Continued the grand refactoring.