Refactored a great deal of the things.
Moar refactoring.