Adding metrics comments.
Merging master into feature-metrics
Simplifying storage.
Adding storage metrics via interface wrapper.