add custom client

[edwvee]

That's stupid that client is passed in every functions. But, it's not OOP style.

PS: Had an issue with previous request: third commit didn't come.