Merge pull request #124 from charsleysa/metadata

Metadata - Second Iteration (Incomplete)
Merge pull request #125 from charsleysa/metadata

Metadata - Second Iteration (Incomplete)