Compile metadata

Yeah, I'd assumed that it was merged. This is merely whatever master had when I merged it into this branch before pushing.

Probably need to coordinate some merging into master at this point.