Got the units conversion down mostly