"Refactoring" going well too. #xpman