First cut of Buoy Client