I have a chemical distributor that is having trouble assigning a commodity classification to their products. They have more than 800 different types. The chemicals they carry do not fall neatly into the commodity classifications. As an AHJ I want to send them to the 2016 edition of NFPA 13, Chapters 13 --> Table 13.2.1 and Section 22.37 Hazardous Materials. Is this the right direction? Any help would be appreciated.