First draft of map
Bug fixes for map