Rewrote CMakeLists