Working on the grunt workflow