diff --git a/current/algorithms/rust_algo/src/graph.rs b/current/algorithms/rust_algo/src/graph.rs
new file mode 100644
index 0000000..8c8d5fe
--- /dev/null
+++ b/current/algorithms/rust_algo/src/graph.rs
@@ -0,0 +1,38 @@
+use std::iter::Map;
+use std::collections::HashMap;
+
+pub struct Vertex {
+    id: usize,
+    name: String
+}
+
+pub struct Graph {
+    vertices: HashMap<usize, Vertex>,
+    edges: HashMap<usize, Vec<usize>>
+}
+
+impl Graph {
+    pub fn new() -> Self {
+        return Graph { vertices: HashMap::new(), edges: HashMap::new() }
+    }
+
+    pub fn add_node(&mut self, vid: usize, name: String) {
+        let v = Vertex { id: vid, name: name };
+        self.vertices.insert(vid, v);
+    }
+
+    pub fn connect(&mut self, i: usize, j: usize) {
+        let res = self.edges.get_mut(&i);
+        match res {
+            Some(l) => {
+                l.push(j)
+            },
+            None => {}
+        }
+    }
+
+    pub fn DFS(&self, i: usize, j: usize) {
+
+    }
+}
+
diff --git a/current/algorithms/rust_algo/src/main.rs b/current/algorithms/rust_algo/src/main.rs
index 6342d68..5611423 100644
--- a/current/algorithms/rust_algo/src/main.rs
+++ b/current/algorithms/rust_algo/src/main.rs
@@ -1,7 +1,11 @@
-use std::cell::RefCell;
-use std::rc::Rc;
+// use std::cell::RefCell;
+// use std::rc::Rc;
+mod graph;
+use graph::Graph;
+// use std::collections::HashMap;
+// use std::iter::Map;
 // use std::borrow::BorrowMut;
-
+/*
 struct Vertex {
     name: String,
     edges: RefCell<Vec<Vertex>>
@@ -25,7 +29,7 @@ impl Graph {
     }
 
     
-    fn connect(&mut self, i: usize, j: usize) {
+    fn connect(&mut self, i: usize, _j: usize) {
         // let nodej = Rc::clone(&self.vertices[j]);
         // let nodei = Rc::clone(&self.vertices[i]);
         // nodei.into_inner();
@@ -36,13 +40,14 @@ impl Graph {
         // let mut edges_new = self.vertices[i].edges.get_mut();
         // let inner = self.vertices[j].take();
         // self.vertices[i].get_mut().edges.borrow_mut().push(inner);
-        let list = self.vertices[i].get_mut().edges.clone();
+        // let list = self.vertices[i].get_mut().edges.clone();
         self.vertices[i].get_mut().edges.replace(vec![]);
     }
     
 }
-
+*/
 fn main() {
+    /*
     let mut g = Graph::new();
     g.add_node(String::from("Vertice #1"));
     g.add_node(String::from("Vertice #2"));
@@ -52,4 +57,11 @@ fn main() {
     g.connect(1, 2);
 
     println!("Done, Vertices count: {}.", g.vertices_count());
+    */
+    let mut g = Graph::new();
+    g.add_node(1, String::from("Node #1"));
+    g.add_node(2, String::from("Node #2"));
+    g.add_node(3, String::from("Node #3"));
+    g.connect(1,2);
+    g.connect(2,3);
 }