wip: more work on making adapters nice