Add Grunt Complexity and attempt to lower complexity