Started moving to a new, seperated annotation framework
Save before major change
Changes to referencing and annotation