diff --git a/src/main/java/com/application/DB/DB.java b/src/main/java/com/application/DB/DB.java
index a2fbb8f3dbb704a512cf8a9bb13eae76a0273d42..585c474a4cec65409405d0206184fe4fa718ec0b 100644
--- a/src/main/java/com/application/DB/DB.java
+++ b/src/main/java/com/application/DB/DB.java
@@ -159,26 +159,27 @@ public class DB {
                 String formatedTimeStamp = getDateFormat().format(timeStamp);
 
                 // Checks for negative values,
-                if(variantValue > 0){
+                if(variantValue > 0 && variantValue < 5000000){
                     // Adding the data to a list in order to sort through later
                     data.put(formatedTimeStamp, variantValue);
                 }
                 //System.out.printf("Timestamp: \t%s\t\t\tkWh: \t%s\t\t\tBaseline: %s\n",formatedTimeStamp,variantValue,baseline);
                 // Checks if the data is empty
                 }
-            if(!data.isEmpty()) {
-                finalResults.put(index,data);
+            NavigableMap<String, Number> sortedData = new TreeMap<>(data);
+            if(!sortedData.isEmpty()) {
+                finalResults.put(index,sortedData);
                 index += 1;
             }
         }
         // Defining a treemap to sort through the data
         NavigableMap<Integer, Map> sortedFinalResults = new TreeMap<>(finalResults);
 
-/*
+
         for (Map.Entry<Integer, Map> entry : sortedFinalResults.entrySet()) {
             System.out.printf("Timestamp: \t%s\t\t\tkWh: \t%s\n",entry.getKey(),entry.getValue());
         }
- */
+
         return sortedFinalResults;
     }
 
@@ -259,7 +260,7 @@ public class DB {
         // Retrieves the results from the queryjob
         TableResult result = queryJob.getQueryResults();
 
-        System.out.println("InTidTork\t\t\tUtTidTork");
+        //System.out.println("InTidTork\t\t\tUtTidTork");
 
         // Iterating through the results
         for (FieldValueList row : result.iterateAll()) {
diff --git a/src/main/java/com/application/Main.java b/src/main/java/com/application/Main.java
index ae1c2ea0eb32cda8b92ad95a8ddacd5e498d615d..6da5ee776e73e68abe7095e3abb95efb2e0767ef 100644
--- a/src/main/java/com/application/Main.java
+++ b/src/main/java/com/application/Main.java
@@ -269,16 +269,35 @@ public class Main extends Application {
 
         final LineChart<String, Number> lineChart = new LineChart<>(xAxis, yAxis);
 
-        lineChart.setTitle("Drying Process");
+        lineChart.setTitle("Drying Processes");
 
-        Map<String, Number> kwh  = null;// = DB.getKwh();
-        Map<String, Number> sortedKwh = new TreeMap<>(kwh);
+        Map<Integer, Map> kWh = DB.getKwh();
 
-        XYChart.Series series1 = new XYChart.Series();
-        series1.setName("Drying 1");
-        sortedKwh.forEach((key, value) -> series1.getData().add(new XYChart.Data(key,value)));
 
-        lineChart.getData().add(series1);
+        for (Map.Entry<Integer, Map> entryKwh : kWh.entrySet()) {
+            Map data = entryKwh.getValue();
+
+            XYChart.Series series = new XYChart.Series();
+            for (Object entryData : data.entrySet()){
+                //System.out.println("data: \t\t"+entryData);
+                String entryString = entryData.toString();
+                String[] arr = entryString.split("=");
+                String date = arr[0];
+                int kwhValue = Integer.parseInt(arr[1]);
+
+                System.out.printf("Date: \t%s\t\t\tkWh: \t%s\n",date,kwhValue);
+
+                // Connect the data to a series
+                series.getData().add(new XYChart.Data(date,kwhValue));
+            }
+            lineChart.getData().add(series);
+            System.out.println("\n\nNew line\n\n");
+        }
+/*
+        for (Map.Entry<Integer, Map> entryKwh : kWh.entrySet()) {
+            System.out.printf("Index: \t%s\t\t\tkWh: \t%s\n",entryKwh.getKey(),entryKwh.getValue());
+        }
+ */
         return lineChart;
     }
 }
diff --git a/target/classes/com/application/DB/DB.class b/target/classes/com/application/DB/DB.class
index b744148f8c96704565f96a5c617d656f3f84964e..b043ea6f9c7d141f62c4802fae9187a01698bd52 100644
Binary files a/target/classes/com/application/DB/DB.class and b/target/classes/com/application/DB/DB.class differ
diff --git a/target/classes/com/application/Main.class b/target/classes/com/application/Main.class
index 176a777b3e7297135d46851c11538e0bf6703743..b9a0b1c909958ed7e95a60800e7fa3918561a1d6 100644
Binary files a/target/classes/com/application/Main.class and b/target/classes/com/application/Main.class differ