diff --git a/Assets/UI/TextBox.png b/Assets/UI/TextBox.png
new file mode 100644
index 0000000..2e9859c
Binary files /dev/null and b/Assets/UI/TextBox.png differ
diff --git a/Assets/UI/TextBox.png.import b/Assets/UI/TextBox.png.import
new file mode 100644
index 0000000..6d23a88
--- /dev/null
+++ b/Assets/UI/TextBox.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/TextBox.png-2ad7bec0b4178924442104273f95e7b4.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/UI/TextBox.png"
+dest_files=[ "res://.import/TextBox.png-2ad7bec0b4178924442104273f95e7b4.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=false
+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/Code Combat.csproj b/Code Combat.csproj
new file mode 100644
index 0000000..ad87733
--- /dev/null
+++ b/Code Combat.csproj	
@@ -0,0 +1,6 @@
+<Project Sdk="Godot.NET.Sdk/3.2.4">
+  <PropertyGroup>
+    <TargetFramework>net472</TargetFramework>
+    <RootNamespace>CodeCombat</RootNamespace>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Code Combat.csproj.old b/Code Combat.csproj.old
new file mode 100644
index 0000000..8a6563a
--- /dev/null
+++ b/Code Combat.csproj.old	
@@ -0,0 +1,6 @@
+<Project Sdk="Godot.NET.Sdk/3.2.3">
+  <PropertyGroup>
+    <TargetFramework>net472</TargetFramework>
+    <RootNamespace>CodeCombat</RootNamespace>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Code Combat.sln b/Code Combat.sln
new file mode 100644
index 0000000..8587323
--- /dev/null
+++ b/Code Combat.sln	
@@ -0,0 +1,19 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Code Combat", "Code Combat.csproj", "{C43DDD98-445D-4980-B226-93C668245C1D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+	Debug|Any CPU = Debug|Any CPU
+	ExportDebug|Any CPU = ExportDebug|Any CPU
+	ExportRelease|Any CPU = ExportRelease|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C43DDD98-445D-4980-B226-93C668245C1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C43DDD98-445D-4980-B226-93C668245C1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C43DDD98-445D-4980-B226-93C668245C1D}.ExportDebug|Any CPU.ActiveCfg = ExportDebug|Any CPU
+		{C43DDD98-445D-4980-B226-93C668245C1D}.ExportDebug|Any CPU.Build.0 = ExportDebug|Any CPU
+		{C43DDD98-445D-4980-B226-93C668245C1D}.ExportRelease|Any CPU.ActiveCfg = ExportRelease|Any CPU
+		{C43DDD98-445D-4980-B226-93C668245C1D}.ExportRelease|Any CPU.Build.0 = ExportRelease|Any CPU
+	EndGlobalSection
+EndGlobal
diff --git a/Levels/ArenaManager.cs b/Levels/ArenaManager.cs
index 3de1493..b59af01 100644
--- a/Levels/ArenaManager.cs
+++ b/Levels/ArenaManager.cs
@@ -1,4 +1,6 @@
 using System.Collections.Generic;
+using System;
+using System.IO;
 using CodeBlitz.Objects;
 using Godot;
 
@@ -8,27 +10,24 @@ public class ArenaManager : Node2D
     {
         List<Entity> YellowTeam = new List<Entity>();
         List<Entity> RedTeam = new List<Entity>();
+        private List<string> _troopNames = new List<string>();
         private PackedScene _archerScene;
         private PackedScene _basicScene;
         private PackedScene _tankScene;
         private PackedScene _wizardScene;
         private PackedScene _knightScene;
+        private List<char> _inputList = new List<char>();
         private PackedScene _smokeScene;
+        private Random _random = new Random();
         private string _attacker = "Yellow";
         private string _defender = "Red";
         private WorldManager _worldManager;
         private Highlight _worldHighlight;
         private PlayerHighlight _playerHighlight;
-        private Entity currentEntity;
         private Entity previousEntity;
         private int _troopsMoved = 0;
-        private int _troopIndex = 0;
-        private bool _canAttack = false;
-        private bool _canChoosetarget = false;
-        private bool _canChooseLoc = false;
-        private bool _canWalk = false;
-        private bool _unitSelected = false;
-        private string _state = string.Empty;
+        private int _troopsSpawned = 0;
+        private bool isSpawn = true;
         private string _currentTeamSpawning = "Yellow";
         [Signal] public delegate void DisplayTroopList(string team);
         [Signal] public delegate void UpdateTroopList(string team);
@@ -48,14 +47,72 @@ public override void _Ready()
             _knightScene = ResourceLoader.Load<PackedScene>("res://Objects/Knight.tscn");
             _smokeScene = ResourceLoader.Load<PackedScene>("res://Objects/Smoke.tscn");
             Connect(nameof(GameOver), this, nameof(_end_Game));
+
+            StreamReader sr = new StreamReader("Troop Names.txt");
+            string line;
+            while ((line = sr.ReadLine()) != null)
+            {
+                _troopNames.Add(line);
+            }
         }
+        public override void _Input(InputEvent @event)
+        {
+            if(isSpawn && @event is InputEventMouse eventKey && eventKey.IsPressed())
+            {
+                var position = _worldManager.WorldToMap(eventKey.Position);
+                if(!_worldManager.ExistsInArray(position, _worldManager.Obstacles) 
+                && !_worldManager.ExistsInArray(position, _worldManager.Players))
+                {
+                    Entity entity;
+                    Vector2 half = (_worldManager.CellSize / 2) / 2;
+                    string name = _troopNames[_random.Next(0, _troopNames.Count - 1)];
+                    _troopNames.Remove(name);
+                    if(_currentTeamSpawning == "Yellow")
+                    {
+                        entity = GetInstance(Troops.YellowTeam[_troopsSpawned]).Instance() as Entity;
+                        entity.Name = Troops.YellowTeam[_troopsSpawned];
+                        YellowTeam.Add(entity);
+                    }
+                    else
+                    {
+                        entity = GetInstance(Troops.RedTeam[_troopsSpawned]).Instance() as Entity;
+                        entity.Name = Troops.RedTeam[_troopsSpawned];
+                        RedTeam.Add(entity);
+                    }
 
+                    entity.Name = name;
+                    entity.GetNode<Label>("NameLabel").Text = entity.Name;
+                    entity.Connect(nameof(Entity.EndTurn), this, nameof(EndTurn));
+                    entity.Connect(nameof(Entity.InvalidMove), this, nameof(InvalidMove));
+                    entity.Connect(nameof(Entity.Death), this, nameof(_on_Entity_Death));
+                    entity.Position = _worldManager.MapToWorld(position);
+                    entity.Position += new Vector2(half.x / 2, half.y + half.y);
+
+                    var smoke = _smokeScene.Instance() as Smoke;
+                    smoke.Position = _worldManager.MapToWorld(position);
+                    smoke.Position += new Vector2(half.x / 2, half.y + half.y);
+                    GetNode<AudioStreamPlayer>("AudioPlayer").Play();
+                    GetNode<Node2D>($"{_currentTeamSpawning} Team").AddChild(entity);
+                    AddChild(smoke);
+                    _troopsSpawned++;
+                    EmitSignal(nameof(UpdateTroopList), _currentTeamSpawning);
+                    if(_troopsSpawned >= 4 && _currentTeamSpawning == "Yellow")
+                    {
+                        _troopsSpawned = 0;
+                        _currentTeamSpawning = "Red";
+                        EmitSignal(nameof(DisplayTroopList), "Red");
+                    }
+                    else if (_troopsSpawned >= 4 && _currentTeamSpawning == "Red")
+                    {
+                        isSpawn = false;
+                        GetNode<AnimationPlayer>("AnimationPlayer").Play("Yellow Alert");
+                    }
+                }
+            }
+        }
         private void InvalidMove()
         {
             ResetTiles();
-            GetNode<TextureButton>("Screen/Buttons/Attack Button").Disabled = true;
-            GetNode<TextureButton>("Screen/Buttons/Walk Button").Disabled = true;
-            GetNode<TextureButton>("Screen/Buttons/End Button").Disabled = true;
         }
 
         private void EndTurn()
@@ -87,191 +144,53 @@ private void EndTurn()
             ResetTiles();
         }
 
