Refactored things a bit.  Request dispatching is simpler now.