Debugging alighnment
Merge branch 'master' into highlight
Highlighter functional but not pretty.
Making it pretty.
Small changes
Fixing ordering
Moving annotable() and making highlights only appear on transactions
Merge branch 'master' into highlight
Fixing typo.
Fixing merge conflict