diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml
index a819df3d42..670f747716 100644
--- a/Resources/Prototypes/Catalog/Research/technologies.yml
+++ b/Resources/Prototypes/Catalog/Research/technologies.yml
@@ -244,6 +244,21 @@
     - SheetRGlass
     - SheetGlass1
 
+# Avionics Circuitry Technology Tree
+
+- type: technology
+  name: "avionics systems"
+  id: AvionicsSystems
+  description: The latest in fly-by-LV-wire technology
+  icon:
+    sprite: Structures/Machines/computers.rsi
+    state: avionics-systems
+  requiredPoints: 10000
+  requiredTechnologies:
+    - IndustrialEngineering
+  unlockedRecipes:
+    - ShuttleConsoleCircuitboard
+
 # Electromagnetic Theory Technology Tree
 
 - type: technology
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
index 21cc3bd53a..be773721da 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -1,4 +1,4 @@
-# TODO: Add descriptions (10)
+# TODO: Add descriptions (10)
 
 - type: entity
   parent: BaseItem
@@ -99,3 +99,19 @@
   components:
     - type: ComputerBoard
       prototype: ParticleAcceleratorControlBoxUnfinished
+
+- type: entity
+  parent: BaseComputerCircuitboard
+  id: ShuttleConsoleCircuitboard
+  name: Shuttle Console Board
+  components:
+    - type: ComputerBoard
+      prototype: ComputerShuttle
+
+- type: entity
+  parent: BaseComputerCircuitboard
+  id: SyndicateShuttleConsoleCircuitboard
+  name: syndicate shuttle console board
+  components:
+    - type: ComputerBoard
+      prototype: ComputerShuttleSyndie
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index 3b98beb836..bd35c3ab85 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -39,6 +39,8 @@
     - type: ComputerVisualizer
       key: generic_key
       screen: shuttle
+  - type: Computer
+    board: ShuttleConsoleCircuitboard
 
 - type: entity
   parent: ComputerShuttleBase
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 5dfaeffeec..9aac30f988 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -188,6 +188,7 @@
       - ProtolatheMachineCircuitboard
       - KitchenReagentGrinderMachineCircuitboard
       - CrewMonitoringComputerCircuitboard
+      - ShuttleConsoleCircuitboard
       - Bucket
       - MopItem
       - SprayBottle
diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml
index 0910a914c3..64f6f3202b 100644
--- a/Resources/Prototypes/Recipes/Lathes/electronics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml
@@ -150,3 +150,12 @@
   materials:
      Steel: 100
      Plastic: 100
+
+- type: latheRecipe
+  id: ShuttleConsoleCircuitboard
+  icon: Objects/Misc/module.rsi/id_mod.png
+  result: ShuttleConsoleCircuitboard
+  completetime: 1000
+  materials:
+     Steel: 100
+     Plastic: 100
diff --git a/Resources/Textures/Structures/Machines/computers.rsi/avionics-systems.png b/Resources/Textures/Structures/Machines/computers.rsi/avionics-systems.png
new file mode 100644
index 0000000000..fc7ae05513
Binary files /dev/null and b/Resources/Textures/Structures/Machines/computers.rsi/avionics-systems.png differ
diff --git a/Resources/Textures/Structures/Machines/computers.rsi/meta.json b/Resources/Textures/Structures/Machines/computers.rsi/meta.json
index 7f179ffbcf..9cad48e34d 100644
--- a/Resources/Textures/Structures/Machines/computers.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/computers.rsi/meta.json
@@ -2125,6 +2125,9 @@
           1
         ]
       ]
+    },
+    {
+      "name": "avionics-systems"
     }
   ]
 }