Metadata - Second Iteration (Incomplete)

Incomplete but stable.
Merging due to breaking changes made which may cause unknown conflicts if merged later.