More annotations. Still WIP