Move some stuff around, break a lot
WIP new flow

This is starting to look a little less insane. The listener side seems
conceptually fine to me by now. Still halfway through ripping out and
replacing the sender side.
Some TODOs
Host order