A bit more scaffolding and templates