We'll need to document all of this.
I'll make a pass once we have merged your changes.