Still fixing Gruntfile.js and adding some functionality