Refactors grunt process, attempting build 2