So much refactoring.