Added some scaffolding