A bit more work on chapter 5.