Refactoring, backing up incomplete changes