Add scaffolding for context etc.