Less c++

A WIP to fix #36, based upon #48 for now - so that one should probably be merged first.