Unit revision. 

Orthogonalize unit interface.
Remove convert method.
Add from base method.