Cleaning up and documenting
Metrics upgrade
Some progress
Some progress