added Room and Thing classes