Started thinking about 'fixing up' the map format. It'll need more than a fixup..