Moved it all to include the solution.