Interim update relating to metadata format changes.
Another interim update.
Updated metadata class to the point where all tests pass.