Beginning annotations

Nothing quite working at the moment
Merge branch 'master' into Annotations
Getting annotations closer...
Annotations mostly working now
Merge branch 'master' into Annotations
Annotations and EventBus functional
Merge branch 'Annotations'