diff --git a/blockflow.gd b/blockflow.gd
index 87901da..4516781 100644
--- a/blockflow.gd
+++ b/blockflow.gd
@@ -7,6 +7,8 @@ const PluginConstants = preload("res://addons/blockflow/core/constants.gd")
 const Debugger = preload("res://addons/blockflow/debugger/debugger_messages.gd")
 ## Blockflow util scripts. Utility functions that didn't have place here.
 const Utils = preload("res://addons/blockflow/core/utils.gd")
+## Blockflow CommandRecord class. Used to manage registered commands in editor.
+const CommandRecord = preload("res://addons/blockflow/core/command_record.gd")
 
 # Made to ensure that classes are loaded before class_name populates editor
 ## [Collection] class.
diff --git a/core/command_record.gd b/core/command_record.gd
new file mode 100644
index 0000000..d818b56
--- /dev/null
+++ b/core/command_record.gd
@@ -0,0 +1,204 @@
+@tool
+## CommandRecord
+##
+## Object in charge of keep track of the registered commands
+## used by editor.
+
+## Emmited when [commands] is modified.
+signal command_list_changed
+
+const Constants = preload("res://addons/blockflow/core/constants.gd")
+const CommandClass = preload("res://addons/blockflow/commands/command.gd")
+
+## Registered and tracked commands. 
+## A duplicated array is returned when you get this value.
+var commands:Array:
+	get: return _commands.duplicate()
+
+# Registered and tracked commands
+var _commands:Array = []
+
+# script: [commands] <- 1:many
+var _scripts:Dictionary = {}
+
+# "path": command <- 1:1
+var _paths:Dictionary = {}
+
+# Little flag to prevent recursion in case we're
+# playing with project settings here.
+var _updating:bool = false
+
+## Get the command record "singleton".
+static func get_record() -> Object:
+	if not Engine.has_meta("CommandRecord"): 
+		return null
+	return (Engine.get_meta("CommandRecord", null) as WeakRef).get_ref()
+
+## Add a command to record.
+## [param command_data] can be [Script], [Command] or a path.
+func register(command_data:Variant, update_project_settings:bool = true) -> void:
+	var command:CommandClass
+	var command_path:String
+	var command_script:Script
+	
+	if typeof(command_data) == TYPE_STRING:
+		command_path = command_data
+		if not ResourceLoader.exists(command_path):
+			push_error(
+				"CommandRecord: Can't load resource at '%s'" % command_path
+				)
+			return
+		
+		if command_path in _paths:
+			# There's already a command registered at that path.
+			return
+		
+		command_data = load(command_path)
+	
+	if command_data is Script:
+		command_script = command_data
+		command_path = command_data.resource_path
+		command_data = command_script.new()
+		
+	if command_data is CommandClass:
+		command = command_data
+		if command in _commands:
+			return
+	else:
+		push_error("CommandRecord: %s is not a valid type" % command_data )
+		return
+	
+	_updating = true
+	
+	# Register in commands
+	_commands.append(command)
+	
+	# Validate and register in scripts
+	if not command_script:
+		command_script = command.get_script()
+	
+	if not command_script in _scripts:
+		var scripts:Array = _scripts.get(command_script, [])
+		scripts.append(command)
+		_scripts[command_script] = scripts
+	
+	if not command in _scripts[command_script]:
+		_scripts[command_script].append(command)
+	
+	if command_path.is_empty():
+		command_path = command.resource_path
+	
+	if not command_path in _paths:
+		_paths[command_path] = command
+	
+	if update_project_settings:
+		var custom_command_paths:PackedStringArray =\
+		ProjectSettings.get_setting(Constants.PROJECT_SETTING_CUSTOM_COMMANDS, PackedStringArray())
+		custom_command_paths.append(command_path)
+		ProjectSettings.set_setting(Constants.PROJECT_SETTING_CUSTOM_COMMANDS, custom_command_paths)
+		if Engine.is_editor_hint():
+			var error := ProjectSettings.save()
+			if error:
+				push_error("CommandRecord: %s while saving ProjectSettings" % error_string(error))
+	
+	command_list_changed.emit()
+	
+	_updating = false
+
+## Removes the command from record
+func unregister(command_data:Variant) -> void:
+	var command:CommandClass
+	var command_path:String
+	var command_script:Script
+	
+	if command_data is Script:
+		command_script = command_data
+		
+		_updating = true
+		
+		for c in _scripts.get(command_script, []):
+			command = c
+			command_path = command.resource_path
+			_commands.erase(command)
+			_paths.erase(command_path)
+		
+		_scripts.erase(command_script)
+		
+		command_list_changed.emit()
+		
+		_updating = false
+		return
+	
+	
+	if typeof(command_data) == TYPE_STRING:
+		command_path = command_data
+		command = _paths.get(command_path)
+		command_script = command.get_script()
+	
+	if command_data is CommandClass:
+		command = command_data
+		command_path = command.resource_path
+		command_script = command.get_script()
+	
+	_updating = true
+	
+	_commands.erase(command)
+	_paths.erase(command_path)
+	_scripts.get(command_script, []).erase(command)
+	
+	command_list_changed.emit()
+	
+	_updating = false
+
+
+func reload_from_project_settings() -> void:
+	if _updating:
+		return
+	
+	if not ProjectSettings.has_setting(Constants.PROJECT_SETTING_CUSTOM_COMMANDS):
+		ProjectSettings.set_setting(Constants.PROJECT_SETTING_CUSTOM_COMMANDS, PackedStringArray())
+		var setting_info:Dictionary = {
+			"name": Constants.PROJECT_SETTING_CUSTOM_COMMANDS,
+			"type": TYPE_PACKED_STRING_ARRAY,
+			"hint": PROPERTY_HINT_FILE, # TODO: Find a way to show a file selector
+			"hint_string": "*.gd"
+		}
+		ProjectSettings.add_property_info(setting_info)
+		ProjectSettings.save()
+	
+	var new_paths:PackedStringArray = ProjectSettings.get_setting(Constants.PROJECT_SETTING_CUSTOM_COMMANDS, [])
+	
+	if PackedStringArray(_paths.keys()) == new_paths:
+		# Same paths, probably, no need to update anything.
+		return
+	
+	_commands.clear()
+	_scripts.clear()
+	_paths.clear()
+	
+	_register_default_commands()
+	
+	for path in new_paths:
+		_updating = true
+		register(path, false)
+		_updating = false
+
+
+func _register_default_commands() -> void:
+	for command_path in Constants.DEFAULT_COMMAND_PATHS:
+		_updating = true
+		register(command_path, false)
+		_updating = false
+
+
+func _init() -> void:
+	if is_instance_valid(get_record()):
+		push_error("A CommandRecord already exist!")
+		return
+	
+	_updating = true
+	reload_from_project_settings()
+	_updating = false
+	
+	# Let's not contribute to reference counter, shall we?
+	Engine.set_meta("CommandRecord", weakref(self))
diff --git a/core/constants.gd b/core/constants.gd
index 0c4666d..1470e61 100644
--- a/core/constants.gd
+++ b/core/constants.gd
@@ -4,6 +4,7 @@ const NAME = &"Blockflow"
 const PLUGIN_NAME = &"BlockflowPlugin"
 
 const COMMAND_FOLDER = &"res://addons/blockflow/commands"
