Initial abbreviation work. Tests currently fail.
Next stab at abbreviations. Highlighting should work.