diff --git a/EHEC_Server/EHEC_Server/EHEC_Server.csproj b/EHEC_Server/EHEC_Server/EHEC_Server.csproj
index 9b5a5f0..020e69d 100644
--- a/EHEC_Server/EHEC_Server/EHEC_Server.csproj
+++ b/EHEC_Server/EHEC_Server/EHEC_Server.csproj
@@ -166,11 +166,7 @@
     </Compile>
     <Compile Include="cluster_dependencies\ClusterConverter.cs" />
     <Compile Include="cluster_dependencies\JsonConverter.cs" />
-    <Compile Include="cluster_dependencies\JsonModel.cs" />
-    <Compile Include="cluster_dependencies\Models\Cluster.cs" />
-    <Compile Include="cluster_dependencies\Models\ClusterOrigin.cs" />
-    <Compile Include="cluster_dependencies\Models\ClusterPatient.cs" />
-    <Compile Include="cluster_dependencies\Models\ClusterResult.cs" />
+    <Compile Include="cluster_dependencies\Models\ClusterModel.cs" />
     <Compile Include="cluster_dependencies\Models\Edges.cs" />
     <Compile Include="cluster_dependencies\Models\Nodes.cs" />
     <Compile Include="DatabaseAccess\Doctor.cs" />
diff --git a/EHEC_Server/EHEC_Server/cluster.aspx.cs b/EHEC_Server/EHEC_Server/cluster.aspx.cs
index 7705d02..77d1da4 100644
--- a/EHEC_Server/EHEC_Server/cluster.aspx.cs
+++ b/EHEC_Server/EHEC_Server/cluster.aspx.cs
@@ -1,4 +1,5 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
@@ -13,11 +14,11 @@ namespace EHEC_Server
         ClusterConverter cc = new ClusterConverter();
         protected void Page_Load(object sender, EventArgs e)
         {
-            Clusterdata = cc.WriteJson();
+            Clusterdata = JsonConvert.SerializeObject(cc.WriteJson());
         }
         protected void Button1_Click(object sender, EventArgs e)
         {
-            Clusterdata = cc.WriteJson();
+            Clusterdata = JsonConvert.SerializeObject(cc.WriteJson());
         }
 
     }
diff --git a/EHEC_Server/EHEC_Server/cluster_dependencies/ClusterConverter.cs b/EHEC_Server/EHEC_Server/cluster_dependencies/ClusterConverter.cs
index 9838920..da01f2f 100644
--- a/EHEC_Server/EHEC_Server/cluster_dependencies/ClusterConverter.cs
+++ b/EHEC_Server/EHEC_Server/cluster_dependencies/ClusterConverter.cs
@@ -4,42 +4,42 @@ using System.Linq;
 using System.Web;
 using EHEC_Server;
 using System.Web.Script.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+using Newtonsoft.Json.Linq;
 
 namespace EHEC_Server
 {
     public class ClusterConverter
     {
         protected string Json { get; set; }
-        public string WriteJson()
+        public JObject WriteJson()
         {
-            var Json = JsonConverter.Serialize(GetCluster());
+            var serializer = new JsonSerializer
+            {
+                ContractResolver = new CamelCasePropertyNamesContractResolver()
+            };
+            var Json = JObject.FromObject(GetCluster(), serializer);
             //ClusterPatient p = new ClusterPatient();
             //List<ClusterPatient> clusterPatientsList = new List<ClusterPatient>();
             //clusterPatientsList = p.GetClusterPatients();
             //ClusterResult r = new ClusterResult();
             //List<ClusterResult> clusterResultsList = new List<ClusterResult>();
             //clusterResultsList = r.GetClusterResults();
-            System.IO.File.WriteAllText(@"C: \Users\novski\Desktop\cluster.json", Json);
+            System.IO.File.WriteAllText(@"C: \Users\novski\Desktop\cluster.json", JsonConvert.SerializeObject(Json));
             return Json; //= JsonConverter.Serialize(clusterPatientsList);
             
         }
-        private Cluster GetCluster()
+        private ClusterModel GetCluster()
         {
-            return new Cluster
+            Node node = new Node();
+            Edge edge = new Edge();
+            return new ClusterModel
             {
                 Comment = "some comment",
-                Nodes = new List<Node>
-                {
-                    new Node
-                    {
-                        Node get = new Node();
-                        List <Node> xs = new List<Node>();
-                        
-                    }
-                    Nodes.add(getClusterPatients()) // irrgend sowas...
-                    
-                }
-    
+                Nodes = node.GetNodes(),
+                Edges = edge.GetEdges(),
+
             };
         }
     }
diff --git a/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterModel.cs b/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterModel.cs
index f1241a3..eda0343 100644
--- a/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterModel.cs
+++ b/EHEC_Server/EHEC_Server/cluster_dependencies/Models/ClusterModel.cs
@@ -9,6 +9,6 @@ namespace EHEC_Server
     {
         public string Comment { get; set; }
         public List<Node> Nodes { get; set; }
-        public List<Edges> Edges { get; set; }
+        public List<Edge> Edges { get; set; }
     }
 }
\ No newline at end of file
diff --git a/EHEC_Server/EHEC_Server/cluster_dependencies/Models/Edges.cs b/EHEC_Server/EHEC_Server/cluster_dependencies/Models/Edges.cs
index 8031b97..37cda09 100644
--- a/EHEC_Server/EHEC_Server/cluster_dependencies/Models/Edges.cs
+++ b/EHEC_Server/EHEC_Server/cluster_dependencies/Models/Edges.cs
@@ -5,22 +5,28 @@ using System.Web;
 
 namespace EHEC_Server
 {
-    public class Edges
+    public class Edge
     {
         public int Source { get; set; }
         public int Target { get; set; }
         public string Edgetype { get; set; }
-        public Edges() { }
-        
-        public List<Edges> GetClusterRelationsPatientsOrigins()
+        public Edge() { }
+        public List<Edge> GetEdges()
+        {
+            List<Edge> X = new List<Edge>();
+            X.AddRange(GetClusterRelationsPatientsOrigins());
+            X.AddRange(GetClusterRelationsPatientsResults());
+            return X;
+        }
+        public List<Edge> GetClusterRelationsPatientsOrigins()
         {
             Exam exam = new Exam();
             List<Exam> exams = new List<Exam>();
             exams = exam.GetAllExams();
-            List<Edges> clusterEdges = new List<Edges>();
+            List<Edge> clusterEdges = new List<Edge>();
             foreach (Exam element in exams)
             {
-                Edges clusterEdge = new Edges
+                Edge clusterEdge = new Edge
                 {
                     Edgetype = "Angesteckt in ",
                     Source = element.PatientId,
@@ -30,15 +36,15 @@ namespace EHEC_Server
             }
             return clusterEdges;
         }
-        public List<Edges> GetClusterRelationsPatientsResults()
+        public List<Edge> GetClusterRelationsPatientsResults()
         {
             Exam exam = new Exam();
             List<Exam> exams = new List<Exam>();
             exams = exam.GetAllExams();
-            List<Edges> clusterEdges = new List<Edges>();
+            List<Edge> clusterEdges = new List<Edge>();
             foreach (Exam element in exams)
             {
-                Edges clusterEdge = new Edges
+                Edge clusterEdge = new Edge
                 {
                     Edgetype = "Wurde Angesteckt mit ",
                     Source = element.PatientId,