Major Update To Metadata Blocks

See ticket #1114 this will need a schema.xml change so assigning to
@pdurbin