Add listening
Fix room usage