Started C++ rewrite.