Finished Chapter 7 bits