diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 2f6eac4ebf..b9a5139252 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -103,6 +103,20 @@
     guides:
     - Robotics
 
+# yes i know this prototype name is long i'm just following conventions
+- type: entity
+  id: ResearchAndDevelopmentServerMachineCircuitboard
+  parent: BaseMachineCircuitboard
+  name: R&D server machine board
+  description: A machine printed circuit board for the R&D server.
+  components:
+  - type: Sprite
+    state: science
+  - type: MachineBoard
+    prototype: ResearchAndDevelopmentServer
+    materialRequirements:
+      Plasma: 5
+
 - type: entity
   id: UniformPrinterMachineCircuitboard
   parent: BaseMachineCircuitboard
diff --git a/Resources/Prototypes/Entities/Structures/Machines/research.yml b/Resources/Prototypes/Entities/Structures/Machines/research.yml
index 8f891b4001..b0c3a1bbb2 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/research.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/research.yml
@@ -1,12 +1,15 @@
 - type: entity
   id: ResearchAndDevelopmentServer
-  parent: BaseMachinePowered
+  parent: [ BaseMachinePowered, ConstructibleMachine ]
   name: R&D server
   description: Contains the collective knowledge of the station's scientists. Destroying it would send them back to the stone age. You don't want that do you?
   components:
   - type: Sprite
     sprite: Structures/Machines/server.rsi
-    state: server
+    layers:
+      - state: server
+      - state: server_o
+        map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: ResearchServer
   - type: TechnologyDatabase
     supportedDisciplines:
@@ -18,6 +21,12 @@
     powerLoad: 200
     priority: Low
   - type: ExtensionCableReceiver
+  - type: WiresPanel
+  - type: Wires
+    LayoutId: rndserver
+  - type: WiresVisuals
+  - type: Machine
+    board: ResearchAndDevelopmentServerMachineCircuitboard
   - type: Destructible
     thresholds:
     - trigger:
@@ -40,6 +49,7 @@
           SheetSteel1:
             min: 1
             max: 2
+  - type: Appearance
   - type: AmbientSound
     volume: -9
     range: 5
diff --git a/Resources/Textures/Structures/Machines/server.rsi/server_o.png b/Resources/Textures/Structures/Machines/server.rsi/server_o.png
index 3df09c8f43..ee4553156d 100644
Binary files a/Resources/Textures/Structures/Machines/server.rsi/server_o.png and b/Resources/Textures/Structures/Machines/server.rsi/server_o.png differ