diff --git a/Makefile b/Makefile
index 964b68c..e8f7300 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 #    By: vavaas <vvaas@student.42.fr>               +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2023/08/09 15:08:49 by vavaas            #+#    #+#              #
-#    Updated: 2024/01/21 10:12:04 by maldavid         ###   ########.fr        #
+#    Updated: 2024/01/21 11:41:25 by maldavid         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -15,6 +15,9 @@ NAME	= ircserv
 SRCS	= srcs/core/main.cpp \
 		  srcs/core/logs.cpp  \
 		  srcs/core/server.cpp  \
+		  srcs/core/client.cpp  \
+		  srcs/core/channel.cpp  \
+		  srcs/core/message.cpp  \
 		  srcs/utils/ansi.cpp  \
 
 OBJ_DIR	= objs
diff --git a/includes/channel.hpp b/includes/channel.hpp
index c073b99..921a218 100644
--- a/includes/channel.hpp
+++ b/includes/channel.hpp
@@ -6,7 +6,7 @@
 /*   By: maldavid <kbz_8.dev@akel-engine.com>       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/01/21 10:34:25 by maldavid          #+#    #+#             */
-/*   Updated: 2024/01/21 10:35:49 by maldavid         ###   ########.fr       */
+/*   Updated: 2024/01/21 11:41:51 by maldavid         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,6 +18,9 @@ namespace irc
 	class Channel
 	{
 		public:
+			Channel();
+
+			~Channel();
 
 		private:
 	};
diff --git a/includes/message.hpp b/includes/message.hpp
new file mode 100644
index 0000000..21c5af6
--- /dev/null
+++ b/includes/message.hpp
@@ -0,0 +1,35 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   message.hpp                                        :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: maldavid <kbz_8.dev@akel-engine.com>       +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/01/21 11:35:21 by maldavid          #+#    #+#             */
+/*   Updated: 2024/01/21 11:39:56 by maldavid         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef __MESSAGE__
+#define __MESSAGE__
+
+#include <string>
+#include <unstd/shared_ptr.hpp>
+
+namespace irc
+{
+	class Message
+	{
+		public:
+			Message(unstd::SharedPtr<class Client> client, const std::string& msg);
+
+			~Message();
+
+		private:
+			const std::string _raw_msg;
+			std::string _command;
+			unstd::SharedPtr<class Client> _client;
+	};
+}
+
+#endif
diff --git a/srcs/core/message.cpp b/srcs/core/message.cpp
new file mode 100644
index 0000000..5f7c2ff
--- /dev/null
+++ b/srcs/core/message.cpp
@@ -0,0 +1,24 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   message.cpp                                        :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: maldavid <kbz_8.dev@akel-engine.com>       +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/01/21 11:38:34 by maldavid          #+#    #+#             */
+/*   Updated: 2024/01/21 11:40:56 by maldavid         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include <message.hpp>
+#include <client.hpp>
+
+namespace irc
+{
+	Message::Message(unstd::SharedPtr<class Client> client, const std::string& msg) : _raw_msg(msg), _client(client)
+	{
+
+	}
+	
+	Message::~Message() {}
+}