First engine working fully in c++, merged commit