Service clients

Fixes #1 and #5