OceanData - make it flow

work in progress