Contains function now checks for location in room, instead of Cell