diff --git a/src/graph/dfs.hpp b/src/graph/dfs.hpp
new file mode 100644
index 0000000..273e5ac
--- /dev/null
+++ b/src/graph/dfs.hpp
@@ -0,0 +1,252 @@
+#ifndef DFS_HPP
+#define DFS_HPP
+
+#include <algorithm>
+#include <concepts>
+#include <iostream>
+#include <stack>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+
+template <typename T>
+concept GraphNode = std::equality_comparable<T> && std::copy_constructible<T>;
+
+template <typename T>
+concept HashableNode = GraphNode<T> && requires(T x) {
+  { std::hash<T>{}(x) } -> std::convertible_to<std::size_t>;
+};
+
+template <HashableNode NodeType>
+class DFS {
+private:
+  using Graph = std::unordered_map<NodeType, std::vector<NodeType>>;
+  Graph adjacencyList;
+
+  void logVisit(const NodeType& node) const {
+    std::cout << "Visiting node: " << node << std::endl;
+  }
+
+  // Helper function for recursive DFS traversal
+  void traverseRecursive(const NodeType& node, std::unordered_map<NodeType, bool>& visited,
+                         std::vector<NodeType>& result) const {
+    visited[node] = true;
+    logVisit(node);
+    result.push_back(node);
+
+    if (auto it = adjacencyList.find(node); it != adjacencyList.end()) {
+      for (const auto& neighbor : it->second) {
+        if (!visited[neighbor]) {
+          std::cout << "Moving from " << node << " to " << neighbor << std::endl;
+          traverseRecursive(neighbor, visited, result);
+        }
+      }
+    }
+  }
+
+public:
+  void addEdge(const NodeType& from, const NodeType& to) {
+    adjacencyList[from].push_back(to);
+    // In the case of an isolated point, create an empty adjacent list
+    if (adjacencyList.find(to) == adjacencyList.end()) {
+      adjacencyList[to] = std::vector<NodeType>();
+    }
+  }
+
+  // Iterative DFS traversal using a stack
+  [[nodiscard]] std::vector<NodeType> traverse(const NodeType& start) const {
+    std::stack<NodeType> stack;
+    std::unordered_map<NodeType, bool> visited;
+    std::vector<NodeType> result;
+
+    std::cout << "Starting DFS traversal from node: " << start << std::endl;
+
+    stack.push(start);
+
+    while (!stack.empty()) {
+      NodeType current = stack.top();
+      stack.pop();
+
+      if (!visited[current]) {
+        logVisit(current);
+        result.push_back(current);
+        visited[current] = true;
+
+        if (auto it = adjacencyList.find(current); it != adjacencyList.end()) {
+          // Push neighbors in reverse order to process them in the original order
+          for (auto it2 = it->second.rbegin(); it2 != it->second.rend(); ++it2) {
+            const auto& neighbor = *it2;
+            if (!visited[neighbor]) {
+              std::cout << "Pushing " << neighbor << " to stack" << std::endl;
+              stack.push(neighbor);
+            }
+          }
+        }
+      }
+    }
+
+    return result;
+  }
+
+  // Recursive DFS traversal
+  [[nodiscard]] std::vector<NodeType> traverseRecursive(const NodeType& start) const {
+    std::unordered_map<NodeType, bool> visited;
+    std::vector<NodeType> result;
+
+    std::cout << "Starting recursive DFS traversal from node: " << start << std::endl;
+    traverseRecursive(start, visited, result);
+
+    return result;
+  }
+
+  // Find path using DFS (not necessarily the shortest)
+  [[nodiscard]] std::vector<NodeType> findPath(const NodeType& start, const NodeType& target) const {
+    std::stack<NodeType> stack;
+    std::unordered_map<NodeType, bool> visited;
+    std::unordered_map<NodeType, NodeType> parent;
+
+    std::cout << "Finding path from " << start << " to " << target << std::endl;
+
+    stack.push(start);
+    visited[start] = true;
+
+    bool found = false;
+    while (!stack.empty() && !found) {
+      NodeType current = stack.top();
+      stack.pop();
+
+      if (current == target) {
+        std::cout << "Target " << target << " found!" << std::endl;
+        found = true;
+        break;
+      }
+
+      if (auto it = adjacencyList.find(current); it != adjacencyList.end()) {
+        for (const auto& neighbor : it->second) {
+          if (!visited[neighbor]) {
+            stack.push(neighbor);
+            visited[neighbor] = true;
+            parent[neighbor] = current;
+          }
+        }
+      }
+    }
+
+    std::vector<NodeType> path;
+    if (found) {
+      NodeType current = target;
+      while (current != start) {
+        path.push_back(current);
+        current = parent[current];
+      }
+      path.push_back(start);
+      std::reverse(path.begin(), path.end());
+    }
+
+    return path;
+  }
+
+  // Detect cycles in the graph
+  [[nodiscard]] bool hasCycle() const {
+    std::unordered_map<NodeType, bool> visited;
+    std::unordered_map<NodeType, bool> inStack;
+
+    for (const auto& [node, _] : adjacencyList) {
+      if (!visited[node]) {
+        if (hasCycleUtil(node, visited, inStack)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
+private:
+  bool hasCycleUtil(const NodeType& node, std::unordered_map<NodeType, bool>& visited,
+                    std::unordered_map<NodeType, bool>& inStack) const {
+    visited[node] = true;
+    inStack[node] = true;
+
+    if (auto it = adjacencyList.find(node); it != adjacencyList.end()) {
+      for (const auto& neighbor : it->second) {
+        if (!visited[neighbor]) {
+          if (hasCycleUtil(neighbor, visited, inStack)) {
+            return true;
+          }
+        } else if (inStack[neighbor]) {
+          // If the neighbor is already in the recursion stack, we found a cycle
+          return true;
+        }
+      }
+    }
+
+    inStack[node] = false;  // Remove the node from recursion stack
+    return false;
+  }
+
+public:
+  // Topological sort (only works for DAGs)
+  [[nodiscard]] std::vector<NodeType> topologicalSort() const {
+    if (hasCycle()) {
+      std::cout << "Graph has a cycle, topological sort not possible" << std::endl;
+      return {};
+    }
+
+    std::unordered_map<NodeType, bool> visited;
+    std::stack<NodeType> stack;
+    std::vector<NodeType> result;
+
+    for (const auto& [node, _] : adjacencyList) {
+      if (!visited[node]) {
+        topologicalSortUtil(node, visited, stack);
+      }
+    }
+
+    while (!stack.empty()) {
+      result.push_back(stack.top());
+      stack.pop();
+    }
+
+    return result;
+  }
+
+private:
+  void topologicalSortUtil(const NodeType& node, std::unordered_map<NodeType, bool>& visited,
+                          std::stack<NodeType>& stack) const {
+    visited[node] = true;
+
+    if (auto it = adjacencyList.find(node); it != adjacencyList.end()) {
+      for (const auto& neighbor : it->second) {
+        if (!visited[neighbor]) {
+          topologicalSortUtil(neighbor, visited, stack);
+        }
+      }
+    }
+
+    // All descendants processed, push current node to stack
+    stack.push(node);
+  }
+
+public:
+  [[nodiscard]] size_t countConnectedComponents() const {
+    std::unordered_set<NodeType> unvisited;
+    for (const auto& [node, _] : adjacencyList) {
+      unvisited.insert(node);
+    }
+
+    size_t components = 0;
+    while (!unvisited.empty()) {
+      NodeType start = *unvisited.begin();
+      std::cout << "Starting new component exploration from node: " << start << std::endl;
+      auto visited = traverse(start);
+      for (const auto& node : visited) {
+        unvisited.erase(node);
+      }
+      components++;
+    }
+
+    return components;
+  }
+};
+
+#endif  // DFS_HPP
diff --git a/tests/graph/dfs_test.cpp b/tests/graph/dfs_test.cpp
new file mode 100644
index 0000000..5880c36
--- /dev/null
+++ b/tests/graph/dfs_test.cpp
@@ -0,0 +1,138 @@
+#include "../src/graph/dfs.hpp"
+
+#include <gtest/gtest.h>
+
+TEST(DFSTest, BasicTraversal) {
+  DFS<int> dfs;
+
+  dfs.addEdge(0, 1);
+  dfs.addEdge(0, 2);
+  dfs.addEdge(2, 3);
+  dfs.addEdge(2, 4);
+
+  auto result = dfs.traverse(0);
+
+  ASSERT_EQ(result.size(), 5);
+  EXPECT_EQ(result[0], 0);
+  // DFS will go deep first, so we expect a different order than BFS
+  EXPECT_TRUE((result[1] == 1 && result[2] == 2) || (result[1] == 2 && result[3] == 3));
+}
+
+TEST(DFSTest, RecursiveTraversal) {
+  DFS<int> dfs;
+
+  dfs.addEdge(0, 1);
+  dfs.addEdge(0, 2);
+  dfs.addEdge(2, 3);
+  dfs.addEdge(2, 4);
+
+  auto result = dfs.traverseRecursive(0);
+
+  ASSERT_EQ(result.size(), 5);
+  EXPECT_EQ(result[0], 0);
+  // The recursive DFS should follow the order of adjacency list
+}
+
+TEST(DFSTest, FindPath) {
+  DFS<int> dfs;
+
+  // Add an edge as an unoriented graph
+  dfs.addEdge(0, 1);
+  dfs.addEdge(1, 0);
+  dfs.addEdge(0, 2);
+  dfs.addEdge(2, 0);
+  dfs.addEdge(0, 3);
+  dfs.addEdge(3, 0);
+  dfs.addEdge(2, 3);
+  dfs.addEdge(3, 2);
+
+  auto path = dfs.findPath(1, 3);
+
+  ASSERT_GT(path.size(), 0);
+  EXPECT_EQ(path[0], 1);
+  EXPECT_EQ(path[path.size() - 1], 3);
+}
+
+TEST(DFSTest, CycleDetection) {
+  DFS<int> dfs1;
+
+  // Create a graph with a cycle
+  dfs1.addEdge(0, 1);
+  dfs1.addEdge(1, 2);
+  dfs1.addEdge(2, 0);
+
+  EXPECT_TRUE(dfs1.hasCycle());
+
+  DFS<int> dfs2;
+
+  // Create a graph without a cycle (DAG)
+  dfs2.addEdge(0, 1);
+  dfs2.addEdge(0, 2);
+  dfs2.addEdge(1, 3);
+  dfs2.addEdge(2, 3);
+
+  EXPECT_FALSE(dfs2.hasCycle());
+}
+
+TEST(DFSTest, TopologicalSort) {
+  DFS<int> dfs;
+
+  // Create a DAG
+  dfs.addEdge(5, 2);
+  dfs.addEdge(5, 0);
+  dfs.addEdge(4, 0);
+  dfs.addEdge(4, 1);
+  dfs.addEdge(2, 3);
+  dfs.addEdge(3, 1);
+
+  auto result = dfs.topologicalSort();
+
+  ASSERT_EQ(result.size(), 6);
+  
+  // Check that for each edge (u, v), u comes before v in the topological sort
+  std::unordered_map<int, int> position;
+  for (size_t i = 0; i < result.size(); ++i) {
+    position[result[i]] = i;
+  }
+  
+  EXPECT_LT(position[5], position[2]);
+  EXPECT_LT(position[5], position[0]);
+  EXPECT_LT(position[4], position[0]);
+  EXPECT_LT(position[4], position[1]);
+  EXPECT_LT(position[2], position[3]);
+  EXPECT_LT(position[3], position[1]);
+}
+
+TEST(DFSTest, ConnectedComponents) {
+  DFS<int> dfs;
+
+  // As an undirected graph, follow the edges
+  dfs.addEdge(0, 1);
+  dfs.addEdge(1, 0);
+  dfs.addEdge(1, 2);
+  dfs.addEdge(2, 1);
+
+  dfs.addEdge(3, 4);
+  dfs.addEdge(4, 3);
+
+  // Isolated points are also tracked
+  dfs.addEdge(5, 5);
+
+  EXPECT_EQ(dfs.countConnectedComponents(), 3);
+}
+
+TEST(DFSTest, CustomNodeType) {
+  DFS<std::string> dfs;
+
+  dfs.addEdge("A", "B");
+  dfs.addEdge("B", "A");
+  dfs.addEdge("B", "C");
+  dfs.addEdge("C", "B");
+
+  auto result = dfs.traverse("A");
+
+  ASSERT_EQ(result.size(), 3);
+  EXPECT_EQ(result[0], "A");
+  // The order may vary depending on the implementation
+  EXPECT_TRUE((result[1] == "B" && result[2] == "C") || (result[1] == "C" && result[2] == "B"));
+}