More work on the service.  Still does not handle multiple clients correctly.