changed to save unit calculation on model

Also, simplified unitList/types
Updated to work with validation