Added a guard and waypoint class.