Implement the new interface across the code base. All tests are passing, I think this may be ready to merge.