forgot to move choices test
implement Waypoint class