About to make some major modifications, just backing up.
Refactoring is a bitch.