Split highlighting functions into global and individual
Add a todo item