Committing before some more refactoring.
More refactoring...