diff --git a/player_controller/Assets/Textures/GridTexture/Dark/texture_01.png.import b/player_controller/Assets/Textures/GridTexture/Dark/texture_01.png.import
index 824bacb..97b37c2 100644
--- a/player_controller/Assets/Textures/GridTexture/Dark/texture_01.png.import
+++ b/player_controller/Assets/Textures/GridTexture/Dark/texture_01.png.import
@@ -3,17 +3,16 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://boasm0g587eov"
-path.s3tc="res://.godot/imported/texture_01.png-9deee4bf2e81814eb5c9325f2657f8c8.s3tc.ctex"
 path.etc2="res://.godot/imported/texture_01.png-9deee4bf2e81814eb5c9325f2657f8c8.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://player_controller/Assets/Textures/GridTexture/Dark/texture_01.png"
-dest_files=["res://.godot/imported/texture_01.png-9deee4bf2e81814eb5c9325f2657f8c8.s3tc.ctex", "res://.godot/imported/texture_01.png-9deee4bf2e81814eb5c9325f2657f8c8.etc2.ctex"]
+dest_files=["res://.godot/imported/texture_01.png-9deee4bf2e81814eb5c9325f2657f8c8.etc2.ctex"]
 
 [params]
 
diff --git a/player_controller/Assets/Textures/GridTexture/Green/texture_01.png.import b/player_controller/Assets/Textures/GridTexture/Green/texture_01.png.import
index c0756a2..bb1f6a3 100644
--- a/player_controller/Assets/Textures/GridTexture/Green/texture_01.png.import
+++ b/player_controller/Assets/Textures/GridTexture/Green/texture_01.png.import
@@ -3,17 +3,16 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://3e1klega6uye"
-path.s3tc="res://.godot/imported/texture_01.png-ae5afc2ae737d1e792f0b8a0a5af4d3f.s3tc.ctex"
 path.etc2="res://.godot/imported/texture_01.png-ae5afc2ae737d1e792f0b8a0a5af4d3f.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://player_controller/Assets/Textures/GridTexture/Green/texture_01.png"
-dest_files=["res://.godot/imported/texture_01.png-ae5afc2ae737d1e792f0b8a0a5af4d3f.s3tc.ctex", "res://.godot/imported/texture_01.png-ae5afc2ae737d1e792f0b8a0a5af4d3f.etc2.ctex"]
+dest_files=["res://.godot/imported/texture_01.png-ae5afc2ae737d1e792f0b8a0a5af4d3f.etc2.ctex"]
 
 [params]
 
diff --git a/player_controller/Assets/Textures/GridTexture/Light/texture_01.png.import b/player_controller/Assets/Textures/GridTexture/Light/texture_01.png.import
index 681440f..cad96a2 100644
--- a/player_controller/Assets/Textures/GridTexture/Light/texture_01.png.import
+++ b/player_controller/Assets/Textures/GridTexture/Light/texture_01.png.import
@@ -3,17 +3,16 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://0t6ie0fkv2op"
-path.s3tc="res://.godot/imported/texture_01.png-1dcf4b27bd12b1fd18e6c870b30bb902.s3tc.ctex"
 path.etc2="res://.godot/imported/texture_01.png-1dcf4b27bd12b1fd18e6c870b30bb902.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://player_controller/Assets/Textures/GridTexture/Light/texture_01.png"
-dest_files=["res://.godot/imported/texture_01.png-1dcf4b27bd12b1fd18e6c870b30bb902.s3tc.ctex", "res://.godot/imported/texture_01.png-1dcf4b27bd12b1fd18e6c870b30bb902.etc2.ctex"]
+dest_files=["res://.godot/imported/texture_01.png-1dcf4b27bd12b1fd18e6c870b30bb902.etc2.ctex"]
 
 [params]
 
diff --git a/player_controller/Assets/Textures/GridTexture/Orange/texture_01.png.import b/player_controller/Assets/Textures/GridTexture/Orange/texture_01.png.import
index 832a0d2..5ac5649 100644
--- a/player_controller/Assets/Textures/GridTexture/Orange/texture_01.png.import
+++ b/player_controller/Assets/Textures/GridTexture/Orange/texture_01.png.import
@@ -3,17 +3,16 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://t10lfkxrg7ay"
-path.s3tc="res://.godot/imported/texture_01.png-2d26b48d2dec4e4e9eea4b1c047417c0.s3tc.ctex"
 path.etc2="res://.godot/imported/texture_01.png-2d26b48d2dec4e4e9eea4b1c047417c0.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://player_controller/Assets/Textures/GridTexture/Orange/texture_01.png"
-dest_files=["res://.godot/imported/texture_01.png-2d26b48d2dec4e4e9eea4b1c047417c0.s3tc.ctex", "res://.godot/imported/texture_01.png-2d26b48d2dec4e4e9eea4b1c047417c0.etc2.ctex"]
+dest_files=["res://.godot/imported/texture_01.png-2d26b48d2dec4e4e9eea4b1c047417c0.etc2.ctex"]
 
 [params]
 
diff --git a/player_controller/Assets/Textures/GridTexture/Red/texture_01.png.import b/player_controller/Assets/Textures/GridTexture/Red/texture_01.png.import
index 3d26250..bf717ef 100644
--- a/player_controller/Assets/Textures/GridTexture/Red/texture_01.png.import
+++ b/player_controller/Assets/Textures/GridTexture/Red/texture_01.png.import
@@ -3,17 +3,16 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dgix86l87u86s"
-path.s3tc="res://.godot/imported/texture_01.png-a7949be0e945f82b88e838fe48a6f350.s3tc.ctex"
 path.etc2="res://.godot/imported/texture_01.png-a7949be0e945f82b88e838fe48a6f350.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://player_controller/Assets/Textures/GridTexture/Red/texture_01.png"
