Finished conversion to C++ - need to clean up the code and then test.