more work on channels/join
More work on channel:x