WIP on adapters