Merge pull request #828 from SlexAxton/master

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