Further progress towards C++