diff --git a/frontend/src/pages/Cache.vue b/frontend/src/pages/Cache.vue
index ef3f49a..db80dbb 100644
--- a/frontend/src/pages/Cache.vue
+++ b/frontend/src/pages/Cache.vue
@@ -147,14 +147,15 @@
     methods: {
       editEndStation() {
         console.log("editEndStation()");
-        const station = this.cache.endStation;
+        const station = this.endStation;
         console.log(station);
         if (station.hasOwnProperty('id')) {
           //this.$router.push({ path: '/station/'+station.id});
         } else {
           // TODO Stationen bearbeitbar machen bevor sie abgeschickt werden. Am besten Station Objekt als Übergabe Parameter bei Router
           this.$store.commit('cacheCollector/SET_TEMPSTATION', station);
-          this.$router.push({path: `/tempstation/${index}`}); // add parameter
+          //this.$router.push({path: `/tempendstation/${index}`}); // add parameter
+          this.$router.push({path: `/tempendstation/`}); // add parameter
         }
 
       },
diff --git a/frontend/src/pages/CacheStart.vue b/frontend/src/pages/CacheStart.vue
index 4619554..2cc51de 100644
--- a/frontend/src/pages/CacheStart.vue
+++ b/frontend/src/pages/CacheStart.vue
@@ -94,8 +94,8 @@
       setParams() {
         console.log("setParams: ");
         let params = {};
-        params.cacheID = this.code.split('/')[0];
-        params.stationID = this.code.split('/')[1];
+        params.cacheID = this.result.split('/')[0];
+        params.stationID = this.result.split('/')[1];
         params.durchgefuehrterCacheID = this.cacheID;
         console.log(params.cacheID + " und " + params.stationID);
         if (localStorage.getItem('userToken')) {
diff --git a/frontend/src/pages/StationEdit.vue b/frontend/src/pages/StationEdit.vue
index 78b29a4..3e1a6e8 100644
--- a/frontend/src/pages/StationEdit.vue
+++ b/frontend/src/pages/StationEdit.vue
@@ -27,8 +27,8 @@
         <q-btn unelevated color="primary" class="full-height" icon="my_location"/>
       </div>
     </div>
-    <p class="text-h6 q-mt-md">Lösung</p>
-    <q-input class="col" dense stack-label filled v-model="station.solution" label="Lösung"/>
+<!--    <p class="text-h6 q-mt-md">Lösung</p>-->
+<!--    <q-input class="col" dense stack-label filled v-model="station.solution" label="Lösung"/>-->
     <!--    <q-input class="col q-mt-md" dense stack-label filled v-model="station.code" label="Code" readonly/>-->
     <div class="row reverse q-mt-md q-gutter-x-md">
       <q-btn @click="saveStation" unelevated color="primary" label="Speichern" icon-right="add"/>
diff --git a/frontend/src/pages/StationEndEdit.vue b/frontend/src/pages/StationEndEdit.vue
new file mode 100644
index 0000000..1f37fc5
--- /dev/null
+++ b/frontend/src/pages/StationEndEdit.vue
@@ -0,0 +1,97 @@
+<template>
+  <div class="q-ma-md">
+    <p class="text-h5">Endstation</p>
+    <p class="text-h6 q-mt-md">Location</p>
+    <q-img transition="fade"
+           class="q-mb-md "
+           :ratio="16/9"
+           src="https://www.buga2019.de/we-bilder/3.Gartenausstellung/Gelaendeplan/190320_Gelaendeplan-quadratisch.jpg"
+    ></q-img>
+    <div class="row q-col-gutter-md">
+      <q-input class="col" dense stack-label filled v-model="latlang" @input="separateLatlang"
+               label="Längengrad/Breitengrad"/>
+      <div class="col-shrink">
+        <q-btn unelevated color="primary" class="full-height" icon="my_location"/>
+      </div>
+    </div>
+<!--    <p class="text-h6 q-mt-md">Lösung</p>-->
+<!--    <q-input class="col" dense stack-label filled v-model="station.solution" label="Lösung"/>-->
+    <!--    <q-input class="col q-mt-md" dense stack-label filled v-model="station.code" label="Code" readonly/>-->
+    <div class="row reverse q-mt-md q-gutter-x-md">
+      <q-btn @click="saveStation" unelevated color="primary" label="Speichern" icon-right="add"/>
+      <q-btn @click="dismiss" unelevated color="negative" label="verwerfen" icon-right="delete"/>
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import {mapGetters} from 'vuex';
+
+  export default {
+    name: "Station",
+
+    data() {
+      return {
+        description: "Rätsel, Aufgabe und Informationen zur Station.",
+        latlang: "",
+        station: {
+          description: "Beschreibung",
+          lattitude: "0.000",
+          longitude: "0.000",
+          solution: "",
+          code: ""
+        },
+        // stationObject: null,
+      }
+    },
+    // props: [ 'stationObject' ],
+    created: function () {
+      //this.isNewStation = (this.$route.params.pos === undefined);
+      console.log("pos: " + this.$route.params.pos);
+      console.log(this.$route);
+      console.log(this.station);
+      this.station = JSON.parse(JSON.stringify(this.tempStation));
+      console.log(this.station);
+    },
+    beforeMount: function () {
+    },
+    mounted: function () {
+      this.concatLatlang();
+    },
+    computed: {
+      ...mapGetters({
+        tempStation: 'cacheCollector/GET_ENDSTATION'
+      }),
+    },
+    methods: {
+      separateLatlang() {
+        //console.log("separateLatlang()");
+        if (this.latlang.includes(',')) {
+          this.station.lattitude = this.latlang.substr(0, this.latlang.indexOf(',')).trim();
+          this.station.longitude = this.latlang.substr(this.latlang.indexOf(',') + 1, this.latlang.length).trim();
+          console.log(this.latlang);
+          console.log(this.station.lattitude + ", " + this.station.longitude);
+        }
+      },
+      concatLatlang() {
+        this.latlang = this.station.lattitude + ", " + this.station.longitude;
+      },
+      saveStation() {
+        console.log("saveStation(): ");
+        console.log(this.station);
+        this.$store.commit('cacheCollector/SET_ENDSTATION', this.station);
+        this.$router.push({path: `/cache`});
+        console.log("station saved..");
+      },
+      dismiss() {
+        //this.$store.commit('cacheCollector/SET_ENDSTATION', null);
+        this.$router.push({path: `/cache`});
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/router/routes.js b/frontend/src/router/routes.js
index d2e6391..1a1e7ff 100644
--- a/frontend/src/router/routes.js
+++ b/frontend/src/router/routes.js
@@ -30,11 +30,21 @@ const routes = [
     component: () => import("layouts/MyLayout.vue"),
     children: [{ path: "", component: () => import("pages/StationEdit.vue") }]
   },
+  {
+    path: "/endstation/",
+    component: () => import("layouts/MyLayout.vue"),
+    children: [{ path: "", component: () => import("pages/StationEndEdit.vue") }]
+  },
   {
     path: "/tempstation/:pos",
     component: () => import("layouts/MyLayout.vue"),
     children: [{path: "", component: () => import("pages/StationEdit.vue")}]
   },
+  {
+    path: "/tempendstation/",
+    component: () => import("layouts/MyLayout.vue"),
+    children: [{path: "", component: () => import("pages/StationEndEdit.vue")}]
+  },
   {
     path: "/station/:cache/:id",
     component: () => import("layouts/MyLayout.vue"),