Update for end of Chapter 5.  Still needs some work.