Fluid 4988

@yzen this is ready for you to look at. Thanks!