Added WaypointS. Organised Behaviours.