Extracted interface for the client for better testability of consumers

[henrybeen]

Sure, my pleasure

It's just when i see 'todo' in code I go into a frenzy