Start of more metrics

The rest of more metrics will be in a seperate app and on a seperate
branch for now.