New Highlight Container

Alright, back up to speed from #295.

Need to work on updating the documentation later on, but everything else seems to be working fine.