diff --git a/zpak001.pk3dir/def/scientist.def b/zpak001.pk3dir/def/monsters/scientist.def
similarity index 100%
rename from zpak001.pk3dir/def/scientist.def
rename to zpak001.pk3dir/def/monsters/scientist.def
diff --git a/zpak001.pk3dir/def/player.def b/zpak001.pk3dir/def/player.def
new file mode 100644
index 0000000..377bfce
--- /dev/null
+++ b/zpak001.pk3dir/def/player.def
@@ -0,0 +1,4 @@
+entityDef player
+{
+	"spawnclass" "HLPlayer"
+}
diff --git a/zpak001.pk3dir/def/spawns.def b/zpak001.pk3dir/def/spawns.def
new file mode 100644
index 0000000..f8d9f14
--- /dev/null
+++ b/zpak001.pk3dir/def/spawns.def
@@ -0,0 +1,44 @@
+entityDef info_player_start
+{
+	"editor_mins" "-16 -16 -36"
+	"editor_maxs" "16 16 36"
+	"editor_description" "Singleplayer Spawn Point"
+	"editor_color" "1 0 0"
+	"spawnclass" "NSSpawnPoint"
+}
+
+entityDef info_player_deathmatch
+{
+	"editor_mins" "-16 -16 -36"
+	"editor_maxs" "16 16 36"
+	"editor_description" "Deathmatch Spawn Point"
+	"editor_color" "1 0 0"
+	"spawnclass" "NSSpawnPoint"
+}
+
+entityDef info_player_coop
+{
+	"editor_mins" "-16 -16 -36"
+	"editor_maxs" "16 16 36"
+	"editor_description" "Cooperative Spawn Point"
+	"editor_color" "1 0 0"
+	"spawnclass" "NSSpawnPoint"
+}
+
+entityDef info_player_team1
+{
+	"editor_mins" "-16 -16 -36"
+	"editor_maxs" "16 16 36"
+	"editor_description" "Red Team Spawn Point"
+	"editor_color" "1 0 0"
+	"spawnclass" "NSSpawnPoint"
+}
+
+entityDef info_player_team2
+{
+	"editor_mins" "-16 -16 -36"
+	"editor_maxs" "16 16 36"
+	"editor_description" "Blue Team Spawn Point"
+	"editor_color" "0 0 1"
+	"spawnclass" "NSSpawnPoint"
+}
\ No newline at end of file
diff --git a/zpak001.pk3dir/def/weapons.def b/zpak001.pk3dir/def/weapons.def
new file mode 100644
index 0000000..9d25a2e
--- /dev/null
+++ b/zpak001.pk3dir/def/weapons.def
@@ -0,0 +1,18 @@
+#include "weapons/357.def"
+#include "weapons/9mmAR.def"
+#include "weapons/9mmhandgun.def"
+#include "weapons/chainsaw.def"
+#include "weapons/crossbow.def"
+#include "weapons/crowbar.def"
+#include "weapons/egon.def"
+#include "weapons/gauss.def"
+#include "weapons/hammer.def"
+#include "weapons/handcannon.def"
+#include "weapons/handgrenade.def"
+#include "weapons/hornetgun.def"
+#include "weapons/needle.def"
+#include "weapons/rpg.def"
+#include "weapons/satchel.def"
+#include "weapons/shotgun.def"
+#include "weapons/snark.def"
+#include "weapons/tripmine.def"
diff --git a/zpak001.pk3dir/def/weapons/chainsaw.def b/zpak001.pk3dir/def/weapons/chainsaw.def
new file mode 100644
index 0000000..d39936e
--- /dev/null
+++ b/zpak001.pk3dir/def/weapons/chainsaw.def
@@ -0,0 +1,56 @@
+entityDef weapon_chainsaw
+{
+	"editor_color"		".3 .3 1"
+	"editor_mins"		"-16 -16 -16"
+	"editor_maxs"		"16 16 16"
+	"editor_usage"		"Chainsaw"
+	"editor_rotatable"	"1"
+
+	"spawnclass"		"HLWeapon"
+	"model"				"models/p_saw.mdl"
+	"model_view"		"models/v_chainsaw.mdl"
+	"snd_acquire"		"weapon.pickup"
+	"snd_respawn"		"item.respawn"
+	"snd_idle"			"weapon_chainsaw.idle"
+
+	// weapon specific
+	"def_melee"			"damage_chainsaw"
+	"melee_distance"	"32"
+// TODO need velocity push on player (32 units each hit)
+	"inv_name"			"Chainsaw"
+	"ammoType"			""
+	"ammoRequired"		"0"
+	"clipSize"			"0"
+
+	"meleeRateMiss"		"0.5"
+	"meleeRateHit"		"0.25"
+
+	"actIdle"			"5,6"
+	"actDraw"			"3"
+	"actHolster"		"4"
+	"actMeleeStart"		"0"
+	"actMeleeMiss"		"1"
+	"actMeleeHit"		"1"
+	"actMeleeStop"		"2"
+
+	// HLWeapon specific
+	"hudSlot"		"0"
+	"hudSlotPos"	"2"
+	"weight"		"1"
+	"crosshair"		"none"
+	"ammoIcon"		"none"
+}
+
+// TODO sh_chainspark and fx_spark.main
+
+entityDef damage_chainsaw
+{
+	"damage"			"skill:plr_chainsaw"
+//	"kickDir"			"-1 0 0"
+//	"knockback"			"20"
+//	"push"				"20000"
+	"gib"				"1"
+
+	"snd_hit"			"weapon_chainsaw.hit"
+	"snd_miss"			"weapon_chainsaw.miss"
+}
diff --git a/zpak001.pk3dir/def/weapons/hammer.def b/zpak001.pk3dir/def/weapons/hammer.def
new file mode 100644
index 0000000..25208d8
--- /dev/null
+++ b/zpak001.pk3dir/def/weapons/hammer.def
@@ -0,0 +1,65 @@
+entityDef weapon_hammer
+{
+	"editor_color"		".3 .3 1"
+	"editor_mins"		"-16 -16 -16"
+	"editor_maxs"		"16 16 16"
+	"editor_usage"		"Hammer"
+	"editor_rotatable"	"1"
+
+	"spawnclass"		"HLWeapon"
+	"model"				"models/p_hammer.mdl"
+	"model_view"		"models/v_hammer.mdl"
+	"snd_acquire"		"weapon.pickup"
+	"snd_respawn"		"item.respawn"
+	"snd_idle"			"weapon_hammer.idle"
+	"snd_hit"			"weapon_hammer.hit"
+	"snd_miss"			"weapon_hammer.miss"
+
+	// weapon specific
+	"def_melee"			"damage_hammer"
+	"def_meleeAlt"		"damage_hammerWindup"
+	"melee_distance"	"32"
+	"inv_name"			"Hammer"
+	"ammoType"			""
+	"ammoRequired"		"0"
+	"clipSize"			"0"
+
+	"meleeRateMiss"		"1.0"
+	"meleeRateHit"		"1.0"
+
+	"actIdle"			"0,5,6"
+	"actDraw"			"1"
+	"actHolster"		"2,7,8"
+	"actMeleeMiss"		"3"
+	"actMeleeHit"		"3"
+
+	// HLWeapon specific
+	"hudSlot"		"0"
+	"hudSlotPos"	"1"
+	"weight"		"1"
+	"crosshair"		"none"
+	"ammoIcon"		"none"
+}
+
+
+// TODO double check push/knockback works on victims
+entityDef damage_hammer
+{
+	"damage"			"skill:plr_hammer"
+//	"kickDir"			"-1 0 0"
+//	"knockback"			"20"
+	"push"				"20000"
+	"gib"				"0"
+
+}
+
+// TODO
+entityDef damage_hammerWindup
+{
+	"damage"			"skill:plr_hammeralt"
+	"gib"				"1"
+	"meleeRateMiss"		"0.75"
+	"meleeRateHit"		"0.75"
+	"actMeleeMiss"		"4"
+	"actMeleeHit"		"4"
+}
diff --git a/zpak001.pk3dir/def/weapons/handcannon.def b/zpak001.pk3dir/def/weapons/handcannon.def
new file mode 100644
index 0000000..ad9d17f
--- /dev/null
+++ b/zpak001.pk3dir/def/weapons/handcannon.def
@@ -0,0 +1,87 @@
+entityDef weapon_handcannon
+{
+	"editor_color"		".3 .3 1"
+	"editor_mins"		"-16 -16 -16"
+	"editor_maxs"		"16 16 16"
+	"editor_usage"		"Hand Cannon"
+	"editor_rotatable"	"1"
+
+	"spawnclass"		"HLWeapon"
+	"model"				"models/p_cannon.mdl"
+	"model_view"		"models/v_cannon.mdl"
+	"snd_acquire"		"weapon.pickup"
+	"snd_respawn"		"item.respawn"
+
+	// weapon specific
+	"def_fireInfo"		"fireInfo_handcannon"
+	"def_altFireInfo"	"fireInfo_altCannon"
+	"inv_name"			"Hand Cannon"
+	"clipSize"			"2"
+
+	"actHolster"		"5"
+	"actReload"			"3"
+	"actDraw"			"4"
+	"actIdle"			"6,7"
+
+	"snd_fire"			"weapon_handcannon.shoot"
+	"snd_empty"			"weapon_shotgun.empty"
+
+	// HLWeapon specific
+	"hudSlot"		"2"
+	"hudSlotPos"	"3"
+	"weight"		"15"
+}
+
+entityDef projectile_handcannon_single
+{
+	"inherit"		"projectile_bullet_base"
+	"damage"		"skill:plr_handcannon"
+	"hitscans"		"12"
+	"spread"		"0.08716 0.04362"
+}
+
+entityDef projectile_handcannon
+{
+	"inherit"		"projectile_bullet_base"
+	"damage"		"skill:plr_handcannon"
+	"hitscans"		"24"
+	"spread"		"0.08716 0.04362"
+}
+
+entityDef fireInfo_handcannon
+{
+	"def_projectile"	"projectile_handcannon"
+	"ammoType"			"ammo_buckshot"
+	"ammoRequired"		"2"
+	"ammoPerShot"		"2"
+	"fireRate"			"1.5"
+	"actFire"			"0"
+	"model_flash"		"sprites/muzzleflash2.spr"
+
+}
+
+entityDef fireInfo_altCannon
+{
+	"def_projectile"	"projectile_handcannon_single"
+	"ammoType"			"ammo_buckshot"
+	"ammoRequired"		"1"
+	"ammoPerShot"		"1"
+	"fireRate"			"1.5"
+	"actFire"			"1,2"
+	"model_flash"		"sprites/muzzleflash2.spr"
+
+}
+
+// TODO respect sh_hchorror = 1
+
+entityDef fireInfo_handcannonHorror
+{
+	"def_projectile"	"projectile_handcannon"
+	"ammoType"			"ammo_buckshot"
+	"ammoRequired"		"0"
+	"ammoPerShot"		"0"
+	"fireRate"			"0.5"
+	"actFire"			"0"
+	"model_flash"		"sprites/muzzleflash2.spr"
+
+}
\ No newline at end of file
diff --git a/zpak001.pk3dir/def/weapons/needle.def b/zpak001.pk3dir/def/weapons/needle.def
new file mode 100644
index 0000000..14a1aaa
--- /dev/null
+++ b/zpak001.pk3dir/def/weapons/needle.def
@@ -0,0 +1,41 @@
+entityDef weapon_needle
+{
+	"editor_color"		".3 .3 1"
+	"editor_mins"		"-16 -16 -16"
+	"editor_maxs"		"16 16 16"
+	"editor_usage"		"Needle"
+	"editor_rotatable"	"1"
+
+	"spawnclass"		"HLWeapon"
+
+	// weapon specific
+	"def_melee"			"damage_needle"
+	"melee_distance"	"32"
+	"inv_name"			"Needle"
+	"ammoType"			""
+	"ammoRequired"		"0"
+	"clipSize"			"0"
+
+	"meleeRateMiss"		"0.5"
+	"meleeRateHit"		"0.25"
+
+
+	// HLWeapon specific
+	"hudSlot"		"0"
+	"hudSlotPos"	"4"
+	"weight"		"0"
+	"crosshair"		"none"
+	"ammoIcon"		"none"
+}
+
+entityDef damage_needle
+{
+	"damage"			"skill:plr_needle"
+//	"kickDir"			"-1 0 0"
+//	"knockback"			"20"
+//	"push"				"20000"
+	"gib"				"0"
+
+	"snd_hit"			"weapon_needle.hit"
+	"snd_miss"			"weapon_needle.miss"
+}
diff --git a/zpak001.pk3dir/sound/weapons_scihunt.sndshd b/zpak001.pk3dir/sound/weapons_scihunt.sndshd
index 18ad25e..025650b 100644
--- a/zpak001.pk3dir/sound/weapons_scihunt.sndshd
+++ b/zpak001.pk3dir/sound/weapons_scihunt.sndshd
@@ -1,4 +1,4 @@
-weapon_cannon.shoot
+weapon_handcannon.shoot
 {
 	sample cannon/fire.wav
 }