Finishing up Exercise 1.9, and editing 1.8