[#1] Add inventory and update calc's to use it