Implemented issue #24, started work on issue #25.

Metadata Editor not updated to handle the new message structure.