Adding scaffolding
1.7 prep