Add Buoys!

Fixes  #8