Updated importing, more efficient.
Too many changes to count.
Unit calculator, fixes to imports mainly.