Adding initial scaffolding