wip on client lib