Added lots of Chapter 2 stuff