Major, major refactoring.