Moved everything in Cpp