Switched to CMake setup.  Cleaned up solution. Euler 39