More work on Chapter 7.