Added small amount of scaffolding.