Finish up lesson 16 and 17