Continued work on grunt