Feature/adapter

work in progress 
Thank you