Added Scaffolding
Josh's changes