Got more highlighting working. Errors are thrown when you move the

mouse and it re-highlights. Strange. Investigating.