-        public override void _Input(InputEvent @event)
+        private void _on_Screen_Enter(string token1, string token2, string token3)
         {
-            if(@event is InputEventMouseButton eventKey)
+            if (token1 == "move")
             {
-                if(eventKey.IsActionReleased("L_mouse_down"))
+                var entity = GetEntity(token2, _attacker);
+                if(entity != null)
                 {
-                    var position = _worldManager.WorldToMap(eventKey.Position);
-                    if(_state == "Game")
-                    {
-                        if(!_canAttack && !_canWalk)
-                        {
-                            GD.Print("Selected Troop");
-                            currentEntity = GetEntity(position, _attacker);
-                            if(currentEntity != null && currentEntity.MoveCount > 0)
-                            {
-                                if(previousEntity != null) 
-                                    previousEntity.HideArrow();
-        
-                                currentEntity.ShowArrow();
-                                _unitSelected = true; 
-                                previousEntity = currentEntity;
-                                GetNode<TextureButton>("Screen/Buttons/Attack Button").Disabled = false;
-                                GetNode<TextureButton>("Screen/Buttons/Walk Button").Disabled = false;
-                                GetNode<TextureButton>("Screen/Buttons/End Button").Disabled = false;
-                            }
-                            else
-                            {
-                                GD.Print("Cannot Select Entity");
-                                ResetTiles();
-                                GetNode<TextureButton>("Screen/Buttons/Attack Button").Disabled = true;
-                                GetNode<TextureButton>("Screen/Buttons/Walk Button").Disabled = true;
-                                GetNode<TextureButton>("Screen/Buttons/End Button").Disabled = true;
-                            }
-
-                            if(currentEntity != null)
-                                EmitSignal(nameof(DisplayTroopStats), currentEntity.Health, currentEntity.MoveCount, currentEntity.Name, currentEntity.Team);
-                        
-                        }
-
-                        Entity nextPossible = GetEntity(position, _attacker);
-                        if(nextPossible != null)
-                        {
-                            if(position != _worldManager.WorldToMap(currentEntity.Position) && nextPossible.MoveCount > 0)
-                            {
-                                GD.Print("My Stats");
-                                currentEntity = nextPossible;
-                                currentEntity.ShowArrow();
-                                ResetTiles();
-                                previousEntity = nextPossible;
-                                _unitSelected = true;
-                                EmitSignal(nameof(DisplayTroopStats), currentEntity.Health, currentEntity.MoveCount, currentEntity.Name, currentEntity.Team);
-                                GetNode<TextureButton>("Screen/Buttons/Attack Button").Disabled = false;
-                                GetNode<TextureButton>("Screen/Buttons/Walk Button").Disabled = false;
-                                GetNode<TextureButton>("Screen/Buttons/End Button").Disabled = false;
-                            }
-                        }
-
-                        nextPossible = GetEntity(position, _defender);
-                        if(nextPossible != null && !_canChoosetarget && !_canChooseLoc)
-                        {
-                            GD.Print("Enemy Stats");
-                            ResetTiles();
-                            EmitSignal(nameof(DisplayTroopStats), nextPossible.Health, nextPossible.MoveCount, nextPossible.Name, nextPossible.Team);
-                            GetNode<TextureButton>("Screen/Buttons/Attack Button").Disabled = true;
-                            GetNode<TextureButton>("Screen/Buttons/Walk Button").Disabled = true;
-                            GetNode<TextureButton>("Screen/Buttons/End Button").Disabled = true;
-                        }
-
-                        else if(_canAttack && currentEntity.MoveCount > 0 && !_canChoosetarget)
-                        {
-                            GD.Print("Can Choose Target");
-                            _canChoosetarget = true;
-                        }
-
-                        else if(_canWalk && currentEntity.MoveCount > 0 && !_canChooseLoc)
-                        {
-                            GD.Print("Can Choose Location");
-                            _canChooseLoc = true;
-                        }
-
-                        else if(_canChoosetarget && currentEntity.MoveCount > 0)
-                        {
-                            GD.Print("Attack");
-                            Entity e = GetEntity(position, _defender);
-                            if (e != null)
-                            {
-                                currentEntity.Attack(e);
-                            }
-                            ResetTiles(); 
-                            GetNode<TextureButton>("Screen/Buttons/Attack Button").Disabled = true;
-                            GetNode<TextureButton>("Screen/Buttons/Walk Button").Disabled = true;
-                            GetNode<TextureButton>("Screen/Buttons/End Button").Disabled = true;
-                        }
-                        else if (_canChooseLoc && currentEntity.MoveCount > 0)
-                        {
-                            GD.Print("Move");
-                            currentEntity.Move(eventKey.Position);
-                            ResetTiles();
-                            GetNode<TextureButton>("Screen/Buttons/Attack Button").Disabled = true;
-                            GetNode<TextureButton>("Screen/Buttons/Walk Button").Disabled = true;
-                            GetNode<TextureButton>("Screen/Buttons/End Button").Disabled = true;
-                        }
-                    }
-                    else if (_state == "Spawn")
-                    {
-                        Entity entity;
-                        Vector2 half = (_worldManager.CellSize / 2) / 2;;
-                        if(!_worldManager.ExistsInArray(position, _worldManager.Obstacles) && !_worldManager.ExistsInArray(position, _worldManager.Players))
-                        {
-                            if(_currentTeamSpawning == "Yellow")
-                            {
-                                entity = GetInstance(Troops.YellowTeam[_troopIndex]).Instance() as Entity;
-                                entity.Name = Troops.YellowTeam[_troopIndex];
-                                YellowTeam.Add(entity);
-                            }
-                        
-                            else
-                            {
-                                entity = GetInstance(Troops.RedTeam[_troopIndex]).Instance() as Entity;
-                                entity.Name = Troops.RedTeam[_troopIndex];
-                                RedTeam.Add(entity);
-                            }
-                        
-                            entity.Connect(nameof(Entity.EndTurn), this, nameof(EndTurn));
-                            entity.Connect(nameof(Entity.InvalidMove), this, nameof(InvalidMove));
-                            entity.Connect(nameof(Entity.Death), this, nameof(_on_Entity_Death));
-
-                            var _half = (_worldManager.CellSize / 2) / 2;
-                            entity.Position = _worldManager.MapToWorld(position);
-                            entity.Position += new Vector2(half.x / 2, half.y + half.y);
-                            //Play cool effect when spawning
-                            var smoke = _smokeScene.Instance() as Smoke;
-                            smoke.Position = _worldManager.MapToWorld(position);
-                            smoke.Position += new Vector2(half.x / 2, half.y + half.y);
-                            GetNode<AudioStreamPlayer>("AudioPlayer").Play();
-                            GetNode<Node2D>($"{_currentTeamSpawning} Team").AddChild(entity);
-                            AddChild(smoke);
-                            _troopIndex++;
-                            EmitSignal(nameof(UpdateTroopList), _currentTeamSpawning);
-                            if(_troopIndex >= 4 && _currentTeamSpawning == "Yellow")
-                            {
-                                _troopIndex = 0;
-                                _currentTeamSpawning = "Red";
-                                EmitSignal(nameof(DisplayTroopList), "Red");
-                            }
-                            else if (_troopIndex >= 4 && _currentTeamSpawning == "Red")
-                            {
-                                _state = "Game";
-                                GetNode<AnimationPlayer>("AnimationPlayer").Play("Yellow Alert");
-                            }
-                        }
-                    }
+                    var vector = StringToVector(token3);
+                    entity.Move(_worldManager.MapToWorld(vector));
                 }
             }
-        }
-
-        private void _on_Attack_Button_down()
-        {
-            if(_unitSelected)
+            else if (token1 == "attack")
             {
-                currentEntity.ModulateAtkTiles();
-                _canAttack = true;
-                _canWalk = false;
-                _canChooseLoc = false;
+                var attacker = GetEntity(token2, _attacker);
+                var defender = GetEntity(token3, _defender);
+                if(attacker != null && defender != null)
+                    attacker.Attack(defender);
             }
-        }
-
-        private void _on_Walk_Button_down()
-        {
-            if(_unitSelected)
+            else if (token1 == "endturn")
             {
-                currentEntity.ModulateMoveTiles();
-                _canAttack = false;
-                _canWalk = true;
-                _canChoosetarget = false;
+                var entity = GetEntity(token2, _attacker);
+                if(entity != null)
+                    entity.EmitSignal(nameof(Entity.EndTurn));
             }
-        }
-
-        private void _on_End_Button_down()
-        {
-            if (_unitSelected)
+            else if (token1 == "select")
             {
-                currentEntity.MoveCount = 0;
-                currentEntity.EmitSignal(nameof(Entity.EndTurn));
+                var entity = GetEntity(token3, _attacker); 
+                if(entity != null && token2 == "move")
+                {
+                    _worldHighlight.Clear();
+                    entity.ShowArrow();
+                    entity.ModulateMoveTiles();
+                    previousEntity = entity;
+                }
+
+                else if(entity != null && token2 == "attack")
+                {
+                    _worldHighlight.Clear();
+                    entity.ShowArrow();
+                    entity.ModulateAtkTiles();
+                    previousEntity = entity;
+                }
             }
+
+            if (previousEntity != null)
+                previousEntity.HideArrow();
+            
         }
 
         private void _end_Game(string team)
