More work on chapter 2.