Checkin more old C++ code