Revert "Revert "Adding FluidCycle""

This reverts commit e8e5dfaf2c226975d8490f68c1bec1a13c202df3.