Started adding commodities class