more scaffolding wip