diff --git a/src/App.jsx b/src/App.jsx
index 2471693..acce082 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -358,17 +358,24 @@ function JoinOrCreateRoom({ client }) {
 }
 
 function useVideoRoom(client, roomId, timeout = 5000) {
-  const [{ loading, joined, room, participants, error }, setState] = useState({
+  const [
+    { loading, joined, room, conferenceCall, participants, error },
+    setState,
+  ] = useState({
     loading: true,
     joined: false,
     room: undefined,
     participants: [],
     error: undefined,
+    conferenceCall: null,
   });
 
   useEffect(() => {
+    const conferenceCall = new ConferenceCall(client, roomId);
+
     setState((prevState) => ({
       ...prevState,
+      conferenceCall,
       loading: true,
       room: undefined,
       error: undefined,
@@ -424,17 +431,6 @@ function useVideoRoom(client, roomId, timeout = 5000) {
   }, [roomId]);
 
   const joinCall = useCallback(() => {
-    const conferenceCall = new ConferenceCall(client, roomId);
-
-    const onJoined = () => {
-      setState((prevState) => ({
-        ...prevState,
-        joined: true,
-      }));
-    };
-
-    conferenceCall.on("joined", onJoined);
-
     const onParticipantsChanged = () => {
       setState((prevState) => ({
         ...prevState,
@@ -446,13 +442,16 @@ function useVideoRoom(client, roomId, timeout = 5000) {
 
     conferenceCall.join();
 
+    setState((prevState) => ({
+      ...prevState,
+      joined: true,
+    }));
+
     return () => {
-      conferenceCall.removeListener("joined", onJoined);
       conferenceCall.removeListener(
         "participants_changed",
         onParticipantsChanged
       );
-      conferenceCall.leave();
 
       setState((prevState) => ({
         ...prevState,
@@ -460,7 +459,7 @@ function useVideoRoom(client, roomId, timeout = 5000) {
         participants: [],
       }));
     };
-  }, [client, roomId]);
+  }, [client, conferenceCall, roomId]);
 
   return { loading, joined, room, participants, error, joinCall };
 }
@@ -513,9 +512,26 @@ function Participant({ participant }) {
   }, [participant.feed]);
 
   return (
-    <div>
-      {participant.userId}
+    <li>
+      <h3>
+        User ID:{participant.userId} {participant.local && "(Local)"}
+      </h3>
+      {!participant.local && (
+        <>
+          <h3>Calls:</h3>
+          <ul>
+            {participant.calls.map((call) => (
+              <li key={call.callId}>
+                <p>Call ID: {call.callId}</p>
+                <p>Direction: {call.direction}</p>
+                <p>State: {call.state}</p>
+                <p>Hangup Reason: {call.hangupReason}</p>
+              </li>
+            ))}
+          </ul>
+        </>
+      )}
       <video ref={videoRef}></video>
-    </div>
+    </li>
   );
 }
diff --git a/src/ConferenceCall.js b/src/ConferenceCall.js
index cb8e586..f9f0f34 100644
--- a/src/ConferenceCall.js
+++ b/src/ConferenceCall.js
@@ -2,33 +2,31 @@ import EventEmitter from "events";
 
 const CONF_ROOM = "me.robertlong.conf";
 const CONF_PARTICIPANT = "me.robertlong.conf.participant";
-const PARTICIPANT_TIMEOUT = 1000 * 30;
+const PARTICIPANT_TIMEOUT = 1000 * 5;
 
 export class ConferenceCall extends EventEmitter {
   constructor(client, roomId) {
     super();
     this.client = client;
     this.roomId = roomId;
-    this.confId = null;
+    this.joined = false;
     this.room = client.getRoom(roomId);
     this.localParticipant = {
+      local: true,
       userId: client.getUserId(),
       feed: null,
       call: null,
       muted: true,
+      calls: [],
     };
     this.participants = [this.localParticipant];
 
-    client.on("Room.timeline", function (event, room, toStartOfTimeline) {
-      console.debug(event.event);
-    });
+    this.client.on("RoomState.members", this._onMemberChanged);
+    this.client.on("Call.incoming", this._onIncomingCall);
   }
 
   join() {
-    this.client.on("RoomState.members", this._onMemberChanged);
-    this.client.on("Call.incoming", this._onIncomingCall);
-
-    this.emit("joined");
+    this.joined = true;
 
     const activeConf = this.room.currentState
       .getStateEvents(CONF_ROOM, "")
@@ -69,11 +67,18 @@ export class ConferenceCall extends EventEmitter {
   };
 
   _onMemberChanged = (_event, _state, member) => {
+    if (!this.joined) {
+      console.debug("_onMemberChanged", member, "not joined");
+      return;
+    }
+
     this._processMember(member.userId);
   };
 
   _processMember(userId) {
-    if (userId === this.client.getUserId()) {
+    const localUserId = this.client.getUserId();
+
+    if (userId === localUserId || userId < localUserId) {
       return;
     }
 
@@ -85,13 +90,18 @@ export class ConferenceCall extends EventEmitter {
     );
     const participantTimeout = memberStateEvent.getContent()[CONF_PARTICIPANT];
 
+    console.debug(
+      "_processMember",
+      new Date().getTime() - participantTimeout > PARTICIPANT_TIMEOUT
+    );
+
     if (
       typeof participantTimeout === "number" &&
-      new Date().getTime() - participantTimeout > PARTICIPANT_TIMEOUT * 1.5
+      new Date().getTime() - participantTimeout > PARTICIPANT_TIMEOUT
     ) {
-      if (participant && participant.call) {
-        participant.call.hangup("user_hangup");
-      }
+      // if (participant && participant.call) {
+      //   participant.call.hangup("user_hangup");
+      // }
 
       return;
     }
@@ -102,6 +112,15 @@ export class ConferenceCall extends EventEmitter {
   }
 
   _onIncomingCall = (call) => {
+    if (!this.joined) {
+      console.debug(
+        "_onIncomingCall",
+        "Member hasn't joined yet. Not answering."
+      );
+      //call.hangup();
+      return;
+    }
+
     console.debug("_onIncomingCall", call);
     this._addCall(call);
     call.answer();
@@ -129,6 +148,7 @@ export class ConferenceCall extends EventEmitter {
       userId,
       feed: null,
       call,
+      calls: [call],
     });
 
     call.on("feeds_changed", () => this._onCallFeedsChanged(call));
@@ -196,6 +216,7 @@ export class ConferenceCall extends EventEmitter {
     const remoteParticipant = this.participants.find((p) => p.call === call);
 
     remoteParticipant.call = newCall;
+    remoteParticipant.calls.push(newCall);
 
     newCall.on("feeds_changed", () => this._onCallFeedsChanged(newCall));
     newCall.on("hangup", () => this._onCallHangup(newCall));