Still refactoring.
More refactoring.