Metro report

Just a few commits on top of #94.

Need to add this to release-notes too. Will add when one of the the release notes PRs are merged.