diff --git a/src/java/com/wasteinformationserver/website/datarequests/DataRequest.java b/src/java/com/wasteinformationserver/website/datarequests/DataRequest.java
deleted file mode 100644
index 6d6e67f..0000000
--- a/src/java/com/wasteinformationserver/website/datarequests/DataRequest.java
+++ /dev/null
@@ -1,210 +0,0 @@
-package com.wasteinformationserver.website.datarequests;
-
-import com.wasteinformationserver.basicutils.Info;
-import com.wasteinformationserver.basicutils.Log;
-import com.wasteinformationserver.db.JDBC;
-import com.wasteinformationserver.website.basicrequest.PostRequest;
-
-import java.io.IOException;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.SQLIntegrityConstraintViolationException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-
-public class DataRequest extends PostRequest {
-    @Override
-    public String request(HashMap<String, String> params) {
-        StringBuilder sb = new StringBuilder();
-        ResultSet set = null;
-        int status = -1;
-
-        JDBC jdbc;
-        try {
-            jdbc = JDBC.getInstance();
-        } catch (IOException e) {
-            Log.Log.error("no connection to db");
-            return "{\"query\" : \"nodbconn\"}";
-        }
-        switch (params.get("action")) {
-            case "newCity":
-                sb.append("{");
-                Log.Log.debug(params.toString());
-
-//                check if wastezone and wasteregion already exists
-
-                Log.Log.debug(params.get("cityname") + params.get("wastetype") + params.get("wastezone"));
-                set = jdbc.executeQuery("select * from `cities` where `name`='" + params.get("cityname") + "' AND `wastetype`='" + params.get("wastetype") + "' AND `zone`='" + params.get("wastezone") + "'");
-                int size = 0;
-                try {
-                    if (set != null) {
-                        set.last();    // moves cursor to the last row
-                        size = set.getRow(); // get row id
-                    }
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-                if (size == 0) {
-                    //doesnt exist
-                    try {
-                        status = jdbc.executeUpdate("INSERT INTO `cities`(`userid`, `name`, `wastetype`, `zone`) VALUES ('0','" + params.get("cityname") + "','" + params.get("wastetype") + "','" + params.get("wastezone") + "');");
-                    } catch (SQLException e) {
-                        e.printStackTrace();
-                    }
-
-                    if (status == 1) {
-                        sb.append("\"status\" : \"inserted\"");
-                    } else {
-                        sb.append("\"status\" : \"inserterror\"");
-                    }
-
-                } else if (size > 1) {
-                    Log.Log.warning("more than one entry in db!!!");
-                    sb.append("\"status\" : \"exists\"");
-                } else {
-                    //already exists
-                    sb.append("\"status\" : \"exists\"");
-                }
-
-                sb.append(",\"query\":\"ok\"");
-                sb.append("}");
-                break;
-            case "getAllCities":
-                set = jdbc.executeQuery("select * from cities");
-                Log.Log.debug(set.toString());
-                sb.append("{\"data\":[");
-                try {
-                    while (set.next()) {
-                        sb.append("{\"cityname\":\"" + set.getString("name") + "\"");
-                        sb.append(",\"wastetype\":\"" + set.getString("wastetype") + "\"");
-                        sb.append(",\"id\":\"" + set.getString("id") + "\"");
-                        sb.append(",\"zone\":\"" + set.getString("zone") + "\"}");
-                        if (!set.isLast()) {
-                            sb.append(",");
-                        }
-                    }
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-                sb.append("]");
-                sb.append(",\"query\":\"ok\"");
-                sb.append("}");
-                break;
-            case "deletecity":
-                //DELETE FROM `cities` WHERE `id`=0
-                sb.append("{");
-                try {
-                    status = jdbc.executeUpdate("DELETE FROM `cities` WHERE `id`='" + params.get("id") + "'");
-                    if (status == 1) {
-                        //success
-                        sb.append("\"status\" : \"success\"");
-                    } else {
-                        sb.append("\"status\" : \"error\"");
-                    }
-                } catch (SQLIntegrityConstraintViolationException e) {
-                    Log.Log.warning("dependencies of deletion exist");
-                    sb.append("\"status\" : \"dependenciesnotdeleted\"");
-                } catch (SQLException e) {
-                    Log.Log.error("sql exception: " + e.getMessage());
-                    sb.append("\"status\" : \"error\"");
-                }
-
-                Log.Log.debug(status);
-
-                sb.append(",\"query\":\"ok\"");
-                sb.append("}");
-
-                break;
-            case "getAllDates":
-                set = jdbc.executeQuery("SELECT pickupdates.id,pickupdates.pickupdate,cities.userid,cities.name,cities.wastetype,cities.zone " +
-                        "FROM `pickupdates` INNER JOIN `cities` ON pickupdates.citywastezoneid = cities.id");
-                sb.append("{\"data\":[");
-                try {
-                    while (set.next()) {
-                        sb.append("{\"date\":\"" + set.getString("pickupdate") + "\"");
-                        sb.append(",\"cityname\":\"" + set.getString("name") + "\"");
-                        sb.append(",\"wastetype\":\"" + set.getString("wastetype") + "\"");
-                        sb.append(",\"id\":\"" + set.getString("id") + "\"");
-                        sb.append(",\"zone\":\"" + set.getString("zone") + "\"}");
-                        if (!set.isLast()) {
-                            sb.append(",");
-                        }
-                    }
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-                sb.append("]");
-                sb.append(",\"query\":\"ok\"");
-                sb.append("}");
-                break;
-            case "deletedate":
-                sb.append("{");
-                try {
-                    status = jdbc.executeUpdate("DELETE FROM `pickupdates` WHERE `id`='" + params.get("id") + "'");
-                    if (status == 1) {
-                        //success
-                        sb.append("\"status\" : \"success\"");
-                    } else {
-                        sb.append("\"status\" : \"error\"");
-                    }
-                } catch (SQLIntegrityConstraintViolationException e) {
-                    Log.Log.warning("dependencies of deletion exist");
-                    sb.append("\"status\" : \"dependenciesnotdeleted\"");
-                } catch (SQLException e) {
-                    Log.Log.error("sql exception: " + e.getMessage());
-                    sb.append("\"status\" : \"error\"");
-                }
-
-                sb.append(",\"query\":\"ok\"");
-                sb.append("}");
-                break;
-            case "getversionandbuildtime":
-                sb.append("{");
-
-                sb.append("\"version\" : \""+ Info.getVersion()+"\"");
-                sb.append(",\"buildtime\" : \""+ Info.getBuilddate()+"\"");
-
-
-                sb.append(",\"query\":\"ok\"");
-                sb.append("}");
-                break;
-            case "getStartHeaderData":
-                sb.append("{");
-
-                try {
-                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-                    Date date = new Date();
-                    String time = sdf.format(date);
-                    set = jdbc.executeQuery("SELECT * FROM `pickupdates` WHERE `pickupdate` BETWEEN  '0000-12-27' AND '"+time+"'");
-                    set.last();
-                    sb.append("\"finshedcollections\":\"" + set.getRow() + "\"");
-
-                    sdf = new SimpleDateFormat("yyyy-MM-dd");
-                    date = new Date();
-                    date = new Date(date.getTime()+1 * 24 * 60 * 60 * 1000);
-
-                    time = sdf.format(date);
-                    set = jdbc.executeQuery("SELECT * FROM `pickupdates` WHERE `pickupdate` BETWEEN '"+time+"' AND '2222-12-27'");
-                    set.last();
-                    sb.append(",\"futurecollections\":\"" + set.getRow() + "\"");
-
-                    set = jdbc.executeQuery("select * from pickupdates");
-                    set.last();
-                    sb.append(",\"collectionnumber\":\"" + set.getRow() + "\"");
-
-                    set = jdbc.executeQuery("select * from `cities`");
-                    set.last();
-                    sb.append(",\"citynumber\":\"" + set.getRow() + "\"");
-                } catch (SQLException e) {
-                    Log.Log.error("sql exception: " + e.getMessage());
-                    sb.append("\"status\" : \"error\"");
-                }
-
-                sb.append(",\"query\":\"ok\"");
-                sb.append("}");
-                break;
-        }
-        return sb.toString();
-    }
-}
diff --git a/src/java/com/wasteinformationserver/website/datarequests/DataRequest.kt b/src/java/com/wasteinformationserver/website/datarequests/DataRequest.kt
new file mode 100644
index 0000000..7ccced3
--- /dev/null
+++ b/src/java/com/wasteinformationserver/website/datarequests/DataRequest.kt
@@ -0,0 +1,190 @@
+package com.wasteinformationserver.website.datarequests
+
+import com.wasteinformationserver.basicutils.Info
+import com.wasteinformationserver.basicutils.Log.Log.debug
+import com.wasteinformationserver.basicutils.Log.Log.error
+import com.wasteinformationserver.basicutils.Log.Log.warning
+import com.wasteinformationserver.db.JDBC
+import com.wasteinformationserver.website.basicrequest.PostRequest
+import java.io.IOException
+import java.sql.ResultSet
+import java.sql.SQLException
+import java.sql.SQLIntegrityConstraintViolationException
+import java.text.SimpleDateFormat
+import java.util.*
+
+class DataRequest : PostRequest() {
+    override fun request(params: HashMap<String, String>): String {
+        val sb = StringBuilder()
+        var set: ResultSet?
+        var status = -1
+        val jdbc: JDBC = try {
+            JDBC.getInstance()
+        } catch (e: IOException) {
+            error("no connection to db")
+            return "{\"query\" : \"nodbconn\"}"
+        }
+        when (params["action"]) {
+            "newCity" -> {
+                sb.append("{")
+                debug(params.toString())
+                //                check if wastezone and wasteregion already exists
+                debug(params["cityname"] + params["wastetype"] + params["wastezone"])
+                set = jdbc.executeQuery("select * from `cities` where `name`='" + params["cityname"] + "' AND `wastetype`='" + params["wastetype"] + "' AND `zone`='" + params["wastezone"] + "'")
+                var size = 0
+                try {
+                    if (set != null) {
+                        set.last() // moves cursor to the last row
+                        size = set.row // get row id
+                    }
+                } catch (e: SQLException) {
+                    e.printStackTrace()
+                }
+                if (size == 0) { //doesnt exist
+                    try {
+                        status = jdbc.executeUpdate("INSERT INTO `cities`(`userid`, `name`, `wastetype`, `zone`) VALUES ('0','" + params["cityname"] + "','" + params["wastetype"] + "','" + params["wastezone"] + "');")
+                    } catch (e: SQLException) {
+                        e.printStackTrace()
+                    }
+                    if (status == 1) {
+                        sb.append("\"status\" : \"inserted\"")
+                    }
+                    else {
+                        sb.append("\"status\" : \"inserterror\"")
+                    }
+                }
+                else if (size > 1) {
+                    warning("more than one entry in db!!!")
+                    sb.append("\"status\" : \"exists\"")
+                }
+                else { //already exists
+                    sb.append("\"status\" : \"exists\"")
+                }
+                sb.append(",\"query\":\"ok\"")
+                sb.append("}")
+            }
+            "getAllCities" -> {
+                set = jdbc.executeQuery("select * from cities")
+                debug(set.toString())
+                sb.append("{\"data\":[")
+                try {
+                    while (set.next()) {
+                        sb.append("{\"cityname\":\"" + set.getString("name") + "\"")
+                        sb.append(",\"wastetype\":\"" + set.getString("wastetype") + "\"")
+                        sb.append(",\"id\":\"" + set.getString("id") + "\"")
+                        sb.append(",\"zone\":\"" + set.getString("zone") + "\"}")
+                        if (!set.isLast) {
+                            sb.append(",")
+                        }
+                    }
+                } catch (e: SQLException) {
+                    e.printStackTrace()
+                }
+                sb.append("]")
+                sb.append(",\"query\":\"ok\"")
+                sb.append("}")
+            }
+            "deletecity" -> {
+                //DELETE FROM `cities` WHERE `id`=0
+                sb.append("{")
+                try {
+                    status = jdbc.executeUpdate("DELETE FROM `cities` WHERE `id`='" + params["id"] + "'")
+                    if (status == 1) { //success
+                        sb.append("\"status\" : \"success\"")
+                    }
+                    else {
+                        sb.append("\"status\" : \"error\"")
+                    }
+                } catch (e: SQLIntegrityConstraintViolationException) {
+                    warning("dependencies of deletion exist")
+                    sb.append("\"status\" : \"dependenciesnotdeleted\"")
+                } catch (e: SQLException) {
+                    error("sql exception: " + e.message)
+                    sb.append("\"status\" : \"error\"")
+                }
+                debug(status)
+                sb.append(",\"query\":\"ok\"")
+                sb.append("}")
+            }
+            "getAllDates" -> {
+                set = jdbc.executeQuery("SELECT pickupdates.id,pickupdates.pickupdate,cities.userid,cities.name,cities.wastetype,cities.zone " +
+                        "FROM `pickupdates` INNER JOIN `cities` ON pickupdates.citywastezoneid = cities.id")
+                sb.append("{\"data\":[")
+                try {
+                    while (set.next()) {
+                        sb.append("{\"date\":\"" + set.getString("pickupdate") + "\"")
+                        sb.append(",\"cityname\":\"" + set.getString("name") + "\"")
+                        sb.append(",\"wastetype\":\"" + set.getString("wastetype") + "\"")
+                        sb.append(",\"id\":\"" + set.getString("id") + "\"")
+                        sb.append(",\"zone\":\"" + set.getString("zone") + "\"}")
+                        if (!set.isLast) {
+                            sb.append(",")
+                        }
+                    }
+                } catch (e: SQLException) {
+                    e.printStackTrace()
+                }
+                sb.append("]")
+                sb.append(",\"query\":\"ok\"")
+                sb.append("}")
+            }
+            "deletedate" -> {
+                sb.append("{")
+                try {
+                    status = jdbc.executeUpdate("DELETE FROM `pickupdates` WHERE `id`='" + params["id"] + "'")
+                    if (status == 1) { //success
+                        sb.append("\"status\" : \"success\"")
+                    }
+                    else {
+                        sb.append("\"status\" : \"error\"")
+                    }
+                } catch (e: SQLIntegrityConstraintViolationException) {
+                    warning("dependencies of deletion exist")
+                    sb.append("\"status\" : \"dependenciesnotdeleted\"")
+                } catch (e: SQLException) {
+                    error("sql exception: " + e.message)
+                    sb.append("\"status\" : \"error\"")
+                }
+                sb.append(",\"query\":\"ok\"")
+                sb.append("}")
+            }
+            "getversionandbuildtime" -> {
+                sb.append("{")
+                sb.append("\"version\" : \"" + Info.getVersion() + "\"")
+                sb.append(",\"buildtime\" : \"" + Info.getBuilddate() + "\"")
+                sb.append(",\"query\":\"ok\"")
+                sb.append("}")
+            }
+            "getStartHeaderData" -> {
+                sb.append("{")
+                try {
+                    var sdf = SimpleDateFormat("yyyy-MM-dd")
+                    var date = Date()
+                    var time = sdf.format(date)
+                    set = jdbc.executeQuery("SELECT * FROM `pickupdates` WHERE `pickupdate` BETWEEN  '0000-12-27' AND '$time'")
+                    set.last()
+                    sb.append("\"finshedcollections\":\"" + set.row + "\"")
+                    sdf = SimpleDateFormat("yyyy-MM-dd")
+                    date = Date()
+                    date = Date(date.time + 1 * 24 * 60 * 60 * 1000)
+                    time = sdf.format(date)
+                    set = jdbc.executeQuery("SELECT * FROM `pickupdates` WHERE `pickupdate` BETWEEN '$time' AND '2222-12-27'")
+                    set.last()
+                    sb.append(",\"futurecollections\":\"" + set.row + "\"")
+                    set = jdbc.executeQuery("select * from pickupdates")
+                    set.last()
+                    sb.append(",\"collectionnumber\":\"" + set.row + "\"")
+                    set = jdbc.executeQuery("select * from `cities`")
+                    set.last()
+                    sb.append(",\"citynumber\":\"" + set.row + "\"")
+                } catch (e: SQLException) {
+                    error("sql exception: " + e.message)
+                    sb.append("\"status\" : \"error\"")
+                }
+                sb.append(",\"query\":\"ok\"")
+                sb.append("}")
+            }
+        }
+        return sb.toString()
+    }
+}
\ No newline at end of file
diff --git a/src/java/com/wasteinformationserver/website/datarequests/DeviceRequest.kt b/src/java/com/wasteinformationserver/website/datarequests/DeviceRequest.kt
index 0dc5f27..0c38de1 100644
--- a/src/java/com/wasteinformationserver/website/datarequests/DeviceRequest.kt
+++ b/src/java/com/wasteinformationserver/website/datarequests/DeviceRequest.kt
@@ -29,7 +29,8 @@ class DeviceRequest : PostRequest() {
                         val cityid = deviceset.getInt("CityID")
                         if (cityid == -1) {
                             sb.append("{\"deviceid\":\"").append(deviceid).append("\",\"cityid\":\"").append(cityid).append("\"}")
-                        } else {
+                        }
+                        else {
                             val devicename = deviceset.getString("DeviceName")
                             val devicelocation = deviceset.getString("DeviceLocation")
                             sb.append("{\"deviceid\":\"").append(deviceid).append("\",\"devicename\":\"").append(devicename).append("\",\"devicelocation\":\"").append(devicelocation).append("\",\"devices\":[")
@@ -122,7 +123,8 @@ class DeviceRequest : PostRequest() {
                 if (cityset.row != 1) {
                     error("error saving device to db --> device multiply defined?")
                     sb.append("{\"success\":\"false\"}")
-                } else {
+                }
+                else {
                     val cityid = cityset.getInt("id")
                     jdbc.executeUpdate("INSERT INTO `device_city` (`DeviceID`, `CityID`) VALUES ('" + params["deviceid"] + "', '" + cityid + "');")
                     jdbc.executeUpdate("UPDATE devices SET `CityID`='0',`DeviceName`='" + params["devicename"] + "',`DeviceLocation`='" + params["devicelocation"] + "' WHERE `DeviceID`='" + params["deviceid"] + "'")