Added some scaffolding

Added some scaffolding