First commit for the new FluidGrid component