Moderately better service RPC implementation

This still needs work, but is sufficient to move on for now