Adding "fluid" mode

This is a first pass at the ideas discussed in #982.
Ah, right, I misunderstood what was happening.
Frankly, we should just move to borderbox wholesale as it will make all the other stuff a lot nicer.