initial annotations backend work
Merge branch 'issue-660-new-annotations' into integration