Metadata - Phase 2 (Partial Completion)

Merging the partially completed phase 2 because it is changing many files which will cause conflicts with @tgiphil and his work.

Passing unit tests continue to pass and CoolWorld continues to work. Shouldn't break anything except Reflection (which isn't used yet).