diff --git a/delivery/.gitignore b/delivery/.gitignore
new file mode 100644
index 0000000..6c01878
--- /dev/null
+++ b/delivery/.gitignore
@@ -0,0 +1,32 @@
+HELP.md
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**
+!**/src/test/**
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+out/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
diff --git a/delivery/build.gradle b/delivery/build.gradle
new file mode 100644
index 0000000..4b72078
--- /dev/null
+++ b/delivery/build.gradle
@@ -0,0 +1,30 @@
+plugins {
+	id 'org.springframework.boot' version '2.2.7.RELEASE'
+	id 'io.spring.dependency-management' version '1.0.9.RELEASE'
+	id 'java'
+}
+
+group = 'org.hso.ecommerce'
+version = '0.0.1-SNAPSHOT'
+sourceCompatibility = '11'
+
+apply plugin: 'java'
+apply plugin: 'idea'
+apply plugin: 'org.springframework.boot'
+apply plugin: 'io.spring.dependency-management'
+
+repositories {
+	mavenCentral()
+}
+
+dependencies {
+	implementation 'org.springframework.boot:spring-boot-starter-web'
+	testImplementation('org.springframework.boot:spring-boot-starter-test') {
+		exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
+	}
+	compile 'org.json:json:20190722'
+}
+
+test {
+	useJUnitPlatform()
+}
diff --git a/delivery/gradle/wrapper/gradle-wrapper.jar b/delivery/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..f3d88b1
Binary files /dev/null and b/delivery/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/delivery/gradle/wrapper/gradle-wrapper.properties b/delivery/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..feb1126
--- /dev/null
+++ b/delivery/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Tue May 19 15:50:06 CEST 2020
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/delivery/gradlew b/delivery/gradlew
new file mode 100644
index 0000000..2fe81a7
--- /dev/null
+++ b/delivery/gradlew
@@ -0,0 +1,183 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/delivery/gradlew.bat b/delivery/gradlew.bat
new file mode 100644
index 0000000..9618d8d
--- /dev/null
+++ b/delivery/gradlew.bat
@@ -0,0 +1,100 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/delivery/settings.gradle b/delivery/settings.gradle
new file mode 100644
index 0000000..6a6c7ab
--- /dev/null
+++ b/delivery/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'delivery'
diff --git a/delivery/src/main/java/org/hso/ecommerce/supplier/App.java b/delivery/src/main/java/org/hso/ecommerce/supplier/App.java
new file mode 100644
index 0000000..bb8b42d
--- /dev/null
+++ b/delivery/src/main/java/org/hso/ecommerce/supplier/App.java
@@ -0,0 +1,11 @@
+package org.hso.ecommerce.supplier;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class App {
+    public static void main(String[] args) {
+        SpringApplication.run(App.class, args);
+    }
+}
diff --git a/delivery/src/main/java/org/hso/ecommerce/supplier/RequestController.java b/delivery/src/main/java/org/hso/ecommerce/supplier/RequestController.java
new file mode 100644
index 0000000..ed62af7
--- /dev/null
+++ b/delivery/src/main/java/org/hso/ecommerce/supplier/RequestController.java
@@ -0,0 +1,32 @@
+package org.hso.ecommerce.supplier;
+
+
+import org.hso.ecommerce.supplier.data.Delivery;
+import org.hso.ecommerce.supplier.data.DeliveryManager;
+import org.hso.ecommerce.supplier.data.ReturnStatus;
+import org.springframework.web.bind.annotation.*;
+
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@RestController
+public class RequestController {
+
+
+
+    @PostMapping("/newDelivery")
+    public String supplier(HttpServletResponse response, HttpServletRequest request, @RequestBody Delivery delivery) {
+        DeliveryManager.getInstance().add(delivery);
+
+        return delivery.getUuid().toString();
+    }
+
+    @GetMapping("/status")
+    public ReturnStatus searchArticles(@RequestParam(value = "trackingID") String trackingID, HttpServletRequest request, HttpServletResponse response) {
+
+        Delivery delivery = DeliveryManager.getInstance().getDeliveryByeID(trackingID);
+
+        return new ReturnStatus(delivery.getStatus(),delivery.getEstimatedArrival());
+    }
+}
diff --git a/delivery/src/main/java/org/hso/ecommerce/supplier/data/Delivery.java b/delivery/src/main/java/org/hso/ecommerce/supplier/data/Delivery.java
new file mode 100644
index 0000000..7a7b9cf
--- /dev/null
+++ b/delivery/src/main/java/org/hso/ecommerce/supplier/data/Delivery.java
@@ -0,0 +1,69 @@
+package org.hso.ecommerce.supplier.data;
+
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.UUID;
+
+public class Delivery {
+
+    private String[] states = {"Bestellung eingegangen","Bestellung auf dem Weg","Lieferung erfolgreich"};
+    private int[] timeBorder = {4,24};
+
+    private String name;
+    private String address;
+    private String estimatedArrival;
+    private Date creationTime;
+    private UUID uuid;
+
+    public Delivery(String name, String address)
+    {
+        this.name = name;
+        this.address = address;
+        this.uuid = UUID.randomUUID();
+        this.creationTime = new Date();
+        SimpleDateFormat formatter = new SimpleDateFormat("dd-MM-yyyy");
+        this.estimatedArrival = formatter.format(addDays((Date)this.creationTime.clone(),1));
+    }
+
+
+    public String getStatus()
+    {
+        Date now = new Date();
+        Long timeNow = now.getTime();
+        Long creationTime = this.creationTime.getTime();
+
+        Long diff = timeNow - creationTime;
+        double hour = (((diff / 1000.0) / 3600.0));
+
+        for (int i = 0; i <  timeBorder.length; i++) {
+
+            if(hour < timeBorder[i])
+                return states[i];
+        }
+
+        return states[timeBorder.length];
+    }
+
+    public String getEstimatedArrival() {
+
+        return estimatedArrival;
+    }
+
+    private Date addDays(Date date, int days)
+    {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.add(Calendar.DATE, days);
+        return cal.getTime();
+    }
+
+    public UUID getUuid() {
+        return uuid;
+    }
+
+    public String getName() {
+        return name;
+    }
+}
diff --git a/delivery/src/main/java/org/hso/ecommerce/supplier/data/DeliveryManager.java b/delivery/src/main/java/org/hso/ecommerce/supplier/data/DeliveryManager.java
new file mode 100644
index 0000000..bd22a56
--- /dev/null
+++ b/delivery/src/main/java/org/hso/ecommerce/supplier/data/DeliveryManager.java
@@ -0,0 +1,34 @@
+package org.hso.ecommerce.supplier.data;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+public class DeliveryManager {
+
+    private List<Delivery> deliveryList;
+    private static DeliveryManager deliveryManager;
+
+    private DeliveryManager()
+    {
+        deliveryList = new ArrayList<>();
+    }
+
+    public static DeliveryManager getInstance () {
+
+        if (DeliveryManager.deliveryManager == null) {
+            DeliveryManager.deliveryManager = new DeliveryManager();
+        }
+        return DeliveryManager.deliveryManager;
+    }
+
+    public boolean add(Delivery delivery)
+    {
+       return deliveryList.add(delivery);
+    }
+
+    public Delivery getDeliveryByeID(String uuid)
+    {
+        return deliveryList.parallelStream().filter(d -> d.getUuid().equals(UUID.fromString(uuid))).findAny().get();
+    }
+}
diff --git a/delivery/src/main/java/org/hso/ecommerce/supplier/data/ReturnStatus.java b/delivery/src/main/java/org/hso/ecommerce/supplier/data/ReturnStatus.java
new file mode 100644
index 0000000..16eaae7
--- /dev/null
+++ b/delivery/src/main/java/org/hso/ecommerce/supplier/data/ReturnStatus.java
@@ -0,0 +1,20 @@
+package org.hso.ecommerce.supplier.data;
+
+public class ReturnStatus {
+
+    private String status;
+    private String estimatedArrival;
+
+    public ReturnStatus(String status, String estimatedArrival) {
+        this.status = status;
+        this.estimatedArrival = estimatedArrival;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public String getEstimatedArrival() {
+        return estimatedArrival;
+    }
+}
diff --git a/delivery/src/main/resources/application.properties b/delivery/src/main/resources/application.properties
new file mode 100644
index 0000000..eca0f47
--- /dev/null
+++ b/delivery/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+server.address=::1
+server.port=8082
diff --git a/prototype/src/main/resources/test.db b/prototype/src/main/resources/test.db
new file mode 100644
index 0000000..bb25c44
Binary files /dev/null and b/prototype/src/main/resources/test.db differ