Lots of work on chapter 4 (actually now its chapter 5)