Add C++, but needs tests.