Restructure a bit, added working v1 of chapter 2