Fixed up some issues, commented out non-working code and ensured that the solution compiled