Added new map system
fucked up everything