Annotation schema

PR to pull annotation creation into API-dev
Remove the yo, yo