diff --git a/src/messageManager/Message.js b/src/messageManager/Message.js
index 23072c9..ad3fe86 100644
--- a/src/messageManager/Message.js
+++ b/src/messageManager/Message.js
@@ -1,7 +1,6 @@
 class Message {
     /**
      * @typedef {Object} MessageFields
-     * @property {import('crypto').UUID} uuid
      * @property {import('discord.js').Snowflake} serverId
      * @property {string|null} serverName
      * @property {import('discord.js').Snowflake} authorId
@@ -10,7 +9,6 @@ class Message {
      */
 
     constructor(){
-        this.uuid = require('crypto').randomUUID();
         this.serverId = 1;
         this.serverName = "[No Server]";
         this.authorId = 1;
@@ -36,7 +34,6 @@ class Message {
 
     toArray(){
         return {
-            uuid : this.uuid,
             serverId : this.serverId,
             serverName : this.serverName,
             authorId : this.authorId,
diff --git a/src/messageManager/client/discord/send.js b/src/messageManager/client/discord/send.js
index 0464eb7..8396901 100644
--- a/src/messageManager/client/discord/send.js
+++ b/src/messageManager/client/discord/send.js
@@ -7,7 +7,7 @@ const { EmbedBuilder } = require("@discordjs/builders");
  * @param {Message} message
  * @param {Client} discord 
  */
-const send = (message, database, channelId , discord) => {
+const send = (message, database, channelId , uuid , discord) => {
     discord.channels.cache?.get(channelId).send({
         embeds: [
             new EmbedBuilder()
@@ -23,6 +23,13 @@ const send = (message, database, channelId , discord) => {
         ]
     }).catch((error) => {
         console.log(`Unable to Send Message to Channel [${channelId}]`);
+    }).then((_message) => {
+        database.insert("xan.messageDelivery" ,{
+            channelId: channelId,
+            messageId : _message.id,
+            client: "discord",
+            link: uuid
+        }, (uuid) => {});
     });
 }
 
diff --git a/src/messageManager/messageManager.js b/src/messageManager/messageManager.js
index 5f1add4..0be28a9 100644
--- a/src/messageManager/messageManager.js
+++ b/src/messageManager/messageManager.js
@@ -10,11 +10,11 @@ const initMessageManager = async (
     database,
     discord
 ) => {
-    function postMessage(message){
+    function postMessage(message, uuid){
         database.list("xan.guilds" , {} , (list) => {
            for(var element of list){
 
-            if(element.client == "discord") discordSend(message , data , element.channelId , discord);
+            if(element.client == "discord") discordSend(message , database , element.channelId ,uuid , discord);
            } 
         });
     }
@@ -36,9 +36,9 @@ const initMessageManager = async (
                 _message.serverName = message.guild.name,
                 _message.message = message.content;
 
-                delete _message.uuid;
-
-                postMessage(_message.toArray());
+                database.insert("xan.messages" , _message.toArray() , (uuid) => {
+                    postMessage(_message.toArray(), uuid);
+                });
             }
         });
     });