Refactors Chapter 2
Adds remaining solutions for Chapter 3