From b0b742b53f517caaaed7489801a17a59d865fc9a Mon Sep 17 00:00:00 2001
From: GsLogiMaker <gslogimaker@gmail.com>
Date: Tue, 3 Dec 2024 16:01:57 -0600
Subject: [PATCH 1/3] Tweak entity instantiations to use `new()` instead of
 `spawn()`

---
 cpp/src/component.cpp                        | 45 +++++++++++-----
 cpp/src/component.h                          | 11 +++-
 cpp/src/doc_classes/GFComponent.xml          | 11 ++--
 cpp/src/doc_classes/GFEntity.xml             | 57 ++++++++++----------
 cpp/src/doc_classes/GFPair.xml               |  6 ---
 cpp/src/doc_classes/GFRegisterableEntity.xml |  8 +++
 cpp/src/doc_classes/GFWorld.xml              | 14 ++---
 cpp/src/entity.cpp                           | 25 +++++++--
 cpp/src/entity.h                             | 51 ++++++++++--------
 cpp/src/module.cpp                           | 12 +++--
 cpp/src/module.h                             | 35 ++++++++++--
 cpp/src/pair.cpp                             |  8 ---
 cpp/src/pair.h                               |  1 -
 cpp/src/querylike_builder.cpp                |  6 ++-
 cpp/src/register_types.cpp                   |  2 +-
 cpp/src/registerable_entity.cpp              | 19 ++++---
 cpp/src/registerable_entity.h                | 10 ++--
 examples/asteroids/asteroids.gd              |  9 ++--
 unittests/test_components.gd                 | 15 +++---
 unittests/test_ecs_world.gd                  | 12 ++---
 unittests/test_entities.gd                   | 16 +++---
 unittests/test_errors.gd                     |  4 +-
 unittests/test_events.gd                     | 20 +++----
 unittests/test_module_rendering_2d.gd        |  2 +-
 unittests/test_prefab.gd                     |  2 +-
 unittests/test_queries.gd                    | 18 +++----
 unittests/test_registration.gd               |  4 +-
 unittests/test_relations.gd                  | 20 +++----
 unittests/test_simple_systems.gd             | 20 +++----
 unittests/test_systems.gd                    |  6 +--
 utils/glecs_tests_runner.gd                  |  2 -
 31 files changed, 272 insertions(+), 199 deletions(-)

diff --git a/cpp/src/component.cpp b/cpp/src/component.cpp
index c8a1e8f..3528f62 100644
--- a/cpp/src/component.cpp
+++ b/cpp/src/component.cpp
@@ -3,6 +3,7 @@
 #include "component_builder.h"
 #include "entity.h"
 #include "godot_cpp/classes/wrapped.hpp"
+#include "godot_cpp/core/error_macros.hpp"
 #include "godot_cpp/variant/array.hpp"
 #include "godot_cpp/variant/dictionary.hpp"
 #include "godot_cpp/variant/packed_int64_array.hpp"
