Made solution into a Solution.  Added Solution class logic as needed.