Split out fluid handler
Simplify drops aquisition