Added groundwork for inventories