-dest_files=["res://.godot/imported/texture_01.png-a7949be0e945f82b88e838fe48a6f350.s3tc.ctex", "res://.godot/imported/texture_01.png-a7949be0e945f82b88e838fe48a6f350.etc2.ctex"]
+dest_files=["res://.godot/imported/texture_01.png-a7949be0e945f82b88e838fe48a6f350.etc2.ctex"]
 
 [params]
 
diff --git a/player_controller/Assets/Textures/PerlinNoise/Gabor 1 - 512x512.png.import b/player_controller/Assets/Textures/PerlinNoise/Gabor 1 - 512x512.png.import
index 9da5157..794c94c 100644
--- a/player_controller/Assets/Textures/PerlinNoise/Gabor 1 - 512x512.png.import	
+++ b/player_controller/Assets/Textures/PerlinNoise/Gabor 1 - 512x512.png.import	
@@ -3,17 +3,16 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://woq2hudxhckr"
-path.s3tc="res://.godot/imported/Gabor 1 - 512x512.png-35241d8f4670c338b8c89a271f5b5891.s3tc.ctex"
 path.etc2="res://.godot/imported/Gabor 1 - 512x512.png-35241d8f4670c338b8c89a271f5b5891.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://player_controller/Assets/Textures/PerlinNoise/Gabor 1 - 512x512.png"
-dest_files=["res://.godot/imported/Gabor 1 - 512x512.png-35241d8f4670c338b8c89a271f5b5891.s3tc.ctex", "res://.godot/imported/Gabor 1 - 512x512.png-35241d8f4670c338b8c89a271f5b5891.etc2.ctex"]
+dest_files=["res://.godot/imported/Gabor 1 - 512x512.png-35241d8f4670c338b8c89a271f5b5891.etc2.ctex"]
 
 [params]
 
diff --git a/player_controller/Examples/MovementTestbed/Hills/kenney-green-checkerboar-cc0.png.import b/player_controller/Examples/MovementTestbed/Hills/kenney-green-checkerboar-cc0.png.import
index e9c1f25..0baa577 100644
--- a/player_controller/Examples/MovementTestbed/Hills/kenney-green-checkerboar-cc0.png.import
+++ b/player_controller/Examples/MovementTestbed/Hills/kenney-green-checkerboar-cc0.png.import
@@ -3,17 +3,16 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://lp2pt8mtj7ty"
-path.s3tc="res://.godot/imported/kenney-green-checkerboar-cc0.png-2ce8609a39a655125c8e037014f6f2db.s3tc.ctex"
 path.etc2="res://.godot/imported/kenney-green-checkerboar-cc0.png-2ce8609a39a655125c8e037014f6f2db.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"imported_formats": ["etc2_astc"],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://player_controller/Examples/MovementTestbed/Hills/kenney-green-checkerboar-cc0.png"
-dest_files=["res://.godot/imported/kenney-green-checkerboar-cc0.png-2ce8609a39a655125c8e037014f6f2db.s3tc.ctex", "res://.godot/imported/kenney-green-checkerboar-cc0.png-2ce8609a39a655125c8e037014f6f2db.etc2.ctex"]
+dest_files=["res://.godot/imported/kenney-green-checkerboar-cc0.png-2ce8609a39a655125c8e037014f6f2db.etc2.ctex"]
 
 [params]
 
diff --git a/player_controller/PlayerController.tscn b/player_controller/PlayerController.tscn
index bd1f5d9..07ac3e4 100644
--- a/player_controller/PlayerController.tscn
+++ b/player_controller/PlayerController.tscn
@@ -141,20 +141,47 @@ script = ExtResource("27_34snm")
 [node name="ToAiming" type="Node" parent="StateChart/Root/WeaponInHand"]
 script = ExtResource("28_n7qhm")
 to = NodePath("../../Aiming")
-event = &"aim_started"
+event = &"aim_triggered"
 delay_in_seconds = "0.0"
 
 [node name="Aiming" type="Node" parent="StateChart/Root"]
 script = ExtResource("27_34snm")
 
+[node name="ToWeaponInHand" type="Node" parent="StateChart/Root/Aiming"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../WeaponInHand")
+event = &"aim_canceled"
+delay_in_seconds = "0.0"
+
+[node name="ToDashing" type="Node" parent="StateChart/Root/Aiming"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Dashing")
+event = &"aim_released"
+delay_in_seconds = "0.0"
+
+[node name="ToWeaponThrown" type="Node" parent="StateChart/Root/Aiming"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../WeaponThrown")
+event = &"hit_triggered"
+delay_in_seconds = "0.0"
+
 [node name="Dashing" type="Node" parent="StateChart/Root"]
 script = ExtResource("27_34snm")
 
+[node name="ToWeaponInHand" type="Node" parent="StateChart/Root/Dashing"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../WeaponInHand")
+event = &"dash_finished"
+delay_in_seconds = "0.0"
+
 [node name="WeaponThrown" type="Node" parent="StateChart/Root"]
 script = ExtResource("27_34snm")
 
-[node name="WeaponPlanted" type="Node" parent="StateChart/Root"]
-script = ExtResource("27_34snm")
+[node name="ToDashing" type="Node" parent="StateChart/Root/WeaponThrown"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Dashing")
+event = &"aim_started"
+delay_in_seconds = "0.0"
 
 [connection signal="input_aim_canceled" from="InputController" to="." method="OnInputAimCanceled"]
 [connection signal="input_aim_pressed" from="InputController" to="." method="OnInputAimPressed"]