Updates to Grunt

More modular flow