diff --git a/includes/server/AResource.hpp b/includes/server/AResource.hpp
index 43f757e..a8150ed 100644
--- a/includes/server/AResource.hpp
+++ b/includes/server/AResource.hpp
@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/04/29 14:20:09 by mmoussou          #+#    #+#             */
-/*   Updated: 2025/05/12 19:05:51 by adjoly           ###   ########.fr       */
+/*   Updated: 2025/05/13 09:56:02 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,12 +18,17 @@
 namespace webserv {
 namespace server {
 
+enum	clientResType {
+	CGI,
+	UP_FILE
+};
+
 class AClientResource {
 public:
 	virtual			~AClientResource() {}
 
 	bool	operator==(int i) const {
-		if (i == _client_id)
+		if (i == _res_id)
 			return true;
 		return false;
 	}
@@ -31,10 +36,12 @@ public:
 	void			addFileDescriptor(struct pollfd fd);
 	struct pollfd	getFileDescriptor();
 
-private:
+	virtual	clientResType type(void);
+
+protected:
 	struct pollfd	_fd;
 
-	int	_client_id;
+	int	_res_id;
 
 };
 
diff --git a/includes/server/ResourceManager.hpp b/includes/server/ResourceManager.hpp
index 432914f..8096221 100644
--- a/includes/server/ResourceManager.hpp
+++ b/includes/server/ResourceManager.hpp
@@ -6,13 +6,15 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/05/12 17:13:39 by adjoly            #+#    #+#             */
-/*   Updated: 2025/05/12 19:06:28 by adjoly           ###   ########.fr       */
+/*   Updated: 2025/05/13 09:55:45 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #pragma once
 
+#include <algorithm>
 #include <sstream>
+#include <stdexcept>
 #include <vector>
 
 #include <cppeleven.hpp>
@@ -25,22 +27,45 @@ namespace server {
 
 class ResourceManager {
   public:
-	static AClientResource *get(int i) {
-		for (auto it = range(_res)) {
-			if ((**it) == i) {
-				return *it;
-			}
-		}
-		std::stringstream str;
-		str << "resource not found for client";
-		str << i;
-		_log->debug(str.str());
-		return not_nullptr;
+	/**
+	 *	@brief	Can be used to get a resource correcponding to the id of the
+	 *			resource
+	 *
+	 *	@param	The id of the resource
+	 *
+	 *	@return	The resource
+	 *	@throw	std::out_of_range If the resource does not exist
+	 */
+	static AClientResource *get(int id) {
+		auto it = std::find(_res.begin(), _res.end(), id);
+
+		if (it != _res.end())
+			return (*it);
+		throw std::out_of_range("resource does not exist for client D:");
 	}
+
+	/**
+	 *	@brief	Can be used to append a resource to the ResourceManager
+	 *
+	 *	@param	The resource to add
+	 */
 	static void append(AClientResource *new_client) {
 		_res.push_back(new_client);
 	}
 
+	/**
+	 *	@brief	Can be used to remove a resource by giving it it's id
+	 *
+	 *	@param	The id of the resource to remove
+	 */
+	static void remove(int id) {
+		auto it = std::find(_res.begin(), _res.end(), id);
+		
+		if (it != _res.end())
+			delete (*it);
+		// TODO throw or not - to see
+	}
+
   protected:
   private:
 	static std::vector<AClientResource *> _res;