Bunch of work for a first pass on the hangup flow