Problem 16 solved
Problem 17 solved