Started switching to using CMake