diff --git a/MemberDatabase/MemberDatabase.gd b/MemberDatabase/MemberDatabase.gd
index 23e1acd..b66b660 100644
--- a/MemberDatabase/MemberDatabase.gd
+++ b/MemberDatabase/MemberDatabase.gd
@@ -11,17 +11,6 @@ func _ready():
 
 # Function to load character data from the JSON file
 func load_character_data():
-	#var file_path = "user://MemberDatabase/memberData.csv"
-	#if FileAccess.file_exists(file_path):
-		#var file = FileAccess.open(file_path, FileAccess.READ)
-		#if file:
-			#var csv_text = file.get_as_text()
-			#file.close()
-			#parse_csv(csv_text)
-		#else:
-			#print("Failed to open file: ", file_path)
-	#else:
-		#print("File not found: ", file_path)
 	
 	#If using json
 	var file = FileAccess.open("user://MemberDatabase/memberData.json", FileAccess.READ)
diff --git a/Root.gd b/Root.gd
index efec077..eefeaca 100644
--- a/Root.gd
+++ b/Root.gd
@@ -3,10 +3,10 @@ extends Control
 
 # Called when the node enters the scene tree for the first time.
 func _ready():
-	for file_name in files_to_copy:
-		copy_file_if_not_exists(file_name)
-
+	#for file_name in files_to_copy:
+		#copy_file_if_not_exists(file_name)
 
