Stuff

Not feeling too good about this Git stuff, I'm struggling to keep my
changes to single units of work...
Clarifying DrawBlockHighlightEventHandler