Also, the cpp stuff needs to be removed - I was more ambitious then.