Drop Grunt. Replace with cat. Reveal, martyr, buff throwrock. Improve code test