diff --git a/Resources/Locale/en-US/paper/stamp-component.ftl b/Resources/Locale/en-US/paper/stamp-component.ftl
index 2eb6c6e9b3..1592c04989 100644
--- a/Resources/Locale/en-US/paper/stamp-component.ftl
+++ b/Resources/Locale/en-US/paper/stamp-component.ftl
@@ -13,4 +13,5 @@ stamp-component-stamped-name-qm = Quartermaster
 stamp-component-stamped-name-rd = Research Director
 stamp-component-stamped-name-warden = Warden
 stamp-component-stamped-name-trader = Trader
-stamp-component-stamped-name-syndicate = Syndicate
\ No newline at end of file
+stamp-component-stamped-name-syndicate = Syndicate
+stamp-component-stamped-name-ce = Chief Engineer
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 335678ba80..56cec266c3 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -102,6 +102,7 @@
       - id: CigarCase
         prob: 0.15
       - id: DoorRemoteEngineering
+      - id: RubberStampCE
 
 - type: entity
   id: LockerChiefMedicalOfficerFilled
diff --git a/Resources/Prototypes/Entities/Objects/Misc/filing_cabinets.yml b/Resources/Prototypes/Entities/Objects/Misc/filing_cabinets.yml
new file mode 100644
index 0000000000..0c523a5939
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Misc/filing_cabinets.yml
@@ -0,0 +1,66 @@
+- type: entity
+  name: filing cabinet
+  parent: BaseStructure
+  id: filingCabinet
+  description: A cabinet for all your filing needs.
+  components:
+  - type: Storage
+    capacity: 80
+    whitelist:
+      tags:
+        - Document
+        - Folder
+        - Write
+  - type: Sprite
+    netsync: false
+    sprite: Structures/Storage/cabinets.rsi
+    state: filingcabinet
+    noRot: true
+  - type: Appearance
+    visuals:
+    - type: BagOpenCloseVisualizer
+      openIcon: filingcabinet-open
+  - type: UserInterface
+    interfaces:
+    - key: enum.StorageUiKey.Key
+      type: StorageBoundUserInterface
+
+- type: entity
+  name: tall cabinet
+  parent: filingCabinet
+  id: filingCabinetTall
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/cabinets.rsi
+    state: tallcabinet
+  - type: Appearance
+    visuals:
+    - type: BagOpenCloseVisualizer
+      openIcon: tallcabinet-open
+
+- type: entity
+  name: chest drawer
+  parent: BaseStructureDynamic
+  id: filingCabinetDrawer
+  description: A small drawer for all your filing needs, Now with wheels!
+  components:
+  - type: Storage
+    capacity: 50
+    whitelist:
+      tags:
+        - Document
+        - Folder
+        - Write
+  - type: Sprite
+    netsync: false
+    sprite: Structures/Storage/cabinets.rsi
+    state: chestdrawer
+    noRot: true
+  - type: Appearance
+    visuals:
+    - type: BagOpenCloseVisualizer
+      openIcon: chestdrawer-open
+  - type: UserInterface
+    interfaces:
+    - key: enum.StorageUiKey.Key
+      type: StorageBoundUserInterface
diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index 9d113e9c90..ca2ff71027 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -80,7 +80,7 @@
   name: Cybersun pen
   parent: BaseItem
   id: CyberPen
-  description: A high-tech pen straight from Cybersun's legal department, capable of refracting hard-light at impossible angles through its diamond tip in order to write. 
+  description: A high-tech pen straight from Cybersun's legal department, capable of refracting hard-light at impossible angles through its diamond tip in order to write.
   components:
   - type: Tag
     tags:
@@ -133,7 +133,7 @@
 #      black: "#3f3f3f"
   - type: Item
     sprite: Objects/Misc/bureaucracy.rsi
-    size: 20
+    size: 5
   - type: Storage
     capacity: 10
     size: 10
@@ -149,6 +149,21 @@
   - type: Appearance
     visuals:
     - type: MappedItemVisualizer
