diff --git a/common/models/machines/hl_scale/packapunch/p_flag.mdl b/common/models/machines/hl_scale/packapunch/p_flag.mdl
new file mode 100644
index 0000000..702faa1
Binary files /dev/null and b/common/models/machines/hl_scale/packapunch/p_flag.mdl differ
diff --git a/common/models/machines/hl_scale/packapunch/p_flag.mdl_0.pcx b/common/models/machines/hl_scale/packapunch/p_flag.mdl_0.pcx
new file mode 100644
index 0000000..fb385c7
Binary files /dev/null and b/common/models/machines/hl_scale/packapunch/p_flag.mdl_0.pcx differ
diff --git a/common/models/machines/hl_scale/pap.mdl b/common/models/machines/hl_scale/packapunch/p_machine.mdl
similarity index 94%
rename from common/models/machines/hl_scale/pap.mdl
rename to common/models/machines/hl_scale/packapunch/p_machine.mdl
index bbe37e2..9f01845 100644
Binary files a/common/models/machines/hl_scale/pap.mdl and b/common/models/machines/hl_scale/packapunch/p_machine.mdl differ
diff --git a/common/models/machines/hl_scale/pap.mdl_0.pcx b/common/models/machines/hl_scale/packapunch/p_machine.mdl_0.pcx
similarity index 100%
rename from common/models/machines/hl_scale/pap.mdl_0.pcx
rename to common/models/machines/hl_scale/packapunch/p_machine.mdl_0.pcx
diff --git a/common/models/machines/hl_scale/packapunch/p_roller.mdl b/common/models/machines/hl_scale/packapunch/p_roller.mdl
new file mode 100644
index 0000000..e70b2f5
Binary files /dev/null and b/common/models/machines/hl_scale/packapunch/p_roller.mdl differ
diff --git a/common/models/machines/hl_scale/packapunch/p_roller.mdl_0.pcx b/common/models/machines/hl_scale/packapunch/p_roller.mdl_0.pcx
new file mode 100644
index 0000000..b185722
Binary files /dev/null and b/common/models/machines/hl_scale/packapunch/p_roller.mdl_0.pcx differ
diff --git a/common/sounds/machines/packapunch/gear_shift.wav b/common/sounds/machines/packapunch/gear_shift.wav
new file mode 100644
index 0000000..769ef22
Binary files /dev/null and b/common/sounds/machines/packapunch/gear_shift.wav differ
diff --git a/common/sounds/machines/packapunch/tick.wav b/common/sounds/machines/packapunch/tick.wav
new file mode 100644
index 0000000..fe9dfdf
Binary files /dev/null and b/common/sounds/machines/packapunch/tick.wav differ
diff --git a/ctr/nzportable/nzp/sounds/machines/packapunch/upgrade.wav b/ctr/nzportable/nzp/sounds/machines/packapunch/upgrade.wav
new file mode 100644
index 0000000..8ca7635
Binary files /dev/null and b/ctr/nzportable/nzp/sounds/machines/packapunch/upgrade.wav differ
diff --git a/nx/nzportable/nzp/sounds/machines/packapunch/upgrade.wav b/nx/nzportable/nzp/sounds/machines/packapunch/upgrade.wav
new file mode 100644
index 0000000..c11acda
Binary files /dev/null and b/nx/nzportable/nzp/sounds/machines/packapunch/upgrade.wav differ
diff --git a/pc/nzp/sounds/machines/packapunch/upgrade.wav b/pc/nzp/sounds/machines/packapunch/upgrade.wav
new file mode 100644
index 0000000..c11acda
Binary files /dev/null and b/pc/nzp/sounds/machines/packapunch/upgrade.wav differ
diff --git a/psp/nzportable/nzp/sounds/machines/packapunch/upgrade.wav b/psp/nzportable/nzp/sounds/machines/packapunch/upgrade.wav
new file mode 100644
index 0000000..8ca7635
Binary files /dev/null and b/psp/nzportable/nzp/sounds/machines/packapunch/upgrade.wav differ
diff --git a/source/maps/fgd/hl-nzp.fgd b/source/maps/fgd/hl-nzp.fgd
index 5a17bd8..88ab431 100644
--- a/source/maps/fgd/hl-nzp.fgd
+++ b/source/maps/fgd/hl-nzp.fgd
@@ -674,10 +674,26 @@
 	]
 ]
 