@@ -24,27 +25,38 @@ GFComponent::GFComponent() {
 GFComponent::~GFComponent() {
 }
 
-Ref<GFComponent> GFComponent::spawn(GFWorld* world_) {
-	ERR(NULL,
-		"Could not instantiate ", get_class_static(), "\n",
-		"Use ", get_class_static(), ".from or ",
-		get_class_static(), ".from_id instead."
-	);
-}
 Ref<GFComponent> GFComponent::from(Variant comp, Variant entity, GFWorld* world) {
 	return from_id(world->coerce_id(comp), world->coerce_id(entity), world);
 }
 Ref<GFComponent> GFComponent::from_id(ecs_entity_t comp, ecs_entity_t entity, GFWorld* world) {
-	const EcsComponent* comp_ptr = GFComponent::get_component_ptr(world, comp);
-	if (comp_ptr == nullptr) {
+	const EcsComponent* comp_data = GFComponent::get_component_ptr(world, comp);
+	if (comp_data == nullptr) {
 		ERR(nullptr,
 			"Could not instantiate ", get_class_static(), "\n",
 			"	Entity ", world->id_to_text(comp), " is not a component"
 		);
 	}
-	Ref<GFComponent> component = from_id_template<GFComponent>(comp, world);
-	component->set_source_id(entity);
-	return component;
+	Ref<GFComponent> comp_ref = Ref(memnew(GFComponent));
+	comp_ref->source_entity_id = entity;
+	comp_ref->set_id(comp);
+	comp_ref->set_world(world);
+	return setup_template<GFComponent>(comp_ref);
+}
+
+Ref<GFComponent> GFComponent::from_id_no_source(ecs_entity_t comp, GFWorld* world) {
+	const EcsComponent* comp_data = GFComponent::get_component_ptr(world, comp);
+	if (comp_data == nullptr) {
+		ERR(nullptr,
+			"Could not instantiate ", get_class_static(), "\n",
+			"	Entity ", world->id_to_text(comp), " is not a component"
+		);
+	}
+	Ref<GFComponent> comp_ref = Ref(memnew(GFComponent));
+	comp_ref->source_entity_id = 0;
+	comp_ref->set_id(comp);
+	comp_ref->set_world(world);
+	comp_ref->update_script();
+	return comp_ref;
 }
 
 void GFComponent::_register_internal() {
@@ -231,6 +243,13 @@ Variant GFComponent::member_value_as_type(
 	throw "Unreachable";
 }
 
+String GFComponent::to_string() {
+	return String("[#")
+		+ String::num_int64(get_source_id())
+		+ "--" + String::num_int64(get_id())
+		+ "]";
+}
+
 Ref<GFEntity> GFComponent::get_source_entity() {
 	return GFEntity::from(get_source_id(), get_world());
 }
@@ -362,7 +381,6 @@ void GFComponent::_bind_methods() {
 	GDVIRTUAL_BIND(_build, "b");
 	godot::ClassDB::bind_method(D_METHOD("_register_internal"), &GFComponent::_register_internal);
 
-	godot::ClassDB::bind_static_method(GFComponent::get_class_static(), D_METHOD("spawn", "world"), &GFComponent::spawn, nullptr);
 	godot::ClassDB::bind_static_method(GFComponent::get_class_static(), D_METHOD("from", "component", "world"), &GFComponent::from, nullptr);
 	godot::ClassDB::bind_static_method(GFComponent::get_class_static(), D_METHOD("from_id", "id", "world"), &GFComponent::from_id, nullptr);
 
@@ -374,6 +392,7 @@ void GFComponent::_bind_methods() {
 	godot::ClassDB::bind_method(D_METHOD("get_data_size"), &GFComponent::get_data_size);
 	godot::ClassDB::bind_method(D_METHOD("get_data_alignment"), &GFComponent::get_data_alignment);
 	godot::ClassDB::bind_method(D_METHOD("is_alive"), &GFComponent::is_alive);
+	godot::ClassDB::bind_method(D_METHOD("_to_string"), &GFComponent::to_string);
 
 	godot::ClassDB::bind_static_method(get_class_static(), D_METHOD("_new_internal"), &GFComponent::new_internal);
 }
diff --git a/cpp/src/component.h b/cpp/src/component.h
index 4926047..da79f99 100644
--- a/cpp/src/component.h
+++ b/cpp/src/component.h
@@ -19,9 +19,15 @@ namespace godot {
 
 	public:
 		GFComponent();
+		GFComponent(ecs_entity_t component, GFWorld* world):
+			GFRegisterableEntity(component, world) {
+				update_script();
+			}
 		GFComponent(ecs_entity_t entity, ecs_entity_t component, GFWorld* world):
 			source_entity_id(entity),
-			GFRegisterableEntity(component, world) {}
+			GFRegisterableEntity(component, world) {
+				update_script();
+			}
 		~GFComponent();
 
 		// --------------------------------------
@@ -30,9 +36,9 @@ namespace godot {
 
 		GDVIRTUAL1(_build, Ref<GFComponentBuilder>)
 
-		static Ref<GFComponent> spawn(GFWorld*);
 		static Ref<GFComponent> from(Variant c, Variant e, GFWorld*);
 		static Ref<GFComponent> from_id(ecs_entity_t c, ecs_entity_t e, GFWorld*);
+		static Ref<GFComponent> from_id_no_source(ecs_entity_t comp, GFWorld* world);
 
 		Variant getm(String);
 		void setm(String, Variant);
@@ -43,6 +49,7 @@ namespace godot {
 		int get_data_alignment();
 
 		bool is_alive();
+		String to_string();
 
 		// --------------------------------------
 		// --- Unexposed
diff --git a/cpp/src/doc_classes/GFComponent.xml b/cpp/src/doc_classes/GFComponent.xml
index dd45159..e61f0c1 100644
--- a/cpp/src/doc_classes/GFComponent.xml
+++ b/cpp/src/doc_classes/GFComponent.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GFComponent" inherits="GFRegisterableEntity"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/godotengine/godot/master/doc/class.xsd">
+<class name="GFComponent" inherits="GFRegisterableEntity" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/godotengine/godot/master/doc/class.xsd">
 	<brief_description>
 		A reference to a Glecs component from a [GFWorld] that is attatached to an entity.
 	</brief_description>
@@ -30,7 +29,7 @@
 				Returns a [GFEntity] reference to the entity this component's data is from.
 				[codeblock]
 				var Vector2C = GFEntity.from("glecs/meta/Vector2")
-				var entity = GFEntity.spawn()
+				var entity = GFEntity.new()
 				entity.add_component(Vector2C)
 				var vec2 = entity.get_component(Vector2C)
 
@@ -44,7 +43,7 @@
 				Returns the ID of the entity that this component's data is from.
 				[codeblock]
 				var Vector2C = GFEntity.from("glecs/meta/Vector2")
-				var entity = GFEntity.spawn()
+				var entity = GFEntity.new()
 				entity.add_component(Vector2C)
 				var vec2 = entity.get_component(Vector2C)
 
@@ -58,7 +57,7 @@
 			<description>
 				Returns the value of a component's member.
 				[codeblock]
-				var entity = GFEntity.spawn()
+				var entity = GFEntity.new()
 				entity.add_component("glecs/meta/Vector2")
 				var vec2 = entity.get_component("glecs/meta/Vector2")
 
@@ -73,7 +72,7 @@
 			<description>
 				Sets the value of a component's member.
 				[codeblock]
-				var entity = GFEntity.spawn()
+				var entity = GFEntity.new()
 				entity.add_component("glecs/meta/Vector2")
 				var vec2 = entity.get_component("glecs/meta/Vector2")
 
diff --git a/cpp/src/doc_classes/GFEntity.xml b/cpp/src/doc_classes/GFEntity.xml
index 358f239..a146cf5 100644
--- a/cpp/src/doc_classes/GFEntity.xml
+++ b/cpp/src/doc_classes/GFEntity.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GFEntity" inherits="RefCounted"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/godotengine/godot/master/doc/class.xsd">
+<class name="GFEntity" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/godotengine/godot/master/doc/class.xsd">
 	<brief_description>
 		A reference to an entity from a [GFWorld].
 	</brief_description>
@@ -17,7 +16,7 @@
 				Adds component data of type [param component] to this entity.
 				The component's type ID is coerced from a [Variant]. To learn more about [Variant] coercion see [method GFWorld.coerce_id].
 				[codeblock]
-				var entity:= GFEntity.spawn()
+				var entity:= GFEntity.new()
 				entity.add_component(GFPosition2D, Vector2(10, 10))
 				entity.get_component(GFPosition2D).get_vec() == Vector2(10, 10) # true
 				[/codeblock]
@@ -33,7 +32,7 @@
 				this entity.
 				The component's type ID is coerced from a [Variant]. To learn more about [Variant] coercion see [method GFWorld.coerce_id].
 				[codeblock]
-				var entity:= GFEntity.spawn()
+				var entity:= GFEntity.new()
 				entity.add_pair(GFPosition2D, Vector2(10, 10))
 				entity.get_pair(GFPosition2D).get_vec() == Vector2(10, 10) # true
 				[/codeblock]
@@ -72,7 +71,7 @@
 				Returns a reference to this entity's component's data of type [param component].
 				Returns [code]null[/code] if the entity does not have the [param component] attached or if [param component] is not a component. The component is identified by an ID coerced from a [Variant]. To learn more about [Variant] coercion see [method GFWorld.coerce_id].
 				[codeblock]
-				var entity:= GFEntity.spawn()
+				var entity:= GFEntity.new()
 				entity.add_component("glecs/meta/Array")
 				entity.get_component("glecs/meta/Array") != null # true
 				[/codeblock]
@@ -93,7 +92,7 @@
 			<description>
 				Returns the name of this entity.
 				[codeblock]
-				var entity:= GFEntity.spawn()
+				var entity:= GFEntity.new()
 				entity.set_name("Entity")
 				entity.get_name() == "Entity" # true
 				[/codeblock]
@@ -108,7 +107,7 @@
 				of [param first] and [param second].
 				Returns [code]null[/code] if the entity does not have the [param component] attached or if [param component] is not a component. The component is identified by an ID coerced from a [Variant]. To learn more about [Variant] coercion see [method GFWorld.coerce_id].
 				[codeblock]
-				var entity:= GFEntity.spawn()
+				var entity:= GFEntity.new()
 				entity.add_component("glecs/meta/Array")
 				entity.get_component("glecs/meta/Array") != null # true
 				[/codeblock]
@@ -120,7 +119,7 @@
 				Returns the world this entity is from.
 				[codeblock]
 				var world:= GFWorld.new()
-				var entity:= GFEntity.spawn(world)
+				var entity:= GFEntity.new_in_world(world)
 				entity.get_world() == world # true
 				[/codeblock]
 			</description>
@@ -130,7 +129,7 @@
 			<description>
 				Returns [code]true[/code] if this entity is still alive.
 				[codeblock]
-				var entity:= GFEntity.spawn()
+				var entity:= GFEntity.new()
 				entity.is_alive() # true
 				entity.delete()
 				entity.is_alive() # false
@@ -148,14 +147,25 @@
 				[/codeblock]
 			</description>
 		</method>
+		<method name="new_in_world" qualifiers="static">
+			<return type="GFEntity" />
+			<param index="0" name="world" type="GFWorld" />
+			<description>
+				Returns a reference to a new entity created within [param world].
+				[codeblock]
+				var world:= GFWorld.new()
+				var entity:= GFEntity.new_in_world(world)
+				[/codeblock]
+			</description>
+		</method>
 		<method name="pair">
 			<return type="GFPair" />
 			<param index="0" name="second" type="Variant" />
 			<description>
 				Creates a [GFPair] from this entity and [param second].
 				[codeblock]
-				var Eats:= GFEntity.spawn()
-				var Grass:= GFEntity.spawn()
+				var Eats:= GFEntity.new()
+				var Grass:= GFEntity.new()
 				var EatsGrass:GFPair = Eats.pair(Grass)
 				[/codeblock]
 			</description>
@@ -166,8 +176,8 @@
 			<description>
 				Creates a pair ID from this entity and [param second_id].
 				[codeblock]
-				var Eats:= GFEntity.spawn()
-				var Grass:= GFEntity.spawn()
+				var Eats:= GFEntity.new()
+				var Grass:= GFEntity.new()
 				var EatsGrass_id:int = Eats.pair_id(Grass.get_id())
 				[/codeblock]
 			</description>
@@ -179,7 +189,7 @@
 				Sets component data of type [param component] in this entity.
 				The component's type ID is coerced from a [Variant]. To learn more about [Variant] coercion see [method GFWorld.coerce_id].
 				[codeblock]
-				var entity:= GFEntity.spawn()
+				var entity:= GFEntity.new()
 				entity.add_component(GFPosition2D)
 				entity.set_component(GFPosition2D, Vector2(10, 10))
 				entity.get_component(GFPosition2D).get_vec() == Vector2(10, 10) # true
@@ -187,7 +197,7 @@
 				If the component is not added yet, then this method will add
 				it automaticly.
 				[codeblock]
-				var entity:= GFEntity.spawn()
+				var entity:= GFEntity.new()
 				entity.set_component(GFPosition2D, Vector2(10, 10))
 				entity.get_component(GFPosition2D).get_vec() == Vector2(10, 10) # true
 				[/codeblock]
@@ -200,7 +210,7 @@
 			<description>
 				Sets the name of this entity.
 				[codeblock]
-				var entity:= GFEntity.spawn()
+				var entity:= GFEntity.new()
 				entity.set_name("Entity")
 				entity.get_name() == "Entity" # true
 				[/codeblock]
@@ -216,8 +226,8 @@
 				[param second].
 				The component's type ID is coerced from a [Variant]. To learn more about [Variant] coercion see [method GFWorld.coerce_id].
 				[codeblock]
-				var start:= GFEntity.spawn().set_name("Start")
-				var entity:= GFEntity.spawn()
+				var start:= GFEntity.new().set_name("Start")
+				var entity:= GFEntity.new()
 				# Pair will be added if it is not already.
 				entity.set_pair(start, GFPosition2D, Vector2(10, 10))
 				entity.get_pair(start, GFPosition2D).get_vec() == Vector2(10, 10) # true
@@ -225,16 +235,5 @@
 				This method returns [code]self[/code] for chaining.
 			</description>
 		</method>
-		<method name="spawn" qualifiers="static">
-			<return type="GFEntity" />
-			<param index="0" name="world" type="GFWorld" default="null" />
-			<description>
-				Creates a new entity ID and returns it.
-				If no world is specified, a default world is used.
-				[codeblock]
-				var entity:= GFEntity.spawn()
-				[/codeblock]
-			</description>
-		</method>
 	</methods>
 </class>
diff --git a/cpp/src/doc_classes/GFPair.xml b/cpp/src/doc_classes/GFPair.xml
index b7f1c30..a27f641 100644
--- a/cpp/src/doc_classes/GFPair.xml
+++ b/cpp/src/doc_classes/GFPair.xml
@@ -92,11 +92,5 @@
 				[/codeblock]
 			</description>
 		</method>
-		<method name="spawn" qualifiers="static">
-			<return type="GFPair" />
-			<description>
-				Do not call, pairs can not be instantiated. Use [method GFPair.from] instead. Overrides [method GFEntity.spawn].
-			</description>
-		</method>
 	</methods>
 </class>
diff --git a/cpp/src/doc_classes/GFRegisterableEntity.xml b/cpp/src/doc_classes/GFRegisterableEntity.xml
index 046fc72..b048b16 100644
--- a/cpp/src/doc_classes/GFRegisterableEntity.xml
+++ b/cpp/src/doc_classes/GFRegisterableEntity.xml
@@ -21,5 +21,13 @@
 				[/codeblock]
 			</description>
 		</method>
+		<method name="new_in_world" qualifiers="static">
+			<return type="GFRegisterableEntity" />
+			<param index="0" name="world" type="GFWorld" />
+			<description>
+				[GFRegisterableEntity] can't be instantiated.
+				Overrides [method GFEntity.new_in_world] to throw an error
+			</description>
+		</method>
 	</methods>
 </class>
diff --git a/cpp/src/doc_classes/GFWorld.xml b/cpp/src/doc_classes/GFWorld.xml
index 67a93c9..49e7fef 100644
--- a/cpp/src/doc_classes/GFWorld.xml
+++ b/cpp/src/doc_classes/GFWorld.xml
@@ -33,8 +33,8 @@
 				This example shows a coercion from a [Vector2i]:
 				[codeblock]
 				var world:= GFWorld.new()
-				var Eats:= GFEntity.spawn(world)
-				var Carrots:= GFEntity.spawn(world)
+				var Eats:= GFEntity.new_in_world(world)
+				var Carrots:= GFEntity.new_in_world(world)
 				var pair:= Vector2i(Eats.get_id(), Carrots.get_id())
 				world.coerce_id(pair) == world.pair(Eats, Carrots) # true
 				[/codeblock]
@@ -101,8 +101,8 @@
 				To learn more about [Variant] coercion see [method GFWorld.coerce_id].
 				[codeblock]
 				var world:= GFWorld.new()
-				var Attacks_tag:= GFEntity.spawn()
-				var Players_tag:= GFEntity.spawn()
+				var Attacks_tag:= GFEntity.new_in_world(world)
+				var Players_tag:= GFEntity.new_in_world(world)
 				world.pair(Attacks_tag, Players_tag)
 				[/codeblock]
 			</description>
@@ -115,8 +115,8 @@
 				Creates and returns a pair ID from two IDs.
 				[codeblock]
 				var world:= GFWorld.new()
-				var Attacks_tag:= GFEntity.spawn()
-				var Player_tag:= GFEntity.spawn()
+				var Attacks_tag:= GFEntity.new_in_world(world)
+				var Player_tag:= GFEntity.new_in_world(world)
 				world.pair_ids(Attacks_tag.get_id(), Player_tag.get_id())
 				[/codeblock]
 			</description>
@@ -150,7 +150,7 @@
 			</description>
 		</method>
 		<method name="register_script">
-			<return type="void" />
+			<return type="GFRegisterableEntity" />
 			<param index="0" name="script" type="Script" />
 			<description>
 				Registers a [Script] that derives from [GFRegisterableEntity].
diff --git a/cpp/src/entity.cpp b/cpp/src/entity.cpp
index bb9fb36..add2a57 100644
--- a/cpp/src/entity.cpp
+++ b/cpp/src/entity.cpp
@@ -1,6 +1,7 @@
 
 #include "entity.h"
 #include "godot_cpp/classes/script.hpp"
+#include "godot_cpp/core/memory.hpp"
 #include "godot_cpp/variant/array.hpp"
 #include "utils.h"
 // needed here because entity.h does not include
@@ -13,23 +14,30 @@
 #include <godot_cpp/core/class_db.hpp>
 #include <godot_cpp/variant/utility_functions.hpp>
 #include "godot_cpp/variant/variant.hpp"
+#include "world.h"
 
 using namespace godot;
 
 GFEntity::GFEntity() {
+	GFWorld* world = GFWorld::singleton();
+	id = ecs_new(world->raw());
+	world_instance_id = world->get_instance_id();
+}
+GFEntity::GFEntity(GFWorld* world) {
+	id = ecs_new(world->raw());
+	world_instance_id = world->get_instance_id();
 }
 GFEntity::~GFEntity() {
 }
 
-Ref<GFEntity> GFEntity::spawn(GFWorld* world_) {
-	GFWorld* world = GFWorld::world_or_singleton(world_);
-	return from_id(ecs_new(world->raw()), world);
+Ref<GFEntity> GFEntity::new_in_world(GFWorld* world) {
+	return memnew(GFEntity(world));
 }
 Ref<GFEntity> GFEntity::from(Variant entity, GFWorld* world) {
 	return from_id(world->coerce_id(entity), world);
 }
 Ref<GFEntity> GFEntity::from_id(ecs_entity_t id, GFWorld* world) {
-	return from_id_template<GFEntity>(id, world);
+	return setup_template<GFEntity>(memnew(GFEntity(id, world)));
 }
 
 Ref<GFEntity> GFEntity::add_component(
@@ -367,6 +375,12 @@ ecs_entity_t GFEntity::pair_id(ecs_entity_t second) {
 	return get_world()->pair_ids(get_id(), second);
 }
 
+String GFEntity::to_string() {
+	return String("[#")
+		+ String::num_int64(get_id())
+		+ "]";
+}
+
 // ----------------------------------------------
 // --- Unexposed ---
 // ----------------------------------------------
@@ -375,7 +389,7 @@ void GFEntity::set_id(ecs_entity_t value) { id = value; }
 void GFEntity::set_world(GFWorld* value) { world_instance_id = value->get_instance_id(); }
 
 void GFEntity::_bind_methods() {
-	godot::ClassDB::bind_static_method(GFEntity::get_class_static(), D_METHOD("spawn", "world"), &GFEntity::spawn, nullptr);
+	godot::ClassDB::bind_static_method(GFEntity::get_class_static(), D_METHOD("new_in_world", "world"), &GFEntity::new_in_world);
 	godot::ClassDB::bind_static_method(GFEntity::get_class_static(), D_METHOD("from", "entity", "world"), &GFEntity::from, nullptr);
 	godot::ClassDB::bind_static_method(GFEntity::get_class_static(), D_METHOD("from_id", "id", "world"), &GFEntity::from_id, nullptr);
 
@@ -423,6 +437,7 @@ void GFEntity::_bind_methods() {
 
 	godot::ClassDB::bind_method(D_METHOD("pair", "second"), &GFEntity::pair);
 	godot::ClassDB::bind_method(D_METHOD("pair_id", "second_id"), &GFEntity::pair_id);
+	godot::ClassDB::bind_method(D_METHOD("_to_string"), &GFEntity::to_string);
 
 	godot::ClassDB::bind_method(D_METHOD("set_name", "name"), &GFEntity::set_name);
 }
diff --git a/cpp/src/entity.h b/cpp/src/entity.h
index d929ef4..0522fc1 100644
--- a/cpp/src/entity.h
+++ b/cpp/src/entity.h
@@ -3,6 +3,7 @@
 #define GL_ENTITY_H
 
 #include "godot_cpp/core/class_db.hpp"
+#include "godot_cpp/variant/utility_functions.hpp"
 #include "godot_cpp/variant/variant.hpp"
 #include "utils.h"
 #include "world.h"
@@ -22,8 +23,13 @@ namespace godot {
 		GDCLASS(GFEntity, RefCounted)
 
 	public:
+		// New entity in global world
 		GFEntity();
+		// New entity in specific world
+		GFEntity(GFWorld* world) ;
+		// Reference an entity
 		GFEntity(ecs_entity_t id_, GFWorld* world_): id(id_), world_instance_id(world_->get_instance_id()) {}
+		// Copy an entity reference
 		GFEntity(GFEntity& ett): GFEntity(ett.get_id(), ett.get_world()) {}
 		~GFEntity();
 
@@ -31,7 +37,7 @@ namespace godot {
 		// --- Exposed ---
 		// --------------------------------------
 
-		static Ref<GFEntity> spawn(GFWorld*);
+		static Ref<GFEntity> new_in_world(GFWorld*);
 		static Ref<GFEntity> from(Variant, GFWorld*);
 		static Ref<GFEntity> from_id(ecs_entity_t, GFWorld*);
 
@@ -65,36 +71,35 @@ namespace godot {
 		Ref<GFPair> pair(Variant second);
 		ecs_entity_t pair_id(ecs_entity_t second_id);
 
+		String to_string();
+
 		// --------------------------------------
 		// --- Unexposed ---
 		// --------------------------------------
 
-		template<typename T>
-		static Ref<T> from_id_template(ecs_entity_t id, GFWorld* world_) {
-			GFWorld* world = GFWorld::world_or_singleton(world_);
-
-			Ref<GFEntity> e;
-			e = Ref(memnew(T));
-			e->set_id(id);
-			e->set_world(world);
-
-			Ref<Script> script = world->get_registered_script(id);
-			if (
-				script != nullptr
-				&& ClassDB::is_parent_class(
-					T::get_class_static(),
-					script->get_instance_base_type()
-				)
-			) {
-				// Set script if entity is registered and the script
-				// inherits from this level of entity
-				e->set_script(script);
+		/// Assigns the correct script to this entity according to its ID.
+		void update_script() {
+			Ref<Script> script = get_world()->get_registered_script(get_id());
+			if (script == nullptr) {
+				return;
+			}
+			if (!ClassDB::is_parent_class(
+				get_class(),
+				script->get_instance_base_type()
+			)) {
+				return;
 			}
+			set_script(script);
+		}
+
+		template<typename T>
+		static Ref<T> setup_template(Ref<T> e) {
+			e->update_script();
 
 			if (!e->is_alive()) {
 				ERR(nullptr,
-					"Could not instantiate", T::get_class_static(), " from ID\n",
-					"World/ID is not valid/alive"
+					"Could not instantiate ", T::get_class_static(), " from ID\n",
+					"ID ", e->to_string(), " is not valid in world ", e->get_world()
 				);
 			}
 
diff --git a/cpp/src/module.cpp b/cpp/src/module.cpp
index 12ec239..2ee3693 100644
--- a/cpp/src/module.cpp
+++ b/cpp/src/module.cpp
@@ -7,17 +7,20 @@
 #include "godot_cpp/variant/char_string.hpp"
 #include "godot_cpp/classes/wrapped.hpp"
 #include "godot_cpp/variant/array.hpp"
+#include "world.h"
 #include <godot_cpp/core/class_db.hpp>
 #include <godot_cpp/variant/utility_functions.hpp>
 
 using namespace godot;
 
-GFModule::GFModule() {
-}
 GFModule::~GFModule() {
 }
 
-Ref<GFModule> GFModule::spawn(String name, GFWorld* world_) {
+Ref<GFModule> GFModule::new_in_world(GFWorld* world) {
+	return memnew(GFModule(world));
+}
+
+Ref<GFModule> GFModule::new_named_in_world(String name, GFWorld* world_) {
 	CharString name_utf8 = name.utf8();
 	GFWorld* world = GFWorld::world_or_singleton(world_);
 	ecs_component_desc_t comp_desc = {0};
@@ -131,7 +134,8 @@ Ref<GFRegisterableEntity> GFModule::new_internal() {
 }
 
 void GFModule::_bind_methods() {
-	godot::ClassDB::bind_static_method(get_class_static(), D_METHOD("spawn", "name", "world"), &GFModule::spawn, nullptr);
+	godot::ClassDB::bind_static_method(get_class_static(), D_METHOD("new_in_world", "world"), &GFModule::new_named_in_world);
+	godot::ClassDB::bind_static_method(get_class_static(), D_METHOD("new_named_in_world", "name", "world"), &GFModule::new_named_in_world);
 	godot::ClassDB::bind_static_method(get_class_static(), D_METHOD("from", "module", "world"), &GFModule::from, nullptr);
 	godot::ClassDB::bind_static_method(get_class_static(), D_METHOD("from_id", "module_id", "world"), &GFModule::from_id, nullptr);
 	godot::ClassDB::bind_method(D_METHOD("_register_internal"), &GFModule::_register_internal);
diff --git a/cpp/src/module.h b/cpp/src/module.h
index 3f0dfeb..6369c41 100644
--- a/cpp/src/module.h
+++ b/cpp/src/module.h
@@ -4,6 +4,7 @@
 
 #include "entity.h"
 #include "registerable_entity.h"
+#include "world.h"
 
 #include <flecs.h>
 #include <godot_cpp/classes/ref_counted.hpp>
@@ -15,17 +16,41 @@ namespace godot {
 		GDCLASS(GFModule, GFRegisterableEntity)
 
 	public:
-		GFModule();
-		GFModule(ecs_entity_t pair_id, GFWorld* world):
-			GFRegisterableEntity(pair_id, world)
-			{}
+		/// Create a new named module
+		GFModule(const char* name, GFWorld* world):
+			GFRegisterableEntity(
+				ecs_module_init(
+					world->raw(),
+					"",
+					0
+				),
+				world
+			)
+		{}
+		/// Create a new named module in default world
+		GFModule(const char* name):
+			GFRegisterableEntity(GFWorld::singleton())
+		{}
+		/// Create new unnamed module
+		GFModule(GFWorld* world): GFModule("", world)
+		{}
+		/// Create new unnamed module in default world
+		GFModule(): GFModule("")
+		{}
+
+		/// Reference an existing module
+		GFModule(ecs_entity_t module_id, GFWorld* world):
+			GFRegisterableEntity(module_id, world)
+		{}
+
 		~GFModule();
 
 		// --------------------------------------
 		// --- Exposed
 		// --------------------------------------
 
-		static Ref<GFModule> spawn(String name, GFWorld*);
+		static Ref<GFModule> new_in_world(GFWorld* world);
+		static Ref<GFModule> new_named_in_world(String name, GFWorld*);
 		static Ref<GFModule> from(Variant module, GFWorld*);
 		static Ref<GFModule> from_id(ecs_entity_t, GFWorld*);
 
diff --git a/cpp/src/pair.cpp b/cpp/src/pair.cpp
index 941b1c4..15ea071 100644
--- a/cpp/src/pair.cpp
+++ b/cpp/src/pair.cpp
@@ -17,13 +17,6 @@ GFPair::GFPair() {
 GFPair::~GFPair() {
 }
 
-Ref<GFPair> GFPair::spawn() {
-	ERR(nullptr,
-		"Couldn't instantiate entity\n",
-		"Pairs cannot be instantiated. Use \"from\" instead"
-	);
-}
-
 Ref<GFPair> GFPair::from(Variant first, Variant second, GFWorld* world) {
 	ecs_entity_t first_id = world->coerce_id(first);
 	ecs_entity_t second_id = world->coerce_id(second);
@@ -69,7 +62,6 @@ ecs_entity_t GFPair::second_id() {
 }
 
 void GFPair::_bind_methods() {
-	godot::ClassDB::bind_static_method(get_class_static(), D_METHOD("spawn"), &GFPair::spawn);
 	godot::ClassDB::bind_static_method(get_class_static(), D_METHOD("from", "first", "second", "world"), &GFPair::from, nullptr);
 	godot::ClassDB::bind_static_method(get_class_static(), D_METHOD("from_id", "pair_id", "world"), &GFPair::from_id, nullptr);
 	godot::ClassDB::bind_static_method(get_class_static(), D_METHOD("from_ids", "first", "second", "world"), &GFPair::from_ids, nullptr);
diff --git a/cpp/src/pair.h b/cpp/src/pair.h
index d0c25f4..2e7f91c 100644
--- a/cpp/src/pair.h
+++ b/cpp/src/pair.h
@@ -29,7 +29,6 @@ namespace godot {
 		// --- Exposed
 		// --------------------------------------
 
-		static Ref<GFPair> spawn();
 		static Ref<GFPair> from(Variant first, Variant second, GFWorld*);
 		static Ref<GFPair> from_id(ecs_entity_t, GFWorld*);
 		static Ref<GFPair> from_ids(ecs_entity_t, ecs_entity_t, GFWorld*);
diff --git a/cpp/src/querylike_builder.cpp b/cpp/src/querylike_builder.cpp
index 4a4a17d..797f7d1 100644
--- a/cpp/src/querylike_builder.cpp
+++ b/cpp/src/querylike_builder.cpp
@@ -1,7 +1,9 @@
 
 
 #include "querylike_builder.h"
+#include "component.h"
 #include "godot_cpp/variant/callable.hpp"
+#include "godot_cpp/variant/utility_functions.hpp"
 #include "godot_cpp/variant/variant.hpp"
 #include "utils.h"
 #include "world.h"
@@ -195,13 +197,13 @@ QueryIterationContext::QueryIterationContext(
 			case ecs_oper_kind_t::EcsAnd:
 			case ecs_oper_kind_t::EcsOptional:
 				comp_ref_per_term.append(
-					GFComponent::from_id(terms[i].id, 0, get_world())
+					GFComponent::from_id_no_source(terms[i].id, get_world())
 				);
 				comp_ref_args.append(Variant());
 				break;
 			case ecs_oper_kind_t::EcsOr:
 				comp_ref_per_term.append(
-					GFComponent::from_id(terms[i].id, 0, get_world())
+					GFComponent::from_id_no_source(terms[i].id, get_world())
 				);
 				// OR terms must always be followed by another term, so
 				// there's guaranteed to be another term after this one
diff --git a/cpp/src/register_types.cpp b/cpp/src/register_types.cpp
index b7f8f91..7fb0afa 100644
--- a/cpp/src/register_types.cpp
+++ b/cpp/src/register_types.cpp
@@ -30,7 +30,7 @@ void initialize_module(ModuleInitializationLevel p_level) {
         case MODULE_INITIALIZATION_LEVEL_SCENE:
 			godot::ClassDB::register_class<GFWorld>();
 
-			godot::ClassDB::register_abstract_class<GFEntity>();
+			godot::ClassDB::register_class<GFEntity>();
 			godot::ClassDB::register_abstract_class<GFPair>();
 			godot::ClassDB::register_class<GFRegisterableEntity>();
 			godot::ClassDB::register_class<GFComponent>();
diff --git a/cpp/src/registerable_entity.cpp b/cpp/src/registerable_entity.cpp
index 75aeb54..0a976f4 100644
--- a/cpp/src/registerable_entity.cpp
+++ b/cpp/src/registerable_entity.cpp
@@ -7,8 +7,6 @@
 
 using namespace godot;
 
-GFRegisterableEntity::GFRegisterableEntity() {
-}
 GFRegisterableEntity::~GFRegisterableEntity() {
 }
 
@@ -16,13 +14,15 @@ GFRegisterableEntity::~GFRegisterableEntity() {
 // --- Exposed ---
 // --------------------------------------------------------
 
-
-// --------------------------------------------------------
-// --- Unexposed ---
-// --------------------------------------------------------
+Ref<GFRegisterableEntity> GFRegisterableEntity::new_in_world(GFWorld* world) {
+	ERR(nullptr,
+		"Couldn't instantiate entity\n",
+		get_class_static(), " cannot be instantiated. Use \"from\" instead"
+	);
+}
 
 Ref<GFRegisterableEntity> GFRegisterableEntity::from_id(ecs_entity_t id, GFWorld* world_) {
-	return from_id_template<GFRegisterableEntity>(id, world_);
+	return setup_template<GFRegisterableEntity>(memnew(GFRegisterableEntity(id, world_)));
 }
 
 Ref<GFRegisterableEntity> GFRegisterableEntity::from_script(Ref<Script> script, GFWorld* world) {
@@ -43,6 +43,10 @@ Ref<GFRegisterableEntity> GFRegisterableEntity::from_script(Ref<Script> script,
 	return e;
 }
 
+// --------------------------------------------------------
+// --- Unexposed ---
+// --------------------------------------------------------
+
 void GFRegisterableEntity::register_in_world(
 	GFWorld* world
 ) {
@@ -73,6 +77,7 @@ Ref<GFRegisterableEntity> GFRegisterableEntity::new_internal() {
 
 void GFRegisterableEntity::_bind_methods() {
 	GDVIRTUAL_BIND(_register, "world");
+	godot::ClassDB::bind_static_method(GFRegisterableEntity::get_class_static(), D_METHOD("new_in_world", "world"), &GFRegisterableEntity::new_in_world);
 	godot::ClassDB::bind_method(D_METHOD("_register_internal"), &GFRegisterableEntity::_register_internal);
 	godot::ClassDB::bind_method(D_METHOD("_register_user"), &GFRegisterableEntity::_register_user);
 	godot::ClassDB::bind_static_method(get_class_static(), D_METHOD("_new_internal"), &GFRegisterableEntity::new_internal);
diff --git a/cpp/src/registerable_entity.h b/cpp/src/registerable_entity.h
index 37a9bce..302c882 100644
--- a/cpp/src/registerable_entity.h
+++ b/cpp/src/registerable_entity.h
@@ -15,7 +15,8 @@ namespace godot {
 		GDCLASS(GFRegisterableEntity, GFEntity)
 
 	public:
-		GFRegisterableEntity();
+		GFRegisterableEntity(): GFEntity() {}
+		GFRegisterableEntity(GFWorld* world): GFEntity(world) {}
 		GFRegisterableEntity(ecs_entity_t id, GFWorld* world):
 			GFEntity(id, world) {}
 		~GFRegisterableEntity();
@@ -27,13 +28,14 @@ namespace godot {
 		GDVIRTUAL1(_register, GFWorld*)
 		static Ref<GFRegisterableEntity> new_internal();
 
+		static Ref<GFRegisterableEntity> new_in_world(GFWorld*);
+		static Ref<GFRegisterableEntity> from_id(ecs_entity_t id, GFWorld* world);
+		static Ref<GFRegisterableEntity> from_script(Ref<Script>, GFWorld*);
+
 		// --------------------------------------------------------
 		// --- Unexposed ---
 		// --------------------------------------------------------
 
-		static Ref<GFRegisterableEntity> from_id(ecs_entity_t id, GFWorld* world);
-		static Ref<GFRegisterableEntity> from_script(Ref<Script>, GFWorld*);
-
 		void register_in_world(GFWorld* world);
 		// Runs internal register setup code
 		void call_internal_register();
diff --git a/examples/asteroids/asteroids.gd b/examples/asteroids/asteroids.gd
index 266f716..151546c 100644
--- a/examples/asteroids/asteroids.gd
+++ b/examples/asteroids/asteroids.gd
@@ -1,23 +1,22 @@
 
 extends Node2D
 
-var world:= GFWorld.new()
 
 var texture:= load("res://icon.png")
 
 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
-	GFEntity.spawn(world) \
+	GFEntity.new() \
 		.set_name("Test") \
 		.add_component(GFTexture2D, texture) \
 		.add_component(GFCanvasItem) \
 		.add_component(GFPosition2D)
 
-	world.start_rest_api()
+	GFGlobalWorld.start_rest_api()
 
 
 func _process(delta: float) -> void:
-	world.progress(delta)
-	world.lookup("Test") \
+	GFGlobalWorld.progress(delta)
+	GFGlobalWorld.lookup("Test") \
 		.get_component(GFPosition2D) \
 		.set_vec(get_global_mouse_position())
diff --git a/unittests/test_components.gd b/unittests/test_components.gd
index 36d2e30..8bac7c3 100644
--- a/unittests/test_components.gd
+++ b/unittests/test_components.gd
@@ -12,7 +12,7 @@ func after_each():
 
 
 func test_add_entity():
-	var _entity:= GFEntity.spawn(world)
+	var _entity:= GFEntity.new_in_world(world)
 
 	# Can't assert, but should be fine as long as it doesn't crash
 	assert_null(null)
@@ -20,11 +20,11 @@ func test_add_entity():
 
 func test_world_deletion():
 	var w:= GFWorld.new()
-	var e:= GFEntity.spawn(w) \
+	var e:= GFEntity.new_in_world(w) \
 		.add_component(Foo) \
 		.set_name("Test")
 	var foo:= e.get_component(Foo)
-	var e2:= GFEntity.spawn(w) \
+	var e2:= GFEntity.new_in_world(w) \
 		.add_component(Foo) \
 		.set_name("Test")
 	var foo2:= e2.get_component(Foo)
@@ -49,7 +49,7 @@ func test_world_deletion():
 func test_registration():
 	var w:= world
 
-	var e:= GFEntity.spawn(world) \
+	var e:= GFEntity.new_in_world(world) \
 		.add_component(RegistrationA) \
 		.add_component(RegistrationB) \
 		.set_name("Test")
@@ -68,11 +68,12 @@ func test_registration():
 func test_simple_system():
 	world.system_builder() \
 		.with(Foo) \
-		.for_each(func(foo:Foo):
+		.for_each(func(foo):
+			prints("REA", foo.get_script())
 			foo.set_value(Vector2(2, 5))
 			)
 
-	var entity:= GFEntity.spawn(world) \
+	var entity:= GFEntity.new_in_world(world) \
 		.add_component(Foo) \
 		.set_name("Test")
 
@@ -85,7 +86,7 @@ func test_simple_system():
 func test_components_in_relationships():
 	var w:= GFWorld.new()
 
-	var e:= GFEntity.spawn(w)
+	var e:= GFEntity.new_in_world(w)
 	var foo:Foo = e.add_pair(Targets, Foo) \
 		.get_component(w.pair(Targets, Foo))
 
diff --git a/unittests/test_ecs_world.gd b/unittests/test_ecs_world.gd
index 8f31b36..2cf7b73 100644
--- a/unittests/test_ecs_world.gd
+++ b/unittests/test_ecs_world.gd
@@ -10,7 +10,7 @@ func after_all():
 	world.free()
 
 func test_add_entity():
-	var _entity:= GFEntity.spawn(world) \
+	var _entity:= GFEntity.new_in_world(world) \
 		.set_name("Test")
 
 	# Can't assert, but should be fine as long as it doesn't crash
@@ -19,8 +19,8 @@ func test_add_entity():
 
 func test_pairs_are_alive():
 	var w:= GFWorld.new()
-	var first:= GFEntity.spawn(w)
-	var second:= GFEntity.spawn(w)
+	var first:= GFEntity.new_in_world(w)
+	var second:= GFEntity.new_in_world(w)
 	assert_eq(first.is_alive(), true)
 	assert_eq(second.is_alive(), true)
 
@@ -32,12 +32,12 @@ func test_pairs_are_alive():
 func test_world_deletion():
 	var w:= GFWorld.new()
 
-	var e:= GFEntity.spawn(w) \
+	var e:= GFEntity.new_in_world(w) \
 		.add_component(Foo) \
 		.set_name("Test")
 	var foo:Foo = e.get_component(Foo)
 
-	var e2:= GFEntity.spawn(w) \
+	var e2:= GFEntity.new_in_world(w) \
 		.add_component(Foo) \
 		.set_name("Test")
 	var foo2:Foo = e2.get_component(Foo)
@@ -74,7 +74,7 @@ func test_simple_system():
 			foo.setm(&"vec", 2.67)
 			)
 
-	var entity:= GFEntity.spawn(world) \
+	var entity:= GFEntity.new_in_world(world) \
 		.add_component(Foo) \
 		.set_name("Test")
 
diff --git a/unittests/test_entities.gd b/unittests/test_entities.gd
index ce54074..6aab3bd 100644
--- a/unittests/test_entities.gd
+++ b/unittests/test_entities.gd
@@ -12,7 +12,7 @@ func after_all():
 #region Tests
 
 func test_component_get_and_set():
-	var e:GFEntity = GFEntity.spawn(world) \
+	var e:GFEntity = GFEntity.new_in_world(world) \
 		.add_component(Foo) \
 		.set_name("Test")
 
@@ -25,7 +25,7 @@ func test_component_get_and_set():
 	e.delete()
 
 func test_component_string_get_and_set():
-	var e:= GFEntity.spawn(world) \
+	var e:= GFEntity.new_in_world(world) \
 		.add_component(Stringy) \
 		.set_name("Test")
 
@@ -40,21 +40,21 @@ func test_component_string_get_and_set():
 	assert_eq(foo.b, "em")
 
 func test_new_entity_with_unregistered_component():
-	var e:GFEntity = GFEntity.spawn(world) \
+	var e:GFEntity = GFEntity.new_in_world(world) \
 		.add_component(Unregistered) \
 		.set_name("Test")
 	assert_eq(e.get_component(Unregistered).value, 0)
 
 func test_creating_entity_by_new():
 	# Test that an entity is invalidated by being deleted
-	var e:= GFEntity.spawn(world)
+	var e:= GFEntity.new_in_world(world)
 	assert_eq(e.is_alive(), true)
 	e.delete()
 	assert_eq(e.is_alive(), false)
 
 	# Test that an entity is invalidated by its world being deleted
 	var w:= GFWorld.new()
-	var e2:= GFEntity.spawn(w)
+	var e2:= GFEntity.new_in_world(w)
 	assert_eq(e2.is_alive(), true)
 	w.free()
 	assert_eq(e2.is_alive(), false)
@@ -62,7 +62,7 @@ func test_creating_entity_by_new():
 func test_entity_from():
 	var id:= 0
 	if true:
-		var tmp_entity = GFEntity.spawn(world)
+		var tmp_entity = GFEntity.new_in_world(world)
 		tmp_entity.set_name(&"Cool Name")
 		id = tmp_entity.get_id()
 	assert_ne(id, 0)
@@ -72,10 +72,10 @@ func test_entity_from():
 	assert_eq(e.get_name(), &"Cool Name")
 
 func test_entity_created_in_singleton():
-	var e:= GFEntity.spawn()
+	var e:= GFEntity.new()
 	assert_eq(e.is_alive(), true)
 
-	var e2:= GFEntity.spawn(GFGlobalWorld)
+	var e2:= GFEntity.new_in_world(GFGlobalWorld)
 	assert_eq(e2.is_alive(), true)
 
 	assert_eq(e.get_world(), e2.get_world())
diff --git a/unittests/test_errors.gd b/unittests/test_errors.gd
index 52d990b..ea4961b 100644
--- a/unittests/test_errors.gd
+++ b/unittests/test_errors.gd
@@ -12,7 +12,7 @@ func after_all():
 #region Tests
 
 func test_get_nonexistant_property():
-	var entity:= GFEntity.spawn(world) \
+	var entity:= GFEntity.new_in_world(world) \
 		.add_component(Foo) \
 		.set_name("Test")
 	var foo:Foo = entity.get_component(Foo)
@@ -21,7 +21,7 @@ func test_get_nonexistant_property():
 
 
 func test_new_entity_with_unregistered_component():
-	var _entity:= GFEntity.spawn(world) \
+	var _entity:= GFEntity.new_in_world(world) \
 		.add_component(Unregistered) \
 		.set_name("Test")
 
diff --git a/unittests/test_events.gd b/unittests/test_events.gd
index bef6c6b..d7b4342 100644
--- a/unittests/test_events.gd
+++ b/unittests/test_events.gd
@@ -20,14 +20,14 @@ func test_on_add_event():
 			data.i += 1
 			)
 
-	var e:= GFEntity.spawn(world) \
+	var e:= GFEntity.new_in_world(world) \
 		.add_component(Ints) \
 		.set_name("WithInts")
-	var e2:= GFEntity.spawn(world) \
+	var e2:= GFEntity.new_in_world(world) \
 		.set_name("WithoutInts")
-	var e3:= GFEntity.spawn(world) \
+	var e3:= GFEntity.new_in_world(world) \
 		.set_name("WithInts")
-	var e4:= GFEntity.spawn(world) \
+	var e4:= GFEntity.new_in_world(world) \
 		.set_name("WithoutInts")
 
 	e3.add_component(Ints)
@@ -48,14 +48,14 @@ func test_on_set_event():
 			data.i += ints.a + ints.b
 			)
 
-	var e:= GFEntity.spawn(world) \
+	var e:= GFEntity.new_in_world(world) \
 		.add_component(Ints, 2, 31) \
 		.set_name("WithInts")
-	var e2:= GFEntity.spawn(world) \
+	var e2:= GFEntity.new_in_world(world) \
 		.set_name("WithoutInts")
-	var e3:= GFEntity.spawn(world) \
+	var e3:= GFEntity.new_in_world(world) \
 		.set_name("WithInts")
-	var e4:= GFEntity.spawn(world) \
+	var e4:= GFEntity.new_in_world(world) \
 		.set_name("WithoutInts")
 
 	e3.add_component(Ints, 99, 2)
@@ -76,7 +76,7 @@ func test_on_add_event_with_objects():
 			data.i += 1
 			)
 
-	var e:= GFEntity.spawn(world) \
+	var e:= GFEntity.new_in_world(world) \
 		.add_component(Textures) \
 		.set_name("WithInts")
 	assert_eq(data.i, 1)
@@ -87,7 +87,7 @@ func test_on_add_event_with_objects():
 	# In this test, the loaded textures will be auto freed by Godot if Glecs
 	# does not properly take ownership of them.
 	data.i = 0
-	var e2:= GFEntity.spawn(world) \
+	var e2:= GFEntity.new_in_world(world) \
 		.set_name("WithTextures")
 	e2.add_component(Textures, load("res://icon.png"))
 	assert_eq(data.i, 1)
diff --git a/unittests/test_module_rendering_2d.gd b/unittests/test_module_rendering_2d.gd
index 6a01141..a2d5fdc 100644
--- a/unittests/test_module_rendering_2d.gd
+++ b/unittests/test_module_rendering_2d.gd
@@ -14,7 +14,7 @@ func after_each():
 #region Tests
 
 func test_rendering_texture():
-	var e:= GFEntity.spawn(world) \
+	var e:= GFEntity.new_in_world(world) \
 		.add_component(GFTexture2D, TEXTURE) \
 		.add_component(GFCanvasItem)
 
diff --git a/unittests/test_prefab.gd b/unittests/test_prefab.gd
index c28f34c..d54917a 100644
--- a/unittests/test_prefab.gd
+++ b/unittests/test_prefab.gd
@@ -25,7 +25,7 @@ func test_prefab():
 			b.b = PI
 			)
 
-	var entity:= GFEntity.spawn(world)
+	var entity:= GFEntity.new_in_world(world)
 	var isa:= world.coerce_id("flecs/core/IsA")
 	var myprefab:= world.coerce_id(MyPrefab)
 	var pair:= world.pair(isa, myprefab)
diff --git a/unittests/test_queries.gd b/unittests/test_queries.gd
index 5a0914a..23524fc 100644
--- a/unittests/test_queries.gd
+++ b/unittests/test_queries.gd
@@ -21,16 +21,16 @@ func test_optional_terms():
 		if bools:
 			data.bools += 1
 
-	var empty:= GFEntity.spawn(w) \
+	var empty:= GFEntity.new_in_world(w) \
 		.set_name("Empty") \
 		.add_component(Bools)
-	var just_ints:= GFEntity.spawn(w) \
+	var just_ints:= GFEntity.new_in_world(w) \
 		.set_name("JustInts") \
 		.add_component(Ints)
-	var just_bools:= GFEntity.spawn(w) \
+	var just_bools:= GFEntity.new_in_world(w) \
 		.set_name("JustBools") \
 		.add_component(Bools)
-	var all:= GFEntity.spawn(w) \
+	var all:= GFEntity.new_in_world(w) \
 		.set_name("All") \
 		.add_component(Ints) \
 		.add_component(Bools)
@@ -68,11 +68,11 @@ func test_or_operation_terms():
 				data.bools += 1
 			)
 
-	GFEntity.spawn(w).add_component(Ints)
-	GFEntity.spawn(w).add_component(Ints)
-	GFEntity.spawn(w).add_component(Ints)
-	GFEntity.spawn(w).add_component(Bools)
-	GFEntity.spawn(w).add_component(Ints).add_component(Bools)
+	GFEntity.new_in_world(w).add_component(Ints)
+	GFEntity.new_in_world(w).add_component(Ints)
+	GFEntity.new_in_world(w).add_component(Ints)
+	GFEntity.new_in_world(w).add_component(Bools)
+	GFEntity.new_in_world(w).add_component(Ints).add_component(Bools)
 
 	w.progress(0.0)
 
diff --git a/unittests/test_registration.gd b/unittests/test_registration.gd
index 2d4f540..a223b6f 100644
--- a/unittests/test_registration.gd
+++ b/unittests/test_registration.gd
@@ -17,7 +17,7 @@ func after_all():
 #region Tests
 
 func test_auto_register_script():
-	GFEntity.spawn(world) \
+	GFEntity.new_in_world(world) \
 		.add_component(AComponent)
 
 	assert_ne(
@@ -87,7 +87,7 @@ func test_register_script_sub_class():
 	)
 
 func test_name_conflic():
-	GFEntity.spawn(world) \
+	GFEntity.new_in_world(world) \
 		.set_name("Foo")
 	world.register_script(Foo)
 
diff --git a/unittests/test_relations.gd b/unittests/test_relations.gd
index 3b40700..13f1613 100644
--- a/unittests/test_relations.gd
+++ b/unittests/test_relations.gd
@@ -12,10 +12,10 @@ func after_each():
 #region Tests
 
 func test_add_and_set_pairs() -> void:
-	var eats:= GFEntity.spawn(world).set_name("Eats")
-	var grass:= GFEntity.spawn(world).set_name("Grass")
+	var eats:= GFEntity.new_in_world(world).set_name("Eats")
+	var grass:= GFEntity.new_in_world(world).set_name("Grass")
 	
-	var e:= GFEntity.spawn(world)
+	var e:= GFEntity.new_in_world(world)
 	
 	e.add_pair("Eats", GFRotation2D, 3.0)
 	assert_almost_eq(
@@ -39,16 +39,16 @@ func test_add_and_set_pairs() -> void:
 	)
 
 func test_basic_query():
-	var eats:= GFEntity.spawn(world) \
+	var eats:= GFEntity.new_in_world(world) \
 		.set_name("Eats")
-	var apple:= GFEntity.spawn(world) \
+	var apple:= GFEntity.new_in_world(world) \
 		.set_name("Apple")
-	var grass:= GFEntity.spawn(world) \
+	var grass:= GFEntity.new_in_world(world) \
 		.set_name("Grass")
-	var man:= GFEntity.spawn(world) \
+	var man:= GFEntity.new_in_world(world) \
 		.set_name("Man") \
 		.add_pair("Eats", apple)
-	var cow:= GFEntity.spawn(world) \
+	var cow:= GFEntity.new_in_world(world) \
 		.set_name("Cow") \
 		.add_pair("Eats", grass)
 
@@ -69,8 +69,8 @@ func test_basic_query():
 	assert_eq(eater_count, 2)
 
 func test_is_pair():
-	var likes = GFEntity.spawn(world).set_name("Likes")
-	var jill = GFEntity.spawn(world).set_name("Jill")
+	var likes = GFEntity.new_in_world(world).set_name("Likes")
+	var jill = GFEntity.new_in_world(world).set_name("Jill")
 	var likes_jill = likes.pair(jill)
 	
 	assert_true(likes_jill.is_pair())
diff --git a/unittests/test_simple_systems.gd b/unittests/test_simple_systems.gd
index dae5323..122f094 100644
--- a/unittests/test_simple_systems.gd
+++ b/unittests/test_simple_systems.gd
@@ -16,7 +16,7 @@ func after_all():
 	#world.new_pipeline(&"first")
 	#world.new_pipeline(&"second")
 #
-	#var entity:= GFEntity.spawn(world) \
+	#var entity:= GFEntity.new_in_world(world) \
 		#.add_component(Bools) \
 		#.add_component(Ints) \
 		#.set_name("Test")
@@ -59,7 +59,7 @@ func test_bools():
 			x.a = not x.b
 			)
 
-	var entity:= GFEntity.spawn(world) \
+	var entity:= GFEntity.new_in_world(world) \
 		.add_component(Bools) \
 		.set_name("Test")
 
@@ -78,7 +78,7 @@ func test_ints():
 			x.a += x.b
 			)
 
-	var entity:= GFEntity.spawn(world) \
+	var entity:= GFEntity.new_in_world(world) \
 		.add_component(Ints) \
 		.set_name("Test")
 	entity.get_component(Ints).b = 1
@@ -99,7 +99,7 @@ func test_floats():
 			x.a += x.b
 			)
 
-	var entity:= GFEntity.spawn(world) \
+	var entity:= GFEntity.new_in_world(world) \
 		.add_component(Floats) \
 		.set_name("Test")
 	entity.get_component(Floats).b = 1.2
@@ -121,7 +121,7 @@ func test_strings():
 			x.a += x.b
 			)
 
-	var entity:= GFEntity.spawn(world) \
+	var entity:= GFEntity.new_in_world(world) \
 		.set_name("Test") \
 		.add_component(Strings, "", "po")
 	var strings:Strings = entity.get_component(Strings)
@@ -145,7 +145,7 @@ func test_byte_arrays():
 				x.a[i] += x.b[i]
 			)
 
-	var entity:= GFEntity.spawn(world) \
+	var entity:= GFEntity.new_in_world(world) \
 		.add_component(ByteArrays) \
 		.set_name("Test")
 	entity.get_component(ByteArrays).a = PackedByteArray([1, 2, 3])
@@ -167,7 +167,7 @@ func test_textures():
 			x.a = x.b
 			)
 
-	var entity:= GFEntity.spawn(world) \
+	var entity:= GFEntity.new_in_world(world) \
 		.add_component(Textures) \
 		.set_name("Test")
 	entity.get_component(Textures).a = null
@@ -192,7 +192,7 @@ func test_ref_counts():
 	var rc:= RefCounted.new()
 	assert_eq(rc.get_reference_count(), 1)
 
-	var entity:= GFEntity.spawn(world) \
+	var entity:= GFEntity.new_in_world(world) \
 		.add_component(RefCounts) \
 		.set_name("Test")
 
@@ -212,7 +212,7 @@ func test_arrays():
 				x.b[i] += x.a[i]
 			)
 
-	var entity:= GFEntity.spawn(world) \
+	var entity:= GFEntity.new_in_world(world) \
 		.add_component(Arrays) \
 		.set_name("Test")
 	entity.get_component(Arrays).a = [23, 4, 6]
@@ -234,7 +234,7 @@ func test_dicts():
 			x.b["value"] += x.a["add_by"]
 			)
 
-	var entity:= GFEntity.spawn(world) \
+	var entity:= GFEntity.new_in_world(world) \
 		.add_component(Dicts) \
 		.set_name("Test")
 	entity.get_component(Dicts).a = {"add_by": 5}
diff --git a/unittests/test_systems.gd b/unittests/test_systems.gd
index 7ae3d8e..abb4eb8 100644
--- a/unittests/test_systems.gd
+++ b/unittests/test_systems.gd
@@ -3,11 +3,11 @@ extends GutTest
 
 var world:GFWorld
 
-func before_all():
+func before_each():
 	world = GFWorld.new()
 	# world.new_pipeline(&"test_pipeline")
 
-func after_all():
+func after_each():
 	world.free()
 
 #region Tests
@@ -21,7 +21,7 @@ func test_stuff():
 			boo.b = boo.a
 			)
 
-	var e:= GFEntity.spawn(world) \
+	var e:= GFEntity.new_in_world(world) \
 		.add_component(Bools) \
 		.set_name("Test")
 	world.register_script(Bools)
diff --git a/utils/glecs_tests_runner.gd b/utils/glecs_tests_runner.gd
index 3ec172e..d42ff0a 100644
--- a/utils/glecs_tests_runner.gd
+++ b/utils/glecs_tests_runner.gd
@@ -34,8 +34,6 @@ func run_tests():
 		# Glecs plugin is not installed, exit with failure
 		OS.crash("Glecs plugin is absent or not properly installed")
 
-	gut_config.options.tests = []
-	gut_config.options.unit_test_name = ""
 	gut_runner.run_tests()
 
 	# Wait for tests up to 10 seconds

From 679700236d60ff0f125f26a0355a8a865ccd67f0 Mon Sep 17 00:00:00 2001
From: GsLogiMaker <gslogimaker@gmail.com>
Date: Tue, 3 Dec 2024 17:07:58 -0600
Subject: [PATCH 2/3] Update builders with new constructors

---
 cpp/src/component.cpp                      |  2 +-
 cpp/src/component_builder.cpp              | 22 +++----
 cpp/src/component_builder.h                | 10 +++-
 cpp/src/doc_classes/GFComponentBuilder.xml | 18 ++++--
 cpp/src/doc_classes/GFObserverBuilder.xml  | 38 +++++++-----
 cpp/src/doc_classes/GFQueryBuilder.xml     | 17 ++++--
 cpp/src/doc_classes/GFSystemBuilder.xml    | 20 ++++---
 cpp/src/doc_classes/GFWorld.xml            | 69 ----------------------
 cpp/src/observer_builder.cpp               |  6 +-
 cpp/src/observer_builder.h                 |  4 +-
 cpp/src/query_builder.cpp                  |  6 +-
 cpp/src/query_builder.h                    |  3 +-
 cpp/src/register_types.cpp                 | 10 ++--
 cpp/src/system_builder.cpp                 |  6 +-
 cpp/src/system_builder.h                   |  3 +-
 cpp/src/world.cpp                          | 47 ---------------
 cpp/src/world.h                            |  5 --
 17 files changed, 103 insertions(+), 183 deletions(-)

diff --git a/cpp/src/component.cpp b/cpp/src/component.cpp
index 3528f62..01e2b55 100644
--- a/cpp/src/component.cpp
+++ b/cpp/src/component.cpp
@@ -61,7 +61,7 @@ Ref<GFComponent> GFComponent::from_id_no_source(ecs_entity_t comp, GFWorld* worl
 
 void GFComponent::_register_internal() {
 	// Build component
-	Ref<GFComponentBuilder> b = get_world()->component_builder();
+	Ref<GFComponentBuilder> b = memnew(GFComponentBuilder(get_world()));
 	if (GDVIRTUAL_IS_OVERRIDDEN(_build)) {
 		b->set_entity(get_id());
 		GDVIRTUAL_CALL(_build, b);
diff --git a/cpp/src/component_builder.cpp b/cpp/src/component_builder.cpp
index 57a80db..166b3ba 100644
--- a/cpp/src/component_builder.cpp
+++ b/cpp/src/component_builder.cpp
@@ -3,22 +3,20 @@
 #include "component_builder.h"
 #include "world.h"
 #include "utils.h"
+#include "entity.h"
 
 #include <stdlib.h>
 #include <flecs.h>
 
 using namespace godot;
 
-GFComponentBuilder::GFComponentBuilder() {
-	component_desc = {0};
-	struct_desc = {0};
-	member_names = Array();
-	world = {0};
-	built = {0};
-}
 GFComponentBuilder::~GFComponentBuilder() {
 }
 
+Ref<GFComponentBuilder> GFComponentBuilder::new_in_world(GFWorld* world) {
+	return memnew(GFComponentBuilder(world));
+}
+
 Ref<GFComponentBuilder> GFComponentBuilder::add_member(
 	String member,
 	Variant::Type type
@@ -73,15 +71,15 @@ Ref<GFComponentBuilder> GFComponentBuilder::set_name(
 	return Ref(this);
 }
 
-void GFComponentBuilder::build() {
+Ref<GFEntity> GFComponentBuilder::build() {
 	if (built) {
-		ERR(/**/,
+		ERR(nullptr,
 			"Failed to build component \"" + name + "\".\n",
 			"	Component is already built."
 		);
 	}
 	if (get_member_count() == 0) {
-		ERR(/**/,
+		ERR(nullptr,
 			"Failed to build component \"" + name + "\".\n",
 			"	No members were defined. Specify at least one member."
 		);
@@ -126,6 +124,8 @@ void GFComponentBuilder::build() {
 	}; ecs_set_hooks_id(raw, component_id, &hooks);
 
 	ecs_add_path(raw, component_id, 0, component_desc.type.name);
+
+	return memnew(GFEntity(component_id, world));
 }
 
 void GFComponentBuilder::set_world(GFWorld* world_) {
@@ -137,11 +137,11 @@ void GFComponentBuilder::set_world(GFWorld* world_) {
 // **********************************************
 
 void GFComponentBuilder::_bind_methods() {
+	godot::ClassDB::bind_static_method(get_class_static(), D_METHOD("new_in_world", "world"), &GFComponentBuilder::new_in_world);
 	godot::ClassDB::bind_method(D_METHOD("add_member", "member", "type"), &GFComponentBuilder::add_member);
 	godot::ClassDB::bind_method(D_METHOD("is_built"), &GFComponentBuilder::is_built);
 	godot::ClassDB::bind_method(D_METHOD("set_name", "name"), &GFComponentBuilder::set_name);
 	godot::ClassDB::bind_method(D_METHOD("build"), &GFComponentBuilder::build);
-
 }
 
 // **********************************************
diff --git a/cpp/src/component_builder.h b/cpp/src/component_builder.h
index 1c14b1c..a225246 100644
--- a/cpp/src/component_builder.h
+++ b/cpp/src/component_builder.h
@@ -2,6 +2,7 @@
 #ifndef COMPONENT_Builder_H
 #define COMPONENT_Builder_H
 
+#include "world.h"
 #include <flecs.h>
 #include <godot_cpp/classes/ref_counted.hpp>
 #include <godot_cpp/variant/string.hpp>
@@ -15,20 +16,25 @@ namespace godot {
 		GDCLASS(GFComponentBuilder, RefCounted)
 
 	public:
-		GFComponentBuilder();
+		GFComponentBuilder(GFWorld* world): world(world) {}
+		GFComponentBuilder():
+			GFComponentBuilder(GFWorld::singleton())
+		{}
 		~GFComponentBuilder();
 
 		// **************************************
 		// *** Exposed ***
 		// **************************************
 
+		static Ref<GFComponentBuilder> new_in_world(GFWorld*);
+
 		Ref<GFComponentBuilder> add_member(String, Variant::Type);
 		int get_member_count();
 		GFWorld* get_world();
 		bool is_built();
 		Ref<GFComponentBuilder> set_entity(Variant);
 		Ref<GFComponentBuilder> set_name(String);
-		void build();
+		Ref<GFEntity> build();
 
 		// **************************************
 		// *** Unexposed ***
diff --git a/cpp/src/doc_classes/GFComponentBuilder.xml b/cpp/src/doc_classes/GFComponentBuilder.xml
index 1a04210..d6fafef 100644
--- a/cpp/src/doc_classes/GFComponentBuilder.xml
+++ b/cpp/src/doc_classes/GFComponentBuilder.xml
@@ -6,11 +6,10 @@
 	<description>
 		This example shows the creation of a [i]Jump[/i] component:
 		[codeblock]
-		var world:= GFWorld.new()
-		world.component_builder() \
-			.set_name("Jump") \
-			.add_member("jump_velocity", TYPE_FLOAT) \
-			.build()
+		GFComponentBuilder.new() \
+		    .set_name("Jump") \
+		    .add_member("jump_velocity", TYPE_FLOAT) \
+		    .build()
 		[/codeblock]
 	</description>
 	<tutorials>
@@ -26,7 +25,7 @@
 			</description>
 		</method>
 		<method name="build">
-			<return type="void" />
+			<return type="GFEntity" />
 			<description>
 				Creates the new component from the settings of the builder.
 			</description>
@@ -37,6 +36,13 @@
 				Returns [code]true[/code] if this builder has already been built.
 			</description>
 		</method>
+		<method name="new_in_world" qualifiers="static">
+			<return type="GFComponentBuilder" />
+			<param index="0" name="world" type="GFWorld" />
+			<description>
+				Returns a new builder in [param world].
+			</description>
+		</method>
 		<method name="set_name">
 			<return type="GFComponentBuilder" />
 			<param index="0" name="name" type="String" />
diff --git a/cpp/src/doc_classes/GFObserverBuilder.xml b/cpp/src/doc_classes/GFObserverBuilder.xml
index 8c4fa31..d354563 100644
--- a/cpp/src/doc_classes/GFObserverBuilder.xml
+++ b/cpp/src/doc_classes/GFObserverBuilder.xml
@@ -1,28 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GFObserverBuilder" inherits="GFQuerylikeBuilder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/godotengine/godot/master/doc/class.xsd">
+<class name="GFObserverBuilder" inherits="GFQuerylikeBuilder"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/godotengine/godot/master/doc/class.xsd">
 	<brief_description>
 		A builder for observers.
 	</brief_description>
 	<description>
 		This example shows the creation of an observer that is run whenever either the [i]Run[/i] or [i]Jump[/i] component is added to an entity and that entity has both the [i]Run[/i] and [i]Jump[/i] components:
 		[codeblock]
-		var world:= GFWorld.new()
-		world.observer_builder("flecs/core/OnAdd") \
-			.with("Run") \
-			.with("Jump") \
-			.for_each(func(run:GFComponent, jump:GFComponent):
-				pass
-				)
+		GFObserverBuilder.new() \
+		    .set_events("flecs/core/OnAdd") \
+		    .with("Run") \
+		    .with("Jump") \
+		    .for_each(func(run:GFComponent, jump:GFComponent):
+		        pass
+		        )
 		[/codeblock]
 		This example shows the creation of an observer that is run when the [i]Run[/i] component is added to an entity and that has the [i]Jump[/i] component:
 		[codeblock]
-		var world:= GFWorld.new()
-		world.observer_builder("flecs/core/OnAdd") \
-			.with("Run") \
-			.with("Jump").access_filter() \
-			.for_each(func(run:GFComponent, jump:GFComponent):
-				pass
-				)
+		GFObserverBuilder.new() \
+		    .set_events("flecs/core/OnAdd") \
+		    .with("Run") \
+		    .with("Jump").access_filter() \
+		    .for_each(func(run:GFComponent, jump:GFComponent):
+		        pass
+		        )
 		[/codeblock]
 	</description>
 	<tutorials>
@@ -36,6 +37,13 @@
 				Builds the observer with a callback for iterating over each result.
 			</description>
 		</method>
+		<method name="new_in_world" qualifiers="static">
+			<return type="GFObserverBuilder" />
+			<param index="0" name="world" type="GFWorld" />
+			<description>
+				Returns a new builder in [param world].
+			</description>
+		</method>
 		<method name="set_event">
 			<return type="GFObserverBuilder" />
 			<param index="0" name="index" type="int" />
diff --git a/cpp/src/doc_classes/GFQueryBuilder.xml b/cpp/src/doc_classes/GFQueryBuilder.xml
index e88dd38..4d1c0f7 100644
--- a/cpp/src/doc_classes/GFQueryBuilder.xml
+++ b/cpp/src/doc_classes/GFQueryBuilder.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GFQueryBuilder" inherits="GFQuerylikeBuilder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/godotengine/godot/master/doc/class.xsd">
+<class name="GFQueryBuilder" inherits="GFQuerylikeBuilder"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/godotengine/godot/master/doc/class.xsd">
 	<brief_description>
 		A builder for queries.
 	</brief_description>
@@ -7,10 +8,9 @@
 		Queries are the main way entities are accessed from a [GFWorld]. Under the hood, systems and observers both use queries.
 		The example below shows the creation of a query over entities with the [i]Jump[/i] component:
 		[codeblock]
-		var world:= GFWorld.new()
-		var query:GFQuery = world.query_builder() \
-			.with("Jump") \
-			.build()
+		var query:GFQuery = QueryBuilder.new() \
+		    .with("Jump") \
+		    .build()
 		[/codeblock]
 	</description>
 	<tutorials>
@@ -23,5 +23,12 @@
 				Builds and returns the new query.
 			</description>
 		</method>
+		<method name="new_in_world" qualifiers="static">
+			<return type="GFQueryBuilder" />
+			<param index="0" name="world" type="GFWorld" />
+			<description>
+				Returns a new builder in [param world].
+			</description>
+		</method>
 	</methods>
 </class>
diff --git a/cpp/src/doc_classes/GFSystemBuilder.xml b/cpp/src/doc_classes/GFSystemBuilder.xml
index c9be490..99356d5 100644
--- a/cpp/src/doc_classes/GFSystemBuilder.xml
+++ b/cpp/src/doc_classes/GFSystemBuilder.xml
@@ -6,13 +6,12 @@
 	<description>
 		This example shows the creation of a system that runs over entities with the [i]Run[/i] and [i]Jump[/i] components:
 		[codeblock]
-		var world:= GFWorld.new()
-		world.observer_builder() \
-			.with("Run") \
-			.with("Jump") \
-			.for_each(func(run:GFComponent, jump:GFComponent):
-				pass
-				)
+		GFSystemBuilder.new() \
+		    .with("Run") \
+		    .with("Jump") \
+		    .for_each(func(run:GFComponent, jump:GFComponent):
+		        pass
+		        )
 		[/codeblock]
 	</description>
 	<tutorials>
@@ -26,5 +25,12 @@
 				Builds the system with a callback for iterating over each result.
 			</description>
 		</method>
+		<method name="new_in_world" qualifiers="static">
+			<return type="GFSystemBuilder" />
+			<param index="0" name="world" type="GFWorld" />
+			<description>
+				Returns a new builder in [param world].
+			</description>
+		</method>
 	</methods>
 </class>
diff --git a/cpp/src/doc_classes/GFWorld.xml b/cpp/src/doc_classes/GFWorld.xml
index 49e7fef..ec6dfde 100644
--- a/cpp/src/doc_classes/GFWorld.xml
+++ b/cpp/src/doc_classes/GFWorld.xml
@@ -51,46 +51,6 @@
 				[/codeblock]
 			</description>
 		</method>
-		<method name="component_builder">
-			<return type="GFComponentBuilder" />
-			<description>
-				Returns a new component builder.
-				This example shows the creation of a [i]Jump[/i] component:
-				[codeblock]
-				var world:= GFWorld.new()
-				world.component_builder() \
-				    .set_name("Jump") \
-				    .add_member("jump_velocity", TYPE_FLOAT) \
-				    .build()
-				[/codeblock]
-			</description>
-		</method>
-		<method name="observer_builder" qualifiers="const vararg">
-			<return type="GFObserverBuilder" />
-			<description>
-				Returns a new observer builder.
-				Arguments to this method specify the events (coerced from IDs) that this observer listens for. To learn more about [Variant] coercion see [method GFWorld.coerce_id].
-				This example shows the creation of an observer that is run whenever either the [i]Run[/i] or [i]Jump[/i] component is added to an entity and that entity has both the [i]Run[/i] and [i]Jump[/i] components:
-				[codeblock]
-				var world:= GFWorld.new()
-				world.observer_builder("flecs/core/OnAdd") \
-				    .with("Run") \
-				    .with("Jump") \
-				    .for_each(func(run:GFComponent, jump:GFComponent):
-				        pass
-				        )
-				[/codeblock]
-				This example shows the creation of an observer that is run when the [i]Run[/i] component is added to an entity and that has the [i]Jump[/i] component:
-				[codeblock]
-				var world:= GFWorld.new()
-				world.observer_builder("flecs/core/OnAdd") \
-				    .with("Run") \
-				    .with("Jump").access_filter() \
-				    .for_each(func(run:GFComponent, jump:GFComponent):
-				        pass
-				        )
-				[/codeblock]
-			</description>
 		</method>
 		<method name="pair">
 			<return type="GFPair" />
@@ -136,19 +96,6 @@
 				[/codeblock]
 			</description>
 		</method>
-		<method name="query_builder">
-			<return type="GFQueryBuilder" />
-			<description>
-				Returns a new query builder.
-				This example shows the creation of a query over entities with the [i]Jump[/i] component:
-				[codeblock]
-				var world:= GFWorld.new()
-				var query:GFQuery = world.query_builder() \
-				    .with("Jump") \
-				    .build()
-				[/codeblock]
-			</description>
-		</method>
 		<method name="register_script">
 			<return type="GFRegisterableEntity" />
 			<param index="0" name="script" type="Script" />
@@ -186,21 +133,5 @@
 				[/codeblock]
 			</description>
 		</method>
-		<method name="system_builder">
-			<return type="GFSystemBuilder" />
-			<description>
-				Returns a new system builder.
-				This example shows the creation of a system that runs over entities with the [i]Run[/i] and [i]Jump[/i] components:
-				[codeblock]
-				var world:= GFWorld.new()
-				world.observer_builder() \
-				    .with("Run") \
-				    .with("Jump") \
-				    .for_each(func(run:GFComponent, jump:GFComponent):
-				        pass
-				        )
-				[/codeblock]
-			</description>
-		</method>
 	</methods>
 </class>
diff --git a/cpp/src/observer_builder.cpp b/cpp/src/observer_builder.cpp
index ec2863d..6e6db03 100644
--- a/cpp/src/observer_builder.cpp
+++ b/cpp/src/observer_builder.cpp
@@ -8,10 +8,11 @@
 
 using namespace godot;
 
-GFObserverBuilder::GFObserverBuilder() {
+GFObserverBuilder::~GFObserverBuilder() {
 }
 
-GFObserverBuilder::~GFObserverBuilder() {
+Ref<GFObserverBuilder> GFObserverBuilder::new_in_world(GFWorld* world) {
+	return memnew(GFObserverBuilder(world));
 }
 
 void GFObserverBuilder::for_each(Callable callable) {
@@ -71,6 +72,7 @@ Ref<GFObserverBuilder> GFObserverBuilder::set_events_varargs(
 
 
 void GFObserverBuilder::_bind_methods() {
+	godot::ClassDB::bind_static_method(get_class_static(), D_METHOD("new_in_world", "world"), &GFObserverBuilder::new_in_world);
 	godot::ClassDB::bind_method(D_METHOD("for_each", "callback"), &GFObserverBuilder::for_each);
 	godot::ClassDB::bind_method(D_METHOD("set_event", "index", "event"), &GFObserverBuilder::set_event);
 	ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT, "set_events", &GFObserverBuilder::set_events_varargs);
diff --git a/cpp/src/observer_builder.h b/cpp/src/observer_builder.h
index dab79d1..23f6d47 100644
--- a/cpp/src/observer_builder.h
+++ b/cpp/src/observer_builder.h
@@ -16,14 +16,16 @@ namespace godot {
 		GDCLASS(GFObserverBuilder, GFQuerylikeBuilder)
 
 	public:
-		GFObserverBuilder();
 		GFObserverBuilder(GFWorld* world): GFQuerylikeBuilder(world) {}
+		GFObserverBuilder(): GFObserverBuilder(GFWorld::singleton()) {}
 		~GFObserverBuilder();
 
 		// **************************************
 		// *** Exposed ***
 		// **************************************
 
+		static Ref<GFObserverBuilder> new_in_world(GFWorld*);
+
 		void for_each(Callable callable);
 		Ref<GFObserverBuilder> set_events_varargs(
 			const Variant** args,
diff --git a/cpp/src/query_builder.cpp b/cpp/src/query_builder.cpp
index 78566e4..a5c657e 100644
--- a/cpp/src/query_builder.cpp
+++ b/cpp/src/query_builder.cpp
@@ -11,10 +11,11 @@
 
 using namespace godot;
 
-GFQueryBuilder::GFQueryBuilder() {
+GFQueryBuilder::~GFQueryBuilder() {
 }
 
-GFQueryBuilder::~GFQueryBuilder() {
+Ref<GFQueryBuilder> GFQueryBuilder::new_in_world(GFWorld* world) {
+	return memnew(GFQueryBuilder(world));
 }
 
 Ref<GFQuery> GFQueryBuilder::build() {
@@ -43,6 +44,7 @@ Ref<GFQuery> GFQueryBuilder::build() {
 // **********************************************
 
 void GFQueryBuilder::_bind_methods() {
+	godot::ClassDB::bind_static_method(get_class_static(), D_METHOD("new_in_world", "world"), &GFQueryBuilder::new_in_world);
 	godot::ClassDB::bind_method(D_METHOD("build"), &GFQueryBuilder::build);
 }
 
diff --git a/cpp/src/query_builder.h b/cpp/src/query_builder.h
index 61cc161..e3c26d4 100644
--- a/cpp/src/query_builder.h
+++ b/cpp/src/query_builder.h
@@ -18,14 +18,15 @@ namespace godot {
 		GDCLASS(GFQueryBuilder, GFQuerylikeBuilder)
 
 	public:
-		GFQueryBuilder();
 		GFQueryBuilder(GFWorld* world): GFQuerylikeBuilder(world) {}
+		GFQueryBuilder(): GFQueryBuilder(GFWorld::singleton()) {}
 		~GFQueryBuilder();
 
 		// **************************************
 		// *** Exposed ***
 		// **************************************
 
+		static Ref<GFQueryBuilder> new_in_world(GFWorld*);
 		Ref<GFQuery> build();
 
 		// **************************************
diff --git a/cpp/src/register_types.cpp b/cpp/src/register_types.cpp
index 7fb0afa..8725d6e 100644
--- a/cpp/src/register_types.cpp
+++ b/cpp/src/register_types.cpp
@@ -5,8 +5,6 @@
 #include "entity.h"
 #include "gdextension_interface.h"
 #include "godot_cpp/classes/engine.hpp"
-#include "godot_cpp/classes/resource_loader.hpp"
-#include "godot_cpp/variant/utility_functions.hpp"
 #include "module.h"
 #include "observer_builder.h"
 #include "pair.h"
@@ -36,14 +34,14 @@ void initialize_module(ModuleInitializationLevel p_level) {
 			godot::ClassDB::register_class<GFComponent>();
 			godot::ClassDB::register_class<GFModule>();
 
-			godot::ClassDB::register_abstract_class<GFComponentBuilder>();
+			godot::ClassDB::register_class<GFComponentBuilder>();
 			godot::ClassDB::register_abstract_class<GFQuery>();
 			godot::ClassDB::register_abstract_class<GFQueryIterator>();
 
 			godot::ClassDB::register_abstract_class<GFQuerylikeBuilder>();
-			godot::ClassDB::register_abstract_class<GFObserverBuilder>();
-			godot::ClassDB::register_abstract_class<GFQueryBuilder>();
-			godot::ClassDB::register_abstract_class<GFSystemBuilder>();
+			godot::ClassDB::register_class<GFObserverBuilder>();
+			godot::ClassDB::register_class<GFQueryBuilder>();
+			godot::ClassDB::register_class<GFSystemBuilder>();
      	   	Engine::get_singleton()->register_singleton(GFWorld::SINGLETON_NAME, memnew(GFWorld));
 			break;
         case MODULE_INITIALIZATION_LEVEL_EDITOR:
diff --git a/cpp/src/system_builder.cpp b/cpp/src/system_builder.cpp
index 1ea9525..463329f 100644
--- a/cpp/src/system_builder.cpp
+++ b/cpp/src/system_builder.cpp
@@ -12,10 +12,11 @@
 
 using namespace godot;
 
-GFSystemBuilder::GFSystemBuilder() {
+GFSystemBuilder::~GFSystemBuilder() {
 }
 
-GFSystemBuilder::~GFSystemBuilder() {
+Ref<GFSystemBuilder> GFSystemBuilder::new_in_world(GFWorld* world) {
+	return memnew(GFSystemBuilder(world));
 }
 
 void GFSystemBuilder::for_each(Callable callable) {
@@ -48,6 +49,7 @@ void GFSystemBuilder::for_each(Callable callable) {
 
 
 void GFSystemBuilder::_bind_methods() {
+	godot::ClassDB::bind_static_method(get_class_static(), D_METHOD("new_in_world", "world"), &GFSystemBuilder::new_in_world);
 	godot::ClassDB::bind_method(D_METHOD("for_each", "callback"), &GFSystemBuilder::for_each);
 }
 
diff --git a/cpp/src/system_builder.h b/cpp/src/system_builder.h
index 2a192d9..58ead46 100644
--- a/cpp/src/system_builder.h
+++ b/cpp/src/system_builder.h
@@ -18,14 +18,15 @@ namespace godot {
 		GDCLASS(GFSystemBuilder, GFQuerylikeBuilder)
 
 	public:
-		GFSystemBuilder();
 		GFSystemBuilder(GFWorld* world): GFQuerylikeBuilder(world) {}
+		GFSystemBuilder(): GFSystemBuilder(GFWorld::singleton()) {}
 		~GFSystemBuilder();
 
 		// **************************************
 		// *** Exposed ***
 		// **************************************
 
+		static Ref<GFSystemBuilder> new_in_world(GFWorld*);
 		void for_each(Callable callable);
 
 		// **************************************
diff --git a/cpp/src/world.cpp b/cpp/src/world.cpp
index 4563370..b96c14f 100644
--- a/cpp/src/world.cpp
+++ b/cpp/src/world.cpp
@@ -617,49 +617,6 @@ void GFWorld::progress(double delta) {
 	ecs_progress(raw(), delta);
 }
 
-Ref<GFComponentBuilder> GFWorld::component_builder() {
-	Ref<GFComponentBuilder> builder = memnew(GFComponentBuilder);
-	builder->set_world(this);
-	return builder;
-}
-
-Ref<GFObserverBuilder> GFWorld::observer_builder_varargs(
-	const Variant** args,
-	int64_t arg_count,
-	GDExtensionCallError& error
-) {
-	if (arg_count > FLECS_EVENT_DESC_MAX) {
-		// TODO: utilize call error
-		ERR(Ref<GFObserverBuilder>(),
-			"Failed to set terms in observer builder",
-			"Max term count is ", FLECS_EVENT_DESC_MAX, ", but ",
-			arg_count, " terms were passed"
-		);
-	}
-
-	Ref<GFObserverBuilder> builder = memnew(GFObserverBuilder(this));
-	builder->set_events_varargs(args, arg_count, error);
-	return builder;
-}
-
-Variant observer_builder_varargs(
-	const Variant **args,
-	GDExtensionInt arg_count,
-	GDExtensionCallError &error
-) {
-	return arg_count;
-}
-
-Ref<GFQueryBuilder> GFWorld::query_builder() {
-	Ref<GFQueryBuilder> builder = memnew(GFQueryBuilder(this));
-	return builder;
-}
-
-Ref<GFSystemBuilder> GFWorld::system_builder() {
-	Ref<GFSystemBuilder> builder = memnew(GFSystemBuilder(this));
-	return builder;
-}
-
 Ref<GFRegisterableEntity> GFWorld::register_script(Ref<Script> script) {
 	Ref<GFRegisterableEntity> ett = register_script_id_no_user_call(script);
 	if (ett == nullptr) {
@@ -1099,11 +1056,7 @@ ecs_world_t * GFWorld::raw() {
 // ----------------------------------------------
 
 void GFWorld::_bind_methods() {
-	godot::ClassDB::bind_method(D_METHOD("component_builder"), &GFWorld::component_builder);
-	ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT, "observer_builder", &GFWorld::observer_builder_varargs);
-	godot::ClassDB::bind_method(D_METHOD("query_builder"), &GFWorld::query_builder);
 	godot::ClassDB::bind_method(D_METHOD("register_script", "script"), &GFWorld::register_script);
-	godot::ClassDB::bind_method(D_METHOD("system_builder"), &GFWorld::system_builder);
 	godot::ClassDB::bind_method(D_METHOD("coerce_id", "entity"), &GFWorld::coerce_id);
 	godot::ClassDB::bind_method(D_METHOD("start_rest_api"), &GFWorld::start_rest_api);
 	godot::ClassDB::bind_method(D_METHOD("lookup", "path"), &GFWorld::lookup);
diff --git a/cpp/src/world.h b/cpp/src/world.h
index 54e5172..bc7ab90 100644
--- a/cpp/src/world.h
+++ b/cpp/src/world.h
@@ -30,11 +30,6 @@ namespace godot {
 		// *** Exposed ***
 		// **************************************
 
-		Ref<GFComponentBuilder> component_builder();
-		Ref<GFObserverBuilder> observer_builder_varargs(const Variant**, int64_t, GDExtensionCallError&);
-		Ref<GFQueryBuilder> query_builder();
-		Ref<GFSystemBuilder> system_builder();
-
 		ecs_entity_t coerce_id(Variant);
 		Ref<GFEntity> lookup(String);
 		Ref<GFPair> pair(Variant, Variant);

From 5eebef8ce5bac7711442448305ebe59248a00975 Mon Sep 17 00:00:00 2001
From: GsLogiMaker <gslogimaker@gmail.com>
Date: Wed, 4 Dec 2024 12:52:55 -0600
Subject: [PATCH 3/3] General branch fixes

---
 cpp/src/component.cpp            | 18 ++----------------
 cpp/src/component.h              | 17 +++++++++--------
 cpp/src/component_builder.h      |  9 ++++++++-
 cpp/src/doc_classes/GFWorld.xml  |  4 ++--
 cpp/src/entity.h                 |  5 ++++-
 cpp/src/module.cpp               |  4 ----
 cpp/src/module.h                 |  2 --
 cpp/src/observer_builder.h       |  9 +++++++--
 cpp/src/pair.cpp                 |  2 --
 cpp/src/pair.h                   |  8 +++++---
 cpp/src/query.cpp                |  3 ---
 cpp/src/query.h                  |  9 +++++++--
 cpp/src/query_builder.h          |  8 ++++++--
 cpp/src/query_iterator.cpp       |  3 ---
 cpp/src/query_iterator.h         |  6 ++++--
 cpp/src/querylike_builder.cpp    |  3 ---
 cpp/src/querylike_builder.h      | 11 +++++++++--
 cpp/src/registerable_entity.cpp  |  6 +-----
 cpp/src/registerable_entity.h    | 12 ++++++++----
 cpp/src/system_builder.h         |  9 +++++++--
 gd/rendering/2d/systems.gd       | 25 +++++++++++++++++--------
 unittests/test_components.gd     |  9 ++++-----
 unittests/test_ecs_world.gd      |  2 +-
 unittests/test_events.gd         |  9 ++++++---
 unittests/test_prefab.gd         |  2 +-
 unittests/test_queries.gd        |  6 +++---
 unittests/test_relations.gd      |  6 ++++--
 unittests/test_simple_systems.gd | 16 ++++++++--------
 unittests/test_systems.gd        |  2 +-
 29 files changed, 124 insertions(+), 101 deletions(-)

diff --git a/cpp/src/component.cpp b/cpp/src/component.cpp
index 01e2b55..758197c 100644
--- a/cpp/src/component.cpp
+++ b/cpp/src/component.cpp
@@ -20,8 +20,6 @@
 
 using namespace godot;
 
-GFComponent::GFComponent() {
-}
 GFComponent::~GFComponent() {
 }
 
@@ -36,10 +34,7 @@ Ref<GFComponent> GFComponent::from_id(ecs_entity_t comp, ecs_entity_t entity, GF
 			"	Entity ", world->id_to_text(comp), " is not a component"
 		);
 	}
-	Ref<GFComponent> comp_ref = Ref(memnew(GFComponent));
-	comp_ref->source_entity_id = entity;
-	comp_ref->set_id(comp);
-	comp_ref->set_world(world);
+	Ref<GFComponent> comp_ref = memnew(GFComponent(entity, comp, world));
 	return setup_template<GFComponent>(comp_ref);
 }
 
@@ -51,10 +46,7 @@ Ref<GFComponent> GFComponent::from_id_no_source(ecs_entity_t comp, GFWorld* worl
 			"	Entity ", world->id_to_text(comp), " is not a component"
 		);
 	}
-	Ref<GFComponent> comp_ref = Ref(memnew(GFComponent));
-	comp_ref->source_entity_id = 0;
-	comp_ref->set_id(comp);
-	comp_ref->set_world(world);
+	Ref<GFComponent> comp_ref = Ref(memnew(GFComponent(0, comp, world)));
 	comp_ref->update_script();
 	return comp_ref;
 }
@@ -373,10 +365,6 @@ void GFComponent::set_source_id(ecs_entity_t id) {
 	source_entity_id = id;
 }
 
-Ref<GFRegisterableEntity> GFComponent::new_internal() {
-	return Ref(memnew(GFComponent));
-}
-
 void GFComponent::_bind_methods() {
 	GDVIRTUAL_BIND(_build, "b");
 	godot::ClassDB::bind_method(D_METHOD("_register_internal"), &GFComponent::_register_internal);
@@ -393,6 +381,4 @@ void GFComponent::_bind_methods() {
 	godot::ClassDB::bind_method(D_METHOD("get_data_alignment"), &GFComponent::get_data_alignment);
 	godot::ClassDB::bind_method(D_METHOD("is_alive"), &GFComponent::is_alive);
 	godot::ClassDB::bind_method(D_METHOD("_to_string"), &GFComponent::to_string);
-
-	godot::ClassDB::bind_static_method(get_class_static(), D_METHOD("_new_internal"), &GFComponent::new_internal);
 }
diff --git a/cpp/src/component.h b/cpp/src/component.h
index da79f99..88dae70 100644
--- a/cpp/src/component.h
+++ b/cpp/src/component.h
@@ -18,16 +18,18 @@ namespace godot {
 		GDCLASS(GFComponent, GFRegisterableEntity)
 
 	public:
-		GFComponent();
 		GFComponent(ecs_entity_t component, GFWorld* world):
-			GFRegisterableEntity(component, world) {
-				update_script();
-			}
+			GFRegisterableEntity(component, world),
+			source_entity_id(0)
+		{}
 		GFComponent(ecs_entity_t entity, ecs_entity_t component, GFWorld* world):
 			source_entity_id(entity),
-			GFRegisterableEntity(component, world) {
-				update_script();
-			}
+			GFRegisterableEntity(component, world)
+		{}
+		GFComponent():
+			source_entity_id(0),
+			GFRegisterableEntity(0, GFWorld::singleton())
+		{}
 		~GFComponent();
 
 		// --------------------------------------
@@ -63,7 +65,6 @@ namespace godot {
 		static const EcsStruct* get_struct_ptr(GFWorld*, ecs_entity_t);
 		void set_source_id(ecs_entity_t id);
 
-		static Ref<GFRegisterableEntity> new_internal();
 
 	protected:
 		static void _bind_methods();
diff --git a/cpp/src/component_builder.h b/cpp/src/component_builder.h
index a225246..f077e1a 100644
--- a/cpp/src/component_builder.h
+++ b/cpp/src/component_builder.h
@@ -16,7 +16,14 @@ namespace godot {
 		GDCLASS(GFComponentBuilder, RefCounted)
 
 	public:
-		GFComponentBuilder(GFWorld* world): world(world) {}
+		GFComponentBuilder(GFWorld* world):
+			component_desc({0}),
+			struct_desc({0}),
+			name(""),
+			member_names(Array()),
+			world(world),
+			built(false)
+		{}
 		GFComponentBuilder():
 			GFComponentBuilder(GFWorld::singleton())
 		{}
diff --git a/cpp/src/doc_classes/GFWorld.xml b/cpp/src/doc_classes/GFWorld.xml
index ec6dfde..e58b776 100644
--- a/cpp/src/doc_classes/GFWorld.xml
+++ b/cpp/src/doc_classes/GFWorld.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GFWorld" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/godotengine/godot/master/doc/class.xsd">
+<class name="GFWorld" inherits="Object"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/godotengine/godot/master/doc/class.xsd">
 	<brief_description>
 		An entity component system world.
 	</brief_description>
@@ -51,7 +52,6 @@
 				[/codeblock]
 			</description>
 		</method>
-		</method>
 		<method name="pair">
 			<return type="GFPair" />
 			<param index="0" name="first" type="Variant" />
diff --git a/cpp/src/entity.h b/cpp/src/entity.h
index 0522fc1..12ad883 100644
--- a/cpp/src/entity.h
+++ b/cpp/src/entity.h
@@ -28,7 +28,10 @@ namespace godot {
 		// New entity in specific world
 		GFEntity(GFWorld* world) ;
 		// Reference an entity
-		GFEntity(ecs_entity_t id_, GFWorld* world_): id(id_), world_instance_id(world_->get_instance_id()) {}
+		GFEntity(ecs_entity_t id_, GFWorld* world_):
+			id(id_),
+			world_instance_id(world_->get_instance_id())
+		{}
 		// Copy an entity reference
 		GFEntity(GFEntity& ett): GFEntity(ett.get_id(), ett.get_world()) {}
 		~GFEntity();
diff --git a/cpp/src/module.cpp b/cpp/src/module.cpp
index 2ee3693..2912fcf 100644
--- a/cpp/src/module.cpp
+++ b/cpp/src/module.cpp
@@ -129,9 +129,6 @@ void GFModule::_register_user() {
 	GFRegisterableEntity::_register_user();
 }
 
-Ref<GFRegisterableEntity> GFModule::new_internal() {
-	return Ref(memnew(GFModule));
-}
 
 void GFModule::_bind_methods() {
 	godot::ClassDB::bind_static_method(get_class_static(), D_METHOD("new_in_world", "world"), &GFModule::new_named_in_world);
@@ -140,5 +137,4 @@ void GFModule::_bind_methods() {
 	godot::ClassDB::bind_static_method(get_class_static(), D_METHOD("from_id", "module_id", "world"), &GFModule::from_id, nullptr);
 	godot::ClassDB::bind_method(D_METHOD("_register_internal"), &GFModule::_register_internal);
 	godot::ClassDB::bind_method(D_METHOD("_register_user"), &GFModule::_register_user);
-	godot::ClassDB::bind_static_method(get_class_static(), D_METHOD("_new_internal"), GFModule::new_internal);
 }
diff --git a/cpp/src/module.h b/cpp/src/module.h
index 6369c41..43b09d1 100644
--- a/cpp/src/module.h
+++ b/cpp/src/module.h
@@ -54,8 +54,6 @@ namespace godot {
 		static Ref<GFModule> from(Variant module, GFWorld*);
 		static Ref<GFModule> from_id(ecs_entity_t, GFWorld*);
 
-		static Ref<GFRegisterableEntity> new_internal();
-
 		// --------------------------------------
 		// --- Unexposed
 		// --------------------------------------
diff --git a/cpp/src/observer_builder.h b/cpp/src/observer_builder.h
index 23f6d47..07d2fd9 100644
--- a/cpp/src/observer_builder.h
+++ b/cpp/src/observer_builder.h
@@ -16,8 +16,13 @@ namespace godot {
 		GDCLASS(GFObserverBuilder, GFQuerylikeBuilder)
 
 	public:
-		GFObserverBuilder(GFWorld* world): GFQuerylikeBuilder(world) {}
-		GFObserverBuilder(): GFObserverBuilder(GFWorld::singleton()) {}
+		GFObserverBuilder(GFWorld* world):
+			GFQuerylikeBuilder(world),
+			events(0)
+		{}
+		GFObserverBuilder():
+			GFObserverBuilder(GFWorld::singleton())
+		{}
 		~GFObserverBuilder();
 
 		// **************************************
diff --git a/cpp/src/pair.cpp b/cpp/src/pair.cpp
index 15ea071..fdc591e 100644
--- a/cpp/src/pair.cpp
+++ b/cpp/src/pair.cpp
@@ -12,8 +12,6 @@
 
 using namespace godot;
 
-GFPair::GFPair() {
-}
 GFPair::~GFPair() {
 }
 
diff --git a/cpp/src/pair.h b/cpp/src/pair.h
index 2e7f91c..738230c 100644
--- a/cpp/src/pair.h
+++ b/cpp/src/pair.h
@@ -16,13 +16,15 @@ namespace godot {
 		GDCLASS(GFPair, GFEntity)
 
 	public:
-		GFPair();
 		GFPair(ecs_entity_t first, ecs_entity_t second, GFWorld* world):
 			GFEntity(ecs_make_pair(first, second), world)
-			{}
+		{}
 		GFPair(ecs_entity_t pair_id, GFWorld* world):
 			GFEntity(pair_id, world)
-			{}
+		{}
+		GFPair():
+			GFPair(0, nullptr)
+		{}
 		~GFPair();
 
 		// --------------------------------------
diff --git a/cpp/src/query.cpp b/cpp/src/query.cpp
index 88ece69..8d6fb13 100644
--- a/cpp/src/query.cpp
+++ b/cpp/src/query.cpp
@@ -9,9 +9,6 @@
 
 using namespace godot;
 
-GFQuery::GFQuery() {
-
-}
 GFQuery::~GFQuery() {
 	ecs_query_fini(query);
 }
diff --git a/cpp/src/query.h b/cpp/src/query.h
index 26cd565..03a2069 100644
--- a/cpp/src/query.h
+++ b/cpp/src/query.h
@@ -14,8 +14,13 @@ namespace godot {
 		GDCLASS(GFQuery, RefCounted)
 
 	public:
-		GFQuery();
-		GFQuery(GFWorld* world, ecs_query_t* query): world(world), query(query) {}
+		GFQuery(GFWorld* world, ecs_query_t* query):
+			world(world),
+			query(query)
+		{}
+		GFQuery():
+			GFQuery(nullptr, nullptr)
+		{}
 		~GFQuery();
 
 		// --------------------------------------
diff --git a/cpp/src/query_builder.h b/cpp/src/query_builder.h
index e3c26d4..6181b3c 100644
--- a/cpp/src/query_builder.h
+++ b/cpp/src/query_builder.h
@@ -18,8 +18,12 @@ namespace godot {
 		GDCLASS(GFQueryBuilder, GFQuerylikeBuilder)
 
 	public:
-		GFQueryBuilder(GFWorld* world): GFQuerylikeBuilder(world) {}
-		GFQueryBuilder(): GFQueryBuilder(GFWorld::singleton()) {}
+		GFQueryBuilder(GFWorld* world):
+			GFQuerylikeBuilder(world)
+		{}
+		GFQueryBuilder():
+			GFQueryBuilder(GFWorld::singleton())
+		{}
 		~GFQueryBuilder();
 
 		// **************************************
diff --git a/cpp/src/query_iterator.cpp b/cpp/src/query_iterator.cpp
index 8d509bb..1c82fc9 100644
--- a/cpp/src/query_iterator.cpp
+++ b/cpp/src/query_iterator.cpp
@@ -11,9 +11,6 @@
 
 using namespace godot;
 
-GFQueryIterator::GFQueryIterator() {
-}
-
 GFQueryIterator::~GFQueryIterator() {
 	if (!is_done()) {
 		ecs_iter_fini(&iterator);
diff --git a/cpp/src/query_iterator.h b/cpp/src/query_iterator.h
index 3319a04..8d89a73 100644
--- a/cpp/src/query_iterator.h
+++ b/cpp/src/query_iterator.h
@@ -12,11 +12,13 @@ namespace godot {
 		GDCLASS(GFQueryIterator, RefCounted)
 
 	public:
-		GFQueryIterator();
+		GFQueryIterator():
+			GFQueryIterator(nullptr, {0})
+		{}
 		GFQueryIterator(Ref<GFQuery> query, ecs_iter_t iterator):
 			query(query),
 			iterator(iterator)
-			{}
+		{}
 		~GFQueryIterator();
 
 		// --------------------------------------
diff --git a/cpp/src/querylike_builder.cpp b/cpp/src/querylike_builder.cpp
index 797f7d1..abe47d4 100644
--- a/cpp/src/querylike_builder.cpp
+++ b/cpp/src/querylike_builder.cpp
@@ -3,7 +3,6 @@
 #include "querylike_builder.h"
 #include "component.h"
 #include "godot_cpp/variant/callable.hpp"
-#include "godot_cpp/variant/utility_functions.hpp"
 #include "godot_cpp/variant/variant.hpp"
 #include "utils.h"
 #include "world.h"
@@ -13,8 +12,6 @@
 
 using namespace godot;
 
-GFQuerylikeBuilder::GFQuerylikeBuilder() {
-}
 GFQuerylikeBuilder::~GFQuerylikeBuilder() {
 }
 
diff --git a/cpp/src/querylike_builder.h b/cpp/src/querylike_builder.h
index 0b836cc..281d024 100644
--- a/cpp/src/querylike_builder.h
+++ b/cpp/src/querylike_builder.h
@@ -23,8 +23,15 @@ namespace godot {
 		friend QueryIterationContext;
 
 	public:
-		GFQuerylikeBuilder();
-		GFQuerylikeBuilder(GFWorld* world): world(world) {}
+		GFQuerylikeBuilder():
+			GFQuerylikeBuilder(nullptr)
+		{}
+		GFQuerylikeBuilder(GFWorld* world):
+			query_desc(0),
+			built(false),
+			term_count(0),
+			world(world)
+		{}
 		~GFQuerylikeBuilder();
 
 		// **************************************
diff --git a/cpp/src/registerable_entity.cpp b/cpp/src/registerable_entity.cpp
index 0a976f4..eed06d5 100644
--- a/cpp/src/registerable_entity.cpp
+++ b/cpp/src/registerable_entity.cpp
@@ -1,6 +1,7 @@
 
 #include "registerable_entity.h"
 #include "godot_cpp/classes/wrapped.hpp"
+#include "world.h"
 
 #include <flecs.h>
 #include <godot_cpp/core/class_db.hpp>
@@ -71,14 +72,9 @@ void GFRegisterableEntity::_register_user() {
 	GDVIRTUAL_CALL(_register, get_world());
 }
 
-Ref<GFRegisterableEntity> GFRegisterableEntity::new_internal() {
-	return Ref(memnew(GFRegisterableEntity));
-}
-
 void GFRegisterableEntity::_bind_methods() {
 	GDVIRTUAL_BIND(_register, "world");
 	godot::ClassDB::bind_static_method(GFRegisterableEntity::get_class_static(), D_METHOD("new_in_world", "world"), &GFRegisterableEntity::new_in_world);
 	godot::ClassDB::bind_method(D_METHOD("_register_internal"), &GFRegisterableEntity::_register_internal);
 	godot::ClassDB::bind_method(D_METHOD("_register_user"), &GFRegisterableEntity::_register_user);
-	godot::ClassDB::bind_static_method(get_class_static(), D_METHOD("_new_internal"), &GFRegisterableEntity::new_internal);
 }
diff --git a/cpp/src/registerable_entity.h b/cpp/src/registerable_entity.h
index 302c882..13a2f85 100644
--- a/cpp/src/registerable_entity.h
+++ b/cpp/src/registerable_entity.h
@@ -15,10 +15,15 @@ namespace godot {
 		GDCLASS(GFRegisterableEntity, GFEntity)
 
 	public:
-		GFRegisterableEntity(): GFEntity() {}
-		GFRegisterableEntity(GFWorld* world): GFEntity(world) {}
+		GFRegisterableEntity():
+			GFRegisterableEntity(GFWorld::singleton())
+		{}
+		GFRegisterableEntity(GFWorld* world):
+			GFEntity(world)
+		{}
 		GFRegisterableEntity(ecs_entity_t id, GFWorld* world):
-			GFEntity(id, world) {}
+			GFEntity(id, world)
+		{}
 		~GFRegisterableEntity();
 
 		// --------------------------------------------------------
@@ -26,7 +31,6 @@ namespace godot {
 		// --------------------------------------------------------
 
 		GDVIRTUAL1(_register, GFWorld*)
-		static Ref<GFRegisterableEntity> new_internal();
 
 		static Ref<GFRegisterableEntity> new_in_world(GFWorld*);
 		static Ref<GFRegisterableEntity> from_id(ecs_entity_t id, GFWorld* world);
diff --git a/cpp/src/system_builder.h b/cpp/src/system_builder.h
index 58ead46..5d9adb9 100644
--- a/cpp/src/system_builder.h
+++ b/cpp/src/system_builder.h
@@ -18,8 +18,13 @@ namespace godot {
 		GDCLASS(GFSystemBuilder, GFQuerylikeBuilder)
 
 	public:
-		GFSystemBuilder(GFWorld* world): GFQuerylikeBuilder(world) {}
-		GFSystemBuilder(): GFSystemBuilder(GFWorld::singleton()) {}
+		GFSystemBuilder(GFWorld* world):
+			GFQuerylikeBuilder(world),
+			callable(Callable())
+		{}
+		GFSystemBuilder():
+			GFSystemBuilder(GFWorld::singleton())
+		{}
 		~GFSystemBuilder();
 
 		// **************************************
diff --git a/gd/rendering/2d/systems.gd b/gd/rendering/2d/systems.gd
index de13ffe..76aa1a8 100644
--- a/gd/rendering/2d/systems.gd
+++ b/gd/rendering/2d/systems.gd
@@ -6,7 +6,8 @@ extends GFModule
 func _register(w:GFWorld):
 	#region GFCanvasItem
 	# On add GFCanvasItem
-	w.observer_builder("/root/flecs/core/OnAdd") \
+	GFObserverBuilder.new_in_world(w) \
+		.set_events("/root/flecs/core/OnAdd") \
 		.with(GFCanvasItem) \
 		.for_each(func(item:GFCanvasItem):
 			item.set_rid(RenderingServer.canvas_item_create())
@@ -17,7 +18,8 @@ func _register(w:GFWorld):
 			)
 
 	# On set GFCanvasItem
-	w.observer_builder("/root/flecs/core/OnSet") \
+	GFObserverBuilder.new_in_world(w) \
+		.set_events("/root/flecs/core/OnSet") \
 		.with(GFCanvasItem) \
 		.for_each(func(item:GFCanvasItem):
 			item.set_parent_canvas_item(
@@ -26,7 +28,8 @@ func _register(w:GFWorld):
 			)
 
 	# On remove GFCanvasItem
-	w.observer_builder("/root/flecs/core/OnRemove") \
+	GFObserverBuilder.new_in_world(w) \
+		.set_events("/root/flecs/core/OnRemove") \
 		.with(GFCanvasItem) \
 		.for_each(func(item:GFCanvasItem):
 			RenderingServer.free_rid(item.get_rid())
@@ -35,7 +38,8 @@ func _register(w:GFWorld):
 	
 	#region GFPosition2D
 	# On GFPosition2D set, update visual transform of CanvasItemC
-	w.observer_builder("/root/flecs/core/OnSet") \
+	GFObserverBuilder.new_in_world(w) \
+		.set_events("/root/flecs/core/OnSet") \
 		.with(GFCanvasItem).access_filter() \
 		.with(GFPosition2D) \
 		.maybe_with(GFRotation2D) \
@@ -52,7 +56,9 @@ func _register(w:GFWorld):
 
 	#region GFRotation2D
 	# On GFPosition2D set, update visual transform of GFCanvasItem
-	w.observer_builder("/root/flecs/core/OnSet") \
+	
+	GFObserverBuilder.new_in_world(w) \
+		.set_events("/root/flecs/core/OnSet") \
 		.with(GFCanvasItem).access_filter() \
 		.with(GFRotation2D) \
 		.maybe_with(GFPosition2D) \
@@ -69,7 +75,8 @@ func _register(w:GFWorld):
 	
 	#region GFScale2D
 	# On GFScale2D set, update visual transform of GFCanvasItem
-	w.observer_builder("/root/flecs/core/OnSet") \
+	GFObserverBuilder.new_in_world(w) \
+		.set_events("/root/flecs/core/OnSet") \
 		.with(GFCanvasItem).access_filter() \
 		.with(GFScale2D) \
 		.maybe_with(GFPosition2D) \
@@ -85,12 +92,14 @@ func _register(w:GFWorld):
 	#endregion
 
 	#region GFTexture2D
-	w.observer_builder("/root/flecs/core/OnAdd") \
+	GFObserverBuilder.new_in_world(w) \
+		.set_events("/root/flecs/core/OnAdd") \
 		.with(GFTexture2D) \
 		.with(GFCanvasItem) \
 		.for_each(GFTexture2D.update_texture_rect)
 		
-	w.observer_builder("/root/flecs/core/OnSet") \
+	GFObserverBuilder.new_in_world(w) \
+		.set_events("/root/flecs/core/OnSet") \
 		.with(GFTexture2D) \
 		.with(GFCanvasItem) \
 		.for_each(GFTexture2D.update_texture_rect)
diff --git a/unittests/test_components.gd b/unittests/test_components.gd
index 8bac7c3..fb7da35 100644
--- a/unittests/test_components.gd
+++ b/unittests/test_components.gd
@@ -66,10 +66,9 @@ func test_registration():
 
 
 func test_simple_system():
-	world.system_builder() \
+	GFSystemBuilder.new_in_world(world) \
 		.with(Foo) \
 		.for_each(func(foo):
-			prints("REA", foo.get_script())
 			foo.set_value(Vector2(2, 5))
 			)
 
@@ -142,7 +141,7 @@ class RegistrationA extends GFComponent:
 		setm(&"result", v)
 
 	func _register(w: GFWorld):
-		w.system_builder() \
+		GFSystemBuilder.new_in_world(w) \
 			.with(RegistrationA) \
 			.with(RegistrationB) \
 			.for_each(func(reg_a:RegistrationA, reg_b:RegistrationB):
@@ -164,8 +163,8 @@ class RegistrationB extends GFComponent:
 	func set_result(v:float) -> void:
 		setm(&"result", v)
 
-	func _register(world:GFWorld):
-		world.system_builder() \
+	func _register(w:GFWorld):
+		GFSystemBuilder.new_in_world(w) \
 			.with(RegistrationA) \
 			.with(RegistrationB) \
 			.for_each(func(reg_a:RegistrationA, reg_b:RegistrationB):
diff --git a/unittests/test_ecs_world.gd b/unittests/test_ecs_world.gd
index 2cf7b73..35c06d8 100644
--- a/unittests/test_ecs_world.gd
+++ b/unittests/test_ecs_world.gd
@@ -68,7 +68,7 @@ func test_world_deletion():
 	assert_eq(foo.is_alive(), false)
 
 func test_simple_system():
-	world.system_builder() \
+	GFSystemBuilder.new_in_world(world) \
 		.with(Foo) \
 		.for_each(func(foo:Foo):
 			foo.setm(&"vec", 2.67)
diff --git a/unittests/test_events.gd b/unittests/test_events.gd
index d7b4342..2ef4740 100644
--- a/unittests/test_events.gd
+++ b/unittests/test_events.gd
@@ -14,7 +14,8 @@ func after_each():
 func test_on_add_event():
 	var data:= {i=0}
 
-	world.observer_builder("flecs/core/OnAdd") \
+	GFObserverBuilder.new_in_world(world) \
+		.set_events("flecs/core/OnAdd") \
 		.with(Ints) \
 		.for_each(func(_ints: Ints):
 			data.i += 1
@@ -42,7 +43,8 @@ func test_on_add_event():
 # test events on_set_event
 func test_on_set_event():
 	var data:= {i=0}
-	world.observer_builder("flecs/core/OnSet") \
+	GFObserverBuilder.new_in_world(world) \
+		.set_events("flecs/core/OnSet") \
 		.with(Ints) \
 		.for_each(func(ints: Ints):
 			data.i += ints.a + ints.b
@@ -70,7 +72,8 @@ func test_on_set_event():
 
 func test_on_add_event_with_objects():
 	var data:= {i=0}
-	world.observer_builder("flecs/core/OnAdd") \
+	GFObserverBuilder.new_in_world(world) \
+		.set_events("flecs/core/OnAdd") \
 		.with(Textures) \
 		.for_each(func(_ints: Textures):
 			data.i += 1
diff --git a/unittests/test_prefab.gd b/unittests/test_prefab.gd
index d54917a..43dcbcc 100644
--- a/unittests/test_prefab.gd
+++ b/unittests/test_prefab.gd
@@ -14,7 +14,7 @@ func after_all():
 
 # test prefab prefab
 func test_prefab():
-	world.system_builder() \
+	GFSystemBuilder.new_in_world(world) \
 		.with(Foo) \
 		.with(Bar) \
 		.for_each(func(f:Foo, b:Bar):
diff --git a/unittests/test_queries.gd b/unittests/test_queries.gd
index 23524fc..96a7e38 100644
--- a/unittests/test_queries.gd
+++ b/unittests/test_queries.gd
@@ -37,7 +37,7 @@ func test_optional_terms():
 
 	data.ints = 0
 	data.bools = 0
-	w.system_builder() \
+	GFSystemBuilder.new_in_world(world) \
 		.with(Ints) \
 		.maybe_with(Bools) \
 		.for_each(callable)
@@ -47,7 +47,7 @@ func test_optional_terms():
 
 	data.ints = 0
 	data.bools = 0
-	w.system_builder() \
+	GFSystemBuilder.new_in_world(world) \
 		.maybe_with(Ints) \
 		.with(Bools) \
 		.for_each(callable)
@@ -59,7 +59,7 @@ func test_or_operation_terms():
 	var w:= world
 
 	var data:= {ints=0, bools=0}
-	w.system_builder() \
+	GFSystemBuilder.new_in_world(world) \
 		.with(Bools).or_with(Ints) \
 		.for_each(func(bools_or_ints:GFComponent):
 			if bools_or_ints is Ints:
diff --git a/unittests/test_relations.gd b/unittests/test_relations.gd
index 13f1613..7279d76 100644
--- a/unittests/test_relations.gd
+++ b/unittests/test_relations.gd
@@ -52,7 +52,8 @@ func test_basic_query():
 		.set_name("Cow") \
 		.add_pair("Eats", grass)
 
-	var grass_eater_iter:= world.query_builder() \
+	var grass_eater_iter:= GFQueryBuilder \
+		.new_in_world(world) \
 		.with(eats.pair(grass)) \
 		.build() as GFQuery
 	var grass_eater_count:= 0
@@ -60,7 +61,8 @@ func test_basic_query():
 		grass_eater_count += 1
 	assert_eq(grass_eater_count, 1)
 	
-	var eater_iter:= world.query_builder() \
+	var eater_iter:= GFQueryBuilder \
+		.new_in_world(world) \
 		.with(eats.pair("flecs/core/*")) \
 		.build() as GFQuery
 	var eater_count:= 0
diff --git a/unittests/test_simple_systems.gd b/unittests/test_simple_systems.gd
index 122f094..253155b 100644
--- a/unittests/test_simple_systems.gd
+++ b/unittests/test_simple_systems.gd
@@ -52,7 +52,7 @@ func after_all():
 	#entity.free()
 
 func test_bools():
-	world.system_builder() \
+	GFSystemBuilder.new_in_world(world) \
 		.with(Bools) \
 		.for_each(func(x:Bools):
 			x.b = x.a
@@ -71,7 +71,7 @@ func test_bools():
 	entity.delete()
 
 func test_ints():
-	world.system_builder() \
+	GFSystemBuilder.new_in_world(world) \
 		.with(Ints) \
 		.for_each(func(x:Ints):
 			x.b *= 2
@@ -92,7 +92,7 @@ func test_ints():
 	entity.delete()
 
 func test_floats():
-	world.system_builder() \
+	GFSystemBuilder.new_in_world(world) \
 		.with(Floats) \
 		.for_each(func(x:Floats):
 			x.b *= 2
@@ -114,7 +114,7 @@ func test_floats():
 
 # test simple_systems strings
 func test_strings():
-	world.system_builder() \
+	GFSystemBuilder.new_in_world(world) \
 		.with(Strings) \
 		.for_each(func(x:Strings):
 			x.b += "em"
@@ -138,7 +138,7 @@ func test_strings():
 	entity.delete()
 
 func test_byte_arrays():
-	world.system_builder() \
+	GFSystemBuilder.new_in_world(world) \
 		.with(ByteArrays) \
 		.for_each(func(x:ByteArrays):
 			for i in range(x.a.size()):
@@ -161,7 +161,7 @@ func test_byte_arrays():
 
 # test simple_systems textures
 func test_textures():
-	world.system_builder() \
+	GFSystemBuilder.new_in_world(world) \
 		.with(Textures) \
 		.for_each(func(x:Textures):
 			x.a = x.b
@@ -205,7 +205,7 @@ func test_ref_counts():
 	entity.delete()
 
 func test_arrays():
-	world.system_builder() \
+	GFSystemBuilder.new_in_world(world) \
 		.with(Arrays) \
 		.for_each(func(x:Arrays):
 			for i in mini(x.a.size(), x.b.size()):
@@ -228,7 +228,7 @@ func test_arrays():
 	entity.delete()
 
 func test_dicts():
-	world.system_builder() \
+	GFSystemBuilder.new_in_world(world) \
 		.with(Dicts) \
 		.for_each(func(x:Dicts):
 			x.b["value"] += x.a["add_by"]
diff --git a/unittests/test_systems.gd b/unittests/test_systems.gd
index abb4eb8..045d913 100644
--- a/unittests/test_systems.gd
+++ b/unittests/test_systems.gd
@@ -15,7 +15,7 @@ func after_each():
 func test_stuff():
 	pass
 	#world.system_builder(&"test_pipeline") \
-	world.system_builder() \
+	GFSystemBuilder.new_in_world(world) \
 		.with(Bools) \
 		.for_each(func(boo:Bools):
 			boo.b = boo.a