Waypoint Update

@jihoonl Doesn't seem to be anything in here which is going to cause a conflict....all are entirely new messages.