Bouys are persistent

Still need some tests ans to tidy it all up
a bit