..::Values => ..::Values_and_Units; added ..::Units and ..::Calc subclasses