diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 9d6d098e3b..031ded29fa 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -43,12 +43,6 @@
 	if(self_recharge)
 		START_PROCESSING(SSobj, src)
 
-//CHOMPAdd Start
-/obj/item/cell/Initialize()
-	. = ..()
-	update_icon()
-//CHOMPAdd End
-
 /obj/item/cell/Destroy()
 	if(self_recharge)
 		STOP_PROCESSING(SSobj, src)
diff --git a/modular_chomp/code/modules/power/cells/device_cells.dm b/modular_chomp/code/modules/power/cells/device_cells.dm
index d6b152f03e..19e666562b 100644
--- a/modular_chomp/code/modules/power/cells/device_cells.dm
+++ b/modular_chomp/code/modules/power/cells/device_cells.dm
@@ -11,15 +11,14 @@
 	force = 0
 	throw_speed = 5
 	throw_range = 7
+	charge = 480
 	maxcharge = 480
 	charge_amount = 5
 	matter = list(MAT_STEEL = 350, MAT_GLASS = 50)
 	preserve_item = 1
 
-/obj/item/cell/device/empty/Initialize()
-	. = ..()
+/obj/item/cell/device/empty
 	charge = 0
-	update_icon()
 
 /*
  * EMP Proof Device
@@ -32,10 +31,8 @@
 	emp_proof = TRUE
 	origin_tech = list(TECH_POWER = 3)
 
-/obj/item/cell/device/empproof/empty/Initialize()
-	. = ..()
+/obj/item/cell/device/empproof/empty
 	charge = 0
-	update_icon()
 
 /*
  * Weapon
@@ -44,27 +41,25 @@
 	name = "advanced device power cell" //This was a yawn change. I quite like this, makes more sense.
 	desc = "A small upgraded power cell designed to power handheld devices."
 	icon_state = "m_sup"
+	charge = 2400
 	maxcharge = 2400
 	charge_amount = 20
 	origin_tech = list(TECH_POWER = 2)
 
-/obj/item/cell/device/weapon/empty/Initialize()
-	. = ..()
+/obj/item/cell/device/weapon/empty
 	charge = 0
-	update_icon()
 
 /obj/item/cell/device/super
 	name = "super device power cell"
 	desc = "A small upgraded power cell designed to power handheld devices."
-	icon_state = "m_hy" //CHOMP Add
+	icon_state = "m_hy"
+	charge = 3600
 	maxcharge = 3600
 	charge_amount = 20
 	origin_tech = list(TECH_POWER = 3)
 
-/obj/item/cell/device/super/empty/Initialize()
-	. = ..()
+/obj/item/cell/device/super/empty
 	charge = 0
-	update_icon()
 
 /*
  * Hyper
@@ -72,15 +67,14 @@
 /obj/item/cell/device/hyper
 	name = "hyper device power cell"
 	desc = "A small upgraded power cell designed to hold much more power for handheld devices."
-	icon_state = "meb_m_st" //CHOMP Add
+	icon_state = "meb_m_st"
+	charge = 4800
 	maxcharge = 4800
 	charge_amount = 20
 	origin_tech = list(TECH_POWER = 4)
 
-/obj/item/cell/device/hyper/empty/Initialize()
-	. = ..()
+/obj/item/cell/device/hyper/empty
 	charge = 0
-	update_icon()
 
 /*
  * Giga
@@ -89,14 +83,13 @@
 	name = "giga device power cell"
 	desc = "A small power cell that holds a blistering amount of energy, constructed by clever scientists using secrets gleaned from alien technology."
 	icon_state = "meb_m_hi"
+	charge = 10000
 	maxcharge = 10000
 	charge_amount = 20
 	origin_tech = list(TECH_POWER = 8)
 
-/obj/item/cell/device/giga/empty/Initialize()
-	. = ..()
+/obj/item/cell/device/giga/empty
 	charge = 0
-	update_icon()
 
 /*
  * EMP Proof Weapon
@@ -105,16 +98,15 @@
 	name = "shielded weapon power cell"
 	desc = "A small power cell designed to power handheld weaponry. Shielded from EMPs."
 	icon_state = "s_hi"
+	charge = 2400
 	maxcharge = 2400
 	charge_amount = 20
 	matter = list(MAT_STEEL = 400, MAT_GLASS = 60)
 	emp_proof = TRUE
 	origin_tech = list(TECH_POWER = 4)
 
-/obj/item/cell/device/weapon/empproof/empty/Initialize()
-	. = ..()
+/obj/item/cell/device/weapon/empproof/empty
 	charge = 0
-	update_icon()
 
 /*
  * Self-charging Weapon
@@ -161,6 +153,7 @@
 	catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_void_cell)
 	icon = 'icons/obj/abductor.dmi'
 	icon_state = "cell"
+	charge = 5000
 	maxcharge = 5000
 	charge_amount = 130 // 2.5%.
 	charge_delay = 50 // Every five seconds, bit faster than the default.
@@ -192,6 +185,7 @@
 	origin_tech = list(TECH_POWER = 8, TECH_ENGINEERING = 6)
 	icon = 'icons/obj/abductor.dmi'
 	icon_state = "cell"
+	charge = 10000
 	maxcharge = 10000
 	charge_amount = 500
 	self_recharge = TRUE
@@ -226,11 +220,11 @@
 	name = "omni weapon power cell"
 	desc = "A mix between alien technology and phoron-based tech. Not quite as good as a true void cell though."
 	charge_amount = 90 // 2.5%.
+	charge = 3600
 	maxcharge = 3600
 	charge_delay = 50
 	swaps_to = null
 	origin_tech = list(TECH_POWER = 8, TECH_ENGINEERING = 6, TECH_PHORON = 6, TECH_ARCANE = 1, TECH_PRECURSOR = 1)
 
-/obj/item/cell/device/weapon/recharge/alien/omni/empty/Initialize()
-	. = ..()
+/obj/item/cell/device/weapon/recharge/alien/omni/empty
 	charge = 0
diff --git a/modular_chomp/code/modules/power/cells/esoteric_cells.dm b/modular_chomp/code/modules/power/cells/esoteric_cells.dm
index e03b57191f..af3707965a 100644
--- a/modular_chomp/code/modules/power/cells/esoteric_cells.dm
+++ b/modular_chomp/code/modules/power/cells/esoteric_cells.dm
@@ -4,6 +4,7 @@
 	desc = "A modified power cell sitting in a highly conductive chassis."
 	origin_tech = list(TECH_POWER = 2)
 	icon_state = "modded"
+	charge = 10000
 	maxcharge = 10000
 	matter = list(MAT_STEEL = 1000, MAT_GLASS = 80, MAT_SILVER = 100)
 	self_recharge = TRUE