Made some progress with cpp.