Ported clientside to C++ and enabled cli