Started on making inventory work ok