Added room capabilities
Fixed variable scope