diff --git a/Database/__pycache__/id.cpython-311.pyc b/Database/__pycache__/id.cpython-311.pyc
index b88ef075..bd9c37d1 100644
Binary files a/Database/__pycache__/id.cpython-311.pyc and b/Database/__pycache__/id.cpython-311.pyc differ
diff --git a/Database/data/ammo.csv b/Database/data/ammo.csv
index 211711ed..d886847c 100644
--- a/Database/data/ammo.csv
+++ b/Database/data/ammo.csv
@@ -1,13 +1,13 @@
 id,type,name,rarity,weight,width,height,stack,value,gunpowder
-NULL,ammoRifle,5.56x45 AP,4,0.02646,1,1,30,7500,15
-NULL,ammoRifle,5.56x45 FMJ,1,0.02646,1,1,30,2500,10
-NULL,ammoRifle,5.56x45 HP,2,0.02646,1,1,30,5000,10
-NULL,ammoPistol,9mm AP,3,0.01984,1,1,45,5000,12
-NULL,ammoPistol,9mm FMJ,1,0.01984,1,1,45,2000,6
-NULL,ammoPistol,9mm HP,2,0.01984,1,1,45,4000,6
-NULL,ammoPistol,.40 S&W AP,3,0.01984,1,1,45,5500,13
-NULL,ammoPistol,.40 S&W FMJ,1,0.01984,1,1,45,3000,7
-NULL,ammoPistol,.40 S&W HP,2,0.01984,1,1,45,4500,7
-NULL,ammoRifle,7.62x39 AP,4,0.02646,1,1,30,5200,15
-NULL,ammoRifle,7.62x39 FMJ,1,0.02646,1,1,30,1800,10
-NULL,ammoRifle,7.62x39 HP,2,0.02646,1,1,30,3600,10
\ No newline at end of file
+NULL,5.56x45,5.56x45 AP,4,0.02646,1,1,30,7500,15
+NULL,5.56x45,5.56x45 FMJ,1,0.02646,1,1,30,2500,10
+NULL,5.56x45,5.56x45 HP,2,0.02646,1,1,30,5000,10
+NULL,9mm,9mm AP,3,0.01984,1,1,45,5000,12
+NULL,9mm,9mm FMJ,1,0.01984,1,1,45,2000,6
+NULL,9mm,9mm HP,2,0.01984,1,1,45,4000,6
+NULL,.40S&W,.40 S&W AP,3,0.01984,1,1,45,5500,13
+NULL,.40S&W,.40 S&W FMJ,1,0.01984,1,1,45,3000,7
+NULL,.40S&W,.40 S&W HP,2,0.01984,1,1,45,4500,7
+NULL,7.62x39,7.62x39 AP,4,0.02646,1,1,30,5200,15
+NULL,7.62x39,7.62x39 FMJ,1,0.02646,1,1,30,1800,10
+NULL,7.62x39,7.62x39 HP,2,0.02646,1,1,30,3600,10
\ No newline at end of file
diff --git a/Database/data/meds.csv b/Database/data/med.csv
similarity index 100%
rename from Database/data/meds.csv
rename to Database/data/med.csv
diff --git a/Database/data/part.csv b/Database/data/part.csv
new file mode 100644
index 00000000..0c09f84c
--- /dev/null
+++ b/Database/data/part.csv
@@ -0,0 +1,31 @@
+id,type,name,rarity,weight,height,width,stack,value,vital,ctype1,ctype2,ctype3,ammocap
+NULL,armag,STANAG 30-Round Magazine,1,0.375,2,1,1,100000,n,5.56x45,NULL,NULL,30
+NULL,glockmag,Glock 22 15-Round Magazine,1,0.21164,1,1,1,70000,n,9mm,.40 S&W,NULL,30
+NULL,glockmag,Glock 33-Round Magazine,3,0.33069,2,1,1,180000,n,9mm,.40 S&W,NULL,33
+NULL,ak47mag,AK47 30-Round Magazine,1,0.375,2,1,1,80000,n,7.62x39,NULL,NULL,30
+NULL,5.56x45muzzle,5.56x45 Flash Hider,1,0.33069,1,1,1,40000,n,NULL,NULL,NULL,NULL
+NULL,5.56x45muzzle,5.56x45 Silencer,3,0.99869,2,1,1,1000000,n,NULL,NULL,NULL,NULL
+NULL,5.56x45muzzle,5.56x45 Muzzle Break,2,0.33069,1,1,1,80000,n,NULL,NULL,NULL,NULL
+NULL,7.62x39muzzle,7.62x39 Flash Hider,1,0.33069,1,1,1,40000,n,NULL,NULL,NULL,NULL
+NULL,7.62x39muzzle,7.62x39 Silencer,3,0.99869,2,1,1,1000000,n,NULL,NULL,NULL,NULL
+NULL,7.62x39muzzle,7.62x39 Slant Break,2,0.33069,1,1,1,80000,n,NULL,NULL,NULL,NULL
+NULL,siderail,Laser,3,0,1,1,1,350000,n,NULL,NULL,NULL,NULL
+NULL,siderail,Flashlight,2,0,1,1,1,100000,n,NULL,NULL,NULL,NULL
+NULL,forgrip,Vertical Foregrip,2,0,1,1,1,100000,n,NULL,NULL,NULL,NULL
+NULL,forgrip,Angled Foregrip,2,0,1,1,1,0,n,NULL,NULL,NULL,NULL
+NULL,optic,EOTech Holographic sight,2,0,1,1,1,700000,n,NULL,NULL,NULL,NULL
+NULL,akstock,Ak47 Wood Stock,1,0,2,1,1,120000,n,NULL,NULL,NULL,NULL
+NULL,akdust,AK47 Ribbed Dust Cover,1,0,2,1,1,130000,n,NULL,NULL,NULL,NULL
+NULL,5.56x45barrel,"16"" 5.56x45 Barrel,1,0,3,1,3,750000,y,5.56x45muzzle,NULL,NULL,NULL
+NULL,5.56x45barrel,"10" 5.56x45 Barrel,3,0,2,1,2,1000000,y,5.56x45muzzle,NULL,NULL,NULL
+NULL,5.56x45barrel,"20" 5.56x45 Barrel,2,0,3,1,2,1000000,y,5.56x45muzzle,NULL,NULL,NULL
+NULL,arguard,"9" Quad Rail Handguard,2,0,2,1,2,300000,y,siderail,siderail,forgrip,NULL
+NULL,arguard,"15" Quad Rail Handguard,1,0,3,1,3,500000,y,siderail,siderail,forgrip,NULL
+NULL,argrip,AR15 Polymer Pistol Grip,2,0,1,1,1,80000,y,NULL,NULL,NULL,NULL
+NULL,argrip,A2 Pistol Grip,1,0,1,1,1,70000,y,NULL,NULL,NULL,NULL
+NULL,arstock,M16 Stock,1,0,2,1,1,200000,y,NULL,NULL,NULL,NULL
+NULL,arstock,AR15 Polymer Stock,2,0,2,1,1,250000,y,NULL,NULL,NULL,NULL
+NULL,akguard,AK47 Wood Handguard,1,0,1,1,1,120000,y,NULL,NULL,NULL,NULL
+NULL,akgrip,AK47 Wood Pistol Grip,1,0,1,1,1,60000,y,NULL,NULL,NULL,NULL
+NULL,g22barrel,Glock 22 4.5" Barrel",1,0,0,0,1,0,y,.40S&Wmuzzle,NULL,NULL,NULL
+NULL,g22upper,Glock 22 Upper Slide,1,0,0,0,1,0,y,opticmini,NULL,NULL,NULL
diff --git a/Database/data/parts.csv b/Database/data/parts.csv
deleted file mode 100644
index 5ef99338..00000000
--- a/Database/data/parts.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-id,type,name,rarity,weight,height,width,stack,value,vital
-NULL,mag,STANAG 30-Round Magazine,1,0.375,2,1,1,100000,n
-NULL,mag,Glock 22 15-Round Magazine,1,0.21164,1,1,1,70000,n
-NULL,mag,Glock 33-Round Magazine,3,0.33069,2,1,1,180000,n
-NULL,mag,AK47 30-Round Magazine,1,0.375,2,1,1,80000,n
-NULL,muzzle,5.56 Flash Hider,1,0.33069,1,1,1,40000,n
-NULL,muzzle,5.56x45 Silencer,3,0.99869,2,1,1,1000000,n
-NULL,muzzle,5.56x45 Muzzle Break,2,0.33069,1,1,1,80000,n
-NULL,muzzle,7.62x39 Flash Hider,1,0.33069,1,1,1,40000,n
-NULL,muzzle,7.62x39 Silencer,3,0.99869,2,1,1,1000000,n
-NULL,muzzle,7.62x39 Slant Break,2,0.33069,1,1,1,80000,n
-NULL,rail,Laser,3,0,1,1,1,350000,n
-NULL,rail,Flashlight,2,0,1,1,1,100000,n
-NULL,forgrip,Vertical Foregrip,2,0,1,1,1,100000,n
-NULL,forgrip,Angled Foregrip,2,0,1,1,1,0,n
-NULL,optic,EOTech Holographic sight,2,0,1,1,1,700000,n
-NULL,stock,Ak47 Wood Stock,1,0,2,1,1,120000,n
-NULL,misc,AK47 Ribbed Dust Cover,1,0,2,1,1,130000,n
-NULL,Barrels,"16"" 5.56x45 Barrel",1,0,3,1,3,750000,y
-NULL,Barrels,"10"" 5.56x45 Barrel",3,0,2,1,2,1000000,y
-NULL,Barrels,"20"" 5.56x45 Barrel",2,0,3,1,2,1000000,y
-NULL,Handguards,"9"" Quad Rail Handguard",2,0,2,1,2,300000,y
-NULL,Handguards,"15"" Quad Rail Handguard",1,0,3,1,3,500000,y
-NULL,Pistol Grips,AR15 Polymer Pistol Grip,2,0,1,1,1,80000,y
-NULL,Pistol Grips,A2 Pistol Grip,1,0,1,1,1,70000,y
-NULL,Stocks,M16 Stock,1,0,2,1,1,200000,y
-NULL,Stocks,AR15 Polymer Stock,2,0,2,1,1,250000,y
-NULL,Handguards,AK47 Wood Handguard,1,0,1,1,1,120000,y
-NULL,Pistol Grips,AK47 Wood Pistol Grip,1,0,1,1,1,60000,y
-NULL,Pistols,"Glock 22 4.5"" Barrel",1,0,0,0,1,0,y
-NULL,Pistols,Glock 22 Upper Slide,1,0,0,0,1,0,y
diff --git a/Database/data/reloading.csv b/Database/data/reload.csv
similarity index 100%
rename from Database/data/reloading.csv
rename to Database/data/reload.csv
diff --git a/Database/data/weapon.csv b/Database/data/weapon.csv
new file mode 100644
index 00000000..a65b436b
--- /dev/null
+++ b/Database/data/weapon.csv
@@ -0,0 +1,6 @@
+id,type,name,rarity,weight,height,width,stack,value,ctype1,ctype2,ctype3,ctype4,ctype5,ctype6,ctype7
+NULL,m16,M16 Receiver Set,3,7.06582,1,1,1,2000000,arstock,5.56x45barrel,armag,argrip,optic,arguard,NULL
+NULL,ar15,AR15 Receiver Set,2,7.06582,1,1,1,1500000,arstock,5.56x45barrel,armag,argrip,optic,arguard,NULL
+NULL,ak47,"Stripped AK47 16"" Barreled Receiver",2,7.06582,1,3,3,1250000,akstock,akguard,ak47mag,akgrip,akstock,akdust,7.62x39muzzle
+NULL,glock22,Glock 22 Lower Receiver,1,0,1,2,0,0,g22barrel,g22upper,glockmag,NULL,NULL,NULL,NULL
+NULL,colt1911,Colt 1911 Lower Receiver,1,0,1,2,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL
diff --git a/Database/data/weapons.csv b/Database/data/weapons.csv
deleted file mode 100644
index 1993c8be..00000000
--- a/Database/data/weapons.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-id,type,name,rarity,weight,height,width,stack,value
-NULL,m16,M16 Receiver Set,3,7.06582,2,1,1,2000000
-NULL,ar15,AR15 Receiver Set,2,7.06582,2,1,1,1500000
-NULL,ak47,"Stripped AK47 16"" Barrel",2,7.06582,3,1,3,1250000
-NULL,glock22,Glock 22 Lower Receiver,1,0,0,0,0,0
-NULL,colt1911,Colt 1911 Lower Receiver,1,0,0,0,0,0
diff --git a/Database/database.db b/Database/database.db
index 77d53f62..35a50d64 100644
Binary files a/Database/database.db and b/Database/database.db differ