Still fixing cpp stuff
Put cpp stuff back
Added shape function