Pushing my Dame stuff

So that hopefully it will be easier for Michael to work on level stuff
as well