Revamping InventoryModel to make i less dependent on FirstScreen, working build