Solve problem 15
Solved problem 17
Clean up solution to problem 17