Adding some more pieces of scaffolding.