Finished problem 16 and 17