Made some progress on ServiceProviders