Halfway through a refactor!  OOOOOPS
Flows restored (as long as you don't rotate)