wip: trying to make adapters friendlier