added optional highlighting code, not sure I like it yet