Checkin old C++ code