Lots of editor/map gen work