Wip/cppify