Maps move, fuck markers

FML this is bullshit
Merge branch 'master' into working