WIP refactor annotations
Annotations working with kvo