initial work on annotations
Merge branch 'annotations-improvements' into issue-660-new-annotations