About to do some refactoring.