Refactored EVERYTHING.  And still working on the 403/404 bugs.

Refactored so Jake wouldn't get pissed off.