Hopefully this can be merged if the tests pass.