continue working on C++ification