Annotations

This implements the annotations in parallel with the schema.  This is dependent on #850 and should close a number of the remaining issues.