FIX: rejiggering things for first baseline version of fluid