diff --git a/src/main/java/net/floodlightcontroller/core/internal/SwitchStorageImpl.java b/src/main/java/net/floodlightcontroller/core/internal/SwitchStorageImpl.java
new file mode 100644
index 0000000..114803b
--- /dev/null
+++ b/src/main/java/net/floodlightcontroller/core/internal/SwitchStorageImpl.java
@@ -0,0 +1,165 @@
+package net.floodlightcontroller.core.internal;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.openflow.protocol.OFPhysicalPort;
+
+import com.thinkaurelius.titan.core.TitanException;
+import com.thinkaurelius.titan.core.TitanFactory;
+import com.thinkaurelius.titan.core.TitanGraph;
+import com.tinkerpop.blueprints.Direction;
+import com.tinkerpop.blueprints.TransactionalGraph.Conclusion;
+import com.tinkerpop.blueprints.Edge;
+import com.tinkerpop.blueprints.Vertex;
+import net.floodlightcontroller.core.ISwitchStorage;
+
+public class SwitchStorageImpl implements ISwitchStorage {
+	public TitanGraph graph;
+
+	@Override
+	public void update(String dpid, SwitchState state, DM_OPERATION op) {
+		// TODO Auto-generated method stub
+        switch(op) {
+
+        	case UPDATE:
+        	case INSERT:
+        	case CREATE:
+                addSwitch(dpid);
+                if (state != SwitchState.ACTIVE) {
+                	setStatus(dpid, state);
+                }
+                break;
+        	case DELETE:
+                deleteSwitch(dpid);
+                break;
+        	default:
+        }
+	}
+
+	private void setStatus(String dpid, SwitchState state) {
+		// TODO Auto-generated method stub
+		Vertex sw;
+		try {
+            if ((sw = graph.getVertices("dpid",dpid).iterator().next()) != null) {
+            	sw.setProperty("state",state);
+            	graph.stopTransaction(Conclusion.SUCCESS);
+            }
+		} catch (TitanException e) {
+             // TODO: handle exceptions
+		}
+            	
+		
+	}
+
+	@Override
+	public void addPort(String dpid, OFPhysicalPort port) {
+		// TODO Auto-generated method stub
+		Vertex sw;
+		try {
+            if ((sw = graph.getVertices("dpid",dpid).iterator().next()) != null) {
+            	// TODO: Check if port exists
+            	Vertex p = graph.addVertex(null);
+            	p.setProperty("number",port.getPortNumber());
+            	p.setProperty("state",port.getState());
+            	p.setProperty("desc",port.getName());
+            	Edge e = graph.addEdge(null, sw, p, "on");
+            	e.setProperty("state","ACTIVE");
+            	e.setProperty("number", port.getPortNumber());
+            	
+            	graph.stopTransaction(Conclusion.SUCCESS);
+            }
+		} catch (TitanException e) {
+             // TODO: handle exceptions
+		}	
+
+	}
+
+	@Override
+	public Collection<OFPhysicalPort> getPorts(long dpid) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public OFPhysicalPort getPort(String dpid, short portnum) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public OFPhysicalPort getPort(String dpid, String portName) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void addSwitch(String dpid) {
+		
+        try {
+            if (graph.getVertices("dpid",dpid).iterator().hasNext()) {
+                    /*
+                     *  Do nothing or throw exception?
+                     */
+            } else {
+                    Vertex sw = graph.addVertex(null);
+
+                    sw.setProperty("type","switch");
+                    sw.setProperty("dpid", dpid);
+                    sw.setProperty("state",SwitchState.ACTIVE);
+                    graph.stopTransaction(Conclusion.SUCCESS);
+            }
+    } catch (TitanException e) {
+            /*
+             * retry till we succeed?
+             */
+    }
+
+
+	}
+
+	@Override
+	public void deleteSwitch(String dpid) {
+		// TODO Setting inactive but we need to eventually remove data
+		setStatus(dpid, SwitchState.INACTIVE);
+
+	}
+
+	@Override
+	public void deletePort(String dpid, short port) {
+		// TODO Auto-generated method stub
+		Vertex sw;
+		try {
+            if ((sw = graph.getVertices("dpid",dpid).iterator().next()) != null) {
+            	// TODO: Check if port exists
+            	Vertex p = sw.query().direction(Direction.OUT).labels("on").has("number",port).vertices().iterator().next();
+            	graph.removeVertex(p);
+            	graph.stopTransaction(Conclusion.SUCCESS);
+            }
+		} catch (TitanException e) {
+             // TODO: handle exceptions
+		}	
+
+
+	}
+
+	@Override
+	public void deletePort(String dpid, String portName) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public List<String> getActiveSwitches() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void init(String conf) {
+        graph = TitanFactory.open(conf);
+        graph.createKeyIndex("dpid", Vertex.class);
+
+	}
+
+}