Adding some scaffy scaffolding