More porting of stuff from Python to C++