Bugfix #7 & #8. Eliminate dependence on fluid.