+  - type: Tag
+    tags:
+    - Folder
+  - type: StorageFill
+    contents:
+      - id: Paper
+        prob: 0.5
+      - id: Paper
+        prob: 0.4
+      - id: Paper
+        prob: 0.3
+      - id: Paper
+        prob: 0.2
+      - id: Paper
+        prob: 0.2
 
 - type: entity
   id: BoxFolderRed
@@ -248,7 +263,6 @@
   - type: Sprite
     sprite: Objects/Misc/bureaucracy.rsi
     state: stamp-cap
-    netsync: false
 
 - type: entity
   name: CentCom rubber stamp
@@ -261,7 +275,6 @@
   - type: Sprite
     sprite: Objects/Misc/bureaucracy.rsi
     state: stamp-cent
-    netsync: false
 
 - type: entity
   name: chaplain's rubber stamp
@@ -274,7 +287,6 @@
   - type: Sprite
     sprite: Objects/Misc/bureaucracy.rsi
     state: stamp-chaplain
-    netsync: false
 
 - type: entity
   name: clown's rubber stamp
@@ -287,7 +299,6 @@
   - type: Sprite
     sprite: Objects/Misc/bureaucracy.rsi
     state: stamp-clown
-    netsync: false
 
 - type: entity
   name: chief medical officer's rubber stamp
@@ -300,7 +311,6 @@
   - type: Sprite
     sprite: Objects/Misc/bureaucracy.rsi
     state: stamp-cmo
-    netsync: false
 
 - type: entity
   name: DENIED rubber stamp
@@ -313,7 +323,6 @@
   - type: Sprite
     sprite: Objects/Misc/bureaucracy.rsi
     state: stamp-deny
-    netsync: false
 
 - type: entity
   name: APPROVED rubber stamp
@@ -326,7 +335,6 @@
   - type: Sprite
     sprite: Objects/Misc/bureaucracy.rsi
     state: stamp-iaa
-    netsync: false
 
 - type: entity
   name: head of personnel's rubber stamp
@@ -339,7 +347,6 @@
   - type: Sprite
     sprite: Objects/Misc/bureaucracy.rsi
     state: stamp-hop
-    netsync: false
 
 - type: entity
   name: head of security's rubber stamp
@@ -352,7 +359,6 @@
   - type: Sprite
     sprite: Objects/Misc/bureaucracy.rsi
     state: stamp-hos
-    netsync: false
 
 - type: entity
   name: quartermaster's rubber stamp
@@ -365,7 +371,6 @@
   - type: Sprite
     sprite: Objects/Misc/bureaucracy.rsi
     state: stamp-qm
-    netsync: false
 
 - type: entity
   name: research director's rubber stamp
@@ -378,7 +383,6 @@
   - type: Sprite
     sprite: Objects/Misc/bureaucracy.rsi
     state: stamp-rd
-    netsync: false
 
 - type: entity
   name: warden's rubber stamp
@@ -391,7 +395,6 @@
   - type: Sprite
     sprite: Objects/Misc/bureaucracy.rsi
     state: stamp-warden
-    netsync: false
 
 - type: entity
   name: trader's rubber stamp
@@ -404,7 +407,6 @@
   - type: Sprite
     sprite: Objects/Misc/bureaucracy.rsi
     state: stamp-trader
-    netsync: false
 
 - type: entity
   name: syndicate rubber stamp
@@ -417,4 +419,15 @@
   - type: Sprite
     sprite: Objects/Misc/bureaucracy.rsi
     state: stamp-syndicate
-    netsync: false
\ No newline at end of file
+
+- type: entity
+  name: chief engineers's rubber stamp
+  parent: RubberStampMime
+  id: RubberStampCE
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-ce
+    stampState: "paper_stamp-ce"
+  - type: Sprite
+    sprite: Objects/Misc/bureaucracy.rsi
+    state: stamp-ce
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index b157a8d7b9..a7fd26174b 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -159,6 +159,9 @@
 - type: Tag
   id: Flashlight
 
