Added Waypoint ini and likked waypoints to DDFS,