Added some more work - and it compiles