Feature/middleman