Got things refactored and somewhat tested. Perhaps a bit of cleanup needed when not riding in car...
Added a fairly exhaustive set of units from Wikipedia.