Still working on CMake build
CMake build working on Unix commandline.
Going to do some testing before merging into master