Vast refactoring.