Content/buoy

Not ready yet, just putting the PR out there