Switched to using CMake