Added unit conversion. Still a few things left to fix but it works now!