Redesign of how grunt works