Speaker notes from @todb

Land this.

I think I did it right, but dang branching and merging straight from the UI makes my face hurt.