diff --git a/src/components/scanstations/ScanStationsOverview.svelte b/src/components/scanstations/ScanStationsOverview.svelte
index 9d27551d..fc5e8a0a 100644
--- a/src/components/scanstations/ScanStationsOverview.svelte
+++ b/src/components/scanstations/ScanStationsOverview.svelte
@@ -1,29 +1,29 @@
 <script>
   import { _ } from "svelte-i18n";
   import Toastify from "toastify-js";
-  import { GroupContactService } from "@odit/lfk-client-js";
-  const promise = GroupContactService.groupContactControllerGetAll().then(
+  import { ScanStationService } from "@odit/lfk-client-js";
+  const promise = ScanStationService.scanStationControllerGetAll().then(
     (result) => {
-      current_contacts = result;
+      current_stations = result;
     }
   );
   import store from "../../store";
   import ContactsEmptyState from "./ScanStationsEmptyState.svelte";
   $: searchvalue = "";
   $: active_deletes = [];
-  export let current_contacts = [];
+  export let current_stations = [];
 </script>
 
-{#if store.state.jwtinfo.userdetails.permissions.includes('TEAM:GET')}
+{#if store.state.jwtinfo.userdetails.permissions.includes('STATION:GET')}
   {#await promise}
     <div
       class="bg-teal-lightest border-t-4 border-teal rounded-b text-teal-darkest px-4 py-3 shadow-md my-2"
       role="alert">
-      <p class="font-bold">{$_('contacts-are-being-loaded')}</p>
+      <p class="font-bold">Scanstations are being loaded</p>
       <p class="text-sm">{$_('this-might-take-a-moment')}</p>
     </div>
   {:then}
-    {#if current_contacts.length === 0}
+    {#if current_stations.length === 0}
       <ContactsEmptyState />
     {:else}
       <input
@@ -40,17 +40,17 @@
               <th
                 scope="col"
                 class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                {$_('name')}
+                Description
               </th>
               <th
                 scope="col"
                 class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                {$_('groups')}
+                Track
               </th>
               <th
                 scope="col"
                 class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                {$_('address')}
+                Enabled
               </th>
               <th scope="col" class="relative px-6 py-3">
                 <span class="sr-only">{$_('action')}</span>
@@ -58,19 +58,17 @@
             </tr>
           </thead>
           <tbody class="divide-y divide-gray-200">
-            {#each current_contacts as t}
-              {#if Object.values(t)
+            {#each current_stations as s}
+              {#if Object.values(s)
                 .toString()
                 .toLowerCase()
                 .includes(searchvalue)}
-                <tr data-rowid="team_{t.id}">
+                <tr data-rowid="station_{s.id}">
                   <td class="px-6 py-4 whitespace-nowrap">
                     <div class="flex items-center">
                       <div class="ml-4">
                         <div class="text-sm font-medium text-gray-900">
-                          {t.firstname}
-                          {t.middlename || ''}
-                          {t.lastname}
+                          {s.description}
                         </div>
                       </div>
                     </div>
@@ -79,23 +77,9 @@
                     <div class="flex items-center">
                       <div class="ml-4">
                         <div class="text-sm font-medium text-gray-900">
-                          {#if t.groups.length > 0}
-                            {#each t.groups as g}
-                              {#if g.responseType === 'RUNNERORGANIZATION'}
-                                <a
-                                  href="../orgs/{g.id}"
-                                  class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{g.name}</a>
-                              {:else}
-                                <a
-                                  href="../teams/{g.id}"
-                                  class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{g.parentGroup.name}
-                                  &gt;
-                                  {g.name}</a>
-                              {/if}
-                            {/each}
-                          {:else}
-                            {$_('contact-is-not-a-member-in-any-group')}
-                          {/if}
+                          <a
+                        href="../tracks"
+                        class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800"> {s.track.name || s.track.distance + "m"}</a>
                         </div>
                       </div>
                     </div>
@@ -104,41 +88,36 @@
                     <div class="flex items-center">
                       <div class="ml-4">
                         <div class="text-sm font-medium text-gray-900">
-                          {#if t.address.address1 !== null}
-                            {t.address.address1}<br />
-                            {t.address.address2 || ''}<br />
-                            {t.address.postalcode}
-                            {t.address.city}
-                            {t.address.country}
-                          {/if}
+                          {s.enabled.toString()}
                         </div>
                       </div>
                     </div>
                   </td>
-                  {#if active_deletes[t.id] === true}
+                  {#if active_deletes[s.id] === true}
                     <td
                       class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
                       <button
                         on:click={() => {
-                          active_deletes[t.id] = false;
+                          active_deletes[s.id] = false;
                         }}
                         tabindex="0"
                         class="ml-4 text-indigo-600 hover:text-indigo-900 cursor-pointer">{$_('cancel-delete')}</button>
                       <button
                         on:click={() => {
-                          GroupContactService.groupContactControllerRemove(t.id, false).then(
-                            (resp) => {
-                              current_contacts = current_contacts.filter(
-                                (obj) => obj.id !== t.id
-                              );
-                              Toastify({
-                                text: $_('contact-deleted'),
-                                duration: 500,
-                                backgroundColor:
-                                  'linear-gradient(to right, #00b09b, #96c93d)',
-                              }).showToast();
-                            }
-                          );
+                          //TODO:
+                          // ScanStationService.scanStationControllerRemove(s.id, false).then(
+                          //   (resp) => {
+                          //     current_stations = current_stations.filter(
+                          //       (obj) => obj.id !== t.id
+                          //     );
+                          //     Toastify({
+                          //       text: $_('contact-deleted'),
+                          //       duration: 500,
+                          //       backgroundColor:
+                          //         'linear-gradient(to right, #00b09b, #96c93d)',
+                          //     }).showToast();
+                          //   }
+                          // );
                         }}
                         tabindex="0"
                         class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">{$_('confirm-delete')}</button>
@@ -147,12 +126,12 @@
                     <td
                       class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
                       <a
-                        href="./{t.id}"
+                        href="./{s.id}"
                         class="text-indigo-600 hover:text-indigo-900">{$_('details')}</a>
-                      {#if store.state.jwtinfo.userdetails.permissions.includes('TEAM:DELETE')}
+                      {#if store.state.jwtinfo.userdetails.permissions.includes('STATION:DELETE')}
                         <button
                           on:click={() => {
-                            active_deletes[t.id] = true;
+                            active_deletes[s.id] = true;
                           }}
                           tabindex="0"
                           class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">{$_('delete')}</button>