Some more work on the grunt framework