Updates to initial scaffolding