Massive refactoring seems successful. Debugging…