Haha, yeah, so I left it alone.  I hope some day this will be completely rewritten in a preferred style.  Didn't want to touch this entire thing as much as possible.