WIP - focus on generic client right now