Completed part 1
Completed 2.1, started 2.2 (line 22)