@@ -283,7 +202,6 @@ private void _end_Game(string team)
             GetNode<TextureButton>("Screen/Buttons/Walk Button").Disabled = true;
             GetNode<TextureButton>("Screen/Buttons/End Button").Disabled = true;
             GetNode<AnimationPlayer>("AnimationPlayer").Play("Fade Out");
-
         }
 
         private void _on_Entity_Death(Entity e, string team)
@@ -301,7 +219,6 @@ private void _on_AnimationPlayer_finished(string animationName)
             if (animationName == "Fade In")
             {
                 GetNode<ColorRect>("ColorRect").Hide();
-                _state = "Spawn";
             }
             else if(animationName == "Fade Out")
             {
@@ -309,6 +226,61 @@ private void _on_AnimationPlayer_finished(string animationName)
             }
         }
 
+        private Vector2 StringToVector(string token)
+        {
+            if(token.Length == 2)
+                return new Vector2(CharToAxis(token[0].ToString()), CharToAxis(token[1].ToString()));
+            else if (token.Length == 3)
+            {
+                string newString = token[1].ToString() + token[2].ToString();
+                GD.Print(newString);
+                return new Vector2(CharToAxis(token[0].ToString()), CharToAxis(newString));
+            }
+            
+            return Vector2.Zero;
+        }
+
+        private int CharToAxis(string input)
+        {
+            switch(input)
+            {
+                case "a": { return 14; }
+                case "b": { return 15; }
+                case "c": { return 16; }
+                case "d": { return 17; }
+                case "e": { return 18; }
+                case "f": { return 19; }
+                case "g": { return 20; }
+                case "h": { return 21; }
+                case "i": { return 22; }
+                case "j": { return 23; }
+                case "k": { return 24; }
+                case "l": { return 25; }
+                case "m": { return 26; }
+                case "n": { return 27; }
+                case "o": { return 28; }
+                case "p": { return 29; }
+                
+                case "1": { return -5; }
+                case "2": { return -4; }
+                case "3": { return -3; }
+                case "4": { return -2; }
+                case "5": { return -1; }
+                case "6": { return 0; }
+                case "7": { return 1; }
+                case "8": { return 2; }
+                case "9": { return 3; }
+                case "10": { return 4; }
+                case "11": { return 5; }
+                case "12": { return 6; }
+                case "13": { return 7; }
+                case "14": { return 8; }
+                case "15": { return 9; }
+                case "16": { return 10; }
+            }
+            return 0;
+        }
+
         private PackedScene GetInstance(string type)
         {
             switch (type)
@@ -337,20 +309,20 @@ private PackedScene GetInstance(string type)
             return null;
         }
 
