More scaffolding functions based on the discussions from Saturday night