WIP - working on doc annotations