Attempted to rehash/clarify the flow to bring it in line with our discussions of the last couple of days.

Supplants #158