Not finished map generating push
(to work on from a different place)