Add logic for new room client side

@Matthological , @Alex-II