diff --git a/railsignal-app/src/api/components.js b/railsignal-app/src/api/components.js
new file mode 100644
index 0000000..ecb5c76
--- /dev/null
+++ b/railsignal-app/src/api/components.js
@@ -0,0 +1,80 @@
+import axios from "axios";
+import {API_URL} from "./constants";
+
+export function refreshComponents(rs) {
+    return new Promise((resolve, reject) => {
+        axios.get(`${API_URL}/rs/${rs.id}/c`)
+            .then(response => {
+                const previousSelectedComponentId = rs.selectedComponent ? rs.selectedComponent.id : null;
+                rs.components = response.data;
+                if (previousSelectedComponentId !== null) {
+                    const previousComponent = rs.components.find(c => c.id === previousSelectedComponentId);
+                    if (previousComponent) {
+                        rs.selectedComponent = previousComponent;
+                    } else {
+                        rs.selectedComponent = null;
+                    }
+                } else {
+                    rs.selectedComponent = null;
+                }
+                resolve();
+            })
+            .catch(reject);
+    });
+}
+
+export function refreshSomeComponents(rs, components) {
+    const promises = [];
+    for (let i = 0; i < components.length; i++) {
+        const promise = new Promise((resolve, reject) => {
+            axios.get(`${API_URL}/rs/${rs.id}/c/${components[i].id}`)
+                .then(resp => {
+                    const idx = rs.components.findIndex(c => c.id === resp.data.id);
+                    if (idx > -1) rs.components[idx] = resp.data;
+                    resolve();
+                })
+                .catch(reject);
+        });
+        promises.push(promise);
+    }
+    return Promise.all(promises);
+}
+
+export function getComponent(rs, id) {
+    return new Promise((resolve, reject) => {
+        axios.get(`${this.apiUrl}/rs/${rs.id}/c/${id}`)
+            .then(response => resolve(response.data))
+            .catch(reject);
+    });
+}
+
+export function createComponent(rs, data) {
+    return new Promise((resolve, reject) => {
+        axios.post(`${API_URL}/rs/${rs.id}/c`, data)
+            .then(response => {
+                const newComponentId = response.data.id;
+                refreshComponents(rs)
+                    .then(() => {
+                        const newComponent = rs.components.find(c => c.id === newComponentId);
+                        if (newComponent) {
+                            rs.selectedComponent = newComponent;
+                        }
+                        resolve();
+                    })
+                    .catch(reject);
+            })
+            .catch(reject);
+    });
+}
+
+export function removeComponent(rs, id) {
+    return new Promise((resolve, reject) => {
+        axios.delete(`${API_URL}/rs/${rs.id}/c/${id}`)
+            .then(() => {
+                refreshComponents(rs)
+                    .then(resolve)
+                    .catch(reject);
+            })
+            .catch(reject);
+    });
+}
diff --git a/railsignal-app/src/api/constants.js b/railsignal-app/src/api/constants.js
new file mode 100644
index 0000000..51239b5
--- /dev/null
+++ b/railsignal-app/src/api/constants.js
@@ -0,0 +1,2 @@
+export const API_URL = import.meta.env.VITE_API_URL;
+export const WS_URL = import.meta.env.VITE_WS_URL;
\ No newline at end of file
diff --git a/railsignal-app/src/api/paths.js b/railsignal-app/src/api/paths.js
new file mode 100644
index 0000000..afd74f5
--- /dev/null
+++ b/railsignal-app/src/api/paths.js
@@ -0,0 +1,44 @@
+import axios from "axios";
+import {API_URL} from "./constants";
+import {refreshSomeComponents} from "./components";
+
+export function updateConnections(rs, node) {
+    return new Promise((resolve, reject) => {
+        axios.patch(
+            `${API_URL}/rs/${rs.id}/c/${node.id}/connectedNodes`,
+            node
+        )
+            .then(response => {
+                node.connectedNodes = response.data.connectedNodes;
+                resolve();
+            })
+            .catch(reject);
+    });
+}
+
+export function addConnection(rs, node, other) {
+    node.connectedNodes.push(other);
+    return updateConnections(rs, node);
+}
+
+export function removeConnection(rs, node, other) {
+    const idx = node.connectedNodes.findIndex(n => n.id === other.id);
+    return new Promise((resolve, reject) => {
+        if (idx > -1) {
+            node.connectedNodes.splice(idx, 1);
+            updateConnections(rs, node)
+                .then(() => {
+                    const nodes = [];
+                    nodes.push(...node.connectedNodes);
+                    nodes.push(other);
+                    refreshSomeComponents(rs, nodes)
+                        .then(resolve)
+                        .catch(reject);
+                })
+                .catch(reject);
+        } else {
+            resolve();
+        }
+    });
+
+}
\ No newline at end of file
diff --git a/railsignal-app/src/api/railSystems.js b/railsignal-app/src/api/railSystems.js
new file mode 100644
index 0000000..10b8660
--- /dev/null
+++ b/railsignal-app/src/api/railSystems.js
@@ -0,0 +1,38 @@
+import axios from "axios";
+import {API_URL} from "./constants";
+
+export function refreshRailSystems(rsStore) {
+    return new Promise(resolve => {
+        axios.get(`${API_URL}/rs`)
+            .then(response => {
+                rsStore.railSystems = response.data;
+                resolve();
+            })
+            .catch(error => console.error(error));
+    })
+}
+
+export function createRailSystem(rsStore, name) {
+    return new Promise((resolve, reject) => {
+        axios.post(`${API_URL}/rs`, {name: name})
+            .then(response => {
+                const newId = response.data.id;
+                refreshRailSystems(rsStore)
+                    .then(() => resolve(rsStore.railSystems.find(rs => rs.id === newId)))
+                    .catch(error => reject(error));
+            })
+            .catch(error => reject(error));
+    });
+}
+
+export function removeRailSystem(rsStore, id) {
+    return new Promise((resolve, reject) => {
+        axios.delete(`${API_URL}/rs/${id}`)
+            .then(() => {
+                rsStore.selectedRailSystem = null;
+                refreshRailSystems(rsStore)
+                    .then(() => resolve)
+                    .catch(error => reject(error));
+            });
+    });
+}
diff --git a/railsignal-app/src/api/segments.js b/railsignal-app/src/api/segments.js
new file mode 100644
index 0000000..c49e0ec
--- /dev/null
+++ b/railsignal-app/src/api/segments.js
@@ -0,0 +1,50 @@
+import axios from "axios";
+import {API_URL} from "./constants";
+
+/**
+ * Fetches the set of segments for a rail system.
+ * @param {Number} rsId
+ * @returns {Promise<[Object]>}
+ */
+export function getSegments(rsId) {
+    return new Promise((resolve, reject) => {
+        axios.get(`${API_URL}/rs/${rsId}/s`)
+            .then(response => resolve(response.data))
+            .catch(error => reject(error));
+    });
+}
+
+export function refreshSegments(rs) {
+    return new Promise(resolve => {
+        getSegments(rs.id)
+            .then(segments => {
+                rs.segments = segments;
+                resolve();
+            })
+            .catch(error => console.error(error));
+    });
+}
+
+export function createSegment(rs, name) {
+    return new Promise((resolve, reject) => {
+        axios.post(`${API_URL}/rs/${rs.id}/s`, {name: name})
+            .then(() => {
+                refreshSegments(rs)
+                    .then(() => resolve())
+                    .catch(error => reject(error));
+            })
+            .catch(error => reject(error));
+    });
+}
+
+export function removeSegment(rs, segmentId) {
+    return new Promise((resolve, reject) => {
+        axios.delete(`${API_URL}/rs/${rs.id}/${segmentId}`)
+            .then(() => {
+                refreshSegments(rs)
+                    .then(() => resolve())
+                    .catch(error => reject(error));
+            })
+            .catch(error => reject(error));
+    });
+}
diff --git a/railsignal-app/src/api/websocket.js b/railsignal-app/src/api/websocket.js
new file mode 100644
index 0000000..3f4276d
--- /dev/null
+++ b/railsignal-app/src/api/websocket.js
@@ -0,0 +1,33 @@
+import {WS_URL} from "./constants";
+
+export function establishWebsocketConnection(rs) {
+    if (rs.websocket) {
+        rs.websocket.close();
+    }
+    rs.websocket = new WebSocket(`${WS_URL}/${rs.id}`);
+    rs.websocket.onopen = () => {
+        console.log("Opened websocket connection to rail system " + rs.id);
+    };
+    rs.websocket.onclose = event => {
+        if (event.code !== 1000) {
+            console.warn("Lost websocket connection. Attempting to reestablish.");
+            setTimeout(() => {
+                establishWebsocketConnection(rs);
+            }, 3000);
+        }
+        console.log("Closed websocket connection to rail system " + rs.id);
+    };
+    rs.websocket.onmessage = msg => {
+        console.log(msg);
+    };
+    rs.websocket.onerror = error => {
+        console.log(error);
+    };
+}
+
+export function closeWebsocketConnection(rs) {
+    if (rs.websocket) {
+        rs.websocket.close();
+        rs.websocket = null;
+    }
+}
diff --git a/railsignal-app/src/components/AppNavbar.vue b/railsignal-app/src/components/AppNavbar.vue
index cf86a87..efc5878 100644
--- a/railsignal-app/src/components/AppNavbar.vue
+++ b/railsignal-app/src/components/AppNavbar.vue
@@ -23,7 +23,7 @@
           </li>
           <li class="nav-item me-2" v-if="rsStore.selectedRailSystem !== null">
             <button
