Begin refactor to put source of truth in factories.