First attempt at proper draining behaviour
Don't bother checking the fluid type