diff --git a/README.md b/README.md
index 40ade1c..0aa2adf 100644
--- a/README.md
+++ b/README.md
@@ -82,6 +82,8 @@ ______
 - Rust格式化： `cargo fmt`
 - clippy提交检查：`cargo clippy --locked --workspace --all-targets --all-features -- --deny warnings`
 - 本地开发运行：`cargo run`
+- Powershell打开调试日志：`$env:RUST_LOG="debug"`
+- Powershell打开追踪日志：`$env:RUST_BACKTRACE=1; cargo run`
 
 # 4. 发布
 [Itch.io](https://cloudhu.itch.io/skywalker2088)
diff --git a/assets/data/consumables.ron b/assets/data/consumables.ron
index edc316c..3973a5d 100644
--- a/assets/data/consumables.ron
+++ b/assets/data/consumables.ron
@@ -8,7 +8,7 @@
         acceleration: (8.0, 8.0),
         deceleration: (5.0, 5.0),
         speed: (0.0, 120.0),
-        z_level: 15.0,
+        z_level: 915.0,
         initial_motion: (
             random_linvel: Some(((-100, 50), (100, 100))),
             random_angvel: Some((-3.0, 3.0)),
@@ -33,7 +33,7 @@
         acceleration: (8.0, 8.0),
         deceleration: (5.0, 5.0),
         speed: (0.0, 120.0),
-        z_level: 15.0,
+        z_level: 915.0,
         initial_motion: (
             random_linvel: Some(((-100, 50), (100, 100))),
             random_angvel: Some((-3.0, 3.0)),
@@ -58,7 +58,7 @@
         acceleration: (8.0, 8.0),
         deceleration: (5.0, 5.0),
         speed: (0.0, 120.0),
-        z_level: 15.0,
+        z_level: 915.0,
         initial_motion: (
             random_linvel: Some(((-120, 50), (120, 120))),
             random_angvel: Some((-5.0, 5.0)),
@@ -83,7 +83,7 @@
         acceleration: (8.0, 8.0),
         deceleration: (5.0, 5.0),
         speed: (0.0, 120.0),
-        z_level: 15.0,
+        z_level: 915.0,
         initial_motion: (
             random_linvel: Some(((-100, 50), (100, 100))),
             random_angvel: Some((-3.0, 3.0)),
@@ -108,7 +108,7 @@
         acceleration: (8.0, 8.0),
         deceleration: (5.0, 5.0),
         speed: (0.0, 120.0),
-        z_level: 15.0,
+        z_level: 915.0,
         initial_motion: (
             random_linvel: Some(((-100, 50), (100, 100))),
             random_angvel: Some((-3.0, 3.0)),
diff --git a/assets/data/effects.ron b/assets/data/effects.ron
index 13ba508..04342d9 100644
--- a/assets/data/effects.ron
+++ b/assets/data/effects.ron
@@ -2,7 +2,7 @@
 	AllyBlastExplosion: (
 		effect_type: AllyBlastExplosion,
 		effect_behaviors_data: [FadeOutAndDespawnAfterAnimation],
-		z_level: 10.0,
+		z_level: 909.0,
 		animation: (
 			direction: Forward,
 			frame_duration: 0.1,
@@ -17,7 +17,7 @@
 	EnemyBlastExplosion: (
 		effect_type: EnemyBlastExplosion,
 		effect_behaviors_data: [FadeOutAndDespawnAfterAnimation],
-		z_level: 10.5,
+		z_level: 909.5,
 		animation: (
 			direction: Forward,
 			frame_duration: 0.1,
@@ -32,7 +32,7 @@
 	AllyBlastDespawn: (
 		effect_type: AllyBlastDespawn,
 		effect_behaviors_data: [FadeOutAndDespawnAfterAnimation],
-		z_level: 9.0,
+		z_level: 909.0,
 		animation: (
 			direction: Forward,
 			frame_duration: 0.1,
@@ -47,7 +47,7 @@
 	EnemyBlastDespawn: (
 		effect_type: EnemyBlastDespawn,
 		effect_behaviors_data: [FadeOutAndDespawnAfterAnimation],
-		z_level: 9.0,
+		z_level: 909.0,
 		animation: (
 			direction: Forward,
 			frame_duration: 0.1,
@@ -62,7 +62,7 @@
 	MobExplosion: (
 		effect_type: MobExplosion,
 		effect_behaviors_data: [FadeOutAndDespawnAfterAnimation],
-		z_level: -5.0,
+		z_level: 904.0,
 		animation: (
 			direction: Forward,
 			frame_duration: 0.1,
@@ -77,7 +77,7 @@
 	ConsumableDespawn: (
 		effect_type: ConsumableDespawn,
 		effect_behaviors_data: [FadeOutAndDespawnAfterAnimation],
-		z_level: 9.0,
+		z_level: 909.0,
 		animation: (
 			direction: Forward,
 			frame_duration: 0.05,
@@ -92,7 +92,7 @@
 	BarrierGlow: (
 		effect_type: BarrierGlow,
 		effect_behaviors_data: [],
-		z_level: 25.0,
+		z_level: 925.0,
 		animation: (
 			direction: PingPong(Forward),
 			frame_duration: 0.2,
@@ -107,7 +107,7 @@
 	AllyBulletDespawn: (
 		effect_type: AllyBulletDespawn,
 		effect_behaviors_data: [FadeOutAndDespawnAfterAnimation],
-		z_level: 9.0,
+		z_level: 909.0,
 		animation: (
 			direction: Forward,
 			frame_duration: 0.1,
@@ -122,7 +122,7 @@
 	EnemyBulletDespawn: (
 		effect_type: EnemyBulletDespawn,
 		effect_behaviors_data: [FadeOutAndDespawnAfterAnimation],
-		z_level: 9.0,
+		z_level: 909.0,
 		animation: (
 			direction: Forward,
 			frame_duration: 0.1,
@@ -137,7 +137,7 @@
 	AllyBulletExplosion: (
 		effect_type: AllyBulletExplosion,
 		effect_behaviors_data: [FadeOutAndDespawnAfterAnimation],
-		z_level: 9.0,
+		z_level: 909.0,
 		animation: (
 			direction: Forward,
 			frame_duration: 0.1,
@@ -152,7 +152,7 @@
 	EnemyBulletExplosion: (
 		effect_type: EnemyBulletExplosion,
 		effect_behaviors_data: [FadeOutAndDespawnAfterAnimation],
-		z_level: 9.0,
+		z_level: 909.0,
 		animation: (
 			direction: Forward,
 			frame_duration: 0.1,
@@ -167,7 +167,7 @@
 	Text(DamageDealt): (
 		effect_type: Text(DamageDealt),
 		effect_behaviors_data: [FadeOut(0.55)],
-		z_level: 10.0,
+		z_level: 909.0,
 		animation: (
 			direction: None,
 			frame_duration: 0.1,
@@ -182,7 +182,7 @@
 	Text(ConsumableCollected(Money1)): (
 		effect_type: Text(ConsumableCollected(Money1)),
 		effect_behaviors_data: [FadeOut(0.55)],
-		z_level: 10.0,
+		z_level: 909.0,
 		animation: (
 			direction: None,
 			frame_duration: 0.1,
@@ -197,7 +197,7 @@
 	Text(ConsumableCollected(Money3)): (
 		effect_type: Text(ConsumableCollected(Money3)),
 		effect_behaviors_data: [FadeOut(0.55)],
-		z_level: 10.0,
+		z_level: 909.0,
 		animation: (
 			direction: None,
 			frame_duration: 0.1,
@@ -212,7 +212,7 @@
 	Text(ConsumableCollected(HealthWrench)): (
 		effect_type: Text(ConsumableCollected(HealthWrench)),
 		effect_behaviors_data: [FadeOut(0.55)],
-		z_level: 10.0,
+		z_level: 909.0,
 		animation: (
 			direction: None,
 			frame_duration: 0.1,
@@ -227,7 +227,7 @@
 	Text(ConsumableCollected(Armor)): (
 		effect_type: Text(ConsumableCollected(Armor)),
 		effect_behaviors_data: [FadeOut(0.55)],
-		z_level: 10.0,
+		z_level: 909.0,
 		animation: (
 			direction: None,
 			frame_duration: 0.1,
@@ -242,7 +242,7 @@
 	Text(ConsumableCollected(GainProjectiles)): (
 		effect_type: Text(ConsumableCollected(GainProjectiles)),
 		effect_behaviors_data: [FadeOut(0.55)],
-		z_level: 10.0,
+		z_level: 909.0,
 		animation: (
 			direction: None,
 			frame_duration: 0.1,
diff --git a/assets/data/items.ron b/assets/data/items.ron
index a31f56e..fb08af3 100644
--- a/assets/data/items.ron
+++ b/assets/data/items.ron
@@ -7,7 +7,7 @@
         acceleration: (8.0, 8.0),
         deceleration: (5.0, 5.0),
         speed: (0.0, 120.0),
-        z_level: 15.0,
+        z_level: 915.0,
         initial_motion: (
             random_linvel: Some(((-100, 50),(100, 100))),
             random_angvel: Some((-3.0, 3.0)),
diff --git a/assets/data/mob_segments.ron b/assets/data/mob_segments.ron
index 6167ff3..3821869 100644
--- a/assets/data/mob_segments.ron
+++ b/assets/data/mob_segments.ron
@@ -17,7 +17,7 @@
             defense_interaction: Some(Heal(10)),
             health: 60,
             consumable_drops: Nothing,
-            z_level: 5.0,
+            z_level: 705.0,
             anchor_point: (0.0, -30.0),
             behaviors: [ReceiveDamageOnImpact, DieAtZeroHealth],
         ),
@@ -38,7 +38,7 @@
             defense_interaction: Some(Heal(10)),
             health: 60,
             consumable_drops: Standard,
-            z_level: 5.0,
+            z_level: 705.0,
             anchor_point: (0.0, -30.0),
             behaviors: [DealDamageToPlayerOnImpact, ReceiveDamageOnImpact, DieAtZeroHealth],
         ),
@@ -59,7 +59,7 @@
             defense_interaction: Some(Heal(10)),
             health: 60,
             consumable_drops: Standard,
-            z_level: 5.0,
+            z_level: 705.0,
             anchor_point: (0.0, -30.0),
             behaviors: [DealDamageToPlayerOnImpact, ReceiveDamageOnImpact, DieAtZeroHealth],
             mob_segment_anchor_points: Some([(
@@ -88,7 +88,7 @@
             collision_sound: Squishy,
             health: 35,
             consumable_drops: Standard,
-            z_level: 4.9,
+            z_level: 704.9,
             anchor_point: (0.0, 40.0),
             behaviors: [
                 DealDamageToPlayerOnImpact,
@@ -119,7 +119,7 @@
             collision_sound: Squishy,
             health: 35,
             consumable_drops: Standard,
-            z_level: 4.9,
+            z_level: 704.9,
             anchor_point: (0.0, 40.0),
             behaviors: [
                 DealDamageToPlayerOnImpact,
@@ -150,7 +150,7 @@
             collision_sound: Squishy,
             health: 35,
             consumable_drops: Standard,
-            z_level: 4.9,
+            z_level: 704.9,
             anchor_point: (0.0, 40.0),
             behaviors: [
                 DealDamageToPlayerOnImpact,
@@ -181,7 +181,7 @@
             health: 450,
             density: 2.3,
             consumable_drops: Standard,
-            z_level: 4.9,
+            z_level: 704.9,
             anchor_point: (0.0, -51.0),
             behaviors: [
                 DealDamageToPlayerOnImpact,
@@ -229,7 +229,7 @@
             health: 450,
             density: 2.3,
             consumable_drops: Standard,
-            z_level: 5.1,
+            z_level: 705.1,
             anchor_point: (-75.0, 48.0),
             behaviors: [],
             mob_segment_anchor_points: Some([
@@ -265,7 +265,7 @@
             health: 450,
             density: 2.3,
             consumable_drops: Standard,
-            z_level: 5.1,
+            z_level: 705.1,
             anchor_point: (75.0, 48.0),
             behaviors: [],
             mob_segment_anchor_points: Some([
@@ -306,7 +306,7 @@
             health: 650,
             density: 2.3,
             consumable_drops: Standard,
-            z_level: 5.2,
+            z_level: 705.2,
             anchor_point: (-28.0, 80.0),
             behaviors: [],
             mob_segment_anchor_points: Some([
@@ -361,7 +361,7 @@
             health: 650,
             density: 2.3,
             consumable_drops: Standard,
-            z_level: 5.2,
+            z_level: 705.2,
             anchor_point: (28.0, 80.0),
             behaviors: [],
             mob_segment_anchor_points: Some([
@@ -411,7 +411,7 @@
             health: 700,
             density: 2.3,
             consumable_drops: Standard,
-            z_level: 5.3,
+            z_level: 705.3,
             anchor_point: (42.0, -23.0),
             behaviors: [],  
         ),
@@ -437,7 +437,7 @@
             health: 700,
             density: 2.3,
             consumable_drops: Standard,
-            z_level: 5.3,
+            z_level: 705.3,
             anchor_point: (-42.0, -23.0),
             behaviors: [],  
         ),
@@ -463,7 +463,7 @@
             health: 725,
             density: 3.3,
             consumable_drops: Standard,
-            z_level: 5.1,
+            z_level: 705.1,
             anchor_point: (0.0, -51.0),
             behaviors: [
                 DealDamageToPlayerOnImpact,
@@ -511,7 +511,7 @@
             health: 725,
             density: 3.3,
             consumable_drops: Standard,
-            z_level: 5.0,
+            z_level: 705.0,
             anchor_point: (-75.0, 48.0),
             behaviors: [],
             mob_segment_anchor_points: Some([
@@ -547,7 +547,7 @@
             health: 725,
             density: 3.3,
             consumable_drops: Standard,
-            z_level: 5.0,
+            z_level: 705.0,
             anchor_point: (75.0, 48.0),
             behaviors: [],
             mob_segment_anchor_points: Some([
@@ -588,7 +588,7 @@
             health: 1050,
             density: 3.3,
             consumable_drops: Standard,
-            z_level: 5.1,
+            z_level: 705.1,
             anchor_point: (-28.0, 80.0),
             behaviors: [],
             mob_segment_anchor_points: Some([
@@ -666,7 +666,7 @@
             health: 1050,
             density: 3.3,
             consumable_drops: Standard,
-            z_level: 5.1,
+            z_level: 705.1,
             anchor_point: (28.0, 80.0),
             behaviors: [],
             mob_segment_anchor_points: Some([
@@ -754,7 +754,7 @@
             health: 1100,
             density: 3.3,
             consumable_drops: Standard,
-            z_level: 5.3,
+            z_level: 705.3,
             anchor_point: (50.0, 0.0),
             behaviors: [],  
         ),
@@ -795,7 +795,7 @@
             health: 1100,
             density: 3.3,
             consumable_drops: Standard,
-            z_level: 5.3,
+            z_level: 705.3,
             anchor_point: (-50.0, 0.0),
             behaviors: [],  
         ),
@@ -821,7 +821,7 @@
             health: 1000,
             density: 3.6,
             consumable_drops: Standard,
-            z_level: 5.1,
+            z_level: 705.1,
             anchor_point: (0.0, -51.0),
             behaviors: [
                 DealDamageToPlayerOnImpact,
@@ -869,7 +869,7 @@
             health: 1000,
             density: 3.6,
             consumable_drops: Standard,
-            z_level: 5.0,
+            z_level: 705.0,
             anchor_point: (-75.0, 48.0),
             behaviors: [],
             mob_segment_anchor_points: Some([
@@ -905,7 +905,7 @@
             health: 1000,
             density: 3.6,
             consumable_drops: Standard,
-            z_level: 5.0,
+            z_level: 705.0,
             anchor_point: (75.0, 48.0),
             behaviors: [],
             mob_segment_anchor_points: Some([
@@ -946,7 +946,7 @@
             health: 1450,
             density: 3.6,
             consumable_drops: Standard,
-            z_level: 5.1,
+            z_level: 705.1,
             anchor_point: (-28.0, 80.0),
             behaviors: [],
             mob_segment_anchor_points: Some([
@@ -1029,7 +1029,7 @@
             health: 1450,
             density: 3.6,
             consumable_drops: Standard,
-            z_level: 5.1,
+            z_level: 705.1,
             anchor_point: (28.0, 80.0),
             behaviors: [],
             mob_segment_anchor_points: Some([
@@ -1122,7 +1122,7 @@
             health: 1500,
             density: 3.6,
             consumable_drops: Standard,
-            z_level: 5.3,
+            z_level: 705.3,
             anchor_point: (50.0, 0.0),
             behaviors: [],  
         ),
@@ -1163,7 +1163,7 @@
             health: 1500,
             density: 3.6,
             consumable_drops: Standard,
-            z_level: 5.3,
+            z_level: 705.3,
             anchor_point: (-50.0, 0.0),
             behaviors: [],  
         ),
diff --git a/assets/data/mobs.ron b/assets/data/mobs.ron
index f9cdc07..4d0898c 100644
--- a/assets/data/mobs.ron
+++ b/assets/data/mobs.ron
@@ -175,7 +175,7 @@
 				rotation: 0.0,
 			)
 		],
-		z_level: 5.0,
+		z_level: 705.0,
 		consumable_drops: Boss,
 		health: 2400,
 		density: 3.8,
@@ -396,7 +396,7 @@
 				rotation: 0.0,
 			)
 		],
-		z_level: 5.0,
+		z_level: 705.0,
 		consumable_drops: Boss,
 		health: 1800,
 		density: 3.5,
@@ -617,7 +617,7 @@
 				rotation: 0.0,
 			)
 		],
-		z_level: 5.0,
+		z_level: 705.0,
 		consumable_drops: Boss,
 		health: 1200,
 		density: 2.7,
@@ -683,7 +683,7 @@
 				rotation: 0.0,
 			),
 		],
-		z_level: 5.0,
+		z_level: 705.0,
 		consumable_drops: Standard,
 		health: 40,
 		animation: (
@@ -738,7 +738,7 @@
 				rotation: 0.0,
 			),
 		],
-		z_level: 5.0,
+		z_level: 705.0,
 		consumable_drops: Standard,
 		health: 40,
 		animation: (
@@ -788,7 +788,7 @@
 				rotation: 0.0,
 			)
 		],
-		z_level: 5.0,
+		z_level: 705.0,
 		consumable_drops: Standard,
 		health: 30,
 		animation: (
@@ -829,7 +829,7 @@
 				rotation: 0.0,
 			)
 		],
-		z_level: 5.0,
+		z_level: 705.0,
 		consumable_drops: Standard,
 		health: 20,
 		animation: (
@@ -893,7 +893,7 @@
 				rotation: 0.0,
 			)
 		],
-		z_level: 5.0,
+		z_level: 705.0,
 		consumable_drops: Standard,
 		health: 50,
 		animation: (
@@ -1134,7 +1134,7 @@
 				rotation: 0.0,
 			)
 		],
-		z_level: 6.0,
+		z_level: 506.0,
 		health: 80,
 		animation: (
 			direction: None,
@@ -1179,7 +1179,7 @@
 				rotation: 0.0,
 			)
 		],
-		z_level: 6.0,
+		z_level: 506.0,
 		health: 80,
 		animation: (
 			direction: None,
@@ -1224,7 +1224,7 @@
 				rotation: 0.0,
 			)
 		],
-		z_level: 6.0,
+		z_level: 506.0,
 		health: 80,
 		animation: (
 			direction: None,
@@ -1275,7 +1275,7 @@
 				rotation: 0.0,
 			)
 		],
-		z_level: 5.0,
+		z_level: 705.0,
 		consumable_drops: Standard,
 		health: 50,
 		animation: (
@@ -1323,7 +1323,7 @@
 				rotation: 0.0,
 			)
 		],
-		z_level: 5.0,
+		z_level: 705.0,
 		health: 15,
 		animation: (
 			direction: Forward,
@@ -1363,7 +1363,7 @@
 				rotation: 0.0,
 			)
 		],
-		z_level: 5.0,
+		z_level: 705.0,
 		consumable_drops: Standard,
 		health: 20,
 		animation: (
@@ -1426,7 +1426,7 @@
 				rotation: 0.0,
 			)
 		],
-		z_level: 5.0,
+		z_level: 705.0,
 		consumable_drops: Standard,
 		health: 20,
 		animation: (
@@ -1478,7 +1478,7 @@
 		can_rotate: true,
 		speed: (0.0, 75.0),
 		collision_damage: 7,
-		z_level: 4.0,
+		z_level: 504.0,
 		consumable_drops: MoneyAsteroid,
 		initial_motion: (
 			random_angvel: Some((-1.0, 1.0)),
@@ -1512,7 +1512,7 @@
 				rotation: 0.0,
 			)
 		],
-		z_level: 5.0,
+		z_level: 705.0,
 		consumable_drops: Nothing,
 		health: 15,
 		animation: (
diff --git a/assets/data/projectiles.ron b/assets/data/projectiles.ron
index 77bce9e..e175a97 100644
--- a/assets/data/projectiles.ron
+++ b/assets/data/projectiles.ron
@@ -3,7 +3,7 @@
 		projectile_type: Blast(Enemy),
 		spawnable_behaviors: [],
 		projectile_behaviors: [ExplodeOnIntersection, DealDamageOnIntersection],
-		z_level: 20.0,
+		z_level: 300.0,
 		animation: (
 			direction: None,
 			frame_duration: 1.0
@@ -26,7 +26,7 @@
 		spawnable_behaviors: [],
 		projectile_behaviors: [ExplodeOnIntersection, DealDamageOnIntersection],
 		collider_dimensions: (1.5, 1.5),
-		z_level: 20.0,
+		z_level: 300.0,
 		animation: (
 			direction: None,
 			frame_duration: 1.0
@@ -49,7 +49,7 @@
 		spawnable_behaviors: [],
 		projectile_behaviors: [ExplodeOnIntersection, DealDamageOnIntersection],
 		collider_dimensions: (1.5, 1.5),
-		z_level: 19.0,
+		z_level: 319.0,
 		animation: (
 			direction: None,
 			frame_duration: 1.0
@@ -72,7 +72,7 @@
 		spawnable_behaviors: [],
 		projectile_behaviors: [DealDamageOnContact, ExplodeOnContact],
 		collider_dimensions: (1.5, 1.5),
-		z_level: 20.0,
+		z_level: 320.0,
 		animation: (
 			direction: None,
 			frame_duration: 1.0
@@ -95,7 +95,7 @@
 		spawnable_behaviors: [],
 		projectile_behaviors: [DealDamageOnContact, ExplodeOnContact],
 		collider_dimensions: (1.5, 1.5),
-		z_level: 20.0,
+		z_level: 320.0,
 		animation: (
 			direction: None,
 			frame_duration: 1.0
@@ -118,7 +118,7 @@
 		spawnable_behaviors: [],
 		projectile_behaviors: [DealDamageOnContact, ExplodeOnContact],
 		collider_dimensions: (1.5, 1.5),
-		z_level: 19.0,
+		z_level: 319.0,
 		animation: (
 			direction: None,
 			frame_duration: 1.0
diff --git a/src/animation/mod.rs b/src/animation/mod.rs
index a164d4a..e2a9d12 100644
--- a/src/animation/mod.rs
+++ b/src/animation/mod.rs
@@ -1,8 +1,8 @@
 //! Exposes a component to tag animatable sprite sheets, along with the plugin with associated
 //! systems to animate + clean up 2D sprite-based animations.
-use crate::assets::game_assets::AppStates;
 use crate::components::events::AnimationCompletedEvent;
-use crate::gameplay::GameStates;
+use crate::components::states::AppStates;
+use crate::components::states::GameStates;
 use bevy::{
     app::{App, Plugin, Update},
     asset::Assets,
diff --git a/src/arena/barrier.rs b/src/arena/barrier.rs
index defb555..e694a79 100644
--- a/src/arena/barrier.rs
+++ b/src/arena/barrier.rs
@@ -1,6 +1,6 @@
-use crate::assets::game_assets::AppStates;
 use crate::collision::{HORIZONTAL_BARRIER_COLLIDER_GROUP, SPAWNABLE_COLLIDER_GROUP};
 use crate::components::spawnable::EffectType;
+use crate::components::states::AppStates;
 use crate::options::resources::GameParametersResource;
 use crate::spawnable::SpawnEffectEvent;
 use bevy::prelude::{
@@ -18,61 +18,61 @@ use std::f32::consts::FRAC_PI_2;
 pub struct ArenaBarrierComponent;
 
 /// Spawns arena barriers arranged in a centered rectangle
-pub(super) fn spawn_barriers_system(
-    mut commands: Commands,
-    mut spawn_effect: EventWriter<SpawnEffectEvent>,
-    game_parameters: Res<GameParametersResource>,
-) {
-    // TODO: move hard coded values to data file
-    // spawn horizontal barriers at top and bottom of arena
-    spawn_spawnables_pass_barrier(&mut commands, Vec2::new(0.0, 360.0), 1000.0, 30.0);
-    spawn_spawnables_pass_barrier(&mut commands, Vec2::new(0.0, -360.0), 1000.0, 30.0);
+// pub(super) fn spawn_barriers_system(
+//     mut commands: Commands,
+//     mut spawn_effect: EventWriter<SpawnEffectEvent>,
+//     game_parameters: Res<GameParametersResource>,
+// ) {
+// TODO: move hard coded values to data file
+// spawn horizontal barriers at top and bottom of arena
+// spawn_spawnables_pass_barrier(&mut commands, Vec2::new(0.0, 360.0), 1000.0, 30.0);
+// spawn_spawnables_pass_barrier(&mut commands, Vec2::new(0.0, -360.0), 1000.0, 30.0);
+//
+// // spawn vertical barriers at right and left of arena
+// spawn_barrier(&mut commands, Vec2::new(500.0, 0.0), 30.0, 10000.0);
+// spawn_barrier(&mut commands, Vec2::new(-500.0, 0.0), 30.0, 10000.0);
+//
+// // spawn horizontal barriers
+// spawn_barrier(&mut commands, Vec2::new(0.0, 2250.0), 3000.0, 30.0);
 
-    // spawn vertical barriers at right and left of arena
-    spawn_barrier(&mut commands, Vec2::new(500.0, 0.0), 30.0, 10000.0);
-    spawn_barrier(&mut commands, Vec2::new(-500.0, 0.0), 30.0, 10000.0);
-
-    // spawn horizontal barriers
-    spawn_barrier(&mut commands, Vec2::new(0.0, 2250.0), 3000.0, 30.0);
-
-    // spawn barrier glow effect
-    spawn_effect.send(SpawnEffectEvent {
-        effect_type: EffectType::BarrierGlow,
-        transform: Transform {
-            translation: Vec3::new(0.0, -355.0, 1.0),
-            scale: Vec3::new(10.0, game_parameters.sprite_scale, 1.0),
-            ..Default::default()
-        },
-        ..Default::default()
-    });
-    spawn_effect.send(SpawnEffectEvent {
-        effect_type: EffectType::BarrierGlow,
-        transform: Transform {
-            translation: Vec3::new(0.0, 355.0, 1.0),
-            scale: Vec3::new(10.0, game_parameters.sprite_scale, 1.0),
-            ..Default::default()
-        },
-        ..Default::default()
-    });
-    spawn_effect.send(SpawnEffectEvent {
-        effect_type: EffectType::BarrierGlow,
-        transform: Transform {
-            translation: Vec3::new(495.0, 0.0, 1.0),
-            scale: Vec3::new(7.3, game_parameters.sprite_scale, 1.0),
-            rotation: Quat::from_rotation_z(FRAC_PI_2),
-        },
-        ..Default::default()
-    });
-    spawn_effect.send(SpawnEffectEvent {
-        effect_type: EffectType::BarrierGlow,
-        transform: Transform {
-            translation: Vec3::new(-495.0, 0.0, 1.0),
-            scale: Vec3::new(7.3, game_parameters.sprite_scale, 1.0),
-            rotation: Quat::from_rotation_z(FRAC_PI_2),
-        },
-        ..Default::default()
-    });
-}
+// spawn barrier glow effect
+// spawn_effect.send(SpawnEffectEvent {
+//     effect_type: EffectType::BarrierGlow,
+//     transform: Transform {
+//         translation: Vec3::new(0.0, -355.0, 1.0),
+//         scale: Vec3::new(10.0, game_parameters.sprite_scale, 1.0),
+//         ..Default::default()
+//     },
+//     ..Default::default()
+// });
+// spawn_effect.send(SpawnEffectEvent {
+//     effect_type: EffectType::BarrierGlow,
+//     transform: Transform {
+//         translation: Vec3::new(0.0, 355.0, 1.0),
+//         scale: Vec3::new(10.0, game_parameters.sprite_scale, 1.0),
+//         ..Default::default()
+//     },
+//     ..Default::default()
+// });
+// spawn_effect.send(SpawnEffectEvent {
+//     effect_type: EffectType::BarrierGlow,
+//     transform: Transform {
+//         translation: Vec3::new(495.0, 0.0, 1.0),
+//         scale: Vec3::new(7.3, game_parameters.sprite_scale, 1.0),
+//         rotation: Quat::from_rotation_z(FRAC_PI_2),
+//     },
+//     ..Default::default()
+// });
+// spawn_effect.send(SpawnEffectEvent {
+//     effect_type: EffectType::BarrierGlow,
+//     transform: Transform {
+//         translation: Vec3::new(-495.0, 0.0, 1.0),
+//         scale: Vec3::new(7.3, game_parameters.sprite_scale, 1.0),
+//         rotation: Quat::from_rotation_z(FRAC_PI_2),
+//     },
+//     ..Default::default()
+// });
+// }
 
 /// Spawns an arena barrier
 fn spawn_barrier(commands: &mut Commands, position: Vec2, width: f32, height: f32) {
diff --git a/src/arena/gate.rs b/src/arena/gate.rs
index 6194352..c1d31a0 100644
--- a/src/arena/gate.rs
+++ b/src/arena/gate.rs
@@ -1,5 +1,5 @@
-use crate::assets::game_assets::AppStates;
 use crate::components::events::MobReachedBottomGateEvent;
+use crate::components::states::AppStates;
 use crate::spawnable::{MobComponent, MobSegmentComponent, SpawnableComponent};
 use bevy::prelude::StateScoped;
 use bevy::{
diff --git a/src/arena/mod.rs b/src/arena/mod.rs
index b7e9dfd..c32ea57 100644
--- a/src/arena/mod.rs
+++ b/src/arena/mod.rs
@@ -1,11 +1,11 @@
 //! Exposes a plugin that renders a rectangular boundary that the player cannot cross, but mobs
 //! can. Also handles sending events when mobs reach the botton of the screen.
 
-use crate::assets::game_assets::AppStates;
 use crate::assets::game_assets::GameEnterSet;
 use crate::components::events::MobReachedBottomGateEvent;
-use crate::gameplay::GameStates;
-use barrier::spawn_barriers_system;
+use crate::components::states::AppStates;
+use crate::components::states::GameStates;
+// use barrier::spawn_barriers_system;
 use bevy::{
     app::{App, Plugin, Update},
     prelude::{in_state, IntoSystemConfigs, OnEnter},
@@ -28,7 +28,7 @@ impl Plugin for ArenaPlugin {
 
         app.add_systems(
             OnEnter(AppStates::Game),
-            (spawn_barriers_system, spawn_despawn_gates_system).in_set(GameEnterSet::BuildLevel),
+            spawn_despawn_gates_system.in_set(GameEnterSet::BuildLevel), //TODO: spawn_barriers_system
         );
 
         app.add_systems(
diff --git a/src/assets/game_assets.rs b/src/assets/game_assets.rs
index 3111f9c..cddb241 100644
--- a/src/assets/game_assets.rs
+++ b/src/assets/game_assets.rs
@@ -6,6 +6,7 @@ use crate::assets::mob::MobAssets;
 use crate::assets::player_assets::PlayerAssets;
 use crate::assets::projectile::ProjectileAssets;
 use crate::assets::ui::UiAssets;
+use crate::components::states::AppStates;
 use bevy::app::App;
 use bevy::asset::Handle;
 use bevy::prelude::*;
@@ -79,8 +80,6 @@ pub struct Music {
 }
 
 pub(super) fn plugin(app: &mut App) {
-    app.init_state::<AppStates>();
-    app.enable_state_scoped_entities::<AppStates>();
     app.add_loading_state(
         LoadingState::new(AppStates::LoadingAssets)
             .continue_to_state(AppStates::MainMenu)
@@ -176,21 +175,6 @@ pub enum GameUpdateSet {
     Cleanup,
 }
 
-/// The game's main screen states.
-#[derive(States, Debug, Hash, PartialEq, Eq, Clone, Default)]
-pub enum AppStates {
-    #[default]
-    Splash,
-    LoadingAssets,
-    MainMenu,
-    CharacterSelection,
-    InitializeRun,
-    Credits,
-    Game,
-    GameOver,
-    Victory,
-}
-
 // setup rapier
 fn setup_physics(mut rapier_config: ResMut<RapierConfiguration>) {
     rapier_config.timestep_mode = TimestepMode::Fixed {
diff --git a/src/audio.rs b/src/audio.rs
index 037de0a..6ba29ea 100644
--- a/src/audio.rs
+++ b/src/audio.rs
@@ -18,7 +18,7 @@ pub(super) fn plugin(app: &mut App) {
     app.add_systems(
         Update,
         (play_sound_effect_system, change_bg_music_system)
-            .run_if(resource_added::<GameAudioAssets>),
+            .run_if(resource_exists::<GameAudioAssets>),
     );
 }
 
@@ -81,7 +81,7 @@ fn change_bg_music_system(
                 stop_command.fade_out(AudioTween::new(fade_out, AudioEasing::Linear));
             }
         }
-
+        // info!("play_sound_effect_system: change_bg_music_event");
         // play music if provided a type
         if let Some(bg_music_type) = event.bg_music_type.clone() {
             let mut start_command =
diff --git a/src/camera/mod.rs b/src/camera/mod.rs
index f48cbec..1b4a0df 100644
--- a/src/camera/mod.rs
+++ b/src/camera/mod.rs
@@ -3,8 +3,8 @@
 use self::screen_shake::{
     add_trauma_system, screen_shake_on_player_damage_system, screen_shake_system,
 };
-use crate::assets::game_assets::AppStates;
 use crate::components::events::ScreenShakeEvent;
+use crate::components::states::AppStates;
 use crate::options::resources::GameParametersResource;
 use crate::util::RenderLayer;
 use bevy::app::{App, Plugin, Startup, Update};
diff --git a/src/camera/screen_shake.rs b/src/camera/screen_shake.rs
index 46abec4..81a306d 100644
--- a/src/camera/screen_shake.rs
+++ b/src/camera/screen_shake.rs
@@ -1,7 +1,6 @@
 //! Shake the screen when the player receives damage. There is some randomness in the initial
 //! jolt, with the camera eventually moving back to the original location (centered)
-use crate::components::events::ScreenShakeEvent;
-use crate::components::health::DamageDealtEvent;
+use crate::components::events::{ScreenShakeEvent, TakeDamageEvent};
 use crate::components::player::PlayerComponent;
 use bevy::{
     core_pipeline::{core_2d::Camera2d, core_3d::Camera3d},
@@ -84,12 +83,12 @@ fn get_random_shake(screen_shake: &ScreenShakeComponent) -> f32 {
 
 /// Trigger a screen shake whenever the player receives nonzero damage.
 pub(super) fn screen_shake_on_player_damage_system(
-    mut damage_dealt_events: EventReader<DamageDealtEvent>,
+    mut damage_dealt_events: EventReader<TakeDamageEvent>,
     player_query: Query<Entity, With<PlayerComponent>>,
     mut screen_shake_event_writer: EventWriter<ScreenShakeEvent>,
 ) {
     for event in damage_dealt_events.read() {
-        if player_query.contains(event.target) && event.damage > 0 {
+        if player_query.contains(event.target) && event.damage.amount > 0 {
             screen_shake_event_writer.send(ScreenShakeEvent { trauma: 0.23 });
         }
     }
diff --git a/src/collision/mod.rs b/src/collision/mod.rs
index 20cb843..e6fede9 100644
--- a/src/collision/mod.rs
+++ b/src/collision/mod.rs
@@ -1,7 +1,7 @@
-use crate::assets::game_assets::AppStates;
 use crate::assets::game_assets::GameUpdateSet;
 use crate::components::spawnable::Faction;
-use crate::gameplay::GameStates;
+use crate::components::states::AppStates;
+use crate::components::states::GameStates;
 use bevy::{
     app::{App, Plugin, Update},
     prelude::{in_state, Entity, Event, IntoSystemConfigs},
diff --git a/src/components/events.rs b/src/components/events.rs
index 660325e..046d627 100644
--- a/src/components/events.rs
+++ b/src/components/events.rs
@@ -1,3 +1,4 @@
+use crate::components::health::Damage;
 use crate::components::objectives::DefenseInteraction;
 use crate::components::player::PlayerInput;
 use crate::components::spawnable::{MobSegmentType, MobType};
@@ -47,3 +48,9 @@ pub struct PlayerJoinEvent {
     pub player_idx: u8,
     pub input: PlayerInput,
 }
+
+#[derive(Event)]
+pub struct TakeDamageEvent {
+    pub target: Entity,
+    pub damage: Damage,
+}
diff --git a/src/components/game.rs b/src/components/game.rs
new file mode 100644
index 0000000..4c51b36
--- /dev/null
+++ b/src/components/game.rs
@@ -0,0 +1,13 @@
+use bevy::math::Vec2;
+use bevy::prelude::{Component, Timer};
+
+#[derive(Component)]
+pub struct ShouldDespawn;
+
+#[derive(Component)]
+pub struct ExplosionRender {
+    pub origin: Vec2,
+    pub radius: f32,
+    pub ttl: Timer,
+    pub fade_out: bool,
+}
diff --git a/src/components/health.rs b/src/components/health.rs
index 5ca23a3..e8f45c4 100644
--- a/src/components/health.rs
+++ b/src/components/health.rs
@@ -26,12 +26,6 @@ pub struct Seeker(pub Entity);
 #[derive(Reflect, Component)]
 pub struct Owner(pub Entity);
 
-#[derive(Event)]
-pub struct DamageDealtEvent {
-    pub damage: usize,
-    pub target: Entity,
-}
-
 #[derive(Component)]
 pub struct HealthComponent {
     /// Current health value
@@ -170,3 +164,18 @@ impl HealthComponent {
         self.health = self.max_health;
     }
 }
+
+#[derive(Component, Copy, Clone)]
+pub struct Damage {
+    pub amount: usize,
+    pub is_crit: bool,
+}
+
+impl Damage {
+    pub fn from_amount(amount: usize) -> Self {
+        Self {
+            amount,
+            is_crit: false,
+        }
+    }
+}
diff --git a/src/components/mod.rs b/src/components/mod.rs
index 1351e13..6648821 100644
--- a/src/components/mod.rs
+++ b/src/components/mod.rs
@@ -2,9 +2,11 @@ pub mod abilities;
 pub mod audio;
 pub mod character;
 pub mod events;
+pub mod game;
 pub mod health;
 pub mod input;
 pub mod objectives;
 pub mod player;
 pub mod spawnable;
+pub mod states;
 pub mod weapon;
diff --git a/src/components/states.rs b/src/components/states.rs
new file mode 100644
index 0000000..8842510
--- /dev/null
+++ b/src/components/states.rs
@@ -0,0 +1,27 @@
+use bevy::prelude::States;
+
+/// The game's gameplay states.
+#[derive(Debug, Clone, Copy, Default, Eq, PartialEq, Hash, States)]
+pub enum GameStates {
+    #[default]
+    Playing,
+    Selection,
+    Paused,
+    GameOver,
+    Victory,
+}
+
+/// The game's states.
+#[derive(States, Debug, Hash, PartialEq, Eq, Clone, Default)]
+pub enum AppStates {
+    #[default]
+    Splash,
+    LoadingAssets,
+    MainMenu,
+    CharacterSelection,
+    InitializeRun,
+    Credits,
+    Game,
+    GameOver,
+    Victory,
+}
diff --git a/src/dev_tools.rs b/src/dev_tools.rs
index a401bea..59551fa 100644
--- a/src/dev_tools.rs
+++ b/src/dev_tools.rs
@@ -1,7 +1,7 @@
 //! Development tools for the game. This plugin is only enabled in dev builds.
 
-use crate::assets::game_assets::AppStates;
-use crate::gameplay::GameStates;
+use crate::components::states::AppStates;
+use crate::components::states::GameStates;
 use bevy::{
     dev_tools::{
         states::log_transitions,
diff --git a/src/enemy/mod.rs b/src/enemy/mod.rs
index bdb5037..7468095 100644
--- a/src/enemy/mod.rs
+++ b/src/enemy/mod.rs
@@ -5,9 +5,10 @@ mod final_boss;
 mod mothership;
 use bevy::prelude::*;
 
-use crate::assets::game_assets::AppStates;
 use crate::assets::game_assets::Fonts;
 use crate::components::player::PlayerComponent;
+use crate::components::states::AppStates;
+use crate::components::states::GameStates;
 use crate::enemy::drone::spawn_drone;
 use crate::enemy::drone_boss::spawn_drone_boss;
 use crate::enemy::fighter::spawn_fighter;
@@ -15,7 +16,6 @@ use crate::enemy::final_boss::spawn_final_boss;
 use crate::enemy::mothership::spawn_mothership;
 use crate::gameplay::gamelogic::{game_not_paused, GameTime};
 use crate::gameplay::physics::Physics;
-use crate::gameplay::GameStates;
 use crate::ship::engine::{Engine, EngineMethod};
 use crate::util::{Math, RenderLayer};
 use rand::Rng;
diff --git a/src/gameplay/control.rs b/src/gameplay/control.rs
index 0dc46ee..5ec535d 100644
--- a/src/gameplay/control.rs
+++ b/src/gameplay/control.rs
@@ -1,9 +1,9 @@
 use crate::components::player::PlayerComponent;
+use crate::components::states::{AppStates, GameStates};
 use crate::{
     gameplay::{
         gamelogic::{game_not_paused, PlayerLevel},
         loot::Cargo,
-        GameStates,
     },
     ship::engine::Engine,
     AppSet,
@@ -11,7 +11,6 @@ use crate::{
 use bevy::input::mouse::MouseWheel;
 use bevy::prelude::*;
 use bevy::window::WindowMode;
-use crate::assets::game_assets::AppStates;
 
 pub(super) fn plugin(app: &mut App) {
     app.add_systems(
@@ -52,7 +51,7 @@ pub fn player_control(
                 .cursor_position()
                 .and_then(|cursor| camera.viewport_to_world(camera_transform, cursor))
                 .map(|ray| ray.origin.truncate());
-            // println!("Player controlled at {:?}", engine.target);
+            debug!("Player controlled at {:?}", engine.target);
         } else {
             engine.target = None;
         }
diff --git a/src/gameplay/effects.rs b/src/gameplay/effects.rs
index 301d81f..3264fb6 100644
--- a/src/gameplay/effects.rs
+++ b/src/gameplay/effects.rs
@@ -1,4 +1,4 @@
-use crate::assets::game_assets::AppStates;
+use crate::components::states::AppStates;
 use crate::gameplay::gamelogic::game_not_paused;
 use crate::util::Colour;
 use crate::AppSet;
diff --git a/src/gameplay/gamelogic.rs b/src/gameplay/gamelogic.rs
index 7295379..e9f03cf 100644
--- a/src/gameplay/gamelogic.rs
+++ b/src/gameplay/gamelogic.rs
@@ -1,13 +1,13 @@
-use crate::assets::game_assets::AppStates;
 use crate::assets::game_assets::Fonts;
-use crate::components::health::{DamageDealtEvent, HealthComponent};
+use crate::components::events::TakeDamageEvent;
+use crate::components::game::{ExplosionRender, ShouldDespawn};
+use crate::components::health::HealthComponent;
 use crate::components::player::{PlayerComponent, PlayersResource};
 use crate::components::spawnable::{EffectType, TextEffectType};
+use crate::components::states::*;
 use crate::gameplay::effects::{FloatingText, HitFlash};
 use crate::gameplay::loot::{DropsLoot, IsLoot, Points, WorthPoints};
 use crate::gameplay::physics::{Collider, Physics};
-use crate::gameplay::GameStates;
-use crate::ship::bullet::{ExplosionRender, ShouldDespawn};
 use crate::spawnable::SpawnEffectEvent;
 use crate::util::{Colour, Math, RenderLayer};
 use crate::AppSet;
@@ -63,18 +63,6 @@ impl PlayerLevel {
     }
 }
 
-#[derive(Component, Copy, Clone)]
-pub struct Damage {
-    pub amount: usize,
-    pub is_crit: bool,
-}
-
-#[derive(Event)]//TODO:replace DamageDealtEvent
-pub struct TakeDamageEvent {
-    pub entity: Entity,
-    pub damage: Damage,
-}
-
 #[derive(PartialEq)]
 pub enum Allegiance {
     Friend,
@@ -101,17 +89,16 @@ impl Default for WillTarget {
 
 pub(super) fn plugin(app: &mut App) {
     app.add_event::<TakeDamageEvent>()
-        .add_event::<DamageDealtEvent>()
         .add_systems(OnEnter(AppStates::Game), setup_new_game);
     app.add_systems(OnExit(AppStates::Game), reset_game);
     app.add_systems(
         Update,
         (
-            game_time_system,
+            // game_time_system,
             camera_follow.before(ParallaxSystems),
-            combat_system,
+            shield_recharge_system,
             take_damage_events,
-            death_system,
+            drop_loot_system,
         )
             .chain()
             .in_set(AppSet::TickTimers)
@@ -180,14 +167,12 @@ pub fn camera_follow(
     }
 }
 
-pub fn combat_system(
-    mut commands: Commands,
+pub fn shield_recharge_system(
     time: Res<Time>,
-    mut query: Query<(&mut HealthComponent, Entity), Without<ShouldDespawn>>,
+    mut query: Query<(&mut HealthComponent, Entity), With<PlayerComponent>>,
 ) {
     for (mut health, entity) in &mut query {
         if health.get_health() <= 0 {
-            commands.entity(entity).insert(ShouldDespawn);
             continue;
         }
 
@@ -203,15 +188,11 @@ pub fn take_damage_events(
     mut commands: Commands,
     fonts: Res<Fonts>,
     mut take_damage_events: EventReader<TakeDamageEvent>,
-    mut query: Query<(
-        &Transform,
-        &mut HealthComponent,
-        Option<&mut HitFlash>,
-    )>,
+    mut query: Query<(&Transform, &mut HealthComponent, Option<&mut HitFlash>)>,
     mut spawn_effect_event_writer: EventWriter<SpawnEffectEvent>,
 ) {
     for ev in take_damage_events.read() {
-        if let Ok((transform, mut health, hit_flash)) = query.get_mut(ev.entity) {
+        if let Ok((transform, mut health, hit_flash)) = query.get_mut(ev.target) {
             // take damage from health
             health.take_damage(ev.damage.amount);
             // spawn damage dealt text effect
@@ -246,7 +227,7 @@ pub fn take_damage_events(
                             },
                         },
                     )
-                        .with_justify(JustifyText::Center),
+                    .with_justify(JustifyText::Center),
                     transform: Transform::from_xyz(
                         transform.translation.x,
                         transform.translation.y + 10.0,
@@ -259,24 +240,21 @@ pub fn take_damage_events(
     }
 }
 
-pub fn death_system(
+pub fn drop_loot_system(
     mut commands: Commands,
     fonts: Res<Fonts>,
     mut query: Query<
         (
-            Entity,
-            Option<&DropsLoot>,
             Option<&Transform>,
             Option<&ExplodesOnDespawn>,
             Option<&WorthPoints>,
+            Option<&DropsLoot>
         ),
-        With<ShouldDespawn>,
+        With<HealthComponent>,
     >,
     mut points: ResMut<Points>,
 ) {
-    for (entity, drops_loot, transform, explodes, worth_points) in &mut query {
-        commands.entity(entity).despawn_recursive();
-
+    for (transform, explodes, worth_points,drops_loot) in &mut query {
         if let Some(transform) = transform {
             if let Some(_drops_loot) = drops_loot {
                 spawn_loot(&mut commands, &fonts, transform.translation);
diff --git a/src/gameplay/hud.rs b/src/gameplay/hud.rs
index 1f70a39..a40e674 100644
--- a/src/gameplay/hud.rs
+++ b/src/gameplay/hud.rs
@@ -1,7 +1,7 @@
-use crate::assets::game_assets::AppStates;
 use crate::assets::game_assets::Fonts;
 use crate::components::health::HealthComponent;
 use crate::components::player::PlayerComponent;
+use crate::components::states::AppStates;
 use crate::gameplay::gamelogic::{DespawnWithScene, GameTime, PlayerLevel};
 use crate::gameplay::loot::Cargo;
 use crate::gameplay::upgrade::PlayerUpgrades;
diff --git a/src/gameplay/level.rs b/src/gameplay/level.rs
index a5422d3..0841fa9 100644
--- a/src/gameplay/level.rs
+++ b/src/gameplay/level.rs
@@ -11,7 +11,7 @@ use bevy::{ecs::world::Command, prelude::*};
 /// Functions that accept only `&mut World` as their parameter implement [`Command`].
 /// We use this style when a command requires no configuration.
 pub fn spawn_level(world: &mut World) {
-    println!("spawning level");
+    debug!("spawning level");
     // The only thing we have in our level is a player,
     // but add things like walls etc. here.
     SpawnPlayer::default().apply(world);
diff --git a/src/gameplay/loot.rs b/src/gameplay/loot.rs
index 170be72..8c126d6 100644
--- a/src/gameplay/loot.rs
+++ b/src/gameplay/loot.rs
@@ -1,4 +1,4 @@
-use crate::assets::game_assets::AppStates;
+use crate::components::states::AppStates;
 use crate::gameplay::gamelogic::game_not_paused;
 use crate::gameplay::physics::{Collider, Physics};
 use crate::AppSet;
diff --git a/src/gameplay/mod.rs b/src/gameplay/mod.rs
index e889dba..c122513 100644
--- a/src/gameplay/mod.rs
+++ b/src/gameplay/mod.rs
@@ -13,30 +13,15 @@ mod upgrade;
 use bevy::prelude::*;
 
 pub(super) fn plugin(app: &mut App) {
-    app.init_state::<GameStates>();
-    app.enable_state_scoped_entities::<GameStates>();
-
     app.add_plugins((
         gamelogic::plugin,
         physics::plugin,
         effects::plugin,
         loot::plugin,
-        selection::plugin,
-        upgrade::plugin,
-        object::plugin,
-        hud::plugin,
-        control::plugin,
+        // selection::plugin,
+        // upgrade::plugin,
+        // object::plugin,
+        // hud::plugin,
+        // control::plugin,
     ));
 }
-
-/// The game's gameplay states.
-#[derive(Debug, Clone, Copy, Default, Eq, PartialEq, Hash, States)]
-pub enum GameStates {
-    #[default]
-    Initialise,
-    Playing,
-    Selection,
-    Paused,
-    GameOver,
-    Victory,
-}
diff --git a/src/gameplay/object.rs b/src/gameplay/object.rs
index 1bfcaec..e3148e8 100644
--- a/src/gameplay/object.rs
+++ b/src/gameplay/object.rs
@@ -1,5 +1,5 @@
-use crate::assets::game_assets::AppStates;
 use crate::components::health::HealthComponent;
+use crate::components::states::AppStates;
 use crate::gameplay::gamelogic::ExplodesOnDespawn;
 use crate::gameplay::physics::{Collider, Physics, Rotator};
 use crate::util;
diff --git a/src/gameplay/physics.rs b/src/gameplay/physics.rs
index a62ba88..fd5b061 100644
--- a/src/gameplay/physics.rs
+++ b/src/gameplay/physics.rs
@@ -1,4 +1,4 @@
-use crate::assets::game_assets::AppStates;
+use crate::components::states::AppStates;
 use crate::gameplay::gamelogic::game_not_paused;
 use crate::util::Math;
 use crate::AppSet;
@@ -75,7 +75,7 @@ pub fn physics_system(
         let drag = physics.drag;
         physics.velocity += current_acceleration;
         transform.translation += physics.velocity.extend(0.0) * time.delta_seconds();
-        // println!("Player translate at {:?}", transform.translation);
+        debug!("Player translate at {:?}", transform.translation);
         // TODO make acceleration ramp down
         physics.acceleration = Vec2::ZERO;
         physics.velocity *= 1.0 - (drag * time.delta_seconds());
diff --git a/src/gameplay/selection.rs b/src/gameplay/selection.rs
index 88d7fb8..8020200 100644
--- a/src/gameplay/selection.rs
+++ b/src/gameplay/selection.rs
@@ -1,6 +1,6 @@
+use crate::components::states::GameStates;
 use crate::gameplay::gamelogic::PlayerLevel;
 use crate::gameplay::upgrade::{PlayerUpgrades, UpgradeEvent};
-use crate::gameplay::GameStates;
 use crate::ship::turret::TurretClass;
 use crate::theme::language::Localize;
 use crate::util::Colour;
@@ -171,7 +171,7 @@ fn button(
         UpgradeEvent::Passive(_) => Colour::SHIELD,
         UpgradeEvent::Heal => Colour::GREEN,
     };
-    // println!("{}",format!("{}", upgrade));
+    debug!("{}", format!("{}", upgrade));
     parent
         .spawn((
             ButtonBundle {
diff --git a/src/gameplay/upgrade.rs b/src/gameplay/upgrade.rs
index 3e240a3..ffb16b6 100644
--- a/src/gameplay/upgrade.rs
+++ b/src/gameplay/upgrade.rs
@@ -1,6 +1,6 @@
-use crate::assets::game_assets::AppStates;
 use crate::components::health::HealthComponent;
 use crate::components::player::PlayerComponent;
+use crate::components::states::AppStates;
 use crate::gameplay::loot::{Cargo, Magnet};
 use crate::ship::engine::Engine;
 use crate::ship::turret::{DoesDamage, EffectSize, FireRate, MultiShot, TurretBundle, TurretClass};
diff --git a/src/lib.rs b/src/lib.rs
index e149828..9fea26d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -28,6 +28,7 @@ pub mod weapon;
 use crate::animation::SpriteAnimationPlugin;
 use crate::arena::ArenaPlugin;
 use crate::camera::CameraPlugin;
+use crate::components::states::{AppStates, GameStates};
 use crate::loot::LootPlugin;
 use crate::options::display::DisplayConfig;
 use crate::options::generate_config_files;
@@ -125,18 +126,23 @@ impl Plugin for AppPlugin {
             assets::plugin,
             stats::plugin,
             // screens::plugin,//TODO:Merge with ui(UiPlugin)
-            theme::plugin,
+            // theme::plugin,
             gameplay::plugin,
-            ship::plugin,
-            enemy::plugin,
+            // ship::plugin,
+            // enemy::plugin,
             audio::plugin,
         ));
-
+        app.init_state::<GameStates>();
+        app.enable_state_scoped_entities::<GameStates>();
+        app.init_state::<AppStates>();
+        app.enable_state_scoped_entities::<AppStates>();
         // Enable dev tools for dev builds.
         #[cfg(feature = "dev")]
         app.add_plugins(dev_tools::plugin);
-        #[cfg(feature = "dev")]
-        app.add_plugins(RapierDebugRenderPlugin::default());
+
+        if cfg!(debug_assertions) && !cfg!(test) {
+            app.add_plugins(RapierDebugRenderPlugin::default());
+        }
     }
 }
 
diff --git a/src/options/mod.rs b/src/options/mod.rs
index 0432a28..8e9b010 100644
--- a/src/options/mod.rs
+++ b/src/options/mod.rs
@@ -14,8 +14,8 @@ mod input;
 pub mod resources;
 
 use self::display::set_window_icon;
-use crate::assets::game_assets::AppStates;
 use crate::components::input::{InputsResource, MenuAction};
+use crate::components::states::AppStates;
 use crate::options::resources::GameParametersResource;
 use input::get_input_bindings;
 use ron::de::from_bytes;
diff --git a/src/player/mod.rs b/src/player/mod.rs
index 6837019..addb618 100644
--- a/src/player/mod.rs
+++ b/src/player/mod.rs
@@ -9,14 +9,17 @@ use self::systems::{
     player_death_system, players_reset_system,
     upgrades::scale_ability_cooldowns_system,
 };
-use crate::assets::game_assets::AppStates;
 use crate::assets::game_assets::GameUpdateSet;
 use crate::components::abilities::{
     AbilitiesResource, AbilityDescriptionsResource, ActivateAbilityEvent,
 };
 use crate::components::input::PlayerAction;
 use crate::components::player::{InputRestrictionsAtSpawn, PlayerComponent, PlayersResource};
-use crate::gameplay::GameStates;
+use crate::components::states::AppStates;
+use crate::components::states::GameStates;
+use crate::player::spawn::SpawnPlayer;
+use bevy::ecs::world::Command;
+use bevy::prelude::{Commands, World};
 use bevy::{
     app::{App, Plugin, Update},
     ecs::schedule::IntoSystemConfigs,
@@ -27,6 +30,7 @@ use bevy::{
 };
 use leafwing_input_manager::prelude::InputManagerPlugin;
 use ron::de::from_bytes;
+use tracing::debug;
 
 mod resources;
 pub mod spawn;
@@ -45,7 +49,7 @@ impl Plugin for PlayerPlugin {
             from_bytes::<CharactersResource>(include_bytes!("../../assets/data/characters.ron"))
                 .unwrap(),
         );
-
+        debug!("PlayerPlugin build");
         app.insert_resource(
             from_bytes::<AbilitiesResource>(include_bytes!("../../assets/data/abilities.ron"))
                 .unwrap(),
@@ -60,7 +64,7 @@ impl Plugin for PlayerPlugin {
 
         app.insert_resource(PlayersResource::default())
             .insert_resource(InputRestrictionsAtSpawn::default());
-
+        app.add_systems(OnEnter(AppStates::Game), setup_new_game);
         app.add_systems(
             Update,
             (
@@ -84,3 +88,17 @@ impl Plugin for PlayerPlugin {
         app.add_systems(OnEnter(AppStates::MainMenu), players_reset_system);
     }
 }
+
+fn setup_new_game(mut commands: Commands) {
+    commands.add(spawn_level);
+}
+
+/// A [`Command`] to spawn the level.
+/// Functions that accept only `&mut World` as their parameter implement [`Command`].
+/// We use this style when a command requires no configuration.
+pub fn spawn_level(world: &mut World) {
+    debug!("spawning level");
+    // The only thing we have in our level is a player,
+    // but add things like walls etc. here.
+    SpawnPlayer::default().apply(world);
+}
diff --git a/src/player/spawn.rs b/src/player/spawn.rs
index 45071ae..76025f9 100644
--- a/src/player/spawn.rs
+++ b/src/player/spawn.rs
@@ -1,4 +1,3 @@
-use crate::assets::game_assets::AppStates;
 use crate::assets::player_assets::PlayerAssets;
 use crate::components::abilities::{
     AbilitiesResource, ChargeAbilityBundle, SlotOneAbilityType, SlotTwoAbilityType,
@@ -7,11 +6,12 @@ use crate::components::abilities::{
 use crate::components::health::{HealthComponent, ShipBundle};
 use crate::components::input::{InputsResource, PlayerAction};
 use crate::components::player::{PlayerBundle, PlayerIDComponent, PlayerInput};
+use crate::components::states::AppStates;
 use crate::gameplay::gamelogic::{Allegiance, Targettable, WillTarget};
 use crate::gameplay::loot::{Cargo, Magnet};
 use crate::gameplay::physics::{BaseGlyphRotation, Physics};
 use crate::options::resources::GameParametersResource;
-use crate::player::PlayersResource;
+use crate::player::{CharactersResource, PlayersResource};
 use crate::ship::engine::Engine;
 use crate::util::RenderLayer;
 use bevy::color::Color;
@@ -130,7 +130,7 @@ impl Command for SpawnPlayer {
 fn spawn_player(
     In(config): In<SpawnPlayer>,
     mut commands: Commands,
-    characters: Res<crate::components::character::CharactersResource>,
+    characters: Res<CharactersResource>,
     game_parameters: Res<GameParametersResource>,
     player_assets: Res<PlayerAssets>,
     players_resource: Res<PlayersResource>,
@@ -139,7 +139,7 @@ fn spawn_player(
 ) {
     // check if more than one player is playing
     let is_multiplayer = players_resource.player_data.get(1).is_some();
-    println!(
+    debug!(
         "spawning player is_multiplayer:{},player_data:{}",
         is_multiplayer,
         players_resource.player_data.get(0).is_some()
@@ -159,7 +159,7 @@ fn spawn_player(
                 character.collider_dimensions.x * game_parameters.sprite_scale / 2.0;
             let collider_size_hy =
                 character.collider_dimensions.y * game_parameters.sprite_scale / 2.0;
-            println!("spawning Player:{}", &character.name);
+            debug!("spawning Player:{}", &character.name);
             // create player component from character
             let player_bundle = PlayerBundle::from(character).with_id(player_id);
 
@@ -200,8 +200,8 @@ fn spawn_player(
                         }
                     },
                     scale: Vec3::new(
-                        game_parameters.sprite_scale * 8.0,
-                        game_parameters.sprite_scale * 8.0,
+                        game_parameters.sprite_scale,
+                        game_parameters.sprite_scale,
                         1.0,
                     ),
                     ..Default::default()
@@ -233,17 +233,17 @@ fn spawn_player(
                     parent.spawn_slot_1_ability(&abilities_res, &character.slot_1_ability);
                     parent.spawn_slot_2_ability(&abilities_res, &character.slot_2_ability);
                 })
-                .insert(ShipBundle {
-                    physics: Physics::new(config.drag),
-                    engine: Engine::new_with_steering(
-                        config.power,
-                        config.max_speed,
-                        config.steering_factor,
-                    ),
-                    targettable: Targettable(Allegiance::Friend),
-                    will_target: WillTarget(vec![Allegiance::Enemy]),
-                    ..default()
-                })
+                // .insert(ShipBundle {
+                //     physics: Physics::new(config.drag),
+                //     engine: Engine::new_with_steering(
+                //         config.power,
+                //         config.max_speed,
+                //         config.steering_factor,
+                //     ),
+                //     targettable: Targettable(Allegiance::Friend),
+                //     will_target: WillTarget(vec![Allegiance::Enemy]),
+                //     ..default()
+                // })
                 .insert(BaseGlyphRotation {
                     rotation: Quat::from_rotation_z(PI / 2.0),
                 })
diff --git a/src/player/systems/abilities.rs b/src/player/systems/abilities.rs
index bb87552..2c8096b 100644
--- a/src/player/systems/abilities.rs
+++ b/src/player/systems/abilities.rs
@@ -48,8 +48,8 @@ pub(in crate::player) fn player_ability_input_system(
             if let Ok((mut ability_cooldown, ability_id)) = ability_query.get_mut(*child) {
                 match ability_id {
                     AbilitySlotIDComponent::One => {
-                        if action_state.pressed(&PlayerAction::SlotOneAbility)
-                            && ability_cooldown.cooldown_timer.finished()
+                        if ability_cooldown.cooldown_timer.finished()
+                        // && action_state.pressed(&PlayerAction::SlotOneAbility)//TODO:more abilities
                         {
                             ability_cooldown.cooldown_timer = Timer::from_seconds(
                                 ability_cooldown.base_cooldown_time
@@ -61,8 +61,8 @@ pub(in crate::player) fn player_ability_input_system(
                         }
                     }
                     AbilitySlotIDComponent::Two => {
-                        if action_state.pressed(&PlayerAction::SlotTwoAbility)
-                            && ability_cooldown.cooldown_timer.finished()
+                        if ability_cooldown.cooldown_timer.finished()
+                        // && action_state.pressed(&PlayerAction::SlotTwoAbility)
                         {
                             ability_cooldown.cooldown_timer = Timer::from_seconds(
                                 ability_cooldown.base_cooldown_time
@@ -79,7 +79,7 @@ pub(in crate::player) fn player_ability_input_system(
     }
 }
 
-/// Activates a standard waeapon ability (abilities with `StandardWeaponAbilityComponent`)
+/// Activates a standard weapon ability (abilities with `StandardWeaponAbilityComponent`)
 /// for a player for corresponding ActivateAbilityEvents.
 /// Combines the stats in the player's `PlayerOutgoingDamageComponent` of the player with
 /// the stats in `StandardWeaponAbilityComponent`.
diff --git a/src/player/systems/movement.rs b/src/player/systems/movement.rs
index 3efdc08..e01e99e 100644
--- a/src/player/systems/movement.rs
+++ b/src/player/systems/movement.rs
@@ -7,6 +7,7 @@ use bevy::transform::components::Transform;
 use bevy_rapier2d::dynamics::Velocity;
 use leafwing_input_manager::prelude::ActionState;
 use std::f32::consts::PI;
+use tracing::debug;
 
 /// Move player by modifying velocity with input
 pub(in crate::player) fn player_movement_system(
@@ -29,7 +30,7 @@ pub(in crate::player) fn player_movement_system(
         // convert to axis multipliers
         let x_axis = -(left as i8) + right as i8;
         let y_axis = -(down as i8) + up as i8;
-
+        debug!("x_axis: {:?}, y_axis: {:?}", x_axis, y_axis);
         // handle movement in x direction
         if x_axis != 0 {
             // accelerate to the player's maximum speed stat
diff --git a/src/run/gameplay.rs b/src/run/gameplay.rs
new file mode 100644
index 0000000..6bdf90b
--- /dev/null
+++ b/src/run/gameplay.rs
@@ -0,0 +1,70 @@
+use crate::audio::MenuAudioChannel;
+use crate::components::input::{MainMenuExplorer, MenuAction};
+use crate::components::states::{AppStates, GameStates};
+use bevy::asset::AssetServer;
+use bevy::prelude::{NextState, Query, Res, ResMut, With};
+use bevy_kira_audio::{AudioChannel, AudioControl};
+use bevy_rapier2d::plugin::RapierConfiguration;
+use leafwing_input_manager::prelude::ActionState;
+
+pub fn start_mainmenu_system(
+    menu_input_query: Query<&ActionState<MenuAction>, With<MainMenuExplorer>>,
+    mut next_app_state: ResMut<NextState<AppStates>>,
+    mut next_game_state: ResMut<NextState<GameStates>>,
+) {
+    // read menu input action
+    let action_state = menu_input_query.single();
+
+    // if reset input provided reset th run
+    if action_state.just_released(&MenuAction::Reset) {
+        // go to the main menu state
+        next_app_state.set(AppStates::MainMenu);
+        next_game_state.set(GameStates::Playing);
+    }
+}
+
+// close pause menu if input given
+pub(super) fn close_pause_menu_system(
+    menu_input_query: Query<&ActionState<MenuAction>, With<MainMenuExplorer>>,
+    mut next_game_state: ResMut<NextState<GameStates>>,
+    mut rapier_config: ResMut<RapierConfiguration>,
+    asset_server: Res<AssetServer>,
+    audio_channel: Res<AudioChannel<MenuAudioChannel>>,
+) {
+    // read menu input action
+    let action_state = menu_input_query.single();
+
+    // pop the pause state if input read
+    if action_state.just_released(&MenuAction::ExitPauseMenu) {
+        next_game_state.set(GameStates::Playing);
+
+        // play sound effect
+        audio_channel.play(asset_server.load("sounds/menu_input_success.wav"));
+
+        // resume the physics engine
+        rapier_config.physics_pipeline_active = true;
+        rapier_config.query_pipeline_active = true;
+    }
+}
+
+pub(super) fn open_pause_menu_system(
+    menu_input_query: Query<&ActionState<MenuAction>, With<MainMenuExplorer>>,
+    mut next_game_state: ResMut<NextState<GameStates>>,
+    mut rapier_config: ResMut<RapierConfiguration>,
+    asset_server: Res<AssetServer>,
+    audio_channel: Res<AudioChannel<MenuAudioChannel>>,
+) {
+    let action_state = menu_input_query.single();
+
+    // switch to pause menu state if input read
+    if action_state.just_released(&MenuAction::PauseGame) {
+        next_game_state.set(GameStates::Paused);
+
+        // play sound effect
+        audio_channel.play(asset_server.load("sounds/menu_input_success.wav"));
+
+        // suspend the physics engine
+        rapier_config.physics_pipeline_active = false;
+        rapier_config.query_pipeline_active = false;
+    }
+}
diff --git a/src/run/mod.rs b/src/run/mod.rs
index fac543d..905a2e6 100644
--- a/src/run/mod.rs
+++ b/src/run/mod.rs
@@ -12,7 +12,6 @@ use ron::de::from_bytes;
 use serde::Deserialize;
 use std::collections::{HashMap, VecDeque};
 
-use crate::assets::game_assets::AppStates;
 use crate::assets::game_assets::GameUpdateSet;
 use crate::components::audio::{ChangeBackgroundMusicEvent, PlaySoundEffectEvent, SoundEffectType};
 use crate::components::events::{
@@ -22,10 +21,15 @@ use crate::components::input::PlayerAction;
 use crate::components::objectives::{DefenseInteraction, Objective};
 use crate::components::player::{InputRestrictionsAtSpawn, PlayerComponent};
 use crate::components::spawnable::{MobDestroyedEvent, MobSegmentDestroyedEvent, SpawnMobEvent};
-use crate::gameplay::GameStates;
+use crate::components::states::AppStates;
+use crate::components::states::GameStates;
+use crate::run::gameplay::{
+    close_pause_menu_system, open_pause_menu_system, start_mainmenu_system,
+};
 use crate::spawnable::BossesDestroyedEvent;
 
 mod formation;
+mod gameplay;
 mod level;
 pub(crate) mod level_phase;
 pub(crate) mod tutorial;
@@ -81,6 +85,34 @@ impl Plugin for RunPlugin {
                 .run_if(in_state(GameStates::Playing)),
         );
 
+        app.add_systems(
+            Update,
+            close_pause_menu_system.run_if(in_state(GameStates::Paused)),
+        );
+
+        app.add_systems(
+            Update,
+            open_pause_menu_system
+                .run_if(in_state(AppStates::Game))
+                .run_if(in_state(GameStates::Playing)),
+        );
+
+        app.add_systems(
+            Update,
+            start_mainmenu_system.run_if(in_state(AppStates::Victory)),
+        );
+
+        app.add_systems(
+            Update,
+            start_mainmenu_system.run_if(in_state(AppStates::GameOver)),
+        );
+
+        app.add_systems(
+            Update,
+            start_mainmenu_system
+                .run_if(in_state(AppStates::Game))
+                .run_if(in_state(GameStates::Paused)),
+        );
         // reset the run after exiting the end game screens and when entering the main menu
         app.add_systems(OnExit(AppStates::GameOver), run_reset_system);
         app.add_systems(OnExit(AppStates::Victory), run_reset_system);
@@ -97,7 +129,7 @@ pub(super) struct PremadeRunsResource {
 /// state required to transition to new sections of the level.
 #[derive(Resource, Debug)]
 pub struct CurrentRunProgressResource {
-    /// List of string level keys that are matched to values in the levelsresource
+    /// List of string level keys that are matched to values in the levels resource
     pub queued_levels: VecDeque<Level>,
     pub completed_levels: VecDeque<Level>,
     /// Tracks the level currently being played
@@ -144,10 +176,12 @@ impl CurrentRunProgressResource {
             self.current_level = None;
         }
 
-        // pop the next level (if it exists) into the the current level
+        // pop the next level (if it exists) into the current level
         self.current_level = self.queued_levels.pop_front();
-
-        info!("Level cycled");
+        info!(
+            "Level cycled,current level is {:?}",
+            self.current_level.as_ref().unwrap().name.clone()
+        );
     }
 
     fn init_current_level(
@@ -353,7 +387,6 @@ fn run_reset_system(
 
 #[cfg(test)]
 mod test {
-    use crate::assets::game_assets::AppStates;
     use crate::components::audio::{ChangeBackgroundMusicEvent, PlaySoundEffectEvent};
     use crate::components::events::MobReachedBottomGateEvent;
     use crate::components::objectives::DefenseInteraction;
@@ -361,7 +394,8 @@ mod test {
     use crate::components::spawnable::{
         MobDestroyedEvent, MobSegmentDestroyedEvent, SpawnMobEvent,
     };
-    use crate::gameplay::GameStates;
+    use crate::components::states::AppStates;
+    use crate::components::states::GameStates;
     use crate::run::{RunPlugin, SpawnFormationEvent};
     use crate::spawnable::{BossesDestroyedEvent, SpawnConsumableEvent};
     use bevy::app::App;
diff --git a/src/screens/credits.rs b/src/screens/credits.rs
index 44d4e9b..866a8ff 100644
--- a/src/screens/credits.rs
+++ b/src/screens/credits.rs
@@ -1,8 +1,9 @@
 //! A credits screen that can be accessed from the title screen.
 use bevy::prelude::*;
 
-use crate::assets::game_assets::{AppStates, Fonts, Music};
-use crate::{theme::prelude::*};
+use crate::assets::game_assets::Fonts;
+use crate::components::states::AppStates;
+use crate::theme::prelude::*;
 
 pub(super) fn plugin(app: &mut App) {
     app.add_systems(OnEnter(AppStates::Credits), spawn_credits_screen);
diff --git a/src/screens/gameplay.rs b/src/screens/gameplay.rs
index 14ef610..76bff0c 100644
--- a/src/screens/gameplay.rs
+++ b/src/screens/gameplay.rs
@@ -1,8 +1,8 @@
 //! The screen state for the main gameplay.
-use crate::assets::game_assets::{AppStates, Fonts};
+use crate::assets::game_assets::Fonts;
+use crate::components::states::*;
 use crate::gameplay::level::spawn_level as spawn_level_command;
 use crate::gameplay::loot::Points;
-use crate::gameplay::GameStates;
 use crate::theme::interaction::OnPress;
 use crate::theme::prelude::*;
 use bevy::input::common_conditions::input_just_pressed;
diff --git a/src/screens/loading.rs b/src/screens/loading.rs
index 6da0a4a..2fe5bc3 100644
--- a/src/screens/loading.rs
+++ b/src/screens/loading.rs
@@ -1,9 +1,9 @@
 //! A loading screen during which game assets are loaded.
 //! This reduces stuttering, especially for audio on WASM.
 
-use bevy::prelude::*;
-use crate::assets::game_assets::AppStates;
+use crate::components::states::AppStates;
 use crate::theme::prelude::*;
+use bevy::prelude::*;
 
 pub(super) fn plugin(app: &mut App) {
     app.add_systems(OnEnter(AppStates::LoadingAssets), spawn_loading_screen);
diff --git a/src/screens/main_menu.rs b/src/screens/main_menu.rs
index 4240ec0..5588a65 100644
--- a/src/screens/main_menu.rs
+++ b/src/screens/main_menu.rs
@@ -1,5 +1,6 @@
 //! The title screen that appears when the game starts.
-use crate::assets::game_assets::{AppStates, Fonts, Music};
+use crate::assets::game_assets::Fonts;
+use crate::components::states::AppStates;
 use crate::config::GameConfig;
 use crate::theme::prelude::*;
 use bevy::prelude::*;
diff --git a/src/ship/bullet.rs b/src/ship/bullet.rs
index 994b495..22916df 100644
--- a/src/ship/bullet.rs
+++ b/src/ship/bullet.rs
@@ -1,8 +1,10 @@
-use crate::assets::game_assets::AppStates;
 use crate::assets::game_assets::AudioAssets;
+use crate::components::events::TakeDamageEvent;
+use crate::components::game::{ExplosionRender, ShouldDespawn};
 use crate::components::health::*;
+use crate::components::states::AppStates;
 use crate::config::GameConfig;
-use crate::gameplay::gamelogic::{game_not_paused, Damage, TakeDamageEvent};
+use crate::gameplay::gamelogic::game_not_paused;
 use crate::gameplay::physics::Collider;
 use crate::AppSet;
 use bevy::{prelude::*, utils::HashMap};
@@ -11,17 +13,6 @@ use bevy_kira_audio::{Audio, AudioControl};
 use bevy_prototype_lyon::prelude::{GeometryBuilder, Path, Stroke};
 use bevy_prototype_lyon::shapes;
 
-#[derive(Component)]
-pub struct ExplosionRender {
-    pub origin: Vec2,
-    pub radius: f32,
-    pub ttl: Timer,
-    pub fade_out: bool,
-}
-
-#[derive(Component)]
-pub struct ShouldDespawn;
-
 #[derive(Component)]
 pub struct Bullet {
     pub time2live: Timer,
@@ -163,7 +154,7 @@ pub fn bullet_collision_system(
                 *number_of_times_hit += 1;
 
                 take_damage_event.send(TakeDamageEvent {
-                    entity: *potential_entity,
+                    target: *potential_entity,
                     damage: direct_damage.0,
                 });
             }
@@ -206,7 +197,7 @@ fn do_aoe_damage(
         *number_of_times_hit += 1;
 
         take_damage_event.send(TakeDamageEvent {
-            entity: h.2,
+            target: h.2,
             damage: aoe_damage.damage,
         });
     }
diff --git a/src/ship/engine.rs b/src/ship/engine.rs
index e4598e2..d8982c4 100644
--- a/src/ship/engine.rs
+++ b/src/ship/engine.rs
@@ -1,5 +1,5 @@
-use crate::assets::game_assets::AppStates;
 use crate::components::health::Seeker;
+use crate::components::states::AppStates;
 use crate::gameplay::gamelogic::game_not_paused;
 use crate::gameplay::physics::Physics;
 use crate::AppSet;
@@ -103,7 +103,7 @@ pub fn engine_system(
             }
             let clamped_steer = desired_steer.clamp(-max_steer_this_step, max_steer_this_step);
             let to_target = Vec2::from_angle(clamped_steer).rotate(to_target);
-            // println!("to target: {:?}", to_target);
+            debug!("to target: {:?}", to_target);
             physics.add_force(to_target.normalize() * engine.speed);
         } else {
             engine.speed -= engine.power * time.delta_seconds() * engine.depower_factor;
diff --git a/src/ship/turret.rs b/src/ship/turret.rs
index ca8f5d4..a595e07 100644
--- a/src/ship/turret.rs
+++ b/src/ship/turret.rs
@@ -1,15 +1,14 @@
-use crate::assets::game_assets::AppStates;
 use crate::assets::game_assets::{AudioAssets, Fonts};
-use crate::components::health::{HealthComponent, Owner, Seeker};
+use crate::components::events::TakeDamageEvent;
+use crate::components::game::ExplosionRender;
+use crate::components::health::{Damage, HealthComponent, Owner, Seeker};
+use crate::components::states::AppStates;
 use crate::config::GameConfig;
 use crate::gameplay::gamelogic::{
-    game_not_paused, Damage, DespawnWithScene, ExplodesOnDespawn, TakeDamageEvent, Targettable,
-    WillTarget,
+    game_not_paused, DespawnWithScene, ExplodesOnDespawn, Targettable, WillTarget,
 };
 use crate::gameplay::physics::{BaseGlyphRotation, Collider, Physics};
-use crate::ship::bullet::{
-    AoeDamage, Bullet, DirectDamage, ExpandingCollider, ExplosionRender, LaserRender,
-};
+use crate::ship::bullet::{AoeDamage, Bullet, DirectDamage, ExpandingCollider, LaserRender};
 use crate::ship::engine::Engine;
 use crate::util::{Colour, Math, RenderLayer};
 use bevy::ecs::query::QueryEntityError;
@@ -434,7 +433,7 @@ pub fn fire_blast_laser(
 
             // Immediate hit
             take_damage_event.send(TakeDamageEvent {
-                entity: target,
+                target,
                 damage: damage.roll(),
             });
         }
@@ -526,7 +525,7 @@ fn spawn_link(
     ));
     // Immediate hit
     take_damage_event.send(TakeDamageEvent {
-        entity: target,
+        target,
         damage: damage.roll(),
     });
     Ok(target_position)
@@ -800,7 +799,7 @@ pub fn fire_pierce_laser(
                         <= a.3.radius + size.0
                 })
                 .map(|hit| TakeDamageEvent {
-                    entity: hit.0,
+                    target: hit.0,
                     damage: damage.roll(),
                 });
             take_damage_event.send_batch(events);
diff --git a/src/spawnable/consumable/mod.rs b/src/spawnable/consumable/mod.rs
index 1487552..ca2cdd1 100644
--- a/src/spawnable/consumable/mod.rs
+++ b/src/spawnable/consumable/mod.rs
@@ -1,9 +1,9 @@
 use crate::animation::{AnimationComponent, AnimationData};
 use crate::assets::consumable::ConsumableAssets;
-use crate::assets::game_assets::AppStates;
 use crate::components::spawnable::{
     AttractToClosestPlayerComponent, ConsumableType, SpawnableType,
 };
+use crate::components::states::AppStates;
 use crate::options::resources::GameParametersResource;
 use crate::options::GameOptions;
 use crate::spawnable::{SpawnableBehavior, SpawnableComponent};
diff --git a/src/spawnable/effect/behavior.rs b/src/spawnable/effect/behavior.rs
index 2501e61..657da88 100644
--- a/src/spawnable/effect/behavior.rs
+++ b/src/spawnable/effect/behavior.rs
@@ -1,9 +1,9 @@
 use super::EffectComponent;
 use crate::animation::AnimationComponent;
-use crate::assets::game_assets::AppStates;
 use crate::assets::game_assets::GameUpdateSet;
 use crate::components::events::AnimationCompletedEvent;
-use crate::gameplay::GameStates;
+use crate::components::states::AppStates;
+use crate::components::states::GameStates;
 use bevy::app::{App, Plugin, Update};
 use bevy::asset::{Assets, Handle};
 use bevy::color::Alpha;
diff --git a/src/spawnable/effect/spawn.rs b/src/spawnable/effect/spawn.rs
index 3ff2d9b..7357752 100644
--- a/src/spawnable/effect/spawn.rs
+++ b/src/spawnable/effect/spawn.rs
@@ -1,9 +1,9 @@
 use crate::animation::AnimationComponent;
 use crate::assets::effect::EffectAssets;
-use crate::assets::game_assets::AppStates;
 use crate::assets::ui::UiAssets;
 use crate::components::spawnable::{EffectType, SpawnableType, TextEffectType};
-use crate::gameplay::GameStates;
+use crate::components::states::AppStates;
+use crate::components::states::GameStates;
 use crate::options::GameOptions;
 use crate::spawnable::effect::{EffectComponent, TextEffectData, TextEffectsResource};
 use crate::spawnable::{EffectsResource, InitialMotion, SpawnEffectEvent, SpawnableComponent};
diff --git a/src/spawnable/item/behavior.rs b/src/spawnable/item/behavior.rs
index f74a5c0..de94886 100644
--- a/src/spawnable/item/behavior.rs
+++ b/src/spawnable/item/behavior.rs
@@ -1,9 +1,9 @@
-use crate::assets::game_assets::AppStates;
 use crate::collision::SortedCollisionEvent;
 use crate::components::health::HealthComponent;
 use crate::components::player::PlayerComponent;
 use crate::components::spawnable::ItemComponent;
-use crate::gameplay::GameStates;
+use crate::components::states::AppStates;
+use crate::components::states::GameStates;
 use bevy::log::info;
 use bevy::prelude::{
     in_state, App, Commands, Component, EventReader, IntoSystemConfigs, Plugin, Query, Update, With,
diff --git a/src/spawnable/item/spawn.rs b/src/spawnable/item/spawn.rs
index d9b96da..6739c75 100644
--- a/src/spawnable/item/spawn.rs
+++ b/src/spawnable/item/spawn.rs
@@ -2,12 +2,12 @@ use super::{
     behavior::{ItemBehavior, OnCollectFullHeal, OnCollectIncreaseMaxHealth},
     ItemResource,
 };
-use crate::assets::game_assets::AppStates;
 use crate::assets::item::ItemAssets;
 use crate::components::spawnable::{
     AttractToClosestPlayerComponent, ItemComponent, ItemType, SpawnItemEvent,
 };
-use crate::gameplay::GameStates;
+use crate::components::states::AppStates;
+use crate::components::states::GameStates;
 use crate::options::resources::GameParametersResource;
 use crate::spawnable::SpawnableBehavior;
 use crate::{animation::AnimationComponent, spawnable::SpawnableComponent};
diff --git a/src/spawnable/mob/behavior.rs b/src/spawnable/mob/behavior.rs
index 334a5e1..6dd4efb 100644
--- a/src/spawnable/mob/behavior.rs
+++ b/src/spawnable/mob/behavior.rs
@@ -1,6 +1,7 @@
 use super::{BossComponent, MobComponent};
 use crate::components::audio::{PlaySoundEffectEvent, SoundEffectType};
-use crate::components::health::{DamageDealtEvent, HealthComponent};
+use crate::components::events::TakeDamageEvent;
+use crate::components::health::{Damage, HealthComponent};
 use crate::components::player::PlayerIncomingDamageComponent;
 use crate::components::spawnable::{
     EffectType, MobDestroyedEvent, SpawnItemEvent, SpawnMobEvent, SpawnPosition,
@@ -56,7 +57,7 @@ pub fn mob_execute_behavior_system(
     mut spawn_item_event_writer: EventWriter<SpawnItemEvent>,
     mut spawn_mob_event_writer: EventWriter<SpawnMobEvent>,
     mut mob_destroyed_event_writer: EventWriter<MobDestroyedEvent>,
-    mut damage_dealt_event_writer: EventWriter<DamageDealtEvent>,
+    mut damage_dealt_event_writer: EventWriter<TakeDamageEvent>,
     loot_drops_resource: Res<LootDropsResource>,
     mut sound_effect_event_writer: EventWriter<PlaySoundEffectEvent>,
     game_parameters: Res<GameParametersResource>,
@@ -184,7 +185,7 @@ fn receive_damage_on_impact(
     entity: Entity,
     collision_events: &[&SortedCollisionEvent],
     player_query: &Query<(Entity, &PlayerIncomingDamageComponent)>,
-    damage_dealt_event_writer: &mut EventWriter<DamageDealtEvent>,
+    damage_dealt_event_writer: &mut EventWriter<TakeDamageEvent>,
 ) {
     for collision_event in collision_events.iter() {
         match collision_event {
@@ -197,8 +198,8 @@ fn receive_damage_on_impact(
                 if entity == *mob_entity {
                     for (player_entity_q, _) in player_query.iter() {
                         if player_entity_q == *player_entity && *player_damage > 0 {
-                            damage_dealt_event_writer.send(DamageDealtEvent {
-                                damage: *player_damage,
+                            damage_dealt_event_writer.send(TakeDamageEvent {
+                                damage: Damage::from_amount(*player_damage),
                                 target: *mob_entity,
                             });
                         }
@@ -210,8 +211,8 @@ fn receive_damage_on_impact(
                 mob_damage_2,
             } => {
                 if entity == *mob_entity_1 && *mob_damage_2 > 0 {
-                    damage_dealt_event_writer.send(DamageDealtEvent {
-                        damage: *mob_damage_2,
+                    damage_dealt_event_writer.send(TakeDamageEvent {
+                        damage: Damage::from_amount(*mob_damage_2),
                         target: *mob_entity_1,
                     });
                 }
@@ -223,8 +224,8 @@ fn receive_damage_on_impact(
                 mob_segment_damage,
             } => {
                 if entity == *mob_entity && *mob_segment_damage > 0 {
-                    damage_dealt_event_writer.send(DamageDealtEvent {
-                        damage: *mob_segment_damage,
+                    damage_dealt_event_writer.send(TakeDamageEvent {
+                        damage: Damage::from_amount(*mob_segment_damage),
                         target: *mob_entity,
                     });
                 }
@@ -240,7 +241,7 @@ fn deal_damage_to_player_on_impact(
     entity: Entity,
     collision_events: &[&SortedCollisionEvent],
     player_query: &Query<(Entity, &PlayerIncomingDamageComponent)>,
-    damage_dealt_event_writer: &mut EventWriter<DamageDealtEvent>,
+    damage_dealt_event_writer: &mut EventWriter<TakeDamageEvent>,
 ) {
     for collision_event in collision_events.iter() {
         if let SortedCollisionEvent::PlayerToMobContact {
@@ -256,8 +257,8 @@ fn deal_damage_to_player_on_impact(
                     let damage =
                         (player_incoming_damage.multiplier * *mob_damage as f32).round() as usize;
                     if player_entity_q == *player_entity && damage > 0 {
-                        damage_dealt_event_writer.send(DamageDealtEvent {
-                            damage,
+                        damage_dealt_event_writer.send(TakeDamageEvent {
+                            damage: Damage::from_amount(damage),
                             target: player_entity_q,
                         });
                     }
diff --git a/src/spawnable/mob/mob_segment/behavior.rs b/src/spawnable/mob/mob_segment/behavior.rs
index dd8bbe1..7bd6ff6 100644
--- a/src/spawnable/mob/mob_segment/behavior.rs
+++ b/src/spawnable/mob/mob_segment/behavior.rs
@@ -1,6 +1,7 @@
 use super::{MobSegmentComponent, MobSegmentsResource};
 use crate::components::audio::{PlaySoundEffectEvent, SoundEffectType};
-use crate::components::health::{DamageDealtEvent, HealthComponent};
+use crate::components::events::TakeDamageEvent;
+use crate::components::health::{Damage, HealthComponent};
 use crate::components::player::PlayerIncomingDamageComponent;
 use crate::components::spawnable::{
     EffectType, MobDestroyedEvent, MobSegmentDestroyedEvent, SpawnItemEvent, SpawnPosition,
@@ -83,7 +84,7 @@ pub fn mob_segment_execute_behavior_system(
     mut spawn_mob_event_writer: EventWriter<SpawnMobEvent>,
     mut mob_segment_destroyed_event_writer: EventWriter<MobSegmentDestroyedEvent>,
     game_parameters: Res<GameParametersResource>,
-    mut damage_dealt_event_writer: EventWriter<DamageDealtEvent>,
+    mut damage_dealt_event_writer: EventWriter<TakeDamageEvent>,
 ) {
     let mut collision_events_vec = vec![];
     for collision_event in collision_events.read() {
@@ -297,7 +298,7 @@ fn deal_damage_to_player_on_impact(
     entity: Entity,
     collision_events: &[&SortedCollisionEvent],
     player_query: &Query<(Entity, &PlayerIncomingDamageComponent)>,
-    damage_dealt_event_writer: &mut EventWriter<DamageDealtEvent>,
+    damage_dealt_event_writer: &mut EventWriter<TakeDamageEvent>,
 ) {
     for collision_event in collision_events.iter() {
         if let SortedCollisionEvent::PlayerToMobSegmentContact {
@@ -313,8 +314,8 @@ fn deal_damage_to_player_on_impact(
                     let damage = (*mob_segment_damage as f32 * player_incoming_damage.multiplier)
                         .round() as usize;
                     if player_entity_q == *player_entity && damage > 0 {
-                        damage_dealt_event_writer.send(DamageDealtEvent {
-                            damage,
+                        damage_dealt_event_writer.send(TakeDamageEvent {
+                            damage: Damage::from_amount(damage),
                             target: player_entity_q,
                         });
                     }
@@ -329,7 +330,7 @@ fn receive_damage_on_impact(
     entity: Entity,
     collision_events: &[&SortedCollisionEvent],
     player_query: &Query<(Entity, &PlayerIncomingDamageComponent)>,
-    damage_dealt_event_writer: &mut EventWriter<DamageDealtEvent>,
+    damage_dealt_event_writer: &mut EventWriter<TakeDamageEvent>,
 ) {
     for collision_event in collision_events.iter() {
         match collision_event {
@@ -342,8 +343,8 @@ fn receive_damage_on_impact(
                 if entity == *mob_segment_entity {
                     for (player_entity_q, _) in player_query.iter() {
                         if player_entity_q == *player_entity && *player_damage > 0 {
-                            damage_dealt_event_writer.send(DamageDealtEvent {
-                                damage: *player_damage,
+                            damage_dealt_event_writer.send(TakeDamageEvent {
+                                damage: Damage::from_amount(*player_damage),
                                 target: *mob_segment_entity,
                             });
                         }
@@ -357,8 +358,8 @@ fn receive_damage_on_impact(
                 mob_damage,
             } => {
                 if entity == *mob_segment_entity && *mob_damage > 0 {
-                    damage_dealt_event_writer.send(DamageDealtEvent {
-                        damage: *mob_damage,
+                    damage_dealt_event_writer.send(TakeDamageEvent {
+                        damage: Damage::from_amount(*mob_damage),
                         target: *mob_segment_entity,
                     });
                 }
@@ -368,8 +369,8 @@ fn receive_damage_on_impact(
                 mob_segment_damage_2,
             } => {
                 if entity == *mob_segment_entity_1 && *mob_segment_damage_2 > 0 {
-                    damage_dealt_event_writer.send(DamageDealtEvent {
-                        damage: *mob_segment_damage_2,
+                    damage_dealt_event_writer.send(TakeDamageEvent {
+                        damage: Damage::from_amount(*mob_segment_damage_2),
                         target: *mob_segment_entity_1,
                     });
                 }
diff --git a/src/spawnable/mob/mob_segment/mod.rs b/src/spawnable/mob/mob_segment/mod.rs
index aff230d..d234652 100644
--- a/src/spawnable/mob/mob_segment/mod.rs
+++ b/src/spawnable/mob/mob_segment/mod.rs
@@ -26,12 +26,12 @@ use super::{
     ColliderData, CompoundColliderData, JointType, MobSegmentAnchorPointData, MobSpawner,
     MobSpawnerData,
 };
-use crate::assets::game_assets::AppStates;
 use crate::assets::mob::MobAssets;
 use crate::components::audio::CollisionSoundType;
 use crate::components::health::HealthComponent;
 use crate::components::objectives::DefenseInteraction;
 use crate::components::spawnable::{MobSegmentType, SpawnableType};
+use crate::components::states::AppStates;
 use crate::components::weapon::{WeaponData, WeaponsComponent};
 use crate::options::resources::GameParametersResource;
 pub(in crate::spawnable) use behavior::{
diff --git a/src/spawnable/mob/mod.rs b/src/spawnable/mob/mod.rs
index 47fd552..56e9b55 100644
--- a/src/spawnable/mob/mod.rs
+++ b/src/spawnable/mob/mod.rs
@@ -40,7 +40,6 @@ pub(in crate::spawnable) use self::{
 };
 
 use super::{behavior_sequence::MobBehaviorSequenceType, InitialMotion};
-use crate::assets::game_assets::AppStates;
 use crate::collision::{
     HORIZONTAL_BARRIER_COLLIDER_GROUP, MOB_COLLIDER_GROUP, SPAWNABLE_COLLIDER_GROUP,
 };
@@ -50,6 +49,7 @@ use crate::components::objectives::DefenseInteraction;
 use crate::components::spawnable::{
     MobDestroyedEvent, MobSegmentType, MobType, SpawnMobEvent, SpawnPosition,
 };
+use crate::components::states::AppStates;
 use crate::components::weapon::{WeaponData, WeaponsComponent};
 use crate::options::resources::GameParametersResource;
 use crate::options::GameOptions;
diff --git a/src/spawnable/mod.rs b/src/spawnable/mod.rs
index 2d00e8a..ef648de 100644
--- a/src/spawnable/mod.rs
+++ b/src/spawnable/mod.rs
@@ -1,12 +1,12 @@
 //! Exposes a plugin with systems determining how spawnables (e.x. consumables, items, mobs,
 //! players, etc.) behave.
-use crate::assets::game_assets::AppStates;
 use crate::assets::game_assets::GameUpdateSet;
 use crate::components::spawnable::{
     ConsumableType, MobDestroyedEvent, MobSegmentDestroyedEvent, MobType, ProjectileType,
     SpawnMobEvent, SpawnableType,
 };
-use crate::gameplay::GameStates;
+use crate::components::states::AppStates;
+use crate::components::states::GameStates;
 use crate::spawnable::effect::EffectPlugin;
 use bevy::app::{App, Plugin, Update};
 use bevy::hierarchy::DespawnRecursiveExt;
diff --git a/src/spawnable/projectile/behavior.rs b/src/spawnable/projectile/behavior.rs
index b621500..b9a779c 100644
--- a/src/spawnable/projectile/behavior.rs
+++ b/src/spawnable/projectile/behavior.rs
@@ -1,6 +1,7 @@
 use super::ProjectileComponent;
 use crate::components::audio::{PlaySoundEffectEvent, SoundEffectType};
-use crate::components::health::DamageDealtEvent;
+use crate::components::events::TakeDamageEvent;
+use crate::components::health::Damage;
 use crate::components::player::PlayerComponent;
 use crate::components::spawnable::{EffectType, Faction, ProjectileType};
 use crate::{
@@ -38,7 +39,7 @@ pub fn projectile_execute_behavior_system(
     mut spawn_effect_event_writer: EventWriter<SpawnEffectEvent>,
     time: Res<Time>,
     mut sound_effect_event_writer: EventWriter<PlaySoundEffectEvent>,
-    mut damage_dealt_event_writer: EventWriter<DamageDealtEvent>,
+    mut damage_dealt_event_writer: EventWriter<TakeDamageEvent>,
 ) {
     // Put all collision events in a vec so they can be read more than once
     let collision_events_vec: Vec<_> = collision_events.read().collect();
@@ -156,7 +157,7 @@ fn deal_damage_on_contact(
     mob_query: &Query<(Entity, &MobComponent)>,
     mob_segment_query: &Query<(Entity, &MobSegmentComponent)>,
     sound_effect_event_writer: &mut EventWriter<PlaySoundEffectEvent>,
-    damage_dealt_event_writer: &mut EventWriter<DamageDealtEvent>,
+    damage_dealt_event_writer: &mut EventWriter<TakeDamageEvent>,
 ) {
     for collision_event in collision_events.iter() {
         match collision_event {
@@ -174,8 +175,8 @@ fn deal_damage_on_contact(
                         sound_effect_type: SoundEffectType::PlayerHit,
                     });
                     if player_query.contains(*player_entity) && *projectile_damage > 0 {
-                        damage_dealt_event_writer.send(DamageDealtEvent {
-                            damage: *projectile_damage,
+                        damage_dealt_event_writer.send(TakeDamageEvent {
+                            damage: Damage::from_amount(*projectile_damage),
                             target: *player_entity,
                         });
                     }
@@ -201,8 +202,8 @@ fn deal_damage_on_contact(
                         sound_effect_type: SoundEffectType::BulletDing,
                     });
                     if mob_query.contains(*mob_entity) && *projectile_damage > 0 {
-                        damage_dealt_event_writer.send(DamageDealtEvent {
-                            damage: *projectile_damage,
+                        damage_dealt_event_writer.send(TakeDamageEvent {
+                            damage: Damage::from_amount(*projectile_damage),
                             target: *mob_entity,
                         });
                     }
@@ -227,8 +228,8 @@ fn deal_damage_on_contact(
                         sound_effect_type: SoundEffectType::BulletDing,
                     });
                     if mob_segment_query.contains(*mob_segment_entity) && *projectile_damage > 0 {
-                        damage_dealt_event_writer.send(DamageDealtEvent {
-                            damage: *projectile_damage,
+                        damage_dealt_event_writer.send(TakeDamageEvent {
+                            damage: Damage::from_amount(*projectile_damage),
                             target: *mob_segment_entity,
                         });
                     }
@@ -247,7 +248,7 @@ fn deal_damage_on_intersection(
     mob_query: &Query<(Entity, &MobComponent)>,
     mob_segment_query: &Query<(Entity, &MobSegmentComponent)>,
     sound_effect_event_writer: &mut EventWriter<PlaySoundEffectEvent>,
-    damage_dealt_event_writer: &mut EventWriter<DamageDealtEvent>,
+    damage_dealt_event_writer: &mut EventWriter<TakeDamageEvent>,
 ) {
     for collision_event in collision_events.iter() {
         match collision_event {
@@ -263,8 +264,8 @@ fn deal_damage_on_intersection(
                     && *projectile_damage > 0
                 {
                     // deal damage to player
-                    damage_dealt_event_writer.send(DamageDealtEvent {
-                        damage: *projectile_damage,
+                    damage_dealt_event_writer.send(TakeDamageEvent {
+                        damage: Damage::from_amount(*projectile_damage),
                         target: *player_entity,
                     });
                     sound_effect_event_writer.send(PlaySoundEffectEvent {
@@ -287,8 +288,8 @@ fn deal_damage_on_intersection(
                     && *projectile_damage > 0
                 {
                     // deal damage to mob
-                    damage_dealt_event_writer.send(DamageDealtEvent {
-                        damage: *projectile_damage,
+                    damage_dealt_event_writer.send(TakeDamageEvent {
+                        damage: Damage::from_amount(*projectile_damage),
                         target: *mob_entity,
                     });
                 }
@@ -306,8 +307,8 @@ fn deal_damage_on_intersection(
                     && *projectile_damage > 0
                 {
                     // deal damage to mob
-                    damage_dealt_event_writer.send(DamageDealtEvent {
-                        damage: *projectile_damage,
+                    damage_dealt_event_writer.send(TakeDamageEvent {
+                        damage: Damage::from_amount(*projectile_damage),
                         target: *mob_segment_entity,
                     });
                 }
diff --git a/src/spawnable/projectile/mod.rs b/src/spawnable/projectile/mod.rs
index a037ec9..6c16afa 100644
--- a/src/spawnable/projectile/mod.rs
+++ b/src/spawnable/projectile/mod.rs
@@ -1,4 +1,3 @@
-use crate::assets::game_assets::AppStates;
 use crate::assets::projectile::ProjectileAssets;
 use crate::collision::{
     ALLY_PROJECTILE_COLLIDER_GROUP, ENEMY_PROJECTILE_COLLIDER_GROUP,
@@ -6,9 +5,11 @@ use crate::collision::{
 };
 use crate::components::audio::PlaySoundEffectEvent;
 use crate::components::spawnable::{Faction, ProjectileType, SpawnPosition, SpawnableType};
+use crate::components::states::AppStates;
 use crate::components::weapon::WeaponProjectileData;
 use crate::options::resources::GameParametersResource;
 use crate::options::GameOptions;
+use crate::util::RenderLayer;
 use crate::weapon::WeaponProjectileInitialVelocitiesExt;
 use crate::{
     animation::{AnimationComponent, AnimationData},
@@ -158,7 +159,7 @@ pub fn spawn_projectile_from_weapon(
             SpawnPosition::Global(pos) => pos,
             SpawnPosition::Local(pos) => {
                 // Apply the rotation to the local position
-                let rotated_pos = source_transform.rotation * pos.extend(0.0);
+                let rotated_pos = source_transform.rotation * pos.extend(0.);
                 // Convert back to Vec2 and add to the source translation
                 source_transform.translation.xy() + rotated_pos.xy()
             }
diff --git a/src/stats/metrics.rs b/src/stats/metrics.rs
index 4afa65c..0e28866 100644
--- a/src/stats/metrics.rs
+++ b/src/stats/metrics.rs
@@ -1,7 +1,7 @@
-use crate::assets::game_assets::AppStates;
 use crate::collision::SortedCollisionEvent;
 use crate::components::player::PlayerIDComponent;
 use crate::components::spawnable::{MobDestroyedEvent, MobType};
+use crate::components::states::AppStates;
 use crate::spawnable::FireWeaponEvent;
 use crate::stats::historical_metrics::{
     MobKillsByPlayerForCompletedGames, MobKillsByPlayerForCurrentGame, UserStat,
@@ -181,7 +181,6 @@ fn roll_current_game_counters_into_completed_game_metrics(
 mod test {
     use std::f32::consts::{FRAC_PI_2, PI};
 
-    use crate::assets::game_assets::AppStates;
     use crate::collision::SortedCollisionEvent;
     use crate::components::audio::SoundEffectType;
     use crate::components::character::{Character, CharacterType};
@@ -189,8 +188,9 @@ mod test {
     use crate::components::spawnable::{
         EnemyMobType, Faction, MobDestroyedEvent, MobType, ProjectileType, SpawnPosition,
     };
+    use crate::components::states::AppStates;
+    use crate::components::states::GameStates;
     use crate::components::weapon::{ArcPatternData, SpreadPattern, WeaponProjectileData};
-    use crate::gameplay::GameStates;
     use crate::player::{CharactersResource, PlayerPlugin};
     use crate::spawnable::FireWeaponEvent;
     use crate::stats::historical_metrics::{
diff --git a/src/stats/scanner.rs b/src/stats/scanner.rs
index eb938e5..35287b5 100644
--- a/src/stats/scanner.rs
+++ b/src/stats/scanner.rs
@@ -1,6 +1,6 @@
 //! Exposes a plugin that logs whenever the user's mouse hovers over a mob.
-use crate::assets::game_assets::AppStates;
 use crate::components::health::HealthComponent;
+use crate::components::states::AppStates;
 use crate::options::resources::GameParametersResource;
 use crate::spawnable::MobComponent;
 use bevy::app::App;
diff --git a/src/ui/button.rs b/src/ui/button.rs
index d3e8890..d1f0231 100644
--- a/src/ui/button.rs
+++ b/src/ui/button.rs
@@ -1,6 +1,6 @@
-use crate::assets::game_assets::AppStates;
 use crate::assets::ui::UiAssets;
 use crate::components::player::PlayerInput;
+use crate::components::states::AppStates;
 use bevy::{
     app::AppExit,
     asset::Handle,
diff --git a/src/ui/character_selection.rs b/src/ui/character_selection.rs
index 40841b8..ae75511 100644
--- a/src/ui/character_selection.rs
+++ b/src/ui/character_selection.rs
@@ -3,7 +3,6 @@
 use super::button::{
     ButtonActionComponent, ButtonActionEvent, ButtonActionType, UiButtonChildBuilderExt,
 };
-use crate::assets::game_assets::AppStates;
 use crate::assets::player_assets::PlayerAssets;
 use crate::assets::ui::UiAssets;
 use crate::components::abilities::AbilityDescriptionsResource;
@@ -11,6 +10,7 @@ use crate::components::character::{Character, CharacterStatType, CharacterType};
 use crate::components::events::PlayerJoinEvent;
 use crate::components::input::{InputsResource, MainMenuExplorer, MenuAction, MenuExplorer};
 use crate::components::player::{PlayerData, PlayerInput, PlayersResource};
+use crate::components::states::AppStates;
 use crate::options::resources::GameParametersResource;
 use crate::player::CharactersResource;
 use bevy::prelude::StateScoped;
diff --git a/src/ui/game/border_gradient.rs b/src/ui/game/border_gradient.rs
index b8ec465..cf1e3fb 100644
--- a/src/ui/game/border_gradient.rs
+++ b/src/ui/game/border_gradient.rs
@@ -1,10 +1,10 @@
 use std::{f32::consts::PI, time::Duration};
 
 use super::parent::BorderGradientCommandsExt;
-use crate::assets::game_assets::AppStates;
 use crate::assets::ui::UiAssets;
 use crate::components::events::MobReachedBottomGateEvent;
 use crate::components::objectives::DefenseInteraction;
+use crate::components::states::AppStates;
 use bevy::prelude::StateScoped;
 use bevy::{
     color::Color,
diff --git a/src/ui/game/mod.rs b/src/ui/game/mod.rs
index d2b8830..39aba23 100644
--- a/src/ui/game/mod.rs
+++ b/src/ui/game/mod.rs
@@ -1,6 +1,6 @@
-use crate::assets::game_assets::AppStates;
 use crate::assets::game_assets::GameEnterSet;
-use crate::gameplay::GameStates;
+use crate::components::states::AppStates;
+use crate::components::states::GameStates;
 use bevy::{
     app::{Plugin, Update},
     ecs::schedule::IntoSystemConfigs,
diff --git a/src/ui/game/parent.rs b/src/ui/game/parent.rs
index 259c26a..2f11aed 100644
--- a/src/ui/game/parent.rs
+++ b/src/ui/game/parent.rs
@@ -1,9 +1,9 @@
 use super::border_gradient::BorderGradientType;
-use crate::assets::game_assets::AppStates;
 use crate::assets::ui::UiAssets;
 use crate::components::abilities::AbilitySlotIDComponent;
 use crate::components::character::Character;
 use crate::components::player::{PlayerIDComponent, PlayersResource};
+use crate::components::states::AppStates;
 use crate::player::CharactersResource;
 use bevy::prelude::StateScoped;
 use bevy::{
diff --git a/src/ui/game_over.rs b/src/ui/game_over.rs
index 943c975..a10a3c9 100644
--- a/src/ui/game_over.rs
+++ b/src/ui/game_over.rs
@@ -1,7 +1,7 @@
 //! System to draw the game over screen.
-use crate::assets::game_assets::AppStates;
 use crate::assets::ui::UiAssets;
 use crate::components::audio::ChangeBackgroundMusicEvent;
+use crate::components::states::AppStates;
 use crate::stats::historical_metrics::{
     MobKillsByPlayerForCurrentGame, UserStatsByPlayerForCurrentGameCache, DEFAULT_USER_ID,
 };
diff --git a/src/ui/main_menu/mod.rs b/src/ui/main_menu/mod.rs
index 39a1a09..57f1011 100644
--- a/src/ui/main_menu/mod.rs
+++ b/src/ui/main_menu/mod.rs
@@ -1,9 +1,9 @@
 //! Exposes a plugin to handle the layout and behavior of a button-based main menu that mainly
 //! guides the user into the `AppStates::CharacterSelection` state.
 use crate::animation::{AnimationComponent, AnimationDirection};
-use crate::assets::game_assets::AppStates;
 use crate::assets::ui::UiAssets;
 use crate::components::audio::{BGMusicType, ChangeBackgroundMusicEvent};
+use crate::components::states::AppStates;
 use bevy::prelude::StateScoped;
 use bevy::{
     color::Srgba,
@@ -19,6 +19,7 @@ use bevy::{
     utils::default,
 };
 use std::time::Duration;
+use tracing::info;
 
 mod button;
 use self::button::main_menu_button_selection_and_click_system;
@@ -55,7 +56,7 @@ fn setup_main_menu_system(
         fade_in: Some(Duration::from_secs(2)),
         fade_out: Some(Duration::from_secs(2)),
     });
-
+    // info!("setup main menu");
     commands
         .spawn(NodeBundle {
             style: Style {
@@ -93,22 +94,19 @@ fn setup_main_menu_system(
                             ..default()
                         })
                         .with_children(|parent| {
-                            parent
-                                .spawn((
-                                    ImageBundle {
-                                        image: ui_assets.bevy_logo_light.clone().into(),
-                                        style: Style {
-                                            max_width: Val::Px(520.0),
-                                            width: Val::Percent(100.0),
-                                            min_width: Val::Px(130.0),
-                                            aspect_ratio: Some(520.0 / 130.0),
-                                            justify_content: JustifyContent::Center,
-                                            align_items: AlignItems::Center,
-                                            ..default()
-                                        },
-                                        ..default()
-                                    },
-                                ));
+                            parent.spawn((ImageBundle {
+                                image: ui_assets.bevy_logo_light.clone().into(),
+                                style: Style {
+                                    max_width: Val::Px(520.0),
+                                    width: Val::Percent(100.0),
+                                    min_width: Val::Px(130.0),
+                                    aspect_ratio: Some(520.0 / 130.0),
+                                    justify_content: JustifyContent::Center,
+                                    align_items: AlignItems::Center,
+                                    ..default()
+                                },
+                                ..default()
+                            },));
                         });
                     parent
                         .spawn(NodeBundle {
diff --git a/src/ui/mod.rs b/src/ui/mod.rs
index c7bd4e5..a053774 100644
--- a/src/ui/mod.rs
+++ b/src/ui/mod.rs
@@ -1,7 +1,7 @@
 //! Exposes a plugin that handles layout, rendering, and styling for each of the major game states.
-use crate::gameplay::GameStates;
+use crate::components::states::GameStates;
 
-use crate::assets::game_assets::AppStates;
+use crate::components::states::AppStates;
 use crate::stats::historical_metrics::{MobsKilledByPlayerCacheT, DEFAULT_USER_ID};
 use bevy::{
     app::{App, Plugin, Update},
diff --git a/src/ui/pause_menu.rs b/src/ui/pause_menu.rs
index 9f04548..24b1972 100644
--- a/src/ui/pause_menu.rs
+++ b/src/ui/pause_menu.rs
@@ -1,4 +1,4 @@
-use crate::gameplay::GameStates;
+use crate::components::states::GameStates;
 use crate::ui::BouncingPromptComponent;
 use bevy::prelude::StateScoped;
 use bevy::{
diff --git a/src/ui/splash.rs b/src/ui/splash.rs
index 92ad72a..6842189 100644
--- a/src/ui/splash.rs
+++ b/src/ui/splash.rs
@@ -6,7 +6,7 @@ use bevy::{
     render::texture::{ImageLoaderSettings, ImageSampler},
 };
 
-use crate::assets::game_assets::AppStates;
+use crate::components::states::AppStates;
 use crate::{theme::prelude::*, AppSet};
 
 pub(crate) fn plugin(app: &mut App) {
diff --git a/src/ui/victory.rs b/src/ui/victory.rs
index bfe2bad..f6c2fea 100644
--- a/src/ui/victory.rs
+++ b/src/ui/victory.rs
@@ -1,6 +1,6 @@
-use crate::assets::game_assets::AppStates;
 use crate::assets::ui::UiAssets;
 use crate::components::audio::ChangeBackgroundMusicEvent;
+use crate::components::states::AppStates;
 use crate::stats::historical_metrics::{
     MobKillsByPlayerForCurrentGame, UserStatsByPlayerForCurrentGameCache, DEFAULT_USER_ID,
 };
diff --git a/src/weapon/mod.rs b/src/weapon/mod.rs
index a284b7e..f25ef54 100644
--- a/src/weapon/mod.rs
+++ b/src/weapon/mod.rs
@@ -15,11 +15,11 @@ use bevy::{
 use bevy_rapier2d::dynamics::Velocity;
 use std::time::Duration;
 
-use crate::assets::game_assets::AppStates;
+use crate::components::states::AppStates;
+use crate::components::states::GameStates;
 use crate::components::weapon::{
     FireMode, SpreadPattern, Weapon, WeaponProjectileData, WeaponsComponent,
 };
-use crate::gameplay::GameStates;
 use crate::spawnable::{FireWeaponEvent, InitialMotion};
 use rand::{thread_rng, Rng};