More grunt funcitonality and options