Scaffolding a bit further