Added more lesson 17 code