WIP, most will be cleaned up by not linking the popups with the markers...