Some more scaffolding