WIP - Abbreviations

refs #20