WIP: grunt improvements