Chapter 2 update

2.1 ready for review
2.2 ready for review