Creates `cigarettes per day` as a potential unit and changes other units from `unit count` to `units`, partially addressing #67