Finish more parts of problem 1
Finish 1
Update points
Finish 2.1
Finish 2.2
More for 2.2
Finish 2.3