Annotations work - commit 7

Think I found the issue.