Adding a little bit more scaffolding.