Finished Part 17, added some code