[WIP] Adding annotation discussions and converting bookmarks completely to new API spec