Updates to inventory system… needs a re-architecting