diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientEditorController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientEditorController.java
index 61b2aae..81f7895 100644
--- a/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientEditorController.java
+++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientEditorController.java
@@ -14,6 +14,7 @@ import javafx.event.ActionEvent;
 import javafx.stage.Stage;
 
 import java.sql.SQLException;
+import java.time.LocalDate;
 
 public class PatientEditorController {
 
@@ -159,22 +160,22 @@ public class PatientEditorController {
     }
 
 
-
+    // TODO: Remove default values.
     private void clearFields(){
         patId.setText("<auto>");
         patGeburtsname.setText("");
-        patNachname.setText("");
-        patVorname.setText("");
+        patNachname.setText("Peter");
+        patVorname.setText("Hans");
         patStrasse.setText("");
         patHausnummer.setText("");
-        patPlz.setText("");
+        patPlz.setText("12345");
         patOrt.setText("");
-        patGeburtsdatum.setValue(null);
-        patFamilienstand.setValue(null);
+        patGeburtsdatum.setValue(LocalDate.of(1988, 4, 7));
+        patFamilienstand.setValue(Patient.Familienstand.VERWITWET);
         patGeschlecht.setValue(null);
         patVersicherungsnummer.setText("");
         patVersicherung.setValue(null);
-        patCave.setText("");
+        patCave.setText("Angst");
 
         patCreator.setText("todo");
         patCreateTime.setText("<auto>");
@@ -191,6 +192,11 @@ public class PatientEditorController {
         if(patient==null){
             patient = new Patient();
             copyFieldDataIntoPatient(patient);
+            try {
+                DBHandler.insertPatient(patient, 1003);
+            } catch (SQLException e) {
+                e.printStackTrace();
+            }
             //Create new db entry TODO
         }else{
             copyFieldDataIntoPatient(patient);
diff --git a/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java b/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java
index a0b2708..8840e56 100644
--- a/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java
+++ b/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java
@@ -14,13 +14,40 @@ public class DBHandler {
 
     private static final String SELECT_ALL_PATIENTS = "SELECT * FROM `patient`";
     private static final String SELECT_PATIENT_BY_ID = "SELECT * FROM `patient` WHERE `id` = ?";
-    private static final String UPDATE_PATIENT = "UPDATE `patient` SET `CAVE`=?, `Familienstand`=?, " +
-            "`Geburtsdatum`=?, `Geburtsname`=?, `Geschlecht`=?, `KassenID`=?, `LetzterBearbeiter`=?, `Nachname`=?, " +
-            "`Ort`=?, `PLZ`=?, `Strasse`=?, `Telefon`=?, `Versichertennummer`=?, `Vorname`=? WHERE `ID`=?";
-    private static final String INSERT_PATIENT = "INSERT INTO `patient` (`CAVE`, `Ersteller`, `Familienstand`, " +
-            "`Geburtdatum`, `Geburtsname`,`Geschlecht`, `Hausnummer`, `KassenID`, `LetzterBearbeiter`, `Nachname`, " +
-            "`Ort`, `PLZ`, `Strasse`, `Telefon`,`Versichertennummer`, `Vorname`) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, " +
-            "?, ?, ?, ?, ?, ?, ?, ?, ?)";
+    private static final String UPDATE_PATIENT = "UPDATE `patient` " +
+            "SET `CAVE`=?, " +
+            "`Familienstand`=?, " +
+            "`Geburtsdatum`=?, " +
+            "`Geburtsname`=?, " +
+            "`Geschlecht`=?, " +    // TODO: Hausnummer fehlt
+            "`KassenID`=?, " +
+            "`LetzterBearbeiter`=?, " +
+            "`Nachname`=?, " +
+            "`Ort`=?, " +
+            "`PLZ`=?, " +
+            "`Strasse`=?, " +
+            "`Telefon`=?, " +
+            "`Versichertennummer`=?, " +
+            "`Vorname`=? " +
+            "WHERE `ID`=?";
+    private static final String INSERT_PATIENT = "INSERT INTO `patient` " +
+            "(`CAVE`, " +
+            "`Familienstand`, " +
+            "`Geburtsdatum`, " +
+            "`Geburtsname`," +
+            "`Geschlecht`, " +
+            "`Hausnummer`, " +
+            "`KassenID`, " +
+            "`LetzterBearbeiter`, " +
+            "`Nachname`, " +
+            "`Ort`, " +
+            "`PLZ`, " +
+            "`Strasse`, " +
+            "`Telefon`," +
+            "`Versichertennummer`, " +
+            "`Vorname`, " +
+            "`Ersteller`) " +
+            "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
     private static final String SELECT_ALL_STATIONEN = "SELECT * FROM `stammstation`";
     private static final String SELECT_FAELLE_BY_PATID = "SELECT * FROM `fall` WHERE `patientid` = ?";
     private static final String SELECT_DIAGNOSE_BY_ID = "SELECT * FROM `diagnose` WHERE `diagid` = ?";
@@ -107,7 +134,34 @@ public class DBHandler {
 
     public static void insertPatient(Patient patient, int mitarbid) throws SQLException {
         PreparedStatement statement = MySqlConnFactory.getConnection().prepareStatement(INSERT_PATIENT);
-        // TODO
+        statement.setString(1, patient.getCave());                    // `CAVE`
+        if (patient.getFamilienstand() != null)
+            statement.setString(2, String.valueOf(patient.getFamilienstand().id()));                    // `Familienstand`
+        else
+            statement.setString(2, "l");
+        statement.setDate(3, Date.valueOf(patient.getGeburtsdatum()));                    // `Geburtdatum`
+        statement.setString(4, patient.getGeburtsname());                    // `Geburtsname`
+        if (patient.getGeschlecht() != null)
+            statement.setString(5, String.valueOf(patient.getGeschlecht().id()));                    // `Geschlecht`
+        else
+            statement.setString(5, "o");
+        statement.setString(6, patient.getHausnummer());                    // `Hausnummer`
+        //statement.setInt(7, patient.getKassenID());                    // `KassenID`
+        statement.setInt(7, 1);                    // `KassenID`
+        statement.setInt(8, mitarbid);                    // `LetzterBearbeiter`
+        statement.setString(9, patient.getNachname());                    // `Nachname`
+        statement.setString(10, patient.getOrt());                    // `Ort`
+        statement.setString(11, patient.getPlz());                    // `PLZ`
+        statement.setString(12, patient.getStrasse());                    // `Strasse`
+        statement.setString(13, patient.getTelefon());                    // `Telefon`
+        statement.setString(14, patient.getVersichertennummer());                    // `Versichertennummer`
+        statement.setString(15, patient.getVorname());                    // `Vorname`
+        statement.setInt(16, mitarbid);                    // `Ersteller`
+
+        System.out.println(statement.toString());
+
+        statement.execute();
+
     }
 
     public static List<Station> getAllStationen() throws SQLException {