diff --git a/scenes/lobby.tscn b/scenes/lobby.tscn
index 76e968f..9ec12fa 100644
--- a/scenes/lobby.tscn
+++ b/scenes/lobby.tscn
@@ -3,17 +3,17 @@
 [ext_resource path="res://scripts/lobby.gd" type="Script" id=1]
 [ext_resource path="res://scripts/hero_select.gd" type="Script" id=2]
 
-[sub_resource type="DynamicFontData" id=2]
+[sub_resource type="DynamicFontData" id=1]
 
 font_path = "res://assets/DejaVuSansMono.ttf"
 _sections_unfolded = [ "Resource" ]
 
-[sub_resource type="DynamicFont" id=1]
+[sub_resource type="DynamicFont" id=2]
 
 size = 16
 use_mipmaps = false
 use_filter = false
-font_data = SubResource( 2 )
+font_data = SubResource( 1 )
 _sections_unfolded = [ "Font", "Resource", "Settings" ]
 
 [node name="Control" type="Control" index="0"]
@@ -386,7 +386,7 @@ mouse_filter = 2
 mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 4
-custom_fonts/font = SubResource( 1 )
+custom_fonts/font = SubResource( 2 )
 text = "Waiting for players to connect...."
 percent_visible = 1.0
 lines_skipped = 0
diff --git a/scripts/lobby.gd b/scripts/lobby.gd
index d718304..ee2ca8f 100644
--- a/scripts/lobby.gd
+++ b/scripts/lobby.gd
@@ -20,6 +20,8 @@ func _ready():
 
 	get_tree().connect("network_peer_connected", self, "_player_connected")
 	get_tree().connect("connected_to_server", self, "_connected_ok")
+	
+	get_node("HeroSelect").connect("item_selected", self, "select_hero")
 
 func _client_init():
 	collect_info()
@@ -73,6 +75,13 @@ remote func register_player(new_peer, info):
 		if (player_info.size() == MAX_PLAYERS):
 			start_game()
 
+func select_hero(hero):
+	rpc("set_hero", get_tree().get_network_unique_id(), hero)
+
+sync func set_hero(peer, hero):
+	player_info[peer].hero = hero
+	render_player_list()
+
 func render_player_list():
 	var list = ""
 	var hero_names = get_node("HeroSelect").hero_names