WIP add adapters concept