Added code for a route with waypoints at gps locations.
Added some more state helpers.