Start transitional refactoring