refactor, switch to single client with common code and fallback

Signed-off-by: leohoare <[email protected]>

Author: leohoare