Refactoring... broken.