Chapter 4 update
5.1.1
5.1.2
5.2.3
5.2
5.3.3
5.3
Finished chapter 5