diff --git a/device-types/APC/AP4431.yaml b/device-types/APC/AP4431.yaml
new file mode 100644
index 00000000..0ba054db
--- /dev/null
+++ b/device-types/APC/AP4431.yaml
@@ -0,0 +1,25 @@
+manufacturer: APC
+model: AP4431
+slug: ap4431
+part_number: AP4431
+u_height: 2
+is_full_depth: false
+comments: Rack ATS, 208V, 30A, (2) L6-30P in, (1) L6-30R Out
+console-ports:
+  - name: Serial
+    type: rj-12
+  - name: usb
+    type: usb-a  
+power-ports:
+  - name: Source A
+    type: nema-l6-30p
+  - name: Source B
+    type: nema-l6-30p
+power-outlets:
+  - name: Outlet
+    type: nema-l6-30r 
+interfaces:
+  - name: Management
+    type: 100base-tx
+    mgmt_only: true
+    
diff --git a/device-types/Dell/networking-s4148f-on.yaml b/device-types/Dell/networking-s4148f-on.yaml
new file mode 100644
index 00000000..640b6892
--- /dev/null
+++ b/device-types/Dell/networking-s4148f-on.yaml
@@ -0,0 +1,120 @@
+manufacturer: Dell
+model: Dell Networking S4148F-ON
+slug: dell-networking-s4148f-on
+part_number: S4148F-ON
+u_height: 1
+is_full_depth: true
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PS1
+    type: iec-60320-c14
+  - name: PS2
+    type: iec-60320-c14
+interfaces:
+  - name: Ethernet 1/1
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/2
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/3
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/4
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/5
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/6
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/7
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/8
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/9
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/11
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/12
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/13
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/14
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/15
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/16
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/17
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/18
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/19
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/21
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/22
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/23
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/24
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/25
+    type: 100gbase-x-qsfp28
+  - name: Ethernet 1/26
+    type: 100gbase-x-qsfp28
+  - name: Ethernet 1/27
+    type: 100gbase-x-qsfp28
+  - name: Ethernet 1/28
+    type: 100gbase-x-qsfp28
+  - name: Ethernet 1/29
+    type: 100gbase-x-qsfp28
+  - name: Ethernet 1/30
+    type: 100gbase-x-qsfp28
+  - name: Ethernet 1/31
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/32
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/33
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/34
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/35
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/36
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/37
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/38
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/39
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/41
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/42
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/43
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/44
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/45
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/46
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/47
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/48
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/49
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/50
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/51
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/52
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/53
+    type: 10gbase-x-sfpp
+  - name: Ethernet 1/54
+    type: 10gbase-x-sfpp
+  - name: Management1
+    type: 1000base-t
+    mgmt_only: true
diff --git a/device-types/Fortinet/FG-60E.yaml b/device-types/Fortinet/FG-60E.yaml
new file mode 100644
index 00000000..f44b755c
--- /dev/null
+++ b/device-types/Fortinet/FG-60E.yaml
@@ -0,0 +1,38 @@
+manufacturer: Fortinet
+model: FortiGate 60E
+slug: fg-60e
+part_number: FGT_60E
+u_height: 1
+is_full_depth: false
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PS1
+    type: nema-5-15p
+    maximum_draw: 14
+    allocated_draw: 12
+interfaces:
+  - name: dmz
+    type: 1000base-t
+  - name: internal1
+    type: 1000base-t
+  - name: internal2
+    type: 1000base-t
+  - name: internal3
+    type: 1000base-t
+  - name: internal4
+    type: 1000base-t
+  - name: internal5
+    type: 1000base-t
+  - name: internal6
+    type: 1000base-t
+  - name: internal7
+    type: 1000base-t
+  - name: internal8
+    type: 1000base-t
+  - name: wan1
+    type: 1000base-t
+  - name: wan2
+    type: 1000base-t
+    
diff --git a/device-types/Juniper/EX3300-48T.yaml b/device-types/Juniper/EX3300-48T.yaml
new file mode 100644
index 00000000..0851ee83
--- /dev/null
+++ b/device-types/Juniper/EX3300-48T.yaml
@@ -0,0 +1,118 @@
+manufacturer: Juniper
+model: EX3300-48T
+slug: ex3300-48t
+interfaces:
+  - name: ge-0/0/0
+    type: 1000base-t
+  - name: ge-0/0/1
+    type: 1000base-t
+  - name: ge-0/0/2
+    type: 1000base-t
+  - name: ge-0/0/3
+    type: 1000base-t
+  - name: ge-0/0/4
+    type: 1000base-t
+  - name: ge-0/0/5
+    type: 1000base-t
+  - name: ge-0/0/6
+    type: 1000base-t
+  - name: ge-0/0/7
+    type: 1000base-t
+  - name: ge-0/0/8
+    type: 1000base-t
+  - name: ge-0/0/9
+    type: 1000base-t
+  - name: ge-0/0/10
+    type: 1000base-t
+  - name: ge-0/0/11
+    type: 1000base-t
+  - name: ge-0/0/12
+    type: 1000base-t
+  - name: ge-0/0/13
+    type: 1000base-t
+  - name: ge-0/0/14
+    type: 1000base-t
+  - name: ge-0/0/15
+    type: 1000base-t
+  - name: ge-0/0/16
+    type: 1000base-t
+  - name: ge-0/0/17
+    type: 1000base-t
+  - name: ge-0/0/18
+    type: 1000base-t
+  - name: ge-0/0/19
+    type: 1000base-t
+  - name: ge-0/0/20
+    type: 1000base-t
+  - name: ge-0/0/21
+    type: 1000base-t
+  - name: ge-0/0/22
+    type: 1000base-t
+  - name: ge-0/0/23
+    type: 1000base-t
+  - name: ge-0/0/24
+    type: 1000base-t
+  - name: ge-0/0/25
+    type: 1000base-t
+  - name: ge-0/0/26
+    type: 1000base-t
+  - name: ge-0/0/27
+    type: 1000base-t
+  - name: ge-0/0/28
+    type: 1000base-t
+  - name: ge-0/0/29
+    type: 1000base-t
+  - name: ge-0/0/30
+    type: 1000base-t
+  - name: ge-0/0/31
+    type: 1000base-t
+  - name: ge-0/0/32
+    type: 1000base-t
+  - name: ge-0/0/33
+    type: 1000base-t
+  - name: ge-0/0/34
+    type: 1000base-t
+  - name: ge-0/0/35
+    type: 1000base-t
+  - name: ge-0/0/36
+    type: 1000base-t
+  - name: ge-0/0/37
+    type: 1000base-t
+  - name: ge-0/0/38
+    type: 1000base-t
+  - name: ge-0/0/39
+    type: 1000base-t
+  - name: ge-0/0/40
+    type: 1000base-t
+  - name: ge-0/0/41
+    type: 1000base-t
+  - name: ge-0/0/42
+    type: 1000base-t
+  - name: ge-0/0/43
+    type: 1000base-t
+  - name: ge-0/0/44
+    type: 1000base-t
+  - name: ge-0/0/45
+    type: 1000base-t
+  - name: ge-0/0/46
+    type: 1000base-t
+  - name: ge-0/0/47
+    type: 1000base-t
+  - name: xe-0/0/0
+    type: 10gbase-x-sfpp
+  - name: xe-0/0/1
+    type: 10gbase-x-sfpp
+  - name: xe-0/0/2
+    type: 10gbase-x-sfpp
+  - name: xe-0/0/3
+    type: 10gbase-x-sfpp
+  - name: me0
+    type: 1000base-t
+    mgmt_only: true
+power-ports:
+  - name: PSU0
+    type: iec-60320-c14
+    maximum_draw: 100
+console-ports:
+  - name: Console
+    type: rj-45
diff --git a/device-types/Panduit/P36G18M.yaml b/device-types/Panduit/P36G18M.yaml
new file mode 100644
index 00000000..114174ff
--- /dev/null
+++ b/device-types/Panduit/P36G18M.yaml
@@ -0,0 +1,161 @@
+manufacturer: Panduit
+model: P36G18M
+slug: p36g18m
+part_number: P36G18M
+u_height: 0
+is_full_depth: false
+console-ports:
+  - name: Serial
+    type: rj-45
+power-ports:
+  - name: Power Port 1
+    type: nema-l6-30p
+power-outlets:
+  - name: Bank 1 Outlet 1
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 1 Outlet 2
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 1 Outlet 3
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 1 Outlet 4
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 1 Outlet 5
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 1 Outlet 6
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 1 Outlet 7
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 1 Outlet 8
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 1 Outlet 9
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 1 Outlet 10
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 1 Outlet 11
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 1 Outlet 12
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 1 Outlet 13
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 1 Outlet 14
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 1 Outlet 15
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 1 Outlet 16
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 1 Outlet 17
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 1 Outlet 18
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 2 Outlet 19
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 2 Outlet 20
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 2 Outlet 21
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 2 Outlet 22
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 2 Outlet 23
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 2 Outlet 24
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 2 Outlet 25
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 2 Outlet 26
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 2 Outlet 27
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 2 Outlet 28
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 2 Outlet 29
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 2 Outlet 30
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 2 Outlet 31
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 2 Outlet 32
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 2 Outlet 33
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 2 Outlet 34
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 2 Outlet 35
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Bank 2 Outlet 36
+    type: iec-60320-c13
+    power_port: Power Port 1
+    feed_leg: A
+interfaces:
+  - name: Network
+    type: 100base-tx
+    mgmt_only: true
diff --git a/device-types/TP-Link/TL-SG1024D.yaml b/device-types/TP-Link/TL-SG1024D.yaml
new file mode 100644
index 00000000..7585bb20
--- /dev/null
+++ b/device-types/TP-Link/TL-SG1024D.yaml
@@ -0,0 +1,58 @@
+manufacturer: TP-Link
+model: TL-SG1024D
+slug: tl-SG1024d
+part_number: TL-SG1024D
+is_full_depth: false
+u_height: 1
+interfaces:
+  - name: '1'
+    type: 1000base-t
+  - name: '2'
+    type: 1000base-t
+  - name: '3'
+    type: 1000base-t
+  - name: '4'
+    type: 1000base-t
+  - name: '5'
+    type: 1000base-t
+  - name: '6'
+    type: 1000base-t
+  - name: '7'
+    type: 1000base-t
+  - name: '8'
+    type: 1000base-t
+  - name: '9'
+    type: 1000base-t
+  - name: '10'
+    type: 1000base-t
+  - name: '11'
+    type: 1000base-t
+  - name: '12'
+    type: 1000base-t
+  - name: '13'
+    type: 1000base-t
+  - name: '14'
+    type: 1000base-t
+  - name: '15'
+    type: 1000base-t
+  - name: '16'
+    type: 1000base-t
+  - name: '17'
+    type: 1000base-t
+  - name: '18'
+    type: 1000base-t
+  - name: '19'
+    type: 1000base-t
+  - name: '20'
+    type: 1000base-t
+  - name: '21'
+    type: 1000base-t
+  - name: '22'
+    type: 1000base-t
+  - name: '23'
+    type: 1000base-t
+  - name: '24'
+    type: 1000base-t
+power-ports:
+  - name: Power
+    type: iec-60320-c14