Another wam run
hrrt done?
Merge branch 'shawn' into Metrics
Commented file writing stuff for now.