-        private Entity GetEntity(Vector2 position, string team)
+        private Entity GetEntity(string name, string team)
         {
             if(team == "Red")
             {
                 foreach (var t in RedTeam)
                 {
-                    if (_worldManager.WorldToMap(t.Position) == position) return t;
+                    if (t.Name == name) return t;
                 }
             }
             else
             {
                 foreach (var t in YellowTeam)
                 {
-                    if (_worldManager.WorldToMap(t.Position) == position) return t;
+                   if (t.Name == name) return t;
                 }
             }
             return null;
@@ -375,18 +347,7 @@ private void ResetRound()
 
         private void ResetTiles()
         {
-            GetNode<Control>("Screen/TroopDisplay").Hide();
             _worldHighlight.Clear();
-            if (previousEntity != null)
-            {
-                previousEntity.HideArrow();
-            } 
-            previousEntity = null;
-            _unitSelected = false;
-            _canChooseLoc = false;
-            _canChoosetarget = false;
-            _canWalk = false;
-            _canAttack = false;
         }
     }
 }
diff --git a/Levels/ClassSelect.tscn b/Levels/ClassSelect.tscn
index 24fd532..0073f4d 100644
--- a/Levels/ClassSelect.tscn
+++ b/Levels/ClassSelect.tscn
@@ -276,6 +276,7 @@ __meta__ = {
 
 [node name="SelectPlayer" type="AudioStreamPlayer" parent="."]
 stream = ExtResource( 10 )
+
 [connection signal="mouse_entered" from="Classes/Basic" to="Players" method="_on_button_mouse_entered"]
 [connection signal="pressed" from="Classes/Basic" to="Players" method="_on_Basic_pressed"]
 [connection signal="mouse_entered" from="Classes/Archer" to="Players" method="_on_button_mouse_entered"]
diff --git a/Levels/NavigationArena.tscn b/Levels/NavigationArena.tscn
index 40aee0f..8e5acc7 100644
--- a/Levels/NavigationArena.tscn
+++ b/Levels/NavigationArena.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=24 format=2]
+[gd_scene load_steps=23 format=2]
 
 [ext_resource path="res://Levels/ArenaManager.cs" type="Script" id=1]
 [ext_resource path="res://Assets/Tiles/ObstacleTile.png" type="Texture" id=2]
