Adding "fluid" mode

This is a first pass at the ideas discussed in #982.
Ok, works for me.