Refactoring 2/2 complete. New working baseline for Provider set.