I promise to tease this apart into coherent commits.