Added a TODO
Updated right-click on map to be a button thing