WIP: adapting client