Some work on chapter 4
Finish up with chapter 4