Progress check-in of C++ refactor work