Added initial client for #1