Add more sophisticated metrics that uses the codahale metrics library
Revert accidentally committed changes
Merged Enno's changes into main branch