Now adding info to the annotations. (WIP)