Annotations work - commit 6

Testing to get it to work.