Refactor 15 into just an App object.
Problem 16 solution.