add grub unit, split whip drawing code out of the loop