Added some stuff for metrics
an attempt at a compromise
Merge pull request #3 from calvertj/master

removed some details...