Removed Border because it results in incorrect Dijkstra Data.
Reimplement returning of Waypoints and drawing.