V3 - Grunt additions, refactor