Metro report

Just a few commits on top of #94.