josh's additions, plus init of map 2