cleanup
broke out new MapDestination class