RedDeerRefactoring in progress