Jeff - refactor to commodities repository interface