Adding super-awesome scaffolding