diff --git a/packages/renderer/src/index.tsx b/packages/renderer/src/index.tsx
index 4cb9cdd..3179eef 100644
--- a/packages/renderer/src/index.tsx
+++ b/packages/renderer/src/index.tsx
@@ -1,26 +1,8 @@
-import React from 'react';
+import React, { createContext } from 'react';
 import ReactDOM from 'react-dom';
-import Channels from './pages/Channels';
-import Chat from './pages/Chat';
+import App from './pages/App';
 
 ReactDOM.render(
-  (
-    <div style={{
-      display: 'grid',
-      gridTemplateColumns: '200px 1fr',
-      gridTemplateRows: '1fr',
-      height: '100%',
-    }}>
-      <div style={{
-        background: 'rgba(25, 26, 33)',
-        borderRight: '1px solid #bd93f9',
-      }}>
-        <Channels></Channels>
-      </div>
-      <div>
-        <Chat></Chat>
-      </div>
-    </div>
-  ),
+  <App></App>,
   document.getElementById('app'),
 );
\ No newline at end of file
diff --git a/packages/renderer/src/pages/App.tsx b/packages/renderer/src/pages/App.tsx
new file mode 100644
index 0000000..a01365f
--- /dev/null
+++ b/packages/renderer/src/pages/App.tsx
@@ -0,0 +1,39 @@
+import { createContext, useState } from 'react';
+import Channels from './Channels';
+import Chat from './Chat';
+
+
+export const channelContext = createContext<{
+  channel: string | null,
+  setChannel: (uid: string) => void
+}>({
+  channel: null,
+  setChannel: () => {},
+});
+
+export default function App() {
+  const [channel, setChannel] = useState<string>(null);
+
+  const channelContextValue = { channel, setChannel };
+
+  return (
+    <channelContext.Provider value={channelContextValue}>
+      <div style={{
+        display: 'grid',
+        gridTemplateColumns: '200px 1fr',
+        gridTemplateRows: '1fr',
+        height: '100%',
+      }}>
+        <div style={{
+          background: 'rgba(25, 26, 33)',
+          borderRight: '1px solid #bd93f9',
+        }}>
+          <Channels></Channels>
+        </div>
+        <div>
+          <Chat></Chat>
+        </div>
+      </div>
+    </channelContext.Provider>
+  );
+}
\ No newline at end of file
diff --git a/packages/server/src/lib/WebSocketServer.ts b/packages/server/src/lib/WebSocketServer.ts
index cc356d7..0aef5d6 100644
--- a/packages/server/src/lib/WebSocketServer.ts
+++ b/packages/server/src/lib/WebSocketServer.ts
@@ -19,7 +19,7 @@ export function expose(router: Function, port: number) {
         try {
           console.log('[IN]', action, data);
           const _return = await (router(action, data) as unknown as Promise<any>);
-          console.log(_return);
+          // console.log(_return);
           if(_return) {
             try {
               switch(_return.type) {
diff --git a/packages/server/src/routers/channel.ts b/packages/server/src/routers/channel.ts
index 291a471..b7bd4ce 100644
--- a/packages/server/src/routers/channel.ts
+++ b/packages/server/src/routers/channel.ts
@@ -13,10 +13,10 @@ export default router({
   async add(channel: any) {
     const name = channel.name;
     const uid = v4();
-    console.log(channel);
+    // console.log(channel);
     const res = await query(add, name, uid);
     if(res === null) return;
-    console.log(res);
+    // console.log(res);
     return broadcast({
       uid,
       name,