diff --git a/2021/day02/input b/2021/day02/input
new file mode 100644
index 0000000..594c25f
--- /dev/null
+++ b/2021/day02/input
@@ -0,0 +1,1000 @@
+forward 5
+down 9
+forward 2
+up 2
+forward 4
+forward 4
+up 5
+down 3
+forward 2
+forward 9
+down 7
+forward 2
+down 2
+forward 1
+up 9
+forward 1
+forward 4
+up 5
+down 9
+forward 8
+forward 3
+up 1
+down 2
+down 3
+forward 7
+forward 2
+up 3
+forward 9
+forward 9
+down 3
+up 8
+forward 5
+forward 7
+forward 2
+down 7
+forward 5
+down 4
+up 7
+forward 8
+forward 1
+down 3
+down 1
+forward 6
+up 7
+forward 6
+down 3
+forward 9
+forward 6
+up 3
+down 1
+forward 8
+up 7
+down 9
+down 2
+down 1
+down 5
+forward 4
+down 8
+forward 2
+down 5
+down 6
+down 5
+forward 5
+down 8
+up 8
+forward 3
+forward 4
+forward 8
+forward 9
+down 2
+forward 7
+forward 3
+forward 9
+down 3
+up 1
+down 5
+forward 2
+down 9
+down 2
+down 5
+down 2
+down 9
+up 3
+forward 6
+up 9
+down 1
+forward 8
+up 6
+down 1
+forward 1
+up 1
+forward 3
+down 8
+down 1
+down 9
+forward 4
+forward 1
+down 3
+forward 8
+down 9
+forward 7
+up 6
+down 8
+down 6
+down 8
+down 7
+down 1
+down 8
+down 1
+forward 5
+down 9
+forward 4
+down 2
+forward 8
+up 1
+forward 7
+down 7
+down 6
+forward 4
+forward 6
+down 2
+down 2
+up 7
+down 2
+up 9
+forward 6
+forward 3
+down 8
+forward 9
+down 9
+down 9
+down 8
+forward 2
+forward 5
+forward 8
+forward 1
+down 3
+forward 1
+forward 2
+forward 9
+up 5
+forward 4
+forward 2
+down 6
+forward 3
+forward 7
+forward 1
+forward 8
+down 7
+forward 4
+up 3
+down 9
+up 2
+forward 2
+forward 7
+down 9
+up 9
+forward 9
+up 8
+up 7
+down 8
+down 9
+forward 1
+forward 5
+up 7
+down 3
+up 9
+forward 9
+down 4
+down 7
+down 7
+down 1
+down 4
+down 5
+up 2
+forward 2
+forward 2
+forward 6
+down 7
+forward 7
+down 5
+forward 8
+down 7
+forward 6
+down 2
+up 2
+down 5
+down 1
+up 4
+down 8
+up 9
+forward 1
+down 9
+down 6
+down 8
+up 7
+up 1
+forward 7
+down 8
+forward 1
+down 4
+down 2
+forward 3
+forward 6
+forward 8
+down 2
+forward 7
+forward 8
+up 3
+down 1
+down 8
+up 3
+down 4
+down 5
+forward 6
+forward 9
+down 3
+up 2
+down 9
+up 2
+down 3
+down 9
+forward 4
+forward 6
+down 7
+down 8
+down 4
+forward 7
+up 2
+down 5
+up 3
+down 5
+up 1
+up 1
+forward 5
+forward 9
+down 9
+up 4
+up 4
+up 8
+up 5
+forward 7
+forward 6
+up 6
+down 5
+forward 4
+forward 3
+up 6
+down 6
+forward 5
+up 6
+up 7
+forward 1
+forward 2
+forward 5
+down 3
+forward 6
+down 6
+down 3
+up 9
+down 4
+down 5
+down 4
+forward 1
+down 1
+forward 3
+up 4
+forward 1
+forward 5
+up 3
+forward 6
+forward 5
+forward 9
+forward 6
+down 2
+forward 2
+down 1
+down 4
+forward 6
+forward 8
+down 8
+up 5
+forward 8
+forward 3
+forward 1
+forward 3
+forward 6
+down 1
+down 9
+up 7
+down 2
+forward 6
+down 4
+down 7
+down 5
+forward 2
+down 1
+forward 2
+forward 8
+forward 4
+up 3
+down 1
+forward 6
+forward 3
+down 3
+down 9
+forward 1
+up 5
+forward 3
+forward 3
+up 5
+down 7
+forward 8
+up 5
+forward 2
+forward 2
+down 6
+up 8
+up 5
+forward 2
+forward 1
+down 9
+forward 7
+down 5
+forward 3
+down 3
+down 5
+down 5
+up 7
+down 8
+forward 2
+forward 4
+forward 5
+forward 1
+down 6
+forward 3
+down 1
+down 7
+forward 3
+forward 7
+down 5
+down 3
+forward 6
+down 3
+down 2
+down 4
+down 9
+forward 7
+down 2
+up 2
+up 6
+up 9
+up 8
+forward 9
+down 1
+forward 4
+forward 2
+forward 7
+forward 2
+down 8
+down 3
+forward 4
+forward 6
+down 8
+forward 7
+forward 6
+up 3
+down 6
+down 1
+down 3
+down 8
+down 2
+down 7
+down 9
+forward 4
+forward 7
+forward 8
+forward 5
+forward 9
+up 5
+down 2
+forward 9
+forward 6
+up 6
+forward 7
+down 2
+down 3
+forward 4
+down 6
+down 1
+down 2
+down 8
+forward 3
+down 3
+forward 3
+down 5
+up 8
+down 5
+forward 8
+down 1
+forward 1
+forward 4
+forward 7
+down 2
+down 5
+forward 5
+down 8
+forward 2
+down 2
+forward 5
+forward 6
+forward 4
+down 7
+up 7
+down 1
+forward 7
+forward 8
+down 6
+up 7
+forward 6
+up 6
+down 8
+forward 5
+forward 8
+up 4
+up 2
+up 1
+down 8
+down 6
+up 2
+down 5
+down 1
+forward 5
+forward 7
+down 2
+up 3
+up 3
+forward 9
+down 1
+forward 6
+down 2
+forward 2
+down 1
+down 9
+forward 7
+down 5
+down 8
+up 1
+forward 1
+down 7
+forward 3
+down 4
+up 4
+down 6
+forward 1
+forward 3
+down 2
+forward 3
+forward 5
+forward 6
+up 2
+up 9
+forward 4
+down 4
+up 1
+up 3
+forward 8
+forward 1
+down 9
+down 9
+forward 2
+down 1
+up 9
+up 3
+up 1
+up 5
+forward 6
+down 9
+forward 6
+forward 9
+forward 6
+forward 4
+up 2
+down 6
+up 3
+forward 3
+forward 1
+up 4
+forward 7
+down 9
+down 3
+forward 9
+down 4
+down 8
+down 3
+up 8
+down 8
+down 8
+forward 2
+forward 8
+up 9
+forward 2
+up 6
+forward 7
+down 1
+forward 5
+forward 4
+forward 1
+forward 7
+up 9
+down 8
+forward 1
+up 5
+forward 9
+forward 2
+forward 8
+down 1
+forward 7
+down 2
+up 8
+down 6
+up 9
+up 3
+down 6
+forward 5
+down 1
+forward 1
+forward 6
+forward 6
+up 1
+forward 5
+forward 1
+up 2
+forward 9
+forward 6
+down 3
+up 1
+forward 7
+forward 2
+down 1
+forward 6
+down 3
+up 2
+down 3
+down 8
+forward 4
+down 2
+up 7
+down 6
+up 5
+down 7
+forward 4
+down 9
+down 3
+forward 2
+up 5
+up 4
+forward 9
+down 1
+up 2
+forward 4
+down 9
+down 8
+forward 5
+forward 2
+down 5
+forward 6
+down 4
+forward 7
+forward 1
+forward 6
+down 3
+down 9
+forward 9
+forward 2
+forward 6
+down 7
+down 5
+down 3
+forward 7
+down 3
+down 3
+down 4
+down 4
+down 7
+down 7
+down 7
+up 7
+up 9
+up 7
+up 3
+up 4
+down 9
+down 4
+up 3
+forward 2
+up 1
+down 9
+down 6
+up 1
+up 2
+down 7
+down 9
+up 2
+forward 7
+down 4
+forward 3
+down 1
+down 7
+forward 7
+up 7
+forward 3
+forward 1
+forward 6
+forward 2
+down 9
+forward 8
+up 8
+down 8
+down 9
+up 1
+down 4
+down 6
+down 8
+up 4
+down 1
+forward 1
+forward 1
+forward 4
+forward 7
+forward 1
+down 4
+forward 5
+up 3
+forward 4
+down 5
+down 1
+up 2
+down 7
+forward 7
+down 7
+up 9
+down 9
+down 3
+up 2
+up 8
+up 8
+up 7
+forward 7
+forward 5
+forward 3
+forward 2
+down 5
+forward 4
+forward 1
+down 6
+down 1
+forward 8
+down 6
+down 3
+down 5
+down 9
+down 3
+forward 7
+forward 6
+down 6
+forward 9
+up 7
+forward 3
+up 5
+down 5
+down 5
+forward 4
+up 6
+down 6
+forward 3
+up 2
+forward 4
+up 1
+down 5
+forward 6
+forward 9
+down 2
+up 2
+down 2
+up 7
+forward 3
+up 2
+forward 9
+forward 5
+down 5
+down 7
+down 8
+down 6
+up 9
+up 5
+forward 7
+down 8
+down 1
+forward 7
+up 2
+forward 4
+forward 2
+up 9
+down 8
+forward 1
+forward 7
+down 2
+down 3
+down 6
+down 3
+forward 1
+up 6
+forward 8
+down 9
+down 9
+forward 8
+up 8
+down 6
+forward 4
+up 1
+forward 5
+down 3
+down 7
+down 7
+down 3
+up 2
+forward 4
+down 9
+forward 2
+down 9
+forward 9
+forward 4
+forward 5
+down 4
+forward 1
+up 1
+forward 4
+up 3
+up 4
+forward 7
+down 9
+forward 6
+down 1
+down 1
+down 2
+down 4
+forward 7
+forward 8
+forward 6
+down 8
+forward 2
+down 3
+up 5
+forward 2
+up 5
+forward 8
+down 8
+down 8
+up 8
+forward 6
+up 1
+down 3
+forward 6
+down 1
+forward 9
+up 1
+forward 7
+forward 7
+down 1
+forward 5
+forward 2
+up 7
+down 1
+forward 2
+down 4
+forward 3
+down 9
+forward 6
+up 5
+forward 1
+forward 5
+down 7
+forward 6
+down 8
+forward 9
+down 1
+forward 9
+down 1
+forward 5
+up 9
+forward 1
+forward 6
+forward 5
+down 7
+down 6
+down 5
+down 9
+forward 9
+down 2
+down 8
+down 8
+forward 2
+forward 3
+forward 3
+down 3
+forward 8
+forward 8
+down 8
+forward 1
+up 1
+forward 4
+down 7
+forward 1
+up 2
+forward 9
+forward 1
+down 6
+up 9
+down 3
+down 1
+up 1
+up 6
+up 7
+forward 9
+up 2
+forward 4
+up 8
+down 6
+forward 3
+forward 7
+down 6
+down 5
+down 3
+forward 5
+down 1
+forward 2
+forward 9
+down 8
+up 6
+forward 3
+forward 2
+up 7
+down 3
+forward 5
+forward 9
+down 5
+down 1
+up 4
+down 8
+forward 1
+forward 3
+forward 3
+down 2
+forward 5
+down 1
+forward 2
+up 3
+forward 8
+down 2
+up 8
+down 6
+down 8
+forward 4
+down 4
+up 7
+up 6
+down 7
+forward 2
+up 3
+forward 3
+down 8
+forward 8
+down 5
+forward 5
+down 3
+up 7
+down 1
+down 2
+up 8
+down 6
+up 6
+down 7
+forward 5
+up 3
+forward 7
+forward 2
+down 9
+down 1
+down 4
+down 7
+forward 9
+up 7
+forward 5
+up 8
+forward 8
+up 1
+forward 2
+down 7
+down 5
+down 6
+down 4
+up 4
+forward 5
+forward 6
+up 4
+forward 8
+forward 4
+forward 3
+up 5
+down 6
+up 4
+forward 8
+down 7
+forward 3
+down 2
+down 7
+down 5
+down 4
+forward 5
+up 4
+forward 4
+down 7
+down 3
+down 9
+down 7
+forward 2
+forward 1
+down 7
+down 8
+forward 1
+forward 2
+down 5
+up 1
+down 1
+forward 5
+down 2
+forward 9
+forward 7
+down 2
+forward 6
+forward 9
+up 5
+forward 3
+up 5
+forward 7
+down 6
+down 3
+up 3
+down 4
+forward 2
+up 4
+forward 5
+up 9
+down 3
+up 1
+down 1
+up 3
+forward 4
+forward 5
+down 3
+forward 5
+down 6
+down 2
+forward 5
+forward 3
+down 7
+down 8
+forward 4
+down 5
+forward 7
+forward 2
+forward 7
+down 7
+up 1
+forward 6
+down 1
+forward 1
+down 4
+forward 1
+up 6
+forward 8
+forward 6
+forward 7
+up 6
+up 7
+up 2
+down 9
+forward 4
+up 3
+down 1
+down 1
+forward 3
+down 4
+down 6
+down 8
+forward 9
+forward 6
+down 1
+forward 5
diff --git a/2021/day02/main.go b/2021/day02/main.go
new file mode 100644
index 0000000..a21aae4
--- /dev/null
+++ b/2021/day02/main.go
@@ -0,0 +1,126 @@
+package main
+
+import (
+	"fmt"
+	"strings"
+
+	h "git.bullercodeworks.com/brian/adventofcode/helpers"
+)
+
+func main() {
+	inp := h.StdinToStringSlice()
+	part1(inp)
+	part2(inp)
+}
+
+func part1(inp []string) {
+	s := NewSubMk1(0, 0, 0)
+	s.Follow(inp)
+	fmt.Println(s)
+}
+
+func part2(inp []string) {
+	s := NewSubMk2(0, 0, 0)
+	s.Follow(inp)
+	fmt.Println(s)
+}
+
+type Sub interface {
+	Follow(inp []string)
+	Forward(d int)
+	Down(d int)
+	Up(d int)
+}
+
+type SubMk1 struct {
+	Horizontal, Depth, Aim int
+}
+
+func NewSubMk1(horizontal, depth, aim int) Sub {
+	return &SubMk1{
+		Horizontal: horizontal,
+		Depth:      depth,
+		Aim:        aim,
+	}
+}
+
+func (s SubMk1) String() string {
+	return fmt.Sprintf("Horizontal: %d; Depth: %d; Aim: %d; M: %d", s.Horizontal, s.Depth, s.Aim, s.Horizontal*s.Depth)
+}
+
+func (s *SubMk1) Follow(inp []string) {
+	for _, v := range inp {
+		pts := strings.Fields(v)
+		if len(pts) < 2 {
+			fmt.Println("Error following instruction:", v)
+			return
+		}
+		switch pts[0] {
+		case "forward":
+			s.Forward(h.Atoi(pts[1]))
+		case "down":
+			s.Down(h.Atoi(pts[1]))
+		case "up":
+			s.Up(h.Atoi(pts[1]))
+		}
+	}
+}
+
+func (s *SubMk1) Forward(d int) {
+	s.Horizontal += d
+}
+
+func (s *SubMk1) Down(d int) {
+	s.Depth += d
+}
+
+func (s *SubMk1) Up(d int) {
+	s.Depth -= d
+}
+
+type SubMk2 struct {
+	Horizontal, Depth, Aim int
+}
+
+func NewSubMk2(horizontal, depth, aim int) Sub {
+	return &SubMk2{
+		Horizontal: horizontal,
+		Depth:      depth,
+		Aim:        aim,
+	}
+}
+
+func (s SubMk2) String() string {
+	return fmt.Sprintf("Horizontal: %d; Depth: %d; Aim: %d; M: %d", s.Horizontal, s.Depth, s.Aim, s.Horizontal*s.Depth)
+}
+
+func (s *SubMk2) Follow(inp []string) {
+	for _, v := range inp {
+		pts := strings.Fields(v)
+		if len(pts) < 2 {
+			fmt.Println("Error following instruction:", v)
+			return
+		}
+		switch pts[0] {
+		case "forward":
+			s.Forward(h.Atoi(pts[1]))
+		case "down":
+			s.Down(h.Atoi(pts[1]))
+		case "up":
+			s.Up(h.Atoi(pts[1]))
+		}
+	}
+}
+
+func (s *SubMk2) Forward(x int) {
+	s.Horizontal += x
+	s.Depth += s.Aim * x
+}
+
+func (s *SubMk2) Down(x int) {
+	s.Aim += x
+}
+
+func (s *SubMk2) Up(x int) {
+	s.Aim -= x
+}
diff --git a/2021/day02/testinput b/2021/day02/testinput
new file mode 100644
index 0000000..b7172ac
--- /dev/null
+++ b/2021/day02/testinput
@@ -0,0 +1,6 @@
+forward 5
+down 5
+forward 8
+up 3
+down 8
+forward 2