Wip 8665 reorder

@jcsp @dmick 
I created this PR to show the order I expect to merge this work in. The ordering is logical and contains better messages. I didn't push over the wip-8665 branch because the rebase would drop all the great feedback I got there.