Foundation set for the C++ rewrite