Work on adding functionality to C++ version