Started working on C++ part