move stuff from the model to the provider (bug 944799)