Implementing the buoy data map
Cleaning up some stuff