readded Waypoint class after accidental deletion.