Adding in subtables for annotations.
Merging in annotations to reflect the fact it is now in a partial.