Feature/new proxying workflow

Fixes #410.