A lot more of refactoring.