More stuff
Merged Chapter 2 (minus images)