Cleaned up the source code. Stopped at solution.solve.