Added a map
Added map, fixed merge conflicts