Refactoring provider stuff so we can force_deployer by pulling