final commit from Mace, some of the maps turn out janky, ah well