Add client custom attribute for custom key/values

So this passes the tests that I created, copying #85 a lot.  However, I don't have a very easy test environment.  Can someone help me see if this works?