Refactoring phase2 essentially complete