Add metrics

Is this a todo for more tests, or can it go away now?