diff --git a/src/main/angular/src/app/editor/breadboard/breadboard.component.ts b/src/main/angular/src/app/editor/breadboard/breadboard.component.ts
index 4267424..93386b8 100644
--- a/src/main/angular/src/app/editor/breadboard/breadboard.component.ts
+++ b/src/main/angular/src/app/editor/breadboard/breadboard.component.ts
@@ -120,8 +120,17 @@ export class BreadboardComponent {
       return;
     }
     const wire = new Wire(start, end);
-    console.log("Wire created: ", wire);
+    wire.start.wires.push(wire);
+    wire.end.wires.push(wire);
     this.wires.push(wire);
+    console.log("Wire connected: ", wire);
+  }
+
+  private wireDisconnect(wire: Wire) {
+    this.wires.splice(this.wires.indexOf(wire), 1);
+    wire.start.wires.splice(wire.start.wires.indexOf(wire), 1);
+    wire.end.wires.splice(wire.end.wires.indexOf(wire), 1);
+    console.log("Wire disconnected: ", wire);
   }
 
   private wireReset() {
diff --git a/src/main/angular/src/app/editor/junction/Junction.ts b/src/main/angular/src/app/editor/junction/Junction.ts
index 8c2adc1..bb4695f 100644
--- a/src/main/angular/src/app/editor/junction/Junction.ts
+++ b/src/main/angular/src/app/editor/junction/Junction.ts
@@ -1,3 +1,5 @@
+import {Wire} from "../wire/Wire";
+
 export const JUNCTION_RADIUS_PERCENT = 15;
 
 export class Junction {
@@ -8,6 +10,8 @@ export class Junction {
 
   readonly percentY: number;
 
+  readonly wires: Wire[] = [];
+
   constructor(
     percentX: number,
     percentY: number,