Started the grand refactoring.