-@PointClass size(-32 -32 -32, 32 32 56) base(Item, Appearflags) color(125 196 187) studio("models/machines/hl_scale/pap.mdl") = 
+@PointClass size(-32 -32 -32, 32 32 56) base(Item, Appearflags) color(125 196 187) studio("models/machines/hl_scale/packapunch/p_machine.mdl") = 
 	perk_pap : "Pack-A-Punch" 
 [	
-
+	model(studio) : "Model" : "models/machines/hl_scale/packapunch/p_machine.mdl"
+	skin(integer) : "Skin" : 0
+	oldorigin(vector) : "Floating Weapon Offset" : "0 0 2"
+	oldz(integer) : "Floating Weapon forward velocity" : 30
+	weapon2model(string) : "Roller Model" : "models/machines/hl_scale/packapunch/p_roller.mdl"
+	box1(vector) : "Roller Offset" : "7.5 0.1 6.0"
+	door_model_name(string) : "Flag Model" : "models/machines/hl_scale/packapunch/p_flag.mdl"
+	box3(vector) : "Flag Offset" : "-18 -31.7 18"
+	box2(vector) : "Spark Offset" : "17 0 6"
+	cost(integer) : "Cost" :  5000
+	oldmodel(string) : "Upgrade Sound" : "sounds/machines/packapunch/upgrade.wav"
+	spawnflags(Flags) =
+	[
+		1: "Use Rollers": 1
+		2: "Use Flag" : 1
+		4: "No Spark" : 0
+	]
 ]
 
 @PointClass size(-24 -24 -32, 24 24 56) base(Item, Appearflags) color(0 117 58) studio("models/machines/hl_scale/speed_cola.mdl") = 
diff --git a/source/maps/fgd/tb-nzp.fgd b/source/maps/fgd/tb-nzp.fgd
index ad2e76b..da63ac7 100644
--- a/source/maps/fgd/tb-nzp.fgd
+++ b/source/maps/fgd/tb-nzp.fgd
@@ -674,10 +674,26 @@
 	]
 ]
 
-@PointClass size(-32 -32 -32, 32 32 56) base(Item, Appearflags) color(125 196 187) model("models/machines/hl_scale/pap.mdl") = 
+@PointClass size(-32 -32 -32, 32 32 56) base(Item, Appearflags) color(125 196 187) model({{ model != Null -> model, {"path":"models/machines/hl_scale/packapunch/p_machine.mdl"} }}) =
 	perk_pap : "Pack-A-Punch" 
 [
-
+	model(model) : "Model" : "models/machines/hl_scale/packapunch/p_machine.mdl"
+	skin(integer) : "Skin" : 0
+	oldorigin(vector) : "Floating Weapon Offset" : "0 0 2"
+	oldz(integer) : "Floating Weapon forward velocity" : 30
+	weapon2model(string) : "Roller Model" : "models/machines/hl_scale/packapunch/p_roller.mdl"
+	box1(vector) : "Roller Offset" : "7.5 0.1 6.0"
+	door_model_name(string) : "Flag Model" : "models/machines/hl_scale/packapunch/p_flag.mdl"
+	box3(vector) : "Flag Offset" : "-18 -31.7 18"
+	box2(vector) : "Spark Offset" : "17 0 6"
+	cost(integer) : "Cost" :  5000
+	oldmodel(string) : "Upgrade Sound" : "sounds/machines/packapunch/upgrade.wav"
+	spawnflags(Flags) =
+	[
+		1: "Use Rollers": 1
+		2: "Use Flag" : 1
+		4: "No Spark" : 0
+	]
 ]
 
 @PointClass size(-24 -24 -32, 24 24 56) base(Item, Appearflags) color(0 117 58) model("models/machines/hl_scale/speed_cola.mdl") = 
diff --git a/vita/data/nzp/nzp/sounds/machines/packapunch/upgrade.wav b/vita/data/nzp/nzp/sounds/machines/packapunch/upgrade.wav
new file mode 100644
index 0000000..c11acda
Binary files /dev/null and b/vita/data/nzp/nzp/sounds/machines/packapunch/upgrade.wav differ