better error messages on failure. Cleanup bunch of imports, go resharper. Add some comments. Try to get test soln working