First big chunk of C++ port