Majority of resource factory refactor is finished.