Refactoring Branch begun.