Another interim commit for chap 7.