Initial commit of scaffolding code