Chapter 16 & 17 completed