diff --git a/addons/accessibility/accessibility.gd b/addons/accessibility/accessibility.gd
index 0e4485e..d9ed5b7 100644
--- a/addons/accessibility/accessibility.gd
+++ b/addons/accessibility/accessibility.gd
@@ -5,13 +5,18 @@ var Accessible = preload("accessible.gd")
 
 func augment_node(node):
     if node is Control:
-        node.set_focus_mode(Control.FOCUS_ALL)
         Accessible.new(node)
 
+func augment_tree(node):
+    augment_node(node)
+    for child in node.get_children():
+        augment_node(child)
+
 func set_initial_screen_focus(screen):
     print("Screen ",screen)
     var focus
     var root = get_tree().root
+    augment_tree(root)
     if screen == "3D":
         focus = root.find_node("ToolButton", true, false)
     print("Focus ",focus)
diff --git a/addons/accessibility/accessible.gd b/addons/accessibility/accessible.gd
index c5a7eec..ffb1df6 100644
--- a/addons/accessibility/accessible.gd
+++ b/addons/accessibility/accessible.gd
@@ -3,10 +3,10 @@ extends Object
 var node
 
 func focused():
-    print("Focus entered.")
+    print("Focus entered.", self.node)
 
 func unfocused():
-    print("Unfocused")
+    print("Unfocused", self.node)
 
 func gui_input():
     print("GUI input.")
@@ -15,8 +15,9 @@ func _init(node):
     if node.is_in_group("accessible"):
         return
     node.add_to_group("accessible")
-    # print(node.get_path())
+    print(node.get_path())
     self.node = node
+    self.node.set_focus_mode(Control.FOCUS_ALL)
     self.node.connect("focus_entered", self, "focused")
     self.node.connect("mouse_entered", self, "focused")
     self.node.connect("focus_exited", self, "unfocused")