diff --git a/Images/Battery.xcf b/Images/Battery.xcf
new file mode 100644
index 0000000..9c60e57
Binary files /dev/null and b/Images/Battery.xcf differ
diff --git a/Images/BatteryBackground.png b/Images/BatteryBackground.png
new file mode 100644
index 0000000..2861d76
--- /dev/null
+++ b/Images/BatteryBackground.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:244418e6584251db4598c09dc4739105a0fc098b14653452f2518c2ab01a790e
+size 2247
diff --git a/Images/BatteryBackground.png.import b/Images/BatteryBackground.png.import
new file mode 100644
index 0000000..79f7bb6
--- /dev/null
+++ b/Images/BatteryBackground.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/BatteryBackground.png-6f72c72e50b260a430d77730fd43915f.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Images/BatteryBackground.png"
+dest_files=[ "res://.import/BatteryBackground.png-6f72c72e50b260a430d77730fd43915f.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Images/BatteryBolt.png b/Images/BatteryBolt.png
new file mode 100644
index 0000000..00336d6
--- /dev/null
+++ b/Images/BatteryBolt.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bbae7ab87551ac58e5eaaaf2f62ed29921aa7d2c3f55e1ed62b34da46f2cc203
+size 5063
diff --git a/Images/BatteryBolt.png.import b/Images/BatteryBolt.png.import
new file mode 100644
index 0000000..a68a2e4
--- /dev/null
+++ b/Images/BatteryBolt.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/BatteryBolt.png-6b33434acdc257f5923cf33fe88fccf4.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Images/BatteryBolt.png"
+dest_files=[ "res://.import/BatteryBolt.png-6b33434acdc257f5923cf33fe88fccf4.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Images/BatteryFilling.png b/Images/BatteryFilling.png
new file mode 100644
index 0000000..4d4cefa
--- /dev/null
+++ b/Images/BatteryFilling.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:161a5f0cbf2e2d7dfa05dbc7317f157d0b469abda020ff3e42dc8e643ffa64fd
+size 2176
diff --git a/Images/BatteryFilling.png.import b/Images/BatteryFilling.png.import
new file mode 100644
index 0000000..c2e27ba
--- /dev/null
+++ b/Images/BatteryFilling.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/BatteryFilling.png-eee2638059fa72688c7a005441519033.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Images/BatteryFilling.png"
+dest_files=[ "res://.import/BatteryFilling.png-eee2638059fa72688c7a005441519033.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Models/Material_002.material b/Models/Material_002.material
index 77c60c8..dcec47c 100644
--- a/Models/Material_002.material
+++ b/Models/Material_002.material
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0902485cce834327f3e179f3f9c85606ab228e90d68852de3d7ecbd5d826c35
-size 1801
+oid sha256:f468728890627c07ab6f93b29c3cfc670b179b54c39de5c33bd9f5e6530e1be6
+size 829
diff --git a/Models/gun_barrel.tres b/Models/gun_barrel.tres
new file mode 100644
index 0000000..9a646a5
--- /dev/null
+++ b/Models/gun_barrel.tres
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:18a4a2ae33b0179df40cb31d3a32009497f230e23230e297bb55d6849e36a6db
+size 544
diff --git a/Models/gun_body.tres b/Models/gun_body.tres
new file mode 100644
index 0000000..ce90953
--- /dev/null
+++ b/Models/gun_body.tres
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:764200979d156e228a2f6bda2dadc3949d81efc17d49af7ba5dc0b270beecb2b
+size 501
diff --git a/Models/spaceship-gun.glb b/Models/spaceship-gun.glb
new file mode 100644
index 0000000..c9083a5
--- /dev/null
+++ b/Models/spaceship-gun.glb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ba280cd786011ba3a64e7ba71579134c9815962812f39010c045d3a3970a1450
+size 6535624
diff --git a/Models/spaceship-gun.glb.import b/Models/spaceship-gun.glb.import
new file mode 100644
index 0000000..853d5c5
--- /dev/null
+++ b/Models/spaceship-gun.glb.import
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:deb93d223ebaff7d06e3b2d9304772e8a86a6e5d6563c9b62a9e783141756b4a
+size 31763
diff --git a/Models/spaceship-gun.tscn b/Models/spaceship-gun.tscn
new file mode 100644
index 0000000..b02f241
--- /dev/null
+++ b/Models/spaceship-gun.tscn
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b78734925f00faa7a76e7920af5b40df5163932f7c051b558e3754771948074c
+size 27772526
diff --git a/Scenes/Player.tscn b/Scenes/Player.tscn
index 0832506..0351817 100644
--- a/Scenes/Player.tscn
+++ b/Scenes/Player.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=12 format=2]
+[gd_scene load_steps=14 format=2]
 
 [ext_resource path="res://Scripts/Player.gd" type="Script" id=1]
 [ext_resource path="res://Models/Arrow.obj" type="ArrayMesh" id=2]
@@ -9,6 +9,7 @@
 [ext_resource path="res://Scenes/EngineParticles.tscn" type="PackedScene" id=7]
 [ext_resource path="res://Images/TurnEndBanner.png" type="Texture" id=8]
 [ext_resource path="res://Animations/TurnEndBanner.anim" type="Animation" id=9]
+[ext_resource path="res://Models/spaceship-gun.tscn" type="PackedScene" id=10]
 
 [sub_resource type="CapsuleShape" id=1]
 radius = 0.15
@@ -17,6 +18,14 @@ height = 0.6
 [sub_resource type="CanvasItemMaterial" id=2]
 light_mode = 1
 
+[sub_resource type="SpatialMaterial" id=3]
+albedo_color = Color( 1, 0, 0, 1 )
+emission_enabled = true
+emission = Color( 1, 0, 0, 1 )
+emission_energy = 10.0
+emission_operator = 0
+emission_on_uv2 = false
+
 [node name="Player" type="RigidBody"]
 gravity_scale = -128.0
 script = ExtResource( 1 )
@@ -426,6 +435,24 @@ __meta__ = {
 [node name="AnimationPlayer" type="AnimationPlayer" parent="TurnEndBanner"]
 autoplay = "ShowEndTurnBanner"
 anims/ShowEndTurnBanner = ExtResource( 9 )
+
+[node name="GunContainer" type="Spatial" parent="."]
+transform = Transform( -4.37114e-09, 4.37114e-09, 0.1, 0.1, -4.37114e-09, 4.37114e-09, 4.37114e-09, 0.1, -4.37114e-09, 0, -0.0222926, 0.382747 )
+
+[node name="spaceship-gun" parent="GunContainer" instance=ExtResource( 10 )]
+transform = Transform( 1, 0, 1.64203e-15, 0, 1, 0, 1.64203e-15, 0, 1, 4.47035e-08, 0.811224, -3.54597e-08 )
+
+[node name="RayCast" type="RayCast" parent="GunContainer"]
+transform = Transform( 1, 0, 1.64203e-15, 0, 1, 0, 1.64203e-15, 0, 1, 7.45058e-08, 1.76881, -7.73171e-08 )
+enabled = true
+cast_to = Vector3( 0, 1, 0 )
+
+[node name="CSGCylinder" type="CSGCylinder" parent="GunContainer/RayCast"]
+transform = Transform( 1, 0, 1.64203e-15, 0, 1, 0, 1.64203e-15, 0, 1, 7.45058e-08, 1.445, -6.3163e-08 )
+visible = false
+material_override = SubResource( 3 )
+radius = 0.09
+sides = 32
 [connection signal="value_changed" from="MainPanel/TimeBar" to="." method="_on_TimeBar_value_changed"]
 [connection signal="pressed" from="MainPanel/AddButton" to="." method="_on_AddButton_pressed"]
 [connection signal="pressed" from="MainPanel/PlayButton" to="." method="_on_PlayButton_pressed"]
diff --git a/Scenes/RootNode.tscn b/Scenes/RootNode.tscn
index 4cf3cfa..6cd135f 100644
--- a/Scenes/RootNode.tscn
+++ b/Scenes/RootNode.tscn
@@ -8,7 +8,9 @@
 script = ExtResource( 1 )
 
 [node name="Lobby" parent="." instance=ExtResource( 2 )]
+margin_left = 1.0
 margin_top = 1.0
+margin_right = 1.0
 margin_bottom = 1.0
 
 [node name="ConsoleOutput" type="TextEdit" parent="."]