Most of refactor completed for migrating to object based dispatch.  Code is cleaner and more reusable (i hope).  Still need to add classes for the all services