WIP issues with API client mockup