changes merged early aug 2, without router.
Added simple buoy task that comes in from above