+	pass
 #User Data copy if needed
 var files_to_copy = [
 	"MemberDatabase/memberData.json",
@@ -58,14 +58,14 @@ func _process(delta):
 	Global.globalDamageMultiplier = totalDamageMultiplier
 
 		#Get the current status of any screens needed
-	var teamScreen = get_node(Global.teamScreenPath)
-	teamScreen.visible = Global.teamScreenVisible
-	
-	var teamSelection = get_node(Global.teamSelectionPath)
-	teamSelection.visible = Global.teamSelectionVisible
-	
-	var bossScreen = get_node(Global.bossSelectionPath)
-	bossScreen.visible = Global.bossScreenVisible
+	#var teamScreen = get_node(Global.teamScreenPath)
+	#teamScreen.visible = Global.teamScreenVisible
+	#
+	#var teamSelection = get_node(Global.teamSelectionPath)
+	#teamSelection.visible = Global.teamSelectionVisible
+	#
+	#var bossScreen = get_node(Global.bossSelectionPath)
+	#bossScreen.visible = Global.bossScreenVisible
 
 func damageEngineCalc():
 
diff --git a/TeamSelection.gd b/TeamSelection.gd
index 44341ec..dff8862 100644
--- a/TeamSelection.gd
+++ b/TeamSelection.gd
@@ -1,11 +1,13 @@
 extends GridContainer
 
 var target_buttons = []  # Array to hold target buttons
-
 # Called when the node enters the scene tree for the first time.
-func _ready():
-	load_character_buttons()
 
+func _ready():
+	print("Team Selection loaded")
+	MemberDatabase.load_character_data()
+	load_character_buttons()
+	#pass
 	# Initialize or find the target buttons using their absolute paths
 	target_buttons = [
 		get_node("/root/Root/UI/AspectRatioContainer/TeamScreen/Member1"),  # Replace with the actual path to your target button 1
@@ -16,10 +18,16 @@ func _ready():
 	]
 	
 func load_character_buttons():
+	#print("started load function")
+	#print(MemberDatabase.character_data)
 	if "members" in MemberDatabase.character_data:
+		#print("found members in data")
 		for character in MemberDatabase.character_data["members"]:
-			var button = create_character_button(character)
-			add_child(button)
+			#print("iterating through data")
+			if character["isObtained"] ==true:
+				print ("Created character:", character["name"])
+				var button = create_character_button(character)
+				add_child(button)
 	else:
 		print("No characters found in character data.")
 
@@ -87,6 +95,8 @@ func _on_button_pressed(button: TextureButton, member: Dictionary):
 	##Sets the global variable for the team selection screen to true so when you move back it's already open
 	Global.teamScreenVisible = true
 	Global.teamSelectionVisible = false
+	
+	get_tree().change_scene_to_file("res://team.tscn")
 
 	
 
diff --git a/User Interface/BossGrid.gd b/User Interface/BossGrid.gd
index 42efef4..6149636 100644
--- a/User Interface/BossGrid.gd	
+++ b/User Interface/BossGrid.gd	
@@ -38,5 +38,7 @@ func _on_button_exited(button: TextureButton):
 
 
 func _on_button_pressed(button: TextureButton, boss: Dictionary):
-	var character_manager = get_node("/root/@Control@14/UI/CharacterRoll")
-	character_manager.roll_character()
+	#var character_manager = get_node("/root/Root/UI/CharacterRoll")
+	#character_manager.roll_character()
+	
+	$CharacterRoll.roll_character()
diff --git a/User Interface/Bossbutton.gd b/User Interface/Bossbutton.gd
index 120a2bd..85869b8 100644
--- a/User Interface/Bossbutton.gd	
+++ b/User Interface/Bossbutton.gd	
@@ -7,11 +7,13 @@ func _ready():
 
 # Function to handle the button press
 func _on_Button_pressed():
-	if Global.bossScreenVisible == false:
-		Global.bossScreenVisible = true
-		Global.teamScreenVisible = false
-		Global.teamSelectionVisible = false
-	else:
-		Global.bossScreenVisible = false
-
 	
+	get_tree().change_scene_to_file("res://bossFights.tscn")
+	#if Global.bossScreenVisible == false:
+		#Global.bossScreenVisible = true
+		#Global.teamScreenVisible = false
+		#Global.teamSelectionVisible = false
+	#else:
+		#Global.bossScreenVisible = false
+#
+	#
diff --git a/User Interface/CharacterRoll.gd b/User Interface/CharacterRoll.gd
index c017520..b72dac5 100644
--- a/User Interface/CharacterRoll.gd	
+++ b/User Interface/CharacterRoll.gd	
@@ -14,7 +14,7 @@ func load_character_inventory():
 		if file:
 			var json_text = file.get_as_text()
 			file.close()
-			print("Loaded JSON text: ", json_text)
+			#print("Loaded JSON text: ", json_text)
 			
 			var json_parser = JSON.new()
 			var json_result = json_parser.parse(json_text)
@@ -22,7 +22,7 @@ func load_character_inventory():
 			if json_result == OK:
 				#character_data = json_result.result.get("members", [])
 				character_data = json_parser.get_data()
-				print("Loaded character data: ", character_data)
+				#print("Loaded character data: ", character_data)
 			else:
 				print("Error parsing JSON: ", json_result.error_string)
 		else:
@@ -38,7 +38,7 @@ func save_character_inventory():
 		var json_text = JSON.stringify({ "members": getMembers })
 		file.store_string(json_text)
 		file.close()
-		print("Saved character data: ", json_text)
+		#print("Saved character data: ", json_text)
 	else:
 		print("Failed to open file: ", file_path)
 
@@ -48,7 +48,7 @@ func update_character(index, new_data):
 	if index >= 0 and index < character_data.size():
 		character_data[index] = new_data
 		save_character_inventory()
-		print("Updated character data: ", character_data[index])
+		#print("Updated character data: ", character_data[index])
 	else:
 		print("Invalid character index: ", index)
 
diff --git a/User Interface/Member1.gd b/User Interface/Member1.gd
index b7bb468..a891487 100644
--- a/User Interface/Member1.gd	
+++ b/User Interface/Member1.gd	
@@ -17,7 +17,8 @@ func _process(delta):
 # Function to handle the button press
 func _on_Button_pressed():
 	
-	
+	#MemberDatabase.load_character_data()
+	get_tree().change_scene_to_file("res://teamSelection.tscn")
 	
 	Global.currentMemberSelected = 0
 	
diff --git a/User Interface/Member2.gd b/User Interface/Member2.gd
index 38f0681..72a3277 100644
--- a/User Interface/Member2.gd	
+++ b/User Interface/Member2.gd	
@@ -17,6 +17,8 @@ func _process(delta):
 # Function to handle the button press
 func _on_Button_pressed():
 	
+	get_tree().change_scene_to_file("res://teamSelection.tscn")
+	
 	Global.currentMemberSelected = 1
 	
 	Global.teamScreenVisible = false
diff --git a/User Interface/Member3.gd b/User Interface/Member3.gd
index 09e9278..f60a756 100644
--- a/User Interface/Member3.gd	
+++ b/User Interface/Member3.gd	
@@ -17,6 +17,8 @@ func _process(delta):
 # Function to handle the button press
 func _on_Button_pressed():
 	#This is an array, numbers will not match
+	
+	get_tree().change_scene_to_file("res://teamSelection.tscn")
 	Global.currentMemberSelected = 2
 	
 	Global.teamScreenVisible = false
diff --git a/User Interface/Member4.gd b/User Interface/Member4.gd
index c3013b1..1813788 100644
--- a/User Interface/Member4.gd	
+++ b/User Interface/Member4.gd	
@@ -17,6 +17,8 @@ func _process(delta):
 # Function to handle the button press
 func _on_Button_pressed():
 	
+	get_tree().change_scene_to_file("res://teamSelection.tscn")
+	
 	Global.currentMemberSelected = 3
 	
 	Global.teamScreenVisible = false
diff --git a/User Interface/Member5.gd b/User Interface/Member5.gd
index ed53401..9c42e32 100644
--- a/User Interface/Member5.gd	
+++ b/User Interface/Member5.gd	
@@ -17,6 +17,8 @@ func _process(delta):
 # Function to handle the button press
 func _on_Button_pressed():
 	
+	get_tree().change_scene_to_file("res://teamSelection.tscn")
+	
 	Global.currentMemberSelected = 4
 	
 	Global.teamScreenVisible = false
diff --git a/User Interface/TeamButton.gd b/User Interface/TeamButton.gd
index c9028af..1e0180d 100644
--- a/User Interface/TeamButton.gd	
+++ b/User Interface/TeamButton.gd	
@@ -7,12 +7,16 @@ func _ready():
 
 # Function to handle the button press
 func _on_Button_pressed():
-	if Global.teamScreenVisible == false:
-		Global.teamSelectionVisible = false
-		Global.teamScreenVisible = true
-		Global.bossScreenVisible = false
-	else:
-		Global.teamScreenVisible = false
+	
+	#var new_scene = load("res://teamSelection.tscn")
+	get_tree().change_scene_to_file("res://team.tscn")
+	
+	#if Global.teamScreenVisible == false:
+		#Global.teamSelectionVisible = false
+		#Global.teamScreenVisible = true
+		#Global.bossScreenVisible = false
+	#else:
+		#Global.teamScreenVisible = false
 
 	
 
diff --git a/User Interface/UserInterface.tscn b/User Interface/UserInterface.tscn
index b1c6aad..519931e 100644
--- a/User Interface/UserInterface.tscn	
+++ b/User Interface/UserInterface.tscn	
@@ -1,40 +1,9 @@
-[gd_scene load_steps=22 format=3 uid="uid://xh0p6v5ir05f"]
+[gd_scene load_steps=5 format=3 uid="uid://xh0p6v5ir05f"]
 
 [ext_resource type="Script" path="res://Root.gd" id="1_dtx5s"]
 [ext_resource type="Script" path="res://User Interface/TeamButton.gd" id="3_g0muc"]
 [ext_resource type="Script" path="res://User Interface/Header.gd" id="3_q5rri"]
-[ext_resource type="Script" path="res://User Interface/Member1.gd" id="4_4xump"]
 [ext_resource type="Script" path="res://User Interface/Bossbutton.gd" id="4_7wp2t"]
-[ext_resource type="Script" path="res://User Interface/AspectRatioContainer.gd" id="5_priim"]
-[ext_resource type="Script" path="res://TeamSelection.gd" id="6_1cnw8"]
-[ext_resource type="Script" path="res://User Interface/Member2.gd" id="6_spk65"]
-[ext_resource type="Script" path="res://User Interface/Member3.gd" id="6_tuvg4"]
-[ext_resource type="Script" path="res://User Interface/Member4.gd" id="7_5ow7k"]
-[ext_resource type="Script" path="res://User Interface/Hank.gd" id="8_kx4m8"]
-[ext_resource type="Script" path="res://User Interface/Member5.gd" id="8_n56qv"]
-[ext_resource type="Script" path="res://User Interface/BossGrid.gd" id="12_16xc1"]
-[ext_resource type="Script" path="res://User Interface/Boss1.gd" id="12_ullwe"]
-[ext_resource type="Script" path="res://User Interface/CharacterRoll.gd" id="14_ox8ae"]
-
-[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_8gi0c"]
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_74gmg"]
-atlas = SubResource("CompressedTexture2D_8gi0c")
-region = Rect2(128, 0, 32, 32)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_xmmtg"]
-atlas = SubResource("CompressedTexture2D_8gi0c")
-region = Rect2(96, 320, 32, 32)
-
-[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_pioex"]
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_l5qwh"]
-atlas = SubResource("CompressedTexture2D_pioex")
-region = Rect2(32, 416, 32, 32)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_t1ab2"]
-atlas = SubResource("CompressedTexture2D_pioex")
-region = Rect2(288, 416, 32, 32)
 
 [node name="Root" type="Control"]
 layout_mode = 3
@@ -158,116 +127,3 @@ text = "Multiplier:
 [node name="Multiplier" type="Label" parent="UI/CanvasLayer/Header"]
 layout_mode = 2
 text = "0"
-
-[node name="AspectRatioContainer" type="AspectRatioContainer" parent="UI"]
-visible = false
-layout_mode = 0
-offset_left = -2.60654
-offset_top = 271.396
-offset_right = 1917.39
-offset_bottom = 800.396
-script = ExtResource("5_priim")
-
-[node name="TeamScreen" type="HBoxContainer" parent="UI/AspectRatioContainer"]
-visibility_layer = 2
-layout_mode = 2
-alignment = 1
-
-[node name="Member1" type="TextureButton" parent="UI/AspectRatioContainer/TeamScreen"]
-custom_minimum_size = Vector2(200, 10)
-layout_mode = 2
-script = ExtResource("4_4xump")
-
-[node name="VSeparator" type="VSeparator" parent="UI/AspectRatioContainer/TeamScreen"]
-layout_mode = 2
-
-[node name="Member2" type="TextureButton" parent="UI/AspectRatioContainer/TeamScreen"]
-custom_minimum_size = Vector2(200, 10)
-layout_mode = 2
-script = ExtResource("6_spk65")
-
-[node name="VSeparator2" type="VSeparator" parent="UI/AspectRatioContainer/TeamScreen"]
-layout_mode = 2
-
-[node name="Member3" type="TextureButton" parent="UI/AspectRatioContainer/TeamScreen"]
-custom_minimum_size = Vector2(200, 10)
-layout_mode = 2
-script = ExtResource("6_tuvg4")
-
-[node name="VSeparator3" type="VSeparator" parent="UI/AspectRatioContainer/TeamScreen"]
-layout_mode = 2
-
-[node name="Member4" type="TextureButton" parent="UI/AspectRatioContainer/TeamScreen"]
-custom_minimum_size = Vector2(200, 10)
-layout_mode = 2
-script = ExtResource("7_5ow7k")
-
-[node name="VSeparator4" type="VSeparator" parent="UI/AspectRatioContainer/TeamScreen"]
-layout_mode = 2
-
-[node name="Member5" type="TextureButton" parent="UI/AspectRatioContainer/TeamScreen"]
-custom_minimum_size = Vector2(200, 10)
-layout_mode = 2
-script = ExtResource("8_n56qv")
-
-[node name="Label" type="Label" parent="UI/AspectRatioContainer/TeamScreen"]
-visible = false
-layout_mode = 2
-text = "testtestsetsetsetsetsetsetset"
-
-[node name="TeamSelection" type="GridContainer" parent="UI"]
-visible = false
-layout_mode = 0
-offset_left = 3.0
-offset_top = 40.0
-offset_right = 1923.0
-offset_bottom = 1120.0
-columns = 10
-script = ExtResource("6_1cnw8")
-
-[node name="Hank" type="TextureButton" parent="UI/TeamSelection"]
-visible = false
-layout_mode = 2
-texture_normal = SubResource("AtlasTexture_74gmg")
-script = ExtResource("8_kx4m8")
-memberClickAdd = 5
-memberPerSec = 25
-
-[node name="Rory" type="TextureButton" parent="UI/TeamSelection"]
-visible = false
-layout_mode = 2
-texture_normal = SubResource("AtlasTexture_xmmtg")
-
-[node name="TextureButton3" type="TextureButton" parent="UI/TeamSelection"]
-visible = false
-layout_mode = 2
-texture_normal = SubResource("AtlasTexture_l5qwh")
-
-[node name="TextureButton4" type="TextureButton" parent="UI/TeamSelection"]
-visible = false
-layout_mode = 2
-texture_normal = SubResource("AtlasTexture_t1ab2")
-
-[node name="BossFights" type="PanelContainer" parent="UI"]
-visible = false
-layout_mode = 0
-offset_left = 857.0
-offset_top = 294.0
-offset_right = 1049.0
-offset_bottom = 422.0
-
-[node name="BossGrid" type="GridContainer" parent="UI/BossFights"]
-layout_mode = 2
-script = ExtResource("12_16xc1")
-
-[node name="Boss1" type="TextureButton" parent="UI/BossFights/BossGrid"]
-layout_mode = 2
-script = ExtResource("12_ullwe")
-
-[node name="CharacterRoll" type="PanelContainer" parent="UI"]
-visible = false
-layout_mode = 0
-offset_top = 31.0
-offset_right = 1917.0
-offset_bottom = 1080.0
-script = ExtResource("14_ox8ae")
diff --git a/bossFights.tscn b/bossFights.tscn
new file mode 100644
index 0000000..0baf8f4
--- /dev/null
+++ b/bossFights.tscn
@@ -0,0 +1,152 @@
+[gd_scene load_steps=8 format=3 uid="uid://2xiybbxvsdwi"]
+
+[ext_resource type="Script" path="res://Root.gd" id="1_dq55c"]
+[ext_resource type="Script" path="res://User Interface/Header.gd" id="2_e5bkm"]
+[ext_resource type="Script" path="res://User Interface/TeamButton.gd" id="3_2wxqa"]
+[ext_resource type="Script" path="res://User Interface/Bossbutton.gd" id="4_0lt4t"]
+[ext_resource type="Script" path="res://User Interface/BossGrid.gd" id="5_1d3gb"]
+[ext_resource type="Script" path="res://User Interface/Boss1.gd" id="6_pp6ep"]
+[ext_resource type="Script" path="res://User Interface/CharacterRoll.gd" id="7_7lppr"]
+
+[node name="Root" type="Control"]
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_right = 768.0
+offset_bottom = 432.0
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("1_dq55c")
+
+[node name="UI" type="Control" parent="."]
+anchors_preset = 0
+offset_right = 1920.0
+offset_bottom = 1080.0
+
+[node name="CanvasLayer" type="CanvasLayer" parent="UI"]
+
+[node name="Header" type="HBoxContainer" parent="UI/CanvasLayer"]
+offset_left = 3.0
+offset_right = 395.0
+offset_bottom = 40.0
+script = ExtResource("2_e5bkm")
+
+[node name="ScoreLabel" type="Label" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "Score:"
+
+[node name="Score" type="Label" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "0"
+
+[node name="Timer" type="Timer" parent="UI/CanvasLayer/Header"]
+autostart = true
+
+[node name="ClickUpgrades" type="MenuButton" parent="UI/CanvasLayer/Header"]
+visible = false
+layout_mode = 2
+text = "Click Upgrades"
+item_count = 9
+popup/item_0/text = "+1 Cost:10"
+popup/item_0/id = 0
+popup/item_1/text = "+10 Cost: 100"
+popup/item_1/id = 1
+popup/item_2/text = "+20 Cost:1,000"
+popup/item_2/id = 2
+popup/item_3/text = "+40 Cost: 10,000"
+popup/item_3/id = 3
+popup/item_4/text = "+60 Cost: 100,000"
+popup/item_4/id = 4
+popup/item_5/text = "+80 Cost: 1,000,000"
+popup/item_5/id = 5
+popup/item_6/text = "+100 Cost: 10,000,000"
+popup/item_6/id = 6
+popup/item_7/text = "+200 Cost: 100,000,000"
+popup/item_7/id = 7
+popup/item_8/text = "+400 Cost: 1,000,000,000"
+popup/item_8/id = 8
+
+[node name="PassiveUpgrades" type="MenuButton" parent="UI/CanvasLayer/Header"]
+visible = false
+layout_mode = 2
+text = "Passive Upgrades"
+item_count = 9
+popup/item_0/text = "2/s Cost: 100"
+popup/item_0/id = 0
+popup/item_1/text = "10/s Cost: 1,000"
+popup/item_1/id = 1
+popup/item_2/text = "20/s Cost: 10,000"
+popup/item_2/id = 2
+popup/item_3/text = "50/s Cost: 100,000"
+popup/item_3/id = 3
+popup/item_4/text = "100/s Cost:1,000,000"
+popup/item_4/id = 4
+popup/item_5/text = "200/s Cost: 10,000,000"
+popup/item_5/id = 5
+popup/item_6/text = "500/s Cost: 100,000,000"
+popup/item_6/id = 6
+popup/item_7/text = "1,000/s Cost: 1,000,000,000"
+popup/item_7/id = 7
+popup/item_8/text = "10,000/s Cost: 10,000,000,000"
+popup/item_8/id = 8
+
+[node name="TeamButton" type="Button" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "Team"
+flat = true
+alignment = 0
+script = ExtResource("3_2wxqa")
+
+[node name="Bossbutton" type="Button" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "Bosses"
+flat = true
+alignment = 0
+script = ExtResource("4_0lt4t")
+
+[node name="ClickAddLabel" type="Label" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "ClickAdd:"
+
+[node name="ClickAdd" type="Label" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "0"
+
+[node name="PerSecLabel" type="Label" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "PerSec:
+"
+
+[node name="PerSec" type="Label" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "0"
+
+[node name="MultiplierLabel" type="Label" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "Multiplier:
+"
+
+[node name="Multiplier" type="Label" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "0"
+
+[node name="BossFights" type="PanelContainer" parent="UI"]
+layout_mode = 0
+offset_left = 857.0
+offset_top = 294.0
+offset_right = 1049.0
+offset_bottom = 422.0
+
+[node name="BossGrid" type="GridContainer" parent="UI/BossFights"]
+layout_mode = 2
+script = ExtResource("5_1d3gb")
+
+[node name="Boss1" type="TextureButton" parent="UI/BossFights/BossGrid"]
+layout_mode = 2
+script = ExtResource("6_pp6ep")
+
+[node name="CharacterRoll" type="PanelContainer" parent="UI/BossFights/BossGrid"]
+visible = false
+layout_mode = 2
+script = ExtResource("7_7lppr")
diff --git a/team.tscn b/team.tscn
index d48060b..8309b06 100644
--- a/team.tscn
+++ b/team.tscn
@@ -1,26 +1,15 @@
-[gd_scene load_steps=8 format=3 uid="uid://blwuy4v4qqyna"]
+[gd_scene load_steps=11 format=3 uid="uid://blwuy4v4qqyna"]
 
-[ext_resource type="Script" path="res://TeamSelection.gd" id="1_gd8pa"]
-
-[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_8gi0c"]
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_f2pfc"]
-atlas = SubResource("CompressedTexture2D_8gi0c")
-region = Rect2(128, 0, 32, 32)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_g12ml"]
-atlas = SubResource("CompressedTexture2D_8gi0c")
-region = Rect2(96, 320, 32, 32)
-
-[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_yxbb2"]
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_d8eoy"]
-atlas = SubResource("CompressedTexture2D_yxbb2")
-region = Rect2(32, 416, 32, 32)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_ng453"]
-atlas = SubResource("CompressedTexture2D_yxbb2")
-region = Rect2(288, 416, 32, 32)
+[ext_resource type="Script" path="res://User Interface/Header.gd" id="1_ldil2"]
+[ext_resource type="Script" path="res://Root.gd" id="1_mv0o0"]
+[ext_resource type="Script" path="res://User Interface/TeamButton.gd" id="2_nwe87"]
+[ext_resource type="Script" path="res://User Interface/Bossbutton.gd" id="3_c1mhp"]
+[ext_resource type="Script" path="res://User Interface/AspectRatioContainer.gd" id="4_eqraq"]
+[ext_resource type="Script" path="res://User Interface/Member1.gd" id="5_574fx"]
+[ext_resource type="Script" path="res://User Interface/Member2.gd" id="6_a2aw7"]
+[ext_resource type="Script" path="res://User Interface/Member3.gd" id="7_o40hd"]
+[ext_resource type="Script" path="res://User Interface/Member4.gd" id="8_0l7ds"]
+[ext_resource type="Script" path="res://User Interface/Member5.gd" id="9_yaflp"]
 
 [node name="Root" type="Control"]
 layout_mode = 3
@@ -29,26 +18,172 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
+script = ExtResource("1_mv0o0")
 
-[node name="TeamSelection" type="GridContainer" parent="."]
-layout_mode = 0
+[node name="UI" type="Control" parent="."]
+layout_mode = 3
+anchors_preset = 0
 offset_right = 1920.0
 offset_bottom = 1080.0
-columns = 10
-script = ExtResource("1_gd8pa")
 
-[node name="TextureButton" type="TextureButton" parent="TeamSelection"]
-layout_mode = 2
-texture_normal = SubResource("AtlasTexture_f2pfc")
+[node name="CanvasLayer" type="CanvasLayer" parent="UI"]
 
-[node name="TextureButton2" type="TextureButton" parent="TeamSelection"]
-layout_mode = 2
-texture_normal = SubResource("AtlasTexture_g12ml")
+[node name="Header" type="HBoxContainer" parent="UI/CanvasLayer"]
+offset_left = 3.0
+offset_right = 395.0
+offset_bottom = 40.0
+script = ExtResource("1_ldil2")
 
-[node name="TextureButton3" type="TextureButton" parent="TeamSelection"]
+[node name="ScoreLabel" type="Label" parent="UI/CanvasLayer/Header"]
 layout_mode = 2
-texture_normal = SubResource("AtlasTexture_d8eoy")
+text = "Score:"
 
-[node name="TextureButton4" type="TextureButton" parent="TeamSelection"]
+[node name="Score" type="Label" parent="UI/CanvasLayer/Header"]
 layout_mode = 2
-texture_normal = SubResource("AtlasTexture_ng453")
+text = "0"
+
+[node name="Timer" type="Timer" parent="UI/CanvasLayer/Header"]
+autostart = true
+
+[node name="ClickUpgrades" type="MenuButton" parent="UI/CanvasLayer/Header"]
+visible = false
+layout_mode = 2
+text = "Click Upgrades"
+item_count = 9
+popup/item_0/text = "+1 Cost:10"
+popup/item_0/id = 0
+popup/item_1/text = "+10 Cost: 100"
+popup/item_1/id = 1
+popup/item_2/text = "+20 Cost:1,000"
+popup/item_2/id = 2
+popup/item_3/text = "+40 Cost: 10,000"
+popup/item_3/id = 3
+popup/item_4/text = "+60 Cost: 100,000"
+popup/item_4/id = 4
+popup/item_5/text = "+80 Cost: 1,000,000"
+popup/item_5/id = 5
+popup/item_6/text = "+100 Cost: 10,000,000"
+popup/item_6/id = 6
+popup/item_7/text = "+200 Cost: 100,000,000"
+popup/item_7/id = 7
+popup/item_8/text = "+400 Cost: 1,000,000,000"
+popup/item_8/id = 8
+
+[node name="PassiveUpgrades" type="MenuButton" parent="UI/CanvasLayer/Header"]
+visible = false
+layout_mode = 2
+text = "Passive Upgrades"
+item_count = 9
+popup/item_0/text = "2/s Cost: 100"
+popup/item_0/id = 0
+popup/item_1/text = "10/s Cost: 1,000"
+popup/item_1/id = 1
+popup/item_2/text = "20/s Cost: 10,000"
+popup/item_2/id = 2
+popup/item_3/text = "50/s Cost: 100,000"
+popup/item_3/id = 3
+popup/item_4/text = "100/s Cost:1,000,000"
+popup/item_4/id = 4
+popup/item_5/text = "200/s Cost: 10,000,000"
+popup/item_5/id = 5
+popup/item_6/text = "500/s Cost: 100,000,000"
+popup/item_6/id = 6
+popup/item_7/text = "1,000/s Cost: 1,000,000,000"
+popup/item_7/id = 7
+popup/item_8/text = "10,000/s Cost: 10,000,000,000"
+popup/item_8/id = 8
+
+[node name="TeamButton" type="Button" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "Team"
+flat = true
+alignment = 0
+script = ExtResource("2_nwe87")
+
+[node name="Bossbutton" type="Button" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "Bosses"
+flat = true
+alignment = 0
+script = ExtResource("3_c1mhp")
+
+[node name="ClickAddLabel" type="Label" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "ClickAdd:"
+
+[node name="ClickAdd" type="Label" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "0"
+
+[node name="PerSecLabel" type="Label" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "PerSec:
+"
+
+[node name="PerSec" type="Label" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "0"
+
+[node name="MultiplierLabel" type="Label" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "Multiplier:
+"
+
+[node name="Multiplier" type="Label" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "0"
+
+[node name="AspectRatioContainer" type="AspectRatioContainer" parent="UI"]
+layout_mode = 0
+offset_left = -2.60654
+offset_top = 271.396
+offset_right = 1917.39
+offset_bottom = 800.396
+script = ExtResource("4_eqraq")
+
+[node name="TeamScreen" type="HBoxContainer" parent="UI/AspectRatioContainer"]
+visibility_layer = 2
+layout_mode = 2
+alignment = 1
+
+[node name="Member1" type="TextureButton" parent="UI/AspectRatioContainer/TeamScreen"]
+custom_minimum_size = Vector2(200, 10)
+layout_mode = 2
+script = ExtResource("5_574fx")
+
+[node name="VSeparator" type="VSeparator" parent="UI/AspectRatioContainer/TeamScreen"]
+layout_mode = 2
+
+[node name="Member2" type="TextureButton" parent="UI/AspectRatioContainer/TeamScreen"]
+custom_minimum_size = Vector2(200, 10)
+layout_mode = 2
+script = ExtResource("6_a2aw7")
+
+[node name="VSeparator2" type="VSeparator" parent="UI/AspectRatioContainer/TeamScreen"]
+layout_mode = 2
+
+[node name="Member3" type="TextureButton" parent="UI/AspectRatioContainer/TeamScreen"]
+custom_minimum_size = Vector2(200, 10)
+layout_mode = 2
+script = ExtResource("7_o40hd")
+
+[node name="VSeparator3" type="VSeparator" parent="UI/AspectRatioContainer/TeamScreen"]
+layout_mode = 2
+
+[node name="Member4" type="TextureButton" parent="UI/AspectRatioContainer/TeamScreen"]
+custom_minimum_size = Vector2(200, 10)
+layout_mode = 2
+script = ExtResource("8_0l7ds")
+
+[node name="VSeparator4" type="VSeparator" parent="UI/AspectRatioContainer/TeamScreen"]
+layout_mode = 2
+
+[node name="Member5" type="TextureButton" parent="UI/AspectRatioContainer/TeamScreen"]
+custom_minimum_size = Vector2(200, 10)
+layout_mode = 2
+script = ExtResource("9_yaflp")
+
+[node name="Label" type="Label" parent="UI/AspectRatioContainer/TeamScreen"]
+visible = false
+layout_mode = 2
+text = "testtestsetsetsetsetsetsetset"
diff --git a/teamSelection.tscn b/teamSelection.tscn
new file mode 100644
index 0000000..de8cd0a
--- /dev/null
+++ b/teamSelection.tscn
@@ -0,0 +1,147 @@
+[gd_scene load_steps=7 format=3 uid="uid://jleorcxdlvge"]
+
+[ext_resource type="Script" path="res://Root.gd" id="1_8y42b"]
+[ext_resource type="Script" path="res://User Interface/Header.gd" id="2_mowpw"]
+[ext_resource type="Script" path="res://User Interface/TeamButton.gd" id="3_oxquv"]
+[ext_resource type="Script" path="res://User Interface/Bossbutton.gd" id="4_l25dw"]
+[ext_resource type="Script" path="res://TeamSelection.gd" id="5_3rdmh"]
+[ext_resource type="Script" path="res://MemberDatabase/MemberDatabase.gd" id="6_ukmgy"]
+
+[node name="Root" type="Control"]
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_right = 768.0
+offset_bottom = 432.0
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("1_8y42b")
+
+[node name="MemberDatabase" type="Control" parent="."]
+visible = false
+anchors_preset = 0
+offset_right = 40.0
+offset_bottom = 40.0
+script = ExtResource("6_ukmgy")
+
+[node name="UI" type="Control" parent="."]
+anchors_preset = 0
+offset_right = 1920.0
+offset_bottom = 1080.0
+
+[node name="CanvasLayer" type="CanvasLayer" parent="UI"]
+
+[node name="Header" type="HBoxContainer" parent="UI/CanvasLayer"]
+offset_left = 3.0
+offset_right = 395.0
+offset_bottom = 40.0
+script = ExtResource("2_mowpw")
+
+[node name="ScoreLabel" type="Label" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "Score:"
+
+[node name="Score" type="Label" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "0"
+
+[node name="Timer" type="Timer" parent="UI/CanvasLayer/Header"]
+autostart = true
+
+[node name="ClickUpgrades" type="MenuButton" parent="UI/CanvasLayer/Header"]
+visible = false
+layout_mode = 2
+text = "Click Upgrades"
+item_count = 9
+popup/item_0/text = "+1 Cost:10"
+popup/item_0/id = 0
+popup/item_1/text = "+10 Cost: 100"
+popup/item_1/id = 1
+popup/item_2/text = "+20 Cost:1,000"
+popup/item_2/id = 2
+popup/item_3/text = "+40 Cost: 10,000"
+popup/item_3/id = 3
+popup/item_4/text = "+60 Cost: 100,000"
+popup/item_4/id = 4
+popup/item_5/text = "+80 Cost: 1,000,000"
+popup/item_5/id = 5
+popup/item_6/text = "+100 Cost: 10,000,000"
+popup/item_6/id = 6
+popup/item_7/text = "+200 Cost: 100,000,000"
+popup/item_7/id = 7
+popup/item_8/text = "+400 Cost: 1,000,000,000"
+popup/item_8/id = 8
+
+[node name="PassiveUpgrades" type="MenuButton" parent="UI/CanvasLayer/Header"]
+visible = false
+layout_mode = 2
+text = "Passive Upgrades"
+item_count = 9
+popup/item_0/text = "2/s Cost: 100"
+popup/item_0/id = 0
+popup/item_1/text = "10/s Cost: 1,000"
+popup/item_1/id = 1
+popup/item_2/text = "20/s Cost: 10,000"
+popup/item_2/id = 2
+popup/item_3/text = "50/s Cost: 100,000"
+popup/item_3/id = 3
+popup/item_4/text = "100/s Cost:1,000,000"
+popup/item_4/id = 4
+popup/item_5/text = "200/s Cost: 10,000,000"
+popup/item_5/id = 5
+popup/item_6/text = "500/s Cost: 100,000,000"
+popup/item_6/id = 6
+popup/item_7/text = "1,000/s Cost: 1,000,000,000"
+popup/item_7/id = 7
+popup/item_8/text = "10,000/s Cost: 10,000,000,000"
+popup/item_8/id = 8
+
+[node name="TeamButton" type="Button" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "Team"
+flat = true
+alignment = 0
+script = ExtResource("3_oxquv")
+
+[node name="Bossbutton" type="Button" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "Bosses"
+flat = true
+alignment = 0
+script = ExtResource("4_l25dw")
+
+[node name="ClickAddLabel" type="Label" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "ClickAdd:"
+
+[node name="ClickAdd" type="Label" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "0"
+
+[node name="PerSecLabel" type="Label" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "PerSec:
+"
+
+[node name="PerSec" type="Label" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "0"
+
+[node name="MultiplierLabel" type="Label" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "Multiplier:
+"
+
+[node name="Multiplier" type="Label" parent="UI/CanvasLayer/Header"]
+layout_mode = 2
+text = "0"
+
+[node name="TeamSelection" type="GridContainer" parent="UI"]
+layout_mode = 0
+offset_left = 3.0
+offset_top = 40.0
+offset_right = 1923.0
+offset_bottom = 1120.0
+columns = 10
+script = ExtResource("5_3rdmh")