Must... stop... refactoring.