[WIP] add annotations
[WIP] Work on adding annotations