diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 1e7a5ed..80bbd78 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -12,7 +12,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -static")
 endif()
     
-add_executable(server ${server_src} src/db/_init_sql.cpp)
+add_executable(server ${server_src} src/db/_init_sql.hpp)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
     target_link_libraries(server wsock32 ws2_32)
diff --git a/server/src/db/_init_sql.cpp b/server/src/db/_init_sql.hpp
similarity index 95%
rename from server/src/db/_init_sql.cpp
rename to server/src/db/_init_sql.hpp
index 1f9f0ba..7fae755 100644
--- a/server/src/db/_init_sql.cpp
+++ b/server/src/db/_init_sql.hpp
@@ -1,3 +1,6 @@
+#ifndef SOSC_INIT_SQL_DEF
+#define SOSC_INIT_SQL_DEF
+
 #include <vector>
 
 const char* _mem_db_sql =
@@ -41,4 +44,6 @@ const std::vector<const char*> _hard_db_sql = {
         "PRIMARY KEY(`USER_ID`)"
     ") WITHOUT ROWID;\n",
     /** END MIGRATION 0 **/
-};
\ No newline at end of file
+};
+
+#endif
\ No newline at end of file
diff --git a/server/src/db/database.cpp b/server/src/db/database.cpp
index c1f1ec8..2621563 100644
--- a/server/src/db/database.cpp
+++ b/server/src/db/database.cpp
@@ -1,5 +1,5 @@
 #include "database.hpp"
-#include "_init_sql.cpp"
+#include "_init_sql.hpp"
 
 static struct {
     bool ready = false;
diff --git a/server/src/db/database.hpp b/server/src/db/database.hpp
index 3195a41..ae33682 100644
--- a/server/src/db/database.hpp
+++ b/server/src/db/database.hpp
@@ -7,9 +7,6 @@
 #include <vector>
 #include <string>
 
-#define DB_COL_TEXT 1
-#define DB_COL_BLOB 2
-
 #define DB_USE_HARD   1
 #define DB_USE_MEMORY 2
 
diff --git a/server/src/hosts/master.hpp b/server/src/hosts/master.hpp
index ca5f00d..5fe1f6c 100644
--- a/server/src/hosts/master.hpp
+++ b/server/src/hosts/master.hpp
@@ -33,25 +33,27 @@ protected:
 
 class MasterIntra {
 public:
-    MasterIntra(const IntraClient& client);
+    explicit MasterIntra(const IntraClient& client);
     bool Process();
 
     bool Close();
     bool Close(const Packet& message);
 private:
     bool InitAttempt(Packet& pck);
+    bool Authentication(Packet& pck);
+    bool StatusUpdate(Packet& pck);
 
-    enum kSlaveToMasterId {
-        InitAttempt = 1,
-        Authentication,
-        StatusUpdate
+    enum SlaveToMasterId {
+        kInitAttempt = 1,
+        kAuthentication,
+        kStatusUpdate
     };
 
-    enum kMasterToSlaveId {
-        KeyExchange = 1,
-        EncryptionError,
-        PositiveAck,
-        NegativeAck
+    enum MasterToSlaveId {
+        kKeyExchange = 1,
+        kEncryptionError,
+        kPositiveAck,
+        kNegativeAck
     };
 
     IntraClient sock;
diff --git a/server/src/hosts/master_intra.cpp b/server/src/hosts/master_intra.cpp
index 64e1cc8..ab7d8a2 100644
--- a/server/src/hosts/master_intra.cpp
+++ b/server/src/hosts/master_intra.cpp
@@ -13,32 +13,36 @@ bool sosc::MasterIntra::Process() {
         return true;
 
     switch(pck.GetId()) {
-        case InitAttempt:
+        case kInitAttempt:
             return this->InitAttempt(pck);
-        case Authentication:
-
-            break;
-        case StatusUpdate:
-
-            break;
+        case kAuthentication:
+            return this->Authentication(pck);
+        case kStatusUpdate:
+            return this->StatusUpdate(pck);
         default:
             return this->Close();
     }
-
-    return true;
 }
 
 bool sosc::MasterIntra::InitAttempt(sosc::Packet &pck) {
     if(!pck.Check(1, key.key_size_bytes))
-        return this->Close(Packet(EncryptionError, { "\x01" }));
+        return this->Close(Packet(kEncryptionError, { "\x01" }));
 
     Packet response;
-    if(!this->key.ParseRequest(pck, &response, KeyExchange))
-        return this->Close(Packet(EncryptionError, { "\x02" }));
+    if(!this->key.ParseRequest(pck, &response, kKeyExchange))
+        return this->Close(Packet(kEncryptionError, { "\x02" }));
 
     this->sock.Send(response);
 }
 
+bool sosc::MasterIntra::Authentication(sosc::Packet &pck) {
+
+}
+
+bool sosc::MasterIntra::StatusUpdate(sosc::Packet &pck) {
+
+}
+
 bool sosc::MasterIntra::Close() {
     this->sock.Close();
     return false;