Added map
More map stuff