Start of right-click add to room thingy #21