restructure everything
Problem 12 solved.