Commits of initial progress in C to C++ conversion