Ok, third time's the charm. No changes from last time except the CMake