Added CMake capability, added placeholder save handling