Buoyancy working as expected now. Source refactoring needed yet