Adding commands and improving room logic