Refactored Units to remove some of the type safety and rigidity.