Made the highlighting work. Still needs alignment grouping