Started adding C++ code