More interactable item stuff
Merge conflicts