Refactoring EVERYTHING.
More refactoring!
More new stuff.