Start of Abbreviation implementation, part 2.