Metrics Script debugging

Added some new functionality and debugged it. This version will be
running on henry-test.