_Slightly_ more sane pull request to clean stuff up. Plus metadata start.

Sorry I'm terrible at pull requests lately, this should end the confusion (hopefully). Merging since it's all new stuff and I want this past me.