Further metrics

Implementing the rest of the things in #333