WIP Add highlights

Refactor the decoration storage.

More to come...
This helper matches up kinda weird with the other one... seems like they should have corresponding names.