Grunt and some other stuff added