Waypoints

Allows for waypoints to be specified, along with the optional optimization