Done through problem 18

Problem 18 has been completed.