@@ -10,7 +10,6 @@
 [ext_resource path="res://Levels/Highlight.cs" type="Script" id=8]
 [ext_resource path="res://Assets/Tiles/ActorTile.png" type="Texture" id=9]
 [ext_resource path="res://Levels/UI/MainUI.tscn" type="PackedScene" id=10]
-[ext_resource path="res://Levels/UI/BasicRed.tscn" type="PackedScene" id=11]
 [ext_resource path="res://Assets/Sounds/Explosion.ogg" type="AudioStream" id=12]
 [ext_resource path="res://Assets/UI/Yellow Alert.png" type="Texture" id=13]
 [ext_resource path="res://Assets/UI/Red Alert.png" type="Texture" id=14]
@@ -165,9 +164,6 @@ margin_bottom = 0.0
 
 [node name="Troop List" parent="Screen" instance=ExtResource( 4 )]
 
-[node name="TroopDisplay" parent="Screen" instance=ExtResource( 11 )]
-visible = false
-
 [node name="Labels" type="Control" parent="."]
 margin_right = 40.0
 margin_bottom = 40.0
@@ -218,12 +214,12 @@ __meta__ = {
 }
 
 [node name="4" type="Label" parent="Labels"]
-margin_left = 47.3414
-margin_top = 97.7662
-margin_right = 58.3414
-margin_bottom = 138.766
+margin_left = 46.9441
+margin_top = 98.5608
+margin_right = 57.9441
+margin_bottom = 139.561
 custom_fonts/font = SubResource( 2 )
