more map stuff idk i should really clean this up before i check in but fuck it