+const TEMPLATE_FOLDER = &"res://command_templates"
 
 const DEFAULT_COMMAND_PATHS = [
 	"res://addons/blockflow/commands/command_call.gd",
diff --git a/core/plugin_script.gd b/core/plugin_script.gd
index 4b42f03..c5c05f4 100644
--- a/core/plugin_script.gd
+++ b/core/plugin_script.gd
@@ -32,6 +32,8 @@ var debugger:BlockflowDebugger
 
 var theme:Theme = load(EditorConstants.DEFAULT_THEME_PATH) as Theme
 
+var command_record:Blockflow.CommandRecord
+
 func toast(message:String, severity:int = 0, tooltip:String = ""):
 	if not is_inside_tree():
 		return
@@ -40,20 +42,6 @@ func toast(message:String, severity:int = 0, tooltip:String = ""):
 	
 	editor_toaster.call("_popup_str", message, severity, tooltip)
 
-func _enable_plugin() -> void:
-	if not ProjectSettings.has_setting(Constants.PROJECT_SETTING_CUSTOM_COMMANDS):
-		ProjectSettings.set_setting(Constants.PROJECT_SETTING_CUSTOM_COMMANDS, [])
-	var setting_info:Dictionary = {
-		"name": Constants.PROJECT_SETTING_CUSTOM_COMMANDS,
-		"type": TYPE_PACKED_STRING_ARRAY,
-		"hint": PROPERTY_HINT_FILE,
-		"hint_string": "*.gd"
-	}
-	ProjectSettings.add_property_info(setting_info)
-	
-	
-	ProjectSettings.save()
-
 func _enter_tree():
 	_define_toaster()
 	block_editor.toast_callback = toast
@@ -122,9 +110,6 @@ func _define_toaster() -> void:
 	remove_control_from_bottom_panel(dummy)
 	dummy.queue_free()
 
-func _project_settings_changed() -> void:
-	block_editor.command_list.build_command_list()
-
 func _exit_tree():
 	queue_save_layout()
 	block_editor.queue_free()
@@ -163,10 +148,11 @@ func _init() -> void:
 	command_call_inspector = CommandCallInspector.new()
 	command_call_inspector.editor_plugin = self
 	
-	project_settings_changed.connect(_project_settings_changed)
-	
 	debugger = BlockflowDebugger.new()
 	
 	# Add the plugin to the list when we're created as soon as possible.
 	# Existing doesn't mean that plugin is ready, be careful with that.
 	Engine.set_meta(Constants.PLUGIN_NAME, self)
+	
+	command_record = Blockflow.CommandRecord.new()
+	project_settings_changed.connect(command_record.reload_from_project_settings)