Started rebuilding the marker and popup code

Starting new code for the popup and a click handler on a marker.