diff --git a/godot/testmap.tscn b/godot/testmap.tscn
index d5fd5cf..94bb387 100644
--- a/godot/testmap.tscn
+++ b/godot/testmap.tscn
@@ -1,8 +1,9 @@
-[gd_scene load_steps=10 format=3 uid="uid://e3dmisrrgqq7"]
+[gd_scene load_steps=8 format=3 uid="uid://e3dmisrrgqq7"]
 
 [ext_resource type="RallyRushGameMode" uid="uid://r8bx64rqumkl" path="res://rally_rush_game_mode.tres" id="1_p2wxn"]
 [ext_resource type="Material" uid="uid://cfont63vhwa3y" path="res://grid_material.tres" id="2_dkg88"]
 [ext_resource type="PackedScene" uid="uid://ceolgn0y2m6e4" path="res://key_pickup.tscn" id="3_j5pjd"]
+[ext_resource type="PackedScene" uid="uid://brpccv2gy7pjs" path="res://turret.tscn" id="4_u6a78"]
 
 [sub_resource type="PhysicsMaterial" id="PhysicsMaterial_whr25"]
 rough = true
@@ -13,15 +14,6 @@ size = Vector3(100, 1, 100)
 [sub_resource type="PlaneMesh" id="PlaneMesh_g4f08"]
 size = Vector2(100, 100)
 
-[sub_resource type="PrismMesh" id="PrismMesh_xjis4"]
-size = Vector3(1, 3.135, 1)
-
-[sub_resource type="BoxShape3D" id="BoxShape3D_rxnqc"]
-size = Vector3(1, 3.18433, 1)
-
-[sub_resource type="SphereShape3D" id="SphereShape3D_rdc8b"]
-radius = 20.126
-
 [node name="TestMap2" type="Level3D"]
 game_mode_prototype = ExtResource("1_p2wxn")
 
@@ -181,21 +173,5 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 190.995, 0, 90.7647)
 [node name="KeyPickup3" parent="." instance=ExtResource("3_j5pjd")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 270.692, 1.52588e-05, -5.4676)
 
-[node name="Turret" type="Turret" parent="."]
-attack_classes = [&"CarPlayer"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 52.5271, -3.8147e-06, 28.3981)
-
-[node name="MeshInstance3D" type="MeshInstance3D" parent="Turret"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.44861, 0)
-mesh = SubResource("PrismMesh_xjis4")
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="Turret"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.45032, 0)
-shape = SubResource("BoxShape3D_rxnqc")
-
-[node name="AwarenessArea" type="Area3D" parent="Turret"]
-collision_layer = 0
-collision_mask = 2
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="Turret/AwarenessArea"]
-shape = SubResource("SphereShape3D_rdc8b")
+[node name="Turret" parent="." instance=ExtResource("4_u6a78")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 178.697, 5.47171, 28.3981)
diff --git a/godot/turret.tscn b/godot/turret.tscn
new file mode 100644
index 0000000..e36978a
--- /dev/null
+++ b/godot/turret.tscn
@@ -0,0 +1,45 @@
+[gd_scene load_steps=6 format=3 uid="uid://brpccv2gy7pjs"]
+
+[ext_resource type="PackedScene" uid="uid://d0ir0dpghkikq" path="res://beam.tscn" id="1_7e7bw"]
+
+[sub_resource type="PrismMesh" id="PrismMesh_xjis4"]
+size = Vector3(1, 3.135, 1)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_rxnqc"]
+size = Vector3(1, 3.18433, 1)
+
+[sub_resource type="SphereShape3D" id="SphereShape3D_rdc8b"]
+radius = 167.996
+
+[sub_resource type="BoxMesh" id="BoxMesh_axukv"]
+size = Vector3(0.5, 0.5, 1.735)
+
+[node name="Turret" type="Turret"]
+attack_classes = [&"CarPlayer"]
+beam_scene = ExtResource("1_7e7bw")
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 178.697, 6.0093, 28.3981)
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.44861, 0)
+mesh = SubResource("PrismMesh_xjis4")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.45032, 0)
+shape = SubResource("BoxShape3D_rxnqc")
+
+[node name="AwarenessArea" type="Area3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -15.7959, 0)
+collision_layer = 0
+collision_mask = 2
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="AwarenessArea"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 13.9111, 0)
+shape = SubResource("SphereShape3D_rdc8b")
+
+[node name="Gun" type="Node3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.79299, 0)
+
+[node name="MeshInstance3D2" type="MeshInstance3D" parent="Gun"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.277781)
+mesh = SubResource("BoxMesh_axukv")
+skeleton = NodePath("../..")