WIP Better separation of client api