diff --git a/freechat-client/pages/index.html b/freechat-client/pages/index.html
new file mode 100644
index 0000000..ac9c1e5
--- /dev/null
+++ b/freechat-client/pages/index.html
@@ -0,0 +1,18 @@
+<!-- Keep in mind basically all the major components of the app are held together here -->
+<!-- The reason for this is because I want to keep the electron app as simple as I can get it -->
+<html>
+    <head>
+        <meta charset="utf-8"/>
+        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
+        <link rel="stylesheet" href="../../libs/css/pure.css"/>
+        <link rel="stylesheet" href="../css/style.css"/>
+        <title>Freechat</title>
+    </head>
+<body>
+  <div id="local-stream"></div>
+  <div id="remote-stream"></div>
+  <div id="servers"><!-- Container for the "welcome page"--></div>
+  <div id="messages"></div>
+  <div id="channels"></div>
+</body>
+</html>
diff --git a/freechat-client/src/sass/general.scss b/freechat-client/sass/general.scss
similarity index 100%
rename from freechat-client/src/sass/general.scss
rename to freechat-client/sass/general.scss
diff --git a/freechat-client/src/sass/settings.scss b/freechat-client/sass/settings.scss
similarity index 100%
rename from freechat-client/src/sass/settings.scss
rename to freechat-client/sass/settings.scss
diff --git a/freechat-client/src/sass/welcome.scss b/freechat-client/sass/style.scss
similarity index 81%
rename from freechat-client/src/sass/welcome.scss
rename to freechat-client/sass/style.scss
index 08ce926..444844e 100644
--- a/freechat-client/src/sass/welcome.scss
+++ b/freechat-client/sass/style.scss
@@ -1,6 +1,10 @@
 @import 'general';
 
-$text-color: white;
+$text-color: whitesmoke;
+
+body {
+    color: $text-color;
+}
 
 label {
     color: $text-color;
@@ -21,4 +25,4 @@ h1 {
 input {
     margin-top: 0.5em;
     margin-bottom: 0.5em;
-}
\ No newline at end of file
+}
diff --git a/freechat-client/src/js/rtc.js b/freechat-client/src/js/rtc.js
deleted file mode 100644
index d4d623d..0000000
--- a/freechat-client/src/js/rtc.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Module handles dealing with all the rtc bs that we need to deal with when
-// doing rtc things
-// http2 once auth becomes a thing -> save on them tls handshakes
-const http = require('http')
-const io = require('socket.io-client')
-
-
-var room_id;
-var local_stream;
-var remote_stream; // cat streams later(?)
-var rtc_conn;
-const iceServers = {
-    'iceServers': [
-        { 'urls': 'stun:stun.services.mozilla.com'},
-        { 'urls': 'stun:stun.l.google.com:19302'}
-    ]
-}
-
-// don't really care about video streams
-var stream_constraints = { audio: true, video : false }
-
-var is_caller;
-
diff --git a/freechat-client/src/js/testfile.json b/freechat-client/src/js/testfile.json
deleted file mode 100644
index 58830bd..0000000
--- a/freechat-client/src/js/testfile.json
+++ /dev/null
@@ -1 +0,0 @@
-{"username":null}
\ No newline at end of file
diff --git a/freechat-client/src/pages/index.html b/freechat-client/src/pages/index.html
deleted file mode 100644
index 5e1dd2a..0000000
--- a/freechat-client/src/pages/index.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-    <head>
-        <meta charset="utf-8"/>
-        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-        <link rel="stylesheet" href="../../libs/css/pure.css"/>
-        <link rel="stylesheet" href="../css/welcome.css"/>
-        <title>Freechat</title>
-    </head>
-<body>
-  <!-- For sake of argument we'll keep a list of connected clients in the DOM for now -->
-  <div>
-    <h1>User list</h1>
-    <div id="user-list"></div>
-  </div>
-</body>
-<script src="../js/rtc.js"></script>
-</html>
diff --git a/freechat-client/src/pages/settings.html b/freechat-client/src/pages/settings.html
deleted file mode 100644
index dadbe04..0000000
--- a/freechat-client/src/pages/settings.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-    <head>
-        <meta charset="utf-8"/>
-        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-        <link rel="stylesheet" href="../resources/css/pure.css"/>
-        <link rel="stylesheet" href="../src/css/settings.css"/>
-        <title>Settings</title>
-	</head>
-	<body>
-		<p>this is the settings page</p>
-	</body>
-</html>
