added hybrid client and server services, addresses #387