C++ stuff, will try to commit everyday