diff --git a/server/src/crypto/base64.cpp b/server/src/crypto/base64.cpp
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/server/src/crypto/base64.cpp
@@ -0,0 +1 @@
+
diff --git a/server/src/crypto/base64.hpp b/server/src/crypto/base64.hpp
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/server/src/crypto/base64.hpp
@@ -0,0 +1 @@
+
diff --git a/server/src/crypto/sha1.cpp b/server/src/crypto/sha1.cpp
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/server/src/crypto/sha1.cpp
@@ -0,0 +1 @@
+
diff --git a/server/src/crypto/sha1.hpp b/server/src/crypto/sha1.hpp
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/server/src/crypto/sha1.hpp
@@ -0,0 +1 @@
+
diff --git a/server/src/main.cpp b/server/src/main.cpp
index af20424..6691e29 100644
--- a/server/src/main.cpp
+++ b/server/src/main.cpp
@@ -28,5 +28,7 @@ int main(int argc, char **argv) {
             std::cout << got << std::endl;
     }*/
     
+    
+    
     return 0;
 }
diff --git a/server/src/sock/intrasock.cpp b/server/src/sock/intrasock.cpp
index 8db6203..2369711 100644
--- a/server/src/sock/intrasock.cpp
+++ b/server/src/sock/intrasock.cpp
@@ -4,16 +4,24 @@
 /* BEGIN INTRACONNECTION CODE */
 /******************************/
 
-sosc::IntraConnection::IntraConnection() {
+sosc::IntraClient::IntraClient() {
     this->client_open = false;
 }
 
-sosc::IntraConnection::IntraConnection(TcpClient client) {
+bool sosc::IntraClient::Open(std::string host, uint16_t port) {
+    if(!this->client.Open(host, port))
+        return false;
+    
+    this->client_open = true;
+    return true;
+}
+
+void sosc::IntraClient::Open(TcpClient client) {
     this->client = client;
     this->client_open = true;
 }
 
-int sosc::IntraConnection::Receive(Packet* packet, bool block) {
+int sosc::IntraClient::Receive(Packet* packet, bool block) {
     if(!this->client_open)
         return PCK_ERR;
     
@@ -36,14 +44,14 @@ int sosc::IntraConnection::Receive(Packet* packet, bool block) {
     return PCK_OK;
 }
 
-bool sosc::IntraConnection::Send(const Packet& packet) {
+bool sosc::IntraClient::Send(const Packet& packet) {
     if(!this->client_open)
         return false;
     
     return this->client.Send(packet.ToString()) == 0;
 }
 
-sosc::IntraConnection::~IntraConnection() {
+sosc::IntraClient::~IntraClient() {
     this->Close();
 }
 
@@ -64,13 +72,13 @@ bool sosc::IntraServer::Listen(uint16_t port) {
     return this->server.Listen(port);
 }
 
-int sosc::IntraServer::Accept(IntraConnection* client) {
+int sosc::IntraServer::Accept(IntraClient* client) {
     if(!this->server_open)
         return -1;
     
     TcpClient new_client;
     if(this->server.Accept(&new_client) == 0) {
-        *client = IntraConnection(new_client);
+        client->Open(new_client);
         return 0;
     } else
         return -1;
diff --git a/server/src/sock/intrasock.hpp b/server/src/sock/intrasock.hpp
index a9121b7..3e79342 100644
--- a/server/src/sock/intrasock.hpp
+++ b/server/src/sock/intrasock.hpp
@@ -5,9 +5,10 @@
 #include "packet.hpp"
 
 namespace sosc {
-class IntraConnection {
+class IntraClient {
 public:
-    IntraConnection();
+    IntraClient();
+    bool Open(std::string host, uint16_t port);
     
     int Receive(Packet* packet, bool block = false);
     bool Send(const Packet& packet);
@@ -21,9 +22,9 @@ public:
         this->client.Close();
     }
     
-    ~IntraConnection();
+    ~IntraClient();
 private:
-    IntraConnection(TcpClient client);
+    void Open(TcpClient client);
     
     bool client_open;
     TcpClient client;
@@ -37,7 +38,7 @@ public:
     IntraServer();
     
     bool Listen(uint16_t port);
-    int Accept(IntraConnection* client);
+    int Accept(IntraClient* client);
     
     inline bool IsOpen() const {
         return this->server_open;
diff --git a/server/src/sock/scapesock.hpp b/server/src/sock/scapesock.hpp
index 096d0e1..a3accc1 100644
--- a/server/src/sock/scapesock.hpp
+++ b/server/src/sock/scapesock.hpp
@@ -23,7 +23,7 @@ public:
     
     ~ScapeConnection();
 private:
-    ScapeConnection(TcpClient client);
+    void Open(TcpClient client);
     
     bool client_open;
     TcpClient client;
diff --git a/server/src/sock/tcpsock.hpp b/server/src/sock/tcpsock.hpp
index 6900612..31ca44c 100644
--- a/server/src/sock/tcpsock.hpp
+++ b/server/src/sock/tcpsock.hpp
@@ -43,7 +43,7 @@ namespace sosc {
 class TcpClient {
 public:
     TcpClient();
-    bool Open(std::string host, std::uint16_t port);
+    bool Open(std::string host, uint16_t port);
     
     int Receive(std::string* str, int flags = 0);
     int Send(const std::string& str);