nearly compiles clean with the mvc tidy up