More work on grunt tasks