+- type: Tag
+  id: Folder
+
 - type: Tag
   id: FootstepSound
 
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/chestdrawer-open.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/chestdrawer-open.png
deleted file mode 100644
index 1a10a7946a..0000000000
Binary files a/Resources/Textures/Objects/Misc/bureaucracy.rsi/chestdrawer-open.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/filingcabinet-open.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/filingcabinet-open.png
deleted file mode 100644
index de589ef189..0000000000
Binary files a/Resources/Textures/Objects/Misc/bureaucracy.rsi/filingcabinet-open.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
index fddc934817..8ec8d3b1dd 100644
--- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
@@ -7,18 +7,6 @@
     "y": 32
   },
   "states": [
-    {
-      "name": "chestdrawer"
-    },
-    {
-      "name": "chestdrawer-open",
-      "delays": [
-        [
-          0.5,
-          0.1
-        ]
-      ]
-    },
     {
       "name": "clipboard"
     },
@@ -43,18 +31,6 @@
     {
       "name": "envelope_torn_overlay"
     },
-    {
-      "name": "filingcabinet"
-    },
-    {
-      "name": "filingcabinet-open",
-      "delays": [
-        [
-          0.5,
-          0.1
-        ]
-      ]
-    },
     {
       "name": "folder-base"
     },
@@ -299,18 +275,6 @@
     {
       "name": "stamp-warden"
     },
-    {
-      "name": "tallcabinet"
-    },
-    {
-      "name": "tallcabinet-open",
-      "delays": [
-        [
-          0.5,
-          0.1
-        ]
-      ]
-    },
     {
       "name": "clipboard-equipped-BELT",
       "directions": 4
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/tallcabinet-open.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/tallcabinet-open.png
deleted file mode 100644
index c69048306a..0000000000
Binary files a/Resources/Textures/Objects/Misc/bureaucracy.rsi/tallcabinet-open.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/cabinets.rsi/chestdrawer-open.png b/Resources/Textures/Structures/Storage/cabinets.rsi/chestdrawer-open.png
new file mode 100644
index 0000000000..4acc2fa1ed
Binary files /dev/null and b/Resources/Textures/Structures/Storage/cabinets.rsi/chestdrawer-open.png differ
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/chestdrawer.png b/Resources/Textures/Structures/Storage/cabinets.rsi/chestdrawer.png
similarity index 100%
rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/chestdrawer.png
rename to Resources/Textures/Structures/Storage/cabinets.rsi/chestdrawer.png
diff --git a/Resources/Textures/Structures/Storage/cabinets.rsi/filingcabinet-open.png b/Resources/Textures/Structures/Storage/cabinets.rsi/filingcabinet-open.png
new file mode 100644
index 0000000000..bb8e09a13c
Binary files /dev/null and b/Resources/Textures/Structures/Storage/cabinets.rsi/filingcabinet-open.png differ
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/filingcabinet.png b/Resources/Textures/Structures/Storage/cabinets.rsi/filingcabinet.png
similarity index 100%
rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/filingcabinet.png
rename to Resources/Textures/Structures/Storage/cabinets.rsi/filingcabinet.png
diff --git a/Resources/Textures/Structures/Storage/cabinets.rsi/meta.json b/Resources/Textures/Structures/Storage/cabinets.rsi/meta.json
new file mode 100644
index 0000000000..2a74d0e3a8
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/cabinets.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "chestdrawer"
+    },
+    {
+      "name": "chestdrawer-open"
+    },
+    {
+      "name": "filingcabinet"
+    },
+    {
+      "name": "filingcabinet-open"
+    },
+    {
+      "name": "tallcabinet"
+    },
+    {
+      "name": "tallcabinet-open"
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Storage/cabinets.rsi/tallcabinet-open.png b/Resources/Textures/Structures/Storage/cabinets.rsi/tallcabinet-open.png
new file mode 100644
index 0000000000..23d12ae63a
Binary files /dev/null and b/Resources/Textures/Structures/Storage/cabinets.rsi/tallcabinet-open.png differ
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/tallcabinet.png b/Resources/Textures/Structures/Storage/cabinets.rsi/tallcabinet.png
similarity index 100%
rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/tallcabinet.png
rename to Resources/Textures/Structures/Storage/cabinets.rsi/tallcabinet.png