changed some things to pointers worked on rooms and changed some of the naming convention