@Ben Gotow diff approved. have some non-trivial followup questions that would be good to address in the final rewview