got rid of accident merge stuff
join and leaving rooms done