C++ build actually works now