Adding in tags, and author as annotations