added untested changes to mapper to prepare for separate edit/play modes and to include starting player position