Scaffolding

Starting some work on scaffolding