Add map markers

Not complete yet - parking this pull request for discussions on popups