Chapter 2 update

Work continues on chapter 2.