Scaffolded out some things