Much more work on fluids (still untested)