Added a bit of scaffolding.