Forget Provider, use Loader.

* about 70% of the tests are passing as of this writing