more scaffolding
rework edit workflow