WIP new maps

WIP DO NOT MERGE!!