diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 0ea42ff..5505623 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -16,4 +16,4 @@
 # under the License.
 wrapperVersion=3.3.4
 distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
diff --git a/docker-compose.yml b/docker-compose.yml
index c9dfb52..3d27214 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   mysql:
-    image: mysql:8.0
+    image: mysql:8.4
     container_name: lcc-mysql-local
     environment:
       MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASSWORD}
diff --git a/pom.xml b/pom.xml
index eaaa690..4db4de8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.5.8</version>
+        <version>3.5.9</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>de.avatic</groupId>
@@ -28,7 +28,7 @@
     </scm>
     <properties>
         <java.version>23</java.version>
-        <spring-cloud-azure.version>5.24.0</spring-cloud-azure.version>
+        <spring-cloud-azure.version>5.24.1</spring-cloud-azure.version>
         <mockito.version>5.20.0</mockito.version>
         <flyway.version>11.18.0</flyway.version>
     </properties>
@@ -130,6 +130,11 @@
             <artifactId>fastexcel</artifactId>
             <version>0.19.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.commonmark</groupId>
+            <artifactId>commonmark</artifactId>
+            <version>0.22.0</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
diff --git a/src/frontend/src/App.vue b/src/frontend/src/App.vue
index 66c8e16..9facbb2 100644
--- a/src/frontend/src/App.vue
+++ b/src/frontend/src/App.vue
@@ -1,5 +1,6 @@
 <template>
   <the-notification-system />
+  <the-help-system />
   <the-header></the-header>
   <router-view v-slot="slotProps">
     <transition name="route" mode="out-in">
@@ -13,9 +14,10 @@
 
 import TheHeader from "@/components/layout/TheHeader.vue";
 import TheNotificationSystem from "@/components/UI/TheNotificationSystem.vue";
+import TheHelpSystem from "@/components/layout/help/TheHelpSystem.vue";
 
 export default {
-  components: {TheNotificationSystem, TheHeader},
+  components: {TheHelpSystem, TheNotificationSystem, TheHeader},
 
 }
 </script>
@@ -44,10 +46,12 @@ html.modal-open {
   color: #002F54;
 }
 
+
 .sub-header {
   font-weight: normal;
   font-size: 1.4rem;
   color: #6B869C;
+  margin: 1.6rem 0;
 }
 
 html {
diff --git a/src/frontend/src/components/UI/AppListItem.vue b/src/frontend/src/components/UI/AppListItem.vue
index fc022a2..eb41c46 100644
--- a/src/frontend/src/components/UI/AppListItem.vue
+++ b/src/frontend/src/components/UI/AppListItem.vue
@@ -1,10 +1,20 @@
 <template>
   <div>
     <div class="app-list-item">
-      <div class="app-name-container"><div class="app-name-name">{{ app.name }}</div><div class="app-name-id">{{ app.client_id}}</div></div>
+      <div class="app-name-container">
+        <div class="app-name-name">{{ app.name }}</div>
+        <div class="app-name-id">{{ app.client_id }}</div>
+      </div>
+
+      <div class="badge-list">
+        <basic-badge variant="secondary" icon="lock" v-for="group in groups" :key="group">{{ group }}</basic-badge>
+      </div>
+
+      <div class="action-container">
+        <icon-button icon="download" @click="exportClick"></icon-button>
+        <icon-button icon="trash" @click="deleteClick"></icon-button>
+      </div>
 
-      <div class="badge-list"> <basic-badge variant="secondary" icon="lock" v-for="group in groups" :key="group">{{group}}</basic-badge></div>
-      <div class="action-container"> <icon-button icon="trash" @click="deleteClick"></icon-button></div>
     </div>
   </div>
 
@@ -18,7 +28,7 @@ import BasicBadge from "@/components/UI/BasicBadge.vue";
 export default {
   name: "AppListItem",
   components: {BasicBadge, IconButton, Box},
-  emits: ["deleteApp"],
+  emits: ["deleteApp", "exportApp"],
   props: {
     app: {
       type: Object,
@@ -33,6 +43,9 @@ export default {
   methods: {
     deleteClick() {
       this.$emit("deleteApp", this.app.id);
+    },
+    exportClick() {
+      this.$emit("exportApp", this.app.id);
     }
   }
 }
@@ -76,7 +89,10 @@ export default {
   color: #6b7280;
 }
 
-.action-container{
+.action-container {
+  display: flex;
+  flex-direction: row;
+  gap: 1.2rem;
   align-self: center;
 }
 
diff --git a/src/frontend/src/components/UI/CollapsibleBox.vue b/src/frontend/src/components/UI/CollapsibleBox.vue
index c138875..1fb44d1 100644
--- a/src/frontend/src/components/UI/CollapsibleBox.vue
+++ b/src/frontend/src/components/UI/CollapsibleBox.vue
@@ -133,9 +133,12 @@ export default {
 .box-content.collapsed {
   max-height: 0;
   opacity: 0;
-  margin-top: 0;
-  margin-bottom: 0;
-  padding-top: 0;
-  padding-bottom: 0;
+
+  margin: 0 !important;  /* ← !important um alle margins zu überschreiben */
+  padding: 0 !important;
+  overflow: hidden;
 }
+
+
+
 </style>
\ No newline at end of file
diff --git a/src/frontend/src/components/UI/Modal.vue b/src/frontend/src/components/UI/Modal.vue
index 98cd238..b052bda 100644
--- a/src/frontend/src/components/UI/Modal.vue
+++ b/src/frontend/src/components/UI/Modal.vue
@@ -128,7 +128,7 @@ export default {
         return; // Allow keyboard scrolling inside modal
       }
 
-      // Prevent scrolling via keyboard (arrow keys, space, page up/down)
+      // Prevent scrolling via keyboard (arrow keys, space, helppages up/down)
       const scrollKeys = [32, 33, 34, 35, 36, 37, 38, 39, 40];
       if (scrollKeys.includes(e.keyCode)) {
         e.preventDefault();
diff --git a/src/frontend/src/components/UI/Pagination.vue b/src/frontend/src/components/UI/Pagination.vue
index 784bfdb..e123b5e 100644
--- a/src/frontend/src/components/UI/Pagination.vue
+++ b/src/frontend/src/components/UI/Pagination.vue
@@ -10,7 +10,7 @@
       <PhCaretLeft :size="18" />  Previous
     </button>
 
-    <!-- First page -->
+    <!-- First helppages -->
     <button
         v-if="showFirstPage"
         class="pagination-btn page-number"
@@ -23,7 +23,7 @@
     <!-- First ellipsis -->
     <span v-if="showFirstEllipsis" class="ellipsis">...</span>
 
-    <!-- Page numbers around current page -->
+    <!-- Page numbers around current helppages -->
     <button
         v-for="pageNum in visiblePages"
         :key="pageNum"
@@ -37,7 +37,7 @@
     <!-- Last ellipsis -->
     <span v-if="showLastEllipsis" class="ellipsis">...</span>
 
-    <!-- Last page -->
+    <!-- Last helppages -->
     <button
         v-if="showLastPage"
         class="pagination-btn page-number"
@@ -90,7 +90,7 @@ export default {
       default: 5
     }
   },
-  emits: ['page-change'],
+  emits: ['helppages-change'],
   computed: {
     visiblePages() {
       const delta = Math.floor(this.maxVisiblePages / 2);
@@ -130,7 +130,7 @@ export default {
   methods: {
     goToPage(pageNumber) {
       if (pageNumber >= 1 && pageNumber <= this.pageCount && pageNumber !== this.page) {
-        this.$emit('page-change', pageNumber);
+        this.$emit('helppages-change', pageNumber);
       }
     }
   }
diff --git a/src/frontend/src/components/UI/Toast.vue b/src/frontend/src/components/UI/Toast.vue
index 27967cc..3c646df 100644
--- a/src/frontend/src/components/UI/Toast.vue
+++ b/src/frontend/src/components/UI/Toast.vue
@@ -116,7 +116,7 @@ export default {
         case 'warning':
           return 'secondary'
         case 'info':
-          return 'primary'
+          return 'secondary'
         case 'error':
           return 'exception'
         default:
diff --git a/src/frontend/src/components/layout/assistant/SupplierItem.vue b/src/frontend/src/components/layout/assistant/SupplierItem.vue
index 7b222fa..1568dad 100644
--- a/src/frontend/src/components/layout/assistant/SupplierItem.vue
+++ b/src/frontend/src/components/layout/assistant/SupplierItem.vue
@@ -1,10 +1,16 @@
 <template>
   <div class="item-container" :class="{'selected-item': selected}">
-    <flag :iso="isoCode" size="l"></flag>
-    <div class="supplier-item-text">
-      <div class="supplier-item-name"> <span class="user-icon" v-if="isUserSupplier"><ph-user weight="fill" ></ph-user></span> {{name}}</div>
-      <div class="supplier-item-address">{{ address }}</div>
-
+    <div class="supplier-content">
+      <flag :iso="isoCode" size="l"></flag>
+      <div class="supplier-item-text">
+        <div class="supplier-item-name">
+          <span class="user-icon" v-if="isUserSupplier">
+            <ph-user weight="fill"></ph-user>
+          </span>
+          {{name}}
+        </div>
+        <div class="supplier-item-address">{{ address }}</div>
+      </div>
     </div>
     <icon-button v-if="showTrash" icon="trash" @click="deleteClick"></icon-button>
   </div>
@@ -65,14 +71,13 @@ export default {
 
 .item-container {
   display: flex;
-  justify-content: space-between;
+  justify-content: flex-start; /* Statt space-between */
   align-items: center;
   padding: 3.6rem 3.6rem;
   background: white;
   border-radius: 0.8rem;
   box-shadow: 0 0.4rem 0.6rem -0.1rem rgba(0, 0, 0, 0.1);
   overflow: hidden;
-  gap: 2.4rem;
   flex: 0 0 50rem;
   transition: background-color 0.3s ease;
 }
@@ -97,6 +102,20 @@ export default {
   align-items: center;
 }
 
+.supplier-content {
+  display: flex;
+  align-items: center;
+  gap: 2.4rem;
+  flex: 1;
+  min-width: 0;
+}
+
+.supplier-item-text {
+  display: flex;
+  flex-direction: column;
+  gap: 0.4rem;
+}
+
 
 .supplier-item-name {
   font-size: 1.6rem;
@@ -112,4 +131,8 @@ export default {
   color: #6b7280;
 }
 
+.item-container > .icon-button {
+  margin-left: auto;
+}
+
 </style>
\ No newline at end of file
diff --git a/src/frontend/src/components/layout/calculation/CalculationListItem.vue b/src/frontend/src/components/layout/calculation/CalculationListItem.vue
index 87a0c0a..ee8ec54 100644
--- a/src/frontend/src/components/layout/calculation/CalculationListItem.vue
+++ b/src/frontend/src/components/layout/calculation/CalculationListItem.vue
@@ -20,6 +20,9 @@
     <div class="calculation-list-status-cell">
       <basic-badge :variant="variant" :icon="variantIcon">{{ premise.state }}</basic-badge>
     </div>
+    <div class="calculation-list-date-cell">
+      {{ buildDate(this.premise.created_at, true)}}
+    </div>
     <div class="calculation-list-actions-cell">
       <icon-button :disabled="!isDraft" icon="pencil-simple" @click="editClick" help-text="Edit this calculation"
                    help-text-position="left"></icon-button>
@@ -39,7 +42,7 @@ import Checkbox from "@/components/UI/Checkbox.vue";
 import {mapStores} from "pinia";
 import {usePremiseStore} from "@/store/premise.js";
 import Flag from "@/components/UI/Flag.vue";
-import {UrlSafeBase64} from "@/common.js";
+import {buildDate, UrlSafeBase64} from "@/common.js";
 
 export default {
   name: "CalculationListItem",
@@ -68,7 +71,7 @@ export default {
         return 'grey';
       } else if (this.premise.state === 'COMPLETED') {
         return 'primary';
-      } else if (this.premise.state === 'EXCEPTION') {
+      } else if (this.premise.state === 'COMPLETED' && this.premise.calculation_state === 'EXCEPTION') {
         return 'exception';
       } else {
         return 'grey';
@@ -95,6 +98,7 @@ export default {
     }
   },
   methods: {
+    buildDate,
     updateCheckBox(checked) {
       this.$emit('updateCheckbox', {checked: checked, id: this.id});
     },
@@ -124,7 +128,7 @@ export default {
 
 .calculation-list-row {
   display: grid;
-  grid-template-columns: 6rem 1fr 2fr 14rem 10rem;
+  grid-template-columns: 6rem 1fr 2fr 14rem 20rem 10rem;
   gap: 1.6rem;
   padding: 1.6rem;
   border-bottom: 0.16rem solid #f3f4f6;
@@ -203,6 +207,14 @@ export default {
   justify-content: start;
 }
 
+.calculation-list-date-cell {
+  display: flex;
+  justify-content: start;
+  color: #6b7280;
+  font-size: 1.4rem;
+  line-height: 1.4;
+}
+
 .calculation-list-actions-cell {
   display: flex;
   gap: 0.8rem;
diff --git a/src/frontend/src/components/layout/calculation/TheDashboard.vue b/src/frontend/src/components/layout/calculation/TheDashboard.vue
new file mode 100644
index 0000000..cf14520
--- /dev/null
+++ b/src/frontend/src/components/layout/calculation/TheDashboard.vue
@@ -0,0 +1,212 @@
+<template>
+  <div class="dashboard-container">
+    <!-- Total Calculations -->
+    <box>
+      <div class="dashboard-box">
+        <div class="dashboard-box-icon dashboard-box-icon--primary">
+
+          <svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 256 256">
+            <polygon points="32 80 128 136 224 80 128 24 32 80" fill="currentColor" opacity="0.2"/>
+            <polygon points="32 128 128 184 224 128 128 72 32 128" fill="currentColor" opacity="0.2"/>
+            <polygon points="32 176 128 232 224 176 128 120 32 176" fill="currentColor" opacity="0.2"/>
+            <rect width="256" height="256" fill="none"/><polyline points="32 176 128 232 224 176" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><polyline points="32 128 128 184 224 128" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><polygon points="32 80 128 136 224 80 128 24 32 80" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/></svg>
+
+        </div>
+        <div class="dashboard-box-info">
+          <div v-if="completed !== null" class="dashboard-box-number">{{ completed }}</div>
+          <div v-else class="dashboard-box-number"><spinner size="s"/></div>
+          <div class="dashboard-box-number-text">Completed</div>
+        </div>
+      </div>
+    </box>
+
+    <!-- Draft Calculations -->
+    <box>
+      <div class="dashboard-box">
+        <div class="dashboard-box-icon dashboard-box-icon--primary">
+          <svg xmlns="http://www.w3.org/2000/svg" width="42" height="42" viewBox="0 0 24 24">
+            <rect x="9" y="-1" width="8" height="24" fill="currentcolor" opacity="0.2" transform="rotate(45 13 11)"/>
+            <path d="M14.078 4.232l-12.64 12.639-1.438 7.129 7.127-1.438 12.641-12.64-5.69-5.69zm-10.369 14.893l-.85-.85 11.141-11.125.849.849-11.14 11.126zm2.008 2.008l-.85-.85 11.141-11.125.85.85-11.141 11.125zm18.283-15.444l-2.816 2.818-5.691-5.691 2.816-2.816 5.691 5.689z"/></svg>
+        </div>
+        <div class="dashboard-box-info">
+          <div v-if="drafts !== null" class="dashboard-box-number">{{ drafts }}</div>
+          <div v-else class="dashboard-box-number"><spinner size="s"/></div>
+          <div class="dashboard-box-number-text">Drafts</div>
+        </div>
+      </div>
+    </box>
+
+    <!-- Running Calculations -->
+    <box>
+      <div class="dashboard-box">
+        <div class="dashboard-box-icon dashboard-box-icon--primary">
+          <svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 24 24">
+            <circle cx="14" cy="14" r="10" fill="currentcolor" opacity="0.2"/>
+            <path fill="currentcolor" d="M15.91 13.34l2.636-4.026-.454-.406-3.673 3.099c-.675-.138-1.402.068-1.894.618-.736.823-.665 2.088.159 2.824.824.736 2.088.665 2.824-.159.492-.55.615-1.295.402-1.95zm-3.91-10.646v-2.694h4v2.694c-1.439-.243-2.592-.238-4 0zm8.851 2.064l1.407-1.407 1.414 1.414-1.321 1.321c-.462-.484-.964-.927-1.5-1.328zm-18.851 4.242h8v2h-8v-2zm-2 4h8v2h-8v-2zm3 4h7v2h-7v-2zm21-3c0 5.523-4.477 10-10 10-2.79 0-5.3-1.155-7.111-3h3.28c1.138.631 2.439 1 3.831 1 4.411 0 8-3.589 8-8s-3.589-8-8-8c-1.392 0-2.693.369-3.831 1h-3.28c1.811-1.845 4.321-3 7.111-3 5.523 0 10 4.477 10 10z"/>
+          </svg>        </div>
+        <div class="dashboard-box-info">
+          <div v-if="running !== null" class="dashboard-box-number">{{ running }}</div>
+          <div v-else class="dashboard-box-number"><spinner size="s"/></div>
+          <div class="dashboard-box-number-text">Running</div>
+        </div>
+      </div>
+    </box>
+
+    <!-- Failed Calculations -->
+    <box>
+      <div class="dashboard-box">
+        <div class="dashboard-box-icon dashboard-box-icon--primary">
+          <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <path d="M24 4L44 40H4L24 4Z" fill="currentColor" opacity="0.2"/>
+            <path d="M24 4L44 40H4L24 4Z" stroke="currentColor" stroke-width="3" stroke-linejoin="round" fill="none"/>
+            <path d="M24 18V28" stroke="currentColor" stroke-width="3" stroke-linecap="round"/>
+            <circle cx="24" cy="34" r="1.5" fill="currentColor"/>
+          </svg>
+        </div>
+        <div class="dashboard-box-info">
+          <div v-if="failed !== null" class="dashboard-box-number">{{ failed }}</div>
+          <div v-else class="dashboard-box-number"><spinner size="s"/></div>
+          <div class="dashboard-box-number-text">Failed</div>
+        </div>
+      </div>
+    </box>
+  </div>
+</template>
+
+<script>
+import Box from "@/components/UI/Box.vue";
+import { PhStack, PhPencilSimple, PhHourglassMedium, PhWarning } from "@phosphor-icons/vue";
+import {useDashboardStore} from "@/store/dashboard.js";
+import {mapStores} from "pinia";
+import {usePremiseStore} from "@/store/premise.js";
+import {useActiveUserStore} from "@/store/activeuser.js";
+import Spinner from "@/components/UI/Spinner.vue";
+
+export default {
+  name: "TheDashboard",
+  components: {
+    Spinner,
+    PhStack,
+    PhPencilSimple,
+    PhHourglassMedium,
+    PhWarning,
+    Box
+  },
+  computed: {
+    ...mapStores(useDashboardStore),
+    completed() {
+      return this.dashboardStore.completed
+    },
+    drafts() {
+      return this.dashboardStore.drafts
+    },
+    running() {
+      return this.dashboardStore.running
+    },
+    failed() {
+      return this.dashboardStore.failed
+    }
+  },
+  created() {
+    this.dashboardStore.load();
+  },
+  mounted() {
+    this.dashboardStore.startPulling();
+  },
+  unmounted() {
+    this.dashboardStore.stopPulling();
+  }
+}
+</script>
+
+<style scoped>
+.dashboard-container {
+  display: grid;
+  grid-template-columns: repeat(4, 1fr);
+  gap: 1.6rem;
+  margin: 1.6rem 0 3.6rem 0;
+}
+
+.dashboard-box {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: flex-start;
+  padding: 2rem 2.4rem;
+  gap: 1.6rem;
+}
+
+.dashboard-box-icon {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+}
+
+.dashboard-box-more-link {
+  color: #002F54;
+  font-weight: 400;
+  font-size: 1.2rem;
+  text-decoration: none;
+  text-transform: none;
+}
+
+.dashboard-box-icon--primary {
+  color: #002F54;
+}
+
+.dashboard-box-icon--draft {
+  color: #6b7280;
+}
+
+.dashboard-box-icon--running {
+  color: #3b82f6;
+}
+
+.dashboard-box-icon--error {
+  color: #BC2B72;
+}
+
+.dashboard-box-info {
+  display: flex;
+  flex-direction: column;
+  gap: 0.4rem;
+}
+
+.dashboard-box-number {
+  font-weight: 500;
+  color: #002F54;
+  font-size: 3.2rem;
+  line-height: 1;
+}
+
+.dashboard-box-number-text {
+  font-weight: 400;
+  color: #6b7280;
+  text-transform: uppercase;
+  letter-spacing: 0.05rem;
+  font-size: 1.4rem;
+  line-height: 1.4;
+}
+
+/* Responsive Design */
+@media (max-width: 1024px) {
+  .dashboard-container {
+    grid-template-columns: repeat(2, 1fr);
+  }
+}
+
+@media (max-width: 640px) {
+  .dashboard-container {
+    grid-template-columns: 1fr;
+  }
+
+  .dashboard-box {
+    padding: 1.6rem 2rem;
+  }
+
+  .dashboard-box-number {
+    font-size: 2.8rem;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/frontend/src/components/layout/config/Apps.vue b/src/frontend/src/components/layout/config/Apps.vue
index 3af2e75..7e606f5 100644
--- a/src/frontend/src/components/layout/config/Apps.vue
+++ b/src/frontend/src/components/layout/config/Apps.vue
@@ -1,6 +1,8 @@
 <template>
   <div class="apps-container">
+    <div class="app-list-actions">
 
+    </div>
     <div class="app-list-header">
       <div>App</div>
       <div>Groups</div>
@@ -8,13 +10,20 @@
     </div>
     <div class="app-list">
 
-      <app-list-item v-for="app in apps" :app="app" @delete-app="deleteApp"></app-list-item>
+      <app-list-item v-for="app in apps" :app="app" @delete-app="deleteApp" @export-app="exportApp"></app-list-item>
+
     </div>
 
     <modal :state="modalState">
       <add-app @close="closeModal"></add-app>
     </modal>
-    <basic-button icon="Plus" @click="modalState = true">New App</basic-button>
+
+
+    <div class="app-list-actions">
+
+      <basic-button icon="Upload" @click="importApp">Import</basic-button>
+      <basic-button icon="Plus" @click="modalState = true">New App</basic-button>
+    </div>
   </div>
 
 
@@ -27,6 +36,8 @@ import {mapStores} from "pinia";
 import {useAppsStore} from "@/store/apps.js";
 import Modal from "@/components/UI/Modal.vue";
 import AddApp from "@/components/layout/config/AddApp.vue";
+import Dropdown from "@/components/UI/Dropdown.vue";
+import IconButton from "@/components/UI/IconButton.vue";
 
 export default {
   name: "Apps",
@@ -36,7 +47,7 @@ export default {
       default: false
     }
   },
-  components: {AddApp, Modal, AppListItem, BasicButton},
+  components: {IconButton, Dropdown, AddApp, Modal, AppListItem, BasicButton},
   computed: {
     ...mapStores(useAppsStore),
     apps() {
@@ -45,7 +56,8 @@ export default {
   },
   data() {
     return {
-      modalState: false
+      modalState: false,
+      exportedApp: null
     }
   },
   methods: {
@@ -57,6 +69,62 @@ export default {
     },
     deleteApp(id) {
       this.appsStore.deleteApp(id);
+    },
+    async exportApp(id) {
+      const response = await this.appsStore.exportApp(id);
+      const app = this.appsStore.getById(id);
+
+      if(response?.data) {
+        const base64String = response.data;
+
+        const blob = new Blob([base64String], { type: 'text/plain' });
+        const url = window.URL.createObjectURL(blob);
+        const link = document.createElement('a');
+        link.href = url;
+        link.download = `${app.name}.app`;
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
+        window.URL.revokeObjectURL(url);
+      }
+
+    },
+    async importApp() {
+
+      const input = document.createElement('input');
+      input.type = 'file';
+      input.accept = '.app';
+
+      input.onchange = async (event) => {
+        const file = event.target.files[0];
+        if (file) {
+          try {
+            const fileContent = await this.readFileContent(file);
+            await this.appsStore.importApp(fileContent);
+          } catch (error) {
+
+          }
+        }
+      };
+
+      // File Dialog öffnen
+      input.click();
+    },
+
+    readFileContent(file) {
+      return new Promise((resolve, reject) => {
+        const reader = new FileReader();
+
+        reader.onload = (e) => {
+          resolve(e.target.result);
+        };
+
+        reader.onerror = (error) => {
+          reject(error);
+        };
+
+        reader.readAsText(file);
+      });
     }
   },
   async created() {
@@ -85,6 +153,13 @@ export default {
   border-bottom: 0.1rem solid #E3EDFF;
 }
 
+.app-list-actions {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 2rem;
+  gap: 1.6rem
+}
+
 .app-list {
   margin-bottom: 2.4rem;
 }
diff --git a/src/frontend/src/components/layout/config/Nodes.vue b/src/frontend/src/components/layout/config/Nodes.vue
index b308524..e9dedd0 100644
--- a/src/frontend/src/components/layout/config/Nodes.vue
+++ b/src/frontend/src/components/layout/config/Nodes.vue
@@ -1,8 +1,26 @@
 <template>
   <div class="nodes-container">
+
+    <modal :state="showModal">
+      <div class="node-modal-container">
+        <div class="node-header">
+          <h3 class="sub-header"> {{ node.name }}
+          </h3>
+          <icon-button icon="x" @click="showModal = false"></icon-button>
+        </div>
+        <div class="node-body">
+          <div class="node-address"><flag :iso="node.country.iso_code" />{{ node.address }}</div>
+          <div class="supplier-map" v-if="node.location">
+            <open-street-map-embed :coordinates="node.location" :zoom="5" width="100%" height="300px"
+                                   custom-filter="grayscale(0.8) sepia(0.5) hue-rotate(180deg) saturate(0.5) brightness(1.0)"></open-street-map-embed>
+          </div>
+        </div>
+      </div>
+    </modal>
+
     <table-view ref="tableViewRef" :data-source="fetch" :columns="nodeColumns" :page="pagination.page"
                 :page-size="pageSize" :page-count="pagination.pageCount"
-                :total-count="pagination.totalCount"></table-view>
+                :total-count="pagination.totalCount" @row-click="showDetails" :mouse-over="true"></table-view>
 
   </div>
 
@@ -12,6 +30,12 @@
 import TableView from "@/components/UI/TableView.vue";
 import {mapStores} from "pinia";
 import {useNodeStore} from "@/store/node.js";
+import Modal from "@/components/UI/Modal.vue";
+import ErrorModal from "@/components/layout/error/ErrorModal.vue";
+import TabContainer from "@/components/UI/TabContainer.vue";
+import IconButton from "@/components/UI/IconButton.vue";
+import OpenStreetMapEmbed from "@/components/UI/OpenStreetMapEmbed.vue";
+import Flag from "@/components/UI/Flag.vue";
 
 export default {
   name: "Nodes",
@@ -28,7 +52,7 @@ export default {
       }
     }
   },
-  components: {TableView},
+  components: {Flag, OpenStreetMapEmbed, IconButton, TabContainer, ErrorModal, Modal, TableView},
   computed: {
     ...mapStores(useNodeStore),
   },
@@ -40,10 +64,16 @@ export default {
       await this.nodeStore.setQuery(query);
       this.pagination = this.nodeStore.pagination;
       return this.nodeStore.nodes;
+    },
+    showDetails(node) {
+      this.node = node;
+      this.showModal = true;
     }
   },
   data() {
     return {
+      showModal: false,
+      node: null,
       nodeColumns: [
         {
           key: 'external_mapping_id',
@@ -95,4 +125,39 @@ export default {
   padding: 2.4rem;
 }
 
+
+.node-modal-container {
+  height: 40rem;
+  width: 60rem;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden; /* Verhindert Overflow */
+}
+
+.node-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  flex-shrink: 0; /* Header soll nicht schrumpfen */
+  padding-bottom: 1.6rem; /* Optional: etwas Abstand */
+}
+
+.node-body {
+  flex: 1; /* Nimmt den restlichen Platz ein */
+  min-height: 0; /* Wichtig für Flexbox-Scrolling */
+  overflow: hidden; /* Container selbst soll nicht scrollen */
+  display: flex;
+  flex-direction: column;
+  gap: 1.6rem;
+}
+
+.node-address {
+  display: flex;
+  gap: 0.8rem;
+
+  color: #6b7280;
+  font-size: 1.4rem;
+  line-height: 1.4;
+}
+
 </style>
\ No newline at end of file
diff --git a/src/frontend/src/components/layout/config/Property.vue b/src/frontend/src/components/layout/config/Property.vue
index 66417b0..805cb49 100644
--- a/src/frontend/src/components/layout/config/Property.vue
+++ b/src/frontend/src/components/layout/config/Property.vue
@@ -178,15 +178,16 @@ export default {
       }
 
       if (this.property.data_type === 'INT') {
-        this.value = parseNumberFromString(this.value, 0);
+        this.value = parseNumberFromString(this.value, 0, true);
       }
 
       if (this.property.data_type === 'PERCENTAGE') {
-        this.value = parseNumberFromString(this.value, 4);
+        this.value = parseNumberFromString(this.value, 4, true);
       }
 
       if (this.property.data_type === 'CURRENCY') {
-        this.value = parseNumberFromString(this.value, 2);
+        this.value = parseNumberFromString(this.value, 2, true);
+        console.log(this.property.name, " parsed from 'currency' property: '", this.value, "'")
       }
     }
   }
diff --git a/src/frontend/src/components/layout/edit/PriceEdit.vue b/src/frontend/src/components/layout/edit/PriceEdit.vue
index bc7e03b..23fcdcb 100644
--- a/src/frontend/src/components/layout/edit/PriceEdit.vue
+++ b/src/frontend/src/components/layout/edit/PriceEdit.vue
@@ -13,7 +13,7 @@
       </div>
 
       <div class="field-group">
-        <div class="caption-column">Oversea share [%]</div>
+        <div class="caption-column">Overseas share [%]</div>
         <div class="input-column">
           <div class="text-container">
             <input ref="overseaShareInput" @keydown.enter="handleEnter('overseaShareInput', $event)" :value="overSeaSharePercent" @blur="validateOverSeaShare" class="input-field"
diff --git a/src/frontend/src/components/layout/edit/destination/DestinationEditHandlingCost.vue b/src/frontend/src/components/layout/edit/destination/DestinationEditHandlingCost.vue
index 0c5758b..0c52506 100644
--- a/src/frontend/src/components/layout/edit/destination/DestinationEditHandlingCost.vue
+++ b/src/frontend/src/components/layout/edit/destination/DestinationEditHandlingCost.vue
@@ -58,7 +58,7 @@ export default {
     },
     repackaging: {
       get() {
-        return this.destination?.repackaging_costs?.toFixed(2) ?? '0.00';
+        return this.destination?.repackaging_costs?.toFixed(2) ?? '';
       },
       set(value) {
         return this.destination && (this.destination.repackaging_costs = value);
@@ -66,7 +66,7 @@ export default {
     },
     handling: {
       get() {
-        return this.destination?.handling_costs?.toFixed(2) ?? '0.00';
+        return this.destination?.handling_costs?.toFixed(2) ?? '';
       },
       set(value) {
         return this.destination && (this.destination.handling_costs = value);
@@ -74,7 +74,7 @@ export default {
     },
     disposal: {
       get() {
-        return this.destination?.disposal_costs?.toFixed(2) ?? '0.00';
+        return this.destination?.disposal_costs?.toFixed(2) ?? '';
       },
       set(value) {
         return this.destination && (this.destination.disposal_costs = value);
diff --git a/src/frontend/src/components/layout/help/Help.vue b/src/frontend/src/components/layout/help/Help.vue
new file mode 100644
index 0000000..7d22b3a
--- /dev/null
+++ b/src/frontend/src/components/layout/help/Help.vue
@@ -0,0 +1,38 @@
+<template>
+  <div>
+    <video controls width="100%">
+      <source :src="videoUrl" type="video/mp4">
+    </video>
+    <div v-html="text"></div>
+  </div>
+</template>
+
+
+<script>
+
+import {mapStores} from "pinia";
+import {useHelpStore} from "@/store/help.js";
+
+export default {
+  name: "Help",
+  data() {
+  },
+  computed: {
+    ...mapStores(useHelpStore),
+    currentPage() {
+      return this.helpStore.currentPage;
+    },
+    videoUrl() {
+      return this.helpStore.videoUrl;
+    },
+    text() {
+      return this.helpStore.text;
+    }
+  }
+}
+</script>
+
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/frontend/src/components/layout/help/HelpText.vue b/src/frontend/src/components/layout/help/HelpText.vue
new file mode 100644
index 0000000..95d6714
--- /dev/null
+++ b/src/frontend/src/components/layout/help/HelpText.vue
@@ -0,0 +1,107 @@
+<template>
+  <div class="help">
+    <div class="help-text-content" v-html="text"></div>
+  </div>
+</template>
+
+<script>
+import {mapStores} from "pinia";
+import {useHelpStore} from "@/store/help.js";
+
+export default {
+  name: "HelpText",
+  computed: {
+    ...mapStores(useHelpStore),
+    text() {
+      return this.helpStore.text;
+    },
+  }
+}
+</script>
+
+<style scoped>
+.help {
+  margin-top: 2rem;
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  min-height: 0;
+}
+
+.help-text-content {
+  flex: 1;
+  overflow-y: auto;
+  overflow-x: hidden;
+  padding-right: 1rem;
+}
+
+
+/* Text content styling */
+.help-text-content :deep(blockquote) {
+  margin: 0 0 2rem 0;
+  padding: 1.6rem;
+  background: #c3cfdf;
+  color: #002F54;
+  font-size: 1.4rem;
+  font-weight: 500;
+  border-radius: 0.4rem;
+}
+
+.help-text-content :deep(blockquote p) {
+  margin: 0;
+  line-height: 1.6;
+  color: #002F54;
+  font-size: 1.4rem;
+  font-weight: 400;
+}
+
+.help-text-content :deep(h3) {
+  margin: 3rem 0 1.6rem 0;
+  font-size: 1.4rem;
+  font-weight: 500;
+  color: #6B869C;
+}
+
+.help-text-content :deep(h3:first-child) {
+  margin-top: 0;
+}
+
+.help-text-content :deep(p) {
+  margin: 0 0 1.6rem 0;
+  line-height: 1.6;
+  font-size: 1.4rem;
+  font-weight: 400;
+  color: #6b7280;
+}
+
+.help-text-content :deep(strong) {
+  font-weight: 600;
+  color: #6b7280;
+}
+
+.help-text-content :deep(img) {
+  max-width: 100%;
+  height: auto;
+  margin: 1.6rem 0;
+  border-radius: 0.8rem;
+  box-shadow: 0 0.2rem 0.8rem rgba(0, 0, 0, 0.1);
+}
+
+.help-text-content :deep(ul) {
+  margin: 0 0 1.6rem 0;
+  padding-left: 2rem;
+  list-style-type: disc;
+}
+
+.help-text-content :deep(li) {
+  margin: 0.8rem 0;
+  line-height: 1.6;
+  font-size: 1.4rem;
+  font-weight: 400;
+  color: #6b7280;
+}
+
+.help-text-content :deep(li::marker) {
+  color: #c3cfdf;
+}
+</style>
\ No newline at end of file
diff --git a/src/frontend/src/components/layout/help/HelpVideo.vue b/src/frontend/src/components/layout/help/HelpVideo.vue
new file mode 100644
index 0000000..f26ce7f
--- /dev/null
+++ b/src/frontend/src/components/layout/help/HelpVideo.vue
@@ -0,0 +1,32 @@
+<template>
+  <div class="help-content-container">
+    <video controls width="80%" :key="videoUrl">
+      <source :src="videoUrl" type="video/mp4">
+    </video>
+
+  </div>
+</template>
+
+<script>
+
+import {mapStores} from "pinia";
+import {useHelpStore} from "@/store/help.js";
+
+export default {
+  name: "HelpVideo",
+  computed: {
+    ...mapStores(useHelpStore),
+    videoUrl() {
+      return this.helpStore.videoUrl;
+    },
+  }
+}
+</script>
+
+
+<style scoped>
+.help-content-container {
+  margin-top: 3rem;
+}
+
+</style>
\ No newline at end of file
diff --git a/src/frontend/src/components/layout/help/TheHelpMenu.vue b/src/frontend/src/components/layout/help/TheHelpMenu.vue
new file mode 100644
index 0000000..3559c2f
--- /dev/null
+++ b/src/frontend/src/components/layout/help/TheHelpMenu.vue
@@ -0,0 +1,57 @@
+<template>
+  <div >
+    <ul class="help-menu">
+      <li v-for="page in pages" class="help-menu-element-container" @click="$emit('changePage', page.page)"><div :class="{'help-menu-element-active': isActive(page.page)}" class="help-menu-element">{{ page.title }}</div></li>
+    </ul>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "TheHelpMenu",
+  emits: ['changePage'],
+  props: {
+    currentPage: {
+      type: String,
+      required: true
+    },
+    pages: {
+      type: Array,
+      required: true
+    }
+  },
+  methods: {
+    isActive(page) {
+      return page === this.currentPage;
+    }
+  },
+}
+</script>
+
+
+<style scoped>
+
+.help-menu-element {
+  font-weight: 400;
+  font-size: 1.4rem;
+  color: #6B869C;
+  height: 25px;
+
+}
+
+
+.help-menu-element:hover, .help-menu-element-active {
+  color: #002F54;
+  border-bottom: 5px solid #5AF0B4;
+  /* AE0055 */
+  height: 25px;
+  cursor: pointer;
+}
+
+.help-menu-element-container {
+  display: flex;
+  justify-content: flex-start;
+  list-style-type: none;
+}
+
+</style>
\ No newline at end of file
diff --git a/src/frontend/src/components/layout/help/TheHelpSystem.vue b/src/frontend/src/components/layout/help/TheHelpSystem.vue
new file mode 100644
index 0000000..4650458
--- /dev/null
+++ b/src/frontend/src/components/layout/help/TheHelpSystem.vue
@@ -0,0 +1,124 @@
+<template>
+  <teleport to="body">
+    <modal :z-index="9001" :state="showHelp">
+      <div class="help-modal-container">
+        <div class="help-modal-header">
+          <icon-button icon="x" @click="helpStore.closeHelp()"/>
+        </div>
+        <div class="help-container">
+          <div class="help-menu-container">
+            <the-help-menu @changePage="updatePage" :currentPage="currentPage" :pages="pages"/>
+          </div>
+          <div class="help-content-container">
+            <h2 class="page-header">{{ title }}</h2>
+            <tab-container :tabs="tabsConfig"></tab-container>
+          </div>
+        </div>
+      </div>
+    </modal>
+  </teleport>
+</template>
+
+<script>
+import Modal from "@/components/UI/Modal.vue";
+import {mapStores} from "pinia";
+import Help from "@/components/layout/help/Help.vue";
+import {useHelpStore} from "@/store/help.js";
+import TheHelpMenu from "@/components/layout/help/TheHelpMenu.vue";
+import BasicButton from "@/components/UI/BasicButton.vue";
+import IconButton from "@/components/UI/IconButton.vue";
+import TabContainer from "@/components/UI/TabContainer.vue";
+import {markRaw} from "vue";
+import Nodes from "@/components/layout/config/Nodes.vue";
+import HelpVideo from "@/components/layout/help/HelpVideo.vue";
+import HelpText from "@/components/layout/help/HelpText.vue";
+
+export default {
+  name: "TheHelpSystem",
+  components: {TabContainer, IconButton, BasicButton, TheHelpMenu, Help, Modal},
+  data() {
+    return {
+      tabsConfig: [
+        {
+          title: 'Video',
+          component: markRaw(HelpVideo),
+          props: {isSelected: false},
+        },
+        {
+          title: 'Text',
+          component: markRaw(HelpText),
+          props: {isSelected: false},
+        },
+      ]
+    }
+  },
+  computed: {
+    ...mapStores(useHelpStore),
+    showHelp() {
+      return this.helpStore.showHelp;
+    },
+    currentPage() {
+      return this.helpStore.currentPage;
+    },
+    title() {
+      return this.helpStore.title;
+    },
+    pages() {
+      return this.helpStore.pages;
+    }
+  },
+  methods: {
+    async updatePage(page) {
+      await this.helpStore.getContent(page);
+    }
+  },
+  created() {
+    this.helpStore.loadPages();
+  }
+}
+</script>
+
+<style scoped>
+
+
+.help-modal-container {
+  display: flex;
+  flex-direction: column;
+  gap: 1.6rem;
+  width: min(80vw, 180rem);
+  height: min(80vh, 120rem);
+  min-height: 0;
+}
+
+.help-modal-header {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  flex-shrink: 0;
+}
+
+.help-container {
+  display: flex;
+  flex-direction: row;
+  gap: 2.4rem;
+  flex: 1;
+  min-height: 0;
+}
+
+.help-menu-container {
+  flex: 0 0 auto;
+  min-width: fit-content;
+}
+
+.help-content-container {
+  flex: 1;
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 1.6rem;
+}
+
+.page-header {
+  flex-shrink: 0;
+}
+</style>
\ No newline at end of file
diff --git a/src/frontend/src/components/layout/report/Report.vue b/src/frontend/src/components/layout/report/Report.vue
index a36c328..3b5420b 100644
--- a/src/frontend/src/components/layout/report/Report.vue
+++ b/src/frontend/src/components/layout/report/Report.vue
@@ -7,42 +7,53 @@
       <report-chart
           title=""
           :mek_a="report.costs.mek_a.total"
-          :logistics_costs="report.risk.mek_b.total-report.costs.mek_a.total"
-          :chance_cost="report.risk.opportunity_scenario.total"
-          :risk_cost="report.risk.risk_scenario.total"
+          :logistics_costs="report.overview.mek_b.total-report.costs.mek_a.total"
+          :chance_cost="report.overview.opportunity_scenario.total"
+          :risk_cost="report.overview.risk_scenario.total"
           :scale="chartScale"
       ></report-chart>
     </div>
 
+    <!--    summary -->
     <div class="box-gap">
-      <collapsible-box :is-collapsable="false" variant="border" title="Overview" size="m" :stretch-content="true">
+      <collapsible-box :is-collapsable="false" variant="border" title="Summary" size="m" :stretch-content="true">
         <div class="report-content-container--3-col">
 
           <div class="report-content-row">
-            <div class="report-content-row-highlight">MEK B</div>
-            <div class="report-content-data-cell report-content-row-highlight">{{ report.risk.mek_b.total.toFixed(2) }} €</div>
-            <div class="report-content-data-cell"></div>
-          </div>
-
-          <div class="report-content-row">
-            <div>Opportunity scenario</div>
-            <div class="report-content-data-cell">{{ report.risk.opportunity_scenario.total.toFixed(2) }} €</div>
+            <div>MEK A</div>
+            <div class="report-content-data-cell">{{ report.overview.mek_a.total.toFixed(2) }} €</div>
             <div class="report-content-data-cell">{{
-                `${(report.risk.opportunity_scenario.percentage * 100).toFixed(2)} %`
+                `${(report.overview.mek_a.percentage * 100).toFixed(2)} %`
               }}
             </div>
           </div>
 
           <div class="report-content-row">
-            <div>Risk scenario</div>
-            <div class="report-content-data-cell">{{ report.risk.risk_scenario.total.toFixed(2) }} €</div>
-            <div class="report-content-data-cell">{{ `${(report.risk.risk_scenario.percentage * 100).toFixed(2)} %`}}</div>
+            <div>Logistics cost</div>
+            <div class="report-content-data-cell">{{ report.overview.logistics.total.toFixed(2) }} €</div>
+            <div class="report-content-data-cell">{{
+                `${(report.overview.logistics.percentage * 100).toFixed(2)} %`
+              }}
+            </div>
           </div>
 
-
+          <div class="report-content-row">
+            <div class="report-content-row-highlight">MEK B</div>
+            <div class="report-content-data-cell report-content-row-highlight">{{
+                report.overview.mek_b.total.toFixed(2)
+              }} €
+            </div>
+            <div class="report-content-data-cell report-content-row-highlight">{{
+                `${(report.overview.mek_b.percentage * 100).toFixed(2)} %`
+              }}
+            </div>
+          </div>
         </div>
+
+
       </collapsible-box>
     </div>
+    <!--    weighted cost breakdown-->
     <div class="box-gap">
       <collapsible-box :is-collapsable="false" variant="border" title="Weighted cost breakdown" size="m"
                        :stretch-content="true">
@@ -142,18 +153,155 @@
             <div class="report-content-data-cell">{{ (report.costs.capital.percentage * 100).toFixed(2) }}</div>
           </div>
 
+          <div class="report-content-row">
+            <div class="report-content-row-highlight">Total</div>
+            <div class="report-content-data-cell report-content-row-highlight">{{
+                report.costs.total.total.toFixed(2)
+              }}
+            </div>
+            <div class="report-content-data-cell report-content-row-highlight">
+              {{ (report.costs.total.percentage * 100).toFixed(2) }}
+            </div>
+          </div>
+
 
         </div>
       </collapsible-box>
     </div>
 
+    <!--    all time high/low container rate-->
+    <div class="box-gap">
+      <collapsible-box :is-collapsable="true" variant="border" title="Transport costs fluctuations"
+                       :initially-collapsed="true"
+                       :stretch-content="true">
 
-    <div class="box-gap" :key="premise.id" v-for="(premise, idx) in report.premises">
+        <div class="report-content-container--3-col-2">
 
-      <collapsible-box class="report-content-container" variant="border" :title="premise.destination.name"
+          <div class="report-content-row">
+            <div></div>
+            <div class="report-content-data-header-cell">total [&euro;]</div>
+            <div class="report-content-data-header-cell">of MEK B [%]</div>
+          </div>
+
+          <div class="report-content-row">
+            <div class="">Current scenario</div>
+            <div class="report-content-data-cell">{{
+                report.overview.mek_b.total.toFixed(2)
+              }} €
+            </div>
+            <div class="report-content-data-cell">{{
+                `${(report.overview.mek_b.percentage * 100).toFixed(2)}`
+              }}
+            </div>
+          </div>
+
+          <div class="report-content-row">
+            <div>Opportunity scenario</div>
+            <div class="report-content-data-cell">{{ report.overview.opportunity_scenario.total.toFixed(2) }} €</div>
+            <div class="report-content-data-cell">{{
+                `${(report.overview.opportunity_scenario.percentage * 100).toFixed(2)}`
+              }}
+            </div>
+          </div>
+
+          <div class="report-content-row">
+            <div>Risk scenario</div>
+            <div class="report-content-data-cell">{{ report.overview.risk_scenario.total.toFixed(2) }} €</div>
+            <div class="report-content-data-cell">
+              {{ `${(report.overview.risk_scenario.percentage * 100).toFixed(2)}` }}
+            </div>
+          </div>
+        </div>
+
+
+      </collapsible-box>
+    </div>
+
+
+    <!--    material and handling unit-->
+    <div class="box-gap">
+      <collapsible-box :is-collapsable="false" variant="border" title="Material" size="m"
+                       :stretch-content="true">
+
+        <div class="report-content-container--2-col">
+
+          <div class="report-content-row">
+            <div>Part number</div>
+            <div class="report-content-data-cell"> {{ report.material.part_number }}</div>
+          </div>
+
+
+          <div class="report-content-row">
+            <div>HS code</div>
+            <div class="report-content-data-cell"> {{ report.premises.hs_code }}</div>
+          </div>
+
+          <div class="report-content-row">
+            <div>Tariff rate</div>
+            <div class="report-content-data-cell"> {{ (report.premises.tariff_rate * 100).toFixed(2) }}%</div>
+          </div>
+
+          <div class="report-content-row">
+            <div>Oversea share</div>
+            <div class="report-content-data-cell">{{ (report.premises.oversea_share * 100).toFixed(2) }}%</div>
+          </div>
+
+          <div class="report-content-row" v-if="(report.premises.air_freight_share ?? null) !== null">
+            <div>Airfreight share</div>
+            <div class="report-content-data-cell">{{ (report.premises.air_freight_share * 100).toFixed(2) }}%</div>
+          </div>
+          <div class="report-content-row">
+            <div>Safety stock [w-days]</div>
+            <div class="report-content-data-cell">{{ report.premises.safety_stock }}</div>
+          </div>
+
+        </div>
+
+        <div class="report-sub-header">Handling unit</div>
+
+        <div class="report-content-container--2-col">
+
+          <div class="report-content-row">
+            <div>Dimensions [{{ report.premises.dimension_unit }}]</div>
+            <div class="report-content-data-cell">{{
+                toFixedDimension(report.premises.length, report.premises.dimension_unit)
+              }} x
+              {{ toFixedDimension(report.premises.width, report.premises.dimension_unit) }} x
+              {{ toFixedDimension(report.premises.height, report.premises.dimension_unit) }}
+            </div>
+          </div>
+
+          <div class="report-content-row">
+            <div>Weight [{{ report.premises.weight_unit }}]</div>
+            <div class="report-content-data-cell">{{
+                toFixedWeight(report.premises.weight, report.premises.weight_unit)
+              }}
+            </div>
+          </div>
+
+          <div class="report-content-row">
+            <div>Unit count</div>
+            <div class="report-content-data-cell">{{ report.premises.hu_unit_count }}</div>
+          </div>
+
+          <div class="report-content-row">
+            <div>Mixed transport</div>
+            <div class="report-content-data-cell">{{ report.premises.mixable ? 'Yes' : 'No' }}</div>
+          </div>
+
+        </div>
+
+      </collapsible-box>
+
+    </div>
+
+    <!--    destinations -->
+    <div class="box-gap" :key="destination.id" v-for="(destination, idx) in report.destinations">
+
+      <collapsible-box class="report-content-container" variant="border" :title="destination.destination.name"
                        :stretch-content="true" :initially-collapsed="true">
         <div>
-          <report-route :sections="premise.sections" :destination="premise.destination"
+          <report-route :sections="destination.sections" :destination="destination.destination"
                         :route-section-scale="routeSectionScale[idx]"></report-route>
 
           <div class="report-sub-header">General</div>
@@ -162,69 +310,19 @@
 
             <div class="report-content-row">
               <div>Annual Quantity</div>
-              <div class="report-content-data-cell">{{ premise.annual_quantity }}</div>
+              <div class="report-content-data-cell">{{ destination.annual_quantity }}</div>
             </div>
 
-            <div class="report-content-row">
-              <div>HS code</div>
-              <div class="report-content-data-cell">{{ premise.hs_code }}</div>
-            </div>
-
-            <div class="report-content-row">
-              <div>Tariff rate</div>
-              <div class="report-content-data-cell">{{ (premise.tariff_rate * 100).toFixed(2) }}%</div>
-            </div>
-
-            <div class="report-content-row">
-              <div>Oversea share</div>
-              <div class="report-content-data-cell">{{ (premise.oversea_share * 100).toFixed(2) }}%</div>
-            </div>
-
-            <div class="report-content-row" v-if="(premise.air_freight_share ?? null) !== null">
-              <div>Airfreight share</div>
-              <div class="report-content-data-cell">{{ (premise.air_freight_share * 100).toFixed(2) }}%</div>
-            </div>
 
             <div class="report-content-row">
               <div>Transit time [days]</div>
-              <div class="report-content-data-cell">{{ premise.transport_time }}</div>
+              <div class="report-content-data-cell">{{ destination.transport_time }}</div>
             </div>
 
-            <div class="report-content-row">
-              <div>Safety stock [w-days]</div>
-              <div class="report-content-data-cell">{{ premise.safety_stock }}</div>
-            </div>
+
 
           </div>
 
-          <div class="report-sub-header">Handling unit</div>
-
-          <div class="report-content-container--2-col">
-
-            <div class="report-content-row">
-              <div>Dimensions [{{ premise.dimension_unit }}]</div>
-              <div class="report-content-data-cell">{{ toFixedDimension(premise.length, premise.dimension_unit) }} x
-                {{ toFixedDimension(premise.width, premise.dimension_unit) }} x
-                {{ toFixedDimension(premise.height, premise.dimension_unit) }}
-              </div>
-            </div>
-
-            <div class="report-content-row">
-              <div>Weight [{{ premise.weight_unit }}]</div>
-              <div class="report-content-data-cell">{{ toFixedWeight(premise.weight, premise.weight_unit) }}</div>
-            </div>
-
-            <div class="report-content-row">
-              <div>Unit count</div>
-              <div class="report-content-data-cell">{{ premise.hu_unit_count }}</div>
-            </div>
-
-            <div class="report-content-row">
-              <div>Mixed transport</div>
-              <div class="report-content-data-cell">{{ premise.mixed ? 'Yes' : 'No' }}</div>
-            </div>
-
-          </div>
 
           <div class="report-sub-header">Container</div>
 
@@ -232,29 +330,33 @@
 
             <div class="report-content-row">
               <div>Stacked layers</div>
-              <div class="report-content-data-cell">{{ hasMainRun(premise.sections) ? premise.layer : '-' }}</div>
+              <div class="report-content-data-cell">{{
+                  hasMainRunOrD2D(destination.sections) ? destination.layer : '-'
+                }}
+              </div>
             </div>
 
             <div class="report-content-row">
               <div>Container unit count</div>
               <div class="report-content-data-cell">
-                {{ hasMainRun(premise.sections) ? (premise.unit_count * premise.hu_unit_count) : '-' }}
+                {{
+                  hasMainRunOrD2D(destination.sections) ? (destination.unit_count * report.premises.hu_unit_count) : '-'
+                }}
               </div>
             </div>
 
 
-
             <div class="report-content-row">
               <div>Container type</div>
               <div class="report-content-data-cell">
-                {{ hasMainRun(premise.sections) ? getContainerTypeName(premise.container_type) : '-' }}
+                {{ hasMainRunOrD2D(destination.sections) ? getContainerTypeName(destination.container_type) : '-' }}
               </div>
             </div>
 
             <div class="report-content-row">
               <div>Limiting factor</div>
               <div class="report-content-data-cell">
-                {{ hasMainRun(premise.sections) ? premise.weight_exceeded ? 'Weight' : 'Volume' : '-' }}
+                {{ hasMainRunOrD2D(destination.sections) ? destination.weight_exceeded ? 'Weight' : 'Volume' : '-' }}
               </div>
             </div>
 
@@ -293,8 +395,8 @@ export default {
     }
   },
   methods: {
-    hasMainRun(sections) {
-      return sections.some(section => section.transport_type === 'SEA' || section.transport_type === 'RAIL');
+    hasMainRunOrD2D(sections) {
+      return sections.some(section => section.transport_type === 'SEA' || section.transport_type === 'RAIL' || section.rate_type === 'D2D');
     },
     shorten(text, length) {
       if (text !== null && text !== undefined && text.length > length) {
@@ -390,6 +492,14 @@ export default {
   font-size: 1.2rem;
 }
 
+.report-content-container--3-col-2 {
+  display: grid;
+  grid-template-columns: 5fr 3fr 3fr;
+  gap: 1rem;
+  margin-top: 1.6rem;
+  font-size: 1.2rem;
+}
+
 .report-content-row {
   display: contents;
   color: #6B869C;
diff --git a/src/frontend/src/main.js b/src/frontend/src/main.js
index c19cce7..27310c4 100644
--- a/src/frontend/src/main.js
+++ b/src/frontend/src/main.js
@@ -34,7 +34,7 @@ import {
     PhUpload,
     PhWarning,
     PhX,
-    PhExclamationMark, PhMapPin, PhEmpty, PhShippingContainer, PhPackage, PhVectorThree, PhTag
+    PhExclamationMark, PhMapPin, PhEmpty, PhShippingContainer, PhPackage, PhVectorThree, PhTag, PhInfo
 } from "@phosphor-icons/vue";
 import {setupSessionRefresh} from "@/store/activeuser.js";
 
@@ -81,6 +81,7 @@ app.component("PhMapPin", PhMapPin);
 app.component("PhPackage", PhPackage);
 app.component("PhVectorThree", PhVectorThree);
 app.component("PhTag", PhTag);
+app.component("PhInfo", PhInfo);
 
 
 app.use(router);
diff --git a/src/frontend/src/pages/CalculationAssistant.vue b/src/frontend/src/pages/CalculationAssistant.vue
index b6051b9..d897343 100644
--- a/src/frontend/src/pages/CalculationAssistant.vue
+++ b/src/frontend/src/pages/CalculationAssistant.vue
@@ -1,6 +1,15 @@
 <template>
   <div class="start-calculation-container">
-    <h2 class="page-header">Create Calculation</h2>
+    <div class="start-calculation-header">
+      <div>
+        <h2 class="page-header">Create Calculation</h2>
+      </div>
+      <div class="start-calculation-help">
+        <icon-button v-if="useHelpStore().enableHelp" icon="info"
+                     @click="useHelpStore().activateHelp('assistant')"></icon-button>
+      </div>
+
+    </div>
 
 
     <div class="part-numbers-headers">
@@ -23,8 +32,15 @@
           <textarea v-model="partNumberField" name="partNumbers" cols="140" rows="15"></textarea>
         </div>
         <div class="part-number-modal-action">
-          <basic-button @click="parsePartNumbers" icon="CloudArrowUp">Analyze input</basic-button>
-          <basic-button @click="closeModal('partNumber')" :show-icon="false" variant="secondary">Cancel</basic-button>
+          <div class="part-number-modal-action-help">
+            <icon-button v-if="useHelpStore().enableHelp" icon="info"
+                         @click="useHelpStore().activateHelp('assistant')"></icon-button>
+          </div>
+          <div class="part-number-modal-action-buttons">
+            <basic-button @click="parsePartNumbers" icon="CloudArrowUp">Analyze input</basic-button>
+            <basic-button @click="closeModal('partNumber')" :show-icon="false" variant="secondary">Cancel</basic-button>
+
+          </div>
         </div>
       </div>
     </modal>
@@ -88,11 +104,22 @@ import CreateNewNode from "@/components/layout/node/CreateNewNode.vue";
 import Checkbox from "@/components/UI/Checkbox.vue";
 import {UrlSafeBase64} from "@/common.js";
 import {useNotificationStore} from "@/store/notification.js";
+import IconButton from "@/components/UI/IconButton.vue";
+import {useHelpStore} from "@/store/help.js";
 
 
 export default {
   name: "CalculationAssistant",
-  components: {Checkbox, CreateNewNode, Modal, SupplierItem, MaterialItem, BasicButton, AutosuggestSearchbar},
+  components: {
+    IconButton,
+    Checkbox,
+    CreateNewNode,
+    Modal,
+    SupplierItem,
+    MaterialItem,
+    BasicButton,
+    AutosuggestSearchbar
+  },
   computed: {
     ...mapStores(useNodeStore, useAssistantStore, useNotificationStore),
     showPartNumberModal() {
@@ -108,6 +135,7 @@ export default {
     }
   },
   methods: {
+    useHelpStore,
     setUseExisting(useExisting) {
       this.assistantStore.setCreateEmpty(!useExisting);
     },
@@ -160,7 +188,7 @@ export default {
     parsePartNumbers() {
       this.closeModal('partNumber');
 
-      if(this.partNumberField.trim().length !== 0)
+      if (this.partNumberField.trim().length !== 0)
         this.assistantStore.getMaterialsAndSuppliers(this.partNumberField);
 
       this.partNumberField = '';
@@ -179,6 +207,22 @@ export default {
 
 <style scoped>
 
+.start-calculation-help {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  gap: 1.6rem;
+  margin-bottom: 3rem;
+}
+
+.start-calculation-header {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+  gap: 1.6rem;
+}
+
 .start-calculation-footer-container {
   display: flex;
   justify-content: space-between;
@@ -232,10 +276,17 @@ textarea {
   gap: 1.6rem;
 }
 
+.part-number-modal-action-help {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  gap: 0.8rem;
+}
+
 .part-number-modal-action {
   display: flex;
   align-items: center;
-  justify-content: flex-end;
+  justify-content: space-between;
   gap: 1.6rem
 }
 
@@ -246,6 +297,13 @@ textarea {
   margin-bottom: 1.6rem;
 }
 
+.part-number-modal-action-buttons {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 1.6rem
+}
+
 .item-list {
   display: flex;
   list-style: none;
diff --git a/src/frontend/src/pages/CalculationMassEdit.vue b/src/frontend/src/pages/CalculationMassEdit.vue
index 2952b0e..bbc4da3 100644
--- a/src/frontend/src/pages/CalculationMassEdit.vue
+++ b/src/frontend/src/pages/CalculationMassEdit.vue
@@ -2,7 +2,19 @@
   <div class="edit-calculation-container"
        :class="{ 'has-selection': hasSelection, 'apply-filter': applyFilter, 'add-all': addAll }">
     <div class="header-container">
-      <h2 class="page-header">Mass edit calculation</h2>
+
+      <div class="header-caption-container">
+        <div>
+          <h2 class="page-header">Mass edit calculation</h2>
+        </div>
+        <div class="header-help-container">
+          <icon-button v-if="useHelpStore().enableHelp" icon="info"
+                       @click="useHelpStore().activateHelp('mass-edit-basics')"></icon-button>
+        </div>
+
+      </div>
+
+
       <div class="header-controls">
         <basic-button :show-icon="true"
                       :disabled="disableButtons"
@@ -173,6 +185,8 @@ import DestMassCreate from "@/components/layout/edit/destination/mass/DestMassCr
 import ModalDialog from "@/components/UI/ModalDialog.vue";
 import destinationEdit from "@/components/layout/edit/destination/DestinationEdit.vue";
 import logger from "@/logger.js";
+import IconButton from "@/components/UI/IconButton.vue";
+import {useHelpStore} from "@/store/help.js";
 
 
 const COMPONENT_TYPES = {
@@ -187,6 +201,7 @@ const COMPONENT_TYPES = {
 export default {
   name: "MassEdit",
   components: {
+    IconButton,
     ModalDialog,
     SortButton,
     Modal,
@@ -210,7 +225,7 @@ export default {
       modalType: null,
       modalProps: null,
       editIds: null,
-      processingMessage: "Please wait. Calculating ...",
+      processingMessage: "Please wait. Processing ...",
       showCalculationModal: false,
       isInitialLoad: true,
       modalDialogShow: false,
@@ -267,6 +282,9 @@ export default {
       return this.premiseEditStore.showProcessingModal || this.destinationEditStore.showProcessingModal;
     },
     shownProcessingMessage() {
+      if (this.premiseEditStore.showProcessingModal)
+        return "Please wait. Prepare calculation ..."
+
       return this.processingMessage;
     }
   },
@@ -295,6 +313,7 @@ export default {
     window.removeEventListener('keyup', this.handleKeyUp);
   },
   methods: {
+    useHelpStore,
     handleKeyDown(event) {
       if (event.key === 'Control') {
         this.isCtrlPressed = true;
@@ -441,6 +460,7 @@ export default {
     async closeEditModalAction(action) {
 
       let massUpdate = false;
+      let success = true;
 
       if (this.modalType === 'amount' || this.modalType === 'routes' || this.modalType === "destinations") {
 
@@ -450,18 +470,21 @@ export default {
             const setMatrix = this.$refs.modalComponent?.destMatrix;
 
             if (setMatrix) {
-              await this.destinationEditStore.massSetDestinations(setMatrix);
+              success = await this.destinationEditStore.massSetDestinations(setMatrix);
             }
           } else {
             massUpdate = true
           }
         }
 
-        // Clear data
-        this.fillData(this.modalType);
-        this.modalType = null;
 
-        if(massUpdate) {
+        if (success) {
+          // Clear data
+          this.fillData(this.modalType);
+          this.modalType = null;
+        } else return;
+
+        if (massUpdate) {
           await this.destinationEditStore.massUpdateDestinations(this.editIds);
         }
 
@@ -487,6 +510,8 @@ export default {
     },
     fillData(type, id = -1, hideDescription = false) {
 
+      this.modalTitle = "Edit ".concat(type);
+
       if (id === -1) {
 
         if (type === 'price')
@@ -523,8 +548,6 @@ export default {
       } else {
         const premise = this.premiseEditStore.getById(id);
 
-        this.modalTitle = "Edit ".concat(type);
-
         if (type === "price") {
           this.modalProps = {
             price: premise.material_cost,
@@ -735,4 +758,20 @@ export default {
   display: flex;
   gap: 1.6rem;
 }
+
+.header-help-container {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  gap: 1.6rem;
+  margin-bottom: 3rem;
+}
+
+.header-caption-container {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+  gap: 1.6rem;
+}
 </style>
diff --git a/src/frontend/src/pages/CalculationSingleEdit.vue b/src/frontend/src/pages/CalculationSingleEdit.vue
index f13a3f8..10ff27d 100644
--- a/src/frontend/src/pages/CalculationSingleEdit.vue
+++ b/src/frontend/src/pages/CalculationSingleEdit.vue
@@ -1,7 +1,22 @@
 <template>
   <div class="edit-calculation-container">
     <div class="header-container">
-      <h2 class="page-header">Edit calculation</h2>
+
+
+      <div class="header-container">
+        <div>
+          <h2 class="page-header">Edit calculation</h2>
+        </div>
+        <div class="header-help-container">
+          <icon-button v-if="useHelpStore().enableHelp" icon="info"
+                       @click="useHelpStore().activateHelp('single-edit')"></icon-button>
+        </div>
+
+      </div>
+
+
+
+
       <div class="header-controls">
         <basic-button @click="close" :show-icon="false" :disabled="premiseSingleEditStore.showLoadingSpinner"
                       variant="secondary"> {{ fromMassEdit ? 'Back' : 'Close' }}
@@ -107,6 +122,7 @@ import {UrlSafeBase64} from "@/common.js";
 import {usePremiseSingleEditStore} from "@/store/premiseSingleEdit.js";
 import {useNotificationStore} from "@/store/notification.js";
 import Spinner from "@/components/UI/Spinner.vue";
+import {useHelpStore} from "@/store/help.js";
 
 export default {
   name: "SingleEdit",
@@ -147,7 +163,7 @@ export default {
       if (this.premiseSingleEditStore.routing)
         return "Please wait. Routing ..."
 
-      return "Please wait. Calculating ...";
+      return "Please wait. Prepare calculation ...";
     }
   },
   watch: {
@@ -161,6 +177,7 @@ export default {
     }
   },
   methods: {
+    useHelpStore,
 
     async startCalculation() {
       this.showCalculationModal = true;
@@ -209,6 +226,23 @@ export default {
 </script>
 
 <style scoped>
+
+.header-help-container {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  gap: 1.6rem;
+  margin-bottom: 3rem;
+}
+
+.header-container {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+  gap: 1.6rem;
+}
+
 .edit-calculation-container {
   display: flex;
   flex-direction: column;
diff --git a/src/frontend/src/pages/Calculations.vue b/src/frontend/src/pages/Calculations.vue
index f54cccc..a88645d 100644
--- a/src/frontend/src/pages/Calculations.vue
+++ b/src/frontend/src/pages/Calculations.vue
@@ -1,9 +1,25 @@
 <template>
   <div>
 
-    <h2 class="page-header">My calculations</h2>
+    <div class="header-container">
+      <div>
+        <h2 class="page-header"> My calculations</h2>
+      </div>
+      <div class="header-help-container">
+        <icon-button v-if="useHelpStore().enableHelp" icon="info"
+                     @click="useHelpStore().activateHelp('dashboard')"></icon-button>
+      </div>
+
+    </div>
+
+    <h2 class="page-sub-header">{{ greeting }}</h2>
 
 
+    <h3 class="sub-header">Status</h3>
+
+    <the-dashboard></the-dashboard>
+
+    <h3 class="sub-header">Drafts</h3>
     <div class="calculation-list-container">
 
       <the-calculation-search @execute-search="updateFilter"/>
@@ -17,6 +33,7 @@
         <div>Material</div>
         <div>Supplier</div>
         <div>Status</div>
+        <div>Created at</div>
         <div>Action</div>
       </div>
       <transition name="list-container" mode="out-in">
@@ -44,7 +61,6 @@
     <list-edit :show="showListEdit" :select-count="premiseStore.selectedIds.length"
                @action="handleMultiselectAction"></list-edit>
 
-
   </div>
 
 
@@ -68,10 +84,16 @@ import {UrlSafeBase64} from "@/common.js";
 import Pagination from "@/components/UI/Pagination.vue";
 import ModalDialog from "@/components/UI/ModalDialog.vue";
 import modal from "@/components/UI/Modal.vue";
+import {useActiveUserStore} from "@/store/activeuser.js";
+import TheDashboard from "@/components/layout/calculation/TheDashboard.vue";
+import Box from "@/components/UI/Box.vue";
+import {useHelpStore} from "@/store/help.js";
 
 export default {
   name: "Calculation",
   components: {
+    Box,
+    TheDashboard,
     ModalDialog,
     Pagination,
     ListEdit,
@@ -79,9 +101,64 @@ export default {
     CalculationListItem, Checkbox, NotificationBar, IconButton, BasicBadge, TheCalculationSearch, Flag
   },
   computed: {
-    ...mapStores(usePremiseStore),
+    ...mapStores(usePremiseStore, useActiveUserStore),
     showListEdit() {
       return this.premiseStore.globallySomeChecked;
+    },
+    greeting() {
+      const now = new Date();
+      const hour = now.getHours();
+
+      // Get day of year as seed for consistent random selection throughout the day
+      const dayOfYear = Math.floor((now - new Date(now.getFullYear(), 0, 0)) / 86400000);
+
+      let greetings = [];
+
+      // Morning: 5-12
+      if (hour >= 5 && hour < 12) {
+        greetings = [
+          `Good morning, ${this.username}`,
+          `Morning, ${this.username}!`,
+          `Good morning, ${this.username}. Ready to calculate?`,
+          `Morning ${this.username}, what's on the agenda today?`
+        ];
+      }
+      // Afternoon: 12-18
+      else if (hour >= 12 && hour < 18) {
+        greetings = [
+          `Good afternoon, ${this.username}`,
+          `Hi ${this.username}, welcome back`,
+          `Afternoon, ${this.username}!`,
+          `Hello ${this.username}, let's continue`,
+          `Hi ${this.username}, ready to work?`
+        ];
+      }
+      // Evening: 18-22
+      else if (hour >= 18 && hour < 22) {
+        greetings = [
+          `Good evening, ${this.username}`,
+          `Evening, ${this.username}!`,
+          `Hi ${this.username}, still working hard?`,
+          `Good evening, ${this.username}, almost done for today?`
+        ];
+      }
+      // Night: 22-5
+      else {
+        greetings = [
+          `Working late, ${this.username}?`,
+          `Hi ${this.username}, burning the midnight oil?`,
+          `Hello ${this.username}`,
+          `Still here, ${this.username}?`,
+          `Hi ${this.username}, don't stay up too late`
+        ];
+      }
+
+      // Use day of year as seed for consistent selection
+      const index = dayOfYear % greetings.length;
+      return greetings[index];
+    },
+    username() {
+      return this.activeUserStore.username;
     }
   },
   data() {
@@ -118,6 +195,7 @@ export default {
     await this.executeSearch();
   },
   methods: {
+    useHelpStore,
     async handleModalAction(action) {
       if (action === 'dismiss') {
         this.modal.state = false;
@@ -240,7 +318,7 @@ export default {
       }
     },
     updatePagination(resetPage = true) {
-      if(resetPage) {
+      if (resetPage) {
         this.updatePage(1);
       }
       this.pagination = this.premiseStore.pagination;
@@ -293,6 +371,36 @@ export default {
 
 <style scoped>
 
+.header-help-container {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  gap: 1.6rem;
+}
+
+.header-container {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+  gap: 1.6rem;
+}
+
+.page-header {
+  font-weight: normal;
+  margin-bottom: 0;
+  font-size: 2.4rem;
+  color: #002F54;
+}
+
+.page-sub-header {
+  font-weight: normal;
+  font-size: 1.8rem;
+  color: #6B869C;
+  margin-bottom: 2.4rem;
+}
+
+
 .space-around {
   margin: 3rem;
 }
@@ -372,7 +480,7 @@ export default {
 
 .calculation-list-header {
   display: grid;
-  grid-template-columns: 6rem 1fr 2fr 14rem 10rem;
+  grid-template-columns: 6rem 1fr 2fr 14rem 20rem 10rem;
   gap: 1.6rem;
   padding: 1.6rem;
   background-color: #ffffff;
diff --git a/src/frontend/src/pages/Reporting.vue b/src/frontend/src/pages/Reporting.vue
index 8ff009d..233bc5f 100644
--- a/src/frontend/src/pages/Reporting.vue
+++ b/src/frontend/src/pages/Reporting.vue
@@ -1,12 +1,26 @@
 <template>
   <div>
     <div class="header-container">
-      <h2 class="page-header page-header-align">Reporting
+
+      <div class="header-caption-container">
+        <div>
+          <h2 class="page-header page-header-align">Reporting
+
+          </h2>
+
+        </div>
+        <div class="header-help-container">
+          <icon-button v-if="useHelpStore().enableHelp" icon="info"
+                       @click="useHelpStore().activateHelp('report')"></icon-button>
+        </div>
         <div class="page-header-badges">
           <basic-badge variant="primary" v-if="period">{{ period }}</basic-badge>
           <basic-badge variant="secondary" v-if="partNumber">{{ partNumber }}</basic-badge>
         </div>
-      </h2>
+
+      </div>
+
+
       <div class="header-controls">
         <basic-button @click="createReport" icon="file">Create report</basic-button>
         <basic-button :disabled="!hasReport" variant="secondary" @click="downloadReport" icon="Download">Export
@@ -56,10 +70,12 @@ import ReportChart from "@/components/UI/ReportChart.vue";
 import Report from "@/components/layout/report/Report.vue";
 import BasicBadge from "@/components/UI/BasicBadge.vue";
 import {buildDate} from "@/common.js";
+import IconButton from "@/components/UI/IconButton.vue";
+import {useHelpStore} from "@/store/help.js";
 
 export default {
   name: "Reporting",
-  components: {BasicBadge, Report, ReportChart, Spinner, Box, SelectForReport, BasicButton, Modal},
+  components: {IconButton, BasicBadge, Report, ReportChart, Spinner, Box, SelectForReport, BasicButton, Modal},
   data() {
     return {
       showModal: false,
@@ -75,17 +91,17 @@ export default {
     },
     routeSectionScale() {
       const reports = this.reportsStore.reports;
-      const scale = new Array(reports.map(r => r.premises.length).reduce((max, n) => Math.max(n, max), 0)).fill(0);
+      const scale = new Array(reports.map(r => r.destinations.length).reduce((max, n) => Math.max(n, max), 0)).fill(0);
 
       for (let i = 0; i < scale.length; i++) {
         for (const report of reports) {
-          if(report.premises.length > i) {
-            scale[i] = Math.max(scale[i], report.premises[i].sections.length);
+          if (report.destinations.length > i) {
+            scale[i] = Math.max(scale[i], report.destinations[i].sections.length);
           }
         }
       }
 
-      return scale.map(s => (s+1)*4);
+      return scale.map(s => (s + 1) * 4);
     },
     reports() {
       return this.reportsStore.reports
@@ -113,6 +129,7 @@ export default {
     }
   },
   methods: {
+    useHelpStore,
     downloadReport() {
       this.reportsStore.downloadReport();
     },
@@ -140,6 +157,22 @@ export default {
 
 <style scoped>
 
+.header-help-container {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  gap: 1.6rem;
+  margin-bottom: 3rem;
+}
+
+.header-caption-container {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+  gap: 1.6rem;
+}
+
 .page-header-align {
   display: flex;
   align-items: center;
@@ -150,6 +183,7 @@ export default {
   display: flex;
   align-items: center;
   gap: 0.8rem;
+  margin-bottom: 3rem;
 }
 
 .space-around {
diff --git a/src/frontend/src/store/activeuser.js b/src/frontend/src/store/activeuser.js
index 39e063f..d5419a7 100644
--- a/src/frontend/src/store/activeuser.js
+++ b/src/frontend/src/store/activeuser.js
@@ -62,6 +62,11 @@ export const useActiveUserStore = defineStore('activeUser', {
             if (state.user === null)
                 return false;
             return state.user.groups?.includes("super") || state.user.groups?.includes("freight");
+        },
+        username(state) {
+            if (state.user === null)
+                return null;
+            return state.user.firstname; //+ ' ' + state.user.lastname;
         }
 
     },
diff --git a/src/frontend/src/store/apps.js b/src/frontend/src/store/apps.js
index 599059d..d9cb561 100644
--- a/src/frontend/src/store/apps.js
+++ b/src/frontend/src/store/apps.js
@@ -24,6 +24,18 @@ export const useAppsStore = defineStore('apps', {
             this.apps = resp.data;
             this.loading = false;
         },
+        async exportApp(id) {
+            const url = `${config.backendUrl}/apps/export/${id}`;
+            const resp = await performRequest(this, 'GET', url, null);
+            return resp.data;
+        },
+        async importApp(app) {
+            const url = `${config.backendUrl}/apps/import`;
+            const resp = await performRequest(this, 'POST', url, { data: app },true);
+
+            if(resp.data)
+                await this.loadApps();
+        },
         async addApp(appName, appGroups) {
             const url = `${config.backendUrl}/apps`;
 
diff --git a/src/frontend/src/store/bulkOperation.js b/src/frontend/src/store/bulkOperation.js
index 437a4bc..bfc5e18 100644
--- a/src/frontend/src/store/bulkOperation.js
+++ b/src/frontend/src/store/bulkOperation.js
@@ -43,7 +43,7 @@ export const useBulkOperationStore = defineStore('bulkOperation', {
                 useNotificationStore().addNotification({
                     title: 'Bulk operation',
                     message: 'All your bulk operations have been completed.',
-                    type: 'success',
+                    variant: 'info',
                     icon: 'stack',
                 })
 
diff --git a/src/frontend/src/store/dashboard.js b/src/frontend/src/store/dashboard.js
new file mode 100644
index 0000000..9faed48
--- /dev/null
+++ b/src/frontend/src/store/dashboard.js
@@ -0,0 +1,74 @@
+import {defineStore} from 'pinia'
+import performRequest from "@/backend.js";
+import {config} from '@/config'
+import {useNotificationStore} from "@/store/notification.js";
+
+export const useDashboardStore = defineStore('dashboard', {
+    state: () => ({
+        stats: null,
+        pullInterval: 3000,
+        pullTimer: null,
+    }),
+    getters: {
+        completed(state) {
+            if (state.stats)
+                return state.stats.completed;
+
+            return null;
+        },
+        running(state) {
+            if (state.stats)
+                return state.stats.running;
+
+            return null;
+        },
+        drafts(state) {
+            if (state.stats)
+                return state.stats.drafts;
+
+            return null;
+        },
+        failed(state) {
+            if (state.stats)
+                return state.stats.failed;
+
+            return null;
+        }
+    },
+    actions: {
+        async load() {
+            const url = `${config.backendUrl}/dashboard`;
+            const resp = await performRequest(this, 'GET', url, null);
+
+            if(this.stats?.running && this.stats.running > 0 && resp.data.running === 0) {
+                useNotificationStore().addNotification({
+                    title: 'Calculation',
+                    message: 'All your calculations have been completed.',
+                    variant: 'info',
+                    icon: 'calculator',
+                })
+            }
+
+            this.stats = resp.data;
+        },
+        startPulling() {
+            if (this.pullTimer) return
+
+            this.pullTimer = setTimeout(async () => {
+                await this.pull()
+            }, this.pullInterval)
+        },
+        stopPulling() {
+            if (this.pullTimer) {
+                clearTimeout(this.pullTimer)
+                this.pullTimer = null
+            }
+        },
+        async pull() {
+            await this.load();
+            this.stopPulling();
+            this.startPulling();
+        }
+    }
+
+});
\ No newline at end of file
diff --git a/src/frontend/src/store/destinationEdit.js b/src/frontend/src/store/destinationEdit.js
index e15fc31..eb160a8 100644
--- a/src/frontend/src/store/destinationEdit.js
+++ b/src/frontend/src/store/destinationEdit.js
@@ -1,6 +1,8 @@
 import {defineStore} from 'pinia'
 import performRequest from "@/backend.js";
 import {config} from '@/config'
+import logger from "@/logger.js";
+import {useNotificationStore} from "@/store/notification.js";
 
 export const useDestinationEditStore = defineStore('destinationEdit', {
     state: () => ({
@@ -83,30 +85,44 @@ export const useDestinationEditStore = defineStore('destinationEdit', {
         async massSetDestinations(updateMatrix) {
             this.loading = true;
 
-            const toBeAdded = {};
-            const toBeDeletedMap = new Map();
+            try {
 
-            updateMatrix.forEach(row => {
-                toBeAdded[row.id] = row.destinations.filter(d => d.selected).map(d => d.id);
-                toBeDeletedMap.set(row.id, row.destinations.filter(d => !d.selected).map(d => d.id));
-            });
+                const toBeAdded = {};
+                const toBeDeletedMap = new Map();
 
-            const url = `${config.backendUrl}/calculation/destination`;
-            const {
-                data: data,
-                headers: headers
-            } = await performRequest(this, 'POST', url, {'destination_node_ids': toBeAdded});
+                updateMatrix.forEach(row => {
+                    toBeAdded[row.id] = row.destinations.filter(d => d.selected).map(d => d.id);
+                    toBeDeletedMap.set(row.id, row.destinations.filter(d => !d.selected).map(d => d.id));
+                });
 
-            this.destinations.forEach((destinations, premiseId) => {
-                const toBeDeleted = toBeDeletedMap.get(premiseId);
+                const url = `${config.backendUrl}/calculation/destination`;
+                const {
+                    data: data,
+                    headers: headers
+                } = await performRequest(this, 'POST', url, {'destination_node_ids': toBeAdded});
 
-                const filtered = destinations !== null ? destinations.filter(d => !toBeDeleted?.includes(d.destination_node.id)) : [];
+                this.destinations.forEach((destinations, premiseId) => {
+                    const toBeDeleted = toBeDeletedMap.get(premiseId);
 
-                this.destinations.set(premiseId, [...filtered, ...data[premiseId]]);
-            });
+                    const filtered = destinations !== null ? destinations.filter(d => !toBeDeleted?.includes(d.destination_node.id)) : [];
 
+                    this.destinations.set(premiseId, [...filtered, ...data[premiseId]]);
+                });
 
-            this.loading = false;
+            } catch (error) {
+                logger.error('Error in massSetDestinations:', error);
+                useNotificationStore().addNotification({
+                    title: 'Unable to set destinations',
+                    message: error.message ?? error.toString(),
+                    variant: 'exception',
+                    icon: 'bug',
+                })
+                return false;
+            } finally {
+                this.loading = false;
+            }
+
+            return true;
         },
         async massUpdateDestinations(premiseIds) {
             this.loading = true;
diff --git a/src/frontend/src/store/help.js b/src/frontend/src/store/help.js
new file mode 100644
index 0000000..eb0c975
--- /dev/null
+++ b/src/frontend/src/store/help.js
@@ -0,0 +1,53 @@
+import {defineStore} from "pinia";
+import {config} from "@/config.js";
+import performRequest from "@/backend.js";
+
+export const useHelpStore = defineStore('help', {
+    state() {
+        return {
+            currentPage: null,
+            pages: null,
+            content: null,
+            showHelp: false,
+        }
+    },
+    getters: {
+        title(state) {
+          return state.pages?.find(p => p.page === state.currentPage)?.title;
+        },
+        videoUrl(state) {
+            return state.content?.video;
+        },
+        text(state) {
+            return state.content?.content;
+        },
+        showHelpVideo() {
+            return this.baseUrl && this.baseUrl !== "";
+        },
+        enableHelp() {
+            return this.pages !== null && this.pages.length > 0;
+        }
+    },
+    actions: {
+        async getContent(pageId) {
+            const url = `${config.backendUrl}/help/content/${pageId}`;
+            const {data: data, headers: headers} = await performRequest(this, 'GET', url, null);
+            console.log("help system", data);
+            this.content = data;
+            this.currentPage = pageId;
+        },
+        async loadPages() {
+            const url = `${config.backendUrl}/help/content`;
+            const {data: data, headers: headers} = await performRequest(this, 'GET', url, null);
+            this.pages = data;
+        },
+        async activateHelp(pageId) {
+            await this.getContent(pageId);
+            this.showHelp = true;
+
+        },
+        closeHelp() {
+            this.showHelp = false;
+        }
+    }
+});
\ No newline at end of file
diff --git a/src/frontend/src/store/notification.js b/src/frontend/src/store/notification.js
index 018691c..b2fe61d 100644
--- a/src/frontend/src/store/notification.js
+++ b/src/frontend/src/store/notification.js
@@ -33,6 +33,9 @@ export const useNotificationStore = defineStore('notification', {
             return this.notifications.pop();
         },
         addNotification(notification) {
+
+            console.log("add notification", notification, this.notifications.length)
+
             this.notifications.push({
                 icon: notification.icon ?? null,
                 message: notification.message ?? 'Unknown notification',
diff --git a/src/frontend/src/store/premiseEdit.js b/src/frontend/src/store/premiseEdit.js
index 9d494aa..b6f62cd 100644
--- a/src/frontend/src/store/premiseEdit.js
+++ b/src/frontend/src/store/premiseEdit.js
@@ -16,10 +16,7 @@ export const usePremiseEditStore = defineStore('premiseEdit', {
                  */
                 loading: false,
 
-                /**
-                 * set to true while the store sets the selected/deselected field in the premises.
-                 */
-                selectedLoading: false,
+                processing: false,
 
                 throwsException: true,
             }
@@ -113,7 +110,7 @@ export const usePremiseEditStore = defineStore('premiseEdit', {
             },
 
             showProcessingModal(state) {
-                return state.processDestinationMassEdit;
+                return state.processing;
             },
 
             /**
@@ -187,7 +184,9 @@ export const usePremiseEditStore = defineStore('premiseEdit', {
             },
             async startCalculation() {
 
-                const body = this.premisses.map(p => p.id);
+                this.processing = true;
+
+                const body = {premise_ids: this.premisses.map(p => p.id)};
                 const url = `${config.backendUrl}/calculation/start/`;
                 let error = null;
 
@@ -196,6 +195,7 @@ export const usePremiseEditStore = defineStore('premiseEdit', {
                     error = e.errorObj;
                 })
 
+                this.processing = false;
                 return error;
             },
 
diff --git a/src/frontend/src/store/premiseSingleEdit.js b/src/frontend/src/store/premiseSingleEdit.js
index 1a01135..598b1ab 100644
--- a/src/frontend/src/store/premiseSingleEdit.js
+++ b/src/frontend/src/store/premiseSingleEdit.js
@@ -69,7 +69,7 @@ export const usePremiseSingleEditStore = defineStore('premiseSingleEdit', {
         async startCalculation() {
 
             this.calculating = true;
-            const body = [this.premise?.id];
+            const body = {premise_ids:[this.premise?.id]};
             const url = `${config.backendUrl}/calculation/start/`;
             let error = null;
 
diff --git a/src/frontend/src/store/reports.js b/src/frontend/src/store/reports.js
index d83e54e..72795fc 100644
--- a/src/frontend/src/store/reports.js
+++ b/src/frontend/src/store/reports.js
@@ -22,8 +22,8 @@ export const useReportsStore = defineStore('reports', {
                 let max = 0;
 
                 state.reports.forEach(report => {
-                    max = Math.max(report.risk.mek_b.total, max);
-                    max = Math.max(report.risk.risk_scenario.total, max);
+                    max = Math.max(report.overview.mek_b.total, max);
+                    max = Math.max(report.overview.risk_scenario.total, max);
                 })
 
                 const magnitude = Math.pow(10, Math.floor(Math.log10(max)));
@@ -37,7 +37,7 @@ export const useReportsStore = defineStore('reports', {
                     return;
 
                 const params = new URLSearchParams();
-                params.append('material', this.materialId);
+                params.append('materials', [this.materialId]);
                 params.append('sources', this.supplierIds);
                 params.append('userSources', this.userSupplierIds);
 
@@ -74,14 +74,14 @@ export const useReportsStore = defineStore('reports', {
                 this.showComparableWarning = false;
                 for (const [idx, report] of this.reports.entries()) {
                     for (const otherReport of this.reports.slice(idx + 1)) {
-                        if (report.premises.length !== otherReport.premises.length) {
+                        if (report.destinations.length !== otherReport.destinations.length) {
                             this.showComparableWarning = true;
                             break;
                         }
 
-                        for (const premise of report.premises) {
+                        for (const premise of report.destinations) {
 
-                            const otherPremise = otherReport.premises.find(otherPremise => otherPremise.destination.external_mapping_id === premise.destination.external_mapping_id);
+                            const otherPremise = otherReport.destinations.find(otherPremise => otherPremise.destination.external_mapping_id === premise.destination.external_mapping_id);
 
                             if((otherPremise ?? null) == null) {
                                 this.showComparableWarning = true;
diff --git a/src/frontend/vite.config.js b/src/frontend/vite.config.js
index 75fd831..8a25c07 100644
--- a/src/frontend/vite.config.js
+++ b/src/frontend/vite.config.js
@@ -20,7 +20,6 @@ export default defineConfig({
                     src: 'assets/map.json',
                     dest: 'assets/'
                 }
-
             ]
         })
     ],
@@ -35,4 +34,18 @@ export default defineConfig({
             '@': fileURLToPath(new URL('./src', import.meta.url))
         },
     },
-})
+    server: {
+        proxy: {
+            '/api': {
+                target: 'http://localhost:8080',
+                changeOrigin: true,
+                secure: false
+            },
+            '/help': {
+                target: 'http://localhost:8080',
+                changeOrigin: true,
+                secure: false
+            }
+        }
+    }
+})
\ No newline at end of file
diff --git a/src/main/java/de/avatic/lcc/config/AsyncConfig.java b/src/main/java/de/avatic/lcc/config/AsyncConfig.java
index ec95e6d..e38b98e 100644
--- a/src/main/java/de/avatic/lcc/config/AsyncConfig.java
+++ b/src/main/java/de/avatic/lcc/config/AsyncConfig.java
@@ -1,33 +1,41 @@
 package de.avatic.lcc.config;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.ThreadPoolExecutor;
 
 @Configuration
 @EnableAsync
+@EnableScheduling
 public class AsyncConfig {
 
-    @Bean(name = "calculationExecutor")
-    public Executor taskExecutor() {
-        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
-        executor.setCorePoolSize(16);
-        executor.setMaxPoolSize(32);
-        executor.setQueueCapacity(500);
-        executor.setThreadNamePrefix("calc-");
-        executor.initialize();
-        return executor;
+    @Bean(name = "calculationJobScheduler")
+    public ThreadPoolTaskScheduler calculationJobScheduler(
+            @Value("${calculation.job.processor.pool-size:1}") int poolSize,
+            @Value("${calculation.job.processor.thread-name-prefix:calc-job-}") String threadNamePrefix) {
+
+        ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler();
+        scheduler.setPoolSize(poolSize);
+        scheduler.setThreadNamePrefix(threadNamePrefix);
+        scheduler.setWaitForTasksToCompleteOnShutdown(true);
+        scheduler.setAwaitTerminationSeconds(60);
+        scheduler.initialize();
+
+        return scheduler;
     }
 
     @Bean(name = "customLookupExecutor")
     public Executor customLookupExecutor() {
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
-        executor.setCorePoolSize(16);
+        executor.setCorePoolSize(2);
         executor.setMaxPoolSize(32);
         executor.setQueueCapacity(500);
         executor.setThreadNamePrefix("lookup-");
diff --git a/src/main/java/de/avatic/lcc/config/SecurityConfig.java b/src/main/java/de/avatic/lcc/config/SecurityConfig.java
index 079f381..0ce4c0d 100644
--- a/src/main/java/de/avatic/lcc/config/SecurityConfig.java
+++ b/src/main/java/de/avatic/lcc/config/SecurityConfig.java
@@ -42,7 +42,7 @@ import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
 import org.springframework.security.web.csrf.CsrfToken;
 import org.springframework.security.web.csrf.CsrfTokenRequestAttributeHandler;
 import org.springframework.security.web.csrf.CsrfTokenRequestHandler;
-import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
+import org.springframework.security.web.servlet.util.matcher.PathPatternRequestMatcher;
 import org.springframework.util.StringUtils;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.CorsConfigurationSource;
@@ -111,7 +111,7 @@ public class SecurityConfig {
                 .exceptionHandling(ex -> ex
                         .defaultAuthenticationEntryPointFor(
                                 new HttpStatusEntryPoint(HttpStatus.UNAUTHORIZED),
-                                new AntPathRequestMatcher("/api/**")
+                                PathPatternRequestMatcher.withDefaults().matcher("/api/**")
                         )
                 )
                 .csrf(csrf -> csrf
diff --git a/src/main/java/de/avatic/lcc/config/ShutdownListener.java b/src/main/java/de/avatic/lcc/config/ShutdownListener.java
index e785fd9..c21572c 100644
--- a/src/main/java/de/avatic/lcc/config/ShutdownListener.java
+++ b/src/main/java/de/avatic/lcc/config/ShutdownListener.java
@@ -18,10 +18,5 @@ public class ShutdownListener {
         Runtime runtime = Runtime.getRuntime();
         long usedMemory = (runtime.totalMemory() - runtime.freeMemory()) / 1024 / 1024;
         log.info("Memory: {} used, {} total, {} free, {} max ", usedMemory, runtime.totalMemory() / 1024 / 1024, runtime.freeMemory() / 1024 / 1024, runtime.maxMemory() / 1024 / 1024);
-
-
-
-          log.error("Thread stack dump:");
-        Thread.dumpStack();
     }
 }
\ No newline at end of file
diff --git a/src/main/java/de/avatic/lcc/controller/GlobalExceptionHandler.java b/src/main/java/de/avatic/lcc/controller/GlobalExceptionHandler.java
index 8ba656e..1dda8f4 100644
--- a/src/main/java/de/avatic/lcc/controller/GlobalExceptionHandler.java
+++ b/src/main/java/de/avatic/lcc/controller/GlobalExceptionHandler.java
@@ -133,7 +133,7 @@ public class GlobalExceptionHandler {
     public ResponseEntity<ErrorResponseDTO> handlePremiseValidationException(PremiseValidationError exception) {
         ErrorDTO error = new ErrorDTO(
                 exception.getClass().getName(),
-                "Validation error",
+                "Almost there - just need to fix a few things",
                 exception.getMessage(),
                 Arrays.asList(exception.getStackTrace())
         );
diff --git a/src/main/java/de/avatic/lcc/controller/calculation/DashboardController.java b/src/main/java/de/avatic/lcc/controller/calculation/DashboardController.java
new file mode 100644
index 0000000..7b1386d
--- /dev/null
+++ b/src/main/java/de/avatic/lcc/controller/calculation/DashboardController.java
@@ -0,0 +1,26 @@
+package de.avatic.lcc.controller.calculation;
+
+import de.avatic.lcc.dto.calculation.execution.CalculationProcessingOverviewDTO;
+import de.avatic.lcc.service.calculation.execution.CalculationJobProcessorManagementService;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/dashboard")
+public class DashboardController {
+
+    private final CalculationJobProcessorManagementService calculationJobProcessorManagementService;
+
+    public DashboardController(CalculationJobProcessorManagementService calculationJobProcessorManagementService) {
+        this.calculationJobProcessorManagementService = calculationJobProcessorManagementService;
+    }
+
+    @GetMapping({"/", ""})
+    @PreAuthorize("hasAnyRole('SUPER', 'CALCULATION')")
+    public ResponseEntity<CalculationProcessingOverviewDTO> getDashboardData() {
+        return ResponseEntity.ok(calculationJobProcessorManagementService.getCalculationOverview());
+    }
+}
diff --git a/src/main/java/de/avatic/lcc/controller/calculation/PremiseController.java b/src/main/java/de/avatic/lcc/controller/calculation/PremiseController.java
index 015dab5..21eb49c 100644
--- a/src/main/java/de/avatic/lcc/controller/calculation/PremiseController.java
+++ b/src/main/java/de/avatic/lcc/controller/calculation/PremiseController.java
@@ -1,7 +1,6 @@
 package de.avatic.lcc.controller.calculation;
 
 
-import de.avatic.lcc.dto.calculation.CalculationStatus;
 import de.avatic.lcc.dto.calculation.DestinationDTO;
 import de.avatic.lcc.dto.calculation.PremiseDTO;
 import de.avatic.lcc.dto.calculation.ResolvePremiseDTO;
@@ -15,10 +14,15 @@ import de.avatic.lcc.dto.calculation.edit.destination.DestinationUpdateDTO;
 import de.avatic.lcc.dto.calculation.edit.masterData.MaterialUpdateDTO;
 import de.avatic.lcc.dto.calculation.edit.masterData.PackagingUpdateDTO;
 import de.avatic.lcc.dto.calculation.edit.masterData.PriceUpdateDTO;
+import de.avatic.lcc.dto.calculation.execution.CalculationProcessingStateRequestDTO;
+import de.avatic.lcc.dto.calculation.execution.CalculationProcessingStateResponseDTO;
+import de.avatic.lcc.dto.calculation.execution.CalculationStartRequestDTO;
+import de.avatic.lcc.dto.calculation.execution.CalculationStartResponseDTO;
 import de.avatic.lcc.service.access.DestinationService;
 import de.avatic.lcc.service.access.PremisesService;
 import de.avatic.lcc.service.calculation.PremiseCreationService;
 import de.avatic.lcc.service.calculation.PremiseSearchStringAnalyzerService;
+import de.avatic.lcc.service.calculation.execution.CalculationJobProcessorManagementService;
 import de.avatic.lcc.util.exception.badrequest.InvalidArgumentException;
 import de.avatic.lcc.util.exception.base.BadRequestException;
 import jakarta.validation.Valid;
@@ -45,12 +49,14 @@ public class PremiseController {
     private final PremisesService premisesServices;
     private final PremiseCreationService premiseCreationService;
     private final DestinationService destinationService;
+    private final CalculationJobProcessorManagementService calculationJobProcessorManagementService;
 
-    public PremiseController(PremiseSearchStringAnalyzerService premiseSearchStringAnalyzerService, PremisesService premisesServices, PremiseCreationService premiseCreationService, DestinationService destinationService) {
+    public PremiseController(PremiseSearchStringAnalyzerService premiseSearchStringAnalyzerService, PremisesService premisesServices, PremiseCreationService premiseCreationService, DestinationService destinationService, CalculationJobProcessorManagementService calculationJobProcessorManagementService) {
         this.premiseSearchStringAnalyzerService = premiseSearchStringAnalyzerService;
         this.premisesServices = premisesServices;
         this.premiseCreationService = premiseCreationService;
         this.destinationService = destinationService;
+        this.calculationJobProcessorManagementService = calculationJobProcessorManagementService;
     }
 
     @GetMapping({"/view", "/view/"})
@@ -77,13 +83,13 @@ public class PremiseController {
     public ResponseEntity<PremiseSearchResultDTO> findMaterialsAndSuppliers(@RequestParam String search) {
 
         try {
-//            String decodedValue = URLDecoder.decode(search, StandardCharsets.UTF_8);
             return ResponseEntity.ok(premiseSearchStringAnalyzerService.findMaterialAndSuppliers(search));
         } catch (Exception e) {
             throw new BadRequestException("Bad string encoding", "Unable to decode request", e);
         }
     }
 
+
     @PostMapping({"/create", "/create/"})
     @PreAuthorize("hasAnyRole('SUPER', 'CALCULATION')")
     public ResponseEntity<List<PremiseDetailDTO>> createPremises(@RequestBody @Valid CreatePremiseDTO dto) {
@@ -135,21 +141,16 @@ public class PremiseController {
 
     @PutMapping({"/start", "/start/"})
     @PreAuthorize("hasAnyRole('SUPER', 'CALCULATION')")
-    public ResponseEntity<Void> startCalculation(@RequestBody List<Integer> premiseIds) {
-        premisesServices.startCalculation(premiseIds);
-        return ResponseEntity.ok().build();
+    public ResponseEntity<CalculationStartResponseDTO> startCalculation(@RequestBody @Valid CalculationStartRequestDTO requestDTO) {
+        var response = calculationJobProcessorManagementService.startCalculation(requestDTO);
+        return ResponseEntity.ok(response);
     }
 
-    /**
-     * Retrieves the current status of a specific calculation processing operation.
-     *
-     * @param id The unique identifier of the operation (processing_id) to check its status.
-     * @return A ResponseEntity with the bulk processing status payload.
-     */
-    @GetMapping({"/status/{processing_id}", "/status/{processing_id}/"})
-    @PreAuthorize("hasAnyRole('SUPER', 'CALCULATION')")
-    public ResponseEntity<CalculationStatus> getCalculationStatus(@PathVariable("processing_id") Integer id) {
-        return ResponseEntity.ok(premisesServices.getCalculationStatus(id));
+
+    @GetMapping({"/status/", "/status"})
+    @PreAuthorize("hasAnyRole('SUPER', 'CALCULATION', 'BASIC')")
+    public ResponseEntity<CalculationProcessingStateResponseDTO> getCalculationStatus(@RequestBody CalculationProcessingStateRequestDTO requestDTO) {
+        return ResponseEntity.ok(calculationJobProcessorManagementService.getCalculationStatus(requestDTO));
     }
 
 
@@ -215,5 +216,4 @@ public class PremiseController {
     }
 
 
-
 }
diff --git a/src/main/java/de/avatic/lcc/controller/configuration/AppsController.java b/src/main/java/de/avatic/lcc/controller/configuration/AppsController.java
index 3880a60..851ffa8 100644
--- a/src/main/java/de/avatic/lcc/controller/configuration/AppsController.java
+++ b/src/main/java/de/avatic/lcc/controller/configuration/AppsController.java
@@ -2,8 +2,10 @@ package de.avatic.lcc.controller.configuration;
 
 import com.azure.core.annotation.BodyParam;
 import de.avatic.lcc.dto.configuration.apps.AppDTO;
+import de.avatic.lcc.dto.configuration.apps.AppExchangeDTO;
 import de.avatic.lcc.service.apps.AppsService;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -16,21 +18,35 @@ public class AppsController {
     private final AppsService appsService;
 
     public AppsController(AppsService appsService) {
-
         this.appsService = appsService;
     }
 
     @GetMapping({"", "/"})
+    @PreAuthorize("hasRole('SERVICE')")
     public ResponseEntity<List<AppDTO>> listApps() {
         return ResponseEntity.ok(appsService.listApps());
     }
 
     @PostMapping({"", "/"})
+    @PreAuthorize("hasRole('SERVICE')")
     public ResponseEntity<AppDTO> updateApp(@RequestBody AppDTO dto) {
         return ResponseEntity.ok(appsService.updateApp(dto));
     }
 
+    @GetMapping({"/export/{id}", "/export/{id}/"})
+    @PreAuthorize("hasRole('SERVICE')")
+    public ResponseEntity<AppExchangeDTO> exportApp(@PathVariable Integer id) {
+        return ResponseEntity.ok(appsService.exportApp(id));
+    }
+
+    @PostMapping({"/import/", "/import"})
+    @PreAuthorize("hasRole('SERVICE')")
+    public ResponseEntity<Boolean> importApp(@RequestBody AppExchangeDTO dto) {
+        return ResponseEntity.ok(appsService.importApp(dto));
+    }
+
     @DeleteMapping({"/{id}", "/{id}/"})
+    @PreAuthorize("hasRole('SERVICE')")
     public ResponseEntity<Void> deleteApp(@PathVariable Integer id) {
         appsService.deleteApp(id);
         return ResponseEntity.ok().build();
diff --git a/src/main/java/de/avatic/lcc/controller/configuration/CalculationDumpController.java b/src/main/java/de/avatic/lcc/controller/configuration/CalculationDumpController.java
index 01ebff1..627d538 100644
--- a/src/main/java/de/avatic/lcc/controller/configuration/CalculationDumpController.java
+++ b/src/main/java/de/avatic/lcc/controller/configuration/CalculationDumpController.java
@@ -5,6 +5,7 @@ import de.avatic.lcc.repositories.error.DumpRepository;
 import de.avatic.lcc.repositories.pagination.SearchQueryPagination;
 import jakarta.validation.constraints.Min;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -20,11 +21,13 @@ public class CalculationDumpController {
     }
 
     @GetMapping({"/dump/{id}", "/dump/{id}/"})
+    @PreAuthorize("hasRole('SERVICE')")
     public ResponseEntity<CalculationJobDumpDTO> getDump(@PathVariable Integer id) {
         return ResponseEntity.ok(dumpRepository.getDump(id));
     }
 
     @GetMapping({"/dump/", "/dump"})
+    @PreAuthorize("hasRole('SERVICE')")
     public ResponseEntity<List<CalculationJobDumpDTO>> listDumps(
             @RequestParam(defaultValue = "20") @Min(1) int limit,
             @RequestParam(defaultValue = "1") @Min(1) int page) {
diff --git a/src/main/java/de/avatic/lcc/controller/help/HelpController.java b/src/main/java/de/avatic/lcc/controller/help/HelpController.java
new file mode 100644
index 0000000..a041e0e
--- /dev/null
+++ b/src/main/java/de/avatic/lcc/controller/help/HelpController.java
@@ -0,0 +1,72 @@
+package de.avatic.lcc.controller.help;
+
+import de.avatic.lcc.dto.help.HelpPage;
+import de.avatic.lcc.service.help.MarkdownService;
+import org.apache.commons.compress.utils.Lists;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api/help")
+public class HelpController {
+
+    private static final Logger logger = LoggerFactory.getLogger(HelpController.class);
+
+    private final MarkdownService markdownService;
+
+    private final List<HelpPage> pages = List.of(
+            new HelpPage("dashboard", "Dashboard"),
+            new HelpPage("assistant", "Create Calculations"),
+            new HelpPage("single-edit", "Single Edit"),
+            new HelpPage("mass-edit-basics", "Mass Edit (Basics)"),
+            new HelpPage("mass-edit-destinations", "Mass Edit (Advanced)"),
+            new HelpPage("report", "Reporting"));
+
+    @Value(value = "${lcc.help.static:}")
+    private String staticStorageUrl;
+
+    public HelpController(MarkdownService markdownService) {
+        this.markdownService = markdownService;
+    }
+
+    @GetMapping({"/content", "content"})
+    public List<HelpPage> listContent() {
+        if(staticStorageUrl == null|| staticStorageUrl.isBlank())
+            return List.of();
+
+        return pages;
+    }
+
+    @GetMapping("/content/{resource}")
+    public Map<String, String> getHelpContent(@PathVariable String resource) throws IOException {
+
+        if (pages.stream().noneMatch(p -> p.getPage().equals(resource)))
+            throw new IOException("Page not found");
+
+        Map<String, String> map = new HashMap<>();
+
+        var fileName = resource + ".md";
+        var videoUrl = staticStorageUrl == null ? null : staticStorageUrl + "/" + resource + ".mp4";
+
+        logger.info("Loading help content: {}", fileName);
+        String html = markdownService.loadAndConvertMarkdown(fileName, resource);
+
+        map.put("content", html);
+
+        if (videoUrl != null)
+            map.put("video", videoUrl);
+
+        return map;
+
+    }
+}
diff --git a/src/main/java/de/avatic/lcc/controller/maps/AzureMapsController.java b/src/main/java/de/avatic/lcc/controller/maps/AzureMapsController.java
deleted file mode 100644
index a6ce88b..0000000
--- a/src/main/java/de/avatic/lcc/controller/maps/AzureMapsController.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package de.avatic.lcc.controller.maps;
-
-import com.azure.core.credential.AccessToken;
-import com.azure.identity.DefaultAzureCredentialBuilder;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.time.OffsetDateTime;
-import java.util.HashMap;
-import java.util.Map;
-
-@RestController
-@RequestMapping("/api/maps")
-public class AzureMapsController {
-
-    @Value("${azure.maps.client.id}")
-    private String mapsClientId;
-
-    @Value("${azure.maps.subscription.key}")
-    private String mapsSubscriptionKey;
-
-    @GetMapping("/token")
-    @PreAuthorize("isAuthenticated()")
-    public ResponseEntity<Map<String, Object>> getAzureMapsToken() {
-        try {
-            // Verwende die DefaultAzureCredential für die Authentifizierung
-            var credential = new DefaultAzureCredentialBuilder().build();
-
-            // Fordere ein Token für Azure Maps an
-            AccessToken token = credential.getToken(
-                    new com.azure.core.credential.TokenRequestContext()
-                            .addScopes("https://atlas.microsoft.com/.default")
-            ).block();
-
-            Map<String, Object> response = new HashMap<>();
-            response.put("token", token.getToken());
-            response.put("expiresOn", token.getExpiresAt().toEpochSecond());
-
-            return ResponseEntity.ok(response);
-        } catch (Exception e) {
-            return ResponseEntity.internalServerError().build();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/de/avatic/lcc/controller/report/ReportingController.java b/src/main/java/de/avatic/lcc/controller/report/ReportingController.java
index d1099c5..1982f1c 100644
--- a/src/main/java/de/avatic/lcc/controller/report/ReportingController.java
+++ b/src/main/java/de/avatic/lcc/controller/report/ReportingController.java
@@ -2,17 +2,17 @@ package de.avatic.lcc.controller.report;
 
 import de.avatic.lcc.dto.generic.NodeDTO;
 import de.avatic.lcc.dto.report.ReportDTO;
+import de.avatic.lcc.dto.report.ReportSearchRequestDTO;
 import de.avatic.lcc.service.report.ExcelReportingService;
 import de.avatic.lcc.service.report.ReportingService;
+import jakarta.validation.constraints.Min;
+import org.apache.coyote.Response;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -24,7 +24,6 @@ import java.util.List;
 @RequestMapping("/api/reports")
 public class ReportingController {
 
-    //TODO: rollenbeschränkung
 
     private final ReportingService reportingService;
     private final ExcelReportingService excelReportingService;
@@ -41,6 +40,19 @@ public class ReportingController {
         this.excelReportingService = excelReportingService;
     }
 
+    @GetMapping({"/", ""})
+    @PreAuthorize("hasAnyRole('SUPER', 'CALCULATION', 'BASIC')")
+    public ResponseEntity<String> listReports(@RequestBody(required = false) ReportSearchRequestDTO filter,
+                                               @RequestParam(defaultValue = "20") @Min(1) int limit,
+                                               @RequestParam(defaultValue = "1") @Min(1) int page) {
+
+        //TODO implement me
+
+        return ResponseEntity.ok().build();
+
+    }
+
+
     /**
      * Fetches a list of suppliers for reporting purposes, based on material ID.
      *
@@ -69,13 +81,13 @@ public class ReportingController {
     /**
      * Downloads an Excel report for the given material and source nodes.
      *
-     * @param materialId The ID of the material for which the report will be downloaded.
+     * @param materialIds The IDs of the materials for which the report will be downloaded.
      * @param nodeIds    A list of node IDs (sources) to include in the downloaded report.
      * @return The Excel file as an attachment in the response.
      */
     @GetMapping({"/download", "/download/"})
     @PreAuthorize("hasAnyRole('SUPER', 'CALCULATION', 'BASIC')")
-    public ResponseEntity<InputStreamResource> downloadReport(@RequestParam(value = "material") Integer materialId, @RequestParam(value = "sources", required = false) List<Integer> nodeIds, @RequestParam(value = "userSources", required = false) List<Integer> userNodeIds) {
+    public ResponseEntity<InputStreamResource> downloadReport(@RequestParam(value = "materials") List<Integer> materialIds, @RequestParam(value = "sources", required = false) List<Integer> nodeIds, @RequestParam(value = "userSources", required = false) List<Integer> userNodeIds) {
 
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Disposition", "attachment; filename=lcc_report.xlsx");
@@ -84,6 +96,6 @@ public class ReportingController {
                 .ok()
                 .headers(headers)
                 .contentType(MediaType.parseMediaType("application/vnd.ms-excel"))
-                .body(new InputStreamResource(excelReportingService.generateExcelReport(materialId, nodeIds, userNodeIds)));
+                .body(new InputStreamResource(excelReportingService.generateExcelReport(materialIds, nodeIds, userNodeIds)));
     }
 }
diff --git a/src/main/java/de/avatic/lcc/dto/bulk/BulkFileType.java b/src/main/java/de/avatic/lcc/dto/bulk/BulkFileType.java
index c55edf7..26ff083 100644
--- a/src/main/java/de/avatic/lcc/dto/bulk/BulkFileType.java
+++ b/src/main/java/de/avatic/lcc/dto/bulk/BulkFileType.java
@@ -9,7 +9,6 @@ public enum BulkFileType {
         this.fileType = fileType;
     }
 
-
     public String getFileType() {
         return fileType;
     }
diff --git a/src/main/java/de/avatic/lcc/dto/calculation/CalculationStatus.java b/src/main/java/de/avatic/lcc/dto/calculation/CalculationStatus.java
deleted file mode 100644
index efbd745..0000000
--- a/src/main/java/de/avatic/lcc/dto/calculation/CalculationStatus.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package de.avatic.lcc.dto.calculation;
-
-import de.avatic.lcc.model.db.calculations.CalculationJobState;
-
-import java.util.Map;
-
-public class CalculationStatus {
-
-    private Integer processId;
-
-    private Map<Integer, CalculationJobState> jobStates;
-    private Map<Integer, String> exceptionMessages;
-
-}
diff --git a/src/main/java/de/avatic/lcc/dto/calculation/PremiseDTO.java b/src/main/java/de/avatic/lcc/dto/calculation/PremiseDTO.java
index ee0ff47..0ee9787 100644
--- a/src/main/java/de/avatic/lcc/dto/calculation/PremiseDTO.java
+++ b/src/main/java/de/avatic/lcc/dto/calculation/PremiseDTO.java
@@ -1,9 +1,13 @@
 package de.avatic.lcc.dto.calculation;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import de.avatic.lcc.dto.generic.MaterialDTO;
 import de.avatic.lcc.dto.generic.NodeDTO;
+import de.avatic.lcc.model.db.calculations.CalculationJobState;
 import de.avatic.lcc.model.db.users.User;
 
+import java.time.LocalDateTime;
+
 public class PremiseDTO {
 
     private int id;
@@ -14,8 +18,11 @@ public class PremiseDTO {
 
     private PremiseState state;
 
-    //TODO premise calculation result here
-    // add owner information here (for superuser)
+    @JsonProperty("calculation_state")
+    private CalculationJobState calculationStatus;
+
+    @JsonProperty("created_at")
+    private LocalDateTime createdAt;
 
     private User owner;
 
@@ -58,4 +65,20 @@ public class PremiseDTO {
     public void setState(PremiseState state) {
         this.state = state;
     }
+
+    public LocalDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(LocalDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public CalculationJobState getCalculationStatus() {
+        return calculationStatus;
+    }
+
+    public void setCalculationStatus(CalculationJobState calculationStatus) {
+        this.calculationStatus = calculationStatus;
+    }
 }
diff --git a/src/main/java/de/avatic/lcc/dto/calculation/TransitNodeDTO.java b/src/main/java/de/avatic/lcc/dto/calculation/TransitNodeDTO.java
deleted file mode 100644
index 5107ff3..0000000
--- a/src/main/java/de/avatic/lcc/dto/calculation/TransitNodeDTO.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package de.avatic.lcc.dto.calculation;
-
-public class TransitNodeDTO {
-
-    private Integer id;
-
-
-}
diff --git a/src/main/java/de/avatic/lcc/dto/calculation/execution/CalculationProcessingOverviewDTO.java b/src/main/java/de/avatic/lcc/dto/calculation/execution/CalculationProcessingOverviewDTO.java
new file mode 100644
index 0000000..c92e257
--- /dev/null
+++ b/src/main/java/de/avatic/lcc/dto/calculation/execution/CalculationProcessingOverviewDTO.java
@@ -0,0 +1,45 @@
+package de.avatic.lcc.dto.calculation.execution;
+
+public class CalculationProcessingOverviewDTO {
+
+    private Integer completed;
+
+    private Integer running;
+
+    private Integer drafts;
+
+    private Integer failed;
+
+
+    public Integer getCompleted() {
+        return completed;
+    }
+
+    public void setCompleted(Integer completed) {
+        this.completed = completed;
+    }
+
+    public Integer getRunning() {
+        return running;
+    }
+
+    public void setRunning(Integer running) {
+        this.running = running;
+    }
+
+    public Integer getDrafts() {
+        return drafts;
+    }
+
+    public void setDrafts(Integer drafts) {
+        this.drafts = drafts;
+    }
+
+    public Integer getFailed() {
+        return failed;
+    }
+
+    public void setFailed(Integer failed) {
+        this.failed = failed;
+    }
+}
diff --git a/src/main/java/de/avatic/lcc/dto/calculation/execution/CalculationProcessingStateRequestDTO.java b/src/main/java/de/avatic/lcc/dto/calculation/execution/CalculationProcessingStateRequestDTO.java
new file mode 100644
index 0000000..d5d8202
--- /dev/null
+++ b/src/main/java/de/avatic/lcc/dto/calculation/execution/CalculationProcessingStateRequestDTO.java
@@ -0,0 +1,19 @@
+package de.avatic.lcc.dto.calculation.execution;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+
+public class CalculationProcessingStateRequestDTO {
+
+    @JsonProperty("calculation_ids")
+    private List<Integer> calculationIds;
+
+    public List<Integer> getCalculationIds() {
+        return calculationIds;
+    }
+
+    public void setCalculationIds(List<Integer> calculationIds) {
+        this.calculationIds = calculationIds;
+    }
+}
diff --git a/src/main/java/de/avatic/lcc/dto/calculation/execution/CalculationProcessingStateResponseDTO.java b/src/main/java/de/avatic/lcc/dto/calculation/execution/CalculationProcessingStateResponseDTO.java
new file mode 100644
index 0000000..d483ce0
--- /dev/null
+++ b/src/main/java/de/avatic/lcc/dto/calculation/execution/CalculationProcessingStateResponseDTO.java
@@ -0,0 +1,16 @@
+package de.avatic.lcc.dto.calculation.execution;
+
+import java.util.Map;
+
+public class CalculationProcessingStateResponseDTO {
+
+    Map<Integer, String> states;
+
+    public Map<Integer, String> getStates() {
+        return states;
+    }
+
+    public void setStates(Map<Integer, String> states) {
+        this.states = states;
+    }
+}
diff --git a/src/main/java/de/avatic/lcc/dto/calculation/execution/CalculationStartRequestDTO.java b/src/main/java/de/avatic/lcc/dto/calculation/execution/CalculationStartRequestDTO.java
new file mode 100644
index 0000000..9c17326
--- /dev/null
+++ b/src/main/java/de/avatic/lcc/dto/calculation/execution/CalculationStartRequestDTO.java
@@ -0,0 +1,33 @@
+package de.avatic.lcc.dto.calculation.execution;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+
+import java.time.LocalDate;
+import java.util.List;
+
+public class CalculationStartRequestDTO {
+
+    @JsonProperty("premise_ids")
+    @Size(min = 1)
+    List<@NotNull Integer> premiseIds;
+
+    LocalDate date;
+
+    public List<Integer> getPremiseIds() {
+        return premiseIds;
+    }
+
+    public void setPremiseIds(List<Integer> premiseIds) {
+        this.premiseIds = premiseIds;
+    }
+
+    public LocalDate getDate() {
+        return date;
+    }
+
+    public void setDate(LocalDate date) {
+        this.date = date;
+    }
+}
diff --git a/src/main/java/de/avatic/lcc/dto/calculation/execution/CalculationStartResponseDTO.java b/src/main/java/de/avatic/lcc/dto/calculation/execution/CalculationStartResponseDTO.java
new file mode 100644
index 0000000..aa01a1b
--- /dev/null
+++ b/src/main/java/de/avatic/lcc/dto/calculation/execution/CalculationStartResponseDTO.java
@@ -0,0 +1,16 @@
+package de.avatic.lcc.dto.calculation.execution;
+
+import java.util.List;
+
+public class CalculationStartResponseDTO {
+
+    private List<Integer> calculationIds;
+
+    public List<Integer> getCalculationIds() {
+        return calculationIds;
+    }
+
+    public void setCalculationIds(List<Integer> calculationIds) {
+        this.calculationIds = calculationIds;
+    }
+}
diff --git a/src/main/java/de/avatic/lcc/dto/configuration/apps/AppExchangeDTO.java b/src/main/java/de/avatic/lcc/dto/configuration/apps/AppExchangeDTO.java
new file mode 100644
index 0000000..0b9f306
--- /dev/null
+++ b/src/main/java/de/avatic/lcc/dto/configuration/apps/AppExchangeDTO.java
@@ -0,0 +1,14 @@
+package de.avatic.lcc.dto.configuration.apps;
+
+public class AppExchangeDTO {
+
+    private String data;
+
+    public void setData(String data) {
+        this.data = data;
+    }
+
+    public String getData() {
+        return data;
+    }
+}
diff --git a/src/main/java/de/avatic/lcc/dto/generic/ContainerType.java b/src/main/java/de/avatic/lcc/dto/generic/ContainerType.java
index d1d0369..2df42a1 100644
--- a/src/main/java/de/avatic/lcc/dto/generic/ContainerType.java
+++ b/src/main/java/de/avatic/lcc/dto/generic/ContainerType.java
@@ -1,10 +1,10 @@
 package de.avatic.lcc.dto.generic;
 
 public enum ContainerType {
-    FEU(12030, 2350, 2390, 67.7, 24,21),
-    TEU(5890 ,2350,2390, 33.0, 11,10),
-    HC(12030, 2350, 2690, 76.4, 24,21),
-    TRUCK(13600,2450,  2650, 88.3, 34, 33);
+    FEU(12030, 2350, 2390, 67.7, 24,21, "40' GP"),
+    TEU(5890 ,2350,2390, 33.0, 11,10, "20' GP"),
+    HC(12030, 2350, 2690, 76.4, 24,21,"40' HC"),
+    TRUCK(13600,2450,  2650, 88.3, 34, 33, "Truck");
 
     private final int length;
     private final int width;
@@ -12,14 +12,16 @@ public enum ContainerType {
     private final double volume;
     private final int euroPalletCount;
     private final int industrialPalletCount;
+    private final String description;
 
-    ContainerType(int length, int width, int height, double volume, int euroPalletCount, int industrialPalletCount) {
+    ContainerType(int length, int width, int height, double volume, int euroPalletCount, int industrialPalletCount, String description) {
         this.length = length;
         this.width = width;
         this.height = height;
         this.volume = volume;
         this.euroPalletCount = euroPalletCount;
         this.industrialPalletCount = industrialPalletCount;
+        this.description = description;
 
     }
     public int getLength() {
@@ -40,4 +42,8 @@ public enum ContainerType {
         return palletType == PalletType.EURO_PALLET ? euroPalletCount : industrialPalletCount;
 
     }
+
+    public String getDescription() {
+        return description;
+    }
 }
diff --git a/src/main/java/de/avatic/lcc/dto/help/HelpPage.java b/src/main/java/de/avatic/lcc/dto/help/HelpPage.java
new file mode 100644
index 0000000..4c91a9c
--- /dev/null
+++ b/src/main/java/de/avatic/lcc/dto/help/HelpPage.java
@@ -0,0 +1,28 @@
+package de.avatic.lcc.dto.help;
+
+public class HelpPage {
+
+    String title;
+    String page;
+
+    public HelpPage(String page, String title) {
+        this.title = title;
+        this.page = page;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getPage() {
+        return page;
+    }
+
+    public void setPage(String page) {
+        this.page = page;
+    }
+}
diff --git a/src/main/java/de/avatic/lcc/dto/report/ReportDTO.java b/src/main/java/de/avatic/lcc/dto/report/ReportDTO.java
index 156e818..2f6ed7f 100644
--- a/src/main/java/de/avatic/lcc/dto/report/ReportDTO.java
+++ b/src/main/java/de/avatic/lcc/dto/report/ReportDTO.java
@@ -23,10 +23,13 @@ public class ReportDTO {
     @JsonProperty("costs")
     public Map<String, ReportEntryDTO> cost;
 
-    @JsonProperty("risk")
-    public Map<String, ReportEntryDTO> risk;
+    @JsonProperty("overview")
+    public Map<String, ReportEntryDTO> overview;
 
     @JsonProperty("premises")
+    private ReportPremisesDTO premises;
+
+    @JsonProperty("destinations")
     public List<ReportDestinationDTO> destinations;
 
     public NodeDTO getSupplier() {
@@ -49,12 +52,12 @@ public class ReportDTO {
         this.cost = cost;
     }
 
-    public Map<String, ReportEntryDTO> getRisk() {
-        return risk;
+    public Map<String, ReportEntryDTO> getOverview() {
+        return overview;
     }
 
-    public void setRisk(Map<String, ReportEntryDTO> risk) {
-        this.risk = risk;
+    public void setOverview(Map<String, ReportEntryDTO> overview) {
+        this.overview = overview;
     }
 
     public List<ReportDestinationDTO> getDestinations() {
@@ -88,4 +91,14 @@ public class ReportDTO {
     public void setEndDate(LocalDateTime endDate) {
         this.endDate = endDate;
     }
+
+
+    public ReportPremisesDTO getPremises() {
+        return premises;
+    }
+
+    public void setPremises(ReportPremisesDTO premises) {
+        this.premises = premises;
+    }
+
 }
diff --git a/src/main/java/de/avatic/lcc/dto/report/ReportDestinationDTO.java b/src/main/java/de/avatic/lcc/dto/report/ReportDestinationDTO.java
index 905c304..0ac4807 100644
--- a/src/main/java/de/avatic/lcc/dto/report/ReportDestinationDTO.java
+++ b/src/main/java/de/avatic/lcc/dto/report/ReportDestinationDTO.java
@@ -17,50 +17,18 @@ public class ReportDestinationDTO {
 
     /* general */
 
-    @JsonProperty("annual_quantity")
-    private Integer annualQuantity;
-
-    @JsonProperty("hs_code")
-    private String hsCode;
-
-    @JsonProperty("tariff_rate")
-    private Number tariffRate;
-
-    @JsonProperty("oversea_share")
-    private Double overseaShare;
-
-    @JsonProperty("air_freight_share")
-    private Double airFreightShare;
-
     @JsonProperty("transport_time")
     private Double transportTime;
 
-    @JsonProperty("safety_stock")
-    private Integer safetyStock;
 
-    /* packaging */
+    @JsonProperty("annual_quantity")
+    private Integer annualQuantity;
 
-    private Double width;
-
-    private Double height;
-
-    private Double length;
-
-    private Double weight;
-
-    @JsonProperty("dimension_unit")
-    private DimensionUnit dimensionUnit;
-
-    @JsonProperty("weight_unit")
-    private WeightUnit weightUnit;
-
-    @JsonProperty("hu_unit_count")
-    private Integer huUnitCount;
-
-    private Integer layer;
 
     /* container */
 
+    private Integer layer;
+
     @JsonProperty("unit_count")
     private Number unitCount;
 
@@ -75,8 +43,6 @@ public class ReportDestinationDTO {
     @JsonProperty("container_rate")
     private Number rate;
 
-    private Boolean mixed;
-
 
     public Integer getId() {
         return id;
@@ -110,110 +76,6 @@ public class ReportDestinationDTO {
         this.annualQuantity = annualQuantity;
     }
 
-    public String getHsCode() {
-        return hsCode;
-    }
-
-    public void setHsCode(String hsCode) {
-        this.hsCode = hsCode;
-    }
-
-    public Number getTariffRate() {
-        return tariffRate;
-    }
-
-    public void setTariffRate(Number tariffRate) {
-        this.tariffRate = tariffRate;
-    }
-
-    public Double getOverseaShare() {
-        return overseaShare;
-    }
-
-    public void setOverseaShare(Double overseaShare) {
-        this.overseaShare = overseaShare;
-    }
-
-    public Double getAirFreightShare() {
-        return airFreightShare;
-    }
-
-    public void setAirFreightShare(Double airFreightShare) {
-        this.airFreightShare = airFreightShare;
-    }
-
-    public Double getTransportTime() {
-        return transportTime;
-    }
-
-    public void setTransportTime(Double transportTime) {
-        this.transportTime = transportTime;
-    }
-
-    public Integer getSafetyStock() {
-        return safetyStock;
-    }
-
-    public void setSafetyStock(Integer safetyStock) {
-        this.safetyStock = safetyStock;
-    }
-
-    public Double getWidth() {
-        return width;
-    }
-
-    public void setWidth(Double width) {
-        this.width = width;
-    }
-
-    public Double getHeight() {
-        return height;
-    }
-
-    public void setHeight(Double height) {
-        this.height = height;
-    }
-
-    public Double getLength() {
-        return length;
-    }
-
-    public void setLength(Double length) {
-        this.length = length;
-    }
-
-    public Double getWeight() {
-        return weight;
-    }
-
-    public void setWeight(Double weight) {
-        this.weight = weight;
-    }
-
-    public DimensionUnit getDimensionUnit() {
-        return dimensionUnit;
-    }
-
-    public void setDimensionUnit(DimensionUnit dimensionUnit) {
-        this.dimensionUnit = dimensionUnit;
-    }
-
-    public WeightUnit getWeightUnit() {
-        return weightUnit;
-    }
-
-    public void setWeightUnit(WeightUnit weightUnit) {
-        this.weightUnit = weightUnit;
-    }
-
-    public Integer getHuUnitCount() {
-        return huUnitCount;
-    }
-
-    public void setHuUnitCount(Integer huUnitCount) {
-        this.huUnitCount = huUnitCount;
-    }
-
     public Integer getLayer() {
         return layer;
     }
@@ -262,11 +124,11 @@ public class ReportDestinationDTO {
         this.rate = rate;
     }
 
-    public Boolean getMixed() {
-        return mixed;
+    public Double getTransportTime() {
+        return transportTime;
     }
 
-    public void setMixed(Boolean mixed) {
-        this.mixed = mixed;
+    public void setTransportTime(Double transportTime) {
+        this.transportTime = transportTime;
     }
 }
diff --git a/src/main/java/de/avatic/lcc/dto/report/ReportPremisesDTO.java b/src/main/java/de/avatic/lcc/dto/report/ReportPremisesDTO.java
new file mode 100644
index 0000000..b5bf464
--- /dev/null
+++ b/src/main/java/de/avatic/lcc/dto/report/ReportPremisesDTO.java
@@ -0,0 +1,155 @@
+package de.avatic.lcc.dto.report;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import de.avatic.lcc.model.db.utils.DimensionUnit;
+import de.avatic.lcc.model.db.utils.WeightUnit;
+
+public class ReportPremisesDTO {
+
+
+    @JsonProperty("hs_code")
+    private String hsCode;
+
+    @JsonProperty("tariff_rate")
+    private Number tariffRate;
+
+    @JsonProperty("oversea_share")
+    private Number overseaShare;
+
+    @JsonProperty("air_freight_share")
+    private Number airFreightShare;
+
+    @JsonProperty("safety_stock")
+    private Number safetyStock;
+
+
+
+    /* packaging */
+
+    private Double width;
+
+    private Double height;
+
+    private Double length;
+
+    private Double weight;
+
+    @JsonProperty("dimension_unit")
+    private DimensionUnit dimensionUnit;
+
+    @JsonProperty("weight_unit")
+    private WeightUnit weightUnit;
+
+    @JsonProperty("hu_unit_count")
+    private Integer huUnitCount;
+
+    @JsonProperty("mixable")
+    private Boolean mixable;
+
+
+    public String getHsCode() {
+        return hsCode;
+    }
+
+    public void setHsCode(String hsCode) {
+        this.hsCode = hsCode;
+    }
+
+    public Number getTariffRate() {
+        return tariffRate;
+    }
+
+    public void setTariffRate(Number tariffRate) {
+        this.tariffRate = tariffRate;
+    }
+
+    public Double getWidth() {
+        return width;
+    }
+
+    public void setWidth(Double width) {
+        this.width = width;
+    }
+
+    public Double getHeight() {
+        return height;
+    }
+
+    public void setHeight(Double height) {
+        this.height = height;
+    }
+
+    public Double getLength() {
+        return length;
+    }
+
+    public void setLength(Double length) {
+        this.length = length;
+    }
+
+    public Double getWeight() {
+        return weight;
+    }
+
+    public void setWeight(Double weight) {
+        this.weight = weight;
+    }
+
+    public DimensionUnit getDimensionUnit() {
+        return dimensionUnit;
+    }
+
+    public void setDimensionUnit(DimensionUnit dimensionUnit) {
+        this.dimensionUnit = dimensionUnit;
+    }
+
+    public WeightUnit getWeightUnit() {
+        return weightUnit;
+    }
+
+    public void setWeightUnit(WeightUnit weightUnit) {
+        this.weightUnit = weightUnit;
+    }
+
+    public Integer getHuUnitCount() {
+        return huUnitCount;
+    }
+
+    public void setHuUnitCount(Integer huUnitCount) {
+        this.huUnitCount = huUnitCount;
+    }
+
+
+
+    public Number getOverseaShare() {
+        return overseaShare;
+    }
+
+    public void setOverseaShare(Number overseaShare) {
+        this.overseaShare = overseaShare;
+    }
+
+    public Number getAirFreightShare() {
+        return airFreightShare;
+    }
+
+    public void setAirFreightShare(Number airFreightShare) {
+        this.airFreightShare = airFreightShare;
+    }
+
+    public Number getSafetyStock() {
+        return safetyStock;
+    }
+
+    public void setSafetyStock(Number safetyStock) {
+        this.safetyStock = safetyStock;
+    }
+
+    public Boolean getMixable() {
+        return mixable;
+    }
+
+    public void setMixable(Boolean mixable) {
+        this.mixable = mixable;
+    }
+}
diff --git a/src/main/java/de/avatic/lcc/dto/report/ReportSearchRequestDTO.java b/src/main/java/de/avatic/lcc/dto/report/ReportSearchRequestDTO.java
new file mode 100644
index 0000000..fe38958
--- /dev/null
+++ b/src/main/java/de/avatic/lcc/dto/report/ReportSearchRequestDTO.java
@@ -0,0 +1,13 @@
+package de.avatic.lcc.dto.report;
+
+import java.util.List;
+
+public class ReportSearchRequestDTO {
+
+    List<Integer> supplierIds;
+
+    List<Integer> materialIds;
+
+
+
+}
diff --git a/src/main/java/de/avatic/lcc/model/bulk/header/HeaderProvider.java b/src/main/java/de/avatic/lcc/model/bulk/header/HeaderProvider.java
index eeade12..2ecb607 100644
--- a/src/main/java/de/avatic/lcc/model/bulk/header/HeaderProvider.java
+++ b/src/main/java/de/avatic/lcc/model/bulk/header/HeaderProvider.java
@@ -3,4 +3,14 @@ package de.avatic.lcc.model.bulk.header;
 public interface HeaderProvider {
     String getHeader();
 
+    default int occupiedCells() {
+        return 1;
+    }
+
+    default int getColumn() { throw new UnsupportedOperationException();}
+
+    default boolean useOrdinal() {
+        return true;
+    }
+
 }
diff --git a/src/main/java/de/avatic/lcc/model/bulk/header/PackagingHeader.java b/src/main/java/de/avatic/lcc/model/bulk/header/PackagingHeader.java
index 325264c..980485f 100644
--- a/src/main/java/de/avatic/lcc/model/bulk/header/PackagingHeader.java
+++ b/src/main/java/de/avatic/lcc/model/bulk/header/PackagingHeader.java
@@ -17,7 +17,7 @@ public enum PackagingHeader implements HeaderProvider {
     HU_DIMENSION_UNIT("HU Dimension unit"),
     HU_WEIGHT("HU gross weight"),
     HU_WEIGHT_UNIT("HU gross weight unit"),
-    HU_UNIT_COUNT("Units/HU [pieces]");
+    HU_UNIT_COUNT("SHU Units/HU [SHU pieces]");
 
 
     private final String header;
diff --git a/src/main/java/de/avatic/lcc/model/bulk/header/ReportSummaryHeader.java b/src/main/java/de/avatic/lcc/model/bulk/header/ReportSummaryHeader.java
new file mode 100644
index 0000000..c513739
--- /dev/null
+++ b/src/main/java/de/avatic/lcc/model/bulk/header/ReportSummaryHeader.java
@@ -0,0 +1,49 @@
+package de.avatic.lcc.model.bulk.header;
+
+public enum ReportSummaryHeader implements HeaderProvider{
+    MATERIAL("Material", 0, 1),
+    SUPPLIER("Supplier", 1, 1),
+    MEK_A("MEK A", 2, 2),
+    LOGISTICS_COST("Logistics costs", 4, 2),
+    MEK_B("MEK B", 6, 2),
+    TRANSPORT("Transport", 8, 1),
+    HANDLING("Handling", 9, 1),
+    STORAGE("Storage", 10, 1),
+    REPACKAGING("Repackaging", 11, 1),
+    DISPOSAL("Disposal", 12, 1),
+    CAPITAL("Capital", 13, 1),
+    CUSTOM("Custom", 14, 1),
+    FCA_FEE("FCA Fee", 15, 1),
+    AIR_FREIGHT("Air freight", 16, 1);
+
+
+    private final int occupiedCells;
+    private final String header;
+    private final int column;
+
+    ReportSummaryHeader(String header, int column, int occupiedCells) {
+        this.occupiedCells = occupiedCells;
+        this.header = header;
+        this.column = column;
+    }
+
+    @Override
+    public boolean useOrdinal() {
+        return false;
+    }
+
+    @Override
+    public String getHeader() {
+        return header;
+    }
+
+    @Override
+    public int occupiedCells() {
+        return occupiedCells;
+    }
+
+    @Override
+    public int getColumn() {
+        return column;
+    }
+}
diff --git a/src/main/java/de/avatic/lcc/model/calculation/ContainerCalculationResult.java b/src/main/java/de/avatic/lcc/model/calculation/ContainerCalculationResult.java
index c2e69ca..cd879c9 100644
--- a/src/main/java/de/avatic/lcc/model/calculation/ContainerCalculationResult.java
+++ b/src/main/java/de/avatic/lcc/model/calculation/ContainerCalculationResult.java
@@ -215,7 +215,7 @@ public class ContainerCalculationResult {
      * @return The total utilization value for the container.
      */
     public double getTotalUtilizationByVolume() {
-        return getHuUtilizationByVolume() * huUnitCount * layer;
+        return getHuUtilizationByVolume() * huUnitCount;
     }
 
     /**
@@ -254,4 +254,7 @@ public class ContainerCalculationResult {
         return WeightUnit.KG.convertFromG(hu.getWeight()) / maxContainerWeight;
     }
 
+    public int getHuPerContainer() {
+        return this.huUnitCount;
+    }
 }
diff --git a/src/main/java/de/avatic/lcc/model/db/calculations/CalculationJob.java b/src/main/java/de/avatic/lcc/model/db/calculations/CalculationJob.java
index 3ee3cbd..29d5dd6 100644
--- a/src/main/java/de/avatic/lcc/model/db/calculations/CalculationJob.java
+++ b/src/main/java/de/avatic/lcc/model/db/calculations/CalculationJob.java
@@ -20,6 +20,35 @@ public class CalculationJob {
 
     private Integer userId;
 
+    private CalculationJobPriority priority;
+
+    private Integer retries;
+
+    private Integer errorId;
+
+    public Integer getErrorId() {
+        return errorId;
+    }
+
+    public void setErrorId(Integer errorId) {
+        this.errorId = errorId;
+    }
+
+    public CalculationJobPriority getPriority() {
+        return priority;
+    }
+
+    public void setPriority(CalculationJobPriority priority) {
+        this.priority = priority;
+    }
+
+    public Integer getRetries() {
+        return retries;
+    }
+
+    public void setRetries(Integer retries) {
+        this.retries = retries;
+    }
 
     public Integer getId() {
         return id;
diff --git a/src/main/java/de/avatic/lcc/model/db/calculations/CalculationJobPriority.java b/src/main/java/de/avatic/lcc/model/db/calculations/CalculationJobPriority.java
new file mode 100644
index 0000000..64b79d0
--- /dev/null
+++ b/src/main/java/de/avatic/lcc/model/db/calculations/CalculationJobPriority.java
@@ -0,0 +1,5 @@
+package de.avatic.lcc.model.db.calculations;
+
+public enum CalculationJobPriority {
+    LOW, MEDIUM, HIGH
+}
diff --git a/src/main/java/de/avatic/lcc/model/db/nodes/Distance.java b/src/main/java/de/avatic/lcc/model/db/nodes/Distance.java
index 27546d2..d6f2bda 100644
--- a/src/main/java/de/avatic/lcc/model/db/nodes/Distance.java
+++ b/src/main/java/de/avatic/lcc/model/db/nodes/Distance.java
@@ -40,6 +40,7 @@ public class Distance {
 
     private DistanceMatrixState state;
 
+    private Integer retries;
 
     private Integer fromNodeId;
 
@@ -144,4 +145,12 @@ public class Distance {
     public void setToUserNodeId(Integer toUserNodeId) {
         this.toUserNodeId = toUserNodeId;
     }
+
+    public Integer getRetries() {
+        return retries;
+    }
+
+    public void setRetries(Integer retries) {
+        this.retries = retries;
+    }
 }
diff --git a/src/main/java/de/avatic/lcc/model/db/nodes/DistanceMatrixState.java b/src/main/java/de/avatic/lcc/model/db/nodes/DistanceMatrixState.java
index 3be5f0d..9b571b8 100644
--- a/src/main/java/de/avatic/lcc/model/db/nodes/DistanceMatrixState.java
+++ b/src/main/java/de/avatic/lcc/model/db/nodes/DistanceMatrixState.java
@@ -1,5 +1,5 @@
 package de.avatic.lcc.model.db.nodes;
 
 public enum DistanceMatrixState {
-    VALID, STALE
+    VALID, STALE, EXCEPTION
 }
diff --git a/src/main/java/de/avatic/lcc/model/db/premises/route/Destination.java b/src/main/java/de/avatic/lcc/model/db/premises/route/Destination.java
index 0aeb820..f9b82dd 100644
--- a/src/main/java/de/avatic/lcc/model/db/premises/route/Destination.java
+++ b/src/main/java/de/avatic/lcc/model/db/premises/route/Destination.java
@@ -31,6 +31,8 @@ public class Destination {
 
     private Integer countryId;
 
+    private BigDecimal distanceD2d;
+
     public Integer getLeadTimeD2d() {
         return leadTimeD2d;
     }
@@ -134,4 +136,12 @@ public class Destination {
     public void setDisposalCost(BigDecimal disposalCost) {
         this.disposalCost = disposalCost;
     }
+
+    public BigDecimal getDistanceD2d() {
+        return distanceD2d;
+    }
+
+    public void setDistanceD2d(BigDecimal distanceD2d) {
+        this.distanceD2d = distanceD2d;
+    }
 }
diff --git a/src/main/java/de/avatic/lcc/model/db/premises/route/RouteSection.java b/src/main/java/de/avatic/lcc/model/db/premises/route/RouteSection.java
index 36610c2..d6219da 100644
--- a/src/main/java/de/avatic/lcc/model/db/premises/route/RouteSection.java
+++ b/src/main/java/de/avatic/lcc/model/db/premises/route/RouteSection.java
@@ -27,6 +27,8 @@ public class RouteSection {
 
     private Integer toRouteNodeId;
 
+    private Double distance;
+
     public RateType getRateType() {
         return rateType;
     }
@@ -114,4 +116,12 @@ public class RouteSection {
     public void setToRouteNodeId(Integer toRouteNodeId) {
         this.toRouteNodeId = toRouteNodeId;
     }
+
+    public Double getDistance() {
+        return distance;
+    }
+
+    public void setDistance(Double distance) {
+        this.distance = distance;
+    }
 }
diff --git a/src/main/java/de/avatic/lcc/model/zolltarifnummern/ZolltarifnummernResponse.java b/src/main/java/de/avatic/lcc/model/zolltarifnummern/ZolltarifnummernResponse.java
deleted file mode 100644
index 1ac850b..0000000
--- a/src/main/java/de/avatic/lcc/model/zolltarifnummern/ZolltarifnummernResponse.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package de.avatic.lcc.model.zolltarifnummern;
-
-import java.lang.reflect.Array;
-import java.util.List;
-
-public class ZolltarifnummernResponse {
-
-    String query;
-
-    String year;
-
-    String lang;
-
-    String version;
-
-    String total;
-
-    List<ZolltarifnummernResponseEntry> suggestions;
-
-    public String getQuery() {
-        return query;
-    }
-
-    public void setQuery(String query) {
-        this.query = query;
-    }
-
-    public String getYear() {
-        return year;
-    }
-
-    public void setYear(String year) {
-        this.year = year;
-    }
-
-    public String getLang() {
-        return lang;
-    }
-
-    public void setLang(String lang) {
-        this.lang = lang;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    public String getTotal() {
-        return total;
-    }
-
-    public void setTotal(String total) {
-        this.total = total;
-    }
-
-    public List<ZolltarifnummernResponseEntry> getSuggestions() {
-        return suggestions;
-    }
-
-    public void setSuggestions(List<ZolltarifnummernResponseEntry> suggestions) {
-        this.suggestions = suggestions;
-    }
-}
diff --git a/src/main/java/de/avatic/lcc/model/zolltarifnummern/ZolltarifnummernResponseEntry.java b/src/main/java/de/avatic/lcc/model/zolltarifnummern/ZolltarifnummernResponseEntry.java
deleted file mode 100644
index 9e808fd..0000000
--- a/src/main/java/de/avatic/lcc/model/zolltarifnummern/ZolltarifnummernResponseEntry.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package de.avatic.lcc.model.zolltarifnummern;
-
-public class ZolltarifnummernResponseEntry {
-
-    String code;
-
-    String score;
-
-    String value;
-
-    String data;
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getScore() {
-        return score;
-    }
-
-    public void setScore(String score) {
-        this.score = score;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public String getData() {
-        return data;
-    }
-
-    public void setData(String data) {
-        this.data = data;
-    }
-}
diff --git a/src/main/java/de/avatic/lcc/repositories/DistanceMatrixRepository.java b/src/main/java/de/avatic/lcc/repositories/DistanceMatrixRepository.java
index a8274fb..2ff959e 100644
--- a/src/main/java/de/avatic/lcc/repositories/DistanceMatrixRepository.java
+++ b/src/main/java/de/avatic/lcc/repositories/DistanceMatrixRepository.java
@@ -29,10 +29,10 @@ public class DistanceMatrixRepository {
         String fromCol = isUsrFrom ? "from_user_node_id" : "from_node_id";
         String toCol = isUsrTo ? "to_user_node_id" : "to_node_id";
 
-        String query = "SELECT * FROM distance_matrix WHERE " + fromCol + " = ? AND " + toCol + " = ? AND state = ?";
+        String query = "SELECT * FROM distance_matrix WHERE " + fromCol + " = ? AND " + toCol + " = ?";
 
         var distance = jdbcTemplate.query(query, new DistanceMapper(),
-                src.getId(), dest.getId(), DistanceMatrixState.VALID.name());
+                src.getId(), dest.getId());
 
         if (distance.isEmpty())
             return Optional.empty();
@@ -40,6 +40,12 @@ public class DistanceMatrixRepository {
         return Optional.of(distance.getFirst());
     }
 
+    @Transactional
+    public void updateRetries(Integer id) {
+        String query = "UPDATE distance_matrix SET retries = retries + 1 WHERE id = ?";
+        jdbcTemplate.update(query, id);
+    }
+
     @Transactional
     public void saveDistance(Distance distance) {
         try {
@@ -82,7 +88,7 @@ public class DistanceMatrixRepository {
                         toId);
 
                 logger.info("Updated existing distance entry for nodes {} -> {}",
-                        distance.getFromNodeId(), distance.getToNodeId());
+                        fromId, toId);
             } else {
                 // Insert new entry
                 String insertQuery = """
@@ -105,11 +111,14 @@ public class DistanceMatrixRepository {
                         distance.getUpdatedAt());
 
                 logger.info("Inserted new distance entry for nodes {} -> {}",
-                        distance.getFromNodeId(), distance.getToNodeId());
+                        fromId, toId);
             }
         } catch (Exception e) {
+            Integer fromId = distance.getFromUserNodeId() != null ? distance.getFromUserNodeId() : distance.getFromNodeId();
+            Integer toId = distance.getToUserNodeId() != null ? distance.getToUserNodeId() : distance.getToNodeId();
+
             logger.error("Error saving distance to database for nodes {} -> {}",
-                    distance.getFromNodeId(), distance.getToNodeId(), e);
+                    fromId, toId, e);
             throw e;
         }
     }
@@ -119,10 +128,20 @@ public class DistanceMatrixRepository {
         public Distance mapRow(ResultSet rs, int rowNum) throws SQLException {
             Distance entity = new Distance();
 
-            entity.setFromNodeId(rs.getInt("from_node_id"));
-            entity.setToNodeId(rs.getInt("to_node_id"));
-            entity.setFromNodeId(rs.getInt("from_user_node_id"));
-            entity.setToNodeId(rs.getInt("to_user_node_id"));
+            entity.setId(rs.getInt("id"));
+
+            var fromNodeId = rs.getInt("from_node_id");
+            entity.setFromNodeId(rs.wasNull() ? null : fromNodeId);
+
+            var toNodeId = rs.getInt("to_node_id");
+            entity.setToNodeId(rs.wasNull() ? null : toNodeId);
+
+            var fromUserNodeId = rs.getInt("from_user_node_id");
+            entity.setFromUserNodeId(rs.wasNull() ? null : fromUserNodeId);
+
+            var toUserNodeId = rs.getInt("to_user_node_id");
+            entity.setToUserNodeId(rs.wasNull() ? null : toUserNodeId);
+
             entity.setDistance(rs.getBigDecimal("distance"));
             entity.setFromGeoLng(rs.getBigDecimal("from_geo_lng"));
             entity.setFromGeoLat(rs.getBigDecimal("from_geo_lat"));
@@ -131,6 +150,9 @@ public class DistanceMatrixRepository {
             entity.setState(DistanceMatrixState.valueOf(rs.getString("state")));
             entity.setUpdatedAt(rs.getTimestamp("updated_at").toLocalDateTime());
 
+            var retries = rs.getInt("retries");
+            entity.setRetries(rs.wasNull() ? 0 : retries);
+
             return entity;
         }
     }
diff --git a/src/main/java/de/avatic/lcc/repositories/MaterialRepository.java b/src/main/java/de/avatic/lcc/repositories/MaterialRepository.java
index 8582b0a..c4b5d52 100644
--- a/src/main/java/de/avatic/lcc/repositories/MaterialRepository.java
+++ b/src/main/java/de/avatic/lcc/repositories/MaterialRepository.java
@@ -75,6 +75,7 @@ public class MaterialRepository {
         return jdbcTemplate.query(query, new MaterialMapper(), params.toArray());
     }
 
+    @Transactional
     public Optional<Material> getByPartNumber(String partNumber) {
         if (partNumber == null) {
             return Optional.empty();
diff --git a/src/main/java/de/avatic/lcc/repositories/NodeRepository.java b/src/main/java/de/avatic/lcc/repositories/NodeRepository.java
index 88f9e0b..275d130 100644
--- a/src/main/java/de/avatic/lcc/repositories/NodeRepository.java
+++ b/src/main/java/de/avatic/lcc/repositories/NodeRepository.java
@@ -5,6 +5,7 @@ import de.avatic.lcc.model.db.ValidityTuple;
 import de.avatic.lcc.model.db.nodes.Node;
 import de.avatic.lcc.repositories.pagination.SearchQueryPagination;
 import de.avatic.lcc.repositories.pagination.SearchQueryResult;
+import de.avatic.lcc.util.exception.internalerror.DatabaseException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
@@ -105,8 +106,8 @@ public class NodeRepository {
             entities = jdbcTemplate.query(query, new NodeMapper(), pagination.getLimit(), pagination.getOffset());
             totalCount = jdbcTemplate.queryForObject(countQuery, Integer.class);
         } else {
-            entities = jdbcTemplate.query(query, new NodeMapper(), "%" + filter + "%", "%" + filter + "%", "%" + filter + "%", pagination.getLimit(), pagination.getOffset());
-            totalCount = jdbcTemplate.queryForObject(countQuery, Integer.class, "%" + filter + "%", "%" + filter + "%", "%" + filter + "%");
+            entities = jdbcTemplate.query(query, new NodeMapper(), "%" + filter + "%", "%" + filter + "%", "%" + filter + "%", "%" + filter + "%", pagination.getLimit(), pagination.getOffset());
+            totalCount = jdbcTemplate.queryForObject(countQuery, Integer.class, "%" + filter + "%", "%" + filter + "%", "%" + filter + "%", "%" + filter + "%");
         }
 
 
@@ -124,7 +125,7 @@ public class NodeRepository {
             queryBuilder.append(" AND node.is_deprecated = FALSE");
         }
         if (filter != null) {
-            queryBuilder.append(" AND (node.name LIKE ? OR node.address LIKE ? OR country.iso_code LIKE ?)");
+            queryBuilder.append(" AND (node.name LIKE ? OR node.external_mapping_id LIKE ? OR node.address LIKE ? OR country.iso_code LIKE ?)");
         }
 
         return queryBuilder.toString();
@@ -142,7 +143,7 @@ public class NodeRepository {
             queryBuilder.append(" AND node.is_deprecated = FALSE");
         }
         if (filter != null) {
-            queryBuilder.append(" AND (node.name LIKE ? OR node.address LIKE ? OR country.iso_code LIKE ?)");
+            queryBuilder.append(" AND (node.name LIKE ? OR node.external_mapping_id LIKE ? OR node.address LIKE ? OR country.iso_code LIKE ?)");
         }
         queryBuilder.append(" ORDER BY node.id LIMIT ? OFFSET ?");
         return queryBuilder.toString();
@@ -165,6 +166,9 @@ public class NodeRepository {
             return Optional.empty();
         }
 
+        if(node.isUserNode())
+            throw new DatabaseException("Cannot update user node in node repository.");
+
         String updateNodeSql = """
                 UPDATE node SET
                     country_id = ?,
@@ -389,6 +393,25 @@ public class NodeRepository {
     @Transactional
     public List<Node> getByDistance(Node node, Integer regionRadius) {
 
+        if(node.isUserNode()) {
+            String query = """
+                SELECT * FROM node
+                WHERE is_deprecated = FALSE AND
+                      (
+                        6371 * acos(
+                            cos(radians(?)) *
+                            cos(radians(geo_lat)) *
+                            cos(radians(geo_lng) - radians(?)) +
+                            sin(radians(?)) *
+                            sin(radians(geo_lat))
+                        )
+                    ) <= ?
+                """;
+
+            return jdbcTemplate.query(query, new NodeMapper(), node.getGeoLat(), node.getGeoLng(), node.getGeoLat(), regionRadius);
+        }
+
+
         String query = """
                 SELECT * FROM node
                 WHERE is_deprecated = FALSE AND id != ? AND
diff --git a/src/main/java/de/avatic/lcc/repositories/calculation/CalculationJobRepository.java b/src/main/java/de/avatic/lcc/repositories/calculation/CalculationJobRepository.java
index e2a2864..f221d24 100644
--- a/src/main/java/de/avatic/lcc/repositories/calculation/CalculationJobRepository.java
+++ b/src/main/java/de/avatic/lcc/repositories/calculation/CalculationJobRepository.java
@@ -1,6 +1,7 @@
 package de.avatic.lcc.repositories.calculation;
 
 import de.avatic.lcc.model.db.calculations.CalculationJob;
+import de.avatic.lcc.model.db.calculations.CalculationJobPriority;
 import de.avatic.lcc.model.db.calculations.CalculationJobState;
 import de.avatic.lcc.util.exception.internalerror.DatabaseException;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -10,6 +11,8 @@ import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.sql.*;
+import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 @Repository
@@ -20,31 +23,106 @@ public class CalculationJobRepository {
         this.jdbcTemplate = jdbcTemplate;
     }
 
-     @Transactional
-     public Integer insert(CalculationJob job) {
-         String sql = """
-        INSERT INTO calculation_job (premise_id, calculation_date, validity_period_id, property_set_id, job_state, user_id)
-        VALUES (?, ?, ?, ?, ?, ?)
-        """;
+    @Transactional
+    public Integer insert(CalculationJob job) {
+        String sql = """
+                INSERT INTO calculation_job (premise_id, calculation_date, validity_period_id, property_set_id, job_state, user_id)
+                VALUES (?, ?, ?, ?, ?, ?)
+                """;
 
-         GeneratedKeyHolder keyHolder = new GeneratedKeyHolder();
+        GeneratedKeyHolder keyHolder = new GeneratedKeyHolder();
 
-         jdbcTemplate.update(connection -> {
-             PreparedStatement ps = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
-             ps.setInt(1, job.getPremiseId());
+        jdbcTemplate.update(connection -> {
+            PreparedStatement ps = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
+            ps.setInt(1, job.getPremiseId());
 
-             ps.setTimestamp(2, job.getCalculationDate() == null ? null : Timestamp.valueOf(job.getCalculationDate()));
+            ps.setTimestamp(2, job.getCalculationDate() == null ? null : Timestamp.valueOf(job.getCalculationDate()));
 
-             ps.setInt(3, job.getValidityPeriodId());
-             ps.setInt(4, job.getPropertySetId());
-             ps.setString(5, job.getJobState().name()); // Convert enum to string
-             ps.setInt(6, job.getUserId());
-             return ps;
-         }, keyHolder);
+            ps.setInt(3, job.getValidityPeriodId());
+            ps.setInt(4, job.getPropertySetId());
+            ps.setString(5, job.getJobState().name()); // Convert enum to string
+            ps.setInt(6, job.getUserId());
+            return ps;
+        }, keyHolder);
 
-         // Return the generated ID
-         return keyHolder.getKey() != null ? keyHolder.getKey().intValue() : null;
-     }
+        // Return the generated ID
+        return keyHolder.getKey() != null ? keyHolder.getKey().intValue() : null;
+    }
+
+    /**
+     * Fetches and locks the next available calculation job based on priority and state.
+     * Uses pessimistic locking (SELECT FOR UPDATE) to ensure thread-safety across multiple instances.
+     * <p>
+     * Priority order:
+     * 1. CREATED with HIGH priority
+     * 2. CREATED with MEDIUM priority
+     * 3. CREATED with LOW priority
+     * 4. EXCEPTION with retries < 3
+     *
+     * @return Optional containing the locked job, or empty if no job available
+     */
+    @Transactional
+    public Optional<CalculationJob> fetchAndLockNextJob() {
+        String sql = """
+                    SELECT * FROM calculation_job
+                    WHERE (job_state = 'CREATED')
+                       OR (job_state = 'EXCEPTION' AND retries < 3)
+                    ORDER BY
+                        CASE 
+                            WHEN job_state = 'CREATED' AND priority = 'HIGH' THEN 1
+                            WHEN job_state = 'CREATED' AND priority = 'MEDIUM' THEN 2
+                            WHEN job_state = 'CREATED' AND priority = 'LOW' THEN 3
+                            WHEN job_state = 'EXCEPTION' THEN 4
+                        END,
+                        calculation_date
+                    LIMIT 1
+                    FOR UPDATE SKIP LOCKED
+                """;
+
+        var jobs = jdbcTemplate.query(sql, new CalculationJobMapper());
+
+        if (jobs.isEmpty()) {
+            return Optional.empty();
+        }
+
+        CalculationJob job = jobs.getFirst();
+
+        // Update state to SCHEDULED
+        String updateSql = "UPDATE calculation_job SET job_state = ?, retries = retries + 1 WHERE id = ?";
+        jdbcTemplate.update(updateSql, CalculationJobState.SCHEDULED.name(), job.getId());
+
+        job.setJobState(CalculationJobState.SCHEDULED);
+
+        return Optional.of(job);
+    }
+
+    /**
+     * Marks a job as completed successfully
+     */
+    @Transactional
+    public void markAsValid(Integer id) {
+        String sql = "UPDATE calculation_job SET job_state = ? WHERE id = ?";
+        var affectedRows = jdbcTemplate.update(sql, CalculationJobState.VALID.name(), id);
+
+        if (1 != affectedRows) {
+            throw new DatabaseException("Unable to mark calculation job as valid with id " + id);
+        }
+    }
+
+    /**
+     * Marks a job as failed and increments retry counter
+     */
+    @Transactional
+    public void markAsException(Integer id, Integer errorId) {
+        String sql = "UPDATE calculation_job SET job_state = ?, error_id = ?, retries = retries + 1 WHERE id = ?";
+        var affectedRows = jdbcTemplate.update(sql, CalculationJobState.EXCEPTION.name(), errorId, id);
+
+        if (1 != affectedRows) {
+            throw new DatabaseException("Unable to mark calculation job as exception with id " + id);
+        }
+    }
+
+    /* ****************************** check ******************** */
 
     @Transactional
     public Optional<CalculationJob> getCalculationJob(Integer id) {
@@ -52,7 +130,7 @@ public class CalculationJobRepository {
 
         var job = jdbcTemplate.query(query, new CalculationJobMapper(), id);
 
-        if(job.isEmpty())
+        if (job.isEmpty())
             return Optional.empty();
 
         return Optional.of(job.getFirst());
@@ -64,7 +142,7 @@ public class CalculationJobRepository {
 
         var affectedRows = jdbcTemplate.update(sql, CalculationJobState.CREATED.name(), java.time.LocalDateTime.now(), id);
 
-        if(1 != affectedRows) {
+        if (1 != affectedRows) {
             throw new DatabaseException("Unable to update calculation job with id " + id);
         }
     }
@@ -77,7 +155,7 @@ public class CalculationJobRepository {
 
         var job = jdbcTemplate.query(query, new CalculationJobMapper(), periodId, setId, nodeId, materialId);
 
-        if(job.isEmpty())
+        if (job.isEmpty())
             return Optional.empty();
 
         return Optional.of(job.getFirst());
@@ -91,21 +169,20 @@ public class CalculationJobRepository {
 
         var job = jdbcTemplate.query(query, new CalculationJobMapper(), periodId, setId, userNodeId, materialId);
 
-        if(job.isEmpty())
+        if (job.isEmpty())
             return Optional.empty();
 
         return Optional.of(job.getFirst());
     }
 
 
-
     @Transactional
     public void setStateTo(Integer id, CalculationJobState calculationJobState) {
         String sql = "UPDATE calculation_job SET job_state = ? WHERE id = ?";
 
         var affectedRows = jdbcTemplate.update(sql, calculationJobState.name(), id);
 
-        if(1 != affectedRows) {
+        if (1 != affectedRows) {
             throw new DatabaseException("Unable to update calculation job with id " + id);
         }
     }
@@ -131,6 +208,39 @@ public class CalculationJobRepository {
         jdbcTemplate.update(sql, CalculationJobState.INVALIDATED.name(), id);
     }
 
+    @Transactional
+    public CalculationJobState getLastStateFor(Integer premiseId) {
+
+        String sql = "SELECT job_state FROM calculation_job WHERE premise_id = ? ORDER BY calculation_date DESC LIMIT 1";
+        var result = jdbcTemplate.query(sql, (rs, rowNum) -> CalculationJobState.valueOf(rs.getString("job_state")), premiseId);
+
+        if (result.isEmpty())
+            return null;
+
+        return result.getFirst();
+    }
+
+    @Transactional
+    public Map<Integer, CalculationJobState> getStateFor(List<Integer> ids) {
+        return null;
+    }
+
+    public Integer getFailedJobByUserId(Integer userId) {
+
+        String sql = "SELECT COUNT(*) FROM calculation_job WHERE user_id = ? AND job_state = 'EXCEPTION' AND calculation_date > DATE_SUB(NOW(), INTERVAL 3 DAY)";
+
+
+
+        return jdbcTemplate.queryForObject(sql, Integer.class, userId);
+    }
+
+    public Integer getSelfScheduledJobCountByUserId(Integer userId) {
+
+        String sql = "SELECT COUNT(*) FROM calculation_job WHERE user_id = ? AND ( job_state = 'SCHEDULED' or job_state = 'CREATED' )";
+
+
+        return jdbcTemplate.queryForObject(sql, Integer.class, userId);
+    }
 
     private static class CalculationJobMapper implements RowMapper<CalculationJob> {
         @Override
@@ -146,6 +256,14 @@ public class CalculationJobRepository {
             entity.setUserId(rs.getInt("user_id"));
             entity.setCalculationDate(rs.getTimestamp("calculation_date").toLocalDateTime());
 
+            entity.setPriority(CalculationJobPriority.valueOf(rs.getString("priority")));
+            entity.setRetries(rs.getInt("retries"));
+
+            Integer errorId = rs.getInt("error_id");
+            if (!rs.wasNull()) {
+                entity.setErrorId(errorId);
+            }
+
             return entity;
 
         }
diff --git a/src/main/java/de/avatic/lcc/repositories/premise/DestinationRepository.java b/src/main/java/de/avatic/lcc/repositories/premise/DestinationRepository.java
index 3b47aa3..70dde7f 100644
--- a/src/main/java/de/avatic/lcc/repositories/premise/DestinationRepository.java
+++ b/src/main/java/de/avatic/lcc/repositories/premise/DestinationRepository.java
@@ -67,7 +67,7 @@ public class DestinationRepository {
     }
 
     @Transactional
-    public void update(Integer id, Integer annualAmount, BigDecimal repackingCost, BigDecimal disposalCost, BigDecimal handlingCost, Boolean isD2d, BigDecimal d2dRate, BigDecimal d2dLeadTime) {
+    public void update(Integer id, Integer annualAmount, BigDecimal repackingCost, BigDecimal disposalCost, BigDecimal handlingCost, Boolean isD2d, BigDecimal d2dRate, BigDecimal d2dLeadTime, BigDecimal distanceD2d) {
         if (id == null) {
             throw new InvalidArgumentException("ID cannot be null");
         }
@@ -99,6 +99,9 @@ public class DestinationRepository {
         setClauses.add("lead_time_d2d = :d2dLeadTime");
         parameters.put("d2dLeadTime", setD2d ? d2dLeadTime : null);
 
+        setClauses.add("distance_d2d = :distanceD2d");
+        parameters.put("distanceD2d", distanceD2d);
+
 
         if (annualAmount != null) {
             setClauses.add("annual_amount = :annualAmount");
@@ -268,7 +271,7 @@ public class DestinationRepository {
     public Integer insert(Destination destination) {
         KeyHolder keyHolder = new GeneratedKeyHolder();
 
-        String query = "INSERT INTO premise_destination (annual_amount, premise_id, destination_node_id, country_id, rate_d2d, lead_time_d2d, is_d2d, repacking_cost, handling_cost, disposal_cost, geo_lat, geo_lng) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+        String query = "INSERT INTO premise_destination (annual_amount, premise_id, destination_node_id, country_id, rate_d2d, lead_time_d2d, is_d2d, repacking_cost, handling_cost, disposal_cost, geo_lat, geo_lng, distance_d2d) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
 
         jdbcTemplate.update(connection -> {
             var ps = connection.prepareStatement(query, Statement.RETURN_GENERATED_KEYS);
@@ -297,6 +300,8 @@ public class DestinationRepository {
             ps.setBigDecimal(11, destination.getGeoLat());
             ps.setBigDecimal(12, destination.getGeoLng());
 
+            ps.setBigDecimal(13, destination.getDistanceD2d());
+
             return ps;
         }, keyHolder);
 
@@ -363,6 +368,8 @@ public class DestinationRepository {
             entity.setGeoLng(rs.getBigDecimal("geo_lng"));
             entity.setCountryId(rs.getInt("country_id"));
 
+            entity.setDistanceD2d(rs.getBigDecimal("distance_d2d"));
+
             return entity;
         }
     }
diff --git a/src/main/java/de/avatic/lcc/repositories/premise/PremiseRepository.java b/src/main/java/de/avatic/lcc/repositories/premise/PremiseRepository.java
index f3a78c6..daec30b 100644
--- a/src/main/java/de/avatic/lcc/repositories/premise/PremiseRepository.java
+++ b/src/main/java/de/avatic/lcc/repositories/premise/PremiseRepository.java
@@ -710,6 +710,17 @@ public class PremiseRepository {
         return unlockedIds;
     }
 
+    public Integer getPremiseCompletedCountByUserId(Integer userId) {
+        String sql = "SELECT COUNT(*) FROM premise WHERE user_id = ? AND state = 'COMPLETED'";
+
+        return jdbcTemplate.queryForObject(sql, Integer.class, userId);
+    }
+
+    public Integer getPremiseDraftCountByUserId(Integer userId) {
+        String sql = "SELECT COUNT(*) FROM premise WHERE user_id = ? AND state = 'DRAFT'";
+        return jdbcTemplate.queryForObject(sql, Integer.class, userId);
+    }
+
 
     /**
      * Encapsulates SQL query building logic
@@ -843,7 +854,7 @@ public class PremiseRepository {
             entity.setState(de.avatic.lcc.dto.calculation.PremiseState.valueOf(rs.getString("p.state")));
             entity.setOwnerId(rs.getInt("p.user_id"));
             entity.setCreatedAt(rs.getTimestamp("p.created_at").toLocalDateTime());
-            entity.setUpdatedAt(rs.getTimestamp("p.created_at").toLocalDateTime()); // Note: This looks like a bug, should be "p.updated_at"
+            entity.setUpdatedAt(rs.getTimestamp("p.updated_at").toLocalDateTime());
         }
 
         private Material mapMaterial(ResultSet rs) throws SQLException {
diff --git a/src/main/java/de/avatic/lcc/repositories/premise/RouteSectionRepository.java b/src/main/java/de/avatic/lcc/repositories/premise/RouteSectionRepository.java
index f47ac8d..eb8a373 100644
--- a/src/main/java/de/avatic/lcc/repositories/premise/RouteSectionRepository.java
+++ b/src/main/java/de/avatic/lcc/repositories/premise/RouteSectionRepository.java
@@ -9,6 +9,7 @@ import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.stereotype.Repository;
 
+import java.math.BigDecimal;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -45,8 +46,8 @@ public class RouteSectionRepository {
     }
 
     public Integer insert(RouteSection premiseRouteSection) {
-        String sql = "INSERT INTO premise_route_section (premise_route_id, from_route_node_id, to_route_node_id, list_position, transport_type, rate_type, is_pre_run, is_main_run, is_post_run, is_outdated) " +
-                "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+        String sql = "INSERT INTO premise_route_section (premise_route_id, from_route_node_id, to_route_node_id, list_position, transport_type, rate_type, is_pre_run, is_main_run, is_post_run, is_outdated, distance) " +
+                "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
         KeyHolder keyHolder = new GeneratedKeyHolder();
 
         jdbcTemplate.update(connection -> {
@@ -61,6 +62,7 @@ public class RouteSectionRepository {
             ps.setBoolean(8, premiseRouteSection.getMainRun());
             ps.setBoolean(9, premiseRouteSection.getPostRun());
             ps.setBoolean(10, premiseRouteSection.getOutdated());
+            ps.setBigDecimal(11, premiseRouteSection.getDistance() == null ? null : BigDecimal.valueOf(premiseRouteSection.getDistance()));
             return ps;
         }, keyHolder);
 
@@ -92,6 +94,9 @@ public class RouteSectionRepository {
             entity.setPostRun(rs.getBoolean("is_post_run"));
             entity.setOutdated(rs.getBoolean("is_outdated"));
 
+            var distance = rs.getBigDecimal("distance");
+            entity.setDistance(rs.wasNull() ? null : distance.doubleValue());
+
             return entity;
         }
     }
diff --git a/src/main/java/de/avatic/lcc/repositories/properties/PropertySetRepository.java b/src/main/java/de/avatic/lcc/repositories/properties/PropertySetRepository.java
index d292333..cc429bc 100644
--- a/src/main/java/de/avatic/lcc/repositories/properties/PropertySetRepository.java
+++ b/src/main/java/de/avatic/lcc/repositories/properties/PropertySetRepository.java
@@ -11,7 +11,9 @@ import org.springframework.transaction.annotation.Transactional;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Timestamp;
+import java.time.LocalDate;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * Repository class for managing and querying property sets.
@@ -72,8 +74,12 @@ public class PropertySetRepository {
      *
      * @return The {@link PropertySet} object in the valid state, or null if none exists.
      */
-    public PropertySet getValidSet() {
-        return jdbcTemplate.queryForObject("SELECT id, start_date, end_date, state FROM property_set WHERE state = ?", new PropertySetMapper(), ValidityPeriodState.VALID.name());
+    public Optional<PropertySet> getValidSet() {
+        var queryResult = jdbcTemplate.query("SELECT id, start_date, end_date, state FROM property_set WHERE state = ?", new PropertySetMapper(), ValidityPeriodState.VALID.name());
+
+        if(queryResult.isEmpty()) return Optional.empty();
+        return Optional.ofNullable(queryResult.getFirst());
+
     }
 
     /**
@@ -82,7 +88,7 @@ public class PropertySetRepository {
      * @return the ID of the valid {@link PropertySet}.
      */
     public Integer getValidSetId() {
-        return getValidSet().getId();
+        return getValidSet().orElseThrow().getId();
     }
 
 
@@ -148,6 +154,21 @@ public class PropertySetRepository {
         return set.getFirst();
     }
 
+    public Optional<PropertySet> getByDate(LocalDate date) {
+        String query = """
+            SELECT id, start_date, end_date, state
+            FROM property_set
+            WHERE DATE(start_date) <= ?
+            AND (end_date IS NULL OR DATE(end_date) >= ?)
+            ORDER BY start_date DESC
+            LIMIT 1
+            """;
+
+        var propertySets = jdbcTemplate.query(query, new PropertySetMapper(), date, date);
+
+        return propertySets.isEmpty() ? Optional.empty() : Optional.of(propertySets.getFirst());
+    }
+
     /**
      * Mapper class for converting SQL query results into {@link PropertySet} objects.
      */
diff --git a/src/main/java/de/avatic/lcc/repositories/rates/ValidityPeriodRepository.java b/src/main/java/de/avatic/lcc/repositories/rates/ValidityPeriodRepository.java
index 480dd10..f108882 100644
--- a/src/main/java/de/avatic/lcc/repositories/rates/ValidityPeriodRepository.java
+++ b/src/main/java/de/avatic/lcc/repositories/rates/ValidityPeriodRepository.java
@@ -12,6 +12,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Timestamp;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Collections;
 import java.util.List;
@@ -327,6 +328,20 @@ public class ValidityPeriodRepository {
         jdbcTemplate.update(sql, increase);
     }
 
+    public Optional<ValidityPeriod> getByDate(LocalDate date) {
+        String query = """
+            SELECT * FROM validity_period
+            WHERE DATE(start_date) <= ?
+            AND (end_date IS NULL OR DATE(end_date) >= ?)
+            ORDER BY start_date DESC
+            LIMIT 1
+            """;
+
+        var periods = jdbcTemplate.query(query, new ValidityPeriodMapper(), date, date);
+
+        return periods.isEmpty() ? Optional.empty() : Optional.of(periods.getFirst());
+    }
+
 
     /**
      * Maps rows of a {@link ResultSet} to {@link ValidityPeriod} objects.
diff --git a/src/main/java/de/avatic/lcc/service/access/DestinationService.java b/src/main/java/de/avatic/lcc/service/access/DestinationService.java
index 283fd8d..d7b6297 100644
--- a/src/main/java/de/avatic/lcc/service/access/DestinationService.java
+++ b/src/main/java/de/avatic/lcc/service/access/DestinationService.java
@@ -10,6 +10,7 @@ import de.avatic.lcc.model.db.premises.route.*;
 import de.avatic.lcc.repositories.NodeRepository;
 import de.avatic.lcc.repositories.premise.*;
 import de.avatic.lcc.repositories.users.UserNodeRepository;
+import de.avatic.lcc.service.calculation.DistanceService;
 import de.avatic.lcc.service.calculation.RoutingService;
 import de.avatic.lcc.service.transformer.premise.DestinationTransformer;
 import de.avatic.lcc.service.users.AuthorizationService;
@@ -35,8 +36,9 @@ public class DestinationService {
     private final PremiseRepository premiseRepository;
     private final UserNodeRepository userNodeRepository;
     private final AuthorizationService authorizationService;
+    private final DistanceService distanceService;
 
-    public DestinationService(DestinationRepository destinationRepository, DestinationTransformer destinationTransformer, RouteRepository routeRepository, RouteSectionRepository routeSectionRepository, RouteNodeRepository routeNodeRepository, RoutingService routingService, NodeRepository nodeRepository, PremiseRepository premiseRepository, UserNodeRepository userNodeRepository, AuthorizationService authorizationService) {
+    public DestinationService(DestinationRepository destinationRepository, DestinationTransformer destinationTransformer, RouteRepository routeRepository, RouteSectionRepository routeSectionRepository, RouteNodeRepository routeNodeRepository, RoutingService routingService, NodeRepository nodeRepository, PremiseRepository premiseRepository, UserNodeRepository userNodeRepository, AuthorizationService authorizationService, DistanceService distanceService) {
         this.destinationRepository = destinationRepository;
         this.destinationTransformer = destinationTransformer;
         this.routeRepository = routeRepository;
@@ -47,6 +49,7 @@ public class DestinationService {
         this.premiseRepository = premiseRepository;
         this.userNodeRepository = userNodeRepository;
         this.authorizationService = authorizationService;
+        this.distanceService = distanceService;
     }
 
 
@@ -199,11 +202,30 @@ public class DestinationService {
                 destinationUpdateDTO.getDisposalCost() == null ? null : BigDecimal.valueOf(destinationUpdateDTO.getDisposalCost().doubleValue()),
                 destinationUpdateDTO.getHandlingCost() == null ? null : BigDecimal.valueOf(destinationUpdateDTO.getHandlingCost().doubleValue()),
                 destinationUpdateDTO.getD2d(), destinationUpdateDTO.getRateD2d() == null ? null : BigDecimal.valueOf(destinationUpdateDTO.getRateD2d().doubleValue()),
-                destinationUpdateDTO.getLeadtimeD2d() == null ? null : BigDecimal.valueOf(destinationUpdateDTO.getLeadtimeD2d())
+                destinationUpdateDTO.getLeadtimeD2d() == null ? null : BigDecimal.valueOf(destinationUpdateDTO.getLeadtimeD2d()),
+                destinationUpdateDTO.getD2d() ? getD2dDistance(id) : null
         );
 
     }
 
+    private BigDecimal getD2dDistance(Integer destinationId) {
+        var dest = destinationRepository.getById(destinationId);
+
+        if(dest.isPresent()) {
+            var premise = premiseRepository.getPremiseById(dest.get().getPremiseId());
+
+            if(premise.isPresent()) {
+                boolean isUserNode = premise.get().getSupplierNodeId() == null;
+
+                var from = isUserNode ? userNodeRepository.getById(premise.get().getUserSupplierNodeId()) : nodeRepository.getById(premise.get().getSupplierNodeId());
+                var to = nodeRepository.getById(dest.get().getDestinationNodeId());
+
+                return BigDecimal.valueOf(distanceService.getDistanceForNode(from.orElseThrow(), to.orElseThrow()));
+            }
+        }
+        return null;
+    }
+
     private Map<RouteIds, List<RouteInformation>> findRoutes(List<Premise> premisses, Map<Integer, List<Integer>> routingRequest) {
 
         Map<RouteIds, List<RouteInformation>> routes = new HashMap<>();
@@ -267,6 +289,7 @@ public class DestinationService {
                 premiseRouteSection.setFromRouteNodeId(fromNodeId);
                 premiseRouteSection.setToRouteNodeId(toNodeId);
 
+
                 routeSectionRepository.insert(premiseRouteSection);
 
                 fromNodeId = toNodeId;
diff --git a/src/main/java/de/avatic/lcc/service/access/PremisesService.java b/src/main/java/de/avatic/lcc/service/access/PremisesService.java
index 41e353c..9f7c009 100644
--- a/src/main/java/de/avatic/lcc/service/access/PremisesService.java
+++ b/src/main/java/de/avatic/lcc/service/access/PremisesService.java
@@ -1,45 +1,28 @@
 package de.avatic.lcc.service.access;
 
-import de.avatic.lcc.dto.calculation.CalculationStatus;
-import de.avatic.lcc.dto.calculation.ResolvePremiseDTO;
 import de.avatic.lcc.dto.calculation.PremiseDTO;
+import de.avatic.lcc.dto.calculation.ResolvePremiseDTO;
 import de.avatic.lcc.dto.calculation.edit.PremiseDetailDTO;
 import de.avatic.lcc.dto.calculation.edit.masterData.MaterialUpdateDTO;
 import de.avatic.lcc.dto.calculation.edit.masterData.PackagingUpdateDTO;
 import de.avatic.lcc.dto.calculation.edit.masterData.PriceUpdateDTO;
-import de.avatic.lcc.model.db.calculations.CalculationJob;
-import de.avatic.lcc.model.db.calculations.CalculationJobState;
 import de.avatic.lcc.model.db.premises.Premise;
 import de.avatic.lcc.model.db.premises.PremiseState;
-import de.avatic.lcc.repositories.calculation.CalculationJobDestinationRepository;
-import de.avatic.lcc.repositories.calculation.CalculationJobRepository;
-import de.avatic.lcc.repositories.calculation.CalculationJobRouteSectionRepository;
 import de.avatic.lcc.repositories.pagination.SearchQueryPagination;
 import de.avatic.lcc.repositories.pagination.SearchQueryResult;
 import de.avatic.lcc.repositories.premise.PremiseRepository;
-import de.avatic.lcc.repositories.properties.PropertySetRepository;
-import de.avatic.lcc.repositories.rates.ValidityPeriodRepository;
-import de.avatic.lcc.service.calculation.execution.CalculationExecutionService;
-import de.avatic.lcc.service.calculation.execution.CalculationStatusService;
-import de.avatic.lcc.service.precalculation.PostCalculationCheckService;
-import de.avatic.lcc.service.precalculation.PreCalculationCheckService;
 import de.avatic.lcc.service.transformer.generic.DimensionTransformer;
 import de.avatic.lcc.service.transformer.premise.PremiseTransformer;
 import de.avatic.lcc.service.users.AuthorizationService;
-import de.avatic.lcc.util.exception.base.InternalErrorException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
-import java.util.concurrent.ExecutionException;
 
 @Service
 public class PremisesService {
@@ -51,33 +34,14 @@ public class PremisesService {
     private final PremiseTransformer premiseTransformer;
     private final DimensionTransformer dimensionTransformer;
     private final DestinationService destinationService;
-    private final CalculationJobRepository calculationJobRepository;
 
-    private final PropertySetRepository propertySetRepository;
-    private final ValidityPeriodRepository validityPeriodRepository;
-    private final CalculationStatusService calculationStatusService;
-    private final CalculationExecutionService calculationExecutionService;
-    private final PreCalculationCheckService preCalculationCheckService;
-    private final CalculationJobDestinationRepository calculationJobDestinationRepository;
-    private final CalculationJobRouteSectionRepository calculationJobRouteSectionRepository;
-    private final PostCalculationCheckService postCalculationCheckService;
     private final AuthorizationService authorizationService;
 
-    public PremisesService(PremiseRepository premiseRepository, PremiseTransformer premiseTransformer, DimensionTransformer dimensionTransformer, DestinationService destinationService, CalculationJobRepository calculationJobRepository, PropertySetRepository propertySetRepository, ValidityPeriodRepository validityPeriodRepository, CalculationStatusService calculationStatusService, CalculationExecutionService calculationExecutionService, PreCalculationCheckService preCalculationCheckService, CalculationJobDestinationRepository calculationJobDestinationRepository, CalculationJobRouteSectionRepository calculationJobRouteSectionRepository, PostCalculationCheckService postCalculationCheckService, AuthorizationService authorizationService) {
+    public PremisesService(PremiseRepository premiseRepository, PremiseTransformer premiseTransformer, DimensionTransformer dimensionTransformer, DestinationService destinationService, AuthorizationService authorizationService) {
         this.premiseRepository = premiseRepository;
         this.premiseTransformer = premiseTransformer;
         this.dimensionTransformer = dimensionTransformer;
         this.destinationService = destinationService;
-        this.calculationJobRepository = calculationJobRepository;
-
-        this.propertySetRepository = propertySetRepository;
-        this.validityPeriodRepository = validityPeriodRepository;
-        this.calculationStatusService = calculationStatusService;
-        this.calculationExecutionService = calculationExecutionService;
-        this.preCalculationCheckService = preCalculationCheckService;
-        this.calculationJobDestinationRepository = calculationJobDestinationRepository;
-        this.calculationJobRouteSectionRepository = calculationJobRouteSectionRepository;
-        this.postCalculationCheckService = postCalculationCheckService;
         this.authorizationService = authorizationService;
     }
 
@@ -102,95 +66,6 @@ public class PremisesService {
     }
 
 
-    public void startCalculation(List<Integer> premises) {
-        var admin = authorizationService.isSuper();
-        var userId = authorizationService.getUserId();
-
-        if (!admin)
-            premiseRepository.checkOwner(premises, userId);
-
-        var validSetId = propertySetRepository.getValidSetId();
-        var validPeriodId = validityPeriodRepository.getValidPeriodId().orElseThrow(() -> new InternalErrorException("no set of transport rates found that is VALID"));
-
-        var checkResult = premises.stream().map(premiseId -> preCalculationCheckService.doPrecheck(premiseId, validSetId, validPeriodId)).toList();
-        CompletableFuture.allOf(checkResult.toArray(new CompletableFuture[0])).join();
-
-        var calculationIds = new ArrayList<Integer>();
-
-        premises.forEach(p -> {
-
-            var existingJob = calculationJobRepository.findJob(p, validSetId, validPeriodId);
-
-            if (existingJob.isPresent()) {
-                if (CalculationJobState.EXCEPTION == existingJob.get().getJobState()) {
-                    calculationJobRepository.setStateTo(existingJob.get().getId(), CalculationJobState.CREATED);
-                    calculationIds.add(existingJob.get().getId());
-                } else if (CalculationJobState.SCHEDULED == existingJob.get().getJobState() && existingJob.get().getCalculationDate().plusMinutes(15).isBefore(LocalDateTime.now())) {
-                    calculationJobRepository.reschedule(existingJob.get().getId());
-                    calculationIds.add(existingJob.get().getId());
-                }
-            } else {
-                CalculationJob job = new CalculationJob();
-
-                job.setPremiseId(p);
-                job.setJobState(CalculationJobState.CREATED);
-                job.setCalculationDate(java.time.LocalDateTime.now());
-                job.setUserId(userId);
-                job.setPropertySetId(validSetId);
-                job.setValidityPeriodId(validPeriodId);
-
-                calculationIds.add(calculationJobRepository.insert(job));
-            }
-
-        });
-
-        premiseRepository.setStatus(premises, PremiseState.COMPLETED);
-
-        calculationIds.forEach(this::scheduleCalculation);
-
-        try {
-            var futures = calculationIds.stream().map(calculationExecutionService::launchJobCalculation).toList();
-            CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
-
-            for (var future : futures) {
-                var jobResult = future.get();
-                if (jobResult.getState().equals(CalculationJobState.EXCEPTION)) {
-                    calculationJobRepository.setStateTo(jobResult.getJobId(), CalculationJobState.EXCEPTION);
-                    throw new InternalErrorException("Calculation failed", "Calculation was not successful. Please contact Administrator.", new Exception(jobResult.getException()));
-                } else {
-
-                    postCalculationCheckService.doPostcheck(jobResult);
-
-                    for (var destinationInfo : jobResult.getDestinationInfos()) {
-                        destinationInfo.destinationCalculationJob().setCalculationJobId(jobResult.getJobId());
-                        var destinationId = calculationJobDestinationRepository.insert(destinationInfo.destinationCalculationJob());
-
-                        for (var sectionInfo : destinationInfo.sectionInfo()) {
-                            var section = sectionInfo.result();
-                            section.setCalculationJobDestinationId(destinationId);
-                            calculationJobRouteSectionRepository.insert(section);
-                        }
-                    }
-
-                    calculationJobRepository.setStateTo(jobResult.getJobId(), CalculationJobState.VALID);
-                    log.info("Calculation job {} finished", jobResult.getJobId());
-                }
-            }
-
-        } catch (CompletionException | InterruptedException | ExecutionException e) {
-            throw new InternalErrorException("Task execution of calculation failed", "Task execution of calculation was not successful. Please contact Administrator.", e);
-        }
-    }
-
-    public void scheduleCalculation(Integer id) {
-        calculationJobRepository.setStateTo(id, CalculationJobState.SCHEDULED);
-    }
-
-    public CalculationStatus getCalculationStatus(Integer processId) {
-        return calculationStatusService.getCalculationStatus(processId);
-    }
-
-
     public void updatePackaging(PackagingUpdateDTO packagingDTO) {
         var admin = authorizationService.isSuper();
         var userId = authorizationService.getUserId();
diff --git a/src/main/java/de/avatic/lcc/service/api/DistanceApiService.java b/src/main/java/de/avatic/lcc/service/api/DistanceApiService.java
index 8dea904..5763b29 100644
--- a/src/main/java/de/avatic/lcc/service/api/DistanceApiService.java
+++ b/src/main/java/de/avatic/lcc/service/api/DistanceApiService.java
@@ -1,5 +1,7 @@
 package de.avatic.lcc.service.api;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import de.avatic.lcc.model.azuremaps.route.RouteDirectionsResponse;
 import de.avatic.lcc.model.db.nodes.Distance;
 import de.avatic.lcc.model.db.nodes.DistanceMatrixState;
@@ -10,6 +12,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriComponentsBuilder;
 
@@ -25,14 +28,18 @@ public class DistanceApiService {
 
     private final DistanceMatrixRepository distanceMatrixRepository;
     private final RestTemplate restTemplate;
+    private final ObjectMapper objectMapper;
+    private final GeoApiService geoApiService;
 
     @Value("${azure.maps.subscription.key}")
     private String subscriptionKey;
 
     public DistanceApiService(DistanceMatrixRepository distanceMatrixRepository,
-                              RestTemplate restTemplate) {
+                              RestTemplate restTemplate, ObjectMapper objectMapper, GeoApiService geoApiService) {
         this.distanceMatrixRepository = distanceMatrixRepository;
         this.restTemplate = restTemplate;
+        this.objectMapper = objectMapper;
+        this.geoApiService = geoApiService;
     }
 
     public Optional<Integer> getDistance(Location from, Location to) {
@@ -64,28 +71,63 @@ public class DistanceApiService {
 
         if (from.getGeoLat() == null || from.getGeoLng() == null ||
                 to.getGeoLat() == null || to.getGeoLng() == null) {
-            logger.warn("Missing geo coordinates for nodes: from={}, to={}", from.getId(), to.getId());
+            logger.warn("Missing geo coordinates for nodes: from={}, to={}", from.getExternalMappingId(), to.getExternalMappingId());
             return Optional.empty();
         }
 
         Optional<Distance> cachedDistance = distanceMatrixRepository.getDistance(from, isUsrFrom, to, isUsrTo);
 
-        if (cachedDistance.isPresent()) {
-            logger.debug("Found cached distance from node {} to node {}", from.getId(), to.getId());
+        if (cachedDistance.isPresent() && cachedDistance.get().getState() == DistanceMatrixState.VALID) {
+            logger.info("Found cached distance from node {} (user: {}) to node {} (user {}) - {} meters", from.getExternalMappingId(), isUsrFrom, to.getExternalMappingId(), isUsrTo, cachedDistance.get().getDistance().doubleValue());
             return cachedDistance;
         }
 
-        logger.debug("Fetching distance from Azure Maps for nodes {} to {}", from.getId(), to.getId());
-        Optional<Distance> fetchedDistance = fetchDistanceFromAzureMaps(from, isUsrFrom, to, isUsrTo);
+        if (cachedDistance.isPresent() && cachedDistance.get().getState() == DistanceMatrixState.EXCEPTION) {
+            if (cachedDistance.get().getRetries() >= 3)
+                return Optional.empty();
 
-        if (fetchedDistance.isPresent()) {
-            distanceMatrixRepository.saveDistance(fetchedDistance.get());
-            return fetchedDistance;
+            distanceMatrixRepository.updateRetries(cachedDistance.get().getId());
+        }
+
+        logger.info("Fetching distance from Azure Maps for nodes {} to {}", from.getExternalMappingId() == null ? from.getName() : from.getExternalMappingId(), to.getExternalMappingId() == null ? to.getName() : to.getExternalMappingId());
+        AzureMapResponse distanceResponse = fetchDistanceFromAzureMaps(from, isUsrFrom, to, isUsrTo, true);
+
+        if (distanceResponse.distance != null) {
+            distanceMatrixRepository.saveDistance(distanceResponse.distance);
+            return Optional.of(distanceResponse.distance);
+        }
+
+        if (distanceResponse.errorType != AzureMapsErrorType.NO_ERROR) {
+            distanceMatrixRepository.saveDistance(getErrorDistance(cachedDistance, from, isUsrFrom, to, isUsrTo));
         }
 
         return Optional.empty();
     }
 
+    private Distance getErrorDistance(Optional<Distance> cachedDistance, Node from, boolean isUsrFrom, Node to, boolean isUsrTo) {
+        var distance = cachedDistance.orElse(new Distance());
+
+        distance.setState(DistanceMatrixState.EXCEPTION);
+        distance.setUpdatedAt(LocalDateTime.now());
+        distance.setRetries(distance.getRetries() == null ? 0 : distance.getRetries() + 1);
+
+        if (cachedDistance.isEmpty()) {
+            distance.setFromUserNodeId(isUsrFrom ? from.getId() : null);
+            distance.setFromNodeId(isUsrFrom ? null : from.getId());
+            distance.setToUserNodeId(isUsrTo ? to.getId() : null);
+            distance.setToNodeId(isUsrTo ? null : to.getId());
+
+            distance.setFromGeoLat(from.getGeoLat());
+            distance.setFromGeoLng(from.getGeoLng());
+            distance.setToGeoLat(to.getGeoLat());
+            distance.setToGeoLng(to.getGeoLng());
+
+            distance.setDistance(BigDecimal.ZERO);
+        }
+
+        return distance;
+    }
+
     private RouteDirectionsResponse fetchDistanceFromAzureMaps(BigDecimal fromLat, BigDecimal fromLng, BigDecimal toLat, BigDecimal toLng) {
         String url = UriComponentsBuilder.fromUriString(AZURE_MAPS_ROUTE_API)
                 .queryParam("api-version", "1.0")
@@ -99,50 +141,144 @@ public class DistanceApiService {
         return restTemplate.getForObject(url, RouteDirectionsResponse.class);
     }
 
-    private Optional<Distance> fetchDistanceFromAzureMaps(Node from, boolean isUsrFrom, Node to, boolean isUsrTo) {
+
+    private AzureMapResponse fetchDistanceFromAzureMaps(Node from, boolean isUsrFrom, Node to, boolean isUsrTo, boolean allowFixing) {
         try {
-
             RouteDirectionsResponse response = fetchDistanceFromAzureMaps(from.getGeoLat(), from.getGeoLng(), to.getGeoLat(), to.getGeoLng());
-
-            if (response != null && response.getRoutes() != null && !response.getRoutes().isEmpty()) {
-                Integer distanceInMeters = response.getRoutes().getFirst().getSummary().getLengthInMeters();
-
-                Distance distance = new Distance();
-
-                if (isUsrFrom) {
-                    distance.setFromUserNodeId(from.getId());
-                    distance.setFromNodeId(null);
-                } else {
-                    distance.setFromUserNodeId(null);
-                    distance.setFromNodeId(from.getId());
-                }
-
-                if (isUsrTo) {
-                    distance.setToUserNodeId(to.getId());
-                    distance.setToNodeId(null);
-                } else {
-                    distance.setToUserNodeId(null);
-                    distance.setToNodeId(to.getId());
-                }
-
-                distance.setFromGeoLat(from.getGeoLat());
-                distance.setFromGeoLng(from.getGeoLng());
-                distance.setToGeoLat(to.getGeoLat());
-                distance.setToGeoLng(to.getGeoLng());
-                distance.setDistance(BigDecimal.valueOf(distanceInMeters));
-                distance.setState(DistanceMatrixState.VALID);
-                distance.setUpdatedAt(LocalDateTime.now());
-
-                logger.info("Successfully fetched distance: {} meters", distanceInMeters);
-                return Optional.of(distance);
-            } else {
-                logger.warn("No routes found in Azure Maps response");
-            }
+            return convertToDistance(response, from, isUsrFrom, to, isUsrTo);
         } catch (Exception e) {
+            if (HttpClientErrorException.class.isAssignableFrom(e.getClass()))
+                return handleAzureMapsError((HttpClientErrorException) e, from, isUsrFrom, to, isUsrTo, allowFixing);
+
             logger.error("Error fetching distance from Azure Maps", e);
+            return new AzureMapResponse(null, AzureMapsErrorType.OTHER_ERROR, null);
+        }
+    }
+
+    private AzureMapResponse convertToDistance(RouteDirectionsResponse response, Node from, boolean isUsrFrom, Node to, boolean isUsrTo) {
+        if (response != null && response.getRoutes() != null && !response.getRoutes().isEmpty()) {
+            Integer distanceInMeters = response.getRoutes().getFirst().getSummary().getLengthInMeters();
+
+            Distance distance = new Distance();
+
+            if (isUsrFrom) {
+                distance.setFromUserNodeId(from.getId());
+                distance.setFromNodeId(null);
+            } else {
+                distance.setFromUserNodeId(null);
+                distance.setFromNodeId(from.getId());
+            }
+
+            if (isUsrTo) {
+                distance.setToUserNodeId(to.getId());
+                distance.setToNodeId(null);
+            } else {
+                distance.setToUserNodeId(null);
+                distance.setToNodeId(to.getId());
+            }
+
+            distance.setFromGeoLat(from.getGeoLat());
+            distance.setFromGeoLng(from.getGeoLng());
+            distance.setToGeoLat(to.getGeoLat());
+            distance.setToGeoLng(to.getGeoLng());
+            distance.setDistance(BigDecimal.valueOf(distanceInMeters));
+            distance.setState(DistanceMatrixState.VALID);
+            distance.setUpdatedAt(LocalDateTime.now());
+
+            // reset to 0 if on success
+            distance.setRetries(0);
+
+            logger.info("Successfully fetched distance: {} meters", distanceInMeters);
+            return new AzureMapResponse(distance, AzureMapsErrorType.NO_ERROR, null);
+        } else {
+            logger.error("No routes found in Azure Maps response");
+            return new AzureMapResponse(null, AzureMapsErrorType.ROUTE_ERROR, null);
+        }
+    }
+
+    private AzureMapResponse handleAzureMapsError(HttpClientErrorException e,
+                                                  Node from, boolean isUsrFrom,
+                                                  Node to, boolean isUsrTo, boolean allowFixing) {
+
+        try {
+            String responseBody = e.getResponseBodyAsString();
+            JsonNode errorNode = objectMapper.readTree(responseBody);
+
+            String errorCode = errorNode.path("error").path("code").asText();
+            String errorMessage = errorNode.path("error").path("message").asText();
+
+            logger.warn("Azure Maps API Error for nodes {} ({}) to {} ({}): {} - {}",
+                    from.getExternalMappingId() == null ? from.getName() : from.getExternalMappingId(), from.getId(), to.getExternalMappingId() == null ? to.getName() : to.getExternalMappingId(), to.getId(),
+                    errorCode, errorMessage);
+
+            if (errorMessage.contains("NO_ROUTE_FOUND"))
+                return new AzureMapResponse(null, AzureMapsErrorType.ROUTE_ERROR, null);
+
+            if (errorMessage.contains("MAP_MATCHING_FAILURE")) {
+                if (errorMessage.contains("Destination")) {
+                    if (allowFixing) {
+                        var fixedNode = fixNode(to);
+
+                        if (fixedNode != null)
+                            return fetchDistanceFromAzureMaps(from, isUsrFrom, fixedNode, isUsrTo, false);
+                    }
+
+                    return new AzureMapResponse(null, AzureMapsErrorType.NODE_ERROR, AzureMapsDefectiveNode.FROM);
+                }
+
+                if (errorMessage.contains("Origin")) {
+                    if (allowFixing) {
+                        var fixedNode = fixNode(from);
+
+                        if (fixedNode != null)
+                            return fetchDistanceFromAzureMaps(fixedNode, isUsrFrom, to, isUsrTo, false);
+                    }
+
+                    return new AzureMapResponse(null, AzureMapsErrorType.NODE_ERROR, AzureMapsDefectiveNode.TO);
+                }
+
+                return new AzureMapResponse(null, AzureMapsErrorType.NODE_ERROR, AzureMapsDefectiveNode.UNKNOWN);
+            }
+
+        } catch (Exception parseException) {
+            logger.error("Failed to parse Azure Maps error response", parseException);
         }
 
-        return Optional.empty();
+        return new AzureMapResponse(null, AzureMapsErrorType.OTHER_ERROR, null);
+    }
+
+    private Node fixNode(Node node) {
+
+        logger.info("Try to fix node {} ({}) ", node.getExternalMappingId(), node.getId());
+
+        Location location = geoApiService.locate(node.getAddress() + ", " + node.getCountryId());
+
+        if (location != null && location.getLatitude() != null && location.getLongitude() != null) {
+            if (0 != BigDecimal.valueOf(location.getLatitude()).compareTo(node.getGeoLat()) || 0 != BigDecimal.valueOf(location.getLongitude()).compareTo(node.getGeoLng())) {
+                logger.info("Fixed node {} ({}) coordinates {}, {} -> {}, {}", node.getExternalMappingId(), node.getId(), node.getGeoLat(), node.getGeoLng(), location.getLatitude(), location.getLongitude());
+
+                node.setGeoLng(BigDecimal.valueOf(location.getLongitude()));
+                node.setGeoLat(BigDecimal.valueOf(location.getLatitude()));
+
+
+                return node;
+            }
+        }
+
+        return null;
+    }
+
+    private enum AzureMapsErrorType {
+        NO_ERROR, NODE_ERROR, ROUTE_ERROR, OTHER_ERROR
+    }
+
+    private enum AzureMapsDefectiveNode {
+        FROM, TO, UNKNOWN
+    }
+
+    private record AzureMapResponse(Distance distance, AzureMapsErrorType errorType,
+                                    AzureMapsDefectiveNode defectiveNode) {
+
     }
 
 
diff --git a/src/main/java/de/avatic/lcc/service/api/EUTaxationApiService.java b/src/main/java/de/avatic/lcc/service/api/EUTaxationApiService.java
index 70d2c24..ec3766e 100644
--- a/src/main/java/de/avatic/lcc/service/api/EUTaxationApiService.java
+++ b/src/main/java/de/avatic/lcc/service/api/EUTaxationApiService.java
@@ -53,12 +53,16 @@ public class EUTaxationApiService {
         request.setReferenceDate(getCurrentDate());
         request.setTradeMovement(TradeMovementCode.fromValue(tradeMovement));
 
+        logger.info("Lookup Measure for {} and {}", goodsCode, countryCode);
+
         JAXBElement<GoodsMeasForWs> requestElement = objectFactory.createGoodsMeasForWs(request);
 
         @SuppressWarnings("unchecked")
         JAXBElement<GoodsMeasForWsResponse> responseElement =
                 (JAXBElement<GoodsMeasForWsResponse>) webServiceTemplate.marshalSendAndReceive(requestElement);
 
+        logger.info("Lookup Measure for {} and {} success: {} Measures received.", goodsCode, countryCode, responseElement.getValue().getReturn().getResult().getMeasures().getMeasure().size());
+
         return CompletableFuture.completedFuture(responseElement.getValue());
     }
 
diff --git a/src/main/java/de/avatic/lcc/service/api/GeoApiService.java b/src/main/java/de/avatic/lcc/service/api/GeoApiService.java
index 1bc63f2..0bae27b 100644
--- a/src/main/java/de/avatic/lcc/service/api/GeoApiService.java
+++ b/src/main/java/de/avatic/lcc/service/api/GeoApiService.java
@@ -43,6 +43,7 @@ public class GeoApiService {
     }
 
     public GeocodingResult geocode(String address) {
+
         if (address == null || address.trim().isEmpty()) {
             logger.warn("Address is null or empty");
             return null;
diff --git a/src/main/java/de/avatic/lcc/service/api/TaxationResolverService.java b/src/main/java/de/avatic/lcc/service/api/TaxationResolverService.java
index bcd7f12..10f03e5 100644
--- a/src/main/java/de/avatic/lcc/service/api/TaxationResolverService.java
+++ b/src/main/java/de/avatic/lcc/service/api/TaxationResolverService.java
@@ -17,6 +17,8 @@ import de.avatic.lcc.util.exception.base.InternalErrorException;
 import eu.europa.ec.taxation.taric.client.GoodsMeasForWsResponse;
 import eu.europa.ec.taxation.taric.client.GoodsMeasuresForWsResponse;
 import jakarta.annotation.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -30,15 +32,16 @@ public class TaxationResolverService {
     private final CountryRepository countryRepository;
     private final EUTaxationApiService eUTaxationApiService;
     private final PropertyRepository propertyRepository;
-    private final ZolltarifnummernApiService zolltarifnummernApiService;
     private final NomenclatureService nomenclatureService;
     private final CountryPropertyRepository countryPropertyRepository;
 
-    public TaxationResolverService(CountryRepository countryRepository, EUTaxationApiService eUTaxationApiService, PropertyRepository propertyRepository, ZolltarifnummernApiService zolltarifnummernApiService, NomenclatureService nomenclatureService, CountryPropertyRepository countryPropertyRepository) {
+    private final Logger logger = LoggerFactory.getLogger(TaxationResolverService.class);
+
+
+    public TaxationResolverService(CountryRepository countryRepository, EUTaxationApiService eUTaxationApiService, PropertyRepository propertyRepository, NomenclatureService nomenclatureService, CountryPropertyRepository countryPropertyRepository) {
         this.countryRepository = countryRepository;
         this.eUTaxationApiService = eUTaxationApiService;
         this.propertyRepository = propertyRepository;
-        this.zolltarifnummernApiService = zolltarifnummernApiService;
         this.nomenclatureService = nomenclatureService;
         this.countryPropertyRepository = countryPropertyRepository;
     }
@@ -73,39 +76,30 @@ public class TaxationResolverService {
         var singleResponses = doSingleRequests(joined.toList());
 
         return Stream.of(
-                byCustomUnion.getOrDefault(CustomUnionType.NONE,Collections.emptyList()).stream().collect(Collectors.toMap(
-                        r -> r,
-                        r -> new TaxationResolverApiResponse(
-                                r.material(),
-                                true,
-                                singleResponses.keySet().stream().filter(k -> k.origin.equals(r)).map(singleResponses::get).toList()))),
+                        byCustomUnion.getOrDefault(CustomUnionType.NONE, Collections.emptyList()).stream().collect(Collectors.toMap(
+                                r -> r,
+                                r -> new TaxationResolverApiResponse(
+                                        r.material(),
+                                        true,
+                                        singleResponses.keySet().stream().filter(k -> k.origin.equals(r)).map(singleResponses::get).toList()))),
 
-                byCustomUnion.getOrDefault(CustomUnionType.EU,Collections.emptyList()).stream().collect(Collectors.toMap(
-                        r -> r,
-                        r -> new TaxationResolverApiResponse(
-                                r.material(),
-                                false,
-                                null))))
+                        byCustomUnion.getOrDefault(CustomUnionType.EU, Collections.emptyList()).stream().collect(Collectors.toMap(
+                                r -> r,
+                                r -> new TaxationResolverApiResponse(
+                                        r.material(),
+                                        false,
+                                        null))))
 
-                .flatMap(map -> map.entrySet().stream()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue,(r1,_) -> r1));
+                .flatMap(map -> map.entrySet().stream()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (r1, _) -> r1));
 
     }
 
     private List<TaxationResolverSingleRequest> resolveIncompleteHsCodesIntern(List<TaxationResolverRequest> request) {
-        return request.stream().flatMap(r -> nomenclatureService.getNomenclature(r.material().getHsCode()).stream().map(hsCode -> new TaxationResolverSingleRequest(hsCode, r.countryId(), r))).toList();
-    }
+        var singleRequests = request.stream().flatMap(r -> nomenclatureService.getNomenclature(r.material().getHsCode()).stream().map(hsCode -> new TaxationResolverSingleRequest(hsCode, r.countryId(), r))).toList();
 
-    private List<TaxationResolverSingleRequest> resolveIncompleteHsCodes(List<TaxationResolverRequest> request) {
+        logger.info("Resolved {} incomplete hs codes to {} hs code leaves ", request.size(), singleRequests.size());
 
-        var futures = request.stream()
-                .collect(Collectors.toMap(
-                        r -> r,
-                        r -> zolltarifnummernApiService.getDeclarableHsCodes(r.material().getHsCode()))
-                );
-
-        CompletableFuture.allOf(futures.values().toArray(new CompletableFuture[0])).join();
-
-        return futures.keySet().stream().flatMap(k -> futures.get(k).join().stream().map(resp -> new TaxationResolverSingleRequest(resp, k.countryId(), k))).toList();
+        return singleRequests;
     }
 
 
@@ -244,6 +238,9 @@ public class TaxationResolverService {
     }
 
     public List<TaxationResolverResponse> getTariffRates(List<TaxationResolverRequest> requests) {
+
+        logger.info("Do taxation resolution for {} requests", requests.size());
+
         var goodMeasures = doRequests(requests);
         return goodMeasures.keySet().stream().map(r -> mapToResponse(r, goodMeasures.get(r))).toList();
     }
@@ -251,12 +248,15 @@ public class TaxationResolverService {
     private TaxationResolverResponse mapToResponse(TaxationResolverRequest request, TaxationResolverApiResponse apiResponse) {
 
         // source is EU country.
-        if(!apiResponse.requestExecuted)
+        if (!apiResponse.requestExecuted)
             return new TaxationResolverResponse(0.0, null, request.material().getHsCode(), request.material(), request.countryId());
 
 
         List<GoodsMeasForWsResponse> measForWsResponse = apiResponse.apiResponse();
 
+        logger.info("============================");
+        logger.info("Resolved measures for: {}, {}", request.material(), request.countryId());
+
         try {
             String selectedHsCode = null;
             Double selectedDuty = null;
@@ -277,11 +277,20 @@ public class TaxationResolverService {
                     var measureType = MeasureType.fromMeasureCode(measure.getMeasureType().getMeasureType());
                     boolean maybeRelevant = measureType.map(MeasureType::containsRelevantDuty).orElse(false);
 
+
                     if (maybeRelevant) {
                         var duty = extractDuty(measure);
 
                         if (duty.isPresent()) {
 
+                            logger.info("Measure ({}{}, {}): is_relevant: true, duty: {}, hs code: {}",
+                                    measureType.map(MeasureType::getSeries).orElse("UNKNOWN"),
+                                    measureType.map(MeasureType::getMeasureCode).orElse(""),
+                                    measureType.map(MeasureType::name).orElse("UNKNOWN"),
+                                    duty,
+                                    entry.getKey().getReturn().getResult().getRequest().getGoodsCode());
+
+
                             maxDuty = Math.max(maxDuty, duty.get());
                             minDuty = Math.min(minDuty, duty.get());
 
@@ -291,11 +300,23 @@ public class TaxationResolverService {
                                 selectedMeasure = measureType.map(MeasureType::getMeasureCode).orElse(null);
                                 selectedHsCode = entry.getKey().getReturn().getResult().getRequest().getGoodsCode();
                             }
+                        } else {
+                            logger.info("Measure ({}{}, {}): is_relevant: true, no duty extracted",
+                                    measureType.map(MeasureType::getSeries).orElse("UNKNOWN"),
+                                    measureType.map(MeasureType::getMeasureCode).orElse(""),
+                                    measureType.map(MeasureType::name).orElse("UNKNOWN"));
                         }
+                    } else {
+                        logger.info("Measure ({}{}, {}): is_relevant: false", measureType.map(MeasureType::getSeries).orElse("UNKNOWN"), measureType.map(MeasureType::getMeasureCode).orElse(""), measureType.map(MeasureType::name).orElse("UNKNOWN"));
                     }
+
                 }
             }
 
+            logger.info("============================");
+            logger.info("Selected: measure: {}, duty: {}, max_duty: {}, min_duty: {}", selectedMeasure, selectedDuty, maxDuty, minDuty);
+            logger.info("============================");
+
             if (selectedDuty != null && (maxDuty - minDuty <= 0.02)) {
                 return new TaxationResolverResponse(selectedDuty, selectedMeasure, selectedHsCode, request.material(), request.countryId());
             }
diff --git a/src/main/java/de/avatic/lcc/service/api/ZolltarifnummernApiService.java b/src/main/java/de/avatic/lcc/service/api/ZolltarifnummernApiService.java
deleted file mode 100644
index e5b795f..0000000
--- a/src/main/java/de/avatic/lcc/service/api/ZolltarifnummernApiService.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package de.avatic.lcc.service.api;
-
-import de.avatic.lcc.model.zolltarifnummern.ZolltarifnummernResponse;
-import de.avatic.lcc.model.zolltarifnummern.ZolltarifnummernResponseEntry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.util.UriComponentsBuilder;
-
-import java.util.Collections;
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
-
-@Service
-public class ZolltarifnummernApiService {
-
-    private static final Logger logger = LoggerFactory.getLogger(ZolltarifnummernApiService.class);
-
-    private static final String API_V_1 = "https://www.zolltarifnummern.de/api/v1/cnSuggest";
-    private final RestTemplate restTemplate;
-
-    public ZolltarifnummernApiService(RestTemplate restTemplate) {
-        this.restTemplate = restTemplate;
-    }
-
-    @Async("customLookupExecutor")
-    public CompletableFuture<Set<String>> getDeclarableHsCodes(String incompleteHsCode) {
-
-        try {
-            String url = UriComponentsBuilder.fromUriString(API_V_1)
-                    .queryParam("term", incompleteHsCode)
-                    .queryParam("lang", "en")
-                    .encode()
-                    .toUriString();
-
-            var resp = restTemplate.getForObject(url, ZolltarifnummernResponse.class);
-
-            if (resp != null && resp.getSuggestions() != null) {
-                return CompletableFuture.completedFuture(resp.getSuggestions().stream()
-                        .map(ZolltarifnummernResponseEntry::getCode)
-                        .filter(s -> s.startsWith(incompleteHsCode))
-                        .filter(s -> s.length() >= 10).collect(Collectors.toSet()));
-            }
-
-        } catch (Throwable t) {
-            logger.error("HS code lookup failed with exception \"{}\"", t.getMessage());
-            // just continue
-        }
-
-        logger.warn("Unable to load tarif numbers for HS code {}", incompleteHsCode);
-
-        return CompletableFuture.completedFuture(Collections.emptySet());
-    }
-
-}
diff --git a/src/main/java/de/avatic/lcc/service/apps/AppsService.java b/src/main/java/de/avatic/lcc/service/apps/AppsService.java
index 09f9641..b207594 100644
--- a/src/main/java/de/avatic/lcc/service/apps/AppsService.java
+++ b/src/main/java/de/avatic/lcc/service/apps/AppsService.java
@@ -1,13 +1,23 @@
 package de.avatic.lcc.service.apps;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import de.avatic.lcc.dto.configuration.apps.AppDTO;
+import de.avatic.lcc.dto.configuration.apps.AppExchangeDTO;
 import de.avatic.lcc.model.db.users.App;
 import de.avatic.lcc.repositories.users.AppRepository;
 import de.avatic.lcc.service.transformer.apps.AppTransformer;
+import de.avatic.lcc.util.exception.base.InternalErrorException;
+import io.jsonwebtoken.security.Keys;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
-import java.security.SecureRandom;
+import javax.crypto.*;
+import javax.crypto.spec.GCMParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.StandardCharsets;
+import java.security.*;
 import java.util.Base64;
 import java.util.List;
 import java.util.Optional;
@@ -16,14 +26,31 @@ import java.util.UUID;
 @Service
 public class AppsService {
 
+
+    private static final String HMAC_ALGORITHM = "HmacSHA256";
+    private static final String ENCRYPTION_ALGORITHM = "AES/GCM/NoPadding";
+    private static final int GCM_TAG_LENGTH = 128;
+    private static final int GCM_IV_LENGTH = 12;
     private final AppRepository appRepository;
     private final AppTransformer appTransformer;
     private final PasswordEncoder passwordEncoder;
+    private final ObjectMapper objectMapper;
+    private final Key signingKey;
+    private final SecretKeySpec encryptionKey;
 
-    public AppsService(AppRepository appRepository, AppTransformer appTransformer, PasswordEncoder passwordEncoder) {
+
+    public AppsService(@Value("${jwt.secret}") String secret, AppRepository appRepository, AppTransformer appTransformer, PasswordEncoder passwordEncoder, ObjectMapper objectMapper) {
         this.appRepository = appRepository;
         this.appTransformer = appTransformer;
         this.passwordEncoder = passwordEncoder;
+        this.signingKey = Keys.hmacShaKeyFor(secret.getBytes(StandardCharsets.UTF_8));
+        this.objectMapper = objectMapper;
+
+        // AES-256 Key aus JWT Secret ableiten
+        byte[] keyBytes = secret.getBytes(StandardCharsets.UTF_8);
+        byte[] aesKey = new byte[32]; // 256 bit
+        System.arraycopy(keyBytes, 0, aesKey, 0, Math.min(keyBytes.length, 32));
+        this.encryptionKey = new SecretKeySpec(aesKey, "AES");
     }
 
     public List<AppDTO> listApps() {
@@ -35,7 +62,7 @@ public class AppsService {
         var newApp = dto.getId() == null;
         String appSecret = null;
 
-        if(newApp) {
+        if (newApp) {
             dto.setClientId(generateAppId());
             appSecret = generateAppSecret();
             dto.setClientSecret(passwordEncoder.encode(appSecret));
@@ -43,7 +70,7 @@ public class AppsService {
 
         var id = appRepository.update(appTransformer.toAppEntity(dto));
 
-        if(newApp) {
+        if (newApp) {
             dto.setId(id);
             dto.setClientSecret(appSecret);
         }
@@ -79,4 +106,103 @@ public class AppsService {
 
     }
 
+    public AppExchangeDTO exportApp(Integer id) {
+        var app = appRepository.getById(id).map(appTransformer::toAppDTOWithHashedSecret);
+
+        if (app.isEmpty()) {
+            throw new IllegalArgumentException("App mit ID " + id + " nicht gefunden");
+        }
+        AppExchangeDTO exchangeDTO = new AppExchangeDTO();
+        try {
+
+            String json = objectMapper.writeValueAsString(app);
+            byte[] jsonBytes = json.getBytes(StandardCharsets.UTF_8);
+
+            Cipher cipher = Cipher.getInstance(ENCRYPTION_ALGORITHM);
+            byte[] iv = new byte[GCM_IV_LENGTH];
+            new SecureRandom().nextBytes(iv);
+            GCMParameterSpec gcmSpec = new GCMParameterSpec(GCM_TAG_LENGTH, iv);
+            cipher.init(Cipher.ENCRYPT_MODE, encryptionKey, gcmSpec);
+            byte[] encryptedData = cipher.doFinal(jsonBytes);
+
+            Mac mac = Mac.getInstance(HMAC_ALGORITHM);
+            mac.init(new SecretKeySpec(signingKey.getEncoded(), HMAC_ALGORITHM));
+            mac.update(iv);
+            mac.update(encryptedData);
+            byte[] signature = mac.doFinal();
+
+            byte[] bundle = new byte[iv.length + encryptedData.length + signature.length];
+            System.arraycopy(iv, 0, bundle, 0, iv.length);
+            System.arraycopy(encryptedData, 0, bundle, iv.length, encryptedData.length);
+            System.arraycopy(signature, 0, bundle, iv.length + encryptedData.length, signature.length);
+
+
+            exchangeDTO.setData(Base64.getEncoder().encodeToString(bundle));
+        } catch (JsonProcessingException | NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException |
+                 InvalidAlgorithmParameterException | IllegalBlockSizeException | BadPaddingException _) {
+            throw new InternalErrorException("Fehler beim Exportieren der App");
+        }
+
+
+        return exchangeDTO;
+    }
+
+    public boolean importApp(AppExchangeDTO exchangeDTO)  {
+
+        try {
+
+            byte[] bundle = Base64.getDecoder().decode(exchangeDTO.getData());
+
+            // 2. Bundle aufteilen
+            if (bundle.length < GCM_IV_LENGTH + 32) {
+                throw new IllegalArgumentException("Ungültiges Export-Bundle");
+            }
+
+            byte[] iv = new byte[GCM_IV_LENGTH];
+            byte[] signature = new byte[32];
+            byte[] encryptedData = new byte[bundle.length - GCM_IV_LENGTH - 32];
+
+            System.arraycopy(bundle, 0, iv, 0, GCM_IV_LENGTH);
+            System.arraycopy(bundle, GCM_IV_LENGTH, encryptedData, 0, encryptedData.length);
+            System.arraycopy(bundle, GCM_IV_LENGTH + encryptedData.length, signature, 0, 32);
+
+            // 3. Signatur verifizieren
+            Mac mac = Mac.getInstance(HMAC_ALGORITHM);
+            mac.init(new SecretKeySpec(signingKey.getEncoded(), HMAC_ALGORITHM));
+            mac.update(iv);
+            mac.update(encryptedData);
+            byte[] expectedSignature = mac.doFinal();
+
+            if (!java.security.MessageDigest.isEqual(signature, expectedSignature)) {
+                throw new SecurityException("Ungültige Signatur - Daten wurden manipuliert oder stammen nicht von dieser Instanz");
+            }
+
+            // 4. Entschlüsseln
+            Cipher cipher = Cipher.getInstance(ENCRYPTION_ALGORITHM);
+            GCMParameterSpec gcmSpec = new GCMParameterSpec(GCM_TAG_LENGTH, iv);
+            cipher.init(Cipher.DECRYPT_MODE, encryptionKey, gcmSpec);
+            byte[] decryptedData = cipher.doFinal(encryptedData);
+
+            // 5. JSON deserialisieren
+            String json = new String(decryptedData, StandardCharsets.UTF_8);
+            AppDTO dto = objectMapper.readValue(json, AppDTO.class);
+
+            // 6. Prüfen ob App mit dieser Client-ID bereits existiert
+            var existingApp = appRepository.getByClientId(dto.getClientId());
+            if (existingApp.isPresent()) {
+                throw new IllegalStateException(
+                        "App mit Client-ID '" + dto.getClientId() + "' existiert bereits"
+                );
+            }
+
+            App app = appTransformer.toAppEntityWithHashedSecret(dto);
+            appRepository.update(app);
+        } catch (JsonProcessingException | NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException |
+                 InvalidAlgorithmParameterException | IllegalBlockSizeException | BadPaddingException _) {
+           return false;
+        }
+
+
+        return true;
+    }
 }
diff --git a/src/main/java/de/avatic/lcc/service/bulk/BulkExportService.java b/src/main/java/de/avatic/lcc/service/bulk/BulkExportService.java
index 6baf9f7..6b0c1a6 100644
--- a/src/main/java/de/avatic/lcc/service/bulk/BulkExportService.java
+++ b/src/main/java/de/avatic/lcc/service/bulk/BulkExportService.java
@@ -4,8 +4,7 @@ import de.avatic.lcc.dto.bulk.BulkFileType;
 import de.avatic.lcc.model.bulk.BulkFileTypes;
 import de.avatic.lcc.model.bulk.BulkOperation;
 import de.avatic.lcc.model.bulk.HiddenTableType;
-import de.avatic.lcc.repositories.rates.ValidityPeriodRepository;
-import de.avatic.lcc.service.bulk.helper.HeaderCellStyleProvider;
+import de.avatic.lcc.service.bulk.helper.CellStyleProvider;
 import de.avatic.lcc.service.excelMapper.*;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -21,10 +20,9 @@ import java.io.IOException;
 @Service
 public class BulkExportService {
 
-    private final HeaderCellStyleProvider headerCellStyleProvider;
+    private final CellStyleProvider cellStyleProvider;
     private final ContainerRateExcelMapper containerRateExcelMapper;
     private final MatrixRateExcelMapper matrixRateExcelMapper;
-    private final MaterialExcelMapper materialExcelMapper;
     private final PackagingExcelMapper packagingExcelMapper;
     private final NodeExcelMapper nodeExcelMapper;
     private final HiddenNodeExcelMapper hiddenNodeExcelMapper;
@@ -32,11 +30,10 @@ public class BulkExportService {
     private final String sheetPassword;
     private final MaterialFastExcelMapper materialFastExcelMapper;
 
-    public BulkExportService(@Value("${lcc.bulk.sheet_password}") String sheetPassword, HeaderCellStyleProvider headerCellStyleProvider, ContainerRateExcelMapper containerRateExcelMapper, MatrixRateExcelMapper matrixRateExcelMapper, MaterialExcelMapper materialExcelMapper, PackagingExcelMapper packagingExcelMapper, NodeExcelMapper nodeExcelMapper, HiddenNodeExcelMapper hiddenNodeExcelMapper, HiddenCountryExcelMapper hiddenCountryExcelMapper, MaterialFastExcelMapper materialFastExcelMapper) {
-        this.headerCellStyleProvider = headerCellStyleProvider;
+    public BulkExportService(@Value("${lcc.bulk.sheet_password}") String sheetPassword, CellStyleProvider cellStyleProvider, ContainerRateExcelMapper containerRateExcelMapper, MatrixRateExcelMapper matrixRateExcelMapper, PackagingExcelMapper packagingExcelMapper, NodeExcelMapper nodeExcelMapper, HiddenNodeExcelMapper hiddenNodeExcelMapper, HiddenCountryExcelMapper hiddenCountryExcelMapper, MaterialFastExcelMapper materialFastExcelMapper) {
+        this.cellStyleProvider = cellStyleProvider;
         this.containerRateExcelMapper = containerRateExcelMapper;
         this.matrixRateExcelMapper = matrixRateExcelMapper;
-        this.materialExcelMapper = materialExcelMapper;
         this.packagingExcelMapper = packagingExcelMapper;
         this.nodeExcelMapper = nodeExcelMapper;
         this.hiddenNodeExcelMapper = hiddenNodeExcelMapper;
@@ -68,7 +65,7 @@ public class BulkExportService {
         Workbook workbook = new XSSFWorkbook();
         Sheet worksheet = workbook.createSheet(BulkFileTypes.valueOf(bulkFileType.name()).getSheetName());
 
-        CellStyle style = headerCellStyleProvider.createHeaderCellStyle(workbook);
+        CellStyle style = cellStyleProvider.createHeaderCellStyle(workbook);
 
 
         if (bulkFileType.equals(BulkFileType.COUNTRY_MATRIX) || bulkFileType.equals(BulkFileType.NODE)) {
@@ -93,10 +90,6 @@ public class BulkExportService {
                 matrixRateExcelMapper.fillSheet(worksheet, style, periodId);
                 matrixRateExcelMapper.createConstraints(workbook, worksheet);
                 break;
-//            case MATERIAL:
-//                materialExcelMapper.fillSheet(worksheet, style);
-//                materialExcelMapper.createConstraints(worksheet);
-//                break;
             case PACKAGING:
                 packagingExcelMapper.fillSheet(worksheet, style);
                 packagingExcelMapper.createConstraints(workbook, worksheet);
diff --git a/src/main/java/de/avatic/lcc/service/bulk/BulkImportService.java b/src/main/java/de/avatic/lcc/service/bulk/BulkImportService.java
index aa77891..3e0f248 100644
--- a/src/main/java/de/avatic/lcc/service/bulk/BulkImportService.java
+++ b/src/main/java/de/avatic/lcc/service/bulk/BulkImportService.java
@@ -3,6 +3,7 @@ package de.avatic.lcc.service.bulk;
 import de.avatic.lcc.dto.bulk.BulkFileType;
 import de.avatic.lcc.model.bulk.BulkFileTypes;
 import de.avatic.lcc.model.bulk.BulkOperation;
+import de.avatic.lcc.model.db.materials.Material;
 import de.avatic.lcc.service.api.BatchGeoApiService;
 import de.avatic.lcc.service.bulk.bulkImport.*;
 import de.avatic.lcc.service.excelMapper.*;
@@ -11,6 +12,8 @@ import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.util.RecordFormatException;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import java.io.ByteArrayInputStream;
@@ -34,6 +37,10 @@ public class BulkImportService {
     private final BatchGeoApiService batchGeoApiService;
     private final MaterialFastExcelMapper materialFastExcelMapper;
 
+    private static final Logger log = LoggerFactory.getLogger(BulkImportService.class);
+
+
+
     public BulkImportService(MatrixRateExcelMapper matrixRateExcelMapper, ContainerRateExcelMapper containerRateExcelMapper, MaterialExcelMapper materialExcelMapper, PackagingExcelMapper packagingExcelMapper, NodeExcelMapper nodeExcelMapper, NodeBulkImportService nodeBulkImportService, PackagingBulkImportService packagingBulkImportService, MaterialBulkImportService materialBulkImportService, MatrixRateImportService matrixRateImportService, ContainerRateImportService containerRateImportService, BatchGeoApiService batchGeoApiService, MaterialFastExcelMapper materialFastExcelMapper) {
         this.matrixRateExcelMapper = matrixRateExcelMapper;
         this.containerRateExcelMapper = containerRateExcelMapper;
@@ -63,7 +70,15 @@ public class BulkImportService {
 
     private void processOperationWithFastExcel(BulkOperation op) throws IOException {
         var materials = materialFastExcelMapper.importFromExcel(op.getFile());
-        materials.forEach(materialBulkImportService::processMaterialInstructions);
+
+        int processed = 0;
+        for(var material : materials) {
+
+            if(processed++ % 1000 == 0)
+                log.info("Processed {} of {} materials", processed, materials.size());
+
+            materialBulkImportService.processMaterialInstructions(material);
+        }
     }
 
     private void processOperationWithApachePOI(BulkOperation op) throws IOException {
@@ -96,10 +111,6 @@ public class BulkImportService {
                     var matrixRates = matrixRateExcelMapper.extractSheet(sheet);
                     matrixRateImportService.processMatrixRates(matrixRates);
                     break;
-//                case MATERIAL:
-//                    var materials = materialExcelMapper.extractSheet(sheet);
-//                    materials.forEach(materialBulkImportService::processMaterialInstructions);
-//                    break;
                 case PACKAGING:
                     var packaging = packagingExcelMapper.extractSheet(sheet);
                     packaging.forEach(packagingBulkImportService::processPackagingInstructions);
diff --git a/src/main/java/de/avatic/lcc/service/bulk/TemplateExportService.java b/src/main/java/de/avatic/lcc/service/bulk/TemplateExportService.java
index e5159f4..79954a8 100644
--- a/src/main/java/de/avatic/lcc/service/bulk/TemplateExportService.java
+++ b/src/main/java/de/avatic/lcc/service/bulk/TemplateExportService.java
@@ -3,7 +3,7 @@ package de.avatic.lcc.service.bulk;
 import de.avatic.lcc.dto.bulk.BulkFileType;
 import de.avatic.lcc.model.bulk.*;
 import de.avatic.lcc.model.bulk.header.*;
-import de.avatic.lcc.service.bulk.helper.HeaderCellStyleProvider;
+import de.avatic.lcc.service.bulk.helper.CellStyleProvider;
 import de.avatic.lcc.service.bulk.helper.HeaderGenerator;
 import de.avatic.lcc.service.excelMapper.*;
 import org.apache.poi.ss.usermodel.CellStyle;
@@ -24,7 +24,7 @@ public class TemplateExportService {
 
 
     private final HeaderGenerator headerGenerator;
-    private final HeaderCellStyleProvider headerCellStyleProvider;
+    private final CellStyleProvider cellStyleProvider;
     private final HiddenNodeExcelMapper hiddenNodeExcelMapper;
     private final HiddenCountryExcelMapper hiddenCountryExcelMapper;
     private final String sheetPassword;
@@ -34,9 +34,9 @@ public class TemplateExportService {
     private final PackagingExcelMapper packagingExcelMapper;
     private final NodeExcelMapper nodeExcelMapper;
 
-    public TemplateExportService(@Value("${lcc.bulk.sheet_password}") String sheetPassword, HeaderGenerator headerGenerator, HeaderCellStyleProvider headerCellStyleProvider, HiddenNodeExcelMapper hiddenNodeExcelMapper, HiddenCountryExcelMapper hiddenCountryExcelMapper, ContainerRateExcelMapper containerRateExcelMapper, MatrixRateExcelMapper matrixRateExcelMapper, MaterialExcelMapper materialExcelMapper, PackagingExcelMapper packagingExcelMapper, NodeExcelMapper nodeExcelMapper) {
+    public TemplateExportService(@Value("${lcc.bulk.sheet_password}") String sheetPassword, HeaderGenerator headerGenerator, CellStyleProvider cellStyleProvider, HiddenNodeExcelMapper hiddenNodeExcelMapper, HiddenCountryExcelMapper hiddenCountryExcelMapper, ContainerRateExcelMapper containerRateExcelMapper, MatrixRateExcelMapper matrixRateExcelMapper, MaterialExcelMapper materialExcelMapper, PackagingExcelMapper packagingExcelMapper, NodeExcelMapper nodeExcelMapper) {
         this.headerGenerator = headerGenerator;
-        this.headerCellStyleProvider = headerCellStyleProvider;
+        this.cellStyleProvider = cellStyleProvider;
         this.hiddenNodeExcelMapper = hiddenNodeExcelMapper;
         this.hiddenCountryExcelMapper = hiddenCountryExcelMapper;
         this.sheetPassword = sheetPassword;
@@ -53,7 +53,7 @@ public class TemplateExportService {
 
             Sheet sheet = workbook.createSheet(BulkFileTypes.valueOf(bulkFileType.name()).getSheetName());
 
-            CellStyle style = headerCellStyleProvider.createHeaderCellStyle(workbook);
+            CellStyle style = cellStyleProvider.createHeaderCellStyle(workbook);
 
 
             if (bulkFileType.equals(BulkFileType.COUNTRY_MATRIX) || bulkFileType.equals(BulkFileType.NODE)) {
diff --git a/src/main/java/de/avatic/lcc/service/bulk/bulkImport/MaterialBulkImportService.java b/src/main/java/de/avatic/lcc/service/bulk/bulkImport/MaterialBulkImportService.java
index 2f9c4c1..e5ef06f 100644
--- a/src/main/java/de/avatic/lcc/service/bulk/bulkImport/MaterialBulkImportService.java
+++ b/src/main/java/de/avatic/lcc/service/bulk/bulkImport/MaterialBulkImportService.java
@@ -29,6 +29,7 @@ public class MaterialBulkImportService {
         }
     }
 
+
     private void updateMaterial(Material material) {
         var foundMaterial = materialRepository.getByPartNumber(material.getNormalizedPartNumber());
 
diff --git a/src/main/java/de/avatic/lcc/service/bulk/helper/CellStyleProvider.java b/src/main/java/de/avatic/lcc/service/bulk/helper/CellStyleProvider.java
new file mode 100644
index 0000000..ce6f063
--- /dev/null
+++ b/src/main/java/de/avatic/lcc/service/bulk/helper/CellStyleProvider.java
@@ -0,0 +1,138 @@
+package de.avatic.lcc.service.bulk.helper;
+
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFColor;
+import org.apache.poi.xssf.usermodel.XSSFFont;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+public class CellStyleProvider {
+
+    public CellStyle createHeaderCellStyle(Workbook workbook) {
+
+        XSSFFont headerFont = (XSSFFont) workbook.createFont();
+
+        headerFont.setColor(PredefinedColors.NEUTRAL.getColor());
+        headerFont.setFontName("Arial");
+        headerFont.setFontHeightInPoints((short) 11);
+        headerFont.setBold(true);
+
+        CellStyle headerStyle = workbook.createCellStyle();
+        headerStyle.setFont(headerFont);
+        headerStyle.setFillForegroundColor(PredefinedColors.TITLE.getColor());
+
+        headerStyle.setAlignment(HorizontalAlignment.CENTER);
+        headerStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+        return updateBorderStyle(headerStyle, IndexedColors.WHITE);
+    }
+
+    private XSSFFont createFontStyle(Workbook workbook, boolean bold) {
+        XSSFFont font = (XSSFFont) workbook.createFont();
+
+        font.setColor(PredefinedColors.TITLE.getColor());
+        font.setFontName("Arial");
+        font.setFontHeightInPoints((short) 11);
+        font.setBold(bold);
+
+        return font;
+    }
+
+    private CellStyle updateBorderStyle(CellStyle style, IndexedColors color) {
+
+        style.setBorderBottom(BorderStyle.THIN);
+        style.setBorderTop(BorderStyle.THIN);
+        style.setBorderLeft(BorderStyle.THIN);
+        style.setBorderRight(BorderStyle.THIN);
+
+        style.setLeftBorderColor(color.getIndex());
+        style.setRightBorderColor(color.getIndex());
+        style.setBottomBorderColor(color.getIndex());
+        style.setTopBorderColor(color.getIndex());
+
+        return style;
+    }
+
+
+    private CellStyle createStyle(Workbook workbook, Short textFormat, XSSFFont fontStyle) {
+        CellStyle style = workbook.createCellStyle();
+
+        style.setFont(fontStyle);
+        style.setAlignment(HorizontalAlignment.RIGHT);
+        style.setDataFormat(textFormat);
+
+        return updateBorderStyle(style, IndexedColors.GREY_25_PERCENT);
+    }
+
+
+    private CellStyle updateHighlight(CellStyle style, PredefinedColors background) {
+        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+        style.setFillForegroundColor(background.getColor());
+        return style;
+    }
+
+    public Map<TextFormat, Map<PredefinedColors, CellStyle>> createCellStyles(Workbook workbook) {
+
+        Map<TextFormat, Map<PredefinedColors, CellStyle>> styles = new HashMap<>();
+
+        Map<TextFormat, Short> textFormat = new HashMap<>();
+        textFormat.put(TextFormat.TEXT_ONLY, workbook.createDataFormat().getFormat("@"));
+        textFormat.put(TextFormat.CURRENCY, workbook.createDataFormat().getFormat("#,##0.00 €"));
+        textFormat.put(TextFormat.PERCENTAGE, workbook.createDataFormat().getFormat("0.00%"));
+
+        var fontStyle = createFontStyle(workbook, false);
+        var headerFontStyle = createFontStyle(workbook, true);
+
+        for (TextFormat currentFormat : TextFormat.values()) {
+
+            Map<PredefinedColors, CellStyle> colors = new HashMap<>();
+
+            for (PredefinedColors color : PredefinedColors.values()) {
+
+                CellStyle style = createStyle(workbook, textFormat.get(currentFormat), color.getBold() ? headerFontStyle : fontStyle);
+                colors.put(color, updateHighlight(style, color));
+
+            }
+
+            styles.put(currentFormat, colors);
+        }
+
+        return styles;
+    }
+
+
+    public enum TextFormat {
+        TEXT_ONLY,
+        CURRENCY,
+        PERCENTAGE,
+    }
+
+    public enum PredefinedColors {
+        HEADER(true, new XSSFColor(new byte[]{(byte) 195, (byte) 207, (byte) 223}, null)),
+        SUB_HEADER(true, new XSSFColor(new byte[]{(byte) 220, (byte) 227, (byte) 236}, null)),
+        LIGHT_BLUE_1(true, new XSSFColor(new byte[]{(byte) 220, (byte) 227, (byte) 236}, null)),
+        LIGHT_BLUE_2(true, new XSSFColor(new byte[]{(byte) 195, (byte) 207, (byte) 223}, null)),
+        GREEN_1(false, new XSSFColor(new byte[]{(byte) 160, (byte) 246, (byte) 211}, null)),
+        GREEN_2(false, new XSSFColor(new byte[]{(byte) 90, (byte) 240, (byte) 180}, null)),
+        TITLE(true, new XSSFColor(new byte[]{(byte) 0, (byte) 47, (byte) 84}, null)),
+        NEUTRAL(false, new XSSFColor(new byte[]{(byte) 255, (byte) 255, (byte) 255}, null)),
+        EXCEPTION(false, new XSSFColor(new byte[]{(byte) 188, (byte) 43, (byte) 114}, null));
+
+        final XSSFColor color;
+        private final boolean bold;
+
+        PredefinedColors(boolean bold, XSSFColor xssfColor) {
+            this.color = xssfColor;
+            this.bold = bold;
+        }
+
+        public XSSFColor getColor() {
+            return color;
+        }
+
+        public boolean getBold() { return bold; }
+    }
+
+}
diff --git a/src/main/java/de/avatic/lcc/service/bulk/helper/HeaderCellStyleProvider.java b/src/main/java/de/avatic/lcc/service/bulk/helper/HeaderCellStyleProvider.java
deleted file mode 100644
index f218a98..0000000
--- a/src/main/java/de/avatic/lcc/service/bulk/helper/HeaderCellStyleProvider.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package de.avatic.lcc.service.bulk.helper;
-
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.xssf.usermodel.XSSFCellStyle;
-import org.apache.poi.xssf.usermodel.XSSFColor;
-import org.apache.poi.xssf.usermodel.XSSFFont;
-import org.springframework.stereotype.Service;
-
-@Service
-public class HeaderCellStyleProvider {
-
-    public CellStyle createHeaderCellStyle(Workbook workbook) {
-
-        XSSFFont headerFont = (XSSFFont) workbook.createFont();
-
-        XSSFColor customTextColor = new XSSFColor(new byte[]{(byte)0, (byte)47, (byte)84}, null); // Blue
-        headerFont.setColor(customTextColor);
-
-        headerFont.setFontName("Arial");
-        headerFont.setFontHeightInPoints((short)10);
-        headerFont.setBold(true);
-
-
-
-        XSSFColor customColor = new XSSFColor(new byte[]{(byte)90, (byte)240, (byte)180}, null);
-
-        CellStyle headerStyle = workbook.createCellStyle();
-        headerFont.setBold(true);
-        headerStyle.setFont(headerFont);
-        headerStyle.setFillForegroundColor(customColor);
-
-
-        headerStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        headerStyle.setBorderBottom(BorderStyle.THIN);
-        headerStyle.setBorderTop(BorderStyle.THIN);
-        headerStyle.setBorderLeft(BorderStyle.THIN);
-        headerStyle.setBorderRight(BorderStyle.THIN);
-        headerStyle.setAlignment(HorizontalAlignment.CENTER);
-        return headerStyle;
-    }
-
-
-
-}
diff --git a/src/main/java/de/avatic/lcc/service/bulk/helper/HeaderGenerator.java b/src/main/java/de/avatic/lcc/service/bulk/helper/HeaderGenerator.java
index e9a3a83..cce553e 100644
--- a/src/main/java/de/avatic/lcc/service/bulk/helper/HeaderGenerator.java
+++ b/src/main/java/de/avatic/lcc/service/bulk/helper/HeaderGenerator.java
@@ -6,6 +6,8 @@ import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.RegionUtil;
 import org.springframework.stereotype.Service;
 
 import java.util.EnumSet;
@@ -13,13 +15,13 @@ import java.util.EnumSet;
 @Service
 public class HeaderGenerator {
 
-    private static final int ADD_COLUMN_SIZE = (10*256);
+    private static final int ADD_COLUMN_SIZE = (10 * 256);
 
     public <H extends Enum<H> & HeaderProvider> void validateHeader(Sheet sheet, Class<H> headers) {
         Row row = sheet.getRow(0);
-        for(H header : EnumSet.allOf(headers)){
+        for (H header : EnumSet.allOf(headers)) {
             Cell cell = row.getCell(header.ordinal());
-            if(cell == null || !cell.getStringCellValue().equals(header.getHeader())){
+            if (cell == null || !cell.getStringCellValue().equals(header.getHeader())) {
                 throw new ExcelValidationError("Unable to validate header \"" + header.getHeader() + "\": Header of column " + toExcelLetter(header.ordinal()) + " has to be \"" + header.getHeader() + "\"");
             }
         }
@@ -28,9 +30,9 @@ public class HeaderGenerator {
     public void validateHeader(Sheet sheet, String[] headers) {
         Row row = sheet.getRow(0);
         int idx = 0;
-        for(String header : headers){
+        for (String header : headers) {
             Cell cell = row.getCell(idx++);
-            if(cell == null || !cell.getStringCellValue().equals(header)){
+            if (cell == null || !cell.getStringCellValue().equals(header)) {
                 throw new ExcelValidationError("Unable to validate header \"" + header + "\": Header of column " + toExcelLetter(idx) + " has to be \"" + header + "\"");
 
             }
@@ -39,39 +41,132 @@ public class HeaderGenerator {
 
     public <H extends Enum<H> & HeaderProvider> void generateHeader(Sheet worksheet, Class<H> headers, CellStyle style) {
         Row row = worksheet.createRow(0);
+
+        Boolean usesOrdinals = null;
+
         for (H header : EnumSet.allOf(headers)) {
-            Cell cell = row.createCell(header.ordinal());
-            cell.setCellValue(header.getHeader());
-            cell.setCellStyle(style);
-            worksheet.autoSizeColumn(header.ordinal());
+
+            if (usesOrdinals == null) usesOrdinals = header.useOrdinal();
+
+            if (usesOrdinals) {
+                Cell cell = row.createCell(header.ordinal());
+                cell.setCellValue(header.getHeader());
+                cell.setCellStyle(style);
+                worksheet.autoSizeColumn(header.ordinal());
+
+            } else {
+                Cell cell = row.createCell(header.getColumn());
+
+                if (header.occupiedCells() > 1) {
+
+
+                    var merged = new CellRangeAddress(0, 0, header.getColumn(), header.getColumn() + header.occupiedCells() - 1);
+
+                    RegionUtil.setBorderBottom(style.getBorderBottom(), merged, worksheet);
+                    RegionUtil.setBorderTop(style.getBorderTop(), merged, worksheet);
+                    RegionUtil.setBorderLeft(style.getBorderLeft(), merged, worksheet);
+                    RegionUtil.setBorderRight(style.getBorderRight(), merged, worksheet);
+                    RegionUtil.setBottomBorderColor(style.getBottomBorderColor(), merged, worksheet);
+                    RegionUtil.setTopBorderColor(style.getTopBorderColor(), merged, worksheet);
+                    RegionUtil.setLeftBorderColor(style.getLeftBorderColor(), merged, worksheet);
+                    RegionUtil.setRightBorderColor(style.getRightBorderColor(), merged, worksheet);
+
+                    worksheet.addMergedRegion(merged);
+                }
+
+                cell.setCellValue(header.getHeader());
+                cell.setCellStyle(style);
+                worksheet.autoSizeColumn(header.getColumn());
+            }
         }
     }
 
     public void generateHeader(Sheet worksheet, String[] headers, CellStyle style) {
+        generateHeader(worksheet, headers, style, false);
+    }
+
+    public void generateHeader(Sheet worksheet, String[] headers, CellStyle style, boolean mergeCells) {
         Row row = worksheet.createRow(0);
-        int idx = 0;
-        for (String header : headers) {
-            Cell cell = row.createCell(idx);
-            cell.setCellValue(header);
-            cell.setCellStyle(style);
-            worksheet.autoSizeColumn(idx++);
+
+        for (int idx = 0; idx < headers.length; idx++) {
+
+            if (headers[idx] != null || !mergeCells) {
+                String header = headers[idx];
+
+                Cell cell = row.createCell(idx);
+                cell.setCellValue(header);
+                cell.setCellStyle(style);
+
+                if (mergeCells) {
+                    int lookAhead = 1;
+                    while (idx + lookAhead < headers.length && headers[idx + lookAhead] == null) lookAhead++;
+
+                    if (lookAhead > 1) {
+                        var merged = new CellRangeAddress(
+                                0,
+                                0,
+                                idx,
+                                idx + lookAhead - 1
+                        );
+
+                        RegionUtil.setBorderBottom(style.getBorderBottom(), merged, worksheet);
+                        RegionUtil.setBorderTop(style.getBorderTop(), merged, worksheet);
+                        RegionUtil.setBorderLeft(style.getBorderLeft(), merged, worksheet);
+                        RegionUtil.setBorderRight(style.getBorderRight(), merged, worksheet);
+                        RegionUtil.setBottomBorderColor(style.getBottomBorderColor(), merged, worksheet);
+                        RegionUtil.setTopBorderColor(style.getTopBorderColor(), merged, worksheet);
+                        RegionUtil.setLeftBorderColor(style.getLeftBorderColor(), merged, worksheet);
+                        RegionUtil.setRightBorderColor(style.getRightBorderColor(), merged, worksheet);
+
+                        worksheet.addMergedRegion(merged);
+                    }
+                }
+
+
+            }
+
+            worksheet.autoSizeColumn(idx);
         }
     }
 
 
+    public void fixWidth(Sheet sheet, String[] headers, boolean respectMerged) {
+
+        if (respectMerged) {
+            int idx = 0;
+            for (String header : headers) {
+                sheet.autoSizeColumn(idx, true);
+                sheet.setColumnWidth(idx, sheet.getColumnWidth(idx) + ADD_COLUMN_SIZE);
+                idx++;
+            }
+        } else
+            fixWidth(sheet, headers);
+
+    }
+
+
     public void fixWidth(Sheet sheet, String[] headers) {
         int idx = 0;
         for (String header : headers) {
             sheet.autoSizeColumn(idx);
-            sheet.setColumnWidth(idx,sheet.getColumnWidth(idx)+ADD_COLUMN_SIZE);
+            sheet.setColumnWidth(idx, sheet.getColumnWidth(idx) + ADD_COLUMN_SIZE);
             idx++;
         }
     }
 
     public <H extends Enum<H> & HeaderProvider> void fixWidth(Sheet sheet, Class<H> headers) {
+        Boolean usesOrdinals = null;
+
         for (H header : EnumSet.allOf(headers)) {
-            sheet.autoSizeColumn(header.ordinal());
-            sheet.setColumnWidth(header.ordinal(),sheet.getColumnWidth(header.ordinal())+ADD_COLUMN_SIZE);
+            if (usesOrdinals == null) usesOrdinals = header.useOrdinal();
+
+            if (usesOrdinals) {
+                sheet.autoSizeColumn(header.ordinal());
+                sheet.setColumnWidth(header.ordinal(), sheet.getColumnWidth(header.ordinal()) + ADD_COLUMN_SIZE);
+            } else {
+                sheet.autoSizeColumn(header.getColumn());
+                sheet.setColumnWidth(header.getColumn(), sheet.getColumnWidth(header.getColumn()) + ADD_COLUMN_SIZE);
+            }
         }
     }
 
diff --git a/src/main/java/de/avatic/lcc/service/calculation/DistanceService.java b/src/main/java/de/avatic/lcc/service/calculation/DistanceService.java
index 774013c..a09a3e7 100644
--- a/src/main/java/de/avatic/lcc/service/calculation/DistanceService.java
+++ b/src/main/java/de/avatic/lcc/service/calculation/DistanceService.java
@@ -4,7 +4,6 @@ import de.avatic.lcc.model.db.country.DetourIndex;
 import de.avatic.lcc.model.db.country.IsoCode;
 import de.avatic.lcc.model.db.nodes.Location;
 import de.avatic.lcc.model.db.nodes.Node;
-import de.avatic.lcc.repositories.DistanceMatrixRepository;
 import de.avatic.lcc.repositories.country.CountryRepository;
 import de.avatic.lcc.service.api.DistanceApiService;
 import org.springframework.stereotype.Service;
@@ -21,26 +20,36 @@ public class DistanceService {
         this.distanceApiService = distanceApiService;
     }
 
-    public double getDistance(Integer srcCountryId, Location src, Integer destCountryId, Location dest, boolean fast) {
-        if (fast) return getDistanceFast(srcCountryId, src, destCountryId, dest);
+    public double getDistanceForLocation(Integer srcCountryId, Location src, Integer destCountryId, Location dest, boolean fast) {
+        var fastDistance = getDistanceFast(srcCountryId, src, destCountryId, dest);
+
+        // use fast distance if more than 3000km
+        if (fast || fastDistance > 3000) return fastDistance;
 
         var distance = distanceApiService.getDistance(src, dest);
-        if (distance.isEmpty()) return getDistanceFast(srcCountryId, src, destCountryId, dest);
+        if (distance.isEmpty()) return fastDistance;
 
         return distance.map(value -> value/1000).orElse(0);
     }
 
-    public double getDistance(Node src, Node dest, boolean fast) {
-        if (fast) return getDistanceFast(src, dest);
+    public double getDistanceForNode(Node src, Node dest) {
+        return getDistanceForNode(src, dest, false);
+    }
+
+    public double getDistanceForNode(Node src, Node dest, boolean fast) {
+        var fastDistance = getDistanceFast(src, dest);
+
+        // use fast distance if more than 3000km
+        if (fast || fastDistance > 3000) return fastDistance;
 
         var distance = distanceApiService.getDistance(src, src.isUserNode(), dest, dest.isUserNode());
-        if (distance.isEmpty()) return getDistanceFast(src, dest);
+        if (distance.isEmpty()) return fastDistance;
 
         return distance.map(value -> value.getDistance().intValue()/1000).orElse(0);
     }
 
 
-    public double getDistanceFast(Integer srcCountryId, Location src, Integer destCountryId, Location dest  ) {
+    private double getDistanceFast(Integer srcCountryId, Location src, Integer destCountryId, Location dest  ) {
         double srcLatitudeRadians = Math.toRadians(src.getLatitude());
         double srcLongitudeRad = Math.toRadians(src.getLongitude());
         double destLatitudeRadians = Math.toRadians(dest.getLatitude());
diff --git a/src/main/java/de/avatic/lcc/service/calculation/RoutingService.java b/src/main/java/de/avatic/lcc/service/calculation/RoutingService.java
index 5f474f9..83efa68 100644
--- a/src/main/java/de/avatic/lcc/service/calculation/RoutingService.java
+++ b/src/main/java/de/avatic/lcc/service/calculation/RoutingService.java
@@ -219,6 +219,8 @@ public class RoutingService {
         routeSection.setPostRun(section.getType().equals(TemporaryRateObject.TemporaryRateObjectType.POST_RUN));
         routeSection.setPreRun(false);
 
+        routeSection.setDistance(section.getApproxDistance());
+
         return routeSection;
 
     }
@@ -334,7 +336,7 @@ public class RoutingService {
                 }
 
                 finalSection.setRate(matrixRate);
-                finalSection.setApproxDistance(distanceService.getDistance(container.getSourceNode(), toNode, true));
+                finalSection.setApproxDistance(distanceService.getDistanceForNode(container.getSourceNode(), toNode));
                 rates.add(finalSection);
             }
 
@@ -429,7 +431,7 @@ public class RoutingService {
                 TemporaryRateObject finalSection = null;
                 SourceConnectionType connectionType = SourceConnectionType.NONE;
 
-                if (source.getId().equals(chain.getLast().getId())) {
+                if (!source.isUserNode() && source.getId().equals(chain.getLast().getId())) {
                     connectionType = SourceConnectionType.CHAIN_END_IS_SOURCE_NODE;
                 } else if (nearByNodes != null) {
                     nearByNode = nearByNodes.stream().filter(n -> n.getId().equals(chain.getLast().getId())).findFirst().orElse(null);
@@ -440,7 +442,7 @@ public class RoutingService {
                 if (connectionType == SourceConnectionType.NONE) {
                     // find final section: check if chain end and source node are identical, then check if chain end can be connected to
                     // source node, if this is not possible use a near-by node
-                    finalSection = connectNodes(source, chain.getLast(), container);
+                   finalSection = connectNodes(source, chain.getLast(), container);
                     if (finalSection != null)
                         connectionType = SourceConnectionType.FINAL_SECTION_WITH_SOURCE_NODE;
                 }
@@ -477,7 +479,7 @@ public class RoutingService {
                         }
 
                         if (connectionType == SourceConnectionType.FINAL_SECTION_WITH_NEAR_BY_NODE || connectionType == SourceConnectionType.CHAIN_END_IS_NEAR_BY_NODE) {
-                            duplicate.routeOverNearBy(source, nearByNode);
+                            duplicate.routeOverNearBy(source, nearByNode, distanceService.getDistanceForNode(source, nearByNode));
                         }
 
                         routes.add(duplicate);
@@ -563,7 +565,6 @@ public class RoutingService {
          *      - check if chain is routable
          *      - add post run and main run
          */
-        var mainruns = container.getMainRuns();
 
         for (var mainRun : container.getMainRuns()) {
 
@@ -629,6 +630,10 @@ public class RoutingService {
                         if (routable) {
                             qualityRoutable = true;
                             routeObj.setQuality(quality);
+
+                            mainRunObj.setApproxDistance(distanceService.getDistanceForNode(mainRunStartNode, mainRunEndNode));
+                            postRunObj.setApproxDistance(distanceService.getDistanceForNode(mainRunEndNode, postRunEndNode));
+
                             routeObj.addPostRunSection(postRunObj);
                             routeObj.addMainRunSection(mainRunObj);
                             container.addRoute(routeObj);
@@ -688,10 +693,11 @@ public class RoutingService {
         if (container.getRates().contains(matrixRateObj))
             return container.getRates().stream().filter(r -> r.equals(matrixRateObj)).findFirst().orElseThrow();
 
-        Optional<ContainerRate> containerRate = containerRateRepository.findRoute(startNode.getId(), endNode.getId(), TransportType.ROAD);
+        Optional<ContainerRate> containerRate = startNode.isUserNode() ? Optional.empty() : containerRateRepository.findRoute(startNode.getId(), endNode.getId(), TransportType.ROAD);
 
         if (containerRate.isPresent()) {
             containerRateObj.setRate(containerRate.get());
+            containerRateObj.setApproxDistance(distanceService.getDistanceForNode(startNode, endNode));
             container.getRates().add(containerRateObj);
             return containerRateObj;
         } else {
@@ -699,7 +705,7 @@ public class RoutingService {
 
             if (matrixRate.isPresent()) {
                 matrixRateObj.setRate(matrixRate.get());
-                matrixRateObj.setApproxDistance(distanceService.getDistance(startNode, endNode, true));
+                matrixRateObj.setApproxDistance(distanceService.getDistanceForNode(startNode, endNode));
                 container.getRates().add(matrixRateObj);
                 return matrixRateObj;
             } else {
@@ -889,8 +895,10 @@ public class RoutingService {
             return clone;
         }
 
-        public void routeOverNearBy(Node source, Node nearByNode) {
-            this.sections.add(new TemporaryRateObject(source, nearByNode, TemporaryRateObject.TemporaryRateObjectType.NEAR_BY));
+        public void routeOverNearBy(Node source, Node nearByNode, double distance) {
+            var rate = new TemporaryRateObject(source, nearByNode, TemporaryRateObject.TemporaryRateObjectType.NEAR_BY);
+            rate.setApproxDistance(distance);
+            this.sections.add(rate);
             this.nearBy = true;
         }
 
@@ -927,16 +935,16 @@ public class RoutingService {
 
                 sb.append(sections.getLast().getFromNode().getDebugText());
                 for (var section : sections.reversed()) {
-                    sb.append(" -");
+                    sb.append(" --[");
                     sb.append(section.getType().getDebugText());
-                    sb.append("-> ");
+                    sb.append("]--> ");
                     sb.append(section.getToNode().getDebugText());
                 }
 
             } else sb.append("Empty");
 
 
-            return String.format("Route: [%s, %s]", quality.name().charAt(0) + (isFastest ? "\uD83D\uDE80" : "") + (isCheapest ? "\uD83D\uDCB2" : ""), sb);
+            return String.format("Route: [%s, %s]", quality.name() + (isFastest ? " FAST" : "") + (isCheapest ? " CHEAP" : ""), sb);
         }
 
         public void setQuality(ChainQuality quality) {
@@ -985,7 +993,10 @@ public class RoutingService {
                 if (this.type.equals(TemporaryRateObjectType.MATRIX)) {
                     return Objects.equals(this.fromNode.getCountryId(), that.fromNode.getCountryId()) && Objects.equals(this.toNode.getCountryId(), that.toNode.getCountryId());
                 } else if (this.type.equals(TemporaryRateObjectType.CONTAINER) || this.type.equals(TemporaryRateObjectType.MAIN_RUN) || this.type.equals(TemporaryRateObjectType.POST_RUN) || this.type.equals(TemporaryRateObjectType.NEAR_BY)) {
-                    return Objects.equals(this.fromNode.getId(), that.fromNode.getId()) && Objects.equals(this.toNode.getId(), that.toNode.getId());
+                    return Objects.equals(this.fromNode.getId(), that.fromNode.getId())
+                            && Objects.equals(this.toNode.getId(), that.toNode.getId())
+                            && Objects.equals(this.fromNode.isUserNode(), that.fromNode.isUserNode())
+                            && Objects.equals(this.toNode.isUserNode(), that.toNode.isUserNode());
                 }
             }
 
@@ -998,7 +1009,7 @@ public class RoutingService {
 
             if (containerRate != null) return Objects.hash(containerRate.getFromNodeId(), containerRate.getToNodeId());
 
-            return Objects.hash(null, null);
+            return Objects.hash(fromNode.getId(), toNode.getId(), fromNode.isUserNode(), toNode.isUserNode());
         }
 
         public void setRate(ContainerRate containerRate) {
@@ -1074,8 +1085,8 @@ public class RoutingService {
         }
 
         private enum TemporaryRateObjectType {
-            NEAR_BY("\uD83D\uDCCD"), MATRIX("\uD83D\uDCCA"), CONTAINER("\uD83D\uDCE6"), POST_RUN("\uD83D\uDE9B"), MAIN_RUN("\uD83D\uDEA2");
-
+//            NEAR_BY("\uD83D\uDCCD"), MATRIX("\uD83D\uDCCA"), CONTAINER("\uD83D\uDCE6"), POST_RUN("\uD83D\uDE9B"), MAIN_RUN("\uD83D\uDEA2");
+           NEAR_BY("NEAR"), MATRIX("KM"), CONTAINER("CON"), POST_RUN("POST"), MAIN_RUN("MAIN");
             private final String debugText;
 
             TemporaryRateObjectType(String debugText) {
diff --git a/src/main/java/de/avatic/lcc/service/calculation/execution/CalculationExecutionService.java b/src/main/java/de/avatic/lcc/service/calculation/execution/CalculationExecutionService.java
index c0dab67..db12325 100644
--- a/src/main/java/de/avatic/lcc/service/calculation/execution/CalculationExecutionService.java
+++ b/src/main/java/de/avatic/lcc/service/calculation/execution/CalculationExecutionService.java
@@ -3,33 +3,32 @@ package de.avatic.lcc.service.calculation.execution;
 import de.avatic.lcc.dto.generic.ContainerType;
 import de.avatic.lcc.dto.generic.RateType;
 import de.avatic.lcc.model.calculation.*;
-import de.avatic.lcc.model.db.calculations.*;
-import de.avatic.lcc.model.db.error.SysError;
-import de.avatic.lcc.model.db.error.SysErrorType;
+import de.avatic.lcc.model.db.calculations.CalculationJob;
+import de.avatic.lcc.model.db.calculations.CalculationJobDestination;
+import de.avatic.lcc.model.db.calculations.CalculationJobRouteSection;
+import de.avatic.lcc.model.db.calculations.CalculationJobState;
 import de.avatic.lcc.model.db.packaging.LoadCarrierType;
 import de.avatic.lcc.model.db.packaging.PackagingDimension;
 import de.avatic.lcc.model.db.premises.Premise;
 import de.avatic.lcc.model.db.premises.route.Destination;
 import de.avatic.lcc.model.db.premises.route.RouteSection;
 import de.avatic.lcc.model.db.properties.SystemPropertyMappingId;
-import de.avatic.lcc.repositories.calculation.CalculationJobRepository;
-import de.avatic.lcc.repositories.error.SysErrorRepository;
+import de.avatic.lcc.repositories.calculation.CalculationJobDestinationRepository;
+import de.avatic.lcc.repositories.calculation.CalculationJobRouteSectionRepository;
 import de.avatic.lcc.repositories.premise.DestinationRepository;
 import de.avatic.lcc.repositories.premise.PremiseRepository;
 import de.avatic.lcc.repositories.premise.RouteRepository;
 import de.avatic.lcc.repositories.premise.RouteSectionRepository;
 import de.avatic.lcc.repositories.properties.PropertyRepository;
 import de.avatic.lcc.service.calculation.execution.steps.*;
-import de.avatic.lcc.service.transformer.error.SysErrorTransformer;
+import de.avatic.lcc.service.precalculation.PostCalculationCheckService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
 
 @Service
 public class CalculationExecutionService {
@@ -49,12 +48,12 @@ public class CalculationExecutionService {
     private final PremiseToHuService premiseToHuService;
     private final ContainerCalculationService containerCalculationService;
     private final ShippingFrequencyCalculationService shippingFrequencyCalculationService;
-    private final CalculationJobRepository calculationJobRepository;
-    private final SysErrorRepository sysErrorRepository;
-    private final SysErrorTransformer sysErrorTransformer;
+    private final PostCalculationCheckService postCalculationCheckService;
+    private final CalculationJobDestinationRepository calculationJobDestinationRepository;
+    private final CalculationJobRouteSectionRepository calculationJobRouteSectionRepository;
 
 
-    public CalculationExecutionService(PremiseRepository premiseRepository, DestinationRepository destinationRepository, RouteRepository routeRepository, RouteSectionRepository routeSectionRepository, CustomCostCalculationService customCostCalculationService, RouteSectionCostCalculationService routeSectionCostCalculationService, HandlingCostCalculationService handlingCostCalculationService, InventoryCostCalculationService inventoryCostCalculationService, PropertyRepository propertyRepository, AirfreightCalculationService airfreightCalculationService, PremiseToHuService premiseToHuService, ContainerCalculationService containerCalculationService, ShippingFrequencyCalculationService shippingFrequencyCalculationService, CalculationJobRepository calculationJobRepository, SysErrorRepository sysErrorRepository, SysErrorTransformer sysErrorTransformer) {
+    public CalculationExecutionService(PremiseRepository premiseRepository, DestinationRepository destinationRepository, RouteRepository routeRepository, RouteSectionRepository routeSectionRepository, CustomCostCalculationService customCostCalculationService, RouteSectionCostCalculationService routeSectionCostCalculationService, HandlingCostCalculationService handlingCostCalculationService, InventoryCostCalculationService inventoryCostCalculationService, PropertyRepository propertyRepository, AirfreightCalculationService airfreightCalculationService, PremiseToHuService premiseToHuService, ContainerCalculationService containerCalculationService, ShippingFrequencyCalculationService shippingFrequencyCalculationService, PostCalculationCheckService postCalculationCheckService, CalculationJobDestinationRepository calculationJobDestinationRepository, CalculationJobRouteSectionRepository calculationJobRouteSectionRepository) {
         this.premiseRepository = premiseRepository;
         this.destinationRepository = destinationRepository;
         this.routeRepository = routeRepository;
@@ -68,9 +67,9 @@ public class CalculationExecutionService {
         this.premiseToHuService = premiseToHuService;
         this.containerCalculationService = containerCalculationService;
         this.shippingFrequencyCalculationService = shippingFrequencyCalculationService;
-        this.calculationJobRepository = calculationJobRepository;
-        this.sysErrorRepository = sysErrorRepository;
-        this.sysErrorTransformer = sysErrorTransformer;
+        this.postCalculationCheckService = postCalculationCheckService;
+        this.calculationJobDestinationRepository = calculationJobDestinationRepository;
+        this.calculationJobRouteSectionRepository = calculationJobRouteSectionRepository;
     }
 
     private static ContainerType getBestContainerType(Map<ContainerType, List<SectionInfo>> sectionResults) {
@@ -85,32 +84,23 @@ public class CalculationExecutionService {
     }
 
 
-    @Async("calculationExecutor")
-    public CompletableFuture<CalculationResult> launchJobCalculation(Integer calculationId) {
+    public void launchJobCalculation(CalculationJob job) {
 
-        var optCalc = calculationJobRepository.getCalculationJob(calculationId);
+        var destinationInfos = calculateJob(job);
 
-        try {
-            return CompletableFuture.completedFuture(new CalculationResult(calculationId, calculateJob(optCalc.orElseThrow())));
-        } catch (Throwable e) {
+        /* check if successfull */
+        postCalculationCheckService.doPostcheck(destinationInfos);
 
-            var calc = optCalc.orElse(null);
+        /* save result */
+        for (var destinationInfo : destinationInfos) {
+            destinationInfo.destinationCalculationJob().setCalculationJobId(job.getId());
+            var destinationId = calculationJobDestinationRepository.insert(destinationInfo.destinationCalculationJob());
 
-            var error = new SysError();
-            error.setType(SysErrorType.CALCULATION);
-            error.setCode(e.getClass().getSimpleName().substring(0, Math.min(e.getClass().getSimpleName().length(), 253)));
-            error.setTitle("Calculation operation execution " + calculationId + " failed");
-
-            var msg = e.getMessage() == null ? "" : e.getMessage();
-
-            error.setMessage(msg.substring(0, Math.min(e.getMessage().length(), 1000)));
-            error.setUserId(calc == null ? null : calc.getUserId());
-            error.setCalculationJobId(calculationId);
-            error.setTrace(Arrays.stream(e.getStackTrace()).map(sysErrorTransformer::toSysErrorTraceItem).toList());
-
-            sysErrorRepository.insert(error);
-
-            return CompletableFuture.completedFuture(new CalculationResult(calculationId, e));
+            for (var sectionInfo : destinationInfo.sectionInfo()) {
+                var section = sectionInfo.result();
+                section.setCalculationJobDestinationId(destinationId);
+                calculationJobRouteSectionRepository.insert(section);
+            }
         }
     }
 
@@ -147,13 +137,15 @@ public class CalculationExecutionService {
         AirfreightResult airfreightCost = airfreightCalculationService.doCalculation(setId, periodId, premise, destination);
         ContainerType usedContainerType = null;
 
+        ContainerCalculationResult selectedContainerCalculation = null;
+
         CalculationJobDestination destinationCalculationJob = new CalculationJobDestination();
         boolean hasMainRun = true;
         BigDecimal leadTime = null;
 
         if (destination.getD2d()) {
-            var containerCalculation = containerCalculationService.doCalculation(setId, premiseToHuService.createHuFromPremise(premise), ContainerType.FEU);
-            sections = List.of(new SectionInfo(null, routeSectionCostCalculationService.doD2dCalculation(setId, periodId, premise, destination, containerCalculation), containerCalculation));
+            selectedContainerCalculation = containerCalculationService.doCalculation(setId, premiseToHuService.createHuFromPremise(premise), ContainerType.FEU, premise.getHuMixable(), premise.getHuStackable());
+            sections = List.of(new SectionInfo(null, routeSectionCostCalculationService.doD2dCalculation(setId, periodId, premise, destination, selectedContainerCalculation), selectedContainerCalculation));
             leadTime = BigDecimal.valueOf(destination.getLeadTimeD2d());
             usedContainerType = ContainerType.FEU;
         } else {
@@ -171,6 +163,8 @@ public class CalculationExecutionService {
                     s.result().setPostRun(false);
                 });
             }
+
+            selectedContainerCalculation = bestContainerTypeResult.selectedContainerCalculation;
         }
 
         destinationCalculationJob.setD2D(destination.getD2d());
@@ -178,9 +172,9 @@ public class CalculationExecutionService {
         if(destination.getD2d())
             destinationCalculationJob.setRateD2D(destination.getRateD2d());
 
-        customCost = customCostCalculationService.doCalculation(setId, premise, destination, sections);
-        handlingCost = handlingCostCalculationService.doCalculation(setId, premise, destination, hasMainRun);
-        inventoryCost = inventoryCostCalculationService.doCalculation(setId, premise, destination, leadTime);
+        customCost = customCostCalculationService.doCalculation(setId, premise, destination, sections, selectedContainerCalculation);
+        handlingCost = handlingCostCalculationService.doCalculation(setId, premise, destination, hasMainRun, selectedContainerCalculation);
+        inventoryCost = inventoryCostCalculationService.doCalculation(setId, premise, destination, leadTime, selectedContainerCalculation);
 
         destinationCalculationJob.setContainerType(usedContainerType);
 
@@ -219,7 +213,10 @@ public class CalculationExecutionService {
         destinationCalculationJob.setHuCount(sections.getFirst().containerResult().getHuUnitCount());
 
         destinationCalculationJob.setAnnualAmount(BigDecimal.valueOf(destination.getAnnualAmount()));
-        destinationCalculationJob.setShippingFrequency(shippingFrequencyCalculationService.doCalculation(setId, destination.getAnnualAmount()));
+
+
+        double huAnnualAmount = BigDecimal.valueOf(destination.getAnnualAmount()).divide(BigDecimal.valueOf(premise.getHuUnitCount()),4, RoundingMode.UP ).doubleValue();
+        destinationCalculationJob.setShippingFrequency(Double.valueOf(shippingFrequencyCalculationService.doCalculation(setId, huAnnualAmount, selectedContainerCalculation.getHuPerContainer(),!premise.getHuMixable())).intValue());
 
         var commonCost = destinationCalculationJob.getAnnualHandlingCost()
                 .add(destinationCalculationJob.getAnnualDisposalCost())
@@ -256,7 +253,7 @@ public class CalculationExecutionService {
 
         // Get container calculation
         for (var containerType : ContainerType.values()) {
-            containerCalculation.put(containerType, containerCalculationService.doCalculation(setId, hu, containerType));
+            containerCalculation.put(containerType, containerCalculationService.doCalculation(setId, hu, containerType, premise.getHuMixable(), premise.getHuStackable()));
         }
 
         for (var containerType : ContainerType.values()) {
@@ -274,10 +271,10 @@ public class CalculationExecutionService {
 
         }
         var bestContainerType = getBestContainerType(sectionInfos);
-        return new BestContainerTypeResult(bestContainerType, sectionInfos.get(bestContainerType));
+        return new BestContainerTypeResult(bestContainerType, sectionInfos.get(bestContainerType), containerCalculation.get(bestContainerType));
     }
 
-    private record BestContainerTypeResult(ContainerType containerType, List<SectionInfo> sections) {
+    private record BestContainerTypeResult(ContainerType containerType, List<SectionInfo> sections, ContainerCalculationResult selectedContainerCalculation) {
     }
 
 }
diff --git a/src/main/java/de/avatic/lcc/service/calculation/execution/CalculationJobProcessor.java b/src/main/java/de/avatic/lcc/service/calculation/execution/CalculationJobProcessor.java
new file mode 100644
index 0000000..c671025
--- /dev/null
+++ b/src/main/java/de/avatic/lcc/service/calculation/execution/CalculationJobProcessor.java
@@ -0,0 +1,135 @@
+package de.avatic.lcc.service.calculation.execution;
+
+import de.avatic.lcc.model.db.calculations.CalculationJob;
+import de.avatic.lcc.model.db.error.SysError;
+import de.avatic.lcc.model.db.error.SysErrorType;
+import de.avatic.lcc.repositories.calculation.CalculationJobRepository;
+import de.avatic.lcc.repositories.error.SysErrorRepository;
+import de.avatic.lcc.service.transformer.error.SysErrorTransformer;
+import jakarta.annotation.PreDestroy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+@Component
+public class CalculationJobProcessor {
+
+    private static final Logger log = LoggerFactory.getLogger(CalculationJobProcessor.class);
+
+    private final CalculationJobRepository calculationJobRepository;
+    private final SysErrorTransformer sysErrorTransformer;
+    private final SysErrorRepository sysErrorRepository;
+    private final CalculationExecutionService calculationExecutionService;
+
+    @Value("${calculation.job.processor.enabled:true}")
+    private boolean enabled;
+
+    private volatile  boolean shutdownRequested = false;
+
+    public CalculationJobProcessor(CalculationJobRepository calculationJobRepository, SysErrorTransformer sysErrorTransformer, SysErrorRepository sysErrorRepository, CalculationExecutionService calculationExecutionService) {
+        this.calculationJobRepository = calculationJobRepository;
+        this.sysErrorTransformer = sysErrorTransformer;
+        this.sysErrorRepository = sysErrorRepository;
+        this.calculationExecutionService = calculationExecutionService;
+    }
+
+    private void processNextJob(CalculationJob job) {
+
+        log.info("Processing calculation job {} with priority {} (retries: {})",
+                job.getId(), job.getPriority(), job.getRetries());
+
+        try {
+
+            executeCalculation(job);
+
+            calculationJobRepository.markAsValid(job.getId());
+            log.info("Successfully completed calculation job {}", job.getId());
+
+        } catch (Exception e) {
+            // Job fehlgeschlagen
+            log.error("Error processing calculation job {}: {}", job.getId(), e.getMessage() == null ? "n/a" : e.getMessage(), e);
+
+            Integer errorId = buildError(e, job);
+
+            calculationJobRepository.markAsException(job.getId(), errorId);
+
+            if (job.getRetries() >= 3) {
+                log.warn("Calculation job {} failed after {} retries", job.getId(), job.getRetries());
+            } else {
+                log.info("Calculation job {} marked for retry (attempt {}/3)", job.getId(), job.getRetries());
+            }
+        }
+    }
+
+    @PreDestroy
+    public void onShutdown() {
+        log.info("Shutdown requested, stopping job processing after current jobs...");
+        shutdownRequested = true;
+    }
+
+    @Scheduled(fixedDelayString = "${calculation.job.processor.delay:5000}")
+    public void entryPoint() {
+        if (!enabled) {
+            return;
+        }
+
+        try {
+            while (!shutdownRequested && !Thread.currentThread().isInterrupted()) {
+
+                Optional<CalculationJob> jobOpt = calculationJobRepository.fetchAndLockNextJob();
+
+                if (jobOpt.isEmpty()) {
+                    // no jobs -> go to sleep
+                    return;
+                }
+
+                CalculationJob job = jobOpt.get();
+
+                processNextJob(job);
+
+            }
+
+
+        } catch (Exception e) {
+            log.error("Unexpected error in job processor: {}", e.getMessage(), e);
+            buildError(e, null);
+        }
+    }
+
+    private Integer buildError(Exception e, CalculationJob job) {
+        var error = new SysError();
+
+        error.setType(job == null ? SysErrorType.BACKEND : SysErrorType.CALCULATION);
+
+        error.setCode(e.getClass().getSimpleName().substring(0, Math.min(e.getClass().getSimpleName().length(), 253)));
+        error.setTitle(job == null ? "Unexpected error in job processor" : String.format("Calculation operation execution %s failed", job.getId()));
+
+        var msg = e.getMessage() == null ? "" : e.getMessage();
+
+        error.setMessage(msg.substring(0, Math.min(msg.length(), 1000)));
+        error.setUserId(job == null ? null : job.getUserId());
+        error.setCalculationJobId(job == null ? null : job.getId());
+        error.setTrace(Arrays.stream(e.getStackTrace()).map(sysErrorTransformer::toSysErrorTraceItem).toList());
+
+        return sysErrorRepository.insert(error);
+    }
+
+
+    private void executeCalculation(CalculationJob job) throws Exception {
+
+        log.info("Executing calculation for job {} (premise: {}, period: {}, set: {})",
+                job.getId(), job.getPremiseId(), job.getValidityPeriodId(), job.getPropertySetId());
+
+        var startTime = System.currentTimeMillis();
+        calculationExecutionService.launchJobCalculation(job);
+        var stopTime = System.currentTimeMillis();
+
+        log.info("Executing calculation for job {} finished (execution time: {}ms)",
+                job.getId(), stopTime - startTime);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/de/avatic/lcc/service/calculation/execution/CalculationJobProcessorManagementService.java b/src/main/java/de/avatic/lcc/service/calculation/execution/CalculationJobProcessorManagementService.java
new file mode 100644
index 0000000..7fe495c
--- /dev/null
+++ b/src/main/java/de/avatic/lcc/service/calculation/execution/CalculationJobProcessorManagementService.java
@@ -0,0 +1,147 @@
+package de.avatic.lcc.service.calculation.execution;
+
+import de.avatic.lcc.dto.calculation.execution.*;
+import de.avatic.lcc.model.db.calculations.CalculationJob;
+import de.avatic.lcc.model.db.calculations.CalculationJobState;
+import de.avatic.lcc.model.db.premises.PremiseState;
+import de.avatic.lcc.model.db.properties.PropertySet;
+import de.avatic.lcc.model.db.rates.ValidityPeriod;
+import de.avatic.lcc.repositories.calculation.CalculationJobDestinationRepository;
+import de.avatic.lcc.repositories.calculation.CalculationJobRepository;
+import de.avatic.lcc.repositories.calculation.CalculationJobRouteSectionRepository;
+import de.avatic.lcc.repositories.premise.PremiseRepository;
+import de.avatic.lcc.repositories.properties.PropertySetRepository;
+import de.avatic.lcc.repositories.rates.ValidityPeriodRepository;
+import de.avatic.lcc.service.precalculation.PostCalculationCheckService;
+import de.avatic.lcc.service.precalculation.PreCalculationCheckService;
+import de.avatic.lcc.service.users.AuthorizationService;
+import de.avatic.lcc.util.exception.internalerror.PremiseValidationError;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+@Service
+public class CalculationJobProcessorManagementService {
+    private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(CalculationJobProcessorManagementService.class);
+    private final AuthorizationService authorizationService;
+    private final PremiseRepository premiseRepository;
+    private final PropertySetRepository propertySetRepository;
+    private final ValidityPeriodRepository validityPeriodRepository;
+    private final PreCalculationCheckService preCalculationCheckService;
+    private final CalculationJobRepository calculationJobRepository;
+    private final CalculationExecutionService calculationExecutionService;
+    private final PostCalculationCheckService postCalculationCheckService;
+    private final CalculationJobDestinationRepository calculationJobDestinationRepository;
+    private final CalculationJobRouteSectionRepository calculationJobRouteSectionRepository;
+
+    public CalculationJobProcessorManagementService(AuthorizationService authorizationService, PremiseRepository premiseRepository, PropertySetRepository propertySetRepository, ValidityPeriodRepository validityPeriodRepository, PreCalculationCheckService preCalculationCheckService, CalculationJobRepository calculationJobRepository, CalculationExecutionService calculationExecutionService, PostCalculationCheckService postCalculationCheckService, CalculationJobDestinationRepository calculationJobDestinationRepository, CalculationJobRouteSectionRepository calculationJobRouteSectionRepository) {
+        this.authorizationService = authorizationService;
+        this.premiseRepository = premiseRepository;
+        this.propertySetRepository = propertySetRepository;
+        this.validityPeriodRepository = validityPeriodRepository;
+        this.preCalculationCheckService = preCalculationCheckService;
+        this.calculationJobRepository = calculationJobRepository;
+        this.calculationExecutionService = calculationExecutionService;
+        this.postCalculationCheckService = postCalculationCheckService;
+        this.calculationJobDestinationRepository = calculationJobDestinationRepository;
+        this.calculationJobRouteSectionRepository = calculationJobRouteSectionRepository;
+    }
+
+
+    public CalculationStartResponseDTO startCalculation(CalculationStartRequestDTO request) {
+        var admin = authorizationService.isSuper();
+        var userId = authorizationService.getUserId();
+
+        if (!admin)
+            premiseRepository.checkOwner(request.getPremiseIds(), userId);
+
+
+        Optional<PropertySet> validSet;
+        Optional<ValidityPeriod> validPeriod;
+
+        if (request.getDate() == null) {
+            validSet = propertySetRepository.getValidSet();
+            validPeriod = validityPeriodRepository.getValidPeriod();
+        } else {
+            validSet = propertySetRepository.getByDate(request.getDate());
+            validPeriod = validityPeriodRepository.getByDate(request.getDate());
+        }
+
+        boolean multiRequest = request.getPremiseIds().size() > 1;
+        request.getPremiseIds().forEach(premiseId -> preCalculationCheckService.doPrecheck(premiseId, validSet, validPeriod, request.getDate(), multiRequest));
+
+
+        if (validSet.isEmpty() || validPeriod.isEmpty())
+            throw new PremiseValidationError("No rates available for this date - please contact your administrator.");
+
+        var validSetId = validSet.get().getId();
+        var validPeriodId = validPeriod.get().getId();
+
+        var calculationIds = new ArrayList<Integer>();
+
+        request.getPremiseIds().forEach(p -> {
+
+            var existingJob = calculationJobRepository.findJob(p, validSetId, validPeriodId);
+
+            if (existingJob.isPresent()) {
+                if (CalculationJobState.EXCEPTION == existingJob.get().getJobState()) {
+                    calculationIds.add(existingJob.get().getId());
+                }
+            } else {
+                CalculationJob job = new CalculationJob();
+
+                job.setPremiseId(p);
+                job.setJobState(CalculationJobState.CREATED);
+                job.setCalculationDate(java.time.LocalDateTime.now());
+                job.setUserId(userId);
+                job.setPropertySetId(validSetId);
+                job.setValidityPeriodId(validPeriodId);
+                calculationIds.add(calculationJobRepository.insert(job));
+            }
+
+        });
+
+        premiseRepository.setStatus(request.getPremiseIds(), PremiseState.COMPLETED);
+
+        var dto = new CalculationStartResponseDTO();
+        dto.setCalculationIds(calculationIds);
+        return dto;
+    }
+
+    public CalculationProcessingOverviewDTO getCalculationOverview() {
+        var dto = new CalculationProcessingOverviewDTO();
+
+        var userId = authorizationService.getUserId();
+
+        int completed = premiseRepository.getPremiseCompletedCountByUserId(userId);
+        int draft = premiseRepository.getPremiseDraftCountByUserId(userId);
+
+        int running = calculationJobRepository.getSelfScheduledJobCountByUserId(userId);
+        int failed = calculationJobRepository.getFailedJobByUserId(userId);
+
+        dto.setFailed(failed);
+        dto.setDrafts(draft);
+        dto.setRunning(running);
+        dto.setCompleted(completed);
+
+        return dto;
+    }
+
+    public CalculationProcessingStateResponseDTO getCalculationStatus(CalculationProcessingStateRequestDTO requestDTO) {
+        var ids = requestDTO.getCalculationIds();
+
+
+        if (ids != null && !ids.isEmpty()) {
+            var states = calculationJobRepository.getStateFor(ids).entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().name()));
+
+            var dto = new CalculationProcessingStateResponseDTO();
+            dto.setStates(states);
+            return dto;
+        }
+
+        return new CalculationProcessingStateResponseDTO();
+    }
+}
diff --git a/src/main/java/de/avatic/lcc/service/calculation/execution/CalculationStatusService.java b/src/main/java/de/avatic/lcc/service/calculation/execution/CalculationStatusService.java
deleted file mode 100644
index a4c00a7..0000000
--- a/src/main/java/de/avatic/lcc/service/calculation/execution/CalculationStatusService.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package de.avatic.lcc.service.calculation.execution;
-
-import de.avatic.lcc.dto.calculation.CalculationStatus;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.concurrent.atomic.AtomicReference;
-
-@Service
-public class CalculationStatusService {
-
-    AtomicReference<HashMap<Integer, CalculationStatus>> status = new AtomicReference<>();
-
-    public CalculationStatus getCalculationStatus(int processId) {
-        return status.get().get(processId);
-    }
-
-    public void addCalculationStatus(int statusId, CalculationStatus calculationStatus) {
-        HashMap<Integer, CalculationStatus> map = status.get();
-        if(map == null){
-            map = new HashMap<>();
-        }
-        map.put(statusId, calculationStatus);
-        status.set(map);
-    }
-
-    public void removeCalculationStatus(int statusId) {
-        HashMap<Integer, CalculationStatus> map = status.get();
-        if(map != null){
-            map.remove(statusId);
-        }
-    }
-
-    public Integer schedule(ArrayList<Integer> calculationIds) {
-        //TODO
-        return 1;
-    }
-}
diff --git a/src/main/java/de/avatic/lcc/service/calculation/execution/steps/ContainerCalculationService.java b/src/main/java/de/avatic/lcc/service/calculation/execution/steps/ContainerCalculationService.java
index 3ef74ca..32da301 100644
--- a/src/main/java/de/avatic/lcc/service/calculation/execution/steps/ContainerCalculationService.java
+++ b/src/main/java/de/avatic/lcc/service/calculation/execution/steps/ContainerCalculationService.java
@@ -49,7 +49,7 @@ public class ContainerCalculationService {
      * @param containerType The type of container to be loaded
      * @return ContainerCalculationResult containing loading pattern and capacity information
      */
-    public ContainerCalculationResult doCalculation(Integer setId, PackagingDimension hu, ContainerType containerType) {
+    public ContainerCalculationResult doCalculation(Integer setId, PackagingDimension hu, ContainerType containerType, boolean mixable, boolean stackable) {
 
         var weightInKg = BigDecimal.valueOf(WeightUnit.KG.convertFromG(hu.getWeight()));
         var maxContainerLoad = BigDecimal.valueOf(getMaxContainerLoad(containerType, setId));
@@ -60,7 +60,7 @@ public class ContainerCalculationService {
         var solutionHorizontal = solveLayer(SolutionType.HORIZONTAL, dimensions, containerType.getLength(), containerType.getWidth());
         var solutionVertical = solveLayer(SolutionType.VERTICAL, dimensions, containerType.getWidth(), containerType.getLength());
         var bestSolution =  solutionHorizontal.getTotal() < solutionVertical.getTotal() ? solutionVertical : solutionHorizontal;
-        int layers = getLayerCount(dimensions, containerType);
+        int layers = stackable ? getLayerCount(dimensions, containerType) : 1;
 
         if(PalletType.EURO_PALLET.fitsOn(hu) && bestSolution.getTotal() < containerType.getPalletCount(PalletType.EURO_PALLET)) {
             return new ContainerCalculationResult(Math.min(containerType.getPalletCount(PalletType.EURO_PALLET)*layers,maxUnitByWeight), layers, null, (containerType.getPalletCount(PalletType.EURO_PALLET)*layers) > maxUnitByWeight, containerType, dimensions, maxContainerLoad.intValueExact());
diff --git a/src/main/java/de/avatic/lcc/service/calculation/execution/steps/CustomCostCalculationService.java b/src/main/java/de/avatic/lcc/service/calculation/execution/steps/CustomCostCalculationService.java
index 55bfd61..2b34abf 100644
--- a/src/main/java/de/avatic/lcc/service/calculation/execution/steps/CustomCostCalculationService.java
+++ b/src/main/java/de/avatic/lcc/service/calculation/execution/steps/CustomCostCalculationService.java
@@ -37,18 +37,7 @@ public class CustomCostCalculationService {
         this.shippingFrequencyCalculationService = shippingFrequencyCalculationService;
     }
 
-    private BigDecimal getContainerShare(Premise premise, ContainerCalculationResult containerCalculationResult) {
-        var weightExceeded = containerCalculationResult.isWeightExceeded();
-        var mixable = premise.getHuMixable();
-
-        if (mixable) {
-            return BigDecimal.valueOf(weightExceeded ? containerCalculationResult.getHuUtilizationByWeight() : containerCalculationResult.getHuUtilizationByVolume());
-        } else {
-            return BigDecimal.ONE.divide(BigDecimal.valueOf(containerCalculationResult.getHuUnitCount()), 10, RoundingMode.HALF_UP);
-        }
-    }
-
-    public CustomResult doCalculation(Integer setId, Premise premise, Destination destination, List<SectionInfo> sections) {
+    public CustomResult doCalculation(Integer setId, Premise premise, Destination destination, List<SectionInfo> sections, ContainerCalculationResult containerCalculationResult) {
 
         var destUnion = countryPropertyRepository.getByMappingIdAndCountryId(CountryPropertyMappingId.UNION, setId, destination.getCountryId()).orElseThrow();
         var sourceUnion = countryPropertyRepository.getByMappingIdAndCountryId(CountryPropertyMappingId.UNION, setId, premise.getCountryId()).orElseThrow();
@@ -62,16 +51,17 @@ public class CustomCostCalculationService {
             var transportationRiskCost = relevantSections.stream().map(s -> s.result().getAnnualRiskCost()).reduce(BigDecimal.ZERO, BigDecimal::add);
 
 
-            double huAnnualAmount = BigDecimal.valueOf(destination.getAnnualAmount()).divide(BigDecimal.valueOf(relevantSections.getFirst().containerResult().getHuUnitCount()),2, RoundingMode.HALF_UP).doubleValue();
+            double huAnnualAmount = BigDecimal.valueOf(destination.getAnnualAmount()).divide(BigDecimal.valueOf(premise.getHuUnitCount()),0, RoundingMode.CEILING).doubleValue();
 
-            return getCustomCalculationResult(setId, premise, destination, getContainerShare(premise, relevantSections.getFirst().containerResult()), huAnnualAmount, transportationCost, transportationChanceCost, transportationRiskCost);
+            return getCustomCalculationResult(setId, premise, destination, huAnnualAmount, transportationCost, transportationChanceCost, transportationRiskCost, containerCalculationResult);
         }
 
         return CustomResult.EMPTY;
     }
 
-    private CustomResult getCustomCalculationResult(Integer setId, Premise premise, Destination destination, BigDecimal containerShare, double huAnnualAmount, BigDecimal transportationCost, BigDecimal transportationChanceCost, BigDecimal transportationRiskCost) {
-        var shippingFrequency = shippingFrequencyCalculationService.doCalculation(setId, huAnnualAmount);
+    private CustomResult getCustomCalculationResult(Integer setId, Premise premise, Destination destination, double huAnnualAmount, BigDecimal transportationCost, BigDecimal transportationChanceCost, BigDecimal transportationRiskCost, ContainerCalculationResult containerCalculationResult) {
+
+        var shippingFrequency = shippingFrequencyCalculationService.doCalculation(setId, huAnnualAmount, containerCalculationResult.getHuPerContainer(), !premise.getHuMixable());
         var customFee = Double.parseDouble(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.CUSTOM_FEE, setId).orElseThrow().getCurrentValue());
 
         var tariffRate =  premise.getTariffRate();
@@ -87,7 +77,7 @@ public class CustomCostCalculationService {
 
         var customValue = materialCost.add(fcaFee).add(transportationCost);
         var customDuties = customValue.multiply(tariffRate);
-        var annualCustomFee = BigDecimal.valueOf(shippingFrequency).multiply(BigDecimal.valueOf(customFee)).multiply(containerShare);
+        var annualCustomFee = BigDecimal.valueOf(shippingFrequency).multiply(BigDecimal.valueOf(customFee));
         var annualCost = customDuties.add(annualCustomFee);
 
         var customRiskValue = materialCost.add(fcaFee).add(transportationRiskCost);
diff --git a/src/main/java/de/avatic/lcc/service/calculation/execution/steps/HandlingCostCalculationService.java b/src/main/java/de/avatic/lcc/service/calculation/execution/steps/HandlingCostCalculationService.java
index d172f77..80ffdd8 100644
--- a/src/main/java/de/avatic/lcc/service/calculation/execution/steps/HandlingCostCalculationService.java
+++ b/src/main/java/de/avatic/lcc/service/calculation/execution/steps/HandlingCostCalculationService.java
@@ -1,5 +1,6 @@
 package de.avatic.lcc.service.calculation.execution.steps;
 
+import de.avatic.lcc.model.calculation.ContainerCalculationResult;
 import de.avatic.lcc.model.calculation.HandlingResult;
 import de.avatic.lcc.model.db.packaging.LoadCarrierType;
 import de.avatic.lcc.model.db.packaging.PackagingDimension;
@@ -13,6 +14,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.util.Objects;
 
 @Service
 public class HandlingCostCalculationService {
@@ -30,32 +32,46 @@ public class HandlingCostCalculationService {
         this.shippingFrequencyCalculationService = shippingFrequencyCalculationService;
     }
 
-    public HandlingResult doCalculation(Integer setId, Premise premise, Destination destination, Boolean addRepackingAndDisposalCost) {
+    public HandlingResult doCalculation(Integer setId, Premise premise, Destination destination, Boolean addRepackingAndDisposalCost, ContainerCalculationResult containerCalculationResult) {
 
         var hu = premiseToHuService.createHuFromPremise(premise);
-        return (LoadCarrierType.SLC == hu.getLoadCarrierType() ? getSLCCost(setId, destination, hu, hu.getLoadCarrierType(), addRepackingAndDisposalCost) : getLLCCost(setId, destination, hu, hu.getLoadCarrierType(), addRepackingAndDisposalCost));
+        return (LoadCarrierType.SLC == hu.getLoadCarrierType() ? getSLCCost(setId, premise, destination, hu, hu.getLoadCarrierType(), addRepackingAndDisposalCost, containerCalculationResult) : getLLCCost(setId, premise, destination, hu, hu.getLoadCarrierType(), addRepackingAndDisposalCost, containerCalculationResult));
     }
 
-    private HandlingResult getSLCCost(Integer setId, Destination destination, PackagingDimension hu, LoadCarrierType loadCarrierType, boolean addRepackingAndDisposalCost) {
+    private HandlingResult getSLCCost(Integer setId, Premise premise, Destination destination, PackagingDimension hu, LoadCarrierType loadCarrierType, boolean addRepackingAndDisposalCost, ContainerCalculationResult containerCalculationResult) {
 
         var destinationHandling = destination.getHandlingCost();
         var destinationDisposal = destination.getDisposalCost();
         var destinationRepacking = destination.getRepackingCost();
 
         BigDecimal huAnnualAmount = BigDecimal.valueOf(destination.getAnnualAmount()).divide(BigDecimal.valueOf(hu.getContentUnitCount()),4, RoundingMode.UP );
-        BigDecimal handling = destinationHandling != null ? destinationHandling : BigDecimal.valueOf(Double.parseDouble(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.GLT_HANDLING, setId).orElseThrow().getCurrentValue()));
-        BigDecimal release =  BigDecimal.valueOf(Double.parseDouble(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.GLT_RELEASE, setId).orElseThrow().getCurrentValue()));
-        BigDecimal dispatch =  BigDecimal.valueOf(Double.parseDouble(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.GLT_DISPATCH, setId).orElseThrow().getCurrentValue()));
-        BigDecimal disposal = destinationDisposal != null ? destinationDisposal : (addRepackingAndDisposalCost ? BigDecimal.valueOf(Double.parseDouble(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.DISPOSAL, setId).orElseThrow().getCurrentValue())) : BigDecimal.ZERO);
+        BigDecimal shippingFreq = BigDecimal.valueOf(shippingFrequencyCalculationService.doCalculation(setId, huAnnualAmount.doubleValue(), containerCalculationResult.getHuPerContainer(), !premise.getHuMixable()));
+
+        BigDecimal multiplier = shippingFreq.compareTo(huAnnualAmount) > 0 ? shippingFreq : huAnnualAmount;
+
+        BigDecimal handling = BigDecimal.valueOf(Double.parseDouble(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.KLT_HANDLING, setId).orElseThrow().getCurrentValue()));
+        BigDecimal release =  BigDecimal.valueOf(Double.parseDouble(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.KLT_RELEASE, setId).orElseThrow().getCurrentValue()));
+        BigDecimal dispatch =  BigDecimal.valueOf(Double.parseDouble(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.KLT_DISPATCH, setId).orElseThrow().getCurrentValue()));
 
         BigDecimal wageFactor = BigDecimal.valueOf(Double.parseDouble(countryPropertyRepository.getByMappingIdAndCountryId(CountryPropertyMappingId.WAGE, setId, destination.getCountryId()).orElseThrow().getCurrentValue()));
         BigDecimal booking = BigDecimal.valueOf(Double.parseDouble(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.BOOKING_KLT, setId).orElseThrow().getCurrentValue()));
 
+        BigDecimal annualRepacking = Objects.requireNonNullElse(destinationRepacking, getRepackingCost(setId, hu, loadCarrierType, addRepackingAndDisposalCost, destinationRepacking).multiply(wageFactor)).multiply(huAnnualAmount);
+        BigDecimal annualDisposal = Objects.requireNonNullElse(destinationDisposal.multiply(huAnnualAmount), BigDecimal.ZERO);
+
+        BigDecimal annualHandling;
+
+        if(destinationHandling != null)
+            annualHandling = destinationHandling.multiply(multiplier);
+        else
+            annualHandling = (((handling.multiply(multiplier)).add((dispatch.multiply(huAnnualAmount))).add((release.multiply(huAnnualAmount)))).add(booking.multiply(shippingFreq))).multiply(wageFactor);
+
+
         return new HandlingResult(LoadCarrierType.SLC,
-                getRepackingCost(setId, hu, loadCarrierType, addRepackingAndDisposalCost, destinationRepacking).multiply(huAnnualAmount),
-                handling.multiply(huAnnualAmount),
-                destinationDisposal == null ? BigDecimal.ZERO : (disposal.multiply(huAnnualAmount)), //TODO: disposal SLC, ignore?
-                huAnnualAmount.multiply((handling.add(booking).add(release).add(dispatch).add(getRepackingCost(setId, hu, loadCarrierType, addRepackingAndDisposalCost, destinationRepacking)))).multiply(wageFactor));
+                annualRepacking,
+                annualHandling,
+                annualDisposal,
+                annualHandling.add(annualRepacking).add(annualDisposal));
 
     }
 
@@ -77,24 +93,35 @@ public class HandlingCostCalculationService {
     }
 
 
-    private HandlingResult getLLCCost(Integer setId, Destination destination, PackagingDimension hu, LoadCarrierType type, boolean addRepackingAndDisposalCost) {
+    private HandlingResult getLLCCost(Integer setId, Premise premise, Destination destination, PackagingDimension hu, LoadCarrierType type, boolean addRepackingAndDisposalCost, ContainerCalculationResult containerCalculationResult) {
 
         var destinationHandling = destination.getHandlingCost();
         var destinationDisposal = destination.getDisposalCost();
         var destinationRepacking = destination.getRepackingCost();
 
         BigDecimal huAnnualAmount = BigDecimal.valueOf(destination.getAnnualAmount()).divide(BigDecimal.valueOf(hu.getContentUnitCount()),4, RoundingMode.UP );
-        BigDecimal handling = destinationHandling != null ? destinationHandling : BigDecimal.valueOf(Double.parseDouble(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.GLT_HANDLING, setId).orElseThrow().getCurrentValue()));
+        BigDecimal shippingFreq = BigDecimal.valueOf(shippingFrequencyCalculationService.doCalculation(setId, huAnnualAmount.doubleValue(), containerCalculationResult.getHuPerContainer(), !premise.getHuMixable()));
+
+        BigDecimal multiplier = shippingFreq.compareTo(huAnnualAmount) > 0 ? shippingFreq : huAnnualAmount;
+
+        BigDecimal handling = BigDecimal.valueOf(Double.parseDouble(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.GLT_HANDLING, setId).orElseThrow().getCurrentValue()));
         BigDecimal release =  BigDecimal.valueOf(Double.parseDouble(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.GLT_RELEASE, setId).orElseThrow().getCurrentValue()));
         BigDecimal dispatch =  BigDecimal.valueOf(Double.parseDouble(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.GLT_DISPATCH, setId).orElseThrow().getCurrentValue()));
-        BigDecimal disposal = destinationDisposal != null ? destinationDisposal : (addRepackingAndDisposalCost ? BigDecimal.valueOf(Double.parseDouble(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.DISPOSAL, setId).orElseThrow().getCurrentValue())) : BigDecimal.ZERO);
+        BigDecimal disposal = (addRepackingAndDisposalCost ? BigDecimal.valueOf(Double.parseDouble(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.DISPOSAL, setId).orElseThrow().getCurrentValue())) : BigDecimal.ZERO);
 
         BigDecimal wageFactor = BigDecimal.valueOf(Double.parseDouble(countryPropertyRepository.getByMappingIdAndCountryId(CountryPropertyMappingId.WAGE, setId, destination.getCountryId()).orElseThrow().getCurrentValue()));
         BigDecimal booking = BigDecimal.valueOf(Double.parseDouble(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.BOOKING, setId).orElseThrow().getCurrentValue()));
 
-        var annualRepacking = getRepackingCost(setId, hu, type, addRepackingAndDisposalCost, destinationRepacking).multiply(wageFactor).multiply( huAnnualAmount);
-        var annualHandling = ((handling.add(dispatch).add(release)).multiply(wageFactor).multiply(huAnnualAmount)).add(booking.multiply(BigDecimal.valueOf(shippingFrequencyCalculationService.doCalculation(setId, huAnnualAmount.doubleValue()))));
-        var annualDisposal = (disposal.multiply(huAnnualAmount));
+        BigDecimal annualRepacking = Objects.requireNonNullElse(destinationRepacking, getRepackingCost(setId, hu, type, addRepackingAndDisposalCost, destinationRepacking).multiply(wageFactor)).multiply(huAnnualAmount);
+
+        BigDecimal annualHandling;
+
+        if(destinationHandling != null)
+            annualHandling = destinationHandling.multiply(multiplier);
+        else
+            annualHandling = (((handling.multiply(multiplier)).add((dispatch.multiply(huAnnualAmount))).add((release.multiply(huAnnualAmount)))).add(booking.multiply(shippingFreq))).multiply(wageFactor);
+
+        BigDecimal annualDisposal = Objects.requireNonNullElse(destinationDisposal, disposal).multiply(huAnnualAmount);
 
         return new HandlingResult(LoadCarrierType.LLC, annualRepacking, annualHandling, annualDisposal, annualRepacking.add(annualHandling).add(annualDisposal));
 
diff --git a/src/main/java/de/avatic/lcc/service/calculation/execution/steps/InventoryCostCalculationService.java b/src/main/java/de/avatic/lcc/service/calculation/execution/steps/InventoryCostCalculationService.java
index d9b0658..c7d722e 100644
--- a/src/main/java/de/avatic/lcc/service/calculation/execution/steps/InventoryCostCalculationService.java
+++ b/src/main/java/de/avatic/lcc/service/calculation/execution/steps/InventoryCostCalculationService.java
@@ -1,5 +1,6 @@
 package de.avatic.lcc.service.calculation.execution.steps;
 
+import de.avatic.lcc.model.calculation.ContainerCalculationResult;
 import de.avatic.lcc.model.calculation.InventoryCostResult;
 import de.avatic.lcc.model.db.packaging.PackagingDimension;
 import de.avatic.lcc.model.db.premises.Premise;
@@ -30,7 +31,7 @@ public class InventoryCostCalculationService {
         this.premiseToHuService = premiseToHuService;
     }
 
-    public InventoryCostResult doCalculation(Integer setId, Premise premise, Destination destination, BigDecimal leadTime) {
+    public InventoryCostResult doCalculation(Integer setId, Premise premise, Destination destination, BigDecimal leadTime, ContainerCalculationResult containerCalculationResult) {
 
 
         var fcaFee = BigDecimal.ZERO;
@@ -53,7 +54,7 @@ public class InventoryCostCalculationService {
         var dailyAmount = annualAmount.divide(BigDecimal.valueOf(365), 10, RoundingMode.HALF_UP);
         var workdayAmount = annualAmount.divide(workdays, 10, RoundingMode.HALF_UP);
 
-        var opStock = (annualAmount.divide(BigDecimal.valueOf(Math.max(shippingFrequencyCalculationService.doCalculation(setId, huAnnualAmount),1)), 10, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(.5)));
+        var opStock = (annualAmount.divide(BigDecimal.valueOf(Math.max(shippingFrequencyCalculationService.doCalculation(setId, huAnnualAmount, containerCalculationResult.getHuPerContainer(), !premise.getHuMixable()),1)), 10, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(.5)));
         var safetyStock = safetyDays.multiply(workdayAmount);
         var stockedInventory = opStock.add(safetyStock);
         var inTransportStock = dailyAmount.multiply(leadTime);
@@ -71,7 +72,8 @@ public class InventoryCostCalculationService {
     }
 
     private BigDecimal getSpaceCostPerHu(Integer setId, PackagingDimension hu) {
-        var spaceCost = BigDecimal.valueOf(Double.parseDouble(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.SPACE_COST, setId).orElseThrow().getCurrentValue()));
+        var spaceCostStr = propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.SPACE_COST, setId).orElseThrow().getCurrentValue();
+        var spaceCost = BigDecimal.valueOf(Double.parseDouble(spaceCostStr));
         var spaceCostPerHu = BigDecimal.valueOf(hu.getFloorArea(DimensionUnit.M)*hu.getRoundedHeight(DimensionUnit.M)).multiply(spaceCost);
         return spaceCostPerHu;
     }
diff --git a/src/main/java/de/avatic/lcc/service/calculation/execution/steps/RouteSectionCostCalculationService.java b/src/main/java/de/avatic/lcc/service/calculation/execution/steps/RouteSectionCostCalculationService.java
index ae22e04..6139420 100644
--- a/src/main/java/de/avatic/lcc/service/calculation/execution/steps/RouteSectionCostCalculationService.java
+++ b/src/main/java/de/avatic/lcc/service/calculation/execution/steps/RouteSectionCostCalculationService.java
@@ -1,9 +1,9 @@
 package de.avatic.lcc.service.calculation.execution.steps;
 
-import de.avatic.lcc.model.calculation.ContainerCalculationResult;
 import de.avatic.lcc.dto.generic.ContainerType;
 import de.avatic.lcc.dto.generic.RateType;
 import de.avatic.lcc.dto.generic.TransportType;
+import de.avatic.lcc.model.calculation.ContainerCalculationResult;
 import de.avatic.lcc.model.db.calculations.CalculationJobRouteSection;
 import de.avatic.lcc.model.db.nodes.Location;
 import de.avatic.lcc.model.db.nodes.Node;
@@ -40,8 +40,9 @@ public class RouteSectionCostCalculationService {
     private final ChangeRiskFactorCalculationService changeRiskFactorCalculationService;
     private final NodeRepository nodeRepository;
     private final UserNodeRepository userNodeRepository;
+    private final ShippingFrequencyCalculationService shippingFrequencyCalculationService;
 
-    public RouteSectionCostCalculationService(ContainerRateRepository containerRateRepository, MatrixRateRepository matrixRateRepository, RouteNodeRepository routeNodeRepository, DistanceService distanceService, PropertyRepository propertyRepository, ChangeRiskFactorCalculationService changeRiskFactorCalculationService, NodeRepository nodeRepository, UserNodeRepository userNodeRepository) {
+    public RouteSectionCostCalculationService(ContainerRateRepository containerRateRepository, MatrixRateRepository matrixRateRepository, RouteNodeRepository routeNodeRepository, DistanceService distanceService, PropertyRepository propertyRepository, ChangeRiskFactorCalculationService changeRiskFactorCalculationService, NodeRepository nodeRepository, UserNodeRepository userNodeRepository, ShippingFrequencyCalculationService shippingFrequencyCalculationService) {
         this.containerRateRepository = containerRateRepository;
         this.matrixRateRepository = matrixRateRepository;
         this.routeNodeRepository = routeNodeRepository;
@@ -50,6 +51,7 @@ public class RouteSectionCostCalculationService {
         this.changeRiskFactorCalculationService = changeRiskFactorCalculationService;
         this.nodeRepository = nodeRepository;
         this.userNodeRepository = userNodeRepository;
+        this.shippingFrequencyCalculationService = shippingFrequencyCalculationService;
     }
 
     public CalculationJobRouteSection doD2dCalculation(Integer setId, Integer periodId, Premise premise, Destination destination, ContainerCalculationResult containerCalculation) {
@@ -64,13 +66,13 @@ public class RouteSectionCostCalculationService {
 
         // Set premise metadata
         result.setStacked(premise.getHuStackable());
-        result.setUnmixedPrice(premise.getHuMixable());
+        result.setUnmixedPrice(!premise.getHuMixable());
 
         // Get nodes and distance
         Node fromNode = premise.getSupplierNodeId() != null ? nodeRepository.getById(premise.getSupplierNodeId()).orElseThrow() : userNodeRepository.getById(premise.getUserSupplierNodeId()).orElseThrow();
         Node toNode = nodeRepository.getById(destination.getDestinationNodeId()).orElseThrow();
 
-        double distance = distanceService.getDistance(fromNode, toNode, false);
+        double distance = destination.getDistanceD2d() == null ? distanceService.getDistanceForNode(fromNode, toNode) : destination.getDistanceD2d().doubleValue();
         result.setDistance(BigDecimal.valueOf(distance));
 
         // Get rate and transit time
@@ -81,8 +83,10 @@ public class RouteSectionCostCalculationService {
         result.setTransitTime(transitTime);
 
         // Calculate price and annual cost
+        BigDecimal huAnnualAmount = BigDecimal.valueOf(destination.getAnnualAmount()).divide(BigDecimal.valueOf(containerCalculation.getHu().getContentUnitCount()), 2, RoundingMode.HALF_UP);
         BigDecimal utilization = getUtilization(setId, RateType.CONTAINER); /* D2D is always 40ft container */
-        double annualVolume = destination.getAnnualAmount() * containerCalculation.getHu().getVolume(DimensionUnit.M);
+        BigDecimal annualVolume = huAnnualAmount.multiply(BigDecimal.valueOf(containerCalculation.getHu().getVolume(DimensionUnit.M)));
+        BigDecimal annualWeight = huAnnualAmount.multiply(BigDecimal.valueOf(containerCalculation.getHu().getWeight(WeightUnit.KG)));
 
         PriceCalculationResult prices = calculatePrices(
                 premise.getHuMixable(),
@@ -92,7 +96,10 @@ public class RouteSectionCostCalculationService {
                 containerCalculation.getMaxContainerWeight(),
                 BigDecimal.valueOf(containerCalculation.getTotalUtilizationByVolume()),
                 BigDecimal.valueOf(containerCalculation.getHuUtilizationByWeight()),
-                utilization);
+                utilization,
+                shippingFrequencyCalculationService.doCalculation(setId, huAnnualAmount.doubleValue(), containerCalculation.getHuPerContainer(), !premise.getHuMixable()),
+                huAnnualAmount.doubleValue(),
+                containerCalculation);
 
         result.setCbmPrice(!containerCalculation.isWeightExceeded());
         result.setWeightPrice(containerCalculation.isWeightExceeded());
@@ -102,7 +109,7 @@ public class RouteSectionCostCalculationService {
 
         var chanceRiskFactors = changeRiskFactorCalculationService.getChanceRiskFactors(setId, periodId);
 
-        BigDecimal annualCost = (containerCalculation.isWeightExceeded() ? prices.weightPrice : prices.volumePrice).multiply(BigDecimal.valueOf(annualVolume));
+        BigDecimal annualCost = (containerCalculation.isWeightExceeded() ? prices.weightPrice.multiply(annualWeight) : prices.volumePrice.multiply(annualVolume));
         BigDecimal annualRiskCost = annualCost.multiply(chanceRiskFactors.getRiskFactor());
         BigDecimal annualChanceCost = annualCost.multiply(chanceRiskFactors.getChanceFactor());
 
@@ -130,8 +137,14 @@ public class RouteSectionCostCalculationService {
         // Get nodes and distance
         RouteNode fromNode = routeNodeRepository.getById(section.getFromRouteNodeId()).orElseThrow();
         RouteNode toNode = routeNodeRepository.getById(section.getToRouteNodeId()).orElseThrow();
-        double distance = getDistance(fromNode, toNode);
-        result.setDistance(BigDecimal.valueOf(distance));
+
+        if (section.getDistance() == null) {
+            double distance = getDistance(fromNode, toNode);
+            result.setDistance(BigDecimal.valueOf(distance));
+        } else {
+            result.setDistance(BigDecimal.valueOf(section.getDistance()));
+        }
+
 
         // Get rate and transit time
         BigDecimal rate;
@@ -143,7 +156,7 @@ public class RouteSectionCostCalculationService {
             transitTime = containerRate.getLeadTime();
         } else if (RateType.MATRIX == section.getRateType()) {
             MatrixRate matrixRate = findMatrixRate(fromNode, toNode, periodId);
-            rate = matrixRate.getRate().multiply(BigDecimal.valueOf(distance));
+            rate = matrixRate.getRate().multiply(result.getDistance());
             transitTime = 3; // Default transit time for matrix rate
         } else if (RateType.NEAR_BY == section.getRateType()) {
             rate = BigDecimal.ZERO;
@@ -169,7 +182,10 @@ public class RouteSectionCostCalculationService {
                 containerCalculation.getMaxContainerWeight(),
                 BigDecimal.valueOf(containerCalculation.getTotalUtilizationByVolume()),
                 BigDecimal.valueOf(containerCalculation.getTotalUtilizationByWeight()),
-                utilization);
+                utilization,
+                shippingFrequencyCalculationService.doCalculation(setId, huAnnualAmount.doubleValue(), containerCalculation.getHuPerContainer(), !premise.getHuMixable()),
+                huAnnualAmount.doubleValue(),
+                containerCalculation);
 
         result.setCbmPrice(!containerCalculation.isWeightExceeded());
         result.setWeightPrice(containerCalculation.isWeightExceeded());
@@ -183,8 +199,8 @@ public class RouteSectionCostCalculationService {
 
 
         BigDecimal annualCost = (containerCalculation.isWeightExceeded() ? prices.weightPrice.multiply(annualWeight) : prices.volumePrice.multiply(annualVolume));
-        BigDecimal annualRiskCost =  useRiskChange ? annualCost.multiply(chanceRiskFactors.getRiskFactor()) : annualCost;
-        BigDecimal annualChanceCost = useRiskChange ? annualCost.multiply(chanceRiskFactors.getChanceFactor()): annualCost;
+        BigDecimal annualRiskCost = useRiskChange ? annualCost.multiply(chanceRiskFactors.getRiskFactor()) : annualCost;
+        BigDecimal annualChanceCost = useRiskChange ? annualCost.multiply(chanceRiskFactors.getChanceFactor()) : annualCost;
 
         result.setAnnualRiskCost(annualRiskCost);
         result.setAnnualChanceCost(annualChanceCost);
@@ -203,7 +219,11 @@ public class RouteSectionCostCalculationService {
             int maxContainerWeight,
             BigDecimal totalVolumeUtilization,
             BigDecimal totalWeightUtilization,
-            BigDecimal propertyUtilization) {
+            BigDecimal propertyUtilization,
+            double shippingFrequency,
+            double annualHuAmount,
+            ContainerCalculationResult containerCalculationResult
+    ) {
 
 
         BigDecimal utilization;
@@ -213,14 +233,26 @@ public class RouteSectionCostCalculationService {
         BigDecimal cbmRate = rate.divide(BigDecimal.valueOf(containerType.getVolume()), 10, RoundingMode.HALF_UP);
         BigDecimal weightRate = rate.divide(BigDecimal.valueOf(maxContainerWeight), 10, RoundingMode.HALF_UP);
 
+
         if (huMixable) {
             volumePrice = cbmRate.divide(propertyUtilization, 10, RoundingMode.HALF_UP);
             weightPrice = weightRate.divide(BigDecimal.valueOf(1), 10, RoundingMode.HALF_UP);
             utilization = weightExceeded ? BigDecimal.ONE : propertyUtilization;
         } else {
+
+            double huPerContainer = annualHuAmount / shippingFrequency;
+
+            // if the shipping frequency is bigger than the annual amount the "totalXXUtilization" cannot be used.
+            if(huPerContainer < (containerCalculationResult.getHuPerContainer())) {
+
+                totalVolumeUtilization = BigDecimal.valueOf(huPerContainer * containerCalculationResult.getHu().getVolume(DimensionUnit.M)).divide(BigDecimal.valueOf(containerCalculationResult.getContainerType().getVolume()), 20, RoundingMode.HALF_UP);
+                totalWeightUtilization = BigDecimal.valueOf(huPerContainer * containerCalculationResult.getHu().getWeight(WeightUnit.KG)).divide(BigDecimal.valueOf(containerCalculationResult.getMaxContainerWeight()), 20, RoundingMode.HALF_UP);
+            }
+
             volumePrice = cbmRate.divide(totalVolumeUtilization, 10, RoundingMode.HALF_UP);
             weightPrice = weightRate.divide(totalWeightUtilization, 10, RoundingMode.HALF_UP);
             utilization = weightExceeded ? totalWeightUtilization : totalVolumeUtilization;
+
         }
 
         return new PriceCalculationResult(volumePrice, weightPrice, utilization);
@@ -278,8 +310,8 @@ public class RouteSectionCostCalculationService {
 
     private double getDistance(RouteNode fromNode, RouteNode toNode) {
 
-        if(fromNode.getOutdated() || toNode.getOutdated()) {
-            return distanceService.getDistance(
+        if (fromNode.getOutdated() || toNode.getOutdated()) {
+            return distanceService.getDistanceForLocation(
                     fromNode.getCountryId(), new Location(fromNode.getGeoLng().doubleValue(), fromNode.getGeoLat().doubleValue()),
                     toNode.getCountryId(), new Location(toNode.getGeoLng().doubleValue(), toNode.getGeoLat().doubleValue()), false);
         }
@@ -287,14 +319,14 @@ public class RouteSectionCostCalculationService {
         var optSrcNode = fromNode.getNodeId() == null ? userNodeRepository.getById(fromNode.getUserNodeId()) : nodeRepository.getById(fromNode.getNodeId());
         var optDestNode = toNode.getNodeId() == null ? userNodeRepository.getById(toNode.getUserNodeId()) : nodeRepository.getById(toNode.getNodeId());
 
-        if(optSrcNode.isEmpty() ) {
+        if (optSrcNode.isEmpty()) {
             throw new NoSuchElementException("Source node not found for route section " + fromNode.getName());
         }
-        if(optDestNode.isEmpty() ) {
+        if (optDestNode.isEmpty()) {
             throw new NoSuchElementException("Destination node not found for route section" + toNode.getName());
         }
 
-        return distanceService.getDistance(optSrcNode.get(), optDestNode.get(), false);
+        return distanceService.getDistanceForNode(optSrcNode.get(), optDestNode.get());
 
     }
 
diff --git a/src/main/java/de/avatic/lcc/service/calculation/execution/steps/ShippingFrequencyCalculationService.java b/src/main/java/de/avatic/lcc/service/calculation/execution/steps/ShippingFrequencyCalculationService.java
index 04687f4..7f78659 100644
--- a/src/main/java/de/avatic/lcc/service/calculation/execution/steps/ShippingFrequencyCalculationService.java
+++ b/src/main/java/de/avatic/lcc/service/calculation/execution/steps/ShippingFrequencyCalculationService.java
@@ -13,26 +13,20 @@ public class ShippingFrequencyCalculationService {
         this.propertyRepository = propertyRepository;
     }
 
-    public int doCalculation(Integer setId, int huAnnualAmount) {
-        var minAnnualFrequency = Integer.parseInt(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.FREQ_MIN, setId).orElseThrow().getCurrentValue());
-        var maxAnnualFrequency = Integer.parseInt(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.FREQ_MAX, setId).orElseThrow().getCurrentValue());
+    public double doCalculation(Integer setId, double huAnnualAmount, int maxHuPerContainer, boolean fillContainer) {
+        int minAnnualFrequency = Integer.parseInt(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.FREQ_MIN, setId).orElseThrow().getCurrentValue());
+        int maxAnnualFrequency = Integer.parseInt(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.FREQ_MAX, setId).orElseThrow().getCurrentValue());
 
-        if (huAnnualAmount > maxAnnualFrequency)
+        if (fillContainer) {
+            var fullContainers = huAnnualAmount / maxHuPerContainer;
+            return fullContainers > minAnnualFrequency ? fullContainers : minAnnualFrequency;
+        }
+
+        if (huAnnualAmount > (double) maxAnnualFrequency)
             return maxAnnualFrequency;
 
         return Math.max(huAnnualAmount, minAnnualFrequency);
 
     }
 
-    public double doCalculation(Integer setId, double huAnnualAmount) {
-        Integer minAnnualFrequency = Integer.parseInt(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.FREQ_MIN, setId).orElseThrow().getCurrentValue());
-        Integer maxAnnualFrequency = Integer.parseInt(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.FREQ_MAX, setId).orElseThrow().getCurrentValue());
-
-        if (huAnnualAmount > maxAnnualFrequency.doubleValue())
-            return maxAnnualFrequency;
-
-        return Math.max(huAnnualAmount, minAnnualFrequency.doubleValue());
-
-    }
-
 }
diff --git a/src/main/java/de/avatic/lcc/service/excelMapper/ContainerRateExcelMapper.java b/src/main/java/de/avatic/lcc/service/excelMapper/ContainerRateExcelMapper.java
index 57afb87..b901ee5 100644
--- a/src/main/java/de/avatic/lcc/service/excelMapper/ContainerRateExcelMapper.java
+++ b/src/main/java/de/avatic/lcc/service/excelMapper/ContainerRateExcelMapper.java
@@ -4,9 +4,12 @@ import de.avatic.lcc.dto.generic.TransportType;
 import de.avatic.lcc.model.bulk.HiddenTableType;
 import de.avatic.lcc.model.bulk.header.ContainerRateHeader;
 import de.avatic.lcc.model.bulk.header.HiddenNodeHeader;
+import de.avatic.lcc.model.db.nodes.Node;
+import de.avatic.lcc.model.db.properties.SystemPropertyMappingId;
 import de.avatic.lcc.model.db.rates.ContainerRate;
 import de.avatic.lcc.repositories.NodeRepository;
 import de.avatic.lcc.repositories.rates.ContainerRateRepository;
+import de.avatic.lcc.service.access.PropertyService;
 import de.avatic.lcc.service.bulk.helper.ConstraintGenerator;
 import de.avatic.lcc.service.bulk.helper.HeaderGenerator;
 import de.avatic.lcc.util.exception.internalerror.ExcelValidationError;
@@ -16,6 +19,7 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 @Service
 public class ContainerRateExcelMapper {
@@ -24,12 +28,14 @@ public class ContainerRateExcelMapper {
     private final ContainerRateRepository containerRateRepository;
     private final NodeRepository nodeRepository;
     private final ConstraintGenerator constraintGenerator;
+    private final PropertyService propertyService;
 
-    public ContainerRateExcelMapper(HeaderGenerator headerGenerator, ContainerRateRepository containerRateRepository, NodeRepository nodeRepository, ConstraintGenerator constraintGenerator) {
+    public ContainerRateExcelMapper(HeaderGenerator headerGenerator, ContainerRateRepository containerRateRepository, NodeRepository nodeRepository, ConstraintGenerator constraintGenerator, PropertyService propertyService) {
         this.headerGenerator = headerGenerator;
         this.containerRateRepository = containerRateRepository;
         this.nodeRepository = nodeRepository;
         this.constraintGenerator = constraintGenerator;
+        this.propertyService = propertyService;
     }
 
     public void fillSheet(Sheet sheet, CellStyle headerStyle, Integer periodId) {
@@ -73,10 +79,20 @@ public class ContainerRateExcelMapper {
         return true;
     }
 
+    private String getRefStart() {
+        Optional<String> ref = propertyService.getProperty(SystemPropertyMappingId.START_REF);
+        return ref.orElseThrow(() -> new InternalError("Unable to get start reference from properties"));
+    }
+
+    private String getRefEnd() {
+        Optional<String> ref = propertyService.getProperty(SystemPropertyMappingId.END_REF);
+        return ref.orElseThrow(() -> new InternalError("Unable to get end reference from properties"));
+    }
+
     public List<ContainerRate> extractSheet(Sheet sheet) {
         headerGenerator.validateHeader(sheet, ContainerRateHeader.class);
 
-        var rates = new ArrayList<ContainerRate>();
+        var rates = new ArrayList<ExcelContainerRate>();
 
         sheet.forEach(row -> {
             if (row.getRowNum() == 0) return;
@@ -84,7 +100,18 @@ public class ContainerRateExcelMapper {
                 rates.add(mapToEntity(row));
         });
 
-        return rates;
+        validateReferenceRoute(rates);
+
+        return rates.stream().map(ExcelContainerRate::rate).toList();
+    }
+
+    private void validateReferenceRoute(List<ExcelContainerRate> rates) {
+        var startRef = getRefStart();
+        var endRef = getRefEnd();
+
+        if(rates.stream().noneMatch(rate -> rate.fromNode().getExternalMappingId().equals(startRef) || rate.toNode().getExternalMappingId().equals(endRef)))
+            throw new ExcelValidationError(String.format("Container rates must reference route (%s - %s) not found in container rates", startRef, endRef));
+
     }
 
     private boolean isEmpty(Row row) {
@@ -109,7 +136,7 @@ public class ContainerRateExcelMapper {
         return result.toString();
     }
 
-    private ContainerRate mapToEntity(Row row) {
+    private ExcelContainerRate mapToEntity(Row row) {
         ContainerRate entity = new ContainerRate();
 
         validateConstraints(row);
@@ -134,7 +161,7 @@ public class ContainerRateExcelMapper {
         entity.setRateTeu(BigDecimal.valueOf(row.getCell(ContainerRateHeader.RATE_TEU.ordinal()).getNumericCellValue()));
         entity.setRateHc(BigDecimal.valueOf(row.getCell(ContainerRateHeader.RATE_HC.ordinal()).getNumericCellValue()));
 
-        return entity;
+        return new ExcelContainerRate(entity, fromNode.orElseThrow(), toNode.orElseThrow());
     }
 
     private void validateConstraints(Row row) {
@@ -142,10 +169,12 @@ public class ContainerRateExcelMapper {
         constraintGenerator.validateStringCell(row, ContainerRateHeader.FROM_NODE.ordinal());
         constraintGenerator.validateStringCell(row, ContainerRateHeader.TO_NODE.ordinal());
         constraintGenerator.validateEnumConstraint(row, ContainerRateHeader.CONTAINER_RATE_TYPE.ordinal(), TransportType.class);
-        constraintGenerator.validateDecimalConstraint(row, ContainerRateHeader.RATE_FEU.ordinal(), 0.0, 1000000.0);
-        constraintGenerator.validateDecimalConstraint(row, ContainerRateHeader.RATE_TEU.ordinal(), 0.0, 1000000.0);
-        constraintGenerator.validateDecimalConstraint(row, ContainerRateHeader.RATE_HC.ordinal(), 0.0, 1000000.0);
+        constraintGenerator.validateDecimalConstraint(row, ContainerRateHeader.RATE_FEU.ordinal(), 1.0, 1000000.0);
+        constraintGenerator.validateDecimalConstraint(row, ContainerRateHeader.RATE_TEU.ordinal(), 1.0, 1000000.0);
+        constraintGenerator.validateDecimalConstraint(row, ContainerRateHeader.RATE_HC.ordinal(), 1.0, 1000000.0);
         constraintGenerator.validateIntegerConstraint(row, ContainerRateHeader.LEAD_TIME.ordinal(), 0, 365);
 
     }
+
+    private record ExcelContainerRate(ContainerRate rate, Node fromNode, Node toNode) {}
 }
diff --git a/src/main/java/de/avatic/lcc/service/excelMapper/NodeExcelMapper.java b/src/main/java/de/avatic/lcc/service/excelMapper/NodeExcelMapper.java
index 5e2122c..660e281 100644
--- a/src/main/java/de/avatic/lcc/service/excelMapper/NodeExcelMapper.java
+++ b/src/main/java/de/avatic/lcc/service/excelMapper/NodeExcelMapper.java
@@ -1,5 +1,6 @@
 package de.avatic.lcc.service.excelMapper;
 
+import de.avatic.lcc.model.bulk.header.ContainerRateHeader;
 import de.avatic.lcc.model.excel.ExcelNode;
 import de.avatic.lcc.model.bulk.BulkInstruction;
 import de.avatic.lcc.model.bulk.BulkInstructionType;
@@ -150,6 +151,11 @@ public class NodeExcelMapper {
         entity.setSource(Boolean.valueOf(row.getCell(NodeHeader.IS_SOURCE.ordinal()).getStringCellValue()));
         entity.setIntermediate(Boolean.valueOf(row.getCell(NodeHeader.IS_INTERMEDIATE.ordinal()).getStringCellValue()));
         entity.setDestination(Boolean.valueOf(row.getCell(NodeHeader.IS_DESTINATION.ordinal()).getStringCellValue()));
+
+        if(!entity.getSource() && !entity.getDestination() && !entity.getIntermediate())
+            throw new ExcelValidationError("Unable to validate row " + (row.getRowNum() + 1) + " column " + toExcelLetter(ContainerRateHeader.FROM_NODE.ordinal()) + ": Node with mapping id " + row.getCell(NodeHeader.MAPPING_ID.ordinal()).getStringCellValue() + " must be either source, destination or intermediate");
+
+
         entity.setPredecessorRequired(Boolean.valueOf(row.getCell(NodeHeader.IS_PREDECESSOR_MANDATORY.ordinal()).getStringCellValue()));
         entity.setNodePredecessors(mapChainsFromCell(CellUtil.getCell(row, NodeHeader.PREDECESSOR_NODES.ordinal()).getStringCellValue()));
         entity.setOutboundCountries(mapOutboundCountriesFromCell(CellUtil.getCell(row, NodeHeader.OUTBOUND_COUNTRIES.ordinal()).getStringCellValue()));
@@ -199,4 +205,14 @@ public class NodeExcelMapper {
         return Arrays.stream(chain.split(",")).map(String::trim).toList();
     }
 
+    private String toExcelLetter(int columnIdx) {
+        StringBuilder result = new StringBuilder();
+        columnIdx++; // Convert from 0-based to 1-based for the algorithm
+        while (columnIdx > 0) {
+            columnIdx--; // Adjust for 1-based indexing
+            result.insert(0, (char) ('A' + columnIdx % 26));
+            columnIdx /= 26;
+        }
+        return result.toString();
+    }
 }
diff --git a/src/main/java/de/avatic/lcc/service/excelMapper/PackagingExcelMapper.java b/src/main/java/de/avatic/lcc/service/excelMapper/PackagingExcelMapper.java
index cd1e0ec..f6e3860 100644
--- a/src/main/java/de/avatic/lcc/service/excelMapper/PackagingExcelMapper.java
+++ b/src/main/java/de/avatic/lcc/service/excelMapper/PackagingExcelMapper.java
@@ -60,7 +60,7 @@ public class PackagingExcelMapper {
 
     private void mapToRow(Packaging packaging, ArrayList<String> headers, Row row) {
         Optional<PackagingDimension> shu = packagingDimensionRepository.getById(packaging.getShuId());
-        Optional<PackagingDimension> hu = packagingDimensionRepository.getById(packaging.getShuId());
+        Optional<PackagingDimension> hu = packagingDimensionRepository.getById(packaging.getHuId());
 
         row.createCell(PackagingHeader.OPERATION.ordinal()).setCellValue(BulkInstructionType.UPDATE.name());
 
diff --git a/src/main/java/de/avatic/lcc/service/help/MarkdownService.java b/src/main/java/de/avatic/lcc/service/help/MarkdownService.java
new file mode 100644
index 0000000..e6d6eee
--- /dev/null
+++ b/src/main/java/de/avatic/lcc/service/help/MarkdownService.java
@@ -0,0 +1,243 @@
+package de.avatic.lcc.service.help;
+
+import org.commonmark.node.Node;
+import org.commonmark.parser.Parser;
+import org.commonmark.renderer.html.HtmlRenderer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Service
+public class MarkdownService {
+
+    private static final Logger logger = LoggerFactory.getLogger(MarkdownService.class);
+
+    @Value(value = "${lcc.help.static:}")
+    private String imagesBaseUrl;
+
+    @Value("${help.markdown.cache.enabled:true}")
+    private boolean cacheEnabled;
+
+    private final Parser parser;
+    private final HtmlRenderer renderer;
+    private final Map<String, String> contentCache = new ConcurrentHashMap<>();
+
+    public MarkdownService() {
+
+        this.parser = Parser.builder()
+
+                .build();
+
+        this.renderer = HtmlRenderer.builder()
+
+                .escapeHtml(false)  // HTML in Markdown erlauben
+                .sanitizeUrls(true) // URLs sanitizen
+                .build();
+
+    }
+
+    /**
+     * Konvertiert Markdown-String zu HTML
+     */
+    public String convertToHtml(String markdown, String imagePrefix) {
+        if (markdown == null || markdown.isEmpty()) {
+            return "";
+        }
+
+        Node document = parser.parse(markdown);
+        String html = renderer.render(document);
+
+        // Bild-URLs anpassen
+        return replaceImageUrls(html, imagePrefix);
+    }
+
+    /**
+     * Lädt Markdown-Datei und konvertiert zu HTML
+     */
+    public String loadAndConvertMarkdown(String fileName, String imagePrefix) throws IOException {
+        // Cache-Key erstellen
+        String cacheKey = fileName + "_" + imagesBaseUrl.hashCode();
+
+        // Aus Cache laden wenn aktiviert
+        if (cacheEnabled && contentCache.containsKey(cacheKey)) {
+            logger.debug("Loading help content from cache: {}", fileName);
+            return contentCache.get(cacheKey);
+        }
+
+        logger.debug("Loading help content from file: {}", fileName);
+
+        // Markdown-Datei laden
+        String markdown = loadMarkdownFile(fileName);
+
+        // Zu HTML konvertieren
+        String html = convertToHtml(markdown, imagePrefix);
+
+        // In HTML-Template einbetten
+//        html = wrapInHtmlTemplate(html, fileName);
+
+        // Im Cache speichern
+        if (cacheEnabled) {
+            contentCache.put(cacheKey, html);
+        }
+
+        return html;
+    }
+
+    /**
+     * Lädt Markdown-Datei aus Resources
+     */
+    private String loadMarkdownFile(String fileName) throws IOException {
+        // .md Extension hinzufügen falls nicht vorhanden
+        if (!fileName.endsWith(".md")) {
+            fileName = fileName + ".md";
+        }
+
+        Resource resource = new ClassPathResource("static/help/" + fileName);
+
+        if (!resource.exists()) {
+            throw new IOException("Help file not found: " + fileName);
+        }
+
+        return new String(resource.getInputStream().readAllBytes(), StandardCharsets.UTF_8);
+    }
+
+    /**
+     * Ersetzt relative Bild-URLs durch absolute URLs zum Azure Blob Storage
+     */
+    private String replaceImageUrls(String html, String imagePrefix) {
+        if (imagesBaseUrl == null || imagesBaseUrl.isEmpty()) {
+            logger.warn("Images base URL not configured");
+            return html;
+        }
+
+        // Verschiedene Bild-URL-Formate ersetzen
+        html = html.replaceAll("src=\"images/", "src=\"" + imagesBaseUrl + "/" + imagePrefix + "-");
+        html = html.replaceAll("src='images/", "src='" + imagesBaseUrl + "/" + imagePrefix + "-");
+        html = html.replaceAll("src=\"./images/", "src=\"" + imagesBaseUrl + "/" + imagePrefix + "-");
+
+        return html;
+    }
+
+    /**
+     * Bettet HTML-Inhalt in vollständiges HTML-Dokument ein
+     */
+    private String wrapInHtmlTemplate(String content, String title) {
+        return """
+                <!DOCTYPE html>
+                <html lang="de">
+                <head>
+                    <meta charset="UTF-8">
+                    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                    <title>%s</title>
+                    <style>
+                        body {
+                            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
+                            line-height: 1.6;
+                            color: #333;
+                            max-width: 900px;
+                            margin: 0 auto;
+                            padding: 20px;
+                        }
+                        img {
+                            max-width: 100%%;
+                            height: auto;
+                            border-radius: 4px;
+                            box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+                            margin: 1rem 0;
+                        }
+                        h1 {
+                            color: #2c3e50;
+                            border-bottom: 2px solid #3498db;
+                            padding-bottom: 0.5rem;
+                        }
+                        h2 {
+                            color: #34495e;
+                            margin-top: 2rem;
+                        }
+                        h3 {
+                            color: #34495e;
+                        }
+                        table {
+                            width: 100%%;
+                            border-collapse: collapse;
+                            margin: 1rem 0;
+                        }
+                        th, td {
+                            padding: 12px;
+                            text-align: left;
+                            border: 1px solid #ddd;
+                        }
+                        th {
+                            background-color: #3498db;
+                            color: white;
+                        }
+                        tr:nth-child(even) {
+                            background-color: #f2f2f2;
+                        }
+                        code {
+                            background-color: #f4f4f4;
+                            padding: 2px 6px;
+                            border-radius: 3px;
+                            font-family: 'Courier New', monospace;
+                        }
+                        pre {
+                            background-color: #f4f4f4;
+                            padding: 1rem;
+                            border-radius: 4px;
+                            overflow-x: auto;
+                        }
+                        blockquote {
+                            border-left: 4px solid #3498db;
+                            padding-left: 1rem;
+                            margin-left: 0;
+                            color: #666;
+                        }
+                        a {
+                            color: #3498db;
+                            text-decoration: none;
+                        }
+                        a:hover {
+                            text-decoration: underline;
+                        }
+                        ul, ol {
+                            padding-left: 2rem;
+                        }
+                        li {
+                            margin: 0.5rem 0;
+                        }
+                    </style>
+                </head>
+                <body>
+                    %s
+                </body>
+                </html>
+                """.formatted(title, content);
+    }
+
+    /**
+     * Leert den Content-Cache
+     */
+    public void clearCache() {
+        contentCache.clear();
+        logger.info("Help content cache cleared");
+    }
+
+    /**
+     * Gibt Cache-Statistiken zurück
+     */
+    public Map<String, Object> getCacheStats() {
+        return Map.of(
+                "cacheEnabled", cacheEnabled,
+                "cachedFiles", contentCache.size(),
+                "imagesBaseUrl", imagesBaseUrl
+        );
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/de/avatic/lcc/service/precalculation/PostCalculationCheckService.java b/src/main/java/de/avatic/lcc/service/precalculation/PostCalculationCheckService.java
index d1de294..aaf1051 100644
--- a/src/main/java/de/avatic/lcc/service/precalculation/PostCalculationCheckService.java
+++ b/src/main/java/de/avatic/lcc/service/precalculation/PostCalculationCheckService.java
@@ -1,12 +1,15 @@
 package de.avatic.lcc.service.precalculation;
 
+import de.avatic.lcc.model.calculation.DestinationInfo;
 import de.avatic.lcc.model.db.calculations.CalculationResult;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class PostCalculationCheckService {
 
-    public void doPostcheck(CalculationResult calculationResult) {
+    public void doPostcheck(List<DestinationInfo> destinationInfos) {
         //TODO check if all destinations are valid
     }
 
diff --git a/src/main/java/de/avatic/lcc/service/precalculation/PreCalculationCheckService.java b/src/main/java/de/avatic/lcc/service/precalculation/PreCalculationCheckService.java
index f0d3a9f..73cef88 100644
--- a/src/main/java/de/avatic/lcc/service/precalculation/PreCalculationCheckService.java
+++ b/src/main/java/de/avatic/lcc/service/precalculation/PreCalculationCheckService.java
@@ -6,33 +6,31 @@ import de.avatic.lcc.model.db.nodes.Node;
 import de.avatic.lcc.model.db.premises.Premise;
 import de.avatic.lcc.model.db.premises.route.Destination;
 import de.avatic.lcc.model.db.premises.route.Route;
+import de.avatic.lcc.model.db.premises.route.RouteNode;
 import de.avatic.lcc.model.db.premises.route.RouteSection;
 import de.avatic.lcc.model.db.properties.PropertySet;
 import de.avatic.lcc.model.db.properties.SystemPropertyMappingId;
 import de.avatic.lcc.model.db.rates.ValidityPeriod;
 import de.avatic.lcc.model.db.rates.ValidityPeriodState;
 import de.avatic.lcc.model.db.utils.WeightUnit;
+import de.avatic.lcc.repositories.MaterialRepository;
 import de.avatic.lcc.repositories.NodeRepository;
 import de.avatic.lcc.repositories.premise.*;
 import de.avatic.lcc.repositories.properties.PropertyRepository;
-import de.avatic.lcc.repositories.properties.PropertySetRepository;
 import de.avatic.lcc.repositories.rates.ContainerRateRepository;
 import de.avatic.lcc.repositories.rates.MatrixRateRepository;
-import de.avatic.lcc.repositories.rates.ValidityPeriodRepository;
+import de.avatic.lcc.repositories.users.UserNodeRepository;
 import de.avatic.lcc.service.access.PropertyService;
-import de.avatic.lcc.service.api.CustomApiService;
-import de.avatic.lcc.service.api.TaxationResolverService;
 import de.avatic.lcc.service.transformer.generic.DimensionTransformer;
 import de.avatic.lcc.util.exception.internalerror.PremiseValidationError;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
 
 @Service
 public class PreCalculationCheckService {
@@ -40,7 +38,6 @@ public class PreCalculationCheckService {
     private static final double DIMENSION_TOLERANCE = 0.02;
 
     private final PremiseRepository premiseRepository;
-    private final CustomApiService customApiService;
     private final DestinationRepository destinationRepository;
     private final RouteRepository routeRepository;
     private final NodeRepository nodeRepository;
@@ -51,14 +48,12 @@ public class PreCalculationCheckService {
     private final RouteNodeRepository routeNodeRepository;
     private final MatrixRateRepository matrixRateRepository;
     private final ContainerRateRepository containerRateRepository;
-    private final ValidityPeriodRepository validityPeriodRepository;
-    private final PropertySetRepository propertySetRepository;
     private final PropertyRepository propertyRepository;
-    private final TaxationResolverService eUTaxationResolverService;
+    private final MaterialRepository materialRepository;
+    private final UserNodeRepository userNodeRepository;
 
-    public PreCalculationCheckService(PremiseRepository premiseRepository, CustomApiService customApiService, DestinationRepository destinationRepository, RouteRepository routeRepository, NodeRepository nodeRepository, DimensionTransformer dimensionTransformer, PropertyService propertyService, RouteSectionRepository routeSectionRepository, RouteNodeRepository routeNodeRepository, MatrixRateRepository matrixRateRepository, ContainerRateRepository containerRateRepository, ValidityPeriodRepository validityPeriodRepository, PropertySetRepository propertySetRepository, PropertyRepository propertyRepository, TaxationResolverService eUTaxationResolverService) {
+    public PreCalculationCheckService(PremiseRepository premiseRepository, DestinationRepository destinationRepository, RouteRepository routeRepository, NodeRepository nodeRepository, DimensionTransformer dimensionTransformer, PropertyService propertyService, RouteSectionRepository routeSectionRepository, RouteNodeRepository routeNodeRepository, MatrixRateRepository matrixRateRepository, ContainerRateRepository containerRateRepository, PropertyRepository propertyRepository,  MaterialRepository materialRepository,  UserNodeRepository userNodeRepository) {
         this.premiseRepository = premiseRepository;
-        this.customApiService = customApiService;
         this.destinationRepository = destinationRepository;
         this.routeRepository = routeRepository;
         this.nodeRepository = nodeRepository;
@@ -69,165 +64,173 @@ public class PreCalculationCheckService {
         this.routeNodeRepository = routeNodeRepository;
         this.matrixRateRepository = matrixRateRepository;
         this.containerRateRepository = containerRateRepository;
-        this.validityPeriodRepository = validityPeriodRepository;
-        this.propertySetRepository = propertySetRepository;
         this.propertyRepository = propertyRepository;
-        this.eUTaxationResolverService = eUTaxationResolverService;
+        this.materialRepository = materialRepository;
+        this.userNodeRepository = userNodeRepository;
     }
 
-    @Async("calculationExecutor")
-    public CompletableFuture<Void> doPrecheck(Integer premiseId, Integer setId, Integer periodId) {
+    public void doPrecheck(Integer premiseId, Optional<PropertySet> set, Optional<ValidityPeriod> period, boolean showCalcInfo) {
+        doPrecheck(premiseId, set, period, LocalDate.now(), showCalcInfo);
+    }
+
+
+    public void doPrecheck(Integer premiseId, Optional<PropertySet> set, Optional<ValidityPeriod> period, LocalDate date, boolean showCalcInfo) {
         var premise = premiseRepository.getPremiseById(premiseId).orElseThrow();
 
         supplierCheck(premise);
 
-        materialCheck(premise);
+        var material = materialRepository.getById(premise.getMaterialId());
+        var supplier = premise.getSupplierNodeId() == null ? userNodeRepository.getById(premise.getUserSupplierNodeId()) : nodeRepository.getById(premise.getSupplierNodeId());
 
-        packagingCheck(premise);
+        if(material.isEmpty() || supplier.isEmpty())
+            throw new PremiseValidationError("No material or supplier - please contact your administrator");
 
-        priceCheck(premise);
+        var partNumber = material.get().getPartNumber();
+        var supplierName = supplier.get().getName();
+
+        materialCheck(premise, supplierName, partNumber, showCalcInfo);
+
+        packagingCheck(premise, supplierName, partNumber, showCalcInfo);
+
+        priceCheck(premise, supplierName, partNumber, showCalcInfo);
 
         var destinations = destinationRepository.getByPremiseId(premiseId);
 
         if (destinations == null || destinations.isEmpty()) {
-            throw new PremiseValidationError("No destination defined yet, please add at least one destination.");
+            throw new PremiseValidationError("Please add at least one destination to continue", supplierName, partNumber, showCalcInfo);
         }
 
-
         for (Destination destination : destinations) {
 
             var node = nodeRepository.getByDestinationId(destination.getId()).orElseThrow();
 
-            destinationCheck(destination, node);
+            destinationCheck(destination, node, supplierName, partNumber, showCalcInfo);
 
             var routes = routeRepository.getByDestinationId(destination.getId());
 
 
             if (routes.isEmpty() && destination.getD2d() == false)
-                throw new PremiseValidationError("No standard route available for destination " + node.getName() + ". Please use individual rate or contact your administrator.");
+                throw new PremiseValidationError(String.format("No standard route found for %s - try using an individual rate instead", node.getName()), supplierName, partNumber, showCalcInfo);
 
             if (routes.stream().noneMatch(Route::getSelected) && destination.getD2d() == false)
-                throw new PremiseValidationError("No route selected for destination " + node.getName());
+                throw new PremiseValidationError(String.format("Please select a route for %s", node.getName()), supplierName, partNumber, showCalcInfo);
 
             if (destination.getD2d() && (destination.getRateD2d() == null || destination.getRateD2d().compareTo(BigDecimal.ZERO) == 0)) {
-                throw new PremiseValidationError("Door-2-door rate not entered or zero.");
+                throw new PremiseValidationError("Please enter a door-to-door rate greater than zero", supplierName, partNumber, showCalcInfo);
             }
 
             if (destination.getD2d() && (destination.getLeadTimeD2d() == null || destination.getLeadTimeD2d() == 0)) {
-                throw new PremiseValidationError("Door-2-door lead time not entered or zero.");
+                throw new PremiseValidationError("Please enter a door-to-door lead time", supplierName, partNumber, showCalcInfo);
             }
 
-            var period = validityPeriodRepository.getById(periodId);
-            var set = propertySetRepository.getById(setId);
-
-            periodCheck(period, set);
+            periodCheck(period.orElse(null), set.orElse(null), date, supplierName, partNumber);
 
             routes.stream().filter(Route::getSelected).findAny().ifPresent(r -> {
                 var sections = routeSectionRepository.getByRouteId(r.getId());
-                routeCheck(sections, period);
+                routeCheck(sections, period.orElseThrow(), date, supplierName, partNumber, showCalcInfo);
             });
-
-
         }
-
-        return CompletableFuture.completedFuture(null);
     }
 
-    private void periodCheck(ValidityPeriod period, PropertySet set) {
-
+    private void periodCheck(ValidityPeriod period, PropertySet set, LocalDate calculationDate, String supplierName, String partNumber) {
 
         if (set == null)
-            throw new PremiseValidationError("There are no system properties for the given date. Please contact your administrator.");
+            throw new PremiseValidationError("No system configuration available for this date - please contact your administrator");
 
         if (period == null)
-            throw new PremiseValidationError("There are no rates for the given date. Please contact your administrator.");
+            throw new PremiseValidationError("No rates available for this date - please contact your administrator");
 
         if (ValidityPeriodState.VALID != period.getState() && ValidityPeriodState.EXPIRED != period.getState())
-            throw new PremiseValidationError("There are no valid rates for the given date. Please contact your administrator.");
+            throw new PremiseValidationError("Rates for this date aren't valid yet - please contact your administrator");
 
         if (ValidityPeriodState.VALID != set.getState() && ValidityPeriodState.EXPIRED != period.getState())
-            throw new PremiseValidationError("There are no valid system properties for the given date. Please contact your administrator.");
+            throw new PremiseValidationError("System properties for this date aren't valid yet - please contact your administrator");
 
-        //TODO: sicherstellen, dass die valid days für den zeitpunkt galten zu dem die valid period galt (wenn rückwirkend gerechnet wird)
-        var validDays = propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.VALID_DAYS, set.getId());
-        var renewals = period.getRenewals();
 
-        if (validDays.isEmpty())
-            throw new PremiseValidationError("There are no valid days property. Please contact your administrator");
+        if (calculationDate == null) {
 
-        var validDaysInt = Integer.parseInt(validDays.get().getCurrentValue());
+            var validDays = propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.VALID_DAYS, set.getId());
+            var renewals = period.getRenewals();
 
-        if (!period.getStartDate().plusDays((((long) validDaysInt * renewals) + validDaysInt)).isAfter(LocalDateTime.now()))
-            throw new PremiseValidationError("There are no valid rates for the given date. Please contact your administrator.");
+            if (validDays.isEmpty())
+                throw new PremiseValidationError("Missing system configuration (VALID_DAYS) - please contact your administrator");
+
+            var validDaysInt = Integer.parseInt(validDays.get().getCurrentValue());
+
+            if (!period.getStartDate().plusDays((((long) validDaysInt * renewals) + validDaysInt)).isAfter(LocalDateTime.now()))
+                throw new PremiseValidationError("Rates for this date aren't valid yet - please contact your administrator");
+        }
 
     }
 
-    private void routeCheck(List<RouteSection> sections, ValidityPeriod period) {
+    private void routeCheck(List<RouteSection> sections, ValidityPeriod period, LocalDate calculationDate, String supplierName, String partNumber, boolean showCalcInfo) {
 
         sections.forEach(section -> {
             var fromRouteNode = routeNodeRepository.getFromNodeBySectionId(section.getId());
             var toRouteNode = routeNodeRepository.getToNodeBySectionId(section.getId());
 
             if (fromRouteNode.isEmpty() || toRouteNode.isEmpty())
-                throw new PremiseValidationError("Error in route. Please contact your administrator.");
+                throw new PremiseValidationError("Route configuration issue - please contact your administrator", supplierName, partNumber, showCalcInfo);
 
             if (RateType.MATRIX == section.getRateType()) {
                 var rate = matrixRateRepository.getByCountryIds(fromRouteNode.get().getCountryId(), toRouteNode.get().getCountryId(), period.getId());
-
-
-                if (rate.isEmpty())
-                    throw new PremiseValidationError("The transport rates for the period " + period.getStartDate().format(DateTimeFormatter.ISO_DATE) + " to " + period.getEndDate().format(DateTimeFormatter.ISO_DATE) + " are insufficient to perform the calculation for route segment" + fromRouteNode.get().getExternalMappingId() + " to " + toRouteNode.get().getExternalMappingId());
-
+                constructRouteSectionError(calculationDate, fromRouteNode.get(), toRouteNode.get(), rate.isEmpty(), supplierName, partNumber, showCalcInfo);
             }
 
             if (RateType.CONTAINER == section.getRateType()) {
                 var rate = containerRateRepository.findRoute(fromRouteNode.get().getNodeId(), toRouteNode.get().getNodeId(), period.getId(), section.getTransportType());
-
-                if (rate.isEmpty())
-                    throw new PremiseValidationError("The transport rates for the period " + period.getStartDate().format(DateTimeFormatter.ISO_DATE) + " to " + period.getEndDate().format(DateTimeFormatter.ISO_DATE) + " are insufficient to perform the calculation for route segment" + fromRouteNode.get().getExternalMappingId() + " to " + toRouteNode.get().getExternalMappingId());
-
+                constructRouteSectionError(calculationDate, fromRouteNode.get(), toRouteNode.get(), rate.isEmpty(), supplierName, partNumber, showCalcInfo);
             }
-
         });
-
     }
 
-    private void destinationCheck(Destination destination, Node node) {
+    private void constructRouteSectionError(LocalDate calculationDate, RouteNode fromRouteNode, RouteNode toRouteNode, boolean empty, String supplierName, String partNumber, boolean showCalcInfo) {
+        if (empty) {
+            var dateStr = calculationDate == null ? "" : String.format("on %s", calculationDate.format(DateTimeFormatter.ofPattern("dd.MM.yyyy")));
+            var errStr = String.format("Transport rate missing for %s to %s %s - please contact your administrator",
+                    fromRouteNode.getExternalMappingId(),
+                    toRouteNode.getExternalMappingId(),
+                    dateStr);
+            throw new PremiseValidationError(errStr, supplierName, partNumber, showCalcInfo);
+        }
+    }
+
+    private void destinationCheck(Destination destination, Node node, String supplierName, String partNumber, boolean showCalcInfo) {
 
         if (destination.getAnnualAmount() == null || destination.getAnnualAmount() == 0)
-            throw new PremiseValidationError("In destination " + node.getName() + ": annual quantity must be greater than zero.");
+            throw new PremiseValidationError(String.format("Annual quantity for %s must be greater than zero", node.getName()), supplierName, partNumber, showCalcInfo);
 
         if (destination.getD2d() == null)
-            throw new PremiseValidationError("In destination " + node.getName() + ": Door-2-Door flag is missing. Please contact administrator.");
+            throw new PremiseValidationError(String.format("Something's missing for %s - please contact your administrator", node.getName()), supplierName, partNumber, showCalcInfo);
 
         if (destination.getD2d() == true) {
             if (destination.getRateD2d() == null || destination.getRateD2d().compareTo(BigDecimal.ZERO) == 0) {
-                throw new PremiseValidationError("In destination " + node.getName() + ": Door-2-door rate not entered or zero.");
+                throw new PremiseValidationError(String.format("Door-to-door rate for %s needs to be greater than zero", node.getName()), supplierName, partNumber, showCalcInfo);
             }
 
             if (destination.getLeadTimeD2d() == null || destination.getLeadTimeD2d() == 0) {
-                throw new PremiseValidationError("In destination " + node.getName() + ": Door-2-Door lead time not entered or zero.");
+                throw new PremiseValidationError(String.format("Please set a lead time for door-to-door delivery to %s", node.getName()), supplierName, partNumber, showCalcInfo);
             }
         }
 
         if (destination.getCountryId() == null || destination.getCountryId() == 0) {
-            throw new PremiseValidationError("In destination " + node.getName() + ": destination country ID not set. Please contact your administrator.");
+            throw new PremiseValidationError(String.format("Configuration issue with %s - please contact your administrator", node.getName()), supplierName, partNumber, showCalcInfo);
         }
 
         if (destination.getGeoLat() == null || destination.getGeoLng() == null) {
-            throw new PremiseValidationError("In destination " + node.getName() + ": destination geo location not set. Please contact your administrator.");
+            throw new PremiseValidationError(String.format("Location data missing for %s - please contact your administrator", node.getName()), supplierName, partNumber, showCalcInfo);
         }
 
         if (destination.getDisposalCost() != null && destination.getDisposalCost().compareTo(BigDecimal.ZERO) < 0) {
-            throw new PremiseValidationError("In destination " + node.getName() + ": disposal costs are not set or entered value is less than zero.");
+            throw new PremiseValidationError(String.format("Disposal costs for %s can't be negative", node.getName()), supplierName, partNumber, showCalcInfo);
         }
 
         if (destination.getHandlingCost() != null && destination.getHandlingCost().compareTo(BigDecimal.ZERO) < 0) {
-            throw new PremiseValidationError("In destination " + node.getName() + ": handling costs are not set or entered value is less than zero.");
+            throw new PremiseValidationError(String.format("Handling costs for %s can't be negative", node.getName()), supplierName, partNumber, showCalcInfo);
         }
 
         if (destination.getRepackingCost() != null && destination.getRepackingCost().compareTo(BigDecimal.ZERO) < 0) {
-            throw new PremiseValidationError("In destination " + node.getName() + ": repackaging costs are not set or entered value is less than zero.");
+            throw new PremiseValidationError(String.format("Repackaging costs for %s can't be negative", node.getName()), supplierName, partNumber, showCalcInfo);
         }
 
     }
@@ -235,66 +238,66 @@ public class PreCalculationCheckService {
     private void supplierCheck(Premise premise) {
 
         if (premise.getSupplierNodeId() == null && premise.getUserSupplierNodeId() == null)
-            throw new PremiseValidationError("Supplier node not set. Please contact administrator");
+            throw new PremiseValidationError("Supplier information is missing - please contact your administrator");
 
     }
 
-    private void priceCheck(Premise premise) {
+    private void priceCheck(Premise premise, String supplierName, String partNumber, boolean showCalcInfo) {
 
         if (premise.getMaterialCost() == null || premise.getMaterialCost().compareTo(BigDecimal.ZERO) == 0) {
-            throw new PremiseValidationError("MEK_A not entered or zero.");
+            throw new PremiseValidationError("Please enter a material cost (MEK_A) greater than zero", supplierName, partNumber, showCalcInfo);
         }
 
         if (premise.getOverseaShare() == null) {
-            throw new PremiseValidationError("Oversea share not entered.");
+            throw new PremiseValidationError("Please enter the overseas share", supplierName, partNumber, showCalcInfo);
         }
 
         if (premise.getFcaEnabled() == null) {
-            throw new PremiseValidationError("FCA fee not set. Please contact administrator");
+            throw new PremiseValidationError("FCA configuration missing - please contact your administrator", supplierName, partNumber, showCalcInfo);
         }
 
     }
 
-    private void packagingCheck(Premise premise) {
+    private void packagingCheck(Premise premise, String supplierName, String partNumber, boolean showCalcInfo) {
 
         if (premise.getHuMixable() == null) {
-            throw new PremiseValidationError("Mixable not set. Please contact administrator.");
+            throw new PremiseValidationError("Packaging configuration incomplete - please contact your administrator", supplierName, partNumber, showCalcInfo);
         }
 
         if (premise.getHuStackable() == null) {
-            throw new PremiseValidationError("Stackable not set. Please contact administrator.");
+            throw new PremiseValidationError("Packaging configuration incomplete - please contact your administrator", supplierName, partNumber, showCalcInfo);
         }
 
         if (premise.getHuStackable() == false && premise.getHuMixable() == true) {
-            throw new PremiseValidationError("Stackable cannot be false, when mixable is true.");
+            throw new PremiseValidationError("If packaging is mixable, it must also be stackable", supplierName, partNumber, showCalcInfo);
         }
 
         if (premise.getIndividualHuLength() == null || premise.getIndividualHuLength() == 0) {
-            throw new PremiseValidationError("Packaging length not entered or zero.");
+            throw new PremiseValidationError("Please enter packaging length", supplierName, partNumber, showCalcInfo);
         }
 
         if (premise.getIndividualHuWidth() == null || premise.getIndividualHuWidth() == 0) {
-            throw new PremiseValidationError("Packaging width not entered or zero.");
+            throw new PremiseValidationError("Please enter packaging width", supplierName, partNumber, showCalcInfo);
         }
 
         if (premise.getIndividualHuHeight() == null || premise.getIndividualHuHeight() == 0) {
-            throw new PremiseValidationError("Packaging height not entered or zero.");
+            throw new PremiseValidationError("Please enter packaging height", supplierName, partNumber, showCalcInfo);
         }
 
         if (premise.getIndividualHuWeight() == null || premise.getIndividualHuWeight() == 0) {
-            throw new PremiseValidationError("Packaging weight not entered or zero");
+            throw new PremiseValidationError("Please enter packaging weight", supplierName, partNumber, showCalcInfo);
         }
 
         if (premise.getHuUnitCount() == null || premise.getHuUnitCount() == 0) {
-            throw new PremiseValidationError("Packaging unit count not entered or zero.");
+            throw new PremiseValidationError("Please enter the number of units per package", supplierName, partNumber, showCalcInfo);
         }
 
         if (premise.getHuDisplayedWeightUnit() == null) {
-            throw new PremiseValidationError("Packaging weight unit not set. Please contact administrator.");
+            throw new PremiseValidationError("Weight unit configuration missing - please contact your administrator", supplierName, partNumber, showCalcInfo);
         }
 
         if (premise.getHuDisplayedDimensionUnit() == null) {
-            throw new PremiseValidationError("Packaging dimension unit not set. Please contact administrator.");
+            throw new PremiseValidationError("Dimension unit configuration missing - please contact your administrator", supplierName, partNumber, showCalcInfo);
         }
 
         var hu = dimensionTransformer.toDimensionEntity(premise).withTolerance(DIMENSION_TOLERANCE);
@@ -303,39 +306,39 @@ public class PreCalculationCheckService {
         Optional<Integer> feuLoad = propertyService.getProperty(SystemPropertyMappingId.TEU_LOAD);
 
         if (teuLoad.isEmpty() || feuLoad.isEmpty())
-            throw new PremiseValidationError("System properties not properly configured. Please contact your administrator.");
+            throw new PremiseValidationError("System configuration incomplete - please contact your administrator", supplierName, partNumber, showCalcInfo);
 
         if (WeightUnit.KG.convertFromG(hu.getWeight()) > teuLoad.get() && hu.getWeight() > feuLoad.get())
-            throw new PremiseValidationError("HU weight exceeds maximum container weight load (" + Math.max(teuLoad.get(), feuLoad.get()) + " kg). Review entered weight and selected weight unit [g, kg, t].");
+            throw new PremiseValidationError(String.format("Package weight exceeds %d kg - please check your weight and unit", Math.max(teuLoad.get(), feuLoad.get())), supplierName, partNumber, showCalcInfo);
 
         var teuFitsXY = (hu.getLength() < ContainerType.TEU.getLength() && hu.getWidth() < ContainerType.TEU.getWidth());
         var teuFitsYX = (hu.getWidth() < ContainerType.TEU.getLength() && hu.getLength() < ContainerType.TEU.getWidth());
 
         if (!teuFitsYX && !teuFitsXY) {
-            throw new PremiseValidationError("HU dimensions too large. Review entered length, width, height and selected dimension unit [mm, cm, m].");
+            throw new PremiseValidationError("Package dimensions are too large - please check your measurements and unit", supplierName, partNumber, showCalcInfo);
         }
 
 
         if ((hu.getLength() * hu.getWidth()) < 20000) {
-            throw new PremiseValidationError("HU dimensions too small. Review entered length, width, height and selected dimension unit [mm, cm, m].");
+            throw new PremiseValidationError("Package dimensions are too small - please check your measurements and unit", supplierName, partNumber, showCalcInfo);
         }
 
     }
 
-    private void materialCheck(Premise premise) {
+    private void materialCheck(Premise premise, String supplierName, String partNumber, boolean showCalcInfo) {
 
 //        if (premise.getTariffUnlocked()) {
 //            if (premise.getHsCode() == null || premise.getHsCode().length() < 10)
-//                throw new PremiseValidationError("Invalid HS code (10 digits expected).");
+//                throw new PremiseValidationError("Invalid HS code (10 digits expected).", supplierName, partNumber);
 //
 //            var isDeclarable = eUTaxationResolverService.validate(premise.getHsCode());
 //
-//            if (!isDeclarable) throw new PremiseValidationError("Invalid HS code (not declarable).");
+//            if (!isDeclarable) throw new PremiseValidationError("Invalid HS code (not declarable).", supplierName, partNumber);
 //        }
 
         if (premise.getTariffRate() == null) {
-            throw new PremiseValidationError("Tariff rate not entered.");
+            throw new PremiseValidationError("Please enter a tariff rate", supplierName, partNumber, showCalcInfo);
         }
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/de/avatic/lcc/service/report/ExcelReportingService.java b/src/main/java/de/avatic/lcc/service/report/ExcelReportingService.java
index 64f7c83..863462f 100644
--- a/src/main/java/de/avatic/lcc/service/report/ExcelReportingService.java
+++ b/src/main/java/de/avatic/lcc/service/report/ExcelReportingService.java
@@ -1,206 +1,721 @@
 package de.avatic.lcc.service.report;
 
 import de.avatic.lcc.dto.generic.NodeDTO;
-import de.avatic.lcc.dto.generic.TransportType;
 import de.avatic.lcc.dto.report.ReportDTO;
 import de.avatic.lcc.dto.report.ReportDestinationDTO;
 import de.avatic.lcc.dto.report.ReportEntryDTO;
-import de.avatic.lcc.service.bulk.helper.HeaderCellStyleProvider;
+import de.avatic.lcc.dto.report.ReportSectionDTO;
+import de.avatic.lcc.model.bulk.header.ReportSummaryHeader;
+import de.avatic.lcc.model.db.properties.SystemPropertyMappingId;
+import de.avatic.lcc.repositories.MaterialRepository;
+import de.avatic.lcc.repositories.properties.PropertyRepository;
+import de.avatic.lcc.service.bulk.helper.CellStyleProvider;
 import de.avatic.lcc.service.bulk.helper.HeaderGenerator;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.RegionUtil;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.stereotype.Service;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Stream;
 
 @Service
 public class ExcelReportingService {
 
 
-    private final ReportingService reportingService;
-    private final HeaderCellStyleProvider headerCellStyleProvider;
-    private final HeaderGenerator headerGenerator;
+    private static final Map<Integer, RowInfo> rowSequence = new HashMap<>() {
+        {
+            put(0, new RowInfo(0, RowCaption.SUPPLIER, "Supplier", RowType.TITLE, true));
+            put(1, new RowInfo(1, RowCaption.ADDRESS, "Address", RowType.SUB_TITLE, true));
 
-    public ExcelReportingService(ReportingService reportingService, HeaderCellStyleProvider headerCellStyleProvider, HeaderGenerator headerGenerator) {
+            put(2, new RowInfo(2, RowCaption.SUMMARY, "Summary", RowType.HEADER, false));
+            put(3, new RowInfo(3, RowCaption.SUMMARY_MEK_A, "MEK A", RowType.SPLIT_DATA, false));
+            put(4, new RowInfo(4, RowCaption.SUMMARY_LOGISTICS_COST, "Logistics cost", RowType.SPLIT_DATA, false));
+            put(5, new RowInfo(5, RowCaption.SUMMARY_MEK_B, "MEK B", RowType.SPLIT_DATA, false));
+
+            put(6, new RowInfo(6, RowCaption.WEIGHTED_COST_BREAKDOWN, "Weighted cost breakdown", RowType.HEADER, false));
+            put(7, new RowInfo(7, RowCaption.BREAKDOWN_MEK_A, "MEK A", RowType.SPLIT_DATA, false));
+            put(8, new RowInfo(8, RowCaption.BREAKDOWN_TRANSPORT, "Transport", RowType.SPLIT_DATA, false));
+            put(9, new RowInfo(9, RowCaption.BREAKDOWN_HANDLING, "Handling", RowType.SPLIT_DATA, false));
+            put(10, new RowInfo(10, RowCaption.BREAKDOWN_STORAGE, "Storage", RowType.SPLIT_DATA, false));
+            put(11, new RowInfo(11, RowCaption.BREAKDOWN_REPACKAGING, "Repackaging", RowType.SPLIT_DATA, false));
+            put(12, new RowInfo(12, RowCaption.BREAKDOWN_DISPOSAL, "Disposal", RowType.SPLIT_DATA, false));
+            put(13, new RowInfo(13, RowCaption.BREAKDOWN_CAPITAL, "Capital", RowType.SPLIT_DATA, false));
+            put(14, new RowInfo(14, RowCaption.BREAKDOWN_CUSTOM, "Custom", RowType.SPLIT_DATA, false));
+            put(15, new RowInfo(15, RowCaption.BREAKDOWN_FCA_FEES, "FCA fees", RowType.SPLIT_DATA, false));
+            put(16, new RowInfo(16, RowCaption.BREAKDOWN_TOTAL, "Total", RowType.SPLIT_DATA, false));
+
+            put(17, new RowInfo(17, RowCaption.FLUCTUATION, "Transport costs fluctuations", RowType.HEADER, false));
+            put(18, new RowInfo(18, RowCaption.FLUCTUATION_CURRENT, "Current scenario", RowType.SPLIT_DATA, false));
+            put(19, new RowInfo(19, RowCaption.FLUCTUATION_OPPORTUNITY, "Opportunity scenario", RowType.SPLIT_DATA, false));
+            put(20, new RowInfo(20, RowCaption.FLUCTUATION_RISK, "Risk scenario", RowType.SPLIT_DATA, false));
+
+            put(21, new RowInfo(21, RowCaption.ASSUMPTIONS, "Assumptions", RowType.HEADER, false));
+            put(22, new RowInfo(22, RowCaption.ASSUMPTIONS_MATERIAL, "Material", RowType.SUB_HEADER, false));
+            put(23, new RowInfo(23, RowCaption.ASSUMPTIONS_PART_NUMBER, "Part number", RowType.DATA, false));
+            put(24, new RowInfo(24, RowCaption.ASSUMPTIONS_HS_CODE, "HS code", RowType.DATA, false));
+            put(25, new RowInfo(25, RowCaption.ASSUMPTIONS_TARIFF_RATE, "Tariff rate", RowType.DATA, false));
+            put(26, new RowInfo(26, RowCaption.ASSUMPTIONS_OVERSEA_SHARE, "Oversea share", RowType.DATA, false));
+            put(27, new RowInfo(27, RowCaption.ASSUMPTIONS_AIR_FREIGHT_SHARE, "Airfreight share", RowType.DATA, false));
+            put(28, new RowInfo(28, RowCaption.ASSUMPTIONS_SAFETY_STOCK, "Safety stock [working days]", RowType.DATA, false));
+
+            put(29, new RowInfo(29, RowCaption.HANDLING_UNIT, "Handling unit", RowType.SUB_HEADER, false));
+            put(30, new RowInfo(30, RowCaption.HANDLING_UNIT_LENGTH, "Length", RowType.DATA, false));
+            put(31, new RowInfo(31, RowCaption.HANDLING_UNIT_WIDTH, "Width", RowType.DATA, false));
+            put(32, new RowInfo(32, RowCaption.HANDLING_UNIT_HEIGHT, "Height", RowType.DATA, false));
+            put(33, new RowInfo(33, RowCaption.HANDLING_UNIT_DIMENSION_UNIT, "Unit", RowType.DATA, false));
+            put(34, new RowInfo(34, RowCaption.HANDLING_UNIT_WEIGHT, "Weight", RowType.DATA, false));
+            put(35, new RowInfo(35, RowCaption.HANDLING_UNIT_DIMENSION_WEIGHT, "Unit", RowType.DATA, false));
+            put(36, new RowInfo(36, RowCaption.HANDLING_UNIT_PIECES, "Pieces per HU", RowType.DATA, false));
+            put(37, new RowInfo(37, RowCaption.HANDLING_UNIT_MIXED, "Mixed transport", RowType.DATA, false));
+
+        }
+    };
+    private static final Map<Integer, RowInfo> destinationRowSequence = new HashMap<>() {
+        {
+            put(0, new RowInfo(0, RowCaption.DESTINATION, "Destination", RowType.HEADER, true));
+
+            put(1, new RowInfo(1, RowCaption.DESTINATION_GENERAL, "General", RowType.SUB_HEADER, false));
+
+            put(2, new RowInfo(2, RowCaption.DESTINATION_ROUTE, "Route", RowType.DATA, false));
+            put(3, new RowInfo(3, RowCaption.DESTINATION_ANNUAL_QUANTITY, "Annual quantity", RowType.DATA, false));
+            put(4, new RowInfo(4, RowCaption.DESTINATION_TRANSPORT_TIME, "Transit time [days]", RowType.DATA, false));
+
+            put(5, new RowInfo(5, RowCaption.DESTINATION_CONTAINER, "Container calculation", RowType.SUB_HEADER, false));
+            put(6, new RowInfo(6, RowCaption.DESTINATION_CONTAINER_LAYER, "Stacked layers", RowType.DATA, false));
+            put(7, new RowInfo(7, RowCaption.DESTINATION_CONTAINER_UNIT_COUNT, "Container unit count", RowType.DATA, false));
+            put(8, new RowInfo(8, RowCaption.DESTINATION_CONTAINER_TYPE, "Container type", RowType.DATA, false));
+            put(9, new RowInfo(9, RowCaption.DESTINATION_CONTAINER_LIMIT, "Limiting factor", RowType.DATA, false));
+        }
+    };
+    private final ReportingService reportingService;
+    private final CellStyleProvider cellStyleProvider;
+    private final HeaderGenerator headerGenerator;
+    private final MaterialRepository materialRepository;
+    private final PropertyRepository propertyRepository;
+
+    public ExcelReportingService(ReportingService reportingService, CellStyleProvider cellStyleProvider, HeaderGenerator headerGenerator, MaterialRepository materialRepository, PropertyRepository propertyRepository) {
 
         this.reportingService = reportingService;
-        this.headerCellStyleProvider = headerCellStyleProvider;
+        this.cellStyleProvider = cellStyleProvider;
         this.headerGenerator = headerGenerator;
+        this.materialRepository = materialRepository;
+        this.propertyRepository = propertyRepository;
     }
 
-    public ByteArrayResource generateExcelReport(Integer materialId, List<Integer> nodeIds, List<Integer> userNodeIds ) {
+    public ByteArrayResource generateExcelReport(List<Integer> materialIds, List<Integer> nodeIds, List<Integer> userNodeIds) {
+        var reportingProperty = propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.REPORTING).orElseThrow();
+        boolean includeAirfreight = reportingProperty.getCurrentValue().equals("MEK_C");
+
         try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
-            var reports = reportingService.getReport(materialId, nodeIds, userNodeIds);
-
             Workbook workbook = new XSSFWorkbook();
-            Sheet sheet = workbook.createSheet("report");
-
-            CellStyle headerStyle = headerCellStyleProvider.createHeaderCellStyle(workbook);
-
-            ArrayList<String> headers = new ArrayList<>();
-            headers.add("");
-            headers.addAll(reports.stream().map(ReportDTO::getSupplier).map(NodeDTO::getName).toList());
-
-            headerGenerator.generateHeader(sheet, headers.toArray(String[]::new), headerStyle);
-
-            List<ReportFlattener> flatterers = reports.stream().map(ReportFlattener::new).toList();
+            CellStyle headerStyle = cellStyleProvider.createHeaderCellStyle(workbook);
+            var styles = cellStyleProvider.createCellStyles(workbook);
 
 
-            while(true) {
-                boolean hasData = false;
-                boolean headerWritten = false;
-
-                var row = sheet.createRow(sheet.getLastRowNum() + 1);
-                int cellIdx = 1 /* 0 is the header column */;
-                for(ReportFlattener flattener : flatterers) {
-
-                    Cell cell = row.createCell(cellIdx);
-
-
-                    if(flattener.hasData(row.getRowNum())) {
-                        if(!headerWritten) {
-                            row.createCell(0).setCellValue(flattener.getHeader(row.getRowNum()));
-                            headerWritten = true;
-                        }
-                        cell.setCellValue(flattener.getCell(row.getRowNum()));
-                        hasData = true;
-                    }
-
-                    cellIdx++;
-                }
-
-                if(!hasData) break;
-            }
-
-            headerGenerator.fixWidth(sheet, headers.toArray(String[]::new));
+            fillSummarySheet(workbook, headerStyle, materialIds, nodeIds, userNodeIds, styles);
+            materialIds.forEach(id -> fillExcelSheet(workbook, headerStyle, id, nodeIds, userNodeIds, styles, includeAirfreight));
 
             // Return the Excel file as an InputStreamSource
             workbook.write(outputStream);
             return new ByteArrayResource(outputStream.toByteArray());
-        } catch (
-                IOException e) {
+        } catch (IOException e) {
             throw new RuntimeException("Failed to generate template", e);
         }
     }
 
-    private static class ReportFlattener {
+    private void fillSummarySheet(Workbook workbook, CellStyle headerStyle, List<Integer> materialIds, List<Integer> nodeIds, List<Integer> userNodeIds, Map<CellStyleProvider.TextFormat, Map<CellStyleProvider.PredefinedColors, CellStyle>> styles) {
+        Sheet sheet = workbook.createSheet("Summary");
 
-        private static final String SUPPLIER_NAME = "Supplier";
-        private static final String SUPPLIER_ADDRESS = "Address";
+        int row = 1;
 
-        private static final String DESTINATION_NAME = "Destination";
-        private static final String DESTINATION_ADDRESS = "Address";
-
-        private static final String DESTINATION_QUANTITY = "Annual quantity";
-        private static final String DESTINATION_HS_CODE = "HS code";
-        private static final String DESTINATION_TARIFF_RATE = "Tariff rate";
-        private static final String DESTINATION_OVERSHARE = "Oversea share";
-        private static final String DESTINATION_AIR_FREIGHT_SHARE = "Air freight share";
-        private static final String DESTINATION_TRANSPORT_TIME = "Transport time";
-        private static final String DESTINATION_SAFETY_STOCK = "Safety stock";
-
-        private static final String DESTINATION_WIDTH = "HU Width";
-        private static final String DESTINATION_HEIGHT = "HU Height";
-        private static final String DESTINATION_LENGTH = "HU Length";
-        private static final String DESTINATION_WEIGHT = "HU Weight";
-        private static final String DESTINATION_HU_UNIT_COUNT = "HU Unit count";
-
-        private static final String DESTINATION_WEIGHT_UNIT = "HU Weight unit";
-        private static final String DESTINATION_DIMENSION_UNIT = "HU Unit";
-
-        private static final String DESTINATION_CONTAINER_LAYER = "Container layers";
-        private static final String DESTINATION_CONTAINER_UNIT_COUNT = "Container unit count";
-        private static final String DESTINATION_CONTAINER_UTILIZATION = "Container utilization";
-        private static final String DESTINATION_CONTAINER_TYPE = "Container type";
-        private static final String DESTINATION_CONTAINER_WEIGHT_EXCEEDED = "Container weight exceeded";
-        private static final String DESTINATION_CONTAINER_RATE = "Container rate";
-        private static final String DESTINATION_MIXED = "Mixed";
-
-
-        private final ReportDTO report;
-        private final List<String> data = new ArrayList<>();
-        private final List<String> dataHeader = new ArrayList<>();
-
-        public ReportFlattener(ReportDTO report) {
-            this.report = report;
-            flatten();
+        for (Integer materialId : materialIds) {
+            for (var mapper : reportingService.getReport(materialId, nodeIds, userNodeIds).stream().map(report -> new SummaryMapper(report, styles)).toList()) {
+                mapper.map(sheet, row++);
+            }
         }
 
-        private void flatten() {
+        headerGenerator.generateHeader(sheet, ReportSummaryHeader.class, headerStyle);
+        headerGenerator.fixWidth(sheet, ReportSummaryHeader.class);
 
-            addData(SUPPLIER_NAME, report.getSupplier().getName());
-            addData(SUPPLIER_ADDRESS, report.getSupplier().getAddress());
+    }
 
-            // TODO: hardcoded (otherwise values wont match
-            report.getCost().keySet().forEach(costName -> addData(costName, report.getCost().get(costName)));
-            report.getRisk().keySet().forEach(riskName -> addData(riskName, report.getRisk().get(riskName)));
+    private void fillExcelSheet(Workbook workbook, CellStyle headerStyle, Integer materialId, List<Integer> nodeIds, List<Integer> userNodeIds, Map<CellStyleProvider.TextFormat, Map<CellStyleProvider.PredefinedColors, CellStyle>> styles, boolean includeAirfreight) {
+        var material = materialRepository.getById(materialId).orElseThrow();
+        var reports = reportingService.getReport(materialId, nodeIds, userNodeIds);
 
-            report.getDestinations().forEach(this::flattenDestination);
+        Sheet sheet = workbook.createSheet(material.getPartNumber());
+
+        ArrayList<String> headers = new ArrayList<>();
+        headers.add("");
+        headers.addAll(reports.stream().flatMap(report -> Stream.of(report.getSupplier().getName(), null)).toList());
+
+        headerGenerator.generateHeader(sheet, headers.toArray(String[]::new), headerStyle, true);
+        List<NodeDTO> destinations = collectDestinations(reports);
+
+        var row = 1;
+        var mapper = new ReportRowMapper(reports.stream().map(report -> new ReportMapper(report, destinations, styles, includeAirfreight)).toList(), destinations, styles, rowSequence, destinationRowSequence);
+
+        boolean finished = false;
+        while (!finished) {
+            finished = !mapper.map(sheet, row++);
         }
 
-        private void flattenDestination(ReportDestinationDTO destination) {
+        headerGenerator.fixWidth(sheet, headers.toArray(String[]::new), true);
 
-            var hasMainRun = destination.getSections().stream().anyMatch(s -> s.getTransportType().equals(TransportType.RAIL) || s.getTransportType().equals(TransportType.SEA));
+    }
 
-            addData(DESTINATION_NAME, destination.getDestination().getName());
-            addData(DESTINATION_ADDRESS, destination.getDestination().getAddress());
+    private List<NodeDTO> collectDestinations(List<ReportDTO> reports) {
+        Map<Integer, NodeDTO> destinations = new HashMap<>();
 
-            addData(DESTINATION_QUANTITY, destination.getAnnualQuantity().toString());
-            addData(DESTINATION_HS_CODE, destination.getHsCode());
-            addData(DESTINATION_TARIFF_RATE, destination.getTariffRate().toString());
-            addData(DESTINATION_OVERSHARE, destination.getOverseaShare().toString());
+        reports.forEach(r -> r.getDestinations().forEach(d -> {
+            if (!destinations.containsKey(d.getDestination().getId()))
+                destinations.put(d.getDestination().getId(), d.getDestination());
+        }));
 
-            if(destination.getAirFreightShare() != null)
-                addData(DESTINATION_AIR_FREIGHT_SHARE, destination.getAirFreightShare().toString());
-            addData(DESTINATION_TRANSPORT_TIME, destination.getTransportTime().toString());
-            addData(DESTINATION_SAFETY_STOCK, destination.getSafetyStock().toString());
+        return destinations.values().stream().toList();
+    }
 
-            addData(DESTINATION_WIDTH, destination.getWidth().toString());
-            addData(DESTINATION_HEIGHT, destination.getHeight().toString());
-            addData(DESTINATION_LENGTH, destination.getLength().toString());
-            addData(DESTINATION_DIMENSION_UNIT, destination.getDimensionUnit().toString());
-            addData(DESTINATION_WEIGHT, destination.getWeight().toString());
-            addData(DESTINATION_WEIGHT_UNIT, destination.getWeightUnit().toString());
-            addData(DESTINATION_HU_UNIT_COUNT, destination.getHuUnitCount().toString());
-            addData(DESTINATION_CONTAINER_LAYER, !hasMainRun ? "-" : destination.getLayer().toString());
+    private enum RowCaption {
+        SUPPLIER, ADDRESS, SUMMARY, SUMMARY_MEK_A, SUMMARY_LOGISTICS_COST, SUMMARY_MEK_B, WEIGHTED_COST_BREAKDOWN, BREAKDOWN_MEK_A, BREAKDOWN_TRANSPORT, BREAKDOWN_HANDLING, BREAKDOWN_STORAGE, BREAKDOWN_REPACKAGING, BREAKDOWN_DISPOSAL, BREAKDOWN_CAPITAL, BREAKDOWN_CUSTOM, BREAKDOWN_FCA_FEES, BREAKDOWN_TOTAL, FLUCTUATION, FLUCTUATION_CURRENT, FLUCTUATION_OPPORTUNITY, FLUCTUATION_RISK, ASSUMPTIONS, ASSUMPTIONS_MATERIAL, ASSUMPTIONS_PART_NUMBER, ASSUMPTIONS_HS_CODE, ASSUMPTIONS_TARIFF_RATE, ASSUMPTIONS_OVERSEA_SHARE, ASSUMPTIONS_AIR_FREIGHT_SHARE, ASSUMPTIONS_SAFETY_STOCK, HANDLING_UNIT, HANDLING_UNIT_LENGTH, HANDLING_UNIT_WIDTH, HANDLING_UNIT_HEIGHT, HANDLING_UNIT_DIMENSION_UNIT, HANDLING_UNIT_WEIGHT, HANDLING_UNIT_DIMENSION_WEIGHT, HANDLING_UNIT_PIECES, HANDLING_UNIT_MIXED, DESTINATION, DESTINATION_ROUTE, DESTINATION_ANNUAL_QUANTITY, DESTINATION_TRANSPORT_TIME, DESTINATION_CONTAINER, DESTINATION_CONTAINER_LAYER, DESTINATION_CONTAINER_UNIT_COUNT, DESTINATION_CONTAINER_TYPE, DESTINATION_CONTAINER_LIMIT, DESTINATION_GENERAL;
+    }
 
-            addData(DESTINATION_CONTAINER_UNIT_COUNT, !hasMainRun ? "-" : destination.getUnitCount().toString());
-            addData(DESTINATION_CONTAINER_UTILIZATION, !hasMainRun ? "-" : destination.getUtilization().toString());
-            addData(DESTINATION_CONTAINER_TYPE, !hasMainRun ? "-" : destination.getType().toString());
-            addData(DESTINATION_CONTAINER_WEIGHT_EXCEEDED, !hasMainRun ? "-" : destination.getWeightExceeded().toString());
-            addData(DESTINATION_CONTAINER_RATE, !hasMainRun ? "-" : destination.getRate().toString());
-            addData(DESTINATION_MIXED, !hasMainRun ? "-" : destination.getMixed().toString());
 
+    private enum RowType {
+        TITLE, SUB_TITLE, HEADER, SUB_HEADER, DATA, SPLIT_DATA
+    }
+
+    private record RowInfo(int rowIdx, RowCaption captionType, String caption, RowType type, boolean hideCaption) {
+    }
+
+    private record ReportRowMapper(List<ReportMapper> mapper, List<NodeDTO> destinations,
+                                   Map<CellStyleProvider.TextFormat, Map<CellStyleProvider.PredefinedColors, CellStyle>> styles,
+                                   Map<Integer, RowInfo> rowSequence, Map<Integer, RowInfo> destinationRowSequence) {
+
+
+        public boolean map(Sheet sheet, int rowIndex) {
+
+            RowInfo info = getRowInfo(rowIndex);
+            int destinationIdx = getDestinationIdx(rowIndex);
+
+            Row row = sheet.createRow(rowIndex);
+
+            Cell cell = row.createCell(0);
+
+            if (info.captionType == RowCaption.DESTINATION) {
+                cell.setCellValue(destinations.get(destinationIdx).getName());
+            } else {
+                cell.setCellValue(info.hideCaption() ? "" : info.caption());
+            }
+
+            cell.setCellStyle(getStyle(info));
+
+            int columnIdx = 1;
+            for (var curMapper : mapper) {
+                curMapper.map(sheet, row, rowIndex, columnIdx, info, destinationIdx);
+                columnIdx += 2;
+            }
+
+            return rowIndex < getLastIndex();
         }
 
-        private void addData(String header, String data) {
-            this.dataHeader.add(header);
-            this.data.add(data);
+        private int getLastIndex() {
+            return rowSequence.size() + (destinations.size() * destinationRowSequence.size()) - 1;
         }
 
-        private void addData(String header, ReportEntryDTO data) {
-            this.dataHeader.add(header);
-            this.data.add(data.getTotal().toString()); // + " (" + data.getPercentage().doubleValue()*100 + "%)");
+        private CellStyle getStyle(RowInfo info) {
+            return switch (info.type) {
+                case TITLE ->
+                        this.styles.get(CellStyleProvider.TextFormat.TEXT_ONLY).get(CellStyleProvider.PredefinedColors.TITLE);
+                case SUB_TITLE, DATA, SPLIT_DATA ->
+                        this.styles.get(CellStyleProvider.TextFormat.TEXT_ONLY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                case HEADER ->
+                        this.styles.get(CellStyleProvider.TextFormat.TEXT_ONLY).get(CellStyleProvider.PredefinedColors.HEADER);
+                case SUB_HEADER ->
+                        this.styles.get(CellStyleProvider.TextFormat.TEXT_ONLY).get(CellStyleProvider.PredefinedColors.SUB_HEADER);
+            };
         }
 
-        public String getCell(int rowIdx) {
-            return data.get(rowIdx);
+        private int getDestinationIdx(int rowIndex) {
+
+            if (rowIndex < rowSequence.size()) return -1;
+
+            return (rowIndex - rowSequence.size()) / destinationRowSequence.size();
         }
 
-        public String getHeader(int rowIdx) {
-            return dataHeader.get(rowIdx);
-        }
+        private RowInfo getRowInfo(int rowIndex) {
+            if (rowIndex < rowSequence.size()) return rowSequence.get(rowIndex);
 
-        public boolean hasData(int index) {
-            return data.size() > index;
+            return destinationRowSequence.get((rowIndex - rowSequence.size()) % destinationRowSequence.size());
         }
     }
 
+
+    private record ReportMapper(ReportDTO report, List<NodeDTO> destinations,
+                                Map<CellStyleProvider.TextFormat, Map<CellStyleProvider.PredefinedColors, CellStyle>> styles,
+                                boolean includeAirfreight) {
+
+        public void map(Sheet sheet, Row row, int rowIdx, int columnIdx, RowInfo info, int destinationIdx) {
+
+
+            boolean mergeCells = false;
+            CellStyle selectedStyle = null;
+
+            /* **********************************
+             * Cell 1
+             * **********************************/
+
+            Cell cell = row.createCell(columnIdx);
+
+            switch (info.type) {
+                case TITLE -> {
+                    cell.setCellValue(report.getSupplier().getName());
+                    selectedStyle = this.styles.get(CellStyleProvider.TextFormat.TEXT_ONLY).get(CellStyleProvider.PredefinedColors.TITLE);
+                    mergeCells = true;
+                }
+                case SUB_TITLE -> {
+                    cell.setCellValue(report.getSupplier().getAddress());
+                    selectedStyle = this.styles.get(CellStyleProvider.TextFormat.TEXT_ONLY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    mergeCells = true;
+                }
+                case HEADER -> {
+                    cell.setCellValue("");
+                    selectedStyle = this.styles.get(CellStyleProvider.TextFormat.TEXT_ONLY).get(CellStyleProvider.PredefinedColors.HEADER);
+                    mergeCells = true;
+                }
+                case SUB_HEADER -> {
+                    cell.setCellValue("");
+                    selectedStyle = this.styles.get(CellStyleProvider.TextFormat.TEXT_ONLY).get(CellStyleProvider.PredefinedColors.SUB_HEADER);
+                    mergeCells = true;
+                }
+                case DATA -> {
+                    selectedStyle = setCellValue(cell, info, destinationIdx, false);
+                    mergeCells = true;
+                }
+                case SPLIT_DATA -> {
+                    selectedStyle = setCellValue(cell, info, destinationIdx, false);
+                }
+
+            }
+
+            if (selectedStyle != null) {
+                cell.setCellStyle(selectedStyle);
+            }
+
+            /* **********************************
+             * Cell 2
+             * **********************************/
+
+            if (mergeCells) {
+                var merged = new CellRangeAddress(rowIdx, rowIdx, columnIdx, columnIdx + 1);
+
+                if (selectedStyle != null) {
+                    RegionUtil.setBorderBottom(selectedStyle.getBorderBottom(), merged, sheet);
+                    RegionUtil.setBorderTop(selectedStyle.getBorderTop(), merged, sheet);
+                    RegionUtil.setBorderLeft(selectedStyle.getBorderLeft(), merged, sheet);
+                    RegionUtil.setBorderRight(selectedStyle.getBorderRight(), merged, sheet);
+                    RegionUtil.setBottomBorderColor(selectedStyle.getBottomBorderColor(), merged, sheet);
+                    RegionUtil.setTopBorderColor(selectedStyle.getTopBorderColor(), merged, sheet);
+                    RegionUtil.setLeftBorderColor(selectedStyle.getLeftBorderColor(), merged, sheet);
+                    RegionUtil.setRightBorderColor(selectedStyle.getRightBorderColor(), merged, sheet);
+                }
+                sheet.addMergedRegion(merged);
+            } else {
+                Cell cell2nd = row.createCell(columnIdx + 1);
+                var selectedStyle2nCell = setCellValue(cell2nd, info, destinationIdx, true);
+                if (selectedStyle2nCell != null) {
+                    cell2nd.setCellStyle(selectedStyle2nCell);
+                }
+            }
+
+        }
+
+        private CellStyle setCellValue(Cell cell, RowInfo info, int destinationIdx, boolean secondColumn) {
+
+            CellStyle selectedStyle = null;
+
+            switch (info.captionType) {
+                case SUPPLIER -> {
+                    cell.setCellValue(report.getSupplier().getName());
+                }
+                case ADDRESS -> {
+                    cell.setCellValue(report.getSupplier().getAddress());
+                }
+                case SUMMARY, WEIGHTED_COST_BREAKDOWN, FLUCTUATION, ASSUMPTIONS, ASSUMPTIONS_MATERIAL, HANDLING_UNIT,
+                     DESTINATION, DESTINATION_CONTAINER, DESTINATION_GENERAL -> {
+                    cell.setCellValue("");
+                }
+                case SUMMARY_MEK_A -> {
+                    if (!secondColumn) {
+                        cell.setCellValue(report.getOverview().get("mek_a").getTotal().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.CURRENCY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    } else {
+                        cell.setCellValue(report.getOverview().get("mek_a").getPercentage().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.PERCENTAGE).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    }
+                }
+                case SUMMARY_LOGISTICS_COST -> {
+                    if (!secondColumn) {
+                        cell.setCellValue(report.getOverview().get("logistics").getTotal().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.CURRENCY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    } else {
+                        cell.setCellValue(report.getOverview().get("logistics").getPercentage().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.PERCENTAGE).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    }
+                }
+                case SUMMARY_MEK_B, FLUCTUATION_CURRENT -> {
+                    if (!secondColumn) {
+                        cell.setCellValue(report.getOverview().get("mek_b").getTotal().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.CURRENCY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    } else {
+                        cell.setCellValue(report.getOverview().get("mek_b").getPercentage().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.PERCENTAGE).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    }
+                }
+                case BREAKDOWN_MEK_A -> {
+                    if (!secondColumn) {
+                        cell.setCellValue(report.getCost().get("mek_a").getTotal().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.CURRENCY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    } else {
+                        cell.setCellValue(report.getCost().get("mek_a").getPercentage().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.PERCENTAGE).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    }
+                }
+                case BREAKDOWN_TRANSPORT -> {
+                    if (!secondColumn) {
+                        cell.setCellValue(report.getCost().get("transport").getTotal().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.CURRENCY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    } else {
+                        cell.setCellValue(report.getCost().get("transport").getPercentage().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.PERCENTAGE).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    }
+                }
+                case BREAKDOWN_HANDLING -> {
+                    if (!secondColumn) {
+                        cell.setCellValue(report.getCost().get("handling").getTotal().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.CURRENCY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    } else {
+                        cell.setCellValue(report.getCost().get("handling").getPercentage().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.PERCENTAGE).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    }
+                }
+                case BREAKDOWN_STORAGE -> {
+                    if (!secondColumn) {
+                        cell.setCellValue(report.getCost().get("storage").getTotal().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.CURRENCY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    } else {
+                        cell.setCellValue(report.getCost().get("storage").getPercentage().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.PERCENTAGE).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    }
+                }
+                case BREAKDOWN_REPACKAGING -> {
+                    if (!secondColumn) {
+                        cell.setCellValue(report.getCost().get("repacking").getTotal().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.CURRENCY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    } else {
+                        cell.setCellValue(report.getCost().get("repacking").getPercentage().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.PERCENTAGE).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    }
+                }
+                case BREAKDOWN_DISPOSAL -> {
+                    if (!secondColumn) {
+                        cell.setCellValue(report.getCost().get("disposal").getTotal().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.CURRENCY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    } else {
+                        cell.setCellValue(report.getCost().get("disposal").getPercentage().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.PERCENTAGE).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    }
+                }
+                case BREAKDOWN_CAPITAL -> {
+                    if (!secondColumn) {
+                        cell.setCellValue(report.getCost().get("capital").getTotal().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.CURRENCY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    } else {
+                        cell.setCellValue(report.getCost().get("capital").getPercentage().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.PERCENTAGE).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    }
+                }
+                case BREAKDOWN_CUSTOM -> {
+                    if (!secondColumn) {
+                        cell.setCellValue(report.getCost().get("custom").getTotal().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.CURRENCY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    } else {
+                        cell.setCellValue(report.getCost().get("custom").getPercentage().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.PERCENTAGE).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    }
+                }
+                case BREAKDOWN_FCA_FEES -> {
+                    if (!secondColumn) {
+                        cell.setCellValue(report.getCost().get("fca_fees").getTotal().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.CURRENCY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    } else {
+                        cell.setCellValue(report.getCost().get("fca_fees").getPercentage().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.PERCENTAGE).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    }
+                }
+                case BREAKDOWN_TOTAL -> {
+                    if (!secondColumn) {
+                        cell.setCellValue(report.getCost().get("total").getTotal().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.CURRENCY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    } else {
+                        cell.setCellValue(report.getCost().get("total").getPercentage().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.PERCENTAGE).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    }
+                }
+                case FLUCTUATION_OPPORTUNITY -> {
+                    if (!secondColumn) {
+                        cell.setCellValue(report.getOverview().get("opportunity_scenario").getTotal().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.CURRENCY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    } else {
+                        cell.setCellValue(report.getOverview().get("opportunity_scenario").getPercentage().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.PERCENTAGE).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    }
+                }
+                case FLUCTUATION_RISK -> {
+                    if (!secondColumn) {
+                        cell.setCellValue(report.getOverview().get("risk_scenario").getTotal().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.CURRENCY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    } else {
+                        cell.setCellValue(report.getOverview().get("risk_scenario").getPercentage().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.PERCENTAGE).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    }
+                }
+                case ASSUMPTIONS_PART_NUMBER -> {
+                    cell.setCellValue(report.getMaterial().getPartNumber());
+                    selectedStyle = this.styles.get(CellStyleProvider.TextFormat.TEXT_ONLY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                }
+                case ASSUMPTIONS_HS_CODE -> {
+                    cell.setCellValue(report.getPremises().getHsCode());
+                    selectedStyle = this.styles.get(CellStyleProvider.TextFormat.TEXT_ONLY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                }
+                case ASSUMPTIONS_TARIFF_RATE -> {
+                    cell.setCellValue(report.getPremises().getTariffRate().doubleValue());
+                    selectedStyle = this.styles.get(CellStyleProvider.TextFormat.PERCENTAGE).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                }
+                case ASSUMPTIONS_OVERSEA_SHARE -> {
+                    cell.setCellValue(report.getPremises().getOverseaShare().doubleValue());
+                    selectedStyle = this.styles.get(CellStyleProvider.TextFormat.PERCENTAGE).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                }
+                case ASSUMPTIONS_AIR_FREIGHT_SHARE -> {
+                    if (includeAirfreight) {
+                        cell.setCellValue(report.getPremises().getAirFreightShare().doubleValue());
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.PERCENTAGE).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+
+                    } else {
+                        cell.setCellValue("-");
+                        selectedStyle = this.styles.get(CellStyleProvider.TextFormat.TEXT_ONLY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                    }
+                }
+                case ASSUMPTIONS_SAFETY_STOCK -> {
+                    cell.setCellValue(report.getPremises().getSafetyStock().doubleValue());
+                    selectedStyle = this.styles.get(CellStyleProvider.TextFormat.TEXT_ONLY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                }
+                case HANDLING_UNIT_LENGTH -> {
+                    cell.setCellValue(report.getPremises().getLength());
+                    selectedStyle = this.styles.get(CellStyleProvider.TextFormat.TEXT_ONLY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                }
+                case HANDLING_UNIT_WIDTH -> {
+                    cell.setCellValue(report.getPremises().getWidth());
+                    selectedStyle = this.styles.get(CellStyleProvider.TextFormat.TEXT_ONLY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                }
+                case HANDLING_UNIT_HEIGHT -> {
+                    cell.setCellValue(report.getPremises().getHeight());
+                    selectedStyle = this.styles.get(CellStyleProvider.TextFormat.TEXT_ONLY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                }
+                case HANDLING_UNIT_DIMENSION_UNIT -> {
+                    cell.setCellValue(report.getPremises().getDimensionUnit().getDisplayedName());
+                    selectedStyle = this.styles.get(CellStyleProvider.TextFormat.TEXT_ONLY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                }
+                case HANDLING_UNIT_WEIGHT -> {
+                    cell.setCellValue(report.getPremises().getWeight());
+                    selectedStyle = this.styles.get(CellStyleProvider.TextFormat.TEXT_ONLY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                }
+                case HANDLING_UNIT_DIMENSION_WEIGHT -> {
+                    cell.setCellValue(report.getPremises().getWeightUnit().getDisplayedName());
+                    selectedStyle = this.styles.get(CellStyleProvider.TextFormat.TEXT_ONLY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                }
+                case HANDLING_UNIT_PIECES -> {
+                    cell.setCellValue(report.getPremises().getHuUnitCount());
+                    selectedStyle = this.styles.get(CellStyleProvider.TextFormat.TEXT_ONLY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                }
+                case HANDLING_UNIT_MIXED -> {
+                    cell.setCellValue(report.getPremises().getMixable() ? "Yes" : "No");
+                    selectedStyle = this.styles.get(CellStyleProvider.TextFormat.TEXT_ONLY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                }
+                case DESTINATION_ROUTE -> {
+                    var dest = getDestination(destinationIdx);
+
+                    if (dest == null) {
+                        cell.setCellValue("");
+                    } else {
+                        cell.setCellValue(getRoute(dest.getSections()));
+                    }
+                    selectedStyle = this.styles.get(CellStyleProvider.TextFormat.TEXT_ONLY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                }
+                case DESTINATION_ANNUAL_QUANTITY -> {
+                    var dest = getDestination(destinationIdx);
+
+                    if (dest == null) {
+                        cell.setCellValue("");
+                    } else {
+                        cell.setCellValue(dest.getAnnualQuantity());
+                    }
+                    selectedStyle = this.styles.get(CellStyleProvider.TextFormat.TEXT_ONLY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+
+                }
+                case DESTINATION_TRANSPORT_TIME -> {
+                    var dest = getDestination(destinationIdx);
+
+                    if (dest == null) {
+                        cell.setCellValue("");
+                    } else {
+                        cell.setCellValue(dest.getTransportTime());
+                    }
+                    selectedStyle = this.styles.get(CellStyleProvider.TextFormat.TEXT_ONLY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+                }
+                case DESTINATION_CONTAINER_LAYER -> {
+                    var dest = getDestination(destinationIdx);
+
+                    if (dest == null) {
+                        cell.setCellValue("");
+                    } else {
+                        cell.setCellValue(dest.getLayer());
+                    }
+                    selectedStyle = this.styles.get(CellStyleProvider.TextFormat.TEXT_ONLY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+
+                }
+                case DESTINATION_CONTAINER_UNIT_COUNT -> {
+                    var dest = getDestination(destinationIdx);
+
+                    if (dest == null) {
+                        cell.setCellValue("");
+                    } else {
+                        cell.setCellValue(dest.getUnitCount().intValue() * report.getPremises().getHuUnitCount());
+                    }
+                    selectedStyle = this.styles.get(CellStyleProvider.TextFormat.TEXT_ONLY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+
+                }
+                case DESTINATION_CONTAINER_TYPE -> {
+                    var dest = getDestination(destinationIdx);
+
+                    if (dest == null) {
+                        cell.setCellValue("");
+                    } else {
+                        cell.setCellValue(dest.getType().getDescription());
+                    }
+                    selectedStyle = this.styles.get(CellStyleProvider.TextFormat.TEXT_ONLY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+
+                }
+                case DESTINATION_CONTAINER_LIMIT -> {
+                    var dest = getDestination(destinationIdx);
+
+                    if (dest == null) {
+                        cell.setCellValue("");
+                    } else {
+                        cell.setCellValue(dest.getWeightExceeded() ? "Weight" : "Volume");
+                    }
+                    selectedStyle = this.styles.get(CellStyleProvider.TextFormat.TEXT_ONLY).get(CellStyleProvider.PredefinedColors.NEUTRAL);
+
+                }
+            }
+
+            return selectedStyle;
+        }
+
+        private String getRoute(List<ReportSectionDTO> sections) {
+
+            if (sections == null || sections.isEmpty())
+                return "";
+
+            var firstNode = sections.getFirst().getFromNode();
+
+            StringBuilder route = new StringBuilder(firstNode.getExternalMappingId() == null ? shortened(firstNode.getName()) : firstNode.getExternalMappingId());
+
+            sections.forEach(s -> {
+                route.append(" > ");
+                route.append(s.getToNode().getExternalMappingId());
+            });
+
+            return route.toString();
+        }
+
+        private String shortened(String name) {
+            if (name == null || name.length() < 10)
+                return name;
+
+            return name.substring(0, 7) + "...";
+        }
+
+        private ReportDestinationDTO getDestination(int destinationIdx) {
+            if (destinationIdx == -1 || destinations.size() <= destinationIdx)
+                return null;
+
+            var node = destinations.get(destinationIdx);
+
+            if (node == null) return null;
+
+            return report.getDestinations().stream().filter(d -> Objects.equals(d.getDestination().getId(), node.getId())).findFirst().orElse(null);
+
+        }
+
+    }
+
+    private record SummaryMapper(ReportDTO report,
+                                 Map<CellStyleProvider.TextFormat, Map<CellStyleProvider.PredefinedColors, CellStyle>> styles) {
+
+        public void map(Sheet sheet, int rowIdx) {
+            Row row = sheet.createRow(rowIdx);
+
+            createStringCell(row, ReportSummaryHeader.MATERIAL, report.getMaterial().getPartNumber());
+            createStringCell(row, ReportSummaryHeader.SUPPLIER, report.getSupplier().getName());
+
+            var currencyStyle = styles.get(CellStyleProvider.TextFormat.CURRENCY);
+            var percentStyle = styles.get(CellStyleProvider.TextFormat.PERCENTAGE);
+
+            createSplitCell(row, ReportSummaryHeader.MEK_A, report.getOverview().get("mek_a"), currencyStyle.get(CellStyleProvider.PredefinedColors.NEUTRAL), percentStyle.get(CellStyleProvider.PredefinedColors.NEUTRAL));
+            createSplitCell(row, ReportSummaryHeader.LOGISTICS_COST, report.getOverview().get("logistics"), currencyStyle.get(CellStyleProvider.PredefinedColors.LIGHT_BLUE_1), percentStyle.get(CellStyleProvider.PredefinedColors.LIGHT_BLUE_2));
+            createSplitCell(row, ReportSummaryHeader.MEK_B, report.getOverview().get("mek_b"), currencyStyle.get(CellStyleProvider.PredefinedColors.GREEN_1), percentStyle.get(CellStyleProvider.PredefinedColors.GREEN_2));
+
+            createNumberCell(row, ReportSummaryHeader.TRANSPORT, report.getCost().get("transport").getTotal(), currencyStyle.get(CellStyleProvider.PredefinedColors.NEUTRAL));
+            createNumberCell(row, ReportSummaryHeader.HANDLING, report.getCost().get("handling").getTotal(), currencyStyle.get(CellStyleProvider.PredefinedColors.NEUTRAL));
+            createNumberCell(row, ReportSummaryHeader.STORAGE, report.getCost().get("storage").getTotal(), currencyStyle.get(CellStyleProvider.PredefinedColors.NEUTRAL));
+            createNumberCell(row, ReportSummaryHeader.REPACKAGING, report.getCost().get("repacking").getTotal(), currencyStyle.get(CellStyleProvider.PredefinedColors.NEUTRAL));
+            createNumberCell(row, ReportSummaryHeader.DISPOSAL, report.getCost().get("disposal").getTotal(), currencyStyle.get(CellStyleProvider.PredefinedColors.NEUTRAL));
+            createNumberCell(row, ReportSummaryHeader.CAPITAL, report.getCost().get("capital").getTotal(), currencyStyle.get(CellStyleProvider.PredefinedColors.NEUTRAL));
+            createNumberCell(row, ReportSummaryHeader.CUSTOM, report.getCost().get("custom").getTotal(), currencyStyle.get(CellStyleProvider.PredefinedColors.NEUTRAL));
+            createNumberCell(row, ReportSummaryHeader.FCA_FEE, report.getCost().get("fca_fees").getTotal(), currencyStyle.get(CellStyleProvider.PredefinedColors.NEUTRAL));
+
+            if (report.getCost().containsKey("air_freight_cost"))
+                createNumberCell(row, ReportSummaryHeader.AIR_FREIGHT, report.getCost().get("air_freight_cost").getTotal(), currencyStyle.get(CellStyleProvider.PredefinedColors.NEUTRAL));
+            else createStringCell(row, ReportSummaryHeader.AIR_FREIGHT, "-");
+
+        }
+
+        private void createSplitCell(Row row, ReportSummaryHeader header, ReportEntryDTO value, CellStyle cellStyleHighlight1, CellStyle cellStyleHighlight2) {
+            Cell cell = row.createCell(header.getColumn());
+            cell.setCellValue(value.getTotal().doubleValue());
+            cell.setCellStyle(cellStyleHighlight1);
+
+            Cell percentageCell = row.createCell(header.getColumn() + 1);
+            percentageCell.setCellValue(value.getPercentage().doubleValue());
+            percentageCell.setCellStyle(cellStyleHighlight2);
+        }
+
+        private void createStringCell(Row row, ReportSummaryHeader header, String value) {
+            Cell cell = row.createCell(header.getColumn());
+            cell.setCellValue(value);
+        }
+
+        private void createNumberCell(Row row, ReportSummaryHeader header, Number value, CellStyle style) {
+            Cell cell = row.createCell(header.getColumn());
+            cell.setCellValue(value.doubleValue());
+            cell.setCellStyle(style);
+        }
+
+
+    }
 }
diff --git a/src/main/java/de/avatic/lcc/service/transformer/apps/AppTransformer.java b/src/main/java/de/avatic/lcc/service/transformer/apps/AppTransformer.java
index f5aef01..081f60b 100644
--- a/src/main/java/de/avatic/lcc/service/transformer/apps/AppTransformer.java
+++ b/src/main/java/de/avatic/lcc/service/transformer/apps/AppTransformer.java
@@ -14,7 +14,6 @@ public class AppTransformer {
 
         dto.setId(entity.getId());
         dto.setName(entity.getName());
-        dto.setClientSecret(entity.getClientSecret());
         dto.setClientId(entity.getClientId());
         dto.setGroups(entity.getGroups().stream().map(Group::getName).toList());
 
@@ -38,4 +37,26 @@ public class AppTransformer {
         group.setName(name);
         return group;
     }
+
+    public AppDTO toAppDTOWithHashedSecret(App entity) {
+        AppDTO dto = new AppDTO();
+
+        dto.setName(entity.getName());
+        dto.setClientSecret(entity.getClientSecret());
+        dto.setClientId(entity.getClientId());
+        dto.setGroups(entity.getGroups().stream().map(Group::getName).toList());
+
+        return dto;
+    }
+
+    public App toAppEntityWithHashedSecret(AppDTO dto) {
+        App entity = new App();
+
+        entity.setName(dto.getName());
+        entity.setClientSecret(dto.getClientSecret());
+        entity.setClientId(dto.getClientId());
+        entity.setGroups(dto.getGroups().stream().map(this::fromGroupDTO).toList());
+
+        return entity;
+    }
 }
diff --git a/src/main/java/de/avatic/lcc/service/transformer/premise/PremiseTransformer.java b/src/main/java/de/avatic/lcc/service/transformer/premise/PremiseTransformer.java
index 1e8211e..0d21918 100644
--- a/src/main/java/de/avatic/lcc/service/transformer/premise/PremiseTransformer.java
+++ b/src/main/java/de/avatic/lcc/service/transformer/premise/PremiseTransformer.java
@@ -10,6 +10,7 @@ import de.avatic.lcc.model.db.premises.Premise;
 import de.avatic.lcc.model.db.premises.PremiseListEntry;
 import de.avatic.lcc.repositories.MaterialRepository;
 import de.avatic.lcc.repositories.NodeRepository;
+import de.avatic.lcc.repositories.calculation.CalculationJobRepository;
 import de.avatic.lcc.repositories.country.CountryRepository;
 import de.avatic.lcc.repositories.premise.DestinationRepository;
 import de.avatic.lcc.repositories.users.UserNodeRepository;
@@ -36,8 +37,9 @@ public class PremiseTransformer {
     private final UserNodeRepository userNodeRepository;
     private final DestinationRepository destinationRepository;
     private final DestinationTransformer destinationTransformer;
+    private final CalculationJobRepository calculationJobRepository;
 
-    public PremiseTransformer(MaterialTransformer materialTransformer, UserRepository userRepository, CountryRepository countryRepository, CountryTransformer countryTransformer, NodeTransformer nodeTransformer, MaterialRepository materialRepository, DimensionTransformer dimensionTransformer, NodeRepository nodeRepository, UserNodeRepository userNodeRepository, DestinationRepository destinationRepository, DestinationTransformer destinationTransformer) {
+    public PremiseTransformer(MaterialTransformer materialTransformer, UserRepository userRepository, CountryRepository countryRepository, CountryTransformer countryTransformer, NodeTransformer nodeTransformer, MaterialRepository materialRepository, DimensionTransformer dimensionTransformer, NodeRepository nodeRepository, UserNodeRepository userNodeRepository, DestinationRepository destinationRepository, DestinationTransformer destinationTransformer, CalculationJobRepository calculationJobRepository) {
         this.materialTransformer = materialTransformer;
         this.userRepository = userRepository;
         this.countryRepository = countryRepository;
@@ -49,6 +51,7 @@ public class PremiseTransformer {
         this.userNodeRepository = userNodeRepository;
         this.destinationRepository = destinationRepository;
         this.destinationTransformer = destinationTransformer;
+        this.calculationJobRepository = calculationJobRepository;
     }
 
     public PremiseDTO toPremiseDTOWithUserInfo(PremiseListEntry entity) {
@@ -77,6 +80,9 @@ public class PremiseTransformer {
 
         PremiseDTO dto = new PremiseDTO();
 
+        dto.setCreatedAt(entity.getCreatedAt());
+        dto.setCalculationStatus(calculationJobRepository.getLastStateFor(entity.getId()));
+
         dto.setId(entity.getId());
         dto.setState(entity.getState());
         dto.setMaterial(materialTransformer.toMaterialDTO(entity.getMaterial()));
diff --git a/src/main/java/de/avatic/lcc/service/transformer/report/ReportTransformer.java b/src/main/java/de/avatic/lcc/service/transformer/report/ReportTransformer.java
index 210f2a1..1837917 100644
--- a/src/main/java/de/avatic/lcc/service/transformer/report/ReportTransformer.java
+++ b/src/main/java/de/avatic/lcc/service/transformer/report/ReportTransformer.java
@@ -2,10 +2,7 @@ package de.avatic.lcc.service.transformer.report;
 
 import de.avatic.lcc.dto.generic.NodeType;
 import de.avatic.lcc.dto.generic.RateType;
-import de.avatic.lcc.dto.report.ReportDTO;
-import de.avatic.lcc.dto.report.ReportDestinationDTO;
-import de.avatic.lcc.dto.report.ReportEntryDTO;
-import de.avatic.lcc.dto.report.ReportSectionDTO;
+import de.avatic.lcc.dto.report.*;
 import de.avatic.lcc.model.db.calculations.CalculationJob;
 import de.avatic.lcc.model.db.calculations.CalculationJobDestination;
 import de.avatic.lcc.model.db.calculations.CalculationJobRouteSection;
@@ -67,23 +64,18 @@ public class ReportTransformer {
 
     public ReportDTO toReportDTO(CalculationJob job) {
 
-        ReportDTO reportDTO = new ReportDTO();
-
-        var reportingProperty = propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.REPORTING).orElseThrow();
-        boolean includeAirfreight = reportingProperty.getCurrentValue().equals("MEK_C");
 
+        /*
+         * STEP 1: Fetch all infos.
+         */
         List<CalculationJobDestination> destinations = calculationJobDestinationRepository.getDestinationsByJobId(job.getId());
         Map<Integer, List<CalculationJobRouteSection>> sections = calculationJobRouteSectionRepository.getRouteSectionsByDestinationIds(destinations.stream().map(CalculationJobDestination::getId).toList());
 
+        var reportingProperty = propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.REPORTING).orElseThrow();
+        boolean includeAirfreight = reportingProperty.getCurrentValue().equals("MEK_C");
         var weightedTotalCost = getWeightedTotalCosts(sections);
 
         Premise premise = premiseRepository.getPremiseById(job.getPremiseId()).orElseThrow();
-        reportDTO.setMaterial(materialTransformer.toMaterialDTO(materialRepository.getByIdIncludeDeprecated(premise.getMaterialId()).orElseThrow()));
-
-        var period = getPeriod(job);
-
-        reportDTO.setStartDate(period.startDate);
-        reportDTO.setEndDate(period.endDate);
 
         Node sourceNode = null;
 
@@ -93,10 +85,29 @@ public class ReportTransformer {
         if (premise.getUserSupplierNodeId() != null)
             sourceNode = userNodeRepository.getById(premise.getUserSupplierNodeId()).orElseThrow();
 
+        /*
+         * STEP 2: Create report DTO.
+         */
+
+        ReportDTO reportDTO = new ReportDTO();
+
+        reportDTO.setMaterial(materialTransformer.toMaterialDTO(materialRepository.getByIdIncludeDeprecated(premise.getMaterialId()).orElseThrow()));
+
+        var period = getPeriod(job);
+
+        reportDTO.setStartDate(period.startDate);
+        reportDTO.setEndDate(period.endDate);
+
+        reportDTO.setPremises(getPremisesDTO(job, premise, destinations, includeAirfreight));
+
 
         if (!destinations.isEmpty()) {
-            reportDTO.setCost(getCostMap(job, destinations, weightedTotalCost, includeAirfreight));
-            reportDTO.setRisk(getRisk(job, destinations, weightedTotalCost, includeAirfreight));
+            var costs = getCostMap(job, destinations, weightedTotalCost, includeAirfreight);
+            reportDTO.setCost(costs);
+
+            /* costs.total contains all logistic costs */
+            reportDTO.setOverview(getOverview(job, destinations, weightedTotalCost, includeAirfreight, costs));
+
             Node finalSourceNode = sourceNode;
             reportDTO.setDestination(destinations.stream().map(d -> getDestinationDTO(d, sections.get(d.getId()), premise, finalSourceNode, includeAirfreight)).toList());
         } else {
@@ -160,12 +171,42 @@ public class ReportTransformer {
         return new WeightedTotalCosts(totalPreRunCost, totalMainRunCost, totalPostRunCost, totalD2D, totalCost);
     }
 
-    private ReportDestinationDTO getDestinationDTO(CalculationJobDestination destination, List<CalculationJobRouteSection> sections, Premise premise, Node sourceNode, boolean includeAirfreight) {
-        var destinationNode = nodeRepository.getByDestinationId(destination.getPremiseDestinationId()).orElseThrow();
+    private ReportPremisesDTO getPremisesDTO(CalculationJob job, Premise premise, List<CalculationJobDestination> destinations, boolean includeAirfreight) {
+        ReportPremisesDTO premisesDTO = new ReportPremisesDTO();
+
+        var destination = destinations.getFirst();
 
         var dimensionUnit = premise.getHuDisplayedDimensionUnit();
         var weightUnit = premise.getHuDisplayedWeightUnit();
 
+        premisesDTO.setDimensionUnit(dimensionUnit);
+        premisesDTO.setWeightUnit(weightUnit);
+        premisesDTO.setHeight(dimensionUnit.convertFromMM(premise.getIndividualHuHeight()));
+        premisesDTO.setWidth(dimensionUnit.convertFromMM(premise.getIndividualHuWidth()));
+        premisesDTO.setLength(dimensionUnit.convertFromMM(premise.getIndividualHuLength()));
+        premisesDTO.setWeight(weightUnit.convertFromG(premise.getIndividualHuWeight()));
+        premisesDTO.setHuUnitCount(premise.getHuUnitCount());
+
+        premisesDTO.setHsCode(premise.getHsCode());
+        premisesDTO.setTariffRate(premise.getTariffRate());
+
+        if (includeAirfreight)
+            premisesDTO.setAirFreightShare(destination.getAirFreightShare().doubleValue());
+
+        premisesDTO.setOverseaShare(premise.getOverseaShare());
+
+        premisesDTO.setSafetyStock(destination.getSafetyStockInDays().intValue());
+
+        premisesDTO.setMixable(premise.getHuMixable());
+
+        return premisesDTO;
+    }
+
+    private ReportDestinationDTO getDestinationDTO(CalculationJobDestination destination, List<CalculationJobRouteSection> sections, Premise premise, Node sourceNode, boolean includeAirfreight) {
+        var destinationNode = nodeRepository.getByDestinationId(destination.getPremiseDestinationId()).orElseThrow();
+
+
+
         ReportDestinationDTO destinationDTO = new ReportDestinationDTO();
         destinationDTO.setSections(sections.stream().map(s -> getSection(s, sourceNode, destinationNode, premise)).toList());
 
@@ -182,35 +223,19 @@ public class ReportTransformer {
 
         destinationDTO.setDestination(nodeTransformer.toNodeDTO(destinationNode));
 
-        destinationDTO.setDimensionUnit(dimensionUnit);
-        destinationDTO.setWeightUnit(weightUnit);
-        destinationDTO.setHeight(dimensionUnit.convertFromMM(premise.getIndividualHuHeight()));
-        destinationDTO.setWidth(dimensionUnit.convertFromMM(premise.getIndividualHuWidth()));
-        destinationDTO.setLength(dimensionUnit.convertFromMM(premise.getIndividualHuLength()));
-        destinationDTO.setWeight(weightUnit.convertFromG(premise.getIndividualHuWeight()));
-        destinationDTO.setHuUnitCount(premise.getHuUnitCount());
-
         CalculationJobRouteSection mainRun = sections.stream().filter(CalculationJobRouteSection::getMainRun).findFirst().orElse(null);
 
         destinationDTO.setLayer(destination.getLayerCount());
 
-        destinationDTO.setOverseaShare(premise.getOverseaShare().doubleValue());
-        destinationDTO.setSafetyStock(destination.getSafetyStockInDays().intValue());
         destinationDTO.setTransportTime(destination.getTotalTransitTime().doubleValue());
 
-        if (includeAirfreight)
-            destinationDTO.setAirFreightShare(destination.getAirFreightShare().doubleValue());
-
-
-        destinationDTO.setMixed(premise.getHuMixable());
         destinationDTO.setRate(mainRun == null ? 0 : mainRun.getRate());
         destinationDTO.setType(destination.getContainerType());
         destinationDTO.setUtilization(destination.getContainerUtilization());
         destinationDTO.setUnitCount(destination.getHuCount());
         destinationDTO.setWeightExceeded(destination.getTransportWeightExceeded());
 
-        destinationDTO.setHsCode(premise.getHsCode());
-        destinationDTO.setTariffRate(destination.getTariffRate());
+
 
         return destinationDTO;
     }
@@ -247,7 +272,7 @@ public class ReportTransformer {
         return sectionDTO;
     }
 
-    private Map<String, ReportEntryDTO> getRisk(CalculationJob job, List<CalculationJobDestination> destination, WeightedTotalCosts weightedTotalCost, boolean includeAirfreight) {
+    private Map<String, ReportEntryDTO> getOverview(CalculationJob job, List<CalculationJobDestination> destination, WeightedTotalCosts weightedTotalCost, boolean includeAirfreight, Map<String, ReportEntryDTO> weightedCostBreakDown) {
         Map<String, ReportEntryDTO> risk = new HashMap<>();
 
         var annualAmount = destination.stream().map(CalculationJobDestination::getAnnualAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -261,6 +286,18 @@ public class ReportTransformer {
 
         totalValue = totalValue.add(airfreightValue.multiply(BigDecimal.valueOf(includeAirfreight ? 1 : 0)));
 
+        var totalLogistics = getTotalLogistics(weightedCostBreakDown);
+
+        ReportEntryDTO mekA = new ReportEntryDTO();
+        mekA.setTotal(weightedCostBreakDown.get("mek_a").getTotal());
+        mekA.setPercentage(weightedCostBreakDown.get("mek_a").getTotal().doubleValue() / (totalValue.doubleValue()));
+        risk.put("mek_a", mekA);
+
+        ReportEntryDTO logistics = new ReportEntryDTO();
+        logistics.setTotal(totalLogistics);
+        logistics.setPercentage(totalLogistics / (totalValue.doubleValue()));
+        risk.put("logistics", logistics);
+
         ReportEntryDTO total = new ReportEntryDTO();
         total.setTotal(totalValue);
         total.setPercentage(totalValue.divide(totalValue, 4, RoundingMode.HALF_UP));
@@ -279,6 +316,11 @@ public class ReportTransformer {
         return risk;
     }
 
+    private Double getTotalLogistics(Map<String, ReportEntryDTO> weightedCostBreakDown) {
+        return weightedCostBreakDown.get("total").getTotal().doubleValue() - weightedCostBreakDown.get("mek_a").getTotal().doubleValue();
+
+    }
+
     private Map<String, ReportEntryDTO> getCostMap(CalculationJob job, List<CalculationJobDestination> destination, WeightedTotalCosts weightedTotalCost, boolean includeAirfreight) {
         Map<String, ReportEntryDTO> cost = new HashMap<>();
 
@@ -287,7 +329,7 @@ public class ReportTransformer {
         var airfreightValue = destination.stream().map(CalculationJobDestination::getAnnualAirFreightCost).reduce(BigDecimal.ZERO, BigDecimal::add).divide(annualAmount, 4, RoundingMode.HALF_UP);
 
         var materialValue = destination.stream().map(CalculationJobDestination::getMaterialCost).reduce(BigDecimal.ZERO, BigDecimal::add).divide(BigDecimal.valueOf(destination.size()), 4, RoundingMode.HALF_UP);
-        var fcaFeesValues = destination.stream().map(CalculationJobDestination::getFcaCost).reduce(BigDecimal.ZERO, BigDecimal::add);
+        var fcaFeesValues = destination.stream().map(CalculationJobDestination::getFcaCost).reduce(BigDecimal.ZERO, BigDecimal::add).divide(BigDecimal.valueOf(destination.size()), 4, RoundingMode.HALF_UP);
         var repackingValues = annualAmount.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : destination.stream().map(CalculationJobDestination::getAnnualRepackingCost).reduce(BigDecimal.ZERO, BigDecimal::add).divide(annualAmount, 4, RoundingMode.HALF_UP);
         var handlingValues = annualAmount.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : destination.stream().map(CalculationJobDestination::getAnnualHandlingCost).reduce(BigDecimal.ZERO, BigDecimal::add).divide(annualAmount, 4, RoundingMode.HALF_UP);
         var storageValues = annualAmount.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : destination.stream().map(CalculationJobDestination::getAnnualStorageCost).reduce(BigDecimal.ZERO, BigDecimal::add).divide(annualAmount, 4, RoundingMode.HALF_UP);
diff --git a/src/main/java/de/avatic/lcc/util/exception/internalerror/PremiseValidationError.java b/src/main/java/de/avatic/lcc/util/exception/internalerror/PremiseValidationError.java
index b8ff029..4d52582 100644
--- a/src/main/java/de/avatic/lcc/util/exception/internalerror/PremiseValidationError.java
+++ b/src/main/java/de/avatic/lcc/util/exception/internalerror/PremiseValidationError.java
@@ -4,6 +4,10 @@ import de.avatic.lcc.util.exception.base.InternalErrorException;
 
 public class PremiseValidationError extends InternalErrorException {
 
+    public PremiseValidationError(String message, String supplierName, String partNumber, boolean showCalcInfo) {
+        super("Calculation data validation failed.", showCalcInfo ? String.format("%s (Part number: %s - %s)" , message, partNumber, supplierName) : message);
+    }
+
     public PremiseValidationError(String message) {
         super("Calculation data validation failed.", message);
     }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 4db8dab..9944606 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -35,4 +35,10 @@ lcc.auth.claim.lastname=family_name
 lcc.auth.claim.ignore.workday=false
 
 # Bulk Import
-lcc.bulk.sheet_password=secretSheet?!
\ No newline at end of file
+lcc.bulk.sheet_password=secretSheet?!
+
+# Calculation Job Processor Configuration
+calculation.job.processor.enabled=true
+calculation.job.processor.pool-size=1
+calculation.job.processor.delay=5000
+calculation.job.processor.thread-name-prefix=calc-job-
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V11__Schedule_Priority.sql b/src/main/resources/db/migration/V11__Schedule_Priority.sql
new file mode 100644
index 0000000..20945fa
--- /dev/null
+++ b/src/main/resources/db/migration/V11__Schedule_Priority.sql
@@ -0,0 +1,20 @@
+ALTER TABLE calculation_job
+    ADD COLUMN retries  INT         NOT NULL DEFAULT 0,
+    ADD COLUMN priority VARCHAR(10) NOT NULL DEFAULT 'MEDIUM'
+        CHECK (priority IN ('LOW', 'MEDIUM', 'HIGH'));
+
+ALTER TABLE calculation_job
+    ADD INDEX idx_priority (priority);
+
+ALTER TABLE distance_matrix
+    ADD COLUMN retries INT NOT NULL DEFAULT 0,
+    DROP CONSTRAINT chk_distance_matrix_state,
+    ADD CONSTRAINT chk_distance_matrix_state CHECK (`state` IN ('VALID', 'STALE', 'EXCEPTION'));
+
+
+ALTER TABLE premise_destination
+    ADD COLUMN distance_d2d DECIMAL(15, 2) DEFAULT NULL COMMENT 'travel distance between the two nodes in meters';
+
+ALTER TABLE premise_route_section
+    ADD COLUMN distance DECIMAL(15, 2) DEFAULT NULL COMMENT 'travel distance between the two nodes in meters';
+
diff --git a/src/main/resources/db/migration/V12__Packaging_Properties.sql b/src/main/resources/db/migration/V12__Packaging_Properties.sql
new file mode 100644
index 0000000..24630be
--- /dev/null
+++ b/src/main/resources/db/migration/V12__Packaging_Properties.sql
@@ -0,0 +1,8 @@
+INSERT INTO packaging_property_type (name, external_mapping_id, data_type, validation_rule, is_required, description, property_group, sequence_number)
+VALUES
+    ('Stackable', 'STACKABLE', 'BOOLEAN', NULL, FALSE, 'desc', 'general', 1),
+    ('Rust Prevention', 'RUST_PREVENTION', 'BOOLEAN', NULL, FALSE, 'desc', 'general', 2),
+    ('Mixable', 'MIXABLE', 'BOOLEAN', NULL, FALSE, 'desc', 'general', 3)
+ON DUPLICATE KEY UPDATE
+                     name = VALUES(name),
+                     data_type = VALUES(data_type);
\ No newline at end of file
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
index a122343..47c35f3 100644
--- a/src/main/resources/schema.sql
+++ b/src/main/resources/schema.sql
@@ -106,9 +106,9 @@ CREATE TABLE IF NOT EXISTS `sys_user`
 -- Group definitions
 CREATE TABLE IF NOT EXISTS `sys_group`
 (
-    `id`                INT          NOT NULL AUTO_INCREMENT PRIMARY KEY,
-    `group_name`        VARCHAR(64)  NOT NULL,
-    `group_description` TEXT NOT NULL,
+    `id`                INT         NOT NULL AUTO_INCREMENT PRIMARY KEY,
+    `group_name`        VARCHAR(64) NOT NULL,
+    `group_description` TEXT        NOT NULL,
     UNIQUE KEY `idx_group_name` (`group_name`)
 ) COMMENT 'Defines user groups for access management';
 
@@ -433,6 +433,7 @@ CREATE TABLE IF NOT EXISTS premise_destination
     is_d2d              BOOLEAN        DEFAULT FALSE,
     rate_d2d            DECIMAL(15, 2) DEFAULT NULL CHECK (rate_d2d >= 0),
     lead_time_d2d       INT UNSIGNED   DEFAULT NULL CHECK (lead_time_d2d >= 0),
+    distance_d2d        DECIMAL(15, 2) DEFAULT NULL,
     repacking_cost      DECIMAL(15, 2) DEFAULT NULL CHECK (repacking_cost >= 0),
     handling_cost       DECIMAL(15, 2) DEFAULT NULL CHECK (handling_cost >= 0),
     disposal_cost       DECIMAL(15, 2) DEFAULT NULL CHECK (disposal_cost >= 0),
@@ -496,6 +497,7 @@ CREATE TABLE IF NOT EXISTS premise_route_section
     is_main_run        BOOLEAN DEFAULT FALSE,
     is_post_run        BOOLEAN DEFAULT FALSE,
     is_outdated        BOOLEAN DEFAULT FALSE,
+    distance          DECIMAL(15, 2) DEFAULT NULL COMMENT 'travel distance between the two nodes in meters',
     CONSTRAINT fk_premise_route_section_premise_route_id FOREIGN KEY (premise_route_id) REFERENCES premise_route (id),
     FOREIGN KEY (from_route_node_id) REFERENCES premise_route_node (id),
     FOREIGN KEY (to_route_node_id) REFERENCES premise_route_node (id),
@@ -518,6 +520,8 @@ CREATE TABLE IF NOT EXISTS calculation_job
                                                  ('CREATED', 'SCHEDULED', 'VALID', 'INVALID', 'EXCEPTION')),
     error_id           INT                DEFAULT NULL,
     user_id            INT       NOT NULL,
+    retries            INT       NOT NULL DEFAULT 0,
+    priority           VARCHAR(10) NOT NULL DEFAULT 'MEDIUM' CHECK (priority IN ('LOW', 'MEDIUM', 'HIGH')),
     FOREIGN KEY (premise_id) REFERENCES premise (id),
     FOREIGN KEY (validity_period_id) REFERENCES validity_period (id),
     FOREIGN KEY (property_set_id) REFERENCES property_set (id),
@@ -526,7 +530,6 @@ CREATE TABLE IF NOT EXISTS calculation_job
     INDEX idx_validity_period_id (validity_period_id),
     INDEX idx_property_set_id (property_set_id),
     INDEX idx_user_id (user_id)
-
 );
 
 
diff --git a/src/main/resources/static/help/assistant.md b/src/main/resources/static/help/assistant.md
new file mode 100644
index 0000000..08d366c
--- /dev/null
+++ b/src/main/resources/static/help/assistant.md
@@ -0,0 +1,113 @@
+
+> The logistics cost calculation tool lets you create cost calculations for combinations of supplier and part number. You can set up several supplier/part number combos at once. The assistant helps you import part numbers, assign existing suppliers, add new suppliers, and then automatically generates all the calculations you need.
+
+### Step 1: Start the Assistant for a New Calculation
+
+In the main view of the logistics cost calculation tool, open the assistant by clicking the **“New Calculation”** button.
+
+![Screenshot 1](images/image1.jpg)
+
+### Step 2: Paste Part Numbers from Text
+
+When you start the assistant, a window pops up where you can paste your part numbers. Just copy the relevant part numbers from a text, like an email, and drop them into the input field.
+
+![Screenshot 2](images/image2.jpg)
+
+### Step 3: Analyze the Text and Detect Part Numbers
+
+Click **“Analyse Input”** in the assistant so the tool can scan the pasted text for part numbers and pull them out.
+
+![Screenshot 3](images/image3.jpg)
+
+All detected part numbers will then be listed in the assistant, ready for the next steps.
+
+### Step 4: Reset Detected Part Numbers Input Step
+
+If you spot a mistake or want to start over with different part numbers, click **“Drop Part Numbers”** at the top of the assistant. This will remove all currently detected part numbers and reset the input step.
+
+![Screenshot 4](images/image4.jpg)
+
+![Screenshot 5](images/image5.jpg)
+
+You can then paste in new or corrected part numbers if needed.
+
+### Step 5: Enter Part Numbers Manually and Analyze Again
+
+You can also type in part numbers yourself. Enter the part numbers into the text field, separated by any delimiter you like (such as comma, semicolon, space, or line break).
+Then click **“Analyse Input”** again so the tool can detect and extract the part numbers you entered.
+
+![Screenshot 6](images/image6.jpg)
+
+The assistant will show the successfully recognized part numbers. The tool will also try to suggest matching suppliers if calculations have been made for certain part numbers and suppliers before. These will appear below the part numbers.
+
+### Step 6: Remove Supplier and Part Number Entries
+
+If you want to remove a supplier from your current selection, click the trash can icon next to that supplier.
+
+![Screenshot 7](images/image7.jpg)
+
+You can remove a single part number from the list the same way.
+
+![Screenshot 8](images/image8.jpg)
+
+This lets you tidy up any unnecessary combinations before creating your calculations.
+
+### Step 7: Search for and Add Existing Suppliers
+
+To add another supplier to one or more part numbers, use the search box in the assistant.
+
+![Screenshot 9](images/image9.jpg)
+
+Enter the name of the supplier you want, pick them from the results list, and click **“Bietvorschlag”** to add them.
+
+![Screenshot 10](images/image10.jpg)
+
+![Screenshot 11](images/image11.jpg)
+
+The supplier will then be assigned to the selected part numbers.
+
+### Step 8: Create a New Supplier
+
+If you don’t find the supplier you’re looking for, you can add a new one by clicking the **“Create New Supplier”** button.
+
+![Screenshot 12](images/image12.jpg)
+
+![Screenshot 13](images/image13.jpg)
+
+In the dialog that opens, type in the new supplier’s name and then enter their address.
+
+![Screenshot 14](images/image14.jpg)
+
+For example, you can enter the street, house number, zip code, and city (like “Bozener Straße, Ludwigshafen”). Click **“Check Address”** afterward so the tool can check and, if needed, correct the address.
+
+![Screenshot 15](images/image15.jpg)
+
+A map will be shown so you can confirm the address was correctly recognized.
+
+![Screenshot 16](images/image16.jpg)
+
+Once all details are correct, click the **“Create”** button to add the new supplier and insert them directly into your current form.
+
+![Screenshot 17](images/image17.jpg)
+
+### Step 9: Review the Number of Calculations to be Created
+
+After you’ve assigned all relevant part numbers and suppliers, the tool will show you at the bottom how many calculations will be created from the available combinations.
+Each unique pairing of a part number and supplier results in its own logistics calculation.
+
+### Step 10: Set Up Data Transfer from Existing Calculations
+
+At the end of the assistant, there’s a checkbox that lets you choose whether to pull in data from already existing calculations:
+
+* If the box is checked, the tool will try to import any available calculation data and pre-fill the new calculations, saving you manual entry later.
+* If you leave it unchecked, the new calculations will be created from scratch, without any pre-filled info.
+
+![Screenshot 18](images/image18.jpg)
+
+### Step 11: Generate Calculations
+
+Finally, click the **“Create”** button to set up all calculations for your selected combinations of part numbers and suppliers.
+
+![Screenshot 19](images/image19.jpg)
+
+Your new logistics calculations will now be available in the system for further editing.
\ No newline at end of file
diff --git a/src/main/resources/static/help/dashboard.md b/src/main/resources/static/help/dashboard.md
new file mode 100644
index 0000000..f1732da
--- /dev/null
+++ b/src/main/resources/static/help/dashboard.md
@@ -0,0 +1,116 @@
+
+> This document explains how the personal dashboard in the Logistics Cost Calculation Tool is set up, how to use filters, selection features, and the different actions available for one or multiple calculations.
+
+### Step 1: Opening the Dashboard
+
+When you start the Logistics Cost Calculation Tool, your personal dashboard opens automatically. You can also get to the dashboard anytime by clicking **“My Calculations”** at the top of the main menu.
+
+![Screenshot 1](images/image1.jpg)
+
+### Step 2: Understanding the Dashboard Layout
+
+The dashboard is divided into two main sections:  
+The **top section** displays stats about your calculations. The **bottom section** is a table listing all your calculations and drafts.
+
+In the stats area, you can quickly see:
+- how many calculations you’ve already completed,
+- how many are currently in draft mode,
+- how many have been put in the queue and are waiting to run,
+- and how many of those queued calculations have failed.
+
+As soon as a calculation finishes successfully, it gets added to the **“Completed”** count in the stats section.
+
+### Step 3: Filtering the Calculations Table
+
+The lower part of the dashboard shows a table with all your calculations. There’s a search bar above the table so you can filter the list.
+
+![Screenshot 2](images/image2.jpg)
+
+You can use this search bar to filter by **supplier** or **part number**. The table updates automatically as you type.
+
+There’s also a status dropdown to choose which calculations you want to see. For example, you can filter to show only **completed** calculations.
+
+![Screenshot 3](images/image3.jpg)
+![Screenshot 5](images/image4.jpg)
+
+### Step 4: Navigating the Table
+
+At the bottom of the table, you’ll find controls for **page navigation** so you can flip through multiple pages of calculations.
+
+![Screenshot 6](images/image5.jpg)
+![Screenshot 7](images/image6.jpg)
+
+### Step 5: Selecting One or Multiple Calculations
+
+In the first column of the table, there are **checkboxes** so you can select one or more calculations.
+
+![Screenshot 8](images/image7.jpg)
+![Screenshot 9](images/image8.jpg)
+
+You can even select calculations across different pages—the selection is **persistent** as you move from page to page.
+
+![Screenshot 10](images/image9.jpg)
+![Screenshot 12](images/image10.jpg)
+
+Once you’ve selected at least one calculation, a **toolbar** pops up at the bottom of the screen. It shows how many calculations you’ve picked and gives you buttons for available actions, as well as a button to clear your selection.
+
+![Screenshot 13](images/image11.jpg)
+![Screenshot 14](images/image12.jpg)
+
+### Step 6: Using Actions for Single Calculations
+
+In each row of the table, there are buttons for actions you can take on that specific calculation:
+
+- **Pencil icon**: Edit the calculation
+- **Trash can icon**: Delete the calculation
+- **Archive icon**: Archive the calculation
+
+Not all actions are available for every status:
+- Editing is only possible for calculations in **draft mode**.
+- Deleting is also only possible for **draft** calculations.
+- Archiving is only available for **completed** calculations.
+
+### Step 7: Working with Multiple Calculations at Once
+
+If you select multiple calculations using the checkboxes,
+
+![Screenshot 15](images/image13.jpg)
+![Screenshot 19](images/image14.jpg)
+
+the toolbar at the bottom lets you apply the same actions (like **edit**, **delete**, **archive**) to all selected calculations at once.
+
+If you, for example, select both completed calculations and drafts, then hit **Edit**,
+
+![Screenshot 20](images/image15.jpg)
+![Screenshot 21](images/image16.jpg)
+
+you’ll see an error message. This message tells you that completed calculations can’t be edited directly. You’ll get a few options:
+
+- Create a **copy** of the completed calculations and edit those copies.
+- Open **only** the calculations that are still in **draft mode**.
+- Or use **Cancel** to stop the action.
+
+### Step 8: Deleting Multiple Calculations
+
+If you select several calculations and then click the **Delete** button in the toolbar,
+
+![Screenshot 22](images/image17.jpg)
+![Screenshot 23](images/image18.jpg)
+
+you’ll get an error message if any of the selected calculations can’t be deleted. The message will tell you that only calculations in **draft mode** can be deleted—so, for example, two out of four selected items.
+
+To confirm the deletion, just click the **Delete** button again. You can stop the process with the **Cancel** button.
+
+![Screenshot 24](images/image19.jpg)
+
+### Step 9: Archiving Multiple Calculations
+
+If you select several calculations and click the **Archive** button in the toolbar,
+
+![Screenshot 25](images/image20.jpg)
+
+you’ll see a message letting you know that only **completed** calculations can be archived. If you’ve selected drafts too, they won’t be archived.
+
+Click the **Archive** button in the message to archive the selected completed calculations. Or, hit **Cancel** to cancel the action.
+
+![Screenshot 26](images/image21.jpg)
\ No newline at end of file
diff --git a/src/main/resources/static/help/mass-edit-basics.md b/src/main/resources/static/help/mass-edit-basics.md
new file mode 100644
index 0000000..f050761
--- /dev/null
+++ b/src/main/resources/static/help/mass-edit-basics.md
@@ -0,0 +1,198 @@
+
+> This guide explains how to edit multiple calculations at once in the mass edit view, how to switch between mass and single editing, and how to set, update, or copy values from other calculations as needed.
+
+### Step 1: Open the Mass Edit Mode
+
+Whenever you select several calculations at the same time and start to edit them, the mass edit mode will automatically open.
+
+![Screenshot 1](images/image1.jpg)
+
+After picking multiple calculations, you can begin editing.
+
+![Screenshot 2](images/image2.jpg)
+
+In mass edit mode, each row in the table represents one calculation. Every calculation always refers to a combination of material and supplier.
+
+### Step 2: Edit Individual Rows in Mass Edit View
+
+At the end of each row, there’s a pencil icon you can click to open that specific calculation in single edit mode.
+
+![Screenshot 3](images/image3.jpg)
+
+When you click the pencil, you’ll switch to the detailed view for that calculation, where you can set all parameters just like usual.
+
+To get back to the mass edit view from single edit mode, use the back button.
+
+![Screenshot 4](images/image4.jpg)
+
+There’s also an X icon in each row. Clicking this removes the row from the mass edit view, but it doesn’t delete the underlying calculation itself.
+
+### Step 3: Edit Parameters Through Cells in the Mass View
+
+The columns in the mass edit view match the parameter groups from the single edit screen.
+For example, if you click the cell for “Packaging” in the first row,
+
+![Screenshot 5](images/image5.jpg)
+
+the same packaging input window opens as in single edit mode.
+
+![Screenshot 6](images/image6.jpg)
+
+You can enter the values as usual in this window.
+
+![Screenshot 7](images/image7.jpg)
+
+![Screenshot 8](images/image8.jpg)
+
+Here, you’ll enter for example the data for a Euro pallet,
+
+![Screenshot 9](images/image9.jpg)
+
+![Screenshot 10](images/image10.jpg)
+
+including the weight
+
+![Screenshot 11](images/image11.jpg)
+
+and the number of units per package.
+
+Important
+
+![Screenshot 12](images/image12.jpg)
+
+is to
+
+![Screenshot 13](images/image13.jpg)
+
+pick the right dimensions.
+
+![Screenshot 14](images/image14.jpg)
+
+![Screenshot 15](images/image15.jpg)
+
+Once you’re done, hit “OK” to confirm your entry,
+
+![Screenshot 16](images/image16.jpg)
+
+and the values will be saved for that cell.
+
+Cells with a red exclamation mark show that values are missing. Make sure to fill these in before your calculation is complete.
+
+### Step 4: Edit Multiple Calculations at the Same Time
+
+To update several calculations at once, you can select multiple rows in the mass edit view using the checkbox at the beginning of each row.
+
+![Screenshot 17](images/image17.jpg)
+
+![Screenshot 18](images/image18.jpg)
+
+As soon as you select more than one row, an editing bar will pop up at the bottom.
+
+![Screenshot 19](images/image19.jpg)
+
+This bar shows how many rows you have selected and lets you edit common parameters for all the marked calculations at once.
+
+For example, clicking the “Price” field in the editing bar
+
+![Screenshot 20](images/image20.jpg)
+
+opens the price input window.
+
+![Screenshot 21](images/image21.jpg)
+
+You might enter a price of eighty-five euros here,
+
+![Screenshot 22](images/image22.jpg)
+
+along with a seventy percent Oversea Share. Then you check FCA fee.
+
+![Screenshot 23](images/image23.jpg)
+
+![Screenshot 24](images/image24.jpg)
+
+and confirm everything with “OK.” The values you entered will be applied to all the selected rows.
+
+If you want to deselect the currently chosen rows, just click the “Cancel” button in the editing bar.
+
+![Screenshot 25](images/image25.jpg)
+
+### Step 5: Select Rows by Material or Supplier
+
+If you want to pick specific rows, like all those with the same material number, hold down the Ctrl key and click on a material cell.
+
+![Screenshot 26](images/image26.jpg)
+
+This will select all rows with that material number. While holding Ctrl, your cursor will change to show you’re in multi-select mode.
+
+The same approach works for suppliers: If you hold Ctrl and click on a supplier,
+
+![Screenshot 27](images/image27.jpg)
+
+all rows with that supplier get selected.
+
+If you want to combine different suppliers or materials, start by holding Ctrl
+
+![Screenshot 28](images/image28.jpg)
+
+and clicking the first material or supplier cell.
+Then, hold both Ctrl and Shift and click on another material number.
+
+![Screenshot 29](images/image29.jpg)
+
+This lets you add more rows to your current selection.
+
+### Step 6: Set Shared Parameters (e.g. Packaging) for Selected Rows
+
+For all currently selected items
+
+![Screenshot 30](images/image30.jpg)
+
+you can edit the packaging together, for example.
+
+![Screenshot 31](images/image31.jpg)
+
+In the window that pops up, enter the new packaging values.
+
+Important: If you only fill in certain fields (like just the HU length) and hit “OK,” only that specific field gets updated. Any other values that already exist in the other fields will stay the same.
+
+For example, if you enter 1800 as the HU length in one field
+
+![Screenshot 32](images/image32.jpg)
+
+and then click “OK,”
+
+![Screenshot 33](images/image33.jpg)
+
+the HU length in that row will be set to 1800, but any previous values like 800 and 500 millimeters in other rows will remain.
+
+### Step 7: Copy and Adjust Values Between Calculations
+
+Another option is to copy values from one calculation into others.
+
+![Screenshot 34](images/image34.jpg)
+
+Start by selecting the target calculations.
+
+![Screenshot 35](images/image35.jpg)
+
+![Screenshot 36](images/image36.jpg)
+
+Next, click on the parameter group (such as Packaging, Price, etc.) that you want to copy values for.
+The cursor will change to a special copy symbol to show that you can transfer values.
+
+Now, if you click directly on the source cell (not through the editing bar at the bottom),
+
+![Screenshot 37](images/image37.jpg)
+
+the values from that cell will be pulled into the input window.
+You can tweak these values if needed
+
+![Screenshot 38](images/image38.jpg)
+
+before confirming them with “OK.”
+
+![Screenshot 39](images/image39.jpg)
+
+The updated values will only go into the rows you picked earlier. The original source calculation stays unchanged.
+
+![Screenshot 40](images/image40.jpg)
\ No newline at end of file
diff --git a/src/main/resources/static/help/mass-edit-destinations.md b/src/main/resources/static/help/mass-edit-destinations.md
new file mode 100644
index 0000000..f1b0961
--- /dev/null
+++ b/src/main/resources/static/help/mass-edit-destinations.md
@@ -0,0 +1,270 @@
+
+> This guide walks you through fully managing calculations in bulk edit mode—from setting up destinations (using the Destination Manager), distributing annual quantities, and handling routes, to entering handling, repackaging, and other costs. You'll also see how to manage Door-to-Door routes and efficiently edit values for multiple combinations at once.
+
+***
+
+### Step 1: Understanding Warnings for Empty Cells
+
+When you open calculations in bulk edit mode, you might notice empty values in the “Routes” or “Annual Quantity” columns. Clicking these cells will show a warning.
+
+![Screenshot 1](images/image1.jpg)
+
+This video explains what the warning means and how to handle it.
+
+![Screenshot 2](images/image2.jpg)
+
+The warning pops up because destinations haven't been set up yet for these calculations.
+
+***
+
+### Step 2: Open Destination Manager in Bulk Edit Mode
+
+To add destinations in bulk edit mode, click the “Destination Manager” button at the top.
+
+![Screenshot 3](images/image3.jpg)
+
+A summary will pop up showing all your material and supplier combinations.
+
+![Screenshot 4](images/image4.jpg)
+
+There's a search bar at the top where you can look up specific plants (for example, type “Aschaffenburg” and pick it from the suggestions).
+
+![Screenshot 5](images/image5.jpg)
+
+You can then search for another plant (like “Geisa”)
+
+![Screenshot 6](images/image6.jpg)
+
+and add that one too.
+
+![Screenshot 7](images/image7.jpg)
+
+***
+
+### Step 3: Assign Destinations to Combinations with Checkboxes
+
+Once you've added your destinations, you'll see checkboxes for each material and supplier combination. Use these to assign the right destinations to each calculation.
+
+![Screenshot 8](images/image8.jpg)
+
+For example, you can set it up so a specific combo is delivered to both destinations.
+
+![Screenshot 9](images/image9.jpg)
+
+Set checkmarks for all the combinations as needed.
+
+![Screenshot 10](images/image10.jpg)
+
+![Screenshot 17](images/image11.jpg)
+
+***
+
+### Step 4: Apply Destinations and Auto-fill Cells
+
+After assigning your destinations, click the “OK” button at the bottom to process the data.
+
+![Screenshot 18](images/image12.jpg)
+
+![Screenshot 20](images/image13.jpg)
+
+The previously empty cells in the bulk edit table will now be filled in. You can always reopen the Destination Manager to adjust these settings
+
+![Screenshot 21](images/image14.jpg)
+
+and confirm your changes again with “OK”.
+
+![Screenshot 22](images/image15.jpg)
+
+![Screenshot 26](images/image16.jpg)
+
+The main table in bulk edit mode will update accordingly.
+
+***
+
+### Step 5: Open Annual Quantity and Routes Menus
+
+Now, when you click a cell in the “Annual Quantity” or “Routes” columns, the respective editing menu will pop up.
+
+![Screenshot 27](images/image17.jpg)
+
+The easiest way to manage annual quantities and routes is to first select all relevant rows, then open the correct menu at the bottom by clicking the “Annual Quantity” or “Routes” button.
+
+![Screenshot 28](images/image18.jpg)
+
+![Screenshot 30](images/image19.jpg)
+
+This menu will include all materials and part numbers you've selected, so you can edit them together.
+
+***
+
+### Step 6: Enter Annual Quantities for Destinations
+
+In the annual quantity menu, you'll see all materials, suppliers, and destinations listed. Enter the quantity in the cell to show how much of a material, from a certain supplier, should go to a certain destination.
+
+![Screenshot 31](images/image20.jpg)
+
+![Screenshot 32](images/image21.jpg)
+
+You can type values directly into each cell
+
+![Screenshot 33](images/image22.jpg)
+
+or select several rows at once
+
+![Screenshot 34](images/image23.jpg)
+
+![Screenshot 37](images/image24.jpg)
+
+and enter the value in the input field at the top.
+
+![Screenshot 38](images/image25.jpg)
+
+![Screenshot 39](images/image26.jpg)
+
+For example, enter “600” for Aschaffenburg and “200” for Geisa, then confirm the entry for the selected calculations by clicking the checkmark. If you make a mistake, use the “X” to cancel. Click the checkmark to confirm your values.
+
+![Screenshot 40](images/image27.jpg)
+
+Grayed-out cells show that, according to the Destination Manager, this material and supplier combo isn't delivered to that plant.
+
+Now finish filling out the table.
+
+![Screenshot 41](images/image28.jpg)
+
+![Screenshot 49](images/image29.jpg)
+
+***
+
+### Step 7: Edit Handling, Repackaging Costs, and Routes Using Tabs
+
+At the top, you’ll see tabs for editing handling and repackaging costs, as well as routes, for all selected calculations.
+
+![Screenshot 50](images/image30.jpg)
+
+![Screenshot 53](images/image31.jpg)
+
+Since all rows in bulk edit are selected, you can set all routes in one go.
+
+***
+
+### Step 8: Set Routes via Dropdown and Door-to-Door Routing
+
+Use the dropdown menus to choose the right route for each supplier and destination combination.
+
+![Screenshot 54](images/image32.jpg)
+
+![Screenshot 55](images/image33.jpg)
+
+Pick the appropriate route for every combination.
+
+![Screenshot 56](images/image34.jpg)
+
+![Screenshot 60](images/image35.jpg)
+
+Besides predefined routes, you can also use Door-to-Door routing.
+
+![Screenshot 61](images/image36.jpg)
+
+If you pick Door-to-Door, a small red exclamation mark appears. This means you still need to fill in a Door-to-Door rate and lead time. Click the little pencil icon
+
+![Screenshot 62](images/image37.jpg)
+
+and enter the Door-to-Door rate and lead time.
+
+![Screenshot 63](images/image38.jpg)
+
+![Screenshot 64](images/image39.jpg)
+
+Click “OK” to confirm.
+
+![Screenshot 65](images/image40.jpg)
+
+The exclamation mark will disappear.
+
+***
+
+### Step 9: Enter Handling and Repackaging Costs Individually
+
+In the “Handling and Repackaging” tab, you can enter individual handling, repackaging, and disposal costs.
+
+![Screenshot 66](images/image41.jpg)
+
+First, acknowledge the warning by checking the box to enable editing.
+
+![Screenshot 67](images/image42.jpg)
+
+You'll see a list with all material, supplier, and destination combinations. Now, you can enter handling, repackaging, and disposal costs for each one individually.
+
+***
+
+### Step 10: Use Ctrl to Multi-select and Set Values at Once
+
+Both in the handling/repackaging tab and the annual quantity menu—just like in bulk edit—you can select the same material number multiple times by holding down the Ctrl key and clicking the material number.
+
+![Screenshot 68](images/image43.jpg)
+
+Then, as with annual quantities, enter a value in the input bar at the top
+
+![Screenshot 69](images/image44.jpg)
+
+![Screenshot 70](images/image45.jpg)
+
+and use the checkmark to apply it to all the selected rows.
+
+![Screenshot 71](images/image46.jpg)
+
+![Screenshot 73](images/image47.jpg)
+
+This also works for specific destinations or suppliers.
+
+***
+
+### Step 11: Use Ctrl + Shift for Advanced Multi-selection
+
+To select several suppliers at once—just like in the bulk editor—hold down the Shift key along with Ctrl, then click another supplier.
+
+![Screenshot 76](images/image48.jpg)
+
+This will add that supplier to your current selection.
+
+![Screenshot 77](images/image49.jpg)
+
+You can then enter values at the top again. Empty cells will be left as they are; only cells where you’ve typed something new will be changed. Existing values (like “300”) stay the same.
+
+![Screenshot 78](images/image50.jpg)
+
+![Screenshot 79](images/image51.jpg)
+
+This kind of selection is especially handy in the annual quantity menu.
+
+![Screenshot 80](images/image52.jpg)
+
+![Screenshot 81](images/image53.jpg)
+
+When you’re done, click the “OK” button to save your changes.
+
+![Screenshot 82](images/image54.jpg)
+
+Now, your annual quantities and routes are fully filled out for bulk calculations.
+
+***
+
+### Step 12: Start or Close Bulk Calculation
+
+You can start the bulk calculation with the “Calculate and close” button. This works the same way as in single edit mode. Or, if you're done, close bulk editing with the “Close” button—your changes are saved automatically, so you won't lose any work.
+
+If you hit “Close” while something is still missing, you'll get an error message (just like in single edit mode) showing which values need fixing.
+
+![Screenshot 83](images/image55.jpg)
+
+For example, if all rows are selected and you copy packaging data from one cell and confirm with “OK,”
+
+![Screenshot 84](images/image56.jpg)
+
+![Screenshot 85](images/image57.jpg)
+
+all relevant values will be filled in and you can kick off the calculation with “Calculate and close.”
+
+![Screenshot 86](images/image58.jpg)
+
+Your calculations will then go into a queue and be processed in the background.
\ No newline at end of file
diff --git a/src/main/resources/static/help/report.md b/src/main/resources/static/help/report.md
new file mode 100644
index 0000000..ee4c65b
--- /dev/null
+++ b/src/main/resources/static/help/report.md
@@ -0,0 +1,119 @@
+
+> This guide shows you how to create a report from completed calculations, select the relevant suppliers, interpret the report’s contents (charts, key metrics, assumptions, and transport cost fluctuations), and export the report as an Excel file.
+
+### Step 1: Switch to the Reporting View
+
+First, switch to the Reporting view to start a new report.  
+Just click on the **"Reporting"** tab at the top of the app.
+
+![Screenshot 1](images/image1.jpg)
+
+### Step 2: Create a New Report
+
+Once you’re in the Reporting view, click the **"Create Report"** button to make a new report.
+
+![Screenshot 2](images/image2.jpg)
+
+### Step 3: Search for Material or Part Number
+
+A new window will pop up where you can search for the material or **part number** you need.  
+Start typing the part number into the search box until you see a suggestion that matches what you entered.
+
+![Screenshot 3](images/image3.jpg)
+
+Click on the suggested part number to select it.
+
+![Screenshot 4](images/image4.jpg)
+
+### Step 4: Choose Suppliers for the Report
+
+After picking the part number, you'll see a list of all suppliers that already have a calculation for that part.  
+Now, select the suppliers you want to include in your report.
+
+![Screenshot 5](images/image5.jpg)
+![Screenshot 7](images/image6.jpg)
+
+Confirm your selection by clicking **"OK"**.
+
+Note: As soon as you pick a supplier, some other suppliers might disappear from the list. This happens because not all calculations are directly comparable. So you can only look at a certain subset of suppliers together in the report.
+
+Click **"OK"** again to generate and display the report.
+
+![Screenshot 8](images/image7.jpg)
+
+### Step 5: Get an Overview of the Report Structure
+
+When your report opens, you might see a warning that some of the reports can’t be fully compared—like if target plants or annual purchase quantities are different. At the bottom, you’ll see all the target plants, so you can spot if the calculations are for different locations (for example, Geisern, Aschaffenburg, or a mix).
+
+At the top of the report, you’ll see:
+
+- the time period for the calculations
+- the part number the report is about
+- several columns—one for each supplier you picked
+
+You’ll also see a chart that breaks down the cost items for a quick overview:
+
+- The **gray area** at the bottom is **MEK A**.
+- The **green area** at the top is **logistics costs**.
+- There’s also a thin **gray spread** showing logistics cost fluctuations:
+    - the top of the black bar: the highest possible logistics costs (based on past data)
+    - the bottom of the black bar: the lowest possible logistics costs (also from past data)
+
+### Step 6: Understanding Key Metrics and Cost Breakdown
+
+Further down in the report, the chart values are laid out in a table. Here, you’ll find:
+
+- **MEK A price**, **logistics costs**, and **MEK B price**
+- each shown as **absolute values**
+- and as **percentages** relative to the MEK B price
+
+You’ll also get a **cost breakdown**, weighted across all the target plants included in the calculations. This lets you see how each part of the logistics costs affects the total MEK B price.
+
+The breakdown appears in both absolute numbers and percentages based on the MEK B price.
+
+### Step 7: Check Transport Cost Fluctuations in Detail
+
+The logistics cost fluctuations you see in the chart (the black area) are also available as actual numbers in the **"Transport cost fluctuations"** section.
+
+![Screenshot 9](images/image8.jpg)
+
+Here you’ll find:
+
+- the **total values** for the fluctuations
+- the **percentage values** compared to the calculated MEK B price
+
+![Screenshot 10](images/image9.jpg)
+![Screenshot 11](images/image10.jpg)
+
+### Step 8: View Assumptions and Logistics Route
+
+At the bottom of the report, you’ll see the assumptions used for the calculation. This includes:
+
+- the **material** used
+- the **packaging dimensions** you entered
+
+Expand the **"Target plant"** section to see more details.
+
+![Screenshot 12](images/image11.jpg)
+
+Here, you’ll see the **logistics route** used as the basis for the calculation. If you hover your mouse over the route sections, you’ll get more detailed info, like:
+
+- the **transport rate** used
+- required **transport time**
+- the **calculation model** applied
+- whether the route section is based on a **container rate** or was calculated using a **kilometer cost matrix**
+
+Below that, you’ll find extra assumptions specific to the target plant, like:
+
+- **purchase quantity**
+- **total transport time**
+- the result of the **container calculation**
+
+### Step 9: Export the Report as an Excel File
+
+At the top of the report, you can download it as an **Excel file**.
+
+The Excel file will include:
+
+- all the information shown in the report
+- plus a **simple summary** of the most important metrics and contents.
\ No newline at end of file
diff --git a/src/main/resources/static/help/single-edit.md b/src/main/resources/static/help/single-edit.md
new file mode 100644
index 0000000..af9ba55
--- /dev/null
+++ b/src/main/resources/static/help/single-edit.md
@@ -0,0 +1,210 @@
+
+> In this application, you’ll edit logistics cost calculations for a specific supplier and part number combination. The detailed view is divided into several sections where you’ll enter material details, pricing info, packaging data, and destination plants. At the end, you’ll start the calculation, and if there are any errors, you’ll be prompted with hints on how to fix them.
+
+---
+
+### Step 1: Open the detailed view of a calculation
+
+In the overview, click on the pencil icon for the calculation you want to work on to switch to the detailed view for logistics cost calculation.
+
+![Screenshot 1](images/image1.jpg)
+
+At the top of the detailed view, you’ll see supplier information, and below that, the input forms divided into these sections:
+- Material / part number
+- Pricing information
+- Packaging (handling unit, e.g. large load carrier)
+- Calculation targets (plants to be supplied)
+
+---
+
+### Step 2: Check and correct material and customs data as needed
+
+In the first section, you’ll enter information about the part number, especially:
+- HS code
+- Customs tariff rate
+
+When you create a calculation, the tool automatically looks up tariff rates via an API.
+- If the lookup is clear, the HS code and customs tariff rate are prefilled and locked; you don’t need to enter anything.
+- If the lookup isn’t clear (shown by a message at the bottom of the section), you’ll need to research and enter the correct customs tariff rate yourself. By default, 3% is prefilled here.
+
+---
+
+### Step 3: Enter purchase price and overseas share
+
+In the second section, you’ll enter pricing information:
+
+1. Enter the MEK A purchase price.
+
+![Screenshot 2](images/image2.jpg)
+
+This MEK A price should always be considered the FCA price.
+
+2. If the price you have isn’t an FCA price, but an Ex-Works price, check the “include FCA fee” box.
+
+![Screenshot 3](images/image3.jpg)
+
+This will automatically add a percentage fee to the MEK A price in the calculation.
+
+3. If you already have an FCA price, uncheck the box so the extra fee isn’t added.
+
+![Screenshot 4](images/image4.jpg)
+![Screenshot 5](images/image5.jpg)
+
+4. In the “Overseas share” field, enter the percentage of suppliers who ship from overseas (not just for this calculation, but across all suppliers). Enter the number as a percentage, e.g. 70%.
+
+![Screenshot 6](images/image6.jpg)
+
+---
+
+### Step 4: Configure packaging data and handling unit
+
+Go to the third input section for packaging:
+
+1. Enter the dimensions of the handling unit (typically the large load carrier; if you have small quantities, this might be the small load carrier—just keep that in mind for later).  
+   For example, enter the measurements for a Euro pallet.
+
+![Screenshot 7](images/image7.jpg)
+![Screenshot 8](images/image8.jpg)
+
+2. Select the correct unit for these measurements (e.g. millimeters, if that’s what you entered).
+
+![Screenshot 9](images/image9.jpg)
+![Screenshot 12](images/image10.jpg)
+
+3. Enter the weight of the handling unit and choose the right weight unit (e.g. kilograms).
+
+![Screenshot 13](images/image11.jpg)
+![Screenshot 14](images/image12.jpg)
+
+4. Enter the number of individual units inside a handling unit (e.g. 200 pieces per large or small load carrier).
+
+![Screenshot 15](images/image13.jpg)
+
+5. Set the two important checkboxes on the right:
+    - Checkbox 1: “Mixed transport allowed” (the handling unit can be shipped together with other units or part numbers).
+      If you uncheck this box, the part number will always be shipped separately. This affects container utilization calculations:
+        - Unchecked: The tool uses an algorithm to determine the actual container utilization.
+        - Checked: A standard container utilization rate is used.
+
+![Screenshot 16](images/image14.jpg)
+
+- Checkbox 2: “Stacking allowed” (units can be stacked).
+  If you uncheck this, only one layer is counted in the container (e.g. for fragile parts), which reduces utilization.
+
+![Screenshot 17](images/image15.jpg)
+
+6. Check both boxes again if the part number can be shipped mixed and stacked.
+
+![Screenshot 18](images/image16.jpg)
+![Screenshot 19](images/image17.jpg)
+
+---
+
+### Step 5: Add destination plants and routes using the standard logic
+
+At the bottom, you’ll now set the destinations for this calculation—meaning, the plants that will receive this part number:
+
+1. In the search box, type in the plant you want (e.g. “Châtellerault”) and select it from the suggestions.
+
+![Screenshot 20](images/image18.jpg)
+![Screenshot 21](images/image19.jpg)
+
+2. In the window that opens, enter the annual quantity this plant will receive (e.g. 3,000 parts).
+
+3. At the bottom, pick the route the containers will take to get to the plant (e.g. a route through a specific intermediate warehouse).
+
+![Screenshot 22](images/image20.jpg)
+![Screenshot 23](images/image21.jpg)
+
+4. Switch to the second tab if you want to enter custom handling and repackaging costs. By default, the tool calculates these costs automatically.
+
+![Screenshot 24](images/image22.jpg)
+
+5. If your actual handling and repackaging costs are very different from the automatically calculated ones, check the box to confirm the warning and enter your own costs.
+
+![Screenshot 25](images/image23.jpg)
+
+6. Then, enter your individual costs in the three fields that appear (always based on the previously defined handling unit):
+    - Repackaging costs: The cost to repackage from the disposable pallet to the packaging needed at the plant (e.g. €6).
+
+![Screenshot 26](images/image24.jpg)
+![Screenshot 27](images/image25.jpg)
+
+- Handling costs: The cost for goods receipt and storage (e.g. €3.12).
+    - Disposal costs: The cost for disposing of disposable packaging (e.g. €0 if there’s no charge).
+
+![Screenshot 28](images/image26.jpg)
+
+7. Confirm everything for this plant by clicking the “OK” button.
+
+![Screenshot 29](images/image27.jpg)
+
+The plant now appears in the destinations list.
+
+![Screenshot 30](images/image28.jpg)
+
+---
+
+### Step 6: Add another plant with a custom door-to-door rate
+
+1. Add another plant, e.g. “Luzzara”.
+
+![Screenshot 31](images/image29.jpg)
+![Screenshot 32](images/image30.jpg)
+
+2. If no route can be determined from the supplier for this plant, select the option to set a custom rate.
+
+![Screenshot 33](images/image31.jpg)
+
+3. Enter a door-to-door rate that covers all costs from pickup at the supplier to delivery at the plant (e.g. €2,000).
+
+![Screenshot 34](images/image32.jpg)
+![Screenshot 35](images/image33.jpg)
+
+4. Enter the lead time (e.g. 47 days) and the plant’s annual quantity (e.g. 1,000 pieces).
+
+![Screenshot 36](images/image34.jpg)
+
+5. Confirm this plant as well by clicking the “OK” button.
+
+![Screenshot 37](images/image35.jpg)
+
+Now both plants receiving this part are listed in the destinations.
+
+---
+
+### Step 7: Run the calculation or cancel input
+
+Once all data is entered, you can:
+- Use the “Calculate and Close” button to start the calculation and close the form.
+- Use the “Close” button to exit the form without starting the calculation.
+
+All your entries are saved continuously, so nothing is lost when closing the form. You can reopen and continue the calculation anytime.
+
+---
+
+### Step 8: Identify and fix input errors
+
+To see how error handling works, try making a deliberate mistake, for example:
+
+1. Accidentally select “centimeters” instead of “millimeters” for the dimensions. This will make the packaging seem way too big.
+
+![Screenshot 38](images/image36.jpg)
+![Screenshot 39](images/image37.jpg)
+
+2. Then start the calculation.
+
+![Screenshot 40](images/image38.jpg)
+
+You’ll see an error message at the bottom of the screen showing which values need to be fixed.
+
+3. Correct the wrong unit or the value in question.
+
+![Screenshot 41](images/image39.jpg)
+![Screenshot 42](images/image40.jpg)
+
+4. Start the calculation again.
+
+![Screenshot 43](images/image41.jpg)
+
+The calculation will now be queued and processed. You can see its status in your dashboard.
\ No newline at end of file
diff --git a/src/test/resources/master_data/users.sql b/src/test/resources/master_data/users.sql
index 57f3f28..3b280e6 100644
--- a/src/test/resources/master_data/users.sql
+++ b/src/test/resources/master_data/users.sql
@@ -7,26 +7,6 @@ VALUES ('USR001', 'john.doe@company.com', 'John', 'Doe', TRUE),
        ('USR005', 'david.chen@company.com', 'David', 'Chen', TRUE)
 ON DUPLICATE KEY UPDATE email = VALUES(email);
 
-INSERT INTO sys_group(group_name, group_description)
-VALUES ('none', 'no rights');
-INSERT INTO sys_group(group_name, group_description)
-VALUES ('basic', 'Login, generate reports');
-INSERT INTO sys_group(group_name, group_description)
-VALUES ('calculation', 'Login, generate reports, do calculations');
-INSERT INTO sys_group(group_name, group_description)
-VALUES ('freight', 'Login, generate reports, edit freight rates');
-INSERT INTO sys_group(group_name, group_description)
-VALUES ('packaging', 'Login, generate reports, edit packaging data');
-INSERT INTO sys_group(group_name, group_description)
-VALUES ('material', 'Login, generate reports, edit material data');
-INSERT INTO sys_group(group_name, group_description)
-VALUES ('super',
-        'Login, generate reports, do calculations, edit freight rates, edit packaging data');
-INSERT INTO sys_group(group_name, group_description)
-VALUES ('service', 'Register API Tokens');
-INSERT INTO sys_group(group_name, group_description)
-VALUES ('right-management',
-        'Add/Remove users, groups, etc.');
 
 INSERT INTO sys_user_group_mapping (group_id, user_id)
 VALUES ((SELECT id FROM sys_group WHERE group_name = 'super'),
diff --git a/test/conftest.py b/test/conftest.py
new file mode 100644
index 0000000..55cbf47
--- /dev/null
+++ b/test/conftest.py
@@ -0,0 +1,101 @@
+# conftest.py
+import pytest
+from selenium import webdriver
+from selenium.webdriver.chrome.options import Options
+from selenium.webdriver.support.ui import WebDriverWait
+from pathlib import Path
+import openpyxl
+
+
+@pytest.fixture(scope="session")
+def browser_options():
+    options = Options()
+    options.add_argument("--start-maximized")
+    # options.add_argument("--headless")  # Optional für CI/CD
+    return options
+
+
+@pytest.fixture(scope="function")
+def driver(browser_options):
+    """Erstellt einen neuen Browser pro Test"""
+    driver = webdriver.Chrome(options=browser_options)
+    driver.implicitly_wait(10)
+    yield driver
+    driver.quit()
+
+
+@pytest.fixture(scope="function")
+def wait(driver):
+    """WebDriverWait Instanz"""
+    return WebDriverWait(driver, 20)
+
+
+@pytest.fixture
+def base_url():
+    """Basis-URL deiner Anwendung"""
+    return "http://localhost:5173"
+
+
+def pytest_generate_tests(metafunc):
+    """Parametrisiert Tests basierend auf Excel-Dateien im testdata Ordner"""
+    if "testcase_file" in metafunc.fixturenames:
+        testdata_dir = Path("testcases")
+        excel_files = list(testdata_dir.glob("*.xlsx"))
+
+        # IDs für bessere Testausgabe
+        ids = [f.stem for f in excel_files]
+
+        metafunc.parametrize("testcase_file", excel_files, ids=ids)
+
+
+@pytest.fixture
+def test_data(testcase_file):
+    """Lädt Testdaten aus Excel-Datei"""
+    wb = openpyxl.load_workbook(testcase_file)
+
+    # Eingabedaten aus "in" Sheet
+    input_sheet = wb["in"]
+    input_data = {}
+    groups = {}
+    for row in input_sheet.iter_rows(values_only=True):
+        if row[0]:  # Feldname in Spalte A
+            if '_' in row[0]:
+                [remainder, suffix] = row[0].rsplit('_',1)
+                if suffix.isdigit():
+                    [prefix, name] = remainder.split('_',1)
+                    if prefix not in groups:
+                        groups[prefix] = {}
+                    if groups[prefix].get(suffix) is None:
+                        groups[prefix][suffix] = {}
+                    groups[prefix][suffix][name] = row[1]
+                else:
+                    input_data[row[0]] = row[1]
+            else:
+                input_data[row[0]] = row[1]  # Wert in Spalte B
+    input_data.update(groups)
+
+    # Erwartete Ausgaben aus "out" Sheet
+    output_sheet = wb["out"]
+    expected_data = {}
+    expected_groups = {}
+    for row in input_sheet.iter_rows(values_only=True):
+        if row[0]:  # Feldname in Spalte A
+            if '_' in row[0]:
+                [remainder, suffix] = row[0].rsplit('_',1)
+                if suffix.isdigit():
+                    [prefix, name] = remainder.split('_',1)
+                    if prefix not in expected_groups:
+                        expected_groups[prefix] = {}
+                    if expected_groups[prefix].get(suffix) is None:
+                        expected_groups[prefix][suffix] = {}
+                    expected_groups[prefix][suffix][name] = row[1]
+                else:
+                    expected_data[row[0]] = row[1]
+            else:
+                expected_data[row[0]] = row[1]  # Wert in Spalte B
+    expected_data.update(expected_groups)
+    return {
+        "input": input_data,
+        "expected": expected_data,
+        "filename": testcase_file.name
+    }
\ No newline at end of file
diff --git a/test/pages/assistant.py b/test/pages/assistant.py
new file mode 100644
index 0000000..e5d07ba
--- /dev/null
+++ b/test/pages/assistant.py
@@ -0,0 +1,46 @@
+import time
+
+from selenium.webdriver.common.by import By
+
+from conftest import driver
+from pages.base_page import BasePage
+
+
+class Assistant(BasePage):
+    """Page Object für den Assistant"""
+
+    # Mapping von Excel-Feldnamen zu Locators
+    FIELD_MAPPING = {
+        "PART_NUMBER": (By.CSS_SELECTOR, "textarea[name='partNumbers']"),
+        "ANALYZE_BUTTON": (By.CSS_SELECTOR, ".part-number-modal-action > .btn--primary"),
+        "SUPPLIER_NAME": (By.CSS_SELECTOR, ".supplier-headers-searchbar-container .search-input"),
+        "LOAD_FROM_PREVIOUS": (By.CSS_SELECTOR, ".start-calculation-footer-container .checkbox-item"),
+        "CREATE_CALCULATION_BUTTON": (By.CSS_SELECTOR, ".start-calculation-footer-container .btn--secondary"),
+        "DELETE_SUPPLIER_BUTTON": (By.CSS_SELECTOR, ".supplier-headers ~ .item-list .item-list-element .icon-btn-container .icon-btn"),
+    }
+
+    def search_part_numbers(self, data_dict):
+        """Füllt das Formular mit Daten aus dem Excel"""
+        self.fill_input(*self.FIELD_MAPPING["PART_NUMBER"], data_dict["PART_NUMBER"])
+        self.click_button(*self.FIELD_MAPPING["ANALYZE_BUTTON"])
+
+    def delete_preselected_suppliers(self):
+        while True:
+            try:
+                button = self.wait_for_clickable(
+                    *self.FIELD_MAPPING["DELETE_SUPPLIER_BUTTON"],
+                    timeout=1
+                )
+                button.click()
+                time.sleep(0.2)
+            except:
+                # Keine Buttons mehr vorhanden
+                break
+
+    def select_supplier(self, data_dict):
+        self.search_and_select_autosuggest(*self.FIELD_MAPPING["SUPPLIER_NAME"], data_dict["SUPPLIER_NAME"])
+
+
+    def create_calculation(self, data_dict):
+        self.set_checkbox(*self.FIELD_MAPPING["LOAD_FROM_PREVIOUS"], data_dict["LOAD_FROM_PREVIOUS"])
+        self.click_button(*self.FIELD_MAPPING["CREATE_CALCULATION_BUTTON"])
diff --git a/test/pages/base_page.py b/test/pages/base_page.py
new file mode 100644
index 0000000..4a19b18
--- /dev/null
+++ b/test/pages/base_page.py
@@ -0,0 +1,147 @@
+# pages/base_page.py
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.common.by import By
+from selenium.common.exceptions import TimeoutException
+import time
+import logging
+
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+
+class BasePage:
+    """Basis-Klasse für alle Page Objects"""
+
+    def __init__(self, driver, wait):
+        self.driver = driver
+        self.wait = wait
+
+    def wait_for_spa_navigation(self, expected_route_part, timeout=2):
+        """Wartet bis SPA zur erwarteten Route navigiert hat"""
+        WebDriverWait(self.driver, timeout).until(
+            lambda d: expected_route_part in d.current_url
+        )
+        # Zusätzlich auf Vue-Rendering warten
+        time.sleep(0.5)
+
+    def wait_for_element(self, by, value, timeout=2):
+        """Wartet auf ein Element"""
+        start_time = time.time()
+        logger.info(f"Waiting for element: {by}={value}")
+
+        result = WebDriverWait(self.driver, timeout).until(
+            EC.presence_of_element_located((by, value))
+        )
+
+        elapsed = time.time() - start_time
+        logger.info(f"Found element after {elapsed:.2f}s")
+        return result
+    def wait_for_clickable(self, by, value, timeout=2):
+        """Wartet bis Element klickbar ist"""
+        return WebDriverWait(self.driver, timeout).until(
+            EC.element_to_be_clickable((by, value))
+        )
+
+    def fill_input(self, by, value, text, check_existence=False, timeout=2):
+        if check_existence:
+            # Prüfe ob Element existiert
+            try:
+                element = WebDriverWait(self.driver, timeout).until(
+                    EC.presence_of_element_located((by, value))
+                )
+                logger.info(f"Element exists, filling...")
+            except TimeoutException:
+                logger.warning(f"Element does not exist, skipping (check_existence=True)")
+                return False
+        else:
+            # Normaler Modus - erwarte dass Element existiert
+            element = self.wait_for_element(by, value, timeout)
+
+        # Element existiert - jetzt füllen
+        element.clear()
+        element.send_keys(text)
+        logger.info(f"Filled input with: {text}")
+        return True
+
+    def click_button(self, by, value):
+        """Klickt einen Button"""
+        start_time = time.time()
+        logger.info(f"Clicking button: {by}={value}")
+
+        button = self.wait_for_clickable(by, value)
+        button.click()
+
+        elapsed = time.time() - start_time
+        logger.info(f"Clicked after {elapsed:.2f}s")
+
+    def set_checkbox(self, by, value, checked, timeout=2):
+        label = self.wait_for_clickable(by, value, timeout)
+
+        checkbox_input = label.find_element(By.CSS_SELECTOR, "input[type='checkbox']")
+
+        is_checked = checkbox_input.is_selected()
+
+        if is_checked != checked:
+            label.click()
+            time.sleep(0.3)
+
+
+    def select_dropdown_option(self, by, value, option_text, timeout=10):
+        dropdown_button = self.wait_for_element(by, value, timeout=timeout)
+
+        try:
+            current_value = dropdown_button.find_element(
+                By.CSS_SELECTOR,
+                "span.dropdown-trigger-text"
+            ).text
+
+            if current_value == option_text:
+                logger.info(f"Dropdown already has value: {option_text}")
+                return
+        except:
+            pass  # Falls kein Text gefunden wurde, öffne das Dropdown
+
+        dropdown_button.click()
+        logger.info("Opened dropdown")
+
+        menu = WebDriverWait(self.driver, timeout).until(
+            EC.visibility_of_element_located((By.CSS_SELECTOR, "ul.dropdown-menu"))
+        )
+        logger.info("Dropdown menu visible")
+
+        option_xpath = f"//li[contains(@class, 'dropdown-option')][normalize-space(text())='{option_text}']"
+        option = WebDriverWait(self.driver, timeout).until(
+            EC.element_to_be_clickable((By.XPATH, option_xpath))
+        )
+
+        logger.info(f"Clicking option: {option_text}")
+        option.click()
+
+
+        time.sleep(0.2)
+
+    def search_and_select_autosuggest(self, by_or_selector, value_or_search_text,
+                                      search_text=None,
+                                      suggestion_selector=".suggestion-item",
+                                      timeout=2):
+
+        if search_text is not None:
+            # Fall: (By.CSS_SELECTOR, ".selector", "search_text")
+            search_input = self.wait_for_element(by_or_selector, value_or_search_text, timeout)
+            text_to_search = search_text
+        else:
+            # Fall: (".selector", "search_text")
+            search_input = self.wait_for_element(By.CSS_SELECTOR, by_or_selector, timeout)
+            text_to_search = value_or_search_text
+
+        search_input.clear()
+        search_input.send_keys(text_to_search)
+
+        time.sleep(1)
+
+        suggestion = WebDriverWait(self.driver, timeout).until(
+            EC.element_to_be_clickable((By.CSS_SELECTOR, suggestion_selector))
+        )
+        suggestion.click()
+
+        time.sleep(0.5)
diff --git a/test/pages/calculation_page.py b/test/pages/calculation_page.py
new file mode 100644
index 0000000..56b1fea
--- /dev/null
+++ b/test/pages/calculation_page.py
@@ -0,0 +1,157 @@
+# pages/calculation_page.py
+from selenium.webdriver.common.by import By
+from pages.base_page import BasePage
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class CalculationPage(BasePage):
+    """Page Object für die Berechnungsformulare"""
+
+    # WICHTIG: Verwende data-v-* Attribute NUR wenn sie WIRKLICH stabil sind
+    # Besser: Positionsbasierte Selektoren mit aussagekräftigen Parent-Elementen
+
+    FIELD_MAPPING = {
+        # Material-Sektion (erste Box)
+        "HS_CODE": (
+            By.XPATH,
+            "//div[contains(@class, 'master-data-item')][1]//div[contains(@class, 'caption-column')][text()='HS code']"
+            "/following-sibling::div//input[@class='input-field']"
+        ),
+        "TARIFF_RATE": (
+            By.XPATH,
+            "//div[contains(@class, 'master-data-item')][1]//div[contains(@class, 'caption-column')][contains(text(), 'Tariff rate')]"
+            "/following-sibling::div//input[@class='input-field']"
+        ),
+
+        # Price-Sektion (zweite Box)
+        "PRICE": (
+            By.XPATH,
+            "//div[contains(@class, 'master-data-item')][2]//div[contains(@class, 'caption-column')][text()='MEK_A [EUR]']"
+            "/following-sibling::div//input[@class='input-field']"
+        ),
+        "OVERSEA_SHARE": (
+            By.XPATH,
+            "//div[contains(@class, 'master-data-item')][2]//div[contains(@class, 'caption-column')][contains(text(), 'Oversea share')]"
+            "/following-sibling::div//input[@class='input-field']"
+        ),
+        # Handling Unit-Sektion (dritte Box)
+        "LENGTH": (
+            By.XPATH,
+            "//div[contains(@class, 'master-data-item')][3]//div[contains(@class, 'caption-column')][text()='HU length']"
+            "/following-sibling::div//input[@class='input-field']"
+        ),
+        "WIDTH": (
+            By.XPATH,
+            "//div[contains(@class, 'master-data-item')][3]//div[contains(@class, 'caption-column')][text()='HU width']"
+            "/following-sibling::div//input[@class='input-field']"
+        ),
+        "HEIGHT": (
+            By.XPATH,
+            "//div[contains(@class, 'master-data-item')][3]//div[contains(@class, 'caption-column')][text()='HU height']"
+            "/following-sibling::div//input[@class='input-field']"
+        ),
+        "WEIGHT": (
+            By.XPATH,
+            "//div[contains(@class, 'master-data-item')][3]//div[contains(@class, 'caption-column')][text()='HU weight']"
+            "/following-sibling::div//input[@class='input-field']"
+        ),
+        "PIECES_UNIT": (
+            By.XPATH,
+            "//div[contains(@class, 'master-data-item')][3]//div[contains(@class, 'caption-column')][text()='Pieces per HU']"
+            "/following-sibling::div//input[@class='input-field']"
+        ),
+
+        # Dropdowns
+        "DIMENSION_UNIT": (
+            By.XPATH,
+            "//div[contains(@class, 'master-data-item')][3]//div[contains(@class, 'caption-column')][text()='Dimension unit']"
+            "/following-sibling::div//button[contains(@class, 'dropdown-trigger')]"
+        ),
+        "WEIGHT_UNIT": (
+            By.XPATH,
+            "//div[contains(@class, 'master-data-item')][3]//div[contains(@class, 'caption-column')][text()='Weight unit']"
+            "/following-sibling::div//button[contains(@class, 'dropdown-trigger')]"
+        ),
+
+        # Checkboxen
+        "FBA_FEE": (
+            By.XPATH,
+            "//div[contains(@class, 'master-data-item')][2]"
+            "//label[contains(@class, 'checkbox-item')]"
+            "[.//span[contains(@class, 'checkbox-label')][normalize-space(text())='']]"
+        ),
+        "MIXED": (
+            By.XPATH,
+            "//label[contains(@class, 'checkbox-item')]"
+            "[.//span[contains(@class, 'checkbox-label')][text()='Mixable']]"
+        ),
+        "STACKED": (
+            By.XPATH,
+            "//label[contains(@class, 'checkbox-item')]"
+            "[.//span[contains(@class, 'checkbox-label')][text()='Stackable']]"
+        ),
+    }
+
+    DEST_FIELD_MAPPING = {
+        "NAME": (By.XPATH, "//input[@placeholder='Add new Destination ...']"),
+        "QUANTITY": (By.XPATH,
+                     "//div[contains(@class, 'destination-edit-column-caption') and contains(text(), 'Annual quantity')]/following-sibling::div[1]//input[@class='input-field']")
+        "ROUTING": (By.XPATH,
+                    "//input[@type='radio' and @name='model' and @value='routing']"),
+        "D2D": (By.XPATH,
+                "//input[@type='radio' and @name='model' and @value='d2d']"),
+        "ROUTE": (By.XPATH,
+                  "//div[@class='destination-route-container']//div[contains(@class, 'destination-route-inner-container')][.//span[contains(text(), 'Ireland Su')] and .//span[contains(text(), 'WH ULHA')] and .//span[contains(text(), 'AB')]]")
+        "HANDLING_TAB": (By.XPATH, "//button[@class='tab-header' and text()='Handling & Repackaging']"),
+        "CUSTOM_HANDLING": (By.XPATH,
+                            "//div[@class='destination-edit-handling-cost']//label[@class='checkbox-item']/input[@type='checkbox']"),
+        "REPACKING": (By.XPATH,
+                      "//div[@class='destination-edit-column-caption' and contains(text(), 'Repackaging cost')]/following-sibling::div[@class='destination-edit-column-data'][1]//input[@class='input-field']"),
+        "HANDLING": (By.XPATH,
+                      "//div[@class='destination-edit-column-caption' and contains(text(), 'Handling cost')]/following-sibling::div[@class='destination-edit-column-data'][1]//input[@class='input-field']"),
+        "DISPOSAL": (By.XPATH,
+                      "//div[@class='destination-edit-column-caption' and contains(text(), 'Disposal cost')]/following-sibling::div[@class='destination-edit-column-data'][1]//input[@class='input-field']"),
+    }
+
+    # Buttons
+    CALCULATE_CLOSE_BUTTON = (By.XPATH, "//button[contains(., 'Calculate & close')]")
+    CLOSE_BUTTON = (By.XPATH, "//button[contains(., 'Close') and not(contains(., 'Calculate'))]")
+
+    def fill_form(self, data_dict):
+        """Füllt das Formular mit Daten aus dem Excel"""
+        for field_name, locator in self.FIELD_MAPPING.items():
+
+            value = data_dict[field_name]
+            logger.info(f"Filling field: {field_name} = {value}")
+
+            try:
+                if field_name in ["FBA_FEE", "STACKED", "MIXED"]:
+                    self.set_checkbox(*locator, str(value) == 'True')
+
+                elif field_name in ["DIMENSION_UNIT", "WEIGHT_UNIT"]:
+                    self.select_dropdown_option(*locator, str(value))
+
+                else:
+                    self.fill_input(*locator, str(value), check_existence=field_name in ["HS_CODE", "TARIFF_RATE"])
+
+            except Exception as e:
+                logger.error(f"Failed to fill field {field_name}: {e}")
+                self.driver.save_screenshot(f"failed_field_{field_name}.png")
+                raise Exception(f"Could not fill field '{field_name}': {e}") from e
+
+    def add_destination(self, data_dict):
+        self.search_and_select_autosuggest(*self.DEST_FIELD_MAPPING["NAME"], data_dict["NAME"])
+
+    def fill_destination(self, data_dict):
+        self.wait_for_element(*self.DEST_FIELD_MAPPING["QUANTITY"])
+        pass
+
+    def click_calculate_and_close(self):
+        """Klickt auf 'Calculate & close' Button"""
+        self.click_button(*self.CALCULATE_CLOSE_BUTTON)
+
+    def click_close(self):
+        """Klickt auf 'Close' Button"""
+        self.click_button(*self.CLOSE_BUTTON)
diff --git a/test/pages/dev_page.py b/test/pages/dev_page.py
new file mode 100644
index 0000000..66de67d
--- /dev/null
+++ b/test/pages/dev_page.py
@@ -0,0 +1,53 @@
+# pages/results_page.py
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+import time
+
+class DevPage:
+    MODAL_YES_BUTTON = (By.CSS_SELECTOR, "div.modal-dialog-actions button.btn--primary")
+    MODAL_NO_BUTTON = (By.CSS_SELECTOR, "div.modal-dialog-actions button.btn--secondary")
+
+    def __init__(self, driver, wait):
+        self.driver = driver
+        self.wait = wait
+
+    def dev_login(self, base_url, user_name="John"):
+        """
+        Simuliert Login über /dev Seite
+
+        Args:
+            base_url: Basis-URL der Anwendung
+            user_name: Vorname des Users (z.B. "John", "Sarah", "Mike")
+        """
+        # Navigiere zur Dev-Seite
+        self.driver.get(f"{base_url}/dev")
+
+        # Warte bis Tabelle geladen ist
+        self.wait.until(
+            EC.presence_of_element_located((By.CSS_SELECTOR, "table.data-table"))
+        )
+
+        # Finde die User-Row anhand des Vornamens
+        # Die Tabelle hat Spalten: First name | Last name | E-Mail | ...
+        rows = self.driver.find_elements(By.CSS_SELECTOR, "table.data-table tbody tr.table-row")
+
+        for row in rows:
+            cells = row.find_elements(By.TAG_NAME, "td")
+            if cells and user_name in cells[0].text:  # cells[0] ist "First name"
+                # Klicke auf die Row
+                self.wait.until(EC.element_to_be_clickable(row))
+                row.click()
+                break
+        else:
+            raise Exception(f"User '{user_name}' nicht in der Dev-User-Tabelle gefunden")
+
+        # Warte auf Modal und klicke "Yes"
+        yes_button = self.wait.until(
+            EC.element_to_be_clickable(self.MODAL_YES_BUTTON)
+        )
+        yes_button.click()
+
+        # Warte bis Modal geschlossen ist
+        self.wait.until(
+            EC.invisibility_of_element_located((By.CSS_SELECTOR, "div.modal-container"))
+        )
\ No newline at end of file
diff --git a/test/pages/navigation.py b/test/pages/navigation.py
new file mode 100644
index 0000000..7c8ea82
--- /dev/null
+++ b/test/pages/navigation.py
@@ -0,0 +1,29 @@
+# pages/navigation.py
+from selenium.webdriver.common.by import By
+
+from pages.assistant import Assistant
+from pages.base_page import BasePage
+from pages.calculation_page import CalculationPage
+from pages.results_page import ResultsPage
+
+
+class Navigation(BasePage):
+    """Handhabt die SPA-Navigation"""
+
+    # Locators für Navigationselemente
+    MENU_BUTTON = (By.CSS_SELECTOR, "button.menu-toggle")
+    NEW_CALCULATION_LINK = (By.CSS_SELECTOR, "a[href*='/assistant']")
+    RESULTS_LINK = (By.CSS_SELECTOR, "a[href*='/results']")
+
+    def start_calculation(self, base_url):
+        """Navigiert zur Berechnungsseite"""
+        self.driver.get(base_url+"/assistant")
+        self.wait_for_spa_navigation("/assistant")
+        return Assistant(self.driver, self.wait)
+
+
+    def navigate_to_results(self):
+        """Navigiert zur Ergebnisseite"""
+        self.click_button(*self.RESULTS_LINK)
+        self.wait_for_spa_navigation("/results")
+        return ResultsPage(self.driver, self.wait)
\ No newline at end of file
diff --git a/test/pages/results_page.py b/test/pages/results_page.py
new file mode 100644
index 0000000..9d76774
--- /dev/null
+++ b/test/pages/results_page.py
@@ -0,0 +1,35 @@
+# pages/results_page.py
+from selenium.webdriver.common.by import By
+from pages.base_page import BasePage
+
+
+class ResultsPage(BasePage):
+    """Page Object für die Ergebnisseite"""
+
+    # Mapping von Excel-Feldnamen zu Locators
+    RESULT_MAPPING = {
+        "gesamtkosten": (By.ID, "result-total-cost"),
+        "zollgebuehr": (By.ID, "result-customs-fee"),
+        "transportkosten": (By.ID, "result-transport-cost"),
+        "mehrwertsteuer": (By.ID, "result-vat"),
+        # Weitere Ergebnisfelder...
+    }
+
+    def wait_for_results(self):
+        """Wartet bis Ergebnisse geladen sind"""
+        self.wait_for_element(By.CSS_SELECTOR, ".results-container.loaded")
+
+    def read_results(self):
+        """Liest alle Ergebniswerte aus"""
+        self.wait_for_results()
+
+        results = {}
+        for field_name, locator in self.RESULT_MAPPING.items():
+            try:
+                element = self.wait_for_element(*locator)
+                results[field_name] = element.text
+            except Exception as e:
+                print(f"Fehler beim Lesen von '{field_name}': {e}")
+                results[field_name] = None
+
+        return results
\ No newline at end of file
diff --git a/test/pytest.ini b/test/pytest.ini
new file mode 100644
index 0000000..e74e39e
--- /dev/null
+++ b/test/pytest.ini
@@ -0,0 +1,18 @@
+[pytest]
+log_cli = true
+log_cli_level = INFO
+log_cli_format = %(asctime)s [%(levelname)s] %(message)s
+log_cli_date_format = %H:%M:%S
+testpaths = .
+python_files = test_*.py
+python_classes = Test*
+python_functions = test_*
+addopts =
+    -v
+    --tb=short
+    --capture=no
+    --html=reports/report.html
+    --self-contained-html
+markers =
+    smoke: Smoke tests
+    regression: Regression tests
\ No newline at end of file
diff --git a/test/requirements.txt b/test/requirements.txt
new file mode 100644
index 0000000..323adac
--- /dev/null
+++ b/test/requirements.txt
@@ -0,0 +1,5 @@
+pytest==9.0.2
+selenium==4.39.0
+openpyxl==3.1.5
+pytest-html==4.1.1
+webdriver-manager==4.0.2
\ No newline at end of file
diff --git a/test/test_calculation.py b/test/test_calculation.py
new file mode 100644
index 0000000..dd7d95a
--- /dev/null
+++ b/test/test_calculation.py
@@ -0,0 +1,70 @@
+# tests/test_calculation.py
+import pytest
+
+from pages.dev_page import DevPage
+from pages.navigation import Navigation
+from pages.calculation_page import CalculationPage
+from pages.results_page import ResultsPage
+
+
+class TestCalculation:
+    """Testklasse für Berechnungslogik"""
+
+    def test_calculation_workflow(self, driver, wait, base_url, test_data):
+        """
+        Haupttest: Führt einen kompletten Berechnungsdurchlauf durch
+        Wird automatisch für jede Excel-Datei parametrisiert
+        """
+
+        login_page = DevPage(driver, wait)
+        login_page.dev_login(base_url, user_name="John")
+
+
+        # Setup assistant
+        nav = Navigation(driver, wait)
+        assistant = nav.start_calculation(base_url)
+        assistant.search_part_numbers(test_data["input"])
+        assistant.delete_preselected_suppliers()
+        assistant.select_supplier(test_data["input"])
+        assistant.create_calculation(test_data["input"])
+
+        # Fill calculation page
+        calc_page = CalculationPage(driver, wait)
+        calc_page.fill_form(test_data["input"])
+
+        for destination in test_data["input"]["DESTINATION"].values():
+            calc_page.add_destination(destination)
+            calc_page.fill_destination(destination)
+
+        # Ergebnisse lesen
+        results_page = ResultsPage(driver, wait)
+        actual_results = results_page.read_results()
+
+        # Assertions: Vergleich mit erwarteten Werten aus "out" Sheet
+        expected = test_data["expected"]
+
+        for field_name, expected_value in expected.items():
+            actual_value = actual_results.get(field_name)
+
+            # Numerische Werte mit Toleranz vergleichen
+            if self._is_numeric(expected_value):
+                expected_num = float(expected_value)
+                actual_num = float(actual_value.replace("€", "").replace(",", ".").strip())
+
+                assert pytest.approx(expected_num, rel=0.01) == actual_num, \
+                    f"Feld '{field_name}': Erwartet {expected_num}, erhalten {actual_num}"
+            else:
+                # String-Vergleich
+                assert str(actual_value).strip() == str(expected_value).strip(), \
+                    f"Feld '{field_name}': Erwartet '{expected_value}', erhalten '{actual_value}'"
+
+        print(f"✓ Test erfolgreich für {test_data['filename']}")
+
+    @staticmethod
+    def _is_numeric(value):
+        """Prüft ob Wert numerisch ist"""
+        try:
+            float(str(value).replace(",", "."))
+            return True
+        except (ValueError, AttributeError):
+            return False