Two phase handoff - design review for 373

Design for #373. Almost too simple, but then someone else did all the hard work of incremental push :grin: