more scaffolding and wirign up foundation