Added more elements, scaffolding.