Add new cmake

I'm not sure if it completely works yet.