WIP: Port to C++

latest commit ea5dfe13b8
Christoph Brill authored