Made changes to cpp so it will actually compile.  Make sure to recompile the source