Finished problem 16
Finished problem 17