Updated metric conversion. Needs review.

I need some one to test this out and review it for bugs.