WIP:Metrics2 to Metrics3 Migration