diff --git a/shared/items.lua b/shared/items.lua
index ba4e6b7..91525ad 100644
--- a/shared/items.lua
+++ b/shared/items.lua
@@ -339,6 +339,7 @@ QBShared.Items = {
     ['jerry_can']                       = {['name'] = 'jerry_can',                         ['label'] = 'Jerrycan 20L',              ['weight'] = 20000,        ['type'] = 'item',         ['image'] = 'jerry_can.png',               ['unique'] = false,         ['useable'] = true,      ['shouldClose'] = true,      ['combinable'] = nil,   ['description'] = 'A can full of Fuel'},
 
     -- Mechanic Parts
+    ['veh_toolbox']                     = {['name'] = 'veh_toolbox',                        ['label'] = 'Toolbox',                  ['weight'] = 1000,         ['type'] = 'item',         ['image'] = 'veh_toolbox.png',             ['unique'] = false,         ['useable'] = true,      ['shouldClose'] = true,      ['combinable'] = nil,   ['description'] = 'Check vehicle status'},
     ['veh_armor']                       = {['name'] = 'veh_armor',                          ['label'] = 'Armor',                    ['weight'] = 1000,         ['type'] = 'item',         ['image'] = 'veh_armor.png',               ['unique'] = false,         ['useable'] = true,      ['shouldClose'] = true,      ['combinable'] = nil,   ['description'] = 'Upgrade vehicle armor'},
     ['veh_brakes']                      = {['name'] = 'veh_brakes',                         ['label'] = 'Brakes',                   ['weight'] = 1000,         ['type'] = 'item',         ['image'] = 'veh_brakes.png',              ['unique'] = false,         ['useable'] = true,      ['shouldClose'] = true,      ['combinable'] = nil,   ['description'] = 'Upgrade vehicle brakes'},
     ['veh_engine']                      = {['name'] = 'veh_engine',                         ['label'] = 'Engine',                   ['weight'] = 1000,         ['type'] = 'item',         ['image'] = 'veh_engine.png',              ['unique'] = false,         ['useable'] = true,      ['shouldClose'] = true,      ['combinable'] = nil,   ['description'] = 'Upgrade vehicle engine'},
diff --git a/shared/jobs.lua b/shared/jobs.lua
index 98e805b..1f14a38 100644
--- a/shared/jobs.lua
+++ b/shared/jobs.lua
@@ -1,288 +1,105 @@
 QBShared = QBShared or {}
 QBShared.ForceJobDefaultDutyAtLogin = true -- true: Force duty state to jobdefaultDuty | false: set duty state from database last saved
-QBShared.QBJobsStatus = false -- true: integrate qb-jobs into the whole of qb-core | false: treat qb-jobs as an add-on resource.
-QBShared.Jobs = {} -- All of below has been migrated into qb-jobs
-if QBShared.QBJobsStatus then return end
 QBShared.Jobs = {
-	['unemployed'] = {
-		label = 'Civilian',
-		defaultDuty = true,
-		offDutyPay = false,
+	['unemployed'] = {label = 'Civilian', defaultDuty = true, offDutyPay = false, grades = {['0'] = {name = 'Freelancer', payment = 10}}},
+    ['bus'] =        {label = 'Bus',      defaultDuty = true, offDutyPay = false, grades = {['0'] = {name = 'Driver',     payment = 50}}},
+	['judge'] =      {label = 'Honorary', defaultDuty = true, offDutyPay = false, grades = {['0'] = {name = 'Judge',      payment = 100}}},
+	['lawyer'] =     {label = 'Law Firm', defaultDuty = true, offDutyPay = false, grades = {['0'] = {name = 'Associate',  payment = 50}}},
+	['reporter'] =   {label = 'Reporter', defaultDuty = true, offDutyPay = false, grades = {['0'] = {name = 'Journalist', payment = 50}}},
+	['trucker'] =    {label = 'Trucker',  defaultDuty = true, offDutyPay = false, grades = {['0'] = {name = 'Driver',     payment = 50}}},
+	['tow'] =        {label = 'Towing',   defaultDuty = true, offDutyPay = false, grades = {['0'] = {name = 'Driver',     payment = 50}}},
+	['garbage'] =    {label = 'Garbage',  defaultDuty = true, offDutyPay = false, grades = {['0'] = {name = 'Collector',  payment = 50}}},
+	['vineyard'] =   {label = 'Vineyard', defaultDuty = true, offDutyPay = false, grades = {['0'] = {name = 'Picker',     payment = 50}}},
+	['hotdog'] =     {label = 'Hotdog',   defaultDuty = true, offDutyPay = false, grades = {['0'] = {name = 'Sales',      payment = 50}}},
+
+	['police'] = {label = 'Law Enforcement', type = "leo", defaultDuty = true, offDutyPay = false,
 		grades = {
-            ['0'] = {
-                name = 'Freelancer',
-                payment = 10
-            },
+        	['0'] = {name = 'Recruit', payment = 50},
+			['1'] = {name = 'Officer', payment = 75},
+			['2'] = {name = 'Sergeant', payment = 100},
+			['3'] = {name = 'Lieutenant', payment = 125},
+			['4'] = {name = 'Chief', isboss = true, payment = 150},
         },
 	},
-	['police'] = {
-		label = 'Law Enforcement',
-        type = "leo",
-		defaultDuty = true,
-		offDutyPay = false,
+	['ambulance'] = {label = 'EMS', type = 'ems', defaultDuty = true, offDutyPay = false,
 		grades = {
-            ['0'] = {
-                name = 'Recruit',
-                payment = 50
-            },
-			['1'] = {
-                name = 'Officer',
-                payment = 75
-            },
-			['2'] = {
-                name = 'Sergeant',
-                payment = 100
-            },
-			['3'] = {
-                name = 'Lieutenant',
-                payment = 125
-            },
-			['4'] = {
-                name = 'Chief',
-				isboss = true,
-                payment = 150
-            },
+        	['0'] = {name = 'Recruit', payment = 50},
+			['1'] = {name = 'Paramedic', payment = 75},
+			['2'] = {name = 'Doctor', payment = 100},
+			['3'] = {name = 'Surgeon', payment = 125},
+			['4'] = {name = 'Chief', isboss = true, payment = 150},
         },
 	},
-	['ambulance'] = {
-		label = 'EMS',
-        type = 'ems',
-		defaultDuty = true,
-		offDutyPay = false,
+	['realestate'] = {label = 'Real Estate', defaultDuty = true, offDutyPay = false,
 		grades = {
-            ['0'] = {
-                name = 'Recruit',
-                payment = 50
-            },
-			['1'] = {
-                name = 'Paramedic',
-                payment = 75
-            },
-			['2'] = {
-                name = 'Doctor',
-                payment = 100
-            },
-			['3'] = {
-                name = 'Surgeon',
-                payment = 125
-            },
-			['4'] = {
-                name = 'Chief',
-				isboss = true,
-                payment = 150
-            },
+        	['0'] = {name = 'Recruit', payment = 50},
+			['1'] = {name = 'House Sales', payment = 75},
+			['2'] = {name = 'Business Sales', payment = 100},
+			['3'] = {name = 'Broker', payment = 125},
+			['4'] = {name = 'Manager', isboss = true, payment = 150},
         },
 	},
-	['realestate'] = {
-		label = 'Real Estate',
-		defaultDuty = true,
-		offDutyPay = false,
+	['taxi'] = {label = 'Taxi', defaultDuty = true, offDutyPay = false,
 		grades = {
-            ['0'] = {
-                name = 'Recruit',
-                payment = 50
-            },
-			['1'] = {
-                name = 'House Sales',
-                payment = 75
-            },
-			['2'] = {
-                name = 'Business Sales',
-                payment = 100
-            },
-			['3'] = {
-                name = 'Broker',
-                payment = 125
-            },
-			['4'] = {
-                name = 'Manager',
-				isboss = true,
-                payment = 150
-            },
+        	['0'] = {name = 'Recruit', payment = 50},
+			['1'] = {name = 'Driver', payment = 75},
+			['2'] = {name = 'Event Driver', payment = 100},
+			['3'] = {name = 'Sales', payment = 125},
+			['4'] = {name = 'Manager', isboss = true, payment = 150},
         },
 	},
-	['taxi'] = {
-		label = 'Taxi',
-		defaultDuty = true,
-		offDutyPay = false,
+	['cardealer'] = {label = 'Vehicle Dealer', defaultDuty = true, offDutyPay = false,
 		grades = {
-            ['0'] = {
-                name = 'Recruit',
-                payment = 50
-            },
-			['1'] = {
-                name = 'Driver',
-                payment = 75
-            },
-			['2'] = {
-                name = 'Event Driver',
-                payment = 100
-            },
-			['3'] = {
-                name = 'Sales',
-                payment = 125
-            },
-			['4'] = {
-                name = 'Manager',
-				isboss = true,
-                payment = 150
-            },
+        	['0'] = {name = 'Recruit', payment = 50},
+			['1'] = {name = 'Showroom Sales', payment = 75},
+			['2'] = {name = 'Business Sales', payment = 100},
+			['3'] = {name = 'Finance', payment = 125},
+			['4'] = {name = 'Manager', isboss = true, payment = 150},
         },
 	},
-    ['bus'] = {
-		label = 'Bus',
-		defaultDuty = true,
-		offDutyPay = false,
+	['mechanic'] = {label = 'LS Customs', type = "mechanic", defaultDuty = true, offDutyPay = false,
 		grades = {
-            ['0'] = {
-                name = 'Driver',
-                payment = 50
-            },
-		},
-	},
-	['cardealer'] = {
-		label = 'Vehicle Dealer',
-		defaultDuty = true,
-		offDutyPay = false,
-		grades = {
-            ['0'] = {
-                name = 'Recruit',
-                payment = 50
-            },
-			['1'] = {
-                name = 'Showroom Sales',
-                payment = 75
-            },
-			['2'] = {
-                name = 'Business Sales',
-                payment = 100
-            },
-			['3'] = {
-                name = 'Finance',
-                payment = 125
-            },
-			['4'] = {
-                name = 'Manager',
-				isboss = true,
-                payment = 150
-            },
+        	['0'] = {name = 'Recruit', payment = 50},
+			['1'] = {name = 'Novice', payment = 75},
+			['2'] = {name = 'Experienced', payment = 100},
+			['3'] = {name = 'Advanced', payment = 125},
+			['4'] = {name = 'Manager', isboss = true, payment = 150},
         },
 	},
-	['mechanic'] = {
-		label = 'Mechanic',
-        type = "mechanic",
-		defaultDuty = true,
-		offDutyPay = false,
+    ['mechanic2'] = {label = 'LS Customs', type = "mechanic", defaultDuty = true, offDutyPay = false,
 		grades = {
-            ['0'] = {
-                name = 'Recruit',
-                payment = 50
-            },
-			['1'] = {
-                name = 'Novice',
-                payment = 75
-            },
-			['2'] = {
-                name = 'Experienced',
-                payment = 100
-            },
-			['3'] = {
-                name = 'Advanced',
-                payment = 125
-            },
-			['4'] = {
-                name = 'Manager',
-				isboss = true,
-                payment = 150
-            },
+        	['0'] = {name = 'Recruit', payment = 50},
+			['1'] = {name = 'Novice', payment = 75},
+			['2'] = {name = 'Experienced', payment = 100},
+			['3'] = {name = 'Advanced', payment = 125},
+			['4'] = {name = 'Manager', isboss = true, payment = 150},
         },
 	},
-	['judge'] = {
-		label = 'Honorary',
-		defaultDuty = true,
-		offDutyPay = false,
+    ['mechanic3'] = {label = 'LS Customs', type = "mechanic", defaultDuty = true, offDutyPay = false,
 		grades = {
-            ['0'] = {
-                name = 'Judge',
-                payment = 100
-            },
+        	['0'] = {name = 'Recruit', payment = 50},
+			['1'] = {name = 'Novice', payment = 75},
+			['2'] = {name = 'Experienced', payment = 100},
+			['3'] = {name = 'Advanced', payment = 125},
+			['4'] = {name = 'Manager', isboss = true, payment = 150},
         },
 	},
-	['lawyer'] = {
-		label = 'Law Firm',
-		defaultDuty = true,
-		offDutyPay = false,
+    ['beeker'] = {label = 'Beeker\'s Garage', type = "mechanic", defaultDuty = true, offDutyPay = false,
 		grades = {
-            ['0'] = {
-                name = 'Associate',
-                payment = 50
-            },
+        	['0'] = {name = 'Recruit', payment = 50},
+			['1'] = {name = 'Novice', payment = 75},
+			['2'] = {name = 'Experienced', payment = 100},
+			['3'] = {name = 'Advanced', payment = 125},
+			['4'] = {name = 'Manager', isboss = true, payment = 150},
         },
 	},
-	['reporter'] = {
-		label = 'Reporter',
-		defaultDuty = true,
-		offDutyPay = false,
+    ['bennys'] = {label = 'Benny\'s Original Motor Works', type = "mechanic", defaultDuty = true, offDutyPay = false,
 		grades = {
-            ['0'] = {
-                name = 'Journalist',
-                payment = 50
-            },
+        	['0'] = {name = 'Recruit', payment = 50},
+			['1'] = {name = 'Novice', payment = 75},
+			['2'] = {name = 'Experienced', payment = 100},
+			['3'] = {name = 'Advanced', payment = 125},
+			['4'] = {name = 'Manager', isboss = true, payment = 150},
         },
 	},
-	['trucker'] = {
-		label = 'Trucker',
-		defaultDuty = true,
-		offDutyPay = false,
-		grades = {
-            ['0'] = {
-                name = 'Driver',
-                payment = 50
-            },
-        },
-	},
-	['tow'] = {
-		label = 'Towing',
-		defaultDuty = true,
-		offDutyPay = false,
-		grades = {
-            ['0'] = {
-                name = 'Driver',
-                payment = 50
-            },
-        },
-	},
-	['garbage'] = {
-		label = 'Garbage',
-		defaultDuty = true,
-		offDutyPay = false,
-		grades = {
-            ['0'] = {
-                name = 'Collector',
-                payment = 50
-            },
-        },
-	},
-	['vineyard'] = {
-		label = 'Vineyard',
-		defaultDuty = true,
-		offDutyPay = false,
-		grades = {
-            ['0'] = {
-                name = 'Picker',
-                payment = 50
-            },
-        },
-	},
-	['hotdog'] = {
-		label = 'Hotdog',
-		defaultDuty = true,
-		offDutyPay = false,
-		grades = {
-            ['0'] = {
-                name = 'Sales',
-                payment = 50
-            },
-        },
-	},
-}
+}
\ No newline at end of file