WIP- half working adapter