Adding some grunt magic