-text = "e"
+text = "d"
 align = 1
 valign = 1
 __meta__ = {
@@ -231,12 +227,12 @@ __meta__ = {
 }
 
 [node name="5" type="Label" parent="Labels"]
-margin_left = 53.8652
-margin_top = 102.537
-margin_right = 64.8652
-margin_bottom = 143.537
+margin_left = 54.6598
+margin_top = 103.067
+margin_right = 65.6598
+margin_bottom = 144.067
 custom_fonts/font = SubResource( 2 )
-text = "f"
+text = "e"
 align = 1
 valign = 1
 __meta__ = {
@@ -244,12 +240,12 @@ __meta__ = {
 }
 
 [node name="6" type="Label" parent="Labels"]
-margin_left = 62.3379
-margin_top = 105.297
-margin_right = 73.3379
-margin_bottom = 146.297
+margin_left = 62.8676
+margin_top = 105.562
+margin_right = 73.8676
+margin_bottom = 146.562
 custom_fonts/font = SubResource( 2 )
-text = "g"
+text = "f"
 align = 1
 valign = 1
 __meta__ = {
@@ -262,7 +258,7 @@ margin_top = 110.402
 margin_right = 82.1095
 margin_bottom = 151.402
 custom_fonts/font = SubResource( 2 )
-text = "h"
+text = "g"
 align = 1
 valign = 1
 __meta__ = {
@@ -270,12 +266,12 @@ __meta__ = {
 }
 
 [node name="8" type="Label" parent="Labels"]
-margin_left = 78.2286
+margin_left = 78.6259
 margin_top = 114.882
-margin_right = 89.2286
+margin_right = 89.6259
 margin_bottom = 155.882
 custom_fonts/font = SubResource( 2 )
-text = "i"
+text = "h"
 align = 1
 valign = 1
 __meta__ = {
@@ -283,12 +279,12 @@ __meta__ = {
 }
 
 [node name="9" type="Label" parent="Labels"]
-margin_left = 85.2728
-margin_top = 118.247
-margin_right = 96.2728
-margin_bottom = 159.247
+margin_left = 87.1269
+margin_top = 118.115
+margin_right = 98.1269
+margin_bottom = 159.115
 custom_fonts/font = SubResource( 2 )
-text = "j"
+text = "i"
 align = 1
 valign = 1
 __meta__ = {
@@ -301,7 +297,7 @@ margin_top = 122.078
 margin_right = 105.689
 margin_bottom = 163.078
 custom_fonts/font = SubResource( 2 )
-text = "k"
+text = "j"
 align = 1
 valign = 1
 __meta__ = {
@@ -309,12 +305,12 @@ __meta__ = {
 }
 
 [node name="11" type="Label" parent="Labels"]
-margin_left = 101.9
-margin_top = 126.573
-margin_right = 112.9
-margin_bottom = 167.573
+margin_left = 102.695
+margin_top = 125.911
+margin_right = 113.695
+margin_bottom = 166.911
 custom_fonts/font = SubResource( 2 )
-text = "l"
+text = "k"
 align = 1
 valign = 1
 __meta__ = {
@@ -322,12 +318,12 @@ __meta__ = {
 }
 
 [node name="12" type="Label" parent="Labels"]
-margin_left = 110.422
+margin_left = 110.687
 margin_top = 130.352
-margin_right = 121.422
+margin_right = 121.687
 margin_bottom = 171.352
 custom_fonts/font = SubResource( 2 )
-text = "m"
+text = "l"
 align = 1
 valign = 1
 __meta__ = {
@@ -340,7 +336,7 @@ margin_top = 133.877
 margin_right = 129.662
 margin_bottom = 174.877
 custom_fonts/font = SubResource( 2 )
-text = "n"
+text = "m"
 align = 1
 valign = 1
 __meta__ = {
@@ -348,12 +344,12 @@ __meta__ = {
 }
 
 [node name="14" type="Label" parent="Labels"]
-margin_left = 126.341
+margin_left = 126.871
 margin_top = 137.623
-margin_right = 137.341
+margin_right = 137.871
 margin_bottom = 178.623
 custom_fonts/font = SubResource( 2 )
-text = "o"
+text = "n"
 align = 1
 valign = 1
 __meta__ = {
@@ -361,12 +357,12 @@ __meta__ = {
 }
 
 [node name="15" type="Label" parent="Labels"]
-margin_left = 134.301
+margin_left = 135.003
 margin_top = 140.807
-margin_right = 145.301
+margin_right = 146.003
 margin_bottom = 181.807
 custom_fonts/font = SubResource( 2 )
-text = "p"
+text = "o"
 align = 1
 valign = 1
 __meta__ = {
@@ -374,12 +370,12 @@ __meta__ = {
 }
 
 [node name="16" type="Label" parent="Labels"]
-margin_left = 142.208
+margin_left = 143.05
 margin_top = 145.038
-margin_right = 153.208
+margin_right = 154.05
 margin_bottom = 186.038
 custom_fonts/font = SubResource( 2 )
-text = "q"
+text = "p"
 align = 1
 valign = 1
 __meta__ = {
@@ -643,6 +639,7 @@ __meta__ = {
 }
 
 [node name="ColorRect" type="ColorRect" parent="."]
+visible = false
 margin_right = 304.0
 margin_bottom = 170.0
 color = Color( 0, 0, 0, 1 )
@@ -666,12 +663,8 @@ texture = ExtResource( 13 )
 [node name="Red Alert" type="Sprite" parent="."]
 position = Vector2( 148.806, -3.059 )
 texture = ExtResource( 14 )
-[connection signal="DisplayTroopList" from="." to="Screen/Troop List" method="DisplayTroopList"]
-[connection signal="DisplayTroopStats" from="." to="Screen/TroopDisplay" method="DisplayStats"]
-[connection signal="UpdateTroopList" from="." to="Screen/Troop List" method="UpdateTroopList"]
-[connection signal="button_down" from="Screen/Buttons/Attack Button" to="." method="_on_Attack_Button_down"]
-[connection signal="button_down" from="Screen/Buttons/Walk Button" to="." method="_on_Walk_Button_down"]
-[connection signal="button_down" from="Screen/Buttons/End Button" to="." method="_on_End_Button_down"]
+
+[connection signal="Enter" from="Screen" to="." method="_on_Screen_Enter"]
 [connection signal="animation_finished" from="AnimationPlayer" to="." method="_on_AnimationPlayer_finished"]
 
 [editable path="Screen"]
diff --git a/Levels/UI/MainUI.tscn b/Levels/UI/MainUI.tscn
index 6ab335f..7ea594c 100644
--- a/Levels/UI/MainUI.tscn
+++ b/Levels/UI/MainUI.tscn
@@ -1,11 +1,12 @@
-[gd_scene load_steps=7 format=2]
+[gd_scene load_steps=5 format=2]
 
-[ext_resource path="res://Assets/UI/End Move Button Pressed.png" type="Texture" id=1]
-[ext_resource path="res://Assets/UI/End Move Button.png" type="Texture" id=2]
-[ext_resource path="res://Assets/UI/Attack Button.png" type="Texture" id=3]
-[ext_resource path="res://Assets/UI/Walk Button.png" type="Texture" id=4]
-[ext_resource path="res://Assets/UI/Attack Button Pressed.png" type="Texture" id=5]
-[ext_resource path="res://Assets/UI/Walk Button Pressedt.png" type="Texture" id=6]
+[ext_resource path="res://Assets/UI/TextBox.png" type="Texture" id=1]
+[ext_resource path="res://Assets/Jeebz-Regular.ttf" type="DynamicFontData" id=2]
+[ext_resource path="res://Levels/UI/TextBox.cs" type="Script" id=3]
+
+[sub_resource type="DynamicFont" id=1]
+size = 8
+font_data = ExtResource( 2 )
 
 [node name="Screen" type="Control"]
 anchor_right = 1.0
@@ -14,49 +15,21 @@ margin_left = -0.314972
 margin_top = 0.944946
 margin_right = -0.314972
 margin_bottom = 0.944946
+script = ExtResource( 3 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="Buttons" type="Control" parent="."]
-margin_right = 40.0
-margin_bottom = 40.0
-
-[node name="Attack Button" type="TextureButton" parent="Buttons"]
-margin_left = 1.444
-margin_top = 136.318
-margin_right = 33.444
-margin_bottom = 168.318
-disabled = true
-texture_normal = ExtResource( 3 )
-texture_pressed = ExtResource( 5 )
-texture_disabled = ExtResource( 5 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
-[node name="Walk Button" type="TextureButton" parent="Buttons"]
-margin_left = 30.5796
-margin_top = 136.021
-margin_right = 62.5796
-margin_bottom = 168.021
-disabled = true
-texture_normal = ExtResource( 4 )
-texture_pressed = ExtResource( 6 )
-texture_disabled = ExtResource( 6 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
+[node name="Sprite" type="Sprite" parent="."]
+position = Vector2( 49.7081, 153.013 )
+texture = ExtResource( 1 )
 
-[node name="End Button" type="TextureButton" parent="Buttons"]
-margin_left = 61.2949
-margin_top = 136.209
-margin_right = 93.2949
-margin_bottom = 168.209
-disabled = true
-texture_normal = ExtResource( 2 )
-texture_pressed = ExtResource( 1 )
-texture_disabled = ExtResource( 1 )
+[node name="TextBox" type="Label" parent="."]
+margin_left = 7.0079
+margin_top = 157.176
+margin_right = 99.0079
+margin_bottom = 176.176
+custom_fonts/font = SubResource( 1 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
diff --git a/Levels/UI/TextBox.cs b/Levels/UI/TextBox.cs
new file mode 100644
index 0000000..fb421ea
--- /dev/null
+++ b/Levels/UI/TextBox.cs
@@ -0,0 +1,42 @@
+using Godot;
+using System;
+
+public class TextBox : Control
+{
+    [Signal] public delegate void Enter(string token1, string token2, string token3);
+    private Label _textBox;
+    public override void _Ready()
+    {
+        _textBox = GetNode<Label>("TextBox");
+    }
+
+    public override void _Input(InputEvent @event)
+    {
+        if(@event is InputEventKey eventKey && @event.IsPressed()) 
+        {
+            if(eventKey.IsActionPressed("ui_accept"))
+            {
+                string[] tokens = _textBox.Text.Split(' ');
+                if(tokens.Length == 2)
+                    EmitSignal(nameof(Enter), tokens[0], tokens[1]);
+                else if (tokens.Length == 3)
+                    EmitSignal(nameof(Enter), tokens[0], tokens[1], tokens[2]);
+
+                _textBox.Text = string.Empty;
+            }
+            else if (eventKey.IsActionPressed("backspace"))
+            {
+                if(_textBox.Text.Length > 0)
+                    _textBox.Text = _textBox.Text.Remove(_textBox.Text.Length - 1);
+            }
+            else 
+            {
+                  _textBox.Text += (char)eventKey.Scancode;
+                   _textBox.Text = _textBox.Text.ToLower();
+            }
+              
+   
+        }
+    }
+}
+
diff --git a/Objects/Archer.tscn b/Objects/Archer.tscn
index 6942701..2d11d7e 100644
--- a/Objects/Archer.tscn
+++ b/Objects/Archer.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=26 format=2]
+[gd_scene load_steps=28 format=2]
 
 [ext_resource path="res://Assets/characters/basic/basic_bow_run_01.png" type="Texture" id=1]
 [ext_resource path="res://Assets/characters/basic/basic_bow_run_03.png" type="Texture" id=2]
@@ -23,6 +23,7 @@
 [ext_resource path="res://Assets/characters/basic/basic_bow_run_07.png" type="Texture" id=21]
 [ext_resource path="res://Assets/characters/basic/basic_bow_run_06.png" type="Texture" id=22]
 [ext_resource path="res://Assets/Sounds/Hit.ogg" type="AudioStream" id=23]
+[ext_resource path="res://Assets/Jeebz-Regular.ttf" type="DynamicFontData" id=24]
 
 [sub_resource type="Animation" id=1]
 resource_name = "Bounce"
@@ -59,6 +60,12 @@ animations = [ {
 "speed": 10.0
 } ]
 
+[sub_resource type="DynamicFont" id=3]
+size = 6
+outline_size = 1
+outline_color = Color( 0, 0, 0, 1 )
+font_data = ExtResource( 24 )
+
 [node name="Archer" type="Position2D"]
 script = ExtResource( 15 )
 Health = 25
@@ -80,7 +87,7 @@ anims/Bounce = SubResource( 1 )
 position = Vector2( -1, -5 )
 frames = SubResource( 2 )
 animation = "idle"
-frame = 2
+frame = 1
 playing = true
 
 [node name="MovementTimer" type="Timer" parent="."]
@@ -91,4 +98,18 @@ anims/Damaged = ExtResource( 16 )
 
 [node name="HitPlayer" type="AudioStreamPlayer" parent="."]
 stream = ExtResource( 23 )
+
+[node name="NameLabel" type="Label" parent="."]
+margin_left = -10.0
+margin_top = -17.0
+margin_right = 6.0
+margin_bottom = -3.0
+custom_fonts/font = SubResource( 3 )
+text = "john"
+align = 1
+valign = 1
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
 [connection signal="timeout" from="MovementTimer" to="." method="_on_MovementTimer_timeout"]
diff --git a/Objects/Basic.tscn b/Objects/Basic.tscn
index 72b187c..8136e6c 100644
--- a/Objects/Basic.tscn
+++ b/Objects/Basic.tscn
@@ -97,7 +97,7 @@ anims/Bounce = SubResource( 1 )
 position = Vector2( 0, -5 )
 frames = SubResource( 2 )
 animation = "idle"
-frame = 3
+frame = 2
 playing = true
 
 [node name="MovementTimer" type="Timer" parent="."]
@@ -109,4 +109,5 @@ anims/Damaged = SubResource( 3 )
 
 [node name="HitPlayer" type="AudioStreamPlayer" parent="."]
 stream = ExtResource( 25 )
+
 [connection signal="timeout" from="MovementTimer" to="." method="_on_MovementTimer_timeout"]
diff --git a/Troop Names.txt b/Troop Names.txt
new file mode 100644
index 0000000..1601cef
--- /dev/null
+++ b/Troop Names.txt	
@@ -0,0 +1,9 @@
+john
+bob
+richard
+timmy
+tommy
+joel
+jimmy
+patrick
+miguel
diff --git a/project.godot b/project.godot
index d1aa2b8..b8f28c1 100644
--- a/project.godot
+++ b/project.godot
@@ -10,10 +10,14 @@ config_version=4
 
 [application]
 
-config/name="CodeBlitz"
+config/name="Code Combat"
 run/main_scene="res://Levels/MainMenu.tscn"
 config/icon="res://icon.png"
 
+[autoload]
+
+Global="*res://Levels/Troops.cs"
+
 [display]
 
 window/size/width=304
@@ -24,6 +28,13 @@ window/stretch/mode="2d"
 
 [input]
 
+ui_accept={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777222,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":0,"pressure":0.0,"pressed":false,"script":null)
+ ]
+}
 R_mouse_down={
 "deadzone": 0.5,
 "events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":2,"pressed":false,"doubleclick":false,"script":null)
@@ -39,6 +50,11 @@ enter={
 "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"unicode":0,"echo":false,"script":null)
  ]
 }
+backspace={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777220,"unicode":0,"echo":false,"script":null)
+ ]
+}
 
 [rendering]