-                @click="removeRailSystem()"
+                @click="remove()"
                 class="btn btn-danger btn-sm"
                 type="button"
             >
@@ -57,6 +57,7 @@
 import {useRailSystemsStore} from "../stores/railSystemsStore";
 import AddRailSystemModal from "./railsystem/AddRailSystemModal.vue";
 import ConfirmModal from "./ConfirmModal.vue";
+import {refreshRailSystems, removeRailSystem} from "../api/railSystems";
 
 export default {
   name: "AppNavbar",
@@ -68,12 +69,12 @@ export default {
     };
   },
   mounted() {
-    this.rsStore.refreshRailSystems();
+    refreshRailSystems(this.rsStore);
   },
   methods: {
-    removeRailSystem() {
+    remove() {
       this.$refs.confirmModal.showConfirm()
-          .then(() => this.rsStore.removeRailSystem(this.rsStore.selectedRailSystem));
+          .then(() => removeRailSystem(this.rsStore, this.rsStore.selectedRailSystem.id));
 
     }
   }
diff --git a/railsignal-app/src/components/railsystem/AddRailSystemModal.vue b/railsignal-app/src/components/railsystem/AddRailSystemModal.vue
index d5e93fc..0289ace 100644
--- a/railsignal-app/src/components/railsystem/AddRailSystemModal.vue
+++ b/railsignal-app/src/components/railsystem/AddRailSystemModal.vue
@@ -36,6 +36,7 @@
 <script>
 import {useRailSystemsStore} from "../../stores/railSystemsStore";
 import {Modal} from "bootstrap";
+import {createRailSystem} from "../../api/railSystems";
 
 export default {
   name: "AddRailSystem",
@@ -55,7 +56,7 @@ export default {
   },
   methods: {
     formSubmitted() {
-      this.rsStore.createRailSystem(this.formData.rsName)
+      createRailSystem(this.rsStore, this.formData.rsName)
           .then(rs => {
             this.formData.rsName = "";
             const modal = Modal.getInstance(document.getElementById("addRailSystemModal"));
diff --git a/railsignal-app/src/components/railsystem/AddSegmentModal.vue b/railsignal-app/src/components/railsystem/AddSegmentModal.vue
index 2133137..7cc8aa3 100644
--- a/railsignal-app/src/components/railsystem/AddSegmentModal.vue
+++ b/railsignal-app/src/components/railsystem/AddSegmentModal.vue
@@ -47,6 +47,7 @@
 <script>
 import {useRailSystemsStore} from "../../stores/railSystemsStore";
 import {Modal} from "bootstrap";
+import {createSegment} from "../../api/segments";
 
 export default {
   name: "AddSegmentModal",
@@ -67,7 +68,7 @@ export default {
   methods: {
     formSubmitted() {
       const modal = Modal.getInstance(document.getElementById("addSegmentModal"));
-      this.rsStore.addSegment(this.formData.name)
+      createSegment(this.rsStore.selectedRailSystem, this.formData.name)
           .then(() => {
             this.formData.name = "";
             modal.hide();
diff --git a/railsignal-app/src/components/railsystem/RailSystemPropertiesView.vue b/railsignal-app/src/components/railsystem/RailSystemPropertiesView.vue
index 29c1edd..fa72e1f 100644
--- a/railsignal-app/src/components/railsystem/RailSystemPropertiesView.vue
+++ b/railsignal-app/src/components/railsystem/RailSystemPropertiesView.vue
@@ -1,46 +1,57 @@
 <template>
   <h3>Rail System: <em>{{railSystem.name}}</em></h3>
-  <SegmentsView />
-  <button
-      type="button"
-      class="btn btn-success btn-sm me-2"
-      data-bs-toggle="modal"
-      data-bs-target="#addSegmentModal"
-  >
-    Add Segment
-  </button>
+  <SegmentsView :segments="railSystem.segments" v-if="railSystem.segments"/>
+  <div class="dropdown">
+    <button class="btn btn-success btn-sm dropdown-toggle" type="button" id="railSystemAddComponentsToggle" data-bs-toggle="dropdown" aria-expanded="false">
+      Add Component
+    </button>
+    <ul class="dropdown-menu" aria-labelledby="railSystemAddComponentsToggle">
+      <li>
+        <button
+            type="button"
+            class="dropdown-item"
+            data-bs-toggle="modal"
+            data-bs-target="#addSegmentModal"
+        >
+          Add Segment
+        </button>
+      </li>
+      <li v-if="addSignalAllowed()">
+        <button
+            type="button"
+            class="dropdown-item"
+            data-bs-toggle="modal"
+            data-bs-target="#addSignalModal"
+        >
+          Add Signal
+        </button>
+      </li>
+      <li v-if="addSegmentBoundaryAllowed()">
+        <button
+            type="button"
+            class="dropdown-item"
+            data-bs-toggle="modal"
+            data-bs-target="#addSegmentBoundaryModal"
+        >
+          Add Segment Boundary
+        </button>
+      </li>
+      <li v-if="addSwitchAllowed()">
+        <button
+            type="button"
+            class="dropdown-item"
+            data-bs-toggle="modal"
+            data-bs-target="#addSwitchModal"
+        >
+          Add Switch
+        </button>
+      </li>
+    </ul>
+  </div>
   <AddSegmentModal />
-  <span v-if="railSystem.segments && railSystem.segments.length > 0">
-    <button
-        type="button"
-        class="btn btn-success btn-sm me-2"
-        data-bs-toggle="modal"
-        data-bs-target="#addSignalModal"
-    >
-      Add Signal
-    </button>
-    <AddSignalModal />
-    <button
-      type="button"
-      class="btn btn-success btn-sm me-2"
-      data-bs-toggle="modal"
-      data-bs-target="#addSegmentBoundaryModal"
-    >
-      Add Segment Boundary
-    </button>
-    <AddSegmentBoundaryModal />
-  </span>
-  <span v-if="railSystem.components && railSystem.components.length > 1">
-    <button
-        type="button"
-        class="btn btn-success btn-sm"
-        data-bs-toggle="modal"
-        data-bs-target="#addSwitchModal"
-    >
-      Add Switch
-    </button>
-    <AddSwitchModal />
-  </span>
+  <AddSignalModal v-if="addSignalAllowed()" />
+  <AddSegmentBoundaryModal v-if="addSegmentBoundaryAllowed()" />
+  <AddSwitchModal v-if="addSwitchAllowed()" />
 </template>
 
 <script>
@@ -64,6 +75,17 @@ export default {
       type: Object,
       required: true
     }
+  },
+  methods: {
+    addSignalAllowed() {
+      return this.railSystem.segments && this.railSystem.segments.length > 0
+    },
+    addSegmentBoundaryAllowed() {
+      return this.railSystem.segments && this.railSystem.segments.length > 1
+    },
+    addSwitchAllowed() {
+      return this.railSystem.components && this.railSystem.components.length > 1
+    }
   }
 }
 </script>
diff --git a/railsignal-app/src/components/railsystem/SegmentsView.vue b/railsignal-app/src/components/railsystem/SegmentsView.vue
index e8237c9..8b4fe0a 100644
--- a/railsignal-app/src/components/railsystem/SegmentsView.vue
+++ b/railsignal-app/src/components/railsystem/SegmentsView.vue
@@ -1,26 +1,47 @@
 <template>
   <h5>Segments</h5>
+  <input type="search" class="form-control-sm w-100 mb-1" placeholder="Filter by name" v-model="segmentNameFilter" />
   <ul class="list-group overflow-auto mb-2" style="max-height: 200px;">
     <li
-        v-for="segment in rsStore.selectedRailSystem.segments"
+        v-for="segment in filteredSegments()"
         :key="segment.id"
         class="list-group-item"
     >
       {{segment.name}}
-      <button @click.prevent="rsStore.removeSegment(segment.id)" class="btn btn-sm btn-danger float-end">Remove</button>
+      <button @click.prevent="removeSegment(rsStore.selectedRailSystem, segment.id)" class="btn btn-sm btn-danger float-end">Remove</button>
     </li>
   </ul>
 </template>
 
 <script>
 import {useRailSystemsStore} from "../../stores/railSystemsStore";
+import {removeSegment} from "../../api/segments";
 
 export default {
   name: "SegmentsView.vue",
   setup() {
     const rsStore = useRailSystemsStore();
     return {
-      rsStore
+      rsStore,
+      removeSegment
+    }
+  },
+  props: {
+    segments: {
+      type: Array,
+      required: true
+    }
+  },
+  data() {
+    return {
+      segmentNameFilter: null
+    }
+  },
+  methods: {
+    filteredSegments() {
+      if (this.segmentNameFilter === null || this.segmentNameFilter.trim().length === 0) return this.segments;
+      const filterString = this.segmentNameFilter.trim().toLowerCase();
+      return this.segments.filter(segment => segment.name.toLowerCase().includes(filterString));
     }
   }
 }
diff --git a/railsignal-app/src/components/railsystem/component/AddSegmentBoundaryModal.vue b/railsignal-app/src/components/railsystem/component/AddSegmentBoundaryModal.vue
index 7b1add1..9ce6272 100644
--- a/railsignal-app/src/components/railsystem/component/AddSegmentBoundaryModal.vue
+++ b/railsignal-app/src/components/railsystem/component/AddSegmentBoundaryModal.vue
@@ -64,6 +64,7 @@
 <script>
 import {useRailSystemsStore} from "../../../stores/railSystemsStore";
 import {Modal} from "bootstrap";
+import {createComponent} from "../../../api/components";
 
 export default {
   name: "AddSegmentBoundaryModal",
@@ -94,7 +95,7 @@ export default {
     formSubmitted() {
       const modal = Modal.getInstance(document.getElementById("addSegmentBoundaryModal"));
       this.formData.segments = [this.formData.segmentA, this.formData.segmentB];
-      this.rsStore.addComponent(this.formData)
+      createComponent(this.rsStore.selectedRailSystem, this.formData)
           .then(() => {
             modal.hide();
           })
diff --git a/railsignal-app/src/components/railsystem/component/AddSignalModal.vue b/railsignal-app/src/components/railsystem/component/AddSignalModal.vue
index dcfe659..863eada 100644
--- a/railsignal-app/src/components/railsystem/component/AddSignalModal.vue
+++ b/railsignal-app/src/components/railsystem/component/AddSignalModal.vue
@@ -53,6 +53,7 @@
 <script>
 import {useRailSystemsStore} from "../../../stores/railSystemsStore";
 import {Modal} from "bootstrap";
+import {createComponent} from "../../../api/components";
 
 export default {
   name: "AddSignalModal",
@@ -80,7 +81,7 @@ export default {
   methods: {
     formSubmitted() {
       const modal = Modal.getInstance(document.getElementById("addSignalModal"));
-      this.rsStore.addComponent(this.formData)
+      createComponent(this.rsStore.selectedRailSystem, this.formData)
           .then(() => {
             modal.hide();
           })
diff --git a/railsignal-app/src/components/railsystem/component/AddSwitchModal.vue b/railsignal-app/src/components/railsystem/component/AddSwitchModal.vue
index a879041..4c8ac54 100644
--- a/railsignal-app/src/components/railsystem/component/AddSwitchModal.vue
+++ b/railsignal-app/src/components/railsystem/component/AddSwitchModal.vue
@@ -56,6 +56,7 @@
 <script>
 import {useRailSystemsStore} from "../../../stores/railSystemsStore";
 import {Modal} from "bootstrap";
+import {createComponent} from "../../../api/components";
 
 export default {
   name: "AddSwitchModal",
@@ -84,7 +85,7 @@ export default {
   methods: {
     formSubmitted() {
       const modal = Modal.getInstance(document.getElementById("addSwitchModal"));
-      this.rsStore.addComponent(this.formData)
+      createComponent(this.rsStore.selectedRailSystem, this.formData)
           .then(() => {
             modal.hide();
           })
diff --git a/railsignal-app/src/components/railsystem/component/ComponentView.vue b/railsignal-app/src/components/railsystem/component/ComponentView.vue
index b1453d1..fdfb31c 100644
--- a/railsignal-app/src/components/railsystem/component/ComponentView.vue
+++ b/railsignal-app/src/components/railsystem/component/ComponentView.vue
@@ -1,7 +1,9 @@
 <template>
   <div>
     <h3>{{component.name}}</h3>
-    <small class="text-muted">{{component.type}}</small>
+    <small class="text-muted">
+      {{component.type}}
+    </small>
     <table class="table">
       <tbody>
         <tr>
@@ -21,16 +23,13 @@
             </table>
           </td>
         </tr>
-        <tr>
-          <th>Online</th><td>{{component.online}}</td>
-        </tr>
       </tbody>
     </table>
     <SignalComponentView v-if="component.type === 'SIGNAL'" :signal="component" />
     <SegmentBoundaryNodeComponentView v-if="component.type === 'SEGMENT_BOUNDARY'" :node="component" />
     <SwitchComponentView v-if="component.type === 'SWITCH'" :sw="component"/>
     <PathNodeComponentView v-if="component.connectedNodes" :pathNode="component" :railSystem="railSystem" />
-    <button @click="removeComponent()" class="btn btn-sm btn-danger">Remove</button>
+    <button @click="remove()" class="btn btn-sm btn-danger">Remove</button>
   </div>
   <ConfirmModal
       ref="removeConfirm"
@@ -47,6 +46,7 @@ import SegmentBoundaryNodeComponentView from "./SegmentBoundaryNodeComponentView
 import {useRailSystemsStore} from "../../../stores/railSystemsStore";
 import ConfirmModal from "../../ConfirmModal.vue";
 import SwitchComponentView from "./SwitchComponentView.vue";
+import {removeComponent} from "../../../api/components";
 
 export default {
   components: {
@@ -73,9 +73,12 @@ export default {
     }
   },
   methods: {
-    removeComponent() {
+    remove() {
       this.$refs.removeConfirm.showConfirm()
-          .then(() => this.rsStore.removeComponent(this.component.id));
+          .then(() => {
+            removeComponent(this.rsStore.selectedRailSystem, this.component.id)
+                .catch(console.error);
+          });
     }
   }
 }
diff --git a/railsignal-app/src/components/railsystem/component/PathNodeComponentView.vue b/railsignal-app/src/components/railsystem/component/PathNodeComponentView.vue
index 81ece24..422547a 100644
--- a/railsignal-app/src/components/railsystem/component/PathNodeComponentView.vue
+++ b/railsignal-app/src/components/railsystem/component/PathNodeComponentView.vue
@@ -7,7 +7,7 @@
           class="list-group-item"
       >
         {{node.name}}
-        <button @click="rsStore.removeConnection(pathNode, node)" class="btn btn-sm btn-danger float-end">
+        <button @click="remove(node)" class="btn btn-sm btn-danger float-end">
           Remove
         </button>
       </li>
@@ -16,7 +16,7 @@
       There are no connected nodes.
     </p>
     <form
-        @submit.prevent="rsStore.addConnection(pathNode, formData.nodeToAdd)"
+        @submit.prevent="add(formData.nodeToAdd)"
         v-if="getEligibleConnections().length > 0"
         class="input-group mb-3"
     >
@@ -30,16 +30,10 @@
 </template>
 
 <script>
-import {useRailSystemsStore} from "../../../stores/railSystemsStore";
+import {addConnection, removeConnection} from "../../../api/paths";
 
 export default {
   name: "PathNodeComponentView",
-  setup() {
-    const rsStore = useRailSystemsStore();
-    return {
-      rsStore
-    };
-  },
   props: {
     pathNode: {
       type: Object,
@@ -74,6 +68,12 @@ export default {
         }
       }
       return nodes;
+    },
+    remove(node) {
+      removeConnection(this.railSystem, this.pathNode, node);
+    },
+    add(node) {
+      addConnection(this.railSystem, this.pathNode, node);
     }
   }
 }
diff --git a/railsignal-app/src/components/railsystem/component/SegmentBoundaryNodeComponentView.vue b/railsignal-app/src/components/railsystem/component/SegmentBoundaryNodeComponentView.vue
index 223fa94..672e3e4 100644
--- a/railsignal-app/src/components/railsystem/component/SegmentBoundaryNodeComponentView.vue
+++ b/railsignal-app/src/components/railsystem/component/SegmentBoundaryNodeComponentView.vue
@@ -1,19 +1,14 @@
 <template>
   <h5>Segments Connected</h5>
-  <table class="table">
-    <thead>
-      <tr>
-        <th>Name</th>
-        <th>Occupied</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr v-for="segment in node.segments" :key="segment.id">
-        <td>{{segment.name}}</td>
-        <td>{{segment.occupied}}</td>
-      </tr>
-    </tbody>
-  </table>
+  <div class="mb-2">
+    <span
+      v-for="segment in node.segments"
+      :key="segment.id"
+      class="badge bg-secondary me-1"
+    >
+      {{segment.name}}
+    </span>
+  </div>
 </template>
 
 <script>
diff --git a/railsignal-app/src/components/railsystem/component/SwitchComponentView.vue b/railsignal-app/src/components/railsystem/component/SwitchComponentView.vue
index 717ec78..f6b4e68 100644
--- a/railsignal-app/src/components/railsystem/component/SwitchComponentView.vue
+++ b/railsignal-app/src/components/railsystem/component/SwitchComponentView.vue
@@ -1,6 +1,10 @@
 <template>
     <h5>Switch Configurations</h5>
-    <ul class="list-group list-group-flush border" v-if="sw.possibleConfigurations.length > 0" style="overflow: auto; max-height: 150px;">
+    <ul
+        class="list-group list-group-flush border mb-2"
+        v-if="sw.possibleConfigurations.length > 0"
+        style="overflow: auto; max-height: 150px;"
+    >
       <li
           v-for="config in sw.possibleConfigurations"
           :key="config.id"
diff --git a/railsignal-app/src/stores/railSystemsStore.js b/railsignal-app/src/stores/railSystemsStore.js
index 8516bbf..b81c349 100644
--- a/railsignal-app/src/stores/railSystemsStore.js
+++ b/railsignal-app/src/stores/railSystemsStore.js
@@ -1,5 +1,7 @@
-import { defineStore } from "pinia";
-import axios from "axios";
+import {defineStore} from "pinia";
+import {refreshSegments} from "../api/segments"
+import {refreshComponents} from "../api/components";
+import {closeWebsocketConnection, establishWebsocketConnection} from "../api/websocket";
 
 export const useRailSystemsStore = defineStore('RailSystemsStore', {
     state: () => ({
@@ -12,173 +14,21 @@ export const useRailSystemsStore = defineStore('RailSystemsStore', {
          * websocket: WebSocket | null
          * } | null}
          */
-        selectedRailSystem: null,
-        websocket: null,
-        apiUrl: import.meta.env.VITE_API_URL,
-        wsUrl: import.meta.env.VITE_WS_URL
+        selectedRailSystem: null
     }),
     actions: {
-        refreshRailSystems() {
-            return new Promise((resolve, reject) => {
-                axios.get(this.apiUrl + "/rs")
-                    .then(response => {
-                        this.railSystems = response.data;
-                        resolve();
-                    })
-                    .catch(error => {
-                        reject(error);
-                    });
-            });
-        },
-        createRailSystem(name) {
-            return new Promise((resolve, reject) => {
-                axios.post(this.apiUrl + "/rs", {name: name})
-                    .then(response => {
-                        const newId = response.data.id;
-                        this.refreshRailSystems()
-                            .then(() => resolve(this.railSystems.find(rs => rs.id === newId)))
-                            .catch(error => reject(error));
-                    })
-                    .catch(error => reject(error));
-            });
-        },
-        removeRailSystem(rs) {
-            return new Promise((resolve, reject) => {
-                axios.delete(this.apiUrl + "/rs/" + rs.id)
-                    .then(() => {
-                        this.selectedRailSystem = null;
-                        this.refreshRailSystems()
-                            .then(() => resolve)
-                            .catch(error => reject(error));
-                    })
-            })
-        },
-        refreshSegments(rs) {
-            return new Promise(resolve => {
-                axios.get(`${this.apiUrl}/rs/${rs.id}/s`)
-                    .then(response => {
-                        rs.segments = response.data;
-                        resolve();
-                    });
-            });
-        },
-        refreshAllComponents(rs) {
-            return new Promise(resolve => {
-                axios.get(`${this.apiUrl}/rs/${rs.id}/c`)
-                    .then(response => {
-                        rs.selectedComponent = null;
-                        rs.components = response.data;
-                        resolve();
-                    });
-            });
-        },
         onSelectedRailSystemChanged() {
+            this.railSystems.forEach(rs => closeWebsocketConnection(rs));
             if (!this.selectedRailSystem) return;
-            this.refreshSegments(this.selectedRailSystem);
-            this.refreshAllComponents(this.selectedRailSystem);
-            if (this.websocket !== null) {
-                this.websocket.close();
-            }
-            console.log(this.wsUrl);
-            this.websocket = new WebSocket(this.wsUrl + "/" + this.selectedRailSystem.id);
-            this.websocket.onopen = event => {
-                console.log("Opened websocket connection.");
-            };
-            this.websocket.onclose = event => {
-                console.log("Closed websocket connection.");
-            };
-            this.websocket.onmessage = (msg) => {
-                console.log(msg);
-            };
-        },
-        addSegment(name) {
-            const rs = this.selectedRailSystem;
-            return new Promise((resolve, reject) => {
-                axios.post(`${this.apiUrl}/rs/${rs.id}/s`, {name: name})
-                    .then(() => {
-                        this.refreshSegments(rs)
-                            .then(() => resolve())
-                            .catch(error => reject(error));
-                    })
-                    .catch(error => reject(error));
-            });
-        },
-        removeSegment(id) {
-            const rs = this.selectedRailSystem;
-            axios.delete(`${this.apiUrl}/rs/${rs.id}/s/${id}`)
-                .then(() => this.refreshSegments(rs))
-                .catch(error => console.log(error));
-        },
-        addComponent(data) {
-            const rs = this.selectedRailSystem;
-            return new Promise((resolve, reject) => {
-                axios.post(`${this.apiUrl}/rs/${rs.id}/c`, data)
-                    .then(() => {
-                        this.refreshAllComponents(rs)
-                            .then(() => resolve())
-                            .catch(error => reject(error));
-                    })
-                    .catch(error => reject(error));
-            });
-        },
-        removeComponent(id) {
-            const rs = this.selectedRailSystem;
-            axios.delete(`${this.apiUrl}/rs/${rs.id}/c/${id}`)
-                .then(() => this.refreshAllComponents(rs))
-                .catch(error => console.log(error));
-        },
-        fetchComponentData(component) {
-            return new Promise(resolve => {
-                const rs = this.selectedRailSystem;
-                axios.get(`${this.apiUrl}/rs/${rs.id}/c/${component.id}`)
-                    .then(response => resolve(response.data))
-                    .catch(error => console.log(error));
-            });
-        },
-        refreshComponents(components) {
-            const rs = this.selectedRailSystem;
-            for (let i = 0; i < components.length; i++) {
-                axios.get(`${this.apiUrl}/rs/${rs.id}/c/${components[i].id}`)
-                    .then(resp => {
-                        const idx = this.selectedRailSystem.components.findIndex(c => c.id === resp.data.id);
-                        if (idx > -1) this.selectedRailSystem.components[idx] = resp.data;
-                    })
-                    .catch(error => console.log(error));
-            }
-        },
-        updateConnections(pathNode) {
-            const rs = this.selectedRailSystem;
-            return new Promise(resolve => {
-                axios.patch(
-                    `${this.apiUrl}/rs/${rs.id}/c/${pathNode.id}/connectedNodes`,
-                    pathNode
-                )
-                    .then(response => {
-                        pathNode.connectedNodes = response.data.connectedNodes;
-                        resolve();
-                    })
-                    .catch(error => console.log(error));
-            });
-        },
-        addConnection(pathNode, other) {
-            pathNode.connectedNodes.push(other);
-            this.updateConnections(pathNode)
-                .then(() => {
-                    this.refreshComponents(pathNode.connectedNodes);
-                });
-        },
-        removeConnection(pathNode, other) {
-            const idx = pathNode.connectedNodes.findIndex(n => n.id === other.id);
-            if (idx > -1) {
-                pathNode.connectedNodes.splice(idx, 1);
-                this.updateConnections(pathNode)
-                    .then(() => {
-                        const nodes = [];
-                        nodes.push(pathNode.connectedNodes);
-                        nodes.push(other);
-                        this.refreshComponents(nodes);
-                    })
-            }
+            refreshSegments(this.selectedRailSystem);
+            refreshComponents(this.selectedRailSystem);
+            establishWebsocketConnection(this.selectedRailSystem);
+        }
+    },
+    getters: {
+        rsId() {
+            if (this.selectedRailSystem === null) return null;
+            return this.selectedRailSystem.id;
         }
     }
 });
\ No newline at end of file
diff --git a/src/main/java/nl/andrewl/railsignalapi/dao/LinkTokenRepository.java b/src/main/java/nl/andrewl/railsignalapi/dao/LinkTokenRepository.java
index 28bd909..c7a3ece 100644
--- a/src/main/java/nl/andrewl/railsignalapi/dao/LinkTokenRepository.java
+++ b/src/main/java/nl/andrewl/railsignalapi/dao/LinkTokenRepository.java
@@ -1,12 +1,17 @@
 package nl.andrewl.railsignalapi.dao;
 
 import nl.andrewl.railsignalapi.model.LinkToken;
+import nl.andrewl.railsignalapi.model.RailSystem;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+import java.util.Optional;
+
 @Repository
 public interface LinkTokenRepository extends JpaRepository<LinkToken, Long> {
 	Iterable<LinkToken> findAllByTokenPrefix(String prefix);
 	boolean existsByLabel(String label);
-
+	List<LinkToken> findAllByRailSystem(RailSystem rs);
+	Optional<LinkToken> findByIdAndRailSystemId(long ltId, long rsId);
 }
diff --git a/src/main/java/nl/andrewl/railsignalapi/dao/SegmentRepository.java b/src/main/java/nl/andrewl/railsignalapi/dao/SegmentRepository.java
index ebba876..e021ee4 100644
--- a/src/main/java/nl/andrewl/railsignalapi/dao/SegmentRepository.java
+++ b/src/main/java/nl/andrewl/railsignalapi/dao/SegmentRepository.java
@@ -12,7 +12,7 @@ import java.util.Optional;
 public interface SegmentRepository extends JpaRepository<Segment, Long> {
 	boolean existsByNameAndRailSystem(String name, RailSystem rs);
 
-	List<Segment> findAllByRailSystemId(long rsId);
+	List<Segment> findAllByRailSystemIdOrderByName(long rsId);
 
 	Optional<Segment> findByIdAndRailSystemId(long id, long rsId);
 
diff --git a/src/main/java/nl/andrewl/railsignalapi/live/ComponentDownlink.java b/src/main/java/nl/andrewl/railsignalapi/live/ComponentDownlink.java
index a72dde1..db3aafb 100644
--- a/src/main/java/nl/andrewl/railsignalapi/live/ComponentDownlink.java
+++ b/src/main/java/nl/andrewl/railsignalapi/live/ComponentDownlink.java
@@ -15,6 +15,7 @@ public abstract class ComponentDownlink {
 	}
 
 	public abstract void send(Object msg) throws Exception;
+	public abstract void shutdown() throws Exception;
 
 	@Override
 	public boolean equals(Object o) {
diff --git a/src/main/java/nl/andrewl/railsignalapi/live/ComponentDownlinkService.java b/src/main/java/nl/andrewl/railsignalapi/live/ComponentDownlinkService.java
index aab0fe0..5cf293c 100644
--- a/src/main/java/nl/andrewl/railsignalapi/live/ComponentDownlinkService.java
+++ b/src/main/java/nl/andrewl/railsignalapi/live/ComponentDownlinkService.java
@@ -2,8 +2,9 @@ package nl.andrewl.railsignalapi.live;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import nl.andrewl.railsignalapi.dao.LinkTokenRepository;
 import nl.andrewl.railsignalapi.dao.ComponentRepository;
+import nl.andrewl.railsignalapi.dao.LinkTokenRepository;
+import nl.andrewl.railsignalapi.live.websocket.AppUpdateService;
 import nl.andrewl.railsignalapi.model.component.Component;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -23,6 +24,7 @@ public class ComponentDownlinkService {
 
 	private final LinkTokenRepository tokenRepository;
 	private final ComponentRepository<Component> componentRepository;
+	private final AppUpdateService appUpdateService;
 
 	/**
 	 * Registers a new active downlink to one or more components.
@@ -34,10 +36,11 @@ public class ComponentDownlinkService {
 		componentDownlinks.put(downlink, components.stream().map(Component::getId).collect(Collectors.toSet()));
 		for (var c : components) {
 			c.setOnline(true);
+			componentRepository.save(c);
+			appUpdateService.sendComponentUpdate(c.getRailSystem().getId(), c.getId());
 			Set<ComponentDownlink> downlinks = downlinksByCId.computeIfAbsent(c.getId(), aLong -> new HashSet<>());
 			downlinks.add(downlink);
 		}
-		componentRepository.saveAll(components);
 		log.info("Registered downlink with token id {}.", downlink.getTokenId());
 	}
 
@@ -54,6 +57,7 @@ public class ComponentDownlinkService {
 				componentRepository.findById(cId).ifPresent(component -> {
 					component.setOnline(false);
 					componentRepository.save(component);
+					appUpdateService.sendComponentUpdate(component.getRailSystem().getId(), component.getId());
 				});
 				Set<ComponentDownlink> downlinks = downlinksByCId.get(cId);
 				if (downlinks != null) {
@@ -64,6 +68,11 @@ public class ComponentDownlinkService {
 				}
 			}
 		}
+		try {
+			downlink.shutdown();
+		} catch (Exception e) {
+			log.warn("An error occurred while shutting down a component downlink.", e);
+		}
 		log.info("De-registered downlink with token id {}.", downlink.getTokenId());
 	}
 
diff --git a/src/main/java/nl/andrewl/railsignalapi/live/tcp_socket/TcpLinkManager.java b/src/main/java/nl/andrewl/railsignalapi/live/tcp_socket/TcpLinkManager.java
index e5154bf..bf78068 100644
--- a/src/main/java/nl/andrewl/railsignalapi/live/tcp_socket/TcpLinkManager.java
+++ b/src/main/java/nl/andrewl/railsignalapi/live/tcp_socket/TcpLinkManager.java
@@ -13,7 +13,9 @@ import java.io.IOException;
 import java.net.Socket;
 
 /**
- * This link manager is started when a TCP link is established.
+ * This link manager is started when a TCP link is established, and acts as
+ * both a downlink to the component that we can send messages through, and an
+ * uplink that receives messages from the component.
  */
 @Slf4j
 public class TcpLinkManager extends ComponentDownlink implements Runnable {
@@ -53,12 +55,9 @@ public class TcpLinkManager extends ComponentDownlink implements Runnable {
 		downlinkService.deregisterDownlink(this);
 	}
 
-	public void shutdown() {
-		try {
-			this.socket.close();
-		} catch (IOException e) {
-			log.warn("An error occurred while closing TCP socket.", e);
-		}
+	@Override
+	public void shutdown() throws IOException {
+		socket.close();
 	}
 
 	@Override
diff --git a/src/main/java/nl/andrewl/railsignalapi/live/tcp_socket/TcpSocketServer.java b/src/main/java/nl/andrewl/railsignalapi/live/tcp_socket/TcpSocketServer.java
index 1715e0a..6b13534 100644
--- a/src/main/java/nl/andrewl/railsignalapi/live/tcp_socket/TcpSocketServer.java
+++ b/src/main/java/nl/andrewl/railsignalapi/live/tcp_socket/TcpSocketServer.java
@@ -1,15 +1,14 @@
 package nl.andrewl.railsignalapi.live.tcp_socket;
 
 import lombok.extern.slf4j.Slf4j;
-import nl.andrewl.railsignalapi.dao.LinkTokenRepository;
 import nl.andrewl.railsignalapi.live.ComponentDownlinkService;
 import nl.andrewl.railsignalapi.live.ComponentUplinkMessageHandler;
 import nl.andrewl.railsignalapi.model.LinkToken;
+import nl.andrewl.railsignalapi.service.LinkTokenService;
 import nl.andrewl.railsignalapi.util.JsonUtils;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.event.ContextClosedEvent;
 import org.springframework.context.event.EventListener;
-import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Component;
 
 import java.io.DataInputStream;
@@ -19,6 +18,7 @@ import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.HashSet;
+import java.util.Optional;
 import java.util.Set;
 
 /**
@@ -43,19 +43,16 @@ public class TcpSocketServer {
 	private final ServerSocket serverSocket;
 	private final Set<TcpLinkManager> linkManagers;
 
-	private final LinkTokenRepository tokenRepository;
-	private final PasswordEncoder passwordEncoder;
+	private final LinkTokenService tokenService;
 	private final ComponentDownlinkService componentDownlinkService;
 	private final ComponentUplinkMessageHandler uplinkMessageHandler;
 
 	public TcpSocketServer(
-			LinkTokenRepository tokenRepository,
-			PasswordEncoder passwordEncoder,
+			LinkTokenService linkTokenService,
 			ComponentDownlinkService componentDownlinkService,
 			ComponentUplinkMessageHandler uplinkMessageHandler
 	) throws IOException {
-		this.tokenRepository = tokenRepository;
-		this.passwordEncoder = passwordEncoder;
+		this.tokenService = linkTokenService;
 		this.componentDownlinkService = componentDownlinkService;
 		this.uplinkMessageHandler = uplinkMessageHandler;
 
@@ -86,7 +83,9 @@ public class TcpSocketServer {
 	@EventListener(ContextClosedEvent.class)
 	public void closeServer() throws IOException {
 		serverSocket.close();
-		for (var linkManager : linkManagers) linkManager.shutdown();
+		for (var linkManager : linkManagers) {
+			linkManager.shutdown();
+		}
 	}
 
 	private void initializeConnection(Socket socket) throws IOException {
@@ -98,18 +97,17 @@ public class TcpSocketServer {
 			JsonUtils.writeJsonString(out, new ConnectMessage(false, "Invalid or missing token."));
 			socket.close();
 		} else {
-			Iterable<LinkToken> tokens = tokenRepository.findAllByTokenPrefix(rawToken.substring(0, LinkToken.PREFIX_SIZE));
-			for (var token : tokens) {
-				if (passwordEncoder.matches(rawToken, token.getTokenHash())) {
-					JsonUtils.writeJsonString(out, new ConnectMessage(true, "Connection established."));
-					var linkManager = new TcpLinkManager(token.getId(), socket, componentDownlinkService, uplinkMessageHandler);
-					new Thread(linkManager, "linkManager-" + token.getId()).start();
-					linkManagers.add(linkManager);
-					return;
-				}
+			Optional<LinkToken> optionalToken = tokenService.validateToken(rawToken);
+			if (optionalToken.isPresent()) {
+				LinkToken token = optionalToken.get();
+				JsonUtils.writeJsonString(out, new ConnectMessage(true, "Connection established."));
+				var linkManager = new TcpLinkManager(token.getId(), socket, componentDownlinkService, uplinkMessageHandler);
+				new Thread(linkManager, "LinkManager-" + token.getId()).start();
+				linkManagers.add(linkManager);
+			} else {
+				JsonUtils.writeJsonString(out, new ConnectMessage(false, "Invalid token."));
+				socket.close();
 			}
-			JsonUtils.writeJsonString(out, new ConnectMessage(false, "Invalid token."));
-			socket.close();
 		}
 	}
 }
diff --git a/src/main/java/nl/andrewl/railsignalapi/live/websocket/AppUpdateService.java b/src/main/java/nl/andrewl/railsignalapi/live/websocket/AppUpdateService.java
index 2779dda..0c066e2 100644
--- a/src/main/java/nl/andrewl/railsignalapi/live/websocket/AppUpdateService.java
+++ b/src/main/java/nl/andrewl/railsignalapi/live/websocket/AppUpdateService.java
@@ -32,6 +32,7 @@ public class AppUpdateService {
 	public synchronized void registerSession(long rsId, WebSocketSession session) {
 		Set<WebSocketSession> sessionsForRs = sessions.computeIfAbsent(rsId, x -> new HashSet<>());
 		sessionsForRs.add(session);
+		log.info("Registered a new app websocket session for rail system id " + rsId);
 	}
 
 	public synchronized void deregisterSession(WebSocketSession session) {
@@ -49,6 +50,7 @@ public class AppUpdateService {
 		for (var orphanRsId : orphans) {
 			sessions.remove(orphanRsId);
 		}
+		log.info("De-registered an app websocket session.");
 	}
 
 	public synchronized void sendUpdate(long rsId, Object msg) {
diff --git a/src/main/java/nl/andrewl/railsignalapi/live/websocket/WebsocketDownlink.java b/src/main/java/nl/andrewl/railsignalapi/live/websocket/WebsocketDownlink.java
index a76e635..4340031 100644
--- a/src/main/java/nl/andrewl/railsignalapi/live/websocket/WebsocketDownlink.java
+++ b/src/main/java/nl/andrewl/railsignalapi/live/websocket/WebsocketDownlink.java
@@ -17,4 +17,9 @@ public class WebsocketDownlink extends ComponentDownlink {
 	public void send(Object msg) throws Exception {
 		webSocketSession.sendMessage(new TextMessage(JsonUtils.toJson(msg)));
 	}
+
+	@Override
+	public void shutdown() throws Exception {
+		webSocketSession.close();
+	}
 }
diff --git a/src/main/java/nl/andrewl/railsignalapi/rest/LinkTokensApiController.java b/src/main/java/nl/andrewl/railsignalapi/rest/LinkTokensApiController.java
new file mode 100644
index 0000000..19aadeb
--- /dev/null
+++ b/src/main/java/nl/andrewl/railsignalapi/rest/LinkTokensApiController.java
@@ -0,0 +1,38 @@
+package nl.andrewl.railsignalapi.rest;
+
+import lombok.RequiredArgsConstructor;
+import nl.andrewl.railsignalapi.rest.dto.LinkTokenCreatedResponse;
+import nl.andrewl.railsignalapi.rest.dto.LinkTokenPayload;
+import nl.andrewl.railsignalapi.rest.dto.LinkTokenResponse;
+import nl.andrewl.railsignalapi.service.LinkTokenService;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * Controller for endpoints regarding link tokens.
+ */
+@RestController
+@RequestMapping(path = "/api/rs/{rsId}/lt")
+@RequiredArgsConstructor
+public class LinkTokensApiController {
+	private final LinkTokenService tokenService;
+
+	@GetMapping
+	public List<LinkTokenResponse> getTokens(@PathVariable long rsId) {
+		return tokenService.getTokens(rsId);
+	}
+
+	@PostMapping
+	public LinkTokenCreatedResponse createToken(@PathVariable long rsId, @RequestBody @Valid LinkTokenPayload payload) {
+		return tokenService.createToken(rsId, payload);
+	}
+
+	@DeleteMapping(path = "/{ltId}")
+	public ResponseEntity<Void> deleteToken(@PathVariable long rsId, @PathVariable long ltId) {
+		tokenService.deleteToken(rsId, ltId);
+		return ResponseEntity.noContent().build();
+	}
+}
diff --git a/src/main/java/nl/andrewl/railsignalapi/rest/dto/LinkTokenCreatedResponse.java b/src/main/java/nl/andrewl/railsignalapi/rest/dto/LinkTokenCreatedResponse.java
new file mode 100644
index 0000000..cde3880
--- /dev/null
+++ b/src/main/java/nl/andrewl/railsignalapi/rest/dto/LinkTokenCreatedResponse.java
@@ -0,0 +1,5 @@
+package nl.andrewl.railsignalapi.rest.dto;
+
+public record LinkTokenCreatedResponse(
+		String token
+) {}
diff --git a/src/main/java/nl/andrewl/railsignalapi/rest/dto/LinkTokenPayload.java b/src/main/java/nl/andrewl/railsignalapi/rest/dto/LinkTokenPayload.java
new file mode 100644
index 0000000..ec3f738
--- /dev/null
+++ b/src/main/java/nl/andrewl/railsignalapi/rest/dto/LinkTokenPayload.java
@@ -0,0 +1,12 @@
+package nl.andrewl.railsignalapi.rest.dto;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+public record LinkTokenPayload(
+		@NotNull @NotBlank
+		String label,
+		@NotEmpty
+		long[] componentIds
+) {}
diff --git a/src/main/java/nl/andrewl/railsignalapi/rest/dto/LinkTokenResponse.java b/src/main/java/nl/andrewl/railsignalapi/rest/dto/LinkTokenResponse.java
new file mode 100644
index 0000000..f62f06b
--- /dev/null
+++ b/src/main/java/nl/andrewl/railsignalapi/rest/dto/LinkTokenResponse.java
@@ -0,0 +1,24 @@
+package nl.andrewl.railsignalapi.rest.dto;
+
+import nl.andrewl.railsignalapi.model.LinkToken;
+import nl.andrewl.railsignalapi.model.component.Component;
+import nl.andrewl.railsignalapi.rest.dto.component.out.SimpleComponentResponse;
+
+import java.util.Comparator;
+import java.util.List;
+
+public record LinkTokenResponse(
+		long id,
+		String label,
+		List<SimpleComponentResponse> components
+) {
+	public LinkTokenResponse(LinkToken token) {
+		this(
+				token.getId(),
+				token.getLabel(),
+				token.getComponents().stream()
+						.sorted(Comparator.comparing(Component::getName))
+						.map(SimpleComponentResponse::new).toList()
+		);
+	}
+}
diff --git a/src/main/java/nl/andrewl/railsignalapi/service/LinkTokenService.java b/src/main/java/nl/andrewl/railsignalapi/service/LinkTokenService.java
new file mode 100644
index 0000000..2216fc3
--- /dev/null
+++ b/src/main/java/nl/andrewl/railsignalapi/service/LinkTokenService.java
@@ -0,0 +1,85 @@
+package nl.andrewl.railsignalapi.service;
+
+import lombok.RequiredArgsConstructor;
+import nl.andrewl.railsignalapi.dao.ComponentRepository;
+import nl.andrewl.railsignalapi.dao.LinkTokenRepository;
+import nl.andrewl.railsignalapi.dao.RailSystemRepository;
+import nl.andrewl.railsignalapi.live.ComponentDownlinkService;
+import nl.andrewl.railsignalapi.model.LinkToken;
+import nl.andrewl.railsignalapi.model.component.Component;
+import nl.andrewl.railsignalapi.model.component.ComponentType;
+import nl.andrewl.railsignalapi.rest.dto.LinkTokenCreatedResponse;
+import nl.andrewl.railsignalapi.rest.dto.LinkTokenPayload;
+import nl.andrewl.railsignalapi.rest.dto.LinkTokenResponse;
+import nl.andrewl.railsignalapi.util.StringUtils;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.util.*;
+
+@Service
+@RequiredArgsConstructor
+public class LinkTokenService {
+	private final LinkTokenRepository tokenRepository;
+	private final RailSystemRepository railSystemRepository;
+	private final ComponentRepository<Component> componentRepository;
+	private final PasswordEncoder passwordEncoder;
+	private final ComponentDownlinkService componentDownlinkService;
+
+	@Transactional
+	public LinkTokenCreatedResponse createToken(long rsId, LinkTokenPayload payload) {
+		var rs = railSystemRepository.findById(rsId).orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND));
+		if (tokenRepository.existsByLabel(payload.label())) {
+			throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "There is already a token with that label.");
+		}
+		final Set<ComponentType> validTypes = Set.of(ComponentType.SIGNAL, ComponentType.SWITCH, ComponentType.SEGMENT_BOUNDARY);
+		Set<Component> components = new HashSet<>();
+		for (var cId : payload.componentIds()) {
+			var c = componentRepository.findByIdAndRailSystemId(cId, rsId)
+					.orElseThrow(() -> new ResponseStatusException(HttpStatus.BAD_REQUEST, "Component with id " + cId + " was not found in this rail system."));
+			if (!validTypes.contains(c.getType())) {
+				throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Component with id " + cId + " is not a valid type which allows linking.");
+			}
+			components.add(c);
+		}
+		final String token = StringUtils.randomString(32, StringUtils.ALPHA_NUM);
+		tokenRepository.save(new LinkToken(
+				rs,
+				payload.label(),
+				token.substring(0, LinkToken.PREFIX_SIZE),
+				passwordEncoder.encode(token),
+				components
+		));
+		return new LinkTokenCreatedResponse(token);
+	}
+
+	@Transactional(readOnly = true)
+	public Optional<LinkToken> validateToken(String rawToken) {
+		for (var token : tokenRepository.findAllByTokenPrefix(rawToken.substring(0, LinkToken.PREFIX_SIZE))) {
+			if (passwordEncoder.matches(rawToken, token.getTokenHash())) {
+				return Optional.of(token);
+			}
+		}
+		return Optional.empty();
+	}
+
+	@Transactional(readOnly = true)
+	public List<LinkTokenResponse> getTokens(long rsId) {
+		var rs = railSystemRepository.findById(rsId)
+				.orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND));
+		return tokenRepository.findAllByRailSystem(rs).stream()
+				.sorted(Comparator.comparing(LinkToken::getLabel))
+				.map(LinkTokenResponse::new).toList();
+	}
+
+	@Transactional
+	public void deleteToken(long rsId, long ltId) {
+		var token = tokenRepository.findByIdAndRailSystemId(ltId, rsId)
+				.orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND));
+		componentDownlinkService.deregisterDownlink(token.getId());
+		tokenRepository.delete(token);
+	}
+}
diff --git a/src/main/java/nl/andrewl/railsignalapi/service/SegmentService.java b/src/main/java/nl/andrewl/railsignalapi/service/SegmentService.java
index ce136b1..0513697 100644
--- a/src/main/java/nl/andrewl/railsignalapi/service/SegmentService.java
+++ b/src/main/java/nl/andrewl/railsignalapi/service/SegmentService.java
@@ -35,7 +35,7 @@ public class SegmentService {
 
 	@Transactional(readOnly = true)
 	public List<SegmentResponse> getSegments(long rsId) {
-		return segmentRepository.findAllByRailSystemId(rsId).stream().map(SegmentResponse::new).toList();
+		return segmentRepository.findAllByRailSystemIdOrderByName(rsId).stream().map(SegmentResponse::new).toList();
 	}
 
 	@Transactional(readOnly = true)
diff --git a/src/main/java/nl/andrewl/railsignalapi/util/StringUtils.java b/src/main/java/nl/andrewl/railsignalapi/util/StringUtils.java
new file mode 100644
index 0000000..3c77801
--- /dev/null
+++ b/src/main/java/nl/andrewl/railsignalapi/util/StringUtils.java
@@ -0,0 +1,19 @@
+package nl.andrewl.railsignalapi.util;
+
+import java.security.SecureRandom;
+import java.util.Random;
+
+public final class StringUtils {
+	private StringUtils() {}
+
+	public static final String ALPHA_NUM = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+	private static final Random random = new SecureRandom();
+
+	public static String randomString(int length, String alphabet) {
+		StringBuilder sb = new StringBuilder(length);
+		for (int i = 0; i < length; i++) {
+			sb.append(alphabet.charAt(random.nextInt(alphabet.length())));
+		}
+		return sb.toString();
+	}
+}