Redone in terms of base units.
But needs some thought into how to better structure the base units.