Grunt fix, and more scaffolding