diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..b66e484
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "TriviaBot/bot/simplewebsocket"]
+	path = TriviaBot/bot/simplewebsocket
+	url = https://github.com/eidheim/Simple-WebSocket-Server.git
diff --git a/TriviaBot/CSV/LoadDB.cpp b/TriviaBot/CSV/LoadDB.cpp
index e3ef18a..b8445ce 100644
--- a/TriviaBot/CSV/LoadDB.cpp
+++ b/TriviaBot/CSV/LoadDB.cpp
@@ -21,7 +21,7 @@ static int callback(void *x, int argc, char **argv, char **azColName) {
 	return 0;
 }
 
-int main(int argc, char* argv[]) {
+int loadDB() {
 	sqlite3 *db;
 	char *zErrMsg = 0;
 	int rc;
@@ -30,7 +30,7 @@ int main(int argc, char* argv[]) {
 
 	if (rc) {
 		std::cerr << "Can't open database: " << sqlite3_errmsg(db) << std::endl;
-		return(0);
+		return 1;
 	}
 	else {
 		std::cout << "Opened database successfully" << std::endl;
@@ -58,7 +58,6 @@ int main(int argc, char* argv[]) {
 
 		int result = sqlite3_step(insertThreeQuestions);
 		std::cout << result << " ";
-
 	}
 	std::cout << std::endl;
 
diff --git a/TriviaBot/TriviaBot.cpp b/TriviaBot/TriviaBot.cpp
deleted file mode 100644
index 584e12c..0000000
--- a/TriviaBot/TriviaBot.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <stdio.h>
-
-int main(int argc, char* argv[]) {
-
-}
\ No newline at end of file
diff --git a/TriviaBot/TriviaBot.vcxproj b/TriviaBot/TriviaBot.vcxproj
index 694fa4d..68e3f0c 100644
--- a/TriviaBot/TriviaBot.vcxproj
+++ b/TriviaBot/TriviaBot.vcxproj
@@ -69,20 +69,20 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>C:\Users\Jack\Documents\Visual Studio 2015\Projects\TriviaBot\lib\sqlite3;$(IncludePath)</IncludePath>
+    <IncludePath>C:\Users\Jack\Documents\Visual Studio 2015\Projects\TriviaBot\lib\sqlite3;C:\Users\Jack\Documents\GitHubVisualStudio\TriviaDiscord\lib\curl\include;$(IncludePath)</IncludePath>
     <LibraryPath>C:\Users\Jack\Documents\Visual Studio 2015\Projects\TriviaBot\lib\sqlite3\x64;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>C:\Users\Jack\Documents\Visual Studio 2015\Projects\TriviaBot\lib\sqlite3;$(IncludePath)</IncludePath>
+    <IncludePath>C:\Users\Jack\Documents\Visual Studio 2015\Projects\TriviaBot\lib\sqlite3;C:\Users\Jack\Documents\GitHubVisualStudio\TriviaDiscord\lib\curl\include;$(IncludePath)</IncludePath>
     <LibraryPath>C:\Users\Jack\Documents\Visual Studio 2015\Projects\TriviaBot\lib\sqlite3\x64;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LibraryPath>C:\Users\Jack\Documents\Visual Studio 2015\Projects\TriviaBot\lib\sqlite3\x86;$(LibraryPath)</LibraryPath>
-    <IncludePath>C:\Users\Jack\Documents\Visual Studio 2015\Projects\TriviaBot\lib\sqlite3;$(IncludePath)</IncludePath>
+    <IncludePath>C:\Users\Jack\Documents\Visual Studio 2015\Projects\TriviaBot\lib\sqlite3;C:\Users\Jack\Documents\GitHubVisualStudio\TriviaDiscord\lib\curl\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LibraryPath>C:\Users\Jack\Documents\Visual Studio 2015\Projects\TriviaBot\lib\sqlite3\x86;$(LibraryPath)</LibraryPath>
-    <IncludePath>C:\Users\Jack\Documents\Visual Studio 2015\Projects\TriviaBot\lib\sqlite3;$(IncludePath)</IncludePath>
+    <IncludePath>C:\Users\Jack\Documents\Visual Studio 2015\Projects\TriviaBot\lib\sqlite3;C:\Users\Jack\Documents\GitHubVisualStudio\TriviaDiscord\lib\curl\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -141,13 +141,18 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="TriviaBot.cpp" />
+    <ClCompile Include="bot\TriviaBot.cpp" />
     <ClCompile Include="CSV\LoadDB.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\..\AppData\Local\Temp\Rar$DRa0.635\fast-cpp-csv-parser-master\LICENSE" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="bot\simplewebsocket\client_ws.hpp" />
+    <ClInclude Include="bot\simplewebsocket\client_wss.hpp" />
+    <ClInclude Include="bot\simplewebsocket\crypto.hpp" />
+    <ClInclude Include="bot\simplewebsocket\server_ws.hpp" />
+    <ClInclude Include="bot\simplewebsocket\server_wss.hpp" />
     <ClInclude Include="CSV\csv.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/TriviaBot/TriviaBot.vcxproj.filters b/TriviaBot/TriviaBot.vcxproj.filters
index b30b254..7e75dc2 100644
--- a/TriviaBot/TriviaBot.vcxproj.filters
+++ b/TriviaBot/TriviaBot.vcxproj.filters
@@ -21,12 +21,27 @@
     <ClInclude Include="CSV\csv.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="bot\simplewebsocket\server_wss.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="bot\simplewebsocket\server_ws.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="bot\simplewebsocket\crypto.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="bot\simplewebsocket\client_wss.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="bot\simplewebsocket\client_ws.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="CSV\LoadDB.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="TriviaBot.cpp">
+    <ClCompile Include="bot\TriviaBot.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/TriviaBot/bot/TriviaBot.cpp b/TriviaBot/bot/TriviaBot.cpp
new file mode 100644
index 0000000..f4eea67
--- /dev/null
+++ b/TriviaBot/bot/TriviaBot.cpp
@@ -0,0 +1,4 @@
+#include <stdio.h>
+
+int main() {
+}
diff --git a/TriviaBot/bot/simplewebsocket b/TriviaBot/bot/simplewebsocket
new file mode 160000
index 0000000..c284e5a
--- /dev/null
+++ b/TriviaBot/bot/simplewebsocket
@@ -0,0 +1 @@
+Subproject commit c284e5a2829ed854712230e7a9112f39ebfc5aae