Sprint 15, Issue 9: Workbench framework. Also, Issue 10 partial fix.