Beginning Phase 2 of the refactor.  Moving the business logic out of the webservice layer