Turned room into an object so that new room features can be added, and changed some methods to remove unneeded parameters