Revert "Revert "[IN PROGRESS] FluidCycle integration""

This reverts commit c86ccdbf2274a3199181b8606eee9ce6dbda8154.