Adding Grunt to the mix - will refine later