This is going away. Iterative steps here because this is a mammoth effort. Please wait for the PR for master.