Added more scaffolding.
Yet more scaffolding.