Refactored slightly, updated nuget packages and migrated MVC project over to MVC3, not yet working at run time but we'll get there