Started move to MapScreenr

Also messed around with maps and stuff... Big changes, no promises.