Refactored

The code refactoring I was doing at work has worked out.

Now, if I could just get the other new feature that I threw in ahead of the refactoring to work, I'd have this licked...

Maybe tomorrow.