added saving map stuff crap
merge conflicts