commodities refactor + visualization updates