Added Buoys!

Fixes #8