767 files changed, 63235 insertions, 43333 deletions

diff --git a/modules/SCsub b/modules/SCsub
index dc0420616c..edfc4ed9c6 100644
--- a/modules/SCsub
+++ b/modules/SCsub
@@ -1,24 +1,66 @@
 #!/usr/bin/env python
 
-Import('env')
+import modules_builders
+import os
+
+Import("env")
 
 env_modules = env.Clone()
 
-Export('env_modules')
+Export("env_modules")
 
-env.modules_sources = []
+# Header with MODULE_*_ENABLED defines.
+env.CommandNoCache(
+    "modules_enabled.gen.h",
+    Value(env.module_list),
+    env.Run(
+        modules_builders.generate_modules_enabled,
+        "Generating enabled modules header.",
+        # NOTE: No need to run in subprocess since this is still executed serially.
+        subprocess=False,
+    ),
+)
 
-env_modules.add_source_files(env.modules_sources, "register_module_types.gen.cpp")
+# Header to be included in `tests/test_main.cpp` to run module-specific tests.
+if env["tests"]:
+    env.CommandNoCache(
+        "modules_tests.gen.h",
+        Value(env.module_list),
+        env.Run(
+            modules_builders.generate_modules_tests,
+            "Generating modules tests header.",
+            # NOTE: No need to run in subprocess since this is still executed serially.
+            subprocess=False,
+        ),
+    )
+    env.AlwaysBuild("modules_tests.gen.h")
 
-for x in env.module_list:
-    if (x in env.disabled_modules):
-        continue
-    env_modules.Append(CPPDEFINES=["MODULE_" + x.upper() + "_ENABLED"])
-    SConscript(x + "/SCsub")
+vs_sources = []
+# libmodule_<name>.a for each active module.
+for name, path in env.module_list.items():
+    env.modules_sources = []
 
-if env['split_libmodules']:
-    env.split_lib("modules", env_lib = env_modules)
-else:
-    lib = env_modules.add_library("modules", env.modules_sources)
+    if not os.path.isabs(path):
+        SConscript(name + "/SCsub")  # Built-in.
+    else:
+        SConscript(path + "/SCsub")  # Custom.
 
+    # Some modules are not linked automatically but can be enabled optionally
+    # on iOS, so we handle those specially.
+    if env["platform"] == "iphone" and name in ["arkit", "camera"]:
+        continue
+
+    lib = env_modules.add_library("module_%s" % name, env.modules_sources)
     env.Prepend(LIBS=[lib])
+    if env["vsproj"]:
+        vs_sources += env.modules_sources
+
+# libmodules.a with only register_module_types.
+# Must be last so that all libmodule_<name>.a libraries are on the right side
+# in the linker command.
+env.modules_sources = []
+env_modules.add_source_files(env.modules_sources, "register_module_types.gen.cpp")
+lib = env_modules.add_library("modules", env.modules_sources)
+env.Prepend(LIBS=[lib])
+if env["vsproj"]:
+    env.modules_sources += vs_sources
diff --git a/modules/arkit/SCsub b/modules/arkit/SCsub
index e605703a72..7e103d6565 100644
--- a/modules/arkit/SCsub
+++ b/modules/arkit/SCsub
@@ -1,12 +1,15 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_arkit = env_modules.Clone()
 
+# (iOS) Enable module support
+env_arkit.Append(CCFLAGS=["-fmodules", "-fcxx-modules"])
+
 # (iOS) Build as separate static library
 modules_sources = []
 env_arkit.add_source_files(modules_sources, "*.cpp")
 env_arkit.add_source_files(modules_sources, "*.mm")
-mod_lib = env_modules.add_library('#bin/libgodot_arkit_module' + env['LIBSUFFIX'], modules_sources)
\ No newline at end of file
+mod_lib = env_modules.add_library("#bin/libgodot_arkit_module" + env["LIBSUFFIX"], modules_sources)
diff --git a/modules/arkit/arkit_interface.h b/modules/arkit/arkit_interface.h
index cb18350409..5a2c50e213 100644
--- a/modules/arkit/arkit_interface.h
+++ b/modules/arkit/arkit_interface.h
@@ -31,9 +31,9 @@
 #ifndef ARKIT_INTERFACE_H
 #define ARKIT_INTERFACE_H
 
-#include "servers/arvr/arvr_interface.h"
-#include "servers/arvr/arvr_positional_tracker.h"
 #include "servers/camera/camera_feed.h"
+#include "servers/xr/xr_interface.h"
+#include "servers/xr/xr_positional_tracker.h"
 
 /**
 	@author Bastiaan Olij <mux213@gmail.com>
@@ -44,8 +44,8 @@
 // forward declaration for some needed objects
 class ARKitShader;
 
-class ARKitInterface : public ARVRInterface {
-	GDCLASS(ARKitInterface, ARVRInterface);
+class ARKitInterface : public XRInterface {
+	GDCLASS(ARKitInterface, XRInterface);
 
 private:
 	bool initialized;
@@ -60,12 +60,12 @@ private:
 	float eye_height, z_near, z_far;
 
 	Ref<CameraFeed> feed;
-	int image_width[2];
-	int image_height[2];
-	PoolVector<uint8_t> img_data[2];
+	size_t image_width[2];
+	size_t image_height[2];
+	Vector<uint8_t> img_data[2];
 
 	struct anchor_map {
-		ARVRPositionalTracker *tracker;
+		XRPositionalTracker *tracker;
 		unsigned char uuid[16];
 	};
 
@@ -73,7 +73,7 @@ private:
 	unsigned int num_anchors;
 	unsigned int max_anchors;
 	anchor_map *anchors;
-	ARVRPositionalTracker *get_anchor_for_uuid(const unsigned char *p_uuid);
+	XRPositionalTracker *get_anchor_for_uuid(const unsigned char *p_uuid);
 	void remove_anchor_for_uuid(const unsigned char *p_uuid);
 	void remove_all_anchors();
 
@@ -84,9 +84,9 @@ public:
 	void start_session();
 	void stop_session();
 
-	bool get_anchor_detection_is_enabled() const;
-	void set_anchor_detection_is_enabled(bool p_enable);
-	virtual int get_camera_feed_id();
+	bool get_anchor_detection_is_enabled() const override;
+	void set_anchor_detection_is_enabled(bool p_enable) override;
+	virtual int get_camera_feed_id() override;
 
 	bool get_light_estimation_is_enabled() const;
 	void set_light_estimation_is_enabled(bool p_enable);
@@ -97,22 +97,22 @@ public:
 	/* while Godot has its own raycast logic this takes ARKits camera into account and hits on any ARAnchor */
 	Array raycast(Vector2 p_screen_coord);
 
-	void notification(int p_what);
+	virtual void notification(int p_what) override;
 
-	virtual StringName get_name() const;
-	virtual int get_capabilities() const;
+	virtual StringName get_name() const override;
+	virtual int get_capabilities() const override;
 
-	virtual bool is_initialized() const;
-	virtual bool initialize();
-	virtual void uninitialize();
+	virtual bool is_initialized() const override;
+	virtual bool initialize() override;
+	virtual void uninitialize() override;
 
-	virtual Size2 get_render_targetsize();
-	virtual bool is_stereo();
-	virtual Transform get_transform_for_eye(ARVRInterface::Eyes p_eye, const Transform &p_cam_transform);
-	virtual CameraMatrix get_projection_for_eye(ARVRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far);
-	virtual void commit_for_eye(ARVRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect);
+	virtual Size2 get_render_targetsize() override;
+	virtual bool is_stereo() override;
+	virtual Transform get_transform_for_eye(XRInterface::Eyes p_eye, const Transform &p_cam_transform) override;
+	virtual CameraMatrix get_projection_for_eye(XRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far) override;
+	virtual void commit_for_eye(XRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect) override;
 
-	virtual void process();
+	virtual void process() override;
 
 	// called by delegate (void * because C++ and Obj-C don't always mix, should really change all platform/iphone/*.cpp files to .mm)
 	void _add_or_update_anchor(void *p_anchor);
diff --git a/modules/arkit/arkit_interface.mm b/modules/arkit/arkit_interface.mm
index 1896a34e46..3fb2cc933d 100644
--- a/modules/arkit/arkit_interface.mm
+++ b/modules/arkit/arkit_interface.mm
@@ -28,10 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/os.h"
 #include "scene/resources/surface_tool.h"
-#include "servers/visual/visual_server_globals.h"
+#include "servers/rendering/rendering_server_globals.h"
 
 #import <ARKit/ARKit.h>
 #import <UIKit/UIKit.h>
@@ -42,7 +42,9 @@
 #include "arkit_session_delegate.h"
 
 // just a dirty workaround for now, declare these as globals. I'll probably encapsulate ARSession and associated logic into an mm object and change ARKitInterface to a normal cpp object that consumes it.
+API_AVAILABLE(ios(11.0))
 ARSession *ar_session;
+
 ARKitSessionDelegate *ar_delegate;
 NSTimeInterval last_timestamp;
 
@@ -55,22 +57,28 @@ void ARKitInterface::start_session() {
 	if (initialized) {
 		print_line("Starting ARKit session");
 
-		Class ARWorldTrackingConfigurationClass = NSClassFromString(@"ARWorldTrackingConfiguration");
-		ARWorldTrackingConfiguration *configuration = [ARWorldTrackingConfigurationClass new];
+		if (@available(iOS 11, *)) {
+			Class ARWorldTrackingConfigurationClass = NSClassFromString(@"ARWorldTrackingConfiguration");
+			ARWorldTrackingConfiguration *configuration = [ARWorldTrackingConfigurationClass new];
 
-		configuration.lightEstimationEnabled = light_estimation_is_enabled;
-		if (plane_detection_is_enabled) {
-			configuration.planeDetection = ARPlaneDetectionVertical | ARPlaneDetectionHorizontal;
-		} else {
-			configuration.planeDetection = 0;
-		}
+			configuration.lightEstimationEnabled = light_estimation_is_enabled;
+			if (plane_detection_is_enabled) {
+				if (@available(iOS 11.3, *)) {
+					configuration.planeDetection = ARPlaneDetectionVertical | ARPlaneDetectionHorizontal;
+				} else {
+					configuration.planeDetection = ARPlaneDetectionHorizontal;
+				}
+			} else {
+				configuration.planeDetection = 0;
+			}
 
-		// make sure our camera is on
-		if (feed.is_valid()) {
-			feed->set_active(true);
-		}
+			// make sure our camera is on
+			if (feed.is_valid()) {
+				feed->set_active(true);
+			}
 
-		[ar_session runWithConfiguration:configuration];
+			[ar_session runWithConfiguration:configuration];
+		}
 	}
 }
 
@@ -84,7 +92,9 @@ void ARKitInterface::stop_session() {
 			feed->set_active(false);
 		}
 
-		[ar_session pause];
+		if (@available(iOS 11.0, *)) {
+			[ar_session pause];
+		}
 	}
 }
 
@@ -92,12 +102,12 @@ void ARKitInterface::notification(int p_what) {
 	// TODO, this is not being called, need to find out why, possibly because this is not a node.
 	// in that case we need to find a way to get these notifications!
 	switch (p_what) {
-		case MainLoop::NOTIFICATION_WM_FOCUS_IN: {
+		case DisplayServer::WINDOW_EVENT_FOCUS_IN: {
 			print_line("Focus in");
 
 			start_session();
 		}; break;
-		case MainLoop::NOTIFICATION_WM_FOCUS_OUT: {
+		case DisplayServer::WINDOW_EVENT_FOCUS_OUT: {
 			print_line("Focus out");
 
 			stop_session();
@@ -158,41 +168,46 @@ StringName ARKitInterface::get_name() const {
 }
 
 int ARKitInterface::get_capabilities() const {
-	return ARKitInterface::ARVR_MONO + ARKitInterface::ARVR_AR;
+	return ARKitInterface::XR_MONO + ARKitInterface::XR_AR;
 }
 
 Array ARKitInterface::raycast(Vector2 p_screen_coord) {
-	Array arr;
-	Size2 screen_size = OS::get_singleton()->get_window_size();
-	CGPoint point;
-	point.x = p_screen_coord.x / screen_size.x;
-	point.y = p_screen_coord.y / screen_size.y;
-
-	///@TODO maybe give more options here, for now we're taking just ARAchors into account that were found during plane detection keeping their size into account
-	NSArray<ARHitTestResult *> *results = [ar_session.currentFrame hittest:point types:ARHitTestResultTypeExistingPlaneUsingExtent];
-
-	for (ARHitTestResult *result in results) {
-		Transform transform;
-
-		matrix_float4x4 m44 = result.worldTransform;
-		transform.basis.elements[0].x = m44.columns[0][0];
-		transform.basis.elements[1].x = m44.columns[0][1];
-		transform.basis.elements[2].x = m44.columns[0][2];
-		transform.basis.elements[0].y = m44.columns[1][0];
-		transform.basis.elements[1].y = m44.columns[1][1];
-		transform.basis.elements[2].y = m44.columns[1][2];
-		transform.basis.elements[0].z = m44.columns[2][0];
-		transform.basis.elements[1].z = m44.columns[2][1];
-		transform.basis.elements[2].z = m44.columns[2][2];
-		transform.origin.x = m44.columns[3][0];
-		transform.origin.y = m44.columns[3][1];
-		transform.origin.z = m44.columns[3][2];
-
-		/* important, NOT scaled to world_scale !! */
-		arr.push_back(transform);
-	}
+	if (@available(iOS 11, *)) {
+		Array arr;
+		Size2 screen_size = DisplayServer::get_singleton()->screen_get_size();
+		CGPoint point;
+		point.x = p_screen_coord.x / screen_size.x;
+		point.y = p_screen_coord.y / screen_size.y;
+
+		///@TODO maybe give more options here, for now we're taking just ARAchors into account that were found during plane detection keeping their size into account
+
+		NSArray<ARHitTestResult *> *results = [ar_session.currentFrame hitTest:point types:ARHitTestResultTypeExistingPlaneUsingExtent];
+
+		for (ARHitTestResult *result in results) {
+			Transform transform;
+
+			matrix_float4x4 m44 = result.worldTransform;
+			transform.basis.elements[0].x = m44.columns[0][0];
+			transform.basis.elements[1].x = m44.columns[0][1];
+			transform.basis.elements[2].x = m44.columns[0][2];
+			transform.basis.elements[0].y = m44.columns[1][0];
+			transform.basis.elements[1].y = m44.columns[1][1];
+			transform.basis.elements[2].y = m44.columns[1][2];
+			transform.basis.elements[0].z = m44.columns[2][0];
+			transform.basis.elements[1].z = m44.columns[2][1];
+			transform.basis.elements[2].z = m44.columns[2][2];
+			transform.origin.x = m44.columns[3][0];
+			transform.origin.y = m44.columns[3][1];
+			transform.origin.z = m44.columns[3][2];
+
+			/* important, NOT scaled to world_scale !! */
+			arr.push_back(transform);
+		}
 
-	return arr;
+		return arr;
+	} else {
+		return Array();
+	}
 }
 
 void ARKitInterface::_bind_methods() {
@@ -218,62 +233,66 @@ bool ARKitInterface::is_initialized() const {
 }
 
 bool ARKitInterface::initialize() {
-	ARVRServer *arvr_server = ARVRServer::get_singleton();
-	ERR_FAIL_NULL_V(arvr_server, false);
-
-	if (!initialized) {
-		print_line("initializing ARKit");
-
-		// create our ar session and delegate
-		Class ARSessionClass = NSClassFromString(@"ARSession");
-		if (ARSessionClass == Nil) {
-			void *arkit_handle = dlopen("/System/Library/Frameworks/ARKit.framework/ARKit", RTLD_NOW);
-			if (arkit_handle) {
-				ARSessionClass = NSClassFromString(@"ARSession");
-			} else {
-				print_line("ARKit init failed");
-				return false;
+	XRServer *xr_server = XRServer::get_singleton();
+	ERR_FAIL_NULL_V(xr_server, false);
+
+	if (@available(iOS 11, *)) {
+		if (!initialized) {
+			print_line("initializing ARKit");
+
+			// create our ar session and delegate
+			Class ARSessionClass = NSClassFromString(@"ARSession");
+			if (ARSessionClass == Nil) {
+				void *arkit_handle = dlopen("/System/Library/Frameworks/ARKit.framework/ARKit", RTLD_NOW);
+				if (arkit_handle) {
+					ARSessionClass = NSClassFromString(@"ARSession");
+				} else {
+					print_line("ARKit init failed");
+					return false;
+				}
 			}
-		}
-		ar_session = [ARSessionClass new];
-		ar_delegate = [ARKitSessionDelegate new];
-		ar_delegate.arkit_interface = this;
-		ar_session.delegate = ar_delegate;
+			ar_session = [ARSessionClass new];
+			ar_delegate = [ARKitSessionDelegate new];
+			ar_delegate.arkit_interface = this;
+			ar_session.delegate = ar_delegate;
 
-		// reset our transform
-		transform = Transform();
+			// reset our transform
+			transform = Transform();
 
-		// make this our primary interface
-		arvr_server->set_primary_interface(this);
+			// make this our primary interface
+			xr_server->set_primary_interface(this);
 
-		// make sure we have our feed setup
-		if (feed.is_null()) {
-			feed.instance();
-			feed->set_name("ARKit");
+			// make sure we have our feed setup
+			if (feed.is_null()) {
+				feed.instance();
+				feed->set_name("ARKit");
 
-			CameraServer *cs = CameraServer::get_singleton();
-			if (cs != NULL) {
-				cs->add_feed(feed);
+				CameraServer *cs = CameraServer::get_singleton();
+				if (cs != NULL) {
+					cs->add_feed(feed);
+				}
 			}
-		}
-		feed->set_active(true);
+			feed->set_active(true);
 
-		// yeah!
-		initialized = true;
+			// yeah!
+			initialized = true;
 
-		// Start our session...
-		start_session();
-	}
+			// Start our session...
+			start_session();
+		}
 
-	return true;
+		return true;
+	} else {
+		return false;
+	}
 }
 
 void ARKitInterface::uninitialize() {
 	if (initialized) {
-		ARVRServer *arvr_server = ARVRServer::get_singleton();
-		if (arvr_server != NULL) {
+		XRServer *xr_server = XRServer::get_singleton();
+		if (xr_server != NULL) {
 			// no longer our primary interface
-			arvr_server->clear_primary_interface_if(this);
+			xr_server->clear_primary_interface_if(this);
 		}
 
 		if (feed.is_valid()) {
@@ -286,9 +305,12 @@ void ARKitInterface::uninitialize() {
 
 		remove_all_anchors();
 
-		[ar_session release];
+		if (@available(iOS 11.0, *)) {
+			[ar_session release];
+			ar_session = NULL;
+		}
 		[ar_delegate release];
-		ar_session = NULL;
+
 		ar_delegate = NULL;
 		initialized = false;
 		session_was_started = false;
@@ -296,29 +318,29 @@ void ARKitInterface::uninitialize() {
 }
 
 Size2 ARKitInterface::get_render_targetsize() {
-	_THREAD_SAFE_METHOD_
+	// _THREAD_SAFE_METHOD_
 
-	Size2 target_size = OS::get_singleton()->get_window_size();
+	Size2 target_size = DisplayServer::get_singleton()->screen_get_size();
 
 	return target_size;
 }
 
-Transform ARKitInterface::get_transform_for_eye(ARVRInterface::Eyes p_eye, const Transform &p_cam_transform) {
-	_THREAD_SAFE_METHOD_
+Transform ARKitInterface::get_transform_for_eye(XRInterface::Eyes p_eye, const Transform &p_cam_transform) {
+	// _THREAD_SAFE_METHOD_
 
 	Transform transform_for_eye;
 
-	ARVRServer *arvr_server = ARVRServer::get_singleton();
-	ERR_FAIL_NULL_V(arvr_server, transform_for_eye);
+	XRServer *xr_server = XRServer::get_singleton();
+	ERR_FAIL_NULL_V(xr_server, transform_for_eye);
 
 	if (initialized) {
-		float world_scale = arvr_server->get_world_scale();
+		float world_scale = xr_server->get_world_scale();
 
 		// just scale our origin point of our transform, note that we really shouldn't be using world_scale in ARKit but....
 		transform_for_eye = transform;
 		transform_for_eye.origin *= world_scale;
 
-		transform_for_eye = p_cam_transform * arvr_server->get_reference_frame() * transform_for_eye;
+		transform_for_eye = p_cam_transform * xr_server->get_reference_frame() * transform_for_eye;
 	} else {
 		// huh? well just return what we got....
 		transform_for_eye = p_cam_transform;
@@ -327,7 +349,7 @@ Transform ARKitInterface::get_transform_for_eye(ARVRInterface::Eyes p_eye, const
 	return transform_for_eye;
 }
 
-CameraMatrix ARKitInterface::get_projection_for_eye(ARVRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far) {
+CameraMatrix ARKitInterface::get_projection_for_eye(XRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far) {
 	// Remember our near and far, it will be used in process when we obtain our projection from our ARKit session.
 	z_near = p_z_near;
 	z_far = p_z_far;
@@ -335,8 +357,8 @@ CameraMatrix ARKitInterface::get_projection_for_eye(ARVRInterface::Eyes p_eye, r
 	return projection;
 }
 
-void ARKitInterface::commit_for_eye(ARVRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect) {
-	_THREAD_SAFE_METHOD_
+void ARKitInterface::commit_for_eye(XRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect) {
+	// _THREAD_SAFE_METHOD_
 
 	// We must have a valid render target
 	ERR_FAIL_COND(!p_render_target.is_valid());
@@ -345,18 +367,18 @@ void ARKitInterface::commit_for_eye(ARVRInterface::Eyes p_eye, RID p_render_targ
 	ERR_FAIL_COND(p_screen_rect == Rect2());
 
 	// get the size of our screen
-	Rect2 screen_rect = p_screen_rect;
+	//	Rect2 screen_rect = p_screen_rect;
 
 	//		screen_rect.position.x += screen_rect.size.x;
 	//		screen_rect.size.x = -screen_rect.size.x;
 	//		screen_rect.position.y += screen_rect.size.y;
 	//		screen_rect.size.y = -screen_rect.size.y;
 
-	VSG::rasterizer->set_current_render_target(RID());
-	VSG::rasterizer->blit_render_target_to_screen(p_render_target, screen_rect, 0);
+	//	VSG::rasterizer->set_current_render_target(RID());
+	//	VSG::rasterizer->blit_render_target_to_screen(p_render_target, screen_rect, 0);
 }
 
-ARVRPositionalTracker *ARKitInterface::get_anchor_for_uuid(const unsigned char *p_uuid) {
+XRPositionalTracker *ARKitInterface::get_anchor_for_uuid(const unsigned char *p_uuid) {
 	if (anchors == NULL) {
 		num_anchors = 0;
 		max_anchors = 10;
@@ -377,8 +399,8 @@ ARVRPositionalTracker *ARKitInterface::get_anchor_for_uuid(const unsigned char *
 		ERR_FAIL_NULL_V(anchors, NULL);
 	}
 
-	ARVRPositionalTracker *new_tracker = memnew(ARVRPositionalTracker);
-	new_tracker->set_type(ARVRServer::TRACKER_ANCHOR);
+	XRPositionalTracker *new_tracker = memnew(XRPositionalTracker);
+	new_tracker->set_type(XRServer::TRACKER_ANCHOR);
 
 	char tracker_name[256];
 	sprintf(tracker_name, "Anchor %02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x", p_uuid[0], p_uuid[1], p_uuid[2], p_uuid[3], p_uuid[4], p_uuid[5], p_uuid[6], p_uuid[7], p_uuid[8], p_uuid[9], p_uuid[10], p_uuid[11], p_uuid[12], p_uuid[13], p_uuid[14], p_uuid[15]);
@@ -388,7 +410,7 @@ ARVRPositionalTracker *ARKitInterface::get_anchor_for_uuid(const unsigned char *
 	new_tracker->set_name(name);
 
 	// add our tracker
-	ARVRServer::get_singleton()->add_tracker(new_tracker);
+	XRServer::get_singleton()->add_tracker(new_tracker);
 	anchors[num_anchors].tracker = new_tracker;
 	memcpy(anchors[num_anchors].uuid, p_uuid, 16);
 	num_anchors++;
@@ -401,7 +423,7 @@ void ARKitInterface::remove_anchor_for_uuid(const unsigned char *p_uuid) {
 		for (unsigned int i = 0; i < num_anchors; i++) {
 			if (memcmp(anchors[i].uuid, p_uuid, 16) == 0) {
 				// remove our tracker
-				ARVRServer::get_singleton()->remove_tracker(anchors[i].tracker);
+				XRServer::get_singleton()->remove_tracker(anchors[i].tracker);
 				memdelete(anchors[i].tracker);
 
 				// bring remaining forward
@@ -421,7 +443,7 @@ void ARKitInterface::remove_all_anchors() {
 	if (anchors != NULL) {
 		for (unsigned int i = 0; i < num_anchors; i++) {
 			// remove our tracker
-			ARVRServer::get_singleton()->remove_tracker(anchors[i].tracker);
+			XRServer::get_singleton()->remove_tracker(anchors[i].tracker);
 			memdelete(anchors[i].tracker);
 		};
 
@@ -432,7 +454,7 @@ void ARKitInterface::remove_all_anchors() {
 }
 
 void ARKitInterface::process() {
-	_THREAD_SAFE_METHOD_
+	// _THREAD_SAFE_METHOD_
 
 	if (@available(iOS 11.0, *)) {
 		if (initialized) {
@@ -443,8 +465,16 @@ void ARKitInterface::process() {
 				last_timestamp = current_frame.timestamp;
 
 				// get some info about our screen and orientation
-				Size2 screen_size = OS::get_singleton()->get_window_size();
-				UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
+				Size2 screen_size = DisplayServer::get_singleton()->screen_get_size();
+				UIInterfaceOrientation orientation = UIInterfaceOrientationUnknown;
+
+				if (@available(iOS 13, *)) {
+					orientation = [UIApplication sharedApplication].delegate.window.windowScene.interfaceOrientation;
+#if !defined(TARGET_OS_SIMULATOR) || !TARGET_OS_SIMULATOR
+				} else {
+					orientation = [[UIApplication sharedApplication] statusBarOrientation];
+#endif
+				}
 
 				// Grab our camera image for our backbuffer
 				CVPixelBufferRef pixelBuffer = current_frame.capturedImage;
@@ -475,27 +505,27 @@ void ARKitInterface::process() {
 
 						{
 							// do Y
-							int new_width = CVPixelBufferGetWidthOfPlane(pixelBuffer, 0);
-							int new_height = CVPixelBufferGetHeightOfPlane(pixelBuffer, 0);
-							int bytes_per_row = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, 0);
+							size_t new_width = CVPixelBufferGetWidthOfPlane(pixelBuffer, 0);
+							size_t new_height = CVPixelBufferGetHeightOfPlane(pixelBuffer, 0);
+							size_t bytes_per_row = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, 0);
 
 							if ((image_width[0] != new_width) || (image_height[0] != new_height)) {
 								printf("- Camera padding l:%lu r:%lu t:%lu b:%lu\n", extraLeft, extraRight, extraTop, extraBottom);
-								printf("- Camera Y plane size: %i, %i - %i\n", new_width, new_height, bytes_per_row);
+								printf("- Camera Y plane size: %lu, %lu - %lu\n", new_width, new_height, bytes_per_row);
 
 								image_width[0] = new_width;
 								image_height[0] = new_height;
 								img_data[0].resize(new_width * new_height);
 							}
 
-							PoolVector<uint8_t>::Write w = img_data[0].write();
+							uint8_t *w = img_data[0].ptrw();
 							if (new_width == bytes_per_row) {
-								memcpy(w.ptr(), dataY, new_width * new_height);
+								memcpy(w, dataY, new_width * new_height);
 							} else {
-								int offset_a = 0;
-								int offset_b = extraLeft + (extraTop * bytes_per_row);
-								for (int r = 0; r < new_height; r++) {
-									memcpy(w.ptr() + offset_a, dataY + offset_b, new_width);
+								size_t offset_a = 0;
+								size_t offset_b = extraLeft + (extraTop * bytes_per_row);
+								for (size_t r = 0; r < new_height; r++) {
+									memcpy(w + offset_a, dataY + offset_b, new_width);
 									offset_a += new_width;
 									offset_b += bytes_per_row;
 								}
@@ -507,26 +537,26 @@ void ARKitInterface::process() {
 
 						{
 							// do CbCr
-							int new_width = CVPixelBufferGetWidthOfPlane(pixelBuffer, 1);
-							int new_height = CVPixelBufferGetHeightOfPlane(pixelBuffer, 1);
-							int bytes_per_row = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, 0);
+							size_t new_width = CVPixelBufferGetWidthOfPlane(pixelBuffer, 1);
+							size_t new_height = CVPixelBufferGetHeightOfPlane(pixelBuffer, 1);
+							size_t bytes_per_row = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, 0);
 
 							if ((image_width[1] != new_width) || (image_height[1] != new_height)) {
-								printf("- Camera CbCr plane size: %i, %i - %i\n", new_width, new_height, bytes_per_row);
+								printf("- Camera CbCr plane size: %lu, %lu - %lu\n", new_width, new_height, bytes_per_row);
 
 								image_width[1] = new_width;
 								image_height[1] = new_height;
 								img_data[1].resize(2 * new_width * new_height);
 							}
 
-							PoolVector<uint8_t>::Write w = img_data[1].write();
+							uint8_t *w = img_data[1].ptrw();
 							if ((2 * new_width) == bytes_per_row) {
-								memcpy(w.ptr(), dataCbCr, 2 * new_width * new_height);
+								memcpy(w, dataCbCr, 2 * new_width * new_height);
 							} else {
-								int offset_a = 0;
-								int offset_b = extraLeft + (extraTop * bytes_per_row);
-								for (int r = 0; r < new_height; r++) {
-									memcpy(w.ptr() + offset_a, dataCbCr + offset_b, 2 * new_width);
+								size_t offset_a = 0;
+								size_t offset_b = extraLeft + (extraTop * bytes_per_row);
+								for (size_t r = 0; r < new_height; r++) {
+									memcpy(w + offset_a, dataCbCr + offset_b, 2 * new_width);
 									offset_a += 2 * new_width;
 									offset_b += bytes_per_row;
 								}
@@ -582,16 +612,16 @@ void ARKitInterface::process() {
 				// strangely enough we have to states, rolling them up into one
 				if (camera.trackingState == ARTrackingStateNotAvailable) {
 					// no tracking, would be good if we black out the screen or something...
-					tracking_state = ARVRInterface::ARVR_NOT_TRACKING;
+					tracking_state = XRInterface::XR_NOT_TRACKING;
 				} else {
 					if (camera.trackingState == ARTrackingStateNormal) {
-						tracking_state = ARVRInterface::ARVR_NORMAL_TRACKING;
+						tracking_state = XRInterface::XR_NORMAL_TRACKING;
 					} else if (camera.trackingStateReason == ARTrackingStateReasonExcessiveMotion) {
-						tracking_state = ARVRInterface::ARVR_EXCESSIVE_MOTION;
+						tracking_state = XRInterface::XR_EXCESSIVE_MOTION;
 					} else if (camera.trackingStateReason == ARTrackingStateReasonInsufficientFeatures) {
-						tracking_state = ARVRInterface::ARVR_INSUFFICIENT_FEATURES;
+						tracking_state = XRInterface::XR_INSUFFICIENT_FEATURES;
 					} else {
-						tracking_state = ARVRInterface::ARVR_UNKNOWN_TRACKING;
+						tracking_state = XRInterface::XR_UNKNOWN_TRACKING;
 					}
 
 					// copy our current frame transform
@@ -658,69 +688,78 @@ void ARKitInterface::process() {
 }
 
 void ARKitInterface::_add_or_update_anchor(void *p_anchor) {
-	_THREAD_SAFE_METHOD_
-
-	ARAnchor *anchor = (ARAnchor *)p_anchor;
-
-	unsigned char uuid[16];
-	[anchor.identifier getUUIDBytes:uuid];
-
-	ARVRPositionalTracker *tracker = get_anchor_for_uuid(uuid);
-	if (tracker != NULL) {
-		// lets update our mesh! (using Arjens code as is for now)
-		// we should also probably limit how often we do this...
+	// _THREAD_SAFE_METHOD_
 
-		// can we safely cast this?
-		ARPlaneAnchor *planeAnchor = (ARPlaneAnchor *)anchor;
-
-		if (planeAnchor.geometry.triangleCount > 0) {
-			Ref<SurfaceTool> surftool;
-			surftool.instance();
-			surftool->begin(Mesh::PRIMITIVE_TRIANGLES);
+	if (@available(iOS 11.0, *)) {
+		ARAnchor *anchor = (ARAnchor *)p_anchor;
+
+		unsigned char uuid[16];
+		[anchor.identifier getUUIDBytes:uuid];
+
+		XRPositionalTracker *tracker = get_anchor_for_uuid(uuid);
+		if (tracker != NULL) {
+			// lets update our mesh! (using Arjens code as is for now)
+			// we should also probably limit how often we do this...
+
+			// can we safely cast this?
+			ARPlaneAnchor *planeAnchor = (ARPlaneAnchor *)anchor;
+
+			if (@available(iOS 11.3, *)) {
+				if (planeAnchor.geometry.triangleCount > 0) {
+					Ref<SurfaceTool> surftool;
+					surftool.instance();
+					surftool->begin(Mesh::PRIMITIVE_TRIANGLES);
+
+					for (int j = planeAnchor.geometry.triangleCount * 3 - 1; j >= 0; j--) {
+						int16_t index = planeAnchor.geometry.triangleIndices[j];
+						simd_float3 vrtx = planeAnchor.geometry.vertices[index];
+						simd_float2 textcoord = planeAnchor.geometry.textureCoordinates[index];
+						surftool->add_uv(Vector2(textcoord[0], textcoord[1]));
+						surftool->add_color(Color(0.8, 0.8, 0.8));
+						surftool->add_vertex(Vector3(vrtx[0], vrtx[1], vrtx[2]));
+					}
 
-			for (int j = planeAnchor.geometry.triangleCount * 3 - 1; j >= 0; j--) {
-				int16_t index = planeAnchor.geometry.triangleIndices[j];
-				simd_float3 vrtx = planeAnchor.geometry.vertices[index];
-				simd_float2 textcoord = planeAnchor.geometry.textureCoordinates[index];
-				surftool->add_uv(Vector2(textcoord[0], textcoord[1]));
-				surftool->add_color(Color(0.8, 0.8, 0.8));
-				surftool->add_vertex(Vector3(vrtx[0], vrtx[1], vrtx[2]));
+					surftool->generate_normals();
+					tracker->set_mesh(surftool->commit());
+				} else {
+					Ref<Mesh> nomesh;
+					tracker->set_mesh(nomesh);
+				}
+			} else {
+				Ref<Mesh> nomesh;
+				tracker->set_mesh(nomesh);
 			}
 
-			surftool->generate_normals();
-			tracker->set_mesh(surftool->commit());
-		} else {
-			Ref<Mesh> nomesh;
-			tracker->set_mesh(nomesh);
+			// Note, this also contains a scale factor which gives us an idea of the size of the anchor
+			// We may extract that in our XRAnchor class
+			Basis b;
+			matrix_float4x4 m44 = anchor.transform;
+			b.elements[0].x = m44.columns[0][0];
+			b.elements[1].x = m44.columns[0][1];
+			b.elements[2].x = m44.columns[0][2];
+			b.elements[0].y = m44.columns[1][0];
+			b.elements[1].y = m44.columns[1][1];
+			b.elements[2].y = m44.columns[1][2];
+			b.elements[0].z = m44.columns[2][0];
+			b.elements[1].z = m44.columns[2][1];
+			b.elements[2].z = m44.columns[2][2];
+			tracker->set_orientation(b);
+			tracker->set_rw_position(Vector3(m44.columns[3][0], m44.columns[3][1], m44.columns[3][2]));
 		}
-
-		// Note, this also contains a scale factor which gives us an idea of the size of the anchor
-		// We may extract that in our ARVRAnchor class
-		Basis b;
-		matrix_float4x4 m44 = anchor.transform;
-		b.elements[0].x = m44.columns[0][0];
-		b.elements[1].x = m44.columns[0][1];
-		b.elements[2].x = m44.columns[0][2];
-		b.elements[0].y = m44.columns[1][0];
-		b.elements[1].y = m44.columns[1][1];
-		b.elements[2].y = m44.columns[1][2];
-		b.elements[0].z = m44.columns[2][0];
-		b.elements[1].z = m44.columns[2][1];
-		b.elements[2].z = m44.columns[2][2];
-		tracker->set_orientation(b);
-		tracker->set_rw_position(Vector3(m44.columns[3][0], m44.columns[3][1], m44.columns[3][2]));
 	}
 }
 
 void ARKitInterface::_remove_anchor(void *p_anchor) {
-	_THREAD_SAFE_METHOD_
+	// _THREAD_SAFE_METHOD_
 
-	ARAnchor *anchor = (ARAnchor *)p_anchor;
+	if (@available(iOS 11.0, *)) {
+		ARAnchor *anchor = (ARAnchor *)p_anchor;
 
-	unsigned char uuid[16];
-	[anchor.identifier getUUIDBytes:uuid];
+		unsigned char uuid[16];
+		[anchor.identifier getUUIDBytes:uuid];
 
-	remove_anchor_for_uuid(uuid);
+		remove_anchor_for_uuid(uuid);
+	}
 }
 
 ARKitInterface::ARKitInterface() {
@@ -728,7 +767,9 @@ ARKitInterface::ARKitInterface() {
 	session_was_started = false;
 	plane_detection_is_enabled = false;
 	light_estimation_is_enabled = false;
-	ar_session = NULL;
+	if (@available(iOS 11.0, *)) {
+		ar_session = NULL;
+	}
 	z_near = 0.01;
 	z_far = 1000.0;
 	projection.set_perspective(60.0, 1.0, z_near, z_far, false);
diff --git a/modules/arkit/arkit_session_delegate.h b/modules/arkit/arkit_session_delegate.h
index 158b80a60a..df98bf506e 100644
--- a/modules/arkit/arkit_session_delegate.h
+++ b/modules/arkit/arkit_session_delegate.h
@@ -42,9 +42,9 @@ class ARKitInterface;
 
 @property(nonatomic) ARKitInterface *arkit_interface;
 
-- (void)session:(ARSession *)session didAddAnchors:(NSArray<ARAnchor *> *)anchors;
-- (void)session:(ARSession *)session didRemoveAnchors:(NSArray<ARAnchor *> *)anchors;
-- (void)session:(ARSession *)session didUpdateAnchors:(NSArray<ARAnchor *> *)anchors;
+- (void)session:(ARSession *)session didAddAnchors:(NSArray<ARAnchor *> *)anchors API_AVAILABLE(ios(11.0));
+- (void)session:(ARSession *)session didRemoveAnchors:(NSArray<ARAnchor *> *)anchors API_AVAILABLE(ios(11.0));
+- (void)session:(ARSession *)session didUpdateAnchors:(NSArray<ARAnchor *> *)anchors API_AVAILABLE(ios(11.0));
 @end
 
 #endif /* !ARKIT_SESSION_DELEGATE_H */
diff --git a/modules/arkit/arkit_session_delegate.mm b/modules/arkit/arkit_session_delegate.mm
index d3c12ad582..f44f46b7b7 100644
--- a/modules/arkit/arkit_session_delegate.mm
+++ b/modules/arkit/arkit_session_delegate.mm
@@ -53,4 +53,4 @@
 	}
 }
 
-@end
\ No newline at end of file
+@end
diff --git a/modules/arkit/config.py b/modules/arkit/config.py
index 96e41826c5..e68603fc93 100644
--- a/modules/arkit/config.py
+++ b/modules/arkit/config.py
@@ -1,5 +1,6 @@
 def can_build(env, platform):
-    return platform == 'iphone'
+    return platform == "iphone"
+
 
 def configure(env):
     pass
diff --git a/modules/arkit/register_types.cpp b/modules/arkit/register_types.cpp
index c78b35529b..91069ab364 100644
--- a/modules/arkit/register_types.cpp
+++ b/modules/arkit/register_types.cpp
@@ -37,7 +37,7 @@ void register_arkit_types() {
 
 	Ref<ARKitInterface> arkit_interface;
 	arkit_interface.instance();
-	ARVRServer::get_singleton()->add_interface(arkit_interface);
+	XRServer::get_singleton()->add_interface(arkit_interface);
 }
 
 void unregister_arkit_types() {
diff --git a/modules/arkit/register_types.h b/modules/arkit/register_types.h
index 5c697baf68..f8939a1e3f 100644
--- a/modules/arkit/register_types.h
+++ b/modules/arkit/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef ARKIT_REGISTER_TYPES_H
+#define ARKIT_REGISTER_TYPES_H
+
 void register_arkit_types();
 void unregister_arkit_types();
+
+#endif // ARKIT_REGISTER_TYPES_H
diff --git a/modules/assimp/SCsub b/modules/assimp/SCsub
index 5e66b50de3..f1d0c742b4 100644
--- a/modules/assimp/SCsub
+++ b/modules/assimp/SCsub
@@ -1,100 +1,94 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_assimp = env_modules.Clone()
-env_assimp.Prepend(CPPPATH=['#thirdparty/assimp'])
-env_assimp.Prepend(CPPPATH=['#thirdparty/assimp/include'])
-env_assimp.Prepend(CPPPATH=['#thirdparty/assimp/code/Importer/IFC'])
-env_assimp.Prepend(CPPPATH=['#thirdparty/misc'])
-env_assimp.Prepend(CPPPATH=['#thirdparty/assimp/code'])
-env_assimp.Prepend(CPPPATH=['#thirdparty/assimp/common'])
-env_assimp.Prepend(CPPPATH=['#thirdparty/assimp/contrib/irrXML/'])
-env_assimp.Prepend(CPPPATH=['#thirdparty/assimp/contrib/unzip/'])
-env_assimp.Prepend(CPPPATH=['#thirdparty/assimp/code/Importer/STEPParser'])
-env_assimp.Prepend(CPPPATH=['#thirdparty/assimp/'])
-env_assimp.Prepend(CPPPATH=['#thirdparty/zlib/'])
-env_assimp.Prepend(CPPPATH=['#thirdparty/assimp/contrib/openddlparser/include'])
-env_assimp.Prepend(CPPPATH=['#thirdparty/assimp/contrib/rapidjson/include'])
-env_assimp.Prepend(CPPPATH=['.'])
-#env_assimp.Append(CPPDEFINES=['ASSIMP_DOUBLE_PRECISION']) # TODO default to what godot is compiled with for future double support
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_BOOST_WORKAROUND'])
-env_assimp.Append(CPPDEFINES=['OPENDDLPARSER_BUILD'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_OWN_ZLIB'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_EXPORT'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_X_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_AMF_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_3DS_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_MD3_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_MD5_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_MDL_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_MD2_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_PLY_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_ASE_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_OBJ_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_HMP_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_SMD_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_MDC_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_MD5_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_STL_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_LWO_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_DXF_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_NFF_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_RAW_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_SIB_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_OFF_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_AC_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_BVH_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_IRRMESH_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_IRR_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_Q3D_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_B3D_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_COLLADA_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_TERRAGEN_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_CSM_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_3D_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_LWS_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_OGRE_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_OPENGEX_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_MS3D_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_COB_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_BLEND_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_Q3BSP_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_NDO_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_STEP_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_IFC_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_XGL_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_ASSBIN_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_C4D_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_3MF_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_X3D_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_GLTF_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_GLTF2_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_SINGLETHREADED'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_M3D_IMPORTER'])
-env_assimp.Append(CPPDEFINES=['ASSIMP_BUILD_NO_MMD_IMPORTER'])
 
+# Force bundled version for now, there's no released version of Assimp with
+# support for ArmaturePopulate which we use from their master branch.
+if True:  # env['builtin_assimp']:
+    thirdparty_dir = "#thirdparty/assimp"
 
-if(env['platform'] == 'windows'):
-    env_assimp.Append(CPPDEFINES=['PLATFORM_WINDOWS'])
-    env_assimp.Append(CPPDEFINES=[('PLATFORM', 'WINDOWS')])
-elif(env['platform'] == 'x11'):
-    env_assimp.Append(CPPDEFINES=['PLATFORM_LINUX'])
-    env_assimp.Append(CPPDEFINES=[('PLATFORM', 'LINUX')])
-elif(env['platform'] == 'osx'):
-    env_assimp.Append(CPPDEFINES=['PLATFORM_DARWIN'])
-    env_assimp.Append(CPPDEFINES=[('PLATFORM', 'DARWIN')])
-    
-env_thirdparty = env_assimp.Clone()
-env_thirdparty.disable_warnings()
-env_thirdparty.add_source_files(env.modules_sources, Glob('#thirdparty/assimp/code/Common/*.cpp'))
-env_thirdparty.add_source_files(env.modules_sources, Glob('#thirdparty/assimp/code/PostProcessing/*.cpp'))
-env_thirdparty.add_source_files(env.modules_sources, Glob('#thirdparty/assimp/code/Material/*.cpp'))
-env_thirdparty.add_source_files(env.modules_sources, Glob('#thirdparty/assimp/code/FBX/*.cpp'))
-env_thirdparty.add_source_files(env.modules_sources, Glob('#thirdparty/assimp/code/MMD/*.cpp'))
-env_thirdparty.add_source_files(env.modules_sources, Glob('#thirdparty/assimp/code/glTF/*.cpp'))
-env_thirdparty.add_source_files(env.modules_sources, Glob('#thirdparty/assimp/code/glTF2/*.cpp'))
+    env_assimp.Prepend(CPPPATH=["#thirdparty/assimp"])
+    env_assimp.Prepend(CPPPATH=["#thirdparty/assimp/code"])
+    env_assimp.Prepend(CPPPATH=["#thirdparty/assimp/include"])
+
+    # env_assimp.Append(CPPDEFINES=['ASSIMP_DOUBLE_PRECISION']) # TODO default to what godot is compiled with for future double support
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_SINGLETHREADED"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_BOOST_WORKAROUND"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_OWN_ZLIB"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_EXPORT"])
+
+    # Importers we don't need
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_3D_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_3DS_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_3MF_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_AC_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_AMF_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_ASE_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_ASSBIN_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_B3D_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_BLEND_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_BVH_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_C4D_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_COB_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_COLLADA_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_CSM_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_DXF_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_GLTF2_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_GLTF_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_HMP_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_IFC_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_IRR_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_IRRMESH_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_LWO_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_LWS_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_M3D_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_MD2_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_MD3_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_MD5_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_MD5_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_MDC_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_MDL_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_MMD_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_MS3D_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_NDO_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_NFF_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_OBJ_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_OFF_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_OGRE_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_OPENGEX_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_PLY_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_Q3BSP_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_Q3D_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_RAW_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_SIB_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_SMD_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_STEP_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_STL_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_TERRAGEN_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_X3D_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_XGL_IMPORTER"])
+    env_assimp.Append(CPPDEFINES=["ASSIMP_BUILD_NO_X_IMPORTER"])
+
+    if env["platform"] == "windows":
+        env_assimp.Append(CPPDEFINES=["PLATFORM_WINDOWS"])
+        env_assimp.Append(CPPDEFINES=[("PLATFORM", "WINDOWS")])
+    elif env["platform"] == "linuxbsd":
+        env_assimp.Append(CPPDEFINES=["PLATFORM_LINUX"])
+        env_assimp.Append(CPPDEFINES=[("PLATFORM", "LINUX")])
+    elif env["platform"] == "osx":
+        env_assimp.Append(CPPDEFINES=["PLATFORM_DARWIN"])
+        env_assimp.Append(CPPDEFINES=[("PLATFORM", "DARWIN")])
+
+    env_thirdparty = env_assimp.Clone()
+    env_thirdparty.disable_warnings()
+    env_thirdparty.add_source_files(env.modules_sources, Glob("#thirdparty/assimp/code/CApi/*.cpp"))
+    env_thirdparty.add_source_files(env.modules_sources, Glob("#thirdparty/assimp/code/Common/*.cpp"))
+    env_thirdparty.add_source_files(env.modules_sources, Glob("#thirdparty/assimp/code/PostProcessing/*.cpp"))
+    env_thirdparty.add_source_files(env.modules_sources, Glob("#thirdparty/assimp/code/Material/*.cpp"))
+    env_thirdparty.add_source_files(env.modules_sources, Glob("#thirdparty/assimp/code/FBX/*.cpp"))
 
 # Godot's own source files
 env_assimp.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/assimp/config.py b/modules/assimp/config.py
index 098f1eafa9..53b8f2f2e3 100644
--- a/modules/assimp/config.py
+++ b/modules/assimp/config.py
@@ -1,5 +1,6 @@
 def can_build(env, platform):
-    return env['tools']
+    return env["tools"]
+
 
 def configure(env):
     pass
diff --git a/modules/assimp/editor_scene_importer_assimp.cpp b/modules/assimp/editor_scene_importer_assimp.cpp
index a547dabb60..e5becfd559 100644
--- a/modules/assimp/editor_scene_importer_assimp.cpp
+++ b/modules/assimp/editor_scene_importer_assimp.cpp
@@ -32,9 +32,9 @@
 #include "core/io/image_loader.h"
 #include "editor/import/resource_importer_scene.h"
 #include "import_utils.h"
-#include "scene/3d/camera.h"
-#include "scene/3d/light.h"
-#include "scene/3d/mesh_instance.h"
+#include "scene/3d/camera_3d.h"
+#include "scene/3d/light_3d.h"
+#include "scene/3d/mesh_instance_3d.h"
 #include "scene/main/node.h"
 #include "scene/resources/material.h"
 #include "scene/resources/surface_tool.h"
@@ -44,7 +44,6 @@
 #include <assimp/scene.h>
 #include <assimp/Importer.hpp>
 #include <assimp/LogStream.hpp>
-#include <string>
 
 // move into assimp
 aiBone *get_bone_by_name(const aiScene *scene, aiString bone_name) {
@@ -53,7 +52,6 @@ aiBone *get_bone_by_name(const aiScene *scene, aiString bone_name) {
 
 		// iterate over all the bones on the mesh for this node only!
 		for (unsigned int boneIndex = 0; boneIndex < mesh->mNumBones; boneIndex++) {
-
 			aiBone *bone = mesh->mBones[boneIndex];
 			if (bone->mName == bone_name) {
 				printf("matched bone by name: %s\n", bone->mName.C_Str());
@@ -62,11 +60,10 @@ aiBone *get_bone_by_name(const aiScene *scene, aiString bone_name) {
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 void EditorSceneImporterAssimp::get_extensions(List<String> *r_extensions) const {
-
 	const String import_setting_string = "filesystem/import/open_asset_import/";
 
 	Map<String, ImportFormat> import_format;
@@ -104,8 +101,6 @@ void EditorSceneImporterAssimp::_bind_methods() {
 Node *EditorSceneImporterAssimp::import_scene(const String &p_path, uint32_t p_flags, int p_bake_fps,
 		List<String> *r_missing_deps, Error *r_err) {
 	Assimp::Importer importer;
-	std::wstring w_path = ProjectSettings::get_singleton()->globalize_path(p_path).c_str();
-	std::string s_path(w_path.begin(), w_path.end());
 	importer.SetPropertyBool(AI_CONFIG_PP_FD_REMOVE, true);
 	// Cannot remove pivot points because the static mesh will be in the wrong place
 	importer.SetPropertyBool(AI_CONFIG_IMPORT_FBX_PRESERVE_PIVOTS, false);
@@ -147,28 +142,25 @@ Node *EditorSceneImporterAssimp::import_scene(const String &p_path, uint32_t p_f
 								 // aiProcess_EmbedTextures |
 								 //aiProcess_SplitByBoneCount |
 								 0;
-	aiScene *scene = (aiScene *)importer.ReadFile(s_path.c_str(), post_process_Steps);
+	String g_path = ProjectSettings::get_singleton()->globalize_path(p_path);
+	aiScene *scene = (aiScene *)importer.ReadFile(g_path.utf8().ptr(), post_process_Steps);
 
-	ERR_FAIL_COND_V_MSG(scene == NULL, NULL, String("Open Asset Import failed to open: ") + String(importer.GetErrorString()));
+	ERR_FAIL_COND_V_MSG(scene == nullptr, nullptr, String("Open Asset Import failed to open: ") + String(importer.GetErrorString()));
 
 	return _generate_scene(p_path, scene, p_flags, p_bake_fps, max_bone_weights);
 }
 
 template <class T>
 struct EditorSceneImporterAssetImportInterpolate {
-
 	T lerp(const T &a, const T &b, float c) const {
-
 		return a + (b - a) * c;
 	}
 
 	T catmull_rom(const T &p0, const T &p1, const T &p2, const T &p3, float t) {
-
 		float t2 = t * t;
 		float t3 = t2 * t;
 
-		return 0.5f * ((2.0f * p1) + (-p0 + p2) * t + (2.0f * p0 - 5.0f * p1 + 4 * p2 - p3) * t2 +
-							  (-p0 + 3.0f * p1 - 3.0f * p2 + p3) * t3);
+		return 0.5f * ((2.0f * p1) + (-p0 + p2) * t + (2.0f * p0 - 5.0f * p1 + 4.0f * p2 - p3) * t2 + (-p0 + 3.0f * p1 - 3.0f * p2 + p3) * t3);
 	}
 
 	T bezier(T start, T control_1, T control_2, T end, float t) {
@@ -186,7 +178,6 @@ struct EditorSceneImporterAssetImportInterpolate {
 //thank you for existing, partial specialization
 template <>
 struct EditorSceneImporterAssetImportInterpolate<Quat> {
-
 	Quat lerp(const Quat &a, const Quat &b, float c) const {
 		ERR_FAIL_COND_V_MSG(!a.is_normalized(), Quat(), "The quaternion \"a\" must be normalized.");
 		ERR_FAIL_COND_V_MSG(!b.is_normalized(), Quat(), "The quaternion \"b\" must be normalized.");
@@ -215,8 +206,9 @@ T EditorSceneImporterAssimp::_interpolate_track(const Vector<float> &p_times, co
 	//could use binary search, worth it?
 	int idx = -1;
 	for (int i = 0; i < p_times.size(); i++) {
-		if (p_times[i] > p_time)
+		if (p_times[i] > p_time) {
 			break;
+		}
 		idx++;
 	}
 
@@ -224,7 +216,6 @@ T EditorSceneImporterAssimp::_interpolate_track(const Vector<float> &p_times, co
 
 	switch (p_interp) {
 		case AssetImportAnimation::INTERP_LINEAR: {
-
 			if (idx == -1) {
 				return p_values[0];
 			} else if (idx >= p_times.size() - 1) {
@@ -237,7 +228,6 @@ T EditorSceneImporterAssimp::_interpolate_track(const Vector<float> &p_times, co
 
 		} break;
 		case AssetImportAnimation::INTERP_STEP: {
-
 			if (idx == -1) {
 				return p_values[0];
 			} else if (idx >= p_times.size() - 1) {
@@ -248,7 +238,6 @@ T EditorSceneImporterAssimp::_interpolate_track(const Vector<float> &p_times, co
 
 		} break;
 		case AssetImportAnimation::INTERP_CATMULLROMSPLINE: {
-
 			if (idx == -1) {
 				return p_values[1];
 			} else if (idx >= p_times.size() - 1) {
@@ -261,7 +250,6 @@ T EditorSceneImporterAssimp::_interpolate_track(const Vector<float> &p_times, co
 
 		} break;
 		case AssetImportAnimation::INTERP_CUBIC_SPLINE: {
-
 			if (idx == -1) {
 				return p_values[1];
 			} else if (idx >= p_times.size() - 1) {
@@ -285,7 +273,7 @@ T EditorSceneImporterAssimp::_interpolate_track(const Vector<float> &p_times, co
 
 aiBone *EditorSceneImporterAssimp::get_bone_from_stack(ImportState &state, aiString name) {
 	List<aiBone *>::Element *iter;
-	aiBone *bone = NULL;
+	aiBone *bone = nullptr;
 	for (iter = state.bone_stack.front(); iter; iter = iter->next()) {
 		bone = (aiBone *)iter->get();
 
@@ -295,32 +283,32 @@ aiBone *EditorSceneImporterAssimp::get_bone_from_stack(ImportState &state, aiStr
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
-Spatial *
+Node3D *
 EditorSceneImporterAssimp::_generate_scene(const String &p_path, aiScene *scene, const uint32_t p_flags, int p_bake_fps,
 		const int32_t p_max_bone_weights) {
-	ERR_FAIL_COND_V(scene == NULL, NULL);
+	ERR_FAIL_COND_V(scene == nullptr, nullptr);
 
 	ImportState state;
 	state.path = p_path;
 	state.assimp_scene = scene;
 	state.max_bone_weights = p_max_bone_weights;
-	state.animation_player = NULL;
+	state.animation_player = nullptr;
+	state.import_flags = p_flags;
 
 	// populate light map
 	for (unsigned int l = 0; l < scene->mNumLights; l++) {
-
 		aiLight *ai_light = scene->mLights[l];
-		ERR_CONTINUE(ai_light == NULL);
+		ERR_CONTINUE(ai_light == nullptr);
 		state.light_cache[AssimpUtils::get_assimp_string(ai_light->mName)] = l;
 	}
 
 	// fill camera cache
 	for (unsigned int c = 0; c < scene->mNumCameras; c++) {
 		aiCamera *ai_camera = scene->mCameras[c];
-		ERR_CONTINUE(ai_camera == NULL);
+		ERR_CONTINUE(ai_camera == nullptr);
 		state.camera_cache[AssimpUtils::get_assimp_string(ai_camera->mName)] = c;
 	}
 
@@ -334,7 +322,7 @@ EditorSceneImporterAssimp::_generate_scene(const String &p_path, aiScene *scene,
 
 		RegenerateBoneStack(state);
 
-		Node *last_valid_parent = NULL;
+		Node *last_valid_parent = nullptr;
 
 		List<const aiNode *>::Element *iter;
 		for (iter = state.nodes.front(); iter; iter = iter->next()) {
@@ -344,7 +332,7 @@ EditorSceneImporterAssimp::_generate_scene(const String &p_path, aiScene *scene,
 			String node_name = AssimpUtils::get_assimp_string(element_assimp_node->mName);
 			//print_verbose("node: " + node_name);
 
-			Spatial *spatial = NULL;
+			Node3D *spatial = nullptr;
 			Transform transform = AssimpUtils::assimp_matrix_transform(element_assimp_node->mTransformation);
 
 			// retrieve this node bone
@@ -357,18 +345,18 @@ EditorSceneImporterAssimp::_generate_scene(const String &p_path, aiScene *scene,
 			} else if (state.armature_nodes.find(element_assimp_node)) {
 				// create skeleton
 				print_verbose("Making skeleton: " + node_name);
-				Skeleton *skeleton = memnew(Skeleton);
+				Skeleton3D *skeleton = memnew(Skeleton3D);
 				spatial = skeleton;
 				if (!state.armature_skeletons.has(element_assimp_node)) {
 					state.armature_skeletons.insert(element_assimp_node, skeleton);
 				}
-			} else if (bone != NULL) {
+			} else if (bone != nullptr) {
 				continue;
 			} else {
-				spatial = memnew(Spatial);
+				spatial = memnew(Node3D);
 			}
 
-			ERR_CONTINUE_MSG(spatial == NULL, "FBX Import - are we out of ram?");
+			ERR_CONTINUE_MSG(spatial == nullptr, "FBX Import - are we out of ram?");
 			// we on purpose set the transform and name after creating the node.
 
 			spatial->set_name(node_name);
@@ -382,14 +370,14 @@ EditorSceneImporterAssimp::_generate_scene(const String &p_path, aiScene *scene,
 			// flat node map parent lookup tool
 			state.flat_node_map.insert(element_assimp_node, spatial);
 
-			Map<const aiNode *, Spatial *>::Element *parent_lookup = state.flat_node_map.find(parent_assimp_node);
+			Map<const aiNode *, Node3D *>::Element *parent_lookup = state.flat_node_map.find(parent_assimp_node);
 
 			// note: this always fails on the root node :) keep that in mind this is by design
 			if (parent_lookup) {
-				Spatial *parent_node = parent_lookup->value();
+				Node3D *parent_node = parent_lookup->value();
 
-				ERR_FAIL_COND_V_MSG(parent_node == NULL, state.root,
-						"Parent node invalid even though lookup successful, out of ram?")
+				ERR_FAIL_COND_V_MSG(parent_node == nullptr, state.root,
+						"Parent node invalid even though lookup successful, out of ram?");
 
 				if (spatial != state.root) {
 					parent_node->add_child(spatial);
@@ -435,8 +423,8 @@ EditorSceneImporterAssimp::_generate_scene(const String &p_path, aiScene *scene,
 			aiNode *parent_node = bone_node->mParent;
 
 			String bone_name = AssimpUtils::get_anim_string_from_assimp(bone->mName);
-			ERR_CONTINUE_MSG(armature_for_bone == NULL, "Armature for bone invalid: " + bone_name);
-			Skeleton *skeleton = state.armature_skeletons[armature_for_bone];
+			ERR_CONTINUE_MSG(armature_for_bone == nullptr, "Armature for bone invalid: " + bone_name);
+			Skeleton3D *skeleton = state.armature_skeletons[armature_for_bone];
 
 			state.skeleton_bone_map[bone] = skeleton;
 
@@ -453,9 +441,8 @@ EditorSceneImporterAssimp::_generate_scene(const String &p_path, aiScene *scene,
 				Transform pform = AssimpUtils::assimp_matrix_transform(bone->mNode->mTransformation);
 				skeleton->add_bone(bone_name);
 				skeleton->set_bone_rest(boneIdx, pform);
-				skeleton->set_bone_pose(boneIdx, pform);
 
-				if (parent_node != NULL) {
+				if (parent_node != nullptr) {
 					int parent_bone_id = skeleton->find_bone(AssimpUtils::get_anim_string_from_assimp(parent_node->mName));
 					int current_bone_id = boneIdx;
 					skeleton->set_bone_parent(current_bone_id, parent_bone_id);
@@ -465,14 +452,14 @@ EditorSceneImporterAssimp::_generate_scene(const String &p_path, aiScene *scene,
 
 		print_verbose("generating mesh phase from skeletal mesh");
 
-		List<Spatial *> cleanup_template_nodes;
+		List<Node3D *> cleanup_template_nodes;
 
-		for (Map<const aiNode *, Spatial *>::Element *key_value_pair = state.flat_node_map.front(); key_value_pair; key_value_pair = key_value_pair->next()) {
+		for (Map<const aiNode *, Node3D *>::Element *key_value_pair = state.flat_node_map.front(); key_value_pair; key_value_pair = key_value_pair->next()) {
 			const aiNode *assimp_node = key_value_pair->key();
-			Spatial *mesh_template = key_value_pair->value();
+			Node3D *mesh_template = key_value_pair->value();
 
-			ERR_CONTINUE(assimp_node == NULL);
-			ERR_CONTINUE(mesh_template == NULL);
+			ERR_CONTINUE(assimp_node == nullptr);
+			ERR_CONTINUE(mesh_template == nullptr);
 
 			Node *parent_node = mesh_template->get_parent();
 
@@ -480,7 +467,7 @@ EditorSceneImporterAssimp::_generate_scene(const String &p_path, aiScene *scene,
 				continue;
 			}
 
-			if (parent_node == NULL) {
+			if (parent_node == nullptr) {
 				print_error("Found invalid parent node!");
 				continue; // root node
 			}
@@ -489,9 +476,8 @@ EditorSceneImporterAssimp::_generate_scene(const String &p_path, aiScene *scene,
 			Transform node_transform = AssimpUtils::assimp_matrix_transform(assimp_node->mTransformation);
 
 			if (assimp_node->mNumMeshes > 0) {
-				MeshInstance *mesh = create_mesh(state, assimp_node, node_name, parent_node, node_transform);
+				MeshInstance3D *mesh = create_mesh(state, assimp_node, node_name, parent_node, node_transform);
 				if (mesh) {
-
 					parent_node->remove_child(mesh_template);
 
 					// re-parent children
@@ -523,7 +509,7 @@ EditorSceneImporterAssimp::_generate_scene(const String &p_path, aiScene *scene,
 			}
 		}
 
-		for (List<Spatial *>::Element *element = cleanup_template_nodes.front(); element; element = element->next()) {
+		for (List<Node3D *>::Element *element = cleanup_template_nodes.front(); element; element = element->next()) {
 			if (element->get()) {
 				memdelete(element->get());
 			}
@@ -531,7 +517,6 @@ EditorSceneImporterAssimp::_generate_scene(const String &p_path, aiScene *scene,
 	}
 
 	if (p_flags & IMPORT_ANIMATION && scene->mNumAnimations) {
-
 		state.animation_player = memnew(AnimationPlayer);
 		state.root->add_child(state.animation_player);
 		state.animation_player->set_owner(state.root);
@@ -560,7 +545,7 @@ EditorSceneImporterAssimp::_generate_scene(const String &p_path, aiScene *scene,
 
 void EditorSceneImporterAssimp::_insert_animation_track(ImportState &scene, const aiAnimation *assimp_anim, int track_id,
 		int anim_fps, Ref<Animation> animation, float ticks_per_second,
-		Skeleton *skeleton, const NodePath &node_path,
+		Skeleton3D *skeleton, const NodePath &node_path,
 		const String &node_name, aiBone *track_bone) {
 	const aiNodeAnim *assimp_track = assimp_anim->mChannels[track_id];
 	//make transform track
@@ -622,12 +607,11 @@ void EditorSceneImporterAssimp::_insert_animation_track(ImportState &scene, cons
 			int skeleton_bone = skeleton->find_bone(node_name);
 
 			if (skeleton_bone >= 0 && track_bone) {
-
 				Transform xform;
 				xform.basis.set_quat_scale(rot, scale);
 				xform.origin = pos;
 
-				xform = skeleton->get_bone_pose(skeleton_bone).inverse() * xform;
+				xform = skeleton->get_bone_rest(skeleton_bone).inverse() * xform;
 
 				rot = xform.basis.get_rotation_quat();
 				rot.normalize();
@@ -653,21 +637,20 @@ void EditorSceneImporterAssimp::_insert_animation_track(ImportState &scene, cons
 
 // I really do not like this but need to figure out a better way of removing it later.
 Node *EditorSceneImporterAssimp::get_node_by_name(ImportState &state, String name) {
-	for (Map<const aiNode *, Spatial *>::Element *key_value_pair = state.flat_node_map.front(); key_value_pair; key_value_pair = key_value_pair->next()) {
+	for (Map<const aiNode *, Node3D *>::Element *key_value_pair = state.flat_node_map.front(); key_value_pair; key_value_pair = key_value_pair->next()) {
 		const aiNode *assimp_node = key_value_pair->key();
-		Spatial *node = key_value_pair->value();
+		Node3D *node = key_value_pair->value();
 
 		String node_name = AssimpUtils::get_assimp_string(assimp_node->mName);
 		if (name == node_name && node) {
 			return node;
 		}
 	}
-	return NULL;
+	return nullptr;
 }
 
 /* Bone stack is a fifo handler for multiple armatures since armatures aren't a thing in assimp (yet) */
 void EditorSceneImporterAssimp::RegenerateBoneStack(ImportState &state) {
-
 	state.bone_stack.clear();
 	// build bone stack list
 	for (unsigned int mesh_id = 0; mesh_id < state.assimp_scene->mNumMeshes; ++mesh_id) {
@@ -692,7 +675,7 @@ void EditorSceneImporterAssimp::RegenerateBoneStack(ImportState &state, aiMesh *
 	// iterate over all the bones on the mesh for this node only!
 	for (unsigned int boneIndex = 0; boneIndex < mesh->mNumBones; boneIndex++) {
 		aiBone *bone = mesh->mBones[boneIndex];
-		if (state.bone_stack.find(bone) == NULL) {
+		if (state.bone_stack.find(bone) == nullptr) {
 			state.bone_stack.push_back(bone);
 		}
 	}
@@ -701,7 +684,6 @@ void EditorSceneImporterAssimp::RegenerateBoneStack(ImportState &state, aiMesh *
 // animation tracks are per bone
 
 void EditorSceneImporterAssimp::_import_animation(ImportState &state, int p_animation_index, int p_bake_fps) {
-
 	ERR_FAIL_INDEX(p_animation_index, (int)state.assimp_scene->mNumAnimations);
 
 	const aiAnimation *anim = state.assimp_scene->mAnimations[p_animation_index];
@@ -712,7 +694,7 @@ void EditorSceneImporterAssimp::_import_animation(ImportState &state, int p_anim
 	print_verbose("import animation: " + name);
 	float ticks_per_second = anim->mTicksPerSecond;
 
-	if (state.assimp_scene->mMetaData != NULL && Math::is_equal_approx(ticks_per_second, 0.0f)) {
+	if (state.assimp_scene->mMetaData != nullptr && Math::is_equal_approx(ticks_per_second, 0.0f)) {
 		int32_t time_mode = 0;
 		state.assimp_scene->mMetaData->Get("TimeMode", time_mode);
 		ticks_per_second = AssimpUtils::get_fbx_fps(time_mode, state.assimp_scene);
@@ -748,9 +730,9 @@ void EditorSceneImporterAssimp::_import_animation(ImportState &state, int p_anim
 			continue; //do not bother
 		}
 
-		Skeleton *skeleton = NULL;
+		Skeleton3D *skeleton = nullptr;
 		NodePath node_path;
-		aiBone *bone = NULL;
+		aiBone *bone = nullptr;
 
 		// Import skeleton bone animation for this track
 		// Any bone will do, no point in processing more than just what is in the skeleton
@@ -796,7 +778,6 @@ void EditorSceneImporterAssimp::_import_animation(ImportState &state, int p_anim
 	//blend shape tracks
 
 	for (size_t i = 0; i < anim->mNumMorphMeshChannels; i++) {
-
 		const aiMeshMorphAnim *anim_mesh = anim->mMorphMeshChannels[i];
 
 		const String prop_name = AssimpUtils::get_assimp_string(anim_mesh->mName);
@@ -806,8 +787,8 @@ void EditorSceneImporterAssimp::_import_animation(ImportState &state, int p_anim
 
 		Node *item = get_node_by_name(state, mesh_name);
 		ERR_CONTINUE_MSG(!item, "failed to look up node by name");
-		const MeshInstance *mesh_instance = Object::cast_to<MeshInstance>(item);
-		ERR_CONTINUE(mesh_instance == NULL);
+		const MeshInstance3D *mesh_instance = Object::cast_to<MeshInstance3D>(item);
+		ERR_CONTINUE(mesh_instance == nullptr);
 
 		String base_path = state.root->get_path_to(mesh_instance);
 
@@ -817,14 +798,12 @@ void EditorSceneImporterAssimp::_import_animation(ImportState &state, int p_anim
 		//add the tracks for this mesh
 		int base_track = animation->get_track_count();
 		for (int j = 0; j < mesh->get_blend_shape_count(); j++) {
-
 			animation->add_track(Animation::TYPE_VALUE);
 			animation->track_set_path(base_track + j, base_path + ":blend_shapes/" + mesh->get_blend_shape_name(j));
 		}
 
 		for (size_t k = 0; k < anim_mesh->mNumKeys; k++) {
 			for (size_t j = 0; j < anim_mesh->mKeys[k].mNumValuesAndWeights; j++) {
-
 				float t = anim_mesh->mKeys[k].mTime / ticks_per_second;
 				float w = anim_mesh->mKeys[k].mWeights[j];
 
@@ -837,17 +816,19 @@ void EditorSceneImporterAssimp::_import_animation(ImportState &state, int p_anim
 		state.animation_player->add_animation(name, animation);
 	}
 }
+
 //
 // Mesh Generation from indices ? why do we need so much mesh code
 // [debt needs looked into]
 Ref<Mesh>
 EditorSceneImporterAssimp::_generate_mesh_from_surface_indices(ImportState &state, const Vector<int> &p_surface_indices,
 		const aiNode *assimp_node, Ref<Skin> &skin,
-		Skeleton *&skeleton_assigned) {
-
+		Skeleton3D *&skeleton_assigned) {
 	Ref<ArrayMesh> mesh;
 	mesh.instance();
 	bool has_uvs = false;
+	bool compress_vert_data = state.import_flags & IMPORT_USE_COMPRESSION;
+	uint32_t mesh_flags = compress_vert_data ? Mesh::ARRAY_COMPRESS_DEFAULT : 0;
 
 	Map<String, uint32_t> morph_mesh_string_lookup;
 
@@ -873,7 +854,7 @@ EditorSceneImporterAssimp::_generate_mesh_from_surface_indices(ImportState &stat
 		const unsigned int mesh_idx = p_surface_indices[i];
 		const aiMesh *ai_mesh = state.assimp_scene->mMeshes[mesh_idx];
 
-		Map<uint32_t, Vector<BoneInfo> > vertex_weights;
+		Map<uint32_t, Vector<BoneInfo>> vertex_weights;
 
 		if (ai_mesh->mNumBones > 0) {
 			for (size_t b = 0; b < ai_mesh->mNumBones; b++) {
@@ -895,7 +876,6 @@ EditorSceneImporterAssimp::_generate_mesh_from_surface_indices(ImportState &stat
 				int bone_index = skeleton_assigned->find_bone(bone_name);
 				ERR_CONTINUE(bone_index == -1);
 				for (size_t w = 0; w < bone->mNumWeights; w++) {
-
 					aiVertexWeight ai_weights = bone->mWeights[w];
 
 					BoneInfo bi;
@@ -921,7 +901,6 @@ EditorSceneImporterAssimp::_generate_mesh_from_surface_indices(ImportState &stat
 		st->begin(Mesh::PRIMITIVE_TRIANGLES);
 
 		for (size_t j = 0; j < ai_mesh->mNumVertices; j++) {
-
 			// Get the texture coordinates if they exist
 			if (ai_mesh->HasTextureCoords(0)) {
 				has_uvs = true;
@@ -941,7 +920,7 @@ EditorSceneImporterAssimp::_generate_mesh_from_surface_indices(ImportState &stat
 			}
 
 			// Work out normal calculations? - this needs work it doesn't work properly on huestos
-			if (ai_mesh->mNormals != NULL) {
+			if (ai_mesh->mNormals != nullptr) {
 				const aiVector3D normals = ai_mesh->mNormals[j];
 				const Vector3 godot_normal = Vector3(normals.x, normals.y, normals.z);
 				st->add_normal(godot_normal);
@@ -957,7 +936,6 @@ EditorSceneImporterAssimp::_generate_mesh_from_surface_indices(ImportState &stat
 
 			// We have vertex weights right?
 			if (vertex_weights.has(j)) {
-
 				Vector<BoneInfo> bone_info = vertex_weights[j];
 				Vector<int> bones;
 				bones.resize(bone_info.size());
@@ -995,15 +973,15 @@ EditorSceneImporterAssimp::_generate_mesh_from_surface_indices(ImportState &stat
 		}
 
 		aiMaterial *ai_material = state.assimp_scene->mMaterials[ai_mesh->mMaterialIndex];
-		Ref<SpatialMaterial> mat;
+		Ref<StandardMaterial3D> mat;
 		mat.instance();
 
 		int32_t mat_two_sided = 0;
 		if (AI_SUCCESS == ai_material->Get(AI_MATKEY_TWOSIDED, mat_two_sided)) {
 			if (mat_two_sided > 0) {
-				mat->set_cull_mode(SpatialMaterial::CULL_DISABLED);
+				mat->set_cull_mode(StandardMaterial3D::CULL_DISABLED);
 			} else {
-				mat->set_cull_mode(SpatialMaterial::CULL_BACK);
+				mat->set_cull_mode(StandardMaterial3D::CULL_BACK);
 			}
 		}
 
@@ -1015,7 +993,7 @@ EditorSceneImporterAssimp::_generate_mesh_from_surface_indices(ImportState &stat
 		// Culling handling for meshes
 
 		// cull all back faces
-		mat->set_cull_mode(SpatialMaterial::CULL_DISABLED);
+		mat->set_cull_mode(StandardMaterial3D::CULL_DISABLED);
 
 		// Now process materials
 		aiTextureType base_color = aiTextureType_BASE_COLOR;
@@ -1028,13 +1006,11 @@ EditorSceneImporterAssimp::_generate_mesh_from_surface_indices(ImportState &stat
 
 				// anything transparent must be culled
 				if (image_data.raw_image->detect_alpha() != Image::ALPHA_NONE) {
-					mat->set_feature(SpatialMaterial::FEATURE_TRANSPARENT, true);
-					mat->set_depth_draw_mode(SpatialMaterial::DepthDrawMode::DEPTH_DRAW_ALPHA_OPAQUE_PREPASS);
-					mat->set_cull_mode(
-							SpatialMaterial::CULL_DISABLED); // since you can see both sides in transparent mode
+					mat->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA_DEPTH_PRE_PASS);
+					mat->set_cull_mode(StandardMaterial3D::CULL_DISABLED); // since you can see both sides in transparent mode
 				}
 
-				mat->set_texture(SpatialMaterial::TEXTURE_ALBEDO, image_data.texture);
+				mat->set_texture(StandardMaterial3D::TEXTURE_ALBEDO, image_data.texture);
 			}
 		}
 
@@ -1048,22 +1024,18 @@ EditorSceneImporterAssimp::_generate_mesh_from_surface_indices(ImportState &stat
 
 				// anything transparent must be culled
 				if (image_data.raw_image->detect_alpha() != Image::ALPHA_NONE) {
-					mat->set_feature(SpatialMaterial::FEATURE_TRANSPARENT, true);
-					mat->set_depth_draw_mode(SpatialMaterial::DepthDrawMode::DEPTH_DRAW_ALPHA_OPAQUE_PREPASS);
-					mat->set_cull_mode(
-							SpatialMaterial::CULL_DISABLED); // since you can see both sides in transparent mode
+					mat->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA_DEPTH_PRE_PASS);
+					mat->set_cull_mode(StandardMaterial3D::CULL_DISABLED); // since you can see both sides in transparent mode
 				}
 
-				mat->set_texture(SpatialMaterial::TEXTURE_ALBEDO, image_data.texture);
+				mat->set_texture(StandardMaterial3D::TEXTURE_ALBEDO, image_data.texture);
 			}
 
 			aiColor4D clr_diffuse;
 			if (AI_SUCCESS == ai_material->Get(AI_MATKEY_COLOR_DIFFUSE, clr_diffuse)) {
 				if (Math::is_equal_approx(clr_diffuse.a, 1.0f) == false) {
-					mat->set_feature(SpatialMaterial::FEATURE_TRANSPARENT, true);
-					mat->set_depth_draw_mode(SpatialMaterial::DepthDrawMode::DEPTH_DRAW_ALPHA_OPAQUE_PREPASS);
-					mat->set_cull_mode(
-							SpatialMaterial::CULL_DISABLED); // since you can see both sides in transparent mode
+					mat->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA_DEPTH_PRE_PASS);
+					mat->set_cull_mode(StandardMaterial3D::CULL_DISABLED); // since you can see both sides in transparent mode
 				}
 				mat->set_albedo(Color(clr_diffuse.r, clr_diffuse.g, clr_diffuse.b, clr_diffuse.a));
 			}
@@ -1078,14 +1050,14 @@ EditorSceneImporterAssimp::_generate_mesh_from_surface_indices(ImportState &stat
 			// Process texture normal map
 			if (AssimpUtils::GetAssimpTexture(state, ai_material, tex_normal, filename, path, image_data)) {
 				AssimpUtils::set_texture_mapping_mode(image_data.map_mode, image_data.texture);
-				mat->set_feature(SpatialMaterial::Feature::FEATURE_NORMAL_MAPPING, true);
-				mat->set_texture(SpatialMaterial::TEXTURE_NORMAL, image_data.texture);
+				mat->set_feature(StandardMaterial3D::Feature::FEATURE_NORMAL_MAPPING, true);
+				mat->set_texture(StandardMaterial3D::TEXTURE_NORMAL, image_data.texture);
 			} else {
 				aiString texture_path;
 				if (AI_SUCCESS == ai_material->Get(AI_MATKEY_FBX_NORMAL_TEXTURE, AI_PROPERTIES, texture_path)) {
 					if (AssimpUtils::CreateAssimpTexture(state, texture_path, filename, path, image_data)) {
-						mat->set_feature(SpatialMaterial::Feature::FEATURE_NORMAL_MAPPING, true);
-						mat->set_texture(SpatialMaterial::TEXTURE_NORMAL, image_data.texture);
+						mat->set_feature(StandardMaterial3D::Feature::FEATURE_NORMAL_MAPPING, true);
+						mat->set_texture(StandardMaterial3D::TEXTURE_NORMAL, image_data.texture);
 					}
 				}
 			}
@@ -1100,8 +1072,8 @@ EditorSceneImporterAssimp::_generate_mesh_from_surface_indices(ImportState &stat
 			// Process texture normal map
 			if (AssimpUtils::GetAssimpTexture(state, ai_material, tex_normal_camera, filename, path, image_data)) {
 				AssimpUtils::set_texture_mapping_mode(image_data.map_mode, image_data.texture);
-				mat->set_feature(SpatialMaterial::Feature::FEATURE_NORMAL_MAPPING, true);
-				mat->set_texture(SpatialMaterial::TEXTURE_NORMAL, image_data.texture);
+				mat->set_feature(StandardMaterial3D::Feature::FEATURE_NORMAL_MAPPING, true);
+				mat->set_texture(StandardMaterial3D::TEXTURE_NORMAL, image_data.texture);
 			}
 		}
 
@@ -1114,8 +1086,8 @@ EditorSceneImporterAssimp::_generate_mesh_from_surface_indices(ImportState &stat
 			// Process texture normal map
 			if (AssimpUtils::GetAssimpTexture(state, ai_material, tex_emission_color, filename, path, image_data)) {
 				AssimpUtils::set_texture_mapping_mode(image_data.map_mode, image_data.texture);
-				mat->set_feature(SpatialMaterial::Feature::FEATURE_NORMAL_MAPPING, true);
-				mat->set_texture(SpatialMaterial::TEXTURE_NORMAL, image_data.texture);
+				mat->set_feature(StandardMaterial3D::Feature::FEATURE_NORMAL_MAPPING, true);
+				mat->set_texture(StandardMaterial3D::TEXTURE_NORMAL, image_data.texture);
 			}
 		}
 
@@ -1128,7 +1100,7 @@ EditorSceneImporterAssimp::_generate_mesh_from_surface_indices(ImportState &stat
 			// Process texture normal map
 			if (AssimpUtils::GetAssimpTexture(state, ai_material, tex_metalness, filename, path, image_data)) {
 				AssimpUtils::set_texture_mapping_mode(image_data.map_mode, image_data.texture);
-				mat->set_texture(SpatialMaterial::TEXTURE_METALLIC, image_data.texture);
+				mat->set_texture(StandardMaterial3D::TEXTURE_METALLIC, image_data.texture);
 			}
 		}
 
@@ -1141,7 +1113,7 @@ EditorSceneImporterAssimp::_generate_mesh_from_surface_indices(ImportState &stat
 			// Process texture normal map
 			if (AssimpUtils::GetAssimpTexture(state, ai_material, tex_roughness, filename, path, image_data)) {
 				AssimpUtils::set_texture_mapping_mode(image_data.map_mode, image_data.texture);
-				mat->set_texture(SpatialMaterial::TEXTURE_ROUGHNESS, image_data.texture);
+				mat->set_texture(StandardMaterial3D::TEXTURE_ROUGHNESS, image_data.texture);
 			}
 		}
 
@@ -1154,16 +1126,16 @@ EditorSceneImporterAssimp::_generate_mesh_from_surface_indices(ImportState &stat
 
 			if (AssimpUtils::GetAssimpTexture(state, ai_material, tex_emissive, filename, path, image_data)) {
 				AssimpUtils::set_texture_mapping_mode(image_data.map_mode, image_data.texture);
-				mat->set_feature(SpatialMaterial::FEATURE_EMISSION, true);
-				mat->set_texture(SpatialMaterial::TEXTURE_EMISSION, image_data.texture);
+				mat->set_feature(StandardMaterial3D::FEATURE_EMISSION, true);
+				mat->set_texture(StandardMaterial3D::TEXTURE_EMISSION, image_data.texture);
 			} else {
 				// Process emission textures
 				aiString texture_emissive_path;
 				if (AI_SUCCESS ==
 						ai_material->Get(AI_MATKEY_FBX_MAYA_EMISSION_TEXTURE, AI_PROPERTIES, texture_emissive_path)) {
 					if (AssimpUtils::CreateAssimpTexture(state, texture_emissive_path, filename, path, image_data)) {
-						mat->set_feature(SpatialMaterial::FEATURE_EMISSION, true);
-						mat->set_texture(SpatialMaterial::TEXTURE_EMISSION, image_data.texture);
+						mat->set_feature(StandardMaterial3D::FEATURE_EMISSION, true);
+						mat->set_texture(StandardMaterial3D::TEXTURE_EMISSION, image_data.texture);
 					}
 				} else {
 					float pbr_emission = 0.0f;
@@ -1183,7 +1155,7 @@ EditorSceneImporterAssimp::_generate_mesh_from_surface_indices(ImportState &stat
 			// Process texture normal map
 			if (AssimpUtils::GetAssimpTexture(state, ai_material, tex_specular, filename, path, image_data)) {
 				AssimpUtils::set_texture_mapping_mode(image_data.map_mode, image_data.texture);
-				mat->set_texture(SpatialMaterial::TEXTURE_METALLIC, image_data.texture);
+				mat->set_texture(StandardMaterial3D::TEXTURE_METALLIC, image_data.texture);
 			}
 		}
 
@@ -1196,8 +1168,8 @@ EditorSceneImporterAssimp::_generate_mesh_from_surface_indices(ImportState &stat
 			// Process texture normal map
 			if (AssimpUtils::GetAssimpTexture(state, ai_material, tex_ao_map, filename, path, image_data)) {
 				AssimpUtils::set_texture_mapping_mode(image_data.map_mode, image_data.texture);
-				mat->set_feature(SpatialMaterial::FEATURE_AMBIENT_OCCLUSION, true);
-				mat->set_texture(SpatialMaterial::TEXTURE_AMBIENT_OCCLUSION, image_data.texture);
+				mat->set_feature(StandardMaterial3D::FEATURE_AMBIENT_OCCLUSION, true);
+				mat->set_texture(StandardMaterial3D::TEXTURE_AMBIENT_OCCLUSION, image_data.texture);
 			}
 		}
 
@@ -1207,7 +1179,6 @@ EditorSceneImporterAssimp::_generate_mesh_from_surface_indices(ImportState &stat
 		Mesh::PrimitiveType primitive = Mesh::PRIMITIVE_TRIANGLES;
 
 		for (size_t j = 0; j < ai_mesh->mNumAnimMeshes; j++) {
-
 			String ai_anim_mesh_name = AssimpUtils::get_assimp_string(ai_mesh->mAnimMeshes[j]->mName);
 
 			if (ai_anim_mesh_name.empty()) {
@@ -1215,87 +1186,87 @@ EditorSceneImporterAssimp::_generate_mesh_from_surface_indices(ImportState &stat
 			}
 
 			Array array_copy;
-			array_copy.resize(VisualServer::ARRAY_MAX);
+			array_copy.resize(RenderingServer::ARRAY_MAX);
 
-			for (int l = 0; l < VisualServer::ARRAY_MAX; l++) {
+			for (int l = 0; l < RenderingServer::ARRAY_MAX; l++) {
 				array_copy[l] = array_mesh[l].duplicate(true);
 			}
 
 			const size_t num_vertices = ai_mesh->mAnimMeshes[j]->mNumVertices;
 			array_copy[Mesh::ARRAY_INDEX] = Variant();
 			if (ai_mesh->mAnimMeshes[j]->HasPositions()) {
-				PoolVector3Array vertices;
+				PackedVector3Array vertices;
 				vertices.resize(num_vertices);
 				for (size_t l = 0; l < num_vertices; l++) {
 					const aiVector3D ai_pos = ai_mesh->mAnimMeshes[j]->mVertices[l];
 					Vector3 position = Vector3(ai_pos.x, ai_pos.y, ai_pos.z);
-					vertices.write()[l] = position;
+					vertices.ptrw()[l] = position;
 				}
-				PoolVector3Array new_vertices = array_copy[VisualServer::ARRAY_VERTEX].duplicate(true);
+				PackedVector3Array new_vertices = array_copy[RenderingServer::ARRAY_VERTEX].duplicate(true);
 				ERR_CONTINUE(vertices.size() != new_vertices.size());
 				for (int32_t l = 0; l < new_vertices.size(); l++) {
-					PoolVector3Array::Write w = new_vertices.write();
+					Vector3 *w = new_vertices.ptrw();
 					w[l] = vertices[l];
 				}
-				array_copy[VisualServer::ARRAY_VERTEX] = new_vertices;
+				array_copy[RenderingServer::ARRAY_VERTEX] = new_vertices;
 			}
 
 			int32_t color_set = 0;
 			if (ai_mesh->mAnimMeshes[j]->HasVertexColors(color_set)) {
-				PoolColorArray colors;
+				PackedColorArray colors;
 				colors.resize(num_vertices);
 				for (size_t l = 0; l < num_vertices; l++) {
 					const aiColor4D ai_color = ai_mesh->mAnimMeshes[j]->mColors[color_set][l];
 					Color color = Color(ai_color.r, ai_color.g, ai_color.b, ai_color.a);
-					colors.write()[l] = color;
+					colors.ptrw()[l] = color;
 				}
-				PoolColorArray new_colors = array_copy[VisualServer::ARRAY_COLOR].duplicate(true);
+				PackedColorArray new_colors = array_copy[RenderingServer::ARRAY_COLOR].duplicate(true);
 				ERR_CONTINUE(colors.size() != new_colors.size());
 				for (int32_t l = 0; l < colors.size(); l++) {
-					PoolColorArray::Write w = new_colors.write();
+					Color *w = new_colors.ptrw();
 					w[l] = colors[l];
 				}
-				array_copy[VisualServer::ARRAY_COLOR] = new_colors;
+				array_copy[RenderingServer::ARRAY_COLOR] = new_colors;
 			}
 
 			if (ai_mesh->mAnimMeshes[j]->HasNormals()) {
-				PoolVector3Array normals;
+				PackedVector3Array normals;
 				normals.resize(num_vertices);
 				for (size_t l = 0; l < num_vertices; l++) {
 					const aiVector3D ai_normal = ai_mesh->mAnimMeshes[j]->mNormals[l];
 					Vector3 normal = Vector3(ai_normal.x, ai_normal.y, ai_normal.z);
-					normals.write()[l] = normal;
+					normals.ptrw()[l] = normal;
 				}
-				PoolVector3Array new_normals = array_copy[VisualServer::ARRAY_NORMAL].duplicate(true);
+				PackedVector3Array new_normals = array_copy[RenderingServer::ARRAY_NORMAL].duplicate(true);
 				ERR_CONTINUE(normals.size() != new_normals.size());
 				for (int l = 0; l < normals.size(); l++) {
-					PoolVector3Array::Write w = new_normals.write();
+					Vector3 *w = new_normals.ptrw();
 					w[l] = normals[l];
 				}
-				array_copy[VisualServer::ARRAY_NORMAL] = new_normals;
+				array_copy[RenderingServer::ARRAY_NORMAL] = new_normals;
 			}
 
 			if (ai_mesh->mAnimMeshes[j]->HasTangentsAndBitangents()) {
-				PoolColorArray tangents;
+				PackedColorArray tangents;
 				tangents.resize(num_vertices);
-				PoolColorArray::Write w = tangents.write();
+				Color *w = tangents.ptrw();
 				for (size_t l = 0; l < num_vertices; l++) {
 					AssimpUtils::calc_tangent_from_mesh(ai_mesh, j, l, l, w);
 				}
-				PoolRealArray new_tangents = array_copy[VisualServer::ARRAY_TANGENT].duplicate(true);
+				PackedFloat32Array new_tangents = array_copy[RenderingServer::ARRAY_TANGENT].duplicate(true);
 				ERR_CONTINUE(new_tangents.size() != tangents.size() * 4);
 				for (int32_t l = 0; l < tangents.size(); l++) {
-					new_tangents.write()[l + 0] = tangents[l].r;
-					new_tangents.write()[l + 1] = tangents[l].g;
-					new_tangents.write()[l + 2] = tangents[l].b;
-					new_tangents.write()[l + 3] = tangents[l].a;
+					new_tangents.ptrw()[l + 0] = tangents[l].r;
+					new_tangents.ptrw()[l + 1] = tangents[l].g;
+					new_tangents.ptrw()[l + 2] = tangents[l].b;
+					new_tangents.ptrw()[l + 3] = tangents[l].a;
 				}
-				array_copy[VisualServer::ARRAY_TANGENT] = new_tangents;
+				array_copy[RenderingServer::ARRAY_TANGENT] = new_tangents;
 			}
 
 			morphs[j] = array_copy;
 		}
-		mesh->add_surface_from_arrays(primitive, array_mesh, morphs);
+		mesh->add_surface_from_arrays(primitive, array_mesh, morphs, Dictionary(), mesh_flags);
 		mesh->surface_set_material(i, mat);
 		mesh->surface_set_name(i, AssimpUtils::get_assimp_string(ai_mesh->mName));
 	}
@@ -1306,7 +1277,7 @@ EditorSceneImporterAssimp::_generate_mesh_from_surface_indices(ImportState &stat
 /**
  * Create a new mesh for the node supplied
  */
-MeshInstance *
+MeshInstance3D *
 EditorSceneImporterAssimp::create_mesh(ImportState &state, const aiNode *assimp_node, const String &node_name, Node *active_node, Transform node_transform) {
 	/* MESH NODE */
 	Ref<Mesh> mesh;
@@ -1332,15 +1303,15 @@ EditorSceneImporterAssimp::create_mesh(ImportState &state, const aiNode *assimp_
 		mesh_key += itos(surface_indices[i]);
 	}
 
-	Skeleton *skeleton = NULL;
-	aiNode *armature = NULL;
+	Skeleton3D *skeleton = nullptr;
+	aiNode *armature = nullptr;
 
 	if (!state.mesh_cache.has(mesh_key)) {
 		mesh = _generate_mesh_from_surface_indices(state, surface_indices, assimp_node, skin, skeleton);
 		state.mesh_cache[mesh_key] = mesh;
 	}
 
-	MeshInstance *mesh_node = memnew(MeshInstance);
+	MeshInstance3D *mesh_node = memnew(MeshInstance3D);
 	mesh = state.mesh_cache[mesh_key];
 	mesh_node->set_mesh(mesh);
 
@@ -1414,22 +1385,22 @@ EditorSceneImporterAssimp::create_mesh(ImportState &state, const aiNode *assimp_
  * Create a light for the scene
  * Automatically caches lights for lookup later
  */
-Spatial *EditorSceneImporterAssimp::create_light(
+Node3D *EditorSceneImporterAssimp::create_light(
 		ImportState &state,
 		const String &node_name,
 		Transform &look_at_transform) {
-	Light *light = NULL;
+	Light3D *light = nullptr;
 	aiLight *assimp_light = state.assimp_scene->mLights[state.light_cache[node_name]];
-	ERR_FAIL_COND_V(!assimp_light, NULL);
+	ERR_FAIL_COND_V(!assimp_light, nullptr);
 
 	if (assimp_light->mType == aiLightSource_DIRECTIONAL) {
-		light = memnew(DirectionalLight);
+		light = memnew(DirectionalLight3D);
 	} else if (assimp_light->mType == aiLightSource_POINT) {
-		light = memnew(OmniLight);
+		light = memnew(OmniLight3D);
 	} else if (assimp_light->mType == aiLightSource_SPOT) {
-		light = memnew(SpotLight);
+		light = memnew(SpotLight3D);
 	}
-	ERR_FAIL_COND_V(light == NULL, NULL);
+	ERR_FAIL_COND_V(light == nullptr, nullptr);
 
 	if (assimp_light->mType != aiLightSource_POINT) {
 		Vector3 pos = Vector3(
@@ -1460,15 +1431,15 @@ Spatial *EditorSceneImporterAssimp::create_light(
 /**
  * Create camera for the scene
  */
-Spatial *EditorSceneImporterAssimp::create_camera(
+Node3D *EditorSceneImporterAssimp::create_camera(
 		ImportState &state,
 		const String &node_name,
 		Transform &look_at_transform) {
 	aiCamera *camera = state.assimp_scene->mCameras[state.camera_cache[node_name]];
-	ERR_FAIL_COND_V(!camera, NULL);
+	ERR_FAIL_COND_V(!camera, nullptr);
 
-	Camera *camera_node = memnew(Camera);
-	ERR_FAIL_COND_V(!camera_node, NULL);
+	Camera3D *camera_node = memnew(Camera3D);
+	ERR_FAIL_COND_V(!camera_node, nullptr);
 	float near = camera->mClipPlaneNear;
 	if (Math::is_equal_approx(near, 0.0f)) {
 		near = 0.1f;
@@ -1489,8 +1460,7 @@ Spatial *EditorSceneImporterAssimp::create_camera(
 void EditorSceneImporterAssimp::_generate_node(
 		ImportState &state,
 		const aiNode *assimp_node) {
-
-	ERR_FAIL_COND(assimp_node == NULL);
+	ERR_FAIL_COND(assimp_node == nullptr);
 	state.nodes.push_back(assimp_node);
 	String parent_name = AssimpUtils::get_assimp_string(assimp_node->mParent->mName);
 
@@ -1505,7 +1475,7 @@ void EditorSceneImporterAssimp::_generate_node(
 	// is this an armature
 	// parent null
 	// and this is the first bone :)
-	if (parent_bone == NULL && current_bone) {
+	if (parent_bone == nullptr && current_bone) {
 		state.armature_nodes.push_back(assimp_node->mParent);
 		print_verbose("found valid armature: " + parent_name);
 	}
diff --git a/modules/assimp/editor_scene_importer_assimp.h b/modules/assimp/editor_scene_importer_assimp.h
index 4cd50e7681..7be80c4ad0 100644
--- a/modules/assimp/editor_scene_importer_assimp.h
+++ b/modules/assimp/editor_scene_importer_assimp.h
@@ -37,9 +37,9 @@
 #include "core/vector.h"
 #include "editor/import/resource_importer_scene.h"
 #include "editor/project_settings_editor.h"
-#include "scene/3d/mesh_instance.h"
-#include "scene/3d/skeleton.h"
-#include "scene/3d/spatial.h"
+#include "scene/3d/mesh_instance_3d.h"
+#include "scene/3d/node_3d.h"
+#include "scene/3d/skeleton_3d.h"
 #include "scene/animation/animation_player.h"
 #include "scene/resources/animation.h"
 #include "scene/resources/surface_tool.h"
@@ -90,29 +90,29 @@ private:
 
 	Ref<Mesh> _generate_mesh_from_surface_indices(ImportState &state, const Vector<int> &p_surface_indices,
 			const aiNode *assimp_node, Ref<Skin> &skin,
-			Skeleton *&skeleton_assigned);
+			Skeleton3D *&skeleton_assigned);
 
 	// simple object creation functions
-	Spatial *create_light(ImportState &state,
+	Node3D *create_light(ImportState &state,
 			const String &node_name,
 			Transform &look_at_transform);
-	Spatial *create_camera(
+	Node3D *create_camera(
 			ImportState &state,
 			const String &node_name,
 			Transform &look_at_transform);
 	// non recursive - linear so must not use recursive arguments
-	MeshInstance *create_mesh(ImportState &state, const aiNode *assimp_node, const String &node_name, Node *active_node, Transform node_transform);
+	MeshInstance3D *create_mesh(ImportState &state, const aiNode *assimp_node, const String &node_name, Node *active_node, Transform node_transform);
 	// recursive node generator
 	void _generate_node(ImportState &state, const aiNode *assimp_node);
 	void _insert_animation_track(ImportState &scene, const aiAnimation *assimp_anim, int track_id,
 			int anim_fps, Ref<Animation> animation, float ticks_per_second,
-			Skeleton *skeleton, const NodePath &node_path,
+			Skeleton3D *skeleton, const NodePath &node_path,
 			const String &node_name, aiBone *track_bone);
 
 	void _import_animation(ImportState &state, int p_animation_index, int p_bake_fps);
 	Node *get_node_by_name(ImportState &state, String name);
 	aiBone *get_bone_from_stack(ImportState &state, aiString name);
-	Spatial *_generate_scene(const String &p_path, aiScene *scene, const uint32_t p_flags, int p_bake_fps, const int32_t p_max_bone_weights);
+	Node3D *_generate_scene(const String &p_path, aiScene *scene, const uint32_t p_flags, int p_bake_fps, const int32_t p_max_bone_weights);
 
 	template <class T>
 	T _interpolate_track(const Vector<float> &p_times, const Vector<T> &p_values, float p_time, AssetImportAnimation::Interpolation p_interp);
@@ -136,9 +136,9 @@ public:
 		Assimp::DefaultLogger::kill();
 	}
 
-	virtual void get_extensions(List<String> *r_extensions) const;
-	virtual uint32_t get_import_flags() const;
-	virtual Node *import_scene(const String &p_path, uint32_t p_flags, int p_bake_fps, List<String> *r_missing_deps, Error *r_err = NULL);
+	virtual void get_extensions(List<String> *r_extensions) const override;
+	virtual uint32_t get_import_flags() const override;
+	virtual Node *import_scene(const String &p_path, uint32_t p_flags, int p_bake_fps, List<String> *r_missing_deps, Error *r_err = nullptr) override;
 	Ref<Image> load_image(ImportState &state, const aiScene *p_scene, String p_path);
 
 	static void RegenerateBoneStack(ImportState &state);
diff --git a/modules/assimp/import_state.h b/modules/assimp/import_state.h
index 26aad423cd..ee22800ac4 100644
--- a/modules/assimp/import_state.h
+++ b/modules/assimp/import_state.h
@@ -36,9 +36,9 @@
 #include "core/vector.h"
 #include "editor/import/resource_importer_scene.h"
 #include "editor/project_settings_editor.h"
-#include "scene/3d/mesh_instance.h"
-#include "scene/3d/skeleton.h"
-#include "scene/3d/spatial.h"
+#include "scene/3d/mesh_instance_3d.h"
+#include "scene/3d/node_3d.h"
+#include "scene/3d/skeleton_3d.h"
 #include "scene/animation/animation_player.h"
 #include "scene/resources/animation.h"
 #include "scene/resources/surface_tool.h"
@@ -55,39 +55,41 @@ namespace AssimpImporter {
  * This makes the code simpler and contains useful lookups.
  */
 struct ImportState {
-
 	String path;
-	Spatial *root;
+	Node3D *root;
 	const aiScene *assimp_scene;
 	uint32_t max_bone_weights;
 
-	Map<String, Ref<Mesh> > mesh_cache;
-	Map<int, Ref<Material> > material_cache;
+	Map<String, Ref<Mesh>> mesh_cache;
+	Map<int, Ref<Material>> material_cache;
 	Map<String, int> light_cache;
 	Map<String, int> camera_cache;
 
 	// very useful for when you need to ask assimp for the bone mesh
 
 	Map<const aiNode *, Node *> assimp_node_map;
-	Map<String, Ref<Image> > path_to_image_cache;
+	Map<String, Ref<Image>> path_to_image_cache;
 
 	// Generation 3 - determinisitic iteration
 	// to lower potential recursion errors
 	List<const aiNode *> nodes;
-	Map<const aiNode *, Spatial *> flat_node_map;
+	Map<const aiNode *, Node3D *> flat_node_map;
 	AnimationPlayer *animation_player;
 
 	// Generation 3 - deterministic armatures
 	// list of armature nodes - flat and simple to parse
 	// assimp node, node in godot
 	List<aiNode *> armature_nodes;
-	Map<const aiNode *, Skeleton *> armature_skeletons;
-	Map<aiBone *, Skeleton *> skeleton_bone_map;
+	Map<const aiNode *, Skeleton3D *> armature_skeletons;
+	Map<aiBone *, Skeleton3D *> skeleton_bone_map;
 	// Generation 3 - deterministic bone handling
 	// bones from the stack are popped when found
 	// this means we can detect
 	// what bones are for other armatures
 	List<aiBone *> bone_stack;
+
+	// EditorSceneImporter::ImportFlags
+	uint32_t import_flags;
 };
 
 struct AssimpImageData {
@@ -103,8 +105,8 @@ struct RecursiveState {
 	RecursiveState() {} // do not construct :)
 	RecursiveState(
 			Transform &_node_transform,
-			Skeleton *_skeleton,
-			Spatial *_new_node,
+			Skeleton3D *_skeleton,
+			Node3D *_new_node,
 			String &_node_name,
 			aiNode *_assimp_node,
 			Node *_parent_node,
@@ -118,12 +120,12 @@ struct RecursiveState {
 			bone(_bone) {}
 
 	Transform node_transform;
-	Skeleton *skeleton = NULL;
-	Spatial *new_node = NULL;
+	Skeleton3D *skeleton = nullptr;
+	Node3D *new_node = nullptr;
 	String node_name;
-	aiNode *assimp_node = NULL;
-	Node *parent_node = NULL;
-	aiBone *bone = NULL;
+	aiNode *assimp_node = nullptr;
+	Node *parent_node = nullptr;
+	aiBone *bone = nullptr;
 };
 } // namespace AssimpImporter
 
diff --git a/modules/assimp/import_utils.h b/modules/assimp/import_utils.h
index c522b01727..dc85d06fed 100644
--- a/modules/assimp/import_utils.h
+++ b/modules/assimp/import_utils.h
@@ -98,7 +98,7 @@ public:
 	/**
 	 * calculate tangents for mesh data from assimp data
 	 */
-	static void calc_tangent_from_mesh(const aiMesh *ai_mesh, int i, int tri_index, int index, PoolColorArray::Write &w) {
+	static void calc_tangent_from_mesh(const aiMesh *ai_mesh, int i, int tri_index, int index, Color *w) {
 		const aiVector3D normals = ai_mesh->mAnimMeshes[i]->mNormals[tri_index];
 		const Vector3 godot_normal = Vector3(normals.x, normals.y, normals.z);
 		const aiVector3D tangent = ai_mesh->mAnimMeshes[i]->mTangents[tri_index];
@@ -162,7 +162,6 @@ public:
 	}
 
 	static String get_anim_string_from_assimp(const aiString &p_string) {
-
 		String name;
 		name.parse_utf8(p_string.C_Str() /*,p_string.length*/);
 		if (name.find(":") != -1) {
@@ -189,7 +188,7 @@ public:
 	}
 
 	/**
-     * Converts aiMatrix4x4 to godot Transform 
+     * Converts aiMatrix4x4 to godot Transform
     */
 	static const Transform assimp_matrix_transform(const aiMatrix4x4 p_matrix) {
 		aiMatrix4x4 matrix = p_matrix;
@@ -202,20 +201,34 @@ public:
      */
 	static float get_fbx_fps(int32_t time_mode, const aiScene *p_scene) {
 		switch (time_mode) {
-			case AssetImportFbx::TIME_MODE_DEFAULT: return 24; //hack
-			case AssetImportFbx::TIME_MODE_120: return 120;
-			case AssetImportFbx::TIME_MODE_100: return 100;
-			case AssetImportFbx::TIME_MODE_60: return 60;
-			case AssetImportFbx::TIME_MODE_50: return 50;
-			case AssetImportFbx::TIME_MODE_48: return 48;
-			case AssetImportFbx::TIME_MODE_30: return 30;
-			case AssetImportFbx::TIME_MODE_30_DROP: return 30;
-			case AssetImportFbx::TIME_MODE_NTSC_DROP_FRAME: return 29.9700262f;
-			case AssetImportFbx::TIME_MODE_NTSC_FULL_FRAME: return 29.9700262f;
-			case AssetImportFbx::TIME_MODE_PAL: return 25;
-			case AssetImportFbx::TIME_MODE_CINEMA: return 24;
-			case AssetImportFbx::TIME_MODE_1000: return 1000;
-			case AssetImportFbx::TIME_MODE_CINEMA_ND: return 23.976f;
+			case AssetImportFbx::TIME_MODE_DEFAULT:
+				return 24; //hack
+			case AssetImportFbx::TIME_MODE_120:
+				return 120;
+			case AssetImportFbx::TIME_MODE_100:
+				return 100;
+			case AssetImportFbx::TIME_MODE_60:
+				return 60;
+			case AssetImportFbx::TIME_MODE_50:
+				return 50;
+			case AssetImportFbx::TIME_MODE_48:
+				return 48;
+			case AssetImportFbx::TIME_MODE_30:
+				return 30;
+			case AssetImportFbx::TIME_MODE_30_DROP:
+				return 30;
+			case AssetImportFbx::TIME_MODE_NTSC_DROP_FRAME:
+				return 29.9700262f;
+			case AssetImportFbx::TIME_MODE_NTSC_FULL_FRAME:
+				return 29.9700262f;
+			case AssetImportFbx::TIME_MODE_PAL:
+				return 25;
+			case AssetImportFbx::TIME_MODE_CINEMA:
+				return 24;
+			case AssetImportFbx::TIME_MODE_1000:
+				return 1000;
+			case AssetImportFbx::TIME_MODE_CINEMA_ND:
+				return 23.976f;
 			case AssetImportFbx::TIME_MODE_CUSTOM:
 				int32_t frame_rate = -1;
 				p_scene->mMetaData->Get("FrameRate", frame_rate);
@@ -233,7 +246,7 @@ public:
 	static Transform _get_global_assimp_node_transform(const aiNode *p_current_node) {
 		aiNode const *current_node = p_current_node;
 		Transform xform;
-		while (current_node != NULL) {
+		while (current_node != nullptr) {
 			xform = assimp_matrix_transform(current_node->mTransformation) * xform;
 			current_node = current_node->mParent;
 		}
@@ -319,26 +332,28 @@ public:
 	  */
 	static void set_texture_mapping_mode(aiTextureMapMode *map_mode, Ref<ImageTexture> texture) {
 		ERR_FAIL_COND(texture.is_null());
-		ERR_FAIL_COND(map_mode == NULL);
+		ERR_FAIL_COND(map_mode == nullptr);
+		// FIXME: Commented out during Vulkan port.
+		/*
 		aiTextureMapMode tex_mode = map_mode[0];
 
-		int32_t flags = Texture::FLAGS_DEFAULT;
+		int32_t flags = Texture2D::FLAGS_DEFAULT;
 		if (tex_mode == aiTextureMapMode_Wrap) {
 			//Default
 		} else if (tex_mode == aiTextureMapMode_Clamp) {
-			flags = flags & ~Texture::FLAG_REPEAT;
+			flags = flags & ~Texture2D::FLAG_REPEAT;
 		} else if (tex_mode == aiTextureMapMode_Mirror) {
-			flags = flags | Texture::FLAG_MIRRORED_REPEAT;
+			flags = flags | Texture2D::FLAG_MIRRORED_REPEAT;
 		}
 		texture->set_flags(flags);
+		*/
 	}
 
 	/**
 	  * Load or load from cache image :)
 	  */
 	static Ref<Image> load_image(ImportState &state, const aiScene *p_scene, String p_path) {
-
-		Map<String, Ref<Image> >::Element *match = state.path_to_image_cache.find(p_path);
+		Map<String, Ref<Image>>::Element *match = state.path_to_image_cache.find(p_path);
 
 		// if our cache contains this image then don't bother
 		if (match) {
@@ -355,13 +370,13 @@ public:
 			print_verbose("Open Asset Import: Loading embedded texture " + filename);
 			if (tex->mHeight == 0) {
 				if (tex->CheckFormat("png")) {
-					ERR_FAIL_COND_V(Image::_png_mem_loader_func == NULL, Ref<Image>());
+					ERR_FAIL_COND_V(Image::_png_mem_loader_func == nullptr, Ref<Image>());
 					Ref<Image> img = Image::_png_mem_loader_func((uint8_t *)tex->pcData, tex->mWidth);
 					ERR_FAIL_COND_V(img.is_null(), Ref<Image>());
 					state.path_to_image_cache.insert(p_path, img);
 					return img;
 				} else if (tex->CheckFormat("jpg")) {
-					ERR_FAIL_COND_V(Image::_jpg_mem_loader_func == NULL, Ref<Image>());
+					ERR_FAIL_COND_V(Image::_jpg_mem_loader_func == nullptr, Ref<Image>());
 					Ref<Image> img = Image::_jpg_mem_loader_func((uint8_t *)tex->pcData, tex->mWidth);
 					ERR_FAIL_COND_V(img.is_null(), Ref<Image>());
 					state.path_to_image_cache.insert(p_path, img);
@@ -372,17 +387,17 @@ public:
 			} else {
 				Ref<Image> img;
 				img.instance();
-				PoolByteArray arr;
+				PackedByteArray arr;
 				uint32_t size = tex->mWidth * tex->mHeight;
 				arr.resize(size);
-				memcpy(arr.write().ptr(), tex->pcData, size);
+				memcpy(arr.ptrw(), tex->pcData, size);
 				ERR_FAIL_COND_V(arr.size() % 4 != 0, Ref<Image>());
 				//ARGB8888 to RGBA8888
 				for (int32_t i = 0; i < arr.size() / 4; i++) {
-					arr.write().ptr()[(4 * i) + 3] = arr[(4 * i) + 0];
-					arr.write().ptr()[(4 * i) + 0] = arr[(4 * i) + 1];
-					arr.write().ptr()[(4 * i) + 1] = arr[(4 * i) + 2];
-					arr.write().ptr()[(4 * i) + 2] = arr[(4 * i) + 3];
+					arr.ptrw()[(4 * i) + 3] = arr[(4 * i) + 0];
+					arr.ptrw()[(4 * i) + 0] = arr[(4 * i) + 1];
+					arr.ptrw()[(4 * i) + 1] = arr[(4 * i) + 2];
+					arr.ptrw()[(4 * i) + 2] = arr[(4 * i) + 3];
 				}
 				img->create(tex->mWidth, tex->mHeight, true, Image::FORMAT_RGBA8, arr);
 				ERR_FAIL_COND_V(img.is_null(), Ref<Image>());
@@ -391,7 +406,7 @@ public:
 			}
 			return Ref<Image>();
 		} else {
-			Ref<Texture> texture = ResourceLoader::load(p_path);
+			Ref<Texture2D> texture = ResourceLoader::load(p_path);
 			ERR_FAIL_COND_V(texture.is_null(), Ref<Image>());
 			Ref<Image> image = texture->get_data();
 			ERR_FAIL_COND_V(image.is_null(), Ref<Image>());
@@ -418,7 +433,8 @@ public:
 			if (image_state.raw_image.is_valid()) {
 				image_state.texture.instance();
 				image_state.texture->create_from_image(image_state.raw_image);
-				image_state.texture->set_storage(ImageTexture::STORAGE_COMPRESS_LOSSY);
+				// FIXME: Commented out during Vulkan port.
+				//image_state.texture->set_storage(ImageTexture::STORAGE_COMPRESS_LOSSY);
 				return true;
 			}
 		}
@@ -436,7 +452,7 @@ public:
 			String &path,
 			AssimpImageData &image_state) {
 		aiString ai_filename = aiString();
-		if (AI_SUCCESS == ai_material->GetTexture(texture_type, 0, &ai_filename, NULL, NULL, NULL, NULL, image_state.map_mode)) {
+		if (AI_SUCCESS == ai_material->GetTexture(texture_type, 0, &ai_filename, nullptr, nullptr, nullptr, nullptr, image_state.map_mode)) {
 			return CreateAssimpTexture(state, ai_filename, filename, path, image_state);
 		}
 
diff --git a/modules/assimp/register_types.cpp b/modules/assimp/register_types.cpp
index 3af8827bf9..6cb0fc982f 100644
--- a/modules/assimp/register_types.cpp
+++ b/modules/assimp/register_types.cpp
@@ -42,7 +42,6 @@ static void _editor_init() {
 #endif
 
 void register_assimp_types() {
-
 #ifdef TOOLS_ENABLED
 	ClassDB::APIType prev_api = ClassDB::get_current_api();
 	ClassDB::set_current_api(ClassDB::API_EDITOR);
diff --git a/modules/assimp/register_types.h b/modules/assimp/register_types.h
index f363744c0a..f399a7acc6 100644
--- a/modules/assimp/register_types.h
+++ b/modules/assimp/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef ASSIMP_REGISTER_TYPES_H
+#define ASSIMP_REGISTER_TYPES_H
+
 void register_assimp_types();
 void unregister_assimp_types();
+
+#endif // ASSIMP_REGISTER_TYPES_H
diff --git a/modules/basis_universal/SCsub b/modules/basis_universal/SCsub
new file mode 100644
index 0000000000..dc7b176d24
--- /dev/null
+++ b/modules/basis_universal/SCsub
@@ -0,0 +1,48 @@
+#!/usr/bin/env python
+
+Import("env")
+Import("env_modules")
+
+env_basisu = env_modules.Clone()
+
+# Thirdparty source files
+# Not unbundled so far since not widespread as shared library
+thirdparty_dir = "#thirdparty/basis_universal/"
+tool_sources = [
+    "basisu_astc_decomp.cpp",
+    "basisu_backend.cpp",
+    "basisu_basis_file.cpp",
+    "basisu_comp.cpp",
+    "basisu_enc.cpp",
+    "basisu_etc.cpp",
+    "basisu_frontend.cpp",
+    "basisu_global_selector_palette_helpers.cpp",
+    "basisu_gpu_texture.cpp",
+    "basisu_pvrtc1_4.cpp",
+    "basisu_resample_filters.cpp",
+    "basisu_resampler.cpp",
+    "basisu_ssim.cpp",
+    "lodepng.cpp",
+]
+tool_sources = [thirdparty_dir + file for file in tool_sources]
+transcoder_sources = [thirdparty_dir + "transcoder/basisu_transcoder.cpp"]
+
+# Treat Basis headers as system headers to avoid raising warnings. Not supported on MSVC.
+if not env.msvc:
+    env_basisu.Append(
+        CPPFLAGS=["-isystem", Dir(thirdparty_dir).path, "-isystem", Dir(thirdparty_dir + "transcoder").path]
+    )
+else:
+    env_basisu.Prepend(CPPPATH=[thirdparty_dir, thirdparty_dir + "transcoder"])
+
+if env["target"] == "debug":
+    env_basisu.Append(CPPFLAGS=["-DBASISU_DEVEL_MESSAGES=1", "-DBASISD_ENABLE_DEBUG_FLAGS=1"])
+
+env_thirdparty = env_basisu.Clone()
+env_thirdparty.disable_warnings()
+if env["tools"]:
+    env_thirdparty.add_source_files(env.modules_sources, tool_sources)
+env_thirdparty.add_source_files(env.modules_sources, transcoder_sources)
+
+# Godot source files
+env_basisu.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/recast/config.py b/modules/basis_universal/config.py
index 098f1eafa9..d22f9454ed 100644
--- a/modules/recast/config.py
+++ b/modules/basis_universal/config.py
@@ -1,5 +1,6 @@
 def can_build(env, platform):
-    return env['tools']
+    return True
+
 
 def configure(env):
     pass
diff --git a/modules/basis_universal/register_types.cpp b/modules/basis_universal/register_types.cpp
new file mode 100644
index 0000000000..27b299a65d
--- /dev/null
+++ b/modules/basis_universal/register_types.cpp
@@ -0,0 +1,284 @@
+/*************************************************************************/
+/*  register_types.cpp                                                   */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "register_types.h"
+
+#include "core/os/os.h"
+#include "servers/rendering_server.h"
+#include "texture_basisu.h"
+
+#ifdef TOOLS_ENABLED
+#include <basisu_comp.h>
+#endif
+
+#include <transcoder/basisu_transcoder.h>
+
+enum BasisDecompressFormat {
+	BASIS_DECOMPRESS_RG,
+	BASIS_DECOMPRESS_RGB,
+	BASIS_DECOMPRESS_RGBA,
+	BASIS_DECOMPRESS_RG_AS_RA
+};
+
+//workaround for lack of ETC2 RG
+#define USE_RG_AS_RGBA
+
+basist::etc1_global_selector_codebook *sel_codebook = nullptr;
+
+#ifdef TOOLS_ENABLED
+static Vector<uint8_t> basis_universal_packer(const Ref<Image> &p_image, Image::UsedChannels p_channels) {
+	Vector<uint8_t> budata;
+
+	{
+		Ref<Image> image = p_image->duplicate();
+
+		// unfortunately, basis universal does not support compressing supplied mipmaps,
+		// so for the time being, only compressing individual images will have to do.
+
+		if (image->has_mipmaps()) {
+			image->clear_mipmaps();
+		}
+		if (image->get_format() != Image::FORMAT_RGBA8) {
+			image->convert(Image::FORMAT_RGBA8);
+		}
+
+		basisu::image buimg(image->get_width(), image->get_height());
+
+		{
+			Vector<uint8_t> vec = image->get_data();
+			const uint8_t *r = vec.ptr();
+
+			memcpy(buimg.get_ptr(), r, vec.size());
+		}
+
+		//image->save_png("pepeche.png");
+
+		basisu::basis_compressor_params params;
+		params.m_max_endpoint_clusters = 512;
+		params.m_max_selector_clusters = 512;
+		params.m_multithreading = true;
+		//params.m_no_hybrid_sel_cb = true; //fixme, default on this causes crashes //seems fixed?
+		params.m_pSel_codebook = sel_codebook;
+		//params.m_quality_level = 0;
+		//params.m_disable_hierarchical_endpoint_codebooks = true;
+		//params.m_no_selector_rdo = true;
+		params.m_auto_global_sel_pal = false;
+
+		basisu::job_pool jpool(OS::get_singleton()->get_processor_count());
+		params.m_pJob_pool = &jpool;
+
+		params.m_mip_gen = false; //sorry, please some day support provided mipmaps.
+		params.m_source_images.push_back(buimg);
+
+		BasisDecompressFormat decompress_format = BASIS_DECOMPRESS_RG;
+		params.m_check_for_alpha = false;
+
+		switch (p_channels) {
+			case Image::USED_CHANNELS_L: {
+				decompress_format = BASIS_DECOMPRESS_RGB;
+			} break;
+			case Image::USED_CHANNELS_LA: {
+				params.m_force_alpha = true;
+				decompress_format = BASIS_DECOMPRESS_RGBA;
+			} break;
+			case Image::USED_CHANNELS_R: {
+				decompress_format = BASIS_DECOMPRESS_RGB;
+			} break;
+			case Image::USED_CHANNELS_RG: {
+#ifdef USE_RG_AS_RGBA
+				image->convert_rg_to_ra_rgba8();
+				decompress_format = BASIS_DECOMPRESS_RG_AS_RA;
+#else
+				params.m_seperate_rg_to_color_alpha = true;
+				decompress_format = BASIS_DECOMPRESS_RG;
+#endif
+			} break;
+			case Image::USED_CHANNELS_RGB: {
+				decompress_format = BASIS_DECOMPRESS_RGB;
+			} break;
+			case Image::USED_CHANNELS_RGBA: {
+				params.m_force_alpha = true;
+				decompress_format = BASIS_DECOMPRESS_RGBA;
+			} break;
+		}
+
+		basisu::basis_compressor c;
+		c.init(params);
+
+		int buerr = c.process();
+		ERR_FAIL_COND_V(buerr != basisu::basis_compressor::cECSuccess, budata);
+
+		const basisu::uint8_vec &buvec = c.get_output_basis_file();
+		budata.resize(buvec.size() + 4);
+
+		{
+			uint8_t *w = budata.ptrw();
+			uint32_t *decf = (uint32_t *)w;
+			*decf = decompress_format;
+			memcpy(w + 4, &buvec[0], buvec.size());
+		}
+	}
+
+	return budata;
+}
+#endif // TOOLS_ENABLED
+
+static Ref<Image> basis_universal_unpacker(const Vector<uint8_t> &p_buffer) {
+	Ref<Image> image;
+
+	const uint8_t *r = p_buffer.ptr();
+	const uint8_t *ptr = r;
+	int size = p_buffer.size();
+
+	basist::transcoder_texture_format format = basist::transcoder_texture_format::cTFTotalTextureFormats;
+	Image::Format imgfmt = Image::FORMAT_MAX;
+
+	switch (*(uint32_t *)(ptr)) {
+		case BASIS_DECOMPRESS_RG: {
+			if (RS::get_singleton()->has_os_feature("rgtc")) {
+				format = basist::transcoder_texture_format::cTFBC5; // get this from renderer
+				imgfmt = Image::FORMAT_RGTC_RG;
+			} else if (RS::get_singleton()->has_os_feature("etc2")) {
+				//unfortunately, basis universal does not support
+				//
+				ERR_FAIL_V(image); //unimplemented here
+				//format = basist::transcoder_texture_format::cTFETC1; // get this from renderer
+				//imgfmt = Image::FORMAT_RGTC_RG;
+			} else {
+				// FIXME: There wasn't anything here, but then imgformat is used uninitialized.
+				ERR_FAIL_V(image);
+			}
+		} break;
+		case BASIS_DECOMPRESS_RGB: {
+			if (RS::get_singleton()->has_os_feature("bptc")) {
+				format = basist::transcoder_texture_format::cTFBC7_M6_OPAQUE_ONLY; // get this from renderer
+				imgfmt = Image::FORMAT_BPTC_RGBA;
+			} else if (RS::get_singleton()->has_os_feature("s3tc")) {
+				format = basist::transcoder_texture_format::cTFBC1; // get this from renderer
+				imgfmt = Image::FORMAT_DXT1;
+			} else if (RS::get_singleton()->has_os_feature("etc")) {
+				format = basist::transcoder_texture_format::cTFETC1; // get this from renderer
+				imgfmt = Image::FORMAT_ETC;
+			} else {
+				format = basist::transcoder_texture_format::cTFBGR565; // get this from renderer
+				imgfmt = Image::FORMAT_RGB565;
+			}
+
+		} break;
+		case BASIS_DECOMPRESS_RGBA: {
+			if (RS::get_singleton()->has_os_feature("bptc")) {
+				format = basist::transcoder_texture_format::cTFBC7_M5; // get this from renderer
+				imgfmt = Image::FORMAT_BPTC_RGBA;
+			} else if (RS::get_singleton()->has_os_feature("s3tc")) {
+				format = basist::transcoder_texture_format::cTFBC3; // get this from renderer
+				imgfmt = Image::FORMAT_DXT5;
+			} else if (RS::get_singleton()->has_os_feature("etc2")) {
+				format = basist::transcoder_texture_format::cTFETC2; // get this from renderer
+				imgfmt = Image::FORMAT_ETC2_RGBA8;
+			} else {
+				//gles2 most likely
+				format = basist::transcoder_texture_format::cTFRGBA4444; // get this from renderer
+				imgfmt = Image::FORMAT_RGBA4444;
+			}
+		} break;
+		case BASIS_DECOMPRESS_RG_AS_RA: {
+			if (RS::get_singleton()->has_os_feature("s3tc")) {
+				format = basist::transcoder_texture_format::cTFBC3; // get this from renderer
+				imgfmt = Image::FORMAT_DXT5_RA_AS_RG;
+			} else if (RS::get_singleton()->has_os_feature("etc2")) {
+				format = basist::transcoder_texture_format::cTFETC2; // get this from renderer
+				imgfmt = Image::FORMAT_ETC2_RGBA8;
+			} else {
+				//gles2 most likely, bad for normalmaps, nothing to do about this.
+				format = basist::transcoder_texture_format::cTFRGBA32;
+				imgfmt = Image::FORMAT_RGBA8;
+			}
+		} break;
+	}
+
+	ptr += 4;
+	size -= 4;
+
+	basist::basisu_transcoder tr(nullptr);
+
+	ERR_FAIL_COND_V(!tr.validate_header(ptr, size), image);
+
+	basist::basisu_image_info info;
+	tr.get_image_info(ptr, size, info, 0);
+
+	int block_size = basist::basis_get_bytes_per_block(format);
+	Vector<uint8_t> gpudata;
+	gpudata.resize(info.m_total_blocks * block_size);
+
+	{
+		uint8_t *w = gpudata.ptrw();
+		uint8_t *dst = w;
+		for (int i = 0; i < gpudata.size(); i++) {
+			dst[i] = 0x00;
+		}
+
+		int ofs = 0;
+		tr.start_transcoding(ptr, size);
+		for (uint32_t i = 0; i < info.m_total_levels; i++) {
+			basist::basisu_image_level_info level;
+			tr.get_image_level_info(ptr, size, level, 0, i);
+
+			bool ret = tr.transcode_image_level(ptr, size, 0, i, dst + ofs, level.m_total_blocks - i, format);
+			if (!ret) {
+				printf("failed! on level %i\n", i);
+				break;
+			};
+
+			ofs += level.m_total_blocks * block_size;
+		};
+	};
+
+	image.instance();
+	image->create(info.m_width, info.m_height, info.m_total_levels > 1, imgfmt, gpudata);
+
+	return image;
+}
+
+void register_basis_universal_types() {
+#ifdef TOOLS_ENABLED
+	sel_codebook = new basist::etc1_global_selector_codebook(basist::g_global_selector_cb_size, basist::g_global_selector_cb);
+	Image::basis_universal_packer = basis_universal_packer;
+#endif
+	Image::basis_universal_unpacker = basis_universal_unpacker;
+	//ClassDB::register_class<TextureBasisU>();
+}
+
+void unregister_basis_universal_types() {
+#ifdef TOOLS_ENABLED
+	delete sel_codebook;
+	Image::basis_universal_packer = nullptr;
+#endif
+	Image::basis_universal_unpacker = nullptr;
+}
diff --git a/modules/opus/stub/register_types.h b/modules/basis_universal/register_types.h
index 445be4e166..5053dc27ce 100644
--- a/modules/opus/stub/register_types.h
+++ b/modules/basis_universal/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-void register_opus_types();
-void unregister_opus_types();
+#ifndef BASIS_UNIVERSAL_REGISTER_TYPES_H
+#define BASIS_UNIVERSAL_REGISTER_TYPES_H
+
+void register_basis_universal_types();
+void unregister_basis_universal_types();
+
+#endif // BASIS_UNIVERSAL_REGISTER_TYPES_H
diff --git a/modules/basis_universal/texture_basisu.cpp b/modules/basis_universal/texture_basisu.cpp
new file mode 100644
index 0000000000..2ed0340927
--- /dev/null
+++ b/modules/basis_universal/texture_basisu.cpp
@@ -0,0 +1,233 @@
+/*************************************************************************/
+/*  texture_basisu.cpp                                                   */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "texture_basisu.h"
+#if 0
+#include "core/os/os.h"
+
+#ifdef TOOLS_ENABLED
+#include <basisu_comp.h>
+#endif
+
+#include <transcoder/basisu_transcoder.h>
+
+void TextureBasisU::_bind_methods() {
+
+	ClassDB::bind_method(D_METHOD("set_basisu_data", "data"), &TextureBasisU::set_basisu_data);
+	ClassDB::bind_method(D_METHOD("get_basisu_data"), &TextureBasisU::get_data);
+	ClassDB::bind_method(D_METHOD("import"), &TextureBasisU::import);
+
+	ADD_PROPERTY(PropertyInfo(Variant::PACKED_BYTE_ARRAY, "basisu_data"), "set_basisu_data", "get_basisu_data");
+
+};
+
+int TextureBasisU::get_width() const {
+
+	return tex_size.x;
+};
+
+int TextureBasisU::get_height() const {
+
+	return tex_size.y;
+};
+
+RID TextureBasisU::get_rid() const {
+
+	return texture;
+};
+
+
+bool TextureBasisU::has_alpha() const {
+
+	return false;
+};
+
+void TextureBasisU::set_flags(uint32_t p_flags) {
+
+	flags = p_flags;
+	RenderingServer::get_singleton()->texture_set_flags(texture, p_flags);
+};
+
+uint32_t TextureBasisU::get_flags() const {
+
+	return flags;
+};
+
+
+void TextureBasisU::set_basisu_data(const Vector<uint8_t>& p_data) {
+
+#ifdef TOOLS_ENABLED
+	data = p_data;
+#endif
+
+	const uint8_t* r = p_data.ptr();
+	const void* ptr = r.ptr();
+	int size = p_data.size();
+
+	basist::transcoder_texture_format format;
+	Image::Format imgfmt;
+
+	if (OS::get_singleton()->has_feature("s3tc")) {
+
+		format = basist::cTFBC3; // get this from renderer
+		imgfmt = Image::FORMAT_DXT5;
+
+	} else if (OS::get_singleton()->has_feature("etc2")) {
+
+		format = basist::cTFETC2;
+		imgfmt = Image::FORMAT_ETC2_RGBA8;
+	};
+
+	basist::basisu_transcoder tr(nullptr);
+
+	ERR_FAIL_COND(!tr.validate_header(ptr, size));
+
+	basist::basisu_image_info info;
+	tr.get_image_info(ptr, size, info, 0);
+	tex_size = Size2(info.m_width, info.m_height);
+
+	int block_size = basist::basis_get_bytes_per_block(format);
+	Vector<uint8_t> gpudata;
+	gpudata.resize(info.m_total_blocks * block_size);
+
+	{
+		uint8_t* w = gpudata.ptrw();
+		uint8_t* dst = w.ptr();
+		for (int i=0; i<gpudata.size(); i++)
+			dst[i] = 0x00;
+
+		int ofs = 0;
+		tr.start_transcoding(ptr, size);
+		for (int i=0; i<info.m_total_levels; i++) {
+
+			basist::basisu_image_level_info level;
+			tr.get_image_level_info(ptr, size, level, 0, i);
+
+			bool ret = tr.transcode_image_level(ptr, size, 0, i, dst + ofs, level.m_total_blocks - i, format);
+			if (!ret) {
+				printf("failed! on level %i\n", i);
+				break;
+			};
+
+			ofs += level.m_total_blocks * block_size;
+		};
+	};
+
+	Ref<Image> img;
+	img.instance();
+	img->create(info.m_width, info.m_height, info.m_total_levels > 1, imgfmt, gpudata);
+
+	RenderingServer::get_singleton()->texture_allocate(texture, tex_size.x, tex_size.y, 0, img->get_format(), RS::TEXTURE_TYPE_2D, flags);
+	RenderingServer::get_singleton()->texture_set_data(texture, img);
+};
+
+Error TextureBasisU::import(const Ref<Image>& p_img) {
+
+#ifdef TOOLS_ENABLED
+
+	Vector<uint8_t> budata;
+
+	{
+		Image::Format format = p_img->get_format();
+		if (format != Image::FORMAT_RGB8 && format != Image::FORMAT_RGBA8) {
+			ERR_FAIL_V(ERR_INVALID_PARAMETER);
+			return ERR_INVALID_PARAMETER;
+		};
+
+		Ref<Image> copy = p_img->duplicate();
+		if (format == Image::FORMAT_RGB8)
+			copy->convert(Image::FORMAT_RGBA8);
+
+		basisu::image buimg(p_img->get_width(), p_img->get_height());
+		int size = p_img->get_width() * p_img->get_height() * 4;
+
+		Vector<uint8_t> vec = copy->get_data();
+		{
+			const uint8_t* r = vec.ptr();
+			memcpy(buimg.get_ptr(), r.ptr(), size);
+		};
+
+		basisu::basis_compressor_params params;
+		params.m_max_endpoint_clusters = 512;
+		params.m_max_selector_clusters = 512;
+		params.m_multithreading = true;
+
+		basisu::job_pool jpool(1);
+		params.m_pJob_pool = &jpool;
+
+		params.m_mip_gen = p_img->get_mipmap_count() > 0;
+		params.m_source_images.push_back(buimg);
+
+		basisu::basis_compressor c;
+		c.init(params);
+
+		int buerr = c.process();
+		if (buerr != basisu::basis_compressor::cECSuccess) {
+			ERR_FAIL_V(ERR_INVALID_PARAMETER);
+			return ERR_INVALID_PARAMETER;
+		};
+
+		const basisu::uint8_vec& buvec = c.get_output_basis_file();
+		budata.resize(buvec.size());
+
+		{
+			uint8_t* w = budata.ptrw();
+			memcpy(w.ptr(), &buvec[0], budata.size());
+		};
+	};
+
+	set_basisu_data(budata);
+
+	return OK;
+#else
+
+	return ERR_UNAVAILABLE;
+#endif
+};
+
+
+Vector<uint8_t> TextureBasisU::get_basisu_data() const {
+
+	return data;
+};
+
+TextureBasisU::TextureBasisU() {
+
+	flags = FLAGS_DEFAULT;
+	texture = RenderingServer::get_singleton()->texture_create();
+};
+
+
+TextureBasisU::~TextureBasisU() {
+
+	RenderingServer::get_singleton()->free(texture);
+};
+
+#endif
diff --git a/modules/basis_universal/texture_basisu.h b/modules/basis_universal/texture_basisu.h
new file mode 100644
index 0000000000..20ecf15a59
--- /dev/null
+++ b/modules/basis_universal/texture_basisu.h
@@ -0,0 +1,82 @@
+/*************************************************************************/
+/*  texture_basisu.h                                                     */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef BASIS_UNIVERSAL_TEXTURE_BASISU_H
+#define BASIS_UNIVERSAL_TEXTURE_BASISU_H
+
+#include "scene/resources/texture.h"
+
+#ifdef TOOLS_ENABLED
+#include <basisu_comp.h>
+#endif
+
+#include <transcoder/basisu_transcoder.h>
+
+#if 0
+class TextureBasisU : public Texture {
+
+	GDCLASS(TextureBasisU, Texture);
+	RES_BASE_EXTENSION("butex");
+
+	RID texture;
+	Size2 tex_size;
+
+	uint32_t flags;
+
+	Vector<uint8_t> data;
+
+	static void _bind_methods();
+
+public:
+
+	virtual int get_width() const;
+	virtual int get_height() const;
+	virtual RID get_rid() const;
+	virtual bool has_alpha() const;
+
+	virtual void set_flags(uint32_t p_flags);
+	virtual uint32_t get_flags() const;
+
+
+	Error import(const Ref<Image> &p_img);
+
+	void set_basisu_data(const Vector<uint8_t>& p_data);
+
+	Vector<uint8_t> get_basisu_data() const;
+	String get_img_path() const;
+
+	TextureBasisU();
+	~TextureBasisU();
+
+};
+
+#endif
+
+#endif // BASIS_UNIVERSAL_TEXTURE_BASISU_H
diff --git a/modules/bmp/SCsub b/modules/bmp/SCsub
index e7da7cf108..4f3405ff28 100644
--- a/modules/bmp/SCsub
+++ b/modules/bmp/SCsub
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_bmp = env_modules.Clone()
 
diff --git a/modules/bmp/config.py b/modules/bmp/config.py
index 1c8cd12a2d..d22f9454ed 100644
--- a/modules/bmp/config.py
+++ b/modules/bmp/config.py
@@ -1,5 +1,6 @@
 def can_build(env, platform):
     return True
 
+
 def configure(env):
     pass
diff --git a/modules/bmp/image_loader_bmp.cpp b/modules/bmp/image_loader_bmp.cpp
index 5ce6d59daa..757afeb9e3 100644
--- a/modules/bmp/image_loader_bmp.cpp
+++ b/modules/bmp/image_loader_bmp.cpp
@@ -35,11 +35,11 @@ Error ImageLoaderBMP::convert_to_image(Ref<Image> p_image,
 		const uint8_t *p_color_buffer,
 		const uint32_t color_table_size,
 		const bmp_header_s &p_header) {
-
 	Error err = OK;
 
-	if (p_buffer == NULL)
+	if (p_buffer == nullptr) {
 		err = FAILED;
+	}
 
 	if (err == OK) {
 		size_t index = 0;
@@ -51,21 +51,24 @@ Error ImageLoaderBMP::convert_to_image(Ref<Image> p_image,
 
 		if (bits_per_pixel == 1) {
 			// Requires bit unpacking...
-			ERR_FAIL_COND_V(width % 8 != 0, ERR_UNAVAILABLE);
-			ERR_FAIL_COND_V(height % 8 != 0, ERR_UNAVAILABLE);
+			ERR_FAIL_COND_V_MSG(width % 8 != 0, ERR_UNAVAILABLE,
+					vformat("1-bpp BMP images must have a width that is a multiple of 8, but the imported BMP is %d pixels wide.", int(width)));
+			ERR_FAIL_COND_V_MSG(height % 8 != 0, ERR_UNAVAILABLE,
+					vformat("1-bpp BMP images must have a height that is a multiple of 8, but the imported BMP is %d pixels tall.", int(height)));
 
 		} else if (bits_per_pixel == 4) {
 			// Requires bit unpacking...
-			ERR_FAIL_COND_V(width % 2 != 0, ERR_UNAVAILABLE);
-			ERR_FAIL_COND_V(height % 2 != 0, ERR_UNAVAILABLE);
+			ERR_FAIL_COND_V_MSG(width % 2 != 0, ERR_UNAVAILABLE,
+					vformat("4-bpp BMP images must have a width that is a multiple of 2, but the imported BMP is %d pixels wide.", int(width)));
+			ERR_FAIL_COND_V_MSG(height % 2 != 0, ERR_UNAVAILABLE,
+					vformat("4-bpp BMP images must have a height that is a multiple of 2, but the imported BMP is %d pixels tall.", int(height)));
 
 		} else if (bits_per_pixel == 16) {
-
-			ERR_FAIL_V(ERR_UNAVAILABLE);
+			ERR_FAIL_V_MSG(ERR_UNAVAILABLE, "16-bpp BMP images are not supported.");
 		}
 
 		// Image data (might be indexed)
-		PoolVector<uint8_t> data;
+		Vector<uint8_t> data;
 		int data_len = 0;
 
 		if (bits_per_pixel <= 8) { // indexed
@@ -73,11 +76,11 @@ Error ImageLoaderBMP::convert_to_image(Ref<Image> p_image,
 		} else { // color
 			data_len = width * height * 4;
 		}
-		ERR_FAIL_COND_V(data_len == 0, ERR_BUG);
+		ERR_FAIL_COND_V_MSG(data_len == 0, ERR_BUG, "Couldn't parse the BMP image data.");
 		err = data.resize(data_len);
 
-		PoolVector<uint8_t>::Write data_w = data.write();
-		uint8_t *write_buffer = data_w.ptr();
+		uint8_t *data_w = data.ptrw();
+		uint8_t *write_buffer = data_w;
 
 		const uint32_t width_bytes = width * bits_per_pixel / 8;
 		const uint32_t line_width = (width_bytes + 3) & ~3;
@@ -151,18 +154,18 @@ Error ImageLoaderBMP::convert_to_image(Ref<Image> p_image,
 			line -= line_width;
 		}
 
-		if (p_color_buffer == NULL || color_table_size == 0) { // regular pixels
+		if (p_color_buffer == nullptr || color_table_size == 0) { // regular pixels
 
-			p_image->create(width, height, 0, Image::FORMAT_RGBA8, data);
+			p_image->create(width, height, false, Image::FORMAT_RGBA8, data);
 
 		} else { // data is in indexed format, extend it
 
 			// Palette data
-			PoolVector<uint8_t> palette_data;
+			Vector<uint8_t> palette_data;
 			palette_data.resize(color_table_size * 4);
 
-			PoolVector<uint8_t>::Write palette_data_w = palette_data.write();
-			uint8_t *pal = palette_data_w.ptr();
+			uint8_t *palette_data_w = palette_data.ptrw();
+			uint8_t *pal = palette_data_w;
 
 			const uint8_t *cb = p_color_buffer;
 
@@ -177,11 +180,11 @@ Error ImageLoaderBMP::convert_to_image(Ref<Image> p_image,
 				cb += 4;
 			}
 			// Extend palette to image
-			PoolVector<uint8_t> extended_data;
+			Vector<uint8_t> extended_data;
 			extended_data.resize(data.size() * 4);
 
-			PoolVector<uint8_t>::Write ex_w = extended_data.write();
-			uint8_t *dest = ex_w.ptr();
+			uint8_t *ex_w = extended_data.ptrw();
+			uint8_t *dest = ex_w;
 
 			const int num_pixels = width * height;
 
@@ -193,7 +196,7 @@ Error ImageLoaderBMP::convert_to_image(Ref<Image> p_image,
 
 				dest += 4;
 			}
-			p_image->create(width, height, 0, Image::FORMAT_RGBA8, extended_data);
+			p_image->create(width, height, false, Image::FORMAT_RGBA8, extended_data);
 		}
 	}
 	return err;
@@ -201,7 +204,6 @@ Error ImageLoaderBMP::convert_to_image(Ref<Image> p_image,
 
 Error ImageLoaderBMP::load_image(Ref<Image> p_image, FileAccess *f,
 		bool p_force_linear, float p_scale) {
-
 	bmp_header_s bmp_header;
 	Error err = ERR_INVALID_DATA;
 
@@ -217,13 +219,15 @@ Error ImageLoaderBMP::load_image(Ref<Image> p_image, FileAccess *f,
 
 			// Info Header
 			bmp_header.bmp_info_header.bmp_header_size = f->get_32();
-			ERR_FAIL_COND_V(bmp_header.bmp_info_header.bmp_header_size < BITMAP_INFO_HEADER_MIN_SIZE, ERR_FILE_CORRUPT);
+			ERR_FAIL_COND_V_MSG(bmp_header.bmp_info_header.bmp_header_size < BITMAP_INFO_HEADER_MIN_SIZE, ERR_FILE_CORRUPT,
+					vformat("Couldn't parse the BMP info header. The file is likely corrupt: %s", f->get_path()));
 
 			bmp_header.bmp_info_header.bmp_width = f->get_32();
 			bmp_header.bmp_info_header.bmp_height = f->get_32();
 
 			bmp_header.bmp_info_header.bmp_planes = f->get_16();
-			ERR_FAIL_COND_V(bmp_header.bmp_info_header.bmp_planes != 1, ERR_FILE_CORRUPT);
+			ERR_FAIL_COND_V_MSG(bmp_header.bmp_info_header.bmp_planes != 1, ERR_FILE_CORRUPT,
+					vformat("Couldn't parse the BMP planes. The file is likely corrupt: %s", f->get_path()));
 
 			bmp_header.bmp_info_header.bmp_bit_count = f->get_16();
 			bmp_header.bmp_info_header.bmp_compression = f->get_32();
@@ -238,10 +242,10 @@ Error ImageLoaderBMP::load_image(Ref<Image> p_image, FileAccess *f,
 				case BI_RLE4:
 				case BI_CMYKRLE8:
 				case BI_CMYKRLE4: {
-					// Stop parsing
-					String bmp_path = f->get_path();
+					// Stop parsing.
 					f->close();
-					ERR_FAIL_V_MSG(ERR_UNAVAILABLE, "Compressed BMP files are not supported: " + bmp_path + ".");
+					ERR_FAIL_V_MSG(ERR_UNAVAILABLE,
+							vformat("Compressed BMP files are not supported: %s", f->get_path()));
 				} break;
 			}
 			// Don't rely on sizeof(bmp_file_header) as structure padding
@@ -257,30 +261,31 @@ Error ImageLoaderBMP::load_image(Ref<Image> p_image, FileAccess *f,
 			if (bmp_header.bmp_info_header.bmp_bit_count <= 8) {
 				// Support 256 colors max
 				color_table_size = 1 << bmp_header.bmp_info_header.bmp_bit_count;
-				ERR_FAIL_COND_V(color_table_size == 0, ERR_BUG);
+				ERR_FAIL_COND_V_MSG(color_table_size == 0, ERR_BUG,
+						vformat("Couldn't parse the BMP color table: %s", f->get_path()));
 			}
 
-			PoolVector<uint8_t> bmp_color_table;
+			Vector<uint8_t> bmp_color_table;
 			// Color table is usually 4 bytes per color -> [B][G][R][0]
 			bmp_color_table.resize(color_table_size * 4);
-			PoolVector<uint8_t>::Write bmp_color_table_w = bmp_color_table.write();
-			f->get_buffer(bmp_color_table_w.ptr(), color_table_size * 4);
+			uint8_t *bmp_color_table_w = bmp_color_table.ptrw();
+			f->get_buffer(bmp_color_table_w, color_table_size * 4);
 
 			f->seek(bmp_header.bmp_file_header.bmp_file_offset);
 
 			uint32_t bmp_buffer_size = (bmp_header.bmp_file_header.bmp_file_size -
 										bmp_header.bmp_file_header.bmp_file_offset);
 
-			PoolVector<uint8_t> bmp_buffer;
+			Vector<uint8_t> bmp_buffer;
 			err = bmp_buffer.resize(bmp_buffer_size);
 			if (err == OK) {
-				PoolVector<uint8_t>::Write bmp_buffer_w = bmp_buffer.write();
-				f->get_buffer(bmp_buffer_w.ptr(), bmp_buffer_size);
+				uint8_t *bmp_buffer_w = bmp_buffer.ptrw();
+				f->get_buffer(bmp_buffer_w, bmp_buffer_size);
 
-				PoolVector<uint8_t>::Read bmp_buffer_r = bmp_buffer.read();
-				PoolVector<uint8_t>::Read bmp_color_table_r = bmp_color_table.read();
-				err = convert_to_image(p_image, bmp_buffer_r.ptr(),
-						bmp_color_table_r.ptr(), color_table_size, bmp_header);
+				const uint8_t *bmp_buffer_r = bmp_buffer.ptr();
+				const uint8_t *bmp_color_table_r = bmp_color_table.ptr();
+				err = convert_to_image(p_image, bmp_buffer_r,
+						bmp_color_table_r, color_table_size, bmp_header);
 			}
 			f->close();
 		}
@@ -290,7 +295,6 @@ Error ImageLoaderBMP::load_image(Ref<Image> p_image, FileAccess *f,
 
 void ImageLoaderBMP::get_recognized_extensions(
 		List<String> *p_extensions) const {
-
 	p_extensions->push_back("bmp");
 }
 
diff --git a/modules/bmp/register_types.cpp b/modules/bmp/register_types.cpp
index d5cc6c5eb3..6220e956d6 100644
--- a/modules/bmp/register_types.cpp
+++ b/modules/bmp/register_types.cpp
@@ -32,7 +32,7 @@
 
 #include "image_loader_bmp.h"
 
-static ImageLoaderBMP *image_loader_bmp = NULL;
+static ImageLoaderBMP *image_loader_bmp = nullptr;
 
 void register_bmp_types() {
 	image_loader_bmp = memnew(ImageLoaderBMP);
diff --git a/modules/bmp/register_types.h b/modules/bmp/register_types.h
index 398716eaa1..e7561dc32d 100644
--- a/modules/bmp/register_types.h
+++ b/modules/bmp/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef BMP_REGISTER_TYPES_H
+#define BMP_REGISTER_TYPES_H
+
 void register_bmp_types();
 void unregister_bmp_types();
+
+#endif // BMP_REGISTER_TYPES_H
diff --git a/modules/bullet/SCsub b/modules/bullet/SCsub
index 02d0a31a69..21bdcca18e 100644
--- a/modules/bullet/SCsub
+++ b/modules/bullet/SCsub
@@ -1,212 +1,210 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_bullet = env_modules.Clone()
 
 # Thirdparty source files
 
-if env['builtin_bullet']:
+if env["builtin_bullet"]:
     # Build only version 2 for now (as of 2.89)
     # Sync file list with relevant upstream CMakeLists.txt for each folder.
     thirdparty_dir = "#thirdparty/bullet/"
 
     bullet2_src = [
         # BulletCollision
-          "BulletCollision/BroadphaseCollision/btAxisSweep3.cpp"
-        , "BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp"
-        , "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp"
-        , "BulletCollision/BroadphaseCollision/btDbvt.cpp"
-        , "BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp"
-        , "BulletCollision/BroadphaseCollision/btDispatcher.cpp"
-        , "BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp"
-        , "BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp"
-        , "BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp"
-        , "BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp"
-        , "BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp"
-        , "BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp"
-        , "BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp"
-        , "BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp"
-        , "BulletCollision/CollisionDispatch/btCollisionDispatcherMt.cpp"
-        , "BulletCollision/CollisionDispatch/btCollisionObject.cpp"
-        , "BulletCollision/CollisionDispatch/btCollisionWorld.cpp"
-        , "BulletCollision/CollisionDispatch/btCollisionWorldImporter.cpp"
-        , "BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp"
-        , "BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.cpp"
-        , "BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp"
-        , "BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp"
-        , "BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp"
-        , "BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp"
-        , "BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp"
-        , "BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp"
-        , "BulletCollision/CollisionDispatch/btGhostObject.cpp"
-        , "BulletCollision/CollisionDispatch/btHashedSimplePairCache.cpp"
-        , "BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp"
-        , "BulletCollision/CollisionDispatch/btManifoldResult.cpp"
-        , "BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp"
-        , "BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp"
-        , "BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp"
-        , "BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp"
-        , "BulletCollision/CollisionDispatch/btUnionFind.cpp"
-        , "BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp"
-        , "BulletCollision/CollisionShapes/btBoxShape.cpp"
-        , "BulletCollision/CollisionShapes/btBox2dShape.cpp"
-        , "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp"
-        , "BulletCollision/CollisionShapes/btCapsuleShape.cpp"
-        , "BulletCollision/CollisionShapes/btCollisionShape.cpp"
-        , "BulletCollision/CollisionShapes/btCompoundShape.cpp"
-        , "BulletCollision/CollisionShapes/btConcaveShape.cpp"
-        , "BulletCollision/CollisionShapes/btConeShape.cpp"
-        , "BulletCollision/CollisionShapes/btConvexHullShape.cpp"
-        , "BulletCollision/CollisionShapes/btConvexInternalShape.cpp"
-        , "BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp"
-        , "BulletCollision/CollisionShapes/btConvexPolyhedron.cpp"
-        , "BulletCollision/CollisionShapes/btConvexShape.cpp"
-        , "BulletCollision/CollisionShapes/btConvex2dShape.cpp"
-        , "BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp"
-        , "BulletCollision/CollisionShapes/btCylinderShape.cpp"
-        , "BulletCollision/CollisionShapes/btEmptyShape.cpp"
-        , "BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp"
-        , "BulletCollision/CollisionShapes/btMiniSDF.cpp"
-        , "BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp"
-        , "BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp"
-        , "BulletCollision/CollisionShapes/btMultiSphereShape.cpp"
-        , "BulletCollision/CollisionShapes/btOptimizedBvh.cpp"
-        , "BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp"
-        , "BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp"
-        , "BulletCollision/CollisionShapes/btSdfCollisionShape.cpp"
-        , "BulletCollision/CollisionShapes/btShapeHull.cpp"
-        , "BulletCollision/CollisionShapes/btSphereShape.cpp"
-        , "BulletCollision/CollisionShapes/btStaticPlaneShape.cpp"
-        , "BulletCollision/CollisionShapes/btStridingMeshInterface.cpp"
-        , "BulletCollision/CollisionShapes/btTetrahedronShape.cpp"
-        , "BulletCollision/CollisionShapes/btTriangleBuffer.cpp"
-        , "BulletCollision/CollisionShapes/btTriangleCallback.cpp"
-        , "BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp"
-        , "BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp"
-        , "BulletCollision/CollisionShapes/btTriangleMesh.cpp"
-        , "BulletCollision/CollisionShapes/btTriangleMeshShape.cpp"
-        , "BulletCollision/CollisionShapes/btUniformScalingShape.cpp"
-        , "BulletCollision/Gimpact/btContactProcessing.cpp"
-        , "BulletCollision/Gimpact/btGenericPoolAllocator.cpp"
-        , "BulletCollision/Gimpact/btGImpactBvh.cpp"
-        , "BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp"
-        , "BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp"
-        , "BulletCollision/Gimpact/btGImpactShape.cpp"
-        , "BulletCollision/Gimpact/btTriangleShapeEx.cpp"
-        , "BulletCollision/Gimpact/gim_box_set.cpp"
-        , "BulletCollision/Gimpact/gim_contact.cpp"
-        , "BulletCollision/Gimpact/gim_memory.cpp"
-        , "BulletCollision/Gimpact/gim_tri_collision.cpp"
-        , "BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp"
-        , "BulletCollision/NarrowPhaseCollision/btConvexCast.cpp"
-        , "BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp"
-        , "BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp"
-        , "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp"
-        , "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp"
-        , "BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp"
-        , "BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp"
-        , "BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp"
-        , "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp"
-        , "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp"
-        , "BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp"
-
+        "BulletCollision/BroadphaseCollision/btAxisSweep3.cpp",
+        "BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp",
+        "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp",
+        "BulletCollision/BroadphaseCollision/btDbvt.cpp",
+        "BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp",
+        "BulletCollision/BroadphaseCollision/btDispatcher.cpp",
+        "BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp",
+        "BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp",
+        "BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp",
+        "BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp",
+        "BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp",
+        "BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp",
+        "BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp",
+        "BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp",
+        "BulletCollision/CollisionDispatch/btCollisionDispatcherMt.cpp",
+        "BulletCollision/CollisionDispatch/btCollisionObject.cpp",
+        "BulletCollision/CollisionDispatch/btCollisionWorld.cpp",
+        "BulletCollision/CollisionDispatch/btCollisionWorldImporter.cpp",
+        "BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp",
+        "BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.cpp",
+        "BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp",
+        "BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp",
+        "BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp",
+        "BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp",
+        "BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp",
+        "BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp",
+        "BulletCollision/CollisionDispatch/btGhostObject.cpp",
+        "BulletCollision/CollisionDispatch/btHashedSimplePairCache.cpp",
+        "BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp",
+        "BulletCollision/CollisionDispatch/btManifoldResult.cpp",
+        "BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp",
+        "BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp",
+        "BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp",
+        "BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp",
+        "BulletCollision/CollisionDispatch/btUnionFind.cpp",
+        "BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp",
+        "BulletCollision/CollisionShapes/btBoxShape.cpp",
+        "BulletCollision/CollisionShapes/btBox2dShape.cpp",
+        "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp",
+        "BulletCollision/CollisionShapes/btCapsuleShape.cpp",
+        "BulletCollision/CollisionShapes/btCollisionShape.cpp",
+        "BulletCollision/CollisionShapes/btCompoundShape.cpp",
+        "BulletCollision/CollisionShapes/btConcaveShape.cpp",
+        "BulletCollision/CollisionShapes/btConeShape.cpp",
+        "BulletCollision/CollisionShapes/btConvexHullShape.cpp",
+        "BulletCollision/CollisionShapes/btConvexInternalShape.cpp",
+        "BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp",
+        "BulletCollision/CollisionShapes/btConvexPolyhedron.cpp",
+        "BulletCollision/CollisionShapes/btConvexShape.cpp",
+        "BulletCollision/CollisionShapes/btConvex2dShape.cpp",
+        "BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp",
+        "BulletCollision/CollisionShapes/btCylinderShape.cpp",
+        "BulletCollision/CollisionShapes/btEmptyShape.cpp",
+        "BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp",
+        "BulletCollision/CollisionShapes/btMiniSDF.cpp",
+        "BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp",
+        "BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp",
+        "BulletCollision/CollisionShapes/btMultiSphereShape.cpp",
+        "BulletCollision/CollisionShapes/btOptimizedBvh.cpp",
+        "BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp",
+        "BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp",
+        "BulletCollision/CollisionShapes/btSdfCollisionShape.cpp",
+        "BulletCollision/CollisionShapes/btShapeHull.cpp",
+        "BulletCollision/CollisionShapes/btSphereShape.cpp",
+        "BulletCollision/CollisionShapes/btStaticPlaneShape.cpp",
+        "BulletCollision/CollisionShapes/btStridingMeshInterface.cpp",
+        "BulletCollision/CollisionShapes/btTetrahedronShape.cpp",
+        "BulletCollision/CollisionShapes/btTriangleBuffer.cpp",
+        "BulletCollision/CollisionShapes/btTriangleCallback.cpp",
+        "BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp",
+        "BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp",
+        "BulletCollision/CollisionShapes/btTriangleMesh.cpp",
+        "BulletCollision/CollisionShapes/btTriangleMeshShape.cpp",
+        "BulletCollision/CollisionShapes/btUniformScalingShape.cpp",
+        "BulletCollision/Gimpact/btContactProcessing.cpp",
+        "BulletCollision/Gimpact/btGenericPoolAllocator.cpp",
+        "BulletCollision/Gimpact/btGImpactBvh.cpp",
+        "BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp",
+        "BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp",
+        "BulletCollision/Gimpact/btGImpactShape.cpp",
+        "BulletCollision/Gimpact/btTriangleShapeEx.cpp",
+        "BulletCollision/Gimpact/gim_box_set.cpp",
+        "BulletCollision/Gimpact/gim_contact.cpp",
+        "BulletCollision/Gimpact/gim_memory.cpp",
+        "BulletCollision/Gimpact/gim_tri_collision.cpp",
+        "BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp",
+        "BulletCollision/NarrowPhaseCollision/btConvexCast.cpp",
+        "BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp",
+        "BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp",
+        "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp",
+        "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp",
+        "BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp",
+        "BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp",
+        "BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp",
+        "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp",
+        "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp",
+        "BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp",
         # BulletDynamics
-        , "BulletDynamics/Character/btKinematicCharacterController.cpp"
-        , "BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp"
-        , "BulletDynamics/ConstraintSolver/btContactConstraint.cpp"
-        , "BulletDynamics/ConstraintSolver/btFixedConstraint.cpp"
-        , "BulletDynamics/ConstraintSolver/btGearConstraint.cpp"
-        , "BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp"
-        , "BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp"
-        , "BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.cpp"
-        , "BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp"
-        , "BulletDynamics/ConstraintSolver/btHingeConstraint.cpp"
-        , "BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp"
-        , "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp"
-        , "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolverMt.cpp"
-        , "BulletDynamics/ConstraintSolver/btBatchedConstraints.cpp"
-        , "BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.cpp"
-        , "BulletDynamics/ConstraintSolver/btSliderConstraint.cpp"
-        , "BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp"
-        , "BulletDynamics/ConstraintSolver/btTypedConstraint.cpp"
-        , "BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp"
-        , "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp"
-        , "BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.cpp"
-        , "BulletDynamics/Dynamics/btSimulationIslandManagerMt.cpp"
-        , "BulletDynamics/Dynamics/btRigidBody.cpp"
-        , "BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp"
-        #, "BulletDynamics/Dynamics/Bullet-C-API.cpp"
-        , "BulletDynamics/Vehicle/btRaycastVehicle.cpp"
-        , "BulletDynamics/Vehicle/btWheelInfo.cpp"
-        , "BulletDynamics/Featherstone/btMultiBody.cpp"
-        , "BulletDynamics/Featherstone/btMultiBodyConstraint.cpp"
-        , "BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp"
-        , "BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp"
-        , "BulletDynamics/Featherstone/btMultiBodyFixedConstraint.cpp"
-        , "BulletDynamics/Featherstone/btMultiBodyGearConstraint.cpp"
-        , "BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.cpp"
-        , "BulletDynamics/Featherstone/btMultiBodyJointMotor.cpp"
-        , "BulletDynamics/Featherstone/btMultiBodyMLCPConstraintSolver.cpp"
-        , "BulletDynamics/Featherstone/btMultiBodyPoint2Point.cpp"
-        , "BulletDynamics/Featherstone/btMultiBodySliderConstraint.cpp"
-        , "BulletDynamics/Featherstone/btMultiBodySphericalJointMotor.cpp"
-        , "BulletDynamics/MLCPSolvers/btDantzigLCP.cpp"
-        , "BulletDynamics/MLCPSolvers/btMLCPSolver.cpp"
-        , "BulletDynamics/MLCPSolvers/btLemkeAlgorithm.cpp"
-
+        "BulletDynamics/Character/btKinematicCharacterController.cpp",
+        "BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp",
+        "BulletDynamics/ConstraintSolver/btContactConstraint.cpp",
+        "BulletDynamics/ConstraintSolver/btFixedConstraint.cpp",
+        "BulletDynamics/ConstraintSolver/btGearConstraint.cpp",
+        "BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp",
+        "BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.cpp",
+        "BulletDynamics/ConstraintSolver/btGeneric6DofSpring2Constraint.cpp",
+        "BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp",
+        "BulletDynamics/ConstraintSolver/btHingeConstraint.cpp",
+        "BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp",
+        "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp",
+        "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolverMt.cpp",
+        "BulletDynamics/ConstraintSolver/btBatchedConstraints.cpp",
+        "BulletDynamics/ConstraintSolver/btNNCGConstraintSolver.cpp",
+        "BulletDynamics/ConstraintSolver/btSliderConstraint.cpp",
+        "BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp",
+        "BulletDynamics/ConstraintSolver/btTypedConstraint.cpp",
+        "BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp",
+        "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp",
+        "BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.cpp",
+        "BulletDynamics/Dynamics/btSimulationIslandManagerMt.cpp",
+        "BulletDynamics/Dynamics/btRigidBody.cpp",
+        "BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp",
+        # "BulletDynamics/Dynamics/Bullet-C-API.cpp",
+        "BulletDynamics/Vehicle/btRaycastVehicle.cpp",
+        "BulletDynamics/Vehicle/btWheelInfo.cpp",
+        "BulletDynamics/Featherstone/btMultiBody.cpp",
+        "BulletDynamics/Featherstone/btMultiBodyConstraint.cpp",
+        "BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp",
+        "BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp",
+        "BulletDynamics/Featherstone/btMultiBodyFixedConstraint.cpp",
+        "BulletDynamics/Featherstone/btMultiBodyGearConstraint.cpp",
+        "BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.cpp",
+        "BulletDynamics/Featherstone/btMultiBodyJointMotor.cpp",
+        "BulletDynamics/Featherstone/btMultiBodyMLCPConstraintSolver.cpp",
+        "BulletDynamics/Featherstone/btMultiBodyPoint2Point.cpp",
+        "BulletDynamics/Featherstone/btMultiBodySliderConstraint.cpp",
+        "BulletDynamics/Featherstone/btMultiBodySphericalJointMotor.cpp",
+        "BulletDynamics/MLCPSolvers/btDantzigLCP.cpp",
+        "BulletDynamics/MLCPSolvers/btMLCPSolver.cpp",
+        "BulletDynamics/MLCPSolvers/btLemkeAlgorithm.cpp",
         # BulletInverseDynamics
-        , "BulletInverseDynamics/IDMath.cpp"
-        , "BulletInverseDynamics/MultiBodyTree.cpp"
-        , "BulletInverseDynamics/details/MultiBodyTreeInitCache.cpp"
-        , "BulletInverseDynamics/details/MultiBodyTreeImpl.cpp"
-
+        "BulletInverseDynamics/IDMath.cpp",
+        "BulletInverseDynamics/MultiBodyTree.cpp",
+        "BulletInverseDynamics/details/MultiBodyTreeInitCache.cpp",
+        "BulletInverseDynamics/details/MultiBodyTreeImpl.cpp",
         # BulletSoftBody
-        , "BulletSoftBody/btSoftBody.cpp"
-        , "BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp"
-        , "BulletSoftBody/btSoftBodyHelpers.cpp"
-        , "BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp"
-        , "BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp"
-        , "BulletSoftBody/btSoftRigidDynamicsWorld.cpp"
-        , "BulletSoftBody/btSoftMultiBodyDynamicsWorld.cpp"
-        , "BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp"
-        , "BulletSoftBody/btDefaultSoftBodySolver.cpp"
-        , "BulletSoftBody/btDeformableBackwardEulerObjective.cpp"
-        , "BulletSoftBody/btDeformableBodySolver.cpp"
-        , "BulletSoftBody/btDeformableMultiBodyConstraintSolver.cpp"
-        , "BulletSoftBody/btDeformableContactProjection.cpp"
-        , "BulletSoftBody/btDeformableMultiBodyDynamicsWorld.cpp"
-        , "BulletSoftBody/btDeformableContactConstraint.cpp"
-
+        "BulletSoftBody/btSoftBody.cpp",
+        "BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp",
+        "BulletSoftBody/btSoftBodyHelpers.cpp",
+        "BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp",
+        "BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp",
+        "BulletSoftBody/btSoftRigidDynamicsWorld.cpp",
+        "BulletSoftBody/btSoftMultiBodyDynamicsWorld.cpp",
+        "BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp",
+        "BulletSoftBody/btDefaultSoftBodySolver.cpp",
+        "BulletSoftBody/btDeformableBackwardEulerObjective.cpp",
+        "BulletSoftBody/btDeformableBodySolver.cpp",
+        "BulletSoftBody/btDeformableMultiBodyConstraintSolver.cpp",
+        "BulletSoftBody/btDeformableContactProjection.cpp",
+        "BulletSoftBody/btDeformableMultiBodyDynamicsWorld.cpp",
+        "BulletSoftBody/btDeformableContactConstraint.cpp",
+        "BulletSoftBody/poly34.cpp",
         # clew
-        , "clew/clew.c"
-
+        "clew/clew.c",
         # LinearMath
-        , "LinearMath/btAlignedAllocator.cpp"
-        , "LinearMath/btConvexHull.cpp"
-        , "LinearMath/btConvexHullComputer.cpp"
-        , "LinearMath/btGeometryUtil.cpp"
-        , "LinearMath/btPolarDecomposition.cpp"
-        , "LinearMath/btQuickprof.cpp"
-        , "LinearMath/btSerializer.cpp"
-        , "LinearMath/btSerializer64.cpp"
-        , "LinearMath/btThreads.cpp"
-        , "LinearMath/btVector3.cpp"
-        , "LinearMath/TaskScheduler/btTaskScheduler.cpp"
-        , "LinearMath/TaskScheduler/btThreadSupportPosix.cpp"
-        , "LinearMath/TaskScheduler/btThreadSupportWin32.cpp"
+        "LinearMath/btAlignedAllocator.cpp",
+        "LinearMath/btConvexHull.cpp",
+        "LinearMath/btConvexHullComputer.cpp",
+        "LinearMath/btGeometryUtil.cpp",
+        "LinearMath/btPolarDecomposition.cpp",
+        "LinearMath/btQuickprof.cpp",
+        "LinearMath/btSerializer.cpp",
+        "LinearMath/btSerializer64.cpp",
+        "LinearMath/btThreads.cpp",
+        "LinearMath/btVector3.cpp",
+        "LinearMath/TaskScheduler/btTaskScheduler.cpp",
+        "LinearMath/TaskScheduler/btThreadSupportPosix.cpp",
+        "LinearMath/TaskScheduler/btThreadSupportWin32.cpp",
     ]
 
     thirdparty_sources = [thirdparty_dir + file for file in bullet2_src]
 
     # Treat Bullet headers as system headers to avoid raising warnings. Not supported on MSVC.
     if not env.msvc:
-        env_bullet.Append(CPPFLAGS=['-isystem', Dir(thirdparty_dir).path])
+        env_bullet.Append(CPPFLAGS=["-isystem", Dir(thirdparty_dir).path])
     else:
         env_bullet.Prepend(CPPPATH=[thirdparty_dir])
-    # if env['target'] == "debug" or env['target'] == "release_debug":
-    #     env_bullet.Append(CPPDEFINES=['BT_DEBUG'])
+    if env["target"] == "debug" or env["target"] == "release_debug":
+        env_bullet.Append(CPPDEFINES=["DEBUG"])
+
+    env_bullet.Append(CPPDEFINES=["BT_USE_OLD_DAMPING_METHOD"])
 
     env_thirdparty = env_bullet.Clone()
     env_thirdparty.disable_warnings()
diff --git a/modules/bullet/area_bullet.cpp b/modules/bullet/area_bullet.cpp
index 79ada54f0f..b35019bea3 100644
--- a/modules/bullet/area_bullet.cpp
+++ b/modules/bullet/area_bullet.cpp
@@ -44,19 +44,7 @@
 */
 
 AreaBullet::AreaBullet() :
-		RigidCollisionObjectBullet(CollisionObjectBullet::TYPE_AREA),
-		monitorable(true),
-		spOv_mode(PhysicsServer::AREA_SPACE_OVERRIDE_DISABLED),
-		spOv_gravityPoint(false),
-		spOv_gravityPointDistanceScale(0),
-		spOv_gravityPointAttenuation(1),
-		spOv_gravityVec(0, -1, 0),
-		spOv_gravityMag(10),
-		spOv_linearDump(0.1),
-		spOv_angularDump(1),
-		spOv_priority(0),
-		isScratched(false) {
-
+		RigidCollisionObjectBullet(CollisionObjectBullet::TYPE_AREA) {
 	btGhost = bulletnew(btGhostObject);
 	reload_shapes();
 	setupBulletCollisionObject(btGhost);
@@ -64,33 +52,33 @@ AreaBullet::AreaBullet() :
 	/// In order to use collision objects as trigger, you have to disable the collision response.
 	set_collision_enabled(false);
 
-	for (int i = 0; i < 5; ++i)
+	for (int i = 0; i < 5; ++i) {
 		call_event_res_ptr[i] = &call_event_res[i];
+	}
 }
 
 AreaBullet::~AreaBullet() {
 	// signal are handled by godot, so just clear without notify
-	for (int i = overlappingObjects.size() - 1; 0 <= i; --i)
+	for (int i = overlappingObjects.size() - 1; 0 <= i; --i) {
 		overlappingObjects[i].object->on_exit_area(this);
+	}
 }
 
 void AreaBullet::dispatch_callbacks() {
-	if (!isScratched)
-		return;
-	isScratched = false;
+	RigidCollisionObjectBullet::dispatch_callbacks();
 
 	// Reverse order because I've to remove EXIT objects
 	for (int i = overlappingObjects.size() - 1; 0 <= i; --i) {
-		OverlappingObjectData &otherObj = overlappingObjects.write[i];
+		OverlappingObjectData &otherObj = overlappingObjects[i];
 
 		switch (otherObj.state) {
 			case OVERLAP_STATE_ENTER:
 				otherObj.state = OVERLAP_STATE_INSIDE;
-				call_event(otherObj.object, PhysicsServer::AREA_BODY_ADDED);
+				call_event(otherObj.object, PhysicsServer3D::AREA_BODY_ADDED);
 				otherObj.object->on_enter_area(this);
 				break;
 			case OVERLAP_STATE_EXIT:
-				call_event(otherObj.object, PhysicsServer::AREA_BODY_REMOVED);
+				call_event(otherObj.object, PhysicsServer3D::AREA_BODY_REMOVED);
 				otherObj.object->on_exit_area(this);
 				overlappingObjects.remove(i); // Remove after callback
 				break;
@@ -101,13 +89,12 @@ void AreaBullet::dispatch_callbacks() {
 	}
 }
 
-void AreaBullet::call_event(CollisionObjectBullet *p_otherObject, PhysicsServer::AreaBodyStatus p_status) {
-
+void AreaBullet::call_event(CollisionObjectBullet *p_otherObject, PhysicsServer3D::AreaBodyStatus p_status) {
 	InOutEventCallback &event = eventsCallbacks[static_cast<int>(p_otherObject->getType())];
 	Object *areaGodoObject = ObjectDB::get_instance(event.event_callback_id);
 
 	if (!areaGodoObject) {
-		event.event_callback_id = 0;
+		event.event_callback_id = ObjectID();
 		return;
 	}
 
@@ -117,20 +104,21 @@ void AreaBullet::call_event(CollisionObjectBullet *p_otherObject, PhysicsServer:
 	call_event_res[3] = 0; // other_body_shape ID
 	call_event_res[4] = 0; // self_shape ID
 
-	Variant::CallError outResp;
+	Callable::CallError outResp;
 	areaGodoObject->call(event.event_callback_method, (const Variant **)call_event_res_ptr, 5, outResp);
 }
 
 void AreaBullet::scratch() {
-	if (isScratched)
-		return;
-	isScratched = true;
+	if (space != nullptr) {
+		space->add_to_pre_flush_queue(this);
+	}
 }
 
 void AreaBullet::clear_overlaps(bool p_notify) {
 	for (int i = overlappingObjects.size() - 1; 0 <= i; --i) {
-		if (p_notify)
-			call_event(overlappingObjects[i].object, PhysicsServer::AREA_BODY_REMOVED);
+		if (p_notify) {
+			call_event(overlappingObjects[i].object, PhysicsServer3D::AREA_BODY_REMOVED);
+		}
 		overlappingObjects[i].object->on_exit_area(this);
 	}
 	overlappingObjects.clear();
@@ -139,8 +127,9 @@ void AreaBullet::clear_overlaps(bool p_notify) {
 void AreaBullet::remove_overlap(CollisionObjectBullet *p_object, bool p_notify) {
 	for (int i = overlappingObjects.size() - 1; 0 <= i; --i) {
 		if (overlappingObjects[i].object == p_object) {
-			if (p_notify)
-				call_event(overlappingObjects[i].object, PhysicsServer::AREA_BODY_REMOVED);
+			if (p_notify) {
+				call_event(overlappingObjects[i].object, PhysicsServer3D::AREA_BODY_REMOVED);
+			}
 			overlappingObjects[i].object->on_exit_area(this);
 			overlappingObjects.remove(i);
 			break;
@@ -167,11 +156,11 @@ bool AreaBullet::is_monitoring() const {
 }
 
 void AreaBullet::main_shape_changed() {
-	CRASH_COND(!get_main_shape())
+	CRASH_COND(!get_main_shape());
 	btGhost->setCollisionShape(get_main_shape());
 }
 
-void AreaBullet::reload_body() {
+void AreaBullet::do_reload_body() {
 	if (space) {
 		space->remove_area(this);
 		space->add_area(this);
@@ -180,21 +169,25 @@ void AreaBullet::reload_body() {
 
 void AreaBullet::set_space(SpaceBullet *p_space) {
 	// Clear the old space if there is one
+
 	if (space) {
-		isScratched = false;
+		clear_overlaps(false);
 
 		// Remove this object form the physics world
+		space->unregister_collision_object(this);
 		space->remove_area(this);
 	}
 
 	space = p_space;
 
 	if (space) {
-		space->add_area(this);
+		space->register_collision_object(this);
+		reload_body();
+		scratch();
 	}
 }
 
-void AreaBullet::on_collision_filters_change() {
+void AreaBullet::do_reload_collision_filters() {
 	if (space) {
 		space->reload_collision_filters(this);
 	}
@@ -208,67 +201,67 @@ void AreaBullet::add_overlap(CollisionObjectBullet *p_otherObject) {
 
 void AreaBullet::put_overlap_as_exit(int p_index) {
 	scratch();
-	overlappingObjects.write[p_index].state = OVERLAP_STATE_EXIT;
+	overlappingObjects[p_index].state = OVERLAP_STATE_EXIT;
 }
 
 void AreaBullet::put_overlap_as_inside(int p_index) {
 	// This check is required to be sure this body was inside
 	if (OVERLAP_STATE_DIRTY == overlappingObjects[p_index].state) {
-		overlappingObjects.write[p_index].state = OVERLAP_STATE_INSIDE;
+		overlappingObjects[p_index].state = OVERLAP_STATE_INSIDE;
 	}
 }
 
-void AreaBullet::set_param(PhysicsServer::AreaParameter p_param, const Variant &p_value) {
+void AreaBullet::set_param(PhysicsServer3D::AreaParameter p_param, const Variant &p_value) {
 	switch (p_param) {
-		case PhysicsServer::AREA_PARAM_GRAVITY:
+		case PhysicsServer3D::AREA_PARAM_GRAVITY:
 			set_spOv_gravityMag(p_value);
 			break;
-		case PhysicsServer::AREA_PARAM_GRAVITY_VECTOR:
+		case PhysicsServer3D::AREA_PARAM_GRAVITY_VECTOR:
 			set_spOv_gravityVec(p_value);
 			break;
-		case PhysicsServer::AREA_PARAM_LINEAR_DAMP:
+		case PhysicsServer3D::AREA_PARAM_LINEAR_DAMP:
 			set_spOv_linearDump(p_value);
 			break;
-		case PhysicsServer::AREA_PARAM_ANGULAR_DAMP:
+		case PhysicsServer3D::AREA_PARAM_ANGULAR_DAMP:
 			set_spOv_angularDump(p_value);
 			break;
-		case PhysicsServer::AREA_PARAM_PRIORITY:
+		case PhysicsServer3D::AREA_PARAM_PRIORITY:
 			set_spOv_priority(p_value);
 			break;
-		case PhysicsServer::AREA_PARAM_GRAVITY_IS_POINT:
+		case PhysicsServer3D::AREA_PARAM_GRAVITY_IS_POINT:
 			set_spOv_gravityPoint(p_value);
 			break;
-		case PhysicsServer::AREA_PARAM_GRAVITY_DISTANCE_SCALE:
+		case PhysicsServer3D::AREA_PARAM_GRAVITY_DISTANCE_SCALE:
 			set_spOv_gravityPointDistanceScale(p_value);
 			break;
-		case PhysicsServer::AREA_PARAM_GRAVITY_POINT_ATTENUATION:
+		case PhysicsServer3D::AREA_PARAM_GRAVITY_POINT_ATTENUATION:
 			set_spOv_gravityPointAttenuation(p_value);
 			break;
 		default:
-			WARN_PRINTS("Area doesn't support this parameter in the Bullet backend: " + itos(p_param));
+			WARN_PRINT("Area doesn't support this parameter in the Bullet backend: " + itos(p_param));
 	}
 }
 
-Variant AreaBullet::get_param(PhysicsServer::AreaParameter p_param) const {
+Variant AreaBullet::get_param(PhysicsServer3D::AreaParameter p_param) const {
 	switch (p_param) {
-		case PhysicsServer::AREA_PARAM_GRAVITY:
+		case PhysicsServer3D::AREA_PARAM_GRAVITY:
 			return spOv_gravityMag;
-		case PhysicsServer::AREA_PARAM_GRAVITY_VECTOR:
+		case PhysicsServer3D::AREA_PARAM_GRAVITY_VECTOR:
 			return spOv_gravityVec;
-		case PhysicsServer::AREA_PARAM_LINEAR_DAMP:
+		case PhysicsServer3D::AREA_PARAM_LINEAR_DAMP:
 			return spOv_linearDump;
-		case PhysicsServer::AREA_PARAM_ANGULAR_DAMP:
+		case PhysicsServer3D::AREA_PARAM_ANGULAR_DAMP:
 			return spOv_angularDump;
-		case PhysicsServer::AREA_PARAM_PRIORITY:
+		case PhysicsServer3D::AREA_PARAM_PRIORITY:
 			return spOv_priority;
-		case PhysicsServer::AREA_PARAM_GRAVITY_IS_POINT:
+		case PhysicsServer3D::AREA_PARAM_GRAVITY_IS_POINT:
 			return spOv_gravityPoint;
-		case PhysicsServer::AREA_PARAM_GRAVITY_DISTANCE_SCALE:
+		case PhysicsServer3D::AREA_PARAM_GRAVITY_DISTANCE_SCALE:
 			return spOv_gravityPointDistanceScale;
-		case PhysicsServer::AREA_PARAM_GRAVITY_POINT_ATTENUATION:
+		case PhysicsServer3D::AREA_PARAM_GRAVITY_POINT_ATTENUATION:
 			return spOv_gravityPointAttenuation;
 		default:
-			WARN_PRINTS("Area doesn't support this parameter in the Bullet backend: " + itos(p_param));
+			WARN_PRINT("Area doesn't support this parameter in the Bullet backend: " + itos(p_param));
 			return Variant();
 	}
 }
@@ -279,7 +272,7 @@ void AreaBullet::set_event_callback(Type p_callbackObjectType, ObjectID p_id, co
 	ev.event_callback_method = p_method;
 
 	/// Set if monitoring
-	if (eventsCallbacks[0].event_callback_id || eventsCallbacks[1].event_callback_id) {
+	if (eventsCallbacks[0].event_callback_id.is_valid() || eventsCallbacks[1].event_callback_id.is_valid()) {
 		set_godot_object_flags(get_godot_object_flags() | GOF_IS_MONITORING_AREA);
 	} else {
 		set_godot_object_flags(get_godot_object_flags() & (~GOF_IS_MONITORING_AREA));
@@ -287,7 +280,7 @@ void AreaBullet::set_event_callback(Type p_callbackObjectType, ObjectID p_id, co
 }
 
 bool AreaBullet::has_event_callback(Type p_callbackObjectType) {
-	return eventsCallbacks[static_cast<int>(p_callbackObjectType)].event_callback_id;
+	return eventsCallbacks[static_cast<int>(p_callbackObjectType)].event_callback_id.is_valid();
 }
 
 void AreaBullet::on_enter_area(AreaBullet *p_area) {
diff --git a/modules/bullet/area_bullet.h b/modules/bullet/area_bullet.h
index f770c63bcc..51fbc1f71d 100644
--- a/modules/bullet/area_bullet.h
+++ b/modules/bullet/area_bullet.h
@@ -32,8 +32,8 @@
 #define AREABULLET_H
 
 #include "collision_object_bullet.h"
-#include "core/vector.h"
-#include "servers/physics_server.h"
+#include "core/local_vector.h"
+#include "servers/physics_server_3d.h"
 #include "space_bullet.h"
 
 /**
@@ -50,8 +50,7 @@ public:
 		ObjectID event_callback_id;
 		StringName event_callback_method;
 
-		InOutEventCallback() :
-				event_callback_id(0) {}
+		InOutEventCallback() {}
 	};
 
 	enum OverlapState {
@@ -62,12 +61,10 @@ public:
 	};
 
 	struct OverlappingObjectData {
-		CollisionObjectBullet *object;
-		OverlapState state;
+		CollisionObjectBullet *object = nullptr;
+		OverlapState state = OVERLAP_STATE_ENTER;
 
-		OverlappingObjectData() :
-				object(NULL),
-				state(OVERLAP_STATE_ENTER) {}
+		OverlappingObjectData() {}
 		OverlappingObjectData(CollisionObjectBullet *p_object, OverlapState p_state) :
 				object(p_object),
 				state(p_state) {}
@@ -86,20 +83,18 @@ private:
 	Variant *call_event_res_ptr[5];
 
 	btGhostObject *btGhost;
-	Vector<OverlappingObjectData> overlappingObjects;
-	bool monitorable;
-
-	PhysicsServer::AreaSpaceOverrideMode spOv_mode;
-	bool spOv_gravityPoint;
-	real_t spOv_gravityPointDistanceScale;
-	real_t spOv_gravityPointAttenuation;
-	Vector3 spOv_gravityVec;
-	real_t spOv_gravityMag;
-	real_t spOv_linearDump;
-	real_t spOv_angularDump;
-	int spOv_priority;
-
-	bool isScratched;
+	LocalVector<OverlappingObjectData> overlappingObjects;
+	bool monitorable = true;
+
+	PhysicsServer3D::AreaSpaceOverrideMode spOv_mode = PhysicsServer3D::AREA_SPACE_OVERRIDE_DISABLED;
+	bool spOv_gravityPoint = false;
+	real_t spOv_gravityPointDistanceScale = 0;
+	real_t spOv_gravityPointAttenuation = 1;
+	Vector3 spOv_gravityVec = Vector3(0, -1, 0);
+	real_t spOv_gravityMag = 10;
+	real_t spOv_linearDump = 0.1;
+	real_t spOv_angularDump = 0.1;
+	int spOv_priority = 0;
 
 	InOutEventCallback eventsCallbacks[2];
 
@@ -115,8 +110,8 @@ public:
 
 	bool is_monitoring() const;
 
-	_FORCE_INLINE_ void set_spOv_mode(PhysicsServer::AreaSpaceOverrideMode p_mode) { spOv_mode = p_mode; }
-	_FORCE_INLINE_ PhysicsServer::AreaSpaceOverrideMode get_spOv_mode() { return spOv_mode; }
+	_FORCE_INLINE_ void set_spOv_mode(PhysicsServer3D::AreaSpaceOverrideMode p_mode) { spOv_mode = p_mode; }
+	_FORCE_INLINE_ PhysicsServer3D::AreaSpaceOverrideMode get_spOv_mode() { return spOv_mode; }
 
 	_FORCE_INLINE_ void set_spOv_gravityPoint(bool p_isGP) { spOv_gravityPoint = p_isGP; }
 	_FORCE_INLINE_ bool is_spOv_gravityPoint() { return spOv_gravityPoint; }
@@ -142,12 +137,12 @@ public:
 	_FORCE_INLINE_ void set_spOv_priority(int p_priority) { spOv_priority = p_priority; }
 	_FORCE_INLINE_ int get_spOv_priority() { return spOv_priority; }
 
-	virtual void main_shape_changed();
-	virtual void reload_body();
-	virtual void set_space(SpaceBullet *p_space);
+	virtual void main_shape_changed() override;
+	virtual void do_reload_body() override;
+	virtual void set_space(SpaceBullet *p_space) override;
 
-	virtual void dispatch_callbacks();
-	void call_event(CollisionObjectBullet *p_otherObject, PhysicsServer::AreaBodyStatus p_status);
+	virtual void dispatch_callbacks() override;
+	void call_event(CollisionObjectBullet *p_otherObject, PhysicsServer3D::AreaBodyStatus p_status);
 	void set_on_state_change(ObjectID p_id, const StringName &p_method, const Variant &p_udata = Variant());
 	void scratch();
 
@@ -155,22 +150,22 @@ public:
 	// Dispatch the callbacks and removes from overlapping list
 	void remove_overlap(CollisionObjectBullet *p_object, bool p_notify);
 
-	virtual void on_collision_filters_change();
-	virtual void on_collision_checker_start() {}
-	virtual void on_collision_checker_end() { isTransformChanged = false; }
+	virtual void do_reload_collision_filters() override;
+	virtual void on_collision_checker_start() override {}
+	virtual void on_collision_checker_end() override { isTransformChanged = false; }
 
 	void add_overlap(CollisionObjectBullet *p_otherObject);
 	void put_overlap_as_exit(int p_index);
 	void put_overlap_as_inside(int p_index);
 
-	void set_param(PhysicsServer::AreaParameter p_param, const Variant &p_value);
-	Variant get_param(PhysicsServer::AreaParameter p_param) const;
+	void set_param(PhysicsServer3D::AreaParameter p_param, const Variant &p_value);
+	Variant get_param(PhysicsServer3D::AreaParameter p_param) const;
 
 	void set_event_callback(Type p_callbackObjectType, ObjectID p_id, const StringName &p_method);
 	bool has_event_callback(Type p_callbackObjectType);
 
-	virtual void on_enter_area(AreaBullet *p_area);
-	virtual void on_exit_area(AreaBullet *p_area);
+	virtual void on_enter_area(AreaBullet *p_area) override;
+	virtual void on_exit_area(AreaBullet *p_area) override;
 };
 
 #endif
diff --git a/modules/bullet/btRayShape.cpp b/modules/bullet/btRayShape.cpp
index 4071723a3e..a754ca6a89 100644
--- a/modules/bullet/btRayShape.cpp
+++ b/modules/bullet/btRayShape.cpp
@@ -43,13 +43,13 @@ btRayShape::btRayShape(btScalar length) :
 		m_shapeAxis(0, 0, 1) {
 	m_shapeType = CUSTOM_CONVEX_SHAPE_TYPE;
 	setLength(length);
+	slipsOnSlope = false;
 }
 
 btRayShape::~btRayShape() {
 }
 
 void btRayShape::setLength(btScalar p_length) {
-
 	m_length = p_length;
 	reload_cache();
 }
@@ -60,7 +60,6 @@ void btRayShape::setMargin(btScalar margin) {
 }
 
 void btRayShape::setSlipsOnSlope(bool p_slipsOnSlope) {
-
 	slipsOnSlope = p_slipsOnSlope;
 }
 
@@ -69,10 +68,11 @@ btVector3 btRayShape::localGetSupportingVertex(const btVector3 &vec) const {
 }
 
 btVector3 btRayShape::localGetSupportingVertexWithoutMargin(const btVector3 &vec) const {
-	if (vec.z() > 0)
+	if (vec.z() > 0) {
 		return m_shapeAxis * m_cacheScaledLength;
-	else
+	} else {
 		return btVector3(0, 0, 0);
+	}
 }
 
 void btRayShape::batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3 *vectors, btVector3 *supportVerticesOut, int numVectors) const {
@@ -100,7 +100,6 @@ void btRayShape::getPreferredPenetrationDirection(int index, btVector3 &penetrat
 }
 
 void btRayShape::reload_cache() {
-
 	m_cacheScaledLength = m_length * m_localScaling[2];
 
 	m_cacheSupportPoint.setIdentity();
diff --git a/modules/bullet/btRayShape.h b/modules/bullet/btRayShape.h
index df6dd93d57..d9ecde81e6 100644
--- a/modules/bullet/btRayShape.h
+++ b/modules/bullet/btRayShape.h
@@ -42,7 +42,6 @@
 /// Ray shape around z axis
 ATTRIBUTE_ALIGNED16(class)
 btRayShape : public btConvexInternalShape {
-
 	btScalar m_length;
 	bool slipsOnSlope;
 	/// The default axis is the z
diff --git a/modules/bullet/bullet_physics_server.cpp b/modules/bullet/bullet_physics_server.cpp
index 6662e130c8..8f64c11867 100644
--- a/modules/bullet/bullet_physics_server.cpp
+++ b/modules/bullet/bullet_physics_server.cpp
@@ -57,10 +57,10 @@
 
 // <--------------- Joint creation asserts
 /// Assert the body is assigned to a space
-#define JointAssertSpace(body, bIndex, ret)                                                           \
-	if (!body->get_space()) {                                                                         \
-		ERR_PRINTS("Before create a joint the Body" + String(bIndex) + " must be added to a space!"); \
-		return ret;                                                                                   \
+#define JointAssertSpace(body, bIndex, ret)                                                          \
+	if (!body->get_space()) {                                                                        \
+		ERR_PRINT("Before create a joint the Body" + String(bIndex) + " must be added to a space!"); \
+		return ret;                                                                                  \
 	}
 
 /// Assert the two bodies of joint are in the same space
@@ -74,51 +74,41 @@
 	body->get_space()->add_constraint(joint, joint->is_disabled_collisions_between_bodies());
 // <--------------- Joint creation asserts
 
-void BulletPhysicsServer::_bind_methods() {
-	//ClassDB::bind_method(D_METHOD("DoTest"), &BulletPhysicsServer::DoTest);
+void BulletPhysicsServer3D::_bind_methods() {
+	//ClassDB::bind_method(D_METHOD("DoTest"), &BulletPhysicsServer3D::DoTest);
 }
 
-BulletPhysicsServer::BulletPhysicsServer() :
-		PhysicsServer(),
-		active(true),
-		active_spaces_count(0) {}
+BulletPhysicsServer3D::BulletPhysicsServer3D() :
+		PhysicsServer3D() {}
 
-BulletPhysicsServer::~BulletPhysicsServer() {}
+BulletPhysicsServer3D::~BulletPhysicsServer3D() {}
 
-RID BulletPhysicsServer::shape_create(ShapeType p_shape) {
-	ShapeBullet *shape = NULL;
+RID BulletPhysicsServer3D::shape_create(ShapeType p_shape) {
+	ShapeBullet *shape = nullptr;
 
 	switch (p_shape) {
 		case SHAPE_PLANE: {
-
 			shape = bulletnew(PlaneShapeBullet);
 		} break;
 		case SHAPE_SPHERE: {
-
 			shape = bulletnew(SphereShapeBullet);
 		} break;
 		case SHAPE_BOX: {
-
 			shape = bulletnew(BoxShapeBullet);
 		} break;
 		case SHAPE_CAPSULE: {
-
 			shape = bulletnew(CapsuleShapeBullet);
 		} break;
 		case SHAPE_CYLINDER: {
-
 			shape = bulletnew(CylinderShapeBullet);
 		} break;
 		case SHAPE_CONVEX_POLYGON: {
-
 			shape = bulletnew(ConvexPolygonShapeBullet);
 		} break;
 		case SHAPE_CONCAVE_POLYGON: {
-
 			shape = bulletnew(ConcavePolygonShapeBullet);
 		} break;
 		case SHAPE_HEIGHTMAP: {
-
 			shape = bulletnew(HeightMapShapeBullet);
 		} break;
 		case SHAPE_RAY: {
@@ -133,53 +123,52 @@ RID BulletPhysicsServer::shape_create(ShapeType p_shape) {
 	CreateThenReturnRID(shape_owner, shape)
 }
 
-void BulletPhysicsServer::shape_set_data(RID p_shape, const Variant &p_data) {
-	ShapeBullet *shape = shape_owner.get(p_shape);
+void BulletPhysicsServer3D::shape_set_data(RID p_shape, const Variant &p_data) {
+	ShapeBullet *shape = shape_owner.getornull(p_shape);
 	ERR_FAIL_COND(!shape);
 	shape->set_data(p_data);
 }
 
-void BulletPhysicsServer::shape_set_custom_solver_bias(RID p_shape, real_t p_bias) {
+void BulletPhysicsServer3D::shape_set_custom_solver_bias(RID p_shape, real_t p_bias) {
 	//WARN_PRINT("Bias not supported by Bullet physics engine");
 }
 
-PhysicsServer::ShapeType BulletPhysicsServer::shape_get_type(RID p_shape) const {
-	ShapeBullet *shape = shape_owner.get(p_shape);
-	ERR_FAIL_COND_V(!shape, PhysicsServer::SHAPE_CUSTOM);
+PhysicsServer3D::ShapeType BulletPhysicsServer3D::shape_get_type(RID p_shape) const {
+	ShapeBullet *shape = shape_owner.getornull(p_shape);
+	ERR_FAIL_COND_V(!shape, PhysicsServer3D::SHAPE_CUSTOM);
 	return shape->get_type();
 }
 
-Variant BulletPhysicsServer::shape_get_data(RID p_shape) const {
-	ShapeBullet *shape = shape_owner.get(p_shape);
+Variant BulletPhysicsServer3D::shape_get_data(RID p_shape) const {
+	ShapeBullet *shape = shape_owner.getornull(p_shape);
 	ERR_FAIL_COND_V(!shape, Variant());
 	return shape->get_data();
 }
 
-void BulletPhysicsServer::shape_set_margin(RID p_shape, real_t p_margin) {
-	ShapeBullet *shape = shape_owner.get(p_shape);
+void BulletPhysicsServer3D::shape_set_margin(RID p_shape, real_t p_margin) {
+	ShapeBullet *shape = shape_owner.getornull(p_shape);
 	ERR_FAIL_COND(!shape);
 	shape->set_margin(p_margin);
 }
 
-real_t BulletPhysicsServer::shape_get_margin(RID p_shape) const {
-	ShapeBullet *shape = shape_owner.get(p_shape);
+real_t BulletPhysicsServer3D::shape_get_margin(RID p_shape) const {
+	ShapeBullet *shape = shape_owner.getornull(p_shape);
 	ERR_FAIL_COND_V(!shape, 0.0);
 	return shape->get_margin();
 }
 
-real_t BulletPhysicsServer::shape_get_custom_solver_bias(RID p_shape) const {
+real_t BulletPhysicsServer3D::shape_get_custom_solver_bias(RID p_shape) const {
 	//WARN_PRINT("Bias not supported by Bullet physics engine");
 	return 0.;
 }
 
-RID BulletPhysicsServer::space_create() {
+RID BulletPhysicsServer3D::space_create() {
 	SpaceBullet *space = bulletnew(SpaceBullet);
 	CreateThenReturnRID(space_owner, space);
 }
 
-void BulletPhysicsServer::space_set_active(RID p_space, bool p_active) {
-
-	SpaceBullet *space = space_owner.get(p_space);
+void BulletPhysicsServer3D::space_set_active(RID p_space, bool p_active) {
+	SpaceBullet *space = space_owner.getornull(p_space);
 	ERR_FAIL_COND(!space);
 
 	if (space_is_active(p_space) == p_active) {
@@ -195,345 +184,347 @@ void BulletPhysicsServer::space_set_active(RID p_space, bool p_active) {
 	}
 }
 
-bool BulletPhysicsServer::space_is_active(RID p_space) const {
-	SpaceBullet *space = space_owner.get(p_space);
+bool BulletPhysicsServer3D::space_is_active(RID p_space) const {
+	SpaceBullet *space = space_owner.getornull(p_space);
 	ERR_FAIL_COND_V(!space, false);
 
 	return -1 != active_spaces.find(space);
 }
 
-void BulletPhysicsServer::space_set_param(RID p_space, SpaceParameter p_param, real_t p_value) {
-	SpaceBullet *space = space_owner.get(p_space);
+void BulletPhysicsServer3D::space_set_param(RID p_space, SpaceParameter p_param, real_t p_value) {
+	SpaceBullet *space = space_owner.getornull(p_space);
 	ERR_FAIL_COND(!space);
 	space->set_param(p_param, p_value);
 }
 
-real_t BulletPhysicsServer::space_get_param(RID p_space, SpaceParameter p_param) const {
-	SpaceBullet *space = space_owner.get(p_space);
+real_t BulletPhysicsServer3D::space_get_param(RID p_space, SpaceParameter p_param) const {
+	SpaceBullet *space = space_owner.getornull(p_space);
 	ERR_FAIL_COND_V(!space, 0);
 	return space->get_param(p_param);
 }
 
-PhysicsDirectSpaceState *BulletPhysicsServer::space_get_direct_state(RID p_space) {
-	SpaceBullet *space = space_owner.get(p_space);
-	ERR_FAIL_COND_V(!space, NULL);
+PhysicsDirectSpaceState3D *BulletPhysicsServer3D::space_get_direct_state(RID p_space) {
+	SpaceBullet *space = space_owner.getornull(p_space);
+	ERR_FAIL_COND_V(!space, nullptr);
 
 	return space->get_direct_state();
 }
 
-void BulletPhysicsServer::space_set_debug_contacts(RID p_space, int p_max_contacts) {
-	SpaceBullet *space = space_owner.get(p_space);
+void BulletPhysicsServer3D::space_set_debug_contacts(RID p_space, int p_max_contacts) {
+	SpaceBullet *space = space_owner.getornull(p_space);
 	ERR_FAIL_COND(!space);
 
 	space->set_debug_contacts(p_max_contacts);
 }
 
-Vector<Vector3> BulletPhysicsServer::space_get_contacts(RID p_space) const {
-	SpaceBullet *space = space_owner.get(p_space);
+Vector<Vector3> BulletPhysicsServer3D::space_get_contacts(RID p_space) const {
+	SpaceBullet *space = space_owner.getornull(p_space);
 	ERR_FAIL_COND_V(!space, Vector<Vector3>());
 
 	return space->get_debug_contacts();
 }
 
-int BulletPhysicsServer::space_get_contact_count(RID p_space) const {
-	SpaceBullet *space = space_owner.get(p_space);
+int BulletPhysicsServer3D::space_get_contact_count(RID p_space) const {
+	SpaceBullet *space = space_owner.getornull(p_space);
 	ERR_FAIL_COND_V(!space, 0);
 
 	return space->get_debug_contact_count();
 }
 
-RID BulletPhysicsServer::area_create() {
+RID BulletPhysicsServer3D::area_create() {
 	AreaBullet *area = bulletnew(AreaBullet);
 	area->set_collision_layer(1);
 	area->set_collision_mask(1);
 	CreateThenReturnRID(area_owner, area)
 }
 
-void BulletPhysicsServer::area_set_space(RID p_area, RID p_space) {
-	AreaBullet *area = area_owner.get(p_area);
+void BulletPhysicsServer3D::area_set_space(RID p_area, RID p_space) {
+	AreaBullet *area = area_owner.getornull(p_area);
 	ERR_FAIL_COND(!area);
-	SpaceBullet *space = NULL;
+	SpaceBullet *space = nullptr;
 	if (p_space.is_valid()) {
-		space = space_owner.get(p_space);
+		space = space_owner.getornull(p_space);
 		ERR_FAIL_COND(!space);
 	}
 	area->set_space(space);
 }
 
-RID BulletPhysicsServer::area_get_space(RID p_area) const {
-	AreaBullet *area = area_owner.get(p_area);
+RID BulletPhysicsServer3D::area_get_space(RID p_area) const {
+	AreaBullet *area = area_owner.getornull(p_area);
 	return area->get_space()->get_self();
 }
 
-void BulletPhysicsServer::area_set_space_override_mode(RID p_area, AreaSpaceOverrideMode p_mode) {
-	AreaBullet *area = area_owner.get(p_area);
+void BulletPhysicsServer3D::area_set_space_override_mode(RID p_area, AreaSpaceOverrideMode p_mode) {
+	AreaBullet *area = area_owner.getornull(p_area);
 	ERR_FAIL_COND(!area);
 
 	area->set_spOv_mode(p_mode);
 }
 
-PhysicsServer::AreaSpaceOverrideMode BulletPhysicsServer::area_get_space_override_mode(RID p_area) const {
-	AreaBullet *area = area_owner.get(p_area);
-	ERR_FAIL_COND_V(!area, PhysicsServer::AREA_SPACE_OVERRIDE_DISABLED);
+PhysicsServer3D::AreaSpaceOverrideMode BulletPhysicsServer3D::area_get_space_override_mode(RID p_area) const {
+	AreaBullet *area = area_owner.getornull(p_area);
+	ERR_FAIL_COND_V(!area, PhysicsServer3D::AREA_SPACE_OVERRIDE_DISABLED);
 
 	return area->get_spOv_mode();
 }
 
-void BulletPhysicsServer::area_add_shape(RID p_area, RID p_shape, const Transform &p_transform, bool p_disabled) {
-	AreaBullet *area = area_owner.get(p_area);
+void BulletPhysicsServer3D::area_add_shape(RID p_area, RID p_shape, const Transform &p_transform, bool p_disabled) {
+	AreaBullet *area = area_owner.getornull(p_area);
 	ERR_FAIL_COND(!area);
 
-	ShapeBullet *shape = shape_owner.get(p_shape);
+	ShapeBullet *shape = shape_owner.getornull(p_shape);
 	ERR_FAIL_COND(!shape);
 
 	area->add_shape(shape, p_transform, p_disabled);
 }
 
-void BulletPhysicsServer::area_set_shape(RID p_area, int p_shape_idx, RID p_shape) {
-	AreaBullet *area = area_owner.get(p_area);
+void BulletPhysicsServer3D::area_set_shape(RID p_area, int p_shape_idx, RID p_shape) {
+	AreaBullet *area = area_owner.getornull(p_area);
 	ERR_FAIL_COND(!area);
 
-	ShapeBullet *shape = shape_owner.get(p_shape);
+	ShapeBullet *shape = shape_owner.getornull(p_shape);
 	ERR_FAIL_COND(!shape);
 
 	area->set_shape(p_shape_idx, shape);
 }
 
-void BulletPhysicsServer::area_set_shape_transform(RID p_area, int p_shape_idx, const Transform &p_transform) {
-	AreaBullet *area = area_owner.get(p_area);
+void BulletPhysicsServer3D::area_set_shape_transform(RID p_area, int p_shape_idx, const Transform &p_transform) {
+	AreaBullet *area = area_owner.getornull(p_area);
 	ERR_FAIL_COND(!area);
 
 	area->set_shape_transform(p_shape_idx, p_transform);
 }
 
-int BulletPhysicsServer::area_get_shape_count(RID p_area) const {
-	AreaBullet *area = area_owner.get(p_area);
+int BulletPhysicsServer3D::area_get_shape_count(RID p_area) const {
+	AreaBullet *area = area_owner.getornull(p_area);
 	ERR_FAIL_COND_V(!area, 0);
 
 	return area->get_shape_count();
 }
 
-RID BulletPhysicsServer::area_get_shape(RID p_area, int p_shape_idx) const {
-	AreaBullet *area = area_owner.get(p_area);
+RID BulletPhysicsServer3D::area_get_shape(RID p_area, int p_shape_idx) const {
+	AreaBullet *area = area_owner.getornull(p_area);
 	ERR_FAIL_COND_V(!area, RID());
 
 	return area->get_shape(p_shape_idx)->get_self();
 }
 
-Transform BulletPhysicsServer::area_get_shape_transform(RID p_area, int p_shape_idx) const {
-	AreaBullet *area = area_owner.get(p_area);
+Transform BulletPhysicsServer3D::area_get_shape_transform(RID p_area, int p_shape_idx) const {
+	AreaBullet *area = area_owner.getornull(p_area);
 	ERR_FAIL_COND_V(!area, Transform());
 
 	return area->get_shape_transform(p_shape_idx);
 }
 
-void BulletPhysicsServer::area_remove_shape(RID p_area, int p_shape_idx) {
-	AreaBullet *area = area_owner.get(p_area);
+void BulletPhysicsServer3D::area_remove_shape(RID p_area, int p_shape_idx) {
+	AreaBullet *area = area_owner.getornull(p_area);
 	ERR_FAIL_COND(!area);
 	return area->remove_shape_full(p_shape_idx);
 }
 
-void BulletPhysicsServer::area_clear_shapes(RID p_area) {
-	AreaBullet *area = area_owner.get(p_area);
+void BulletPhysicsServer3D::area_clear_shapes(RID p_area) {
+	AreaBullet *area = area_owner.getornull(p_area);
 	ERR_FAIL_COND(!area);
 
-	for (int i = area->get_shape_count(); 0 < i; --i)
+	for (int i = area->get_shape_count(); 0 < i; --i) {
 		area->remove_shape_full(0);
+	}
 }
 
-void BulletPhysicsServer::area_set_shape_disabled(RID p_area, int p_shape_idx, bool p_disabled) {
-	AreaBullet *area = area_owner.get(p_area);
+void BulletPhysicsServer3D::area_set_shape_disabled(RID p_area, int p_shape_idx, bool p_disabled) {
+	AreaBullet *area = area_owner.getornull(p_area);
 	ERR_FAIL_COND(!area);
 
 	area->set_shape_disabled(p_shape_idx, p_disabled);
 }
 
-void BulletPhysicsServer::area_attach_object_instance_id(RID p_area, ObjectID p_id) {
+void BulletPhysicsServer3D::area_attach_object_instance_id(RID p_area, ObjectID p_id) {
 	if (space_owner.owns(p_area)) {
 		return;
 	}
-	AreaBullet *area = area_owner.get(p_area);
+	AreaBullet *area = area_owner.getornull(p_area);
 	ERR_FAIL_COND(!area);
 	area->set_instance_id(p_id);
 }
 
-ObjectID BulletPhysicsServer::area_get_object_instance_id(RID p_area) const {
+ObjectID BulletPhysicsServer3D::area_get_object_instance_id(RID p_area) const {
 	if (space_owner.owns(p_area)) {
-		return 0;
+		return ObjectID();
 	}
-	AreaBullet *area = area_owner.get(p_area);
+	AreaBullet *area = area_owner.getornull(p_area);
 	ERR_FAIL_COND_V(!area, ObjectID());
 	return area->get_instance_id();
 }
 
-void BulletPhysicsServer::area_set_param(RID p_area, AreaParameter p_param, const Variant &p_value) {
+void BulletPhysicsServer3D::area_set_param(RID p_area, AreaParameter p_param, const Variant &p_value) {
 	if (space_owner.owns(p_area)) {
-		SpaceBullet *space = space_owner.get(p_area);
+		SpaceBullet *space = space_owner.getornull(p_area);
 		if (space) {
 			space->set_param(p_param, p_value);
 		}
 	} else {
-
-		AreaBullet *area = area_owner.get(p_area);
+		AreaBullet *area = area_owner.getornull(p_area);
 		ERR_FAIL_COND(!area);
 
 		area->set_param(p_param, p_value);
 	}
 }
 
-Variant BulletPhysicsServer::area_get_param(RID p_area, AreaParameter p_param) const {
+Variant BulletPhysicsServer3D::area_get_param(RID p_area, AreaParameter p_param) const {
 	if (space_owner.owns(p_area)) {
-		SpaceBullet *space = space_owner.get(p_area);
+		SpaceBullet *space = space_owner.getornull(p_area);
 		return space->get_param(p_param);
 	} else {
-		AreaBullet *area = area_owner.get(p_area);
+		AreaBullet *area = area_owner.getornull(p_area);
 		ERR_FAIL_COND_V(!area, Variant());
 
 		return area->get_param(p_param);
 	}
 }
 
-void BulletPhysicsServer::area_set_transform(RID p_area, const Transform &p_transform) {
-	AreaBullet *area = area_owner.get(p_area);
+void BulletPhysicsServer3D::area_set_transform(RID p_area, const Transform &p_transform) {
+	AreaBullet *area = area_owner.getornull(p_area);
 	ERR_FAIL_COND(!area);
 	area->set_transform(p_transform);
 }
 
-Transform BulletPhysicsServer::area_get_transform(RID p_area) const {
-	AreaBullet *area = area_owner.get(p_area);
+Transform BulletPhysicsServer3D::area_get_transform(RID p_area) const {
+	AreaBullet *area = area_owner.getornull(p_area);
 	ERR_FAIL_COND_V(!area, Transform());
 	return area->get_transform();
 }
 
-void BulletPhysicsServer::area_set_collision_mask(RID p_area, uint32_t p_mask) {
-	AreaBullet *area = area_owner.get(p_area);
+void BulletPhysicsServer3D::area_set_collision_mask(RID p_area, uint32_t p_mask) {
+	AreaBullet *area = area_owner.getornull(p_area);
 	ERR_FAIL_COND(!area);
 	area->set_collision_mask(p_mask);
 }
 
-void BulletPhysicsServer::area_set_collision_layer(RID p_area, uint32_t p_layer) {
-	AreaBullet *area = area_owner.get(p_area);
+void BulletPhysicsServer3D::area_set_collision_layer(RID p_area, uint32_t p_layer) {
+	AreaBullet *area = area_owner.getornull(p_area);
 	ERR_FAIL_COND(!area);
 	area->set_collision_layer(p_layer);
 }
 
-void BulletPhysicsServer::area_set_monitorable(RID p_area, bool p_monitorable) {
-	AreaBullet *area = area_owner.get(p_area);
+void BulletPhysicsServer3D::area_set_monitorable(RID p_area, bool p_monitorable) {
+	AreaBullet *area = area_owner.getornull(p_area);
 	ERR_FAIL_COND(!area);
 
 	area->set_monitorable(p_monitorable);
 }
 
-void BulletPhysicsServer::area_set_monitor_callback(RID p_area, Object *p_receiver, const StringName &p_method) {
-	AreaBullet *area = area_owner.get(p_area);
+void BulletPhysicsServer3D::area_set_monitor_callback(RID p_area, Object *p_receiver, const StringName &p_method) {
+	AreaBullet *area = area_owner.getornull(p_area);
 	ERR_FAIL_COND(!area);
 
-	area->set_event_callback(CollisionObjectBullet::TYPE_RIGID_BODY, p_receiver ? p_receiver->get_instance_id() : 0, p_method);
+	area->set_event_callback(CollisionObjectBullet::TYPE_RIGID_BODY, p_receiver ? p_receiver->get_instance_id() : ObjectID(), p_method);
 }
 
-void BulletPhysicsServer::area_set_area_monitor_callback(RID p_area, Object *p_receiver, const StringName &p_method) {
-	AreaBullet *area = area_owner.get(p_area);
+void BulletPhysicsServer3D::area_set_area_monitor_callback(RID p_area, Object *p_receiver, const StringName &p_method) {
+	AreaBullet *area = area_owner.getornull(p_area);
 	ERR_FAIL_COND(!area);
 
-	area->set_event_callback(CollisionObjectBullet::TYPE_AREA, p_receiver ? p_receiver->get_instance_id() : 0, p_method);
+	area->set_event_callback(CollisionObjectBullet::TYPE_AREA, p_receiver ? p_receiver->get_instance_id() : ObjectID(), p_method);
 }
 
-void BulletPhysicsServer::area_set_ray_pickable(RID p_area, bool p_enable) {
-	AreaBullet *area = area_owner.get(p_area);
+void BulletPhysicsServer3D::area_set_ray_pickable(RID p_area, bool p_enable) {
+	AreaBullet *area = area_owner.getornull(p_area);
 	ERR_FAIL_COND(!area);
 	area->set_ray_pickable(p_enable);
 }
 
-bool BulletPhysicsServer::area_is_ray_pickable(RID p_area) const {
-	AreaBullet *area = area_owner.get(p_area);
+bool BulletPhysicsServer3D::area_is_ray_pickable(RID p_area) const {
+	AreaBullet *area = area_owner.getornull(p_area);
 	ERR_FAIL_COND_V(!area, false);
 	return area->is_ray_pickable();
 }
 
-RID BulletPhysicsServer::body_create(BodyMode p_mode, bool p_init_sleeping) {
+RID BulletPhysicsServer3D::body_create(BodyMode p_mode, bool p_init_sleeping) {
 	RigidBodyBullet *body = bulletnew(RigidBodyBullet);
 	body->set_mode(p_mode);
 	body->set_collision_layer(1);
 	body->set_collision_mask(1);
-	if (p_init_sleeping)
+	if (p_init_sleeping) {
 		body->set_state(BODY_STATE_SLEEPING, p_init_sleeping);
+	}
 	CreateThenReturnRID(rigid_body_owner, body);
 }
 
-void BulletPhysicsServer::body_set_space(RID p_body, RID p_space) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_set_space(RID p_body, RID p_space) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
-	SpaceBullet *space = NULL;
+	SpaceBullet *space = nullptr;
 
 	if (p_space.is_valid()) {
-		space = space_owner.get(p_space);
+		space = space_owner.getornull(p_space);
 		ERR_FAIL_COND(!space);
 	}
 
-	if (body->get_space() == space)
+	if (body->get_space() == space) {
 		return; //pointles
+	}
 
 	body->set_space(space);
 }
 
-RID BulletPhysicsServer::body_get_space(RID p_body) const {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+RID BulletPhysicsServer3D::body_get_space(RID p_body) const {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, RID());
 
 	SpaceBullet *space = body->get_space();
-	if (!space)
+	if (!space) {
 		return RID();
+	}
 	return space->get_self();
 }
 
-void BulletPhysicsServer::body_set_mode(RID p_body, PhysicsServer::BodyMode p_mode) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_set_mode(RID p_body, PhysicsServer3D::BodyMode p_mode) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 	body->set_mode(p_mode);
 }
 
-PhysicsServer::BodyMode BulletPhysicsServer::body_get_mode(RID p_body) const {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+PhysicsServer3D::BodyMode BulletPhysicsServer3D::body_get_mode(RID p_body) const {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, BODY_MODE_STATIC);
 	return body->get_mode();
 }
 
-void BulletPhysicsServer::body_add_shape(RID p_body, RID p_shape, const Transform &p_transform, bool p_disabled) {
-
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_add_shape(RID p_body, RID p_shape, const Transform &p_transform, bool p_disabled) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
-	ShapeBullet *shape = shape_owner.get(p_shape);
+	ShapeBullet *shape = shape_owner.getornull(p_shape);
 	ERR_FAIL_COND(!shape);
 
 	body->add_shape(shape, p_transform, p_disabled);
 }
 
-void BulletPhysicsServer::body_set_shape(RID p_body, int p_shape_idx, RID p_shape) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_set_shape(RID p_body, int p_shape_idx, RID p_shape) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
-	ShapeBullet *shape = shape_owner.get(p_shape);
+	ShapeBullet *shape = shape_owner.getornull(p_shape);
 	ERR_FAIL_COND(!shape);
 
 	body->set_shape(p_shape_idx, shape);
 }
 
-void BulletPhysicsServer::body_set_shape_transform(RID p_body, int p_shape_idx, const Transform &p_transform) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_set_shape_transform(RID p_body, int p_shape_idx, const Transform &p_transform) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
 	body->set_shape_transform(p_shape_idx, p_transform);
 }
 
-int BulletPhysicsServer::body_get_shape_count(RID p_body) const {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+int BulletPhysicsServer3D::body_get_shape_count(RID p_body) const {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, 0);
 	return body->get_shape_count();
 }
 
-RID BulletPhysicsServer::body_get_shape(RID p_body, int p_shape_idx) const {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+RID BulletPhysicsServer3D::body_get_shape(RID p_body, int p_shape_idx) const {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, RID());
 
 	ShapeBullet *shape = body->get_shape(p_shape_idx);
@@ -542,219 +533,217 @@ RID BulletPhysicsServer::body_get_shape(RID p_body, int p_shape_idx) const {
 	return shape->get_self();
 }
 
-Transform BulletPhysicsServer::body_get_shape_transform(RID p_body, int p_shape_idx) const {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+Transform BulletPhysicsServer3D::body_get_shape_transform(RID p_body, int p_shape_idx) const {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, Transform());
 	return body->get_shape_transform(p_shape_idx);
 }
 
-void BulletPhysicsServer::body_set_shape_disabled(RID p_body, int p_shape_idx, bool p_disabled) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_set_shape_disabled(RID p_body, int p_shape_idx, bool p_disabled) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
 	body->set_shape_disabled(p_shape_idx, p_disabled);
 }
 
-void BulletPhysicsServer::body_remove_shape(RID p_body, int p_shape_idx) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_remove_shape(RID p_body, int p_shape_idx) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
 	body->remove_shape_full(p_shape_idx);
 }
 
-void BulletPhysicsServer::body_clear_shapes(RID p_body) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_clear_shapes(RID p_body) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
 	body->remove_all_shapes();
 }
 
-void BulletPhysicsServer::body_attach_object_instance_id(RID p_body, uint32_t p_id) {
-	CollisionObjectBullet *body = get_collisin_object(p_body);
+void BulletPhysicsServer3D::body_attach_object_instance_id(RID p_body, ObjectID p_id) {
+	CollisionObjectBullet *body = get_collision_object(p_body);
 	ERR_FAIL_COND(!body);
 
 	body->set_instance_id(p_id);
 }
 
-uint32_t BulletPhysicsServer::body_get_object_instance_id(RID p_body) const {
-	CollisionObjectBullet *body = get_collisin_object(p_body);
-	ERR_FAIL_COND_V(!body, 0);
+ObjectID BulletPhysicsServer3D::body_get_object_instance_id(RID p_body) const {
+	CollisionObjectBullet *body = get_collision_object(p_body);
+	ERR_FAIL_COND_V(!body, ObjectID());
 
 	return body->get_instance_id();
 }
 
-void BulletPhysicsServer::body_set_enable_continuous_collision_detection(RID p_body, bool p_enable) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_set_enable_continuous_collision_detection(RID p_body, bool p_enable) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
 	body->set_continuous_collision_detection(p_enable);
 }
 
-bool BulletPhysicsServer::body_is_continuous_collision_detection_enabled(RID p_body) const {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+bool BulletPhysicsServer3D::body_is_continuous_collision_detection_enabled(RID p_body) const {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, false);
 
 	return body->is_continuous_collision_detection_enabled();
 }
 
-void BulletPhysicsServer::body_set_collision_layer(RID p_body, uint32_t p_layer) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_set_collision_layer(RID p_body, uint32_t p_layer) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
 	body->set_collision_layer(p_layer);
 }
 
-uint32_t BulletPhysicsServer::body_get_collision_layer(RID p_body) const {
-	const RigidBodyBullet *body = rigid_body_owner.get(p_body);
+uint32_t BulletPhysicsServer3D::body_get_collision_layer(RID p_body) const {
+	const RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, 0);
 
 	return body->get_collision_layer();
 }
 
-void BulletPhysicsServer::body_set_collision_mask(RID p_body, uint32_t p_mask) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_set_collision_mask(RID p_body, uint32_t p_mask) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
 	body->set_collision_mask(p_mask);
 }
 
-uint32_t BulletPhysicsServer::body_get_collision_mask(RID p_body) const {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+uint32_t BulletPhysicsServer3D::body_get_collision_mask(RID p_body) const {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, 0);
 
 	return body->get_collision_mask();
 }
 
-void BulletPhysicsServer::body_set_user_flags(RID p_body, uint32_t p_flags) {
+void BulletPhysicsServer3D::body_set_user_flags(RID p_body, uint32_t p_flags) {
 	// This function si not currently supported
 }
 
-uint32_t BulletPhysicsServer::body_get_user_flags(RID p_body) const {
+uint32_t BulletPhysicsServer3D::body_get_user_flags(RID p_body) const {
 	// This function si not currently supported
 	return 0;
 }
 
-void BulletPhysicsServer::body_set_param(RID p_body, BodyParameter p_param, float p_value) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_set_param(RID p_body, BodyParameter p_param, float p_value) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
 	body->set_param(p_param, p_value);
 }
 
-float BulletPhysicsServer::body_get_param(RID p_body, BodyParameter p_param) const {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+float BulletPhysicsServer3D::body_get_param(RID p_body, BodyParameter p_param) const {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, 0);
 
 	return body->get_param(p_param);
 }
 
-void BulletPhysicsServer::body_set_kinematic_safe_margin(RID p_body, real_t p_margin) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_set_kinematic_safe_margin(RID p_body, real_t p_margin) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
 	if (body->get_kinematic_utilities()) {
-
 		body->get_kinematic_utilities()->setSafeMargin(p_margin);
 	}
 }
 
-real_t BulletPhysicsServer::body_get_kinematic_safe_margin(RID p_body) const {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+real_t BulletPhysicsServer3D::body_get_kinematic_safe_margin(RID p_body) const {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, 0);
 
 	if (body->get_kinematic_utilities()) {
-
 		return body->get_kinematic_utilities()->safe_margin;
 	}
 
 	return 0;
 }
 
-void BulletPhysicsServer::body_set_state(RID p_body, BodyState p_state, const Variant &p_variant) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_set_state(RID p_body, BodyState p_state, const Variant &p_variant) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
 	body->set_state(p_state, p_variant);
 }
 
-Variant BulletPhysicsServer::body_get_state(RID p_body, BodyState p_state) const {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+Variant BulletPhysicsServer3D::body_get_state(RID p_body, BodyState p_state) const {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, Variant());
 
 	return body->get_state(p_state);
 }
 
-void BulletPhysicsServer::body_set_applied_force(RID p_body, const Vector3 &p_force) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_set_applied_force(RID p_body, const Vector3 &p_force) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
 	body->set_applied_force(p_force);
 }
 
-Vector3 BulletPhysicsServer::body_get_applied_force(RID p_body) const {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+Vector3 BulletPhysicsServer3D::body_get_applied_force(RID p_body) const {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, Vector3());
 	return body->get_applied_force();
 }
 
-void BulletPhysicsServer::body_set_applied_torque(RID p_body, const Vector3 &p_torque) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_set_applied_torque(RID p_body, const Vector3 &p_torque) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
 	body->set_applied_torque(p_torque);
 }
 
-Vector3 BulletPhysicsServer::body_get_applied_torque(RID p_body) const {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+Vector3 BulletPhysicsServer3D::body_get_applied_torque(RID p_body) const {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, Vector3());
 
 	return body->get_applied_torque();
 }
 
-void BulletPhysicsServer::body_add_central_force(RID p_body, const Vector3 &p_force) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_add_central_force(RID p_body, const Vector3 &p_force) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
 	body->apply_central_force(p_force);
 }
 
-void BulletPhysicsServer::body_add_force(RID p_body, const Vector3 &p_force, const Vector3 &p_pos) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_add_force(RID p_body, const Vector3 &p_force, const Vector3 &p_position) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
-	body->apply_force(p_force, p_pos);
+	body->apply_force(p_force, p_position);
 }
 
-void BulletPhysicsServer::body_add_torque(RID p_body, const Vector3 &p_torque) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_add_torque(RID p_body, const Vector3 &p_torque) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
 	body->apply_torque(p_torque);
 }
 
-void BulletPhysicsServer::body_apply_central_impulse(RID p_body, const Vector3 &p_impulse) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_apply_central_impulse(RID p_body, const Vector3 &p_impulse) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
 	body->apply_central_impulse(p_impulse);
 }
 
-void BulletPhysicsServer::body_apply_impulse(RID p_body, const Vector3 &p_pos, const Vector3 &p_impulse) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_apply_impulse(RID p_body, const Vector3 &p_impulse, const Vector3 &p_position) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
-	body->apply_impulse(p_pos, p_impulse);
+	body->apply_impulse(p_impulse, p_position);
 }
 
-void BulletPhysicsServer::body_apply_torque_impulse(RID p_body, const Vector3 &p_impulse) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_apply_torque_impulse(RID p_body, const Vector3 &p_impulse) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
 	body->apply_torque_impulse(p_impulse);
 }
 
-void BulletPhysicsServer::body_set_axis_velocity(RID p_body, const Vector3 &p_axis_velocity) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_set_axis_velocity(RID p_body, const Vector3 &p_axis_velocity) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
 	Vector3 v = body->get_linear_velocity();
@@ -764,254 +753,257 @@ void BulletPhysicsServer::body_set_axis_velocity(RID p_body, const Vector3 &p_ax
 	body->set_linear_velocity(v);
 }
 
-void BulletPhysicsServer::body_set_axis_lock(RID p_body, BodyAxis p_axis, bool p_lock) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_set_axis_lock(RID p_body, BodyAxis p_axis, bool p_lock) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 	body->set_axis_lock(p_axis, p_lock);
 }
 
-bool BulletPhysicsServer::body_is_axis_locked(RID p_body, BodyAxis p_axis) const {
-	const RigidBodyBullet *body = rigid_body_owner.get(p_body);
+bool BulletPhysicsServer3D::body_is_axis_locked(RID p_body, BodyAxis p_axis) const {
+	const RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, 0);
 	return body->is_axis_locked(p_axis);
 }
 
-void BulletPhysicsServer::body_add_collision_exception(RID p_body, RID p_body_b) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_add_collision_exception(RID p_body, RID p_body_b) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
-	RigidBodyBullet *other_body = rigid_body_owner.get(p_body_b);
+	RigidBodyBullet *other_body = rigid_body_owner.getornull(p_body_b);
 	ERR_FAIL_COND(!other_body);
 
 	body->add_collision_exception(other_body);
 }
 
-void BulletPhysicsServer::body_remove_collision_exception(RID p_body, RID p_body_b) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_remove_collision_exception(RID p_body, RID p_body_b) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
-	RigidBodyBullet *other_body = rigid_body_owner.get(p_body_b);
+	RigidBodyBullet *other_body = rigid_body_owner.getornull(p_body_b);
 	ERR_FAIL_COND(!other_body);
 
 	body->remove_collision_exception(other_body);
 }
 
-void BulletPhysicsServer::body_get_collision_exceptions(RID p_body, List<RID> *p_exceptions) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_get_collision_exceptions(RID p_body, List<RID> *p_exceptions) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 	for (int i = 0; i < body->get_exceptions().size(); i++) {
 		p_exceptions->push_back(body->get_exceptions()[i]);
 	}
 }
 
-void BulletPhysicsServer::body_set_max_contacts_reported(RID p_body, int p_contacts) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_set_max_contacts_reported(RID p_body, int p_contacts) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
 	body->set_max_collisions_detection(p_contacts);
 }
 
-int BulletPhysicsServer::body_get_max_contacts_reported(RID p_body) const {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+int BulletPhysicsServer3D::body_get_max_contacts_reported(RID p_body) const {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, 0);
 
 	return body->get_max_collisions_detection();
 }
 
-void BulletPhysicsServer::body_set_contacts_reported_depth_threshold(RID p_body, float p_threshold) {
+void BulletPhysicsServer3D::body_set_contacts_reported_depth_threshold(RID p_body, float p_threshold) {
 	// Not supported by bullet and even Godot
 }
 
-float BulletPhysicsServer::body_get_contacts_reported_depth_threshold(RID p_body) const {
+float BulletPhysicsServer3D::body_get_contacts_reported_depth_threshold(RID p_body) const {
 	// Not supported by bullet and even Godot
 	return 0.;
 }
 
-void BulletPhysicsServer::body_set_omit_force_integration(RID p_body, bool p_omit) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_set_omit_force_integration(RID p_body, bool p_omit) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
 	body->set_omit_forces_integration(p_omit);
 }
 
-bool BulletPhysicsServer::body_is_omitting_force_integration(RID p_body) const {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+bool BulletPhysicsServer3D::body_is_omitting_force_integration(RID p_body) const {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, false);
 
 	return body->get_omit_forces_integration();
 }
 
-void BulletPhysicsServer::body_set_force_integration_callback(RID p_body, Object *p_receiver, const StringName &p_method, const Variant &p_udata) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_set_force_integration_callback(RID p_body, Object *p_receiver, const StringName &p_method, const Variant &p_udata) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
-	body->set_force_integration_callback(p_receiver ? p_receiver->get_instance_id() : ObjectID(0), p_method, p_udata);
+	body->set_force_integration_callback(p_receiver ? p_receiver->get_instance_id() : ObjectID(), p_method, p_udata);
 }
 
-void BulletPhysicsServer::body_set_ray_pickable(RID p_body, bool p_enable) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+void BulletPhysicsServer3D::body_set_ray_pickable(RID p_body, bool p_enable) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 	body->set_ray_pickable(p_enable);
 }
 
-bool BulletPhysicsServer::body_is_ray_pickable(RID p_body) const {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+bool BulletPhysicsServer3D::body_is_ray_pickable(RID p_body) const {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, false);
 	return body->is_ray_pickable();
 }
 
-PhysicsDirectBodyState *BulletPhysicsServer::body_get_direct_state(RID p_body) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
-	ERR_FAIL_COND_V(!body, NULL);
-	return BulletPhysicsDirectBodyState::get_singleton(body);
+PhysicsDirectBodyState3D *BulletPhysicsServer3D::body_get_direct_state(RID p_body) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
+	ERR_FAIL_COND_V(!body, nullptr);
+	return BulletPhysicsDirectBodyState3D::get_singleton(body);
 }
 
-bool BulletPhysicsServer::body_test_motion(RID p_body, const Transform &p_from, const Vector3 &p_motion, bool p_infinite_inertia, MotionResult *r_result, bool p_exclude_raycast_shapes) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+bool BulletPhysicsServer3D::body_test_motion(RID p_body, const Transform &p_from, const Vector3 &p_motion, bool p_infinite_inertia, MotionResult *r_result, bool p_exclude_raycast_shapes) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, false);
 	ERR_FAIL_COND_V(!body->get_space(), false);
 
 	return body->get_space()->test_body_motion(body, p_from, p_motion, p_infinite_inertia, r_result, p_exclude_raycast_shapes);
 }
 
-int BulletPhysicsServer::body_test_ray_separation(RID p_body, const Transform &p_transform, bool p_infinite_inertia, Vector3 &r_recover_motion, SeparationResult *r_results, int p_result_max, float p_margin) {
-	RigidBodyBullet *body = rigid_body_owner.get(p_body);
+int BulletPhysicsServer3D::body_test_ray_separation(RID p_body, const Transform &p_transform, bool p_infinite_inertia, Vector3 &r_recover_motion, SeparationResult *r_results, int p_result_max, float p_margin) {
+	RigidBodyBullet *body = rigid_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, 0);
 	ERR_FAIL_COND_V(!body->get_space(), 0);
 
 	return body->get_space()->test_ray_separation(body, p_transform, p_infinite_inertia, r_recover_motion, r_results, p_result_max, p_margin);
 }
 
-RID BulletPhysicsServer::soft_body_create(bool p_init_sleeping) {
+RID BulletPhysicsServer3D::soft_body_create(bool p_init_sleeping) {
 	SoftBodyBullet *body = bulletnew(SoftBodyBullet);
 	body->set_collision_layer(1);
 	body->set_collision_mask(1);
-	if (p_init_sleeping)
+	if (p_init_sleeping) {
 		body->set_activation_state(false);
+	}
 	CreateThenReturnRID(soft_body_owner, body);
 }
 
-void BulletPhysicsServer::soft_body_update_visual_server(RID p_body, class SoftBodyVisualServerHandler *p_visual_server_handler) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+void BulletPhysicsServer3D::soft_body_update_rendering_server(RID p_body, class SoftBodyRenderingServerHandler *p_rendering_server_handler) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
-	body->update_visual_server(p_visual_server_handler);
+	body->update_rendering_server(p_rendering_server_handler);
 }
 
-void BulletPhysicsServer::soft_body_set_space(RID p_body, RID p_space) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+void BulletPhysicsServer3D::soft_body_set_space(RID p_body, RID p_space) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
-	SpaceBullet *space = NULL;
+	SpaceBullet *space = nullptr;
 
 	if (p_space.is_valid()) {
-		space = space_owner.get(p_space);
+		space = space_owner.getornull(p_space);
 		ERR_FAIL_COND(!space);
 	}
 
-	if (body->get_space() == space)
+	if (body->get_space() == space) {
 		return; //pointles
+	}
 
 	body->set_space(space);
 }
 
-RID BulletPhysicsServer::soft_body_get_space(RID p_body) const {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+RID BulletPhysicsServer3D::soft_body_get_space(RID p_body) const {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, RID());
 
 	SpaceBullet *space = body->get_space();
-	if (!space)
+	if (!space) {
 		return RID();
+	}
 	return space->get_self();
 }
 
-void BulletPhysicsServer::soft_body_set_mesh(RID p_body, const REF &p_mesh) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+void BulletPhysicsServer3D::soft_body_set_mesh(RID p_body, const REF &p_mesh) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
 	body->set_soft_mesh(p_mesh);
 }
 
-void BulletPhysicsServer::soft_body_set_collision_layer(RID p_body, uint32_t p_layer) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+void BulletPhysicsServer3D::soft_body_set_collision_layer(RID p_body, uint32_t p_layer) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
 	body->set_collision_layer(p_layer);
 }
 
-uint32_t BulletPhysicsServer::soft_body_get_collision_layer(RID p_body) const {
-	const SoftBodyBullet *body = soft_body_owner.get(p_body);
+uint32_t BulletPhysicsServer3D::soft_body_get_collision_layer(RID p_body) const {
+	const SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, 0);
 
 	return body->get_collision_layer();
 }
 
-void BulletPhysicsServer::soft_body_set_collision_mask(RID p_body, uint32_t p_mask) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+void BulletPhysicsServer3D::soft_body_set_collision_mask(RID p_body, uint32_t p_mask) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
 	body->set_collision_mask(p_mask);
 }
 
-uint32_t BulletPhysicsServer::soft_body_get_collision_mask(RID p_body) const {
-	const SoftBodyBullet *body = soft_body_owner.get(p_body);
+uint32_t BulletPhysicsServer3D::soft_body_get_collision_mask(RID p_body) const {
+	const SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, 0);
 
 	return body->get_collision_mask();
 }
 
-void BulletPhysicsServer::soft_body_add_collision_exception(RID p_body, RID p_body_b) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+void BulletPhysicsServer3D::soft_body_add_collision_exception(RID p_body, RID p_body_b) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
-	CollisionObjectBullet *other_body = rigid_body_owner.get(p_body_b);
+	CollisionObjectBullet *other_body = rigid_body_owner.getornull(p_body_b);
 	if (!other_body) {
-		other_body = soft_body_owner.get(p_body_b);
+		other_body = soft_body_owner.getornull(p_body_b);
 	}
 	ERR_FAIL_COND(!other_body);
 
 	body->add_collision_exception(other_body);
 }
 
-void BulletPhysicsServer::soft_body_remove_collision_exception(RID p_body, RID p_body_b) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+void BulletPhysicsServer3D::soft_body_remove_collision_exception(RID p_body, RID p_body_b) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
-	CollisionObjectBullet *other_body = rigid_body_owner.get(p_body_b);
+	CollisionObjectBullet *other_body = rigid_body_owner.getornull(p_body_b);
 	if (!other_body) {
-		other_body = soft_body_owner.get(p_body_b);
+		other_body = soft_body_owner.getornull(p_body_b);
 	}
 	ERR_FAIL_COND(!other_body);
 
 	body->remove_collision_exception(other_body);
 }
 
-void BulletPhysicsServer::soft_body_get_collision_exceptions(RID p_body, List<RID> *p_exceptions) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+void BulletPhysicsServer3D::soft_body_get_collision_exceptions(RID p_body, List<RID> *p_exceptions) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 	for (int i = 0; i < body->get_exceptions().size(); i++) {
 		p_exceptions->push_back(body->get_exceptions()[i]);
 	}
 }
 
-void BulletPhysicsServer::soft_body_set_state(RID p_body, BodyState p_state, const Variant &p_variant) {
+void BulletPhysicsServer3D::soft_body_set_state(RID p_body, BodyState p_state, const Variant &p_variant) {
 	// FIXME: Must be implemented.
 	WARN_PRINT("soft_body_state is not implemented yet in Bullet backend.");
 }
 
-Variant BulletPhysicsServer::soft_body_get_state(RID p_body, BodyState p_state) const {
+Variant BulletPhysicsServer3D::soft_body_get_state(RID p_body, BodyState p_state) const {
 	// FIXME: Must be implemented.
 	WARN_PRINT("soft_body_state is not implemented yet in Bullet backend.");
 	return Variant();
 }
 
-void BulletPhysicsServer::soft_body_set_transform(RID p_body, const Transform &p_transform) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+void BulletPhysicsServer3D::soft_body_set_transform(RID p_body, const Transform &p_transform) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 
 	body->set_soft_transform(p_transform);
 }
 
-Vector3 BulletPhysicsServer::soft_body_get_vertex_position(RID p_body, int vertex_index) const {
-	const SoftBodyBullet *body = soft_body_owner.get(p_body);
+Vector3 BulletPhysicsServer3D::soft_body_get_vertex_position(RID p_body, int vertex_index) const {
+	const SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	Vector3 pos;
 	ERR_FAIL_COND_V(!body, pos);
 
@@ -1019,204 +1011,204 @@ Vector3 BulletPhysicsServer::soft_body_get_vertex_position(RID p_body, int verte
 	return pos;
 }
 
-void BulletPhysicsServer::soft_body_set_ray_pickable(RID p_body, bool p_enable) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+void BulletPhysicsServer3D::soft_body_set_ray_pickable(RID p_body, bool p_enable) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 	body->set_ray_pickable(p_enable);
 }
 
-bool BulletPhysicsServer::soft_body_is_ray_pickable(RID p_body) const {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+bool BulletPhysicsServer3D::soft_body_is_ray_pickable(RID p_body) const {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, false);
 	return body->is_ray_pickable();
 }
 
-void BulletPhysicsServer::soft_body_set_simulation_precision(RID p_body, int p_simulation_precision) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+void BulletPhysicsServer3D::soft_body_set_simulation_precision(RID p_body, int p_simulation_precision) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 	body->set_simulation_precision(p_simulation_precision);
 }
 
-int BulletPhysicsServer::soft_body_get_simulation_precision(RID p_body) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+int BulletPhysicsServer3D::soft_body_get_simulation_precision(RID p_body) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, 0.f);
 	return body->get_simulation_precision();
 }
 
-void BulletPhysicsServer::soft_body_set_total_mass(RID p_body, real_t p_total_mass) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+void BulletPhysicsServer3D::soft_body_set_total_mass(RID p_body, real_t p_total_mass) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 	body->set_total_mass(p_total_mass);
 }
 
-real_t BulletPhysicsServer::soft_body_get_total_mass(RID p_body) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+real_t BulletPhysicsServer3D::soft_body_get_total_mass(RID p_body) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, 0.f);
 	return body->get_total_mass();
 }
 
-void BulletPhysicsServer::soft_body_set_linear_stiffness(RID p_body, real_t p_stiffness) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+void BulletPhysicsServer3D::soft_body_set_linear_stiffness(RID p_body, real_t p_stiffness) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 	body->set_linear_stiffness(p_stiffness);
 }
 
-real_t BulletPhysicsServer::soft_body_get_linear_stiffness(RID p_body) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+real_t BulletPhysicsServer3D::soft_body_get_linear_stiffness(RID p_body) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, 0.f);
 	return body->get_linear_stiffness();
 }
 
-void BulletPhysicsServer::soft_body_set_areaAngular_stiffness(RID p_body, real_t p_stiffness) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+void BulletPhysicsServer3D::soft_body_set_areaAngular_stiffness(RID p_body, real_t p_stiffness) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 	body->set_areaAngular_stiffness(p_stiffness);
 }
 
-real_t BulletPhysicsServer::soft_body_get_areaAngular_stiffness(RID p_body) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+real_t BulletPhysicsServer3D::soft_body_get_areaAngular_stiffness(RID p_body) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, 0.f);
 	return body->get_areaAngular_stiffness();
 }
 
-void BulletPhysicsServer::soft_body_set_volume_stiffness(RID p_body, real_t p_stiffness) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+void BulletPhysicsServer3D::soft_body_set_volume_stiffness(RID p_body, real_t p_stiffness) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 	body->set_volume_stiffness(p_stiffness);
 }
 
-real_t BulletPhysicsServer::soft_body_get_volume_stiffness(RID p_body) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+real_t BulletPhysicsServer3D::soft_body_get_volume_stiffness(RID p_body) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, 0.f);
 	return body->get_volume_stiffness();
 }
 
-void BulletPhysicsServer::soft_body_set_pressure_coefficient(RID p_body, real_t p_pressure_coefficient) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+void BulletPhysicsServer3D::soft_body_set_pressure_coefficient(RID p_body, real_t p_pressure_coefficient) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 	body->set_pressure_coefficient(p_pressure_coefficient);
 }
 
-real_t BulletPhysicsServer::soft_body_get_pressure_coefficient(RID p_body) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+real_t BulletPhysicsServer3D::soft_body_get_pressure_coefficient(RID p_body) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, 0.f);
 	return body->get_pressure_coefficient();
 }
 
-void BulletPhysicsServer::soft_body_set_pose_matching_coefficient(RID p_body, real_t p_pose_matching_coefficient) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+void BulletPhysicsServer3D::soft_body_set_pose_matching_coefficient(RID p_body, real_t p_pose_matching_coefficient) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 	return body->set_pose_matching_coefficient(p_pose_matching_coefficient);
 }
 
-real_t BulletPhysicsServer::soft_body_get_pose_matching_coefficient(RID p_body) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+real_t BulletPhysicsServer3D::soft_body_get_pose_matching_coefficient(RID p_body) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, 0.f);
 	return body->get_pose_matching_coefficient();
 }
 
-void BulletPhysicsServer::soft_body_set_damping_coefficient(RID p_body, real_t p_damping_coefficient) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+void BulletPhysicsServer3D::soft_body_set_damping_coefficient(RID p_body, real_t p_damping_coefficient) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 	body->set_damping_coefficient(p_damping_coefficient);
 }
 
-real_t BulletPhysicsServer::soft_body_get_damping_coefficient(RID p_body) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+real_t BulletPhysicsServer3D::soft_body_get_damping_coefficient(RID p_body) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, 0.f);
 	return body->get_damping_coefficient();
 }
 
-void BulletPhysicsServer::soft_body_set_drag_coefficient(RID p_body, real_t p_drag_coefficient) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+void BulletPhysicsServer3D::soft_body_set_drag_coefficient(RID p_body, real_t p_drag_coefficient) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 	body->set_drag_coefficient(p_drag_coefficient);
 }
 
-real_t BulletPhysicsServer::soft_body_get_drag_coefficient(RID p_body) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+real_t BulletPhysicsServer3D::soft_body_get_drag_coefficient(RID p_body) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, 0.f);
 	return body->get_drag_coefficient();
 }
 
-void BulletPhysicsServer::soft_body_move_point(RID p_body, int p_point_index, const Vector3 &p_global_position) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+void BulletPhysicsServer3D::soft_body_move_point(RID p_body, int p_point_index, const Vector3 &p_global_position) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 	body->set_node_position(p_point_index, p_global_position);
 }
 
-Vector3 BulletPhysicsServer::soft_body_get_point_global_position(RID p_body, int p_point_index) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+Vector3 BulletPhysicsServer3D::soft_body_get_point_global_position(RID p_body, int p_point_index) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, Vector3(0., 0., 0.));
 	Vector3 pos;
 	body->get_node_position(p_point_index, pos);
 	return pos;
 }
 
-Vector3 BulletPhysicsServer::soft_body_get_point_offset(RID p_body, int p_point_index) const {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+Vector3 BulletPhysicsServer3D::soft_body_get_point_offset(RID p_body, int p_point_index) const {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, Vector3());
 	Vector3 res;
 	body->get_node_offset(p_point_index, res);
 	return res;
 }
 
-void BulletPhysicsServer::soft_body_remove_all_pinned_points(RID p_body) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+void BulletPhysicsServer3D::soft_body_remove_all_pinned_points(RID p_body) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 	body->reset_all_node_mass();
 }
 
-void BulletPhysicsServer::soft_body_pin_point(RID p_body, int p_point_index, bool p_pin) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+void BulletPhysicsServer3D::soft_body_pin_point(RID p_body, int p_point_index, bool p_pin) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND(!body);
 	body->set_node_mass(p_point_index, p_pin ? 0 : 1);
 }
 
-bool BulletPhysicsServer::soft_body_is_point_pinned(RID p_body, int p_point_index) {
-	SoftBodyBullet *body = soft_body_owner.get(p_body);
+bool BulletPhysicsServer3D::soft_body_is_point_pinned(RID p_body, int p_point_index) {
+	SoftBodyBullet *body = soft_body_owner.getornull(p_body);
 	ERR_FAIL_COND_V(!body, 0.f);
 	return body->get_node_mass(p_point_index);
 }
 
-PhysicsServer::JointType BulletPhysicsServer::joint_get_type(RID p_joint) const {
-	JointBullet *joint = joint_owner.get(p_joint);
+PhysicsServer3D::JointType BulletPhysicsServer3D::joint_get_type(RID p_joint) const {
+	JointBullet *joint = joint_owner.getornull(p_joint);
 	ERR_FAIL_COND_V(!joint, JOINT_PIN);
 	return joint->get_type();
 }
 
-void BulletPhysicsServer::joint_set_solver_priority(RID p_joint, int p_priority) {
+void BulletPhysicsServer3D::joint_set_solver_priority(RID p_joint, int p_priority) {
 	// Joint priority not supported by bullet
 }
 
-int BulletPhysicsServer::joint_get_solver_priority(RID p_joint) const {
+int BulletPhysicsServer3D::joint_get_solver_priority(RID p_joint) const {
 	// Joint priority not supported by bullet
 	return 0;
 }
 
-void BulletPhysicsServer::joint_disable_collisions_between_bodies(RID p_joint, const bool p_disable) {
-	JointBullet *joint = joint_owner.get(p_joint);
+void BulletPhysicsServer3D::joint_disable_collisions_between_bodies(RID p_joint, const bool p_disable) {
+	JointBullet *joint = joint_owner.getornull(p_joint);
 	ERR_FAIL_COND(!joint);
 
 	joint->disable_collisions_between_bodies(p_disable);
 }
 
-bool BulletPhysicsServer::joint_is_disabled_collisions_between_bodies(RID p_joint) const {
-	JointBullet *joint(joint_owner.get(p_joint));
+bool BulletPhysicsServer3D::joint_is_disabled_collisions_between_bodies(RID p_joint) const {
+	JointBullet *joint(joint_owner.getornull(p_joint));
 	ERR_FAIL_COND_V(!joint, false);
 
 	return joint->is_disabled_collisions_between_bodies();
 }
 
-RID BulletPhysicsServer::joint_create_pin(RID p_body_A, const Vector3 &p_local_A, RID p_body_B, const Vector3 &p_local_B) {
-	RigidBodyBullet *body_A = rigid_body_owner.get(p_body_A);
+RID BulletPhysicsServer3D::joint_create_pin(RID p_body_A, const Vector3 &p_local_A, RID p_body_B, const Vector3 &p_local_B) {
+	RigidBodyBullet *body_A = rigid_body_owner.getornull(p_body_A);
 	ERR_FAIL_COND_V(!body_A, RID());
 
 	JointAssertSpace(body_A, "A", RID());
 
-	RigidBodyBullet *body_B = NULL;
+	RigidBodyBullet *body_B = nullptr;
 	if (p_body_B.is_valid()) {
-		body_B = rigid_body_owner.get(p_body_B);
+		body_B = rigid_body_owner.getornull(p_body_B);
 		JointAssertSpace(body_B, "B", RID());
 		JointAssertSameSpace(body_A, body_B, RID());
 	}
@@ -1229,62 +1221,62 @@ RID BulletPhysicsServer::joint_create_pin(RID p_body_A, const Vector3 &p_local_A
 	CreateThenReturnRID(joint_owner, joint);
 }
 
-void BulletPhysicsServer::pin_joint_set_param(RID p_joint, PinJointParam p_param, float p_value) {
-	JointBullet *joint = joint_owner.get(p_joint);
+void BulletPhysicsServer3D::pin_joint_set_param(RID p_joint, PinJointParam p_param, float p_value) {
+	JointBullet *joint = joint_owner.getornull(p_joint);
 	ERR_FAIL_COND(!joint);
 	ERR_FAIL_COND(joint->get_type() != JOINT_PIN);
 	PinJointBullet *pin_joint = static_cast<PinJointBullet *>(joint);
 	pin_joint->set_param(p_param, p_value);
 }
 
-float BulletPhysicsServer::pin_joint_get_param(RID p_joint, PinJointParam p_param) const {
-	JointBullet *joint = joint_owner.get(p_joint);
+float BulletPhysicsServer3D::pin_joint_get_param(RID p_joint, PinJointParam p_param) const {
+	JointBullet *joint = joint_owner.getornull(p_joint);
 	ERR_FAIL_COND_V(!joint, 0);
 	ERR_FAIL_COND_V(joint->get_type() != JOINT_PIN, 0);
 	PinJointBullet *pin_joint = static_cast<PinJointBullet *>(joint);
 	return pin_joint->get_param(p_param);
 }
 
-void BulletPhysicsServer::pin_joint_set_local_a(RID p_joint, const Vector3 &p_A) {
-	JointBullet *joint = joint_owner.get(p_joint);
+void BulletPhysicsServer3D::pin_joint_set_local_a(RID p_joint, const Vector3 &p_A) {
+	JointBullet *joint = joint_owner.getornull(p_joint);
 	ERR_FAIL_COND(!joint);
 	ERR_FAIL_COND(joint->get_type() != JOINT_PIN);
 	PinJointBullet *pin_joint = static_cast<PinJointBullet *>(joint);
 	pin_joint->setPivotInA(p_A);
 }
 
-Vector3 BulletPhysicsServer::pin_joint_get_local_a(RID p_joint) const {
-	JointBullet *joint = joint_owner.get(p_joint);
+Vector3 BulletPhysicsServer3D::pin_joint_get_local_a(RID p_joint) const {
+	JointBullet *joint = joint_owner.getornull(p_joint);
 	ERR_FAIL_COND_V(!joint, Vector3());
 	ERR_FAIL_COND_V(joint->get_type() != JOINT_PIN, Vector3());
 	PinJointBullet *pin_joint = static_cast<PinJointBullet *>(joint);
 	return pin_joint->getPivotInA();
 }
 
-void BulletPhysicsServer::pin_joint_set_local_b(RID p_joint, const Vector3 &p_B) {
-	JointBullet *joint = joint_owner.get(p_joint);
+void BulletPhysicsServer3D::pin_joint_set_local_b(RID p_joint, const Vector3 &p_B) {
+	JointBullet *joint = joint_owner.getornull(p_joint);
 	ERR_FAIL_COND(!joint);
 	ERR_FAIL_COND(joint->get_type() != JOINT_PIN);
 	PinJointBullet *pin_joint = static_cast<PinJointBullet *>(joint);
 	pin_joint->setPivotInB(p_B);
 }
 
-Vector3 BulletPhysicsServer::pin_joint_get_local_b(RID p_joint) const {
-	JointBullet *joint = joint_owner.get(p_joint);
+Vector3 BulletPhysicsServer3D::pin_joint_get_local_b(RID p_joint) const {
+	JointBullet *joint = joint_owner.getornull(p_joint);
 	ERR_FAIL_COND_V(!joint, Vector3());
 	ERR_FAIL_COND_V(joint->get_type() != JOINT_PIN, Vector3());
 	PinJointBullet *pin_joint = static_cast<PinJointBullet *>(joint);
 	return pin_joint->getPivotInB();
 }
 
-RID BulletPhysicsServer::joint_create_hinge(RID p_body_A, const Transform &p_hinge_A, RID p_body_B, const Transform &p_hinge_B) {
-	RigidBodyBullet *body_A = rigid_body_owner.get(p_body_A);
+RID BulletPhysicsServer3D::joint_create_hinge(RID p_body_A, const Transform &p_hinge_A, RID p_body_B, const Transform &p_hinge_B) {
+	RigidBodyBullet *body_A = rigid_body_owner.getornull(p_body_A);
 	ERR_FAIL_COND_V(!body_A, RID());
 	JointAssertSpace(body_A, "A", RID());
 
-	RigidBodyBullet *body_B = NULL;
+	RigidBodyBullet *body_B = nullptr;
 	if (p_body_B.is_valid()) {
-		body_B = rigid_body_owner.get(p_body_B);
+		body_B = rigid_body_owner.getornull(p_body_B);
 		JointAssertSpace(body_B, "B", RID());
 		JointAssertSameSpace(body_A, body_B, RID());
 	}
@@ -1297,14 +1289,14 @@ RID BulletPhysicsServer::joint_create_hinge(RID p_body_A, const Transform &p_hin
 	CreateThenReturnRID(joint_owner, joint);
 }
 
-RID BulletPhysicsServer::joint_create_hinge_simple(RID p_body_A, const Vector3 &p_pivot_A, const Vector3 &p_axis_A, RID p_body_B, const Vector3 &p_pivot_B, const Vector3 &p_axis_B) {
-	RigidBodyBullet *body_A = rigid_body_owner.get(p_body_A);
+RID BulletPhysicsServer3D::joint_create_hinge_simple(RID p_body_A, const Vector3 &p_pivot_A, const Vector3 &p_axis_A, RID p_body_B, const Vector3 &p_pivot_B, const Vector3 &p_axis_B) {
+	RigidBodyBullet *body_A = rigid_body_owner.getornull(p_body_A);
 	ERR_FAIL_COND_V(!body_A, RID());
 	JointAssertSpace(body_A, "A", RID());
 
-	RigidBodyBullet *body_B = NULL;
+	RigidBodyBullet *body_B = nullptr;
 	if (p_body_B.is_valid()) {
-		body_B = rigid_body_owner.get(p_body_B);
+		body_B = rigid_body_owner.getornull(p_body_B);
 		JointAssertSpace(body_B, "B", RID());
 		JointAssertSameSpace(body_A, body_B, RID());
 	}
@@ -1317,46 +1309,46 @@ RID BulletPhysicsServer::joint_create_hinge_simple(RID p_body_A, const Vector3 &
 	CreateThenReturnRID(joint_owner, joint);
 }
 
-void BulletPhysicsServer::hinge_joint_set_param(RID p_joint, HingeJointParam p_param, float p_value) {
-	JointBullet *joint = joint_owner.get(p_joint);
+void BulletPhysicsServer3D::hinge_joint_set_param(RID p_joint, HingeJointParam p_param, float p_value) {
+	JointBullet *joint = joint_owner.getornull(p_joint);
 	ERR_FAIL_COND(!joint);
 	ERR_FAIL_COND(joint->get_type() != JOINT_HINGE);
 	HingeJointBullet *hinge_joint = static_cast<HingeJointBullet *>(joint);
 	hinge_joint->set_param(p_param, p_value);
 }
 
-float BulletPhysicsServer::hinge_joint_get_param(RID p_joint, HingeJointParam p_param) const {
-	JointBullet *joint = joint_owner.get(p_joint);
+float BulletPhysicsServer3D::hinge_joint_get_param(RID p_joint, HingeJointParam p_param) const {
+	JointBullet *joint = joint_owner.getornull(p_joint);
 	ERR_FAIL_COND_V(!joint, 0);
 	ERR_FAIL_COND_V(joint->get_type() != JOINT_HINGE, 0);
 	HingeJointBullet *hinge_joint = static_cast<HingeJointBullet *>(joint);
 	return hinge_joint->get_param(p_param);
 }
 
-void BulletPhysicsServer::hinge_joint_set_flag(RID p_joint, HingeJointFlag p_flag, bool p_value) {
-	JointBullet *joint = joint_owner.get(p_joint);
+void BulletPhysicsServer3D::hinge_joint_set_flag(RID p_joint, HingeJointFlag p_flag, bool p_value) {
+	JointBullet *joint = joint_owner.getornull(p_joint);
 	ERR_FAIL_COND(!joint);
 	ERR_FAIL_COND(joint->get_type() != JOINT_HINGE);
 	HingeJointBullet *hinge_joint = static_cast<HingeJointBullet *>(joint);
 	hinge_joint->set_flag(p_flag, p_value);
 }
 
-bool BulletPhysicsServer::hinge_joint_get_flag(RID p_joint, HingeJointFlag p_flag) const {
-	JointBullet *joint = joint_owner.get(p_joint);
+bool BulletPhysicsServer3D::hinge_joint_get_flag(RID p_joint, HingeJointFlag p_flag) const {
+	JointBullet *joint = joint_owner.getornull(p_joint);
 	ERR_FAIL_COND_V(!joint, false);
 	ERR_FAIL_COND_V(joint->get_type() != JOINT_HINGE, false);
 	HingeJointBullet *hinge_joint = static_cast<HingeJointBullet *>(joint);
 	return hinge_joint->get_flag(p_flag);
 }
 
-RID BulletPhysicsServer::joint_create_slider(RID p_body_A, const Transform &p_local_frame_A, RID p_body_B, const Transform &p_local_frame_B) {
-	RigidBodyBullet *body_A = rigid_body_owner.get(p_body_A);
+RID BulletPhysicsServer3D::joint_create_slider(RID p_body_A, const Transform &p_local_frame_A, RID p_body_B, const Transform &p_local_frame_B) {
+	RigidBodyBullet *body_A = rigid_body_owner.getornull(p_body_A);
 	ERR_FAIL_COND_V(!body_A, RID());
 	JointAssertSpace(body_A, "A", RID());
 
-	RigidBodyBullet *body_B = NULL;
+	RigidBodyBullet *body_B = nullptr;
 	if (p_body_B.is_valid()) {
-		body_B = rigid_body_owner.get(p_body_B);
+		body_B = rigid_body_owner.getornull(p_body_B);
 		JointAssertSpace(body_B, "B", RID());
 		JointAssertSameSpace(body_A, body_B, RID());
 	}
@@ -1369,30 +1361,30 @@ RID BulletPhysicsServer::joint_create_slider(RID p_body_A, const Transform &p_lo
 	CreateThenReturnRID(joint_owner, joint);
 }
 
-void BulletPhysicsServer::slider_joint_set_param(RID p_joint, SliderJointParam p_param, float p_value) {
-	JointBullet *joint = joint_owner.get(p_joint);
+void BulletPhysicsServer3D::slider_joint_set_param(RID p_joint, SliderJointParam p_param, float p_value) {
+	JointBullet *joint = joint_owner.getornull(p_joint);
 	ERR_FAIL_COND(!joint);
 	ERR_FAIL_COND(joint->get_type() != JOINT_SLIDER);
 	SliderJointBullet *slider_joint = static_cast<SliderJointBullet *>(joint);
 	slider_joint->set_param(p_param, p_value);
 }
 
-float BulletPhysicsServer::slider_joint_get_param(RID p_joint, SliderJointParam p_param) const {
-	JointBullet *joint = joint_owner.get(p_joint);
+float BulletPhysicsServer3D::slider_joint_get_param(RID p_joint, SliderJointParam p_param) const {
+	JointBullet *joint = joint_owner.getornull(p_joint);
 	ERR_FAIL_COND_V(!joint, 0);
 	ERR_FAIL_COND_V(joint->get_type() != JOINT_SLIDER, 0);
 	SliderJointBullet *slider_joint = static_cast<SliderJointBullet *>(joint);
 	return slider_joint->get_param(p_param);
 }
 
-RID BulletPhysicsServer::joint_create_cone_twist(RID p_body_A, const Transform &p_local_frame_A, RID p_body_B, const Transform &p_local_frame_B) {
-	RigidBodyBullet *body_A = rigid_body_owner.get(p_body_A);
+RID BulletPhysicsServer3D::joint_create_cone_twist(RID p_body_A, const Transform &p_local_frame_A, RID p_body_B, const Transform &p_local_frame_B) {
+	RigidBodyBullet *body_A = rigid_body_owner.getornull(p_body_A);
 	ERR_FAIL_COND_V(!body_A, RID());
 	JointAssertSpace(body_A, "A", RID());
 
-	RigidBodyBullet *body_B = NULL;
+	RigidBodyBullet *body_B = nullptr;
 	if (p_body_B.is_valid()) {
-		body_B = rigid_body_owner.get(p_body_B);
+		body_B = rigid_body_owner.getornull(p_body_B);
 		JointAssertSpace(body_B, "B", RID());
 		JointAssertSameSpace(body_A, body_B, RID());
 	}
@@ -1403,30 +1395,30 @@ RID BulletPhysicsServer::joint_create_cone_twist(RID p_body_A, const Transform &
 	CreateThenReturnRID(joint_owner, joint);
 }
 
-void BulletPhysicsServer::cone_twist_joint_set_param(RID p_joint, ConeTwistJointParam p_param, float p_value) {
-	JointBullet *joint = joint_owner.get(p_joint);
+void BulletPhysicsServer3D::cone_twist_joint_set_param(RID p_joint, ConeTwistJointParam p_param, float p_value) {
+	JointBullet *joint = joint_owner.getornull(p_joint);
 	ERR_FAIL_COND(!joint);
 	ERR_FAIL_COND(joint->get_type() != JOINT_CONE_TWIST);
 	ConeTwistJointBullet *coneTwist_joint = static_cast<ConeTwistJointBullet *>(joint);
 	coneTwist_joint->set_param(p_param, p_value);
 }
 
-float BulletPhysicsServer::cone_twist_joint_get_param(RID p_joint, ConeTwistJointParam p_param) const {
-	JointBullet *joint = joint_owner.get(p_joint);
+float BulletPhysicsServer3D::cone_twist_joint_get_param(RID p_joint, ConeTwistJointParam p_param) const {
+	JointBullet *joint = joint_owner.getornull(p_joint);
 	ERR_FAIL_COND_V(!joint, 0.);
 	ERR_FAIL_COND_V(joint->get_type() != JOINT_CONE_TWIST, 0.);
 	ConeTwistJointBullet *coneTwist_joint = static_cast<ConeTwistJointBullet *>(joint);
 	return coneTwist_joint->get_param(p_param);
 }
 
-RID BulletPhysicsServer::joint_create_generic_6dof(RID p_body_A, const Transform &p_local_frame_A, RID p_body_B, const Transform &p_local_frame_B) {
-	RigidBodyBullet *body_A = rigid_body_owner.get(p_body_A);
+RID BulletPhysicsServer3D::joint_create_generic_6dof(RID p_body_A, const Transform &p_local_frame_A, RID p_body_B, const Transform &p_local_frame_B) {
+	RigidBodyBullet *body_A = rigid_body_owner.getornull(p_body_A);
 	ERR_FAIL_COND_V(!body_A, RID());
 	JointAssertSpace(body_A, "A", RID());
 
-	RigidBodyBullet *body_B = NULL;
+	RigidBodyBullet *body_B = nullptr;
 	if (p_body_B.is_valid()) {
-		body_B = rigid_body_owner.get(p_body_B);
+		body_B = rigid_body_owner.getornull(p_body_B);
 		JointAssertSpace(body_B, "B", RID());
 		JointAssertSameSpace(body_A, body_B, RID());
 	}
@@ -1439,58 +1431,57 @@ RID BulletPhysicsServer::joint_create_generic_6dof(RID p_body_A, const Transform
 	CreateThenReturnRID(joint_owner, joint);
 }
 
-void BulletPhysicsServer::generic_6dof_joint_set_param(RID p_joint, Vector3::Axis p_axis, G6DOFJointAxisParam p_param, float p_value) {
-	JointBullet *joint = joint_owner.get(p_joint);
+void BulletPhysicsServer3D::generic_6dof_joint_set_param(RID p_joint, Vector3::Axis p_axis, G6DOFJointAxisParam p_param, float p_value) {
+	JointBullet *joint = joint_owner.getornull(p_joint);
 	ERR_FAIL_COND(!joint);
 	ERR_FAIL_COND(joint->get_type() != JOINT_6DOF);
 	Generic6DOFJointBullet *generic_6dof_joint = static_cast<Generic6DOFJointBullet *>(joint);
 	generic_6dof_joint->set_param(p_axis, p_param, p_value);
 }
 
-float BulletPhysicsServer::generic_6dof_joint_get_param(RID p_joint, Vector3::Axis p_axis, G6DOFJointAxisParam p_param) {
-	JointBullet *joint = joint_owner.get(p_joint);
+float BulletPhysicsServer3D::generic_6dof_joint_get_param(RID p_joint, Vector3::Axis p_axis, G6DOFJointAxisParam p_param) {
+	JointBullet *joint = joint_owner.getornull(p_joint);
 	ERR_FAIL_COND_V(!joint, 0);
 	ERR_FAIL_COND_V(joint->get_type() != JOINT_6DOF, 0);
 	Generic6DOFJointBullet *generic_6dof_joint = static_cast<Generic6DOFJointBullet *>(joint);
 	return generic_6dof_joint->get_param(p_axis, p_param);
 }
 
-void BulletPhysicsServer::generic_6dof_joint_set_flag(RID p_joint, Vector3::Axis p_axis, G6DOFJointAxisFlag p_flag, bool p_enable) {
-	JointBullet *joint = joint_owner.get(p_joint);
+void BulletPhysicsServer3D::generic_6dof_joint_set_flag(RID p_joint, Vector3::Axis p_axis, G6DOFJointAxisFlag p_flag, bool p_enable) {
+	JointBullet *joint = joint_owner.getornull(p_joint);
 	ERR_FAIL_COND(!joint);
 	ERR_FAIL_COND(joint->get_type() != JOINT_6DOF);
 	Generic6DOFJointBullet *generic_6dof_joint = static_cast<Generic6DOFJointBullet *>(joint);
 	generic_6dof_joint->set_flag(p_axis, p_flag, p_enable);
 }
 
-bool BulletPhysicsServer::generic_6dof_joint_get_flag(RID p_joint, Vector3::Axis p_axis, G6DOFJointAxisFlag p_flag) {
-	JointBullet *joint = joint_owner.get(p_joint);
+bool BulletPhysicsServer3D::generic_6dof_joint_get_flag(RID p_joint, Vector3::Axis p_axis, G6DOFJointAxisFlag p_flag) {
+	JointBullet *joint = joint_owner.getornull(p_joint);
 	ERR_FAIL_COND_V(!joint, false);
 	ERR_FAIL_COND_V(joint->get_type() != JOINT_6DOF, false);
 	Generic6DOFJointBullet *generic_6dof_joint = static_cast<Generic6DOFJointBullet *>(joint);
 	return generic_6dof_joint->get_flag(p_axis, p_flag);
 }
 
-void BulletPhysicsServer::generic_6dof_joint_set_precision(RID p_joint, int p_precision) {
-	JointBullet *joint = joint_owner.get(p_joint);
+void BulletPhysicsServer3D::generic_6dof_joint_set_precision(RID p_joint, int p_precision) {
+	JointBullet *joint = joint_owner.getornull(p_joint);
 	ERR_FAIL_COND(!joint);
 	ERR_FAIL_COND(joint->get_type() != JOINT_6DOF);
 	Generic6DOFJointBullet *generic_6dof_joint = static_cast<Generic6DOFJointBullet *>(joint);
 	generic_6dof_joint->set_precision(p_precision);
 }
 
-int BulletPhysicsServer::generic_6dof_joint_get_precision(RID p_joint) {
-	JointBullet *joint = joint_owner.get(p_joint);
+int BulletPhysicsServer3D::generic_6dof_joint_get_precision(RID p_joint) {
+	JointBullet *joint = joint_owner.getornull(p_joint);
 	ERR_FAIL_COND_V(!joint, 0);
 	ERR_FAIL_COND_V(joint->get_type() != JOINT_6DOF, 0);
 	Generic6DOFJointBullet *generic_6dof_joint = static_cast<Generic6DOFJointBullet *>(joint);
 	return generic_6dof_joint->get_precision();
 }
 
-void BulletPhysicsServer::free(RID p_rid) {
+void BulletPhysicsServer3D::free(RID p_rid) {
 	if (shape_owner.owns(p_rid)) {
-
-		ShapeBullet *shape = shape_owner.get(p_rid);
+		ShapeBullet *shape = shape_owner.getornull(p_rid);
 
 		// Notify the shape is configured
 		for (Map<ShapeOwnerBullet *, int>::Element *element = shape->get_owners().front(); element; element = element->next()) {
@@ -1500,10 +1491,9 @@ void BulletPhysicsServer::free(RID p_rid) {
 		shape_owner.free(p_rid);
 		bulletdelete(shape);
 	} else if (rigid_body_owner.owns(p_rid)) {
+		RigidBodyBullet *body = rigid_body_owner.getornull(p_rid);
 
-		RigidBodyBullet *body = rigid_body_owner.get(p_rid);
-
-		body->set_space(NULL);
+		body->set_space(nullptr);
 
 		body->remove_all_shapes(true, true);
 
@@ -1511,19 +1501,17 @@ void BulletPhysicsServer::free(RID p_rid) {
 		bulletdelete(body);
 
 	} else if (soft_body_owner.owns(p_rid)) {
+		SoftBodyBullet *body = soft_body_owner.getornull(p_rid);
 
-		SoftBodyBullet *body = soft_body_owner.get(p_rid);
-
-		body->set_space(NULL);
+		body->set_space(nullptr);
 
 		soft_body_owner.free(p_rid);
 		bulletdelete(body);
 
 	} else if (area_owner.owns(p_rid)) {
+		AreaBullet *area = area_owner.getornull(p_rid);
 
-		AreaBullet *area = area_owner.get(p_rid);
-
-		area->set_space(NULL);
+		area->set_space(nullptr);
 
 		area->remove_all_shapes(true, true);
 
@@ -1531,15 +1519,13 @@ void BulletPhysicsServer::free(RID p_rid) {
 		bulletdelete(area);
 
 	} else if (joint_owner.owns(p_rid)) {
-
-		JointBullet *joint = joint_owner.get(p_rid);
+		JointBullet *joint = joint_owner.getornull(p_rid);
 		joint->destroy_internal_constraint();
 		joint_owner.free(p_rid);
 		bulletdelete(joint);
 
 	} else if (space_owner.owns(p_rid)) {
-
-		SpaceBullet *space = space_owner.get(p_rid);
+		SpaceBullet *space = space_owner.getornull(p_rid);
 
 		space->remove_all_collision_objects();
 
@@ -1547,42 +1533,58 @@ void BulletPhysicsServer::free(RID p_rid) {
 		space_owner.free(p_rid);
 		bulletdelete(space);
 	} else {
-
 		ERR_FAIL_MSG("Invalid ID.");
 	}
 }
 
-void BulletPhysicsServer::init() {
-	BulletPhysicsDirectBodyState::initSingleton();
+void BulletPhysicsServer3D::init() {
+	BulletPhysicsDirectBodyState3D::initSingleton();
 }
 
-void BulletPhysicsServer::step(float p_deltaTime) {
-	if (!active)
+void BulletPhysicsServer3D::step(float p_deltaTime) {
+	if (!active) {
 		return;
+	}
 
-	BulletPhysicsDirectBodyState::singleton_setDeltaTime(p_deltaTime);
+	BulletPhysicsDirectBodyState3D::singleton_setDeltaTime(p_deltaTime);
 
 	for (int i = 0; i < active_spaces_count; ++i) {
-
 		active_spaces[i]->step(p_deltaTime);
 	}
 }
 
-void BulletPhysicsServer::sync() {
+void BulletPhysicsServer3D::sync() {
 }
 
-void BulletPhysicsServer::flush_queries() {
+void BulletPhysicsServer3D::flush_queries() {
+	if (!active) {
+		return;
+	}
+
+	for (int i = 0; i < active_spaces_count; ++i) {
+		active_spaces[i]->flush_queries();
+	}
 }
 
-void BulletPhysicsServer::finish() {
-	BulletPhysicsDirectBodyState::destroySingleton();
+void BulletPhysicsServer3D::finish() {
+	BulletPhysicsDirectBodyState3D::destroySingleton();
 }
 
-int BulletPhysicsServer::get_process_info(ProcessInfo p_info) {
+int BulletPhysicsServer3D::get_process_info(ProcessInfo p_info) {
 	return 0;
 }
 
-CollisionObjectBullet *BulletPhysicsServer::get_collisin_object(RID p_object) const {
+SpaceBullet *BulletPhysicsServer3D::get_space(RID p_rid) const {
+	ERR_FAIL_COND_V_MSG(space_owner.owns(p_rid) == false, nullptr, "The RID is not valid.");
+	return space_owner.getornull(p_rid);
+}
+
+ShapeBullet *BulletPhysicsServer3D::get_shape(RID p_rid) const {
+	ERR_FAIL_COND_V_MSG(shape_owner.owns(p_rid) == false, nullptr, "The RID is not valid.");
+	return shape_owner.getornull(p_rid);
+}
+
+CollisionObjectBullet *BulletPhysicsServer3D::get_collision_object(RID p_object) const {
 	if (rigid_body_owner.owns(p_object)) {
 		return rigid_body_owner.getornull(p_object);
 	}
@@ -1592,15 +1594,20 @@ CollisionObjectBullet *BulletPhysicsServer::get_collisin_object(RID p_object) co
 	if (soft_body_owner.owns(p_object)) {
 		return soft_body_owner.getornull(p_object);
 	}
-	return NULL;
+	ERR_FAIL_V_MSG(nullptr, "The RID is no valid.");
 }
 
-RigidCollisionObjectBullet *BulletPhysicsServer::get_rigid_collisin_object(RID p_object) const {
+RigidCollisionObjectBullet *BulletPhysicsServer3D::get_rigid_collision_object(RID p_object) const {
 	if (rigid_body_owner.owns(p_object)) {
 		return rigid_body_owner.getornull(p_object);
 	}
 	if (area_owner.owns(p_object)) {
 		return area_owner.getornull(p_object);
 	}
-	return NULL;
+	ERR_FAIL_V_MSG(nullptr, "The RID is no valid.");
+}
+
+JointBullet *BulletPhysicsServer3D::get_joint(RID p_rid) const {
+	ERR_FAIL_COND_V_MSG(joint_owner.owns(p_rid) == false, nullptr, "The RID is not valid.");
+	return joint_owner.getornull(p_rid);
 }
diff --git a/modules/bullet/bullet_physics_server.h b/modules/bullet/bullet_physics_server.h
index 4a3b4a2edc..eb95120f74 100644
--- a/modules/bullet/bullet_physics_server.h
+++ b/modules/bullet/bullet_physics_server.h
@@ -33,9 +33,10 @@
 
 #include "area_bullet.h"
 #include "core/rid.h"
+#include "core/rid_owner.h"
 #include "joint_bullet.h"
 #include "rigid_body_bullet.h"
-#include "servers/physics_server.h"
+#include "servers/physics_server_3d.h"
 #include "shape_bullet.h"
 #include "soft_body_bullet.h"
 #include "space_bullet.h"
@@ -44,78 +45,78 @@
 	@author AndreaCatania
 */
 
-class BulletPhysicsServer : public PhysicsServer {
-	GDCLASS(BulletPhysicsServer, PhysicsServer);
+class BulletPhysicsServer3D : public PhysicsServer3D {
+	GDCLASS(BulletPhysicsServer3D, PhysicsServer3D);
 
 	friend class BulletPhysicsDirectSpaceState;
 
-	bool active;
-	char active_spaces_count;
-	Vector<SpaceBullet *> active_spaces;
+	bool active = true;
+	char active_spaces_count = 0;
+	LocalVector<SpaceBullet *> active_spaces;
 
-	mutable RID_Owner<SpaceBullet> space_owner;
-	mutable RID_Owner<ShapeBullet> shape_owner;
-	mutable RID_Owner<AreaBullet> area_owner;
-	mutable RID_Owner<RigidBodyBullet> rigid_body_owner;
-	mutable RID_Owner<SoftBodyBullet> soft_body_owner;
-	mutable RID_Owner<JointBullet> joint_owner;
+	mutable RID_PtrOwner<SpaceBullet> space_owner;
+	mutable RID_PtrOwner<ShapeBullet> shape_owner;
+	mutable RID_PtrOwner<AreaBullet> area_owner;
+	mutable RID_PtrOwner<RigidBodyBullet> rigid_body_owner;
+	mutable RID_PtrOwner<SoftBodyBullet> soft_body_owner;
+	mutable RID_PtrOwner<JointBullet> joint_owner;
 
 protected:
 	static void _bind_methods();
 
 public:
-	BulletPhysicsServer();
-	~BulletPhysicsServer();
+	BulletPhysicsServer3D();
+	~BulletPhysicsServer3D();
 
-	_FORCE_INLINE_ RID_Owner<SpaceBullet> *get_space_owner() {
+	_FORCE_INLINE_ RID_PtrOwner<SpaceBullet> *get_space_owner() {
 		return &space_owner;
 	}
-	_FORCE_INLINE_ RID_Owner<ShapeBullet> *get_shape_owner() {
+	_FORCE_INLINE_ RID_PtrOwner<ShapeBullet> *get_shape_owner() {
 		return &shape_owner;
 	}
-	_FORCE_INLINE_ RID_Owner<AreaBullet> *get_area_owner() {
+	_FORCE_INLINE_ RID_PtrOwner<AreaBullet> *get_area_owner() {
 		return &area_owner;
 	}
-	_FORCE_INLINE_ RID_Owner<RigidBodyBullet> *get_rigid_body_owner() {
+	_FORCE_INLINE_ RID_PtrOwner<RigidBodyBullet> *get_rigid_body_owner() {
 		return &rigid_body_owner;
 	}
-	_FORCE_INLINE_ RID_Owner<SoftBodyBullet> *get_soft_body_owner() {
+	_FORCE_INLINE_ RID_PtrOwner<SoftBodyBullet> *get_soft_body_owner() {
 		return &soft_body_owner;
 	}
-	_FORCE_INLINE_ RID_Owner<JointBullet> *get_joint_owner() {
+	_FORCE_INLINE_ RID_PtrOwner<JointBullet> *get_joint_owner() {
 		return &joint_owner;
 	}
 
 	/* SHAPE API */
-	virtual RID shape_create(ShapeType p_shape);
-	virtual void shape_set_data(RID p_shape, const Variant &p_data);
-	virtual ShapeType shape_get_type(RID p_shape) const;
-	virtual Variant shape_get_data(RID p_shape) const;
+	virtual RID shape_create(ShapeType p_shape) override;
+	virtual void shape_set_data(RID p_shape, const Variant &p_data) override;
+	virtual ShapeType shape_get_type(RID p_shape) const override;
+	virtual Variant shape_get_data(RID p_shape) const override;
 
-	virtual void shape_set_margin(RID p_shape, real_t p_margin);
-	virtual real_t shape_get_margin(RID p_shape) const;
+	virtual void shape_set_margin(RID p_shape, real_t p_margin) override;
+	virtual real_t shape_get_margin(RID p_shape) const override;
 
 	/// Not supported
-	virtual void shape_set_custom_solver_bias(RID p_shape, real_t p_bias);
+	virtual void shape_set_custom_solver_bias(RID p_shape, real_t p_bias) override;
 	/// Not supported
-	virtual real_t shape_get_custom_solver_bias(RID p_shape) const;
+	virtual real_t shape_get_custom_solver_bias(RID p_shape) const override;
 
 	/* SPACE API */
 
-	virtual RID space_create();
-	virtual void space_set_active(RID p_space, bool p_active);
-	virtual bool space_is_active(RID p_space) const;
+	virtual RID space_create() override;
+	virtual void space_set_active(RID p_space, bool p_active) override;
+	virtual bool space_is_active(RID p_space) const override;
 
 	/// Not supported
-	virtual void space_set_param(RID p_space, SpaceParameter p_param, real_t p_value);
+	virtual void space_set_param(RID p_space, SpaceParameter p_param, real_t p_value) override;
 	/// Not supported
-	virtual real_t space_get_param(RID p_space, SpaceParameter p_param) const;
+	virtual real_t space_get_param(RID p_space, SpaceParameter p_param) const override;
 
-	virtual PhysicsDirectSpaceState *space_get_direct_state(RID p_space);
+	virtual PhysicsDirectSpaceState3D *space_get_direct_state(RID p_space) override;
 
-	virtual void space_set_debug_contacts(RID p_space, int p_max_contacts);
-	virtual Vector<Vector3> space_get_contacts(RID p_space) const;
-	virtual int space_get_contact_count(RID p_space) const;
+	virtual void space_set_debug_contacts(RID p_space, int p_max_contacts) override;
+	virtual Vector<Vector3> space_get_contacts(RID p_space) const override;
+	virtual int space_get_contact_count(RID p_space) const override;
 
 	/* AREA API */
 
@@ -124,291 +125,291 @@ public:
 	/// The API area_set_param is a bit hacky, and allow Godot to set some parameters on Bullet's world, a different use print a warning to console.
 	/// All other APIs returns a warning message if used
 
-	virtual RID area_create();
+	virtual RID area_create() override;
 
-	virtual void area_set_space(RID p_area, RID p_space);
+	virtual void area_set_space(RID p_area, RID p_space) override;
 
-	virtual RID area_get_space(RID p_area) const;
+	virtual RID area_get_space(RID p_area) const override;
 
-	virtual void area_set_space_override_mode(RID p_area, AreaSpaceOverrideMode p_mode);
-	virtual AreaSpaceOverrideMode area_get_space_override_mode(RID p_area) const;
+	virtual void area_set_space_override_mode(RID p_area, AreaSpaceOverrideMode p_mode) override;
+	virtual AreaSpaceOverrideMode area_get_space_override_mode(RID p_area) const override;
 
-	virtual void area_add_shape(RID p_area, RID p_shape, const Transform &p_transform = Transform(), bool p_disabled = false);
-	virtual void area_set_shape(RID p_area, int p_shape_idx, RID p_shape);
-	virtual void area_set_shape_transform(RID p_area, int p_shape_idx, const Transform &p_transform);
-	virtual int area_get_shape_count(RID p_area) const;
-	virtual RID area_get_shape(RID p_area, int p_shape_idx) const;
-	virtual Transform area_get_shape_transform(RID p_area, int p_shape_idx) const;
-	virtual void area_remove_shape(RID p_area, int p_shape_idx);
-	virtual void area_clear_shapes(RID p_area);
-	virtual void area_set_shape_disabled(RID p_area, int p_shape_idx, bool p_disabled);
-	virtual void area_attach_object_instance_id(RID p_area, ObjectID p_id);
-	virtual ObjectID area_get_object_instance_id(RID p_area) const;
+	virtual void area_add_shape(RID p_area, RID p_shape, const Transform &p_transform = Transform(), bool p_disabled = false) override;
+	virtual void area_set_shape(RID p_area, int p_shape_idx, RID p_shape) override;
+	virtual void area_set_shape_transform(RID p_area, int p_shape_idx, const Transform &p_transform) override;
+	virtual int area_get_shape_count(RID p_area) const override;
+	virtual RID area_get_shape(RID p_area, int p_shape_idx) const override;
+	virtual Transform area_get_shape_transform(RID p_area, int p_shape_idx) const override;
+	virtual void area_remove_shape(RID p_area, int p_shape_idx) override;
+	virtual void area_clear_shapes(RID p_area) override;
+	virtual void area_set_shape_disabled(RID p_area, int p_shape_idx, bool p_disabled) override;
+	virtual void area_attach_object_instance_id(RID p_area, ObjectID p_id) override;
+	virtual ObjectID area_get_object_instance_id(RID p_area) const override;
 
 	/// If you pass as p_area the SpaceBullet you can set some parameters as specified below
 	/// AREA_PARAM_GRAVITY
 	/// AREA_PARAM_GRAVITY_VECTOR
 	/// Otherwise you can set area parameters
-	virtual void area_set_param(RID p_area, AreaParameter p_param, const Variant &p_value);
-	virtual Variant area_get_param(RID p_area, AreaParameter p_param) const;
+	virtual void area_set_param(RID p_area, AreaParameter p_param, const Variant &p_value) override;
+	virtual Variant area_get_param(RID p_area, AreaParameter p_param) const override;
 
-	virtual void area_set_transform(RID p_area, const Transform &p_transform);
-	virtual Transform area_get_transform(RID p_area) const;
+	virtual void area_set_transform(RID p_area, const Transform &p_transform) override;
+	virtual Transform area_get_transform(RID p_area) const override;
 
-	virtual void area_set_collision_mask(RID p_area, uint32_t p_mask);
-	virtual void area_set_collision_layer(RID p_area, uint32_t p_layer);
+	virtual void area_set_collision_mask(RID p_area, uint32_t p_mask) override;
+	virtual void area_set_collision_layer(RID p_area, uint32_t p_layer) override;
 
-	virtual void area_set_monitorable(RID p_area, bool p_monitorable);
-	virtual void area_set_monitor_callback(RID p_area, Object *p_receiver, const StringName &p_method);
-	virtual void area_set_area_monitor_callback(RID p_area, Object *p_receiver, const StringName &p_method);
-	virtual void area_set_ray_pickable(RID p_area, bool p_enable);
-	virtual bool area_is_ray_pickable(RID p_area) const;
+	virtual void area_set_monitorable(RID p_area, bool p_monitorable) override;
+	virtual void area_set_monitor_callback(RID p_area, Object *p_receiver, const StringName &p_method) override;
+	virtual void area_set_area_monitor_callback(RID p_area, Object *p_receiver, const StringName &p_method) override;
+	virtual void area_set_ray_pickable(RID p_area, bool p_enable) override;
+	virtual bool area_is_ray_pickable(RID p_area) const override;
 
 	/* RIGID BODY API */
 
-	virtual RID body_create(BodyMode p_mode = BODY_MODE_RIGID, bool p_init_sleeping = false);
+	virtual RID body_create(BodyMode p_mode = BODY_MODE_RIGID, bool p_init_sleeping = false) override;
 
-	virtual void body_set_space(RID p_body, RID p_space);
-	virtual RID body_get_space(RID p_body) const;
+	virtual void body_set_space(RID p_body, RID p_space) override;
+	virtual RID body_get_space(RID p_body) const override;
 
-	virtual void body_set_mode(RID p_body, BodyMode p_mode);
-	virtual BodyMode body_get_mode(RID p_body) const;
+	virtual void body_set_mode(RID p_body, BodyMode p_mode) override;
+	virtual BodyMode body_get_mode(RID p_body) const override;
 
-	virtual void body_add_shape(RID p_body, RID p_shape, const Transform &p_transform = Transform(), bool p_disabled = false);
+	virtual void body_add_shape(RID p_body, RID p_shape, const Transform &p_transform = Transform(), bool p_disabled = false) override;
 	// Not supported, Please remove and add new shape
-	virtual void body_set_shape(RID p_body, int p_shape_idx, RID p_shape);
-	virtual void body_set_shape_transform(RID p_body, int p_shape_idx, const Transform &p_transform);
+	virtual void body_set_shape(RID p_body, int p_shape_idx, RID p_shape) override;
+	virtual void body_set_shape_transform(RID p_body, int p_shape_idx, const Transform &p_transform) override;
 
-	virtual int body_get_shape_count(RID p_body) const;
-	virtual RID body_get_shape(RID p_body, int p_shape_idx) const;
-	virtual Transform body_get_shape_transform(RID p_body, int p_shape_idx) const;
+	virtual int body_get_shape_count(RID p_body) const override;
+	virtual RID body_get_shape(RID p_body, int p_shape_idx) const override;
+	virtual Transform body_get_shape_transform(RID p_body, int p_shape_idx) const override;
 
-	virtual void body_set_shape_disabled(RID p_body, int p_shape_idx, bool p_disabled);
+	virtual void body_set_shape_disabled(RID p_body, int p_shape_idx, bool p_disabled) override;
 
-	virtual void body_remove_shape(RID p_body, int p_shape_idx);
-	virtual void body_clear_shapes(RID p_body);
+	virtual void body_remove_shape(RID p_body, int p_shape_idx) override;
+	virtual void body_clear_shapes(RID p_body) override;
 
 	// Used for Rigid and Soft Bodies
-	virtual void body_attach_object_instance_id(RID p_body, uint32_t p_id);
-	virtual uint32_t body_get_object_instance_id(RID p_body) const;
+	virtual void body_attach_object_instance_id(RID p_body, ObjectID p_id) override;
+	virtual ObjectID body_get_object_instance_id(RID p_body) const override;
 
-	virtual void body_set_enable_continuous_collision_detection(RID p_body, bool p_enable);
-	virtual bool body_is_continuous_collision_detection_enabled(RID p_body) const;
+	virtual void body_set_enable_continuous_collision_detection(RID p_body, bool p_enable) override;
+	virtual bool body_is_continuous_collision_detection_enabled(RID p_body) const override;
 
-	virtual void body_set_collision_layer(RID p_body, uint32_t p_layer);
-	virtual uint32_t body_get_collision_layer(RID p_body) const;
+	virtual void body_set_collision_layer(RID p_body, uint32_t p_layer) override;
+	virtual uint32_t body_get_collision_layer(RID p_body) const override;
 
-	virtual void body_set_collision_mask(RID p_body, uint32_t p_mask);
-	virtual uint32_t body_get_collision_mask(RID p_body) const;
+	virtual void body_set_collision_mask(RID p_body, uint32_t p_mask) override;
+	virtual uint32_t body_get_collision_mask(RID p_body) const override;
 
 	/// This is not supported by physics server
-	virtual void body_set_user_flags(RID p_body, uint32_t p_flags);
+	virtual void body_set_user_flags(RID p_body, uint32_t p_flags) override;
 	/// This is not supported by physics server
-	virtual uint32_t body_get_user_flags(RID p_body) const;
+	virtual uint32_t body_get_user_flags(RID p_body) const override;
 
-	virtual void body_set_param(RID p_body, BodyParameter p_param, float p_value);
-	virtual float body_get_param(RID p_body, BodyParameter p_param) const;
+	virtual void body_set_param(RID p_body, BodyParameter p_param, float p_value) override;
+	virtual float body_get_param(RID p_body, BodyParameter p_param) const override;
 
-	virtual void body_set_kinematic_safe_margin(RID p_body, real_t p_margin);
-	virtual real_t body_get_kinematic_safe_margin(RID p_body) const;
+	virtual void body_set_kinematic_safe_margin(RID p_body, real_t p_margin) override;
+	virtual real_t body_get_kinematic_safe_margin(RID p_body) const override;
 
-	virtual void body_set_state(RID p_body, BodyState p_state, const Variant &p_variant);
-	virtual Variant body_get_state(RID p_body, BodyState p_state) const;
+	virtual void body_set_state(RID p_body, BodyState p_state, const Variant &p_variant) override;
+	virtual Variant body_get_state(RID p_body, BodyState p_state) const override;
 
-	virtual void body_set_applied_force(RID p_body, const Vector3 &p_force);
-	virtual Vector3 body_get_applied_force(RID p_body) const;
+	virtual void body_set_applied_force(RID p_body, const Vector3 &p_force) override;
+	virtual Vector3 body_get_applied_force(RID p_body) const override;
 
-	virtual void body_set_applied_torque(RID p_body, const Vector3 &p_torque);
-	virtual Vector3 body_get_applied_torque(RID p_body) const;
+	virtual void body_set_applied_torque(RID p_body, const Vector3 &p_torque) override;
+	virtual Vector3 body_get_applied_torque(RID p_body) const override;
 
-	virtual void body_add_central_force(RID p_body, const Vector3 &p_force);
-	virtual void body_add_force(RID p_body, const Vector3 &p_force, const Vector3 &p_pos);
-	virtual void body_add_torque(RID p_body, const Vector3 &p_torque);
+	virtual void body_add_central_force(RID p_body, const Vector3 &p_force) override;
+	virtual void body_add_force(RID p_body, const Vector3 &p_force, const Vector3 &p_position = Vector3()) override;
+	virtual void body_add_torque(RID p_body, const Vector3 &p_torque) override;
 
-	virtual void body_apply_central_impulse(RID p_body, const Vector3 &p_impulse);
-	virtual void body_apply_impulse(RID p_body, const Vector3 &p_pos, const Vector3 &p_impulse);
-	virtual void body_apply_torque_impulse(RID p_body, const Vector3 &p_impulse);
-	virtual void body_set_axis_velocity(RID p_body, const Vector3 &p_axis_velocity);
+	virtual void body_apply_central_impulse(RID p_body, const Vector3 &p_impulse) override;
+	virtual void body_apply_impulse(RID p_body, const Vector3 &p_impulse, const Vector3 &p_position = Vector3()) override;
+	virtual void body_apply_torque_impulse(RID p_body, const Vector3 &p_impulse) override;
+	virtual void body_set_axis_velocity(RID p_body, const Vector3 &p_axis_velocity) override;
 
-	virtual void body_set_axis_lock(RID p_body, BodyAxis p_axis, bool p_lock);
-	virtual bool body_is_axis_locked(RID p_body, BodyAxis p_axis) const;
+	virtual void body_set_axis_lock(RID p_body, BodyAxis p_axis, bool p_lock) override;
+	virtual bool body_is_axis_locked(RID p_body, BodyAxis p_axis) const override;
 
-	virtual void body_add_collision_exception(RID p_body, RID p_body_b);
-	virtual void body_remove_collision_exception(RID p_body, RID p_body_b);
-	virtual void body_get_collision_exceptions(RID p_body, List<RID> *p_exceptions);
+	virtual void body_add_collision_exception(RID p_body, RID p_body_b) override;
+	virtual void body_remove_collision_exception(RID p_body, RID p_body_b) override;
+	virtual void body_get_collision_exceptions(RID p_body, List<RID> *p_exceptions) override;
 
-	virtual void body_set_max_contacts_reported(RID p_body, int p_contacts);
-	virtual int body_get_max_contacts_reported(RID p_body) const;
+	virtual void body_set_max_contacts_reported(RID p_body, int p_contacts) override;
+	virtual int body_get_max_contacts_reported(RID p_body) const override;
 
-	virtual void body_set_contacts_reported_depth_threshold(RID p_body, float p_threshold);
-	virtual float body_get_contacts_reported_depth_threshold(RID p_body) const;
+	virtual void body_set_contacts_reported_depth_threshold(RID p_body, float p_threshold) override;
+	virtual float body_get_contacts_reported_depth_threshold(RID p_body) const override;
 
-	virtual void body_set_omit_force_integration(RID p_body, bool p_omit);
-	virtual bool body_is_omitting_force_integration(RID p_body) const;
+	virtual void body_set_omit_force_integration(RID p_body, bool p_omit) override;
+	virtual bool body_is_omitting_force_integration(RID p_body) const override;
 
-	virtual void body_set_force_integration_callback(RID p_body, Object *p_receiver, const StringName &p_method, const Variant &p_udata = Variant());
+	virtual void body_set_force_integration_callback(RID p_body, Object *p_receiver, const StringName &p_method, const Variant &p_udata = Variant()) override;
 
-	virtual void body_set_ray_pickable(RID p_body, bool p_enable);
-	virtual bool body_is_ray_pickable(RID p_body) const;
+	virtual void body_set_ray_pickable(RID p_body, bool p_enable) override;
+	virtual bool body_is_ray_pickable(RID p_body) const override;
 
 	// this function only works on physics process, errors and returns null otherwise
-	virtual PhysicsDirectBodyState *body_get_direct_state(RID p_body);
+	virtual PhysicsDirectBodyState3D *body_get_direct_state(RID p_body) override;
 
-	virtual bool body_test_motion(RID p_body, const Transform &p_from, const Vector3 &p_motion, bool p_infinite_inertia, MotionResult *r_result = NULL, bool p_exclude_raycast_shapes = true);
-	virtual int body_test_ray_separation(RID p_body, const Transform &p_transform, bool p_infinite_inertia, Vector3 &r_recover_motion, SeparationResult *r_results, int p_result_max, float p_margin = 0.001);
+	virtual bool body_test_motion(RID p_body, const Transform &p_from, const Vector3 &p_motion, bool p_infinite_inertia, MotionResult *r_result = nullptr, bool p_exclude_raycast_shapes = true) override;
+	virtual int body_test_ray_separation(RID p_body, const Transform &p_transform, bool p_infinite_inertia, Vector3 &r_recover_motion, SeparationResult *r_results, int p_result_max, float p_margin = 0.001) override;
 
 	/* SOFT BODY API */
 
-	virtual RID soft_body_create(bool p_init_sleeping = false);
+	virtual RID soft_body_create(bool p_init_sleeping = false) override;
 
-	virtual void soft_body_update_visual_server(RID p_body, class SoftBodyVisualServerHandler *p_visual_server_handler);
+	virtual void soft_body_update_rendering_server(RID p_body, class SoftBodyRenderingServerHandler *p_rendering_server_handler) override;
 
-	virtual void soft_body_set_space(RID p_body, RID p_space);
-	virtual RID soft_body_get_space(RID p_body) const;
+	virtual void soft_body_set_space(RID p_body, RID p_space) override;
+	virtual RID soft_body_get_space(RID p_body) const override;
 
-	virtual void soft_body_set_mesh(RID p_body, const REF &p_mesh);
+	virtual void soft_body_set_mesh(RID p_body, const REF &p_mesh) override;
 
-	virtual void soft_body_set_collision_layer(RID p_body, uint32_t p_layer);
-	virtual uint32_t soft_body_get_collision_layer(RID p_body) const;
+	virtual void soft_body_set_collision_layer(RID p_body, uint32_t p_layer) override;
+	virtual uint32_t soft_body_get_collision_layer(RID p_body) const override;
 
-	virtual void soft_body_set_collision_mask(RID p_body, uint32_t p_mask);
-	virtual uint32_t soft_body_get_collision_mask(RID p_body) const;
+	virtual void soft_body_set_collision_mask(RID p_body, uint32_t p_mask) override;
+	virtual uint32_t soft_body_get_collision_mask(RID p_body) const override;
 
-	virtual void soft_body_add_collision_exception(RID p_body, RID p_body_b);
-	virtual void soft_body_remove_collision_exception(RID p_body, RID p_body_b);
-	virtual void soft_body_get_collision_exceptions(RID p_body, List<RID> *p_exceptions);
+	virtual void soft_body_add_collision_exception(RID p_body, RID p_body_b) override;
+	virtual void soft_body_remove_collision_exception(RID p_body, RID p_body_b) override;
+	virtual void soft_body_get_collision_exceptions(RID p_body, List<RID> *p_exceptions) override;
 
-	virtual void soft_body_set_state(RID p_body, BodyState p_state, const Variant &p_variant);
-	virtual Variant soft_body_get_state(RID p_body, BodyState p_state) const;
+	virtual void soft_body_set_state(RID p_body, BodyState p_state, const Variant &p_variant) override;
+	virtual Variant soft_body_get_state(RID p_body, BodyState p_state) const override;
 
 	/// Special function. This function has bad performance
-	virtual void soft_body_set_transform(RID p_body, const Transform &p_transform);
-	virtual Vector3 soft_body_get_vertex_position(RID p_body, int vertex_index) const;
+	virtual void soft_body_set_transform(RID p_body, const Transform &p_transform) override;
+	virtual Vector3 soft_body_get_vertex_position(RID p_body, int vertex_index) const override;
 
-	virtual void soft_body_set_ray_pickable(RID p_body, bool p_enable);
-	virtual bool soft_body_is_ray_pickable(RID p_body) const;
+	virtual void soft_body_set_ray_pickable(RID p_body, bool p_enable) override;
+	virtual bool soft_body_is_ray_pickable(RID p_body) const override;
 
-	virtual void soft_body_set_simulation_precision(RID p_body, int p_simulation_precision);
-	virtual int soft_body_get_simulation_precision(RID p_body);
+	virtual void soft_body_set_simulation_precision(RID p_body, int p_simulation_precision) override;
+	virtual int soft_body_get_simulation_precision(RID p_body) override;
 
-	virtual void soft_body_set_total_mass(RID p_body, real_t p_total_mass);
-	virtual real_t soft_body_get_total_mass(RID p_body);
+	virtual void soft_body_set_total_mass(RID p_body, real_t p_total_mass) override;
+	virtual real_t soft_body_get_total_mass(RID p_body) override;
 
-	virtual void soft_body_set_linear_stiffness(RID p_body, real_t p_stiffness);
-	virtual real_t soft_body_get_linear_stiffness(RID p_body);
+	virtual void soft_body_set_linear_stiffness(RID p_body, real_t p_stiffness) override;
+	virtual real_t soft_body_get_linear_stiffness(RID p_body) override;
 
-	virtual void soft_body_set_areaAngular_stiffness(RID p_body, real_t p_stiffness);
-	virtual real_t soft_body_get_areaAngular_stiffness(RID p_body);
+	virtual void soft_body_set_areaAngular_stiffness(RID p_body, real_t p_stiffness) override;
+	virtual real_t soft_body_get_areaAngular_stiffness(RID p_body) override;
 
-	virtual void soft_body_set_volume_stiffness(RID p_body, real_t p_stiffness);
-	virtual real_t soft_body_get_volume_stiffness(RID p_body);
+	virtual void soft_body_set_volume_stiffness(RID p_body, real_t p_stiffness) override;
+	virtual real_t soft_body_get_volume_stiffness(RID p_body) override;
 
-	virtual void soft_body_set_pressure_coefficient(RID p_body, real_t p_pressure_coefficient);
-	virtual real_t soft_body_get_pressure_coefficient(RID p_body);
+	virtual void soft_body_set_pressure_coefficient(RID p_body, real_t p_pressure_coefficient) override;
+	virtual real_t soft_body_get_pressure_coefficient(RID p_body) override;
 
-	virtual void soft_body_set_pose_matching_coefficient(RID p_body, real_t p_pose_matching_coefficient);
-	virtual real_t soft_body_get_pose_matching_coefficient(RID p_body);
+	virtual void soft_body_set_pose_matching_coefficient(RID p_body, real_t p_pose_matching_coefficient) override;
+	virtual real_t soft_body_get_pose_matching_coefficient(RID p_body) override;
 
-	virtual void soft_body_set_damping_coefficient(RID p_body, real_t p_damping_coefficient);
-	virtual real_t soft_body_get_damping_coefficient(RID p_body);
+	virtual void soft_body_set_damping_coefficient(RID p_body, real_t p_damping_coefficient) override;
+	virtual real_t soft_body_get_damping_coefficient(RID p_body) override;
 
-	virtual void soft_body_set_drag_coefficient(RID p_body, real_t p_drag_coefficient);
-	virtual real_t soft_body_get_drag_coefficient(RID p_body);
+	virtual void soft_body_set_drag_coefficient(RID p_body, real_t p_drag_coefficient) override;
+	virtual real_t soft_body_get_drag_coefficient(RID p_body) override;
 
-	virtual void soft_body_move_point(RID p_body, int p_point_index, const Vector3 &p_global_position);
-	virtual Vector3 soft_body_get_point_global_position(RID p_body, int p_point_index);
+	virtual void soft_body_move_point(RID p_body, int p_point_index, const Vector3 &p_global_position) override;
+	virtual Vector3 soft_body_get_point_global_position(RID p_body, int p_point_index) override;
 
-	virtual Vector3 soft_body_get_point_offset(RID p_body, int p_point_index) const;
+	virtual Vector3 soft_body_get_point_offset(RID p_body, int p_point_index) const override;
 
-	virtual void soft_body_remove_all_pinned_points(RID p_body);
-	virtual void soft_body_pin_point(RID p_body, int p_point_index, bool p_pin);
-	virtual bool soft_body_is_point_pinned(RID p_body, int p_point_index);
+	virtual void soft_body_remove_all_pinned_points(RID p_body) override;
+	virtual void soft_body_pin_point(RID p_body, int p_point_index, bool p_pin) override;
+	virtual bool soft_body_is_point_pinned(RID p_body, int p_point_index) override;
 
 	/* JOINT API */
 
-	virtual JointType joint_get_type(RID p_joint) const;
+	virtual JointType joint_get_type(RID p_joint) const override;
 
-	virtual void joint_set_solver_priority(RID p_joint, int p_priority);
-	virtual int joint_get_solver_priority(RID p_joint) const;
+	virtual void joint_set_solver_priority(RID p_joint, int p_priority) override;
+	virtual int joint_get_solver_priority(RID p_joint) const override;
 
-	virtual void joint_disable_collisions_between_bodies(RID p_joint, const bool p_disable);
-	virtual bool joint_is_disabled_collisions_between_bodies(RID p_joint) const;
+	virtual void joint_disable_collisions_between_bodies(RID p_joint, const bool p_disable) override;
+	virtual bool joint_is_disabled_collisions_between_bodies(RID p_joint) const override;
 
-	virtual RID joint_create_pin(RID p_body_A, const Vector3 &p_local_A, RID p_body_B, const Vector3 &p_local_B);
+	virtual RID joint_create_pin(RID p_body_A, const Vector3 &p_local_A, RID p_body_B, const Vector3 &p_local_B) override;
 
-	virtual void pin_joint_set_param(RID p_joint, PinJointParam p_param, float p_value);
-	virtual float pin_joint_get_param(RID p_joint, PinJointParam p_param) const;
+	virtual void pin_joint_set_param(RID p_joint, PinJointParam p_param, float p_value) override;
+	virtual float pin_joint_get_param(RID p_joint, PinJointParam p_param) const override;
 
-	virtual void pin_joint_set_local_a(RID p_joint, const Vector3 &p_A);
-	virtual Vector3 pin_joint_get_local_a(RID p_joint) const;
+	virtual void pin_joint_set_local_a(RID p_joint, const Vector3 &p_A) override;
+	virtual Vector3 pin_joint_get_local_a(RID p_joint) const override;
 
-	virtual void pin_joint_set_local_b(RID p_joint, const Vector3 &p_B);
-	virtual Vector3 pin_joint_get_local_b(RID p_joint) const;
+	virtual void pin_joint_set_local_b(RID p_joint, const Vector3 &p_B) override;
+	virtual Vector3 pin_joint_get_local_b(RID p_joint) const override;
 
-	virtual RID joint_create_hinge(RID p_body_A, const Transform &p_hinge_A, RID p_body_B, const Transform &p_hinge_B);
-	virtual RID joint_create_hinge_simple(RID p_body_A, const Vector3 &p_pivot_A, const Vector3 &p_axis_A, RID p_body_B, const Vector3 &p_pivot_B, const Vector3 &p_axis_B);
+	virtual RID joint_create_hinge(RID p_body_A, const Transform &p_hinge_A, RID p_body_B, const Transform &p_hinge_B) override;
+	virtual RID joint_create_hinge_simple(RID p_body_A, const Vector3 &p_pivot_A, const Vector3 &p_axis_A, RID p_body_B, const Vector3 &p_pivot_B, const Vector3 &p_axis_B) override;
 
-	virtual void hinge_joint_set_param(RID p_joint, HingeJointParam p_param, float p_value);
-	virtual float hinge_joint_get_param(RID p_joint, HingeJointParam p_param) const;
+	virtual void hinge_joint_set_param(RID p_joint, HingeJointParam p_param, float p_value) override;
+	virtual float hinge_joint_get_param(RID p_joint, HingeJointParam p_param) const override;
 
-	virtual void hinge_joint_set_flag(RID p_joint, HingeJointFlag p_flag, bool p_value);
-	virtual bool hinge_joint_get_flag(RID p_joint, HingeJointFlag p_flag) const;
+	virtual void hinge_joint_set_flag(RID p_joint, HingeJointFlag p_flag, bool p_value) override;
+	virtual bool hinge_joint_get_flag(RID p_joint, HingeJointFlag p_flag) const override;
 
 	/// Reference frame is A
-	virtual RID joint_create_slider(RID p_body_A, const Transform &p_local_frame_A, RID p_body_B, const Transform &p_local_frame_B);
+	virtual RID joint_create_slider(RID p_body_A, const Transform &p_local_frame_A, RID p_body_B, const Transform &p_local_frame_B) override;
 
-	virtual void slider_joint_set_param(RID p_joint, SliderJointParam p_param, float p_value);
-	virtual float slider_joint_get_param(RID p_joint, SliderJointParam p_param) const;
+	virtual void slider_joint_set_param(RID p_joint, SliderJointParam p_param, float p_value) override;
+	virtual float slider_joint_get_param(RID p_joint, SliderJointParam p_param) const override;
 
 	/// Reference frame is A
-	virtual RID joint_create_cone_twist(RID p_body_A, const Transform &p_local_frame_A, RID p_body_B, const Transform &p_local_frame_B);
+	virtual RID joint_create_cone_twist(RID p_body_A, const Transform &p_local_frame_A, RID p_body_B, const Transform &p_local_frame_B) override;
 
-	virtual void cone_twist_joint_set_param(RID p_joint, ConeTwistJointParam p_param, float p_value);
-	virtual float cone_twist_joint_get_param(RID p_joint, ConeTwistJointParam p_param) const;
+	virtual void cone_twist_joint_set_param(RID p_joint, ConeTwistJointParam p_param, float p_value) override;
+	virtual float cone_twist_joint_get_param(RID p_joint, ConeTwistJointParam p_param) const override;
 
 	/// Reference frame is A
-	virtual RID joint_create_generic_6dof(RID p_body_A, const Transform &p_local_frame_A, RID p_body_B, const Transform &p_local_frame_B);
+	virtual RID joint_create_generic_6dof(RID p_body_A, const Transform &p_local_frame_A, RID p_body_B, const Transform &p_local_frame_B) override;
 
-	virtual void generic_6dof_joint_set_param(RID p_joint, Vector3::Axis p_axis, G6DOFJointAxisParam p_param, float p_value);
-	virtual float generic_6dof_joint_get_param(RID p_joint, Vector3::Axis p_axis, G6DOFJointAxisParam p_param);
+	virtual void generic_6dof_joint_set_param(RID p_joint, Vector3::Axis p_axis, G6DOFJointAxisParam p_param, float p_value) override;
+	virtual float generic_6dof_joint_get_param(RID p_joint, Vector3::Axis p_axis, G6DOFJointAxisParam p_param) override;
 
-	virtual void generic_6dof_joint_set_flag(RID p_joint, Vector3::Axis p_axis, G6DOFJointAxisFlag p_flag, bool p_enable);
-	virtual bool generic_6dof_joint_get_flag(RID p_joint, Vector3::Axis p_axis, G6DOFJointAxisFlag p_flag);
+	virtual void generic_6dof_joint_set_flag(RID p_joint, Vector3::Axis p_axis, G6DOFJointAxisFlag p_flag, bool p_enable) override;
+	virtual bool generic_6dof_joint_get_flag(RID p_joint, Vector3::Axis p_axis, G6DOFJointAxisFlag p_flag) override;
 
-	virtual void generic_6dof_joint_set_precision(RID p_joint, int precision);
-	virtual int generic_6dof_joint_get_precision(RID p_joint);
+	virtual void generic_6dof_joint_set_precision(RID p_joint, int precision) override;
+	virtual int generic_6dof_joint_get_precision(RID p_joint) override;
 
 	/* MISC */
 
-	virtual void free(RID p_rid);
+	virtual void free(RID p_rid) override;
 
-	virtual void set_active(bool p_active) {
+	virtual void set_active(bool p_active) override {
 		active = p_active;
 	}
 
 	static bool singleton_isActive() {
-		return static_cast<BulletPhysicsServer *>(get_singleton())->active;
+		return static_cast<BulletPhysicsServer3D *>(get_singleton())->active;
 	}
 
 	bool isActive() {
 		return active;
 	}
 
-	virtual void init();
-	virtual void step(float p_deltaTime);
-	virtual void sync();
-	virtual void flush_queries();
-	virtual void finish();
+	virtual void init() override;
+	virtual void step(float p_deltaTime) override;
+	virtual void sync() override;
+	virtual void flush_queries() override;
+	virtual void finish() override;
 
-	virtual bool is_flushing_queries() const { return false; }
+	virtual bool is_flushing_queries() const override { return false; }
 
-	virtual int get_process_info(ProcessInfo p_info);
+	virtual int get_process_info(ProcessInfo p_info) override;
 
-	CollisionObjectBullet *get_collisin_object(RID p_object) const;
-	RigidCollisionObjectBullet *get_rigid_collisin_object(RID p_object) const;
-
-	/// Internal APIs
-public:
+	SpaceBullet *get_space(RID p_rid) const;
+	ShapeBullet *get_shape(RID p_rid) const;
+	CollisionObjectBullet *get_collision_object(RID p_object) const;
+	RigidCollisionObjectBullet *get_rigid_collision_object(RID p_object) const;
+	JointBullet *get_joint(RID p_rid) const;
 };
 
 #endif
diff --git a/modules/bullet/bullet_types_converter.cpp b/modules/bullet/bullet_types_converter.cpp
index c9493d8892..7ecad9b78a 100644
--- a/modules/bullet/bullet_types_converter.cpp
+++ b/modules/bullet/bullet_types_converter.cpp
@@ -95,12 +95,61 @@ void G_TO_B(Transform const &inVal, btTransform &outVal) {
 }
 
 void UNSCALE_BT_BASIS(btTransform &scaledBasis) {
-	btMatrix3x3 &m(scaledBasis.getBasis());
-	btVector3 column0(m[0][0], m[1][0], m[2][0]);
-	btVector3 column1(m[0][1], m[1][1], m[2][1]);
-	btVector3 column2(m[0][2], m[1][2], m[2][2]);
+	btMatrix3x3 &basis(scaledBasis.getBasis());
+	btVector3 column0 = basis.getColumn(0);
+	btVector3 column1 = basis.getColumn(1);
+	btVector3 column2 = basis.getColumn(2);
+
+	// Check for zero scaling.
+	if (btFuzzyZero(column0[0])) {
+		if (btFuzzyZero(column1[1])) {
+			if (btFuzzyZero(column2[2])) {
+				// All dimensions are fuzzy zero. Create a default basis.
+				column0 = btVector3(1, 0, 0);
+				column1 = btVector3(0, 1, 0);
+				column2 = btVector3(0, 0, 1);
+			} else { // Column 2 scale not fuzzy zero.
+				// Create two vectors orthogonal to row 2.
+				// Ensure that a default basis is created if row 2 = <0, 0, 1>
+				column1 = btVector3(0, column2[2], -column2[1]);
+				column0 = column1.cross(column2);
+			}
+		} else { // Column 1 scale not fuzzy zero.
+			if (btFuzzyZero(column2[2])) {
+				// Create two vectors othogonal to column 1.
+				// Ensure that a default basis is created if column 1 = <0, 1, 0>
+				column0 = btVector3(column1[1], -column1[0], 0);
+				column2 = column0.cross(column1);
+			} else { // Column 1 and column 2 scales not fuzzy zero.
+				// Create column 0 orthogonal to column 1 and column 2.
+				column0 = column1.cross(column2);
+			}
+		}
+	} else { // Column 0 scale not fuzzy zero.
+		if (btFuzzyZero(column1[1])) {
+			if (btFuzzyZero(column2[2])) {
+				// Create two vectors orthogonal to column 0.
+				// Ensure that a default basis is created if column 0 = <1, 0, 0>
+				column2 = btVector3(-column0[2], 0, column0[0]);
+				column1 = column2.cross(column0);
+			} else { // Column 0 and column 2 scales not fuzzy zero.
+				// Create column 1 orthogonal to column 0 and column 2.
+				column1 = column2.cross(column0);
+			}
+		} else { // Column 0 and column 1 scales not fuzzy zero.
+			if (btFuzzyZero(column2[2])) {
+				// Create column 2 orthogonal to column 0 and column 1.
+				column2 = column0.cross(column1);
+			}
+		}
+	}
+
+	// Normalize
 	column0.normalize();
 	column1.normalize();
 	column2.normalize();
-	m.setValue(column0[0], column1[0], column2[0], column0[1], column1[1], column2[1], column0[2], column1[2], column2[2]);
+
+	basis.setValue(column0[0], column1[0], column2[0],
+			column0[1], column1[1], column2[1],
+			column0[2], column1[2], column2[2]);
 }
diff --git a/modules/bullet/bullet_utilities.h b/modules/bullet/bullet_utilities.h
index 968cb38ba2..a5e33d9829 100644
--- a/modules/bullet/bullet_utilities.h
+++ b/modules/bullet/bullet_utilities.h
@@ -41,6 +41,6 @@
 #define bulletdelete(cl) \
 	{                    \
 		delete cl;       \
-		cl = NULL;       \
+		cl = nullptr;    \
 	}
 #endif
diff --git a/modules/bullet/collision_object_bullet.cpp b/modules/bullet/collision_object_bullet.cpp
index c916c65d2b..660e9afc5e 100644
--- a/modules/bullet/collision_object_bullet.cpp
+++ b/modules/bullet/collision_object_bullet.cpp
@@ -60,7 +60,7 @@ void CollisionObjectBullet::ShapeWrapper::set_transform(const btTransform &p_tra
 }
 
 btTransform CollisionObjectBullet::ShapeWrapper::get_adjusted_transform() const {
-	if (shape->get_type() == PhysicsServer::SHAPE_HEIGHTMAP) {
+	if (shape->get_type() == PhysicsServer3D::SHAPE_HEIGHTMAP) {
 		const HeightMapShapeBullet *hm_shape = (const HeightMapShapeBullet *)shape; // should be safe to cast now
 		btTransform adjusted_transform;
 
@@ -79,28 +79,25 @@ btTransform CollisionObjectBullet::ShapeWrapper::get_adjusted_transform() const
 }
 
 void CollisionObjectBullet::ShapeWrapper::claim_bt_shape(const btVector3 &body_scale) {
-	if (!bt_shape) {
-		if (active)
+	if (bt_shape == nullptr) {
+		if (active) {
 			bt_shape = shape->create_bt_shape(scale * body_scale);
-		else
+		} else {
 			bt_shape = ShapeBullet::create_shape_empty();
+		}
+	}
+}
+
+void CollisionObjectBullet::ShapeWrapper::release_bt_shape() {
+	if (bt_shape != nullptr) {
+		shape->destroy_bt_shape(bt_shape);
+		bt_shape = nullptr;
 	}
 }
 
 CollisionObjectBullet::CollisionObjectBullet(Type p_type) :
 		RIDBullet(),
-		type(p_type),
-		instance_id(0),
-		collisionLayer(0),
-		collisionMask(0),
-		collisionsEnabled(true),
-		m_isStatic(false),
-		ray_pickable(false),
-		bt_collision_object(NULL),
-		body_scale(1., 1., 1.),
-		force_shape_reset(false),
-		space(NULL),
-		isTransformChanged(false) {}
+		type(p_type) {}
 
 CollisionObjectBullet::~CollisionObjectBullet() {
 	// Remove all overlapping, notify is not required since godot take care of it
@@ -147,24 +144,43 @@ void CollisionObjectBullet::setupBulletCollisionObject(btCollisionObject *p_coll
 
 void CollisionObjectBullet::add_collision_exception(const CollisionObjectBullet *p_ignoreCollisionObject) {
 	exceptions.insert(p_ignoreCollisionObject->get_self());
-	if (!bt_collision_object)
+	if (!bt_collision_object) {
 		return;
+	}
 	bt_collision_object->setIgnoreCollisionCheck(p_ignoreCollisionObject->bt_collision_object, true);
-	if (space)
+	if (space) {
 		space->get_broadphase()->getOverlappingPairCache()->cleanProxyFromPairs(bt_collision_object->getBroadphaseHandle(), space->get_dispatcher());
+	}
 }
 
 void CollisionObjectBullet::remove_collision_exception(const CollisionObjectBullet *p_ignoreCollisionObject) {
 	exceptions.erase(p_ignoreCollisionObject->get_self());
 	bt_collision_object->setIgnoreCollisionCheck(p_ignoreCollisionObject->bt_collision_object, false);
-	if (space)
+	if (space) {
 		space->get_broadphase()->getOverlappingPairCache()->cleanProxyFromPairs(bt_collision_object->getBroadphaseHandle(), space->get_dispatcher());
+	}
 }
 
 bool CollisionObjectBullet::has_collision_exception(const CollisionObjectBullet *p_otherCollisionObject) const {
 	return !bt_collision_object->checkCollideWith(p_otherCollisionObject->bt_collision_object);
 }
 
+void CollisionObjectBullet::reload_body() {
+	needs_body_reload = true;
+}
+
+void CollisionObjectBullet::dispatch_callbacks() {}
+
+void CollisionObjectBullet::pre_process() {
+	if (needs_body_reload) {
+		do_reload_body();
+	} else if (needs_collision_filters_reload) {
+		do_reload_collision_filters();
+	}
+	needs_body_reload = false;
+	needs_collision_filters_reload = false;
+}
+
 void CollisionObjectBullet::set_collision_enabled(bool p_enabled) {
 	collisionsEnabled = p_enabled;
 	if (collisionsEnabled) {
@@ -195,7 +211,6 @@ int CollisionObjectBullet::get_godot_object_flags() const {
 }
 
 void CollisionObjectBullet::set_transform(const Transform &p_global_transform) {
-
 	set_body_scale(p_global_transform.basis.get_scale_abs());
 
 	btTransform bt_transform;
@@ -225,11 +240,6 @@ void CollisionObjectBullet::notify_transform_changed() {
 	isTransformChanged = true;
 }
 
-RigidCollisionObjectBullet::RigidCollisionObjectBullet(Type p_type) :
-		CollisionObjectBullet(p_type),
-		mainShape(NULL) {
-}
-
 RigidCollisionObjectBullet::~RigidCollisionObjectBullet() {
 	remove_all_shapes(true, true);
 	if (mainShape && mainShape->isCompound()) {
@@ -244,7 +254,7 @@ void RigidCollisionObjectBullet::add_shape(ShapeBullet *p_shape, const Transform
 }
 
 void RigidCollisionObjectBullet::set_shape(int p_index, ShapeBullet *p_shape) {
-	ShapeWrapper &shp = shapes.write[p_index];
+	ShapeWrapper &shp = shapes[p_index];
 	shp.shape->remove_owner(this);
 	p_shape->add_owner(this);
 	shp.shape = p_shape;
@@ -266,8 +276,9 @@ btCollisionShape *RigidCollisionObjectBullet::get_bt_shape(int p_index) const {
 int RigidCollisionObjectBullet::find_shape(ShapeBullet *p_shape) const {
 	const int size = shapes.size();
 	for (int i = 0; i < size; ++i) {
-		if (shapes[i].shape == p_shape)
+		if (shapes[i].shape == p_shape) {
 			return i;
+		}
 	}
 	return -1;
 }
@@ -297,14 +308,15 @@ void RigidCollisionObjectBullet::remove_all_shapes(bool p_permanentlyFromThisBod
 		internal_shape_destroy(i, p_permanentlyFromThisBody);
 	}
 	shapes.clear();
-	if (!p_force_not_reload)
+	if (!p_force_not_reload) {
 		reload_shapes();
+	}
 }
 
 void RigidCollisionObjectBullet::set_shape_transform(int p_index, const Transform &p_transform) {
 	ERR_FAIL_INDEX(p_index, get_shape_count());
 
-	shapes.write[p_index].set_transform(p_transform);
+	shapes[p_index].set_transform(p_transform);
 	shape_changed(p_index);
 }
 
@@ -319,9 +331,10 @@ Transform RigidCollisionObjectBullet::get_shape_transform(int p_index) const {
 }
 
 void RigidCollisionObjectBullet::set_shape_disabled(int p_index, bool p_disabled) {
-	if (shapes[p_index].active != p_disabled)
+	if (shapes[p_index].active != p_disabled) {
 		return;
-	shapes.write[p_index].active = !p_disabled;
+	}
+	shapes[p_index].active = !p_disabled;
 	shape_changed(p_index);
 }
 
@@ -329,59 +342,67 @@ bool RigidCollisionObjectBullet::is_shape_disabled(int p_index) {
 	return !shapes[p_index].active;
 }
 
+void RigidCollisionObjectBullet::pre_process() {
+	if (need_shape_reload) {
+		do_reload_shapes();
+		need_shape_reload = false;
+	}
+	CollisionObjectBullet::pre_process();
+}
+
 void RigidCollisionObjectBullet::shape_changed(int p_shape_index) {
-	ShapeWrapper &shp = shapes.write[p_shape_index];
+	ShapeWrapper &shp = shapes[p_shape_index];
 	if (shp.bt_shape == mainShape) {
-		mainShape = NULL;
+		mainShape = nullptr;
 	}
-	bulletdelete(shp.bt_shape);
+	shp.release_bt_shape();
 	reload_shapes();
 }
 
 void RigidCollisionObjectBullet::reload_shapes() {
+	need_shape_reload = true;
+}
 
+void RigidCollisionObjectBullet::do_reload_shapes() {
 	if (mainShape && mainShape->isCompound()) {
 		// Destroy compound
 		bulletdelete(mainShape);
 	}
 
-	mainShape = NULL;
+	mainShape = nullptr;
 
-	ShapeWrapper *shpWrapper;
 	const int shape_count = shapes.size();
 
-	// Reset shape if required
+	// Reset all shapes if required
 	if (force_shape_reset) {
 		for (int i(0); i < shape_count; ++i) {
-			shpWrapper = &shapes.write[i];
-			bulletdelete(shpWrapper->bt_shape);
+			shapes[i].release_bt_shape();
 		}
 		force_shape_reset = false;
 	}
 
 	const btVector3 body_scale(get_bt_body_scale());
 
-	// Try to optimize by not using compound
 	if (1 == shape_count) {
-		shpWrapper = &shapes.write[0];
-		btTransform transform = shpWrapper->get_adjusted_transform();
+		// Is it possible to optimize by not using compound?
+		btTransform transform = shapes[0].get_adjusted_transform();
 		if (transform.getOrigin().isZero() && transform.getBasis() == transform.getBasis().getIdentity()) {
-			shpWrapper->claim_bt_shape(body_scale);
-			mainShape = shpWrapper->bt_shape;
+			shapes[0].claim_bt_shape(body_scale);
+			mainShape = shapes[0].bt_shape;
 			main_shape_changed();
+			// Nothing more to do
 			return;
 		}
 	}
 
-	// Optimization not possible use a compound shape
+	// Optimization not possible use a compound shape.
 	btCompoundShape *compoundShape = bulletnew(btCompoundShape(enableDynamicAabbTree, shape_count));
 
 	for (int i(0); i < shape_count; ++i) {
-		shpWrapper = &shapes.write[i];
-		shpWrapper->claim_bt_shape(body_scale);
-		btTransform scaled_shape_transform(shpWrapper->get_adjusted_transform());
+		shapes[i].claim_bt_shape(body_scale);
+		btTransform scaled_shape_transform(shapes[i].get_adjusted_transform());
 		scaled_shape_transform.getOrigin() *= body_scale;
-		compoundShape->addChildShape(scaled_shape_transform, shpWrapper->bt_shape);
+		compoundShape->addChildShape(scaled_shape_transform, shapes[i].bt_shape);
 	}
 
 	compoundShape->recalculateLocalAabb();
@@ -395,10 +416,10 @@ void RigidCollisionObjectBullet::body_scale_changed() {
 }
 
 void RigidCollisionObjectBullet::internal_shape_destroy(int p_index, bool p_permanentlyFromThisBody) {
-	ShapeWrapper &shp = shapes.write[p_index];
+	ShapeWrapper &shp = shapes[p_index];
 	shp.shape->remove_owner(this, p_permanentlyFromThisBody);
 	if (shp.bt_shape == mainShape) {
-		mainShape = NULL;
+		mainShape = nullptr;
 	}
-	bulletdelete(shp.bt_shape);
+	shp.release_bt_shape();
 }
diff --git a/modules/bullet/collision_object_bullet.h b/modules/bullet/collision_object_bullet.h
index 42ba4aa907..920d80af23 100644
--- a/modules/bullet/collision_object_bullet.h
+++ b/modules/bullet/collision_object_bullet.h
@@ -31,6 +31,7 @@
 #ifndef COLLISION_OBJECT_BULLET_H
 #define COLLISION_OBJECT_BULLET_H
 
+#include "core/local_vector.h"
 #include "core/math/transform.h"
 #include "core/math/vector3.h"
 #include "core/object.h"
@@ -69,27 +70,23 @@ public:
 	};
 
 	struct ShapeWrapper {
-		ShapeBullet *shape;
-		btCollisionShape *bt_shape;
+		ShapeBullet *shape = nullptr;
 		btTransform transform;
 		btVector3 scale;
-		bool active;
+		bool active = true;
+		btCollisionShape *bt_shape = nullptr;
 
-		ShapeWrapper() :
-				shape(NULL),
-				bt_shape(NULL),
-				active(true) {}
+	public:
+		ShapeWrapper() {}
 
 		ShapeWrapper(ShapeBullet *p_shape, const btTransform &p_transform, bool p_active) :
 				shape(p_shape),
-				bt_shape(NULL),
 				active(p_active) {
 			set_transform(p_transform);
 		}
 
 		ShapeWrapper(ShapeBullet *p_shape, const Transform &p_transform, bool p_active) :
 				shape(p_shape),
-				bt_shape(NULL),
 				active(p_active) {
 			set_transform(p_transform);
 		}
@@ -112,28 +109,36 @@ public:
 		btTransform get_adjusted_transform() const;
 
 		void claim_bt_shape(const btVector3 &body_scale);
+		void release_bt_shape();
 	};
 
 protected:
 	Type type;
 	ObjectID instance_id;
-	uint32_t collisionLayer;
-	uint32_t collisionMask;
-	bool collisionsEnabled;
-	bool m_isStatic;
-	bool ray_pickable;
-	btCollisionObject *bt_collision_object;
-	Vector3 body_scale;
-	bool force_shape_reset;
-	SpaceBullet *space;
+	uint32_t collisionLayer = 0;
+	uint32_t collisionMask = 0;
+	bool collisionsEnabled = true;
+	bool m_isStatic = false;
+	bool ray_pickable = false;
+	btCollisionObject *bt_collision_object = nullptr;
+	Vector3 body_scale = Vector3(1, 1, 1);
+	bool force_shape_reset = false;
+	SpaceBullet *space = nullptr;
 
 	VSet<RID> exceptions;
 
+	bool needs_body_reload = true;
+	bool needs_collision_filters_reload = true;
+
 	/// This array is used to know all areas where this Object is overlapped in
 	/// New area is added when overlap with new area (AreaBullet::addOverlap), then is removed when it exit (CollisionObjectBullet::onExitArea)
 	/// This array is used mainly to know which area hold the pointer of this object
-	Vector<AreaBullet *> areasOverlapped;
-	bool isTransformChanged;
+	LocalVector<AreaBullet *> areasOverlapped;
+	bool isTransformChanged = false;
+
+public:
+	bool is_in_world = false;
+	bool is_in_flush_queue = false;
 
 public:
 	CollisionObjectBullet(Type p_type);
@@ -169,7 +174,7 @@ public:
 	_FORCE_INLINE_ void set_collision_layer(uint32_t p_layer) {
 		if (collisionLayer != p_layer) {
 			collisionLayer = p_layer;
-			on_collision_filters_change();
+			needs_collision_filters_reload = true;
 		}
 	}
 	_FORCE_INLINE_ uint32_t get_collision_layer() const { return collisionLayer; }
@@ -177,25 +182,32 @@ public:
 	_FORCE_INLINE_ void set_collision_mask(uint32_t p_mask) {
 		if (collisionMask != p_mask) {
 			collisionMask = p_mask;
-			on_collision_filters_change();
+			needs_collision_filters_reload = true;
 		}
 	}
 	_FORCE_INLINE_ uint32_t get_collision_mask() const { return collisionMask; }
 
-	virtual void on_collision_filters_change() = 0;
+	virtual void do_reload_collision_filters() = 0;
 
 	_FORCE_INLINE_ bool test_collision_mask(CollisionObjectBullet *p_other) const {
 		return collisionLayer & p_other->collisionMask || p_other->collisionLayer & collisionMask;
 	}
 
-	virtual void reload_body() = 0;
+	bool need_reload_body() const {
+		return needs_body_reload;
+	}
+
+	void reload_body();
+
+	virtual void do_reload_body() = 0;
 	virtual void set_space(SpaceBullet *p_space) = 0;
 	_FORCE_INLINE_ SpaceBullet *get_space() const { return space; }
 
 	virtual void on_collision_checker_start() = 0;
 	virtual void on_collision_checker_end() = 0;
 
-	virtual void dispatch_callbacks() = 0;
+	virtual void dispatch_callbacks();
+	virtual void pre_process();
 
 	void set_collision_enabled(bool p_enabled);
 	bool is_collisions_response_enabled();
@@ -218,14 +230,16 @@ public:
 
 class RigidCollisionObjectBullet : public CollisionObjectBullet, public ShapeOwnerBullet {
 protected:
-	btCollisionShape *mainShape;
-	Vector<ShapeWrapper> shapes;
+	btCollisionShape *mainShape = nullptr;
+	LocalVector<ShapeWrapper> shapes;
+	bool need_shape_reload = true;
 
 public:
-	RigidCollisionObjectBullet(Type p_type);
+	RigidCollisionObjectBullet(Type p_type) :
+			CollisionObjectBullet(p_type) {}
 	~RigidCollisionObjectBullet();
 
-	_FORCE_INLINE_ const Vector<ShapeWrapper> &get_shapes_wrappers() const { return shapes; }
+	_FORCE_INLINE_ const LocalVector<ShapeWrapper> &get_shapes_wrappers() const { return shapes; }
 
 	_FORCE_INLINE_ btCollisionShape *get_main_shape() const { return mainShape; }
 
@@ -236,9 +250,9 @@ public:
 	ShapeBullet *get_shape(int p_index) const;
 	btCollisionShape *get_bt_shape(int p_index) const;
 
-	int find_shape(ShapeBullet *p_shape) const;
+	virtual int find_shape(ShapeBullet *p_shape) const override;
 
-	virtual void remove_shape_full(ShapeBullet *p_shape);
+	virtual void remove_shape_full(ShapeBullet *p_shape) override;
 	void remove_shape_full(int p_index);
 	void remove_all_shapes(bool p_permanentlyFromThisBody = false, bool p_force_not_reload = false);
 
@@ -250,11 +264,15 @@ public:
 	void set_shape_disabled(int p_index, bool p_disabled);
 	bool is_shape_disabled(int p_index);
 
-	virtual void shape_changed(int p_shape_index);
-	virtual void reload_shapes();
+	virtual void pre_process() override;
+
+	virtual void shape_changed(int p_shape_index) override;
+	virtual void reload_shapes() override;
+	bool need_reload_shapes() const { return need_shape_reload; }
+	virtual void do_reload_shapes();
 
 	virtual void main_shape_changed() = 0;
-	virtual void body_scale_changed();
+	virtual void body_scale_changed() override;
 
 private:
 	void internal_shape_destroy(int p_index, bool p_permanentlyFromThisBody = false);
diff --git a/modules/bullet/cone_twist_joint_bullet.cpp b/modules/bullet/cone_twist_joint_bullet.cpp
index afeafcc356..b4735fa9e9 100644
--- a/modules/bullet/cone_twist_joint_bullet.cpp
+++ b/modules/bullet/cone_twist_joint_bullet.cpp
@@ -42,7 +42,6 @@
 
 ConeTwistJointBullet::ConeTwistJointBullet(RigidBodyBullet *rbA, RigidBodyBullet *rbB, const Transform &rbAFrame, const Transform &rbBFrame) :
 		JointBullet() {
-
 	Transform scaled_AFrame(rbAFrame.scaled(rbA->get_body_scale()));
 	scaled_AFrame.basis.rotref_posscale_decomposition(scaled_AFrame.basis);
 
@@ -50,7 +49,6 @@ ConeTwistJointBullet::ConeTwistJointBullet(RigidBodyBullet *rbA, RigidBodyBullet
 	G_TO_B(scaled_AFrame, btFrameA);
 
 	if (rbB) {
-
 		Transform scaled_BFrame(rbBFrame.scaled(rbB->get_body_scale()));
 		scaled_BFrame.basis.rotref_posscale_decomposition(scaled_BFrame.basis);
 
@@ -64,44 +62,46 @@ ConeTwistJointBullet::ConeTwistJointBullet(RigidBodyBullet *rbA, RigidBodyBullet
 	setup(coneConstraint);
 }
 
-void ConeTwistJointBullet::set_param(PhysicsServer::ConeTwistJointParam p_param, real_t p_value) {
+void ConeTwistJointBullet::set_param(PhysicsServer3D::ConeTwistJointParam p_param, real_t p_value) {
 	switch (p_param) {
-		case PhysicsServer::CONE_TWIST_JOINT_SWING_SPAN:
+		case PhysicsServer3D::CONE_TWIST_JOINT_SWING_SPAN:
 			coneConstraint->setLimit(5, p_value);
 			coneConstraint->setLimit(4, p_value);
 			break;
-		case PhysicsServer::CONE_TWIST_JOINT_TWIST_SPAN:
+		case PhysicsServer3D::CONE_TWIST_JOINT_TWIST_SPAN:
 			coneConstraint->setLimit(3, p_value);
 			break;
-		case PhysicsServer::CONE_TWIST_JOINT_BIAS:
+		case PhysicsServer3D::CONE_TWIST_JOINT_BIAS:
 			coneConstraint->setLimit(coneConstraint->getSwingSpan1(), coneConstraint->getSwingSpan2(), coneConstraint->getTwistSpan(), coneConstraint->getLimitSoftness(), p_value, coneConstraint->getRelaxationFactor());
 			break;
-		case PhysicsServer::CONE_TWIST_JOINT_SOFTNESS:
+		case PhysicsServer3D::CONE_TWIST_JOINT_SOFTNESS:
 			coneConstraint->setLimit(coneConstraint->getSwingSpan1(), coneConstraint->getSwingSpan2(), coneConstraint->getTwistSpan(), p_value, coneConstraint->getBiasFactor(), coneConstraint->getRelaxationFactor());
 			break;
-		case PhysicsServer::CONE_TWIST_JOINT_RELAXATION:
+		case PhysicsServer3D::CONE_TWIST_JOINT_RELAXATION:
 			coneConstraint->setLimit(coneConstraint->getSwingSpan1(), coneConstraint->getSwingSpan2(), coneConstraint->getTwistSpan(), coneConstraint->getLimitSoftness(), coneConstraint->getBiasFactor(), p_value);
 			break;
-		default:
-			WARN_DEPRECATED_MSG("The parameter " + itos(p_param) + " is deprecated.");
+		case PhysicsServer3D::CONE_TWIST_MAX:
+			// Internal size value, nothing to do.
 			break;
 	}
 }
 
-real_t ConeTwistJointBullet::get_param(PhysicsServer::ConeTwistJointParam p_param) const {
+real_t ConeTwistJointBullet::get_param(PhysicsServer3D::ConeTwistJointParam p_param) const {
 	switch (p_param) {
-		case PhysicsServer::CONE_TWIST_JOINT_SWING_SPAN:
+		case PhysicsServer3D::CONE_TWIST_JOINT_SWING_SPAN:
 			return coneConstraint->getSwingSpan1();
-		case PhysicsServer::CONE_TWIST_JOINT_TWIST_SPAN:
+		case PhysicsServer3D::CONE_TWIST_JOINT_TWIST_SPAN:
 			return coneConstraint->getTwistSpan();
-		case PhysicsServer::CONE_TWIST_JOINT_BIAS:
+		case PhysicsServer3D::CONE_TWIST_JOINT_BIAS:
 			return coneConstraint->getBiasFactor();
-		case PhysicsServer::CONE_TWIST_JOINT_SOFTNESS:
+		case PhysicsServer3D::CONE_TWIST_JOINT_SOFTNESS:
 			return coneConstraint->getLimitSoftness();
-		case PhysicsServer::CONE_TWIST_JOINT_RELAXATION:
+		case PhysicsServer3D::CONE_TWIST_JOINT_RELAXATION:
 			return coneConstraint->getRelaxationFactor();
-		default:
-			WARN_DEPRECATED_MSG("The parameter " + itos(p_param) + " is deprecated.");
+		case PhysicsServer3D::CONE_TWIST_MAX:
+			// Internal size value, nothing to do.
 			return 0;
 	}
+	// Compiler doesn't seem to notice that all code paths are fulfilled...
+	return 0;
 }
diff --git a/modules/bullet/cone_twist_joint_bullet.h b/modules/bullet/cone_twist_joint_bullet.h
index 134706f8bb..ed4baa9d1b 100644
--- a/modules/bullet/cone_twist_joint_bullet.h
+++ b/modules/bullet/cone_twist_joint_bullet.h
@@ -45,9 +45,9 @@ class ConeTwistJointBullet : public JointBullet {
 public:
 	ConeTwistJointBullet(RigidBodyBullet *rbA, RigidBodyBullet *rbB, const Transform &rbAFrame, const Transform &rbBFrame);
 
-	virtual PhysicsServer::JointType get_type() const { return PhysicsServer::JOINT_CONE_TWIST; }
+	virtual PhysicsServer3D::JointType get_type() const { return PhysicsServer3D::JOINT_CONE_TWIST; }
 
-	void set_param(PhysicsServer::ConeTwistJointParam p_param, real_t p_value);
-	real_t get_param(PhysicsServer::ConeTwistJointParam p_param) const;
+	void set_param(PhysicsServer3D::ConeTwistJointParam p_param, real_t p_value);
+	real_t get_param(PhysicsServer3D::ConeTwistJointParam p_param) const;
 };
 #endif
diff --git a/modules/bullet/config.py b/modules/bullet/config.py
index 92dbcf5cb0..d22f9454ed 100644
--- a/modules/bullet/config.py
+++ b/modules/bullet/config.py
@@ -1,14 +1,6 @@
 def can_build(env, platform):
     return True
 
+
 def configure(env):
     pass
-
-def get_doc_classes():
-    return [
-        "BulletPhysicsDirectBodyState",
-        "BulletPhysicsServer",
-    ]
-
-def get_doc_path():
-    return "doc_classes"
diff --git a/modules/bullet/constraint_bullet.cpp b/modules/bullet/constraint_bullet.cpp
index 7e90e2b488..c47a23e75f 100644
--- a/modules/bullet/constraint_bullet.cpp
+++ b/modules/bullet/constraint_bullet.cpp
@@ -37,10 +37,7 @@
 	@author AndreaCatania
 */
 
-ConstraintBullet::ConstraintBullet() :
-		space(NULL),
-		constraint(NULL),
-		disabled_collisions_between_bodies(true) {}
+ConstraintBullet::ConstraintBullet() {}
 
 void ConstraintBullet::setup(btTypedConstraint *p_constraint) {
 	constraint = p_constraint;
diff --git a/modules/bullet/constraint_bullet.h b/modules/bullet/constraint_bullet.h
index 89ad150257..538808be51 100644
--- a/modules/bullet/constraint_bullet.h
+++ b/modules/bullet/constraint_bullet.h
@@ -45,11 +45,10 @@ class SpaceBullet;
 class btTypedConstraint;
 
 class ConstraintBullet : public RIDBullet {
-
 protected:
-	SpaceBullet *space;
-	btTypedConstraint *constraint;
-	bool disabled_collisions_between_bodies;
+	SpaceBullet *space = nullptr;
+	btTypedConstraint *constraint = nullptr;
+	bool disabled_collisions_between_bodies = true;
 
 public:
 	ConstraintBullet();
@@ -64,7 +63,7 @@ public:
 public:
 	virtual ~ConstraintBullet() {
 		bulletdelete(constraint);
-		constraint = NULL;
+		constraint = nullptr;
 	}
 
 	_FORCE_INLINE_ btTypedConstraint *get_bt_constraint() { return constraint; }
diff --git a/modules/bullet/doc_classes/BulletPhysicsDirectBodyState.xml b/modules/bullet/doc_classes/BulletPhysicsDirectBodyState.xml
deleted file mode 100644
index 5ea1b810a1..0000000000
--- a/modules/bullet/doc_classes/BulletPhysicsDirectBodyState.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="BulletPhysicsDirectBodyState" inherits="PhysicsDirectBodyState" version="4.0">
-	<brief_description>
-	</brief_description>
-	<description>
-	</description>
-	<tutorials>
-	</tutorials>
-	<methods>
-	</methods>
-	<constants>
-	</constants>
-</class>
diff --git a/modules/bullet/doc_classes/BulletPhysicsServer.xml b/modules/bullet/doc_classes/BulletPhysicsServer.xml
deleted file mode 100644
index af8fb3c02c..0000000000
--- a/modules/bullet/doc_classes/BulletPhysicsServer.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="BulletPhysicsServer" inherits="PhysicsServer" version="4.0">
-	<brief_description>
-	</brief_description>
-	<description>
-	</description>
-	<tutorials>
-	</tutorials>
-	<methods>
-	</methods>
-	<constants>
-	</constants>
-</class>
diff --git a/modules/bullet/generic_6dof_joint_bullet.cpp b/modules/bullet/generic_6dof_joint_bullet.cpp
index 86bedd6c45..56a66dba45 100644
--- a/modules/bullet/generic_6dof_joint_bullet.cpp
+++ b/modules/bullet/generic_6dof_joint_bullet.cpp
@@ -42,6 +42,11 @@
 
 Generic6DOFJointBullet::Generic6DOFJointBullet(RigidBodyBullet *rbA, RigidBodyBullet *rbB, const Transform &frameInA, const Transform &frameInB) :
 		JointBullet() {
+	for (int i = 0; i < 3; i++) {
+		for (int j = 0; j < PhysicsServer3D::G6DOF_JOINT_FLAG_MAX; j++) {
+			flags[i][j] = false;
+		}
+	}
 
 	Transform scaled_AFrame(frameInA.scaled(rbA->get_body_scale()));
 
@@ -118,147 +123,153 @@ void Generic6DOFJointBullet::set_angular_upper_limit(const Vector3 &angularUpper
 	sixDOFConstraint->setAngularUpperLimit(btVec);
 }
 
-void Generic6DOFJointBullet::set_param(Vector3::Axis p_axis, PhysicsServer::G6DOFJointAxisParam p_param, real_t p_value) {
+void Generic6DOFJointBullet::set_param(Vector3::Axis p_axis, PhysicsServer3D::G6DOFJointAxisParam p_param, real_t p_value) {
 	ERR_FAIL_INDEX(p_axis, 3);
 	switch (p_param) {
-		case PhysicsServer::G6DOF_JOINT_LINEAR_LOWER_LIMIT:
+		case PhysicsServer3D::G6DOF_JOINT_LINEAR_LOWER_LIMIT:
 			limits_lower[0][p_axis] = p_value;
-			set_flag(p_axis, PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_LINEAR_LIMIT, flags[p_axis][PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_LINEAR_LIMIT]); // Reload bullet parameter
+			set_flag(p_axis, PhysicsServer3D::G6DOF_JOINT_FLAG_ENABLE_LINEAR_LIMIT, flags[p_axis][PhysicsServer3D::G6DOF_JOINT_FLAG_ENABLE_LINEAR_LIMIT]); // Reload bullet parameter
 			break;
-		case PhysicsServer::G6DOF_JOINT_LINEAR_UPPER_LIMIT:
+		case PhysicsServer3D::G6DOF_JOINT_LINEAR_UPPER_LIMIT:
 			limits_upper[0][p_axis] = p_value;
-			set_flag(p_axis, PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_LINEAR_LIMIT, flags[p_axis][PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_LINEAR_LIMIT]); // Reload bullet parameter
+			set_flag(p_axis, PhysicsServer3D::G6DOF_JOINT_FLAG_ENABLE_LINEAR_LIMIT, flags[p_axis][PhysicsServer3D::G6DOF_JOINT_FLAG_ENABLE_LINEAR_LIMIT]); // Reload bullet parameter
 			break;
-		case PhysicsServer::G6DOF_JOINT_LINEAR_MOTOR_TARGET_VELOCITY:
+		case PhysicsServer3D::G6DOF_JOINT_LINEAR_MOTOR_TARGET_VELOCITY:
 			sixDOFConstraint->getTranslationalLimitMotor()->m_targetVelocity.m_floats[p_axis] = p_value;
 			break;
-		case PhysicsServer::G6DOF_JOINT_LINEAR_MOTOR_FORCE_LIMIT:
+		case PhysicsServer3D::G6DOF_JOINT_LINEAR_MOTOR_FORCE_LIMIT:
 			sixDOFConstraint->getTranslationalLimitMotor()->m_maxMotorForce.m_floats[p_axis] = p_value;
 			break;
-		case PhysicsServer::G6DOF_JOINT_LINEAR_SPRING_DAMPING:
+		case PhysicsServer3D::G6DOF_JOINT_LINEAR_SPRING_DAMPING:
 			sixDOFConstraint->getTranslationalLimitMotor()->m_springDamping.m_floats[p_axis] = p_value;
 			break;
-		case PhysicsServer::G6DOF_JOINT_LINEAR_SPRING_STIFFNESS:
+		case PhysicsServer3D::G6DOF_JOINT_LINEAR_SPRING_STIFFNESS:
 			sixDOFConstraint->getTranslationalLimitMotor()->m_springStiffness.m_floats[p_axis] = p_value;
 			break;
-		case PhysicsServer::G6DOF_JOINT_LINEAR_SPRING_EQUILIBRIUM_POINT:
+		case PhysicsServer3D::G6DOF_JOINT_LINEAR_SPRING_EQUILIBRIUM_POINT:
 			sixDOFConstraint->getTranslationalLimitMotor()->m_equilibriumPoint.m_floats[p_axis] = p_value;
 			break;
-		case PhysicsServer::G6DOF_JOINT_ANGULAR_LOWER_LIMIT:
+		case PhysicsServer3D::G6DOF_JOINT_ANGULAR_LOWER_LIMIT:
 			limits_lower[1][p_axis] = p_value;
-			set_flag(p_axis, PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_ANGULAR_LIMIT, flags[p_axis][PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_ANGULAR_LIMIT]); // Reload bullet parameter
+			set_flag(p_axis, PhysicsServer3D::G6DOF_JOINT_FLAG_ENABLE_ANGULAR_LIMIT, flags[p_axis][PhysicsServer3D::G6DOF_JOINT_FLAG_ENABLE_ANGULAR_LIMIT]); // Reload bullet parameter
 			break;
-		case PhysicsServer::G6DOF_JOINT_ANGULAR_UPPER_LIMIT:
+		case PhysicsServer3D::G6DOF_JOINT_ANGULAR_UPPER_LIMIT:
 			limits_upper[1][p_axis] = p_value;
-			set_flag(p_axis, PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_ANGULAR_LIMIT, flags[p_axis][PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_ANGULAR_LIMIT]); // Reload bullet parameter
+			set_flag(p_axis, PhysicsServer3D::G6DOF_JOINT_FLAG_ENABLE_ANGULAR_LIMIT, flags[p_axis][PhysicsServer3D::G6DOF_JOINT_FLAG_ENABLE_ANGULAR_LIMIT]); // Reload bullet parameter
 			break;
-		case PhysicsServer::G6DOF_JOINT_ANGULAR_RESTITUTION:
+		case PhysicsServer3D::G6DOF_JOINT_ANGULAR_RESTITUTION:
 			sixDOFConstraint->getRotationalLimitMotor(p_axis)->m_bounce = p_value;
 			break;
-		case PhysicsServer::G6DOF_JOINT_ANGULAR_ERP:
+		case PhysicsServer3D::G6DOF_JOINT_ANGULAR_ERP:
 			sixDOFConstraint->getRotationalLimitMotor(p_axis)->m_stopERP = p_value;
 			break;
-		case PhysicsServer::G6DOF_JOINT_ANGULAR_MOTOR_TARGET_VELOCITY:
+		case PhysicsServer3D::G6DOF_JOINT_ANGULAR_MOTOR_TARGET_VELOCITY:
 			sixDOFConstraint->getRotationalLimitMotor(p_axis)->m_targetVelocity = p_value;
 			break;
-		case PhysicsServer::G6DOF_JOINT_ANGULAR_MOTOR_FORCE_LIMIT:
+		case PhysicsServer3D::G6DOF_JOINT_ANGULAR_MOTOR_FORCE_LIMIT:
 			sixDOFConstraint->getRotationalLimitMotor(p_axis)->m_maxMotorForce = p_value;
 			break;
-		case PhysicsServer::G6DOF_JOINT_ANGULAR_SPRING_STIFFNESS:
+		case PhysicsServer3D::G6DOF_JOINT_ANGULAR_SPRING_STIFFNESS:
 			sixDOFConstraint->getRotationalLimitMotor(p_axis)->m_springStiffness = p_value;
 			break;
-		case PhysicsServer::G6DOF_JOINT_ANGULAR_SPRING_DAMPING:
+		case PhysicsServer3D::G6DOF_JOINT_ANGULAR_SPRING_DAMPING:
 			sixDOFConstraint->getRotationalLimitMotor(p_axis)->m_springDamping = p_value;
 			break;
-		case PhysicsServer::G6DOF_JOINT_ANGULAR_SPRING_EQUILIBRIUM_POINT:
+		case PhysicsServer3D::G6DOF_JOINT_ANGULAR_SPRING_EQUILIBRIUM_POINT:
 			sixDOFConstraint->getRotationalLimitMotor(p_axis)->m_equilibriumPoint = p_value;
 			break;
+		case PhysicsServer3D::G6DOF_JOINT_MAX:
+			// Internal size value, nothing to do.
+			break;
 		default:
 			WARN_DEPRECATED_MSG("The parameter " + itos(p_param) + " is deprecated.");
 			break;
 	}
 }
 
-real_t Generic6DOFJointBullet::get_param(Vector3::Axis p_axis, PhysicsServer::G6DOFJointAxisParam p_param) const {
+real_t Generic6DOFJointBullet::get_param(Vector3::Axis p_axis, PhysicsServer3D::G6DOFJointAxisParam p_param) const {
 	ERR_FAIL_INDEX_V(p_axis, 3, 0.);
 	switch (p_param) {
-		case PhysicsServer::G6DOF_JOINT_LINEAR_LOWER_LIMIT:
+		case PhysicsServer3D::G6DOF_JOINT_LINEAR_LOWER_LIMIT:
 			return limits_lower[0][p_axis];
-		case PhysicsServer::G6DOF_JOINT_LINEAR_UPPER_LIMIT:
+		case PhysicsServer3D::G6DOF_JOINT_LINEAR_UPPER_LIMIT:
 			return limits_upper[0][p_axis];
-		case PhysicsServer::G6DOF_JOINT_LINEAR_MOTOR_TARGET_VELOCITY:
+		case PhysicsServer3D::G6DOF_JOINT_LINEAR_MOTOR_TARGET_VELOCITY:
 			return sixDOFConstraint->getTranslationalLimitMotor()->m_targetVelocity.m_floats[p_axis];
-		case PhysicsServer::G6DOF_JOINT_LINEAR_MOTOR_FORCE_LIMIT:
+		case PhysicsServer3D::G6DOF_JOINT_LINEAR_MOTOR_FORCE_LIMIT:
 			return sixDOFConstraint->getTranslationalLimitMotor()->m_maxMotorForce.m_floats[p_axis];
-		case PhysicsServer::G6DOF_JOINT_LINEAR_SPRING_DAMPING:
+		case PhysicsServer3D::G6DOF_JOINT_LINEAR_SPRING_DAMPING:
 			return sixDOFConstraint->getTranslationalLimitMotor()->m_springDamping.m_floats[p_axis];
-		case PhysicsServer::G6DOF_JOINT_LINEAR_SPRING_STIFFNESS:
+		case PhysicsServer3D::G6DOF_JOINT_LINEAR_SPRING_STIFFNESS:
 			return sixDOFConstraint->getTranslationalLimitMotor()->m_springStiffness.m_floats[p_axis];
-		case PhysicsServer::G6DOF_JOINT_LINEAR_SPRING_EQUILIBRIUM_POINT:
+		case PhysicsServer3D::G6DOF_JOINT_LINEAR_SPRING_EQUILIBRIUM_POINT:
 			return sixDOFConstraint->getTranslationalLimitMotor()->m_equilibriumPoint.m_floats[p_axis];
-		case PhysicsServer::G6DOF_JOINT_ANGULAR_LOWER_LIMIT:
+		case PhysicsServer3D::G6DOF_JOINT_ANGULAR_LOWER_LIMIT:
 			return limits_lower[1][p_axis];
-		case PhysicsServer::G6DOF_JOINT_ANGULAR_UPPER_LIMIT:
+		case PhysicsServer3D::G6DOF_JOINT_ANGULAR_UPPER_LIMIT:
 			return limits_upper[1][p_axis];
-		case PhysicsServer::G6DOF_JOINT_ANGULAR_RESTITUTION:
+		case PhysicsServer3D::G6DOF_JOINT_ANGULAR_RESTITUTION:
 			return sixDOFConstraint->getRotationalLimitMotor(p_axis)->m_bounce;
-		case PhysicsServer::G6DOF_JOINT_ANGULAR_ERP:
+		case PhysicsServer3D::G6DOF_JOINT_ANGULAR_ERP:
 			return sixDOFConstraint->getRotationalLimitMotor(p_axis)->m_stopERP;
-		case PhysicsServer::G6DOF_JOINT_ANGULAR_MOTOR_TARGET_VELOCITY:
+		case PhysicsServer3D::G6DOF_JOINT_ANGULAR_MOTOR_TARGET_VELOCITY:
 			return sixDOFConstraint->getRotationalLimitMotor(p_axis)->m_targetVelocity;
-		case PhysicsServer::G6DOF_JOINT_ANGULAR_MOTOR_FORCE_LIMIT:
+		case PhysicsServer3D::G6DOF_JOINT_ANGULAR_MOTOR_FORCE_LIMIT:
 			return sixDOFConstraint->getRotationalLimitMotor(p_axis)->m_maxMotorForce;
-		case PhysicsServer::G6DOF_JOINT_ANGULAR_SPRING_STIFFNESS:
+		case PhysicsServer3D::G6DOF_JOINT_ANGULAR_SPRING_STIFFNESS:
 			return sixDOFConstraint->getRotationalLimitMotor(p_axis)->m_springStiffness;
-		case PhysicsServer::G6DOF_JOINT_ANGULAR_SPRING_DAMPING:
+		case PhysicsServer3D::G6DOF_JOINT_ANGULAR_SPRING_DAMPING:
 			return sixDOFConstraint->getRotationalLimitMotor(p_axis)->m_springDamping;
-		case PhysicsServer::G6DOF_JOINT_ANGULAR_SPRING_EQUILIBRIUM_POINT:
+		case PhysicsServer3D::G6DOF_JOINT_ANGULAR_SPRING_EQUILIBRIUM_POINT:
 			return sixDOFConstraint->getRotationalLimitMotor(p_axis)->m_equilibriumPoint;
+		case PhysicsServer3D::G6DOF_JOINT_MAX:
+			// Internal size value, nothing to do.
+			return 0;
 		default:
 			WARN_DEPRECATED_MSG("The parameter " + itos(p_param) + " is deprecated.");
 			return 0;
 	}
 }
 
-void Generic6DOFJointBullet::set_flag(Vector3::Axis p_axis, PhysicsServer::G6DOFJointAxisFlag p_flag, bool p_value) {
+void Generic6DOFJointBullet::set_flag(Vector3::Axis p_axis, PhysicsServer3D::G6DOFJointAxisFlag p_flag, bool p_value) {
 	ERR_FAIL_INDEX(p_axis, 3);
 
 	flags[p_axis][p_flag] = p_value;
 
 	switch (p_flag) {
-		case PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_LINEAR_LIMIT:
+		case PhysicsServer3D::G6DOF_JOINT_FLAG_ENABLE_LINEAR_LIMIT:
 			if (flags[p_axis][p_flag]) {
 				sixDOFConstraint->setLimit(p_axis, limits_lower[0][p_axis], limits_upper[0][p_axis]);
 			} else {
 				sixDOFConstraint->setLimit(p_axis, 0, -1); // Free
 			}
 			break;
-		case PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_ANGULAR_LIMIT:
+		case PhysicsServer3D::G6DOF_JOINT_FLAG_ENABLE_ANGULAR_LIMIT:
 			if (flags[p_axis][p_flag]) {
 				sixDOFConstraint->setLimit(p_axis + 3, limits_lower[1][p_axis], limits_upper[1][p_axis]);
 			} else {
 				sixDOFConstraint->setLimit(p_axis + 3, 0, -1); // Free
 			}
 			break;
-		case PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_MOTOR:
-			sixDOFConstraint->getRotationalLimitMotor(p_axis)->m_enableMotor = flags[p_axis][p_flag];
-			break;
-		case PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_LINEAR_MOTOR:
-			sixDOFConstraint->getTranslationalLimitMotor()->m_enableMotor[p_axis] = flags[p_axis][p_flag];
+		case PhysicsServer3D::G6DOF_JOINT_FLAG_ENABLE_ANGULAR_SPRING:
+			sixDOFConstraint->getRotationalLimitMotor(p_axis)->m_enableSpring = p_value;
 			break;
-		case PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_LINEAR_SPRING:
+		case PhysicsServer3D::G6DOF_JOINT_FLAG_ENABLE_LINEAR_SPRING:
 			sixDOFConstraint->getTranslationalLimitMotor()->m_enableSpring[p_axis] = p_value;
 			break;
-		case PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_ANGULAR_SPRING:
-			sixDOFConstraint->getRotationalLimitMotor(p_axis)->m_enableSpring = p_value;
+		case PhysicsServer3D::G6DOF_JOINT_FLAG_ENABLE_MOTOR:
+			sixDOFConstraint->getRotationalLimitMotor(p_axis)->m_enableMotor = flags[p_axis][p_flag];
 			break;
-		default:
-			WARN_DEPRECATED_MSG("The flag " + itos(p_flag) + " is deprecated.");
+		case PhysicsServer3D::G6DOF_JOINT_FLAG_ENABLE_LINEAR_MOTOR:
+			sixDOFConstraint->getTranslationalLimitMotor()->m_enableMotor[p_axis] = flags[p_axis][p_flag];
+			break;
+		case PhysicsServer3D::G6DOF_JOINT_FLAG_MAX:
+			// Internal size value, nothing to do.
 			break;
 	}
 }
 
-bool Generic6DOFJointBullet::get_flag(Vector3::Axis p_axis, PhysicsServer::G6DOFJointAxisFlag p_flag) const {
+bool Generic6DOFJointBullet::get_flag(Vector3::Axis p_axis, PhysicsServer3D::G6DOFJointAxisFlag p_flag) const {
 	ERR_FAIL_INDEX_V(p_axis, 3, false);
 	return flags[p_axis][p_flag];
 }
diff --git a/modules/bullet/generic_6dof_joint_bullet.h b/modules/bullet/generic_6dof_joint_bullet.h
index 75c8005811..316708bb11 100644
--- a/modules/bullet/generic_6dof_joint_bullet.h
+++ b/modules/bullet/generic_6dof_joint_bullet.h
@@ -45,12 +45,12 @@ class Generic6DOFJointBullet : public JointBullet {
 	// First is linear second is angular
 	Vector3 limits_lower[2];
 	Vector3 limits_upper[2];
-	bool flags[3][PhysicsServer::G6DOF_JOINT_FLAG_MAX];
+	bool flags[3][PhysicsServer3D::G6DOF_JOINT_FLAG_MAX];
 
 public:
 	Generic6DOFJointBullet(RigidBodyBullet *rbA, RigidBodyBullet *rbB, const Transform &frameInA, const Transform &frameInB);
 
-	virtual PhysicsServer::JointType get_type() const { return PhysicsServer::JOINT_6DOF; }
+	virtual PhysicsServer3D::JointType get_type() const { return PhysicsServer3D::JOINT_6DOF; }
 
 	Transform getFrameOffsetA() const;
 	Transform getFrameOffsetB() const;
@@ -63,11 +63,11 @@ public:
 	void set_angular_lower_limit(const Vector3 &angularLower);
 	void set_angular_upper_limit(const Vector3 &angularUpper);
 
-	void set_param(Vector3::Axis p_axis, PhysicsServer::G6DOFJointAxisParam p_param, real_t p_value);
-	real_t get_param(Vector3::Axis p_axis, PhysicsServer::G6DOFJointAxisParam p_param) const;
+	void set_param(Vector3::Axis p_axis, PhysicsServer3D::G6DOFJointAxisParam p_param, real_t p_value);
+	real_t get_param(Vector3::Axis p_axis, PhysicsServer3D::G6DOFJointAxisParam p_param) const;
 
-	void set_flag(Vector3::Axis p_axis, PhysicsServer::G6DOFJointAxisFlag p_flag, bool p_value);
-	bool get_flag(Vector3::Axis p_axis, PhysicsServer::G6DOFJointAxisFlag p_flag) const;
+	void set_flag(Vector3::Axis p_axis, PhysicsServer3D::G6DOFJointAxisFlag p_flag, bool p_value);
+	bool get_flag(Vector3::Axis p_axis, PhysicsServer3D::G6DOFJointAxisFlag p_flag) const;
 
 	void set_precision(int p_precision);
 	int get_precision() const;
diff --git a/modules/bullet/godot_collision_configuration.cpp b/modules/bullet/godot_collision_configuration.cpp
index f3e3a01a52..ec7a1dbd9a 100644
--- a/modules/bullet/godot_collision_configuration.cpp
+++ b/modules/bullet/godot_collision_configuration.cpp
@@ -41,8 +41,7 @@
 
 GodotCollisionConfiguration::GodotCollisionConfiguration(const btDiscreteDynamicsWorld *world, const btDefaultCollisionConstructionInfo &constructionInfo) :
 		btDefaultCollisionConfiguration(constructionInfo) {
-
-	void *mem = NULL;
+	void *mem = nullptr;
 
 	mem = btAlignedAlloc(sizeof(GodotRayWorldAlgorithm::CreateFunc), 16);
 	m_rayWorldCF = new (mem) GodotRayWorldAlgorithm::CreateFunc(world);
@@ -60,45 +59,34 @@ GodotCollisionConfiguration::~GodotCollisionConfiguration() {
 }
 
 btCollisionAlgorithmCreateFunc *GodotCollisionConfiguration::getCollisionAlgorithmCreateFunc(int proxyType0, int proxyType1) {
-
 	if (CUSTOM_CONVEX_SHAPE_TYPE == proxyType0 && CUSTOM_CONVEX_SHAPE_TYPE == proxyType1) {
-
 		// This collision is not supported
 		return m_emptyCreateFunc;
 	} else if (CUSTOM_CONVEX_SHAPE_TYPE == proxyType0) {
-
 		return m_rayWorldCF;
 	} else if (CUSTOM_CONVEX_SHAPE_TYPE == proxyType1) {
-
 		return m_swappedRayWorldCF;
 	} else {
-
 		return btDefaultCollisionConfiguration::getCollisionAlgorithmCreateFunc(proxyType0, proxyType1);
 	}
 }
 
 btCollisionAlgorithmCreateFunc *GodotCollisionConfiguration::getClosestPointsAlgorithmCreateFunc(int proxyType0, int proxyType1) {
-
 	if (CUSTOM_CONVEX_SHAPE_TYPE == proxyType0 && CUSTOM_CONVEX_SHAPE_TYPE == proxyType1) {
-
 		// This collision is not supported
 		return m_emptyCreateFunc;
 	} else if (CUSTOM_CONVEX_SHAPE_TYPE == proxyType0) {
-
 		return m_rayWorldCF;
 	} else if (CUSTOM_CONVEX_SHAPE_TYPE == proxyType1) {
-
 		return m_swappedRayWorldCF;
 	} else {
-
 		return btDefaultCollisionConfiguration::getClosestPointsAlgorithmCreateFunc(proxyType0, proxyType1);
 	}
 }
 
 GodotSoftCollisionConfiguration::GodotSoftCollisionConfiguration(const btDiscreteDynamicsWorld *world, const btDefaultCollisionConstructionInfo &constructionInfo) :
 		btSoftBodyRigidBodyCollisionConfiguration(constructionInfo) {
-
-	void *mem = NULL;
+	void *mem = nullptr;
 
 	mem = btAlignedAlloc(sizeof(GodotRayWorldAlgorithm::CreateFunc), 16);
 	m_rayWorldCF = new (mem) GodotRayWorldAlgorithm::CreateFunc(world);
@@ -116,37 +104,27 @@ GodotSoftCollisionConfiguration::~GodotSoftCollisionConfiguration() {
 }
 
 btCollisionAlgorithmCreateFunc *GodotSoftCollisionConfiguration::getCollisionAlgorithmCreateFunc(int proxyType0, int proxyType1) {
-
 	if (CUSTOM_CONVEX_SHAPE_TYPE == proxyType0 && CUSTOM_CONVEX_SHAPE_TYPE == proxyType1) {
-
 		// This collision is not supported
 		return m_emptyCreateFunc;
 	} else if (CUSTOM_CONVEX_SHAPE_TYPE == proxyType0) {
-
 		return m_rayWorldCF;
 	} else if (CUSTOM_CONVEX_SHAPE_TYPE == proxyType1) {
-
 		return m_swappedRayWorldCF;
 	} else {
-
 		return btSoftBodyRigidBodyCollisionConfiguration::getCollisionAlgorithmCreateFunc(proxyType0, proxyType1);
 	}
 }
 
 btCollisionAlgorithmCreateFunc *GodotSoftCollisionConfiguration::getClosestPointsAlgorithmCreateFunc(int proxyType0, int proxyType1) {
-
 	if (CUSTOM_CONVEX_SHAPE_TYPE == proxyType0 && CUSTOM_CONVEX_SHAPE_TYPE == proxyType1) {
-
 		// This collision is not supported
 		return m_emptyCreateFunc;
 	} else if (CUSTOM_CONVEX_SHAPE_TYPE == proxyType0) {
-
 		return m_rayWorldCF;
 	} else if (CUSTOM_CONVEX_SHAPE_TYPE == proxyType1) {
-
 		return m_swappedRayWorldCF;
 	} else {
-
 		return btSoftBodyRigidBodyCollisionConfiguration::getClosestPointsAlgorithmCreateFunc(proxyType0, proxyType1);
 	}
 }
diff --git a/modules/bullet/godot_motion_state.h b/modules/bullet/godot_motion_state.h
index e2c1b10e94..90d1614a77 100644
--- a/modules/bullet/godot_motion_state.h
+++ b/modules/bullet/godot_motion_state.h
@@ -46,7 +46,6 @@ class RigidBodyBullet;
 /// DOC:
 /// http://www.bulletphysics.org/mediawiki-1.5.8/index.php/MotionStates#What.27s_a_MotionState.3F
 class GodotMotionState : public btMotionState {
-
 	/// This data is used to store the new world position for kinematic body
 	btTransform bodyKinematicWorldTransf;
 	/// This data is used to store last world position
diff --git a/modules/bullet/godot_ray_world_algorithm.cpp b/modules/bullet/godot_ray_world_algorithm.cpp
index 2ef277cf5b..a84f3511ba 100644
--- a/modules/bullet/godot_ray_world_algorithm.cpp
+++ b/modules/bullet/godot_ray_world_algorithm.cpp
@@ -52,7 +52,6 @@ GodotRayWorldAlgorithm::GodotRayWorldAlgorithm(const btDiscreteDynamicsWorld *wo
 		btActivatingCollisionAlgorithm(ci, body0Wrap, body1Wrap),
 		m_world(world),
 		m_manifoldPtr(mf),
-		m_ownManifold(false),
 		m_isSwapped(isSwapped) {}
 
 GodotRayWorldAlgorithm::~GodotRayWorldAlgorithm() {
@@ -62,7 +61,6 @@ GodotRayWorldAlgorithm::~GodotRayWorldAlgorithm() {
 }
 
 void GodotRayWorldAlgorithm::processCollision(const btCollisionObjectWrapper *body0Wrap, const btCollisionObjectWrapper *body1Wrap, const btDispatcherInfo &dispatchInfo, btManifoldResult *resultOut) {
-
 	if (!m_manifoldPtr) {
 		if (m_isSwapped) {
 			m_manifoldPtr = m_dispatcher->getNewManifold(body1Wrap->getCollisionObject(), body0Wrap->getCollisionObject());
@@ -80,13 +78,11 @@ void GodotRayWorldAlgorithm::processCollision(const btCollisionObjectWrapper *bo
 	const btCollisionObjectWrapper *other_co_wrapper;
 
 	if (m_isSwapped) {
-
 		ray_shape = static_cast<const btRayShape *>(body1Wrap->getCollisionShape());
 		ray_transform = body1Wrap->getWorldTransform();
 
 		other_co_wrapper = body0Wrap;
 	} else {
-
 		ray_shape = static_cast<const btRayShape *>(body0Wrap->getCollisionShape());
 		ray_transform = body0Wrap->getWorldTransform();
 
@@ -100,15 +96,15 @@ void GodotRayWorldAlgorithm::processCollision(const btCollisionObjectWrapper *bo
 	m_world->rayTestSingleInternal(ray_transform, to, other_co_wrapper, btResult);
 
 	if (btResult.hasHit()) {
-
 		btScalar depth(ray_shape->getScaledLength() * (btResult.m_closestHitFraction - 1));
 
-		if (depth > -RAY_PENETRATION_DEPTH_EPSILON)
+		if (depth > -RAY_PENETRATION_DEPTH_EPSILON) {
 			depth = 0.0;
+		}
 
-		if (ray_shape->getSlipsOnSlope())
+		if (ray_shape->getSlipsOnSlope()) {
 			resultOut->addContactPoint(btResult.m_hitNormalWorld, btResult.m_hitPointWorld, depth);
-		else {
+		} else {
 			resultOut->addContactPoint((ray_transform.getOrigin() - to.getOrigin()).normalize(), btResult.m_hitPointWorld, depth);
 		}
 	}
diff --git a/modules/bullet/godot_ray_world_algorithm.h b/modules/bullet/godot_ray_world_algorithm.h
index 2cdea6c133..9786732d40 100644
--- a/modules/bullet/godot_ray_world_algorithm.h
+++ b/modules/bullet/godot_ray_world_algorithm.h
@@ -42,10 +42,9 @@
 class btDiscreteDynamicsWorld;
 
 class GodotRayWorldAlgorithm : public btActivatingCollisionAlgorithm {
-
 	const btDiscreteDynamicsWorld *m_world;
 	btPersistentManifold *m_manifoldPtr;
-	bool m_ownManifold;
+	bool m_ownManifold = false;
 	bool m_isSwapped;
 
 public:
@@ -57,11 +56,11 @@ public:
 
 	virtual void getAllContactManifolds(btManifoldArray &manifoldArray) {
 		///should we use m_ownManifold to avoid adding duplicates?
-		if (m_manifoldPtr && m_ownManifold)
+		if (m_manifoldPtr && m_ownManifold) {
 			manifoldArray.push_back(m_manifoldPtr);
+		}
 	}
 	struct CreateFunc : public btCollisionAlgorithmCreateFunc {
-
 		const btDiscreteDynamicsWorld *m_world;
 		CreateFunc(const btDiscreteDynamicsWorld *world);
 
@@ -72,7 +71,6 @@ public:
 	};
 
 	struct SwappedCreateFunc : public btCollisionAlgorithmCreateFunc {
-
 		const btDiscreteDynamicsWorld *m_world;
 		SwappedCreateFunc(const btDiscreteDynamicsWorld *world);
 
diff --git a/modules/bullet/godot_result_callbacks.cpp b/modules/bullet/godot_result_callbacks.cpp
index 6e54d10abf..f82648d6ff 100644
--- a/modules/bullet/godot_result_callbacks.cpp
+++ b/modules/bullet/godot_result_callbacks.cpp
@@ -62,11 +62,13 @@ bool GodotClosestRayResultCallback::needsCollision(btBroadphaseProxy *proxy0) co
 		CollisionObjectBullet *gObj = static_cast<CollisionObjectBullet *>(btObj->getUserPointer());
 
 		if (CollisionObjectBullet::TYPE_AREA == gObj->getType()) {
-			if (!collide_with_areas)
+			if (!collide_with_areas) {
 				return false;
+			}
 		} else {
-			if (!collide_with_bodies)
+			if (!collide_with_bodies) {
 				return false;
+			}
 		}
 
 		if (m_pickRay && !gObj->is_ray_pickable()) {
@@ -84,8 +86,9 @@ bool GodotClosestRayResultCallback::needsCollision(btBroadphaseProxy *proxy0) co
 }
 
 bool GodotAllConvexResultCallback::needsCollision(btBroadphaseProxy *proxy0) const {
-	if (count >= m_resultMax)
+	if (count >= m_resultMax) {
 		return false;
+	}
 
 	const bool needs = GodotFilterCallback::test_collision_filters(m_collisionFilterGroup, m_collisionFilterMask, proxy0->m_collisionFilterGroup, proxy0->m_collisionFilterMask);
 	if (needs) {
@@ -102,17 +105,18 @@ bool GodotAllConvexResultCallback::needsCollision(btBroadphaseProxy *proxy0) con
 }
 
 btScalar GodotAllConvexResultCallback::addSingleResult(btCollisionWorld::LocalConvexResult &convexResult, bool normalInWorldSpace) {
-	if (count >= m_resultMax)
+	if (count >= m_resultMax) {
 		return 1; // not used by bullet
+	}
 
 	CollisionObjectBullet *gObj = static_cast<CollisionObjectBullet *>(convexResult.m_hitCollisionObject->getUserPointer());
 
-	PhysicsDirectSpaceState::ShapeResult &result = m_results[count];
+	PhysicsDirectSpaceState3D::ShapeResult &result = m_results[count];
 
 	result.shape = convexResult.m_localShapeInfo->m_triangleIndex; // "m_triangleIndex" Is a odd name but contains the compound shape ID
 	result.rid = gObj->get_self();
 	result.collider_id = gObj->get_instance_id();
-	result.collider = 0 == result.collider_id ? NULL : ObjectDB::get_instance(result.collider_id);
+	result.collider = result.collider_id.is_null() ? nullptr : ObjectDB::get_instance(result.collider_id);
 
 	++count;
 	return 1; // not used by bullet
@@ -126,16 +130,18 @@ bool GodotKinClosestConvexResultCallback::needsCollision(btBroadphaseProxy *prox
 		if (gObj == m_self_object) {
 			return false;
 		} else {
-
 			// A kinematic body can't be stopped by a rigid body since the mass of kinematic body is infinite
-			if (m_infinite_inertia && !btObj->isStaticOrKinematicObject())
+			if (m_infinite_inertia && !btObj->isStaticOrKinematicObject()) {
 				return false;
+			}
 
-			if (gObj->getType() == CollisionObjectBullet::TYPE_AREA)
+			if (gObj->getType() == CollisionObjectBullet::TYPE_AREA) {
 				return false;
+			}
 
-			if (m_self_object->has_collision_exception(gObj) || gObj->has_collision_exception(m_self_object))
+			if (m_self_object->has_collision_exception(gObj) || gObj->has_collision_exception(m_self_object)) {
 				return false;
+			}
 		}
 		return true;
 	} else {
@@ -150,11 +156,13 @@ bool GodotClosestConvexResultCallback::needsCollision(btBroadphaseProxy *proxy0)
 		CollisionObjectBullet *gObj = static_cast<CollisionObjectBullet *>(btObj->getUserPointer());
 
 		if (CollisionObjectBullet::TYPE_AREA == gObj->getType()) {
-			if (!collide_with_areas)
+			if (!collide_with_areas) {
 				return false;
+			}
 		} else {
-			if (!collide_with_bodies)
+			if (!collide_with_bodies) {
 				return false;
+			}
 		}
 
 		if (m_exclude->has(gObj->get_self())) {
@@ -167,16 +175,18 @@ bool GodotClosestConvexResultCallback::needsCollision(btBroadphaseProxy *proxy0)
 }
 
 btScalar GodotClosestConvexResultCallback::addSingleResult(btCollisionWorld::LocalConvexResult &convexResult, bool normalInWorldSpace) {
-	if (convexResult.m_localShapeInfo)
+	if (convexResult.m_localShapeInfo) {
 		m_shapeId = convexResult.m_localShapeInfo->m_triangleIndex; // "m_triangleIndex" Is a odd name but contains the compound shape ID
-	else
+	} else {
 		m_shapeId = 0;
+	}
 	return btCollisionWorld::ClosestConvexResultCallback::addSingleResult(convexResult, normalInWorldSpace);
 }
 
 bool GodotAllContactResultCallback::needsCollision(btBroadphaseProxy *proxy0) const {
-	if (m_count >= m_resultMax)
+	if (m_count >= m_resultMax) {
 		return false;
+	}
 
 	const bool needs = GodotFilterCallback::test_collision_filters(m_collisionFilterGroup, m_collisionFilterMask, proxy0->m_collisionFilterGroup, proxy0->m_collisionFilterMask);
 	if (needs) {
@@ -184,11 +194,13 @@ bool GodotAllContactResultCallback::needsCollision(btBroadphaseProxy *proxy0) co
 		CollisionObjectBullet *gObj = static_cast<CollisionObjectBullet *>(btObj->getUserPointer());
 
 		if (CollisionObjectBullet::TYPE_AREA == gObj->getType()) {
-			if (!collide_with_areas)
+			if (!collide_with_areas) {
 				return false;
+			}
 		} else {
-			if (!collide_with_bodies)
+			if (!collide_with_bodies) {
 				return false;
+			}
 		}
 
 		if (m_exclude->has(gObj->get_self())) {
@@ -201,13 +213,12 @@ bool GodotAllContactResultCallback::needsCollision(btBroadphaseProxy *proxy0) co
 }
 
 btScalar GodotAllContactResultCallback::addSingleResult(btManifoldPoint &cp, const btCollisionObjectWrapper *colObj0Wrap, int partId0, int index0, const btCollisionObjectWrapper *colObj1Wrap, int partId1, int index1) {
-
-	if (m_count >= m_resultMax)
+	if (m_count >= m_resultMax) {
 		return cp.getDistance();
+	}
 
 	if (cp.getDistance() <= 0) {
-
-		PhysicsDirectSpaceState::ShapeResult &result = m_results[m_count];
+		PhysicsDirectSpaceState3D::ShapeResult &result = m_results[m_count];
 		// Penetrated
 
 		CollisionObjectBullet *colObj;
@@ -220,7 +231,7 @@ btScalar GodotAllContactResultCallback::addSingleResult(btManifoldPoint &cp, con
 		}
 
 		result.collider_id = colObj->get_instance_id();
-		result.collider = 0 == result.collider_id ? NULL : ObjectDB::get_instance(result.collider_id);
+		result.collider = result.collider_id.is_null() ? nullptr : ObjectDB::get_instance(result.collider_id);
 		result.rid = colObj->get_self();
 		++m_count;
 	}
@@ -229,8 +240,9 @@ btScalar GodotAllContactResultCallback::addSingleResult(btManifoldPoint &cp, con
 }
 
 bool GodotContactPairContactResultCallback::needsCollision(btBroadphaseProxy *proxy0) const {
-	if (m_count >= m_resultMax)
+	if (m_count >= m_resultMax) {
 		return false;
+	}
 
 	const bool needs = GodotFilterCallback::test_collision_filters(m_collisionFilterGroup, m_collisionFilterMask, proxy0->m_collisionFilterGroup, proxy0->m_collisionFilterMask);
 	if (needs) {
@@ -238,11 +250,13 @@ bool GodotContactPairContactResultCallback::needsCollision(btBroadphaseProxy *pr
 		CollisionObjectBullet *gObj = static_cast<CollisionObjectBullet *>(btObj->getUserPointer());
 
 		if (CollisionObjectBullet::TYPE_AREA == gObj->getType()) {
-			if (!collide_with_areas)
+			if (!collide_with_areas) {
 				return false;
+			}
 		} else {
-			if (!collide_with_bodies)
+			if (!collide_with_bodies) {
 				return false;
+			}
 		}
 
 		if (m_exclude->has(gObj->get_self())) {
@@ -255,8 +269,9 @@ bool GodotContactPairContactResultCallback::needsCollision(btBroadphaseProxy *pr
 }
 
 btScalar GodotContactPairContactResultCallback::addSingleResult(btManifoldPoint &cp, const btCollisionObjectWrapper *colObj0Wrap, int partId0, int index0, const btCollisionObjectWrapper *colObj1Wrap, int partId1, int index1) {
-	if (m_count >= m_resultMax)
+	if (m_count >= m_resultMax) {
 		return 1; // not used by bullet
+	}
 
 	if (m_self_object == colObj0Wrap->getCollisionObject()) {
 		B_TO_G(cp.m_localPointA, m_results[m_count * 2 + 0]); // Local contact
@@ -278,11 +293,13 @@ bool GodotRestInfoContactResultCallback::needsCollision(btBroadphaseProxy *proxy
 		CollisionObjectBullet *gObj = static_cast<CollisionObjectBullet *>(btObj->getUserPointer());
 
 		if (CollisionObjectBullet::TYPE_AREA == gObj->getType()) {
-			if (!collide_with_areas)
+			if (!collide_with_areas) {
 				return false;
+			}
 		} else {
-			if (!collide_with_bodies)
+			if (!collide_with_bodies) {
 				return false;
+			}
 		}
 
 		if (m_exclude->has(gObj->get_self())) {
@@ -295,7 +312,6 @@ bool GodotRestInfoContactResultCallback::needsCollision(btBroadphaseProxy *proxy
 }
 
 btScalar GodotRestInfoContactResultCallback::addSingleResult(btManifoldPoint &cp, const btCollisionObjectWrapper *colObj0Wrap, int partId0, int index0, const btCollisionObjectWrapper *colObj1Wrap, int partId1, int index1) {
-
 	if (cp.getDistance() <= m_min_distance) {
 		m_min_distance = cp.getDistance();
 
@@ -325,7 +341,6 @@ btScalar GodotRestInfoContactResultCallback::addSingleResult(btManifoldPoint &cp
 }
 
 void GodotDeepPenetrationContactResultCallback::addContactPoint(const btVector3 &normalOnBInWorld, const btVector3 &pointInWorldOnB, btScalar depth) {
-
 	if (m_penetration_distance > depth) { // Has penetration?
 
 		const bool isSwapped = m_manifoldPtr->getBody0() != m_body0Wrap->getCollisionObject();
diff --git a/modules/bullet/godot_result_callbacks.h b/modules/bullet/godot_result_callbacks.h
index 4f634ed6f0..1325542973 100644
--- a/modules/bullet/godot_result_callbacks.h
+++ b/modules/bullet/godot_result_callbacks.h
@@ -31,7 +31,7 @@
 #ifndef GODOT_RESULT_CALLBACKS_H
 #define GODOT_RESULT_CALLBACKS_H
 
-#include "servers/physics_server.h"
+#include "servers/physics_server_3d.h"
 
 #include <BulletCollision/BroadphaseCollision/btBroadphaseProxy.h>
 #include <btBulletDynamicsCommon.h>
@@ -56,8 +56,8 @@ struct GodotFilterCallback : public btOverlapFilterCallback {
 /// It performs an additional check allow exclusions.
 struct GodotClosestRayResultCallback : public btCollisionWorld::ClosestRayResultCallback {
 	const Set<RID> *m_exclude;
-	bool m_pickRay;
-	int m_shapeId;
+	bool m_pickRay = false;
+	int m_shapeId = 0;
 
 	bool collide_with_bodies;
 	bool collide_with_areas;
@@ -66,18 +66,17 @@ public:
 	GodotClosestRayResultCallback(const btVector3 &rayFromWorld, const btVector3 &rayToWorld, const Set<RID> *p_exclude, bool p_collide_with_bodies, bool p_collide_with_areas) :
 			btCollisionWorld::ClosestRayResultCallback(rayFromWorld, rayToWorld),
 			m_exclude(p_exclude),
-			m_pickRay(false),
-			m_shapeId(0),
 			collide_with_bodies(p_collide_with_bodies),
 			collide_with_areas(p_collide_with_areas) {}
 
 	virtual bool needsCollision(btBroadphaseProxy *proxy0) const;
 
 	virtual btScalar addSingleResult(btCollisionWorld::LocalRayResult &rayResult, bool normalInWorldSpace) {
-		if (rayResult.m_localShapeInfo)
+		if (rayResult.m_localShapeInfo) {
 			m_shapeId = rayResult.m_localShapeInfo->m_triangleIndex; // "m_triangleIndex" Is a odd name but contains the compound shape ID
-		else
+		} else {
 			m_shapeId = 0;
+		}
 		return btCollisionWorld::ClosestRayResultCallback::addSingleResult(rayResult, normalInWorldSpace);
 	}
 };
@@ -85,16 +84,15 @@ public:
 // store all colliding object
 struct GodotAllConvexResultCallback : public btCollisionWorld::ConvexResultCallback {
 public:
-	PhysicsDirectSpaceState::ShapeResult *m_results;
+	PhysicsDirectSpaceState3D::ShapeResult *m_results;
 	int m_resultMax;
 	const Set<RID> *m_exclude;
-	int count;
+	int count = 0;
 
-	GodotAllConvexResultCallback(PhysicsDirectSpaceState::ShapeResult *p_results, int p_resultMax, const Set<RID> *p_exclude) :
+	GodotAllConvexResultCallback(PhysicsDirectSpaceState3D::ShapeResult *p_results, int p_resultMax, const Set<RID> *p_exclude) :
 			m_results(p_results),
 			m_resultMax(p_resultMax),
-			m_exclude(p_exclude),
-			count(0) {}
+			m_exclude(p_exclude) {}
 
 	virtual bool needsCollision(btBroadphaseProxy *proxy0) const;
 
@@ -117,7 +115,7 @@ public:
 struct GodotClosestConvexResultCallback : public btCollisionWorld::ClosestConvexResultCallback {
 public:
 	const Set<RID> *m_exclude;
-	int m_shapeId;
+	int m_shapeId = 0;
 
 	bool collide_with_bodies;
 	bool collide_with_areas;
@@ -125,7 +123,6 @@ public:
 	GodotClosestConvexResultCallback(const btVector3 &convexFromWorld, const btVector3 &convexToWorld, const Set<RID> *p_exclude, bool p_collide_with_bodies, bool p_collide_with_areas) :
 			btCollisionWorld::ClosestConvexResultCallback(convexFromWorld, convexToWorld),
 			m_exclude(p_exclude),
-			m_shapeId(0),
 			collide_with_bodies(p_collide_with_bodies),
 			collide_with_areas(p_collide_with_areas) {}
 
@@ -137,20 +134,19 @@ public:
 struct GodotAllContactResultCallback : public btCollisionWorld::ContactResultCallback {
 public:
 	const btCollisionObject *m_self_object;
-	PhysicsDirectSpaceState::ShapeResult *m_results;
+	PhysicsDirectSpaceState3D::ShapeResult *m_results;
 	int m_resultMax;
 	const Set<RID> *m_exclude;
-	int m_count;
+	int m_count = 0;
 
 	bool collide_with_bodies;
 	bool collide_with_areas;
 
-	GodotAllContactResultCallback(btCollisionObject *p_self_object, PhysicsDirectSpaceState::ShapeResult *p_results, int p_resultMax, const Set<RID> *p_exclude, bool p_collide_with_bodies, bool p_collide_with_areas) :
+	GodotAllContactResultCallback(btCollisionObject *p_self_object, PhysicsDirectSpaceState3D::ShapeResult *p_results, int p_resultMax, const Set<RID> *p_exclude, bool p_collide_with_bodies, bool p_collide_with_areas) :
 			m_self_object(p_self_object),
 			m_results(p_results),
 			m_resultMax(p_resultMax),
 			m_exclude(p_exclude),
-			m_count(0),
 			collide_with_bodies(p_collide_with_bodies),
 			collide_with_areas(p_collide_with_areas) {}
 
@@ -166,7 +162,7 @@ public:
 	Vector3 *m_results;
 	int m_resultMax;
 	const Set<RID> *m_exclude;
-	int m_count;
+	int m_count = 0;
 
 	bool collide_with_bodies;
 	bool collide_with_areas;
@@ -176,7 +172,6 @@ public:
 			m_results(p_results),
 			m_resultMax(p_resultMax),
 			m_exclude(p_exclude),
-			m_count(0),
 			collide_with_bodies(p_collide_with_bodies),
 			collide_with_areas(p_collide_with_areas) {}
 
@@ -188,21 +183,19 @@ public:
 struct GodotRestInfoContactResultCallback : public btCollisionWorld::ContactResultCallback {
 public:
 	const btCollisionObject *m_self_object;
-	PhysicsDirectSpaceState::ShapeRestInfo *m_result;
+	PhysicsDirectSpaceState3D::ShapeRestInfo *m_result;
 	const Set<RID> *m_exclude;
-	bool m_collided;
-	real_t m_min_distance;
+	bool m_collided = false;
+	real_t m_min_distance = 0;
 	const btCollisionObject *m_rest_info_collision_object;
 	btVector3 m_rest_info_bt_point;
 	bool collide_with_bodies;
 	bool collide_with_areas;
 
-	GodotRestInfoContactResultCallback(btCollisionObject *p_self_object, PhysicsDirectSpaceState::ShapeRestInfo *p_result, const Set<RID> *p_exclude, bool p_collide_with_bodies, bool p_collide_with_areas) :
+	GodotRestInfoContactResultCallback(btCollisionObject *p_self_object, PhysicsDirectSpaceState3D::ShapeRestInfo *p_result, const Set<RID> *p_exclude, bool p_collide_with_bodies, bool p_collide_with_areas) :
 			m_self_object(p_self_object),
 			m_result(p_result),
 			m_exclude(p_exclude),
-			m_collided(false),
-			m_min_distance(0),
 			collide_with_bodies(p_collide_with_bodies),
 			collide_with_areas(p_collide_with_areas) {}
 
@@ -214,13 +207,11 @@ public:
 struct GodotDeepPenetrationContactResultCallback : public btManifoldResult {
 	btVector3 m_pointNormalWorld;
 	btVector3 m_pointWorld;
-	btScalar m_penetration_distance;
-	int m_other_compound_shape_index;
+	btScalar m_penetration_distance = 0;
+	int m_other_compound_shape_index = 0;
 
 	GodotDeepPenetrationContactResultCallback(const btCollisionObjectWrapper *body0Wrap, const btCollisionObjectWrapper *body1Wrap) :
-			btManifoldResult(body0Wrap, body1Wrap),
-			m_penetration_distance(0),
-			m_other_compound_shape_index(0) {}
+			btManifoldResult(body0Wrap, body1Wrap) {}
 
 	void reset() {
 		m_penetration_distance = 0;
diff --git a/modules/bullet/hinge_joint_bullet.cpp b/modules/bullet/hinge_joint_bullet.cpp
index 49e67bfbc1..2338277565 100644
--- a/modules/bullet/hinge_joint_bullet.cpp
+++ b/modules/bullet/hinge_joint_bullet.cpp
@@ -42,7 +42,6 @@
 
 HingeJointBullet::HingeJointBullet(RigidBodyBullet *rbA, RigidBodyBullet *rbB, const Transform &frameA, const Transform &frameB) :
 		JointBullet() {
-
 	Transform scaled_AFrame(frameA.scaled(rbA->get_body_scale()));
 	scaled_AFrame.basis.rotref_posscale_decomposition(scaled_AFrame.basis);
 
@@ -50,7 +49,6 @@ HingeJointBullet::HingeJointBullet(RigidBodyBullet *rbA, RigidBodyBullet *rbB, c
 	G_TO_B(scaled_AFrame, btFrameA);
 
 	if (rbB) {
-
 		Transform scaled_BFrame(frameB.scaled(rbB->get_body_scale()));
 		scaled_BFrame.basis.rotref_posscale_decomposition(scaled_BFrame.basis);
 
@@ -59,7 +57,6 @@ HingeJointBullet::HingeJointBullet(RigidBodyBullet *rbA, RigidBodyBullet *rbB, c
 
 		hingeConstraint = bulletnew(btHingeConstraint(*rbA->get_bt_rigid_body(), *rbB->get_bt_rigid_body(), btFrameA, btFrameB));
 	} else {
-
 		hingeConstraint = bulletnew(btHingeConstraint(*rbA->get_bt_rigid_body(), btFrameA));
 	}
 
@@ -68,7 +65,6 @@ HingeJointBullet::HingeJointBullet(RigidBodyBullet *rbA, RigidBodyBullet *rbB, c
 
 HingeJointBullet::HingeJointBullet(RigidBodyBullet *rbA, RigidBodyBullet *rbB, const Vector3 &pivotInA, const Vector3 &pivotInB, const Vector3 &axisInA, const Vector3 &axisInB) :
 		JointBullet() {
-
 	btVector3 btPivotA;
 	btVector3 btAxisA;
 	G_TO_B(pivotInA * rbA->get_body_scale(), btPivotA);
@@ -82,7 +78,6 @@ HingeJointBullet::HingeJointBullet(RigidBodyBullet *rbA, RigidBodyBullet *rbB, c
 
 		hingeConstraint = bulletnew(btHingeConstraint(*rbA->get_bt_rigid_body(), *rbB->get_bt_rigid_body(), btPivotA, btPivotB, btAxisA, btAxisB));
 	} else {
-
 		hingeConstraint = bulletnew(btHingeConstraint(*rbA->get_bt_rigid_body(), btPivotA, btAxisA));
 	}
 
@@ -93,79 +88,85 @@ real_t HingeJointBullet::get_hinge_angle() {
 	return hingeConstraint->getHingeAngle();
 }
 
-void HingeJointBullet::set_param(PhysicsServer::HingeJointParam p_param, real_t p_value) {
+void HingeJointBullet::set_param(PhysicsServer3D::HingeJointParam p_param, real_t p_value) {
 	switch (p_param) {
-		case PhysicsServer::HINGE_JOINT_LIMIT_UPPER:
+		case PhysicsServer3D::HINGE_JOINT_BIAS:
+			WARN_DEPRECATED_MSG("The HingeJoint3D parameter \"bias\" is deprecated.");
+			break;
+		case PhysicsServer3D::HINGE_JOINT_LIMIT_UPPER:
 			hingeConstraint->setLimit(hingeConstraint->getLowerLimit(), p_value, hingeConstraint->getLimitSoftness(), hingeConstraint->getLimitBiasFactor(), hingeConstraint->getLimitRelaxationFactor());
 			break;
-		case PhysicsServer::HINGE_JOINT_LIMIT_LOWER:
+		case PhysicsServer3D::HINGE_JOINT_LIMIT_LOWER:
 			hingeConstraint->setLimit(p_value, hingeConstraint->getUpperLimit(), hingeConstraint->getLimitSoftness(), hingeConstraint->getLimitBiasFactor(), hingeConstraint->getLimitRelaxationFactor());
 			break;
-		case PhysicsServer::HINGE_JOINT_LIMIT_BIAS:
+		case PhysicsServer3D::HINGE_JOINT_LIMIT_BIAS:
 			hingeConstraint->setLimit(hingeConstraint->getLowerLimit(), hingeConstraint->getUpperLimit(), hingeConstraint->getLimitSoftness(), p_value, hingeConstraint->getLimitRelaxationFactor());
 			break;
-		case PhysicsServer::HINGE_JOINT_LIMIT_SOFTNESS:
+		case PhysicsServer3D::HINGE_JOINT_LIMIT_SOFTNESS:
 			hingeConstraint->setLimit(hingeConstraint->getLowerLimit(), hingeConstraint->getUpperLimit(), p_value, hingeConstraint->getLimitBiasFactor(), hingeConstraint->getLimitRelaxationFactor());
 			break;
-		case PhysicsServer::HINGE_JOINT_LIMIT_RELAXATION:
+		case PhysicsServer3D::HINGE_JOINT_LIMIT_RELAXATION:
 			hingeConstraint->setLimit(hingeConstraint->getLowerLimit(), hingeConstraint->getUpperLimit(), hingeConstraint->getLimitSoftness(), hingeConstraint->getLimitBiasFactor(), p_value);
 			break;
-		case PhysicsServer::HINGE_JOINT_MOTOR_TARGET_VELOCITY:
+		case PhysicsServer3D::HINGE_JOINT_MOTOR_TARGET_VELOCITY:
 			hingeConstraint->setMotorTargetVelocity(p_value);
 			break;
-		case PhysicsServer::HINGE_JOINT_MOTOR_MAX_IMPULSE:
+		case PhysicsServer3D::HINGE_JOINT_MOTOR_MAX_IMPULSE:
 			hingeConstraint->setMaxMotorImpulse(p_value);
 			break;
-		default:
-			WARN_DEPRECATED_MSG("The HingeJoint parameter " + itos(p_param) + " is deprecated.");
+		case PhysicsServer3D::HINGE_JOINT_MAX:
+			// Internal size value, nothing to do.
 			break;
 	}
 }
 
-real_t HingeJointBullet::get_param(PhysicsServer::HingeJointParam p_param) const {
+real_t HingeJointBullet::get_param(PhysicsServer3D::HingeJointParam p_param) const {
 	switch (p_param) {
-		case PhysicsServer::HINGE_JOINT_BIAS:
+		case PhysicsServer3D::HINGE_JOINT_BIAS:
+			WARN_DEPRECATED_MSG("The HingeJoint3D parameter \"bias\" is deprecated.");
 			return 0;
-			break;
-		case PhysicsServer::HINGE_JOINT_LIMIT_UPPER:
+		case PhysicsServer3D::HINGE_JOINT_LIMIT_UPPER:
 			return hingeConstraint->getUpperLimit();
-		case PhysicsServer::HINGE_JOINT_LIMIT_LOWER:
+		case PhysicsServer3D::HINGE_JOINT_LIMIT_LOWER:
 			return hingeConstraint->getLowerLimit();
-		case PhysicsServer::HINGE_JOINT_LIMIT_BIAS:
+		case PhysicsServer3D::HINGE_JOINT_LIMIT_BIAS:
 			return hingeConstraint->getLimitBiasFactor();
-		case PhysicsServer::HINGE_JOINT_LIMIT_SOFTNESS:
+		case PhysicsServer3D::HINGE_JOINT_LIMIT_SOFTNESS:
 			return hingeConstraint->getLimitSoftness();
-		case PhysicsServer::HINGE_JOINT_LIMIT_RELAXATION:
+		case PhysicsServer3D::HINGE_JOINT_LIMIT_RELAXATION:
 			return hingeConstraint->getLimitRelaxationFactor();
-		case PhysicsServer::HINGE_JOINT_MOTOR_TARGET_VELOCITY:
+		case PhysicsServer3D::HINGE_JOINT_MOTOR_TARGET_VELOCITY:
 			return hingeConstraint->getMotorTargetVelocity();
-		case PhysicsServer::HINGE_JOINT_MOTOR_MAX_IMPULSE:
+		case PhysicsServer3D::HINGE_JOINT_MOTOR_MAX_IMPULSE:
 			return hingeConstraint->getMaxMotorImpulse();
-		default:
-			WARN_DEPRECATED_MSG("The HingeJoint parameter " + itos(p_param) + " is deprecated.");
+		case PhysicsServer3D::HINGE_JOINT_MAX:
+			// Internal size value, nothing to do.
 			return 0;
 	}
+	// Compiler doesn't seem to notice that all code paths are fulfilled...
+	return 0;
 }
 
-void HingeJointBullet::set_flag(PhysicsServer::HingeJointFlag p_flag, bool p_value) {
+void HingeJointBullet::set_flag(PhysicsServer3D::HingeJointFlag p_flag, bool p_value) {
 	switch (p_flag) {
-		case PhysicsServer::HINGE_JOINT_FLAG_USE_LIMIT:
+		case PhysicsServer3D::HINGE_JOINT_FLAG_USE_LIMIT:
 			if (!p_value) {
 				hingeConstraint->setLimit(-Math_PI, Math_PI);
 			}
 			break;
-		case PhysicsServer::HINGE_JOINT_FLAG_ENABLE_MOTOR:
+		case PhysicsServer3D::HINGE_JOINT_FLAG_ENABLE_MOTOR:
 			hingeConstraint->enableMotor(p_value);
 			break;
-		case PhysicsServer::HINGE_JOINT_FLAG_MAX: break; // Can't happen, but silences warning
+		case PhysicsServer3D::HINGE_JOINT_FLAG_MAX:
+			break; // Can't happen, but silences warning
 	}
 }
 
-bool HingeJointBullet::get_flag(PhysicsServer::HingeJointFlag p_flag) const {
+bool HingeJointBullet::get_flag(PhysicsServer3D::HingeJointFlag p_flag) const {
 	switch (p_flag) {
-		case PhysicsServer::HINGE_JOINT_FLAG_USE_LIMIT:
+		case PhysicsServer3D::HINGE_JOINT_FLAG_USE_LIMIT:
 			return true;
-		case PhysicsServer::HINGE_JOINT_FLAG_ENABLE_MOTOR:
+		case PhysicsServer3D::HINGE_JOINT_FLAG_ENABLE_MOTOR:
 			return hingeConstraint->getEnableAngularMotor();
 		default:
 			return false;
diff --git a/modules/bullet/hinge_joint_bullet.h b/modules/bullet/hinge_joint_bullet.h
index d1061fe52f..120c40e5c0 100644
--- a/modules/bullet/hinge_joint_bullet.h
+++ b/modules/bullet/hinge_joint_bullet.h
@@ -44,14 +44,14 @@ public:
 	HingeJointBullet(RigidBodyBullet *rbA, RigidBodyBullet *rbB, const Transform &frameA, const Transform &frameB);
 	HingeJointBullet(RigidBodyBullet *rbA, RigidBodyBullet *rbB, const Vector3 &pivotInA, const Vector3 &pivotInB, const Vector3 &axisInA, const Vector3 &axisInB);
 
-	virtual PhysicsServer::JointType get_type() const { return PhysicsServer::JOINT_HINGE; }
+	virtual PhysicsServer3D::JointType get_type() const { return PhysicsServer3D::JOINT_HINGE; }
 
 	real_t get_hinge_angle();
 
-	void set_param(PhysicsServer::HingeJointParam p_param, real_t p_value);
-	real_t get_param(PhysicsServer::HingeJointParam p_param) const;
+	void set_param(PhysicsServer3D::HingeJointParam p_param, real_t p_value);
+	real_t get_param(PhysicsServer3D::HingeJointParam p_param) const;
 
-	void set_flag(PhysicsServer::HingeJointFlag p_flag, bool p_value);
-	bool get_flag(PhysicsServer::HingeJointFlag p_flag) const;
+	void set_flag(PhysicsServer3D::HingeJointFlag p_flag, bool p_value);
+	bool get_flag(PhysicsServer3D::HingeJointFlag p_flag) const;
 };
 #endif
diff --git a/modules/bullet/joint_bullet.h b/modules/bullet/joint_bullet.h
index c840eb8f14..c70cea817e 100644
--- a/modules/bullet/joint_bullet.h
+++ b/modules/bullet/joint_bullet.h
@@ -32,7 +32,7 @@
 #define JOINT_BULLET_H
 
 #include "constraint_bullet.h"
-#include "servers/physics_server.h"
+#include "servers/physics_server_3d.h"
 
 /**
 	@author AndreaCatania
@@ -42,11 +42,10 @@ class RigidBodyBullet;
 class btTypedConstraint;
 
 class JointBullet : public ConstraintBullet {
-
 public:
 	JointBullet();
 	virtual ~JointBullet();
 
-	virtual PhysicsServer::JointType get_type() const = 0;
+	virtual PhysicsServer3D::JointType get_type() const = 0;
 };
 #endif
diff --git a/modules/bullet/pin_joint_bullet.cpp b/modules/bullet/pin_joint_bullet.cpp
index 1c2e5e65cc..1cfbc65c78 100644
--- a/modules/bullet/pin_joint_bullet.cpp
+++ b/modules/bullet/pin_joint_bullet.cpp
@@ -42,7 +42,6 @@
 PinJointBullet::PinJointBullet(RigidBodyBullet *p_body_a, const Vector3 &p_pos_a, RigidBodyBullet *p_body_b, const Vector3 &p_pos_b) :
 		JointBullet() {
 	if (p_body_b) {
-
 		btVector3 btPivotA;
 		btVector3 btPivotB;
 		G_TO_B(p_pos_a * p_body_a->get_body_scale(), btPivotA);
@@ -62,32 +61,31 @@ PinJointBullet::PinJointBullet(RigidBodyBullet *p_body_a, const Vector3 &p_pos_a
 
 PinJointBullet::~PinJointBullet() {}
 
-void PinJointBullet::set_param(PhysicsServer::PinJointParam p_param, real_t p_value) {
+void PinJointBullet::set_param(PhysicsServer3D::PinJointParam p_param, real_t p_value) {
 	switch (p_param) {
-		case PhysicsServer::PIN_JOINT_BIAS:
+		case PhysicsServer3D::PIN_JOINT_BIAS:
 			p2pConstraint->m_setting.m_tau = p_value;
 			break;
-		case PhysicsServer::PIN_JOINT_DAMPING:
+		case PhysicsServer3D::PIN_JOINT_DAMPING:
 			p2pConstraint->m_setting.m_damping = p_value;
 			break;
-		case PhysicsServer::PIN_JOINT_IMPULSE_CLAMP:
+		case PhysicsServer3D::PIN_JOINT_IMPULSE_CLAMP:
 			p2pConstraint->m_setting.m_impulseClamp = p_value;
 			break;
 	}
 }
 
-real_t PinJointBullet::get_param(PhysicsServer::PinJointParam p_param) const {
+real_t PinJointBullet::get_param(PhysicsServer3D::PinJointParam p_param) const {
 	switch (p_param) {
-		case PhysicsServer::PIN_JOINT_BIAS:
+		case PhysicsServer3D::PIN_JOINT_BIAS:
 			return p2pConstraint->m_setting.m_tau;
-		case PhysicsServer::PIN_JOINT_DAMPING:
+		case PhysicsServer3D::PIN_JOINT_DAMPING:
 			return p2pConstraint->m_setting.m_damping;
-		case PhysicsServer::PIN_JOINT_IMPULSE_CLAMP:
+		case PhysicsServer3D::PIN_JOINT_IMPULSE_CLAMP:
 			return p2pConstraint->m_setting.m_impulseClamp;
-		default:
-			WARN_DEPRECATED_MSG("The parameter " + itos(p_param) + " is deprecated.");
-			return 0;
 	}
+	// Compiler doesn't seem to notice that all code paths are fulfilled...
+	return 0;
 }
 
 void PinJointBullet::setPivotInA(const Vector3 &p_pos) {
diff --git a/modules/bullet/pin_joint_bullet.h b/modules/bullet/pin_joint_bullet.h
index d6e7a945b5..e7d05f34d4 100644
--- a/modules/bullet/pin_joint_bullet.h
+++ b/modules/bullet/pin_joint_bullet.h
@@ -46,10 +46,10 @@ public:
 	PinJointBullet(RigidBodyBullet *p_body_a, const Vector3 &p_pos_a, RigidBodyBullet *p_body_b, const Vector3 &p_pos_b);
 	~PinJointBullet();
 
-	virtual PhysicsServer::JointType get_type() const { return PhysicsServer::JOINT_PIN; }
+	virtual PhysicsServer3D::JointType get_type() const { return PhysicsServer3D::JOINT_PIN; }
 
-	void set_param(PhysicsServer::PinJointParam p_param, real_t p_value);
-	real_t get_param(PhysicsServer::PinJointParam p_param) const;
+	void set_param(PhysicsServer3D::PinJointParam p_param, real_t p_value);
+	real_t get_param(PhysicsServer3D::PinJointParam p_param) const;
 
 	void setPivotInA(const Vector3 &p_pos);
 	void setPivotInB(const Vector3 &p_pos);
diff --git a/modules/bullet/register_types.cpp b/modules/bullet/register_types.cpp
index 7819b67cad..009d0dff63 100644
--- a/modules/bullet/register_types.cpp
+++ b/modules/bullet/register_types.cpp
@@ -39,15 +39,15 @@
 */
 
 #ifndef _3D_DISABLED
-PhysicsServer *_createBulletPhysicsCallback() {
-	return memnew(BulletPhysicsServer);
+PhysicsServer3D *_createBulletPhysicsCallback() {
+	return memnew(BulletPhysicsServer3D);
 }
 #endif
 
 void register_bullet_types() {
 #ifndef _3D_DISABLED
-	PhysicsServerManager::register_server("Bullet", &_createBulletPhysicsCallback);
-	PhysicsServerManager::set_default_server("Bullet", 1);
+	PhysicsServer3DManager::register_server("Bullet", &_createBulletPhysicsCallback);
+	PhysicsServer3DManager::set_default_server("Bullet", 1);
 
 	GLOBAL_DEF("physics/3d/active_soft_world", true);
 	ProjectSettings::get_singleton()->set_custom_property_info("physics/3d/active_soft_world", PropertyInfo(Variant::BOOL, "physics/3d/active_soft_world"));
diff --git a/modules/bullet/rid_bullet.h b/modules/bullet/rid_bullet.h
index 28bcedb01a..3551ca05f9 100644
--- a/modules/bullet/rid_bullet.h
+++ b/modules/bullet/rid_bullet.h
@@ -37,17 +37,17 @@
 	@author AndreaCatania
 */
 
-class BulletPhysicsServer;
+class BulletPhysicsServer3D;
 
-class RIDBullet : public RID_Data {
+class RIDBullet {
 	RID self;
-	BulletPhysicsServer *physicsServer;
+	BulletPhysicsServer3D *physicsServer;
 
 public:
 	_FORCE_INLINE_ void set_self(const RID &p_self) { self = p_self; }
 	_FORCE_INLINE_ RID get_self() const { return self; }
 
-	_FORCE_INLINE_ void _set_physics_server(BulletPhysicsServer *p_physicsServer) { physicsServer = p_physicsServer; }
-	_FORCE_INLINE_ BulletPhysicsServer *get_physics_server() const { return physicsServer; }
+	_FORCE_INLINE_ void _set_physics_server(BulletPhysicsServer3D *p_physicsServer) { physicsServer = p_physicsServer; }
+	_FORCE_INLINE_ BulletPhysicsServer3D *get_physics_server() const { return physicsServer; }
 };
 #endif
diff --git a/modules/bullet/rigid_body_bullet.cpp b/modules/bullet/rigid_body_bullet.cpp
index 16a8cf8ede..f517eecf64 100644
--- a/modules/bullet/rigid_body_bullet.cpp
+++ b/modules/bullet/rigid_body_bullet.cpp
@@ -48,142 +48,140 @@
 	@author AndreaCatania
 */
 
-BulletPhysicsDirectBodyState *BulletPhysicsDirectBodyState::singleton = NULL;
+BulletPhysicsDirectBodyState3D *BulletPhysicsDirectBodyState3D::singleton = nullptr;
 
-Vector3 BulletPhysicsDirectBodyState::get_total_gravity() const {
-	Vector3 gVec;
-	B_TO_G(body->btBody->getGravity(), gVec);
-	return gVec;
+Vector3 BulletPhysicsDirectBodyState3D::get_total_gravity() const {
+	return body->total_gravity;
 }
 
-float BulletPhysicsDirectBodyState::get_total_angular_damp() const {
+float BulletPhysicsDirectBodyState3D::get_total_angular_damp() const {
 	return body->btBody->getAngularDamping();
 }
 
-float BulletPhysicsDirectBodyState::get_total_linear_damp() const {
+float BulletPhysicsDirectBodyState3D::get_total_linear_damp() const {
 	return body->btBody->getLinearDamping();
 }
 
-Vector3 BulletPhysicsDirectBodyState::get_center_of_mass() const {
+Vector3 BulletPhysicsDirectBodyState3D::get_center_of_mass() const {
 	Vector3 gVec;
 	B_TO_G(body->btBody->getCenterOfMassPosition(), gVec);
 	return gVec;
 }
 
-Basis BulletPhysicsDirectBodyState::get_principal_inertia_axes() const {
+Basis BulletPhysicsDirectBodyState3D::get_principal_inertia_axes() const {
 	return Basis();
 }
 
-float BulletPhysicsDirectBodyState::get_inverse_mass() const {
+float BulletPhysicsDirectBodyState3D::get_inverse_mass() const {
 	return body->btBody->getInvMass();
 }
 
-Vector3 BulletPhysicsDirectBodyState::get_inverse_inertia() const {
+Vector3 BulletPhysicsDirectBodyState3D::get_inverse_inertia() const {
 	Vector3 gVec;
 	B_TO_G(body->btBody->getInvInertiaDiagLocal(), gVec);
 	return gVec;
 }
 
-Basis BulletPhysicsDirectBodyState::get_inverse_inertia_tensor() const {
+Basis BulletPhysicsDirectBodyState3D::get_inverse_inertia_tensor() const {
 	Basis gInertia;
 	B_TO_G(body->btBody->getInvInertiaTensorWorld(), gInertia);
 	return gInertia;
 }
 
-void BulletPhysicsDirectBodyState::set_linear_velocity(const Vector3 &p_velocity) {
+void BulletPhysicsDirectBodyState3D::set_linear_velocity(const Vector3 &p_velocity) {
 	body->set_linear_velocity(p_velocity);
 }
 
-Vector3 BulletPhysicsDirectBodyState::get_linear_velocity() const {
+Vector3 BulletPhysicsDirectBodyState3D::get_linear_velocity() const {
 	return body->get_linear_velocity();
 }
 
-void BulletPhysicsDirectBodyState::set_angular_velocity(const Vector3 &p_velocity) {
+void BulletPhysicsDirectBodyState3D::set_angular_velocity(const Vector3 &p_velocity) {
 	body->set_angular_velocity(p_velocity);
 }
 
-Vector3 BulletPhysicsDirectBodyState::get_angular_velocity() const {
+Vector3 BulletPhysicsDirectBodyState3D::get_angular_velocity() const {
 	return body->get_angular_velocity();
 }
 
-void BulletPhysicsDirectBodyState::set_transform(const Transform &p_transform) {
+void BulletPhysicsDirectBodyState3D::set_transform(const Transform &p_transform) {
 	body->set_transform(p_transform);
 }
 
-Transform BulletPhysicsDirectBodyState::get_transform() const {
+Transform BulletPhysicsDirectBodyState3D::get_transform() const {
 	return body->get_transform();
 }
 
-void BulletPhysicsDirectBodyState::add_central_force(const Vector3 &p_force) {
+void BulletPhysicsDirectBodyState3D::add_central_force(const Vector3 &p_force) {
 	body->apply_central_force(p_force);
 }
 
-void BulletPhysicsDirectBodyState::add_force(const Vector3 &p_force, const Vector3 &p_pos) {
-	body->apply_force(p_force, p_pos);
+void BulletPhysicsDirectBodyState3D::add_force(const Vector3 &p_force, const Vector3 &p_position) {
+	body->apply_force(p_force, p_position);
 }
 
-void BulletPhysicsDirectBodyState::add_torque(const Vector3 &p_torque) {
+void BulletPhysicsDirectBodyState3D::add_torque(const Vector3 &p_torque) {
 	body->apply_torque(p_torque);
 }
 
-void BulletPhysicsDirectBodyState::apply_central_impulse(const Vector3 &p_impulse) {
+void BulletPhysicsDirectBodyState3D::apply_central_impulse(const Vector3 &p_impulse) {
 	body->apply_central_impulse(p_impulse);
 }
 
-void BulletPhysicsDirectBodyState::apply_impulse(const Vector3 &p_pos, const Vector3 &p_impulse) {
-	body->apply_impulse(p_pos, p_impulse);
+void BulletPhysicsDirectBodyState3D::apply_impulse(const Vector3 &p_impulse, const Vector3 &p_position) {
+	body->apply_impulse(p_impulse, p_position);
 }
 
-void BulletPhysicsDirectBodyState::apply_torque_impulse(const Vector3 &p_impulse) {
+void BulletPhysicsDirectBodyState3D::apply_torque_impulse(const Vector3 &p_impulse) {
 	body->apply_torque_impulse(p_impulse);
 }
 
-void BulletPhysicsDirectBodyState::set_sleep_state(bool p_enable) {
-	body->set_activation_state(p_enable);
+void BulletPhysicsDirectBodyState3D::set_sleep_state(bool p_sleep) {
+	body->set_activation_state(!p_sleep);
 }
 
-bool BulletPhysicsDirectBodyState::is_sleeping() const {
+bool BulletPhysicsDirectBodyState3D::is_sleeping() const {
 	return !body->is_active();
 }
 
-int BulletPhysicsDirectBodyState::get_contact_count() const {
+int BulletPhysicsDirectBodyState3D::get_contact_count() const {
 	return body->collisionsCount;
 }
 
-Vector3 BulletPhysicsDirectBodyState::get_contact_local_position(int p_contact_idx) const {
+Vector3 BulletPhysicsDirectBodyState3D::get_contact_local_position(int p_contact_idx) const {
 	return body->collisions[p_contact_idx].hitLocalLocation;
 }
 
-Vector3 BulletPhysicsDirectBodyState::get_contact_local_normal(int p_contact_idx) const {
+Vector3 BulletPhysicsDirectBodyState3D::get_contact_local_normal(int p_contact_idx) const {
 	return body->collisions[p_contact_idx].hitNormal;
 }
 
-float BulletPhysicsDirectBodyState::get_contact_impulse(int p_contact_idx) const {
+float BulletPhysicsDirectBodyState3D::get_contact_impulse(int p_contact_idx) const {
 	return body->collisions[p_contact_idx].appliedImpulse;
 }
 
-int BulletPhysicsDirectBodyState::get_contact_local_shape(int p_contact_idx) const {
+int BulletPhysicsDirectBodyState3D::get_contact_local_shape(int p_contact_idx) const {
 	return body->collisions[p_contact_idx].local_shape;
 }
 
-RID BulletPhysicsDirectBodyState::get_contact_collider(int p_contact_idx) const {
+RID BulletPhysicsDirectBodyState3D::get_contact_collider(int p_contact_idx) const {
 	return body->collisions[p_contact_idx].otherObject->get_self();
 }
 
-Vector3 BulletPhysicsDirectBodyState::get_contact_collider_position(int p_contact_idx) const {
+Vector3 BulletPhysicsDirectBodyState3D::get_contact_collider_position(int p_contact_idx) const {
 	return body->collisions[p_contact_idx].hitWorldLocation;
 }
 
-ObjectID BulletPhysicsDirectBodyState::get_contact_collider_id(int p_contact_idx) const {
+ObjectID BulletPhysicsDirectBodyState3D::get_contact_collider_id(int p_contact_idx) const {
 	return body->collisions[p_contact_idx].otherObject->get_instance_id();
 }
 
-int BulletPhysicsDirectBodyState::get_contact_collider_shape(int p_contact_idx) const {
+int BulletPhysicsDirectBodyState3D::get_contact_collider_shape(int p_contact_idx) const {
 	return body->collisions[p_contact_idx].other_object_shape;
 }
 
-Vector3 BulletPhysicsDirectBodyState::get_contact_collider_velocity_at_position(int p_contact_idx) const {
-	RigidBodyBullet::CollisionData &colDat = body->collisions.write[p_contact_idx];
+Vector3 BulletPhysicsDirectBodyState3D::get_contact_collider_velocity_at_position(int p_contact_idx) const {
+	RigidBodyBullet::CollisionData &colDat = body->collisions[p_contact_idx];
 
 	btVector3 hitLocation;
 	G_TO_B(colDat.hitLocalLocation, hitLocation);
@@ -194,7 +192,7 @@ Vector3 BulletPhysicsDirectBodyState::get_contact_collider_velocity_at_position(
 	return velocityAtPoint;
 }
 
-PhysicsDirectSpaceState *BulletPhysicsDirectBodyState::get_space_state() {
+PhysicsDirectSpaceState3D *BulletPhysicsDirectBodyState3D::get_space_state() {
 	return body->get_space()->get_direct_state();
 }
 
@@ -213,7 +211,7 @@ void RigidBodyBullet::KinematicUtilities::setSafeMargin(btScalar p_margin) {
 }
 
 void RigidBodyBullet::KinematicUtilities::copyAllOwnerShapes() {
-	const Vector<CollisionObjectBullet::ShapeWrapper> &shapes_wrappers(owner->get_shapes_wrappers());
+	const LocalVector<CollisionObjectBullet::ShapeWrapper> &shapes_wrappers(owner->get_shapes_wrappers());
 	const int shapes_count = shapes_wrappers.size();
 
 	just_delete_shapes(shapes_count);
@@ -228,20 +226,20 @@ void RigidBodyBullet::KinematicUtilities::copyAllOwnerShapes() {
 			continue;
 		}
 
-		shapes.write[i].transform = shape_wrapper->transform;
-		shapes.write[i].transform.getOrigin() *= owner_scale;
+		shapes[i].transform = shape_wrapper->transform;
+		shapes[i].transform.getOrigin() *= owner_scale;
 		switch (shape_wrapper->shape->get_type()) {
-			case PhysicsServer::SHAPE_SPHERE:
-			case PhysicsServer::SHAPE_BOX:
-			case PhysicsServer::SHAPE_CAPSULE:
-			case PhysicsServer::SHAPE_CYLINDER:
-			case PhysicsServer::SHAPE_CONVEX_POLYGON:
-			case PhysicsServer::SHAPE_RAY: {
-				shapes.write[i].shape = static_cast<btConvexShape *>(shape_wrapper->shape->create_bt_shape(owner_scale * shape_wrapper->scale, safe_margin));
+			case PhysicsServer3D::SHAPE_SPHERE:
+			case PhysicsServer3D::SHAPE_BOX:
+			case PhysicsServer3D::SHAPE_CAPSULE:
+			case PhysicsServer3D::SHAPE_CYLINDER:
+			case PhysicsServer3D::SHAPE_CONVEX_POLYGON:
+			case PhysicsServer3D::SHAPE_RAY: {
+				shapes[i].shape = static_cast<btConvexShape *>(shape_wrapper->shape->internal_create_bt_shape(owner_scale * shape_wrapper->scale, safe_margin));
 			} break;
 			default:
-				WARN_PRINT("This shape is not supported to be kinematic!");
-				shapes.write[i].shape = NULL;
+				WARN_PRINT("This shape is not supported for kinematic collision.");
+				shapes[i].shape = nullptr;
 		}
 	}
 }
@@ -249,49 +247,30 @@ void RigidBodyBullet::KinematicUtilities::copyAllOwnerShapes() {
 void RigidBodyBullet::KinematicUtilities::just_delete_shapes(int new_size) {
 	for (int i = shapes.size() - 1; 0 <= i; --i) {
 		if (shapes[i].shape) {
-			bulletdelete(shapes.write[i].shape);
+			bulletdelete(shapes[i].shape);
 		}
 	}
 	shapes.resize(new_size);
 }
 
 RigidBodyBullet::RigidBodyBullet() :
-		RigidCollisionObjectBullet(CollisionObjectBullet::TYPE_RIGID_BODY),
-		kinematic_utilities(NULL),
-		locked_axis(0),
-		mass(1),
-		gravity_scale(1),
-		linearDamp(0),
-		angularDamp(0),
-		can_sleep(true),
-		omit_forces_integration(false),
-		can_integrate_forces(false),
-		maxCollisionsDetection(0),
-		collisionsCount(0),
-		prev_collision_count(0),
-		maxAreasWhereIam(10),
-		areaWhereIamCount(0),
-		countGravityPointSpaces(0),
-		isScratchedSpaceOverrideModificator(false),
-		previousActiveState(true),
-		force_integration_callback(NULL) {
-
+		RigidCollisionObjectBullet(CollisionObjectBullet::TYPE_RIGID_BODY) {
 	godotMotionState = bulletnew(GodotMotionState(this));
 
 	// Initial properties
 	const btVector3 localInertia(0, 0, 0);
-	btRigidBody::btRigidBodyConstructionInfo cInfo(mass, godotMotionState, NULL, localInertia);
+	btRigidBody::btRigidBodyConstructionInfo cInfo(mass, godotMotionState, nullptr, localInertia);
 
 	btBody = bulletnew(btRigidBody(cInfo));
 	reload_shapes();
 	setupBulletCollisionObject(btBody);
 
-	set_mode(PhysicsServer::BODY_MODE_RIGID);
+	set_mode(PhysicsServer3D::BODY_MODE_RIGID);
 	reload_axis_lock();
 
 	areasWhereIam.resize(maxAreasWhereIam);
-	for (int i = areasWhereIam.size() - 1; 0 <= i; --i) {
-		areasWhereIam.write[i] = NULL;
+	for (uint32_t i = 0; i < areasWhereIam.size(); i += 1) {
+		areasWhereIam[i] = nullptr;
 	}
 	btBody->setSleepingThresholds(0.2, 0.2);
 
@@ -302,8 +281,9 @@ RigidBodyBullet::RigidBodyBullet() :
 RigidBodyBullet::~RigidBodyBullet() {
 	bulletdelete(godotMotionState);
 
-	if (force_integration_callback)
+	if (force_integration_callback) {
 		memdelete(force_integration_callback);
+	}
 
 	destroy_kinematic_utilities();
 }
@@ -315,21 +295,22 @@ void RigidBodyBullet::init_kinematic_utilities() {
 void RigidBodyBullet::destroy_kinematic_utilities() {
 	if (kinematic_utilities) {
 		memdelete(kinematic_utilities);
-		kinematic_utilities = NULL;
+		kinematic_utilities = nullptr;
 	}
 }
 
 void RigidBodyBullet::main_shape_changed() {
-	CRASH_COND(!get_main_shape())
+	CRASH_COND(!get_main_shape());
 	btBody->setCollisionShape(get_main_shape());
 	set_continuous_collision_detection(is_continuous_collision_detection_enabled()); // Reset
 }
 
-void RigidBodyBullet::reload_body() {
+void RigidBodyBullet::do_reload_body() {
 	if (space) {
 		space->remove_rigid_body(this);
-		if (get_main_shape())
+		if (get_main_shape()) {
 			space->add_rigid_body(this);
+		}
 	}
 }
 
@@ -337,65 +318,72 @@ void RigidBodyBullet::set_space(SpaceBullet *p_space) {
 	// Clear the old space if there is one
 	if (space) {
 		can_integrate_forces = false;
+		isScratchedSpaceOverrideModificator = false;
 
 		// Remove all eventual constraints
 		assert_no_constraints();
 
 		// Remove this object form the physics world
+		space->unregister_collision_object(this);
 		space->remove_rigid_body(this);
 	}
 
 	space = p_space;
 
 	if (space) {
-		space->add_rigid_body(this);
+		space->register_collision_object(this);
+		reload_body();
+		space->add_to_flush_queue(this);
 	}
 }
 
 void RigidBodyBullet::dispatch_callbacks() {
+	RigidCollisionObjectBullet::dispatch_callbacks();
+
 	/// The check isFirstTransformChanged is necessary in order to call integrated forces only when the first transform is sent
 	if ((btBody->isKinematicObject() || btBody->isActive() || previousActiveState != btBody->isActive()) && force_integration_callback && can_integrate_forces) {
-
-		if (omit_forces_integration)
-			btBody->clearForces();
-
-		BulletPhysicsDirectBodyState *bodyDirect = BulletPhysicsDirectBodyState::get_singleton(this);
+		BulletPhysicsDirectBodyState3D *bodyDirect = BulletPhysicsDirectBodyState3D::get_singleton(this);
 
 		Variant variantBodyDirect = bodyDirect;
 
 		Object *obj = ObjectDB::get_instance(force_integration_callback->id);
 		if (!obj) {
 			// Remove integration callback
-			set_force_integration_callback(0, StringName());
+			set_force_integration_callback(ObjectID(), StringName());
 		} else {
 			const Variant *vp[2] = { &variantBodyDirect, &force_integration_callback->udata };
 
-			Variant::CallError responseCallError;
+			Callable::CallError responseCallError;
 			int argc = (force_integration_callback->udata.get_type() == Variant::NIL) ? 1 : 2;
 			obj->call(force_integration_callback->method, vp, argc, responseCallError);
 		}
 	}
 
+	previousActiveState = btBody->isActive();
+}
+
+void RigidBodyBullet::pre_process() {
+	RigidCollisionObjectBullet::pre_process();
+
 	if (isScratchedSpaceOverrideModificator || 0 < countGravityPointSpaces) {
 		isScratchedSpaceOverrideModificator = false;
 		reload_space_override_modificator();
 	}
 
-	/// Lock axis
-	btBody->setLinearVelocity(btBody->getLinearVelocity() * btBody->getLinearFactor());
-	btBody->setAngularVelocity(btBody->getAngularVelocity() * btBody->getAngularFactor());
-
-	previousActiveState = btBody->isActive();
+	if (is_active()) {
+		/// Lock axis
+		btBody->setLinearVelocity(btBody->getLinearVelocity() * btBody->getLinearFactor());
+		btBody->setAngularVelocity(btBody->getAngularVelocity() * btBody->getAngularFactor());
+	}
 }
 
 void RigidBodyBullet::set_force_integration_callback(ObjectID p_id, const StringName &p_method, const Variant &p_udata) {
-
 	if (force_integration_callback) {
 		memdelete(force_integration_callback);
-		force_integration_callback = NULL;
+		force_integration_callback = nullptr;
 	}
 
-	if (p_id != 0) {
+	if (p_id.is_valid()) {
 		force_integration_callback = memnew(ForceIntegrationCallback);
 		force_integration_callback->id = p_id;
 		force_integration_callback->method = p_method;
@@ -407,7 +395,7 @@ void RigidBodyBullet::scratch_space_override_modificator() {
 	isScratchedSpaceOverrideModificator = true;
 }
 
-void RigidBodyBullet::on_collision_filters_change() {
+void RigidBodyBullet::do_reload_collision_filters() {
 	if (space) {
 		space->reload_collision_filters(this);
 	}
@@ -416,28 +404,27 @@ void RigidBodyBullet::on_collision_filters_change() {
 }
 
 void RigidBodyBullet::on_collision_checker_start() {
-
 	prev_collision_count = collisionsCount;
 	collisionsCount = 0;
 
 	// Swap array
-	Vector<RigidBodyBullet *> *s = prev_collision_traces;
-	prev_collision_traces = curr_collision_traces;
-	curr_collision_traces = s;
+	SWAP(prev_collision_traces, curr_collision_traces);
 }
 
 void RigidBodyBullet::on_collision_checker_end() {
 	// Always true if active and not a static or kinematic body
 	isTransformChanged = btBody->isActive() && !btBody->isStaticOrKinematicObject();
+	if (isTransformChanged && space != nullptr) {
+		space->add_to_flush_queue(this);
+	}
 }
 
 bool RigidBodyBullet::add_collision_object(RigidBodyBullet *p_otherObject, const Vector3 &p_hitWorldLocation, const Vector3 &p_hitLocalLocation, const Vector3 &p_hitNormal, const float &p_appliedImpulse, int p_other_shape_index, int p_local_shape_index) {
-
 	if (collisionsCount >= maxCollisionsDetection) {
 		return false;
 	}
 
-	CollisionData &cd = collisions.write[collisionsCount];
+	CollisionData &cd = collisions[collisionsCount];
 	cd.hitLocalLocation = p_hitLocalLocation;
 	cd.otherObject = p_otherObject;
 	cd.hitWorldLocation = p_hitWorldLocation;
@@ -446,7 +433,7 @@ bool RigidBodyBullet::add_collision_object(RigidBodyBullet *p_otherObject, const
 	cd.other_object_shape = p_other_shape_index;
 	cd.local_shape = p_local_shape_index;
 
-	curr_collision_traces->write[collisionsCount] = p_otherObject;
+	(*curr_collision_traces)[collisionsCount] = p_otherObject;
 
 	++collisionsCount;
 	return true;
@@ -454,8 +441,9 @@ bool RigidBodyBullet::add_collision_object(RigidBodyBullet *p_otherObject, const
 
 bool RigidBodyBullet::was_colliding(RigidBodyBullet *p_other_object) {
 	for (int i = prev_collision_count - 1; 0 <= i; --i) {
-		if ((*prev_collision_traces)[i] == p_other_object)
+		if ((*prev_collision_traces)[i] == p_other_object) {
 			return true;
+		}
 	}
 	return false;
 }
@@ -464,11 +452,6 @@ void RigidBodyBullet::assert_no_constraints() {
 	if (btBody->getNumConstraintRefs()) {
 		WARN_PRINT("A body with a joints is destroyed. Please check the implementation in order to destroy the joint before the body.");
 	}
-	/*for(int i = btBody->getNumConstraintRefs()-1; 0<=i; --i){
-        btTypedConstraint* btConst = btBody->getConstraintRef(i);
-        JointBullet* joint = static_cast<JointBullet*>( btConst->getUserConstraintPtr() );
-        space->removeConstraint(joint);
-    }*/
 }
 
 void RigidBodyBullet::set_activation_state(bool p_active) {
@@ -485,87 +468,91 @@ bool RigidBodyBullet::is_active() const {
 
 void RigidBodyBullet::set_omit_forces_integration(bool p_omit) {
 	omit_forces_integration = p_omit;
+	scratch_space_override_modificator();
 }
 
-void RigidBodyBullet::set_param(PhysicsServer::BodyParameter p_param, real_t p_value) {
+void RigidBodyBullet::set_param(PhysicsServer3D::BodyParameter p_param, real_t p_value) {
 	switch (p_param) {
-		case PhysicsServer::BODY_PARAM_BOUNCE:
+		case PhysicsServer3D::BODY_PARAM_BOUNCE:
 			btBody->setRestitution(p_value);
 			break;
-		case PhysicsServer::BODY_PARAM_FRICTION:
+		case PhysicsServer3D::BODY_PARAM_FRICTION:
 			btBody->setFriction(p_value);
 			break;
-		case PhysicsServer::BODY_PARAM_MASS: {
+		case PhysicsServer3D::BODY_PARAM_MASS: {
 			ERR_FAIL_COND(p_value < 0);
 			mass = p_value;
 			_internal_set_mass(p_value);
 			break;
 		}
-		case PhysicsServer::BODY_PARAM_LINEAR_DAMP:
+		case PhysicsServer3D::BODY_PARAM_LINEAR_DAMP:
 			linearDamp = p_value;
-			btBody->setDamping(linearDamp, angularDamp);
+			// Mark for updating total linear damping.
+			scratch_space_override_modificator();
 			break;
-		case PhysicsServer::BODY_PARAM_ANGULAR_DAMP:
+		case PhysicsServer3D::BODY_PARAM_ANGULAR_DAMP:
 			angularDamp = p_value;
-			btBody->setDamping(linearDamp, angularDamp);
+			// Mark for updating total angular damping.
+			scratch_space_override_modificator();
 			break;
-		case PhysicsServer::BODY_PARAM_GRAVITY_SCALE:
+		case PhysicsServer3D::BODY_PARAM_GRAVITY_SCALE:
 			gravity_scale = p_value;
-			/// The Bullet gravity will be is set by reload_space_override_modificator
+			// The Bullet gravity will be is set by reload_space_override_modificator.
+			// Mark for updating total gravity scale.
 			scratch_space_override_modificator();
 			break;
 		default:
-			WARN_PRINTS("Parameter " + itos(p_param) + " not supported by bullet. Value: " + itos(p_value));
+			WARN_PRINT("Parameter " + itos(p_param) + " not supported by bullet. Value: " + itos(p_value));
 	}
 }
 
-real_t RigidBodyBullet::get_param(PhysicsServer::BodyParameter p_param) const {
+real_t RigidBodyBullet::get_param(PhysicsServer3D::BodyParameter p_param) const {
 	switch (p_param) {
-		case PhysicsServer::BODY_PARAM_BOUNCE:
+		case PhysicsServer3D::BODY_PARAM_BOUNCE:
 			return btBody->getRestitution();
-		case PhysicsServer::BODY_PARAM_FRICTION:
+		case PhysicsServer3D::BODY_PARAM_FRICTION:
 			return btBody->getFriction();
-		case PhysicsServer::BODY_PARAM_MASS: {
+		case PhysicsServer3D::BODY_PARAM_MASS: {
 			const btScalar invMass = btBody->getInvMass();
 			return 0 == invMass ? 0 : 1 / invMass;
 		}
-		case PhysicsServer::BODY_PARAM_LINEAR_DAMP:
+		case PhysicsServer3D::BODY_PARAM_LINEAR_DAMP:
 			return linearDamp;
-		case PhysicsServer::BODY_PARAM_ANGULAR_DAMP:
+		case PhysicsServer3D::BODY_PARAM_ANGULAR_DAMP:
 			return angularDamp;
-		case PhysicsServer::BODY_PARAM_GRAVITY_SCALE:
+		case PhysicsServer3D::BODY_PARAM_GRAVITY_SCALE:
 			return gravity_scale;
 		default:
-			WARN_PRINTS("Parameter " + itos(p_param) + " not supported by bullet");
+			WARN_PRINT("Parameter " + itos(p_param) + " not supported by bullet");
 			return 0;
 	}
 }
 
-void RigidBodyBullet::set_mode(PhysicsServer::BodyMode p_mode) {
+void RigidBodyBullet::set_mode(PhysicsServer3D::BodyMode p_mode) {
 	// This is necessary to block force_integration untile next move
 	can_integrate_forces = false;
 	destroy_kinematic_utilities();
 	// The mode change is relevant to its mass
 	switch (p_mode) {
-		case PhysicsServer::BODY_MODE_KINEMATIC:
-			mode = PhysicsServer::BODY_MODE_KINEMATIC;
+		case PhysicsServer3D::BODY_MODE_KINEMATIC:
+			mode = PhysicsServer3D::BODY_MODE_KINEMATIC;
 			reload_axis_lock();
 			_internal_set_mass(0);
 			init_kinematic_utilities();
 			break;
-		case PhysicsServer::BODY_MODE_STATIC:
-			mode = PhysicsServer::BODY_MODE_STATIC;
+		case PhysicsServer3D::BODY_MODE_STATIC:
+			mode = PhysicsServer3D::BODY_MODE_STATIC;
 			reload_axis_lock();
 			_internal_set_mass(0);
 			break;
-		case PhysicsServer::BODY_MODE_RIGID:
-			mode = PhysicsServer::BODY_MODE_RIGID;
+		case PhysicsServer3D::BODY_MODE_RIGID:
+			mode = PhysicsServer3D::BODY_MODE_RIGID;
 			reload_axis_lock();
 			_internal_set_mass(0 == mass ? 1 : mass);
 			scratch_space_override_modificator();
 			break;
-		case PhysicsServer::BODY_MODE_CHARACTER:
-			mode = PhysicsServer::BODY_MODE_CHARACTER;
+		case PhysicsServer3D::BODY_MODE_CHARACTER:
+			mode = PhysicsServer3D::BODY_MODE_CHARACTER;
 			reload_axis_lock();
 			_internal_set_mass(0 == mass ? 1 : mass);
 			scratch_space_override_modificator();
@@ -575,26 +562,26 @@ void RigidBodyBullet::set_mode(PhysicsServer::BodyMode p_mode) {
 	btBody->setAngularVelocity(btVector3(0, 0, 0));
 	btBody->setLinearVelocity(btVector3(0, 0, 0));
 }
-PhysicsServer::BodyMode RigidBodyBullet::get_mode() const {
+
+PhysicsServer3D::BodyMode RigidBodyBullet::get_mode() const {
 	return mode;
 }
 
-void RigidBodyBullet::set_state(PhysicsServer::BodyState p_state, const Variant &p_variant) {
-
+void RigidBodyBullet::set_state(PhysicsServer3D::BodyState p_state, const Variant &p_variant) {
 	switch (p_state) {
-		case PhysicsServer::BODY_STATE_TRANSFORM:
+		case PhysicsServer3D::BODY_STATE_TRANSFORM:
 			set_transform(p_variant);
 			break;
-		case PhysicsServer::BODY_STATE_LINEAR_VELOCITY:
+		case PhysicsServer3D::BODY_STATE_LINEAR_VELOCITY:
 			set_linear_velocity(p_variant);
 			break;
-		case PhysicsServer::BODY_STATE_ANGULAR_VELOCITY:
+		case PhysicsServer3D::BODY_STATE_ANGULAR_VELOCITY:
 			set_angular_velocity(p_variant);
 			break;
-		case PhysicsServer::BODY_STATE_SLEEPING:
+		case PhysicsServer3D::BODY_STATE_SLEEPING:
 			set_activation_state(!bool(p_variant));
 			break;
-		case PhysicsServer::BODY_STATE_CAN_SLEEP:
+		case PhysicsServer3D::BODY_STATE_CAN_SLEEP:
 			can_sleep = bool(p_variant);
 			if (!can_sleep) {
 				// Can't sleep
@@ -606,81 +593,88 @@ void RigidBodyBullet::set_state(PhysicsServer::BodyState p_state, const Variant
 	}
 }
 
-Variant RigidBodyBullet::get_state(PhysicsServer::BodyState p_state) const {
+Variant RigidBodyBullet::get_state(PhysicsServer3D::BodyState p_state) const {
 	switch (p_state) {
-		case PhysicsServer::BODY_STATE_TRANSFORM:
+		case PhysicsServer3D::BODY_STATE_TRANSFORM:
 			return get_transform();
-		case PhysicsServer::BODY_STATE_LINEAR_VELOCITY:
+		case PhysicsServer3D::BODY_STATE_LINEAR_VELOCITY:
 			return get_linear_velocity();
-		case PhysicsServer::BODY_STATE_ANGULAR_VELOCITY:
+		case PhysicsServer3D::BODY_STATE_ANGULAR_VELOCITY:
 			return get_angular_velocity();
-		case PhysicsServer::BODY_STATE_SLEEPING:
+		case PhysicsServer3D::BODY_STATE_SLEEPING:
 			return !is_active();
-		case PhysicsServer::BODY_STATE_CAN_SLEEP:
+		case PhysicsServer3D::BODY_STATE_CAN_SLEEP:
 			return can_sleep;
 		default:
-			WARN_PRINTS("This state " + itos(p_state) + " is not supported by Bullet");
+			WARN_PRINT("This state " + itos(p_state) + " is not supported by Bullet");
 			return Variant();
 	}
 }
 
 void RigidBodyBullet::apply_central_impulse(const Vector3 &p_impulse) {
-	btVector3 btImpu;
-	G_TO_B(p_impulse, btImpu);
-	if (Vector3() != p_impulse)
+	btVector3 btImpulse;
+	G_TO_B(p_impulse, btImpulse);
+	if (Vector3() != p_impulse) {
 		btBody->activate();
-	btBody->applyCentralImpulse(btImpu);
+	}
+	btBody->applyCentralImpulse(btImpulse);
 }
 
-void RigidBodyBullet::apply_impulse(const Vector3 &p_pos, const Vector3 &p_impulse) {
-	btVector3 btImpu;
-	btVector3 btPos;
-	G_TO_B(p_impulse, btImpu);
-	G_TO_B(p_pos, btPos);
-	if (Vector3() != p_impulse)
+void RigidBodyBullet::apply_impulse(const Vector3 &p_impulse, const Vector3 &p_position) {
+	btVector3 btImpulse;
+	btVector3 btPosition;
+	G_TO_B(p_impulse, btImpulse);
+	G_TO_B(p_position, btPosition);
+	if (Vector3() != p_impulse) {
 		btBody->activate();
-	btBody->applyImpulse(btImpu, btPos);
+	}
+	btBody->applyImpulse(btImpulse, btPosition);
 }
 
 void RigidBodyBullet::apply_torque_impulse(const Vector3 &p_impulse) {
 	btVector3 btImp;
 	G_TO_B(p_impulse, btImp);
-	if (Vector3() != p_impulse)
+	if (Vector3() != p_impulse) {
 		btBody->activate();
+	}
 	btBody->applyTorqueImpulse(btImp);
 }
 
-void RigidBodyBullet::apply_force(const Vector3 &p_force, const Vector3 &p_pos) {
+void RigidBodyBullet::apply_force(const Vector3 &p_force, const Vector3 &p_position) {
 	btVector3 btForce;
-	btVector3 btPos;
+	btVector3 btPosition;
 	G_TO_B(p_force, btForce);
-	G_TO_B(p_pos, btPos);
-	if (Vector3() != p_force)
+	G_TO_B(p_position, btPosition);
+	if (Vector3() != p_force) {
 		btBody->activate();
-	btBody->applyForce(btForce, btPos);
+	}
+	btBody->applyForce(btForce, btPosition);
 }
 
 void RigidBodyBullet::apply_central_force(const Vector3 &p_force) {
 	btVector3 btForce;
 	G_TO_B(p_force, btForce);
-	if (Vector3() != p_force)
+	if (Vector3() != p_force) {
 		btBody->activate();
+	}
 	btBody->applyCentralForce(btForce);
 }
 
 void RigidBodyBullet::apply_torque(const Vector3 &p_torque) {
 	btVector3 btTorq;
 	G_TO_B(p_torque, btTorq);
-	if (Vector3() != p_torque)
+	if (Vector3() != p_torque) {
 		btBody->activate();
+	}
 	btBody->applyTorque(btTorq);
 }
 
 void RigidBodyBullet::set_applied_force(const Vector3 &p_force) {
 	btVector3 btVec = btBody->getTotalTorque();
 
-	if (Vector3() != p_force)
+	if (Vector3() != p_force) {
 		btBody->activate();
+	}
 
 	btBody->clearForces();
 	btBody->applyTorque(btVec);
@@ -698,8 +692,9 @@ Vector3 RigidBodyBullet::get_applied_force() const {
 void RigidBodyBullet::set_applied_torque(const Vector3 &p_torque) {
 	btVector3 btVec = btBody->getTotalForce();
 
-	if (Vector3() != p_torque)
+	if (Vector3() != p_torque) {
 		btBody->activate();
+	}
 
 	btBody->clearForces();
 	btBody->applyCentralForce(btVec);
@@ -714,7 +709,7 @@ Vector3 RigidBodyBullet::get_applied_torque() const {
 	return gTotTorq;
 }
 
-void RigidBodyBullet::set_axis_lock(PhysicsServer::BodyAxis p_axis, bool lock) {
+void RigidBodyBullet::set_axis_lock(PhysicsServer3D::BodyAxis p_axis, bool lock) {
 	if (lock) {
 		locked_axis |= p_axis;
 	} else {
@@ -724,18 +719,17 @@ void RigidBodyBullet::set_axis_lock(PhysicsServer::BodyAxis p_axis, bool lock) {
 	reload_axis_lock();
 }
 
-bool RigidBodyBullet::is_axis_locked(PhysicsServer::BodyAxis p_axis) const {
+bool RigidBodyBullet::is_axis_locked(PhysicsServer3D::BodyAxis p_axis) const {
 	return locked_axis & p_axis;
 }
 
 void RigidBodyBullet::reload_axis_lock() {
-
-	btBody->setLinearFactor(btVector3(float(!is_axis_locked(PhysicsServer::BODY_AXIS_LINEAR_X)), float(!is_axis_locked(PhysicsServer::BODY_AXIS_LINEAR_Y)), float(!is_axis_locked(PhysicsServer::BODY_AXIS_LINEAR_Z))));
-	if (PhysicsServer::BODY_MODE_CHARACTER == mode) {
+	btBody->setLinearFactor(btVector3(float(!is_axis_locked(PhysicsServer3D::BODY_AXIS_LINEAR_X)), float(!is_axis_locked(PhysicsServer3D::BODY_AXIS_LINEAR_Y)), float(!is_axis_locked(PhysicsServer3D::BODY_AXIS_LINEAR_Z))));
+	if (PhysicsServer3D::BODY_MODE_CHARACTER == mode) {
 		/// When character angular is always locked
 		btBody->setAngularFactor(btVector3(0., 0., 0.));
 	} else {
-		btBody->setAngularFactor(btVector3(float(!is_axis_locked(PhysicsServer::BODY_AXIS_ANGULAR_X)), float(!is_axis_locked(PhysicsServer::BODY_AXIS_ANGULAR_Y)), float(!is_axis_locked(PhysicsServer::BODY_AXIS_ANGULAR_Z))));
+		btBody->setAngularFactor(btVector3(float(!is_axis_locked(PhysicsServer3D::BODY_AXIS_ANGULAR_X)), float(!is_axis_locked(PhysicsServer3D::BODY_AXIS_ANGULAR_Y)), float(!is_axis_locked(PhysicsServer3D::BODY_AXIS_ANGULAR_Z))));
 	}
 }
 
@@ -768,8 +762,9 @@ bool RigidBodyBullet::is_continuous_collision_detection_enabled() const {
 void RigidBodyBullet::set_linear_velocity(const Vector3 &p_velocity) {
 	btVector3 btVec;
 	G_TO_B(p_velocity, btVec);
-	if (Vector3() != p_velocity)
+	if (Vector3() != p_velocity) {
 		btBody->activate();
+	}
 	btBody->setLinearVelocity(btVec);
 }
 
@@ -782,8 +777,9 @@ Vector3 RigidBodyBullet::get_linear_velocity() const {
 void RigidBodyBullet::set_angular_velocity(const Vector3 &p_velocity) {
 	btVector3 btVec;
 	G_TO_B(p_velocity, btVec);
-	if (Vector3() != p_velocity)
+	if (Vector3() != p_velocity) {
 		btBody->activate();
+	}
 	btBody->setAngularVelocity(btVec);
 }
 
@@ -794,9 +790,10 @@ Vector3 RigidBodyBullet::get_angular_velocity() const {
 }
 
 void RigidBodyBullet::set_transform__bullet(const btTransform &p_global_transform) {
-	if (mode == PhysicsServer::BODY_MODE_KINEMATIC) {
-		if (space && space->get_delta_time() != 0)
+	if (mode == PhysicsServer3D::BODY_MODE_KINEMATIC) {
+		if (space && space->get_delta_time() != 0) {
 			btBody->setLinearVelocity((p_global_transform.getOrigin() - btBody->getWorldTransform().getOrigin()) / space->get_delta_time());
+		}
 		// The kinematic use MotionState class
 		godotMotionState->moveBody(p_global_transform);
 	} else {
@@ -808,16 +805,14 @@ void RigidBodyBullet::set_transform__bullet(const btTransform &p_global_transfor
 
 const btTransform &RigidBodyBullet::get_transform__bullet() const {
 	if (is_static()) {
-
 		return RigidCollisionObjectBullet::get_transform__bullet();
 	} else {
-
 		return godotMotionState->getCurrentWorldTransform();
 	}
 }
 
-void RigidBodyBullet::reload_shapes() {
-	RigidCollisionObjectBullet::reload_shapes();
+void RigidBodyBullet::do_reload_shapes() {
+	RigidCollisionObjectBullet::do_reload_shapes();
 
 	const btScalar invMass = btBody->getInvMass();
 	const btScalar mass = invMass == 0 ? 0 : 1 / invMass;
@@ -827,8 +822,9 @@ void RigidBodyBullet::reload_shapes() {
 		// shapes incorrectly do not set the vector in calculateLocalIntertia.
 		// Arbitrary zero is preferable to undefined behaviour.
 		btVector3 inertia(0, 0, 0);
-		if (EMPTY_SHAPE_PROXYTYPE != mainShape->getShapeType()) // Necessary to avoid assertion of the empty shape
+		if (EMPTY_SHAPE_PROXYTYPE != mainShape->getShapeType()) { // Necessary to avoid assertion of the empty shape
 			mainShape->calculateLocalInertia(mass, inertia);
+		}
 		btBody->setMassProps(mass, inertia);
 	}
 	btBody->updateInertiaTensor();
@@ -846,23 +842,22 @@ void RigidBodyBullet::on_enter_area(AreaBullet *p_area) {
 		return;
 	}
 	for (int i = 0; i < areaWhereIamCount; ++i) {
-
-		if (NULL == areasWhereIam[i]) {
+		if (nullptr == areasWhereIam[i]) {
 			// This area has the highest priority
-			areasWhereIam.write[i] = p_area;
+			areasWhereIam[i] = p_area;
 			break;
 		} else {
 			if (areasWhereIam[i]->get_spOv_priority() > p_area->get_spOv_priority()) {
 				// The position was found, just shift all elements
-				for (int j = i; j < areaWhereIamCount; ++j) {
-					areasWhereIam.write[j + 1] = areasWhereIam[j];
+				for (int j = areaWhereIamCount; j > i; j--) {
+					areasWhereIam[j] = areasWhereIam[j - 1];
 				}
-				areasWhereIam.write[i] = p_area;
+				areasWhereIam[i] = p_area;
 				break;
 			}
 		}
 	}
-	if (PhysicsServer::AREA_SPACE_OVERRIDE_DISABLED != p_area->get_spOv_mode()) {
+	if (PhysicsServer3D::AREA_SPACE_OVERRIDE_DISABLED != p_area->get_spOv_mode()) {
 		scratch_space_override_modificator();
 	}
 
@@ -881,7 +876,7 @@ void RigidBodyBullet::on_exit_area(AreaBullet *p_area) {
 		if (p_area == areasWhereIam[i]) {
 			// The area was found, just shift down all elements
 			for (int j = i; j < areaWhereIamCount; ++j) {
-				areasWhereIam.write[j] = areasWhereIam[j + 1];
+				areasWhereIam[j] = areasWhereIam[j + 1];
 			}
 			wasTheAreaFound = true;
 			break;
@@ -894,51 +889,43 @@ void RigidBodyBullet::on_exit_area(AreaBullet *p_area) {
 		}
 
 		--areaWhereIamCount;
-		areasWhereIam.write[areaWhereIamCount] = NULL; // Even if this is not required, I clear the last element to be safe
-		if (PhysicsServer::AREA_SPACE_OVERRIDE_DISABLED != p_area->get_spOv_mode()) {
+		areasWhereIam[areaWhereIamCount] = nullptr; // Even if this is not required, I clear the last element to be safe
+		if (PhysicsServer3D::AREA_SPACE_OVERRIDE_DISABLED != p_area->get_spOv_mode()) {
 			scratch_space_override_modificator();
 		}
 	}
 }
 
 void RigidBodyBullet::reload_space_override_modificator() {
-
-	// Make sure that kinematic bodies have their total gravity calculated
-	if (!is_active() && PhysicsServer::BODY_MODE_KINEMATIC != mode)
+	if (mode == PhysicsServer3D::BODY_MODE_STATIC) {
 		return;
+	}
 
-	Vector3 newGravity(space->get_gravity_direction() * space->get_gravity_magnitude());
-	real_t newLinearDamp(linearDamp);
-	real_t newAngularDamp(angularDamp);
-
-	AreaBullet *currentArea;
-	// Variable used to calculate new gravity for gravity point areas, it is pointed by currentGravity pointer
-	Vector3 support_gravity(0, 0, 0);
-
-	int countCombined(0);
-	for (int i = areaWhereIamCount - 1; 0 <= i; --i) {
+	Vector3 newGravity;
+	real_t newLinearDamp = MAX(0.0, linearDamp);
+	real_t newAngularDamp = MAX(0.0, angularDamp);
 
-		currentArea = areasWhereIam[i];
+	bool stopped = false;
+	for (int i = 0; i < areaWhereIamCount && !stopped; i += 1) {
+		AreaBullet *currentArea = areasWhereIam[i];
 
-		if (!currentArea || PhysicsServer::AREA_SPACE_OVERRIDE_DISABLED == currentArea->get_spOv_mode()) {
+		if (!currentArea || PhysicsServer3D::AREA_SPACE_OVERRIDE_DISABLED == currentArea->get_spOv_mode()) {
 			continue;
 		}
 
+		Vector3 support_gravity;
+
 		/// Here is calculated the gravity
 		if (currentArea->is_spOv_gravityPoint()) {
-
 			/// It calculates the direction of new gravity
 			support_gravity = currentArea->get_transform().xform(currentArea->get_spOv_gravityVec()) - get_transform().get_origin();
-			real_t distanceMag = support_gravity.length();
+
+			const real_t distanceMag = support_gravity.length();
 			// Normalized in this way to avoid the double call of function "length()"
 			if (distanceMag == 0) {
-				support_gravity.x = 0;
-				support_gravity.y = 0;
-				support_gravity.z = 0;
+				support_gravity = Vector3();
 			} else {
-				support_gravity.x /= distanceMag;
-				support_gravity.y /= distanceMag;
-				support_gravity.z /= distanceMag;
+				support_gravity /= distanceMag;
 			}
 
 			/// Here is calculated the final gravity
@@ -954,58 +941,63 @@ void RigidBodyBullet::reload_space_override_modificator() {
 		}
 
 		switch (currentArea->get_spOv_mode()) {
-			case PhysicsServer::AREA_SPACE_OVERRIDE_DISABLED:
+			case PhysicsServer3D::AREA_SPACE_OVERRIDE_DISABLED:
 				/// This area does not affect gravity/damp. These are generally areas
 				/// that exist only to detect collisions, and objects entering or exiting them.
 				break;
-			case PhysicsServer::AREA_SPACE_OVERRIDE_COMBINE:
+			case PhysicsServer3D::AREA_SPACE_OVERRIDE_COMBINE:
 				/// This area adds its gravity/damp values to whatever has been
 				/// calculated so far. This way, many overlapping areas can combine
 				/// their physics to make interesting
 				newGravity += support_gravity;
 				newLinearDamp += currentArea->get_spOv_linearDamp();
 				newAngularDamp += currentArea->get_spOv_angularDamp();
-				++countCombined;
 				break;
-			case PhysicsServer::AREA_SPACE_OVERRIDE_COMBINE_REPLACE:
+			case PhysicsServer3D::AREA_SPACE_OVERRIDE_COMBINE_REPLACE:
 				/// This area adds its gravity/damp values to whatever has been calculated
 				/// so far. Then stops taking into account the rest of the areas, even the
 				/// default one.
 				newGravity += support_gravity;
 				newLinearDamp += currentArea->get_spOv_linearDamp();
 				newAngularDamp += currentArea->get_spOv_angularDamp();
-				++countCombined;
-				goto endAreasCycle;
-			case PhysicsServer::AREA_SPACE_OVERRIDE_REPLACE:
+				stopped = true;
+				break;
+			case PhysicsServer3D::AREA_SPACE_OVERRIDE_REPLACE:
 				/// This area replaces any gravity/damp, even the default one, and
 				/// stops taking into account the rest of the areas.
 				newGravity = support_gravity;
 				newLinearDamp = currentArea->get_spOv_linearDamp();
 				newAngularDamp = currentArea->get_spOv_angularDamp();
-				countCombined = 1;
-				goto endAreasCycle;
-			case PhysicsServer::AREA_SPACE_OVERRIDE_REPLACE_COMBINE:
+				stopped = true;
+				break;
+			case PhysicsServer3D::AREA_SPACE_OVERRIDE_REPLACE_COMBINE:
 				/// This area replaces any gravity/damp calculated so far, but keeps
 				/// calculating the rest of the areas, down to the default one.
 				newGravity = support_gravity;
 				newLinearDamp = currentArea->get_spOv_linearDamp();
 				newAngularDamp = currentArea->get_spOv_angularDamp();
-				countCombined = 1;
 				break;
 		}
 	}
-endAreasCycle:
 
-	if (1 < countCombined) {
-		newGravity /= countCombined;
-		newLinearDamp /= countCombined;
-		newAngularDamp /= countCombined;
+	// Add default gravity and damping from space.
+	if (!stopped) {
+		newGravity += space->get_gravity_direction() * space->get_gravity_magnitude();
+		newLinearDamp += space->get_linear_damp();
+		newAngularDamp += space->get_angular_damp();
 	}
 
-	btVector3 newBtGravity;
-	G_TO_B(newGravity * gravity_scale, newBtGravity);
+	total_gravity = newGravity;
+
+	if (omit_forces_integration) {
+		// Custom behaviour.
+		btBody->setGravity(btVector3(0, 0, 0));
+	} else {
+		btVector3 newBtGravity;
+		G_TO_B(newGravity * gravity_scale, newBtGravity);
+		btBody->setGravity(newBtGravity);
+	}
 
-	btBody->setGravity(newBtGravity);
 	btBody->setDamping(newLinearDamp, newAngularDamp);
 }
 
@@ -1022,7 +1014,6 @@ void RigidBodyBullet::notify_transform_changed() {
 }
 
 void RigidBodyBullet::_internal_set_mass(real_t p_mass) {
-
 	btVector3 localInertia(0, 0, 0);
 
 	int clearedCurrentFlags = btBody->getCollisionFlags();
@@ -1031,19 +1022,18 @@ void RigidBodyBullet::_internal_set_mass(real_t p_mass) {
 	// Rigidbody is dynamic if and only if mass is non Zero, otherwise static
 	const bool isDynamic = p_mass != 0.f;
 	if (isDynamic) {
-
-		if (PhysicsServer::BODY_MODE_RIGID != mode && PhysicsServer::BODY_MODE_CHARACTER != mode)
+		if (PhysicsServer3D::BODY_MODE_RIGID != mode && PhysicsServer3D::BODY_MODE_CHARACTER != mode) {
 			return;
+		}
 
 		m_isStatic = false;
-		if (mainShape)
+		if (mainShape) {
 			mainShape->calculateLocalInertia(p_mass, localInertia);
+		}
 
-		if (PhysicsServer::BODY_MODE_RIGID == mode) {
-
+		if (PhysicsServer3D::BODY_MODE_RIGID == mode) {
 			btBody->setCollisionFlags(clearedCurrentFlags); // Just set the flags without Kin and Static
 		} else {
-
 			btBody->setCollisionFlags(clearedCurrentFlags | btCollisionObject::CF_CHARACTER_OBJECT);
 		}
 
@@ -1053,16 +1043,14 @@ void RigidBodyBullet::_internal_set_mass(real_t p_mass) {
 			btBody->forceActivationState(DISABLE_DEACTIVATION); // DISABLE_DEACTIVATION 4
 		}
 	} else {
-
-		if (PhysicsServer::BODY_MODE_STATIC != mode && PhysicsServer::BODY_MODE_KINEMATIC != mode)
+		if (PhysicsServer3D::BODY_MODE_STATIC != mode && PhysicsServer3D::BODY_MODE_KINEMATIC != mode) {
 			return;
+		}
 
 		m_isStatic = true;
-		if (PhysicsServer::BODY_MODE_STATIC == mode) {
-
+		if (PhysicsServer3D::BODY_MODE_STATIC == mode) {
 			btBody->setCollisionFlags(clearedCurrentFlags | btCollisionObject::CF_STATIC_OBJECT);
 		} else {
-
 			btBody->setCollisionFlags(clearedCurrentFlags | btCollisionObject::CF_KINEMATIC_OBJECT);
 			set_transform__bullet(btBody->getWorldTransform()); // Set current Transform using kinematic method
 		}
diff --git a/modules/bullet/rigid_body_bullet.h b/modules/bullet/rigid_body_bullet.h
index ca599f7a77..047645677b 100644
--- a/modules/bullet/rigid_body_bullet.h
+++ b/modules/bullet/rigid_body_bullet.h
@@ -45,37 +45,37 @@ class AreaBullet;
 class SpaceBullet;
 class btRigidBody;
 class GodotMotionState;
-class BulletPhysicsDirectBodyState;
+class BulletPhysicsDirectBodyState3D;
 
 /// This class could be used in multi thread with few changes but currently
 /// is set to be only in one single thread.
 ///
 /// In the system there is only one object at a time that manage all bodies and is
-/// created by BulletPhysicsServer and is held by the "singleton" variable of this class
+/// created by BulletPhysicsServer3D and is held by the "singleton" variable of this class
 /// Each time something require it, the body must be set again.
-class BulletPhysicsDirectBodyState : public PhysicsDirectBodyState {
-	GDCLASS(BulletPhysicsDirectBodyState, PhysicsDirectBodyState);
+class BulletPhysicsDirectBodyState3D : public PhysicsDirectBodyState3D {
+	GDCLASS(BulletPhysicsDirectBodyState3D, PhysicsDirectBodyState3D);
 
-	static BulletPhysicsDirectBodyState *singleton;
+	static BulletPhysicsDirectBodyState3D *singleton;
 
 public:
 	/// This class avoid the creation of more object of this class
 	static void initSingleton() {
 		if (!singleton) {
-			singleton = memnew(BulletPhysicsDirectBodyState);
+			singleton = memnew(BulletPhysicsDirectBodyState3D);
 		}
 	}
 
 	static void destroySingleton() {
 		memdelete(singleton);
-		singleton = NULL;
+		singleton = nullptr;
 	}
 
 	static void singleton_setDeltaTime(real_t p_deltaTime) {
 		singleton->deltaTime = p_deltaTime;
 	}
 
-	static BulletPhysicsDirectBodyState *get_singleton(RigidBodyBullet *p_body) {
+	static BulletPhysicsDirectBodyState3D *get_singleton(RigidBodyBullet *p_body) {
 		singleton->body = p_body;
 		return singleton;
 	}
@@ -85,64 +85,63 @@ public:
 	real_t deltaTime;
 
 private:
-	BulletPhysicsDirectBodyState() {}
+	BulletPhysicsDirectBodyState3D() {}
 
 public:
-	virtual Vector3 get_total_gravity() const;
-	virtual float get_total_angular_damp() const;
-	virtual float get_total_linear_damp() const;
+	virtual Vector3 get_total_gravity() const override;
+	virtual float get_total_angular_damp() const override;
+	virtual float get_total_linear_damp() const override;
 
-	virtual Vector3 get_center_of_mass() const;
-	virtual Basis get_principal_inertia_axes() const;
+	virtual Vector3 get_center_of_mass() const override;
+	virtual Basis get_principal_inertia_axes() const override;
 	// get the mass
-	virtual float get_inverse_mass() const;
+	virtual float get_inverse_mass() const override;
 	// get density of this body space
-	virtual Vector3 get_inverse_inertia() const;
+	virtual Vector3 get_inverse_inertia() const override;
 	// get density of this body space
-	virtual Basis get_inverse_inertia_tensor() const;
+	virtual Basis get_inverse_inertia_tensor() const override;
 
-	virtual void set_linear_velocity(const Vector3 &p_velocity);
-	virtual Vector3 get_linear_velocity() const;
+	virtual void set_linear_velocity(const Vector3 &p_velocity) override;
+	virtual Vector3 get_linear_velocity() const override;
 
-	virtual void set_angular_velocity(const Vector3 &p_velocity);
-	virtual Vector3 get_angular_velocity() const;
+	virtual void set_angular_velocity(const Vector3 &p_velocity) override;
+	virtual Vector3 get_angular_velocity() const override;
 
-	virtual void set_transform(const Transform &p_transform);
-	virtual Transform get_transform() const;
+	virtual void set_transform(const Transform &p_transform) override;
+	virtual Transform get_transform() const override;
 
-	virtual void add_central_force(const Vector3 &p_force);
-	virtual void add_force(const Vector3 &p_force, const Vector3 &p_pos);
-	virtual void add_torque(const Vector3 &p_torque);
-	virtual void apply_central_impulse(const Vector3 &p_impulse);
-	virtual void apply_impulse(const Vector3 &p_pos, const Vector3 &p_impulse);
-	virtual void apply_torque_impulse(const Vector3 &p_impulse);
+	virtual void add_central_force(const Vector3 &p_force) override;
+	virtual void add_force(const Vector3 &p_force, const Vector3 &p_position = Vector3()) override;
+	virtual void add_torque(const Vector3 &p_torque) override;
+	virtual void apply_central_impulse(const Vector3 &p_impulse) override;
+	virtual void apply_impulse(const Vector3 &p_impulse, const Vector3 &p_position = Vector3()) override;
+	virtual void apply_torque_impulse(const Vector3 &p_impulse) override;
 
-	virtual void set_sleep_state(bool p_enable);
-	virtual bool is_sleeping() const;
+	virtual void set_sleep_state(bool p_sleep) override;
+	virtual bool is_sleeping() const override;
 
-	virtual int get_contact_count() const;
+	virtual int get_contact_count() const override;
 
-	virtual Vector3 get_contact_local_position(int p_contact_idx) const;
-	virtual Vector3 get_contact_local_normal(int p_contact_idx) const;
-	virtual float get_contact_impulse(int p_contact_idx) const;
-	virtual int get_contact_local_shape(int p_contact_idx) const;
+	virtual Vector3 get_contact_local_position(int p_contact_idx) const override;
+	virtual Vector3 get_contact_local_normal(int p_contact_idx) const override;
+	virtual float get_contact_impulse(int p_contact_idx) const override;
+	virtual int get_contact_local_shape(int p_contact_idx) const override;
 
-	virtual RID get_contact_collider(int p_contact_idx) const;
-	virtual Vector3 get_contact_collider_position(int p_contact_idx) const;
-	virtual ObjectID get_contact_collider_id(int p_contact_idx) const;
-	virtual int get_contact_collider_shape(int p_contact_idx) const;
-	virtual Vector3 get_contact_collider_velocity_at_position(int p_contact_idx) const;
+	virtual RID get_contact_collider(int p_contact_idx) const override;
+	virtual Vector3 get_contact_collider_position(int p_contact_idx) const override;
+	virtual ObjectID get_contact_collider_id(int p_contact_idx) const override;
+	virtual int get_contact_collider_shape(int p_contact_idx) const override;
+	virtual Vector3 get_contact_collider_velocity_at_position(int p_contact_idx) const override;
 
-	virtual real_t get_step() const { return deltaTime; }
-	virtual void integrate_forces() {
+	virtual real_t get_step() const override { return deltaTime; }
+	virtual void integrate_forces() override {
 		// Skip the execution of this function
 	}
 
-	virtual PhysicsDirectSpaceState *get_space_state();
+	virtual PhysicsDirectSpaceState3D *get_space_state() override;
 };
 
 class RigidBodyBullet : public RigidCollisionObjectBullet {
-
 public:
 	struct CollisionData {
 		RigidBodyBullet *otherObject;
@@ -162,18 +161,17 @@ public:
 
 	/// Used to hold shapes
 	struct KinematicShape {
-		class btConvexShape *shape;
+		class btConvexShape *shape = nullptr;
 		btTransform transform;
 
-		KinematicShape() :
-				shape(NULL) {}
+		KinematicShape() {}
 		bool is_active() const { return shape; }
 	};
 
 	struct KinematicUtilities {
 		RigidBodyBullet *owner;
 		btScalar safe_margin;
-		Vector<KinematicShape> shapes;
+		LocalVector<KinematicShape> shapes;
 
 		KinematicUtilities(RigidBodyBullet *p_owner);
 		~KinematicUtilities();
@@ -187,45 +185,46 @@ public:
 	};
 
 private:
-	friend class BulletPhysicsDirectBodyState;
+	friend class BulletPhysicsDirectBodyState3D;
 
 	// This is required only for Kinematic movement
-	KinematicUtilities *kinematic_utilities;
+	KinematicUtilities *kinematic_utilities = nullptr;
 
-	PhysicsServer::BodyMode mode;
+	PhysicsServer3D::BodyMode mode;
 	GodotMotionState *godotMotionState;
 	btRigidBody *btBody;
-	uint16_t locked_axis;
-	real_t mass;
-	real_t gravity_scale;
-	real_t linearDamp;
-	real_t angularDamp;
-	bool can_sleep;
-	bool omit_forces_integration;
-	bool can_integrate_forces;
-
-	Vector<CollisionData> collisions;
-	Vector<RigidBodyBullet *> collision_traces_1;
-	Vector<RigidBodyBullet *> collision_traces_2;
-	Vector<RigidBodyBullet *> *prev_collision_traces;
-	Vector<RigidBodyBullet *> *curr_collision_traces;
+	Vector3 total_gravity;
+	uint16_t locked_axis = 0;
+	real_t mass = 1;
+	real_t gravity_scale = 1;
+	real_t linearDamp = 0;
+	real_t angularDamp = 0;
+	bool can_sleep = true;
+	bool omit_forces_integration = false;
+	bool can_integrate_forces = false;
+
+	LocalVector<CollisionData> collisions;
+	LocalVector<RigidBodyBullet *> collision_traces_1;
+	LocalVector<RigidBodyBullet *> collision_traces_2;
+	LocalVector<RigidBodyBullet *> *prev_collision_traces;
+	LocalVector<RigidBodyBullet *> *curr_collision_traces;
 
 	// these parameters are used to avoid vector resize
-	int maxCollisionsDetection;
-	int collisionsCount;
-	int prev_collision_count;
+	uint32_t maxCollisionsDetection = 0;
+	uint32_t collisionsCount = 0;
+	uint32_t prev_collision_count = 0;
 
-	Vector<AreaBullet *> areasWhereIam;
+	LocalVector<AreaBullet *> areasWhereIam;
 	// these parameters are used to avoid vector resize
-	int maxAreasWhereIam;
-	int areaWhereIamCount;
+	int maxAreasWhereIam = 10;
+	int areaWhereIamCount = 0;
 	// Used to know if the area is used as gravity point
-	int countGravityPointSpaces;
-	bool isScratchedSpaceOverrideModificator;
+	int countGravityPointSpaces = 0;
+	bool isScratchedSpaceOverrideModificator = false;
 
-	bool previousActiveState; // Last check state
+	bool previousActiveState = true; // Last check state
 
-	ForceIntegrationCallback *force_integration_callback;
+	ForceIntegrationCallback *force_integration_callback = nullptr;
 
 public:
 	RigidBodyBullet();
@@ -237,22 +236,20 @@ public:
 
 	_FORCE_INLINE_ btRigidBody *get_bt_rigid_body() { return btBody; }
 
-	virtual void main_shape_changed();
-	virtual void reload_body();
-	virtual void set_space(SpaceBullet *p_space);
+	virtual void main_shape_changed() override;
+	virtual void do_reload_body() override;
+	virtual void set_space(SpaceBullet *p_space) override;
 
-	virtual void dispatch_callbacks();
+	virtual void dispatch_callbacks() override;
+	virtual void pre_process() override;
 	void set_force_integration_callback(ObjectID p_id, const StringName &p_method, const Variant &p_udata = Variant());
 	void scratch_space_override_modificator();
 
-	virtual void on_collision_filters_change();
-	virtual void on_collision_checker_start();
-	virtual void on_collision_checker_end();
-
-	void set_max_collisions_detection(int p_maxCollisionsDetection) {
-
-		ERR_FAIL_COND(0 > p_maxCollisionsDetection);
+	virtual void do_reload_collision_filters() override;
+	virtual void on_collision_checker_start() override;
+	virtual void on_collision_checker_end() override;
 
+	void set_max_collisions_detection(uint32_t p_maxCollisionsDetection) {
 		maxCollisionsDetection = p_maxCollisionsDetection;
 
 		collisions.resize(p_maxCollisionsDetection);
@@ -278,21 +275,21 @@ public:
 	void set_omit_forces_integration(bool p_omit);
 	_FORCE_INLINE_ bool get_omit_forces_integration() const { return omit_forces_integration; }
 
-	void set_param(PhysicsServer::BodyParameter p_param, real_t);
-	real_t get_param(PhysicsServer::BodyParameter p_param) const;
+	void set_param(PhysicsServer3D::BodyParameter p_param, real_t);
+	real_t get_param(PhysicsServer3D::BodyParameter p_param) const;
 
-	void set_mode(PhysicsServer::BodyMode p_mode);
-	PhysicsServer::BodyMode get_mode() const;
+	void set_mode(PhysicsServer3D::BodyMode p_mode);
+	PhysicsServer3D::BodyMode get_mode() const;
 
-	void set_state(PhysicsServer::BodyState p_state, const Variant &p_variant);
-	Variant get_state(PhysicsServer::BodyState p_state) const;
+	void set_state(PhysicsServer3D::BodyState p_state, const Variant &p_variant);
+	Variant get_state(PhysicsServer3D::BodyState p_state) const;
 
-	void apply_impulse(const Vector3 &p_pos, const Vector3 &p_impulse);
 	void apply_central_impulse(const Vector3 &p_impulse);
+	void apply_impulse(const Vector3 &p_impulse, const Vector3 &p_position = Vector3());
 	void apply_torque_impulse(const Vector3 &p_impulse);
 
-	void apply_force(const Vector3 &p_force, const Vector3 &p_pos);
 	void apply_central_force(const Vector3 &p_force);
+	void apply_force(const Vector3 &p_force, const Vector3 &p_position = Vector3());
 	void apply_torque(const Vector3 &p_torque);
 
 	void set_applied_force(const Vector3 &p_force);
@@ -300,8 +297,8 @@ public:
 	void set_applied_torque(const Vector3 &p_torque);
 	Vector3 get_applied_torque() const;
 
-	void set_axis_lock(PhysicsServer::BodyAxis p_axis, bool lock);
-	bool is_axis_locked(PhysicsServer::BodyAxis p_axis) const;
+	void set_axis_lock(PhysicsServer3D::BodyAxis p_axis, bool lock);
+	bool is_axis_locked(PhysicsServer3D::BodyAxis p_axis) const;
 	void reload_axis_lock();
 
 	/// Doc:
@@ -315,19 +312,19 @@ public:
 	void set_angular_velocity(const Vector3 &p_velocity);
 	Vector3 get_angular_velocity() const;
 
-	virtual void set_transform__bullet(const btTransform &p_global_transform);
-	virtual const btTransform &get_transform__bullet() const;
+	virtual void set_transform__bullet(const btTransform &p_global_transform) override;
+	virtual const btTransform &get_transform__bullet() const override;
 
-	virtual void reload_shapes();
+	virtual void do_reload_shapes() override;
 
-	virtual void on_enter_area(AreaBullet *p_area);
-	virtual void on_exit_area(AreaBullet *p_area);
+	virtual void on_enter_area(AreaBullet *p_area) override;
+	virtual void on_exit_area(AreaBullet *p_area) override;
 	void reload_space_override_modificator();
 
 	/// Kinematic
 	void reload_kinematic_shapes();
 
-	virtual void notify_transform_changed();
+	virtual void notify_transform_changed() override;
 
 private:
 	void _internal_set_mass(real_t p_mass);
diff --git a/modules/bullet/shape_bullet.cpp b/modules/bullet/shape_bullet.cpp
index f46db09e4a..74d6e073b3 100644
--- a/modules/bullet/shape_bullet.cpp
+++ b/modules/bullet/shape_bullet.cpp
@@ -46,10 +46,15 @@
 	@author AndreaCatania
 */
 
-ShapeBullet::ShapeBullet() :
-		margin(0.04) {}
+ShapeBullet::ShapeBullet() {
+}
 
-ShapeBullet::~ShapeBullet() {}
+ShapeBullet::~ShapeBullet() {
+	if (default_shape != nullptr) {
+		bulletdelete(default_shape);
+		default_shape = nullptr;
+	}
+}
 
 btCollisionShape *ShapeBullet::create_bt_shape(const Vector3 &p_implicit_scale, real_t p_extra_edge) {
 	btVector3 s;
@@ -57,6 +62,22 @@ btCollisionShape *ShapeBullet::create_bt_shape(const Vector3 &p_implicit_scale,
 	return create_bt_shape(s, p_extra_edge);
 }
 
+btCollisionShape *ShapeBullet::create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge) {
+	if (p_extra_edge == 0.0 && (p_implicit_scale - btVector3(1, 1, 1)).length2() <= CMP_EPSILON) {
+		return default_shape;
+	}
+
+	return internal_create_bt_shape(p_implicit_scale, p_extra_edge);
+}
+
+void ShapeBullet::destroy_bt_shape(btCollisionShape *p_shape) const {
+	if (p_shape != default_shape && p_shape != old_default_shape) {
+		if (likely(p_shape != nullptr)) {
+			bulletdelete(p_shape);
+		}
+	}
+}
+
 btCollisionShape *ShapeBullet::prepare(btCollisionShape *p_btShape) const {
 	p_btShape->setUserPointer(const_cast<ShapeBullet *>(this));
 	p_btShape->setMargin(margin);
@@ -64,10 +85,21 @@ btCollisionShape *ShapeBullet::prepare(btCollisionShape *p_btShape) const {
 }
 
 void ShapeBullet::notifyShapeChanged() {
+	// Store the old shape ptr so to not lose the reference pointer.
+	old_default_shape = default_shape;
+	// Create the new default shape with the new data.
+	default_shape = internal_create_bt_shape(btVector3(1, 1, 1));
+
 	for (Map<ShapeOwnerBullet *, int>::Element *E = owners.front(); E; E = E->next()) {
 		ShapeOwnerBullet *owner = static_cast<ShapeOwnerBullet *>(E->key());
 		owner->shape_changed(owner->find_shape(this));
 	}
+
+	if (old_default_shape) {
+		// At this point now one has the old default shape; just delete it.
+		bulletdelete(old_default_shape);
+		old_default_shape = nullptr;
+	}
 }
 
 void ShapeBullet::add_owner(ShapeOwnerBullet *p_owner) {
@@ -81,7 +113,9 @@ void ShapeBullet::add_owner(ShapeOwnerBullet *p_owner) {
 
 void ShapeBullet::remove_owner(ShapeOwnerBullet *p_owner, bool p_permanentlyFromThisBody) {
 	Map<ShapeOwnerBullet *, int>::Element *E = owners.find(p_owner);
-	if (!E) return;
+	if (!E) {
+		return;
+	}
 	E->get()--;
 	if (p_permanentlyFromThisBody || 0 >= E->get()) {
 		owners.erase(E);
@@ -89,7 +123,6 @@ void ShapeBullet::remove_owner(ShapeOwnerBullet *p_owner, bool p_permanentlyFrom
 }
 
 bool ShapeBullet::is_owner(ShapeOwnerBullet *p_owner) const {
-
 	return owners.has(p_owner);
 }
 
@@ -122,8 +155,8 @@ btBoxShape *ShapeBullet::create_shape_box(const btVector3 &boxHalfExtents) {
 	return bulletnew(btBoxShape(boxHalfExtents));
 }
 
-btCapsuleShapeZ *ShapeBullet::create_shape_capsule(btScalar radius, btScalar height) {
-	return bulletnew(btCapsuleShapeZ(radius, height));
+btCapsuleShape *ShapeBullet::create_shape_capsule(btScalar radius, btScalar height) {
+	return bulletnew(btCapsuleShape(radius, height));
 }
 
 btCylinderShape *ShapeBullet::create_shape_cylinder(btScalar radius, btScalar height) {
@@ -138,21 +171,22 @@ btScaledBvhTriangleMeshShape *ShapeBullet::create_shape_concave(btBvhTriangleMes
 	if (p_mesh_shape) {
 		return bulletnew(btScaledBvhTriangleMeshShape(p_mesh_shape, p_local_scaling));
 	} else {
-		return NULL;
+		return nullptr;
 	}
 }
 
-btHeightfieldTerrainShape *ShapeBullet::create_shape_height_field(PoolVector<real_t> &p_heights, int p_width, int p_depth, real_t p_min_height, real_t p_max_height) {
+btHeightfieldTerrainShape *ShapeBullet::create_shape_height_field(Vector<real_t> &p_heights, int p_width, int p_depth, real_t p_min_height, real_t p_max_height) {
 	const btScalar ignoredHeightScale(1);
 	const int YAxis = 1; // 0=X, 1=Y, 2=Z
 	const bool flipQuadEdges = false;
-	const void *heightsPtr = p_heights.read().ptr();
+	const void *heightsPtr = p_heights.ptr();
 
 	btHeightfieldTerrainShape *heightfield = bulletnew(btHeightfieldTerrainShape(p_width, p_depth, heightsPtr, ignoredHeightScale, p_min_height, p_max_height, YAxis, PHY_FLOAT, flipQuadEdges));
 
-	// The shape can be created without params when you do PhysicsServer.shape_create(PhysicsServer.SHAPE_HEIGHTMAP)
-	if (heightsPtr)
+	// The shape can be created without params when you do PhysicsServer3D.shape_create(PhysicsServer3D.SHAPE_HEIGHTMAP)
+	if (heightsPtr) {
 		heightfield->buildAccelerator(16);
+	}
 
 	return heightfield;
 }
@@ -176,8 +210,8 @@ Variant PlaneShapeBullet::get_data() const {
 	return plane;
 }
 
-PhysicsServer::ShapeType PlaneShapeBullet::get_type() const {
-	return PhysicsServer::SHAPE_PLANE;
+PhysicsServer3D::ShapeType PlaneShapeBullet::get_type() const {
+	return PhysicsServer3D::SHAPE_PLANE;
 }
 
 void PlaneShapeBullet::setup(const Plane &p_plane) {
@@ -185,7 +219,7 @@ void PlaneShapeBullet::setup(const Plane &p_plane) {
 	notifyShapeChanged();
 }
 
-btCollisionShape *PlaneShapeBullet::create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge) {
+btCollisionShape *PlaneShapeBullet::internal_create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge) {
 	btVector3 btPlaneNormal;
 	G_TO_B(plane.normal, btPlaneNormal);
 	return prepare(PlaneShapeBullet::create_shape_plane(btPlaneNormal, plane.d));
@@ -204,8 +238,8 @@ Variant SphereShapeBullet::get_data() const {
 	return radius;
 }
 
-PhysicsServer::ShapeType SphereShapeBullet::get_type() const {
-	return PhysicsServer::SHAPE_SPHERE;
+PhysicsServer3D::ShapeType SphereShapeBullet::get_type() const {
+	return PhysicsServer3D::SHAPE_SPHERE;
 }
 
 void SphereShapeBullet::setup(real_t p_radius) {
@@ -213,7 +247,7 @@ void SphereShapeBullet::setup(real_t p_radius) {
 	notifyShapeChanged();
 }
 
-btCollisionShape *SphereShapeBullet::create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge) {
+btCollisionShape *SphereShapeBullet::internal_create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge) {
 	return prepare(ShapeBullet::create_shape_sphere(radius * p_implicit_scale[0] + p_extra_edge));
 }
 
@@ -231,8 +265,8 @@ Variant BoxShapeBullet::get_data() const {
 	return g_half_extents;
 }
 
-PhysicsServer::ShapeType BoxShapeBullet::get_type() const {
-	return PhysicsServer::SHAPE_BOX;
+PhysicsServer3D::ShapeType BoxShapeBullet::get_type() const {
+	return PhysicsServer3D::SHAPE_BOX;
 }
 
 void BoxShapeBullet::setup(const Vector3 &p_half_extents) {
@@ -240,7 +274,7 @@ void BoxShapeBullet::setup(const Vector3 &p_half_extents) {
 	notifyShapeChanged();
 }
 
-btCollisionShape *BoxShapeBullet::create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge) {
+btCollisionShape *BoxShapeBullet::internal_create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge) {
 	return prepare(ShapeBullet::create_shape_box((half_extents * p_implicit_scale) + btVector3(p_extra_edge, p_extra_edge, p_extra_edge)));
 }
 
@@ -263,8 +297,8 @@ Variant CapsuleShapeBullet::get_data() const {
 	return d;
 }
 
-PhysicsServer::ShapeType CapsuleShapeBullet::get_type() const {
-	return PhysicsServer::SHAPE_CAPSULE;
+PhysicsServer3D::ShapeType CapsuleShapeBullet::get_type() const {
+	return PhysicsServer3D::SHAPE_CAPSULE;
 }
 
 void CapsuleShapeBullet::setup(real_t p_height, real_t p_radius) {
@@ -273,8 +307,8 @@ void CapsuleShapeBullet::setup(real_t p_height, real_t p_radius) {
 	notifyShapeChanged();
 }
 
-btCollisionShape *CapsuleShapeBullet::create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge) {
-	return prepare(ShapeBullet::create_shape_capsule(radius * p_implicit_scale[0] + p_extra_edge, height * p_implicit_scale[1] + p_extra_edge));
+btCollisionShape *CapsuleShapeBullet::internal_create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge) {
+	return prepare(ShapeBullet::create_shape_capsule(radius * p_implicit_scale[0] + p_extra_edge, height * p_implicit_scale[1]));
 }
 
 /* Cylinder */
@@ -296,8 +330,8 @@ Variant CylinderShapeBullet::get_data() const {
 	return d;
 }
 
-PhysicsServer::ShapeType CylinderShapeBullet::get_type() const {
-	return PhysicsServer::SHAPE_CYLINDER;
+PhysicsServer3D::ShapeType CylinderShapeBullet::get_type() const {
+	return PhysicsServer3D::SHAPE_CYLINDER;
 }
 
 void CylinderShapeBullet::setup(real_t p_height, real_t p_radius) {
@@ -306,7 +340,7 @@ void CylinderShapeBullet::setup(real_t p_height, real_t p_radius) {
 	notifyShapeChanged();
 }
 
-btCollisionShape *CylinderShapeBullet::create_bt_shape(const btVector3 &p_implicit_scale, real_t p_margin) {
+btCollisionShape *CylinderShapeBullet::internal_create_bt_shape(const btVector3 &p_implicit_scale, real_t p_margin) {
 	return prepare(ShapeBullet::create_shape_cylinder(radius * p_implicit_scale[0] + p_margin, height * p_implicit_scale[1] + p_margin));
 }
 
@@ -334,8 +368,8 @@ Variant ConvexPolygonShapeBullet::get_data() const {
 	return out_vertices;
 }
 
-PhysicsServer::ShapeType ConvexPolygonShapeBullet::get_type() const {
-	return PhysicsServer::SHAPE_CONVEX_POLYGON;
+PhysicsServer3D::ShapeType ConvexPolygonShapeBullet::get_type() const {
+	return PhysicsServer3D::SHAPE_CONVEX_POLYGON;
 }
 
 void ConvexPolygonShapeBullet::setup(const Vector<Vector3> &p_vertices) {
@@ -348,10 +382,11 @@ void ConvexPolygonShapeBullet::setup(const Vector<Vector3> &p_vertices) {
 	notifyShapeChanged();
 }
 
-btCollisionShape *ConvexPolygonShapeBullet::create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge) {
-	if (!vertices.size())
+btCollisionShape *ConvexPolygonShapeBullet::internal_create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge) {
+	if (!vertices.size()) {
 		// This is necessary since 0 vertices
 		return prepare(ShapeBullet::create_shape_empty());
+	}
 	btCollisionShape *cs(ShapeBullet::create_shape_convex(vertices));
 	cs->setLocalScaling(p_implicit_scale);
 	prepare(cs);
@@ -361,8 +396,7 @@ btCollisionShape *ConvexPolygonShapeBullet::create_bt_shape(const btVector3 &p_i
 /* Concave polygon */
 
 ConcavePolygonShapeBullet::ConcavePolygonShapeBullet() :
-		ShapeBullet(),
-		meshShape(NULL) {}
+		ShapeBullet() {}
 
 ConcavePolygonShapeBullet::~ConcavePolygonShapeBullet() {
 	if (meshShape) {
@@ -370,7 +404,7 @@ ConcavePolygonShapeBullet::~ConcavePolygonShapeBullet() {
 		delete meshShape->getTriangleInfoMap();
 		bulletdelete(meshShape);
 	}
-	faces = PoolVector<Vector3>();
+	faces = Vector<Vector3>();
 }
 
 void ConcavePolygonShapeBullet::set_data(const Variant &p_data) {
@@ -381,11 +415,11 @@ Variant ConcavePolygonShapeBullet::get_data() const {
 	return faces;
 }
 
-PhysicsServer::ShapeType ConcavePolygonShapeBullet::get_type() const {
-	return PhysicsServer::SHAPE_CONCAVE_POLYGON;
+PhysicsServer3D::ShapeType ConcavePolygonShapeBullet::get_type() const {
+	return PhysicsServer3D::SHAPE_CONCAVE_POLYGON;
 }
 
-void ConcavePolygonShapeBullet::setup(PoolVector<Vector3> p_faces) {
+void ConcavePolygonShapeBullet::setup(Vector<Vector3> p_faces) {
 	faces = p_faces;
 	if (meshShape) {
 		/// Clear previous created shape
@@ -395,14 +429,13 @@ void ConcavePolygonShapeBullet::setup(PoolVector<Vector3> p_faces) {
 	}
 	int src_face_count = faces.size();
 	if (0 < src_face_count) {
-
 		// It counts the faces and assert the array contains the correct number of vertices.
 		ERR_FAIL_COND(src_face_count % 3);
 
 		btTriangleMesh *shapeInterface = bulletnew(btTriangleMesh);
 		src_face_count /= 3;
-		PoolVector<Vector3>::Read r = p_faces.read();
-		const Vector3 *facesr = r.ptr();
+		const Vector3 *r = p_faces.ptr();
+		const Vector3 *facesr = r;
 
 		btVector3 supVec_0;
 		btVector3 supVec_1;
@@ -425,17 +458,18 @@ void ConcavePolygonShapeBullet::setup(PoolVector<Vector3> p_faces) {
 			btGenerateInternalEdgeInfo(meshShape, triangleInfoMap);
 		}
 	} else {
-		meshShape = NULL;
+		meshShape = nullptr;
 		ERR_PRINT("The faces count are 0, the mesh shape cannot be created");
 	}
 	notifyShapeChanged();
 }
 
-btCollisionShape *ConcavePolygonShapeBullet::create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge) {
+btCollisionShape *ConcavePolygonShapeBullet::internal_create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge) {
 	btCollisionShape *cs = ShapeBullet::create_shape_concave(meshShape);
-	if (!cs)
-		// This is necessary since if 0 faces the creation of concave return NULL
+	if (!cs) {
+		// This is necessary since if 0 faces the creation of concave return null
 		cs = ShapeBullet::create_shape_empty();
+	}
 	cs->setLocalScaling(p_implicit_scale);
 	prepare(cs);
 	cs->setMargin(0);
@@ -458,23 +492,28 @@ void HeightMapShapeBullet::set_data(const Variant &p_data) {
 	real_t l_max_height = 0.0;
 
 	// If specified, min and max height will be used as precomputed values
-	if (d.has("min_height"))
+	if (d.has("min_height")) {
 		l_min_height = d["min_height"];
-	if (d.has("max_height"))
+	}
+	if (d.has("max_height")) {
 		l_max_height = d["max_height"];
+	}
 
 	ERR_FAIL_COND(l_min_height > l_max_height);
 
 	int l_width = d["width"];
 	int l_depth = d["depth"];
 
+	ERR_FAIL_COND_MSG(l_width < 2, "Map width must be at least 2.");
+	ERR_FAIL_COND_MSG(l_depth < 2, "Map depth must be at least 2.");
+
 	// TODO This code will need adjustments if real_t is set to `double`,
 	// because that precision is unnecessary for a heightmap and Bullet doesn't support it...
 
-	PoolVector<real_t> l_heights;
+	Vector<real_t> l_heights;
 	Variant l_heights_v = d["heights"];
 
-	if (l_heights_v.get_type() == Variant::POOL_REAL_ARRAY) {
+	if (l_heights_v.get_type() == Variant::PACKED_FLOAT32_ARRAY) {
 		// Ready-to-use heights can be passed
 
 		l_heights = l_heights_v;
@@ -491,13 +530,13 @@ void HeightMapShapeBullet::set_data(const Variant &p_data) {
 		// We could convert here automatically but it's better to not be intrusive and let the caller do it if necessary.
 		ERR_FAIL_COND(l_image->get_format() != Image::FORMAT_RF);
 
-		PoolByteArray im_data = l_image->get_data();
+		PackedByteArray im_data = l_image->get_data();
 
 		l_heights.resize(l_image->get_width() * l_image->get_height());
 
-		PoolRealArray::Write w = l_heights.write();
-		PoolByteArray::Read r = im_data.read();
-		float *rp = (float *)r.ptr();
+		real_t *w = l_heights.ptrw();
+		const uint8_t *r = im_data.ptr();
+		float *rp = (float *)r;
 		// At this point, `rp` could be used directly for Bullet, but I don't know how safe it would be.
 
 		for (int i = 0; i < l_heights.size(); ++i) {
@@ -505,7 +544,7 @@ void HeightMapShapeBullet::set_data(const Variant &p_data) {
 		}
 
 	} else {
-		ERR_FAIL_MSG("Expected PoolRealArray or float Image.");
+		ERR_FAIL_MSG("Expected PackedFloat32Array or float Image.");
 	}
 
 	ERR_FAIL_COND(l_width <= 0);
@@ -514,8 +553,7 @@ void HeightMapShapeBullet::set_data(const Variant &p_data) {
 
 	// Compute min and max heights if not specified.
 	if (!d.has("min_height") && !d.has("max_height")) {
-
-		PoolVector<real_t>::Read r = l_heights.read();
+		const real_t *r = l_heights.ptr();
 		int heights_size = l_heights.size();
 
 		for (int i = 0; i < heights_size; ++i) {
@@ -536,11 +574,11 @@ Variant HeightMapShapeBullet::get_data() const {
 	ERR_FAIL_V(Variant());
 }
 
-PhysicsServer::ShapeType HeightMapShapeBullet::get_type() const {
-	return PhysicsServer::SHAPE_HEIGHTMAP;
+PhysicsServer3D::ShapeType HeightMapShapeBullet::get_type() const {
+	return PhysicsServer3D::SHAPE_HEIGHTMAP;
 }
 
-void HeightMapShapeBullet::setup(PoolVector<real_t> &p_heights, int p_width, int p_depth, real_t p_min_height, real_t p_max_height) {
+void HeightMapShapeBullet::setup(Vector<real_t> &p_heights, int p_width, int p_depth, real_t p_min_height, real_t p_max_height) {
 	// TODO cell size must be tweaked using localScaling, which is a shared property for all Bullet shapes
 
 	// If this array is resized outside of here, it should be preserved due to CoW
@@ -553,7 +591,7 @@ void HeightMapShapeBullet::setup(PoolVector<real_t> &p_heights, int p_width, int
 	notifyShapeChanged();
 }
 
-btCollisionShape *HeightMapShapeBullet::create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge) {
+btCollisionShape *HeightMapShapeBullet::internal_create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge) {
 	btCollisionShape *cs(ShapeBullet::create_shape_height_field(heights, width, depth, min_height, max_height));
 	cs->setLocalScaling(p_implicit_scale);
 	prepare(cs);
@@ -562,26 +600,22 @@ btCollisionShape *HeightMapShapeBullet::create_bt_shape(const btVector3 &p_impli
 
 /* Ray shape */
 RayShapeBullet::RayShapeBullet() :
-		ShapeBullet(),
-		length(1),
-		slips_on_slope(false) {}
+		ShapeBullet() {}
 
 void RayShapeBullet::set_data(const Variant &p_data) {
-
 	Dictionary d = p_data;
 	setup(d["length"], d["slips_on_slope"]);
 }
 
 Variant RayShapeBullet::get_data() const {
-
 	Dictionary d;
 	d["length"] = length;
 	d["slips_on_slope"] = slips_on_slope;
 	return d;
 }
 
-PhysicsServer::ShapeType RayShapeBullet::get_type() const {
-	return PhysicsServer::SHAPE_RAY;
+PhysicsServer3D::ShapeType RayShapeBullet::get_type() const {
+	return PhysicsServer3D::SHAPE_RAY;
 }
 
 void RayShapeBullet::setup(real_t p_length, bool p_slips_on_slope) {
@@ -590,6 +624,6 @@ void RayShapeBullet::setup(real_t p_length, bool p_slips_on_slope) {
 	notifyShapeChanged();
 }
 
-btCollisionShape *RayShapeBullet::create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge) {
+btCollisionShape *RayShapeBullet::internal_create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge) {
 	return prepare(ShapeBullet::create_shape_ray(length * p_implicit_scale[1] + p_extra_edge, slips_on_slope));
 }
diff --git a/modules/bullet/shape_bullet.h b/modules/bullet/shape_bullet.h
index 8d3512cab4..6ca4d36a23 100644
--- a/modules/bullet/shape_bullet.h
+++ b/modules/bullet/shape_bullet.h
@@ -31,10 +31,10 @@
 #ifndef SHAPE_BULLET_H
 #define SHAPE_BULLET_H
 
-#include "core/math/geometry.h"
+#include "core/math/geometry_3d.h"
 #include "core/variant.h"
 #include "rid_bullet.h"
-#include "servers/physics_server.h"
+#include "servers/physics_server_3d.h"
 
 #include <LinearMath/btAlignedObjectArray.h>
 #include <LinearMath/btScalar.h>
@@ -50,9 +50,12 @@ class ShapeOwnerBullet;
 class btBvhTriangleMeshShape;
 
 class ShapeBullet : public RIDBullet {
-
 	Map<ShapeOwnerBullet *, int> owners;
-	real_t margin;
+	real_t margin = 0.04;
+
+	// Contains the default shape.
+	btCollisionShape *default_shape = nullptr;
+	btCollisionShape *old_default_shape = nullptr;
 
 protected:
 	/// return self
@@ -64,7 +67,11 @@ public:
 	virtual ~ShapeBullet();
 
 	btCollisionShape *create_bt_shape(const Vector3 &p_implicit_scale, real_t p_extra_edge = 0);
-	virtual btCollisionShape *create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge = 0) = 0;
+	btCollisionShape *create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge = 0);
+
+	void destroy_bt_shape(btCollisionShape *p_shape) const;
+
+	virtual btCollisionShape *internal_create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge = 0) = 0;
 
 	void add_owner(ShapeOwnerBullet *p_owner);
 	void remove_owner(ShapeOwnerBullet *p_owner, bool p_permanentlyFromThisBody = false);
@@ -78,24 +85,23 @@ public:
 	virtual void set_data(const Variant &p_data) = 0;
 	virtual Variant get_data() const = 0;
 
-	virtual PhysicsServer::ShapeType get_type() const = 0;
+	virtual PhysicsServer3D::ShapeType get_type() const = 0;
 
 public:
 	static class btEmptyShape *create_shape_empty();
 	static class btStaticPlaneShape *create_shape_plane(const btVector3 &planeNormal, btScalar planeConstant);
 	static class btSphereShape *create_shape_sphere(btScalar radius);
 	static class btBoxShape *create_shape_box(const btVector3 &boxHalfExtents);
-	static class btCapsuleShapeZ *create_shape_capsule(btScalar radius, btScalar height);
+	static class btCapsuleShape *create_shape_capsule(btScalar radius, btScalar height);
 	static class btCylinderShape *create_shape_cylinder(btScalar radius, btScalar height);
 	/// IMPORTANT: Remember to delete the shape interface by calling: delete my_shape->getMeshInterface();
 	static class btConvexPointCloudShape *create_shape_convex(btAlignedObjectArray<btVector3> &p_vertices, const btVector3 &p_local_scaling = btVector3(1, 1, 1));
 	static class btScaledBvhTriangleMeshShape *create_shape_concave(btBvhTriangleMeshShape *p_mesh_shape, const btVector3 &p_local_scaling = btVector3(1, 1, 1));
-	static class btHeightfieldTerrainShape *create_shape_height_field(PoolVector<real_t> &p_heights, int p_width, int p_depth, real_t p_min_height, real_t p_max_height);
+	static class btHeightfieldTerrainShape *create_shape_height_field(Vector<real_t> &p_heights, int p_width, int p_depth, real_t p_min_height, real_t p_max_height);
 	static class btRayShape *create_shape_ray(real_t p_length, bool p_slips_on_slope);
 };
 
 class PlaneShapeBullet : public ShapeBullet {
-
 	Plane plane;
 
 public:
@@ -103,15 +109,14 @@ public:
 
 	virtual void set_data(const Variant &p_data);
 	virtual Variant get_data() const;
-	virtual PhysicsServer::ShapeType get_type() const;
-	virtual btCollisionShape *create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge = 0);
+	virtual PhysicsServer3D::ShapeType get_type() const;
+	virtual btCollisionShape *internal_create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge = 0);
 
 private:
 	void setup(const Plane &p_plane);
 };
 
 class SphereShapeBullet : public ShapeBullet {
-
 	real_t radius;
 
 public:
@@ -120,15 +125,14 @@ public:
 	_FORCE_INLINE_ real_t get_radius() { return radius; }
 	virtual void set_data(const Variant &p_data);
 	virtual Variant get_data() const;
-	virtual PhysicsServer::ShapeType get_type() const;
-	virtual btCollisionShape *create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge = 0);
+	virtual PhysicsServer3D::ShapeType get_type() const;
+	virtual btCollisionShape *internal_create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge = 0);
 
 private:
 	void setup(real_t p_radius);
 };
 
 class BoxShapeBullet : public ShapeBullet {
-
 	btVector3 half_extents;
 
 public:
@@ -137,15 +141,14 @@ public:
 	_FORCE_INLINE_ const btVector3 &get_half_extents() { return half_extents; }
 	virtual void set_data(const Variant &p_data);
 	virtual Variant get_data() const;
-	virtual PhysicsServer::ShapeType get_type() const;
-	virtual btCollisionShape *create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge = 0);
+	virtual PhysicsServer3D::ShapeType get_type() const;
+	virtual btCollisionShape *internal_create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge = 0);
 
 private:
 	void setup(const Vector3 &p_half_extents);
 };
 
 class CapsuleShapeBullet : public ShapeBullet {
-
 	real_t height;
 	real_t radius;
 
@@ -156,15 +159,14 @@ public:
 	_FORCE_INLINE_ real_t get_radius() { return radius; }
 	virtual void set_data(const Variant &p_data);
 	virtual Variant get_data() const;
-	virtual PhysicsServer::ShapeType get_type() const;
-	virtual btCollisionShape *create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge = 0);
+	virtual PhysicsServer3D::ShapeType get_type() const;
+	virtual btCollisionShape *internal_create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge = 0);
 
 private:
 	void setup(real_t p_height, real_t p_radius);
 };
 
 class CylinderShapeBullet : public ShapeBullet {
-
 	real_t height;
 	real_t radius;
 
@@ -175,15 +177,14 @@ public:
 	_FORCE_INLINE_ real_t get_radius() { return radius; }
 	virtual void set_data(const Variant &p_data);
 	virtual Variant get_data() const;
-	virtual PhysicsServer::ShapeType get_type() const;
-	virtual btCollisionShape *create_bt_shape(const btVector3 &p_implicit_scale, real_t p_margin = 0);
+	virtual PhysicsServer3D::ShapeType get_type() const;
+	virtual btCollisionShape *internal_create_bt_shape(const btVector3 &p_implicit_scale, real_t p_margin = 0);
 
 private:
 	void setup(real_t p_height, real_t p_radius);
 };
 
 class ConvexPolygonShapeBullet : public ShapeBullet {
-
 public:
 	btAlignedObjectArray<btVector3> vertices;
 
@@ -192,35 +193,34 @@ public:
 	virtual void set_data(const Variant &p_data);
 	void get_vertices(Vector<Vector3> &out_vertices);
 	virtual Variant get_data() const;
-	virtual PhysicsServer::ShapeType get_type() const;
-	virtual btCollisionShape *create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge = 0);
+	virtual PhysicsServer3D::ShapeType get_type() const;
+	virtual btCollisionShape *internal_create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge = 0);
 
 private:
 	void setup(const Vector<Vector3> &p_vertices);
 };
 
 class ConcavePolygonShapeBullet : public ShapeBullet {
-	class btBvhTriangleMeshShape *meshShape;
+	class btBvhTriangleMeshShape *meshShape = nullptr;
 
 public:
-	PoolVector<Vector3> faces;
+	Vector<Vector3> faces;
 
 	ConcavePolygonShapeBullet();
 	virtual ~ConcavePolygonShapeBullet();
 
 	virtual void set_data(const Variant &p_data);
 	virtual Variant get_data() const;
-	virtual PhysicsServer::ShapeType get_type() const;
-	virtual btCollisionShape *create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge = 0);
+	virtual PhysicsServer3D::ShapeType get_type() const;
+	virtual btCollisionShape *internal_create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge = 0);
 
 private:
-	void setup(PoolVector<Vector3> p_faces);
+	void setup(Vector<Vector3> p_faces);
 };
 
 class HeightMapShapeBullet : public ShapeBullet {
-
 public:
-	PoolVector<real_t> heights;
+	Vector<real_t> heights;
 	int width;
 	int depth;
 	real_t min_height;
@@ -230,25 +230,24 @@ public:
 
 	virtual void set_data(const Variant &p_data);
 	virtual Variant get_data() const;
-	virtual PhysicsServer::ShapeType get_type() const;
-	virtual btCollisionShape *create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge = 0);
+	virtual PhysicsServer3D::ShapeType get_type() const;
+	virtual btCollisionShape *internal_create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge = 0);
 
 private:
-	void setup(PoolVector<real_t> &p_heights, int p_width, int p_depth, real_t p_min_height, real_t p_max_height);
+	void setup(Vector<real_t> &p_heights, int p_width, int p_depth, real_t p_min_height, real_t p_max_height);
 };
 
 class RayShapeBullet : public ShapeBullet {
-
 public:
-	real_t length;
-	bool slips_on_slope;
+	real_t length = 1;
+	bool slips_on_slope = false;
 
 	RayShapeBullet();
 
 	virtual void set_data(const Variant &p_data);
 	virtual Variant get_data() const;
-	virtual PhysicsServer::ShapeType get_type() const;
-	virtual btCollisionShape *create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge = 0);
+	virtual PhysicsServer3D::ShapeType get_type() const;
+	virtual btCollisionShape *internal_create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge = 0);
 
 private:
 	void setup(real_t p_length, bool p_slips_on_slope);
diff --git a/modules/bullet/slider_joint_bullet.cpp b/modules/bullet/slider_joint_bullet.cpp
index d9ebb9d580..6d5d95d07a 100644
--- a/modules/bullet/slider_joint_bullet.cpp
+++ b/modules/bullet/slider_joint_bullet.cpp
@@ -42,7 +42,6 @@
 
 SliderJointBullet::SliderJointBullet(RigidBodyBullet *rbA, RigidBodyBullet *rbB, const Transform &frameInA, const Transform &frameInB) :
 		JointBullet() {
-
 	Transform scaled_AFrame(frameInA.scaled(rbA->get_body_scale()));
 	scaled_AFrame.basis.rotref_posscale_decomposition(scaled_AFrame.basis);
 
@@ -50,7 +49,6 @@ SliderJointBullet::SliderJointBullet(RigidBodyBullet *rbA, RigidBodyBullet *rbB,
 	G_TO_B(scaled_AFrame, btFrameA);
 
 	if (rbB) {
-
 		Transform scaled_BFrame(frameInB.scaled(rbB->get_body_scale()));
 		scaled_BFrame.basis.rotref_posscale_decomposition(scaled_BFrame.basis);
 
@@ -121,6 +119,7 @@ real_t SliderJointBullet::getLowerLinLimit() const {
 void SliderJointBullet::setLowerLinLimit(real_t lowerLimit) {
 	sliderConstraint->setLowerLinLimit(lowerLimit);
 }
+
 real_t SliderJointBullet::getUpperLinLimit() const {
 	return sliderConstraint->getUpperLinLimit();
 }
@@ -342,58 +341,125 @@ real_t SliderJointBullet::getLinearPos() {
 	;
 }
 
-void SliderJointBullet::set_param(PhysicsServer::SliderJointParam p_param, real_t p_value) {
+void SliderJointBullet::set_param(PhysicsServer3D::SliderJointParam p_param, real_t p_value) {
 	switch (p_param) {
-		case PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_UPPER: setUpperLinLimit(p_value); break;
-		case PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_LOWER: setLowerLinLimit(p_value); break;
-		case PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_SOFTNESS: setSoftnessLimLin(p_value); break;
-		case PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_RESTITUTION: setRestitutionLimLin(p_value); break;
-		case PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_DAMPING: setDampingLimLin(p_value); break;
-		case PhysicsServer::SLIDER_JOINT_LINEAR_MOTION_SOFTNESS: setSoftnessDirLin(p_value); break;
-		case PhysicsServer::SLIDER_JOINT_LINEAR_MOTION_RESTITUTION: setRestitutionDirLin(p_value); break;
-		case PhysicsServer::SLIDER_JOINT_LINEAR_MOTION_DAMPING: setDampingDirLin(p_value); break;
-		case PhysicsServer::SLIDER_JOINT_LINEAR_ORTHOGONAL_SOFTNESS: setSoftnessOrthoLin(p_value); break;
-		case PhysicsServer::SLIDER_JOINT_LINEAR_ORTHOGONAL_RESTITUTION: setRestitutionOrthoLin(p_value); break;
-		case PhysicsServer::SLIDER_JOINT_LINEAR_ORTHOGONAL_DAMPING: setDampingOrthoLin(p_value); break;
-		case PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_UPPER: setUpperAngLimit(p_value); break;
-		case PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_LOWER: setLowerAngLimit(p_value); break;
-		case PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_SOFTNESS: setSoftnessLimAng(p_value); break;
-		case PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_RESTITUTION: setRestitutionLimAng(p_value); break;
-		case PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_DAMPING: setDampingLimAng(p_value); break;
-		case PhysicsServer::SLIDER_JOINT_ANGULAR_MOTION_SOFTNESS: setSoftnessDirAng(p_value); break;
-		case PhysicsServer::SLIDER_JOINT_ANGULAR_MOTION_RESTITUTION: setRestitutionDirAng(p_value); break;
-		case PhysicsServer::SLIDER_JOINT_ANGULAR_MOTION_DAMPING: setDampingDirAng(p_value); break;
-		case PhysicsServer::SLIDER_JOINT_ANGULAR_ORTHOGONAL_SOFTNESS: setSoftnessOrthoAng(p_value); break;
-		case PhysicsServer::SLIDER_JOINT_ANGULAR_ORTHOGONAL_RESTITUTION: setRestitutionOrthoAng(p_value); break;
-		case PhysicsServer::SLIDER_JOINT_ANGULAR_ORTHOGONAL_DAMPING: setDampingOrthoAng(p_value); break;
-		case PhysicsServer::SLIDER_JOINT_MAX: break; // Can't happen, but silences warning
+		case PhysicsServer3D::SLIDER_JOINT_LINEAR_LIMIT_UPPER:
+			setUpperLinLimit(p_value);
+			break;
+		case PhysicsServer3D::SLIDER_JOINT_LINEAR_LIMIT_LOWER:
+			setLowerLinLimit(p_value);
+			break;
+		case PhysicsServer3D::SLIDER_JOINT_LINEAR_LIMIT_SOFTNESS:
+			setSoftnessLimLin(p_value);
+			break;
+		case PhysicsServer3D::SLIDER_JOINT_LINEAR_LIMIT_RESTITUTION:
+			setRestitutionLimLin(p_value);
+			break;
+		case PhysicsServer3D::SLIDER_JOINT_LINEAR_LIMIT_DAMPING:
+			setDampingLimLin(p_value);
+			break;
+		case PhysicsServer3D::SLIDER_JOINT_LINEAR_MOTION_SOFTNESS:
+			setSoftnessDirLin(p_value);
+			break;
+		case PhysicsServer3D::SLIDER_JOINT_LINEAR_MOTION_RESTITUTION:
+			setRestitutionDirLin(p_value);
+			break;
+		case PhysicsServer3D::SLIDER_JOINT_LINEAR_MOTION_DAMPING:
+			setDampingDirLin(p_value);
+			break;
+		case PhysicsServer3D::SLIDER_JOINT_LINEAR_ORTHOGONAL_SOFTNESS:
+			setSoftnessOrthoLin(p_value);
+			break;
+		case PhysicsServer3D::SLIDER_JOINT_LINEAR_ORTHOGONAL_RESTITUTION:
+			setRestitutionOrthoLin(p_value);
+			break;
+		case PhysicsServer3D::SLIDER_JOINT_LINEAR_ORTHOGONAL_DAMPING:
+			setDampingOrthoLin(p_value);
+			break;
+		case PhysicsServer3D::SLIDER_JOINT_ANGULAR_LIMIT_UPPER:
+			setUpperAngLimit(p_value);
+			break;
+		case PhysicsServer3D::SLIDER_JOINT_ANGULAR_LIMIT_LOWER:
+			setLowerAngLimit(p_value);
+			break;
+		case PhysicsServer3D::SLIDER_JOINT_ANGULAR_LIMIT_SOFTNESS:
+			setSoftnessLimAng(p_value);
+			break;
+		case PhysicsServer3D::SLIDER_JOINT_ANGULAR_LIMIT_RESTITUTION:
+			setRestitutionLimAng(p_value);
+			break;
+		case PhysicsServer3D::SLIDER_JOINT_ANGULAR_LIMIT_DAMPING:
+			setDampingLimAng(p_value);
+			break;
+		case PhysicsServer3D::SLIDER_JOINT_ANGULAR_MOTION_SOFTNESS:
+			setSoftnessDirAng(p_value);
+			break;
+		case PhysicsServer3D::SLIDER_JOINT_ANGULAR_MOTION_RESTITUTION:
+			setRestitutionDirAng(p_value);
+			break;
+		case PhysicsServer3D::SLIDER_JOINT_ANGULAR_MOTION_DAMPING:
+			setDampingDirAng(p_value);
+			break;
+		case PhysicsServer3D::SLIDER_JOINT_ANGULAR_ORTHOGONAL_SOFTNESS:
+			setSoftnessOrthoAng(p_value);
+			break;
+		case PhysicsServer3D::SLIDER_JOINT_ANGULAR_ORTHOGONAL_RESTITUTION:
+			setRestitutionOrthoAng(p_value);
+			break;
+		case PhysicsServer3D::SLIDER_JOINT_ANGULAR_ORTHOGONAL_DAMPING:
+			setDampingOrthoAng(p_value);
+			break;
+		case PhysicsServer3D::SLIDER_JOINT_MAX:
+			break; // Can't happen, but silences warning
 	}
 }
 
-real_t SliderJointBullet::get_param(PhysicsServer::SliderJointParam p_param) const {
+real_t SliderJointBullet::get_param(PhysicsServer3D::SliderJointParam p_param) const {
 	switch (p_param) {
-		case PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_UPPER: return getUpperLinLimit();
-		case PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_LOWER: return getLowerLinLimit();
-		case PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_SOFTNESS: return getSoftnessLimLin();
-		case PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_RESTITUTION: return getRestitutionLimLin();
-		case PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_DAMPING: return getDampingLimLin();
-		case PhysicsServer::SLIDER_JOINT_LINEAR_MOTION_SOFTNESS: return getSoftnessDirLin();
-		case PhysicsServer::SLIDER_JOINT_LINEAR_MOTION_RESTITUTION: return getRestitutionDirLin();
-		case PhysicsServer::SLIDER_JOINT_LINEAR_MOTION_DAMPING: return getDampingDirLin();
-		case PhysicsServer::SLIDER_JOINT_LINEAR_ORTHOGONAL_SOFTNESS: return getSoftnessOrthoLin();
-		case PhysicsServer::SLIDER_JOINT_LINEAR_ORTHOGONAL_RESTITUTION: return getRestitutionOrthoLin();
-		case PhysicsServer::SLIDER_JOINT_LINEAR_ORTHOGONAL_DAMPING: return getDampingOrthoLin();
-		case PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_UPPER: return getUpperAngLimit();
-		case PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_LOWER: return getLowerAngLimit();
-		case PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_SOFTNESS: return getSoftnessLimAng();
-		case PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_RESTITUTION: return getRestitutionLimAng();
-		case PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_DAMPING: return getDampingLimAng();
-		case PhysicsServer::SLIDER_JOINT_ANGULAR_MOTION_SOFTNESS: return getSoftnessDirAng();
-		case PhysicsServer::SLIDER_JOINT_ANGULAR_MOTION_RESTITUTION: return getRestitutionDirAng();
-		case PhysicsServer::SLIDER_JOINT_ANGULAR_MOTION_DAMPING: return getDampingDirAng();
-		case PhysicsServer::SLIDER_JOINT_ANGULAR_ORTHOGONAL_SOFTNESS: return getSoftnessOrthoAng();
-		case PhysicsServer::SLIDER_JOINT_ANGULAR_ORTHOGONAL_RESTITUTION: return getRestitutionOrthoAng();
-		case PhysicsServer::SLIDER_JOINT_ANGULAR_ORTHOGONAL_DAMPING: return getDampingOrthoAng();
+		case PhysicsServer3D::SLIDER_JOINT_LINEAR_LIMIT_UPPER:
+			return getUpperLinLimit();
+		case PhysicsServer3D::SLIDER_JOINT_LINEAR_LIMIT_LOWER:
+			return getLowerLinLimit();
+		case PhysicsServer3D::SLIDER_JOINT_LINEAR_LIMIT_SOFTNESS:
+			return getSoftnessLimLin();
+		case PhysicsServer3D::SLIDER_JOINT_LINEAR_LIMIT_RESTITUTION:
+			return getRestitutionLimLin();
+		case PhysicsServer3D::SLIDER_JOINT_LINEAR_LIMIT_DAMPING:
+			return getDampingLimLin();
+		case PhysicsServer3D::SLIDER_JOINT_LINEAR_MOTION_SOFTNESS:
+			return getSoftnessDirLin();
+		case PhysicsServer3D::SLIDER_JOINT_LINEAR_MOTION_RESTITUTION:
+			return getRestitutionDirLin();
+		case PhysicsServer3D::SLIDER_JOINT_LINEAR_MOTION_DAMPING:
+			return getDampingDirLin();
+		case PhysicsServer3D::SLIDER_JOINT_LINEAR_ORTHOGONAL_SOFTNESS:
+			return getSoftnessOrthoLin();
+		case PhysicsServer3D::SLIDER_JOINT_LINEAR_ORTHOGONAL_RESTITUTION:
+			return getRestitutionOrthoLin();
+		case PhysicsServer3D::SLIDER_JOINT_LINEAR_ORTHOGONAL_DAMPING:
+			return getDampingOrthoLin();
+		case PhysicsServer3D::SLIDER_JOINT_ANGULAR_LIMIT_UPPER:
+			return getUpperAngLimit();
+		case PhysicsServer3D::SLIDER_JOINT_ANGULAR_LIMIT_LOWER:
+			return getLowerAngLimit();
+		case PhysicsServer3D::SLIDER_JOINT_ANGULAR_LIMIT_SOFTNESS:
+			return getSoftnessLimAng();
+		case PhysicsServer3D::SLIDER_JOINT_ANGULAR_LIMIT_RESTITUTION:
+			return getRestitutionLimAng();
+		case PhysicsServer3D::SLIDER_JOINT_ANGULAR_LIMIT_DAMPING:
+			return getDampingLimAng();
+		case PhysicsServer3D::SLIDER_JOINT_ANGULAR_MOTION_SOFTNESS:
+			return getSoftnessDirAng();
+		case PhysicsServer3D::SLIDER_JOINT_ANGULAR_MOTION_RESTITUTION:
+			return getRestitutionDirAng();
+		case PhysicsServer3D::SLIDER_JOINT_ANGULAR_MOTION_DAMPING:
+			return getDampingDirAng();
+		case PhysicsServer3D::SLIDER_JOINT_ANGULAR_ORTHOGONAL_SOFTNESS:
+			return getSoftnessOrthoAng();
+		case PhysicsServer3D::SLIDER_JOINT_ANGULAR_ORTHOGONAL_RESTITUTION:
+			return getRestitutionOrthoAng();
+		case PhysicsServer3D::SLIDER_JOINT_ANGULAR_ORTHOGONAL_DAMPING:
+			return getDampingOrthoAng();
 		default:
 			return 0;
 	}
diff --git a/modules/bullet/slider_joint_bullet.h b/modules/bullet/slider_joint_bullet.h
index d98a1b8c95..6410b952ed 100644
--- a/modules/bullet/slider_joint_bullet.h
+++ b/modules/bullet/slider_joint_bullet.h
@@ -46,7 +46,7 @@ public:
 	/// Reference frame is A
 	SliderJointBullet(RigidBodyBullet *rbA, RigidBodyBullet *rbB, const Transform &frameInA, const Transform &frameInB);
 
-	virtual PhysicsServer::JointType get_type() const { return PhysicsServer::JOINT_SLIDER; }
+	virtual PhysicsServer3D::JointType get_type() const { return PhysicsServer3D::JOINT_SLIDER; }
 
 	const RigidBodyBullet *getRigidBodyA() const;
 	const RigidBodyBullet *getRigidBodyB() const;
@@ -115,7 +115,7 @@ public:
 	real_t getMaxAngMotorForce();
 	real_t getLinearPos();
 
-	void set_param(PhysicsServer::SliderJointParam p_param, real_t p_value);
-	real_t get_param(PhysicsServer::SliderJointParam p_param) const;
+	void set_param(PhysicsServer3D::SliderJointParam p_param, real_t p_value);
+	real_t get_param(PhysicsServer3D::SliderJointParam p_param) const;
 };
 #endif
diff --git a/modules/bullet/soft_body_bullet.cpp b/modules/bullet/soft_body_bullet.cpp
index f4c0ffa6eb..ee48b3c5f0 100644
--- a/modules/bullet/soft_body_bullet.cpp
+++ b/modules/bullet/soft_body_bullet.cpp
@@ -32,27 +32,16 @@
 
 #include "bullet_types_converter.h"
 #include "bullet_utilities.h"
-#include "scene/3d/soft_body.h"
+#include "scene/3d/soft_body_3d.h"
 #include "space_bullet.h"
 
 SoftBodyBullet::SoftBodyBullet() :
-		CollisionObjectBullet(CollisionObjectBullet::TYPE_SOFT_BODY),
-		bt_soft_body(NULL),
-		isScratched(false),
-		simulation_precision(5),
-		total_mass(1.),
-		linear_stiffness(0.5),
-		areaAngular_stiffness(0.5),
-		volume_stiffness(0.5),
-		pressure_coefficient(0.),
-		pose_matching_coefficient(0.),
-		damping_coefficient(0.01),
-		drag_coefficient(0.) {}
+		CollisionObjectBullet(CollisionObjectBullet::TYPE_SOFT_BODY) {}
 
 SoftBodyBullet::~SoftBodyBullet() {
 }
 
-void SoftBodyBullet::reload_body() {
+void SoftBodyBullet::do_reload_body() {
 	if (space) {
 		space->remove_soft_body(this);
 		space->add_soft_body(this);
@@ -62,13 +51,15 @@ void SoftBodyBullet::reload_body() {
 void SoftBodyBullet::set_space(SpaceBullet *p_space) {
 	if (space) {
 		isScratched = false;
+		space->unregister_collision_object(this);
 		space->remove_soft_body(this);
 	}
 
 	space = p_space;
 
 	if (space) {
-		space->add_soft_body(this);
+		space->register_collision_object(this);
+		reload_body();
 	}
 }
 
@@ -76,9 +67,10 @@ void SoftBodyBullet::on_enter_area(AreaBullet *p_area) {}
 
 void SoftBodyBullet::on_exit_area(AreaBullet *p_area) {}
 
-void SoftBodyBullet::update_visual_server(SoftBodyVisualServerHandler *p_visual_server_handler) {
-	if (!bt_soft_body)
+void SoftBodyBullet::update_rendering_server(SoftBodyRenderingServerHandler *p_rendering_server_handler) {
+	if (!bt_soft_body) {
 		return;
+	}
 
 	/// Update visual server vertices
 	const btSoftBody::tNodeArray &nodes(bt_soft_body->m_nodes);
@@ -96,8 +88,8 @@ void SoftBodyBullet::update_visual_server(SoftBodyVisualServerHandler *p_visual_
 
 		const int vs_indices_size(vs_indices->size());
 		for (int x = 0; x < vs_indices_size; ++x) {
-			p_visual_server_handler->set_vertex((*vs_indices)[x], vertex_position);
-			p_visual_server_handler->set_normal((*vs_indices)[x], vertex_normal);
+			p_rendering_server_handler->set_vertex((*vs_indices)[x], vertex_position);
+			p_rendering_server_handler->set_normal((*vs_indices)[x], vertex_normal);
 		}
 	}
 
@@ -112,31 +104,30 @@ void SoftBodyBullet::update_visual_server(SoftBodyVisualServerHandler *p_visual_
 	B_TO_G(aabb_min, aabb.position);
 	B_TO_G(size, aabb.size);
 
-	p_visual_server_handler->set_aabb(aabb);
+	p_rendering_server_handler->set_aabb(aabb);
 }
 
 void SoftBodyBullet::set_soft_mesh(const Ref<Mesh> &p_mesh) {
-
-	if (p_mesh.is_null())
+	if (p_mesh.is_null()) {
 		soft_mesh.unref();
-	else
+	} else {
 		soft_mesh = p_mesh;
+	}
 
 	if (soft_mesh.is_null()) {
-
 		destroy_soft_body();
 		return;
 	}
 
 	Array arrays = soft_mesh->surface_get_arrays(0);
-	ERR_FAIL_COND(!(soft_mesh->surface_get_format(0) & VS::ARRAY_FORMAT_INDEX));
-	set_trimesh_body_shape(arrays[VS::ARRAY_INDEX], arrays[VS::ARRAY_VERTEX]);
+	ERR_FAIL_COND(!(soft_mesh->surface_get_format(0) & RS::ARRAY_FORMAT_INDEX));
+	set_trimesh_body_shape(arrays[RS::ARRAY_INDEX], arrays[RS::ARRAY_VERTEX]);
 }
 
 void SoftBodyBullet::destroy_soft_body() {
-
-	if (!bt_soft_body)
+	if (!bt_soft_body) {
 		return;
+	}
 
 	if (space) {
 		/// Remove from world before deletion
@@ -144,7 +135,7 @@ void SoftBodyBullet::destroy_soft_body() {
 	}
 
 	destroyBulletCollisionObject();
-	bt_soft_body = NULL;
+	bt_soft_body = nullptr;
 }
 
 void SoftBodyBullet::set_soft_transform(const Transform &p_transform) {
@@ -153,8 +144,9 @@ void SoftBodyBullet::set_soft_transform(const Transform &p_transform) {
 }
 
 void SoftBodyBullet::move_all_nodes(const Transform &p_transform) {
-	if (!bt_soft_body)
+	if (!bt_soft_body) {
 		return;
+	}
 	btTransform bt_transf;
 	G_TO_B(p_transform, bt_transf);
 	bt_soft_body->transform(bt_transf);
@@ -168,6 +160,7 @@ void SoftBodyBullet::set_node_position(int p_node_index, const Vector3 &p_global
 
 void SoftBodyBullet::set_node_position(int p_node_index, const btVector3 &p_global_position) {
 	if (bt_soft_body) {
+		bt_soft_body->m_nodes[p_node_index].m_q = bt_soft_body->m_nodes[p_node_index].m_x;
 		bt_soft_body->m_nodes[p_node_index].m_x = p_global_position;
 	}
 }
@@ -179,11 +172,12 @@ void SoftBodyBullet::get_node_position(int p_node_index, Vector3 &r_position) co
 }
 
 void SoftBodyBullet::get_node_offset(int p_node_index, Vector3 &r_offset) const {
-	if (soft_mesh.is_null())
+	if (soft_mesh.is_null()) {
 		return;
+	}
 
 	Array arrays = soft_mesh->surface_get_arrays(0);
-	PoolVector<Vector3> vertices(arrays[VS::ARRAY_VERTEX]);
+	Vector<Vector3> vertices(arrays[RS::ARRAY_VERTEX]);
 
 	if (0 <= p_node_index && vertices.size() > p_node_index) {
 		r_offset = vertices[p_node_index];
@@ -225,15 +219,15 @@ void SoftBodyBullet::reset_all_node_mass() {
 }
 
 void SoftBodyBullet::reset_all_node_positions() {
-	if (soft_mesh.is_null())
+	if (soft_mesh.is_null()) {
 		return;
+	}
 
 	Array arrays = soft_mesh->surface_get_arrays(0);
-	PoolVector<Vector3> vs_vertices(arrays[VS::ARRAY_VERTEX]);
-	PoolVector<Vector3>::Read vs_vertices_read = vs_vertices.read();
+	Vector<Vector3> vs_vertices(arrays[RS::ARRAY_VERTEX]);
+	const Vector3 *vs_vertices_read = vs_vertices.ptr();
 
 	for (int vertex_index = bt_soft_body->m_nodes.size() - 1; 0 <= vertex_index; --vertex_index) {
-
 		G_TO_B(vs_vertices_read[indices_table[vertex_index][0]], bt_soft_body->m_nodes[vertex_index].m_x);
 
 		bt_soft_body->m_nodes[vertex_index].m_q = bt_soft_body->m_nodes[vertex_index].m_x;
@@ -319,7 +313,7 @@ void SoftBodyBullet::set_drag_coefficient(real_t p_val) {
 	}
 }
 
-void SoftBodyBullet::set_trimesh_body_shape(PoolVector<int> p_indices, PoolVector<Vector3> p_vertices) {
+void SoftBodyBullet::set_trimesh_body_shape(Vector<int> p_indices, Vector<Vector3> p_vertices) {
 	/// Assert the current soft body is destroyed
 	destroy_soft_body();
 
@@ -338,10 +332,9 @@ void SoftBodyBullet::set_trimesh_body_shape(PoolVector<int> p_indices, PoolVecto
 
 			const int vs_vertices_size(p_vertices.size());
 
-			PoolVector<Vector3>::Read p_vertices_read = p_vertices.read();
+			const Vector3 *p_vertices_read = p_vertices.ptr();
 
 			for (int vs_vertex_index = 0; vs_vertex_index < vs_vertices_size; ++vs_vertex_index) {
-
 				Map<Vector3, int>::Element *e = unique_vertices.find(p_vertices_read[vs_vertex_index]);
 				int vertex_id;
 				if (e) {
@@ -353,40 +346,40 @@ void SoftBodyBullet::set_trimesh_body_shape(PoolVector<int> p_indices, PoolVecto
 					indices_table.push_back(Vector<int>());
 				}
 
-				indices_table.write[vertex_id].push_back(vs_vertex_index);
+				indices_table[vertex_id].push_back(vs_vertex_index);
 				vs_indices_to_physics_table.push_back(vertex_id);
 			}
 		}
 
 		const int indices_map_size(indices_table.size());
 
-		Vector<btScalar> bt_vertices;
+		LocalVector<btScalar> bt_vertices;
 
 		{ // Parse vertices to bullet
 
 			bt_vertices.resize(indices_map_size * 3);
-			PoolVector<Vector3>::Read p_vertices_read = p_vertices.read();
+			const Vector3 *p_vertices_read = p_vertices.ptr();
 
 			for (int i = 0; i < indices_map_size; ++i) {
-				bt_vertices.write[3 * i + 0] = p_vertices_read[indices_table[i][0]].x;
-				bt_vertices.write[3 * i + 1] = p_vertices_read[indices_table[i][0]].y;
-				bt_vertices.write[3 * i + 2] = p_vertices_read[indices_table[i][0]].z;
+				bt_vertices[3 * i + 0] = p_vertices_read[indices_table[i][0]].x;
+				bt_vertices[3 * i + 1] = p_vertices_read[indices_table[i][0]].y;
+				bt_vertices[3 * i + 2] = p_vertices_read[indices_table[i][0]].z;
 			}
 		}
 
-		Vector<int> bt_triangles;
+		LocalVector<int> bt_triangles;
 		const int triangles_size(p_indices.size() / 3);
 
 		{ // Parse indices
 
 			bt_triangles.resize(triangles_size * 3);
 
-			PoolVector<int>::Read p_indices_read = p_indices.read();
+			const int *p_indices_read = p_indices.ptr();
 
 			for (int i = 0; i < triangles_size; ++i) {
-				bt_triangles.write[3 * i + 0] = vs_indices_to_physics_table[p_indices_read[3 * i + 2]];
-				bt_triangles.write[3 * i + 1] = vs_indices_to_physics_table[p_indices_read[3 * i + 1]];
-				bt_triangles.write[3 * i + 2] = vs_indices_to_physics_table[p_indices_read[3 * i + 0]];
+				bt_triangles[3 * i + 0] = vs_indices_to_physics_table[p_indices_read[3 * i + 2]];
+				bt_triangles[3 * i + 1] = vs_indices_to_physics_table[p_indices_read[3 * i + 1]];
+				bt_triangles[3 * i + 2] = vs_indices_to_physics_table[p_indices_read[3 * i + 0]];
 			}
 		}
 
@@ -397,13 +390,13 @@ void SoftBodyBullet::set_trimesh_body_shape(PoolVector<int> p_indices, PoolVecto
 }
 
 void SoftBodyBullet::setup_soft_body() {
-
-	if (!bt_soft_body)
+	if (!bt_soft_body) {
 		return;
+	}
 
 	// Soft body setup
 	setupBulletCollisionObject(bt_soft_body);
-	bt_soft_body->m_worldInfo = NULL; // Remove fake world info
+	bt_soft_body->m_worldInfo = nullptr; // Remove fake world info
 	bt_soft_body->getCollisionShape()->setMargin(0.01);
 	bt_soft_body->setCollisionFlags(bt_soft_body->getCollisionFlags() & (~(btCollisionObject::CF_KINEMATIC_OBJECT | btCollisionObject::CF_STATIC_OBJECT)));
 
diff --git a/modules/bullet/soft_body_bullet.h b/modules/bullet/soft_body_bullet.h
index b98116b073..229204b539 100644
--- a/modules/bullet/soft_body_bullet.h
+++ b/modules/bullet/soft_body_bullet.h
@@ -32,7 +32,6 @@
 #define SOFT_BODY_BULLET_H
 
 #include "collision_object_bullet.h"
-#include "scene/resources/material.h" // TODO remove this please
 
 #ifdef None
 /// This is required to remove the macro None defined by x11 compiler because this word "None" is used internally by Bullet
@@ -43,7 +42,7 @@
 #include "BulletSoftBody/btSoftBodyHelpers.h"
 #include "collision_object_bullet.h"
 #include "scene/resources/mesh.h"
-#include "servers/physics_server.h"
+#include "servers/physics_server_3d.h"
 
 #ifdef x11_None
 /// This is required to re add the macro None defined by x11 compiler
@@ -56,25 +55,24 @@
 */
 
 class SoftBodyBullet : public CollisionObjectBullet {
-
 private:
-	btSoftBody *bt_soft_body;
-	Vector<Vector<int> > indices_table;
+	btSoftBody *bt_soft_body = nullptr;
+	LocalVector<Vector<int>> indices_table;
 	btSoftBody::Material *mat0; // This is just a copy of pointer managed by btSoftBody
-	bool isScratched;
+	bool isScratched = false;
 
 	Ref<Mesh> soft_mesh;
 
-	int simulation_precision;
-	real_t total_mass;
-	real_t linear_stiffness; // [0,1]
-	real_t areaAngular_stiffness; // [0,1]
-	real_t volume_stiffness; // [0,1]
-	real_t pressure_coefficient; // [-inf,+inf]
-	real_t pose_matching_coefficient; // [0,1]
-	real_t damping_coefficient; // [0,1]
-	real_t drag_coefficient; // [0,1]
-	Vector<int> pinned_nodes;
+	int simulation_precision = 5;
+	real_t total_mass = 1.;
+	real_t linear_stiffness = 0.5; // [0,1]
+	real_t areaAngular_stiffness = 0.5; // [0,1]
+	real_t volume_stiffness = 0.5; // [0,1]
+	real_t pressure_coefficient = 0.; // [-inf,+inf]
+	real_t pose_matching_coefficient = 0.; // [0,1]
+	real_t damping_coefficient = 0.01; // [0,1]
+	real_t drag_coefficient = 0.; // [0,1]
+	LocalVector<int> pinned_nodes;
 
 	// Other property to add
 	//btScalar				kVC;			// Volume conversation coefficient [0,+inf]
@@ -88,19 +86,18 @@ public:
 	SoftBodyBullet();
 	~SoftBodyBullet();
 
-	virtual void reload_body();
-	virtual void set_space(SpaceBullet *p_space);
+	virtual void do_reload_body() override;
+	virtual void set_space(SpaceBullet *p_space) override;
 
-	virtual void dispatch_callbacks() {}
-	virtual void on_collision_filters_change() {}
-	virtual void on_collision_checker_start() {}
-	virtual void on_collision_checker_end() {}
-	virtual void on_enter_area(AreaBullet *p_area);
-	virtual void on_exit_area(AreaBullet *p_area);
+	virtual void do_reload_collision_filters() override {}
+	virtual void on_collision_checker_start() override {}
+	virtual void on_collision_checker_end() override {}
+	virtual void on_enter_area(AreaBullet *p_area) override;
+	virtual void on_exit_area(AreaBullet *p_area) override;
 
 	_FORCE_INLINE_ btSoftBody *get_bt_soft_body() const { return bt_soft_body; }
 
-	void update_visual_server(class SoftBodyVisualServerHandler *p_visual_server_handler);
+	void update_rendering_server(class SoftBodyRenderingServerHandler *p_rendering_server_handler);
 
 	void set_soft_mesh(const Ref<Mesh> &p_mesh);
 	void destroy_soft_body();
@@ -152,7 +149,7 @@ public:
 	_FORCE_INLINE_ real_t get_drag_coefficient() const { return drag_coefficient; }
 
 private:
-	void set_trimesh_body_shape(PoolVector<int> p_indices, PoolVector<Vector3> p_vertices);
+	void set_trimesh_body_shape(Vector<int> p_indices, Vector<Vector3> p_vertices);
 	void setup_soft_body();
 
 	void pin_node(int p_node_index);
diff --git a/modules/bullet/space_bullet.cpp b/modules/bullet/space_bullet.cpp
index 0f50d31611..d0515e7c97 100644
--- a/modules/bullet/space_bullet.cpp
+++ b/modules/bullet/space_bullet.cpp
@@ -39,7 +39,7 @@
 #include "godot_collision_configuration.h"
 #include "godot_collision_dispatcher.h"
 #include "rigid_body_bullet.h"
-#include "servers/physics_server.h"
+#include "servers/physics_server_3d.h"
 #include "soft_body_bullet.h"
 
 #include <BulletCollision/BroadphaseCollision/btBroadphaseProxy.h>
@@ -59,13 +59,13 @@
 */
 
 BulletPhysicsDirectSpaceState::BulletPhysicsDirectSpaceState(SpaceBullet *p_space) :
-		PhysicsDirectSpaceState(),
+		PhysicsDirectSpaceState3D(),
 		space(p_space) {}
 
 int BulletPhysicsDirectSpaceState::intersect_point(const Vector3 &p_point, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude, uint32_t p_collision_mask, bool p_collide_with_bodies, bool p_collide_with_areas) {
-
-	if (p_result_max <= 0)
+	if (p_result_max <= 0) {
 		return 0;
+	}
 
 	btVector3 bt_point;
 	G_TO_B(p_point, bt_point);
@@ -86,7 +86,6 @@ int BulletPhysicsDirectSpaceState::intersect_point(const Vector3 &p_point, Shape
 }
 
 bool BulletPhysicsDirectSpaceState::intersect_ray(const Vector3 &p_from, const Vector3 &p_to, RayResult &r_result, const Set<RID> &p_exclude, uint32_t p_collision_mask, bool p_collide_with_bodies, bool p_collide_with_areas, bool p_pick_ray) {
-
 	btVector3 btVec_from;
 	btVector3 btVec_to;
 
@@ -108,9 +107,9 @@ bool BulletPhysicsDirectSpaceState::intersect_ray(const Vector3 &p_from, const V
 			r_result.shape = btResult.m_shapeId;
 			r_result.rid = gObj->get_self();
 			r_result.collider_id = gObj->get_instance_id();
-			r_result.collider = 0 == r_result.collider_id ? NULL : ObjectDB::get_instance(r_result.collider_id);
+			r_result.collider = r_result.collider_id.is_null() ? nullptr : ObjectDB::get_instance(r_result.collider_id);
 		} else {
-			WARN_PRINTS("The raycast performed has hit a collision object that is not part of Godot scene, please check it.");
+			WARN_PRINT("The raycast performed has hit a collision object that is not part of Godot scene, please check it.");
 		}
 		return true;
 	} else {
@@ -119,15 +118,17 @@ bool BulletPhysicsDirectSpaceState::intersect_ray(const Vector3 &p_from, const V
 }
 
 int BulletPhysicsDirectSpaceState::intersect_shape(const RID &p_shape, const Transform &p_xform, float p_margin, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude, uint32_t p_collision_mask, bool p_collide_with_bodies, bool p_collide_with_areas) {
-	if (p_result_max <= 0)
+	if (p_result_max <= 0) {
 		return 0;
+	}
 
-	ShapeBullet *shape = space->get_physics_server()->get_shape_owner()->get(p_shape);
+	ShapeBullet *shape = space->get_physics_server()->get_shape_owner()->getornull(p_shape);
+	ERR_FAIL_COND_V(!shape, 0);
 
 	btCollisionShape *btShape = shape->create_bt_shape(p_xform.basis.get_scale_abs(), p_margin);
 	if (!btShape->isConvex()) {
-		bulletdelete(btShape);
-		ERR_PRINTS("The shape is not a convex shape, then is not supported: shape type: " + itos(shape->get_type()));
+		shape->destroy_bt_shape(btShape);
+		ERR_PRINT("The shape is not a convex shape, then is not supported: shape type: " + itos(shape->get_type()));
 		return 0;
 	}
 	btConvexShape *btConvex = static_cast<btConvexShape *>(btShape);
@@ -146,25 +147,28 @@ int BulletPhysicsDirectSpaceState::intersect_shape(const RID &p_shape, const Tra
 	btQuery.m_closestDistanceThreshold = 0;
 	space->dynamicsWorld->contactTest(&collision_object, btQuery);
 
-	bulletdelete(btConvex);
+	shape->destroy_bt_shape(btShape);
 
 	return btQuery.m_count;
 }
 
 bool BulletPhysicsDirectSpaceState::cast_motion(const RID &p_shape, const Transform &p_xform, const Vector3 &p_motion, float p_margin, float &r_closest_safe, float &r_closest_unsafe, const Set<RID> &p_exclude, uint32_t p_collision_mask, bool p_collide_with_bodies, bool p_collide_with_areas, ShapeRestInfo *r_info) {
-	ShapeBullet *shape = space->get_physics_server()->get_shape_owner()->get(p_shape);
+	r_closest_safe = 0.0f;
+	r_closest_unsafe = 0.0f;
+	btVector3 bt_motion;
+	G_TO_B(p_motion, bt_motion);
+
+	ShapeBullet *shape = space->get_physics_server()->get_shape_owner()->getornull(p_shape);
+	ERR_FAIL_COND_V(!shape, false);
 
 	btCollisionShape *btShape = shape->create_bt_shape(p_xform.basis.get_scale(), p_margin);
 	if (!btShape->isConvex()) {
-		bulletdelete(btShape);
-		ERR_PRINTS("The shape is not a convex shape, then is not supported: shape type: " + itos(shape->get_type()));
+		shape->destroy_bt_shape(btShape);
+		ERR_PRINT("The shape is not a convex shape, then is not supported: shape type: " + itos(shape->get_type()));
 		return false;
 	}
 	btConvexShape *bt_convex_shape = static_cast<btConvexShape *>(btShape);
 
-	btVector3 bt_motion;
-	G_TO_B(p_motion, bt_motion);
-
 	btTransform bt_xform_from;
 	G_TO_B(p_xform, bt_xform_from);
 	UNSCALE_BT_BASIS(bt_xform_from);
@@ -172,15 +176,17 @@ bool BulletPhysicsDirectSpaceState::cast_motion(const RID &p_shape, const Transf
 	btTransform bt_xform_to(bt_xform_from);
 	bt_xform_to.getOrigin() += bt_motion;
 
+	if ((bt_xform_to.getOrigin() - bt_xform_from.getOrigin()).fuzzyZero()) {
+		shape->destroy_bt_shape(btShape);
+		return false;
+	}
+
 	GodotClosestConvexResultCallback btResult(bt_xform_from.getOrigin(), bt_xform_to.getOrigin(), &p_exclude, p_collide_with_bodies, p_collide_with_areas);
 	btResult.m_collisionFilterGroup = 0;
 	btResult.m_collisionFilterMask = p_collision_mask;
 
 	space->dynamicsWorld->convexSweepTest(bt_convex_shape, bt_xform_from, bt_xform_to, btResult, space->dynamicsWorld->getDispatchInfo().m_allowedCcdPenetration);
 
-	r_closest_unsafe = 1.0;
-	r_closest_safe = 1.0;
-
 	if (btResult.hasHit()) {
 		const btScalar l = bt_motion.length();
 		r_closest_unsafe = btResult.m_closestHitFraction;
@@ -196,24 +202,29 @@ bool BulletPhysicsDirectSpaceState::cast_motion(const RID &p_shape, const Transf
 			r_info->collider_id = collision_object->get_instance_id();
 			r_info->shape = btResult.m_shapeId;
 		}
+	} else {
+		r_closest_safe = 1.0f;
+		r_closest_unsafe = 1.0f;
 	}
 
-	bulletdelete(bt_convex_shape);
+	shape->destroy_bt_shape(btShape);
 	return true; // Mean success
 }
 
 /// Returns the list of contacts pairs in this order: Local contact, other body contact
 bool BulletPhysicsDirectSpaceState::collide_shape(RID p_shape, const Transform &p_shape_xform, float p_margin, Vector3 *r_results, int p_result_max, int &r_result_count, const Set<RID> &p_exclude, uint32_t p_collision_mask, bool p_collide_with_bodies, bool p_collide_with_areas) {
-	if (p_result_max <= 0)
-		return 0;
+	if (p_result_max <= 0) {
+		return false;
+	}
 
-	ShapeBullet *shape = space->get_physics_server()->get_shape_owner()->get(p_shape);
+	ShapeBullet *shape = space->get_physics_server()->get_shape_owner()->getornull(p_shape);
+	ERR_FAIL_COND_V(!shape, false);
 
 	btCollisionShape *btShape = shape->create_bt_shape(p_shape_xform.basis.get_scale_abs(), p_margin);
 	if (!btShape->isConvex()) {
-		bulletdelete(btShape);
-		ERR_PRINTS("The shape is not a convex shape, then is not supported: shape type: " + itos(shape->get_type()));
-		return 0;
+		shape->destroy_bt_shape(btShape);
+		ERR_PRINT("The shape is not a convex shape, then is not supported: shape type: " + itos(shape->get_type()));
+		return false;
 	}
 	btConvexShape *btConvex = static_cast<btConvexShape *>(btShape);
 
@@ -232,20 +243,20 @@ bool BulletPhysicsDirectSpaceState::collide_shape(RID p_shape, const Transform &
 	space->dynamicsWorld->contactTest(&collision_object, btQuery);
 
 	r_result_count = btQuery.m_count;
-	bulletdelete(btConvex);
+	shape->destroy_bt_shape(btShape);
 
 	return btQuery.m_count;
 }
 
 bool BulletPhysicsDirectSpaceState::rest_info(RID p_shape, const Transform &p_shape_xform, float p_margin, ShapeRestInfo *r_info, const Set<RID> &p_exclude, uint32_t p_collision_mask, bool p_collide_with_bodies, bool p_collide_with_areas) {
-
-	ShapeBullet *shape = space->get_physics_server()->get_shape_owner()->get(p_shape);
+	ShapeBullet *shape = space->get_physics_server()->get_shape_owner()->getornull(p_shape);
+	ERR_FAIL_COND_V(!shape, false);
 
 	btCollisionShape *btShape = shape->create_bt_shape(p_shape_xform.basis.get_scale_abs(), p_margin);
 	if (!btShape->isConvex()) {
-		bulletdelete(btShape);
-		ERR_PRINTS("The shape is not a convex shape, then is not supported: shape type: " + itos(shape->get_type()));
-		return 0;
+		shape->destroy_bt_shape(btShape);
+		ERR_PRINT("The shape is not a convex shape, then is not supported: shape type: " + itos(shape->get_type()));
+		return false;
 	}
 	btConvexShape *btConvex = static_cast<btConvexShape *>(btShape);
 
@@ -263,7 +274,7 @@ bool BulletPhysicsDirectSpaceState::rest_info(RID p_shape, const Transform &p_sh
 	btQuery.m_closestDistanceThreshold = 0;
 	space->dynamicsWorld->contactTest(&collision_object, btQuery);
 
-	bulletdelete(btConvex);
+	shape->destroy_bt_shape(btShape);
 
 	if (btQuery.m_collided) {
 		if (btCollisionObject::CO_RIGID_BODY == btQuery.m_rest_info_collision_object->getInternalType()) {
@@ -276,8 +287,7 @@ bool BulletPhysicsDirectSpaceState::rest_info(RID p_shape, const Transform &p_sh
 }
 
 Vector3 BulletPhysicsDirectSpaceState::get_closest_point_to_object_volume(RID p_object, const Vector3 p_point) const {
-
-	RigidCollisionObjectBullet *rigid_object = space->get_physics_server()->get_rigid_collisin_object(p_object);
+	RigidCollisionObjectBullet *rigid_object = space->get_physics_server()->get_rigid_collision_object(p_object);
 	ERR_FAIL_COND_V(!rigid_object, Vector3());
 
 	btVector3 out_closest_point(0, 0, 0);
@@ -309,7 +319,7 @@ Vector3 BulletPhysicsDirectSpaceState::get_closest_point_to_object_volume(RID p_
 
 			btPointCollector result;
 			btGjkPairDetector gjk_pair_detector(&point_shape, convex_shape, space->gjk_simplex_solver, space->gjk_epa_pen_solver);
-			gjk_pair_detector.getClosestPoints(input, result, 0);
+			gjk_pair_detector.getClosestPoints(input, result, nullptr);
 
 			if (out_distance > result.m_distance) {
 				out_distance = result.m_distance;
@@ -320,31 +330,16 @@ Vector3 BulletPhysicsDirectSpaceState::get_closest_point_to_object_volume(RID p_
 	}
 
 	if (shapes_found) {
-
 		Vector3 out;
 		B_TO_G(out_closest_point, out);
 		return out;
 	} else {
-
 		// no shapes found, use distance to origin.
 		return rigid_object->get_transform().get_origin();
 	}
 }
 
-SpaceBullet::SpaceBullet() :
-		broadphase(NULL),
-		collisionConfiguration(NULL),
-		dispatcher(NULL),
-		solver(NULL),
-		dynamicsWorld(NULL),
-		soft_body_world_info(NULL),
-		ghostPairCallback(NULL),
-		godotFilterCallback(NULL),
-		gravityDirection(0, -1, 0),
-		gravityMagnitude(10),
-		contactDebugCount(0),
-		delta_time(0.) {
-
+SpaceBullet::SpaceBullet() {
 	create_empty_world(GLOBAL_DEF("physics/3d/active_soft_world", true));
 	direct_access = memnew(BulletPhysicsDirectSpaceState(this));
 }
@@ -354,112 +349,162 @@ SpaceBullet::~SpaceBullet() {
 	destroy_world();
 }
 
+void SpaceBullet::add_to_pre_flush_queue(CollisionObjectBullet *p_co) {
+	if (p_co->is_in_flush_queue == false) {
+		p_co->is_in_flush_queue = true;
+		queue_pre_flush.push_back(p_co);
+	}
+}
+
+void SpaceBullet::add_to_flush_queue(CollisionObjectBullet *p_co) {
+	if (p_co->is_in_flush_queue == false) {
+		p_co->is_in_flush_queue = true;
+		queue_flush.push_back(p_co);
+	}
+}
+
+void SpaceBullet::remove_from_any_queue(CollisionObjectBullet *p_co) {
+	if (p_co->is_in_flush_queue) {
+		p_co->is_in_flush_queue = false;
+		queue_pre_flush.erase(p_co);
+		queue_flush.erase(p_co);
+	}
+}
+
 void SpaceBullet::flush_queries() {
-	const btCollisionObjectArray &colObjArray = dynamicsWorld->getCollisionObjectArray();
-	for (int i = colObjArray.size() - 1; 0 <= i; --i) {
-		static_cast<CollisionObjectBullet *>(colObjArray[i]->getUserPointer())->dispatch_callbacks();
+	for (uint32_t i = 0; i < queue_pre_flush.size(); i += 1) {
+		queue_pre_flush[i]->dispatch_callbacks();
+		queue_pre_flush[i]->is_in_flush_queue = false;
+	}
+	for (uint32_t i = 0; i < queue_flush.size(); i += 1) {
+		queue_flush[i]->dispatch_callbacks();
+		queue_flush[i]->is_in_flush_queue = false;
 	}
+	queue_pre_flush.clear();
+	queue_flush.clear();
 }
 
 void SpaceBullet::step(real_t p_delta_time) {
+	for (uint32_t i = 0; i < collision_objects.size(); i += 1) {
+		collision_objects[i]->pre_process();
+	}
+
 	delta_time = p_delta_time;
 	dynamicsWorld->stepSimulation(p_delta_time, 0, 0);
 }
 
-void SpaceBullet::set_param(PhysicsServer::AreaParameter p_param, const Variant &p_value) {
+void SpaceBullet::set_param(PhysicsServer3D::AreaParameter p_param, const Variant &p_value) {
 	assert(dynamicsWorld);
 
 	switch (p_param) {
-		case PhysicsServer::AREA_PARAM_GRAVITY:
+		case PhysicsServer3D::AREA_PARAM_GRAVITY:
 			gravityMagnitude = p_value;
 			update_gravity();
 			break;
-		case PhysicsServer::AREA_PARAM_GRAVITY_VECTOR:
+		case PhysicsServer3D::AREA_PARAM_GRAVITY_VECTOR:
 			gravityDirection = p_value;
 			update_gravity();
 			break;
-		case PhysicsServer::AREA_PARAM_LINEAR_DAMP:
-		case PhysicsServer::AREA_PARAM_ANGULAR_DAMP:
-			break; // No damp
-		case PhysicsServer::AREA_PARAM_PRIORITY:
+		case PhysicsServer3D::AREA_PARAM_LINEAR_DAMP:
+			linear_damp = p_value;
+			break;
+		case PhysicsServer3D::AREA_PARAM_ANGULAR_DAMP:
+			angular_damp = p_value;
+			break;
+		case PhysicsServer3D::AREA_PARAM_PRIORITY:
 			// Priority is always 0, the lower
 			break;
-		case PhysicsServer::AREA_PARAM_GRAVITY_IS_POINT:
-		case PhysicsServer::AREA_PARAM_GRAVITY_DISTANCE_SCALE:
-		case PhysicsServer::AREA_PARAM_GRAVITY_POINT_ATTENUATION:
+		case PhysicsServer3D::AREA_PARAM_GRAVITY_IS_POINT:
+		case PhysicsServer3D::AREA_PARAM_GRAVITY_DISTANCE_SCALE:
+		case PhysicsServer3D::AREA_PARAM_GRAVITY_POINT_ATTENUATION:
 			break;
 		default:
-			WARN_PRINTS("This set parameter (" + itos(p_param) + ") is ignored, the SpaceBullet doesn't support it.");
+			WARN_PRINT("This set parameter (" + itos(p_param) + ") is ignored, the SpaceBullet doesn't support it.");
 			break;
 	}
 }
 
-Variant SpaceBullet::get_param(PhysicsServer::AreaParameter p_param) {
+Variant SpaceBullet::get_param(PhysicsServer3D::AreaParameter p_param) {
 	switch (p_param) {
-		case PhysicsServer::AREA_PARAM_GRAVITY:
+		case PhysicsServer3D::AREA_PARAM_GRAVITY:
 			return gravityMagnitude;
-		case PhysicsServer::AREA_PARAM_GRAVITY_VECTOR:
+		case PhysicsServer3D::AREA_PARAM_GRAVITY_VECTOR:
 			return gravityDirection;
-		case PhysicsServer::AREA_PARAM_LINEAR_DAMP:
-		case PhysicsServer::AREA_PARAM_ANGULAR_DAMP:
-			return 0; // No damp
-		case PhysicsServer::AREA_PARAM_PRIORITY:
+		case PhysicsServer3D::AREA_PARAM_LINEAR_DAMP:
+			return linear_damp;
+		case PhysicsServer3D::AREA_PARAM_ANGULAR_DAMP:
+			return angular_damp;
+		case PhysicsServer3D::AREA_PARAM_PRIORITY:
 			return 0; // Priority is always 0, the lower
-		case PhysicsServer::AREA_PARAM_GRAVITY_IS_POINT:
+		case PhysicsServer3D::AREA_PARAM_GRAVITY_IS_POINT:
 			return false;
-		case PhysicsServer::AREA_PARAM_GRAVITY_DISTANCE_SCALE:
+		case PhysicsServer3D::AREA_PARAM_GRAVITY_DISTANCE_SCALE:
 			return 0;
-		case PhysicsServer::AREA_PARAM_GRAVITY_POINT_ATTENUATION:
+		case PhysicsServer3D::AREA_PARAM_GRAVITY_POINT_ATTENUATION:
 			return 0;
 		default:
-			WARN_PRINTS("This get parameter (" + itos(p_param) + ") is ignored, the SpaceBullet doesn't support it.");
+			WARN_PRINT("This get parameter (" + itos(p_param) + ") is ignored, the SpaceBullet doesn't support it.");
 			return Variant();
 	}
 }
 
-void SpaceBullet::set_param(PhysicsServer::SpaceParameter p_param, real_t p_value) {
+void SpaceBullet::set_param(PhysicsServer3D::SpaceParameter p_param, real_t p_value) {
 	switch (p_param) {
-		case PhysicsServer::SPACE_PARAM_CONTACT_RECYCLE_RADIUS:
-		case PhysicsServer::SPACE_PARAM_CONTACT_MAX_SEPARATION:
-		case PhysicsServer::SPACE_PARAM_BODY_MAX_ALLOWED_PENETRATION:
-		case PhysicsServer::SPACE_PARAM_BODY_LINEAR_VELOCITY_SLEEP_THRESHOLD:
-		case PhysicsServer::SPACE_PARAM_BODY_ANGULAR_VELOCITY_SLEEP_THRESHOLD:
-		case PhysicsServer::SPACE_PARAM_BODY_TIME_TO_SLEEP:
-		case PhysicsServer::SPACE_PARAM_BODY_ANGULAR_VELOCITY_DAMP_RATIO:
-		case PhysicsServer::SPACE_PARAM_CONSTRAINT_DEFAULT_BIAS:
+		case PhysicsServer3D::SPACE_PARAM_CONTACT_RECYCLE_RADIUS:
+		case PhysicsServer3D::SPACE_PARAM_CONTACT_MAX_SEPARATION:
+		case PhysicsServer3D::SPACE_PARAM_BODY_MAX_ALLOWED_PENETRATION:
+		case PhysicsServer3D::SPACE_PARAM_BODY_LINEAR_VELOCITY_SLEEP_THRESHOLD:
+		case PhysicsServer3D::SPACE_PARAM_BODY_ANGULAR_VELOCITY_SLEEP_THRESHOLD:
+		case PhysicsServer3D::SPACE_PARAM_BODY_TIME_TO_SLEEP:
+		case PhysicsServer3D::SPACE_PARAM_BODY_ANGULAR_VELOCITY_DAMP_RATIO:
+		case PhysicsServer3D::SPACE_PARAM_CONSTRAINT_DEFAULT_BIAS:
 		default:
-			WARN_PRINTS("This set parameter (" + itos(p_param) + ") is ignored, the SpaceBullet doesn't support it.");
+			WARN_PRINT("This set parameter (" + itos(p_param) + ") is ignored, the SpaceBullet doesn't support it.");
 			break;
 	}
 }
 
-real_t SpaceBullet::get_param(PhysicsServer::SpaceParameter p_param) {
+real_t SpaceBullet::get_param(PhysicsServer3D::SpaceParameter p_param) {
 	switch (p_param) {
-		case PhysicsServer::SPACE_PARAM_CONTACT_RECYCLE_RADIUS:
-		case PhysicsServer::SPACE_PARAM_CONTACT_MAX_SEPARATION:
-		case PhysicsServer::SPACE_PARAM_BODY_MAX_ALLOWED_PENETRATION:
-		case PhysicsServer::SPACE_PARAM_BODY_LINEAR_VELOCITY_SLEEP_THRESHOLD:
-		case PhysicsServer::SPACE_PARAM_BODY_ANGULAR_VELOCITY_SLEEP_THRESHOLD:
-		case PhysicsServer::SPACE_PARAM_BODY_TIME_TO_SLEEP:
-		case PhysicsServer::SPACE_PARAM_BODY_ANGULAR_VELOCITY_DAMP_RATIO:
-		case PhysicsServer::SPACE_PARAM_CONSTRAINT_DEFAULT_BIAS:
+		case PhysicsServer3D::SPACE_PARAM_CONTACT_RECYCLE_RADIUS:
+		case PhysicsServer3D::SPACE_PARAM_CONTACT_MAX_SEPARATION:
+		case PhysicsServer3D::SPACE_PARAM_BODY_MAX_ALLOWED_PENETRATION:
+		case PhysicsServer3D::SPACE_PARAM_BODY_LINEAR_VELOCITY_SLEEP_THRESHOLD:
+		case PhysicsServer3D::SPACE_PARAM_BODY_ANGULAR_VELOCITY_SLEEP_THRESHOLD:
+		case PhysicsServer3D::SPACE_PARAM_BODY_TIME_TO_SLEEP:
+		case PhysicsServer3D::SPACE_PARAM_BODY_ANGULAR_VELOCITY_DAMP_RATIO:
+		case PhysicsServer3D::SPACE_PARAM_CONSTRAINT_DEFAULT_BIAS:
 		default:
-			WARN_PRINTS("The SpaceBullet  doesn't support this get parameter (" + itos(p_param) + "), 0 is returned.");
+			WARN_PRINT("The SpaceBullet  doesn't support this get parameter (" + itos(p_param) + "), 0 is returned.");
 			return 0.f;
 	}
 }
 
 void SpaceBullet::add_area(AreaBullet *p_area) {
+#ifdef TOOLS_ENABLED
+	// This never happen, and there is no way for the user to trigger it.
+	// If in future a bug is introduced into this bullet integration and this
+	// function is called twice, the crash will notify the developer that will
+	// fix it even before do the eventual PR.
+	CRASH_COND(p_area->is_in_world);
+#endif
 	areas.push_back(p_area);
 	dynamicsWorld->addCollisionObject(p_area->get_bt_ghost(), p_area->get_collision_layer(), p_area->get_collision_mask());
+	p_area->is_in_world = true;
 }
 
 void SpaceBullet::remove_area(AreaBullet *p_area) {
-	areas.erase(p_area);
-	dynamicsWorld->removeCollisionObject(p_area->get_bt_ghost());
+	if (p_area->is_in_world) {
+		areas.erase(p_area);
+		dynamicsWorld->removeCollisionObject(p_area->get_bt_ghost());
+		p_area->is_in_world = false;
+	}
 }
 
 void SpaceBullet::reload_collision_filters(AreaBullet *p_area) {
+	if (p_area->is_in_world == false) {
+		return;
+	}
 	btGhostObject *ghost_object = p_area->get_bt_ghost();
 
 	btBroadphaseProxy *ghost_proxy = ghost_object->getBroadphaseHandle();
@@ -469,24 +514,47 @@ void SpaceBullet::reload_collision_filters(AreaBullet *p_area) {
 	dynamicsWorld->refreshBroadphaseProxy(ghost_object);
 }
 
+void SpaceBullet::register_collision_object(CollisionObjectBullet *p_object) {
+	collision_objects.push_back(p_object);
+}
+
+void SpaceBullet::unregister_collision_object(CollisionObjectBullet *p_object) {
+	remove_from_any_queue(p_object);
+	collision_objects.erase(p_object);
+}
+
 void SpaceBullet::add_rigid_body(RigidBodyBullet *p_body) {
+#ifdef TOOLS_ENABLED
+	// This never happen, and there is no way for the user to trigger it.
+	// If in future a bug is introduced into this bullet integration and this
+	// function is called twice, the crash will notify the developer that will
+	// fix it even before do the eventual PR.
+	CRASH_COND(p_body->is_in_world);
+#endif
 	if (p_body->is_static()) {
 		dynamicsWorld->addCollisionObject(p_body->get_bt_rigid_body(), p_body->get_collision_layer(), p_body->get_collision_mask());
 	} else {
 		dynamicsWorld->addRigidBody(p_body->get_bt_rigid_body(), p_body->get_collision_layer(), p_body->get_collision_mask());
 		p_body->scratch_space_override_modificator();
 	}
+	p_body->is_in_world = true;
 }
 
 void SpaceBullet::remove_rigid_body(RigidBodyBullet *p_body) {
-	if (p_body->is_static()) {
-		dynamicsWorld->removeCollisionObject(p_body->get_bt_rigid_body());
-	} else {
-		dynamicsWorld->removeRigidBody(p_body->get_bt_rigid_body());
+	if (p_body->is_in_world) {
+		if (p_body->is_static()) {
+			dynamicsWorld->removeCollisionObject(p_body->get_bt_rigid_body());
+		} else {
+			dynamicsWorld->removeRigidBody(p_body->get_bt_rigid_body());
+		}
+		p_body->is_in_world = false;
 	}
 }
 
 void SpaceBullet::reload_collision_filters(RigidBodyBullet *p_body) {
+	if (p_body->is_in_world == false) {
+		return;
+	}
 	btRigidBody *rigid_body = p_body->get_bt_rigid_body();
 
 	btBroadphaseProxy *body_proxy = rigid_body->getBroadphaseProxy();
@@ -511,7 +579,7 @@ void SpaceBullet::remove_soft_body(SoftBodyBullet *p_body) {
 	if (is_using_soft_world()) {
 		if (p_body->get_bt_soft_body()) {
 			static_cast<btSoftRigidDynamicsWorld *>(dynamicsWorld)->removeSoftBody(p_body->get_bt_soft_body());
-			p_body->get_bt_soft_body()->m_worldInfo = NULL;
+			p_body->get_bt_soft_body()->m_worldInfo = nullptr;
 		}
 	}
 }
@@ -539,16 +607,11 @@ void SpaceBullet::remove_all_collision_objects() {
 	for (int i = dynamicsWorld->getNumCollisionObjects() - 1; 0 <= i; --i) {
 		btCollisionObject *btObj = dynamicsWorld->getCollisionObjectArray()[i];
 		CollisionObjectBullet *colObj = static_cast<CollisionObjectBullet *>(btObj->getUserPointer());
-		colObj->set_space(NULL);
+		colObj->set_space(nullptr);
 	}
 }
 
-void onBulletPreTickCallback(btDynamicsWorld *p_dynamicsWorld, btScalar timeStep) {
-	static_cast<SpaceBullet *>(p_dynamicsWorld->getWorldUserInfo())->flush_queries();
-}
-
 void onBulletTickCallback(btDynamicsWorld *p_dynamicsWorld, btScalar timeStep) {
-
 	const btCollisionObjectArray &colObjArray = p_dynamicsWorld->getCollisionObjectArray();
 
 	// Notify all Collision objects the collision checker is started
@@ -570,17 +633,14 @@ BulletPhysicsDirectSpaceState *SpaceBullet::get_direct_state() {
 }
 
 btScalar calculateGodotCombinedRestitution(const btCollisionObject *body0, const btCollisionObject *body1) {
-
 	return CLAMP(body0->getRestitution() + body1->getRestitution(), 0, 1);
 }
 
 btScalar calculateGodotCombinedFriction(const btCollisionObject *body0, const btCollisionObject *body1) {
-
 	return ABS(MIN(body0->getFriction(), body1->getFriction()));
 }
 
 void SpaceBullet::create_empty_world(bool p_create_soft_world) {
-
 	gjk_epa_pen_solver = bulletnew(btGjkEpaPenetrationDepthSolver);
 	gjk_simplex_solver = bulletnew(btVoronoiSimplexSolver);
 
@@ -618,7 +678,6 @@ void SpaceBullet::create_empty_world(bool p_create_soft_world) {
 
 	dynamicsWorld->setWorldUserInfo(this);
 
-	dynamicsWorld->setInternalTickCallback(onBulletPreTickCallback, this, true);
 	dynamicsWorld->setInternalTickCallback(onBulletTickCallback, this, false);
 	dynamicsWorld->getBroadphase()->getOverlappingPairCache()->setInternalGhostPairCallback(ghostPairCallback); // Setup ghost check
 	dynamicsWorld->getPairCache()->setOverlapFilterCallback(godotFilterCallback);
@@ -633,11 +692,10 @@ void SpaceBullet::create_empty_world(bool p_create_soft_world) {
 }
 
 void SpaceBullet::destroy_world() {
-
 	/// The world elements (like: Collision Objects, Constraints, Shapes) are managed by godot
 
-	dynamicsWorld->getBroadphase()->getOverlappingPairCache()->setInternalGhostPairCallback(NULL);
-	dynamicsWorld->getPairCache()->setOverlapFilterCallback(NULL);
+	dynamicsWorld->getBroadphase()->getOverlappingPairCache()->setInternalGhostPairCallback(nullptr);
+	dynamicsWorld->getPairCache()->setOverlapFilterCallback(nullptr);
 
 	bulletdelete(ghostPairCallback);
 	bulletdelete(godotFilterCallback);
@@ -645,7 +703,7 @@ void SpaceBullet::destroy_world() {
 	// Deallocate world
 	dynamicsWorld->~btDiscreteDynamicsWorld();
 	free(dynamicsWorld);
-	dynamicsWorld = NULL;
+	dynamicsWorld = nullptr;
 
 	bulletdelete(solver);
 	bulletdelete(broadphase);
@@ -657,7 +715,6 @@ void SpaceBullet::destroy_world() {
 }
 
 void SpaceBullet::check_ghost_overlaps() {
-
 	/// Algorithm support variables
 	btCollisionShape *other_body_shape;
 	btConvexShape *area_shape;
@@ -671,12 +728,13 @@ void SpaceBullet::check_ghost_overlaps() {
 
 		btVector3 area_scale(area->get_bt_body_scale());
 
-		if (!area->is_monitoring())
+		if (!area->is_monitoring()) {
 			continue;
+		}
 
 		/// 1. Reset all states
 		for (i = area->overlappingObjects.size() - 1; 0 <= i; --i) {
-			AreaBullet::OverlappingObjectData &otherObj = area->overlappingObjects.write[i];
+			AreaBullet::OverlappingObjectData &otherObj = area->overlappingObjects[i];
 			// This check prevent the overwrite of ENTER state
 			// if this function is called more times before dispatchCallbacks
 			if (otherObj.state != AreaBullet::OVERLAP_STATE_ENTER) {
@@ -690,7 +748,6 @@ void SpaceBullet::check_ghost_overlaps() {
 
 		// For each overlapping
 		for (i = ghostOverlaps.size() - 1; 0 <= i; --i) {
-
 			bool hasOverlap = false;
 			btCollisionObject *overlapped_bt_co = ghostOverlaps[i];
 			RigidCollisionObjectBullet *otherObject = static_cast<RigidCollisionObjectBullet *>(overlapped_bt_co->getUserPointer());
@@ -702,15 +759,18 @@ void SpaceBullet::check_ghost_overlaps() {
 			}
 
 			if (overlapped_bt_co->getUserIndex() == CollisionObjectBullet::TYPE_AREA) {
-				if (!static_cast<AreaBullet *>(overlapped_bt_co->getUserPointer())->is_monitorable())
+				if (!static_cast<AreaBullet *>(overlapped_bt_co->getUserPointer())->is_monitorable()) {
 					continue;
-			} else if (overlapped_bt_co->getUserIndex() != CollisionObjectBullet::TYPE_RIGID_BODY)
+				}
+			} else if (overlapped_bt_co->getUserIndex() != CollisionObjectBullet::TYPE_RIGID_BODY) {
 				continue;
+			}
 
 			// For each area shape
 			for (y = area->get_shape_count() - 1; 0 <= y; --y) {
-				if (!area->get_bt_shape(y)->isConvex())
+				if (!area->get_bt_shape(y)->isConvex()) {
 					continue;
+				}
 
 				btTransform area_shape_treansform(area->get_bt_shape_transform(y));
 				area_shape_treansform.getOrigin() *= area_scale;
@@ -723,12 +783,8 @@ void SpaceBullet::check_ghost_overlaps() {
 
 				// For each other object shape
 				for (z = otherObject->get_shape_count() - 1; 0 <= z; --z) {
-
 					other_body_shape = static_cast<btCollisionShape *>(otherObject->get_bt_shape(z));
 
-					if (other_body_shape->isConcave())
-						continue;
-
 					btTransform other_shape_transform(otherObject->get_bt_shape_transform(z));
 					other_shape_transform.getOrigin() *= other_body_scale;
 
@@ -737,14 +793,13 @@ void SpaceBullet::check_ghost_overlaps() {
 							other_shape_transform;
 
 					if (other_body_shape->isConvex()) {
-
 						btPointCollector result;
 						btGjkPairDetector gjk_pair_detector(
 								area_shape,
 								static_cast<btConvexShape *>(other_body_shape),
 								gjk_simplex_solver,
 								gjk_epa_pen_solver);
-						gjk_pair_detector.getClosestPoints(gjk_input, result, 0);
+						gjk_pair_detector.getClosestPoints(gjk_input, result, nullptr);
 
 						if (0 >= result.m_distance) {
 							hasOverlap = true;
@@ -752,14 +807,14 @@ void SpaceBullet::check_ghost_overlaps() {
 						}
 
 					} else {
+						btCollisionObjectWrapper obA(nullptr, area_shape, area->get_bt_ghost(), gjk_input.m_transformA, -1, y);
+						btCollisionObjectWrapper obB(nullptr, other_body_shape, otherObject->get_bt_collision_object(), gjk_input.m_transformB, -1, z);
 
-						btCollisionObjectWrapper obA(NULL, area_shape, area->get_bt_ghost(), gjk_input.m_transformA, -1, y);
-						btCollisionObjectWrapper obB(NULL, other_body_shape, otherObject->get_bt_collision_object(), gjk_input.m_transformB, -1, z);
-
-						btCollisionAlgorithm *algorithm = dispatcher->findAlgorithm(&obA, &obB, NULL, BT_CONTACT_POINT_ALGORITHMS);
+						btCollisionAlgorithm *algorithm = dispatcher->findAlgorithm(&obA, &obB, nullptr, BT_CONTACT_POINT_ALGORITHMS);
 
-						if (!algorithm)
+						if (!algorithm) {
 							continue;
+						}
 
 						GodotDeepPenetrationContactResultCallback contactPointResult(&obA, &obB);
 						algorithm->processCollision(&obA, &obB, dynamicsWorld->getDispatchInfo(), &contactPointResult);
@@ -777,8 +832,9 @@ void SpaceBullet::check_ghost_overlaps() {
 			} // ~For each area shape
 
 		collision_found:
-			if (!hasOverlap)
+			if (!hasOverlap) {
 				continue;
+			}
 
 			indexOverlap = area->find_overlapping_object(otherObject);
 			if (-1 == indexOverlap) {
@@ -835,7 +891,6 @@ void SpaceBullet::check_body_collision() {
 						pt.getDistance() <= 0.0 ||
 						bodyA->was_colliding(bodyB) ||
 						bodyB->was_colliding(bodyA)) {
-
 					Vector3 collisionWorldPosition;
 					Vector3 collisionLocalPosition;
 					Vector3 normalOnB;
@@ -888,41 +943,40 @@ void SpaceBullet::update_gravity() {
 
 #include "scene/3d/immediate_geometry.h"
 
-static ImmediateGeometry *motionVec(NULL);
-static ImmediateGeometry *normalLine(NULL);
-static Ref<SpatialMaterial> red_mat;
-static Ref<SpatialMaterial> blue_mat;
+static ImmediateGeometry3D *motionVec(nullptr);
+static ImmediateGeometry3D *normalLine(nullptr);
+static Ref<StandardMaterial3D> red_mat;
+static Ref<StandardMaterial3D> blue_mat;
 #endif
 
-bool SpaceBullet::test_body_motion(RigidBodyBullet *p_body, const Transform &p_from, const Vector3 &p_motion, bool p_infinite_inertia, PhysicsServer::MotionResult *r_result, bool p_exclude_raycast_shapes) {
-
+bool SpaceBullet::test_body_motion(RigidBodyBullet *p_body, const Transform &p_from, const Vector3 &p_motion, bool p_infinite_inertia, PhysicsServer3D::MotionResult *r_result, bool p_exclude_raycast_shapes) {
 #if debug_test_motion
 	/// Yes I know this is not good, but I've used it as fast debugging hack.
 	/// I'm leaving it here just for speedup the other eventual debugs
 	if (!normalLine) {
-		motionVec = memnew(ImmediateGeometry);
-		normalLine = memnew(ImmediateGeometry);
+		motionVec = memnew(ImmediateGeometry3D);
+		normalLine = memnew(ImmediateGeometry3D);
 		SceneTree::get_singleton()->get_current_scene()->add_child(motionVec);
 		SceneTree::get_singleton()->get_current_scene()->add_child(normalLine);
 
 		motionVec->set_as_toplevel(true);
 		normalLine->set_as_toplevel(true);
 
-		red_mat = Ref<SpatialMaterial>(memnew(SpatialMaterial));
-		red_mat->set_flag(SpatialMaterial::FLAG_UNSHADED, true);
+		red_mat = Ref<StandardMaterial3D>(memnew(StandardMaterial3D));
+		red_mat->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED);
 		red_mat->set_line_width(20.0);
-		red_mat->set_feature(SpatialMaterial::FEATURE_TRANSPARENT, true);
-		red_mat->set_flag(SpatialMaterial::FLAG_ALBEDO_FROM_VERTEX_COLOR, true);
-		red_mat->set_flag(SpatialMaterial::FLAG_SRGB_VERTEX_COLOR, true);
+		red_mat->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA);
+		red_mat->set_flag(StandardMaterial3D::FLAG_ALBEDO_FROM_VERTEX_COLOR, true);
+		red_mat->set_flag(StandardMaterial3D::FLAG_SRGB_VERTEX_COLOR, true);
 		red_mat->set_albedo(Color(1, 0, 0, 1));
 		motionVec->set_material_override(red_mat);
 
-		blue_mat = Ref<SpatialMaterial>(memnew(SpatialMaterial));
-		blue_mat->set_flag(SpatialMaterial::FLAG_UNSHADED, true);
+		blue_mat = Ref<StandardMaterial3D>(memnew(StandardMaterial3D));
+		blue_mat->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED);
 		blue_mat->set_line_width(20.0);
-		blue_mat->set_feature(SpatialMaterial::FEATURE_TRANSPARENT, true);
-		blue_mat->set_flag(SpatialMaterial::FLAG_ALBEDO_FROM_VERTEX_COLOR, true);
-		blue_mat->set_flag(SpatialMaterial::FLAG_SRGB_VERTEX_COLOR, true);
+		blue_mat->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA);
+		blue_mat->set_flag(StandardMaterial3D::FLAG_ALBEDO_FROM_VERTEX_COLOR, true);
+		blue_mat->set_flag(StandardMaterial3D::FLAG_SRGB_VERTEX_COLOR, true);
 		blue_mat->set_albedo(Color(0, 0, 1, 1));
 		normalLine->set_material_override(blue_mat);
 	}
@@ -954,13 +1008,13 @@ bool SpaceBullet::test_body_motion(RigidBodyBullet *p_body, const Transform &p_f
 		Vector3 sup_line;
 		B_TO_G(body_safe_position.getOrigin(), sup_line);
 		motionVec->clear();
-		motionVec->begin(Mesh::PRIMITIVE_LINES, NULL);
+		motionVec->begin(Mesh::PRIMITIVE_LINES, nullptr);
 		motionVec->add_vertex(sup_line);
 		motionVec->add_vertex(sup_line + p_motion * 10);
 		motionVec->end();
 #endif
 
-		for (int shIndex = 0; shIndex < shape_count && !motion.fuzzyZero(); ++shIndex) {
+		for (int shIndex = 0; shIndex < shape_count; ++shIndex) {
 			if (p_body->is_shape_disabled(shIndex)) {
 				continue;
 			}
@@ -982,6 +1036,11 @@ bool SpaceBullet::test_body_motion(RigidBodyBullet *p_body, const Transform &p_f
 			btTransform shape_world_to(shape_world_from);
 			shape_world_to.getOrigin() += motion;
 
+			if ((shape_world_to.getOrigin() - shape_world_from.getOrigin()).fuzzyZero()) {
+				motion = btVector3(0, 0, 0);
+				break;
+			}
+
 			GodotKinClosestConvexResultCallback btResult(shape_world_from.getOrigin(), shape_world_to.getOrigin(), p_body, p_infinite_inertia);
 			btResult.m_collisionFilterGroup = p_body->get_collision_layer();
 			btResult.m_collisionFilterMask = p_body->get_collision_mask();
@@ -1012,7 +1071,6 @@ bool SpaceBullet::test_body_motion(RigidBodyBullet *p_body, const Transform &p_f
 			B_TO_G(motion + initial_recover_motion + __rec, r_result->motion);
 
 			if (has_penetration) {
-
 				const btRigidBody *btRigid = static_cast<const btRigidBody *>(r_recover_result.other_collision_object);
 				CollisionObjectBullet *collisionObject = static_cast<CollisionObjectBullet *>(btRigid->getUserPointer());
 
@@ -1031,7 +1089,7 @@ bool SpaceBullet::test_body_motion(RigidBodyBullet *p_body, const Transform &p_f
 				Vector3 sup_line2;
 				B_TO_G(motion, sup_line2);
 				normalLine->clear();
-				normalLine->begin(Mesh::PRIMITIVE_LINES, NULL);
+				normalLine->begin(Mesh::PRIMITIVE_LINES, nullptr);
 				normalLine->add_vertex(r_result->collision_point);
 				normalLine->add_vertex(r_result->collision_point + r_result->collision_normal * 10);
 				normalLine->end();
@@ -1045,8 +1103,7 @@ bool SpaceBullet::test_body_motion(RigidBodyBullet *p_body, const Transform &p_f
 	return has_penetration;
 }
 
-int SpaceBullet::test_ray_separation(RigidBodyBullet *p_body, const Transform &p_transform, bool p_infinite_inertia, Vector3 &r_recover_motion, PhysicsServer::SeparationResult *r_results, int p_result_max, float p_margin) {
-
+int SpaceBullet::test_ray_separation(RigidBodyBullet *p_body, const Transform &p_transform, bool p_infinite_inertia, Vector3 &r_recover_motion, PhysicsServer3D::SeparationResult *r_results, int p_result_max, float p_margin) {
 	btTransform body_transform;
 	G_TO_B(p_transform, body_transform);
 	UNSCALE_BT_BASIS(body_transform);
@@ -1057,7 +1114,7 @@ int SpaceBullet::test_ray_separation(RigidBodyBullet *p_body, const Transform &p
 	int rays_found_this_round = 0;
 
 	for (int t(RECOVERING_MOVEMENT_CYCLES); 0 < t; --t) {
-		PhysicsServer::SeparationResult *next_results = &r_results[rays_found];
+		PhysicsServer3D::SeparationResult *next_results = &r_results[rays_found];
 		rays_found_this_round = recover_from_penetration_ray(p_body, body_transform, RECOVERING_MOVEMENT_SCALE, p_infinite_inertia, p_result_max - rays_found, recover_motion, next_results);
 
 		rays_found += rays_found_this_round;
@@ -1111,14 +1168,12 @@ public:
 			self_collision_object(p_self_collision_object),
 			collision_layer(p_collision_layer),
 			collision_mask(p_collision_mask) {
-
 		bounds = btDbvtVolume::FromMM(p_aabb_min, p_aabb_max);
 	}
 
 	virtual ~RecoverPenetrationBroadPhaseCallback() {}
 
 	virtual bool process(const btBroadphaseProxy *proxy) {
-
 		btCollisionObject *co = static_cast<btCollisionObject *>(proxy->m_clientObject);
 		if (co->getInternalType() <= btCollisionObject::CO_RIGID_BODY) {
 			if (self_collision_object != proxy->m_clientObject && GodotFilterCallback::test_collision_filters(collision_layer, collision_mask, proxy->m_collisionFilterGroup, proxy->m_collisionFilterMask)) {
@@ -1127,7 +1182,7 @@ public:
 
 					if (cs->getNumChildShapes() > 1) {
 						const btDbvt *tree = cs->getDynamicAabbTree();
-						ERR_FAIL_COND_V(tree == NULL, true);
+						ERR_FAIL_COND_V(tree == nullptr, true);
 
 						// Transform bounds into compound shape local space
 						const btTransform other_in_compound_space = co->getWorldTransform().inverse();
@@ -1162,13 +1217,11 @@ public:
 };
 
 bool SpaceBullet::recover_from_penetration(RigidBodyBullet *p_body, const btTransform &p_body_position, btScalar p_recover_movement_scale, bool p_infinite_inertia, btVector3 &r_delta_recover_movement, RecoverResult *r_recover_result) {
-
 	// Calculate the cumulative AABB of all shapes of the kinematic body
 	btVector3 aabb_min, aabb_max;
 	bool shapes_found = false;
 
 	for (int kinIndex = p_body->get_kinematic_utilities()->shapes.size() - 1; 0 <= kinIndex; --kinIndex) {
-
 		const RigidBodyBullet::KinematicShape &kin_shape(p_body->get_kinematic_utilities()->shapes[kinIndex]);
 		if (!kin_shape.is_active()) {
 			continue;
@@ -1213,7 +1266,6 @@ bool SpaceBullet::recover_from_penetration(RigidBodyBullet *p_body, const btTran
 
 	// Perform narrowphase per shape
 	for (int kinIndex = p_body->get_kinematic_utilities()->shapes.size() - 1; 0 <= kinIndex; --kinIndex) {
-
 		const RigidBodyBullet::KinematicShape &kin_shape(p_body->get_kinematic_utilities()->shapes[kinIndex]);
 		if (!kin_shape.is_active()) {
 			continue;
@@ -1232,8 +1284,9 @@ bool SpaceBullet::recover_from_penetration(RigidBodyBullet *p_body, const btTran
 			if (p_infinite_inertia && !otherObject->isStaticOrKinematicObject()) {
 				otherObject->activate(); // Force activation of hitten rigid, soft body
 				continue;
-			} else if (!p_body->get_bt_collision_object()->checkCollideWith(otherObject) || !otherObject->checkCollideWith(p_body->get_bt_collision_object()))
+			} else if (!p_body->get_bt_collision_object()->checkCollideWith(otherObject) || !otherObject->checkCollideWith(p_body->get_bt_collision_object())) {
 				continue;
+			}
 
 			if (otherObject->getCollisionShape()->isCompound()) {
 				const btCompoundShape *cs = static_cast<const btCompoundShape *>(otherObject->getCollisionShape());
@@ -1242,23 +1295,19 @@ bool SpaceBullet::recover_from_penetration(RigidBodyBullet *p_body, const btTran
 
 				if (cs->getChildShape(shape_idx)->isConvex()) {
 					if (RFP_convex_convex_test(kin_shape.shape, static_cast<const btConvexShape *>(cs->getChildShape(shape_idx)), otherObject, kinIndex, shape_idx, shape_transform, otherObject->getWorldTransform() * cs->getChildTransform(shape_idx), p_recover_movement_scale, r_delta_recover_movement, r_recover_result)) {
-
 						penetration = true;
 					}
 				} else {
 					if (RFP_convex_world_test(kin_shape.shape, cs->getChildShape(shape_idx), p_body->get_bt_collision_object(), otherObject, kinIndex, shape_idx, shape_transform, otherObject->getWorldTransform() * cs->getChildTransform(shape_idx), p_recover_movement_scale, r_delta_recover_movement, r_recover_result)) {
-
 						penetration = true;
 					}
 				}
 			} else if (otherObject->getCollisionShape()->isConvex()) { /// Execute GJK test against object shape
 				if (RFP_convex_convex_test(kin_shape.shape, static_cast<const btConvexShape *>(otherObject->getCollisionShape()), otherObject, kinIndex, 0, shape_transform, otherObject->getWorldTransform(), p_recover_movement_scale, r_delta_recover_movement, r_recover_result)) {
-
 					penetration = true;
 				}
 			} else {
 				if (RFP_convex_world_test(kin_shape.shape, otherObject->getCollisionShape(), p_body->get_bt_collision_object(), otherObject, kinIndex, 0, shape_transform, otherObject->getWorldTransform(), p_recover_movement_scale, r_delta_recover_movement, r_recover_result)) {
-
 					penetration = true;
 				}
 			}
@@ -1269,7 +1318,6 @@ bool SpaceBullet::recover_from_penetration(RigidBodyBullet *p_body, const btTran
 }
 
 bool SpaceBullet::RFP_convex_convex_test(const btConvexShape *p_shapeA, const btConvexShape *p_shapeB, btCollisionObject *p_objectB, int p_shapeId_A, int p_shapeId_B, const btTransform &p_transformA, const btTransform &p_transformB, btScalar p_recover_movement_scale, btVector3 &r_delta_recover_movement, RecoverResult *r_recover_result) {
-
 	// Initialize GJK input
 	btGjkPairDetector::ClosestPointInput gjk_input;
 	gjk_input.m_transformA = p_transformA;
@@ -1278,7 +1326,7 @@ bool SpaceBullet::RFP_convex_convex_test(const btConvexShape *p_shapeA, const bt
 	// Perform GJK test
 	btPointCollector result;
 	btGjkPairDetector gjk_pair_detector(p_shapeA, p_shapeB, gjk_simplex_solver, gjk_epa_pen_solver);
-	gjk_pair_detector.getClosestPoints(gjk_input, result, 0);
+	gjk_pair_detector.getClosestPoints(gjk_input, result, nullptr);
 	if (0 > result.m_distance) {
 		// Has penetration
 		r_delta_recover_movement += result.m_normalOnBInWorld * (result.m_distance * -1 * p_recover_movement_scale);
@@ -1300,15 +1348,14 @@ bool SpaceBullet::RFP_convex_convex_test(const btConvexShape *p_shapeA, const bt
 }
 
 bool SpaceBullet::RFP_convex_world_test(const btConvexShape *p_shapeA, const btCollisionShape *p_shapeB, btCollisionObject *p_objectA, btCollisionObject *p_objectB, int p_shapeId_A, int p_shapeId_B, const btTransform &p_transformA, const btTransform &p_transformB, btScalar p_recover_movement_scale, btVector3 &r_delta_recover_movement, RecoverResult *r_recover_result) {
-
 	/// Contact test
 
 	btTransform tA(p_transformA);
 
-	btCollisionObjectWrapper obA(NULL, p_shapeA, p_objectA, tA, -1, p_shapeId_A);
-	btCollisionObjectWrapper obB(NULL, p_shapeB, p_objectB, p_transformB, -1, p_shapeId_B);
+	btCollisionObjectWrapper obA(nullptr, p_shapeA, p_objectA, tA, -1, p_shapeId_A);
+	btCollisionObjectWrapper obB(nullptr, p_shapeB, p_objectB, p_transformB, -1, p_shapeId_B);
 
-	btCollisionAlgorithm *algorithm = dispatcher->findAlgorithm(&obA, &obB, NULL, BT_CONTACT_POINT_ALGORITHMS);
+	btCollisionAlgorithm *algorithm = dispatcher->findAlgorithm(&obA, &obB, nullptr, BT_CONTACT_POINT_ALGORITHMS);
 	if (algorithm) {
 		GodotDeepPenetrationContactResultCallback contactPointResult(&obA, &obB);
 		//discrete collision detection query
@@ -1336,8 +1383,7 @@ bool SpaceBullet::RFP_convex_world_test(const btConvexShape *p_shapeA, const btC
 	return false;
 }
 
-int SpaceBullet::add_separation_result(PhysicsServer::SeparationResult *r_result, const SpaceBullet::RecoverResult &p_recover_result, int p_shape_id, const btCollisionObject *p_other_object) const {
-
+int SpaceBullet::add_separation_result(PhysicsServer3D::SeparationResult *r_result, const SpaceBullet::RecoverResult &p_recover_result, int p_shape_id, const btCollisionObject *p_other_object) const {
 	// optimize results (ignore non-colliding)
 	if (p_recover_result.penetration_distance < 0.0) {
 		const btRigidBody *btRigid = static_cast<const btRigidBody *>(p_other_object);
@@ -1358,14 +1404,12 @@ int SpaceBullet::add_separation_result(PhysicsServer::SeparationResult *r_result
 	}
 }
 
-int SpaceBullet::recover_from_penetration_ray(RigidBodyBullet *p_body, const btTransform &p_body_position, btScalar p_recover_movement_scale, bool p_infinite_inertia, int p_result_max, btVector3 &r_delta_recover_movement, PhysicsServer::SeparationResult *r_results) {
-
+int SpaceBullet::recover_from_penetration_ray(RigidBodyBullet *p_body, const btTransform &p_body_position, btScalar p_recover_movement_scale, bool p_infinite_inertia, int p_result_max, btVector3 &r_delta_recover_movement, PhysicsServer3D::SeparationResult *r_results) {
 	// Calculate the cumulative AABB of all shapes of the kinematic body
 	btVector3 aabb_min, aabb_max;
 	bool shapes_found = false;
 
 	for (int kinIndex = p_body->get_kinematic_utilities()->shapes.size() - 1; 0 <= kinIndex; --kinIndex) {
-
 		const RigidBodyBullet::KinematicShape &kin_shape(p_body->get_kinematic_utilities()->shapes[kinIndex]);
 		if (!kin_shape.is_active()) {
 			continue;
@@ -1409,7 +1453,6 @@ int SpaceBullet::recover_from_penetration_ray(RigidBodyBullet *p_body, const btT
 
 	// Perform narrowphase per shape
 	for (int kinIndex = p_body->get_kinematic_utilities()->shapes.size() - 1; 0 <= kinIndex; --kinIndex) {
-
 		if (ray_count >= p_result_max) {
 			break;
 		}
@@ -1431,8 +1474,9 @@ int SpaceBullet::recover_from_penetration_ray(RigidBodyBullet *p_body, const btT
 			if (p_infinite_inertia && !otherObject->isStaticOrKinematicObject()) {
 				otherObject->activate(); // Force activation of hitten rigid, soft body
 				continue;
-			} else if (!p_body->get_bt_collision_object()->checkCollideWith(otherObject) || !otherObject->checkCollideWith(p_body->get_bt_collision_object()))
+			} else if (!p_body->get_bt_collision_object()->checkCollideWith(otherObject) || !otherObject->checkCollideWith(p_body->get_bt_collision_object())) {
 				continue;
+			}
 
 			if (otherObject->getCollisionShape()->isCompound()) {
 				const btCompoundShape *cs = static_cast<const btCompoundShape *>(otherObject->getCollisionShape());
@@ -1441,14 +1485,11 @@ int SpaceBullet::recover_from_penetration_ray(RigidBodyBullet *p_body, const btT
 
 				RecoverResult recover_result;
 				if (RFP_convex_world_test(kin_shape.shape, cs->getChildShape(shape_idx), p_body->get_bt_collision_object(), otherObject, kinIndex, shape_idx, shape_transform, otherObject->getWorldTransform() * cs->getChildTransform(shape_idx), p_recover_movement_scale, r_delta_recover_movement, &recover_result)) {
-
 					ray_count = add_separation_result(&r_results[ray_count], recover_result, kinIndex, otherObject);
 				}
 			} else {
-
 				RecoverResult recover_result;
 				if (RFP_convex_world_test(kin_shape.shape, otherObject->getCollisionShape(), p_body->get_bt_collision_object(), otherObject, kinIndex, 0, shape_transform, otherObject->getWorldTransform(), p_recover_movement_scale, r_delta_recover_movement, &recover_result)) {
-
 					ray_count = add_separation_result(&r_results[ray_count], recover_result, kinIndex, otherObject);
 				}
 			}
diff --git a/modules/bullet/space_bullet.h b/modules/bullet/space_bullet.h
index 32372f1630..897f902fe1 100644
--- a/modules/bullet/space_bullet.h
+++ b/modules/bullet/space_bullet.h
@@ -31,11 +31,11 @@
 #ifndef SPACE_BULLET_H
 #define SPACE_BULLET_H
 
+#include "core/local_vector.h"
 #include "core/variant.h"
-#include "core/vector.h"
 #include "godot_result_callbacks.h"
 #include "rid_bullet.h"
-#include "servers/physics_server.h"
+#include "servers/physics_server_3d.h"
 
 #include <BulletCollision/BroadphaseCollision/btBroadphaseProxy.h>
 #include <BulletCollision/BroadphaseCollision/btOverlappingPairCache.h>
@@ -67,8 +67,8 @@ class btGjkEpaPenetrationDepthSolver;
 
 extern ContactAddedCallback gContactAddedCallback;
 
-class BulletPhysicsDirectSpaceState : public PhysicsDirectSpaceState {
-	GDCLASS(BulletPhysicsDirectSpaceState, PhysicsDirectSpaceState);
+class BulletPhysicsDirectSpaceState : public PhysicsDirectSpaceState3D {
+	GDCLASS(BulletPhysicsDirectSpaceState, PhysicsDirectSpaceState3D);
 
 private:
 	SpaceBullet *space;
@@ -76,75 +76,90 @@ private:
 public:
 	BulletPhysicsDirectSpaceState(SpaceBullet *p_space);
 
-	virtual int intersect_point(const Vector3 &p_point, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, bool p_collide_with_bodies = true, bool p_collide_with_areas = false);
-	virtual bool intersect_ray(const Vector3 &p_from, const Vector3 &p_to, RayResult &r_result, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, bool p_collide_with_bodies = true, bool p_collide_with_areas = false, bool p_pick_ray = false);
-	virtual int intersect_shape(const RID &p_shape, const Transform &p_xform, float p_margin, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, bool p_collide_with_bodies = true, bool p_collide_with_areas = false);
-	virtual bool cast_motion(const RID &p_shape, const Transform &p_xform, const Vector3 &p_motion, float p_margin, float &r_closest_safe, float &r_closest_unsafe, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, bool p_collide_with_bodies = true, bool p_collide_with_areas = false, ShapeRestInfo *r_info = NULL);
+	virtual int intersect_point(const Vector3 &p_point, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, bool p_collide_with_bodies = true, bool p_collide_with_areas = false) override;
+	virtual bool intersect_ray(const Vector3 &p_from, const Vector3 &p_to, RayResult &r_result, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, bool p_collide_with_bodies = true, bool p_collide_with_areas = false, bool p_pick_ray = false) override;
+	virtual int intersect_shape(const RID &p_shape, const Transform &p_xform, float p_margin, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, bool p_collide_with_bodies = true, bool p_collide_with_areas = false) override;
+	virtual bool cast_motion(const RID &p_shape, const Transform &p_xform, const Vector3 &p_motion, float p_margin, float &r_closest_safe, float &r_closest_unsafe, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, bool p_collide_with_bodies = true, bool p_collide_with_areas = false, ShapeRestInfo *r_info = nullptr) override;
 	/// Returns the list of contacts pairs in this order: Local contact, other body contact
-	virtual bool collide_shape(RID p_shape, const Transform &p_shape_xform, float p_margin, Vector3 *r_results, int p_result_max, int &r_result_count, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, bool p_collide_with_bodies = true, bool p_collide_with_areas = false);
-	virtual bool rest_info(RID p_shape, const Transform &p_shape_xform, float p_margin, ShapeRestInfo *r_info, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, bool p_collide_with_bodies = true, bool p_collide_with_areas = false);
-	virtual Vector3 get_closest_point_to_object_volume(RID p_object, const Vector3 p_point) const;
+	virtual bool collide_shape(RID p_shape, const Transform &p_shape_xform, float p_margin, Vector3 *r_results, int p_result_max, int &r_result_count, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, bool p_collide_with_bodies = true, bool p_collide_with_areas = false) override;
+	virtual bool rest_info(RID p_shape, const Transform &p_shape_xform, float p_margin, ShapeRestInfo *r_info, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, bool p_collide_with_bodies = true, bool p_collide_with_areas = false) override;
+	virtual Vector3 get_closest_point_to_object_volume(RID p_object, const Vector3 p_point) const override;
 };
 
 class SpaceBullet : public RIDBullet {
-
 	friend class AreaBullet;
 	friend void onBulletTickCallback(btDynamicsWorld *world, btScalar timeStep);
 	friend class BulletPhysicsDirectSpaceState;
 
-	btBroadphaseInterface *broadphase;
-	btDefaultCollisionConfiguration *collisionConfiguration;
-	btCollisionDispatcher *dispatcher;
-	btConstraintSolver *solver;
-	btDiscreteDynamicsWorld *dynamicsWorld;
-	btSoftBodyWorldInfo *soft_body_world_info;
-	btGhostPairCallback *ghostPairCallback;
-	GodotFilterCallback *godotFilterCallback;
+	btBroadphaseInterface *broadphase = nullptr;
+	btDefaultCollisionConfiguration *collisionConfiguration = nullptr;
+	btCollisionDispatcher *dispatcher = nullptr;
+	btConstraintSolver *solver = nullptr;
+	btDiscreteDynamicsWorld *dynamicsWorld = nullptr;
+	btSoftBodyWorldInfo *soft_body_world_info = nullptr;
+	btGhostPairCallback *ghostPairCallback = nullptr;
+	GodotFilterCallback *godotFilterCallback = nullptr;
 
 	btGjkEpaPenetrationDepthSolver *gjk_epa_pen_solver;
 	btVoronoiSimplexSolver *gjk_simplex_solver;
 
 	BulletPhysicsDirectSpaceState *direct_access;
-	Vector3 gravityDirection;
-	real_t gravityMagnitude;
+	Vector3 gravityDirection = Vector3(0, -1, 0);
+	real_t gravityMagnitude = 10;
+
+	real_t linear_damp = 0.0;
+	real_t angular_damp = 0.0;
 
-	Vector<AreaBullet *> areas;
+	LocalVector<CollisionObjectBullet *> queue_pre_flush;
+	LocalVector<CollisionObjectBullet *> queue_flush;
+	LocalVector<CollisionObjectBullet *> collision_objects;
+	LocalVector<AreaBullet *> areas;
 
-	Vector<Vector3> contactDebug;
-	int contactDebugCount;
-	real_t delta_time;
+	LocalVector<Vector3> contactDebug;
+	uint32_t contactDebugCount = 0;
+	real_t delta_time = 0.;
 
 public:
 	SpaceBullet();
 	virtual ~SpaceBullet();
 
+	void add_to_flush_queue(CollisionObjectBullet *p_co);
+	void add_to_pre_flush_queue(CollisionObjectBullet *p_co);
+	void remove_from_any_queue(CollisionObjectBullet *p_co);
+
 	void flush_queries();
 	real_t get_delta_time() { return delta_time; }
 	void step(real_t p_delta_time);
 
-	_FORCE_INLINE_ btBroadphaseInterface *get_broadphase() { return broadphase; }
-	_FORCE_INLINE_ btCollisionDispatcher *get_dispatcher() { return dispatcher; }
-	_FORCE_INLINE_ btSoftBodyWorldInfo *get_soft_body_world_info() { return soft_body_world_info; }
+	_FORCE_INLINE_ btBroadphaseInterface *get_broadphase() const { return broadphase; }
+	_FORCE_INLINE_ btDefaultCollisionConfiguration *get_collision_configuration() const { return collisionConfiguration; }
+	_FORCE_INLINE_ btCollisionDispatcher *get_dispatcher() const { return dispatcher; }
+	_FORCE_INLINE_ btConstraintSolver *get_solver() const { return solver; }
+	_FORCE_INLINE_ btDiscreteDynamicsWorld *get_dynamic_world() const { return dynamicsWorld; }
+	_FORCE_INLINE_ btSoftBodyWorldInfo *get_soft_body_world_info() const { return soft_body_world_info; }
 	_FORCE_INLINE_ bool is_using_soft_world() { return soft_body_world_info; }
 
 	/// Used to set some parameters to Bullet world
 	/// @param p_param:
 	///     AREA_PARAM_GRAVITY          to set the gravity magnitude of entire world
 	///     AREA_PARAM_GRAVITY_VECTOR   to set the gravity direction of entire world
-	void set_param(PhysicsServer::AreaParameter p_param, const Variant &p_value);
+	void set_param(PhysicsServer3D::AreaParameter p_param, const Variant &p_value);
 	/// Used to get some parameters to Bullet world
 	/// @param p_param:
 	///     AREA_PARAM_GRAVITY          to get the gravity magnitude of entire world
 	///     AREA_PARAM_GRAVITY_VECTOR   to get the gravity direction of entire world
-	Variant get_param(PhysicsServer::AreaParameter p_param);
+	Variant get_param(PhysicsServer3D::AreaParameter p_param);
 
-	void set_param(PhysicsServer::SpaceParameter p_param, real_t p_value);
-	real_t get_param(PhysicsServer::SpaceParameter p_param);
+	void set_param(PhysicsServer3D::SpaceParameter p_param, real_t p_value);
+	real_t get_param(PhysicsServer3D::SpaceParameter p_param);
 
 	void add_area(AreaBullet *p_area);
 	void remove_area(AreaBullet *p_area);
 	void reload_collision_filters(AreaBullet *p_area);
 
+	void register_collision_object(CollisionObjectBullet *p_object);
+	void unregister_collision_object(CollisionObjectBullet *p_object);
+
 	void add_rigid_body(RigidBodyBullet *p_body);
 	void remove_rigid_body(RigidBodyBullet *p_body);
 	void reload_collision_filters(RigidBodyBullet *p_body);
@@ -167,7 +182,9 @@ public:
 		contactDebugCount = 0;
 	}
 	_FORCE_INLINE_ void add_debug_contact(const Vector3 &p_contact) {
-		if (contactDebugCount < contactDebug.size()) contactDebug.write[contactDebugCount++] = p_contact;
+		if (contactDebugCount < contactDebug.size()) {
+			contactDebug[contactDebugCount++] = p_contact;
+		}
 	}
 	_FORCE_INLINE_ Vector<Vector3> get_debug_contacts() { return contactDebug; }
 	_FORCE_INLINE_ int get_debug_contact_count() { return contactDebugCount; }
@@ -177,8 +194,11 @@ public:
 
 	void update_gravity();
 
-	bool test_body_motion(RigidBodyBullet *p_body, const Transform &p_from, const Vector3 &p_motion, bool p_infinite_inertia, PhysicsServer::MotionResult *r_result, bool p_exclude_raycast_shapes);
-	int test_ray_separation(RigidBodyBullet *p_body, const Transform &p_transform, bool p_infinite_inertia, Vector3 &r_recover_motion, PhysicsServer::SeparationResult *r_results, int p_result_max, float p_margin);
+	real_t get_linear_damp() const { return linear_damp; }
+	real_t get_angular_damp() const { return angular_damp; }
+
+	bool test_body_motion(RigidBodyBullet *p_body, const Transform &p_from, const Vector3 &p_motion, bool p_infinite_inertia, PhysicsServer3D::MotionResult *r_result, bool p_exclude_raycast_shapes);
+	int test_ray_separation(RigidBodyBullet *p_body, const Transform &p_transform, bool p_infinite_inertia, Vector3 &r_recover_motion, PhysicsServer3D::SeparationResult *r_results, int p_result_max, float p_margin);
 
 private:
 	void create_empty_world(bool p_create_soft_world);
@@ -187,33 +207,26 @@ private:
 	void check_body_collision();
 
 	struct RecoverResult {
-		bool hasPenetration;
-		btVector3 normal;
-		btVector3 pointWorld;
-		btScalar penetration_distance; // Negative mean penetration
-		int other_compound_shape_index;
-		const btCollisionObject *other_collision_object;
-		int local_shape_most_recovered;
-
-		RecoverResult() :
-				hasPenetration(false),
-				normal(0, 0, 0),
-				pointWorld(0, 0, 0),
-				penetration_distance(1e20),
-				other_compound_shape_index(0),
-				other_collision_object(NULL),
-				local_shape_most_recovered(0) {}
+		bool hasPenetration = false;
+		btVector3 normal = btVector3(0, 0, 0);
+		btVector3 pointWorld = btVector3(0, 0, 0);
+		btScalar penetration_distance = 1e20; // Negative mean penetration
+		int other_compound_shape_index = 0;
+		const btCollisionObject *other_collision_object = nullptr;
+		int local_shape_most_recovered = 0;
+
+		RecoverResult() {}
 	};
 
-	bool recover_from_penetration(RigidBodyBullet *p_body, const btTransform &p_body_position, btScalar p_recover_movement_scale, bool p_infinite_inertia, btVector3 &r_delta_recover_movement, RecoverResult *r_recover_result = NULL);
+	bool recover_from_penetration(RigidBodyBullet *p_body, const btTransform &p_body_position, btScalar p_recover_movement_scale, bool p_infinite_inertia, btVector3 &r_delta_recover_movement, RecoverResult *r_recover_result = nullptr);
 	/// This is an API that recover a kinematic object from penetration
 	/// This allow only Convex Convex test and it always use GJK algorithm, With this API we don't benefit of Bullet special accelerated functions
-	bool RFP_convex_convex_test(const btConvexShape *p_shapeA, const btConvexShape *p_shapeB, btCollisionObject *p_objectB, int p_shapeId_A, int p_shapeId_B, const btTransform &p_transformA, const btTransform &p_transformB, btScalar p_recover_movement_scale, btVector3 &r_delta_recover_movement, RecoverResult *r_recover_result = NULL);
+	bool RFP_convex_convex_test(const btConvexShape *p_shapeA, const btConvexShape *p_shapeB, btCollisionObject *p_objectB, int p_shapeId_A, int p_shapeId_B, const btTransform &p_transformA, const btTransform &p_transformB, btScalar p_recover_movement_scale, btVector3 &r_delta_recover_movement, RecoverResult *r_recover_result = nullptr);
 	/// This is an API that recover a kinematic object from penetration
 	/// Using this we leave Bullet to select the best algorithm, For example GJK in case we have Convex Convex, or a Bullet accelerated algorithm
-	bool RFP_convex_world_test(const btConvexShape *p_shapeA, const btCollisionShape *p_shapeB, btCollisionObject *p_objectA, btCollisionObject *p_objectB, int p_shapeId_A, int p_shapeId_B, const btTransform &p_transformA, const btTransform &p_transformB, btScalar p_recover_movement_scale, btVector3 &r_delta_recover_movement, RecoverResult *r_recover_result = NULL);
+	bool RFP_convex_world_test(const btConvexShape *p_shapeA, const btCollisionShape *p_shapeB, btCollisionObject *p_objectA, btCollisionObject *p_objectB, int p_shapeId_A, int p_shapeId_B, const btTransform &p_transformA, const btTransform &p_transformB, btScalar p_recover_movement_scale, btVector3 &r_delta_recover_movement, RecoverResult *r_recover_result = nullptr);
 
-	int add_separation_result(PhysicsServer::SeparationResult *r_results, const SpaceBullet::RecoverResult &p_recover_result, int p_shape_id, const btCollisionObject *p_other_object) const;
-	int recover_from_penetration_ray(RigidBodyBullet *p_body, const btTransform &p_body_position, btScalar p_recover_movement_scale, bool p_infinite_inertia, int p_result_max, btVector3 &r_delta_recover_movement, PhysicsServer::SeparationResult *r_results);
+	int add_separation_result(PhysicsServer3D::SeparationResult *r_results, const SpaceBullet::RecoverResult &p_recover_result, int p_shape_id, const btCollisionObject *p_other_object) const;
+	int recover_from_penetration_ray(RigidBodyBullet *p_body, const btTransform &p_body_position, btScalar p_recover_movement_scale, bool p_infinite_inertia, int p_result_max, btVector3 &r_delta_recover_movement, PhysicsServer3D::SeparationResult *r_results);
 };
 #endif
diff --git a/modules/camera/SCsub b/modules/camera/SCsub
index 23f031f06e..631a65bde2 100644
--- a/modules/camera/SCsub
+++ b/modules/camera/SCsub
@@ -1,16 +1,19 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_camera = env_modules.Clone()
 
 if env["platform"] == "iphone":
+    # (iOS) Enable module support
+    env_camera.Append(CCFLAGS=["-fmodules", "-fcxx-modules"])
+
     # (iOS) Build as separate static library
     modules_sources = []
     env_camera.add_source_files(modules_sources, "register_types.cpp")
     env_camera.add_source_files(modules_sources, "camera_ios.mm")
-    mod_lib = env_modules.add_library('#bin/libgodot_camera_module' + env['LIBSUFFIX'], modules_sources)
+    mod_lib = env_modules.add_library("#bin/libgodot_camera_module" + env["LIBSUFFIX"], modules_sources)
 
 elif env["platform"] == "windows":
     env_camera.add_source_files(env.modules_sources, "register_types.cpp")
@@ -19,4 +22,3 @@ elif env["platform"] == "windows":
 elif env["platform"] == "osx":
     env_camera.add_source_files(env.modules_sources, "register_types.cpp")
     env_camera.add_source_files(env.modules_sources, "camera_osx.mm")
-
diff --git a/modules/camera/camera_ios.h b/modules/camera/camera_ios.h
index 89620f788b..7da43e4851 100644
--- a/modules/camera/camera_ios.h
+++ b/modules/camera/camera_ios.h
@@ -42,4 +42,4 @@ public:
 	void update_feeds();
 };
 
-#endif /* CAMERAIOS_H */
\ No newline at end of file
+#endif /* CAMERAIOS_H */
diff --git a/modules/camera/camera_ios.mm b/modules/camera/camera_ios.mm
index 8059277503..c10b13b2af 100644
--- a/modules/camera/camera_ios.mm
+++ b/modules/camera/camera_ios.mm
@@ -44,7 +44,7 @@
 	Ref<CameraFeed> feed;
 	size_t width[2];
 	size_t height[2];
-	PoolVector<uint8_t> img_data[2];
+	Vector<uint8_t> img_data[2];
 
 	AVCaptureDeviceInput *input;
 	AVCaptureVideoDataOutput *output;
@@ -158,25 +158,31 @@
 	} else if (dataCbCr == NULL) {
 		print_line("Couldn't access CbCr pixel buffer data");
 	} else {
-		UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
+		UIInterfaceOrientation orientation = UIInterfaceOrientationUnknown;
+
+		if (@available(iOS 13, *)) {
+			orientation = [UIApplication sharedApplication].delegate.window.windowScene.interfaceOrientation;
+#if !defined(TARGET_OS_SIMULATOR) || !TARGET_OS_SIMULATOR
+		} else {
+			orientation = [[UIApplication sharedApplication] statusBarOrientation];
+#endif
+		}
+
 		Ref<Image> img[2];
 
 		{
 			// do Y
-			int new_width = CVPixelBufferGetWidthOfPlane(pixelBuffer, 0);
-			int new_height = CVPixelBufferGetHeightOfPlane(pixelBuffer, 0);
-			int _bytes_per_row = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, 0);
+			size_t new_width = CVPixelBufferGetWidthOfPlane(pixelBuffer, 0);
+			size_t new_height = CVPixelBufferGetHeightOfPlane(pixelBuffer, 0);
 
 			if ((width[0] != new_width) || (height[0] != new_height)) {
-				// printf("Camera Y plane %i, %i - %i\n", new_width, new_height, bytes_per_row);
-
 				width[0] = new_width;
 				height[0] = new_height;
 				img_data[0].resize(new_width * new_height);
 			}
 
-			PoolVector<uint8_t>::Write w = img_data[0].write();
-			memcpy(w.ptr(), dataY, new_width * new_height);
+			uint8_t *w = img_data[0].ptrw();
+			memcpy(w, dataY, new_width * new_height);
 
 			img[0].instance();
 			img[0]->create(new_width, new_height, 0, Image::FORMAT_R8, img_data[0]);
@@ -184,20 +190,17 @@
 
 		{
 			// do CbCr
-			int new_width = CVPixelBufferGetWidthOfPlane(pixelBuffer, 1);
-			int new_height = CVPixelBufferGetHeightOfPlane(pixelBuffer, 1);
-			int bytes_per_row = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, 1);
+			size_t new_width = CVPixelBufferGetWidthOfPlane(pixelBuffer, 1);
+			size_t new_height = CVPixelBufferGetHeightOfPlane(pixelBuffer, 1);
 
 			if ((width[1] != new_width) || (height[1] != new_height)) {
-				// printf("Camera CbCr plane %i, %i - %i\n", new_width, new_height, bytes_per_row);
-
 				width[1] = new_width;
 				height[1] = new_height;
 				img_data[1].resize(2 * new_width * new_height);
 			}
 
-			PoolVector<uint8_t>::Write w = img_data[1].write();
-			memcpy(w.ptr(), dataCbCr, 2 * new_width * new_height);
+			uint8_t *w = img_data[1].ptrw();
+			memcpy(w, dataCbCr, 2 * new_width * new_height);
 
 			///TODO GLES2 doesn't support FORMAT_RG8, need to do some form of conversion
 			img[1].instance();
@@ -359,41 +362,59 @@ void CameraIOS::update_feeds() {
 	// this way of doing things is deprecated but still works,
 	// rewrite to using AVCaptureDeviceDiscoverySession
 
-	AVCaptureDeviceDiscoverySession *session = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:[NSArray arrayWithObjects:AVCaptureDeviceTypeBuiltInTelephotoCamera, AVCaptureDeviceTypeBuiltInDualCamera, AVCaptureDeviceTypeBuiltInTrueDepthCamera, AVCaptureDeviceTypeBuiltInWideAngleCamera, nil] mediaType:AVMediaTypeVideo position:AVCaptureDevicePositionUnspecified];
+	NSMutableArray *deviceTypes = [NSMutableArray array];
 
-	// remove devices that are gone..
-	for (int i = feeds.size() - 1; i >= 0; i--) {
-		Ref<CameraFeedIOS> feed(feeds[i]);
+	if (@available(iOS 10, *)) {
+		[deviceTypes addObject:AVCaptureDeviceTypeBuiltInWideAngleCamera];
+		[deviceTypes addObject:AVCaptureDeviceTypeBuiltInTelephotoCamera];
 
-		if (feed.is_null()) {
-			// feed not managed by us
-		} else if (![session.devices containsObject:feed->get_device()]) {
-			// remove it from our array, this will also destroy it ;)
-			remove_feed(feed);
-		};
-	};
+		if (@available(iOS 10.2, *)) {
+			[deviceTypes addObject:AVCaptureDeviceTypeBuiltInDualCamera];
+		}
 
-	// add new devices..
-	for (AVCaptureDevice *device in session.devices) {
-		bool found = false;
+		if (@available(iOS 11.1, *)) {
+			[deviceTypes addObject:AVCaptureDeviceTypeBuiltInTrueDepthCamera];
+		}
+
+		AVCaptureDeviceDiscoverySession *session = [AVCaptureDeviceDiscoverySession
+				discoverySessionWithDeviceTypes:deviceTypes
+									  mediaType:AVMediaTypeVideo
+									   position:AVCaptureDevicePositionUnspecified];
 
-		for (int i = 0; i < feeds.size() && !found; i++) {
+		// remove devices that are gone..
+		for (int i = feeds.size() - 1; i >= 0; i--) {
 			Ref<CameraFeedIOS> feed(feeds[i]);
 
 			if (feed.is_null()) {
 				// feed not managed by us
-			} else if (feed->get_device() == device) {
-				found = true;
+			} else if (![session.devices containsObject:feed->get_device()]) {
+				// remove it from our array, this will also destroy it ;)
+				remove_feed(feed);
 			};
 		};
 
-		if (!found) {
-			Ref<CameraFeedIOS> newfeed;
-			newfeed.instance();
-			newfeed->set_device(device);
-			add_feed(newfeed);
+		// add new devices..
+		for (AVCaptureDevice *device in session.devices) {
+			bool found = false;
+
+			for (int i = 0; i < feeds.size() && !found; i++) {
+				Ref<CameraFeedIOS> feed(feeds[i]);
+
+				if (feed.is_null()) {
+					// feed not managed by us
+				} else if (feed->get_device() == device) {
+					found = true;
+				};
+			};
+
+			if (!found) {
+				Ref<CameraFeedIOS> newfeed;
+				newfeed.instance();
+				newfeed->set_device(device);
+				add_feed(newfeed);
+			};
 		};
-	};
+	}
 };
 
 CameraIOS::CameraIOS() {
diff --git a/modules/camera/camera_osx.mm b/modules/camera/camera_osx.mm
index 658ddb728b..306632a016 100644
--- a/modules/camera/camera_osx.mm
+++ b/modules/camera/camera_osx.mm
@@ -42,7 +42,7 @@
 	Ref<CameraFeed> feed;
 	size_t width[2];
 	size_t height[2];
-	PoolVector<uint8_t> img_data[2];
+	Vector<uint8_t> img_data[2];
 
 	AVCaptureDeviceInput *input;
 	AVCaptureVideoDataOutput *output;
@@ -159,8 +159,8 @@
 				img_data[0].resize(new_width * new_height);
 			}
 
-			PoolVector<uint8_t>::Write w = img_data[0].write();
-			memcpy(w.ptr(), dataY, new_width * new_height);
+			uint8_t *w = img_data[0].ptrw();
+			memcpy(w, dataY, new_width * new_height);
 
 			img[0].instance();
 			img[0]->create(new_width, new_height, 0, Image::FORMAT_R8, img_data[0]);
@@ -177,8 +177,8 @@
 				img_data[1].resize(2 * new_width * new_height);
 			}
 
-			PoolVector<uint8_t>::Write w = img_data[1].write();
-			memcpy(w.ptr(), dataCbCr, 2 * new_width * new_height);
+			uint8_t *w = img_data[1].ptrw();
+			memcpy(w, dataCbCr, 2 * new_width * new_height);
 
 			///TODO GLES2 doesn't support FORMAT_RG8, need to do some form of conversion
 			img[1].instance();
@@ -313,7 +313,12 @@ MyDeviceNotifications *device_notifications = nil;
 // CameraOSX - Subclass for our camera server on OSX
 
 void CameraOSX::update_feeds() {
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101500
+	AVCaptureDeviceDiscoverySession *session = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:[NSArray arrayWithObjects:AVCaptureDeviceTypeExternalUnknown, AVCaptureDeviceTypeBuiltInWideAngleCamera, nil] mediaType:AVMediaTypeVideo position:AVCaptureDevicePositionUnspecified];
+	NSArray *devices = session.devices;
+#else
 	NSArray *devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo];
+#endif
 
 	// remove devices that are gone..
 	for (int i = feeds.size() - 1; i >= 0; i--) {
@@ -325,7 +330,6 @@ void CameraOSX::update_feeds() {
 		};
 	};
 
-	// add new devices..
 	for (AVCaptureDevice *device in devices) {
 		bool found = false;
 		for (int i = 0; i < feeds.size() && !found; i++) {
diff --git a/modules/camera/camera_win.cpp b/modules/camera/camera_win.cpp
index 875f0b26bc..1646644be3 100644
--- a/modules/camera/camera_win.cpp
+++ b/modules/camera/camera_win.cpp
@@ -53,9 +53,9 @@ public:
 	void deactivate_feed();
 };
 
-CameraFeedWindows::CameraFeedWindows(){
+CameraFeedWindows::CameraFeedWindows() {
 	///@TODO implement this, should store information about our available camera
-};
+}
 
 CameraFeedWindows::~CameraFeedWindows() {
 	// make sure we stop recording if we are!
@@ -75,16 +75,16 @@ bool CameraFeedWindows::activate_feed() {
 ///@TODO we should probably have a callback method here that is being called by the
 // camera API which provides frames and call back into the CameraServer to update our texture
 
-void CameraFeedWindows::deactivate_feed(){
+void CameraFeedWindows::deactivate_feed() {
 	///@TODO this should deactivate our camera and stop the process of capturing frames
-};
+}
 
 //////////////////////////////////////////////////////////////////////////
 // CameraWindows - Subclass for our camera server on windows
 
-void CameraWindows::add_active_cameras(){
+void CameraWindows::add_active_cameras() {
 	///@TODO scan through any active cameras and create CameraFeedWindows objects for them
-};
+}
 
 CameraWindows::CameraWindows() {
 	// Find cameras active right now
@@ -92,7 +92,3 @@ CameraWindows::CameraWindows() {
 
 	// need to add something that will react to devices being connected/removed...
 };
-
-CameraWindows::~CameraWindows(){
-
-};
diff --git a/modules/camera/camera_win.h b/modules/camera/camera_win.h
index 39a1b0b86f..bbc8880c12 100644
--- a/modules/camera/camera_win.h
+++ b/modules/camera/camera_win.h
@@ -40,7 +40,7 @@ private:
 
 public:
 	CameraWindows();
-	~CameraWindows();
+	~CameraWindows() {}
 };
 
 #endif /* CAMERAWIN_H */
diff --git a/modules/camera/config.py b/modules/camera/config.py
index d308c04195..87d7542741 100644
--- a/modules/camera/config.py
+++ b/modules/camera/config.py
@@ -1,5 +1,6 @@
 def can_build(env, platform):
-     return platform == 'iphone' or platform == 'osx' or platform == 'windows'
+    return platform == "iphone" or platform == "osx" or platform == "windows"
+
 
 def configure(env):
     pass
diff --git a/modules/camera/register_types.h b/modules/camera/register_types.h
index f2753cb6d7..e34f84bf2c 100644
--- a/modules/camera/register_types.h
+++ b/modules/camera/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef CAMERA_REGISTER_TYPES_H
+#define CAMERA_REGISTER_TYPES_H
+
 void register_camera_types();
 void unregister_camera_types();
+
+#endif // CAMERA_REGISTER_TYPES_H
diff --git a/modules/csg/SCsub b/modules/csg/SCsub
index 57c504efd8..641a42c187 100644
--- a/modules/csg/SCsub
+++ b/modules/csg/SCsub
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_csg = env_modules.Clone()
 
diff --git a/modules/csg/config.py b/modules/csg/config.py
index 38ccc66d91..9106cbceca 100644
--- a/modules/csg/config.py
+++ b/modules/csg/config.py
@@ -1,21 +1,24 @@
 def can_build(env, platform):
     return True
 
+
 def configure(env):
     pass
 
+
 def get_doc_classes():
     return [
-        "CSGBox",
-        "CSGCombiner",
-        "CSGCylinder",
-        "CSGMesh",
-        "CSGPolygon",
-        "CSGPrimitive",
-        "CSGShape",
-        "CSGSphere",
-        "CSGTorus",
+        "CSGBox3D",
+        "CSGCombiner3D",
+        "CSGCylinder3D",
+        "CSGMesh3D",
+        "CSGPolygon3D",
+        "CSGPrimitive3D",
+        "CSGShape3D",
+        "CSGSphere3D",
+        "CSGTorus3D",
     ]
 
+
 def get_doc_path():
     return "doc_classes"
diff --git a/modules/csg/csg.cpp b/modules/csg/csg.cpp
index cc3bbed27f..47982d519a 100644
--- a/modules/csg/csg.cpp
+++ b/modules/csg/csg.cpp
@@ -29,33 +29,187 @@
 /*************************************************************************/
 
 #include "csg.h"
-#include "core/math/face3.h"
-#include "core/math/geometry.h"
-#include "core/os/os.h"
+
+#include "core/math/geometry_2d.h"
+#include "core/math/math_funcs.h"
 #include "core/sort_array.h"
-#include "thirdparty/misc/triangulator.h"
 
-void CSGBrush::clear() {
-	faces.clear();
+// Static helper functions.
+
+inline static bool is_snapable(const Vector3 &p_point1, const Vector3 &p_point2, real_t p_distance) {
+	return (p_point1 - p_point2).length_squared() < p_distance * p_distance;
+}
+
+inline static Vector2 interpolate_segment_uv(const Vector2 p_segement_points[2], const Vector2 p_uvs[2], const Vector2 &p_interpolation_point) {
+	float segment_length = (p_segement_points[1] - p_segement_points[0]).length();
+	if (segment_length < CMP_EPSILON) {
+		return p_uvs[0];
+	}
+
+	float distance = (p_interpolation_point - p_segement_points[0]).length();
+	float fraction = distance / segment_length;
+
+	return p_uvs[0].lerp(p_uvs[1], fraction);
+}
+
+inline static Vector2 interpolate_triangle_uv(const Vector2 p_vertices[3], const Vector2 p_uvs[3], const Vector2 &p_interpolation_point) {
+	if (p_interpolation_point.distance_squared_to(p_vertices[0]) < CMP_EPSILON2) {
+		return p_uvs[0];
+	}
+	if (p_interpolation_point.distance_squared_to(p_vertices[1]) < CMP_EPSILON2) {
+		return p_uvs[1];
+	}
+	if (p_interpolation_point.distance_squared_to(p_vertices[2]) < CMP_EPSILON2) {
+		return p_uvs[2];
+	}
+
+	Vector2 edge1 = p_vertices[1] - p_vertices[0];
+	Vector2 edge2 = p_vertices[2] - p_vertices[0];
+	Vector2 interpolation = p_interpolation_point - p_vertices[0];
+
+	float edge1_on_edge1 = edge1.dot(edge1);
+	float edge1_on_edge2 = edge1.dot(edge2);
+	float edge2_on_edge2 = edge2.dot(edge2);
+	float inter_on_edge1 = interpolation.dot(edge1);
+	float inter_on_edge2 = interpolation.dot(edge2);
+	float scale = (edge1_on_edge1 * edge2_on_edge2 - edge1_on_edge2 * edge1_on_edge2);
+	if (scale == 0) {
+		return p_uvs[0];
+	}
+
+	float v = (edge2_on_edge2 * inter_on_edge1 - edge1_on_edge2 * inter_on_edge2) / scale;
+	float w = (edge1_on_edge1 * inter_on_edge2 - edge1_on_edge2 * inter_on_edge1) / scale;
+	float u = 1.0f - v - w;
+
+	return p_uvs[0] * u + p_uvs[1] * v + p_uvs[2] * w;
+}
+
+static inline bool ray_intersects_triangle(const Vector3 &p_from, const Vector3 &p_dir, const Vector3 p_vertices[3], float p_tolerance, Vector3 &r_intersection_point) {
+	Vector3 edge1 = p_vertices[1] - p_vertices[0];
+	Vector3 edge2 = p_vertices[2] - p_vertices[0];
+	Vector3 h = p_dir.cross(edge2);
+	real_t a = edge1.dot(h);
+	// Check if ray is parallel to triangle.
+	if (Math::is_zero_approx(a)) {
+		return false;
+	}
+	real_t f = 1.0 / a;
+
+	Vector3 s = p_from - p_vertices[0];
+	real_t u = f * s.dot(h);
+	if (u < 0.0 - p_tolerance || u > 1.0 + p_tolerance) {
+		return false;
+	}
+
+	Vector3 q = s.cross(edge1);
+	real_t v = f * p_dir.dot(q);
+	if (v < 0.0 - p_tolerance || u + v > 1.0 + p_tolerance) {
+		return false;
+	}
+
+	// Ray intersects triangle.
+	// Calculate distance.
+	real_t t = f * edge2.dot(q);
+	// Confirm triangle is in front of ray.
+	if (t >= p_tolerance) {
+		r_intersection_point = p_from + p_dir * t;
+		return true;
+	} else {
+		return false;
+	}
+}
+
+inline bool is_point_in_triangle(const Vector3 &p_point, const Vector3 p_vertices[3], int p_shifted = 0) {
+	real_t det = p_vertices[0].dot(p_vertices[1].cross(p_vertices[2]));
+
+	// If determinant is, zero try shift the triangle and the point.
+	if (Math::is_zero_approx(det)) {
+		if (p_shifted > 2) {
+			// Triangle appears degenerate, so ignore it.
+			return false;
+		}
+		Vector3 shift_by;
+		shift_by[p_shifted] = 1;
+		Vector3 shifted_point = p_point + shift_by;
+		Vector3 shifted_vertices[3] = { p_vertices[0] + shift_by, p_vertices[1] + shift_by, p_vertices[2] + shift_by };
+		return is_point_in_triangle(shifted_point, shifted_vertices, p_shifted + 1);
+	}
+
+	// Find the barycentric coordinates of the point with respect to the vertices.
+	real_t lambda[3];
+	lambda[0] = p_vertices[1].cross(p_vertices[2]).dot(p_point) / det;
+	lambda[1] = p_vertices[2].cross(p_vertices[0]).dot(p_point) / det;
+	lambda[2] = p_vertices[0].cross(p_vertices[1]).dot(p_point) / det;
+
+	// Point is in the plane if all lambdas sum to 1.
+	if (!Math::is_equal_approx(lambda[0] + lambda[1] + lambda[2], 1)) {
+		return false;
+	}
+
+	// Point is inside the triangle if all lambdas are positive.
+	if (lambda[0] < 0 || lambda[1] < 0 || lambda[2] < 0) {
+		return false;
+	}
+
+	return true;
+}
+
+inline static bool is_triangle_degenerate(const Vector2 p_vertices[3], real_t p_vertex_snap2) {
+	real_t det = p_vertices[0].x * p_vertices[1].y - p_vertices[0].x * p_vertices[2].y +
+				 p_vertices[0].y * p_vertices[2].x - p_vertices[0].y * p_vertices[1].x +
+				 p_vertices[1].x * p_vertices[2].y - p_vertices[1].y * p_vertices[2].x;
+
+	return det < p_vertex_snap2;
+}
+
+inline static bool are_segements_parallel(const Vector2 p_segment1_points[2], const Vector2 p_segment2_points[2], float p_vertex_snap2) {
+	Vector2 segment1 = p_segment1_points[1] - p_segment1_points[0];
+	Vector2 segment2 = p_segment2_points[1] - p_segment2_points[0];
+	real_t segment1_length2 = segment1.dot(segment1);
+	real_t segment2_length2 = segment2.dot(segment2);
+	real_t segment_onto_segment = segment2.dot(segment1);
+
+	if (segment1_length2 < p_vertex_snap2 || segment2_length2 < p_vertex_snap2) {
+		return true;
+	}
+
+	real_t max_separation2;
+	if (segment1_length2 > segment2_length2) {
+		max_separation2 = segment2_length2 - segment_onto_segment * segment_onto_segment / segment1_length2;
+	} else {
+		max_separation2 = segment1_length2 - segment_onto_segment * segment_onto_segment / segment2_length2;
+	}
+
+	return max_separation2 < p_vertex_snap2;
 }
 
-void CSGBrush::build_from_faces(const PoolVector<Vector3> &p_vertices, const PoolVector<Vector2> &p_uvs, const PoolVector<bool> &p_smooth, const PoolVector<Ref<Material> > &p_materials, const PoolVector<bool> &p_invert_faces) {
+// CSGBrush
+
+void CSGBrush::_regen_face_aabbs() {
+	for (int i = 0; i < faces.size(); i++) {
+		faces.write[i].aabb = AABB();
+		faces.write[i].aabb.position = faces[i].vertices[0];
+		faces.write[i].aabb.expand_to(faces[i].vertices[1]);
+		faces.write[i].aabb.expand_to(faces[i].vertices[2]);
+	}
+}
 
-	clear();
+void CSGBrush::build_from_faces(const Vector<Vector3> &p_vertices, const Vector<Vector2> &p_uvs, const Vector<bool> &p_smooth, const Vector<Ref<Material>> &p_materials, const Vector<bool> &p_invert_faces) {
+	faces.clear();
 
 	int vc = p_vertices.size();
 
 	ERR_FAIL_COND((vc % 3) != 0);
 
-	PoolVector<Vector3>::Read rv = p_vertices.read();
+	const Vector3 *rv = p_vertices.ptr();
 	int uvc = p_uvs.size();
-	PoolVector<Vector2>::Read ruv = p_uvs.read();
+	const Vector2 *ruv = p_uvs.ptr();
 	int sc = p_smooth.size();
-	PoolVector<bool>::Read rs = p_smooth.read();
+	const bool *rs = p_smooth.ptr();
 	int mc = p_materials.size();
-	PoolVector<Ref<Material> >::Read rm = p_materials.read();
+	const Ref<Material> *rm = p_materials.ptr();
 	int ic = p_invert_faces.size();
-	PoolVector<bool>::Read ri = p_invert_faces.read();
+	const bool *ri = p_invert_faces.ptr();
 
 	Map<Ref<Material>, int> material_map;
 
@@ -66,11 +220,13 @@ void CSGBrush::build_from_faces(const PoolVector<Vector3> &p_vertices, const Poo
 		f.vertices[0] = rv[i * 3 + 0];
 		f.vertices[1] = rv[i * 3 + 1];
 		f.vertices[2] = rv[i * 3 + 2];
+
 		if (uvc == vc) {
 			f.uvs[0] = ruv[i * 3 + 0];
 			f.uvs[1] = ruv[i * 3 + 1];
 			f.uvs[2] = ruv[i * 3 + 2];
 		}
+
 		if (sc == vc / 3) {
 			f.smooth = rs[i];
 		} else {
@@ -87,12 +243,14 @@ void CSGBrush::build_from_faces(const PoolVector<Vector3> &p_vertices, const Poo
 			Ref<Material> mat = rm[i];
 			if (mat.is_valid()) {
 				const Map<Ref<Material>, int>::Element *E = material_map.find(mat);
+
 				if (E) {
 					f.material = E->get();
 				} else {
 					f.material = material_map.size();
 					material_map[mat] = f.material;
 				}
+
 			} else {
 				f.material = -1;
 			}
@@ -107,19 +265,7 @@ void CSGBrush::build_from_faces(const PoolVector<Vector3> &p_vertices, const Poo
 	_regen_face_aabbs();
 }
 
-void CSGBrush::_regen_face_aabbs() {
-
-	for (int i = 0; i < faces.size(); i++) {
-
-		faces.write[i].aabb.position = faces[i].vertices[0];
-		faces.write[i].aabb.expand_to(faces[i].vertices[1]);
-		faces.write[i].aabb.expand_to(faces[i].vertices[2]);
-		faces.write[i].aabb.grow_by(faces[i].aabb.get_longest_axis_size() * 0.001); //make it a tad bigger to avoid num precision errors
-	}
-}
-
 void CSGBrush::copy_from(const CSGBrush &p_brush, const Transform &p_xform) {
-
 	faces = p_brush.faces;
 	materials = p_brush.materials;
 
@@ -132,937 +278,244 @@ void CSGBrush::copy_from(const CSGBrush &p_brush, const Transform &p_xform) {
 	_regen_face_aabbs();
 }
 
-////////////////////////
-
-void CSGBrushOperation::BuildPoly::create(const CSGBrush *p_brush, int p_face, MeshMerge &mesh_merge, bool p_for_B) {
-
-	//creates the initial face that will be used for clipping against the other faces
-
-	Vector3 va[3] = {
-		p_brush->faces[p_face].vertices[0],
-		p_brush->faces[p_face].vertices[1],
-		p_brush->faces[p_face].vertices[2],
-	};
-
-	plane = Plane(va[0], va[1], va[2]);
-
-	to_world.origin = va[0];
-
-	to_world.basis.set_axis(2, plane.normal);
-	to_world.basis.set_axis(0, (va[1] - va[2]).normalized());
-	to_world.basis.set_axis(1, to_world.basis.get_axis(0).cross(to_world.basis.get_axis(2)).normalized());
-
-	to_poly = to_world.affine_inverse();
-
-	face_index = p_face;
-
-	for (int i = 0; i < 3; i++) {
-
-		Point p;
-		Vector3 localp = to_poly.xform(va[i]);
-		p.point.x = localp.x;
-		p.point.y = localp.y;
-		p.uv = p_brush->faces[p_face].uvs[i];
-
-		points.push_back(p);
-
-		///edge
+// CSGBrushOperation
 
-		Edge e;
-		e.points[0] = i;
-		e.points[1] = (i + 1) % 3;
-		e.outer = true;
-		edges.push_back(e);
-	}
-
-	smooth = p_brush->faces[p_face].smooth;
-	invert = p_brush->faces[p_face].invert;
-
-	if (p_brush->faces[p_face].material != -1) {
-		material = p_brush->materials[p_brush->faces[p_face].material];
-	}
-
-	base_edges = 3;
-}
-
-static Vector2 interpolate_uv(const Vector2 &p_vertex_a, const Vector2 &p_vertex_b, const Vector2 &p_vertex_c, const Vector2 &p_uv_a, const Vector2 &p_uv_c) {
-
-	float len_a_c = (p_vertex_c - p_vertex_a).length();
-	if (len_a_c < CMP_EPSILON) {
-		return p_uv_a;
-	}
-
-	float len_a_b = (p_vertex_b - p_vertex_a).length();
-
-	float c = len_a_b / len_a_c;
-
-	return p_uv_a.linear_interpolate(p_uv_c, c);
-}
-
-static Vector2 interpolate_triangle_uv(const Vector2 &p_pos, const Vector2 *p_vtx, const Vector2 *p_uv) {
-
-	if (p_pos.distance_squared_to(p_vtx[0]) < CMP_EPSILON2) {
-		return p_uv[0];
-	}
-	if (p_pos.distance_squared_to(p_vtx[1]) < CMP_EPSILON2) {
-		return p_uv[1];
-	}
-	if (p_pos.distance_squared_to(p_vtx[2]) < CMP_EPSILON2) {
-		return p_uv[2];
-	}
-
-	Vector2 v0 = p_vtx[1] - p_vtx[0];
-	Vector2 v1 = p_vtx[2] - p_vtx[0];
-	Vector2 v2 = p_pos - p_vtx[0];
-
-	float d00 = v0.dot(v0);
-	float d01 = v0.dot(v1);
-	float d11 = v1.dot(v1);
-	float d20 = v2.dot(v0);
-	float d21 = v2.dot(v1);
-	float denom = (d00 * d11 - d01 * d01);
-	if (denom == 0) {
-		return p_uv[0];
-	}
-	float v = (d11 * d20 - d01 * d21) / denom;
-	float w = (d00 * d21 - d01 * d20) / denom;
-	float u = 1.0f - v - w;
-
-	return p_uv[0] * u + p_uv[1] * v + p_uv[2] * w;
-}
-
-void CSGBrushOperation::BuildPoly::_clip_segment(const CSGBrush *p_brush, int p_face, const Vector2 *segment, MeshMerge &mesh_merge, bool p_for_B) {
-
-	//keep track of what was inserted
-	Vector<int> inserted_points;
-
-	//keep track of point indices for what was inserted, allowing reuse of points.
-	int segment_idx[2] = { -1, -1 };
-
-	//check if edge and poly share a vertex, of so, assign it to segment_idx
-	for (int i = 0; i < points.size(); i++) {
-		for (int j = 0; j < 2; j++) {
-			if (segment[j].is_equal_approx(points[i].point)) {
-				segment_idx[j] = i;
-				inserted_points.push_back(i);
-				break;
-			}
-		}
-	}
-
-	//check if both segment points are shared with other vertices
-	if (segment_idx[0] != -1 && segment_idx[1] != -1) {
-
-		if (segment_idx[0] == segment_idx[1]) {
-			return; //segment was too tiny, both mapped to same point
-		}
-
-		bool found = false;
-
-		//check if the segment already exists
-		for (int i = 0; i < edges.size(); i++) {
-
-			if (
-					(edges[i].points[0] == segment_idx[0] && edges[i].points[1] == segment_idx[1]) ||
-					(edges[i].points[0] == segment_idx[1] && edges[i].points[1] == segment_idx[0])) {
-				found = true;
-				break;
+void CSGBrushOperation::merge_brushes(Operation p_operation, const CSGBrush &p_brush_a, const CSGBrush &p_brush_b, CSGBrush &r_merged_brush, float p_vertex_snap) {
+	// Check for face collisions and add necessary faces.
+	Build2DFaceCollection build2DFaceCollection;
+	for (int i = 0; i < p_brush_a.faces.size(); i++) {
+		for (int j = 0; j < p_brush_b.faces.size(); j++) {
+			if (p_brush_a.faces[i].aabb.intersects_inclusive(p_brush_b.faces[j].aabb)) {
+				update_faces(p_brush_a, i, p_brush_b, j, build2DFaceCollection, p_vertex_snap);
 			}
 		}
-
-		if (found) {
-			//it does already exist, do nothing
-			return;
-		}
-
-		//directly add the new segment
-		Edge new_edge;
-		new_edge.points[0] = segment_idx[0];
-		new_edge.points[1] = segment_idx[1];
-		edges.push_back(new_edge);
-		return;
 	}
 
-	//check edge by edge against the segment points to see if intersects
-
-	for (int i = 0; i < base_edges; i++) {
-
-		//if a point is shared with one of the edge points, then this edge must not be tested, as it will result in a numerical precision error.
-		bool edge_valid = true;
-		for (int j = 0; j < 2; j++) {
-
-			if (edges[i].points[0] == segment_idx[0] || edges[i].points[1] == segment_idx[1] || edges[i].points[0] == segment_idx[1] || edges[i].points[1] == segment_idx[0]) {
-				edge_valid = false; //segment has this point, can't check against this
-				break;
-			}
-		}
-
-		if (!edge_valid) //already hit a point in this edge, so don't test it
-			continue;
-
-		//see if either points are within the edge isntead of crossing it
-		Vector2 res;
-		bool found = false;
-		int assign_segment_id = -1;
-
-		for (int j = 0; j < 2; j++) {
-
-			Vector2 edgeseg[2] = { points[edges[i].points[0]].point, points[edges[i].points[1]].point };
-			Vector2 closest = Geometry::get_closest_point_to_segment_2d(segment[j], edgeseg);
-
-			if (closest.is_equal_approx(segment[j])) {
-				//point rest of this edge
-				res = closest;
-				found = true;
-				assign_segment_id = j;
-			}
-		}
+	// Add faces to MeshMerge.
+	MeshMerge mesh_merge;
+	mesh_merge.vertex_snap = p_vertex_snap;
 
-		//test if the point crosses the edge
-		if (!found && Geometry::segment_intersects_segment_2d(segment[0], segment[1], points[edges[i].points[0]].point, points[edges[i].points[1]].point, &res)) {
-			//point does cross the edge
-			found = true;
+	for (int i = 0; i < p_brush_a.faces.size(); i++) {
+		Ref<Material> material;
+		if (p_brush_a.faces[i].material != -1) {
+			material = p_brush_a.materials[p_brush_a.faces[i].material];
 		}
 
-		//check whether an intersection against the segment happened
-		if (found) {
-
-			//It did! so first, must slice the segment
-			Point new_point;
-			new_point.point = res;
-			//make sure to interpolate UV too
-			new_point.uv = interpolate_uv(points[edges[i].points[0]].point, new_point.point, points[edges[i].points[1]].point, points[edges[i].points[0]].uv, points[edges[i].points[1]].uv);
-
-			int point_idx = points.size();
-			points.push_back(new_point);
-
-			//split the edge in 2
-			Edge new_edge;
-			new_edge.points[0] = edges[i].points[0];
-			new_edge.points[1] = point_idx;
-			new_edge.outer = edges[i].outer;
-			edges.write[i].points[0] = point_idx;
-			edges.insert(i, new_edge);
-			i++; //skip newly inserted edge
-			base_edges++; //will need an extra one in the base triangle
-			if (assign_segment_id >= 0) {
-				//point did split a segment, so make sure to remember this
-				segment_idx[assign_segment_id] = point_idx;
+		if (build2DFaceCollection.build2DFacesA.has(i)) {
+			build2DFaceCollection.build2DFacesA[i].addFacesToMesh(mesh_merge, p_brush_a.faces[i].smooth, p_brush_a.faces[i].invert, material, false);
+		} else {
+			Vector3 points[3];
+			Vector2 uvs[3];
+			for (int j = 0; j < 3; j++) {
+				points[j] = p_brush_a.faces[i].vertices[j];
+				uvs[j] = p_brush_a.faces[i].uvs[j];
 			}
-			inserted_points.push_back(point_idx);
+			mesh_merge.add_face(points, uvs, p_brush_a.faces[i].smooth, p_brush_a.faces[i].invert, material, false);
 		}
 	}
 
-	//final step: after cutting the original triangle, try to see if we can still insert
-	//this segment
-
-	//if already inserted two points, just use them for a segment
-
-	if (inserted_points.size() >= 2) { //should never be >2 on non-manifold geometry, but cope with error
-		//two points were inserted, create the new edge
-		Edge new_edge;
-		new_edge.points[0] = inserted_points[0];
-		new_edge.points[1] = inserted_points[1];
-		edges.push_back(new_edge);
-		return;
-	}
-
-	// One or no points were inserted (besides splitting), so try to see if extra points can be placed inside the triangle.
-	// This needs to be done here, after the previous tests were exhausted
-	for (int i = 0; i < 2; i++) {
-
-		if (segment_idx[i] != -1)
-			continue; //already assigned to something, so skip
-
-		//check whether one of the segment endpoints is inside the triangle. If it is, this points needs to be inserted
-		if (Geometry::is_point_in_triangle(segment[i], points[0].point, points[1].point, points[2].point)) {
-
-			Point new_point;
-			new_point.point = segment[i];
-
-			Vector2 point3[3] = { points[0].point, points[1].point, points[2].point };
-			Vector2 uv3[3] = { points[0].uv, points[1].uv, points[2].uv };
-
-			new_point.uv = interpolate_triangle_uv(new_point.point, point3, uv3);
-
-			int point_idx = points.size();
-			points.push_back(new_point);
-			inserted_points.push_back(point_idx);
+	for (int i = 0; i < p_brush_b.faces.size(); i++) {
+		Ref<Material> material;
+		if (p_brush_b.faces[i].material != -1) {
+			material = p_brush_b.materials[p_brush_b.faces[i].material];
 		}
-	}
-
-	//check again whether two points were inserted, if so then create the new edge
-	if (inserted_points.size() >= 2) { //should never be >2 on non-manifold geometry, but cope with error
-		Edge new_edge;
-		new_edge.points[0] = inserted_points[0];
-		new_edge.points[1] = inserted_points[1];
-		edges.push_back(new_edge);
-	}
-}
 
-void CSGBrushOperation::BuildPoly::clip(const CSGBrush *p_brush, int p_face, MeshMerge &mesh_merge, bool p_for_B) {
-
-	//Clip function.. find triangle points that will be mapped to the plane and form a segment
-
-	Vector2 segment[3]; //2D
-
-	int src_points = 0;
-
-	for (int i = 0; i < 3; i++) {
-		Vector3 p = p_brush->faces[p_face].vertices[i];
-		if (plane.has_point(p)) {
-			Vector3 pp = plane.project(p);
-			pp = to_poly.xform(pp);
-			segment[src_points++] = Vector2(pp.x, pp.y);
+		if (build2DFaceCollection.build2DFacesB.has(i)) {
+			build2DFaceCollection.build2DFacesB[i].addFacesToMesh(mesh_merge, p_brush_b.faces[i].smooth, p_brush_b.faces[i].invert, material, true);
 		} else {
-			Vector3 q = p_brush->faces[p_face].vertices[(i + 1) % 3];
-			if (plane.has_point(q))
-				continue; //next point is in plane, will be added eventually
-			if (plane.is_point_over(p) == plane.is_point_over(q))
-				continue; // both on same side of the plane, don't add
-
-			Vector3 res;
-			if (plane.intersects_segment(p, q, &res)) {
-				res = to_poly.xform(res);
-				segment[src_points++] = Vector2(res.x, res.y);
+			Vector3 points[3];
+			Vector2 uvs[3];
+			for (int j = 0; j < 3; j++) {
+				points[j] = p_brush_b.faces[i].vertices[j];
+				uvs[j] = p_brush_b.faces[i].uvs[j];
 			}
+			mesh_merge.add_face(points, uvs, p_brush_b.faces[i].smooth, p_brush_b.faces[i].invert, material, true);
 		}
 	}
 
-	//all above or all below, nothing to do. Should not happen though since a precheck was done before.
-	if (src_points == 0)
-		return;
-
-	//just one point in plane is not worth doing anything
-	if (src_points == 1)
-		return;
-
-	//transform A points to 2D
-
-	if (segment[0].is_equal_approx(segment[1]))
-		return; //too small
-
-	_clip_segment(p_brush, p_face, segment, mesh_merge, p_for_B);
-}
-
-void CSGBrushOperation::_collision_callback(const CSGBrush *A, int p_face_a, Map<int, BuildPoly> &build_polys_a, const CSGBrush *B, int p_face_b, Map<int, BuildPoly> &build_polys_b, MeshMerge &mesh_merge) {
-
-	//construct a frame of reference for both transforms, in order to do intersection test
-	Vector3 va[3] = {
-		A->faces[p_face_a].vertices[0],
-		A->faces[p_face_a].vertices[1],
-		A->faces[p_face_a].vertices[2],
-	};
-	Vector3 vb[3] = {
-		B->faces[p_face_b].vertices[0],
-		B->faces[p_face_b].vertices[1],
-		B->faces[p_face_b].vertices[2],
-	};
-
-	{
-		//check if either is a degenerate
-		if (va[0].is_equal_approx(va[1]) || va[0].is_equal_approx(va[2]) || va[1].is_equal_approx(va[2]))
-			return;
-
-		if (vb[0].is_equal_approx(vb[1]) || vb[0].is_equal_approx(vb[2]) || vb[1].is_equal_approx(vb[2]))
-			return;
-	}
+	// Mark faces that ended up inside the intersection.
+	mesh_merge.mark_inside_faces();
 
-	{
-		//check if points are the same
-		int equal_count = 0;
+	// Create new brush and fill with new faces.
+	r_merged_brush.faces.clear();
 
-		for (int i = 0; i < 3; i++) {
+	switch (p_operation) {
+		case OPERATION_UNION: {
+			int outside_count = 0;
 
-			for (int j = 0; j < 3; j++) {
-				if (va[i].distance_to(vb[j]) < mesh_merge.vertex_snap) {
-					equal_count++;
-					break;
+			for (int i = 0; i < mesh_merge.faces.size(); i++) {
+				if (mesh_merge.faces[i].inside) {
+					continue;
 				}
+				outside_count++;
 			}
-		}
-
-		//if 2 or 3 points are the same, there is no point in doing anything. They can't
-		//be clipped either, so add both.
-		if (equal_count == 2 || equal_count == 3) {
-			return;
-		}
-	}
-
-	// do a quick pre-check for no-intersection using the SAT theorem
-
-	{
-
-		//b under or over a plane
-		int over_count = 0, in_plane_count = 0, under_count = 0;
-		Plane plane_a(va[0], va[1], va[2]);
-		if (plane_a.normal == Vector3()) {
-			return; //degenerate
-		}
-
-		for (int i = 0; i < 3; i++) {
-			if (plane_a.has_point(vb[i]))
-				in_plane_count++;
-			else if (plane_a.is_point_over(vb[i]))
-				over_count++;
-			else
-				under_count++;
-		}
-
-		if (over_count == 0 || under_count == 0)
-			return; //no intersection, something needs to be under AND over
-
-		//a under or over b plane
-		over_count = 0;
-		under_count = 0;
-		in_plane_count = 0;
-
-		Plane plane_b(vb[0], vb[1], vb[2]);
-		if (plane_b.normal == Vector3())
-			return; //degenerate
-
-		for (int i = 0; i < 3; i++) {
-			if (plane_b.has_point(va[i]))
-				in_plane_count++;
-			else if (plane_b.is_point_over(va[i]))
-				over_count++;
-			else
-				under_count++;
-		}
-
-		if (over_count == 0 || under_count == 0)
-			return; //no intersection, something needs to be under AND over
 
-		//edge pairs (cross product combinations), see SAT theorem
+			r_merged_brush.faces.resize(outside_count);
 
-		for (int i = 0; i < 3; i++) {
-
-			Vector3 axis_a = (va[i] - va[(i + 1) % 3]).normalized();
-
-			for (int j = 0; j < 3; j++) {
-
-				Vector3 axis_b = (vb[j] - vb[(j + 1) % 3]).normalized();
-
-				Vector3 sep_axis = axis_a.cross(axis_b);
-				if (sep_axis == Vector3())
-					continue; //colineal
-				sep_axis.normalize();
-
-				real_t min_a = 1e20, max_a = -1e20;
-				real_t min_b = 1e20, max_b = -1e20;
+			outside_count = 0;
 
-				for (int k = 0; k < 3; k++) {
-					real_t d = sep_axis.dot(va[k]);
-					min_a = MIN(min_a, d);
-					max_a = MAX(max_a, d);
-					d = sep_axis.dot(vb[k]);
-					min_b = MIN(min_b, d);
-					max_b = MAX(max_b, d);
+			for (int i = 0; i < mesh_merge.faces.size(); i++) {
+				if (mesh_merge.faces[i].inside) {
+					continue;
 				}
 
-				min_b -= (max_a - min_a) * 0.5;
-				max_b += (max_a - min_a) * 0.5;
-
-				real_t dmin = min_b - (min_a + max_a) * 0.5;
-				real_t dmax = max_b - (min_a + max_a) * 0.5;
-
-				if (dmin > CMP_EPSILON || dmax < -CMP_EPSILON) {
-					return; //does not contain zero, so they don't overlap
+				for (int j = 0; j < 3; j++) {
+					r_merged_brush.faces.write[outside_count].vertices[j] = mesh_merge.points[mesh_merge.faces[i].points[j]];
+					r_merged_brush.faces.write[outside_count].uvs[j] = mesh_merge.faces[i].uvs[j];
 				}
-			}
-		}
-	}
-
-	//if we are still here, it means they most likely intersect, so create BuildPolys if they don't exist
-
-	BuildPoly *poly_a = NULL;
-
-	if (!build_polys_a.has(p_face_a)) {
-
-		BuildPoly bp;
-		bp.create(A, p_face_a, mesh_merge, false);
-		build_polys_a[p_face_a] = bp;
-	}
-
-	poly_a = &build_polys_a[p_face_a];
-
-	BuildPoly *poly_b = NULL;
-
-	if (!build_polys_b.has(p_face_b)) {
-
-		BuildPoly bp;
-		bp.create(B, p_face_b, mesh_merge, true);
-		build_polys_b[p_face_b] = bp;
-	}
-
-	poly_b = &build_polys_b[p_face_b];
-
-	//clip each other, this could be improved by using vertex unique IDs (more vertices may be shared instead of using snap)
-	poly_a->clip(B, p_face_b, mesh_merge, false);
-	poly_b->clip(A, p_face_a, mesh_merge, true);
-}
 
-void CSGBrushOperation::_add_poly_points(const BuildPoly &p_poly, int p_edge, int p_from_point, int p_to_point, const Vector<Vector<int> > &vertex_process, Vector<bool> &edge_process, Vector<PolyPoints> &r_poly) {
-
-	//this function follows the polygon points counter clockwise and adds them. It creates lists of unique polygons
-	//every time an unused edge is found, it's pushed to a stack and continues from there.
-
-	List<EdgeSort> edge_stack;
-
-	{
-		EdgeSort es;
-		es.angle = 0; //won't be checked here
-		es.edge = p_edge;
-		es.prev_point = p_from_point;
-		es.edge_point = p_to_point;
-
-		edge_stack.push_back(es);
-	}
-
-	//attempt to empty the stack.
-	while (edge_stack.size()) {
-
-		EdgeSort e = edge_stack.front()->get();
-		edge_stack.pop_front();
-
-		if (edge_process[e.edge]) {
-			//nothing to do here
-			continue;
-		}
-
-		Vector<int> points;
-		points.push_back(e.prev_point);
-
-		int prev_point = e.prev_point;
-		int to_point = e.edge_point;
-		int current_edge = e.edge;
-
-		edge_process.write[e.edge] = true; //mark as processed
-
-		int limit = p_poly.points.size() * 4; //avoid infinite recursion
-
-		while (to_point != e.prev_point && limit) {
-
-			Vector2 segment[2] = { p_poly.points[prev_point].point, p_poly.points[to_point].point };
-
-			//construct a basis transform from the segment, which will be used to check the angle
-			Transform2D t2d;
-			t2d[0] = (segment[1] - segment[0]).normalized(); //use as Y
-			t2d[1] = Vector2(-t2d[0].y, t2d[0].x); // use as tangent
-			t2d[2] = segment[1]; //origin
-
-			if (t2d.basis_determinant() == 0)
-				break; //abort poly
-
-			t2d.affine_invert();
-
-			//push all edges found here, they will be sorted by minimum angle later.
-			Vector<EdgeSort> next_edges;
-
-			for (int i = 0; i < vertex_process[to_point].size(); i++) {
-
-				int edge = vertex_process[to_point][i];
-				int opposite_point = p_poly.edges[edge].points[0] == to_point ? p_poly.edges[edge].points[1] : p_poly.edges[edge].points[0];
-				if (opposite_point == prev_point)
-					continue; //not going back
-
-				EdgeSort e2;
-				Vector2 local_vec = t2d.xform(p_poly.points[opposite_point].point);
-				e2.angle = -local_vec.angle(); //negate so we can sort by minimum angle
-				e2.edge = edge;
-				e2.edge_point = opposite_point;
-				e2.prev_point = to_point;
-
-				next_edges.push_back(e2);
+				r_merged_brush.faces.write[outside_count].smooth = mesh_merge.faces[i].smooth;
+				r_merged_brush.faces.write[outside_count].invert = mesh_merge.faces[i].invert;
+				r_merged_brush.faces.write[outside_count].material = mesh_merge.faces[i].material_idx;
+				outside_count++;
 			}
 
-			//finally, sort by minimum angle
-			next_edges.sort();
-
-			int next_point = -1;
-			int next_edge = -1;
+			r_merged_brush._regen_face_aabbs();
 
-			for (int i = 0; i < next_edges.size(); i++) {
+		} break;
 
-				if (i == 0) {
-					//minimum angle found is the next point
-					next_point = next_edges[i].edge_point;
-					next_edge = next_edges[i].edge;
+		case OPERATION_INTERSECTION: {
+			int inside_count = 0;
 
-				} else {
-					//the rest are pushed to the stack IF they were not processed yet.
-					if (!edge_process[next_edges[i].edge]) {
-						edge_stack.push_back(next_edges[i]);
-					}
+			for (int i = 0; i < mesh_merge.faces.size(); i++) {
+				if (!mesh_merge.faces[i].inside) {
+					continue;
 				}
+				inside_count++;
 			}
 
-			if (next_edge == -1) {
-				//did not find anything, may be a dead-end edge (this should normally not happen)
-				//just flip the direction and go back
-				next_point = prev_point;
-				next_edge = current_edge;
-			}
-
-			points.push_back(to_point);
-
-			prev_point = to_point;
-			to_point = next_point;
-			edge_process.write[next_edge] = true; //mark this edge as processed
-			current_edge = next_edge;
-
-			limit--;
-		}
-
-		//if more than 2 points were added to the polygon, add it to the list of polygons.
-		if (points.size() > 2) {
-			PolyPoints pp;
-			pp.points = points;
-			r_poly.push_back(pp);
-		}
-	}
-}
-
-void CSGBrushOperation::_add_poly_outline(const BuildPoly &p_poly, int p_from_point, int p_to_point, const Vector<Vector<int> > &vertex_process, Vector<int> &r_outline) {
-
-	//this is the opposite of the function above. It adds polygon outlines instead.
-	//this is used for triangulating holes.
-	//no stack is used here because only the bigger outline is interesting.
-
-	r_outline.push_back(p_from_point);
-
-	int prev_point = p_from_point;
-	int to_point = p_to_point;
-
-	int limit = p_poly.points.size() * 4; //avoid infinite recursion
-
-	while (to_point != p_from_point && limit) {
-
-		Vector2 segment[2] = { p_poly.points[prev_point].point, p_poly.points[to_point].point };
-		//again create a transform to compute the angle.
-		Transform2D t2d;
-		t2d[0] = (segment[1] - segment[0]).normalized(); //use as Y
-		t2d[1] = Vector2(-t2d[0].y, t2d[0].x); // use as tangent
-		t2d[2] = segment[1]; //origin
-
-		if (t2d.basis_determinant() == 0)
-			break; //abort poly
-
-		t2d.affine_invert();
-
-		float max_angle = 0;
-		int next_point_angle = -1;
-
-		for (int i = 0; i < vertex_process[to_point].size(); i++) {
-
-			int edge = vertex_process[to_point][i];
-			int opposite_point = p_poly.edges[edge].points[0] == to_point ? p_poly.edges[edge].points[1] : p_poly.edges[edge].points[0];
-			if (opposite_point == prev_point)
-				continue; //not going back
-
-			float angle = -t2d.xform(p_poly.points[opposite_point].point).angle();
-			if (next_point_angle == -1 || angle > max_angle) { //same as before but use greater to check.
-				max_angle = angle;
-				next_point_angle = opposite_point;
-			}
-		}
-
-		if (next_point_angle == -1) {
-			//go back because no route found
-			next_point_angle = prev_point;
-		}
-
-		r_outline.push_back(to_point);
-		prev_point = to_point;
-		to_point = next_point_angle;
-
-		limit--;
-	}
-}
-
-void CSGBrushOperation::_merge_poly(MeshMerge &mesh, int p_face_idx, const BuildPoly &p_poly, bool p_from_b) {
+			r_merged_brush.faces.resize(inside_count);
 
-	//finally, merge the 2D polygon back to 3D
-
-	Vector<Vector<int> > vertex_process;
-	Vector<bool> edge_process;
-
-	vertex_process.resize(p_poly.points.size());
-	edge_process.resize(p_poly.edges.size());
-
-	//none processed by default
-	for (int i = 0; i < edge_process.size(); i++) {
-		edge_process.write[i] = false;
-	}
-
-	//put edges in points, so points can go through them
-	for (int i = 0; i < p_poly.edges.size(); i++) {
-		vertex_process.write[p_poly.edges[i].points[0]].push_back(i);
-		vertex_process.write[p_poly.edges[i].points[1]].push_back(i);
-	}
-
-	Vector<PolyPoints> polys;
-
-	//process points that were not processed
-	for (int i = 0; i < edge_process.size(); i++) {
-		if (edge_process[i])
-			continue; //already processed
-
-		int intersect_poly = -1;
-
-		if (i > 0) {
-			//this is disconnected, so it's clearly a hole. lets find where it belongs
-			Vector2 ref_point = p_poly.points[p_poly.edges[i].points[0]].point;
-
-			for (int j = 0; j < polys.size(); j++) {
-
-				//find a point outside poly
-				Vector2 out_point(-1e20, -1e20);
-
-				const PolyPoints &pp = polys[j];
-
-				for (int k = 0; k < pp.points.size(); k++) {
-					Vector2 p = p_poly.points[pp.points[k]].point;
-					out_point.x = MAX(out_point.x, p.x);
-					out_point.y = MAX(out_point.y, p.y);
-				}
-
-				out_point += Vector2(0.12341234, 0.4123412); // move to a random place to avoid direct edge-point chances
-
-				int intersections = 0;
-
-				for (int k = 0; k < pp.points.size(); k++) {
-					Vector2 p1 = p_poly.points[pp.points[k]].point;
-					Vector2 p2 = p_poly.points[pp.points[(k + 1) % pp.points.size()]].point;
+			inside_count = 0;
 
-					if (Geometry::segment_intersects_segment_2d(ref_point, out_point, p1, p2, NULL)) {
-						intersections++;
-					}
+			for (int i = 0; i < mesh_merge.faces.size(); i++) {
+				if (!mesh_merge.faces[i].inside) {
+					continue;
 				}
 
-				if (intersections % 2 == 1) {
-					//hole is inside this poly
-					intersect_poly = j;
-					break;
+				for (int j = 0; j < 3; j++) {
+					r_merged_brush.faces.write[inside_count].vertices[j] = mesh_merge.points[mesh_merge.faces[i].points[j]];
+					r_merged_brush.faces.write[inside_count].uvs[j] = mesh_merge.faces[i].uvs[j];
 				}
-			}
-		}
-
-		if (intersect_poly != -1) {
-			//must add this as a hole
-			Vector<int> outline;
-			_add_poly_outline(p_poly, p_poly.edges[i].points[0], p_poly.edges[i].points[1], vertex_process, outline);
 
-			if (outline.size() > 1) {
-				polys.write[intersect_poly].holes.push_back(outline);
+				r_merged_brush.faces.write[inside_count].smooth = mesh_merge.faces[i].smooth;
+				r_merged_brush.faces.write[inside_count].invert = mesh_merge.faces[i].invert;
+				r_merged_brush.faces.write[inside_count].material = mesh_merge.faces[i].material_idx;
+				inside_count++;
 			}
-		}
-		_add_poly_points(p_poly, i, p_poly.edges[i].points[0], p_poly.edges[i].points[1], vertex_process, edge_process, polys);
-	}
-
-	//get rid of holes, not the most optiomal way, but also not a common case at all to be inoptimal
-	for (int i = 0; i < polys.size(); i++) {
-
-		if (!polys[i].holes.size())
-			continue;
-
-		//repeat until no more holes are left to be merged
-		while (polys[i].holes.size()) {
-
-			//try to merge a hole with the outline
-			bool added_hole = false;
-
-			for (int j = 0; j < polys[i].holes.size(); j++) {
-
-				//try hole vertices
-				int with_outline_vertex = -1;
-				int from_hole_vertex = -1;
-
-				bool found = false;
-
-				for (int k = 0; k < polys[i].holes[j].size(); k++) {
-
-					int from_idx = polys[i].holes[j][k];
-					Vector2 from = p_poly.points[from_idx].point;
-
-					//try a segment from hole vertex to outline vertices
-					from_hole_vertex = k;
-
-					bool valid = true;
-
-					for (int l = 0; l < polys[i].points.size(); l++) {
 
-						int to_idx = polys[i].points[l];
-						Vector2 to = p_poly.points[to_idx].point;
-						with_outline_vertex = l;
+			r_merged_brush._regen_face_aabbs();
 
-						//try against outline (other points) first
-
-						valid = true;
-
-						for (int m = 0; m < polys[i].points.size(); m++) {
-
-							int m_next = (m + 1) % polys[i].points.size();
-							if (m == with_outline_vertex || m_next == with_outline_vertex) //do not test with edges that share this point
-								continue;
-
-							if (Geometry::segment_intersects_segment_2d(from, to, p_poly.points[polys[i].points[m]].point, p_poly.points[polys[i].points[m_next]].point, NULL)) {
-								valid = false;
-								break;
-							}
-						}
-
-						if (!valid)
-							continue;
-
-						//try against all holes including self
-
-						for (int m = 0; m < polys[i].holes.size(); m++) {
-
-							for (int n = 0; n < polys[i].holes[m].size(); n++) {
-
-								int n_next = (n + 1) % polys[i].holes[m].size();
-								if (m == j && (n == from_hole_vertex || n_next == from_hole_vertex)) //contains vertex being tested from current hole, skip
-									continue;
-
-								if (Geometry::segment_intersects_segment_2d(from, to, p_poly.points[polys[i].holes[m][n]].point, p_poly.points[polys[i].holes[m][n_next]].point, NULL)) {
-									valid = false;
-									break;
-								}
-							}
-
-							if (!valid)
-								break;
-						}
+		} break;
 
-						if (valid) //all passed! exit loop
-							break;
-						else
-							continue; //something went wrong, go on.
-					}
+		case OPERATION_SUBSTRACTION: {
+			int face_count = 0;
 
-					if (valid) {
-						found = true; //if in the end this was valid, use it
-						break;
-					}
+			for (int i = 0; i < mesh_merge.faces.size(); i++) {
+				if (mesh_merge.faces[i].from_b && !mesh_merge.faces[i].inside) {
+					continue;
 				}
-
-				if (found) {
-
-					//hook this hole with outline, and remove from list of holes
-
-					//duplicate point
-					int insert_at = with_outline_vertex;
-					int point = polys[i].points[insert_at];
-					polys.write[i].points.insert(insert_at, point);
-					insert_at++;
-					//insert all others, outline should be backwards (must check)
-					int holesize = polys[i].holes[j].size();
-					for (int k = 0; k <= holesize; k++) {
-						int idx = (from_hole_vertex + k) % holesize;
-						int point2 = polys[i].holes[j][idx];
-						polys.write[i].points.insert(insert_at, point2);
-						insert_at++;
-					}
-
-					added_hole = true;
-					polys.write[i].holes.remove(j);
-					break; //got rid of hole, break and continue
+				if (!mesh_merge.faces[i].from_b && mesh_merge.faces[i].inside) {
+					continue;
 				}
+				face_count++;
 			}
 
-			ERR_BREAK(!added_hole);
-		}
-	}
-
-	//triangulate polygons
+			r_merged_brush.faces.resize(face_count);
 
-	for (int i = 0; i < polys.size(); i++) {
-
-		Vector<Vector2> vertices;
-		vertices.resize(polys[i].points.size());
-		for (int j = 0; j < vertices.size(); j++) {
-			vertices.write[j] = p_poly.points[polys[i].points[j]].point;
-		}
+			face_count = 0;
 
-		Vector<int> indices = Geometry::triangulate_polygon(vertices);
+			for (int i = 0; i < mesh_merge.faces.size(); i++) {
+				if (mesh_merge.faces[i].from_b && !mesh_merge.faces[i].inside) {
+					continue;
+				}
+				if (!mesh_merge.faces[i].from_b && mesh_merge.faces[i].inside) {
+					continue;
+				}
 
-		for (int j = 0; j < indices.size(); j += 3) {
+				for (int j = 0; j < 3; j++) {
+					r_merged_brush.faces.write[face_count].vertices[j] = mesh_merge.points[mesh_merge.faces[i].points[j]];
+					r_merged_brush.faces.write[face_count].uvs[j] = mesh_merge.faces[i].uvs[j];
+				}
 
-			//obtain the vertex
+				if (mesh_merge.faces[i].from_b) {
+					//invert facing of insides of B
+					SWAP(r_merged_brush.faces.write[face_count].vertices[1], r_merged_brush.faces.write[face_count].vertices[2]);
+					SWAP(r_merged_brush.faces.write[face_count].uvs[1], r_merged_brush.faces.write[face_count].uvs[2]);
+				}
 
-			Vector3 face[3];
-			Vector2 uv[3];
-			float cp = Geometry::vec2_cross(p_poly.points[polys[i].points[indices[j + 0]]].point, p_poly.points[polys[i].points[indices[j + 1]]].point, p_poly.points[polys[i].points[indices[j + 2]]].point);
-			if (Math::abs(cp) < CMP_EPSILON)
-				continue;
+				r_merged_brush.faces.write[face_count].smooth = mesh_merge.faces[i].smooth;
+				r_merged_brush.faces.write[face_count].invert = mesh_merge.faces[i].invert;
+				r_merged_brush.faces.write[face_count].material = mesh_merge.faces[i].material_idx;
+				face_count++;
+			}
 
-			for (int k = 0; k < 3; k++) {
+			r_merged_brush._regen_face_aabbs();
 
-				Vector2 p = p_poly.points[polys[i].points[indices[j + k]]].point;
-				face[k] = p_poly.to_world.xform(Vector3(p.x, p.y, 0));
-				uv[k] = p_poly.points[polys[i].points[indices[j + k]]].uv;
-			}
+		} break;
+	}
 
-			mesh.add_face(face[0], face[1], face[2], uv[0], uv[1], uv[2], p_poly.smooth, p_poly.invert, p_poly.material, p_from_b);
-		}
+	// Update the list of materials.
+	r_merged_brush.materials.resize(mesh_merge.materials.size());
+	for (const Map<Ref<Material>, int>::Element *E = mesh_merge.materials.front(); E; E = E->next()) {
+		r_merged_brush.materials.write[E->get()] = E->key();
 	}
 }
 
-//use a limit to speed up bvh and limit the depth
-#define BVH_LIMIT 8
+// CSGBrushOperation::MeshMerge
 
-int CSGBrushOperation::MeshMerge::_create_bvh(BVH *p_bvh, BVH **p_bb, int p_from, int p_size, int p_depth, int &max_depth, int &max_alloc) {
+// Use a limit to speed up bvh and limit the depth.
+#define BVH_LIMIT 8
 
-	if (p_depth > max_depth) {
-		max_depth = p_depth;
+int CSGBrushOperation::MeshMerge::_create_bvh(FaceBVH *facebvhptr, FaceBVH **facebvhptrptr, int p_from, int p_size, int p_depth, int &r_max_depth, int &r_max_alloc) {
+	if (p_depth > r_max_depth) {
+		r_max_depth = p_depth;
 	}
 
 	if (p_size == 0) {
-
 		return -1;
-	} else if (p_size <= BVH_LIMIT) {
+	}
 
+	if (p_size <= BVH_LIMIT) {
 		for (int i = 0; i < p_size - 1; i++) {
-			p_bb[p_from + i]->next = p_bb[p_from + i + 1] - p_bvh;
+			facebvhptrptr[p_from + i]->next = facebvhptrptr[p_from + i + 1] - facebvhptr;
 		}
-		return p_bb[p_from] - p_bvh;
+		return facebvhptrptr[p_from] - facebvhptr;
 	}
 
 	AABB aabb;
-	aabb = p_bb[p_from]->aabb;
+	aabb = facebvhptrptr[p_from]->aabb;
 	for (int i = 1; i < p_size; i++) {
-
-		aabb.merge_with(p_bb[p_from + i]->aabb);
+		aabb.merge_with(facebvhptrptr[p_from + i]->aabb);
 	}
 
 	int li = aabb.get_longest_axis_index();
 
 	switch (li) {
-
 		case Vector3::AXIS_X: {
-			SortArray<BVH *, BVHCmpX> sort_x;
-			sort_x.nth_element(0, p_size, p_size / 2, &p_bb[p_from]);
+			SortArray<FaceBVH *, FaceBVHCmpX> sort_x;
+			sort_x.nth_element(0, p_size, p_size / 2, &facebvhptrptr[p_from]);
 			//sort_x.sort(&p_bb[p_from],p_size);
 		} break;
+
 		case Vector3::AXIS_Y: {
-			SortArray<BVH *, BVHCmpY> sort_y;
-			sort_y.nth_element(0, p_size, p_size / 2, &p_bb[p_from]);
+			SortArray<FaceBVH *, FaceBVHCmpY> sort_y;
+			sort_y.nth_element(0, p_size, p_size / 2, &facebvhptrptr[p_from]);
 			//sort_y.sort(&p_bb[p_from],p_size);
 		} break;
+
 		case Vector3::AXIS_Z: {
-			SortArray<BVH *, BVHCmpZ> sort_z;
-			sort_z.nth_element(0, p_size, p_size / 2, &p_bb[p_from]);
+			SortArray<FaceBVH *, FaceBVHCmpZ> sort_z;
+			sort_z.nth_element(0, p_size, p_size / 2, &facebvhptrptr[p_from]);
 			//sort_z.sort(&p_bb[p_from],p_size);
-
 		} break;
 	}
 
-	int left = _create_bvh(p_bvh, p_bb, p_from, p_size / 2, p_depth + 1, max_depth, max_alloc);
-	int right = _create_bvh(p_bvh, p_bb, p_from + p_size / 2, p_size - p_size / 2, p_depth + 1, max_depth, max_alloc);
+	int left = _create_bvh(facebvhptr, facebvhptrptr, p_from, p_size / 2, p_depth + 1, r_max_depth, r_max_alloc);
+	int right = _create_bvh(facebvhptr, facebvhptrptr, p_from + p_size / 2, p_size - p_size / 2, p_depth + 1, r_max_depth, r_max_alloc);
 
-	int index = max_alloc++;
-	BVH *_new = &p_bvh[index];
+	int index = r_max_alloc++;
+	FaceBVH *_new = &facebvhptr[index];
 	_new->aabb = aabb;
 	_new->center = aabb.position + aabb.size * 0.5;
 	_new->face = -1;
@@ -1073,7 +526,28 @@ int CSGBrushOperation::MeshMerge::_create_bvh(BVH *p_bvh, BVH **p_bb, int p_from
 	return index;
 }
 
-int CSGBrushOperation::MeshMerge::_bvh_count_intersections(BVH *bvhptr, int p_max_depth, int p_bvh_first, const Vector3 &p_begin, const Vector3 &p_end, int p_exclude) const {
+void CSGBrushOperation::MeshMerge::_add_distance(List<real_t> &r_intersectionsA, List<real_t> &r_intersectionsB, bool p_from_B, real_t p_distance) const {
+	List<real_t> &intersections = p_from_B ? r_intersectionsB : r_intersectionsA;
+
+	// Check if distance exists.
+	for (const List<real_t>::Element *E = intersections.front(); E; E = E->next()) {
+		if (Math::is_equal_approx(**E, p_distance)) {
+			return;
+		}
+	}
+
+	intersections.push_back(p_distance);
+}
+
+bool CSGBrushOperation::MeshMerge::_bvh_inside(FaceBVH *facebvhptr, int p_max_depth, int p_bvh_first, int p_face_idx) const {
+	Face face = faces[p_face_idx];
+	Vector3 face_points[3] = {
+		points[face.points[0]],
+		points[face.points[1]],
+		points[face.points[2]]
+	};
+	Vector3 face_center = (face_points[0] + face_points[1] + face_points[2]) / 3.0;
+	Vector3 face_normal = Plane(face_points[0], face_points[1], face_points[2]).normal;
 
 	uint32_t *stack = (uint32_t *)alloca(sizeof(int) * p_max_depth);
 
@@ -1084,226 +558,206 @@ int CSGBrushOperation::MeshMerge::_bvh_count_intersections(BVH *bvhptr, int p_ma
 		VISIT_DONE_BIT = 3,
 		VISITED_BIT_SHIFT = 29,
 		NODE_IDX_MASK = (1 << VISITED_BIT_SHIFT) - 1,
-		VISITED_BIT_MASK = ~NODE_IDX_MASK,
-
+		VISITED_BIT_MASK = ~NODE_IDX_MASK
 	};
 
-	int intersections = 0;
+	List<real_t> intersectionsA;
+	List<real_t> intersectionsB;
 
 	int level = 0;
-
-	const Vector3 *vertexptr = points.ptr();
-	const Face *facesptr = faces.ptr();
-	AABB segment_aabb;
-	segment_aabb.position = p_begin;
-	segment_aabb.expand_to(p_end);
-
 	int pos = p_bvh_first;
-
 	stack[0] = pos;
-	while (true) {
 
+	while (true) {
 		uint32_t node = stack[level] & NODE_IDX_MASK;
-		const BVH &b = bvhptr[node];
+		const FaceBVH *current_facebvhptr = &(facebvhptr[node]);
 		bool done = false;
 
 		switch (stack[level] >> VISITED_BIT_SHIFT) {
 			case TEST_AABB_BIT: {
-
-				if (b.face >= 0) {
-
-					const BVH *bp = &b;
-
-					while (bp) {
-
-						bool valid = segment_aabb.intersects(bp->aabb) && bp->aabb.intersects_segment(p_begin, p_end);
-
-						if (valid && p_exclude != bp->face) {
-							const Face &s = facesptr[bp->face];
-							Face3 f3(vertexptr[s.points[0]], vertexptr[s.points[1]], vertexptr[s.points[2]]);
-
-							Vector3 res;
-
-							if (f3.intersects_segment(p_begin, p_end, &res)) {
-								intersections++;
+				if (current_facebvhptr->face >= 0) {
+					while (current_facebvhptr) {
+						if (p_face_idx != current_facebvhptr->face &&
+								current_facebvhptr->aabb.intersects_ray(face_center, face_normal)) {
+							const Face &current_face = faces[current_facebvhptr->face];
+							Vector3 current_points[3] = {
+								points[current_face.points[0]],
+								points[current_face.points[1]],
+								points[current_face.points[2]]
+							};
+							Vector3 current_normal = Plane(current_points[0], current_points[1], current_points[2]).normal;
+							Vector3 intersection_point;
+
+							// Check if faces are co-planar.
+							if ((current_normal - face_normal).length_squared() < CMP_EPSILON2 &&
+									is_point_in_triangle(face_center, current_points)) {
+								// Only add an intersection if not a B face.
+								if (!face.from_b) {
+									_add_distance(intersectionsA, intersectionsB, current_face.from_b, 0);
+								}
+							} else if (ray_intersects_triangle(face_center, face_normal, current_points, CMP_EPSILON, intersection_point)) {
+								real_t distance = (intersection_point - face_center).length();
+								_add_distance(intersectionsA, intersectionsB, current_face.from_b, distance);
 							}
 						}
-						if (bp->next != -1) {
-							bp = &bvhptr[bp->next];
+
+						if (current_facebvhptr->next != -1) {
+							current_facebvhptr = &facebvhptr[current_facebvhptr->next];
 						} else {
-							bp = NULL;
+							current_facebvhptr = nullptr;
 						}
 					}
 
 					stack[level] = (VISIT_DONE_BIT << VISITED_BIT_SHIFT) | node;
 
 				} else {
-
-					bool valid = segment_aabb.intersects(b.aabb) && b.aabb.intersects_segment(p_begin, p_end);
+					bool valid = current_facebvhptr->aabb.intersects_ray(face_center, face_normal);
 
 					if (!valid) {
-
 						stack[level] = (VISIT_DONE_BIT << VISITED_BIT_SHIFT) | node;
-
 					} else {
 						stack[level] = (VISIT_LEFT_BIT << VISITED_BIT_SHIFT) | node;
 					}
 				}
 				continue;
 			}
-			case VISIT_LEFT_BIT: {
 
+			case VISIT_LEFT_BIT: {
 				stack[level] = (VISIT_RIGHT_BIT << VISITED_BIT_SHIFT) | node;
-				stack[level + 1] = b.left | TEST_AABB_BIT;
+				stack[level + 1] = current_facebvhptr->left | TEST_AABB_BIT;
 				level++;
 				continue;
 			}
-			case VISIT_RIGHT_BIT: {
 
+			case VISIT_RIGHT_BIT: {
 				stack[level] = (VISIT_DONE_BIT << VISITED_BIT_SHIFT) | node;
-				stack[level + 1] = b.right | TEST_AABB_BIT;
+				stack[level + 1] = current_facebvhptr->right | TEST_AABB_BIT;
 				level++;
 				continue;
 			}
-			case VISIT_DONE_BIT: {
 
+			case VISIT_DONE_BIT: {
 				if (level == 0) {
 					done = true;
 					break;
-				} else
+				} else {
 					level--;
+				}
 				continue;
 			}
 		}
 
-		if (done)
+		if (done) {
 			break;
+		}
 	}
 
-	return intersections;
+	// Inside if face normal intersects other faces an odd number of times.
+	return (intersectionsA.size() + intersectionsB.size()) & 1;
 }
 
 void CSGBrushOperation::MeshMerge::mark_inside_faces() {
+	// Mark faces that are inside. This helps later do the boolean ops when merging.
+	// This approach is very brute force with a bunch of optimizations,
+	// such as BVH and pre AABB intersection test.
 
-	// mark faces that are inside. This helps later do the boolean ops when merging.
-	// this approach is very brute force (with a bunch of optimizatios, such as BVH and pre AABB intersection test)
-
-	AABB aabb;
-
-	for (int i = 0; i < points.size(); i++) {
-		if (i == 0) {
-			aabb.position = points[i];
-		} else {
-			aabb.expand_to(points[i]);
-		}
-	}
-
-	float max_distance = aabb.size.length() * 1.2;
+	Vector<FaceBVH> bvhvec;
+	bvhvec.resize(faces.size() * 3); // Will never be larger than this (TODO: Make better)
+	FaceBVH *facebvh = bvhvec.ptrw();
 
-	Vector<BVH> bvhvec;
-	bvhvec.resize(faces.size() * 3); //will never be larger than this (todo make better)
-	BVH *bvh = bvhvec.ptrw();
-
-	AABB faces_a;
-	AABB faces_b;
+	AABB aabb_a;
+	AABB aabb_b;
 
 	bool first_a = true;
 	bool first_b = true;
 
 	for (int i = 0; i < faces.size(); i++) {
-		bvh[i].left = -1;
-		bvh[i].right = -1;
-		bvh[i].face = i;
-		bvh[i].aabb.position = points[faces[i].points[0]];
-		bvh[i].aabb.expand_to(points[faces[i].points[1]]);
-		bvh[i].aabb.expand_to(points[faces[i].points[2]]);
-		bvh[i].center = bvh[i].aabb.position + bvh[i].aabb.size * 0.5;
-		bvh[i].next = -1;
+		facebvh[i].left = -1;
+		facebvh[i].right = -1;
+		facebvh[i].face = i;
+		facebvh[i].aabb.position = points[faces[i].points[0]];
+		facebvh[i].aabb.expand_to(points[faces[i].points[1]]);
+		facebvh[i].aabb.expand_to(points[faces[i].points[2]]);
+		facebvh[i].center = facebvh[i].aabb.position + facebvh[i].aabb.size * 0.5;
+		facebvh[i].aabb.grow_by(vertex_snap);
+		facebvh[i].next = -1;
+
 		if (faces[i].from_b) {
 			if (first_b) {
-				faces_b = bvh[i].aabb;
+				aabb_b = facebvh[i].aabb;
 				first_b = false;
 			} else {
-				faces_b.merge_with(bvh[i].aabb);
+				aabb_b.merge_with(facebvh[i].aabb);
 			}
 		} else {
 			if (first_a) {
-				faces_a = bvh[i].aabb;
+				aabb_a = facebvh[i].aabb;
 				first_a = false;
 			} else {
-				faces_a.merge_with(bvh[i].aabb);
+				aabb_a.merge_with(facebvh[i].aabb);
 			}
 		}
 	}
 
-	AABB intersection_aabb = faces_a.intersection(faces_b);
-	intersection_aabb.grow_by(intersection_aabb.get_longest_axis_size() * 0.01); //grow a little, avoid numerical error
+	AABB intersection_aabb = aabb_a.intersection(aabb_b);
 
-	if (intersection_aabb.size == Vector3()) //AABB do not intersect, so neither do shapes.
+	// Check if shape AABBs intersect.
+	if (intersection_aabb.size == Vector3()) {
 		return;
+	}
 
-	Vector<BVH *> bvhtrvec;
+	Vector<FaceBVH *> bvhtrvec;
 	bvhtrvec.resize(faces.size());
-	BVH **bvhptr = bvhtrvec.ptrw();
+	FaceBVH **bvhptr = bvhtrvec.ptrw();
 	for (int i = 0; i < faces.size(); i++) {
-
-		bvhptr[i] = &bvh[i];
+		bvhptr[i] = &facebvh[i];
 	}
 
 	int max_depth = 0;
 	int max_alloc = faces.size();
-	_create_bvh(bvh, bvhptr, 0, faces.size(), 1, max_depth, max_alloc);
+	_create_bvh(facebvh, bvhptr, 0, faces.size(), 1, max_depth, max_alloc);
 
 	for (int i = 0; i < faces.size(); i++) {
+		// Check if face AABB intersects the intersection AABB.
+		if (!intersection_aabb.intersects_inclusive(facebvh[i].aabb)) {
+			continue;
+		}
 
-		if (!intersection_aabb.intersects(bvh[i].aabb))
-			continue; //not in AABB intersection, so not in face intersection
-		Vector3 center = points[faces[i].points[0]];
-		center += points[faces[i].points[1]];
-		center += points[faces[i].points[2]];
-		center /= 3.0;
-
-		Plane plane(points[faces[i].points[0]], points[faces[i].points[1]], points[faces[i].points[2]]);
-		Vector3 target = center + plane.normal * max_distance + Vector3(0.0001234, 0.000512, 0.00013423); //reduce chance of edge hits by doing a small increment
-
-		int intersections = _bvh_count_intersections(bvh, max_depth, max_alloc - 1, center, target, i);
-
-		if (intersections & 1) {
+		if (_bvh_inside(facebvh, max_depth, max_alloc - 1, i)) {
 			faces.write[i].inside = true;
 		}
 	}
 }
 
-void CSGBrushOperation::MeshMerge::add_face(const Vector3 &p_a, const Vector3 &p_b, const Vector3 &p_c, const Vector2 &p_uv_a, const Vector2 &p_uv_b, const Vector2 &p_uv_c, bool p_smooth, bool p_invert, const Ref<Material> &p_material, bool p_from_b) {
-
-	Vector3 src_points[3] = { p_a, p_b, p_c };
-	Vector2 src_uvs[3] = { p_uv_a, p_uv_b, p_uv_c };
+void CSGBrushOperation::MeshMerge::add_face(const Vector3 p_points[], const Vector2 p_uvs[], bool p_smooth, bool p_invert, const Ref<Material> &p_material, bool p_from_b) {
 	int indices[3];
 	for (int i = 0; i < 3; i++) {
-
 		VertexKey vk;
-		vk.x = int((double(src_points[i].x) + double(vertex_snap) * 0.31234) / double(vertex_snap));
-		vk.y = int((double(src_points[i].y) + double(vertex_snap) * 0.31234) / double(vertex_snap));
-		vk.z = int((double(src_points[i].z) + double(vertex_snap) * 0.31234) / double(vertex_snap));
+		vk.x = int((double(p_points[i].x) + double(vertex_snap) * 0.31234) / double(vertex_snap));
+		vk.y = int((double(p_points[i].y) + double(vertex_snap) * 0.31234) / double(vertex_snap));
+		vk.z = int((double(p_points[i].z) + double(vertex_snap) * 0.31234) / double(vertex_snap));
 
 		int res;
 		if (snap_cache.lookup(vk, res)) {
 			indices[i] = res;
 		} else {
 			indices[i] = points.size();
-			points.push_back(src_points[i]);
+			points.push_back(p_points[i]);
 			snap_cache.set(vk, indices[i]);
 		}
 	}
 
-	if (indices[0] == indices[2] || indices[0] == indices[1] || indices[1] == indices[2])
-		return; //not adding degenerate
+	// Don't add degenerate faces.
+	if (indices[0] == indices[2] || indices[0] == indices[1] || indices[1] == indices[2]) {
+		return;
+	}
 
 	MeshMerge::Face face;
 	face.from_b = p_from_b;
 	face.inside = false;
 	face.smooth = p_smooth;
 	face.invert = p_invert;
+
 	if (p_material.is_valid()) {
 		if (!materials.has(p_material)) {
 			face.material_idx = materials.size();
@@ -1316,205 +770,710 @@ void CSGBrushOperation::MeshMerge::add_face(const Vector3 &p_a, const Vector3 &p
 	}
 
 	for (int k = 0; k < 3; k++) {
-
 		face.points[k] = indices[k];
-		face.uvs[k] = src_uvs[k];
-		;
+		face.uvs[k] = p_uvs[k];
 	}
 
 	faces.push_back(face);
 }
 
-void CSGBrushOperation::merge_brushes(Operation p_operation, const CSGBrush &p_A, const CSGBrush &p_B, CSGBrush &result, float p_snap) {
-
-	CallbackData cd;
-	cd.self = this;
-	cd.A = &p_A;
-	cd.B = &p_B;
+// CSGBrushOperation::Build2DFaces
 
-	MeshMerge mesh_merge;
-	mesh_merge.vertex_snap = p_snap;
-
-	//check intersections between faces. Use AABB to speed up precheck
-	//this generates list of buildpolys and clips them.
-	//this was originally BVH optimized, but its not really worth it.
-	for (int i = 0; i < p_A.faces.size(); i++) {
-		cd.face_a = i;
-		for (int j = 0; j < p_B.faces.size(); j++) {
-			if (p_A.faces[i].aabb.intersects(p_B.faces[j].aabb)) {
-				_collision_callback(&p_A, i, cd.build_polys_A, &p_B, j, cd.build_polys_B, mesh_merge);
-			}
+int CSGBrushOperation::Build2DFaces::_get_point_idx(const Vector2 &p_point) {
+	for (int vertex_idx = 0; vertex_idx < vertices.size(); ++vertex_idx) {
+		if ((p_point - vertices[vertex_idx].point).length_squared() < vertex_snap2) {
+			return vertex_idx;
 		}
 	}
+	return -1;
+}
 
-	//merge the already cliped polys back to 3D
-	for (Map<int, BuildPoly>::Element *E = cd.build_polys_A.front(); E; E = E->next()) {
-		_merge_poly(mesh_merge, E->key(), E->get(), false);
+int CSGBrushOperation::Build2DFaces::_add_vertex(const Vertex2D &p_vertex) {
+	// Check if vertex exists.
+	int vertex_id = _get_point_idx(p_vertex.point);
+	if (vertex_id != -1) {
+		return vertex_id;
 	}
 
-	for (Map<int, BuildPoly>::Element *E = cd.build_polys_B.front(); E; E = E->next()) {
-		_merge_poly(mesh_merge, E->key(), E->get(), true);
-	}
+	vertices.push_back(p_vertex);
+	return vertices.size() - 1;
+}
 
-	//merge the non clipped faces back
+void CSGBrushOperation::Build2DFaces::_add_vertex_idx_sorted(Vector<int> &r_vertex_indices, int p_new_vertex_index) {
+	if (p_new_vertex_index >= 0 && r_vertex_indices.find(p_new_vertex_index) == -1) {
+		ERR_FAIL_COND_MSG(p_new_vertex_index >= vertices.size(), "Invalid vertex index.");
 
-	for (int i = 0; i < p_A.faces.size(); i++) {
+		// The first vertex.
+		if (r_vertex_indices.size() == 0) {
+			// Simply add it.
+			r_vertex_indices.push_back(p_new_vertex_index);
+			return;
+		}
 
-		if (cd.build_polys_A.has(i))
-			continue; //made from buildpoly, skipping
+		// The second vertex.
+		if (r_vertex_indices.size() == 1) {
+			Vector2 first_point = vertices[r_vertex_indices[0]].point;
+			Vector2 new_point = vertices[p_new_vertex_index].point;
 
-		Vector3 points[3];
-		Vector2 uvs[3];
-		for (int j = 0; j < 3; j++) {
-			points[j] = p_A.faces[i].vertices[j];
-			uvs[j] = p_A.faces[i].uvs[j];
+			// Sort along the axis with the greatest difference.
+			int axis = 0;
+			if (Math::abs(new_point.x - first_point.x) < Math::abs(new_point.y - first_point.y)) {
+				axis = 1;
+			}
+
+			// Add it to the beginning or the end appropriately.
+			if (new_point[axis] < first_point[axis]) {
+				r_vertex_indices.insert(0, p_new_vertex_index);
+			} else {
+				r_vertex_indices.push_back(p_new_vertex_index);
+			}
+
+			return;
 		}
-		Ref<Material> material;
-		if (p_A.faces[i].material != -1) {
-			material = p_A.materials[p_A.faces[i].material];
+
+		// Third or later vertices.
+		Vector2 first_point = vertices[r_vertex_indices[0]].point;
+		Vector2 last_point = vertices[r_vertex_indices[r_vertex_indices.size() - 1]].point;
+		Vector2 new_point = vertices[p_new_vertex_index].point;
+
+		// Determine axis being sorted against i.e. the axis with the greatest difference.
+		int axis = 0;
+		if (Math::abs(last_point.x - first_point.x) < Math::abs(last_point.y - first_point.y)) {
+			axis = 1;
 		}
-		mesh_merge.add_face(points[0], points[1], points[2], uvs[0], uvs[1], uvs[2], p_A.faces[i].smooth, p_A.faces[i].invert, material, false);
+
+		// Insert the point at the appropriate index.
+		for (int insert_idx = 0; insert_idx < r_vertex_indices.size(); ++insert_idx) {
+			Vector2 insert_point = vertices[r_vertex_indices[insert_idx]].point;
+			if (new_point[axis] < insert_point[axis]) {
+				r_vertex_indices.insert(insert_idx, p_new_vertex_index);
+				return;
+			}
+		}
+
+		// New largest, add it to the end.
+		r_vertex_indices.push_back(p_new_vertex_index);
 	}
+}
 
-	for (int i = 0; i < p_B.faces.size(); i++) {
+void CSGBrushOperation::Build2DFaces::_merge_faces(const Vector<int> &p_segment_indices) {
+	int segments = p_segment_indices.size() - 1;
+	if (segments < 2) {
+		return;
+	}
 
-		if (cd.build_polys_B.has(i))
-			continue; //made from buildpoly, skipping
+	// Faces around an inner vertex are merged by moving the inner vertex to the first vertex.
+	for (int sorted_idx = 1; sorted_idx < segments; ++sorted_idx) {
+		int closest_idx = 0;
+		int inner_idx = p_segment_indices[sorted_idx];
 
-		Vector3 points[3];
-		Vector2 uvs[3];
-		for (int j = 0; j < 3; j++) {
-			points[j] = p_B.faces[i].vertices[j];
-			uvs[j] = p_B.faces[i].uvs[j];
+		if (sorted_idx > segments / 2) {
+			// Merge to other segment end.
+			closest_idx = segments;
+			// Reverse the merge order.
+			inner_idx = p_segment_indices[segments + segments / 2 - sorted_idx];
 		}
-		Ref<Material> material;
-		if (p_B.faces[i].material != -1) {
-			material = p_B.materials[p_B.faces[i].material];
+
+		// Find the mergeable faces.
+		Vector<int> merge_faces_idx;
+		Vector<Face2D> merge_faces;
+		Vector<int> merge_faces_inner_vertex_idx;
+		for (int face_idx = 0; face_idx < faces.size(); ++face_idx) {
+			for (int face_vertex_idx = 0; face_vertex_idx < 3; ++face_vertex_idx) {
+				if (faces[face_idx].vertex_idx[face_vertex_idx] == inner_idx) {
+					merge_faces_idx.push_back(face_idx);
+					merge_faces.push_back(faces[face_idx]);
+					merge_faces_inner_vertex_idx.push_back(face_vertex_idx);
+				}
+			}
 		}
-		mesh_merge.add_face(points[0], points[1], points[2], uvs[0], uvs[1], uvs[2], p_B.faces[i].smooth, p_B.faces[i].invert, material, true);
-	}
 
-	//mark faces that ended up inside the intersection
-	mesh_merge.mark_inside_faces();
+		Vector<int> degenerate_points;
 
-	//regen new brush to start filling it again
-	result.clear();
+		// Create the new faces.
+		for (int merge_idx = 0; merge_idx < merge_faces.size(); ++merge_idx) {
+			int outer_edge_idx[2];
+			outer_edge_idx[0] = merge_faces[merge_idx].vertex_idx[(merge_faces_inner_vertex_idx[merge_idx] + 1) % 3];
+			outer_edge_idx[1] = merge_faces[merge_idx].vertex_idx[(merge_faces_inner_vertex_idx[merge_idx] + 2) % 3];
 
-	switch (p_operation) {
+			// Skip flattened faces.
+			if (outer_edge_idx[0] == p_segment_indices[closest_idx] ||
+					outer_edge_idx[1] == p_segment_indices[closest_idx]) {
+				continue;
+			}
 
-		case OPERATION_UNION: {
+			//Don't create degenerate triangles.
+			Vector2 edge1[2] = {
+				vertices[outer_edge_idx[0]].point,
+				vertices[p_segment_indices[closest_idx]].point
+			};
+			Vector2 edge2[2] = {
+				vertices[outer_edge_idx[1]].point,
+				vertices[p_segment_indices[closest_idx]].point
+			};
+			if (are_segements_parallel(edge1, edge2, vertex_snap2)) {
+				if (!degenerate_points.find(outer_edge_idx[0])) {
+					degenerate_points.push_back(outer_edge_idx[0]);
+				}
+				if (!degenerate_points.find(outer_edge_idx[1])) {
+					degenerate_points.push_back(outer_edge_idx[1]);
+				}
+				continue;
+			}
 
-			int outside_count = 0;
+			// Create new faces.
+			Face2D new_face;
+			new_face.vertex_idx[0] = p_segment_indices[closest_idx];
+			new_face.vertex_idx[1] = outer_edge_idx[0];
+			new_face.vertex_idx[2] = outer_edge_idx[1];
+			faces.push_back(new_face);
+		}
 
-			for (int i = 0; i < mesh_merge.faces.size(); i++) {
-				if (mesh_merge.faces[i].inside)
+		// Delete the old faces in reverse index order.
+		merge_faces_idx.sort();
+		merge_faces_idx.invert();
+		for (int i = 0; i < merge_faces_idx.size(); ++i) {
+			faces.remove(merge_faces_idx[i]);
+		}
+
+		if (degenerate_points.size() == 0) {
+			continue;
+		}
+
+		// Split faces using degenerate points.
+		for (int face_idx = 0; face_idx < faces.size(); ++face_idx) {
+			Face2D face = faces[face_idx];
+			Vertex2D face_vertices[3] = {
+				vertices[face.vertex_idx[0]],
+				vertices[face.vertex_idx[1]],
+				vertices[face.vertex_idx[2]]
+			};
+			Vector2 face_points[3] = {
+				face_vertices[0].point,
+				face_vertices[1].point,
+				face_vertices[2].point
+			};
+
+			for (int point_idx = 0; point_idx < degenerate_points.size(); ++point_idx) {
+				int degenerate_idx = degenerate_points[point_idx];
+				Vector2 point_2D = vertices[degenerate_idx].point;
+
+				// Check if point is existing face vertex.
+				bool existing = false;
+				for (int i = 0; i < 3; ++i) {
+					if ((point_2D - face_vertices[i].point).length_squared() < vertex_snap2) {
+						existing = true;
+						break;
+					}
+				}
+				if (existing) {
 					continue;
+				}
 
-				outside_count++;
+				// Check if point is on an each edge.
+				for (int face_edge_idx = 0; face_edge_idx < 3; ++face_edge_idx) {
+					Vector2 edge_points[2] = {
+						face_points[face_edge_idx],
+						face_points[(face_edge_idx + 1) % 3]
+					};
+					Vector2 closest_point = Geometry2D::get_closest_point_to_segment(point_2D, edge_points);
+
+					if ((closest_point - point_2D).length_squared() < vertex_snap2) {
+						int opposite_vertex_idx = face.vertex_idx[(face_edge_idx + 2) % 3];
+
+						// If new vertex snaps to degenerate vertex, just delete this face.
+						if (degenerate_idx == opposite_vertex_idx) {
+							faces.remove(face_idx);
+							// Update index.
+							--face_idx;
+							break;
+						}
+
+						// Create two new faces around the new edge and remove this face.
+						// The new edge is the last edge.
+						Face2D left_face;
+						left_face.vertex_idx[0] = degenerate_idx;
+						left_face.vertex_idx[1] = face.vertex_idx[(face_edge_idx + 1) % 3];
+						left_face.vertex_idx[2] = opposite_vertex_idx;
+						Face2D right_face;
+						right_face.vertex_idx[0] = opposite_vertex_idx;
+						right_face.vertex_idx[1] = face.vertex_idx[face_edge_idx];
+						right_face.vertex_idx[2] = degenerate_idx;
+						faces.remove(face_idx);
+						faces.insert(face_idx, right_face);
+						faces.insert(face_idx, left_face);
+
+						// Don't check against the new faces.
+						++face_idx;
+
+						// No need to check other edges.
+						break;
+					}
+				}
 			}
+		}
+	}
+}
 
-			result.faces.resize(outside_count);
+void CSGBrushOperation::Build2DFaces::_find_edge_intersections(const Vector2 p_segment_points[2], Vector<int> &r_segment_indices) {
+	// For each face.
+	for (int face_idx = 0; face_idx < faces.size(); ++face_idx) {
+		Face2D face = faces[face_idx];
+		Vertex2D face_vertices[3] = {
+			vertices[face.vertex_idx[0]],
+			vertices[face.vertex_idx[1]],
+			vertices[face.vertex_idx[2]]
+		};
+
+		// Check each edge.
+		for (int face_edge_idx = 0; face_edge_idx < 3; ++face_edge_idx) {
+			Vector2 edge_points[2] = {
+				face_vertices[face_edge_idx].point,
+				face_vertices[(face_edge_idx + 1) % 3].point
+			};
+			Vector2 edge_uvs[2] = {
+				face_vertices[face_edge_idx].uv,
+				face_vertices[(face_edge_idx + 1) % 3].uv
+			};
+			Vector2 intersection_point;
+
+			// First check if the ends of the segment are on the edge.
+			bool on_edge = false;
+			for (int edge_point_idx = 0; edge_point_idx < 2; ++edge_point_idx) {
+				intersection_point = Geometry2D::get_closest_point_to_segment(p_segment_points[edge_point_idx], edge_points);
+				if ((intersection_point - p_segment_points[edge_point_idx]).length_squared() < vertex_snap2) {
+					on_edge = true;
+					break;
+				}
+			}
 
-			outside_count = 0;
+			// Else check if the segment intersects the edge.
+			if (on_edge || Geometry2D::segment_intersects_segment(p_segment_points[0], p_segment_points[1], edge_points[0], edge_points[1], &intersection_point)) {
+				// Check if intersection point is an edge point.
+				if ((intersection_point - edge_points[0]).length_squared() < vertex_snap2 ||
+						(intersection_point - edge_points[1]).length_squared() < vertex_snap2) {
+					continue;
+				}
 
-			for (int i = 0; i < mesh_merge.faces.size(); i++) {
-				if (mesh_merge.faces[i].inside)
+				// Check if edge exists, by checking if the intersecting segment is parallel to the edge.
+				if (are_segements_parallel(p_segment_points, edge_points, vertex_snap2)) {
 					continue;
-				for (int j = 0; j < 3; j++) {
-					result.faces.write[outside_count].vertices[j] = mesh_merge.points[mesh_merge.faces[i].points[j]];
-					result.faces.write[outside_count].uvs[j] = mesh_merge.faces[i].uvs[j];
 				}
 
-				result.faces.write[outside_count].smooth = mesh_merge.faces[i].smooth;
-				result.faces.write[outside_count].invert = mesh_merge.faces[i].invert;
-				result.faces.write[outside_count].material = mesh_merge.faces[i].material_idx;
-				outside_count++;
+				// Add the intersection point as a new vertex.
+				Vertex2D new_vertex;
+				new_vertex.point = intersection_point;
+				new_vertex.uv = interpolate_segment_uv(edge_points, edge_uvs, intersection_point);
+				int new_vertex_idx = _add_vertex(new_vertex);
+				int opposite_vertex_idx = face.vertex_idx[(face_edge_idx + 2) % 3];
+				_add_vertex_idx_sorted(r_segment_indices, new_vertex_idx);
+
+				// If new vertex snaps to opposite vertex, just delete this face.
+				if (new_vertex_idx == opposite_vertex_idx) {
+					faces.remove(face_idx);
+					// Update index.
+					--face_idx;
+					break;
+				}
+
+				// If opposite point is on the segemnt, add its index to segment indices too.
+				Vector2 closest_point = Geometry2D::get_closest_point_to_segment(vertices[opposite_vertex_idx].point, p_segment_points);
+				if ((closest_point - vertices[opposite_vertex_idx].point).length_squared() < vertex_snap2) {
+					_add_vertex_idx_sorted(r_segment_indices, opposite_vertex_idx);
+				}
+
+				// Create two new faces around the new edge and remove this face.
+				// The new edge is the last edge.
+				Face2D left_face;
+				left_face.vertex_idx[0] = new_vertex_idx;
+				left_face.vertex_idx[1] = face.vertex_idx[(face_edge_idx + 1) % 3];
+				left_face.vertex_idx[2] = opposite_vertex_idx;
+				Face2D right_face;
+				right_face.vertex_idx[0] = opposite_vertex_idx;
+				right_face.vertex_idx[1] = face.vertex_idx[face_edge_idx];
+				right_face.vertex_idx[2] = new_vertex_idx;
+				faces.remove(face_idx);
+				faces.insert(face_idx, right_face);
+				faces.insert(face_idx, left_face);
+
+				// Check against the new faces.
+				--face_idx;
+				break;
 			}
+		}
+	}
+}
 
-			result._regen_face_aabbs();
+int CSGBrushOperation::Build2DFaces::_insert_point(const Vector2 &p_point) {
+	int new_vertex_idx = -1;
+
+	for (int face_idx = 0; face_idx < faces.size(); ++face_idx) {
+		Face2D face = faces[face_idx];
+		Vertex2D face_vertices[3] = {
+			vertices[face.vertex_idx[0]],
+			vertices[face.vertex_idx[1]],
+			vertices[face.vertex_idx[2]]
+		};
+		Vector2 points[3] = {
+			face_vertices[0].point,
+			face_vertices[1].point,
+			face_vertices[2].point
+		};
+		Vector2 uvs[3] = {
+			face_vertices[0].uv,
+			face_vertices[1].uv,
+			face_vertices[2].uv
+		};
+
+		// Skip degenerate triangles.
+		if (is_triangle_degenerate(points, vertex_snap2)) {
+			continue;
+		}
 
-		} break;
-		case OPERATION_INTERSECTION: {
+		// Check if point is existing face vertex.
+		for (int i = 0; i < 3; ++i) {
+			if ((p_point - face_vertices[i].point).length_squared() < vertex_snap2) {
+				return face.vertex_idx[i];
+			}
+		}
 
-			int inside_count = 0;
+		// Check if point is on an each edge.
+		bool on_edge = false;
+		for (int face_edge_idx = 0; face_edge_idx < 3; ++face_edge_idx) {
+			Vector2 edge_points[2] = {
+				points[face_edge_idx],
+				points[(face_edge_idx + 1) % 3]
+			};
+			Vector2 edge_uvs[2] = {
+				uvs[face_edge_idx],
+				uvs[(face_edge_idx + 1) % 3]
+			};
+
+			Vector2 closest_point = Geometry2D::get_closest_point_to_segment(p_point, edge_points);
+			if ((closest_point - p_point).length_squared() < vertex_snap2) {
+				on_edge = true;
+
+				// Add the point as a new vertex.
+				Vertex2D new_vertex;
+				new_vertex.point = p_point;
+				new_vertex.uv = interpolate_segment_uv(edge_points, edge_uvs, p_point);
+				new_vertex_idx = _add_vertex(new_vertex);
+				int opposite_vertex_idx = face.vertex_idx[(face_edge_idx + 2) % 3];
+
+				// If new vertex snaps to opposite vertex, just delete this face.
+				if (new_vertex_idx == opposite_vertex_idx) {
+					faces.remove(face_idx);
+					// Update index.
+					--face_idx;
+					break;
+				}
 
-			for (int i = 0; i < mesh_merge.faces.size(); i++) {
-				if (!mesh_merge.faces[i].inside)
+				// Don't create degenerate triangles.
+				Vector2 split_edge1[2] = { vertices[new_vertex_idx].point, edge_points[0] };
+				Vector2 split_edge2[2] = { vertices[new_vertex_idx].point, edge_points[1] };
+				Vector2 new_edge[2] = { vertices[new_vertex_idx].point, vertices[opposite_vertex_idx].point };
+				if (are_segements_parallel(split_edge1, new_edge, vertex_snap2) &&
+						are_segements_parallel(split_edge2, new_edge, vertex_snap2)) {
+					break;
+				}
+
+				// Create two new faces around the new edge and remove this face.
+				// The new edge is the last edge.
+				Face2D left_face;
+				left_face.vertex_idx[0] = new_vertex_idx;
+				left_face.vertex_idx[1] = face.vertex_idx[(face_edge_idx + 1) % 3];
+				left_face.vertex_idx[2] = opposite_vertex_idx;
+				Face2D right_face;
+				right_face.vertex_idx[0] = opposite_vertex_idx;
+				right_face.vertex_idx[1] = face.vertex_idx[face_edge_idx];
+				right_face.vertex_idx[2] = new_vertex_idx;
+				faces.remove(face_idx);
+				faces.insert(face_idx, right_face);
+				faces.insert(face_idx, left_face);
+
+				// Don't check against the new faces.
+				++face_idx;
+
+				// No need to check other edges.
+				break;
+			}
+		}
+
+		// If not on an edge, check if the point is inside the face.
+		if (!on_edge && Geometry2D::is_point_in_triangle(p_point, face_vertices[0].point, face_vertices[1].point, face_vertices[2].point)) {
+			// Add the point as a new vertex.
+			Vertex2D new_vertex;
+			new_vertex.point = p_point;
+			new_vertex.uv = interpolate_triangle_uv(points, uvs, p_point);
+			new_vertex_idx = _add_vertex(new_vertex);
+
+			// Create three new faces around this point and remove this face.
+			// The new vertex is the last vertex.
+			for (int i = 0; i < 3; ++i) {
+				// Don't create degenerate triangles.
+				Vector2 new_points[3] = { points[i], points[(i + 1) % 3], vertices[new_vertex_idx].point };
+				if (is_triangle_degenerate(new_points, vertex_snap2)) {
 					continue;
+				}
 
-				inside_count++;
+				Face2D new_face;
+				new_face.vertex_idx[0] = face.vertex_idx[i];
+				new_face.vertex_idx[1] = face.vertex_idx[(i + 1) % 3];
+				new_face.vertex_idx[2] = new_vertex_idx;
+				faces.push_back(new_face);
 			}
+			faces.remove(face_idx);
 
-			result.faces.resize(inside_count);
+			// No need to check other faces.
+			break;
+		}
+	}
 
-			inside_count = 0;
+	return new_vertex_idx;
+}
 
-			for (int i = 0; i < mesh_merge.faces.size(); i++) {
-				if (!mesh_merge.faces[i].inside)
-					continue;
-				for (int j = 0; j < 3; j++) {
-					result.faces.write[inside_count].vertices[j] = mesh_merge.points[mesh_merge.faces[i].points[j]];
-					result.faces.write[inside_count].uvs[j] = mesh_merge.faces[i].uvs[j];
-				}
+void CSGBrushOperation::Build2DFaces::insert(const CSGBrush &p_brush, int p_face_idx) {
+	// Find edge points that cross the plane and face points that are in the plane.
+	// Map those points to 2D.
+	// Create new faces from those points.
 
-				result.faces.write[inside_count].smooth = mesh_merge.faces[i].smooth;
-				result.faces.write[inside_count].invert = mesh_merge.faces[i].invert;
-				result.faces.write[inside_count].material = mesh_merge.faces[i].material_idx;
-				inside_count++;
+	Vector2 points_2D[3];
+	int points_count = 0;
+
+	for (int i = 0; i < 3; i++) {
+		Vector3 point_3D = p_brush.faces[p_face_idx].vertices[i];
+
+		if (plane.has_point(point_3D)) {
+			// Point is in the plane, add it.
+			Vector3 point_2D = plane.project(point_3D);
+			point_2D = to_2D.xform(point_2D);
+			points_2D[points_count++] = Vector2(point_2D.x, point_2D.y);
+
+		} else {
+			Vector3 next_point_3D = p_brush.faces[p_face_idx].vertices[(i + 1) % 3];
+
+			if (plane.has_point(next_point_3D)) {
+				continue; // Next point is in plane, it will be added separately.
+			}
+			if (plane.is_point_over(point_3D) == plane.is_point_over(next_point_3D)) {
+				continue; // Both points on the same side of the plane, ignore.
 			}
 
-			result._regen_face_aabbs();
+			// Edge crosses the plane, find and add the intersection point.
+			Vector3 point_2D;
+			if (plane.intersects_segment(point_3D, next_point_3D, &point_2D)) {
+				point_2D = to_2D.xform(point_2D);
+				points_2D[points_count++] = Vector2(point_2D.x, point_2D.y);
+			}
+		}
+	}
 
-		} break;
-		case OPERATION_SUBSTRACTION: {
+	Vector<int> segment_indices;
+	Vector2 segment[2];
+	int inserted_index[3] = { -1, -1, -1 };
 
-			int face_count = 0;
+	// Insert points.
+	for (int i = 0; i < points_count; ++i) {
+		inserted_index[i] = _insert_point(points_2D[i]);
+	}
 
-			for (int i = 0; i < mesh_merge.faces.size(); i++) {
-				if (mesh_merge.faces[i].from_b && !mesh_merge.faces[i].inside)
-					continue;
-				if (!mesh_merge.faces[i].from_b && mesh_merge.faces[i].inside)
-					continue;
+	if (points_count == 2) {
+		// Insert a single segment.
+		segment[0] = points_2D[0];
+		segment[1] = points_2D[1];
+		_find_edge_intersections(segment, segment_indices);
+		for (int i = 0; i < 2; ++i) {
+			_add_vertex_idx_sorted(segment_indices, inserted_index[i]);
+		}
+		_merge_faces(segment_indices);
+	}
 
-				face_count++;
+	if (points_count == 3) {
+		// Insert three segments.
+		for (int edge_idx = 0; edge_idx < 3; ++edge_idx) {
+			segment[0] = points_2D[edge_idx];
+			segment[1] = points_2D[(edge_idx + 1) % 3];
+			_find_edge_intersections(segment, segment_indices);
+			for (int i = 0; i < 2; ++i) {
+				_add_vertex_idx_sorted(segment_indices, inserted_index[(edge_idx + i) % 3]);
 			}
+			_merge_faces(segment_indices);
+			segment_indices.clear();
+		}
+	}
+}
 
-			result.faces.resize(face_count);
+void CSGBrushOperation::Build2DFaces::addFacesToMesh(MeshMerge &r_mesh_merge, bool p_smooth, bool p_invert, const Ref<Material> &p_material, bool p_from_b) {
+	for (int face_idx = 0; face_idx < faces.size(); ++face_idx) {
+		Face2D face = faces[face_idx];
+		Vertex2D fv[3] = {
+			vertices[face.vertex_idx[0]],
+			vertices[face.vertex_idx[1]],
+			vertices[face.vertex_idx[2]]
+		};
+
+		// Convert 2D vertex points to 3D.
+		Vector3 points_3D[3];
+		Vector2 uvs[3];
+		for (int i = 0; i < 3; ++i) {
+			Vector3 point_2D(fv[i].point.x, fv[i].point.y, 0);
+			points_3D[i] = to_3D.xform(point_2D);
+			uvs[i] = fv[i].uv;
+		}
 
-			face_count = 0;
+		r_mesh_merge.add_face(points_3D, uvs, p_smooth, p_invert, p_material, p_from_b);
+	}
+}
 
-			for (int i = 0; i < mesh_merge.faces.size(); i++) {
+CSGBrushOperation::Build2DFaces::Build2DFaces(const CSGBrush &p_brush, int p_face_idx, float p_vertex_snap2) :
+		vertex_snap2(p_vertex_snap2 * p_vertex_snap2) {
+	// Convert 3D vertex points to 2D.
+	Vector3 points_3D[3] = {
+		p_brush.faces[p_face_idx].vertices[0],
+		p_brush.faces[p_face_idx].vertices[1],
+		p_brush.faces[p_face_idx].vertices[2],
+	};
 
-				if (mesh_merge.faces[i].from_b && !mesh_merge.faces[i].inside)
-					continue;
-				if (!mesh_merge.faces[i].from_b && mesh_merge.faces[i].inside)
-					continue;
+	plane = Plane(points_3D[0], points_3D[1], points_3D[2]);
+	to_3D.origin = points_3D[0];
+	to_3D.basis.set_axis(2, plane.normal);
+	to_3D.basis.set_axis(0, (points_3D[1] - points_3D[2]).normalized());
+	to_3D.basis.set_axis(1, to_3D.basis.get_axis(0).cross(to_3D.basis.get_axis(2)).normalized());
+	to_2D = to_3D.affine_inverse();
 
-				for (int j = 0; j < 3; j++) {
-					result.faces.write[face_count].vertices[j] = mesh_merge.points[mesh_merge.faces[i].points[j]];
-					result.faces.write[face_count].uvs[j] = mesh_merge.faces[i].uvs[j];
+	Face2D face;
+	for (int i = 0; i < 3; i++) {
+		Vertex2D vertex;
+		Vector3 point_2D = to_2D.xform(points_3D[i]);
+		vertex.point.x = point_2D.x;
+		vertex.point.y = point_2D.y;
+		vertex.uv = p_brush.faces[p_face_idx].uvs[i];
+		vertices.push_back(vertex);
+		face.vertex_idx[i] = i;
+	}
+	faces.push_back(face);
+}
+
+void CSGBrushOperation::update_faces(const CSGBrush &p_brush_a, const int p_face_idx_a, const CSGBrush &p_brush_b, const int p_face_idx_b, Build2DFaceCollection &p_collection, float p_vertex_snap) {
+	Vector3 vertices_a[3] = {
+		p_brush_a.faces[p_face_idx_a].vertices[0],
+		p_brush_a.faces[p_face_idx_a].vertices[1],
+		p_brush_a.faces[p_face_idx_a].vertices[2],
+	};
+
+	Vector3 vertices_b[3] = {
+		p_brush_b.faces[p_face_idx_b].vertices[0],
+		p_brush_b.faces[p_face_idx_b].vertices[1],
+		p_brush_b.faces[p_face_idx_b].vertices[2],
+	};
+
+	// Don't use degenerate faces.
+	bool has_degenerate = false;
+	if (is_snapable(vertices_a[0], vertices_a[1], p_vertex_snap) ||
+			is_snapable(vertices_a[0], vertices_a[2], p_vertex_snap) ||
+			is_snapable(vertices_a[1], vertices_a[2], p_vertex_snap)) {
+		p_collection.build2DFacesA[p_face_idx_a] = Build2DFaces();
+		has_degenerate = true;
+	}
+
+	if (is_snapable(vertices_b[0], vertices_b[1], p_vertex_snap) ||
+			is_snapable(vertices_b[0], vertices_b[2], p_vertex_snap) ||
+			is_snapable(vertices_b[1], vertices_b[2], p_vertex_snap)) {
+		p_collection.build2DFacesB[p_face_idx_b] = Build2DFaces();
+		has_degenerate = true;
+	}
+	if (has_degenerate) {
+		return;
+	}
+
+	// Ensure B has points either side of or in the plane of A.
+	int in_plane_count = 0, over_count = 0, under_count = 0;
+	Plane plane_a(vertices_a[0], vertices_a[1], vertices_a[2]);
+	ERR_FAIL_COND_MSG(plane_a.normal == Vector3(), "Couldn't form plane from Brush A face.");
+
+	for (int i = 0; i < 3; i++) {
+		if (plane_a.has_point(vertices_b[i])) {
+			in_plane_count++;
+		} else if (plane_a.is_point_over(vertices_b[i])) {
+			over_count++;
+		} else {
+			under_count++;
+		}
+	}
+	// If all points under or over the plane, there is no intesection.
+	if (over_count == 3 || under_count == 3) {
+		return;
+	}
+
+	// Ensure A has points either side of or in the plane of B.
+	in_plane_count = 0;
+	over_count = 0;
+	under_count = 0;
+	Plane plane_b(vertices_b[0], vertices_b[1], vertices_b[2]);
+	ERR_FAIL_COND_MSG(plane_b.normal == Vector3(), "Couldn't form plane from Brush B face.");
+
+	for (int i = 0; i < 3; i++) {
+		if (plane_b.has_point(vertices_a[i])) {
+			in_plane_count++;
+		} else if (plane_b.is_point_over(vertices_a[i])) {
+			over_count++;
+		} else {
+			under_count++;
+		}
+	}
+	// If all points under or over the plane, there is no intesection.
+	if (over_count == 3 || under_count == 3) {
+		return;
+	}
+
+	// Check for intersection using the SAT theorem.
+	{
+		// Edge pair cross product combinations.
+		for (int i = 0; i < 3; i++) {
+			Vector3 axis_a = (vertices_a[i] - vertices_a[(i + 1) % 3]).normalized();
+
+			for (int j = 0; j < 3; j++) {
+				Vector3 axis_b = (vertices_b[j] - vertices_b[(j + 1) % 3]).normalized();
+
+				Vector3 sep_axis = axis_a.cross(axis_b);
+				if (sep_axis == Vector3()) {
+					continue; //colineal
 				}
+				sep_axis.normalize();
 
-				if (mesh_merge.faces[i].from_b) {
-					//invert facing of insides of B
-					SWAP(result.faces.write[face_count].vertices[1], result.faces.write[face_count].vertices[2]);
-					SWAP(result.faces.write[face_count].uvs[1], result.faces.write[face_count].uvs[2]);
+				real_t min_a = 1e20, max_a = -1e20;
+				real_t min_b = 1e20, max_b = -1e20;
+
+				for (int k = 0; k < 3; k++) {
+					real_t d = sep_axis.dot(vertices_a[k]);
+					min_a = MIN(min_a, d);
+					max_a = MAX(max_a, d);
+					d = sep_axis.dot(vertices_b[k]);
+					min_b = MIN(min_b, d);
+					max_b = MAX(max_b, d);
 				}
 
-				result.faces.write[face_count].smooth = mesh_merge.faces[i].smooth;
-				result.faces.write[face_count].invert = mesh_merge.faces[i].invert;
-				result.faces.write[face_count].material = mesh_merge.faces[i].material_idx;
-				face_count++;
-			}
+				min_b -= (max_a - min_a) * 0.5;
+				max_b += (max_a - min_a) * 0.5;
 
-			result._regen_face_aabbs();
+				real_t dmin = min_b - (min_a + max_a) * 0.5;
+				real_t dmax = max_b - (min_a + max_a) * 0.5;
 
-		} break;
+				if (dmin > CMP_EPSILON || dmax < -CMP_EPSILON) {
+					return; // Does not contain zero, so they don't overlap.
+				}
+			}
+		}
 	}
 
-	//updatelist of materials
-	result.materials.resize(mesh_merge.materials.size());
-	for (const Map<Ref<Material>, int>::Element *E = mesh_merge.materials.front(); E; E = E->next()) {
-		result.materials.write[E->get()] = E->key();
+	// If we're still here, the faces probably intersect, so add new faces.
+	if (!p_collection.build2DFacesA.has(p_face_idx_a)) {
+		p_collection.build2DFacesA[p_face_idx_a] = Build2DFaces(p_brush_a, p_face_idx_a, p_vertex_snap);
+	}
+	p_collection.build2DFacesA[p_face_idx_a].insert(p_brush_b, p_face_idx_b);
+
+	if (!p_collection.build2DFacesB.has(p_face_idx_b)) {
+		p_collection.build2DFacesB[p_face_idx_b] = Build2DFaces(p_brush_b, p_face_idx_b, p_vertex_snap);
 	}
+	p_collection.build2DFacesB[p_face_idx_b].insert(p_brush_a, p_face_idx_a);
 }
diff --git a/modules/csg/csg.h b/modules/csg/csg.h
index a11e55c72a..34ee239c17 100644
--- a/modules/csg/csg.h
+++ b/modules/csg/csg.h
@@ -31,20 +31,20 @@
 #ifndef CSG_H
 #define CSG_H
 
+#include "core/list.h"
 #include "core/map.h"
 #include "core/math/aabb.h"
 #include "core/math/plane.h"
-#include "core/math/rect2.h"
 #include "core/math/transform.h"
+#include "core/math/vector2.h"
 #include "core/math/vector3.h"
 #include "core/oa_hash_map.h"
-#include "core/pool_vector.h"
+#include "core/reference.h"
+#include "core/vector.h"
 #include "scene/resources/material.h"
 
 struct CSGBrush {
-
 	struct Face {
-
 		Vector3 vertices[3];
 		Vector2 uvs[3];
 		AABB aabb;
@@ -54,28 +54,36 @@ struct CSGBrush {
 	};
 
 	Vector<Face> faces;
-	Vector<Ref<Material> > materials;
+	Vector<Ref<Material>> materials;
 
-	void _regen_face_aabbs();
-	//create a brush from faces
-	void build_from_faces(const PoolVector<Vector3> &p_vertices, const PoolVector<Vector2> &p_uvs, const PoolVector<bool> &p_smooth, const PoolVector<Ref<Material> > &p_materials, const PoolVector<bool> &p_invert_faces);
-	void copy_from(const CSGBrush &p_brush, const Transform &p_xform);
+	inline void _regen_face_aabbs();
 
-	void clear();
+	// Create a brush from faces.
+	void build_from_faces(const Vector<Vector3> &p_vertices, const Vector<Vector2> &p_uvs, const Vector<bool> &p_smooth, const Vector<Ref<Material>> &p_materials, const Vector<bool> &p_invert_faces);
+	void copy_from(const CSGBrush &p_brush, const Transform &p_xform);
 };
 
 struct CSGBrushOperation {
-
 	enum Operation {
 		OPERATION_UNION,
 		OPERATION_INTERSECTION,
 		OPERATION_SUBSTRACTION,
-
 	};
 
+	void merge_brushes(Operation p_operation, const CSGBrush &p_brush_a, const CSGBrush &p_brush_b, CSGBrush &r_merged_brush, float p_vertex_snap);
+
 	struct MeshMerge {
+		struct Face {
+			bool from_b;
+			bool inside;
+			int points[3];
+			Vector2 uvs[3];
+			bool smooth;
+			bool invert;
+			int material_idx;
+		};
 
-		struct BVH {
+		struct FaceBVH {
 			int face;
 			int left;
 			int right;
@@ -84,32 +92,23 @@ struct CSGBrushOperation {
 			AABB aabb;
 		};
 
-		struct BVHCmpX {
-
-			bool operator()(const BVH *p_left, const BVH *p_right) const {
-
+		struct FaceBVHCmpX {
+			_FORCE_INLINE_ bool operator()(const FaceBVH *p_left, const FaceBVH *p_right) const {
 				return p_left->center.x < p_right->center.x;
 			}
 		};
 
-		struct BVHCmpY {
-
-			bool operator()(const BVH *p_left, const BVH *p_right) const {
-
+		struct FaceBVHCmpY {
+			_FORCE_INLINE_ bool operator()(const FaceBVH *p_left, const FaceBVH *p_right) const {
 				return p_left->center.y < p_right->center.y;
 			}
 		};
-		struct BVHCmpZ {
-
-			bool operator()(const BVH *p_left, const BVH *p_right) const {
-
+		struct FaceBVHCmpZ {
+			_FORCE_INLINE_ bool operator()(const FaceBVH *p_left, const FaceBVH *p_right) const {
 				return p_left->center.z < p_right->center.z;
 			}
 		};
 
-		int _bvh_count_intersections(BVH *bvhptr, int p_max_depth, int p_bvh_first, const Vector3 &p_begin, const Vector3 &p_end, int p_exclude) const;
-		int _create_bvh(BVH *p_bvh, BVH **p_bb, int p_from, int p_size, int p_depth, int &max_depth, int &max_alloc);
-
 		struct VertexKey {
 			int32_t x, y, z;
 			_FORCE_INLINE_ bool operator<(const VertexKey &p_key) const {
@@ -138,99 +137,58 @@ struct CSGBrushOperation {
 			}
 		};
 
-		OAHashMap<VertexKey, int, VertexKeyHash> snap_cache;
-
 		Vector<Vector3> points;
-
-		struct Face {
-			bool from_b;
-			bool inside;
-			int points[3];
-			Vector2 uvs[3];
-			bool smooth;
-			bool invert;
-			int material_idx;
-		};
-
 		Vector<Face> faces;
-
 		Map<Ref<Material>, int> materials;
-
 		Map<Vector3, int> vertex_map;
-		void add_face(const Vector3 &p_a, const Vector3 &p_b, const Vector3 &p_c, const Vector2 &p_uv_a, const Vector2 &p_uv_b, const Vector2 &p_uv_c, bool p_smooth, bool p_invert, const Ref<Material> &p_material, bool p_from_b);
-		//		void add_face(const Vector3 &p_a, const Vector3 &p_b, const Vector3 &p_c, bool p_from_b);
-
+		OAHashMap<VertexKey, int, VertexKeyHash> snap_cache;
 		float vertex_snap;
-		void mark_inside_faces();
-	};
 
-	struct BuildPoly {
+		inline void _add_distance(List<real_t> &r_intersectionsA, List<real_t> &r_intersectionsB, bool p_from_B, real_t p_distance) const;
+		inline bool _bvh_inside(FaceBVH *facebvhptr, int p_max_depth, int p_bvh_first, int p_face_idx) const;
+		inline int _create_bvh(FaceBVH *facebvhptr, FaceBVH **facebvhptrptr, int p_from, int p_size, int p_depth, int &r_max_depth, int &r_max_alloc);
 
-		Plane plane;
-		Transform to_poly;
-		Transform to_world;
-		int face_index;
+		void add_face(const Vector3 p_points[3], const Vector2 p_uvs[3], bool p_smooth, bool p_invert, const Ref<Material> &p_material, bool p_from_b);
+		void mark_inside_faces();
+	};
 
-		struct Point {
+	struct Build2DFaces {
+		struct Vertex2D {
 			Vector2 point;
 			Vector2 uv;
 		};
 
-		Vector<Point> points;
-
-		struct Edge {
-			bool outer;
-			int points[2];
-			Edge() {
-				outer = false;
-			}
+		struct Face2D {
+			int vertex_idx[3];
 		};
 
-		Vector<Edge> edges;
-		Ref<Material> material;
-		bool smooth;
-		bool invert;
-
-		int base_edges; //edges from original triangle, even if split
-
-		void _clip_segment(const CSGBrush *p_brush, int p_face, const Vector2 *segment, MeshMerge &mesh_merge, bool p_for_B);
-
-		void create(const CSGBrush *p_brush, int p_face, MeshMerge &mesh_merge, bool p_for_B);
-		void clip(const CSGBrush *p_brush, int p_face, MeshMerge &mesh_merge, bool p_for_B);
-	};
-
-	struct PolyPoints {
-
-		Vector<int> points;
-
-		Vector<Vector<int> > holes;
-	};
-
-	struct EdgeSort {
-		int edge;
-		int prev_point;
-		int edge_point;
-		float angle;
-		bool operator<(const EdgeSort &p_edge) const { return angle < p_edge.angle; }
+		Vector<Vertex2D> vertices;
+		Vector<Face2D> faces;
+		Plane plane;
+		Transform to_2D;
+		Transform to_3D;
+		float vertex_snap2;
+
+		inline int _get_point_idx(const Vector2 &p_point);
+		inline int _add_vertex(const Vertex2D &p_vertex);
+		inline void _add_vertex_idx_sorted(Vector<int> &r_vertex_indices, int p_new_vertex_index);
+		inline void _merge_faces(const Vector<int> &p_segment_indices);
+		inline void _find_edge_intersections(const Vector2 p_segment_points[2], Vector<int> &r_segment_indices);
+		inline int _insert_point(const Vector2 &p_point);
+
+		void insert(const CSGBrush &p_brush, int p_brush_face);
+		void addFacesToMesh(MeshMerge &r_mesh_merge, bool p_smooth, bool p_invert, const Ref<Material> &p_material, bool p_from_b);
+
+		Build2DFaces() {}
+		Build2DFaces(const CSGBrush &p_brush, int p_brush_face, float p_vertex_snap2);
 	};
 
-	struct CallbackData {
-		const CSGBrush *A;
-		const CSGBrush *B;
-		int face_a;
-		CSGBrushOperation *self;
-		Map<int, BuildPoly> build_polys_A;
-		Map<int, BuildPoly> build_polys_B;
+	struct Build2DFaceCollection {
+		Map<int, Build2DFaces> build2DFacesA;
+		Map<int, Build2DFaces> build2DFacesB;
 	};
 
-	void _add_poly_points(const BuildPoly &p_poly, int p_edge, int p_from_point, int p_to_point, const Vector<Vector<int> > &vertex_process, Vector<bool> &edge_process, Vector<PolyPoints> &r_poly);
-	void _add_poly_outline(const BuildPoly &p_poly, int p_from_point, int p_to_point, const Vector<Vector<int> > &vertex_process, Vector<int> &r_outline);
-	void _merge_poly(MeshMerge &mesh, int p_face_idx, const BuildPoly &p_poly, bool p_from_b);
-
-	void _collision_callback(const CSGBrush *A, int p_face_a, Map<int, BuildPoly> &build_polys_a, const CSGBrush *B, int p_face_b, Map<int, BuildPoly> &build_polys_b, MeshMerge &mesh_merge);
-
-	static void _collision_callbacks(void *ud, int p_face_b);
-	void merge_brushes(Operation p_operation, const CSGBrush &p_A, const CSGBrush &p_B, CSGBrush &result, float p_snap = 0.001);
+	void update_faces(const CSGBrush &p_brush_a, const int p_face_idx_a, const CSGBrush &p_brush_b, const int p_face_idx_b, Build2DFaceCollection &p_collection, float p_vertex_snap);
 };
 
 #endif // CSG_H
diff --git a/modules/csg/csg_gizmos.cpp b/modules/csg/csg_gizmos.cpp
index 49387606f3..cce72770f5 100644
--- a/modules/csg/csg_gizmos.cpp
+++ b/modules/csg/csg_gizmos.cpp
@@ -32,8 +32,7 @@
 
 ///////////
 
-CSGShapeSpatialGizmoPlugin::CSGShapeSpatialGizmoPlugin() {
-
+CSGShape3DGizmoPlugin::CSGShape3DGizmoPlugin() {
 	Color gizmo_color = EDITOR_DEF("editors/3d_gizmos/gizmo_colors/csg", Color(0.0, 0.4, 1, 0.15));
 	create_material("shape_union_material", gizmo_color);
 	create_material("shape_union_solid_material", gizmo_color);
@@ -49,70 +48,64 @@ CSGShapeSpatialGizmoPlugin::CSGShapeSpatialGizmoPlugin() {
 	create_handle_material("handles");
 }
 
-String CSGShapeSpatialGizmoPlugin::get_handle_name(const EditorSpatialGizmo *p_gizmo, int p_idx) const {
-
-	CSGShape *cs = Object::cast_to<CSGShape>(p_gizmo->get_spatial_node());
-
-	if (Object::cast_to<CSGSphere>(cs)) {
+String CSGShape3DGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const {
+	CSGShape3D *cs = Object::cast_to<CSGShape3D>(p_gizmo->get_spatial_node());
 
+	if (Object::cast_to<CSGSphere3D>(cs)) {
 		return "Radius";
 	}
 
-	if (Object::cast_to<CSGBox>(cs)) {
-
+	if (Object::cast_to<CSGBox3D>(cs)) {
 		static const char *hname[3] = { "Width", "Height", "Depth" };
 		return hname[p_idx];
 	}
 
-	if (Object::cast_to<CSGCylinder>(cs)) {
-
+	if (Object::cast_to<CSGCylinder3D>(cs)) {
 		return p_idx == 0 ? "Radius" : "Height";
 	}
 
-	if (Object::cast_to<CSGTorus>(cs)) {
-
+	if (Object::cast_to<CSGTorus3D>(cs)) {
 		return p_idx == 0 ? "InnerRadius" : "OuterRadius";
 	}
 
 	return "";
 }
-Variant CSGShapeSpatialGizmoPlugin::get_handle_value(EditorSpatialGizmo *p_gizmo, int p_idx) const {
 
-	CSGShape *cs = Object::cast_to<CSGShape>(p_gizmo->get_spatial_node());
+Variant CSGShape3DGizmoPlugin::get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const {
+	CSGShape3D *cs = Object::cast_to<CSGShape3D>(p_gizmo->get_spatial_node());
 
-	if (Object::cast_to<CSGSphere>(cs)) {
-
-		CSGSphere *s = Object::cast_to<CSGSphere>(cs);
+	if (Object::cast_to<CSGSphere3D>(cs)) {
+		CSGSphere3D *s = Object::cast_to<CSGSphere3D>(cs);
 		return s->get_radius();
 	}
 
-	if (Object::cast_to<CSGBox>(cs)) {
-
-		CSGBox *s = Object::cast_to<CSGBox>(cs);
+	if (Object::cast_to<CSGBox3D>(cs)) {
+		CSGBox3D *s = Object::cast_to<CSGBox3D>(cs);
 		switch (p_idx) {
-			case 0: return s->get_width();
-			case 1: return s->get_height();
-			case 2: return s->get_depth();
+			case 0:
+				return s->get_width();
+			case 1:
+				return s->get_height();
+			case 2:
+				return s->get_depth();
 		}
 	}
 
-	if (Object::cast_to<CSGCylinder>(cs)) {
-
-		CSGCylinder *s = Object::cast_to<CSGCylinder>(cs);
+	if (Object::cast_to<CSGCylinder3D>(cs)) {
+		CSGCylinder3D *s = Object::cast_to<CSGCylinder3D>(cs);
 		return p_idx == 0 ? s->get_radius() : s->get_height();
 	}
 
-	if (Object::cast_to<CSGTorus>(cs)) {
-
-		CSGTorus *s = Object::cast_to<CSGTorus>(cs);
+	if (Object::cast_to<CSGTorus3D>(cs)) {
+		CSGTorus3D *s = Object::cast_to<CSGTorus3D>(cs);
 		return p_idx == 0 ? s->get_inner_radius() : s->get_outer_radius();
 	}
 
 	return Variant();
 }
-void CSGShapeSpatialGizmoPlugin::set_handle(EditorSpatialGizmo *p_gizmo, int p_idx, Camera *p_camera, const Point2 &p_point) {
 
-	CSGShape *cs = Object::cast_to<CSGShape>(p_gizmo->get_spatial_node());
+void CSGShape3DGizmoPlugin::set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point) {
+	CSGShape3D *cs = Object::cast_to<CSGShape3D>(p_gizmo->get_spatial_node());
 
 	Transform gt = cs->get_global_transform();
 	//gt.orthonormalize();
@@ -123,127 +116,147 @@ void CSGShapeSpatialGizmoPlugin::set_handle(EditorSpatialGizmo *p_gizmo, int p_i
 
 	Vector3 sg[2] = { gi.xform(ray_from), gi.xform(ray_from + ray_dir * 16384) };
 
-	if (Object::cast_to<CSGSphere>(cs)) {
-
-		CSGSphere *s = Object::cast_to<CSGSphere>(cs);
+	if (Object::cast_to<CSGSphere3D>(cs)) {
+		CSGSphere3D *s = Object::cast_to<CSGSphere3D>(cs);
 
 		Vector3 ra, rb;
-		Geometry::get_closest_points_between_segments(Vector3(), Vector3(4096, 0, 0), sg[0], sg[1], ra, rb);
+		Geometry3D::get_closest_points_between_segments(Vector3(), Vector3(4096, 0, 0), sg[0], sg[1], ra, rb);
 		float d = ra.x;
-		if (SpatialEditor::get_singleton()->is_snap_enabled()) {
-			d = Math::stepify(d, SpatialEditor::get_singleton()->get_translate_snap());
+		if (Node3DEditor::get_singleton()->is_snap_enabled()) {
+			d = Math::stepify(d, Node3DEditor::get_singleton()->get_translate_snap());
 		}
 
-		if (d < 0.001)
+		if (d < 0.001) {
 			d = 0.001;
+		}
 
 		s->set_radius(d);
 	}
 
-	if (Object::cast_to<CSGBox>(cs)) {
-
-		CSGBox *s = Object::cast_to<CSGBox>(cs);
+	if (Object::cast_to<CSGBox3D>(cs)) {
+		CSGBox3D *s = Object::cast_to<CSGBox3D>(cs);
 
 		Vector3 axis;
 		axis[p_idx] = 1.0;
 		Vector3 ra, rb;
-		Geometry::get_closest_points_between_segments(Vector3(), axis * 4096, sg[0], sg[1], ra, rb);
+		Geometry3D::get_closest_points_between_segments(Vector3(), axis * 4096, sg[0], sg[1], ra, rb);
 		float d = ra[p_idx];
-		if (SpatialEditor::get_singleton()->is_snap_enabled()) {
-			d = Math::stepify(d, SpatialEditor::get_singleton()->get_translate_snap());
+		if (Node3DEditor::get_singleton()->is_snap_enabled()) {
+			d = Math::stepify(d, Node3DEditor::get_singleton()->get_translate_snap());
 		}
 
-		if (d < 0.001)
+		if (d < 0.001) {
 			d = 0.001;
+		}
 
 		switch (p_idx) {
-			case 0: s->set_width(d * 2); break;
-			case 1: s->set_height(d * 2); break;
-			case 2: s->set_depth(d * 2); break;
+			case 0:
+				s->set_width(d * 2);
+				break;
+			case 1:
+				s->set_height(d * 2);
+				break;
+			case 2:
+				s->set_depth(d * 2);
+				break;
 		}
 	}
 
-	if (Object::cast_to<CSGCylinder>(cs)) {
-
-		CSGCylinder *s = Object::cast_to<CSGCylinder>(cs);
+	if (Object::cast_to<CSGCylinder3D>(cs)) {
+		CSGCylinder3D *s = Object::cast_to<CSGCylinder3D>(cs);
 
 		Vector3 axis;
 		axis[p_idx == 0 ? 0 : 1] = 1.0;
 		Vector3 ra, rb;
-		Geometry::get_closest_points_between_segments(Vector3(), axis * 4096, sg[0], sg[1], ra, rb);
+		Geometry3D::get_closest_points_between_segments(Vector3(), axis * 4096, sg[0], sg[1], ra, rb);
 		float d = axis.dot(ra);
-		if (SpatialEditor::get_singleton()->is_snap_enabled()) {
-			d = Math::stepify(d, SpatialEditor::get_singleton()->get_translate_snap());
+		if (Node3DEditor::get_singleton()->is_snap_enabled()) {
+			d = Math::stepify(d, Node3DEditor::get_singleton()->get_translate_snap());
 		}
 
-		if (d < 0.001)
+		if (d < 0.001) {
 			d = 0.001;
+		}
 
-		if (p_idx == 0)
+		if (p_idx == 0) {
 			s->set_radius(d);
-		else if (p_idx == 1)
+		} else if (p_idx == 1) {
 			s->set_height(d * 2.0);
+		}
 	}
 
-	if (Object::cast_to<CSGTorus>(cs)) {
-
-		CSGTorus *s = Object::cast_to<CSGTorus>(cs);
+	if (Object::cast_to<CSGTorus3D>(cs)) {
+		CSGTorus3D *s = Object::cast_to<CSGTorus3D>(cs);
 
 		Vector3 axis;
 		axis[0] = 1.0;
 		Vector3 ra, rb;
-		Geometry::get_closest_points_between_segments(Vector3(), axis * 4096, sg[0], sg[1], ra, rb);
+		Geometry3D::get_closest_points_between_segments(Vector3(), axis * 4096, sg[0], sg[1], ra, rb);
 		float d = axis.dot(ra);
-		if (SpatialEditor::get_singleton()->is_snap_enabled()) {
-			d = Math::stepify(d, SpatialEditor::get_singleton()->get_translate_snap());
+		if (Node3DEditor::get_singleton()->is_snap_enabled()) {
+			d = Math::stepify(d, Node3DEditor::get_singleton()->get_translate_snap());
 		}
 
-		if (d < 0.001)
+		if (d < 0.001) {
 			d = 0.001;
+		}
 
-		if (p_idx == 0)
+		if (p_idx == 0) {
 			s->set_inner_radius(d);
-		else if (p_idx == 1)
+		} else if (p_idx == 1) {
 			s->set_outer_radius(d);
+		}
 	}
 }
-void CSGShapeSpatialGizmoPlugin::commit_handle(EditorSpatialGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel) {
 
-	CSGShape *cs = Object::cast_to<CSGShape>(p_gizmo->get_spatial_node());
+void CSGShape3DGizmoPlugin::commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel) {
+	CSGShape3D *cs = Object::cast_to<CSGShape3D>(p_gizmo->get_spatial_node());
 
-	if (Object::cast_to<CSGSphere>(cs)) {
-		CSGSphere *s = Object::cast_to<CSGSphere>(cs);
+	if (Object::cast_to<CSGSphere3D>(cs)) {
+		CSGSphere3D *s = Object::cast_to<CSGSphere3D>(cs);
 		if (p_cancel) {
 			s->set_radius(p_restore);
 			return;
 		}
 
-		UndoRedo *ur = SpatialEditor::get_singleton()->get_undo_redo();
+		UndoRedo *ur = Node3DEditor::get_singleton()->get_undo_redo();
 		ur->create_action(TTR("Change Sphere Shape Radius"));
 		ur->add_do_method(s, "set_radius", s->get_radius());
 		ur->add_undo_method(s, "set_radius", p_restore);
 		ur->commit_action();
 	}
 
-	if (Object::cast_to<CSGBox>(cs)) {
-		CSGBox *s = Object::cast_to<CSGBox>(cs);
+	if (Object::cast_to<CSGBox3D>(cs)) {
+		CSGBox3D *s = Object::cast_to<CSGBox3D>(cs);
 		if (p_cancel) {
 			switch (p_idx) {
-				case 0: s->set_width(p_restore); break;
-				case 1: s->set_height(p_restore); break;
-				case 2: s->set_depth(p_restore); break;
+				case 0:
+					s->set_width(p_restore);
+					break;
+				case 1:
+					s->set_height(p_restore);
+					break;
+				case 2:
+					s->set_depth(p_restore);
+					break;
 			}
 			return;
 		}
 
-		UndoRedo *ur = SpatialEditor::get_singleton()->get_undo_redo();
+		UndoRedo *ur = Node3DEditor::get_singleton()->get_undo_redo();
 		ur->create_action(TTR("Change Box Shape Extents"));
 		static const char *method[3] = { "set_width", "set_height", "set_depth" };
 		float current = 0;
 		switch (p_idx) {
-			case 0: current = s->get_width(); break;
-			case 1: current = s->get_height(); break;
-			case 2: current = s->get_depth(); break;
+			case 0:
+				current = s->get_width();
+				break;
+			case 1:
+				current = s->get_height();
+				break;
+			case 2:
+				current = s->get_depth();
+				break;
 		}
 
 		ur->add_do_method(s, method[p_idx], current);
@@ -251,17 +264,18 @@ void CSGShapeSpatialGizmoPlugin::commit_handle(EditorSpatialGizmo *p_gizmo, int
 		ur->commit_action();
 	}
 
-	if (Object::cast_to<CSGCylinder>(cs)) {
-		CSGCylinder *s = Object::cast_to<CSGCylinder>(cs);
+	if (Object::cast_to<CSGCylinder3D>(cs)) {
+		CSGCylinder3D *s = Object::cast_to<CSGCylinder3D>(cs);
 		if (p_cancel) {
-			if (p_idx == 0)
+			if (p_idx == 0) {
 				s->set_radius(p_restore);
-			else
+			} else {
 				s->set_height(p_restore);
+			}
 			return;
 		}
 
-		UndoRedo *ur = SpatialEditor::get_singleton()->get_undo_redo();
+		UndoRedo *ur = Node3DEditor::get_singleton()->get_undo_redo();
 		if (p_idx == 0) {
 			ur->create_action(TTR("Change Cylinder Radius"));
 			ur->add_do_method(s, "set_radius", s->get_radius());
@@ -275,17 +289,18 @@ void CSGShapeSpatialGizmoPlugin::commit_handle(EditorSpatialGizmo *p_gizmo, int
 		ur->commit_action();
 	}
 
-	if (Object::cast_to<CSGTorus>(cs)) {
-		CSGTorus *s = Object::cast_to<CSGTorus>(cs);
+	if (Object::cast_to<CSGTorus3D>(cs)) {
+		CSGTorus3D *s = Object::cast_to<CSGTorus3D>(cs);
 		if (p_cancel) {
-			if (p_idx == 0)
+			if (p_idx == 0) {
 				s->set_inner_radius(p_restore);
-			else
+			} else {
 				s->set_outer_radius(p_restore);
+			}
 			return;
 		}
 
-		UndoRedo *ur = SpatialEditor::get_singleton()->get_undo_redo();
+		UndoRedo *ur = Node3DEditor::get_singleton()->get_undo_redo();
 		if (p_idx == 0) {
 			ur->create_action(TTR("Change Torus Inner Radius"));
 			ur->add_do_method(s, "set_inner_radius", s->get_inner_radius());
@@ -299,49 +314,49 @@ void CSGShapeSpatialGizmoPlugin::commit_handle(EditorSpatialGizmo *p_gizmo, int
 		ur->commit_action();
 	}
 }
-bool CSGShapeSpatialGizmoPlugin::has_gizmo(Spatial *p_spatial) {
-	return Object::cast_to<CSGSphere>(p_spatial) || Object::cast_to<CSGBox>(p_spatial) || Object::cast_to<CSGCylinder>(p_spatial) || Object::cast_to<CSGTorus>(p_spatial) || Object::cast_to<CSGMesh>(p_spatial) || Object::cast_to<CSGPolygon>(p_spatial);
+
+bool CSGShape3DGizmoPlugin::has_gizmo(Node3D *p_spatial) {
+	return Object::cast_to<CSGSphere3D>(p_spatial) || Object::cast_to<CSGBox3D>(p_spatial) || Object::cast_to<CSGCylinder3D>(p_spatial) || Object::cast_to<CSGTorus3D>(p_spatial) || Object::cast_to<CSGMesh3D>(p_spatial) || Object::cast_to<CSGPolygon3D>(p_spatial);
 }
 
-String CSGShapeSpatialGizmoPlugin::get_name() const {
-	return "CSGShapes";
+String CSGShape3DGizmoPlugin::get_name() const {
+	return "CSGShape3D";
 }
 
-int CSGShapeSpatialGizmoPlugin::get_priority() const {
+int CSGShape3DGizmoPlugin::get_priority() const {
 	return -1;
 }
 
-bool CSGShapeSpatialGizmoPlugin::is_selectable_when_hidden() const {
+bool CSGShape3DGizmoPlugin::is_selectable_when_hidden() const {
 	return true;
 }
 
-void CSGShapeSpatialGizmoPlugin::redraw(EditorSpatialGizmo *p_gizmo) {
-
-	CSGShape *cs = Object::cast_to<CSGShape>(p_gizmo->get_spatial_node());
+void CSGShape3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
+	CSGShape3D *cs = Object::cast_to<CSGShape3D>(p_gizmo->get_spatial_node());
 
 	p_gizmo->clear();
 
 	Ref<Material> material;
 	switch (cs->get_operation()) {
-		case CSGShape::OPERATION_UNION:
+		case CSGShape3D::OPERATION_UNION:
 			material = get_material("shape_union_material", p_gizmo);
 			break;
-		case CSGShape::OPERATION_INTERSECTION:
+		case CSGShape3D::OPERATION_INTERSECTION:
 			material = get_material("shape_intersection_material", p_gizmo);
 			break;
-		case CSGShape::OPERATION_SUBTRACTION:
+		case CSGShape3D::OPERATION_SUBTRACTION:
 			material = get_material("shape_subtraction_material", p_gizmo);
 			break;
 	}
 
 	Ref<Material> handles_material = get_material("handles");
 
-	PoolVector<Vector3> faces = cs->get_brush_faces();
+	Vector<Vector3> faces = cs->get_brush_faces();
 
 	Vector<Vector3> lines;
 	lines.resize(faces.size() * 2);
 	{
-		PoolVector<Vector3>::Read r = faces.read();
+		const Vector3 *r = faces.ptr();
 
 		for (int i = 0; i < lines.size(); i += 6) {
 			int f = i / 6;
@@ -366,13 +381,13 @@ void CSGShapeSpatialGizmoPlugin::redraw(EditorSpatialGizmo *p_gizmo) {
 
 		Ref<Material> solid_material;
 		switch (cs->get_operation()) {
-			case CSGShape::OPERATION_UNION:
+			case CSGShape3D::OPERATION_UNION:
 				solid_material = get_material("shape_union_solid_material", p_gizmo);
 				break;
-			case CSGShape::OPERATION_INTERSECTION:
+			case CSGShape3D::OPERATION_INTERSECTION:
 				solid_material = get_material("shape_intersection_solid_material", p_gizmo);
 				break;
-			case CSGShape::OPERATION_SUBTRACTION:
+			case CSGShape3D::OPERATION_SUBTRACTION:
 				solid_material = get_material("shape_subtraction_solid_material", p_gizmo);
 				break;
 		}
@@ -380,8 +395,8 @@ void CSGShapeSpatialGizmoPlugin::redraw(EditorSpatialGizmo *p_gizmo) {
 		p_gizmo->add_mesh(mesh, false, Ref<SkinReference>(), solid_material);
 	}
 
-	if (Object::cast_to<CSGSphere>(cs)) {
-		CSGSphere *s = Object::cast_to<CSGSphere>(cs);
+	if (Object::cast_to<CSGSphere3D>(cs)) {
+		CSGSphere3D *s = Object::cast_to<CSGSphere3D>(cs);
 
 		float r = s->get_radius();
 		Vector<Vector3> handles;
@@ -389,8 +404,8 @@ void CSGShapeSpatialGizmoPlugin::redraw(EditorSpatialGizmo *p_gizmo) {
 		p_gizmo->add_handles(handles, handles_material);
 	}
 
-	if (Object::cast_to<CSGBox>(cs)) {
-		CSGBox *s = Object::cast_to<CSGBox>(cs);
+	if (Object::cast_to<CSGBox3D>(cs)) {
+		CSGBox3D *s = Object::cast_to<CSGBox3D>(cs);
 
 		Vector<Vector3> handles;
 		handles.push_back(Vector3(s->get_width() * 0.5, 0, 0));
@@ -399,8 +414,8 @@ void CSGShapeSpatialGizmoPlugin::redraw(EditorSpatialGizmo *p_gizmo) {
 		p_gizmo->add_handles(handles, handles_material);
 	}
 
-	if (Object::cast_to<CSGCylinder>(cs)) {
-		CSGCylinder *s = Object::cast_to<CSGCylinder>(cs);
+	if (Object::cast_to<CSGCylinder3D>(cs)) {
+		CSGCylinder3D *s = Object::cast_to<CSGCylinder3D>(cs);
 
 		Vector<Vector3> handles;
 		handles.push_back(Vector3(s->get_radius(), 0, 0));
@@ -408,8 +423,8 @@ void CSGShapeSpatialGizmoPlugin::redraw(EditorSpatialGizmo *p_gizmo) {
 		p_gizmo->add_handles(handles, handles_material);
 	}
 
-	if (Object::cast_to<CSGTorus>(cs)) {
-		CSGTorus *s = Object::cast_to<CSGTorus>(cs);
+	if (Object::cast_to<CSGTorus3D>(cs)) {
+		CSGTorus3D *s = Object::cast_to<CSGTorus3D>(cs);
 
 		Vector<Vector3> handles;
 		handles.push_back(Vector3(s->get_inner_radius(), 0, 0));
@@ -419,6 +434,6 @@ void CSGShapeSpatialGizmoPlugin::redraw(EditorSpatialGizmo *p_gizmo) {
 }
 
 EditorPluginCSG::EditorPluginCSG(EditorNode *p_editor) {
-	Ref<CSGShapeSpatialGizmoPlugin> gizmo_plugin = Ref<CSGShapeSpatialGizmoPlugin>(memnew(CSGShapeSpatialGizmoPlugin));
-	SpatialEditor::get_singleton()->add_gizmo_plugin(gizmo_plugin);
+	Ref<CSGShape3DGizmoPlugin> gizmo_plugin = Ref<CSGShape3DGizmoPlugin>(memnew(CSGShape3DGizmoPlugin));
+	Node3DEditor::get_singleton()->add_gizmo_plugin(gizmo_plugin);
 }
diff --git a/modules/csg/csg_gizmos.h b/modules/csg/csg_gizmos.h
index 966b654802..83ee847caf 100644
--- a/modules/csg/csg_gizmos.h
+++ b/modules/csg/csg_gizmos.h
@@ -33,25 +33,24 @@
 
 #include "csg_shape.h"
 #include "editor/editor_plugin.h"
-#include "editor/spatial_editor_gizmos.h"
+#include "editor/node_3d_editor_gizmos.h"
 
-class CSGShapeSpatialGizmoPlugin : public EditorSpatialGizmoPlugin {
-
-	GDCLASS(CSGShapeSpatialGizmoPlugin, EditorSpatialGizmoPlugin);
+class CSGShape3DGizmoPlugin : public EditorNode3DGizmoPlugin {
+	GDCLASS(CSGShape3DGizmoPlugin, EditorNode3DGizmoPlugin);
 
 public:
-	bool has_gizmo(Spatial *p_spatial);
-	String get_name() const;
-	int get_priority() const;
-	bool is_selectable_when_hidden() const;
-	void redraw(EditorSpatialGizmo *p_gizmo);
-
-	String get_handle_name(const EditorSpatialGizmo *p_gizmo, int p_idx) const;
-	Variant get_handle_value(EditorSpatialGizmo *p_gizmo, int p_idx) const;
-	void set_handle(EditorSpatialGizmo *p_gizmo, int p_idx, Camera *p_camera, const Point2 &p_point);
-	void commit_handle(EditorSpatialGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel);
-
-	CSGShapeSpatialGizmoPlugin();
+	bool has_gizmo(Node3D *p_spatial) override;
+	String get_name() const override;
+	int get_priority() const override;
+	bool is_selectable_when_hidden() const override;
+	void redraw(EditorNode3DGizmo *p_gizmo) override;
+
+	String get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const override;
+	Variant get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const override;
+	void set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point) override;
+	void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel) override;
+
+	CSGShape3DGizmoPlugin();
 };
 
 class EditorPluginCSG : public EditorPlugin {
diff --git a/modules/csg/csg_shape.cpp b/modules/csg/csg_shape.cpp
index c8a72ff813..8f2ebc7232 100644
--- a/modules/csg/csg_shape.cpp
+++ b/modules/csg/csg_shape.cpp
@@ -29,155 +29,146 @@
 /*************************************************************************/
 
 #include "csg_shape.h"
-#include "scene/3d/path.h"
+#include "core/math/geometry_2d.h"
+#include "scene/3d/path_3d.h"
 
-void CSGShape::set_use_collision(bool p_enable) {
-
-	if (use_collision == p_enable)
+void CSGShape3D::set_use_collision(bool p_enable) {
+	if (use_collision == p_enable) {
 		return;
+	}
 
 	use_collision = p_enable;
 
-	if (!is_inside_tree() || !is_root_shape())
+	if (!is_inside_tree() || !is_root_shape()) {
 		return;
+	}
 
 	if (use_collision) {
 		root_collision_shape.instance();
-		root_collision_instance = PhysicsServer::get_singleton()->body_create(PhysicsServer::BODY_MODE_STATIC);
-		PhysicsServer::get_singleton()->body_set_state(root_collision_instance, PhysicsServer::BODY_STATE_TRANSFORM, get_global_transform());
-		PhysicsServer::get_singleton()->body_add_shape(root_collision_instance, root_collision_shape->get_rid());
-		PhysicsServer::get_singleton()->body_set_space(root_collision_instance, get_world()->get_space());
-		PhysicsServer::get_singleton()->body_attach_object_instance_id(root_collision_instance, get_instance_id());
+		root_collision_instance = PhysicsServer3D::get_singleton()->body_create(PhysicsServer3D::BODY_MODE_STATIC);
+		PhysicsServer3D::get_singleton()->body_set_state(root_collision_instance, PhysicsServer3D::BODY_STATE_TRANSFORM, get_global_transform());
+		PhysicsServer3D::get_singleton()->body_add_shape(root_collision_instance, root_collision_shape->get_rid());
+		PhysicsServer3D::get_singleton()->body_set_space(root_collision_instance, get_world_3d()->get_space());
+		PhysicsServer3D::get_singleton()->body_attach_object_instance_id(root_collision_instance, get_instance_id());
 		set_collision_layer(collision_layer);
 		set_collision_mask(collision_mask);
 		_make_dirty(); //force update
 	} else {
-		PhysicsServer::get_singleton()->free(root_collision_instance);
+		PhysicsServer3D::get_singleton()->free(root_collision_instance);
 		root_collision_instance = RID();
 		root_collision_shape.unref();
 	}
 	_change_notify();
 }
 
-bool CSGShape::is_using_collision() const {
+bool CSGShape3D::is_using_collision() const {
 	return use_collision;
 }
 
-void CSGShape::set_collision_layer(uint32_t p_layer) {
+void CSGShape3D::set_collision_layer(uint32_t p_layer) {
 	collision_layer = p_layer;
 	if (root_collision_instance.is_valid()) {
-		PhysicsServer::get_singleton()->body_set_collision_layer(root_collision_instance, p_layer);
+		PhysicsServer3D::get_singleton()->body_set_collision_layer(root_collision_instance, p_layer);
 	}
 }
 
-uint32_t CSGShape::get_collision_layer() const {
-
+uint32_t CSGShape3D::get_collision_layer() const {
 	return collision_layer;
 }
 
-void CSGShape::set_collision_mask(uint32_t p_mask) {
-
+void CSGShape3D::set_collision_mask(uint32_t p_mask) {
 	collision_mask = p_mask;
 	if (root_collision_instance.is_valid()) {
-		PhysicsServer::get_singleton()->body_set_collision_mask(root_collision_instance, p_mask);
+		PhysicsServer3D::get_singleton()->body_set_collision_mask(root_collision_instance, p_mask);
 	}
 }
 
-uint32_t CSGShape::get_collision_mask() const {
-
+uint32_t CSGShape3D::get_collision_mask() const {
 	return collision_mask;
 }
 
-void CSGShape::set_collision_mask_bit(int p_bit, bool p_value) {
-
+void CSGShape3D::set_collision_mask_bit(int p_bit, bool p_value) {
 	uint32_t mask = get_collision_mask();
-	if (p_value)
+	if (p_value) {
 		mask |= 1 << p_bit;
-	else
+	} else {
 		mask &= ~(1 << p_bit);
+	}
 	set_collision_mask(mask);
 }
 
-bool CSGShape::get_collision_mask_bit(int p_bit) const {
-
+bool CSGShape3D::get_collision_mask_bit(int p_bit) const {
 	return get_collision_mask() & (1 << p_bit);
 }
 
-void CSGShape::set_collision_layer_bit(int p_bit, bool p_value) {
-
+void CSGShape3D::set_collision_layer_bit(int p_bit, bool p_value) {
 	uint32_t mask = get_collision_layer();
-	if (p_value)
+	if (p_value) {
 		mask |= 1 << p_bit;
-	else
+	} else {
 		mask &= ~(1 << p_bit);
+	}
 	set_collision_layer(mask);
 }
 
-bool CSGShape::get_collision_layer_bit(int p_bit) const {
-
+bool CSGShape3D::get_collision_layer_bit(int p_bit) const {
 	return get_collision_layer() & (1 << p_bit);
 }
 
-bool CSGShape::is_root_shape() const {
-
+bool CSGShape3D::is_root_shape() const {
 	return !parent;
 }
 
-void CSGShape::set_snap(float p_snap) {
+void CSGShape3D::set_snap(float p_snap) {
 	snap = p_snap;
 }
 
-float CSGShape::get_snap() const {
+float CSGShape3D::get_snap() const {
 	return snap;
 }
 
-void CSGShape::_make_dirty() {
-
-	if (!is_inside_tree())
-		return;
-
-	if (dirty) {
+void CSGShape3D::_make_dirty() {
+	if (!is_inside_tree()) {
 		return;
 	}
 
-	dirty = true;
-
 	if (parent) {
 		parent->_make_dirty();
-	} else {
-		//only parent will do
+	} else if (!dirty) {
 		call_deferred("_update_shape");
 	}
-}
 
-CSGBrush *CSGShape::_get_brush() {
+	dirty = true;
+}
 
+CSGBrush *CSGShape3D::_get_brush() {
 	if (dirty) {
 		if (brush) {
 			memdelete(brush);
 		}
-		brush = NULL;
+		brush = nullptr;
 
 		CSGBrush *n = _build_brush();
 
 		for (int i = 0; i < get_child_count(); i++) {
-
-			CSGShape *child = Object::cast_to<CSGShape>(get_child(i));
-			if (!child)
+			CSGShape3D *child = Object::cast_to<CSGShape3D>(get_child(i));
+			if (!child) {
 				continue;
-			if (!child->is_visible_in_tree())
+			}
+			if (!child->is_visible_in_tree()) {
 				continue;
+			}
 
 			CSGBrush *n2 = child->_get_brush();
-			if (!n2)
+			if (!n2) {
 				continue;
+			}
 			if (!n) {
 				n = memnew(CSGBrush);
 
 				n->copy_from(*n2, child->get_transform());
 
 			} else {
-
 				CSGBrush *nn = memnew(CSGBrush);
 				CSGBrush *nn2 = memnew(CSGBrush);
 				nn2->copy_from(*n2, child->get_transform());
@@ -185,9 +176,15 @@ CSGBrush *CSGShape::_get_brush() {
 				CSGBrushOperation bop;
 
 				switch (child->get_operation()) {
-					case CSGShape::OPERATION_UNION: bop.merge_brushes(CSGBrushOperation::OPERATION_UNION, *n, *nn2, *nn, snap); break;
-					case CSGShape::OPERATION_INTERSECTION: bop.merge_brushes(CSGBrushOperation::OPERATION_INTERSECTION, *n, *nn2, *nn, snap); break;
-					case CSGShape::OPERATION_SUBTRACTION: bop.merge_brushes(CSGBrushOperation::OPERATION_SUBSTRACTION, *n, *nn2, *nn, snap); break;
+					case CSGShape3D::OPERATION_UNION:
+						bop.merge_brushes(CSGBrushOperation::OPERATION_UNION, *n, *nn2, *nn, snap);
+						break;
+					case CSGShape3D::OPERATION_INTERSECTION:
+						bop.merge_brushes(CSGBrushOperation::OPERATION_INTERSECTION, *n, *nn2, *nn, snap);
+						break;
+					case CSGShape3D::OPERATION_SUBTRACTION:
+						bop.merge_brushes(CSGBrushOperation::OPERATION_SUBSTRACTION, *n, *nn2, *nn, snap);
+						break;
 				}
 				memdelete(n);
 				memdelete(nn2);
@@ -199,10 +196,11 @@ CSGBrush *CSGShape::_get_brush() {
 			AABB aabb;
 			for (int i = 0; i < n->faces.size(); i++) {
 				for (int j = 0; j < 3; j++) {
-					if (i == 0 && j == 0)
+					if (i == 0 && j == 0) {
 						aabb.position = n->faces[i].vertices[j];
-					else
+					} else {
 						aabb.expand_to(n->faces[i].vertices[j]);
+					}
 				}
 			}
 			node_aabb = aabb;
@@ -218,18 +216,18 @@ CSGBrush *CSGShape::_get_brush() {
 	return brush;
 }
 
-int CSGShape::mikktGetNumFaces(const SMikkTSpaceContext *pContext) {
+int CSGShape3D::mikktGetNumFaces(const SMikkTSpaceContext *pContext) {
 	ShapeUpdateSurface &surface = *((ShapeUpdateSurface *)pContext->m_pUserData);
 
 	return surface.vertices.size() / 3;
 }
 
-int CSGShape::mikktGetNumVerticesOfFace(const SMikkTSpaceContext *pContext, const int iFace) {
+int CSGShape3D::mikktGetNumVerticesOfFace(const SMikkTSpaceContext *pContext, const int iFace) {
 	// always 3
 	return 3;
 }
 
-void CSGShape::mikktGetPosition(const SMikkTSpaceContext *pContext, float fvPosOut[], const int iFace, const int iVert) {
+void CSGShape3D::mikktGetPosition(const SMikkTSpaceContext *pContext, float fvPosOut[], const int iFace, const int iVert) {
 	ShapeUpdateSurface &surface = *((ShapeUpdateSurface *)pContext->m_pUserData);
 
 	Vector3 v = surface.verticesw[iFace * 3 + iVert];
@@ -238,7 +236,7 @@ void CSGShape::mikktGetPosition(const SMikkTSpaceContext *pContext, float fvPosO
 	fvPosOut[2] = v.z;
 }
 
-void CSGShape::mikktGetNormal(const SMikkTSpaceContext *pContext, float fvNormOut[], const int iFace, const int iVert) {
+void CSGShape3D::mikktGetNormal(const SMikkTSpaceContext *pContext, float fvNormOut[], const int iFace, const int iVert) {
 	ShapeUpdateSurface &surface = *((ShapeUpdateSurface *)pContext->m_pUserData);
 
 	Vector3 n = surface.normalsw[iFace * 3 + iVert];
@@ -247,7 +245,7 @@ void CSGShape::mikktGetNormal(const SMikkTSpaceContext *pContext, float fvNormOu
 	fvNormOut[2] = n.z;
 }
 
-void CSGShape::mikktGetTexCoord(const SMikkTSpaceContext *pContext, float fvTexcOut[], const int iFace, const int iVert) {
+void CSGShape3D::mikktGetTexCoord(const SMikkTSpaceContext *pContext, float fvTexcOut[], const int iFace, const int iVert) {
 	ShapeUpdateSurface &surface = *((ShapeUpdateSurface *)pContext->m_pUserData);
 
 	Vector2 t = surface.uvsw[iFace * 3 + iVert];
@@ -255,9 +253,8 @@ void CSGShape::mikktGetTexCoord(const SMikkTSpaceContext *pContext, float fvTexc
 	fvTexcOut[1] = t.y;
 }
 
-void CSGShape::mikktSetTSpaceDefault(const SMikkTSpaceContext *pContext, const float fvTangent[], const float fvBiTangent[], const float fMagS, const float fMagT,
+void CSGShape3D::mikktSetTSpaceDefault(const SMikkTSpaceContext *pContext, const float fvTangent[], const float fvBiTangent[], const float fMagS, const float fMagT,
 		const tbool bIsOrientationPreserving, const int iFace, const int iVert) {
-
 	ShapeUpdateSurface &surface = *((ShapeUpdateSurface *)pContext->m_pUserData);
 
 	int i = iFace * 3 + iVert;
@@ -273,10 +270,10 @@ void CSGShape::mikktSetTSpaceDefault(const SMikkTSpaceContext *pContext, const f
 	surface.tansw[i++] = d < 0 ? -1 : 1;
 }
 
-void CSGShape::_update_shape() {
-
-	if (parent)
+void CSGShape3D::_update_shape() {
+	if (parent) {
 		return;
+	}
 
 	set_base(RID());
 	root_mesh.unref(); //byebye root mesh
@@ -296,20 +293,18 @@ void CSGShape::_update_shape() {
 		int mat = n->faces[i].material;
 		ERR_CONTINUE(mat < -1 || mat >= face_count.size());
 		int idx = mat == -1 ? face_count.size() - 1 : mat;
-		if (n->faces[i].smooth) {
 
-			Plane p(n->faces[i].vertices[0], n->faces[i].vertices[1], n->faces[i].vertices[2]);
+		Plane p(n->faces[i].vertices[0], n->faces[i].vertices[1], n->faces[i].vertices[2]);
 
-			for (int j = 0; j < 3; j++) {
-				Vector3 v = n->faces[i].vertices[j];
-				Vector3 add;
-				if (vec_map.lookup(v, add)) {
-					add += p.normal;
-				} else {
-					add = p.normal;
-				}
-				vec_map.set(v, add);
+		for (int j = 0; j < 3; j++) {
+			Vector3 v = n->faces[i].vertices[j];
+			Vector3 add;
+			if (vec_map.lookup(v, add)) {
+				add += p.normal;
+			} else {
+				add = p.normal;
 			}
+			vec_map.set(v, add);
 		}
 
 		face_count.write[idx]++;
@@ -321,7 +316,6 @@ void CSGShape::_update_shape() {
 
 	//create arrays
 	for (int i = 0; i < surfaces.size(); i++) {
-
 		surfaces.write[i].vertices.resize(face_count[i] * 3);
 		surfaces.write[i].normals.resize(face_count[i] * 3);
 		surfaces.write[i].uvs.resize(face_count[i] * 3);
@@ -334,43 +328,44 @@ void CSGShape::_update_shape() {
 			surfaces.write[i].material = n->materials[i];
 		}
 
-		surfaces.write[i].verticesw = surfaces.write[i].vertices.write();
-		surfaces.write[i].normalsw = surfaces.write[i].normals.write();
-		surfaces.write[i].uvsw = surfaces.write[i].uvs.write();
+		surfaces.write[i].verticesw = surfaces.write[i].vertices.ptrw();
+		surfaces.write[i].normalsw = surfaces.write[i].normals.ptrw();
+		surfaces.write[i].uvsw = surfaces.write[i].uvs.ptrw();
 		if (calculate_tangents) {
-			surfaces.write[i].tansw = surfaces.write[i].tans.write();
+			surfaces.write[i].tansw = surfaces.write[i].tans.ptrw();
 		}
 	}
 
-	//fill arrays
-	PoolVector<Vector3> physics_faces;
-	bool fill_physics_faces = false;
+	// Update collision faces.
 	if (root_collision_shape.is_valid()) {
+		Vector<Vector3> physics_faces;
 		physics_faces.resize(n->faces.size() * 3);
-		fill_physics_faces = true;
-	}
+		Vector3 *physicsw = physics_faces.ptrw();
 
-	{
-		PoolVector<Vector3>::Write physicsw;
+		for (int i = 0; i < n->faces.size(); i++) {
+			int order[3] = { 0, 1, 2 };
+
+			if (n->faces[i].invert) {
+				SWAP(order[1], order[2]);
+			}
 
-		if (fill_physics_faces) {
-			physicsw = physics_faces.write();
+			physicsw[i * 3 + 0] = n->faces[i].vertices[order[0]];
+			physicsw[i * 3 + 1] = n->faces[i].vertices[order[1]];
+			physicsw[i * 3 + 2] = n->faces[i].vertices[order[2]];
 		}
 
-		for (int i = 0; i < n->faces.size(); i++) {
+		root_collision_shape->set_faces(physics_faces);
+	}
 
+	//fill arrays
+	{
+		for (int i = 0; i < n->faces.size(); i++) {
 			int order[3] = { 0, 1, 2 };
 
 			if (n->faces[i].invert) {
 				SWAP(order[1], order[2]);
 			}
 
-			if (fill_physics_faces) {
-				physicsw[i * 3 + 0] = n->faces[i].vertices[order[0]];
-				physicsw[i * 3 + 1] = n->faces[i].vertices[order[1]];
-				physicsw[i * 3 + 2] = n->faces[i].vertices[order[2]];
-			}
-
 			int mat = n->faces[i].material;
 			ERR_CONTINUE(mat < -1 || mat >= face_count.size());
 			int idx = mat == -1 ? face_count.size() - 1 : mat;
@@ -380,7 +375,6 @@ void CSGShape::_update_shape() {
 			Plane p(n->faces[i].vertices[0], n->faces[i].vertices[1], n->faces[i].vertices[2]);
 
 			for (int j = 0; j < 3; j++) {
-
 				Vector3 v = n->faces[i].vertices[j];
 
 				Vector3 normal = p.normal;
@@ -390,7 +384,6 @@ void CSGShape::_update_shape() {
 				}
 
 				if (n->faces[i].invert) {
-
 					normal = -normal;
 				}
 
@@ -427,7 +420,7 @@ void CSGShape::_update_shape() {
 			mkif.m_getPosition = mikktGetPosition;
 			mkif.m_getTexCoord = mikktGetTexCoord;
 			mkif.m_setTSpace = mikktSetTSpaceDefault;
-			mkif.m_setTSpaceBasic = NULL;
+			mkif.m_setTSpaceBasic = nullptr;
 
 			SMikkTSpaceContext msc;
 			msc.m_pInterface = &mkif;
@@ -435,14 +428,9 @@ void CSGShape::_update_shape() {
 			have_tangents = genTangSpaceDefault(&msc);
 		}
 
-		// unset write access
-		surfaces.write[i].verticesw.release();
-		surfaces.write[i].normalsw.release();
-		surfaces.write[i].uvsw.release();
-		surfaces.write[i].tansw.release();
-
-		if (surfaces[i].last_added == 0)
+		if (surfaces[i].last_added == 0) {
 			continue;
+		}
 
 		// and convert to surface array
 		Array array;
@@ -460,28 +448,25 @@ void CSGShape::_update_shape() {
 		root_mesh->surface_set_material(idx, surfaces[i].material);
 	}
 
-	if (root_collision_shape.is_valid()) {
-		root_collision_shape->set_faces(physics_faces);
-	}
-
 	set_base(root_mesh->get_rid());
 }
-AABB CSGShape::get_aabb() const {
+
+AABB CSGShape3D::get_aabb() const {
 	return node_aabb;
 }
 
-PoolVector<Vector3> CSGShape::get_brush_faces() {
-	ERR_FAIL_COND_V(!is_inside_tree(), PoolVector<Vector3>());
+Vector<Vector3> CSGShape3D::get_brush_faces() {
+	ERR_FAIL_COND_V(!is_inside_tree(), Vector<Vector3>());
 	CSGBrush *b = _get_brush();
 	if (!b) {
-		return PoolVector<Vector3>();
+		return Vector<Vector3>();
 	}
 
-	PoolVector<Vector3> faces;
+	Vector<Vector3> faces;
 	int fc = b->faces.size();
 	faces.resize(fc * 3);
 	{
-		PoolVector<Vector3>::Write w = faces.write();
+		Vector3 *w = faces.ptrw();
 		for (int i = 0; i < fc; i++) {
 			w[i * 3 + 0] = b->faces[i].vertices[0];
 			w[i * 3 + 1] = b->faces[i].vertices[1];
@@ -492,18 +477,15 @@ PoolVector<Vector3> CSGShape::get_brush_faces() {
 	return faces;
 }
 
-PoolVector<Face3> CSGShape::get_faces(uint32_t p_usage_flags) const {
-
-	return PoolVector<Face3>();
+Vector<Face3> CSGShape3D::get_faces(uint32_t p_usage_flags) const {
+	return Vector<Face3>();
 }
 
-void CSGShape::_notification(int p_what) {
-
+void CSGShape3D::_notification(int p_what) {
 	if (p_what == NOTIFICATION_ENTER_TREE) {
-
 		Node *parentn = get_parent();
 		if (parentn) {
-			parent = Object::cast_to<CSGShape>(parentn);
+			parent = Object::cast_to<CSGShape3D>(parentn);
 			if (parent) {
 				set_base(RID());
 				root_mesh.unref();
@@ -512,11 +494,11 @@ void CSGShape::_notification(int p_what) {
 
 		if (use_collision && is_root_shape()) {
 			root_collision_shape.instance();
-			root_collision_instance = PhysicsServer::get_singleton()->body_create(PhysicsServer::BODY_MODE_STATIC);
-			PhysicsServer::get_singleton()->body_set_state(root_collision_instance, PhysicsServer::BODY_STATE_TRANSFORM, get_global_transform());
-			PhysicsServer::get_singleton()->body_add_shape(root_collision_instance, root_collision_shape->get_rid());
-			PhysicsServer::get_singleton()->body_set_space(root_collision_instance, get_world()->get_space());
-			PhysicsServer::get_singleton()->body_attach_object_instance_id(root_collision_instance, get_instance_id());
+			root_collision_instance = PhysicsServer3D::get_singleton()->body_create(PhysicsServer3D::BODY_MODE_STATIC);
+			PhysicsServer3D::get_singleton()->body_set_state(root_collision_instance, PhysicsServer3D::BODY_STATE_TRANSFORM, get_global_transform());
+			PhysicsServer3D::get_singleton()->body_add_shape(root_collision_instance, root_collision_shape->get_rid());
+			PhysicsServer3D::get_singleton()->body_set_space(root_collision_instance, get_world_3d()->get_space());
+			PhysicsServer3D::get_singleton()->body_attach_object_instance_id(root_collision_instance, get_instance_id());
 			set_collision_layer(collision_layer);
 			set_collision_mask(collision_mask);
 		}
@@ -524,28 +506,32 @@ void CSGShape::_notification(int p_what) {
 		_make_dirty();
 	}
 
-	if (p_what == NOTIFICATION_LOCAL_TRANSFORM_CHANGED) {
+	if (p_what == NOTIFICATION_TRANSFORM_CHANGED) {
+		if (use_collision && is_root_shape() && root_collision_instance.is_valid()) {
+			PhysicsServer3D::get_singleton()->body_set_state(root_collision_instance, PhysicsServer3D::BODY_STATE_TRANSFORM, get_global_transform());
+		}
+	}
 
+	if (p_what == NOTIFICATION_LOCAL_TRANSFORM_CHANGED) {
 		if (parent) {
 			parent->_make_dirty();
 		}
 	}
 
 	if (p_what == NOTIFICATION_VISIBILITY_CHANGED) {
-
 		if (parent) {
 			parent->_make_dirty();
 		}
 	}
 
 	if (p_what == NOTIFICATION_EXIT_TREE) {
-
-		if (parent)
+		if (parent) {
 			parent->_make_dirty();
-		parent = NULL;
+		}
+		parent = nullptr;
 
 		if (use_collision && is_root_shape() && root_collision_instance.is_valid()) {
-			PhysicsServer::get_singleton()->free(root_collision_instance);
+			PhysicsServer3D::get_singleton()->free(root_collision_instance);
 			root_collision_instance = RID();
 			root_collision_shape.unref();
 		}
@@ -553,27 +539,26 @@ void CSGShape::_notification(int p_what) {
 	}
 }
 
-void CSGShape::set_operation(Operation p_operation) {
-
+void CSGShape3D::set_operation(Operation p_operation) {
 	operation = p_operation;
 	_make_dirty();
 	update_gizmo();
 }
 
-CSGShape::Operation CSGShape::get_operation() const {
+CSGShape3D::Operation CSGShape3D::get_operation() const {
 	return operation;
 }
 
-void CSGShape::set_calculate_tangents(bool p_calculate_tangents) {
+void CSGShape3D::set_calculate_tangents(bool p_calculate_tangents) {
 	calculate_tangents = p_calculate_tangents;
 	_make_dirty();
 }
 
-bool CSGShape::is_calculating_tangents() const {
+bool CSGShape3D::is_calculating_tangents() const {
 	return calculate_tangents;
 }
 
-void CSGShape::_validate_property(PropertyInfo &property) const {
+void CSGShape3D::_validate_property(PropertyInfo &property) const {
 	bool is_collision_prefixed = property.name.begins_with("collision_");
 	if ((is_collision_prefixed || property.name.begins_with("use_collision")) && is_inside_tree() && !is_root_shape()) {
 		//hide collision if not root
@@ -583,8 +568,7 @@ void CSGShape::_validate_property(PropertyInfo &property) const {
 	}
 }
 
-Array CSGShape::get_meshes() const {
-
+Array CSGShape3D::get_meshes() const {
 	if (root_mesh.is_valid()) {
 		Array arr;
 		arr.resize(2);
@@ -595,39 +579,39 @@ Array CSGShape::get_meshes() const {
 
 	return Array();
 }
-void CSGShape::_bind_methods() {
 
-	ClassDB::bind_method(D_METHOD("_update_shape"), &CSGShape::_update_shape);
-	ClassDB::bind_method(D_METHOD("is_root_shape"), &CSGShape::is_root_shape);
+void CSGShape3D::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("_update_shape"), &CSGShape3D::_update_shape);
+	ClassDB::bind_method(D_METHOD("is_root_shape"), &CSGShape3D::is_root_shape);
 
-	ClassDB::bind_method(D_METHOD("set_operation", "operation"), &CSGShape::set_operation);
-	ClassDB::bind_method(D_METHOD("get_operation"), &CSGShape::get_operation);
+	ClassDB::bind_method(D_METHOD("set_operation", "operation"), &CSGShape3D::set_operation);
+	ClassDB::bind_method(D_METHOD("get_operation"), &CSGShape3D::get_operation);
 
-	ClassDB::bind_method(D_METHOD("set_snap", "snap"), &CSGShape::set_snap);
-	ClassDB::bind_method(D_METHOD("get_snap"), &CSGShape::get_snap);
+	ClassDB::bind_method(D_METHOD("set_snap", "snap"), &CSGShape3D::set_snap);
+	ClassDB::bind_method(D_METHOD("get_snap"), &CSGShape3D::get_snap);
 
-	ClassDB::bind_method(D_METHOD("set_use_collision", "operation"), &CSGShape::set_use_collision);
-	ClassDB::bind_method(D_METHOD("is_using_collision"), &CSGShape::is_using_collision);
+	ClassDB::bind_method(D_METHOD("set_use_collision", "operation"), &CSGShape3D::set_use_collision);
+	ClassDB::bind_method(D_METHOD("is_using_collision"), &CSGShape3D::is_using_collision);
 
-	ClassDB::bind_method(D_METHOD("set_collision_layer", "layer"), &CSGShape::set_collision_layer);
-	ClassDB::bind_method(D_METHOD("get_collision_layer"), &CSGShape::get_collision_layer);
+	ClassDB::bind_method(D_METHOD("set_collision_layer", "layer"), &CSGShape3D::set_collision_layer);
+	ClassDB::bind_method(D_METHOD("get_collision_layer"), &CSGShape3D::get_collision_layer);
 
-	ClassDB::bind_method(D_METHOD("set_collision_mask", "mask"), &CSGShape::set_collision_mask);
-	ClassDB::bind_method(D_METHOD("get_collision_mask"), &CSGShape::get_collision_mask);
+	ClassDB::bind_method(D_METHOD("set_collision_mask", "mask"), &CSGShape3D::set_collision_mask);
+	ClassDB::bind_method(D_METHOD("get_collision_mask"), &CSGShape3D::get_collision_mask);
 
-	ClassDB::bind_method(D_METHOD("set_collision_mask_bit", "bit", "value"), &CSGShape::set_collision_mask_bit);
-	ClassDB::bind_method(D_METHOD("get_collision_mask_bit", "bit"), &CSGShape::get_collision_mask_bit);
+	ClassDB::bind_method(D_METHOD("set_collision_mask_bit", "bit", "value"), &CSGShape3D::set_collision_mask_bit);
+	ClassDB::bind_method(D_METHOD("get_collision_mask_bit", "bit"), &CSGShape3D::get_collision_mask_bit);
 
-	ClassDB::bind_method(D_METHOD("set_collision_layer_bit", "bit", "value"), &CSGShape::set_collision_layer_bit);
-	ClassDB::bind_method(D_METHOD("get_collision_layer_bit", "bit"), &CSGShape::get_collision_layer_bit);
+	ClassDB::bind_method(D_METHOD("set_collision_layer_bit", "bit", "value"), &CSGShape3D::set_collision_layer_bit);
+	ClassDB::bind_method(D_METHOD("get_collision_layer_bit", "bit"), &CSGShape3D::get_collision_layer_bit);
 
-	ClassDB::bind_method(D_METHOD("set_calculate_tangents", "enabled"), &CSGShape::set_calculate_tangents);
-	ClassDB::bind_method(D_METHOD("is_calculating_tangents"), &CSGShape::is_calculating_tangents);
+	ClassDB::bind_method(D_METHOD("set_calculate_tangents", "enabled"), &CSGShape3D::set_calculate_tangents);
+	ClassDB::bind_method(D_METHOD("is_calculating_tangents"), &CSGShape3D::is_calculating_tangents);
 
-	ClassDB::bind_method(D_METHOD("get_meshes"), &CSGShape::get_meshes);
+	ClassDB::bind_method(D_METHOD("get_meshes"), &CSGShape3D::get_meshes);
 
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "operation", PROPERTY_HINT_ENUM, "Union,Intersection,Subtraction"), "set_operation", "get_operation");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "snap", PROPERTY_HINT_RANGE, "0.0001,1,0.001"), "set_snap", "get_snap");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "snap", PROPERTY_HINT_RANGE, "0.0001,1,0.001"), "set_snap", "get_snap");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "calculate_tangents"), "set_calculate_tangents", "is_calculating_tangents");
 
 	ADD_GROUP("Collision", "collision_");
@@ -640,10 +624,10 @@ void CSGShape::_bind_methods() {
 	BIND_ENUM_CONSTANT(OPERATION_SUBTRACTION);
 }
 
-CSGShape::CSGShape() {
+CSGShape3D::CSGShape3D() {
 	operation = OPERATION_UNION;
-	parent = NULL;
-	brush = NULL;
+	parent = nullptr;
+	brush = nullptr;
 	dirty = false;
 	snap = 0.001;
 	use_collision = false;
@@ -653,33 +637,32 @@ CSGShape::CSGShape() {
 	set_notify_local_transform(true);
 }
 
-CSGShape::~CSGShape() {
+CSGShape3D::~CSGShape3D() {
 	if (brush) {
 		memdelete(brush);
-		brush = NULL;
+		brush = nullptr;
 	}
 }
-//////////////////////////////////
 
-CSGBrush *CSGCombiner::_build_brush() {
+//////////////////////////////////
 
-	return NULL; //does not build anything
+CSGBrush *CSGCombiner3D::_build_brush() {
+	return memnew(CSGBrush); //does not build anything
 }
 
-CSGCombiner::CSGCombiner() {
+CSGCombiner3D::CSGCombiner3D() {
 }
 
 /////////////////////
 
-CSGBrush *CSGPrimitive::_create_brush_from_arrays(const PoolVector<Vector3> &p_vertices, const PoolVector<Vector2> &p_uv, const PoolVector<bool> &p_smooth, const PoolVector<Ref<Material> > &p_materials) {
-
+CSGBrush *CSGPrimitive3D::_create_brush_from_arrays(const Vector<Vector3> &p_vertices, const Vector<Vector2> &p_uv, const Vector<bool> &p_smooth, const Vector<Ref<Material>> &p_materials) {
 	CSGBrush *brush = memnew(CSGBrush);
 
-	PoolVector<bool> invert;
+	Vector<bool> invert;
 	invert.resize(p_vertices.size() / 3);
 	{
 		int ic = invert.size();
-		PoolVector<bool>::Write w = invert.write();
+		bool *w = invert.ptrw();
 		for (int i = 0; i < ic; i++) {
 			w[i] = invert_faces;
 		}
@@ -689,46 +672,45 @@ CSGBrush *CSGPrimitive::_create_brush_from_arrays(const PoolVector<Vector3> &p_v
 	return brush;
 }
 
-void CSGPrimitive::_bind_methods() {
-
-	ClassDB::bind_method(D_METHOD("set_invert_faces", "invert_faces"), &CSGPrimitive::set_invert_faces);
-	ClassDB::bind_method(D_METHOD("is_inverting_faces"), &CSGPrimitive::is_inverting_faces);
+void CSGPrimitive3D::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("set_invert_faces", "invert_faces"), &CSGPrimitive3D::set_invert_faces);
+	ClassDB::bind_method(D_METHOD("is_inverting_faces"), &CSGPrimitive3D::is_inverting_faces);
 
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "invert_faces"), "set_invert_faces", "is_inverting_faces");
 }
 
-void CSGPrimitive::set_invert_faces(bool p_invert) {
-	if (invert_faces == p_invert)
+void CSGPrimitive3D::set_invert_faces(bool p_invert) {
+	if (invert_faces == p_invert) {
 		return;
+	}
 
 	invert_faces = p_invert;
 
 	_make_dirty();
 }
 
-bool CSGPrimitive::is_inverting_faces() {
+bool CSGPrimitive3D::is_inverting_faces() {
 	return invert_faces;
 }
 
-CSGPrimitive::CSGPrimitive() {
+CSGPrimitive3D::CSGPrimitive3D() {
 	invert_faces = false;
 }
 
 /////////////////////
 
-CSGBrush *CSGMesh::_build_brush() {
-
-	if (!mesh.is_valid())
-		return NULL;
+CSGBrush *CSGMesh3D::_build_brush() {
+	if (!mesh.is_valid()) {
+		return nullptr;
+	}
 
-	PoolVector<Vector3> vertices;
-	PoolVector<bool> smooth;
-	PoolVector<Ref<Material> > materials;
-	PoolVector<Vector2> uvs;
+	Vector<Vector3> vertices;
+	Vector<bool> smooth;
+	Vector<Ref<Material>> materials;
+	Vector<Vector2> uvs;
 	Ref<Material> material = get_material();
 
 	for (int i = 0; i < mesh->get_surface_count(); i++) {
-
 		if (mesh->surface_get_primitive_type(i) != Mesh::PRIMITIVE_TRIANGLES) {
 			continue;
 		}
@@ -737,29 +719,26 @@ CSGBrush *CSGMesh::_build_brush() {
 
 		if (arrays.size() == 0) {
 			_make_dirty();
-			ERR_FAIL_COND_V(arrays.size() == 0, NULL);
+			ERR_FAIL_COND_V(arrays.size() == 0, nullptr);
 		}
 
-		PoolVector<Vector3> avertices = arrays[Mesh::ARRAY_VERTEX];
-		if (avertices.size() == 0)
+		Vector<Vector3> avertices = arrays[Mesh::ARRAY_VERTEX];
+		if (avertices.size() == 0) {
 			continue;
+		}
 
-		PoolVector<Vector3>::Read vr = avertices.read();
+		const Vector3 *vr = avertices.ptr();
 
-		PoolVector<Vector3> anormals = arrays[Mesh::ARRAY_NORMAL];
-		PoolVector<Vector3>::Read nr;
-		bool nr_used = false;
+		Vector<Vector3> anormals = arrays[Mesh::ARRAY_NORMAL];
+		const Vector3 *nr = nullptr;
 		if (anormals.size()) {
-			nr = anormals.read();
-			nr_used = true;
+			nr = anormals.ptr();
 		}
 
-		PoolVector<Vector2> auvs = arrays[Mesh::ARRAY_TEX_UV];
-		PoolVector<Vector2>::Read uvr;
-		bool uvr_used = false;
+		Vector<Vector2> auvs = arrays[Mesh::ARRAY_TEX_UV];
+		const Vector2 *uvr = nullptr;
 		if (auvs.size()) {
-			uvr = auvs.read();
-			uvr_used = true;
+			uvr = auvs.ptr();
 		}
 
 		Ref<Material> mat;
@@ -769,7 +748,7 @@ CSGBrush *CSGMesh::_build_brush() {
 			mat = mesh->surface_get_material(i);
 		}
 
-		PoolVector<int> aindices = arrays[Mesh::ARRAY_INDEX];
+		Vector<int> aindices = arrays[Mesh::ARRAY_INDEX];
 		if (aindices.size()) {
 			int as = vertices.size();
 			int is = aindices.size();
@@ -779,15 +758,14 @@ CSGBrush *CSGMesh::_build_brush() {
 			materials.resize((as + is) / 3);
 			uvs.resize(as + is);
 
-			PoolVector<Vector3>::Write vw = vertices.write();
-			PoolVector<bool>::Write sw = smooth.write();
-			PoolVector<Vector2>::Write uvw = uvs.write();
-			PoolVector<Ref<Material> >::Write mw = materials.write();
+			Vector3 *vw = vertices.ptrw();
+			bool *sw = smooth.ptrw();
+			Vector2 *uvw = uvs.ptrw();
+			Ref<Material> *mw = materials.ptrw();
 
-			PoolVector<int>::Read ir = aindices.read();
+			const int *ir = aindices.ptr();
 
 			for (int j = 0; j < is; j += 3) {
-
 				Vector3 vertex[3];
 				Vector3 normal[3];
 				Vector2 uv[3];
@@ -795,10 +773,10 @@ CSGBrush *CSGMesh::_build_brush() {
 				for (int k = 0; k < 3; k++) {
 					int idx = ir[j + k];
 					vertex[k] = vr[idx];
-					if (nr_used) {
+					if (nr) {
 						normal[k] = nr[idx];
 					}
-					if (uvr_used) {
+					if (uvr) {
 						uv[k] = uvr[idx];
 					}
 				}
@@ -825,23 +803,22 @@ CSGBrush *CSGMesh::_build_brush() {
 			uvs.resize(as + is);
 			materials.resize((as + is) / 3);
 
-			PoolVector<Vector3>::Write vw = vertices.write();
-			PoolVector<bool>::Write sw = smooth.write();
-			PoolVector<Vector2>::Write uvw = uvs.write();
-			PoolVector<Ref<Material> >::Write mw = materials.write();
+			Vector3 *vw = vertices.ptrw();
+			bool *sw = smooth.ptrw();
+			Vector2 *uvw = uvs.ptrw();
+			Ref<Material> *mw = materials.ptrw();
 
 			for (int j = 0; j < is; j += 3) {
-
 				Vector3 vertex[3];
 				Vector3 normal[3];
 				Vector2 uv[3];
 
 				for (int k = 0; k < 3; k++) {
 					vertex[k] = vr[j + k];
-					if (nr_used) {
+					if (nr) {
 						normal[k] = nr[j + k];
 					}
-					if (uvr_used) {
+					if (uvr) {
 						uv[k] = uvr[j + k];
 					}
 				}
@@ -862,67 +839,64 @@ CSGBrush *CSGMesh::_build_brush() {
 		}
 	}
 
-	if (vertices.size() == 0)
-		return NULL;
+	if (vertices.size() == 0) {
+		return nullptr;
+	}
 
 	return _create_brush_from_arrays(vertices, uvs, smooth, materials);
 }
 
-void CSGMesh::_mesh_changed() {
+void CSGMesh3D::_mesh_changed() {
 	_make_dirty();
 	update_gizmo();
 }
 
-void CSGMesh::set_material(const Ref<Material> &p_material) {
-	if (material == p_material)
+void CSGMesh3D::set_material(const Ref<Material> &p_material) {
+	if (material == p_material) {
 		return;
+	}
 	material = p_material;
 	_make_dirty();
 }
 
-Ref<Material> CSGMesh::get_material() const {
-
+Ref<Material> CSGMesh3D::get_material() const {
 	return material;
 }
 
-void CSGMesh::_bind_methods() {
-
-	ClassDB::bind_method(D_METHOD("set_mesh", "mesh"), &CSGMesh::set_mesh);
-	ClassDB::bind_method(D_METHOD("get_mesh"), &CSGMesh::get_mesh);
+void CSGMesh3D::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("set_mesh", "mesh"), &CSGMesh3D::set_mesh);
+	ClassDB::bind_method(D_METHOD("get_mesh"), &CSGMesh3D::get_mesh);
 
-	ClassDB::bind_method(D_METHOD("_mesh_changed"), &CSGMesh::_mesh_changed);
-
-	ClassDB::bind_method(D_METHOD("set_material", "material"), &CSGMesh::set_material);
-	ClassDB::bind_method(D_METHOD("get_material"), &CSGMesh::get_material);
+	ClassDB::bind_method(D_METHOD("set_material", "material"), &CSGMesh3D::set_material);
+	ClassDB::bind_method(D_METHOD("get_material"), &CSGMesh3D::get_material);
 
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesh", PROPERTY_HINT_RESOURCE_TYPE, "Mesh"), "set_mesh", "get_mesh");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "material", PROPERTY_HINT_RESOURCE_TYPE, "SpatialMaterial,ShaderMaterial"), "set_material", "get_material");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "material", PROPERTY_HINT_RESOURCE_TYPE, "StandardMaterial3D,ShaderMaterial"), "set_material", "get_material");
 }
 
-void CSGMesh::set_mesh(const Ref<Mesh> &p_mesh) {
-
-	if (mesh == p_mesh)
+void CSGMesh3D::set_mesh(const Ref<Mesh> &p_mesh) {
+	if (mesh == p_mesh) {
 		return;
+	}
 	if (mesh.is_valid()) {
-		mesh->disconnect("changed", this, "_mesh_changed");
+		mesh->disconnect("changed", callable_mp(this, &CSGMesh3D::_mesh_changed));
 	}
 	mesh = p_mesh;
 
 	if (mesh.is_valid()) {
-		mesh->connect("changed", this, "_mesh_changed");
+		mesh->connect("changed", callable_mp(this, &CSGMesh3D::_mesh_changed));
 	}
 
 	_make_dirty();
 }
 
-Ref<Mesh> CSGMesh::get_mesh() {
+Ref<Mesh> CSGMesh3D::get_mesh() {
 	return mesh;
 }
 
 ////////////////////////////////
 
-CSGBrush *CSGSphere::_build_brush() {
-
+CSGBrush *CSGSphere3D::_build_brush() {
 	// set our bounding box
 
 	CSGBrush *brush = memnew(CSGBrush);
@@ -932,11 +906,11 @@ CSGBrush *CSGSphere::_build_brush() {
 	bool invert_val = is_inverting_faces();
 	Ref<Material> material = get_material();
 
-	PoolVector<Vector3> faces;
-	PoolVector<Vector2> uvs;
-	PoolVector<bool> smooth;
-	PoolVector<Ref<Material> > materials;
-	PoolVector<bool> invert;
+	Vector<Vector3> faces;
+	Vector<Vector2> uvs;
+	Vector<bool> smooth;
+	Vector<Ref<Material>> materials;
+	Vector<bool> invert;
 
 	faces.resize(face_count * 3);
 	uvs.resize(face_count * 3);
@@ -946,12 +920,11 @@ CSGBrush *CSGSphere::_build_brush() {
 	invert.resize(face_count);
 
 	{
-
-		PoolVector<Vector3>::Write facesw = faces.write();
-		PoolVector<Vector2>::Write uvsw = uvs.write();
-		PoolVector<bool>::Write smoothw = smooth.write();
-		PoolVector<Ref<Material> >::Write materialsw = materials.write();
-		PoolVector<bool>::Write invertw = invert.write();
+		Vector3 *facesw = faces.ptrw();
+		Vector2 *uvsw = uvs.ptrw();
+		bool *smoothw = smooth.ptrw();
+		Ref<Material> *materialsw = materials.ptrw();
+		bool *invertw = invert.ptrw();
 
 		int face = 0;
 
@@ -967,7 +940,6 @@ CSGBrush *CSGSphere::_build_brush() {
 			double u1 = double(i) / rings;
 
 			for (int j = radial_segments; j >= 1; j--) {
-
 				double lng0 = 2 * Math_PI * (double)(j - 1) / radial_segments;
 				double x0 = Math::cos(lng0);
 				double y0 = Math::sin(lng0);
@@ -994,7 +966,6 @@ CSGBrush *CSGSphere::_build_brush() {
 				};
 
 				if (i < rings) {
-
 					//face 1
 					facesw[face * 3 + 0] = v[0];
 					facesw[face * 3 + 1] = v[1];
@@ -1040,29 +1011,29 @@ CSGBrush *CSGSphere::_build_brush() {
 	return brush;
 }
 
-void CSGSphere::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("set_radius", "radius"), &CSGSphere::set_radius);
-	ClassDB::bind_method(D_METHOD("get_radius"), &CSGSphere::get_radius);
+void CSGSphere3D::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("set_radius", "radius"), &CSGSphere3D::set_radius);
+	ClassDB::bind_method(D_METHOD("get_radius"), &CSGSphere3D::get_radius);
 
-	ClassDB::bind_method(D_METHOD("set_radial_segments", "radial_segments"), &CSGSphere::set_radial_segments);
-	ClassDB::bind_method(D_METHOD("get_radial_segments"), &CSGSphere::get_radial_segments);
-	ClassDB::bind_method(D_METHOD("set_rings", "rings"), &CSGSphere::set_rings);
-	ClassDB::bind_method(D_METHOD("get_rings"), &CSGSphere::get_rings);
+	ClassDB::bind_method(D_METHOD("set_radial_segments", "radial_segments"), &CSGSphere3D::set_radial_segments);
+	ClassDB::bind_method(D_METHOD("get_radial_segments"), &CSGSphere3D::get_radial_segments);
+	ClassDB::bind_method(D_METHOD("set_rings", "rings"), &CSGSphere3D::set_rings);
+	ClassDB::bind_method(D_METHOD("get_rings"), &CSGSphere3D::get_rings);
 
-	ClassDB::bind_method(D_METHOD("set_smooth_faces", "smooth_faces"), &CSGSphere::set_smooth_faces);
-	ClassDB::bind_method(D_METHOD("get_smooth_faces"), &CSGSphere::get_smooth_faces);
+	ClassDB::bind_method(D_METHOD("set_smooth_faces", "smooth_faces"), &CSGSphere3D::set_smooth_faces);
+	ClassDB::bind_method(D_METHOD("get_smooth_faces"), &CSGSphere3D::get_smooth_faces);
 
-	ClassDB::bind_method(D_METHOD("set_material", "material"), &CSGSphere::set_material);
-	ClassDB::bind_method(D_METHOD("get_material"), &CSGSphere::get_material);
+	ClassDB::bind_method(D_METHOD("set_material", "material"), &CSGSphere3D::set_material);
+	ClassDB::bind_method(D_METHOD("get_material"), &CSGSphere3D::get_material);
 
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "radius", PROPERTY_HINT_RANGE, "0.001,100.0,0.001"), "set_radius", "get_radius");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "radius", PROPERTY_HINT_RANGE, "0.001,100.0,0.001"), "set_radius", "get_radius");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "radial_segments", PROPERTY_HINT_RANGE, "1,100,1"), "set_radial_segments", "get_radial_segments");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "rings", PROPERTY_HINT_RANGE, "1,100,1"), "set_rings", "get_rings");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "smooth_faces"), "set_smooth_faces", "get_smooth_faces");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "material", PROPERTY_HINT_RESOURCE_TYPE, "SpatialMaterial,ShaderMaterial"), "set_material", "get_material");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "material", PROPERTY_HINT_RESOURCE_TYPE, "StandardMaterial3D,ShaderMaterial"), "set_material", "get_material");
 }
 
-void CSGSphere::set_radius(const float p_radius) {
+void CSGSphere3D::set_radius(const float p_radius) {
 	ERR_FAIL_COND(p_radius <= 0);
 	radius = p_radius;
 	_make_dirty();
@@ -1070,51 +1041,49 @@ void CSGSphere::set_radius(const float p_radius) {
 	_change_notify("radius");
 }
 
-float CSGSphere::get_radius() const {
+float CSGSphere3D::get_radius() const {
 	return radius;
 }
 
-void CSGSphere::set_radial_segments(const int p_radial_segments) {
+void CSGSphere3D::set_radial_segments(const int p_radial_segments) {
 	radial_segments = p_radial_segments > 4 ? p_radial_segments : 4;
 	_make_dirty();
 	update_gizmo();
 }
 
-int CSGSphere::get_radial_segments() const {
+int CSGSphere3D::get_radial_segments() const {
 	return radial_segments;
 }
 
-void CSGSphere::set_rings(const int p_rings) {
+void CSGSphere3D::set_rings(const int p_rings) {
 	rings = p_rings > 1 ? p_rings : 1;
 	_make_dirty();
 	update_gizmo();
 }
 
-int CSGSphere::get_rings() const {
+int CSGSphere3D::get_rings() const {
 	return rings;
 }
 
-void CSGSphere::set_smooth_faces(const bool p_smooth_faces) {
+void CSGSphere3D::set_smooth_faces(const bool p_smooth_faces) {
 	smooth_faces = p_smooth_faces;
 	_make_dirty();
 }
 
-bool CSGSphere::get_smooth_faces() const {
+bool CSGSphere3D::get_smooth_faces() const {
 	return smooth_faces;
 }
 
-void CSGSphere::set_material(const Ref<Material> &p_material) {
-
+void CSGSphere3D::set_material(const Ref<Material> &p_material) {
 	material = p_material;
 	_make_dirty();
 }
 
-Ref<Material> CSGSphere::get_material() const {
-
+Ref<Material> CSGSphere3D::get_material() const {
 	return material;
 }
 
-CSGSphere::CSGSphere() {
+CSGSphere3D::CSGSphere3D() {
 	// defaults
 	radius = 1.0;
 	radial_segments = 12;
@@ -1124,8 +1093,7 @@ CSGSphere::CSGSphere() {
 
 ///////////////
 
-CSGBrush *CSGBox::_build_brush() {
-
+CSGBrush *CSGBox3D::_build_brush() {
 	// set our bounding box
 
 	CSGBrush *brush = memnew(CSGBrush);
@@ -1135,11 +1103,11 @@ CSGBrush *CSGBox::_build_brush() {
 	bool invert_val = is_inverting_faces();
 	Ref<Material> material = get_material();
 
-	PoolVector<Vector3> faces;
-	PoolVector<Vector2> uvs;
-	PoolVector<bool> smooth;
-	PoolVector<Ref<Material> > materials;
-	PoolVector<bool> invert;
+	Vector<Vector3> faces;
+	Vector<Vector2> uvs;
+	Vector<bool> smooth;
+	Vector<Ref<Material>> materials;
+	Vector<bool> invert;
 
 	faces.resize(face_count * 3);
 	uvs.resize(face_count * 3);
@@ -1149,37 +1117,33 @@ CSGBrush *CSGBox::_build_brush() {
 	invert.resize(face_count);
 
 	{
-
-		PoolVector<Vector3>::Write facesw = faces.write();
-		PoolVector<Vector2>::Write uvsw = uvs.write();
-		PoolVector<bool>::Write smoothw = smooth.write();
-		PoolVector<Ref<Material> >::Write materialsw = materials.write();
-		PoolVector<bool>::Write invertw = invert.write();
+		Vector3 *facesw = faces.ptrw();
+		Vector2 *uvsw = uvs.ptrw();
+		bool *smoothw = smooth.ptrw();
+		Ref<Material> *materialsw = materials.ptrw();
+		bool *invertw = invert.ptrw();
 
 		int face = 0;
 
 		Vector3 vertex_mul(width * 0.5, height * 0.5, depth * 0.5);
 
 		{
-
 			for (int i = 0; i < 6; i++) {
-
 				Vector3 face_points[4];
 				float uv_points[8] = { 0, 0, 0, 1, 1, 1, 1, 0 };
 
 				for (int j = 0; j < 4; j++) {
-
 					float v[3];
 					v[0] = 1.0;
 					v[1] = 1 - 2 * ((j >> 1) & 1);
 					v[2] = v[1] * (1 - 2 * (j & 1));
 
 					for (int k = 0; k < 3; k++) {
-
-						if (i < 3)
+						if (i < 3) {
 							face_points[j][(i + k) % 3] = v[k];
-						else
+						} else {
 							face_points[3 - j][(i + k) % 3] = -v[k];
+						}
 					}
 				}
 
@@ -1229,71 +1193,69 @@ CSGBrush *CSGBox::_build_brush() {
 	return brush;
 }
 
-void CSGBox::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("set_width", "width"), &CSGBox::set_width);
-	ClassDB::bind_method(D_METHOD("get_width"), &CSGBox::get_width);
+void CSGBox3D::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("set_width", "width"), &CSGBox3D::set_width);
+	ClassDB::bind_method(D_METHOD("get_width"), &CSGBox3D::get_width);
 
-	ClassDB::bind_method(D_METHOD("set_height", "height"), &CSGBox::set_height);
-	ClassDB::bind_method(D_METHOD("get_height"), &CSGBox::get_height);
+	ClassDB::bind_method(D_METHOD("set_height", "height"), &CSGBox3D::set_height);
+	ClassDB::bind_method(D_METHOD("get_height"), &CSGBox3D::get_height);
 
-	ClassDB::bind_method(D_METHOD("set_depth", "depth"), &CSGBox::set_depth);
-	ClassDB::bind_method(D_METHOD("get_depth"), &CSGBox::get_depth);
+	ClassDB::bind_method(D_METHOD("set_depth", "depth"), &CSGBox3D::set_depth);
+	ClassDB::bind_method(D_METHOD("get_depth"), &CSGBox3D::get_depth);
 
-	ClassDB::bind_method(D_METHOD("set_material", "material"), &CSGBox::set_material);
-	ClassDB::bind_method(D_METHOD("get_material"), &CSGBox::get_material);
+	ClassDB::bind_method(D_METHOD("set_material", "material"), &CSGBox3D::set_material);
+	ClassDB::bind_method(D_METHOD("get_material"), &CSGBox3D::get_material);
 
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "width", PROPERTY_HINT_EXP_RANGE, "0.001,1000.0,0.001,or_greater"), "set_width", "get_width");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "height", PROPERTY_HINT_EXP_RANGE, "0.001,1000.0,0.001,or_greater"), "set_height", "get_height");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "depth", PROPERTY_HINT_EXP_RANGE, "0.001,1000.0,0.001,or_greater"), "set_depth", "get_depth");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "material", PROPERTY_HINT_RESOURCE_TYPE, "SpatialMaterial,ShaderMaterial"), "set_material", "get_material");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "width", PROPERTY_HINT_EXP_RANGE, "0.001,1000.0,0.001,or_greater"), "set_width", "get_width");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "height", PROPERTY_HINT_EXP_RANGE, "0.001,1000.0,0.001,or_greater"), "set_height", "get_height");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "depth", PROPERTY_HINT_EXP_RANGE, "0.001,1000.0,0.001,or_greater"), "set_depth", "get_depth");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "material", PROPERTY_HINT_RESOURCE_TYPE, "StandardMaterial3D,ShaderMaterial"), "set_material", "get_material");
 }
 
-void CSGBox::set_width(const float p_width) {
+void CSGBox3D::set_width(const float p_width) {
 	width = p_width;
 	_make_dirty();
 	update_gizmo();
 	_change_notify("width");
 }
 
-float CSGBox::get_width() const {
+float CSGBox3D::get_width() const {
 	return width;
 }
 
-void CSGBox::set_height(const float p_height) {
+void CSGBox3D::set_height(const float p_height) {
 	height = p_height;
 	_make_dirty();
 	update_gizmo();
 	_change_notify("height");
 }
 
-float CSGBox::get_height() const {
+float CSGBox3D::get_height() const {
 	return height;
 }
 
-void CSGBox::set_depth(const float p_depth) {
+void CSGBox3D::set_depth(const float p_depth) {
 	depth = p_depth;
 	_make_dirty();
 	update_gizmo();
 	_change_notify("depth");
 }
 
-float CSGBox::get_depth() const {
+float CSGBox3D::get_depth() const {
 	return depth;
 }
 
-void CSGBox::set_material(const Ref<Material> &p_material) {
-
+void CSGBox3D::set_material(const Ref<Material> &p_material) {
 	material = p_material;
 	_make_dirty();
 	update_gizmo();
 }
 
-Ref<Material> CSGBox::get_material() const {
-
+Ref<Material> CSGBox3D::get_material() const {
 	return material;
 }
 
-CSGBox::CSGBox() {
+CSGBox3D::CSGBox3D() {
 	// defaults
 	width = 2.0;
 	height = 2.0;
@@ -1302,8 +1264,7 @@ CSGBox::CSGBox() {
 
 ///////////////
 
-CSGBrush *CSGCylinder::_build_brush() {
-
+CSGBrush *CSGCylinder3D::_build_brush() {
 	// set our bounding box
 
 	CSGBrush *brush = memnew(CSGBrush);
@@ -1313,11 +1274,11 @@ CSGBrush *CSGCylinder::_build_brush() {
 	bool invert_val = is_inverting_faces();
 	Ref<Material> material = get_material();
 
-	PoolVector<Vector3> faces;
-	PoolVector<Vector2> uvs;
-	PoolVector<bool> smooth;
-	PoolVector<Ref<Material> > materials;
-	PoolVector<bool> invert;
+	Vector<Vector3> faces;
+	Vector<Vector2> uvs;
+	Vector<bool> smooth;
+	Vector<Ref<Material>> materials;
+	Vector<bool> invert;
 
 	faces.resize(face_count * 3);
 	uvs.resize(face_count * 3);
@@ -1327,21 +1288,18 @@ CSGBrush *CSGCylinder::_build_brush() {
 	invert.resize(face_count);
 
 	{
-
-		PoolVector<Vector3>::Write facesw = faces.write();
-		PoolVector<Vector2>::Write uvsw = uvs.write();
-		PoolVector<bool>::Write smoothw = smooth.write();
-		PoolVector<Ref<Material> >::Write materialsw = materials.write();
-		PoolVector<bool>::Write invertw = invert.write();
+		Vector3 *facesw = faces.ptrw();
+		Vector2 *uvsw = uvs.ptrw();
+		bool *smoothw = smooth.ptrw();
+		Ref<Material> *materialsw = materials.ptrw();
+		bool *invertw = invert.ptrw();
 
 		int face = 0;
 
 		Vector3 vertex_mul(radius, height * 0.5, radius);
 
 		{
-
 			for (int i = 0; i < sides; i++) {
-
 				float inc = float(i) / sides;
 				float inc_n = float((i + 1)) / sides;
 
@@ -1438,97 +1396,95 @@ CSGBrush *CSGCylinder::_build_brush() {
 	return brush;
 }
 
-void CSGCylinder::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("set_radius", "radius"), &CSGCylinder::set_radius);
-	ClassDB::bind_method(D_METHOD("get_radius"), &CSGCylinder::get_radius);
+void CSGCylinder3D::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("set_radius", "radius"), &CSGCylinder3D::set_radius);
+	ClassDB::bind_method(D_METHOD("get_radius"), &CSGCylinder3D::get_radius);
 
-	ClassDB::bind_method(D_METHOD("set_height", "height"), &CSGCylinder::set_height);
-	ClassDB::bind_method(D_METHOD("get_height"), &CSGCylinder::get_height);
+	ClassDB::bind_method(D_METHOD("set_height", "height"), &CSGCylinder3D::set_height);
+	ClassDB::bind_method(D_METHOD("get_height"), &CSGCylinder3D::get_height);
 
-	ClassDB::bind_method(D_METHOD("set_sides", "sides"), &CSGCylinder::set_sides);
-	ClassDB::bind_method(D_METHOD("get_sides"), &CSGCylinder::get_sides);
+	ClassDB::bind_method(D_METHOD("set_sides", "sides"), &CSGCylinder3D::set_sides);
+	ClassDB::bind_method(D_METHOD("get_sides"), &CSGCylinder3D::get_sides);
 
-	ClassDB::bind_method(D_METHOD("set_cone", "cone"), &CSGCylinder::set_cone);
-	ClassDB::bind_method(D_METHOD("is_cone"), &CSGCylinder::is_cone);
+	ClassDB::bind_method(D_METHOD("set_cone", "cone"), &CSGCylinder3D::set_cone);
+	ClassDB::bind_method(D_METHOD("is_cone"), &CSGCylinder3D::is_cone);
 
-	ClassDB::bind_method(D_METHOD("set_material", "material"), &CSGCylinder::set_material);
-	ClassDB::bind_method(D_METHOD("get_material"), &CSGCylinder::get_material);
+	ClassDB::bind_method(D_METHOD("set_material", "material"), &CSGCylinder3D::set_material);
+	ClassDB::bind_method(D_METHOD("get_material"), &CSGCylinder3D::get_material);
 
-	ClassDB::bind_method(D_METHOD("set_smooth_faces", "smooth_faces"), &CSGCylinder::set_smooth_faces);
-	ClassDB::bind_method(D_METHOD("get_smooth_faces"), &CSGCylinder::get_smooth_faces);
+	ClassDB::bind_method(D_METHOD("set_smooth_faces", "smooth_faces"), &CSGCylinder3D::set_smooth_faces);
+	ClassDB::bind_method(D_METHOD("get_smooth_faces"), &CSGCylinder3D::get_smooth_faces);
 
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "radius", PROPERTY_HINT_EXP_RANGE, "0.001,1000.0,0.001,or_greater"), "set_radius", "get_radius");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "height", PROPERTY_HINT_EXP_RANGE, "0.001,1000.0,0.001,or_greater"), "set_height", "get_height");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "radius", PROPERTY_HINT_EXP_RANGE, "0.001,1000.0,0.001,or_greater"), "set_radius", "get_radius");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "height", PROPERTY_HINT_EXP_RANGE, "0.001,1000.0,0.001,or_greater"), "set_height", "get_height");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "sides", PROPERTY_HINT_RANGE, "3,64,1"), "set_sides", "get_sides");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "cone"), "set_cone", "is_cone");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "smooth_faces"), "set_smooth_faces", "get_smooth_faces");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "material", PROPERTY_HINT_RESOURCE_TYPE, "SpatialMaterial,ShaderMaterial"), "set_material", "get_material");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "material", PROPERTY_HINT_RESOURCE_TYPE, "StandardMaterial3D,ShaderMaterial"), "set_material", "get_material");
 }
 
-void CSGCylinder::set_radius(const float p_radius) {
+void CSGCylinder3D::set_radius(const float p_radius) {
 	radius = p_radius;
 	_make_dirty();
 	update_gizmo();
 	_change_notify("radius");
 }
 
-float CSGCylinder::get_radius() const {
+float CSGCylinder3D::get_radius() const {
 	return radius;
 }
 
-void CSGCylinder::set_height(const float p_height) {
+void CSGCylinder3D::set_height(const float p_height) {
 	height = p_height;
 	_make_dirty();
 	update_gizmo();
 	_change_notify("height");
 }
 
-float CSGCylinder::get_height() const {
+float CSGCylinder3D::get_height() const {
 	return height;
 }
 
-void CSGCylinder::set_sides(const int p_sides) {
+void CSGCylinder3D::set_sides(const int p_sides) {
 	ERR_FAIL_COND(p_sides < 3);
 	sides = p_sides;
 	_make_dirty();
 	update_gizmo();
 }
 
-int CSGCylinder::get_sides() const {
+int CSGCylinder3D::get_sides() const {
 	return sides;
 }
 
-void CSGCylinder::set_cone(const bool p_cone) {
+void CSGCylinder3D::set_cone(const bool p_cone) {
 	cone = p_cone;
 	_make_dirty();
 	update_gizmo();
 }
 
-bool CSGCylinder::is_cone() const {
+bool CSGCylinder3D::is_cone() const {
 	return cone;
 }
 
-void CSGCylinder::set_smooth_faces(const bool p_smooth_faces) {
+void CSGCylinder3D::set_smooth_faces(const bool p_smooth_faces) {
 	smooth_faces = p_smooth_faces;
 	_make_dirty();
 }
 
-bool CSGCylinder::get_smooth_faces() const {
+bool CSGCylinder3D::get_smooth_faces() const {
 	return smooth_faces;
 }
 
-void CSGCylinder::set_material(const Ref<Material> &p_material) {
-
+void CSGCylinder3D::set_material(const Ref<Material> &p_material) {
 	material = p_material;
 	_make_dirty();
 }
 
-Ref<Material> CSGCylinder::get_material() const {
-
+Ref<Material> CSGCylinder3D::get_material() const {
 	return material;
 }
 
-CSGCylinder::CSGCylinder() {
+CSGCylinder3D::CSGCylinder3D() {
 	// defaults
 	radius = 1.0;
 	height = 1.0;
@@ -1539,15 +1495,15 @@ CSGCylinder::CSGCylinder() {
 
 ///////////////
 
-CSGBrush *CSGTorus::_build_brush() {
-
+CSGBrush *CSGTorus3D::_build_brush() {
 	// set our bounding box
 
 	float min_radius = inner_radius;
 	float max_radius = outer_radius;
 
-	if (min_radius == max_radius)
-		return NULL; //sorry, can't
+	if (min_radius == max_radius) {
+		return nullptr; //sorry, can't
+	}
 
 	if (min_radius > max_radius) {
 		SWAP(min_radius, max_radius);
@@ -1562,11 +1518,11 @@ CSGBrush *CSGTorus::_build_brush() {
 	bool invert_val = is_inverting_faces();
 	Ref<Material> material = get_material();
 
-	PoolVector<Vector3> faces;
-	PoolVector<Vector2> uvs;
-	PoolVector<bool> smooth;
-	PoolVector<Ref<Material> > materials;
-	PoolVector<bool> invert;
+	Vector<Vector3> faces;
+	Vector<Vector2> uvs;
+	Vector<bool> smooth;
+	Vector<Ref<Material>> materials;
+	Vector<bool> invert;
 
 	faces.resize(face_count * 3);
 	uvs.resize(face_count * 3);
@@ -1576,19 +1532,16 @@ CSGBrush *CSGTorus::_build_brush() {
 	invert.resize(face_count);
 
 	{
-
-		PoolVector<Vector3>::Write facesw = faces.write();
-		PoolVector<Vector2>::Write uvsw = uvs.write();
-		PoolVector<bool>::Write smoothw = smooth.write();
-		PoolVector<Ref<Material> >::Write materialsw = materials.write();
-		PoolVector<bool>::Write invertw = invert.write();
+		Vector3 *facesw = faces.ptrw();
+		Vector2 *uvsw = uvs.ptrw();
+		bool *smoothw = smooth.ptrw();
+		Ref<Material> *materialsw = materials.ptrw();
+		bool *invertw = invert.ptrw();
 
 		int face = 0;
 
 		{
-
 			for (int i = 0; i < sides; i++) {
-
 				float inci = float(i) / sides;
 				float inci_n = float((i + 1)) / sides;
 
@@ -1599,7 +1552,6 @@ CSGBrush *CSGTorus::_build_brush() {
 				Vector3 normali_n = Vector3(Math::cos(angi_n), 0, Math::sin(angi_n));
 
 				for (int j = 0; j < ring_sides; j++) {
-
 					float incj = float(j) / ring_sides;
 					float incj_n = float((j + 1)) / ring_sides;
 
@@ -1665,98 +1617,96 @@ CSGBrush *CSGTorus::_build_brush() {
 	return brush;
 }
 
-void CSGTorus::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("set_inner_radius", "radius"), &CSGTorus::set_inner_radius);
-	ClassDB::bind_method(D_METHOD("get_inner_radius"), &CSGTorus::get_inner_radius);
+void CSGTorus3D::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("set_inner_radius", "radius"), &CSGTorus3D::set_inner_radius);
+	ClassDB::bind_method(D_METHOD("get_inner_radius"), &CSGTorus3D::get_inner_radius);
 
-	ClassDB::bind_method(D_METHOD("set_outer_radius", "radius"), &CSGTorus::set_outer_radius);
-	ClassDB::bind_method(D_METHOD("get_outer_radius"), &CSGTorus::get_outer_radius);
+	ClassDB::bind_method(D_METHOD("set_outer_radius", "radius"), &CSGTorus3D::set_outer_radius);
+	ClassDB::bind_method(D_METHOD("get_outer_radius"), &CSGTorus3D::get_outer_radius);
 
-	ClassDB::bind_method(D_METHOD("set_sides", "sides"), &CSGTorus::set_sides);
-	ClassDB::bind_method(D_METHOD("get_sides"), &CSGTorus::get_sides);
+	ClassDB::bind_method(D_METHOD("set_sides", "sides"), &CSGTorus3D::set_sides);
+	ClassDB::bind_method(D_METHOD("get_sides"), &CSGTorus3D::get_sides);
 
-	ClassDB::bind_method(D_METHOD("set_ring_sides", "sides"), &CSGTorus::set_ring_sides);
-	ClassDB::bind_method(D_METHOD("get_ring_sides"), &CSGTorus::get_ring_sides);
+	ClassDB::bind_method(D_METHOD("set_ring_sides", "sides"), &CSGTorus3D::set_ring_sides);
+	ClassDB::bind_method(D_METHOD("get_ring_sides"), &CSGTorus3D::get_ring_sides);
 
-	ClassDB::bind_method(D_METHOD("set_material", "material"), &CSGTorus::set_material);
-	ClassDB::bind_method(D_METHOD("get_material"), &CSGTorus::get_material);
+	ClassDB::bind_method(D_METHOD("set_material", "material"), &CSGTorus3D::set_material);
+	ClassDB::bind_method(D_METHOD("get_material"), &CSGTorus3D::get_material);
 
-	ClassDB::bind_method(D_METHOD("set_smooth_faces", "smooth_faces"), &CSGTorus::set_smooth_faces);
-	ClassDB::bind_method(D_METHOD("get_smooth_faces"), &CSGTorus::get_smooth_faces);
+	ClassDB::bind_method(D_METHOD("set_smooth_faces", "smooth_faces"), &CSGTorus3D::set_smooth_faces);
+	ClassDB::bind_method(D_METHOD("get_smooth_faces"), &CSGTorus3D::get_smooth_faces);
 
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "inner_radius", PROPERTY_HINT_EXP_RANGE, "0.001,1000.0,0.001,or_greater"), "set_inner_radius", "get_inner_radius");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "outer_radius", PROPERTY_HINT_EXP_RANGE, "0.001,1000.0,0.001,or_greater"), "set_outer_radius", "get_outer_radius");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "inner_radius", PROPERTY_HINT_EXP_RANGE, "0.001,1000.0,0.001,or_greater"), "set_inner_radius", "get_inner_radius");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "outer_radius", PROPERTY_HINT_EXP_RANGE, "0.001,1000.0,0.001,or_greater"), "set_outer_radius", "get_outer_radius");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "sides", PROPERTY_HINT_RANGE, "3,64,1"), "set_sides", "get_sides");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "ring_sides", PROPERTY_HINT_RANGE, "3,64,1"), "set_ring_sides", "get_ring_sides");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "smooth_faces"), "set_smooth_faces", "get_smooth_faces");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "material", PROPERTY_HINT_RESOURCE_TYPE, "SpatialMaterial,ShaderMaterial"), "set_material", "get_material");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "material", PROPERTY_HINT_RESOURCE_TYPE, "StandardMaterial3D,ShaderMaterial"), "set_material", "get_material");
 }
 
-void CSGTorus::set_inner_radius(const float p_inner_radius) {
+void CSGTorus3D::set_inner_radius(const float p_inner_radius) {
 	inner_radius = p_inner_radius;
 	_make_dirty();
 	update_gizmo();
 	_change_notify("inner_radius");
 }
 
-float CSGTorus::get_inner_radius() const {
+float CSGTorus3D::get_inner_radius() const {
 	return inner_radius;
 }
 
-void CSGTorus::set_outer_radius(const float p_outer_radius) {
+void CSGTorus3D::set_outer_radius(const float p_outer_radius) {
 	outer_radius = p_outer_radius;
 	_make_dirty();
 	update_gizmo();
 	_change_notify("outer_radius");
 }
 
-float CSGTorus::get_outer_radius() const {
+float CSGTorus3D::get_outer_radius() const {
 	return outer_radius;
 }
 
-void CSGTorus::set_sides(const int p_sides) {
+void CSGTorus3D::set_sides(const int p_sides) {
 	ERR_FAIL_COND(p_sides < 3);
 	sides = p_sides;
 	_make_dirty();
 	update_gizmo();
 }
 
-int CSGTorus::get_sides() const {
+int CSGTorus3D::get_sides() const {
 	return sides;
 }
 
-void CSGTorus::set_ring_sides(const int p_ring_sides) {
+void CSGTorus3D::set_ring_sides(const int p_ring_sides) {
 	ERR_FAIL_COND(p_ring_sides < 3);
 	ring_sides = p_ring_sides;
 	_make_dirty();
 	update_gizmo();
 }
 
-int CSGTorus::get_ring_sides() const {
+int CSGTorus3D::get_ring_sides() const {
 	return ring_sides;
 }
 
-void CSGTorus::set_smooth_faces(const bool p_smooth_faces) {
+void CSGTorus3D::set_smooth_faces(const bool p_smooth_faces) {
 	smooth_faces = p_smooth_faces;
 	_make_dirty();
 }
 
-bool CSGTorus::get_smooth_faces() const {
+bool CSGTorus3D::get_smooth_faces() const {
 	return smooth_faces;
 }
 
-void CSGTorus::set_material(const Ref<Material> &p_material) {
-
+void CSGTorus3D::set_material(const Ref<Material> &p_material) {
 	material = p_material;
 	_make_dirty();
 }
 
-Ref<Material> CSGTorus::get_material() const {
-
+Ref<Material> CSGTorus3D::get_material() const {
 	return material;
 }
 
-CSGTorus::CSGTorus() {
+CSGTorus3D::CSGTorus3D() {
 	// defaults
 	inner_radius = 2.0;
 	outer_radius = 3.0;
@@ -1767,12 +1717,12 @@ CSGTorus::CSGTorus() {
 
 ///////////////
 
-CSGBrush *CSGPolygon::_build_brush() {
-
+CSGBrush *CSGPolygon3D::_build_brush() {
 	// set our bounding box
 
-	if (polygon.size() < 3)
-		return NULL;
+	if (polygon.size() < 3) {
+		return nullptr;
+	}
 
 	Vector<Point2> final_polygon = polygon;
 
@@ -1780,12 +1730,13 @@ CSGBrush *CSGPolygon::_build_brush() {
 		final_polygon.invert();
 	}
 
-	Vector<int> triangles = Geometry::triangulate_polygon(final_polygon);
+	Vector<int> triangles = Geometry2D::triangulate_polygon(final_polygon);
 
-	if (triangles.size() < 3)
-		return NULL;
+	if (triangles.size() < 3) {
+		return nullptr;
+	}
 
-	Path *path = NULL;
+	Path3D *path = nullptr;
 	Ref<Curve3D> curve;
 
 	// get bounds for our polygon
@@ -1797,51 +1748,68 @@ CSGBrush *CSGPolygon::_build_brush() {
 			final_polygon_min = p;
 			final_polygon_max = final_polygon_min;
 		} else {
-			if (p.x < final_polygon_min.x) final_polygon_min.x = p.x;
-			if (p.y < final_polygon_min.y) final_polygon_min.y = p.y;
+			if (p.x < final_polygon_min.x) {
+				final_polygon_min.x = p.x;
+			}
+			if (p.y < final_polygon_min.y) {
+				final_polygon_min.y = p.y;
+			}
 
-			if (p.x > final_polygon_max.x) final_polygon_max.x = p.x;
-			if (p.y > final_polygon_max.y) final_polygon_max.y = p.y;
+			if (p.x > final_polygon_max.x) {
+				final_polygon_max.x = p.x;
+			}
+			if (p.y > final_polygon_max.y) {
+				final_polygon_max.y = p.y;
+			}
 		}
 	}
 	Vector2 final_polygon_size = final_polygon_max - final_polygon_min;
 
 	if (mode == MODE_PATH) {
-		if (!has_node(path_node))
-			return NULL;
+		if (!has_node(path_node)) {
+			return nullptr;
+		}
 		Node *n = get_node(path_node);
-		if (!n)
-			return NULL;
-		path = Object::cast_to<Path>(n);
-		if (!path)
-			return NULL;
+		if (!n) {
+			return nullptr;
+		}
+		path = Object::cast_to<Path3D>(n);
+		if (!path) {
+			return nullptr;
+		}
 
 		if (path != path_cache) {
 			if (path_cache) {
-				path_cache->disconnect("tree_exited", this, "_path_exited");
-				path_cache->disconnect("curve_changed", this, "_path_changed");
-				path_cache = NULL;
+				path_cache->disconnect("tree_exited", callable_mp(this, &CSGPolygon3D::_path_exited));
+				path_cache->disconnect("curve_changed", callable_mp(this, &CSGPolygon3D::_path_changed));
+				path_cache = nullptr;
 			}
 
 			path_cache = path;
 
-			path_cache->connect("tree_exited", this, "_path_exited");
-			path_cache->connect("curve_changed", this, "_path_changed");
-			path_cache = NULL;
+			path_cache->connect("tree_exited", callable_mp(this, &CSGPolygon3D::_path_exited));
+			path_cache->connect("curve_changed", callable_mp(this, &CSGPolygon3D::_path_changed));
+			path_cache = nullptr;
 		}
 		curve = path->get_curve();
-		if (curve.is_null())
-			return NULL;
-		if (curve->get_baked_length() <= 0)
-			return NULL;
+		if (curve.is_null()) {
+			return nullptr;
+		}
+		if (curve->get_baked_length() <= 0) {
+			return nullptr;
+		}
 	}
 	CSGBrush *brush = memnew(CSGBrush);
 
 	int face_count = 0;
 
 	switch (mode) {
-		case MODE_DEPTH: face_count = triangles.size() * 2 / 3 + (final_polygon.size()) * 2; break;
-		case MODE_SPIN: face_count = (spin_degrees < 360 ? triangles.size() * 2 / 3 : 0) + (final_polygon.size()) * 2 * spin_sides; break;
+		case MODE_DEPTH:
+			face_count = triangles.size() * 2 / 3 + (final_polygon.size()) * 2;
+			break;
+		case MODE_SPIN:
+			face_count = (spin_degrees < 360 ? triangles.size() * 2 / 3 : 0) + (final_polygon.size()) * 2 * spin_sides;
+			break;
 		case MODE_PATH: {
 			float bl = curve->get_baked_length();
 			int splits = MAX(2, Math::ceil(bl / path_interval));
@@ -1856,11 +1824,11 @@ CSGBrush *CSGPolygon::_build_brush() {
 	bool invert_val = is_inverting_faces();
 	Ref<Material> material = get_material();
 
-	PoolVector<Vector3> faces;
-	PoolVector<Vector2> uvs;
-	PoolVector<bool> smooth;
-	PoolVector<Ref<Material> > materials;
-	PoolVector<bool> invert;
+	Vector<Vector3> faces;
+	Vector<Vector2> uvs;
+	Vector<bool> smooth;
+	Vector<Ref<Material>> materials;
+	Vector<bool> invert;
 
 	faces.resize(face_count * 3);
 	uvs.resize(face_count * 3);
@@ -1871,21 +1839,18 @@ CSGBrush *CSGPolygon::_build_brush() {
 
 	AABB aabb; //must be computed
 	{
-
-		PoolVector<Vector3>::Write facesw = faces.write();
-		PoolVector<Vector2>::Write uvsw = uvs.write();
-		PoolVector<bool>::Write smoothw = smooth.write();
-		PoolVector<Ref<Material> >::Write materialsw = materials.write();
-		PoolVector<bool>::Write invertw = invert.write();
+		Vector3 *facesw = faces.ptrw();
+		Vector2 *uvsw = uvs.ptrw();
+		bool *smoothw = smooth.ptrw();
+		Ref<Material> *materialsw = materials.ptrw();
+		bool *invertw = invert.ptrw();
 
 		int face = 0;
 
 		switch (mode) {
 			case MODE_DEPTH: {
-
 				//add triangles, front and back
 				for (int i = 0; i < 2; i++) {
-
 					for (int j = 0; j < triangles.size(); j += 3) {
 						for (int k = 0; k < 3; k++) {
 							int src[3] = { 0, i == 0 ? 1 : 2, i == 0 ? 2 : 1 };
@@ -1910,7 +1875,6 @@ CSGBrush *CSGPolygon::_build_brush() {
 
 				//add triangles for depth
 				for (int i = 0; i < final_polygon.size(); i++) {
-
 					int i_n = (i + 1) % final_polygon.size();
 
 					Vector3 v[4] = {
@@ -1960,9 +1924,7 @@ CSGBrush *CSGPolygon::_build_brush() {
 
 			} break;
 			case MODE_SPIN: {
-
 				for (int i = 0; i < spin_sides; i++) {
-
 					float inci = float(i) / spin_sides;
 					float inci_n = float((i + 1)) / spin_sides;
 
@@ -1974,7 +1936,6 @@ CSGBrush *CSGPolygon::_build_brush() {
 
 					//add triangles for depth
 					for (int j = 0; j < final_polygon.size(); j++) {
-
 						int j_n = (j + 1) % final_polygon.size();
 
 						Vector3 v[4] = {
@@ -2023,7 +1984,6 @@ CSGBrush *CSGPolygon::_build_brush() {
 					}
 
 					if (i == 0 && spin_degrees < 360) {
-
 						for (int j = 0; j < triangles.size(); j += 3) {
 							for (int k = 0; k < 3; k++) {
 								int src[3] = { 0, 2, 1 };
@@ -2041,7 +2001,6 @@ CSGBrush *CSGPolygon::_build_brush() {
 					}
 
 					if (i == spin_sides - 1 && spin_degrees < 360) {
-
 						for (int j = 0; j < triangles.size(); j += 3) {
 							for (int k = 0; k < 3; k++) {
 								int src[3] = { 0, 1, 2 };
@@ -2061,7 +2020,6 @@ CSGBrush *CSGPolygon::_build_brush() {
 				}
 			} break;
 			case MODE_PATH: {
-
 				float bl = curve->get_baked_length();
 				int splits = MAX(2, Math::ceil(bl / path_interval));
 				float u1 = 0.0;
@@ -2087,7 +2045,6 @@ CSGBrush *CSGPolygon::_build_brush() {
 				}
 
 				for (int i = 0; i <= splits; i++) {
-
 					float ofs = i * path_interval;
 					if (ofs > bl) {
 						ofs = bl;
@@ -2127,7 +2084,6 @@ CSGBrush *CSGPolygon::_build_brush() {
 						//put triangles where they belong
 						//add triangles for depth
 						for (int j = 0; j < final_polygon.size(); j++) {
-
 							int j_n = (j + 1) % final_polygon.size();
 
 							Vector3 v[4] = {
@@ -2177,7 +2133,6 @@ CSGBrush *CSGPolygon::_build_brush() {
 					}
 
 					if (i == 0 && !path_joined) {
-
 						for (int j = 0; j < triangles.size(); j += 3) {
 							for (int k = 0; k < 3; k++) {
 								int src[3] = { 0, 1, 2 };
@@ -2195,7 +2150,6 @@ CSGBrush *CSGPolygon::_build_brush() {
 					}
 
 					if (i == splits && !path_joined) {
-
 						for (int j = 0; j < triangles.size(); j += 3) {
 							for (int k = 0; k < 3; k++) {
 								int src[3] = { 0, 2, 1 };
@@ -2239,17 +2193,17 @@ CSGBrush *CSGPolygon::_build_brush() {
 	return brush;
 }
 
-void CSGPolygon::_notification(int p_what) {
+void CSGPolygon3D::_notification(int p_what) {
 	if (p_what == NOTIFICATION_EXIT_TREE) {
 		if (path_cache) {
-			path_cache->disconnect("tree_exited", this, "_path_exited");
-			path_cache->disconnect("curve_changed", this, "_path_changed");
-			path_cache = NULL;
+			path_cache->disconnect("tree_exited", callable_mp(this, &CSGPolygon3D::_path_exited));
+			path_cache->disconnect("curve_changed", callable_mp(this, &CSGPolygon3D::_path_changed));
+			path_cache = nullptr;
 		}
 	}
 }
 
-void CSGPolygon::_validate_property(PropertyInfo &property) const {
+void CSGPolygon3D::_validate_property(PropertyInfo &property) const {
 	if (property.name.begins_with("spin") && mode != MODE_SPIN) {
 		property.usage = 0;
 	}
@@ -2260,77 +2214,74 @@ void CSGPolygon::_validate_property(PropertyInfo &property) const {
 		property.usage = 0;
 	}
 
-	CSGShape::_validate_property(property);
+	CSGShape3D::_validate_property(property);
 }
 
-void CSGPolygon::_path_changed() {
+void CSGPolygon3D::_path_changed() {
 	_make_dirty();
 	update_gizmo();
 }
 
-void CSGPolygon::_path_exited() {
-	path_cache = NULL;
+void CSGPolygon3D::_path_exited() {
+	path_cache = nullptr;
 }
 
-void CSGPolygon::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("set_polygon", "polygon"), &CSGPolygon::set_polygon);
-	ClassDB::bind_method(D_METHOD("get_polygon"), &CSGPolygon::get_polygon);
-
-	ClassDB::bind_method(D_METHOD("set_mode", "mode"), &CSGPolygon::set_mode);
-	ClassDB::bind_method(D_METHOD("get_mode"), &CSGPolygon::get_mode);
+void CSGPolygon3D::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("set_polygon", "polygon"), &CSGPolygon3D::set_polygon);
+	ClassDB::bind_method(D_METHOD("get_polygon"), &CSGPolygon3D::get_polygon);
 
-	ClassDB::bind_method(D_METHOD("set_depth", "depth"), &CSGPolygon::set_depth);
-	ClassDB::bind_method(D_METHOD("get_depth"), &CSGPolygon::get_depth);
+	ClassDB::bind_method(D_METHOD("set_mode", "mode"), &CSGPolygon3D::set_mode);
+	ClassDB::bind_method(D_METHOD("get_mode"), &CSGPolygon3D::get_mode);
 
-	ClassDB::bind_method(D_METHOD("set_spin_degrees", "degrees"), &CSGPolygon::set_spin_degrees);
-	ClassDB::bind_method(D_METHOD("get_spin_degrees"), &CSGPolygon::get_spin_degrees);
+	ClassDB::bind_method(D_METHOD("set_depth", "depth"), &CSGPolygon3D::set_depth);
+	ClassDB::bind_method(D_METHOD("get_depth"), &CSGPolygon3D::get_depth);
 
-	ClassDB::bind_method(D_METHOD("set_spin_sides", "spin_sides"), &CSGPolygon::set_spin_sides);
-	ClassDB::bind_method(D_METHOD("get_spin_sides"), &CSGPolygon::get_spin_sides);
+	ClassDB::bind_method(D_METHOD("set_spin_degrees", "degrees"), &CSGPolygon3D::set_spin_degrees);
+	ClassDB::bind_method(D_METHOD("get_spin_degrees"), &CSGPolygon3D::get_spin_degrees);
 
-	ClassDB::bind_method(D_METHOD("set_path_node", "path"), &CSGPolygon::set_path_node);
-	ClassDB::bind_method(D_METHOD("get_path_node"), &CSGPolygon::get_path_node);
+	ClassDB::bind_method(D_METHOD("set_spin_sides", "spin_sides"), &CSGPolygon3D::set_spin_sides);
+	ClassDB::bind_method(D_METHOD("get_spin_sides"), &CSGPolygon3D::get_spin_sides);
 
-	ClassDB::bind_method(D_METHOD("set_path_interval", "distance"), &CSGPolygon::set_path_interval);
-	ClassDB::bind_method(D_METHOD("get_path_interval"), &CSGPolygon::get_path_interval);
+	ClassDB::bind_method(D_METHOD("set_path_node", "path"), &CSGPolygon3D::set_path_node);
+	ClassDB::bind_method(D_METHOD("get_path_node"), &CSGPolygon3D::get_path_node);
 
-	ClassDB::bind_method(D_METHOD("set_path_rotation", "mode"), &CSGPolygon::set_path_rotation);
-	ClassDB::bind_method(D_METHOD("get_path_rotation"), &CSGPolygon::get_path_rotation);
+	ClassDB::bind_method(D_METHOD("set_path_interval", "distance"), &CSGPolygon3D::set_path_interval);
+	ClassDB::bind_method(D_METHOD("get_path_interval"), &CSGPolygon3D::get_path_interval);
 
-	ClassDB::bind_method(D_METHOD("set_path_local", "enable"), &CSGPolygon::set_path_local);
-	ClassDB::bind_method(D_METHOD("is_path_local"), &CSGPolygon::is_path_local);
+	ClassDB::bind_method(D_METHOD("set_path_rotation", "mode"), &CSGPolygon3D::set_path_rotation);
+	ClassDB::bind_method(D_METHOD("get_path_rotation"), &CSGPolygon3D::get_path_rotation);
 
-	ClassDB::bind_method(D_METHOD("set_path_continuous_u", "enable"), &CSGPolygon::set_path_continuous_u);
-	ClassDB::bind_method(D_METHOD("is_path_continuous_u"), &CSGPolygon::is_path_continuous_u);
+	ClassDB::bind_method(D_METHOD("set_path_local", "enable"), &CSGPolygon3D::set_path_local);
+	ClassDB::bind_method(D_METHOD("is_path_local"), &CSGPolygon3D::is_path_local);
 
-	ClassDB::bind_method(D_METHOD("set_path_joined", "enable"), &CSGPolygon::set_path_joined);
-	ClassDB::bind_method(D_METHOD("is_path_joined"), &CSGPolygon::is_path_joined);
+	ClassDB::bind_method(D_METHOD("set_path_continuous_u", "enable"), &CSGPolygon3D::set_path_continuous_u);
+	ClassDB::bind_method(D_METHOD("is_path_continuous_u"), &CSGPolygon3D::is_path_continuous_u);
 
-	ClassDB::bind_method(D_METHOD("set_material", "material"), &CSGPolygon::set_material);
-	ClassDB::bind_method(D_METHOD("get_material"), &CSGPolygon::get_material);
+	ClassDB::bind_method(D_METHOD("set_path_joined", "enable"), &CSGPolygon3D::set_path_joined);
+	ClassDB::bind_method(D_METHOD("is_path_joined"), &CSGPolygon3D::is_path_joined);
 
-	ClassDB::bind_method(D_METHOD("set_smooth_faces", "smooth_faces"), &CSGPolygon::set_smooth_faces);
-	ClassDB::bind_method(D_METHOD("get_smooth_faces"), &CSGPolygon::get_smooth_faces);
+	ClassDB::bind_method(D_METHOD("set_material", "material"), &CSGPolygon3D::set_material);
+	ClassDB::bind_method(D_METHOD("get_material"), &CSGPolygon3D::get_material);
 
-	ClassDB::bind_method(D_METHOD("_is_editable_3d_polygon"), &CSGPolygon::_is_editable_3d_polygon);
-	ClassDB::bind_method(D_METHOD("_has_editable_3d_polygon_no_depth"), &CSGPolygon::_has_editable_3d_polygon_no_depth);
+	ClassDB::bind_method(D_METHOD("set_smooth_faces", "smooth_faces"), &CSGPolygon3D::set_smooth_faces);
+	ClassDB::bind_method(D_METHOD("get_smooth_faces"), &CSGPolygon3D::get_smooth_faces);
 
-	ClassDB::bind_method(D_METHOD("_path_exited"), &CSGPolygon::_path_exited);
-	ClassDB::bind_method(D_METHOD("_path_changed"), &CSGPolygon::_path_changed);
+	ClassDB::bind_method(D_METHOD("_is_editable_3d_polygon"), &CSGPolygon3D::_is_editable_3d_polygon);
+	ClassDB::bind_method(D_METHOD("_has_editable_3d_polygon_no_depth"), &CSGPolygon3D::_has_editable_3d_polygon_no_depth);
 
-	ADD_PROPERTY(PropertyInfo(Variant::POOL_VECTOR2_ARRAY, "polygon"), "set_polygon", "get_polygon");
+	ADD_PROPERTY(PropertyInfo(Variant::PACKED_VECTOR2_ARRAY, "polygon"), "set_polygon", "get_polygon");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "mode", PROPERTY_HINT_ENUM, "Depth,Spin,Path"), "set_mode", "get_mode");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "depth", PROPERTY_HINT_EXP_RANGE, "0.001,1000.0,0.001,or_greater"), "set_depth", "get_depth");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "spin_degrees", PROPERTY_HINT_RANGE, "1,360,0.1"), "set_spin_degrees", "get_spin_degrees");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "depth", PROPERTY_HINT_EXP_RANGE, "0.001,1000.0,0.001,or_greater"), "set_depth", "get_depth");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "spin_degrees", PROPERTY_HINT_RANGE, "1,360,0.1"), "set_spin_degrees", "get_spin_degrees");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "spin_sides", PROPERTY_HINT_RANGE, "3,64,1"), "set_spin_sides", "get_spin_sides");
 	ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "path_node", PROPERTY_HINT_NODE_PATH_VALID_TYPES, "Path"), "set_path_node", "get_path_node");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "path_interval", PROPERTY_HINT_EXP_RANGE, "0.001,1000.0,0.001,or_greater"), "set_path_interval", "get_path_interval");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "path_interval", PROPERTY_HINT_EXP_RANGE, "0.001,1000.0,0.001,or_greater"), "set_path_interval", "get_path_interval");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "path_rotation", PROPERTY_HINT_ENUM, "Polygon,Path,PathFollow"), "set_path_rotation", "get_path_rotation");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "path_local"), "set_path_local", "is_path_local");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "path_continuous_u"), "set_path_continuous_u", "is_path_continuous_u");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "path_joined"), "set_path_joined", "is_path_joined");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "smooth_faces"), "set_smooth_faces", "get_smooth_faces");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "material", PROPERTY_HINT_RESOURCE_TYPE, "SpatialMaterial,ShaderMaterial"), "set_material", "get_material");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "material", PROPERTY_HINT_RESOURCE_TYPE, "StandardMaterial3D,ShaderMaterial"), "set_material", "get_material");
 
 	BIND_ENUM_CONSTANT(MODE_DEPTH);
 	BIND_ENUM_CONSTANT(MODE_SPIN);
@@ -2341,148 +2292,147 @@ void CSGPolygon::_bind_methods() {
 	BIND_ENUM_CONSTANT(PATH_ROTATION_PATH_FOLLOW);
 }
 
-void CSGPolygon::set_polygon(const Vector<Vector2> &p_polygon) {
+void CSGPolygon3D::set_polygon(const Vector<Vector2> &p_polygon) {
 	polygon = p_polygon;
 	_make_dirty();
 	update_gizmo();
 }
 
-Vector<Vector2> CSGPolygon::get_polygon() const {
+Vector<Vector2> CSGPolygon3D::get_polygon() const {
 	return polygon;
 }
 
-void CSGPolygon::set_mode(Mode p_mode) {
+void CSGPolygon3D::set_mode(Mode p_mode) {
 	mode = p_mode;
 	_make_dirty();
 	update_gizmo();
 	_change_notify();
 }
 
-CSGPolygon::Mode CSGPolygon::get_mode() const {
+CSGPolygon3D::Mode CSGPolygon3D::get_mode() const {
 	return mode;
 }
 
-void CSGPolygon::set_depth(const float p_depth) {
+void CSGPolygon3D::set_depth(const float p_depth) {
 	ERR_FAIL_COND(p_depth < 0.001);
 	depth = p_depth;
 	_make_dirty();
 	update_gizmo();
 }
 
-float CSGPolygon::get_depth() const {
+float CSGPolygon3D::get_depth() const {
 	return depth;
 }
 
-void CSGPolygon::set_path_continuous_u(bool p_enable) {
+void CSGPolygon3D::set_path_continuous_u(bool p_enable) {
 	path_continuous_u = p_enable;
 	_make_dirty();
 }
 
-bool CSGPolygon::is_path_continuous_u() const {
+bool CSGPolygon3D::is_path_continuous_u() const {
 	return path_continuous_u;
 }
 
-void CSGPolygon::set_spin_degrees(const float p_spin_degrees) {
+void CSGPolygon3D::set_spin_degrees(const float p_spin_degrees) {
 	ERR_FAIL_COND(p_spin_degrees < 0.01 || p_spin_degrees > 360);
 	spin_degrees = p_spin_degrees;
 	_make_dirty();
 	update_gizmo();
 }
 
-float CSGPolygon::get_spin_degrees() const {
+float CSGPolygon3D::get_spin_degrees() const {
 	return spin_degrees;
 }
 
-void CSGPolygon::set_spin_sides(const int p_spin_sides) {
+void CSGPolygon3D::set_spin_sides(const int p_spin_sides) {
 	ERR_FAIL_COND(p_spin_sides < 3);
 	spin_sides = p_spin_sides;
 	_make_dirty();
 	update_gizmo();
 }
 
-int CSGPolygon::get_spin_sides() const {
+int CSGPolygon3D::get_spin_sides() const {
 	return spin_sides;
 }
 
-void CSGPolygon::set_path_node(const NodePath &p_path) {
+void CSGPolygon3D::set_path_node(const NodePath &p_path) {
 	path_node = p_path;
 	_make_dirty();
 	update_gizmo();
 }
 
-NodePath CSGPolygon::get_path_node() const {
+NodePath CSGPolygon3D::get_path_node() const {
 	return path_node;
 }
 
-void CSGPolygon::set_path_interval(float p_interval) {
+void CSGPolygon3D::set_path_interval(float p_interval) {
 	ERR_FAIL_COND_MSG(p_interval < 0.001, "Path interval cannot be smaller than 0.001.");
 	path_interval = p_interval;
 	_make_dirty();
 	update_gizmo();
 }
-float CSGPolygon::get_path_interval() const {
+
+float CSGPolygon3D::get_path_interval() const {
 	return path_interval;
 }
 
-void CSGPolygon::set_path_rotation(PathRotation p_rotation) {
+void CSGPolygon3D::set_path_rotation(PathRotation p_rotation) {
 	path_rotation = p_rotation;
 	_make_dirty();
 	update_gizmo();
 }
 
-CSGPolygon::PathRotation CSGPolygon::get_path_rotation() const {
+CSGPolygon3D::PathRotation CSGPolygon3D::get_path_rotation() const {
 	return path_rotation;
 }
 
-void CSGPolygon::set_path_local(bool p_enable) {
+void CSGPolygon3D::set_path_local(bool p_enable) {
 	path_local = p_enable;
 	_make_dirty();
 	update_gizmo();
 }
 
-bool CSGPolygon::is_path_local() const {
+bool CSGPolygon3D::is_path_local() const {
 	return path_local;
 }
 
-void CSGPolygon::set_path_joined(bool p_enable) {
+void CSGPolygon3D::set_path_joined(bool p_enable) {
 	path_joined = p_enable;
 	_make_dirty();
 	update_gizmo();
 }
 
-bool CSGPolygon::is_path_joined() const {
+bool CSGPolygon3D::is_path_joined() const {
 	return path_joined;
 }
 
-void CSGPolygon::set_smooth_faces(const bool p_smooth_faces) {
+void CSGPolygon3D::set_smooth_faces(const bool p_smooth_faces) {
 	smooth_faces = p_smooth_faces;
 	_make_dirty();
 }
 
-bool CSGPolygon::get_smooth_faces() const {
+bool CSGPolygon3D::get_smooth_faces() const {
 	return smooth_faces;
 }
 
-void CSGPolygon::set_material(const Ref<Material> &p_material) {
-
+void CSGPolygon3D::set_material(const Ref<Material> &p_material) {
 	material = p_material;
 	_make_dirty();
 }
 
-Ref<Material> CSGPolygon::get_material() const {
-
+Ref<Material> CSGPolygon3D::get_material() const {
 	return material;
 }
 
-bool CSGPolygon::_is_editable_3d_polygon() const {
+bool CSGPolygon3D::_is_editable_3d_polygon() const {
 	return true;
 }
 
-bool CSGPolygon::_has_editable_3d_polygon_no_depth() const {
+bool CSGPolygon3D::_has_editable_3d_polygon_no_depth() const {
 	return true;
 }
 
-CSGPolygon::CSGPolygon() {
+CSGPolygon3D::CSGPolygon3D() {
 	// defaults
 	mode = MODE_DEPTH;
 	polygon.push_back(Vector2(0, 0));
@@ -2498,5 +2448,5 @@ CSGPolygon::CSGPolygon() {
 	path_local = false;
 	path_continuous_u = false;
 	path_joined = false;
-	path_cache = NULL;
+	path_cache = nullptr;
 }
diff --git a/modules/csg/csg_shape.h b/modules/csg/csg_shape.h
index 1098feea51..d93693f145 100644
--- a/modules/csg/csg_shape.h
+++ b/modules/csg/csg_shape.h
@@ -34,12 +34,12 @@
 #define CSGJS_HEADER_ONLY
 
 #include "csg.h"
-#include "scene/3d/visual_instance.h"
-#include "scene/resources/concave_polygon_shape.h"
+#include "scene/3d/visual_instance_3d.h"
+#include "scene/resources/concave_polygon_shape_3d.h"
 #include "thirdparty/misc/mikktspace.h"
 
-class CSGShape : public GeometryInstance {
-	GDCLASS(CSGShape, GeometryInstance);
+class CSGShape3D : public GeometryInstance3D {
+	GDCLASS(CSGShape3D, GeometryInstance3D);
 
 public:
 	enum Operation {
@@ -51,7 +51,7 @@ public:
 
 private:
 	Operation operation;
-	CSGShape *parent;
+	CSGShape3D *parent;
 
 	CSGBrush *brush;
 
@@ -63,7 +63,7 @@ private:
 	bool use_collision;
 	uint32_t collision_layer;
 	uint32_t collision_mask;
-	Ref<ConcavePolygonShape> root_collision_shape;
+	Ref<ConcavePolygonShape3D> root_collision_shape;
 	RID root_collision_instance;
 
 	bool calculate_tangents;
@@ -80,17 +80,17 @@ private:
 	};
 
 	struct ShapeUpdateSurface {
-		PoolVector<Vector3> vertices;
-		PoolVector<Vector3> normals;
-		PoolVector<Vector2> uvs;
-		PoolVector<float> tans;
+		Vector<Vector3> vertices;
+		Vector<Vector3> normals;
+		Vector<Vector2> uvs;
+		Vector<float> tans;
 		Ref<Material> material;
 		int last_added;
 
-		PoolVector<Vector3>::Write verticesw;
-		PoolVector<Vector3>::Write normalsw;
-		PoolVector<Vector2>::Write uvsw;
-		PoolVector<float>::Write tansw;
+		Vector3 *verticesw;
+		Vector3 *normalsw;
+		Vector2 *uvsw;
+		float *tansw;
 	};
 
 	//mikktspace callbacks
@@ -111,10 +111,10 @@ protected:
 
 	static void _bind_methods();
 
-	friend class CSGCombiner;
+	friend class CSGCombiner3D;
 	CSGBrush *_get_brush();
 
-	virtual void _validate_property(PropertyInfo &property) const;
+	virtual void _validate_property(PropertyInfo &property) const override;
 
 public:
 	Array get_meshes() const;
@@ -122,10 +122,10 @@ public:
 	void set_operation(Operation p_operation);
 	Operation get_operation() const;
 
-	virtual PoolVector<Vector3> get_brush_faces();
+	virtual Vector<Vector3> get_brush_faces();
 
-	virtual AABB get_aabb() const;
-	virtual PoolVector<Face3> get_faces(uint32_t p_usage_flags) const;
+	virtual AABB get_aabb() const override;
+	virtual Vector<Face3> get_faces(uint32_t p_usage_flags) const override;
 
 	void set_use_collision(bool p_enable);
 	bool is_using_collision() const;
@@ -149,43 +149,43 @@ public:
 	bool is_calculating_tangents() const;
 
 	bool is_root_shape() const;
-	CSGShape();
-	~CSGShape();
+	CSGShape3D();
+	~CSGShape3D();
 };
 
-VARIANT_ENUM_CAST(CSGShape::Operation)
+VARIANT_ENUM_CAST(CSGShape3D::Operation)
 
-class CSGCombiner : public CSGShape {
-	GDCLASS(CSGCombiner, CSGShape);
+class CSGCombiner3D : public CSGShape3D {
+	GDCLASS(CSGCombiner3D, CSGShape3D);
 
 private:
-	virtual CSGBrush *_build_brush();
+	virtual CSGBrush *_build_brush() override;
 
 public:
-	CSGCombiner();
+	CSGCombiner3D();
 };
 
-class CSGPrimitive : public CSGShape {
-	GDCLASS(CSGPrimitive, CSGShape);
+class CSGPrimitive3D : public CSGShape3D {
+	GDCLASS(CSGPrimitive3D, CSGShape3D);
 
 private:
 	bool invert_faces;
 
 protected:
-	CSGBrush *_create_brush_from_arrays(const PoolVector<Vector3> &p_vertices, const PoolVector<Vector2> &p_uv, const PoolVector<bool> &p_smooth, const PoolVector<Ref<Material> > &p_materials);
+	CSGBrush *_create_brush_from_arrays(const Vector<Vector3> &p_vertices, const Vector<Vector2> &p_uv, const Vector<bool> &p_smooth, const Vector<Ref<Material>> &p_materials);
 	static void _bind_methods();
 
 public:
 	void set_invert_faces(bool p_invert);
 	bool is_inverting_faces();
 
-	CSGPrimitive();
+	CSGPrimitive3D();
 };
 
-class CSGMesh : public CSGPrimitive {
-	GDCLASS(CSGMesh, CSGPrimitive);
+class CSGMesh3D : public CSGPrimitive3D {
+	GDCLASS(CSGMesh3D, CSGPrimitive3D);
 
-	virtual CSGBrush *_build_brush();
+	virtual CSGBrush *_build_brush() override;
 
 	Ref<Mesh> mesh;
 	Ref<Material> material;
@@ -203,10 +203,9 @@ public:
 	Ref<Material> get_material() const;
 };
 
-class CSGSphere : public CSGPrimitive {
-
-	GDCLASS(CSGSphere, CSGPrimitive);
-	virtual CSGBrush *_build_brush();
+class CSGSphere3D : public CSGPrimitive3D {
+	GDCLASS(CSGSphere3D, CSGPrimitive3D);
+	virtual CSGBrush *_build_brush() override;
 
 	Ref<Material> material;
 	bool smooth_faces;
@@ -233,13 +232,12 @@ public:
 	void set_smooth_faces(bool p_smooth_faces);
 	bool get_smooth_faces() const;
 
-	CSGSphere();
+	CSGSphere3D();
 };
 
-class CSGBox : public CSGPrimitive {
-
-	GDCLASS(CSGBox, CSGPrimitive);
-	virtual CSGBrush *_build_brush();
+class CSGBox3D : public CSGPrimitive3D {
+	GDCLASS(CSGBox3D, CSGPrimitive3D);
+	virtual CSGBrush *_build_brush() override;
 
 	Ref<Material> material;
 	float width;
@@ -262,13 +260,12 @@ public:
 	void set_material(const Ref<Material> &p_material);
 	Ref<Material> get_material() const;
 
-	CSGBox();
+	CSGBox3D();
 };
 
-class CSGCylinder : public CSGPrimitive {
-
-	GDCLASS(CSGCylinder, CSGPrimitive);
-	virtual CSGBrush *_build_brush();
+class CSGCylinder3D : public CSGPrimitive3D {
+	GDCLASS(CSGCylinder3D, CSGPrimitive3D);
+	virtual CSGBrush *_build_brush() override;
 
 	Ref<Material> material;
 	float radius;
@@ -299,13 +296,12 @@ public:
 	void set_material(const Ref<Material> &p_material);
 	Ref<Material> get_material() const;
 
-	CSGCylinder();
+	CSGCylinder3D();
 };
 
-class CSGTorus : public CSGPrimitive {
-
-	GDCLASS(CSGTorus, CSGPrimitive);
-	virtual CSGBrush *_build_brush();
+class CSGTorus3D : public CSGPrimitive3D {
+	GDCLASS(CSGTorus3D, CSGPrimitive3D);
+	virtual CSGBrush *_build_brush() override;
 
 	Ref<Material> material;
 	float inner_radius;
@@ -336,12 +332,11 @@ public:
 	void set_material(const Ref<Material> &p_material);
 	Ref<Material> get_material() const;
 
-	CSGTorus();
+	CSGTorus3D();
 };
 
-class CSGPolygon : public CSGPrimitive {
-
-	GDCLASS(CSGPolygon, CSGPrimitive);
+class CSGPolygon3D : public CSGPrimitive3D {
+	GDCLASS(CSGPolygon3D, CSGPrimitive3D);
 
 public:
 	enum Mode {
@@ -357,7 +352,7 @@ public:
 	};
 
 private:
-	virtual CSGBrush *_build_brush();
+	virtual CSGBrush *_build_brush() override;
 
 	Vector<Vector2> polygon;
 	Ref<Material> material;
@@ -388,7 +383,7 @@ private:
 
 protected:
 	static void _bind_methods();
-	virtual void _validate_property(PropertyInfo &property) const;
+	virtual void _validate_property(PropertyInfo &property) const override;
 	void _notification(int p_what);
 
 public:
@@ -431,10 +426,10 @@ public:
 	void set_material(const Ref<Material> &p_material);
 	Ref<Material> get_material() const;
 
-	CSGPolygon();
+	CSGPolygon3D();
 };
 
-VARIANT_ENUM_CAST(CSGPolygon::Mode)
-VARIANT_ENUM_CAST(CSGPolygon::PathRotation)
+VARIANT_ENUM_CAST(CSGPolygon3D::Mode)
+VARIANT_ENUM_CAST(CSGPolygon3D::PathRotation)
 
 #endif // CSG_SHAPE_H
diff --git a/modules/csg/doc_classes/CSGBox.xml b/modules/csg/doc_classes/CSGBox3D.xml
index e2f0f8488a..492bf68c44 100644
--- a/modules/csg/doc_classes/CSGBox.xml
+++ b/modules/csg/doc_classes/CSGBox3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSGBox" inherits="CSGPrimitive" version="4.0">
+<class name="CSGBox3D" inherits="CSGPrimitive3D" version="4.0">
 	<brief_description>
 		A CSG Box shape.
 	</brief_description>
diff --git a/modules/csg/doc_classes/CSGCombiner.xml b/modules/csg/doc_classes/CSGCombiner.xml
deleted file mode 100644
index ab95d3c3ee..0000000000
--- a/modules/csg/doc_classes/CSGCombiner.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSGCombiner" inherits="CSGShape" version="4.0">
-	<brief_description>
-		A CSG node that allows you to combine other CSG modifiers.
-	</brief_description>
-	<description>
-		For complex arrangements of shapes, it is sometimes needed to add structure to your CSG nodes. The CSGCombiner node allows you to create this structure. The node encapsulates the result of the CSG operations of its children. In this way, it is possible to do operations on one set of shapes that are children of one CSGCombiner node, and a set of separate operations on a second set of shapes that are children of a second CSGCombiner node, and then do an operation that takes the two end results as its input to create the final shape.
-	</description>
-	<tutorials>
-	</tutorials>
-	<methods>
-	</methods>
-	<constants>
-	</constants>
-</class>
diff --git a/modules/csg/doc_classes/CSGCombiner3D.xml b/modules/csg/doc_classes/CSGCombiner3D.xml
new file mode 100644
index 0000000000..b55111eee4
--- /dev/null
+++ b/modules/csg/doc_classes/CSGCombiner3D.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class name="CSGCombiner3D" inherits="CSGShape3D" version="4.0">
+	<brief_description>
+		A CSG node that allows you to combine other CSG modifiers.
+	</brief_description>
+	<description>
+		For complex arrangements of shapes, it is sometimes needed to add structure to your CSG nodes. The CSGCombiner3D node allows you to create this structure. The node encapsulates the result of the CSG operations of its children. In this way, it is possible to do operations on one set of shapes that are children of one CSGCombiner3D node, and a set of separate operations on a second set of shapes that are children of a second CSGCombiner3D node, and then do an operation that takes the two end results as its input to create the final shape.
+	</description>
+	<tutorials>
+	</tutorials>
+	<methods>
+	</methods>
+	<constants>
+	</constants>
+</class>
diff --git a/modules/csg/doc_classes/CSGCylinder.xml b/modules/csg/doc_classes/CSGCylinder3D.xml
index 2dd8c6a8d0..bfd2a5d5f2 100644
--- a/modules/csg/doc_classes/CSGCylinder.xml
+++ b/modules/csg/doc_classes/CSGCylinder3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSGCylinder" inherits="CSGPrimitive" version="4.0">
+<class name="CSGCylinder3D" inherits="CSGPrimitive3D" version="4.0">
 	<brief_description>
 		A CSG Cylinder shape.
 	</brief_description>
diff --git a/modules/csg/doc_classes/CSGMesh.xml b/modules/csg/doc_classes/CSGMesh3D.xml
index f1fe2c286b..1bab8f4ee9 100644
--- a/modules/csg/doc_classes/CSGMesh.xml
+++ b/modules/csg/doc_classes/CSGMesh3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSGMesh" inherits="CSGPrimitive" version="4.0">
+<class name="CSGMesh3D" inherits="CSGPrimitive3D" version="4.0">
 	<brief_description>
 		A CSG Mesh shape that uses a mesh resource.
 	</brief_description>
diff --git a/modules/csg/doc_classes/CSGPolygon.xml b/modules/csg/doc_classes/CSGPolygon3D.xml
index 64ae46c69a..c55fa0983e 100644
--- a/modules/csg/doc_classes/CSGPolygon.xml
+++ b/modules/csg/doc_classes/CSGPolygon3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSGPolygon" inherits="CSGPrimitive" version="4.0">
+<class name="CSGPolygon3D" inherits="CSGPrimitive3D" version="4.0">
 	<brief_description>
 		Extrudes a 2D polygon shape to create a 3D mesh.
 	</brief_description>
@@ -17,7 +17,7 @@
 		<member name="material" type="Material" setter="set_material" getter="get_material">
 			Material to use for the resulting mesh.
 		</member>
-		<member name="mode" type="int" setter="set_mode" getter="get_mode" enum="CSGPolygon.Mode" default="0">
+		<member name="mode" type="int" setter="set_mode" getter="get_mode" enum="CSGPolygon3D.Mode" default="0">
 			Extrusion mode.
 		</member>
 		<member name="path_continuous_u" type="bool" setter="set_path_continuous_u" getter="is_path_continuous_u">
@@ -30,15 +30,15 @@
 			If [code]true[/code] the start and end of our path are joined together ensuring there is no seam when [member mode] is [constant MODE_PATH].
 		</member>
 		<member name="path_local" type="bool" setter="set_path_local" getter="is_path_local">
-			If [code]false[/code] we extrude centered on our path, if [code]true[/code] we extrude in relation to the position of our CSGPolygon when [member mode] is [constant MODE_PATH].
+			If [code]false[/code] we extrude centered on our path, if [code]true[/code] we extrude in relation to the position of our CSGPolygon3D when [member mode] is [constant MODE_PATH].
 		</member>
 		<member name="path_node" type="NodePath" setter="set_path_node" getter="get_path_node">
-			The [Shape] object containing the path along which we extrude when [member mode] is [constant MODE_PATH].
+			The [Shape3D] object containing the path along which we extrude when [member mode] is [constant MODE_PATH].
 		</member>
-		<member name="path_rotation" type="int" setter="set_path_rotation" getter="get_path_rotation" enum="CSGPolygon.PathRotation">
+		<member name="path_rotation" type="int" setter="set_path_rotation" getter="get_path_rotation" enum="CSGPolygon3D.PathRotation">
 			The method by which each slice is rotated along the path when [member mode] is [constant MODE_PATH].
 		</member>
-		<member name="polygon" type="PoolVector2Array" setter="set_polygon" getter="get_polygon" default="PoolVector2Array( 0, 0, 0, 1, 1, 1, 1, 0 )">
+		<member name="polygon" type="PackedVector2Array" setter="set_polygon" getter="get_polygon" default="PackedVector2Array( 0, 0, 0, 1, 1, 1, 1, 0 )">
 			Point array that defines the shape that we'll extrude.
 		</member>
 		<member name="smooth_faces" type="bool" setter="set_smooth_faces" getter="get_smooth_faces" default="false">
@@ -53,13 +53,13 @@
 	</members>
 	<constants>
 		<constant name="MODE_DEPTH" value="0" enum="Mode">
-			Shape is extruded to [member depth].
+			Shape3D is extruded to [member depth].
 		</constant>
 		<constant name="MODE_SPIN" value="1" enum="Mode">
-			Shape is extruded by rotating it around an axis.
+			Shape3D is extruded by rotating it around an axis.
 		</constant>
 		<constant name="MODE_PATH" value="2" enum="Mode">
-			Shape is extruded along a path set by a [Shape] set in [member path_node].
+			Shape3D is extruded along a path set by a [Shape3D] set in [member path_node].
 		</constant>
 		<constant name="PATH_ROTATION_POLYGON" value="0" enum="PathRotation">
 			Slice is not rotated.
diff --git a/modules/csg/doc_classes/CSGPrimitive.xml b/modules/csg/doc_classes/CSGPrimitive3D.xml
index ba395b7edd..31b7360fac 100644
--- a/modules/csg/doc_classes/CSGPrimitive.xml
+++ b/modules/csg/doc_classes/CSGPrimitive3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSGPrimitive" inherits="CSGShape" version="4.0">
+<class name="CSGPrimitive3D" inherits="CSGShape3D" version="4.0">
 	<brief_description>
 		Base class for CSG primitives.
 	</brief_description>
diff --git a/modules/csg/doc_classes/CSGShape.xml b/modules/csg/doc_classes/CSGShape3D.xml
index 64a2fb1840..dac556c7f1 100644
--- a/modules/csg/doc_classes/CSGShape.xml
+++ b/modules/csg/doc_classes/CSGShape3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSGShape" inherits="GeometryInstance" version="4.0">
+<class name="CSGShape3D" inherits="GeometryInstance3D" version="4.0">
 	<brief_description>
 		The CSG base class.
 	</brief_description>
@@ -71,12 +71,12 @@
 		<member name="collision_layer" type="int" setter="set_collision_layer" getter="get_collision_layer" default="1">
 			The physics layers this area is in.
 			Collidable objects can exist in any of 32 different layers. These layers work like a tagging system, and are not visual. A collidable can use these layers to select with which objects it can collide, using the collision_mask property.
-			A contact is detected if object A is in any of the layers that object B scans, or object B is in any layer scanned by object A.
+			A contact is detected if object A is in any of the layers that object B scans, or object B is in any layer scanned by object A. See [url=https://docs.godotengine.org/en/latest/tutorials/physics/physics_introduction.html#collision-layers-and-masks]Collision layers and masks[/url] in the documentation for more information.
 		</member>
 		<member name="collision_mask" type="int" setter="set_collision_mask" getter="get_collision_mask" default="1">
-			The physics layers this CSG shape scans for collisions.
+			The physics layers this CSG shape scans for collisions. See [url=https://docs.godotengine.org/en/latest/tutorials/physics/physics_introduction.html#collision-layers-and-masks]Collision layers and masks[/url] in the documentation for more information.
 		</member>
-		<member name="operation" type="int" setter="set_operation" getter="get_operation" enum="CSGShape.Operation" default="0">
+		<member name="operation" type="int" setter="set_operation" getter="get_operation" enum="CSGShape3D.Operation" default="0">
 			The operation that is performed on this shape. This is ignored for the first CSG child node as the operation is between this node and the previous child of this nodes parent.
 		</member>
 		<member name="snap" type="float" setter="set_snap" getter="get_snap" default="0.001">
diff --git a/modules/csg/doc_classes/CSGSphere.xml b/modules/csg/doc_classes/CSGSphere3D.xml
index 847cc63586..4d5b3be099 100644
--- a/modules/csg/doc_classes/CSGSphere.xml
+++ b/modules/csg/doc_classes/CSGSphere3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSGSphere" inherits="CSGPrimitive" version="4.0">
+<class name="CSGSphere3D" inherits="CSGPrimitive3D" version="4.0">
 	<brief_description>
 		A CSG Sphere shape.
 	</brief_description>
diff --git a/modules/csg/doc_classes/CSGTorus.xml b/modules/csg/doc_classes/CSGTorus3D.xml
index 84a08edaf5..abe3eab913 100644
--- a/modules/csg/doc_classes/CSGTorus.xml
+++ b/modules/csg/doc_classes/CSGTorus3D.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSGTorus" inherits="CSGPrimitive" version="4.0">
+<class name="CSGTorus3D" inherits="CSGPrimitive3D" version="4.0">
 	<brief_description>
 		A CSG Torus shape.
 	</brief_description>
diff --git a/modules/csg/icons/icon_c_s_g_box.svg b/modules/csg/icons/CSGBox3D.svg
index 67e34df444..67e34df444 100644
--- a/modules/csg/icons/icon_c_s_g_box.svg
+++ b/modules/csg/icons/CSGBox3D.svg
diff --git a/modules/csg/icons/icon_c_s_g_capsule.svg b/modules/csg/icons/CSGCapsule3D.svg
index 92a7b5a870..92a7b5a870 100644
--- a/modules/csg/icons/icon_c_s_g_capsule.svg
+++ b/modules/csg/icons/CSGCapsule3D.svg
diff --git a/modules/csg/icons/icon_c_s_g_combiner.svg b/modules/csg/icons/CSGCombiner3D.svg
index cce2902e24..cce2902e24 100644
--- a/modules/csg/icons/icon_c_s_g_combiner.svg
+++ b/modules/csg/icons/CSGCombiner3D.svg
diff --git a/modules/csg/icons/icon_c_s_g_cylinder.svg b/modules/csg/icons/CSGCylinder3D.svg
index 645a74c79b..645a74c79b 100644
--- a/modules/csg/icons/icon_c_s_g_cylinder.svg
+++ b/modules/csg/icons/CSGCylinder3D.svg
diff --git a/modules/csg/icons/icon_c_s_g_mesh.svg b/modules/csg/icons/CSGMesh3D.svg
index 6e940a4aa5..6e940a4aa5 100644
--- a/modules/csg/icons/icon_c_s_g_mesh.svg
+++ b/modules/csg/icons/CSGMesh3D.svg
diff --git a/modules/csg/icons/icon_c_s_g_polygon.svg b/modules/csg/icons/CSGPolygon3D.svg
index 71b03cb8e6..71b03cb8e6 100644
--- a/modules/csg/icons/icon_c_s_g_polygon.svg
+++ b/modules/csg/icons/CSGPolygon3D.svg
diff --git a/modules/csg/icons/icon_c_s_g_sphere.svg b/modules/csg/icons/CSGSphere3D.svg
index f81b566993..f81b566993 100644
--- a/modules/csg/icons/icon_c_s_g_sphere.svg
+++ b/modules/csg/icons/CSGSphere3D.svg
diff --git a/modules/csg/icons/icon_c_s_g_torus.svg b/modules/csg/icons/CSGTorus3D.svg
index 3d30aa47b2..3d30aa47b2 100644
--- a/modules/csg/icons/icon_c_s_g_torus.svg
+++ b/modules/csg/icons/CSGTorus3D.svg
diff --git a/modules/csg/register_types.cpp b/modules/csg/register_types.cpp
index 677a20df38..a8bcc2fed1 100644
--- a/modules/csg/register_types.cpp
+++ b/modules/csg/register_types.cpp
@@ -34,18 +34,17 @@
 #include "csg_shape.h"
 
 void register_csg_types() {
-
 #ifndef _3D_DISABLED
 
-	ClassDB::register_virtual_class<CSGShape>();
-	ClassDB::register_virtual_class<CSGPrimitive>();
-	ClassDB::register_class<CSGMesh>();
-	ClassDB::register_class<CSGSphere>();
-	ClassDB::register_class<CSGBox>();
-	ClassDB::register_class<CSGCylinder>();
-	ClassDB::register_class<CSGTorus>();
-	ClassDB::register_class<CSGPolygon>();
-	ClassDB::register_class<CSGCombiner>();
+	ClassDB::register_virtual_class<CSGShape3D>();
+	ClassDB::register_virtual_class<CSGPrimitive3D>();
+	ClassDB::register_class<CSGMesh3D>();
+	ClassDB::register_class<CSGSphere3D>();
+	ClassDB::register_class<CSGBox3D>();
+	ClassDB::register_class<CSGCylinder3D>();
+	ClassDB::register_class<CSGTorus3D>();
+	ClassDB::register_class<CSGPolygon3D>();
+	ClassDB::register_class<CSGCombiner3D>();
 
 #ifdef TOOLS_ENABLED
 	EditorPlugins::add_by_type<EditorPluginCSG>();
diff --git a/modules/csg/register_types.h b/modules/csg/register_types.h
index 4eadeea254..926e598561 100644
--- a/modules/csg/register_types.h
+++ b/modules/csg/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef CSG_REGISTER_TYPES_H
+#define CSG_REGISTER_TYPES_H
+
 void register_csg_types();
 void unregister_csg_types();
+
+#endif // CSG_REGISTER_TYPES_H
diff --git a/modules/cvtt/SCsub b/modules/cvtt/SCsub
index 746b23ca28..5438f7ebac 100644
--- a/modules/cvtt/SCsub
+++ b/modules/cvtt/SCsub
@@ -1,14 +1,14 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_cvtt = env_modules.Clone()
 
 # Thirdparty source files
 thirdparty_dir = "#thirdparty/cvtt/"
 thirdparty_sources = [
-    "ConvectionKernels.cpp"
+    "ConvectionKernels.cpp",
 ]
 
 thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
diff --git a/modules/cvtt/config.py b/modules/cvtt/config.py
index 098f1eafa9..53b8f2f2e3 100644
--- a/modules/cvtt/config.py
+++ b/modules/cvtt/config.py
@@ -1,5 +1,6 @@
 def can_build(env, platform):
-    return env['tools']
+    return env["tools"]
+
 
 def configure(env):
     pass
diff --git a/modules/cvtt/image_compress_cvtt.cpp b/modules/cvtt/image_compress_cvtt.cpp
index c261350e89..2a4f836478 100644
--- a/modules/cvtt/image_compress_cvtt.cpp
+++ b/modules/cvtt/image_compress_cvtt.cpp
@@ -136,10 +136,10 @@ static void _digest_job_queue(void *p_job_queue) {
 	}
 }
 
-void image_compress_cvtt(Image *p_image, float p_lossy_quality, Image::CompressSource p_source) {
-
-	if (p_image->get_format() >= Image::FORMAT_BPTC_RGBA)
+void image_compress_cvtt(Image *p_image, float p_lossy_quality, Image::UsedChannels p_channels) {
+	if (p_image->get_format() >= Image::FORMAT_BPTC_RGBA) {
 		return; //do not compress, already compressed
+	}
 
 	int w = p_image->get_width();
 	int h = p_image->get_height();
@@ -154,20 +154,21 @@ void image_compress_cvtt(Image *p_image, float p_lossy_quality, Image::CompressS
 	cvtt::Options options;
 	uint32_t flags = cvtt::Flags::Fastest;
 
-	if (p_lossy_quality > 0.85)
+	if (p_lossy_quality > 0.85) {
 		flags = cvtt::Flags::Ultra;
-	else if (p_lossy_quality > 0.75)
+	} else if (p_lossy_quality > 0.75) {
 		flags = cvtt::Flags::Better;
-	else if (p_lossy_quality > 0.55)
+	} else if (p_lossy_quality > 0.55) {
 		flags = cvtt::Flags::Default;
-	else if (p_lossy_quality > 0.35)
+	} else if (p_lossy_quality > 0.35) {
 		flags = cvtt::Flags::Fast;
-	else if (p_lossy_quality > 0.15)
+	} else if (p_lossy_quality > 0.15) {
 		flags = cvtt::Flags::Faster;
+	}
 
 	flags |= cvtt::Flags::BC7_RespectPunchThrough;
 
-	if (p_source == Image::COMPRESS_SOURCE_NORMAL) {
+	if (p_channels == Image::USED_CHANNELS_RG) { //guessing this is a normalmap
 		flags |= cvtt::Flags::Uniform;
 	}
 
@@ -179,7 +180,7 @@ void image_compress_cvtt(Image *p_image, float p_lossy_quality, Image::CompressS
 			p_image->convert(Image::FORMAT_RGBH);
 		}
 
-		PoolVector<uint8_t>::Read rb = p_image->get_data().read();
+		const uint8_t *rb = p_image->get_data().ptr();
 
 		const uint16_t *source_data = reinterpret_cast<const uint16_t *>(&rb[0]);
 		int pixel_element_count = w * h * 3;
@@ -195,15 +196,15 @@ void image_compress_cvtt(Image *p_image, float p_lossy_quality, Image::CompressS
 		p_image->convert(Image::FORMAT_RGBA8); //still uses RGBA to convert
 	}
 
-	PoolVector<uint8_t>::Read rb = p_image->get_data().read();
+	const uint8_t *rb = p_image->get_data().ptr();
 
-	PoolVector<uint8_t> data;
+	Vector<uint8_t> data;
 	int target_size = Image::get_image_data_size(w, h, target_format, p_image->has_mipmaps());
 	int mm_count = p_image->has_mipmaps() ? Image::get_image_required_mipmaps(w, h, target_format) : 0;
 	data.resize(target_size);
 	int shift = Image::get_format_pixel_rshift(target_format);
 
-	PoolVector<uint8_t>::Write wb = data.write();
+	uint8_t *wb = data.ptrw();
 
 	int dst_ofs = 0;
 
@@ -219,10 +220,9 @@ void image_compress_cvtt(Image *p_image, float p_lossy_quality, Image::CompressS
 	int num_job_threads = OS::get_singleton()->can_use_threads() ? (OS::get_singleton()->get_processor_count() - 1) : 0;
 #endif
 
-	PoolVector<CVTTCompressionRowTask> tasks;
+	Vector<CVTTCompressionRowTask> tasks;
 
 	for (int i = 0; i <= mm_count; i++) {
-
 		int bw = w % 4 != 0 ? w + (4 - w % 4) : w;
 		int bh = h % 4 != 0 ? h + (4 - h % 4) : h;
 
@@ -254,12 +254,12 @@ void image_compress_cvtt(Image *p_image, float p_lossy_quality, Image::CompressS
 	}
 
 	if (num_job_threads > 0) {
-		PoolVector<Thread *> threads;
+		Vector<Thread *> threads;
 		threads.resize(num_job_threads);
 
-		PoolVector<Thread *>::Write threads_wb = threads.write();
+		Thread **threads_wb = threads.ptrw();
 
-		PoolVector<CVTTCompressionRowTask>::Read tasks_rb = tasks.read();
+		const CVTTCompressionRowTask *tasks_rb = tasks.ptr();
 
 		job_queue.job_tasks = &tasks_rb[0];
 		job_queue.current_task = 0;
@@ -280,7 +280,6 @@ void image_compress_cvtt(Image *p_image, float p_lossy_quality, Image::CompressS
 }
 
 void image_decompress_cvtt(Image *p_image) {
-
 	Image::Format target_format;
 	bool is_signed = false;
 	bool is_hdr = false;
@@ -304,21 +303,20 @@ void image_decompress_cvtt(Image *p_image) {
 	int w = p_image->get_width();
 	int h = p_image->get_height();
 
-	PoolVector<uint8_t>::Read rb = p_image->get_data().read();
+	const uint8_t *rb = p_image->get_data().ptr();
 
-	PoolVector<uint8_t> data;
+	Vector<uint8_t> data;
 	int target_size = Image::get_image_data_size(w, h, target_format, p_image->has_mipmaps());
 	int mm_count = p_image->get_mipmap_count();
 	data.resize(target_size);
 
-	PoolVector<uint8_t>::Write wb = data.write();
+	uint8_t *wb = data.ptrw();
 
 	int bytes_per_pixel = is_hdr ? 6 : 4;
 
 	int dst_ofs = 0;
 
 	for (int i = 0; i <= mm_count; i++) {
-
 		int src_ofs = p_image->get_mipmap_offset(i);
 
 		const uint8_t *in_bytes = &rb[src_ofs];
@@ -388,8 +386,5 @@ void image_decompress_cvtt(Image *p_image) {
 		h >>= 1;
 	}
 
-	rb.release();
-	wb.release();
-
 	p_image->create(p_image->get_width(), p_image->get_height(), p_image->has_mipmaps(), target_format, data);
 }
diff --git a/modules/cvtt/image_compress_cvtt.h b/modules/cvtt/image_compress_cvtt.h
index ecb876ecc6..c1772199af 100644
--- a/modules/cvtt/image_compress_cvtt.h
+++ b/modules/cvtt/image_compress_cvtt.h
@@ -33,7 +33,7 @@
 
 #include "core/image.h"
 
-void image_compress_cvtt(Image *p_image, float p_lossy_quality, Image::CompressSource p_source);
+void image_compress_cvtt(Image *p_image, float p_lossy_quality, Image::UsedChannels p_channels);
 void image_decompress_cvtt(Image *p_image);
 
 #endif // IMAGE_COMPRESS_CVTT_H
diff --git a/modules/cvtt/register_types.cpp b/modules/cvtt/register_types.cpp
index 38542a33b9..e4a01cc787 100644
--- a/modules/cvtt/register_types.cpp
+++ b/modules/cvtt/register_types.cpp
@@ -35,7 +35,6 @@
 #include "image_compress_cvtt.h"
 
 void register_cvtt_types() {
-
 	Image::set_compress_bptc_func(image_compress_cvtt);
 	Image::_image_decompress_bptc = image_decompress_cvtt;
 }
diff --git a/modules/cvtt/register_types.h b/modules/cvtt/register_types.h
index 93f684cdd1..36b5e332d6 100644
--- a/modules/cvtt/register_types.h
+++ b/modules/cvtt/register_types.h
@@ -28,7 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef CVTT_REGISTER_TYPES_H
+#define CVTT_REGISTER_TYPES_H
+
 #ifdef TOOLS_ENABLED
+
 void register_cvtt_types();
 void unregister_cvtt_types();
-#endif
+
+#endif // TOOLS_ENABLED
+
+#endif // CVTT_REGISTER_TYPES_H
diff --git a/modules/dds/SCsub b/modules/dds/SCsub
index 3d92ff02d6..06980bd670 100644
--- a/modules/dds/SCsub
+++ b/modules/dds/SCsub
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_dds = env_modules.Clone()
 
diff --git a/modules/dds/config.py b/modules/dds/config.py
index 1c8cd12a2d..d22f9454ed 100644
--- a/modules/dds/config.py
+++ b/modules/dds/config.py
@@ -1,5 +1,6 @@
 def can_build(env, platform):
     return True
 
+
 def configure(env):
     pass
diff --git a/modules/dds/register_types.cpp b/modules/dds/register_types.cpp
index c6281ff01b..3991964a28 100644
--- a/modules/dds/register_types.cpp
+++ b/modules/dds/register_types.cpp
@@ -35,13 +35,11 @@
 static Ref<ResourceFormatDDS> resource_loader_dds;
 
 void register_dds_types() {
-
 	resource_loader_dds.instance();
 	ResourceLoader::add_resource_format_loader(resource_loader_dds);
 }
 
 void unregister_dds_types() {
-
 	ResourceLoader::remove_resource_format_loader(resource_loader_dds);
 	resource_loader_dds.unref();
 }
diff --git a/modules/dds/register_types.h b/modules/dds/register_types.h
index 1808a4af36..3cb7b5c2a6 100644
--- a/modules/dds/register_types.h
+++ b/modules/dds/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef DDS_REGISTER_TYPES_H
+#define DDS_REGISTER_TYPES_H
+
 void register_dds_types();
 void unregister_dds_types();
+
+#endif // DDS_REGISTER_TYPES_H
diff --git a/modules/dds/texture_loader_dds.cpp b/modules/dds/texture_loader_dds.cpp
index a7701329d8..2f4f7d7a4c 100644
--- a/modules/dds/texture_loader_dds.cpp
+++ b/modules/dds/texture_loader_dds.cpp
@@ -29,14 +29,15 @@
 /*************************************************************************/
 
 #include "texture_loader_dds.h"
+
 #include "core/os/file_access.h"
 
 #define PF_FOURCC(s) ((uint32_t)(((s)[3] << 24U) | ((s)[2] << 16U) | ((s)[1] << 8U) | ((s)[0])))
 
+// Reference: https://docs.microsoft.com/en-us/windows/win32/direct3ddds/dds-header
+
 enum {
 	DDS_MAGIC = 0x20534444,
-	DDSD_CAPS = 0x00000001,
-	DDSD_PIXELFORMAT = 0x00001000,
 	DDSD_PITCH = 0x00000008,
 	DDSD_LINEARSIZE = 0x00080000,
 	DDSD_MIPMAPCOUNT = 0x00020000,
@@ -47,7 +48,6 @@ enum {
 };
 
 enum DDSFormat {
-
 	DDS_DXT1,
 	DDS_DXT3,
 	DDS_DXT5,
@@ -94,19 +94,21 @@ static const DDSFormatInfo dds_format_info[DDS_MAX] = {
 	{ "GRAYSCALE_ALPHA", false, false, 1, 2, Image::FORMAT_LA8 }
 };
 
-RES ResourceFormatDDS::load(const String &p_path, const String &p_original_path, Error *r_error) {
-
-	if (r_error)
+RES ResourceFormatDDS::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, bool p_no_cache) {
+	if (r_error) {
 		*r_error = ERR_CANT_OPEN;
+	}
 
 	Error err;
 	FileAccess *f = FileAccess::open(p_path, FileAccess::READ, &err);
-	if (!f)
+	if (!f) {
 		return RES();
+	}
 
 	FileAccessRef fref(f);
-	if (r_error)
+	if (r_error) {
 		*r_error = ERR_FILE_CORRUPT;
+	}
 
 	ERR_FAIL_COND_V_MSG(err != OK, RES(), "Unable to open DDS texture file '" + p_path + "'.");
 
@@ -120,13 +122,15 @@ RES ResourceFormatDDS::load(const String &p_path, const String &p_original_path,
 	uint32_t mipmaps = f->get_32();
 
 	//skip 11
-	for (int i = 0; i < 11; i++)
+	for (int i = 0; i < 11; i++) {
 		f->get_32();
+	}
 
 	//validate
 
-	if (magic != DDS_MAGIC || hsize != 124 || !(flags & DDSD_PIXELFORMAT) || !(flags & DDSD_CAPS)) {
-
+	// We don't check DDSD_CAPS or DDSD_PIXELFORMAT, as they're mandatory when writing,
+	// but non-mandatory when reading (as some writers don't set them)...
+	if (magic != DDS_MAGIC || hsize != 124) {
 		ERR_FAIL_V_MSG(RES(), "Invalid or unsupported DDS texture file '" + p_path + "'.");
 	}
 
@@ -157,72 +161,57 @@ RES ResourceFormatDDS::load(const String &p_path, const String &p_original_path,
 	*/
 
 	//must avoid this later
-	while (f->get_position() < 128)
+	while (f->get_position() < 128) {
 		f->get_8();
+	}
 
 	DDSFormat dds_format;
 
 	if (format_flags & DDPF_FOURCC && format_fourcc == PF_FOURCC("DXT1")) {
-
 		dds_format = DDS_DXT1;
 	} else if (format_flags & DDPF_FOURCC && format_fourcc == PF_FOURCC("DXT3")) {
-
 		dds_format = DDS_DXT3;
 
 	} else if (format_flags & DDPF_FOURCC && format_fourcc == PF_FOURCC("DXT5")) {
-
 		dds_format = DDS_DXT5;
 	} else if (format_flags & DDPF_FOURCC && format_fourcc == PF_FOURCC("ATI1")) {
-
 		dds_format = DDS_ATI1;
 	} else if (format_flags & DDPF_FOURCC && format_fourcc == PF_FOURCC("ATI2")) {
-
 		dds_format = DDS_ATI2;
 	} else if (format_flags & DDPF_FOURCC && format_fourcc == PF_FOURCC("A2XY")) {
-
 		dds_format = DDS_A2XY;
 
 	} else if (format_flags & DDPF_RGB && format_flags & DDPF_ALPHAPIXELS && format_rgb_bits == 32 && format_red_mask == 0xff0000 && format_green_mask == 0xff00 && format_blue_mask == 0xff && format_alpha_mask == 0xff000000) {
-
 		dds_format = DDS_BGRA8;
 	} else if (format_flags & DDPF_RGB && !(format_flags & DDPF_ALPHAPIXELS) && format_rgb_bits == 24 && format_red_mask == 0xff0000 && format_green_mask == 0xff00 && format_blue_mask == 0xff) {
-
 		dds_format = DDS_BGR8;
 	} else if (format_flags & DDPF_RGB && format_flags & DDPF_ALPHAPIXELS && format_rgb_bits == 32 && format_red_mask == 0xff && format_green_mask == 0xff00 && format_blue_mask == 0xff0000 && format_alpha_mask == 0xff000000) {
-
 		dds_format = DDS_RGBA8;
 	} else if (format_flags & DDPF_RGB && !(format_flags & DDPF_ALPHAPIXELS) && format_rgb_bits == 24 && format_red_mask == 0xff && format_green_mask == 0xff00 && format_blue_mask == 0xff0000) {
-
 		dds_format = DDS_RGB8;
 
 	} else if (format_flags & DDPF_RGB && format_flags & DDPF_ALPHAPIXELS && format_rgb_bits == 16 && format_red_mask == 0x00007c00 && format_green_mask == 0x000003e0 && format_blue_mask == 0x0000001f && format_alpha_mask == 0x00008000) {
-
 		dds_format = DDS_BGR5A1;
 	} else if (format_flags & DDPF_RGB && format_flags & DDPF_ALPHAPIXELS && format_rgb_bits == 32 && format_red_mask == 0x3ff00000 && format_green_mask == 0xffc00 && format_blue_mask == 0x3ff && format_alpha_mask == 0xc0000000) {
-
 		dds_format = DDS_BGR10A2;
 	} else if (format_flags & DDPF_RGB && !(format_flags & DDPF_ALPHAPIXELS) && format_rgb_bits == 16 && format_red_mask == 0x0000f800 && format_green_mask == 0x000007e0 && format_blue_mask == 0x0000001f) {
-
 		dds_format = DDS_BGR565;
 	} else if (!(format_flags & DDPF_ALPHAPIXELS) && format_rgb_bits == 8 && format_red_mask == 0xff && format_green_mask == 0xff && format_blue_mask == 0xff) {
-
 		dds_format = DDS_LUMINANCE;
 	} else if ((format_flags & DDPF_ALPHAPIXELS) && format_rgb_bits == 16 && format_red_mask == 0xff && format_green_mask == 0xff && format_blue_mask == 0xff && format_alpha_mask == 0xff00) {
-
 		dds_format = DDS_LUMINANCE_ALPHA;
 	} else if (format_flags & DDPF_INDEXED && format_rgb_bits == 8) {
-
 		dds_format = DDS_BGR565;
 	} else {
-
 		printf("unrecognized fourcc %x format_flags: %x - rgbbits %i - red_mask %x green mask %x blue mask %x alpha mask %x\n", format_fourcc, format_flags, format_rgb_bits, format_red_mask, format_green_mask, format_blue_mask, format_alpha_mask);
 		ERR_FAIL_V_MSG(RES(), "Unrecognized or unsupported color layout in DDS '" + p_path + "'.");
 	}
 
-	if (!(flags & DDSD_MIPMAPCOUNT))
+	if (!(flags & DDSD_MIPMAPCOUNT)) {
 		mipmaps = 1;
+	}
 
-	PoolVector<uint8_t> src_data;
+	Vector<uint8_t> src_data;
 
 	const DDSFormatInfo &info = dds_format_info[dds_format];
 	uint32_t w = width;
@@ -236,7 +225,6 @@ RES ResourceFormatDDS::load(const String &p_path, const String &p_original_path,
 		ERR_FAIL_COND_V(!(flags & DDSD_LINEARSIZE), RES());
 
 		for (uint32_t i = 1; i < mipmaps; i++) {
-
 			w = MAX(1, w >> 1);
 			h = MAX(1, h >> 1);
 			uint32_t bsize = MAX(info.divisor, w) / info.divisor * MAX(info.divisor, h) / info.divisor * info.block_size;
@@ -245,11 +233,10 @@ RES ResourceFormatDDS::load(const String &p_path, const String &p_original_path,
 		}
 
 		src_data.resize(size);
-		PoolVector<uint8_t>::Write wb = src_data.write();
-		f->get_buffer(wb.ptr(), size);
+		uint8_t *wb = src_data.ptrw();
+		f->get_buffer(wb, size);
 
 	} else if (info.palette) {
-
 		//indexed
 		ERR_FAIL_COND_V(!(flags & DDSD_PITCH), RES());
 		ERR_FAIL_COND_V(format_rgb_bits != 8, RES());
@@ -262,34 +249,33 @@ RES ResourceFormatDDS::load(const String &p_path, const String &p_original_path,
 
 		int colsize = 3;
 		for (int i = 0; i < 256; i++) {
-
-			if (palette[i * 4 + 3] < 255)
+			if (palette[i * 4 + 3] < 255) {
 				colsize = 4;
+			}
 		}
 
 		int w2 = width;
 		int h2 = height;
 
 		for (uint32_t i = 1; i < mipmaps; i++) {
-
 			w2 = (w2 + 1) >> 1;
 			h2 = (h2 + 1) >> 1;
 			size += w2 * h2 * info.block_size;
 		}
 
 		src_data.resize(size + 256 * colsize);
-		PoolVector<uint8_t>::Write wb = src_data.write();
-		f->get_buffer(wb.ptr(), size);
+		uint8_t *wb = src_data.ptrw();
+		f->get_buffer(wb, size);
 
 		for (int i = 0; i < 256; i++) {
-
 			int dst_ofs = size + i * colsize;
 			int src_ofs = i * 4;
 			wb[dst_ofs + 0] = palette[src_ofs + 2];
 			wb[dst_ofs + 1] = palette[src_ofs + 1];
 			wb[dst_ofs + 2] = palette[src_ofs + 0];
-			if (colsize == 4)
+			if (colsize == 4) {
 				wb[dst_ofs + 3] = palette[src_ofs + 3];
+			}
 		}
 	} else {
 		//uncompressed generic...
@@ -297,30 +283,27 @@ RES ResourceFormatDDS::load(const String &p_path, const String &p_original_path,
 		uint32_t size = width * height * info.block_size;
 
 		for (uint32_t i = 1; i < mipmaps; i++) {
-
 			w = (w + 1) >> 1;
 			h = (h + 1) >> 1;
 			size += w * h * info.block_size;
 		}
 
-		if (dds_format == DDS_BGR565)
+		if (dds_format == DDS_BGR565) {
 			size = size * 3 / 2;
-		else if (dds_format == DDS_BGR5A1)
+		} else if (dds_format == DDS_BGR5A1) {
 			size = size * 2;
+		}
 
 		src_data.resize(size);
-		PoolVector<uint8_t>::Write wb = src_data.write();
-		f->get_buffer(wb.ptr(), size);
+		uint8_t *wb = src_data.ptrw();
+		f->get_buffer(wb, size);
 
 		switch (dds_format) {
-
 			case DDS_BGR5A1: {
-
 				// TO RGBA
 				int colcount = size / 4;
 
 				for (int i = colcount - 1; i >= 0; i--) {
-
 					int src_ofs = i * 2;
 					int dst_ofs = i * 4;
 
@@ -335,11 +318,9 @@ RES ResourceFormatDDS::load(const String &p_path, const String &p_original_path,
 				}
 			} break;
 			case DDS_BGR565: {
-
 				int colcount = size / 3;
 
 				for (int i = colcount - 1; i >= 0; i--) {
-
 					int src_ofs = i * 2;
 					int dst_ofs = i * 3;
 
@@ -353,12 +334,10 @@ RES ResourceFormatDDS::load(const String &p_path, const String &p_original_path,
 
 			} break;
 			case DDS_BGR10A2: {
-
 				// TO RGBA
 				int colcount = size / 4;
 
 				for (int i = colcount - 1; i >= 0; i--) {
-
 					int ofs = i * 4;
 
 					uint32_t w32 = uint32_t(wb[ofs + 0]) | (uint32_t(wb[ofs + 1]) << 8) | (uint32_t(wb[ofs + 2]) << 16) | (uint32_t(wb[ofs + 3]) << 24);
@@ -375,26 +354,21 @@ RES ResourceFormatDDS::load(const String &p_path, const String &p_original_path,
 				}
 			} break;
 			case DDS_BGRA8: {
-
 				int colcount = size / 4;
 
 				for (int i = 0; i < colcount; i++) {
-
 					SWAP(wb[i * 4 + 0], wb[i * 4 + 2]);
 				}
 
 			} break;
 			case DDS_BGR8: {
-
 				int colcount = size / 3;
 
 				for (int i = 0; i < colcount; i++) {
-
 					SWAP(wb[i * 3 + 0], wb[i * 3 + 2]);
 				}
 			} break;
 			case DDS_RGBA8: {
-
 				/* do nothing either
 				int colcount = size/4;
 
@@ -413,7 +387,6 @@ RES ResourceFormatDDS::load(const String &p_path, const String &p_original_path,
 				*/
 			} break;
 			case DDS_RGB8: {
-
 				// do nothing
 				/*
 				int colcount = size/3;
@@ -424,12 +397,10 @@ RES ResourceFormatDDS::load(const String &p_path, const String &p_original_path,
 				}*/
 			} break;
 			case DDS_LUMINANCE: {
-
 				// do nothing i guess?
 
 			} break;
 			case DDS_LUMINANCE_ALPHA: {
-
 				// do nothing i guess?
 
 			} break;
@@ -444,25 +415,24 @@ RES ResourceFormatDDS::load(const String &p_path, const String &p_original_path,
 	Ref<ImageTexture> texture = memnew(ImageTexture);
 	texture->create_from_image(img);
 
-	if (r_error)
+	if (r_error) {
 		*r_error = OK;
+	}
 
 	return texture;
 }
 
 void ResourceFormatDDS::get_recognized_extensions(List<String> *p_extensions) const {
-
 	p_extensions->push_back("dds");
 }
 
 bool ResourceFormatDDS::handles_type(const String &p_type) const {
-
-	return ClassDB::is_parent_class(p_type, "Texture");
+	return ClassDB::is_parent_class(p_type, "Texture2D");
 }
 
 String ResourceFormatDDS::get_resource_type(const String &p_path) const {
-
-	if (p_path.get_extension().to_lower() == "dds")
+	if (p_path.get_extension().to_lower() == "dds") {
 		return "ImageTexture";
+	}
 	return "";
 }
diff --git a/modules/dds/texture_loader_dds.h b/modules/dds/texture_loader_dds.h
index 34f4e9b548..ef08967df7 100644
--- a/modules/dds/texture_loader_dds.h
+++ b/modules/dds/texture_loader_dds.h
@@ -36,7 +36,7 @@
 
 class ResourceFormatDDS : public ResourceFormatLoader {
 public:
-	virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
+	virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, bool p_no_cache = false);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual bool handles_type(const String &p_type) const;
 	virtual String get_resource_type(const String &p_path) const;
diff --git a/modules/denoise/SCsub b/modules/denoise/SCsub
new file mode 100644
index 0000000000..bf3bd7d073
--- /dev/null
+++ b/modules/denoise/SCsub
@@ -0,0 +1,118 @@
+#!/usr/bin/env python
+
+import resource_to_cpp
+
+Import("env")
+Import("env_modules")
+
+env_oidn = env_modules.Clone()
+
+# Thirdparty source files
+thirdparty_dir = "#thirdparty/oidn/"
+thirdparty_sources = [
+    "core/api.cpp",
+    "core/device.cpp",
+    "core/filter.cpp",
+    "core/network.cpp",
+    "core/autoencoder.cpp",
+    "core/transfer_function.cpp",
+    "weights/rtlightmap_hdr.gen.cpp",
+    "mkl-dnn/src/common/batch_normalization.cpp",
+    "mkl-dnn/src/common/concat.cpp",
+    "mkl-dnn/src/common/convolution.cpp",
+    "mkl-dnn/src/common/convolution_pd.cpp",
+    "mkl-dnn/src/common/deconvolution.cpp",
+    "mkl-dnn/src/common/eltwise.cpp",
+    "mkl-dnn/src/common/engine.cpp",
+    "mkl-dnn/src/common/inner_product.cpp",
+    "mkl-dnn/src/common/inner_product_pd.cpp",
+    "mkl-dnn/src/common/lrn.cpp",
+    "mkl-dnn/src/common/memory.cpp",
+    "mkl-dnn/src/common/memory_desc_wrapper.cpp",
+    "mkl-dnn/src/common/mkldnn_debug.cpp",
+    "mkl-dnn/src/common/mkldnn_debug_autogenerated.cpp",
+    "mkl-dnn/src/common/pooling.cpp",
+    "mkl-dnn/src/common/primitive.cpp",
+    "mkl-dnn/src/common/primitive_attr.cpp",
+    "mkl-dnn/src/common/primitive_desc.cpp",
+    "mkl-dnn/src/common/primitive_exec_types.cpp",
+    "mkl-dnn/src/common/primitive_iterator.cpp",
+    "mkl-dnn/src/common/query.cpp",
+    "mkl-dnn/src/common/reorder.cpp",
+    "mkl-dnn/src/common/rnn.cpp",
+    "mkl-dnn/src/common/scratchpad.cpp",
+    "mkl-dnn/src/common/shuffle.cpp",
+    "mkl-dnn/src/common/softmax.cpp",
+    "mkl-dnn/src/common/stream.cpp",
+    "mkl-dnn/src/common/sum.cpp",
+    "mkl-dnn/src/common/utils.cpp",
+    "mkl-dnn/src/common/verbose.cpp",
+    "mkl-dnn/src/cpu/cpu_barrier.cpp",
+    "mkl-dnn/src/cpu/cpu_concat.cpp",
+    "mkl-dnn/src/cpu/cpu_engine.cpp",
+    "mkl-dnn/src/cpu/cpu_memory.cpp",
+    "mkl-dnn/src/cpu/cpu_reducer.cpp",
+    "mkl-dnn/src/cpu/cpu_reorder.cpp",
+    "mkl-dnn/src/cpu/cpu_sum.cpp",
+    "mkl-dnn/src/cpu/jit_avx2_conv_kernel_f32.cpp",
+    "mkl-dnn/src/cpu/jit_avx2_convolution.cpp",
+    "mkl-dnn/src/cpu/jit_avx512_common_conv_kernel.cpp",
+    "mkl-dnn/src/cpu/jit_avx512_common_conv_winograd_kernel_f32.cpp",
+    "mkl-dnn/src/cpu/jit_avx512_common_convolution.cpp",
+    "mkl-dnn/src/cpu/jit_avx512_common_convolution_winograd.cpp",
+    "mkl-dnn/src/cpu/jit_avx512_core_fp32_wino_conv_2x3.cpp",
+    "mkl-dnn/src/cpu/jit_avx512_core_fp32_wino_conv_4x3.cpp",
+    "mkl-dnn/src/cpu/jit_avx512_core_fp32_wino_conv_4x3_kernel.cpp",
+    "mkl-dnn/src/cpu/jit_sse42_conv_kernel_f32.cpp",
+    "mkl-dnn/src/cpu/jit_sse42_convolution.cpp",
+    "mkl-dnn/src/cpu/jit_transpose_src_utils.cpp",
+    "mkl-dnn/src/cpu/jit_uni_eltwise.cpp",
+    "mkl-dnn/src/cpu/jit_uni_pool_kernel_f32.cpp",
+    "mkl-dnn/src/cpu/jit_uni_pooling.cpp",
+    "mkl-dnn/src/cpu/jit_uni_reorder.cpp",
+    "mkl-dnn/src/cpu/jit_uni_reorder_utils.cpp",
+    "mkl-dnn/src/cpu/jit_utils/jit_utils.cpp",
+    "mkl-dnn/src/cpu/jit_utils/jitprofiling/jitprofiling.c",
+    "common/platform.cpp",
+    "common/thread.cpp",
+    "common/tensor.cpp",
+]
+thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
+
+thirdparty_include_dirs = [
+    "",
+    "include",
+    "mkl-dnn/include",
+    "mkl-dnn/src",
+    "mkl-dnn/src/common",
+    "mkl-dnn/src/cpu/xbyak",
+    "mkl-dnn/src/cpu",
+]
+thirdparty_include_dirs = [thirdparty_dir + file for file in thirdparty_include_dirs]
+
+
+env_oidn.Prepend(CPPPATH=thirdparty_include_dirs)
+env_oidn.Append(
+    CPPDEFINES=[
+        "MKLDNN_THR=MKLDNN_THR_SEQ",
+        "OIDN_STATIC_LIB",
+        "__STDC_CONSTANT_MACROS",
+        "__STDC_LIMIT_MACROS",
+        "DISABLE_VERBOSE",
+        "MKLDNN_ENABLE_CONCURRENT_EXEC",
+        "NDEBUG",
+    ]
+)
+
+env_thirdparty = env_oidn.Clone()
+env_thirdparty.disable_warnings()
+env_thirdparty.add_source_files(env.modules_sources, thirdparty_sources)
+
+weights_in_path = thirdparty_dir + "weights/rtlightmap_hdr.tza"
+weights_out_path = thirdparty_dir + "weights/rtlightmap_hdr.gen.cpp"
+
+env_thirdparty.Depends(weights_out_path, weights_in_path)
+env_thirdparty.CommandNoCache(weights_out_path, weights_in_path, resource_to_cpp.tza_to_cpp)
+
+env_oidn.add_source_files(env.modules_sources, "denoise_wrapper.cpp")
+env_modules.add_source_files(env.modules_sources, ["register_types.cpp", "lightmap_denoiser.cpp"])
diff --git a/modules/denoise/config.py b/modules/denoise/config.py
new file mode 100644
index 0000000000..49a1f036ed
--- /dev/null
+++ b/modules/denoise/config.py
@@ -0,0 +1,12 @@
+def can_build(env, platform):
+    # Thirdparty dependency OpenImage Denoise includes oneDNN library
+    # which only supports 64-bit architectures.
+    # It's also only relevant for tools build and desktop platforms,
+    # as doing lightmap generation and denoising on Android or HTML5
+    # would be a bit far-fetched.
+    desktop_platforms = ["linuxbsd", "osx", "windows"]
+    return env["tools"] and platform in desktop_platforms and env["bits"] == "64" and env["arch"] != "arm64"
+
+
+def configure(env):
+    pass
diff --git a/modules/denoise/denoise_wrapper.cpp b/modules/denoise/denoise_wrapper.cpp
new file mode 100644
index 0000000000..c12c6d9c31
--- /dev/null
+++ b/modules/denoise/denoise_wrapper.cpp
@@ -0,0 +1,64 @@
+/*************************************************************************/
+/*  denoise_wrapper.cpp                                                  */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "denoise_wrapper.h"
+#include "thirdparty/oidn/include/OpenImageDenoise/oidn.h"
+#include <stdio.h>
+
+void *oidn_denoiser_init() {
+	OIDNDeviceImpl *device = oidnNewDevice(OIDN_DEVICE_TYPE_CPU);
+	oidnCommitDevice(device);
+	return device;
+}
+
+bool oidn_denoise(void *deviceptr, float *p_floats, int p_width, int p_height) {
+	OIDNDeviceImpl *device = (OIDNDeviceImpl *)deviceptr;
+	OIDNFilter filter = oidnNewFilter(device, "RTLightmap");
+	oidnSetSharedFilterImage(filter, "color", (void *)p_floats, OIDN_FORMAT_FLOAT3, p_width, p_height, 0, 0, 0);
+	oidnSetSharedFilterImage(filter, "output", (void *)p_floats, OIDN_FORMAT_FLOAT3, p_width, p_height, 0, 0, 0);
+	oidnSetFilter1b(filter, "hdr", true);
+	//oidnSetFilter1f(filter, "hdrScale", 1.0f);
+	oidnCommitFilter(filter);
+	oidnExecuteFilter(filter);
+
+	const char *msg;
+	bool success = true;
+	if (oidnGetDeviceError(device, &msg) != OIDN_ERROR_NONE) {
+		printf("LightmapDenoiser: %s\n", msg);
+		success = false;
+	}
+
+	oidnReleaseFilter(filter);
+	return success;
+}
+
+void oidn_denoiser_finish(void *device) {
+	oidnReleaseDevice((OIDNDeviceImpl *)device);
+}
diff --git a/modules/opus/stub/register_types.cpp b/modules/denoise/denoise_wrapper.h
index a4329e142c..2107df09c1 100644
--- a/modules/opus/stub/register_types.cpp
+++ b/modules/denoise/denoise_wrapper.h
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  register_types.cpp                                                   */
+/*  denoise_wrapper.h                                                    */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,10 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "register_types.h"
+#ifndef DENOISE_WRAPPER_H
+#define DENOISE_WRAPPER_H
 
-// Dummy module as libvorbis is needed by other modules (theora ...)
+void *oidn_denoiser_init();
+bool oidn_denoise(void *device, float *p_floats, int p_width, int p_height);
+void oidn_denoiser_finish(void *device);
 
-void register_opus_types() {}
-
-void unregister_opus_types() {}
+#endif // DENOISE_WRAPPER_H
diff --git a/modules/denoise/lightmap_denoiser.cpp b/modules/denoise/lightmap_denoiser.cpp
new file mode 100644
index 0000000000..29d02e8ee2
--- /dev/null
+++ b/modules/denoise/lightmap_denoiser.cpp
@@ -0,0 +1,62 @@
+/*************************************************************************/
+/*  lightmap_denoiser.cpp                                                */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "lightmap_denoiser.h"
+#include "denoise_wrapper.h"
+
+LightmapDenoiser *LightmapDenoiserOIDN::create_oidn_denoiser() {
+	return memnew(LightmapDenoiserOIDN);
+}
+
+void LightmapDenoiserOIDN::make_default_denoiser() {
+	create_function = create_oidn_denoiser;
+}
+
+Ref<Image> LightmapDenoiserOIDN::denoise_image(const Ref<Image> &p_image) {
+	Ref<Image> img = p_image->duplicate();
+
+	img->convert(Image::FORMAT_RGBF);
+
+	Vector<uint8_t> data = img->get_data();
+	if (!oidn_denoise(device, (float *)data.ptrw(), img->get_width(), img->get_height())) {
+		return p_image;
+	}
+
+	img->create(img->get_width(), img->get_height(), false, img->get_format(), data);
+	return img;
+}
+
+LightmapDenoiserOIDN::LightmapDenoiserOIDN() {
+	device = oidn_denoiser_init();
+}
+
+LightmapDenoiserOIDN::~LightmapDenoiserOIDN() {
+	oidn_denoiser_finish(device);
+}
diff --git a/modules/denoise/lightmap_denoiser.h b/modules/denoise/lightmap_denoiser.h
new file mode 100644
index 0000000000..d01bbd10a5
--- /dev/null
+++ b/modules/denoise/lightmap_denoiser.h
@@ -0,0 +1,56 @@
+/*************************************************************************/
+/*  lightmap_denoiser.h                                                  */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef LIGHTMAP_DENOISER_H
+#define LIGHTMAP_DENOISER_H
+
+#include "core/object.h"
+#include "scene/3d/lightmapper.h"
+
+struct OIDNDeviceImpl;
+
+class LightmapDenoiserOIDN : public LightmapDenoiser {
+	GDCLASS(LightmapDenoiserOIDN, LightmapDenoiser);
+
+protected:
+	void *device = nullptr;
+
+public:
+	static LightmapDenoiser *create_oidn_denoiser();
+
+	Ref<Image> denoise_image(const Ref<Image> &p_image) override;
+
+	static void make_default_denoiser();
+
+	LightmapDenoiserOIDN();
+	~LightmapDenoiserOIDN();
+};
+
+#endif // LIGHTMAP_DENOISER_H
diff --git a/modules/gdnative/arvr/register_types.cpp b/modules/denoise/register_types.cpp
index 0f6e2bca1a..b78734a531 100644
--- a/modules/gdnative/arvr/register_types.cpp
+++ b/modules/denoise/register_types.cpp
@@ -29,11 +29,12 @@
 /*************************************************************************/
 
 #include "register_types.h"
-#include "arvr_interface_gdnative.h"
+#include "core/engine.h"
+#include "lightmap_denoiser.h"
 
-void register_arvr_types() {
-	ClassDB::register_class<ARVRInterfaceGDNative>();
+void register_denoise_types() {
+	LightmapDenoiserOIDN::make_default_denoiser();
 }
 
-void unregister_arvr_types() {
+void unregister_denoise_types() {
 }
diff --git a/modules/recast/register_types.h b/modules/denoise/register_types.h
index d16ba37f5e..f0f1f44bfe 100644
--- a/modules/recast/register_types.h
+++ b/modules/denoise/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-void register_recast_types();
-void unregister_recast_types();
+#ifndef DENOISE_REGISTER_TYPES_H
+#define DENOISE_REGISTER_TYPES_H
+
+void register_denoise_types();
+void unregister_denoise_types();
+
+#endif // DENOISE_REGISTER_TYPES_H
diff --git a/modules/denoise/resource_to_cpp.py b/modules/denoise/resource_to_cpp.py
new file mode 100644
index 0000000000..6c83277355
--- /dev/null
+++ b/modules/denoise/resource_to_cpp.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python
+
+## ======================================================================== ##
+## Copyright 2009-2019 Intel Corporation                                    ##
+##                                                                          ##
+## Licensed under the Apache License, Version 2.0 (the "License");          ##
+## you may not use this file except in compliance with the License.         ##
+## You may obtain a copy of the License at                                  ##
+##                                                                          ##
+##     http://www.apache.org/licenses/LICENSE-2.0                           ##
+##                                                                          ##
+## Unless required by applicable law or agreed to in writing, software      ##
+## distributed under the License is distributed on an "AS IS" BASIS,        ##
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ##
+## See the License for the specific language governing permissions and      ##
+## limitations under the License.                                           ##
+## ======================================================================== ##
+
+import os
+from array import array
+
+# Generates a C++ file from the specified binary resource file
+def generate(in_path, out_path):
+
+    namespace = "oidn::weights"
+    scopes = namespace.split("::")
+
+    file_name = os.path.basename(in_path)
+    var_name = os.path.splitext(file_name)[0]
+
+    with open(in_path, "rb") as in_file, open(out_path, "w") as out_file:
+        # Header
+        out_file.write("// Generated from: %s\n" % file_name)
+        out_file.write("#include <cstddef>\n\n")
+
+        # Open the namespaces
+        for s in scopes:
+            out_file.write("namespace %s {\n" % s)
+        if scopes:
+            out_file.write("\n")
+
+        # Read the file
+        in_data = array("B", in_file.read())
+
+        # Write the size
+        out_file.write("//const size_t %s_size = %d;\n\n" % (var_name, len(in_data)))
+
+        # Write the data
+        out_file.write("unsigned char %s[] = {" % var_name)
+        for i in range(len(in_data)):
+            c = in_data[i]
+            if i > 0:
+                out_file.write(",")
+            if (i + 1) % 20 == 1:
+                out_file.write("\n")
+            out_file.write("%d" % c)
+        out_file.write("\n};\n")
+
+        # Close the namespaces
+        if scopes:
+            out_file.write("\n")
+        for scope in reversed(scopes):
+            out_file.write("} // namespace %s\n" % scope)
+
+
+def tza_to_cpp(target, source, env):
+    for x in zip(source, target):
+        generate(str(x[0]), str(x[1]))
diff --git a/modules/enet/SCsub b/modules/enet/SCsub
index 485c33b1a8..c8f4b3885e 100644
--- a/modules/enet/SCsub
+++ b/modules/enet/SCsub
@@ -1,13 +1,13 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_enet = env_modules.Clone()
 
 # Thirdparty source files
 
-if env['builtin_enet']:
+if env["builtin_enet"]:
     thirdparty_dir = "#thirdparty/enet/"
     thirdparty_sources = [
         "godot.cpp",
diff --git a/modules/enet/config.py b/modules/enet/config.py
index 3e30bbe778..5fd343c75d 100644
--- a/modules/enet/config.py
+++ b/modules/enet/config.py
@@ -1,13 +1,16 @@
 def can_build(env, platform):
     return True
 
+
 def configure(env):
     pass
 
+
 def get_doc_classes():
     return [
         "NetworkedMultiplayerENet",
     ]
 
+
 def get_doc_path():
     return "doc_classes"
diff --git a/modules/enet/doc_classes/NetworkedMultiplayerENet.xml b/modules/enet/doc_classes/NetworkedMultiplayerENet.xml
index 76b3710e96..f46ef2d812 100644
--- a/modules/enet/doc_classes/NetworkedMultiplayerENet.xml
+++ b/modules/enet/doc_classes/NetworkedMultiplayerENet.xml
@@ -7,8 +7,8 @@
 		A PacketPeer implementation that should be passed to [member SceneTree.network_peer] after being initialized as either a client or server. Events can then be handled by connecting to [SceneTree] signals.
 	</description>
 	<tutorials>
-		<link>https://docs.godotengine.org/en/latest/tutorials/networking/high_level_multiplayer.html</link>
-		<link>http://enet.bespin.org/usergroup0.html</link>
+		<link title="High-level multiplayer">https://docs.godotengine.org/en/latest/tutorials/networking/high_level_multiplayer.html</link>
+		<link title="API documentation on the ENet website">http://enet.bespin.org/usergroup0.html</link>
 	</tutorials>
 	<methods>
 		<method name="close_connection">
@@ -104,25 +104,50 @@
 				The IP used when creating a server. This is set to the wildcard [code]"*"[/code] by default, which binds to all available interfaces. The given IP needs to be in IPv4 or IPv6 address format, for example: [code]"192.168.1.1"[/code].
 			</description>
 		</method>
+		<method name="set_dtls_certificate">
+			<return type="void">
+			</return>
+			<argument index="0" name="certificate" type="X509Certificate">
+			</argument>
+			<description>
+				Configure the [X509Certificate] to use when [member use_dtls] is [code]true[/code]. For servers, you must also setup the [CryptoKey] via [method set_dtls_key].
+			</description>
+		</method>
+		<method name="set_dtls_key">
+			<return type="void">
+			</return>
+			<argument index="0" name="key" type="CryptoKey">
+			</argument>
+			<description>
+				Configure the [CryptoKey] to use when [member use_dtls] is [code]true[/code]. Remember to also call [method set_dtls_certificate] to setup your [X509Certificate].
+			</description>
+		</method>
 	</methods>
 	<members>
 		<member name="always_ordered" type="bool" setter="set_always_ordered" getter="is_always_ordered" default="false">
 			Enforce ordered packets when using [constant NetworkedMultiplayerPeer.TRANSFER_MODE_UNRELIABLE] (thus behaving similarly to [constant NetworkedMultiplayerPeer.TRANSFER_MODE_UNRELIABLE_ORDERED]). This is the only way to use ordering with the RPC system.
 		</member>
 		<member name="channel_count" type="int" setter="set_channel_count" getter="get_channel_count" default="3">
-			The number of channels to be used by ENet. Channels are used to separate different kinds of data. In reliable or ordered mode, for example, the packet delivery order is ensured on a per channel basis.
+			The number of channels to be used by ENet. Channels are used to separate different kinds of data. In reliable or ordered mode, for example, the packet delivery order is ensured on a per-channel basis. This is done to combat latency and reduces ordering restrictions on packets. The delivery status of a packet in one channel won't stall the delivery of other packets in another channel.
 		</member>
 		<member name="compression_mode" type="int" setter="set_compression_mode" getter="get_compression_mode" enum="NetworkedMultiplayerENet.CompressionMode" default="0">
 			The compression method used for network packets. These have different tradeoffs of compression speed versus bandwidth, you may need to test which one works best for your use case if you use compression at all.
 		</member>
+		<member name="dtls_verify" type="bool" setter="set_dtls_verify_enabled" getter="is_dtls_verify_enabled" default="true">
+			Enable or disable certificate verification when [member use_dtls] [code]true[/code].
+		</member>
 		<member name="refuse_new_connections" type="bool" setter="set_refuse_new_connections" getter="is_refusing_new_connections" override="true" default="false" />
 		<member name="server_relay" type="bool" setter="set_server_relay_enabled" getter="is_server_relay_enabled" default="true">
 			Enable or disable the server feature that notifies clients of other peers' connection/disconnection, and relays messages between them. When this option is [code]false[/code], clients won't be automatically notified of other peers and won't be able to send them packets through the server.
 		</member>
 		<member name="transfer_channel" type="int" setter="set_transfer_channel" getter="get_transfer_channel" default="-1">
-			Set the default channel to be used to transfer data. By default, this value is [code]-1[/code] which means that ENet will only use 2 channels, one for reliable and one for unreliable packets. Channel [code]0[/code] is reserved, and cannot be used. Setting this member to any value between [code]0[/code] and [member channel_count] (excluded) will force ENet to use that channel for sending data.
+			Set the default channel to be used to transfer data. By default, this value is [code]-1[/code] which means that ENet will only use 2 channels: one for reliable packets, and one for unreliable packets. The channel [code]0[/code] is reserved and cannot be used. Setting this member to any value between [code]0[/code] and [member channel_count] (excluded) will force ENet to use that channel for sending data. See [member channel_count] for more information about ENet channels.
 		</member>
 		<member name="transfer_mode" type="int" setter="set_transfer_mode" getter="get_transfer_mode" override="true" enum="NetworkedMultiplayerPeer.TransferMode" default="2" />
+		<member name="use_dtls" type="bool" setter="set_dtls_enabled" getter="is_dtls_enabled" default="false">
+			When enabled, the client or server created by this peer, will use [PacketPeerDTLS] instead of raw UDP sockets for communicating with the remote peer. This will make the communication encrypted with DTLS at the cost of higher resource usage and potentially larger packet size.
+			Note: When creating a DTLS server, make sure you setup the key/certificate pair via [method set_dtls_key] and [method set_dtls_certificate]. For DTLS clients, have a look at the [member dtls_verify] option, and configure the certificate accordingly via [method set_dtls_certificate].
+		</member>
 	</members>
 	<constants>
 		<constant name="COMPRESS_NONE" value="0" enum="CompressionMode">
diff --git a/modules/enet/networked_multiplayer_enet.cpp b/modules/enet/networked_multiplayer_enet.cpp
index 21dd758391..64977ad237 100644
--- a/modules/enet/networked_multiplayer_enet.cpp
+++ b/modules/enet/networked_multiplayer_enet.cpp
@@ -34,50 +34,45 @@
 #include "core/os/os.h"
 
 void NetworkedMultiplayerENet::set_transfer_mode(TransferMode p_mode) {
-
 	transfer_mode = p_mode;
 }
-NetworkedMultiplayerPeer::TransferMode NetworkedMultiplayerENet::get_transfer_mode() const {
 
+NetworkedMultiplayerPeer::TransferMode NetworkedMultiplayerENet::get_transfer_mode() const {
 	return transfer_mode;
 }
 
 void NetworkedMultiplayerENet::set_target_peer(int p_peer) {
-
 	target_peer = p_peer;
 }
 
 int NetworkedMultiplayerENet::get_packet_peer() const {
-
-	ERR_FAIL_COND_V(!active, 1);
+	ERR_FAIL_COND_V_MSG(!active, 1, "The multiplayer instance isn't currently active.");
 	ERR_FAIL_COND_V(incoming_packets.size() == 0, 1);
 
 	return incoming_packets.front()->get().from;
 }
 
 int NetworkedMultiplayerENet::get_packet_channel() const {
-
-	ERR_FAIL_COND_V(!active, -1);
+	ERR_FAIL_COND_V_MSG(!active, -1, "The multiplayer instance isn't currently active.");
 	ERR_FAIL_COND_V(incoming_packets.size() == 0, -1);
 
 	return incoming_packets.front()->get().channel;
 }
 
 int NetworkedMultiplayerENet::get_last_packet_channel() const {
-
-	ERR_FAIL_COND_V(!active, -1);
+	ERR_FAIL_COND_V_MSG(!active, -1, "The multiplayer instance isn't currently active.");
 	ERR_FAIL_COND_V(!current_packet.packet, -1);
 
 	return current_packet.channel;
 }
 
 Error NetworkedMultiplayerENet::create_server(int p_port, int p_max_clients, int p_in_bandwidth, int p_out_bandwidth) {
-
-	ERR_FAIL_COND_V(active, ERR_ALREADY_IN_USE);
-	ERR_FAIL_COND_V(p_port < 0 || p_port > 65535, ERR_INVALID_PARAMETER);
-	ERR_FAIL_COND_V(p_max_clients < 1 || p_max_clients > 4095, ERR_INVALID_PARAMETER);
-	ERR_FAIL_COND_V(p_in_bandwidth < 0, ERR_INVALID_PARAMETER);
-	ERR_FAIL_COND_V(p_out_bandwidth < 0, ERR_INVALID_PARAMETER);
+	ERR_FAIL_COND_V_MSG(active, ERR_ALREADY_IN_USE, "The multiplayer instance is already active.");
+	ERR_FAIL_COND_V_MSG(p_port < 0 || p_port > 65535, ERR_INVALID_PARAMETER, "The port number must be set between 0 and 65535 (inclusive).");
+	ERR_FAIL_COND_V_MSG(p_max_clients < 1 || p_max_clients > 4095, ERR_INVALID_PARAMETER, "The number of clients must be set between 1 and 4095 (inclusive).");
+	ERR_FAIL_COND_V_MSG(p_in_bandwidth < 0, ERR_INVALID_PARAMETER, "The incoming bandwidth limit must be greater than or equal to 0 (0 disables the limit).");
+	ERR_FAIL_COND_V_MSG(p_out_bandwidth < 0, ERR_INVALID_PARAMETER, "The outgoing bandwidth limit must be greater than or equal to 0 (0 disables the limit).");
+	ERR_FAIL_COND_V(dtls_enabled && (dtls_key.is_null() || dtls_cert.is_null()), ERR_INVALID_PARAMETER);
 
 	ENetAddress address;
 	memset(&address, 0, sizeof(address));
@@ -104,7 +99,13 @@ Error NetworkedMultiplayerENet::create_server(int p_port, int p_max_clients, int
 			p_in_bandwidth /* limit incoming bandwidth if > 0 */,
 			p_out_bandwidth /* limit outgoing bandwidth if > 0 */);
 
-	ERR_FAIL_COND_V(!host, ERR_CANT_CREATE);
+	ERR_FAIL_COND_V_MSG(!host, ERR_CANT_CREATE, "Couldn't create an ENet multiplayer server.");
+#ifdef GODOT_ENET
+	if (dtls_enabled) {
+		enet_host_dtls_server_setup(host, dtls_key.ptr(), dtls_cert.ptr());
+	}
+	enet_host_refuse_new_connections(host, refuse_connections);
+#endif
 
 	_setup_compressor();
 	active = true;
@@ -114,13 +115,13 @@ Error NetworkedMultiplayerENet::create_server(int p_port, int p_max_clients, int
 	connection_status = CONNECTION_CONNECTED;
 	return OK;
 }
-Error NetworkedMultiplayerENet::create_client(const String &p_address, int p_port, int p_in_bandwidth, int p_out_bandwidth, int p_client_port) {
 
-	ERR_FAIL_COND_V(active, ERR_ALREADY_IN_USE);
-	ERR_FAIL_COND_V(p_port < 0 || p_port > 65535, ERR_INVALID_PARAMETER);
-	ERR_FAIL_COND_V(p_client_port < 0 || p_client_port > 65535, ERR_INVALID_PARAMETER);
-	ERR_FAIL_COND_V(p_in_bandwidth < 0, ERR_INVALID_PARAMETER);
-	ERR_FAIL_COND_V(p_out_bandwidth < 0, ERR_INVALID_PARAMETER);
+Error NetworkedMultiplayerENet::create_client(const String &p_address, int p_port, int p_in_bandwidth, int p_out_bandwidth, int p_client_port) {
+	ERR_FAIL_COND_V_MSG(active, ERR_ALREADY_IN_USE, "The multiplayer instance is already active.");
+	ERR_FAIL_COND_V_MSG(p_port < 0 || p_port > 65535, ERR_INVALID_PARAMETER, "The server port number must be set between 0 and 65535 (inclusive).");
+	ERR_FAIL_COND_V_MSG(p_client_port < 0 || p_client_port > 65535, ERR_INVALID_PARAMETER, "The client port number must be set between 0 and 65535 (inclusive).");
+	ERR_FAIL_COND_V_MSG(p_in_bandwidth < 0, ERR_INVALID_PARAMETER, "The incoming bandwidth limit must be greater than or equal to 0 (0 disables the limit).");
+	ERR_FAIL_COND_V_MSG(p_out_bandwidth < 0, ERR_INVALID_PARAMETER, "The outgoing bandwidth limit must be greater than or equal to 0 (0 disables the limit).");
 
 	if (p_client_port != 0) {
 		ENetAddress c_client;
@@ -135,7 +136,7 @@ Error NetworkedMultiplayerENet::create_client(const String &p_address, int p_por
 		if (bind_ip.is_wildcard()) {
 			c_client.host = 0;
 		} else {
-			ERR_FAIL_COND_V(!bind_ip.is_ipv4(), ERR_INVALID_PARAMETER);
+			ERR_FAIL_COND_V_MSG(!bind_ip.is_ipv4(), ERR_INVALID_PARAMETER, "Wildcard IP addresses are only permitted in IPv4, not IPv6.");
 			c_client.host = *(uint32_t *)bind_ip.get_ipv4();
 		}
 #endif
@@ -148,14 +149,20 @@ Error NetworkedMultiplayerENet::create_client(const String &p_address, int p_por
 				p_in_bandwidth /* limit incoming bandwidth if > 0 */,
 				p_out_bandwidth /* limit outgoing bandwidth if > 0 */);
 	} else {
-		host = enet_host_create(NULL /* create a client host */,
+		host = enet_host_create(nullptr /* create a client host */,
 				1 /* only allow 1 outgoing connection */,
 				channel_count /* allow up to channel_count to be used */,
 				p_in_bandwidth /* limit incoming bandwidth if > 0 */,
 				p_out_bandwidth /* limit outgoing bandwidth if > 0 */);
 	}
 
-	ERR_FAIL_COND_V(!host, ERR_CANT_CREATE);
+	ERR_FAIL_COND_V_MSG(!host, ERR_CANT_CREATE, "Couldn't create the ENet client host.");
+#ifdef GODOT_ENET
+	if (dtls_enabled) {
+		enet_host_dtls_client_setup(host, dtls_cert.ptr(), dtls_verify, p_address.utf8().get_data());
+	}
+	enet_host_refuse_new_connections(host, refuse_connections);
+#endif
 
 	_setup_compressor();
 
@@ -169,14 +176,14 @@ Error NetworkedMultiplayerENet::create_client(const String &p_address, int p_por
 		ip = IP::get_singleton()->resolve_hostname(p_address, IP::TYPE_IPV4);
 #endif
 
-		ERR_FAIL_COND_V(!ip.is_valid(), ERR_CANT_RESOLVE);
+		ERR_FAIL_COND_V_MSG(!ip.is_valid(), ERR_CANT_RESOLVE, "Couldn't resolve the server IP address or domain name.");
 	}
 
 	ENetAddress address;
 #ifdef GODOT_ENET
 	enet_address_set_ip(&address, ip.get_ipv6(), 16);
 #else
-	ERR_FAIL_COND_V(!ip.is_ipv4(), ERR_INVALID_PARAMETER);
+	ERR_FAIL_COND_V_MSG(!ip.is_ipv4(), ERR_INVALID_PARAMETER, "Connecting to an IPv6 server isn't supported when using vanilla ENet. Recompile Godot with the bundled ENet library.");
 	address.host = *(uint32_t *)ip.get_ipv4();
 #endif
 	address.port = p_port;
@@ -186,9 +193,9 @@ Error NetworkedMultiplayerENet::create_client(const String &p_address, int p_por
 	// Initiate connection, allocating enough channels
 	ENetPeer *peer = enet_host_connect(host, &address, channel_count, unique_id);
 
-	if (peer == NULL) {
+	if (peer == nullptr) {
 		enet_host_destroy(host);
-		ERR_FAIL_COND_V(!peer, ERR_CANT_CREATE);
+		ERR_FAIL_COND_V_MSG(!peer, ERR_CANT_CREATE, "Couldn't connect to the ENet multiplayer server.");
 	}
 
 	// Technically safe to ignore the peer or anything else.
@@ -202,17 +209,16 @@ Error NetworkedMultiplayerENet::create_client(const String &p_address, int p_por
 }
 
 void NetworkedMultiplayerENet::poll() {
-
-	ERR_FAIL_COND(!active);
+	ERR_FAIL_COND_MSG(!active, "The multiplayer instance isn't currently active.");
 
 	_pop_current_packet();
 
 	ENetEvent event;
 	/* Keep servicing until there are no available events left in queue. */
 	while (true) {
-
-		if (!host || !active) // Might have been disconnected while emitting a notification
+		if (!host || !active) { // Might have been disconnected while emitting a notification
 			return;
+		}
 
 		int ret = enet_host_service(host, &event, 0);
 
@@ -256,33 +262,32 @@ void NetworkedMultiplayerENet::poll() {
 
 				if (server) {
 					// Do not notify other peers when server_relay is disabled.
-					if (!server_relay)
+					if (!server_relay) {
 						break;
+					}
 
 					// Someone connected, notify all the peers available
 					for (Map<int, ENetPeer *>::Element *E = peer_map.front(); E; E = E->next()) {
-
-						if (E->key() == *new_id)
+						if (E->key() == *new_id) {
 							continue;
+						}
 						// Send existing peers to new peer
-						ENetPacket *packet = enet_packet_create(NULL, 8, ENET_PACKET_FLAG_RELIABLE);
+						ENetPacket *packet = enet_packet_create(nullptr, 8, ENET_PACKET_FLAG_RELIABLE);
 						encode_uint32(SYSMSG_ADD_PEER, &packet->data[0]);
 						encode_uint32(E->key(), &packet->data[4]);
 						enet_peer_send(event.peer, SYSCH_CONFIG, packet);
 						// Send the new peer to existing peers
-						packet = enet_packet_create(NULL, 8, ENET_PACKET_FLAG_RELIABLE);
+						packet = enet_packet_create(nullptr, 8, ENET_PACKET_FLAG_RELIABLE);
 						encode_uint32(SYSMSG_ADD_PEER, &packet->data[0]);
 						encode_uint32(*new_id, &packet->data[4]);
 						enet_peer_send(E->get(), SYSCH_CONFIG, packet);
 					}
 				} else {
-
 					emit_signal("connection_succeeded");
 				}
 
 			} break;
 			case ENET_EVENT_TYPE_DISCONNECT: {
-
 				// Reset the peer's client information.
 
 				int *id = (int *)event.peer->data;
@@ -296,20 +301,18 @@ void NetworkedMultiplayerENet::poll() {
 				}
 
 				if (!server) {
-
 					// Client just disconnected from server.
 					emit_signal("server_disconnected");
 					close_connection();
 					return;
 				} else if (server_relay) {
-
 					// Server just received a client disconnect and is in relay mode, notify everyone else.
 					for (Map<int, ENetPeer *>::Element *E = peer_map.front(); E; E = E->next()) {
-
-						if (E->key() == *id)
+						if (E->key() == *id) {
 							continue;
+						}
 
-						ENetPacket *packet = enet_packet_create(NULL, 8, ENET_PACKET_FLAG_RELIABLE);
+						ENetPacket *packet = enet_packet_create(nullptr, 8, ENET_PACKET_FLAG_RELIABLE);
 						encode_uint32(SYSMSG_REMOVE_PEER, &packet->data[0]);
 						encode_uint32(*id, &packet->data[4]);
 						enet_peer_send(E->get(), SYSCH_CONFIG, packet);
@@ -321,7 +324,6 @@ void NetworkedMultiplayerENet::poll() {
 				memdelete(id);
 			} break;
 			case ENET_EVENT_TYPE_RECEIVE: {
-
 				if (event.channelID == SYSCH_CONFIG) {
 					// Some config message
 					ERR_CONTINUE(event.packet->dataLength < 8);
@@ -334,13 +336,11 @@ void NetworkedMultiplayerENet::poll() {
 
 					switch (msg) {
 						case SYSMSG_ADD_PEER: {
-
-							peer_map[id] = NULL;
+							peer_map[id] = nullptr;
 							emit_signal("peer_connected", id);
 
 						} break;
 						case SYSMSG_REMOVE_PEER: {
-
 							peer_map.erase(id);
 							emit_signal("peer_disconnected", id);
 						} break;
@@ -348,7 +348,6 @@ void NetworkedMultiplayerENet::poll() {
 
 					enet_packet_destroy(event.packet);
 				} else if (event.channelID < channel_count) {
-
 					Packet packet;
 					packet.packet = event.packet;
 
@@ -380,9 +379,9 @@ void NetworkedMultiplayerENet::poll() {
 							incoming_packets.push_back(packet);
 							// And make copies for sending
 							for (Map<int, ENetPeer *>::Element *E = peer_map.front(); E; E = E->next()) {
-
-								if (uint32_t(E->key()) == source) // Do not resend to self
+								if (uint32_t(E->key()) == source) { // Do not resend to self
 									continue;
+								}
 
 								ENetPacket *packet2 = enet_packet_create(packet.packet->data, packet.packet->dataLength, packet.packet->flags);
 
@@ -394,9 +393,9 @@ void NetworkedMultiplayerENet::poll() {
 
 							// And make copies for sending
 							for (Map<int, ENetPeer *>::Element *E = peer_map.front(); E; E = E->next()) {
-
-								if (uint32_t(E->key()) == source || E->key() == -target) // Do not resend to self, also do not send to excluded
+								if (uint32_t(E->key()) == source || E->key() == -target) { // Do not resend to self, also do not send to excluded
 									continue;
+								}
 
 								ENetPacket *packet2 = enet_packet_create(packet.packet->data, packet.packet->dataLength, packet.packet->flags);
 
@@ -417,7 +416,6 @@ void NetworkedMultiplayerENet::poll() {
 							enet_peer_send(peer_map[target], event.channelID, packet.packet);
 						}
 					} else {
-
 						incoming_packets.push_back(packet);
 					}
 
@@ -435,14 +433,13 @@ void NetworkedMultiplayerENet::poll() {
 }
 
 bool NetworkedMultiplayerENet::is_server() const {
-	ERR_FAIL_COND_V(!active, false);
+	ERR_FAIL_COND_V_MSG(!active, false, "The multiplayer instance isn't currently active.");
 
 	return server;
 }
 
 void NetworkedMultiplayerENet::close_connection(uint32_t wait_usec) {
-
-	ERR_FAIL_COND(!active);
+	ERR_FAIL_COND_MSG(!active, "The multiplayer instance isn't currently active.");
 
 	_pop_current_packet();
 
@@ -473,10 +470,9 @@ void NetworkedMultiplayerENet::close_connection(uint32_t wait_usec) {
 }
 
 void NetworkedMultiplayerENet::disconnect_peer(int p_peer, bool now) {
-
-	ERR_FAIL_COND(!active);
-	ERR_FAIL_COND(!is_server());
-	ERR_FAIL_COND(!peer_map.has(p_peer));
+	ERR_FAIL_COND_MSG(!active, "The multiplayer instance isn't currently active.");
+	ERR_FAIL_COND_MSG(!is_server(), "Can't disconnect a peer when not acting as a server.");
+	ERR_FAIL_COND_MSG(!peer_map.has(p_peer), vformat("Peer ID %d not found in the list of peers.", p_peer));
 
 	if (now) {
 		int *id = (int *)peer_map[p_peer]->data;
@@ -486,20 +482,20 @@ void NetworkedMultiplayerENet::disconnect_peer(int p_peer, bool now) {
 		// notify everyone else, send disconnect signal & remove from peer_map like in poll()
 		if (server_relay) {
 			for (Map<int, ENetPeer *>::Element *E = peer_map.front(); E; E = E->next()) {
-
 				if (E->key() == p_peer) {
 					continue;
 				}
 
-				ENetPacket *packet = enet_packet_create(NULL, 8, ENET_PACKET_FLAG_RELIABLE);
+				ENetPacket *packet = enet_packet_create(nullptr, 8, ENET_PACKET_FLAG_RELIABLE);
 				encode_uint32(SYSMSG_REMOVE_PEER, &packet->data[0]);
 				encode_uint32(p_peer, &packet->data[4]);
 				enet_peer_send(E->get(), SYSCH_CONFIG, packet);
 			}
 		}
 
-		if (id)
+		if (id) {
 			memdelete(id);
+		}
 
 		emit_signal("peer_disconnected", p_peer);
 		peer_map.erase(p_peer);
@@ -509,13 +505,11 @@ void NetworkedMultiplayerENet::disconnect_peer(int p_peer, bool now) {
 }
 
 int NetworkedMultiplayerENet::get_available_packet_count() const {
-
 	return incoming_packets.size();
 }
 
 Error NetworkedMultiplayerENet::get_packet(const uint8_t **r_buffer, int &r_buffer_size) {
-
-	ERR_FAIL_COND_V(incoming_packets.size() == 0, ERR_UNAVAILABLE);
+	ERR_FAIL_COND_V_MSG(incoming_packets.size() == 0, ERR_UNAVAILABLE, "No incoming packets available.");
 
 	_pop_current_packet();
 
@@ -529,19 +523,19 @@ Error NetworkedMultiplayerENet::get_packet(const uint8_t **r_buffer, int &r_buff
 }
 
 Error NetworkedMultiplayerENet::put_packet(const uint8_t *p_buffer, int p_buffer_size) {
-
-	ERR_FAIL_COND_V(!active, ERR_UNCONFIGURED);
-	ERR_FAIL_COND_V(connection_status != CONNECTION_CONNECTED, ERR_UNCONFIGURED);
+	ERR_FAIL_COND_V_MSG(!active, ERR_UNCONFIGURED, "The multiplayer instance isn't currently active.");
+	ERR_FAIL_COND_V_MSG(connection_status != CONNECTION_CONNECTED, ERR_UNCONFIGURED, "The multiplayer instance isn't currently connected to any server or client.");
 
 	int packet_flags = 0;
 	int channel = SYSCH_RELIABLE;
 
 	switch (transfer_mode) {
 		case TRANSFER_MODE_UNRELIABLE: {
-			if (always_ordered)
+			if (always_ordered) {
 				packet_flags = 0;
-			else
+			} else {
 				packet_flags = ENET_PACKET_FLAG_UNSEQUENCED;
+			}
 			channel = SYSCH_UNRELIABLE;
 		} break;
 		case TRANSFER_MODE_UNRELIABLE_ORDERED: {
@@ -554,24 +548,23 @@ Error NetworkedMultiplayerENet::put_packet(const uint8_t *p_buffer, int p_buffer
 		} break;
 	}
 
-	if (transfer_channel > SYSCH_CONFIG)
+	if (transfer_channel > SYSCH_CONFIG) {
 		channel = transfer_channel;
+	}
 
-	Map<int, ENetPeer *>::Element *E = NULL;
+	Map<int, ENetPeer *>::Element *E = nullptr;
 
 	if (target_peer != 0) {
-
 		E = peer_map.find(ABS(target_peer));
-		ERR_FAIL_COND_V_MSG(!E, ERR_INVALID_PARAMETER, "Invalid target peer '" + itos(target_peer) + "'.");
+		ERR_FAIL_COND_V_MSG(!E, ERR_INVALID_PARAMETER, vformat("Invalid target peer: %d", target_peer));
 	}
 
-	ENetPacket *packet = enet_packet_create(NULL, p_buffer_size + 8, packet_flags);
+	ENetPacket *packet = enet_packet_create(nullptr, p_buffer_size + 8, packet_flags);
 	encode_uint32(unique_id, &packet->data[0]); // Source ID
 	encode_uint32(target_peer, &packet->data[4]); // Dest ID
 	copymem(&packet->data[8], p_buffer, p_buffer_size);
 
 	if (server) {
-
 		if (target_peer == 0) {
 			enet_host_broadcast(host, channel, packet);
 		} else if (target_peer < 0) {
@@ -581,9 +574,9 @@ Error NetworkedMultiplayerENet::put_packet(const uint8_t *p_buffer, int p_buffer
 			int exclude = -target_peer;
 
 			for (Map<int, ENetPeer *>::Element *F = peer_map.front(); F; F = F->next()) {
-
-				if (F->key() == exclude) // Exclude packet
+				if (F->key() == exclude) { // Exclude packet
 					continue;
+				}
 
 				ENetPacket *packet2 = enet_packet_create(packet->data, packet->dataLength, packet_flags);
 
@@ -595,7 +588,6 @@ Error NetworkedMultiplayerENet::put_packet(const uint8_t *p_buffer, int p_buffer
 			enet_peer_send(E->get(), channel, packet);
 		}
 	} else {
-
 		ERR_FAIL_COND_V(!peer_map.has(1), ERR_BUG);
 		enet_peer_send(peer_map[1], channel, packet); // Send to server for broadcast
 	}
@@ -606,31 +598,26 @@ Error NetworkedMultiplayerENet::put_packet(const uint8_t *p_buffer, int p_buffer
 }
 
 int NetworkedMultiplayerENet::get_max_packet_size() const {
-
 	return 1 << 24; // Anything is good
 }
 
 void NetworkedMultiplayerENet::_pop_current_packet() {
-
 	if (current_packet.packet) {
 		enet_packet_destroy(current_packet.packet);
-		current_packet.packet = NULL;
+		current_packet.packet = nullptr;
 		current_packet.from = 0;
 		current_packet.channel = -1;
 	}
 }
 
 NetworkedMultiplayerPeer::ConnectionStatus NetworkedMultiplayerENet::get_connection_status() const {
-
 	return connection_status;
 }
 
 uint32_t NetworkedMultiplayerENet::_gen_unique_id() const {
-
 	uint32_t hash = 0;
 
 	while (hash == 0 || hash == 1) {
-
 		hash = hash_djb2_one_32(
 				(uint32_t)OS::get_singleton()->get_ticks_usec());
 		hash = hash_djb2_one_32(
@@ -649,33 +636,32 @@ uint32_t NetworkedMultiplayerENet::_gen_unique_id() const {
 }
 
 int NetworkedMultiplayerENet::get_unique_id() const {
-
-	ERR_FAIL_COND_V(!active, 0);
+	ERR_FAIL_COND_V_MSG(!active, 0, "The multiplayer instance isn't currently active.");
 	return unique_id;
 }
 
 void NetworkedMultiplayerENet::set_refuse_new_connections(bool p_enable) {
-
 	refuse_connections = p_enable;
+#ifdef GODOT_ENET
+	if (active) {
+		enet_host_refuse_new_connections(host, p_enable);
+	}
+#endif
 }
 
 bool NetworkedMultiplayerENet::is_refusing_new_connections() const {
-
 	return refuse_connections;
 }
 
 void NetworkedMultiplayerENet::set_compression_mode(CompressionMode p_mode) {
-
 	compression_mode = p_mode;
 }
 
 NetworkedMultiplayerENet::CompressionMode NetworkedMultiplayerENet::get_compression_mode() const {
-
 	return compression_mode;
 }
 
 size_t NetworkedMultiplayerENet::enet_compress(void *context, const ENetBuffer *inBuffers, size_t inBufferCount, size_t inLimit, enet_uint8 *outData, size_t outLimit) {
-
 	NetworkedMultiplayerENet *enet = (NetworkedMultiplayerENet *)(context);
 
 	if (size_t(enet->src_compressor_mem.size()) < inLimit) {
@@ -706,7 +692,7 @@ size_t NetworkedMultiplayerENet::enet_compress(void *context, const ENetBuffer *
 			mode = Compression::MODE_ZSTD;
 		} break;
 		default: {
-			ERR_FAIL_V(0);
+			ERR_FAIL_V_MSG(0, vformat("Invalid ENet compression mode: %d", enet->compression_mode));
 		}
 	}
 
@@ -716,11 +702,13 @@ size_t NetworkedMultiplayerENet::enet_compress(void *context, const ENetBuffer *
 	}
 	int ret = Compression::compress(enet->dst_compressor_mem.ptrw(), enet->src_compressor_mem.ptr(), ofs, mode);
 
-	if (ret < 0)
+	if (ret < 0) {
 		return 0;
+	}
 
-	if (ret > int(outLimit))
+	if (ret > int(outLimit)) {
 		return 0; // Do not bother
+	}
 
 	copymem(outData, enet->dst_compressor_mem.ptr(), ret);
 
@@ -728,20 +716,16 @@ size_t NetworkedMultiplayerENet::enet_compress(void *context, const ENetBuffer *
 }
 
 size_t NetworkedMultiplayerENet::enet_decompress(void *context, const enet_uint8 *inData, size_t inLimit, enet_uint8 *outData, size_t outLimit) {
-
 	NetworkedMultiplayerENet *enet = (NetworkedMultiplayerENet *)(context);
 	int ret = -1;
 	switch (enet->compression_mode) {
 		case COMPRESS_FASTLZ: {
-
 			ret = Compression::decompress(outData, outLimit, inData, inLimit, Compression::MODE_FASTLZ);
 		} break;
 		case COMPRESS_ZLIB: {
-
 			ret = Compression::decompress(outData, outLimit, inData, inLimit, Compression::MODE_DEFLATE);
 		} break;
 		case COMPRESS_ZSTD: {
-
 			ret = Compression::decompress(outData, outLimit, inData, inLimit, Compression::MODE_ZSTD);
 		} break;
 		default: {
@@ -755,12 +739,9 @@ size_t NetworkedMultiplayerENet::enet_decompress(void *context, const enet_uint8
 }
 
 void NetworkedMultiplayerENet::_setup_compressor() {
-
 	switch (compression_mode) {
-
 		case COMPRESS_NONE: {
-
-			enet_host_compress(host, NULL);
+			enet_host_compress(host, nullptr);
 		} break;
 		case COMPRESS_RANGE_CODER: {
 			enet_host_compress_with_range_coder(host);
@@ -768,22 +749,19 @@ void NetworkedMultiplayerENet::_setup_compressor() {
 		case COMPRESS_FASTLZ:
 		case COMPRESS_ZLIB:
 		case COMPRESS_ZSTD: {
-
 			enet_host_compress(host, &enet_compressor);
 		} break;
 	}
 }
 
 void NetworkedMultiplayerENet::enet_compressor_destroy(void *context) {
-
 	// Nothing to do
 }
 
 IP_Address NetworkedMultiplayerENet::get_peer_address(int p_peer_id) const {
-
-	ERR_FAIL_COND_V(!peer_map.has(p_peer_id), IP_Address());
-	ERR_FAIL_COND_V(!is_server() && p_peer_id != 1, IP_Address());
-	ERR_FAIL_COND_V(peer_map[p_peer_id] == NULL, IP_Address());
+	ERR_FAIL_COND_V_MSG(!peer_map.has(p_peer_id), IP_Address(), vformat("Peer ID %d not found in the list of peers.", p_peer_id));
+	ERR_FAIL_COND_V_MSG(!is_server() && p_peer_id != 1, IP_Address(), "Can't get the address of peers other than the server (ID -1) when acting as a client.");
+	ERR_FAIL_COND_V_MSG(peer_map[p_peer_id] == nullptr, IP_Address(), vformat("Peer ID %d found in the list of peers, but is null.", p_peer_id));
 
 	IP_Address out;
 #ifdef GODOT_ENET
@@ -796,10 +774,9 @@ IP_Address NetworkedMultiplayerENet::get_peer_address(int p_peer_id) const {
 }
 
 int NetworkedMultiplayerENet::get_peer_port(int p_peer_id) const {
-
-	ERR_FAIL_COND_V(!peer_map.has(p_peer_id), 0);
-	ERR_FAIL_COND_V(!is_server() && p_peer_id != 1, 0);
-	ERR_FAIL_COND_V(peer_map[p_peer_id] == NULL, 0);
+	ERR_FAIL_COND_V_MSG(!peer_map.has(p_peer_id), 0, vformat("Peer ID %d not found in the list of peers.", p_peer_id));
+	ERR_FAIL_COND_V_MSG(!is_server() && p_peer_id != 1, 0, "Can't get the address of peers other than the server (ID -1) when acting as a client.");
+	ERR_FAIL_COND_V_MSG(peer_map[p_peer_id] == nullptr, 0, vformat("Peer ID %d found in the list of peers, but is null.", p_peer_id));
 #ifdef GODOT_ENET
 	return peer_map[p_peer_id]->address.port;
 #else
@@ -808,9 +785,8 @@ int NetworkedMultiplayerENet::get_peer_port(int p_peer_id) const {
 }
 
 void NetworkedMultiplayerENet::set_transfer_channel(int p_channel) {
-
-	ERR_FAIL_COND(p_channel < -1 || p_channel >= channel_count);
-	ERR_FAIL_COND_MSG(p_channel == SYSCH_CONFIG, "Channel " + itos(SYSCH_CONFIG) + " is reserved.");
+	ERR_FAIL_COND_MSG(p_channel < -1 || p_channel >= channel_count, vformat("The transfer channel must be set between 0 and %d, inclusive (got %d).", channel_count - 1, p_channel));
+	ERR_FAIL_COND_MSG(p_channel == SYSCH_CONFIG, vformat("The channel %d is reserved.", SYSCH_CONFIG));
 	transfer_channel = p_channel;
 }
 
@@ -819,9 +795,8 @@ int NetworkedMultiplayerENet::get_transfer_channel() const {
 }
 
 void NetworkedMultiplayerENet::set_channel_count(int p_channel) {
-
-	ERR_FAIL_COND(active);
-	ERR_FAIL_COND(p_channel < SYSCH_MAX);
+	ERR_FAIL_COND_MSG(active, "The channel count can't be set while the multiplayer instance is active.");
+	ERR_FAIL_COND_MSG(p_channel < SYSCH_MAX, vformat("The channel count must be greater than or equal to %d to account for reserved channels (got %d).", SYSCH_MAX, p_channel));
 	channel_count = p_channel;
 }
 
@@ -838,7 +813,7 @@ bool NetworkedMultiplayerENet::is_always_ordered() const {
 }
 
 void NetworkedMultiplayerENet::set_server_relay_enabled(bool p_enabled) {
-	ERR_FAIL_COND(active);
+	ERR_FAIL_COND_MSG(active, "Server relaying can't be toggled while the multiplayer instance is active.");
 
 	server_relay = p_enabled;
 }
@@ -848,7 +823,6 @@ bool NetworkedMultiplayerENet::is_server_relay_enabled() const {
 }
 
 void NetworkedMultiplayerENet::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("create_server", "port", "max_clients", "in_bandwidth", "out_bandwidth"), &NetworkedMultiplayerENet::create_server, DEFVAL(32), DEFVAL(0), DEFVAL(0));
 	ClassDB::bind_method(D_METHOD("create_client", "address", "port", "in_bandwidth", "out_bandwidth", "client_port"), &NetworkedMultiplayerENet::create_client, DEFVAL(0), DEFVAL(0), DEFVAL(0));
 	ClassDB::bind_method(D_METHOD("close_connection", "wait_usec"), &NetworkedMultiplayerENet::close_connection, DEFVAL(100));
@@ -856,6 +830,12 @@ void NetworkedMultiplayerENet::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_compression_mode", "mode"), &NetworkedMultiplayerENet::set_compression_mode);
 	ClassDB::bind_method(D_METHOD("get_compression_mode"), &NetworkedMultiplayerENet::get_compression_mode);
 	ClassDB::bind_method(D_METHOD("set_bind_ip", "ip"), &NetworkedMultiplayerENet::set_bind_ip);
+	ClassDB::bind_method(D_METHOD("set_dtls_enabled", "enabled"), &NetworkedMultiplayerENet::set_dtls_enabled);
+	ClassDB::bind_method(D_METHOD("is_dtls_enabled"), &NetworkedMultiplayerENet::is_dtls_enabled);
+	ClassDB::bind_method(D_METHOD("set_dtls_key", "key"), &NetworkedMultiplayerENet::set_dtls_key);
+	ClassDB::bind_method(D_METHOD("set_dtls_certificate", "certificate"), &NetworkedMultiplayerENet::set_dtls_certificate);
+	ClassDB::bind_method(D_METHOD("set_dtls_verify_enabled", "enabled"), &NetworkedMultiplayerENet::set_dtls_verify_enabled);
+	ClassDB::bind_method(D_METHOD("is_dtls_verify_enabled"), &NetworkedMultiplayerENet::is_dtls_verify_enabled);
 	ClassDB::bind_method(D_METHOD("get_peer_address", "id"), &NetworkedMultiplayerENet::get_peer_address);
 	ClassDB::bind_method(D_METHOD("get_peer_port", "id"), &NetworkedMultiplayerENet::get_peer_port);
 
@@ -875,6 +855,8 @@ void NetworkedMultiplayerENet::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "channel_count"), "set_channel_count", "get_channel_count");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "always_ordered"), "set_always_ordered", "is_always_ordered");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "server_relay"), "set_server_relay_enabled", "is_server_relay_enabled");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "dtls_verify"), "set_dtls_verify_enabled", "is_dtls_verify_enabled");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "use_dtls"), "set_dtls_enabled", "is_dtls_enabled");
 
 	BIND_ENUM_CONSTANT(COMPRESS_NONE);
 	BIND_ENUM_CONSTANT(COMPRESS_RANGE_CODER);
@@ -884,14 +866,13 @@ void NetworkedMultiplayerENet::_bind_methods() {
 }
 
 NetworkedMultiplayerENet::NetworkedMultiplayerENet() {
-
 	active = false;
 	server = false;
 	refuse_connections = false;
 	server_relay = true;
 	unique_id = 0;
 	target_peer = 0;
-	current_packet.packet = NULL;
+	current_packet.packet = nullptr;
 	transfer_mode = TRANSFER_MODE_RELIABLE;
 	channel_count = SYSCH_MAX;
 	transfer_channel = -1;
@@ -904,10 +885,12 @@ NetworkedMultiplayerENet::NetworkedMultiplayerENet() {
 	enet_compressor.destroy = enet_compressor_destroy;
 
 	bind_ip = IP_Address("*");
+
+	dtls_enabled = false;
+	dtls_verify = true;
 }
 
 NetworkedMultiplayerENet::~NetworkedMultiplayerENet() {
-
 	if (active) {
 		close_connection();
 	}
@@ -916,7 +899,35 @@ NetworkedMultiplayerENet::~NetworkedMultiplayerENet() {
 // Sets IP for ENet to bind when using create_server or create_client
 // if no IP is set, then ENet bind to ENET_HOST_ANY
 void NetworkedMultiplayerENet::set_bind_ip(const IP_Address &p_ip) {
-	ERR_FAIL_COND(!p_ip.is_valid() && !p_ip.is_wildcard());
+	ERR_FAIL_COND_MSG(!p_ip.is_valid() && !p_ip.is_wildcard(), vformat("Invalid bind IP address: %s", String(p_ip)));
 
 	bind_ip = p_ip;
 }
+
+void NetworkedMultiplayerENet::set_dtls_enabled(bool p_enabled) {
+	ERR_FAIL_COND(active);
+	dtls_enabled = p_enabled;
+}
+
+bool NetworkedMultiplayerENet::is_dtls_enabled() const {
+	return dtls_enabled;
+}
+
+void NetworkedMultiplayerENet::set_dtls_verify_enabled(bool p_enabled) {
+	ERR_FAIL_COND(active);
+	dtls_verify = p_enabled;
+}
+
+bool NetworkedMultiplayerENet::is_dtls_verify_enabled() const {
+	return dtls_verify;
+}
+
+void NetworkedMultiplayerENet::set_dtls_key(Ref<CryptoKey> p_key) {
+	ERR_FAIL_COND(active);
+	dtls_key = p_key;
+}
+
+void NetworkedMultiplayerENet::set_dtls_certificate(Ref<X509Certificate> p_cert) {
+	ERR_FAIL_COND(active);
+	dtls_cert = p_cert;
+}
diff --git a/modules/enet/networked_multiplayer_enet.h b/modules/enet/networked_multiplayer_enet.h
index 11487b99a5..722c7001fd 100644
--- a/modules/enet/networked_multiplayer_enet.h
+++ b/modules/enet/networked_multiplayer_enet.h
@@ -31,13 +31,13 @@
 #ifndef NETWORKED_MULTIPLAYER_ENET_H
 #define NETWORKED_MULTIPLAYER_ENET_H
 
+#include "core/crypto/crypto.h"
 #include "core/io/compression.h"
 #include "core/io/networked_multiplayer_peer.h"
 
 #include <enet/enet.h>
 
 class NetworkedMultiplayerENet : public NetworkedMultiplayerPeer {
-
 	GDCLASS(NetworkedMultiplayerENet, NetworkedMultiplayerPeer);
 
 public:
@@ -85,7 +85,6 @@ private:
 	Map<int, ENetPeer *> peer_map;
 
 	struct Packet {
-
 		ENetPacket *packet;
 		int from;
 		int channel;
@@ -111,15 +110,20 @@ private:
 
 	IP_Address bind_ip;
 
+	bool dtls_enabled;
+	Ref<CryptoKey> dtls_key;
+	Ref<X509Certificate> dtls_cert;
+	bool dtls_verify;
+
 protected:
 	static void _bind_methods();
 
 public:
-	virtual void set_transfer_mode(TransferMode p_mode);
-	virtual TransferMode get_transfer_mode() const;
-	virtual void set_target_peer(int p_peer);
+	virtual void set_transfer_mode(TransferMode p_mode) override;
+	virtual TransferMode get_transfer_mode() const override;
+	virtual void set_target_peer(int p_peer) override;
 
-	virtual int get_packet_peer() const;
+	virtual int get_packet_peer() const override;
 
 	virtual IP_Address get_peer_address(int p_peer_id) const;
 	virtual int get_peer_port(int p_peer_id) const;
@@ -131,22 +135,22 @@ public:
 
 	void disconnect_peer(int p_peer, bool now = false);
 
-	virtual void poll();
+	virtual void poll() override;
 
-	virtual bool is_server() const;
+	virtual bool is_server() const override;
 
-	virtual int get_available_packet_count() const;
-	virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size); ///< buffer is GONE after next get_packet
-	virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size);
+	virtual int get_available_packet_count() const override;
+	virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size) override; ///< buffer is GONE after next get_packet
+	virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size) override;
 
-	virtual int get_max_packet_size() const;
+	virtual int get_max_packet_size() const override;
 
-	virtual ConnectionStatus get_connection_status() const;
+	virtual ConnectionStatus get_connection_status() const override;
 
-	virtual void set_refuse_new_connections(bool p_enable);
-	virtual bool is_refusing_new_connections() const;
+	virtual void set_refuse_new_connections(bool p_enable) override;
+	virtual bool is_refusing_new_connections() const override;
 
-	virtual int get_unique_id() const;
+	virtual int get_unique_id() const override;
 
 	void set_compression_mode(CompressionMode p_mode);
 	CompressionMode get_compression_mode() const;
@@ -166,6 +170,12 @@ public:
 	~NetworkedMultiplayerENet();
 
 	void set_bind_ip(const IP_Address &p_ip);
+	void set_dtls_enabled(bool p_enabled);
+	bool is_dtls_enabled() const;
+	void set_dtls_verify_enabled(bool p_enabled);
+	bool is_dtls_verify_enabled() const;
+	void set_dtls_key(Ref<CryptoKey> p_key);
+	void set_dtls_certificate(Ref<X509Certificate> p_cert);
 };
 
 VARIANT_ENUM_CAST(NetworkedMultiplayerENet::CompressionMode);
diff --git a/modules/enet/register_types.cpp b/modules/enet/register_types.cpp
index 27f27196d6..18051f756a 100644
--- a/modules/enet/register_types.cpp
+++ b/modules/enet/register_types.cpp
@@ -35,7 +35,6 @@
 static bool enet_ok = false;
 
 void register_enet_types() {
-
 	if (enet_initialize() != 0) {
 		ERR_PRINT("ENet initialization failure");
 	} else {
@@ -46,7 +45,7 @@ void register_enet_types() {
 }
 
 void unregister_enet_types() {
-
-	if (enet_ok)
+	if (enet_ok) {
 		enet_deinitialize();
+	}
 }
diff --git a/modules/enet/register_types.h b/modules/enet/register_types.h
index 19f8c5a352..cac0a4f7ee 100644
--- a/modules/enet/register_types.h
+++ b/modules/enet/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef ENET_REGISTER_TYPES_H
+#define ENET_REGISTER_TYPES_H
+
 void register_enet_types();
 void unregister_enet_types();
+
+#endif // ENET_REGISTER_TYPES_H
diff --git a/modules/etc/SCsub b/modules/etc/SCsub
index 1742d3534f..383bbf83c3 100644
--- a/modules/etc/SCsub
+++ b/modules/etc/SCsub
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_etc = env_modules.Clone()
 
@@ -9,21 +9,21 @@ env_etc = env_modules.Clone()
 # Not unbundled so far since not widespread as shared library
 thirdparty_dir = "#thirdparty/etc2comp/"
 thirdparty_sources = [
-	"EtcBlock4x4.cpp",
-	"EtcBlock4x4Encoding.cpp",
-	"EtcBlock4x4Encoding_ETC1.cpp",
-	"EtcBlock4x4Encoding_R11.cpp",
-	"EtcBlock4x4Encoding_RG11.cpp",
-	"EtcBlock4x4Encoding_RGB8A1.cpp",
-	"EtcBlock4x4Encoding_RGB8.cpp",
-	"EtcBlock4x4Encoding_RGBA8.cpp",
-	"Etc.cpp",
-	"EtcDifferentialTrys.cpp",
-	"EtcFilter.cpp",
-	"EtcImage.cpp",
-	"EtcIndividualTrys.cpp",
-	"EtcMath.cpp",
-	"EtcSortedBlockList.cpp",
+    "EtcBlock4x4.cpp",
+    "EtcBlock4x4Encoding.cpp",
+    "EtcBlock4x4Encoding_ETC1.cpp",
+    "EtcBlock4x4Encoding_R11.cpp",
+    "EtcBlock4x4Encoding_RG11.cpp",
+    "EtcBlock4x4Encoding_RGB8A1.cpp",
+    "EtcBlock4x4Encoding_RGB8.cpp",
+    "EtcBlock4x4Encoding_RGBA8.cpp",
+    "Etc.cpp",
+    "EtcDifferentialTrys.cpp",
+    "EtcFilter.cpp",
+    "EtcImage.cpp",
+    "EtcIndividualTrys.cpp",
+    "EtcMath.cpp",
+    "EtcSortedBlockList.cpp",
 ]
 thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
diff --git a/modules/etc/config.py b/modules/etc/config.py
index 098f1eafa9..53b8f2f2e3 100644
--- a/modules/etc/config.py
+++ b/modules/etc/config.py
@@ -1,5 +1,6 @@
 def can_build(env, platform):
-    return env['tools']
+    return env["tools"]
+
 
 def configure(env):
     pass
diff --git a/modules/etc/image_etc.cpp b/modules/etc/image_etc.cpp
index b80138c99d..d1ba3dc355 100644
--- a/modules/etc/image_etc.cpp
+++ b/modules/etc/image_etc.cpp
@@ -36,18 +36,18 @@
 #include "core/os/os.h"
 #include "core/print_string.h"
 
-static Image::Format _get_etc2_mode(Image::DetectChannels format) {
+static Image::Format _get_etc2_mode(Image::UsedChannels format) {
 	switch (format) {
-		case Image::DETECTED_R:
+		case Image::USED_CHANNELS_R:
 			return Image::FORMAT_ETC2_R11;
 
-		case Image::DETECTED_RG:
+		case Image::USED_CHANNELS_RG:
 			return Image::FORMAT_ETC2_RG11;
 
-		case Image::DETECTED_RGB:
+		case Image::USED_CHANNELS_RGB:
 			return Image::FORMAT_ETC2_RGB8;
 
-		case Image::DETECTED_RGBA:
+		case Image::USED_CHANNELS_RGBA:
 			return Image::FORMAT_ETC2_RGBA8;
 
 		// TODO: would be nice if we could use FORMAT_ETC2_RGB8A1 for FORMAT_RGBA5551
@@ -88,47 +88,8 @@ static Etc::Image::Format _image_format_to_etc2comp_format(Image::Format format)
 	}
 }
 
-static void _compress_etc(Image *p_img, float p_lossy_quality, bool force_etc1_format, Image::CompressSource p_source) {
+static void _compress_etc(Image *p_img, float p_lossy_quality, bool force_etc1_format, Image::UsedChannels p_channels) {
 	Image::Format img_format = p_img->get_format();
-	Image::DetectChannels detected_channels = p_img->get_detected_channels();
-
-	if (p_source == Image::COMPRESS_SOURCE_LAYERED) {
-		//keep what comes in
-		switch (p_img->get_format()) {
-			case Image::FORMAT_L8: {
-				detected_channels = Image::DETECTED_L;
-			} break;
-			case Image::FORMAT_LA8: {
-				detected_channels = Image::DETECTED_LA;
-			} break;
-			case Image::FORMAT_R8: {
-				detected_channels = Image::DETECTED_R;
-			} break;
-			case Image::FORMAT_RG8: {
-				detected_channels = Image::DETECTED_RG;
-			} break;
-			case Image::FORMAT_RGB8: {
-				detected_channels = Image::DETECTED_RGB;
-			} break;
-			case Image::FORMAT_RGBA8:
-			case Image::FORMAT_RGBA4444:
-			case Image::FORMAT_RGBA5551: {
-				detected_channels = Image::DETECTED_RGBA;
-			} break;
-			default: {
-			}
-		}
-	}
-
-	if (p_source == Image::COMPRESS_SOURCE_SRGB && (detected_channels == Image::DETECTED_R || detected_channels == Image::DETECTED_RG)) {
-		//R and RG do not support SRGB
-		detected_channels = Image::DETECTED_RGB;
-	}
-
-	if (p_source == Image::COMPRESS_SOURCE_NORMAL) {
-		//use RG channels only for normal
-		detected_channels = Image::DETECTED_RG;
-	}
 
 	if (img_format >= Image::FORMAT_DXT1) {
 		return; //do not compress, already compressed
@@ -139,26 +100,36 @@ static void _compress_etc(Image *p_img, float p_lossy_quality, bool force_etc1_f
 		return;
 	}
 
+	// FIXME: Commented out during Vulkan rebase.
+	/*
 	if (force_etc1_format) {
 		// If VRAM compression is using ETC, but image has alpha, convert to RGBA4444 or LA8
 		// This saves space while maintaining the alpha channel
-		if (detected_channels == Image::DETECTED_RGBA) {
+		if (detected_channels == Image::USED_CHANNELS_RGBA) {
+
+			if (p_img->has_mipmaps()) {
+				// Image doesn't support mipmaps with RGBA4444 textures
+				p_img->clear_mipmaps();
+			}
 			p_img->convert(Image::FORMAT_RGBA4444);
 			return;
-		} else if (detected_channels == Image::DETECTED_LA) {
+		} else if (detected_channels == Image::USE_CHANNELS_LA) {
+
 			p_img->convert(Image::FORMAT_LA8);
 			return;
 		}
 	}
+	*/
 
 	uint32_t imgw = p_img->get_width(), imgh = p_img->get_height();
 
-	Image::Format etc_format = force_etc1_format ? Image::FORMAT_ETC : _get_etc2_mode(detected_channels);
+	Image::Format etc_format = force_etc1_format ? Image::FORMAT_ETC : _get_etc2_mode(p_channels);
 
 	Ref<Image> img = p_img->duplicate();
 
-	if (img->get_format() != Image::FORMAT_RGBA8)
+	if (img->get_format() != Image::FORMAT_RGBA8) {
 		img->convert(Image::FORMAT_RGBA8); //still uses RGBA to convert
+	}
 
 	if (img->has_mipmaps()) {
 		if (next_power_of_2(imgw) != imgw || next_power_of_2(imgh) != imgh) {
@@ -179,28 +150,29 @@ static void _compress_etc(Image *p_img, float p_lossy_quality, bool force_etc1_f
 		}
 	}
 
-	PoolVector<uint8_t>::Read r = img->get_data().read();
-	ERR_FAIL_COND(!r.ptr());
+	const uint8_t *r = img->get_data().ptr();
+	ERR_FAIL_COND(!r);
 
 	unsigned int target_size = Image::get_image_data_size(imgw, imgh, etc_format, p_img->has_mipmaps());
 	int mmc = 1 + (p_img->has_mipmaps() ? Image::get_image_required_mipmaps(imgw, imgh, etc_format) : 0);
 
-	PoolVector<uint8_t> dst_data;
+	Vector<uint8_t> dst_data;
 	dst_data.resize(target_size);
 
-	PoolVector<uint8_t>::Write w = dst_data.write();
+	uint8_t *w = dst_data.ptrw();
 
 	// prepare parameters to be passed to etc2comp
 	int num_cpus = OS::get_singleton()->get_processor_count();
 	int encoding_time = 0;
 	float effort = 0.0; //default, reasonable time
 
-	if (p_lossy_quality > 0.75)
+	if (p_lossy_quality > 0.75) {
 		effort = 0.4;
-	else if (p_lossy_quality > 0.85)
+	} else if (p_lossy_quality > 0.85) {
 		effort = 0.6;
-	else if (p_lossy_quality > 0.95)
+	} else if (p_lossy_quality > 0.95) {
 		effort = 0.8;
+	}
 
 	Etc::ErrorMetric error_metric = Etc::ErrorMetric::RGBX; // NOTE: we can experiment with other error metrics
 	Etc::Image::Format etc2comp_etc_format = _image_format_to_etc2comp_format(etc_format);
@@ -222,7 +194,7 @@ static void _compress_etc(Image *p_img, float p_lossy_quality, bool force_etc1_f
 			src_rgba_f[j] = Etc::ColorFloatRGBA::ConvertFromRGBA8(src[si], src[si + 1], src[si + 2], src[si + 3]);
 		}
 
-		unsigned char *etc_data = NULL;
+		unsigned char *etc_data = nullptr;
 		unsigned int etc_data_len = 0;
 		unsigned int extended_width = 0, extended_height = 0;
 		Etc::Encode((float *)src_rgba_f, mipmap_w, mipmap_h, etc2comp_etc_format, error_metric, effort, num_cpus, num_cpus, &etc_data, &etc_data_len, &extended_width, &extended_height, &encoding_time);
@@ -241,15 +213,14 @@ static void _compress_etc(Image *p_img, float p_lossy_quality, bool force_etc1_f
 }
 
 static void _compress_etc1(Image *p_img, float p_lossy_quality) {
-	_compress_etc(p_img, p_lossy_quality, true, Image::COMPRESS_SOURCE_GENERIC);
+	_compress_etc(p_img, p_lossy_quality, true, Image::USED_CHANNELS_RGB);
 }
 
-static void _compress_etc2(Image *p_img, float p_lossy_quality, Image::CompressSource p_source) {
-	_compress_etc(p_img, p_lossy_quality, false, p_source);
+static void _compress_etc2(Image *p_img, float p_lossy_quality, Image::UsedChannels p_channels) {
+	_compress_etc(p_img, p_lossy_quality, false, p_channels);
 }
 
 void _register_etc_compress_func() {
-
 	Image::_image_compress_etc1_func = _compress_etc1;
 	Image::_image_compress_etc2_func = _compress_etc2;
 }
diff --git a/modules/etc/register_types.cpp b/modules/etc/register_types.cpp
index 26809e0de9..0972857808 100644
--- a/modules/etc/register_types.cpp
+++ b/modules/etc/register_types.cpp
@@ -36,7 +36,6 @@
 static Ref<ResourceFormatPKM> resource_loader_pkm;
 
 void register_etc_types() {
-
 	resource_loader_pkm.instance();
 	ResourceLoader::add_resource_format_loader(resource_loader_pkm);
 
@@ -44,7 +43,6 @@ void register_etc_types() {
 }
 
 void unregister_etc_types() {
-
 	ResourceLoader::remove_resource_format_loader(resource_loader_pkm);
 	resource_loader_pkm.unref();
 }
diff --git a/modules/etc/register_types.h b/modules/etc/register_types.h
index fac83e7d17..247c7213af 100644
--- a/modules/etc/register_types.h
+++ b/modules/etc/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef ETC_REGISTER_TYPES_H
+#define ETC_REGISTER_TYPES_H
+
 void register_etc_types();
 void unregister_etc_types();
+
+#endif // ETC_REGISTER_TYPES_H
diff --git a/modules/etc/texture_loader_pkm.cpp b/modules/etc/texture_loader_pkm.cpp
index 27c2358306..c40e9612a8 100644
--- a/modules/etc/texture_loader_pkm.cpp
+++ b/modules/etc/texture_loader_pkm.cpp
@@ -42,19 +42,21 @@ struct ETC1Header {
 	uint16_t origHeight;
 };
 
-RES ResourceFormatPKM::load(const String &p_path, const String &p_original_path, Error *r_error) {
-
-	if (r_error)
+RES ResourceFormatPKM::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, bool p_no_cache) {
+	if (r_error) {
 		*r_error = ERR_CANT_OPEN;
+	}
 
 	Error err;
 	FileAccess *f = FileAccess::open(p_path, FileAccess::READ, &err);
-	if (!f)
+	if (!f) {
 		return RES();
+	}
 
 	FileAccessRef fref(f);
-	if (r_error)
+	if (r_error) {
 		*r_error = ERR_FILE_CORRUPT;
+	}
 
 	ERR_FAIL_COND_V_MSG(err != OK, RES(), "Unable to open PKM texture file '" + p_path + "'.");
 
@@ -71,13 +73,12 @@ RES ResourceFormatPKM::load(const String &p_path, const String &p_original_path,
 	h.origWidth = f->get_16();
 	h.origHeight = f->get_16();
 
-	PoolVector<uint8_t> src_data;
+	Vector<uint8_t> src_data;
 
 	uint32_t size = h.texWidth * h.texHeight / 2;
 	src_data.resize(size);
-	PoolVector<uint8_t>::Write wb = src_data.write();
-	f->get_buffer(wb.ptr(), size);
-	wb.release();
+	uint8_t *wb = src_data.ptrw();
+	f->get_buffer(wb, size);
 
 	int mipmaps = h.format;
 	int width = h.origWidth;
@@ -88,8 +89,9 @@ RES ResourceFormatPKM::load(const String &p_path, const String &p_original_path,
 	Ref<ImageTexture> texture = memnew(ImageTexture);
 	texture->create_from_image(img);
 
-	if (r_error)
+	if (r_error) {
 		*r_error = OK;
+	}
 
 	f->close();
 	memdelete(f);
@@ -97,18 +99,16 @@ RES ResourceFormatPKM::load(const String &p_path, const String &p_original_path,
 }
 
 void ResourceFormatPKM::get_recognized_extensions(List<String> *p_extensions) const {
-
 	p_extensions->push_back("pkm");
 }
 
 bool ResourceFormatPKM::handles_type(const String &p_type) const {
-
-	return ClassDB::is_parent_class(p_type, "Texture");
+	return ClassDB::is_parent_class(p_type, "Texture2D");
 }
 
 String ResourceFormatPKM::get_resource_type(const String &p_path) const {
-
-	if (p_path.get_extension().to_lower() == "pkm")
+	if (p_path.get_extension().to_lower() == "pkm") {
 		return "ImageTexture";
+	}
 	return "";
 }
diff --git a/modules/etc/texture_loader_pkm.h b/modules/etc/texture_loader_pkm.h
index 3d52a9ea95..6507e0bdec 100644
--- a/modules/etc/texture_loader_pkm.h
+++ b/modules/etc/texture_loader_pkm.h
@@ -36,7 +36,7 @@
 
 class ResourceFormatPKM : public ResourceFormatLoader {
 public:
-	virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
+	virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, bool p_no_cache = false);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual bool handles_type(const String &p_type) const;
 	virtual String get_resource_type(const String &p_path) const;
diff --git a/modules/freetype/SCsub b/modules/freetype/SCsub
index 8f4a8de895..bfc1658bb4 100644
--- a/modules/freetype/SCsub
+++ b/modules/freetype/SCsub
@@ -1,14 +1,12 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
-
-from compat import isbasestring
+Import("env")
+Import("env_modules")
 
 env_freetype = env_modules.Clone()
 
 # Thirdparty source files
-if env['builtin_freetype']:
+if env["builtin_freetype"]:
     thirdparty_dir = "#thirdparty/freetype/"
     thirdparty_sources = [
         "src/autofit/autofit.c",
@@ -55,31 +53,31 @@ if env['builtin_freetype']:
     ]
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-    if env['platform'] == 'uwp':
+    if env["platform"] == "uwp":
         # Include header for UWP to fix build issues
-        env_freetype.Append(CCFLAGS=['/FI', '"modules/freetype/uwpdef.h"'])
+        env_freetype.Append(CCFLAGS=["/FI", '"modules/freetype/uwpdef.h"'])
         # Globally too, as freetype is used in scene (see bottom)
-        env.Append(CCFLAGS=['/FI', '"modules/freetype/uwpdef.h"'])
+        env.Append(CCFLAGS=["/FI", '"modules/freetype/uwpdef.h"'])
 
     env_freetype.Prepend(CPPPATH=[thirdparty_dir + "/include"])
     # Also needed in main env for scene/
     env.Prepend(CPPPATH=[thirdparty_dir + "/include"])
 
-    env_freetype.Append(CPPDEFINES=['FT2_BUILD_LIBRARY', 'FT_CONFIG_OPTION_USE_PNG'])
-    if (env['target'] == 'debug'):
-        env_freetype.Append(CPPDEFINES=['ZLIB_DEBUG'])
+    env_freetype.Append(CPPDEFINES=["FT2_BUILD_LIBRARY", "FT_CONFIG_OPTION_USE_PNG"])
+    if env["target"] == "debug":
+        env_freetype.Append(CPPDEFINES=["ZLIB_DEBUG"])
 
     # Also requires libpng headers
-    if env['builtin_libpng']:
+    if env["builtin_libpng"]:
         env_freetype.Prepend(CPPPATH=["#thirdparty/libpng"])
 
-    sfnt = thirdparty_dir + 'src/sfnt/sfnt.c'
+    sfnt = thirdparty_dir + "src/sfnt/sfnt.c"
     # Must be done after all CPPDEFINES are being set so we can copy them.
-    if env['platform'] == 'javascript':
+    if env["platform"] == "javascript":
         # Forcibly undefine this macro so SIMD is not used in this file,
         # since currently unsupported in WASM
         tmp_env = env_freetype.Clone()
-        tmp_env.Append(CPPFLAGS=['-U__OPTIMIZE__'])
+        tmp_env.Append(CPPFLAGS=["-U__OPTIMIZE__"])
         sfnt = tmp_env.Object(sfnt)
     thirdparty_sources += [sfnt]
 
@@ -93,7 +91,7 @@ if env['builtin_freetype']:
     # and then plain strings for system library. We insert between the two.
     inserted = False
     for idx, linklib in enumerate(env["LIBS"]):
-        if isbasestring(linklib): # first system lib such as "X11", otherwise SCons lib object
+        if isinstance(linklib, (str, bytes)):  # first system lib such as "X11", otherwise SCons lib object
             env["LIBS"].insert(idx, lib)
             inserted = True
             break
@@ -102,5 +100,3 @@ if env['builtin_freetype']:
 
 # Godot source files
 env_freetype.add_source_files(env.modules_sources, "*.cpp")
-# Used in scene/, needs to be in main env
-env.Append(CPPDEFINES=['FREETYPE_ENABLED'])
diff --git a/modules/freetype/config.py b/modules/freetype/config.py
index 1c8cd12a2d..d22f9454ed 100644
--- a/modules/freetype/config.py
+++ b/modules/freetype/config.py
@@ -1,5 +1,6 @@
 def can_build(env, platform):
     return True
 
+
 def configure(env):
     pass
diff --git a/modules/freetype/register_types.h b/modules/freetype/register_types.h
index 336969d079..aa8088d2e8 100644
--- a/modules/freetype/register_types.h
+++ b/modules/freetype/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef FREETYPE_REGISTER_TYPES_H
+#define FREETYPE_REGISTER_TYPES_H
+
 void register_freetype_types();
 void unregister_freetype_types();
+
+#endif // FREETYPE_REGISTER_TYPES_H
diff --git a/modules/gdnative/SCsub b/modules/gdnative/SCsub
index a18c75fa27..0e2291c1f9 100644
--- a/modules/gdnative/SCsub
+++ b/modules/gdnative/SCsub
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_gdnative = env_modules.Clone()
 env_gdnative.add_source_files(env.modules_sources, "gdnative.cpp")
@@ -12,21 +12,23 @@ env_gdnative.add_source_files(env.modules_sources, "nativescript/*.cpp")
 env_gdnative.add_source_files(env.modules_sources, "gdnative_library_singleton_editor.cpp")
 env_gdnative.add_source_files(env.modules_sources, "gdnative_library_editor_plugin.cpp")
 
-env_gdnative.Prepend(CPPPATH=['#modules/gdnative/include/'])
+env_gdnative.Prepend(CPPPATH=["#modules/gdnative/include/"])
 
-Export('env_gdnative')
+Export("env_gdnative")
 
 SConscript("net/SCsub")
-SConscript("arvr/SCsub")
+SConscript("xr/SCsub")
 SConscript("pluginscript/SCsub")
 SConscript("videodecoder/SCsub")
 
 
-from platform_methods import run_in_subprocess
 import gdnative_builders
 
-_, gensource = env_gdnative.CommandNoCache(['include/gdnative_api_struct.gen.h', 'gdnative_api_struct.gen.cpp'],
-                               'gdnative_api.json', run_in_subprocess(gdnative_builders.build_gdnative_api_struct))
+_, gensource = env_gdnative.CommandNoCache(
+    ["include/gdnative_api_struct.gen.h", "gdnative_api_struct.gen.cpp"],
+    "gdnative_api.json",
+    env.Run(gdnative_builders.build_gdnative_api_struct, "Generating GDNative API."),
+)
 env_gdnative.add_source_files(env.modules_sources, [gensource])
 
 env.use_ptrcall = True
diff --git a/modules/gdnative/android/android_gdn.cpp b/modules/gdnative/android/android_gdn.cpp
index 4be489cd46..bc39be1813 100644
--- a/modules/gdnative/android/android_gdn.cpp
+++ b/modules/gdnative/android/android_gdn.cpp
@@ -50,7 +50,7 @@ JNIEnv *GDAPI godot_android_get_env() {
 #ifdef __ANDROID__
 	return ThreadAndroid::get_env();
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -59,7 +59,7 @@ jobject GDAPI godot_android_get_activity() {
 	OS_Android *os_android = (OS_Android *)OS::get_singleton();
 	return os_android->get_godot_java()->get_activity();
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -68,7 +68,7 @@ jobject GDAPI godot_android_get_surface() {
 	OS_Android *os_android = (OS_Android *)OS::get_singleton();
 	return os_android->get_godot_java()->get_surface();
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -83,4 +83,4 @@ bool GDAPI godot_android_is_activity_resumed() {
 
 #ifdef __cplusplus
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/modules/gdnative/arvr/SCsub b/modules/gdnative/arvr/SCsub
deleted file mode 100644
index 20eaa99592..0000000000
--- a/modules/gdnative/arvr/SCsub
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env python
-
-Import('env')
-Import('env_gdnative')
-
-env_gdnative.add_source_files(env.modules_sources, '*.cpp')
diff --git a/modules/gdnative/arvr/arvr_interface_gdnative.cpp b/modules/gdnative/arvr/arvr_interface_gdnative.cpp
deleted file mode 100644
index 5efa915f62..0000000000
--- a/modules/gdnative/arvr/arvr_interface_gdnative.cpp
+++ /dev/null
@@ -1,428 +0,0 @@
-/*************************************************************************/
-/*  arvr_interface_gdnative.cpp                                          */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
-/*                                                                       */
-/* Permission is hereby granted, free of charge, to any person obtaining */
-/* a copy of this software and associated documentation files (the       */
-/* "Software"), to deal in the Software without restriction, including   */
-/* without limitation the rights to use, copy, modify, merge, publish,   */
-/* distribute, sublicense, and/or sell copies of the Software, and to    */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions:                                             */
-/*                                                                       */
-/* The above copyright notice and this permission notice shall be        */
-/* included in all copies or substantial portions of the Software.       */
-/*                                                                       */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
-/*************************************************************************/
-
-#include "arvr_interface_gdnative.h"
-#include "main/input_default.h"
-#include "servers/arvr/arvr_positional_tracker.h"
-#include "servers/visual/visual_server_globals.h"
-
-void ARVRInterfaceGDNative::_bind_methods() {
-	ADD_PROPERTY_DEFAULT("interface_is_initialized", false);
-	ADD_PROPERTY_DEFAULT("ar_is_anchor_detection_enabled", false);
-}
-
-ARVRInterfaceGDNative::ARVRInterfaceGDNative() {
-	print_verbose("Construct gdnative interface\n");
-
-	// we won't have our data pointer until our library gets set
-	data = NULL;
-
-	interface = NULL;
-}
-
-ARVRInterfaceGDNative::~ARVRInterfaceGDNative() {
-	print_verbose("Destruct gdnative interface\n");
-
-	if (interface != NULL && is_initialized()) {
-		uninitialize();
-	};
-
-	// cleanup after ourselves
-	cleanup();
-}
-
-void ARVRInterfaceGDNative::cleanup() {
-	if (interface != NULL) {
-		interface->destructor(data);
-		data = NULL;
-		interface = NULL;
-	}
-}
-
-void ARVRInterfaceGDNative::set_interface(const godot_arvr_interface_gdnative *p_interface) {
-	// this should only be called once, just being paranoid..
-	if (interface) {
-		cleanup();
-	}
-
-	// bind to our interface
-	interface = p_interface;
-
-	// Now we do our constructing...
-	data = interface->constructor((godot_object *)this);
-}
-
-StringName ARVRInterfaceGDNative::get_name() const {
-
-	ERR_FAIL_COND_V(interface == NULL, StringName());
-
-	godot_string result = interface->get_name(data);
-
-	StringName name = *(String *)&result;
-
-	godot_string_destroy(&result);
-
-	return name;
-}
-
-int ARVRInterfaceGDNative::get_capabilities() const {
-	int capabilities;
-
-	ERR_FAIL_COND_V(interface == NULL, 0); // 0 = None
-
-	capabilities = interface->get_capabilities(data);
-
-	return capabilities;
-}
-
-bool ARVRInterfaceGDNative::get_anchor_detection_is_enabled() const {
-
-	ERR_FAIL_COND_V(interface == NULL, false);
-
-	return interface->get_anchor_detection_is_enabled(data);
-}
-
-void ARVRInterfaceGDNative::set_anchor_detection_is_enabled(bool p_enable) {
-
-	ERR_FAIL_COND(interface == NULL);
-
-	interface->set_anchor_detection_is_enabled(data, p_enable);
-}
-
-int ARVRInterfaceGDNative::get_camera_feed_id() {
-
-	ERR_FAIL_COND_V(interface == NULL, 0);
-
-	if ((interface->version.major > 1) || ((interface->version.major) == 1 && (interface->version.minor >= 1))) {
-		return (unsigned int)interface->get_camera_feed_id(data);
-	} else {
-		return 0;
-	}
-}
-
-bool ARVRInterfaceGDNative::is_stereo() {
-	bool stereo;
-
-	ERR_FAIL_COND_V(interface == NULL, false);
-
-	stereo = interface->is_stereo(data);
-
-	return stereo;
-}
-
-bool ARVRInterfaceGDNative::is_initialized() const {
-
-	ERR_FAIL_COND_V(interface == NULL, false);
-
-	return interface->is_initialized(data);
-}
-
-bool ARVRInterfaceGDNative::initialize() {
-	ERR_FAIL_COND_V(interface == NULL, false);
-
-	bool initialized = interface->initialize(data);
-
-	if (initialized) {
-		// if we successfully initialize our interface and we don't have a primary interface yet, this becomes our primary interface
-
-		ARVRServer *arvr_server = ARVRServer::get_singleton();
-		if ((arvr_server != NULL) && (arvr_server->get_primary_interface() == NULL)) {
-			arvr_server->set_primary_interface(this);
-		};
-	};
-
-	return initialized;
-}
-
-void ARVRInterfaceGDNative::uninitialize() {
-	ERR_FAIL_COND(interface == NULL);
-
-	ARVRServer *arvr_server = ARVRServer::get_singleton();
-	if (arvr_server != NULL) {
-		// Whatever happens, make sure this is no longer our primary interface
-		arvr_server->clear_primary_interface_if(this);
-	}
-
-	interface->uninitialize(data);
-}
-
-Size2 ARVRInterfaceGDNative::get_render_targetsize() {
-
-	ERR_FAIL_COND_V(interface == NULL, Size2());
-
-	godot_vector2 result = interface->get_render_targetsize(data);
-	Vector2 *vec = (Vector2 *)&result;
-
-	return *vec;
-}
-
-Transform ARVRInterfaceGDNative::get_transform_for_eye(ARVRInterface::Eyes p_eye, const Transform &p_cam_transform) {
-	Transform *ret;
-
-	ERR_FAIL_COND_V(interface == NULL, Transform());
-
-	godot_transform t = interface->get_transform_for_eye(data, (int)p_eye, (godot_transform *)&p_cam_transform);
-
-	ret = (Transform *)&t;
-
-	return *ret;
-}
-
-CameraMatrix ARVRInterfaceGDNative::get_projection_for_eye(ARVRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far) {
-	CameraMatrix cm;
-
-	ERR_FAIL_COND_V(interface == NULL, CameraMatrix());
-
-	interface->fill_projection_for_eye(data, (godot_real *)cm.matrix, (godot_int)p_eye, p_aspect, p_z_near, p_z_far);
-
-	return cm;
-}
-
-unsigned int ARVRInterfaceGDNative::get_external_texture_for_eye(ARVRInterface::Eyes p_eye) {
-
-	ERR_FAIL_COND_V(interface == NULL, 0);
-
-	if ((interface->version.major > 1) || ((interface->version.major) == 1 && (interface->version.minor >= 1))) {
-		return (unsigned int)interface->get_external_texture_for_eye(data, (godot_int)p_eye);
-	} else {
-		return 0;
-	}
-}
-
-void ARVRInterfaceGDNative::commit_for_eye(ARVRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect) {
-
-	ERR_FAIL_COND(interface == NULL);
-
-	interface->commit_for_eye(data, (godot_int)p_eye, (godot_rid *)&p_render_target, (godot_rect2 *)&p_screen_rect);
-}
-
-void ARVRInterfaceGDNative::process() {
-	ERR_FAIL_COND(interface == NULL);
-
-	interface->process(data);
-}
-
-void ARVRInterfaceGDNative::notification(int p_what) {
-	ERR_FAIL_COND(interface == NULL);
-
-	// this is only available in interfaces that implement 1.1 or later
-	if ((interface->version.major > 1) || ((interface->version.major == 1) && (interface->version.minor > 0))) {
-		interface->notification(data, p_what);
-	}
-}
-
-/////////////////////////////////////////////////////////////////////////////////////
-// some helper callbacks
-
-extern "C" {
-
-void GDAPI godot_arvr_register_interface(const godot_arvr_interface_gdnative *p_interface) {
-	// If our major version is 0 or bigger then 10, we're likely looking at our constructor pointer from an older plugin
-	ERR_FAIL_COND_MSG((p_interface->version.major == 0) || (p_interface->version.major > 10), "GDNative ARVR interfaces build for Godot 3.0 are not supported.");
-
-	Ref<ARVRInterfaceGDNative> new_interface;
-	new_interface.instance();
-	new_interface->set_interface((const godot_arvr_interface_gdnative *)p_interface);
-	ARVRServer::get_singleton()->add_interface(new_interface);
-}
-
-godot_real GDAPI godot_arvr_get_worldscale() {
-	ARVRServer *arvr_server = ARVRServer::get_singleton();
-	ERR_FAIL_NULL_V(arvr_server, 1.0);
-
-	return arvr_server->get_world_scale();
-}
-
-godot_transform GDAPI godot_arvr_get_reference_frame() {
-	godot_transform reference_frame;
-	Transform *reference_frame_ptr = (Transform *)&reference_frame;
-
-	ARVRServer *arvr_server = ARVRServer::get_singleton();
-	if (arvr_server != NULL) {
-		*reference_frame_ptr = arvr_server->get_reference_frame();
-	} else {
-		godot_transform_new_identity(&reference_frame);
-	}
-
-	return reference_frame;
-}
-
-void GDAPI godot_arvr_blit(godot_int p_eye, godot_rid *p_render_target, godot_rect2 *p_rect) {
-	// blits out our texture as is, handy for preview display of one of the eyes that is already rendered with lens distortion on an external HMD
-	ARVRInterface::Eyes eye = (ARVRInterface::Eyes)p_eye;
-	RID *render_target = (RID *)p_render_target;
-	Rect2 screen_rect = *(Rect2 *)p_rect;
-
-	if (eye == ARVRInterface::EYE_LEFT) {
-		screen_rect.size.x /= 2.0;
-	} else if (p_eye == ARVRInterface::EYE_RIGHT) {
-		screen_rect.size.x /= 2.0;
-		screen_rect.position.x += screen_rect.size.x;
-	}
-
-	VSG::rasterizer->set_current_render_target(RID());
-	VSG::rasterizer->blit_render_target_to_screen(*render_target, screen_rect, 0);
-}
-
-godot_int GDAPI godot_arvr_get_texid(godot_rid *p_render_target) {
-	// In order to send off our textures to display on our hardware we need the opengl texture ID instead of the render target RID
-	// This is a handy function to expose that.
-	RID *render_target = (RID *)p_render_target;
-
-	RID eye_texture = VSG::storage->render_target_get_texture(*render_target);
-	uint32_t texid = VS::get_singleton()->texture_get_texid(eye_texture);
-
-	return texid;
-}
-
-godot_int GDAPI godot_arvr_add_controller(char *p_device_name, godot_int p_hand, godot_bool p_tracks_orientation, godot_bool p_tracks_position) {
-	ARVRServer *arvr_server = ARVRServer::get_singleton();
-	ERR_FAIL_NULL_V(arvr_server, 0);
-
-	InputDefault *input = (InputDefault *)Input::get_singleton();
-	ERR_FAIL_NULL_V(input, 0);
-
-	ARVRPositionalTracker *new_tracker = memnew(ARVRPositionalTracker);
-	new_tracker->set_name(p_device_name);
-	new_tracker->set_type(ARVRServer::TRACKER_CONTROLLER);
-	if (p_hand == 1) {
-		new_tracker->set_hand(ARVRPositionalTracker::TRACKER_LEFT_HAND);
-	} else if (p_hand == 2) {
-		new_tracker->set_hand(ARVRPositionalTracker::TRACKER_RIGHT_HAND);
-	}
-
-	// also register as joystick...
-	int joyid = input->get_unused_joy_id();
-	if (joyid != -1) {
-		new_tracker->set_joy_id(joyid);
-		input->joy_connection_changed(joyid, true, p_device_name, "");
-	}
-
-	if (p_tracks_orientation) {
-		Basis orientation;
-		new_tracker->set_orientation(orientation);
-	}
-	if (p_tracks_position) {
-		Vector3 position;
-		new_tracker->set_position(position);
-	}
-
-	// add our tracker to our server and remember its pointer
-	arvr_server->add_tracker(new_tracker);
-
-	// note, this ID is only unique within controllers!
-	return new_tracker->get_tracker_id();
-}
-
-void GDAPI godot_arvr_remove_controller(godot_int p_controller_id) {
-	ARVRServer *arvr_server = ARVRServer::get_singleton();
-	ERR_FAIL_NULL(arvr_server);
-
-	InputDefault *input = (InputDefault *)Input::get_singleton();
-	ERR_FAIL_NULL(input);
-
-	ARVRPositionalTracker *remove_tracker = arvr_server->find_by_type_and_id(ARVRServer::TRACKER_CONTROLLER, p_controller_id);
-	if (remove_tracker != NULL) {
-		// unset our joystick if applicable
-		int joyid = remove_tracker->get_joy_id();
-		if (joyid != -1) {
-			input->joy_connection_changed(joyid, false, "", "");
-			remove_tracker->set_joy_id(-1);
-		}
-
-		// remove our tracker from our server
-		arvr_server->remove_tracker(remove_tracker);
-		memdelete(remove_tracker);
-	}
-}
-
-void GDAPI godot_arvr_set_controller_transform(godot_int p_controller_id, godot_transform *p_transform, godot_bool p_tracks_orientation, godot_bool p_tracks_position) {
-	ARVRServer *arvr_server = ARVRServer::get_singleton();
-	ERR_FAIL_NULL(arvr_server);
-
-	ARVRPositionalTracker *tracker = arvr_server->find_by_type_and_id(ARVRServer::TRACKER_CONTROLLER, p_controller_id);
-	if (tracker != NULL) {
-		Transform *transform = (Transform *)p_transform;
-		if (p_tracks_orientation) {
-			tracker->set_orientation(transform->basis);
-		}
-		if (p_tracks_position) {
-			tracker->set_rw_position(transform->origin);
-		}
-	}
-}
-
-void GDAPI godot_arvr_set_controller_button(godot_int p_controller_id, godot_int p_button, godot_bool p_is_pressed) {
-	ARVRServer *arvr_server = ARVRServer::get_singleton();
-	ERR_FAIL_NULL(arvr_server);
-
-	InputDefault *input = (InputDefault *)Input::get_singleton();
-	ERR_FAIL_NULL(input);
-
-	ARVRPositionalTracker *tracker = arvr_server->find_by_type_and_id(ARVRServer::TRACKER_CONTROLLER, p_controller_id);
-	if (tracker != NULL) {
-		int joyid = tracker->get_joy_id();
-		if (joyid != -1) {
-			input->joy_button(joyid, p_button, p_is_pressed);
-		}
-	}
-}
-
-void GDAPI godot_arvr_set_controller_axis(godot_int p_controller_id, godot_int p_axis, godot_real p_value, godot_bool p_can_be_negative) {
-	ARVRServer *arvr_server = ARVRServer::get_singleton();
-	ERR_FAIL_NULL(arvr_server);
-
-	InputDefault *input = (InputDefault *)Input::get_singleton();
-	ERR_FAIL_NULL(input);
-
-	ARVRPositionalTracker *tracker = arvr_server->find_by_type_and_id(ARVRServer::TRACKER_CONTROLLER, p_controller_id);
-	if (tracker != NULL) {
-		int joyid = tracker->get_joy_id();
-		if (joyid != -1) {
-			InputDefault::JoyAxis jx;
-			jx.min = p_can_be_negative ? -1 : 0;
-			jx.value = p_value;
-			input->joy_axis(joyid, p_axis, jx);
-		}
-	}
-}
-
-godot_real GDAPI godot_arvr_get_controller_rumble(godot_int p_controller_id) {
-	ARVRServer *arvr_server = ARVRServer::get_singleton();
-	ERR_FAIL_NULL_V(arvr_server, 0.0);
-
-	ARVRPositionalTracker *tracker = arvr_server->find_by_type_and_id(ARVRServer::TRACKER_CONTROLLER, p_controller_id);
-	if (tracker != NULL) {
-		return tracker->get_rumble();
-	}
-
-	return 0.0;
-}
-}
diff --git a/modules/gdnative/config.py b/modules/gdnative/config.py
index b9e5afcdf3..7603e7d69d 100644
--- a/modules/gdnative/config.py
+++ b/modules/gdnative/config.py
@@ -1,13 +1,14 @@
 def can_build(env, platform):
     return True
 
+
 def configure(env):
     env.use_ptrcall = True
 
+
 def get_doc_classes():
     return [
-        "@NativeScript",
-        "ARVRInterfaceGDNative",
+        "XRInterfaceGDNative",
         "GDNative",
         "GDNativeLibrary",
         "MultiplayerPeerGDNative",
@@ -20,5 +21,6 @@ def get_doc_classes():
         "WebRTCDataChannelGDNative",
     ]
 
+
 def get_doc_path():
     return "doc_classes"
diff --git a/modules/gdnative/doc_classes/@NativeScript.xml b/modules/gdnative/doc_classes/@NativeScript.xml
deleted file mode 100644
index 809b225e21..0000000000
--- a/modules/gdnative/doc_classes/@NativeScript.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="@NativeScript" version="4.0">
-	<brief_description>
-	</brief_description>
-	<description>
-	</description>
-	<tutorials>
-	</tutorials>
-	<methods>
-	</methods>
-	<constants>
-	</constants>
-</class>
diff --git a/modules/gdnative/doc_classes/ARVRInterfaceGDNative.xml b/modules/gdnative/doc_classes/ARVRInterfaceGDNative.xml
deleted file mode 100644
index e8405b64a3..0000000000
--- a/modules/gdnative/doc_classes/ARVRInterfaceGDNative.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="ARVRInterfaceGDNative" inherits="ARVRInterface" version="4.0">
-	<brief_description>
-		GDNative wrapper for an ARVR interface.
-	</brief_description>
-	<description>
-		This is a wrapper class for GDNative implementations of the ARVR interface. To use a GDNative ARVR interface, simply instantiate this object and set your GDNative library containing the ARVR interface implementation.
-	</description>
-	<tutorials>
-	</tutorials>
-	<methods>
-	</methods>
-	<constants>
-	</constants>
-</class>
diff --git a/modules/gdnative/doc_classes/GDNative.xml b/modules/gdnative/doc_classes/GDNative.xml
index b4b63bf04a..44d9e32ed8 100644
--- a/modules/gdnative/doc_classes/GDNative.xml
+++ b/modules/gdnative/doc_classes/GDNative.xml
@@ -10,9 +10,9 @@
 		<method name="call_native">
 			<return type="Variant">
 			</return>
-			<argument index="0" name="calling_type" type="String">
+			<argument index="0" name="calling_type" type="StringName">
 			</argument>
-			<argument index="1" name="procedure_name" type="String">
+			<argument index="1" name="procedure_name" type="StringName">
 			</argument>
 			<argument index="2" name="arguments" type="Array">
 			</argument>
diff --git a/modules/gdnative/doc_classes/GDNativeLibrary.xml b/modules/gdnative/doc_classes/GDNativeLibrary.xml
index 820f126dd1..05cda05f9f 100644
--- a/modules/gdnative/doc_classes/GDNativeLibrary.xml
+++ b/modules/gdnative/doc_classes/GDNativeLibrary.xml
@@ -4,15 +4,15 @@
 		An external library containing functions or script classes to use in Godot.
 	</brief_description>
 	<description>
-		A GDNative library can implement [NativeScript]s, global functions to call with the [GDNative] class, or low-level engine extensions through interfaces such as [ARVRInterfaceGDNative]. The library must be compiled for each platform and architecture that the project will run on.
+		A GDNative library can implement [NativeScript]s, global functions to call with the [GDNative] class, or low-level engine extensions through interfaces such as [XRInterfaceGDNative]. The library must be compiled for each platform and architecture that the project will run on.
 	</description>
 	<tutorials>
-		<link>https://docs.godotengine.org/en/latest/tutorials/plugins/gdnative/gdnative-c-example.html</link>
-		<link>https://docs.godotengine.org/en/latest/tutorials/plugins/gdnative/gdnative-cpp-example.html</link>
+		<link title="GDNative C example">https://docs.godotengine.org/en/latest/tutorials/plugins/gdnative/gdnative-c-example.html</link>
+		<link title="GDNative C++ example">https://docs.godotengine.org/en/latest/tutorials/plugins/gdnative/gdnative-cpp-example.html</link>
 	</tutorials>
 	<methods>
 		<method name="get_current_dependencies" qualifiers="const">
-			<return type="PoolStringArray">
+			<return type="PackedStringArray">
 			</return>
 			<description>
 				Returns paths to all dependency libraries for the current platform and architecture.
diff --git a/modules/gdnative/doc_classes/NativeScript.xml b/modules/gdnative/doc_classes/NativeScript.xml
index b21d16a6fd..f2e9cac6dc 100644
--- a/modules/gdnative/doc_classes/NativeScript.xml
+++ b/modules/gdnative/doc_classes/NativeScript.xml
@@ -17,7 +17,7 @@
 		<method name="get_method_documentation" qualifiers="const">
 			<return type="String">
 			</return>
-			<argument index="0" name="method" type="String">
+			<argument index="0" name="method" type="StringName">
 			</argument>
 			<description>
 				Returns the documentation string that was previously set with [code]godot_nativescript_set_method_documentation[/code].
@@ -26,7 +26,7 @@
 		<method name="get_property_documentation" qualifiers="const">
 			<return type="String">
 			</return>
-			<argument index="0" name="path" type="String">
+			<argument index="0" name="path" type="StringName">
 			</argument>
 			<description>
 				Returns the documentation string that was previously set with [code]godot_nativescript_set_property_documentation[/code].
@@ -35,7 +35,7 @@
 		<method name="get_signal_documentation" qualifiers="const">
 			<return type="String">
 			</return>
-			<argument index="0" name="signal_name" type="String">
+			<argument index="0" name="signal_name" type="StringName">
 			</argument>
 			<description>
 				Returns the documentation string that was previously set with [code]godot_nativescript_set_signal_documentation[/code].
diff --git a/modules/gdnative/doc_classes/XRInterfaceGDNative.xml b/modules/gdnative/doc_classes/XRInterfaceGDNative.xml
new file mode 100644
index 0000000000..13de815793
--- /dev/null
+++ b/modules/gdnative/doc_classes/XRInterfaceGDNative.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class name="XRInterfaceGDNative" inherits="XRInterface" version="4.0">
+	<brief_description>
+		GDNative wrapper for an XR interface.
+	</brief_description>
+	<description>
+		This is a wrapper class for GDNative implementations of the XR interface. To use a GDNative XR interface, simply instantiate this object and set your GDNative library containing the XR interface implementation.
+	</description>
+	<tutorials>
+	</tutorials>
+	<methods>
+	</methods>
+	<constants>
+	</constants>
+</class>
diff --git a/modules/gdnative/gdnative.cpp b/modules/gdnative/gdnative.cpp
index d9dc256ac0..bb2da70c3a 100644
--- a/modules/gdnative/gdnative.cpp
+++ b/modules/gdnative/gdnative.cpp
@@ -48,7 +48,7 @@ static const bool default_reloadable = true;
 // Defined in gdnative_api_struct.gen.cpp
 extern const godot_gdnative_core_api_struct api_struct;
 
-Map<String, Vector<Ref<GDNative> > > GDNativeLibrary::loaded_libraries;
+Map<String, Vector<Ref<GDNative>>> GDNativeLibrary::loaded_libraries;
 
 GDNativeLibrary::GDNativeLibrary() {
 	config_file.instance();
@@ -63,7 +63,6 @@ GDNativeLibrary::~GDNativeLibrary() {
 }
 
 bool GDNativeLibrary::_set(const StringName &p_name, const Variant &p_property) {
-
 	String name = p_name;
 
 	if (name.begins_with("entry/")) {
@@ -115,8 +114,9 @@ void GDNativeLibrary::_get_property_list(List<PropertyInfo> *p_list) const {
 	// set entries
 	List<String> entry_key_list;
 
-	if (config_file->has_section("entry"))
+	if (config_file->has_section("entry")) {
 		config_file->get_section_keys("entry", &entry_key_list);
+	}
 
 	for (List<String>::Element *E = entry_key_list.front(); E; E = E->next()) {
 		String key = E->get();
@@ -132,8 +132,9 @@ void GDNativeLibrary::_get_property_list(List<PropertyInfo> *p_list) const {
 	// set dependencies
 	List<String> dependency_key_list;
 
-	if (config_file->has_section("dependencies"))
+	if (config_file->has_section("dependencies")) {
 		config_file->get_section_keys("dependencies", &dependency_key_list);
+	}
 
 	for (List<String>::Element *E = dependency_key_list.front(); E; E = E->next()) {
 		String key = E->get();
@@ -148,7 +149,6 @@ void GDNativeLibrary::_get_property_list(List<PropertyInfo> *p_list) const {
 }
 
 void GDNativeLibrary::set_config_file(Ref<ConfigFile> p_config_file) {
-
 	set_singleton(p_config_file->get_value("general", "singleton", default_singleton));
 	set_load_once(p_config_file->get_value("general", "load_once", default_load_once));
 	set_symbol_prefix(p_config_file->get_value("general", "symbol_prefix", default_symbol_prefix));
@@ -156,11 +156,11 @@ void GDNativeLibrary::set_config_file(Ref<ConfigFile> p_config_file) {
 
 	String entry_lib_path;
 	{
-
 		List<String> entry_keys;
 
-		if (p_config_file->has_section("entry"))
+		if (p_config_file->has_section("entry")) {
 			p_config_file->get_section_keys("entry", &entry_keys);
+		}
 
 		for (List<String>::Element *E = entry_keys.front(); E; E = E->next()) {
 			String key = E->get();
@@ -188,11 +188,11 @@ void GDNativeLibrary::set_config_file(Ref<ConfigFile> p_config_file) {
 
 	Vector<String> dependency_paths;
 	{
-
 		List<String> dependency_keys;
 
-		if (p_config_file->has_section("dependencies"))
+		if (p_config_file->has_section("dependencies")) {
 			p_config_file->get_section_keys("dependencies", &dependency_keys);
+		}
 
 		for (List<String>::Element *E = dependency_keys.front(); E; E = E->next()) {
 			String key = E->get();
@@ -248,7 +248,7 @@ void GDNativeLibrary::_bind_methods() {
 }
 
 GDNative::GDNative() {
-	native_handle = NULL;
+	native_handle = nullptr;
 	initialized = false;
 }
 
@@ -291,8 +291,26 @@ bool GDNative::initialize() {
 		return false;
 	}
 #ifdef IPHONE_ENABLED
-	// on iOS we use static linking
+	// On iOS we use static linking by default.
 	String path = "";
+
+	// On iOS dylibs is not allowed, but can be replaced with .framework or .xcframework.
+	// If they are used, we can run dlopen on them.
+	// They should be located under Frameworks directory, so we need to replace library path.
+	if (!lib_path.ends_with(".a")) {
+		path = ProjectSettings::get_singleton()->globalize_path(lib_path);
+
+		if (!FileAccess::exists(path)) {
+			String lib_name = lib_path.get_basename().get_file();
+			String framework_path_format = "Frameworks/$name.framework/$name";
+
+			Dictionary format_dict;
+			format_dict["name"] = lib_name;
+			String framework_path = framework_path_format.format(format_dict, "$_");
+
+			path = OS::get_singleton()->get_executable_path().get_base_dir().plus_file(framework_path);
+		}
+	}
 #elif defined(ANDROID_ENABLED)
 	// On Android dynamic libraries are located separately from resource assets,
 	// we should pass library name to dlopen(). The library name is flattened
@@ -338,8 +356,8 @@ bool GDNative::initialize() {
 
 	if (err || !library_init) {
 		OS::get_singleton()->close_dynamic_library(native_handle);
-		native_handle = NULL;
-		ERR_PRINTS("Failed to obtain " + library->get_symbol_prefix() + "gdnative_init symbol");
+		native_handle = nullptr;
+		ERR_PRINT("Failed to obtain " + library->get_symbol_prefix() + "gdnative_init symbol");
 		return false;
 	}
 
@@ -373,7 +391,7 @@ bool GDNative::initialize() {
 	initialized = true;
 
 	if (library->should_load_once() && !GDNativeLibrary::loaded_libraries.has(lib_path)) {
-		Vector<Ref<GDNative> > gdnatives;
+		Vector<Ref<GDNative>> gdnatives;
 		gdnatives.resize(1);
 		gdnatives.write[0] = Ref<GDNative>(this);
 		GDNativeLibrary::loaded_libraries.insert(lib_path, gdnatives);
@@ -383,14 +401,13 @@ bool GDNative::initialize() {
 }
 
 bool GDNative::terminate() {
-
 	if (!initialized) {
 		ERR_PRINT("No valid library handle, can't terminate GDNative object");
 		return false;
 	}
 
 	if (library->should_load_once()) {
-		Vector<Ref<GDNative> > *gdnatives = &GDNativeLibrary::loaded_libraries[library->get_current_library_path()];
+		Vector<Ref<GDNative>> *gdnatives = &GDNativeLibrary::loaded_libraries[library->get_current_library_path()];
 		if (gdnatives->size() > 1) {
 			// there are other GDNative's still using this library, so we actually don't terminate
 			gdnatives->erase(Ref<GDNative>(this));
@@ -408,7 +425,7 @@ bool GDNative::terminate() {
 	Error error = get_symbol(library->get_symbol_prefix() + terminate_symbol, library_terminate);
 	if (error || !library_terminate) {
 		OS::get_singleton()->close_dynamic_library(native_handle);
-		native_handle = NULL;
+		native_handle = nullptr;
 		initialized = false;
 		return true;
 	}
@@ -426,7 +443,7 @@ bool GDNative::terminate() {
 	// GDNativeScriptLanguage::get_singleton()->initialized_libraries.erase(p_native_lib->path);
 
 	OS::get_singleton()->close_dynamic_library(native_handle);
-	native_handle = NULL;
+	native_handle = nullptr;
 
 	return true;
 }
@@ -452,7 +469,6 @@ Vector<StringName> GDNativeCallRegistry::get_native_call_types() {
 }
 
 Variant GDNative::call_native(StringName p_native_call_type, StringName p_procedure_name, Array p_arguments) {
-
 	Map<StringName, native_call_cb>::Element *E = GDNativeCallRegistry::singleton->native_calls.find(p_native_call_type);
 	if (!E) {
 		ERR_PRINT((String("No handler for native call type \"" + p_native_call_type) + "\" found").utf8().get_data());
@@ -466,7 +482,7 @@ Variant GDNative::call_native(StringName p_native_call_type, StringName p_proced
 			p_procedure_name,
 			procedure_handle);
 
-	if (err != OK || procedure_handle == NULL) {
+	if (err != OK || procedure_handle == nullptr) {
 		return Variant();
 	}
 
@@ -478,7 +494,6 @@ Variant GDNative::call_native(StringName p_native_call_type, StringName p_proced
 }
 
 Error GDNative::get_symbol(StringName p_procedure_name, void *&r_handle, bool p_optional) const {
-
 	if (!initialized) {
 		ERR_PRINT("No valid library handle, can't get symbol from GDNative object");
 		return ERR_CANT_OPEN;
@@ -493,7 +508,7 @@ Error GDNative::get_symbol(StringName p_procedure_name, void *&r_handle, bool p_
 	return result;
 }
 
-RES GDNativeLibraryResourceLoader::load(const String &p_path, const String &p_original_path, Error *r_error) {
+RES GDNativeLibraryResourceLoader::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, bool p_no_cache) {
 	Ref<GDNativeLibrary> lib;
 	lib.instance();
 
@@ -520,13 +535,13 @@ bool GDNativeLibraryResourceLoader::handles_type(const String &p_type) const {
 
 String GDNativeLibraryResourceLoader::get_resource_type(const String &p_path) const {
 	String el = p_path.get_extension().to_lower();
-	if (el == "gdnlib")
+	if (el == "gdnlib") {
 		return "GDNativeLibrary";
+	}
 	return "";
 }
 
 Error GDNativeLibraryResourceSaver::save(const String &p_path, const RES &p_resource, uint32_t p_flags) {
-
 	Ref<GDNativeLibrary> lib = p_resource;
 
 	if (lib.is_null()) {
@@ -544,11 +559,11 @@ Error GDNativeLibraryResourceSaver::save(const String &p_path, const RES &p_reso
 }
 
 bool GDNativeLibraryResourceSaver::recognize(const RES &p_resource) const {
-	return Object::cast_to<GDNativeLibrary>(*p_resource) != NULL;
+	return Object::cast_to<GDNativeLibrary>(*p_resource) != nullptr;
 }
 
 void GDNativeLibraryResourceSaver::get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const {
-	if (Object::cast_to<GDNativeLibrary>(*p_resource) != NULL) {
+	if (Object::cast_to<GDNativeLibrary>(*p_resource) != nullptr) {
 		p_extensions->push_back("gdnlib");
 	}
 }
diff --git a/modules/gdnative/gdnative.h b/modules/gdnative/gdnative.h
index c0c2cdf24c..6d26c2141d 100644
--- a/modules/gdnative/gdnative.h
+++ b/modules/gdnative/gdnative.h
@@ -47,7 +47,7 @@ class GDNative;
 class GDNativeLibrary : public Resource {
 	GDCLASS(GDNativeLibrary, Resource);
 
-	static Map<String, Vector<Ref<GDNative> > > loaded_libraries;
+	static Map<String, Vector<Ref<GDNative>>> loaded_libraries;
 
 	friend class GDNativeLibraryResourceLoader;
 	friend class GDNative;
@@ -166,7 +166,7 @@ public:
 
 class GDNativeLibraryResourceLoader : public ResourceFormatLoader {
 public:
-	virtual RES load(const String &p_path, const String &p_original_path, Error *r_error);
+	virtual RES load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads = false, float *r_progress = nullptr, bool p_no_cache = false);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual bool handles_type(const String &p_type) const;
 	virtual String get_resource_type(const String &p_path) const;
diff --git a/modules/gdnative/gdnative/aabb.cpp b/modules/gdnative/gdnative/aabb.cpp
index 246e5d4e8d..d5970e8004 100644
--- a/modules/gdnative/gdnative/aabb.cpp
+++ b/modules/gdnative/gdnative/aabb.cpp
@@ -37,6 +37,8 @@
 extern "C" {
 #endif
 
+static_assert(sizeof(godot_aabb) == sizeof(AABB), "AABB size mismatch");
+
 void GDAPI godot_aabb_new(godot_aabb *r_dest, const godot_vector3 *p_pos, const godot_vector3 *p_size) {
 	const Vector3 *pos = (const Vector3 *)p_pos;
 	const Vector3 *size = (const Vector3 *)p_size;
@@ -79,6 +81,13 @@ godot_string GDAPI godot_aabb_as_string(const godot_aabb *p_self) {
 	return ret;
 }
 
+godot_aabb GDAPI godot_aabb_abs(const godot_aabb *p_self) {
+	godot_aabb dest;
+	const AABB *self = (const AABB *)p_self;
+	*((AABB *)&dest) = self->abs();
+	return dest;
+}
+
 godot_real GDAPI godot_aabb_get_area(const godot_aabb *p_self) {
 	const AABB *self = (const AABB *)p_self;
 	return self->get_area();
diff --git a/modules/gdnative/gdnative/array.cpp b/modules/gdnative/gdnative/array.cpp
index 4a0308edec..59953f5182 100644
--- a/modules/gdnative/gdnative/array.cpp
+++ b/modules/gdnative/gdnative/array.cpp
@@ -34,7 +34,6 @@
 #include "core/os/memory.h"
 
 #include "core/color.h"
-#include "core/pool_vector.h"
 
 #include "core/variant.h"
 
@@ -42,6 +41,8 @@
 extern "C" {
 #endif
 
+static_assert(sizeof(godot_array) == sizeof(Array), "Array size mismatch");
+
 void GDAPI godot_array_new(godot_array *r_dest) {
 	Array *dest = (Array *)r_dest;
 	memnew_placement(dest, Array);
@@ -53,9 +54,33 @@ void GDAPI godot_array_new_copy(godot_array *r_dest, const godot_array *p_src) {
 	memnew_placement(dest, Array(*src));
 }
 
-void GDAPI godot_array_new_pool_color_array(godot_array *r_dest, const godot_pool_color_array *p_pca) {
+void GDAPI godot_array_new_packed_color_array(godot_array *r_dest, const godot_packed_color_array *p_pca) {
+	Array *dest = (Array *)r_dest;
+	Vector<Color> *pca = (Vector<Color> *)p_pca;
+	memnew_placement(dest, Array);
+	dest->resize(pca->size());
+
+	for (int i = 0; i < dest->size(); i++) {
+		Variant v = pca->operator[](i);
+		dest->operator[](i) = v;
+	}
+}
+
+void GDAPI godot_array_new_packed_vector3_array(godot_array *r_dest, const godot_packed_vector3_array *p_pv3a) {
+	Array *dest = (Array *)r_dest;
+	Vector<Vector3> *pca = (Vector<Vector3> *)p_pv3a;
+	memnew_placement(dest, Array);
+	dest->resize(pca->size());
+
+	for (int i = 0; i < dest->size(); i++) {
+		Variant v = pca->operator[](i);
+		dest->operator[](i) = v;
+	}
+}
+
+void GDAPI godot_array_new_packed_vector2_array(godot_array *r_dest, const godot_packed_vector2_array *p_pv2a) {
 	Array *dest = (Array *)r_dest;
-	PoolVector<Color> *pca = (PoolVector<Color> *)p_pca;
+	Vector<Vector2> *pca = (Vector<Vector2> *)p_pv2a;
 	memnew_placement(dest, Array);
 	dest->resize(pca->size());
 
@@ -65,9 +90,9 @@ void GDAPI godot_array_new_pool_color_array(godot_array *r_dest, const godot_poo
 	}
 }
 
-void GDAPI godot_array_new_pool_vector3_array(godot_array *r_dest, const godot_pool_vector3_array *p_pv3a) {
+void GDAPI godot_array_new_packed_string_array(godot_array *r_dest, const godot_packed_string_array *p_psa) {
 	Array *dest = (Array *)r_dest;
-	PoolVector<Vector3> *pca = (PoolVector<Vector3> *)p_pv3a;
+	Vector<String> *pca = (Vector<String> *)p_psa;
 	memnew_placement(dest, Array);
 	dest->resize(pca->size());
 
@@ -77,9 +102,9 @@ void GDAPI godot_array_new_pool_vector3_array(godot_array *r_dest, const godot_p
 	}
 }
 
-void GDAPI godot_array_new_pool_vector2_array(godot_array *r_dest, const godot_pool_vector2_array *p_pv2a) {
+void GDAPI godot_array_new_packed_float32_array(godot_array *r_dest, const godot_packed_float32_array *p_pra) {
 	Array *dest = (Array *)r_dest;
-	PoolVector<Vector2> *pca = (PoolVector<Vector2> *)p_pv2a;
+	Vector<float> *pca = (Vector<float> *)p_pra;
 	memnew_placement(dest, Array);
 	dest->resize(pca->size());
 
@@ -89,9 +114,9 @@ void GDAPI godot_array_new_pool_vector2_array(godot_array *r_dest, const godot_p
 	}
 }
 
-void GDAPI godot_array_new_pool_string_array(godot_array *r_dest, const godot_pool_string_array *p_psa) {
+void GDAPI godot_array_new_packed_float64_array(godot_array *r_dest, const godot_packed_float64_array *p_pra) {
 	Array *dest = (Array *)r_dest;
-	PoolVector<String> *pca = (PoolVector<String> *)p_psa;
+	Vector<double> *pca = (Vector<double> *)p_pra;
 	memnew_placement(dest, Array);
 	dest->resize(pca->size());
 
@@ -101,9 +126,9 @@ void GDAPI godot_array_new_pool_string_array(godot_array *r_dest, const godot_po
 	}
 }
 
-void GDAPI godot_array_new_pool_real_array(godot_array *r_dest, const godot_pool_real_array *p_pra) {
+void GDAPI godot_array_new_packed_int32_array(godot_array *r_dest, const godot_packed_int32_array *p_pia) {
 	Array *dest = (Array *)r_dest;
-	PoolVector<godot_real> *pca = (PoolVector<godot_real> *)p_pra;
+	Vector<int32_t> *pca = (Vector<int32_t> *)p_pia;
 	memnew_placement(dest, Array);
 	dest->resize(pca->size());
 
@@ -113,9 +138,9 @@ void GDAPI godot_array_new_pool_real_array(godot_array *r_dest, const godot_pool
 	}
 }
 
-void GDAPI godot_array_new_pool_int_array(godot_array *r_dest, const godot_pool_int_array *p_pia) {
+void GDAPI godot_array_new_packed_int64_array(godot_array *r_dest, const godot_packed_int64_array *p_pia) {
 	Array *dest = (Array *)r_dest;
-	PoolVector<godot_int> *pca = (PoolVector<godot_int> *)p_pia;
+	Vector<int64_t> *pca = (Vector<int64_t> *)p_pia;
 	memnew_placement(dest, Array);
 	dest->resize(pca->size());
 
@@ -125,9 +150,9 @@ void GDAPI godot_array_new_pool_int_array(godot_array *r_dest, const godot_pool_
 	}
 }
 
-void GDAPI godot_array_new_pool_byte_array(godot_array *r_dest, const godot_pool_byte_array *p_pba) {
+void GDAPI godot_array_new_packed_byte_array(godot_array *r_dest, const godot_packed_byte_array *p_pba) {
 	Array *dest = (Array *)r_dest;
-	PoolVector<uint8_t> *pca = (PoolVector<uint8_t> *)p_pba;
+	Vector<uint8_t> *pca = (Vector<uint8_t> *)p_pba;
 	memnew_placement(dest, Array);
 	dest->resize(pca->size());
 
diff --git a/modules/gdnative/gdnative/basis.cpp b/modules/gdnative/gdnative/basis.cpp
index 4f489287b9..990fd3795d 100644
--- a/modules/gdnative/gdnative/basis.cpp
+++ b/modules/gdnative/gdnative/basis.cpp
@@ -37,6 +37,8 @@
 extern "C" {
 #endif
 
+static_assert(sizeof(godot_basis) == sizeof(Basis), "Basis size mismatch");
+
 void GDAPI godot_basis_new_with_rows(godot_basis *r_dest, const godot_vector3 *p_x_axis, const godot_vector3 *p_y_axis, const godot_vector3 *p_z_axis) {
 	const Vector3 *x_axis = (const Vector3 *)p_x_axis;
 	const Vector3 *y_axis = (const Vector3 *)p_y_axis;
diff --git a/modules/gdnative/gdnative/callable.cpp b/modules/gdnative/gdnative/callable.cpp
new file mode 100644
index 0000000000..868b324227
--- /dev/null
+++ b/modules/gdnative/gdnative/callable.cpp
@@ -0,0 +1,252 @@
+/*************************************************************************/
+/*  callable.cpp                                                         */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "gdnative/callable.h"
+
+#include "core/callable.h"
+#include "core/resource.h"
+#include "core/variant.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+static_assert(sizeof(godot_callable) == sizeof(Callable), "Callable size mismatch");
+static_assert(sizeof(godot_signal) == sizeof(Signal), "Signal size mismatch");
+
+// Callable
+
+void GDAPI godot_callable_new_with_object(godot_callable *r_dest, const godot_object *p_object, const godot_string_name *p_method) {
+	Callable *dest = (Callable *)r_dest;
+	const Object *object = (const Object *)p_object;
+	const StringName *method = (const StringName *)p_method;
+	memnew_placement(dest, Callable(object, *method));
+}
+
+void GDAPI godot_callable_new_with_object_id(godot_callable *r_dest, uint64_t p_objectid, const godot_string_name *p_method) {
+	Callable *dest = (Callable *)r_dest;
+	const StringName *method = (const StringName *)p_method;
+	memnew_placement(dest, Callable(ObjectID(p_objectid), *method));
+}
+
+void GDAPI godot_callable_new_copy(godot_callable *r_dest, const godot_callable *p_src) {
+	Callable *dest = (Callable *)r_dest;
+	const Callable *src = (const Callable *)p_src;
+	memnew_placement(dest, Callable(*src));
+}
+
+void GDAPI godot_callable_destroy(godot_callable *p_self) {
+	Callable *self = (Callable *)p_self;
+	self->~Callable();
+}
+
+godot_int GDAPI godot_callable_call(const godot_callable *p_self, const godot_variant **p_arguments, godot_int p_argcount, godot_variant *r_return_value) {
+	const Callable *self = (const Callable *)p_self;
+	const Variant **arguments = (const Variant **)p_arguments;
+	Variant *return_value = (Variant *)r_return_value;
+	Variant ret;
+	Callable::CallError err;
+	self->call(arguments, p_argcount, ret, err);
+	if (return_value)
+		(*return_value) = ret;
+	return (godot_int)err.error;
+}
+
+void GDAPI godot_callable_call_deferred(const godot_callable *p_self, const godot_variant **p_arguments, godot_int p_argcount) {
+	const Callable *self = (const Callable *)p_self;
+	const Variant **arguments = (const Variant **)p_arguments;
+	self->call_deferred(arguments, p_argcount);
+}
+
+godot_bool GDAPI godot_callable_is_null(const godot_callable *p_self) {
+	const Callable *self = (const Callable *)p_self;
+	return self->is_null();
+}
+
+godot_bool GDAPI godot_callable_is_custom(const godot_callable *p_self) {
+	const Callable *self = (const Callable *)p_self;
+	return self->is_custom();
+}
+
+godot_bool GDAPI godot_callable_is_standard(const godot_callable *p_self) {
+	const Callable *self = (const Callable *)p_self;
+	return self->is_standard();
+}
+
+godot_object GDAPI *godot_callable_get_object(const godot_callable *p_self) {
+	const Callable *self = (const Callable *)p_self;
+	return (godot_object *)self->get_object();
+}
+
+uint64_t GDAPI godot_callable_get_object_id(const godot_callable *p_self) {
+	const Callable *self = (const Callable *)p_self;
+	return (uint64_t)self->get_object_id();
+}
+
+godot_string_name GDAPI godot_callable_get_method(const godot_callable *p_self) {
+	godot_string_name raw_dest;
+	const Callable *self = (const Callable *)p_self;
+	StringName *dest = (StringName *)&raw_dest;
+	memnew_placement(dest, StringName(self->get_method()));
+	return raw_dest;
+}
+
+uint32_t GDAPI godot_callable_hash(const godot_callable *p_self) {
+	const Callable *self = (const Callable *)p_self;
+	return self->hash();
+}
+
+godot_string GDAPI godot_callable_as_string(const godot_callable *p_self) {
+	godot_string ret;
+	const Callable *self = (const Callable *)p_self;
+	memnew_placement(&ret, String(*self));
+	return ret;
+}
+
+godot_bool GDAPI godot_callable_operator_equal(const godot_callable *p_self, const godot_callable *p_other) {
+	const Callable *self = (const Callable *)p_self;
+	const Callable *other = (const Callable *)p_other;
+	return *self == *other;
+}
+
+godot_bool GDAPI godot_callable_operator_less(const godot_callable *p_self, const godot_callable *p_other) {
+	const Callable *self = (const Callable *)p_self;
+	const Callable *other = (const Callable *)p_other;
+	return *self < *other;
+}
+
+// Signal
+
+void GDAPI godot_signal_new_with_object(godot_signal *r_dest, const godot_object *p_object, const godot_string_name *p_name) {
+	Signal *dest = (Signal *)r_dest;
+	const Object *object = (const Object *)p_object;
+	const StringName *name = (const StringName *)p_name;
+	memnew_placement(dest, Signal(object, *name));
+}
+
+void GDAPI godot_signal_new_with_object_id(godot_signal *r_dest, uint64_t p_objectid, const godot_string_name *p_name) {
+	Signal *dest = (Signal *)r_dest;
+	const StringName *name = (const StringName *)p_name;
+	memnew_placement(dest, Signal(ObjectID(p_objectid), *name));
+}
+
+void GDAPI godot_signal_new_copy(godot_signal *r_dest, const godot_signal *p_src) {
+	Signal *dest = (Signal *)r_dest;
+	const Signal *src = (const Signal *)p_src;
+	memnew_placement(dest, Signal(*src));
+}
+
+void GDAPI godot_signal_destroy(godot_signal *p_self) {
+	Signal *self = (Signal *)p_self;
+	self->~Signal();
+}
+
+godot_int GDAPI godot_signal_emit(const godot_signal *p_self, const godot_variant **p_arguments, godot_int p_argcount) {
+	const Signal *self = (const Signal *)p_self;
+	const Variant **arguments = (const Variant **)p_arguments;
+	return (godot_int)self->emit(arguments, p_argcount);
+}
+
+godot_int GDAPI godot_signal_connect(godot_signal *p_self, const godot_callable *p_callable, const godot_array *p_binds, uint32_t p_flags) {
+	Signal *self = (Signal *)p_self;
+	const Callable *callable = (const Callable *)p_callable;
+	const Array *binds_ar = (const Array *)p_binds;
+	Vector<Variant> binds;
+	for (int i = 0; i < binds_ar->size(); i++) {
+		binds.push_back(binds_ar->get(i));
+	}
+	return (godot_int)self->connect(*callable, binds, p_flags);
+}
+
+void GDAPI godot_signal_disconnect(godot_signal *p_self, const godot_callable *p_callable) {
+	Signal *self = (Signal *)p_self;
+	const Callable *callable = (const Callable *)p_callable;
+	self->disconnect(*callable);
+}
+
+godot_bool GDAPI godot_signal_is_null(const godot_signal *p_self) {
+	const Signal *self = (const Signal *)p_self;
+	return self->is_null();
+}
+
+godot_bool GDAPI godot_signal_is_connected(const godot_signal *p_self, const godot_callable *p_callable) {
+	const Signal *self = (const Signal *)p_self;
+	const Callable *callable = (const Callable *)p_callable;
+	return self->is_connected(*callable);
+}
+
+godot_array GDAPI godot_signal_get_connections(const godot_signal *p_self) {
+	godot_array raw_dest;
+	const Signal *self = (const Signal *)p_self;
+	Array *dest = (Array *)&raw_dest;
+	memnew_placement(dest, Array(self->get_connections()));
+	return raw_dest;
+}
+
+godot_object GDAPI *godot_signal_get_object(const godot_signal *p_self) {
+	const Signal *self = (const Signal *)p_self;
+	return (godot_object *)self->get_object();
+}
+
+uint64_t GDAPI godot_signal_get_object_id(const godot_signal *p_self) {
+	const Signal *self = (const Signal *)p_self;
+	return (uint64_t)self->get_object_id();
+}
+
+godot_string_name GDAPI godot_signal_get_name(const godot_signal *p_self) {
+	godot_string_name raw_dest;
+	const Signal *self = (const Signal *)p_self;
+	StringName *dest = (StringName *)&raw_dest;
+	memnew_placement(dest, StringName(self->get_name()));
+	return raw_dest;
+}
+
+godot_string GDAPI godot_signal_as_string(const godot_signal *p_self) {
+	godot_string ret;
+	const Signal *self = (const Signal *)p_self;
+	memnew_placement(&ret, String(*self));
+	return ret;
+}
+
+godot_bool GDAPI godot_signal_operator_equal(const godot_signal *p_self, const godot_signal *p_other) {
+	const Signal *self = (const Signal *)p_self;
+	const Signal *other = (const Signal *)p_other;
+	return *self == *other;
+}
+
+godot_bool GDAPI godot_signal_operator_less(const godot_signal *p_self, const godot_signal *p_other) {
+	const Signal *self = (const Signal *)p_self;
+	const Signal *other = (const Signal *)p_other;
+	return *self < *other;
+}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/modules/gdnative/gdnative/color.cpp b/modules/gdnative/gdnative/color.cpp
index 24587ce4a1..c75e74daba 100644
--- a/modules/gdnative/gdnative/color.cpp
+++ b/modules/gdnative/gdnative/color.cpp
@@ -37,14 +37,14 @@
 extern "C" {
 #endif
 
-void GDAPI godot_color_new_rgba(godot_color *r_dest, const godot_real p_r, const godot_real p_g, const godot_real p_b, const godot_real p_a) {
+static_assert(sizeof(godot_color) == sizeof(Color), "Color size mismatch");
 
+void GDAPI godot_color_new_rgba(godot_color *r_dest, const godot_real p_r, const godot_real p_g, const godot_real p_b, const godot_real p_a) {
 	Color *dest = (Color *)r_dest;
 	*dest = Color(p_r, p_g, p_b, p_a);
 }
 
 void GDAPI godot_color_new_rgb(godot_color *r_dest, const godot_real p_r, const godot_real p_g, const godot_real p_b) {
-
 	Color *dest = (Color *)r_dest;
 	*dest = Color(p_r, p_g, p_b);
 }
@@ -141,11 +141,6 @@ godot_int GDAPI godot_color_to_argb32(const godot_color *p_self) {
 	return self->to_argb32();
 }
 
-godot_real GDAPI godot_color_gray(const godot_color *p_self) {
-	const Color *self = (const Color *)p_self;
-	return self->gray();
-}
-
 godot_color GDAPI godot_color_inverted(const godot_color *p_self) {
 	godot_color dest;
 	const Color *self = (const Color *)p_self;
@@ -160,11 +155,11 @@ godot_color GDAPI godot_color_contrasted(const godot_color *p_self) {
 	return dest;
 }
 
-godot_color GDAPI godot_color_linear_interpolate(const godot_color *p_self, const godot_color *p_b, const godot_real p_t) {
+godot_color GDAPI godot_color_lerp(const godot_color *p_self, const godot_color *p_b, const godot_real p_t) {
 	godot_color dest;
 	const Color *self = (const Color *)p_self;
 	const Color *b = (const Color *)p_b;
-	*((Color *)&dest) = self->linear_interpolate(*b, p_t);
+	*((Color *)&dest) = self->lerp(*b, p_t);
 	return dest;
 }
 
diff --git a/modules/gdnative/gdnative/dictionary.cpp b/modules/gdnative/gdnative/dictionary.cpp
index b145b88934..a126974815 100644
--- a/modules/gdnative/gdnative/dictionary.cpp
+++ b/modules/gdnative/gdnative/dictionary.cpp
@@ -39,6 +39,8 @@
 extern "C" {
 #endif
 
+static_assert(sizeof(godot_dictionary) == sizeof(Dictionary), "Dictionary size mismatch");
+
 void GDAPI godot_dictionary_new(godot_dictionary *r_dest) {
 	Dictionary *dest = (Dictionary *)r_dest;
 	memnew_placement(dest, Dictionary);
diff --git a/modules/gdnative/gdnative/gdnative.cpp b/modules/gdnative/gdnative/gdnative.cpp
index 06334556d9..e94190b07b 100644
--- a/modules/gdnative/gdnative/gdnative.cpp
+++ b/modules/gdnative/gdnative/gdnative.cpp
@@ -56,14 +56,12 @@ godot_object GDAPI *godot_global_get_singleton(char *p_name) {
 // MethodBind API
 
 godot_method_bind GDAPI *godot_method_bind_get_method(const char *p_classname, const char *p_methodname) {
-
 	MethodBind *mb = ClassDB::get_method(StringName(p_classname), StringName(p_methodname));
 	// MethodBind *mb = ClassDB::get_method("Node", "get_name");
 	return (godot_method_bind *)mb;
 }
 
 void GDAPI godot_method_bind_ptrcall(godot_method_bind *p_method_bind, godot_object *p_instance, const void **p_args, void *p_ret) {
-
 	MethodBind *mb = (MethodBind *)p_method_bind;
 	Object *o = (Object *)p_instance;
 	mb->ptrcall(o, p_args, p_ret);
@@ -79,7 +77,7 @@ godot_variant GDAPI godot_method_bind_call(godot_method_bind *p_method_bind, god
 
 	Variant *ret_val = (Variant *)&ret;
 
-	Variant::CallError r_error;
+	Callable::CallError r_error;
 	*ret_val = mb->call(o, args, p_arg_count, r_error);
 
 	if (p_call_error) {
@@ -93,9 +91,10 @@ godot_variant GDAPI godot_method_bind_call(godot_method_bind *p_method_bind, god
 
 godot_class_constructor GDAPI godot_get_class_constructor(const char *p_classname) {
 	ClassDB::ClassInfo *class_info = ClassDB::classes.getptr(StringName(p_classname));
-	if (class_info)
+	if (class_info) {
 		return (godot_class_constructor)class_info->creation_func;
-	return NULL;
+	}
+	return nullptr;
 }
 
 godot_dictionary GDAPI godot_get_global_constants() {
@@ -166,25 +165,28 @@ void _gdnative_report_loading_error(const godot_object *p_library, const char *p
 	_err_print_error("gdnative_init", library->get_current_library_path().utf8().ptr(), 0, message.utf8().ptr());
 }
 
-bool GDAPI godot_is_instance_valid(const godot_object *p_object) {
-	return ObjectDB::instance_validate((Object *)p_object);
-}
-
-godot_object GDAPI *godot_instance_from_id(godot_int p_instance_id) {
-	return (godot_object *)ObjectDB::get_instance((ObjectID)p_instance_id);
+godot_object GDAPI *godot_instance_from_id(uint64_t p_instance_id) {
+	return (godot_object *)ObjectDB::get_instance(ObjectID(p_instance_id));
 }
 
 void *godot_get_class_tag(const godot_string_name *p_class) {
 	StringName class_name = *(StringName *)p_class;
 	ClassDB::ClassInfo *class_info = ClassDB::classes.getptr(class_name);
-	return class_info ? class_info->class_ptr : NULL;
+	return class_info ? class_info->class_ptr : nullptr;
 }
 
 godot_object *godot_object_cast_to(const godot_object *p_object, void *p_class_tag) {
-	if (!p_object) return NULL;
+	if (!p_object) {
+		return nullptr;
+	}
 	Object *o = (Object *)p_object;
 
-	return o->is_class_ptr(p_class_tag) ? (godot_object *)o : NULL;
+	return o->is_class_ptr(p_class_tag) ? (godot_object *)o : nullptr;
+}
+
+uint64_t GDAPI godot_object_get_instance_id(const godot_object *p_object) {
+	const Object *o = (const Object *)p_object;
+	return (uint64_t)o->get_instance_id();
 }
 
 #ifdef __cplusplus
diff --git a/modules/gdnative/gdnative/node_path.cpp b/modules/gdnative/gdnative/node_path.cpp
index 93f43835c8..88ed650ebe 100644
--- a/modules/gdnative/gdnative/node_path.cpp
+++ b/modules/gdnative/gdnative/node_path.cpp
@@ -37,6 +37,8 @@
 extern "C" {
 #endif
 
+static_assert(sizeof(godot_node_path) == sizeof(NodePath), "NodePath size mismatch");
+
 void GDAPI godot_node_path_new(godot_node_path *r_dest, const godot_string *p_from) {
 	NodePath *dest = (NodePath *)r_dest;
 	const String *from = (const String *)p_from;
diff --git a/modules/gdnative/gdnative/packed_arrays.cpp b/modules/gdnative/gdnative/packed_arrays.cpp
new file mode 100644
index 0000000000..de93c1d9b3
--- /dev/null
+++ b/modules/gdnative/gdnative/packed_arrays.cpp
@@ -0,0 +1,1028 @@
+/*************************************************************************/
+/*  packed_arrays.cpp                                                    */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "gdnative/packed_arrays.h"
+
+#include "core/array.h"
+
+#include "core/variant.h"
+
+#include "core/color.h"
+#include "core/math/vector2.h"
+#include "core/math/vector3.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+static_assert(sizeof(godot_packed_byte_array) == sizeof(Vector<uint8_t>), "Vector<uint8_t> size mismatch");
+static_assert(sizeof(godot_packed_int32_array) == sizeof(Vector<int32_t>), "Vector<int32_t> size mismatch");
+static_assert(sizeof(godot_packed_int64_array) == sizeof(Vector<int64_t>), "Vector<int64_t> size mismatch");
+static_assert(sizeof(godot_packed_float32_array) == sizeof(Vector<float>), "Vector<float> size mismatch");
+static_assert(sizeof(godot_packed_float64_array) == sizeof(Vector<double>), "Vector<double> size mismatch");
+static_assert(sizeof(godot_packed_string_array) == sizeof(Vector<String>), "Vector<String> size mismatch");
+static_assert(sizeof(godot_packed_vector2_array) == sizeof(Vector<Vector2>), "Vector<Vector2> size mismatch");
+static_assert(sizeof(godot_packed_vector3_array) == sizeof(Vector<Vector3>), "Vector<Vector3> size mismatch");
+static_assert(sizeof(godot_packed_color_array) == sizeof(Vector<Color>), "Vector<Color> size mismatch");
+
+#define memnew_placement_custom(m_placement, m_class, m_constr) _post_initialize(new (m_placement, sizeof(m_class), "") m_constr)
+
+// byte
+
+void GDAPI godot_packed_byte_array_new(godot_packed_byte_array *r_dest) {
+	Vector<uint8_t> *dest = (Vector<uint8_t> *)r_dest;
+	memnew_placement(dest, Vector<uint8_t>);
+}
+
+void GDAPI godot_packed_byte_array_new_copy(godot_packed_byte_array *r_dest, const godot_packed_byte_array *p_src) {
+	Vector<uint8_t> *dest = (Vector<uint8_t> *)r_dest;
+	const Vector<uint8_t> *src = (const Vector<uint8_t> *)p_src;
+	memnew_placement(dest, Vector<uint8_t>(*src));
+}
+
+void GDAPI godot_packed_byte_array_new_with_array(godot_packed_byte_array *r_dest, const godot_array *p_a) {
+	Vector<uint8_t> *dest = (Vector<uint8_t> *)r_dest;
+	Array *a = (Array *)p_a;
+	memnew_placement(dest, Vector<uint8_t>);
+
+	dest->resize(a->size());
+	for (int i = 0; i < a->size(); i++) {
+		dest->set(i, (*a)[i]);
+	}
+}
+
+const uint8_t GDAPI *godot_packed_byte_array_ptr(const godot_packed_byte_array *p_self) {
+	const Vector<uint8_t> *self = (const Vector<uint8_t> *)p_self;
+	return self->ptr();
+}
+
+uint8_t GDAPI *godot_packed_byte_array_ptrw(godot_packed_byte_array *p_self) {
+	Vector<uint8_t> *self = (Vector<uint8_t> *)p_self;
+	return self->ptrw();
+}
+
+void GDAPI godot_packed_byte_array_append(godot_packed_byte_array *p_self, const uint8_t p_data) {
+	Vector<uint8_t> *self = (Vector<uint8_t> *)p_self;
+	self->push_back(p_data);
+}
+
+void GDAPI godot_packed_byte_array_append_array(godot_packed_byte_array *p_self, const godot_packed_byte_array *p_array) {
+	Vector<uint8_t> *self = (Vector<uint8_t> *)p_self;
+	Vector<uint8_t> *array = (Vector<uint8_t> *)p_array;
+	self->append_array(*array);
+}
+
+godot_error GDAPI godot_packed_byte_array_insert(godot_packed_byte_array *p_self, const godot_int p_idx, const uint8_t p_data) {
+	Vector<uint8_t> *self = (Vector<uint8_t> *)p_self;
+	return (godot_error)self->insert(p_idx, p_data);
+}
+
+godot_bool GDAPI godot_packed_byte_array_has(godot_packed_byte_array *p_self, const uint8_t p_value) {
+	Vector<uint8_t> *self = (Vector<uint8_t> *)p_self;
+	return (godot_bool)self->has(p_value);
+}
+
+void GDAPI godot_packed_byte_array_sort(godot_packed_byte_array *p_self) {
+	Vector<uint8_t> *self = (Vector<uint8_t> *)p_self;
+	self->sort();
+}
+
+void GDAPI godot_packed_byte_array_invert(godot_packed_byte_array *p_self) {
+	Vector<uint8_t> *self = (Vector<uint8_t> *)p_self;
+	self->invert();
+}
+
+void GDAPI godot_packed_byte_array_push_back(godot_packed_byte_array *p_self, const uint8_t p_data) {
+	Vector<uint8_t> *self = (Vector<uint8_t> *)p_self;
+	self->push_back(p_data);
+}
+
+void GDAPI godot_packed_byte_array_remove(godot_packed_byte_array *p_self, const godot_int p_idx) {
+	Vector<uint8_t> *self = (Vector<uint8_t> *)p_self;
+	self->remove(p_idx);
+}
+
+void GDAPI godot_packed_byte_array_resize(godot_packed_byte_array *p_self, const godot_int p_size) {
+	Vector<uint8_t> *self = (Vector<uint8_t> *)p_self;
+	self->resize(p_size);
+}
+
+void GDAPI godot_packed_byte_array_set(godot_packed_byte_array *p_self, const godot_int p_idx, const uint8_t p_data) {
+	Vector<uint8_t> *self = (Vector<uint8_t> *)p_self;
+	self->set(p_idx, p_data);
+}
+
+uint8_t GDAPI godot_packed_byte_array_get(const godot_packed_byte_array *p_self, const godot_int p_idx) {
+	const Vector<uint8_t> *self = (const Vector<uint8_t> *)p_self;
+	return self->get(p_idx);
+}
+
+godot_int GDAPI godot_packed_byte_array_size(const godot_packed_byte_array *p_self) {
+	const Vector<uint8_t> *self = (const Vector<uint8_t> *)p_self;
+	return self->size();
+}
+
+godot_bool GDAPI godot_packed_byte_array_empty(const godot_packed_byte_array *p_self) {
+	const Vector<uint8_t> *self = (const Vector<uint8_t> *)p_self;
+	return self->empty();
+}
+
+void GDAPI godot_packed_byte_array_destroy(godot_packed_byte_array *p_self) {
+	((Vector<uint8_t> *)p_self)->~Vector();
+}
+
+// int32
+
+void GDAPI godot_packed_int32_array_new(godot_packed_int32_array *r_dest) {
+	Vector<int32_t> *dest = (Vector<int32_t> *)r_dest;
+	memnew_placement(dest, Vector<int32_t>);
+}
+
+void GDAPI godot_packed_int32_array_new_copy(godot_packed_int32_array *r_dest, const godot_packed_int32_array *p_src) {
+	Vector<int32_t> *dest = (Vector<int32_t> *)r_dest;
+	const Vector<int32_t> *src = (const Vector<int32_t> *)p_src;
+	memnew_placement(dest, Vector<int32_t>(*src));
+}
+
+void GDAPI godot_packed_int32_array_new_with_array(godot_packed_int32_array *r_dest, const godot_array *p_a) {
+	Vector<int32_t> *dest = (Vector<int32_t> *)r_dest;
+	Array *a = (Array *)p_a;
+	memnew_placement(dest, Vector<int32_t>);
+
+	dest->resize(a->size());
+	for (int i = 0; i < a->size(); i++) {
+		dest->set(i, (*a)[i]);
+	}
+}
+
+const int32_t GDAPI *godot_packed_int32_array_ptr(const godot_packed_int32_array *p_self) {
+	const Vector<int32_t> *self = (const Vector<int32_t> *)p_self;
+	return self->ptr();
+}
+
+int32_t GDAPI *godot_packed_int32_array_ptrw(godot_packed_int32_array *p_self) {
+	Vector<int32_t> *self = (Vector<int32_t> *)p_self;
+	return self->ptrw();
+}
+
+void GDAPI godot_packed_int32_array_append(godot_packed_int32_array *p_self, const int32_t p_data) {
+	Vector<int32_t> *self = (Vector<int32_t> *)p_self;
+	self->push_back(p_data);
+}
+
+void GDAPI godot_packed_int32_array_append_array(godot_packed_int32_array *p_self, const godot_packed_int32_array *p_array) {
+	Vector<int32_t> *self = (Vector<int32_t> *)p_self;
+	Vector<int32_t> *array = (Vector<int32_t> *)p_array;
+	self->append_array(*array);
+}
+
+godot_error GDAPI godot_packed_int32_array_insert(godot_packed_int32_array *p_self, const godot_int p_idx, const int32_t p_data) {
+	Vector<int32_t> *self = (Vector<int32_t> *)p_self;
+	return (godot_error)self->insert(p_idx, p_data);
+}
+
+godot_bool GDAPI godot_packed_int32_array_has(godot_packed_int32_array *p_self, const int32_t p_value) {
+	Vector<int32_t> *self = (Vector<int32_t> *)p_self;
+	return (godot_bool)self->has(p_value);
+}
+
+void GDAPI godot_packed_int32_array_sort(godot_packed_int32_array *p_self) {
+	Vector<int32_t> *self = (Vector<int32_t> *)p_self;
+	self->sort();
+}
+
+void GDAPI godot_packed_int32_array_invert(godot_packed_int32_array *p_self) {
+	Vector<int32_t> *self = (Vector<int32_t> *)p_self;
+	self->invert();
+}
+
+void GDAPI godot_packed_int32_array_push_back(godot_packed_int32_array *p_self, const int32_t p_data) {
+	Vector<int32_t> *self = (Vector<int32_t> *)p_self;
+	self->push_back(p_data);
+}
+
+void GDAPI godot_packed_int32_array_remove(godot_packed_int32_array *p_self, const godot_int p_idx) {
+	Vector<int32_t> *self = (Vector<int32_t> *)p_self;
+	self->remove(p_idx);
+}
+
+void GDAPI godot_packed_int32_array_resize(godot_packed_int32_array *p_self, const godot_int p_size) {
+	Vector<int32_t> *self = (Vector<int32_t> *)p_self;
+	self->resize(p_size);
+}
+
+void GDAPI godot_packed_int32_array_set(godot_packed_int32_array *p_self, const godot_int p_idx, const int32_t p_data) {
+	Vector<int32_t> *self = (Vector<int32_t> *)p_self;
+	self->set(p_idx, p_data);
+}
+
+int32_t GDAPI godot_packed_int32_array_get(const godot_packed_int32_array *p_self, const godot_int p_idx) {
+	const Vector<int32_t> *self = (const Vector<int32_t> *)p_self;
+	return self->get(p_idx);
+}
+
+godot_int GDAPI godot_packed_int32_array_size(const godot_packed_int32_array *p_self) {
+	const Vector<int32_t> *self = (const Vector<int32_t> *)p_self;
+	return self->size();
+}
+
+godot_bool GDAPI godot_packed_int32_array_empty(const godot_packed_int32_array *p_self) {
+	const Vector<int32_t> *self = (const Vector<int32_t> *)p_self;
+	return self->empty();
+}
+
+void GDAPI godot_packed_int32_array_destroy(godot_packed_int32_array *p_self) {
+	((Vector<int32_t> *)p_self)->~Vector();
+}
+
+// int64
+
+void GDAPI godot_packed_int64_array_new(godot_packed_int64_array *r_dest) {
+	Vector<int64_t> *dest = (Vector<int64_t> *)r_dest;
+	memnew_placement(dest, Vector<int64_t>);
+}
+
+void GDAPI godot_packed_int64_array_new_copy(godot_packed_int64_array *r_dest, const godot_packed_int64_array *p_src) {
+	Vector<int64_t> *dest = (Vector<int64_t> *)r_dest;
+	const Vector<int64_t> *src = (const Vector<int64_t> *)p_src;
+	memnew_placement(dest, Vector<int64_t>(*src));
+}
+
+void GDAPI godot_packed_int64_array_new_with_array(godot_packed_int64_array *r_dest, const godot_array *p_a) {
+	Vector<int64_t> *dest = (Vector<int64_t> *)r_dest;
+	Array *a = (Array *)p_a;
+	memnew_placement(dest, Vector<int64_t>);
+
+	dest->resize(a->size());
+	for (int i = 0; i < a->size(); i++) {
+		dest->set(i, (*a)[i]);
+	}
+}
+
+const int64_t GDAPI *godot_packed_int64_array_ptr(const godot_packed_int64_array *p_self) {
+	const Vector<int64_t> *self = (const Vector<int64_t> *)p_self;
+	return self->ptr();
+}
+
+int64_t GDAPI *godot_packed_int64_array_ptrw(godot_packed_int64_array *p_self) {
+	Vector<int64_t> *self = (Vector<int64_t> *)p_self;
+	return self->ptrw();
+}
+
+void GDAPI godot_packed_int64_array_append(godot_packed_int64_array *p_self, const int64_t p_data) {
+	Vector<int64_t> *self = (Vector<int64_t> *)p_self;
+	self->push_back(p_data);
+}
+
+void GDAPI godot_packed_int64_array_append_array(godot_packed_int64_array *p_self, const godot_packed_int64_array *p_array) {
+	Vector<int64_t> *self = (Vector<int64_t> *)p_self;
+	Vector<int64_t> *array = (Vector<int64_t> *)p_array;
+	self->append_array(*array);
+}
+
+godot_error GDAPI godot_packed_int64_array_insert(godot_packed_int64_array *p_self, const godot_int p_idx, const int64_t p_data) {
+	Vector<int64_t> *self = (Vector<int64_t> *)p_self;
+	return (godot_error)self->insert(p_idx, p_data);
+}
+
+godot_bool GDAPI godot_packed_int64_array_has(godot_packed_int64_array *p_self, const int64_t p_value) {
+	Vector<int64_t> *self = (Vector<int64_t> *)p_self;
+	return (godot_bool)self->has(p_value);
+}
+
+void GDAPI godot_packed_int64_array_sort(godot_packed_int64_array *p_self) {
+	Vector<int64_t> *self = (Vector<int64_t> *)p_self;
+	self->sort();
+}
+
+void GDAPI godot_packed_int64_array_invert(godot_packed_int64_array *p_self) {
+	Vector<int64_t> *self = (Vector<int64_t> *)p_self;
+	self->invert();
+}
+
+void GDAPI godot_packed_int64_array_push_back(godot_packed_int64_array *p_self, const int64_t p_data) {
+	Vector<int64_t> *self = (Vector<int64_t> *)p_self;
+	self->push_back(p_data);
+}
+
+void GDAPI godot_packed_int64_array_remove(godot_packed_int64_array *p_self, const godot_int p_idx) {
+	Vector<int64_t> *self = (Vector<int64_t> *)p_self;
+	self->remove(p_idx);
+}
+
+void GDAPI godot_packed_int64_array_resize(godot_packed_int64_array *p_self, const godot_int p_size) {
+	Vector<int64_t> *self = (Vector<int64_t> *)p_self;
+	self->resize(p_size);
+}
+
+void GDAPI godot_packed_int64_array_set(godot_packed_int64_array *p_self, const godot_int p_idx, const int64_t p_data) {
+	Vector<int64_t> *self = (Vector<int64_t> *)p_self;
+	self->set(p_idx, p_data);
+}
+
+int64_t GDAPI godot_packed_int64_array_get(const godot_packed_int64_array *p_self, const godot_int p_idx) {
+	const Vector<int64_t> *self = (const Vector<int64_t> *)p_self;
+	return self->get(p_idx);
+}
+
+godot_int GDAPI godot_packed_int64_array_size(const godot_packed_int64_array *p_self) {
+	const Vector<int64_t> *self = (const Vector<int64_t> *)p_self;
+	return self->size();
+}
+
+godot_bool GDAPI godot_packed_int64_array_empty(const godot_packed_int64_array *p_self) {
+	const Vector<int64_t> *self = (const Vector<int64_t> *)p_self;
+	return self->empty();
+}
+
+void GDAPI godot_packed_int64_array_destroy(godot_packed_int64_array *p_self) {
+	((Vector<int64_t> *)p_self)->~Vector();
+}
+
+// float32
+
+void GDAPI godot_packed_float32_array_new(godot_packed_float32_array *r_dest) {
+	Vector<float> *dest = (Vector<float> *)r_dest;
+	memnew_placement(dest, Vector<float>);
+}
+
+void GDAPI godot_packed_float32_array_new_copy(godot_packed_float32_array *r_dest, const godot_packed_float32_array *p_src) {
+	Vector<float> *dest = (Vector<float> *)r_dest;
+	const Vector<float> *src = (const Vector<float> *)p_src;
+	memnew_placement(dest, Vector<float>(*src));
+}
+
+void GDAPI godot_packed_float32_array_new_with_array(godot_packed_float32_array *r_dest, const godot_array *p_a) {
+	Vector<float> *dest = (Vector<float> *)r_dest;
+	Array *a = (Array *)p_a;
+	memnew_placement(dest, Vector<float>);
+
+	dest->resize(a->size());
+	for (int i = 0; i < a->size(); i++) {
+		dest->set(i, (*a)[i]);
+	}
+}
+
+const float GDAPI *godot_packed_float32_array_ptr(const godot_packed_float32_array *p_self) {
+	const Vector<float> *self = (const Vector<float> *)p_self;
+	return self->ptr();
+}
+
+float GDAPI *godot_packed_float32_array_ptrw(godot_packed_float32_array *p_self) {
+	Vector<float> *self = (Vector<float> *)p_self;
+	return self->ptrw();
+}
+
+void GDAPI godot_packed_float32_array_append(godot_packed_float32_array *p_self, const float p_data) {
+	Vector<float> *self = (Vector<float> *)p_self;
+	self->push_back(p_data);
+}
+
+void GDAPI godot_packed_float32_array_append_array(godot_packed_float32_array *p_self, const godot_packed_float32_array *p_array) {
+	Vector<float> *self = (Vector<float> *)p_self;
+	Vector<float> *array = (Vector<float> *)p_array;
+	self->append_array(*array);
+}
+
+godot_error GDAPI godot_packed_float32_array_insert(godot_packed_float32_array *p_self, const godot_int p_idx, const float p_data) {
+	Vector<float> *self = (Vector<float> *)p_self;
+	return (godot_error)self->insert(p_idx, p_data);
+}
+
+godot_bool GDAPI godot_packed_float32_array_has(godot_packed_float32_array *p_self, const float p_value) {
+	Vector<float> *self = (Vector<float> *)p_self;
+	return (godot_bool)self->has(p_value);
+}
+
+void GDAPI godot_packed_float32_array_sort(godot_packed_float32_array *p_self) {
+	Vector<float> *self = (Vector<float> *)p_self;
+	self->sort();
+}
+
+void GDAPI godot_packed_float32_array_invert(godot_packed_float32_array *p_self) {
+	Vector<float> *self = (Vector<float> *)p_self;
+	self->invert();
+}
+
+void GDAPI godot_packed_float32_array_push_back(godot_packed_float32_array *p_self, const float p_data) {
+	Vector<float> *self = (Vector<float> *)p_self;
+	self->push_back(p_data);
+}
+
+void GDAPI godot_packed_float32_array_remove(godot_packed_float32_array *p_self, const godot_int p_idx) {
+	Vector<float> *self = (Vector<float> *)p_self;
+	self->remove(p_idx);
+}
+
+void GDAPI godot_packed_float32_array_resize(godot_packed_float32_array *p_self, const godot_int p_size) {
+	Vector<float> *self = (Vector<float> *)p_self;
+	self->resize(p_size);
+}
+
+void GDAPI godot_packed_float32_array_set(godot_packed_float32_array *p_self, const godot_int p_idx, const float p_data) {
+	Vector<float> *self = (Vector<float> *)p_self;
+	self->set(p_idx, p_data);
+}
+
+float GDAPI godot_packed_float32_array_get(const godot_packed_float32_array *p_self, const godot_int p_idx) {
+	const Vector<float> *self = (const Vector<float> *)p_self;
+	return self->get(p_idx);
+}
+
+godot_int GDAPI godot_packed_float32_array_size(const godot_packed_float32_array *p_self) {
+	const Vector<float> *self = (const Vector<float> *)p_self;
+	return self->size();
+}
+
+godot_bool GDAPI godot_packed_float32_array_empty(const godot_packed_float32_array *p_self) {
+	const Vector<float> *self = (const Vector<float> *)p_self;
+	return self->empty();
+}
+
+void GDAPI godot_packed_float32_array_destroy(godot_packed_float32_array *p_self) {
+	((Vector<float> *)p_self)->~Vector();
+}
+
+// float64
+
+void GDAPI godot_packed_float64_array_new(godot_packed_float64_array *r_dest) {
+	Vector<double> *dest = (Vector<double> *)r_dest;
+	memnew_placement(dest, Vector<double>);
+}
+
+void GDAPI godot_packed_float64_array_new_copy(godot_packed_float64_array *r_dest, const godot_packed_float64_array *p_src) {
+	Vector<double> *dest = (Vector<double> *)r_dest;
+	const Vector<double> *src = (const Vector<double> *)p_src;
+	memnew_placement(dest, Vector<double>(*src));
+}
+
+void GDAPI godot_packed_float64_array_new_with_array(godot_packed_float64_array *r_dest, const godot_array *p_a) {
+	Vector<double> *dest = (Vector<double> *)r_dest;
+	Array *a = (Array *)p_a;
+	memnew_placement(dest, Vector<double>);
+
+	dest->resize(a->size());
+	for (int i = 0; i < a->size(); i++) {
+		dest->set(i, (*a)[i]);
+	}
+}
+
+const double GDAPI *godot_packed_float64_array_ptr(const godot_packed_float64_array *p_self) {
+	const Vector<double> *self = (const Vector<double> *)p_self;
+	return self->ptr();
+}
+
+double GDAPI *godot_packed_float64_array_ptrw(godot_packed_float64_array *p_self) {
+	Vector<double> *self = (Vector<double> *)p_self;
+	return self->ptrw();
+}
+
+void GDAPI godot_packed_float64_array_append(godot_packed_float64_array *p_self, const double p_data) {
+	Vector<double> *self = (Vector<double> *)p_self;
+	self->push_back(p_data);
+}
+
+void GDAPI godot_packed_float64_array_append_array(godot_packed_float64_array *p_self, const godot_packed_float64_array *p_array) {
+	Vector<double> *self = (Vector<double> *)p_self;
+	Vector<double> *array = (Vector<double> *)p_array;
+	self->append_array(*array);
+}
+
+godot_error GDAPI godot_packed_float64_array_insert(godot_packed_float64_array *p_self, const godot_int p_idx, const double p_data) {
+	Vector<double> *self = (Vector<double> *)p_self;
+	return (godot_error)self->insert(p_idx, p_data);
+}
+
+godot_bool GDAPI godot_packed_float64_array_has(godot_packed_float64_array *p_self, const double p_value) {
+	Vector<double> *self = (Vector<double> *)p_self;
+	return (godot_bool)self->has(p_value);
+}
+
+void GDAPI godot_packed_float64_array_sort(godot_packed_float64_array *p_self) {
+	Vector<double> *self = (Vector<double> *)p_self;
+	self->sort();
+}
+
+void GDAPI godot_packed_float64_array_invert(godot_packed_float64_array *p_self) {
+	Vector<double> *self = (Vector<double> *)p_self;
+	self->invert();
+}
+
+void GDAPI godot_packed_float64_array_push_back(godot_packed_float64_array *p_self, const double p_data) {
+	Vector<double> *self = (Vector<double> *)p_self;
+	self->push_back(p_data);
+}
+
+void GDAPI godot_packed_float64_array_remove(godot_packed_float64_array *p_self, const godot_int p_idx) {
+	Vector<double> *self = (Vector<double> *)p_self;
+	self->remove(p_idx);
+}
+
+void GDAPI godot_packed_float64_array_resize(godot_packed_float64_array *p_self, const godot_int p_size) {
+	Vector<double> *self = (Vector<double> *)p_self;
+	self->resize(p_size);
+}
+
+void GDAPI godot_packed_float64_array_set(godot_packed_float64_array *p_self, const godot_int p_idx, const double p_data) {
+	Vector<double> *self = (Vector<double> *)p_self;
+	self->set(p_idx, p_data);
+}
+
+double GDAPI godot_packed_float64_array_get(const godot_packed_float64_array *p_self, const godot_int p_idx) {
+	const Vector<double> *self = (const Vector<double> *)p_self;
+	return self->get(p_idx);
+}
+
+godot_int GDAPI godot_packed_float64_array_size(const godot_packed_float64_array *p_self) {
+	const Vector<double> *self = (const Vector<double> *)p_self;
+	return self->size();
+}
+
+godot_bool GDAPI godot_packed_float64_array_empty(const godot_packed_float64_array *p_self) {
+	const Vector<double> *self = (const Vector<double> *)p_self;
+	return self->empty();
+}
+
+void GDAPI godot_packed_float64_array_destroy(godot_packed_float64_array *p_self) {
+	((Vector<double> *)p_self)->~Vector();
+}
+
+// string
+
+void GDAPI godot_packed_string_array_new(godot_packed_string_array *r_dest) {
+	Vector<String> *dest = (Vector<String> *)r_dest;
+	memnew_placement(dest, Vector<String>);
+}
+
+void GDAPI godot_packed_string_array_new_copy(godot_packed_string_array *r_dest, const godot_packed_string_array *p_src) {
+	Vector<String> *dest = (Vector<String> *)r_dest;
+	const Vector<String> *src = (const Vector<String> *)p_src;
+	memnew_placement(dest, Vector<String>(*src));
+}
+
+void GDAPI godot_packed_string_array_new_with_array(godot_packed_string_array *r_dest, const godot_array *p_a) {
+	Vector<String> *dest = (Vector<String> *)r_dest;
+	Array *a = (Array *)p_a;
+	memnew_placement(dest, Vector<String>);
+
+	dest->resize(a->size());
+	for (int i = 0; i < a->size(); i++) {
+		dest->set(i, (*a)[i]);
+	}
+}
+
+const godot_string GDAPI *godot_packed_string_array_ptr(const godot_packed_string_array *p_self) {
+	const Vector<String> *self = (const Vector<String> *)p_self;
+	return (const godot_string *)self->ptr();
+}
+
+godot_string GDAPI *godot_packed_string_array_ptrw(godot_packed_string_array *p_self) {
+	Vector<String> *self = (Vector<String> *)p_self;
+	return (godot_string *)self->ptrw();
+}
+
+void GDAPI godot_packed_string_array_append(godot_packed_string_array *p_self, const godot_string *p_data) {
+	Vector<String> *self = (Vector<String> *)p_self;
+	String &s = *(String *)p_data;
+	self->push_back(s);
+}
+
+void GDAPI godot_packed_string_array_append_array(godot_packed_string_array *p_self, const godot_packed_string_array *p_array) {
+	Vector<String> *self = (Vector<String> *)p_self;
+	Vector<String> *array = (Vector<String> *)p_array;
+	self->append_array(*array);
+}
+
+godot_error GDAPI godot_packed_string_array_insert(godot_packed_string_array *p_self, const godot_int p_idx, const godot_string *p_data) {
+	Vector<String> *self = (Vector<String> *)p_self;
+	String &s = *(String *)p_data;
+	return (godot_error)self->insert(p_idx, s);
+}
+
+godot_bool GDAPI godot_packed_string_array_has(godot_packed_string_array *p_self, const godot_string *p_value) {
+	Vector<String> *self = (Vector<String> *)p_self;
+	String &s = *(String *)p_value;
+	return (godot_bool)self->has(s);
+}
+
+void GDAPI godot_packed_string_array_sort(godot_packed_string_array *p_self) {
+	Vector<String> *self = (Vector<String> *)p_self;
+	self->sort();
+}
+
+void GDAPI godot_packed_string_array_invert(godot_packed_string_array *p_self) {
+	Vector<String> *self = (Vector<String> *)p_self;
+	self->invert();
+}
+
+void GDAPI godot_packed_string_array_push_back(godot_packed_string_array *p_self, const godot_string *p_data) {
+	Vector<String> *self = (Vector<String> *)p_self;
+	String &s = *(String *)p_data;
+	self->push_back(s);
+}
+
+void GDAPI godot_packed_string_array_remove(godot_packed_string_array *p_self, const godot_int p_idx) {
+	Vector<String> *self = (Vector<String> *)p_self;
+	self->remove(p_idx);
+}
+
+void GDAPI godot_packed_string_array_resize(godot_packed_string_array *p_self, const godot_int p_size) {
+	Vector<String> *self = (Vector<String> *)p_self;
+	self->resize(p_size);
+}
+
+void GDAPI godot_packed_string_array_set(godot_packed_string_array *p_self, const godot_int p_idx, const godot_string *p_data) {
+	Vector<String> *self = (Vector<String> *)p_self;
+	String &s = *(String *)p_data;
+	self->set(p_idx, s);
+}
+
+godot_string GDAPI godot_packed_string_array_get(const godot_packed_string_array *p_self, const godot_int p_idx) {
+	const Vector<String> *self = (const Vector<String> *)p_self;
+	godot_string str;
+	String *s = (String *)&str;
+	memnew_placement(s, String);
+	*s = self->get(p_idx);
+	return str;
+}
+
+godot_int GDAPI godot_packed_string_array_size(const godot_packed_string_array *p_self) {
+	const Vector<String> *self = (const Vector<String> *)p_self;
+	return self->size();
+}
+
+godot_bool GDAPI godot_packed_string_array_empty(const godot_packed_string_array *p_self) {
+	const Vector<String> *self = (const Vector<String> *)p_self;
+	return self->empty();
+}
+
+void GDAPI godot_packed_string_array_destroy(godot_packed_string_array *p_self) {
+	((Vector<String> *)p_self)->~Vector();
+}
+
+// vector2
+
+void GDAPI godot_packed_vector2_array_new(godot_packed_vector2_array *r_dest) {
+	Vector<Vector2> *dest = (Vector<Vector2> *)r_dest;
+	memnew_placement(dest, Vector<Vector2>);
+}
+
+void GDAPI godot_packed_vector2_array_new_copy(godot_packed_vector2_array *r_dest, const godot_packed_vector2_array *p_src) {
+	Vector<Vector2> *dest = (Vector<Vector2> *)r_dest;
+	const Vector<Vector2> *src = (const Vector<Vector2> *)p_src;
+	memnew_placement(dest, Vector<Vector2>(*src));
+}
+
+void GDAPI godot_packed_vector2_array_new_with_array(godot_packed_vector2_array *r_dest, const godot_array *p_a) {
+	Vector<Vector2> *dest = (Vector<Vector2> *)r_dest;
+	Array *a = (Array *)p_a;
+	memnew_placement(dest, Vector<Vector2>);
+
+	dest->resize(a->size());
+	for (int i = 0; i < a->size(); i++) {
+		dest->set(i, (*a)[i]);
+	}
+}
+
+const godot_vector2 GDAPI *godot_packed_vector2_array_ptr(const godot_packed_vector2_array *p_self) {
+	const Vector<Vector2> *self = (const Vector<Vector2> *)p_self;
+	return (const godot_vector2 *)self->ptr();
+}
+
+godot_vector2 GDAPI *godot_packed_vector2_array_ptrw(godot_packed_vector2_array *p_self) {
+	Vector<Vector2> *self = (Vector<Vector2> *)p_self;
+	return (godot_vector2 *)self->ptrw();
+}
+
+void GDAPI godot_packed_vector2_array_append(godot_packed_vector2_array *p_self, const godot_vector2 *p_data) {
+	Vector<Vector2> *self = (Vector<Vector2> *)p_self;
+	Vector2 &s = *(Vector2 *)p_data;
+	self->push_back(s);
+}
+
+void GDAPI godot_packed_vector2_array_append_array(godot_packed_vector2_array *p_self, const godot_packed_vector2_array *p_array) {
+	Vector<Vector2> *self = (Vector<Vector2> *)p_self;
+	Vector<Vector2> *array = (Vector<Vector2> *)p_array;
+	self->append_array(*array);
+}
+
+godot_error GDAPI godot_packed_vector2_array_insert(godot_packed_vector2_array *p_self, const godot_int p_idx, const godot_vector2 *p_data) {
+	Vector<Vector2> *self = (Vector<Vector2> *)p_self;
+	Vector2 &s = *(Vector2 *)p_data;
+	return (godot_error)self->insert(p_idx, s);
+}
+
+godot_bool GDAPI godot_packed_vector2_array_has(godot_packed_vector2_array *p_self, const godot_vector2 *p_value) {
+	Vector<Vector2> *self = (Vector<Vector2> *)p_self;
+	Vector2 &v = *(Vector2 *)p_value;
+	return (godot_bool)self->has(v);
+}
+
+void GDAPI godot_packed_vector2_array_sort(godot_packed_vector2_array *p_self) {
+	Vector<Vector2> *self = (Vector<Vector2> *)p_self;
+	self->sort();
+}
+
+void GDAPI godot_packed_vector2_array_invert(godot_packed_vector2_array *p_self) {
+	Vector<Vector2> *self = (Vector<Vector2> *)p_self;
+	self->invert();
+}
+
+void GDAPI godot_packed_vector2_array_push_back(godot_packed_vector2_array *p_self, const godot_vector2 *p_data) {
+	Vector<Vector2> *self = (Vector<Vector2> *)p_self;
+	Vector2 &s = *(Vector2 *)p_data;
+	self->push_back(s);
+}
+
+void GDAPI godot_packed_vector2_array_remove(godot_packed_vector2_array *p_self, const godot_int p_idx) {
+	Vector<Vector2> *self = (Vector<Vector2> *)p_self;
+	self->remove(p_idx);
+}
+
+void GDAPI godot_packed_vector2_array_resize(godot_packed_vector2_array *p_self, const godot_int p_size) {
+	Vector<Vector2> *self = (Vector<Vector2> *)p_self;
+	self->resize(p_size);
+}
+
+void GDAPI godot_packed_vector2_array_set(godot_packed_vector2_array *p_self, const godot_int p_idx, const godot_vector2 *p_data) {
+	Vector<Vector2> *self = (Vector<Vector2> *)p_self;
+	Vector2 &s = *(Vector2 *)p_data;
+	self->set(p_idx, s);
+}
+
+godot_vector2 GDAPI godot_packed_vector2_array_get(const godot_packed_vector2_array *p_self, const godot_int p_idx) {
+	const Vector<Vector2> *self = (const Vector<Vector2> *)p_self;
+	godot_vector2 v;
+	Vector2 *s = (Vector2 *)&v;
+	*s = self->get(p_idx);
+	return v;
+}
+
+godot_int GDAPI godot_packed_vector2_array_size(const godot_packed_vector2_array *p_self) {
+	const Vector<Vector2> *self = (const Vector<Vector2> *)p_self;
+	return self->size();
+}
+
+godot_bool GDAPI godot_packed_vector2_array_empty(const godot_packed_vector2_array *p_self) {
+	const Vector<Vector2> *self = (const Vector<Vector2> *)p_self;
+	return self->empty();
+}
+
+void GDAPI godot_packed_vector2_array_destroy(godot_packed_vector2_array *p_self) {
+	((Vector<Vector2> *)p_self)->~Vector();
+}
+
+// vector3
+
+void GDAPI godot_packed_vector3_array_new(godot_packed_vector3_array *r_dest) {
+	Vector<Vector3> *dest = (Vector<Vector3> *)r_dest;
+	memnew_placement(dest, Vector<Vector3>);
+}
+
+void GDAPI godot_packed_vector3_array_new_copy(godot_packed_vector3_array *r_dest, const godot_packed_vector3_array *p_src) {
+	Vector<Vector3> *dest = (Vector<Vector3> *)r_dest;
+	const Vector<Vector3> *src = (const Vector<Vector3> *)p_src;
+	memnew_placement(dest, Vector<Vector3>(*src));
+}
+
+void GDAPI godot_packed_vector3_array_new_with_array(godot_packed_vector3_array *r_dest, const godot_array *p_a) {
+	Vector<Vector3> *dest = (Vector<Vector3> *)r_dest;
+	Array *a = (Array *)p_a;
+	memnew_placement(dest, Vector<Vector3>);
+
+	dest->resize(a->size());
+	for (int i = 0; i < a->size(); i++) {
+		dest->set(i, (*a)[i]);
+	}
+}
+
+const godot_vector3 GDAPI *godot_packed_vector3_array_ptr(const godot_packed_vector3_array *p_self) {
+	const Vector<Vector3> *self = (const Vector<Vector3> *)p_self;
+	return (const godot_vector3 *)self->ptr();
+}
+
+godot_vector3 GDAPI *godot_packed_vector3_array_ptrw(godot_packed_vector3_array *p_self) {
+	Vector<Vector3> *self = (Vector<Vector3> *)p_self;
+	return (godot_vector3 *)self->ptrw();
+}
+
+void GDAPI godot_packed_vector3_array_append(godot_packed_vector3_array *p_self, const godot_vector3 *p_data) {
+	Vector<Vector3> *self = (Vector<Vector3> *)p_self;
+	Vector3 &s = *(Vector3 *)p_data;
+	self->push_back(s);
+}
+
+void GDAPI godot_packed_vector3_array_append_array(godot_packed_vector3_array *p_self, const godot_packed_vector3_array *p_array) {
+	Vector<Vector3> *self = (Vector<Vector3> *)p_self;
+	Vector<Vector3> *array = (Vector<Vector3> *)p_array;
+	self->append_array(*array);
+}
+
+godot_error GDAPI godot_packed_vector3_array_insert(godot_packed_vector3_array *p_self, const godot_int p_idx, const godot_vector3 *p_data) {
+	Vector<Vector3> *self = (Vector<Vector3> *)p_self;
+	Vector3 &s = *(Vector3 *)p_data;
+	return (godot_error)self->insert(p_idx, s);
+}
+
+godot_bool GDAPI godot_packed_vector3_array_has(godot_packed_vector3_array *p_self, const godot_vector3 *p_value) {
+	Vector<Vector3> *self = (Vector<Vector3> *)p_self;
+	Vector3 &v = *(Vector3 *)p_value;
+	return (godot_bool)self->has(v);
+}
+
+void GDAPI godot_packed_vector3_array_sort(godot_packed_vector3_array *p_self) {
+	Vector<Vector3> *self = (Vector<Vector3> *)p_self;
+	self->sort();
+}
+
+void GDAPI godot_packed_vector3_array_invert(godot_packed_vector3_array *p_self) {
+	Vector<Vector3> *self = (Vector<Vector3> *)p_self;
+	self->invert();
+}
+
+void GDAPI godot_packed_vector3_array_push_back(godot_packed_vector3_array *p_self, const godot_vector3 *p_data) {
+	Vector<Vector3> *self = (Vector<Vector3> *)p_self;
+	Vector3 &s = *(Vector3 *)p_data;
+	self->push_back(s);
+}
+
+void GDAPI godot_packed_vector3_array_remove(godot_packed_vector3_array *p_self, const godot_int p_idx) {
+	Vector<Vector3> *self = (Vector<Vector3> *)p_self;
+	self->remove(p_idx);
+}
+
+void GDAPI godot_packed_vector3_array_resize(godot_packed_vector3_array *p_self, const godot_int p_size) {
+	Vector<Vector3> *self = (Vector<Vector3> *)p_self;
+	self->resize(p_size);
+}
+
+void GDAPI godot_packed_vector3_array_set(godot_packed_vector3_array *p_self, const godot_int p_idx, const godot_vector3 *p_data) {
+	Vector<Vector3> *self = (Vector<Vector3> *)p_self;
+	Vector3 &s = *(Vector3 *)p_data;
+	self->set(p_idx, s);
+}
+
+godot_vector3 GDAPI godot_packed_vector3_array_get(const godot_packed_vector3_array *p_self, const godot_int p_idx) {
+	const Vector<Vector3> *self = (const Vector<Vector3> *)p_self;
+	godot_vector3 v;
+	Vector3 *s = (Vector3 *)&v;
+	*s = self->get(p_idx);
+	return v;
+}
+
+godot_int GDAPI godot_packed_vector3_array_size(const godot_packed_vector3_array *p_self) {
+	const Vector<Vector3> *self = (const Vector<Vector3> *)p_self;
+	return self->size();
+}
+
+godot_bool GDAPI godot_packed_vector3_array_empty(const godot_packed_vector3_array *p_self) {
+	const Vector<Vector3> *self = (const Vector<Vector3> *)p_self;
+	return self->empty();
+}
+
+void GDAPI godot_packed_vector3_array_destroy(godot_packed_vector3_array *p_self) {
+	((Vector<Vector3> *)p_self)->~Vector();
+}
+
+// color
+
+void GDAPI godot_packed_color_array_new(godot_packed_color_array *r_dest) {
+	Vector<Color> *dest = (Vector<Color> *)r_dest;
+	memnew_placement(dest, Vector<Color>);
+}
+
+void GDAPI godot_packed_color_array_new_copy(godot_packed_color_array *r_dest, const godot_packed_color_array *p_src) {
+	Vector<Color> *dest = (Vector<Color> *)r_dest;
+	const Vector<Color> *src = (const Vector<Color> *)p_src;
+	memnew_placement(dest, Vector<Color>(*src));
+}
+
+void GDAPI godot_packed_color_array_new_with_array(godot_packed_color_array *r_dest, const godot_array *p_a) {
+	Vector<Color> *dest = (Vector<Color> *)r_dest;
+	Array *a = (Array *)p_a;
+	memnew_placement(dest, Vector<Color>);
+
+	dest->resize(a->size());
+	for (int i = 0; i < a->size(); i++) {
+		dest->set(i, (*a)[i]);
+	}
+}
+
+const godot_color GDAPI *godot_packed_color_array_ptr(const godot_packed_color_array *p_self) {
+	const Vector<Color> *self = (const Vector<Color> *)p_self;
+	return (const godot_color *)self->ptr();
+}
+
+godot_color GDAPI *godot_packed_color_array_ptrw(godot_packed_color_array *p_self) {
+	Vector<Color> *self = (Vector<Color> *)p_self;
+	return (godot_color *)self->ptrw();
+}
+
+void GDAPI godot_packed_color_array_append(godot_packed_color_array *p_self, const godot_color *p_data) {
+	Vector<Color> *self = (Vector<Color> *)p_self;
+	Color &s = *(Color *)p_data;
+	self->push_back(s);
+}
+
+void GDAPI godot_packed_color_array_append_array(godot_packed_color_array *p_self, const godot_packed_color_array *p_array) {
+	Vector<Color> *self = (Vector<Color> *)p_self;
+	Vector<Color> *array = (Vector<Color> *)p_array;
+	self->append_array(*array);
+}
+
+godot_error GDAPI godot_packed_color_array_insert(godot_packed_color_array *p_self, const godot_int p_idx, const godot_color *p_data) {
+	Vector<Color> *self = (Vector<Color> *)p_self;
+	Color &s = *(Color *)p_data;
+	return (godot_error)self->insert(p_idx, s);
+}
+
+godot_bool GDAPI godot_packed_color_array_has(godot_packed_color_array *p_self, const godot_color *p_value) {
+	Vector<Color> *self = (Vector<Color> *)p_self;
+	Color &c = *(Color *)p_value;
+	return (godot_bool)self->has(c);
+}
+
+void GDAPI godot_packed_color_array_sort(godot_packed_color_array *p_self) {
+	Vector<Color> *self = (Vector<Color> *)p_self;
+	self->sort();
+}
+
+void GDAPI godot_packed_color_array_invert(godot_packed_color_array *p_self) {
+	Vector<Color> *self = (Vector<Color> *)p_self;
+	self->invert();
+}
+
+void GDAPI godot_packed_color_array_push_back(godot_packed_color_array *p_self, const godot_color *p_data) {
+	Vector<Color> *self = (Vector<Color> *)p_self;
+	Color &s = *(Color *)p_data;
+	self->push_back(s);
+}
+
+void GDAPI godot_packed_color_array_remove(godot_packed_color_array *p_self, const godot_int p_idx) {
+	Vector<Color> *self = (Vector<Color> *)p_self;
+	self->remove(p_idx);
+}
+
+void GDAPI godot_packed_color_array_resize(godot_packed_color_array *p_self, const godot_int p_size) {
+	Vector<Color> *self = (Vector<Color> *)p_self;
+	self->resize(p_size);
+}
+
+void GDAPI godot_packed_color_array_set(godot_packed_color_array *p_self, const godot_int p_idx, const godot_color *p_data) {
+	Vector<Color> *self = (Vector<Color> *)p_self;
+	Color &s = *(Color *)p_data;
+	self->set(p_idx, s);
+}
+
+godot_color GDAPI godot_packed_color_array_get(const godot_packed_color_array *p_self, const godot_int p_idx) {
+	const Vector<Color> *self = (const Vector<Color> *)p_self;
+	godot_color v;
+	Color *s = (Color *)&v;
+	*s = self->get(p_idx);
+	return v;
+}
+
+godot_int GDAPI godot_packed_color_array_size(const godot_packed_color_array *p_self) {
+	const Vector<Color> *self = (const Vector<Color> *)p_self;
+	return self->size();
+}
+
+godot_bool GDAPI godot_packed_color_array_empty(const godot_packed_color_array *p_self) {
+	const Vector<Color> *self = (const Vector<Color> *)p_self;
+	return self->empty();
+}
+
+void GDAPI godot_packed_color_array_destroy(godot_packed_color_array *p_self) {
+	((Vector<Color> *)p_self)->~Vector();
+}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/modules/gdnative/gdnative/plane.cpp b/modules/gdnative/gdnative/plane.cpp
index 17221fe081..d4ed8d00f4 100644
--- a/modules/gdnative/gdnative/plane.cpp
+++ b/modules/gdnative/gdnative/plane.cpp
@@ -37,8 +37,9 @@
 extern "C" {
 #endif
 
-void GDAPI godot_plane_new_with_reals(godot_plane *r_dest, const godot_real p_a, const godot_real p_b, const godot_real p_c, const godot_real p_d) {
+static_assert(sizeof(godot_plane) == sizeof(Plane), "Plane size mismatch");
 
+void GDAPI godot_plane_new_with_reals(godot_plane *r_dest, const godot_real p_a, const godot_real p_b, const godot_real p_c, const godot_real p_d) {
 	Plane *dest = (Plane *)r_dest;
 	*dest = Plane(p_a, p_b, p_c, p_d);
 }
@@ -78,13 +79,6 @@ godot_vector3 GDAPI godot_plane_center(const godot_plane *p_self) {
 	return dest;
 }
 
-godot_vector3 GDAPI godot_plane_get_any_point(const godot_plane *p_self) {
-	godot_vector3 dest;
-	const Plane *self = (const Plane *)p_self;
-	*((Vector3 *)&dest) = self->get_any_point();
-	return dest;
-}
-
 godot_bool GDAPI godot_plane_is_point_over(const godot_plane *p_self, const godot_vector3 *p_point) {
 	const Plane *self = (const Plane *)p_self;
 	const Vector3 *point = (const Vector3 *)p_point;
diff --git a/modules/gdnative/gdnative/pool_arrays.cpp b/modules/gdnative/gdnative/pool_arrays.cpp
deleted file mode 100644
index bae1290d59..0000000000
--- a/modules/gdnative/gdnative/pool_arrays.cpp
+++ /dev/null
@@ -1,982 +0,0 @@
-/*************************************************************************/
-/*  pool_arrays.cpp                                                      */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
-/*                                                                       */
-/* Permission is hereby granted, free of charge, to any person obtaining */
-/* a copy of this software and associated documentation files (the       */
-/* "Software"), to deal in the Software without restriction, including   */
-/* without limitation the rights to use, copy, modify, merge, publish,   */
-/* distribute, sublicense, and/or sell copies of the Software, and to    */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions:                                             */
-/*                                                                       */
-/* The above copyright notice and this permission notice shall be        */
-/* included in all copies or substantial portions of the Software.       */
-/*                                                                       */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
-/*************************************************************************/
-
-#include "gdnative/pool_arrays.h"
-
-#include "core/array.h"
-#include "core/pool_vector.h"
-#include "core/variant.h"
-
-#include "core/color.h"
-#include "core/math/vector2.h"
-#include "core/math/vector3.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define memnew_placement_custom(m_placement, m_class, m_constr) _post_initialize(new (m_placement, sizeof(m_class), "") m_constr)
-
-// byte
-
-void GDAPI godot_pool_byte_array_new(godot_pool_byte_array *r_dest) {
-	PoolVector<uint8_t> *dest = (PoolVector<uint8_t> *)r_dest;
-	memnew_placement(dest, PoolVector<uint8_t>);
-}
-
-void GDAPI godot_pool_byte_array_new_copy(godot_pool_byte_array *r_dest, const godot_pool_byte_array *p_src) {
-	PoolVector<uint8_t> *dest = (PoolVector<uint8_t> *)r_dest;
-	const PoolVector<uint8_t> *src = (const PoolVector<uint8_t> *)p_src;
-	memnew_placement(dest, PoolVector<uint8_t>(*src));
-}
-
-void GDAPI godot_pool_byte_array_new_with_array(godot_pool_byte_array *r_dest, const godot_array *p_a) {
-	PoolVector<uint8_t> *dest = (PoolVector<uint8_t> *)r_dest;
-	Array *a = (Array *)p_a;
-	memnew_placement(dest, PoolVector<uint8_t>);
-
-	dest->resize(a->size());
-	for (int i = 0; i < a->size(); i++) {
-		dest->set(i, (*a)[i]);
-	}
-}
-
-void GDAPI godot_pool_byte_array_append(godot_pool_byte_array *p_self, const uint8_t p_data) {
-	PoolVector<uint8_t> *self = (PoolVector<uint8_t> *)p_self;
-	self->append(p_data);
-}
-
-void GDAPI godot_pool_byte_array_append_array(godot_pool_byte_array *p_self, const godot_pool_byte_array *p_array) {
-	PoolVector<uint8_t> *self = (PoolVector<uint8_t> *)p_self;
-	PoolVector<uint8_t> *array = (PoolVector<uint8_t> *)p_array;
-	self->append_array(*array);
-}
-
-godot_error GDAPI godot_pool_byte_array_insert(godot_pool_byte_array *p_self, const godot_int p_idx, const uint8_t p_data) {
-	PoolVector<uint8_t> *self = (PoolVector<uint8_t> *)p_self;
-	return (godot_error)self->insert(p_idx, p_data);
-}
-
-void GDAPI godot_pool_byte_array_invert(godot_pool_byte_array *p_self) {
-	PoolVector<uint8_t> *self = (PoolVector<uint8_t> *)p_self;
-	self->invert();
-}
-
-void GDAPI godot_pool_byte_array_push_back(godot_pool_byte_array *p_self, const uint8_t p_data) {
-	PoolVector<uint8_t> *self = (PoolVector<uint8_t> *)p_self;
-	self->push_back(p_data);
-}
-
-void GDAPI godot_pool_byte_array_remove(godot_pool_byte_array *p_self, const godot_int p_idx) {
-	PoolVector<uint8_t> *self = (PoolVector<uint8_t> *)p_self;
-	self->remove(p_idx);
-}
-
-void GDAPI godot_pool_byte_array_resize(godot_pool_byte_array *p_self, const godot_int p_size) {
-	PoolVector<uint8_t> *self = (PoolVector<uint8_t> *)p_self;
-	self->resize(p_size);
-}
-
-godot_pool_byte_array_read_access GDAPI *godot_pool_byte_array_read(const godot_pool_byte_array *p_self) {
-	const PoolVector<uint8_t> *self = (const PoolVector<uint8_t> *)p_self;
-	return (godot_pool_byte_array_read_access *)memnew(PoolVector<uint8_t>::Read(self->read()));
-}
-
-godot_pool_byte_array_write_access GDAPI *godot_pool_byte_array_write(godot_pool_byte_array *p_self) {
-	PoolVector<uint8_t> *self = (PoolVector<uint8_t> *)p_self;
-	return (godot_pool_byte_array_write_access *)memnew(PoolVector<uint8_t>::Write(self->write()));
-}
-
-void GDAPI godot_pool_byte_array_set(godot_pool_byte_array *p_self, const godot_int p_idx, const uint8_t p_data) {
-	PoolVector<uint8_t> *self = (PoolVector<uint8_t> *)p_self;
-	self->set(p_idx, p_data);
-}
-
-uint8_t GDAPI godot_pool_byte_array_get(const godot_pool_byte_array *p_self, const godot_int p_idx) {
-	const PoolVector<uint8_t> *self = (const PoolVector<uint8_t> *)p_self;
-	return self->get(p_idx);
-}
-
-godot_int GDAPI godot_pool_byte_array_size(const godot_pool_byte_array *p_self) {
-	const PoolVector<uint8_t> *self = (const PoolVector<uint8_t> *)p_self;
-	return self->size();
-}
-
-godot_bool GDAPI godot_pool_byte_array_empty(const godot_pool_byte_array *p_self) {
-	const PoolVector<uint8_t> *self = (const PoolVector<uint8_t> *)p_self;
-	return self->empty();
-}
-
-void GDAPI godot_pool_byte_array_destroy(godot_pool_byte_array *p_self) {
-	((PoolVector<uint8_t> *)p_self)->~PoolVector();
-}
-
-// int
-
-void GDAPI godot_pool_int_array_new(godot_pool_int_array *r_dest) {
-	PoolVector<godot_int> *dest = (PoolVector<godot_int> *)r_dest;
-	memnew_placement(dest, PoolVector<godot_int>);
-}
-
-void GDAPI godot_pool_int_array_new_copy(godot_pool_int_array *r_dest, const godot_pool_int_array *p_src) {
-	PoolVector<godot_int> *dest = (PoolVector<godot_int> *)r_dest;
-	const PoolVector<godot_int> *src = (const PoolVector<godot_int> *)p_src;
-	memnew_placement(dest, PoolVector<godot_int>(*src));
-}
-
-void GDAPI godot_pool_int_array_new_with_array(godot_pool_int_array *r_dest, const godot_array *p_a) {
-	PoolVector<godot_int> *dest = (PoolVector<godot_int> *)r_dest;
-	Array *a = (Array *)p_a;
-	memnew_placement(dest, PoolVector<godot_int>);
-
-	dest->resize(a->size());
-	for (int i = 0; i < a->size(); i++) {
-		dest->set(i, (*a)[i]);
-	}
-}
-
-void GDAPI godot_pool_int_array_append(godot_pool_int_array *p_self, const godot_int p_data) {
-	PoolVector<godot_int> *self = (PoolVector<godot_int> *)p_self;
-	self->append(p_data);
-}
-
-void GDAPI godot_pool_int_array_append_array(godot_pool_int_array *p_self, const godot_pool_int_array *p_array) {
-	PoolVector<godot_int> *self = (PoolVector<godot_int> *)p_self;
-	PoolVector<godot_int> *array = (PoolVector<godot_int> *)p_array;
-	self->append_array(*array);
-}
-
-godot_error GDAPI godot_pool_int_array_insert(godot_pool_int_array *p_self, const godot_int p_idx, const godot_int p_data) {
-	PoolVector<godot_int> *self = (PoolVector<godot_int> *)p_self;
-	return (godot_error)self->insert(p_idx, p_data);
-}
-
-void GDAPI godot_pool_int_array_invert(godot_pool_int_array *p_self) {
-	PoolVector<godot_int> *self = (PoolVector<godot_int> *)p_self;
-	self->invert();
-}
-
-void GDAPI godot_pool_int_array_push_back(godot_pool_int_array *p_self, const godot_int p_data) {
-	PoolVector<godot_int> *self = (PoolVector<godot_int> *)p_self;
-	self->push_back(p_data);
-}
-
-void GDAPI godot_pool_int_array_remove(godot_pool_int_array *p_self, const godot_int p_idx) {
-	PoolVector<godot_int> *self = (PoolVector<godot_int> *)p_self;
-	self->remove(p_idx);
-}
-
-void GDAPI godot_pool_int_array_resize(godot_pool_int_array *p_self, const godot_int p_size) {
-	PoolVector<godot_int> *self = (PoolVector<godot_int> *)p_self;
-	self->resize(p_size);
-}
-
-godot_pool_int_array_read_access GDAPI *godot_pool_int_array_read(const godot_pool_int_array *p_self) {
-	const PoolVector<godot_int> *self = (const PoolVector<godot_int> *)p_self;
-	return (godot_pool_int_array_read_access *)memnew(PoolVector<godot_int>::Read(self->read()));
-}
-
-godot_pool_int_array_write_access GDAPI *godot_pool_int_array_write(godot_pool_int_array *p_self) {
-	PoolVector<godot_int> *self = (PoolVector<godot_int> *)p_self;
-	return (godot_pool_int_array_write_access *)memnew(PoolVector<godot_int>::Write(self->write()));
-}
-
-void GDAPI godot_pool_int_array_set(godot_pool_int_array *p_self, const godot_int p_idx, const godot_int p_data) {
-	PoolVector<godot_int> *self = (PoolVector<godot_int> *)p_self;
-	self->set(p_idx, p_data);
-}
-
-godot_int GDAPI godot_pool_int_array_get(const godot_pool_int_array *p_self, const godot_int p_idx) {
-	const PoolVector<godot_int> *self = (const PoolVector<godot_int> *)p_self;
-	return self->get(p_idx);
-}
-
-godot_int GDAPI godot_pool_int_array_size(const godot_pool_int_array *p_self) {
-	const PoolVector<godot_int> *self = (const PoolVector<godot_int> *)p_self;
-	return self->size();
-}
-
-godot_bool GDAPI godot_pool_int_array_empty(const godot_pool_int_array *p_self) {
-	const PoolVector<godot_int> *self = (const PoolVector<godot_int> *)p_self;
-	return self->empty();
-}
-
-void GDAPI godot_pool_int_array_destroy(godot_pool_int_array *p_self) {
-	((PoolVector<godot_int> *)p_self)->~PoolVector();
-}
-
-// real
-
-void GDAPI godot_pool_real_array_new(godot_pool_real_array *r_dest) {
-	PoolVector<godot_real> *dest = (PoolVector<godot_real> *)r_dest;
-	memnew_placement(dest, PoolVector<godot_real>);
-}
-
-void GDAPI godot_pool_real_array_new_copy(godot_pool_real_array *r_dest, const godot_pool_real_array *p_src) {
-	PoolVector<godot_real> *dest = (PoolVector<godot_real> *)r_dest;
-	const PoolVector<godot_real> *src = (const PoolVector<godot_real> *)p_src;
-	memnew_placement(dest, PoolVector<godot_real>(*src));
-}
-
-void GDAPI godot_pool_real_array_new_with_array(godot_pool_real_array *r_dest, const godot_array *p_a) {
-	PoolVector<godot_real> *dest = (PoolVector<godot_real> *)r_dest;
-	Array *a = (Array *)p_a;
-	memnew_placement(dest, PoolVector<godot_real>);
-
-	dest->resize(a->size());
-	for (int i = 0; i < a->size(); i++) {
-		dest->set(i, (*a)[i]);
-	}
-}
-
-void GDAPI godot_pool_real_array_append(godot_pool_real_array *p_self, const godot_real p_data) {
-	PoolVector<godot_real> *self = (PoolVector<godot_real> *)p_self;
-	self->append(p_data);
-}
-
-void GDAPI godot_pool_real_array_append_array(godot_pool_real_array *p_self, const godot_pool_real_array *p_array) {
-	PoolVector<godot_real> *self = (PoolVector<godot_real> *)p_self;
-	PoolVector<godot_real> *array = (PoolVector<godot_real> *)p_array;
-	self->append_array(*array);
-}
-
-godot_error GDAPI godot_pool_real_array_insert(godot_pool_real_array *p_self, const godot_int p_idx, const godot_real p_data) {
-	PoolVector<godot_real> *self = (PoolVector<godot_real> *)p_self;
-	return (godot_error)self->insert(p_idx, p_data);
-}
-
-void GDAPI godot_pool_real_array_invert(godot_pool_real_array *p_self) {
-	PoolVector<godot_real> *self = (PoolVector<godot_real> *)p_self;
-	self->invert();
-}
-
-void GDAPI godot_pool_real_array_push_back(godot_pool_real_array *p_self, const godot_real p_data) {
-	PoolVector<godot_real> *self = (PoolVector<godot_real> *)p_self;
-	self->push_back(p_data);
-}
-
-void GDAPI godot_pool_real_array_remove(godot_pool_real_array *p_self, const godot_int p_idx) {
-	PoolVector<godot_real> *self = (PoolVector<godot_real> *)p_self;
-	self->remove(p_idx);
-}
-
-void GDAPI godot_pool_real_array_resize(godot_pool_real_array *p_self, const godot_int p_size) {
-	PoolVector<godot_real> *self = (PoolVector<godot_real> *)p_self;
-	self->resize(p_size);
-}
-
-godot_pool_real_array_read_access GDAPI *godot_pool_real_array_read(const godot_pool_real_array *p_self) {
-	const PoolVector<godot_real> *self = (const PoolVector<godot_real> *)p_self;
-	return (godot_pool_real_array_read_access *)memnew(PoolVector<godot_real>::Read(self->read()));
-}
-
-godot_pool_int_array_write_access GDAPI *godot_pool_real_array_write(godot_pool_real_array *p_self) {
-	PoolVector<godot_real> *self = (PoolVector<godot_real> *)p_self;
-	return (godot_pool_real_array_write_access *)memnew(PoolVector<godot_real>::Write(self->write()));
-}
-
-void GDAPI godot_pool_real_array_set(godot_pool_real_array *p_self, const godot_int p_idx, const godot_real p_data) {
-	PoolVector<godot_real> *self = (PoolVector<godot_real> *)p_self;
-	self->set(p_idx, p_data);
-}
-
-godot_real GDAPI godot_pool_real_array_get(const godot_pool_real_array *p_self, const godot_int p_idx) {
-	const PoolVector<godot_real> *self = (const PoolVector<godot_real> *)p_self;
-	return self->get(p_idx);
-}
-
-godot_int GDAPI godot_pool_real_array_size(const godot_pool_real_array *p_self) {
-	const PoolVector<godot_real> *self = (const PoolVector<godot_real> *)p_self;
-	return self->size();
-}
-
-godot_bool GDAPI godot_pool_real_array_empty(const godot_pool_real_array *p_self) {
-	const PoolVector<godot_real> *self = (const PoolVector<godot_real> *)p_self;
-	return self->empty();
-}
-
-void GDAPI godot_pool_real_array_destroy(godot_pool_real_array *p_self) {
-	((PoolVector<godot_real> *)p_self)->~PoolVector();
-}
-
-// string
-
-void GDAPI godot_pool_string_array_new(godot_pool_string_array *r_dest) {
-	PoolVector<String> *dest = (PoolVector<String> *)r_dest;
-	memnew_placement(dest, PoolVector<String>);
-}
-
-void GDAPI godot_pool_string_array_new_copy(godot_pool_string_array *r_dest, const godot_pool_string_array *p_src) {
-	PoolVector<String> *dest = (PoolVector<String> *)r_dest;
-	const PoolVector<String> *src = (const PoolVector<String> *)p_src;
-	memnew_placement(dest, PoolVector<String>(*src));
-}
-
-void GDAPI godot_pool_string_array_new_with_array(godot_pool_string_array *r_dest, const godot_array *p_a) {
-	PoolVector<String> *dest = (PoolVector<String> *)r_dest;
-	Array *a = (Array *)p_a;
-	memnew_placement(dest, PoolVector<String>);
-
-	dest->resize(a->size());
-	for (int i = 0; i < a->size(); i++) {
-		dest->set(i, (*a)[i]);
-	}
-}
-
-void GDAPI godot_pool_string_array_append(godot_pool_string_array *p_self, const godot_string *p_data) {
-	PoolVector<String> *self = (PoolVector<String> *)p_self;
-	String &s = *(String *)p_data;
-	self->append(s);
-}
-
-void GDAPI godot_pool_string_array_append_array(godot_pool_string_array *p_self, const godot_pool_string_array *p_array) {
-	PoolVector<String> *self = (PoolVector<String> *)p_self;
-	PoolVector<String> *array = (PoolVector<String> *)p_array;
-	self->append_array(*array);
-}
-
-godot_error GDAPI godot_pool_string_array_insert(godot_pool_string_array *p_self, const godot_int p_idx, const godot_string *p_data) {
-	PoolVector<String> *self = (PoolVector<String> *)p_self;
-	String &s = *(String *)p_data;
-	return (godot_error)self->insert(p_idx, s);
-}
-
-void GDAPI godot_pool_string_array_invert(godot_pool_string_array *p_self) {
-	PoolVector<String> *self = (PoolVector<String> *)p_self;
-	self->invert();
-}
-
-void GDAPI godot_pool_string_array_push_back(godot_pool_string_array *p_self, const godot_string *p_data) {
-	PoolVector<String> *self = (PoolVector<String> *)p_self;
-	String &s = *(String *)p_data;
-	self->push_back(s);
-}
-
-void GDAPI godot_pool_string_array_remove(godot_pool_string_array *p_self, const godot_int p_idx) {
-	PoolVector<String> *self = (PoolVector<String> *)p_self;
-	self->remove(p_idx);
-}
-
-void GDAPI godot_pool_string_array_resize(godot_pool_string_array *p_self, const godot_int p_size) {
-	PoolVector<String> *self = (PoolVector<String> *)p_self;
-	self->resize(p_size);
-}
-
-godot_pool_string_array_read_access GDAPI *godot_pool_string_array_read(const godot_pool_string_array *p_self) {
-	const PoolVector<String> *self = (const PoolVector<String> *)p_self;
-	return (godot_pool_string_array_read_access *)memnew(PoolVector<String>::Read(self->read()));
-}
-
-godot_pool_string_array_write_access GDAPI *godot_pool_string_array_write(godot_pool_string_array *p_self) {
-	PoolVector<String> *self = (PoolVector<String> *)p_self;
-	return (godot_pool_string_array_write_access *)memnew(PoolVector<String>::Write(self->write()));
-}
-
-void GDAPI godot_pool_string_array_set(godot_pool_string_array *p_self, const godot_int p_idx, const godot_string *p_data) {
-	PoolVector<String> *self = (PoolVector<String> *)p_self;
-	String &s = *(String *)p_data;
-	self->set(p_idx, s);
-}
-
-godot_string GDAPI godot_pool_string_array_get(const godot_pool_string_array *p_self, const godot_int p_idx) {
-	const PoolVector<String> *self = (const PoolVector<String> *)p_self;
-	godot_string str;
-	String *s = (String *)&str;
-	memnew_placement(s, String);
-	*s = self->get(p_idx);
-	return str;
-}
-
-godot_int GDAPI godot_pool_string_array_size(const godot_pool_string_array *p_self) {
-	const PoolVector<String> *self = (const PoolVector<String> *)p_self;
-	return self->size();
-}
-
-godot_bool GDAPI godot_pool_string_array_empty(const godot_pool_string_array *p_self) {
-	const PoolVector<String> *self = (const PoolVector<String> *)p_self;
-	return self->empty();
-}
-
-void GDAPI godot_pool_string_array_destroy(godot_pool_string_array *p_self) {
-	((PoolVector<String> *)p_self)->~PoolVector();
-}
-
-// vector2
-
-void GDAPI godot_pool_vector2_array_new(godot_pool_vector2_array *r_dest) {
-	PoolVector<Vector2> *dest = (PoolVector<Vector2> *)r_dest;
-	memnew_placement(dest, PoolVector<Vector2>);
-}
-
-void GDAPI godot_pool_vector2_array_new_copy(godot_pool_vector2_array *r_dest, const godot_pool_vector2_array *p_src) {
-	PoolVector<Vector2> *dest = (PoolVector<Vector2> *)r_dest;
-	const PoolVector<Vector2> *src = (const PoolVector<Vector2> *)p_src;
-	memnew_placement(dest, PoolVector<Vector2>(*src));
-}
-
-void GDAPI godot_pool_vector2_array_new_with_array(godot_pool_vector2_array *r_dest, const godot_array *p_a) {
-	PoolVector<Vector2> *dest = (PoolVector<Vector2> *)r_dest;
-	Array *a = (Array *)p_a;
-	memnew_placement(dest, PoolVector<Vector2>);
-
-	dest->resize(a->size());
-	for (int i = 0; i < a->size(); i++) {
-		dest->set(i, (*a)[i]);
-	}
-}
-
-void GDAPI godot_pool_vector2_array_append(godot_pool_vector2_array *p_self, const godot_vector2 *p_data) {
-	PoolVector<Vector2> *self = (PoolVector<Vector2> *)p_self;
-	Vector2 &s = *(Vector2 *)p_data;
-	self->append(s);
-}
-
-void GDAPI godot_pool_vector2_array_append_array(godot_pool_vector2_array *p_self, const godot_pool_vector2_array *p_array) {
-	PoolVector<Vector2> *self = (PoolVector<Vector2> *)p_self;
-	PoolVector<Vector2> *array = (PoolVector<Vector2> *)p_array;
-	self->append_array(*array);
-}
-
-godot_error GDAPI godot_pool_vector2_array_insert(godot_pool_vector2_array *p_self, const godot_int p_idx, const godot_vector2 *p_data) {
-	PoolVector<Vector2> *self = (PoolVector<Vector2> *)p_self;
-	Vector2 &s = *(Vector2 *)p_data;
-	return (godot_error)self->insert(p_idx, s);
-}
-
-void GDAPI godot_pool_vector2_array_invert(godot_pool_vector2_array *p_self) {
-	PoolVector<Vector2> *self = (PoolVector<Vector2> *)p_self;
-	self->invert();
-}
-
-void GDAPI godot_pool_vector2_array_push_back(godot_pool_vector2_array *p_self, const godot_vector2 *p_data) {
-	PoolVector<Vector2> *self = (PoolVector<Vector2> *)p_self;
-	Vector2 &s = *(Vector2 *)p_data;
-	self->push_back(s);
-}
-
-void GDAPI godot_pool_vector2_array_remove(godot_pool_vector2_array *p_self, const godot_int p_idx) {
-	PoolVector<Vector2> *self = (PoolVector<Vector2> *)p_self;
-	self->remove(p_idx);
-}
-
-void GDAPI godot_pool_vector2_array_resize(godot_pool_vector2_array *p_self, const godot_int p_size) {
-	PoolVector<Vector2> *self = (PoolVector<Vector2> *)p_self;
-	self->resize(p_size);
-}
-
-godot_pool_vector2_array_read_access GDAPI *godot_pool_vector2_array_read(const godot_pool_vector2_array *p_self) {
-	const PoolVector<Vector2> *self = (const PoolVector<Vector2> *)p_self;
-	return (godot_pool_vector2_array_read_access *)memnew(PoolVector<Vector2>::Read(self->read()));
-}
-
-godot_pool_vector2_array_write_access GDAPI *godot_pool_vector2_array_write(godot_pool_vector2_array *p_self) {
-	PoolVector<Vector2> *self = (PoolVector<Vector2> *)p_self;
-	return (godot_pool_vector2_array_write_access *)memnew(PoolVector<Vector2>::Write(self->write()));
-}
-
-void GDAPI godot_pool_vector2_array_set(godot_pool_vector2_array *p_self, const godot_int p_idx, const godot_vector2 *p_data) {
-	PoolVector<Vector2> *self = (PoolVector<Vector2> *)p_self;
-	Vector2 &s = *(Vector2 *)p_data;
-	self->set(p_idx, s);
-}
-
-godot_vector2 GDAPI godot_pool_vector2_array_get(const godot_pool_vector2_array *p_self, const godot_int p_idx) {
-	const PoolVector<Vector2> *self = (const PoolVector<Vector2> *)p_self;
-	godot_vector2 v;
-	Vector2 *s = (Vector2 *)&v;
-	*s = self->get(p_idx);
-	return v;
-}
-
-godot_int GDAPI godot_pool_vector2_array_size(const godot_pool_vector2_array *p_self) {
-	const PoolVector<Vector2> *self = (const PoolVector<Vector2> *)p_self;
-	return self->size();
-}
-
-godot_bool GDAPI godot_pool_vector2_array_empty(const godot_pool_vector2_array *p_self) {
-	const PoolVector<Vector2> *self = (const PoolVector<Vector2> *)p_self;
-	return self->empty();
-}
-
-void GDAPI godot_pool_vector2_array_destroy(godot_pool_vector2_array *p_self) {
-	((PoolVector<Vector2> *)p_self)->~PoolVector();
-}
-
-// vector3
-
-void GDAPI godot_pool_vector3_array_new(godot_pool_vector3_array *r_dest) {
-	PoolVector<Vector3> *dest = (PoolVector<Vector3> *)r_dest;
-	memnew_placement(dest, PoolVector<Vector3>);
-}
-
-void GDAPI godot_pool_vector3_array_new_copy(godot_pool_vector3_array *r_dest, const godot_pool_vector3_array *p_src) {
-	PoolVector<Vector3> *dest = (PoolVector<Vector3> *)r_dest;
-	const PoolVector<Vector3> *src = (const PoolVector<Vector3> *)p_src;
-	memnew_placement(dest, PoolVector<Vector3>(*src));
-}
-
-void GDAPI godot_pool_vector3_array_new_with_array(godot_pool_vector3_array *r_dest, const godot_array *p_a) {
-	PoolVector<Vector3> *dest = (PoolVector<Vector3> *)r_dest;
-	Array *a = (Array *)p_a;
-	memnew_placement(dest, PoolVector<Vector3>);
-
-	dest->resize(a->size());
-	for (int i = 0; i < a->size(); i++) {
-		dest->set(i, (*a)[i]);
-	}
-}
-
-void GDAPI godot_pool_vector3_array_append(godot_pool_vector3_array *p_self, const godot_vector3 *p_data) {
-	PoolVector<Vector3> *self = (PoolVector<Vector3> *)p_self;
-	Vector3 &s = *(Vector3 *)p_data;
-	self->append(s);
-}
-
-void GDAPI godot_pool_vector3_array_append_array(godot_pool_vector3_array *p_self, const godot_pool_vector3_array *p_array) {
-	PoolVector<Vector3> *self = (PoolVector<Vector3> *)p_self;
-	PoolVector<Vector3> *array = (PoolVector<Vector3> *)p_array;
-	self->append_array(*array);
-}
-
-godot_error GDAPI godot_pool_vector3_array_insert(godot_pool_vector3_array *p_self, const godot_int p_idx, const godot_vector3 *p_data) {
-	PoolVector<Vector3> *self = (PoolVector<Vector3> *)p_self;
-	Vector3 &s = *(Vector3 *)p_data;
-	return (godot_error)self->insert(p_idx, s);
-}
-
-void GDAPI godot_pool_vector3_array_invert(godot_pool_vector3_array *p_self) {
-	PoolVector<Vector3> *self = (PoolVector<Vector3> *)p_self;
-	self->invert();
-}
-
-void GDAPI godot_pool_vector3_array_push_back(godot_pool_vector3_array *p_self, const godot_vector3 *p_data) {
-	PoolVector<Vector3> *self = (PoolVector<Vector3> *)p_self;
-	Vector3 &s = *(Vector3 *)p_data;
-	self->push_back(s);
-}
-
-void GDAPI godot_pool_vector3_array_remove(godot_pool_vector3_array *p_self, const godot_int p_idx) {
-	PoolVector<Vector3> *self = (PoolVector<Vector3> *)p_self;
-	self->remove(p_idx);
-}
-
-void GDAPI godot_pool_vector3_array_resize(godot_pool_vector3_array *p_self, const godot_int p_size) {
-	PoolVector<Vector3> *self = (PoolVector<Vector3> *)p_self;
-	self->resize(p_size);
-}
-
-godot_pool_vector3_array_read_access GDAPI *godot_pool_vector3_array_read(const godot_pool_vector3_array *p_self) {
-	const PoolVector<Vector3> *self = (const PoolVector<Vector3> *)p_self;
-	return (godot_pool_vector3_array_read_access *)memnew(PoolVector<Vector3>::Read(self->read()));
-}
-
-godot_pool_vector3_array_write_access GDAPI *godot_pool_vector3_array_write(godot_pool_vector3_array *p_self) {
-	PoolVector<Vector3> *self = (PoolVector<Vector3> *)p_self;
-	return (godot_pool_vector3_array_write_access *)memnew(PoolVector<Vector3>::Write(self->write()));
-}
-
-void GDAPI godot_pool_vector3_array_set(godot_pool_vector3_array *p_self, const godot_int p_idx, const godot_vector3 *p_data) {
-	PoolVector<Vector3> *self = (PoolVector<Vector3> *)p_self;
-	Vector3 &s = *(Vector3 *)p_data;
-	self->set(p_idx, s);
-}
-
-godot_vector3 GDAPI godot_pool_vector3_array_get(const godot_pool_vector3_array *p_self, const godot_int p_idx) {
-	const PoolVector<Vector3> *self = (const PoolVector<Vector3> *)p_self;
-	godot_vector3 v;
-	Vector3 *s = (Vector3 *)&v;
-	*s = self->get(p_idx);
-	return v;
-}
-
-godot_int GDAPI godot_pool_vector3_array_size(const godot_pool_vector3_array *p_self) {
-	const PoolVector<Vector3> *self = (const PoolVector<Vector3> *)p_self;
-	return self->size();
-}
-
-godot_bool GDAPI godot_pool_vector3_array_empty(const godot_pool_vector3_array *p_self) {
-	const PoolVector<Vector3> *self = (const PoolVector<Vector3> *)p_self;
-	return self->empty();
-}
-
-void GDAPI godot_pool_vector3_array_destroy(godot_pool_vector3_array *p_self) {
-	((PoolVector<Vector3> *)p_self)->~PoolVector();
-}
-
-// color
-
-void GDAPI godot_pool_color_array_new(godot_pool_color_array *r_dest) {
-	PoolVector<Color> *dest = (PoolVector<Color> *)r_dest;
-	memnew_placement(dest, PoolVector<Color>);
-}
-
-void GDAPI godot_pool_color_array_new_copy(godot_pool_color_array *r_dest, const godot_pool_color_array *p_src) {
-	PoolVector<Color> *dest = (PoolVector<Color> *)r_dest;
-	const PoolVector<Color> *src = (const PoolVector<Color> *)p_src;
-	memnew_placement(dest, PoolVector<Color>(*src));
-}
-
-void GDAPI godot_pool_color_array_new_with_array(godot_pool_color_array *r_dest, const godot_array *p_a) {
-	PoolVector<Color> *dest = (PoolVector<Color> *)r_dest;
-	Array *a = (Array *)p_a;
-	memnew_placement(dest, PoolVector<Color>);
-
-	dest->resize(a->size());
-	for (int i = 0; i < a->size(); i++) {
-		dest->set(i, (*a)[i]);
-	}
-}
-
-void GDAPI godot_pool_color_array_append(godot_pool_color_array *p_self, const godot_color *p_data) {
-	PoolVector<Color> *self = (PoolVector<Color> *)p_self;
-	Color &s = *(Color *)p_data;
-	self->append(s);
-}
-
-void GDAPI godot_pool_color_array_append_array(godot_pool_color_array *p_self, const godot_pool_color_array *p_array) {
-	PoolVector<Color> *self = (PoolVector<Color> *)p_self;
-	PoolVector<Color> *array = (PoolVector<Color> *)p_array;
-	self->append_array(*array);
-}
-
-godot_error GDAPI godot_pool_color_array_insert(godot_pool_color_array *p_self, const godot_int p_idx, const godot_color *p_data) {
-	PoolVector<Color> *self = (PoolVector<Color> *)p_self;
-	Color &s = *(Color *)p_data;
-	return (godot_error)self->insert(p_idx, s);
-}
-
-void GDAPI godot_pool_color_array_invert(godot_pool_color_array *p_self) {
-	PoolVector<Color> *self = (PoolVector<Color> *)p_self;
-	self->invert();
-}
-
-void GDAPI godot_pool_color_array_push_back(godot_pool_color_array *p_self, const godot_color *p_data) {
-	PoolVector<Color> *self = (PoolVector<Color> *)p_self;
-	Color &s = *(Color *)p_data;
-	self->push_back(s);
-}
-
-void GDAPI godot_pool_color_array_remove(godot_pool_color_array *p_self, const godot_int p_idx) {
-	PoolVector<Color> *self = (PoolVector<Color> *)p_self;
-	self->remove(p_idx);
-}
-
-void GDAPI godot_pool_color_array_resize(godot_pool_color_array *p_self, const godot_int p_size) {
-	PoolVector<Color> *self = (PoolVector<Color> *)p_self;
-	self->resize(p_size);
-}
-
-godot_pool_color_array_read_access GDAPI *godot_pool_color_array_read(const godot_pool_color_array *p_self) {
-	const PoolVector<Color> *self = (const PoolVector<Color> *)p_self;
-	return (godot_pool_color_array_read_access *)memnew(PoolVector<Color>::Read(self->read()));
-}
-
-godot_pool_color_array_write_access GDAPI *godot_pool_color_array_write(godot_pool_color_array *p_self) {
-	PoolVector<Color> *self = (PoolVector<Color> *)p_self;
-	return (godot_pool_color_array_write_access *)memnew(PoolVector<Color>::Write(self->write()));
-}
-
-void GDAPI godot_pool_color_array_set(godot_pool_color_array *p_self, const godot_int p_idx, const godot_color *p_data) {
-	PoolVector<Color> *self = (PoolVector<Color> *)p_self;
-	Color &s = *(Color *)p_data;
-	self->set(p_idx, s);
-}
-
-godot_color GDAPI godot_pool_color_array_get(const godot_pool_color_array *p_self, const godot_int p_idx) {
-	const PoolVector<Color> *self = (const PoolVector<Color> *)p_self;
-	godot_color v;
-	Color *s = (Color *)&v;
-	*s = self->get(p_idx);
-	return v;
-}
-
-godot_int GDAPI godot_pool_color_array_size(const godot_pool_color_array *p_self) {
-	const PoolVector<Color> *self = (const PoolVector<Color> *)p_self;
-	return self->size();
-}
-
-godot_bool GDAPI godot_pool_color_array_empty(const godot_pool_color_array *p_self) {
-	const PoolVector<Color> *self = (const PoolVector<Color> *)p_self;
-	return self->empty();
-}
-
-void GDAPI godot_pool_color_array_destroy(godot_pool_color_array *p_self) {
-	((PoolVector<Color> *)p_self)->~PoolVector();
-}
-
-//
-// read accessor functions
-//
-
-godot_pool_byte_array_read_access GDAPI *godot_pool_byte_array_read_access_copy(const godot_pool_byte_array_read_access *p_other) {
-	PoolVector<uint8_t>::Read *other = (PoolVector<uint8_t>::Read *)p_other;
-	return (godot_pool_byte_array_read_access *)memnew(PoolVector<uint8_t>::Read(*other));
-}
-const uint8_t GDAPI *godot_pool_byte_array_read_access_ptr(const godot_pool_byte_array_read_access *p_read) {
-	const PoolVector<uint8_t>::Read *read = (const PoolVector<uint8_t>::Read *)p_read;
-	return read->ptr();
-}
-void GDAPI godot_pool_byte_array_read_access_operator_assign(godot_pool_byte_array_read_access *p_read, godot_pool_byte_array_read_access *p_other) {
-	PoolVector<uint8_t>::Read *read = (PoolVector<uint8_t>::Read *)p_read;
-	PoolVector<uint8_t>::Read *other = (PoolVector<uint8_t>::Read *)p_other;
-	read->operator=(*other);
-}
-void GDAPI godot_pool_byte_array_read_access_destroy(godot_pool_byte_array_read_access *p_read) {
-	memdelete((PoolVector<uint8_t>::Read *)p_read);
-}
-
-godot_pool_int_array_read_access GDAPI *godot_pool_int_array_read_access_copy(const godot_pool_int_array_read_access *p_other) {
-	PoolVector<godot_int>::Read *other = (PoolVector<godot_int>::Read *)p_other;
-	return (godot_pool_int_array_read_access *)memnew(PoolVector<godot_int>::Read(*other));
-}
-const godot_int GDAPI *godot_pool_int_array_read_access_ptr(const godot_pool_int_array_read_access *p_read) {
-	const PoolVector<godot_int>::Read *read = (const PoolVector<godot_int>::Read *)p_read;
-	return read->ptr();
-}
-void GDAPI godot_pool_int_array_read_access_operator_assign(godot_pool_int_array_read_access *p_read, godot_pool_int_array_read_access *p_other) {
-	PoolVector<godot_int>::Read *read = (PoolVector<godot_int>::Read *)p_read;
-	PoolVector<godot_int>::Read *other = (PoolVector<godot_int>::Read *)p_other;
-	read->operator=(*other);
-}
-void GDAPI godot_pool_int_array_read_access_destroy(godot_pool_int_array_read_access *p_read) {
-	memdelete((PoolVector<godot_int>::Read *)p_read);
-}
-
-godot_pool_real_array_read_access GDAPI *godot_pool_real_array_read_access_copy(const godot_pool_real_array_read_access *p_other) {
-	PoolVector<godot_real>::Read *other = (PoolVector<godot_real>::Read *)p_other;
-	return (godot_pool_real_array_read_access *)memnew(PoolVector<godot_real>::Read(*other));
-}
-const godot_real GDAPI *godot_pool_real_array_read_access_ptr(const godot_pool_real_array_read_access *p_read) {
-	const PoolVector<godot_real>::Read *read = (const PoolVector<godot_real>::Read *)p_read;
-	return read->ptr();
-}
-void GDAPI godot_pool_real_array_read_access_operator_assign(godot_pool_real_array_read_access *p_read, godot_pool_real_array_read_access *p_other) {
-	PoolVector<godot_real>::Read *read = (PoolVector<godot_real>::Read *)p_read;
-	PoolVector<godot_real>::Read *other = (PoolVector<godot_real>::Read *)p_other;
-	read->operator=(*other);
-}
-void GDAPI godot_pool_real_array_read_access_destroy(godot_pool_real_array_read_access *p_read) {
-	memdelete((PoolVector<godot_real>::Read *)p_read);
-}
-
-godot_pool_string_array_read_access GDAPI *godot_pool_string_array_read_access_copy(const godot_pool_string_array_read_access *p_other) {
-	PoolVector<String>::Read *other = (PoolVector<String>::Read *)p_other;
-	return (godot_pool_string_array_read_access *)memnew(PoolVector<String>::Read(*other));
-}
-const godot_string GDAPI *godot_pool_string_array_read_access_ptr(const godot_pool_string_array_read_access *p_read) {
-	const PoolVector<String>::Read *read = (const PoolVector<String>::Read *)p_read;
-	return (const godot_string *)read->ptr();
-}
-void GDAPI godot_pool_string_array_read_access_operator_assign(godot_pool_string_array_read_access *p_read, godot_pool_string_array_read_access *p_other) {
-	PoolVector<String>::Read *read = (PoolVector<String>::Read *)p_read;
-	PoolVector<String>::Read *other = (PoolVector<String>::Read *)p_other;
-	read->operator=(*other);
-}
-void GDAPI godot_pool_string_array_read_access_destroy(godot_pool_string_array_read_access *p_read) {
-	memdelete((PoolVector<String>::Read *)p_read);
-}
-
-godot_pool_vector2_array_read_access GDAPI *godot_pool_vector2_array_read_access_copy(const godot_pool_vector2_array_read_access *p_other) {
-	PoolVector<Vector2>::Read *other = (PoolVector<Vector2>::Read *)p_other;
-	return (godot_pool_vector2_array_read_access *)memnew(PoolVector<Vector2>::Read(*other));
-}
-const godot_vector2 GDAPI *godot_pool_vector2_array_read_access_ptr(const godot_pool_vector2_array_read_access *p_read) {
-	const PoolVector<Vector2>::Read *read = (const PoolVector<Vector2>::Read *)p_read;
-	return (const godot_vector2 *)read->ptr();
-}
-void GDAPI godot_pool_vector2_array_read_access_operator_assign(godot_pool_vector2_array_read_access *p_read, godot_pool_vector2_array_read_access *p_other) {
-	PoolVector<Vector2>::Read *read = (PoolVector<Vector2>::Read *)p_read;
-	PoolVector<Vector2>::Read *other = (PoolVector<Vector2>::Read *)p_other;
-	read->operator=(*other);
-}
-void GDAPI godot_pool_vector2_array_read_access_destroy(godot_pool_vector2_array_read_access *p_read) {
-	memdelete((PoolVector<Vector2>::Read *)p_read);
-}
-
-godot_pool_vector3_array_read_access GDAPI *godot_pool_vector3_array_read_access_copy(const godot_pool_vector3_array_read_access *p_other) {
-	PoolVector<Vector3>::Read *other = (PoolVector<Vector3>::Read *)p_other;
-	return (godot_pool_vector3_array_read_access *)memnew(PoolVector<Vector3>::Read(*other));
-}
-const godot_vector3 GDAPI *godot_pool_vector3_array_read_access_ptr(const godot_pool_vector3_array_read_access *p_read) {
-	const PoolVector<Vector3>::Read *read = (const PoolVector<Vector3>::Read *)p_read;
-	return (const godot_vector3 *)read->ptr();
-}
-void GDAPI godot_pool_vector3_array_read_access_operator_assign(godot_pool_vector3_array_read_access *p_read, godot_pool_vector3_array_read_access *p_other) {
-	PoolVector<Vector3>::Read *read = (PoolVector<Vector3>::Read *)p_read;
-	PoolVector<Vector3>::Read *other = (PoolVector<Vector3>::Read *)p_other;
-	read->operator=(*other);
-}
-void GDAPI godot_pool_vector3_array_read_access_destroy(godot_pool_vector3_array_read_access *p_read) {
-	memdelete((PoolVector<Vector2>::Read *)p_read);
-}
-
-godot_pool_color_array_read_access GDAPI *godot_pool_color_array_read_access_copy(const godot_pool_color_array_read_access *p_other) {
-	PoolVector<Color>::Read *other = (PoolVector<Color>::Read *)p_other;
-	return (godot_pool_color_array_read_access *)memnew(PoolVector<Color>::Read(*other));
-}
-const godot_color GDAPI *godot_pool_color_array_read_access_ptr(const godot_pool_color_array_read_access *p_read) {
-	const PoolVector<Color>::Read *read = (const PoolVector<Color>::Read *)p_read;
-	return (const godot_color *)read->ptr();
-}
-void GDAPI godot_pool_color_array_read_access_operator_assign(godot_pool_color_array_read_access *p_read, godot_pool_color_array_read_access *p_other) {
-	PoolVector<Color>::Read *read = (PoolVector<Color>::Read *)p_read;
-	PoolVector<Color>::Read *other = (PoolVector<Color>::Read *)p_other;
-	read->operator=(*other);
-}
-void GDAPI godot_pool_color_array_read_access_destroy(godot_pool_color_array_read_access *p_read) {
-	memdelete((PoolVector<Color>::Read *)p_read);
-}
-
-//
-// write accessor functions
-//
-
-godot_pool_byte_array_write_access GDAPI *godot_pool_byte_array_write_access_copy(const godot_pool_byte_array_write_access *p_other) {
-	PoolVector<uint8_t>::Write *other = (PoolVector<uint8_t>::Write *)p_other;
-	return (godot_pool_byte_array_write_access *)memnew(PoolVector<uint8_t>::Write(*other));
-}
-uint8_t GDAPI *godot_pool_byte_array_write_access_ptr(const godot_pool_byte_array_write_access *p_write) {
-	PoolVector<uint8_t>::Write *write = (PoolVector<uint8_t>::Write *)p_write;
-	return write->ptr();
-}
-void GDAPI godot_pool_byte_array_write_access_operator_assign(godot_pool_byte_array_write_access *p_write, godot_pool_byte_array_write_access *p_other) {
-	PoolVector<uint8_t>::Write *write = (PoolVector<uint8_t>::Write *)p_write;
-	PoolVector<uint8_t>::Write *other = (PoolVector<uint8_t>::Write *)p_other;
-	write->operator=(*other);
-}
-void GDAPI godot_pool_byte_array_write_access_destroy(godot_pool_byte_array_write_access *p_write) {
-	memdelete((PoolVector<uint8_t>::Write *)p_write);
-}
-
-godot_pool_int_array_write_access GDAPI *godot_pool_int_array_write_access_copy(const godot_pool_int_array_write_access *p_other) {
-	PoolVector<godot_int>::Write *other = (PoolVector<godot_int>::Write *)p_other;
-	return (godot_pool_int_array_write_access *)memnew(PoolVector<godot_int>::Write(*other));
-}
-godot_int GDAPI *godot_pool_int_array_write_access_ptr(const godot_pool_int_array_write_access *p_write) {
-	PoolVector<godot_int>::Write *write = (PoolVector<godot_int>::Write *)p_write;
-	return write->ptr();
-}
-void GDAPI godot_pool_int_array_write_access_operator_assign(godot_pool_int_array_write_access *p_write, godot_pool_int_array_write_access *p_other) {
-	PoolVector<godot_int>::Write *write = (PoolVector<godot_int>::Write *)p_write;
-	PoolVector<godot_int>::Write *other = (PoolVector<godot_int>::Write *)p_other;
-	write->operator=(*other);
-}
-void GDAPI godot_pool_int_array_write_access_destroy(godot_pool_int_array_write_access *p_write) {
-	memdelete((PoolVector<godot_int>::Write *)p_write);
-}
-
-godot_pool_real_array_write_access GDAPI *godot_pool_real_array_write_access_copy(const godot_pool_real_array_write_access *p_other) {
-	PoolVector<godot_real>::Write *other = (PoolVector<godot_real>::Write *)p_other;
-	return (godot_pool_real_array_write_access *)memnew(PoolVector<godot_real>::Write(*other));
-}
-godot_real GDAPI *godot_pool_real_array_write_access_ptr(const godot_pool_real_array_write_access *p_write) {
-	PoolVector<godot_real>::Write *write = (PoolVector<godot_real>::Write *)p_write;
-	return write->ptr();
-}
-void GDAPI godot_pool_real_array_write_access_operator_assign(godot_pool_real_array_write_access *p_write, godot_pool_real_array_write_access *p_other) {
-	PoolVector<godot_real>::Write *write = (PoolVector<godot_real>::Write *)p_write;
-	PoolVector<godot_real>::Write *other = (PoolVector<godot_real>::Write *)p_other;
-	write->operator=(*other);
-}
-void GDAPI godot_pool_real_array_write_access_destroy(godot_pool_real_array_write_access *p_write) {
-	memdelete((PoolVector<godot_real>::Write *)p_write);
-}
-
-godot_pool_string_array_write_access GDAPI *godot_pool_string_array_write_access_copy(const godot_pool_string_array_write_access *p_other) {
-	PoolVector<String>::Write *other = (PoolVector<String>::Write *)p_other;
-	return (godot_pool_string_array_write_access *)memnew(PoolVector<String>::Write(*other));
-}
-godot_string GDAPI *godot_pool_string_array_write_access_ptr(const godot_pool_string_array_write_access *p_write) {
-	PoolVector<String>::Write *write = (PoolVector<String>::Write *)p_write;
-	return (godot_string *)write->ptr();
-}
-void GDAPI godot_pool_string_array_write_access_operator_assign(godot_pool_string_array_write_access *p_write, godot_pool_string_array_write_access *p_other) {
-	PoolVector<String>::Write *write = (PoolVector<String>::Write *)p_write;
-	PoolVector<String>::Write *other = (PoolVector<String>::Write *)p_other;
-	write->operator=(*other);
-}
-void GDAPI godot_pool_string_array_write_access_destroy(godot_pool_string_array_write_access *p_write) {
-	memdelete((PoolVector<String>::Write *)p_write);
-}
-
-godot_pool_vector2_array_write_access GDAPI *godot_pool_vector2_array_write_access_copy(const godot_pool_vector2_array_write_access *p_other) {
-	PoolVector<Vector2>::Write *other = (PoolVector<Vector2>::Write *)p_other;
-	return (godot_pool_vector2_array_write_access *)memnew(PoolVector<Vector2>::Write(*other));
-}
-godot_vector2 GDAPI *godot_pool_vector2_array_write_access_ptr(const godot_pool_vector2_array_write_access *p_write) {
-	PoolVector<Vector2>::Write *write = (PoolVector<Vector2>::Write *)p_write;
-	return (godot_vector2 *)write->ptr();
-}
-void GDAPI godot_pool_vector2_array_write_access_operator_assign(godot_pool_vector2_array_write_access *p_write, godot_pool_vector2_array_write_access *p_other) {
-	PoolVector<Vector2>::Write *write = (PoolVector<Vector2>::Write *)p_write;
-	PoolVector<Vector2>::Write *other = (PoolVector<Vector2>::Write *)p_other;
-	write->operator=(*other);
-}
-void GDAPI godot_pool_vector2_array_write_access_destroy(godot_pool_vector2_array_write_access *p_write) {
-	memdelete((PoolVector<Vector2>::Write *)p_write);
-}
-
-godot_pool_vector3_array_write_access GDAPI *godot_pool_vector3_array_write_access_copy(const godot_pool_vector3_array_write_access *p_other) {
-	PoolVector<Vector3>::Write *other = (PoolVector<Vector3>::Write *)p_other;
-	return (godot_pool_vector3_array_write_access *)memnew(PoolVector<Vector3>::Write(*other));
-}
-godot_vector3 GDAPI *godot_pool_vector3_array_write_access_ptr(const godot_pool_vector3_array_write_access *p_write) {
-	PoolVector<Vector3>::Write *write = (PoolVector<Vector3>::Write *)p_write;
-	return (godot_vector3 *)write->ptr();
-}
-void GDAPI godot_pool_vector3_array_write_access_operator_assign(godot_pool_vector3_array_write_access *p_write, godot_pool_vector3_array_write_access *p_other) {
-	PoolVector<Vector3>::Write *write = (PoolVector<Vector3>::Write *)p_write;
-	PoolVector<Vector3>::Write *other = (PoolVector<Vector3>::Write *)p_other;
-	write->operator=(*other);
-}
-void GDAPI godot_pool_vector3_array_write_access_destroy(godot_pool_vector3_array_write_access *p_write) {
-	memdelete((PoolVector<Vector3>::Write *)p_write);
-}
-
-godot_pool_color_array_write_access GDAPI *godot_pool_color_array_write_access_copy(const godot_pool_color_array_write_access *p_other) {
-	PoolVector<Color>::Write *other = (PoolVector<Color>::Write *)p_other;
-	return (godot_pool_color_array_write_access *)memnew(PoolVector<Color>::Write(*other));
-}
-godot_color GDAPI *godot_pool_color_array_write_access_ptr(const godot_pool_color_array_write_access *p_write) {
-	PoolVector<Color>::Write *write = (PoolVector<Color>::Write *)p_write;
-	return (godot_color *)write->ptr();
-}
-void GDAPI godot_pool_color_array_write_access_operator_assign(godot_pool_color_array_write_access *p_write, godot_pool_color_array_write_access *p_other) {
-	PoolVector<Color>::Write *write = (PoolVector<Color>::Write *)p_write;
-	PoolVector<Color>::Write *other = (PoolVector<Color>::Write *)p_other;
-	write->operator=(*other);
-}
-void GDAPI godot_pool_color_array_write_access_destroy(godot_pool_color_array_write_access *p_write) {
-	memdelete((PoolVector<Color>::Write *)p_write);
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/modules/gdnative/gdnative/quat.cpp b/modules/gdnative/gdnative/quat.cpp
index be30b89e5f..de6308ad2a 100644
--- a/modules/gdnative/gdnative/quat.cpp
+++ b/modules/gdnative/gdnative/quat.cpp
@@ -37,8 +37,9 @@
 extern "C" {
 #endif
 
-void GDAPI godot_quat_new(godot_quat *r_dest, const godot_real p_x, const godot_real p_y, const godot_real p_z, const godot_real p_w) {
+static_assert(sizeof(godot_quat) == sizeof(Quat), "Quat size mismatch");
 
+void GDAPI godot_quat_new(godot_quat *r_dest, const godot_real p_x, const godot_real p_y, const godot_real p_z, const godot_real p_w) {
 	Quat *dest = (Quat *)r_dest;
 	*dest = Quat(p_x, p_y, p_z, p_w);
 }
diff --git a/modules/gdnative/gdnative/rect2.cpp b/modules/gdnative/gdnative/rect2.cpp
index 906b4f0932..516f4d75ce 100644
--- a/modules/gdnative/gdnative/rect2.cpp
+++ b/modules/gdnative/gdnative/rect2.cpp
@@ -37,6 +37,11 @@
 extern "C" {
 #endif
 
+static_assert(sizeof(godot_rect2) == sizeof(Rect2), "Rect2 size mismatch");
+static_assert(sizeof(godot_rect2i) == sizeof(Rect2i), "Rect2i size mismatch");
+
+// Rect2
+
 void GDAPI godot_rect2_new_with_position_and_size(godot_rect2 *r_dest, const godot_vector2 *p_pos, const godot_vector2 *p_size) {
 	const Vector2 *position = (const Vector2 *)p_pos;
 	const Vector2 *size = (const Vector2 *)p_size;
@@ -45,7 +50,6 @@ void GDAPI godot_rect2_new_with_position_and_size(godot_rect2 *r_dest, const god
 }
 
 void GDAPI godot_rect2_new(godot_rect2 *r_dest, const godot_real p_x, const godot_real p_y, const godot_real p_width, const godot_real p_height) {
-
 	Rect2 *dest = (Rect2 *)r_dest;
 	*dest = Rect2(p_x, p_y, p_width, p_height);
 }
@@ -57,6 +61,13 @@ godot_string GDAPI godot_rect2_as_string(const godot_rect2 *p_self) {
 	return ret;
 }
 
+godot_rect2i GDAPI godot_rect2_as_rect2i(const godot_rect2 *p_self) {
+	godot_rect2i dest;
+	const Rect2 *self = (const Rect2 *)p_self;
+	*((Rect2i *)&dest) = Rect2i(*self);
+	return dest;
+}
+
 godot_real GDAPI godot_rect2_get_area(const godot_rect2 *p_self) {
 	const Rect2 *self = (const Rect2 *)p_self;
 	return self->get_area();
@@ -172,6 +183,149 @@ void GDAPI godot_rect2_set_size(godot_rect2 *p_self, const godot_vector2 *p_size
 	self->set_size(*size);
 }
 
+// Rect2i
+
+void GDAPI godot_rect2i_new_with_position_and_size(godot_rect2i *r_dest, const godot_vector2i *p_pos, const godot_vector2i *p_size) {
+	const Vector2i *position = (const Vector2i *)p_pos;
+	const Vector2i *size = (const Vector2i *)p_size;
+	Rect2i *dest = (Rect2i *)r_dest;
+	*dest = Rect2i(*position, *size);
+}
+
+void GDAPI godot_rect2i_new(godot_rect2i *r_dest, const godot_int p_x, const godot_int p_y, const godot_int p_width, const godot_int p_height) {
+	Rect2i *dest = (Rect2i *)r_dest;
+	*dest = Rect2i(p_x, p_y, p_width, p_height);
+}
+
+godot_string GDAPI godot_rect2i_as_string(const godot_rect2i *p_self) {
+	godot_string ret;
+	const Rect2i *self = (const Rect2i *)p_self;
+	memnew_placement(&ret, String(*self));
+	return ret;
+}
+
+godot_rect2 GDAPI godot_rect2i_as_rect2(const godot_rect2i *p_self) {
+	godot_rect2 dest;
+	const Rect2i *self = (const Rect2i *)p_self;
+	*((Rect2 *)&dest) = Rect2(*self);
+	return dest;
+}
+
+godot_int GDAPI godot_rect2i_get_area(const godot_rect2i *p_self) {
+	const Rect2i *self = (const Rect2i *)p_self;
+	return self->get_area();
+}
+
+godot_bool GDAPI godot_rect2i_intersects(const godot_rect2i *p_self, const godot_rect2i *p_b) {
+	const Rect2i *self = (const Rect2i *)p_self;
+	const Rect2i *b = (const Rect2i *)p_b;
+	return self->intersects(*b);
+}
+
+godot_bool GDAPI godot_rect2i_encloses(const godot_rect2i *p_self, const godot_rect2i *p_b) {
+	const Rect2i *self = (const Rect2i *)p_self;
+	const Rect2i *b = (const Rect2i *)p_b;
+	return self->encloses(*b);
+}
+
+godot_bool GDAPI godot_rect2i_has_no_area(const godot_rect2i *p_self) {
+	const Rect2i *self = (const Rect2i *)p_self;
+	return self->has_no_area();
+}
+
+godot_rect2i GDAPI godot_rect2i_clip(const godot_rect2i *p_self, const godot_rect2i *p_b) {
+	godot_rect2i dest;
+	const Rect2i *self = (const Rect2i *)p_self;
+	const Rect2i *b = (const Rect2i *)p_b;
+	*((Rect2i *)&dest) = self->clip(*b);
+	return dest;
+}
+
+godot_rect2i GDAPI godot_rect2i_merge(const godot_rect2i *p_self, const godot_rect2i *p_b) {
+	godot_rect2i dest;
+	const Rect2i *self = (const Rect2i *)p_self;
+	const Rect2i *b = (const Rect2i *)p_b;
+	*((Rect2i *)&dest) = self->merge(*b);
+	return dest;
+}
+
+godot_bool GDAPI godot_rect2i_has_point(const godot_rect2i *p_self, const godot_vector2i *p_point) {
+	const Rect2i *self = (const Rect2i *)p_self;
+	const Vector2i *point = (const Vector2i *)p_point;
+	return self->has_point(*point);
+}
+
+godot_rect2i GDAPI godot_rect2i_grow(const godot_rect2i *p_self, const godot_int p_by) {
+	godot_rect2i dest;
+	const Rect2i *self = (const Rect2i *)p_self;
+
+	*((Rect2i *)&dest) = self->grow(p_by);
+	return dest;
+}
+
+godot_rect2i GDAPI godot_rect2i_grow_individual(const godot_rect2i *p_self, const godot_int p_left, const godot_int p_top, const godot_int p_right, const godot_int p_bottom) {
+	godot_rect2i dest;
+	const Rect2i *self = (const Rect2i *)p_self;
+	*((Rect2i *)&dest) = self->grow_individual(p_left, p_top, p_right, p_bottom);
+	return dest;
+}
+
+godot_rect2i GDAPI godot_rect2i_grow_margin(const godot_rect2i *p_self, const godot_int p_margin, const godot_int p_by) {
+	godot_rect2i dest;
+	const Rect2i *self = (const Rect2i *)p_self;
+	*((Rect2i *)&dest) = self->grow_margin((Margin)p_margin, p_by);
+	return dest;
+}
+
+godot_rect2i GDAPI godot_rect2i_abs(const godot_rect2i *p_self) {
+	godot_rect2i dest;
+	const Rect2i *self = (const Rect2i *)p_self;
+	*((Rect2i *)&dest) = self->abs();
+	return dest;
+}
+
+godot_rect2i GDAPI godot_rect2i_expand(const godot_rect2i *p_self, const godot_vector2i *p_to) {
+	godot_rect2i dest;
+	const Rect2i *self = (const Rect2i *)p_self;
+	const Vector2i *to = (const Vector2i *)p_to;
+	*((Rect2i *)&dest) = self->expand(*to);
+	return dest;
+}
+
+godot_bool GDAPI godot_rect2i_operator_equal(const godot_rect2i *p_self, const godot_rect2i *p_b) {
+	const Rect2i *self = (const Rect2i *)p_self;
+	const Rect2i *b = (const Rect2i *)p_b;
+	return *self == *b;
+}
+
+godot_vector2i GDAPI godot_rect2i_get_position(const godot_rect2i *p_self) {
+	godot_vector2i dest;
+	Vector2i *d = (Vector2i *)&dest;
+	const Rect2i *self = (const Rect2i *)p_self;
+	*d = self->get_position();
+	return dest;
+}
+
+godot_vector2i GDAPI godot_rect2i_get_size(const godot_rect2i *p_self) {
+	godot_vector2i dest;
+	Vector2i *d = (Vector2i *)&dest;
+	const Rect2i *self = (const Rect2i *)p_self;
+	*d = self->get_size();
+	return dest;
+}
+
+void GDAPI godot_rect2i_set_position(godot_rect2i *p_self, const godot_vector2i *p_pos) {
+	Rect2i *self = (Rect2i *)p_self;
+	const Vector2i *position = (const Vector2i *)p_pos;
+	self->set_position(*position);
+}
+
+void GDAPI godot_rect2i_set_size(godot_rect2i *p_self, const godot_vector2i *p_size) {
+	Rect2i *self = (Rect2i *)p_self;
+	const Vector2i *size = (const Vector2i *)p_size;
+	self->set_size(*size);
+}
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/modules/gdnative/gdnative/rid.cpp b/modules/gdnative/gdnative/rid.cpp
index 7ea80123a3..d7a63f33a7 100644
--- a/modules/gdnative/gdnative/rid.cpp
+++ b/modules/gdnative/gdnative/rid.cpp
@@ -38,6 +38,8 @@
 extern "C" {
 #endif
 
+static_assert(sizeof(godot_rid) == sizeof(RID), "RID size mismatch");
+
 void GDAPI godot_rid_new(godot_rid *r_dest) {
 	RID *dest = (RID *)r_dest;
 	memnew_placement(dest, RID);
diff --git a/modules/gdnative/gdnative/string.cpp b/modules/gdnative/gdnative/string.cpp
index 414b9b9eaf..1fa19f4ff5 100644
--- a/modules/gdnative/gdnative/string.cpp
+++ b/modules/gdnative/gdnative/string.cpp
@@ -40,6 +40,11 @@
 extern "C" {
 #endif
 
+static_assert(sizeof(godot_char16_string) == sizeof(Char16String), "Char16String size mismatch");
+static_assert(sizeof(godot_char_string) == sizeof(CharString), "CharString size mismatch");
+static_assert(sizeof(godot_string) == sizeof(String), "String size mismatch");
+static_assert(sizeof(godot_char_type) == sizeof(char32_t), "char32_t size mismatch");
+
 godot_int GDAPI godot_char_string_length(const godot_char_string *p_cs) {
 	const CharString *cs = (const CharString *)p_cs;
 
@@ -58,6 +63,24 @@ void GDAPI godot_char_string_destroy(godot_char_string *p_cs) {
 	cs->~CharString();
 }
 
+godot_int GDAPI godot_char16_string_length(const godot_char16_string *p_cs) {
+	const Char16String *cs = (const Char16String *)p_cs;
+
+	return cs->length();
+}
+
+const char16_t GDAPI *godot_char16_string_get_data(const godot_char16_string *p_cs) {
+	const Char16String *cs = (const Char16String *)p_cs;
+
+	return cs->get_data();
+}
+
+void GDAPI godot_char16_string_destroy(godot_char16_string *p_cs) {
+	Char16String *cs = (Char16String *)p_cs;
+
+	cs->~Char16String();
+}
+
 void GDAPI godot_string_new(godot_string *r_dest) {
 	String *dest = (String *)r_dest;
 	memnew_placement(dest, String);
@@ -66,27 +89,97 @@ void GDAPI godot_string_new(godot_string *r_dest) {
 void GDAPI godot_string_new_copy(godot_string *r_dest, const godot_string *p_src) {
 	String *dest = (String *)r_dest;
 	const String *src = (const String *)p_src;
-	memnew_placement(dest, String(*src));
+	memnew_placement(dest, String);
+	*dest = String(*src);
+}
+
+void GDAPI godot_string_new_with_latin1_chars(godot_string *r_dest, const char *p_contents) {
+	String *dest = (String *)r_dest;
+	memnew_placement(dest, String);
+	*dest = String(p_contents);
+}
+
+void GDAPI godot_string_new_with_utf8_chars(godot_string *r_dest, const char *p_contents) {
+	String *dest = (String *)r_dest;
+	memnew_placement(dest, String);
+	dest->parse_utf8(p_contents);
+}
+
+void GDAPI godot_string_new_with_utf16_chars(godot_string *r_dest, const char16_t *p_contents) {
+	String *dest = (String *)r_dest;
+	memnew_placement(dest, String);
+	dest->parse_utf16(p_contents);
+}
+
+void GDAPI godot_string_new_with_utf32_chars(godot_string *r_dest, const char32_t *p_contents) {
+	String *dest = (String *)r_dest;
+	memnew_placement(dest, String);
+	*dest = String((const char32_t *)p_contents);
+}
+
+void GDAPI godot_string_new_with_wide_chars(godot_string *r_dest, const wchar_t *p_contents) {
+	String *dest = (String *)r_dest;
+	if (sizeof(wchar_t) == 2) {
+		// wchar_t is 16 bit, parse.
+		memnew_placement(dest, String);
+		dest->parse_utf16((const char16_t *)p_contents);
+	} else {
+		// wchar_t is 32 bit, copy.
+		memnew_placement(dest, String);
+		*dest = String((const char32_t *)p_contents);
+	}
+}
+
+void GDAPI godot_string_new_with_latin1_chars_and_len(godot_string *r_dest, const char *p_contents, const int p_size) {
+	String *dest = (String *)r_dest;
+	memnew_placement(dest, String);
+	*dest = String(p_contents, p_size);
+}
+
+void GDAPI godot_string_new_with_utf8_chars_and_len(godot_string *r_dest, const char *p_contents, const int p_size) {
+	String *dest = (String *)r_dest;
+	memnew_placement(dest, String);
+	dest->parse_utf8(p_contents, p_size);
+}
+
+void GDAPI godot_string_new_with_utf16_chars_and_len(godot_string *r_dest, const char16_t *p_contents, const int p_size) {
+	String *dest = (String *)r_dest;
+	memnew_placement(dest, String);
+	dest->parse_utf16(p_contents, p_size);
 }
 
-void GDAPI godot_string_new_with_wide_string(godot_string *r_dest, const wchar_t *p_contents, const int p_size) {
+void GDAPI godot_string_new_with_utf32_chars_and_len(godot_string *r_dest, const char32_t *p_contents, const int p_size) {
 	String *dest = (String *)r_dest;
-	memnew_placement(dest, String(p_contents, p_size));
+	memnew_placement(dest, String);
+	*dest = String((const char32_t *)p_contents, p_size);
+}
+
+void GDAPI godot_string_new_with_wide_chars_and_len(godot_string *r_dest, const wchar_t *p_contents, const int p_size) {
+	String *dest = (String *)r_dest;
+	if (sizeof(wchar_t) == 2) {
+		// wchar_t is 16 bit, parse.
+		memnew_placement(dest, String);
+		dest->parse_utf16((const char16_t *)p_contents, p_size);
+	} else {
+		// wchar_t is 32 bit, copy.
+		memnew_placement(dest, String);
+		*dest = String((const char32_t *)p_contents, p_size);
+	}
 }
 
-const wchar_t GDAPI *godot_string_operator_index(godot_string *p_self, const godot_int p_idx) {
+const godot_char_type GDAPI *godot_string_operator_index(godot_string *p_self, const godot_int p_idx) {
 	String *self = (String *)p_self;
 	return &(self->operator[](p_idx));
 }
 
-wchar_t GDAPI godot_string_operator_index_const(const godot_string *p_self, const godot_int p_idx) {
+godot_char_type GDAPI godot_string_operator_index_const(const godot_string *p_self, const godot_int p_idx) {
 	const String *self = (const String *)p_self;
 	return self->operator[](p_idx);
 }
 
-const wchar_t GDAPI *godot_string_wide_str(const godot_string *p_self) {
+const godot_char_type GDAPI *godot_string_get_data(const godot_string *p_self) {
 	const String *self = (const String *)p_self;
-	return self->c_str();
+	return self->get_data();
 }
 
 godot_bool GDAPI godot_string_operator_equal(const godot_string *p_self, const godot_string *p_b) {
@@ -137,6 +230,7 @@ signed char GDAPI godot_string_nocasecmp_to(const godot_string *p_self, const go
 
 	return self->nocasecmp_to(*str);
 }
+
 signed char GDAPI godot_string_naturalnocasecmp_to(const godot_string *p_self, const godot_string *p_str) {
 	const String *self = (const String *)p_self;
 	const String *str = (const String *)p_str;
@@ -157,22 +251,14 @@ godot_bool GDAPI godot_string_begins_with_char_array(const godot_string *p_self,
 	return self->begins_with(p_char_array);
 }
 
-godot_array GDAPI godot_string_bigrams(const godot_string *p_self) {
+godot_packed_string_array GDAPI godot_string_bigrams(const godot_string *p_self) {
 	const String *self = (const String *)p_self;
-	Vector<String> return_value = self->bigrams();
-
-	godot_array result;
-	memnew_placement(&result, Array);
-	Array *proxy = (Array *)&result;
-	proxy->resize(return_value.size());
-	for (int i = 0; i < return_value.size(); i++) {
-		(*proxy)[i] = return_value[i];
-	}
-
-	return result;
+	godot_packed_string_array ret;
+	memnew_placement(&ret, Vector<String>(self->bigrams()));
+	return ret;
 };
 
-godot_string GDAPI godot_string_chr(wchar_t p_character) {
+godot_string GDAPI godot_string_chr(godot_char_type p_character) {
 	godot_string result;
 	memnew_placement(&result, String(String::chr(p_character)));
 
@@ -186,94 +272,77 @@ godot_bool GDAPI godot_string_ends_with(const godot_string *p_self, const godot_
 	return self->ends_with(*string);
 }
 
-godot_int GDAPI godot_string_count(const godot_string *p_self, godot_string p_what, godot_int p_from, godot_int p_to) {
+godot_bool GDAPI godot_string_ends_with_char_array(const godot_string *p_self, const char *p_char_array) {
+	const String *self = (const String *)p_self;
+
+	return self->ends_with(p_char_array);
+}
+
+godot_int GDAPI godot_string_count(const godot_string *p_self, const godot_string *p_what, godot_int p_from, godot_int p_to) {
 	const String *self = (const String *)p_self;
-	String *what = (String *)&p_what;
+	const String *what = (const String *)p_what;
 
 	return self->count(*what, p_from, p_to);
 }
 
-godot_int GDAPI godot_string_countn(const godot_string *p_self, godot_string p_what, godot_int p_from, godot_int p_to) {
+godot_int GDAPI godot_string_countn(const godot_string *p_self, const godot_string *p_what, godot_int p_from, godot_int p_to) {
 	const String *self = (const String *)p_self;
-	String *what = (String *)&p_what;
+	const String *what = (const String *)p_what;
 
 	return self->countn(*what, p_from, p_to);
 }
 
-godot_int GDAPI godot_string_find(const godot_string *p_self, godot_string p_what) {
+godot_int GDAPI godot_string_find(const godot_string *p_self, const godot_string *p_what) {
 	const String *self = (const String *)p_self;
-	String *what = (String *)&p_what;
+	const String *what = (const String *)p_what;
 
 	return self->find(*what);
 }
 
-godot_int GDAPI godot_string_find_from(const godot_string *p_self, godot_string p_what, godot_int p_from) {
+godot_int GDAPI godot_string_find_from(const godot_string *p_self, const godot_string *p_what, godot_int p_from) {
 	const String *self = (const String *)p_self;
-	String *what = (String *)&p_what;
+	const String *what = (const String *)p_what;
 
 	return self->find(*what, p_from);
 }
 
-godot_int GDAPI godot_string_findmk(const godot_string *p_self, const godot_array *p_keys) {
+godot_int GDAPI godot_string_findmk(const godot_string *p_self, const godot_packed_string_array *p_keys) {
 	const String *self = (const String *)p_self;
-
-	Vector<String> keys;
-	Array *keys_proxy = (Array *)p_keys;
-	keys.resize(keys_proxy->size());
-	for (int i = 0; i < keys_proxy->size(); i++) {
-		keys.write[i] = (*keys_proxy)[i];
-	}
-
-	return self->findmk(keys);
+	const Vector<String> *keys = (const Vector<String> *)p_keys;
+	return self->findmk(*keys);
 }
 
-godot_int GDAPI godot_string_findmk_from(const godot_string *p_self, const godot_array *p_keys, godot_int p_from) {
+godot_int GDAPI godot_string_findmk_from(const godot_string *p_self, const godot_packed_string_array *p_keys, godot_int p_from) {
 	const String *self = (const String *)p_self;
-
-	Vector<String> keys;
-	Array *keys_proxy = (Array *)p_keys;
-	keys.resize(keys_proxy->size());
-	for (int i = 0; i < keys_proxy->size(); i++) {
-		keys.write[i] = (*keys_proxy)[i];
-	}
-
-	return self->findmk(keys, p_from);
+	const Vector<String> *keys = (const Vector<String> *)p_keys;
+	return self->findmk(*keys, p_from);
 }
 
-godot_int GDAPI godot_string_findmk_from_in_place(const godot_string *p_self, const godot_array *p_keys, godot_int p_from, godot_int *r_key) {
+godot_int GDAPI godot_string_findmk_from_in_place(const godot_string *p_self, const godot_packed_string_array *p_keys, godot_int p_from, godot_int *r_key) {
 	const String *self = (const String *)p_self;
-
-	Vector<String> keys;
-	Array *keys_proxy = (Array *)p_keys;
-	keys.resize(keys_proxy->size());
-	for (int i = 0; i < keys_proxy->size(); i++) {
-		keys.write[i] = (*keys_proxy)[i];
+	const Vector<String> *keys = (const Vector<String> *)p_keys;
+	int key;
+	int ret = self->findmk(*keys, p_from, &key);
+	if (r_key) {
+		*r_key = key;
 	}
-
-	return self->findmk(keys, p_from, r_key);
+	return ret;
 }
 
-godot_int GDAPI godot_string_findn(const godot_string *p_self, godot_string p_what) {
+godot_int GDAPI godot_string_findn(const godot_string *p_self, const godot_string *p_what) {
 	const String *self = (const String *)p_self;
-	String *what = (String *)&p_what;
+	const String *what = (const String *)p_what;
 
 	return self->findn(*what);
 }
 
-godot_int GDAPI godot_string_findn_from(const godot_string *p_self, godot_string p_what, godot_int p_from) {
+godot_int GDAPI godot_string_findn_from(const godot_string *p_self, const godot_string *p_what, godot_int p_from) {
 	const String *self = (const String *)p_self;
-	String *what = (String *)&p_what;
+	const String *what = (const String *)p_what;
 
 	return self->findn(*what, p_from);
 }
 
-godot_int GDAPI godot_string_find_last(const godot_string *p_self, godot_string p_what) {
-	const String *self = (const String *)p_self;
-	String *what = (String *)&p_what;
-
-	return self->find_last(*what);
-}
-
 godot_string GDAPI godot_string_format(const godot_string *p_self, const godot_variant *p_values) {
 	const String *self = (const String *)p_self;
 	const Variant *values = (const Variant *)p_values;
@@ -300,21 +369,9 @@ godot_string GDAPI godot_string_hex_encode_buffer(const uint8_t *p_buffer, godot
 	return result;
 }
 
-godot_int GDAPI godot_string_hex_to_int(const godot_string *p_self) {
-	const String *self = (const String *)p_self;
-
-	return self->hex_to_int();
-}
-
-godot_int GDAPI godot_string_hex_to_int_without_prefix(const godot_string *p_self) {
-	const String *self = (const String *)p_self;
-
-	return self->hex_to_int(true);
-}
-
-godot_string GDAPI godot_string_insert(const godot_string *p_self, godot_int p_at_pos, godot_string p_string) {
+godot_string GDAPI godot_string_insert(const godot_string *p_self, godot_int p_at_pos, const godot_string *p_string) {
 	const String *self = (const String *)p_self;
-	String *content = (String *)&p_string;
+	const String *content = (const String *)p_string;
 	godot_string result;
 	memnew_placement(&result, String(self->insert(p_at_pos, *content)));
 
@@ -437,58 +494,58 @@ godot_string GDAPI godot_string_pad_zeros(const godot_string *p_self, godot_int
 	return result;
 }
 
-godot_string GDAPI godot_string_replace(const godot_string *p_self, godot_string p_key, godot_string p_with) {
+godot_string GDAPI godot_string_replace(const godot_string *p_self, const godot_string *p_key, const godot_string *p_with) {
 	const String *self = (const String *)p_self;
-	String *key = (String *)&p_key;
-	String *with = (String *)&p_with;
+	const String *key = (const String *)p_key;
+	const String *with = (const String *)p_with;
 	godot_string result;
 	memnew_placement(&result, String(self->replace(*key, *with)));
 
 	return result;
 }
 
-godot_string GDAPI godot_string_replacen(const godot_string *p_self, godot_string p_key, godot_string p_with) {
+godot_string GDAPI godot_string_replacen(const godot_string *p_self, const godot_string *p_key, const godot_string *p_with) {
 	const String *self = (const String *)p_self;
-	String *key = (String *)&p_key;
-	String *with = (String *)&p_with;
+	const String *key = (const String *)p_key;
+	const String *with = (const String *)p_with;
 	godot_string result;
 	memnew_placement(&result, String(self->replacen(*key, *with)));
 
 	return result;
 }
 
-godot_int GDAPI godot_string_rfind(const godot_string *p_self, godot_string p_what) {
+godot_int GDAPI godot_string_rfind(const godot_string *p_self, const godot_string *p_what) {
 	const String *self = (const String *)p_self;
-	String *what = (String *)&p_what;
+	const String *what = (const String *)p_what;
 
 	return self->rfind(*what);
 }
 
-godot_int GDAPI godot_string_rfindn(const godot_string *p_self, godot_string p_what) {
+godot_int GDAPI godot_string_rfindn(const godot_string *p_self, const godot_string *p_what) {
 	const String *self = (const String *)p_self;
-	String *what = (String *)&p_what;
+	const String *what = (const String *)p_what;
 
 	return self->rfindn(*what);
 }
 
-godot_int GDAPI godot_string_rfind_from(const godot_string *p_self, godot_string p_what, godot_int p_from) {
+godot_int GDAPI godot_string_rfind_from(const godot_string *p_self, const godot_string *p_what, godot_int p_from) {
 	const String *self = (const String *)p_self;
-	String *what = (String *)&p_what;
+	const String *what = (const String *)p_what;
 
 	return self->rfind(*what, p_from);
 }
 
-godot_int GDAPI godot_string_rfindn_from(const godot_string *p_self, godot_string p_what, godot_int p_from) {
+godot_int GDAPI godot_string_rfindn_from(const godot_string *p_self, const godot_string *p_what, godot_int p_from) {
 	const String *self = (const String *)p_self;
-	String *what = (String *)&p_what;
+	const String *what = (const String *)p_what;
 
 	return self->rfindn(*what, p_from);
 }
 
-godot_string GDAPI godot_string_replace_first(const godot_string *p_self, godot_string p_key, godot_string p_with) {
+godot_string GDAPI godot_string_replace_first(const godot_string *p_self, const godot_string *p_key, const godot_string *p_with) {
 	const String *self = (const String *)p_self;
-	String *key = (String *)&p_key;
-	String *with = (String *)&p_with;
+	const String *key = (const String *)p_key;
+	const String *with = (const String *)p_with;
 	godot_string result;
 	memnew_placement(&result, String(self->replace_first(*key, *with)));
 
@@ -538,24 +595,18 @@ godot_string GDAPI godot_string_substr(const godot_string *p_self, godot_int p_f
 	return result;
 }
 
-double GDAPI godot_string_to_double(const godot_string *p_self) {
+godot_int GDAPI godot_string_to_int(const godot_string *p_self) {
 	const String *self = (const String *)p_self;
 
-	return self->to_double();
+	return self->to_int();
 }
 
-godot_real GDAPI godot_string_to_float(const godot_string *p_self) {
+double GDAPI godot_string_to_float(const godot_string *p_self) {
 	const String *self = (const String *)p_self;
 
 	return self->to_float();
 }
 
-godot_int GDAPI godot_string_to_int(const godot_string *p_self) {
-	const String *self = (const String *)p_self;
-
-	return self->to_int();
-}
-
 godot_string GDAPI godot_string_capitalize(const godot_string *p_self) {
 	const String *self = (const String *)p_self;
 	godot_string result;
@@ -580,15 +631,19 @@ godot_string GDAPI godot_string_camelcase_to_underscore_lowercased(const godot_s
 	return result;
 }
 
-double GDAPI godot_string_char_to_double(const char *p_what) {
-	return String::to_double(p_what);
+double GDAPI godot_string_char_to_float(const char *p_what) {
+	return String::to_float(p_what);
+}
+
+double GDAPI godot_string_wchar_to_float(const wchar_t *p_str, const wchar_t **r_end) {
+	return String::to_float(p_str, r_end);
 }
 
 godot_int GDAPI godot_string_char_to_int(const char *p_what) {
 	return String::to_int(p_what);
 }
 
-int64_t GDAPI godot_string_wchar_to_int(const wchar_t *p_str) {
+godot_int GDAPI godot_string_wchar_to_int(const wchar_t *p_str) {
 	return String::to_int(p_str);
 }
 
@@ -596,42 +651,32 @@ godot_int GDAPI godot_string_char_to_int_with_len(const char *p_what, godot_int
 	return String::to_int(p_what, p_len);
 }
 
-int64_t GDAPI godot_string_char_to_int64_with_len(const wchar_t *p_str, int p_len) {
+godot_int GDAPI godot_string_wchar_to_int_with_len(const wchar_t *p_str, int p_len) {
 	return String::to_int(p_str, p_len);
 }
 
-int64_t GDAPI godot_string_hex_to_int64(const godot_string *p_self) {
-	const String *self = (const String *)p_self;
-
-	return self->hex_to_int64(false);
-}
-
-int64_t GDAPI godot_string_hex_to_int64_with_prefix(const godot_string *p_self) {
+godot_int GDAPI godot_string_hex_to_int(const godot_string *p_self) {
 	const String *self = (const String *)p_self;
 
-	return self->hex_to_int64();
+	return self->hex_to_int(false);
 }
 
-int64_t GDAPI godot_string_to_int64(const godot_string *p_self) {
+godot_int GDAPI godot_string_hex_to_int_with_prefix(const godot_string *p_self) {
 	const String *self = (const String *)p_self;
 
-	return self->to_int64();
-}
-
-double GDAPI godot_string_unicode_char_to_double(const wchar_t *p_str, const wchar_t **r_end) {
-	return String::to_double(p_str, r_end);
+	return self->hex_to_int();
 }
 
-godot_string GDAPI godot_string_get_slice(const godot_string *p_self, godot_string p_splitter, godot_int p_slice) {
+godot_string GDAPI godot_string_get_slice(const godot_string *p_self, const godot_string *p_splitter, godot_int p_slice) {
 	const String *self = (const String *)p_self;
-	String *splitter = (String *)&p_splitter;
+	const String *splitter = (const String *)p_splitter;
 	godot_string result;
 	memnew_placement(&result, String(self->get_slice(*splitter, p_slice)));
 
 	return result;
 }
 
-godot_string GDAPI godot_string_get_slicec(const godot_string *p_self, wchar_t p_splitter, godot_int p_slice) {
+godot_string GDAPI godot_string_get_slicec(const godot_string *p_self, godot_char_type p_splitter, godot_int p_slice) {
 	const String *self = (const String *)p_self;
 	godot_string result;
 	memnew_placement(&result, String(self->get_slicec(p_splitter, p_slice)));
@@ -639,221 +684,149 @@ godot_string GDAPI godot_string_get_slicec(const godot_string *p_self, wchar_t p
 	return result;
 }
 
-godot_array GDAPI godot_string_split(const godot_string *p_self, const godot_string *p_splitter) {
+godot_packed_string_array GDAPI godot_string_split(const godot_string *p_self, const godot_string *p_splitter) {
 	const String *self = (const String *)p_self;
 	const String *splitter = (const String *)p_splitter;
-	godot_array result;
-	memnew_placement(&result, Array);
-	Array *proxy = (Array *)&result;
-	Vector<String> return_value = self->split(*splitter, false);
-
-	proxy->resize(return_value.size());
-	for (int i = 0; i < return_value.size(); i++) {
-		(*proxy)[i] = return_value[i];
-	}
-
-	return result;
+	godot_packed_string_array ret;
+	memnew_placement(&ret, Vector<String>(self->split(*splitter, false)));
+	return ret;
 }
 
-godot_array GDAPI godot_string_split_allow_empty(const godot_string *p_self, const godot_string *p_splitter) {
+godot_packed_string_array GDAPI godot_string_split_allow_empty(const godot_string *p_self, const godot_string *p_splitter) {
 	const String *self = (const String *)p_self;
 	const String *splitter = (const String *)p_splitter;
-	godot_array result;
-	memnew_placement(&result, Array);
-	Array *proxy = (Array *)&result;
-	Vector<String> return_value = self->split(*splitter);
-
-	proxy->resize(return_value.size());
-	for (int i = 0; i < return_value.size(); i++) {
-		(*proxy)[i] = return_value[i];
-	}
+	godot_packed_string_array ret;
+	memnew_placement(&ret, Vector<String>(self->split(*splitter, true)));
+	return ret;
+}
 
-	return result;
+godot_packed_string_array GDAPI godot_string_split_with_maxsplit(const godot_string *p_self, const godot_string *p_splitter, const godot_bool p_allow_empty, const godot_int p_maxsplit) {
+	const String *self = (const String *)p_self;
+	const String *splitter = (const String *)p_splitter;
+	godot_packed_string_array ret;
+	memnew_placement(&ret, Vector<String>(self->split(*splitter, p_allow_empty, p_maxsplit)));
+	return ret;
 }
 
-godot_array GDAPI godot_string_split_floats(const godot_string *p_self, const godot_string *p_splitter) {
+godot_packed_string_array GDAPI godot_string_rsplit(const godot_string *p_self, const godot_string *p_splitter) {
 	const String *self = (const String *)p_self;
 	const String *splitter = (const String *)p_splitter;
-	godot_array result;
-	memnew_placement(&result, Array);
-	Array *proxy = (Array *)&result;
-	Vector<float> return_value = self->split_floats(*splitter, false);
-
-	proxy->resize(return_value.size());
-	for (int i = 0; i < return_value.size(); i++) {
-		(*proxy)[i] = return_value[i];
-	}
 
-	return result;
+	godot_packed_string_array ret;
+	memnew_placement(&ret, Vector<String>(self->rsplit(*splitter, false)));
+	return ret;
 }
 
-godot_array GDAPI godot_string_split_floats_allows_empty(const godot_string *p_self, const godot_string *p_splitter) {
+godot_packed_string_array GDAPI godot_string_rsplit_allow_empty(const godot_string *p_self, const godot_string *p_splitter) {
 	const String *self = (const String *)p_self;
 	const String *splitter = (const String *)p_splitter;
-	godot_array result;
-	memnew_placement(&result, Array);
-	Array *proxy = (Array *)&result;
-	Vector<float> return_value = self->split_floats(*splitter);
-
-	proxy->resize(return_value.size());
-	for (int i = 0; i < return_value.size(); i++) {
-		(*proxy)[i] = return_value[i];
-	}
 
-	return result;
+	godot_packed_string_array ret;
+	memnew_placement(&ret, Vector<String>(self->rsplit(*splitter, true)));
+	return ret;
 }
 
-godot_array GDAPI godot_string_split_floats_mk(const godot_string *p_self, const godot_array *p_splitters) {
+godot_packed_string_array GDAPI godot_string_rsplit_with_maxsplit(const godot_string *p_self, const godot_string *p_splitter, const godot_bool p_allow_empty, const godot_int p_maxsplit) {
 	const String *self = (const String *)p_self;
+	const String *splitter = (const String *)p_splitter;
 
-	Vector<String> splitters;
-	Array *splitter_proxy = (Array *)p_splitters;
-	splitters.resize(splitter_proxy->size());
-	for (int i = 0; i < splitter_proxy->size(); i++) {
-		splitters.write[i] = (*splitter_proxy)[i];
-	}
-
-	godot_array result;
-	memnew_placement(&result, Array);
-	Array *proxy = (Array *)&result;
-	Vector<float> return_value = self->split_floats_mk(splitters, false);
+	godot_packed_string_array ret;
+	memnew_placement(&ret, Vector<String>(self->rsplit(*splitter, p_allow_empty, p_maxsplit)));
+	return ret;
+}
 
-	proxy->resize(return_value.size());
-	for (int i = 0; i < return_value.size(); i++) {
-		(*proxy)[i] = return_value[i];
-	}
+godot_packed_float32_array GDAPI godot_string_split_floats(const godot_string *p_self, const godot_string *p_splitter) {
+	const String *self = (const String *)p_self;
+	const String *splitter = (const String *)p_splitter;
 
-	return result;
+	godot_packed_float32_array ret;
+	memnew_placement(&ret, Vector<float>(self->split_floats(*splitter, false)));
+	return ret;
 }
 
-godot_array GDAPI godot_string_split_floats_mk_allows_empty(const godot_string *p_self, const godot_array *p_splitters) {
+godot_packed_float32_array GDAPI godot_string_split_floats_allow_empty(const godot_string *p_self, const godot_string *p_splitter) {
 	const String *self = (const String *)p_self;
+	const String *splitter = (const String *)p_splitter;
 
-	Vector<String> splitters;
-	Array *splitter_proxy = (Array *)p_splitters;
-	splitters.resize(splitter_proxy->size());
-	for (int i = 0; i < splitter_proxy->size(); i++) {
-		splitters.write[i] = (*splitter_proxy)[i];
-	}
-
-	godot_array result;
-	memnew_placement(&result, Array);
-	Array *proxy = (Array *)&result;
-	Vector<float> return_value = self->split_floats_mk(splitters);
+	godot_packed_float32_array ret;
+	memnew_placement(&ret, Vector<float>(self->split_floats(*splitter, true)));
+	return ret;
+}
 
-	proxy->resize(return_value.size());
-	for (int i = 0; i < return_value.size(); i++) {
-		(*proxy)[i] = return_value[i];
-	}
+godot_packed_float32_array GDAPI godot_string_split_floats_mk(const godot_string *p_self, const godot_packed_string_array *p_splitters) {
+	const String *self = (const String *)p_self;
+	const Vector<String> *splitters = (const Vector<String> *)p_splitters;
 
-	return result;
+	godot_packed_float32_array ret;
+	memnew_placement(&ret, Vector<float>(self->split_floats_mk(*splitters, false)));
+	return ret;
 }
 
-godot_array GDAPI godot_string_split_ints(const godot_string *p_self, const godot_string *p_splitter) {
+godot_packed_float32_array GDAPI godot_string_split_floats_mk_allow_empty(const godot_string *p_self, const godot_packed_string_array *p_splitters) {
 	const String *self = (const String *)p_self;
-	const String *splitter = (const String *)p_splitter;
-	godot_array result;
-	memnew_placement(&result, Array);
-	Array *proxy = (Array *)&result;
-	Vector<int> return_value = self->split_ints(*splitter, false);
-
-	proxy->resize(return_value.size());
-	for (int i = 0; i < return_value.size(); i++) {
-		(*proxy)[i] = return_value[i];
-	}
+	const Vector<String> *splitters = (const Vector<String> *)p_splitters;
 
-	return result;
+	godot_packed_float32_array ret;
+	memnew_placement(&ret, Vector<float>(self->split_floats_mk(*splitters, true)));
+	return ret;
 }
 
-godot_array GDAPI godot_string_split_ints_allows_empty(const godot_string *p_self, const godot_string *p_splitter) {
+godot_packed_int32_array GDAPI godot_string_split_ints(const godot_string *p_self, const godot_string *p_splitter) {
 	const String *self = (const String *)p_self;
 	const String *splitter = (const String *)p_splitter;
-	godot_array result;
-	memnew_placement(&result, Array);
-	Array *proxy = (Array *)&result;
-	Vector<int> return_value = self->split_ints(*splitter);
-
-	proxy->resize(return_value.size());
-	for (int i = 0; i < return_value.size(); i++) {
-		(*proxy)[i] = return_value[i];
-	}
 
-	return result;
+	godot_packed_int32_array ret;
+	memnew_placement(&ret, Vector<int>(self->split_ints(*splitter, false)));
+	return ret;
 }
 
-godot_array GDAPI godot_string_split_ints_mk(const godot_string *p_self, const godot_array *p_splitters) {
+godot_packed_int32_array GDAPI godot_string_split_ints_allow_empty(const godot_string *p_self, const godot_string *p_splitter) {
 	const String *self = (const String *)p_self;
+	const String *splitter = (const String *)p_splitter;
 
-	Vector<String> splitters;
-	Array *splitter_proxy = (Array *)p_splitters;
-	splitters.resize(splitter_proxy->size());
-	for (int i = 0; i < splitter_proxy->size(); i++) {
-		splitters.write[i] = (*splitter_proxy)[i];
-	}
-
-	godot_array result;
-	memnew_placement(&result, Array);
-	Array *proxy = (Array *)&result;
-	Vector<int> return_value = self->split_ints_mk(splitters, false);
-
-	proxy->resize(return_value.size());
-	for (int i = 0; i < return_value.size(); i++) {
-		(*proxy)[i] = return_value[i];
-	}
-
-	return result;
+	godot_packed_int32_array ret;
+	memnew_placement(&ret, Vector<int>(self->split_ints(*splitter, true)));
+	return ret;
 }
 
-godot_array GDAPI godot_string_split_ints_mk_allows_empty(const godot_string *p_self, const godot_array *p_splitters) {
+godot_packed_int32_array GDAPI godot_string_split_ints_mk(const godot_string *p_self, const godot_packed_string_array *p_splitters) {
 	const String *self = (const String *)p_self;
+	const Vector<String> *splitters = (const Vector<String> *)p_splitters;
 
-	Vector<String> splitters;
-	Array *splitter_proxy = (Array *)p_splitters;
-	splitters.resize(splitter_proxy->size());
-	for (int i = 0; i < splitter_proxy->size(); i++) {
-		splitters.write[i] = (*splitter_proxy)[i];
-	}
-
-	godot_array result;
-	memnew_placement(&result, Array);
-	Array *proxy = (Array *)&result;
-	Vector<int> return_value = self->split_ints_mk(splitters);
+	godot_packed_int32_array ret;
+	memnew_placement(&ret, Vector<int>(self->split_ints_mk(*splitters, false)));
+	return ret;
+}
 
-	proxy->resize(return_value.size());
-	for (int i = 0; i < return_value.size(); i++) {
-		(*proxy)[i] = return_value[i];
-	}
+godot_packed_int32_array GDAPI godot_string_split_ints_mk_allow_empty(const godot_string *p_self, const godot_packed_string_array *p_splitters) {
+	const String *self = (const String *)p_self;
+	const Vector<String> *splitters = (const Vector<String> *)p_splitters;
 
-	return result;
+	godot_packed_int32_array ret;
+	memnew_placement(&ret, Vector<int>(self->split_ints_mk(*splitters, true)));
+	return ret;
 }
 
-godot_array GDAPI godot_string_split_spaces(const godot_string *p_self) {
+godot_packed_string_array GDAPI godot_string_split_spaces(const godot_string *p_self) {
 	const String *self = (const String *)p_self;
-	godot_array result;
-	memnew_placement(&result, Array);
-	Array *proxy = (Array *)&result;
-	Vector<String> return_value = self->split_spaces();
 
-	proxy->resize(return_value.size());
-	for (int i = 0; i < return_value.size(); i++) {
-		(*proxy)[i] = return_value[i];
-	}
-
-	return result;
+	godot_packed_string_array ret;
+	memnew_placement(&ret, Vector<String>(self->split_spaces()));
+	return ret;
 }
 
-godot_int GDAPI godot_string_get_slice_count(const godot_string *p_self, godot_string p_splitter) {
+godot_int GDAPI godot_string_get_slice_count(const godot_string *p_self, const godot_string *p_splitter) {
 	const String *self = (const String *)p_self;
-	String *splitter = (String *)&p_splitter;
+	const String *splitter = (const String *)p_splitter;
 
 	return self->get_slice_count(*splitter);
 }
 
-wchar_t GDAPI godot_string_char_lowercase(wchar_t p_char) {
+godot_char_type GDAPI godot_string_char_lowercase(godot_char_type p_char) {
 	return String::char_lowercase(p_char);
 }
 
-wchar_t GDAPI godot_string_char_uppercase(wchar_t p_char) {
+godot_char_type GDAPI godot_string_char_uppercase(godot_char_type p_char) {
 	return String::char_uppercase(p_char);
 }
 
@@ -897,7 +870,7 @@ godot_string GDAPI godot_string_left(const godot_string *p_self, godot_int p_pos
 	return result;
 }
 
-wchar_t GDAPI godot_string_ord_at(const godot_string *p_self, godot_int p_idx) {
+godot_char_type GDAPI godot_string_ord_at(const godot_string *p_self, godot_int p_idx) {
 	const String *self = (const String *)p_self;
 
 	return self->ord_at(p_idx);
@@ -920,6 +893,14 @@ godot_string GDAPI godot_string_right(const godot_string *p_self, godot_int p_po
 	return result;
 }
 
+godot_string GDAPI godot_string_repeat(const godot_string *p_self, godot_int p_count) {
+	const String *self = (const String *)p_self;
+	godot_string result;
+	memnew_placement(&result, String(self->repeat(p_count)));
+
+	return result;
+}
+
 godot_string GDAPI godot_string_strip_edges(const godot_string *p_self, godot_bool p_left, godot_bool p_right) {
 	const String *self = (const String *)p_self;
 	godot_string result;
@@ -951,7 +932,7 @@ godot_char_string GDAPI godot_string_ascii(const godot_string *p_self) {
 	return result;
 }
 
-godot_char_string GDAPI godot_string_ascii_extended(const godot_string *p_self) {
+godot_char_string GDAPI godot_string_latin1(const godot_string *p_self) {
 	const String *self = (const String *)p_self;
 
 	godot_char_string result;
@@ -997,6 +978,42 @@ godot_string GDAPI godot_string_chars_to_utf8_with_len(const char *p_utf8, godot
 	return result;
 }
 
+godot_char16_string GDAPI godot_string_utf16(const godot_string *p_self) {
+	const String *self = (const String *)p_self;
+
+	godot_char16_string result;
+
+	memnew_placement(&result, Char16String(self->utf16()));
+
+	return result;
+}
+
+godot_bool GDAPI godot_string_parse_utf16(godot_string *p_self, const char16_t *p_utf16) {
+	String *self = (String *)p_self;
+
+	return self->parse_utf16(p_utf16);
+}
+
+godot_bool GDAPI godot_string_parse_utf16_with_len(godot_string *p_self, const char16_t *p_utf16, godot_int p_len) {
+	String *self = (String *)p_self;
+
+	return self->parse_utf16(p_utf16, p_len);
+}
+
+godot_string GDAPI godot_string_chars_to_utf16(const char16_t *p_utf16) {
+	godot_string result;
+	memnew_placement(&result, String(String::utf16(p_utf16)));
+
+	return result;
+}
+
+godot_string GDAPI godot_string_chars_to_utf16_with_len(const char16_t *p_utf16, godot_int p_len) {
+	godot_string result;
+	memnew_placement(&result, String(String::utf16(p_utf16, p_len)));
+
+	return result;
+}
+
 uint32_t GDAPI godot_string_hash(const godot_string *p_self) {
 	const String *self = (const String *)p_self;
 
@@ -1017,28 +1034,18 @@ uint32_t GDAPI godot_string_hash_chars_with_len(const char *p_cstr, godot_int p_
 	return String::hash(p_cstr, p_len);
 }
 
-uint32_t GDAPI godot_string_hash_utf8_chars(const wchar_t *p_str) {
+uint32_t GDAPI godot_string_hash_wide_chars(const wchar_t *p_str) {
 	return String::hash(p_str);
 }
 
-uint32_t GDAPI godot_string_hash_utf8_chars_with_len(const wchar_t *p_str, godot_int p_len) {
+uint32_t GDAPI godot_string_hash_wide_chars_with_len(const wchar_t *p_str, godot_int p_len) {
 	return String::hash(p_str, p_len);
 }
 
-godot_pool_byte_array GDAPI godot_string_md5_buffer(const godot_string *p_self) {
+godot_packed_byte_array GDAPI godot_string_md5_buffer(const godot_string *p_self) {
 	const String *self = (const String *)p_self;
-	Vector<uint8_t> tmp_result = self->md5_buffer();
-
-	godot_pool_byte_array result;
-	memnew_placement(&result, PoolByteArray);
-	PoolByteArray *proxy = (PoolByteArray *)&result;
-	PoolByteArray::Write proxy_writer = proxy->write();
-	proxy->resize(tmp_result.size());
-
-	for (int i = 0; i < tmp_result.size(); i++) {
-		proxy_writer[i] = tmp_result[i];
-	}
-
+	godot_packed_byte_array result;
+	memnew_placement(&result, PackedByteArray(self->md5_buffer()));
 	return result;
 }
 
@@ -1050,20 +1057,25 @@ godot_string GDAPI godot_string_md5_text(const godot_string *p_self) {
 	return result;
 }
 
-godot_pool_byte_array GDAPI godot_string_sha256_buffer(const godot_string *p_self) {
+godot_packed_byte_array GDAPI godot_string_sha1_buffer(const godot_string *p_self) {
 	const String *self = (const String *)p_self;
-	Vector<uint8_t> tmp_result = self->sha256_buffer();
+	godot_packed_byte_array result;
+	memnew_placement(&result, PackedByteArray(self->sha1_buffer()));
+	return result;
+}
 
-	godot_pool_byte_array result;
-	memnew_placement(&result, PoolByteArray);
-	PoolByteArray *proxy = (PoolByteArray *)&result;
-	PoolByteArray::Write proxy_writer = proxy->write();
-	proxy->resize(tmp_result.size());
+godot_string GDAPI godot_string_sha1_text(const godot_string *p_self) {
+	const String *self = (const String *)p_self;
+	godot_string result;
+	memnew_placement(&result, String(self->sha1_text()));
 
-	for (int i = 0; i < tmp_result.size(); i++) {
-		proxy_writer[i] = tmp_result[i];
-	}
+	return result;
+}
 
+godot_packed_byte_array GDAPI godot_string_sha256_buffer(const godot_string *p_self) {
+	const String *self = (const String *)p_self;
+	godot_packed_byte_array result;
+	memnew_placement(&result, PackedByteArray(self->sha256_buffer()));
 	return result;
 }
 
@@ -1209,15 +1221,6 @@ godot_string GDAPI godot_string_json_escape(const godot_string *p_self) {
 	return result;
 }
 
-godot_string GDAPI godot_string_word_wrap(const godot_string *p_self, godot_int p_chars_per_line) {
-	const String *self = (const String *)p_self;
-	godot_string result;
-	String return_value = self->word_wrap(p_chars_per_line);
-	memnew_placement(&result, String(return_value));
-
-	return result;
-}
-
 godot_string GDAPI godot_string_xml_escape(const godot_string *p_self) {
 	const String *self = (const String *)p_self;
 	godot_string result;
@@ -1263,6 +1266,22 @@ godot_string GDAPI godot_string_percent_encode(const godot_string *p_self) {
 	return result;
 }
 
+godot_string GDAPI godot_string_join(const godot_string *p_self, const godot_packed_string_array *p_parts) {
+	const String *self = (const String *)p_self;
+	const Vector<String> *parts = (const Vector<String> *)p_parts;
+	godot_string result;
+	String return_value = self->join(*parts);
+	memnew_placement(&result, String(return_value));
+
+	return result;
+}
+
+godot_bool GDAPI godot_string_is_valid_filename(const godot_string *p_self) {
+	const String *self = (const String *)p_self;
+
+	return self->is_valid_filename();
+}
+
 godot_bool GDAPI godot_string_is_valid_float(const godot_string *p_self) {
 	const String *self = (const String *)p_self;
 
@@ -1328,31 +1347,22 @@ godot_string GDAPI godot_string_trim_suffix(const godot_string *p_self, const go
 	return result;
 }
 
-godot_string GDAPI godot_string_rstrip(const godot_string *p_self, const godot_string *p_chars) {
+godot_string GDAPI godot_string_lstrip(const godot_string *p_self, const godot_string *p_chars) {
 	const String *self = (const String *)p_self;
 	String *chars = (String *)p_chars;
 	godot_string result;
-	String return_value = self->rstrip(*chars);
+	String return_value = self->lstrip(*chars);
 	memnew_placement(&result, String(return_value));
 
 	return result;
 }
 
-godot_pool_string_array GDAPI godot_string_rsplit(const godot_string *p_self, const godot_string *p_divisor,
-		const godot_bool p_allow_empty, const godot_int p_maxsplit) {
+godot_string GDAPI godot_string_rstrip(const godot_string *p_self, const godot_string *p_chars) {
 	const String *self = (const String *)p_self;
-	String *divisor = (String *)p_divisor;
-
-	godot_pool_string_array result;
-	memnew_placement(&result, PoolStringArray);
-	PoolStringArray *proxy = (PoolStringArray *)&result;
-	PoolStringArray::Write proxy_writer = proxy->write();
-	Vector<String> tmp_result = self->rsplit(*divisor, p_allow_empty, p_maxsplit);
-	proxy->resize(tmp_result.size());
-
-	for (int i = 0; i < tmp_result.size(); i++) {
-		proxy_writer[i] = tmp_result[i];
-	}
+	String *chars = (String *)p_chars;
+	godot_string result;
+	String return_value = self->rstrip(*chars);
+	memnew_placement(&result, String(return_value));
 
 	return result;
 }
diff --git a/modules/gdnative/gdnative/string_name.cpp b/modules/gdnative/gdnative/string_name.cpp
index 1abb4486b1..7bbaaeeaa0 100644
--- a/modules/gdnative/gdnative/string_name.cpp
+++ b/modules/gdnative/gdnative/string_name.cpp
@@ -39,6 +39,8 @@
 extern "C" {
 #endif
 
+static_assert(sizeof(godot_string_name) == sizeof(StringName), "StringName size mismatch");
+
 void GDAPI godot_string_name_new(godot_string_name *r_dest, const godot_string *p_name) {
 	StringName *dest = (StringName *)r_dest;
 	const String *name = (const String *)p_name;
diff --git a/modules/gdnative/gdnative/transform.cpp b/modules/gdnative/gdnative/transform.cpp
index c9b3e37fb2..d19de93e9b 100644
--- a/modules/gdnative/gdnative/transform.cpp
+++ b/modules/gdnative/gdnative/transform.cpp
@@ -37,6 +37,8 @@
 extern "C" {
 #endif
 
+static_assert(sizeof(godot_transform) == sizeof(Transform), "Transform size mismatch");
+
 void GDAPI godot_transform_new_with_axis_origin(godot_transform *r_dest, const godot_vector3 *p_x_axis, const godot_vector3 *p_y_axis, const godot_vector3 *p_z_axis, const godot_vector3 *p_origin) {
 	const Vector3 *x_axis = (const Vector3 *)p_x_axis;
 	const Vector3 *y_axis = (const Vector3 *)p_y_axis;
diff --git a/modules/gdnative/gdnative/transform2d.cpp b/modules/gdnative/gdnative/transform2d.cpp
index 26a71333b1..c0f7878eb0 100644
--- a/modules/gdnative/gdnative/transform2d.cpp
+++ b/modules/gdnative/gdnative/transform2d.cpp
@@ -37,6 +37,8 @@
 extern "C" {
 #endif
 
+static_assert(sizeof(godot_transform2d) == sizeof(Transform2D), "Transform2D size mismatch");
+
 void GDAPI godot_transform2d_new(godot_transform2d *r_dest, const godot_real p_rot, const godot_vector2 *p_pos) {
 	const Vector2 *pos = (const Vector2 *)p_pos;
 	Transform2D *dest = (Transform2D *)r_dest;
diff --git a/modules/gdnative/gdnative/variant.cpp b/modules/gdnative/gdnative/variant.cpp
index 11b6448e34..dac4feb0e5 100644
--- a/modules/gdnative/gdnative/variant.cpp
+++ b/modules/gdnative/gdnative/variant.cpp
@@ -37,6 +37,8 @@
 extern "C" {
 #endif
 
+static_assert(sizeof(godot_variant) == sizeof(Variant), "Variant size mismatch");
+
 // Workaround GCC ICE on armv7hl which was affected GCC 6.0 up to 8.0 (GH-16100).
 // It was fixed upstream in 8.1, and a fix was backported to 7.4.
 // This can be removed once no supported distro ships with versions older than 7.4.
@@ -97,24 +99,48 @@ void GDAPI godot_variant_new_string(godot_variant *r_dest, const godot_string *p
 	memnew_placement_custom(dest, Variant, Variant(*s));
 }
 
+void GDAPI godot_variant_new_string_name(godot_variant *r_dest, const godot_string_name *p_s) {
+	Variant *dest = (Variant *)r_dest;
+	StringName *s = (StringName *)p_s;
+	memnew_placement_custom(dest, Variant, Variant(*s));
+}
+
 void GDAPI godot_variant_new_vector2(godot_variant *r_dest, const godot_vector2 *p_v2) {
 	Variant *dest = (Variant *)r_dest;
 	Vector2 *v2 = (Vector2 *)p_v2;
 	memnew_placement_custom(dest, Variant, Variant(*v2));
 }
 
+void GDAPI godot_variant_new_vector2i(godot_variant *r_dest, const godot_vector2i *p_v2) {
+	Variant *dest = (Variant *)r_dest;
+	Vector2i *v2 = (Vector2i *)p_v2;
+	memnew_placement_custom(dest, Variant, Variant(*v2));
+}
+
 void GDAPI godot_variant_new_rect2(godot_variant *r_dest, const godot_rect2 *p_rect2) {
 	Variant *dest = (Variant *)r_dest;
 	Rect2 *rect2 = (Rect2 *)p_rect2;
 	memnew_placement_custom(dest, Variant, Variant(*rect2));
 }
 
+void GDAPI godot_variant_new_rect2i(godot_variant *r_dest, const godot_rect2i *p_rect2) {
+	Variant *dest = (Variant *)r_dest;
+	Rect2i *rect2 = (Rect2i *)p_rect2;
+	memnew_placement_custom(dest, Variant, Variant(*rect2));
+}
+
 void GDAPI godot_variant_new_vector3(godot_variant *r_dest, const godot_vector3 *p_v3) {
 	Variant *dest = (Variant *)r_dest;
 	Vector3 *v3 = (Vector3 *)p_v3;
 	memnew_placement_custom(dest, Variant, Variant(*v3));
 }
 
+void GDAPI godot_variant_new_vector3i(godot_variant *r_dest, const godot_vector3i *p_v3) {
+	Variant *dest = (Variant *)r_dest;
+	Vector3i *v3 = (Vector3i *)p_v3;
+	memnew_placement_custom(dest, Variant, Variant(*v3));
+}
+
 void GDAPI godot_variant_new_transform2d(godot_variant *r_dest, const godot_transform2d *p_t2d) {
 	Variant *dest = (Variant *)r_dest;
 	Transform2D *t2d = (Transform2D *)p_t2d;
@@ -169,6 +195,18 @@ void GDAPI godot_variant_new_rid(godot_variant *r_dest, const godot_rid *p_rid)
 	memnew_placement_custom(dest, Variant, Variant(*rid));
 }
 
+void GDAPI godot_variant_new_callable(godot_variant *r_dest, const godot_callable *p_cb) {
+	Variant *dest = (Variant *)r_dest;
+	Callable *cb = (Callable *)p_cb;
+	memnew_placement_custom(dest, Variant, Variant(*cb));
+}
+
+void GDAPI godot_variant_new_signal(godot_variant *r_dest, const godot_signal *p_signal) {
+	Variant *dest = (Variant *)r_dest;
+	Signal *signal = (Signal *)p_signal;
+	memnew_placement_custom(dest, Variant, Variant(*signal));
+}
+
 void GDAPI godot_variant_new_object(godot_variant *r_dest, const godot_object *p_obj) {
 	Variant *dest = (Variant *)r_dest;
 	Object *obj = (Object *)p_obj;
@@ -178,7 +216,7 @@ void GDAPI godot_variant_new_object(godot_variant *r_dest, const godot_object *p
 		ref = REF(reference);
 	}
 	if (!ref.is_null()) {
-		memnew_placement_custom(dest, Variant, Variant(ref.get_ref_ptr()));
+		memnew_placement_custom(dest, Variant, Variant(ref));
 	} else {
 #if defined(DEBUG_METHODS_ENABLED)
 		if (reference) {
@@ -201,45 +239,57 @@ void GDAPI godot_variant_new_array(godot_variant *r_dest, const godot_array *p_a
 	memnew_placement_custom(dest, Variant, Variant(*arr));
 }
 
-void GDAPI godot_variant_new_pool_byte_array(godot_variant *r_dest, const godot_pool_byte_array *p_pba) {
+void GDAPI godot_variant_new_packed_byte_array(godot_variant *r_dest, const godot_packed_byte_array *p_pba) {
 	Variant *dest = (Variant *)r_dest;
-	PoolByteArray *pba = (PoolByteArray *)p_pba;
+	PackedByteArray *pba = (PackedByteArray *)p_pba;
 	memnew_placement_custom(dest, Variant, Variant(*pba));
 }
 
-void GDAPI godot_variant_new_pool_int_array(godot_variant *r_dest, const godot_pool_int_array *p_pia) {
+void GDAPI godot_variant_new_packed_int32_array(godot_variant *r_dest, const godot_packed_int32_array *p_pia) {
 	Variant *dest = (Variant *)r_dest;
-	PoolIntArray *pia = (PoolIntArray *)p_pia;
+	PackedInt32Array *pia = (PackedInt32Array *)p_pia;
 	memnew_placement_custom(dest, Variant, Variant(*pia));
 }
 
-void GDAPI godot_variant_new_pool_real_array(godot_variant *r_dest, const godot_pool_real_array *p_pra) {
+void GDAPI godot_variant_new_packed_int64_array(godot_variant *r_dest, const godot_packed_int64_array *p_pia) {
+	Variant *dest = (Variant *)r_dest;
+	PackedInt64Array *pia = (PackedInt64Array *)p_pia;
+	memnew_placement_custom(dest, Variant, Variant(*pia));
+}
+
+void GDAPI godot_variant_new_packed_float32_array(godot_variant *r_dest, const godot_packed_float32_array *p_pra) {
+	Variant *dest = (Variant *)r_dest;
+	PackedFloat32Array *pra = (PackedFloat32Array *)p_pra;
+	memnew_placement_custom(dest, Variant, Variant(*pra));
+}
+
+void GDAPI godot_variant_new_packed_float64_array(godot_variant *r_dest, const godot_packed_float64_array *p_pra) {
 	Variant *dest = (Variant *)r_dest;
-	PoolRealArray *pra = (PoolRealArray *)p_pra;
+	PackedFloat64Array *pra = (PackedFloat64Array *)p_pra;
 	memnew_placement_custom(dest, Variant, Variant(*pra));
 }
 
-void GDAPI godot_variant_new_pool_string_array(godot_variant *r_dest, const godot_pool_string_array *p_psa) {
+void GDAPI godot_variant_new_packed_string_array(godot_variant *r_dest, const godot_packed_string_array *p_psa) {
 	Variant *dest = (Variant *)r_dest;
-	PoolStringArray *psa = (PoolStringArray *)p_psa;
+	PackedStringArray *psa = (PackedStringArray *)p_psa;
 	memnew_placement_custom(dest, Variant, Variant(*psa));
 }
 
-void GDAPI godot_variant_new_pool_vector2_array(godot_variant *r_dest, const godot_pool_vector2_array *p_pv2a) {
+void GDAPI godot_variant_new_packed_vector2_array(godot_variant *r_dest, const godot_packed_vector2_array *p_pv2a) {
 	Variant *dest = (Variant *)r_dest;
-	PoolVector2Array *pv2a = (PoolVector2Array *)p_pv2a;
+	PackedVector2Array *pv2a = (PackedVector2Array *)p_pv2a;
 	memnew_placement_custom(dest, Variant, Variant(*pv2a));
 }
 
-void GDAPI godot_variant_new_pool_vector3_array(godot_variant *r_dest, const godot_pool_vector3_array *p_pv3a) {
+void GDAPI godot_variant_new_packed_vector3_array(godot_variant *r_dest, const godot_packed_vector3_array *p_pv3a) {
 	Variant *dest = (Variant *)r_dest;
-	PoolVector3Array *pv3a = (PoolVector3Array *)p_pv3a;
+	PackedVector3Array *pv3a = (PackedVector3Array *)p_pv3a;
 	memnew_placement_custom(dest, Variant, Variant(*pv3a));
 }
 
-void GDAPI godot_variant_new_pool_color_array(godot_variant *r_dest, const godot_pool_color_array *p_pca) {
+void GDAPI godot_variant_new_packed_color_array(godot_variant *r_dest, const godot_packed_color_array *p_pca) {
 	Variant *dest = (Variant *)r_dest;
-	PoolColorArray *pca = (PoolColorArray *)p_pca;
+	PackedColorArray *pca = (PackedColorArray *)p_pca;
 	memnew_placement_custom(dest, Variant, Variant(*pca));
 }
 
@@ -271,6 +321,14 @@ godot_string GDAPI godot_variant_as_string(const godot_variant *p_self) {
 	return raw_dest;
 }
 
+godot_string_name GDAPI godot_variant_as_string_name(const godot_variant *p_self) {
+	godot_string_name raw_dest;
+	const Variant *self = (const Variant *)p_self;
+	StringName *dest = (StringName *)&raw_dest;
+	memnew_placement(dest, StringName(self->operator StringName())); // operator = is overloaded by StringName
+	return raw_dest;
+}
+
 godot_vector2 GDAPI godot_variant_as_vector2(const godot_variant *p_self) {
 	godot_vector2 raw_dest;
 	const Variant *self = (const Variant *)p_self;
@@ -279,6 +337,14 @@ godot_vector2 GDAPI godot_variant_as_vector2(const godot_variant *p_self) {
 	return raw_dest;
 }
 
+godot_vector2i GDAPI godot_variant_as_vector2i(const godot_variant *p_self) {
+	godot_vector2i raw_dest;
+	const Variant *self = (const Variant *)p_self;
+	Vector2i *dest = (Vector2i *)&raw_dest;
+	*dest = *self;
+	return raw_dest;
+}
+
 godot_rect2 GDAPI godot_variant_as_rect2(const godot_variant *p_self) {
 	godot_rect2 raw_dest;
 	const Variant *self = (const Variant *)p_self;
@@ -287,6 +353,14 @@ godot_rect2 GDAPI godot_variant_as_rect2(const godot_variant *p_self) {
 	return raw_dest;
 }
 
+godot_rect2i GDAPI godot_variant_as_rect2i(const godot_variant *p_self) {
+	godot_rect2i raw_dest;
+	const Variant *self = (const Variant *)p_self;
+	Rect2i *dest = (Rect2i *)&raw_dest;
+	*dest = *self;
+	return raw_dest;
+}
+
 godot_vector3 GDAPI godot_variant_as_vector3(const godot_variant *p_self) {
 	godot_vector3 raw_dest;
 	const Variant *self = (const Variant *)p_self;
@@ -295,6 +369,14 @@ godot_vector3 GDAPI godot_variant_as_vector3(const godot_variant *p_self) {
 	return raw_dest;
 }
 
+godot_vector3i GDAPI godot_variant_as_vector3i(const godot_variant *p_self) {
+	godot_vector3i raw_dest;
+	const Variant *self = (const Variant *)p_self;
+	Vector3i *dest = (Vector3i *)&raw_dest;
+	*dest = *self;
+	return raw_dest;
+}
+
 godot_transform2d GDAPI godot_variant_as_transform2d(const godot_variant *p_self) {
 	godot_transform2d raw_dest;
 	const Variant *self = (const Variant *)p_self;
@@ -367,6 +449,22 @@ godot_rid GDAPI godot_variant_as_rid(const godot_variant *p_self) {
 	return raw_dest;
 }
 
+godot_callable GDAPI godot_variant_as_callable(const godot_variant *p_self) {
+	godot_callable raw_dest;
+	const Variant *self = (const Variant *)p_self;
+	Callable *dest = (Callable *)&raw_dest;
+	*dest = *self;
+	return raw_dest;
+}
+
+godot_signal GDAPI godot_variant_as_signal(const godot_variant *p_self) {
+	godot_signal raw_dest;
+	const Variant *self = (const Variant *)p_self;
+	Signal *dest = (Signal *)&raw_dest;
+	*dest = *self;
+	return raw_dest;
+}
+
 godot_object GDAPI *godot_variant_as_object(const godot_variant *p_self) {
 	const Variant *self = (const Variant *)p_self;
 	Object *dest;
@@ -390,65 +488,83 @@ godot_array GDAPI godot_variant_as_array(const godot_variant *p_self) {
 	return raw_dest;
 }
 
-godot_pool_byte_array GDAPI godot_variant_as_pool_byte_array(const godot_variant *p_self) {
-	godot_pool_byte_array raw_dest;
+godot_packed_byte_array GDAPI godot_variant_as_packed_byte_array(const godot_variant *p_self) {
+	godot_packed_byte_array raw_dest;
+	const Variant *self = (const Variant *)p_self;
+	PackedByteArray *dest = (PackedByteArray *)&raw_dest;
+	memnew_placement(dest, PackedByteArray(self->operator PackedByteArray())); // operator = is overloaded by PackedByteArray
+	*dest = *self;
+	return raw_dest;
+}
+
+godot_packed_int32_array GDAPI godot_variant_as_packed_int32_array(const godot_variant *p_self) {
+	godot_packed_int32_array raw_dest;
 	const Variant *self = (const Variant *)p_self;
-	PoolByteArray *dest = (PoolByteArray *)&raw_dest;
-	memnew_placement(dest, PoolByteArray(self->operator PoolByteArray())); // operator = is overloaded by PoolByteArray
+	PackedInt32Array *dest = (PackedInt32Array *)&raw_dest;
+	memnew_placement(dest, PackedInt32Array(self->operator PackedInt32Array())); // operator = is overloaded by PackedInt32Array
 	*dest = *self;
 	return raw_dest;
 }
 
-godot_pool_int_array GDAPI godot_variant_as_pool_int_array(const godot_variant *p_self) {
-	godot_pool_int_array raw_dest;
+godot_packed_int64_array GDAPI godot_variant_as_packed_int64_array(const godot_variant *p_self) {
+	godot_packed_int64_array raw_dest;
 	const Variant *self = (const Variant *)p_self;
-	PoolIntArray *dest = (PoolIntArray *)&raw_dest;
-	memnew_placement(dest, PoolIntArray(self->operator PoolIntArray())); // operator = is overloaded by PoolIntArray
+	PackedInt64Array *dest = (PackedInt64Array *)&raw_dest;
+	memnew_placement(dest, PackedInt64Array(self->operator PackedInt64Array())); // operator = is overloaded by PackedInt64Array
 	*dest = *self;
 	return raw_dest;
 }
 
-godot_pool_real_array GDAPI godot_variant_as_pool_real_array(const godot_variant *p_self) {
-	godot_pool_real_array raw_dest;
+godot_packed_float32_array GDAPI godot_variant_as_packed_float32_array(const godot_variant *p_self) {
+	godot_packed_float32_array raw_dest;
 	const Variant *self = (const Variant *)p_self;
-	PoolRealArray *dest = (PoolRealArray *)&raw_dest;
-	memnew_placement(dest, PoolRealArray(self->operator PoolRealArray())); // operator = is overloaded by PoolRealArray
+	PackedFloat32Array *dest = (PackedFloat32Array *)&raw_dest;
+	memnew_placement(dest, PackedFloat32Array(self->operator PackedFloat32Array())); // operator = is overloaded by PackedFloat32Array
 	*dest = *self;
 	return raw_dest;
 }
 
-godot_pool_string_array GDAPI godot_variant_as_pool_string_array(const godot_variant *p_self) {
-	godot_pool_string_array raw_dest;
+godot_packed_float64_array GDAPI godot_variant_as_packed_float64_array(const godot_variant *p_self) {
+	godot_packed_float64_array raw_dest;
 	const Variant *self = (const Variant *)p_self;
-	PoolStringArray *dest = (PoolStringArray *)&raw_dest;
-	memnew_placement(dest, PoolStringArray(self->operator PoolStringArray())); // operator = is overloaded by PoolStringArray
+	PackedFloat64Array *dest = (PackedFloat64Array *)&raw_dest;
+	memnew_placement(dest, PackedFloat64Array(self->operator PackedFloat64Array())); // operator = is overloaded by PackedFloat64Array
 	*dest = *self;
 	return raw_dest;
 }
 
-godot_pool_vector2_array GDAPI godot_variant_as_pool_vector2_array(const godot_variant *p_self) {
-	godot_pool_vector2_array raw_dest;
+godot_packed_string_array GDAPI godot_variant_as_packed_string_array(const godot_variant *p_self) {
+	godot_packed_string_array raw_dest;
 	const Variant *self = (const Variant *)p_self;
-	PoolVector2Array *dest = (PoolVector2Array *)&raw_dest;
-	memnew_placement(dest, PoolVector2Array(self->operator PoolVector2Array())); // operator = is overloaded by PoolVector2Array
+	PackedStringArray *dest = (PackedStringArray *)&raw_dest;
+	memnew_placement(dest, PackedStringArray(self->operator PackedStringArray())); // operator = is overloaded by PackedStringArray
 	*dest = *self;
 	return raw_dest;
 }
 
-godot_pool_vector3_array GDAPI godot_variant_as_pool_vector3_array(const godot_variant *p_self) {
-	godot_pool_vector3_array raw_dest;
+godot_packed_vector2_array GDAPI godot_variant_as_packed_vector2_array(const godot_variant *p_self) {
+	godot_packed_vector2_array raw_dest;
 	const Variant *self = (const Variant *)p_self;
-	PoolVector3Array *dest = (PoolVector3Array *)&raw_dest;
-	memnew_placement(dest, PoolVector3Array(self->operator PoolVector3Array())); // operator = is overloaded by PoolVector3Array
+	PackedVector2Array *dest = (PackedVector2Array *)&raw_dest;
+	memnew_placement(dest, PackedVector2Array(self->operator PackedVector2Array())); // operator = is overloaded by PackedVector2Array
 	*dest = *self;
 	return raw_dest;
 }
 
-godot_pool_color_array GDAPI godot_variant_as_pool_color_array(const godot_variant *p_self) {
-	godot_pool_color_array raw_dest;
+godot_packed_vector3_array GDAPI godot_variant_as_packed_vector3_array(const godot_variant *p_self) {
+	godot_packed_vector3_array raw_dest;
 	const Variant *self = (const Variant *)p_self;
-	PoolColorArray *dest = (PoolColorArray *)&raw_dest;
-	memnew_placement(dest, PoolColorArray(self->operator PoolColorArray())); // operator = is overloaded by PoolColorArray
+	PackedVector3Array *dest = (PackedVector3Array *)&raw_dest;
+	memnew_placement(dest, PackedVector3Array(self->operator PackedVector3Array())); // operator = is overloaded by PackedVector3Array
+	*dest = *self;
+	return raw_dest;
+}
+
+godot_packed_color_array GDAPI godot_variant_as_packed_color_array(const godot_variant *p_self) {
+	godot_packed_color_array raw_dest;
+	const Variant *self = (const Variant *)p_self;
+	PackedColorArray *dest = (PackedColorArray *)&raw_dest;
+	memnew_placement(dest, PackedColorArray(self->operator PackedColorArray())); // operator = is overloaded by PackedColorArray
 	*dest = *self;
 	return raw_dest;
 }
@@ -459,7 +575,7 @@ godot_variant GDAPI godot_variant_call(godot_variant *p_self, const godot_string
 	const Variant **args = (const Variant **)p_args;
 	godot_variant raw_dest;
 	Variant *dest = (Variant *)&raw_dest;
-	Variant::CallError error;
+	Callable::CallError error;
 	memnew_placement_custom(dest, Variant, Variant(self->call(*method, args, p_argcount, error)));
 	if (r_error) {
 		r_error->error = (godot_variant_call_error_error)error.error;
@@ -487,6 +603,11 @@ godot_bool GDAPI godot_variant_operator_less(const godot_variant *p_self, const
 	return self->operator<(*other);
 }
 
+uint32_t GDAPI godot_variant_hash(const godot_variant *p_self) {
+	const Variant *self = (const Variant *)p_self;
+	return self->hash();
+}
+
 godot_bool GDAPI godot_variant_hash_compare(const godot_variant *p_self, const godot_variant *p_other) {
 	const Variant *self = (const Variant *)p_self;
 	const Variant *other = (const Variant *)p_other;
diff --git a/modules/gdnative/gdnative/vector2.cpp b/modules/gdnative/gdnative/vector2.cpp
index e9e2a8edf8..1ee716df86 100644
--- a/modules/gdnative/gdnative/vector2.cpp
+++ b/modules/gdnative/gdnative/vector2.cpp
@@ -37,8 +37,12 @@
 extern "C" {
 #endif
 
-void GDAPI godot_vector2_new(godot_vector2 *r_dest, const godot_real p_x, const godot_real p_y) {
+static_assert(sizeof(godot_vector2) == sizeof(Vector2), "Vector2 size mismatch");
+static_assert(sizeof(godot_vector2i) == sizeof(Vector2i), "Vector2i size mismatch");
+
+// Vector2
 
+void GDAPI godot_vector2_new(godot_vector2 *r_dest, const godot_real p_x, const godot_real p_y) {
 	Vector2 *dest = (Vector2 *)r_dest;
 	*dest = Vector2(p_x, p_y);
 }
@@ -50,6 +54,13 @@ godot_string GDAPI godot_vector2_as_string(const godot_vector2 *p_self) {
 	return ret;
 }
 
+godot_vector2i GDAPI godot_vector2_as_vector2i(const godot_vector2 *p_self) {
+	godot_vector2i dest;
+	const Vector2 *self = (const Vector2 *)p_self;
+	*((Vector2i *)&dest) = Vector2i(*self);
+	return dest;
+}
+
 godot_vector2 GDAPI godot_vector2_normalized(const godot_vector2 *p_self) {
 	godot_vector2 dest;
 	const Vector2 *self = (const Vector2 *)p_self;
@@ -109,11 +120,11 @@ godot_real GDAPI godot_vector2_angle_to_point(const godot_vector2 *p_self, const
 	return self->angle_to_point(*to);
 }
 
-godot_vector2 GDAPI godot_vector2_linear_interpolate(const godot_vector2 *p_self, const godot_vector2 *p_b, const godot_real p_t) {
+godot_vector2 GDAPI godot_vector2_lerp(const godot_vector2 *p_self, const godot_vector2 *p_b, const godot_real p_t) {
 	godot_vector2 dest;
 	const Vector2 *self = (const Vector2 *)p_self;
 	const Vector2 *b = (const Vector2 *)p_b;
-	*((Vector2 *)&dest) = self->linear_interpolate(*b, p_t);
+	*((Vector2 *)&dest) = self->lerp(*b, p_t);
 	return dest;
 }
 
@@ -157,6 +168,13 @@ godot_vector2 GDAPI godot_vector2_floor(const godot_vector2 *p_self) {
 	return dest;
 }
 
+godot_vector2 GDAPI godot_vector2_sign(const godot_vector2 *p_self) {
+	godot_vector2 dest;
+	const Vector2 *self = (const Vector2 *)p_self;
+	*((Vector2 *)&dest) = self->sign();
+	return dest;
+}
+
 godot_vector2 GDAPI godot_vector2_snapped(const godot_vector2 *p_self, const godot_vector2 *p_by) {
 	godot_vector2 dest;
 	const Vector2 *self = (const Vector2 *)p_self;
@@ -307,6 +325,138 @@ godot_real GDAPI godot_vector2_get_y(const godot_vector2 *p_self) {
 	return self->y;
 }
 
+// Vector2i
+
+void GDAPI godot_vector2i_new(godot_vector2i *r_dest, const godot_int p_x, const godot_int p_y) {
+	Vector2i *dest = (Vector2i *)r_dest;
+	*dest = Vector2i(p_x, p_y);
+}
+
+godot_string GDAPI godot_vector2i_as_string(const godot_vector2i *p_self) {
+	godot_string ret;
+	const Vector2i *self = (const Vector2i *)p_self;
+	memnew_placement(&ret, String(*self));
+	return ret;
+}
+
+godot_vector2 GDAPI godot_vector2i_as_vector2(const godot_vector2i *p_self) {
+	godot_vector2 dest;
+	const Vector2i *self = (const Vector2i *)p_self;
+	*((Vector2 *)&dest) = Vector2(*self);
+	return dest;
+}
+
+godot_real GDAPI godot_vector2i_aspect(const godot_vector2i *p_self) {
+	const Vector2i *self = (const Vector2i *)p_self;
+	return self->aspect();
+}
+
+godot_vector2i GDAPI godot_vector2i_abs(const godot_vector2i *p_self) {
+	godot_vector2i dest;
+	const Vector2i *self = (const Vector2i *)p_self;
+	*((Vector2i *)&dest) = self->abs();
+	return dest;
+}
+
+godot_vector2i GDAPI godot_vector2i_sign(const godot_vector2i *p_self) {
+	godot_vector2i dest;
+	const Vector2i *self = (const Vector2i *)p_self;
+	*((Vector2i *)&dest) = self->sign();
+	return dest;
+}
+
+godot_vector2i GDAPI godot_vector2i_operator_add(const godot_vector2i *p_self, const godot_vector2i *p_b) {
+	godot_vector2i raw_dest;
+	Vector2i *dest = (Vector2i *)&raw_dest;
+	const Vector2i *self = (const Vector2i *)p_self;
+	const Vector2i *b = (const Vector2i *)p_b;
+	*dest = *self + *b;
+	return raw_dest;
+}
+
+godot_vector2i GDAPI godot_vector2i_operator_subtract(const godot_vector2i *p_self, const godot_vector2i *p_b) {
+	godot_vector2i raw_dest;
+	Vector2i *dest = (Vector2i *)&raw_dest;
+	const Vector2i *self = (const Vector2i *)p_self;
+	const Vector2i *b = (const Vector2i *)p_b;
+	*dest = *self - *b;
+	return raw_dest;
+}
+
+godot_vector2i GDAPI godot_vector2i_operator_multiply_vector(const godot_vector2i *p_self, const godot_vector2i *p_b) {
+	godot_vector2i raw_dest;
+	Vector2i *dest = (Vector2i *)&raw_dest;
+	const Vector2i *self = (const Vector2i *)p_self;
+	const Vector2i *b = (const Vector2i *)p_b;
+	*dest = *self * *b;
+	return raw_dest;
+}
+
+godot_vector2i GDAPI godot_vector2i_operator_multiply_scalar(const godot_vector2i *p_self, const godot_int p_b) {
+	godot_vector2i raw_dest;
+	Vector2i *dest = (Vector2i *)&raw_dest;
+	const Vector2i *self = (const Vector2i *)p_self;
+	*dest = *self * p_b;
+	return raw_dest;
+}
+
+godot_vector2i GDAPI godot_vector2i_operator_divide_vector(const godot_vector2i *p_self, const godot_vector2i *p_b) {
+	godot_vector2i raw_dest;
+	Vector2i *dest = (Vector2i *)&raw_dest;
+	const Vector2i *self = (const Vector2i *)p_self;
+	const Vector2i *b = (const Vector2i *)p_b;
+	*dest = *self / *b;
+	return raw_dest;
+}
+
+godot_vector2i GDAPI godot_vector2i_operator_divide_scalar(const godot_vector2i *p_self, const godot_int p_b) {
+	godot_vector2i raw_dest;
+	Vector2i *dest = (Vector2i *)&raw_dest;
+	const Vector2i *self = (const Vector2i *)p_self;
+	*dest = *self / p_b;
+	return raw_dest;
+}
+
+godot_bool GDAPI godot_vector2i_operator_equal(const godot_vector2i *p_self, const godot_vector2i *p_b) {
+	const Vector2i *self = (const Vector2i *)p_self;
+	const Vector2i *b = (const Vector2i *)p_b;
+	return *self == *b;
+}
+
+godot_bool GDAPI godot_vector2i_operator_less(const godot_vector2i *p_self, const godot_vector2i *p_b) {
+	const Vector2i *self = (const Vector2i *)p_self;
+	const Vector2i *b = (const Vector2i *)p_b;
+	return *self < *b;
+}
+
+godot_vector2i GDAPI godot_vector2i_operator_neg(const godot_vector2i *p_self) {
+	godot_vector2i raw_dest;
+	Vector2i *dest = (Vector2i *)&raw_dest;
+	const Vector2i *self = (const Vector2i *)p_self;
+	*dest = -(*self);
+	return raw_dest;
+}
+
+void GDAPI godot_vector2i_set_x(godot_vector2i *p_self, const godot_int p_x) {
+	Vector2i *self = (Vector2i *)p_self;
+	self->x = p_x;
+}
+
+void GDAPI godot_vector2i_set_y(godot_vector2i *p_self, const godot_int p_y) {
+	Vector2i *self = (Vector2i *)p_self;
+	self->y = p_y;
+}
+
+godot_int GDAPI godot_vector2i_get_x(const godot_vector2i *p_self) {
+	const Vector2i *self = (const Vector2i *)p_self;
+	return self->x;
+}
+
+godot_int GDAPI godot_vector2i_get_y(const godot_vector2i *p_self) {
+	const Vector2i *self = (const Vector2i *)p_self;
+	return self->y;
+}
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/modules/gdnative/gdnative/vector3.cpp b/modules/gdnative/gdnative/vector3.cpp
index e34a9370a5..32cad30c17 100644
--- a/modules/gdnative/gdnative/vector3.cpp
+++ b/modules/gdnative/gdnative/vector3.cpp
@@ -37,8 +37,12 @@
 extern "C" {
 #endif
 
-void GDAPI godot_vector3_new(godot_vector3 *r_dest, const godot_real p_x, const godot_real p_y, const godot_real p_z) {
+static_assert(sizeof(godot_vector3) == sizeof(Vector3), "Vector3 size mismatch");
+static_assert(sizeof(godot_vector3i) == sizeof(Vector3i), "Vector3i size mismatch");
+
+// Vector3
 
+void GDAPI godot_vector3_new(godot_vector3 *r_dest, const godot_real p_x, const godot_real p_y, const godot_real p_z) {
 	Vector3 *dest = (Vector3 *)r_dest;
 	*dest = Vector3(p_x, p_y, p_z);
 }
@@ -50,6 +54,13 @@ godot_string GDAPI godot_vector3_as_string(const godot_vector3 *p_self) {
 	return ret;
 }
 
+godot_vector3i GDAPI godot_vector3_as_vector3i(const godot_vector3 *p_self) {
+	godot_vector3i dest;
+	const Vector3 *self = (const Vector3 *)p_self;
+	*((Vector3i *)&dest) = Vector3i(*self);
+	return dest;
+}
+
 godot_int GDAPI godot_vector3_min_axis(const godot_vector3 *p_self) {
 	const Vector3 *self = (const Vector3 *)p_self;
 	return self->min_axis();
@@ -106,11 +117,11 @@ godot_vector3 GDAPI godot_vector3_rotated(const godot_vector3 *p_self, const god
 	return dest;
 }
 
-godot_vector3 GDAPI godot_vector3_linear_interpolate(const godot_vector3 *p_self, const godot_vector3 *p_b, const godot_real p_t) {
+godot_vector3 GDAPI godot_vector3_lerp(const godot_vector3 *p_self, const godot_vector3 *p_b, const godot_real p_t) {
 	godot_vector3 dest;
 	const Vector3 *self = (const Vector3 *)p_self;
 	const Vector3 *b = (const Vector3 *)p_b;
-	*((Vector3 *)&dest) = self->linear_interpolate(*b, p_t);
+	*((Vector3 *)&dest) = self->lerp(*b, p_t);
 	return dest;
 }
 
@@ -168,6 +179,13 @@ godot_vector3 GDAPI godot_vector3_abs(const godot_vector3 *p_self) {
 	return dest;
 }
 
+godot_vector3 GDAPI godot_vector3_sign(const godot_vector3 *p_self) {
+	godot_vector3 dest;
+	const Vector3 *self = (const Vector3 *)p_self;
+	*((Vector3 *)&dest) = self->sign();
+	return dest;
+}
+
 godot_vector3 GDAPI godot_vector3_floor(const godot_vector3 *p_self) {
 	godot_vector3 dest;
 	const Vector3 *self = (const Vector3 *)p_self;
@@ -314,6 +332,133 @@ godot_real GDAPI godot_vector3_get_axis(const godot_vector3 *p_self, const godot
 	return self->get_axis(p_axis);
 }
 
+// Vector3i
+
+void GDAPI godot_vector3i_new(godot_vector3i *r_dest, const godot_int p_x, const godot_int p_y, const godot_int p_z) {
+	Vector3i *dest = (Vector3i *)r_dest;
+	*dest = Vector3i(p_x, p_y, p_z);
+}
+
+godot_string GDAPI godot_vector3i_as_string(const godot_vector3i *p_self) {
+	godot_string ret;
+	const Vector3i *self = (const Vector3i *)p_self;
+	memnew_placement(&ret, String(*self));
+	return ret;
+}
+
+godot_vector3 GDAPI godot_vector3i_as_vector3(const godot_vector3i *p_self) {
+	godot_vector3 dest;
+	const Vector3i *self = (const Vector3i *)p_self;
+	*((Vector3 *)&dest) = Vector3(*self);
+	return dest;
+}
+
+godot_int GDAPI godot_vector3i_min_axis(const godot_vector3i *p_self) {
+	const Vector3i *self = (const Vector3i *)p_self;
+	return self->min_axis();
+}
+
+godot_int GDAPI godot_vector3i_max_axis(const godot_vector3i *p_self) {
+	const Vector3i *self = (const Vector3i *)p_self;
+	return self->max_axis();
+}
+
+godot_vector3i GDAPI godot_vector3i_abs(const godot_vector3i *p_self) {
+	godot_vector3i dest;
+	const Vector3i *self = (const Vector3i *)p_self;
+	*((Vector3i *)&dest) = self->abs();
+	return dest;
+}
+
+godot_vector3i GDAPI godot_vector3i_sign(const godot_vector3i *p_self) {
+	godot_vector3i dest;
+	const Vector3i *self = (const Vector3i *)p_self;
+	*((Vector3i *)&dest) = self->sign();
+	return dest;
+}
+
+godot_vector3i GDAPI godot_vector3i_operator_add(const godot_vector3i *p_self, const godot_vector3i *p_b) {
+	godot_vector3i raw_dest;
+	Vector3i *dest = (Vector3i *)&raw_dest;
+	Vector3i *self = (Vector3i *)p_self;
+	const Vector3i *b = (const Vector3i *)p_b;
+	*dest = *self + *b;
+	return raw_dest;
+}
+
+godot_vector3i GDAPI godot_vector3i_operator_subtract(const godot_vector3i *p_self, const godot_vector3i *p_b) {
+	godot_vector3i raw_dest;
+	Vector3i *dest = (Vector3i *)&raw_dest;
+	Vector3i *self = (Vector3i *)p_self;
+	const Vector3i *b = (const Vector3i *)p_b;
+	*dest = *self - *b;
+	return raw_dest;
+}
+
+godot_vector3i GDAPI godot_vector3i_operator_multiply_vector(const godot_vector3i *p_self, const godot_vector3i *p_b) {
+	godot_vector3i raw_dest;
+	Vector3i *dest = (Vector3i *)&raw_dest;
+	Vector3i *self = (Vector3i *)p_self;
+	const Vector3i *b = (const Vector3i *)p_b;
+	*dest = *self * *b;
+	return raw_dest;
+}
+
+godot_vector3i GDAPI godot_vector3i_operator_multiply_scalar(const godot_vector3i *p_self, const godot_int p_b) {
+	godot_vector3i raw_dest;
+	Vector3i *dest = (Vector3i *)&raw_dest;
+	Vector3i *self = (Vector3i *)p_self;
+	*dest = *self * p_b;
+	return raw_dest;
+}
+
+godot_vector3i GDAPI godot_vector3i_operator_divide_vector(const godot_vector3i *p_self, const godot_vector3i *p_b) {
+	godot_vector3i raw_dest;
+	Vector3i *dest = (Vector3i *)&raw_dest;
+	Vector3i *self = (Vector3i *)p_self;
+	const Vector3i *b = (const Vector3i *)p_b;
+	*dest = *self / *b;
+	return raw_dest;
+}
+
+godot_vector3i GDAPI godot_vector3i_operator_divide_scalar(const godot_vector3i *p_self, const godot_int p_b) {
+	godot_vector3i raw_dest;
+	Vector3i *dest = (Vector3i *)&raw_dest;
+	Vector3i *self = (Vector3i *)p_self;
+	*dest = *self / p_b;
+	return raw_dest;
+}
+
+godot_bool GDAPI godot_vector3i_operator_equal(const godot_vector3i *p_self, const godot_vector3i *p_b) {
+	Vector3i *self = (Vector3i *)p_self;
+	const Vector3i *b = (const Vector3i *)p_b;
+	return *self == *b;
+}
+
+godot_bool GDAPI godot_vector3i_operator_less(const godot_vector3i *p_self, const godot_vector3i *p_b) {
+	Vector3i *self = (Vector3i *)p_self;
+	const Vector3i *b = (const Vector3i *)p_b;
+	return *self < *b;
+}
+
+godot_vector3i GDAPI godot_vector3i_operator_neg(const godot_vector3i *p_self) {
+	godot_vector3i raw_dest;
+	Vector3i *dest = (Vector3i *)&raw_dest;
+	const Vector3i *self = (const Vector3i *)p_self;
+	*dest = -(*self);
+	return raw_dest;
+}
+
+void GDAPI godot_vector3i_set_axis(godot_vector3i *p_self, const godot_vector3_axis p_axis, const godot_int p_val) {
+	Vector3i *self = (Vector3i *)p_self;
+	self->set_axis(p_axis, p_val);
+}
+
+godot_int GDAPI godot_vector3i_get_axis(const godot_vector3i *p_self, const godot_vector3_axis p_axis) {
+	const Vector3i *self = (const Vector3i *)p_self;
+	return self->get_axis(p_axis);
+}
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/modules/gdnative/gdnative_api.json b/modules/gdnative/gdnative_api.json
index 8ccb8d2286..82bfbd23de 100644
--- a/modules/gdnative/gdnative_api.json
+++ b/modules/gdnative/gdnative_api.json
@@ -2,1144 +2,587 @@
   "core": {
     "type": "CORE",
     "version": {
-      "major": 1,
+      "major": 4,
       "minor": 0
     },
-    "next": {
-      "type": "CORE",
-      "version": {
-        "major": 1,
-        "minor": 1
-      },
-      "next": {
-        "type": "CORE",
-        "version": {
-          "major": 1,
-          "minor": 2
-        },
-        "next": null,
-        "api": [
-          {
-            "name": "godot_dictionary_duplicate",
-            "return_type": "godot_dictionary",
-            "arguments": [
-              ["const godot_dictionary *", "p_self"],
-              ["const godot_bool", "p_deep"]
-            ]
-          },
-          {
-            "name": "godot_vector3_move_toward",
-            "return_type": "godot_vector3",
-            "arguments": [
-              ["const godot_vector3 *", "p_self"],
-              ["const godot_vector3 *", "p_to"],
-              ["const godot_real", "p_delta"]
-            ]
-          },
-          {
-            "name": "godot_vector2_move_toward",
-            "return_type": "godot_vector2",
-            "arguments": [
-              ["const godot_vector2 *", "p_self"],
-              ["const godot_vector2 *", "p_to"],
-              ["const godot_real", "p_delta"]
-            ]
-          },
-          {
-            "name": "godot_string_count",
-            "return_type": "godot_int",
-            "arguments": [
-              ["const godot_string *", "p_self"],
-              ["godot_string", "p_what"],
-              ["godot_int", "p_from"],
-              ["godot_int", "p_to"]
-            ]
-          },
-          {
-            "name": "godot_string_countn",
-            "return_type": "godot_int",
-            "arguments": [
-              ["const godot_string *", "p_self"],
-              ["godot_string", "p_what"],
-              ["godot_int", "p_from"],
-              ["godot_int", "p_to"]
-            ]
-          },
-          {
-            "name": "godot_vector3_direction_to",
-            "return_type": "godot_vector3",
-            "arguments": [
-              ["const godot_vector3 *", "p_self"],
-              ["const godot_vector3 *", "p_to"]
-            ]
-          },
-          {
-            "name": "godot_vector2_direction_to",
-            "return_type": "godot_vector2",
-            "arguments": [
-              ["const godot_vector2 *", "p_self"],
-              ["const godot_vector2 *", "p_to"]
-            ]
-          },
-          {
-            "name": "godot_array_slice",
-            "return_type": "godot_array",
-            "arguments": [
-              ["const godot_array *", "p_self"],
-              ["const godot_int", "p_begin"],
-              ["const godot_int", "p_end"],
-              ["const godot_int", "p_step"],
-              ["const godot_bool", "p_deep"]
-            ]
-          },
-          {
-            "name": "godot_pool_byte_array_empty",
-            "return_type": "godot_bool",
-            "arguments": [
-              ["const godot_pool_byte_array *", "p_self"]
-            ]
-          },
-          {
-            "name": "godot_pool_int_array_empty",
-            "return_type": "godot_bool",
-            "arguments": [
-              ["const godot_pool_int_array *", "p_self"]
-            ]
-          },
-          {
-            "name": "godot_pool_real_array_empty",
-            "return_type": "godot_bool",
-            "arguments": [
-              ["const godot_pool_real_array *", "p_self"]
-            ]
-          },
-          {
-            "name": "godot_pool_string_array_empty",
-            "return_type": "godot_bool",
-            "arguments": [
-              ["const godot_pool_string_array *", "p_self"]
-            ]
-          },
-          {
-            "name": "godot_pool_vector2_array_empty",
-            "return_type": "godot_bool",
-            "arguments": [
-              ["const godot_pool_vector2_array *", "p_self"]
-            ]
-          },
-          {
-            "name": "godot_pool_vector3_array_empty",
-            "return_type": "godot_bool",
-            "arguments": [
-              ["const godot_pool_vector3_array *", "p_self"]
-            ]
-          },
-          {
-            "name": "godot_pool_color_array_empty",
-            "return_type": "godot_bool",
-            "arguments": [
-              ["const godot_pool_color_array *", "p_self"]
-            ]
-          },
-          {
-            "name": "godot_get_class_tag",
-            "return_type": "void *",
-            "arguments": [
-              ["const godot_string_name *", "p_class"]
-            ]
-          },
-          {
-            "name": "godot_object_cast_to",
-            "return_type": "godot_object *",
-            "arguments": [
-              ["const godot_object *", "p_object"],
-              ["void *", "p_class_tag"]
-            ]
-          },
-          {
-            "name": "godot_instance_from_id",
-            "return_type": "godot_object *",
-            "arguments": [
-              ["godot_int", "p_instance_id"]
-            ]
-          }
-        ]
-      },
-      "api": [
-        {
-          "name": "godot_color_to_abgr32",
-          "return_type": "godot_int",
-          "arguments": [
-            ["const godot_color *", "p_self"]
-          ]
-        },
-        {
-          "name": "godot_color_to_abgr64",
-          "return_type": "godot_int",
-          "arguments": [
-            ["const godot_color *", "p_self"]
-          ]
-        },
-        {
-          "name": "godot_color_to_argb64",
-          "return_type": "godot_int",
-          "arguments": [
-            ["const godot_color *", "p_self"]
-          ]
-        },
-        {
-          "name": "godot_color_to_rgba64",
-          "return_type": "godot_int",
-          "arguments": [
-            ["const godot_color *", "p_self"]
-          ]
-        },
-        {
-          "name": "godot_color_darkened",
-          "return_type": "godot_color",
-          "arguments": [
-            ["const godot_color *", "p_self"],
-            ["const godot_real", "p_amount"]
-          ]
-        },
-        {
-          "name": "godot_color_from_hsv",
-          "return_type": "godot_color",
-          "arguments": [
-            ["const godot_color *", "p_self"],
-            ["const godot_real", "p_h"],
-            ["const godot_real", "p_s"],
-            ["const godot_real", "p_v"],
-            ["const godot_real", "p_a"]
-          ]
-        },
-        {
-          "name": "godot_color_lightened",
-          "return_type": "godot_color",
-          "arguments": [
-            ["const godot_color *", "p_self"],
-            ["const godot_real", "p_amount"]
-          ]
-        },
-        {
-          "name": "godot_array_duplicate",
-          "return_type": "godot_array",
-          "arguments": [
-            ["const godot_array *", "p_self"],
-            ["const godot_bool", "p_deep"]
-          ]
-        },
-        {
-          "name": "godot_array_max",
-          "return_type": "godot_variant",
-          "arguments": [
-            ["const godot_array *", "p_self"]
-          ]
-        },
-        {
-          "name": "godot_array_min",
-          "return_type": "godot_variant",
-          "arguments": [
-            ["const godot_array *", "p_self"]
-          ]
-        },
-        {
-          "name": "godot_array_shuffle",
-          "return_type": "void",
-          "arguments": [
-            ["godot_array *", "p_self"]
-          ]
-        },
-        {
-          "name": "godot_basis_slerp",
-          "return_type": "godot_basis",
-          "arguments": [
-            ["const godot_basis *", "p_self"],
-            ["const godot_basis *", "p_b"],
-            ["const godot_real", "p_t"]
-          ]
-        },
-        {
-          "name": "godot_dictionary_get_with_default",
-          "return_type": "godot_variant",
-          "arguments": [
-            ["const godot_dictionary *", "p_self"],
-            ["const godot_variant *", "p_key"],
-            ["const godot_variant *", "p_default"]
-          ]
-        },
-        {
-          "name": "godot_dictionary_erase_with_return",
-          "return_type": "bool",
-          "arguments": [
-            ["godot_dictionary *", "p_self"],
-            ["const godot_variant *", "p_key"]
-          ]
-        },
-        {
-          "name": "godot_node_path_get_as_property_path",
-          "return_type": "godot_node_path",
-          "arguments": [
-            ["const godot_node_path *", "p_self"]
-          ]
-        },
-        {
-          "name": "godot_quat_set_axis_angle",
-          "return_type": "void",
-          "arguments": [
-            ["godot_quat *", "p_self"],
-            ["const godot_vector3 *", "p_axis"],
-            ["const godot_real", "p_angle"]
-          ]
-        },
-        {
-          "name": "godot_rect2_grow_individual",
-          "return_type": "godot_rect2",
-          "arguments": [
-            ["const godot_rect2 *", "p_self"],
-            ["const godot_real", "p_left"],
-            ["const godot_real", "p_top"],
-            ["const godot_real", "p_right"],
-            ["const godot_real", "p_bottom"]
-          ]
-        },
-        {
-          "name": "godot_rect2_grow_margin",
-          "return_type": "godot_rect2",
-          "arguments": [
-            ["const godot_rect2 *", "p_self"],
-            ["const godot_int", "p_margin"],
-            ["const godot_real", "p_by"]
-          ]
-        },
-        {
-          "name": "godot_rect2_abs",
-          "return_type": "godot_rect2",
-          "arguments": [
-            ["const godot_rect2 *", "p_self"]
-          ]
-        },
-        {
-          "name": "godot_string_dedent",
-          "return_type": "godot_string",
-          "arguments": [
-            ["const godot_string *", "p_self"]
-          ]
-        },
-        {
-          "name": "godot_string_trim_prefix",
-          "return_type": "godot_string",
-          "arguments": [
-            ["const godot_string *", "p_self"],
-            ["const godot_string *", "p_prefix"]
-          ]
-        },
-        {
-          "name": "godot_string_trim_suffix",
-          "return_type": "godot_string",
-          "arguments": [
-            ["const godot_string *", "p_self"],
-            ["const godot_string *", "p_suffix"]
-          ]
-        },
-        {
-          "name": "godot_string_rstrip",
-          "return_type": "godot_string",
-          "arguments": [
-            ["const godot_string *", "p_self"],
-            ["const godot_string *", "p_chars"]
-          ]
-        },
-        {
-          "name": "godot_string_rsplit",
-          "return_type": "godot_pool_string_array",
-          "arguments": [
-            ["const godot_string *", "p_self"],
-            ["const godot_string *", "p_divisor"],
-            ["const godot_bool", "p_allow_empty"],
-            ["const godot_int", "p_maxsplit"]
-          ]
-        },
-        {
-          "name": "godot_basis_get_quat",
-          "return_type": "godot_quat",
-          "arguments": [
-            ["const godot_basis *", "p_self"]
-          ]
-        },
-        {
-          "name": "godot_basis_set_quat",
-          "return_type": "void",
-          "arguments": [
-            ["godot_basis *", "p_self"],
-            ["const godot_quat *", "p_quat"]
-          ]
-        },
-        {
-          "name": "godot_basis_set_axis_angle_scale",
-          "return_type": "void",
-          "arguments": [
-            ["godot_basis *", "p_self"],
-            ["const godot_vector3 *", "p_axis"],
-            ["godot_real", "p_phi"],
-            ["const godot_vector3 *", "p_scale"]
-          ]
-        },
-        {
-          "name": "godot_basis_set_euler_scale",
-          "return_type": "void",
-          "arguments": [
-            ["godot_basis *", "p_self"],
-            ["const godot_vector3 *", "p_euler"],
-            ["const godot_vector3 *", "p_scale"]
-          ]
-        },
-        {
-          "name": "godot_basis_set_quat_scale",
-          "return_type": "void",
-          "arguments": [
-            ["godot_basis *", "p_self"],
-            ["const godot_quat *", "p_quat"],
-            ["const godot_vector3 *", "p_scale"]
-          ]
-        },
-        {
-          "name": "godot_is_instance_valid",
-          "return_type": "bool",
-          "arguments": [
-            ["const godot_object *", "p_object"]
-          ]
-        },
-        {
-          "name": "godot_quat_new_with_basis",
-          "return_type": "void",
-          "arguments": [
-            ["godot_quat *", "r_dest"],
-            ["const godot_basis *", "p_basis"]
-          ]
-        },
-        {
-          "name": "godot_quat_new_with_euler",
-          "return_type": "void",
-          "arguments": [
-            ["godot_quat *", "r_dest"],
-            ["const godot_vector3 *", "p_euler"]
-          ]
-        },
-        {
-          "name": "godot_transform_new_with_quat",
-          "return_type": "void",
-          "arguments": [
-            ["godot_transform *", "r_dest"],
-            ["const godot_quat *", "p_quat"]
-          ]
-        },
-        {
-          "name": "godot_variant_get_operator_name",
-          "return_type": "godot_string",
-          "arguments": [
-            ["godot_variant_operator", "p_op"]
-          ]
-        },
-        {
-          "name": "godot_variant_evaluate",
-          "return_type": "void",
-          "arguments": [
-            ["godot_variant_operator", "p_op"],
-            ["const godot_variant *", "p_a"],
-            ["const godot_variant *", "p_b"],
-            ["godot_variant *", "r_ret"],
-            ["godot_bool *", "r_valid"]
-          ]
-        }
-      ]
-    },
+    "next": null,
     "api": [
       {
-        "name": "godot_color_new_rgba",
-        "return_type": "void",
-        "arguments": [
-          ["godot_color *", "r_dest"],
-          ["const godot_real", "p_r"],
-          ["const godot_real", "p_g"],
-          ["const godot_real", "p_b"],
-          ["const godot_real", "p_a"]
-        ]
-      },
-      {
-        "name": "godot_color_new_rgb",
-        "return_type": "void",
-        "arguments": [
-          ["godot_color *", "r_dest"],
-          ["const godot_real", "p_r"],
-          ["const godot_real", "p_g"],
-          ["const godot_real", "p_b"]
-        ]
-      },
-      {
-        "name": "godot_color_get_r",
-        "return_type": "godot_real",
-        "arguments": [
-          ["const godot_color *", "p_self"]
-        ]
-      },
-      {
-        "name": "godot_color_set_r",
-        "return_type": "void",
-        "arguments": [
-          ["godot_color *", "p_self"],
-          ["const godot_real", "r"]
-        ]
-      },
-      {
-        "name": "godot_color_get_g",
-        "return_type": "godot_real",
-        "arguments": [
-          ["const godot_color *", "p_self"]
-        ]
-      },
-      {
-        "name": "godot_color_set_g",
+        "name": "godot_aabb_new",
         "return_type": "void",
         "arguments": [
-          ["godot_color *", "p_self"],
-          ["const godot_real", "g"]
+          ["godot_aabb *", "r_dest"],
+          ["const godot_vector3 *", "p_pos"],
+          ["const godot_vector3 *", "p_size"]
         ]
       },
       {
-        "name": "godot_color_get_b",
-        "return_type": "godot_real",
+        "name": "godot_aabb_get_position",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_color *", "p_self"]
+          ["const godot_aabb *", "p_self"]
         ]
       },
       {
-        "name": "godot_color_set_b",
+        "name": "godot_aabb_set_position",
         "return_type": "void",
         "arguments": [
-          ["godot_color *", "p_self"],
-          ["const godot_real", "b"]
+          ["const godot_aabb *", "p_self"],
+          ["const godot_vector3 *", "p_v"]
         ]
       },
       {
-        "name": "godot_color_get_a",
-        "return_type": "godot_real",
+        "name": "godot_aabb_get_size",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_color *", "p_self"]
+          ["const godot_aabb *", "p_self"]
         ]
       },
       {
-        "name": "godot_color_set_a",
+        "name": "godot_aabb_set_size",
         "return_type": "void",
         "arguments": [
-          ["godot_color *", "p_self"],
-          ["const godot_real", "a"]
-        ]
-      },
-      {
-        "name": "godot_color_get_h",
-        "return_type": "godot_real",
-        "arguments": [
-          ["const godot_color *", "p_self"]
-        ]
-      },
-      {
-        "name": "godot_color_get_s",
-        "return_type": "godot_real",
-        "arguments": [
-          ["const godot_color *", "p_self"]
-        ]
-      },
-      {
-        "name": "godot_color_get_v",
-        "return_type": "godot_real",
-        "arguments": [
-          ["const godot_color *", "p_self"]
+          ["const godot_aabb *", "p_self"],
+          ["const godot_vector3 *", "p_v"]
         ]
       },
       {
-        "name": "godot_color_as_string",
+        "name": "godot_aabb_as_string",
         "return_type": "godot_string",
         "arguments": [
-          ["const godot_color *", "p_self"]
-        ]
-      },
-      {
-        "name": "godot_color_to_rgba32",
-        "return_type": "godot_int",
-        "arguments": [
-          ["const godot_color *", "p_self"]
+          ["const godot_aabb *", "p_self"]
         ]
       },
       {
-        "name": "godot_color_to_argb32",
-        "return_type": "godot_int",
+        "name": "godot_aabb_abs",
+        "return_type": "godot_aabb",
         "arguments": [
-          ["const godot_color *", "p_self"]
+          ["const godot_aabb *", "p_self"]
         ]
       },
       {
-        "name": "godot_color_gray",
+        "name": "godot_aabb_get_area",
         "return_type": "godot_real",
         "arguments": [
-          ["const godot_color *", "p_self"]
-        ]
-      },
-      {
-        "name": "godot_color_inverted",
-        "return_type": "godot_color",
-        "arguments": [
-          ["const godot_color *", "p_self"]
-        ]
-      },
-      {
-        "name": "godot_color_contrasted",
-        "return_type": "godot_color",
-        "arguments": [
-          ["const godot_color *", "p_self"]
-        ]
-      },
-      {
-        "name": "godot_color_linear_interpolate",
-        "return_type": "godot_color",
-        "arguments": [
-          ["const godot_color *", "p_self"],
-          ["const godot_color *", "p_b"],
-          ["const godot_real", "p_t"]
-        ]
-      },
-      {
-        "name": "godot_color_blend",
-        "return_type": "godot_color",
-        "arguments": [
-          ["const godot_color *", "p_self"],
-          ["const godot_color *", "p_over"]
-        ]
-      },
-      {
-        "name": "godot_color_to_html",
-        "return_type": "godot_string",
-        "arguments": [
-          ["const godot_color *", "p_self"],
-          ["const godot_bool", "p_with_alpha"]
+          ["const godot_aabb *", "p_self"]
         ]
       },
       {
-        "name": "godot_color_operator_equal",
+        "name": "godot_aabb_has_no_area",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_color *", "p_self"],
-          ["const godot_color *", "p_b"]
+          ["const godot_aabb *", "p_self"]
         ]
       },
       {
-        "name": "godot_color_operator_less",
+        "name": "godot_aabb_has_no_surface",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_color *", "p_self"],
-          ["const godot_color *", "p_b"]
+          ["const godot_aabb *", "p_self"]
         ]
       },
       {
-        "name": "godot_vector2_new",
-        "return_type": "void",
+        "name": "godot_aabb_intersects",
+        "return_type": "godot_bool",
         "arguments": [
-          ["godot_vector2 *", "r_dest"],
-          ["const godot_real", "p_x"],
-          ["const godot_real", "p_y"]
+          ["const godot_aabb *", "p_self"],
+          ["const godot_aabb *", "p_with"]
         ]
       },
       {
-        "name": "godot_vector2_as_string",
-        "return_type": "godot_string",
+        "name": "godot_aabb_encloses",
+        "return_type": "godot_bool",
         "arguments": [
-          ["const godot_vector2 *", "p_self"]
+          ["const godot_aabb *", "p_self"],
+          ["const godot_aabb *", "p_with"]
         ]
       },
       {
-        "name": "godot_vector2_normalized",
-        "return_type": "godot_vector2",
+        "name": "godot_aabb_merge",
+        "return_type": "godot_aabb",
         "arguments": [
-          ["const godot_vector2 *", "p_self"]
+          ["const godot_aabb *", "p_self"],
+          ["const godot_aabb *", "p_with"]
         ]
       },
       {
-        "name": "godot_vector2_length",
-        "return_type": "godot_real",
+        "name": "godot_aabb_intersection",
+        "return_type": "godot_aabb",
         "arguments": [
-          ["const godot_vector2 *", "p_self"]
+          ["const godot_aabb *", "p_self"],
+          ["const godot_aabb *", "p_with"]
         ]
       },
       {
-        "name": "godot_vector2_angle",
-        "return_type": "godot_real",
+        "name": "godot_aabb_intersects_plane",
+        "return_type": "godot_bool",
         "arguments": [
-          ["const godot_vector2 *", "p_self"]
+          ["const godot_aabb *", "p_self"],
+          ["const godot_plane *", "p_plane"]
         ]
       },
       {
-        "name": "godot_vector2_length_squared",
-        "return_type": "godot_real",
+        "name": "godot_aabb_intersects_segment",
+        "return_type": "godot_bool",
         "arguments": [
-          ["const godot_vector2 *", "p_self"]
+          ["const godot_aabb *", "p_self"],
+          ["const godot_vector3 *", "p_from"],
+          ["const godot_vector3 *", "p_to"]
         ]
       },
       {
-        "name": "godot_vector2_is_normalized",
+        "name": "godot_aabb_has_point",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_vector2 *", "p_self"]
+          ["const godot_aabb *", "p_self"],
+          ["const godot_vector3 *", "p_point"]
         ]
       },
       {
-        "name": "godot_vector2_distance_to",
-        "return_type": "godot_real",
+        "name": "godot_aabb_get_support",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_vector2 *", "p_self"],
-          ["const godot_vector2 *", "p_to"]
+          ["const godot_aabb *", "p_self"],
+          ["const godot_vector3 *", "p_dir"]
         ]
       },
       {
-        "name": "godot_vector2_distance_squared_to",
-        "return_type": "godot_real",
+        "name": "godot_aabb_get_longest_axis",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_vector2 *", "p_self"],
-          ["const godot_vector2 *", "p_to"]
+          ["const godot_aabb *", "p_self"]
         ]
       },
       {
-        "name": "godot_vector2_angle_to",
-        "return_type": "godot_real",
+        "name": "godot_aabb_get_longest_axis_index",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_vector2 *", "p_self"],
-          ["const godot_vector2 *", "p_to"]
+          ["const godot_aabb *", "p_self"]
         ]
       },
       {
-        "name": "godot_vector2_angle_to_point",
+        "name": "godot_aabb_get_longest_axis_size",
         "return_type": "godot_real",
         "arguments": [
-          ["const godot_vector2 *", "p_self"],
-          ["const godot_vector2 *", "p_to"]
+          ["const godot_aabb *", "p_self"]
         ]
       },
       {
-        "name": "godot_vector2_linear_interpolate",
-        "return_type": "godot_vector2",
+        "name": "godot_aabb_get_shortest_axis",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_vector2 *", "p_self"],
-          ["const godot_vector2 *", "p_b"],
-          ["const godot_real", "p_t"]
+          ["const godot_aabb *", "p_self"]
         ]
       },
       {
-        "name": "godot_vector2_cubic_interpolate",
-        "return_type": "godot_vector2",
+        "name": "godot_aabb_get_shortest_axis_index",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_vector2 *", "p_self"],
-          ["const godot_vector2 *", "p_b"],
-          ["const godot_vector2 *", "p_pre_a"],
-          ["const godot_vector2 *", "p_post_b"],
-          ["const godot_real", "p_t"]
+          ["const godot_aabb *", "p_self"]
         ]
       },
       {
-        "name": "godot_vector2_rotated",
-        "return_type": "godot_vector2",
+        "name": "godot_aabb_get_shortest_axis_size",
+        "return_type": "godot_real",
         "arguments": [
-          ["const godot_vector2 *", "p_self"],
-          ["const godot_real", "p_phi"]
+          ["const godot_aabb *", "p_self"]
         ]
       },
       {
-        "name": "godot_vector2_tangent",
-        "return_type": "godot_vector2",
+        "name": "godot_aabb_expand",
+        "return_type": "godot_aabb",
         "arguments": [
-          ["const godot_vector2 *", "p_self"]
+          ["const godot_aabb *", "p_self"],
+          ["const godot_vector3 *", "p_to_point"]
         ]
       },
       {
-        "name": "godot_vector2_floor",
-        "return_type": "godot_vector2",
+        "name": "godot_aabb_grow",
+        "return_type": "godot_aabb",
         "arguments": [
-          ["const godot_vector2 *", "p_self"]
+          ["const godot_aabb *", "p_self"],
+          ["const godot_real", "p_by"]
         ]
       },
       {
-        "name": "godot_vector2_snapped",
-        "return_type": "godot_vector2",
+        "name": "godot_aabb_get_endpoint",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_vector2 *", "p_self"],
-          ["const godot_vector2 *", "p_by"]
+          ["const godot_aabb *", "p_self"],
+          ["const godot_int", "p_idx"]
         ]
       },
       {
-        "name": "godot_vector2_aspect",
-        "return_type": "godot_real",
+        "name": "godot_aabb_operator_equal",
+        "return_type": "godot_bool",
         "arguments": [
-          ["const godot_vector2 *", "p_self"]
+          ["const godot_aabb *", "p_self"],
+          ["const godot_aabb *", "p_b"]
         ]
       },
       {
-        "name": "godot_vector2_dot",
-        "return_type": "godot_real",
+        "name": "godot_array_new",
+        "return_type": "void",
         "arguments": [
-          ["const godot_vector2 *", "p_self"],
-          ["const godot_vector2 *", "p_with"]
+          ["godot_array *", "r_dest"]
         ]
       },
       {
-        "name": "godot_vector2_slide",
-        "return_type": "godot_vector2",
+        "name": "godot_array_new_copy",
+        "return_type": "void",
         "arguments": [
-          ["const godot_vector2 *", "p_self"],
-          ["const godot_vector2 *", "p_n"]
+          ["godot_array *", "r_dest"],
+          ["const godot_array *", "p_src"]
         ]
       },
       {
-        "name": "godot_vector2_bounce",
-        "return_type": "godot_vector2",
+        "name": "godot_array_new_packed_color_array",
+        "return_type": "void",
         "arguments": [
-          ["const godot_vector2 *", "p_self"],
-          ["const godot_vector2 *", "p_n"]
+          ["godot_array *", "r_dest"],
+          ["const godot_packed_color_array *", "p_pca"]
         ]
       },
       {
-        "name": "godot_vector2_reflect",
-        "return_type": "godot_vector2",
+        "name": "godot_array_new_packed_vector3_array",
+        "return_type": "void",
         "arguments": [
-          ["const godot_vector2 *", "p_self"],
-          ["const godot_vector2 *", "p_n"]
+          ["godot_array *", "r_dest"],
+          ["const godot_packed_vector3_array *", "p_pv3a"]
         ]
       },
       {
-        "name": "godot_vector2_abs",
-        "return_type": "godot_vector2",
+        "name": "godot_array_new_packed_vector2_array",
+        "return_type": "void",
         "arguments": [
-          ["const godot_vector2 *", "p_self"]
+          ["godot_array *", "r_dest"],
+          ["const godot_packed_vector2_array *", "p_pv2a"]
         ]
       },
       {
-        "name": "godot_vector2_clamped",
-        "return_type": "godot_vector2",
+        "name": "godot_array_new_packed_string_array",
+        "return_type": "void",
         "arguments": [
-          ["const godot_vector2 *", "p_self"],
-          ["const godot_real", "p_length"]
+          ["godot_array *", "r_dest"],
+          ["const godot_packed_string_array *", "p_psa"]
         ]
       },
       {
-        "name": "godot_vector2_operator_add",
-        "return_type": "godot_vector2",
+        "name": "godot_array_new_packed_float32_array",
+        "return_type": "void",
         "arguments": [
-          ["const godot_vector2 *", "p_self"],
-          ["const godot_vector2 *", "p_b"]
+          ["godot_array *", "r_dest"],
+          ["const godot_packed_float32_array *", "p_pra"]
         ]
       },
       {
-        "name": "godot_vector2_operator_subtract",
-        "return_type": "godot_vector2",
+        "name": "godot_array_new_packed_float64_array",
+        "return_type": "void",
         "arguments": [
-          ["const godot_vector2 *", "p_self"],
-          ["const godot_vector2 *", "p_b"]
+          ["godot_array *", "r_dest"],
+          ["const godot_packed_float64_array *", "p_pra"]
         ]
       },
       {
-        "name": "godot_vector2_operator_multiply_vector",
-        "return_type": "godot_vector2",
+        "name": "godot_array_new_packed_int32_array",
+        "return_type": "void",
         "arguments": [
-          ["const godot_vector2 *", "p_self"],
-          ["const godot_vector2 *", "p_b"]
+          ["godot_array *", "r_dest"],
+          ["const godot_packed_int32_array *", "p_pia"]
         ]
       },
       {
-        "name": "godot_vector2_operator_multiply_scalar",
-        "return_type": "godot_vector2",
+        "name": "godot_array_new_packed_int64_array",
+        "return_type": "void",
         "arguments": [
-          ["const godot_vector2 *", "p_self"],
-          ["const godot_real", "p_b"]
+          ["godot_array *", "r_dest"],
+          ["const godot_packed_int64_array *", "p_pia"]
         ]
       },
       {
-        "name": "godot_vector2_operator_divide_vector",
-        "return_type": "godot_vector2",
+        "name": "godot_array_new_packed_byte_array",
+        "return_type": "void",
         "arguments": [
-          ["const godot_vector2 *", "p_self"],
-          ["const godot_vector2 *", "p_b"]
+          ["godot_array *", "r_dest"],
+          ["const godot_packed_byte_array *", "p_pba"]
         ]
       },
       {
-        "name": "godot_vector2_operator_divide_scalar",
-        "return_type": "godot_vector2",
+        "name": "godot_array_set",
+        "return_type": "void",
         "arguments": [
-          ["const godot_vector2 *", "p_self"],
-          ["const godot_real", "p_b"]
+          ["godot_array *", "p_self"],
+          ["const godot_int", "p_idx"],
+          ["const godot_variant *", "p_value"]
         ]
       },
       {
-        "name": "godot_vector2_operator_equal",
-        "return_type": "godot_bool",
+        "name": "godot_array_get",
+        "return_type": "godot_variant",
         "arguments": [
-          ["const godot_vector2 *", "p_self"],
-          ["const godot_vector2 *", "p_b"]
+          ["const godot_array *", "p_self"],
+          ["const godot_int", "p_idx"]
         ]
       },
       {
-        "name": "godot_vector2_operator_less",
-        "return_type": "godot_bool",
+        "name": "godot_array_operator_index",
+        "return_type": "godot_variant *",
         "arguments": [
-          ["const godot_vector2 *", "p_self"],
-          ["const godot_vector2 *", "p_b"]
+          ["godot_array *", "p_self"],
+          ["const godot_int", "p_idx"]
         ]
       },
       {
-        "name": "godot_vector2_operator_neg",
-        "return_type": "godot_vector2",
+        "name": "godot_array_operator_index_const",
+        "return_type": "const godot_variant *",
         "arguments": [
-          ["const godot_vector2 *", "p_self"]
+          ["const godot_array *", "p_self"],
+          ["const godot_int", "p_idx"]
         ]
       },
       {
-        "name": "godot_vector2_set_x",
+        "name": "godot_array_append",
         "return_type": "void",
         "arguments": [
-          ["godot_vector2 *", "p_self"],
-          ["const godot_real", "p_x"]
+          ["godot_array *", "p_self"],
+          ["const godot_variant *", "p_value"]
         ]
       },
       {
-        "name": "godot_vector2_set_y",
+        "name": "godot_array_clear",
         "return_type": "void",
         "arguments": [
-          ["godot_vector2 *", "p_self"],
-          ["const godot_real", "p_y"]
+          ["godot_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_vector2_get_x",
-        "return_type": "godot_real",
+        "name": "godot_array_count",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_vector2 *", "p_self"]
+          ["const godot_array *", "p_self"],
+          ["const godot_variant *", "p_value"]
         ]
       },
       {
-        "name": "godot_vector2_get_y",
-        "return_type": "godot_real",
+        "name": "godot_array_duplicate",
+        "return_type": "godot_array",
         "arguments": [
-          ["const godot_vector2 *", "p_self"]
+          ["const godot_array *", "p_self"],
+          ["const godot_bool", "p_deep"]
         ]
       },
       {
-        "name": "godot_quat_new",
-        "return_type": "void",
+        "name": "godot_array_empty",
+        "return_type": "godot_bool",
         "arguments": [
-          ["godot_quat *", "r_dest"],
-          ["const godot_real", "p_x"],
-          ["const godot_real", "p_y"],
-          ["const godot_real", "p_z"],
-          ["const godot_real", "p_w"]
+          ["const godot_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_quat_new_with_axis_angle",
+        "name": "godot_array_erase",
         "return_type": "void",
         "arguments": [
-          ["godot_quat *", "r_dest"],
-          ["const godot_vector3 *", "p_axis"],
-          ["const godot_real", "p_angle"]
+          ["godot_array *", "p_self"],
+          ["const godot_variant *", "p_value"]
         ]
       },
       {
-        "name": "godot_quat_get_x",
-        "return_type": "godot_real",
+        "name": "godot_array_front",
+        "return_type": "godot_variant",
         "arguments": [
-          ["const godot_quat *", "p_self"]
+          ["const godot_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_quat_set_x",
-        "return_type": "void",
+        "name": "godot_array_back",
+        "return_type": "godot_variant",
         "arguments": [
-          ["godot_quat *", "p_self"],
-          ["const godot_real", "val"]
+          ["const godot_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_quat_get_y",
-        "return_type": "godot_real",
+        "name": "godot_array_find",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_quat *", "p_self"]
+          ["const godot_array *", "p_self"],
+          ["const godot_variant *", "p_what"],
+          ["const godot_int", "p_from"]
         ]
       },
       {
-        "name": "godot_quat_set_y",
-        "return_type": "void",
+        "name": "godot_array_find_last",
+        "return_type": "godot_int",
         "arguments": [
-          ["godot_quat *", "p_self"],
-          ["const godot_real", "val"]
+          ["const godot_array *", "p_self"],
+          ["const godot_variant *", "p_what"]
         ]
       },
       {
-        "name": "godot_quat_get_z",
-        "return_type": "godot_real",
+        "name": "godot_array_has",
+        "return_type": "godot_bool",
         "arguments": [
-          ["const godot_quat *", "p_self"]
+          ["const godot_array *", "p_self"],
+          ["const godot_variant *", "p_value"]
         ]
       },
       {
-        "name": "godot_quat_set_z",
-        "return_type": "void",
+        "name": "godot_array_hash",
+        "return_type": "godot_int",
         "arguments": [
-          ["godot_quat *", "p_self"],
-          ["const godot_real", "val"]
+          ["const godot_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_quat_get_w",
-        "return_type": "godot_real",
+        "name": "godot_array_insert",
+        "return_type": "void",
         "arguments": [
-          ["const godot_quat *", "p_self"]
+          ["godot_array *", "p_self"],
+          ["const godot_int", "p_pos"],
+          ["const godot_variant *", "p_value"]
         ]
       },
       {
-        "name": "godot_quat_set_w",
+        "name": "godot_array_invert",
         "return_type": "void",
         "arguments": [
-          ["godot_quat *", "p_self"],
-          ["const godot_real", "val"]
+          ["godot_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_quat_as_string",
-        "return_type": "godot_string",
+        "name": "godot_array_max",
+        "return_type": "godot_variant",
         "arguments": [
-          ["const godot_quat *", "p_self"]
+          ["const godot_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_quat_length",
-        "return_type": "godot_real",
+        "name": "godot_array_min",
+        "return_type": "godot_variant",
         "arguments": [
-          ["const godot_quat *", "p_self"]
+          ["const godot_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_quat_length_squared",
-        "return_type": "godot_real",
+        "name": "godot_array_pop_back",
+        "return_type": "godot_variant",
         "arguments": [
-          ["const godot_quat *", "p_self"]
+          ["godot_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_quat_normalized",
-        "return_type": "godot_quat",
+        "name": "godot_array_pop_front",
+        "return_type": "godot_variant",
         "arguments": [
-          ["const godot_quat *", "p_self"]
+          ["godot_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_quat_is_normalized",
-        "return_type": "godot_bool",
+        "name": "godot_array_push_back",
+        "return_type": "void",
         "arguments": [
-          ["const godot_quat *", "p_self"]
+          ["godot_array *", "p_self"],
+          ["const godot_variant *", "p_value"]
         ]
       },
       {
-        "name": "godot_quat_inverse",
-        "return_type": "godot_quat",
+        "name": "godot_array_push_front",
+        "return_type": "void",
         "arguments": [
-          ["const godot_quat *", "p_self"]
+          ["godot_array *", "p_self"],
+          ["const godot_variant *", "p_value"]
         ]
       },
       {
-        "name": "godot_quat_dot",
-        "return_type": "godot_real",
+        "name": "godot_array_remove",
+        "return_type": "void",
         "arguments": [
-          ["const godot_quat *", "p_self"],
-          ["const godot_quat *", "p_b"]
+          ["godot_array *", "p_self"],
+          ["const godot_int", "p_idx"]
         ]
       },
       {
-        "name": "godot_quat_xform",
-        "return_type": "godot_vector3",
+        "name": "godot_array_resize",
+        "return_type": "void",
         "arguments": [
-          ["const godot_quat *", "p_self"],
-          ["const godot_vector3 *", "p_v"]
+          ["godot_array *", "p_self"],
+          ["const godot_int", "p_size"]
         ]
       },
       {
-        "name": "godot_quat_slerp",
-        "return_type": "godot_quat",
+        "name": "godot_array_rfind",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_quat *", "p_self"],
-          ["const godot_quat *", "p_b"],
-          ["const godot_real", "p_t"]
+          ["const godot_array *", "p_self"],
+          ["const godot_variant *", "p_what"],
+          ["const godot_int", "p_from"]
         ]
       },
       {
-        "name": "godot_quat_slerpni",
-        "return_type": "godot_quat",
+        "name": "godot_array_size",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_quat *", "p_self"],
-          ["const godot_quat *", "p_b"],
-          ["const godot_real", "p_t"]
+          ["const godot_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_quat_cubic_slerp",
-        "return_type": "godot_quat",
+        "name": "godot_array_shuffle",
+        "return_type": "void",
         "arguments": [
-          ["const godot_quat *", "p_self"],
-          ["const godot_quat *", "p_b"],
-          ["const godot_quat *", "p_pre_a"],
-          ["const godot_quat *", "p_post_b"],
-          ["const godot_real", "p_t"]
+          ["godot_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_quat_operator_multiply",
-        "return_type": "godot_quat",
+        "name": "godot_array_slice",
+        "return_type": "godot_array",
         "arguments": [
-          ["const godot_quat *", "p_self"],
-          ["const godot_real", "p_b"]
+          ["const godot_array *", "p_self"],
+          ["const godot_int", "p_begin"],
+          ["const godot_int", "p_end"],
+          ["const godot_int", "p_step"],
+          ["const godot_bool", "p_deep"]
         ]
       },
       {
-        "name": "godot_quat_operator_add",
-        "return_type": "godot_quat",
+        "name": "godot_array_sort",
+        "return_type": "void",
         "arguments": [
-          ["const godot_quat *", "p_self"],
-          ["const godot_quat *", "p_b"]
+          ["godot_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_quat_operator_subtract",
-        "return_type": "godot_quat",
+        "name": "godot_array_sort_custom",
+        "return_type": "void",
         "arguments": [
-          ["const godot_quat *", "p_self"],
-          ["const godot_quat *", "p_b"]
+          ["godot_array *", "p_self"],
+          ["godot_object *", "p_obj"],
+          ["const godot_string *", "p_func"]
         ]
       },
       {
-        "name": "godot_quat_operator_divide",
-        "return_type": "godot_quat",
+        "name": "godot_array_bsearch",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_quat *", "p_self"],
-          ["const godot_real", "p_b"]
+          ["godot_array *", "p_self"],
+          ["const godot_variant *", "p_value"],
+          ["const godot_bool", "p_before"]
         ]
       },
       {
-        "name": "godot_quat_operator_equal",
-        "return_type": "godot_bool",
+        "name": "godot_array_bsearch_custom",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_quat *", "p_self"],
-          ["const godot_quat *", "p_b"]
+          ["godot_array *", "p_self"],
+          ["const godot_variant *", "p_value"],
+          ["godot_object *", "p_obj"],
+          ["const godot_string *", "p_func"],
+          ["const godot_bool", "p_before"]
         ]
       },
       {
-        "name": "godot_quat_operator_neg",
-        "return_type": "godot_quat",
+        "name": "godot_array_destroy",
+        "return_type": "void",
         "arguments": [
-          ["const godot_quat *", "p_self"]
+          ["godot_array *", "p_self"]
         ]
       },
       {
@@ -1380,2110 +823,2117 @@
         ]
       },
       {
-        "name": "godot_vector3_new",
-        "return_type": "void",
+        "name": "godot_basis_slerp",
+        "return_type": "godot_basis",
         "arguments": [
-          ["godot_vector3 *", "r_dest"],
-          ["const godot_real", "p_x"],
-          ["const godot_real", "p_y"],
-          ["const godot_real", "p_z"]
+          ["const godot_basis *", "p_self"],
+          ["const godot_basis *", "p_b"],
+          ["const godot_real", "p_t"]
         ]
       },
       {
-        "name": "godot_vector3_as_string",
-        "return_type": "godot_string",
+        "name": "godot_basis_get_quat",
+        "return_type": "godot_quat",
         "arguments": [
-          ["const godot_vector3 *", "p_self"]
+          ["const godot_basis *", "p_self"]
         ]
       },
       {
-        "name": "godot_vector3_min_axis",
-        "return_type": "godot_int",
+        "name": "godot_basis_set_quat",
+        "return_type": "void",
         "arguments": [
-          ["const godot_vector3 *", "p_self"]
+          ["godot_basis *", "p_self"],
+          ["const godot_quat *", "p_quat"]
         ]
       },
       {
-        "name": "godot_vector3_max_axis",
-        "return_type": "godot_int",
+        "name": "godot_basis_set_axis_angle_scale",
+        "return_type": "void",
         "arguments": [
-          ["const godot_vector3 *", "p_self"]
+          ["godot_basis *", "p_self"],
+          ["const godot_vector3 *", "p_axis"],
+          ["godot_real", "p_phi"],
+          ["const godot_vector3 *", "p_scale"]
         ]
       },
       {
-        "name": "godot_vector3_length",
-        "return_type": "godot_real",
+        "name": "godot_basis_set_euler_scale",
+        "return_type": "void",
         "arguments": [
-          ["const godot_vector3 *", "p_self"]
+          ["godot_basis *", "p_self"],
+          ["const godot_vector3 *", "p_euler"],
+          ["const godot_vector3 *", "p_scale"]
         ]
       },
       {
-        "name": "godot_vector3_length_squared",
-        "return_type": "godot_real",
+        "name": "godot_basis_set_quat_scale",
+        "return_type": "void",
         "arguments": [
-          ["const godot_vector3 *", "p_self"]
+          ["godot_basis *", "p_self"],
+          ["const godot_quat *", "p_quat"],
+          ["const godot_vector3 *", "p_scale"]
         ]
       },
       {
-        "name": "godot_vector3_is_normalized",
-        "return_type": "godot_bool",
+        "name": "godot_callable_new_with_object",
+        "return_type": "void",
         "arguments": [
-          ["const godot_vector3 *", "p_self"]
+          ["godot_callable *", "r_dest"],
+          ["const godot_object *", "p_object"],
+          ["const godot_string_name *", "p_method"]
         ]
       },
       {
-        "name": "godot_vector3_normalized",
-        "return_type": "godot_vector3",
+        "name": "godot_callable_new_with_object_id",
+        "return_type": "void",
         "arguments": [
-          ["const godot_vector3 *", "p_self"]
+          ["godot_callable *", "r_dest"],
+          ["uint64_t", "p_objectid"],
+          ["const godot_string_name *", "p_method"]
         ]
       },
       {
-        "name": "godot_vector3_inverse",
-        "return_type": "godot_vector3",
+        "name": "godot_callable_new_copy",
+        "return_type": "void",
         "arguments": [
-          ["const godot_vector3 *", "p_self"]
+          ["godot_callable *", "r_dest"],
+          ["const godot_callable *", "p_src"]
         ]
       },
       {
-        "name": "godot_vector3_snapped",
-        "return_type": "godot_vector3",
+        "name": "godot_callable_destroy",
+        "return_type": "void",
         "arguments": [
-          ["const godot_vector3 *", "p_self"],
-          ["const godot_vector3 *", "p_by"]
+          ["godot_callable *", "p_self"]
         ]
       },
       {
-        "name": "godot_vector3_rotated",
-        "return_type": "godot_vector3",
+        "name": "godot_callable_call",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_vector3 *", "p_self"],
-          ["const godot_vector3 *", "p_axis"],
-          ["const godot_real", "p_phi"]
+          ["const godot_callable *", "p_self"],
+          ["const godot_variant **", "p_arguments"],
+          ["godot_int", "p_argcount"],
+          ["godot_variant *", "r_return_value"]
         ]
       },
       {
-        "name": "godot_vector3_linear_interpolate",
-        "return_type": "godot_vector3",
+        "name": "godot_callable_call_deferred",
+        "return_type": "void",
         "arguments": [
-          ["const godot_vector3 *", "p_self"],
-          ["const godot_vector3 *", "p_b"],
-          ["const godot_real", "p_t"]
+          ["const godot_callable *", "p_self"],
+          ["const godot_variant **", "p_arguments"],
+          ["godot_int", "p_argcount"]
         ]
       },
       {
-        "name": "godot_vector3_cubic_interpolate",
-        "return_type": "godot_vector3",
+        "name": "godot_callable_is_null",
+        "return_type": "godot_bool",
         "arguments": [
-          ["const godot_vector3 *", "p_self"],
-          ["const godot_vector3 *", "p_b"],
-          ["const godot_vector3 *", "p_pre_a"],
-          ["const godot_vector3 *", "p_post_b"],
-          ["const godot_real", "p_t"]
+          ["const godot_callable *", "p_self"]
         ]
       },
       {
-        "name": "godot_vector3_dot",
-        "return_type": "godot_real",
+        "name": "godot_callable_is_custom",
+        "return_type": "godot_bool",
         "arguments": [
-          ["const godot_vector3 *", "p_self"],
-          ["const godot_vector3 *", "p_b"]
+          ["const godot_callable *", "p_self"]
         ]
       },
       {
-        "name": "godot_vector3_cross",
-        "return_type": "godot_vector3",
+        "name": "godot_callable_is_standard",
+        "return_type": "godot_bool",
         "arguments": [
-          ["const godot_vector3 *", "p_self"],
-          ["const godot_vector3 *", "p_b"]
+          ["const godot_callable *", "p_self"]
         ]
       },
       {
-        "name": "godot_vector3_outer",
-        "return_type": "godot_basis",
+        "name": "godot_callable_get_object",
+        "return_type": "godot_object *",
         "arguments": [
-          ["const godot_vector3 *", "p_self"],
-          ["const godot_vector3 *", "p_b"]
+          ["const godot_callable *", "p_self"]
         ]
       },
       {
-        "name": "godot_vector3_to_diagonal_matrix",
-        "return_type": "godot_basis",
+        "name": "godot_callable_get_object_id",
+        "return_type": "uint64_t",
         "arguments": [
-          ["const godot_vector3 *", "p_self"]
+          ["const godot_callable *", "p_self"]
         ]
       },
       {
-        "name": "godot_vector3_abs",
-        "return_type": "godot_vector3",
+        "name": "godot_callable_get_method",
+        "return_type": "godot_string_name",
         "arguments": [
-          ["const godot_vector3 *", "p_self"]
+          ["const godot_callable *", "p_self"]
         ]
       },
       {
-        "name": "godot_vector3_floor",
-        "return_type": "godot_vector3",
+        "name": "godot_callable_hash",
+        "return_type": "uint32_t",
         "arguments": [
-          ["const godot_vector3 *", "p_self"]
+          ["const godot_callable *", "p_self"]
         ]
       },
       {
-        "name": "godot_vector3_ceil",
-        "return_type": "godot_vector3",
+        "name": "godot_callable_as_string",
+        "return_type": "godot_string",
         "arguments": [
-          ["const godot_vector3 *", "p_self"]
+          ["const godot_callable *", "p_self"]
         ]
       },
       {
-        "name": "godot_vector3_distance_to",
-        "return_type": "godot_real",
+        "name": "godot_callable_operator_equal",
+        "return_type": "godot_bool",
         "arguments": [
-          ["const godot_vector3 *", "p_self"],
-          ["const godot_vector3 *", "p_b"]
+          ["const godot_callable *", "p_self"],
+          ["const godot_callable *", "p_other"]
         ]
       },
       {
-        "name": "godot_vector3_distance_squared_to",
-        "return_type": "godot_real",
+        "name": "godot_callable_operator_less",
+        "return_type": "godot_bool",
         "arguments": [
-          ["const godot_vector3 *", "p_self"],
-          ["const godot_vector3 *", "p_b"]
+          ["const godot_callable *", "p_self"],
+          ["const godot_callable *", "p_other"]
         ]
       },
       {
-        "name": "godot_vector3_angle_to",
-        "return_type": "godot_real",
+        "name": "godot_signal_new_with_object",
+        "return_type": "void",
         "arguments": [
-          ["const godot_vector3 *", "p_self"],
-          ["const godot_vector3 *", "p_to"]
+          ["godot_signal *", "r_dest"],
+          ["const godot_object *", "p_object"],
+          ["const godot_string_name *", "p_method"]
         ]
       },
       {
-        "name": "godot_vector3_slide",
-        "return_type": "godot_vector3",
+        "name": "godot_signal_new_with_object_id",
+        "return_type": "void",
         "arguments": [
-          ["const godot_vector3 *", "p_self"],
-          ["const godot_vector3 *", "p_n"]
+          ["godot_signal *", "r_dest"],
+          ["uint64_t", "p_objectid"],
+          ["const godot_string_name *", "p_method"]
         ]
       },
       {
-        "name": "godot_vector3_bounce",
-        "return_type": "godot_vector3",
+        "name": "godot_signal_new_copy",
+        "return_type": "void",
         "arguments": [
-          ["const godot_vector3 *", "p_self"],
-          ["const godot_vector3 *", "p_n"]
+          ["godot_signal *", "r_dest"],
+          ["const godot_signal *", "p_src"]
         ]
       },
       {
-        "name": "godot_vector3_reflect",
-        "return_type": "godot_vector3",
+        "name": "godot_signal_destroy",
+        "return_type": "void",
         "arguments": [
-          ["const godot_vector3 *", "p_self"],
-          ["const godot_vector3 *", "p_n"]
+          ["godot_signal *", "p_self"]
         ]
       },
       {
-        "name": "godot_vector3_operator_add",
-        "return_type": "godot_vector3",
+        "name": "godot_signal_emit",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_vector3 *", "p_self"],
-          ["const godot_vector3 *", "p_b"]
+          ["const godot_signal *", "p_self"],
+          ["const godot_variant **", "p_arguments"],
+          ["godot_int", "p_argcount"]
         ]
       },
       {
-        "name": "godot_vector3_operator_subtract",
-        "return_type": "godot_vector3",
+        "name": "godot_signal_connect",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_vector3 *", "p_self"],
-          ["const godot_vector3 *", "p_b"]
+          ["godot_signal *", "p_self"],
+          ["const godot_callable *", "p_callable"],
+          ["const godot_array *", "p_binds"],
+          ["uint32_t", "p_flags"]
         ]
       },
       {
-        "name": "godot_vector3_operator_multiply_vector",
-        "return_type": "godot_vector3",
+        "name": "godot_signal_disconnect",
+        "return_type": "void",
         "arguments": [
-          ["const godot_vector3 *", "p_self"],
-          ["const godot_vector3 *", "p_b"]
+          ["godot_signal *", "p_self"],
+          ["const godot_callable *", "p_callable"]
         ]
       },
       {
-        "name": "godot_vector3_operator_multiply_scalar",
-        "return_type": "godot_vector3",
+        "name": "godot_signal_is_null",
+        "return_type": "godot_bool",
         "arguments": [
-          ["const godot_vector3 *", "p_self"],
-          ["const godot_real", "p_b"]
+          ["const godot_signal *", "p_self"]
         ]
       },
       {
-        "name": "godot_vector3_operator_divide_vector",
-        "return_type": "godot_vector3",
+        "name": "godot_signal_is_connected",
+        "return_type": "godot_bool",
         "arguments": [
-          ["const godot_vector3 *", "p_self"],
-          ["const godot_vector3 *", "p_b"]
+          ["const godot_signal *", "p_self"],
+          ["const godot_callable *", "p_callable"]
         ]
       },
       {
-        "name": "godot_vector3_operator_divide_scalar",
-        "return_type": "godot_vector3",
+        "name": "godot_signal_get_connections",
+        "return_type": "godot_array",
         "arguments": [
-          ["const godot_vector3 *", "p_self"],
-          ["const godot_real", "p_b"]
+          ["const godot_signal *", "p_self"]
         ]
       },
       {
-        "name": "godot_vector3_operator_equal",
-        "return_type": "godot_bool",
+        "name": "godot_signal_get_object",
+        "return_type": "godot_object *",
         "arguments": [
-          ["const godot_vector3 *", "p_self"],
-          ["const godot_vector3 *", "p_b"]
+          ["const godot_signal *", "p_self"]
         ]
       },
       {
-        "name": "godot_vector3_operator_less",
-        "return_type": "godot_bool",
+        "name": "godot_signal_get_object_id",
+        "return_type": "uint64_t",
         "arguments": [
-          ["const godot_vector3 *", "p_self"],
-          ["const godot_vector3 *", "p_b"]
+          ["const godot_signal *", "p_self"]
         ]
       },
       {
-        "name": "godot_vector3_operator_neg",
-        "return_type": "godot_vector3",
+        "name": "godot_signal_get_name",
+        "return_type": "godot_string_name",
         "arguments": [
-          ["const godot_vector3 *", "p_self"]
+          ["const godot_signal *", "p_self"]
         ]
       },
       {
-        "name": "godot_vector3_set_axis",
-        "return_type": "void",
+        "name": "godot_signal_as_string",
+        "return_type": "godot_string",
         "arguments": [
-          ["godot_vector3 *", "p_self"],
-          ["const godot_vector3_axis", "p_axis"],
-          ["const godot_real", "p_val"]
+          ["const godot_signal *", "p_self"]
         ]
       },
       {
-        "name": "godot_vector3_get_axis",
-        "return_type": "godot_real",
+        "name": "godot_signal_operator_equal",
+        "return_type": "godot_bool",
         "arguments": [
-          ["const godot_vector3 *", "p_self"],
-          ["const godot_vector3_axis", "p_axis"]
+          ["const godot_signal *", "p_self"],
+          ["const godot_signal *", "p_other"]
         ]
       },
       {
-        "name": "godot_pool_byte_array_new",
-        "return_type": "void",
+        "name": "godot_signal_operator_less",
+        "return_type": "godot_bool",
         "arguments": [
-          ["godot_pool_byte_array *", "r_dest"]
+          ["const godot_signal *", "p_self"],
+          ["const godot_signal *", "p_other"]
         ]
       },
       {
-        "name": "godot_pool_byte_array_new_copy",
+        "name": "godot_color_new_rgba",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_byte_array *", "r_dest"],
-          ["const godot_pool_byte_array *", "p_src"]
+          ["godot_color *", "r_dest"],
+          ["const godot_real", "p_r"],
+          ["const godot_real", "p_g"],
+          ["const godot_real", "p_b"],
+          ["const godot_real", "p_a"]
         ]
       },
       {
-        "name": "godot_pool_byte_array_new_with_array",
+        "name": "godot_color_new_rgb",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_byte_array *", "r_dest"],
-          ["const godot_array *", "p_a"]
+          ["godot_color *", "r_dest"],
+          ["const godot_real", "p_r"],
+          ["const godot_real", "p_g"],
+          ["const godot_real", "p_b"]
         ]
       },
       {
-        "name": "godot_pool_byte_array_append",
-        "return_type": "void",
+        "name": "godot_color_get_r",
+        "return_type": "godot_real",
         "arguments": [
-          ["godot_pool_byte_array *", "p_self"],
-          ["const uint8_t", "p_data"]
+          ["const godot_color *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_byte_array_append_array",
+        "name": "godot_color_set_r",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_byte_array *", "p_self"],
-          ["const godot_pool_byte_array *", "p_array"]
+          ["godot_color *", "p_self"],
+          ["const godot_real", "r"]
         ]
       },
       {
-        "name": "godot_pool_byte_array_insert",
-        "return_type": "godot_error",
+        "name": "godot_color_get_g",
+        "return_type": "godot_real",
         "arguments": [
-          ["godot_pool_byte_array *", "p_self"],
-          ["const godot_int", "p_idx"],
-          ["const uint8_t", "p_data"]
+          ["const godot_color *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_byte_array_invert",
+        "name": "godot_color_set_g",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_byte_array *", "p_self"]
+          ["godot_color *", "p_self"],
+          ["const godot_real", "g"]
         ]
       },
       {
-        "name": "godot_pool_byte_array_push_back",
-        "return_type": "void",
+        "name": "godot_color_get_b",
+        "return_type": "godot_real",
         "arguments": [
-          ["godot_pool_byte_array *", "p_self"],
-          ["const uint8_t", "p_data"]
+          ["const godot_color *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_byte_array_remove",
+        "name": "godot_color_set_b",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_byte_array *", "p_self"],
-          ["const godot_int", "p_idx"]
+          ["godot_color *", "p_self"],
+          ["const godot_real", "b"]
         ]
       },
       {
-        "name": "godot_pool_byte_array_resize",
-        "return_type": "void",
+        "name": "godot_color_get_a",
+        "return_type": "godot_real",
         "arguments": [
-          ["godot_pool_byte_array *", "p_self"],
-          ["const godot_int", "p_size"]
+          ["const godot_color *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_byte_array_read",
-        "return_type": "godot_pool_byte_array_read_access *",
+        "name": "godot_color_set_a",
+        "return_type": "void",
         "arguments": [
-          ["const godot_pool_byte_array *", "p_self"]
+          ["godot_color *", "p_self"],
+          ["const godot_real", "a"]
         ]
       },
       {
-        "name": "godot_pool_byte_array_write",
-        "return_type": "godot_pool_byte_array_write_access *",
+        "name": "godot_color_get_h",
+        "return_type": "godot_real",
         "arguments": [
-          ["godot_pool_byte_array *", "p_self"]
+          ["const godot_color *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_byte_array_set",
-        "return_type": "void",
+        "name": "godot_color_get_s",
+        "return_type": "godot_real",
         "arguments": [
-          ["godot_pool_byte_array *", "p_self"],
-          ["const godot_int", "p_idx"],
-          ["const uint8_t", "p_data"]
+          ["const godot_color *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_byte_array_get",
-        "return_type": "uint8_t",
+        "name": "godot_color_get_v",
+        "return_type": "godot_real",
         "arguments": [
-          ["const godot_pool_byte_array *", "p_self"],
-          ["const godot_int", "p_idx"]
+          ["const godot_color *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_byte_array_size",
-        "return_type": "godot_int",
+        "name": "godot_color_as_string",
+        "return_type": "godot_string",
         "arguments": [
-          ["const godot_pool_byte_array *", "p_self"]
+          ["const godot_color *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_byte_array_destroy",
-        "return_type": "void",
+        "name": "godot_color_to_rgba32",
+        "return_type": "godot_int",
         "arguments": [
-          ["godot_pool_byte_array *", "p_self"]
+          ["const godot_color *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_int_array_new",
-        "return_type": "void",
+        "name": "godot_color_to_argb32",
+        "return_type": "godot_int",
         "arguments": [
-          ["godot_pool_int_array *", "r_dest"]
+          ["const godot_color *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_int_array_new_copy",
-        "return_type": "void",
+        "name": "godot_color_inverted",
+        "return_type": "godot_color",
         "arguments": [
-          ["godot_pool_int_array *", "r_dest"],
-          ["const godot_pool_int_array *", "p_src"]
+          ["const godot_color *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_int_array_new_with_array",
-        "return_type": "void",
+        "name": "godot_color_contrasted",
+        "return_type": "godot_color",
         "arguments": [
-          ["godot_pool_int_array *", "r_dest"],
-          ["const godot_array *", "p_a"]
+          ["const godot_color *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_int_array_append",
-        "return_type": "void",
+        "name": "godot_color_lerp",
+        "return_type": "godot_color",
         "arguments": [
-          ["godot_pool_int_array *", "p_self"],
-          ["const godot_int", "p_data"]
+          ["const godot_color *", "p_self"],
+          ["const godot_color *", "p_b"],
+          ["const godot_real", "p_t"]
         ]
       },
       {
-        "name": "godot_pool_int_array_append_array",
-        "return_type": "void",
+        "name": "godot_color_blend",
+        "return_type": "godot_color",
         "arguments": [
-          ["godot_pool_int_array *", "p_self"],
-          ["const godot_pool_int_array *", "p_array"]
+          ["const godot_color *", "p_self"],
+          ["const godot_color *", "p_over"]
         ]
       },
       {
-        "name": "godot_pool_int_array_insert",
-        "return_type": "godot_error",
+        "name": "godot_color_to_html",
+        "return_type": "godot_string",
         "arguments": [
-          ["godot_pool_int_array *", "p_self"],
-          ["const godot_int", "p_idx"],
-          ["const godot_int", "p_data"]
+          ["const godot_color *", "p_self"],
+          ["const godot_bool", "p_with_alpha"]
         ]
       },
       {
-        "name": "godot_pool_int_array_invert",
-        "return_type": "void",
+        "name": "godot_color_operator_equal",
+        "return_type": "godot_bool",
         "arguments": [
-          ["godot_pool_int_array *", "p_self"]
+          ["const godot_color *", "p_self"],
+          ["const godot_color *", "p_b"]
         ]
       },
       {
-        "name": "godot_pool_int_array_push_back",
-        "return_type": "void",
+        "name": "godot_color_operator_less",
+        "return_type": "godot_bool",
         "arguments": [
-          ["godot_pool_int_array *", "p_self"],
-          ["const godot_int", "p_data"]
+          ["const godot_color *", "p_self"],
+          ["const godot_color *", "p_b"]
         ]
       },
       {
-        "name": "godot_pool_int_array_remove",
-        "return_type": "void",
+        "name": "godot_color_to_abgr32",
+        "return_type": "godot_int",
         "arguments": [
-          ["godot_pool_int_array *", "p_self"],
-          ["const godot_int", "p_idx"]
+          ["const godot_color *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_int_array_resize",
-        "return_type": "void",
+        "name": "godot_color_to_abgr64",
+        "return_type": "godot_int",
         "arguments": [
-          ["godot_pool_int_array *", "p_self"],
-          ["const godot_int", "p_size"]
+          ["const godot_color *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_int_array_read",
-        "return_type": "godot_pool_int_array_read_access *",
+        "name": "godot_color_to_argb64",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_pool_int_array *", "p_self"]
+          ["const godot_color *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_int_array_write",
-        "return_type": "godot_pool_int_array_write_access *",
+        "name": "godot_color_to_rgba64",
+        "return_type": "godot_int",
         "arguments": [
-          ["godot_pool_int_array *", "p_self"]
+          ["const godot_color *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_int_array_set",
-        "return_type": "void",
+        "name": "godot_color_darkened",
+        "return_type": "godot_color",
         "arguments": [
-          ["godot_pool_int_array *", "p_self"],
-          ["const godot_int", "p_idx"],
-          ["const godot_int", "p_data"]
+          ["const godot_color *", "p_self"],
+          ["const godot_real", "p_amount"]
         ]
       },
       {
-        "name": "godot_pool_int_array_get",
-        "return_type": "godot_int",
+        "name": "godot_color_from_hsv",
+        "return_type": "godot_color",
         "arguments": [
-          ["const godot_pool_int_array *", "p_self"],
-          ["const godot_int", "p_idx"]
+          ["const godot_color *", "p_self"],
+          ["const godot_real", "p_h"],
+          ["const godot_real", "p_s"],
+          ["const godot_real", "p_v"],
+          ["const godot_real", "p_a"]
         ]
       },
       {
-        "name": "godot_pool_int_array_size",
-        "return_type": "godot_int",
+        "name": "godot_color_lightened",
+        "return_type": "godot_color",
         "arguments": [
-          ["const godot_pool_int_array *", "p_self"]
+          ["const godot_color *", "p_self"],
+          ["const godot_real", "p_amount"]
         ]
       },
       {
-        "name": "godot_pool_int_array_destroy",
+        "name": "godot_dictionary_new",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_int_array *", "p_self"]
+          ["godot_dictionary *", "r_dest"]
         ]
       },
       {
-        "name": "godot_pool_real_array_new",
+        "name": "godot_dictionary_new_copy",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_real_array *", "r_dest"]
+          ["godot_dictionary *", "r_dest"],
+          ["const godot_dictionary *", "p_src"]
         ]
       },
       {
-        "name": "godot_pool_real_array_new_copy",
+        "name": "godot_dictionary_destroy",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_real_array *", "r_dest"],
-          ["const godot_pool_real_array *", "p_src"]
+          ["godot_dictionary *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_real_array_new_with_array",
-        "return_type": "void",
+        "name": "godot_dictionary_size",
+        "return_type": "godot_int",
         "arguments": [
-          ["godot_pool_real_array *", "r_dest"],
-          ["const godot_array *", "p_a"]
+          ["const godot_dictionary *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_real_array_append",
-        "return_type": "void",
+        "name": "godot_dictionary_empty",
+        "return_type": "godot_bool",
         "arguments": [
-          ["godot_pool_real_array *", "p_self"],
-          ["const godot_real", "p_data"]
+          ["const godot_dictionary *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_real_array_append_array",
+        "name": "godot_dictionary_clear",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_real_array *", "p_self"],
-          ["const godot_pool_real_array *", "p_array"]
+          ["godot_dictionary *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_real_array_insert",
-        "return_type": "godot_error",
+        "name": "godot_dictionary_has",
+        "return_type": "godot_bool",
         "arguments": [
-          ["godot_pool_real_array *", "p_self"],
-          ["const godot_int", "p_idx"],
-          ["const godot_real", "p_data"]
+          ["const godot_dictionary *", "p_self"],
+          ["const godot_variant *", "p_key"]
         ]
       },
       {
-        "name": "godot_pool_real_array_invert",
-        "return_type": "void",
+        "name": "godot_dictionary_has_all",
+        "return_type": "godot_bool",
         "arguments": [
-          ["godot_pool_real_array *", "p_self"]
+          ["const godot_dictionary *", "p_self"],
+          ["const godot_array *", "p_keys"]
         ]
       },
       {
-        "name": "godot_pool_real_array_push_back",
+        "name": "godot_dictionary_erase",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_real_array *", "p_self"],
-          ["const godot_real", "p_data"]
+          ["godot_dictionary *", "p_self"],
+          ["const godot_variant *", "p_key"]
         ]
       },
       {
-        "name": "godot_pool_real_array_remove",
-        "return_type": "void",
+        "name": "godot_dictionary_hash",
+        "return_type": "godot_int",
         "arguments": [
-          ["godot_pool_real_array *", "p_self"],
-          ["const godot_int", "p_idx"]
+          ["const godot_dictionary *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_real_array_resize",
-        "return_type": "void",
+        "name": "godot_dictionary_keys",
+        "return_type": "godot_array",
         "arguments": [
-          ["godot_pool_real_array *", "p_self"],
-          ["const godot_int", "p_size"]
+          ["const godot_dictionary *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_real_array_read",
-        "return_type": "godot_pool_real_array_read_access *",
+        "name": "godot_dictionary_values",
+        "return_type": "godot_array",
         "arguments": [
-          ["const godot_pool_real_array *", "p_self"]
+          ["const godot_dictionary *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_real_array_write",
-        "return_type": "godot_pool_real_array_write_access *",
+        "name": "godot_dictionary_get",
+        "return_type": "godot_variant",
         "arguments": [
-          ["godot_pool_real_array *", "p_self"]
+          ["const godot_dictionary *", "p_self"],
+          ["const godot_variant *", "p_key"]
         ]
       },
       {
-        "name": "godot_pool_real_array_set",
+        "name": "godot_dictionary_set",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_real_array *", "p_self"],
-          ["const godot_int", "p_idx"],
-          ["const godot_real", "p_data"]
+          ["godot_dictionary *", "p_self"],
+          ["const godot_variant *", "p_key"],
+          ["const godot_variant *", "p_value"]
         ]
       },
       {
-        "name": "godot_pool_real_array_get",
-        "return_type": "godot_real",
+        "name": "godot_dictionary_operator_index",
+        "return_type": "godot_variant *",
         "arguments": [
-          ["const godot_pool_real_array *", "p_self"],
-          ["const godot_int", "p_idx"]
+          ["godot_dictionary *", "p_self"],
+          ["const godot_variant *", "p_key"]
         ]
       },
       {
-        "name": "godot_pool_real_array_size",
-        "return_type": "godot_int",
+        "name": "godot_dictionary_operator_index_const",
+        "return_type": "const godot_variant *",
         "arguments": [
-          ["const godot_pool_real_array *", "p_self"]
+          ["const godot_dictionary *", "p_self"],
+          ["const godot_variant *", "p_key"]
         ]
       },
       {
-        "name": "godot_pool_real_array_destroy",
-        "return_type": "void",
+        "name": "godot_dictionary_next",
+        "return_type": "godot_variant *",
         "arguments": [
-          ["godot_pool_real_array *", "p_self"]
+          ["const godot_dictionary *", "p_self"],
+          ["const godot_variant *", "p_key"]
         ]
       },
       {
-        "name": "godot_pool_string_array_new",
-        "return_type": "void",
+        "name": "godot_dictionary_operator_equal",
+        "return_type": "godot_bool",
         "arguments": [
-          ["godot_pool_string_array *", "r_dest"]
+          ["const godot_dictionary *", "p_self"],
+          ["const godot_dictionary *", "p_b"]
         ]
       },
       {
-        "name": "godot_pool_string_array_new_copy",
-        "return_type": "void",
+        "name": "godot_dictionary_to_json",
+        "return_type": "godot_string",
         "arguments": [
-          ["godot_pool_string_array *", "r_dest"],
-          ["const godot_pool_string_array *", "p_src"]
+          ["const godot_dictionary *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_string_array_new_with_array",
-        "return_type": "void",
+        "name": "godot_dictionary_duplicate",
+        "return_type": "godot_dictionary",
         "arguments": [
-          ["godot_pool_string_array *", "r_dest"],
-          ["const godot_array *", "p_a"]
+          ["const godot_dictionary *", "p_self"],
+          ["const godot_bool", "p_deep"]
         ]
       },
       {
-        "name": "godot_pool_string_array_append",
-        "return_type": "void",
+        "name": "godot_dictionary_get_with_default",
+        "return_type": "godot_variant",
         "arguments": [
-          ["godot_pool_string_array *", "p_self"],
-          ["const godot_string *", "p_data"]
+          ["const godot_dictionary *", "p_self"],
+          ["const godot_variant *", "p_key"],
+          ["const godot_variant *", "p_default"]
         ]
       },
       {
-        "name": "godot_pool_string_array_append_array",
-        "return_type": "void",
+        "name": "godot_dictionary_erase_with_return",
+        "return_type": "bool",
         "arguments": [
-          ["godot_pool_string_array *", "p_self"],
-          ["const godot_pool_string_array *", "p_array"]
+          ["godot_dictionary *", "p_self"],
+          ["const godot_variant *", "p_key"]
         ]
       },
       {
-        "name": "godot_pool_string_array_insert",
-        "return_type": "godot_error",
+        "name": "godot_node_path_new",
+        "return_type": "void",
         "arguments": [
-          ["godot_pool_string_array *", "p_self"],
-          ["const godot_int", "p_idx"],
-          ["const godot_string *", "p_data"]
+          ["godot_node_path *", "r_dest"],
+          ["const godot_string *", "p_from"]
         ]
       },
       {
-        "name": "godot_pool_string_array_invert",
+        "name": "godot_node_path_new_copy",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_string_array *", "p_self"]
+          ["godot_node_path *", "r_dest"],
+          ["const godot_node_path *", "p_src"]
         ]
       },
       {
-        "name": "godot_pool_string_array_push_back",
+        "name": "godot_node_path_destroy",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_string_array *", "p_self"],
-          ["const godot_string *", "p_data"]
+          ["godot_node_path *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_string_array_remove",
-        "return_type": "void",
+        "name": "godot_node_path_as_string",
+        "return_type": "godot_string",
         "arguments": [
-          ["godot_pool_string_array *", "p_self"],
-          ["const godot_int", "p_idx"]
+          ["const godot_node_path *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_string_array_resize",
-        "return_type": "void",
+        "name": "godot_node_path_is_absolute",
+        "return_type": "godot_bool",
         "arguments": [
-          ["godot_pool_string_array *", "p_self"],
-          ["const godot_int", "p_size"]
+          ["const godot_node_path *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_string_array_read",
-        "return_type": "godot_pool_string_array_read_access *",
+        "name": "godot_node_path_get_name_count",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_pool_string_array *", "p_self"]
+          ["const godot_node_path *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_string_array_write",
-        "return_type": "godot_pool_string_array_write_access *",
+        "name": "godot_node_path_get_name",
+        "return_type": "godot_string",
         "arguments": [
-          ["godot_pool_string_array *", "p_self"]
+          ["const godot_node_path *", "p_self"],
+          ["const godot_int", "p_idx"]
         ]
       },
       {
-        "name": "godot_pool_string_array_set",
-        "return_type": "void",
+        "name": "godot_node_path_get_subname_count",
+        "return_type": "godot_int",
         "arguments": [
-          ["godot_pool_string_array *", "p_self"],
-          ["const godot_int", "p_idx"],
-          ["const godot_string *", "p_data"]
+          ["const godot_node_path *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_string_array_get",
+        "name": "godot_node_path_get_subname",
         "return_type": "godot_string",
         "arguments": [
-          ["const godot_pool_string_array *", "p_self"],
+          ["const godot_node_path *", "p_self"],
           ["const godot_int", "p_idx"]
         ]
       },
       {
-        "name": "godot_pool_string_array_size",
-        "return_type": "godot_int",
+        "name": "godot_node_path_get_concatenated_subnames",
+        "return_type": "godot_string",
         "arguments": [
-          ["const godot_pool_string_array *", "p_self"]
+          ["const godot_node_path *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_string_array_destroy",
-        "return_type": "void",
+        "name": "godot_node_path_is_empty",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_node_path *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_node_path_operator_equal",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_node_path *", "p_self"],
+          ["const godot_node_path *", "p_b"]
+        ]
+      },
+      {
+        "name": "godot_node_path_get_as_property_path",
+        "return_type": "godot_node_path",
         "arguments": [
-          ["godot_pool_string_array *", "p_self"]
+          ["const godot_node_path *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_vector2_array_new",
+        "name": "godot_packed_byte_array_new",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector2_array *", "r_dest"]
+          ["godot_packed_byte_array *", "r_dest"]
         ]
       },
       {
-        "name": "godot_pool_vector2_array_new_copy",
+        "name": "godot_packed_byte_array_new_copy",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector2_array *", "r_dest"],
-          ["const godot_pool_vector2_array *", "p_src"]
+          ["godot_packed_byte_array *", "r_dest"],
+          ["const godot_packed_byte_array *", "p_src"]
         ]
       },
       {
-        "name": "godot_pool_vector2_array_new_with_array",
+        "name": "godot_packed_byte_array_new_with_array",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector2_array *", "r_dest"],
+          ["godot_packed_byte_array *", "r_dest"],
           ["const godot_array *", "p_a"]
         ]
       },
       {
-        "name": "godot_pool_vector2_array_append",
+        "name": "godot_packed_byte_array_empty",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_packed_byte_array *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_packed_byte_array_append",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector2_array *", "p_self"],
-          ["const godot_vector2 *", "p_data"]
+          ["godot_packed_byte_array *", "p_self"],
+          ["const uint8_t", "p_data"]
         ]
       },
       {
-        "name": "godot_pool_vector2_array_append_array",
+        "name": "godot_packed_byte_array_append_array",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector2_array *", "p_self"],
-          ["const godot_pool_vector2_array *", "p_array"]
+          ["godot_packed_byte_array *", "p_self"],
+          ["const godot_packed_byte_array *", "p_array"]
         ]
       },
       {
-        "name": "godot_pool_vector2_array_insert",
+        "name": "godot_packed_byte_array_insert",
         "return_type": "godot_error",
         "arguments": [
-          ["godot_pool_vector2_array *", "p_self"],
+          ["godot_packed_byte_array *", "p_self"],
           ["const godot_int", "p_idx"],
-          ["const godot_vector2 *", "p_data"]
+          ["const uint8_t", "p_data"]
         ]
       },
       {
-        "name": "godot_pool_vector2_array_invert",
+        "name": "godot_packed_byte_array_has",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["godot_packed_byte_array *", "p_self"],
+          ["const uint8_t", "p_value"]
+        ]
+      },
+      {
+        "name": "godot_packed_byte_array_sort",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector2_array *", "p_self"]
+          ["godot_packed_byte_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_vector2_array_push_back",
+        "name": "godot_packed_byte_array_invert",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector2_array *", "p_self"],
-          ["const godot_vector2 *", "p_data"]
+          ["godot_packed_byte_array *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_packed_byte_array_push_back",
+        "return_type": "void",
+        "arguments": [
+          ["godot_packed_byte_array *", "p_self"],
+          ["const uint8_t", "p_data"]
         ]
       },
       {
-        "name": "godot_pool_vector2_array_remove",
+        "name": "godot_packed_byte_array_remove",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector2_array *", "p_self"],
+          ["godot_packed_byte_array *", "p_self"],
           ["const godot_int", "p_idx"]
         ]
       },
       {
-        "name": "godot_pool_vector2_array_resize",
+        "name": "godot_packed_byte_array_resize",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector2_array *", "p_self"],
+          ["godot_packed_byte_array *", "p_self"],
           ["const godot_int", "p_size"]
         ]
       },
       {
-        "name": "godot_pool_vector2_array_read",
-        "return_type": "godot_pool_vector2_array_read_access *",
+        "name": "godot_packed_byte_array_ptr",
+        "return_type": "const uint8_t *",
         "arguments": [
-          ["const godot_pool_vector2_array *", "p_self"]
+          ["const godot_packed_byte_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_vector2_array_write",
-        "return_type": "godot_pool_vector2_array_write_access *",
+        "name": "godot_packed_byte_array_ptrw",
+        "return_type": "uint8_t *",
         "arguments": [
-          ["godot_pool_vector2_array *", "p_self"]
+          ["godot_packed_byte_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_vector2_array_set",
+        "name": "godot_packed_byte_array_set",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector2_array *", "p_self"],
+          ["godot_packed_byte_array *", "p_self"],
           ["const godot_int", "p_idx"],
-          ["const godot_vector2 *", "p_data"]
+          ["const uint8_t", "p_data"]
         ]
       },
       {
-        "name": "godot_pool_vector2_array_get",
-        "return_type": "godot_vector2",
+        "name": "godot_packed_byte_array_get",
+        "return_type": "uint8_t",
         "arguments": [
-          ["const godot_pool_vector2_array *", "p_self"],
+          ["const godot_packed_byte_array *", "p_self"],
           ["const godot_int", "p_idx"]
         ]
       },
       {
-        "name": "godot_pool_vector2_array_size",
+        "name": "godot_packed_byte_array_size",
         "return_type": "godot_int",
         "arguments": [
-          ["const godot_pool_vector2_array *", "p_self"]
+          ["const godot_packed_byte_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_vector2_array_destroy",
+        "name": "godot_packed_byte_array_destroy",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector2_array *", "p_self"]
+          ["godot_packed_byte_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_vector3_array_new",
+        "name": "godot_packed_int32_array_new",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector3_array *", "r_dest"]
+          ["godot_packed_int32_array *", "r_dest"]
         ]
       },
       {
-        "name": "godot_pool_vector3_array_new_copy",
+        "name": "godot_packed_int32_array_new_copy",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector3_array *", "r_dest"],
-          ["const godot_pool_vector3_array *", "p_src"]
+          ["godot_packed_int32_array *", "r_dest"],
+          ["const godot_packed_int32_array *", "p_src"]
         ]
       },
       {
-        "name": "godot_pool_vector3_array_new_with_array",
+        "name": "godot_packed_int32_array_new_with_array",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector3_array *", "r_dest"],
+          ["godot_packed_int32_array *", "r_dest"],
           ["const godot_array *", "p_a"]
         ]
       },
       {
-        "name": "godot_pool_vector3_array_append",
+        "name": "godot_packed_int32_array_empty",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_packed_int32_array *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_packed_int32_array_append",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector3_array *", "p_self"],
-          ["const godot_vector3 *", "p_data"]
+          ["godot_packed_int32_array *", "p_self"],
+          ["const int32_t", "p_data"]
         ]
       },
       {
-        "name": "godot_pool_vector3_array_append_array",
+        "name": "godot_packed_int32_array_append_array",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector3_array *", "p_self"],
-          ["const godot_pool_vector3_array *", "p_array"]
+          ["godot_packed_int32_array *", "p_self"],
+          ["const godot_packed_int32_array *", "p_array"]
         ]
       },
       {
-        "name": "godot_pool_vector3_array_insert",
+        "name": "godot_packed_int32_array_insert",
         "return_type": "godot_error",
         "arguments": [
-          ["godot_pool_vector3_array *", "p_self"],
+          ["godot_packed_int32_array *", "p_self"],
           ["const godot_int", "p_idx"],
-          ["const godot_vector3 *", "p_data"]
+          ["const int32_t", "p_data"]
+        ]
+      },
+      {
+        "name": "godot_packed_int32_array_has",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["godot_packed_int32_array *", "p_self"],
+          ["const int32_t", "p_value"]
         ]
       },
       {
-        "name": "godot_pool_vector3_array_invert",
+        "name": "godot_packed_int32_array_sort",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector3_array *", "p_self"]
+          ["godot_packed_int32_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_vector3_array_push_back",
+        "name": "godot_packed_int32_array_invert",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector3_array *", "p_self"],
-          ["const godot_vector3 *", "p_data"]
+          ["godot_packed_int32_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_vector3_array_remove",
+        "name": "godot_packed_int32_array_push_back",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector3_array *", "p_self"],
+          ["godot_packed_int32_array *", "p_self"],
+          ["const int32_t", "p_data"]
+        ]
+      },
+      {
+        "name": "godot_packed_int32_array_remove",
+        "return_type": "void",
+        "arguments": [
+          ["godot_packed_int32_array *", "p_self"],
           ["const godot_int", "p_idx"]
         ]
       },
       {
-        "name": "godot_pool_vector3_array_resize",
+        "name": "godot_packed_int32_array_resize",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector3_array *", "p_self"],
+          ["godot_packed_int32_array *", "p_self"],
           ["const godot_int", "p_size"]
         ]
       },
       {
-        "name": "godot_pool_vector3_array_read",
-        "return_type": "godot_pool_vector3_array_read_access *",
+        "name": "godot_packed_int32_array_ptr",
+        "return_type": "const int32_t *",
         "arguments": [
-          ["const godot_pool_vector3_array *", "p_self"]
+          ["const godot_packed_int32_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_vector3_array_write",
-        "return_type": "godot_pool_vector3_array_write_access *",
+        "name": "godot_packed_int32_array_ptrw",
+        "return_type": "int32_t *",
         "arguments": [
-          ["godot_pool_vector3_array *", "p_self"]
+          ["godot_packed_int32_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_vector3_array_set",
+        "name": "godot_packed_int32_array_set",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector3_array *", "p_self"],
+          ["godot_packed_int32_array *", "p_self"],
           ["const godot_int", "p_idx"],
-          ["const godot_vector3 *", "p_data"]
+          ["const int32_t", "p_data"]
         ]
       },
       {
-        "name": "godot_pool_vector3_array_get",
-        "return_type": "godot_vector3",
+        "name": "godot_packed_int32_array_get",
+        "return_type": "int32_t",
         "arguments": [
-          ["const godot_pool_vector3_array *", "p_self"],
+          ["const godot_packed_int32_array *", "p_self"],
           ["const godot_int", "p_idx"]
         ]
       },
       {
-        "name": "godot_pool_vector3_array_size",
+        "name": "godot_packed_int32_array_size",
         "return_type": "godot_int",
         "arguments": [
-          ["const godot_pool_vector3_array *", "p_self"]
+          ["const godot_packed_int32_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_vector3_array_destroy",
+        "name": "godot_packed_int32_array_destroy",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector3_array *", "p_self"]
+          ["godot_packed_int32_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_color_array_new",
+        "name": "godot_packed_int64_array_new",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_color_array *", "r_dest"]
+          ["godot_packed_int64_array *", "r_dest"]
         ]
       },
       {
-        "name": "godot_pool_color_array_new_copy",
+        "name": "godot_packed_int64_array_new_copy",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_color_array *", "r_dest"],
-          ["const godot_pool_color_array *", "p_src"]
+          ["godot_packed_int64_array *", "r_dest"],
+          ["const godot_packed_int64_array *", "p_src"]
         ]
       },
       {
-        "name": "godot_pool_color_array_new_with_array",
+        "name": "godot_packed_int64_array_new_with_array",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_color_array *", "r_dest"],
+          ["godot_packed_int64_array *", "r_dest"],
           ["const godot_array *", "p_a"]
         ]
       },
       {
-        "name": "godot_pool_color_array_append",
-        "return_type": "void",
+        "name": "godot_packed_int64_array_empty",
+        "return_type": "godot_bool",
         "arguments": [
-          ["godot_pool_color_array *", "p_self"],
-          ["const godot_color *", "p_data"]
+          ["const godot_packed_int64_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_color_array_append_array",
+        "name": "godot_packed_int64_array_append",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_color_array *", "p_self"],
-          ["const godot_pool_color_array *", "p_array"]
+          ["godot_packed_int64_array *", "p_self"],
+          ["const int64_t", "p_data"]
         ]
       },
       {
-        "name": "godot_pool_color_array_insert",
-        "return_type": "godot_error",
-        "arguments": [
-          ["godot_pool_color_array *", "p_self"],
-          ["const godot_int", "p_idx"],
-          ["const godot_color *", "p_data"]
-        ]
-      },
-      {
-        "name": "godot_pool_color_array_invert",
+        "name": "godot_packed_int64_array_append_array",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_color_array *", "p_self"]
+          ["godot_packed_int64_array *", "p_self"],
+          ["const godot_packed_int64_array *", "p_array"]
         ]
       },
       {
-        "name": "godot_pool_color_array_push_back",
-        "return_type": "void",
+        "name": "godot_packed_int64_array_insert",
+        "return_type": "godot_error",
         "arguments": [
-          ["godot_pool_color_array *", "p_self"],
-          ["const godot_color *", "p_data"]
+          ["godot_packed_int64_array *", "p_self"],
+          ["const godot_int", "p_idx"],
+          ["const int64_t", "p_data"]
         ]
       },
       {
-        "name": "godot_pool_color_array_remove",
-        "return_type": "void",
+        "name": "godot_packed_int64_array_has",
+        "return_type": "godot_bool",
         "arguments": [
-          ["godot_pool_color_array *", "p_self"],
-          ["const godot_int", "p_idx"]
+          ["godot_packed_int64_array *", "p_self"],
+          ["const int64_t", "p_value"]
         ]
       },
       {
-        "name": "godot_pool_color_array_resize",
+        "name": "godot_packed_int64_array_sort",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_color_array *", "p_self"],
-          ["const godot_int", "p_size"]
-        ]
-      },
-      {
-        "name": "godot_pool_color_array_read",
-        "return_type": "godot_pool_color_array_read_access *",
-        "arguments": [
-          ["const godot_pool_color_array *", "p_self"]
+          ["godot_packed_int64_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_color_array_write",
-        "return_type": "godot_pool_color_array_write_access *",
+        "name": "godot_packed_int64_array_invert",
+        "return_type": "void",
         "arguments": [
-          ["godot_pool_color_array *", "p_self"]
+          ["godot_packed_int64_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_color_array_set",
+        "name": "godot_packed_int64_array_push_back",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_color_array *", "p_self"],
-          ["const godot_int", "p_idx"],
-          ["const godot_color *", "p_data"]
+          ["godot_packed_int64_array *", "p_self"],
+          ["const int64_t", "p_data"]
         ]
       },
       {
-        "name": "godot_pool_color_array_get",
-        "return_type": "godot_color",
+        "name": "godot_packed_int64_array_remove",
+        "return_type": "void",
         "arguments": [
-          ["const godot_pool_color_array *", "p_self"],
+          ["godot_packed_int64_array *", "p_self"],
           ["const godot_int", "p_idx"]
         ]
       },
       {
-        "name": "godot_pool_color_array_size",
-        "return_type": "godot_int",
-        "arguments": [
-          ["const godot_pool_color_array *", "p_self"]
-        ]
-      },
-      {
-        "name": "godot_pool_color_array_destroy",
+        "name": "godot_packed_int64_array_resize",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_color_array *", "p_self"]
+          ["godot_packed_int64_array *", "p_self"],
+          ["const godot_int", "p_size"]
         ]
       },
       {
-        "name": "godot_pool_byte_array_read_access_copy",
-        "return_type": "godot_pool_byte_array_read_access *",
+        "name": "godot_packed_int64_array_ptr",
+        "return_type": "const int64_t *",
         "arguments": [
-          ["const godot_pool_byte_array_read_access *", "p_read"]
+          ["const godot_packed_int64_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_byte_array_read_access_ptr",
-        "return_type": "const uint8_t *",
+        "name": "godot_packed_int64_array_ptrw",
+        "return_type": "int64_t *",
         "arguments": [
-          ["const godot_pool_byte_array_read_access *", "p_read"]
+          ["godot_packed_int64_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_byte_array_read_access_operator_assign",
+        "name": "godot_packed_int64_array_set",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_byte_array_read_access *", "p_read"],
-          ["godot_pool_byte_array_read_access *", "p_other"]
+          ["godot_packed_int64_array *", "p_self"],
+          ["const godot_int", "p_idx"],
+          ["const int64_t", "p_data"]
         ]
       },
       {
-        "name": "godot_pool_byte_array_read_access_destroy",
-        "return_type": "void",
+        "name": "godot_packed_int64_array_get",
+        "return_type": "int64_t",
         "arguments": [
-          ["godot_pool_byte_array_read_access *", "p_read"]
+          ["const godot_packed_int64_array *", "p_self"],
+          ["const godot_int", "p_idx"]
         ]
       },
       {
-        "name": "godot_pool_int_array_read_access_copy",
-        "return_type": "godot_pool_int_array_read_access *",
+        "name": "godot_packed_int64_array_size",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_pool_int_array_read_access *", "p_read"]
+          ["const godot_packed_int64_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_int_array_read_access_ptr",
-        "return_type": "const godot_int *",
+        "name": "godot_packed_int64_array_destroy",
+        "return_type": "void",
         "arguments": [
-          ["const godot_pool_int_array_read_access *", "p_read"]
+          ["godot_packed_int64_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_int_array_read_access_operator_assign",
+        "name": "godot_packed_float32_array_new",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_int_array_read_access *", "p_read"],
-          ["godot_pool_int_array_read_access *", "p_other"]
+          ["godot_packed_float32_array *", "r_dest"]
         ]
       },
       {
-        "name": "godot_pool_int_array_read_access_destroy",
+        "name": "godot_packed_float32_array_new_copy",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_int_array_read_access *", "p_read"]
+          ["godot_packed_float32_array *", "r_dest"],
+          ["const godot_packed_float32_array *", "p_src"]
         ]
       },
       {
-        "name": "godot_pool_real_array_read_access_copy",
-        "return_type": "godot_pool_real_array_read_access *",
+        "name": "godot_packed_float32_array_new_with_array",
+        "return_type": "void",
         "arguments": [
-          ["const godot_pool_real_array_read_access *", "p_read"]
+          ["godot_packed_float32_array *", "r_dest"],
+          ["const godot_array *", "p_a"]
         ]
       },
       {
-        "name": "godot_pool_real_array_read_access_ptr",
-        "return_type": "const godot_real *",
+        "name": "godot_packed_float32_array_empty",
+        "return_type": "godot_bool",
         "arguments": [
-          ["const godot_pool_real_array_read_access *", "p_read"]
+          ["const godot_packed_float32_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_real_array_read_access_operator_assign",
+        "name": "godot_packed_float32_array_append",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_real_array_read_access *", "p_read"],
-          ["godot_pool_real_array_read_access *", "p_other"]
+          ["godot_packed_float32_array *", "p_self"],
+          ["const float", "p_data"]
         ]
       },
       {
-        "name": "godot_pool_real_array_read_access_destroy",
+        "name": "godot_packed_float32_array_append_array",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_real_array_read_access *", "p_read"]
+          ["godot_packed_float32_array *", "p_self"],
+          ["const godot_packed_float32_array *", "p_array"]
         ]
       },
       {
-        "name": "godot_pool_string_array_read_access_copy",
-        "return_type": "godot_pool_string_array_read_access *",
+        "name": "godot_packed_float32_array_insert",
+        "return_type": "godot_error",
         "arguments": [
-          ["const godot_pool_string_array_read_access *", "p_read"]
+          ["godot_packed_float32_array *", "p_self"],
+          ["const godot_int", "p_idx"],
+          ["const float", "p_data"]
         ]
       },
       {
-        "name": "godot_pool_string_array_read_access_ptr",
-        "return_type": "const godot_string *",
+        "name": "godot_packed_float32_array_has",
+        "return_type": "godot_bool",
         "arguments": [
-          ["const godot_pool_string_array_read_access *", "p_read"]
+          ["godot_packed_float32_array *", "p_self"],
+          ["const float", "p_value"]
         ]
       },
       {
-        "name": "godot_pool_string_array_read_access_operator_assign",
+        "name": "godot_packed_float32_array_sort",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_string_array_read_access *", "p_read"],
-          ["godot_pool_string_array_read_access *", "p_other"]
+          ["godot_packed_float32_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_string_array_read_access_destroy",
+        "name": "godot_packed_float32_array_invert",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_string_array_read_access *", "p_read"]
+          ["godot_packed_float32_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_vector2_array_read_access_copy",
-        "return_type": "godot_pool_vector2_array_read_access *",
-        "arguments": [
-          ["const godot_pool_vector2_array_read_access *", "p_read"]
-        ]
-      },
-      {
-        "name": "godot_pool_vector2_array_read_access_ptr",
-        "return_type": "const godot_vector2 *",
+        "name": "godot_packed_float32_array_push_back",
+        "return_type": "void",
         "arguments": [
-          ["const godot_pool_vector2_array_read_access *", "p_read"]
+          ["godot_packed_float32_array *", "p_self"],
+          ["const float", "p_data"]
         ]
       },
       {
-        "name": "godot_pool_vector2_array_read_access_operator_assign",
+        "name": "godot_packed_float32_array_remove",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector2_array_read_access *", "p_read"],
-          ["godot_pool_vector2_array_read_access *", "p_other"]
+          ["godot_packed_float32_array *", "p_self"],
+          ["const godot_int", "p_idx"]
         ]
       },
       {
-        "name": "godot_pool_vector2_array_read_access_destroy",
+        "name": "godot_packed_float32_array_resize",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector2_array_read_access *", "p_read"]
+          ["godot_packed_float32_array *", "p_self"],
+          ["const godot_int", "p_size"]
         ]
       },
       {
-        "name": "godot_pool_vector3_array_read_access_copy",
-        "return_type": "godot_pool_vector3_array_read_access *",
+        "name": "godot_packed_float32_array_ptr",
+        "return_type": "const float *",
         "arguments": [
-          ["const godot_pool_vector3_array_read_access *", "p_read"]
+          ["const godot_packed_float32_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_vector3_array_read_access_ptr",
-        "return_type": "const godot_vector3 *",
+        "name": "godot_packed_float32_array_ptrw",
+        "return_type": "float *",
         "arguments": [
-          ["const godot_pool_vector3_array_read_access *", "p_read"]
+          ["godot_packed_float32_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_vector3_array_read_access_operator_assign",
+        "name": "godot_packed_float32_array_set",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector3_array_read_access *", "p_read"],
-          ["godot_pool_vector3_array_read_access *", "p_other"]
+          ["godot_packed_float32_array *", "p_self"],
+          ["const godot_int", "p_idx"],
+          ["const float", "p_data"]
         ]
       },
       {
-        "name": "godot_pool_vector3_array_read_access_destroy",
-        "return_type": "void",
+        "name": "godot_packed_float32_array_get",
+        "return_type": "float",
         "arguments": [
-          ["godot_pool_vector3_array_read_access *", "p_read"]
+          ["const godot_packed_float32_array *", "p_self"],
+          ["const godot_int", "p_idx"]
         ]
       },
       {
-        "name": "godot_pool_color_array_read_access_copy",
-        "return_type": "godot_pool_color_array_read_access *",
+        "name": "godot_packed_float32_array_size",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_pool_color_array_read_access *", "p_read"]
+          ["const godot_packed_float32_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_color_array_read_access_ptr",
-        "return_type": "const godot_color *",
+        "name": "godot_packed_float32_array_destroy",
+        "return_type": "void",
         "arguments": [
-          ["const godot_pool_color_array_read_access *", "p_read"]
+          ["godot_packed_float32_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_color_array_read_access_operator_assign",
+        "name": "godot_packed_float64_array_new",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_color_array_read_access *", "p_read"],
-          ["godot_pool_color_array_read_access *", "p_other"]
+          ["godot_packed_float64_array *", "r_dest"]
         ]
       },
       {
-        "name": "godot_pool_color_array_read_access_destroy",
+        "name": "godot_packed_float64_array_new_copy",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_color_array_read_access *", "p_read"]
+          ["godot_packed_float64_array *", "r_dest"],
+          ["const godot_packed_float64_array *", "p_src"]
         ]
       },
       {
-        "name": "godot_pool_byte_array_write_access_copy",
-        "return_type": "godot_pool_byte_array_write_access *",
+        "name": "godot_packed_float64_array_new_with_array",
+        "return_type": "void",
         "arguments": [
-          ["const godot_pool_byte_array_write_access *", "p_write"]
+          ["godot_packed_float64_array *", "r_dest"],
+          ["const godot_array *", "p_a"]
         ]
       },
       {
-        "name": "godot_pool_byte_array_write_access_ptr",
-        "return_type": "uint8_t *",
+        "name": "godot_packed_float64_array_empty",
+        "return_type": "godot_bool",
         "arguments": [
-          ["const godot_pool_byte_array_write_access *", "p_write"]
+          ["const godot_packed_float64_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_byte_array_write_access_operator_assign",
+        "name": "godot_packed_float64_array_append",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_byte_array_write_access *", "p_write"],
-          ["godot_pool_byte_array_write_access *", "p_other"]
+          ["godot_packed_float64_array *", "p_self"],
+          ["const double", "p_data"]
         ]
       },
       {
-        "name": "godot_pool_byte_array_write_access_destroy",
+        "name": "godot_packed_float64_array_append_array",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_byte_array_write_access *", "p_write"]
+          ["godot_packed_float64_array *", "p_self"],
+          ["const godot_packed_float64_array *", "p_array"]
         ]
       },
       {
-        "name": "godot_pool_int_array_write_access_copy",
-        "return_type": "godot_pool_int_array_write_access *",
+        "name": "godot_packed_float64_array_insert",
+        "return_type": "godot_error",
         "arguments": [
-          ["const godot_pool_int_array_write_access *", "p_write"]
+          ["godot_packed_float64_array *", "p_self"],
+          ["const godot_int", "p_idx"],
+          ["const double", "p_data"]
         ]
       },
       {
-        "name": "godot_pool_int_array_write_access_ptr",
-        "return_type": "godot_int *",
+        "name": "godot_packed_float64_array_has",
+        "return_type": "godot_bool",
         "arguments": [
-          ["const godot_pool_int_array_write_access *", "p_write"]
+          ["godot_packed_float64_array *", "p_self"],
+          ["const double", "p_value"]
         ]
       },
       {
-        "name": "godot_pool_int_array_write_access_operator_assign",
+        "name": "godot_packed_float64_array_sort",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_int_array_write_access *", "p_write"],
-          ["godot_pool_int_array_write_access *", "p_other"]
+          ["godot_packed_float64_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_int_array_write_access_destroy",
+        "name": "godot_packed_float64_array_invert",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_int_array_write_access *", "p_write"]
-        ]
-      },
-      {
-        "name": "godot_pool_real_array_write_access_copy",
-        "return_type": "godot_pool_real_array_write_access *",
-        "arguments": [
-          ["const godot_pool_real_array_write_access *", "p_write"]
+          ["godot_packed_float64_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_real_array_write_access_ptr",
-        "return_type": "godot_real *",
+        "name": "godot_packed_float64_array_push_back",
+        "return_type": "void",
         "arguments": [
-          ["const godot_pool_real_array_write_access *", "p_write"]
+          ["godot_packed_float64_array *", "p_self"],
+          ["const double", "p_data"]
         ]
       },
       {
-        "name": "godot_pool_real_array_write_access_operator_assign",
+        "name": "godot_packed_float64_array_remove",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_real_array_write_access *", "p_write"],
-          ["godot_pool_real_array_write_access *", "p_other"]
+          ["godot_packed_float64_array *", "p_self"],
+          ["const godot_int", "p_idx"]
         ]
       },
       {
-        "name": "godot_pool_real_array_write_access_destroy",
+        "name": "godot_packed_float64_array_resize",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_real_array_write_access *", "p_write"]
+          ["godot_packed_float64_array *", "p_self"],
+          ["const godot_int", "p_size"]
         ]
       },
       {
-        "name": "godot_pool_string_array_write_access_copy",
-        "return_type": "godot_pool_string_array_write_access *",
+        "name": "godot_packed_float64_array_ptr",
+        "return_type": "const double *",
         "arguments": [
-          ["const godot_pool_string_array_write_access *", "p_write"]
+          ["const godot_packed_float64_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_string_array_write_access_ptr",
-        "return_type": "godot_string *",
+        "name": "godot_packed_float64_array_ptrw",
+        "return_type": "double *",
         "arguments": [
-          ["const godot_pool_string_array_write_access *", "p_write"]
+          ["godot_packed_float64_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_string_array_write_access_operator_assign",
+        "name": "godot_packed_float64_array_set",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_string_array_write_access *", "p_write"],
-          ["godot_pool_string_array_write_access *", "p_other"]
+          ["godot_packed_float64_array *", "p_self"],
+          ["const godot_int", "p_idx"],
+          ["const double", "p_data"]
         ]
       },
       {
-        "name": "godot_pool_string_array_write_access_destroy",
-        "return_type": "void",
+        "name": "godot_packed_float64_array_get",
+        "return_type": "double",
         "arguments": [
-          ["godot_pool_string_array_write_access *", "p_write"]
+          ["const godot_packed_float64_array *", "p_self"],
+          ["const godot_int", "p_idx"]
         ]
       },
       {
-        "name": "godot_pool_vector2_array_write_access_copy",
-        "return_type": "godot_pool_vector2_array_write_access *",
+        "name": "godot_packed_float64_array_size",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_pool_vector2_array_write_access *", "p_write"]
+          ["const godot_packed_float64_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_vector2_array_write_access_ptr",
-        "return_type": "godot_vector2 *",
+        "name": "godot_packed_float64_array_destroy",
+        "return_type": "void",
         "arguments": [
-          ["const godot_pool_vector2_array_write_access *", "p_write"]
+          ["godot_packed_float64_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_vector2_array_write_access_operator_assign",
+        "name": "godot_packed_string_array_new",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector2_array_write_access *", "p_write"],
-          ["godot_pool_vector2_array_write_access *", "p_other"]
+          ["godot_packed_string_array *", "r_dest"]
         ]
       },
       {
-        "name": "godot_pool_vector2_array_write_access_destroy",
+        "name": "godot_packed_string_array_new_copy",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector2_array_write_access *", "p_write"]
+          ["godot_packed_string_array *", "r_dest"],
+          ["const godot_packed_string_array *", "p_src"]
         ]
       },
       {
-        "name": "godot_pool_vector3_array_write_access_copy",
-        "return_type": "godot_pool_vector3_array_write_access *",
+        "name": "godot_packed_string_array_new_with_array",
+        "return_type": "void",
         "arguments": [
-          ["const godot_pool_vector3_array_write_access *", "p_write"]
+          ["godot_packed_string_array *", "r_dest"],
+          ["const godot_array *", "p_a"]
         ]
       },
       {
-        "name": "godot_pool_vector3_array_write_access_ptr",
-        "return_type": "godot_vector3 *",
+        "name": "godot_packed_string_array_empty",
+        "return_type": "godot_bool",
         "arguments": [
-          ["const godot_pool_vector3_array_write_access *", "p_write"]
+          ["const godot_packed_string_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_vector3_array_write_access_operator_assign",
+        "name": "godot_packed_string_array_append",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector3_array_write_access *", "p_write"],
-          ["godot_pool_vector3_array_write_access *", "p_other"]
+          ["godot_packed_string_array *", "p_self"],
+          ["const godot_string *", "p_data"]
         ]
       },
       {
-        "name": "godot_pool_vector3_array_write_access_destroy",
+        "name": "godot_packed_string_array_append_array",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_vector3_array_write_access *", "p_write"]
+          ["godot_packed_string_array *", "p_self"],
+          ["const godot_packed_string_array *", "p_array"]
         ]
       },
       {
-        "name": "godot_pool_color_array_write_access_copy",
-        "return_type": "godot_pool_color_array_write_access *",
+        "name": "godot_packed_string_array_insert",
+        "return_type": "godot_error",
         "arguments": [
-          ["const godot_pool_color_array_write_access *", "p_write"]
+          ["godot_packed_string_array *", "p_self"],
+          ["const godot_int", "p_idx"],
+          ["const godot_string *", "p_data"]
         ]
       },
       {
-        "name": "godot_pool_color_array_write_access_ptr",
-        "return_type": "godot_color *",
+        "name": "godot_packed_string_array_has",
+        "return_type": "godot_bool",
         "arguments": [
-          ["const godot_pool_color_array_write_access *", "p_write"]
+          ["godot_packed_string_array *", "p_self"],
+          ["const godot_string *", "p_value"]
         ]
       },
       {
-        "name": "godot_pool_color_array_write_access_operator_assign",
+        "name": "godot_packed_string_array_sort",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_color_array_write_access *", "p_write"],
-          ["godot_pool_color_array_write_access *", "p_other"]
+          ["godot_packed_string_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_pool_color_array_write_access_destroy",
+        "name": "godot_packed_string_array_invert",
         "return_type": "void",
         "arguments": [
-          ["godot_pool_color_array_write_access *", "p_write"]
+          ["godot_packed_string_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_array_new",
+        "name": "godot_packed_string_array_push_back",
         "return_type": "void",
         "arguments": [
-          ["godot_array *", "r_dest"]
+          ["godot_packed_string_array *", "p_self"],
+          ["const godot_string *", "p_data"]
         ]
       },
       {
-        "name": "godot_array_new_copy",
+        "name": "godot_packed_string_array_remove",
         "return_type": "void",
         "arguments": [
-          ["godot_array *", "r_dest"],
-          ["const godot_array *", "p_src"]
+          ["godot_packed_string_array *", "p_self"],
+          ["const godot_int", "p_idx"]
         ]
       },
       {
-        "name": "godot_array_new_pool_color_array",
+        "name": "godot_packed_string_array_resize",
         "return_type": "void",
         "arguments": [
-          ["godot_array *", "r_dest"],
-          ["const godot_pool_color_array *", "p_pca"]
+          ["godot_packed_string_array *", "p_self"],
+          ["const godot_int", "p_size"]
         ]
       },
       {
-        "name": "godot_array_new_pool_vector3_array",
-        "return_type": "void",
+        "name": "godot_packed_string_array_ptr",
+        "return_type": "const godot_string *",
         "arguments": [
-          ["godot_array *", "r_dest"],
-          ["const godot_pool_vector3_array *", "p_pv3a"]
+          ["const godot_packed_string_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_array_new_pool_vector2_array",
-        "return_type": "void",
+        "name": "godot_packed_string_array_ptrw",
+        "return_type": "godot_string *",
         "arguments": [
-          ["godot_array *", "r_dest"],
-          ["const godot_pool_vector2_array *", "p_pv2a"]
+          ["godot_packed_string_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_array_new_pool_string_array",
+        "name": "godot_packed_string_array_set",
         "return_type": "void",
         "arguments": [
-          ["godot_array *", "r_dest"],
-          ["const godot_pool_string_array *", "p_psa"]
+          ["godot_packed_string_array *", "p_self"],
+          ["const godot_int", "p_idx"],
+          ["const godot_string *", "p_data"]
         ]
       },
       {
-        "name": "godot_array_new_pool_real_array",
-        "return_type": "void",
+        "name": "godot_packed_string_array_get",
+        "return_type": "godot_string",
         "arguments": [
-          ["godot_array *", "r_dest"],
-          ["const godot_pool_real_array *", "p_pra"]
+          ["const godot_packed_string_array *", "p_self"],
+          ["const godot_int", "p_idx"]
         ]
       },
       {
-        "name": "godot_array_new_pool_int_array",
-        "return_type": "void",
+        "name": "godot_packed_string_array_size",
+        "return_type": "godot_int",
         "arguments": [
-          ["godot_array *", "r_dest"],
-          ["const godot_pool_int_array *", "p_pia"]
+          ["const godot_packed_string_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_array_new_pool_byte_array",
+        "name": "godot_packed_string_array_destroy",
         "return_type": "void",
         "arguments": [
-          ["godot_array *", "r_dest"],
-          ["const godot_pool_byte_array *", "p_pba"]
+          ["godot_packed_string_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_array_set",
+        "name": "godot_packed_vector2_array_new",
         "return_type": "void",
         "arguments": [
-          ["godot_array *", "p_self"],
-          ["const godot_int", "p_idx"],
-          ["const godot_variant *", "p_value"]
+          ["godot_packed_vector2_array *", "r_dest"]
         ]
       },
       {
-        "name": "godot_array_get",
-        "return_type": "godot_variant",
+        "name": "godot_packed_vector2_array_new_copy",
+        "return_type": "void",
         "arguments": [
-          ["const godot_array *", "p_self"],
-          ["const godot_int", "p_idx"]
+          ["godot_packed_vector2_array *", "r_dest"],
+          ["const godot_packed_vector2_array *", "p_src"]
         ]
       },
       {
-        "name": "godot_array_operator_index",
-        "return_type": "godot_variant *",
+        "name": "godot_packed_vector2_array_new_with_array",
+        "return_type": "void",
         "arguments": [
-          ["godot_array *", "p_self"],
-          ["const godot_int", "p_idx"]
+          ["godot_packed_vector2_array *", "r_dest"],
+          ["const godot_array *", "p_a"]
         ]
       },
       {
-        "name": "godot_array_operator_index_const",
-        "return_type": "const godot_variant *",
+        "name": "godot_packed_vector2_array_empty",
+        "return_type": "godot_bool",
         "arguments": [
-          ["const godot_array *", "p_self"],
-          ["const godot_int", "p_idx"]
+          ["const godot_packed_vector2_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_array_append",
+        "name": "godot_packed_vector2_array_append",
         "return_type": "void",
         "arguments": [
-          ["godot_array *", "p_self"],
-          ["const godot_variant *", "p_value"]
+          ["godot_packed_vector2_array *", "p_self"],
+          ["const godot_vector2 *", "p_data"]
         ]
       },
       {
-        "name": "godot_array_clear",
+        "name": "godot_packed_vector2_array_append_array",
         "return_type": "void",
         "arguments": [
-          ["godot_array *", "p_self"]
+          ["godot_packed_vector2_array *", "p_self"],
+          ["const godot_packed_vector2_array *", "p_array"]
         ]
       },
       {
-        "name": "godot_array_count",
-        "return_type": "godot_int",
+        "name": "godot_packed_vector2_array_insert",
+        "return_type": "godot_error",
         "arguments": [
-          ["const godot_array *", "p_self"],
-          ["const godot_variant *", "p_value"]
+          ["godot_packed_vector2_array *", "p_self"],
+          ["const godot_int", "p_idx"],
+          ["const godot_vector2 *", "p_data"]
         ]
       },
       {
-        "name": "godot_array_empty",
+        "name": "godot_packed_vector2_array_has",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_array *", "p_self"]
+          ["godot_packed_vector2_array *", "p_self"],
+          ["const godot_vector2 *", "p_value"]
         ]
       },
       {
-        "name": "godot_array_erase",
+        "name": "godot_packed_vector2_array_sort",
         "return_type": "void",
         "arguments": [
-          ["godot_array *", "p_self"],
-          ["const godot_variant *", "p_value"]
+          ["godot_packed_vector2_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_array_front",
-        "return_type": "godot_variant",
+        "name": "godot_packed_vector2_array_invert",
+        "return_type": "void",
         "arguments": [
-          ["const godot_array *", "p_self"]
+          ["godot_packed_vector2_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_array_back",
-        "return_type": "godot_variant",
-        "arguments": [
-          ["const godot_array *", "p_self"]
-        ]
-      },
-      {
-        "name": "godot_array_find",
-        "return_type": "godot_int",
+        "name": "godot_packed_vector2_array_push_back",
+        "return_type": "void",
         "arguments": [
-          ["const godot_array *", "p_self"],
-          ["const godot_variant *", "p_what"],
-          ["const godot_int", "p_from"]
+          ["godot_packed_vector2_array *", "p_self"],
+          ["const godot_vector2 *", "p_data"]
         ]
       },
       {
-        "name": "godot_array_find_last",
-        "return_type": "godot_int",
+        "name": "godot_packed_vector2_array_remove",
+        "return_type": "void",
         "arguments": [
-          ["const godot_array *", "p_self"],
-          ["const godot_variant *", "p_what"]
+          ["godot_packed_vector2_array *", "p_self"],
+          ["const godot_int", "p_idx"]
         ]
       },
       {
-        "name": "godot_array_has",
-        "return_type": "godot_bool",
+        "name": "godot_packed_vector2_array_resize",
+        "return_type": "void",
         "arguments": [
-          ["const godot_array *", "p_self"],
-          ["const godot_variant *", "p_value"]
+          ["godot_packed_vector2_array *", "p_self"],
+          ["const godot_int", "p_size"]
         ]
       },
       {
-        "name": "godot_array_hash",
-        "return_type": "godot_int",
+        "name": "godot_packed_vector2_array_ptr",
+        "return_type": "const godot_vector2 *",
         "arguments": [
-          ["const godot_array *", "p_self"]
+          ["const godot_packed_vector2_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_array_insert",
-        "return_type": "void",
+        "name": "godot_packed_vector2_array_ptrw",
+        "return_type": "godot_vector2 *",
         "arguments": [
-          ["godot_array *", "p_self"],
-          ["const godot_int", "p_pos"],
-          ["const godot_variant *", "p_value"]
+          ["godot_packed_vector2_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_array_invert",
+        "name": "godot_packed_vector2_array_set",
         "return_type": "void",
         "arguments": [
-          ["godot_array *", "p_self"]
+          ["godot_packed_vector2_array *", "p_self"],
+          ["const godot_int", "p_idx"],
+          ["const godot_vector2 *", "p_data"]
         ]
       },
       {
-        "name": "godot_array_pop_back",
-        "return_type": "godot_variant",
+        "name": "godot_packed_vector2_array_get",
+        "return_type": "godot_vector2",
         "arguments": [
-          ["godot_array *", "p_self"]
+          ["const godot_packed_vector2_array *", "p_self"],
+          ["const godot_int", "p_idx"]
         ]
       },
       {
-        "name": "godot_array_pop_front",
-        "return_type": "godot_variant",
+        "name": "godot_packed_vector2_array_size",
+        "return_type": "godot_int",
         "arguments": [
-          ["godot_array *", "p_self"]
+          ["const godot_packed_vector2_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_array_push_back",
+        "name": "godot_packed_vector2_array_destroy",
         "return_type": "void",
         "arguments": [
-          ["godot_array *", "p_self"],
-          ["const godot_variant *", "p_value"]
+          ["godot_packed_vector2_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_array_push_front",
+        "name": "godot_packed_vector3_array_new",
         "return_type": "void",
         "arguments": [
-          ["godot_array *", "p_self"],
-          ["const godot_variant *", "p_value"]
+          ["godot_packed_vector3_array *", "r_dest"]
         ]
       },
       {
-        "name": "godot_array_remove",
+        "name": "godot_packed_vector3_array_new_copy",
         "return_type": "void",
         "arguments": [
-          ["godot_array *", "p_self"],
-          ["const godot_int", "p_idx"]
+          ["godot_packed_vector3_array *", "r_dest"],
+          ["const godot_packed_vector3_array *", "p_src"]
         ]
       },
       {
-        "name": "godot_array_resize",
+        "name": "godot_packed_vector3_array_new_with_array",
         "return_type": "void",
         "arguments": [
-          ["godot_array *", "p_self"],
-          ["const godot_int", "p_size"]
+          ["godot_packed_vector3_array *", "r_dest"],
+          ["const godot_array *", "p_a"]
         ]
       },
       {
-        "name": "godot_array_rfind",
-        "return_type": "godot_int",
+        "name": "godot_packed_vector3_array_empty",
+        "return_type": "godot_bool",
         "arguments": [
-          ["const godot_array *", "p_self"],
-          ["const godot_variant *", "p_what"],
-          ["const godot_int", "p_from"]
+          ["const godot_packed_vector3_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_array_size",
-        "return_type": "godot_int",
+        "name": "godot_packed_vector3_array_append",
+        "return_type": "void",
         "arguments": [
-          ["const godot_array *", "p_self"]
+          ["godot_packed_vector3_array *", "p_self"],
+          ["const godot_vector3 *", "p_data"]
         ]
       },
       {
-        "name": "godot_array_sort",
+        "name": "godot_packed_vector3_array_append_array",
         "return_type": "void",
         "arguments": [
-          ["godot_array *", "p_self"]
+          ["godot_packed_vector3_array *", "p_self"],
+          ["const godot_packed_vector3_array *", "p_array"]
         ]
       },
       {
-        "name": "godot_array_sort_custom",
-        "return_type": "void",
+        "name": "godot_packed_vector3_array_insert",
+        "return_type": "godot_error",
         "arguments": [
-          ["godot_array *", "p_self"],
-          ["godot_object *", "p_obj"],
-          ["const godot_string *", "p_func"]
+          ["godot_packed_vector3_array *", "p_self"],
+          ["const godot_int", "p_idx"],
+          ["const godot_vector3 *", "p_data"]
         ]
       },
       {
-        "name": "godot_array_bsearch",
-        "return_type": "godot_int",
+        "name": "godot_packed_vector3_array_has",
+        "return_type": "godot_bool",
         "arguments": [
-          ["godot_array *", "p_self"],
-          ["const godot_variant *", "p_value"],
-          ["const godot_bool", "p_before"]
+          ["godot_packed_vector3_array *", "p_self"],
+          ["const godot_vector3 *", "p_value"]
         ]
       },
       {
-        "name": "godot_array_bsearch_custom",
-        "return_type": "godot_int",
+        "name": "godot_packed_vector3_array_sort",
+        "return_type": "void",
         "arguments": [
-          ["godot_array *", "p_self"],
-          ["const godot_variant *", "p_value"],
-          ["godot_object *", "p_obj"],
-          ["const godot_string *", "p_func"],
-          ["const godot_bool", "p_before"]
+          ["godot_packed_vector3_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_array_destroy",
+        "name": "godot_packed_vector3_array_invert",
         "return_type": "void",
         "arguments": [
-          ["godot_array *", "p_self"]
+          ["godot_packed_vector3_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_dictionary_new",
+        "name": "godot_packed_vector3_array_push_back",
         "return_type": "void",
         "arguments": [
-          ["godot_dictionary *", "r_dest"]
+          ["godot_packed_vector3_array *", "p_self"],
+          ["const godot_vector3 *", "p_data"]
         ]
       },
       {
-        "name": "godot_dictionary_new_copy",
+        "name": "godot_packed_vector3_array_remove",
         "return_type": "void",
         "arguments": [
-          ["godot_dictionary *", "r_dest"],
-          ["const godot_dictionary *", "p_src"]
+          ["godot_packed_vector3_array *", "p_self"],
+          ["const godot_int", "p_idx"]
         ]
       },
       {
-        "name": "godot_dictionary_destroy",
+        "name": "godot_packed_vector3_array_resize",
         "return_type": "void",
         "arguments": [
-          ["godot_dictionary *", "p_self"]
+          ["godot_packed_vector3_array *", "p_self"],
+          ["const godot_int", "p_size"]
         ]
       },
       {
-        "name": "godot_dictionary_size",
-        "return_type": "godot_int",
+        "name": "godot_packed_vector3_array_ptr",
+        "return_type": "const godot_vector3 *",
         "arguments": [
-          ["const godot_dictionary *", "p_self"]
+          ["const godot_packed_vector3_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_dictionary_empty",
-        "return_type": "godot_bool",
+        "name": "godot_packed_vector3_array_ptrw",
+        "return_type": "godot_vector3 *",
         "arguments": [
-          ["const godot_dictionary *", "p_self"]
+          ["godot_packed_vector3_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_dictionary_clear",
+        "name": "godot_packed_vector3_array_set",
         "return_type": "void",
         "arguments": [
-          ["godot_dictionary *", "p_self"]
+          ["godot_packed_vector3_array *", "p_self"],
+          ["const godot_int", "p_idx"],
+          ["const godot_vector3 *", "p_data"]
         ]
       },
       {
-        "name": "godot_dictionary_has",
-        "return_type": "godot_bool",
+        "name": "godot_packed_vector3_array_get",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_dictionary *", "p_self"],
-          ["const godot_variant *", "p_key"]
+          ["const godot_packed_vector3_array *", "p_self"],
+          ["const godot_int", "p_idx"]
         ]
       },
       {
-        "name": "godot_dictionary_has_all",
-        "return_type": "godot_bool",
+        "name": "godot_packed_vector3_array_size",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_dictionary *", "p_self"],
-          ["const godot_array *", "p_keys"]
+          ["const godot_packed_vector3_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_dictionary_erase",
+        "name": "godot_packed_vector3_array_destroy",
         "return_type": "void",
         "arguments": [
-          ["godot_dictionary *", "p_self"],
-          ["const godot_variant *", "p_key"]
+          ["godot_packed_vector3_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_dictionary_hash",
-        "return_type": "godot_int",
+        "name": "godot_packed_color_array_new",
+        "return_type": "void",
         "arguments": [
-          ["const godot_dictionary *", "p_self"]
+          ["godot_packed_color_array *", "r_dest"]
         ]
       },
       {
-        "name": "godot_dictionary_keys",
-        "return_type": "godot_array",
+        "name": "godot_packed_color_array_new_copy",
+        "return_type": "void",
         "arguments": [
-          ["const godot_dictionary *", "p_self"]
+          ["godot_packed_color_array *", "r_dest"],
+          ["const godot_packed_color_array *", "p_src"]
         ]
       },
       {
-        "name": "godot_dictionary_values",
-        "return_type": "godot_array",
+        "name": "godot_packed_color_array_new_with_array",
+        "return_type": "void",
         "arguments": [
-          ["const godot_dictionary *", "p_self"]
+          ["godot_packed_color_array *", "r_dest"],
+          ["const godot_array *", "p_a"]
         ]
       },
       {
-        "name": "godot_dictionary_get",
-        "return_type": "godot_variant",
+        "name": "godot_packed_color_array_empty",
+        "return_type": "godot_bool",
         "arguments": [
-          ["const godot_dictionary *", "p_self"],
-          ["const godot_variant *", "p_key"]
+          ["const godot_packed_color_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_dictionary_set",
+        "name": "godot_packed_color_array_append",
         "return_type": "void",
         "arguments": [
-          ["godot_dictionary *", "p_self"],
-          ["const godot_variant *", "p_key"],
-          ["const godot_variant *", "p_value"]
-        ]
-      },
-      {
-        "name": "godot_dictionary_operator_index",
-        "return_type": "godot_variant *",
-        "arguments": [
-          ["godot_dictionary *", "p_self"],
-          ["const godot_variant *", "p_key"]
+          ["godot_packed_color_array *", "p_self"],
+          ["const godot_color *", "p_data"]
         ]
       },
       {
-        "name": "godot_dictionary_operator_index_const",
-        "return_type": "const godot_variant *",
+        "name": "godot_packed_color_array_append_array",
+        "return_type": "void",
         "arguments": [
-          ["const godot_dictionary *", "p_self"],
-          ["const godot_variant *", "p_key"]
+          ["godot_packed_color_array *", "p_self"],
+          ["const godot_packed_color_array *", "p_array"]
         ]
       },
       {
-        "name": "godot_dictionary_next",
-        "return_type": "godot_variant *",
+        "name": "godot_packed_color_array_insert",
+        "return_type": "godot_error",
         "arguments": [
-          ["const godot_dictionary *", "p_self"],
-          ["const godot_variant *", "p_key"]
+          ["godot_packed_color_array *", "p_self"],
+          ["const godot_int", "p_idx"],
+          ["const godot_color *", "p_data"]
         ]
       },
       {
-        "name": "godot_dictionary_operator_equal",
+        "name": "godot_packed_color_array_has",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_dictionary *", "p_self"],
-          ["const godot_dictionary *", "p_b"]
+          ["godot_packed_color_array *", "p_self"],
+          ["const godot_color *", "p_value"]
         ]
       },
       {
-        "name": "godot_dictionary_to_json",
-        "return_type": "godot_string",
-        "arguments": [
-          ["const godot_dictionary *", "p_self"]
-        ]
-      },
-      {
-        "name": "godot_node_path_new",
+        "name": "godot_packed_color_array_sort",
         "return_type": "void",
         "arguments": [
-          ["godot_node_path *", "r_dest"],
-          ["const godot_string *", "p_from"]
+          ["godot_packed_color_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_node_path_new_copy",
+        "name": "godot_packed_color_array_invert",
         "return_type": "void",
         "arguments": [
-          ["godot_node_path *", "r_dest"],
-          ["const godot_node_path *", "p_src"]
+          ["godot_packed_color_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_node_path_destroy",
+        "name": "godot_packed_color_array_push_back",
         "return_type": "void",
         "arguments": [
-          ["godot_node_path *", "p_self"]
+          ["godot_packed_color_array *", "p_self"],
+          ["const godot_color *", "p_data"]
         ]
       },
       {
-        "name": "godot_node_path_as_string",
-        "return_type": "godot_string",
+        "name": "godot_packed_color_array_remove",
+        "return_type": "void",
         "arguments": [
-          ["const godot_node_path *", "p_self"]
+          ["godot_packed_color_array *", "p_self"],
+          ["const godot_int", "p_idx"]
         ]
       },
       {
-        "name": "godot_node_path_is_absolute",
-        "return_type": "godot_bool",
+        "name": "godot_packed_color_array_resize",
+        "return_type": "void",
         "arguments": [
-          ["const godot_node_path *", "p_self"]
+          ["godot_packed_color_array *", "p_self"],
+          ["const godot_int", "p_size"]
         ]
       },
       {
-        "name": "godot_node_path_get_name_count",
-        "return_type": "godot_int",
+        "name": "godot_packed_color_array_ptr",
+        "return_type": "const godot_color *",
         "arguments": [
-          ["const godot_node_path *", "p_self"]
+          ["const godot_packed_color_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_node_path_get_name",
-        "return_type": "godot_string",
+        "name": "godot_packed_color_array_ptrw",
+        "return_type": "godot_color *",
         "arguments": [
-          ["const godot_node_path *", "p_self"],
-          ["const godot_int", "p_idx"]
+          ["godot_packed_color_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_node_path_get_subname_count",
-        "return_type": "godot_int",
+        "name": "godot_packed_color_array_set",
+        "return_type": "void",
         "arguments": [
-          ["const godot_node_path *", "p_self"]
+          ["godot_packed_color_array *", "p_self"],
+          ["const godot_int", "p_idx"],
+          ["const godot_color *", "p_data"]
         ]
       },
       {
-        "name": "godot_node_path_get_subname",
-        "return_type": "godot_string",
+        "name": "godot_packed_color_array_get",
+        "return_type": "godot_color",
         "arguments": [
-          ["const godot_node_path *", "p_self"],
+          ["const godot_packed_color_array *", "p_self"],
           ["const godot_int", "p_idx"]
         ]
       },
       {
-        "name": "godot_node_path_get_concatenated_subnames",
-        "return_type": "godot_string",
-        "arguments": [
-          ["const godot_node_path *", "p_self"]
-        ]
-      },
-      {
-        "name": "godot_node_path_is_empty",
-        "return_type": "godot_bool",
+        "name": "godot_packed_color_array_size",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_node_path *", "p_self"]
+          ["const godot_packed_color_array *", "p_self"]
         ]
       },
       {
-        "name": "godot_node_path_operator_equal",
-        "return_type": "godot_bool",
+        "name": "godot_packed_color_array_destroy",
+        "return_type": "void",
         "arguments": [
-          ["const godot_node_path *", "p_self"],
-          ["const godot_node_path *", "p_b"]
+          ["godot_packed_color_array *", "p_self"]
         ]
       },
       {
@@ -3538,13 +2988,6 @@
         ]
       },
       {
-        "name": "godot_plane_get_any_point",
-        "return_type": "godot_vector3",
-        "arguments": [
-          ["const godot_plane *", "p_self"]
-        ]
-      },
-      {
         "name": "godot_plane_is_point_over",
         "return_type": "godot_bool",
         "arguments": [
@@ -3653,6 +3096,245 @@
         ]
       },
       {
+        "name": "godot_quat_new",
+        "return_type": "void",
+        "arguments": [
+          ["godot_quat *", "r_dest"],
+          ["const godot_real", "p_x"],
+          ["const godot_real", "p_y"],
+          ["const godot_real", "p_z"],
+          ["const godot_real", "p_w"]
+        ]
+      },
+      {
+        "name": "godot_quat_new_with_axis_angle",
+        "return_type": "void",
+        "arguments": [
+          ["godot_quat *", "r_dest"],
+          ["const godot_vector3 *", "p_axis"],
+          ["const godot_real", "p_angle"]
+        ]
+      },
+      {
+        "name": "godot_quat_new_with_basis",
+        "return_type": "void",
+        "arguments": [
+          ["godot_quat *", "r_dest"],
+          ["const godot_basis *", "p_basis"]
+        ]
+      },
+      {
+        "name": "godot_quat_new_with_euler",
+        "return_type": "void",
+        "arguments": [
+          ["godot_quat *", "r_dest"],
+          ["const godot_vector3 *", "p_euler"]
+        ]
+      },
+      {
+        "name": "godot_quat_get_x",
+        "return_type": "godot_real",
+        "arguments": [
+          ["const godot_quat *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_quat_set_x",
+        "return_type": "void",
+        "arguments": [
+          ["godot_quat *", "p_self"],
+          ["const godot_real", "val"]
+        ]
+      },
+      {
+        "name": "godot_quat_get_y",
+        "return_type": "godot_real",
+        "arguments": [
+          ["const godot_quat *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_quat_set_y",
+        "return_type": "void",
+        "arguments": [
+          ["godot_quat *", "p_self"],
+          ["const godot_real", "val"]
+        ]
+      },
+      {
+        "name": "godot_quat_get_z",
+        "return_type": "godot_real",
+        "arguments": [
+          ["const godot_quat *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_quat_set_z",
+        "return_type": "void",
+        "arguments": [
+          ["godot_quat *", "p_self"],
+          ["const godot_real", "val"]
+        ]
+      },
+      {
+        "name": "godot_quat_get_w",
+        "return_type": "godot_real",
+        "arguments": [
+          ["const godot_quat *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_quat_set_w",
+        "return_type": "void",
+        "arguments": [
+          ["godot_quat *", "p_self"],
+          ["const godot_real", "val"]
+        ]
+      },
+      {
+        "name": "godot_quat_set_axis_angle",
+        "return_type": "void",
+        "arguments": [
+          ["godot_quat *", "p_self"],
+          ["const godot_vector3 *", "p_axis"],
+          ["const godot_real", "p_angle"]
+        ]
+      },
+      {
+        "name": "godot_quat_as_string",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_quat *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_quat_length",
+        "return_type": "godot_real",
+        "arguments": [
+          ["const godot_quat *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_quat_length_squared",
+        "return_type": "godot_real",
+        "arguments": [
+          ["const godot_quat *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_quat_normalized",
+        "return_type": "godot_quat",
+        "arguments": [
+          ["const godot_quat *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_quat_is_normalized",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_quat *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_quat_inverse",
+        "return_type": "godot_quat",
+        "arguments": [
+          ["const godot_quat *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_quat_dot",
+        "return_type": "godot_real",
+        "arguments": [
+          ["const godot_quat *", "p_self"],
+          ["const godot_quat *", "p_b"]
+        ]
+      },
+      {
+        "name": "godot_quat_xform",
+        "return_type": "godot_vector3",
+        "arguments": [
+          ["const godot_quat *", "p_self"],
+          ["const godot_vector3 *", "p_v"]
+        ]
+      },
+      {
+        "name": "godot_quat_slerp",
+        "return_type": "godot_quat",
+        "arguments": [
+          ["const godot_quat *", "p_self"],
+          ["const godot_quat *", "p_b"],
+          ["const godot_real", "p_t"]
+        ]
+      },
+      {
+        "name": "godot_quat_slerpni",
+        "return_type": "godot_quat",
+        "arguments": [
+          ["const godot_quat *", "p_self"],
+          ["const godot_quat *", "p_b"],
+          ["const godot_real", "p_t"]
+        ]
+      },
+      {
+        "name": "godot_quat_cubic_slerp",
+        "return_type": "godot_quat",
+        "arguments": [
+          ["const godot_quat *", "p_self"],
+          ["const godot_quat *", "p_b"],
+          ["const godot_quat *", "p_pre_a"],
+          ["const godot_quat *", "p_post_b"],
+          ["const godot_real", "p_t"]
+        ]
+      },
+      {
+        "name": "godot_quat_operator_multiply",
+        "return_type": "godot_quat",
+        "arguments": [
+          ["const godot_quat *", "p_self"],
+          ["const godot_real", "p_b"]
+        ]
+      },
+      {
+        "name": "godot_quat_operator_add",
+        "return_type": "godot_quat",
+        "arguments": [
+          ["const godot_quat *", "p_self"],
+          ["const godot_quat *", "p_b"]
+        ]
+      },
+      {
+        "name": "godot_quat_operator_subtract",
+        "return_type": "godot_quat",
+        "arguments": [
+          ["const godot_quat *", "p_self"],
+          ["const godot_quat *", "p_b"]
+        ]
+      },
+      {
+        "name": "godot_quat_operator_divide",
+        "return_type": "godot_quat",
+        "arguments": [
+          ["const godot_quat *", "p_self"],
+          ["const godot_real", "p_b"]
+        ]
+      },
+      {
+        "name": "godot_quat_operator_equal",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_quat *", "p_self"],
+          ["const godot_quat *", "p_b"]
+        ]
+      },
+      {
+        "name": "godot_quat_operator_neg",
+        "return_type": "godot_quat",
+        "arguments": [
+          ["const godot_quat *", "p_self"]
+        ]
+      },
+      {
         "name": "godot_rect2_new_with_position_and_size",
         "return_type": "void",
         "arguments": [
@@ -3673,6 +3355,13 @@
         ]
       },
       {
+        "name": "godot_rect2_as_rect2i",
+        "return_type": "godot_rect2i",
+        "arguments": [
+          ["const godot_rect2 *", "p_self"]
+        ]
+      },
+      {
         "name": "godot_rect2_as_string",
         "return_type": "godot_string",
         "arguments": [
@@ -3687,6 +3376,33 @@
         ]
       },
       {
+        "name": "godot_rect2_grow_individual",
+        "return_type": "godot_rect2",
+        "arguments": [
+          ["const godot_rect2 *", "p_self"],
+          ["const godot_real", "p_left"],
+          ["const godot_real", "p_top"],
+          ["const godot_real", "p_right"],
+          ["const godot_real", "p_bottom"]
+        ]
+      },
+      {
+        "name": "godot_rect2_grow_margin",
+        "return_type": "godot_rect2",
+        "arguments": [
+          ["const godot_rect2 *", "p_self"],
+          ["const godot_int", "p_margin"],
+          ["const godot_real", "p_by"]
+        ]
+      },
+      {
+        "name": "godot_rect2_abs",
+        "return_type": "godot_rect2",
+        "arguments": [
+          ["const godot_rect2 *", "p_self"]
+        ]
+      },
+      {
         "name": "godot_rect2_intersects",
         "return_type": "godot_bool",
         "arguments": [
@@ -3788,247 +3504,1631 @@
         ]
       },
       {
-        "name": "godot_aabb_new",
+        "name": "godot_rect2i_new_with_position_and_size",
         "return_type": "void",
         "arguments": [
-          ["godot_aabb *", "r_dest"],
-          ["const godot_vector3 *", "p_pos"],
-          ["const godot_vector3 *", "p_size"]
+          ["godot_rect2i *", "r_dest"],
+          ["const godot_vector2i *", "p_pos"],
+          ["const godot_vector2i *", "p_size"]
         ]
       },
       {
-        "name": "godot_aabb_get_position",
-        "return_type": "godot_vector3",
+        "name": "godot_rect2i_new",
+        "return_type": "void",
         "arguments": [
-          ["const godot_aabb *", "p_self"]
+          ["godot_rect2i *", "r_dest"],
+          ["const godot_int", "p_x"],
+          ["const godot_int", "p_y"],
+          ["const godot_int", "p_width"],
+          ["const godot_int", "p_height"]
         ]
       },
       {
-        "name": "godot_aabb_set_position",
+        "name": "godot_rect2i_as_string",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_rect2i *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_rect2i_as_rect2",
+        "return_type": "godot_rect2",
+        "arguments": [
+          ["const godot_rect2i *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_rect2i_get_area",
+        "return_type": "godot_int",
+        "arguments": [
+          ["const godot_rect2i *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_rect2i_intersects",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_rect2i *", "p_self"],
+          ["const godot_rect2i *", "p_b"]
+        ]
+      },
+      {
+        "name": "godot_rect2i_encloses",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_rect2i *", "p_self"],
+          ["const godot_rect2i *", "p_b"]
+        ]
+      },
+      {
+        "name": "godot_rect2i_has_no_area",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_rect2i *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_rect2i_clip",
+        "return_type": "godot_rect2i",
+        "arguments": [
+          ["const godot_rect2i *", "p_self"],
+          ["const godot_rect2i *", "p_b"]
+        ]
+      },
+      {
+        "name": "godot_rect2i_merge",
+        "return_type": "godot_rect2i",
+        "arguments": [
+          ["const godot_rect2i *", "p_self"],
+          ["const godot_rect2i *", "p_b"]
+        ]
+      },
+      {
+        "name": "godot_rect2i_has_point",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_rect2i *", "p_self"],
+          ["const godot_vector2i *", "p_point"]
+        ]
+      },
+      {
+        "name": "godot_rect2i_grow",
+        "return_type": "godot_rect2i",
+        "arguments": [
+          ["const godot_rect2i *", "p_self"],
+          ["const godot_int", "p_by"]
+        ]
+      },
+      {
+        "name": "godot_rect2i_grow_individual",
+        "return_type": "godot_rect2i",
+        "arguments": [
+          ["const godot_rect2i *", "p_self"],
+          ["const godot_int", "p_left"],
+          ["const godot_int", "p_top"],
+          ["const godot_int", "p_right"],
+          ["const godot_int", "p_bottom"]
+        ]
+      },
+      {
+        "name": "godot_rect2i_grow_margin",
+        "return_type": "godot_rect2i",
+        "arguments": [
+          ["const godot_rect2i *", "p_self"],
+          ["const godot_int", "p_margin"],
+          ["const godot_int", "p_by"]
+        ]
+      },
+      {
+        "name": "godot_rect2i_abs",
+        "return_type": "godot_rect2i",
+        "arguments": [
+          ["const godot_rect2i *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_rect2i_expand",
+        "return_type": "godot_rect2i",
+        "arguments": [
+          ["const godot_rect2i *", "p_self"],
+          ["const godot_vector2i *", "p_to"]
+        ]
+      },
+      {
+        "name": "godot_rect2i_operator_equal",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_rect2i *", "p_self"],
+          ["const godot_rect2i *", "p_b"]
+        ]
+      },
+      {
+        "name": "godot_rect2i_get_position",
+        "return_type": "godot_vector2i",
+        "arguments": [
+          ["const godot_rect2i *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_rect2i_get_size",
+        "return_type": "godot_vector2i",
+        "arguments": [
+          ["const godot_rect2i *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_rect2i_set_position",
         "return_type": "void",
         "arguments": [
-          ["const godot_aabb *", "p_self"],
-          ["const godot_vector3 *", "p_v"]
+          ["godot_rect2i *", "p_self"],
+          ["const godot_vector2i *", "p_pos"]
         ]
       },
       {
-        "name": "godot_aabb_get_size",
-        "return_type": "godot_vector3",
+        "name": "godot_rect2i_set_size",
+        "return_type": "void",
         "arguments": [
-          ["const godot_aabb *", "p_self"]
+          ["godot_rect2i *", "p_self"],
+          ["const godot_vector2i *", "p_size"]
         ]
       },
       {
-        "name": "godot_aabb_set_size",
+        "name": "godot_rid_new",
         "return_type": "void",
         "arguments": [
-          ["const godot_aabb *", "p_self"],
-          ["const godot_vector3 *", "p_v"]
+          ["godot_rid *", "r_dest"]
         ]
       },
       {
-        "name": "godot_aabb_as_string",
+        "name": "godot_rid_get_id",
+        "return_type": "godot_int",
+        "arguments": [
+          ["const godot_rid *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_rid_new_with_resource",
+        "return_type": "void",
+        "arguments": [
+          ["godot_rid *", "r_dest"],
+          ["const godot_object *", "p_from"]
+        ]
+      },
+      {
+        "name": "godot_rid_operator_equal",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_rid *", "p_self"],
+          ["const godot_rid *", "p_b"]
+        ]
+      },
+      {
+        "name": "godot_rid_operator_less",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_rid *", "p_self"],
+          ["const godot_rid *", "p_b"]
+        ]
+      },
+      {
+        "name": "godot_char_string_length",
+        "return_type": "godot_int",
+        "arguments": [
+          ["const godot_char_string *", "p_cs"]
+        ]
+      },
+      {
+        "name": "godot_char_string_get_data",
+        "return_type": "const char *",
+        "arguments": [
+          ["const godot_char_string *", "p_cs"]
+        ]
+      },
+      {
+        "name": "godot_char_string_destroy",
+        "return_type": "void",
+        "arguments": [
+          ["godot_char_string *", "p_cs"]
+        ]
+      },
+      {
+        "name": "godot_char16_string_length",
+        "return_type": "godot_int",
+        "arguments": [
+          ["const godot_char16_string *", "p_cs"]
+        ]
+      },
+      {
+        "name": "godot_char16_string_get_data",
+        "return_type": "const char16_t *",
+        "arguments": [
+          ["const godot_char16_string *", "p_cs"]
+        ]
+      },
+      {
+        "name": "godot_char16_string_destroy",
+        "return_type": "void",
+        "arguments": [
+          ["godot_char16_string *", "p_cs"]
+        ]
+      },
+      {
+        "name": "godot_string_new",
+        "return_type": "void",
+        "arguments": [
+          ["godot_string *", "r_dest"]
+        ]
+      },
+      {
+        "name": "godot_string_new_copy",
+        "return_type": "void",
+        "arguments": [
+          ["godot_string *", "r_dest"],
+          ["const godot_string *", "p_src"]
+        ]
+      },
+      {
+        "name": "godot_string_new_with_latin1_chars",
+        "return_type": "void",
+        "arguments": [
+          ["godot_string *", "r_dest"],
+          ["const char *", "p_contents"]
+        ]
+      },
+      {
+        "name": "godot_string_new_with_utf8_chars",
+        "return_type": "void",
+        "arguments": [
+          ["godot_string *", "r_dest"],
+          ["const char *", "p_contents"]
+        ]
+      },
+      {
+        "name": "godot_string_new_with_utf16_chars",
+        "return_type": "void",
+        "arguments": [
+          ["godot_string *", "r_dest"],
+          ["const char16_t *", "p_contents"]
+        ]
+      },
+      {
+        "name": "godot_string_new_with_utf32_chars",
+        "return_type": "void",
+        "arguments": [
+          ["godot_string *", "r_dest"],
+          ["const char32_t *", "p_contents"]
+        ]
+      },
+      {
+        "name": "godot_string_new_with_wide_chars",
+        "return_type": "void",
+        "arguments": [
+          ["godot_string *", "r_dest"],
+          ["const wchar_t *", "p_contents"]
+        ]
+      },
+      {
+        "name": "godot_string_new_with_latin1_chars_and_len",
+        "return_type": "void",
+        "arguments": [
+          ["godot_string *", "r_dest"],
+          ["const char *", "p_contents"],
+          ["const int", "p_size"]
+        ]
+      },
+      {
+        "name": "godot_string_new_with_utf8_chars_and_len",
+        "return_type": "void",
+        "arguments": [
+          ["godot_string *", "r_dest"],
+          ["const char *", "p_contents"],
+          ["const int", "p_size"]
+        ]
+      },
+      {
+        "name": "godot_string_new_with_utf16_chars_and_len",
+        "return_type": "void",
+        "arguments": [
+          ["godot_string *", "r_dest"],
+          ["const char16_t *", "p_contents"],
+          ["const int", "p_size"]
+        ]
+      },
+      {
+        "name": "godot_string_new_with_utf32_chars_and_len",
+        "return_type": "void",
+        "arguments": [
+          ["godot_string *", "r_dest"],
+          ["const char32_t *", "p_contents"],
+          ["const int", "p_size"]
+        ]
+      },
+      {
+        "name": "godot_string_new_with_wide_chars_and_len",
+        "return_type": "void",
+        "arguments": [
+          ["godot_string *", "r_dest"],
+          ["const wchar_t *", "p_contents"],
+          ["const int", "p_size"]
+        ]
+      },
+      {
+        "name": "godot_string_operator_index",
+        "return_type": "const godot_char_type *",
+        "arguments": [
+          ["godot_string *", "p_self"],
+          ["const godot_int", "p_idx"]
+        ]
+      },
+      {
+        "name": "godot_string_operator_index_const",
+        "return_type": "godot_char_type",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_int", "p_idx"]
+        ]
+      },
+      {
+        "name": "godot_string_get_data",
+        "return_type": "const godot_char_type *",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_operator_equal",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_b"]
+        ]
+      },
+      {
+        "name": "godot_string_operator_less",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_b"]
+        ]
+      },
+      {
+        "name": "godot_string_operator_plus",
         "return_type": "godot_string",
         "arguments": [
-          ["const godot_aabb *", "p_self"]
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_b"]
         ]
       },
       {
-        "name": "godot_aabb_get_area",
-        "return_type": "godot_real",
+        "name": "godot_string_count",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_aabb *", "p_self"]
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_what"],
+          ["godot_int", "p_from"],
+          ["godot_int", "p_to"]
         ]
       },
       {
-        "name": "godot_aabb_has_no_area",
+        "name": "godot_string_countn",
+        "return_type": "godot_int",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_what"],
+          ["godot_int", "p_from"],
+          ["godot_int", "p_to"]
+        ]
+      },
+      {
+        "name": "godot_string_dedent",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_length",
+        "return_type": "godot_int",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_casecmp_to",
+        "return_type": "signed char",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_str"]
+        ]
+      },
+      {
+        "name": "godot_string_nocasecmp_to",
+        "return_type": "signed char",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_str"]
+        ]
+      },
+      {
+        "name": "godot_string_naturalnocasecmp_to",
+        "return_type": "signed char",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_str"]
+        ]
+      },
+      {
+        "name": "godot_string_begins_with",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_aabb *", "p_self"]
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_string"]
         ]
       },
       {
-        "name": "godot_aabb_has_no_surface",
+        "name": "godot_string_begins_with_char_array",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_aabb *", "p_self"]
+          ["const godot_string *", "p_self"],
+          ["const char *", "p_char_array"]
         ]
       },
       {
-        "name": "godot_aabb_intersects",
+        "name": "godot_string_bigrams",
+        "return_type": "godot_packed_string_array",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_chr",
+        "return_type": "godot_string",
+        "arguments": [
+          ["godot_char_type", "p_character"]
+        ]
+      },
+      {
+        "name": "godot_string_ends_with",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_aabb *", "p_self"],
-          ["const godot_aabb *", "p_with"]
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_string"]
         ]
       },
       {
-        "name": "godot_aabb_encloses",
+        "name": "godot_string_ends_with_char_array",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_aabb *", "p_self"],
-          ["const godot_aabb *", "p_with"]
+          ["const godot_string *", "p_self"],
+          ["const char *", "p_char_array"]
         ]
       },
       {
-        "name": "godot_aabb_merge",
-        "return_type": "godot_aabb",
+        "name": "godot_string_find",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_aabb *", "p_self"],
-          ["const godot_aabb *", "p_with"]
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_what"]
         ]
       },
       {
-        "name": "godot_aabb_intersection",
-        "return_type": "godot_aabb",
+        "name": "godot_string_find_from",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_aabb *", "p_self"],
-          ["const godot_aabb *", "p_with"]
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_what"],
+          ["godot_int", "p_from"]
         ]
       },
       {
-        "name": "godot_aabb_intersects_plane",
+        "name": "godot_string_findmk",
+        "return_type": "godot_int",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_packed_string_array *", "p_keys"]
+        ]
+      },
+      {
+        "name": "godot_string_findmk_from",
+        "return_type": "godot_int",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_packed_string_array *", "p_keys"],
+          ["godot_int", "p_from"]
+        ]
+      },
+      {
+        "name": "godot_string_findmk_from_in_place",
+        "return_type": "godot_int",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_packed_string_array *", "p_keys"],
+          ["godot_int", "p_from"],
+          ["godot_int *", "r_key"]
+        ]
+      },
+      {
+        "name": "godot_string_findn",
+        "return_type": "godot_int",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_what"]
+        ]
+      },
+      {
+        "name": "godot_string_findn_from",
+        "return_type": "godot_int",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_what"],
+          ["godot_int", "p_from"]
+        ]
+      },
+      {
+        "name": "godot_string_format",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_variant *", "p_values"]
+        ]
+      },
+      {
+        "name": "godot_string_format_with_custom_placeholder",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_variant *", "p_values"],
+          ["const char *", "p_placeholder"]
+        ]
+      },
+      {
+        "name": "godot_string_hex_encode_buffer",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const uint8_t *", "p_buffer"],
+          ["godot_int", "p_len"]
+        ]
+      },
+      {
+        "name": "godot_string_insert",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["godot_int", "p_at_pos"],
+          ["const godot_string *", "p_string"]
+        ]
+      },
+      {
+        "name": "godot_string_is_numeric",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_aabb *", "p_self"],
-          ["const godot_plane *", "p_plane"]
+          ["const godot_string *", "p_self"]
         ]
       },
       {
-        "name": "godot_aabb_intersects_segment",
+        "name": "godot_string_is_subsequence_of",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_aabb *", "p_self"],
-          ["const godot_vector3 *", "p_from"],
-          ["const godot_vector3 *", "p_to"]
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_string"]
         ]
       },
       {
-        "name": "godot_aabb_has_point",
+        "name": "godot_string_is_subsequence_ofi",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_aabb *", "p_self"],
-          ["const godot_vector3 *", "p_point"]
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_string"]
         ]
       },
       {
-        "name": "godot_aabb_get_support",
-        "return_type": "godot_vector3",
+        "name": "godot_string_lpad",
+        "return_type": "godot_string",
         "arguments": [
-          ["const godot_aabb *", "p_self"],
-          ["const godot_vector3 *", "p_dir"]
+          ["const godot_string *", "p_self"],
+          ["godot_int", "p_min_length"]
         ]
       },
       {
-        "name": "godot_aabb_get_longest_axis",
-        "return_type": "godot_vector3",
+        "name": "godot_string_lpad_with_custom_character",
+        "return_type": "godot_string",
         "arguments": [
-          ["const godot_aabb *", "p_self"]
+          ["const godot_string *", "p_self"],
+          ["godot_int", "p_min_length"],
+          ["const godot_string *", "p_character"]
         ]
       },
       {
-        "name": "godot_aabb_get_longest_axis_index",
+        "name": "godot_string_match",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_wildcard"]
+        ]
+      },
+      {
+        "name": "godot_string_matchn",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_wildcard"]
+        ]
+      },
+      {
+        "name": "godot_string_md5",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const uint8_t *", "p_md5"]
+        ]
+      },
+      {
+        "name": "godot_string_num",
+        "return_type": "godot_string",
+        "arguments": [
+          ["double", "p_num"]
+        ]
+      },
+      {
+        "name": "godot_string_num_int64",
+        "return_type": "godot_string",
+        "arguments": [
+          ["int64_t", "p_num"],
+          ["godot_int", "p_base"]
+        ]
+      },
+      {
+        "name": "godot_string_num_int64_capitalized",
+        "return_type": "godot_string",
+        "arguments": [
+          ["int64_t", "p_num"],
+          ["godot_int", "p_base"],
+          ["godot_bool", "p_capitalize_hex"]
+        ]
+      },
+      {
+        "name": "godot_string_num_real",
+        "return_type": "godot_string",
+        "arguments": [
+          ["double", "p_num"]
+        ]
+      },
+      {
+        "name": "godot_string_num_scientific",
+        "return_type": "godot_string",
+        "arguments": [
+          ["double", "p_num"]
+        ]
+      },
+      {
+        "name": "godot_string_num_with_decimals",
+        "return_type": "godot_string",
+        "arguments": [
+          ["double", "p_num"],
+          ["godot_int", "p_decimals"]
+        ]
+      },
+      {
+        "name": "godot_string_pad_decimals",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["godot_int", "p_digits"]
+        ]
+      },
+      {
+        "name": "godot_string_pad_zeros",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["godot_int", "p_digits"]
+        ]
+      },
+      {
+        "name": "godot_string_replace_first",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_key"],
+          ["const godot_string *", "p_with"]
+        ]
+      },
+      {
+        "name": "godot_string_replace",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_key"],
+          ["const godot_string *", "p_with"]
+        ]
+      },
+      {
+        "name": "godot_string_replacen",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_key"],
+          ["const godot_string *", "p_with"]
+        ]
+      },
+      {
+        "name": "godot_string_rfind",
         "return_type": "godot_int",
         "arguments": [
-          ["const godot_aabb *", "p_self"]
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_what"]
         ]
       },
       {
-        "name": "godot_aabb_get_longest_axis_size",
-        "return_type": "godot_real",
+        "name": "godot_string_rfindn",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_aabb *", "p_self"]
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_what"]
         ]
       },
       {
-        "name": "godot_aabb_get_shortest_axis",
-        "return_type": "godot_vector3",
+        "name": "godot_string_rfind_from",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_aabb *", "p_self"]
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_what"],
+          ["godot_int", "p_from"]
         ]
       },
       {
-        "name": "godot_aabb_get_shortest_axis_index",
+        "name": "godot_string_rfindn_from",
         "return_type": "godot_int",
         "arguments": [
-          ["const godot_aabb *", "p_self"]
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_what"],
+          ["godot_int", "p_from"]
         ]
       },
       {
-        "name": "godot_aabb_get_shortest_axis_size",
+        "name": "godot_string_rpad",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["godot_int", "p_min_length"]
+        ]
+      },
+      {
+        "name": "godot_string_rpad_with_custom_character",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["godot_int", "p_min_length"],
+          ["const godot_string *", "p_character"]
+        ]
+      },
+      {
+        "name": "godot_string_similarity",
         "return_type": "godot_real",
         "arguments": [
-          ["const godot_aabb *", "p_self"]
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_string"]
         ]
       },
       {
-        "name": "godot_aabb_expand",
-        "return_type": "godot_aabb",
+        "name": "godot_string_sprintf",
+        "return_type": "godot_string",
         "arguments": [
-          ["const godot_aabb *", "p_self"],
-          ["const godot_vector3 *", "p_to_point"]
+          ["const godot_string *", "p_self"],
+          ["const godot_array *", "p_values"],
+          ["godot_bool *", "p_error"]
         ]
       },
       {
-        "name": "godot_aabb_grow",
-        "return_type": "godot_aabb",
+        "name": "godot_string_substr",
+        "return_type": "godot_string",
         "arguments": [
-          ["const godot_aabb *", "p_self"],
-          ["const godot_real", "p_by"]
+          ["const godot_string *", "p_self"],
+          ["godot_int", "p_from"],
+          ["godot_int", "p_chars"]
         ]
       },
       {
-        "name": "godot_aabb_get_endpoint",
-        "return_type": "godot_vector3",
+        "name": "godot_string_to_int",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_aabb *", "p_self"],
-          ["const godot_int", "p_idx"]
+          ["const godot_string *", "p_self"]
         ]
       },
       {
-        "name": "godot_aabb_operator_equal",
+        "name": "godot_string_to_float",
+        "return_type": "double",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_camelcase_to_underscore",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_camelcase_to_underscore_lowercased",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_capitalize",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_char_to_float",
+        "return_type": "double",
+        "arguments": [
+          ["const char *", "p_what"]
+        ]
+      },
+      {
+        "name": "godot_string_wchar_to_float",
+        "return_type": "double",
+        "arguments": [
+          ["const wchar_t *", "p_str"],
+          ["const wchar_t **", "r_end"]
+        ]
+      },
+      {
+        "name": "godot_string_char_to_int",
+        "return_type": "godot_int",
+        "arguments": [
+          ["const char *", "p_what"]
+        ]
+      },
+      {
+        "name": "godot_string_wchar_to_int",
+        "return_type": "godot_int",
+        "arguments": [
+          ["const wchar_t *", "p_str"]
+        ]
+      },
+      {
+        "name": "godot_string_char_to_int_with_len",
+        "return_type": "godot_int",
+        "arguments": [
+          ["const char *", "p_what"],
+          ["godot_int", "p_len"]
+        ]
+      },
+      {
+        "name": "godot_string_wchar_to_int_with_len",
+        "return_type": "godot_int",
+        "arguments": [
+          ["const wchar_t *", "p_str"],
+          ["int", "p_len"]
+        ]
+      },
+      {
+        "name": "godot_string_hex_to_int",
+        "return_type": "godot_int",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_hex_to_int_with_prefix",
+        "return_type": "godot_int",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_get_slice_count",
+        "return_type": "godot_int",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_splitter"]
+        ]
+      },
+      {
+        "name": "godot_string_get_slice",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_splitter"],
+          ["godot_int", "p_slice"]
+        ]
+      },
+      {
+        "name": "godot_string_get_slicec",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["godot_char_type", "p_splitter"],
+          ["godot_int", "p_slice"]
+        ]
+      },
+      {
+        "name": "godot_string_split",
+        "return_type": "godot_packed_string_array",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_splitter"]
+        ]
+      },
+      {
+        "name": "godot_string_split_allow_empty",
+        "return_type": "godot_packed_string_array",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_splitter"]
+        ]
+      },
+      {
+        "name": "godot_string_split_with_maxsplit",
+        "return_type": "godot_packed_string_array",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_splitter"],
+          ["const godot_bool", "p_allow_empty"],
+          ["const godot_int", "p_maxsplit"]
+        ]
+      },
+      {
+        "name": "godot_string_rsplit",
+        "return_type": "godot_packed_string_array",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_splitter"]
+        ]
+      },
+      {
+        "name": "godot_string_rsplit_allow_empty",
+        "return_type": "godot_packed_string_array",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_splitter"]
+        ]
+      },
+      {
+        "name": "godot_string_rsplit_with_maxsplit",
+        "return_type": "godot_packed_string_array",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_splitter"],
+          ["const godot_bool", "p_allow_empty"],
+          ["const godot_int", "p_maxsplit"]
+        ]
+      },
+      {
+        "name": "godot_string_split_floats",
+        "return_type": "godot_packed_float32_array",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_splitter"]
+        ]
+      },
+      {
+        "name": "godot_string_split_floats_allow_empty",
+        "return_type": "godot_packed_float32_array",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_splitter"]
+        ]
+      },
+      {
+        "name": "godot_string_split_floats_mk",
+        "return_type": "godot_packed_float32_array",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_packed_string_array *", "p_splitters"]
+        ]
+      },
+      {
+        "name": "godot_string_split_floats_mk_allow_empty",
+        "return_type": "godot_packed_float32_array",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_packed_string_array *", "p_splitters"]
+        ]
+      },
+      {
+        "name": "godot_string_split_ints",
+        "return_type": "godot_packed_int32_array",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_splitter"]
+        ]
+      },
+      {
+        "name": "godot_string_split_ints_allow_empty",
+        "return_type": "godot_packed_int32_array",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_splitter"]
+        ]
+      },
+      {
+        "name": "godot_string_split_ints_mk",
+        "return_type": "godot_packed_int32_array",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_packed_string_array *", "p_splitters"]
+        ]
+      },
+      {
+        "name": "godot_string_split_ints_mk_allow_empty",
+        "return_type": "godot_packed_int32_array",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_packed_string_array *", "p_splitters"]
+        ]
+      },
+      {
+        "name": "godot_string_split_spaces",
+        "return_type": "godot_packed_string_array",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_lstrip",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_chars"]
+        ]
+      },
+      {
+        "name": "godot_string_rstrip",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_chars"]
+        ]
+      },
+      {
+        "name": "godot_string_trim_prefix",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_prefix"]
+        ]
+      },
+      {
+        "name": "godot_string_trim_suffix",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_suffix"]
+        ]
+      },
+      {
+        "name": "godot_string_char_lowercase",
+        "return_type": "godot_char_type",
+        "arguments": [
+          ["godot_char_type", "p_char"]
+        ]
+      },
+      {
+        "name": "godot_string_char_uppercase",
+        "return_type": "godot_char_type",
+        "arguments": [
+          ["godot_char_type", "p_char"]
+        ]
+      },
+      {
+        "name": "godot_string_to_lower",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_to_upper",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_get_basename",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_get_extension",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_left",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["godot_int", "p_pos"]
+        ]
+      },
+      {
+        "name": "godot_string_ord_at",
+        "return_type": "godot_char_type",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["godot_int", "p_idx"]
+        ]
+      },
+      {
+        "name": "godot_string_plus_file",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_file"]
+        ]
+      },
+      {
+        "name": "godot_string_right",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["godot_int", "p_pos"]
+        ]
+      },
+      {
+        "name": "godot_string_repeat",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["godot_int", "p_count"]
+        ]
+      },
+      {
+        "name": "godot_string_strip_edges",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["godot_bool", "p_left"],
+          ["godot_bool", "p_right"]
+        ]
+      },
+      {
+        "name": "godot_string_strip_escapes",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_erase",
+        "return_type": "void",
+        "arguments": [
+          ["godot_string *", "p_self"],
+          ["godot_int", "p_pos"],
+          ["godot_int", "p_chars"]
+        ]
+      },
+      {
+        "name": "godot_string_ascii",
+        "return_type": "godot_char_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_latin1",
+        "return_type": "godot_char_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_utf8",
+        "return_type": "godot_char_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_parse_utf8",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_aabb *", "p_self"],
-          ["const godot_aabb *", "p_b"]
+          ["godot_string *", "p_self"],
+          ["const char *", "p_utf8"]
         ]
       },
       {
-        "name": "godot_rid_new",
+        "name": "godot_string_parse_utf8_with_len",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["godot_string *", "p_self"],
+          ["const char *", "p_utf8"],
+          ["godot_int", "p_len"]
+        ]
+      },
+      {
+        "name": "godot_string_utf16",
+        "return_type": "godot_char16_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_parse_utf16",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["godot_string *", "p_self"],
+          ["const char16_t *", "p_utf16"]
+        ]
+      },
+      {
+        "name": "godot_string_parse_utf16_with_len",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["godot_string *", "p_self"],
+          ["const char16_t *", "p_utf16"],
+          ["godot_int", "p_len"]
+        ]
+      },
+      {
+        "name": "godot_string_hash",
+        "return_type": "uint32_t",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_hash64",
+        "return_type": "uint64_t",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_hash_chars",
+        "return_type": "uint32_t",
+        "arguments": [
+          ["const char *", "p_cstr"]
+        ]
+      },
+      {
+        "name": "godot_string_hash_chars_with_len",
+        "return_type": "uint32_t",
+        "arguments": [
+          ["const char *", "p_cstr"],
+          ["godot_int", "p_len"]
+        ]
+      },
+      {
+        "name": "godot_string_hash_wide_chars",
+        "return_type": "uint32_t",
+        "arguments": [
+          ["const wchar_t *", "p_str"]
+        ]
+      },
+      {
+        "name": "godot_string_hash_wide_chars_with_len",
+        "return_type": "uint32_t",
+        "arguments": [
+          ["const wchar_t *", "p_str"],
+          ["godot_int", "p_len"]
+        ]
+      },
+      {
+        "name": "godot_string_md5_buffer",
+        "return_type": "godot_packed_byte_array",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_md5_text",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_sha1_buffer",
+        "return_type": "godot_packed_byte_array",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_sha1_text",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_sha256_buffer",
+        "return_type": "godot_packed_byte_array",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_sha256_text",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_empty",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_get_base_dir",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_get_file",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_humanize_size",
+        "return_type": "godot_string",
+        "arguments": [
+          ["size_t", "p_size"]
+        ]
+      },
+      {
+        "name": "godot_string_is_abs_path",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_is_rel_path",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_is_resource_file",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_path_to",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_path"]
+        ]
+      },
+      {
+        "name": "godot_string_path_to_file",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_string *", "p_path"]
+        ]
+      },
+      {
+        "name": "godot_string_simplify_path",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_c_escape",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_c_escape_multiline",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_c_unescape",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_http_escape",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_http_unescape",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_json_escape",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_xml_escape",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_xml_escape_with_quotes",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_xml_unescape",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_percent_decode",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_percent_encode",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_join",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["const godot_packed_string_array *", "p_parts"]
+        ]
+      },
+      {
+        "name": "godot_string_is_valid_filename",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_is_valid_float",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_is_valid_hex_number",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_string *", "p_self"],
+          ["godot_bool", "p_with_prefix"]
+        ]
+      },
+      {
+        "name": "godot_string_is_valid_html_color",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_is_valid_identifier",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_is_valid_integer",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_is_valid_ip_address",
+        "return_type": "godot_bool",
+        "arguments": [
+          ["const godot_string *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_destroy",
         "return_type": "void",
         "arguments": [
-          ["godot_rid *", "r_dest"]
+          ["godot_string *", "p_self"]
         ]
       },
       {
-        "name": "godot_rid_get_id",
-        "return_type": "godot_int",
+        "name": "godot_string_name_new",
+        "return_type": "void",
         "arguments": [
-          ["const godot_rid *", "p_self"]
+          ["godot_string_name *", "r_dest"],
+          ["const godot_string *", "p_name"]
         ]
       },
       {
-        "name": "godot_rid_new_with_resource",
+        "name": "godot_string_name_new_data",
         "return_type": "void",
         "arguments": [
-          ["godot_rid *", "r_dest"],
-          ["const godot_object *", "p_from"]
+          ["godot_string_name *", "r_dest"],
+          ["const char *", "p_name"]
         ]
       },
       {
-        "name": "godot_rid_operator_equal",
+        "name": "godot_string_name_get_name",
+        "return_type": "godot_string",
+        "arguments": [
+          ["const godot_string_name *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_name_get_hash",
+        "return_type": "uint32_t",
+        "arguments": [
+          ["const godot_string_name *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_name_get_data_unique_pointer",
+        "return_type": "const void *",
+        "arguments": [
+          ["const godot_string_name *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_string_name_operator_equal",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_rid *", "p_self"],
-          ["const godot_rid *", "p_b"]
+          ["const godot_string_name *", "p_self"],
+          ["const godot_string_name *", "p_other"]
         ]
       },
       {
-        "name": "godot_rid_operator_less",
+        "name": "godot_string_name_operator_less",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_rid *", "p_self"],
-          ["const godot_rid *", "p_b"]
+          ["const godot_string_name *", "p_self"],
+          ["const godot_string_name *", "p_other"]
+        ]
+      },
+      {
+        "name": "godot_string_name_destroy",
+        "return_type": "void",
+        "arguments": [
+          ["godot_string_name *", "p_self"]
         ]
       },
       {
@@ -4043,6 +5143,14 @@
         ]
       },
       {
+        "name": "godot_transform_new_with_quat",
+        "return_type": "void",
+        "arguments": [
+          ["godot_transform *", "r_dest"],
+          ["const godot_quat *", "p_quat"]
+        ]
+      },
+      {
         "name": "godot_transform_new",
         "return_type": "void",
         "arguments": [
@@ -4449,6 +5557,14 @@
         ]
       },
       {
+        "name": "godot_variant_new_string_name",
+        "return_type": "void",
+        "arguments": [
+          ["godot_variant *", "r_dest"],
+          ["const godot_string_name *", "p_s"]
+        ]
+      },
+      {
         "name": "godot_variant_new_vector2",
         "return_type": "void",
         "arguments": [
@@ -4457,6 +5573,14 @@
         ]
       },
       {
+        "name": "godot_variant_new_vector2i",
+        "return_type": "void",
+        "arguments": [
+          ["godot_variant *", "r_dest"],
+          ["const godot_vector2i *", "p_v2"]
+        ]
+      },
+      {
         "name": "godot_variant_new_rect2",
         "return_type": "void",
         "arguments": [
@@ -4465,6 +5589,14 @@
         ]
       },
       {
+        "name": "godot_variant_new_rect2i",
+        "return_type": "void",
+        "arguments": [
+          ["godot_variant *", "r_dest"],
+          ["const godot_rect2i *", "p_rect2"]
+        ]
+      },
+      {
         "name": "godot_variant_new_vector3",
         "return_type": "void",
         "arguments": [
@@ -4473,6 +5605,14 @@
         ]
       },
       {
+        "name": "godot_variant_new_vector3i",
+        "return_type": "void",
+        "arguments": [
+          ["godot_variant *", "r_dest"],
+          ["const godot_vector3i *", "p_v3"]
+        ]
+      },
+      {
         "name": "godot_variant_new_transform2d",
         "return_type": "void",
         "arguments": [
@@ -4553,6 +5693,22 @@
         ]
       },
       {
+        "name": "godot_variant_new_callable",
+        "return_type": "void",
+        "arguments": [
+          ["godot_variant *", "r_dest"],
+          ["const godot_callable *", "p_cb"]
+        ]
+      },
+      {
+        "name": "godot_variant_new_signal",
+        "return_type": "void",
+        "arguments": [
+          ["godot_variant *", "r_dest"],
+          ["const godot_signal *", "p_signal"]
+        ]
+      },
+      {
         "name": "godot_variant_new_dictionary",
         "return_type": "void",
         "arguments": [
@@ -4569,59 +5725,75 @@
         ]
       },
       {
-        "name": "godot_variant_new_pool_byte_array",
+        "name": "godot_variant_new_packed_byte_array",
         "return_type": "void",
         "arguments": [
           ["godot_variant *", "r_dest"],
-          ["const godot_pool_byte_array *", "p_pba"]
+          ["const godot_packed_byte_array *", "p_pba"]
         ]
       },
       {
-        "name": "godot_variant_new_pool_int_array",
+        "name": "godot_variant_new_packed_int32_array",
         "return_type": "void",
         "arguments": [
           ["godot_variant *", "r_dest"],
-          ["const godot_pool_int_array *", "p_pia"]
+          ["const godot_packed_int32_array *", "p_pia"]
         ]
       },
       {
-        "name": "godot_variant_new_pool_real_array",
+        "name": "godot_variant_new_packed_int64_array",
         "return_type": "void",
         "arguments": [
           ["godot_variant *", "r_dest"],
-          ["const godot_pool_real_array *", "p_pra"]
+          ["const godot_packed_int64_array *", "p_pia"]
         ]
       },
       {
-        "name": "godot_variant_new_pool_string_array",
+        "name": "godot_variant_new_packed_float32_array",
         "return_type": "void",
         "arguments": [
           ["godot_variant *", "r_dest"],
-          ["const godot_pool_string_array *", "p_psa"]
+          ["const godot_packed_float32_array *", "p_pra"]
         ]
       },
       {
-        "name": "godot_variant_new_pool_vector2_array",
+        "name": "godot_variant_new_packed_float64_array",
         "return_type": "void",
         "arguments": [
           ["godot_variant *", "r_dest"],
-          ["const godot_pool_vector2_array *", "p_pv2a"]
+          ["const godot_packed_float64_array *", "p_pra"]
         ]
       },
       {
-        "name": "godot_variant_new_pool_vector3_array",
+        "name": "godot_variant_new_packed_string_array",
         "return_type": "void",
         "arguments": [
           ["godot_variant *", "r_dest"],
-          ["const godot_pool_vector3_array *", "p_pv3a"]
+          ["const godot_packed_string_array *", "p_psa"]
         ]
       },
       {
-        "name": "godot_variant_new_pool_color_array",
+        "name": "godot_variant_new_packed_vector2_array",
         "return_type": "void",
         "arguments": [
           ["godot_variant *", "r_dest"],
-          ["const godot_pool_color_array *", "p_pca"]
+          ["const godot_packed_vector2_array *", "p_pv2a"]
+        ]
+      },
+      {
+        "name": "godot_variant_new_packed_vector3_array",
+        "return_type": "void",
+        "arguments": [
+          ["godot_variant *", "r_dest"],
+          ["const godot_packed_vector3_array *", "p_pv3a"]
+        ]
+      },
+      {
+        "name": "godot_variant_new_packed_color_array",
+        "return_type": "void",
+        "arguments": [
+          ["godot_variant *", "r_dest"],
+          ["const godot_packed_color_array *", "p_pca"]
         ]
       },
       {
@@ -4660,6 +5832,13 @@
         ]
       },
       {
+        "name": "godot_variant_as_string_name",
+        "return_type": "godot_string_name",
+        "arguments": [
+          ["const godot_variant *", "p_self"]
+        ]
+      },
+      {
         "name": "godot_variant_as_vector2",
         "return_type": "godot_vector2",
         "arguments": [
@@ -4667,6 +5846,13 @@
         ]
       },
       {
+        "name": "godot_variant_as_vector2i",
+        "return_type": "godot_vector2i",
+        "arguments": [
+          ["const godot_variant *", "p_self"]
+        ]
+      },
+      {
         "name": "godot_variant_as_rect2",
         "return_type": "godot_rect2",
         "arguments": [
@@ -4674,6 +5860,13 @@
         ]
       },
       {
+        "name": "godot_variant_as_rect2i",
+        "return_type": "godot_rect2i",
+        "arguments": [
+          ["const godot_variant *", "p_self"]
+        ]
+      },
+      {
         "name": "godot_variant_as_vector3",
         "return_type": "godot_vector3",
         "arguments": [
@@ -4681,6 +5874,13 @@
         ]
       },
       {
+        "name": "godot_variant_as_vector3i",
+        "return_type": "godot_vector3i",
+        "arguments": [
+          ["const godot_variant *", "p_self"]
+        ]
+      },
+      {
         "name": "godot_variant_as_transform2d",
         "return_type": "godot_transform2d",
         "arguments": [
@@ -4751,6 +5951,20 @@
         ]
       },
       {
+        "name": "godot_variant_as_callable",
+        "return_type": "godot_callable",
+        "arguments": [
+          ["const godot_variant *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_variant_as_signal",
+        "return_type": "godot_signal",
+        "arguments": [
+          ["const godot_variant *", "p_self"]
+        ]
+      },
+      {
         "name": "godot_variant_as_dictionary",
         "return_type": "godot_dictionary",
         "arguments": [
@@ -4765,50 +5979,64 @@
         ]
       },
       {
-        "name": "godot_variant_as_pool_byte_array",
-        "return_type": "godot_pool_byte_array",
+        "name": "godot_variant_as_packed_byte_array",
+        "return_type": "godot_packed_byte_array",
+        "arguments": [
+          ["const godot_variant *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_variant_as_packed_int32_array",
+        "return_type": "godot_packed_int32_array",
+        "arguments": [
+          ["const godot_variant *", "p_self"]
+        ]
+      },
+      {
+        "name": "godot_variant_as_packed_int64_array",
+        "return_type": "godot_packed_int64_array",
         "arguments": [
           ["const godot_variant *", "p_self"]
         ]
       },
       {
-        "name": "godot_variant_as_pool_int_array",
-        "return_type": "godot_pool_int_array",
+        "name": "godot_variant_as_packed_float32_array",
+        "return_type": "godot_packed_float32_array",
         "arguments": [
           ["const godot_variant *", "p_self"]
         ]
       },
       {
-        "name": "godot_variant_as_pool_real_array",
-        "return_type": "godot_pool_real_array",
+        "name": "godot_variant_as_packed_float64_array",
+        "return_type": "godot_packed_float64_array",
         "arguments": [
           ["const godot_variant *", "p_self"]
         ]
       },
       {
-        "name": "godot_variant_as_pool_string_array",
-        "return_type": "godot_pool_string_array",
+        "name": "godot_variant_as_packed_string_array",
+        "return_type": "godot_packed_string_array",
         "arguments": [
           ["const godot_variant *", "p_self"]
         ]
       },
       {
-        "name": "godot_variant_as_pool_vector2_array",
-        "return_type": "godot_pool_vector2_array",
+        "name": "godot_variant_as_packed_vector2_array",
+        "return_type": "godot_packed_vector2_array",
         "arguments": [
           ["const godot_variant *", "p_self"]
         ]
       },
       {
-        "name": "godot_variant_as_pool_vector3_array",
-        "return_type": "godot_pool_vector3_array",
+        "name": "godot_variant_as_packed_vector3_array",
+        "return_type": "godot_packed_vector3_array",
         "arguments": [
           ["const godot_variant *", "p_self"]
         ]
       },
       {
-        "name": "godot_variant_as_pool_color_array",
-        "return_type": "godot_pool_color_array",
+        "name": "godot_variant_as_packed_color_array",
+        "return_type": "godot_packed_color_array",
         "arguments": [
           ["const godot_variant *", "p_self"]
         ]
@@ -4833,15 +6061,14 @@
         ]
       },
       {
-        "name": "godot_variant_operator_equal",
-        "return_type": "godot_bool",
+        "name": "godot_variant_hash",
+        "return_type": "uint32_t",
         "arguments": [
-          ["const godot_variant *", "p_self"],
-          ["const godot_variant *", "p_other"]
+          ["const godot_variant *", "p_self"]
         ]
       },
       {
-        "name": "godot_variant_operator_less",
+        "name": "godot_variant_operator_equal",
         "return_type": "godot_bool",
         "arguments": [
           ["const godot_variant *", "p_self"],
@@ -4849,7 +6076,7 @@
         ]
       },
       {
-        "name": "godot_variant_hash_compare",
+        "name": "godot_variant_operator_less",
         "return_type": "godot_bool",
         "arguments": [
           ["const godot_variant *", "p_self"],
@@ -4857,1236 +6084,1005 @@
         ]
       },
       {
-        "name": "godot_variant_booleanize",
-        "return_type": "godot_bool",
-        "arguments": [
-          ["const godot_variant *", "p_self"]
-        ]
-      },
-      {
-        "name": "godot_variant_destroy",
-        "return_type": "void",
-        "arguments": [
-          ["godot_variant *", "p_self"]
-        ]
-      },
-      {
-        "name": "godot_char_string_length",
-        "return_type": "godot_int",
-        "arguments": [
-          ["const godot_char_string *", "p_cs"]
-        ]
-      },
-      {
-        "name": "godot_char_string_get_data",
-        "return_type": "const char *",
+        "name": "godot_variant_get_operator_name",
+        "return_type": "godot_string",
         "arguments": [
-          ["const godot_char_string *", "p_cs"]
+          ["godot_variant_operator", "p_op"]
         ]
       },
       {
-        "name": "godot_char_string_destroy",
+        "name": "godot_variant_evaluate",
         "return_type": "void",
         "arguments": [
-          ["godot_char_string *", "p_cs"]
+          ["godot_variant_operator", "p_op"],
+          ["const godot_variant *", "p_a"],
+          ["const godot_variant *", "p_b"],
+          ["godot_variant *", "r_ret"],
+          ["godot_bool *", "r_valid"]
         ]
       },
       {
-        "name": "godot_string_new",
-        "return_type": "void",
+        "name": "godot_variant_hash_compare",
+        "return_type": "godot_bool",
         "arguments": [
-          ["godot_string *", "r_dest"]
+          ["const godot_variant *", "p_self"],
+          ["const godot_variant *", "p_other"]
         ]
       },
       {
-        "name": "godot_string_new_copy",
-        "return_type": "void",
+        "name": "godot_variant_booleanize",
+        "return_type": "godot_bool",
         "arguments": [
-          ["godot_string *", "r_dest"],
-          ["const godot_string *", "p_src"]
+          ["const godot_variant *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_new_with_wide_string",
+        "name": "godot_variant_destroy",
         "return_type": "void",
         "arguments": [
-          ["godot_string *", "r_dest"],
-          ["const wchar_t *", "p_contents"],
-          ["const int", "p_size"]
+          ["godot_variant *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_operator_index",
-        "return_type": "const wchar_t *",
+        "name": "godot_vector2_as_vector2i",
+        "return_type": "godot_vector2i",
         "arguments": [
-          ["godot_string *", "p_self"],
-          ["const godot_int", "p_idx"]
+          ["const godot_vector2 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_operator_index_const",
-        "return_type": "wchar_t",
+        "name": "godot_vector2_sign",
+        "return_type": "godot_vector2",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_int", "p_idx"]
+          ["const godot_vector2 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_wide_str",
-        "return_type": "const wchar_t *",
+        "name": "godot_vector2_move_toward",
+        "return_type": "godot_vector2",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector2 *", "p_self"],
+          ["const godot_vector2 *", "p_to"],
+          ["const godot_real", "p_delta"]
         ]
       },
       {
-        "name": "godot_string_operator_equal",
-        "return_type": "godot_bool",
+        "name": "godot_vector2_direction_to",
+        "return_type": "godot_vector2",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_string *", "p_b"]
+          ["const godot_vector2 *", "p_self"],
+          ["const godot_vector2 *", "p_to"]
         ]
       },
       {
-        "name": "godot_string_operator_less",
-        "return_type": "godot_bool",
+        "name": "godot_vector2_new",
+        "return_type": "void",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_string *", "p_b"]
+          ["godot_vector2 *", "r_dest"],
+          ["const godot_real", "p_x"],
+          ["const godot_real", "p_y"]
         ]
       },
       {
-        "name": "godot_string_operator_plus",
+        "name": "godot_vector2_as_string",
         "return_type": "godot_string",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_string *", "p_b"]
+          ["const godot_vector2 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_length",
-        "return_type": "godot_int",
+        "name": "godot_vector2_normalized",
+        "return_type": "godot_vector2",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector2 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_casecmp_to",
-        "return_type": "signed char",
+        "name": "godot_vector2_length",
+        "return_type": "godot_real",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_string *", "p_str"]
+          ["const godot_vector2 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_nocasecmp_to",
-        "return_type": "signed char",
+        "name": "godot_vector2_angle",
+        "return_type": "godot_real",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_string *", "p_str"]
+          ["const godot_vector2 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_naturalnocasecmp_to",
-        "return_type": "signed char",
+        "name": "godot_vector2_length_squared",
+        "return_type": "godot_real",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_string *", "p_str"]
+          ["const godot_vector2 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_begins_with",
+        "name": "godot_vector2_is_normalized",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_string *", "p_string"]
+          ["const godot_vector2 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_begins_with_char_array",
-        "return_type": "godot_bool",
+        "name": "godot_vector2_distance_to",
+        "return_type": "godot_real",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const char *", "p_char_array"]
+          ["const godot_vector2 *", "p_self"],
+          ["const godot_vector2 *", "p_to"]
         ]
       },
       {
-        "name": "godot_string_bigrams",
-        "return_type": "godot_array",
+        "name": "godot_vector2_distance_squared_to",
+        "return_type": "godot_real",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector2 *", "p_self"],
+          ["const godot_vector2 *", "p_to"]
         ]
       },
       {
-        "name": "godot_string_chr",
-        "return_type": "godot_string",
+        "name": "godot_vector2_angle_to",
+        "return_type": "godot_real",
         "arguments": [
-          ["wchar_t", "p_character"]
+          ["const godot_vector2 *", "p_self"],
+          ["const godot_vector2 *", "p_to"]
         ]
       },
       {
-        "name": "godot_string_ends_with",
-        "return_type": "godot_bool",
+        "name": "godot_vector2_angle_to_point",
+        "return_type": "godot_real",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_string *", "p_string"]
+          ["const godot_vector2 *", "p_self"],
+          ["const godot_vector2 *", "p_to"]
         ]
       },
       {
-        "name": "godot_string_find",
-        "return_type": "godot_int",
+        "name": "godot_vector2_lerp",
+        "return_type": "godot_vector2",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_string", "p_what"]
+          ["const godot_vector2 *", "p_self"],
+          ["const godot_vector2 *", "p_b"],
+          ["const godot_real", "p_t"]
         ]
       },
       {
-        "name": "godot_string_find_from",
-        "return_type": "godot_int",
+        "name": "godot_vector2_cubic_interpolate",
+        "return_type": "godot_vector2",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_string", "p_what"],
-          ["godot_int", "p_from"]
+          ["const godot_vector2 *", "p_self"],
+          ["const godot_vector2 *", "p_b"],
+          ["const godot_vector2 *", "p_pre_a"],
+          ["const godot_vector2 *", "p_post_b"],
+          ["const godot_real", "p_t"]
         ]
       },
       {
-        "name": "godot_string_findmk",
-        "return_type": "godot_int",
+        "name": "godot_vector2_rotated",
+        "return_type": "godot_vector2",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_array *", "p_keys"]
+          ["const godot_vector2 *", "p_self"],
+          ["const godot_real", "p_phi"]
         ]
       },
       {
-        "name": "godot_string_findmk_from",
-        "return_type": "godot_int",
+        "name": "godot_vector2_tangent",
+        "return_type": "godot_vector2",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_array *", "p_keys"],
-          ["godot_int", "p_from"]
+          ["const godot_vector2 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_findmk_from_in_place",
-        "return_type": "godot_int",
+        "name": "godot_vector2_floor",
+        "return_type": "godot_vector2",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_array *", "p_keys"],
-          ["godot_int", "p_from"],
-          ["godot_int *", "r_key"]
+          ["const godot_vector2 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_findn",
-        "return_type": "godot_int",
+        "name": "godot_vector2_snapped",
+        "return_type": "godot_vector2",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_string", "p_what"]
+          ["const godot_vector2 *", "p_self"],
+          ["const godot_vector2 *", "p_by"]
         ]
       },
       {
-        "name": "godot_string_findn_from",
-        "return_type": "godot_int",
+        "name": "godot_vector2_aspect",
+        "return_type": "godot_real",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_string", "p_what"],
-          ["godot_int", "p_from"]
+          ["const godot_vector2 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_find_last",
-        "return_type": "godot_int",
+        "name": "godot_vector2_dot",
+        "return_type": "godot_real",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_string", "p_what"]
+          ["const godot_vector2 *", "p_self"],
+          ["const godot_vector2 *", "p_with"]
         ]
       },
       {
-        "name": "godot_string_format",
-        "return_type": "godot_string",
+        "name": "godot_vector2_slide",
+        "return_type": "godot_vector2",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_variant *", "p_values"]
+          ["const godot_vector2 *", "p_self"],
+          ["const godot_vector2 *", "p_n"]
         ]
       },
       {
-        "name": "godot_string_format_with_custom_placeholder",
-        "return_type": "godot_string",
+        "name": "godot_vector2_bounce",
+        "return_type": "godot_vector2",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_variant *", "p_values"],
-          ["const char *", "p_placeholder"]
+          ["const godot_vector2 *", "p_self"],
+          ["const godot_vector2 *", "p_n"]
         ]
       },
       {
-        "name": "godot_string_hex_encode_buffer",
-        "return_type": "godot_string",
+        "name": "godot_vector2_reflect",
+        "return_type": "godot_vector2",
         "arguments": [
-          ["const uint8_t *", "p_buffer"],
-          ["godot_int", "p_len"]
+          ["const godot_vector2 *", "p_self"],
+          ["const godot_vector2 *", "p_n"]
         ]
       },
       {
-        "name": "godot_string_hex_to_int",
-        "return_type": "godot_int",
+        "name": "godot_vector2_abs",
+        "return_type": "godot_vector2",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector2 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_hex_to_int_without_prefix",
-        "return_type": "godot_int",
+        "name": "godot_vector2_clamped",
+        "return_type": "godot_vector2",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector2 *", "p_self"],
+          ["const godot_real", "p_length"]
         ]
       },
       {
-        "name": "godot_string_insert",
-        "return_type": "godot_string",
+        "name": "godot_vector2_operator_add",
+        "return_type": "godot_vector2",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_int", "p_at_pos"],
-          ["godot_string", "p_string"]
+          ["const godot_vector2 *", "p_self"],
+          ["const godot_vector2 *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_is_numeric",
-        "return_type": "godot_bool",
+        "name": "godot_vector2_operator_subtract",
+        "return_type": "godot_vector2",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector2 *", "p_self"],
+          ["const godot_vector2 *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_is_subsequence_of",
-        "return_type": "godot_bool",
+        "name": "godot_vector2_operator_multiply_vector",
+        "return_type": "godot_vector2",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_string *", "p_string"]
+          ["const godot_vector2 *", "p_self"],
+          ["const godot_vector2 *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_is_subsequence_ofi",
-        "return_type": "godot_bool",
+        "name": "godot_vector2_operator_multiply_scalar",
+        "return_type": "godot_vector2",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_string *", "p_string"]
+          ["const godot_vector2 *", "p_self"],
+          ["const godot_real", "p_b"]
         ]
       },
       {
-        "name": "godot_string_lpad",
-        "return_type": "godot_string",
+        "name": "godot_vector2_operator_divide_vector",
+        "return_type": "godot_vector2",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_int", "p_min_length"]
+          ["const godot_vector2 *", "p_self"],
+          ["const godot_vector2 *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_lpad_with_custom_character",
-        "return_type": "godot_string",
+        "name": "godot_vector2_operator_divide_scalar",
+        "return_type": "godot_vector2",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_int", "p_min_length"],
-          ["const godot_string *", "p_character"]
+          ["const godot_vector2 *", "p_self"],
+          ["const godot_real", "p_b"]
         ]
       },
       {
-        "name": "godot_string_match",
+        "name": "godot_vector2_operator_equal",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_string *", "p_wildcard"]
+          ["const godot_vector2 *", "p_self"],
+          ["const godot_vector2 *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_matchn",
+        "name": "godot_vector2_operator_less",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_string *", "p_wildcard"]
-        ]
-      },
-      {
-        "name": "godot_string_md5",
-        "return_type": "godot_string",
-        "arguments": [
-          ["const uint8_t *", "p_md5"]
-        ]
-      },
-      {
-        "name": "godot_string_num",
-        "return_type": "godot_string",
-        "arguments": [
-          ["double", "p_num"]
-        ]
-      },
-      {
-        "name": "godot_string_num_int64",
-        "return_type": "godot_string",
-        "arguments": [
-          ["int64_t", "p_num"],
-          ["godot_int", "p_base"]
-        ]
-      },
-      {
-        "name": "godot_string_num_int64_capitalized",
-        "return_type": "godot_string",
-        "arguments": [
-          ["int64_t", "p_num"],
-          ["godot_int", "p_base"],
-          ["godot_bool", "p_capitalize_hex"]
-        ]
-      },
-      {
-        "name": "godot_string_num_real",
-        "return_type": "godot_string",
-        "arguments": [
-          ["double", "p_num"]
-        ]
-      },
-      {
-        "name": "godot_string_num_scientific",
-        "return_type": "godot_string",
-        "arguments": [
-          ["double", "p_num"]
-        ]
-      },
-      {
-        "name": "godot_string_num_with_decimals",
-        "return_type": "godot_string",
-        "arguments": [
-          ["double", "p_num"],
-          ["godot_int", "p_decimals"]
-        ]
-      },
-      {
-        "name": "godot_string_pad_decimals",
-        "return_type": "godot_string",
-        "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_int", "p_digits"]
-        ]
-      },
-      {
-        "name": "godot_string_pad_zeros",
-        "return_type": "godot_string",
-        "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_int", "p_digits"]
-        ]
-      },
-      {
-        "name": "godot_string_replace_first",
-        "return_type": "godot_string",
-        "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_string", "p_key"],
-          ["godot_string", "p_with"]
-        ]
-      },
-      {
-        "name": "godot_string_replace",
-        "return_type": "godot_string",
-        "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_string", "p_key"],
-          ["godot_string", "p_with"]
-        ]
-      },
-      {
-        "name": "godot_string_replacen",
-        "return_type": "godot_string",
-        "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_string", "p_key"],
-          ["godot_string", "p_with"]
-        ]
-      },
-      {
-        "name": "godot_string_rfind",
-        "return_type": "godot_int",
-        "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_string", "p_what"]
-        ]
-      },
-      {
-        "name": "godot_string_rfindn",
-        "return_type": "godot_int",
-        "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_string", "p_what"]
+          ["const godot_vector2 *", "p_self"],
+          ["const godot_vector2 *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_rfind_from",
-        "return_type": "godot_int",
+        "name": "godot_vector2_operator_neg",
+        "return_type": "godot_vector2",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_string", "p_what"],
-          ["godot_int", "p_from"]
+          ["const godot_vector2 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_rfindn_from",
-        "return_type": "godot_int",
+        "name": "godot_vector2_set_x",
+        "return_type": "void",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_string", "p_what"],
-          ["godot_int", "p_from"]
+          ["godot_vector2 *", "p_self"],
+          ["const godot_real", "p_x"]
         ]
       },
       {
-        "name": "godot_string_rpad",
-        "return_type": "godot_string",
+        "name": "godot_vector2_set_y",
+        "return_type": "void",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_int", "p_min_length"]
+          ["godot_vector2 *", "p_self"],
+          ["const godot_real", "p_y"]
         ]
       },
       {
-        "name": "godot_string_rpad_with_custom_character",
-        "return_type": "godot_string",
+        "name": "godot_vector2_get_x",
+        "return_type": "godot_real",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_int", "p_min_length"],
-          ["const godot_string *", "p_character"]
+          ["const godot_vector2 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_similarity",
+        "name": "godot_vector2_get_y",
         "return_type": "godot_real",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_string *", "p_string"]
+          ["const godot_vector2 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_sprintf",
-        "return_type": "godot_string",
+        "name": "godot_vector2i_new",
+        "return_type": "void",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_array *", "p_values"],
-          ["godot_bool *", "p_error"]
+          ["godot_vector2i *", "r_dest"],
+          ["const godot_int", "p_x"],
+          ["const godot_int", "p_y"]
         ]
       },
       {
-        "name": "godot_string_substr",
+        "name": "godot_vector2i_as_string",
         "return_type": "godot_string",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_int", "p_from"],
-          ["godot_int", "p_chars"]
+          ["const godot_vector2i *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_to_double",
-        "return_type": "double",
+        "name": "godot_vector2i_as_vector2",
+        "return_type": "godot_vector2",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector2i *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_to_float",
+        "name": "godot_vector2i_aspect",
         "return_type": "godot_real",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector2i *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_to_int",
-        "return_type": "godot_int",
+        "name": "godot_vector2i_abs",
+        "return_type": "godot_vector2i",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector2i *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_camelcase_to_underscore",
-        "return_type": "godot_string",
+        "name": "godot_vector2i_sign",
+        "return_type": "godot_vector2i",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector2i *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_camelcase_to_underscore_lowercased",
-        "return_type": "godot_string",
+        "name": "godot_vector2i_operator_add",
+        "return_type": "godot_vector2i",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector2i *", "p_self"],
+          ["const godot_vector2i *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_capitalize",
-        "return_type": "godot_string",
+        "name": "godot_vector2i_operator_subtract",
+        "return_type": "godot_vector2i",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector2i *", "p_self"],
+          ["const godot_vector2i *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_char_to_double",
-        "return_type": "double",
+        "name": "godot_vector2i_operator_multiply_vector",
+        "return_type": "godot_vector2i",
         "arguments": [
-          ["const char *", "p_what"]
+          ["const godot_vector2i *", "p_self"],
+          ["const godot_vector2i *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_char_to_int",
-        "return_type": "godot_int",
+        "name": "godot_vector2i_operator_multiply_scalar",
+        "return_type": "godot_vector2i",
         "arguments": [
-          ["const char *", "p_what"]
+          ["const godot_vector2i *", "p_self"],
+          ["const godot_int", "p_b"]
         ]
       },
       {
-        "name": "godot_string_wchar_to_int",
-        "return_type": "int64_t",
+        "name": "godot_vector2i_operator_divide_vector",
+        "return_type": "godot_vector2i",
         "arguments": [
-          ["const wchar_t *", "p_str"]
+          ["const godot_vector2i *", "p_self"],
+          ["const godot_vector2i *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_char_to_int_with_len",
-        "return_type": "godot_int",
+        "name": "godot_vector2i_operator_divide_scalar",
+        "return_type": "godot_vector2i",
         "arguments": [
-          ["const char *", "p_what"],
-          ["godot_int", "p_len"]
+          ["const godot_vector2i *", "p_self"],
+          ["const godot_int", "p_b"]
         ]
       },
       {
-        "name": "godot_string_char_to_int64_with_len",
-        "return_type": "int64_t",
+        "name": "godot_vector2i_operator_equal",
+        "return_type": "godot_bool",
         "arguments": [
-          ["const wchar_t *", "p_str"],
-          ["int", "p_len"]
+          ["const godot_vector2i *", "p_self"],
+          ["const godot_vector2i *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_hex_to_int64",
-        "return_type": "int64_t",
+        "name": "godot_vector2i_operator_less",
+        "return_type": "godot_bool",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector2i *", "p_self"],
+          ["const godot_vector2i *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_hex_to_int64_with_prefix",
-        "return_type": "int64_t",
+        "name": "godot_vector2i_operator_neg",
+        "return_type": "godot_vector2i",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector2i *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_to_int64",
-        "return_type": "int64_t",
+        "name": "godot_vector2i_set_x",
+        "return_type": "void",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["godot_vector2i *", "p_self"],
+          ["const godot_int", "p_x"]
         ]
       },
       {
-        "name": "godot_string_unicode_char_to_double",
-        "return_type": "double",
+        "name": "godot_vector2i_set_y",
+        "return_type": "void",
         "arguments": [
-          ["const wchar_t *", "p_str"],
-          ["const wchar_t **", "r_end"]
+          ["godot_vector2i *", "p_self"],
+          ["const godot_int", "p_y"]
         ]
       },
       {
-        "name": "godot_string_get_slice_count",
+        "name": "godot_vector2i_get_x",
         "return_type": "godot_int",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_string", "p_splitter"]
-        ]
-      },
-      {
-        "name": "godot_string_get_slice",
-        "return_type": "godot_string",
-        "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_string", "p_splitter"],
-          ["godot_int", "p_slice"]
-        ]
-      },
-      {
-        "name": "godot_string_get_slicec",
-        "return_type": "godot_string",
-        "arguments": [
-          ["const godot_string *", "p_self"],
-          ["wchar_t", "p_splitter"],
-          ["godot_int", "p_slice"]
-        ]
-      },
-      {
-        "name": "godot_string_split",
-        "return_type": "godot_array",
-        "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_string *", "p_splitter"]
-        ]
-      },
-      {
-        "name": "godot_string_split_allow_empty",
-        "return_type": "godot_array",
-        "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_string *", "p_splitter"]
+          ["const godot_vector2i *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_split_floats",
-        "return_type": "godot_array",
-        "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_string *", "p_splitter"]
-        ]
-      },
-      {
-        "name": "godot_string_split_floats_allows_empty",
-        "return_type": "godot_array",
-        "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_string *", "p_splitter"]
-        ]
-      },
-      {
-        "name": "godot_string_split_floats_mk",
-        "return_type": "godot_array",
-        "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_array *", "p_splitters"]
-        ]
-      },
-      {
-        "name": "godot_string_split_floats_mk_allows_empty",
-        "return_type": "godot_array",
-        "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_array *", "p_splitters"]
-        ]
-      },
-      {
-        "name": "godot_string_split_ints",
-        "return_type": "godot_array",
-        "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_string *", "p_splitter"]
-        ]
-      },
-      {
-        "name": "godot_string_split_ints_allows_empty",
-        "return_type": "godot_array",
-        "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_string *", "p_splitter"]
-        ]
-      },
-      {
-        "name": "godot_string_split_ints_mk",
-        "return_type": "godot_array",
-        "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_array *", "p_splitters"]
-        ]
-      },
-      {
-        "name": "godot_string_split_ints_mk_allows_empty",
-        "return_type": "godot_array",
+        "name": "godot_vector2i_get_y",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_array *", "p_splitters"]
+          ["const godot_vector2i *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_split_spaces",
-        "return_type": "godot_array",
+        "name": "godot_vector3_as_vector3i",
+        "return_type": "godot_vector3i",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_char_lowercase",
-        "return_type": "wchar_t",
+        "name": "godot_vector3_sign",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["wchar_t", "p_char"]
+          ["const godot_vector3 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_char_uppercase",
-        "return_type": "wchar_t",
+        "name": "godot_vector3_move_toward",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["wchar_t", "p_char"]
+          ["const godot_vector3 *", "p_self"],
+          ["const godot_vector3 *", "p_to"],
+          ["const godot_real", "p_delta"]
         ]
       },
       {
-        "name": "godot_string_to_lower",
-        "return_type": "godot_string",
+        "name": "godot_vector3_direction_to",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3 *", "p_self"],
+          ["const godot_vector3 *", "p_to"]
         ]
       },
       {
-        "name": "godot_string_to_upper",
-        "return_type": "godot_string",
+        "name": "godot_vector3_new",
+        "return_type": "void",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["godot_vector3 *", "r_dest"],
+          ["const godot_real", "p_x"],
+          ["const godot_real", "p_y"],
+          ["const godot_real", "p_z"]
         ]
       },
       {
-        "name": "godot_string_get_basename",
+        "name": "godot_vector3_as_string",
         "return_type": "godot_string",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_get_extension",
-        "return_type": "godot_string",
+        "name": "godot_vector3_min_axis",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_left",
-        "return_type": "godot_string",
+        "name": "godot_vector3_max_axis",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_int", "p_pos"]
+          ["const godot_vector3 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_ord_at",
-        "return_type": "wchar_t",
+        "name": "godot_vector3_length",
+        "return_type": "godot_real",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_int", "p_idx"]
+          ["const godot_vector3 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_plus_file",
-        "return_type": "godot_string",
+        "name": "godot_vector3_length_squared",
+        "return_type": "godot_real",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_string *", "p_file"]
+          ["const godot_vector3 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_right",
-        "return_type": "godot_string",
+        "name": "godot_vector3_is_normalized",
+        "return_type": "godot_bool",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_int", "p_pos"]
+          ["const godot_vector3 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_strip_edges",
-        "return_type": "godot_string",
+        "name": "godot_vector3_normalized",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_bool", "p_left"],
-          ["godot_bool", "p_right"]
+          ["const godot_vector3 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_strip_escapes",
-        "return_type": "godot_string",
+        "name": "godot_vector3_inverse",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_erase",
-        "return_type": "void",
+        "name": "godot_vector3_snapped",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["godot_string *", "p_self"],
-          ["godot_int", "p_pos"],
-          ["godot_int", "p_chars"]
+          ["const godot_vector3 *", "p_self"],
+          ["const godot_vector3 *", "p_by"]
         ]
       },
       {
-        "name": "godot_string_ascii",
-        "return_type": "godot_char_string",
+        "name": "godot_vector3_rotated",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3 *", "p_self"],
+          ["const godot_vector3 *", "p_axis"],
+          ["const godot_real", "p_phi"]
         ]
       },
       {
-        "name": "godot_string_ascii_extended",
-        "return_type": "godot_char_string",
+        "name": "godot_vector3_lerp",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3 *", "p_self"],
+          ["const godot_vector3 *", "p_b"],
+          ["const godot_real", "p_t"]
         ]
       },
       {
-        "name": "godot_string_utf8",
-        "return_type": "godot_char_string",
+        "name": "godot_vector3_cubic_interpolate",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3 *", "p_self"],
+          ["const godot_vector3 *", "p_b"],
+          ["const godot_vector3 *", "p_pre_a"],
+          ["const godot_vector3 *", "p_post_b"],
+          ["const godot_real", "p_t"]
         ]
       },
       {
-        "name": "godot_string_parse_utf8",
-        "return_type": "godot_bool",
+        "name": "godot_vector3_dot",
+        "return_type": "godot_real",
         "arguments": [
-          ["godot_string *", "p_self"],
-          ["const char *", "p_utf8"]
+          ["const godot_vector3 *", "p_self"],
+          ["const godot_vector3 *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_parse_utf8_with_len",
-        "return_type": "godot_bool",
+        "name": "godot_vector3_cross",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["godot_string *", "p_self"],
-          ["const char *", "p_utf8"],
-          ["godot_int", "p_len"]
+          ["const godot_vector3 *", "p_self"],
+          ["const godot_vector3 *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_chars_to_utf8",
-        "return_type": "godot_string",
+        "name": "godot_vector3_outer",
+        "return_type": "godot_basis",
         "arguments": [
-          ["const char *", "p_utf8"]
+          ["const godot_vector3 *", "p_self"],
+          ["const godot_vector3 *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_chars_to_utf8_with_len",
-        "return_type": "godot_string",
+        "name": "godot_vector3_to_diagonal_matrix",
+        "return_type": "godot_basis",
         "arguments": [
-          ["const char *", "p_utf8"],
-          ["godot_int", "p_len"]
+          ["const godot_vector3 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_hash",
-        "return_type": "uint32_t",
+        "name": "godot_vector3_abs",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_hash64",
-        "return_type": "uint64_t",
+        "name": "godot_vector3_floor",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_hash_chars",
-        "return_type": "uint32_t",
+        "name": "godot_vector3_ceil",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["const char *", "p_cstr"]
+          ["const godot_vector3 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_hash_chars_with_len",
-        "return_type": "uint32_t",
+        "name": "godot_vector3_distance_to",
+        "return_type": "godot_real",
         "arguments": [
-          ["const char *", "p_cstr"],
-          ["godot_int", "p_len"]
+          ["const godot_vector3 *", "p_self"],
+          ["const godot_vector3 *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_hash_utf8_chars",
-        "return_type": "uint32_t",
+        "name": "godot_vector3_distance_squared_to",
+        "return_type": "godot_real",
         "arguments": [
-          ["const wchar_t *", "p_str"]
+          ["const godot_vector3 *", "p_self"],
+          ["const godot_vector3 *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_hash_utf8_chars_with_len",
-        "return_type": "uint32_t",
+        "name": "godot_vector3_angle_to",
+        "return_type": "godot_real",
         "arguments": [
-          ["const wchar_t *", "p_str"],
-          ["godot_int", "p_len"]
+          ["const godot_vector3 *", "p_self"],
+          ["const godot_vector3 *", "p_to"]
         ]
       },
       {
-        "name": "godot_string_md5_buffer",
-        "return_type": "godot_pool_byte_array",
+        "name": "godot_vector3_slide",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3 *", "p_self"],
+          ["const godot_vector3 *", "p_n"]
         ]
       },
       {
-        "name": "godot_string_md5_text",
-        "return_type": "godot_string",
+        "name": "godot_vector3_bounce",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3 *", "p_self"],
+          ["const godot_vector3 *", "p_n"]
         ]
       },
       {
-        "name": "godot_string_sha256_buffer",
-        "return_type": "godot_pool_byte_array",
+        "name": "godot_vector3_reflect",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3 *", "p_self"],
+          ["const godot_vector3 *", "p_n"]
         ]
       },
       {
-        "name": "godot_string_sha256_text",
-        "return_type": "godot_string",
+        "name": "godot_vector3_operator_add",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3 *", "p_self"],
+          ["const godot_vector3 *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_empty",
-        "return_type": "godot_bool",
+        "name": "godot_vector3_operator_subtract",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3 *", "p_self"],
+          ["const godot_vector3 *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_get_base_dir",
-        "return_type": "godot_string",
+        "name": "godot_vector3_operator_multiply_vector",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3 *", "p_self"],
+          ["const godot_vector3 *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_get_file",
-        "return_type": "godot_string",
+        "name": "godot_vector3_operator_multiply_scalar",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3 *", "p_self"],
+          ["const godot_real", "p_b"]
         ]
       },
       {
-        "name": "godot_string_humanize_size",
-        "return_type": "godot_string",
+        "name": "godot_vector3_operator_divide_vector",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["size_t", "p_size"]
+          ["const godot_vector3 *", "p_self"],
+          ["const godot_vector3 *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_is_abs_path",
-        "return_type": "godot_bool",
+        "name": "godot_vector3_operator_divide_scalar",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3 *", "p_self"],
+          ["const godot_real", "p_b"]
         ]
       },
       {
-        "name": "godot_string_is_rel_path",
+        "name": "godot_vector3_operator_equal",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3 *", "p_self"],
+          ["const godot_vector3 *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_is_resource_file",
+        "name": "godot_vector3_operator_less",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_string *", "p_self"]
-        ]
-      },
-      {
-        "name": "godot_string_path_to",
-        "return_type": "godot_string",
-        "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_string *", "p_path"]
-        ]
-      },
-      {
-        "name": "godot_string_path_to_file",
-        "return_type": "godot_string",
-        "arguments": [
-          ["const godot_string *", "p_self"],
-          ["const godot_string *", "p_path"]
-        ]
-      },
-      {
-        "name": "godot_string_simplify_path",
-        "return_type": "godot_string",
-        "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3 *", "p_self"],
+          ["const godot_vector3 *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_c_escape",
-        "return_type": "godot_string",
+        "name": "godot_vector3_operator_neg",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3 *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_c_escape_multiline",
-        "return_type": "godot_string",
+        "name": "godot_vector3_set_axis",
+        "return_type": "void",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["godot_vector3 *", "p_self"],
+          ["const godot_vector3_axis", "p_axis"],
+          ["const godot_real", "p_val"]
         ]
       },
       {
-        "name": "godot_string_c_unescape",
-        "return_type": "godot_string",
+        "name": "godot_vector3_get_axis",
+        "return_type": "godot_real",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3 *", "p_self"],
+          ["const godot_vector3_axis", "p_axis"]
         ]
       },
       {
-        "name": "godot_string_http_escape",
-        "return_type": "godot_string",
+        "name": "godot_vector3i_new",
+        "return_type": "void",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["godot_vector3i *", "r_dest"],
+          ["const godot_int", "p_x"],
+          ["const godot_int", "p_y"],
+          ["const godot_int", "p_z"]
         ]
       },
       {
-        "name": "godot_string_http_unescape",
+        "name": "godot_vector3i_as_string",
         "return_type": "godot_string",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3i *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_json_escape",
-        "return_type": "godot_string",
+        "name": "godot_vector3i_as_vector3",
+        "return_type": "godot_vector3",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3i *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_word_wrap",
-        "return_type": "godot_string",
+        "name": "godot_vector3i_min_axis",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_int", "p_chars_per_line"]
+          ["const godot_vector3i *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_xml_escape",
-        "return_type": "godot_string",
+        "name": "godot_vector3i_max_axis",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3i *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_xml_escape_with_quotes",
-        "return_type": "godot_string",
+        "name": "godot_vector3i_abs",
+        "return_type": "godot_vector3i",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3i *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_xml_unescape",
-        "return_type": "godot_string",
+        "name": "godot_vector3i_sign",
+        "return_type": "godot_vector3i",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3i *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_percent_decode",
-        "return_type": "godot_string",
+        "name": "godot_vector3i_operator_add",
+        "return_type": "godot_vector3i",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3i *", "p_self"],
+          ["const godot_vector3i *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_percent_encode",
-        "return_type": "godot_string",
+        "name": "godot_vector3i_operator_subtract",
+        "return_type": "godot_vector3i",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3i *", "p_self"],
+          ["const godot_vector3i *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_is_valid_float",
-        "return_type": "godot_bool",
+        "name": "godot_vector3i_operator_multiply_vector",
+        "return_type": "godot_vector3i",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3i *", "p_self"],
+          ["const godot_vector3i *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_is_valid_hex_number",
-        "return_type": "godot_bool",
+        "name": "godot_vector3i_operator_multiply_scalar",
+        "return_type": "godot_vector3i",
         "arguments": [
-          ["const godot_string *", "p_self"],
-          ["godot_bool", "p_with_prefix"]
+          ["const godot_vector3i *", "p_self"],
+          ["const godot_int", "p_b"]
         ]
       },
       {
-        "name": "godot_string_is_valid_html_color",
-        "return_type": "godot_bool",
+        "name": "godot_vector3i_operator_divide_vector",
+        "return_type": "godot_vector3i",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3i *", "p_self"],
+          ["const godot_vector3i *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_is_valid_identifier",
-        "return_type": "godot_bool",
+        "name": "godot_vector3i_operator_divide_scalar",
+        "return_type": "godot_vector3i",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3i *", "p_self"],
+          ["const godot_int", "p_b"]
         ]
       },
       {
-        "name": "godot_string_is_valid_integer",
+        "name": "godot_vector3i_operator_equal",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3i *", "p_self"],
+          ["const godot_vector3i *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_is_valid_ip_address",
+        "name": "godot_vector3i_operator_less",
         "return_type": "godot_bool",
         "arguments": [
-          ["const godot_string *", "p_self"]
+          ["const godot_vector3i *", "p_self"],
+          ["const godot_vector3i *", "p_b"]
         ]
       },
       {
-        "name": "godot_string_destroy",
-        "return_type": "void",
+        "name": "godot_vector3i_operator_neg",
+        "return_type": "godot_vector3i",
         "arguments": [
-          ["godot_string *", "p_self"]
+          ["const godot_vector3i *", "p_self"]
         ]
       },
       {
-        "name": "godot_string_name_new",
+        "name": "godot_vector3i_set_axis",
         "return_type": "void",
         "arguments": [
-          ["godot_string_name *", "r_dest"],
-          ["const godot_string *", "p_name"]
-        ]
-      },
-      {
-        "name": "godot_string_name_new_data",
-        "return_type": "void",
-        "arguments": [
-          ["godot_string_name *", "r_dest"],
-          ["const char *", "p_name"]
+          ["godot_vector3i *", "p_self"],
+          ["const godot_vector3_axis", "p_axis"],
+          ["const godot_int", "p_val"]
         ]
       },
       {
-        "name": "godot_string_name_get_name",
-        "return_type": "godot_string",
+        "name": "godot_vector3i_get_axis",
+        "return_type": "godot_int",
         "arguments": [
-          ["const godot_string_name *", "p_self"]
+          ["const godot_vector3i *", "p_self"],
+          ["const godot_vector3_axis", "p_axis"]
         ]
       },
       {
-        "name": "godot_string_name_get_hash",
-        "return_type": "uint32_t",
+        "name": "godot_global_get_singleton",
+        "return_type": "godot_object *",
         "arguments": [
-          ["const godot_string_name *", "p_self"]
+          ["char *", "p_name"]
         ]
       },
       {
-        "name": "godot_string_name_get_data_unique_pointer",
-        "return_type": "const void *",
+        "name": "godot_get_class_tag",
+        "return_type": "void *",
         "arguments": [
-          ["const godot_string_name *", "p_self"]
+          ["const godot_string_name *", "p_class"]
         ]
       },
       {
-        "name": "godot_string_name_operator_equal",
-        "return_type": "godot_bool",
+        "name": "godot_object_cast_to",
+        "return_type": "godot_object *",
         "arguments": [
-          ["const godot_string_name *", "p_self"],
-          ["const godot_string_name *", "p_other"]
+          ["const godot_object *", "p_object"],
+          ["void *", "p_class_tag"]
         ]
       },
       {
-        "name": "godot_string_name_operator_less",
-        "return_type": "godot_bool",
+        "name": "godot_object_get_instance_id",
+        "return_type": "uint64_t",
         "arguments": [
-          ["const godot_string_name *", "p_self"],
-          ["const godot_string_name *", "p_other"]
+          ["const godot_object *", "p_object"]
         ]
       },
       {
-        "name": "godot_string_name_destroy",
-        "return_type": "void",
+        "name": "godot_instance_from_id",
+        "return_type": "godot_object *",
         "arguments": [
-          ["godot_string_name *", "p_self"]
+          ["uint64_t", "p_instance_id"]
         ]
       },
       {
@@ -6097,13 +7093,6 @@
         ]
       },
       {
-        "name": "godot_global_get_singleton",
-        "return_type": "godot_object *",
-        "arguments": [
-          ["char *", "p_name"]
-        ]
-      },
-      {
         "name": "godot_method_bind_get_method",
         "return_type": "godot_method_bind *",
         "arguments": [
@@ -6209,132 +7198,10 @@
       "name": "nativescript",
       "type": "NATIVESCRIPT",
       "version": {
-        "major": 1,
+        "major": 4,
         "minor": 0
       },
-      "next": {
-        "type": "NATIVESCRIPT",
-        "version": {
-          "major": 1,
-          "minor": 1
-        },
-        "next": null,
-        "api": [
-          {
-            "name": "godot_nativescript_set_method_argument_information",
-            "return_type": "void",
-            "arguments": [
-              ["void *", "p_gdnative_handle"],
-              ["const char *", "p_name"],
-              ["const char *", "p_function_name"],
-              ["int", "p_num_args"],
-              ["const godot_method_arg *", "p_args"]
-            ]
-          },
-          {
-            "name": "godot_nativescript_set_class_documentation",
-            "return_type": "void",
-            "arguments": [
-              ["void *", "p_gdnative_handle"],
-              ["const char *", "p_name"],
-              ["godot_string", "p_documentation"]
-            ]
-          },
-          {
-            "name": "godot_nativescript_set_method_documentation",
-            "return_type": "void",
-            "arguments": [
-              ["void *", "p_gdnative_handle"],
-              ["const char *", "p_name"],
-              ["const char *", "p_function_name"],
-              ["godot_string", "p_documentation"]
-            ]
-          },
-          {
-            "name": "godot_nativescript_set_property_documentation",
-            "return_type": "void",
-            "arguments": [
-              ["void *", "p_gdnative_handle"],
-              ["const char *", "p_name"],
-              ["const char *", "p_path"],
-              ["godot_string", "p_documentation"]
-            ]
-          },
-          {
-            "name": "godot_nativescript_set_signal_documentation",
-            "return_type": "void",
-            "arguments": [
-              ["void *", "p_gdnative_handle"],
-              ["const char *", "p_name"],
-              ["const char *", "p_signal_name"],
-              ["godot_string", "p_documentation"]
-            ]
-          },
-          {
-            "name": "godot_nativescript_set_global_type_tag",
-            "return_type": "void",
-            "arguments": [
-              ["int", "p_idx"],
-              ["const char *", "p_name"],
-              ["const void *", "p_type_tag"]
-            ]
-          },
-          {
-            "name": "godot_nativescript_get_global_type_tag",
-            "return_type": "const void *",
-            "arguments": [
-              ["int", "p_idx"],
-              ["const char *", "p_name"]
-            ]
-          },
-          {
-            "name": "godot_nativescript_set_type_tag",
-            "return_type": "void",
-            "arguments": [
-              ["void *", "p_gdnative_handle"],
-              ["const char *", "p_name"],
-              ["const void *", "p_type_tag"]
-            ]
-          },
-          {
-            "name": "godot_nativescript_get_type_tag",
-            "return_type": "const void *",
-            "arguments": [
-              ["const godot_object *", "p_object"]
-            ]
-          },
-          {
-            "name": "godot_nativescript_register_instance_binding_data_functions",
-            "return_type": "int",
-            "arguments": [
-              ["godot_instance_binding_functions", "p_binding_functions"]
-            ]
-          },
-          {
-            "name": "godot_nativescript_unregister_instance_binding_data_functions",
-            "return_type": "void",
-            "arguments": [
-              ["int", "p_idx"]
-            ]
-          },
-          {
-            "name": "godot_nativescript_get_instance_binding_data",
-            "return_type": "void *",
-            "arguments": [
-              ["int", "p_idx"],
-              ["godot_object *", "p_object"]
-            ]
-          },
-          {
-            "name": "godot_nativescript_profiling_add_data",
-            "return_type": "void",
-            "arguments": [
-              ["const char *", "p_signature"],
-              ["uint64_t", "p_line"]
-            ]
-          }
-        ]
-      },
+      "next": null,
       "api": [
         {
           "name": "godot_nativescript_register_class",
@@ -6343,8 +7210,8 @@
             ["void *", "p_gdnative_handle"],
             ["const char *", "p_name"],
             ["const char *", "p_base"],
-            ["godot_instance_create_func", "p_create_func"],
-            ["godot_instance_destroy_func", "p_destroy_func"]
+            ["godot_nativescript_instance_create_func", "p_create_func"],
+            ["godot_nativescript_instance_destroy_func", "p_destroy_func"]
           ]
         },
         {
@@ -6354,8 +7221,8 @@
             ["void *", "p_gdnative_handle"],
             ["const char *", "p_name"],
             ["const char *", "p_base"],
-            ["godot_instance_create_func", "p_create_func"],
-            ["godot_instance_destroy_func", "p_destroy_func"]
+            ["godot_nativescript_instance_create_func", "p_create_func"],
+            ["godot_nativescript_instance_destroy_func", "p_destroy_func"]
           ]
         },
         {
@@ -6365,8 +7232,19 @@
             ["void *", "p_gdnative_handle"],
             ["const char *", "p_name"],
             ["const char *", "p_function_name"],
-            ["godot_method_attributes", "p_attr"],
-            ["godot_instance_method", "p_method"]
+            ["godot_nativescript_method_attributes", "p_attr"],
+            ["godot_nativescript_instance_method", "p_method"]
+          ]
+        },
+        {
+          "name": "godot_nativescript_set_method_argument_information",
+          "return_type": "void",
+          "arguments": [
+            ["void *", "p_gdnative_handle"],
+            ["const char *", "p_name"],
+            ["const char *", "p_function_name"],
+            ["int", "p_num_args"],
+            ["const godot_nativescript_method_argument *", "p_args"]
           ]
         },
         {
@@ -6376,9 +7254,9 @@
             ["void *", "p_gdnative_handle"],
             ["const char *", "p_name"],
             ["const char *", "p_path"],
-            ["godot_property_attributes *", "p_attr"],
-            ["godot_property_set_func", "p_set_func"],
-            ["godot_property_get_func", "p_get_func"]
+            ["godot_nativescript_property_attributes *", "p_attr"],
+            ["godot_nativescript_property_set_func", "p_set_func"],
+            ["godot_nativescript_property_get_func", "p_get_func"]
           ]
         },
         {
@@ -6387,7 +7265,7 @@
           "arguments": [
             ["void *", "p_gdnative_handle"],
             ["const char *", "p_name"],
-            ["const godot_signal *", "p_signal"]
+            ["const godot_nativescript_signal *", "p_signal"]
           ]
         },
         {
@@ -6396,6 +7274,108 @@
           "arguments": [
             ["godot_object *", "p_instance"]
           ]
+        },
+        {
+          "name": "godot_nativescript_set_class_documentation",
+          "return_type": "void",
+          "arguments": [
+            ["void *", "p_gdnative_handle"],
+            ["const char *", "p_name"],
+            ["godot_string", "p_documentation"]
+          ]
+        },
+        {
+          "name": "godot_nativescript_set_method_documentation",
+          "return_type": "void",
+          "arguments": [
+            ["void *", "p_gdnative_handle"],
+            ["const char *", "p_name"],
+            ["const char *", "p_function_name"],
+            ["godot_string", "p_documentation"]
+          ]
+        },
+        {
+          "name": "godot_nativescript_set_property_documentation",
+          "return_type": "void",
+          "arguments": [
+            ["void *", "p_gdnative_handle"],
+            ["const char *", "p_name"],
+            ["const char *", "p_path"],
+            ["godot_string", "p_documentation"]
+          ]
+        },
+        {
+          "name": "godot_nativescript_set_signal_documentation",
+          "return_type": "void",
+          "arguments": [
+            ["void *", "p_gdnative_handle"],
+            ["const char *", "p_name"],
+            ["const char *", "p_signal_name"],
+            ["godot_string", "p_documentation"]
+          ]
+        },
+        {
+          "name": "godot_nativescript_set_global_type_tag",
+          "return_type": "void",
+          "arguments": [
+            ["int", "p_idx"],
+            ["const char *", "p_name"],
+            ["const void *", "p_type_tag"]
+          ]
+        },
+        {
+          "name": "godot_nativescript_get_global_type_tag",
+          "return_type": "const void *",
+          "arguments": [
+            ["int", "p_idx"],
+            ["const char *", "p_name"]
+          ]
+        },
+        {
+          "name": "godot_nativescript_set_type_tag",
+          "return_type": "void",
+          "arguments": [
+            ["void *", "p_gdnative_handle"],
+            ["const char *", "p_name"],
+            ["const void *", "p_type_tag"]
+          ]
+        },
+        {
+          "name": "godot_nativescript_get_type_tag",
+          "return_type": "const void *",
+          "arguments": [
+            ["const godot_object *", "p_object"]
+          ]
+        },
+        {
+          "name": "godot_nativescript_register_instance_binding_data_functions",
+          "return_type": "int",
+          "arguments": [
+            ["godot_nativescript_instance_binding_functions", "p_binding_functions"]
+          ]
+        },
+        {
+          "name": "godot_nativescript_unregister_instance_binding_data_functions",
+          "return_type": "void",
+          "arguments": [
+            ["int", "p_idx"]
+          ]
+        },
+        {
+          "name": "godot_nativescript_get_instance_binding_data",
+          "return_type": "void *",
+          "arguments": [
+            ["int", "p_idx"],
+            ["godot_object *", "p_object"]
+          ]
+        },
+        {
+          "name": "godot_nativescript_profiling_add_data",
+          "return_type": "void",
+          "arguments": [
+            ["const char *", "p_signature"],
+            ["uint64_t", "p_line"]
+          ]
         }
       ]
     },
@@ -6453,8 +7433,8 @@
       ]
     },
     {
-      "name": "arvr",
-      "type": "ARVR",
+      "name": "xr",
+      "type": "XR",
       "version": {
         "major": 1,
         "minor": 1
@@ -6462,40 +7442,40 @@
       "next": null,
       "api": [
         {
-          "name": "godot_arvr_register_interface",
+          "name": "godot_xr_register_interface",
           "return_type": "void",
           "arguments": [
-            ["const godot_arvr_interface_gdnative *", "p_interface"]
+            ["const godot_xr_interface_gdnative *", "p_interface"]
           ]
         },
         {
-          "name": "godot_arvr_get_worldscale",
+          "name": "godot_xr_get_worldscale",
           "return_type": "godot_real",
           "arguments": []
         },
         {
-          "name": "godot_arvr_get_reference_frame",
+          "name": "godot_xr_get_reference_frame",
           "return_type": "godot_transform",
           "arguments": []
         },
         {
-          "name": "godot_arvr_blit",
+          "name": "godot_xr_blit",
           "return_type": "void",
           "arguments": [
-            ["int", "p_eye"],
+            ["godot_int", "p_eye"],
             ["godot_rid *", "p_render_target"],
             ["godot_rect2 *", "p_screen_rect"]
           ]
         },
         {
-          "name": "godot_arvr_get_texid",
+          "name": "godot_xr_get_texid",
           "return_type": "godot_int",
           "arguments": [
             ["godot_rid *", "p_render_target"]
           ]
         },
         {
-          "name": "godot_arvr_add_controller",
+          "name": "godot_xr_add_controller",
           "return_type": "godot_int",
           "arguments": [
             ["char *", "p_device_name"],
@@ -6505,14 +7485,14 @@
           ]
         },
         {
-          "name": "godot_arvr_remove_controller",
+          "name": "godot_xr_remove_controller",
           "return_type": "void",
           "arguments": [
             ["godot_int", "p_controller_id"]
           ]
         },
         {
-          "name": "godot_arvr_set_controller_transform",
+          "name": "godot_xr_set_controller_transform",
           "return_type": "void",
           "arguments": [
             ["godot_int", "p_controller_id"],
@@ -6522,7 +7502,7 @@
           ]
         },
         {
-          "name": "godot_arvr_set_controller_button",
+          "name": "godot_xr_set_controller_button",
           "return_type": "void",
           "arguments": [
             ["godot_int", "p_controller_id"],
@@ -6531,7 +7511,7 @@
           ]
         },
         {
-          "name": "godot_arvr_set_controller_axis",
+          "name": "godot_xr_set_controller_axis",
           "return_type": "void",
           "arguments": [
             ["godot_int", "p_controller_id"],
@@ -6541,7 +7521,7 @@
           ]
         },
         {
-          "name": "godot_arvr_get_controller_rumble",
+          "name": "godot_xr_get_controller_rumble",
           "return_type": "godot_real",
           "arguments": [
             ["godot_int", "p_controller_id"]
@@ -6589,42 +7569,10 @@
       "name": "net",
       "type": "NET",
       "version": {
-        "major": 3,
-        "minor": 1
-      },
-      "next": {
-        "type": "NET",
-        "version": {
-          "major": 3,
-          "minor": 2
-        },
-        "next": null,
-        "api": [
-          {
-            "name": "godot_net_set_webrtc_library",
-            "return_type": "godot_error",
-            "arguments": [
-              ["const godot_net_webrtc_library *", "p_library"]
-            ]
-          },
-          {
-            "name": "godot_net_bind_webrtc_peer_connection",
-            "return_type": "void",
-            "arguments": [
-              ["godot_object *", "p_obj"],
-              ["const godot_net_webrtc_peer_connection *", "p_interface"]
-            ]
-          },
-          {
-            "name": "godot_net_bind_webrtc_data_channel",
-            "return_type": "void",
-            "arguments": [
-              ["godot_object *", "p_obj"],
-              ["const godot_net_webrtc_data_channel *", "p_interface"]
-            ]
-          }
-        ]
+        "major": 4,
+        "minor": 0
       },
+      "next": null,
       "api": [
         {
           "name": "godot_net_bind_stream_peer",
@@ -6649,6 +7597,29 @@
             ["godot_object *", "p_obj"],
             ["const godot_net_multiplayer_peer *", "p_interface"]
           ]
+        },
+        {
+          "name": "godot_net_set_webrtc_library",
+          "return_type": "godot_error",
+          "arguments": [
+            ["const godot_net_webrtc_library *", "p_library"]
+          ]
+        },
+        {
+          "name": "godot_net_bind_webrtc_peer_connection",
+          "return_type": "void",
+          "arguments": [
+            ["godot_object *", "p_obj"],
+            ["const godot_net_webrtc_peer_connection *", "p_interface"]
+          ]
+        },
+        {
+          "name": "godot_net_bind_webrtc_data_channel",
+          "return_type": "void",
+          "arguments": [
+            ["godot_object *", "p_obj"],
+            ["const godot_net_webrtc_data_channel *", "p_interface"]
+          ]
         }
       ]
     }
diff --git a/modules/gdnative/gdnative_builders.py b/modules/gdnative/gdnative_builders.py
index 0d95a65b7e..28e4957b2f 100644
--- a/modules/gdnative/gdnative_builders.py
+++ b/modules/gdnative/gdnative_builders.py
@@ -8,209 +8,258 @@ from platform_methods import subprocess_main
 
 
 def _spaced(e):
-    return e if e[-1] == '*' else e + ' '
+    return e if e[-1] == "*" else e + " "
 
 
 def _build_gdnative_api_struct_header(api):
     out = [
-        '/* THIS FILE IS GENERATED DO NOT EDIT */',
-        '#ifndef GODOT_GDNATIVE_API_STRUCT_H',
-        '#define GODOT_GDNATIVE_API_STRUCT_H',
-        '',
-        '#include <gdnative/gdnative.h>',
-        '#include <android/godot_android.h>',
-        '#include <arvr/godot_arvr.h>',
-        '#include <nativescript/godot_nativescript.h>',
-        '#include <net/godot_net.h>',
-        '#include <pluginscript/godot_pluginscript.h>',
-        '#include <videodecoder/godot_videodecoder.h>',
-        '',
-        '#ifdef __cplusplus',
+        "/* THIS FILE IS GENERATED DO NOT EDIT */",
+        "#ifndef GODOT_GDNATIVE_API_STRUCT_H",
+        "#define GODOT_GDNATIVE_API_STRUCT_H",
+        "",
+        "#include <gdnative/gdnative.h>",
+        "#include <android/godot_android.h>",
+        "#include <xr/godot_xr.h>",
+        "#include <nativescript/godot_nativescript.h>",
+        "#include <net/godot_net.h>",
+        "#include <pluginscript/godot_pluginscript.h>",
+        "#include <videodecoder/godot_videodecoder.h>",
+        "",
+        "#ifdef __cplusplus",
         'extern "C" {',
-        '#endif',
-        '',
-        'enum GDNATIVE_API_TYPES {',
-        '\tGDNATIVE_' + api['core']['type'] + ','
+        "#endif",
+        "",
+        "enum GDNATIVE_API_TYPES {",
+        "\tGDNATIVE_" + api["core"]["type"] + ",",
     ]
 
-    for ext in api['extensions']:
-        out += ['\tGDNATIVE_EXT_' + ext['type'] + ',']
+    for ext in api["extensions"]:
+        out += ["\tGDNATIVE_EXT_" + ext["type"] + ","]
 
-    out += ['};', '']
+    out += ["};", ""]
 
     def generate_extension_struct(name, ext, include_version=True):
         ret_val = []
-        if ext['next']:
-            ret_val += generate_extension_struct(name, ext['next'])
+        if ext["next"]:
+            ret_val += generate_extension_struct(name, ext["next"])
 
         ret_val += [
-            'typedef struct godot_gdnative_ext_' + name + ('' if not include_version else ('_{0}_{1}'.format(ext['version']['major'], ext['version']['minor']))) + '_api_struct {',
-            '\tunsigned int type;',
-            '\tgodot_gdnative_api_version version;',
-            '\tconst godot_gdnative_api_struct *next;'
+            "typedef struct godot_gdnative_ext_"
+            + name
+            + ("" if not include_version else ("_{0}_{1}".format(ext["version"]["major"], ext["version"]["minor"])))
+            + "_api_struct {",
+            "\tunsigned int type;",
+            "\tgodot_gdnative_api_version version;",
+            "\tconst godot_gdnative_api_struct *next;",
         ]
 
-        for funcdef in ext['api']:
-            args = ', '.join(['%s%s' % (_spaced(t), n) for t, n in funcdef['arguments']])
-            ret_val.append('\t%s(*%s)(%s);' % (_spaced(funcdef['return_type']), funcdef['name'], args))
+        for funcdef in ext["api"]:
+            args = ", ".join(["%s%s" % (_spaced(t), n) for t, n in funcdef["arguments"]])
+            ret_val.append("\t%s(*%s)(%s);" % (_spaced(funcdef["return_type"]), funcdef["name"], args))
 
-        ret_val += ['} godot_gdnative_ext_' + name + ('' if not include_version else ('_{0}_{1}'.format(ext['version']['major'], ext['version']['minor']))) + '_api_struct;', '']
+        ret_val += [
+            "} godot_gdnative_ext_"
+            + name
+            + ("" if not include_version else ("_{0}_{1}".format(ext["version"]["major"], ext["version"]["minor"])))
+            + "_api_struct;",
+            "",
+        ]
 
         return ret_val
 
-
     def generate_core_extension_struct(core):
         ret_val = []
-        if core['next']:
-            ret_val += generate_core_extension_struct(core['next'])
+        if core["next"]:
+            ret_val += generate_core_extension_struct(core["next"])
 
         ret_val += [
-            'typedef struct godot_gdnative_core_' + ('{0}_{1}'.format(core['version']['major'], core['version']['minor'])) + '_api_struct {',
-            '\tunsigned int type;',
-            '\tgodot_gdnative_api_version version;',
-            '\tconst godot_gdnative_api_struct *next;',
+            "typedef struct godot_gdnative_core_"
+            + "{0}_{1}".format(core["version"]["major"], core["version"]["minor"])
+            + "_api_struct {",
+            "\tunsigned int type;",
+            "\tgodot_gdnative_api_version version;",
+            "\tconst godot_gdnative_api_struct *next;",
         ]
 
-        for funcdef in core['api']:
-            args = ', '.join(['%s%s' % (_spaced(t), n) for t, n in funcdef['arguments']])
-            ret_val.append('\t%s(*%s)(%s);' % (_spaced(funcdef['return_type']), funcdef['name'], args))
+        for funcdef in core["api"]:
+            args = ", ".join(["%s%s" % (_spaced(t), n) for t, n in funcdef["arguments"]])
+            ret_val.append("\t%s(*%s)(%s);" % (_spaced(funcdef["return_type"]), funcdef["name"], args))
 
-        ret_val += ['} godot_gdnative_core_' + '{0}_{1}'.format(core['version']['major'], core['version']['minor']) + '_api_struct;', '']
+        ret_val += [
+            "} godot_gdnative_core_"
+            + "{0}_{1}".format(core["version"]["major"], core["version"]["minor"])
+            + "_api_struct;",
+            "",
+        ]
 
         return ret_val
 
-
-    for ext in api['extensions']:
-        name = ext['name']
+    for ext in api["extensions"]:
+        name = ext["name"]
         out += generate_extension_struct(name, ext, False)
 
-    if api['core']['next']:
-        out += generate_core_extension_struct(api['core']['next'])
+    if api["core"]["next"]:
+        out += generate_core_extension_struct(api["core"]["next"])
 
     out += [
-        'typedef struct godot_gdnative_core_api_struct {',
-        '\tunsigned int type;',
-        '\tgodot_gdnative_api_version version;',
-        '\tconst godot_gdnative_api_struct *next;',
-        '\tunsigned int num_extensions;',
-        '\tconst godot_gdnative_api_struct **extensions;',
+        "typedef struct godot_gdnative_core_api_struct {",
+        "\tunsigned int type;",
+        "\tgodot_gdnative_api_version version;",
+        "\tconst godot_gdnative_api_struct *next;",
+        "\tunsigned int num_extensions;",
+        "\tconst godot_gdnative_api_struct **extensions;",
     ]
 
-    for funcdef in api['core']['api']:
-        args = ', '.join(['%s%s' % (_spaced(t), n) for t, n in funcdef['arguments']])
-        out.append('\t%s(*%s)(%s);' % (_spaced(funcdef['return_type']), funcdef['name'], args))
+    for funcdef in api["core"]["api"]:
+        args = ", ".join(["%s%s" % (_spaced(t), n) for t, n in funcdef["arguments"]])
+        out.append("\t%s(*%s)(%s);" % (_spaced(funcdef["return_type"]), funcdef["name"], args))
 
     out += [
-        '} godot_gdnative_core_api_struct;',
-        '',
-        '#ifdef __cplusplus',
-        '}',
-        '#endif',
-        '',
-        '#endif // GODOT_GDNATIVE_API_STRUCT_H',
-        ''
+        "} godot_gdnative_core_api_struct;",
+        "",
+        "#ifdef __cplusplus",
+        "}",
+        "#endif",
+        "",
+        "#endif // GODOT_GDNATIVE_API_STRUCT_H",
+        "",
     ]
-    return '\n'.join(out)
+    return "\n".join(out)
 
 
 def _build_gdnative_api_struct_source(api):
-    out = [
-        '/* THIS FILE IS GENERATED DO NOT EDIT */',
-        '',
-        '#include <gdnative_api_struct.gen.h>',
-        ''
-    ]
+    out = ["/* THIS FILE IS GENERATED DO NOT EDIT */", "", "#include <gdnative_api_struct.gen.h>", ""]
 
     def get_extension_struct_name(name, ext, include_version=True):
-        return 'godot_gdnative_ext_' + name + ('' if not include_version else ('_{0}_{1}'.format(ext['version']['major'], ext['version']['minor']))) + '_api_struct'
+        return (
+            "godot_gdnative_ext_"
+            + name
+            + ("" if not include_version else ("_{0}_{1}".format(ext["version"]["major"], ext["version"]["minor"])))
+            + "_api_struct"
+        )
 
     def get_extension_struct_instance_name(name, ext, include_version=True):
-        return 'api_extension_' + name + ('' if not include_version else ('_{0}_{1}'.format(ext['version']['major'], ext['version']['minor']))) + '_struct'
+        return (
+            "api_extension_"
+            + name
+            + ("" if not include_version else ("_{0}_{1}".format(ext["version"]["major"], ext["version"]["minor"])))
+            + "_struct"
+        )
 
     def get_extension_struct_definition(name, ext, include_version=True):
 
         ret_val = []
 
-        if ext['next']:
-            ret_val += get_extension_struct_definition(name, ext['next'])
+        if ext["next"]:
+            ret_val += get_extension_struct_definition(name, ext["next"])
 
         ret_val += [
-            'extern const ' + get_extension_struct_name(name, ext, include_version) + ' ' + get_extension_struct_instance_name(name, ext, include_version) + ' = {',
-            '\tGDNATIVE_EXT_' + ext['type'] + ',',
-            '\t{' + str(ext['version']['major']) + ', ' + str(ext['version']['minor']) + '},',
-            '\t' + ('NULL' if not ext['next'] else ('(const godot_gdnative_api_struct *)&' + get_extension_struct_instance_name(name, ext['next']))) + ','
+            "extern const "
+            + get_extension_struct_name(name, ext, include_version)
+            + " "
+            + get_extension_struct_instance_name(name, ext, include_version)
+            + " = {",
+            "\tGDNATIVE_EXT_" + ext["type"] + ",",
+            "\t{" + str(ext["version"]["major"]) + ", " + str(ext["version"]["minor"]) + "},",
+            "\t"
+            + (
+                "nullptr"
+                if not ext["next"]
+                else ("(const godot_gdnative_api_struct *)&" + get_extension_struct_instance_name(name, ext["next"]))
+            )
+            + ",",
         ]
 
-        for funcdef in ext['api']:
-            ret_val.append('\t%s,' % funcdef['name'])
+        for funcdef in ext["api"]:
+            ret_val.append("\t%s," % funcdef["name"])
 
-        ret_val += ['};\n']
+        ret_val += ["};\n"]
 
         return ret_val
 
-
     def get_core_struct_definition(core):
         ret_val = []
 
-        if core['next']:
-            ret_val += get_core_struct_definition(core['next'])
+        if core["next"]:
+            ret_val += get_core_struct_definition(core["next"])
 
         ret_val += [
-            'extern const godot_gdnative_core_' + ('{0}_{1}_api_struct api_{0}_{1}'.format(core['version']['major'], core['version']['minor'])) + ' = {',
-            '\tGDNATIVE_' + core['type'] + ',',
-            '\t{' + str(core['version']['major']) + ', ' + str(core['version']['minor']) + '},',
-            '\t' + ('NULL' if not core['next'] else ('(const godot_gdnative_api_struct *)& api_{0}_{1}'.format(core['next']['version']['major'], core['next']['version']['minor']))) + ','
+            "extern const godot_gdnative_core_"
+            + "{0}_{1}_api_struct api_{0}_{1}".format(core["version"]["major"], core["version"]["minor"])
+            + " = {",
+            "\tGDNATIVE_" + core["type"] + ",",
+            "\t{" + str(core["version"]["major"]) + ", " + str(core["version"]["minor"]) + "},",
+            "\t"
+            + (
+                "nullptr"
+                if not core["next"]
+                else (
+                    "(const godot_gdnative_api_struct *)& api_{0}_{1}".format(
+                        core["next"]["version"]["major"], core["next"]["version"]["minor"]
+                    )
+                )
+            )
+            + ",",
         ]
 
-        for funcdef in core['api']:
-            ret_val.append('\t%s,' % funcdef['name'])
+        for funcdef in core["api"]:
+            ret_val.append("\t%s," % funcdef["name"])
 
-        ret_val += ['};\n']
+        ret_val += ["};\n"]
 
         return ret_val
 
-    for ext in api['extensions']:
-        name = ext['name']
+    for ext in api["extensions"]:
+        name = ext["name"]
         out += get_extension_struct_definition(name, ext, False)
 
-    out += ['', 'const godot_gdnative_api_struct *gdnative_extensions_pointers[] = {']
+    out += ["", "const godot_gdnative_api_struct *gdnative_extensions_pointers[] = {"]
 
-    for ext in api['extensions']:
-        name = ext['name']
-        out += ['\t(godot_gdnative_api_struct *)&api_extension_' + name + '_struct,']
+    for ext in api["extensions"]:
+        name = ext["name"]
+        out += ["\t(godot_gdnative_api_struct *)&api_extension_" + name + "_struct,"]
 
-    out += ['};\n']
+    out += ["};\n"]
 
-    if api['core']['next']:
-        out += get_core_struct_definition(api['core']['next'])
+    if api["core"]["next"]:
+        out += get_core_struct_definition(api["core"]["next"])
 
     out += [
-        'extern const godot_gdnative_core_api_struct api_struct = {',
-        '\tGDNATIVE_' + api['core']['type'] + ',',
-        '\t{' + str(api['core']['version']['major']) + ', ' + str(api['core']['version']['minor']) + '},',
-        '\t(const godot_gdnative_api_struct *)&api_1_1,',
-        '\t' + str(len(api['extensions'])) + ',',
-        '\tgdnative_extensions_pointers,',
+        "extern const godot_gdnative_core_api_struct api_struct = {",
+        "\tGDNATIVE_" + api["core"]["type"] + ",",
+        "\t{" + str(api["core"]["version"]["major"]) + ", " + str(api["core"]["version"]["minor"]) + "},",
+        "\t"
+        + (
+            "nullptr, "
+            if not api["core"]["next"]
+            else (
+                "(const godot_gdnative_api_struct *)& api_{0}_{1},".format(
+                    api["core"]["next"]["version"]["major"], api["core"]["next"]["version"]["minor"]
+                )
+            )
+        ),
+        "\t" + str(len(api["extensions"])) + ",",
+        "\tgdnative_extensions_pointers,",
     ]
 
-    for funcdef in api['core']['api']:
-        out.append('\t%s,' % funcdef['name'])
-    out.append('};\n')
+    for funcdef in api["core"]["api"]:
+        out.append("\t%s," % funcdef["name"])
+    out.append("};\n")
 
-    return '\n'.join(out)
+    return "\n".join(out)
 
 
 def build_gdnative_api_struct(target, source, env):
 
-    with open(source[0], 'r') as fd:
+    with open(source[0], "r") as fd:
         api = json.load(fd)
 
     header, source = target
-    with open(header, 'w') as fd:
+    with open(header, "w") as fd:
         fd.write(_build_gdnative_api_struct_header(api))
-    with open(source, 'w') as fd:
+    with open(source, "w") as fd:
         fd.write(_build_gdnative_api_struct_source(api))
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     subprocess_main(globals())
diff --git a/modules/gdnative/gdnative_library_editor_plugin.cpp b/modules/gdnative/gdnative_library_editor_plugin.cpp
index 5ffab0f80e..f0f095ddf5 100644
--- a/modules/gdnative/gdnative_library_editor_plugin.cpp
+++ b/modules/gdnative/gdnative_library_editor_plugin.cpp
@@ -40,7 +40,6 @@ void GDNativeLibraryEditor::edit(Ref<GDNativeLibrary> p_library) {
 
 	for (Map<String, NativePlatformConfig>::Element *E = platforms.front(); E; E = E->next()) {
 		for (List<String>::Element *it = E->value().entries.front(); it; it = it->next()) {
-
 			String target = E->key() + "." + it->get();
 			TargetConfig ecfg;
 			ecfg.library = config->get_value("entry", target, "");
@@ -53,25 +52,15 @@ void GDNativeLibraryEditor::edit(Ref<GDNativeLibrary> p_library) {
 }
 
 void GDNativeLibraryEditor::_bind_methods() {
-
-	ClassDB::bind_method("_on_item_button", &GDNativeLibraryEditor::_on_item_button);
-	ClassDB::bind_method("_on_library_selected", &GDNativeLibraryEditor::_on_library_selected);
-	ClassDB::bind_method("_on_dependencies_selected", &GDNativeLibraryEditor::_on_dependencies_selected);
-	ClassDB::bind_method("_on_filter_selected", &GDNativeLibraryEditor::_on_filter_selected);
-	ClassDB::bind_method("_on_item_collapsed", &GDNativeLibraryEditor::_on_item_collapsed);
-	ClassDB::bind_method("_on_item_activated", &GDNativeLibraryEditor::_on_item_activated);
-	ClassDB::bind_method("_on_create_new_entry", &GDNativeLibraryEditor::_on_create_new_entry);
 }
 
 void GDNativeLibraryEditor::_update_tree() {
-
 	tree->clear();
 	TreeItem *root = tree->create_item();
 
 	PopupMenu *filter_list = filter->get_popup();
 	String text = "";
 	for (int i = 0; i < filter_list->get_item_count(); i++) {
-
 		if (!filter_list->is_item_checked(i)) {
 			continue;
 		}
@@ -85,72 +74,79 @@ void GDNativeLibraryEditor::_update_tree() {
 		platform->set_text(0, E->get().name);
 		platform->set_metadata(0, E->get().library_extension);
 
-		platform->set_custom_bg_color(0, get_color("prop_category", "Editor"));
-		platform->set_custom_bg_color(1, get_color("prop_category", "Editor"));
-		platform->set_custom_bg_color(2, get_color("prop_category", "Editor"));
+		platform->set_custom_bg_color(0, get_theme_color("prop_category", "Editor"));
+		platform->set_custom_bg_color(1, get_theme_color("prop_category", "Editor"));
+		platform->set_custom_bg_color(2, get_theme_color("prop_category", "Editor"));
 		platform->set_selectable(0, false);
 		platform->set_expand_right(0, true);
 
 		for (List<String>::Element *it = E->value().entries.front(); it; it = it->next()) {
-
 			String target = E->key() + "." + it->get();
 			TreeItem *bit = tree->create_item(platform);
 
 			bit->set_text(0, it->get());
 			bit->set_metadata(0, target);
 			bit->set_selectable(0, false);
-			bit->set_custom_bg_color(0, get_color("prop_subsection", "Editor"));
+			bit->set_custom_bg_color(0, get_theme_color("prop_subsection", "Editor"));
 
-			bit->add_button(1, get_icon("Folder", "EditorIcons"), BUTTON_SELECT_LIBRARY, false, TTR("Select the dynamic library for this entry"));
+			bit->add_button(1, get_theme_icon("Folder", "EditorIcons"), BUTTON_SELECT_LIBRARY, false, TTR("Select the dynamic library for this entry"));
 			String file = entry_configs[target].library;
 			if (!file.empty()) {
-				bit->add_button(1, get_icon("Clear", "EditorIcons"), BUTTON_CLEAR_LIBRARY, false, TTR("Clear"));
+				bit->add_button(1, get_theme_icon("Clear", "EditorIcons"), BUTTON_CLEAR_LIBRARY, false, TTR("Clear"));
 			}
 			bit->set_text(1, file);
 
-			bit->add_button(2, get_icon("Folder", "EditorIcons"), BUTTON_SELECT_DEPENDENCES, false, TTR("Select dependencies of the library for this entry"));
+			bit->add_button(2, get_theme_icon("Folder", "EditorIcons"), BUTTON_SELECT_DEPENDENCES, false, TTR("Select dependencies of the library for this entry"));
 			Array files = entry_configs[target].dependencies;
 			if (files.size()) {
-				bit->add_button(2, get_icon("Clear", "EditorIcons"), BUTTON_CLEAR_DEPENDENCES, false, TTR("Clear"));
+				bit->add_button(2, get_theme_icon("Clear", "EditorIcons"), BUTTON_CLEAR_DEPENDENCES, false, TTR("Clear"));
 			}
 			bit->set_text(2, Variant(files));
 
-			bit->add_button(3, get_icon("MoveUp", "EditorIcons"), BUTTON_MOVE_UP, false, TTR("Move Up"));
-			bit->add_button(3, get_icon("MoveDown", "EditorIcons"), BUTTON_MOVE_DOWN, false, TTR("Move Down"));
-			bit->add_button(3, get_icon("Remove", "EditorIcons"), BUTTON_ERASE_ENTRY, false, TTR("Remove current entry"));
+			bit->add_button(3, get_theme_icon("MoveUp", "EditorIcons"), BUTTON_MOVE_UP, false, TTR("Move Up"));
+			bit->add_button(3, get_theme_icon("MoveDown", "EditorIcons"), BUTTON_MOVE_DOWN, false, TTR("Move Down"));
+			bit->add_button(3, get_theme_icon("Remove", "EditorIcons"), BUTTON_ERASE_ENTRY, false, TTR("Remove current entry"));
 		}
 
 		TreeItem *new_arch = tree->create_item(platform);
 		new_arch->set_text(0, TTR("Double click to create a new entry"));
 		new_arch->set_text_align(0, TreeItem::ALIGN_CENTER);
-		new_arch->set_custom_color(0, get_color("accent_color", "Editor"));
+		new_arch->set_custom_color(0, get_theme_color("accent_color", "Editor"));
 		new_arch->set_expand_right(0, true);
 		new_arch->set_metadata(1, E->key());
 
-		platform->set_collapsed(collapsed_items.find(E->get().name) != NULL);
+		platform->set_collapsed(collapsed_items.find(E->get().name) != nullptr);
 	}
 	filter->set_text(text);
 }
 
 void GDNativeLibraryEditor::_on_item_button(Object *item, int column, int id) {
-
 	String target = Object::cast_to<TreeItem>(item)->get_metadata(0);
 	String platform = target.substr(0, target.find("."));
 	String entry = target.substr(platform.length() + 1, target.length());
 	String section = (id == BUTTON_SELECT_DEPENDENCES || id == BUTTON_CLEAR_DEPENDENCES) ? "dependencies" : "entry";
 
 	if (id == BUTTON_SELECT_LIBRARY || id == BUTTON_SELECT_DEPENDENCES) {
-
-		EditorFileDialog::Mode mode = EditorFileDialog::MODE_OPEN_FILE;
-		if (id == BUTTON_SELECT_DEPENDENCES)
-			mode = EditorFileDialog::MODE_OPEN_FILES;
+		TreeItem *treeItem = Object::cast_to<TreeItem>(item)->get_parent();
+		EditorFileDialog::FileMode mode = EditorFileDialog::FILE_MODE_OPEN_FILE;
+		if (id == BUTTON_SELECT_DEPENDENCES) {
+			mode = EditorFileDialog::FILE_MODE_OPEN_FILES;
+		} else if (treeItem->get_text(0) == "iOS") {
+			mode = EditorFileDialog::FILE_MODE_OPEN_ANY;
+		}
 
 		file_dialog->set_meta("target", target);
 		file_dialog->set_meta("section", section);
 		file_dialog->clear_filters();
-		file_dialog->add_filter(Object::cast_to<TreeItem>(item)->get_parent()->get_metadata(0));
-		file_dialog->set_mode(mode);
-		file_dialog->popup_centered_ratio();
+
+		String filter_string = treeItem->get_metadata(0);
+		Vector<String> filters = filter_string.split(",", false, 0);
+		for (int i = 0; i < filters.size(); i++) {
+			file_dialog->add_filter(filters[i]);
+		}
+
+		file_dialog->set_file_mode(mode);
+		file_dialog->popup_file_dialog();
 
 	} else if (id == BUTTON_CLEAR_LIBRARY) {
 		_set_target_value(section, target, "");
@@ -164,24 +160,20 @@ void GDNativeLibraryEditor::_on_item_button(Object *item, int column, int id) {
 }
 
 void GDNativeLibraryEditor::_on_library_selected(const String &file) {
-
 	_set_target_value(file_dialog->get_meta("section"), file_dialog->get_meta("target"), file);
 }
 
-void GDNativeLibraryEditor::_on_dependencies_selected(const PoolStringArray &files) {
-
+void GDNativeLibraryEditor::_on_dependencies_selected(const PackedStringArray &files) {
 	_set_target_value(file_dialog->get_meta("section"), file_dialog->get_meta("target"), files);
 }
 
 void GDNativeLibraryEditor::_on_filter_selected(int index) {
-
 	PopupMenu *filter_list = filter->get_popup();
 	filter_list->set_item_checked(index, !filter_list->is_item_checked(index));
 	_update_tree();
 }
 
 void GDNativeLibraryEditor::_on_item_collapsed(Object *p_item) {
-
 	TreeItem *item = Object::cast_to<TreeItem>(p_item);
 	String name = item->get_text(0);
 
@@ -193,7 +185,6 @@ void GDNativeLibraryEditor::_on_item_collapsed(Object *p_item) {
 }
 
 void GDNativeLibraryEditor::_on_item_activated() {
-
 	TreeItem *item = tree->get_selected();
 	if (item && tree->get_selected_column() == 0 && item->get_metadata(0).get_type() == Variant::NIL) {
 		new_architecture_dialog->set_meta("platform", item->get_metadata(1));
@@ -202,7 +193,6 @@ void GDNativeLibraryEditor::_on_item_activated() {
 }
 
 void GDNativeLibraryEditor::_on_create_new_entry() {
-
 	String platform = new_architecture_dialog->get_meta("platform");
 	String entry = new_architecture_input->get_text().strip_edges();
 	if (!entry.empty()) {
@@ -212,19 +202,18 @@ void GDNativeLibraryEditor::_on_create_new_entry() {
 }
 
 void GDNativeLibraryEditor::_set_target_value(const String &section, const String &target, Variant file) {
-	if (section == "entry")
+	if (section == "entry") {
 		entry_configs[target].library = file;
-	else if (section == "dependencies")
+	} else if (section == "dependencies") {
 		entry_configs[target].dependencies = file;
+	}
 	_translate_to_config_file();
 	_update_tree();
 }
 
 void GDNativeLibraryEditor::_erase_entry(const String &platform, const String &entry) {
-
 	if (platforms.has(platform)) {
 		if (List<String>::Element *E = platforms[platform].entries.find(entry)) {
-
 			String target = platform + "." + entry;
 
 			platforms[platform].entries.erase(E);
@@ -251,19 +240,17 @@ void GDNativeLibraryEditor::_move_entry(const String &platform, const String &en
 }
 
 void GDNativeLibraryEditor::_translate_to_config_file() {
-
 	if (!library.is_null()) {
-
 		Ref<ConfigFile> config = library->get_config_file();
 		config->erase_section("entry");
 		config->erase_section("dependencies");
 
 		for (Map<String, NativePlatformConfig>::Element *E = platforms.front(); E; E = E->next()) {
 			for (List<String>::Element *it = E->value().entries.front(); it; it = it->next()) {
-
 				String target = E->key() + "." + it->get();
-				if (entry_configs[target].library.empty() && entry_configs[target].dependencies.empty())
+				if (entry_configs[target].library.empty() && entry_configs[target].dependencies.empty()) {
 					continue;
+				}
 
 				config->set_value("entry", target, entry_configs[target].library);
 				config->set_value("dependencies", target, entry_configs[target].dependencies);
@@ -275,7 +262,6 @@ void GDNativeLibraryEditor::_translate_to_config_file() {
 }
 
 GDNativeLibraryEditor::GDNativeLibraryEditor() {
-
 	{ // Define platforms
 		NativePlatformConfig platform_windows;
 		platform_windows.name = "Windows";
@@ -306,7 +292,7 @@ GDNativeLibraryEditor::GDNativeLibraryEditor() {
 		platforms["Haiku"] = platform_haiku;
 
 		NativePlatformConfig platform_uwp;
-		platform_uwp.name = "Windows Universal";
+		platform_uwp.name = "UWP";
 		platform_uwp.entries.push_back("arm");
 		platform_uwp.entries.push_back("32");
 		platform_uwp.entries.push_back("64");
@@ -332,7 +318,10 @@ GDNativeLibraryEditor::GDNativeLibraryEditor() {
 		platform_ios.name = "iOS";
 		platform_ios.entries.push_back("armv7");
 		platform_ios.entries.push_back("arm64");
-		platform_ios.library_extension = "*.dylib";
+		platform_ios.entries.push_back("x86_64");
+		// iOS can use both Static and Dynamic libraries.
+		// Frameworks is actually a folder with files.
+		platform_ios.library_extension = "*.framework; Framework, *.xcframework; Binary Framework, *.a; Static Library, *.dylib; Dynamic Library";
 		platforms["iOS"] = platform_ios;
 	}
 
@@ -359,7 +348,7 @@ GDNativeLibraryEditor::GDNativeLibraryEditor() {
 		filter_list->set_item_checked(idx, true);
 		idx += 1;
 	}
-	filter_list->connect("index_pressed", this, "_on_filter_selected");
+	filter_list->connect("index_pressed", callable_mp(this, &GDNativeLibraryEditor::_on_filter_selected));
 
 	tree = memnew(Tree);
 	container->add_child(tree);
@@ -374,54 +363,53 @@ GDNativeLibraryEditor::GDNativeLibraryEditor() {
 	tree->set_column_title(2, TTR("Dependencies"));
 	tree->set_column_expand(3, false);
 	tree->set_column_min_width(3, int(110 * EDSCALE));
-	tree->connect("button_pressed", this, "_on_item_button");
-	tree->connect("item_collapsed", this, "_on_item_collapsed");
-	tree->connect("item_activated", this, "_on_item_activated");
+	tree->connect("button_pressed", callable_mp(this, &GDNativeLibraryEditor::_on_item_button));
+	tree->connect("item_collapsed", callable_mp(this, &GDNativeLibraryEditor::_on_item_collapsed));
+	tree->connect("item_activated", callable_mp(this, &GDNativeLibraryEditor::_on_item_activated));
 
 	file_dialog = memnew(EditorFileDialog);
 	file_dialog->set_access(EditorFileDialog::ACCESS_RESOURCES);
-	file_dialog->set_resizable(true);
+	//file_dialog->set_resizable(true);
 	add_child(file_dialog);
-	file_dialog->connect("file_selected", this, "_on_library_selected");
-	file_dialog->connect("files_selected", this, "_on_dependencies_selected");
+	file_dialog->connect("file_selected", callable_mp(this, &GDNativeLibraryEditor::_on_library_selected));
+	file_dialog->connect("dir_selected", callable_mp(this, &GDNativeLibraryEditor::_on_library_selected));
+	file_dialog->connect("files_selected", callable_mp(this, &GDNativeLibraryEditor::_on_dependencies_selected));
 
 	new_architecture_dialog = memnew(ConfirmationDialog);
 	add_child(new_architecture_dialog);
 	new_architecture_dialog->set_title(TTR("Add an architecture entry"));
 	new_architecture_input = memnew(LineEdit);
 	new_architecture_dialog->add_child(new_architecture_input);
-	new_architecture_dialog->set_custom_minimum_size(Vector2(300, 80) * EDSCALE);
+	//	new_architecture_dialog->set_custom_minimum_size(Vector2(300, 80) * EDSCALE);
 	new_architecture_input->set_anchors_and_margins_preset(PRESET_HCENTER_WIDE, PRESET_MODE_MINSIZE, 5 * EDSCALE);
-	new_architecture_dialog->get_ok()->connect("pressed", this, "_on_create_new_entry");
+	new_architecture_dialog->get_ok()->connect("pressed", callable_mp(this, &GDNativeLibraryEditor::_on_create_new_entry));
 }
 
 void GDNativeLibraryEditorPlugin::edit(Object *p_node) {
-
 	Ref<GDNativeLibrary> new_library = Object::cast_to<GDNativeLibrary>(p_node);
-	if (new_library.is_valid())
+	if (new_library.is_valid()) {
 		library_editor->edit(new_library);
+	}
 }
 
 bool GDNativeLibraryEditorPlugin::handles(Object *p_node) const {
-
 	return p_node->is_class("GDNativeLibrary");
 }
 
 void GDNativeLibraryEditorPlugin::make_visible(bool p_visible) {
-
 	if (p_visible) {
 		button->show();
 		EditorNode::get_singleton()->make_bottom_panel_item_visible(library_editor);
 
 	} else {
-		if (library_editor->is_visible_in_tree())
+		if (library_editor->is_visible_in_tree()) {
 			EditorNode::get_singleton()->hide_bottom_panel();
+		}
 		button->hide();
 	}
 }
 
 GDNativeLibraryEditorPlugin::GDNativeLibraryEditorPlugin(EditorNode *p_node) {
-
 	library_editor = memnew(GDNativeLibraryEditor);
 	library_editor->set_custom_minimum_size(Size2(0, 250 * EDSCALE));
 	button = p_node->add_bottom_panel_item(TTR("GDNativeLibrary"), library_editor);
diff --git a/modules/gdnative/gdnative_library_editor_plugin.h b/modules/gdnative/gdnative_library_editor_plugin.h
index 7b59aaac38..180ab7707c 100644
--- a/modules/gdnative/gdnative_library_editor_plugin.h
+++ b/modules/gdnative/gdnative_library_editor_plugin.h
@@ -36,7 +36,6 @@
 #include "gdnative.h"
 
 class GDNativeLibraryEditor : public Control {
-
 	GDCLASS(GDNativeLibraryEditor, Control);
 
 	struct NativePlatformConfig {
@@ -77,7 +76,7 @@ protected:
 	void _update_tree();
 	void _on_item_button(Object *item, int column, int id);
 	void _on_library_selected(const String &file);
-	void _on_dependencies_selected(const PoolStringArray &files);
+	void _on_dependencies_selected(const PackedStringArray &files);
 	void _on_filter_selected(int id);
 	void _on_item_collapsed(Object *p_item);
 	void _on_item_activated();
@@ -94,7 +93,6 @@ public:
 };
 
 class GDNativeLibraryEditorPlugin : public EditorPlugin {
-
 	GDCLASS(GDNativeLibraryEditorPlugin, EditorPlugin);
 
 	GDNativeLibraryEditor *library_editor;
@@ -102,11 +100,11 @@ class GDNativeLibraryEditorPlugin : public EditorPlugin {
 	Button *button;
 
 public:
-	virtual String get_name() const { return "GDNativeLibrary"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
-	virtual void make_visible(bool p_visible);
+	virtual String get_name() const override { return "GDNativeLibrary"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_node) override;
+	virtual bool handles(Object *p_node) const override;
+	virtual void make_visible(bool p_visible) override;
 
 	GDNativeLibraryEditorPlugin(EditorNode *p_node);
 };
diff --git a/modules/gdnative/gdnative_library_singleton_editor.cpp b/modules/gdnative/gdnative_library_singleton_editor.cpp
index 17a7d5492a..409b6cbffe 100644
--- a/modules/gdnative/gdnative_library_singleton_editor.cpp
+++ b/modules/gdnative/gdnative_library_singleton_editor.cpp
@@ -35,7 +35,6 @@
 #include "editor/editor_node.h"
 
 Set<String> GDNativeLibrarySingletonEditor::_find_singletons_recursive(EditorFileSystemDirectory *p_dir) {
-
 	Set<String> file_paths;
 
 	// check children
@@ -67,7 +66,6 @@ Set<String> GDNativeLibrarySingletonEditor::_find_singletons_recursive(EditorFil
 }
 
 void GDNativeLibrarySingletonEditor::_discover_singletons() {
-
 	EditorFileSystemDirectory *dir = EditorFileSystem::get_singleton()->get_filesystem();
 
 	Set<String> file_paths = _find_singletons_recursive(dir);
@@ -97,7 +95,6 @@ void GDNativeLibrarySingletonEditor::_discover_singletons() {
 	}
 
 	if (changed) {
-
 		ProjectSettings::get_singleton()->set("gdnative/singletons", files);
 		_update_libraries(); // So singleton options (i.e. disabled) updates too
 		ProjectSettings::get_singleton()->save();
@@ -105,7 +102,6 @@ void GDNativeLibrarySingletonEditor::_discover_singletons() {
 }
 
 void GDNativeLibrarySingletonEditor::_update_libraries() {
-
 	updating = true;
 	libraries->clear();
 	libraries->create_item(); // root item
@@ -139,19 +135,22 @@ void GDNativeLibrarySingletonEditor::_update_libraries() {
 	}
 
 	// The singletons list changed, we must update the settings
-	if (updated_disabled.size() != singletons_disabled.size())
+	if (updated_disabled.size() != singletons_disabled.size()) {
 		ProjectSettings::get_singleton()->set("gdnative/singletons_disabled", updated_disabled);
+	}
 
 	updating = false;
 }
 
 void GDNativeLibrarySingletonEditor::_item_edited() {
-	if (updating)
+	if (updating) {
 		return;
+	}
 
 	TreeItem *item = libraries->get_edited();
-	if (!item)
+	if (!item) {
 		return;
+	}
 
 	bool enabled = item->get_range(1);
 	String path = item->get_metadata(0);
@@ -169,8 +168,9 @@ void GDNativeLibrarySingletonEditor::_item_edited() {
 	if (enabled) {
 		disabled_paths.erase(path);
 	} else {
-		if (disabled_paths.find(path) == -1)
+		if (disabled_paths.find(path) == -1) {
 			disabled_paths.push_back(path);
+		}
 	}
 
 	undo_redo->create_action(enabled ? TTR("Enabled GDNative Singleton") : TTR("Disabled GDNative Singleton"));
@@ -182,7 +182,6 @@ void GDNativeLibrarySingletonEditor::_item_edited() {
 }
 
 void GDNativeLibrarySingletonEditor::_notification(int p_what) {
-
 	if (p_what == NOTIFICATION_VISIBILITY_CHANGED) {
 		if (is_visible_in_tree()) {
 			_update_libraries();
@@ -191,9 +190,6 @@ void GDNativeLibrarySingletonEditor::_notification(int p_what) {
 }
 
 void GDNativeLibrarySingletonEditor::_bind_methods() {
-
-	ClassDB::bind_method(D_METHOD("_item_edited"), &GDNativeLibrarySingletonEditor::_item_edited);
-	ClassDB::bind_method(D_METHOD("_discover_singletons"), &GDNativeLibrarySingletonEditor::_discover_singletons);
 	ClassDB::bind_method(D_METHOD("_update_libraries"), &GDNativeLibrarySingletonEditor::_update_libraries);
 }
 
@@ -207,8 +203,8 @@ GDNativeLibrarySingletonEditor::GDNativeLibrarySingletonEditor() {
 	libraries->set_hide_root(true);
 	add_margin_child(TTR("Libraries: "), libraries, true);
 	updating = false;
-	libraries->connect("item_edited", this, "_item_edited");
-	EditorFileSystem::get_singleton()->connect("filesystem_changed", this, "_discover_singletons");
+	libraries->connect("item_edited", callable_mp(this, &GDNativeLibrarySingletonEditor::_item_edited));
+	EditorFileSystem::get_singleton()->connect("filesystem_changed", callable_mp(this, &GDNativeLibrarySingletonEditor::_discover_singletons));
 }
 
 #endif // TOOLS_ENABLED
diff --git a/modules/gdnative/icons/icon_g_d_native_library.svg b/modules/gdnative/icons/GDNativeLibrary.svg
index b494c7af6e..b494c7af6e 100644
--- a/modules/gdnative/icons/icon_g_d_native_library.svg
+++ b/modules/gdnative/icons/GDNativeLibrary.svg
diff --git a/modules/gdnative/icons/icon_native_script.svg b/modules/gdnative/icons/NativeScript.svg
index fb9e135627..fb9e135627 100644
--- a/modules/gdnative/icons/icon_native_script.svg
+++ b/modules/gdnative/icons/NativeScript.svg
diff --git a/modules/gdnative/include/gdnative/aabb.h b/modules/gdnative/include/gdnative/aabb.h
index 9f41e9d4c6..c776297944 100644
--- a/modules/gdnative/include/gdnative/aabb.h
+++ b/modules/gdnative/include/gdnative/aabb.h
@@ -69,6 +69,8 @@ void GDAPI godot_aabb_set_size(const godot_aabb *p_self, const godot_vector3 *p_
 
 godot_string GDAPI godot_aabb_as_string(const godot_aabb *p_self);
 
+godot_aabb GDAPI godot_aabb_abs(const godot_aabb *p_self);
+
 godot_real GDAPI godot_aabb_get_area(const godot_aabb *p_self);
 
 godot_bool GDAPI godot_aabb_has_no_area(const godot_aabb *p_self);
diff --git a/modules/gdnative/include/gdnative/array.h b/modules/gdnative/include/gdnative/array.h
index 36b5c77875..4db685873f 100644
--- a/modules/gdnative/include/gdnative/array.h
+++ b/modules/gdnative/include/gdnative/array.h
@@ -51,7 +51,7 @@ typedef struct {
 }
 #endif
 
-#include <gdnative/pool_arrays.h>
+#include <gdnative/packed_arrays.h>
 #include <gdnative/variant.h>
 
 #include <gdnative/gdnative.h>
@@ -62,13 +62,15 @@ extern "C" {
 
 void GDAPI godot_array_new(godot_array *r_dest);
 void GDAPI godot_array_new_copy(godot_array *r_dest, const godot_array *p_src);
-void GDAPI godot_array_new_pool_color_array(godot_array *r_dest, const godot_pool_color_array *p_pca);
-void GDAPI godot_array_new_pool_vector3_array(godot_array *r_dest, const godot_pool_vector3_array *p_pv3a);
-void GDAPI godot_array_new_pool_vector2_array(godot_array *r_dest, const godot_pool_vector2_array *p_pv2a);
-void GDAPI godot_array_new_pool_string_array(godot_array *r_dest, const godot_pool_string_array *p_psa);
-void GDAPI godot_array_new_pool_real_array(godot_array *r_dest, const godot_pool_real_array *p_pra);
-void GDAPI godot_array_new_pool_int_array(godot_array *r_dest, const godot_pool_int_array *p_pia);
-void GDAPI godot_array_new_pool_byte_array(godot_array *r_dest, const godot_pool_byte_array *p_pba);
+void GDAPI godot_array_new_packed_color_array(godot_array *r_dest, const godot_packed_color_array *p_pca);
+void GDAPI godot_array_new_packed_vector3_array(godot_array *r_dest, const godot_packed_vector3_array *p_pv3a);
+void GDAPI godot_array_new_packed_vector2_array(godot_array *r_dest, const godot_packed_vector2_array *p_pv2a);
+void GDAPI godot_array_new_packed_string_array(godot_array *r_dest, const godot_packed_string_array *p_psa);
+void GDAPI godot_array_new_packed_float32_array(godot_array *r_dest, const godot_packed_float32_array *p_pra);
+void GDAPI godot_array_new_packed_float64_array(godot_array *r_dest, const godot_packed_float64_array *p_pra);
+void GDAPI godot_array_new_packed_int32_array(godot_array *r_dest, const godot_packed_int32_array *p_pia);
+void GDAPI godot_array_new_packed_int64_array(godot_array *r_dest, const godot_packed_int64_array *p_pia);
+void GDAPI godot_array_new_packed_byte_array(godot_array *r_dest, const godot_packed_byte_array *p_pba);
 
 void GDAPI godot_array_set(godot_array *p_self, const godot_int p_idx, const godot_variant *p_value);
 
diff --git a/modules/gdnative/include/gdnative/callable.h b/modules/gdnative/include/gdnative/callable.h
new file mode 100644
index 0000000000..dbb5d02590
--- /dev/null
+++ b/modules/gdnative/include/gdnative/callable.h
@@ -0,0 +1,126 @@
+/*************************************************************************/
+/*  callable.h                                                           */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef GODOT_CALLABLE_H
+#define GODOT_CALLABLE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+
+#define GODOT_CALLABLE_SIZE (16)
+
+#ifndef GODOT_CORE_API_GODOT_CALLABLE_TYPE_DEFINED
+#define GODOT_CORE_API_GODOT_CALLABLE_TYPE_DEFINED
+typedef struct {
+	uint8_t _dont_touch_that[GODOT_CALLABLE_SIZE];
+} godot_callable;
+#endif
+
+#define GODOT_SIGNAL_SIZE (16)
+
+#ifndef GODOT_CORE_API_GODOT_SIGNAL_TYPE_DEFINED
+#define GODOT_CORE_API_GODOT_SIGNAL_TYPE_DEFINED
+typedef struct {
+	uint8_t _dont_touch_that[GODOT_SIGNAL_SIZE];
+} godot_signal;
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#include <gdnative/gdnative.h>
+#include <gdnative/string_name.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Callable
+
+void GDAPI godot_callable_new_with_object(godot_callable *r_dest, const godot_object *p_object, const godot_string_name *p_method);
+void GDAPI godot_callable_new_with_object_id(godot_callable *r_dest, uint64_t p_objectid, const godot_string_name *p_method);
+void GDAPI godot_callable_new_copy(godot_callable *r_dest, const godot_callable *p_src);
+
+void GDAPI godot_callable_destroy(godot_callable *p_self);
+
+godot_int GDAPI godot_callable_call(const godot_callable *p_self, const godot_variant **p_arguments, godot_int p_argcount, godot_variant *r_return_value);
+void GDAPI godot_callable_call_deferred(const godot_callable *p_self, const godot_variant **p_arguments, godot_int p_argcount);
+
+godot_bool GDAPI godot_callable_is_null(const godot_callable *p_self);
+godot_bool GDAPI godot_callable_is_custom(const godot_callable *p_self);
+godot_bool GDAPI godot_callable_is_standard(const godot_callable *p_self);
+
+godot_object GDAPI *godot_callable_get_object(const godot_callable *p_self);
+uint64_t GDAPI godot_callable_get_object_id(const godot_callable *p_self);
+godot_string_name GDAPI godot_callable_get_method(const godot_callable *p_self);
+
+uint32_t GDAPI godot_callable_hash(const godot_callable *p_self);
+
+godot_string GDAPI godot_callable_as_string(const godot_callable *p_self);
+
+godot_bool GDAPI godot_callable_operator_equal(const godot_callable *p_self, const godot_callable *p_other);
+godot_bool GDAPI godot_callable_operator_less(const godot_callable *p_self, const godot_callable *p_other);
+
+// Signal
+
+void GDAPI godot_signal_new_with_object(godot_signal *r_dest, const godot_object *p_object, const godot_string_name *p_name);
+void GDAPI godot_signal_new_with_object_id(godot_signal *r_dest, uint64_t p_objectid, const godot_string_name *p_name);
+void GDAPI godot_signal_new_copy(godot_signal *r_dest, const godot_signal *p_src);
+
+void GDAPI godot_signal_destroy(godot_signal *p_self);
+
+godot_int GDAPI godot_signal_emit(const godot_signal *p_self, const godot_variant **p_arguments, godot_int p_argcount);
+
+godot_int GDAPI godot_signal_connect(godot_signal *p_self, const godot_callable *p_callable, const godot_array *p_binds, uint32_t p_flags);
+void GDAPI godot_signal_disconnect(godot_signal *p_self, const godot_callable *p_callable);
+
+godot_bool GDAPI godot_signal_is_null(const godot_signal *p_self);
+godot_bool GDAPI godot_signal_is_connected(const godot_signal *p_self, const godot_callable *p_callable);
+
+godot_array GDAPI godot_signal_get_connections(const godot_signal *p_self);
+
+godot_object GDAPI *godot_signal_get_object(const godot_signal *p_self);
+uint64_t GDAPI godot_signal_get_object_id(const godot_signal *p_self);
+godot_string_name GDAPI godot_signal_get_name(const godot_signal *p_self);
+
+godot_string GDAPI godot_signal_as_string(const godot_signal *p_self);
+
+godot_bool GDAPI godot_signal_operator_equal(const godot_signal *p_self, const godot_signal *p_other);
+godot_bool GDAPI godot_signal_operator_less(const godot_signal *p_self, const godot_signal *p_other);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/modules/gdnative/include/gdnative/color.h b/modules/gdnative/include/gdnative/color.h
index 3f046b7f08..e7737bf8e1 100644
--- a/modules/gdnative/include/gdnative/color.h
+++ b/modules/gdnative/include/gdnative/color.h
@@ -91,13 +91,11 @@ godot_int GDAPI godot_color_to_rgba64(const godot_color *p_self);
 
 godot_int GDAPI godot_color_to_argb32(const godot_color *p_self);
 
-godot_real GDAPI godot_color_gray(const godot_color *p_self);
-
 godot_color GDAPI godot_color_inverted(const godot_color *p_self);
 
 godot_color GDAPI godot_color_contrasted(const godot_color *p_self);
 
-godot_color GDAPI godot_color_linear_interpolate(const godot_color *p_self, const godot_color *p_b, const godot_real p_t);
+godot_color GDAPI godot_color_lerp(const godot_color *p_self, const godot_color *p_b, const godot_real p_t);
 
 godot_color GDAPI godot_color_blend(const godot_color *p_self, const godot_color *p_over);
 
diff --git a/modules/gdnative/include/gdnative/gdnative.h b/modules/gdnative/include/gdnative/gdnative.h
index e19a2ec149..6a0a375da8 100644
--- a/modules/gdnative/include/gdnative/gdnative.h
+++ b/modules/gdnative/include/gdnative/gdnative.h
@@ -127,7 +127,7 @@ typedef bool godot_bool;
 
 /////// int
 
-typedef int godot_int;
+typedef int64_t godot_int;
 
 /////// real
 
@@ -144,15 +144,15 @@ typedef void godot_object;
 
 #include <gdnative/string_name.h>
 
-////// Vector2
+////// Vector2 & Vector2i
 
 #include <gdnative/vector2.h>
 
-////// Rect2
+////// Rect2 & Rect2i
 
 #include <gdnative/rect2.h>
 
-////// Vector3
+////// Vector3 & Vector3i
 
 #include <gdnative/vector3.h>
 
@@ -192,6 +192,10 @@ typedef void godot_object;
 
 #include <gdnative/rid.h>
 
+/////// Callable & Signal
+
+#include <gdnative/callable.h>
+
 /////// Dictionary
 
 #include <gdnative/dictionary.h>
@@ -200,8 +204,8 @@ typedef void godot_object;
 
 #include <gdnative/array.h>
 
-// single API file for Pool*Array
-#include <gdnative/pool_arrays.h>
+// single API file for Packed*Array
+#include <gdnative/packed_arrays.h>
 
 void GDAPI godot_object_destroy(godot_object *p_o);
 
@@ -282,16 +286,16 @@ void GDAPI godot_print_error(const char *p_description, const char *p_function,
 void GDAPI godot_print_warning(const char *p_description, const char *p_function, const char *p_file, int p_line);
 void GDAPI godot_print(const godot_string *p_message);
 
-// GDNATIVE CORE 1.0.1
-
-bool GDAPI godot_is_instance_valid(const godot_object *p_object);
+// GDNATIVE CORE 1.0.2?
 
 //tags used for safe dynamic casting
 void GDAPI *godot_get_class_tag(const godot_string_name *p_class);
 godot_object GDAPI *godot_object_cast_to(const godot_object *p_object, void *p_class_tag);
 
 // equivalent of GDScript's instance_from_id
-godot_object GDAPI *godot_instance_from_id(godot_int p_instance_id);
+godot_object GDAPI *godot_instance_from_id(uint64_t p_instance_id);
+
+uint64_t GDAPI godot_object_get_instance_id(const godot_object *p_object);
 
 #ifdef __cplusplus
 }
diff --git a/modules/gdnative/include/gdnative/packed_arrays.h b/modules/gdnative/include/gdnative/packed_arrays.h
new file mode 100644
index 0000000000..6a1727d76f
--- /dev/null
+++ b/modules/gdnative/include/gdnative/packed_arrays.h
@@ -0,0 +1,483 @@
+/*************************************************************************/
+/*  packed_arrays.h                                                      */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef GODOT_PACKED_ARRAYS_H
+#define GODOT_PACKED_ARRAYS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+
+/////// PackedByteArray
+
+#define GODOT_PACKED_BYTE_ARRAY_SIZE (2 * sizeof(void *))
+
+#ifndef GODOT_CORE_API_GODOT_PACKED_BYTE_ARRAY_TYPE_DEFINED
+#define GODOT_CORE_API_GODOT_PACKED_BYTE_ARRAY_TYPE_DEFINED
+typedef struct {
+	uint8_t _dont_touch_that[GODOT_PACKED_BYTE_ARRAY_SIZE];
+} godot_packed_byte_array;
+#endif
+
+/////// PackedInt32Array
+
+#define GODOT_PACKED_INT32_ARRAY_SIZE (2 * sizeof(void *))
+
+#ifndef GODOT_CORE_API_GODOT_PACKED_INT32_ARRAY_TYPE_DEFINED
+#define GODOT_CORE_API_GODOT_PACKED_INT32_ARRAY_TYPE_DEFINED
+typedef struct {
+	uint8_t _dont_touch_that[GODOT_PACKED_INT32_ARRAY_SIZE];
+} godot_packed_int32_array;
+#endif
+
+/////// PackedInt64Array
+
+#define GODOT_PACKED_INT64_ARRAY_SIZE (2 * sizeof(void *))
+
+#ifndef GODOT_CORE_API_GODOT_PACKED_INT64_ARRAY_TYPE_DEFINED
+#define GODOT_CORE_API_GODOT_PACKED_INT64_ARRAY_TYPE_DEFINED
+typedef struct {
+	uint8_t _dont_touch_that[GODOT_PACKED_INT64_ARRAY_SIZE];
+} godot_packed_int64_array;
+#endif
+
+/////// PackedFloat32Array
+
+#define GODOT_PACKED_FLOAT32_ARRAY_SIZE (2 * sizeof(void *))
+
+#ifndef GODOT_CORE_API_GODOT_PACKED_FLOAT32_ARRAY_TYPE_DEFINED
+#define GODOT_CORE_API_GODOT_PACKED_FLOAT32_ARRAY_TYPE_DEFINED
+typedef struct {
+	uint8_t _dont_touch_that[GODOT_PACKED_FLOAT32_ARRAY_SIZE];
+} godot_packed_float32_array;
+#endif
+
+/////// PackedFloat64Array
+
+#define GODOT_PACKED_FLOAT64_ARRAY_SIZE (2 * sizeof(void *))
+
+#ifndef GODOT_CORE_API_GODOT_PACKED_FLOAT64_ARRAY_TYPE_DEFINED
+#define GODOT_CORE_API_GODOT_PACKED_FLOAT64_ARRAY_TYPE_DEFINED
+typedef struct {
+	uint8_t _dont_touch_that[GODOT_PACKED_FLOAT64_ARRAY_SIZE];
+} godot_packed_float64_array;
+#endif
+
+/////// PackedStringArray
+
+#define GODOT_PACKED_STRING_ARRAY_SIZE (2 * sizeof(void *))
+
+#ifndef GODOT_CORE_API_GODOT_PACKED_STRING_ARRAY_TYPE_DEFINED
+#define GODOT_CORE_API_GODOT_PACKED_STRING_ARRAY_TYPE_DEFINED
+typedef struct {
+	uint8_t _dont_touch_that[GODOT_PACKED_STRING_ARRAY_SIZE];
+} godot_packed_string_array;
+#endif
+
+/////// PackedVector2Array
+
+#define GODOT_PACKED_VECTOR2_ARRAY_SIZE (2 * sizeof(void *))
+
+#ifndef GODOT_CORE_API_GODOT_PACKED_VECTOR2_ARRAY_TYPE_DEFINED
+#define GODOT_CORE_API_GODOT_PACKED_VECTOR2_ARRAY_TYPE_DEFINED
+typedef struct {
+	uint8_t _dont_touch_that[GODOT_PACKED_VECTOR2_ARRAY_SIZE];
+} godot_packed_vector2_array;
+#endif
+
+/////// PackedVector3Array
+
+#define GODOT_PACKED_VECTOR3_ARRAY_SIZE (2 * sizeof(void *))
+
+#ifndef GODOT_CORE_API_GODOT_PACKED_VECTOR3_ARRAY_TYPE_DEFINED
+#define GODOT_CORE_API_GODOT_PACKED_VECTOR3_ARRAY_TYPE_DEFINED
+typedef struct {
+	uint8_t _dont_touch_that[GODOT_PACKED_VECTOR3_ARRAY_SIZE];
+} godot_packed_vector3_array;
+#endif
+
+/////// PackedColorArray
+
+#define GODOT_PACKED_COLOR_ARRAY_SIZE (2 * sizeof(void *))
+
+#ifndef GODOT_CORE_API_GODOT_PACKED_COLOR_ARRAY_TYPE_DEFINED
+#define GODOT_CORE_API_GODOT_PACKED_COLOR_ARRAY_TYPE_DEFINED
+typedef struct {
+	uint8_t _dont_touch_that[GODOT_PACKED_COLOR_ARRAY_SIZE];
+} godot_packed_color_array;
+#endif
+
+// reduce extern "C" nesting for VS2013
+#ifdef __cplusplus
+}
+#endif
+
+#include <gdnative/array.h>
+#include <gdnative/color.h>
+#include <gdnative/vector2.h>
+#include <gdnative/vector3.h>
+
+#include <gdnative/gdnative.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// byte
+
+void GDAPI godot_packed_byte_array_new(godot_packed_byte_array *r_dest);
+void GDAPI godot_packed_byte_array_new_copy(godot_packed_byte_array *r_dest, const godot_packed_byte_array *p_src);
+void GDAPI godot_packed_byte_array_new_with_array(godot_packed_byte_array *r_dest, const godot_array *p_a);
+
+const uint8_t GDAPI *godot_packed_byte_array_ptr(const godot_packed_byte_array *p_self);
+uint8_t GDAPI *godot_packed_byte_array_ptrw(godot_packed_byte_array *p_self);
+
+void GDAPI godot_packed_byte_array_append(godot_packed_byte_array *p_self, const uint8_t p_data);
+
+void GDAPI godot_packed_byte_array_append_array(godot_packed_byte_array *p_self, const godot_packed_byte_array *p_array);
+
+godot_error GDAPI godot_packed_byte_array_insert(godot_packed_byte_array *p_self, const godot_int p_idx, const uint8_t p_data);
+
+godot_bool GDAPI godot_packed_byte_array_has(godot_packed_byte_array *p_self, const uint8_t p_value);
+
+void GDAPI godot_packed_byte_array_sort(godot_packed_byte_array *p_self);
+
+void GDAPI godot_packed_byte_array_invert(godot_packed_byte_array *p_self);
+
+void GDAPI godot_packed_byte_array_push_back(godot_packed_byte_array *p_self, const uint8_t p_data);
+
+void GDAPI godot_packed_byte_array_remove(godot_packed_byte_array *p_self, const godot_int p_idx);
+
+void GDAPI godot_packed_byte_array_resize(godot_packed_byte_array *p_self, const godot_int p_size);
+
+void GDAPI godot_packed_byte_array_set(godot_packed_byte_array *p_self, const godot_int p_idx, const uint8_t p_data);
+uint8_t GDAPI godot_packed_byte_array_get(const godot_packed_byte_array *p_self, const godot_int p_idx);
+
+godot_int GDAPI godot_packed_byte_array_size(const godot_packed_byte_array *p_self);
+
+godot_bool GDAPI godot_packed_byte_array_empty(const godot_packed_byte_array *p_self);
+
+void GDAPI godot_packed_byte_array_destroy(godot_packed_byte_array *p_self);
+
+// int32
+
+void GDAPI godot_packed_int32_array_new(godot_packed_int32_array *r_dest);
+void GDAPI godot_packed_int32_array_new_copy(godot_packed_int32_array *r_dest, const godot_packed_int32_array *p_src);
+void GDAPI godot_packed_int32_array_new_with_array(godot_packed_int32_array *r_dest, const godot_array *p_a);
+
+const int32_t GDAPI *godot_packed_int32_array_ptr(const godot_packed_int32_array *p_self);
+int32_t GDAPI *godot_packed_int32_array_ptrw(godot_packed_int32_array *p_self);
+
+void GDAPI godot_packed_int32_array_append(godot_packed_int32_array *p_self, const int32_t p_data);
+
+void GDAPI godot_packed_int32_array_append_array(godot_packed_int32_array *p_self, const godot_packed_int32_array *p_array);
+
+godot_error GDAPI godot_packed_int32_array_insert(godot_packed_int32_array *p_self, const godot_int p_idx, const int32_t p_data);
+
+godot_bool GDAPI godot_packed_int32_array_has(godot_packed_int32_array *p_self, const int32_t p_value);
+
+void GDAPI godot_packed_int32_array_sort(godot_packed_int32_array *p_self);
+
+void GDAPI godot_packed_int32_array_invert(godot_packed_int32_array *p_self);
+
+void GDAPI godot_packed_int32_array_push_back(godot_packed_int32_array *p_self, const int32_t p_data);
+
+void GDAPI godot_packed_int32_array_remove(godot_packed_int32_array *p_self, const godot_int p_idx);
+
+void GDAPI godot_packed_int32_array_resize(godot_packed_int32_array *p_self, const godot_int p_size);
+
+void GDAPI godot_packed_int32_array_set(godot_packed_int32_array *p_self, const godot_int p_idx, const int32_t p_data);
+int32_t GDAPI godot_packed_int32_array_get(const godot_packed_int32_array *p_self, const godot_int p_idx);
+
+godot_int GDAPI godot_packed_int32_array_size(const godot_packed_int32_array *p_self);
+
+godot_bool GDAPI godot_packed_int32_array_empty(const godot_packed_int32_array *p_self);
+
+void GDAPI godot_packed_int32_array_destroy(godot_packed_int32_array *p_self);
+
+// int64
+
+void GDAPI godot_packed_int64_array_new(godot_packed_int64_array *r_dest);
+void GDAPI godot_packed_int64_array_new_copy(godot_packed_int64_array *r_dest, const godot_packed_int64_array *p_src);
+void GDAPI godot_packed_int64_array_new_with_array(godot_packed_int64_array *r_dest, const godot_array *p_a);
+
+const int64_t GDAPI *godot_packed_int64_array_ptr(const godot_packed_int64_array *p_self);
+int64_t GDAPI *godot_packed_int64_array_ptrw(godot_packed_int64_array *p_self);
+
+void GDAPI godot_packed_int64_array_append(godot_packed_int64_array *p_self, const int64_t p_data);
+
+void GDAPI godot_packed_int64_array_append_array(godot_packed_int64_array *p_self, const godot_packed_int64_array *p_array);
+
+godot_error GDAPI godot_packed_int64_array_insert(godot_packed_int64_array *p_self, const godot_int p_idx, const int64_t p_data);
+
+godot_bool GDAPI godot_packed_int64_array_has(godot_packed_int64_array *p_self, const int64_t p_value);
+
+void GDAPI godot_packed_int64_array_sort(godot_packed_int64_array *p_self);
+
+void GDAPI godot_packed_int64_array_invert(godot_packed_int64_array *p_self);
+
+void GDAPI godot_packed_int64_array_push_back(godot_packed_int64_array *p_self, const int64_t p_data);
+
+void GDAPI godot_packed_int64_array_remove(godot_packed_int64_array *p_self, const godot_int p_idx);
+
+void GDAPI godot_packed_int64_array_resize(godot_packed_int64_array *p_self, const godot_int p_size);
+
+void GDAPI godot_packed_int64_array_set(godot_packed_int64_array *p_self, const godot_int p_idx, const int64_t p_data);
+int64_t GDAPI godot_packed_int64_array_get(const godot_packed_int64_array *p_self, const godot_int p_idx);
+
+godot_int GDAPI godot_packed_int64_array_size(const godot_packed_int64_array *p_self);
+
+godot_bool GDAPI godot_packed_int64_array_empty(const godot_packed_int64_array *p_self);
+
+void GDAPI godot_packed_int64_array_destroy(godot_packed_int64_array *p_self);
+
+// float32
+
+void GDAPI godot_packed_float32_array_new(godot_packed_float32_array *r_dest);
+void GDAPI godot_packed_float32_array_new_copy(godot_packed_float32_array *r_dest, const godot_packed_float32_array *p_src);
+void GDAPI godot_packed_float32_array_new_with_array(godot_packed_float32_array *r_dest, const godot_array *p_a);
+
+const float GDAPI *godot_packed_float32_array_ptr(const godot_packed_float32_array *p_self);
+float GDAPI *godot_packed_float32_array_ptrw(godot_packed_float32_array *p_self);
+
+void GDAPI godot_packed_float32_array_append(godot_packed_float32_array *p_self, const float p_data);
+
+void GDAPI godot_packed_float32_array_append_array(godot_packed_float32_array *p_self, const godot_packed_float32_array *p_array);
+
+godot_error GDAPI godot_packed_float32_array_insert(godot_packed_float32_array *p_self, const godot_int p_idx, const float p_data);
+
+godot_bool GDAPI godot_packed_float32_array_has(godot_packed_float32_array *p_self, const float p_value);
+
+void GDAPI godot_packed_float32_array_sort(godot_packed_float32_array *p_self);
+
+void GDAPI godot_packed_float32_array_invert(godot_packed_float32_array *p_self);
+
+void GDAPI godot_packed_float32_array_push_back(godot_packed_float32_array *p_self, const float p_data);
+
+void GDAPI godot_packed_float32_array_remove(godot_packed_float32_array *p_self, const godot_int p_idx);
+
+void GDAPI godot_packed_float32_array_resize(godot_packed_float32_array *p_self, const godot_int p_size);
+
+void GDAPI godot_packed_float32_array_set(godot_packed_float32_array *p_self, const godot_int p_idx, const float p_data);
+float GDAPI godot_packed_float32_array_get(const godot_packed_float32_array *p_self, const godot_int p_idx);
+
+godot_int GDAPI godot_packed_float32_array_size(const godot_packed_float32_array *p_self);
+
+godot_bool GDAPI godot_packed_float32_array_empty(const godot_packed_float32_array *p_self);
+
+void GDAPI godot_packed_float32_array_destroy(godot_packed_float32_array *p_self);
+
+// float64
+
+void GDAPI godot_packed_float64_array_new(godot_packed_float64_array *r_dest);
+void GDAPI godot_packed_float64_array_new_copy(godot_packed_float64_array *r_dest, const godot_packed_float64_array *p_src);
+void GDAPI godot_packed_float64_array_new_with_array(godot_packed_float64_array *r_dest, const godot_array *p_a);
+
+const double GDAPI *godot_packed_float64_array_ptr(const godot_packed_float64_array *p_self);
+double GDAPI *godot_packed_float64_array_ptrw(godot_packed_float64_array *p_self);
+
+void GDAPI godot_packed_float64_array_append(godot_packed_float64_array *p_self, const double p_data);
+
+void GDAPI godot_packed_float64_array_append_array(godot_packed_float64_array *p_self, const godot_packed_float64_array *p_array);
+
+godot_error GDAPI godot_packed_float64_array_insert(godot_packed_float64_array *p_self, const godot_int p_idx, const double p_data);
+
+godot_bool GDAPI godot_packed_float64_array_has(godot_packed_float64_array *p_self, const double p_value);
+
+void GDAPI godot_packed_float64_array_sort(godot_packed_float64_array *p_self);
+
+void GDAPI godot_packed_float64_array_invert(godot_packed_float64_array *p_self);
+
+void GDAPI godot_packed_float64_array_push_back(godot_packed_float64_array *p_self, const double p_data);
+
+void GDAPI godot_packed_float64_array_remove(godot_packed_float64_array *p_self, const godot_int p_idx);
+
+void GDAPI godot_packed_float64_array_resize(godot_packed_float64_array *p_self, const godot_int p_size);
+
+void GDAPI godot_packed_float64_array_set(godot_packed_float64_array *p_self, const godot_int p_idx, const double p_data);
+double GDAPI godot_packed_float64_array_get(const godot_packed_float64_array *p_self, const godot_int p_idx);
+
+godot_int GDAPI godot_packed_float64_array_size(const godot_packed_float64_array *p_self);
+
+godot_bool GDAPI godot_packed_float64_array_empty(const godot_packed_float64_array *p_self);
+
+void GDAPI godot_packed_float64_array_destroy(godot_packed_float64_array *p_self);
+
+// string
+
+void GDAPI godot_packed_string_array_new(godot_packed_string_array *r_dest);
+void GDAPI godot_packed_string_array_new_copy(godot_packed_string_array *r_dest, const godot_packed_string_array *p_src);
+void GDAPI godot_packed_string_array_new_with_array(godot_packed_string_array *r_dest, const godot_array *p_a);
+
+const godot_string GDAPI *godot_packed_string_array_ptr(const godot_packed_string_array *p_self);
+godot_string GDAPI *godot_packed_string_array_ptrw(godot_packed_string_array *p_self);
+
+void GDAPI godot_packed_string_array_append(godot_packed_string_array *p_self, const godot_string *p_data);
+
+void GDAPI godot_packed_string_array_append_array(godot_packed_string_array *p_self, const godot_packed_string_array *p_array);
+
+godot_error GDAPI godot_packed_string_array_insert(godot_packed_string_array *p_self, const godot_int p_idx, const godot_string *p_data);
+
+godot_bool GDAPI godot_packed_string_array_has(godot_packed_string_array *p_self, const godot_string *p_value);
+
+void GDAPI godot_packed_string_array_sort(godot_packed_string_array *p_self);
+
+void GDAPI godot_packed_string_array_invert(godot_packed_string_array *p_self);
+
+void GDAPI godot_packed_string_array_push_back(godot_packed_string_array *p_self, const godot_string *p_data);
+
+void GDAPI godot_packed_string_array_remove(godot_packed_string_array *p_self, const godot_int p_idx);
+
+void GDAPI godot_packed_string_array_resize(godot_packed_string_array *p_self, const godot_int p_size);
+
+void GDAPI godot_packed_string_array_set(godot_packed_string_array *p_self, const godot_int p_idx, const godot_string *p_data);
+godot_string GDAPI godot_packed_string_array_get(const godot_packed_string_array *p_self, const godot_int p_idx);
+
+godot_int GDAPI godot_packed_string_array_size(const godot_packed_string_array *p_self);
+
+godot_bool GDAPI godot_packed_string_array_empty(const godot_packed_string_array *p_self);
+
+void GDAPI godot_packed_string_array_destroy(godot_packed_string_array *p_self);
+
+// vector2
+
+void GDAPI godot_packed_vector2_array_new(godot_packed_vector2_array *r_dest);
+void GDAPI godot_packed_vector2_array_new_copy(godot_packed_vector2_array *r_dest, const godot_packed_vector2_array *p_src);
+void GDAPI godot_packed_vector2_array_new_with_array(godot_packed_vector2_array *r_dest, const godot_array *p_a);
+
+const godot_vector2 GDAPI *godot_packed_vector2_array_ptr(const godot_packed_vector2_array *p_self);
+godot_vector2 GDAPI *godot_packed_vector2_array_ptrw(godot_packed_vector2_array *p_self);
+
+void GDAPI godot_packed_vector2_array_append(godot_packed_vector2_array *p_self, const godot_vector2 *p_data);
+
+void GDAPI godot_packed_vector2_array_append_array(godot_packed_vector2_array *p_self, const godot_packed_vector2_array *p_array);
+
+godot_error GDAPI godot_packed_vector2_array_insert(godot_packed_vector2_array *p_self, const godot_int p_idx, const godot_vector2 *p_data);
+
+godot_bool GDAPI godot_packed_vector2_array_has(godot_packed_vector2_array *p_self, const godot_vector2 *p_value);
+
+void GDAPI godot_packed_vector2_array_sort(godot_packed_vector2_array *p_self);
+
+void GDAPI godot_packed_vector2_array_invert(godot_packed_vector2_array *p_self);
+
+void GDAPI godot_packed_vector2_array_push_back(godot_packed_vector2_array *p_self, const godot_vector2 *p_data);
+
+void GDAPI godot_packed_vector2_array_remove(godot_packed_vector2_array *p_self, const godot_int p_idx);
+
+void GDAPI godot_packed_vector2_array_resize(godot_packed_vector2_array *p_self, const godot_int p_size);
+
+void GDAPI godot_packed_vector2_array_set(godot_packed_vector2_array *p_self, const godot_int p_idx, const godot_vector2 *p_data);
+godot_vector2 GDAPI godot_packed_vector2_array_get(const godot_packed_vector2_array *p_self, const godot_int p_idx);
+
+godot_int GDAPI godot_packed_vector2_array_size(const godot_packed_vector2_array *p_self);
+
+godot_bool GDAPI godot_packed_vector2_array_empty(const godot_packed_vector2_array *p_self);
+
+void GDAPI godot_packed_vector2_array_destroy(godot_packed_vector2_array *p_self);
+
+// vector3
+
+void GDAPI godot_packed_vector3_array_new(godot_packed_vector3_array *r_dest);
+void GDAPI godot_packed_vector3_array_new_copy(godot_packed_vector3_array *r_dest, const godot_packed_vector3_array *p_src);
+void GDAPI godot_packed_vector3_array_new_with_array(godot_packed_vector3_array *r_dest, const godot_array *p_a);
+
+const godot_vector3 GDAPI *godot_packed_vector3_array_ptr(const godot_packed_vector3_array *p_self);
+godot_vector3 GDAPI *godot_packed_vector3_array_ptrw(godot_packed_vector3_array *p_self);
+
+void GDAPI godot_packed_vector3_array_append(godot_packed_vector3_array *p_self, const godot_vector3 *p_data);
+
+void GDAPI godot_packed_vector3_array_append_array(godot_packed_vector3_array *p_self, const godot_packed_vector3_array *p_array);
+
+godot_error GDAPI godot_packed_vector3_array_insert(godot_packed_vector3_array *p_self, const godot_int p_idx, const godot_vector3 *p_data);
+
+godot_bool GDAPI godot_packed_vector3_array_has(godot_packed_vector3_array *p_self, const godot_vector3 *p_value);
+
+void GDAPI godot_packed_vector3_array_sort(godot_packed_vector3_array *p_self);
+
+void GDAPI godot_packed_vector3_array_invert(godot_packed_vector3_array *p_self);
+
+void GDAPI godot_packed_vector3_array_push_back(godot_packed_vector3_array *p_self, const godot_vector3 *p_data);
+
+void GDAPI godot_packed_vector3_array_remove(godot_packed_vector3_array *p_self, const godot_int p_idx);
+
+void GDAPI godot_packed_vector3_array_resize(godot_packed_vector3_array *p_self, const godot_int p_size);
+
+void GDAPI godot_packed_vector3_array_set(godot_packed_vector3_array *p_self, const godot_int p_idx, const godot_vector3 *p_data);
+godot_vector3 GDAPI godot_packed_vector3_array_get(const godot_packed_vector3_array *p_self, const godot_int p_idx);
+
+godot_int GDAPI godot_packed_vector3_array_size(const godot_packed_vector3_array *p_self);
+
+godot_bool GDAPI godot_packed_vector3_array_empty(const godot_packed_vector3_array *p_self);
+
+void GDAPI godot_packed_vector3_array_destroy(godot_packed_vector3_array *p_self);
+
+// color
+
+void GDAPI godot_packed_color_array_new(godot_packed_color_array *r_dest);
+void GDAPI godot_packed_color_array_new_copy(godot_packed_color_array *r_dest, const godot_packed_color_array *p_src);
+void GDAPI godot_packed_color_array_new_with_array(godot_packed_color_array *r_dest, const godot_array *p_a);
+
+const godot_color GDAPI *godot_packed_color_array_ptr(const godot_packed_color_array *p_self);
+godot_color GDAPI *godot_packed_color_array_ptrw(godot_packed_color_array *p_self);
+
+void GDAPI godot_packed_color_array_append(godot_packed_color_array *p_self, const godot_color *p_data);
+
+void GDAPI godot_packed_color_array_append_array(godot_packed_color_array *p_self, const godot_packed_color_array *p_array);
+
+godot_error GDAPI godot_packed_color_array_insert(godot_packed_color_array *p_self, const godot_int p_idx, const godot_color *p_data);
+
+godot_bool GDAPI godot_packed_color_array_has(godot_packed_color_array *p_self, const godot_color *p_value);
+
+void GDAPI godot_packed_color_array_sort(godot_packed_color_array *p_self);
+
+void GDAPI godot_packed_color_array_invert(godot_packed_color_array *p_self);
+
+void GDAPI godot_packed_color_array_push_back(godot_packed_color_array *p_self, const godot_color *p_data);
+
+void GDAPI godot_packed_color_array_remove(godot_packed_color_array *p_self, const godot_int p_idx);
+
+void GDAPI godot_packed_color_array_resize(godot_packed_color_array *p_self, const godot_int p_size);
+
+void GDAPI godot_packed_color_array_set(godot_packed_color_array *p_self, const godot_int p_idx, const godot_color *p_data);
+godot_color GDAPI godot_packed_color_array_get(const godot_packed_color_array *p_self, const godot_int p_idx);
+
+godot_int GDAPI godot_packed_color_array_size(const godot_packed_color_array *p_self);
+
+godot_bool GDAPI godot_packed_color_array_empty(const godot_packed_color_array *p_self);
+
+void GDAPI godot_packed_color_array_destroy(godot_packed_color_array *p_self);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // GODOT_POOL_ARRAYS_H
diff --git a/modules/gdnative/include/gdnative/plane.h b/modules/gdnative/include/gdnative/plane.h
index b759a8cc1a..9843056489 100644
--- a/modules/gdnative/include/gdnative/plane.h
+++ b/modules/gdnative/include/gdnative/plane.h
@@ -68,8 +68,6 @@ godot_plane GDAPI godot_plane_normalized(const godot_plane *p_self);
 
 godot_vector3 GDAPI godot_plane_center(const godot_plane *p_self);
 
-godot_vector3 GDAPI godot_plane_get_any_point(const godot_plane *p_self);
-
 godot_bool GDAPI godot_plane_is_point_over(const godot_plane *p_self, const godot_vector3 *p_point);
 
 godot_real GDAPI godot_plane_distance_to(const godot_plane *p_self, const godot_vector3 *p_point);
diff --git a/modules/gdnative/include/gdnative/pool_arrays.h b/modules/gdnative/include/gdnative/pool_arrays.h
deleted file mode 100644
index 7d51b3cd5c..0000000000
--- a/modules/gdnative/include/gdnative/pool_arrays.h
+++ /dev/null
@@ -1,478 +0,0 @@
-/*************************************************************************/
-/*  pool_arrays.h                                                        */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
-/*                                                                       */
-/* Permission is hereby granted, free of charge, to any person obtaining */
-/* a copy of this software and associated documentation files (the       */
-/* "Software"), to deal in the Software without restriction, including   */
-/* without limitation the rights to use, copy, modify, merge, publish,   */
-/* distribute, sublicense, and/or sell copies of the Software, and to    */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions:                                             */
-/*                                                                       */
-/* The above copyright notice and this permission notice shall be        */
-/* included in all copies or substantial portions of the Software.       */
-/*                                                                       */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
-/*************************************************************************/
-
-#ifndef GODOT_POOL_ARRAYS_H
-#define GODOT_POOL_ARRAYS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-
-/////// Read Access
-
-#define GODOT_POOL_ARRAY_READ_ACCESS_SIZE 1
-
-typedef struct {
-	uint8_t _dont_touch_that[GODOT_POOL_ARRAY_READ_ACCESS_SIZE];
-} godot_pool_array_read_access;
-
-typedef godot_pool_array_read_access godot_pool_byte_array_read_access;
-typedef godot_pool_array_read_access godot_pool_int_array_read_access;
-typedef godot_pool_array_read_access godot_pool_real_array_read_access;
-typedef godot_pool_array_read_access godot_pool_string_array_read_access;
-typedef godot_pool_array_read_access godot_pool_vector2_array_read_access;
-typedef godot_pool_array_read_access godot_pool_vector3_array_read_access;
-typedef godot_pool_array_read_access godot_pool_color_array_read_access;
-
-/////// Write Access
-
-#define GODOT_POOL_ARRAY_WRITE_ACCESS_SIZE 1
-
-typedef struct {
-	uint8_t _dont_touch_that[GODOT_POOL_ARRAY_WRITE_ACCESS_SIZE];
-} godot_pool_array_write_access;
-
-typedef godot_pool_array_write_access godot_pool_byte_array_write_access;
-typedef godot_pool_array_write_access godot_pool_int_array_write_access;
-typedef godot_pool_array_write_access godot_pool_real_array_write_access;
-typedef godot_pool_array_write_access godot_pool_string_array_write_access;
-typedef godot_pool_array_write_access godot_pool_vector2_array_write_access;
-typedef godot_pool_array_write_access godot_pool_vector3_array_write_access;
-typedef godot_pool_array_write_access godot_pool_color_array_write_access;
-
-/////// PoolByteArray
-
-#define GODOT_POOL_BYTE_ARRAY_SIZE sizeof(void *)
-
-#ifndef GODOT_CORE_API_GODOT_POOL_BYTE_ARRAY_TYPE_DEFINED
-#define GODOT_CORE_API_GODOT_POOL_BYTE_ARRAY_TYPE_DEFINED
-typedef struct {
-	uint8_t _dont_touch_that[GODOT_POOL_BYTE_ARRAY_SIZE];
-} godot_pool_byte_array;
-#endif
-
-/////// PoolIntArray
-
-#define GODOT_POOL_INT_ARRAY_SIZE sizeof(void *)
-
-#ifndef GODOT_CORE_API_GODOT_POOL_INT_ARRAY_TYPE_DEFINED
-#define GODOT_CORE_API_GODOT_POOL_INT_ARRAY_TYPE_DEFINED
-typedef struct {
-	uint8_t _dont_touch_that[GODOT_POOL_INT_ARRAY_SIZE];
-} godot_pool_int_array;
-#endif
-
-/////// PoolRealArray
-
-#define GODOT_POOL_REAL_ARRAY_SIZE sizeof(void *)
-
-#ifndef GODOT_CORE_API_GODOT_POOL_REAL_ARRAY_TYPE_DEFINED
-#define GODOT_CORE_API_GODOT_POOL_REAL_ARRAY_TYPE_DEFINED
-typedef struct {
-	uint8_t _dont_touch_that[GODOT_POOL_REAL_ARRAY_SIZE];
-} godot_pool_real_array;
-#endif
-
-/////// PoolStringArray
-
-#define GODOT_POOL_STRING_ARRAY_SIZE sizeof(void *)
-
-#ifndef GODOT_CORE_API_GODOT_POOL_STRING_ARRAY_TYPE_DEFINED
-#define GODOT_CORE_API_GODOT_POOL_STRING_ARRAY_TYPE_DEFINED
-typedef struct {
-	uint8_t _dont_touch_that[GODOT_POOL_STRING_ARRAY_SIZE];
-} godot_pool_string_array;
-#endif
-
-/////// PoolVector2Array
-
-#define GODOT_POOL_VECTOR2_ARRAY_SIZE sizeof(void *)
-
-#ifndef GODOT_CORE_API_GODOT_POOL_VECTOR2_ARRAY_TYPE_DEFINED
-#define GODOT_CORE_API_GODOT_POOL_VECTOR2_ARRAY_TYPE_DEFINED
-typedef struct {
-	uint8_t _dont_touch_that[GODOT_POOL_VECTOR2_ARRAY_SIZE];
-} godot_pool_vector2_array;
-#endif
-
-/////// PoolVector3Array
-
-#define GODOT_POOL_VECTOR3_ARRAY_SIZE sizeof(void *)
-
-#ifndef GODOT_CORE_API_GODOT_POOL_VECTOR3_ARRAY_TYPE_DEFINED
-#define GODOT_CORE_API_GODOT_POOL_VECTOR3_ARRAY_TYPE_DEFINED
-typedef struct {
-	uint8_t _dont_touch_that[GODOT_POOL_VECTOR3_ARRAY_SIZE];
-} godot_pool_vector3_array;
-#endif
-
-/////// PoolColorArray
-
-#define GODOT_POOL_COLOR_ARRAY_SIZE sizeof(void *)
-
-#ifndef GODOT_CORE_API_GODOT_POOL_COLOR_ARRAY_TYPE_DEFINED
-#define GODOT_CORE_API_GODOT_POOL_COLOR_ARRAY_TYPE_DEFINED
-typedef struct {
-	uint8_t _dont_touch_that[GODOT_POOL_COLOR_ARRAY_SIZE];
-} godot_pool_color_array;
-#endif
-
-// reduce extern "C" nesting for VS2013
-#ifdef __cplusplus
-}
-#endif
-
-#include <gdnative/array.h>
-#include <gdnative/color.h>
-#include <gdnative/vector2.h>
-#include <gdnative/vector3.h>
-
-#include <gdnative/gdnative.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// byte
-
-void GDAPI godot_pool_byte_array_new(godot_pool_byte_array *r_dest);
-void GDAPI godot_pool_byte_array_new_copy(godot_pool_byte_array *r_dest, const godot_pool_byte_array *p_src);
-void GDAPI godot_pool_byte_array_new_with_array(godot_pool_byte_array *r_dest, const godot_array *p_a);
-
-void GDAPI godot_pool_byte_array_append(godot_pool_byte_array *p_self, const uint8_t p_data);
-
-void GDAPI godot_pool_byte_array_append_array(godot_pool_byte_array *p_self, const godot_pool_byte_array *p_array);
-
-godot_error GDAPI godot_pool_byte_array_insert(godot_pool_byte_array *p_self, const godot_int p_idx, const uint8_t p_data);
-
-void GDAPI godot_pool_byte_array_invert(godot_pool_byte_array *p_self);
-
-void GDAPI godot_pool_byte_array_push_back(godot_pool_byte_array *p_self, const uint8_t p_data);
-
-void GDAPI godot_pool_byte_array_remove(godot_pool_byte_array *p_self, const godot_int p_idx);
-
-void GDAPI godot_pool_byte_array_resize(godot_pool_byte_array *p_self, const godot_int p_size);
-
-godot_pool_byte_array_read_access GDAPI *godot_pool_byte_array_read(const godot_pool_byte_array *p_self);
-
-godot_pool_byte_array_write_access GDAPI *godot_pool_byte_array_write(godot_pool_byte_array *p_self);
-
-void GDAPI godot_pool_byte_array_set(godot_pool_byte_array *p_self, const godot_int p_idx, const uint8_t p_data);
-uint8_t GDAPI godot_pool_byte_array_get(const godot_pool_byte_array *p_self, const godot_int p_idx);
-
-godot_int GDAPI godot_pool_byte_array_size(const godot_pool_byte_array *p_self);
-
-godot_bool GDAPI godot_pool_byte_array_empty(const godot_pool_byte_array *p_self);
-
-void GDAPI godot_pool_byte_array_destroy(godot_pool_byte_array *p_self);
-
-// int
-
-void GDAPI godot_pool_int_array_new(godot_pool_int_array *r_dest);
-void GDAPI godot_pool_int_array_new_copy(godot_pool_int_array *r_dest, const godot_pool_int_array *p_src);
-void GDAPI godot_pool_int_array_new_with_array(godot_pool_int_array *r_dest, const godot_array *p_a);
-
-void GDAPI godot_pool_int_array_append(godot_pool_int_array *p_self, const godot_int p_data);
-
-void GDAPI godot_pool_int_array_append_array(godot_pool_int_array *p_self, const godot_pool_int_array *p_array);
-
-godot_error GDAPI godot_pool_int_array_insert(godot_pool_int_array *p_self, const godot_int p_idx, const godot_int p_data);
-
-void GDAPI godot_pool_int_array_invert(godot_pool_int_array *p_self);
-
-void GDAPI godot_pool_int_array_push_back(godot_pool_int_array *p_self, const godot_int p_data);
-
-void GDAPI godot_pool_int_array_remove(godot_pool_int_array *p_self, const godot_int p_idx);
-
-void GDAPI godot_pool_int_array_resize(godot_pool_int_array *p_self, const godot_int p_size);
-
-godot_pool_int_array_read_access GDAPI *godot_pool_int_array_read(const godot_pool_int_array *p_self);
-
-godot_pool_int_array_write_access GDAPI *godot_pool_int_array_write(godot_pool_int_array *p_self);
-
-void GDAPI godot_pool_int_array_set(godot_pool_int_array *p_self, const godot_int p_idx, const godot_int p_data);
-godot_int GDAPI godot_pool_int_array_get(const godot_pool_int_array *p_self, const godot_int p_idx);
-
-godot_int GDAPI godot_pool_int_array_size(const godot_pool_int_array *p_self);
-
-godot_bool GDAPI godot_pool_int_array_empty(const godot_pool_int_array *p_self);
-
-void GDAPI godot_pool_int_array_destroy(godot_pool_int_array *p_self);
-
-// real
-
-void GDAPI godot_pool_real_array_new(godot_pool_real_array *r_dest);
-void GDAPI godot_pool_real_array_new_copy(godot_pool_real_array *r_dest, const godot_pool_real_array *p_src);
-void GDAPI godot_pool_real_array_new_with_array(godot_pool_real_array *r_dest, const godot_array *p_a);
-
-void GDAPI godot_pool_real_array_append(godot_pool_real_array *p_self, const godot_real p_data);
-
-void GDAPI godot_pool_real_array_append_array(godot_pool_real_array *p_self, const godot_pool_real_array *p_array);
-
-godot_error GDAPI godot_pool_real_array_insert(godot_pool_real_array *p_self, const godot_int p_idx, const godot_real p_data);
-
-void GDAPI godot_pool_real_array_invert(godot_pool_real_array *p_self);
-
-void GDAPI godot_pool_real_array_push_back(godot_pool_real_array *p_self, const godot_real p_data);
-
-void GDAPI godot_pool_real_array_remove(godot_pool_real_array *p_self, const godot_int p_idx);
-
-void GDAPI godot_pool_real_array_resize(godot_pool_real_array *p_self, const godot_int p_size);
-
-godot_pool_real_array_read_access GDAPI *godot_pool_real_array_read(const godot_pool_real_array *p_self);
-
-godot_pool_real_array_write_access GDAPI *godot_pool_real_array_write(godot_pool_real_array *p_self);
-
-void GDAPI godot_pool_real_array_set(godot_pool_real_array *p_self, const godot_int p_idx, const godot_real p_data);
-godot_real GDAPI godot_pool_real_array_get(const godot_pool_real_array *p_self, const godot_int p_idx);
-
-godot_int GDAPI godot_pool_real_array_size(const godot_pool_real_array *p_self);
-
-godot_bool GDAPI godot_pool_real_array_empty(const godot_pool_real_array *p_self);
-
-void GDAPI godot_pool_real_array_destroy(godot_pool_real_array *p_self);
-
-// string
-
-void GDAPI godot_pool_string_array_new(godot_pool_string_array *r_dest);
-void GDAPI godot_pool_string_array_new_copy(godot_pool_string_array *r_dest, const godot_pool_string_array *p_src);
-void GDAPI godot_pool_string_array_new_with_array(godot_pool_string_array *r_dest, const godot_array *p_a);
-
-void GDAPI godot_pool_string_array_append(godot_pool_string_array *p_self, const godot_string *p_data);
-
-void GDAPI godot_pool_string_array_append_array(godot_pool_string_array *p_self, const godot_pool_string_array *p_array);
-
-godot_error GDAPI godot_pool_string_array_insert(godot_pool_string_array *p_self, const godot_int p_idx, const godot_string *p_data);
-
-void GDAPI godot_pool_string_array_invert(godot_pool_string_array *p_self);
-
-void GDAPI godot_pool_string_array_push_back(godot_pool_string_array *p_self, const godot_string *p_data);
-
-void GDAPI godot_pool_string_array_remove(godot_pool_string_array *p_self, const godot_int p_idx);
-
-void GDAPI godot_pool_string_array_resize(godot_pool_string_array *p_self, const godot_int p_size);
-
-godot_pool_string_array_read_access GDAPI *godot_pool_string_array_read(const godot_pool_string_array *p_self);
-
-godot_pool_string_array_write_access GDAPI *godot_pool_string_array_write(godot_pool_string_array *p_self);
-
-void GDAPI godot_pool_string_array_set(godot_pool_string_array *p_self, const godot_int p_idx, const godot_string *p_data);
-godot_string GDAPI godot_pool_string_array_get(const godot_pool_string_array *p_self, const godot_int p_idx);
-
-godot_int GDAPI godot_pool_string_array_size(const godot_pool_string_array *p_self);
-
-godot_bool GDAPI godot_pool_string_array_empty(const godot_pool_string_array *p_self);
-
-void GDAPI godot_pool_string_array_destroy(godot_pool_string_array *p_self);
-
-// vector2
-
-void GDAPI godot_pool_vector2_array_new(godot_pool_vector2_array *r_dest);
-void GDAPI godot_pool_vector2_array_new_copy(godot_pool_vector2_array *r_dest, const godot_pool_vector2_array *p_src);
-void GDAPI godot_pool_vector2_array_new_with_array(godot_pool_vector2_array *r_dest, const godot_array *p_a);
-
-void GDAPI godot_pool_vector2_array_append(godot_pool_vector2_array *p_self, const godot_vector2 *p_data);
-
-void GDAPI godot_pool_vector2_array_append_array(godot_pool_vector2_array *p_self, const godot_pool_vector2_array *p_array);
-
-godot_error GDAPI godot_pool_vector2_array_insert(godot_pool_vector2_array *p_self, const godot_int p_idx, const godot_vector2 *p_data);
-
-void GDAPI godot_pool_vector2_array_invert(godot_pool_vector2_array *p_self);
-
-void GDAPI godot_pool_vector2_array_push_back(godot_pool_vector2_array *p_self, const godot_vector2 *p_data);
-
-void GDAPI godot_pool_vector2_array_remove(godot_pool_vector2_array *p_self, const godot_int p_idx);
-
-void GDAPI godot_pool_vector2_array_resize(godot_pool_vector2_array *p_self, const godot_int p_size);
-
-godot_pool_vector2_array_read_access GDAPI *godot_pool_vector2_array_read(const godot_pool_vector2_array *p_self);
-
-godot_pool_vector2_array_write_access GDAPI *godot_pool_vector2_array_write(godot_pool_vector2_array *p_self);
-
-void GDAPI godot_pool_vector2_array_set(godot_pool_vector2_array *p_self, const godot_int p_idx, const godot_vector2 *p_data);
-godot_vector2 GDAPI godot_pool_vector2_array_get(const godot_pool_vector2_array *p_self, const godot_int p_idx);
-
-godot_int GDAPI godot_pool_vector2_array_size(const godot_pool_vector2_array *p_self);
-
-godot_bool GDAPI godot_pool_vector2_array_empty(const godot_pool_vector2_array *p_self);
-
-void GDAPI godot_pool_vector2_array_destroy(godot_pool_vector2_array *p_self);
-
-// vector3
-
-void GDAPI godot_pool_vector3_array_new(godot_pool_vector3_array *r_dest);
-void GDAPI godot_pool_vector3_array_new_copy(godot_pool_vector3_array *r_dest, const godot_pool_vector3_array *p_src);
-void GDAPI godot_pool_vector3_array_new_with_array(godot_pool_vector3_array *r_dest, const godot_array *p_a);
-
-void GDAPI godot_pool_vector3_array_append(godot_pool_vector3_array *p_self, const godot_vector3 *p_data);
-
-void GDAPI godot_pool_vector3_array_append_array(godot_pool_vector3_array *p_self, const godot_pool_vector3_array *p_array);
-
-godot_error GDAPI godot_pool_vector3_array_insert(godot_pool_vector3_array *p_self, const godot_int p_idx, const godot_vector3 *p_data);
-
-void GDAPI godot_pool_vector3_array_invert(godot_pool_vector3_array *p_self);
-
-void GDAPI godot_pool_vector3_array_push_back(godot_pool_vector3_array *p_self, const godot_vector3 *p_data);
-
-void GDAPI godot_pool_vector3_array_remove(godot_pool_vector3_array *p_self, const godot_int p_idx);
-
-void GDAPI godot_pool_vector3_array_resize(godot_pool_vector3_array *p_self, const godot_int p_size);
-
-godot_pool_vector3_array_read_access GDAPI *godot_pool_vector3_array_read(const godot_pool_vector3_array *p_self);
-
-godot_pool_vector3_array_write_access GDAPI *godot_pool_vector3_array_write(godot_pool_vector3_array *p_self);
-
-void GDAPI godot_pool_vector3_array_set(godot_pool_vector3_array *p_self, const godot_int p_idx, const godot_vector3 *p_data);
-godot_vector3 GDAPI godot_pool_vector3_array_get(const godot_pool_vector3_array *p_self, const godot_int p_idx);
-
-godot_int GDAPI godot_pool_vector3_array_size(const godot_pool_vector3_array *p_self);
-
-godot_bool GDAPI godot_pool_vector3_array_empty(const godot_pool_vector3_array *p_self);
-
-void GDAPI godot_pool_vector3_array_destroy(godot_pool_vector3_array *p_self);
-
-// color
-
-void GDAPI godot_pool_color_array_new(godot_pool_color_array *r_dest);
-void GDAPI godot_pool_color_array_new_copy(godot_pool_color_array *r_dest, const godot_pool_color_array *p_src);
-void GDAPI godot_pool_color_array_new_with_array(godot_pool_color_array *r_dest, const godot_array *p_a);
-
-void GDAPI godot_pool_color_array_append(godot_pool_color_array *p_self, const godot_color *p_data);
-
-void GDAPI godot_pool_color_array_append_array(godot_pool_color_array *p_self, const godot_pool_color_array *p_array);
-
-godot_error GDAPI godot_pool_color_array_insert(godot_pool_color_array *p_self, const godot_int p_idx, const godot_color *p_data);
-
-void GDAPI godot_pool_color_array_invert(godot_pool_color_array *p_self);
-
-void GDAPI godot_pool_color_array_push_back(godot_pool_color_array *p_self, const godot_color *p_data);
-
-void GDAPI godot_pool_color_array_remove(godot_pool_color_array *p_self, const godot_int p_idx);
-
-void GDAPI godot_pool_color_array_resize(godot_pool_color_array *p_self, const godot_int p_size);
-
-godot_pool_color_array_read_access GDAPI *godot_pool_color_array_read(const godot_pool_color_array *p_self);
-
-godot_pool_color_array_write_access GDAPI *godot_pool_color_array_write(godot_pool_color_array *p_self);
-
-void GDAPI godot_pool_color_array_set(godot_pool_color_array *p_self, const godot_int p_idx, const godot_color *p_data);
-godot_color GDAPI godot_pool_color_array_get(const godot_pool_color_array *p_self, const godot_int p_idx);
-
-godot_int GDAPI godot_pool_color_array_size(const godot_pool_color_array *p_self);
-
-godot_bool GDAPI godot_pool_color_array_empty(const godot_pool_color_array *p_self);
-
-void GDAPI godot_pool_color_array_destroy(godot_pool_color_array *p_self);
-
-//
-// read accessor functions
-//
-
-godot_pool_byte_array_read_access GDAPI *godot_pool_byte_array_read_access_copy(const godot_pool_byte_array_read_access *p_other);
-const uint8_t GDAPI *godot_pool_byte_array_read_access_ptr(const godot_pool_byte_array_read_access *p_read);
-void GDAPI godot_pool_byte_array_read_access_operator_assign(godot_pool_byte_array_read_access *p_read, godot_pool_byte_array_read_access *p_other);
-void GDAPI godot_pool_byte_array_read_access_destroy(godot_pool_byte_array_read_access *p_read);
-
-godot_pool_int_array_read_access GDAPI *godot_pool_int_array_read_access_copy(const godot_pool_int_array_read_access *p_other);
-const godot_int GDAPI *godot_pool_int_array_read_access_ptr(const godot_pool_int_array_read_access *p_read);
-void GDAPI godot_pool_int_array_read_access_operator_assign(godot_pool_int_array_read_access *p_read, godot_pool_int_array_read_access *p_other);
-void GDAPI godot_pool_int_array_read_access_destroy(godot_pool_int_array_read_access *p_read);
-
-godot_pool_real_array_read_access GDAPI *godot_pool_real_array_read_access_copy(const godot_pool_real_array_read_access *p_other);
-const godot_real GDAPI *godot_pool_real_array_read_access_ptr(const godot_pool_real_array_read_access *p_read);
-void GDAPI godot_pool_real_array_read_access_operator_assign(godot_pool_real_array_read_access *p_read, godot_pool_real_array_read_access *p_other);
-void GDAPI godot_pool_real_array_read_access_destroy(godot_pool_real_array_read_access *p_read);
-
-godot_pool_string_array_read_access GDAPI *godot_pool_string_array_read_access_copy(const godot_pool_string_array_read_access *p_other);
-const godot_string GDAPI *godot_pool_string_array_read_access_ptr(const godot_pool_string_array_read_access *p_read);
-void GDAPI godot_pool_string_array_read_access_operator_assign(godot_pool_string_array_read_access *p_read, godot_pool_string_array_read_access *p_other);
-void GDAPI godot_pool_string_array_read_access_destroy(godot_pool_string_array_read_access *p_read);
-
-godot_pool_vector2_array_read_access GDAPI *godot_pool_vector2_array_read_access_copy(const godot_pool_vector2_array_read_access *p_other);
-const godot_vector2 GDAPI *godot_pool_vector2_array_read_access_ptr(const godot_pool_vector2_array_read_access *p_read);
-void GDAPI godot_pool_vector2_array_read_access_operator_assign(godot_pool_vector2_array_read_access *p_read, godot_pool_vector2_array_read_access *p_other);
-void GDAPI godot_pool_vector2_array_read_access_destroy(godot_pool_vector2_array_read_access *p_read);
-
-godot_pool_vector3_array_read_access GDAPI *godot_pool_vector3_array_read_access_copy(const godot_pool_vector3_array_read_access *p_other);
-const godot_vector3 GDAPI *godot_pool_vector3_array_read_access_ptr(const godot_pool_vector3_array_read_access *p_read);
-void GDAPI godot_pool_vector3_array_read_access_operator_assign(godot_pool_vector3_array_read_access *p_read, godot_pool_vector3_array_read_access *p_other);
-void GDAPI godot_pool_vector3_array_read_access_destroy(godot_pool_vector3_array_read_access *p_read);
-
-godot_pool_color_array_read_access GDAPI *godot_pool_color_array_read_access_copy(const godot_pool_color_array_read_access *p_other);
-const godot_color GDAPI *godot_pool_color_array_read_access_ptr(const godot_pool_color_array_read_access *p_read);
-void GDAPI godot_pool_color_array_read_access_operator_assign(godot_pool_color_array_read_access *p_read, godot_pool_color_array_read_access *p_other);
-void GDAPI godot_pool_color_array_read_access_destroy(godot_pool_color_array_read_access *p_read);
-
-//
-// write accessor functions
-//
-
-godot_pool_byte_array_write_access GDAPI *godot_pool_byte_array_write_access_copy(const godot_pool_byte_array_write_access *p_other);
-uint8_t GDAPI *godot_pool_byte_array_write_access_ptr(const godot_pool_byte_array_write_access *p_write);
-void GDAPI godot_pool_byte_array_write_access_operator_assign(godot_pool_byte_array_write_access *p_write, godot_pool_byte_array_write_access *p_other);
-void GDAPI godot_pool_byte_array_write_access_destroy(godot_pool_byte_array_write_access *p_write);
-
-godot_pool_int_array_write_access GDAPI *godot_pool_int_array_write_access_copy(const godot_pool_int_array_write_access *p_other);
-godot_int GDAPI *godot_pool_int_array_write_access_ptr(const godot_pool_int_array_write_access *p_write);
-void GDAPI godot_pool_int_array_write_access_operator_assign(godot_pool_int_array_write_access *p_write, godot_pool_int_array_write_access *p_other);
-void GDAPI godot_pool_int_array_write_access_destroy(godot_pool_int_array_write_access *p_write);
-
-godot_pool_real_array_write_access GDAPI *godot_pool_real_array_write_access_copy(const godot_pool_real_array_write_access *p_other);
-godot_real GDAPI *godot_pool_real_array_write_access_ptr(const godot_pool_real_array_write_access *p_write);
-void GDAPI godot_pool_real_array_write_access_operator_assign(godot_pool_real_array_write_access *p_write, godot_pool_real_array_write_access *p_other);
-void GDAPI godot_pool_real_array_write_access_destroy(godot_pool_real_array_write_access *p_write);
-
-godot_pool_string_array_write_access GDAPI *godot_pool_string_array_write_access_copy(const godot_pool_string_array_write_access *p_other);
-godot_string GDAPI *godot_pool_string_array_write_access_ptr(const godot_pool_string_array_write_access *p_write);
-void GDAPI godot_pool_string_array_write_access_operator_assign(godot_pool_string_array_write_access *p_write, godot_pool_string_array_write_access *p_other);
-void GDAPI godot_pool_string_array_write_access_destroy(godot_pool_string_array_write_access *p_write);
-
-godot_pool_vector2_array_write_access GDAPI *godot_pool_vector2_array_write_access_copy(const godot_pool_vector2_array_write_access *p_other);
-godot_vector2 GDAPI *godot_pool_vector2_array_write_access_ptr(const godot_pool_vector2_array_write_access *p_write);
-void GDAPI godot_pool_vector2_array_write_access_operator_assign(godot_pool_vector2_array_write_access *p_write, godot_pool_vector2_array_write_access *p_other);
-void GDAPI godot_pool_vector2_array_write_access_destroy(godot_pool_vector2_array_write_access *p_write);
-
-godot_pool_vector3_array_write_access GDAPI *godot_pool_vector3_array_write_access_copy(const godot_pool_vector3_array_write_access *p_other);
-godot_vector3 GDAPI *godot_pool_vector3_array_write_access_ptr(const godot_pool_vector3_array_write_access *p_write);
-void GDAPI godot_pool_vector3_array_write_access_operator_assign(godot_pool_vector3_array_write_access *p_write, godot_pool_vector3_array_write_access *p_other);
-void GDAPI godot_pool_vector3_array_write_access_destroy(godot_pool_vector3_array_write_access *p_write);
-
-godot_pool_color_array_write_access GDAPI *godot_pool_color_array_write_access_copy(const godot_pool_color_array_write_access *p_other);
-godot_color GDAPI *godot_pool_color_array_write_access_ptr(const godot_pool_color_array_write_access *p_write);
-void GDAPI godot_pool_color_array_write_access_operator_assign(godot_pool_color_array_write_access *p_write, godot_pool_color_array_write_access *p_other);
-void GDAPI godot_pool_color_array_write_access_destroy(godot_pool_color_array_write_access *p_write);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // GODOT_POOL_ARRAYS_H
diff --git a/modules/gdnative/include/gdnative/rect2.h b/modules/gdnative/include/gdnative/rect2.h
index 0ecf072471..f317afc9da 100644
--- a/modules/gdnative/include/gdnative/rect2.h
+++ b/modules/gdnative/include/gdnative/rect2.h
@@ -44,6 +44,13 @@ typedef struct godot_rect2 {
 } godot_rect2;
 #endif
 
+#ifndef GODOT_CORE_API_GODOT_RECT2I_TYPE_DEFINED
+#define GODOT_CORE_API_GODOT_RECT2I_TYPE_DEFINED
+typedef struct godot_rect2i {
+	uint8_t _dont_touch_that[16];
+} godot_rect2i;
+#endif
+
 // reduce extern "C" nesting for VS2013
 #ifdef __cplusplus
 }
@@ -56,11 +63,15 @@ typedef struct godot_rect2 {
 extern "C" {
 #endif
 
+// Rect2
+
 void GDAPI godot_rect2_new_with_position_and_size(godot_rect2 *r_dest, const godot_vector2 *p_pos, const godot_vector2 *p_size);
 void GDAPI godot_rect2_new(godot_rect2 *r_dest, const godot_real p_x, const godot_real p_y, const godot_real p_width, const godot_real p_height);
 
 godot_string GDAPI godot_rect2_as_string(const godot_rect2 *p_self);
 
+godot_rect2i GDAPI godot_rect2_as_rect2i(const godot_rect2 *p_self);
+
 godot_real GDAPI godot_rect2_get_area(const godot_rect2 *p_self);
 
 godot_bool GDAPI godot_rect2_intersects(const godot_rect2 *p_self, const godot_rect2 *p_b);
@@ -95,6 +106,49 @@ void GDAPI godot_rect2_set_position(godot_rect2 *p_self, const godot_vector2 *p_
 
 void GDAPI godot_rect2_set_size(godot_rect2 *p_self, const godot_vector2 *p_size);
 
+// Rect2I
+
+void GDAPI godot_rect2i_new_with_position_and_size(godot_rect2i *r_dest, const godot_vector2i *p_pos, const godot_vector2i *p_size);
+void GDAPI godot_rect2i_new(godot_rect2i *r_dest, const godot_int p_x, const godot_int p_y, const godot_int p_width, const godot_int p_height);
+
+godot_string GDAPI godot_rect2i_as_string(const godot_rect2i *p_self);
+
+godot_rect2 GDAPI godot_rect2i_as_rect2(const godot_rect2i *p_self);
+
+godot_int GDAPI godot_rect2i_get_area(const godot_rect2i *p_self);
+
+godot_bool GDAPI godot_rect2i_intersects(const godot_rect2i *p_self, const godot_rect2i *p_b);
+
+godot_bool GDAPI godot_rect2i_encloses(const godot_rect2i *p_self, const godot_rect2i *p_b);
+
+godot_bool GDAPI godot_rect2i_has_no_area(const godot_rect2i *p_self);
+
+godot_rect2i GDAPI godot_rect2i_clip(const godot_rect2i *p_self, const godot_rect2i *p_b);
+
+godot_rect2i GDAPI godot_rect2i_merge(const godot_rect2i *p_self, const godot_rect2i *p_b);
+
+godot_bool GDAPI godot_rect2i_has_point(const godot_rect2i *p_self, const godot_vector2i *p_point);
+
+godot_rect2i GDAPI godot_rect2i_grow(const godot_rect2i *p_self, const godot_int p_by);
+
+godot_rect2i GDAPI godot_rect2i_grow_individual(const godot_rect2i *p_self, const godot_int p_left, const godot_int p_top, const godot_int p_right, const godot_int p_bottom);
+
+godot_rect2i GDAPI godot_rect2i_grow_margin(const godot_rect2i *p_self, const godot_int p_margin, const godot_int p_by);
+
+godot_rect2i GDAPI godot_rect2i_abs(const godot_rect2i *p_self);
+
+godot_rect2i GDAPI godot_rect2i_expand(const godot_rect2i *p_self, const godot_vector2i *p_to);
+
+godot_bool GDAPI godot_rect2i_operator_equal(const godot_rect2i *p_self, const godot_rect2i *p_b);
+
+godot_vector2i GDAPI godot_rect2i_get_position(const godot_rect2i *p_self);
+
+godot_vector2i GDAPI godot_rect2i_get_size(const godot_rect2i *p_self);
+
+void GDAPI godot_rect2i_set_position(godot_rect2i *p_self, const godot_vector2i *p_pos);
+
+void GDAPI godot_rect2i_set_size(godot_rect2i *p_self, const godot_vector2i *p_size);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/modules/gdnative/include/gdnative/rid.h b/modules/gdnative/include/gdnative/rid.h
index 04661cedc8..73b601dc04 100644
--- a/modules/gdnative/include/gdnative/rid.h
+++ b/modules/gdnative/include/gdnative/rid.h
@@ -37,7 +37,7 @@ extern "C" {
 
 #include <stdint.h>
 
-#define GODOT_RID_SIZE sizeof(void *)
+#define GODOT_RID_SIZE sizeof(uint64_t)
 
 #ifndef GODOT_CORE_API_GODOT_RID_TYPE_DEFINED
 #define GODOT_CORE_API_GODOT_RID_TYPE_DEFINED
diff --git a/modules/gdnative/include/gdnative/string.h b/modules/gdnative/include/gdnative/string.h
index b676d21fb2..0582d95f63 100644
--- a/modules/gdnative/include/gdnative/string.h
+++ b/modules/gdnative/include/gdnative/string.h
@@ -38,10 +38,11 @@ extern "C" {
 #include <stdint.h>
 #include <wchar.h>
 
-typedef wchar_t godot_char_type;
+typedef char32_t godot_char_type;
 
 #define GODOT_STRING_SIZE sizeof(void *)
 #define GODOT_CHAR_STRING_SIZE sizeof(void *)
+#define GODOT_CHAR16_STRING_SIZE sizeof(void *)
 
 #ifndef GODOT_CORE_API_GODOT_STRING_TYPE_DEFINED
 #define GODOT_CORE_API_GODOT_STRING_TYPE_DEFINED
@@ -58,6 +59,13 @@ typedef struct {
 } godot_char_string;
 #endif
 
+#ifndef GODOT_CORE_API_GODOT_CHAR16_STRING_TYPE_DEFINED
+#define GODOT_CORE_API_GODOT_CHAR16_STRING_TYPE_DEFINED
+typedef struct {
+	uint8_t _dont_touch_that[GODOT_CHAR16_STRING_SIZE];
+} godot_char16_string;
+#endif
+
 // reduce extern "C" nesting for VS2013
 #ifdef __cplusplus
 }
@@ -75,13 +83,28 @@ godot_int GDAPI godot_char_string_length(const godot_char_string *p_cs);
 const char GDAPI *godot_char_string_get_data(const godot_char_string *p_cs);
 void GDAPI godot_char_string_destroy(godot_char_string *p_cs);
 
+godot_int GDAPI godot_char16_string_length(const godot_char16_string *p_cs);
+const char16_t GDAPI *godot_char16_string_get_data(const godot_char16_string *p_cs);
+void GDAPI godot_char16_string_destroy(godot_char16_string *p_cs);
+
 void GDAPI godot_string_new(godot_string *r_dest);
 void GDAPI godot_string_new_copy(godot_string *r_dest, const godot_string *p_src);
-void GDAPI godot_string_new_with_wide_string(godot_string *r_dest, const wchar_t *p_contents, const int p_size);
 
-const wchar_t GDAPI *godot_string_operator_index(godot_string *p_self, const godot_int p_idx);
-wchar_t GDAPI godot_string_operator_index_const(const godot_string *p_self, const godot_int p_idx);
-const wchar_t GDAPI *godot_string_wide_str(const godot_string *p_self);
+void GDAPI godot_string_new_with_latin1_chars(godot_string *r_dest, const char *p_contents);
+void GDAPI godot_string_new_with_utf8_chars(godot_string *r_dest, const char *p_contents);
+void GDAPI godot_string_new_with_utf16_chars(godot_string *r_dest, const char16_t *p_contents);
+void GDAPI godot_string_new_with_utf32_chars(godot_string *r_dest, const char32_t *p_contents);
+void GDAPI godot_string_new_with_wide_chars(godot_string *r_dest, const wchar_t *p_contents);
+
+void GDAPI godot_string_new_with_latin1_chars_and_len(godot_string *r_dest, const char *p_contents, const int p_size);
+void GDAPI godot_string_new_with_utf8_chars_and_len(godot_string *r_dest, const char *p_contents, const int p_size);
+void GDAPI godot_string_new_with_utf16_chars_and_len(godot_string *r_dest, const char16_t *p_contents, const int p_size);
+void GDAPI godot_string_new_with_utf32_chars_and_len(godot_string *r_dest, const char32_t *p_contents, const int p_size);
+void GDAPI godot_string_new_with_wide_chars_and_len(godot_string *r_dest, const wchar_t *p_contents, const int p_size);
+
+const godot_char_type GDAPI *godot_string_operator_index(godot_string *p_self, const godot_int p_idx);
+godot_char_type GDAPI godot_string_operator_index_const(const godot_string *p_self, const godot_int p_idx);
+const godot_char_type GDAPI *godot_string_get_data(const godot_string *p_self);
 
 godot_bool GDAPI godot_string_operator_equal(const godot_string *p_self, const godot_string *p_b);
 godot_bool GDAPI godot_string_operator_less(const godot_string *p_self, const godot_string *p_b);
@@ -89,7 +112,7 @@ godot_string GDAPI godot_string_operator_plus(const godot_string *p_self, const
 
 /* Standard size stuff */
 
-godot_int GDAPI godot_string_length(const godot_string *p_self);
+/*+++*/ godot_int GDAPI godot_string_length(const godot_string *p_self);
 
 /* Helpers */
 
@@ -99,25 +122,25 @@ signed char GDAPI godot_string_naturalnocasecmp_to(const godot_string *p_self, c
 
 godot_bool GDAPI godot_string_begins_with(const godot_string *p_self, const godot_string *p_string);
 godot_bool GDAPI godot_string_begins_with_char_array(const godot_string *p_self, const char *p_char_array);
-godot_array GDAPI godot_string_bigrams(const godot_string *p_self);
-godot_string GDAPI godot_string_chr(wchar_t p_character);
+godot_packed_string_array GDAPI godot_string_bigrams(const godot_string *p_self);
+godot_string GDAPI godot_string_chr(godot_char_type p_character);
 godot_bool GDAPI godot_string_ends_with(const godot_string *p_self, const godot_string *p_string);
-godot_int GDAPI godot_string_count(const godot_string *p_self, godot_string p_what, godot_int p_from, godot_int p_to);
-godot_int GDAPI godot_string_countn(const godot_string *p_self, godot_string p_what, godot_int p_from, godot_int p_to);
-godot_int GDAPI godot_string_find(const godot_string *p_self, godot_string p_what);
-godot_int GDAPI godot_string_find_from(const godot_string *p_self, godot_string p_what, godot_int p_from);
-godot_int GDAPI godot_string_findmk(const godot_string *p_self, const godot_array *p_keys);
-godot_int GDAPI godot_string_findmk_from(const godot_string *p_self, const godot_array *p_keys, godot_int p_from);
-godot_int GDAPI godot_string_findmk_from_in_place(const godot_string *p_self, const godot_array *p_keys, godot_int p_from, godot_int *r_key);
-godot_int GDAPI godot_string_findn(const godot_string *p_self, godot_string p_what);
-godot_int GDAPI godot_string_findn_from(const godot_string *p_self, godot_string p_what, godot_int p_from);
-godot_int GDAPI godot_string_find_last(const godot_string *p_self, godot_string p_what);
+godot_bool GDAPI godot_string_ends_with_char_array(const godot_string *p_self, const char *p_char_array);
+godot_int GDAPI godot_string_count(const godot_string *p_self, const godot_string *p_what, godot_int p_from, godot_int p_to);
+godot_int GDAPI godot_string_countn(const godot_string *p_self, const godot_string *p_what, godot_int p_from, godot_int p_to);
+godot_int GDAPI godot_string_find(const godot_string *p_self, const godot_string *p_what);
+godot_int GDAPI godot_string_find_from(const godot_string *p_self, const godot_string *p_what, godot_int p_from);
+godot_int GDAPI godot_string_findmk(const godot_string *p_self, const godot_packed_string_array *p_keys);
+godot_int GDAPI godot_string_findmk_from(const godot_string *p_self, const godot_packed_string_array *p_keys, godot_int p_from);
+godot_int GDAPI godot_string_findmk_from_in_place(const godot_string *p_self, const godot_packed_string_array *p_keys, godot_int p_from, godot_int *r_key);
+godot_int GDAPI godot_string_findn(const godot_string *p_self, const godot_string *p_what);
+godot_int GDAPI godot_string_findn_from(const godot_string *p_self, const godot_string *p_what, godot_int p_from);
 godot_string GDAPI godot_string_format(const godot_string *p_self, const godot_variant *p_values);
 godot_string GDAPI godot_string_format_with_custom_placeholder(const godot_string *p_self, const godot_variant *p_values, const char *p_placeholder);
 godot_string GDAPI godot_string_hex_encode_buffer(const uint8_t *p_buffer, godot_int p_len);
 godot_int GDAPI godot_string_hex_to_int(const godot_string *p_self);
-godot_int GDAPI godot_string_hex_to_int_without_prefix(const godot_string *p_self);
-godot_string GDAPI godot_string_insert(const godot_string *p_self, godot_int p_at_pos, godot_string p_string);
+godot_int GDAPI godot_string_hex_to_int_with_prefix(const godot_string *p_self);
+godot_string GDAPI godot_string_insert(const godot_string *p_self, godot_int p_at_pos, const godot_string *p_string);
 godot_bool GDAPI godot_string_is_numeric(const godot_string *p_self);
 godot_bool GDAPI godot_string_is_subsequence_of(const godot_string *p_self, const godot_string *p_string);
 godot_bool GDAPI godot_string_is_subsequence_ofi(const godot_string *p_self, const godot_string *p_string);
@@ -134,84 +157,98 @@ godot_string GDAPI godot_string_num_scientific(double p_num);
 godot_string GDAPI godot_string_num_with_decimals(double p_num, godot_int p_decimals);
 godot_string GDAPI godot_string_pad_decimals(const godot_string *p_self, godot_int p_digits);
 godot_string GDAPI godot_string_pad_zeros(const godot_string *p_self, godot_int p_digits);
-godot_string GDAPI godot_string_replace_first(const godot_string *p_self, godot_string p_key, godot_string p_with);
-godot_string GDAPI godot_string_replace(const godot_string *p_self, godot_string p_key, godot_string p_with);
-godot_string GDAPI godot_string_replacen(const godot_string *p_self, godot_string p_key, godot_string p_with);
-godot_int GDAPI godot_string_rfind(const godot_string *p_self, godot_string p_what);
-godot_int GDAPI godot_string_rfindn(const godot_string *p_self, godot_string p_what);
-godot_int GDAPI godot_string_rfind_from(const godot_string *p_self, godot_string p_what, godot_int p_from);
-godot_int GDAPI godot_string_rfindn_from(const godot_string *p_self, godot_string p_what, godot_int p_from);
+godot_string GDAPI godot_string_replace_first(const godot_string *p_self, const godot_string *p_key, const godot_string *p_with);
+godot_string GDAPI godot_string_replace(const godot_string *p_self, const godot_string *p_key, const godot_string *p_with);
+godot_string GDAPI godot_string_replacen(const godot_string *p_self, const godot_string *p_key, const godot_string *p_with);
+godot_int GDAPI godot_string_rfind(const godot_string *p_self, const godot_string *p_what);
+godot_int GDAPI godot_string_rfindn(const godot_string *p_self, const godot_string *p_what);
+godot_int GDAPI godot_string_rfind_from(const godot_string *p_self, const godot_string *p_what, godot_int p_from);
+godot_int GDAPI godot_string_rfindn_from(const godot_string *p_self, const godot_string *p_what, godot_int p_from);
 godot_string GDAPI godot_string_rpad(const godot_string *p_self, godot_int p_min_length);
 godot_string GDAPI godot_string_rpad_with_custom_character(const godot_string *p_self, godot_int p_min_length, const godot_string *p_character);
 godot_real GDAPI godot_string_similarity(const godot_string *p_self, const godot_string *p_string);
 godot_string GDAPI godot_string_sprintf(const godot_string *p_self, const godot_array *p_values, godot_bool *p_error);
 godot_string GDAPI godot_string_substr(const godot_string *p_self, godot_int p_from, godot_int p_chars);
-double GDAPI godot_string_to_double(const godot_string *p_self);
-godot_real GDAPI godot_string_to_float(const godot_string *p_self);
+double GDAPI godot_string_to_float(const godot_string *p_self);
 godot_int GDAPI godot_string_to_int(const godot_string *p_self);
 
 godot_string GDAPI godot_string_camelcase_to_underscore(const godot_string *p_self);
 godot_string GDAPI godot_string_camelcase_to_underscore_lowercased(const godot_string *p_self);
 godot_string GDAPI godot_string_capitalize(const godot_string *p_self);
-double GDAPI godot_string_char_to_double(const char *p_what);
+
+double GDAPI godot_string_char_to_float(const char *p_what);
+double GDAPI godot_string_wchar_to_float(const wchar_t *p_str, const wchar_t **r_end);
+
 godot_int GDAPI godot_string_char_to_int(const char *p_what);
-int64_t GDAPI godot_string_wchar_to_int(const wchar_t *p_str);
+godot_int GDAPI godot_string_wchar_to_int(const wchar_t *p_str);
+
 godot_int GDAPI godot_string_char_to_int_with_len(const char *p_what, godot_int p_len);
-int64_t GDAPI godot_string_char_to_int64_with_len(const wchar_t *p_str, int p_len);
-int64_t GDAPI godot_string_hex_to_int64(const godot_string *p_self);
-int64_t GDAPI godot_string_hex_to_int64_with_prefix(const godot_string *p_self);
-int64_t GDAPI godot_string_to_int64(const godot_string *p_self);
-double GDAPI godot_string_unicode_char_to_double(const wchar_t *p_str, const wchar_t **r_end);
-
-godot_int GDAPI godot_string_get_slice_count(const godot_string *p_self, godot_string p_splitter);
-godot_string GDAPI godot_string_get_slice(const godot_string *p_self, godot_string p_splitter, godot_int p_slice);
-godot_string GDAPI godot_string_get_slicec(const godot_string *p_self, wchar_t p_splitter, godot_int p_slice);
-
-godot_array GDAPI godot_string_split(const godot_string *p_self, const godot_string *p_splitter);
-godot_array GDAPI godot_string_split_allow_empty(const godot_string *p_self, const godot_string *p_splitter);
-godot_array GDAPI godot_string_split_floats(const godot_string *p_self, const godot_string *p_splitter);
-godot_array GDAPI godot_string_split_floats_allows_empty(const godot_string *p_self, const godot_string *p_splitter);
-godot_array GDAPI godot_string_split_floats_mk(const godot_string *p_self, const godot_array *p_splitters);
-godot_array GDAPI godot_string_split_floats_mk_allows_empty(const godot_string *p_self, const godot_array *p_splitters);
-godot_array GDAPI godot_string_split_ints(const godot_string *p_self, const godot_string *p_splitter);
-godot_array GDAPI godot_string_split_ints_allows_empty(const godot_string *p_self, const godot_string *p_splitter);
-godot_array GDAPI godot_string_split_ints_mk(const godot_string *p_self, const godot_array *p_splitters);
-godot_array GDAPI godot_string_split_ints_mk_allows_empty(const godot_string *p_self, const godot_array *p_splitters);
-godot_array GDAPI godot_string_split_spaces(const godot_string *p_self);
-
-wchar_t GDAPI godot_string_char_lowercase(wchar_t p_char);
-wchar_t GDAPI godot_string_char_uppercase(wchar_t p_char);
+godot_int GDAPI godot_string_wchar_to_int_with_len(const wchar_t *p_str, int p_len);
+
+godot_int GDAPI godot_string_get_slice_count(const godot_string *p_self, const godot_string *p_splitter);
+godot_string GDAPI godot_string_get_slice(const godot_string *p_self, const godot_string *p_splitter, godot_int p_slice);
+godot_string GDAPI godot_string_get_slicec(const godot_string *p_self, godot_char_type p_splitter, godot_int p_slice);
+
+godot_packed_string_array GDAPI godot_string_split(const godot_string *p_self, const godot_string *p_splitter);
+godot_packed_string_array GDAPI godot_string_split_allow_empty(const godot_string *p_self, const godot_string *p_splitter);
+godot_packed_string_array GDAPI godot_string_split_with_maxsplit(const godot_string *p_self, const godot_string *p_splitter, const godot_bool p_allow_empty, const godot_int p_maxsplit);
+
+godot_packed_string_array GDAPI godot_string_rsplit(const godot_string *p_self, const godot_string *p_splitter);
+godot_packed_string_array GDAPI godot_string_rsplit_allow_empty(const godot_string *p_self, const godot_string *p_splitter);
+godot_packed_string_array GDAPI godot_string_rsplit_with_maxsplit(const godot_string *p_self, const godot_string *p_splitter, const godot_bool p_allow_empty, const godot_int p_maxsplit);
+
+godot_packed_float32_array GDAPI godot_string_split_floats(const godot_string *p_self, const godot_string *p_splitter);
+godot_packed_float32_array GDAPI godot_string_split_floats_allow_empty(const godot_string *p_self, const godot_string *p_splitter);
+godot_packed_float32_array GDAPI godot_string_split_floats_mk(const godot_string *p_self, const godot_packed_string_array *p_splitters);
+godot_packed_float32_array GDAPI godot_string_split_floats_mk_allow_empty(const godot_string *p_self, const godot_packed_string_array *p_splitters);
+godot_packed_int32_array GDAPI godot_string_split_ints(const godot_string *p_self, const godot_string *p_splitter);
+godot_packed_int32_array GDAPI godot_string_split_ints_allow_empty(const godot_string *p_self, const godot_string *p_splitter);
+godot_packed_int32_array GDAPI godot_string_split_ints_mk(const godot_string *p_self, const godot_packed_string_array *p_splitters);
+godot_packed_int32_array GDAPI godot_string_split_ints_mk_allow_empty(const godot_string *p_self, const godot_packed_string_array *p_splitters);
+
+godot_packed_string_array GDAPI godot_string_split_spaces(const godot_string *p_self);
+
+godot_char_type GDAPI godot_string_char_lowercase(godot_char_type p_char);
+godot_char_type GDAPI godot_string_char_uppercase(godot_char_type p_char);
 godot_string GDAPI godot_string_to_lower(const godot_string *p_self);
 godot_string GDAPI godot_string_to_upper(const godot_string *p_self);
 
 godot_string GDAPI godot_string_get_basename(const godot_string *p_self);
 godot_string GDAPI godot_string_get_extension(const godot_string *p_self);
 godot_string GDAPI godot_string_left(const godot_string *p_self, godot_int p_pos);
-wchar_t GDAPI godot_string_ord_at(const godot_string *p_self, godot_int p_idx);
+godot_char_type GDAPI godot_string_ord_at(const godot_string *p_self, godot_int p_idx);
 godot_string GDAPI godot_string_plus_file(const godot_string *p_self, const godot_string *p_file);
 godot_string GDAPI godot_string_right(const godot_string *p_self, godot_int p_pos);
+godot_string GDAPI godot_string_repeat(const godot_string *p_self, godot_int p_count);
 godot_string GDAPI godot_string_strip_edges(const godot_string *p_self, godot_bool p_left, godot_bool p_right);
 godot_string GDAPI godot_string_strip_escapes(const godot_string *p_self);
 
 void GDAPI godot_string_erase(godot_string *p_self, godot_int p_pos, godot_int p_chars);
 
 godot_char_string GDAPI godot_string_ascii(const godot_string *p_self);
-godot_char_string GDAPI godot_string_ascii_extended(const godot_string *p_self);
+godot_char_string GDAPI godot_string_latin1(const godot_string *p_self);
+
 godot_char_string GDAPI godot_string_utf8(const godot_string *p_self);
 godot_bool GDAPI godot_string_parse_utf8(godot_string *p_self, const char *p_utf8);
 godot_bool GDAPI godot_string_parse_utf8_with_len(godot_string *p_self, const char *p_utf8, godot_int p_len);
-godot_string GDAPI godot_string_chars_to_utf8(const char *p_utf8);
-godot_string GDAPI godot_string_chars_to_utf8_with_len(const char *p_utf8, godot_int p_len);
+
+godot_char16_string GDAPI godot_string_utf16(const godot_string *p_self);
+godot_bool GDAPI godot_string_parse_utf16(godot_string *p_self, const char16_t *p_utf16);
+godot_bool GDAPI godot_string_parse_utf16_with_len(godot_string *p_self, const char16_t *p_utf16, godot_int p_len);
 
 uint32_t GDAPI godot_string_hash(const godot_string *p_self);
 uint64_t GDAPI godot_string_hash64(const godot_string *p_self);
+
 uint32_t GDAPI godot_string_hash_chars(const char *p_cstr);
 uint32_t GDAPI godot_string_hash_chars_with_len(const char *p_cstr, godot_int p_len);
-uint32_t GDAPI godot_string_hash_utf8_chars(const wchar_t *p_str);
-uint32_t GDAPI godot_string_hash_utf8_chars_with_len(const wchar_t *p_str, godot_int p_len);
-godot_pool_byte_array GDAPI godot_string_md5_buffer(const godot_string *p_self);
+uint32_t GDAPI godot_string_hash_wide_chars(const wchar_t *p_str);
+uint32_t GDAPI godot_string_hash_wide_chars_with_len(const wchar_t *p_str, godot_int p_len);
+
+godot_packed_byte_array GDAPI godot_string_md5_buffer(const godot_string *p_self);
 godot_string GDAPI godot_string_md5_text(const godot_string *p_self);
-godot_pool_byte_array GDAPI godot_string_sha256_buffer(const godot_string *p_self);
+godot_packed_byte_array GDAPI godot_string_sha1_buffer(const godot_string *p_self);
+godot_string GDAPI godot_string_sha1_text(const godot_string *p_self);
+godot_packed_byte_array GDAPI godot_string_sha256_buffer(const godot_string *p_self);
 godot_string GDAPI godot_string_sha256_text(const godot_string *p_self);
 
 godot_bool godot_string_empty(const godot_string *p_self);
@@ -233,14 +270,15 @@ godot_string GDAPI godot_string_c_unescape(const godot_string *p_self);
 godot_string GDAPI godot_string_http_escape(const godot_string *p_self);
 godot_string GDAPI godot_string_http_unescape(const godot_string *p_self);
 godot_string GDAPI godot_string_json_escape(const godot_string *p_self);
-godot_string GDAPI godot_string_word_wrap(const godot_string *p_self, godot_int p_chars_per_line);
 godot_string GDAPI godot_string_xml_escape(const godot_string *p_self);
 godot_string GDAPI godot_string_xml_escape_with_quotes(const godot_string *p_self);
 godot_string GDAPI godot_string_xml_unescape(const godot_string *p_self);
 
 godot_string GDAPI godot_string_percent_decode(const godot_string *p_self);
 godot_string GDAPI godot_string_percent_encode(const godot_string *p_self);
+godot_string GDAPI godot_string_join(const godot_string *p_self, const godot_packed_string_array *p_parts);
 
+godot_bool GDAPI godot_string_is_valid_filename(const godot_string *p_self);
 godot_bool GDAPI godot_string_is_valid_float(const godot_string *p_self);
 godot_bool GDAPI godot_string_is_valid_hex_number(const godot_string *p_self, godot_bool p_with_prefix);
 godot_bool GDAPI godot_string_is_valid_html_color(const godot_string *p_self);
@@ -251,8 +289,8 @@ godot_bool GDAPI godot_string_is_valid_ip_address(const godot_string *p_self);
 godot_string GDAPI godot_string_dedent(const godot_string *p_self);
 godot_string GDAPI godot_string_trim_prefix(const godot_string *p_self, const godot_string *p_prefix);
 godot_string GDAPI godot_string_trim_suffix(const godot_string *p_self, const godot_string *p_suffix);
+godot_string GDAPI godot_string_lstrip(const godot_string *p_self, const godot_string *p_chars);
 godot_string GDAPI godot_string_rstrip(const godot_string *p_self, const godot_string *p_chars);
-godot_pool_string_array GDAPI godot_string_rsplit(const godot_string *p_self, const godot_string *p_divisor, const godot_bool p_allow_empty, const godot_int p_maxsplit);
 
 void GDAPI godot_string_destroy(godot_string *p_self);
 
diff --git a/modules/gdnative/include/gdnative/variant.h b/modules/gdnative/include/gdnative/variant.h
index c65f7a28d2..0a611b76e9 100644
--- a/modules/gdnative/include/gdnative/variant.h
+++ b/modules/gdnative/include/gdnative/variant.h
@@ -37,7 +37,7 @@ extern "C" {
 
 #include <stdint.h>
 
-#define GODOT_VARIANT_SIZE (16 + sizeof(void *))
+#define GODOT_VARIANT_SIZE (16 + sizeof(int64_t))
 
 #ifndef GODOT_CORE_API_GODOT_VARIANT_TYPE_DEFINED
 #define GODOT_CORE_API_GODOT_VARIANT_TYPE_DEFINED
@@ -56,33 +56,40 @@ typedef enum godot_variant_type {
 	GODOT_VARIANT_TYPE_STRING,
 
 	// math types
-
-	GODOT_VARIANT_TYPE_VECTOR2, // 5
+	GODOT_VARIANT_TYPE_VECTOR2,
+	GODOT_VARIANT_TYPE_VECTOR2I,
 	GODOT_VARIANT_TYPE_RECT2,
+	GODOT_VARIANT_TYPE_RECT2I,
 	GODOT_VARIANT_TYPE_VECTOR3,
+	GODOT_VARIANT_TYPE_VECTOR3I,
 	GODOT_VARIANT_TYPE_TRANSFORM2D,
 	GODOT_VARIANT_TYPE_PLANE,
-	GODOT_VARIANT_TYPE_QUAT, // 10
+	GODOT_VARIANT_TYPE_QUAT,
 	GODOT_VARIANT_TYPE_AABB,
 	GODOT_VARIANT_TYPE_BASIS,
 	GODOT_VARIANT_TYPE_TRANSFORM,
 
 	// misc types
 	GODOT_VARIANT_TYPE_COLOR,
-	GODOT_VARIANT_TYPE_NODE_PATH, // 15
+	GODOT_VARIANT_TYPE_STRING_NAME,
+	GODOT_VARIANT_TYPE_NODE_PATH,
 	GODOT_VARIANT_TYPE_RID,
 	GODOT_VARIANT_TYPE_OBJECT,
+	GODOT_VARIANT_TYPE_CALLABLE,
+	GODOT_VARIANT_TYPE_SIGNAL,
 	GODOT_VARIANT_TYPE_DICTIONARY,
-	GODOT_VARIANT_TYPE_ARRAY, // 20
+	GODOT_VARIANT_TYPE_ARRAY,
 
 	// arrays
-	GODOT_VARIANT_TYPE_POOL_BYTE_ARRAY,
-	GODOT_VARIANT_TYPE_POOL_INT_ARRAY,
-	GODOT_VARIANT_TYPE_POOL_REAL_ARRAY,
-	GODOT_VARIANT_TYPE_POOL_STRING_ARRAY,
-	GODOT_VARIANT_TYPE_POOL_VECTOR2_ARRAY, // 25
-	GODOT_VARIANT_TYPE_POOL_VECTOR3_ARRAY,
-	GODOT_VARIANT_TYPE_POOL_COLOR_ARRAY,
+	GODOT_VARIANT_TYPE_PACKED_BYTE_ARRAY,
+	GODOT_VARIANT_TYPE_PACKED_INT32_ARRAY,
+	GODOT_VARIANT_TYPE_PACKED_INT64_ARRAY,
+	GODOT_VARIANT_TYPE_PACKED_FLOAT32_ARRAY,
+	GODOT_VARIANT_TYPE_PACKED_FLOAT64_ARRAY,
+	GODOT_VARIANT_TYPE_PACKED_STRING_ARRAY,
+	GODOT_VARIANT_TYPE_PACKED_VECTOR2_ARRAY,
+	GODOT_VARIANT_TYPE_PACKED_VECTOR3_ARRAY,
+	GODOT_VARIANT_TYPE_PACKED_COLOR_ARRAY,
 } godot_variant_type;
 
 typedef enum godot_variant_call_error_error {
@@ -147,15 +154,17 @@ typedef enum godot_variant_operator {
 #include <gdnative/aabb.h>
 #include <gdnative/array.h>
 #include <gdnative/basis.h>
+#include <gdnative/callable.h>
 #include <gdnative/color.h>
 #include <gdnative/dictionary.h>
 #include <gdnative/node_path.h>
+#include <gdnative/packed_arrays.h>
 #include <gdnative/plane.h>
-#include <gdnative/pool_arrays.h>
 #include <gdnative/quat.h>
 #include <gdnative/rect2.h>
 #include <gdnative/rid.h>
 #include <gdnative/string.h>
+#include <gdnative/string_name.h>
 #include <gdnative/transform.h>
 #include <gdnative/transform2d.h>
 #include <gdnative/variant.h>
@@ -179,9 +188,13 @@ void GDAPI godot_variant_new_uint(godot_variant *r_dest, const uint64_t p_i);
 void GDAPI godot_variant_new_int(godot_variant *r_dest, const int64_t p_i);
 void GDAPI godot_variant_new_real(godot_variant *r_dest, const double p_r);
 void GDAPI godot_variant_new_string(godot_variant *r_dest, const godot_string *p_s);
+void GDAPI godot_variant_new_string_name(godot_variant *r_dest, const godot_string_name *p_s);
 void GDAPI godot_variant_new_vector2(godot_variant *r_dest, const godot_vector2 *p_v2);
+void GDAPI godot_variant_new_vector2i(godot_variant *r_dest, const godot_vector2i *p_v2);
 void GDAPI godot_variant_new_rect2(godot_variant *r_dest, const godot_rect2 *p_rect2);
+void GDAPI godot_variant_new_rect2i(godot_variant *r_dest, const godot_rect2i *p_rect2);
 void GDAPI godot_variant_new_vector3(godot_variant *r_dest, const godot_vector3 *p_v3);
+void GDAPI godot_variant_new_vector3i(godot_variant *r_dest, const godot_vector3i *p_v3);
 void GDAPI godot_variant_new_transform2d(godot_variant *r_dest, const godot_transform2d *p_t2d);
 void GDAPI godot_variant_new_plane(godot_variant *r_dest, const godot_plane *p_plane);
 void GDAPI godot_variant_new_quat(godot_variant *r_dest, const godot_quat *p_quat);
@@ -191,25 +204,33 @@ void GDAPI godot_variant_new_transform(godot_variant *r_dest, const godot_transf
 void GDAPI godot_variant_new_color(godot_variant *r_dest, const godot_color *p_color);
 void GDAPI godot_variant_new_node_path(godot_variant *r_dest, const godot_node_path *p_np);
 void GDAPI godot_variant_new_rid(godot_variant *r_dest, const godot_rid *p_rid);
+void GDAPI godot_variant_new_callable(godot_variant *r_dest, const godot_callable *p_callable);
+void GDAPI godot_variant_new_signal(godot_variant *r_dest, const godot_signal *p_signal);
 void GDAPI godot_variant_new_object(godot_variant *r_dest, const godot_object *p_obj);
 void GDAPI godot_variant_new_dictionary(godot_variant *r_dest, const godot_dictionary *p_dict);
 void GDAPI godot_variant_new_array(godot_variant *r_dest, const godot_array *p_arr);
-void GDAPI godot_variant_new_pool_byte_array(godot_variant *r_dest, const godot_pool_byte_array *p_pba);
-void GDAPI godot_variant_new_pool_int_array(godot_variant *r_dest, const godot_pool_int_array *p_pia);
-void GDAPI godot_variant_new_pool_real_array(godot_variant *r_dest, const godot_pool_real_array *p_pra);
-void GDAPI godot_variant_new_pool_string_array(godot_variant *r_dest, const godot_pool_string_array *p_psa);
-void GDAPI godot_variant_new_pool_vector2_array(godot_variant *r_dest, const godot_pool_vector2_array *p_pv2a);
-void GDAPI godot_variant_new_pool_vector3_array(godot_variant *r_dest, const godot_pool_vector3_array *p_pv3a);
-void GDAPI godot_variant_new_pool_color_array(godot_variant *r_dest, const godot_pool_color_array *p_pca);
+void GDAPI godot_variant_new_packed_byte_array(godot_variant *r_dest, const godot_packed_byte_array *p_pba);
+void GDAPI godot_variant_new_packed_int32_array(godot_variant *r_dest, const godot_packed_int32_array *p_pia);
+void GDAPI godot_variant_new_packed_int64_array(godot_variant *r_dest, const godot_packed_int64_array *p_pia);
+void GDAPI godot_variant_new_packed_float32_array(godot_variant *r_dest, const godot_packed_float32_array *p_pra);
+void GDAPI godot_variant_new_packed_float64_array(godot_variant *r_dest, const godot_packed_float64_array *p_pra);
+void GDAPI godot_variant_new_packed_string_array(godot_variant *r_dest, const godot_packed_string_array *p_psa);
+void GDAPI godot_variant_new_packed_vector2_array(godot_variant *r_dest, const godot_packed_vector2_array *p_pv2a);
+void GDAPI godot_variant_new_packed_vector3_array(godot_variant *r_dest, const godot_packed_vector3_array *p_pv3a);
+void GDAPI godot_variant_new_packed_color_array(godot_variant *r_dest, const godot_packed_color_array *p_pca);
 
 godot_bool GDAPI godot_variant_as_bool(const godot_variant *p_self);
 uint64_t GDAPI godot_variant_as_uint(const godot_variant *p_self);
 int64_t GDAPI godot_variant_as_int(const godot_variant *p_self);
 double GDAPI godot_variant_as_real(const godot_variant *p_self);
 godot_string GDAPI godot_variant_as_string(const godot_variant *p_self);
+godot_string_name GDAPI godot_variant_as_string_name(const godot_variant *p_self);
 godot_vector2 GDAPI godot_variant_as_vector2(const godot_variant *p_self);
+godot_vector2i GDAPI godot_variant_as_vector2i(const godot_variant *p_self);
 godot_rect2 GDAPI godot_variant_as_rect2(const godot_variant *p_self);
+godot_rect2i GDAPI godot_variant_as_rect2i(const godot_variant *p_self);
 godot_vector3 GDAPI godot_variant_as_vector3(const godot_variant *p_self);
+godot_vector3i GDAPI godot_variant_as_vector3i(const godot_variant *p_self);
 godot_transform2d GDAPI godot_variant_as_transform2d(const godot_variant *p_self);
 godot_plane GDAPI godot_variant_as_plane(const godot_variant *p_self);
 godot_quat GDAPI godot_variant_as_quat(const godot_variant *p_self);
@@ -219,16 +240,20 @@ godot_transform GDAPI godot_variant_as_transform(const godot_variant *p_self);
 godot_color GDAPI godot_variant_as_color(const godot_variant *p_self);
 godot_node_path GDAPI godot_variant_as_node_path(const godot_variant *p_self);
 godot_rid GDAPI godot_variant_as_rid(const godot_variant *p_self);
+godot_callable GDAPI godot_variant_as_callable(const godot_variant *p_self);
+godot_signal GDAPI godot_variant_as_signal(const godot_variant *p_self);
 godot_object GDAPI *godot_variant_as_object(const godot_variant *p_self);
 godot_dictionary GDAPI godot_variant_as_dictionary(const godot_variant *p_self);
 godot_array GDAPI godot_variant_as_array(const godot_variant *p_self);
-godot_pool_byte_array GDAPI godot_variant_as_pool_byte_array(const godot_variant *p_self);
-godot_pool_int_array GDAPI godot_variant_as_pool_int_array(const godot_variant *p_self);
-godot_pool_real_array GDAPI godot_variant_as_pool_real_array(const godot_variant *p_self);
-godot_pool_string_array GDAPI godot_variant_as_pool_string_array(const godot_variant *p_self);
-godot_pool_vector2_array GDAPI godot_variant_as_pool_vector2_array(const godot_variant *p_self);
-godot_pool_vector3_array GDAPI godot_variant_as_pool_vector3_array(const godot_variant *p_self);
-godot_pool_color_array GDAPI godot_variant_as_pool_color_array(const godot_variant *p_self);
+godot_packed_byte_array GDAPI godot_variant_as_packed_byte_array(const godot_variant *p_self);
+godot_packed_int32_array GDAPI godot_variant_as_packed_int32_array(const godot_variant *p_self);
+godot_packed_int64_array GDAPI godot_variant_as_packed_int64_array(const godot_variant *p_self);
+godot_packed_float32_array GDAPI godot_variant_as_packed_float32_array(const godot_variant *p_self);
+godot_packed_float64_array GDAPI godot_variant_as_packed_float64_array(const godot_variant *p_self);
+godot_packed_string_array GDAPI godot_variant_as_packed_string_array(const godot_variant *p_self);
+godot_packed_vector2_array GDAPI godot_variant_as_packed_vector2_array(const godot_variant *p_self);
+godot_packed_vector3_array GDAPI godot_variant_as_packed_vector3_array(const godot_variant *p_self);
+godot_packed_color_array GDAPI godot_variant_as_packed_color_array(const godot_variant *p_self);
 
 godot_variant GDAPI godot_variant_call(godot_variant *p_self, const godot_string *p_method, const godot_variant **p_args, const godot_int p_argcount, godot_variant_call_error *r_error);
 
@@ -237,6 +262,7 @@ godot_bool GDAPI godot_variant_has_method(const godot_variant *p_self, const god
 godot_bool GDAPI godot_variant_operator_equal(const godot_variant *p_self, const godot_variant *p_other);
 godot_bool GDAPI godot_variant_operator_less(const godot_variant *p_self, const godot_variant *p_other);
 
+uint32_t GDAPI godot_variant_hash(const godot_variant *p_self);
 godot_bool GDAPI godot_variant_hash_compare(const godot_variant *p_self, const godot_variant *p_other);
 
 godot_bool GDAPI godot_variant_booleanize(const godot_variant *p_self);
diff --git a/modules/gdnative/include/gdnative/vector2.h b/modules/gdnative/include/gdnative/vector2.h
index 15a1a6063b..35b02c5a75 100644
--- a/modules/gdnative/include/gdnative/vector2.h
+++ b/modules/gdnative/include/gdnative/vector2.h
@@ -46,6 +46,15 @@ typedef struct {
 } godot_vector2;
 #endif
 
+#define GODOT_VECTOR2I_SIZE 8
+
+#ifndef GODOT_CORE_API_GODOT_VECTOR2I_TYPE_DEFINED
+#define GODOT_CORE_API_GODOT_VECTOR2I_TYPE_DEFINED
+typedef struct {
+	uint8_t _dont_touch_that[GODOT_VECTOR2I_SIZE];
+} godot_vector2i;
+#endif
+
 // reduce extern "C" nesting for VS2013
 #ifdef __cplusplus
 }
@@ -57,10 +66,14 @@ typedef struct {
 extern "C" {
 #endif
 
+// Vector2
+
 void GDAPI godot_vector2_new(godot_vector2 *r_dest, const godot_real p_x, const godot_real p_y);
 
 godot_string GDAPI godot_vector2_as_string(const godot_vector2 *p_self);
 
+godot_vector2i GDAPI godot_vector2_as_vector2i(const godot_vector2 *p_self);
+
 godot_vector2 GDAPI godot_vector2_normalized(const godot_vector2 *p_self);
 
 godot_real GDAPI godot_vector2_length(const godot_vector2 *p_self);
@@ -81,7 +94,7 @@ godot_real GDAPI godot_vector2_angle_to(const godot_vector2 *p_self, const godot
 
 godot_real GDAPI godot_vector2_angle_to_point(const godot_vector2 *p_self, const godot_vector2 *p_to);
 
-godot_vector2 GDAPI godot_vector2_linear_interpolate(const godot_vector2 *p_self, const godot_vector2 *p_b, const godot_real p_t);
+godot_vector2 GDAPI godot_vector2_lerp(const godot_vector2 *p_self, const godot_vector2 *p_b, const godot_real p_t);
 
 godot_vector2 GDAPI godot_vector2_cubic_interpolate(const godot_vector2 *p_self, const godot_vector2 *p_b, const godot_vector2 *p_pre_a, const godot_vector2 *p_post_b, const godot_real p_t);
 
@@ -93,6 +106,8 @@ godot_vector2 GDAPI godot_vector2_tangent(const godot_vector2 *p_self);
 
 godot_vector2 GDAPI godot_vector2_floor(const godot_vector2 *p_self);
 
+godot_vector2 GDAPI godot_vector2_sign(const godot_vector2 *p_self);
+
 godot_vector2 GDAPI godot_vector2_snapped(const godot_vector2 *p_self, const godot_vector2 *p_by);
 
 godot_real GDAPI godot_vector2_aspect(const godot_vector2 *p_self);
@@ -135,6 +150,46 @@ godot_real GDAPI godot_vector2_get_x(const godot_vector2 *p_self);
 
 godot_real GDAPI godot_vector2_get_y(const godot_vector2 *p_self);
 
+// Vector2i
+
+void GDAPI godot_vector2i_new(godot_vector2i *r_dest, const godot_int p_x, const godot_int p_y);
+
+godot_string GDAPI godot_vector2i_as_string(const godot_vector2i *p_self);
+
+godot_vector2 GDAPI godot_vector2i_as_vector2(const godot_vector2i *p_self);
+
+godot_real GDAPI godot_vector2i_aspect(const godot_vector2i *p_self);
+
+godot_vector2i GDAPI godot_vector2i_abs(const godot_vector2i *p_self);
+
+godot_vector2i GDAPI godot_vector2i_sign(const godot_vector2i *p_self);
+
+godot_vector2i GDAPI godot_vector2i_operator_add(const godot_vector2i *p_self, const godot_vector2i *p_b);
+
+godot_vector2i GDAPI godot_vector2i_operator_subtract(const godot_vector2i *p_self, const godot_vector2i *p_b);
+
+godot_vector2i GDAPI godot_vector2i_operator_multiply_vector(const godot_vector2i *p_self, const godot_vector2i *p_b);
+
+godot_vector2i GDAPI godot_vector2i_operator_multiply_scalar(const godot_vector2i *p_self, const godot_int p_b);
+
+godot_vector2i GDAPI godot_vector2i_operator_divide_vector(const godot_vector2i *p_self, const godot_vector2i *p_b);
+
+godot_vector2i GDAPI godot_vector2i_operator_divide_scalar(const godot_vector2i *p_self, const godot_int p_b);
+
+godot_bool GDAPI godot_vector2i_operator_equal(const godot_vector2i *p_self, const godot_vector2i *p_b);
+
+godot_bool GDAPI godot_vector2i_operator_less(const godot_vector2i *p_self, const godot_vector2i *p_b);
+
+godot_vector2i GDAPI godot_vector2i_operator_neg(const godot_vector2i *p_self);
+
+void GDAPI godot_vector2i_set_x(godot_vector2i *p_self, const godot_int p_x);
+
+void GDAPI godot_vector2i_set_y(godot_vector2i *p_self, const godot_int p_y);
+
+godot_int GDAPI godot_vector2i_get_x(const godot_vector2i *p_self);
+
+godot_int GDAPI godot_vector2i_get_y(const godot_vector2i *p_self);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/modules/gdnative/include/gdnative/vector3.h b/modules/gdnative/include/gdnative/vector3.h
index 1b344590ea..5127b8789b 100644
--- a/modules/gdnative/include/gdnative/vector3.h
+++ b/modules/gdnative/include/gdnative/vector3.h
@@ -46,6 +46,15 @@ typedef struct {
 } godot_vector3;
 #endif
 
+#define GODOT_VECTOR3I_SIZE 12
+
+#ifndef GODOT_CORE_API_GODOT_VECTOR3I_TYPE_DEFINED
+#define GODOT_CORE_API_GODOT_VECTOR3I_TYPE_DEFINED
+typedef struct {
+	uint8_t _dont_touch_that[GODOT_VECTOR3I_SIZE];
+} godot_vector3i;
+#endif
+
 // reduce extern "C" nesting for VS2013
 #ifdef __cplusplus
 }
@@ -64,10 +73,14 @@ typedef enum {
 	GODOT_VECTOR3_AXIS_Z,
 } godot_vector3_axis;
 
+// Vector3
+
 void GDAPI godot_vector3_new(godot_vector3 *r_dest, const godot_real p_x, const godot_real p_y, const godot_real p_z);
 
 godot_string GDAPI godot_vector3_as_string(const godot_vector3 *p_self);
 
+godot_vector3i GDAPI godot_vector3_as_vector3i(const godot_vector3 *p_self);
+
 godot_int GDAPI godot_vector3_min_axis(const godot_vector3 *p_self);
 
 godot_int GDAPI godot_vector3_max_axis(const godot_vector3 *p_self);
@@ -86,7 +99,7 @@ godot_vector3 GDAPI godot_vector3_snapped(const godot_vector3 *p_self, const god
 
 godot_vector3 GDAPI godot_vector3_rotated(const godot_vector3 *p_self, const godot_vector3 *p_axis, const godot_real p_phi);
 
-godot_vector3 GDAPI godot_vector3_linear_interpolate(const godot_vector3 *p_self, const godot_vector3 *p_b, const godot_real p_t);
+godot_vector3 GDAPI godot_vector3_lerp(const godot_vector3 *p_self, const godot_vector3 *p_b, const godot_real p_t);
 
 godot_vector3 GDAPI godot_vector3_cubic_interpolate(const godot_vector3 *p_self, const godot_vector3 *p_b, const godot_vector3 *p_pre_a, const godot_vector3 *p_post_b, const godot_real p_t);
 
@@ -102,6 +115,8 @@ godot_basis GDAPI godot_vector3_to_diagonal_matrix(const godot_vector3 *p_self);
 
 godot_vector3 GDAPI godot_vector3_abs(const godot_vector3 *p_self);
 
+godot_vector3 GDAPI godot_vector3_sign(const godot_vector3 *p_self);
+
 godot_vector3 GDAPI godot_vector3_floor(const godot_vector3 *p_self);
 
 godot_vector3 GDAPI godot_vector3_ceil(const godot_vector3 *p_self);
@@ -142,6 +157,44 @@ void GDAPI godot_vector3_set_axis(godot_vector3 *p_self, const godot_vector3_axi
 
 godot_real GDAPI godot_vector3_get_axis(const godot_vector3 *p_self, const godot_vector3_axis p_axis);
 
+// Vector3i
+
+void GDAPI godot_vector3i_new(godot_vector3i *r_dest, const godot_int p_x, const godot_int p_y, const godot_int p_z);
+
+godot_string GDAPI godot_vector3i_as_string(const godot_vector3i *p_self);
+
+godot_vector3 GDAPI godot_vector3i_as_vector3(const godot_vector3i *p_self);
+
+godot_int GDAPI godot_vector3i_min_axis(const godot_vector3i *p_self);
+
+godot_int GDAPI godot_vector3i_max_axis(const godot_vector3i *p_self);
+
+godot_vector3i GDAPI godot_vector3i_abs(const godot_vector3i *p_self);
+
+godot_vector3i GDAPI godot_vector3i_sign(const godot_vector3i *p_self);
+
+godot_vector3i GDAPI godot_vector3i_operator_add(const godot_vector3i *p_self, const godot_vector3i *p_b);
+
+godot_vector3i GDAPI godot_vector3i_operator_subtract(const godot_vector3i *p_self, const godot_vector3i *p_b);
+
+godot_vector3i GDAPI godot_vector3i_operator_multiply_vector(const godot_vector3i *p_self, const godot_vector3i *p_b);
+
+godot_vector3i GDAPI godot_vector3i_operator_multiply_scalar(const godot_vector3i *p_self, const godot_int p_b);
+
+godot_vector3i GDAPI godot_vector3i_operator_divide_vector(const godot_vector3i *p_self, const godot_vector3i *p_b);
+
+godot_vector3i GDAPI godot_vector3i_operator_divide_scalar(const godot_vector3i *p_self, const godot_int p_b);
+
+godot_bool GDAPI godot_vector3i_operator_equal(const godot_vector3i *p_self, const godot_vector3i *p_b);
+
+godot_bool GDAPI godot_vector3i_operator_less(const godot_vector3i *p_self, const godot_vector3i *p_b);
+
+godot_vector3i GDAPI godot_vector3i_operator_neg(const godot_vector3i *p_self);
+
+void GDAPI godot_vector3i_set_axis(godot_vector3i *p_self, const godot_vector3_axis p_axis, const godot_int p_val);
+
+godot_int GDAPI godot_vector3i_get_axis(const godot_vector3i *p_self, const godot_vector3_axis p_axis);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/modules/gdnative/include/nativescript/godot_nativescript.h b/modules/gdnative/include/nativescript/godot_nativescript.h
index d2ed4fb3e5..825033c99c 100644
--- a/modules/gdnative/include/nativescript/godot_nativescript.h
+++ b/modules/gdnative/include/nativescript/godot_nativescript.h
@@ -42,12 +42,10 @@ typedef enum {
 	GODOT_METHOD_RPC_MODE_REMOTE,
 	GODOT_METHOD_RPC_MODE_MASTER,
 	GODOT_METHOD_RPC_MODE_PUPPET,
-	GODOT_METHOD_RPC_MODE_SLAVE = GODOT_METHOD_RPC_MODE_PUPPET,
 	GODOT_METHOD_RPC_MODE_REMOTESYNC,
-	GODOT_METHOD_RPC_MODE_SYNC = GODOT_METHOD_RPC_MODE_REMOTESYNC,
 	GODOT_METHOD_RPC_MODE_MASTERSYNC,
 	GODOT_METHOD_RPC_MODE_PUPPETSYNC,
-} godot_method_rpc_mode;
+} godot_nativescript_method_rpc_mode;
 
 typedef enum {
 	GODOT_PROPERTY_HINT_NONE, ///< no hint provided.
@@ -56,7 +54,6 @@ typedef enum {
 	GODOT_PROPERTY_HINT_ENUM, ///< hint_text= "val1,val2,val3,etc"
 	GODOT_PROPERTY_HINT_EXP_EASING, /// exponential easing function (Math::ease)
 	GODOT_PROPERTY_HINT_LENGTH, ///< hint_text= "length" (as integer)
-	GODOT_PROPERTY_HINT_SPRITE_FRAME, // FIXME: Obsolete: drop whenever we can break compat
 	GODOT_PROPERTY_HINT_KEY_ACCEL, ///< hint_text= "length" (as integer)
 	GODOT_PROPERTY_HINT_FLAGS, ///< hint_text= "flag1,flag2,etc" (as bit flags)
 	GODOT_PROPERTY_HINT_LAYERS_2D_RENDER,
@@ -85,7 +82,7 @@ typedef enum {
 	GODOT_PROPERTY_HINT_PROPERTY_OF_INSTANCE, ///< a property of an instance
 	GODOT_PROPERTY_HINT_PROPERTY_OF_SCRIPT, ///< a property of a script & base
 	GODOT_PROPERTY_HINT_MAX,
-} godot_property_hint;
+} godot_nativescript_property_hint;
 
 typedef enum {
 
@@ -98,8 +95,7 @@ typedef enum {
 	GODOT_PROPERTY_USAGE_INTERNATIONALIZED = 64, //hint for internationalized strings
 	GODOT_PROPERTY_USAGE_GROUP = 128, //used for grouping props in the editor
 	GODOT_PROPERTY_USAGE_CATEGORY = 256,
-	GODOT_PROPERTY_USAGE_STORE_IF_NONZERO = 512, // FIXME: Obsolete: drop whenever we can break compat
-	GODOT_PROPERTY_USAGE_STORE_IF_NONONE = 1024, // FIXME: Obsolete: drop whenever we can break compat
+	GODOT_PROPERTY_USAGE_SUBGROUP = 512,
 	GODOT_PROPERTY_USAGE_NO_INSTANCE_STATE = 2048,
 	GODOT_PROPERTY_USAGE_RESTART_IF_CHANGED = 4096,
 	GODOT_PROPERTY_USAGE_SCRIPT_VARIABLE = 8192,
@@ -110,106 +106,95 @@ typedef enum {
 	GODOT_PROPERTY_USAGE_DEFAULT = GODOT_PROPERTY_USAGE_STORAGE | GODOT_PROPERTY_USAGE_EDITOR | GODOT_PROPERTY_USAGE_NETWORK,
 	GODOT_PROPERTY_USAGE_DEFAULT_INTL = GODOT_PROPERTY_USAGE_STORAGE | GODOT_PROPERTY_USAGE_EDITOR | GODOT_PROPERTY_USAGE_NETWORK | GODOT_PROPERTY_USAGE_INTERNATIONALIZED,
 	GODOT_PROPERTY_USAGE_NOEDITOR = GODOT_PROPERTY_USAGE_STORAGE | GODOT_PROPERTY_USAGE_NETWORK,
-} godot_property_usage_flags;
+} godot_nativescript_property_usage_flags;
 
 typedef struct {
-	godot_method_rpc_mode rset_type;
+	godot_nativescript_method_rpc_mode rset_type;
 
 	godot_int type;
-	godot_property_hint hint;
+	godot_nativescript_property_hint hint;
 	godot_string hint_string;
-	godot_property_usage_flags usage;
+	godot_nativescript_property_usage_flags usage;
 	godot_variant default_value;
-} godot_property_attributes;
+} godot_nativescript_property_attributes;
 
 typedef struct {
 	// instance pointer, method_data - return user data
 	GDCALLINGCONV void *(*create_func)(godot_object *, void *);
 	void *method_data;
 	GDCALLINGCONV void (*free_func)(void *);
-} godot_instance_create_func;
+} godot_nativescript_instance_create_func;
 
 typedef struct {
 	// instance pointer, method data, user data
 	GDCALLINGCONV void (*destroy_func)(godot_object *, void *, void *);
 	void *method_data;
 	GDCALLINGCONV void (*free_func)(void *);
-} godot_instance_destroy_func;
+} godot_nativescript_instance_destroy_func;
 
-void GDAPI godot_nativescript_register_class(void *p_gdnative_handle, const char *p_name, const char *p_base, godot_instance_create_func p_create_func, godot_instance_destroy_func p_destroy_func);
+void GDAPI godot_nativescript_register_class(void *p_gdnative_handle, const char *p_name, const char *p_base, godot_nativescript_instance_create_func p_create_func, godot_nativescript_instance_destroy_func p_destroy_func);
 
-void GDAPI godot_nativescript_register_tool_class(void *p_gdnative_handle, const char *p_name, const char *p_base, godot_instance_create_func p_create_func, godot_instance_destroy_func p_destroy_func);
+void GDAPI godot_nativescript_register_tool_class(void *p_gdnative_handle, const char *p_name, const char *p_base, godot_nativescript_instance_create_func p_create_func, godot_nativescript_instance_destroy_func p_destroy_func);
 
 typedef struct {
-	godot_method_rpc_mode rpc_type;
-} godot_method_attributes;
+	godot_nativescript_method_rpc_mode rpc_type;
+} godot_nativescript_method_attributes;
+
+typedef struct {
+	godot_string name;
+
+	godot_variant_type type;
+	godot_nativescript_property_hint hint;
+	godot_string hint_string;
+} godot_nativescript_method_argument;
 
 typedef struct {
 	// instance pointer, method data, user data, num args, args - return result as varaint
 	GDCALLINGCONV godot_variant (*method)(godot_object *, void *, void *, int, godot_variant **);
 	void *method_data;
 	GDCALLINGCONV void (*free_func)(void *);
-} godot_instance_method;
+} godot_nativescript_instance_method;
 
-void GDAPI godot_nativescript_register_method(void *p_gdnative_handle, const char *p_name, const char *p_function_name, godot_method_attributes p_attr, godot_instance_method p_method);
+void GDAPI godot_nativescript_register_method(void *p_gdnative_handle, const char *p_name, const char *p_function_name, godot_nativescript_method_attributes p_attr, godot_nativescript_instance_method p_method);
+void GDAPI godot_nativescript_set_method_argument_information(void *p_gdnative_handle, const char *p_name, const char *p_function_name, int p_num_args, const godot_nativescript_method_argument *p_args);
 
 typedef struct {
 	// instance pointer, method data, user data, value
 	GDCALLINGCONV void (*set_func)(godot_object *, void *, void *, godot_variant *);
 	void *method_data;
 	GDCALLINGCONV void (*free_func)(void *);
-} godot_property_set_func;
+} godot_nativescript_property_set_func;
 
 typedef struct {
 	// instance pointer, method data, user data, value
 	GDCALLINGCONV godot_variant (*get_func)(godot_object *, void *, void *);
 	void *method_data;
 	GDCALLINGCONV void (*free_func)(void *);
-} godot_property_get_func;
+} godot_nativescript_property_get_func;
 
-void GDAPI godot_nativescript_register_property(void *p_gdnative_handle, const char *p_name, const char *p_path, godot_property_attributes *p_attr, godot_property_set_func p_set_func, godot_property_get_func p_get_func);
+void GDAPI godot_nativescript_register_property(void *p_gdnative_handle, const char *p_name, const char *p_path, godot_nativescript_property_attributes *p_attr, godot_nativescript_property_set_func p_set_func, godot_nativescript_property_get_func p_get_func);
 
 typedef struct {
 	godot_string name;
 	godot_int type;
-	godot_property_hint hint;
+	godot_nativescript_property_hint hint;
 	godot_string hint_string;
-	godot_property_usage_flags usage;
+	godot_nativescript_property_usage_flags usage;
 	godot_variant default_value;
-} godot_signal_argument;
+} godot_nativescript_signal_argument;
 
 typedef struct {
 	godot_string name;
 	int num_args;
-	godot_signal_argument *args;
+	godot_nativescript_signal_argument *args;
 	int num_default_args;
 	godot_variant *default_args;
-} godot_signal;
+} godot_nativescript_signal;
 
-void GDAPI godot_nativescript_register_signal(void *p_gdnative_handle, const char *p_name, const godot_signal *p_signal);
+void GDAPI godot_nativescript_register_signal(void *p_gdnative_handle, const char *p_name, const godot_nativescript_signal *p_signal);
 
 void GDAPI *godot_nativescript_get_userdata(godot_object *p_instance);
 
-/*
- *
- *
- * NativeScript 1.1
- *
- *
- */
-
-// method registering with argument names
-
-typedef struct {
-	godot_string name;
-
-	godot_variant_type type;
-	godot_property_hint hint;
-	godot_string hint_string;
-} godot_method_arg;
-
-void GDAPI godot_nativescript_set_method_argument_information(void *p_gdnative_handle, const char *p_name, const char *p_function_name, int p_num_args, const godot_method_arg *p_args);
-
 // documentation
 
 void GDAPI godot_nativescript_set_class_documentation(void *p_gdnative_handle, const char *p_name, godot_string p_documentation);
@@ -234,9 +219,9 @@ typedef struct {
 	GDCALLINGCONV bool (*refcount_decremented_instance_binding)(void *, godot_object *);
 	void *data;
 	GDCALLINGCONV void (*free_func)(void *);
-} godot_instance_binding_functions;
+} godot_nativescript_instance_binding_functions;
 
-int GDAPI godot_nativescript_register_instance_binding_data_functions(godot_instance_binding_functions p_binding_functions);
+int GDAPI godot_nativescript_register_instance_binding_data_functions(godot_nativescript_instance_binding_functions p_binding_functions);
 void GDAPI godot_nativescript_unregister_instance_binding_data_functions(int p_idx);
 
 void GDAPI *godot_nativescript_get_instance_binding_data(int p_idx, godot_object *p_object);
diff --git a/modules/gdnative/include/net/godot_net.h b/modules/gdnative/include/net/godot_net.h
index d245f3b965..42804112f2 100644
--- a/modules/gdnative/include/net/godot_net.h
+++ b/modules/gdnative/include/net/godot_net.h
@@ -45,7 +45,6 @@ extern "C" {
 #define GODOT_NET_API_MINOR 1
 
 typedef struct {
-
 	godot_gdnative_api_version version; /* version of our API */
 	godot_object *data; /* User reference */
 
diff --git a/modules/gdnative/include/pluginscript/godot_pluginscript.h b/modules/gdnative/include/pluginscript/godot_pluginscript.h
index e8822fc1ec..406c3ba663 100644
--- a/modules/gdnative/include/pluginscript/godot_pluginscript.h
+++ b/modules/gdnative/include/pluginscript/godot_pluginscript.h
@@ -44,13 +44,12 @@ typedef void godot_pluginscript_language_data;
 
 // --- Instance ---
 
-// TODO: use godot_string_name for faster lookup ?
 typedef struct {
 	godot_pluginscript_instance_data *(*init)(godot_pluginscript_script_data *p_data, godot_object *p_owner);
 	void (*finish)(godot_pluginscript_instance_data *p_data);
 
-	godot_bool (*set_prop)(godot_pluginscript_instance_data *p_data, const godot_string *p_name, const godot_variant *p_value);
-	godot_bool (*get_prop)(godot_pluginscript_instance_data *p_data, const godot_string *p_name, godot_variant *r_ret);
+	godot_bool (*set_prop)(godot_pluginscript_instance_data *p_data, const godot_string_name *p_name, const godot_variant *p_value);
+	godot_bool (*get_prop)(godot_pluginscript_instance_data *p_data, const godot_string_name *p_name, godot_variant *r_ret);
 
 	godot_variant (*call_method)(godot_pluginscript_instance_data *p_data,
 			const godot_string_name *p_method, const godot_variant **p_args,
@@ -61,7 +60,7 @@ typedef struct {
 	//this is used by script languages that keep a reference counter of their own
 	//you can make make Ref<> not die when it reaches zero, so deleting the reference
 	//depends entirely from the script.
-	// Note: You can set those function pointer to NULL if not needed.
+	// Note: You can set those function pointer to nullptr  if not needed.
 	void (*refcount_incremented)(godot_pluginscript_instance_data *p_data);
 	bool (*refcount_decremented)(godot_pluginscript_instance_data *p_data); // return true if it can die
 } godot_pluginscript_instance_desc;
@@ -120,31 +119,31 @@ typedef struct {
 	const char *name;
 	const char *type;
 	const char *extension;
-	const char **recognized_extensions; // NULL terminated array
+	const char **recognized_extensions; // nullptr  terminated array
 	godot_pluginscript_language_data *(*init)();
 	void (*finish)(godot_pluginscript_language_data *p_data);
-	const char **reserved_words; // NULL terminated array
-	const char **comment_delimiters; // NULL terminated array
-	const char **string_delimiters; // NULL terminated array
+	const char **reserved_words; // nullptr  terminated array
+	const char **comment_delimiters; // nullptr  terminated array
+	const char **string_delimiters; // nullptr  terminated array
 	godot_bool has_named_classes;
 	godot_bool supports_builtin_mode;
 
 	godot_string (*get_template_source_code)(godot_pluginscript_language_data *p_data, const godot_string *p_class_name, const godot_string *p_base_class_name);
-	godot_bool (*validate)(godot_pluginscript_language_data *p_data, const godot_string *p_script, int *r_line_error, int *r_col_error, godot_string *r_test_error, const godot_string *p_path, godot_pool_string_array *r_functions);
-	int (*find_function)(godot_pluginscript_language_data *p_data, const godot_string *p_function, const godot_string *p_code); // Can be NULL
-	godot_string (*make_function)(godot_pluginscript_language_data *p_data, const godot_string *p_class, const godot_string *p_name, const godot_pool_string_array *p_args);
+	godot_bool (*validate)(godot_pluginscript_language_data *p_data, const godot_string *p_script, int *r_line_error, int *r_col_error, godot_string *r_test_error, const godot_string *p_path, godot_packed_string_array *r_functions);
+	int (*find_function)(godot_pluginscript_language_data *p_data, const godot_string *p_function, const godot_string *p_code); // Can be nullptr
+	godot_string (*make_function)(godot_pluginscript_language_data *p_data, const godot_string *p_class, const godot_string *p_name, const godot_packed_string_array *p_args);
 	godot_error (*complete_code)(godot_pluginscript_language_data *p_data, const godot_string *p_code, const godot_string *p_path, godot_object *p_owner, godot_array *r_options, godot_bool *r_force, godot_string *r_call_hint);
 	void (*auto_indent_code)(godot_pluginscript_language_data *p_data, godot_string *p_code, int p_from_line, int p_to_line);
 
-	void (*add_global_constant)(godot_pluginscript_language_data *p_data, const godot_string *p_variable, const godot_variant *p_value);
+	void (*add_global_constant)(godot_pluginscript_language_data *p_data, const godot_string_name *p_variable, const godot_variant *p_value);
 	godot_string (*debug_get_error)(godot_pluginscript_language_data *p_data);
 	int (*debug_get_stack_level_count)(godot_pluginscript_language_data *p_data);
 	int (*debug_get_stack_level_line)(godot_pluginscript_language_data *p_data, int p_level);
 	godot_string (*debug_get_stack_level_function)(godot_pluginscript_language_data *p_data, int p_level);
 	godot_string (*debug_get_stack_level_source)(godot_pluginscript_language_data *p_data, int p_level);
-	void (*debug_get_stack_level_locals)(godot_pluginscript_language_data *p_data, int p_level, godot_pool_string_array *p_locals, godot_array *p_values, int p_max_subitems, int p_max_depth);
-	void (*debug_get_stack_level_members)(godot_pluginscript_language_data *p_data, int p_level, godot_pool_string_array *p_members, godot_array *p_values, int p_max_subitems, int p_max_depth);
-	void (*debug_get_globals)(godot_pluginscript_language_data *p_data, godot_pool_string_array *p_locals, godot_array *p_values, int p_max_subitems, int p_max_depth);
+	void (*debug_get_stack_level_locals)(godot_pluginscript_language_data *p_data, int p_level, godot_packed_string_array *p_locals, godot_array *p_values, int p_max_subitems, int p_max_depth);
+	void (*debug_get_stack_level_members)(godot_pluginscript_language_data *p_data, int p_level, godot_packed_string_array *p_members, godot_array *p_values, int p_max_subitems, int p_max_depth);
+	void (*debug_get_globals)(godot_pluginscript_language_data *p_data, godot_packed_string_array *p_locals, godot_array *p_values, int p_max_subitems, int p_max_depth);
 	godot_string (*debug_parse_stack_level_expression)(godot_pluginscript_language_data *p_data, int p_level, const godot_string *p_expression, int p_max_subitems, int p_max_depth);
 
 	// TODO: could this stuff be moved to the godot_pluginscript_language_desc ?
diff --git a/modules/gdnative/include/videodecoder/godot_videodecoder.h b/modules/gdnative/include/videodecoder/godot_videodecoder.h
index 714991ca72..16c92abd22 100644
--- a/modules/gdnative/include/videodecoder/godot_videodecoder.h
+++ b/modules/gdnative/include/videodecoder/godot_videodecoder.h
@@ -46,7 +46,7 @@ typedef struct
 	void *next;
 	void *(*constructor)(godot_object *);
 	void (*destructor)(void *);
-	const char *(*get_plugin_name)(void);
+	const char *(*get_plugin_name)();
 	const char **(*get_supported_extensions)(int *count);
 	godot_bool (*open_file)(void *, void *); // data struct, and a FileAccess pointer
 	godot_real (*get_length)(const void *);
@@ -54,7 +54,7 @@ typedef struct
 	void (*seek)(void *, godot_real);
 	void (*set_audio_track)(void *, godot_int);
 	void (*update)(void *, godot_real);
-	godot_pool_byte_array *(*get_videoframe)(void *);
+	godot_packed_byte_array *(*get_videoframe)(void *);
 	godot_int (*get_audioframe)(void *, float *, int);
 	godot_int (*get_channels)(const void *);
 	godot_int (*get_mix_rate)(const void *);
diff --git a/modules/gdnative/include/arvr/godot_arvr.h b/modules/gdnative/include/xr/godot_xr.h
index aaef31a855..22f7f021c4 100644
--- a/modules/gdnative/include/arvr/godot_arvr.h
+++ b/modules/gdnative/include/xr/godot_xr.h
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  godot_arvr.h                                                         */
+/*  godot_xr.h                                                           */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GODOT_NATIVEARVR_H
-#define GODOT_NATIVEARVR_H
+#ifndef GODOT_NATIVEXR_H
+#define GODOT_NATIVEXR_H
 
 #include <gdnative/gdnative.h>
 
@@ -61,32 +61,31 @@ typedef struct {
 	void (*fill_projection_for_eye)(void *, godot_real *, godot_int, godot_real, godot_real, godot_real);
 	void (*commit_for_eye)(void *, godot_int, godot_rid *, godot_rect2 *);
 	void (*process)(void *);
-	// only in 1.1 onwards
 	godot_int (*get_external_texture_for_eye)(void *, godot_int);
 	void (*notification)(void *, godot_int);
 	godot_int (*get_camera_feed_id)(void *);
-} godot_arvr_interface_gdnative;
+} godot_xr_interface_gdnative;
 
-void GDAPI godot_arvr_register_interface(const godot_arvr_interface_gdnative *p_interface);
+void GDAPI godot_xr_register_interface(const godot_xr_interface_gdnative *p_interface);
 
-// helper functions to access ARVRServer data
-godot_real GDAPI godot_arvr_get_worldscale();
-godot_transform GDAPI godot_arvr_get_reference_frame();
+// helper functions to access XRServer data
+godot_real GDAPI godot_xr_get_worldscale();
+godot_transform GDAPI godot_xr_get_reference_frame();
 
 // helper functions for rendering
-void GDAPI godot_arvr_blit(godot_int p_eye, godot_rid *p_render_target, godot_rect2 *p_rect);
-godot_int GDAPI godot_arvr_get_texid(godot_rid *p_render_target);
+void GDAPI godot_xr_blit(godot_int p_eye, godot_rid *p_render_target, godot_rect2 *p_rect);
+godot_int GDAPI godot_xr_get_texid(godot_rid *p_render_target);
 
-// helper functions for updating ARVR controllers
-godot_int GDAPI godot_arvr_add_controller(char *p_device_name, godot_int p_hand, godot_bool p_tracks_orientation, godot_bool p_tracks_position);
-void GDAPI godot_arvr_remove_controller(godot_int p_controller_id);
-void GDAPI godot_arvr_set_controller_transform(godot_int p_controller_id, godot_transform *p_transform, godot_bool p_tracks_orientation, godot_bool p_tracks_position);
-void GDAPI godot_arvr_set_controller_button(godot_int p_controller_id, godot_int p_button, godot_bool p_is_pressed);
-void GDAPI godot_arvr_set_controller_axis(godot_int p_controller_id, godot_int p_axis, godot_real p_value, godot_bool p_can_be_negative);
-godot_real GDAPI godot_arvr_get_controller_rumble(godot_int p_controller_id);
+// helper functions for updating XR controllers
+godot_int GDAPI godot_xr_add_controller(char *p_device_name, godot_int p_hand, godot_bool p_tracks_orientation, godot_bool p_tracks_position);
+void GDAPI godot_xr_remove_controller(godot_int p_controller_id);
+void GDAPI godot_xr_set_controller_transform(godot_int p_controller_id, godot_transform *p_transform, godot_bool p_tracks_orientation, godot_bool p_tracks_position);
+void GDAPI godot_xr_set_controller_button(godot_int p_controller_id, godot_int p_button, godot_bool p_is_pressed);
+void GDAPI godot_xr_set_controller_axis(godot_int p_controller_id, godot_int p_axis, godot_real p_value, godot_bool p_can_be_negative);
+godot_real GDAPI godot_xr_get_controller_rumble(godot_int p_controller_id);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* !GODOT_NATIVEARVR_H */
+#endif /* !GODOT_NATIVEXR_H */
diff --git a/modules/gdnative/nativescript/SCsub b/modules/gdnative/nativescript/SCsub
index 92c9d6630d..4212e87a87 100644
--- a/modules/gdnative/nativescript/SCsub
+++ b/modules/gdnative/nativescript/SCsub
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_gdnative')
+Import("env")
+Import("env_gdnative")
 
-env_gdnative.add_source_files(env.modules_sources, '*.cpp')
+env_gdnative.add_source_files(env.modules_sources, "*.cpp")
 
-if "platform" in env and env["platform"] in ["x11", "iphone"]:
+if "platform" in env and env["platform"] in ["linuxbsd", "iphone"]:
     env.Append(LINKFLAGS=["-rdynamic"])
diff --git a/modules/gdnative/nativescript/api_generator.cpp b/modules/gdnative/nativescript/api_generator.cpp
index 850871579b..8dbaec4e75 100644
--- a/modules/gdnative/nativescript/api_generator.cpp
+++ b/modules/gdnative/nativescript/api_generator.cpp
@@ -41,12 +41,11 @@
 // helper stuff
 
 static Error save_file(const String &p_path, const List<String> &p_content) {
-
 	FileAccessRef file = FileAccess::open(p_path, FileAccess::WRITE);
 
 	ERR_FAIL_COND_V(!file, ERR_FILE_CANT_WRITE);
 
-	for (const List<String>::Element *e = p_content.front(); e != NULL; e = e->next()) {
+	for (const List<String>::Element *e = p_content.front(); e != nullptr; e = e->next()) {
 		file->store_string(e->get());
 	}
 
@@ -98,7 +97,7 @@ struct SignalAPI {
 
 struct EnumAPI {
 	String name;
-	List<Pair<int, String> > values;
+	List<Pair<int, String>> values;
 };
 
 struct ClassAPI {
@@ -140,13 +139,12 @@ static String get_type_name(const PropertyInfo &info) {
 }
 
 /*
- * Some comparison helper functions we need 
+ * Some comparison helper functions we need
  */
 
 struct MethodInfoComparator {
 	StringName::AlphCompare compare;
 	bool operator()(const MethodInfo &p_a, const MethodInfo &p_b) const {
-
 		return compare(p_a.name, p_b.name);
 	}
 };
@@ -154,7 +152,6 @@ struct MethodInfoComparator {
 struct PropertyInfoComparator {
 	StringName::AlphCompare compare;
 	bool operator()(const PropertyInfo &p_a, const PropertyInfo &p_b) const {
-
 		return compare(p_a.name, p_b.name);
 	}
 };
@@ -162,7 +159,6 @@ struct PropertyInfoComparator {
 struct ConstantAPIComparator {
 	NoCaseComparator compare;
 	bool operator()(const ConstantAPI &p_a, const ConstantAPI &p_b) const {
-
 		return compare(p_a.constant_name, p_b.constant_name);
 	}
 };
@@ -171,7 +167,6 @@ struct ConstantAPIComparator {
  * Reads the entire Godot API to a list
  */
 List<ClassAPI> generate_c_api_classes() {
-
 	List<ClassAPI> api;
 
 	List<StringName> classes;
@@ -181,10 +176,10 @@ List<ClassAPI> generate_c_api_classes() {
 	// Register global constants as a fake GlobalConstants singleton class
 	{
 		ClassAPI global_constants_api;
-		global_constants_api.class_name = L"GlobalConstants";
+		global_constants_api.class_name = "GlobalConstants";
 		global_constants_api.api_type = ClassDB::API_CORE;
 		global_constants_api.is_singleton = true;
-		global_constants_api.singleton_name = L"GlobalConstants";
+		global_constants_api.singleton_name = "GlobalConstants";
 		global_constants_api.is_instanciable = false;
 		const int constants_count = GlobalConstants::get_global_constant_count();
 		for (int i = 0; i < constants_count; ++i) {
@@ -197,7 +192,7 @@ List<ClassAPI> generate_c_api_classes() {
 		api.push_back(global_constants_api);
 	}
 
-	for (List<StringName>::Element *e = classes.front(); e != NULL; e = e->next()) {
+	for (List<StringName>::Element *e = classes.front(); e != nullptr; e = e->next()) {
 		StringName class_name = e->get();
 
 		ClassAPI class_api;
@@ -219,7 +214,7 @@ List<ClassAPI> generate_c_api_classes() {
 		{
 			List<StringName> inheriters;
 			ClassDB::get_inheriters_from_class("Reference", &inheriters);
-			bool is_reference = !!inheriters.find(class_name);
+			bool is_reference = !!inheriters.find(class_name) || class_name == "Reference";
 			// @Unclear
 			class_api.is_reference = !class_api.is_singleton && is_reference;
 		}
@@ -229,7 +224,7 @@ List<ClassAPI> generate_c_api_classes() {
 			List<String> constant;
 			ClassDB::get_integer_constant_list(class_name, &constant, true);
 			constant.sort_custom<NoCaseComparator>();
-			for (List<String>::Element *c = constant.front(); c != NULL; c = c->next()) {
+			for (List<String>::Element *c = constant.front(); c != nullptr; c = c->next()) {
 				ConstantAPI constant_api;
 				constant_api.constant_name = c->get();
 				constant_api.constant_value = ClassDB::get_integer_constant(class_name, c->get());
@@ -284,7 +279,7 @@ List<ClassAPI> generate_c_api_classes() {
 			ClassDB::get_property_list(class_name, &properties, true);
 			properties.sort_custom<PropertyInfoComparator>();
 
-			for (List<PropertyInfo>::Element *p = properties.front(); p != NULL; p = p->next()) {
+			for (List<PropertyInfo>::Element *p = properties.front(); p != nullptr; p = p->next()) {
 				PropertyAPI property_api;
 
 				property_api.name = p->get().name;
@@ -312,7 +307,7 @@ List<ClassAPI> generate_c_api_classes() {
 			ClassDB::get_method_list(class_name, &methods, true);
 			methods.sort_custom<MethodInfoComparator>();
 
-			for (List<MethodInfo>::Element *m = methods.front(); m != NULL; m = m->next()) {
+			for (List<MethodInfo>::Element *m = methods.front(); m != nullptr; m = m->next()) {
 				MethodAPI method_api;
 				MethodBind *method_bind = ClassDB::get_method(class_name, m->get().name);
 				MethodInfo &method_info = m->get();
@@ -392,10 +387,10 @@ List<ClassAPI> generate_c_api_classes() {
 				enum_api.name = E->get();
 				ClassDB::get_enum_constants(class_name, E->get(), &value_names, true);
 				for (List<StringName>::Element *val_e = value_names.front(); val_e; val_e = val_e->next()) {
-					int int_val = ClassDB::get_integer_constant(class_name, val_e->get(), NULL);
+					int int_val = ClassDB::get_integer_constant(class_name, val_e->get(), nullptr);
 					enum_api.values.push_back(Pair<int, String>(int_val, val_e->get()));
 				}
-				enum_api.values.sort_custom<PairSort<int, String> >();
+				enum_api.values.sort_custom<PairSort<int, String>>();
 				class_api.enums.push_back(enum_api);
 			}
 		}
@@ -410,14 +405,13 @@ List<ClassAPI> generate_c_api_classes() {
  * Generates the JSON source from the API in p_api
  */
 static List<String> generate_c_api_json(const List<ClassAPI> &p_api) {
-
 	// I'm sorry for the \t mess
 
 	List<String> source;
 
 	source.push_back("[\n");
 
-	for (const List<ClassAPI>::Element *c = p_api.front(); c != NULL; c = c->next()) {
+	for (const List<ClassAPI>::Element *c = p_api.front(); c != nullptr; c = c->next()) {
 		ClassAPI api = c->get();
 
 		source.push_back("\t{\n");
@@ -458,6 +452,7 @@ static List<String> generate_c_api_json(const List<ClassAPI> &p_api) {
 				source.push_back("\t\t\t\t\t{\n");
 				source.push_back("\t\t\t\t\t\t\"name\": \"" + e->get().argument_names[i] + "\",\n");
 				source.push_back("\t\t\t\t\t\t\"type\": \"" + e->get().argument_types[i] + "\",\n");
+				source.push_back(String("\t\t\t\t\t\t\"has_default_value\": ") + (e->get().default_arguments.has(i) ? "true" : "false") + ",\n");
 				source.push_back("\t\t\t\t\t\t\"default_value\": \"" + (e->get().default_arguments.has(i) ? (String)e->get().default_arguments[i] : "") + "\"\n");
 				source.push_back(String("\t\t\t\t\t}") + ((i < e->get().argument_names.size() - 1) ? "," : "") + "\n");
 			}
@@ -497,7 +492,7 @@ static List<String> generate_c_api_json(const List<ClassAPI> &p_api) {
 			source.push_back("\t\t\t{\n");
 			source.push_back("\t\t\t\t\"name\": \"" + e->get().name + "\",\n");
 			source.push_back("\t\t\t\t\"values\": {\n");
-			for (List<Pair<int, String> >::Element *val_e = e->get().values.front(); val_e; val_e = val_e->next()) {
+			for (List<Pair<int, String>>::Element *val_e = e->get().values.front(); val_e; val_e = val_e->next()) {
 				source.push_back("\t\t\t\t\t\"" + val_e->get().second + "\": " + itos(val_e->get().first));
 				source.push_back(String((val_e->next() ? "," : "")) + "\n");
 			}
@@ -520,7 +515,6 @@ static List<String> generate_c_api_json(const List<ClassAPI> &p_api) {
  *  p_path
  */
 Error generate_c_api(const String &p_path) {
-
 #ifndef TOOLS_ENABLED
 	return ERR_BUG;
 #else
diff --git a/modules/gdnative/nativescript/godot_nativescript.cpp b/modules/gdnative/nativescript/godot_nativescript.cpp
index e19e675344..e47548f3e9 100644
--- a/modules/gdnative/nativescript/godot_nativescript.cpp
+++ b/modules/gdnative/nativescript/godot_nativescript.cpp
@@ -36,6 +36,7 @@
 #include "core/project_settings.h"
 #include "core/variant.h"
 #include "gdnative/gdnative.h"
+#include <stdint.h>
 
 #include "nativescript.h"
 
@@ -50,8 +51,7 @@ extern "C" void _native_script_hook() {
 
 // Script API
 
-void GDAPI godot_nativescript_register_class(void *p_gdnative_handle, const char *p_name, const char *p_base, godot_instance_create_func p_create_func, godot_instance_destroy_func p_destroy_func) {
-
+void GDAPI godot_nativescript_register_class(void *p_gdnative_handle, const char *p_name, const char *p_base, godot_nativescript_instance_create_func p_create_func, godot_nativescript_instance_destroy_func p_destroy_func) {
 	String *s = (String *)p_gdnative_handle;
 
 	Map<StringName, NativeScriptDesc> *classes = &NSL->library_classes[*s];
@@ -67,16 +67,23 @@ void GDAPI godot_nativescript_register_class(void *p_gdnative_handle, const char
 	if (classes->has(p_base)) {
 		desc.base_data = &(*classes)[p_base];
 		desc.base_native_type = desc.base_data->base_native_type;
+
+		const NativeScriptDesc *b = desc.base_data;
+		while (b) {
+			desc.rpc_count += b->rpc_count;
+			desc.rset_count += b->rset_count;
+			b = b->base_data;
+		}
+
 	} else {
-		desc.base_data = NULL;
+		desc.base_data = nullptr;
 		desc.base_native_type = p_base;
 	}
 
 	classes->insert(p_name, desc);
 }
 
-void GDAPI godot_nativescript_register_tool_class(void *p_gdnative_handle, const char *p_name, const char *p_base, godot_instance_create_func p_create_func, godot_instance_destroy_func p_destroy_func) {
-
+void GDAPI godot_nativescript_register_tool_class(void *p_gdnative_handle, const char *p_name, const char *p_base, godot_nativescript_instance_create_func p_create_func, godot_nativescript_instance_destroy_func p_destroy_func) {
 	String *s = (String *)p_gdnative_handle;
 
 	Map<StringName, NativeScriptDesc> *classes = &NSL->library_classes[*s];
@@ -87,20 +94,29 @@ void GDAPI godot_nativescript_register_tool_class(void *p_gdnative_handle, const
 	desc.destroy_func = p_destroy_func;
 	desc.is_tool = true;
 	desc.base = p_base;
+	desc.rpc_count = 0;
+	desc.rset_count = 0;
 
 	if (classes->has(p_base)) {
 		desc.base_data = &(*classes)[p_base];
 		desc.base_native_type = desc.base_data->base_native_type;
+
+		const NativeScriptDesc *b = desc.base_data;
+		while (b) {
+			desc.rpc_count += b->rpc_count;
+			desc.rset_count += b->rset_count;
+			b = b->base_data;
+		}
+
 	} else {
-		desc.base_data = NULL;
+		desc.base_data = nullptr;
 		desc.base_native_type = p_base;
 	}
 
 	classes->insert(p_name, desc);
 }
 
-void GDAPI godot_nativescript_register_method(void *p_gdnative_handle, const char *p_name, const char *p_function_name, godot_method_attributes p_attr, godot_instance_method p_method) {
-
+void GDAPI godot_nativescript_register_method(void *p_gdnative_handle, const char *p_name, const char *p_function_name, godot_nativescript_method_attributes p_attr, godot_nativescript_instance_method p_method) {
 	String *s = (String *)p_gdnative_handle;
 
 	Map<StringName, NativeScriptDesc>::Element *E = NSL->library_classes[*s].find(p_name);
@@ -109,13 +125,17 @@ void GDAPI godot_nativescript_register_method(void *p_gdnative_handle, const cha
 	NativeScriptDesc::Method method;
 	method.method = p_method;
 	method.rpc_mode = p_attr.rpc_type;
+	method.rpc_method_id = UINT16_MAX;
+	if (p_attr.rpc_type != GODOT_METHOD_RPC_MODE_DISABLED) {
+		method.rpc_method_id = E->get().rpc_count;
+		E->get().rpc_count += 1;
+	}
 	method.info = MethodInfo(p_function_name);
 
 	E->get().methods.insert(p_function_name, method);
 }
 
-void GDAPI godot_nativescript_register_property(void *p_gdnative_handle, const char *p_name, const char *p_path, godot_property_attributes *p_attr, godot_property_set_func p_set_func, godot_property_get_func p_get_func) {
-
+void GDAPI godot_nativescript_register_property(void *p_gdnative_handle, const char *p_name, const char *p_path, godot_nativescript_property_attributes *p_attr, godot_nativescript_property_set_func p_set_func, godot_nativescript_property_get_func p_get_func) {
 	String *s = (String *)p_gdnative_handle;
 
 	Map<StringName, NativeScriptDesc>::Element *E = NSL->library_classes[*s].find(p_name);
@@ -125,6 +145,10 @@ void GDAPI godot_nativescript_register_property(void *p_gdnative_handle, const c
 	property.default_value = *(Variant *)&p_attr->default_value;
 	property.getter = p_get_func;
 	property.rset_mode = p_attr->rset_type;
+	if (p_attr->rset_type != GODOT_METHOD_RPC_MODE_DISABLED) {
+		property.rset_property_id = E->get().rset_count;
+		E->get().rset_count += 1;
+	}
 	property.setter = p_set_func;
 	property.info = PropertyInfo((Variant::Type)p_attr->type,
 			p_path,
@@ -135,8 +159,7 @@ void GDAPI godot_nativescript_register_property(void *p_gdnative_handle, const c
 	E->get().properties.insert(p_path, property);
 }
 
-void GDAPI godot_nativescript_register_signal(void *p_gdnative_handle, const char *p_name, const godot_signal *p_signal) {
-
+void GDAPI godot_nativescript_register_signal(void *p_gdnative_handle, const char *p_name, const godot_nativescript_signal *p_signal) {
 	String *s = (String *)p_gdnative_handle;
 
 	Map<StringName, NativeScriptDesc>::Element *E = NSL->library_classes[*s].find(p_name);
@@ -148,7 +171,7 @@ void GDAPI godot_nativescript_register_signal(void *p_gdnative_handle, const cha
 	for (int i = 0; i < p_signal->num_args; i++) {
 		PropertyInfo info;
 
-		godot_signal_argument arg = p_signal->args[i];
+		godot_nativescript_signal_argument arg = p_signal->args[i];
 
 		info.hint = (PropertyHint)arg.hint;
 		info.hint_string = *(String *)&arg.hint_string;
@@ -161,7 +184,7 @@ void GDAPI godot_nativescript_register_signal(void *p_gdnative_handle, const cha
 
 	for (int i = 0; i < p_signal->num_default_args; i++) {
 		Variant *v;
-		godot_signal_argument attrib = p_signal->args[i];
+		godot_nativescript_signal_argument attrib = p_signal->args[i];
 
 		v = (Variant *)&attrib.default_value;
 
@@ -181,12 +204,13 @@ void GDAPI godot_nativescript_register_signal(void *p_gdnative_handle, const cha
 
 void GDAPI *godot_nativescript_get_userdata(godot_object *p_instance) {
 	Object *instance = (Object *)p_instance;
-	if (!instance)
-		return NULL;
+	if (!instance) {
+		return nullptr;
+	}
 	if (instance->get_script_instance() && instance->get_script_instance()->get_language() == NativeScriptLanguage::get_singleton()) {
 		return ((NativeScriptInstance *)instance->get_script_instance())->userdata;
 	}
-	return NULL;
+	return nullptr;
 }
 
 /*
@@ -197,7 +221,7 @@ void GDAPI *godot_nativescript_get_userdata(godot_object *p_instance) {
  *
  */
 
-void GDAPI godot_nativescript_set_method_argument_information(void *p_gdnative_handle, const char *p_name, const char *p_function_name, int p_num_args, const godot_method_arg *p_args) {
+void GDAPI godot_nativescript_set_method_argument_information(void *p_gdnative_handle, const char *p_name, const char *p_function_name, int p_num_args, const godot_nativescript_method_argument *p_args) {
 	String *s = (String *)p_gdnative_handle;
 
 	Map<StringName, NativeScriptDesc>::Element *E = NSL->library_classes[*s].find(p_name);
@@ -211,7 +235,7 @@ void GDAPI godot_nativescript_set_method_argument_information(void *p_gdnative_h
 	List<PropertyInfo> args;
 
 	for (int i = 0; i < p_num_args; i++) {
-		godot_method_arg arg = p_args[i];
+		godot_nativescript_method_argument arg = p_args[i];
 		String name = *(String *)&arg.name;
 		String hint_string = *(String *)&arg.hint_string;
 
@@ -287,25 +311,25 @@ void GDAPI godot_nativescript_set_type_tag(void *p_gdnative_handle, const char *
 }
 
 const void GDAPI *godot_nativescript_get_type_tag(const godot_object *p_object) {
-
 	const Object *o = (Object *)p_object;
 
 	if (!o->get_script_instance()) {
-		return NULL;
+		return nullptr;
 	} else {
 		NativeScript *script = Object::cast_to<NativeScript>(o->get_script_instance()->get_script().ptr());
 		if (!script) {
-			return NULL;
+			return nullptr;
 		}
 
-		if (script->get_script_desc())
+		if (script->get_script_desc()) {
 			return script->get_script_desc()->type_tag;
+		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
-int GDAPI godot_nativescript_register_instance_binding_data_functions(godot_instance_binding_functions p_binding_functions) {
+int GDAPI godot_nativescript_register_instance_binding_data_functions(godot_nativescript_instance_binding_functions p_binding_functions) {
 	return NativeScriptLanguage::get_singleton()->register_binding_functions(p_binding_functions);
 }
 
diff --git a/modules/gdnative/nativescript/nativescript.cpp b/modules/gdnative/nativescript/nativescript.cpp
index 7a5a7bbc3a..632f4e5fee 100644
--- a/modules/gdnative/nativescript/nativescript.cpp
+++ b/modules/gdnative/nativescript/nativescript.cpp
@@ -30,6 +30,8 @@
 
 #include "nativescript.h"
 
+#include <stdint.h>
+
 #include "gdnative/gdnative.h"
 
 #include "core/core_string_names.h"
@@ -109,6 +111,13 @@ void NativeScript::_placeholder_erased(PlaceHolderScriptInstance *p_placeholder)
 
 #endif
 
+bool NativeScript::inherits_script(const Ref<Script> &p_script) const {
+#ifndef _MSC_VER
+#warning inheritance needs to be implemented in NativeScript
+#endif
+	return false;
+}
+
 void NativeScript::set_class_name(String p_class_name) {
 	class_name = p_class_name;
 }
@@ -160,7 +169,6 @@ String NativeScript::get_script_class_icon_path() const {
 }
 
 bool NativeScript::can_instance() const {
-
 	NativeScriptDesc *script_data = get_script_desc();
 
 #ifdef TOOLS_ENABLED
@@ -176,8 +184,9 @@ bool NativeScript::can_instance() const {
 Ref<Script> NativeScript::get_base_script() const {
 	NativeScriptDesc *script_data = get_script_desc();
 
-	if (!script_data)
+	if (!script_data) {
 		return Ref<Script>();
+	}
 
 	NativeScript *script = (NativeScript *)NSL->create_script();
 	Ref<NativeScript> ns = Ref<NativeScript>(script);
@@ -191,18 +200,18 @@ Ref<Script> NativeScript::get_base_script() const {
 StringName NativeScript::get_instance_base_type() const {
 	NativeScriptDesc *script_data = get_script_desc();
 
-	if (!script_data)
+	if (!script_data) {
 		return "";
+	}
 
 	return script_data->base_native_type;
 }
 
 ScriptInstance *NativeScript::instance_create(Object *p_this) {
-
 	NativeScriptDesc *script_data = get_script_desc();
 
 	if (!script_data) {
-		return NULL;
+		return nullptr;
 	}
 
 	NativeScriptInstance *nsi = memnew(NativeScriptInstance);
@@ -212,7 +221,7 @@ ScriptInstance *NativeScript::instance_create(Object *p_this) {
 
 #ifndef TOOLS_ENABLED
 	if (!ScriptServer::is_scripting_enabled()) {
-		nsi->userdata = NULL;
+		nsi->userdata = nullptr;
 	} else {
 		nsi->userdata = script_data->create_func.create_func((godot_object *)p_this, script_data->create_func.method_data);
 	}
@@ -220,15 +229,11 @@ ScriptInstance *NativeScript::instance_create(Object *p_this) {
 	nsi->userdata = script_data->create_func.create_func((godot_object *)p_this, script_data->create_func.method_data);
 #endif
 
-#ifndef NO_THREADS
-	owners_lock->lock();
-#endif
-
-	instance_owners.insert(p_this);
+	{
+		MutexLock lock(owners_lock);
 
-#ifndef NO_THREADS
-	owners_lock->unlock();
-#endif
+		instance_owners.insert(p_this);
+	}
 
 	return nsi;
 }
@@ -242,7 +247,7 @@ PlaceHolderScriptInstance *NativeScript::placeholder_instance_create(Object *p_t
 
 	return sins;
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -269,8 +274,9 @@ bool NativeScript::has_method(const StringName &p_method) const {
 	NativeScriptDesc *script_data = get_script_desc();
 
 	while (script_data) {
-		if (script_data->methods.has(p_method))
+		if (script_data->methods.has(p_method)) {
 			return true;
+		}
 
 		script_data = script_data->base_data;
 	}
@@ -280,14 +286,16 @@ bool NativeScript::has_method(const StringName &p_method) const {
 MethodInfo NativeScript::get_method_info(const StringName &p_method) const {
 	NativeScriptDesc *script_data = get_script_desc();
 
-	if (!script_data)
+	if (!script_data) {
 		return MethodInfo();
+	}
 
 	while (script_data) {
 		Map<StringName, NativeScriptDesc::Method>::Element *M = script_data->methods.find(p_method);
 
-		if (M)
+		if (M) {
 			return M->get().info;
+		}
 
 		script_data = script_data->base_data;
 	}
@@ -301,8 +309,9 @@ bool NativeScript::is_valid() const {
 bool NativeScript::is_tool() const {
 	NativeScriptDesc *script_data = get_script_desc();
 
-	if (script_data)
+	if (script_data) {
 		return script_data->is_tool;
+	}
 
 	return false;
 }
@@ -315,8 +324,9 @@ bool NativeScript::has_script_signal(const StringName &p_signal) const {
 	NativeScriptDesc *script_data = get_script_desc();
 
 	while (script_data) {
-		if (script_data->signals_.has(p_signal))
+		if (script_data->signals_.has(p_signal)) {
 			return true;
+		}
 		script_data = script_data->base_data;
 	}
 	return false;
@@ -325,13 +335,13 @@ bool NativeScript::has_script_signal(const StringName &p_signal) const {
 void NativeScript::get_script_signal_list(List<MethodInfo> *r_signals) const {
 	NativeScriptDesc *script_data = get_script_desc();
 
-	if (!script_data)
+	if (!script_data) {
 		return;
+	}
 
 	Set<MethodInfo> signals_;
 
 	while (script_data) {
-
 		for (Map<StringName, NativeScriptDesc::Signal>::Element *S = script_data->signals_.front(); S; S = S->next()) {
 			signals_.insert(S->get().signal);
 		}
@@ -352,8 +362,9 @@ bool NativeScript::get_property_default_value(const StringName &p_property, Vari
 		P = script_data->properties.find(p_property);
 		script_data = script_data->base_data;
 	}
-	if (!P)
+	if (!P) {
 		return false;
+	}
 
 	r_value = P.get().default_value;
 	return true;
@@ -365,13 +376,13 @@ void NativeScript::update_exports() {
 void NativeScript::get_script_method_list(List<MethodInfo> *p_list) const {
 	NativeScriptDesc *script_data = get_script_desc();
 
-	if (!script_data)
+	if (!script_data) {
 		return;
+	}
 
 	Set<MethodInfo> methods;
 
 	while (script_data) {
-
 		for (Map<StringName, NativeScriptDesc::Method>::Element *E = script_data->methods.front(); E; E = E->next()) {
 			methods.insert(E->get().info);
 		}
@@ -402,6 +413,247 @@ void NativeScript::get_script_property_list(List<PropertyInfo> *p_list) const {
 	}
 }
 
+Vector<ScriptNetData> NativeScript::get_rpc_methods() const {
+	Vector<ScriptNetData> v;
+
+	NativeScriptDesc *script_data = get_script_desc();
+
+	while (script_data) {
+		for (Map<StringName, NativeScriptDesc::Method>::Element *E = script_data->methods.front(); E; E = E->next()) {
+			if (E->get().rpc_mode != GODOT_METHOD_RPC_MODE_DISABLED) {
+				ScriptNetData nd;
+				nd.name = E->key();
+				nd.mode = MultiplayerAPI::RPCMode(E->get().rpc_mode);
+				v.push_back(nd);
+			}
+		}
+
+		script_data = script_data->base_data;
+	}
+
+	return v;
+}
+
+uint16_t NativeScript::get_rpc_method_id(const StringName &p_method) const {
+	NativeScriptDesc *script_data = get_script_desc();
+
+	while (script_data) {
+		Map<StringName, NativeScriptDesc::Method>::Element *E = script_data->methods.find(p_method);
+		if (E) {
+			return E->get().rpc_method_id;
+		}
+
+		script_data = script_data->base_data;
+	}
+
+	return UINT16_MAX;
+}
+
+StringName NativeScript::get_rpc_method(uint16_t p_id) const {
+	ERR_FAIL_COND_V(p_id == UINT16_MAX, StringName());
+
+	NativeScriptDesc *script_data = get_script_desc();
+
+	while (script_data) {
+		for (Map<StringName, NativeScriptDesc::Method>::Element *E = script_data->methods.front(); E; E = E->next()) {
+			if (E->get().rpc_method_id == p_id) {
+				return E->key();
+			}
+		}
+
+		script_data = script_data->base_data;
+	}
+
+	return StringName();
+}
+
+MultiplayerAPI::RPCMode NativeScript::get_rpc_mode_by_id(uint16_t p_id) const {
+	ERR_FAIL_COND_V(p_id == UINT16_MAX, MultiplayerAPI::RPC_MODE_DISABLED);
+
+	NativeScriptDesc *script_data = get_script_desc();
+
+	while (script_data) {
+		for (Map<StringName, NativeScriptDesc::Method>::Element *E = script_data->methods.front(); E; E = E->next()) {
+			if (E->get().rpc_method_id == p_id) {
+				switch (E->get().rpc_mode) {
+					case GODOT_METHOD_RPC_MODE_DISABLED:
+						return MultiplayerAPI::RPC_MODE_DISABLED;
+					case GODOT_METHOD_RPC_MODE_REMOTE:
+						return MultiplayerAPI::RPC_MODE_REMOTE;
+					case GODOT_METHOD_RPC_MODE_MASTER:
+						return MultiplayerAPI::RPC_MODE_MASTER;
+					case GODOT_METHOD_RPC_MODE_PUPPET:
+						return MultiplayerAPI::RPC_MODE_PUPPET;
+					case GODOT_METHOD_RPC_MODE_REMOTESYNC:
+						return MultiplayerAPI::RPC_MODE_REMOTESYNC;
+					case GODOT_METHOD_RPC_MODE_MASTERSYNC:
+						return MultiplayerAPI::RPC_MODE_MASTERSYNC;
+					case GODOT_METHOD_RPC_MODE_PUPPETSYNC:
+						return MultiplayerAPI::RPC_MODE_PUPPETSYNC;
+					default:
+						return MultiplayerAPI::RPC_MODE_DISABLED;
+				}
+			}
+		}
+
+		script_data = script_data->base_data;
+	}
+
+	return MultiplayerAPI::RPC_MODE_DISABLED;
+}
+
+MultiplayerAPI::RPCMode NativeScript::get_rpc_mode(const StringName &p_method) const {
+	NativeScriptDesc *script_data = get_script_desc();
+
+	while (script_data) {
+		Map<StringName, NativeScriptDesc::Method>::Element *E = script_data->methods.find(p_method);
+		if (E) {
+			switch (E->get().rpc_mode) {
+				case GODOT_METHOD_RPC_MODE_DISABLED:
+					return MultiplayerAPI::RPC_MODE_DISABLED;
+				case GODOT_METHOD_RPC_MODE_REMOTE:
+					return MultiplayerAPI::RPC_MODE_REMOTE;
+				case GODOT_METHOD_RPC_MODE_MASTER:
+					return MultiplayerAPI::RPC_MODE_MASTER;
+				case GODOT_METHOD_RPC_MODE_PUPPET:
+					return MultiplayerAPI::RPC_MODE_PUPPET;
+				case GODOT_METHOD_RPC_MODE_REMOTESYNC:
+					return MultiplayerAPI::RPC_MODE_REMOTESYNC;
+				case GODOT_METHOD_RPC_MODE_MASTERSYNC:
+					return MultiplayerAPI::RPC_MODE_MASTERSYNC;
+				case GODOT_METHOD_RPC_MODE_PUPPETSYNC:
+					return MultiplayerAPI::RPC_MODE_PUPPETSYNC;
+				default:
+					return MultiplayerAPI::RPC_MODE_DISABLED;
+			}
+		}
+
+		script_data = script_data->base_data;
+	}
+
+	return MultiplayerAPI::RPC_MODE_DISABLED;
+}
+
+Vector<ScriptNetData> NativeScript::get_rset_properties() const {
+	Vector<ScriptNetData> v;
+
+	NativeScriptDesc *script_data = get_script_desc();
+
+	while (script_data) {
+		for (OrderedHashMap<StringName, NativeScriptDesc::Property>::Element E = script_data->properties.front(); E; E = E.next()) {
+			if (E.get().rset_mode != GODOT_METHOD_RPC_MODE_DISABLED) {
+				ScriptNetData nd;
+				nd.name = E.key();
+				nd.mode = MultiplayerAPI::RPCMode(E.get().rset_mode);
+				v.push_back(nd);
+			}
+		}
+		script_data = script_data->base_data;
+	}
+
+	return v;
+}
+
+uint16_t NativeScript::get_rset_property_id(const StringName &p_variable) const {
+	NativeScriptDesc *script_data = get_script_desc();
+
+	while (script_data) {
+		OrderedHashMap<StringName, NativeScriptDesc::Property>::Element E = script_data->properties.find(p_variable);
+		if (E) {
+			return E.get().rset_property_id;
+		}
+
+		script_data = script_data->base_data;
+	}
+
+	return UINT16_MAX;
+}
+
+StringName NativeScript::get_rset_property(uint16_t p_id) const {
+	ERR_FAIL_COND_V(p_id == UINT16_MAX, StringName());
+
+	NativeScriptDesc *script_data = get_script_desc();
+
+	while (script_data) {
+		for (OrderedHashMap<StringName, NativeScriptDesc::Property>::Element E = script_data->properties.front(); E; E = E.next()) {
+			if (E.get().rset_property_id == p_id) {
+				return E.key();
+			}
+		}
+
+		script_data = script_data->base_data;
+	}
+
+	return StringName();
+}
+
+MultiplayerAPI::RPCMode NativeScript::get_rset_mode_by_id(uint16_t p_id) const {
+	ERR_FAIL_COND_V(p_id == UINT16_MAX, MultiplayerAPI::RPC_MODE_DISABLED);
+
+	NativeScriptDesc *script_data = get_script_desc();
+
+	while (script_data) {
+		for (OrderedHashMap<StringName, NativeScriptDesc::Property>::Element E = script_data->properties.front(); E; E = E.next()) {
+			if (E.get().rset_property_id == p_id) {
+				switch (E.get().rset_mode) {
+					case GODOT_METHOD_RPC_MODE_DISABLED:
+						return MultiplayerAPI::RPC_MODE_DISABLED;
+					case GODOT_METHOD_RPC_MODE_REMOTE:
+						return MultiplayerAPI::RPC_MODE_REMOTE;
+					case GODOT_METHOD_RPC_MODE_MASTER:
+						return MultiplayerAPI::RPC_MODE_MASTER;
+					case GODOT_METHOD_RPC_MODE_PUPPET:
+						return MultiplayerAPI::RPC_MODE_PUPPET;
+					case GODOT_METHOD_RPC_MODE_REMOTESYNC:
+						return MultiplayerAPI::RPC_MODE_REMOTESYNC;
+					case GODOT_METHOD_RPC_MODE_MASTERSYNC:
+						return MultiplayerAPI::RPC_MODE_MASTERSYNC;
+					case GODOT_METHOD_RPC_MODE_PUPPETSYNC:
+						return MultiplayerAPI::RPC_MODE_PUPPETSYNC;
+					default:
+						return MultiplayerAPI::RPC_MODE_DISABLED;
+				}
+			}
+		}
+
+		script_data = script_data->base_data;
+	}
+
+	return MultiplayerAPI::RPC_MODE_DISABLED;
+}
+
+MultiplayerAPI::RPCMode NativeScript::get_rset_mode(const StringName &p_variable) const {
+	NativeScriptDesc *script_data = get_script_desc();
+
+	while (script_data) {
+		OrderedHashMap<StringName, NativeScriptDesc::Property>::Element E = script_data->properties.find(p_variable);
+		if (E) {
+			switch (E.get().rset_mode) {
+				case GODOT_METHOD_RPC_MODE_DISABLED:
+					return MultiplayerAPI::RPC_MODE_DISABLED;
+				case GODOT_METHOD_RPC_MODE_REMOTE:
+					return MultiplayerAPI::RPC_MODE_REMOTE;
+				case GODOT_METHOD_RPC_MODE_MASTER:
+					return MultiplayerAPI::RPC_MODE_MASTER;
+				case GODOT_METHOD_RPC_MODE_PUPPET:
+					return MultiplayerAPI::RPC_MODE_PUPPET;
+				case GODOT_METHOD_RPC_MODE_REMOTESYNC:
+					return MultiplayerAPI::RPC_MODE_REMOTESYNC;
+				case GODOT_METHOD_RPC_MODE_MASTERSYNC:
+					return MultiplayerAPI::RPC_MODE_MASTERSYNC;
+				case GODOT_METHOD_RPC_MODE_PUPPETSYNC:
+					return MultiplayerAPI::RPC_MODE_PUPPETSYNC;
+				default:
+					return MultiplayerAPI::RPC_MODE_DISABLED;
+			}
+		}
+
+		script_data = script_data->base_data;
+	}
+
+	return MultiplayerAPI::RPC_MODE_DISABLED;
+}
+
 String NativeScript::get_class_documentation() const {
 	NativeScriptDesc *script_data = get_script_desc();
 
@@ -416,7 +668,6 @@ String NativeScript::get_method_documentation(const StringName &p_method) const
 	ERR_FAIL_COND_V_MSG(!script_data, "", "Attempt to get method documentation on invalid NativeScript.");
 
 	while (script_data) {
-
 		Map<StringName, NativeScriptDesc::Method>::Element *method = script_data->methods.find(p_method);
 
 		if (method) {
@@ -435,7 +686,6 @@ String NativeScript::get_signal_documentation(const StringName &p_signal_name) c
 	ERR_FAIL_COND_V_MSG(!script_data, "", "Attempt to get signal documentation on invalid NativeScript.");
 
 	while (script_data) {
-
 		Map<StringName, NativeScriptDesc::Signal>::Element *signal = script_data->signals_.find(p_signal_name);
 
 		if (signal) {
@@ -454,7 +704,6 @@ String NativeScript::get_property_documentation(const StringName &p_path) const
 	ERR_FAIL_COND_V_MSG(!script_data, "", "Attempt to get property documentation on invalid NativeScript.");
 
 	while (script_data) {
-
 		OrderedHashMap<StringName, NativeScriptDesc::Property>::Element property = script_data->properties.find(p_path);
 
 		if (property) {
@@ -467,24 +716,23 @@ String NativeScript::get_property_documentation(const StringName &p_path) const
 	ERR_FAIL_V_MSG("", "Attempt to get property documentation for non-existent signal.");
 }
 
-Variant NativeScript::_new(const Variant **p_args, int p_argcount, Variant::CallError &r_error) {
-
+Variant NativeScript::_new(const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
 	if (lib_path.empty() || class_name.empty() || library.is_null()) {
-		r_error.error = Variant::CallError::CALL_ERROR_INSTANCE_IS_NULL;
+		r_error.error = Callable::CallError::CALL_ERROR_INSTANCE_IS_NULL;
 		return Variant();
 	}
 
 	NativeScriptDesc *script_data = get_script_desc();
 
 	if (!script_data) {
-		r_error.error = Variant::CallError::CALL_ERROR_INSTANCE_IS_NULL;
+		r_error.error = Callable::CallError::CALL_ERROR_INSTANCE_IS_NULL;
 		return Variant();
 	}
 
-	r_error.error = Variant::CallError::CALL_OK;
+	r_error.error = Callable::CallError::CALL_OK;
 
 	REF ref;
-	Object *owner = NULL;
+	Object *owner = nullptr;
 
 	if (!(script_data->base_native_type == "")) {
 		owner = ClassDB::instance(script_data->base_native_type);
@@ -493,7 +741,7 @@ Variant NativeScript::_new(const Variant **p_args, int p_argcount, Variant::Call
 	}
 
 	if (!owner) {
-		r_error.error = Variant::CallError::CALL_ERROR_INSTANCE_IS_NULL;
+		r_error.error = Callable::CallError::CALL_ERROR_INSTANCE_IS_NULL;
 		return Variant();
 	}
 
@@ -524,17 +772,10 @@ NativeScript::NativeScript() {
 	library = Ref<GDNative>();
 	lib_path = "";
 	class_name = "";
-#ifndef NO_THREADS
-	owners_lock = Mutex::create();
-#endif
 }
 
 NativeScript::~NativeScript() {
 	NSL->unregister_script(this);
-
-#ifndef NO_THREADS
-	memdelete(owners_lock);
-#endif
 }
 
 #define GET_SCRIPT_DESC() script->get_script_desc()
@@ -586,6 +827,7 @@ bool NativeScriptInstance::set(const StringName &p_name, const Variant &p_value)
 	}
 	return false;
 }
+
 bool NativeScriptInstance::get(const StringName &p_name, Variant &r_ret) const {
 	NativeScriptDesc *script_data = GET_SCRIPT_DESC();
 
@@ -630,16 +872,14 @@ void NativeScriptInstance::get_property_list(List<PropertyInfo> *p_properties) c
 	NativeScriptDesc *script_data = GET_SCRIPT_DESC();
 
 	while (script_data) {
-
 		Map<StringName, NativeScriptDesc::Method>::Element *E = script_data->methods.find("_get_property_list");
 		if (E) {
-
 			godot_variant result;
 			result = E->get().method.method((godot_object *)owner,
 					E->get().method.method_data,
 					userdata,
 					0,
-					NULL);
+					nullptr);
 			Variant res = *(Variant *)&result;
 			godot_variant_destroy(&result);
 
@@ -682,11 +922,9 @@ void NativeScriptInstance::get_property_list(List<PropertyInfo> *p_properties) c
 }
 
 Variant::Type NativeScriptInstance::get_property_type(const StringName &p_name, bool *r_is_valid) const {
-
 	NativeScriptDesc *script_data = GET_SCRIPT_DESC();
 
 	while (script_data) {
-
 		OrderedHashMap<StringName, NativeScriptDesc::Property>::Element P = script_data->properties.find(p_name);
 		if (P) {
 			*r_is_valid = true;
@@ -706,8 +944,7 @@ bool NativeScriptInstance::has_method(const StringName &p_method) const {
 	return script->has_method(p_method);
 }
 
-Variant NativeScriptInstance::call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error) {
-
+Variant NativeScriptInstance::call(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
 	NativeScriptDesc *script_data = GET_SCRIPT_DESC();
 
 	while (script_data) {
@@ -731,14 +968,14 @@ Variant NativeScriptInstance::call(const StringName &p_method, const Variant **p
 
 			Variant res = *(Variant *)&result;
 			godot_variant_destroy(&result);
-			r_error.error = Variant::CallError::CALL_OK;
+			r_error.error = Callable::CallError::CALL_OK;
 			return res;
 		}
 
 		script_data = script_data->base_data;
 	}
 
-	r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+	r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 	return Variant();
 }
 
@@ -746,7 +983,7 @@ void NativeScriptInstance::notification(int p_notification) {
 #ifdef DEBUG_ENABLED
 	if (p_notification == MainLoop::NOTIFICATION_CRASH) {
 		if (current_method_call != StringName("")) {
-			ERR_PRINTS("NativeScriptInstance detected crash on method: " + current_method_call);
+			ERR_PRINT("NativeScriptInstance detected crash on method: " + current_method_call);
 			current_method_call = "";
 		}
 	}
@@ -754,45 +991,49 @@ void NativeScriptInstance::notification(int p_notification) {
 
 	Variant value = p_notification;
 	const Variant *args[1] = { &value };
-	call_multilevel("_notification", args, 1);
+	Callable::CallError error;
+	call("_notification", args, 1, error);
 }
 
 String NativeScriptInstance::to_string(bool *r_valid) {
 	if (has_method(CoreStringNames::get_singleton()->_to_string)) {
-		Variant::CallError ce;
-		Variant ret = call(CoreStringNames::get_singleton()->_to_string, NULL, 0, ce);
-		if (ce.error == Variant::CallError::CALL_OK) {
+		Callable::CallError ce;
+		Variant ret = call(CoreStringNames::get_singleton()->_to_string, nullptr, 0, ce);
+		if (ce.error == Callable::CallError::CALL_OK) {
 			if (ret.get_type() != Variant::STRING) {
-				if (r_valid)
+				if (r_valid) {
 					*r_valid = false;
+				}
 				ERR_FAIL_V_MSG(String(), "Wrong type for " + CoreStringNames::get_singleton()->_to_string + ", must be a String.");
 			}
-			if (r_valid)
+			if (r_valid) {
 				*r_valid = true;
+			}
 			return ret.operator String();
 		}
 	}
-	if (r_valid)
+	if (r_valid) {
 		*r_valid = false;
+	}
 	return String();
 }
 
 void NativeScriptInstance::refcount_incremented() {
-	Variant::CallError err;
-	call("_refcount_incremented", NULL, 0, err);
-	if (err.error != Variant::CallError::CALL_OK && err.error != Variant::CallError::CALL_ERROR_INVALID_METHOD) {
+	Callable::CallError err;
+	call("_refcount_incremented", nullptr, 0, err);
+	if (err.error != Callable::CallError::CALL_OK && err.error != Callable::CallError::CALL_ERROR_INVALID_METHOD) {
 		ERR_PRINT("Failed to invoke _refcount_incremented - should not happen");
 	}
 }
 
 bool NativeScriptInstance::refcount_decremented() {
-	Variant::CallError err;
-	Variant ret = call("_refcount_decremented", NULL, 0, err);
-	if (err.error != Variant::CallError::CALL_OK && err.error != Variant::CallError::CALL_ERROR_INVALID_METHOD) {
+	Callable::CallError err;
+	Variant ret = call("_refcount_decremented", nullptr, 0, err);
+	if (err.error != Callable::CallError::CALL_OK && err.error != Callable::CallError::CALL_ERROR_INVALID_METHOD) {
 		ERR_PRINT("Failed to invoke _refcount_decremented - should not happen");
 		return true; // assume we can destroy the object
 	}
-	if (err.error == Variant::CallError::CALL_ERROR_INVALID_METHOD) {
+	if (err.error == Callable::CallError::CALL_ERROR_INVALID_METHOD) {
 		// the method does not exist, default is true
 		return true;
 	}
@@ -803,140 +1044,77 @@ Ref<Script> NativeScriptInstance::get_script() const {
 	return script;
 }
 
-MultiplayerAPI::RPCMode NativeScriptInstance::get_rpc_mode(const StringName &p_method) const {
-
-	NativeScriptDesc *script_data = GET_SCRIPT_DESC();
-
-	while (script_data) {
-
-		Map<StringName, NativeScriptDesc::Method>::Element *E = script_data->methods.find(p_method);
-		if (E) {
-			switch (E->get().rpc_mode) {
-				case GODOT_METHOD_RPC_MODE_DISABLED:
-					return MultiplayerAPI::RPC_MODE_DISABLED;
-				case GODOT_METHOD_RPC_MODE_REMOTE:
-					return MultiplayerAPI::RPC_MODE_REMOTE;
-				case GODOT_METHOD_RPC_MODE_MASTER:
-					return MultiplayerAPI::RPC_MODE_MASTER;
-				case GODOT_METHOD_RPC_MODE_PUPPET:
-					return MultiplayerAPI::RPC_MODE_PUPPET;
-				case GODOT_METHOD_RPC_MODE_REMOTESYNC:
-					return MultiplayerAPI::RPC_MODE_REMOTESYNC;
-				case GODOT_METHOD_RPC_MODE_MASTERSYNC:
-					return MultiplayerAPI::RPC_MODE_MASTERSYNC;
-				case GODOT_METHOD_RPC_MODE_PUPPETSYNC:
-					return MultiplayerAPI::RPC_MODE_PUPPETSYNC;
-				default:
-					return MultiplayerAPI::RPC_MODE_DISABLED;
-			}
-		}
-
-		script_data = script_data->base_data;
-	}
-
-	return MultiplayerAPI::RPC_MODE_DISABLED;
+Vector<ScriptNetData> NativeScriptInstance::get_rpc_methods() const {
+	return script->get_rpc_methods();
 }
 
-MultiplayerAPI::RPCMode NativeScriptInstance::get_rset_mode(const StringName &p_variable) const {
-
-	NativeScriptDesc *script_data = GET_SCRIPT_DESC();
+uint16_t NativeScriptInstance::get_rpc_method_id(const StringName &p_method) const {
+	return script->get_rpc_method_id(p_method);
+}
 
-	while (script_data) {
+StringName NativeScriptInstance::get_rpc_method(uint16_t p_id) const {
+	return script->get_rpc_method(p_id);
+}
 
-		OrderedHashMap<StringName, NativeScriptDesc::Property>::Element E = script_data->properties.find(p_variable);
-		if (E) {
-			switch (E.get().rset_mode) {
-				case GODOT_METHOD_RPC_MODE_DISABLED:
-					return MultiplayerAPI::RPC_MODE_DISABLED;
-				case GODOT_METHOD_RPC_MODE_REMOTE:
-					return MultiplayerAPI::RPC_MODE_REMOTE;
-				case GODOT_METHOD_RPC_MODE_MASTER:
-					return MultiplayerAPI::RPC_MODE_MASTER;
-				case GODOT_METHOD_RPC_MODE_PUPPET:
-					return MultiplayerAPI::RPC_MODE_PUPPET;
-				case GODOT_METHOD_RPC_MODE_REMOTESYNC:
-					return MultiplayerAPI::RPC_MODE_REMOTESYNC;
-				case GODOT_METHOD_RPC_MODE_MASTERSYNC:
-					return MultiplayerAPI::RPC_MODE_MASTERSYNC;
-				case GODOT_METHOD_RPC_MODE_PUPPETSYNC:
-					return MultiplayerAPI::RPC_MODE_PUPPETSYNC;
-				default:
-					return MultiplayerAPI::RPC_MODE_DISABLED;
-			}
-		}
+MultiplayerAPI::RPCMode NativeScriptInstance::get_rpc_mode_by_id(uint16_t p_id) const {
+	return script->get_rpc_mode_by_id(p_id);
+}
 
-		script_data = script_data->base_data;
-	}
+MultiplayerAPI::RPCMode NativeScriptInstance::get_rpc_mode(const StringName &p_method) const {
+	return script->get_rpc_mode(p_method);
+}
 
-	return MultiplayerAPI::RPC_MODE_DISABLED;
+Vector<ScriptNetData> NativeScriptInstance::get_rset_properties() const {
+	return script->get_rset_properties();
 }
 
-ScriptLanguage *NativeScriptInstance::get_language() {
-	return NativeScriptLanguage::get_singleton();
+uint16_t NativeScriptInstance::get_rset_property_id(const StringName &p_variable) const {
+	return script->get_rset_property_id(p_variable);
 }
 
-void NativeScriptInstance::call_multilevel(const StringName &p_method, const Variant **p_args, int p_argcount) {
-	NativeScriptDesc *script_data = GET_SCRIPT_DESC();
+StringName NativeScriptInstance::get_rset_property(uint16_t p_id) const {
+	return script->get_rset_property(p_id);
+}
 
-	while (script_data) {
-		Map<StringName, NativeScriptDesc::Method>::Element *E = script_data->methods.find(p_method);
-		if (E) {
-			godot_variant res = E->get().method.method((godot_object *)owner,
-					E->get().method.method_data,
-					userdata,
-					p_argcount,
-					(godot_variant **)p_args);
-			godot_variant_destroy(&res);
-		}
-		script_data = script_data->base_data;
-	}
+MultiplayerAPI::RPCMode NativeScriptInstance::get_rset_mode_by_id(uint16_t p_id) const {
+	return script->get_rset_mode_by_id(p_id);
 }
 
-void NativeScriptInstance::call_multilevel_reversed(const StringName &p_method, const Variant **p_args, int p_argcount) {
-	NativeScriptDesc *script_data = GET_SCRIPT_DESC();
+MultiplayerAPI::RPCMode NativeScriptInstance::get_rset_mode(const StringName &p_variable) const {
+	return script->get_rset_mode(p_variable);
+}
 
-	if (script_data) {
-		_ml_call_reversed(script_data, p_method, p_args, p_argcount);
-	}
+ScriptLanguage *NativeScriptInstance::get_language() {
+	return NativeScriptLanguage::get_singleton();
 }
 
 NativeScriptInstance::~NativeScriptInstance() {
-
 	NativeScriptDesc *script_data = GET_SCRIPT_DESC();
 
-	if (!script_data)
+	if (!script_data) {
 		return;
+	}
 
 	script_data->destroy_func.destroy_func((godot_object *)owner, script_data->destroy_func.method_data, userdata);
 
 	if (owner) {
-
-#ifndef NO_THREADS
-		script->owners_lock->lock();
-#endif
+		MutexLock lock(script->owners_lock);
 
 		script->instance_owners.erase(owner);
-
-#ifndef NO_THREADS
-		script->owners_lock->unlock();
-#endif
 	}
 }
 
 NativeScriptLanguage *NativeScriptLanguage::singleton;
 
 void NativeScriptLanguage::_unload_stuff(bool p_reload) {
+	Map<String, Ref<GDNative>> erase_and_unload;
 
-	Map<String, Ref<GDNative> > erase_and_unload;
-
-	for (Map<String, Map<StringName, NativeScriptDesc> >::Element *L = library_classes.front(); L; L = L->next()) {
-
+	for (Map<String, Map<StringName, NativeScriptDesc>>::Element *L = library_classes.front(); L; L = L->next()) {
 		String lib_path = L->key();
 		Map<StringName, NativeScriptDesc> classes = L->get();
 
 		if (p_reload) {
-
-			Map<String, Ref<GDNative> >::Element *E = library_gdnatives.find(lib_path);
+			Map<String, Ref<GDNative>>::Element *E = library_gdnatives.find(lib_path);
 			Ref<GDNative> gdn;
 
 			if (E) {
@@ -957,7 +1135,7 @@ void NativeScriptLanguage::_unload_stuff(bool p_reload) {
 			}
 		}
 
-		Map<String, Ref<GDNative> >::Element *E = library_gdnatives.find(lib_path);
+		Map<String, Ref<GDNative>>::Element *E = library_gdnatives.find(lib_path);
 		Ref<GDNative> gdn;
 
 		if (E) {
@@ -965,34 +1143,38 @@ void NativeScriptLanguage::_unload_stuff(bool p_reload) {
 		}
 
 		for (Map<StringName, NativeScriptDesc>::Element *C = classes.front(); C; C = C->next()) {
-
 			// free property stuff first
 			for (OrderedHashMap<StringName, NativeScriptDesc::Property>::Element P = C->get().properties.front(); P; P = P.next()) {
-				if (P.get().getter.free_func)
+				if (P.get().getter.free_func) {
 					P.get().getter.free_func(P.get().getter.method_data);
+				}
 
-				if (P.get().setter.free_func)
+				if (P.get().setter.free_func) {
 					P.get().setter.free_func(P.get().setter.method_data);
+				}
 			}
 
 			// free method stuff
 			for (Map<StringName, NativeScriptDesc::Method>::Element *M = C->get().methods.front(); M; M = M->next()) {
-				if (M->get().method.free_func)
+				if (M->get().method.free_func) {
 					M->get().method.free_func(M->get().method.method_data);
+				}
 			}
 
 			// free constructor/destructor
-			if (C->get().create_func.free_func)
+			if (C->get().create_func.free_func) {
 				C->get().create_func.free_func(C->get().create_func.method_data);
+			}
 
-			if (C->get().destroy_func.free_func)
+			if (C->get().destroy_func.free_func) {
 				C->get().destroy_func.free_func(C->get().destroy_func.method_data);
+			}
 		}
 
 		erase_and_unload.insert(lib_path, gdn);
 	}
 
-	for (Map<String, Ref<GDNative> >::Element *E = erase_and_unload.front(); E; E = E->next()) {
+	for (Map<String, Ref<GDNative>>::Element *E = erase_and_unload.front(); E; E = E->next()) {
 		String lib_path = E->key();
 		Ref<GDNative> gdn = E->get();
 
@@ -1016,7 +1198,6 @@ NativeScriptLanguage::NativeScriptLanguage() {
 	NativeScriptLanguage::singleton = this;
 #ifndef NO_THREADS
 	has_objects_to_register = false;
-	mutex = Mutex::create();
 #endif
 
 #ifdef DEBUG_ENABLED
@@ -1035,13 +1216,10 @@ NativeScriptLanguage::NativeScriptLanguage() {
 }
 
 NativeScriptLanguage::~NativeScriptLanguage() {
-
-	for (Map<String, Ref<GDNative> >::Element *L = NSL->library_gdnatives.front(); L; L = L->next()) {
-
+	for (Map<String, Ref<GDNative>>::Element *L = NSL->library_gdnatives.front(); L; L = L->next()) {
 		Ref<GDNative> lib = L->get();
 		// only shut down valid libs, duh!
 		if (lib.is_valid()) {
-
 			// If it's a singleton-library then the gdnative module
 			// manages the destruction at engine shutdown, not NativeScript.
 			if (!lib->get_library()->is_singleton()) {
@@ -1053,10 +1231,6 @@ NativeScriptLanguage::~NativeScriptLanguage() {
 	NSL->library_classes.clear();
 	NSL->library_gdnatives.clear();
 	NSL->library_script_users.clear();
-
-#ifndef NO_THREADS
-	memdelete(mutex);
-#endif
 }
 
 String NativeScriptLanguage::get_name() const {
@@ -1071,7 +1245,6 @@ void _add_reload_node() {
 }
 
 void NativeScriptLanguage::init() {
-
 #if defined(TOOLS_ENABLED) && defined(DEBUG_METHODS_ENABLED)
 
 	List<String> args = OS::get_singleton()->get_cmdline_args();
@@ -1090,22 +1263,29 @@ void NativeScriptLanguage::init() {
 	EditorNode::add_init_callback(&_add_reload_node);
 #endif
 }
+
 String NativeScriptLanguage::get_type() const {
 	return "NativeScript";
 }
+
 String NativeScriptLanguage::get_extension() const {
 	return "gdns";
 }
+
 Error NativeScriptLanguage::execute_file(const String &p_path) {
 	return OK; // Qué?
 }
+
 void NativeScriptLanguage::finish() {
 	_unload_stuff();
 }
+
 void NativeScriptLanguage::get_reserved_words(List<String> *p_words) const {
 }
+
 void NativeScriptLanguage::get_comment_delimiters(List<String> *p_delimiters) const {
 }
+
 void NativeScriptLanguage::get_string_delimiters(List<String> *p_delimiters) const {
 }
 
@@ -1114,6 +1294,7 @@ Ref<Script> NativeScriptLanguage::get_template(const String &p_class_name, const
 	s->set_class_name(p_class_name);
 	return Ref<NativeScript>(s);
 }
+
 bool NativeScriptLanguage::validate(const String &p_script, int &r_line_error, int &r_col_error, String &r_test_error, const String &p_path, List<String> *r_functions, List<ScriptLanguage::Warning> *r_warnings, Set<int> *r_safe_lines) const {
 	return true;
 }
@@ -1122,20 +1303,26 @@ Script *NativeScriptLanguage::create_script() const {
 	NativeScript *script = memnew(NativeScript);
 	return script;
 }
+
 bool NativeScriptLanguage::has_named_classes() const {
 	return true;
 }
+
 bool NativeScriptLanguage::supports_builtin_mode() const {
 	return true;
 }
+
 int NativeScriptLanguage::find_function(const String &p_function, const String &p_code) const {
 	return -1;
 }
-String NativeScriptLanguage::make_function(const String &p_class, const String &p_name, const PoolStringArray &p_args) const {
+
+String NativeScriptLanguage::make_function(const String &p_class, const String &p_name, const PackedStringArray &p_args) const {
 	return "";
 }
+
 void NativeScriptLanguage::auto_indent_code(String &p_code, int p_from_line, int p_to_line) const {
 }
+
 void NativeScriptLanguage::add_global_constant(const StringName &p_variable, const Variant &p_value) {
 }
 
@@ -1143,27 +1330,36 @@ void NativeScriptLanguage::add_global_constant(const StringName &p_variable, con
 String NativeScriptLanguage::debug_get_error() const {
 	return "";
 }
+
 int NativeScriptLanguage::debug_get_stack_level_count() const {
 	return -1;
 }
+
 int NativeScriptLanguage::debug_get_stack_level_line(int p_level) const {
 	return -1;
 }
+
 String NativeScriptLanguage::debug_get_stack_level_function(int p_level) const {
 	return "";
 }
+
 String NativeScriptLanguage::debug_get_stack_level_source(int p_level) const {
 	return "";
 }
+
 void NativeScriptLanguage::debug_get_stack_level_locals(int p_level, List<String> *p_locals, List<Variant> *p_values, int p_max_subitems, int p_max_depth) {
 }
+
 void NativeScriptLanguage::debug_get_stack_level_members(int p_level, List<String> *p_members, List<Variant> *p_values, int p_max_subitems, int p_max_depth) {
 }
+
 void NativeScriptLanguage::debug_get_globals(List<String> *p_locals, List<Variant> *p_values, int p_max_subitems, int p_max_depth) {
 }
+
 String NativeScriptLanguage::debug_parse_stack_level_expression(int p_level, const String &p_expression, int p_max_subitems, int p_max_depth) {
 	return "";
 }
+
 // Debugging stuff end.
 
 void NativeScriptLanguage::reload_all_scripts() {
@@ -1171,6 +1367,7 @@ void NativeScriptLanguage::reload_all_scripts() {
 
 void NativeScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_soft_reload) {
 }
+
 void NativeScriptLanguage::get_recognized_extensions(List<String> *p_extensions) const {
 	p_extensions->push_back("gdns");
 }
@@ -1178,14 +1375,12 @@ void NativeScriptLanguage::get_recognized_extensions(List<String> *p_extensions)
 void NativeScriptLanguage::get_public_functions(List<MethodInfo> *p_functions) const {
 }
 
-void NativeScriptLanguage::get_public_constants(List<Pair<String, Variant> > *p_constants) const {
+void NativeScriptLanguage::get_public_constants(List<Pair<String, Variant>> *p_constants) const {
 }
 
 void NativeScriptLanguage::profiling_start() {
 #ifdef DEBUG_ENABLED
-#ifndef NO_THREADS
 	MutexLock lock(mutex);
-#endif
 
 	profile_data.clear();
 	profiling = true;
@@ -1194,9 +1389,7 @@ void NativeScriptLanguage::profiling_start() {
 
 void NativeScriptLanguage::profiling_stop() {
 #ifdef DEBUG_ENABLED
-#ifndef NO_THREADS
 	MutexLock lock(mutex);
-#endif
 
 	profiling = false;
 #endif
@@ -1204,14 +1397,14 @@ void NativeScriptLanguage::profiling_stop() {
 
 int NativeScriptLanguage::profiling_get_accumulated_data(ProfilingInfo *p_info_arr, int p_info_max) {
 #ifdef DEBUG_ENABLED
-#ifndef NO_THREADS
 	MutexLock lock(mutex);
-#endif
+
 	int current = 0;
 
 	for (Map<StringName, ProfileData>::Element *d = profile_data.front(); d; d = d->next()) {
-		if (current >= p_info_max)
+		if (current >= p_info_max) {
 			break;
+		}
 
 		p_info_arr[current].call_count = d->get().call_count;
 		p_info_arr[current].self_time = d->get().self_time;
@@ -1228,14 +1421,14 @@ int NativeScriptLanguage::profiling_get_accumulated_data(ProfilingInfo *p_info_a
 
 int NativeScriptLanguage::profiling_get_frame_data(ProfilingInfo *p_info_arr, int p_info_max) {
 #ifdef DEBUG_ENABLED
-#ifndef NO_THREADS
 	MutexLock lock(mutex);
-#endif
+
 	int current = 0;
 
 	for (Map<StringName, ProfileData>::Element *d = profile_data.front(); d; d = d->next()) {
-		if (current >= p_info_max)
+		if (current >= p_info_max) {
 			break;
+		}
 
 		if (d->get().last_frame_call_count) {
 			p_info_arr[current].call_count = d->get().last_frame_call_count;
@@ -1254,9 +1447,7 @@ int NativeScriptLanguage::profiling_get_frame_data(ProfilingInfo *p_info_arr, in
 
 void NativeScriptLanguage::profiling_add_data(StringName p_signature, uint64_t p_time) {
 #ifdef DEBUG_ENABLED
-#ifndef NO_THREADS
 	MutexLock lock(mutex);
-#endif
 
 	Map<StringName, ProfileData>::Element *d = profile_data.find(p_signature);
 	if (d) {
@@ -1283,8 +1474,7 @@ void NativeScriptLanguage::profiling_add_data(StringName p_signature, uint64_t p
 #endif
 }
 
-int NativeScriptLanguage::register_binding_functions(godot_instance_binding_functions p_binding_functions) {
-
+int NativeScriptLanguage::register_binding_functions(godot_nativescript_instance_binding_functions p_binding_functions) {
 	// find index
 
 	int idx = -1;
@@ -1315,25 +1505,28 @@ void NativeScriptLanguage::unregister_binding_functions(int p_idx) {
 	for (Set<Vector<void *> *>::Element *E = binding_instances.front(); E; E = E->next()) {
 		Vector<void *> &binding_data = *E->get();
 
-		if (p_idx < binding_data.size() && binding_data[p_idx] && binding_functions[p_idx].second.free_instance_binding_data)
+		if (p_idx < binding_data.size() && binding_data[p_idx] && binding_functions[p_idx].second.free_instance_binding_data) {
 			binding_functions[p_idx].second.free_instance_binding_data(binding_functions[p_idx].second.data, binding_data[p_idx]);
+		}
 	}
 
 	binding_functions.write[p_idx].first = false;
 
-	if (binding_functions[p_idx].second.free_func)
+	if (binding_functions[p_idx].second.free_func) {
 		binding_functions[p_idx].second.free_func(binding_functions[p_idx].second.data);
+	}
 }
 
 void *NativeScriptLanguage::get_instance_binding_data(int p_idx, Object *p_object) {
-	ERR_FAIL_INDEX_V(p_idx, binding_functions.size(), NULL);
+	ERR_FAIL_INDEX_V(p_idx, binding_functions.size(), nullptr);
 
-	ERR_FAIL_COND_V_MSG(!binding_functions[p_idx].first, NULL, "Tried to get binding data for a nativescript binding that does not exist.");
+	ERR_FAIL_COND_V_MSG(!binding_functions[p_idx].first, nullptr, "Tried to get binding data for a nativescript binding that does not exist.");
 
 	Vector<void *> *binding_data = (Vector<void *> *)p_object->get_script_instance_binding(lang_idx);
 
-	if (!binding_data)
-		return NULL; // should never happen.
+	if (!binding_data) {
+		return nullptr; // should never happen.
+	}
 
 	if (binding_data->size() <= p_idx) {
 		// okay, add new elements here.
@@ -1342,12 +1535,11 @@ void *NativeScriptLanguage::get_instance_binding_data(int p_idx, Object *p_objec
 		binding_data->resize(p_idx + 1);
 
 		for (int i = old_size; i <= p_idx; i++) {
-			(*binding_data).write[i] = NULL;
+			(*binding_data).write[i] = nullptr;
 		}
 	}
 
 	if (!(*binding_data)[p_idx]) {
-
 		const void *global_type_tag = get_global_type_tag(p_idx, p_object->get_class_name());
 
 		// no binding data yet, soooooo alloc new one \o/
@@ -1358,13 +1550,12 @@ void *NativeScriptLanguage::get_instance_binding_data(int p_idx, Object *p_objec
 }
 
 void *NativeScriptLanguage::alloc_instance_binding_data(Object *p_object) {
-
 	Vector<void *> *binding_data = new Vector<void *>;
 
 	binding_data->resize(binding_functions.size());
 
 	for (int i = 0; i < binding_functions.size(); i++) {
-		(*binding_data).write[i] = NULL;
+		(*binding_data).write[i] = nullptr;
 	}
 
 	binding_instances.insert(binding_data);
@@ -1373,15 +1564,16 @@ void *NativeScriptLanguage::alloc_instance_binding_data(Object *p_object) {
 }
 
 void NativeScriptLanguage::free_instance_binding_data(void *p_data) {
-
-	if (!p_data)
+	if (!p_data) {
 		return;
+	}
 
 	Vector<void *> &binding_data = *(Vector<void *> *)p_data;
 
 	for (int i = 0; i < binding_data.size(); i++) {
-		if (!binding_data[i])
+		if (!binding_data[i]) {
 			continue;
+		}
 
 		if (binding_functions[i].first && binding_functions[i].second.free_instance_binding_data) {
 			binding_functions[i].second.free_instance_binding_data(binding_functions[i].second.data, binding_data[i]);
@@ -1394,20 +1586,22 @@ void NativeScriptLanguage::free_instance_binding_data(void *p_data) {
 }
 
 void NativeScriptLanguage::refcount_incremented_instance_binding(Object *p_object) {
-
 	void *data = p_object->get_script_instance_binding(lang_idx);
 
-	if (!data)
+	if (!data) {
 		return;
+	}
 
 	Vector<void *> &binding_data = *(Vector<void *> *)data;
 
 	for (int i = 0; i < binding_data.size(); i++) {
-		if (!binding_data[i])
+		if (!binding_data[i]) {
 			continue;
+		}
 
-		if (!binding_functions[i].first)
+		if (!binding_functions[i].first) {
 			continue;
+		}
 
 		if (binding_functions[i].second.refcount_incremented_instance_binding) {
 			binding_functions[i].second.refcount_incremented_instance_binding(binding_data[i], p_object);
@@ -1416,22 +1610,24 @@ void NativeScriptLanguage::refcount_incremented_instance_binding(Object *p_objec
 }
 
 bool NativeScriptLanguage::refcount_decremented_instance_binding(Object *p_object) {
-
 	void *data = p_object->get_script_instance_binding(lang_idx);
 
-	if (!data)
+	if (!data) {
 		return true;
+	}
 
 	Vector<void *> &binding_data = *(Vector<void *> *)data;
 
 	bool can_die = true;
 
 	for (int i = 0; i < binding_data.size(); i++) {
-		if (!binding_data[i])
+		if (!binding_data[i]) {
 			continue;
+		}
 
-		if (!binding_functions[i].first)
+		if (!binding_functions[i].first) {
 			continue;
+		}
 
 		if (binding_functions[i].second.refcount_decremented_instance_binding) {
 			can_die = can_die && binding_functions[i].second.refcount_decremented_instance_binding(binding_data[i], p_object);
@@ -1452,13 +1648,15 @@ void NativeScriptLanguage::set_global_type_tag(int p_idx, StringName p_class_nam
 }
 
 const void *NativeScriptLanguage::get_global_type_tag(int p_idx, StringName p_class_name) const {
-	if (!global_type_tags.has(p_idx))
-		return NULL;
+	if (!global_type_tags.has(p_idx)) {
+		return nullptr;
+	}
 
 	const HashMap<StringName, const void *> &tags = global_type_tags[p_idx];
 
-	if (!tags.has(p_class_name))
-		return NULL;
+	if (!tags.has(p_class_name)) {
+		return nullptr;
+	}
 
 	const void *tag = tags.get(p_class_name);
 
@@ -1475,13 +1673,12 @@ void NativeScriptLanguage::defer_init_library(Ref<GDNativeLibrary> lib, NativeSc
 #endif
 
 void NativeScriptLanguage::init_library(const Ref<GDNativeLibrary> &lib) {
-#ifndef NO_THREADS
 	MutexLock lock(mutex);
-#endif
+
 	// See if this library was "registered" already.
 	const String &lib_path = lib->get_current_library_path();
 	ERR_FAIL_COND_MSG(lib_path.length() == 0, lib->get_name() + " does not have a library for the current platform.");
-	Map<String, Ref<GDNative> >::Element *E = library_gdnatives.find(lib_path);
+	Map<String, Ref<GDNative>>::Element *E = library_gdnatives.find(lib_path);
 
 	if (!E) {
 		Ref<GDNative> gdn;
@@ -1495,8 +1692,9 @@ void NativeScriptLanguage::init_library(const Ref<GDNativeLibrary> &lib) {
 
 		library_classes.insert(lib_path, Map<StringName, NativeScriptDesc>());
 
-		if (!library_script_users.has(lib_path))
+		if (!library_script_users.has(lib_path)) {
 			library_script_users.insert(lib_path, Set<NativeScript *>());
+		}
 
 		void *proc_ptr;
 
@@ -1513,17 +1711,15 @@ void NativeScriptLanguage::init_library(const Ref<GDNativeLibrary> &lib) {
 }
 
 void NativeScriptLanguage::register_script(NativeScript *script) {
-#ifndef NO_THREADS
 	MutexLock lock(mutex);
-#endif
+
 	library_script_users[script->lib_path].insert(script);
 }
 
 void NativeScriptLanguage::unregister_script(NativeScript *script) {
-#ifndef NO_THREADS
 	MutexLock lock(mutex);
-#endif
-	Map<String, Set<NativeScript *> >::Element *S = library_script_users.find(script->lib_path);
+
+	Map<String, Set<NativeScript *>>::Element *S = library_script_users.find(script->lib_path);
 	if (S) {
 		S->get().erase(script);
 		if (S->get().size() == 0) {
@@ -1537,14 +1733,12 @@ void NativeScriptLanguage::unregister_script(NativeScript *script) {
 
 void NativeScriptLanguage::call_libraries_cb(const StringName &name) {
 	// library_gdnatives is modified only from the main thread, so it's safe not to use mutex here
-	for (Map<String, Ref<GDNative> >::Element *L = library_gdnatives.front(); L; L = L->next()) {
-
+	for (Map<String, Ref<GDNative>>::Element *L = library_gdnatives.front(); L; L = L->next()) {
 		if (L->get().is_null()) {
 			continue;
 		}
 
 		if (L->get()->is_initialized()) {
-
 			void *proc_ptr;
 			Error err = L->get()->get_symbol(L->get()->get_library()->get_symbol_prefix() + name, proc_ptr);
 
@@ -1559,7 +1753,7 @@ void NativeScriptLanguage::frame() {
 #ifndef NO_THREADS
 	if (has_objects_to_register) {
 		MutexLock lock(mutex);
-		for (Set<Ref<GDNativeLibrary> >::Element *L = libs_to_init.front(); L; L = L->next()) {
+		for (Set<Ref<GDNativeLibrary>>::Element *L = libs_to_init.front(); L; L = L->next()) {
 			init_library(L->get());
 		}
 		libs_to_init.clear();
@@ -1573,9 +1767,7 @@ void NativeScriptLanguage::frame() {
 
 #ifdef DEBUG_ENABLED
 	{
-#ifndef NO_THREADS
 		MutexLock lock(mutex);
-#endif
 
 		for (Map<StringName, ProfileData>::Element *d = profile_data.front(); d; d = d->next()) {
 			d->get().last_frame_call_count = d->get().frame_call_count;
@@ -1611,16 +1803,20 @@ String NativeScriptLanguage::get_global_class_name(const String &p_path, String
 	if (!p_path.empty()) {
 		Ref<NativeScript> script = ResourceLoader::load(p_path, "NativeScript");
 		if (script.is_valid()) {
-			if (r_base_type)
+			if (r_base_type) {
 				*r_base_type = script->get_instance_base_type();
-			if (r_icon_path)
+			}
+			if (r_icon_path) {
 				*r_icon_path = script->get_script_class_icon_path();
+			}
 			return script->get_script_class_name();
 		}
-		if (r_base_type)
+		if (r_base_type) {
 			*r_base_type = String();
-		if (r_icon_path)
+		}
+		if (r_icon_path) {
 			*r_icon_path = String();
+		}
 	}
 	return String();
 }
@@ -1633,17 +1829,14 @@ void NativeReloadNode::_notification(int p_what) {
 #ifdef TOOLS_ENABLED
 
 	switch (p_what) {
-		case MainLoop::NOTIFICATION_WM_FOCUS_OUT: {
-
-			if (unloaded)
+		case NOTIFICATION_APPLICATION_FOCUS_OUT: {
+			if (unloaded) {
 				break;
-#ifndef NO_THREADS
+			}
 			MutexLock lock(NSL->mutex);
-#endif
 			NSL->_unload_stuff(true);
 
-			for (Map<String, Ref<GDNative> >::Element *L = NSL->library_gdnatives.front(); L; L = L->next()) {
-
+			for (Map<String, Ref<GDNative>>::Element *L = NSL->library_gdnatives.front(); L; L = L->next()) {
 				Ref<GDNative> gdn = L->get();
 
 				if (gdn.is_null()) {
@@ -1670,16 +1863,14 @@ void NativeReloadNode::_notification(int p_what) {
 
 		} break;
 
-		case MainLoop::NOTIFICATION_WM_FOCUS_IN: {
-
-			if (!unloaded)
+		case NOTIFICATION_APPLICATION_FOCUS_IN: {
+			if (!unloaded) {
 				break;
-#ifndef NO_THREADS
+			}
 			MutexLock lock(NSL->mutex);
-#endif
-			Set<StringName> libs_to_remove;
-			for (Map<String, Ref<GDNative> >::Element *L = NSL->library_gdnatives.front(); L; L = L->next()) {
 
+			Set<StringName> libs_to_remove;
+			for (Map<String, Ref<GDNative>>::Element *L = NSL->library_gdnatives.front(); L; L = L->next()) {
 				Ref<GDNative> gdn = L->get();
 
 				if (gdn.is_null()) {
@@ -1713,12 +1904,13 @@ void NativeReloadNode::_notification(int p_what) {
 					((void (*)(void *))proc_ptr)((void *)&L->key());
 				}
 
-				for (Map<String, Set<NativeScript *> >::Element *U = NSL->library_script_users.front(); U; U = U->next()) {
+				for (Map<String, Set<NativeScript *>>::Element *U = NSL->library_script_users.front(); U; U = U->next()) {
 					for (Set<NativeScript *>::Element *S = U->get().front(); S; S = S->next()) {
 						NativeScript *script = S->get();
 
-						if (script->placeholders.size() == 0)
+						if (script->placeholders.size() == 0) {
 							continue;
+						}
 
 						for (Set<PlaceHolderScriptInstance *>::Element *P = script->placeholders.front(); P; P = P->next()) {
 							script->_update_placeholder(P->get());
@@ -1740,7 +1932,7 @@ void NativeReloadNode::_notification(int p_what) {
 #endif
 }
 
-RES ResourceFormatLoaderNativeScript::load(const String &p_path, const String &p_original_path, Error *r_error) {
+RES ResourceFormatLoaderNativeScript::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, bool p_no_cache) {
 	return ResourceFormatLoaderText::singleton->load(p_path, p_original_path, r_error);
 }
 
@@ -1754,8 +1946,9 @@ bool ResourceFormatLoaderNativeScript::handles_type(const String &p_type) const
 
 String ResourceFormatLoaderNativeScript::get_resource_type(const String &p_path) const {
 	String el = p_path.get_extension().to_lower();
-	if (el == "gdns")
+	if (el == "gdns") {
 		return "NativeScript";
+	}
 	return "";
 }
 
@@ -1765,7 +1958,7 @@ Error ResourceFormatSaverNativeScript::save(const String &p_path, const RES &p_r
 }
 
 bool ResourceFormatSaverNativeScript::recognize(const RES &p_resource) const {
-	return Object::cast_to<NativeScript>(*p_resource) != NULL;
+	return Object::cast_to<NativeScript>(*p_resource) != nullptr;
 }
 
 void ResourceFormatSaverNativeScript::get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const {
diff --git a/modules/gdnative/nativescript/nativescript.h b/modules/gdnative/nativescript/nativescript.h
index cf787e1f6a..145bf7dcb6 100644
--- a/modules/gdnative/nativescript/nativescript.h
+++ b/modules/gdnative/nativescript/nativescript.h
@@ -35,6 +35,7 @@
 #include "core/io/resource_saver.h"
 #include "core/oa_hash_map.h"
 #include "core/ordered_hash_map.h"
+#include "core/os/mutex.h"
 #include "core/os/thread_safe.h"
 #include "core/resource.h"
 #include "core/script_language.h"
@@ -42,26 +43,25 @@
 #include "scene/main/node.h"
 
 #include "modules/gdnative/gdnative.h"
-#include <nativescript/godot_nativescript.h>
 
-#ifndef NO_THREADS
-#include "core/os/mutex.h"
-#endif
+#include <nativescript/godot_nativescript.h>
 
 struct NativeScriptDesc {
-
 	struct Method {
-		godot_instance_method method;
+		godot_nativescript_instance_method method;
 		MethodInfo info;
 		int rpc_mode;
+		uint16_t rpc_method_id;
 		String documentation;
 	};
+
 	struct Property {
-		godot_property_set_func setter;
-		godot_property_get_func getter;
+		godot_nativescript_property_set_func setter;
+		godot_nativescript_property_get_func getter;
 		PropertyInfo info;
 		Variant default_value;
 		int rset_mode;
+		uint16_t rset_property_id;
 		String documentation;
 	};
 
@@ -70,31 +70,26 @@ struct NativeScriptDesc {
 		String documentation;
 	};
 
+	uint16_t rpc_count = 0;
 	Map<StringName, Method> methods;
+	uint16_t rset_count = 0;
 	OrderedHashMap<StringName, Property> properties;
 	Map<StringName, Signal> signals_; // QtCreator doesn't like the name signals
 	StringName base;
 	StringName base_native_type;
 	NativeScriptDesc *base_data;
-	godot_instance_create_func create_func;
-	godot_instance_destroy_func destroy_func;
+	godot_nativescript_instance_create_func create_func;
+	godot_nativescript_instance_destroy_func destroy_func;
 
 	String documentation;
 
-	const void *type_tag;
+	const void *type_tag = nullptr;
 
 	bool is_tool;
 
-	inline NativeScriptDesc() :
-			methods(),
-			properties(),
-			signals_(),
-			base(),
-			base_native_type(),
-			documentation(),
-			type_tag(NULL) {
-		zeromem(&create_func, sizeof(godot_instance_create_func));
-		zeromem(&destroy_func, sizeof(godot_instance_destroy_func));
+	inline NativeScriptDesc() {
+		zeromem(&create_func, sizeof(godot_nativescript_instance_create_func));
+		zeromem(&destroy_func, sizeof(godot_nativescript_instance_destroy_func));
 	}
 };
 
@@ -104,7 +99,7 @@ class NativeScript : public Script {
 #ifdef TOOLS_ENABLED
 	Set<PlaceHolderScriptInstance *> placeholders;
 	void _update_placeholder(PlaceHolderScriptInstance *p_placeholder);
-	virtual void _placeholder_erased(PlaceHolderScriptInstance *p_placeholder);
+	virtual void _placeholder_erased(PlaceHolderScriptInstance *p_placeholder) override;
 #endif
 
 	friend class NativeScriptInstance;
@@ -121,9 +116,7 @@ class NativeScript : public Script {
 	String script_class_name;
 	String script_class_icon_path;
 
-#ifndef NO_THREADS
-	Mutex *owners_lock;
-#endif
+	Mutex owners_lock;
 	Set<Object *> instance_owners;
 
 protected:
@@ -132,6 +125,8 @@ protected:
 public:
 	inline NativeScriptDesc *get_script_desc() const;
 
+	bool inherits_script(const Ref<Script> &p_script) const override;
+
 	void set_class_name(String p_class_name);
 	String get_class_name() const;
 
@@ -143,50 +138,61 @@ public:
 	void set_script_class_icon_path(String p_icon_path);
 	String get_script_class_icon_path() const;
 
-	virtual bool can_instance() const;
+	virtual bool can_instance() const override;
 
-	virtual Ref<Script> get_base_script() const; //for script inheritance
+	virtual Ref<Script> get_base_script() const override; //for script inheritance
 
-	virtual StringName get_instance_base_type() const; // this may not work in all scripts, will return empty if so
-	virtual ScriptInstance *instance_create(Object *p_this);
-	virtual PlaceHolderScriptInstance *placeholder_instance_create(Object *p_this);
-	virtual bool instance_has(const Object *p_this) const;
+	virtual StringName get_instance_base_type() const override; // this may not work in all scripts, will return empty if so
+	virtual ScriptInstance *instance_create(Object *p_this) override;
+	virtual PlaceHolderScriptInstance *placeholder_instance_create(Object *p_this) override;
+	virtual bool instance_has(const Object *p_this) const override;
 
-	virtual bool has_source_code() const;
-	virtual String get_source_code() const;
-	virtual void set_source_code(const String &p_code);
-	virtual Error reload(bool p_keep_state = false);
+	virtual bool has_source_code() const override;
+	virtual String get_source_code() const override;
+	virtual void set_source_code(const String &p_code) override;
+	virtual Error reload(bool p_keep_state = false) override;
 
-	virtual bool has_method(const StringName &p_method) const;
-	virtual MethodInfo get_method_info(const StringName &p_method) const;
+	virtual bool has_method(const StringName &p_method) const override;
+	virtual MethodInfo get_method_info(const StringName &p_method) const override;
+
+	virtual bool is_tool() const override;
+	virtual bool is_valid() const override;
+
+	virtual ScriptLanguage *get_language() const override;
 
-	virtual bool is_tool() const;
-	virtual bool is_valid() const;
+	virtual bool has_script_signal(const StringName &p_signal) const override;
+	virtual void get_script_signal_list(List<MethodInfo> *r_signals) const override;
 
-	virtual ScriptLanguage *get_language() const;
+	virtual bool get_property_default_value(const StringName &p_property, Variant &r_value) const override;
 
-	virtual bool has_script_signal(const StringName &p_signal) const;
-	virtual void get_script_signal_list(List<MethodInfo> *r_signals) const;
+	virtual void update_exports() override; //editor tool
+	virtual void get_script_method_list(List<MethodInfo> *p_list) const override;
+	virtual void get_script_property_list(List<PropertyInfo> *p_list) const override;
 
-	virtual bool get_property_default_value(const StringName &p_property, Variant &r_value) const;
+	virtual Vector<ScriptNetData> get_rpc_methods() const override;
+	virtual uint16_t get_rpc_method_id(const StringName &p_method) const override;
+	virtual StringName get_rpc_method(uint16_t p_id) const override;
+	virtual MultiplayerAPI::RPCMode get_rpc_mode_by_id(uint16_t p_id) const override;
+	virtual MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const override;
 
-	virtual void update_exports(); //editor tool
-	virtual void get_script_method_list(List<MethodInfo> *p_list) const;
-	virtual void get_script_property_list(List<PropertyInfo> *p_list) const;
+	virtual Vector<ScriptNetData> get_rset_properties() const override;
+	virtual uint16_t get_rset_property_id(const StringName &p_variable) const override;
+	virtual StringName get_rset_property(uint16_t p_id) const override;
+	virtual MultiplayerAPI::RPCMode get_rset_mode_by_id(uint16_t p_id) const override;
+	virtual MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const override;
 
 	String get_class_documentation() const;
 	String get_method_documentation(const StringName &p_method) const;
 	String get_signal_documentation(const StringName &p_signal_name) const;
 	String get_property_documentation(const StringName &p_path) const;
 
-	Variant _new(const Variant **p_args, int p_argcount, Variant::CallError &r_error);
+	Variant _new(const Variant **p_args, int p_argcount, Callable::CallError &r_error);
 
 	NativeScript();
 	~NativeScript();
 };
 
 class NativeScriptInstance : public ScriptInstance {
-
 	friend class NativeScript;
 
 	Object *owner;
@@ -206,16 +212,24 @@ public:
 	virtual Variant::Type get_property_type(const StringName &p_name, bool *r_is_valid) const;
 	virtual void get_method_list(List<MethodInfo> *p_list) const;
 	virtual bool has_method(const StringName &p_method) const;
-	virtual Variant call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error);
+	virtual Variant call(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error);
 	virtual void notification(int p_notification);
 	String to_string(bool *r_valid);
 	virtual Ref<Script> get_script() const;
+
+	virtual Vector<ScriptNetData> get_rpc_methods() const;
+	virtual uint16_t get_rpc_method_id(const StringName &p_method) const;
+	virtual StringName get_rpc_method(uint16_t p_id) const;
+	virtual MultiplayerAPI::RPCMode get_rpc_mode_by_id(uint16_t p_id) const;
 	virtual MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const;
+
+	virtual Vector<ScriptNetData> get_rset_properties() const;
+	virtual uint16_t get_rset_property_id(const StringName &p_variable) const;
+	virtual StringName get_rset_property(uint16_t p_id) const;
+	virtual MultiplayerAPI::RPCMode get_rset_mode_by_id(uint16_t p_id) const;
 	virtual MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const;
-	virtual ScriptLanguage *get_language();
 
-	virtual void call_multilevel(const StringName &p_method, const Variant **p_args, int p_argcount);
-	virtual void call_multilevel_reversed(const StringName &p_method, const Variant **p_args, int p_argcount);
+	virtual ScriptLanguage *get_language();
 
 	virtual void refcount_incremented();
 	virtual bool refcount_decremented();
@@ -226,7 +240,6 @@ public:
 class NativeReloadNode;
 
 class NativeScriptLanguage : public ScriptLanguage {
-
 	friend class NativeScript;
 	friend class NativeScriptInstance;
 	friend class NativeReloadNode;
@@ -237,10 +250,9 @@ private:
 
 	void _unload_stuff(bool p_reload = false);
 
+	Mutex mutex;
 #ifndef NO_THREADS
-	Mutex *mutex;
-
-	Set<Ref<GDNativeLibrary> > libs_to_init;
+	Set<Ref<GDNativeLibrary>> libs_to_init;
 	Set<NativeScript *> scripts_to_register;
 	volatile bool has_objects_to_register; // so that we don't lock mutex every frame - it's rarely needed
 	void defer_init_library(Ref<GDNativeLibrary> lib, NativeScript *script);
@@ -252,10 +264,10 @@ private:
 
 	void call_libraries_cb(const StringName &name);
 
-	Vector<Pair<bool, godot_instance_binding_functions> > binding_functions;
+	Vector<Pair<bool, godot_nativescript_instance_binding_functions>> binding_functions;
 	Set<Vector<void *> *> binding_instances;
 
-	Map<int, HashMap<StringName, const void *> > global_type_tags;
+	Map<int, HashMap<StringName, const void *>> global_type_tags;
 
 	struct ProfileData {
 		StringName signature;
@@ -275,10 +287,10 @@ private:
 
 public:
 	// These two maps must only be touched on the main thread
-	Map<String, Map<StringName, NativeScriptDesc> > library_classes;
-	Map<String, Ref<GDNative> > library_gdnatives;
+	Map<String, Map<StringName, NativeScriptDesc>> library_classes;
+	Map<String, Ref<GDNative>> library_gdnatives;
 
-	Map<String, Set<NativeScript *> > library_script_users;
+	Map<String, Set<NativeScript *>> library_script_users;
 
 	StringName _init_call_type;
 	StringName _init_call_name;
@@ -318,12 +330,12 @@ public:
 	virtual void get_comment_delimiters(List<String> *p_delimiters) const;
 	virtual void get_string_delimiters(List<String> *p_delimiters) const;
 	virtual Ref<Script> get_template(const String &p_class_name, const String &p_base_class_name) const;
-	virtual bool validate(const String &p_script, int &r_line_error, int &r_col_error, String &r_test_error, const String &p_path, List<String> *r_functions, List<ScriptLanguage::Warning> *r_warnings = NULL, Set<int> *r_safe_lines = NULL) const;
+	virtual bool validate(const String &p_script, int &r_line_error, int &r_col_error, String &r_test_error, const String &p_path, List<String> *r_functions, List<ScriptLanguage::Warning> *r_warnings = nullptr, Set<int> *r_safe_lines = nullptr) const;
 	virtual Script *create_script() const;
 	virtual bool has_named_classes() const;
 	virtual bool supports_builtin_mode() const;
 	virtual int find_function(const String &p_function, const String &p_code) const;
-	virtual String make_function(const String &p_class, const String &p_name, const PoolStringArray &p_args) const;
+	virtual String make_function(const String &p_class, const String &p_name, const PackedStringArray &p_args) const;
 	virtual void auto_indent_code(String &p_code, int p_from_line, int p_to_line) const;
 	virtual void add_global_constant(const StringName &p_variable, const Variant &p_value);
 	virtual String debug_get_error() const;
@@ -339,13 +351,13 @@ public:
 	virtual void reload_tool_script(const Ref<Script> &p_script, bool p_soft_reload);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual void get_public_functions(List<MethodInfo> *p_functions) const;
-	virtual void get_public_constants(List<Pair<String, Variant> > *p_constants) const;
+	virtual void get_public_constants(List<Pair<String, Variant>> *p_constants) const;
 	virtual void profiling_start();
 	virtual void profiling_stop();
 	virtual int profiling_get_accumulated_data(ProfilingInfo *p_info_arr, int p_info_max);
 	virtual int profiling_get_frame_data(ProfilingInfo *p_info_arr, int p_info_max);
 
-	int register_binding_functions(godot_instance_binding_functions p_binding_functions);
+	int register_binding_functions(godot_nativescript_instance_binding_functions p_binding_functions);
 	void unregister_binding_functions(int p_idx);
 
 	void *get_instance_binding_data(int p_idx, Object *p_object);
@@ -366,24 +378,23 @@ public:
 
 inline NativeScriptDesc *NativeScript::get_script_desc() const {
 	Map<StringName, NativeScriptDesc>::Element *E = NativeScriptLanguage::singleton->library_classes[lib_path].find(class_name);
-	return E ? &E->get() : NULL;
+	return E ? &E->get() : nullptr;
 }
 
 class NativeReloadNode : public Node {
 	GDCLASS(NativeReloadNode, Node);
-	bool unloaded;
+	bool unloaded = false;
 
 public:
 	static void _bind_methods();
 	void _notification(int p_what);
 
-	NativeReloadNode() :
-			unloaded(false) {}
+	NativeReloadNode() {}
 };
 
 class ResourceFormatLoaderNativeScript : public ResourceFormatLoader {
 public:
-	virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
+	virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, bool p_no_cache = false);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual bool handles_type(const String &p_type) const;
 	virtual String get_resource_type(const String &p_path) const;
diff --git a/modules/gdnative/nativescript/register_types.cpp b/modules/gdnative/nativescript/register_types.cpp
index b5e8174e43..ac8c7ab2fd 100644
--- a/modules/gdnative/nativescript/register_types.cpp
+++ b/modules/gdnative/nativescript/register_types.cpp
@@ -58,7 +58,6 @@ void register_nativescript_types() {
 }
 
 void unregister_nativescript_types() {
-
 	ResourceLoader::remove_resource_format_loader(resource_loader_gdns);
 	resource_loader_gdns.unref();
 
diff --git a/modules/gdnative/nativescript/register_types.h b/modules/gdnative/nativescript/register_types.h
index 8fcecb9836..088bf38dd5 100644
--- a/modules/gdnative/nativescript/register_types.h
+++ b/modules/gdnative/nativescript/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef NATIVESCRIPT_REGISTER_TYPES_H
+#define NATIVESCRIPT_REGISTER_TYPES_H
+
 void register_nativescript_types();
 void unregister_nativescript_types();
+
+#endif // NATIVESCRIPT_REGISTER_TYPES_H
diff --git a/modules/gdnative/net/SCsub b/modules/gdnative/net/SCsub
index 18ab9986b0..b76500c003 100644
--- a/modules/gdnative/net/SCsub
+++ b/modules/gdnative/net/SCsub
@@ -1,13 +1,12 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_gdnative')
+Import("env")
+Import("env_gdnative")
 
 env_net = env_gdnative.Clone()
 
 has_webrtc = env_net["module_webrtc_enabled"]
 if has_webrtc:
-    env_net.Append(CPPDEFINES=['WEBRTC_GDNATIVE_ENABLED'])
-
-env_net.add_source_files(env.modules_sources, '*.cpp')
+    env_net.Append(CPPDEFINES=["WEBRTC_GDNATIVE_ENABLED"])
 
+env_net.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/gdnative/net/multiplayer_peer_gdnative.cpp b/modules/gdnative/net/multiplayer_peer_gdnative.cpp
index 8c43a79cc5..997eec6425 100644
--- a/modules/gdnative/net/multiplayer_peer_gdnative.cpp
+++ b/modules/gdnative/net/multiplayer_peer_gdnative.cpp
@@ -31,7 +31,7 @@
 #include "multiplayer_peer_gdnative.h"
 
 MultiplayerPeerGDNative::MultiplayerPeerGDNative() {
-	interface = NULL;
+	interface = nullptr;
 }
 
 MultiplayerPeerGDNative::~MultiplayerPeerGDNative() {
@@ -42,73 +42,73 @@ void MultiplayerPeerGDNative::set_native_multiplayer_peer(const godot_net_multip
 }
 
 Error MultiplayerPeerGDNative::get_packet(const uint8_t **r_buffer, int &r_buffer_size) {
-	ERR_FAIL_COND_V(interface == NULL, ERR_UNCONFIGURED);
+	ERR_FAIL_COND_V(interface == nullptr, ERR_UNCONFIGURED);
 	return (Error)interface->get_packet(interface->data, r_buffer, &r_buffer_size);
 }
 
 Error MultiplayerPeerGDNative::put_packet(const uint8_t *p_buffer, int p_buffer_size) {
-	ERR_FAIL_COND_V(interface == NULL, ERR_UNCONFIGURED);
+	ERR_FAIL_COND_V(interface == nullptr, ERR_UNCONFIGURED);
 	return (Error)interface->put_packet(interface->data, p_buffer, p_buffer_size);
 }
 
 int MultiplayerPeerGDNative::get_max_packet_size() const {
-	ERR_FAIL_COND_V(interface == NULL, 0);
+	ERR_FAIL_COND_V(interface == nullptr, 0);
 	return interface->get_max_packet_size(interface->data);
 }
 
 int MultiplayerPeerGDNative::get_available_packet_count() const {
-	ERR_FAIL_COND_V(interface == NULL, 0);
+	ERR_FAIL_COND_V(interface == nullptr, 0);
 	return interface->get_available_packet_count(interface->data);
 }
 
 /* NetworkedMultiplayerPeer */
 void MultiplayerPeerGDNative::set_transfer_mode(TransferMode p_mode) {
-	ERR_FAIL_COND(interface == NULL);
+	ERR_FAIL_COND(interface == nullptr);
 	interface->set_transfer_mode(interface->data, (godot_int)p_mode);
 }
 
 NetworkedMultiplayerPeer::TransferMode MultiplayerPeerGDNative::get_transfer_mode() const {
-	ERR_FAIL_COND_V(interface == NULL, TRANSFER_MODE_UNRELIABLE);
+	ERR_FAIL_COND_V(interface == nullptr, TRANSFER_MODE_UNRELIABLE);
 	return (TransferMode)interface->get_transfer_mode(interface->data);
 }
 
 void MultiplayerPeerGDNative::set_target_peer(int p_peer_id) {
-	ERR_FAIL_COND(interface == NULL);
+	ERR_FAIL_COND(interface == nullptr);
 	interface->set_target_peer(interface->data, p_peer_id);
 }
 
 int MultiplayerPeerGDNative::get_packet_peer() const {
-	ERR_FAIL_COND_V(interface == NULL, 0);
+	ERR_FAIL_COND_V(interface == nullptr, 0);
 	return interface->get_packet_peer(interface->data);
 }
 
 bool MultiplayerPeerGDNative::is_server() const {
-	ERR_FAIL_COND_V(interface == NULL, false);
+	ERR_FAIL_COND_V(interface == nullptr, false);
 	return interface->is_server(interface->data);
 }
 
 void MultiplayerPeerGDNative::poll() {
-	ERR_FAIL_COND(interface == NULL);
+	ERR_FAIL_COND(interface == nullptr);
 	interface->poll(interface->data);
 }
 
 int MultiplayerPeerGDNative::get_unique_id() const {
-	ERR_FAIL_COND_V(interface == NULL, 0);
+	ERR_FAIL_COND_V(interface == nullptr, 0);
 	return interface->get_unique_id(interface->data);
 }
 
 void MultiplayerPeerGDNative::set_refuse_new_connections(bool p_enable) {
-	ERR_FAIL_COND(interface == NULL);
+	ERR_FAIL_COND(interface == nullptr);
 	interface->set_refuse_new_connections(interface->data, p_enable);
 }
 
 bool MultiplayerPeerGDNative::is_refusing_new_connections() const {
-	ERR_FAIL_COND_V(interface == NULL, true);
+	ERR_FAIL_COND_V(interface == nullptr, true);
 	return interface->is_refusing_new_connections(interface->data);
 }
 
 NetworkedMultiplayerPeer::ConnectionStatus MultiplayerPeerGDNative::get_connection_status() const {
-	ERR_FAIL_COND_V(interface == NULL, CONNECTION_DISCONNECTED);
+	ERR_FAIL_COND_V(interface == nullptr, CONNECTION_DISCONNECTED);
 	return (ConnectionStatus)interface->get_connection_status(interface->data);
 }
 
@@ -120,7 +120,6 @@ void MultiplayerPeerGDNative::_bind_methods() {
 extern "C" {
 
 void GDAPI godot_net_bind_multiplayer_peer(godot_object *p_obj, const godot_net_multiplayer_peer *p_impl) {
-
 	((MultiplayerPeerGDNative *)p_obj)->set_native_multiplayer_peer(p_impl);
 }
 }
diff --git a/modules/gdnative/net/multiplayer_peer_gdnative.h b/modules/gdnative/net/multiplayer_peer_gdnative.h
index cfaf14936e..64d764029f 100644
--- a/modules/gdnative/net/multiplayer_peer_gdnative.h
+++ b/modules/gdnative/net/multiplayer_peer_gdnative.h
@@ -50,28 +50,28 @@ public:
 	void set_native_multiplayer_peer(const godot_net_multiplayer_peer *p_impl);
 
 	/* Specific to PacketPeer */
-	virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size);
-	virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size);
-	virtual int get_max_packet_size() const;
-	virtual int get_available_packet_count() const;
+	virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size) override;
+	virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size) override;
+	virtual int get_max_packet_size() const override;
+	virtual int get_available_packet_count() const override;
 
 	/* Specific to NetworkedMultiplayerPeer */
-	virtual void set_transfer_mode(TransferMode p_mode);
-	virtual TransferMode get_transfer_mode() const;
-	virtual void set_target_peer(int p_peer_id);
+	virtual void set_transfer_mode(TransferMode p_mode) override;
+	virtual TransferMode get_transfer_mode() const override;
+	virtual void set_target_peer(int p_peer_id) override;
 
-	virtual int get_packet_peer() const;
+	virtual int get_packet_peer() const override;
 
-	virtual bool is_server() const;
+	virtual bool is_server() const override;
 
-	virtual void poll();
+	virtual void poll() override;
 
-	virtual int get_unique_id() const;
+	virtual int get_unique_id() const override;
 
-	virtual void set_refuse_new_connections(bool p_enable);
-	virtual bool is_refusing_new_connections() const;
+	virtual void set_refuse_new_connections(bool p_enable) override;
+	virtual bool is_refusing_new_connections() const override;
 
-	virtual ConnectionStatus get_connection_status() const;
+	virtual ConnectionStatus get_connection_status() const override;
 };
 
 #endif // MULTIPLAYER_PEER_GDNATIVE_H
diff --git a/modules/gdnative/net/packet_peer_gdnative.cpp b/modules/gdnative/net/packet_peer_gdnative.cpp
index 75e1e0b824..6bb21cb48d 100644
--- a/modules/gdnative/net/packet_peer_gdnative.cpp
+++ b/modules/gdnative/net/packet_peer_gdnative.cpp
@@ -31,7 +31,7 @@
 #include "packet_peer_gdnative.h"
 
 PacketPeerGDNative::PacketPeerGDNative() {
-	interface = NULL;
+	interface = nullptr;
 }
 
 PacketPeerGDNative::~PacketPeerGDNative() {
@@ -45,29 +45,28 @@ void PacketPeerGDNative::_bind_methods() {
 }
 
 Error PacketPeerGDNative::get_packet(const uint8_t **r_buffer, int &r_buffer_size) {
-	ERR_FAIL_COND_V(interface == NULL, ERR_UNCONFIGURED);
+	ERR_FAIL_COND_V(interface == nullptr, ERR_UNCONFIGURED);
 	return (Error)interface->get_packet(interface->data, r_buffer, &r_buffer_size);
 }
 
 Error PacketPeerGDNative::put_packet(const uint8_t *p_buffer, int p_buffer_size) {
-	ERR_FAIL_COND_V(interface == NULL, ERR_UNCONFIGURED);
+	ERR_FAIL_COND_V(interface == nullptr, ERR_UNCONFIGURED);
 	return (Error)interface->put_packet(interface->data, p_buffer, p_buffer_size);
 }
 
 int PacketPeerGDNative::get_max_packet_size() const {
-	ERR_FAIL_COND_V(interface == NULL, 0);
+	ERR_FAIL_COND_V(interface == nullptr, 0);
 	return interface->get_max_packet_size(interface->data);
 }
 
 int PacketPeerGDNative::get_available_packet_count() const {
-	ERR_FAIL_COND_V(interface == NULL, 0);
+	ERR_FAIL_COND_V(interface == nullptr, 0);
 	return interface->get_available_packet_count(interface->data);
 }
 
 extern "C" {
 
 void GDAPI godot_net_bind_packet_peer(godot_object *p_obj, const godot_net_packet_peer *p_impl) {
-
 	((PacketPeerGDNative *)p_obj)->set_native_packet_peer(p_impl);
 }
 }
diff --git a/modules/gdnative/net/packet_peer_gdnative.h b/modules/gdnative/net/packet_peer_gdnative.h
index 78d8bb32b6..00de8f7f4c 100644
--- a/modules/gdnative/net/packet_peer_gdnative.h
+++ b/modules/gdnative/net/packet_peer_gdnative.h
@@ -50,10 +50,10 @@ public:
 	void set_native_packet_peer(const godot_net_packet_peer *p_impl);
 
 	/* Specific to PacketPeer */
-	virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size);
-	virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size);
-	virtual int get_max_packet_size() const;
-	virtual int get_available_packet_count() const;
+	virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size) override;
+	virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size) override;
+	virtual int get_max_packet_size() const override;
+	virtual int get_available_packet_count() const override;
 };
 
 #endif // PACKET_PEER_GDNATIVE_H
diff --git a/modules/gdnative/net/register_types.h b/modules/gdnative/net/register_types.h
index 526bc49deb..70b266f9b9 100644
--- a/modules/gdnative/net/register_types.h
+++ b/modules/gdnative/net/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef NET_REGISTER_TYPES_H
+#define NET_REGISTER_TYPES_H
+
 void register_net_types();
 void unregister_net_types();
+
+#endif // NET_REGISTER_TYPES_H
diff --git a/modules/gdnative/net/stream_peer_gdnative.cpp b/modules/gdnative/net/stream_peer_gdnative.cpp
index 22634daf5f..9dcb184115 100644
--- a/modules/gdnative/net/stream_peer_gdnative.cpp
+++ b/modules/gdnative/net/stream_peer_gdnative.cpp
@@ -31,7 +31,7 @@
 #include "stream_peer_gdnative.h"
 
 StreamPeerGDNative::StreamPeerGDNative() {
-	interface = NULL;
+	interface = nullptr;
 }
 
 StreamPeerGDNative::~StreamPeerGDNative() {
@@ -45,27 +45,27 @@ void StreamPeerGDNative::_bind_methods() {
 }
 
 Error StreamPeerGDNative::put_data(const uint8_t *p_data, int p_bytes) {
-	ERR_FAIL_COND_V(interface == NULL, ERR_UNCONFIGURED);
+	ERR_FAIL_COND_V(interface == nullptr, ERR_UNCONFIGURED);
 	return (Error)(interface->put_data(interface->data, p_data, p_bytes));
 }
 
 Error StreamPeerGDNative::put_partial_data(const uint8_t *p_data, int p_bytes, int &r_sent) {
-	ERR_FAIL_COND_V(interface == NULL, ERR_UNCONFIGURED);
+	ERR_FAIL_COND_V(interface == nullptr, ERR_UNCONFIGURED);
 	return (Error)(interface->put_partial_data(interface->data, p_data, p_bytes, &r_sent));
 }
 
 Error StreamPeerGDNative::get_data(uint8_t *p_buffer, int p_bytes) {
-	ERR_FAIL_COND_V(interface == NULL, ERR_UNCONFIGURED);
+	ERR_FAIL_COND_V(interface == nullptr, ERR_UNCONFIGURED);
 	return (Error)(interface->get_data(interface->data, p_buffer, p_bytes));
 }
 
 Error StreamPeerGDNative::get_partial_data(uint8_t *p_buffer, int p_bytes, int &r_received) {
-	ERR_FAIL_COND_V(interface == NULL, ERR_UNCONFIGURED);
+	ERR_FAIL_COND_V(interface == nullptr, ERR_UNCONFIGURED);
 	return (Error)(interface->get_partial_data(interface->data, p_buffer, p_bytes, &r_received));
 }
 
 int StreamPeerGDNative::get_available_bytes() const {
-	ERR_FAIL_COND_V(interface == NULL, 0);
+	ERR_FAIL_COND_V(interface == nullptr, 0);
 	return interface->get_available_bytes(interface->data);
 }
 
diff --git a/modules/gdnative/net/stream_peer_gdnative.h b/modules/gdnative/net/stream_peer_gdnative.h
index f3711e0f0f..302fb48012 100644
--- a/modules/gdnative/net/stream_peer_gdnative.h
+++ b/modules/gdnative/net/stream_peer_gdnative.h
@@ -36,7 +36,6 @@
 #include "modules/gdnative/include/net/godot_net.h"
 
 class StreamPeerGDNative : public StreamPeer {
-
 	GDCLASS(StreamPeerGDNative, StreamPeer);
 
 protected:
@@ -51,11 +50,11 @@ public:
 	void set_native_stream_peer(const godot_net_stream_peer *p_interface);
 
 	/* Specific to StreamPeer */
-	Error put_data(const uint8_t *p_data, int p_bytes);
-	Error put_partial_data(const uint8_t *p_data, int p_bytes, int &r_sent);
-	Error get_data(uint8_t *p_buffer, int p_bytes);
-	Error get_partial_data(uint8_t *p_buffer, int p_bytes, int &r_received);
-	int get_available_bytes() const;
+	Error put_data(const uint8_t *p_data, int p_bytes) override;
+	Error put_partial_data(const uint8_t *p_data, int p_bytes, int &r_sent) override;
+	Error get_data(uint8_t *p_buffer, int p_bytes) override;
+	Error get_partial_data(uint8_t *p_buffer, int p_bytes, int &r_received) override;
+	int get_available_bytes() const override;
 };
 
 #endif // STREAM_PEER_GDNATIVE_H
diff --git a/modules/gdnative/pluginscript/SCsub b/modules/gdnative/pluginscript/SCsub
index 20eaa99592..0b2db3b504 100644
--- a/modules/gdnative/pluginscript/SCsub
+++ b/modules/gdnative/pluginscript/SCsub
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_gdnative')
+Import("env")
+Import("env_gdnative")
 
-env_gdnative.add_source_files(env.modules_sources, '*.cpp')
+env_gdnative.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/gdnative/pluginscript/pluginscript_instance.cpp b/modules/gdnative/pluginscript/pluginscript_instance.cpp
index c64a00a4d9..7d17a7d5ab 100644
--- a/modules/gdnative/pluginscript/pluginscript_instance.cpp
+++ b/modules/gdnative/pluginscript/pluginscript_instance.cpp
@@ -39,13 +39,11 @@
 #include "pluginscript_script.h"
 
 bool PluginScriptInstance::set(const StringName &p_name, const Variant &p_value) {
-	String name = String(p_name);
-	return _desc->set_prop(_data, (const godot_string *)&name, (const godot_variant *)&p_value);
+	return _desc->set_prop(_data, (const godot_string_name *)&p_name, (const godot_variant *)&p_value);
 }
 
 bool PluginScriptInstance::get(const StringName &p_name, Variant &r_ret) const {
-	String name = String(p_name);
-	return _desc->get_prop(_data, (const godot_string *)&name, (godot_variant *)&r_ret);
+	return _desc->get_prop(_data, (const godot_string_name *)&p_name, (godot_variant *)&r_ret);
 }
 
 Ref<Script> PluginScriptInstance::get_script() const {
@@ -81,7 +79,7 @@ bool PluginScriptInstance::has_method(const StringName &p_method) const {
 	return _script->has_method(p_method);
 }
 
-Variant PluginScriptInstance::call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error) {
+Variant PluginScriptInstance::call(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
 	// TODO: optimize when calling a Godot method from Godot to avoid param conversion ?
 	godot_variant ret = _desc->call_method(
 			_data, (godot_string_name *)&p_method, (const godot_variant **)p_args,
@@ -95,10 +93,42 @@ void PluginScriptInstance::notification(int p_notification) {
 	_desc->notification(_data, p_notification);
 }
 
+Vector<ScriptNetData> PluginScriptInstance::get_rpc_methods() const {
+	return _script->get_rpc_methods();
+}
+
+uint16_t PluginScriptInstance::get_rpc_method_id(const StringName &p_variable) const {
+	return _script->get_rpc_method_id(p_variable);
+}
+
+StringName PluginScriptInstance::get_rpc_method(uint16_t p_id) const {
+	return _script->get_rpc_method(p_id);
+}
+
+MultiplayerAPI::RPCMode PluginScriptInstance::get_rpc_mode_by_id(uint16_t p_id) const {
+	return _script->get_rpc_mode_by_id(p_id);
+}
+
 MultiplayerAPI::RPCMode PluginScriptInstance::get_rpc_mode(const StringName &p_method) const {
 	return _script->get_rpc_mode(p_method);
 }
 
+Vector<ScriptNetData> PluginScriptInstance::get_rset_properties() const {
+	return _script->get_rset_properties();
+}
+
+uint16_t PluginScriptInstance::get_rset_property_id(const StringName &p_variable) const {
+	return _script->get_rset_property_id(p_variable);
+}
+
+StringName PluginScriptInstance::get_rset_property(uint16_t p_id) const {
+	return _script->get_rset_property(p_id);
+}
+
+MultiplayerAPI::RPCMode PluginScriptInstance::get_rset_mode_by_id(uint16_t p_id) const {
+	return _script->get_rset_mode_by_id(p_id);
+}
+
 MultiplayerAPI::RPCMode PluginScriptInstance::get_rset_mode(const StringName &p_variable) const {
 	return _script->get_rset_mode(p_variable);
 }
@@ -126,7 +156,7 @@ bool PluginScriptInstance::init(PluginScript *p_script, Object *p_owner) {
 	_script = Ref<PluginScript>(p_script);
 	_desc = &p_script->_desc->instance_desc;
 	_data = _desc->init(p_script->_data, (godot_object *)p_owner);
-	ERR_FAIL_COND_V(_data == NULL, false);
+	ERR_FAIL_COND_V(_data == nullptr, false);
 	p_owner->set_script_instance(this);
 	return true;
 }
diff --git a/modules/gdnative/pluginscript/pluginscript_instance.h b/modules/gdnative/pluginscript/pluginscript_instance.h
index dc1229a44d..690d1a0432 100644
--- a/modules/gdnative/pluginscript/pluginscript_instance.h
+++ b/modules/gdnative/pluginscript/pluginscript_instance.h
@@ -55,18 +55,12 @@ public:
 	virtual bool set(const StringName &p_name, const Variant &p_value);
 	virtual bool get(const StringName &p_name, Variant &r_ret) const;
 	virtual void get_property_list(List<PropertyInfo> *p_properties) const;
-	virtual Variant::Type get_property_type(const StringName &p_name, bool *r_is_valid = NULL) const;
+	virtual Variant::Type get_property_type(const StringName &p_name, bool *r_is_valid = nullptr) const;
 
 	virtual void get_method_list(List<MethodInfo> *p_list) const;
 	virtual bool has_method(const StringName &p_method) const;
 
-	virtual Variant call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error);
-
-	// Rely on default implementations provided by ScriptInstance for the moment.
-	// Note that multilevel call could be removed in 3.0 release, so stay tuned
-	// (see https://godotengine.org/qa/9244/can-override-the-_ready-and-_process-functions-child-classes)
-	//virtual void call_multilevel(const StringName& p_method,const Variant** p_args,int p_argcount);
-	//virtual void call_multilevel_reversed(const StringName& p_method,const Variant** p_args,int p_argcount);
+	virtual Variant call(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error);
 
 	virtual void notification(int p_notification);
 
@@ -76,7 +70,16 @@ public:
 
 	void set_path(const String &p_path);
 
+	virtual Vector<ScriptNetData> get_rpc_methods() const;
+	virtual uint16_t get_rpc_method_id(const StringName &p_method) const;
+	virtual StringName get_rpc_method(uint16_t p_id) const;
+	virtual MultiplayerAPI::RPCMode get_rpc_mode_by_id(uint16_t p_id) const;
 	virtual MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const;
+
+	virtual Vector<ScriptNetData> get_rset_properties() const;
+	virtual uint16_t get_rset_property_id(const StringName &p_variable) const;
+	virtual StringName get_rset_property(uint16_t p_id) const;
+	virtual MultiplayerAPI::RPCMode get_rset_mode_by_id(uint16_t p_id) const;
 	virtual MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const;
 
 	virtual void refcount_incremented();
diff --git a/modules/gdnative/pluginscript/pluginscript_language.cpp b/modules/gdnative/pluginscript/pluginscript_language.cpp
index 41f0e34243..bccbe95033 100644
--- a/modules/gdnative/pluginscript/pluginscript_language.cpp
+++ b/modules/gdnative/pluginscript/pluginscript_language.cpp
@@ -109,7 +109,7 @@ Ref<Script> PluginScriptLanguage::get_template(const String &p_class_name, const
 }
 
 bool PluginScriptLanguage::validate(const String &p_script, int &r_line_error, int &r_col_error, String &r_test_error, const String &p_path, List<String> *r_functions, List<ScriptLanguage::Warning> *r_warnings, Set<int> *r_safe_lines) const {
-	PoolStringArray functions;
+	PackedStringArray functions;
 	if (_desc.validate) {
 		bool ret = _desc.validate(
 				_data,
@@ -118,7 +118,7 @@ bool PluginScriptLanguage::validate(const String &p_script, int &r_line_error, i
 				&r_col_error,
 				(godot_string *)&r_test_error,
 				(godot_string *)&p_path,
-				(godot_pool_string_array *)&functions);
+				(godot_packed_string_array *)&functions);
 		for (int i = 0; i < functions.size(); i++) {
 			r_functions->push_back(functions[i]);
 		}
@@ -149,9 +149,9 @@ int PluginScriptLanguage::find_function(const String &p_function, const String &
 	return -1;
 }
 
-String PluginScriptLanguage::make_function(const String &p_class, const String &p_name, const PoolStringArray &p_args) const {
+String PluginScriptLanguage::make_function(const String &p_class, const String &p_name, const PackedStringArray &p_args) const {
 	if (_desc.make_function) {
-		godot_string tmp = _desc.make_function(_data, (godot_string *)&p_class, (godot_string *)&p_name, (godot_pool_string_array *)&p_args);
+		godot_string tmp = _desc.make_function(_data, (godot_string *)&p_class, (godot_string *)&p_name, (godot_packed_string_array *)&p_args);
 		String ret = *(String *)&tmp;
 		godot_string_destroy(&tmp);
 		return ret;
@@ -187,8 +187,7 @@ void PluginScriptLanguage::auto_indent_code(String &p_code, int p_from_line, int
 }
 
 void PluginScriptLanguage::add_global_constant(const StringName &p_variable, const Variant &p_value) {
-	const String variable = String(p_variable);
-	_desc.add_global_constant(_data, (godot_string *)&variable, (godot_variant *)&p_value);
+	_desc.add_global_constant(_data, (godot_string_name *)&p_variable, (godot_variant *)&p_value);
 }
 
 /* LOADER FUNCTIONS */
@@ -211,7 +210,7 @@ void PluginScriptLanguage::get_public_functions(List<MethodInfo> *p_functions) c
 	}
 }
 
-void PluginScriptLanguage::get_public_constants(List<Pair<String, Variant> > *p_constants) const {
+void PluginScriptLanguage::get_public_constants(List<Pair<String, Variant>> *p_constants) const {
 	// TODO: provide this statically in `godot_pluginscript_language_desc` ?
 	if (_desc.get_public_constants) {
 		Dictionary constants;
@@ -337,9 +336,9 @@ String PluginScriptLanguage::debug_get_stack_level_source(int p_level) const {
 
 void PluginScriptLanguage::debug_get_stack_level_locals(int p_level, List<String> *p_locals, List<Variant> *p_values, int p_max_subitems, int p_max_depth) {
 	if (_desc.debug_get_stack_level_locals) {
-		PoolStringArray locals;
+		PackedStringArray locals;
 		Array values;
-		_desc.debug_get_stack_level_locals(_data, p_level, (godot_pool_string_array *)&locals, (godot_array *)&values, p_max_subitems, p_max_depth);
+		_desc.debug_get_stack_level_locals(_data, p_level, (godot_packed_string_array *)&locals, (godot_array *)&values, p_max_subitems, p_max_depth);
 		for (int i = 0; i < locals.size(); i++) {
 			p_locals->push_back(locals[i]);
 		}
@@ -351,9 +350,9 @@ void PluginScriptLanguage::debug_get_stack_level_locals(int p_level, List<String
 
 void PluginScriptLanguage::debug_get_stack_level_members(int p_level, List<String> *p_members, List<Variant> *p_values, int p_max_subitems, int p_max_depth) {
 	if (_desc.debug_get_stack_level_members) {
-		PoolStringArray members;
+		PackedStringArray members;
 		Array values;
-		_desc.debug_get_stack_level_members(_data, p_level, (godot_pool_string_array *)&members, (godot_array *)&values, p_max_subitems, p_max_depth);
+		_desc.debug_get_stack_level_members(_data, p_level, (godot_packed_string_array *)&members, (godot_array *)&values, p_max_subitems, p_max_depth);
 		for (int i = 0; i < members.size(); i++) {
 			p_members->push_back(members[i]);
 		}
@@ -365,9 +364,9 @@ void PluginScriptLanguage::debug_get_stack_level_members(int p_level, List<Strin
 
 void PluginScriptLanguage::debug_get_globals(List<String> *p_locals, List<Variant> *p_values, int p_max_subitems, int p_max_depth) {
 	if (_desc.debug_get_globals) {
-		PoolStringArray locals;
+		PackedStringArray locals;
 		Array values;
-		_desc.debug_get_globals(_data, (godot_pool_string_array *)&locals, (godot_array *)&values, p_max_subitems, p_max_depth);
+		_desc.debug_get_globals(_data, (godot_packed_string_array *)&locals, (godot_array *)&values, p_max_subitems, p_max_depth);
 		for (int i = 0; i < locals.size(); i++) {
 			p_locals->push_back(locals[i]);
 		}
@@ -400,39 +399,18 @@ void PluginScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool
 }
 
 void PluginScriptLanguage::lock() {
-#ifndef NO_THREADS
-	if (_lock) {
-		_lock->lock();
-	}
-#endif
+	_lock.lock();
 }
 
 void PluginScriptLanguage::unlock() {
-#ifndef NO_THREADS
-	if (_lock) {
-		_lock->unlock();
-	}
-#endif
+	_lock.unlock();
 }
 
 PluginScriptLanguage::PluginScriptLanguage(const godot_pluginscript_language_desc *desc) :
 		_desc(*desc) {
 	_resource_loader = Ref<ResourceFormatLoaderPluginScript>(memnew(ResourceFormatLoaderPluginScript(this)));
 	_resource_saver = Ref<ResourceFormatSaverPluginScript>(memnew(ResourceFormatSaverPluginScript(this)));
-
-// TODO: totally remove _lock attribute if NO_THREADS is set
-#ifdef NO_THREADS
-	_lock = NULL;
-#else
-	_lock = Mutex::create();
-#endif
 }
 
 PluginScriptLanguage::~PluginScriptLanguage() {
-#ifndef NO_THREADS
-	if (_lock) {
-		memdelete(_lock);
-		_lock = NULL;
-	}
-#endif
 }
diff --git a/modules/gdnative/pluginscript/pluginscript_language.h b/modules/gdnative/pluginscript/pluginscript_language.h
index 145ab5599c..dd6758713f 100644
--- a/modules/gdnative/pluginscript/pluginscript_language.h
+++ b/modules/gdnative/pluginscript/pluginscript_language.h
@@ -53,7 +53,7 @@ class PluginScriptLanguage : public ScriptLanguage {
 	const godot_pluginscript_language_desc _desc;
 	godot_pluginscript_language_data *_data;
 
-	Mutex *_lock;
+	Mutex _lock;
 	SelfList<PluginScript>::List _script_list;
 
 public:
@@ -74,13 +74,13 @@ public:
 	virtual void get_comment_delimiters(List<String> *p_delimiters) const;
 	virtual void get_string_delimiters(List<String> *p_delimiters) const;
 	virtual Ref<Script> get_template(const String &p_class_name, const String &p_base_class_name) const;
-	virtual bool validate(const String &p_script, int &r_line_error, int &r_col_error, String &r_test_error, const String &p_path = "", List<String> *r_functions = NULL, List<ScriptLanguage::Warning> *r_warnings = NULL, Set<int> *r_safe_lines = NULL) const;
+	virtual bool validate(const String &p_script, int &r_line_error, int &r_col_error, String &r_test_error, const String &p_path = "", List<String> *r_functions = nullptr, List<ScriptLanguage::Warning> *r_warnings = nullptr, Set<int> *r_safe_lines = nullptr) const;
 	virtual Script *create_script() const;
 	virtual bool has_named_classes() const;
 	virtual bool supports_builtin_mode() const;
 	virtual bool can_inherit_from_file() { return true; }
 	virtual int find_function(const String &p_function, const String &p_code) const;
-	virtual String make_function(const String &p_class, const String &p_name, const PoolStringArray &p_args) const;
+	virtual String make_function(const String &p_class, const String &p_name, const PackedStringArray &p_args) const;
 	virtual Error complete_code(const String &p_code, const String &p_path, Object *p_owner, List<ScriptCodeCompletionOption> *r_options, bool &r_force, String &r_call_hint);
 	virtual void auto_indent_code(String &p_code, int p_from_line, int p_to_line) const;
 	virtual void add_global_constant(const StringName &p_variable, const Variant &p_value);
@@ -112,7 +112,7 @@ public:
 
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual void get_public_functions(List<MethodInfo> *p_functions) const;
-	virtual void get_public_constants(List<Pair<String, Variant> > *p_constants) const;
+	virtual void get_public_constants(List<Pair<String, Variant>> *p_constants) const;
 
 	virtual void profiling_start();
 	virtual void profiling_stop();
diff --git a/modules/gdnative/pluginscript/pluginscript_loader.cpp b/modules/gdnative/pluginscript/pluginscript_loader.cpp
index fe1cc83c69..4feee4f4a5 100644
--- a/modules/gdnative/pluginscript/pluginscript_loader.cpp
+++ b/modules/gdnative/pluginscript/pluginscript_loader.cpp
@@ -39,9 +39,10 @@ ResourceFormatLoaderPluginScript::ResourceFormatLoaderPluginScript(PluginScriptL
 	_language = language;
 }
 
-RES ResourceFormatLoaderPluginScript::load(const String &p_path, const String &p_original_path, Error *r_error) {
-	if (r_error)
+RES ResourceFormatLoaderPluginScript::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, bool p_no_cache) {
+	if (r_error) {
 		*r_error = ERR_FILE_CANT_OPEN;
+	}
 
 	PluginScript *script = memnew(PluginScript);
 	script->init(_language);
@@ -55,8 +56,9 @@ RES ResourceFormatLoaderPluginScript::load(const String &p_path, const String &p
 
 	script->reload();
 
-	if (r_error)
+	if (r_error) {
 		*r_error = OK;
+	}
 
 	return scriptres;
 }
@@ -71,8 +73,9 @@ bool ResourceFormatLoaderPluginScript::handles_type(const String &p_type) const
 
 String ResourceFormatLoaderPluginScript::get_resource_type(const String &p_path) const {
 	String el = p_path.get_extension().to_lower();
-	if (el == _language->get_extension())
+	if (el == _language->get_extension()) {
 		return _language->get_type();
+	}
 	return "";
 }
 
@@ -101,13 +104,11 @@ Error ResourceFormatSaverPluginScript::save(const String &p_path, const RES &p_r
 }
 
 void ResourceFormatSaverPluginScript::get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const {
-
 	if (Object::cast_to<PluginScript>(*p_resource)) {
 		p_extensions->push_back(_language->get_extension());
 	}
 }
 
 bool ResourceFormatSaverPluginScript::recognize(const RES &p_resource) const {
-
-	return Object::cast_to<PluginScript>(*p_resource) != NULL;
+	return Object::cast_to<PluginScript>(*p_resource) != nullptr;
 }
diff --git a/modules/gdnative/pluginscript/pluginscript_loader.h b/modules/gdnative/pluginscript/pluginscript_loader.h
index ede31c027e..35fc79c2ca 100644
--- a/modules/gdnative/pluginscript/pluginscript_loader.h
+++ b/modules/gdnative/pluginscript/pluginscript_loader.h
@@ -39,19 +39,17 @@
 class PluginScriptLanguage;
 
 class ResourceFormatLoaderPluginScript : public ResourceFormatLoader {
-
 	PluginScriptLanguage *_language;
 
 public:
 	ResourceFormatLoaderPluginScript(PluginScriptLanguage *language);
-	virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
+	virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, bool p_no_cache = false);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual bool handles_type(const String &p_type) const;
 	virtual String get_resource_type(const String &p_path) const;
 };
 
 class ResourceFormatSaverPluginScript : public ResourceFormatSaver {
-
 	PluginScriptLanguage *_language;
 
 public:
diff --git a/modules/gdnative/pluginscript/pluginscript_script.cpp b/modules/gdnative/pluginscript/pluginscript_script.cpp
index cc5bdee0a1..87c6288806 100644
--- a/modules/gdnative/pluginscript/pluginscript_script.cpp
+++ b/modules/gdnative/pluginscript/pluginscript_script.cpp
@@ -34,6 +34,8 @@
 #include "pluginscript_instance.h"
 #include "pluginscript_script.h"
 
+#include <stdint.h>
+
 #ifdef DEBUG_ENABLED
 #define __ASSERT_SCRIPT_REASON "Cannot retrieve PluginScript class for this script, is your code correct?"
 #define ASSERT_SCRIPT_VALID()                                       \
@@ -53,9 +55,8 @@ void PluginScript::_bind_methods() {
 	ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT, "new", &PluginScript::_new, MethodInfo("new"));
 }
 
-PluginScriptInstance *PluginScript::_create_instance(const Variant **p_args, int p_argcount, Object *p_owner, Variant::CallError &r_error) {
-
-	r_error.error = Variant::CallError::CALL_OK;
+PluginScriptInstance *PluginScript::_create_instance(const Variant **p_args, int p_argcount, Object *p_owner, Callable::CallError &r_error) {
+	r_error.error = Callable::CallError::CALL_OK;
 
 	// Create instance
 	PluginScriptInstance *instance = memnew(PluginScriptInstance());
@@ -65,9 +66,9 @@ PluginScriptInstance *PluginScript::_create_instance(const Variant **p_args, int
 		_instances.insert(instance->get_owner());
 		_language->unlock();
 	} else {
-		r_error.error = Variant::CallError::CALL_ERROR_INSTANCE_IS_NULL;
+		r_error.error = Callable::CallError::CALL_ERROR_INSTANCE_IS_NULL;
 		memdelete(instance);
-		ERR_FAIL_V(NULL);
+		ERR_FAIL_V(nullptr);
 	}
 
 	// Construct
@@ -81,17 +82,16 @@ PluginScriptInstance *PluginScript::_create_instance(const Variant **p_args, int
 	return instance;
 }
 
-Variant PluginScript::_new(const Variant **p_args, int p_argcount, Variant::CallError &r_error) {
-
-	r_error.error = Variant::CallError::CALL_OK;
+Variant PluginScript::_new(const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
+	r_error.error = Callable::CallError::CALL_OK;
 
 	if (!_valid) {
-		r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+		r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 		return Variant();
 	}
 
 	REF ref;
-	Object *owner = NULL;
+	Object *owner = nullptr;
 
 	if (get_instance_base_type() == "") {
 		owner = memnew(Reference);
@@ -100,7 +100,7 @@ Variant PluginScript::_new(const Variant **p_args, int p_argcount, Variant::Call
 	}
 
 	if (!owner) {
-		r_error.error = Variant::CallError::CALL_ERROR_INSTANCE_IS_NULL;
+		r_error.error = Callable::CallError::CALL_ERROR_INSTANCE_IS_NULL;
 		return Variant();
 	}
 
@@ -138,6 +138,13 @@ bool PluginScript::can_instance() const {
 	return can;
 }
 
+bool PluginScript::inherits_script(const Ref<Script> &p_script) const {
+#ifndef _MSC_VER
+#warning inheritance needs to be implemented in PluginScript
+#endif
+	return false;
+}
+
 Ref<Script> PluginScript::get_base_script() const {
 	if (_ref_base_parent.is_valid()) {
 		return Ref<PluginScript>(_ref_base_parent);
@@ -147,10 +154,12 @@ Ref<Script> PluginScript::get_base_script() const {
 }
 
 StringName PluginScript::get_instance_base_type() const {
-	if (_native_parent)
+	if (_native_parent) {
 		return _native_parent;
-	if (_ref_base_parent.is_valid())
+	}
+	if (_ref_base_parent.is_valid()) {
 		return _ref_base_parent->get_instance_base_type();
+	}
 	return StringName();
 }
 
@@ -158,7 +167,6 @@ void PluginScript::update_exports() {
 #ifdef TOOLS_ENABLED
 	ASSERT_SCRIPT_VALID();
 	if (placeholders.size()) {
-
 		//update placeholders if any
 		Map<StringName, Variant> propdefvalues;
 		List<PropertyInfo> propinfos;
@@ -173,7 +181,7 @@ void PluginScript::update_exports() {
 
 // TODO: rename p_this "p_owner" ?
 ScriptInstance *PluginScript::instance_create(Object *p_this) {
-	ASSERT_SCRIPT_VALID_V(NULL);
+	ASSERT_SCRIPT_VALID_V(nullptr);
 	// TODO check script validity ?
 	if (!_tool && !ScriptServer::is_scripting_enabled()) {
 #ifdef TOOLS_ENABLED
@@ -183,7 +191,7 @@ ScriptInstance *PluginScript::instance_create(Object *p_this) {
 		update_exports();
 		return si;
 #else
-		return NULL;
+		return nullptr;
 #endif
 	}
 
@@ -192,15 +200,15 @@ ScriptInstance *PluginScript::instance_create(Object *p_this) {
 		if (!ClassDB::is_parent_class(p_this->get_class_name(), base_type)) {
 			String msg = "Script inherits from native type '" + String(base_type) + "', so it can't be instanced in object of type: '" + p_this->get_class() + "'";
 			// TODO: implement PluginscriptLanguage::debug_break_parse
-			// if (ScriptDebugger::get_singleton()) {
+			// if (EngineDebugger::is_active()) {
 			// 	_language->debug_break_parse(get_path(), 0, msg);
 			// }
-			ERR_FAIL_V_MSG(NULL, msg);
+			ERR_FAIL_V_MSG(nullptr, msg);
 		}
 	}
 
-	Variant::CallError unchecked_error;
-	return _create_instance(NULL, 0, p_this, unchecked_error);
+	Callable::CallError unchecked_error;
+	return _create_instance(nullptr, 0, p_this, unchecked_error);
 }
 
 bool PluginScript::instance_has(const Object *p_this) const {
@@ -220,8 +228,9 @@ String PluginScript::get_source_code() const {
 }
 
 void PluginScript::set_source_code(const String &p_code) {
-	if (_source == p_code)
+	if (_source == p_code) {
 		return;
+	}
 	_source = p_code;
 }
 
@@ -235,11 +244,13 @@ Error PluginScript::reload(bool p_keep_state) {
 	_valid = false;
 	String basedir = _path;
 
-	if (basedir == "")
+	if (basedir == "") {
 		basedir = get_path();
+	}
 
-	if (basedir != "")
+	if (basedir != "") {
 		basedir = basedir.get_base_dir();
+	}
 
 	if (_data) {
 		_desc->finish(_data);
@@ -272,7 +283,6 @@ Error PluginScript::reload(bool p_keep_state) {
 	// ClassDB name (i.e. `Node2D`) or a resource path (i.e. `res://foo/bar.gd`)
 	StringName *base_name = (StringName *)&manifest.base;
 	if (*base_name) {
-
 		if (ClassDB::class_exists(*base_name)) {
 			_native_parent = *base_name;
 		} else {
@@ -294,22 +304,35 @@ Error PluginScript::reload(bool p_keep_state) {
 	_tool = manifest.is_tool;
 
 	Dictionary *members = (Dictionary *)&manifest.member_lines;
-	for (const Variant *key = members->next(); key != NULL; key = members->next(key)) {
+	for (const Variant *key = members->next(); key != nullptr; key = members->next(key)) {
 		_member_lines[*key] = (*members)[*key];
 	}
 	Array *methods = (Array *)&manifest.methods;
+	_rpc_methods.clear();
+	_rpc_variables.clear();
+	if (_ref_base_parent.is_valid()) {
+		_rpc_methods = _ref_base_parent->get_rpc_methods();
+		_rpc_variables = _ref_base_parent->get_rset_properties();
+	}
 	for (int i = 0; i < methods->size(); ++i) {
 		Dictionary v = (*methods)[i];
 		MethodInfo mi = MethodInfo::from_dict(v);
 		_methods_info[mi.name] = mi;
 		// rpc_mode is passed as an optional field and is not part of MethodInfo
 		Variant var = v["rpc_mode"];
-		if (var == Variant()) {
-			_methods_rpc_mode[mi.name] = MultiplayerAPI::RPC_MODE_DISABLED;
-		} else {
-			_methods_rpc_mode[mi.name] = MultiplayerAPI::RPCMode(int(var));
+		if (var != Variant()) {
+			ScriptNetData nd;
+			nd.name = mi.name;
+			nd.mode = MultiplayerAPI::RPCMode(int(var));
+			if (_rpc_methods.find(nd) == -1) {
+				_rpc_methods.push_back(nd);
+			}
 		}
 	}
+
+	// Sort so we are 100% that they are always the same.
+	_rpc_methods.sort_custom<SortNetData>();
+
 	Array *signals = (Array *)&manifest.signals;
 	for (int i = 0; i < signals->size(); ++i) {
 		Variant v = (*signals)[i];
@@ -324,13 +347,19 @@ Error PluginScript::reload(bool p_keep_state) {
 		_properties_default_values[pi.name] = v["default_value"];
 		// rset_mode is passed as an optional field and is not part of PropertyInfo
 		Variant var = v["rset_mode"];
-		if (var == Variant()) {
-			_methods_rpc_mode[pi.name] = MultiplayerAPI::RPC_MODE_DISABLED;
-		} else {
-			_methods_rpc_mode[pi.name] = MultiplayerAPI::RPCMode(int(var));
+		if (var != Variant()) {
+			ScriptNetData nd;
+			nd.name = pi.name;
+			nd.mode = MultiplayerAPI::RPCMode(int(var));
+			if (_rpc_variables.find(nd) == -1) {
+				_rpc_variables.push_back(nd);
+			}
 		}
 	}
 
+	// Sort so we are 100% that they are always the same.
+	_rpc_variables.sort_custom<SortNetData>();
+
 #ifdef TOOLS_ENABLED
 /*for (Set<PlaceHolderScriptInstance*>::Element *E=placeholders.front();E;E=E->next()) {
 
@@ -345,14 +374,14 @@ Error PluginScript::reload(bool p_keep_state) {
 
 void PluginScript::get_script_method_list(List<MethodInfo> *r_methods) const {
 	ASSERT_SCRIPT_VALID();
-	for (Map<StringName, MethodInfo>::Element *e = _methods_info.front(); e != NULL; e = e->next()) {
+	for (Map<StringName, MethodInfo>::Element *e = _methods_info.front(); e != nullptr; e = e->next()) {
 		r_methods->push_back(e->get());
 	}
 }
 
 void PluginScript::get_script_property_list(List<PropertyInfo> *r_properties) const {
 	ASSERT_SCRIPT_VALID();
-	for (Map<StringName, PropertyInfo>::Element *e = _properties_info.front(); e != NULL; e = e->next()) {
+	for (Map<StringName, PropertyInfo>::Element *e = _properties_info.front(); e != nullptr; e = e->next()) {
 		r_properties->push_back(e->get());
 	}
 }
@@ -365,7 +394,7 @@ bool PluginScript::has_method(const StringName &p_method) const {
 MethodInfo PluginScript::get_method_info(const StringName &p_method) const {
 	ASSERT_SCRIPT_VALID_V(MethodInfo());
 	const Map<StringName, MethodInfo>::Element *e = _methods_info.find(p_method);
-	if (e != NULL) {
+	if (e != nullptr) {
 		return e->get();
 	} else {
 		return MethodInfo();
@@ -380,7 +409,7 @@ bool PluginScript::has_property(const StringName &p_method) const {
 PropertyInfo PluginScript::get_property_info(const StringName &p_property) const {
 	ASSERT_SCRIPT_VALID_V(PropertyInfo());
 	const Map<StringName, PropertyInfo>::Element *e = _properties_info.find(p_property);
-	if (e != NULL) {
+	if (e != nullptr) {
 		return e->get();
 	} else {
 		return PropertyInfo();
@@ -391,7 +420,7 @@ bool PluginScript::get_property_default_value(const StringName &p_property, Vari
 	ASSERT_SCRIPT_VALID_V(false);
 #ifdef TOOLS_ENABLED
 	const Map<StringName, Variant>::Element *e = _properties_default_values.find(p_property);
-	if (e != NULL) {
+	if (e != nullptr) {
 		r_value = e->get();
 		return true;
 	} else {
@@ -406,23 +435,22 @@ ScriptLanguage *PluginScript::get_language() const {
 }
 
 Error PluginScript::load_source_code(const String &p_path) {
-
-	PoolVector<uint8_t> sourcef;
+	Vector<uint8_t> sourcef;
 	Error err;
 	FileAccess *f = FileAccess::open(p_path, FileAccess::READ, &err);
 	ERR_FAIL_COND_V_MSG(err, err, "Cannot open file '" + p_path + "'.");
 
 	int len = f->get_len();
 	sourcef.resize(len + 1);
-	PoolVector<uint8_t>::Write w = sourcef.write();
-	int r = f->get_buffer(w.ptr(), len);
+	uint8_t *w = sourcef.ptrw();
+	int r = f->get_buffer(w, len);
 	f->close();
 	memdelete(f);
 	ERR_FAIL_COND_V(r != len, ERR_CANT_OPEN);
 	w[len] = 0;
 
 	String s;
-	if (s.parse_utf8((const char *)w.ptr())) {
+	if (s.parse_utf8((const char *)w)) {
 		ERR_FAIL_V_MSG(ERR_INVALID_DATA, "Script '" + p_path + "' contains invalid unicode (UTF-8), so it was not loaded. Please ensure that scripts are saved in valid UTF-8 unicode.");
 	}
 
@@ -441,46 +469,91 @@ bool PluginScript::has_script_signal(const StringName &p_signal) const {
 
 void PluginScript::get_script_signal_list(List<MethodInfo> *r_signals) const {
 	ASSERT_SCRIPT_VALID();
-	for (Map<StringName, MethodInfo>::Element *e = _signals_info.front(); e != NULL; e = e->next()) {
+	for (Map<StringName, MethodInfo>::Element *e = _signals_info.front(); e != nullptr; e = e->next()) {
 		r_signals->push_back(e->get());
 	}
 }
 
 int PluginScript::get_member_line(const StringName &p_member) const {
 #ifdef TOOLS_ENABLED
-	if (_member_lines.has(p_member))
+	if (_member_lines.has(p_member)) {
 		return _member_lines[p_member];
-	else
+	}
 #endif
-		return -1;
+	return -1;
 }
 
-MultiplayerAPI::RPCMode PluginScript::get_rpc_mode(const StringName &p_method) const {
+Vector<ScriptNetData> PluginScript::get_rpc_methods() const {
+	return _rpc_methods;
+}
+
+uint16_t PluginScript::get_rpc_method_id(const StringName &p_method) const {
+	ASSERT_SCRIPT_VALID_V(UINT16_MAX);
+	for (int i = 0; i < _rpc_methods.size(); i++) {
+		if (_rpc_methods[i].name == p_method) {
+			return i;
+		}
+	}
+	return UINT16_MAX;
+}
+
+StringName PluginScript::get_rpc_method(const uint16_t p_rpc_method_id) const {
+	ASSERT_SCRIPT_VALID_V(StringName());
+	if (p_rpc_method_id >= _rpc_methods.size()) {
+		return StringName();
+	}
+	return _rpc_methods[p_rpc_method_id].name;
+}
+
+MultiplayerAPI::RPCMode PluginScript::get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const {
 	ASSERT_SCRIPT_VALID_V(MultiplayerAPI::RPC_MODE_DISABLED);
-	const Map<StringName, MultiplayerAPI::RPCMode>::Element *e = _methods_rpc_mode.find(p_method);
-	if (e != NULL) {
-		return e->get();
-	} else {
+	if (p_rpc_method_id >= _rpc_methods.size()) {
 		return MultiplayerAPI::RPC_MODE_DISABLED;
 	}
+	return _rpc_methods[p_rpc_method_id].mode;
 }
 
-MultiplayerAPI::RPCMode PluginScript::get_rset_mode(const StringName &p_variable) const {
+MultiplayerAPI::RPCMode PluginScript::get_rpc_mode(const StringName &p_method) const {
 	ASSERT_SCRIPT_VALID_V(MultiplayerAPI::RPC_MODE_DISABLED);
-	const Map<StringName, MultiplayerAPI::RPCMode>::Element *e = _variables_rset_mode.find(p_variable);
-	if (e != NULL) {
-		return e->get();
-	} else {
+	return get_rpc_mode_by_id(get_rpc_method_id(p_method));
+}
+
+Vector<ScriptNetData> PluginScript::get_rset_properties() const {
+	return _rpc_variables;
+}
+
+uint16_t PluginScript::get_rset_property_id(const StringName &p_property) const {
+	ASSERT_SCRIPT_VALID_V(UINT16_MAX);
+	for (int i = 0; i < _rpc_variables.size(); i++) {
+		if (_rpc_variables[i].name == p_property) {
+			return i;
+		}
+	}
+	return UINT16_MAX;
+}
+
+StringName PluginScript::get_rset_property(const uint16_t p_rset_property_id) const {
+	ASSERT_SCRIPT_VALID_V(StringName());
+	if (p_rset_property_id >= _rpc_variables.size()) {
+		return StringName();
+	}
+	return _rpc_variables[p_rset_property_id].name;
+}
+
+MultiplayerAPI::RPCMode PluginScript::get_rset_mode_by_id(const uint16_t p_rset_property_id) const {
+	ASSERT_SCRIPT_VALID_V(MultiplayerAPI::RPC_MODE_DISABLED);
+	if (p_rset_property_id >= _rpc_variables.size()) {
 		return MultiplayerAPI::RPC_MODE_DISABLED;
 	}
+	return _rpc_variables[p_rset_property_id].mode;
+}
+
+MultiplayerAPI::RPCMode PluginScript::get_rset_mode(const StringName &p_variable) const {
+	ASSERT_SCRIPT_VALID_V(MultiplayerAPI::RPC_MODE_DISABLED);
+	return get_rset_mode_by_id(get_rset_property_id(p_variable));
 }
 
 PluginScript::PluginScript() :
-		_data(NULL),
-		_desc(NULL),
-		_language(NULL),
-		_tool(false),
-		_valid(false),
 		_script_list(this) {
 }
 
diff --git a/modules/gdnative/pluginscript/pluginscript_script.h b/modules/gdnative/pluginscript/pluginscript_script.h
index f67c88c794..9cd38cd4b4 100644
--- a/modules/gdnative/pluginscript/pluginscript_script.h
+++ b/modules/gdnative/pluginscript/pluginscript_script.h
@@ -38,18 +38,17 @@
 #include <pluginscript/godot_pluginscript.h>
 
 class PluginScript : public Script {
-
 	GDCLASS(PluginScript, Script);
 
 	friend class PluginScriptInstance;
 	friend class PluginScriptLanguage;
 
 private:
-	godot_pluginscript_script_data *_data;
-	const godot_pluginscript_script_desc *_desc;
-	PluginScriptLanguage *_language;
-	bool _tool;
-	bool _valid;
+	godot_pluginscript_script_data *_data = nullptr;
+	const godot_pluginscript_script_desc *_desc = nullptr;
+	PluginScriptLanguage *_language = nullptr;
+	bool _tool = false;
+	bool _valid = false;
 
 	Ref<Script> _ref_base_parent;
 	StringName _native_parent;
@@ -60,8 +59,8 @@ private:
 	Map<StringName, PropertyInfo> _properties_info;
 	Map<StringName, MethodInfo> _signals_info;
 	Map<StringName, MethodInfo> _methods_info;
-	Map<StringName, MultiplayerAPI::RPCMode> _variables_rset_mode;
-	Map<StringName, MultiplayerAPI::RPCMode> _methods_rpc_mode;
+	Vector<ScriptNetData> _rpc_methods;
+	Vector<ScriptNetData> _rpc_variables;
 
 	Set<Object *> _instances;
 	//exported members
@@ -72,54 +71,65 @@ private:
 protected:
 	static void _bind_methods();
 
-	PluginScriptInstance *_create_instance(const Variant **p_args, int p_argcount, Object *p_owner, Variant::CallError &r_error);
-	Variant _new(const Variant **p_args, int p_argcount, Variant::CallError &r_error);
+	bool inherits_script(const Ref<Script> &p_script) const override;
+
+	PluginScriptInstance *_create_instance(const Variant **p_args, int p_argcount, Object *p_owner, Callable::CallError &r_error);
+	Variant _new(const Variant **p_args, int p_argcount, Callable::CallError &r_error);
 
 #ifdef TOOLS_ENABLED
 	Set<PlaceHolderScriptInstance *> placeholders;
 	//void _update_placeholder(PlaceHolderScriptInstance *p_placeholder);
-	virtual void _placeholder_erased(PlaceHolderScriptInstance *p_placeholder);
+	virtual void _placeholder_erased(PlaceHolderScriptInstance *p_placeholder) override;
 #endif
 public:
-	virtual bool can_instance() const;
+	virtual bool can_instance() const override;
 
-	virtual Ref<Script> get_base_script() const; //for script inheritance
+	virtual Ref<Script> get_base_script() const override; //for script inheritance
 
-	virtual StringName get_instance_base_type() const; // this may not work in all scripts, will return empty if so
-	virtual ScriptInstance *instance_create(Object *p_this);
-	virtual bool instance_has(const Object *p_this) const;
+	virtual StringName get_instance_base_type() const override; // this may not work in all scripts, will return empty if so
+	virtual ScriptInstance *instance_create(Object *p_this) override;
+	virtual bool instance_has(const Object *p_this) const override;
 
-	virtual bool has_source_code() const;
-	virtual String get_source_code() const;
-	virtual void set_source_code(const String &p_code);
-	virtual Error reload(bool p_keep_state = false);
+	virtual bool has_source_code() const override;
+	virtual String get_source_code() const override;
+	virtual void set_source_code(const String &p_code) override;
+	virtual Error reload(bool p_keep_state = false) override;
 	// TODO: load_source_code only allow utf-8 file, should handle bytecode as well ?
 	virtual Error load_source_code(const String &p_path);
 
-	virtual bool has_method(const StringName &p_method) const;
-	virtual MethodInfo get_method_info(const StringName &p_method) const;
+	virtual bool has_method(const StringName &p_method) const override;
+	virtual MethodInfo get_method_info(const StringName &p_method) const override;
 
 	bool has_property(const StringName &p_method) const;
 	PropertyInfo get_property_info(const StringName &p_property) const;
 
-	bool is_tool() const { return _tool; }
-	bool is_valid() const { return true; }
+	bool is_tool() const override { return _tool; }
+	bool is_valid() const override { return true; }
+
+	virtual ScriptLanguage *get_language() const override;
 
-	virtual ScriptLanguage *get_language() const;
+	virtual bool has_script_signal(const StringName &p_signal) const override;
+	virtual void get_script_signal_list(List<MethodInfo> *r_signals) const override;
 
-	virtual bool has_script_signal(const StringName &p_signal) const;
-	virtual void get_script_signal_list(List<MethodInfo> *r_signals) const;
+	virtual bool get_property_default_value(const StringName &p_property, Variant &r_value) const override;
 
-	virtual bool get_property_default_value(const StringName &p_property, Variant &r_value) const;
+	virtual void update_exports() override;
+	virtual void get_script_method_list(List<MethodInfo> *r_methods) const override;
+	virtual void get_script_property_list(List<PropertyInfo> *r_properties) const override;
 
-	virtual void update_exports();
-	virtual void get_script_method_list(List<MethodInfo> *r_methods) const;
-	virtual void get_script_property_list(List<PropertyInfo> *r_properties) const;
+	virtual int get_member_line(const StringName &p_member) const override;
 
-	virtual int get_member_line(const StringName &p_member) const;
+	virtual Vector<ScriptNetData> get_rpc_methods() const override;
+	virtual uint16_t get_rpc_method_id(const StringName &p_method) const override;
+	virtual StringName get_rpc_method(const uint16_t p_rpc_method_id) const override;
+	virtual MultiplayerAPI::RPCMode get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const override;
+	virtual MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const override;
 
-	MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const;
-	MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const;
+	virtual Vector<ScriptNetData> get_rset_properties() const override;
+	virtual uint16_t get_rset_property_id(const StringName &p_property) const override;
+	virtual StringName get_rset_property(const uint16_t p_rset_property_id) const override;
+	virtual MultiplayerAPI::RPCMode get_rset_mode_by_id(const uint16_t p_rpc_method_id) const override;
+	virtual MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const override;
 
 	PluginScript();
 	void init(PluginScriptLanguage *language);
diff --git a/modules/gdnative/pluginscript/register_types.h b/modules/gdnative/pluginscript/register_types.h
index a4f7284b54..c6a64b4f40 100644
--- a/modules/gdnative/pluginscript/register_types.h
+++ b/modules/gdnative/pluginscript/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef PLUGINSCRIPT_REGISTER_TYPES_H
+#define PLUGINSCRIPT_REGISTER_TYPES_H
+
 void register_pluginscript_types();
 void unregister_pluginscript_types();
+
+#endif // PLUGINSCRIPT_REGISTER_TYPES_H
diff --git a/modules/gdnative/register_types.cpp b/modules/gdnative/register_types.cpp
index cb84c23e7a..3a2d0b09a3 100644
--- a/modules/gdnative/register_types.cpp
+++ b/modules/gdnative/register_types.cpp
@@ -34,11 +34,11 @@
 
 #include "gdnative.h"
 
-#include "arvr/register_types.h"
 #include "nativescript/register_types.h"
 #include "net/register_types.h"
 #include "pluginscript/register_types.h"
 #include "videodecoder/register_types.h"
+#include "xr/register_types.h"
 
 #include "core/engine.h"
 #include "core/io/resource_loader.h"
@@ -53,7 +53,6 @@
 #include "gdnative_library_singleton_editor.h"
 
 class GDNativeExportPlugin : public EditorExportPlugin {
-
 protected:
 	virtual void _export_file(const String &p_path, const String &p_type, const Set<String> &p_features);
 };
@@ -77,7 +76,6 @@ void GDNativeExportPlugin::_export_file(const String &p_path, const String &p_ty
 	Ref<ConfigFile> config = lib->get_config_file();
 
 	{
-
 		List<String> entry_keys;
 		config->get_section_keys("entry", &entry_keys);
 
@@ -144,52 +142,89 @@ void GDNativeExportPlugin::_export_file(const String &p_path, const String &p_ty
 		}
 	}
 
+	// Add symbols for staticaly linked libraries on iOS
 	if (p_features.has("iOS")) {
-		// Register symbols in the "fake" dynamic lookup table, because dlsym does not work well on iOS.
-		LibrarySymbol expected_symbols[] = {
-			{ "gdnative_init", true },
-			{ "gdnative_terminate", false },
-			{ "nativescript_init", false },
-			{ "nativescript_frame", false },
-			{ "nativescript_thread_enter", false },
-			{ "nativescript_thread_exit", false },
-			{ "gdnative_singleton", false }
-		};
-		String declare_pattern = "extern \"C\" void $name(void)$weak;\n";
-		String additional_code = "extern void register_dynamic_symbol(char *name, void *address);\n"
-								 "extern void add_ios_init_callback(void (*cb)());\n";
-		String linker_flags = "";
-		for (unsigned long i = 0; i < sizeof(expected_symbols) / sizeof(expected_symbols[0]); ++i) {
-			String full_name = lib->get_symbol_prefix() + expected_symbols[i].name;
-			String code = declare_pattern.replace("$name", full_name);
-			code = code.replace("$weak", expected_symbols[i].is_required ? "" : " __attribute__((weak))");
-			additional_code += code;
-
-			if (!expected_symbols[i].is_required) {
-				if (linker_flags.length() > 0) {
-					linker_flags += " ";
+		bool should_fake_dynamic = false;
+
+		List<String> entry_keys;
+		config->get_section_keys("entry", &entry_keys);
+
+		for (List<String>::Element *E = entry_keys.front(); E; E = E->next()) {
+			String key = E->get();
+
+			Vector<String> tags = key.split(".");
+
+			bool skip = false;
+			for (int i = 0; i < tags.size(); i++) {
+				bool has_feature = p_features.has(tags[i]);
+
+				if (!has_feature) {
+					skip = true;
+					break;
 				}
-				linker_flags += "-Wl,-U,_" + full_name;
 			}
-		}
 
-		additional_code += String("void $prefixinit() {\n").replace("$prefix", lib->get_symbol_prefix());
-		String register_pattern = "  if (&$name) register_dynamic_symbol((char *)\"$name\", (void *)$name);\n";
-		for (unsigned long i = 0; i < sizeof(expected_symbols) / sizeof(expected_symbols[0]); ++i) {
-			String full_name = lib->get_symbol_prefix() + expected_symbols[i].name;
-			additional_code += register_pattern.replace("$name", full_name);
+			if (skip) {
+				continue;
+			}
+
+			String entry_lib_path = config->get_value("entry", key);
+			if (entry_lib_path.begins_with("res://") && entry_lib_path.ends_with(".a")) {
+				// If we find static library that was used for export
+				// we should add a fake lookup table.
+				// In case of dynamic library being used,
+				// this symbols will not cause any issues with library loading.
+				should_fake_dynamic = true;
+				break;
+			}
 		}
-		additional_code += "}\n";
-		additional_code += String("struct $prefixstruct {$prefixstruct() {add_ios_init_callback($prefixinit);}};\n").replace("$prefix", lib->get_symbol_prefix());
-		additional_code += String("$prefixstruct $prefixstruct_instance;\n").replace("$prefix", lib->get_symbol_prefix());
 
-		add_ios_cpp_code(additional_code);
-		add_ios_linker_flags(linker_flags);
+		if (should_fake_dynamic) {
+			// Register symbols in the "fake" dynamic lookup table, because dlsym does not work well on iOS.
+			LibrarySymbol expected_symbols[] = {
+				{ "gdnative_init", true },
+				{ "gdnative_terminate", false },
+				{ "nativescript_init", false },
+				{ "nativescript_frame", false },
+				{ "nativescript_thread_enter", false },
+				{ "nativescript_thread_exit", false },
+				{ "gdnative_singleton", false }
+			};
+			String declare_pattern = "extern \"C\" void $name(void)$weak;\n";
+			String additional_code = "extern void register_dynamic_symbol(char *name, void *address);\n"
+									 "extern void add_ios_init_callback(void (*cb)());\n";
+			String linker_flags = "";
+			for (unsigned long i = 0; i < sizeof(expected_symbols) / sizeof(expected_symbols[0]); ++i) {
+				String full_name = lib->get_symbol_prefix() + expected_symbols[i].name;
+				String code = declare_pattern.replace("$name", full_name);
+				code = code.replace("$weak", expected_symbols[i].is_required ? "" : " __attribute__((weak))");
+				additional_code += code;
+
+				if (!expected_symbols[i].is_required) {
+					if (linker_flags.length() > 0) {
+						linker_flags += " ";
+					}
+					linker_flags += "-Wl,-U,_" + full_name;
+				}
+			}
+
+			additional_code += String("void $prefixinit() {\n").replace("$prefix", lib->get_symbol_prefix());
+			String register_pattern = "  if (&$name) register_dynamic_symbol((char *)\"$name\", (void *)$name);\n";
+			for (unsigned long i = 0; i < sizeof(expected_symbols) / sizeof(expected_symbols[0]); ++i) {
+				String full_name = lib->get_symbol_prefix() + expected_symbols[i].name;
+				additional_code += register_pattern.replace("$name", full_name);
+			}
+			additional_code += "}\n";
+			additional_code += String("struct $prefixstruct {$prefixstruct() {add_ios_init_callback($prefixinit);}};\n").replace("$prefix", lib->get_symbol_prefix());
+			additional_code += String("$prefixstruct $prefixstruct_instance;\n").replace("$prefix", lib->get_symbol_prefix());
+
+			add_ios_cpp_code(additional_code);
+			add_ios_linker_flags(linker_flags);
+		}
 	}
 }
 
 static void editor_init_callback() {
-
 	GDNativeLibrarySingletonEditor *library_editor = memnew(GDNativeLibrarySingletonEditor);
 	library_editor->set_name(TTR("GDNative"));
 	ProjectSettingsEditor::get_singleton()->get_tabs()->add_child(library_editor);
@@ -205,7 +240,6 @@ static void editor_init_callback() {
 #endif
 
 static godot_variant cb_standard_varcall(void *p_procedure_handle, godot_array *p_args) {
-
 	godot_gdnative_procedure_fn proc;
 	proc = (godot_gdnative_procedure_fn)p_procedure_handle;
 
@@ -214,13 +248,12 @@ static godot_variant cb_standard_varcall(void *p_procedure_handle, godot_array *
 
 GDNativeCallRegistry *GDNativeCallRegistry::singleton;
 
-Vector<Ref<GDNative> > singleton_gdnatives;
+Vector<Ref<GDNative>> singleton_gdnatives;
 
 Ref<GDNativeLibraryResourceLoader> resource_loader_gdnlib;
 Ref<GDNativeLibraryResourceSaver> resource_saver_gdnlib;
 
 void register_gdnative_types() {
-
 #ifdef TOOLS_ENABLED
 
 	EditorNode::add_init_callback(editor_init_callback);
@@ -240,7 +273,7 @@ void register_gdnative_types() {
 	GDNativeCallRegistry::singleton->register_native_call_type("standard_varcall", cb_standard_varcall);
 
 	register_net_types();
-	register_arvr_types();
+	register_xr_types();
 	register_nativescript_types();
 	register_pluginscript_types();
 	register_videodecoder_types();
@@ -259,8 +292,9 @@ void register_gdnative_types() {
 	for (int i = 0; i < singletons.size(); i++) {
 		String path = singletons[i];
 
-		if (excluded.has(path))
+		if (excluded.has(path)) {
 			continue;
+		}
 
 		Ref<GDNativeLibrary> lib = ResourceLoader::load(path);
 		Ref<GDNative> singleton;
@@ -278,7 +312,7 @@ void register_gdnative_types() {
 				proc_ptr);
 
 		if (err != OK) {
-			ERR_PRINTS("No " + lib->get_symbol_prefix() + "gdnative_singleton in \"" + singleton->get_library()->get_current_library_path() + "\" found");
+			ERR_PRINT("No " + lib->get_symbol_prefix() + "gdnative_singleton in \"" + singleton->get_library()->get_current_library_path() + "\" found");
 		} else {
 			singleton_gdnatives.push_back(singleton);
 			((void (*)())proc_ptr)();
@@ -287,9 +321,7 @@ void register_gdnative_types() {
 }
 
 void unregister_gdnative_types() {
-
 	for (int i = 0; i < singleton_gdnatives.size(); i++) {
-
 		if (singleton_gdnatives[i].is_null()) {
 			continue;
 		}
@@ -305,7 +337,7 @@ void unregister_gdnative_types() {
 	unregister_videodecoder_types();
 	unregister_pluginscript_types();
 	unregister_nativescript_types();
-	unregister_arvr_types();
+	unregister_xr_types();
 	unregister_net_types();
 
 	memdelete(GDNativeCallRegistry::singleton);
@@ -325,7 +357,7 @@ void unregister_gdnative_types() {
 	print_line(String("dict:\t" )     + itos(sizeof(Dictionary)));
 	print_line(String("node_path:\t") + itos(sizeof(NodePath)));
 	print_line(String("plane:\t")     + itos(sizeof(Plane)));
-	print_line(String("poolarray:\t") + itos(sizeof(PoolByteArray)));
+	print_line(String("poolarray:\t") + itos(sizeof(PackedByteArray)));
 	print_line(String("quat:\t")      + itos(sizeof(Quat)));
 	print_line(String("rect2:\t")     + itos(sizeof(Rect2)));
 	print_line(String("aabb:\t")     + itos(sizeof(AABB)));
diff --git a/modules/gdnative/register_types.h b/modules/gdnative/register_types.h
index 0091ef3f96..b5c182f8b7 100644
--- a/modules/gdnative/register_types.h
+++ b/modules/gdnative/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef GDNATIVE_REGISTER_TYPES_H
+#define GDNATIVE_REGISTER_TYPES_H
+
 void register_gdnative_types();
 void unregister_gdnative_types();
+
+#endif // GDNATIVE_REGISTER_TYPES_H
diff --git a/modules/gdnative/tests/test_string.h b/modules/gdnative/tests/test_string.h
new file mode 100644
index 0000000000..aeb855a1c4
--- /dev/null
+++ b/modules/gdnative/tests/test_string.h
@@ -0,0 +1,1980 @@
+/*************************************************************************/
+/*  test_string.h                                                        */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef TEST_GDNATIVE_STRING_H
+#define TEST_GDNATIVE_STRING_H
+
+namespace TestGDNativeString {
+
+#include "gdnative/string.h"
+
+#include "tests/test_macros.h"
+
+int u32scmp(const char32_t *l, const char32_t *r) {
+	for (; *l == *r && *l && *r; l++, r++)
+		;
+	return *l - *r;
+}
+
+TEST_CASE("[GDNative String] Construct from Latin-1 char string") {
+	godot_string s;
+
+	godot_string_new_with_latin1_chars(&s, "Hello");
+	CHECK(u32scmp(godot_string_get_data(&s), U"Hello") == 0);
+	godot_string_destroy(&s);
+
+	godot_string_new_with_latin1_chars_and_len(&s, "Hello", 3);
+	CHECK(u32scmp(godot_string_get_data(&s), U"Hel") == 0);
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] Construct from wchar_t string") {
+	godot_string s;
+
+	godot_string_new_with_wide_chars(&s, L"Give me");
+	CHECK(u32scmp(godot_string_get_data(&s), U"Give me") == 0);
+	godot_string_destroy(&s);
+
+	godot_string_new_with_wide_chars_and_len(&s, L"Give me", 3);
+	CHECK(u32scmp(godot_string_get_data(&s), U"Giv") == 0);
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] Construct from UTF-8 char string") {
+	static const char32_t u32str[] = { 0x0045, 0x0020, 0x304A, 0x360F, 0x3088, 0x3046, 0x1F3A4, 0 };
+	static const char32_t u32str_short[] = { 0x0045, 0x0020, 0x304A, 0 };
+	static const uint8_t u8str[] = { 0x45, 0x20, 0xE3, 0x81, 0x8A, 0xE3, 0x98, 0x8F, 0xE3, 0x82, 0x88, 0xE3, 0x81, 0x86, 0xF0, 0x9F, 0x8E, 0xA4, 0 };
+
+	godot_string s;
+
+	godot_string_new_with_utf8_chars(&s, (const char *)u8str);
+	CHECK(u32scmp(godot_string_get_data(&s), u32str) == 0);
+	godot_string_destroy(&s);
+
+	godot_string_new_with_utf8_chars_and_len(&s, (const char *)u8str, 5);
+	CHECK(u32scmp(godot_string_get_data(&s), u32str_short) == 0);
+	godot_string_destroy(&s);
+
+	godot_string_new_with_utf32_chars(&s, u32str);
+	godot_char_string cs = godot_string_utf8(&s);
+	godot_string_parse_utf8(&s, godot_char_string_get_data(&cs));
+	CHECK(u32scmp(godot_string_get_data(&s), u32str) == 0);
+	godot_string_destroy(&s);
+	godot_char_string_destroy(&cs);
+
+	godot_string_new_with_utf32_chars(&s, u32str);
+	cs = godot_string_utf8(&s);
+	godot_string_parse_utf8_with_len(&s, godot_char_string_get_data(&cs), godot_char_string_length(&cs));
+	CHECK(u32scmp(godot_string_get_data(&s), u32str) == 0);
+	godot_string_destroy(&s);
+	godot_char_string_destroy(&cs);
+}
+
+TEST_CASE("[GDNative String] Construct from UTF-8 string with BOM") {
+	static const char32_t u32str[] = { 0x0045, 0x0020, 0x304A, 0x360F, 0x3088, 0x3046, 0x1F3A4, 0 };
+	static const char32_t u32str_short[] = { 0x0045, 0x0020, 0x304A, 0 };
+	static const uint8_t u8str[] = { 0xEF, 0xBB, 0xBF, 0x45, 0x20, 0xE3, 0x81, 0x8A, 0xE3, 0x98, 0x8F, 0xE3, 0x82, 0x88, 0xE3, 0x81, 0x86, 0xF0, 0x9F, 0x8E, 0xA4, 0 };
+
+	godot_string s;
+
+	godot_string_new_with_utf8_chars(&s, (const char *)u8str);
+	CHECK(u32scmp(godot_string_get_data(&s), u32str) == 0);
+	godot_string_destroy(&s);
+
+	godot_string_new_with_utf8_chars_and_len(&s, (const char *)u8str, 8);
+	CHECK(u32scmp(godot_string_get_data(&s), u32str_short) == 0);
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] Construct from UTF-16 string") {
+	static const char32_t u32str[] = { 0x0045, 0x0020, 0x1F3A4, 0x360F, 0x3088, 0x3046, 0x1F3A4, 0 };
+	static const char32_t u32str_short[] = { 0x0045, 0x0020, 0x1F3A4, 0 };
+	static const char16_t u16str[] = { 0x0045, 0x0020, 0xD83C, 0xDFA4, 0x360F, 0x3088, 0x3046, 0xD83C, 0xDFA4, 0 };
+
+	godot_string s;
+
+	godot_string_new_with_utf16_chars(&s, u16str);
+	CHECK(u32scmp(godot_string_get_data(&s), u32str) == 0);
+	godot_string_destroy(&s);
+
+	godot_string_new_with_utf16_chars_and_len(&s, u16str, 4);
+	CHECK(u32scmp(godot_string_get_data(&s), u32str_short) == 0);
+	godot_string_destroy(&s);
+
+	godot_string_new_with_utf32_chars(&s, u32str);
+	godot_char16_string cs = godot_string_utf16(&s);
+	godot_string_parse_utf16(&s, godot_char16_string_get_data(&cs));
+	CHECK(u32scmp(godot_string_get_data(&s), u32str) == 0);
+	godot_string_destroy(&s);
+	godot_char16_string_destroy(&cs);
+
+	godot_string_new_with_utf32_chars(&s, u32str);
+	cs = godot_string_utf16(&s);
+	godot_string_parse_utf16_with_len(&s, godot_char16_string_get_data(&cs), godot_char16_string_length(&cs));
+	CHECK(u32scmp(godot_string_get_data(&s), u32str) == 0);
+	godot_string_destroy(&s);
+	godot_char16_string_destroy(&cs);
+}
+
+TEST_CASE("[GDNative String] Construct from UTF-16 string with BOM ") {
+	static const char32_t u32str[] = { 0x0045, 0x0020, 0x1F3A4, 0x360F, 0x3088, 0x3046, 0x1F3A4, 0 };
+	static const char32_t u32str_short[] = { 0x0045, 0x0020, 0x1F3A4, 0 };
+	static const char16_t u16str[] = { 0xFEFF, 0x0045, 0x0020, 0xD83C, 0xDFA4, 0x360F, 0x3088, 0x3046, 0xD83C, 0xDFA4, 0 };
+	static const char16_t u16str_swap[] = { 0xFFFE, 0x4500, 0x2000, 0x3CD8, 0xA4DF, 0x0F36, 0x8830, 0x4630, 0x3CD8, 0xA4DF, 0 };
+
+	godot_string s;
+
+	godot_string_new_with_utf16_chars(&s, u16str);
+	CHECK(u32scmp(godot_string_get_data(&s), u32str) == 0);
+	godot_string_destroy(&s);
+
+	godot_string_new_with_utf16_chars(&s, u16str_swap);
+	CHECK(u32scmp(godot_string_get_data(&s), u32str) == 0);
+	godot_string_destroy(&s);
+
+	godot_string_new_with_utf16_chars_and_len(&s, u16str, 5);
+	CHECK(u32scmp(godot_string_get_data(&s), u32str_short) == 0);
+	godot_string_destroy(&s);
+
+	godot_string_new_with_utf16_chars_and_len(&s, u16str_swap, 5);
+	CHECK(u32scmp(godot_string_get_data(&s), u32str_short) == 0);
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] Construct string copy") {
+	godot_string s, t;
+
+	godot_string_new_with_latin1_chars(&s, "Hello");
+	godot_string_new_copy(&t, &s);
+	CHECK(u32scmp(godot_string_get_data(&t), U"Hello") == 0);
+	godot_string_destroy(&t);
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] Construct empty string") {
+	godot_string s;
+
+	godot_string_new(&s);
+	CHECK(u32scmp(godot_string_get_data(&s), U"") == 0);
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] ASCII/Latin-1") {
+	godot_string s;
+	godot_string_new_with_utf32_chars(&s, U"Primero Leche");
+
+	godot_char_string cs = godot_string_ascii(&s);
+	CHECK(strcmp(godot_char_string_get_data(&cs), "Primero Leche") == 0);
+	godot_char_string_destroy(&cs);
+
+	cs = godot_string_latin1(&s);
+	CHECK(strcmp(godot_char_string_get_data(&cs), "Primero Leche") == 0);
+	godot_char_string_destroy(&cs);
+
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] Comparisons (equal)") {
+	godot_string s, t;
+
+	godot_string_new_with_latin1_chars(&s, "Test Compare");
+	godot_string_new_with_latin1_chars(&t, "Test Compare");
+	CHECK(godot_string_operator_equal(&s, &t));
+	godot_string_destroy(&s);
+	godot_string_destroy(&t);
+}
+
+TEST_CASE("[GDNative String] Comparisons (operator <)") {
+	godot_string s, t;
+
+	godot_string_new_with_latin1_chars(&s, "Bees");
+
+	godot_string_new_with_latin1_chars(&t, "Elephant");
+	CHECK(godot_string_operator_less(&s, &t));
+	godot_string_destroy(&t);
+
+	godot_string_new_with_latin1_chars(&t, "Amber");
+	CHECK(!godot_string_operator_less(&s, &t));
+	godot_string_destroy(&t);
+
+	godot_string_new_with_latin1_chars(&t, "Beatrix");
+	CHECK(!godot_string_operator_less(&s, &t));
+	godot_string_destroy(&t);
+
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] Concatenation (operator +)") {
+	godot_string s, t, x;
+
+	godot_string_new_with_latin1_chars(&s, "Hel");
+	godot_string_new_with_latin1_chars(&t, "lo");
+	x = godot_string_operator_plus(&s, &t);
+	CHECK(u32scmp(godot_string_get_data(&x), U"Hello") == 0);
+	godot_string_destroy(&x);
+	godot_string_destroy(&s);
+	godot_string_destroy(&t);
+}
+
+TEST_CASE("[GDNative String] Testing size and length of string") {
+	godot_string s;
+
+	godot_string_new_with_latin1_chars(&s, "Mellon");
+	CHECK(godot_string_length(&s) == 6);
+	godot_string_destroy(&s);
+
+	godot_string_new_with_latin1_chars(&s, "Mellon1");
+	CHECK(godot_string_length(&s) == 7);
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] Testing for empty string") {
+	godot_string s;
+
+	godot_string_new_with_latin1_chars(&s, "Mellon");
+	CHECK(!godot_string_empty(&s));
+	godot_string_destroy(&s);
+
+	godot_string_new_with_latin1_chars(&s, "");
+	CHECK(godot_string_empty(&s));
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] Test chr") {
+	godot_string s;
+
+	s = godot_string_chr('H');
+	CHECK(u32scmp(godot_string_get_data(&s), U"H") == 0);
+	godot_string_destroy(&s);
+
+	s = godot_string_chr(0x3012);
+	CHECK(godot_string_operator_index_const(&s, 0) == 0x3012);
+	godot_string_destroy(&s);
+
+	ERR_PRINT_OFF
+	s = godot_string_chr(0xd812);
+	CHECK(godot_string_operator_index_const(&s, 0) == 0xfffd); // Unpaired UTF-16 surrogate
+	godot_string_destroy(&s);
+
+	s = godot_string_chr(0x20d812);
+	CHECK(godot_string_operator_index_const(&s, 0) == 0xfffd); // Outside UTF-32 range
+	godot_string_destroy(&s);
+	ERR_PRINT_ON
+}
+
+TEST_CASE("[GDNative String] Operator []") {
+	godot_string s;
+
+	godot_string_new_with_latin1_chars(&s, "Hello");
+	CHECK(*godot_string_operator_index(&s, 1) == 'e');
+	CHECK(godot_string_operator_index_const(&s, 0) == 'H');
+	CHECK(godot_string_ord_at(&s, 0) == 'H');
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] Case function test") {
+	godot_string s, t;
+
+	godot_string_new_with_latin1_chars(&s, "MoMoNgA");
+
+	t = godot_string_to_upper(&s);
+	CHECK(u32scmp(godot_string_get_data(&t), U"MOMONGA") == 0);
+	godot_string_destroy(&t);
+
+	t = godot_string_to_lower(&s);
+	CHECK(u32scmp(godot_string_get_data(&t), U"momonga") == 0);
+	godot_string_destroy(&t);
+
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] Case compare function test") {
+	godot_string s, t;
+
+	godot_string_new_with_latin1_chars(&s, "MoMoNgA");
+	godot_string_new_with_latin1_chars(&t, "momonga");
+
+	CHECK(godot_string_casecmp_to(&s, &t) != 0);
+	CHECK(godot_string_nocasecmp_to(&s, &t) == 0);
+
+	godot_string_destroy(&s);
+	godot_string_destroy(&t);
+}
+
+TEST_CASE("[GDNative String] Natural compare function test") {
+	godot_string s, t;
+
+	godot_string_new_with_latin1_chars(&s, "img2.png");
+	godot_string_new_with_latin1_chars(&t, "img10.png");
+
+	CHECK(godot_string_nocasecmp_to(&s, &t) > 0);
+	CHECK(godot_string_naturalnocasecmp_to(&s, &t) < 0);
+
+	godot_string_destroy(&s);
+	godot_string_destroy(&t);
+}
+
+TEST_CASE("[GDNative String] hex_encode_buffer") {
+	static const uint8_t u8str[] = { 0x45, 0xE3, 0x81, 0x8A, 0x8F, 0xE3 };
+	godot_string s = godot_string_hex_encode_buffer(u8str, 6);
+	CHECK(u32scmp(godot_string_get_data(&s), U"45e3818a8fe3") == 0);
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] Substr") {
+	godot_string s, t;
+	godot_string_new_with_latin1_chars(&s, "Killer Baby");
+	t = godot_string_substr(&s, 3, 4);
+	CHECK(u32scmp(godot_string_get_data(&t), U"ler ") == 0);
+	godot_string_destroy(&t);
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] Find") {
+	godot_string s, t;
+	godot_string_new_with_latin1_chars(&s, "Pretty Woman Woman");
+
+	godot_string_new_with_latin1_chars(&t, "Revenge of the Monster Truck");
+	CHECK(godot_string_find(&s, &t) == -1);
+	godot_string_destroy(&t);
+
+	godot_string_new_with_latin1_chars(&t, "tty");
+	CHECK(godot_string_find(&s, &t) == 3);
+	godot_string_destroy(&t);
+
+	godot_string_new_with_latin1_chars(&t, "Wo");
+	CHECK(godot_string_find_from(&s, &t, 9) == 13);
+	godot_string_destroy(&t);
+
+	godot_string_new_with_latin1_chars(&t, "man");
+	CHECK(godot_string_rfind(&s, &t) == 15);
+	godot_string_destroy(&t);
+
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] Find no case") {
+	godot_string s, t;
+	godot_string_new_with_latin1_chars(&s, "Pretty Whale Whale");
+
+	godot_string_new_with_latin1_chars(&t, "WHA");
+	CHECK(godot_string_findn(&s, &t) == 7);
+	godot_string_destroy(&t);
+
+	godot_string_new_with_latin1_chars(&t, "WHA");
+	CHECK(godot_string_findn_from(&s, &t, 9) == 13);
+	godot_string_destroy(&t);
+
+	godot_string_new_with_latin1_chars(&t, "WHA");
+	CHECK(godot_string_rfindn(&s, &t) == 13);
+	godot_string_destroy(&t);
+
+	godot_string_new_with_latin1_chars(&t, "Revenge of the Monster SawFish");
+	CHECK(godot_string_findn(&s, &t) == -1);
+	godot_string_destroy(&t);
+
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] Find MK") {
+	godot_packed_string_array keys;
+	godot_packed_string_array_new(&keys);
+
+#define PUSH_KEY(x)                                     \
+	{                                                   \
+		godot_string t;                                 \
+		godot_string_new_with_latin1_chars(&t, x);      \
+		godot_packed_string_array_push_back(&keys, &t); \
+		godot_string_destroy(&t);                       \
+	}
+
+	PUSH_KEY("sty")
+	PUSH_KEY("tty")
+	PUSH_KEY("man")
+
+	godot_string s;
+	godot_string_new_with_latin1_chars(&s, "Pretty Woman");
+	godot_int key = 0;
+
+	CHECK(godot_string_findmk(&s, &keys) == 3);
+	CHECK(godot_string_findmk_from_in_place(&s, &keys, 0, &key) == 3);
+	CHECK(key == 1);
+
+	CHECK(godot_string_findmk_from(&s, &keys, 5) == 9);
+	CHECK(godot_string_findmk_from_in_place(&s, &keys, 5, &key) == 9);
+	CHECK(key == 2);
+
+	godot_string_destroy(&s);
+	godot_packed_string_array_destroy(&keys);
+
+#undef PUSH_KEY
+}
+
+TEST_CASE("[GDNative String] Find and replace") {
+	godot_string s, c, w;
+	godot_string_new_with_latin1_chars(&s, "Happy Birthday, Anna!");
+	godot_string_new_with_latin1_chars(&c, "Birthday");
+	godot_string_new_with_latin1_chars(&w, "Halloween");
+	godot_string t = godot_string_replace(&s, &c, &w);
+	CHECK(u32scmp(godot_string_get_data(&t), U"Happy Halloween, Anna!") == 0);
+	godot_string_destroy(&s);
+	godot_string_destroy(&c);
+	godot_string_destroy(&w);
+
+	godot_string_new_with_latin1_chars(&c, "H");
+	godot_string_new_with_latin1_chars(&w, "W");
+	s = godot_string_replace_first(&t, &c, &w);
+	godot_string_destroy(&t);
+	godot_string_destroy(&c);
+	godot_string_destroy(&w);
+
+	CHECK(u32scmp(godot_string_get_data(&s), U"Wappy Halloween, Anna!") == 0);
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] Insertion") {
+	godot_string s, t, r, u;
+	godot_string_new_with_latin1_chars(&s, "Who is Frederic?");
+	godot_string_new_with_latin1_chars(&t, "?");
+	godot_string_new_with_latin1_chars(&r, " Chopin");
+
+	u = godot_string_insert(&s, godot_string_find(&s, &t), &r);
+	CHECK(u32scmp(godot_string_get_data(&u), U"Who is Frederic Chopin?") == 0);
+
+	godot_string_destroy(&s);
+	godot_string_destroy(&t);
+	godot_string_destroy(&r);
+	godot_string_destroy(&u);
+}
+
+TEST_CASE("[GDNative String] Number to string") {
+	godot_string s;
+	s = godot_string_num(3.141593);
+	CHECK(u32scmp(godot_string_get_data(&s), U"3.141593") == 0);
+	godot_string_destroy(&s);
+
+	s = godot_string_num_with_decimals(3.141593, 3);
+	CHECK(u32scmp(godot_string_get_data(&s), U"3.142") == 0);
+	godot_string_destroy(&s);
+
+	s = godot_string_num_real(3.141593);
+	CHECK(u32scmp(godot_string_get_data(&s), U"3.141593") == 0);
+	godot_string_destroy(&s);
+
+	s = godot_string_num_scientific(30000000);
+	CHECK(u32scmp(godot_string_get_data(&s), U"3e+07") == 0);
+	godot_string_destroy(&s);
+
+	s = godot_string_num_int64(3141593, 10);
+	CHECK(u32scmp(godot_string_get_data(&s), U"3141593") == 0);
+	godot_string_destroy(&s);
+
+	s = godot_string_num_int64(0xA141593, 16);
+	CHECK(u32scmp(godot_string_get_data(&s), U"a141593") == 0);
+	godot_string_destroy(&s);
+
+	s = godot_string_num_int64_capitalized(0xA141593, 16, true);
+	CHECK(u32scmp(godot_string_get_data(&s), U"A141593") == 0);
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] String to integer") {
+	static const wchar_t *wnums[4] = { L"1237461283", L"- 22", L"0", L" - 1123412" };
+	static const char *nums[4] = { "1237461283", "- 22", "0", " - 1123412" };
+	static const int num[4] = { 1237461283, -22, 0, -1123412 };
+
+	for (int i = 0; i < 4; i++) {
+		godot_string s;
+		godot_string_new_with_latin1_chars(&s, nums[i]);
+		CHECK(godot_string_to_int(&s) == num[i]);
+		godot_string_destroy(&s);
+
+		CHECK(godot_string_char_to_int(nums[i]) == num[i]);
+		CHECK(godot_string_wchar_to_int(wnums[i]) == num[i]);
+	}
+}
+
+TEST_CASE("[GDNative String] Hex to integer") {
+	static const char *nums[4] = { "0xFFAE", "22", "0", "AADDAD" };
+	static const int64_t num[4] = { 0xFFAE, 0x22, 0, 0xAADDAD };
+	static const bool wo_prefix[4] = { false, true, true, true };
+	static const bool w_prefix[4] = { true, false, true, false };
+
+	for (int i = 0; i < 4; i++) {
+		godot_string s;
+		godot_string_new_with_latin1_chars(&s, nums[i]);
+		CHECK((godot_string_hex_to_int_with_prefix(&s) == num[i]) == w_prefix[i]);
+		CHECK((godot_string_hex_to_int(&s) == num[i]) == wo_prefix[i]);
+		godot_string_destroy(&s);
+	}
+}
+
+TEST_CASE("[GDNative String] String to float") {
+	static const wchar_t *wnums[4] = { L"-12348298412.2", L"0.05", L"2.0002", L" -0.0001" };
+	static const char *nums[4] = { "-12348298412.2", "0.05", "2.0002", " -0.0001" };
+	static const double num[4] = { -12348298412.2, 0.05, 2.0002, -0.0001 };
+
+	for (int i = 0; i < 4; i++) {
+		godot_string s;
+		godot_string_new_with_latin1_chars(&s, nums[i]);
+		CHECK(!(ABS(godot_string_to_float(&s) - num[i]) > 0.00001));
+		godot_string_destroy(&s);
+
+		CHECK(!(ABS(godot_string_char_to_float(nums[i]) - num[i]) > 0.00001));
+		CHECK(!(ABS(godot_string_wchar_to_float(wnums[i], nullptr) - num[i]) > 0.00001));
+	}
+}
+
+TEST_CASE("[GDNative String] CamelCase to underscore") {
+	godot_string s, t;
+	godot_string_new_with_latin1_chars(&s, "TestTestStringGD");
+
+	t = godot_string_camelcase_to_underscore(&s);
+	CHECK(u32scmp(godot_string_get_data(&t), U"Test_Test_String_GD") == 0);
+	godot_string_destroy(&t);
+
+	t = godot_string_camelcase_to_underscore_lowercased(&s);
+	CHECK(u32scmp(godot_string_get_data(&t), U"test_test_string_gd") == 0);
+	godot_string_destroy(&t);
+
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] Slicing") {
+	godot_string s, c;
+	godot_string_new_with_latin1_chars(&s, "Mars,Jupiter,Saturn,Uranus");
+	godot_string_new_with_latin1_chars(&c, ",");
+
+	const char32_t *slices[4] = { U"Mars", U"Jupiter", U"Saturn", U"Uranus" };
+	for (int i = 0; i < godot_string_get_slice_count(&s, &c); i++) {
+		godot_string t;
+		t = godot_string_get_slice(&s, &c, i);
+		CHECK(u32scmp(godot_string_get_data(&t), slices[i]) == 0);
+		godot_string_destroy(&t);
+
+		t = godot_string_get_slicec(&s, U',', i);
+		CHECK(u32scmp(godot_string_get_data(&t), slices[i]) == 0);
+		godot_string_destroy(&t);
+	}
+
+	godot_string_destroy(&c);
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] Splitting") {
+	godot_string s, c;
+	godot_string_new_with_latin1_chars(&s, "Mars,Jupiter,Saturn,Uranus");
+	godot_string_new_with_latin1_chars(&c, ",");
+
+	godot_packed_string_array l;
+
+	const char32_t *slices_l[3] = { U"Mars", U"Jupiter", U"Saturn,Uranus" };
+	const char32_t *slices_r[3] = { U"Mars,Jupiter", U"Saturn", U"Uranus" };
+
+	l = godot_string_split_with_maxsplit(&s, &c, true, 2);
+	CHECK(godot_packed_string_array_size(&l) == 3);
+	for (int i = 0; i < godot_packed_string_array_size(&l); i++) {
+		godot_string t = godot_packed_string_array_get(&l, i);
+		CHECK(u32scmp(godot_string_get_data(&t), slices_l[i]) == 0);
+		godot_string_destroy(&t);
+	}
+	godot_packed_string_array_destroy(&l);
+
+	l = godot_string_rsplit_with_maxsplit(&s, &c, true, 2);
+	CHECK(godot_packed_string_array_size(&l) == 3);
+	for (int i = 0; i < godot_packed_string_array_size(&l); i++) {
+		godot_string t = godot_packed_string_array_get(&l, i);
+		CHECK(u32scmp(godot_string_get_data(&t), slices_r[i]) == 0);
+		godot_string_destroy(&t);
+	}
+	godot_packed_string_array_destroy(&l);
+	godot_string_destroy(&s);
+
+	godot_string_new_with_latin1_chars(&s, "Mars Jupiter Saturn Uranus");
+	const char32_t *slices_s[4] = { U"Mars", U"Jupiter", U"Saturn", U"Uranus" };
+	l = godot_string_split_spaces(&s);
+	for (int i = 0; i < godot_packed_string_array_size(&l); i++) {
+		godot_string t = godot_packed_string_array_get(&l, i);
+		CHECK(u32scmp(godot_string_get_data(&t), slices_s[i]) == 0);
+		godot_string_destroy(&t);
+	}
+	godot_packed_string_array_destroy(&l);
+	godot_string_destroy(&s);
+
+	godot_string c1, c2;
+	godot_string_new_with_latin1_chars(&c1, ";");
+	godot_string_new_with_latin1_chars(&c2, " ");
+
+	godot_string_new_with_latin1_chars(&s, "1.2;2.3 4.5");
+	const double slices_d[3] = { 1.2, 2.3, 4.5 };
+
+	godot_packed_float32_array lf = godot_string_split_floats_allow_empty(&s, &c1);
+	CHECK(godot_packed_float32_array_size(&lf) == 2);
+	for (int i = 0; i < godot_packed_float32_array_size(&lf); i++) {
+		CHECK(ABS(godot_packed_float32_array_get(&lf, i) - slices_d[i]) <= 0.00001);
+	}
+	godot_packed_float32_array_destroy(&lf);
+
+	godot_packed_string_array keys;
+	godot_packed_string_array_new(&keys);
+	godot_packed_string_array_push_back(&keys, &c1);
+	godot_packed_string_array_push_back(&keys, &c2);
+
+	lf = godot_string_split_floats_mk_allow_empty(&s, &keys);
+	CHECK(godot_packed_float32_array_size(&lf) == 3);
+	for (int i = 0; i < godot_packed_float32_array_size(&lf); i++) {
+		CHECK(ABS(godot_packed_float32_array_get(&lf, i) - slices_d[i]) <= 0.00001);
+	}
+	godot_packed_float32_array_destroy(&lf);
+
+	godot_string_destroy(&s);
+	godot_string_new_with_latin1_chars(&s, "1;2 4");
+	const int slices_i[3] = { 1, 2, 4 };
+
+	godot_packed_int32_array li = godot_string_split_ints_allow_empty(&s, &c1);
+	CHECK(godot_packed_int32_array_size(&li) == 2);
+	for (int i = 0; i < godot_packed_int32_array_size(&li); i++) {
+		CHECK(godot_packed_int32_array_get(&li, i) == slices_i[i]);
+	}
+	godot_packed_int32_array_destroy(&li);
+
+	li = godot_string_split_ints_mk_allow_empty(&s, &keys);
+	CHECK(godot_packed_int32_array_size(&li) == 3);
+	for (int i = 0; i < godot_packed_int32_array_size(&li); i++) {
+		CHECK(godot_packed_int32_array_get(&li, i) == slices_i[i]);
+	}
+	godot_packed_int32_array_destroy(&li);
+
+	godot_string_destroy(&s);
+	godot_string_destroy(&c);
+	godot_string_destroy(&c1);
+	godot_string_destroy(&c2);
+	godot_packed_string_array_destroy(&keys);
+}
+
+TEST_CASE("[GDNative String] Erasing") {
+	godot_string s, t;
+	godot_string_new_with_latin1_chars(&s, "Josephine is such a cute girl!");
+	godot_string_new_with_latin1_chars(&t, "cute ");
+
+	godot_string_erase(&s, godot_string_find(&s, &t), godot_string_length(&t));
+
+	CHECK(u32scmp(godot_string_get_data(&s), U"Josephine is such a girl!") == 0);
+
+	godot_string_destroy(&s);
+	godot_string_destroy(&t);
+}
+
+struct test_27_data {
+	char const *data;
+	char const *part;
+	bool expected;
+};
+
+TEST_CASE("[GDNative String] Begins with") {
+	test_27_data tc[] = {
+		{ "res://foobar", "res://", true },
+		{ "res", "res://", false },
+		{ "abc", "abc", true }
+	};
+	size_t count = sizeof(tc) / sizeof(tc[0]);
+	bool state = true;
+	for (size_t i = 0; state && i < count; ++i) {
+		godot_string s;
+		godot_string_new_with_latin1_chars(&s, tc[i].data);
+
+		state = godot_string_begins_with_char_array(&s, tc[i].part) == tc[i].expected;
+		if (state) {
+			godot_string t;
+			godot_string_new_with_latin1_chars(&t, tc[i].part);
+			state = godot_string_begins_with(&s, &t) == tc[i].expected;
+			godot_string_destroy(&t);
+		}
+		godot_string_destroy(&s);
+
+		CHECK(state);
+		if (!state) {
+			break;
+		}
+	};
+	CHECK(state);
+}
+
+TEST_CASE("[GDNative String] Ends with") {
+	test_27_data tc[] = {
+		{ "res://foobar", "foobar", true },
+		{ "res", "res://", false },
+		{ "abc", "abc", true }
+	};
+	size_t count = sizeof(tc) / sizeof(tc[0]);
+	bool state = true;
+	for (size_t i = 0; state && i < count; ++i) {
+		godot_string s;
+		godot_string_new_with_latin1_chars(&s, tc[i].data);
+
+		state = godot_string_ends_with_char_array(&s, tc[i].part) == tc[i].expected;
+		if (state) {
+			godot_string t;
+			godot_string_new_with_latin1_chars(&t, tc[i].part);
+			state = godot_string_ends_with(&s, &t) == tc[i].expected;
+			godot_string_destroy(&t);
+		}
+		godot_string_destroy(&s);
+
+		CHECK(state);
+		if (!state) {
+			break;
+		}
+	};
+	CHECK(state);
+}
+
+TEST_CASE("[GDNative String] format") {
+	godot_string value_format, t;
+	godot_string_new_with_latin1_chars(&value_format, "red=\"$red\" green=\"$green\" blue=\"$blue\" alpha=\"$alpha\"");
+
+	godot_variant key_v, val_v;
+	godot_dictionary value_dictionary;
+	godot_dictionary_new(&value_dictionary);
+
+	godot_string_new_with_latin1_chars(&t, "red");
+	godot_variant_new_string(&key_v, &t);
+	godot_string_destroy(&t);
+	godot_variant_new_int(&val_v, 10);
+	godot_dictionary_set(&value_dictionary, &key_v, &val_v);
+	godot_variant_destroy(&key_v);
+	godot_variant_destroy(&val_v);
+
+	godot_string_new_with_latin1_chars(&t, "green");
+	godot_variant_new_string(&key_v, &t);
+	godot_string_destroy(&t);
+	godot_variant_new_int(&val_v, 20);
+	godot_dictionary_set(&value_dictionary, &key_v, &val_v);
+	godot_variant_destroy(&key_v);
+	godot_variant_destroy(&val_v);
+
+	godot_string_new_with_latin1_chars(&t, "blue");
+	godot_variant_new_string(&key_v, &t);
+	godot_string_destroy(&t);
+	godot_string_new_with_latin1_chars(&t, "bla");
+	godot_variant_new_string(&val_v, &t);
+	godot_string_destroy(&t);
+	godot_dictionary_set(&value_dictionary, &key_v, &val_v);
+	godot_variant_destroy(&key_v);
+	godot_variant_destroy(&val_v);
+
+	godot_string_new_with_latin1_chars(&t, "alpha");
+	godot_variant_new_string(&key_v, &t);
+	godot_string_destroy(&t);
+	godot_variant_new_real(&val_v, 0.4);
+	godot_dictionary_set(&value_dictionary, &key_v, &val_v);
+	godot_variant_destroy(&key_v);
+	godot_variant_destroy(&val_v);
+
+	godot_variant dict_v;
+	godot_variant_new_dictionary(&dict_v, &value_dictionary);
+	godot_string s = godot_string_format_with_custom_placeholder(&value_format, &dict_v, "$_");
+
+	CHECK(u32scmp(godot_string_get_data(&s), U"red=\"10\" green=\"20\" blue=\"bla\" alpha=\"0.4\"") == 0);
+
+	godot_dictionary_destroy(&value_dictionary);
+	godot_string_destroy(&s);
+	godot_variant_destroy(&dict_v);
+	godot_string_destroy(&value_format);
+}
+
+TEST_CASE("[GDNative String] sprintf") {
+	//godot_string GDAPI (const godot_string *p_self, const godot_array *p_values, godot_bool *p_error);
+	godot_string format, output;
+	godot_array args;
+	bool error;
+
+#define ARRAY_PUSH_STRING(x)                       \
+	{                                              \
+		godot_variant v;                           \
+		godot_string t;                            \
+		godot_string_new_with_latin1_chars(&t, x); \
+		godot_variant_new_string(&v, &t);          \
+		godot_string_destroy(&t);                  \
+		godot_array_push_back(&args, &v);          \
+		godot_variant_destroy(&v);                 \
+	}
+
+#define ARRAY_PUSH_INT(x)                 \
+	{                                     \
+		godot_variant v;                  \
+		godot_variant_new_int(&v, x);     \
+		godot_array_push_back(&args, &v); \
+		godot_variant_destroy(&v);        \
+	}
+
+#define ARRAY_PUSH_REAL(x)                \
+	{                                     \
+		godot_variant v;                  \
+		godot_variant_new_real(&v, x);    \
+		godot_array_push_back(&args, &v); \
+		godot_variant_destroy(&v);        \
+	}
+
+	godot_array_new(&args);
+
+	// %%
+	godot_string_new_with_latin1_chars(&format, "fish %% frog");
+	godot_array_clear(&args);
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error == false);
+	CHECK(u32scmp(godot_string_get_data(&output), U"fish % frog") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+	//////// INTS
+
+	// Int
+	godot_string_new_with_latin1_chars(&format, "fish %d frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_INT(5);
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error == false);
+	CHECK(u32scmp(godot_string_get_data(&output), U"fish 5 frog") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	// Int left padded with zeroes.
+	godot_string_new_with_latin1_chars(&format, "fish %05d frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_INT(5);
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error == false);
+	CHECK(u32scmp(godot_string_get_data(&output), U"fish 00005 frog") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	// Int left padded with spaces.
+	godot_string_new_with_latin1_chars(&format, "fish %5d frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_INT(5);
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error == false);
+	CHECK(u32scmp(godot_string_get_data(&output), U"fish     5 frog") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	// Int right padded with spaces.
+	godot_string_new_with_latin1_chars(&format, "fish %-5d frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_INT(5);
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error == false);
+	CHECK(u32scmp(godot_string_get_data(&output), U"fish 5     frog") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	// Int with sign (positive).
+	godot_string_new_with_latin1_chars(&format, "fish %+d frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_INT(5);
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error == false);
+	CHECK(u32scmp(godot_string_get_data(&output), U"fish +5 frog") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	// Negative int.
+	godot_string_new_with_latin1_chars(&format, "fish %d frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_INT(-5);
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error == false);
+	CHECK(u32scmp(godot_string_get_data(&output), U"fish -5 frog") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	// Hex (lower)
+	godot_string_new_with_latin1_chars(&format, "fish %x frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_INT(45);
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error == false);
+	CHECK(u32scmp(godot_string_get_data(&output), U"fish 2d frog") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	// Hex (upper)
+	godot_string_new_with_latin1_chars(&format, "fish %X frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_INT(45);
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error == false);
+	CHECK(u32scmp(godot_string_get_data(&output), U"fish 2D frog") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	// Octal
+	godot_string_new_with_latin1_chars(&format, "fish %o frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_INT(99);
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error == false);
+	CHECK(u32scmp(godot_string_get_data(&output), U"fish 143 frog") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+	////// REALS
+
+	// Real
+	godot_string_new_with_latin1_chars(&format, "fish %f frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_REAL(99.99);
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error == false);
+	CHECK(u32scmp(godot_string_get_data(&output), U"fish 99.990000 frog") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	// Real left-padded
+	godot_string_new_with_latin1_chars(&format, "fish %11f frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_REAL(99.99);
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error == false);
+	CHECK(u32scmp(godot_string_get_data(&output), U"fish   99.990000 frog") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	// Real right-padded
+	godot_string_new_with_latin1_chars(&format, "fish %-11f frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_REAL(99.99);
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error == false);
+	CHECK(u32scmp(godot_string_get_data(&output), U"fish 99.990000   frog") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	// Real given int.
+	godot_string_new_with_latin1_chars(&format, "fish %f frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_REAL(99);
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error == false);
+	CHECK(u32scmp(godot_string_get_data(&output), U"fish 99.000000 frog") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	// Real with sign (positive).
+	godot_string_new_with_latin1_chars(&format, "fish %+f frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_REAL(99.99);
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error == false);
+	CHECK(u32scmp(godot_string_get_data(&output), U"fish +99.990000 frog") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	// Real with 1 decimals.
+	godot_string_new_with_latin1_chars(&format, "fish %.1f frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_REAL(99.99);
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error == false);
+	CHECK(u32scmp(godot_string_get_data(&output), U"fish 100.0 frog") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	// Real with 12 decimals.
+	godot_string_new_with_latin1_chars(&format, "fish %.12f frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_REAL(99.99);
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error == false);
+	CHECK(u32scmp(godot_string_get_data(&output), U"fish 99.990000000000 frog") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	// Real with no decimals.
+	godot_string_new_with_latin1_chars(&format, "fish %.f frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_REAL(99.99);
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error == false);
+	CHECK(u32scmp(godot_string_get_data(&output), U"fish 100 frog") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	/////// Strings.
+
+	// String
+	godot_string_new_with_latin1_chars(&format, "fish %s frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_STRING("cheese");
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error == false);
+	CHECK(u32scmp(godot_string_get_data(&output), U"fish cheese frog") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	// String left-padded
+	godot_string_new_with_latin1_chars(&format, "fish %10s frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_STRING("cheese");
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error == false);
+	CHECK(u32scmp(godot_string_get_data(&output), U"fish     cheese frog") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	// String right-padded
+	godot_string_new_with_latin1_chars(&format, "fish %-10s frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_STRING("cheese");
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error == false);
+	CHECK(u32scmp(godot_string_get_data(&output), U"fish cheese     frog") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	///// Characters
+
+	// Character as string.
+	godot_string_new_with_latin1_chars(&format, "fish %c frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_STRING("A");
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error == false);
+	CHECK(u32scmp(godot_string_get_data(&output), U"fish A frog") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	// Character as int.
+	godot_string_new_with_latin1_chars(&format, "fish %c frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_INT(65);
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error == false);
+	CHECK(u32scmp(godot_string_get_data(&output), U"fish A frog") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	///// Dynamic width
+
+	// String dynamic width
+	godot_string_new_with_latin1_chars(&format, "fish %*s frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_INT(10);
+	ARRAY_PUSH_STRING("cheese");
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error == false);
+	REQUIRE(u32scmp(godot_string_get_data(&output), U"fish     cheese frog") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	// Int dynamic width
+	godot_string_new_with_latin1_chars(&format, "fish %*d frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_INT(10);
+	ARRAY_PUSH_INT(99);
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error == false);
+	REQUIRE(u32scmp(godot_string_get_data(&output), U"fish         99 frog") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	// Float dynamic width
+	godot_string_new_with_latin1_chars(&format, "fish %*.*f frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_INT(10);
+	ARRAY_PUSH_INT(3);
+	ARRAY_PUSH_REAL(99.99);
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error == false);
+	CHECK(u32scmp(godot_string_get_data(&output), U"fish     99.990 frog") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	///// Errors
+
+	// More formats than arguments.
+	godot_string_new_with_latin1_chars(&format, "fish %s %s frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_STRING("cheese");
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error);
+	CHECK(u32scmp(godot_string_get_data(&output), U"not enough arguments for format string") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	// More arguments than formats.
+	godot_string_new_with_latin1_chars(&format, "fish %s frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_STRING("hello");
+	ARRAY_PUSH_STRING("cheese");
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error);
+	CHECK(u32scmp(godot_string_get_data(&output), U"not all arguments converted during string formatting") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	// Incomplete format.
+	godot_string_new_with_latin1_chars(&format, "fish %10");
+	godot_array_clear(&args);
+	ARRAY_PUSH_STRING("cheese");
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error);
+	CHECK(u32scmp(godot_string_get_data(&output), U"incomplete format") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	// Bad character in format string
+	godot_string_new_with_latin1_chars(&format, "fish %&f frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_STRING("cheese");
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error);
+	CHECK(u32scmp(godot_string_get_data(&output), U"unsupported format character") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	// Too many decimals.
+	godot_string_new_with_latin1_chars(&format, "fish %2.2.2f frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_REAL(99.99);
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error);
+	CHECK(u32scmp(godot_string_get_data(&output), U"too many decimal points in format") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	// * not a number
+	godot_string_new_with_latin1_chars(&format, "fish %*f frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_STRING("cheese");
+	ARRAY_PUSH_REAL(99.99);
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error);
+	CHECK(u32scmp(godot_string_get_data(&output), U"* wants number") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	// Character too long.
+	godot_string_new_with_latin1_chars(&format, "fish %c frog");
+	godot_array_clear(&args);
+	ARRAY_PUSH_STRING("sc");
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error);
+	CHECK(u32scmp(godot_string_get_data(&output), U"%c requires number or single-character string") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	// Character bad type.
+	godot_string_new_with_latin1_chars(&format, "fish %c frog");
+	godot_array_clear(&args);
+	godot_array t;
+	godot_array_new(&t);
+	godot_variant v;
+	godot_variant_new_array(&v, &t);
+	godot_array_destroy(&t);
+	godot_array_push_back(&args, &v);
+	godot_variant_destroy(&v);
+	output = godot_string_sprintf(&format, &args, &error);
+	REQUIRE(error);
+	CHECK(u32scmp(godot_string_get_data(&output), U"%c requires number or single-character string") == 0);
+	godot_string_destroy(&format);
+	godot_string_destroy(&output);
+
+	godot_array_destroy(&args);
+#undef ARRAY_PUSH_INT
+#undef ARRAY_PUSH_REAL
+#undef ARRAY_PUSH_STRING
+}
+
+TEST_CASE("[GDNative String] is_numeric") {
+#define IS_NUM_TEST(x, r)                          \
+	{                                              \
+		godot_string t;                            \
+		godot_string_new_with_latin1_chars(&t, x); \
+		CHECK(godot_string_is_numeric(&t) == r);   \
+		godot_string_destroy(&t);                  \
+	}
+
+	IS_NUM_TEST("12", true);
+	IS_NUM_TEST("1.2", true);
+	IS_NUM_TEST("AF", false);
+	IS_NUM_TEST("-12", true);
+	IS_NUM_TEST("-1.2", true);
+
+#undef IS_NUM_TEST
+}
+
+TEST_CASE("[GDNative String] pad") {
+	godot_string s, c;
+	godot_string_new_with_latin1_chars(&s, "test");
+	godot_string_new_with_latin1_chars(&c, "x");
+
+	godot_string l = godot_string_lpad_with_custom_character(&s, 10, &c);
+	CHECK(u32scmp(godot_string_get_data(&l), U"xxxxxxtest") == 0);
+	godot_string_destroy(&l);
+
+	godot_string r = godot_string_rpad_with_custom_character(&s, 10, &c);
+	CHECK(u32scmp(godot_string_get_data(&r), U"testxxxxxx") == 0);
+	godot_string_destroy(&r);
+
+	godot_string_destroy(&s);
+	godot_string_destroy(&c);
+
+	godot_string_new_with_latin1_chars(&s, "10.10");
+	c = godot_string_pad_decimals(&s, 4);
+	CHECK(u32scmp(godot_string_get_data(&c), U"10.1000") == 0);
+	godot_string_destroy(&c);
+	c = godot_string_pad_zeros(&s, 4);
+	CHECK(u32scmp(godot_string_get_data(&c), U"0010.10") == 0);
+	godot_string_destroy(&c);
+
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] is_subsequence_of") {
+	godot_string a, t;
+	godot_string_new_with_latin1_chars(&a, "is subsequence of");
+
+	godot_string_new_with_latin1_chars(&t, "sub");
+	CHECK(godot_string_is_subsequence_of(&t, &a));
+	godot_string_destroy(&t);
+
+	godot_string_new_with_latin1_chars(&t, "Sub");
+	CHECK(!godot_string_is_subsequence_of(&t, &a));
+	godot_string_destroy(&t);
+
+	godot_string_new_with_latin1_chars(&t, "Sub");
+	CHECK(godot_string_is_subsequence_ofi(&t, &a));
+	godot_string_destroy(&t);
+
+	godot_string_destroy(&a);
+}
+
+TEST_CASE("[GDNative String] match") {
+	godot_string s, t;
+	godot_string_new_with_latin1_chars(&s, "*.png");
+
+	godot_string_new_with_latin1_chars(&t, "img1.png");
+	CHECK(godot_string_match(&t, &s));
+	godot_string_destroy(&t);
+
+	godot_string_new_with_latin1_chars(&t, "img1.jpeg");
+	CHECK(!godot_string_match(&t, &s));
+	godot_string_destroy(&t);
+
+	godot_string_new_with_latin1_chars(&t, "img1.Png");
+	CHECK(!godot_string_match(&t, &s));
+	CHECK(godot_string_matchn(&t, &s));
+	godot_string_destroy(&t);
+
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] IPVX address to string") {
+	godot_string ip;
+
+	godot_string_new_with_latin1_chars(&ip, "192.168.0.1");
+	CHECK(godot_string_is_valid_ip_address(&ip));
+	godot_string_destroy(&ip);
+
+	godot_string_new_with_latin1_chars(&ip, "192.368.0.1");
+	CHECK(!godot_string_is_valid_ip_address(&ip));
+	godot_string_destroy(&ip);
+
+	godot_string_new_with_latin1_chars(&ip, "2001:0db8:85a3:0000:0000:8a2e:0370:7334");
+	CHECK(godot_string_is_valid_ip_address(&ip));
+	godot_string_destroy(&ip);
+
+	godot_string_new_with_latin1_chars(&ip, "2001:0db8:85j3:0000:0000:8a2e:0370:7334");
+	CHECK(!godot_string_is_valid_ip_address(&ip));
+	godot_string_destroy(&ip);
+
+	godot_string_new_with_latin1_chars(&ip, "2001:0db8:85f345:0000:0000:8a2e:0370:7334");
+	CHECK(!godot_string_is_valid_ip_address(&ip));
+	godot_string_destroy(&ip);
+
+	godot_string_new_with_latin1_chars(&ip, "2001:0db8::0:8a2e:370:7334");
+	CHECK(godot_string_is_valid_ip_address(&ip));
+	godot_string_destroy(&ip);
+
+	godot_string_new_with_latin1_chars(&ip, "::ffff:192.168.0.1");
+	CHECK(godot_string_is_valid_ip_address(&ip));
+	godot_string_destroy(&ip);
+}
+
+TEST_CASE("[GDNative String] Capitalize against many strings") {
+#define CAP_TEST(i, o)                                                                 \
+	godot_string_new_with_latin1_chars(&input, i);                                     \
+	godot_string_new_with_latin1_chars(&output, o);                                    \
+	test = godot_string_capitalize(&input);                                            \
+	CHECK(u32scmp(godot_string_get_data(&output), godot_string_get_data(&test)) == 0); \
+	godot_string_destroy(&input);                                                      \
+	godot_string_destroy(&output);                                                     \
+	godot_string_destroy(&test);
+
+	godot_string input, output, test;
+
+	CAP_TEST("bytes2var", "Bytes 2 Var");
+	CAP_TEST("linear2db", "Linear 2 Db");
+	CAP_TEST("vector3", "Vector 3");
+	CAP_TEST("sha256", "Sha 256");
+	CAP_TEST("2db", "2 Db");
+	CAP_TEST("PascalCase", "Pascal Case");
+	CAP_TEST("PascalPascalCase", "Pascal Pascal Case");
+	CAP_TEST("snake_case", "Snake Case");
+	CAP_TEST("snake_snake_case", "Snake Snake Case");
+	CAP_TEST("sha256sum", "Sha 256 Sum");
+	CAP_TEST("cat2dog", "Cat 2 Dog");
+	CAP_TEST("function(name)", "Function(name)");
+	CAP_TEST("snake_case_function(snake_case_arg)", "Snake Case Function(snake Case Arg)");
+	CAP_TEST("snake_case_function( snake_case_arg )", "Snake Case Function( Snake Case Arg )");
+
+#undef CAP_TEST
+}
+
+TEST_CASE("[GDNative String] lstrip and rstrip") {
+#define LSTRIP_TEST(x, y, z)                                                                     \
+	{                                                                                            \
+		godot_string xx, yy, zz, rr;                                                             \
+		godot_string_new_with_latin1_chars(&xx, x);                                              \
+		godot_string_new_with_latin1_chars(&yy, y);                                              \
+		godot_string_new_with_latin1_chars(&zz, z);                                              \
+		rr = godot_string_lstrip(&xx, &yy);                                                      \
+		state = state && (u32scmp(godot_string_get_data(&rr), godot_string_get_data(&zz)) == 0); \
+		godot_string_destroy(&xx);                                                               \
+		godot_string_destroy(&yy);                                                               \
+		godot_string_destroy(&zz);                                                               \
+		godot_string_destroy(&rr);                                                               \
+	}
+
+#define RSTRIP_TEST(x, y, z)                                                                     \
+	{                                                                                            \
+		godot_string xx, yy, zz, rr;                                                             \
+		godot_string_new_with_latin1_chars(&xx, x);                                              \
+		godot_string_new_with_latin1_chars(&yy, y);                                              \
+		godot_string_new_with_latin1_chars(&zz, z);                                              \
+		rr = godot_string_rstrip(&xx, &yy);                                                      \
+		state = state && (u32scmp(godot_string_get_data(&rr), godot_string_get_data(&zz)) == 0); \
+		godot_string_destroy(&xx);                                                               \
+		godot_string_destroy(&yy);                                                               \
+		godot_string_destroy(&zz);                                                               \
+		godot_string_destroy(&rr);                                                               \
+	}
+
+#define LSTRIP_UTF8_TEST(x, y, z)                                                                \
+	{                                                                                            \
+		godot_string xx, yy, zz, rr;                                                             \
+		godot_string_new_with_utf8_chars(&xx, x);                                                \
+		godot_string_new_with_utf8_chars(&yy, y);                                                \
+		godot_string_new_with_utf8_chars(&zz, z);                                                \
+		rr = godot_string_lstrip(&xx, &yy);                                                      \
+		state = state && (u32scmp(godot_string_get_data(&rr), godot_string_get_data(&zz)) == 0); \
+		godot_string_destroy(&xx);                                                               \
+		godot_string_destroy(&yy);                                                               \
+		godot_string_destroy(&zz);                                                               \
+		godot_string_destroy(&rr);                                                               \
+	}
+
+#define RSTRIP_UTF8_TEST(x, y, z)                                                                \
+	{                                                                                            \
+		godot_string xx, yy, zz, rr;                                                             \
+		godot_string_new_with_utf8_chars(&xx, x);                                                \
+		godot_string_new_with_utf8_chars(&yy, y);                                                \
+		godot_string_new_with_utf8_chars(&zz, z);                                                \
+		rr = godot_string_rstrip(&xx, &yy);                                                      \
+		state = state && (u32scmp(godot_string_get_data(&rr), godot_string_get_data(&zz)) == 0); \
+		godot_string_destroy(&xx);                                                               \
+		godot_string_destroy(&yy);                                                               \
+		godot_string_destroy(&zz);                                                               \
+		godot_string_destroy(&rr);                                                               \
+	}
+
+	bool state = true;
+
+	// strip none
+	LSTRIP_TEST("abc", "", "abc");
+	RSTRIP_TEST("abc", "", "abc");
+	// strip one
+	LSTRIP_TEST("abc", "a", "bc");
+	RSTRIP_TEST("abc", "c", "ab");
+	// strip lots
+	LSTRIP_TEST("bababbababccc", "ab", "ccc");
+	RSTRIP_TEST("aaabcbcbcbbcbbc", "cb", "aaa");
+	// strip empty string
+	LSTRIP_TEST("", "", "");
+	RSTRIP_TEST("", "", "");
+	// strip to empty string
+	LSTRIP_TEST("abcabcabc", "bca", "");
+	RSTRIP_TEST("abcabcabc", "bca", "");
+	// don't strip wrong end
+	LSTRIP_TEST("abc", "c", "abc");
+	LSTRIP_TEST("abca", "a", "bca");
+	RSTRIP_TEST("abc", "a", "abc");
+	RSTRIP_TEST("abca", "a", "abc");
+	// in utf-8 "¿" (\u00bf) has the same first byte as "µ" (\u00b5)
+	// and the same second as "ÿ" (\u00ff)
+	LSTRIP_UTF8_TEST("¿", "µÿ", "¿");
+	RSTRIP_UTF8_TEST("¿", "µÿ", "¿");
+	LSTRIP_UTF8_TEST("µ¿ÿ", "µÿ", "¿ÿ");
+	RSTRIP_UTF8_TEST("µ¿ÿ", "µÿ", "µ¿");
+
+	// the above tests repeated with additional superfluous strip chars
+
+	// strip none
+	LSTRIP_TEST("abc", "qwjkl", "abc");
+	RSTRIP_TEST("abc", "qwjkl", "abc");
+	// strip one
+	LSTRIP_TEST("abc", "qwajkl", "bc");
+	RSTRIP_TEST("abc", "qwcjkl", "ab");
+	// strip lots
+	LSTRIP_TEST("bababbababccc", "qwabjkl", "ccc");
+	RSTRIP_TEST("aaabcbcbcbbcbbc", "qwcbjkl", "aaa");
+	// strip empty string
+	LSTRIP_TEST("", "qwjkl", "");
+	RSTRIP_TEST("", "qwjkl", "");
+	// strip to empty string
+	LSTRIP_TEST("abcabcabc", "qwbcajkl", "");
+	RSTRIP_TEST("abcabcabc", "qwbcajkl", "");
+	// don't strip wrong end
+	LSTRIP_TEST("abc", "qwcjkl", "abc");
+	LSTRIP_TEST("abca", "qwajkl", "bca");
+	RSTRIP_TEST("abc", "qwajkl", "abc");
+	RSTRIP_TEST("abca", "qwajkl", "abc");
+	// in utf-8 "¿" (\u00bf) has the same first byte as "µ" (\u00b5)
+	// and the same second as "ÿ" (\u00ff)
+	LSTRIP_UTF8_TEST("¿", "qwaµÿjkl", "¿");
+	RSTRIP_UTF8_TEST("¿", "qwaµÿjkl", "¿");
+	LSTRIP_UTF8_TEST("µ¿ÿ", "qwaµÿjkl", "¿ÿ");
+	RSTRIP_UTF8_TEST("µ¿ÿ", "qwaµÿjkl", "µ¿");
+
+	CHECK(state);
+
+#undef LSTRIP_TEST
+#undef RSTRIP_TEST
+#undef LSTRIP_UTF8_TEST
+#undef RSTRIP_UTF8_TEST
+}
+
+TEST_CASE("[GDNative String] Cyrillic to_lower()") {
+	godot_string upper, lower, test;
+	godot_string_new_with_utf8_chars(&upper, "АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ");
+	godot_string_new_with_utf8_chars(&lower, "абвгдеёжзийклмнопрстуфхцчшщъыьэюя");
+
+	test = godot_string_to_lower(&upper);
+
+	CHECK((u32scmp(godot_string_get_data(&test), godot_string_get_data(&lower)) == 0));
+
+	godot_string_destroy(&upper);
+	godot_string_destroy(&lower);
+	godot_string_destroy(&test);
+}
+
+TEST_CASE("[GDNative String] Count and countn functionality") {
+#define COUNT_TEST(x, y, r)                                       \
+	{                                                             \
+		godot_string s, t;                                        \
+		godot_string_new_with_latin1_chars(&s, x);                \
+		godot_string_new_with_latin1_chars(&t, y);                \
+		state = state && (godot_string_count(&s, &t, 0, 0) == r); \
+		godot_string_destroy(&s);                                 \
+		godot_string_destroy(&t);                                 \
+	}
+
+#define COUNTR_TEST(x, y, a, b, r)                                \
+	{                                                             \
+		godot_string s, t;                                        \
+		godot_string_new_with_latin1_chars(&s, x);                \
+		godot_string_new_with_latin1_chars(&t, y);                \
+		state = state && (godot_string_count(&s, &t, a, b) == r); \
+		godot_string_destroy(&s);                                 \
+		godot_string_destroy(&t);                                 \
+	}
+
+#define COUNTN_TEST(x, y, r)                                       \
+	{                                                              \
+		godot_string s, t;                                         \
+		godot_string_new_with_latin1_chars(&s, x);                 \
+		godot_string_new_with_latin1_chars(&t, y);                 \
+		state = state && (godot_string_countn(&s, &t, 0, 0) == r); \
+		godot_string_destroy(&s);                                  \
+		godot_string_destroy(&t);                                  \
+	}
+
+#define COUNTNR_TEST(x, y, a, b, r)                                \
+	{                                                              \
+		godot_string s, t;                                         \
+		godot_string_new_with_latin1_chars(&s, x);                 \
+		godot_string_new_with_latin1_chars(&t, y);                 \
+		state = state && (godot_string_countn(&s, &t, a, b) == r); \
+		godot_string_destroy(&s);                                  \
+		godot_string_destroy(&t);                                  \
+	}
+	bool state = true;
+
+	COUNT_TEST("", "Test", 0);
+	COUNT_TEST("Test", "", 0);
+	COUNT_TEST("Test", "test", 0);
+	COUNT_TEST("Test", "TEST", 0);
+	COUNT_TEST("TEST", "TEST", 1);
+	COUNT_TEST("Test", "Test", 1);
+	COUNT_TEST("aTest", "Test", 1);
+	COUNT_TEST("Testa", "Test", 1);
+	COUNT_TEST("TestTestTest", "Test", 3);
+	COUNT_TEST("TestTestTest", "TestTest", 1);
+	COUNT_TEST("TestGodotTestGodotTestGodot", "Test", 3);
+
+	COUNTR_TEST("TestTestTestTest", "Test", 4, 8, 1);
+	COUNTR_TEST("TestTestTestTest", "Test", 4, 12, 2);
+	COUNTR_TEST("TestTestTestTest", "Test", 4, 16, 3);
+	COUNTR_TEST("TestTestTestTest", "Test", 4, 0, 3);
+
+	COUNTN_TEST("Test", "test", 1);
+	COUNTN_TEST("Test", "TEST", 1);
+	COUNTN_TEST("testTest-Testatest", "tEst", 4);
+	COUNTNR_TEST("testTest-TeStatest", "tEsT", 4, 16, 2);
+
+	CHECK(state);
+
+#undef COUNT_TEST
+#undef COUNTR_TEST
+#undef COUNTN_TEST
+#undef COUNTNR_TEST
+}
+
+TEST_CASE("[GDNative String] Bigrams") {
+	godot_string s, t;
+	godot_string_new_with_latin1_chars(&s, "abcd");
+	godot_packed_string_array bigr = godot_string_bigrams(&s);
+	godot_string_destroy(&s);
+
+	CHECK(godot_packed_string_array_size(&bigr) == 3);
+
+	t = godot_packed_string_array_get(&bigr, 0);
+	CHECK(u32scmp(godot_string_get_data(&t), U"ab") == 0);
+	godot_string_destroy(&t);
+
+	t = godot_packed_string_array_get(&bigr, 1);
+	CHECK(u32scmp(godot_string_get_data(&t), U"bc") == 0);
+	godot_string_destroy(&t);
+
+	t = godot_packed_string_array_get(&bigr, 2);
+	CHECK(u32scmp(godot_string_get_data(&t), U"cd") == 0);
+	godot_string_destroy(&t);
+
+	godot_packed_string_array_destroy(&bigr);
+}
+
+TEST_CASE("[GDNative String] c-escape/unescape") {
+	godot_string s;
+	godot_string_new_with_latin1_chars(&s, "\\1\a2\b\f3\n45\r6\t7\v8\'9\?0\"");
+	godot_string t = godot_string_c_escape(&s);
+	godot_string u = godot_string_c_unescape(&t);
+	CHECK(u32scmp(godot_string_get_data(&u), godot_string_get_data(&s)) == 0);
+	godot_string_destroy(&u);
+	godot_string_destroy(&t);
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] dedent") {
+	godot_string s, t;
+	godot_string_new_with_latin1_chars(&s, "      aaa\n    bbb");
+	godot_string_new_with_latin1_chars(&t, "aaa\nbbb");
+	godot_string u = godot_string_dedent(&s);
+	CHECK(u32scmp(godot_string_get_data(&u), godot_string_get_data(&t)) == 0);
+	godot_string_destroy(&u);
+	godot_string_destroy(&t);
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] Path functions") {
+	static const char *path[4] = { "C:\\Godot\\project\\test.tscn", "/Godot/project/test.xscn", "../Godot/project/test.scn", "Godot\\test.doc" };
+	static const char *base_dir[4] = { "C:\\Godot\\project", "/Godot/project", "../Godot/project", "Godot" };
+	static const char *base_name[4] = { "C:\\Godot\\project\\test", "/Godot/project/test", "../Godot/project/test", "Godot\\test" };
+	static const char *ext[4] = { "tscn", "xscn", "scn", "doc" };
+	static const char *file[4] = { "test.tscn", "test.xscn", "test.scn", "test.doc" };
+	static const bool abs[4] = { true, true, false, false };
+
+	for (int i = 0; i < 4; i++) {
+		godot_string s, t, u, f;
+		godot_string_new_with_latin1_chars(&s, path[i]);
+
+		t = godot_string_get_base_dir(&s);
+		godot_string_new_with_latin1_chars(&u, base_dir[i]);
+		CHECK(u32scmp(godot_string_get_data(&u), godot_string_get_data(&t)) == 0);
+		godot_string_destroy(&u);
+		godot_string_destroy(&t);
+
+		t = godot_string_get_basename(&s);
+		godot_string_new_with_latin1_chars(&u, base_name[i]);
+		CHECK(u32scmp(godot_string_get_data(&u), godot_string_get_data(&t)) == 0);
+		godot_string_destroy(&u);
+		godot_string_destroy(&t);
+
+		t = godot_string_get_extension(&s);
+		godot_string_new_with_latin1_chars(&u, ext[i]);
+		CHECK(u32scmp(godot_string_get_data(&u), godot_string_get_data(&t)) == 0);
+		godot_string_destroy(&u);
+		godot_string_destroy(&t);
+
+		t = godot_string_get_file(&s);
+		godot_string_new_with_latin1_chars(&u, file[i]);
+		CHECK(u32scmp(godot_string_get_data(&u), godot_string_get_data(&t)) == 0);
+		godot_string_destroy(&u);
+		godot_string_destroy(&t);
+
+		godot_string s_simp;
+		s_simp = godot_string_simplify_path(&s);
+		t = godot_string_get_base_dir(&s_simp);
+		godot_string_new_with_latin1_chars(&u, file[i]);
+		f = godot_string_plus_file(&t, &u);
+		CHECK(u32scmp(godot_string_get_data(&f), godot_string_get_data(&s_simp)) == 0);
+		godot_string_destroy(&f);
+		godot_string_destroy(&u);
+		godot_string_destroy(&t);
+		godot_string_destroy(&s_simp);
+
+		CHECK(godot_string_is_abs_path(&s) == abs[i]);
+		CHECK(godot_string_is_rel_path(&s) != abs[i]);
+
+		godot_string_destroy(&s);
+	}
+
+	static const char *file_name[3] = { "test.tscn", "test://.xscn", "?tes*t.scn" };
+	static const bool valid[3] = { true, false, false };
+	for (int i = 0; i < 3; i++) {
+		godot_string s;
+		godot_string_new_with_latin1_chars(&s, file_name[i]);
+		CHECK(godot_string_is_valid_filename(&s) == valid[i]);
+		godot_string_destroy(&s);
+	}
+}
+
+TEST_CASE("[GDNative String] hash") {
+	godot_string a, b, c;
+	godot_string_new_with_latin1_chars(&a, "Test");
+	godot_string_new_with_latin1_chars(&b, "Test");
+	godot_string_new_with_latin1_chars(&c, "West");
+	CHECK(godot_string_hash(&a) == godot_string_hash(&b));
+	CHECK(godot_string_hash(&a) != godot_string_hash(&c));
+
+	CHECK(godot_string_hash64(&a) == godot_string_hash64(&b));
+	CHECK(godot_string_hash64(&a) != godot_string_hash64(&c));
+
+	godot_string_destroy(&a);
+	godot_string_destroy(&b);
+	godot_string_destroy(&c);
+}
+
+TEST_CASE("[GDNative String] http_escape/unescape") {
+	godot_string s, t, u;
+	godot_string_new_with_latin1_chars(&s, "Godot Engine:'docs'");
+	godot_string_new_with_latin1_chars(&t, "Godot%20Engine%3A%27docs%27");
+
+	u = godot_string_http_escape(&s);
+	CHECK(u32scmp(godot_string_get_data(&u), godot_string_get_data(&t)) == 0);
+	godot_string_destroy(&u);
+
+	u = godot_string_http_unescape(&t);
+	CHECK(u32scmp(godot_string_get_data(&u), godot_string_get_data(&s)) == 0);
+	godot_string_destroy(&u);
+
+	godot_string_destroy(&s);
+	godot_string_destroy(&t);
+}
+
+TEST_CASE("[GDNative String] percent_encode/decode") {
+	godot_string s, t, u;
+	godot_string_new_with_latin1_chars(&s, "Godot Engine:'docs'");
+	godot_string_new_with_latin1_chars(&t, "Godot%20Engine%3a%27docs%27");
+
+	u = godot_string_percent_encode(&s);
+	CHECK(u32scmp(godot_string_get_data(&u), godot_string_get_data(&t)) == 0);
+	godot_string_destroy(&u);
+
+	u = godot_string_percent_decode(&t);
+	CHECK(u32scmp(godot_string_get_data(&u), godot_string_get_data(&s)) == 0);
+	godot_string_destroy(&u);
+
+	godot_string_destroy(&s);
+	godot_string_destroy(&t);
+}
+
+TEST_CASE("[GDNative String] xml_escape/unescape") {
+	godot_string s, t, u;
+	godot_string_new_with_latin1_chars(&s, "\"Test\" <test@test&'test'>");
+
+	t = godot_string_xml_escape_with_quotes(&s);
+	u = godot_string_xml_unescape(&t);
+	CHECK(u32scmp(godot_string_get_data(&u), godot_string_get_data(&s)) == 0);
+	godot_string_destroy(&u);
+	godot_string_destroy(&t);
+
+	t = godot_string_xml_escape(&s);
+	u = godot_string_xml_unescape(&t);
+	CHECK(u32scmp(godot_string_get_data(&u), godot_string_get_data(&s)) == 0);
+	godot_string_destroy(&u);
+	godot_string_destroy(&t);
+
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] Strip escapes") {
+	godot_string s, t, u;
+	godot_string_new_with_latin1_chars(&s, "\t\tTest Test\r\n Test");
+	godot_string_new_with_latin1_chars(&t, "Test Test Test");
+
+	u = godot_string_strip_escapes(&s);
+	CHECK(u32scmp(godot_string_get_data(&u), godot_string_get_data(&t)) == 0);
+	godot_string_destroy(&u);
+
+	godot_string_destroy(&t);
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] Strip edges") {
+	godot_string s, t, u;
+	godot_string_new_with_latin1_chars(&s, "\t Test Test   ");
+
+	godot_string_new_with_latin1_chars(&t, "Test Test   ");
+	u = godot_string_strip_edges(&s, true, false);
+	CHECK(u32scmp(godot_string_get_data(&u), godot_string_get_data(&t)) == 0);
+	godot_string_destroy(&u);
+	godot_string_destroy(&t);
+
+	godot_string_new_with_latin1_chars(&t, "\t Test Test");
+	u = godot_string_strip_edges(&s, false, true);
+	CHECK(u32scmp(godot_string_get_data(&u), godot_string_get_data(&t)) == 0);
+	godot_string_destroy(&u);
+	godot_string_destroy(&t);
+
+	godot_string_new_with_latin1_chars(&t, "Test Test");
+	u = godot_string_strip_edges(&s, true, true);
+	CHECK(u32scmp(godot_string_get_data(&u), godot_string_get_data(&t)) == 0);
+	godot_string_destroy(&u);
+	godot_string_destroy(&t);
+
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] Similarity") {
+	godot_string a, b, c;
+	godot_string_new_with_latin1_chars(&a, "Test");
+	godot_string_new_with_latin1_chars(&b, "West");
+	godot_string_new_with_latin1_chars(&c, "Toad");
+
+	CHECK(godot_string_similarity(&a, &b) > godot_string_similarity(&a, &c));
+
+	godot_string_destroy(&a);
+	godot_string_destroy(&b);
+	godot_string_destroy(&c);
+}
+
+TEST_CASE("[GDNative String] Trim") {
+	godot_string s, t, u, p;
+	godot_string_new_with_latin1_chars(&s, "aaaTestbbb");
+
+	godot_string_new_with_latin1_chars(&p, "aaa");
+	godot_string_new_with_latin1_chars(&t, "Testbbb");
+	u = godot_string_trim_prefix(&s, &p);
+	CHECK(u32scmp(godot_string_get_data(&u), godot_string_get_data(&t)) == 0);
+	godot_string_destroy(&u);
+	godot_string_destroy(&t);
+	godot_string_destroy(&p);
+
+	godot_string_new_with_latin1_chars(&p, "bbb");
+	godot_string_new_with_latin1_chars(&t, "aaaTest");
+	u = godot_string_trim_suffix(&s, &p);
+	CHECK(u32scmp(godot_string_get_data(&u), godot_string_get_data(&t)) == 0);
+	godot_string_destroy(&u);
+	godot_string_destroy(&t);
+	godot_string_destroy(&p);
+
+	godot_string_new_with_latin1_chars(&p, "Test");
+	u = godot_string_trim_suffix(&s, &p);
+	CHECK(u32scmp(godot_string_get_data(&u), godot_string_get_data(&s)) == 0);
+	godot_string_destroy(&u);
+	godot_string_destroy(&p);
+
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] Right/Left") {
+	godot_string s, t, u;
+	godot_string_new_with_latin1_chars(&s, "aaaTestbbb");
+	//                                            ^
+
+	godot_string_new_with_latin1_chars(&t, "tbbb");
+	u = godot_string_right(&s, 6);
+	CHECK(u32scmp(godot_string_get_data(&u), godot_string_get_data(&t)) == 0);
+	godot_string_destroy(&u);
+	godot_string_destroy(&t);
+
+	godot_string_new_with_latin1_chars(&t, "aaaTes");
+	u = godot_string_left(&s, 6);
+	CHECK(u32scmp(godot_string_get_data(&u), godot_string_get_data(&t)) == 0);
+	godot_string_destroy(&u);
+	godot_string_destroy(&t);
+
+	godot_string_destroy(&s);
+}
+
+TEST_CASE("[GDNative String] Repeat") {
+	godot_string t, u;
+	godot_string_new_with_latin1_chars(&t, "ab");
+
+	u = godot_string_repeat(&t, 4);
+	CHECK(u32scmp(godot_string_get_data(&u), U"abababab") == 0);
+	godot_string_destroy(&u);
+
+	godot_string_destroy(&t);
+}
+
+TEST_CASE("[GDNative String] SHA1/SHA256/MD5") {
+	godot_string s, t, sha1, sha256, md5;
+	godot_string_new_with_latin1_chars(&s, "Godot");
+	godot_string_new_with_latin1_chars(&sha1, "a1e91f39b9fce6a9998b14bdbe2aa2b39dc2d201");
+	static uint8_t sha1_buf[20] = {
+		0xA1, 0xE9, 0x1F, 0x39, 0xB9, 0xFC, 0xE6, 0xA9, 0x99, 0x8B, 0x14, 0xBD, 0xBE, 0x2A, 0xA2, 0xB3,
+		0x9D, 0xC2, 0xD2, 0x01
+	};
+	godot_string_new_with_latin1_chars(&sha256, "2a02b2443f7985d89d09001086ae3dcfa6eb0f55c6ef170715d42328e16e6cb8");
+	static uint8_t sha256_buf[32] = {
+		0x2A, 0x02, 0xB2, 0x44, 0x3F, 0x79, 0x85, 0xD8, 0x9D, 0x09, 0x00, 0x10, 0x86, 0xAE, 0x3D, 0xCF,
+		0xA6, 0xEB, 0x0F, 0x55, 0xC6, 0xEF, 0x17, 0x07, 0x15, 0xD4, 0x23, 0x28, 0xE1, 0x6E, 0x6C, 0xB8
+	};
+	godot_string_new_with_latin1_chars(&md5, "4a336d087aeb0390da10ee2ea7cb87f8");
+	static uint8_t md5_buf[16] = {
+		0x4A, 0x33, 0x6D, 0x08, 0x7A, 0xEB, 0x03, 0x90, 0xDA, 0x10, 0xEE, 0x2E, 0xA7, 0xCB, 0x87, 0xF8
+	};
+
+	godot_packed_byte_array buf = godot_string_sha1_buffer(&s);
+	CHECK(memcmp(sha1_buf, godot_packed_byte_array_ptr(&buf), 20) == 0);
+	godot_packed_byte_array_destroy(&buf);
+
+	t = godot_string_sha1_text(&s);
+	CHECK(u32scmp(godot_string_get_data(&t), godot_string_get_data(&sha1)) == 0);
+	godot_string_destroy(&t);
+
+	buf = godot_string_sha256_buffer(&s);
+	CHECK(memcmp(sha256_buf, godot_packed_byte_array_ptr(&buf), 32) == 0);
+	godot_packed_byte_array_destroy(&buf);
+
+	t = godot_string_sha256_text(&s);
+	CHECK(u32scmp(godot_string_get_data(&t), godot_string_get_data(&sha256)) == 0);
+	godot_string_destroy(&t);
+
+	buf = godot_string_md5_buffer(&s);
+	CHECK(memcmp(md5_buf, godot_packed_byte_array_ptr(&buf), 16) == 0);
+	godot_packed_byte_array_destroy(&buf);
+
+	t = godot_string_md5_text(&s);
+	CHECK(u32scmp(godot_string_get_data(&t), godot_string_get_data(&md5)) == 0);
+	godot_string_destroy(&t);
+
+	godot_string_destroy(&s);
+	godot_string_destroy(&sha1);
+	godot_string_destroy(&sha256);
+	godot_string_destroy(&md5);
+}
+
+TEST_CASE("[GDNative String] Join") {
+	godot_string s, t, u;
+	godot_string_new_with_latin1_chars(&s, ", ");
+
+	godot_packed_string_array parts;
+	godot_packed_string_array_new(&parts);
+	godot_string_new_with_latin1_chars(&t, "One");
+	godot_packed_string_array_push_back(&parts, &t);
+	godot_string_destroy(&t);
+	godot_string_new_with_latin1_chars(&t, "B");
+	godot_packed_string_array_push_back(&parts, &t);
+	godot_string_destroy(&t);
+	godot_string_new_with_latin1_chars(&t, "C");
+	godot_packed_string_array_push_back(&parts, &t);
+	godot_string_destroy(&t);
+
+	godot_string_new_with_latin1_chars(&u, "One, B, C");
+	t = godot_string_join(&s, &parts);
+	CHECK(u32scmp(godot_string_get_data(&u), godot_string_get_data(&t)) == 0);
+	godot_string_destroy(&u);
+	godot_string_destroy(&t);
+
+	godot_string_destroy(&s);
+	godot_packed_string_array_destroy(&parts);
+}
+
+TEST_CASE("[GDNative String] Is_*") {
+	static const char *data[12] = { "-30", "100", "10.1", "10,1", "1e2", "1e-2", "1e2e3", "0xAB", "AB", "Test1", "1Test", "Test*1" };
+	static bool isnum[12] = { true, true, true, false, false, false, false, false, false, false, false, false };
+	static bool isint[12] = { true, true, false, false, false, false, false, false, false, false, false, false };
+	static bool ishex[12] = { true, true, false, false, true, false, true, false, true, false, false, false };
+	static bool ishex_p[12] = { false, false, false, false, false, false, false, true, false, false, false, false };
+	static bool isflt[12] = { true, true, true, false, true, true, false, false, false, false, false, false };
+	static bool isid[12] = { false, false, false, false, false, false, false, false, true, true, false, false };
+
+	for (int i = 0; i < 12; i++) {
+		godot_string s;
+		godot_string_new_with_latin1_chars(&s, data[i]);
+		CHECK(godot_string_is_numeric(&s) == isnum[i]);
+		CHECK(godot_string_is_valid_integer(&s) == isint[i]);
+		CHECK(godot_string_is_valid_hex_number(&s, false) == ishex[i]);
+		CHECK(godot_string_is_valid_hex_number(&s, true) == ishex_p[i]);
+		CHECK(godot_string_is_valid_float(&s) == isflt[i]);
+		CHECK(godot_string_is_valid_identifier(&s) == isid[i]);
+		godot_string_destroy(&s);
+	}
+}
+
+TEST_CASE("[GDNative String] humanize_size") {
+	godot_string s;
+
+	s = godot_string_humanize_size(1000);
+	CHECK(u32scmp(godot_string_get_data(&s), U"1000 B") == 0);
+	godot_string_destroy(&s);
+
+	s = godot_string_humanize_size(1025);
+	CHECK(u32scmp(godot_string_get_data(&s), U"1.00 KiB") == 0);
+	godot_string_destroy(&s);
+
+	s = godot_string_humanize_size(1025300);
+	CHECK(u32scmp(godot_string_get_data(&s), U"1001.2 KiB") == 0);
+	godot_string_destroy(&s);
+
+	s = godot_string_humanize_size(100523550);
+	CHECK(u32scmp(godot_string_get_data(&s), U"95.86 MiB") == 0);
+	godot_string_destroy(&s);
+
+	s = godot_string_humanize_size(5345555000);
+	CHECK(u32scmp(godot_string_get_data(&s), U"4.97 GiB") == 0);
+	godot_string_destroy(&s);
+}
+
+} // namespace TestGDNativeString
+
+#endif // TEST_GDNATIVE_STRING_H
diff --git a/modules/gdnative/videodecoder/SCsub b/modules/gdnative/videodecoder/SCsub
index 04cc8ed604..5948b9a3dd 100644
--- a/modules/gdnative/videodecoder/SCsub
+++ b/modules/gdnative/videodecoder/SCsub
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_vsdecoder_gdnative = env_modules.Clone()
 
-env_vsdecoder_gdnative.Prepend(CPPPATH=['#modules/gdnative/include/'])
-env_vsdecoder_gdnative.add_source_files(env.modules_sources, '*.cpp')
+env_vsdecoder_gdnative.Prepend(CPPPATH=["#modules/gdnative/include/"])
+env_vsdecoder_gdnative.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/gdnative/videodecoder/register_types.cpp b/modules/gdnative/videodecoder/register_types.cpp
index c53e8f2c78..4181d8813f 100644
--- a/modules/gdnative/videodecoder/register_types.cpp
+++ b/modules/gdnative/videodecoder/register_types.cpp
@@ -36,7 +36,6 @@
 static Ref<ResourceFormatLoaderVideoStreamGDNative> resource_loader_vsgdnative;
 
 void register_videodecoder_types() {
-
 	resource_loader_vsgdnative.instance();
 	ResourceLoader::add_resource_format_loader(resource_loader_vsgdnative, true);
 
@@ -44,7 +43,6 @@ void register_videodecoder_types() {
 }
 
 void unregister_videodecoder_types() {
-
 	ResourceLoader::remove_resource_format_loader(resource_loader_vsgdnative);
 	resource_loader_vsgdnative.unref();
 }
diff --git a/modules/gdnative/videodecoder/register_types.h b/modules/gdnative/videodecoder/register_types.h
index d81d5c497b..b1a83d4071 100644
--- a/modules/gdnative/videodecoder/register_types.h
+++ b/modules/gdnative/videodecoder/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef VIDEODECODER_REGISTER_TYPES_H
+#define VIDEODECODER_REGISTER_TYPES_H
+
 void register_videodecoder_types();
 void unregister_videodecoder_types();
+
+#endif // VIDEODECODER_REGISTER_TYPES_H
diff --git a/modules/gdnative/videodecoder/video_stream_gdnative.cpp b/modules/gdnative/videodecoder/video_stream_gdnative.cpp
index dbe00cdf71..fe7c10cad9 100644
--- a/modules/gdnative/videodecoder/video_stream_gdnative.cpp
+++ b/modules/gdnative/videodecoder/video_stream_gdnative.cpp
@@ -33,7 +33,7 @@
 #include "core/project_settings.h"
 #include "servers/audio_server.h"
 
-VideoDecoderServer *VideoDecoderServer::instance = NULL;
+VideoDecoderServer *VideoDecoderServer::instance = nullptr;
 
 static VideoDecoderServer decoder_server;
 
@@ -105,7 +105,6 @@ int64_t GDAPI godot_videodecoder_file_seek(void *ptr, int64_t pos, int whence) {
 }
 
 void GDAPI godot_videodecoder_register_decoder(const godot_videodecoder_interface_gdnative *p_interface) {
-
 	decoder_server.register_decoder_interface(p_interface);
 }
 }
@@ -113,7 +112,7 @@ void GDAPI godot_videodecoder_register_decoder(const godot_videodecoder_interfac
 // VideoStreamPlaybackGDNative starts here.
 
 bool VideoStreamPlaybackGDNative::open_file(const String &p_file) {
-	ERR_FAIL_COND_V(interface == NULL, false);
+	ERR_FAIL_COND_V(interface == nullptr, false);
 	file = FileAccess::open(p_file, FileAccess::READ);
 	bool file_opened = interface->open_file(data_struct, file);
 
@@ -132,7 +131,11 @@ bool VideoStreamPlaybackGDNative::open_file(const String &p_file) {
 		pcm_write_idx = -1;
 		samples_decoded = 0;
 
-		texture->create((int)texture_size.width, (int)texture_size.height, Image::FORMAT_RGBA8, Texture::FLAG_FILTER | Texture::FLAG_VIDEO_SURFACE);
+		Ref<Image> img;
+		img.instance();
+		img->create((int)texture_size.width, false, (int)texture_size.height, Image::FORMAT_RGBA8);
+
+		texture->create_from_image(img);
 	}
 
 	return file_opened;
@@ -146,7 +149,7 @@ void VideoStreamPlaybackGDNative::update(float p_delta) {
 		return;
 	}
 	time += p_delta;
-	ERR_FAIL_COND(interface == NULL);
+	ERR_FAIL_COND(interface == nullptr);
 	interface->update(data_struct, p_delta);
 
 	// Don't mix if there's no audio (num_channels == 0).
@@ -183,57 +186,49 @@ void VideoStreamPlaybackGDNative::update(float p_delta) {
 }
 
 void VideoStreamPlaybackGDNative::update_texture() {
-	PoolByteArray *pba = (PoolByteArray *)interface->get_videoframe(data_struct);
+	PackedByteArray *pba = (PackedByteArray *)interface->get_videoframe(data_struct);
 
-	if (pba == NULL) {
+	if (pba == nullptr) {
 		playing = false;
 		return;
 	}
 
 	Ref<Image> img = memnew(Image(texture_size.width, texture_size.height, 0, Image::FORMAT_RGBA8, *pba));
 
-	texture->set_data(img);
+	texture->update(img, true);
 }
 
 // ctor and dtor
 
 VideoStreamPlaybackGDNative::VideoStreamPlaybackGDNative() :
-		texture(Ref<ImageTexture>(memnew(ImageTexture))),
-		playing(false),
-		paused(false),
-		mix_udata(NULL),
-		mix_callback(NULL),
-		num_channels(-1),
-		time(0),
-		seek_backward(false),
-		mix_rate(0),
-		delay_compensation(0),
-		pcm(NULL),
-		pcm_write_idx(0),
-		samples_decoded(0),
-		file(NULL),
-		interface(NULL),
-		data_struct(NULL) {}
+		texture(Ref<ImageTexture>(memnew(ImageTexture))) {}
 
 VideoStreamPlaybackGDNative::~VideoStreamPlaybackGDNative() {
 	cleanup();
 }
 
 void VideoStreamPlaybackGDNative::cleanup() {
-	if (data_struct)
+	if (data_struct) {
 		interface->destructor(data_struct);
-	if (pcm)
+	}
+	if (pcm) {
 		memfree(pcm);
-	pcm = NULL;
+	}
+	if (file) {
+		file->close();
+		memdelete(file);
+		file = nullptr;
+	}
+	pcm = nullptr;
 	time = 0;
 	num_channels = -1;
-	interface = NULL;
-	data_struct = NULL;
+	interface = nullptr;
+	data_struct = nullptr;
 }
 
 void VideoStreamPlaybackGDNative::set_interface(const godot_videodecoder_interface_gdnative *p_interface) {
-	ERR_FAIL_COND(p_interface == NULL);
-	if (interface != NULL) {
+	ERR_FAIL_COND(p_interface == nullptr);
+	if (interface != nullptr) {
 		cleanup();
 	}
 	interface = p_interface;
@@ -251,7 +246,6 @@ bool VideoStreamPlaybackGDNative::is_paused() const {
 }
 
 void VideoStreamPlaybackGDNative::play() {
-
 	stop();
 
 	playing = true;
@@ -268,10 +262,11 @@ void VideoStreamPlaybackGDNative::stop() {
 }
 
 void VideoStreamPlaybackGDNative::seek(float p_time) {
-	ERR_FAIL_COND(interface == NULL);
+	ERR_FAIL_COND(interface == nullptr);
 	interface->seek(data_struct, p_time);
-	if (p_time < time)
+	if (p_time < time) {
 		seek_backward = true;
+	}
 	time = p_time;
 	// reset audio buffers
 	memset(pcm, 0, num_channels * AUX_BUFFER_SIZE * sizeof(float));
@@ -283,18 +278,17 @@ void VideoStreamPlaybackGDNative::set_paused(bool p_paused) {
 	paused = p_paused;
 }
 
-Ref<Texture> VideoStreamPlaybackGDNative::get_texture() const {
+Ref<Texture2D> VideoStreamPlaybackGDNative::get_texture() const {
 	return texture;
 }
 
 float VideoStreamPlaybackGDNative::get_length() const {
-	ERR_FAIL_COND_V(interface == NULL, 0);
+	ERR_FAIL_COND_V(interface == nullptr, 0);
 	return interface->get_length(data_struct);
 }
 
 float VideoStreamPlaybackGDNative::get_playback_position() const {
-
-	ERR_FAIL_COND_V(interface == NULL, 0);
+	ERR_FAIL_COND_V(interface == nullptr, 0);
 	return interface->get_playback_position(data_struct);
 }
 
@@ -308,24 +302,23 @@ void VideoStreamPlaybackGDNative::set_loop(bool p_enable) {
 }
 
 void VideoStreamPlaybackGDNative::set_audio_track(int p_idx) {
-	ERR_FAIL_COND(interface == NULL);
+	ERR_FAIL_COND(interface == nullptr);
 	interface->set_audio_track(data_struct, p_idx);
 }
 
 void VideoStreamPlaybackGDNative::set_mix_callback(AudioMixCallback p_callback, void *p_userdata) {
-
 	mix_udata = p_userdata;
 	mix_callback = p_callback;
 }
 
 int VideoStreamPlaybackGDNative::get_channels() const {
-	ERR_FAIL_COND_V(interface == NULL, 0);
+	ERR_FAIL_COND_V(interface == nullptr, 0);
 
 	return (num_channels > 0) ? num_channels : 0;
 }
 
 int VideoStreamPlaybackGDNative::get_mix_rate() const {
-	ERR_FAIL_COND_V(interface == NULL, 0);
+	ERR_FAIL_COND_V(interface == nullptr, 0);
 
 	return mix_rate;
 }
@@ -335,27 +328,26 @@ int VideoStreamPlaybackGDNative::get_mix_rate() const {
 Ref<VideoStreamPlayback> VideoStreamGDNative::instance_playback() {
 	Ref<VideoStreamPlaybackGDNative> pb = memnew(VideoStreamPlaybackGDNative);
 	VideoDecoderGDNative *decoder = decoder_server.get_decoder(file.get_extension().to_lower());
-	if (decoder == NULL)
-		return NULL;
+	if (decoder == nullptr) {
+		return nullptr;
+	}
 	pb->set_interface(decoder->interface);
 	pb->set_audio_track(audio_track);
-	if (pb->open_file(file))
+	if (pb->open_file(file)) {
 		return pb;
-	return NULL;
+	}
+	return nullptr;
 }
 
 void VideoStreamGDNative::set_file(const String &p_file) {
-
 	file = p_file;
 }
 
 String VideoStreamGDNative::get_file() {
-
 	return file;
 }
 
 void VideoStreamGDNative::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_file", "file"), &VideoStreamGDNative::set_file);
 	ClassDB::bind_method(D_METHOD("get_file"), &VideoStreamGDNative::get_file);
 
@@ -363,13 +355,12 @@ void VideoStreamGDNative::_bind_methods() {
 }
 
 void VideoStreamGDNative::set_audio_track(int p_track) {
-
 	audio_track = p_track;
 }
 
 /* --- NOTE ResourceFormatLoaderVideoStreamGDNative starts here. ----- */
 
-RES ResourceFormatLoaderVideoStreamGDNative::load(const String &p_path, const String &p_original_path, Error *r_error) {
+RES ResourceFormatLoaderVideoStreamGDNative::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, bool p_no_cache) {
 	FileAccess *f = FileAccess::open(p_path, FileAccess::READ);
 	if (!f) {
 		if (r_error) {
@@ -401,7 +392,8 @@ bool ResourceFormatLoaderVideoStreamGDNative::handles_type(const String &p_type)
 
 String ResourceFormatLoaderVideoStreamGDNative::get_resource_type(const String &p_path) const {
 	String el = p_path.get_extension().to_lower();
-	if (VideoDecoderServer::get_instance()->get_extensions().has(el))
+	if (VideoDecoderServer::get_instance()->get_extensions().has(el)) {
 		return "VideoStreamGDNative";
+	}
 	return "";
 }
diff --git a/modules/gdnative/videodecoder/video_stream_gdnative.h b/modules/gdnative/videodecoder/video_stream_gdnative.h
index bb0346efb4..408d4a2454 100644
--- a/modules/gdnative/videodecoder/video_stream_gdnative.h
+++ b/modules/gdnative/videodecoder/video_stream_gdnative.h
@@ -37,13 +37,11 @@
 #include "scene/resources/video_stream.h"
 
 struct VideoDecoderGDNative {
-	const godot_videodecoder_interface_gdnative *interface;
-	String plugin_name;
+	const godot_videodecoder_interface_gdnative *interface = nullptr;
+	String plugin_name = "none";
 	Vector<String> supported_extensions;
 
-	VideoDecoderGDNative() :
-			interface(NULL),
-			plugin_name("none") {}
+	VideoDecoderGDNative() {}
 
 	VideoDecoderGDNative(const godot_videodecoder_interface_gdnative *p_interface) :
 			interface(p_interface),
@@ -88,8 +86,9 @@ public:
 	}
 
 	VideoDecoderGDNative *get_decoder(const String &extension) {
-		if (extensions.size() == 0 || !extensions.has(extension))
-			return NULL;
+		if (extensions.size() == 0 || !extensions.has(extension)) {
+			return nullptr;
+		}
 		return decoders[extensions[extension]];
 	}
 
@@ -102,32 +101,31 @@ public:
 			memdelete(decoders[i]);
 		}
 		decoders.clear();
-		instance = NULL;
+		instance = nullptr;
 	}
 };
 
 class VideoStreamPlaybackGDNative : public VideoStreamPlayback {
-
 	GDCLASS(VideoStreamPlaybackGDNative, VideoStreamPlayback);
 
 	Ref<ImageTexture> texture;
-	bool playing;
-	bool paused;
+	bool playing = false;
+	bool paused = false;
 
 	Vector2 texture_size;
 
-	void *mix_udata;
-	AudioMixCallback mix_callback;
+	void *mix_udata = nullptr;
+	AudioMixCallback mix_callback = nullptr;
 
-	int num_channels;
-	float time;
-	bool seek_backward;
-	int mix_rate;
-	double delay_compensation;
+	int num_channels = -1;
+	float time = 0;
+	bool seek_backward = false;
+	int mix_rate = 0;
+	double delay_compensation = 0;
 
-	float *pcm;
-	int pcm_write_idx;
-	int samples_decoded;
+	float *pcm = nullptr;
+	int pcm_write_idx = 0;
+	int samples_decoded = 0;
 
 	void cleanup();
 	void update_texture();
@@ -135,10 +133,10 @@ class VideoStreamPlaybackGDNative : public VideoStreamPlayback {
 protected:
 	String file_name;
 
-	FileAccess *file;
+	FileAccess *file = nullptr;
 
-	const godot_videodecoder_interface_gdnative *interface;
-	void *data_struct;
+	const godot_videodecoder_interface_gdnative *interface = nullptr;
+	void *data_struct = nullptr;
 
 public:
 	VideoStreamPlaybackGDNative();
@@ -148,40 +146,39 @@ public:
 
 	bool open_file(const String &p_file);
 
-	virtual void stop();
-	virtual void play();
+	virtual void stop() override;
+	virtual void play() override;
 
-	virtual bool is_playing() const;
+	virtual bool is_playing() const override;
 
-	virtual void set_paused(bool p_paused);
-	virtual bool is_paused() const;
+	virtual void set_paused(bool p_paused) override;
+	virtual bool is_paused() const override;
 
-	virtual void set_loop(bool p_enable);
-	virtual bool has_loop() const;
+	virtual void set_loop(bool p_enable) override;
+	virtual bool has_loop() const override;
 
-	virtual float get_length() const;
+	virtual float get_length() const override;
 
-	virtual float get_playback_position() const;
-	virtual void seek(float p_time);
+	virtual float get_playback_position() const override;
+	virtual void seek(float p_time) override;
 
-	virtual void set_audio_track(int p_idx);
+	virtual void set_audio_track(int p_idx) override;
 
 	//virtual int mix(int16_t* p_buffer,int p_frames)=0;
 
-	virtual Ref<Texture> get_texture() const;
-	virtual void update(float p_delta);
+	virtual Ref<Texture2D> get_texture() const override;
+	virtual void update(float p_delta) override;
 
-	virtual void set_mix_callback(AudioMixCallback p_callback, void *p_userdata);
-	virtual int get_channels() const;
-	virtual int get_mix_rate() const;
+	virtual void set_mix_callback(AudioMixCallback p_callback, void *p_userdata) override;
+	virtual int get_channels() const override;
+	virtual int get_mix_rate() const override;
 };
 
 class VideoStreamGDNative : public VideoStream {
-
 	GDCLASS(VideoStreamGDNative, VideoStream);
 
 	String file;
-	int audio_track;
+	int audio_track = 0;
 
 protected:
 	static void
@@ -191,15 +188,15 @@ public:
 	void set_file(const String &p_file);
 	String get_file();
 
-	virtual void set_audio_track(int p_track);
-	virtual Ref<VideoStreamPlayback> instance_playback();
+	virtual void set_audio_track(int p_track) override;
+	virtual Ref<VideoStreamPlayback> instance_playback() override;
 
 	VideoStreamGDNative() {}
 };
 
 class ResourceFormatLoaderVideoStreamGDNative : public ResourceFormatLoader {
 public:
-	virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
+	virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, bool p_no_cache = false);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual bool handles_type(const String &p_type) const;
 	virtual String get_resource_type(const String &p_path) const;
diff --git a/modules/gdnative/xr/SCsub b/modules/gdnative/xr/SCsub
new file mode 100644
index 0000000000..0b2db3b504
--- /dev/null
+++ b/modules/gdnative/xr/SCsub
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+
+Import("env")
+Import("env_gdnative")
+
+env_gdnative.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/gdnative/arvr/config.py b/modules/gdnative/xr/config.py
index 53bc827027..d22f9454ed 100644
--- a/modules/gdnative/arvr/config.py
+++ b/modules/gdnative/xr/config.py
@@ -1,5 +1,6 @@
 def can_build(env, platform):
-	return True
+    return True
+
 
 def configure(env):
-	pass
+    pass
diff --git a/modules/vorbis/stub/register_types.cpp b/modules/gdnative/xr/register_types.cpp
index 8874b3887b..da3a7dc4b8 100644
--- a/modules/vorbis/stub/register_types.cpp
+++ b/modules/gdnative/xr/register_types.cpp
@@ -29,9 +29,12 @@
 /*************************************************************************/
 
 #include "register_types.h"
+#include "xr_interface_gdnative.h"
 
-// Dummy module as libvorbis is needed by other modules (theora ...)
+void register_xr_types() {
+	ClassDB::register_class<XRInterfaceGDNative>();
+	ClassDB::add_compatibility_class("ARVRInterfaceGDNative", "XRInterfaceGDNative");
+}
 
-void register_vorbis_types() {}
-
-void unregister_vorbis_types() {}
+void unregister_xr_types() {
+}
diff --git a/modules/gdnative/arvr/register_types.h b/modules/gdnative/xr/register_types.h
index 815f112fbf..2501d28651 100644
--- a/modules/gdnative/arvr/register_types.h
+++ b/modules/gdnative/xr/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-void register_arvr_types();
-void unregister_arvr_types();
+#ifndef XR_REGISTER_TYPES_H
+#define XR_REGISTER_TYPES_H
+
+void register_xr_types();
+void unregister_xr_types();
+
+#endif // XR_REGISTER_TYPES_H
diff --git a/modules/gdnative/xr/xr_interface_gdnative.cpp b/modules/gdnative/xr/xr_interface_gdnative.cpp
new file mode 100644
index 0000000000..d03fc33935
--- /dev/null
+++ b/modules/gdnative/xr/xr_interface_gdnative.cpp
@@ -0,0 +1,420 @@
+/*************************************************************************/
+/*  xr_interface_gdnative.cpp                                            */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "xr_interface_gdnative.h"
+#include "core/input/input.h"
+#include "servers/rendering/rendering_server_globals.h"
+#include "servers/xr/xr_positional_tracker.h"
+
+void XRInterfaceGDNative::_bind_methods() {
+	ADD_PROPERTY_DEFAULT("interface_is_initialized", false);
+	ADD_PROPERTY_DEFAULT("ar_is_anchor_detection_enabled", false);
+}
+
+XRInterfaceGDNative::XRInterfaceGDNative() {
+	print_verbose("Construct gdnative interface\n");
+
+	// we won't have our data pointer until our library gets set
+	data = nullptr;
+
+	interface = nullptr;
+}
+
+XRInterfaceGDNative::~XRInterfaceGDNative() {
+	print_verbose("Destruct gdnative interface\n");
+
+	if (interface != nullptr && is_initialized()) {
+		uninitialize();
+	};
+
+	// cleanup after ourselves
+	cleanup();
+}
+
+void XRInterfaceGDNative::cleanup() {
+	if (interface != nullptr) {
+		interface->destructor(data);
+		data = nullptr;
+		interface = nullptr;
+	}
+}
+
+void XRInterfaceGDNative::set_interface(const godot_xr_interface_gdnative *p_interface) {
+	// this should only be called once, just being paranoid..
+	if (interface) {
+		cleanup();
+	}
+
+	// bind to our interface
+	interface = p_interface;
+
+	// Now we do our constructing...
+	data = interface->constructor((godot_object *)this);
+}
+
+StringName XRInterfaceGDNative::get_name() const {
+	ERR_FAIL_COND_V(interface == nullptr, StringName());
+
+	godot_string result = interface->get_name(data);
+
+	StringName name = *(String *)&result;
+
+	godot_string_destroy(&result);
+
+	return name;
+}
+
+int XRInterfaceGDNative::get_capabilities() const {
+	int capabilities;
+
+	ERR_FAIL_COND_V(interface == nullptr, 0); // 0 = None
+
+	capabilities = interface->get_capabilities(data);
+
+	return capabilities;
+}
+
+bool XRInterfaceGDNative::get_anchor_detection_is_enabled() const {
+	ERR_FAIL_COND_V(interface == nullptr, false);
+
+	return interface->get_anchor_detection_is_enabled(data);
+}
+
+void XRInterfaceGDNative::set_anchor_detection_is_enabled(bool p_enable) {
+	ERR_FAIL_COND(interface == nullptr);
+
+	interface->set_anchor_detection_is_enabled(data, p_enable);
+}
+
+int XRInterfaceGDNative::get_camera_feed_id() {
+	ERR_FAIL_COND_V(interface == nullptr, 0);
+
+	return (unsigned int)interface->get_camera_feed_id(data);
+}
+
+bool XRInterfaceGDNative::is_stereo() {
+	bool stereo;
+
+	ERR_FAIL_COND_V(interface == nullptr, false);
+
+	stereo = interface->is_stereo(data);
+
+	return stereo;
+}
+
+bool XRInterfaceGDNative::is_initialized() const {
+	ERR_FAIL_COND_V(interface == nullptr, false);
+
+	return interface->is_initialized(data);
+}
+
+bool XRInterfaceGDNative::initialize() {
+	ERR_FAIL_COND_V(interface == nullptr, false);
+
+	bool initialized = interface->initialize(data);
+
+	if (initialized) {
+		// if we successfully initialize our interface and we don't have a primary interface yet, this becomes our primary interface
+
+		XRServer *xr_server = XRServer::get_singleton();
+		if ((xr_server != nullptr) && (xr_server->get_primary_interface() == nullptr)) {
+			xr_server->set_primary_interface(this);
+		};
+	};
+
+	return initialized;
+}
+
+void XRInterfaceGDNative::uninitialize() {
+	ERR_FAIL_COND(interface == nullptr);
+
+	XRServer *xr_server = XRServer::get_singleton();
+	if (xr_server != nullptr) {
+		// Whatever happens, make sure this is no longer our primary interface
+		xr_server->clear_primary_interface_if(this);
+	}
+
+	interface->uninitialize(data);
+}
+
+Size2 XRInterfaceGDNative::get_render_targetsize() {
+	ERR_FAIL_COND_V(interface == nullptr, Size2());
+
+	godot_vector2 result = interface->get_render_targetsize(data);
+	Vector2 *vec = (Vector2 *)&result;
+
+	return *vec;
+}
+
+Transform XRInterfaceGDNative::get_transform_for_eye(XRInterface::Eyes p_eye, const Transform &p_cam_transform) {
+	Transform *ret;
+
+	ERR_FAIL_COND_V(interface == nullptr, Transform());
+
+	godot_transform t = interface->get_transform_for_eye(data, (int)p_eye, (godot_transform *)&p_cam_transform);
+
+	ret = (Transform *)&t;
+
+	return *ret;
+}
+
+CameraMatrix XRInterfaceGDNative::get_projection_for_eye(XRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far) {
+	CameraMatrix cm;
+
+	ERR_FAIL_COND_V(interface == nullptr, CameraMatrix());
+
+	interface->fill_projection_for_eye(data, (godot_real *)cm.matrix, (godot_int)p_eye, p_aspect, p_z_near, p_z_far);
+
+	return cm;
+}
+
+unsigned int XRInterfaceGDNative::get_external_texture_for_eye(XRInterface::Eyes p_eye) {
+	ERR_FAIL_COND_V(interface == nullptr, 0);
+
+	return (unsigned int)interface->get_external_texture_for_eye(data, (godot_int)p_eye);
+}
+
+void XRInterfaceGDNative::commit_for_eye(XRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect) {
+	ERR_FAIL_COND(interface == nullptr);
+
+	interface->commit_for_eye(data, (godot_int)p_eye, (godot_rid *)&p_render_target, (godot_rect2 *)&p_screen_rect);
+}
+
+void XRInterfaceGDNative::process() {
+	ERR_FAIL_COND(interface == nullptr);
+
+	interface->process(data);
+}
+
+void XRInterfaceGDNative::notification(int p_what) {
+	ERR_FAIL_COND(interface == nullptr);
+
+	interface->notification(data, p_what);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////
+// some helper callbacks
+
+extern "C" {
+
+void GDAPI godot_xr_register_interface(const godot_xr_interface_gdnative *p_interface) {
+	// Must be on a version 4 plugin
+	ERR_FAIL_COND_MSG(p_interface->version.major < 4, "GDNative XR interfaces build for Godot 3.x are not supported.");
+
+	Ref<XRInterfaceGDNative> new_interface;
+	new_interface.instance();
+	new_interface->set_interface((const godot_xr_interface_gdnative *)p_interface);
+	XRServer::get_singleton()->add_interface(new_interface);
+}
+
+godot_real GDAPI godot_xr_get_worldscale() {
+	XRServer *xr_server = XRServer::get_singleton();
+	ERR_FAIL_NULL_V(xr_server, 1.0);
+
+	return xr_server->get_world_scale();
+}
+
+godot_transform GDAPI godot_xr_get_reference_frame() {
+	godot_transform reference_frame;
+	Transform *reference_frame_ptr = (Transform *)&reference_frame;
+
+	XRServer *xr_server = XRServer::get_singleton();
+	if (xr_server != nullptr) {
+		*reference_frame_ptr = xr_server->get_reference_frame();
+	} else {
+		godot_transform_new_identity(&reference_frame);
+	}
+
+	return reference_frame;
+}
+
+void GDAPI godot_xr_blit(godot_int p_eye, godot_rid *p_render_target, godot_rect2 *p_rect) {
+	// blits out our texture as is, handy for preview display of one of the eyes that is already rendered with lens distortion on an external HMD
+	XRInterface::Eyes eye = (XRInterface::Eyes)p_eye;
+#if 0
+	RID *render_target = (RID *)p_render_target;
+#endif
+	Rect2 screen_rect = *(Rect2 *)p_rect;
+
+	if (eye == XRInterface::EYE_LEFT) {
+		screen_rect.size.x /= 2.0;
+	} else if (p_eye == XRInterface::EYE_RIGHT) {
+		screen_rect.size.x /= 2.0;
+		screen_rect.position.x += screen_rect.size.x;
+	}
+#ifndef _MSC_VER
+#warning this needs to be redone
+#endif
+#if 0
+	RSG::rasterizer->blit_render_target_to_screen(*render_target, screen_rect, 0);
+#endif
+}
+
+godot_int GDAPI godot_xr_get_texid(godot_rid *p_render_target) {
+	// In order to send off our textures to display on our hardware we need the opengl texture ID instead of the render target RID
+	// This is a handy function to expose that.
+#if 0
+	RID *render_target = (RID *)p_render_target;
+
+	RID eye_texture = RSG::storage->render_target_get_texture(*render_target);
+#endif
+
+#ifndef _MSC_VER
+#warning need to obtain this ID again
+#endif
+	uint32_t texid = 0; //RS::get_singleton()->texture_get_texid(eye_texture);
+
+	return texid;
+}
+
+godot_int GDAPI godot_xr_add_controller(char *p_device_name, godot_int p_hand, godot_bool p_tracks_orientation, godot_bool p_tracks_position) {
+	XRServer *xr_server = XRServer::get_singleton();
+	ERR_FAIL_NULL_V(xr_server, 0);
+
+	Input *input = Input::get_singleton();
+	ERR_FAIL_NULL_V(input, 0);
+
+	XRPositionalTracker *new_tracker = memnew(XRPositionalTracker);
+	new_tracker->set_name(p_device_name);
+	new_tracker->set_type(XRServer::TRACKER_CONTROLLER);
+	if (p_hand == 1) {
+		new_tracker->set_hand(XRPositionalTracker::TRACKER_LEFT_HAND);
+	} else if (p_hand == 2) {
+		new_tracker->set_hand(XRPositionalTracker::TRACKER_RIGHT_HAND);
+	}
+
+	// also register as joystick...
+	int joyid = input->get_unused_joy_id();
+	if (joyid != -1) {
+		new_tracker->set_joy_id(joyid);
+		input->joy_connection_changed(joyid, true, p_device_name, "");
+	}
+
+	if (p_tracks_orientation) {
+		Basis orientation;
+		new_tracker->set_orientation(orientation);
+	}
+	if (p_tracks_position) {
+		Vector3 position;
+		new_tracker->set_position(position);
+	}
+
+	// add our tracker to our server and remember its pointer
+	xr_server->add_tracker(new_tracker);
+
+	// note, this ID is only unique within controllers!
+	return new_tracker->get_tracker_id();
+}
+
+void GDAPI godot_xr_remove_controller(godot_int p_controller_id) {
+	XRServer *xr_server = XRServer::get_singleton();
+	ERR_FAIL_NULL(xr_server);
+
+	Input *input = Input::get_singleton();
+	ERR_FAIL_NULL(input);
+
+	XRPositionalTracker *remove_tracker = xr_server->find_by_type_and_id(XRServer::TRACKER_CONTROLLER, p_controller_id);
+	if (remove_tracker != nullptr) {
+		// unset our joystick if applicable
+		int joyid = remove_tracker->get_joy_id();
+		if (joyid != -1) {
+			input->joy_connection_changed(joyid, false, "", "");
+			remove_tracker->set_joy_id(-1);
+		}
+
+		// remove our tracker from our server
+		xr_server->remove_tracker(remove_tracker);
+		memdelete(remove_tracker);
+	}
+}
+
+void GDAPI godot_xr_set_controller_transform(godot_int p_controller_id, godot_transform *p_transform, godot_bool p_tracks_orientation, godot_bool p_tracks_position) {
+	XRServer *xr_server = XRServer::get_singleton();
+	ERR_FAIL_NULL(xr_server);
+
+	XRPositionalTracker *tracker = xr_server->find_by_type_and_id(XRServer::TRACKER_CONTROLLER, p_controller_id);
+	if (tracker != nullptr) {
+		Transform *transform = (Transform *)p_transform;
+		if (p_tracks_orientation) {
+			tracker->set_orientation(transform->basis);
+		}
+		if (p_tracks_position) {
+			tracker->set_rw_position(transform->origin);
+		}
+	}
+}
+
+void GDAPI godot_xr_set_controller_button(godot_int p_controller_id, godot_int p_button, godot_bool p_is_pressed) {
+	XRServer *xr_server = XRServer::get_singleton();
+	ERR_FAIL_NULL(xr_server);
+
+	Input *input = Input::get_singleton();
+	ERR_FAIL_NULL(input);
+
+	XRPositionalTracker *tracker = xr_server->find_by_type_and_id(XRServer::TRACKER_CONTROLLER, p_controller_id);
+	if (tracker != nullptr) {
+		int joyid = tracker->get_joy_id();
+		if (joyid != -1) {
+			input->joy_button(joyid, p_button, p_is_pressed);
+		}
+	}
+}
+
+void GDAPI godot_xr_set_controller_axis(godot_int p_controller_id, godot_int p_axis, godot_real p_value, godot_bool p_can_be_negative) {
+	XRServer *xr_server = XRServer::get_singleton();
+	ERR_FAIL_NULL(xr_server);
+
+	Input *input = Input::get_singleton();
+	ERR_FAIL_NULL(input);
+
+	XRPositionalTracker *tracker = xr_server->find_by_type_and_id(XRServer::TRACKER_CONTROLLER, p_controller_id);
+	if (tracker != nullptr) {
+		int joyid = tracker->get_joy_id();
+		if (joyid != -1) {
+			Input::JoyAxis jx;
+			jx.min = p_can_be_negative ? -1 : 0;
+			jx.value = p_value;
+			input->joy_axis(joyid, p_axis, jx);
+		}
+	}
+}
+
+godot_real GDAPI godot_xr_get_controller_rumble(godot_int p_controller_id) {
+	XRServer *xr_server = XRServer::get_singleton();
+	ERR_FAIL_NULL_V(xr_server, 0.0);
+
+	XRPositionalTracker *tracker = xr_server->find_by_type_and_id(XRServer::TRACKER_CONTROLLER, p_controller_id);
+	if (tracker != nullptr) {
+		return tracker->get_rumble();
+	}
+
+	return 0.0;
+}
+}
diff --git a/modules/gdnative/arvr/arvr_interface_gdnative.h b/modules/gdnative/xr/xr_interface_gdnative.h
index 1077bef994..de96487397 100644
--- a/modules/gdnative/arvr/arvr_interface_gdnative.h
+++ b/modules/gdnative/xr/xr_interface_gdnative.h
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  arvr_interface_gdnative.h                                            */
+/*  xr_interface_gdnative.h                                              */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,11 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef ARVR_INTERFACE_GDNATIVE_H
-#define ARVR_INTERFACE_GDNATIVE_H
+#ifndef XR_INTERFACE_GDNATIVE_H
+#define XR_INTERFACE_GDNATIVE_H
 
 #include "modules/gdnative/gdnative.h"
-#include "servers/arvr/arvr_interface.h"
+#include "servers/xr/xr_interface.h"
 
 /**
 	@authors Hinsbart & Karroffel & Mux213
@@ -40,52 +40,52 @@
 	This subclass of our AR/VR interface forms a bridge to GDNative.
 */
 
-class ARVRInterfaceGDNative : public ARVRInterface {
-	GDCLASS(ARVRInterfaceGDNative, ARVRInterface);
+class XRInterfaceGDNative : public XRInterface {
+	GDCLASS(XRInterfaceGDNative, XRInterface);
 
 	void cleanup();
 
 protected:
-	const godot_arvr_interface_gdnative *interface;
+	const godot_xr_interface_gdnative *interface;
 	void *data;
 
 	static void _bind_methods();
 
 public:
 	/** general interface information **/
-	ARVRInterfaceGDNative();
-	~ARVRInterfaceGDNative();
+	XRInterfaceGDNative();
+	~XRInterfaceGDNative();
 
-	void set_interface(const godot_arvr_interface_gdnative *p_interface);
+	void set_interface(const godot_xr_interface_gdnative *p_interface);
 
-	virtual StringName get_name() const;
-	virtual int get_capabilities() const;
+	virtual StringName get_name() const override;
+	virtual int get_capabilities() const override;
 
-	virtual bool is_initialized() const;
-	virtual bool initialize();
-	virtual void uninitialize();
+	virtual bool is_initialized() const override;
+	virtual bool initialize() override;
+	virtual void uninitialize() override;
 
 	/** specific to AR **/
-	virtual bool get_anchor_detection_is_enabled() const;
-	virtual void set_anchor_detection_is_enabled(bool p_enable);
-	virtual int get_camera_feed_id();
+	virtual bool get_anchor_detection_is_enabled() const override;
+	virtual void set_anchor_detection_is_enabled(bool p_enable) override;
+	virtual int get_camera_feed_id() override;
 
 	/** rendering and internal **/
-	virtual Size2 get_render_targetsize();
-	virtual bool is_stereo();
-	virtual Transform get_transform_for_eye(ARVRInterface::Eyes p_eye, const Transform &p_cam_transform);
+	virtual Size2 get_render_targetsize() override;
+	virtual bool is_stereo() override;
+	virtual Transform get_transform_for_eye(XRInterface::Eyes p_eye, const Transform &p_cam_transform) override;
 
-	// we expose a PoolVector<float> version of this function to GDNative
-	PoolVector<float> _get_projection_for_eye(ARVRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far);
+	// we expose a Vector<float> version of this function to GDNative
+	Vector<float> _get_projection_for_eye(XRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far);
 
-	// and a CameraMatrix version to ARVRServer
-	virtual CameraMatrix get_projection_for_eye(ARVRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far);
+	// and a CameraMatrix version to XRServer
+	virtual CameraMatrix get_projection_for_eye(XRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far) override;
 
-	virtual unsigned int get_external_texture_for_eye(ARVRInterface::Eyes p_eye);
-	virtual void commit_for_eye(ARVRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect);
+	virtual unsigned int get_external_texture_for_eye(XRInterface::Eyes p_eye) override;
+	virtual void commit_for_eye(XRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect) override;
 
-	virtual void process();
-	virtual void notification(int p_what);
+	virtual void process() override;
+	virtual void notification(int p_what) override;
 };
 
-#endif // ARVR_INTERFACE_GDNATIVE_H
+#endif // XR_INTERFACE_GDNATIVE_H
diff --git a/modules/gdnavigation/SCsub b/modules/gdnavigation/SCsub
new file mode 100644
index 0000000000..877d601c6a
--- /dev/null
+++ b/modules/gdnavigation/SCsub
@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+
+Import("env")
+Import("env_modules")
+
+env_navigation = env_modules.Clone()
+
+# Recast Thirdparty source files
+if env["builtin_recast"]:
+    thirdparty_dir = "#thirdparty/recastnavigation/Recast/"
+    thirdparty_sources = [
+        "Source/Recast.cpp",
+        "Source/RecastAlloc.cpp",
+        "Source/RecastArea.cpp",
+        "Source/RecastAssert.cpp",
+        "Source/RecastContour.cpp",
+        "Source/RecastFilter.cpp",
+        "Source/RecastLayers.cpp",
+        "Source/RecastMesh.cpp",
+        "Source/RecastMeshDetail.cpp",
+        "Source/RecastRasterization.cpp",
+        "Source/RecastRegion.cpp",
+    ]
+    thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
+
+    env_navigation.Prepend(CPPPATH=[thirdparty_dir + "/Include"])
+
+    env_thirdparty = env_navigation.Clone()
+    env_thirdparty.disable_warnings()
+    env_thirdparty.add_source_files(env.modules_sources, thirdparty_sources)
+
+
+# RVO Thirdparty source files
+if env["builtin_rvo2"]:
+    thirdparty_dir = "#thirdparty/rvo2"
+    thirdparty_sources = [
+        "/src/Agent.cpp",
+        "/src/KdTree.cpp",
+    ]
+    thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
+
+    env_navigation.Prepend(CPPPATH=[thirdparty_dir + "/src"])
+
+    env_thirdparty = env_navigation.Clone()
+    env_thirdparty.disable_warnings()
+    env_thirdparty.add_source_files(env.modules_sources, thirdparty_sources)
+
+
+# Godot source files
+env_navigation.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/gdnavigation/config.py b/modules/gdnavigation/config.py
new file mode 100644
index 0000000000..d22f9454ed
--- /dev/null
+++ b/modules/gdnavigation/config.py
@@ -0,0 +1,6 @@
+def can_build(env, platform):
+    return True
+
+
+def configure(env):
+    pass
diff --git a/modules/gdnavigation/gd_navigation_server.cpp b/modules/gdnavigation/gd_navigation_server.cpp
new file mode 100644
index 0000000000..c80cdcfeab
--- /dev/null
+++ b/modules/gdnavigation/gd_navigation_server.cpp
@@ -0,0 +1,502 @@
+/*************************************************************************/
+/*  gd_navigation_server.cpp                                             */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "gd_navigation_server.h"
+
+#include "core/os/mutex.h"
+
+#ifndef _3D_DISABLED
+#include "navigation_mesh_generator.h"
+#endif
+
+/**
+	@author AndreaCatania
+*/
+
+/// Creates a struct for each function and a function that once called creates
+/// an instance of that struct with the submitted parameters.
+/// Then, that struct is stored in an array; the `sync` function consume that array.
+
+#define COMMAND_1(F_NAME, T_0, D_0)                      \
+	struct MERGE(F_NAME, _command) : public SetCommand { \
+		T_0 d_0;                                         \
+		MERGE(F_NAME, _command)                          \
+		(T_0 p_d_0) :                                    \
+				d_0(p_d_0) {}                            \
+		virtual void exec(GdNavigationServer *server) {  \
+			server->MERGE(_cmd_, F_NAME)(d_0);           \
+		}                                                \
+	};                                                   \
+	void GdNavigationServer::F_NAME(T_0 D_0) const {     \
+		auto cmd = memnew(MERGE(F_NAME, _command)(       \
+				D_0));                                   \
+		add_command(cmd);                                \
+	}                                                    \
+	void GdNavigationServer::MERGE(_cmd_, F_NAME)(T_0 D_0)
+
+#define COMMAND_2(F_NAME, T_0, D_0, T_1, D_1)                 \
+	struct MERGE(F_NAME, _command) : public SetCommand {      \
+		T_0 d_0;                                              \
+		T_1 d_1;                                              \
+		MERGE(F_NAME, _command)                               \
+		(                                                     \
+				T_0 p_d_0,                                    \
+				T_1 p_d_1) :                                  \
+				d_0(p_d_0),                                   \
+				d_1(p_d_1) {}                                 \
+		virtual void exec(GdNavigationServer *server) {       \
+			server->MERGE(_cmd_, F_NAME)(d_0, d_1);           \
+		}                                                     \
+	};                                                        \
+	void GdNavigationServer::F_NAME(T_0 D_0, T_1 D_1) const { \
+		auto cmd = memnew(MERGE(F_NAME, _command)(            \
+				D_0,                                          \
+				D_1));                                        \
+		add_command(cmd);                                     \
+	}                                                         \
+	void GdNavigationServer::MERGE(_cmd_, F_NAME)(T_0 D_0, T_1 D_1)
+
+#define COMMAND_4(F_NAME, T_0, D_0, T_1, D_1, T_2, D_2, T_3, D_3)               \
+	struct MERGE(F_NAME, _command) : public SetCommand {                        \
+		T_0 d_0;                                                                \
+		T_1 d_1;                                                                \
+		T_2 d_2;                                                                \
+		T_3 d_3;                                                                \
+		MERGE(F_NAME, _command)                                                 \
+		(                                                                       \
+				T_0 p_d_0,                                                      \
+				T_1 p_d_1,                                                      \
+				T_2 p_d_2,                                                      \
+				T_3 p_d_3) :                                                    \
+				d_0(p_d_0),                                                     \
+				d_1(p_d_1),                                                     \
+				d_2(p_d_2),                                                     \
+				d_3(p_d_3) {}                                                   \
+		virtual void exec(GdNavigationServer *server) {                         \
+			server->MERGE(_cmd_, F_NAME)(d_0, d_1, d_2, d_3);                   \
+		}                                                                       \
+	};                                                                          \
+	void GdNavigationServer::F_NAME(T_0 D_0, T_1 D_1, T_2 D_2, T_3 D_3) const { \
+		auto cmd = memnew(MERGE(F_NAME, _command)(                              \
+				D_0,                                                            \
+				D_1,                                                            \
+				D_2,                                                            \
+				D_3));                                                          \
+		add_command(cmd);                                                       \
+	}                                                                           \
+	void GdNavigationServer::MERGE(_cmd_, F_NAME)(T_0 D_0, T_1 D_1, T_2 D_2, T_3 D_3)
+
+GdNavigationServer::GdNavigationServer() :
+		NavigationServer3D() {
+}
+
+GdNavigationServer::~GdNavigationServer() {
+	flush_queries();
+}
+
+void GdNavigationServer::add_command(SetCommand *command) const {
+	auto mut_this = const_cast<GdNavigationServer *>(this);
+	{
+		MutexLock lock(commands_mutex);
+		mut_this->commands.push_back(command);
+	}
+}
+
+RID GdNavigationServer::map_create() const {
+	auto mut_this = const_cast<GdNavigationServer *>(this);
+	MutexLock lock(mut_this->operations_mutex);
+	NavMap *space = memnew(NavMap);
+	RID rid = map_owner.make_rid(space);
+	space->set_self(rid);
+	return rid;
+}
+
+COMMAND_2(map_set_active, RID, p_map, bool, p_active) {
+	NavMap *map = map_owner.getornull(p_map);
+	ERR_FAIL_COND(map == nullptr);
+
+	if (p_active) {
+		if (!map_is_active(p_map)) {
+			active_maps.push_back(map);
+		}
+	} else {
+		active_maps.erase(map);
+	}
+}
+
+bool GdNavigationServer::map_is_active(RID p_map) const {
+	NavMap *map = map_owner.getornull(p_map);
+	ERR_FAIL_COND_V(map == nullptr, false);
+
+	return active_maps.find(map) >= 0;
+}
+
+COMMAND_2(map_set_up, RID, p_map, Vector3, p_up) {
+	NavMap *map = map_owner.getornull(p_map);
+	ERR_FAIL_COND(map == nullptr);
+
+	map->set_up(p_up);
+}
+
+Vector3 GdNavigationServer::map_get_up(RID p_map) const {
+	const NavMap *map = map_owner.getornull(p_map);
+	ERR_FAIL_COND_V(map == nullptr, Vector3());
+
+	return map->get_up();
+}
+
+COMMAND_2(map_set_cell_size, RID, p_map, real_t, p_cell_size) {
+	NavMap *map = map_owner.getornull(p_map);
+	ERR_FAIL_COND(map == nullptr);
+
+	map->set_cell_size(p_cell_size);
+}
+
+real_t GdNavigationServer::map_get_cell_size(RID p_map) const {
+	const NavMap *map = map_owner.getornull(p_map);
+	ERR_FAIL_COND_V(map == nullptr, 0);
+
+	return map->get_cell_size();
+}
+
+COMMAND_2(map_set_edge_connection_margin, RID, p_map, real_t, p_connection_margin) {
+	NavMap *map = map_owner.getornull(p_map);
+	ERR_FAIL_COND(map == nullptr);
+
+	map->set_edge_connection_margin(p_connection_margin);
+}
+
+real_t GdNavigationServer::map_get_edge_connection_margin(RID p_map) const {
+	const NavMap *map = map_owner.getornull(p_map);
+	ERR_FAIL_COND_V(map == nullptr, 0);
+
+	return map->get_edge_connection_margin();
+}
+
+Vector<Vector3> GdNavigationServer::map_get_path(RID p_map, Vector3 p_origin, Vector3 p_destination, bool p_optimize) const {
+	const NavMap *map = map_owner.getornull(p_map);
+	ERR_FAIL_COND_V(map == nullptr, Vector<Vector3>());
+
+	return map->get_path(p_origin, p_destination, p_optimize);
+}
+
+Vector3 GdNavigationServer::map_get_closest_point_to_segment(RID p_map, const Vector3 &p_from, const Vector3 &p_to, const bool p_use_collision) const {
+	const NavMap *map = map_owner.getornull(p_map);
+	ERR_FAIL_COND_V(map == nullptr, Vector3());
+
+	return map->get_closest_point_to_segment(p_from, p_to, p_use_collision);
+}
+
+Vector3 GdNavigationServer::map_get_closest_point(RID p_map, const Vector3 &p_point) const {
+	const NavMap *map = map_owner.getornull(p_map);
+	ERR_FAIL_COND_V(map == nullptr, Vector3());
+
+	return map->get_closest_point(p_point);
+}
+
+Vector3 GdNavigationServer::map_get_closest_point_normal(RID p_map, const Vector3 &p_point) const {
+	const NavMap *map = map_owner.getornull(p_map);
+	ERR_FAIL_COND_V(map == nullptr, Vector3());
+
+	return map->get_closest_point_normal(p_point);
+}
+
+RID GdNavigationServer::map_get_closest_point_owner(RID p_map, const Vector3 &p_point) const {
+	const NavMap *map = map_owner.getornull(p_map);
+	ERR_FAIL_COND_V(map == nullptr, RID());
+
+	return map->get_closest_point_owner(p_point);
+}
+
+RID GdNavigationServer::region_create() const {
+	auto mut_this = const_cast<GdNavigationServer *>(this);
+	MutexLock lock(mut_this->operations_mutex);
+	NavRegion *reg = memnew(NavRegion);
+	RID rid = region_owner.make_rid(reg);
+	reg->set_self(rid);
+	return rid;
+}
+
+COMMAND_2(region_set_map, RID, p_region, RID, p_map) {
+	NavRegion *region = region_owner.getornull(p_region);
+	ERR_FAIL_COND(region == nullptr);
+
+	if (region->get_map() != nullptr) {
+		if (region->get_map()->get_self() == p_map) {
+			return; // Pointless
+		}
+
+		region->get_map()->remove_region(region);
+		region->set_map(nullptr);
+	}
+
+	if (p_map.is_valid()) {
+		NavMap *map = map_owner.getornull(p_map);
+		ERR_FAIL_COND(map == nullptr);
+
+		map->add_region(region);
+		region->set_map(map);
+	}
+}
+
+COMMAND_2(region_set_transform, RID, p_region, Transform, p_transform) {
+	NavRegion *region = region_owner.getornull(p_region);
+	ERR_FAIL_COND(region == nullptr);
+
+	region->set_transform(p_transform);
+}
+
+COMMAND_2(region_set_navmesh, RID, p_region, Ref<NavigationMesh>, p_nav_mesh) {
+	NavRegion *region = region_owner.getornull(p_region);
+	ERR_FAIL_COND(region == nullptr);
+
+	region->set_mesh(p_nav_mesh);
+}
+
+void GdNavigationServer::region_bake_navmesh(Ref<NavigationMesh> r_mesh, Node *p_node) const {
+	ERR_FAIL_COND(r_mesh.is_null());
+	ERR_FAIL_COND(p_node == nullptr);
+
+#ifndef _3D_DISABLED
+	NavigationMeshGenerator::get_singleton()->clear(r_mesh);
+	NavigationMeshGenerator::get_singleton()->bake(r_mesh, p_node);
+#endif
+}
+
+RID GdNavigationServer::agent_create() const {
+	auto mut_this = const_cast<GdNavigationServer *>(this);
+	MutexLock lock(mut_this->operations_mutex);
+	RvoAgent *agent = memnew(RvoAgent());
+	RID rid = agent_owner.make_rid(agent);
+	agent->set_self(rid);
+	return rid;
+}
+
+COMMAND_2(agent_set_map, RID, p_agent, RID, p_map) {
+	RvoAgent *agent = agent_owner.getornull(p_agent);
+	ERR_FAIL_COND(agent == nullptr);
+
+	if (agent->get_map()) {
+		if (agent->get_map()->get_self() == p_map) {
+			return; // Pointless
+		}
+
+		agent->get_map()->remove_agent(agent);
+	}
+
+	agent->set_map(nullptr);
+
+	if (p_map.is_valid()) {
+		NavMap *map = map_owner.getornull(p_map);
+		ERR_FAIL_COND(map == nullptr);
+
+		agent->set_map(map);
+		map->add_agent(agent);
+
+		if (agent->has_callback()) {
+			map->set_agent_as_controlled(agent);
+		}
+	}
+}
+
+COMMAND_2(agent_set_neighbor_dist, RID, p_agent, real_t, p_dist) {
+	RvoAgent *agent = agent_owner.getornull(p_agent);
+	ERR_FAIL_COND(agent == nullptr);
+
+	agent->get_agent()->neighborDist_ = p_dist;
+}
+
+COMMAND_2(agent_set_max_neighbors, RID, p_agent, int, p_count) {
+	RvoAgent *agent = agent_owner.getornull(p_agent);
+	ERR_FAIL_COND(agent == nullptr);
+
+	agent->get_agent()->maxNeighbors_ = p_count;
+}
+
+COMMAND_2(agent_set_time_horizon, RID, p_agent, real_t, p_time) {
+	RvoAgent *agent = agent_owner.getornull(p_agent);
+	ERR_FAIL_COND(agent == nullptr);
+
+	agent->get_agent()->timeHorizon_ = p_time;
+}
+
+COMMAND_2(agent_set_radius, RID, p_agent, real_t, p_radius) {
+	RvoAgent *agent = agent_owner.getornull(p_agent);
+	ERR_FAIL_COND(agent == nullptr);
+
+	agent->get_agent()->radius_ = p_radius;
+}
+
+COMMAND_2(agent_set_max_speed, RID, p_agent, real_t, p_max_speed) {
+	RvoAgent *agent = agent_owner.getornull(p_agent);
+	ERR_FAIL_COND(agent == nullptr);
+
+	agent->get_agent()->maxSpeed_ = p_max_speed;
+}
+
+COMMAND_2(agent_set_velocity, RID, p_agent, Vector3, p_velocity) {
+	RvoAgent *agent = agent_owner.getornull(p_agent);
+	ERR_FAIL_COND(agent == nullptr);
+
+	agent->get_agent()->velocity_ = RVO::Vector3(p_velocity.x, p_velocity.y, p_velocity.z);
+}
+
+COMMAND_2(agent_set_target_velocity, RID, p_agent, Vector3, p_velocity) {
+	RvoAgent *agent = agent_owner.getornull(p_agent);
+	ERR_FAIL_COND(agent == nullptr);
+
+	agent->get_agent()->prefVelocity_ = RVO::Vector3(p_velocity.x, p_velocity.y, p_velocity.z);
+}
+
+COMMAND_2(agent_set_position, RID, p_agent, Vector3, p_position) {
+	RvoAgent *agent = agent_owner.getornull(p_agent);
+	ERR_FAIL_COND(agent == nullptr);
+
+	agent->get_agent()->position_ = RVO::Vector3(p_position.x, p_position.y, p_position.z);
+}
+
+COMMAND_2(agent_set_ignore_y, RID, p_agent, bool, p_ignore) {
+	RvoAgent *agent = agent_owner.getornull(p_agent);
+	ERR_FAIL_COND(agent == nullptr);
+
+	agent->get_agent()->ignore_y_ = p_ignore;
+}
+
+bool GdNavigationServer::agent_is_map_changed(RID p_agent) const {
+	RvoAgent *agent = agent_owner.getornull(p_agent);
+	ERR_FAIL_COND_V(agent == nullptr, false);
+
+	return agent->is_map_changed();
+}
+
+COMMAND_4(agent_set_callback, RID, p_agent, Object *, p_receiver, StringName, p_method, Variant, p_udata) {
+	RvoAgent *agent = agent_owner.getornull(p_agent);
+	ERR_FAIL_COND(agent == nullptr);
+
+	agent->set_callback(p_receiver == nullptr ? ObjectID() : p_receiver->get_instance_id(), p_method, p_udata);
+
+	if (agent->get_map()) {
+		if (p_receiver == nullptr) {
+			agent->get_map()->remove_agent_as_controlled(agent);
+		} else {
+			agent->get_map()->set_agent_as_controlled(agent);
+		}
+	}
+}
+
+COMMAND_1(free, RID, p_object) {
+	if (map_owner.owns(p_object)) {
+		NavMap *map = map_owner.getornull(p_object);
+
+		// Removes any assigned region
+		std::vector<NavRegion *> regions = map->get_regions();
+		for (size_t i(0); i < regions.size(); i++) {
+			map->remove_region(regions[i]);
+			regions[i]->set_map(nullptr);
+		}
+
+		// Remove any assigned agent
+		std::vector<RvoAgent *> agents = map->get_agents();
+		for (size_t i(0); i < agents.size(); i++) {
+			map->remove_agent(agents[i]);
+			agents[i]->set_map(nullptr);
+		}
+
+		active_maps.erase(map);
+		map_owner.free(p_object);
+		memdelete(map);
+
+	} else if (region_owner.owns(p_object)) {
+		NavRegion *region = region_owner.getornull(p_object);
+
+		// Removes this region from the map if assigned
+		if (region->get_map() != nullptr) {
+			region->get_map()->remove_region(region);
+			region->set_map(nullptr);
+		}
+
+		region_owner.free(p_object);
+		memdelete(region);
+
+	} else if (agent_owner.owns(p_object)) {
+		RvoAgent *agent = agent_owner.getornull(p_object);
+
+		// Removes this agent from the map if assigned
+		if (agent->get_map() != nullptr) {
+			agent->get_map()->remove_agent(agent);
+			agent->set_map(nullptr);
+		}
+
+		agent_owner.free(p_object);
+		memdelete(agent);
+
+	} else {
+		ERR_FAIL_COND("Invalid ID.");
+	}
+}
+
+void GdNavigationServer::set_active(bool p_active) const {
+	auto mut_this = const_cast<GdNavigationServer *>(this);
+	MutexLock lock(mut_this->operations_mutex);
+	mut_this->active = p_active;
+}
+
+void GdNavigationServer::flush_queries() {
+	// In c++ we can't be sure that this is performed in the main thread
+	// even with mutable functions.
+	MutexLock lock(commands_mutex);
+	MutexLock lock2(operations_mutex);
+	for (size_t i(0); i < commands.size(); i++) {
+		commands[i]->exec(this);
+		memdelete(commands[i]);
+	}
+	commands.clear();
+}
+
+void GdNavigationServer::process(real_t p_delta_time) {
+	flush_queries();
+
+	if (!active) {
+		return;
+	}
+
+	// In c++ we can't be sure that this is performed in the main thread
+	// even with mutable functions.
+	MutexLock lock(operations_mutex);
+	for (int i(0); i < active_maps.size(); i++) {
+		active_maps[i]->sync();
+		active_maps[i]->step(p_delta_time);
+		active_maps[i]->dispatch_callbacks();
+	}
+}
+
+#undef COMMAND_1
+#undef COMMAND_2
+#undef COMMAND_4
diff --git a/modules/gdnavigation/gd_navigation_server.h b/modules/gdnavigation/gd_navigation_server.h
new file mode 100644
index 0000000000..e3e02f3d7c
--- /dev/null
+++ b/modules/gdnavigation/gd_navigation_server.h
@@ -0,0 +1,142 @@
+/*************************************************************************/
+/*  gd_navigation_server.h                                               */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef GD_NAVIGATION_SERVER_H
+#define GD_NAVIGATION_SERVER_H
+
+#include "core/rid.h"
+#include "core/rid_owner.h"
+#include "servers/navigation_server_3d.h"
+
+#include "nav_map.h"
+#include "nav_region.h"
+#include "rvo_agent.h"
+
+/**
+	@author AndreaCatania
+*/
+
+/// The commands are functions executed during the `sync` phase.
+
+#define MERGE_INTERNAL(A, B) A##B
+#define MERGE(A, B) MERGE_INTERNAL(A, B)
+
+#define COMMAND_1(F_NAME, T_0, D_0)     \
+	virtual void F_NAME(T_0 D_0) const; \
+	void MERGE(_cmd_, F_NAME)(T_0 D_0)
+
+#define COMMAND_2(F_NAME, T_0, D_0, T_1, D_1)    \
+	virtual void F_NAME(T_0 D_0, T_1 D_1) const; \
+	void MERGE(_cmd_, F_NAME)(T_0 D_0, T_1 D_1)
+
+#define COMMAND_4_DEF(F_NAME, T_0, D_0, T_1, D_1, T_2, D_2, T_3, D_3, D_3_DEF) \
+	virtual void F_NAME(T_0 D_0, T_1 D_1, T_2 D_2, T_3 D_3 = D_3_DEF) const;   \
+	void MERGE(_cmd_, F_NAME)(T_0 D_0, T_1 D_1, T_2 D_2, T_3 D_3)
+
+class GdNavigationServer;
+
+struct SetCommand {
+	virtual ~SetCommand() {}
+	virtual void exec(GdNavigationServer *server) = 0;
+};
+
+class GdNavigationServer : public NavigationServer3D {
+	Mutex commands_mutex;
+	/// Mutex used to make any operation threadsafe.
+	Mutex operations_mutex;
+
+	std::vector<SetCommand *> commands;
+
+	mutable RID_PtrOwner<NavMap> map_owner;
+	mutable RID_PtrOwner<NavRegion> region_owner;
+	mutable RID_PtrOwner<RvoAgent> agent_owner;
+
+	bool active = true;
+	Vector<NavMap *> active_maps;
+
+public:
+	GdNavigationServer();
+	virtual ~GdNavigationServer();
+
+	void add_command(SetCommand *command) const;
+
+	virtual RID map_create() const;
+	COMMAND_2(map_set_active, RID, p_map, bool, p_active);
+	virtual bool map_is_active(RID p_map) const;
+
+	COMMAND_2(map_set_up, RID, p_map, Vector3, p_up);
+	virtual Vector3 map_get_up(RID p_map) const;
+
+	COMMAND_2(map_set_cell_size, RID, p_map, real_t, p_cell_size);
+	virtual real_t map_get_cell_size(RID p_map) const;
+
+	COMMAND_2(map_set_edge_connection_margin, RID, p_map, real_t, p_connection_margin);
+	virtual real_t map_get_edge_connection_margin(RID p_map) const;
+
+	virtual Vector<Vector3> map_get_path(RID p_map, Vector3 p_origin, Vector3 p_destination, bool p_optimize) const;
+
+	virtual Vector3 map_get_closest_point_to_segment(RID p_map, const Vector3 &p_from, const Vector3 &p_to, const bool p_use_collision = false) const;
+	virtual Vector3 map_get_closest_point(RID p_map, const Vector3 &p_point) const;
+	virtual Vector3 map_get_closest_point_normal(RID p_map, const Vector3 &p_point) const;
+	virtual RID map_get_closest_point_owner(RID p_map, const Vector3 &p_point) const;
+
+	virtual RID region_create() const;
+	COMMAND_2(region_set_map, RID, p_region, RID, p_map);
+	COMMAND_2(region_set_transform, RID, p_region, Transform, p_transform);
+	COMMAND_2(region_set_navmesh, RID, p_region, Ref<NavigationMesh>, p_nav_mesh);
+	virtual void region_bake_navmesh(Ref<NavigationMesh> r_mesh, Node *p_node) const;
+
+	virtual RID agent_create() const;
+	COMMAND_2(agent_set_map, RID, p_agent, RID, p_map);
+	COMMAND_2(agent_set_neighbor_dist, RID, p_agent, real_t, p_dist);
+	COMMAND_2(agent_set_max_neighbors, RID, p_agent, int, p_count);
+	COMMAND_2(agent_set_time_horizon, RID, p_agent, real_t, p_time);
+	COMMAND_2(agent_set_radius, RID, p_agent, real_t, p_radius);
+	COMMAND_2(agent_set_max_speed, RID, p_agent, real_t, p_max_speed);
+	COMMAND_2(agent_set_velocity, RID, p_agent, Vector3, p_velocity);
+	COMMAND_2(agent_set_target_velocity, RID, p_agent, Vector3, p_velocity);
+	COMMAND_2(agent_set_position, RID, p_agent, Vector3, p_position);
+	COMMAND_2(agent_set_ignore_y, RID, p_agent, bool, p_ignore);
+	virtual bool agent_is_map_changed(RID p_agent) const;
+	COMMAND_4_DEF(agent_set_callback, RID, p_agent, Object *, p_receiver, StringName, p_method, Variant, p_udata, Variant());
+
+	COMMAND_1(free, RID, p_object);
+
+	virtual void set_active(bool p_active) const;
+
+	void flush_queries();
+	virtual void process(real_t p_delta_time);
+};
+
+#undef COMMAND_1
+#undef COMMAND_2
+#undef COMMAND_4_DEF
+
+#endif // GD_NAVIGATION_SERVER_H
diff --git a/modules/gdnavigation/nav_map.cpp b/modules/gdnavigation/nav_map.cpp
new file mode 100644
index 0000000000..7919e6a01f
--- /dev/null
+++ b/modules/gdnavigation/nav_map.cpp
@@ -0,0 +1,780 @@
+/*************************************************************************/
+/*  nav_map.cpp                                                          */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "nav_map.h"
+
+#include "core/os/threaded_array_processor.h"
+#include "nav_region.h"
+#include "rvo_agent.h"
+
+#include <algorithm>
+
+/**
+	@author AndreaCatania
+*/
+
+#define USE_ENTRY_POINT
+
+void NavMap::set_up(Vector3 p_up) {
+	up = p_up;
+	regenerate_polygons = true;
+}
+
+void NavMap::set_cell_size(float p_cell_size) {
+	cell_size = p_cell_size;
+	regenerate_polygons = true;
+}
+
+void NavMap::set_edge_connection_margin(float p_edge_connection_margin) {
+	edge_connection_margin = p_edge_connection_margin;
+	regenerate_links = true;
+}
+
+gd::PointKey NavMap::get_point_key(const Vector3 &p_pos) const {
+	const int x = int(Math::floor(p_pos.x / cell_size));
+	const int y = int(Math::floor(p_pos.y / cell_size));
+	const int z = int(Math::floor(p_pos.z / cell_size));
+
+	gd::PointKey p;
+	p.key = 0;
+	p.x = x;
+	p.y = y;
+	p.z = z;
+	return p;
+}
+
+Vector<Vector3> NavMap::get_path(Vector3 p_origin, Vector3 p_destination, bool p_optimize) const {
+	const gd::Polygon *begin_poly = nullptr;
+	const gd::Polygon *end_poly = nullptr;
+	Vector3 begin_point;
+	Vector3 end_point;
+	float begin_d = 1e20;
+	float end_d = 1e20;
+
+	// Find the initial poly and the end poly on this map.
+	for (size_t i(0); i < polygons.size(); i++) {
+		const gd::Polygon &p = polygons[i];
+
+		// For each point cast a face and check the distance between the origin/destination
+		for (size_t point_id = 2; point_id < p.points.size(); point_id++) {
+			Face3 f(p.points[point_id - 2].pos, p.points[point_id - 1].pos, p.points[point_id].pos);
+			Vector3 spoint = f.get_closest_point_to(p_origin);
+			float dpoint = spoint.distance_to(p_origin);
+			if (dpoint < begin_d) {
+				begin_d = dpoint;
+				begin_poly = &p;
+				begin_point = spoint;
+			}
+
+			spoint = f.get_closest_point_to(p_destination);
+			dpoint = spoint.distance_to(p_destination);
+			if (dpoint < end_d) {
+				end_d = dpoint;
+				end_poly = &p;
+				end_point = spoint;
+			}
+		}
+	}
+
+	if (!begin_poly || !end_poly) {
+		// No path
+		return Vector<Vector3>();
+	}
+
+	if (begin_poly == end_poly) {
+		Vector<Vector3> path;
+		path.resize(2);
+		path.write[0] = begin_point;
+		path.write[1] = end_point;
+		return path;
+	}
+
+	std::vector<gd::NavigationPoly> navigation_polys;
+	navigation_polys.reserve(polygons.size() * 0.75);
+
+	// The elements indices in the `navigation_polys`.
+	int least_cost_id(-1);
+	List<uint32_t> open_list;
+	bool found_route = false;
+
+	navigation_polys.push_back(gd::NavigationPoly(begin_poly));
+	{
+		least_cost_id = 0;
+		gd::NavigationPoly *least_cost_poly = &navigation_polys[least_cost_id];
+		least_cost_poly->self_id = least_cost_id;
+		least_cost_poly->entry = begin_point;
+	}
+
+	open_list.push_back(0);
+
+	const gd::Polygon *reachable_end = nullptr;
+	float reachable_d = 1e30;
+	bool is_reachable = true;
+
+	while (found_route == false) {
+		{
+			// Takes the current least_cost_poly neighbors and compute the traveled_distance of each
+			for (size_t i = 0; i < navigation_polys[least_cost_id].poly->edges.size(); i++) {
+				gd::NavigationPoly *least_cost_poly = &navigation_polys[least_cost_id];
+
+				const gd::Edge &edge = least_cost_poly->poly->edges[i];
+				if (!edge.other_polygon) {
+					continue;
+				}
+
+#ifdef USE_ENTRY_POINT
+				Vector3 edge_line[2] = {
+					least_cost_poly->poly->points[i].pos,
+					least_cost_poly->poly->points[(i + 1) % least_cost_poly->poly->points.size()].pos
+				};
+
+				const Vector3 new_entry = Geometry3D::get_closest_point_to_segment(least_cost_poly->entry, edge_line);
+				const float new_distance = least_cost_poly->entry.distance_to(new_entry) + least_cost_poly->traveled_distance;
+#else
+				const float new_distance = least_cost_poly->poly->center.distance_to(edge.other_polygon->center) + least_cost_poly->traveled_distance;
+#endif
+
+				auto it = std::find(
+						navigation_polys.begin(),
+						navigation_polys.end(),
+						gd::NavigationPoly(edge.other_polygon));
+
+				if (it != navigation_polys.end()) {
+					// Oh this was visited already, can we win the cost?
+					if (it->traveled_distance > new_distance) {
+						it->prev_navigation_poly_id = least_cost_id;
+						it->back_navigation_edge = edge.other_edge;
+						it->traveled_distance = new_distance;
+#ifdef USE_ENTRY_POINT
+						it->entry = new_entry;
+#endif
+					}
+				} else {
+					// Add to open neighbours
+
+					navigation_polys.push_back(gd::NavigationPoly(edge.other_polygon));
+					gd::NavigationPoly *np = &navigation_polys[navigation_polys.size() - 1];
+
+					np->self_id = navigation_polys.size() - 1;
+					np->prev_navigation_poly_id = least_cost_id;
+					np->back_navigation_edge = edge.other_edge;
+					np->traveled_distance = new_distance;
+#ifdef USE_ENTRY_POINT
+					np->entry = new_entry;
+#endif
+					open_list.push_back(navigation_polys.size() - 1);
+				}
+			}
+		}
+
+		// Removes the least cost polygon from the open list so we can advance.
+		open_list.erase(least_cost_id);
+
+		if (open_list.size() == 0) {
+			// When the open list is empty at this point the End Polygon is not reachable
+			// so use the further reachable polygon
+			ERR_BREAK_MSG(is_reachable == false, "It's not expect to not find the most reachable polygons");
+			is_reachable = false;
+			if (reachable_end == nullptr) {
+				// The path is not found and there is not a way out.
+				break;
+			}
+
+			// Set as end point the furthest reachable point.
+			end_poly = reachable_end;
+			end_d = 1e20;
+			for (size_t point_id = 2; point_id < end_poly->points.size(); point_id++) {
+				Face3 f(end_poly->points[point_id - 2].pos, end_poly->points[point_id - 1].pos, end_poly->points[point_id].pos);
+				Vector3 spoint = f.get_closest_point_to(p_destination);
+				float dpoint = spoint.distance_to(p_destination);
+				if (dpoint < end_d) {
+					end_point = spoint;
+					end_d = dpoint;
+				}
+			}
+
+			// Reset open and navigation_polys
+			gd::NavigationPoly np = navigation_polys[0];
+			navigation_polys.clear();
+			navigation_polys.push_back(np);
+			open_list.clear();
+			open_list.push_back(0);
+
+			reachable_end = nullptr;
+
+			continue;
+		}
+
+		// Now take the new least_cost_poly from the open list.
+		least_cost_id = -1;
+		float least_cost = 1e30;
+
+		for (auto element = open_list.front(); element != nullptr; element = element->next()) {
+			gd::NavigationPoly *np = &navigation_polys[element->get()];
+			float cost = np->traveled_distance;
+#ifdef USE_ENTRY_POINT
+			cost += np->entry.distance_to(end_point);
+#else
+			cost += np->poly->center.distance_to(end_point);
+#endif
+			if (cost < least_cost) {
+				least_cost_id = np->self_id;
+				least_cost = cost;
+			}
+		}
+
+		// Stores the further reachable end polygon, in case our goal is not reachable.
+		if (is_reachable) {
+			float d = navigation_polys[least_cost_id].entry.distance_to(p_destination);
+			if (reachable_d > d) {
+				reachable_d = d;
+				reachable_end = navigation_polys[least_cost_id].poly;
+			}
+		}
+
+		ERR_BREAK(least_cost_id == -1);
+
+		// Check if we reached the end
+		if (navigation_polys[least_cost_id].poly == end_poly) {
+			// Yep, done!!
+			found_route = true;
+			break;
+		}
+	}
+
+	if (found_route) {
+		Vector<Vector3> path;
+		if (p_optimize) {
+			// String pulling
+
+			gd::NavigationPoly *apex_poly = &navigation_polys[least_cost_id];
+			Vector3 apex_point = end_point;
+			Vector3 portal_left = apex_point;
+			Vector3 portal_right = apex_point;
+			gd::NavigationPoly *left_poly = apex_poly;
+			gd::NavigationPoly *right_poly = apex_poly;
+			gd::NavigationPoly *p = apex_poly;
+
+			path.push_back(end_point);
+
+			while (p) {
+				Vector3 left;
+				Vector3 right;
+
+#define CLOCK_TANGENT(m_a, m_b, m_c) (((m_a) - (m_c)).cross((m_a) - (m_b)))
+
+				if (p->poly == begin_poly) {
+					left = begin_point;
+					right = begin_point;
+				} else {
+					int prev = p->back_navigation_edge;
+					int prev_n = (p->back_navigation_edge + 1) % p->poly->points.size();
+					left = p->poly->points[prev].pos;
+					right = p->poly->points[prev_n].pos;
+
+					if (p->poly->clockwise) {
+						SWAP(left, right);
+					}
+				}
+
+				bool skip = false;
+
+				if (CLOCK_TANGENT(apex_point, portal_left, left).dot(up) >= 0) {
+					//process
+					if (portal_left == apex_point || CLOCK_TANGENT(apex_point, left, portal_right).dot(up) > 0) {
+						left_poly = p;
+						portal_left = left;
+					} else {
+						clip_path(navigation_polys, path, apex_poly, portal_right, right_poly);
+
+						apex_point = portal_right;
+						p = right_poly;
+						left_poly = p;
+						apex_poly = p;
+						portal_left = apex_point;
+						portal_right = apex_point;
+						path.push_back(apex_point);
+						skip = true;
+					}
+				}
+
+				if (!skip && CLOCK_TANGENT(apex_point, portal_right, right).dot(up) <= 0) {
+					//process
+					if (portal_right == apex_point || CLOCK_TANGENT(apex_point, right, portal_left).dot(up) < 0) {
+						right_poly = p;
+						portal_right = right;
+					} else {
+						clip_path(navigation_polys, path, apex_poly, portal_left, left_poly);
+
+						apex_point = portal_left;
+						p = left_poly;
+						right_poly = p;
+						apex_poly = p;
+						portal_right = apex_point;
+						portal_left = apex_point;
+						path.push_back(apex_point);
+					}
+				}
+
+				if (p->prev_navigation_poly_id != -1) {
+					p = &navigation_polys[p->prev_navigation_poly_id];
+				} else {
+					// The end
+					p = nullptr;
+				}
+			}
+
+			if (path[path.size() - 1] != begin_point) {
+				path.push_back(begin_point);
+			}
+
+			path.invert();
+
+		} else {
+			path.push_back(end_point);
+
+			// Add mid points
+			int np_id = least_cost_id;
+			while (np_id != -1) {
+#ifdef USE_ENTRY_POINT
+				Vector3 point = navigation_polys[np_id].entry;
+#else
+				int prev = navigation_polys[np_id].back_navigation_edge;
+				int prev_n = (navigation_polys[np_id].back_navigation_edge + 1) % navigation_polys[np_id].poly->points.size();
+				Vector3 point = (navigation_polys[np_id].poly->points[prev].pos + navigation_polys[np_id].poly->points[prev_n].pos) * 0.5;
+#endif
+
+				path.push_back(point);
+				np_id = navigation_polys[np_id].prev_navigation_poly_id;
+			}
+
+			path.invert();
+		}
+
+		return path;
+	}
+	return Vector<Vector3>();
+}
+
+Vector3 NavMap::get_closest_point_to_segment(const Vector3 &p_from, const Vector3 &p_to, const bool p_use_collision) const {
+	bool use_collision = p_use_collision;
+	Vector3 closest_point;
+	real_t closest_point_d = 1e20;
+
+	// Find the initial poly and the end poly on this map.
+	for (size_t i(0); i < polygons.size(); i++) {
+		const gd::Polygon &p = polygons[i];
+
+		// For each point cast a face and check the distance to the segment
+		for (size_t point_id = 2; point_id < p.points.size(); point_id += 1) {
+			const Face3 f(p.points[point_id - 2].pos, p.points[point_id - 1].pos, p.points[point_id].pos);
+			Vector3 inters;
+			if (f.intersects_segment(p_from, p_to, &inters)) {
+				const real_t d = closest_point_d = p_from.distance_to(inters);
+				if (use_collision == false) {
+					closest_point = inters;
+					use_collision = true;
+					closest_point_d = d;
+				} else if (closest_point_d > d) {
+					closest_point = inters;
+					closest_point_d = d;
+				}
+			}
+		}
+
+		if (use_collision == false) {
+			for (size_t point_id = 0; point_id < p.points.size(); point_id += 1) {
+				Vector3 a, b;
+
+				Geometry3D::get_closest_points_between_segments(
+						p_from,
+						p_to,
+						p.points[point_id].pos,
+						p.points[(point_id + 1) % p.points.size()].pos,
+						a,
+						b);
+
+				const real_t d = a.distance_to(b);
+				if (d < closest_point_d) {
+					closest_point_d = d;
+					closest_point = b;
+				}
+			}
+		}
+	}
+
+	return closest_point;
+}
+
+Vector3 NavMap::get_closest_point(const Vector3 &p_point) const {
+	// TODO this is really not optimal, please redesign the API to directly return all this data
+
+	Vector3 closest_point;
+	real_t closest_point_d = 1e20;
+
+	// Find the initial poly and the end poly on this map.
+	for (size_t i(0); i < polygons.size(); i++) {
+		const gd::Polygon &p = polygons[i];
+
+		// For each point cast a face and check the distance to the point
+		for (size_t point_id = 2; point_id < p.points.size(); point_id += 1) {
+			const Face3 f(p.points[point_id - 2].pos, p.points[point_id - 1].pos, p.points[point_id].pos);
+			const Vector3 inters = f.get_closest_point_to(p_point);
+			const real_t d = inters.distance_to(p_point);
+			if (d < closest_point_d) {
+				closest_point = inters;
+				closest_point_d = d;
+			}
+		}
+	}
+
+	return closest_point;
+}
+
+Vector3 NavMap::get_closest_point_normal(const Vector3 &p_point) const {
+	// TODO this is really not optimal, please redesign the API to directly return all this data
+
+	Vector3 closest_point;
+	Vector3 closest_point_normal;
+	real_t closest_point_d = 1e20;
+
+	// Find the initial poly and the end poly on this map.
+	for (size_t i(0); i < polygons.size(); i++) {
+		const gd::Polygon &p = polygons[i];
+
+		// For each point cast a face and check the distance to the point
+		for (size_t point_id = 2; point_id < p.points.size(); point_id += 1) {
+			const Face3 f(p.points[point_id - 2].pos, p.points[point_id - 1].pos, p.points[point_id].pos);
+			const Vector3 inters = f.get_closest_point_to(p_point);
+			const real_t d = inters.distance_to(p_point);
+			if (d < closest_point_d) {
+				closest_point = inters;
+				closest_point_normal = f.get_plane().normal;
+				closest_point_d = d;
+			}
+		}
+	}
+
+	return closest_point_normal;
+}
+
+RID NavMap::get_closest_point_owner(const Vector3 &p_point) const {
+	// TODO this is really not optimal, please redesign the API to directly return all this data
+
+	Vector3 closest_point;
+	RID closest_point_owner;
+	real_t closest_point_d = 1e20;
+
+	// Find the initial poly and the end poly on this map.
+	for (size_t i(0); i < polygons.size(); i++) {
+		const gd::Polygon &p = polygons[i];
+
+		// For each point cast a face and check the distance to the point
+		for (size_t point_id = 2; point_id < p.points.size(); point_id += 1) {
+			const Face3 f(p.points[point_id - 2].pos, p.points[point_id - 1].pos, p.points[point_id].pos);
+			const Vector3 inters = f.get_closest_point_to(p_point);
+			const real_t d = inters.distance_to(p_point);
+			if (d < closest_point_d) {
+				closest_point = inters;
+				closest_point_owner = p.owner->get_self();
+				closest_point_d = d;
+			}
+		}
+	}
+
+	return closest_point_owner;
+}
+
+void NavMap::add_region(NavRegion *p_region) {
+	regions.push_back(p_region);
+	regenerate_links = true;
+}
+
+void NavMap::remove_region(NavRegion *p_region) {
+	std::vector<NavRegion *>::iterator it = std::find(regions.begin(), regions.end(), p_region);
+	if (it != regions.end()) {
+		regions.erase(it);
+		regenerate_links = true;
+	}
+}
+
+bool NavMap::has_agent(RvoAgent *agent) const {
+	return std::find(agents.begin(), agents.end(), agent) != agents.end();
+}
+
+void NavMap::add_agent(RvoAgent *agent) {
+	if (!has_agent(agent)) {
+		agents.push_back(agent);
+		agents_dirty = true;
+	}
+}
+
+void NavMap::remove_agent(RvoAgent *agent) {
+	remove_agent_as_controlled(agent);
+	auto it = std::find(agents.begin(), agents.end(), agent);
+	if (it != agents.end()) {
+		agents.erase(it);
+		agents_dirty = true;
+	}
+}
+
+void NavMap::set_agent_as_controlled(RvoAgent *agent) {
+	const bool exist = std::find(controlled_agents.begin(), controlled_agents.end(), agent) != controlled_agents.end();
+	if (!exist) {
+		ERR_FAIL_COND(!has_agent(agent));
+		controlled_agents.push_back(agent);
+	}
+}
+
+void NavMap::remove_agent_as_controlled(RvoAgent *agent) {
+	auto it = std::find(controlled_agents.begin(), controlled_agents.end(), agent);
+	if (it != controlled_agents.end()) {
+		controlled_agents.erase(it);
+	}
+}
+
+void NavMap::sync() {
+	if (regenerate_polygons) {
+		for (size_t r(0); r < regions.size(); r++) {
+			regions[r]->scratch_polygons();
+		}
+		regenerate_links = true;
+	}
+
+	for (size_t r(0); r < regions.size(); r++) {
+		if (regions[r]->sync()) {
+			regenerate_links = true;
+		}
+	}
+
+	if (regenerate_links) {
+		// Copy all region polygons in the map.
+		int count = 0;
+		for (size_t r(0); r < regions.size(); r++) {
+			count += regions[r]->get_polygons().size();
+		}
+
+		polygons.resize(count);
+		count = 0;
+
+		for (size_t r(0); r < regions.size(); r++) {
+			std::copy(
+					regions[r]->get_polygons().data(),
+					regions[r]->get_polygons().data() + regions[r]->get_polygons().size(),
+					polygons.begin() + count);
+
+			count += regions[r]->get_polygons().size();
+		}
+
+		// Connects the `Edges` of all the `Polygons` of all `Regions` each other.
+		Map<gd::EdgeKey, gd::Connection> connections;
+
+		for (size_t poly_id(0); poly_id < polygons.size(); poly_id++) {
+			gd::Polygon &poly(polygons[poly_id]);
+
+			for (size_t p(0); p < poly.points.size(); p++) {
+				int next_point = (p + 1) % poly.points.size();
+				gd::EdgeKey ek(poly.points[p].key, poly.points[next_point].key);
+
+				Map<gd::EdgeKey, gd::Connection>::Element *connection = connections.find(ek);
+				if (!connection) {
+					// Nothing yet
+					gd::Connection c;
+					c.A = &poly;
+					c.A_edge = p;
+					c.B = nullptr;
+					c.B_edge = -1;
+					connections[ek] = c;
+
+				} else if (connection->get().B == nullptr) {
+					CRASH_COND(connection->get().A == nullptr); // Unreachable
+
+					// Connect the two Polygons by this edge
+					connection->get().B = &poly;
+					connection->get().B_edge = p;
+
+					connection->get().A->edges[connection->get().A_edge].this_edge = connection->get().A_edge;
+					connection->get().A->edges[connection->get().A_edge].other_polygon = connection->get().B;
+					connection->get().A->edges[connection->get().A_edge].other_edge = connection->get().B_edge;
+
+					connection->get().B->edges[connection->get().B_edge].this_edge = connection->get().B_edge;
+					connection->get().B->edges[connection->get().B_edge].other_polygon = connection->get().A;
+					connection->get().B->edges[connection->get().B_edge].other_edge = connection->get().A_edge;
+				} else {
+					// The edge is already connected with another edge, skip.
+					ERR_PRINT("Attempted to merge a navigation mesh triangle edge with another already-merged edge. This happens when the Navigation3D's `cell_size` is different from the one used to generate the navigation mesh. This will cause navigation problem.");
+				}
+			}
+		}
+
+		// Takes all the free edges.
+		std::vector<gd::FreeEdge> free_edges;
+		free_edges.reserve(connections.size());
+
+		for (auto connection_element = connections.front(); connection_element; connection_element = connection_element->next()) {
+			if (connection_element->get().B == nullptr) {
+				CRASH_COND(connection_element->get().A == nullptr); // Unreachable
+				CRASH_COND(connection_element->get().A_edge < 0); // Unreachable
+
+				// This is a free edge
+				uint32_t id(free_edges.size());
+				free_edges.push_back(gd::FreeEdge());
+				free_edges[id].is_free = true;
+				free_edges[id].poly = connection_element->get().A;
+				free_edges[id].edge_id = connection_element->get().A_edge;
+				uint32_t point_0(free_edges[id].edge_id);
+				uint32_t point_1((free_edges[id].edge_id + 1) % free_edges[id].poly->points.size());
+				Vector3 pos_0 = free_edges[id].poly->points[point_0].pos;
+				Vector3 pos_1 = free_edges[id].poly->points[point_1].pos;
+				Vector3 relative = pos_1 - pos_0;
+				free_edges[id].edge_center = (pos_0 + pos_1) / 2.0;
+				free_edges[id].edge_dir = relative.normalized();
+				free_edges[id].edge_len_squared = relative.length_squared();
+			}
+		}
+
+		const float ecm_squared(edge_connection_margin * edge_connection_margin);
+#define LEN_TOLLERANCE 0.1
+#define DIR_TOLLERANCE 0.9
+		// In front of tolerance
+#define IFO_TOLLERANCE 0.5
+
+		// Find the compatible near edges.
+		//
+		// Note:
+		// Considering that the edges must be compatible (for obvious reasons)
+		// to be connected, create new polygons to remove that small gap is
+		// not really useful and would result in wasteful computation during
+		// connection, integration and path finding.
+		for (size_t i(0); i < free_edges.size(); i++) {
+			if (!free_edges[i].is_free) {
+				continue;
+			}
+			gd::FreeEdge &edge = free_edges[i];
+			for (size_t y(0); y < free_edges.size(); y++) {
+				gd::FreeEdge &other_edge = free_edges[y];
+				if (i == y || !other_edge.is_free || edge.poly->owner == other_edge.poly->owner) {
+					continue;
+				}
+
+				Vector3 rel_centers = other_edge.edge_center - edge.edge_center;
+				if (ecm_squared > rel_centers.length_squared() // Are enough closer?
+						&& ABS(edge.edge_len_squared - other_edge.edge_len_squared) < LEN_TOLLERANCE // Are the same length?
+						&& ABS(edge.edge_dir.dot(other_edge.edge_dir)) > DIR_TOLLERANCE // Are aligned?
+						&& ABS(rel_centers.normalized().dot(edge.edge_dir)) < IFO_TOLLERANCE // Are one in front the other?
+				) {
+					// The edges can be connected
+					edge.is_free = false;
+					other_edge.is_free = false;
+
+					edge.poly->edges[edge.edge_id].this_edge = edge.edge_id;
+					edge.poly->edges[edge.edge_id].other_edge = other_edge.edge_id;
+					edge.poly->edges[edge.edge_id].other_polygon = other_edge.poly;
+
+					other_edge.poly->edges[other_edge.edge_id].this_edge = other_edge.edge_id;
+					other_edge.poly->edges[other_edge.edge_id].other_edge = edge.edge_id;
+					other_edge.poly->edges[other_edge.edge_id].other_polygon = edge.poly;
+				}
+			}
+		}
+	}
+
+	if (regenerate_links) {
+		map_update_id = map_update_id + 1 % 9999999;
+	}
+
+	if (agents_dirty) {
+		std::vector<RVO::Agent *> raw_agents;
+		raw_agents.reserve(agents.size());
+		for (size_t i(0); i < agents.size(); i++) {
+			raw_agents.push_back(agents[i]->get_agent());
+		}
+		rvo.buildAgentTree(raw_agents);
+	}
+
+	regenerate_polygons = false;
+	regenerate_links = false;
+	agents_dirty = false;
+}
+
+void NavMap::compute_single_step(uint32_t index, RvoAgent **agent) {
+	(*(agent + index))->get_agent()->computeNeighbors(&rvo);
+	(*(agent + index))->get_agent()->computeNewVelocity(deltatime);
+}
+
+void NavMap::step(real_t p_deltatime) {
+	deltatime = p_deltatime;
+	if (controlled_agents.size() > 0) {
+		thread_process_array(
+				controlled_agents.size(),
+				this,
+				&NavMap::compute_single_step,
+				controlled_agents.data());
+	}
+}
+
+void NavMap::dispatch_callbacks() {
+	for (int i(0); i < static_cast<int>(controlled_agents.size()); i++) {
+		controlled_agents[i]->dispatch_callback();
+	}
+}
+
+void NavMap::clip_path(const std::vector<gd::NavigationPoly> &p_navigation_polys, Vector<Vector3> &path, const gd::NavigationPoly *from_poly, const Vector3 &p_to_point, const gd::NavigationPoly *p_to_poly) const {
+	Vector3 from = path[path.size() - 1];
+
+	if (from.distance_to(p_to_point) < CMP_EPSILON) {
+		return;
+	}
+	Plane cut_plane;
+	cut_plane.normal = (from - p_to_point).cross(up);
+	if (cut_plane.normal == Vector3()) {
+		return;
+	}
+	cut_plane.normal.normalize();
+	cut_plane.d = cut_plane.normal.dot(from);
+
+	while (from_poly != p_to_poly) {
+		int back_nav_edge = from_poly->back_navigation_edge;
+		Vector3 a = from_poly->poly->points[back_nav_edge].pos;
+		Vector3 b = from_poly->poly->points[(back_nav_edge + 1) % from_poly->poly->points.size()].pos;
+
+		ERR_FAIL_COND(from_poly->prev_navigation_poly_id == -1);
+		from_poly = &p_navigation_polys[from_poly->prev_navigation_poly_id];
+
+		if (a.distance_to(b) > CMP_EPSILON) {
+			Vector3 inters;
+			if (cut_plane.intersects_segment(a, b, &inters)) {
+				if (inters.distance_to(p_to_point) > CMP_EPSILON && inters.distance_to(path[path.size() - 1]) > CMP_EPSILON) {
+					path.push_back(inters);
+				}
+			}
+		}
+	}
+}
diff --git a/modules/gdnavigation/nav_map.h b/modules/gdnavigation/nav_map.h
new file mode 100644
index 0000000000..892755f3f9
--- /dev/null
+++ b/modules/gdnavigation/nav_map.h
@@ -0,0 +1,140 @@
+/*************************************************************************/
+/*  nav_map.h                                                            */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef RVO_SPACE_H
+#define RVO_SPACE_H
+
+#include "nav_rid.h"
+
+#include "core/math/math_defs.h"
+#include "nav_utils.h"
+#include <KdTree.h>
+
+/**
+	@author AndreaCatania
+*/
+
+class NavRegion;
+class RvoAgent;
+class NavRegion;
+
+class NavMap : public NavRid {
+	/// Map Up
+	Vector3 up = Vector3(0, 1, 0);
+
+	/// To find the polygons edges the vertices are displaced in a grid where
+	/// each cell has the following cell_size.
+	real_t cell_size = 0.3;
+
+	/// This value is used to detect the near edges to connect.
+	real_t edge_connection_margin = 5.0;
+
+	bool regenerate_polygons = true;
+	bool regenerate_links = true;
+
+	std::vector<NavRegion *> regions;
+
+	/// Map polygons
+	std::vector<gd::Polygon> polygons;
+
+	/// Rvo world
+	RVO::KdTree rvo;
+
+	/// Is agent array modified?
+	bool agents_dirty = false;
+
+	/// All the Agents (even the controlled one)
+	std::vector<RvoAgent *> agents;
+
+	/// Controlled agents
+	std::vector<RvoAgent *> controlled_agents;
+
+	/// Physics delta time
+	real_t deltatime = 0.0;
+
+	/// Change the id each time the map is updated.
+	uint32_t map_update_id = 0;
+
+public:
+	NavMap() {}
+
+	void set_up(Vector3 p_up);
+	Vector3 get_up() const {
+		return up;
+	}
+
+	void set_cell_size(float p_cell_size);
+	float get_cell_size() const {
+		return cell_size;
+	}
+
+	void set_edge_connection_margin(float p_edge_connection_margin);
+	float get_edge_connection_margin() const {
+		return edge_connection_margin;
+	}
+
+	gd::PointKey get_point_key(const Vector3 &p_pos) const;
+
+	Vector<Vector3> get_path(Vector3 p_origin, Vector3 p_destination, bool p_optimize) const;
+	Vector3 get_closest_point_to_segment(const Vector3 &p_from, const Vector3 &p_to, const bool p_use_collision) const;
+	Vector3 get_closest_point(const Vector3 &p_point) const;
+	Vector3 get_closest_point_normal(const Vector3 &p_point) const;
+	RID get_closest_point_owner(const Vector3 &p_point) const;
+
+	void add_region(NavRegion *p_region);
+	void remove_region(NavRegion *p_region);
+	const std::vector<NavRegion *> &get_regions() const {
+		return regions;
+	}
+
+	bool has_agent(RvoAgent *agent) const;
+	void add_agent(RvoAgent *agent);
+	void remove_agent(RvoAgent *agent);
+	const std::vector<RvoAgent *> &get_agents() const {
+		return agents;
+	}
+
+	void set_agent_as_controlled(RvoAgent *agent);
+	void remove_agent_as_controlled(RvoAgent *agent);
+
+	uint32_t get_map_update_id() const {
+		return map_update_id;
+	}
+
+	void sync();
+	void step(real_t p_deltatime);
+	void dispatch_callbacks();
+
+private:
+	void compute_single_step(uint32_t index, RvoAgent **agent);
+	void clip_path(const std::vector<gd::NavigationPoly> &p_navigation_polys, Vector<Vector3> &path, const gd::NavigationPoly *from_poly, const Vector3 &p_to_point, const gd::NavigationPoly *p_to_poly) const;
+};
+
+#endif // RVO_SPACE_H
diff --git a/modules/gdnavigation/nav_region.cpp b/modules/gdnavigation/nav_region.cpp
new file mode 100644
index 0000000000..51fba67cc3
--- /dev/null
+++ b/modules/gdnavigation/nav_region.cpp
@@ -0,0 +1,131 @@
+/*************************************************************************/
+/*  nav_region.cpp                                                       */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "nav_region.h"
+
+#include "nav_map.h"
+
+/**
+	@author AndreaCatania
+*/
+
+void NavRegion::set_map(NavMap *p_map) {
+	map = p_map;
+	polygons_dirty = true;
+}
+
+void NavRegion::set_transform(Transform p_transform) {
+	transform = p_transform;
+	polygons_dirty = true;
+}
+
+void NavRegion::set_mesh(Ref<NavigationMesh> p_mesh) {
+	mesh = p_mesh;
+	polygons_dirty = true;
+}
+
+bool NavRegion::sync() {
+	bool something_changed = polygons_dirty /* || something_dirty? */;
+
+	update_polygons();
+
+	return something_changed;
+}
+
+void NavRegion::update_polygons() {
+	if (!polygons_dirty) {
+		return;
+	}
+	polygons.clear();
+	polygons_dirty = false;
+
+	if (map == nullptr) {
+		return;
+	}
+
+	if (mesh.is_null()) {
+		return;
+	}
+
+	Vector<Vector3> vertices = mesh->get_vertices();
+	int len = vertices.size();
+	if (len == 0) {
+		return;
+	}
+
+	const Vector3 *vertices_r = vertices.ptr();
+
+	polygons.resize(mesh->get_polygon_count());
+
+	// Build
+	for (size_t i(0); i < polygons.size(); i++) {
+		gd::Polygon &p = polygons[i];
+		p.owner = this;
+
+		Vector<int> mesh_poly = mesh->get_polygon(i);
+		const int *indices = mesh_poly.ptr();
+		bool valid(true);
+		p.points.resize(mesh_poly.size());
+		p.edges.resize(mesh_poly.size());
+
+		Vector3 center;
+		float sum(0);
+
+		for (int j(0); j < mesh_poly.size(); j++) {
+			int idx = indices[j];
+			if (idx < 0 || idx >= len) {
+				valid = false;
+				break;
+			}
+
+			Vector3 point_position = transform.xform(vertices_r[idx]);
+			p.points[j].pos = point_position;
+			p.points[j].key = map->get_point_key(point_position);
+
+			center += point_position; // Composing the center of the polygon
+
+			if (j >= 2) {
+				Vector3 epa = transform.xform(vertices_r[indices[j - 2]]);
+				Vector3 epb = transform.xform(vertices_r[indices[j - 1]]);
+
+				sum += map->get_up().dot((epb - epa).cross(point_position - epa));
+			}
+		}
+
+		if (!valid) {
+			ERR_BREAK_MSG(!valid, "The navigation mesh set in this region is not valid!");
+		}
+
+		p.clockwise = sum > 0;
+		if (mesh_poly.size() != 0) {
+			p.center = center / float(mesh_poly.size());
+		}
+	}
+}
diff --git a/modules/gdnavigation/nav_region.h b/modules/gdnavigation/nav_region.h
new file mode 100644
index 0000000000..731855bfb5
--- /dev/null
+++ b/modules/gdnavigation/nav_region.h
@@ -0,0 +1,89 @@
+/*************************************************************************/
+/*  nav_region.h                                                         */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef NAV_REGION_H
+#define NAV_REGION_H
+
+#include "nav_rid.h"
+
+#include "nav_utils.h"
+#include "scene/3d/navigation_3d.h"
+#include <vector>
+
+/**
+	@author AndreaCatania
+*/
+
+class NavMap;
+class NavRegion;
+
+class NavRegion : public NavRid {
+	NavMap *map = nullptr;
+	Transform transform;
+	Ref<NavigationMesh> mesh;
+
+	bool polygons_dirty = true;
+
+	/// Cache
+	std::vector<gd::Polygon> polygons;
+
+public:
+	NavRegion() {}
+
+	void scratch_polygons() {
+		polygons_dirty = true;
+	}
+
+	void set_map(NavMap *p_map);
+	NavMap *get_map() const {
+		return map;
+	}
+
+	void set_transform(Transform transform);
+	const Transform &get_transform() const {
+		return transform;
+	}
+
+	void set_mesh(Ref<NavigationMesh> p_mesh);
+	const Ref<NavigationMesh> get_mesh() const {
+		return mesh;
+	}
+
+	std::vector<gd::Polygon> const &get_polygons() const {
+		return polygons;
+	}
+
+	bool sync();
+
+private:
+	void update_polygons();
+};
+
+#endif // NAV_REGION_H
diff --git a/modules/mono/editor/csharp_project.h b/modules/gdnavigation/nav_rid.h
index 515b8d3d62..c119ecc5e0 100644
--- a/modules/mono/editor/csharp_project.h
+++ b/modules/gdnavigation/nav_rid.h
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  csharp_project.h                                                     */
+/*  nav_rid.h                                                            */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,15 +28,21 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef CSHARP_PROJECT_H
-#define CSHARP_PROJECT_H
+#ifndef NAV_RID_H
+#define NAV_RID_H
 
-#include "core/ustring.h"
+#include "core/rid.h"
 
-namespace CSharpProject {
+/**
+	@author AndreaCatania
+*/
 
-void add_item(const String &p_project_path, const String &p_item_type, const String &p_include);
+class NavRid {
+	RID self;
 
-} // namespace CSharpProject
+public:
+	_FORCE_INLINE_ void set_self(const RID &p_self) { self = p_self; }
+	_FORCE_INLINE_ RID get_self() const { return self; }
+};
 
-#endif // CSHARP_PROJECT_H
+#endif // NAV_RID_H
diff --git a/modules/gdnavigation/nav_utils.h b/modules/gdnavigation/nav_utils.h
new file mode 100644
index 0000000000..40e54df553
--- /dev/null
+++ b/modules/gdnavigation/nav_utils.h
@@ -0,0 +1,153 @@
+/*************************************************************************/
+/*  nav_utils.h                                                          */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef NAV_UTILS_H
+#define NAV_UTILS_H
+
+#include "core/math/vector3.h"
+
+#include <vector>
+
+/**
+	@author AndreaCatania
+*/
+
+class NavRegion;
+
+namespace gd {
+struct Polygon;
+
+union PointKey {
+	struct {
+		int64_t x : 21;
+		int64_t y : 22;
+		int64_t z : 21;
+	};
+
+	uint64_t key;
+	bool operator<(const PointKey &p_key) const { return key < p_key.key; }
+};
+
+struct EdgeKey {
+	PointKey a;
+	PointKey b;
+
+	bool operator<(const EdgeKey &p_key) const {
+		return (a.key == p_key.a.key) ? (b.key < p_key.b.key) : (a.key < p_key.a.key);
+	}
+
+	EdgeKey(const PointKey &p_a = PointKey(), const PointKey &p_b = PointKey()) :
+			a(p_a),
+			b(p_b) {
+		if (a.key > b.key) {
+			SWAP(a, b);
+		}
+	}
+};
+
+struct Point {
+	Vector3 pos;
+	PointKey key;
+};
+
+struct Edge {
+	/// This edge ID
+	int this_edge = -1;
+
+	/// Other Polygon
+	Polygon *other_polygon = nullptr;
+
+	/// The other `Polygon` at this edge id has this `Polygon`.
+	int other_edge = -1;
+
+	Edge() {}
+};
+
+struct Polygon {
+	NavRegion *owner;
+
+	/// The points of this `Polygon`
+	std::vector<Point> points;
+
+	/// Are the points clockwise ?
+	bool clockwise;
+
+	/// The edges of this `Polygon`
+	std::vector<Edge> edges;
+
+	/// The center of this `Polygon`
+	Vector3 center;
+};
+
+struct Connection {
+	Polygon *A = nullptr;
+	int A_edge = -1;
+	Polygon *B = nullptr;
+	int B_edge = -1;
+
+	Connection() {}
+};
+
+struct NavigationPoly {
+	uint32_t self_id = 0;
+	/// This poly.
+	const Polygon *poly;
+	/// The previous navigation poly (id in the `navigation_poly` array).
+	int prev_navigation_poly_id = -1;
+	/// The edge id in this `Poly` to reach the `prev_navigation_poly_id`.
+	uint32_t back_navigation_edge = 0;
+	/// The entry location of this poly.
+	Vector3 entry;
+	/// The distance to the destination.
+	float traveled_distance = 0.0;
+
+	NavigationPoly(const Polygon *p_poly) :
+			poly(p_poly) {}
+
+	bool operator==(const NavigationPoly &other) const {
+		return this->poly == other.poly;
+	}
+
+	bool operator!=(const NavigationPoly &other) const {
+		return !operator==(other);
+	}
+};
+
+struct FreeEdge {
+	bool is_free;
+	Polygon *poly;
+	uint32_t edge_id;
+	Vector3 edge_center;
+	Vector3 edge_dir;
+	float edge_len_squared;
+};
+} // namespace gd
+
+#endif // NAV_UTILS_H
diff --git a/modules/recast/navigation_mesh_editor_plugin.cpp b/modules/gdnavigation/navigation_mesh_editor_plugin.cpp
index 6e68dba8ee..648f4f7cdd 100644
--- a/modules/recast/navigation_mesh_editor_plugin.cpp
+++ b/modules/gdnavigation/navigation_mesh_editor_plugin.cpp
@@ -28,28 +28,27 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifdef TOOLS_ENABLED
 #include "navigation_mesh_editor_plugin.h"
 
 #include "core/io/marshalls.h"
 #include "core/io/resource_saver.h"
-#include "scene/3d/mesh_instance.h"
+#include "navigation_mesh_generator.h"
+#include "scene/3d/mesh_instance_3d.h"
 #include "scene/gui/box_container.h"
 
 void NavigationMeshEditor::_node_removed(Node *p_node) {
-
 	if (p_node == node) {
-		node = NULL;
+		node = nullptr;
 
 		hide();
 	}
 }
 
 void NavigationMeshEditor::_notification(int p_option) {
-
 	if (p_option == NOTIFICATION_ENTER_TREE) {
-
-		button_bake->set_icon(get_icon("Bake", "EditorIcons"));
-		button_reset->set_icon(get_icon("Reload", "EditorIcons"));
+		button_bake->set_icon(get_theme_icon("Bake", "EditorIcons"));
+		button_reset->set_icon(get_theme_icon("Reload", "EditorIcons"));
 	}
 }
 
@@ -57,23 +56,22 @@ void NavigationMeshEditor::_bake_pressed() {
 	button_bake->set_pressed(false);
 
 	ERR_FAIL_COND(!node);
-	const String conf_warning = node->get_configuration_warning();
-	if (!conf_warning.empty()) {
-		err_dialog->set_text(conf_warning);
-		err_dialog->popup_centered_minsize();
+	if (!node->get_navigation_mesh().is_valid()) {
+		err_dialog->set_text(TTR("A NavigationMesh resource must be set or created for this node to work."));
+		err_dialog->popup_centered();
 		return;
 	}
 
-	EditorNavigationMeshGenerator::get_singleton()->clear(node->get_navigation_mesh());
-	EditorNavigationMeshGenerator::get_singleton()->bake(node->get_navigation_mesh(), node);
+	NavigationMeshGenerator::get_singleton()->clear(node->get_navigation_mesh());
+	NavigationMeshGenerator::get_singleton()->bake(node->get_navigation_mesh(), node);
 
 	node->update_gizmo();
 }
 
 void NavigationMeshEditor::_clear_pressed() {
-
-	if (node)
-		EditorNavigationMeshGenerator::get_singleton()->clear(node->get_navigation_mesh());
+	if (node) {
+		NavigationMeshGenerator::get_singleton()->clear(node->get_navigation_mesh());
+	}
 
 	button_bake->set_pressed(false);
 	bake_info->set_text("");
@@ -83,73 +81,65 @@ void NavigationMeshEditor::_clear_pressed() {
 	}
 }
 
-void NavigationMeshEditor::edit(NavigationMeshInstance *p_nav_mesh_instance) {
-
-	if (p_nav_mesh_instance == NULL || node == p_nav_mesh_instance) {
+void NavigationMeshEditor::edit(NavigationRegion3D *p_nav_region) {
+	if (p_nav_region == nullptr || node == p_nav_region) {
 		return;
 	}
 
-	node = p_nav_mesh_instance;
+	node = p_nav_region;
 }
 
 void NavigationMeshEditor::_bind_methods() {
-
-	ClassDB::bind_method("_bake_pressed", &NavigationMeshEditor::_bake_pressed);
-	ClassDB::bind_method("_clear_pressed", &NavigationMeshEditor::_clear_pressed);
 }
 
 NavigationMeshEditor::NavigationMeshEditor() {
-
 	bake_hbox = memnew(HBoxContainer);
 
-	button_bake = memnew(ToolButton);
+	button_bake = memnew(Button);
+	button_bake->set_flat(true);
 	bake_hbox->add_child(button_bake);
 	button_bake->set_toggle_mode(true);
 	button_bake->set_text(TTR("Bake NavMesh"));
-	button_bake->connect("pressed", this, "_bake_pressed");
+	button_bake->connect("pressed", callable_mp(this, &NavigationMeshEditor::_bake_pressed));
 
-	button_reset = memnew(ToolButton);
+	button_reset = memnew(Button);
+	button_reset->set_flat(true);
 	bake_hbox->add_child(button_reset);
 	// No button text, we only use a revert icon which is set when entering the tree.
 	button_reset->set_tooltip(TTR("Clear the navigation mesh."));
-	button_reset->connect("pressed", this, "_clear_pressed");
+	button_reset->connect("pressed", callable_mp(this, &NavigationMeshEditor::_clear_pressed));
 
 	bake_info = memnew(Label);
 	bake_hbox->add_child(bake_info);
 
 	err_dialog = memnew(AcceptDialog);
 	add_child(err_dialog);
-	node = NULL;
+	node = nullptr;
 }
 
 NavigationMeshEditor::~NavigationMeshEditor() {
 }
 
 void NavigationMeshEditorPlugin::edit(Object *p_object) {
-
-	navigation_mesh_editor->edit(Object::cast_to<NavigationMeshInstance>(p_object));
+	navigation_mesh_editor->edit(Object::cast_to<NavigationRegion3D>(p_object));
 }
 
 bool NavigationMeshEditorPlugin::handles(Object *p_object) const {
-
-	return p_object->is_class("NavigationMeshInstance");
+	return p_object->is_class("NavigationRegion3D");
 }
 
 void NavigationMeshEditorPlugin::make_visible(bool p_visible) {
-
 	if (p_visible) {
 		navigation_mesh_editor->show();
 		navigation_mesh_editor->bake_hbox->show();
 	} else {
-
 		navigation_mesh_editor->hide();
 		navigation_mesh_editor->bake_hbox->hide();
-		navigation_mesh_editor->edit(NULL);
+		navigation_mesh_editor->edit(nullptr);
 	}
 }
 
 NavigationMeshEditorPlugin::NavigationMeshEditorPlugin(EditorNode *p_node) {
-
 	editor = p_node;
 	navigation_mesh_editor = memnew(NavigationMeshEditor);
 	editor->get_viewport()->add_child(navigation_mesh_editor);
@@ -160,3 +150,5 @@ NavigationMeshEditorPlugin::NavigationMeshEditorPlugin(EditorNode *p_node) {
 
 NavigationMeshEditorPlugin::~NavigationMeshEditorPlugin() {
 }
+
+#endif
diff --git a/modules/recast/navigation_mesh_editor_plugin.h b/modules/gdnavigation/navigation_mesh_editor_plugin.h
index 09c8673b43..f09182fff4 100644
--- a/modules/recast/navigation_mesh_editor_plugin.h
+++ b/modules/gdnavigation/navigation_mesh_editor_plugin.h
@@ -28,12 +28,15 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef NAVIGATION_MESH_GENERATOR_PLUGIN_H
-#define NAVIGATION_MESH_GENERATOR_PLUGIN_H
+#ifndef NAVIGATION_MESH_EDITOR_PLUGIN_H
+#define NAVIGATION_MESH_EDITOR_PLUGIN_H
+
+#ifdef TOOLS_ENABLED
 
 #include "editor/editor_node.h"
 #include "editor/editor_plugin.h"
-#include "navigation_mesh_generator.h"
+
+class NavigationRegion3D;
 
 class NavigationMeshEditor : public Control {
 	friend class NavigationMeshEditorPlugin;
@@ -43,11 +46,11 @@ class NavigationMeshEditor : public Control {
 	AcceptDialog *err_dialog;
 
 	HBoxContainer *bake_hbox;
-	ToolButton *button_bake;
-	ToolButton *button_reset;
+	Button *button_bake;
+	Button *button_reset;
 	Label *bake_info;
 
-	NavigationMeshInstance *node;
+	NavigationRegion3D *node;
 
 	void _bake_pressed();
 	void _clear_pressed();
@@ -58,27 +61,28 @@ protected:
 	void _notification(int p_option);
 
 public:
-	void edit(NavigationMeshInstance *p_nav_mesh_instance);
+	void edit(NavigationRegion3D *p_nav_region);
 	NavigationMeshEditor();
 	~NavigationMeshEditor();
 };
 
 class NavigationMeshEditorPlugin : public EditorPlugin {
-
 	GDCLASS(NavigationMeshEditorPlugin, EditorPlugin);
 
 	NavigationMeshEditor *navigation_mesh_editor;
 	EditorNode *editor;
 
 public:
-	virtual String get_name() const { return "NavigationMesh"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
+	virtual String get_name() const override { return "NavigationMesh"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
 
 	NavigationMeshEditorPlugin(EditorNode *p_node);
 	~NavigationMeshEditorPlugin();
 };
 
-#endif // NAVIGATION_MESH_GENERATOR_PLUGIN_H
+#endif
+
+#endif
diff --git a/modules/recast/navigation_mesh_generator.cpp b/modules/gdnavigation/navigation_mesh_generator.cpp
index c67136b814..5329600e39 100644
--- a/modules/recast/navigation_mesh_generator.cpp
+++ b/modules/gdnavigation/navigation_mesh_generator.cpp
@@ -28,47 +28,55 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef _3D_DISABLED
+
 #include "navigation_mesh_generator.h"
+
 #include "core/math/quick_hull.h"
 #include "core/os/thread.h"
-#include "editor/editor_settings.h"
-#include "scene/3d/collision_shape.h"
-#include "scene/3d/mesh_instance.h"
-#include "scene/3d/physics_body.h"
-#include "scene/resources/box_shape.h"
-#include "scene/resources/capsule_shape.h"
-#include "scene/resources/concave_polygon_shape.h"
-#include "scene/resources/convex_polygon_shape.h"
-#include "scene/resources/cylinder_shape.h"
-#include "scene/resources/plane_shape.h"
+#include "scene/3d/collision_shape_3d.h"
+#include "scene/3d/mesh_instance_3d.h"
+#include "scene/3d/physics_body_3d.h"
+#include "scene/resources/box_shape_3d.h"
+#include "scene/resources/capsule_shape_3d.h"
+#include "scene/resources/concave_polygon_shape_3d.h"
+#include "scene/resources/convex_polygon_shape_3d.h"
+#include "scene/resources/cylinder_shape_3d.h"
 #include "scene/resources/primitive_meshes.h"
-#include "scene/resources/shape.h"
-#include "scene/resources/sphere_shape.h"
+#include "scene/resources/shape_3d.h"
+#include "scene/resources/sphere_shape_3d.h"
+#include "scene/resources/world_margin_shape_3d.h"
+
+#include "modules/modules_enabled.gen.h"
+#ifdef TOOLS_ENABLED
+#include "editor/editor_node.h"
+#include "editor/editor_settings.h"
+#endif
 
 #ifdef MODULE_CSG_ENABLED
 #include "modules/csg/csg_shape.h"
 #endif
-
 #ifdef MODULE_GRIDMAP_ENABLED
 #include "modules/gridmap/grid_map.h"
 #endif
 
-EditorNavigationMeshGenerator *EditorNavigationMeshGenerator::singleton = NULL;
+NavigationMeshGenerator *NavigationMeshGenerator::singleton = nullptr;
 
-void EditorNavigationMeshGenerator::_add_vertex(const Vector3 &p_vec3, Vector<float> &p_verticies) {
+void NavigationMeshGenerator::_add_vertex(const Vector3 &p_vec3, Vector<float> &p_verticies) {
 	p_verticies.push_back(p_vec3.x);
 	p_verticies.push_back(p_vec3.y);
 	p_verticies.push_back(p_vec3.z);
 }
 
-void EditorNavigationMeshGenerator::_add_mesh(const Ref<Mesh> &p_mesh, const Transform &p_xform, Vector<float> &p_verticies, Vector<int> &p_indices) {
+void NavigationMeshGenerator::_add_mesh(const Ref<Mesh> &p_mesh, const Transform &p_xform, Vector<float> &p_verticies, Vector<int> &p_indices) {
 	int current_vertex_count;
 
 	for (int i = 0; i < p_mesh->get_surface_count(); i++) {
 		current_vertex_count = p_verticies.size() / 3;
 
-		if (p_mesh->surface_get_primitive_type(i) != Mesh::PRIMITIVE_TRIANGLES)
+		if (p_mesh->surface_get_primitive_type(i) != Mesh::PRIMITIVE_TRIANGLES) {
 			continue;
+		}
 
 		int index_count = 0;
 		if (p_mesh->surface_get_format(i) & Mesh::ARRAY_FORMAT_INDEX) {
@@ -83,13 +91,12 @@ void EditorNavigationMeshGenerator::_add_mesh(const Ref<Mesh> &p_mesh, const Tra
 
 		Array a = p_mesh->surface_get_arrays(i);
 
-		PoolVector<Vector3> mesh_vertices = a[Mesh::ARRAY_VERTEX];
-		PoolVector<Vector3>::Read vr = mesh_vertices.read();
+		Vector<Vector3> mesh_vertices = a[Mesh::ARRAY_VERTEX];
+		const Vector3 *vr = mesh_vertices.ptr();
 
 		if (p_mesh->surface_get_format(i) & Mesh::ARRAY_FORMAT_INDEX) {
-
-			PoolVector<int> mesh_indices = a[Mesh::ARRAY_INDEX];
-			PoolVector<int>::Read ir = mesh_indices.read();
+			Vector<int> mesh_indices = a[Mesh::ARRAY_INDEX];
+			const int *ir = mesh_indices.ptr();
 
 			for (int j = 0; j < mesh_vertices.size(); j++) {
 				_add_vertex(p_xform.xform(vr[j]), p_verticies);
@@ -116,7 +123,7 @@ void EditorNavigationMeshGenerator::_add_mesh(const Ref<Mesh> &p_mesh, const Tra
 	}
 }
 
-void EditorNavigationMeshGenerator::_add_faces(const PoolVector3Array &p_faces, const Transform &p_xform, Vector<float> &p_verticies, Vector<int> &p_indices) {
+void NavigationMeshGenerator::_add_faces(const PackedVector3Array &p_faces, const Transform &p_xform, Vector<float> &p_verticies, Vector<int> &p_indices) {
 	int face_count = p_faces.size() / 3;
 	int current_vertex_count = p_verticies.size() / 3;
 
@@ -131,11 +138,9 @@ void EditorNavigationMeshGenerator::_add_faces(const PoolVector3Array &p_faces,
 	}
 }
 
-void EditorNavigationMeshGenerator::_parse_geometry(Transform p_accumulated_transform, Node *p_node, Vector<float> &p_verticies, Vector<int> &p_indices, int p_generate_from, uint32_t p_collision_mask, bool p_recurse_children) {
-
-	if (Object::cast_to<MeshInstance>(p_node) && p_generate_from != NavigationMesh::PARSED_GEOMETRY_STATIC_COLLIDERS) {
-
-		MeshInstance *mesh_instance = Object::cast_to<MeshInstance>(p_node);
+void NavigationMeshGenerator::_parse_geometry(Transform p_accumulated_transform, Node *p_node, Vector<float> &p_verticies, Vector<int> &p_indices, int p_generate_from, uint32_t p_collision_mask, bool p_recurse_children) {
+	if (Object::cast_to<MeshInstance3D>(p_node) && p_generate_from != NavigationMesh::PARSED_GEOMETRY_STATIC_COLLIDERS) {
+		MeshInstance3D *mesh_instance = Object::cast_to<MeshInstance3D>(p_node);
 		Ref<Mesh> mesh = mesh_instance->get_mesh();
 		if (mesh.is_valid()) {
 			_add_mesh(mesh, p_accumulated_transform * mesh_instance->get_transform(), p_verticies, p_indices);
@@ -143,9 +148,8 @@ void EditorNavigationMeshGenerator::_parse_geometry(Transform p_accumulated_tran
 	}
 
 #ifdef MODULE_CSG_ENABLED
-	if (Object::cast_to<CSGShape>(p_node) && p_generate_from != NavigationMesh::PARSED_GEOMETRY_STATIC_COLLIDERS) {
-
-		CSGShape *csg_shape = Object::cast_to<CSGShape>(p_node);
+	if (Object::cast_to<CSGShape3D>(p_node) && p_generate_from != NavigationMesh::PARSED_GEOMETRY_STATIC_COLLIDERS) {
+		CSGShape3D *csg_shape = Object::cast_to<CSGShape3D>(p_node);
 		Array meshes = csg_shape->get_meshes();
 		if (!meshes.empty()) {
 			Ref<Mesh> mesh = meshes[1];
@@ -156,22 +160,21 @@ void EditorNavigationMeshGenerator::_parse_geometry(Transform p_accumulated_tran
 	}
 #endif
 
-	if (Object::cast_to<StaticBody>(p_node) && p_generate_from != NavigationMesh::PARSED_GEOMETRY_MESH_INSTANCES) {
-		StaticBody *static_body = Object::cast_to<StaticBody>(p_node);
+	if (Object::cast_to<StaticBody3D>(p_node) && p_generate_from != NavigationMesh::PARSED_GEOMETRY_MESH_INSTANCES) {
+		StaticBody3D *static_body = Object::cast_to<StaticBody3D>(p_node);
 
 		if (static_body->get_collision_layer() & p_collision_mask) {
-
 			for (int i = 0; i < p_node->get_child_count(); ++i) {
 				Node *child = p_node->get_child(i);
-				if (Object::cast_to<CollisionShape>(child)) {
-					CollisionShape *col_shape = Object::cast_to<CollisionShape>(child);
+				if (Object::cast_to<CollisionShape3D>(child)) {
+					CollisionShape3D *col_shape = Object::cast_to<CollisionShape3D>(child);
 
 					Transform transform = p_accumulated_transform * static_body->get_transform() * col_shape->get_transform();
 
 					Ref<Mesh> mesh;
-					Ref<Shape> s = col_shape->get_shape();
+					Ref<Shape3D> s = col_shape->get_shape();
 
-					BoxShape *box = Object::cast_to<BoxShape>(*s);
+					BoxShape3D *box = Object::cast_to<BoxShape3D>(*s);
 					if (box) {
 						Ref<CubeMesh> cube_mesh;
 						cube_mesh.instance();
@@ -179,7 +182,7 @@ void EditorNavigationMeshGenerator::_parse_geometry(Transform p_accumulated_tran
 						mesh = cube_mesh;
 					}
 
-					CapsuleShape *capsule = Object::cast_to<CapsuleShape>(*s);
+					CapsuleShape3D *capsule = Object::cast_to<CapsuleShape3D>(*s);
 					if (capsule) {
 						Ref<CapsuleMesh> capsule_mesh;
 						capsule_mesh.instance();
@@ -188,7 +191,7 @@ void EditorNavigationMeshGenerator::_parse_geometry(Transform p_accumulated_tran
 						mesh = capsule_mesh;
 					}
 
-					CylinderShape *cylinder = Object::cast_to<CylinderShape>(*s);
+					CylinderShape3D *cylinder = Object::cast_to<CylinderShape3D>(*s);
 					if (cylinder) {
 						Ref<CylinderMesh> cylinder_mesh;
 						cylinder_mesh.instance();
@@ -198,7 +201,7 @@ void EditorNavigationMeshGenerator::_parse_geometry(Transform p_accumulated_tran
 						mesh = cylinder_mesh;
 					}
 
-					SphereShape *sphere = Object::cast_to<SphereShape>(*s);
+					SphereShape3D *sphere = Object::cast_to<SphereShape3D>(*s);
 					if (sphere) {
 						Ref<SphereMesh> sphere_mesh;
 						sphere_mesh.instance();
@@ -207,23 +210,23 @@ void EditorNavigationMeshGenerator::_parse_geometry(Transform p_accumulated_tran
 						mesh = sphere_mesh;
 					}
 
-					ConcavePolygonShape *concave_polygon = Object::cast_to<ConcavePolygonShape>(*s);
+					ConcavePolygonShape3D *concave_polygon = Object::cast_to<ConcavePolygonShape3D>(*s);
 					if (concave_polygon) {
 						_add_faces(concave_polygon->get_faces(), transform, p_verticies, p_indices);
 					}
 
-					ConvexPolygonShape *convex_polygon = Object::cast_to<ConvexPolygonShape>(*s);
+					ConvexPolygonShape3D *convex_polygon = Object::cast_to<ConvexPolygonShape3D>(*s);
 					if (convex_polygon) {
 						Vector<Vector3> varr = Variant(convex_polygon->get_points());
-						Geometry::MeshData md;
+						Geometry3D::MeshData md;
 
 						Error err = QuickHull::build(varr, md);
 
 						if (err == OK) {
-							PoolVector3Array faces;
+							PackedVector3Array faces;
 
 							for (int j = 0; j < md.faces.size(); ++j) {
-								Geometry::MeshData::Face face = md.faces[j];
+								Geometry3D::MeshData::Face face = md.faces[j];
 
 								for (int k = 2; k < face.indices.size(); ++k) {
 									faces.push_back(md.vertices[face.indices[0]]);
@@ -258,8 +261,8 @@ void EditorNavigationMeshGenerator::_parse_geometry(Transform p_accumulated_tran
 	}
 #endif
 
-	if (Object::cast_to<Spatial>(p_node)) {
-		Spatial *spatial = Object::cast_to<Spatial>(p_node);
+	if (Object::cast_to<Node3D>(p_node)) {
+		Node3D *spatial = Object::cast_to<Node3D>(p_node);
 		p_accumulated_transform = p_accumulated_transform * spatial->get_transform();
 	}
 
@@ -270,13 +273,12 @@ void EditorNavigationMeshGenerator::_parse_geometry(Transform p_accumulated_tran
 	}
 }
 
-void EditorNavigationMeshGenerator::_convert_detail_mesh_to_native_navigation_mesh(const rcPolyMeshDetail *p_detail_mesh, Ref<NavigationMesh> p_nav_mesh) {
-
-	PoolVector<Vector3> nav_vertices;
+void NavigationMeshGenerator::_convert_detail_mesh_to_native_navigation_mesh(const rcPolyMeshDetail *p_detail_mesh, Ref<NavigationMesh> p_nav_mesh) {
+	Vector<Vector3> nav_vertices;
 
 	for (int i = 0; i < p_detail_mesh->nverts; i++) {
 		const float *v = &p_detail_mesh->verts[i * 3];
-		nav_vertices.append(Vector3(v[0], v[1], v[2]));
+		nav_vertices.push_back(Vector3(v[0], v[1], v[2]));
 	}
 	p_nav_mesh->set_vertices(nav_vertices);
 
@@ -298,11 +300,25 @@ void EditorNavigationMeshGenerator::_convert_detail_mesh_to_native_navigation_me
 	}
 }
 
-void EditorNavigationMeshGenerator::_build_recast_navigation_mesh(Ref<NavigationMesh> p_nav_mesh, EditorProgress *ep,
-		rcHeightfield *hf, rcCompactHeightfield *chf, rcContourSet *cset, rcPolyMesh *poly_mesh, rcPolyMeshDetail *detail_mesh,
-		Vector<float> &vertices, Vector<int> &indices) {
+void NavigationMeshGenerator::_build_recast_navigation_mesh(
+		Ref<NavigationMesh> p_nav_mesh,
+#ifdef TOOLS_ENABLED
+		EditorProgress *ep,
+#endif
+		rcHeightfield *hf,
+		rcCompactHeightfield *chf,
+		rcContourSet *cset,
+		rcPolyMesh *poly_mesh,
+		rcPolyMeshDetail *detail_mesh,
+		Vector<float> &vertices,
+		Vector<int> &indices) {
 	rcContext ctx;
-	ep->step(TTR("Setting up Configuration..."), 1);
+
+#ifdef TOOLS_ENABLED
+	if (ep) {
+		ep->step(TTR("Setting up Configuration..."), 1);
+	}
+#endif
 
 	const float *verts = vertices.ptr();
 	const int nverts = vertices.size() / 3;
@@ -336,16 +352,28 @@ void EditorNavigationMeshGenerator::_build_recast_navigation_mesh(Ref<Navigation
 	cfg.bmax[1] = bmax[1];
 	cfg.bmax[2] = bmax[2];
 
-	ep->step(TTR("Calculating grid size..."), 2);
+#ifdef TOOLS_ENABLED
+	if (ep) {
+		ep->step(TTR("Calculating grid size..."), 2);
+	}
+#endif
 	rcCalcGridSize(cfg.bmin, cfg.bmax, cfg.cs, &cfg.width, &cfg.height);
 
-	ep->step(TTR("Creating heightfield..."), 3);
+#ifdef TOOLS_ENABLED
+	if (ep) {
+		ep->step(TTR("Creating heightfield..."), 3);
+	}
+#endif
 	hf = rcAllocHeightfield();
 
 	ERR_FAIL_COND(!hf);
 	ERR_FAIL_COND(!rcCreateHeightfield(&ctx, *hf, cfg.width, cfg.height, cfg.bmin, cfg.bmax, cfg.cs, cfg.ch));
 
-	ep->step(TTR("Marking walkable triangles..."), 4);
+#ifdef TOOLS_ENABLED
+	if (ep) {
+		ep->step(TTR("Marking walkable triangles..."), 4);
+	}
+#endif
 	{
 		Vector<unsigned char> tri_areas;
 		tri_areas.resize(ntris);
@@ -358,14 +386,21 @@ void EditorNavigationMeshGenerator::_build_recast_navigation_mesh(Ref<Navigation
 		ERR_FAIL_COND(!rcRasterizeTriangles(&ctx, verts, nverts, tris, tri_areas.ptr(), ntris, *hf, cfg.walkableClimb));
 	}
 
-	if (p_nav_mesh->get_filter_low_hanging_obstacles())
+	if (p_nav_mesh->get_filter_low_hanging_obstacles()) {
 		rcFilterLowHangingWalkableObstacles(&ctx, cfg.walkableClimb, *hf);
-	if (p_nav_mesh->get_filter_ledge_spans())
+	}
+	if (p_nav_mesh->get_filter_ledge_spans()) {
 		rcFilterLedgeSpans(&ctx, cfg.walkableHeight, cfg.walkableClimb, *hf);
-	if (p_nav_mesh->get_filter_walkable_low_height_spans())
+	}
+	if (p_nav_mesh->get_filter_walkable_low_height_spans()) {
 		rcFilterWalkableLowHeightSpans(&ctx, cfg.walkableHeight, *hf);
+	}
 
-	ep->step(TTR("Constructing compact heightfield..."), 5);
+#ifdef TOOLS_ENABLED
+	if (ep) {
+		ep->step(TTR("Constructing compact heightfield..."), 5);
+	}
+#endif
 
 	chf = rcAllocCompactHeightfield();
 
@@ -373,12 +408,22 @@ void EditorNavigationMeshGenerator::_build_recast_navigation_mesh(Ref<Navigation
 	ERR_FAIL_COND(!rcBuildCompactHeightfield(&ctx, cfg.walkableHeight, cfg.walkableClimb, *hf, *chf));
 
 	rcFreeHeightField(hf);
-	hf = 0;
+	hf = nullptr;
+
+#ifdef TOOLS_ENABLED
+	if (ep) {
+		ep->step(TTR("Eroding walkable area..."), 6);
+	}
+#endif
 
-	ep->step(TTR("Eroding walkable area..."), 6);
 	ERR_FAIL_COND(!rcErodeWalkableArea(&ctx, cfg.walkableRadius, *chf));
 
-	ep->step(TTR("Partitioning..."), 7);
+#ifdef TOOLS_ENABLED
+	if (ep) {
+		ep->step(TTR("Partitioning..."), 7);
+	}
+#endif
+
 	if (p_nav_mesh->get_sample_partition_type() == NavigationMesh::SAMPLE_PARTITION_WATERSHED) {
 		ERR_FAIL_COND(!rcBuildDistanceField(&ctx, *chf));
 		ERR_FAIL_COND(!rcBuildRegions(&ctx, *chf, 0, cfg.minRegionArea, cfg.mergeRegionArea));
@@ -388,14 +433,22 @@ void EditorNavigationMeshGenerator::_build_recast_navigation_mesh(Ref<Navigation
 		ERR_FAIL_COND(!rcBuildLayerRegions(&ctx, *chf, 0, cfg.minRegionArea));
 	}
 
-	ep->step(TTR("Creating contours..."), 8);
+#ifdef TOOLS_ENABLED
+	if (ep) {
+		ep->step(TTR("Creating contours..."), 8);
+	}
+#endif
 
 	cset = rcAllocContourSet();
 
 	ERR_FAIL_COND(!cset);
 	ERR_FAIL_COND(!rcBuildContours(&ctx, *chf, cfg.maxSimplificationError, cfg.maxEdgeLen, *cset));
 
-	ep->step(TTR("Creating polymesh..."), 9);
+#ifdef TOOLS_ENABLED
+	if (ep) {
+		ep->step(TTR("Creating polymesh..."), 9);
+	}
+#endif
 
 	poly_mesh = rcAllocPolyMesh();
 	ERR_FAIL_COND(!poly_mesh);
@@ -406,37 +459,48 @@ void EditorNavigationMeshGenerator::_build_recast_navigation_mesh(Ref<Navigation
 	ERR_FAIL_COND(!rcBuildPolyMeshDetail(&ctx, *poly_mesh, *chf, cfg.detailSampleDist, cfg.detailSampleMaxError, *detail_mesh));
 
 	rcFreeCompactHeightfield(chf);
-	chf = 0;
+	chf = nullptr;
 	rcFreeContourSet(cset);
-	cset = 0;
+	cset = nullptr;
 
-	ep->step(TTR("Converting to native navigation mesh..."), 10);
+#ifdef TOOLS_ENABLED
+	if (ep) {
+		ep->step(TTR("Converting to native navigation mesh..."), 10);
+	}
+#endif
 
 	_convert_detail_mesh_to_native_navigation_mesh(detail_mesh, p_nav_mesh);
 
 	rcFreePolyMesh(poly_mesh);
-	poly_mesh = 0;
+	poly_mesh = nullptr;
 	rcFreePolyMeshDetail(detail_mesh);
-	detail_mesh = 0;
+	detail_mesh = nullptr;
 }
 
-EditorNavigationMeshGenerator *EditorNavigationMeshGenerator::get_singleton() {
+NavigationMeshGenerator *NavigationMeshGenerator::get_singleton() {
 	return singleton;
 }
 
-EditorNavigationMeshGenerator::EditorNavigationMeshGenerator() {
+NavigationMeshGenerator::NavigationMeshGenerator() {
 	singleton = this;
 }
 
-EditorNavigationMeshGenerator::~EditorNavigationMeshGenerator() {
+NavigationMeshGenerator::~NavigationMeshGenerator() {
 }
 
-void EditorNavigationMeshGenerator::bake(Ref<NavigationMesh> p_nav_mesh, Node *p_node) {
-
+void NavigationMeshGenerator::bake(Ref<NavigationMesh> p_nav_mesh, Node *p_node) {
 	ERR_FAIL_COND(!p_nav_mesh.is_valid());
 
-	EditorProgress ep("bake", TTR("Navigation Mesh Generator Setup:"), 11);
-	ep.step(TTR("Parsing Geometry..."), 0);
+#ifdef TOOLS_ENABLED
+	EditorProgress *ep(nullptr);
+	if (Engine::get_singleton()->is_editor_hint()) {
+		ep = memnew(EditorProgress("bake", TTR("Navigation Mesh Generator Setup:"), 11));
+	}
+
+	if (ep) {
+		ep->step(TTR("Parsing Geometry..."), 0);
+	}
+#endif
 
 	Vector<float> vertices;
 	Vector<int> indices;
@@ -449,7 +513,7 @@ void EditorNavigationMeshGenerator::bake(Ref<NavigationMesh> p_nav_mesh, Node *p
 		p_node->get_tree()->get_nodes_in_group(p_nav_mesh->get_source_group_name(), &parse_nodes);
 	}
 
-	Transform navmesh_xform = Object::cast_to<Spatial>(p_node)->get_transform().affine_inverse();
+	Transform navmesh_xform = Object::cast_to<Node3D>(p_node)->get_transform().affine_inverse();
 	for (const List<Node *>::Element *E = parse_nodes.front(); E; E = E->next()) {
 		int geometry_type = p_nav_mesh->get_parsed_geometry_type();
 		uint32_t collision_mask = p_nav_mesh->get_collision_mask();
@@ -458,41 +522,62 @@ void EditorNavigationMeshGenerator::bake(Ref<NavigationMesh> p_nav_mesh, Node *p
 	}
 
 	if (vertices.size() > 0 && indices.size() > 0) {
-
-		rcHeightfield *hf = NULL;
-		rcCompactHeightfield *chf = NULL;
-		rcContourSet *cset = NULL;
-		rcPolyMesh *poly_mesh = NULL;
-		rcPolyMeshDetail *detail_mesh = NULL;
-
-		_build_recast_navigation_mesh(p_nav_mesh, &ep, hf, chf, cset, poly_mesh, detail_mesh, vertices, indices);
+		rcHeightfield *hf = nullptr;
+		rcCompactHeightfield *chf = nullptr;
+		rcContourSet *cset = nullptr;
+		rcPolyMesh *poly_mesh = nullptr;
+		rcPolyMeshDetail *detail_mesh = nullptr;
+
+		_build_recast_navigation_mesh(
+				p_nav_mesh,
+#ifdef TOOLS_ENABLED
+				ep,
+#endif
+				hf,
+				chf,
+				cset,
+				poly_mesh,
+				detail_mesh,
+				vertices,
+				indices);
 
 		rcFreeHeightField(hf);
-		hf = 0;
+		hf = nullptr;
 
 		rcFreeCompactHeightfield(chf);
-		chf = 0;
+		chf = nullptr;
 
 		rcFreeContourSet(cset);
-		cset = 0;
+		cset = nullptr;
 
 		rcFreePolyMesh(poly_mesh);
-		poly_mesh = 0;
+		poly_mesh = nullptr;
 
 		rcFreePolyMeshDetail(detail_mesh);
-		detail_mesh = 0;
+		detail_mesh = nullptr;
 	}
-	ep.step(TTR("Done!"), 11);
+
+#ifdef TOOLS_ENABLED
+	if (ep) {
+		ep->step(TTR("Done!"), 11);
+	}
+
+	if (ep) {
+		memdelete(ep);
+	}
+#endif
 }
 
-void EditorNavigationMeshGenerator::clear(Ref<NavigationMesh> p_nav_mesh) {
+void NavigationMeshGenerator::clear(Ref<NavigationMesh> p_nav_mesh) {
 	if (p_nav_mesh.is_valid()) {
 		p_nav_mesh->clear_polygons();
-		p_nav_mesh->set_vertices(PoolVector<Vector3>());
+		p_nav_mesh->set_vertices(Vector<Vector3>());
 	}
 }
 
-void EditorNavigationMeshGenerator::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("bake", "nav_mesh", "root_node"), &EditorNavigationMeshGenerator::bake);
-	ClassDB::bind_method(D_METHOD("clear", "nav_mesh"), &EditorNavigationMeshGenerator::clear);
+void NavigationMeshGenerator::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("bake", "nav_mesh", "root_node"), &NavigationMeshGenerator::bake);
+	ClassDB::bind_method(D_METHOD("clear", "nav_mesh"), &NavigationMeshGenerator::clear);
 }
+
+#endif
diff --git a/modules/recast/navigation_mesh_generator.h b/modules/gdnavigation/navigation_mesh_generator.h
index 8c7ca8b62c..c5f7b2ab81 100644
--- a/modules/recast/navigation_mesh_generator.h
+++ b/modules/gdnavigation/navigation_mesh_generator.h
@@ -31,37 +31,53 @@
 #ifndef NAVIGATION_MESH_GENERATOR_H
 #define NAVIGATION_MESH_GENERATOR_H
 
-#include "editor/editor_node.h"
-#include "scene/3d/navigation_mesh.h"
+#ifndef _3D_DISABLED
+
+#include "scene/3d/navigation_region_3d.h"
 
 #include <Recast.h>
 
-class EditorNavigationMeshGenerator : public Object {
-	GDCLASS(EditorNavigationMeshGenerator, Object);
+#ifdef TOOLS_ENABLED
+struct EditorProgress;
+#endif
+
+class NavigationMeshGenerator : public Object {
+	GDCLASS(NavigationMeshGenerator, Object);
 
-	static EditorNavigationMeshGenerator *singleton;
+	static NavigationMeshGenerator *singleton;
 
 protected:
 	static void _bind_methods();
 
 	static void _add_vertex(const Vector3 &p_vec3, Vector<float> &p_verticies);
 	static void _add_mesh(const Ref<Mesh> &p_mesh, const Transform &p_xform, Vector<float> &p_verticies, Vector<int> &p_indices);
-	static void _add_faces(const PoolVector3Array &p_faces, const Transform &p_xform, Vector<float> &p_verticies, Vector<int> &p_indices);
+	static void _add_faces(const PackedVector3Array &p_faces, const Transform &p_xform, Vector<float> &p_verticies, Vector<int> &p_indices);
 	static void _parse_geometry(Transform p_accumulated_transform, Node *p_node, Vector<float> &p_verticies, Vector<int> &p_indices, int p_generate_from, uint32_t p_collision_mask, bool p_recurse_children);
 
 	static void _convert_detail_mesh_to_native_navigation_mesh(const rcPolyMeshDetail *p_detail_mesh, Ref<NavigationMesh> p_nav_mesh);
-	static void _build_recast_navigation_mesh(Ref<NavigationMesh> p_nav_mesh, EditorProgress *ep,
-			rcHeightfield *hf, rcCompactHeightfield *chf, rcContourSet *cset, rcPolyMesh *poly_mesh,
-			rcPolyMeshDetail *detail_mesh, Vector<float> &vertices, Vector<int> &indices);
+	static void _build_recast_navigation_mesh(
+			Ref<NavigationMesh> p_nav_mesh,
+#ifdef TOOLS_ENABLED
+			EditorProgress *ep,
+#endif
+			rcHeightfield *hf,
+			rcCompactHeightfield *chf,
+			rcContourSet *cset,
+			rcPolyMesh *poly_mesh,
+			rcPolyMeshDetail *detail_mesh,
+			Vector<float> &vertices,
+			Vector<int> &indices);
 
 public:
-	static EditorNavigationMeshGenerator *get_singleton();
+	static NavigationMeshGenerator *get_singleton();
 
-	EditorNavigationMeshGenerator();
-	~EditorNavigationMeshGenerator();
+	NavigationMeshGenerator();
+	~NavigationMeshGenerator();
 
 	void bake(Ref<NavigationMesh> p_nav_mesh, Node *p_node);
 	void clear(Ref<NavigationMesh> p_nav_mesh);
 };
 
+#endif
+
 #endif // NAVIGATION_MESH_GENERATOR_H
diff --git a/modules/recast/register_types.cpp b/modules/gdnavigation/register_types.cpp
index ea0ab00771..088b26bf17 100644
--- a/modules/recast/register_types.cpp
+++ b/modules/gdnavigation/register_types.cpp
@@ -30,30 +30,51 @@
 
 #include "register_types.h"
 
-#include "navigation_mesh_editor_plugin.h"
+#include "core/engine.h"
+#include "gd_navigation_server.h"
+#include "servers/navigation_server_3d.h"
 
-#ifdef TOOLS_ENABLED
-EditorNavigationMeshGenerator *_nav_mesh_generator = NULL;
+#ifndef _3D_DISABLED
+#include "navigation_mesh_generator.h"
 #endif
 
-void register_recast_types() {
 #ifdef TOOLS_ENABLED
-	ClassDB::APIType prev_api = ClassDB::get_current_api();
-	ClassDB::set_current_api(ClassDB::API_EDITOR);
+#include "navigation_mesh_editor_plugin.h"
+#endif
 
-	EditorPlugins::add_by_type<NavigationMeshEditorPlugin>();
-	_nav_mesh_generator = memnew(EditorNavigationMeshGenerator);
+/**
+	@author AndreaCatania
+*/
 
-	ClassDB::register_class<EditorNavigationMeshGenerator>();
+#ifndef _3D_DISABLED
+NavigationMeshGenerator *_nav_mesh_generator = nullptr;
+#endif
+
+NavigationServer3D *new_server() {
+	return memnew(GdNavigationServer);
+}
 
-	Engine::get_singleton()->add_singleton(Engine::Singleton("NavigationMeshGenerator", EditorNavigationMeshGenerator::get_singleton()));
+void register_gdnavigation_types() {
+	NavigationServer3DManager::set_default_server(new_server);
+
+#ifndef _3D_DISABLED
+	_nav_mesh_generator = memnew(NavigationMeshGenerator);
+	ClassDB::register_class<NavigationMeshGenerator>();
+	Engine::get_singleton()->add_singleton(Engine::Singleton("NavigationMeshGenerator", NavigationMeshGenerator::get_singleton()));
+#endif
+
+#ifdef TOOLS_ENABLED
+	EditorPlugins::add_by_type<NavigationMeshEditorPlugin>();
+
+	ClassDB::APIType prev_api = ClassDB::get_current_api();
+	ClassDB::set_current_api(ClassDB::API_EDITOR);
 
 	ClassDB::set_current_api(prev_api);
 #endif
 }
 
-void unregister_recast_types() {
-#ifdef TOOLS_ENABLED
+void unregister_gdnavigation_types() {
+#ifndef _3D_DISABLED
 	if (_nav_mesh_generator) {
 		memdelete(_nav_mesh_generator);
 	}
diff --git a/modules/gdnavigation/register_types.h b/modules/gdnavigation/register_types.h
new file mode 100644
index 0000000000..cdbff1b937
--- /dev/null
+++ b/modules/gdnavigation/register_types.h
@@ -0,0 +1,41 @@
+/*************************************************************************/
+/*  register_types.h                                                     */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+/**
+	@author AndreaCatania
+*/
+
+#ifndef GDNAVIGATION_REGISTER_TYPES_H
+#define GDNAVIGATION_REGISTER_TYPES_H
+
+void register_gdnavigation_types();
+void unregister_gdnavigation_types();
+
+#endif // GDNAVIGATION_REGISTER_TYPES_H
diff --git a/modules/mono/editor/csharp_project.cpp b/modules/gdnavigation/rvo_agent.cpp
index 872f45ba91..1e1bdbd07d 100644
--- a/modules/mono/editor/csharp_project.cpp
+++ b/modules/gdnavigation/rvo_agent.cpp
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  csharp_project.cpp                                                   */
+/*  rvo_agent.cpp                                                        */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,42 +28,56 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "csharp_project.h"
+#include "rvo_agent.h"
 
-#include "core/io/json.h"
-#include "core/os/dir_access.h"
-#include "core/os/file_access.h"
-#include "core/os/os.h"
-#include "core/project_settings.h"
+#include "nav_map.h"
 
-#include "../csharp_script.h"
-#include "../mono_gd/gd_mono_class.h"
-#include "../mono_gd/gd_mono_marshal.h"
-#include "../utils/string_utils.h"
-#include "script_class_parser.h"
+/**
+	@author AndreaCatania
+*/
 
-namespace CSharpProject {
-
-void add_item(const String &p_project_path, const String &p_item_type, const String &p_include) {
+RvoAgent::RvoAgent() {
+	callback.id = ObjectID();
+}
 
-	if (!GLOBAL_DEF("mono/project/auto_update_project", true))
-		return;
+void RvoAgent::set_map(NavMap *p_map) {
+	map = p_map;
+}
 
-	GDMonoAssembly *tools_project_editor_assembly = GDMono::get_singleton()->get_tools_project_editor_assembly();
+bool RvoAgent::is_map_changed() {
+	if (map) {
+		bool is_changed = map->get_map_update_id() != map_update_id;
+		map_update_id = map->get_map_update_id();
+		return is_changed;
+	} else {
+		return false;
+	}
+}
 
-	GDMonoClass *klass = tools_project_editor_assembly->get_class("GodotTools.ProjectEditor", "ProjectUtils");
+void RvoAgent::set_callback(ObjectID p_id, const StringName p_method, const Variant p_udata) {
+	callback.id = p_id;
+	callback.method = p_method;
+	callback.udata = p_udata;
+}
 
-	Variant project_path = p_project_path;
-	Variant item_type = p_item_type;
-	Variant include = p_include;
-	const Variant *args[3] = { &project_path, &item_type, &include };
-	MonoException *exc = NULL;
-	klass->get_method("AddItemToProjectChecked", 3)->invoke(NULL, args, &exc);
+bool RvoAgent::has_callback() const {
+	return callback.id.is_valid();
+}
 
-	if (exc) {
-		GDMonoUtils::debug_print_unhandled_exception(exc);
-		ERR_FAIL();
+void RvoAgent::dispatch_callback() {
+	if (callback.id.is_null()) {
+		return;
+	}
+	Object *obj = ObjectDB::get_instance(callback.id);
+	if (obj == nullptr) {
+		callback.id = ObjectID();
 	}
-}
 
-} // namespace CSharpProject
+	Callable::CallError responseCallError;
+
+	callback.new_velocity = Vector3(agent.newVelocity_.x(), agent.newVelocity_.y(), agent.newVelocity_.z());
+
+	const Variant *vp[2] = { &callback.new_velocity, &callback.udata };
+	int argc = (callback.udata.get_type() == Variant::NIL) ? 1 : 2;
+	obj->call(callback.method, vp, argc, responseCallError);
+}
diff --git a/modules/mono/glue/string_glue.h b/modules/gdnavigation/rvo_agent.h
index a5e833ba61..f5c579ba84 100644
--- a/modules/mono/glue/string_glue.h
+++ b/modules/gdnavigation/rvo_agent.h
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  string_glue.h                                                        */
+/*  rvo_agent.h                                                          */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,29 +28,50 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef STRING_GLUE_H
-#define STRING_GLUE_H
+#ifndef RVO_AGENT_H
+#define RVO_AGENT_H
 
-#ifdef MONO_GLUE_ENABLED
+#include "core/object.h"
+#include "nav_rid.h"
+#include <Agent.h>
 
-#include "../mono_gd/gd_mono_marshal.h"
+/**
+	@author AndreaCatania
+*/
 
-MonoArray *godot_icall_String_md5_buffer(MonoString *p_str);
+class NavMap;
 
-MonoString *godot_icall_String_md5_text(MonoString *p_str);
+class RvoAgent : public NavRid {
+	struct AvoidanceComputedCallback {
+		ObjectID id;
+		StringName method;
+		Variant udata;
+		Variant new_velocity;
+	};
 
-int godot_icall_String_rfind(MonoString *p_str, MonoString *p_what, int p_from);
+	NavMap *map = nullptr;
+	RVO::Agent agent;
+	AvoidanceComputedCallback callback;
+	uint32_t map_update_id;
 
-int godot_icall_String_rfindn(MonoString *p_str, MonoString *p_what, int p_from);
+public:
+	RvoAgent();
 
-MonoArray *godot_icall_String_sha256_buffer(MonoString *p_str);
+	void set_map(NavMap *p_map);
+	NavMap *get_map() {
+		return map;
+	}
 
-MonoString *godot_icall_String_sha256_text(MonoString *p_str);
+	RVO::Agent *get_agent() {
+		return &agent;
+	}
 
-// Register internal calls
+	bool is_map_changed();
 
-void godot_register_string_icalls();
+	void set_callback(ObjectID p_id, const StringName p_method, const Variant p_udata = Variant());
+	bool has_callback() const;
 
-#endif // MONO_GLUE_ENABLED
+	void dispatch_callback();
+};
 
-#endif // STRING_GLUE_H
+#endif // RVO_AGENT_H
diff --git a/modules/gdscript/SCsub b/modules/gdscript/SCsub
index 74e653ce43..5c8cbdf869 100644
--- a/modules/gdscript/SCsub
+++ b/modules/gdscript/SCsub
@@ -1,19 +1,23 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_gdscript = env_modules.Clone()
 
 env_gdscript.add_source_files(env.modules_sources, "*.cpp")
 
-if env['tools']:
+if env["tools"]:
     env_gdscript.add_source_files(env.modules_sources, "./editor/*.cpp")
 
     # Those two modules are required for the language server protocol
-    if env['module_jsonrpc_enabled'] and env['module_websocket_enabled']:
+    if env["module_jsonrpc_enabled"] and env["module_websocket_enabled"]:
         env_gdscript.add_source_files(env.modules_sources, "./language_server/*.cpp")
     else:
         # Using a define in the disabled case, to avoid having an extra define
         # in regular builds where all modules are enabled.
-        env_gdscript.Append(CPPDEFINES=['GDSCRIPT_NO_LSP'])
+        env_gdscript.Append(CPPDEFINES=["GDSCRIPT_NO_LSP"])
+
+if env["tests"]:
+    env_gdscript.Append(CPPDEFINES=["TESTS_ENABLED"])
+    env_gdscript.add_source_files(env.modules_sources, "./tests/*.cpp")
diff --git a/modules/gdscript/config.py b/modules/gdscript/config.py
index a525eedaaa..6fc227e7f5 100644
--- a/modules/gdscript/config.py
+++ b/modules/gdscript/config.py
@@ -1,16 +1,18 @@
 def can_build(env, platform):
     return True
 
+
 def configure(env):
     pass
 
+
 def get_doc_classes():
     return [
         "@GDScript",
         "GDScript",
         "GDScriptFunctionState",
-        "GDScriptNativeClass",
     ]
 
+
 def get_doc_path():
     return "doc_classes"
diff --git a/modules/gdscript/doc_classes/@GDScript.xml b/modules/gdscript/doc_classes/@GDScript.xml
index b947d95fac..613039754f 100644
--- a/modules/gdscript/doc_classes/@GDScript.xml
+++ b/modules/gdscript/doc_classes/@GDScript.xml
@@ -52,7 +52,7 @@
 			<argument index="0" name="s" type="float">
 			</argument>
 			<description>
-				Returns the absolute value of parameter [code]s[/code] (i.e. unsigned value, works for integer and float).
+				Returns the absolute value of parameter [code]s[/code] (i.e. positive value).
 				[codeblock]
 				# a is 1
 				a = abs(-1)
@@ -90,14 +90,18 @@
 			</return>
 			<argument index="0" name="condition" type="bool">
 			</argument>
+			<argument index="1" name="message" type="String" default="&quot;&quot;">
+			</argument>
 			<description>
-				Asserts that the [code]condition[/code] is [code]true[/code] . If the [code]condition[/code] is [code]false[/code], an error is generated and the program is halted until you resume it. Only executes in debug builds, or when running the game from the editor. Use it for debugging purposes, to make sure a statement is [code]true[/code] during development.
+				Asserts that the [code]condition[/code] is [code]true[/code]. If the [code]condition[/code] is [code]false[/code], an error is generated and the program is halted until you resume it. Only executes in debug builds, or when running the game from the editor. Use it for debugging purposes, to make sure a statement is [code]true[/code] during development.
+				The optional [code]message[/code] argument, if given, is shown in addition to the generic "Assertion failed" message. You can use this to provide additional details about why the assertion failed.
 				[codeblock]
 				# Imagine we always want speed to be between 0 and 20
 				speed = -10
 				assert(speed &lt; 20) # True, the program will continue
 				assert(speed &gt;= 0) # False, the program will stop
 				assert(speed &gt;= 0 &amp;&amp; speed &lt; 20) # You can also combine the two conditional statements in one check
+				assert(speed &lt; 20, "speed = %f, but the speed limit is 20" % speed) # Show a message with clarifying details
 				[/codeblock]
 			</description>
 		</method>
@@ -108,7 +112,7 @@
 			</argument>
 			<description>
 				Returns the arc tangent of [code]s[/code] in radians. Use it to get the angle from an angle's tangent in trigonometry: [code]atan(tan(angle)) == angle[/code].
-				The method cannot know in which quadrant the angle should fall. See [method atan2] if you always want an exact angle.
+				The method cannot know in which quadrant the angle should fall. See [method atan2] if you have both [code]y[/code] and [code]x[/code].
 				[codeblock]
 				a = atan(0.5) # a is 0.463648
 				[/codeblock]
@@ -123,6 +127,7 @@
 			</argument>
 			<description>
 				Returns the arc tangent of [code]y/x[/code] in radians. Use to get the angle of tangent [code]y/x[/code]. To compute the value, the method takes into account the sign of both arguments in order to determine the quadrant.
+				Important note: The Y coordinate comes first, by convention.
 				[codeblock]
 				a = atan2(0, -1) # a is 3.141593
 				[/codeblock]
@@ -131,7 +136,7 @@
 		<method name="bytes2var">
 			<return type="Variant">
 			</return>
-			<argument index="0" name="bytes" type="PoolByteArray">
+			<argument index="0" name="bytes" type="PackedByteArray">
 			</argument>
 			<argument index="1" name="allow_objects" type="bool" default="false">
 			</argument>
@@ -157,11 +162,12 @@
 			<argument index="0" name="s" type="float">
 			</argument>
 			<description>
-				Rounds [code]s[/code] upward, returning the smallest integral value that is not less than [code]s[/code].
+				Rounds [code]s[/code] upward (towards positive infinity), returning the smallest whole number that is not less than [code]s[/code].
 				[codeblock]
 				i = ceil(1.45)  # i is 2
 				i = ceil(1.001) # i is 2
 				[/codeblock]
+				See also [method floor], [method round], and [method stepify].
 			</description>
 		</method>
 		<method name="char">
@@ -256,15 +262,6 @@
 				Converts from decibels to linear energy (audio).
 			</description>
 		</method>
-		<method name="decimals">
-			<return type="int">
-			</return>
-			<argument index="0" name="step" type="float">
-			</argument>
-			<description>
-				Deprecated alias for [method step_decimals].
-			</description>
-		</method>
 		<method name="dectime">
 			<return type="float">
 			</return>
@@ -288,7 +285,7 @@
 			<argument index="0" name="deg" type="float">
 			</argument>
 			<description>
-				Returns degrees converted to radians.
+				Converts an angle expressed in degrees to radians.
 				[codeblock]
 				# r is 3.141593
 				r = deg2rad(180)
@@ -312,7 +309,7 @@
 			<argument index="1" name="curve" type="float">
 			</argument>
 			<description>
-				Easing function, based on exponent. 0 is constant, 1 is linear, 0 to 1 is ease-in, 1+ is ease out. Negative values are in-out/out in.
+				Easing function, based on exponent. The curve values are: 0 is constant, 1 is linear, 0 to 1 is ease-in, 1+ is ease out. Negative values are in-out/out in.
 			</description>
 		</method>
 		<method name="exp">
@@ -322,7 +319,7 @@
 			</argument>
 			<description>
 				The natural exponential function. It raises the mathematical constant [b]e[/b] to the power of [code]s[/code] and returns it.
-				[b]e[/b] has an approximate value of 2.71828.
+				[b]e[/b] has an approximate value of 2.71828, and can be obtained with [code]exp(1)[/code].
 				For exponents to other bases use the method [method pow].
 				[codeblock]
 				a = exp(2) # Approximately 7.39
@@ -335,13 +332,14 @@
 			<argument index="0" name="s" type="float">
 			</argument>
 			<description>
-				Rounds [code]s[/code] to the closest smaller integer and returns it.
+				Rounds [code]s[/code] downward (towards negative infinity), returning the largest whole number that is not more than [code]s[/code].
 				[codeblock]
 				# a is 2.0
 				a = floor(2.99)
 				# a is -3.0
 				a = floor(-2.99)
 				[/codeblock]
+				See also [method ceil], [method round], and [method stepify].
 				[b]Note:[/b] This method returns a float. If you need an integer, you can use [code]int(s)[/code] directly.
 			</description>
 		</method>
@@ -371,24 +369,19 @@
 			<description>
 				Returns the floating-point modulus of [code]a/b[/code] that wraps equally in positive and negative.
 				[codeblock]
-				var i = -6
-				while i &lt; 5:
-				    prints(i, fposmod(i, 3))
-				    i += 1
+				for i in 7:
+				    var x = 0.5 * i - 1.5
+				    print("%4.1f %4.1f %4.1f" % [x, fmod(x, 1.5), fposmod(x, 1.5)])
 				[/codeblock]
 				Produces:
 				[codeblock]
-				-6 0
-				-5 1
-				-4 2
-				-3 0
-				-2 1
-				-1 2
-				0 0
-				1 1
-				2 2
-				3 0
-				4 1
+				-1.5 -0.0  0.0
+				-1.0 -1.0  0.5
+				-0.5 -0.5  1.0
+				 0.0  0.0  0.0
+				 0.5  0.5  0.5
+				 1.0  1.0  1.0
+				 1.5  0.0  0.0
 				[/codeblock]
 			</description>
 		</method>
@@ -490,9 +483,13 @@
 			<argument index="2" name="weight" type="float">
 			</argument>
 			<description>
-				Returns a normalized value considering the given range.
+				Returns a normalized value considering the given range. This is the opposite of [method lerp].
 				[codeblock]
-				inverse_lerp(3, 5, 4) # Returns 0.5
+				var middle = lerp(20, 30, 0.75)
+				# `middle` is now 27.5.
+				# Now, we pretend to have forgotten the original ratio and want to get it back.
+				var ratio = inverse_lerp(20, 30, 27.5)
+				# `ratio` is now 0.75.
 				[/codeblock]
 			</description>
 		</method>
@@ -505,6 +502,8 @@
 			</argument>
 			<description>
 				Returns [code]true[/code] if [code]a[/code] and [code]b[/code] are approximately equal to each other.
+				Here, approximately equal means that [code]a[/code] and [code]b[/code] are within a small internal epsilon of each other, which scales with the magnitude of the numbers.
+				Infinity values of the same sign are considered equal.
 			</description>
 		</method>
 		<method name="is_inf">
@@ -531,7 +530,7 @@
 			<argument index="0" name="s" type="float">
 			</argument>
 			<description>
-				Returns whether [code]s[/code] is a NaN (Not-A-Number) value.
+				Returns whether [code]s[/code] is a NaN ("Not a Number" or invalid) value.
 			</description>
 		</method>
 		<method name="is_zero_approx">
@@ -541,6 +540,7 @@
 			</argument>
 			<description>
 				Returns [code]true[/code] if [code]s[/code] is zero or almost zero.
+				This method is faster than using [method is_equal_approx] with one value as zero.
 			</description>
 		</method>
 		<method name="len">
@@ -567,9 +567,9 @@
 			<argument index="2" name="weight" type="float">
 			</argument>
 			<description>
-				Linearly interpolates between two values by a normalized value.
+				Linearly interpolates between two values by a normalized value. This is the opposite of [method inverse_lerp].
 				If the [code]from[/code] and [code]to[/code] arguments are of type [int] or [float], the return value is a [float].
-				If both are of the same vector type ([Vector2], [Vector3] or [Color]), the return value will be of the same type ([code]lerp[/code] then calls the vector type's [code]linear_interpolate[/code] method).
+				If both are of the same vector type ([Vector2], [Vector3] or [Color]), the return value will be of the same type ([code]lerp[/code] then calls the vector type's [code]lerp[/code] method).
 				[codeblock]
 				lerp(0, 4, 0.75) # Returns 3.0
 				lerp(Vector2(1, 5), Vector2(3, 2), 0.5) # Returns Vector2(2, 3.5)
@@ -587,7 +587,7 @@
 			</argument>
 			<description>
 				Linearly interpolates between two angles (in radians) by a normalized value.
-				Similar to [method lerp] but interpolate correctly when the angles wrap around [constant @GDScript.TAU].
+				Similar to [method lerp], but interpolates correctly when the angles wrap around [constant @GDScript.TAU].
 				[codeblock]
 				extends Sprite
 				var elapsed = 0.0
@@ -605,7 +605,13 @@
 			<argument index="0" name="nrg" type="float">
 			</argument>
 			<description>
-				Converts from linear energy to decibels (audio).
+				Converts from linear energy to decibels (audio). This can be used to implement volume sliders that behave as expected (since volume isn't linear). Example:
+				[codeblock]
+				# "Slider" refers to a node that inherits Range such as HSlider or VSlider.
+				# Its range must be configured to go from 0 to 1.
+				# Change the bus name if you'd like to change the volume of a specific bus only.
+				AudioServer.set_bus_volume_db(AudioServer.get_bus_index("Master"), linear2db($Slider.value))
+				[/codeblock]
 			</description>
 		</method>
 		<method name="load">
@@ -614,11 +620,11 @@
 			<argument index="0" name="path" type="String">
 			</argument>
 			<description>
-				Loads a resource from the filesystem located at [code]path[/code].
-				[b]Note:[/b] Resource paths can be obtained by right-clicking on a resource in the FileSystem dock and choosing [b]Copy Path[/b].
+				Loads a resource from the filesystem located at [code]path[/code]. The resource is loaded on the method call (unless it's referenced already elsewhere, e.g. in another script or in the scene), which might cause slight delay, especially when loading scenes. To avoid unnecessary delays when loading something multiple times, either store the resource in a variable or use [method preload].
+				[b]Note:[/b] Resource paths can be obtained by right-clicking on a resource in the FileSystem dock and choosing "Copy Path" or by dragging the file from the FileSystem dock into the script.
 				[codeblock]
-				# Load a scene called main located in the root of the project directory.
-				var main = load("res://main.tscn")
+				# Load a scene called main located in the root of the project directory and cache it in a variable.
+				var main = load("res://main.tscn") # main will contain a PackedScene resource.
 				[/codeblock]
 				[b]Important:[/b] The path must be absolute, a local path will just return [code]null[/code].
 			</description>
@@ -634,6 +640,7 @@
 				[codeblock]
 				log(10) # Returns 2.302585
 				[/codeblock]
+				[b]Note:[/b] The logarithm of [code]0[/code] returns [code]-inf[/code], while negative values return [code]-nan[/code].
 			</description>
 		</method>
 		<method name="max">
@@ -679,7 +686,9 @@
 				Moves [code]from[/code] toward [code]to[/code] by the [code]delta[/code] value.
 				Use a negative [code]delta[/code] value to move away.
 				[codeblock]
+				move_toward(5, 10, 4) # Returns 9
 				move_toward(10, 5, 4) # Returns 6
+				move_toward(10, 5, -1.5) # Returns 11.5
 				[/codeblock]
 			</description>
 		</method>
@@ -689,12 +698,17 @@
 			<argument index="0" name="value" type="int">
 			</argument>
 			<description>
-				Returns the nearest larger power of 2 for integer [code]value[/code].
+				Returns the nearest equal or larger power of 2 for integer [code]value[/code].
+				In other words, returns the smallest value [code]a[/code] where [code]a = pow(2, n)[/code] such that [code]value &lt;= a[/code] for some non-negative integer [code]n[/code].
 				[codeblock]
 				nearest_po2(3) # Returns 4
 				nearest_po2(4) # Returns 4
 				nearest_po2(5) # Returns 8
+
+				nearest_po2(0) # Returns 0 (this may not be what you expect)
+				nearest_po2(-1) # Returns 0 (this may not be what you expect)
 				[/codeblock]
+				[b]WARNING:[/b] Due to the way it is implemented, this function returns [code]0[/code] rather than [code]1[/code] for non-positive values of [code]value[/code] (in reality, 1 is the smallest integer power of 2).
 			</description>
 		</method>
 		<method name="ord">
@@ -718,16 +732,17 @@
 			<argument index="0" name="json" type="String">
 			</argument>
 			<description>
-				Parse JSON text to a Variant (use [method typeof] to check if it is what you expect).
-				Be aware that the JSON specification does not define integer or float types, but only a number type. Therefore, parsing a JSON text will convert all numerical values to [float] types.
-				Note that JSON objects do not preserve key order like Godot dictionaries, thus you should not rely on keys being in a certain order if a dictionary is constructed from JSON. In contrast, JSON arrays retain the order of their elements:
+				Parse JSON text to a Variant. (Use [method typeof] to check if the Variant's type is what you expect.)
+				[b]Note:[/b] The JSON specification does not define integer or float types, but only a [i]number[/i] type. Therefore, parsing a JSON text will convert all numerical values to [float] types.
+				[b]Note:[/b] JSON objects do not preserve key order like Godot dictionaries, thus, you should not rely on keys being in a certain order if a dictionary is constructed from JSON. In contrast, JSON arrays retain the order of their elements:
 				[codeblock]
-				p = parse_json('["a", "b", "c"]')
-				if typeof(p) == TYPE_ARRAY:
-				    print(p[0]) # Prints a
+				var p = JSON.parse('["hello", "world", "!"]')
+				if typeof(p.result) == TYPE_ARRAY:
+				    print(p.result[0]) # Prints "hello"
 				else:
-				    print("unexpected results")
+				    push_error("Unexpected results.")
 				[/codeblock]
+				See also [JSON] for an alternative way to parse JSON text.
 			</description>
 		</method>
 		<method name="polar2cartesian">
@@ -751,24 +766,18 @@
 			<description>
 				Returns the integer modulus of [code]a/b[/code] that wraps equally in positive and negative.
 				[codeblock]
-				var i = -6
-				while i &lt; 5:
-				    prints(i, posmod(i, 3))
-				    i += 1
+				for i in range(-3, 4):
+				    print("%2.0f %2.0f %2.0f" % [i, i % 3, posmod(i, 3)])
 				[/codeblock]
 				Produces:
 				[codeblock]
-				-6 0
-				-5 1
-				-4 2
-				-3 0
-				-2 1
-				-1 2
-				0 0
-				1 1
-				2 2
-				3 0
-				4 1
+				-3  0  0
+				-2 -2  1
+				-1 -1  2
+				 0  0  0
+				 1  1  1
+				 2  2  2
+				 3  0  0
 				[/codeblock]
 			</description>
 		</method>
@@ -792,11 +801,11 @@
 			<argument index="0" name="path" type="String">
 			</argument>
 			<description>
-				Returns a resource from the filesystem that is loaded during script parsing.
-				[b]Note:[/b] Resource paths can be obtained by right clicking on a resource in the Assets Panel and choosing "Copy Path".
+				Returns a [Resource] from the filesystem located at [code]path[/code]. The resource is loaded during script parsing, i.e. is loaded with the script and [method preload] effectively acts as a reference to that resource. Note that the method requires a constant path. If you want to load a resource from a dynamic/variable path, use [method load].
+				[b]Note:[/b] Resource paths can be obtained by right clicking on a resource in the Assets Panel and choosing "Copy Path" or by dragging the file from the FileSystem dock into the script.
 				[codeblock]
-				# Load a scene called main located in the root of the project directory.
-				var main = preload("res://main.tscn")
+				# Instance a scene.
+				var diamond = preload("res://diamond.tscn").instance()
 				[/codeblock]
 			</description>
 		</method>
@@ -809,6 +818,7 @@
 				a = [1, 2, 3]
 				print("a", "b", a) # Prints ab[1, 2, 3]
 				[/codeblock]
+				[b]Note:[/b] Consider using [method push_error] and [method push_warning] to print error and warning messages instead of [method print]. This distinguishes them from print messages used for debugging purposes, while also displaying a stack trace when an error or warning is printed.
 			</description>
 		</method>
 		<method name="print_debug" qualifiers="vararg">
@@ -882,6 +892,7 @@
 				[codeblock]
 				push_error("test error") # Prints "test error" to debugger and terminal as error call
 				[/codeblock]
+				[b]Note:[/b] Errors printed this way will not pause project execution. To print an error message and pause project execution in debug builds, use [code]assert(false, "test error")[/code] instead.
 			</description>
 		</method>
 		<method name="push_warning">
@@ -902,7 +913,7 @@
 			<argument index="0" name="rad" type="float">
 			</argument>
 			<description>
-				Converts from radians to degrees.
+				Converts an angle expressed in radians to degrees.
 				[codeblock]
 				rad2deg(0.523599) # Returns 30
 				[/codeblock]
@@ -971,27 +982,15 @@
 			<description>
 				Returns an array with the given range. Range can be 1 argument N (0 to N-1), two arguments (initial, final-1) or three arguments (initial, final-1, increment).
 				[codeblock]
-				for i in range(4):
-				    print(i)
-				for i in range(2, 5):
-				    print(i)
-				for i in range(0, 6, 2):
-				    print(i)
+				print(range(4))
+				print(range(2, 5))
+				print(range(0, 6, 2))
 				[/codeblock]
 				Output:
 				[codeblock]
-				0
-				1
-				2
-				3
-
-				2
-				3
-				4
-
-				0
-				2
-				4
+				[0, 1, 2, 3]
+				[2, 3, 4]
+				[0, 2, 4]
 				[/codeblock]
 			</description>
 		</method>
@@ -1021,10 +1020,11 @@
 			<argument index="0" name="s" type="float">
 			</argument>
 			<description>
-				Returns the integral value that is nearest to [code]s[/code], with halfway cases rounded away from zero.
+				Rounds [code]s[/code] to the nearest whole number, with halfway cases rounded away from zero.
 				[codeblock]
 				round(2.6) # Returns 3
 				[/codeblock]
+				See also [method floor], [method ceil], and [method stepify].
 			</description>
 		</method>
 		<method name="seed">
@@ -1086,12 +1086,15 @@
 			</argument>
 			<argument index="1" name="to" type="float">
 			</argument>
-			<argument index="2" name="weight" type="float">
+			<argument index="2" name="s" type="float">
 			</argument>
 			<description>
-				Returns a number smoothly interpolated between the [code]from[/code] and [code]to[/code], based on the [code]weight[/code]. Similar to [method lerp], but interpolates faster at the beginning and slower at the end.
+				Returns the result of smoothly interpolating the value of [code]s[/code] between [code]0[/code] and [code]1[/code], based on the where [code]s[/code] lies with respect to the edges [code]from[/code] and [code]to[/code].
+				The return value is [code]0[/code] if [code]s &lt;= from[/code], and [code]1[/code] if [code]s &gt;= to[/code]. If [code]s[/code] lies between [code]from[/code] and [code]to[/code], the returned value follows an S-shaped curve that maps [code]s[/code] between [code]0[/code] and [code]1[/code].
+				This S-shaped curve is the cubic Hermite interpolator, given by [code]f(s) = 3*s^2 - 2*s^3[/code].
 				[codeblock]
-				smoothstep(0, 2, 0.5) # Returns 0.15
+				smoothstep(0, 2, -5.0) # Returns 0.0
+				smoothstep(0, 2, 0.5) # Returns 0.15625
 				smoothstep(0, 2, 1.0) # Returns 0.5
 				smoothstep(0, 2, 2.0) # Returns 1.0
 				[/codeblock]
@@ -1103,10 +1106,11 @@
 			<argument index="0" name="s" type="float">
 			</argument>
 			<description>
-				Returns the square root of [code]s[/code].
+				Returns the square root of [code]s[/code], where [code]s[/code] is a non-negative number.
 				[codeblock]
 				sqrt(9) # Returns 3
 				[/codeblock]
+				[b]Note:[/b]Negative values of [code]s[/code] return NaN. If you need negative inputs, use [code]System.Numerics.Complex[/code] in C#.
 			</description>
 		</method>
 		<method name="step_decimals">
@@ -1139,6 +1143,7 @@
 				stepify(100, 32) # Returns 96
 				stepify(3.14159, 0.01) # Returns 3.14
 				[/codeblock]
+				See also [method ceil], [method floor], and [method round].
 			</description>
 		</method>
 		<method name="str" qualifiers="vararg">
@@ -1199,12 +1204,16 @@
 			<argument index="0" name="var" type="Variant">
 			</argument>
 			<description>
-				Converts a Variant [code]var[/code] to JSON text and return the result. Useful for serializing data to store or send over the network.
+				Converts a [Variant] [code]var[/code] to JSON text and return the result. Useful for serializing data to store or send over the network.
 				[codeblock]
+				# Both numbers below are integers.
 				a = { "a": 1, "b": 2 }
 				b = to_json(a)
 				print(b) # {"a":1, "b":2}
+				# Both numbers above are floats, even if they display without any decimal places.
 				[/codeblock]
+				[b]Note:[/b] The JSON specification does not define integer or float types, but only a [i]number[/i] type. Therefore, converting a [Variant] to JSON text will convert all numerical values to [float] types.
+				See also [JSON] for an alternative way to convert a [Variant] to JSON text.
 			</description>
 		</method>
 		<method name="type_exists">
@@ -1215,7 +1224,7 @@
 			<description>
 				Returns whether the given class exists in [ClassDB].
 				[codeblock]
-				type_exists("Sprite") # Returns true
+				type_exists("Sprite2D") # Returns true
 				type_exists("Variant") # Returns false
 				[/codeblock]
 			</description>
@@ -1247,14 +1256,14 @@
 				j = to_json([1, 2, 3])
 				v = validate_json(j)
 				if not v:
-				    print("valid")
+				    print("Valid JSON.")
 				else:
-				    prints("invalid", v)
+				    push_error("Invalid JSON: " + v)
 				[/codeblock]
 			</description>
 		</method>
 		<method name="var2bytes">
-			<return type="PoolByteArray">
+			<return type="PackedByteArray">
 			</return>
 			<argument index="0" name="var" type="Variant">
 			</argument>
@@ -1307,27 +1316,19 @@
 				Wraps float [code]value[/code] between [code]min[/code] and [code]max[/code].
 				Usable for creating loop-alike behavior or infinite surfaces.
 				[codeblock]
-				# a is 0.5
-				a = wrapf(10.5, 0.0, 10.0)
-				[/codeblock]
-				[codeblock]
-				# a is 9.5
-				a = wrapf(-0.5, 0.0, 10.0)
-				[/codeblock]
-				[codeblock]
-				# Infinite loop between 0.0 and 0.99
-				f = wrapf(f + 0.1, 0.0, 1.0)
+				# Infinite loop between 5.0 and 9.9
+				value = wrapf(value + 0.1, 5.0, 10.0)
 				[/codeblock]
 				[codeblock]
 				# Infinite rotation (in radians)
 				angle = wrapf(angle + 0.1, 0.0, TAU)
 				[/codeblock]
-				[b]Note:[/b] If you just want to wrap between 0.0 and [code]n[/code] (where [code]n[/code] is a positive floating-point value), it is better for performance to use the [method fmod] method like [code]fmod(number, n)[/code].
-				[code]wrapf[/code] is more flexible than using the [method fmod] approach by giving the user a simple control over the minimum value. It also fully supports negative numbers, e.g.
 				[codeblock]
 				# Infinite rotation (in radians)
 				angle = wrapf(angle + 0.1, -PI, PI)
 				[/codeblock]
+				[b]Note:[/b] If [code]min[/code] is [code]0[/code], this is equivalent to [method fposmod], so prefer using that instead.
+				[code]wrapf[/code] is more flexible than using the [method fposmod] approach by giving the user control over the minimum value.
 			</description>
 		</method>
 		<method name="wrapi">
@@ -1343,75 +1344,30 @@
 				Wraps integer [code]value[/code] between [code]min[/code] and [code]max[/code].
 				Usable for creating loop-alike behavior or infinite surfaces.
 				[codeblock]
-				# a is 0
-				a = wrapi(10, 0, 10)
-				[/codeblock]
-				[codeblock]
-				# a is 9
-				a = wrapi(-1, 0, 10)
+				# Infinite loop between 5 and 9
+				frame = wrapi(frame + 1, 5, 10)
 				[/codeblock]
 				[codeblock]
-				# Infinite loop between 0 and 9
-				frame = wrapi(frame + 1, 0, 10)
-				[/codeblock]
-				[b]Note:[/b] If you just want to wrap between 0 and [code]n[/code] (where [code]n[/code] is a positive integer value), it is better for performance to use the modulo operator like [code]number % n[/code].
-				[code]wrapi[/code] is more flexible than using the modulo approach by giving the user a simple control over the minimum value. It also fully supports negative numbers, e.g.
-				[codeblock]
 				# result is -2
 				var result = wrapi(-6, -5, -1)
 				[/codeblock]
-			</description>
-		</method>
-		<method name="yield">
-			<return type="GDScriptFunctionState">
-			</return>
-			<argument index="0" name="object" type="Object" default="null">
-			</argument>
-			<argument index="1" name="signal" type="String" default="&quot;&quot;">
-			</argument>
-			<description>
-				Stops the function execution and returns the current suspended state to the calling function.
-				From the caller, call [method GDScriptFunctionState.resume] on the state to resume execution. This invalidates the state. Within the resumed function, [code]yield()[/code] returns whatever was passed to the [code]resume()[/code] function call.
-				If passed an object and a signal, the execution is resumed when the object emits the given signal. In this case, [code]yield()[/code] returns the argument passed to [code]emit_signal()[/code] if the signal takes only one argument, or an array containing all the arguments passed to [code]emit_signal()[/code] if the signal takes multiple arguments.
-				You can also use [code]yield[/code] to wait for a function to finish:
-				[codeblock]
-				func _ready():
-				    yield(countdown(), "completed") # waiting for the countdown() function to complete
-				    print('Ready')
-
-				func countdown():
-				    yield(get_tree(), "idle_frame") # returns a GDScriptFunctionState object to _ready()
-				    print(3)
-				    yield(get_tree().create_timer(1.0), "timeout")
-				    print(2)
-				    yield(get_tree().create_timer(1.0), "timeout")
-				    print(1)
-				    yield(get_tree().create_timer(1.0), "timeout")
-
-				# prints:
-				# 3
-				# 2
-				# 1
-				# Ready
-				[/codeblock]
-				When yielding on a function, the [code]completed[/code] signal will be emitted automatically when the function returns. It can, therefore, be used as the [code]signal[/code] parameter of the [code]yield[/code] method to resume.
-				In order to yield on a function, the resulting function should also return a [code]GDScriptFunctionState[/code]. Notice [code]yield(get_tree(), "idle_frame")[/code] from the above example.
+				[b]Note:[/b] If [code]min[/code] is [code]0[/code], this is equivalent to [method posmod], so prefer using that instead.
+				[code]wrapi[/code] is more flexible than using the [method posmod] approach by giving the user control over the minimum value.
 			</description>
 		</method>
 	</methods>
 	<constants>
 		<constant name="PI" value="3.141593">
-			Constant that represents how many times the diameter of a circle fits around its perimeter.
+			Constant that represents how many times the diameter of a circle fits around its perimeter. This is equivalent to [code]TAU / 2[/code].
 		</constant>
 		<constant name="TAU" value="6.283185">
-			The circle constant, the circumference of the unit circle.
+			The circle constant, the circumference of the unit circle in radians.
 		</constant>
 		<constant name="INF" value="inf">
-			A positive infinity. (For negative infinity, use -INF).
+			Positive infinity. For negative infinity, use -INF.
 		</constant>
 		<constant name="NAN" value="nan">
-			Macro constant that expands to an expression of type float that represents a NaN.
-			The NaN values are used to identify undefined or non-representable values for floating-point elements, such as the square root of negative numbers or the result of 0/0.
+			"Not a Number", an invalid value. [code]NaN[/code] has special properties, including that it is not equal to itself. It is output by some invalid operations, such as dividing zero by zero.
 		</constant>
 	</constants>
 </class>
diff --git a/modules/gdscript/doc_classes/GDScript.xml b/modules/gdscript/doc_classes/GDScript.xml
index 5d0e93e117..631a102130 100644
--- a/modules/gdscript/doc_classes/GDScript.xml
+++ b/modules/gdscript/doc_classes/GDScript.xml
@@ -8,11 +8,11 @@
 		[method new] creates a new instance of the script. [method Object.set_script] extends an existing object, if that object's class matches one of the script's base classes.
 	</description>
 	<tutorials>
-		<link>https://docs.godotengine.org/en/latest/getting_started/scripting/gdscript/index.html</link>
+		<link title="GDScript tutorial index">https://docs.godotengine.org/en/latest/getting_started/scripting/gdscript/index.html</link>
 	</tutorials>
 	<methods>
 		<method name="get_as_byte_code" qualifiers="const">
-			<return type="PoolByteArray">
+			<return type="PackedByteArray">
 			</return>
 			<description>
 				Returns byte code for the script source code.
diff --git a/modules/gdscript/doc_classes/GDScriptFunctionState.xml b/modules/gdscript/doc_classes/GDScriptFunctionState.xml
index 9a73764646..5e369b32d9 100644
--- a/modules/gdscript/doc_classes/GDScriptFunctionState.xml
+++ b/modules/gdscript/doc_classes/GDScriptFunctionState.xml
@@ -4,7 +4,8 @@
 		State of a function call after yielding.
 	</brief_description>
 	<description>
-		Calling [method @GDScript.yield] within a function will cause that function to yield and return its current state as an object of this type. The yielded function call can then be resumed later by calling [method resume] on this state object.
+		FIXME: Outdated docs as of GDScript rewrite in 4.0.
+		Calling [code]yield[/code] within a function will cause that function to yield and return its current state as an object of this type. The yielded function call can then be resumed later by calling [method resume] on this state object.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -26,7 +27,7 @@
 			</argument>
 			<description>
 				Resume execution of the yielded function call.
-				If handed an argument, return the argument from the [method @GDScript.yield] call in the yielded function call. You can pass e.g. an [Array] to hand multiple arguments.
+				If handed an argument, return the argument from the [code]yield[/code] call in the yielded function call. You can pass e.g. an [Array] to hand multiple arguments.
 				This function returns what the resumed function call returns, possibly another function state if yielded again.
 			</description>
 		</method>
diff --git a/modules/gdscript/doc_classes/GDScriptNativeClass.xml b/modules/gdscript/doc_classes/GDScriptNativeClass.xml
deleted file mode 100644
index 0a8982de8e..0000000000
--- a/modules/gdscript/doc_classes/GDScriptNativeClass.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="GDScriptNativeClass" inherits="Reference" version="4.0">
-	<brief_description>
-	</brief_description>
-	<description>
-	</description>
-	<tutorials>
-	</tutorials>
-	<methods>
-		<method name="new">
-			<return type="Variant">
-			</return>
-			<description>
-			</description>
-		</method>
-	</methods>
-	<constants>
-	</constants>
-</class>
diff --git a/modules/gdscript/editor/gdscript_highlighter.cpp b/modules/gdscript/editor/gdscript_highlighter.cpp
index 687e1785be..9a3273d201 100644
--- a/modules/gdscript/editor/gdscript_highlighter.cpp
+++ b/modules/gdscript/editor/gdscript_highlighter.cpp
@@ -29,39 +29,24 @@
 /*************************************************************************/
 
 #include "gdscript_highlighter.h"
+#include "../gdscript.h"
 #include "../gdscript_tokenizer.h"
 #include "editor/editor_settings.h"
-#include "scene/gui/text_edit.h"
-
-inline bool _is_symbol(CharType c) {
-
-	return is_symbol(c);
-}
-
-static bool _is_text_char(CharType c) {
-
-	return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '_';
-}
-
-static bool _is_char(CharType c) {
 
+static bool _is_char(char32_t c) {
 	return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '_';
 }
 
-static bool _is_number(CharType c) {
-	return (c >= '0' && c <= '9');
-}
-
-static bool _is_hex_symbol(CharType c) {
+static bool _is_hex_symbol(char32_t c) {
 	return ((c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F'));
 }
 
-static bool _is_bin_symbol(CharType c) {
+static bool _is_bin_symbol(char32_t c) {
 	return (c == '0' || c == '1');
 }
 
-Map<int, TextEdit::HighlighterInfo> GDScriptSyntaxHighlighter::_get_line_syntax_highlighting(int p_line) {
-	Map<int, TextEdit::HighlighterInfo> color_map;
+Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting(int p_line) {
+	Dictionary color_map;
 
 	Type next_type = NONE;
 	Type current_type = NONE;
@@ -85,36 +70,139 @@ Map<int, TextEdit::HighlighterInfo> GDScriptSyntaxHighlighter::_get_line_syntax_
 	Color keyword_color;
 	Color color;
 
-	int in_region = text_editor->_is_line_in_region(p_line);
-	int deregion = 0;
+	color_region_cache[p_line] = -1;
+	int in_region = -1;
+	if (p_line != 0) {
+		if (!color_region_cache.has(p_line - 1)) {
+			get_line_syntax_highlighting(p_line - 1);
+		}
+		in_region = color_region_cache[p_line - 1];
+	}
 
-	const Map<int, TextEdit::Text::ColorRegionInfo> cri_map = text_editor->_get_line_color_region_info(p_line);
-	const String &str = text_editor->get_line(p_line);
+	const String &str = text_edit->get_line(p_line);
+	const int line_length = str.length();
 	Color prev_color;
+
+	if (in_region != -1 && str.length() == 0) {
+		color_region_cache[p_line] = in_region;
+	}
 	for (int j = 0; j < str.length(); j++) {
-		TextEdit::HighlighterInfo highlighter_info;
+		Dictionary highlighter_info;
 
-		if (deregion > 0) {
-			deregion--;
-			if (deregion == 0) {
-				in_region = -1;
+		color = font_color;
+		bool is_char = !is_symbol(str[j]);
+		bool is_a_symbol = is_symbol(str[j]);
+		bool is_number = (str[j] >= '0' && str[j] <= '9');
+
+		/* color regions */
+		if (is_a_symbol || in_region != -1) {
+			int from = j;
+			for (; from < line_length; from++) {
+				if (str[from] == '\\') {
+					from++;
+					continue;
+				}
+				break;
 			}
-		}
 
-		if (deregion != 0) {
-			if (color != prev_color) {
-				prev_color = color;
-				highlighter_info.color = color;
-				color_map[j] = highlighter_info;
-			}
-			continue;
-		}
+			if (from != line_length) {
+				/* check if we are in entering a region */
+				if (in_region == -1) {
+					for (int c = 0; c < color_regions.size(); c++) {
+						/* check there is enough room */
+						int chars_left = line_length - from;
+						int start_key_length = color_regions[c].start_key.length();
+						int end_key_length = color_regions[c].end_key.length();
+						if (chars_left < start_key_length) {
+							continue;
+						}
+
+						/* search the line */
+						bool match = true;
+						const char32_t *start_key = color_regions[c].start_key.get_data();
+						for (int k = 0; k < start_key_length; k++) {
+							if (start_key[k] != str[from + k]) {
+								match = false;
+								break;
+							}
+						}
+						if (!match) {
+							continue;
+						}
+						in_region = c;
+						from += start_key_length;
+
+						/* check if it's the whole line */
+						if (end_key_length == 0 || color_regions[c].line_only || from + end_key_length > line_length) {
+							prev_color = color_regions[in_region].color;
+							highlighter_info["color"] = color_regions[c].color;
+							color_map[j] = highlighter_info;
+
+							j = line_length;
+							if (!color_regions[c].line_only) {
+								color_region_cache[p_line] = c;
+							}
+						}
+						break;
+					}
 
-		color = font_color;
+					if (j == line_length) {
+						continue;
+					}
+				}
+
+				/* if we are in one find the end key */
+				if (in_region != -1) {
+					/* search the line */
+					int region_end_index = -1;
+					int end_key_length = color_regions[in_region].end_key.length();
+					const char32_t *end_key = color_regions[in_region].end_key.get_data();
+					for (; from < line_length; from++) {
+						if (line_length - from < end_key_length) {
+							break;
+						}
+
+						if (!is_symbol(str[from])) {
+							continue;
+						}
+
+						if (str[from] == '\\') {
+							from++;
+							continue;
+						}
+
+						region_end_index = from;
+						for (int k = 0; k < end_key_length; k++) {
+							if (end_key[k] != str[from + k]) {
+								region_end_index = -1;
+								break;
+							}
+						}
+
+						if (region_end_index != -1) {
+							break;
+						}
+					}
+
+					prev_color = color_regions[in_region].color;
+					highlighter_info["color"] = color_regions[in_region].color;
+					color_map[j] = highlighter_info;
+
+					previous_type = REGION;
+					previous_text = "";
+					previous_column = j;
+					j = from + (end_key_length - 1);
+					if (region_end_index == -1) {
+						color_region_cache[p_line] = in_region;
+					}
 
-		bool is_char = _is_text_char(str[j]);
-		bool is_symbol = _is_symbol(str[j]);
-		bool is_number = _is_number(str[j]);
+					in_region = -1;
+					prev_is_char = false;
+					prev_is_number = false;
+					continue;
+				}
+			}
+		}
 
 		// allow ABCDEF in hex notation
 		if (is_hex_notation && (_is_hex_symbol(str[j]) || is_number)) {
@@ -136,7 +224,7 @@ Map<int, TextEdit::HighlighterInfo> GDScriptSyntaxHighlighter::_get_line_syntax_
 		// check for dot or underscore or 'x' for hex notation in floating point number or 'e' for scientific notation
 		if ((str[j] == '.' || str[j] == 'x' || str[j] == 'b' || str[j] == '_' || str[j] == 'e') && !in_word && prev_is_number && !is_number) {
 			is_number = true;
-			is_symbol = false;
+			is_a_symbol = false;
 			is_char = false;
 
 			if (str[j] == 'x' && str[j - 1] == '0') {
@@ -154,43 +242,26 @@ Map<int, TextEdit::HighlighterInfo> GDScriptSyntaxHighlighter::_get_line_syntax_
 			is_number = false;
 		}
 
-		if (is_symbol && str[j] != '.' && in_word) {
+		if (is_a_symbol && str[j] != '.' && in_word) {
 			in_word = false;
 		}
 
-		if (is_symbol && cri_map.has(j)) {
-			const TextEdit::Text::ColorRegionInfo &cri = cri_map[j];
-
-			if (in_region == -1) {
-				if (!cri.end) {
-					in_region = cri.region;
-				}
-			} else {
-				TextEdit::ColorRegion cr = text_editor->_get_color_region(cri.region);
-				if (in_region == cri.region && !cr.line_only) { //ignore otherwise
-					if (cri.end || cr.eq) {
-						deregion = cr.eq ? cr.begin_key.length() : cr.end_key.length();
-					}
-				}
-			}
-		}
-
 		if (!is_char) {
 			in_keyword = false;
 		}
 
-		if (in_region == -1 && !in_keyword && is_char && !prev_is_char) {
-
+		if (!in_keyword && is_char && !prev_is_char) {
 			int to = j;
-			while (to < str.length() && _is_text_char(str[to]))
+			while (to < str.length() && !is_symbol(str[to])) {
 				to++;
+			}
 
 			String word = str.substr(j, to - j);
 			Color col = Color();
-			if (text_editor->has_keyword_color(word)) {
-				col = text_editor->get_keyword_color(word);
-			} else if (text_editor->has_member_color(word)) {
-				col = text_editor->get_member_color(word);
+			if (keywords.has(word)) {
+				col = keywords[word];
+			} else if (member_keywords.has(word)) {
+				col = member_keywords[word];
 				for (int k = j - 1; k >= 0; k--) {
 					if (str[k] == '.') {
 						col = Color(); //member indexing not allowed
@@ -208,9 +279,8 @@ Map<int, TextEdit::HighlighterInfo> GDScriptSyntaxHighlighter::_get_line_syntax_
 		}
 
 		if (!in_function_name && in_word && !in_keyword) {
-
 			int k = j;
-			while (k < str.length() && !_is_symbol(str[k]) && str[k] != '\t' && str[k] != ' ') {
+			while (k < str.length() && !is_symbol(str[k]) && str[k] != '\t' && str[k] != ' ') {
 				k++;
 			}
 
@@ -221,14 +291,14 @@ Map<int, TextEdit::HighlighterInfo> GDScriptSyntaxHighlighter::_get_line_syntax_
 
 			if (str[k] == '(') {
 				in_function_name = true;
-			} else if (previous_text == GDScriptTokenizer::get_token_name(GDScriptTokenizer::TK_PR_VAR)) {
+			} else if (previous_text == GDScriptTokenizer::get_token_name(GDScriptTokenizer::Token::VAR)) {
 				in_variable_declaration = true;
 			}
 		}
 
 		if (!in_function_name && !in_member_variable && !in_keyword && !is_number && in_word) {
 			int k = j;
-			while (k > 0 && !_is_symbol(str[k]) && str[k] != '\t' && str[k] != ' ') {
+			while (k > 0 && !is_symbol(str[k]) && str[k] != '\t' && str[k] != ' ') {
 				k--;
 			}
 
@@ -237,8 +307,7 @@ Map<int, TextEdit::HighlighterInfo> GDScriptSyntaxHighlighter::_get_line_syntax_
 			}
 		}
 
-		if (is_symbol) {
-
+		if (is_a_symbol) {
 			if (in_function_name) {
 				in_function_args = true;
 			}
@@ -275,14 +344,11 @@ Map<int, TextEdit::HighlighterInfo> GDScriptSyntaxHighlighter::_get_line_syntax_
 
 		if (!in_node_path && in_region == -1 && str[j] == '$') {
 			in_node_path = true;
-		} else if (in_region != -1 || (is_symbol && str[j] != '/')) {
+		} else if (in_region != -1 || (is_a_symbol && str[j] != '/')) {
 			in_node_path = false;
 		}
 
-		if (in_region >= 0) {
-			next_type = REGION;
-			color = text_editor->_get_color_region(in_region).color;
-		} else if (in_node_path) {
+		if (in_node_path) {
 			next_type = NODE_PATH;
 			color = node_path_color;
 		} else if (in_keyword) {
@@ -294,12 +360,12 @@ Map<int, TextEdit::HighlighterInfo> GDScriptSyntaxHighlighter::_get_line_syntax_
 		} else if (in_function_name) {
 			next_type = FUNCTION;
 
-			if (previous_text == GDScriptTokenizer::get_token_name(GDScriptTokenizer::TK_PR_FUNCTION)) {
+			if (previous_text == GDScriptTokenizer::get_token_name(GDScriptTokenizer::Token::FUNC)) {
 				color = function_definition_color;
 			} else {
 				color = function_color;
 			}
-		} else if (is_symbol) {
+		} else if (is_a_symbol) {
 			next_type = SYMBOL;
 			color = symbol_color;
 		} else if (is_number) {
@@ -340,32 +406,133 @@ Map<int, TextEdit::HighlighterInfo> GDScriptSyntaxHighlighter::_get_line_syntax_
 
 		if (color != prev_color) {
 			prev_color = color;
-			highlighter_info.color = color;
+			highlighter_info["color"] = color;
 			color_map[j] = highlighter_info;
 		}
 	}
 	return color_map;
 }
 
-String GDScriptSyntaxHighlighter::get_name() const {
+String GDScriptSyntaxHighlighter::_get_name() const {
 	return "GDScript";
 }
 
-List<String> GDScriptSyntaxHighlighter::get_supported_languages() {
-	List<String> languages;
+Array GDScriptSyntaxHighlighter::_get_supported_languages() const {
+	Array languages;
 	languages.push_back("GDScript");
 	return languages;
 }
 
 void GDScriptSyntaxHighlighter::_update_cache() {
-	font_color = text_editor->get_color("font_color");
-	symbol_color = text_editor->get_color("symbol_color");
-	function_color = text_editor->get_color("function_color");
-	number_color = text_editor->get_color("number_color");
-	member_color = text_editor->get_color("member_variable_color");
+	keywords.clear();
+	member_keywords.clear();
+	color_regions.clear();
+	color_region_cache.clear();
+
+	font_color = text_edit->get_theme_color("font_color");
+	symbol_color = EDITOR_GET("text_editor/highlighting/symbol_color");
+	function_color = EDITOR_GET("text_editor/highlighting/function_color");
+	number_color = EDITOR_GET("text_editor/highlighting/number_color");
+	member_color = EDITOR_GET("text_editor/highlighting/member_variable_color");
+
+	/* Engine types. */
+	const Color types_color = EDITOR_GET("text_editor/highlighting/engine_type_color");
+	List<StringName> types;
+	ClassDB::get_class_list(&types);
+	for (List<StringName>::Element *E = types.front(); E; E = E->next()) {
+		String n = E->get();
+		if (n.begins_with("_")) {
+			n = n.substr(1, n.length());
+		}
+		keywords[n] = types_color;
+	}
+
+	/* User types. */
+	const Color usertype_color = EDITOR_GET("text_editor/highlighting/user_type_color");
+	List<StringName> global_classes;
+	ScriptServer::get_global_class_list(&global_classes);
+	for (List<StringName>::Element *E = global_classes.front(); E; E = E->next()) {
+		keywords[String(E->get())] = usertype_color;
+	}
+
+	/* Autoloads. */
+	Map<StringName, ProjectSettings::AutoloadInfo> autoloads = ProjectSettings::get_singleton()->get_autoload_list();
+	for (Map<StringName, ProjectSettings::AutoloadInfo>::Element *E = autoloads.front(); E; E = E->next()) {
+		const ProjectSettings::AutoloadInfo &info = E->value();
+		if (info.is_singleton) {
+			keywords[info.name] = usertype_color;
+		}
+	}
+
+	const GDScriptLanguage *gdscript = GDScriptLanguage::get_singleton();
+
+	/* Core types. */
+	const Color basetype_color = EDITOR_GET("text_editor/highlighting/base_type_color");
+	List<String> core_types;
+	gdscript->get_core_type_words(&core_types);
+	for (List<String>::Element *E = core_types.front(); E; E = E->next()) {
+		keywords[E->get()] = basetype_color;
+	}
 
-	const String text_editor_color_theme = EditorSettings::get_singleton()->get("text_editor/theme/color_theme");
-	const bool default_theme = text_editor_color_theme == "Default";
+	/* Reserved words. */
+	const Color keyword_color = EDITOR_GET("text_editor/highlighting/keyword_color");
+	List<String> keyword_list;
+	gdscript->get_reserved_words(&keyword_list);
+	for (List<String>::Element *E = keyword_list.front(); E; E = E->next()) {
+		keywords[E->get()] = keyword_color;
+	}
+
+	/* Comments */
+	const Color comment_color = EDITOR_GET("text_editor/highlighting/comment_color");
+	List<String> comments;
+	gdscript->get_comment_delimiters(&comments);
+	for (List<String>::Element *E = comments.front(); E; E = E->next()) {
+		String comment = E->get();
+		String beg = comment.get_slice(" ", 0);
+		String end = comment.get_slice_count(" ") > 1 ? comment.get_slice(" ", 1) : String();
+		add_color_region(beg, end, comment_color, end == "");
+	}
+
+	/* Strings */
+	const Color string_color = EDITOR_GET("text_editor/highlighting/string_color");
+	List<String> strings;
+	gdscript->get_string_delimiters(&strings);
+	for (List<String>::Element *E = strings.front(); E; E = E->next()) {
+		String string = E->get();
+		String beg = string.get_slice(" ", 0);
+		String end = string.get_slice_count(" ") > 1 ? string.get_slice(" ", 1) : String();
+		add_color_region(beg, end, string_color, end == "");
+	}
+
+	const Ref<Script> script = _get_edited_resource();
+	if (script.is_valid()) {
+		/* Member types. */
+		const Color member_variable_color = EDITOR_GET("text_editor/highlighting/member_variable_color");
+		StringName instance_base = script->get_instance_base_type();
+		if (instance_base != StringName()) {
+			List<PropertyInfo> plist;
+			ClassDB::get_property_list(instance_base, &plist);
+			for (List<PropertyInfo>::Element *E = plist.front(); E; E = E->next()) {
+				String name = E->get().name;
+				if (E->get().usage & PROPERTY_USAGE_CATEGORY || E->get().usage & PROPERTY_USAGE_GROUP || E->get().usage & PROPERTY_USAGE_SUBGROUP) {
+					continue;
+				}
+				if (name.find("/") != -1) {
+					continue;
+				}
+				member_keywords[name] = member_variable_color;
+			}
+
+			List<String> clist;
+			ClassDB::get_integer_constant_list(instance_base, &clist);
+			for (List<String>::Element *E = clist.front(); E; E = E->next()) {
+				member_keywords[E->get()] = member_variable_color;
+			}
+		}
+	}
+
+	const String text_edit_color_theme = EditorSettings::get_singleton()->get("text_editor/theme/color_theme");
+	const bool default_theme = text_edit_color_theme == "Default";
 
 	if (default_theme || EditorSettings::get_singleton()->is_dark_theme()) {
 		function_definition_color = Color(0.4, 0.9, 1.0);
@@ -377,7 +544,7 @@ void GDScriptSyntaxHighlighter::_update_cache() {
 
 	EDITOR_DEF("text_editor/highlighting/gdscript/function_definition_color", function_definition_color);
 	EDITOR_DEF("text_editor/highlighting/gdscript/node_path_color", node_path_color);
-	if (text_editor_color_theme == "Adaptive" || default_theme) {
+	if (text_edit_color_theme == "Adaptive" || default_theme) {
 		EditorSettings::get_singleton()->set_initial_value(
 				"text_editor/highlighting/gdscript/function_definition_color",
 				function_definition_color,
@@ -393,6 +560,36 @@ void GDScriptSyntaxHighlighter::_update_cache() {
 	type_color = EDITOR_GET("text_editor/highlighting/base_type_color");
 }
 
-SyntaxHighlighter *GDScriptSyntaxHighlighter::create() {
-	return memnew(GDScriptSyntaxHighlighter);
+void GDScriptSyntaxHighlighter::add_color_region(const String &p_start_key, const String &p_end_key, const Color &p_color, bool p_line_only) {
+	for (int i = 0; i < p_start_key.length(); i++) {
+		ERR_FAIL_COND_MSG(!is_symbol(p_start_key[i]), "color regions must start with a symbol");
+	}
+
+	if (p_end_key.length() > 0) {
+		for (int i = 0; i < p_end_key.length(); i++) {
+			ERR_FAIL_COND_MSG(!is_symbol(p_end_key[i]), "color regions must end with a symbol");
+		}
+	}
+
+	int at = 0;
+	for (int i = 0; i < color_regions.size(); i++) {
+		ERR_FAIL_COND_MSG(color_regions[i].start_key == p_start_key, "color region with start key '" + p_start_key + "' already exists.");
+		if (p_start_key.length() < color_regions[i].start_key.length()) {
+			at++;
+		}
+	}
+
+	ColorRegion color_region;
+	color_region.color = p_color;
+	color_region.start_key = p_start_key;
+	color_region.end_key = p_end_key;
+	color_region.line_only = p_line_only;
+	color_regions.insert(at, color_region);
+	clear_highlighting_cache();
+}
+
+Ref<EditorSyntaxHighlighter> GDScriptSyntaxHighlighter::_create() const {
+	Ref<GDScriptSyntaxHighlighter> syntax_highlighter;
+	syntax_highlighter.instance();
+	return syntax_highlighter;
 }
diff --git a/modules/gdscript/editor/gdscript_highlighter.h b/modules/gdscript/editor/gdscript_highlighter.h
index e652fb1471..49357f3d2e 100644
--- a/modules/gdscript/editor/gdscript_highlighter.h
+++ b/modules/gdscript/editor/gdscript_highlighter.h
@@ -31,10 +31,25 @@
 #ifndef GDSCRIPT_HIGHLIGHTER_H
 #define GDSCRIPT_HIGHLIGHTER_H
 
+#include "editor/plugins/script_editor_plugin.h"
 #include "scene/gui/text_edit.h"
 
-class GDScriptSyntaxHighlighter : public SyntaxHighlighter {
+class GDScriptSyntaxHighlighter : public EditorSyntaxHighlighter {
+	GDCLASS(GDScriptSyntaxHighlighter, EditorSyntaxHighlighter)
+
 private:
+	struct ColorRegion {
+		Color color;
+		String start_key;
+		String end_key;
+		bool line_only;
+	};
+	Vector<ColorRegion> color_regions;
+	Map<int, int> color_region_cache;
+
+	Dictionary keywords;
+	Dictionary member_keywords;
+
 	enum Type {
 		NONE,
 		REGION,
@@ -59,14 +74,16 @@ private:
 	Color node_path_color;
 	Color type_color;
 
+	void add_color_region(const String &p_start_key, const String &p_end_key, const Color &p_color, bool p_line_only = false);
+
 public:
-	static SyntaxHighlighter *create();
+	virtual void _update_cache() override;
+	virtual Dictionary _get_line_syntax_highlighting(int p_line) override;
 
-	virtual void _update_cache();
-	virtual Map<int, TextEdit::HighlighterInfo> _get_line_syntax_highlighting(int p_line);
+	virtual String _get_name() const override;
+	virtual Array _get_supported_languages() const override;
 
-	virtual String get_name() const;
-	virtual List<String> get_supported_languages();
+	virtual Ref<EditorSyntaxHighlighter> _create() const override;
 };
 
 #endif // GDSCRIPT_HIGHLIGHTER_H
diff --git a/modules/gdscript/editor/gdscript_translation_parser_plugin.cpp b/modules/gdscript/editor/gdscript_translation_parser_plugin.cpp
new file mode 100644
index 0000000000..944ed859f5
--- /dev/null
+++ b/modules/gdscript/editor/gdscript_translation_parser_plugin.cpp
@@ -0,0 +1,351 @@
+/*************************************************************************/
+/*  gdscript_translation_parser_plugin.cpp                               */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "gdscript_translation_parser_plugin.h"
+
+#include "core/io/resource_loader.h"
+#include "modules/gdscript/gdscript.h"
+
+void GDScriptEditorTranslationParserPlugin::get_recognized_extensions(List<String> *r_extensions) const {
+	GDScriptLanguage::get_singleton()->get_recognized_extensions(r_extensions);
+}
+
+Error GDScriptEditorTranslationParserPlugin::parse_file(const String &p_path, Vector<String> *r_ids, Vector<Vector<String>> *r_ids_ctx_plural) {
+	// Extract all translatable strings using the parsed tree from GDSriptParser.
+	// The strategy is to find all ExpressionNode and AssignmentNode from the tree and extract strings if relevant, i.e
+	// Search strings in ExpressionNode -> CallNode -> tr(), set_text(), set_placeholder() etc.
+	// Search strings in AssignmentNode -> text = "__", hint_tooltip = "__" etc.
+
+	Error err;
+	RES loaded_res = ResourceLoader::load(p_path, "", false, &err);
+	if (err) {
+		ERR_PRINT("Failed to load " + p_path);
+		return err;
+	}
+
+	ids = r_ids;
+	ids_ctx_plural = r_ids_ctx_plural;
+	Ref<GDScript> gdscript = loaded_res;
+	String source_code = gdscript->get_source_code();
+
+	GDScriptParser parser;
+	err = parser.parse(source_code, p_path, false);
+	if (err != OK) {
+		ERR_PRINT("Failed to parse with GDScript with GDScriptParser.");
+		return err;
+	}
+
+	// Traverse through the parsed tree from GDScriptParser.
+	GDScriptParser::ClassNode *c = parser.get_tree();
+	_traverse_class(c);
+
+	return OK;
+}
+
+void GDScriptEditorTranslationParserPlugin::_traverse_class(const GDScriptParser::ClassNode *p_class) {
+	for (int i = 0; i < p_class->members.size(); i++) {
+		const GDScriptParser::ClassNode::Member &m = p_class->members[i];
+		// There are 7 types of Member, but only class, function and variable can contain translatable strings.
+		switch (m.type) {
+			case GDScriptParser::ClassNode::Member::CLASS:
+				_traverse_class(m.m_class);
+				break;
+			case GDScriptParser::ClassNode::Member::FUNCTION:
+				_traverse_function(m.function);
+				break;
+			case GDScriptParser::ClassNode::Member::VARIABLE:
+				_read_variable(m.variable);
+				break;
+			default:
+				break;
+		}
+	}
+}
+
+void GDScriptEditorTranslationParserPlugin::_traverse_function(const GDScriptParser::FunctionNode *p_func) {
+	_traverse_block(p_func->body);
+}
+
+void GDScriptEditorTranslationParserPlugin::_read_variable(const GDScriptParser::VariableNode *p_var) {
+	_assess_expression(p_var->initializer);
+}
+
+void GDScriptEditorTranslationParserPlugin::_traverse_block(const GDScriptParser::SuiteNode *p_suite) {
+	if (!p_suite) {
+		return;
+	}
+
+	const Vector<GDScriptParser::Node *> &statements = p_suite->statements;
+	for (int i = 0; i < statements.size(); i++) {
+		GDScriptParser::Node *statement = statements[i];
+
+		// Statements with Node type constant, break, continue, pass, breakpoint are skipped because they can't contain translatable strings.
+		switch (statement->type) {
+			case GDScriptParser::Node::VARIABLE:
+				_assess_expression(static_cast<GDScriptParser::VariableNode *>(statement)->initializer);
+				break;
+			case GDScriptParser::Node::IF: {
+				GDScriptParser::IfNode *if_node = static_cast<GDScriptParser::IfNode *>(statement);
+				_assess_expression(if_node->condition);
+				//FIXME : if the elif logic is changed in GDScriptParser, then this probably will have to change as well. See GDScriptParser::TreePrinter::print_if().
+				_traverse_block(if_node->true_block);
+				_traverse_block(if_node->false_block);
+				break;
+			}
+			case GDScriptParser::Node::FOR: {
+				GDScriptParser::ForNode *for_node = static_cast<GDScriptParser::ForNode *>(statement);
+				_assess_expression(for_node->list);
+				_traverse_block(for_node->loop);
+				break;
+			}
+			case GDScriptParser::Node::WHILE: {
+				GDScriptParser::WhileNode *while_node = static_cast<GDScriptParser::WhileNode *>(statement);
+				_assess_expression(while_node->condition);
+				_traverse_block(while_node->loop);
+				break;
+			}
+			case GDScriptParser::Node::MATCH: {
+				GDScriptParser::MatchNode *match_node = static_cast<GDScriptParser::MatchNode *>(statement);
+				_assess_expression(match_node->test);
+				for (int j = 0; j < match_node->branches.size(); j++) {
+					_traverse_block(match_node->branches[j]->block);
+				}
+				break;
+			}
+			case GDScriptParser::Node::RETURN:
+				_assess_expression(static_cast<GDScriptParser::ReturnNode *>(statement)->return_value);
+				break;
+			case GDScriptParser::Node::ASSERT:
+				_assess_expression((static_cast<GDScriptParser::AssertNode *>(statement))->condition);
+				break;
+			case GDScriptParser::Node::ASSIGNMENT:
+				_assess_assignment(static_cast<GDScriptParser::AssignmentNode *>(statement));
+				break;
+			default:
+				if (statement->is_expression()) {
+					_assess_expression(static_cast<GDScriptParser::ExpressionNode *>(statement));
+				}
+				break;
+		}
+	}
+}
+
+void GDScriptEditorTranslationParserPlugin::_assess_expression(GDScriptParser::ExpressionNode *p_expression) {
+	// Explore all ExpressionNodes to find CallNodes which contain translation strings, such as tr(), set_text() etc.
+	// tr() can be embedded quite deep within multiple ExpressionNodes so need to dig down to search through all ExpressionNodes.
+	if (!p_expression) {
+		return;
+	}
+
+	// ExpressionNode of type await, cast, get_node, identifier, literal, preload, self, subscript, unary are ignored as they can't be CallNode
+	// containing translation strings.
+	switch (p_expression->type) {
+		case GDScriptParser::Node::ARRAY: {
+			GDScriptParser::ArrayNode *array_node = static_cast<GDScriptParser::ArrayNode *>(p_expression);
+			for (int i = 0; i < array_node->elements.size(); i++) {
+				_assess_expression(array_node->elements[i]);
+			}
+			break;
+		}
+		case GDScriptParser::Node::ASSIGNMENT:
+			_assess_assignment(static_cast<GDScriptParser::AssignmentNode *>(p_expression));
+			break;
+		case GDScriptParser::Node::BINARY_OPERATOR: {
+			GDScriptParser::BinaryOpNode *binary_op_node = static_cast<GDScriptParser::BinaryOpNode *>(p_expression);
+			_assess_expression(binary_op_node->left_operand);
+			_assess_expression(binary_op_node->right_operand);
+			break;
+		}
+		case GDScriptParser::Node::CALL: {
+			GDScriptParser::CallNode *call_node = static_cast<GDScriptParser::CallNode *>(p_expression);
+			_extract_from_call(call_node);
+			for (int i = 0; i < call_node->arguments.size(); i++) {
+				_assess_expression(call_node->arguments[i]);
+			}
+		} break;
+		case GDScriptParser::Node::DICTIONARY: {
+			GDScriptParser::DictionaryNode *dict_node = static_cast<GDScriptParser::DictionaryNode *>(p_expression);
+			for (int i = 0; i < dict_node->elements.size(); i++) {
+				_assess_expression(dict_node->elements[i].key);
+				_assess_expression(dict_node->elements[i].value);
+			}
+			break;
+		}
+		case GDScriptParser::Node::TERNARY_OPERATOR: {
+			GDScriptParser::TernaryOpNode *ternary_op_node = static_cast<GDScriptParser::TernaryOpNode *>(p_expression);
+			_assess_expression(ternary_op_node->condition);
+			_assess_expression(ternary_op_node->true_expr);
+			_assess_expression(ternary_op_node->false_expr);
+			break;
+		}
+		default:
+			break;
+	}
+}
+
+void GDScriptEditorTranslationParserPlugin::_assess_assignment(GDScriptParser::AssignmentNode *p_assignment) {
+	// Extract the translatable strings coming from assignments. For example, get_node("Label").text = "____"
+
+	StringName assignee_name;
+	if (p_assignment->assignee->type == GDScriptParser::Node::IDENTIFIER) {
+		assignee_name = static_cast<GDScriptParser::IdentifierNode *>(p_assignment->assignee)->name;
+	} else if (p_assignment->assignee->type == GDScriptParser::Node::SUBSCRIPT) {
+		assignee_name = static_cast<GDScriptParser::SubscriptNode *>(p_assignment->assignee)->attribute->name;
+	}
+
+	if (assignment_patterns.has(assignee_name) && p_assignment->assigned_value->type == GDScriptParser::Node::LITERAL) {
+		// If the assignment is towards one of the extract patterns (text, hint_tooltip etc.), and the value is a string literal, we collect the string.
+		ids->push_back(static_cast<GDScriptParser::LiteralNode *>(p_assignment->assigned_value)->value);
+	} else if (assignee_name == fd_filters && p_assignment->assigned_value->type == GDScriptParser::Node::CALL) {
+		// FileDialog.filters accepts assignment in the form of PackedStringArray. For example,
+		// get_node("FileDialog").filters = PackedStringArray(["*.png ; PNG Images","*.gd ; GDScript Files"]).
+
+		GDScriptParser::CallNode *call_node = static_cast<GDScriptParser::CallNode *>(p_assignment->assigned_value);
+		if (call_node->arguments[0]->type == GDScriptParser::Node::ARRAY) {
+			GDScriptParser::ArrayNode *array_node = static_cast<GDScriptParser::ArrayNode *>(call_node->arguments[0]);
+
+			// Extract the name in "extension ; name" of PackedStringArray.
+			for (int i = 0; i < array_node->elements.size(); i++) {
+				_extract_fd_literals(array_node->elements[i]);
+			}
+		}
+	} else {
+		// If the assignee is not in extract patterns or the assigned_value is not Literal type, try to see if the assigned_value contains tr().
+		_assess_expression(p_assignment->assigned_value);
+	}
+}
+
+void GDScriptEditorTranslationParserPlugin::_extract_from_call(GDScriptParser::CallNode *p_call) {
+	// Extract the translatable strings coming from function calls. For example:
+	// tr("___"), get_node("Label").set_text("____"), get_node("LineEdit").set_placeholder("____").
+
+	StringName function_name = p_call->function_name;
+
+	// Variables for extracting tr() and tr_n().
+	Vector<String> id_ctx_plural;
+	id_ctx_plural.resize(3);
+	bool extract_id_ctx_plural = true;
+
+	if (function_name == tr_func) {
+		// Extract from tr(id, ctx).
+		for (int i = 0; i < p_call->arguments.size(); i++) {
+			if (p_call->arguments[i]->type == GDScriptParser::Node::LITERAL) {
+				id_ctx_plural.write[i] = static_cast<GDScriptParser::LiteralNode *>(p_call->arguments[i])->value;
+			} else {
+				// Avoid adding something like tr("Flying dragon", var_context_level_1). We want to extract both id and context together.
+				extract_id_ctx_plural = false;
+			}
+		}
+		if (extract_id_ctx_plural) {
+			ids_ctx_plural->push_back(id_ctx_plural);
+		}
+	} else if (function_name == trn_func) {
+		// Extract from tr_n(id, plural, n, ctx).
+		Vector<int> indices;
+		indices.push_back(0);
+		indices.push_back(3);
+		indices.push_back(1);
+		for (int i = 0; i < indices.size(); i++) {
+			if (indices[i] >= p_call->arguments.size()) {
+				continue;
+			}
+
+			if (p_call->arguments[indices[i]]->type == GDScriptParser::Node::LITERAL) {
+				id_ctx_plural.write[i] = static_cast<GDScriptParser::LiteralNode *>(p_call->arguments[indices[i]])->value;
+			} else {
+				extract_id_ctx_plural = false;
+			}
+		}
+		if (extract_id_ctx_plural) {
+			ids_ctx_plural->push_back(id_ctx_plural);
+		}
+	} else if (first_arg_patterns.has(function_name)) {
+		// Extracting argument with only string literals. In other words, not extracting something like set_text("hello " + some_var).
+		if (p_call->arguments[0]->type == GDScriptParser::Node::LITERAL) {
+			ids->push_back(static_cast<GDScriptParser::LiteralNode *>(p_call->arguments[0])->value);
+		}
+	} else if (second_arg_patterns.has(function_name)) {
+		if (p_call->arguments[1]->type == GDScriptParser::Node::LITERAL) {
+			ids->push_back(static_cast<GDScriptParser::LiteralNode *>(p_call->arguments[1])->value);
+		}
+	} else if (function_name == fd_add_filter) {
+		// Extract the 'JPE Images' in this example - get_node("FileDialog").add_filter("*.jpg; JPE Images").
+		_extract_fd_literals(p_call->arguments[0]);
+
+	} else if (function_name == fd_set_filter && p_call->arguments[0]->type == GDScriptParser::Node::CALL) {
+		// FileDialog.set_filters() accepts assignment in the form of PackedStringArray. For example,
+		// get_node("FileDialog").set_filters( PackedStringArray(["*.png ; PNG Images","*.gd ; GDScript Files"])).
+
+		GDScriptParser::CallNode *call_node = static_cast<GDScriptParser::CallNode *>(p_call->arguments[0]);
+		if (call_node->arguments[0]->type == GDScriptParser::Node::ARRAY) {
+			GDScriptParser::ArrayNode *array_node = static_cast<GDScriptParser::ArrayNode *>(call_node->arguments[0]);
+			for (int i = 0; i < array_node->elements.size(); i++) {
+				_extract_fd_literals(array_node->elements[i]);
+			}
+		}
+	}
+}
+
+void GDScriptEditorTranslationParserPlugin::_extract_fd_literals(GDScriptParser::ExpressionNode *p_expression) {
+	// Extract the name in "extension ; name".
+
+	if (p_expression->type == GDScriptParser::Node::LITERAL) {
+		String arg_val = String(static_cast<GDScriptParser::LiteralNode *>(p_expression)->value);
+		PackedStringArray arr = arg_val.split(";", true);
+		if (arr.size() != 2) {
+			ERR_PRINT("Argument for setting FileDialog has bad format.");
+			return;
+		}
+		ids->push_back(arr[1].strip_edges());
+	}
+}
+
+GDScriptEditorTranslationParserPlugin::GDScriptEditorTranslationParserPlugin() {
+	assignment_patterns.insert("text");
+	assignment_patterns.insert("placeholder_text");
+	assignment_patterns.insert("hint_tooltip");
+
+	first_arg_patterns.insert("set_text");
+	first_arg_patterns.insert("set_tooltip");
+	first_arg_patterns.insert("set_placeholder");
+	first_arg_patterns.insert("add_tab");
+	first_arg_patterns.insert("add_check_item");
+	first_arg_patterns.insert("add_item");
+	first_arg_patterns.insert("add_multistate_item");
+	first_arg_patterns.insert("add_radio_check_item");
+	first_arg_patterns.insert("add_separator");
+	first_arg_patterns.insert("add_submenu_item");
+
+	second_arg_patterns.insert("set_tab_title");
+	second_arg_patterns.insert("add_icon_check_item");
+	second_arg_patterns.insert("add_icon_item");
+	second_arg_patterns.insert("add_icon_radio_check_item");
+	second_arg_patterns.insert("set_item_text");
+}
diff --git a/modules/gdscript/editor/gdscript_translation_parser_plugin.h b/modules/gdscript/editor/gdscript_translation_parser_plugin.h
new file mode 100644
index 0000000000..5ea416d4cc
--- /dev/null
+++ b/modules/gdscript/editor/gdscript_translation_parser_plugin.h
@@ -0,0 +1,73 @@
+/*************************************************************************/
+/*  gdscript_translation_parser_plugin.h                                 */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef GDSCRIPT_TRANSLATION_PARSER_PLUGIN_H
+#define GDSCRIPT_TRANSLATION_PARSER_PLUGIN_H
+
+#include "core/set.h"
+#include "editor/editor_translation_parser.h"
+#include "modules/gdscript/gdscript_parser.h"
+#include "modules/regex/regex.h"
+
+class GDScriptEditorTranslationParserPlugin : public EditorTranslationParserPlugin {
+	GDCLASS(GDScriptEditorTranslationParserPlugin, EditorTranslationParserPlugin);
+
+	Vector<String> *ids;
+	Vector<Vector<String>> *ids_ctx_plural;
+
+	// List of patterns used for extracting translation strings.
+	StringName tr_func = "tr";
+	StringName trn_func = "tr_n";
+	Set<StringName> assignment_patterns;
+	Set<StringName> first_arg_patterns;
+	Set<StringName> second_arg_patterns;
+	// FileDialog patterns.
+	StringName fd_add_filter = "add_filter";
+	StringName fd_set_filter = "set_filters";
+	StringName fd_filters = "filters";
+
+	void _traverse_class(const GDScriptParser::ClassNode *p_class);
+	void _traverse_function(const GDScriptParser::FunctionNode *p_func);
+	void _traverse_block(const GDScriptParser::SuiteNode *p_suite);
+
+	void _read_variable(const GDScriptParser::VariableNode *p_var);
+	void _assess_expression(GDScriptParser::ExpressionNode *p_expression);
+	void _assess_assignment(GDScriptParser::AssignmentNode *p_assignment);
+	void _extract_from_call(GDScriptParser::CallNode *p_call);
+	void _extract_fd_literals(GDScriptParser::ExpressionNode *p_expression);
+
+public:
+	virtual Error parse_file(const String &p_path, Vector<String> *r_ids, Vector<Vector<String>> *r_ids_ctx_plural) override;
+	virtual void get_recognized_extensions(List<String> *r_extensions) const override;
+
+	GDScriptEditorTranslationParserPlugin();
+};
+
+#endif // GDSCRIPT_TRANSLATION_PARSER_PLUGIN_H
diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp
index a255b92257..3519038ae6 100644
--- a/modules/gdscript/gdscript.cpp
+++ b/modules/gdscript/gdscript.cpp
@@ -30,6 +30,8 @@
 
 #include "gdscript.h"
 
+#include <stdint.h>
+
 #include "core/core_string_names.h"
 #include "core/engine.h"
 #include "core/global_constants.h"
@@ -37,17 +39,19 @@
 #include "core/os/file_access.h"
 #include "core/os/os.h"
 #include "core/project_settings.h"
+#include "gdscript_analyzer.h"
+#include "gdscript_cache.h"
 #include "gdscript_compiler.h"
+#include "gdscript_parser.h"
+#include "gdscript_warning.h"
 
 ///////////////////////////
 
 GDScriptNativeClass::GDScriptNativeClass(const StringName &p_name) {
-
 	name = p_name;
 }
 
 bool GDScriptNativeClass::_get(const StringName &p_name, Variant &r_ret) const {
-
 	bool ok;
 	int v = ClassDB::get_integer_constant(name, p_name, &ok);
 
@@ -60,12 +64,10 @@ bool GDScriptNativeClass::_get(const StringName &p_name, Variant &r_ret) const {
 }
 
 void GDScriptNativeClass::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("new"), &GDScriptNativeClass::_new);
 }
 
 Variant GDScriptNativeClass::_new() {
-
 	Object *o = instance();
 	ERR_FAIL_COND_V_MSG(!o, Variant(), "Class type: '" + String(name) + "' is not instantiable.");
 
@@ -78,12 +80,21 @@ Variant GDScriptNativeClass::_new() {
 }
 
 Object *GDScriptNativeClass::instance() {
-
 	return ClassDB::instance(name);
 }
 
-GDScriptInstance *GDScript::_create_instance(const Variant **p_args, int p_argcount, Object *p_owner, bool p_isref, Variant::CallError &r_error) {
+void GDScript::_super_implicit_constructor(GDScript *p_script, GDScriptInstance *p_instance, Callable::CallError &r_error) {
+	GDScript *base = p_script->_base;
+	if (base != nullptr) {
+		_super_implicit_constructor(base, p_instance, r_error);
+		if (r_error.error != Callable::CallError::CALL_OK) {
+			return;
+		}
+	}
+	p_script->implicit_initializer->call(p_instance, nullptr, 0, r_error);
+}
 
+GDScriptInstance *GDScript::_create_instance(const Variant **p_args, int p_argcount, Object *p_owner, bool p_isref, Callable::CallError &r_error) {
 	/* STEP 1, CREATE */
 
 	GDScriptInstance *instance = memnew(GDScriptInstance);
@@ -91,6 +102,7 @@ GDScriptInstance *GDScript::_create_instance(const Variant **p_args, int p_argco
 	instance->members.resize(member_indices.size());
 	instance->script = Ref<GDScript>(this);
 	instance->owner = p_owner;
+	instance->owner_id = p_owner->get_instance_id();
 #ifdef DEBUG_ENABLED
 	//needed for hot reloading
 	for (Map<StringName, MemberInfo>::Element *E = member_indices.front(); E; E = E->next()) {
@@ -100,49 +112,52 @@ GDScriptInstance *GDScript::_create_instance(const Variant **p_args, int p_argco
 	instance->owner->set_script_instance(instance);
 
 	/* STEP 2, INITIALIZE AND CONSTRUCT */
+	{
+		MutexLock lock(GDScriptLanguage::singleton->lock);
+		instances.insert(instance->owner);
+	}
 
-#ifndef NO_THREADS
-	GDScriptLanguage::singleton->lock->lock();
-#endif
-
-	instances.insert(instance->owner);
-
-#ifndef NO_THREADS
-	GDScriptLanguage::singleton->lock->unlock();
-#endif
-
-	initializer->call(instance, p_args, p_argcount, r_error);
-
-	if (r_error.error != Variant::CallError::CALL_OK) {
+	_super_implicit_constructor(this, instance, r_error);
+	if (r_error.error != Callable::CallError::CALL_OK) {
 		instance->script = Ref<GDScript>();
-		instance->owner->set_script_instance(NULL);
-#ifndef NO_THREADS
-		GDScriptLanguage::singleton->lock->lock();
-#endif
-		instances.erase(p_owner);
-#ifndef NO_THREADS
-		GDScriptLanguage::singleton->lock->unlock();
-#endif
-
-		ERR_FAIL_COND_V(r_error.error != Variant::CallError::CALL_OK, NULL); //error constructing
+		instance->owner->set_script_instance(nullptr);
+		{
+			MutexLock lock(GDScriptLanguage::singleton->lock);
+			instances.erase(p_owner);
+		}
+		ERR_FAIL_V_MSG(nullptr, "Error constructing a GDScriptInstance.");
 	}
 
+	if (p_argcount < 0) {
+		return instance;
+	}
+	if (initializer != nullptr) {
+		initializer->call(instance, p_args, p_argcount, r_error);
+		if (r_error.error != Callable::CallError::CALL_OK) {
+			instance->script = Ref<GDScript>();
+			instance->owner->set_script_instance(nullptr);
+			{
+				MutexLock lock(GDScriptLanguage::singleton->lock);
+				instances.erase(p_owner);
+			}
+			ERR_FAIL_V_MSG(nullptr, "Error constructing a GDScriptInstance.");
+		}
+	}
 	//@TODO make thread safe
 	return instance;
 }
 
-Variant GDScript::_new(const Variant **p_args, int p_argcount, Variant::CallError &r_error) {
-
+Variant GDScript::_new(const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
 	/* STEP 1, CREATE */
 
 	if (!valid) {
-		r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+		r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 		return Variant();
 	}
 
-	r_error.error = Variant::CallError::CALL_OK;
+	r_error.error = Callable::CallError::CALL_OK;
 	REF ref;
-	Object *owner = NULL;
+	Object *owner = nullptr;
 
 	GDScript *_baseptr = this;
 	while (_baseptr->_base) {
@@ -162,7 +177,7 @@ Variant GDScript::_new(const Variant **p_args, int p_argcount, Variant::CallErro
 		ref = REF(r);
 	}
 
-	GDScriptInstance *instance = _create_instance(p_args, p_argcount, owner, r != NULL, r_error);
+	GDScriptInstance *instance = _create_instance(p_args, p_argcount, owner, r != nullptr, r_error);
 	if (!instance) {
 		if (ref.is_null()) {
 			memdelete(owner); //no owner, sorry
@@ -178,7 +193,6 @@ Variant GDScript::_new(const Variant **p_args, int p_argcount, Variant::CallErro
 }
 
 bool GDScript::can_instance() const {
-
 #ifdef TOOLS_ENABLED
 	return valid && (tool || ScriptServer::is_scripting_enabled());
 #else
@@ -187,7 +201,6 @@ bool GDScript::can_instance() const {
 }
 
 Ref<Script> GDScript::get_base_script() const {
-
 	if (_base) {
 		return Ref<GDScript>(_base);
 	} else {
@@ -196,16 +209,16 @@ Ref<Script> GDScript::get_base_script() const {
 }
 
 StringName GDScript::get_instance_base_type() const {
-
-	if (native.is_valid())
+	if (native.is_valid()) {
 		return native->get_name();
-	if (base.is_valid() && base->is_valid())
+	}
+	if (base.is_valid() && base->is_valid()) {
 		return base->get_instance_base_type();
+	}
 	return StringName();
 }
 
 struct _GDScriptMemberSort {
-
 	int index;
 	StringName name;
 	_FORCE_INLINE_ bool operator<(const _GDScriptMemberSort &p_member) const { return index < p_member.index; }
@@ -214,13 +227,11 @@ struct _GDScriptMemberSort {
 #ifdef TOOLS_ENABLED
 
 void GDScript::_placeholder_erased(PlaceHolderScriptInstance *p_placeholder) {
-
 	placeholders.erase(p_placeholder);
 }
 #endif
 
 void GDScript::get_script_method_list(List<MethodInfo> *p_list) const {
-
 	const GDScript *current = this;
 	while (current) {
 		for (const Map<StringName, GDScriptFunction *>::Element *E = current->member_functions.front(); E; E = E->next()) {
@@ -240,15 +251,12 @@ void GDScript::get_script_method_list(List<MethodInfo> *p_list) const {
 }
 
 void GDScript::get_script_property_list(List<PropertyInfo> *p_list) const {
-
 	const GDScript *sptr = this;
 	List<PropertyInfo> props;
 
 	while (sptr) {
-
 		Vector<_GDScriptMemberSort> msort;
 		for (Map<StringName, PropertyInfo>::Element *E = sptr->member_info.front(); E; E = E->next()) {
-
 			_GDScriptMemberSort ms;
 			ERR_CONTINUE(!sptr->member_indices.has(E->key()));
 			ms.index = sptr->member_indices[E->key()].index;
@@ -259,7 +267,6 @@ void GDScript::get_script_property_list(List<PropertyInfo> *p_list) const {
 		msort.sort();
 		msort.invert();
 		for (int i = 0; i < msort.size(); i++) {
-
 			props.push_front(sptr->member_info[msort[i].name]);
 		}
 
@@ -272,15 +279,14 @@ void GDScript::get_script_property_list(List<PropertyInfo> *p_list) const {
 }
 
 bool GDScript::has_method(const StringName &p_method) const {
-
 	return member_functions.has(p_method);
 }
 
 MethodInfo GDScript::get_method_info(const StringName &p_method) const {
-
 	const Map<StringName, GDScriptFunction *>::Element *E = member_functions.find(p_method);
-	if (!E)
+	if (!E) {
 		return MethodInfo();
+	}
 
 	GDScriptFunction *func = E->get();
 	MethodInfo mi;
@@ -294,7 +300,6 @@ MethodInfo GDScript::get_method_info(const StringName &p_method) const {
 }
 
 bool GDScript::get_property_default_value(const StringName &p_property, Variant &r_value) const {
-
 #ifdef TOOLS_ENABLED
 
 	const Map<StringName, Variant>::Element *E = member_default_values_cache.find(p_property);
@@ -311,23 +316,22 @@ bool GDScript::get_property_default_value(const StringName &p_property, Variant
 }
 
 ScriptInstance *GDScript::instance_create(Object *p_this) {
-
 	GDScript *top = this;
-	while (top->_base)
+	while (top->_base) {
 		top = top->_base;
+	}
 
 	if (top->native.is_valid()) {
 		if (!ClassDB::is_parent_class(p_this->get_class_name(), top->native->get_name())) {
-
-			if (ScriptDebugger::get_singleton()) {
+			if (EngineDebugger::is_active()) {
 				GDScriptLanguage::get_singleton()->debug_break_parse(get_path(), 1, "Script inherits from native type '" + String(top->native->get_name()) + "', so it can't be instanced in object of type: '" + p_this->get_class() + "'");
 			}
-			ERR_FAIL_V_MSG(NULL, "Script inherits from native type '" + String(top->native->get_name()) + "', so it can't be instanced in object of type '" + p_this->get_class() + "'" + ".");
+			ERR_FAIL_V_MSG(nullptr, "Script inherits from native type '" + String(top->native->get_name()) + "', so it can't be instanced in object of type '" + p_this->get_class() + "'" + ".");
 		}
 	}
 
-	Variant::CallError unchecked_error;
-	return _create_instance(NULL, 0, p_this, Object::cast_to<Reference>(p_this) != NULL, unchecked_error);
+	Callable::CallError unchecked_error;
+	return _create_instance(nullptr, 0, p_this, Object::cast_to<Reference>(p_this) != nullptr, unchecked_error);
 }
 
 PlaceHolderScriptInstance *GDScript::placeholder_instance_create(Object *p_this) {
@@ -337,36 +341,28 @@ PlaceHolderScriptInstance *GDScript::placeholder_instance_create(Object *p_this)
 	_update_exports();
 	return si;
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
 bool GDScript::instance_has(const Object *p_this) const {
+	MutexLock lock(GDScriptLanguage::singleton->lock);
 
-#ifndef NO_THREADS
-	GDScriptLanguage::singleton->lock->lock();
-#endif
-	bool hasit = instances.has((Object *)p_this);
-
-#ifndef NO_THREADS
-	GDScriptLanguage::singleton->lock->unlock();
-#endif
-
-	return hasit;
+	return instances.has((Object *)p_this);
 }
 
 bool GDScript::has_source_code() const {
-
 	return source != "";
 }
-String GDScript::get_source_code() const {
 
+String GDScript::get_source_code() const {
 	return source;
 }
-void GDScript::set_source_code(const String &p_code) {
 
-	if (source == p_code)
+void GDScript::set_source_code(const String &p_code) {
+	if (source == p_code) {
 		return;
+	}
 	source = p_code;
 #ifdef TOOLS_ENABLED
 	source_changed_cache = true;
@@ -375,7 +371,6 @@ void GDScript::set_source_code(const String &p_code) {
 
 #ifdef TOOLS_ENABLED
 void GDScript::_update_exports_values(Map<StringName, Variant> &values, List<PropertyInfo> &propnames) {
-
 	if (base_cache.is_valid()) {
 		base_cache->_update_exports_values(values, propnames);
 	}
@@ -390,10 +385,15 @@ void GDScript::_update_exports_values(Map<StringName, Variant> &values, List<Pro
 }
 #endif
 
-bool GDScript::_update_exports() {
-
+bool GDScript::_update_exports(bool *r_err, bool p_recursive_call) {
 #ifdef TOOLS_ENABLED
 
+	static Vector<GDScript *> base_caches;
+	if (!p_recursive_call) {
+		base_caches.clear();
+	}
+	base_caches.append(this);
+
 	bool changed = false;
 
 	if (source_changed_cache) {
@@ -402,21 +402,20 @@ bool GDScript::_update_exports() {
 
 		String basedir = path;
 
-		if (basedir == "")
+		if (basedir == "") {
 			basedir = get_path();
+		}
 
-		if (basedir != "")
+		if (basedir != "") {
 			basedir = basedir.get_base_dir();
+		}
 
 		GDScriptParser parser;
-		Error err = parser.parse(source, basedir, true, path);
+		GDScriptAnalyzer analyzer(&parser);
+		Error err = parser.parse(source, path, false);
 
-		if (err == OK) {
-
-			const GDScriptParser::Node *root = parser.get_parse_tree();
-			ERR_FAIL_COND_V(root->type != GDScriptParser::Node::TYPE_CLASS, false);
-
-			const GDScriptParser::ClassNode *c = static_cast<const GDScriptParser::ClassNode *>(root);
+		if (err == OK && analyzer.analyze() == OK) {
+			const GDScriptParser::ClassNode *c = parser.get_tree();
 
 			if (base_cache.is_valid()) {
 				base_cache->inheriters_cache.erase(get_instance_id());
@@ -425,32 +424,29 @@ bool GDScript::_update_exports() {
 
 			if (c->extends_used) {
 				String path = "";
-				if (String(c->extends_file) != "" && String(c->extends_file) != get_path()) {
-					path = c->extends_file;
+				if (String(c->extends_path) != "" && String(c->extends_path) != get_path()) {
+					path = c->extends_path;
 					if (path.is_rel_path()) {
-
 						String base = get_path();
 						if (base == "" || base.is_rel_path()) {
-
 							ERR_PRINT(("Could not resolve relative path for parent class: " + path).utf8().get_data());
 						} else {
 							path = base.get_base_dir().plus_file(path);
 						}
 					}
-				} else if (c->extends_class.size() != 0) {
-					String base = c->extends_class[0];
+				} else if (c->extends.size() != 0) {
+					const StringName &base = c->extends[0];
 
-					if (ScriptServer::is_global_class(base))
+					if (ScriptServer::is_global_class(base)) {
 						path = ScriptServer::get_global_class_path(base);
+					}
 				}
 
 				if (path != "") {
 					if (path != get_path()) {
-
 						Ref<GDScript> bf = ResourceLoader::load(path);
 
 						if (bf.is_valid()) {
-
 							base_cache = bf;
 							bf->inheriters_cache.insert(get_instance_id());
 						}
@@ -462,19 +458,36 @@ bool GDScript::_update_exports() {
 
 			members_cache.clear();
 			member_default_values_cache.clear();
+			_signals.clear();
 
-			for (int i = 0; i < c->variables.size(); i++) {
-				if (c->variables[i]._export.type == Variant::NIL)
-					continue;
-
-				members_cache.push_back(c->variables[i]._export);
-				member_default_values_cache[c->variables[i].identifier] = c->variables[i].default_value;
-			}
+			for (int i = 0; i < c->members.size(); i++) {
+				const GDScriptParser::ClassNode::Member &member = c->members[i];
 
-			_signals.clear();
+				switch (member.type) {
+					case GDScriptParser::ClassNode::Member::VARIABLE: {
+						if (!member.variable->exported) {
+							continue;
+						}
 
-			for (int i = 0; i < c->_signals.size(); i++) {
-				_signals[c->_signals[i].name] = c->_signals[i].arguments;
+						members_cache.push_back(member.variable->export_info);
+						Variant default_value;
+						if (member.variable->initializer && member.variable->initializer->is_constant) {
+							default_value = member.variable->initializer->reduced_value;
+						}
+						member_default_values_cache[member.variable->identifier->name] = default_value;
+					} break;
+					case GDScriptParser::ClassNode::Member::SIGNAL: {
+						// TODO: Cache this in parser to avoid loops like this.
+						Vector<StringName> parameters_names;
+						parameters_names.resize(member.signal->parameters.size());
+						for (int j = 0; j < member.signal->parameters.size(); j++) {
+							parameters_names.write[j] = member.signal->parameters[j]->identifier->name;
+						}
+						_signals[member.signal->identifier->name] = parameters_names;
+					} break;
+					default:
+						break; // Nothing.
+				}
 			}
 		} else {
 			placeholder_fallback_enabled = true;
@@ -487,7 +500,24 @@ bool GDScript::_update_exports() {
 	placeholder_fallback_enabled = false;
 
 	if (base_cache.is_valid() && base_cache->is_valid()) {
-		if (base_cache->_update_exports()) {
+		for (int i = 0; i < base_caches.size(); i++) {
+			if (base_caches[i] == base_cache.ptr()) {
+				if (r_err) {
+					*r_err = true;
+				}
+				valid = false; // to show error in the editor
+				base_cache->valid = false;
+				base_cache->inheriters_cache.clear(); // to prevent future stackoverflows
+				base_cache.unref();
+				base.unref();
+				_base = nullptr;
+				ERR_FAIL_V_MSG(false, "Cyclic inheritance in script class.");
+			}
+		}
+		if (base_cache->_update_exports(r_err, true)) {
+			if (r_err && *r_err) {
+				return false;
+			}
 			changed = true;
 		}
 	}
@@ -512,18 +542,22 @@ bool GDScript::_update_exports() {
 }
 
 void GDScript::update_exports() {
-
 #ifdef TOOLS_ENABLED
 
-	_update_exports();
+	bool cyclic_error = false;
+	_update_exports(&cyclic_error);
+	if (cyclic_error) {
+		return;
+	}
 
 	Set<ObjectID> copy = inheriters_cache; //might get modified
 
 	for (Set<ObjectID>::Element *E = copy.front(); E; E = E->next()) {
 		Object *id = ObjectDB::get_instance(E->get());
 		GDScript *s = Object::cast_to<GDScript>(id);
-		if (!s)
+		if (!s) {
 			continue;
+		}
 		s->update_exports();
 	}
 
@@ -531,60 +565,82 @@ void GDScript::update_exports() {
 }
 
 void GDScript::_set_subclass_path(Ref<GDScript> &p_sc, const String &p_path) {
-
 	p_sc->path = p_path;
-	for (Map<StringName, Ref<GDScript> >::Element *E = p_sc->subclasses.front(); E; E = E->next()) {
-
+	for (Map<StringName, Ref<GDScript>>::Element *E = p_sc->subclasses.front(); E; E = E->next()) {
 		_set_subclass_path(E->get(), p_path);
 	}
 }
 
 Error GDScript::reload(bool p_keep_state) {
+	bool has_instances;
+	{
+		MutexLock lock(GDScriptLanguage::singleton->lock);
 
-#ifndef NO_THREADS
-	GDScriptLanguage::singleton->lock->lock();
-#endif
-	bool has_instances = instances.size();
-
-#ifndef NO_THREADS
-	GDScriptLanguage::singleton->lock->unlock();
-#endif
+		has_instances = instances.size();
+	}
 
 	ERR_FAIL_COND_V(!p_keep_state && has_instances, ERR_ALREADY_IN_USE);
 
 	String basedir = path;
 
-	if (basedir == "")
+	if (basedir == "") {
 		basedir = get_path();
+	}
 
-	if (basedir != "")
+	if (basedir != "") {
 		basedir = basedir.get_base_dir();
+	}
 
 	if (source.find("%BASE%") != -1) {
 		//loading a template, don't parse
 		return OK;
 	}
 
+	{
+		String source_path = path;
+		if (source_path.empty()) {
+			source_path = get_path();
+		}
+		if (!source_path.empty()) {
+			MutexLock lock(GDScriptCache::singleton->lock);
+			if (!GDScriptCache::singleton->shallow_gdscript_cache.has(source_path)) {
+				GDScriptCache::singleton->shallow_gdscript_cache[source_path] = this;
+			}
+		}
+	}
+
 	valid = false;
 	GDScriptParser parser;
-	Error err = parser.parse(source, basedir, false, path);
+	Error err = parser.parse(source, path, false);
 	if (err) {
-		if (ScriptDebugger::get_singleton()) {
-			GDScriptLanguage::get_singleton()->debug_break_parse(get_path(), parser.get_error_line(), "Parser Error: " + parser.get_error());
+		if (EngineDebugger::is_active()) {
+			GDScriptLanguage::get_singleton()->debug_break_parse(get_path(), parser.get_errors().front()->get().line, "Parser Error: " + parser.get_errors().front()->get().message);
 		}
-		_err_print_error("GDScript::reload", path.empty() ? "built-in" : (const char *)path.utf8().get_data(), parser.get_error_line(), ("Parse Error: " + parser.get_error()).utf8().get_data(), ERR_HANDLER_SCRIPT);
+		// TODO: Show all error messages.
+		_err_print_error("GDScript::reload", path.empty() ? "built-in" : (const char *)path.utf8().get_data(), parser.get_errors().front()->get().line, ("Parse Error: " + parser.get_errors().front()->get().message).utf8().get_data(), ERR_HANDLER_SCRIPT);
 		ERR_FAIL_V(ERR_PARSE_ERROR);
 	}
 
-	bool can_run = ScriptServer::is_scripting_enabled() || parser.is_tool_script();
+	GDScriptAnalyzer analyzer(&parser);
+	err = analyzer.analyze();
+
+	if (err) {
+		if (EngineDebugger::is_active()) {
+			GDScriptLanguage::get_singleton()->debug_break_parse(get_path(), parser.get_errors().front()->get().line, "Parser Error: " + parser.get_errors().front()->get().message);
+		}
+		// TODO: Show all error messages.
+		_err_print_error("GDScript::reload", path.empty() ? "built-in" : (const char *)path.utf8().get_data(), parser.get_errors().front()->get().line, ("Parse Error: " + parser.get_errors().front()->get().message).utf8().get_data(), ERR_HANDLER_SCRIPT);
+		ERR_FAIL_V(ERR_PARSE_ERROR);
+	}
+
+	bool can_run = ScriptServer::is_scripting_enabled() || parser.is_tool();
 
 	GDScriptCompiler compiler;
 	err = compiler.compile(&parser, this, p_keep_state);
 
 	if (err) {
-
 		if (can_run) {
-			if (ScriptDebugger::get_singleton()) {
+			if (EngineDebugger::is_active()) {
 				GDScriptLanguage::get_singleton()->debug_break_parse(get_path(), compiler.get_error_line(), "Parser Error: " + compiler.get_error());
 			}
 			_err_print_error("GDScript::reload", path.empty() ? "built-in" : (const char *)path.utf8().get_data(), compiler.get_error_line(), ("Compile Error: " + compiler.get_error()).utf8().get_data(), ERR_HANDLER_SCRIPT);
@@ -596,30 +652,29 @@ Error GDScript::reload(bool p_keep_state) {
 #ifdef DEBUG_ENABLED
 	for (const List<GDScriptWarning>::Element *E = parser.get_warnings().front(); E; E = E->next()) {
 		const GDScriptWarning &warning = E->get();
-		if (ScriptDebugger::get_singleton()) {
+		if (EngineDebugger::is_active()) {
 			Vector<ScriptLanguage::StackInfo> si;
-			ScriptDebugger::get_singleton()->send_error("", get_path(), warning.line, warning.get_name(), warning.get_message(), ERR_HANDLER_WARNING, si);
+			EngineDebugger::get_script_debugger()->send_error("", get_path(), warning.start_line, warning.get_name(), warning.get_message(), ERR_HANDLER_WARNING, si);
 		}
 	}
 #endif
 
 	valid = true;
 
-	for (Map<StringName, Ref<GDScript> >::Element *E = subclasses.front(); E; E = E->next()) {
-
+	for (Map<StringName, Ref<GDScript>>::Element *E = subclasses.front(); E; E = E->next()) {
 		_set_subclass_path(E->get(), path);
 	}
 
+	_init_rpc_methods_properties();
+
 	return OK;
 }
 
 ScriptLanguage *GDScript::get_language() const {
-
 	return GDScriptLanguage::get_singleton();
 }
 
 void GDScript::get_constants(Map<StringName, Variant> *p_constants) {
-
 	if (p_constants) {
 		for (Map<StringName, Variant>::Element *E = constants.front(); E; E = E->next()) {
 			(*p_constants)[E->key()] = E->value();
@@ -635,17 +690,76 @@ void GDScript::get_members(Set<StringName> *p_members) {
 	}
 }
 
-Variant GDScript::call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error) {
+Vector<ScriptNetData> GDScript::get_rpc_methods() const {
+	return rpc_functions;
+}
+
+uint16_t GDScript::get_rpc_method_id(const StringName &p_method) const {
+	for (int i = 0; i < rpc_functions.size(); i++) {
+		if (rpc_functions[i].name == p_method) {
+			return i;
+		}
+	}
+	return UINT16_MAX;
+}
 
+StringName GDScript::get_rpc_method(const uint16_t p_rpc_method_id) const {
+	if (p_rpc_method_id >= rpc_functions.size()) {
+		return StringName();
+	}
+	return rpc_functions[p_rpc_method_id].name;
+}
+
+MultiplayerAPI::RPCMode GDScript::get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const {
+	if (p_rpc_method_id >= rpc_functions.size()) {
+		return MultiplayerAPI::RPC_MODE_DISABLED;
+	}
+	return rpc_functions[p_rpc_method_id].mode;
+}
+
+MultiplayerAPI::RPCMode GDScript::get_rpc_mode(const StringName &p_method) const {
+	return get_rpc_mode_by_id(get_rpc_method_id(p_method));
+}
+
+Vector<ScriptNetData> GDScript::get_rset_properties() const {
+	return rpc_variables;
+}
+
+uint16_t GDScript::get_rset_property_id(const StringName &p_variable) const {
+	for (int i = 0; i < rpc_variables.size(); i++) {
+		if (rpc_variables[i].name == p_variable) {
+			return i;
+		}
+	}
+	return UINT16_MAX;
+}
+
+StringName GDScript::get_rset_property(const uint16_t p_rset_member_id) const {
+	if (p_rset_member_id >= rpc_variables.size()) {
+		return StringName();
+	}
+	return rpc_variables[p_rset_member_id].name;
+}
+
+MultiplayerAPI::RPCMode GDScript::get_rset_mode_by_id(const uint16_t p_rset_member_id) const {
+	if (p_rset_member_id >= rpc_variables.size()) {
+		return MultiplayerAPI::RPC_MODE_DISABLED;
+	}
+	return rpc_variables[p_rset_member_id].mode;
+}
+
+MultiplayerAPI::RPCMode GDScript::get_rset_mode(const StringName &p_variable) const {
+	return get_rset_mode_by_id(get_rset_property_id(p_variable));
+}
+
+Variant GDScript::call(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
 	GDScript *top = this;
 	while (top) {
-
 		Map<StringName, GDScriptFunction *>::Element *E = top->member_functions.find(p_method);
 		if (E) {
-
 			ERR_FAIL_COND_V_MSG(!E->get()->is_static(), Variant(), "Can't call non-static function '" + String(p_method) + "' in script.");
 
-			return E->get()->call(NULL, p_args, p_argcount, r_error);
+			return E->get()->call(nullptr, p_args, p_argcount, r_error);
 		}
 		top = top->_base;
 	}
@@ -656,25 +770,20 @@ Variant GDScript::call(const StringName &p_method, const Variant **p_args, int p
 }
 
 bool GDScript::_get(const StringName &p_name, Variant &r_ret) const {
-
 	{
-
 		const GDScript *top = this;
 		while (top) {
-
 			{
 				const Map<StringName, Variant>::Element *E = top->constants.find(p_name);
 				if (E) {
-
 					r_ret = E->get();
 					return true;
 				}
 			}
 
 			{
-				const Map<StringName, Ref<GDScript> >::Element *E = subclasses.find(p_name);
+				const Map<StringName, Ref<GDScript>>::Element *E = subclasses.find(p_name);
 				if (E) {
-
 					r_ret = E->get();
 					return true;
 				}
@@ -683,7 +792,6 @@ bool GDScript::_get(const StringName &p_name, Variant &r_ret) const {
 		}
 
 		if (p_name == GDScriptLanguage::get_singleton()->strings._script_source) {
-
 			r_ret = get_source_code();
 			return true;
 		}
@@ -691,133 +799,56 @@ bool GDScript::_get(const StringName &p_name, Variant &r_ret) const {
 
 	return false;
 }
-bool GDScript::_set(const StringName &p_name, const Variant &p_value) {
 
+bool GDScript::_set(const StringName &p_name, const Variant &p_value) {
 	if (p_name == GDScriptLanguage::get_singleton()->strings._script_source) {
-
 		set_source_code(p_value);
 		reload();
-	} else
+	} else {
 		return false;
+	}
 
 	return true;
 }
 
 void GDScript::_get_property_list(List<PropertyInfo> *p_properties) const {
-
 	p_properties->push_back(PropertyInfo(Variant::STRING, "script/source", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL));
 }
 
 void GDScript::_bind_methods() {
-
 	ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT, "new", &GDScript::_new, MethodInfo("new"));
 
 	ClassDB::bind_method(D_METHOD("get_as_byte_code"), &GDScript::get_as_byte_code);
 }
 
 Vector<uint8_t> GDScript::get_as_byte_code() const {
-
-	GDScriptTokenizerBuffer tokenizer;
-	return tokenizer.parse_code_string(source);
+	return Vector<uint8_t>();
 };
 
+// TODO: Fully remove this. There's not this kind of "bytecode" anymore.
 Error GDScript::load_byte_code(const String &p_path) {
-
-	Vector<uint8_t> bytecode;
-
-	if (p_path.ends_with("gde")) {
-
-		FileAccess *fa = FileAccess::open(p_path, FileAccess::READ);
-		ERR_FAIL_COND_V(!fa, ERR_CANT_OPEN);
-
-		FileAccessEncrypted *fae = memnew(FileAccessEncrypted);
-		ERR_FAIL_COND_V(!fae, ERR_CANT_OPEN);
-
-		Vector<uint8_t> key;
-		key.resize(32);
-		for (int i = 0; i < key.size(); i++) {
-			key.write[i] = script_encryption_key[i];
-		}
-
-		Error err = fae->open_and_parse(fa, key, FileAccessEncrypted::MODE_READ);
-
-		if (err) {
-			fa->close();
-			memdelete(fa);
-			memdelete(fae);
-
-			ERR_FAIL_COND_V(err, err);
-		}
-
-		bytecode.resize(fae->get_len());
-		fae->get_buffer(bytecode.ptrw(), bytecode.size());
-		fae->close();
-		memdelete(fae);
-
-	} else {
-
-		bytecode = FileAccess::get_file_as_array(p_path);
-	}
-
-	ERR_FAIL_COND_V(bytecode.size() == 0, ERR_PARSE_ERROR);
-	path = p_path;
-
-	String basedir = path;
-
-	if (basedir == "")
-		basedir = get_path();
-
-	if (basedir != "")
-		basedir = basedir.get_base_dir();
-
-	valid = false;
-	GDScriptParser parser;
-	Error err = parser.parse_bytecode(bytecode, basedir, get_path());
-	if (err) {
-		_err_print_error("GDScript::load_byte_code", path.empty() ? "built-in" : (const char *)path.utf8().get_data(), parser.get_error_line(), ("Parse Error: " + parser.get_error()).utf8().get_data(), ERR_HANDLER_SCRIPT);
-		ERR_FAIL_V(ERR_PARSE_ERROR);
-	}
-
-	GDScriptCompiler compiler;
-	err = compiler.compile(&parser, this);
-
-	if (err) {
-		_err_print_error("GDScript::load_byte_code", path.empty() ? "built-in" : (const char *)path.utf8().get_data(), compiler.get_error_line(), ("Compile Error: " + compiler.get_error()).utf8().get_data(), ERR_HANDLER_SCRIPT);
-		ERR_FAIL_V(ERR_COMPILATION_FAILED);
-	}
-
-	valid = true;
-
-	for (Map<StringName, Ref<GDScript> >::Element *E = subclasses.front(); E; E = E->next()) {
-
-		_set_subclass_path(E->get(), path);
-	}
-
-	return OK;
+	return ERR_COMPILATION_FAILED;
 }
 
 Error GDScript::load_source_code(const String &p_path) {
-
-	PoolVector<uint8_t> sourcef;
+	Vector<uint8_t> sourcef;
 	Error err;
 	FileAccess *f = FileAccess::open(p_path, FileAccess::READ, &err);
 	if (err) {
-
 		ERR_FAIL_COND_V(err, err);
 	}
 
 	int len = f->get_len();
 	sourcef.resize(len + 1);
-	PoolVector<uint8_t>::Write w = sourcef.write();
-	int r = f->get_buffer(w.ptr(), len);
+	uint8_t *w = sourcef.ptrw();
+	int r = f->get_buffer(w, len);
 	f->close();
 	memdelete(f);
 	ERR_FAIL_COND_V(r != len, ERR_CANT_OPEN);
 	w[len] = 0;
 
 	String s;
-	if (s.parse_utf8((const char *)w.ptr())) {
-
+	if (s.parse_utf8((const char *)w)) {
 		ERR_FAIL_V_MSG(ERR_INVALID_DATA, "Script '" + p_path + "' contains invalid unicode (UTF-8), so it was not loaded. Please ensure that scripts are saved in valid UTF-8 unicode.");
 	}
 
@@ -830,29 +861,45 @@ Error GDScript::load_source_code(const String &p_path) {
 }
 
 const Map<StringName, GDScriptFunction *> &GDScript::debug_get_member_functions() const {
-
 	return member_functions;
 }
 
 StringName GDScript::debug_get_member_by_index(int p_idx) const {
-
 	for (const Map<StringName, MemberInfo>::Element *E = member_indices.front(); E; E = E->next()) {
-
-		if (E->get().index == p_idx)
+		if (E->get().index == p_idx) {
 			return E->key();
+		}
 	}
 
 	return "<error>";
 }
 
 Ref<GDScript> GDScript::get_base() const {
-
 	return base;
 }
 
+bool GDScript::inherits_script(const Ref<Script> &p_script) const {
+	Ref<GDScript> gd = p_script;
+	if (gd.is_null()) {
+		return false;
+	}
+
+	const GDScript *s = this;
+
+	while (s) {
+		if (s == p_script.ptr()) {
+			return true;
+		}
+		s = s->_base;
+	}
+
+	return false;
+}
+
 bool GDScript::has_script_signal(const StringName &p_signal) const {
-	if (_signals.has(p_signal))
+	if (_signals.has(p_signal)) {
 		return true;
+	}
 	if (base.is_valid()) {
 		return base->has_script_signal(p_signal);
 	}
@@ -863,10 +910,9 @@ bool GDScript::has_script_signal(const StringName &p_signal) const {
 #endif
 	return false;
 }
-void GDScript::get_script_signal_list(List<MethodInfo> *r_signals) const {
-
-	for (const Map<StringName, Vector<StringName> >::Element *E = _signals.front(); E; E = E->next()) {
 
+void GDScript::get_script_signal_list(List<MethodInfo> *r_signals) const {
+	for (const Map<StringName, Vector<StringName>>::Element *E = _signals.front(); E; E = E->next()) {
 		MethodInfo mi;
 		mi.name = E->key();
 		for (int i = 0; i < E->get().size(); i++) {
@@ -890,13 +936,11 @@ void GDScript::get_script_signal_list(List<MethodInfo> *r_signals) const {
 
 GDScript::GDScript() :
 		script_list(this) {
-
-	_static_ref = this;
 	valid = false;
 	subclass_count = 0;
-	initializer = NULL;
-	_base = NULL;
-	_owner = NULL;
+	initializer = nullptr;
+	_base = nullptr;
+	_owner = nullptr;
 	tool = false;
 #ifdef TOOLS_ENABLED
 	source_changed_cache = false;
@@ -904,13 +948,10 @@ GDScript::GDScript() :
 #endif
 
 #ifdef DEBUG_ENABLED
-	if (GDScriptLanguage::get_singleton()->lock) {
-		GDScriptLanguage::get_singleton()->lock->lock();
-	}
-	GDScriptLanguage::get_singleton()->script_list.add(&script_list);
+	{
+		MutexLock lock(GDScriptLanguage::get_singleton()->lock);
 
-	if (GDScriptLanguage::get_singleton()->lock) {
-		GDScriptLanguage::get_singleton()->lock->unlock();
+		GDScriptLanguage::get_singleton()->script_list.add(&script_list);
 	}
 #endif
 }
@@ -922,8 +963,8 @@ void GDScript::_save_orphaned_subclasses() {
 	};
 	Vector<ClassRefWithName> weak_subclasses;
 	// collect subclasses ObjectID and name
-	for (Map<StringName, Ref<GDScript> >::Element *E = subclasses.front(); E; E = E->next()) {
-		E->get()->_owner = NULL; //bye, you are no longer owned cause I died
+	for (Map<StringName, Ref<GDScript>>::Element *E = subclasses.front(); E; E = E->next()) {
+		E->get()->_owner = nullptr; //bye, you are no longer owned cause I died
 		ClassRefWithName subclass;
 		subclass.id = E->get()->get_instance_id();
 		subclass.fully_qualified_name = E->get()->fully_qualified_name;
@@ -939,28 +980,90 @@ void GDScript::_save_orphaned_subclasses() {
 	for (int i = 0; i < weak_subclasses.size(); i++) {
 		ClassRefWithName subclass = weak_subclasses[i];
 		Object *obj = ObjectDB::get_instance(subclass.id);
-		if (!obj)
+		if (!obj) {
 			continue;
+		}
 		// subclass is not released
 		GDScriptLanguage::get_singleton()->add_orphan_subclass(subclass.fully_qualified_name, subclass.id);
 	}
 }
 
+void GDScript::_init_rpc_methods_properties() {
+	// Copy the base rpc methods so we don't mask their IDs.
+	rpc_functions.clear();
+	rpc_variables.clear();
+	if (base.is_valid()) {
+		rpc_functions = base->rpc_functions;
+		rpc_variables = base->rpc_variables;
+	}
+
+	GDScript *cscript = this;
+	Map<StringName, Ref<GDScript>>::Element *sub_E = subclasses.front();
+	while (cscript) {
+		// RPC Methods
+		for (Map<StringName, GDScriptFunction *>::Element *E = cscript->member_functions.front(); E; E = E->next()) {
+			if (E->get()->get_rpc_mode() != MultiplayerAPI::RPC_MODE_DISABLED) {
+				ScriptNetData nd;
+				nd.name = E->key();
+				nd.mode = E->get()->get_rpc_mode();
+				if (-1 == rpc_functions.find(nd)) {
+					rpc_functions.push_back(nd);
+				}
+			}
+		}
+		// RSet
+		for (Map<StringName, MemberInfo>::Element *E = cscript->member_indices.front(); E; E = E->next()) {
+			if (E->get().rpc_mode != MultiplayerAPI::RPC_MODE_DISABLED) {
+				ScriptNetData nd;
+				nd.name = E->key();
+				nd.mode = E->get().rpc_mode;
+				if (-1 == rpc_variables.find(nd)) {
+					rpc_variables.push_back(nd);
+				}
+			}
+		}
+
+		if (cscript != this) {
+			sub_E = sub_E->next();
+		}
+
+		if (sub_E) {
+			cscript = sub_E->get().ptr();
+		} else {
+			cscript = nullptr;
+		}
+	}
+
+	// Sort so we are 100% that they are always the same.
+	rpc_functions.sort_custom<SortNetData>();
+	rpc_variables.sort_custom<SortNetData>();
+}
+
 GDScript::~GDScript() {
+	{
+		MutexLock lock(GDScriptLanguage::get_singleton()->lock);
+
+		while (SelfList<GDScriptFunctionState> *E = pending_func_states.first()) {
+			E->self()->_clear_stack();
+			pending_func_states.remove(E);
+		}
+	}
+
 	for (Map<StringName, GDScriptFunction *>::Element *E = member_functions.front(); E; E = E->next()) {
 		memdelete(E->get());
 	}
 
+	if (GDScriptCache::singleton) { // Cache may have been already destroyed at engine shutdown.
+		GDScriptCache::remove_script(get_path());
+	}
+
 	_save_orphaned_subclasses();
 
 #ifdef DEBUG_ENABLED
-	if (GDScriptLanguage::get_singleton()->lock) {
-		GDScriptLanguage::get_singleton()->lock->lock();
-	}
-	GDScriptLanguage::get_singleton()->script_list.remove(&script_list);
+	{
+		MutexLock lock(GDScriptLanguage::get_singleton()->lock);
 
-	if (GDScriptLanguage::get_singleton()->lock) {
-		GDScriptLanguage::get_singleton()->lock->unlock();
+		GDScriptLanguage::get_singleton()->script_list.remove(&script_list);
 	}
 #endif
 }
@@ -970,7 +1073,6 @@ GDScript::~GDScript() {
 //////////////////////////////
 
 bool GDScriptInstance::set(const StringName &p_name, const Variant &p_value) {
-
 	//member
 	{
 		const Map<StringName, GDScript::MemberInfo>::Element *E = script->member_indices.find(p_name);
@@ -978,18 +1080,18 @@ bool GDScriptInstance::set(const StringName &p_name, const Variant &p_value) {
 			const GDScript::MemberInfo *member = &E->get();
 			if (member->setter) {
 				const Variant *val = &p_value;
-				Variant::CallError err;
+				Callable::CallError err;
 				call(member->setter, &val, 1, err);
-				if (err.error == Variant::CallError::CALL_OK) {
+				if (err.error == Callable::CallError::CALL_OK) {
 					return true; //function exists, call was successful
 				}
 			} else {
 				if (!member->data_type.is_type(p_value)) {
 					// Try conversion
-					Variant::CallError ce;
+					Callable::CallError ce;
 					const Variant *value = &p_value;
 					Variant converted = Variant::construct(member->data_type.builtin_type, &value, 1, ce);
-					if (ce.error == Variant::CallError::CALL_OK) {
+					if (ce.error == Callable::CallError::CALL_OK) {
 						members.write[member->index] = converted;
 						return true;
 					} else {
@@ -1005,17 +1107,16 @@ bool GDScriptInstance::set(const StringName &p_name, const Variant &p_value) {
 
 	GDScript *sptr = script.ptr();
 	while (sptr) {
-
 		Map<StringName, GDScriptFunction *>::Element *E = sptr->member_functions.find(GDScriptLanguage::get_singleton()->strings._set);
 		if (E) {
-
 			Variant name = p_name;
 			const Variant *args[2] = { &name, &p_value };
 
-			Variant::CallError err;
+			Callable::CallError err;
 			Variant ret = E->get()->call(this, (const Variant **)args, 2, err);
-			if (err.error == Variant::CallError::CALL_OK && ret.get_type() == Variant::BOOL && ret.operator bool())
+			if (err.error == Callable::CallError::CALL_OK && ret.get_type() == Variant::BOOL && ret.operator bool()) {
 				return true;
+			}
 		}
 		sptr = sptr->_base;
 	}
@@ -1024,17 +1125,15 @@ bool GDScriptInstance::set(const StringName &p_name, const Variant &p_value) {
 }
 
 bool GDScriptInstance::get(const StringName &p_name, Variant &r_ret) const {
-
 	const GDScript *sptr = script.ptr();
 	while (sptr) {
-
 		{
 			const Map<StringName, GDScript::MemberInfo>::Element *E = script->member_indices.find(p_name);
 			if (E) {
 				if (E->get().getter) {
-					Variant::CallError err;
-					r_ret = const_cast<GDScriptInstance *>(this)->call(E->get().getter, NULL, 0, err);
-					if (err.error == Variant::CallError::CALL_OK) {
+					Callable::CallError err;
+					r_ret = const_cast<GDScriptInstance *>(this)->call(E->get().getter, nullptr, 0, err);
+					if (err.error == Callable::CallError::CALL_OK) {
 						return true;
 					}
 				}
@@ -1044,7 +1143,6 @@ bool GDScriptInstance::get(const StringName &p_name, Variant &r_ret) const {
 		}
 
 		{
-
 			const GDScript *sl = sptr;
 			while (sl) {
 				const Map<StringName, Variant>::Element *E = sl->constants.find(p_name);
@@ -1057,15 +1155,40 @@ bool GDScriptInstance::get(const StringName &p_name, Variant &r_ret) const {
 		}
 
 		{
+			// Signals.
+			const GDScript *sl = sptr;
+			while (sl) {
+				const Map<StringName, Vector<StringName>>::Element *E = sl->_signals.find(p_name);
+				if (E) {
+					r_ret = Signal(this->owner, E->key());
+					return true; //index found
+				}
+				sl = sl->_base;
+			}
+		}
+
+		{
+			// Methods.
+			const GDScript *sl = sptr;
+			while (sl) {
+				const Map<StringName, GDScriptFunction *>::Element *E = sl->member_functions.find(p_name);
+				if (E) {
+					r_ret = Callable(this->owner, E->key());
+					return true; //index found
+				}
+				sl = sl->_base;
+			}
+		}
+
+		{
 			const Map<StringName, GDScriptFunction *>::Element *E = sptr->member_functions.find(GDScriptLanguage::get_singleton()->strings._get);
 			if (E) {
-
 				Variant name = p_name;
 				const Variant *args[1] = { &name };
 
-				Variant::CallError err;
+				Callable::CallError err;
 				Variant ret = const_cast<GDScriptFunction *>(E->get())->call(const_cast<GDScriptInstance *>(this), (const Variant **)args, 1, err);
-				if (err.error == Variant::CallError::CALL_OK && ret.get_type() != Variant::NIL) {
+				if (err.error == Callable::CallError::CALL_OK && ret.get_type() != Variant::NIL) {
 					r_ret = ret;
 					return true;
 				}
@@ -1078,20 +1201,20 @@ bool GDScriptInstance::get(const StringName &p_name, Variant &r_ret) const {
 }
 
 Variant::Type GDScriptInstance::get_property_type(const StringName &p_name, bool *r_is_valid) const {
-
 	const GDScript *sptr = script.ptr();
 	while (sptr) {
-
 		if (sptr->member_info.has(p_name)) {
-			if (r_is_valid)
+			if (r_is_valid) {
 				*r_is_valid = true;
+			}
 			return sptr->member_info[p_name].type;
 		}
 		sptr = sptr->_base;
 	}
 
-	if (r_is_valid)
+	if (r_is_valid) {
 		*r_is_valid = false;
+	}
 	return Variant::NIL;
 }
 
@@ -1102,19 +1225,15 @@ void GDScriptInstance::get_property_list(List<PropertyInfo> *p_properties) const
 	List<PropertyInfo> props;
 
 	while (sptr) {
-
 		const Map<StringName, GDScriptFunction *>::Element *E = sptr->member_functions.find(GDScriptLanguage::get_singleton()->strings._get_property_list);
 		if (E) {
-
-			Variant::CallError err;
-			Variant ret = const_cast<GDScriptFunction *>(E->get())->call(const_cast<GDScriptInstance *>(this), NULL, 0, err);
-			if (err.error == Variant::CallError::CALL_OK) {
-
+			Callable::CallError err;
+			Variant ret = const_cast<GDScriptFunction *>(E->get())->call(const_cast<GDScriptInstance *>(this), nullptr, 0, err);
+			if (err.error == Callable::CallError::CALL_OK) {
 				ERR_FAIL_COND_MSG(ret.get_type() != Variant::ARRAY, "Wrong type for _get_property_list, must be an array of dictionaries.");
 
 				Array arr = ret;
 				for (int i = 0; i < arr.size(); i++) {
-
 					Dictionary d = arr[i];
 					ERR_CONTINUE(!d.has("name"));
 					ERR_CONTINUE(!d.has("type"));
@@ -1123,12 +1242,15 @@ void GDScriptInstance::get_property_list(List<PropertyInfo> *p_properties) const
 					ERR_CONTINUE(pinfo.type < 0 || pinfo.type >= Variant::VARIANT_MAX);
 					pinfo.name = d["name"];
 					ERR_CONTINUE(pinfo.name == "");
-					if (d.has("hint"))
+					if (d.has("hint")) {
 						pinfo.hint = PropertyHint(d["hint"].operator int());
-					if (d.has("hint_string"))
+					}
+					if (d.has("hint_string")) {
 						pinfo.hint_string = d["hint_string"];
-					if (d.has("usage"))
+					}
+					if (d.has("usage")) {
 						pinfo.usage = d["usage"];
+					}
 
 					props.push_back(pinfo);
 				}
@@ -1139,7 +1261,6 @@ void GDScriptInstance::get_property_list(List<PropertyInfo> *p_properties) const
 
 		Vector<_GDScriptMemberSort> msort;
 		for (Map<StringName, PropertyInfo>::Element *F = sptr->member_info.front(); F; F = F->next()) {
-
 			_GDScriptMemberSort ms;
 			ERR_CONTINUE(!sptr->member_indices.has(F->key()));
 			ms.index = sptr->member_indices[F->key()].index;
@@ -1150,7 +1271,6 @@ void GDScriptInstance::get_property_list(List<PropertyInfo> *p_properties) const
 		msort.sort();
 		msort.invert();
 		for (int i = 0; i < msort.size(); i++) {
-
 			props.push_front(sptr->member_info[msort[i].name]);
 		}
 
@@ -1158,23 +1278,20 @@ void GDScriptInstance::get_property_list(List<PropertyInfo> *p_properties) const
 	}
 
 	for (List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) {
-
 		p_properties->push_back(E->get());
 	}
 }
 
 void GDScriptInstance::get_method_list(List<MethodInfo> *p_list) const {
-
 	const GDScript *sptr = script.ptr();
 	while (sptr) {
-
 		for (Map<StringName, GDScriptFunction *>::Element *E = sptr->member_functions.front(); E; E = E->next()) {
-
 			MethodInfo mi;
 			mi.name = E->key();
 			mi.flags |= METHOD_FLAG_FROM_SCRIPT;
-			for (int i = 0; i < E->get()->get_argument_count(); i++)
+			for (int i = 0; i < E->get()->get_argument_count(); i++) {
 				mi.arguments.push_back(PropertyInfo(Variant::NIL, "arg" + itos(i)));
+			}
 			p_list->push_back(mi);
 		}
 		sptr = sptr->_base;
@@ -1182,19 +1299,19 @@ void GDScriptInstance::get_method_list(List<MethodInfo> *p_list) const {
 }
 
 bool GDScriptInstance::has_method(const StringName &p_method) const {
-
 	const GDScript *sptr = script.ptr();
 	while (sptr) {
 		const Map<StringName, GDScriptFunction *>::Element *E = sptr->member_functions.find(p_method);
-		if (E)
+		if (E) {
 			return true;
+		}
 		sptr = sptr->_base;
 	}
 
 	return false;
 }
-Variant GDScriptInstance::call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error) {
 
+Variant GDScriptInstance::call(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
 	GDScript *sptr = script.ptr();
 	while (sptr) {
 		Map<StringName, GDScriptFunction *>::Element *E = sptr->member_functions.find(p_method);
@@ -1203,46 +1320,11 @@ Variant GDScriptInstance::call(const StringName &p_method, const Variant **p_arg
 		}
 		sptr = sptr->_base;
 	}
-	r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+	r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 	return Variant();
 }
 
-void GDScriptInstance::call_multilevel(const StringName &p_method, const Variant **p_args, int p_argcount) {
-
-	GDScript *sptr = script.ptr();
-	Variant::CallError ce;
-
-	while (sptr) {
-		Map<StringName, GDScriptFunction *>::Element *E = sptr->member_functions.find(p_method);
-		if (E) {
-			E->get()->call(this, p_args, p_argcount, ce);
-		}
-		sptr = sptr->_base;
-	}
-}
-
-void GDScriptInstance::_ml_call_reversed(GDScript *sptr, const StringName &p_method, const Variant **p_args, int p_argcount) {
-
-	if (sptr->_base)
-		_ml_call_reversed(sptr->_base, p_method, p_args, p_argcount);
-
-	Variant::CallError ce;
-
-	Map<StringName, GDScriptFunction *>::Element *E = sptr->member_functions.find(p_method);
-	if (E) {
-		E->get()->call(this, p_args, p_argcount, ce);
-	}
-}
-
-void GDScriptInstance::call_multilevel_reversed(const StringName &p_method, const Variant **p_args, int p_argcount) {
-
-	if (script.ptr()) {
-		_ml_call_reversed(script.ptr(), p_method, p_args, p_argcount);
-	}
-}
-
 void GDScriptInstance::notification(int p_notification) {
-
 	//notification is not virtual, it gets called at ALL levels just like in C.
 	Variant value = p_notification;
 	const Variant *args[1] = { &value };
@@ -1251,9 +1333,9 @@ void GDScriptInstance::notification(int p_notification) {
 	while (sptr) {
 		Map<StringName, GDScriptFunction *>::Element *E = sptr->member_functions.find(GDScriptLanguage::get_singleton()->strings._notification);
 		if (E) {
-			Variant::CallError err;
+			Callable::CallError err;
 			E->get()->call(this, args, 1, err);
-			if (err.error != Variant::CallError::CALL_OK) {
+			if (err.error != Callable::CallError::CALL_OK) {
 				//print error about notification call
 			}
 		}
@@ -1263,72 +1345,76 @@ void GDScriptInstance::notification(int p_notification) {
 
 String GDScriptInstance::to_string(bool *r_valid) {
 	if (has_method(CoreStringNames::get_singleton()->_to_string)) {
-		Variant::CallError ce;
-		Variant ret = call(CoreStringNames::get_singleton()->_to_string, NULL, 0, ce);
-		if (ce.error == Variant::CallError::CALL_OK) {
+		Callable::CallError ce;
+		Variant ret = call(CoreStringNames::get_singleton()->_to_string, nullptr, 0, ce);
+		if (ce.error == Callable::CallError::CALL_OK) {
 			if (ret.get_type() != Variant::STRING) {
-				if (r_valid)
+				if (r_valid) {
 					*r_valid = false;
+				}
 				ERR_FAIL_V_MSG(String(), "Wrong type for " + CoreStringNames::get_singleton()->_to_string + ", must be a String.");
 			}
-			if (r_valid)
+			if (r_valid) {
 				*r_valid = true;
+			}
 			return ret.operator String();
 		}
 	}
-	if (r_valid)
+	if (r_valid) {
 		*r_valid = false;
+	}
 	return String();
 }
 
 Ref<Script> GDScriptInstance::get_script() const {
-
 	return script;
 }
 
 ScriptLanguage *GDScriptInstance::get_language() {
-
 	return GDScriptLanguage::get_singleton();
 }
 
-MultiplayerAPI::RPCMode GDScriptInstance::get_rpc_mode(const StringName &p_method) const {
+Vector<ScriptNetData> GDScriptInstance::get_rpc_methods() const {
+	return script->get_rpc_methods();
+}
 
-	const GDScript *cscript = script.ptr();
+uint16_t GDScriptInstance::get_rpc_method_id(const StringName &p_method) const {
+	return script->get_rpc_method_id(p_method);
+}
 
-	while (cscript) {
-		const Map<StringName, GDScriptFunction *>::Element *E = cscript->member_functions.find(p_method);
-		if (E) {
+StringName GDScriptInstance::get_rpc_method(const uint16_t p_rpc_method_id) const {
+	return script->get_rpc_method(p_rpc_method_id);
+}
 
-			if (E->get()->get_rpc_mode() != MultiplayerAPI::RPC_MODE_DISABLED) {
-				return E->get()->get_rpc_mode();
-			}
-		}
-		cscript = cscript->_base;
-	}
+MultiplayerAPI::RPCMode GDScriptInstance::get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const {
+	return script->get_rpc_mode_by_id(p_rpc_method_id);
+}
 
-	return MultiplayerAPI::RPC_MODE_DISABLED;
+MultiplayerAPI::RPCMode GDScriptInstance::get_rpc_mode(const StringName &p_method) const {
+	return script->get_rpc_mode(p_method);
 }
 
-MultiplayerAPI::RPCMode GDScriptInstance::get_rset_mode(const StringName &p_variable) const {
+Vector<ScriptNetData> GDScriptInstance::get_rset_properties() const {
+	return script->get_rset_properties();
+}
 
-	const GDScript *cscript = script.ptr();
+uint16_t GDScriptInstance::get_rset_property_id(const StringName &p_variable) const {
+	return script->get_rset_property_id(p_variable);
+}
 
-	while (cscript) {
-		const Map<StringName, GDScript::MemberInfo>::Element *E = cscript->member_indices.find(p_variable);
-		if (E) {
+StringName GDScriptInstance::get_rset_property(const uint16_t p_rset_member_id) const {
+	return script->get_rset_property(p_rset_member_id);
+}
 
-			if (E->get().rpc_mode) {
-				return E->get().rpc_mode;
-			}
-		}
-		cscript = cscript->_base;
-	}
+MultiplayerAPI::RPCMode GDScriptInstance::get_rset_mode_by_id(const uint16_t p_rset_member_id) const {
+	return script->get_rset_mode_by_id(p_rset_member_id);
+}
 
-	return MultiplayerAPI::RPC_MODE_DISABLED;
+MultiplayerAPI::RPCMode GDScriptInstance::get_rset_mode(const StringName &p_variable) const {
+	return script->get_rset_mode(p_variable);
 }
 
 void GDScriptInstance::reload_members() {
-
 #ifdef DEBUG_ENABLED
 
 	members.resize(script->member_indices.size()); //resize
@@ -1338,7 +1424,6 @@ void GDScriptInstance::reload_members() {
 
 	//pass the values to the new indices
 	for (Map<StringName, GDScript::MemberInfo>::Element *E = script->member_indices.front(); E; E = E->next()) {
-
 		if (member_indices_cache.has(E->key())) {
 			Variant value = members[member_indices_cache[E->key()]];
 			new_members.write[E->get().index] = value;
@@ -1351,7 +1436,6 @@ void GDScriptInstance::reload_members() {
 	//pass the values to the new indices
 	member_indices_cache.clear();
 	for (Map<StringName, GDScript::MemberInfo>::Element *E = script->member_indices.front(); E; E = E->next()) {
-
 		member_indices_cache[E->key()] = E->get().index;
 	}
 
@@ -1359,36 +1443,34 @@ void GDScriptInstance::reload_members() {
 }
 
 GDScriptInstance::GDScriptInstance() {
-	owner = NULL;
+	owner = nullptr;
 	base_ref = false;
 }
 
 GDScriptInstance::~GDScriptInstance() {
-	if (script.is_valid() && owner) {
-#ifndef NO_THREADS
-		GDScriptLanguage::singleton->lock->lock();
-#endif
+	MutexLock lock(GDScriptLanguage::get_singleton()->lock);
+
+	while (SelfList<GDScriptFunctionState> *E = pending_func_states.first()) {
+		E->self()->_clear_stack();
+		pending_func_states.remove(E);
+	}
 
+	if (script.is_valid() && owner) {
 		script->instances.erase(owner);
-#ifndef NO_THREADS
-		GDScriptLanguage::singleton->lock->unlock();
-#endif
 	}
 }
 
 /************* SCRIPT LANGUAGE **************/
 
-GDScriptLanguage *GDScriptLanguage::singleton = NULL;
+GDScriptLanguage *GDScriptLanguage::singleton = nullptr;
 
 String GDScriptLanguage::get_name() const {
-
 	return "GDScript";
 }
 
 /* LANGUAGE FUNCTIONS */
 
 void GDScriptLanguage::_add_global(const StringName &p_name, const Variant &p_value) {
-
 	if (globals.has(p_name)) {
 		//overwrite existing
 		global_array.write[globals[p_name]] = p_value;
@@ -1400,7 +1482,6 @@ void GDScriptLanguage::_add_global(const StringName &p_name, const Variant &p_va
 }
 
 void GDScriptLanguage::add_global_constant(const StringName &p_variable, const Variant &p_value) {
-
 	_add_global(p_variable, p_value);
 }
 
@@ -1414,11 +1495,9 @@ void GDScriptLanguage::remove_named_global_constant(const StringName &p_name) {
 }
 
 void GDScriptLanguage::init() {
-
 	//populate global constants
 	int gcc = GlobalConstants::get_global_constant_count();
 	for (int i = 0; i < gcc; i++) {
-
 		_add_global(StaticCString::create(GlobalConstants::get_global_constant_name(i)), GlobalConstants::get_global_constant_value(i));
 	}
 
@@ -1432,14 +1511,15 @@ void GDScriptLanguage::init() {
 	List<StringName> class_list;
 	ClassDB::get_class_list(&class_list);
 	for (List<StringName>::Element *E = class_list.front(); E; E = E->next()) {
-
 		StringName n = E->get();
 		String s = String(n);
-		if (s.begins_with("_"))
+		if (s.begins_with("_")) {
 			n = s.substr(1, s.length());
+		}
 
-		if (globals.has(n))
+		if (globals.has(n)) {
 			continue;
+		}
 		Ref<GDScriptNativeClass> nc = memnew(GDScriptNativeClass(E->get()));
 		_add_global(n, nc);
 	}
@@ -1449,33 +1529,29 @@ void GDScriptLanguage::init() {
 	List<Engine::Singleton> singletons;
 	Engine::get_singleton()->get_singletons(&singletons);
 	for (List<Engine::Singleton>::Element *E = singletons.front(); E; E = E->next()) {
-
 		_add_global(E->get().name, E->get().ptr);
 	}
 }
 
 String GDScriptLanguage::get_type() const {
-
 	return "GDScript";
 }
-String GDScriptLanguage::get_extension() const {
 
+String GDScriptLanguage::get_extension() const {
 	return "gd";
 }
-Error GDScriptLanguage::execute_file(const String &p_path) {
 
+Error GDScriptLanguage::execute_file(const String &p_path) {
 	// ??
 	return OK;
 }
+
 void GDScriptLanguage::finish() {
 }
 
 void GDScriptLanguage::profiling_start() {
-
 #ifdef DEBUG_ENABLED
-	if (lock) {
-		lock->lock();
-	}
+	MutexLock lock(this->lock);
 
 	SelfList<GDScriptFunction> *elem = function_list.first();
 	while (elem) {
@@ -1492,40 +1568,28 @@ void GDScriptLanguage::profiling_start() {
 	}
 
 	profiling = true;
-	if (lock) {
-		lock->unlock();
-	}
-
 #endif
 }
 
 void GDScriptLanguage::profiling_stop() {
-
 #ifdef DEBUG_ENABLED
-	if (lock) {
-		lock->lock();
-	}
+	MutexLock lock(this->lock);
 
 	profiling = false;
-	if (lock) {
-		lock->unlock();
-	}
-
 #endif
 }
 
 int GDScriptLanguage::profiling_get_accumulated_data(ProfilingInfo *p_info_arr, int p_info_max) {
-
 	int current = 0;
 #ifdef DEBUG_ENABLED
-	if (lock) {
-		lock->lock();
-	}
+
+	MutexLock lock(this->lock);
 
 	SelfList<GDScriptFunction> *elem = function_list.first();
 	while (elem) {
-		if (current >= p_info_max)
+		if (current >= p_info_max) {
 			break;
+		}
 		p_info_arr[current].call_count = elem->self()->profile.call_count;
 		p_info_arr[current].self_time = elem->self()->profile.self_time;
 		p_info_arr[current].total_time = elem->self()->profile.total_time;
@@ -1533,29 +1597,22 @@ int GDScriptLanguage::profiling_get_accumulated_data(ProfilingInfo *p_info_arr,
 		elem = elem->next();
 		current++;
 	}
-
-	if (lock) {
-		lock->unlock();
-	}
-
 #endif
 
 	return current;
 }
 
 int GDScriptLanguage::profiling_get_frame_data(ProfilingInfo *p_info_arr, int p_info_max) {
-
 	int current = 0;
 
 #ifdef DEBUG_ENABLED
-	if (lock) {
-		lock->lock();
-	}
+	MutexLock lock(this->lock);
 
 	SelfList<GDScriptFunction> *elem = function_list.first();
 	while (elem) {
-		if (current >= p_info_max)
+		if (current >= p_info_max) {
 			break;
+		}
 		if (elem->self()->profile.last_frame_call_count > 0) {
 			p_info_arr[current].call_count = elem->self()->profile.last_frame_call_count;
 			p_info_arr[current].self_time = elem->self()->profile.last_frame_self_time;
@@ -1565,23 +1622,17 @@ int GDScriptLanguage::profiling_get_frame_data(ProfilingInfo *p_info_arr, int p_
 		}
 		elem = elem->next();
 	}
-
-	if (lock) {
-		lock->unlock();
-	}
-
 #endif
 
 	return current;
 }
 
 struct GDScriptDepSort {
-
 	//must support sorting so inheritance works properly (parent must be reloaded first)
 	bool operator()(const Ref<GDScript> &A, const Ref<GDScript> &B) const {
-
-		if (A == B)
+		if (A == B) {
 			return false; //shouldn't happen but..
+		}
 		const GDScript *I = B->get_base().ptr();
 		while (I) {
 			if (I == A.ptr()) {
@@ -1597,34 +1648,27 @@ struct GDScriptDepSort {
 };
 
 void GDScriptLanguage::reload_all_scripts() {
-
 #ifdef DEBUG_ENABLED
 	print_verbose("GDScript: Reloading all scripts");
-	if (lock) {
-		lock->lock();
-	}
-
-	List<Ref<GDScript> > scripts;
+	List<Ref<GDScript>> scripts;
+	{
+		MutexLock lock(this->lock);
 
-	SelfList<GDScript> *elem = script_list.first();
-	while (elem) {
-		if (elem->self()->get_path().is_resource_file()) {
-			print_verbose("GDScript: Found: " + elem->self()->get_path());
-			scripts.push_back(Ref<GDScript>(elem->self())); //cast to gdscript to avoid being erased by accident
+		SelfList<GDScript> *elem = script_list.first();
+		while (elem) {
+			if (elem->self()->get_path().is_resource_file()) {
+				print_verbose("GDScript: Found: " + elem->self()->get_path());
+				scripts.push_back(Ref<GDScript>(elem->self())); //cast to gdscript to avoid being erased by accident
+			}
+			elem = elem->next();
 		}
-		elem = elem->next();
-	}
-
-	if (lock) {
-		lock->unlock();
 	}
 
 	//as scripts are going to be reloaded, must proceed without locking here
 
 	scripts.sort_custom<GDScriptDepSort>(); //update in inheritance dependency order
 
-	for (List<Ref<GDScript> >::Element *E = scripts.front(); E; E = E->next()) {
-
+	for (List<Ref<GDScript>>::Element *E = scripts.front(); E; E = E->next()) {
 		print_verbose("GDScript: Reloading: " + E->get()->get_path());
 		E->get()->load_source_code(E->get()->get_path());
 		E->get()->reload(true);
@@ -1633,59 +1677,50 @@ void GDScriptLanguage::reload_all_scripts() {
 }
 
 void GDScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_soft_reload) {
-
 #ifdef DEBUG_ENABLED
 
-	if (lock) {
-		lock->lock();
-	}
-
-	List<Ref<GDScript> > scripts;
-
-	SelfList<GDScript> *elem = script_list.first();
-	while (elem) {
-		if (elem->self()->get_path().is_resource_file()) {
+	List<Ref<GDScript>> scripts;
+	{
+		MutexLock lock(this->lock);
 
-			scripts.push_back(Ref<GDScript>(elem->self())); //cast to gdscript to avoid being erased by accident
+		SelfList<GDScript> *elem = script_list.first();
+		while (elem) {
+			if (elem->self()->get_path().is_resource_file()) {
+				scripts.push_back(Ref<GDScript>(elem->self())); //cast to gdscript to avoid being erased by accident
+			}
+			elem = elem->next();
 		}
-		elem = elem->next();
-	}
-
-	if (lock) {
-		lock->unlock();
 	}
 
 	//when someone asks you why dynamically typed languages are easier to write....
 
-	Map<Ref<GDScript>, Map<ObjectID, List<Pair<StringName, Variant> > > > to_reload;
+	Map<Ref<GDScript>, Map<ObjectID, List<Pair<StringName, Variant>>>> to_reload;
 
 	//as scripts are going to be reloaded, must proceed without locking here
 
 	scripts.sort_custom<GDScriptDepSort>(); //update in inheritance dependency order
 
-	for (List<Ref<GDScript> >::Element *E = scripts.front(); E; E = E->next()) {
-
+	for (List<Ref<GDScript>>::Element *E = scripts.front(); E; E = E->next()) {
 		bool reload = E->get() == p_script || to_reload.has(E->get()->get_base());
 
-		if (!reload)
+		if (!reload) {
 			continue;
+		}
 
-		to_reload.insert(E->get(), Map<ObjectID, List<Pair<StringName, Variant> > >());
+		to_reload.insert(E->get(), Map<ObjectID, List<Pair<StringName, Variant>>>());
 
 		if (!p_soft_reload) {
-
 			//save state and remove script from instances
-			Map<ObjectID, List<Pair<StringName, Variant> > > &map = to_reload[E->get()];
+			Map<ObjectID, List<Pair<StringName, Variant>>> &map = to_reload[E->get()];
 
 			while (E->get()->instances.front()) {
 				Object *obj = E->get()->instances.front()->get();
 				//save instance info
-				List<Pair<StringName, Variant> > state;
+				List<Pair<StringName, Variant>> state;
 				if (obj->get_script_instance()) {
-
 					obj->get_script_instance()->get_property_state(state);
 					map[obj->get_instance_id()] = state;
-					obj->set_script(RefPtr());
+					obj->set_script(Variant());
 				}
 			}
 
@@ -1697,11 +1732,10 @@ void GDScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_so
 
 				//save instance info
 				if (obj->get_script_instance()) {
-
-					map.insert(obj->get_instance_id(), List<Pair<StringName, Variant> >());
-					List<Pair<StringName, Variant> > &state = map[obj->get_instance_id()];
+					map.insert(obj->get_instance_id(), List<Pair<StringName, Variant>>());
+					List<Pair<StringName, Variant>> &state = map[obj->get_instance_id()];
 					obj->get_script_instance()->get_property_state(state);
-					obj->set_script(RefPtr());
+					obj->set_script(Variant());
 				} else {
 					// no instance found. Let's remove it so we don't loop forever
 					E->get()->placeholders.erase(E->get()->placeholders.front()->get());
@@ -1710,31 +1744,30 @@ void GDScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_so
 
 #endif
 
-			for (Map<ObjectID, List<Pair<StringName, Variant> > >::Element *F = E->get()->pending_reload_state.front(); F; F = F->next()) {
+			for (Map<ObjectID, List<Pair<StringName, Variant>>>::Element *F = E->get()->pending_reload_state.front(); F; F = F->next()) {
 				map[F->key()] = F->get(); //pending to reload, use this one instead
 			}
 		}
 	}
 
-	for (Map<Ref<GDScript>, Map<ObjectID, List<Pair<StringName, Variant> > > >::Element *E = to_reload.front(); E; E = E->next()) {
-
+	for (Map<Ref<GDScript>, Map<ObjectID, List<Pair<StringName, Variant>>>>::Element *E = to_reload.front(); E; E = E->next()) {
 		Ref<GDScript> scr = E->key();
 		scr->reload(p_soft_reload);
 
 		//restore state if saved
-		for (Map<ObjectID, List<Pair<StringName, Variant> > >::Element *F = E->get().front(); F; F = F->next()) {
-
-			List<Pair<StringName, Variant> > &saved_state = F->get();
+		for (Map<ObjectID, List<Pair<StringName, Variant>>>::Element *F = E->get().front(); F; F = F->next()) {
+			List<Pair<StringName, Variant>> &saved_state = F->get();
 
 			Object *obj = ObjectDB::get_instance(F->key());
-			if (!obj)
+			if (!obj) {
 				continue;
+			}
 
 			if (!p_soft_reload) {
 				//clear it just in case (may be a pending reload state)
-				obj->set_script(RefPtr());
+				obj->set_script(Variant());
 			}
-			obj->set_script(scr.get_ref_ptr());
+			obj->set_script(scr);
 
 			ScriptInstance *script_instance = obj->get_script_instance();
 
@@ -1748,11 +1781,11 @@ void GDScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_so
 
 			if (script_instance->is_placeholder() && scr->is_placeholder_fallback_enabled()) {
 				PlaceHolderScriptInstance *placeholder = static_cast<PlaceHolderScriptInstance *>(script_instance);
-				for (List<Pair<StringName, Variant> >::Element *G = saved_state.front(); G; G = G->next()) {
+				for (List<Pair<StringName, Variant>>::Element *G = saved_state.front(); G; G = G->next()) {
 					placeholder->property_set_fallback(G->get().first, G->get().second);
 				}
 			} else {
-				for (List<Pair<StringName, Variant> >::Element *G = saved_state.front(); G; G = G->next()) {
+				for (List<Pair<StringName, Variant>>::Element *G = saved_state.front(); G; G = G->next()) {
 					script_instance->set(G->get().first, G->get().second);
 				}
 			}
@@ -1767,14 +1800,11 @@ void GDScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_so
 }
 
 void GDScriptLanguage::frame() {
-
 	calls = 0;
 
 #ifdef DEBUG_ENABLED
 	if (profiling) {
-		if (lock) {
-			lock->lock();
-		}
+		MutexLock lock(this->lock);
 
 		SelfList<GDScriptFunction> *elem = function_list.first();
 		while (elem) {
@@ -1786,10 +1816,6 @@ void GDScriptLanguage::frame() {
 			elem->self()->profile.frame_total_time = 0;
 			elem = elem->next();
 		}
-
-		if (lock) {
-			lock->unlock();
-		}
 	}
 
 #endif
@@ -1797,7 +1823,7 @@ void GDScriptLanguage::frame() {
 
 /* EDITOR FUNCTIONS */
 void GDScriptLanguage::get_reserved_words(List<String> *p_words) const {
-
+	// TODO: Add annotations here?
 	static const char *_reserved_words[] = {
 		// operators
 		"and",
@@ -1820,6 +1846,7 @@ void GDScriptLanguage::get_reserved_words(List<String> *p_words) const {
 		// functions
 		"as",
 		"assert",
+		"await",
 		"breakpoint",
 		"class",
 		"class_name",
@@ -1827,15 +1854,13 @@ void GDScriptLanguage::get_reserved_words(List<String> *p_words) const {
 		"is",
 		"func",
 		"preload",
-		"setget",
 		"signal",
-		"tool",
+		"super",
+		"trait",
 		"yield",
 		// var
 		"const",
 		"enum",
-		"export",
-		"onready",
 		"static",
 		"var",
 		// control flow
@@ -1849,21 +1874,12 @@ void GDScriptLanguage::get_reserved_words(List<String> *p_words) const {
 		"return",
 		"match",
 		"while",
-		"remote",
-		"sync",
-		"master",
-		"puppet",
-		"slave",
-		"remotesync",
-		"mastersync",
-		"puppetsync",
-		0
+		nullptr
 	};
 
 	const char **w = _reserved_words;
 
 	while (*w) {
-
 		p_words->push_back(*w);
 		w++;
 	}
@@ -1874,13 +1890,11 @@ void GDScriptLanguage::get_reserved_words(List<String> *p_words) const {
 }
 
 bool GDScriptLanguage::handles_global_class_type(const String &p_type) const {
-
 	return p_type == "GDScript";
 }
 
 String GDScriptLanguage::get_global_class_name(const String &p_path, String *r_base_type, String *r_icon_path) const {
-
-	PoolVector<uint8_t> sourcef;
+	Vector<uint8_t> sourcef;
 	Error err;
 	FileAccessRef f = FileAccess::open(p_path, FileAccess::READ, &err);
 	if (err) {
@@ -1890,33 +1904,33 @@ String GDScriptLanguage::get_global_class_name(const String &p_path, String *r_b
 	String source = f->get_as_utf8_string();
 
 	GDScriptParser parser;
-	parser.parse(source, p_path.get_base_dir(), true, p_path, false, NULL, true);
-
-	if (parser.get_parse_tree() && parser.get_parse_tree()->type == GDScriptParser::Node::TYPE_CLASS) {
+	err = parser.parse(source, p_path, false);
 
-		const GDScriptParser::ClassNode *c = static_cast<const GDScriptParser::ClassNode *>(parser.get_parse_tree());
+	// TODO: Simplify this code by using the analyzer to get full inheritance.
+	if (err == OK) {
+		const GDScriptParser::ClassNode *c = parser.get_tree();
 		if (r_icon_path) {
-			if (c->icon_path.empty() || c->icon_path.is_abs_path())
+			if (c->icon_path.empty() || c->icon_path.is_abs_path()) {
 				*r_icon_path = c->icon_path;
-			else if (c->icon_path.is_rel_path())
+			} else if (c->icon_path.is_rel_path()) {
 				*r_icon_path = p_path.get_base_dir().plus_file(c->icon_path).simplify_path();
+			}
 		}
 		if (r_base_type) {
-
 			const GDScriptParser::ClassNode *subclass = c;
 			String path = p_path;
 			GDScriptParser subparser;
 			while (subclass) {
 				if (subclass->extends_used) {
-					if (subclass->extends_file) {
-						if (subclass->extends_class.size() == 0) {
-							get_global_class_name(subclass->extends_file, r_base_type);
-							subclass = NULL;
+					if (!subclass->extends_path.empty()) {
+						if (subclass->extends.size() == 0) {
+							get_global_class_name(subclass->extends_path, r_base_type);
+							subclass = nullptr;
 							break;
 						} else {
-							Vector<StringName> extend_classes = subclass->extends_class;
+							Vector<StringName> extend_classes = subclass->extends;
 
-							FileAccessRef subfile = FileAccess::open(subclass->extends_file, FileAccess::READ);
+							FileAccessRef subfile = FileAccess::open(subclass->extends_path, FileAccess::READ);
 							if (!subfile) {
 								break;
 							}
@@ -1925,25 +1939,26 @@ String GDScriptLanguage::get_global_class_name(const String &p_path, String *r_b
 							if (subsource.empty()) {
 								break;
 							}
-							String subpath = subclass->extends_file;
+							String subpath = subclass->extends_path;
 							if (subpath.is_rel_path()) {
 								subpath = path.get_base_dir().plus_file(subpath).simplify_path();
 							}
 
-							if (OK != subparser.parse(subsource, subpath.get_base_dir(), true, subpath, false, NULL, true)) {
+							if (OK != subparser.parse(subsource, subpath, false)) {
 								break;
 							}
 							path = subpath;
-							if (!subparser.get_parse_tree() || subparser.get_parse_tree()->type != GDScriptParser::Node::TYPE_CLASS) {
-								break;
-							}
-							subclass = static_cast<const GDScriptParser::ClassNode *>(subparser.get_parse_tree());
+							subclass = subparser.get_tree();
 
 							while (extend_classes.size() > 0) {
 								bool found = false;
-								for (int i = 0; i < subclass->subclasses.size(); i++) {
-									const GDScriptParser::ClassNode *inner_class = subclass->subclasses[i];
-									if (inner_class->name == extend_classes[0]) {
+								for (int i = 0; i < subclass->members.size(); i++) {
+									if (subclass->members[i].type != GDScriptParser::ClassNode::Member::CLASS) {
+										continue;
+									}
+
+									const GDScriptParser::ClassNode *inner_class = subclass->members[i].m_class;
+									if (inner_class->identifier->name == extend_classes[0]) {
 										extend_classes.remove(0);
 										found = true;
 										subclass = inner_class;
@@ -1951,200 +1966,30 @@ String GDScriptLanguage::get_global_class_name(const String &p_path, String *r_b
 									}
 								}
 								if (!found) {
-									subclass = NULL;
+									subclass = nullptr;
 									break;
 								}
 							}
 						}
-					} else if (subclass->extends_class.size() == 1) {
-						*r_base_type = subclass->extends_class[0];
-						subclass = NULL;
+					} else if (subclass->extends.size() == 1) {
+						*r_base_type = subclass->extends[0];
+						subclass = nullptr;
 					} else {
 						break;
 					}
 				} else {
 					*r_base_type = "Reference";
-					subclass = NULL;
+					subclass = nullptr;
 				}
 			}
 		}
-		return c->name;
+		return c->identifier != nullptr ? String(c->identifier->name) : String();
 	}
 
 	return String();
 }
 
-#ifdef DEBUG_ENABLED
-String GDScriptWarning::get_message() const {
-
-#define CHECK_SYMBOLS(m_amount) ERR_FAIL_COND_V(symbols.size() < m_amount, String());
-
-	switch (code) {
-		case UNASSIGNED_VARIABLE_OP_ASSIGN: {
-			CHECK_SYMBOLS(1);
-			return "Using assignment with operation but the variable '" + symbols[0] + "' was not previously assigned a value.";
-		} break;
-		case UNASSIGNED_VARIABLE: {
-			CHECK_SYMBOLS(1);
-			return "The variable '" + symbols[0] + "' was used but never assigned a value.";
-		} break;
-		case UNUSED_VARIABLE: {
-			CHECK_SYMBOLS(1);
-			return "The local variable '" + symbols[0] + "' is declared but never used in the block. If this is intended, prefix it with an underscore: '_" + symbols[0] + "'";
-		} break;
-		case SHADOWED_VARIABLE: {
-			CHECK_SYMBOLS(2);
-			return "The local variable '" + symbols[0] + "' is shadowing an already-defined variable at line " + symbols[1] + ".";
-		} break;
-		case UNUSED_CLASS_VARIABLE: {
-			CHECK_SYMBOLS(1);
-			return "The class variable '" + symbols[0] + "' is declared but never used in the script.";
-		} break;
-		case UNUSED_ARGUMENT: {
-			CHECK_SYMBOLS(2);
-			return "The argument '" + symbols[1] + "' is never used in the function '" + symbols[0] + "'. If this is intended, prefix it with an underscore: '_" + symbols[1] + "'";
-		} break;
-		case UNREACHABLE_CODE: {
-			CHECK_SYMBOLS(1);
-			return "Unreachable code (statement after return) in function '" + symbols[0] + "()'.";
-		} break;
-		case STANDALONE_EXPRESSION: {
-			return "Standalone expression (the line has no effect).";
-		} break;
-		case VOID_ASSIGNMENT: {
-			CHECK_SYMBOLS(1);
-			return "Assignment operation, but the function '" + symbols[0] + "()' returns void.";
-		} break;
-		case NARROWING_CONVERSION: {
-			return "Narrowing conversion (float is converted to int and loses precision).";
-		} break;
-		case FUNCTION_MAY_YIELD: {
-			CHECK_SYMBOLS(1);
-			return "Assigned variable is typed but the function '" + symbols[0] + "()' may yield and return a GDScriptFunctionState instead.";
-		} break;
-		case VARIABLE_CONFLICTS_FUNCTION: {
-			CHECK_SYMBOLS(1);
-			return "Variable declaration of '" + symbols[0] + "' conflicts with a function of the same name.";
-		} break;
-		case FUNCTION_CONFLICTS_VARIABLE: {
-			CHECK_SYMBOLS(1);
-			return "Function declaration of '" + symbols[0] + "()' conflicts with a variable of the same name.";
-		} break;
-		case FUNCTION_CONFLICTS_CONSTANT: {
-			CHECK_SYMBOLS(1);
-			return "Function declaration of '" + symbols[0] + "()' conflicts with a constant of the same name.";
-		} break;
-		case INCOMPATIBLE_TERNARY: {
-			return "Values of the ternary conditional are not mutually compatible.";
-		} break;
-		case UNUSED_SIGNAL: {
-			CHECK_SYMBOLS(1);
-			return "The signal '" + symbols[0] + "' is declared but never emitted.";
-		} break;
-		case RETURN_VALUE_DISCARDED: {
-			CHECK_SYMBOLS(1);
-			return "The function '" + symbols[0] + "()' returns a value, but this value is never used.";
-		} break;
-		case PROPERTY_USED_AS_FUNCTION: {
-			CHECK_SYMBOLS(2);
-			return "The method '" + symbols[0] + "()' was not found in base '" + symbols[1] + "' but there's a property with the same name. Did you mean to access it?";
-		} break;
-		case CONSTANT_USED_AS_FUNCTION: {
-			CHECK_SYMBOLS(2);
-			return "The method '" + symbols[0] + "()' was not found in base '" + symbols[1] + "' but there's a constant with the same name. Did you mean to access it?";
-		} break;
-		case FUNCTION_USED_AS_PROPERTY: {
-			CHECK_SYMBOLS(2);
-			return "The property '" + symbols[0] + "' was not found in base '" + symbols[1] + "' but there's a method with the same name. Did you mean to call it?";
-		} break;
-		case INTEGER_DIVISION: {
-			return "Integer division, decimal part will be discarded.";
-		} break;
-		case UNSAFE_PROPERTY_ACCESS: {
-			CHECK_SYMBOLS(2);
-			return "The property '" + symbols[0] + "' is not present on the inferred type '" + symbols[1] + "' (but may be present on a subtype).";
-		} break;
-		case UNSAFE_METHOD_ACCESS: {
-			CHECK_SYMBOLS(2);
-			return "The method '" + symbols[0] + "' is not present on the inferred type '" + symbols[1] + "' (but may be present on a subtype).";
-		} break;
-		case UNSAFE_CAST: {
-			CHECK_SYMBOLS(1);
-			return "The value is cast to '" + symbols[0] + "' but has an unknown type.";
-		} break;
-		case UNSAFE_CALL_ARGUMENT: {
-			CHECK_SYMBOLS(4);
-			return "The argument '" + symbols[0] + "' of the function '" + symbols[1] + "' requires a the subtype '" + symbols[2] + "' but the supertype '" + symbols[3] + "' was provided";
-		} break;
-		case DEPRECATED_KEYWORD: {
-			CHECK_SYMBOLS(2);
-			return "The '" + symbols[0] + "' keyword is deprecated and will be removed in a future release, please replace its uses by '" + symbols[1] + "'.";
-		} break;
-		case STANDALONE_TERNARY: {
-			return "Standalone ternary conditional operator: the return value is being discarded.";
-		}
-		case WARNING_MAX: break; // Can't happen, but silences warning
-	}
-	ERR_FAIL_V_MSG(String(), "Invalid GDScript warning code: " + get_name_from_code(code) + ".");
-
-#undef CHECK_SYMBOLS
-}
-
-String GDScriptWarning::get_name() const {
-	return get_name_from_code(code);
-}
-
-String GDScriptWarning::get_name_from_code(Code p_code) {
-	ERR_FAIL_COND_V(p_code < 0 || p_code >= WARNING_MAX, String());
-
-	static const char *names[] = {
-		"UNASSIGNED_VARIABLE",
-		"UNASSIGNED_VARIABLE_OP_ASSIGN",
-		"UNUSED_VARIABLE",
-		"SHADOWED_VARIABLE",
-		"UNUSED_CLASS_VARIABLE",
-		"UNUSED_ARGUMENT",
-		"UNREACHABLE_CODE",
-		"STANDALONE_EXPRESSION",
-		"VOID_ASSIGNMENT",
-		"NARROWING_CONVERSION",
-		"FUNCTION_MAY_YIELD",
-		"VARIABLE_CONFLICTS_FUNCTION",
-		"FUNCTION_CONFLICTS_VARIABLE",
-		"FUNCTION_CONFLICTS_CONSTANT",
-		"INCOMPATIBLE_TERNARY",
-		"UNUSED_SIGNAL",
-		"RETURN_VALUE_DISCARDED",
-		"PROPERTY_USED_AS_FUNCTION",
-		"CONSTANT_USED_AS_FUNCTION",
-		"FUNCTION_USED_AS_PROPERTY",
-		"INTEGER_DIVISION",
-		"UNSAFE_PROPERTY_ACCESS",
-		"UNSAFE_METHOD_ACCESS",
-		"UNSAFE_CAST",
-		"UNSAFE_CALL_ARGUMENT",
-		"DEPRECATED_KEYWORD",
-		"STANDALONE_TERNARY",
-		NULL
-	};
-
-	return names[(int)p_code];
-}
-
-GDScriptWarning::Code GDScriptWarning::get_code_from_name(const String &p_name) {
-	for (int i = 0; i < WARNING_MAX; i++) {
-		if (get_name_from_code((Code)i) == p_name) {
-			return (Code)i;
-		}
-	}
-
-	ERR_FAIL_V_MSG(WARNING_MAX, "Invalid GDScript warning name: " + p_name);
-}
-
-#endif // DEBUG_ENABLED
-
 GDScriptLanguage::GDScriptLanguage() {
-
 	calls = 0;
 	ERR_FAIL_COND(singleton);
 	singleton = this;
@@ -2157,11 +2002,6 @@ GDScriptLanguage::GDScriptLanguage() {
 	_debug_parse_err_line = -1;
 	_debug_parse_err_file = "";
 
-#ifdef NO_THREADS
-	lock = NULL;
-#else
-	lock = Mutex::create();
-#endif
 	profiling = false;
 	script_frame_time = 0;
 
@@ -2169,7 +2009,7 @@ GDScriptLanguage::GDScriptLanguage() {
 	int dmcs = GLOBAL_DEF("debug/settings/gdscript/max_call_stack", 1024);
 	ProjectSettings::get_singleton()->set_custom_property_info("debug/settings/gdscript/max_call_stack", PropertyInfo(Variant::INT, "debug/settings/gdscript/max_call_stack", PROPERTY_HINT_RANGE, "1024,4096,1,or_greater")); //minimum is 1024
 
-	if (ScriptDebugger::get_singleton()) {
+	if (EngineDebugger::is_active()) {
 		//debugging enabled!
 
 		_debug_max_call_stack = dmcs;
@@ -2177,7 +2017,7 @@ GDScriptLanguage::GDScriptLanguage() {
 
 	} else {
 		_debug_max_call_stack = 0;
-		_call_stack = NULL;
+		_call_stack = nullptr;
 	}
 
 #ifdef DEBUG_ENABLED
@@ -2187,21 +2027,42 @@ GDScriptLanguage::GDScriptLanguage() {
 	GLOBAL_DEF("debug/gdscript/completion/autocomplete_setters_and_getters", false);
 	for (int i = 0; i < (int)GDScriptWarning::WARNING_MAX; i++) {
 		String warning = GDScriptWarning::get_name_from_code((GDScriptWarning::Code)i).to_lower();
-		bool default_enabled = !warning.begins_with("unsafe_") && i != GDScriptWarning::UNUSED_CLASS_VARIABLE;
+		bool default_enabled = !warning.begins_with("unsafe_");
 		GLOBAL_DEF("debug/gdscript/warnings/" + warning, default_enabled);
 	}
 #endif // DEBUG_ENABLED
 }
 
 GDScriptLanguage::~GDScriptLanguage() {
-
-	if (lock) {
-		memdelete(lock);
-		lock = NULL;
-	}
 	if (_call_stack) {
 		memdelete_arr(_call_stack);
 	}
+
+	// Clear dependencies between scripts, to ensure cyclic references are broken (to avoid leaks at exit).
+	SelfList<GDScript> *s = script_list.first();
+	while (s) {
+		GDScript *script = s->self();
+		// This ensures the current script is not released before we can check what's the next one
+		// in the list (we can't get the next upfront because we don't know if the reference breaking
+		// will cause it -or any other after it, for that matter- to be released so the next one
+		// is not the same as before).
+		script->reference();
+
+		for (Map<StringName, GDScriptFunction *>::Element *E = script->member_functions.front(); E; E = E->next()) {
+			GDScriptFunction *func = E->get();
+			for (int i = 0; i < func->argument_types.size(); i++) {
+				func->argument_types.write[i].script_type_ref = Ref<Script>();
+			}
+			func->return_type.script_type_ref = Ref<Script>();
+		}
+		for (Map<StringName, GDScript::MemberInfo>::Element *E = script->member_indices.front(); E; E = E->next()) {
+			E->get().data_type.script_type_ref = Ref<Script>();
+		}
+
+		s = s->next();
+		script->unreference();
+	}
+
 	singleton = NULL;
 }
 
@@ -2211,71 +2072,63 @@ void GDScriptLanguage::add_orphan_subclass(const String &p_qualified_name, const
 
 Ref<GDScript> GDScriptLanguage::get_orphan_subclass(const String &p_qualified_name) {
 	Map<String, ObjectID>::Element *orphan_subclass_element = orphan_subclasses.find(p_qualified_name);
-	if (!orphan_subclass_element)
+	if (!orphan_subclass_element) {
 		return Ref<GDScript>();
+	}
 	ObjectID orphan_subclass = orphan_subclass_element->get();
 	Object *obj = ObjectDB::get_instance(orphan_subclass);
 	orphan_subclasses.erase(orphan_subclass_element);
-	if (!obj)
+	if (!obj) {
 		return Ref<GDScript>();
+	}
 	return Ref<GDScript>(Object::cast_to<GDScript>(obj));
 }
 
 /*************** RESOURCE ***************/
 
-RES ResourceFormatLoaderGDScript::load(const String &p_path, const String &p_original_path, Error *r_error) {
-
-	if (r_error)
+RES ResourceFormatLoaderGDScript::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, bool p_no_cache) {
+	if (r_error) {
 		*r_error = ERR_FILE_CANT_OPEN;
+	}
 
-	GDScript *script = memnew(GDScript);
-
-	Ref<GDScript> scriptres(script);
-
-	if (p_path.ends_with(".gde") || p_path.ends_with(".gdc")) {
-
-		script->set_script_path(p_original_path); // script needs this.
-		script->set_path(p_original_path);
-		Error err = script->load_byte_code(p_path);
-		ERR_FAIL_COND_V_MSG(err != OK, RES(), "Cannot load byte code from file '" + p_path + "'.");
-
-	} else {
-		Error err = script->load_source_code(p_path);
-		ERR_FAIL_COND_V_MSG(err != OK, RES(), "Cannot load source code from file '" + p_path + "'.");
+	Error err;
+	Ref<GDScript> script = GDScriptCache::get_full_script(p_path, err);
 
-		script->set_script_path(p_original_path); // script needs this.
-		script->set_path(p_original_path);
+	// TODO: Reintroduce binary and encrypted scripts.
 
-		script->reload();
+	if (script.is_null()) {
+		// Don't fail loading because of parsing error.
+		script.instance();
 	}
-	if (r_error)
+
+	if (r_error) {
 		*r_error = OK;
+	}
 
-	return scriptres;
+	return script;
 }
 
 void ResourceFormatLoaderGDScript::get_recognized_extensions(List<String> *p_extensions) const {
-
 	p_extensions->push_back("gd");
-	p_extensions->push_back("gdc");
-	p_extensions->push_back("gde");
+	// TODO: Reintroduce binary and encrypted scripts.
+	// p_extensions->push_back("gdc");
+	// p_extensions->push_back("gde");
 }
 
 bool ResourceFormatLoaderGDScript::handles_type(const String &p_type) const {
-
 	return (p_type == "Script" || p_type == "GDScript");
 }
 
 String ResourceFormatLoaderGDScript::get_resource_type(const String &p_path) const {
-
 	String el = p_path.get_extension().to_lower();
-	if (el == "gd" || el == "gdc" || el == "gde")
+	// TODO: Reintroduce binary and encrypted scripts.
+	if (el == "gd" /*|| el == "gdc" || el == "gde"*/) {
 		return "GDScript";
+	}
 	return "";
 }
 
 void ResourceFormatLoaderGDScript::get_dependencies(const String &p_path, List<String> *p_dependencies, bool p_add_types) {
-
 	FileAccessRef file = FileAccess::open(p_path, FileAccess::READ);
 	ERR_FAIL_COND_MSG(!file, "Cannot open file '" + p_path + "'.");
 
@@ -2285,7 +2138,7 @@ void ResourceFormatLoaderGDScript::get_dependencies(const String &p_path, List<S
 	}
 
 	GDScriptParser parser;
-	if (OK != parser.parse(source, p_path.get_base_dir(), true, p_path, false, NULL, true)) {
+	if (OK != parser.parse(source, p_path, false)) {
 		return;
 	}
 
@@ -2295,7 +2148,6 @@ void ResourceFormatLoaderGDScript::get_dependencies(const String &p_path, List<S
 }
 
 Error ResourceFormatSaverGDScript::save(const String &p_path, const RES &p_resource, uint32_t p_flags) {
-
 	Ref<GDScript> sqscr = p_resource;
 	ERR_FAIL_COND_V(sqscr.is_null(), ERR_INVALID_PARAMETER);
 
@@ -2322,12 +2174,11 @@ Error ResourceFormatSaverGDScript::save(const String &p_path, const RES &p_resou
 }
 
 void ResourceFormatSaverGDScript::get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const {
-
 	if (Object::cast_to<GDScript>(*p_resource)) {
 		p_extensions->push_back("gd");
 	}
 }
-bool ResourceFormatSaverGDScript::recognize(const RES &p_resource) const {
 
-	return Object::cast_to<GDScript>(*p_resource) != NULL;
+bool ResourceFormatSaverGDScript::recognize(const RES &p_resource) const {
+	return Object::cast_to<GDScript>(*p_resource) != nullptr;
 }
diff --git a/modules/gdscript/gdscript.h b/modules/gdscript/gdscript.h
index 4ae52238ce..79317ff846 100644
--- a/modules/gdscript/gdscript.h
+++ b/modules/gdscript/gdscript.h
@@ -31,13 +31,14 @@
 #ifndef GDSCRIPT_H
 #define GDSCRIPT_H
 
+#include "core/debugger/engine_debugger.h"
+#include "core/debugger/script_debugger.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
 #include "core/script_language.h"
 #include "gdscript_function.h"
 
 class GDScriptNativeClass : public Reference {
-
 	GDCLASS(GDScriptNativeClass, Reference);
 
 	StringName name;
@@ -54,7 +55,6 @@ public:
 };
 
 class GDScript : public Script {
-
 	GDCLASS(GDScript, Script);
 	bool tool;
 	bool valid;
@@ -69,11 +69,11 @@ class GDScript : public Script {
 
 	friend class GDScriptInstance;
 	friend class GDScriptFunction;
+	friend class GDScriptAnalyzer;
 	friend class GDScriptCompiler;
 	friend class GDScriptFunctions;
 	friend class GDScriptLanguage;
 
-	Variant _static_ref; //used for static call
 	Ref<GDScriptNativeClass> native;
 	Ref<GDScript> base;
 	GDScript *_base; //fast pointer access
@@ -83,8 +83,10 @@ class GDScript : public Script {
 	Map<StringName, Variant> constants;
 	Map<StringName, GDScriptFunction *> member_functions;
 	Map<StringName, MemberInfo> member_indices; //members are just indices to the instanced script.
-	Map<StringName, Ref<GDScript> > subclasses;
-	Map<StringName, Vector<StringName> > _signals;
+	Map<StringName, Ref<GDScript>> subclasses;
+	Map<StringName, Vector<StringName>> _signals;
+	Vector<ScriptNetData> rpc_functions;
+	Vector<ScriptNetData> rpc_variables;
 
 #ifdef TOOLS_ENABLED
 
@@ -103,7 +105,8 @@ class GDScript : public Script {
 #endif
 	Map<StringName, PropertyInfo> member_info;
 
-	GDScriptFunction *initializer; //direct pointer to _init , faster to locate
+	GDScriptFunction *implicit_initializer = nullptr;
+	GDScriptFunction *initializer = nullptr; //direct pointer to new , faster to locate
 
 	int subclass_count;
 	Set<Object *> instances;
@@ -114,40 +117,45 @@ class GDScript : public Script {
 	String fully_qualified_name;
 	SelfList<GDScript> script_list;
 
-	GDScriptInstance *_create_instance(const Variant **p_args, int p_argcount, Object *p_owner, bool p_isref, Variant::CallError &r_error);
+	SelfList<GDScriptFunctionState>::List pending_func_states;
+
+	void _super_implicit_constructor(GDScript *p_script, GDScriptInstance *p_instance, Callable::CallError &r_error);
+	GDScriptInstance *_create_instance(const Variant **p_args, int p_argcount, Object *p_owner, bool p_isref, Callable::CallError &r_error);
 
 	void _set_subclass_path(Ref<GDScript> &p_sc, const String &p_path);
 
 #ifdef TOOLS_ENABLED
 	Set<PlaceHolderScriptInstance *> placeholders;
 	//void _update_placeholder(PlaceHolderScriptInstance *p_placeholder);
-	virtual void _placeholder_erased(PlaceHolderScriptInstance *p_placeholder);
+	virtual void _placeholder_erased(PlaceHolderScriptInstance *p_placeholder) override;
 #endif
 
 #ifdef DEBUG_ENABLED
 
-	Map<ObjectID, List<Pair<StringName, Variant> > > pending_reload_state;
+	Map<ObjectID, List<Pair<StringName, Variant>>> pending_reload_state;
 
 #endif
 
-	bool _update_exports();
+	bool _update_exports(bool *r_err = nullptr, bool p_recursive_call = false);
 
 	void _save_orphaned_subclasses();
+	void _init_rpc_methods_properties();
 
 protected:
 	bool _get(const StringName &p_name, Variant &r_ret) const;
 	bool _set(const StringName &p_name, const Variant &p_value);
 	void _get_property_list(List<PropertyInfo> *p_properties) const;
 
-	Variant call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error);
-	//void call_multilevel(const StringName& p_method,const Variant** p_args,int p_argcount);
+	Variant call(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error) override;
 
 	static void _bind_methods();
 
 public:
-	virtual bool is_valid() const { return valid; }
+	virtual bool is_valid() const override { return valid; }
 
-	const Map<StringName, Ref<GDScript> > &get_subclasses() const { return subclasses; }
+	bool inherits_script(const Ref<Script> &p_script) const override;
+
+	const Map<StringName, Ref<GDScript>> &get_subclasses() const { return subclasses; }
 	const Map<StringName, Variant> &get_constants() const { return constants; }
 	const Set<StringName> &get_members() const { return members; }
 	const GDScriptDataType &get_member_type(const StringName &p_member) const {
@@ -158,32 +166,32 @@ public:
 	const Ref<GDScriptNativeClass> &get_native() const { return native; }
 	const String &get_script_class_name() const { return name; }
 
-	virtual bool has_script_signal(const StringName &p_signal) const;
-	virtual void get_script_signal_list(List<MethodInfo> *r_signals) const;
+	virtual bool has_script_signal(const StringName &p_signal) const override;
+	virtual void get_script_signal_list(List<MethodInfo> *r_signals) const override;
 
-	bool is_tool() const { return tool; }
+	bool is_tool() const override { return tool; }
 	Ref<GDScript> get_base() const;
 
 	const Map<StringName, MemberInfo> &debug_get_member_indices() const { return member_indices; }
 	const Map<StringName, GDScriptFunction *> &debug_get_member_functions() const; //this is debug only
 	StringName debug_get_member_by_index(int p_idx) const;
 
-	Variant _new(const Variant **p_args, int p_argcount, Variant::CallError &r_error);
-	virtual bool can_instance() const;
+	Variant _new(const Variant **p_args, int p_argcount, Callable::CallError &r_error);
+	virtual bool can_instance() const override;
 
-	virtual Ref<Script> get_base_script() const;
+	virtual Ref<Script> get_base_script() const override;
 
-	virtual StringName get_instance_base_type() const; // this may not work in all scripts, will return empty if so
-	virtual ScriptInstance *instance_create(Object *p_this);
-	virtual PlaceHolderScriptInstance *placeholder_instance_create(Object *p_this);
-	virtual bool instance_has(const Object *p_this) const;
+	virtual StringName get_instance_base_type() const override; // this may not work in all scripts, will return empty if so
+	virtual ScriptInstance *instance_create(Object *p_this) override;
+	virtual PlaceHolderScriptInstance *placeholder_instance_create(Object *p_this) override;
+	virtual bool instance_has(const Object *p_this) const override;
 
-	virtual bool has_source_code() const;
-	virtual String get_source_code() const;
-	virtual void set_source_code(const String &p_code);
-	virtual void update_exports();
+	virtual bool has_source_code() const override;
+	virtual String get_source_code() const override;
+	virtual void set_source_code(const String &p_code) override;
+	virtual void update_exports() override;
 
-	virtual Error reload(bool p_keep_state = false);
+	virtual Error reload(bool p_keep_state = false) override;
 
 	void set_script_path(const String &p_path) { path = p_path; } //because subclasses need a path too...
 	Error load_source_code(const String &p_path);
@@ -191,30 +199,42 @@ public:
 
 	Vector<uint8_t> get_as_byte_code() const;
 
-	bool get_property_default_value(const StringName &p_property, Variant &r_value) const;
+	bool get_property_default_value(const StringName &p_property, Variant &r_value) const override;
 
-	virtual void get_script_method_list(List<MethodInfo> *p_list) const;
-	virtual bool has_method(const StringName &p_method) const;
-	virtual MethodInfo get_method_info(const StringName &p_method) const;
+	virtual void get_script_method_list(List<MethodInfo> *p_list) const override;
+	virtual bool has_method(const StringName &p_method) const override;
+	virtual MethodInfo get_method_info(const StringName &p_method) const override;
 
-	virtual void get_script_property_list(List<PropertyInfo> *p_list) const;
+	virtual void get_script_property_list(List<PropertyInfo> *p_list) const override;
 
-	virtual ScriptLanguage *get_language() const;
+	virtual ScriptLanguage *get_language() const override;
 
-	virtual int get_member_line(const StringName &p_member) const {
+	virtual int get_member_line(const StringName &p_member) const override {
 #ifdef TOOLS_ENABLED
-		if (member_lines.has(p_member))
+		if (member_lines.has(p_member)) {
 			return member_lines[p_member];
-		else
+		}
 #endif
-			return -1;
+		return -1;
 	}
 
-	virtual void get_constants(Map<StringName, Variant> *p_constants);
-	virtual void get_members(Set<StringName> *p_members);
+	virtual void get_constants(Map<StringName, Variant> *p_constants) override;
+	virtual void get_members(Set<StringName> *p_members) override;
+
+	virtual Vector<ScriptNetData> get_rpc_methods() const override;
+	virtual uint16_t get_rpc_method_id(const StringName &p_method) const override;
+	virtual StringName get_rpc_method(const uint16_t p_rpc_method_id) const override;
+	virtual MultiplayerAPI::RPCMode get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const override;
+	virtual MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const override;
+
+	virtual Vector<ScriptNetData> get_rset_properties() const override;
+	virtual uint16_t get_rset_property_id(const StringName &p_variable) const override;
+	virtual StringName get_rset_property(const uint16_t p_variable_id) const override;
+	virtual MultiplayerAPI::RPCMode get_rset_mode_by_id(const uint16_t p_variable_id) const override;
+	virtual MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const override;
 
 #ifdef TOOLS_ENABLED
-	virtual bool is_placeholder_fallback_enabled() const { return placeholder_fallback_enabled; }
+	virtual bool is_placeholder_fallback_enabled() const override { return placeholder_fallback_enabled; }
 #endif
 
 	GDScript();
@@ -227,6 +247,7 @@ class GDScriptInstance : public ScriptInstance {
 	friend class GDScriptFunctions;
 	friend class GDScriptCompiler;
 
+	ObjectID owner_id;
 	Object *owner;
 	Ref<GDScript> script;
 #ifdef DEBUG_ENABLED
@@ -235,7 +256,7 @@ class GDScriptInstance : public ScriptInstance {
 	Vector<Variant> members;
 	bool base_ref;
 
-	void _ml_call_reversed(GDScript *sptr, const StringName &p_method, const Variant **p_args, int p_argcount);
+	SelfList<GDScriptFunctionState>::List pending_func_states;
 
 public:
 	virtual Object *get_owner() { return owner; }
@@ -243,13 +264,11 @@ public:
 	virtual bool set(const StringName &p_name, const Variant &p_value);
 	virtual bool get(const StringName &p_name, Variant &r_ret) const;
 	virtual void get_property_list(List<PropertyInfo> *p_properties) const;
-	virtual Variant::Type get_property_type(const StringName &p_name, bool *r_is_valid = NULL) const;
+	virtual Variant::Type get_property_type(const StringName &p_name, bool *r_is_valid = nullptr) const;
 
 	virtual void get_method_list(List<MethodInfo> *p_list) const;
 	virtual bool has_method(const StringName &p_method) const;
-	virtual Variant call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error);
-	virtual void call_multilevel(const StringName &p_method, const Variant **p_args, int p_argcount);
-	virtual void call_multilevel_reversed(const StringName &p_method, const Variant **p_args, int p_argcount);
+	virtual Variant call(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error);
 
 	Variant debug_get_member_by_index(int p_idx) const { return members[p_idx]; }
 
@@ -264,60 +283,24 @@ public:
 
 	void reload_members();
 
+	virtual Vector<ScriptNetData> get_rpc_methods() const;
+	virtual uint16_t get_rpc_method_id(const StringName &p_method) const;
+	virtual StringName get_rpc_method(const uint16_t p_rpc_method_id) const;
+	virtual MultiplayerAPI::RPCMode get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const;
 	virtual MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const;
+
+	virtual Vector<ScriptNetData> get_rset_properties() const;
+	virtual uint16_t get_rset_property_id(const StringName &p_variable) const;
+	virtual StringName get_rset_property(const uint16_t p_variable_id) const;
+	virtual MultiplayerAPI::RPCMode get_rset_mode_by_id(const uint16_t p_variable_id) const;
 	virtual MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const;
 
 	GDScriptInstance();
 	~GDScriptInstance();
 };
 
-#ifdef DEBUG_ENABLED
-struct GDScriptWarning {
-	enum Code {
-		UNASSIGNED_VARIABLE, // Variable used but never assigned
-		UNASSIGNED_VARIABLE_OP_ASSIGN, // Variable never assigned but used in an assignment operation (+=, *=, etc)
-		UNUSED_VARIABLE, // Local variable is declared but never used
-		SHADOWED_VARIABLE, // Variable name shadowed by other variable
-		UNUSED_CLASS_VARIABLE, // Class variable is declared but never used in the file
-		UNUSED_ARGUMENT, // Function argument is never used
-		UNREACHABLE_CODE, // Code after a return statement
-		STANDALONE_EXPRESSION, // Expression not assigned to a variable
-		VOID_ASSIGNMENT, // Function returns void but it's assigned to a variable
-		NARROWING_CONVERSION, // Float value into an integer slot, precision is lost
-		FUNCTION_MAY_YIELD, // Typed assign of function call that yields (it may return a function state)
-		VARIABLE_CONFLICTS_FUNCTION, // Variable has the same name of a function
-		FUNCTION_CONFLICTS_VARIABLE, // Function has the same name of a variable
-		FUNCTION_CONFLICTS_CONSTANT, // Function has the same name of a constant
-		INCOMPATIBLE_TERNARY, // Possible values of a ternary if are not mutually compatible
-		UNUSED_SIGNAL, // Signal is defined but never emitted
-		RETURN_VALUE_DISCARDED, // Function call returns something but the value isn't used
-		PROPERTY_USED_AS_FUNCTION, // Function not found, but there's a property with the same name
-		CONSTANT_USED_AS_FUNCTION, // Function not found, but there's a constant with the same name
-		FUNCTION_USED_AS_PROPERTY, // Property not found, but there's a function with the same name
-		INTEGER_DIVISION, // Integer divide by integer, decimal part is discarded
-		UNSAFE_PROPERTY_ACCESS, // Property not found in the detected type (but can be in subtypes)
-		UNSAFE_METHOD_ACCESS, // Function not found in the detected type (but can be in subtypes)
-		UNSAFE_CAST, // Cast used in an unknown type
-		UNSAFE_CALL_ARGUMENT, // Function call argument is of a supertype of the require argument
-		DEPRECATED_KEYWORD, // The keyword is deprecated and should be replaced
-		STANDALONE_TERNARY, // Return value of ternary expression is discarded
-		WARNING_MAX,
-	} code;
-	Vector<String> symbols;
-	int line;
-
-	String get_name() const;
-	String get_message() const;
-	static String get_name_from_code(Code p_code);
-	static Code get_code_from_name(const String &p_name);
-
-	GDScriptWarning() :
-			code(WARNING_MAX),
-			line(-1) {}
-};
-#endif // DEBUG_ENABLED
-
 class GDScriptLanguage : public ScriptLanguage {
+	friend class GDScriptFunctionState;
 
 	static GDScriptLanguage *singleton;
 
@@ -327,7 +310,6 @@ class GDScriptLanguage : public ScriptLanguage {
 	Map<StringName, Variant> named_globals;
 
 	struct CallLevel {
-
 		Variant *stack;
 		GDScriptFunction *function;
 		GDScriptInstance *instance;
@@ -346,7 +328,7 @@ class GDScriptLanguage : public ScriptLanguage {
 
 	friend class GDScriptInstance;
 
-	Mutex *lock;
+	Mutex lock;
 
 	friend class GDScript;
 
@@ -366,17 +348,18 @@ public:
 	bool debug_break_parse(const String &p_file, int p_line, const String &p_error);
 
 	_FORCE_INLINE_ void enter_function(GDScriptInstance *p_instance, GDScriptFunction *p_function, Variant *p_stack, int *p_ip, int *p_line) {
-
-		if (Thread::get_main_id() != Thread::get_caller_id())
+		if (Thread::get_main_id() != Thread::get_caller_id()) {
 			return; //no support for other threads than main for now
+		}
 
-		if (ScriptDebugger::get_singleton()->get_lines_left() > 0 && ScriptDebugger::get_singleton()->get_depth() >= 0)
-			ScriptDebugger::get_singleton()->set_depth(ScriptDebugger::get_singleton()->get_depth() + 1);
+		if (EngineDebugger::get_script_debugger()->get_lines_left() > 0 && EngineDebugger::get_script_debugger()->get_depth() >= 0) {
+			EngineDebugger::get_script_debugger()->set_depth(EngineDebugger::get_script_debugger()->get_depth() + 1);
+		}
 
 		if (_debug_call_stack_pos >= _debug_max_call_stack) {
 			//stack overflow
 			_debug_error = "Stack Overflow (Stack Size: " + itos(_debug_max_call_stack) + ")";
-			ScriptDebugger::get_singleton()->debug(this);
+			EngineDebugger::get_script_debugger()->debug(this);
 			return;
 		}
 
@@ -389,17 +372,17 @@ public:
 	}
 
 	_FORCE_INLINE_ void exit_function() {
-
-		if (Thread::get_main_id() != Thread::get_caller_id())
+		if (Thread::get_main_id() != Thread::get_caller_id()) {
 			return; //no support for other threads than main for now
+		}
 
-		if (ScriptDebugger::get_singleton()->get_lines_left() > 0 && ScriptDebugger::get_singleton()->get_depth() >= 0)
-			ScriptDebugger::get_singleton()->set_depth(ScriptDebugger::get_singleton()->get_depth() - 1);
+		if (EngineDebugger::get_script_debugger()->get_lines_left() > 0 && EngineDebugger::get_script_debugger()->get_depth() >= 0) {
+			EngineDebugger::get_script_debugger()->set_depth(EngineDebugger::get_script_debugger()->get_depth() - 1);
+		}
 
 		if (_debug_call_stack_pos == 0) {
-
 			_debug_error = "Stack Underflow (Engine Bug)";
-			ScriptDebugger::get_singleton()->debug(this);
+			EngineDebugger::get_script_debugger()->debug(this);
 			return;
 		}
 
@@ -407,8 +390,9 @@ public:
 	}
 
 	virtual Vector<StackInfo> debug_get_current_stack_info() {
-		if (Thread::get_main_id() != Thread::get_caller_id())
+		if (Thread::get_main_id() != Thread::get_caller_id()) {
 			return Vector<StackInfo>();
+		}
 
 		Vector<StackInfo> csi;
 		csi.resize(_debug_call_stack_pos);
@@ -423,7 +407,6 @@ public:
 	}
 
 	struct {
-
 		StringName _init;
 		StringName _notification;
 		StringName _set;
@@ -457,13 +440,13 @@ public:
 	virtual Ref<Script> get_template(const String &p_class_name, const String &p_base_class_name) const;
 	virtual bool is_using_templates();
 	virtual void make_template(const String &p_class_name, const String &p_base_class_name, Ref<Script> &p_script);
-	virtual bool validate(const String &p_script, int &r_line_error, int &r_col_error, String &r_test_error, const String &p_path = "", List<String> *r_functions = NULL, List<ScriptLanguage::Warning> *r_warnings = NULL, Set<int> *r_safe_lines = NULL) const;
+	virtual bool validate(const String &p_script, int &r_line_error, int &r_col_error, String &r_test_error, const String &p_path = "", List<String> *r_functions = nullptr, List<ScriptLanguage::Warning> *r_warnings = nullptr, Set<int> *r_safe_lines = nullptr) const;
 	virtual Script *create_script() const;
 	virtual bool has_named_classes() const;
 	virtual bool supports_builtin_mode() const;
 	virtual bool can_inherit_from_file() { return true; }
 	virtual int find_function(const String &p_function, const String &p_code) const;
-	virtual String make_function(const String &p_class, const String &p_name, const PoolStringArray &p_args) const;
+	virtual String make_function(const String &p_class, const String &p_name, const PackedStringArray &p_args) const;
 	virtual Error complete_code(const String &p_code, const String &p_path, Object *p_owner, List<ScriptCodeCompletionOption> *r_options, bool &r_forced, String &r_call_hint);
 #ifdef TOOLS_ENABLED
 	virtual Error lookup_code(const String &p_code, const String &p_symbol, const String &p_path, Object *p_owner, LookupResult &r_result);
@@ -493,7 +476,7 @@ public:
 	virtual void frame();
 
 	virtual void get_public_functions(List<MethodInfo> *p_functions) const;
-	virtual void get_public_constants(List<Pair<String, Variant> > *p_constants) const;
+	virtual void get_public_constants(List<Pair<String, Variant>> *p_constants) const;
 
 	virtual void profiling_start();
 	virtual void profiling_stop();
@@ -508,7 +491,7 @@ public:
 	/* GLOBAL CLASSES */
 
 	virtual bool handles_global_class_type(const String &p_type) const;
-	virtual String get_global_class_name(const String &p_path, String *r_base_type = NULL, String *r_icon_path = NULL) const;
+	virtual String get_global_class_name(const String &p_path, String *r_base_type = nullptr, String *r_icon_path = nullptr) const;
 
 	void add_orphan_subclass(const String &p_qualified_name, const ObjectID &p_subclass);
 	Ref<GDScript> get_orphan_subclass(const String &p_qualified_name);
@@ -519,7 +502,7 @@ public:
 
 class ResourceFormatLoaderGDScript : public ResourceFormatLoader {
 public:
-	virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
+	virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, bool p_no_cache = false);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual bool handles_type(const String &p_type) const;
 	virtual String get_resource_type(const String &p_path) const;
diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp
new file mode 100644
index 0000000000..943a49060f
--- /dev/null
+++ b/modules/gdscript/gdscript_analyzer.cpp
@@ -0,0 +1,3346 @@
+/*************************************************************************/
+/*  gdscript_analyzer.cpp                                                */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "gdscript_analyzer.h"
+
+#include "core/class_db.h"
+#include "core/hash_map.h"
+#include "core/io/resource_loader.h"
+#include "core/os/file_access.h"
+#include "core/project_settings.h"
+#include "core/script_language.h"
+#include "gdscript.h"
+
+// TODO: Move this to a central location (maybe core?).
+static HashMap<StringName, StringName> underscore_map;
+static const char *underscore_classes[] = {
+	"ClassDB",
+	"Directory",
+	"Engine",
+	"File",
+	"Geometry",
+	"GodotSharp",
+	"JSON",
+	"Marshalls",
+	"Mutex",
+	"OS",
+	"ResourceLoader",
+	"ResourceSaver",
+	"Semaphore",
+	"Thread",
+	"VisualScriptEditor",
+	nullptr,
+};
+static StringName get_real_class_name(const StringName &p_source) {
+	if (underscore_map.empty()) {
+		const char **class_name = underscore_classes;
+		while (*class_name != nullptr) {
+			underscore_map[*class_name] = String("_") + *class_name;
+			class_name++;
+		}
+	}
+	if (underscore_map.has(p_source)) {
+		return underscore_map[p_source];
+	}
+	return p_source;
+}
+
+void GDScriptAnalyzer::cleanup() {
+	underscore_map.clear();
+}
+
+static GDScriptParser::DataType make_callable_type(const MethodInfo &p_info) {
+	GDScriptParser::DataType type;
+	type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+	type.kind = GDScriptParser::DataType::BUILTIN;
+	type.builtin_type = Variant::CALLABLE;
+	type.is_constant = true;
+	type.method_info = p_info;
+	return type;
+}
+
+static GDScriptParser::DataType make_signal_type(const MethodInfo &p_info) {
+	GDScriptParser::DataType type;
+	type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+	type.kind = GDScriptParser::DataType::BUILTIN;
+	type.builtin_type = Variant::SIGNAL;
+	type.is_constant = true;
+	type.method_info = p_info;
+	return type;
+}
+
+static GDScriptParser::DataType make_native_meta_type(const StringName &p_class_name) {
+	GDScriptParser::DataType type;
+	type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+	type.kind = GDScriptParser::DataType::NATIVE;
+	type.builtin_type = Variant::OBJECT;
+	type.is_constant = true;
+	type.native_type = p_class_name;
+	type.is_meta_type = true;
+	return type;
+}
+
+static GDScriptParser::DataType make_native_enum_type(const StringName &p_native_class, const StringName &p_enum_name) {
+	GDScriptParser::DataType type;
+	type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+	type.kind = GDScriptParser::DataType::ENUM;
+	type.builtin_type = Variant::OBJECT;
+	type.is_constant = true;
+	type.is_meta_type = true;
+
+	List<StringName> enum_values;
+	StringName real_native_name = get_real_class_name(p_native_class);
+	ClassDB::get_enum_constants(real_native_name, p_enum_name, &enum_values);
+
+	for (const List<StringName>::Element *E = enum_values.front(); E != nullptr; E = E->next()) {
+		type.enum_values[E->get()] = ClassDB::get_integer_constant(real_native_name, E->get());
+	}
+
+	return type;
+}
+
+static GDScriptParser::DataType make_builtin_meta_type(Variant::Type p_type) {
+	GDScriptParser::DataType type;
+	type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+	type.kind = GDScriptParser::DataType::BUILTIN;
+	type.builtin_type = p_type;
+	type.is_constant = true;
+	type.is_meta_type = true;
+	return type;
+}
+
+Error GDScriptAnalyzer::resolve_inheritance(GDScriptParser::ClassNode *p_class, bool p_recursive) {
+	if (p_class->base_type.is_set()) {
+		// Already resolved
+		return OK;
+	}
+
+	if (p_class == parser->head) {
+		if (p_class->identifier) {
+			p_class->fqcn = p_class->identifier->name;
+		} else {
+			p_class->fqcn = parser->script_path;
+		}
+	} else {
+		p_class->fqcn = p_class->outer->fqcn + "::" + String(p_class->identifier->name);
+	}
+
+	GDScriptParser::DataType result;
+
+	// Set datatype for class.
+	GDScriptParser::DataType class_type;
+	class_type.is_constant = true;
+	class_type.is_meta_type = true;
+	class_type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+	class_type.kind = GDScriptParser::DataType::CLASS;
+	class_type.class_type = p_class;
+	class_type.script_path = parser->script_path;
+	p_class->set_datatype(class_type);
+
+	if (!p_class->extends_used) {
+		result.type_source = GDScriptParser::DataType::ANNOTATED_INFERRED;
+		result.kind = GDScriptParser::DataType::NATIVE;
+		result.native_type = "Reference";
+	} else {
+		result.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+
+		GDScriptParser::DataType base;
+
+		int extends_index = 0;
+
+		if (!p_class->extends_path.empty()) {
+			Ref<GDScriptParserRef> parser = get_parser_for(p_class->extends_path);
+			if (parser.is_null()) {
+				push_error(vformat(R"(Could not resolve super class path "%s".)", p_class->extends_path), p_class);
+				return ERR_PARSE_ERROR;
+			}
+
+			Error err = parser->raise_status(GDScriptParserRef::INTERFACE_SOLVED);
+			if (err != OK) {
+				push_error(vformat(R"(Could not resolve super class inheritance from "%s".)", p_class->extends_path), p_class);
+				return err;
+			}
+
+			base = parser->get_parser()->head->get_datatype();
+		} else {
+			if (p_class->extends.empty()) {
+				return ERR_PARSE_ERROR;
+			}
+			const StringName &name = p_class->extends[extends_index++];
+			base.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+
+			if (ScriptServer::is_global_class(name)) {
+				String base_path = ScriptServer::get_global_class_path(name);
+
+				if (base_path == parser->script_path) {
+					base = parser->head->get_datatype();
+				} else {
+					Ref<GDScriptParserRef> parser = get_parser_for(base_path);
+					if (parser.is_null()) {
+						push_error(vformat(R"(Could not resolve super class "%s".)", name), p_class);
+						return ERR_PARSE_ERROR;
+					}
+
+					Error err = parser->raise_status(GDScriptParserRef::INTERFACE_SOLVED);
+					if (err != OK) {
+						push_error(vformat(R"(Could not resolve super class inheritance from "%s".)", name), p_class);
+						return err;
+					}
+					base = parser->get_parser()->head->get_datatype();
+				}
+			} else if (ProjectSettings::get_singleton()->has_autoload(name) && ProjectSettings::get_singleton()->get_autoload(name).is_singleton) {
+				const ProjectSettings::AutoloadInfo &info = ProjectSettings::get_singleton()->get_autoload(name);
+				if (info.path.get_extension().to_lower() != ".gd") {
+					push_error(vformat(R"(Singleton %s is not a GDScript.)", info.name), p_class);
+					return ERR_PARSE_ERROR;
+				}
+
+				Ref<GDScriptParserRef> parser = get_parser_for(info.path);
+				if (parser.is_null()) {
+					push_error(vformat(R"(Could not parse singleton from "%s".)", info.path), p_class);
+					return ERR_PARSE_ERROR;
+				}
+
+				Error err = parser->raise_status(GDScriptParserRef::INTERFACE_SOLVED);
+				if (err != OK) {
+					push_error(vformat(R"(Could not resolve super class inheritance from "%s".)", name), p_class);
+					return err;
+				}
+			} else if (class_exists(name) && ClassDB::can_instance(get_real_class_name(name))) {
+				base.kind = GDScriptParser::DataType::NATIVE;
+				base.native_type = name;
+			} else {
+				// Look for other classes in script.
+				GDScriptParser::ClassNode *look_class = p_class;
+				bool found = false;
+				while (look_class != nullptr) {
+					if (look_class->identifier && look_class->identifier->name == name) {
+						if (!look_class->get_datatype().is_set()) {
+							Error err = resolve_inheritance(look_class, false);
+							if (err) {
+								return err;
+							}
+						}
+						base = look_class->get_datatype();
+						found = true;
+						break;
+					}
+					if (look_class->members_indices.has(name) && look_class->get_member(name).type == GDScriptParser::ClassNode::Member::CLASS) {
+						GDScriptParser::ClassNode::Member member = look_class->get_member(name);
+						if (!member.m_class->get_datatype().is_set()) {
+							Error err = resolve_inheritance(member.m_class, false);
+							if (err) {
+								return err;
+							}
+						}
+						base = member.m_class->get_datatype();
+						found = true;
+						break;
+					}
+					look_class = look_class->outer;
+				}
+
+				if (!found) {
+					push_error(vformat(R"(Could not find base class "%s".)", name), p_class);
+					return ERR_PARSE_ERROR;
+				}
+			}
+		}
+
+		for (int index = extends_index; index < p_class->extends.size(); index++) {
+			if (base.kind != GDScriptParser::DataType::CLASS) {
+				push_error(R"(Super type "%s" is not a GDScript. Cannot get nested types.)", p_class);
+				return ERR_PARSE_ERROR;
+			}
+
+			// TODO: Extends could use identifier nodes. That way errors can be pointed out properly and it can be used here.
+			GDScriptParser::IdentifierNode *id = parser->alloc_node<GDScriptParser::IdentifierNode>();
+			id->name = p_class->extends[index];
+
+			reduce_identifier_from_base(id, &base);
+
+			GDScriptParser::DataType id_type = id->get_datatype();
+			if (!id_type.is_set()) {
+				push_error(vformat(R"(Could not find type "%s" under base "%s".)", id->name, base.to_string()), p_class);
+			}
+
+			base = id_type;
+		}
+
+		result = base;
+	}
+
+	if (!result.is_set()) {
+		// TODO: More specific error messages.
+		push_error(vformat(R"(Could not resolve inheritance for class "%s".)", p_class->identifier == nullptr ? "<main>" : p_class->identifier->name), p_class);
+		return ERR_PARSE_ERROR;
+	}
+
+	// Check for cyclic inheritance.
+	const GDScriptParser::ClassNode *base_class = result.class_type;
+	while (base_class) {
+		if (base_class->fqcn == p_class->fqcn) {
+			push_error("Cyclic inheritance.", p_class);
+			return ERR_PARSE_ERROR;
+		}
+		base_class = base_class->base_type.class_type;
+	}
+
+	p_class->base_type = result;
+	class_type.native_type = result.native_type;
+	p_class->set_datatype(class_type);
+
+	if (p_recursive) {
+		for (int i = 0; i < p_class->members.size(); i++) {
+			if (p_class->members[i].type == GDScriptParser::ClassNode::Member::CLASS) {
+				Error err = resolve_inheritance(p_class->members[i].m_class, true);
+				if (err) {
+					return err;
+				}
+			}
+		}
+	}
+
+	return OK;
+}
+
+GDScriptParser::DataType GDScriptAnalyzer::resolve_datatype(GDScriptParser::TypeNode *p_type) {
+	GDScriptParser::DataType result;
+
+	if (p_type == nullptr) {
+		result.kind = GDScriptParser::DataType::VARIANT;
+		return result;
+	}
+
+	result.type_source = result.ANNOTATED_EXPLICIT;
+	result.builtin_type = Variant::OBJECT;
+
+	if (p_type->type_chain.empty()) {
+		// void.
+		result.kind = GDScriptParser::DataType::BUILTIN;
+		result.builtin_type = Variant::NIL;
+		p_type->set_datatype(result);
+		return result;
+	}
+
+	StringName first = p_type->type_chain[0]->name;
+
+	if (first == "Variant") {
+		result.kind = GDScriptParser::DataType::VARIANT;
+		if (p_type->type_chain.size() > 1) {
+			push_error(R"("Variant" type don't contain nested types.)", p_type->type_chain[1]);
+			return GDScriptParser::DataType();
+		}
+		return result;
+	}
+
+	if (first == "Object") {
+		result.kind = GDScriptParser::DataType::NATIVE;
+		result.native_type = "Object";
+		if (p_type->type_chain.size() > 1) {
+			push_error(R"("Object" type don't contain nested types.)", p_type->type_chain[1]);
+			return GDScriptParser::DataType();
+		}
+		return result;
+	}
+
+	if (GDScriptParser::get_builtin_type(first) < Variant::VARIANT_MAX) {
+		// Built-in types.
+		if (p_type->type_chain.size() > 1) {
+			push_error(R"(Built-in types don't contain nested types.)", p_type->type_chain[1]);
+			return GDScriptParser::DataType();
+		}
+		result.kind = GDScriptParser::DataType::BUILTIN;
+		result.builtin_type = GDScriptParser::get_builtin_type(first);
+	} else if (class_exists(first)) {
+		// Native engine classes.
+		result.kind = GDScriptParser::DataType::NATIVE;
+		result.native_type = first;
+	} else if (ScriptServer::is_global_class(first)) {
+		if (parser->script_path == ScriptServer::get_global_class_path(first)) {
+			result = parser->head->get_datatype();
+		} else {
+			Ref<GDScriptParserRef> ref = get_parser_for(ScriptServer::get_global_class_path(first));
+			if (ref->raise_status(GDScriptParserRef::INTERFACE_SOLVED) != OK) {
+				push_error(vformat(R"(Could not parse global class "%s" from "%s".)", first, ScriptServer::get_global_class_path(first)), p_type);
+				return GDScriptParser::DataType();
+			}
+			result = ref->get_parser()->head->get_datatype();
+		}
+	} else if (ProjectSettings::get_singleton()->has_autoload(first) && ProjectSettings::get_singleton()->get_autoload(first).is_singleton) {
+		const ProjectSettings::AutoloadInfo &autoload = ProjectSettings::get_singleton()->get_autoload(first);
+		Ref<GDScriptParserRef> ref = get_parser_for(autoload.path);
+		if (ref->raise_status(GDScriptParserRef::INTERFACE_SOLVED) != OK) {
+			push_error(vformat(R"(Could not parse singleton "%s" from "%s".)", first, autoload.path), p_type);
+			return GDScriptParser::DataType();
+		}
+		result = ref->get_parser()->head->get_datatype();
+	} else if (ClassDB::has_enum(get_real_class_name(parser->current_class->base_type.native_type), first)) {
+		// Native enum in current class.
+		result = make_native_enum_type(parser->current_class->base_type.native_type, first);
+	} else {
+		// Classes in current scope.
+		GDScriptParser::ClassNode *script_class = parser->current_class;
+		bool found = false;
+		while (!found && script_class != nullptr) {
+			if (script_class->identifier && script_class->identifier->name == first) {
+				result = script_class->get_datatype();
+				found = true;
+				break;
+			}
+			if (script_class->members_indices.has(first)) {
+				GDScriptParser::ClassNode::Member member = script_class->members[script_class->members_indices[first]];
+				switch (member.type) {
+					case GDScriptParser::ClassNode::Member::CLASS:
+						result = member.m_class->get_datatype();
+						found = true;
+						break;
+					case GDScriptParser::ClassNode::Member::ENUM:
+						result = member.m_enum->get_datatype();
+						found = true;
+						break;
+					case GDScriptParser::ClassNode::Member::CONSTANT:
+						if (member.constant->get_datatype().is_meta_type) {
+							result = member.constant->get_datatype();
+							found = true;
+							break;
+						}
+						[[fallthrough]];
+					default:
+						push_error(vformat(R"("%s" is a %s but does not contain a type.)", first, member.get_type_name()), p_type);
+						return GDScriptParser::DataType();
+				}
+			}
+			script_class = script_class->outer;
+		}
+	}
+	if (!result.is_set()) {
+		push_error(vformat(R"("%s" was not found in the current scope.)", first), p_type);
+		result.kind = GDScriptParser::DataType::VARIANT; // Leave Variant anyway so future type check don't use an unresolved type.
+		return result;
+	}
+
+	if (p_type->type_chain.size() > 1) {
+		if (result.kind == GDScriptParser::DataType::CLASS) {
+			for (int i = 1; i < p_type->type_chain.size(); i++) {
+				GDScriptParser::DataType base = result;
+				reduce_identifier_from_base(p_type->type_chain[i], &base);
+				result = p_type->type_chain[i]->get_datatype();
+				if (!result.is_set()) {
+					push_error(vformat(R"(Could not find type "%s" under base "%s".)", p_type->type_chain[i]->name, base.to_string()), p_type->type_chain[1]);
+					result.kind = GDScriptParser::DataType::VARIANT; // Leave Variant anyway so future type check don't use an unresolved type.
+					return result;
+				} else if (!result.is_meta_type) {
+					push_error(vformat(R"(Member "%s" under base "%s" is not a valid type.)", p_type->type_chain[i]->name, base.to_string()), p_type->type_chain[1]);
+					result.kind = GDScriptParser::DataType::VARIANT; // Leave Variant anyway so future type check don't use an unresolved type.
+					return result;
+				}
+			}
+		} else if (result.kind == GDScriptParser::DataType::NATIVE) {
+			// Only enums allowed for native.
+			if (ClassDB::has_enum(get_real_class_name(result.native_type), p_type->type_chain[1]->name)) {
+				if (p_type->type_chain.size() > 2) {
+					push_error(R"(Enums cannot contain nested types.)", p_type->type_chain[2]);
+				} else {
+					result = make_native_enum_type(result.native_type, p_type->type_chain[1]->name);
+				}
+			}
+		} else {
+			push_error(vformat(R"(Could not find nested type "%s" under base "%s".)", p_type->type_chain[1]->name, result.to_string()), p_type->type_chain[1]);
+			result.kind = GDScriptParser::DataType::VARIANT; // Leave Variant anyway so future type check don't use an unresolved type.
+			return result;
+		}
+	}
+
+	p_type->set_datatype(result);
+	return result;
+}
+
+void GDScriptAnalyzer::resolve_class_interface(GDScriptParser::ClassNode *p_class) {
+	if (p_class->resolved_interface) {
+		return;
+	}
+	p_class->resolved_interface = true;
+
+	GDScriptParser::ClassNode *previous_class = parser->current_class;
+	parser->current_class = p_class;
+
+	for (int i = 0; i < p_class->members.size(); i++) {
+		GDScriptParser::ClassNode::Member member = p_class->members[i];
+
+		switch (member.type) {
+			case GDScriptParser::ClassNode::Member::VARIABLE: {
+				GDScriptParser::DataType datatype;
+				datatype.kind = GDScriptParser::DataType::VARIANT;
+				datatype.type_source = GDScriptParser::DataType::UNDETECTED;
+
+				if (member.variable->initializer != nullptr) {
+					member.variable->set_datatype(datatype); // Allow recursive usage.
+					reduce_expression(member.variable->initializer);
+					datatype = member.variable->initializer->get_datatype();
+					if (datatype.type_source != GDScriptParser::DataType::UNDETECTED) {
+						datatype.type_source = GDScriptParser::DataType::INFERRED;
+					}
+				}
+
+				if (member.variable->datatype_specifier != nullptr) {
+					datatype = resolve_datatype(member.variable->datatype_specifier);
+					datatype.is_meta_type = false;
+
+					if (member.variable->initializer != nullptr) {
+						if (!is_type_compatible(datatype, member.variable->initializer->get_datatype(), true)) {
+							// Try reverse test since it can be a masked subtype.
+							if (!is_type_compatible(member.variable->initializer->get_datatype(), datatype, true)) {
+								push_error(vformat(R"(Value of type "%s" cannot be assigned to a variable of type "%s".)", member.variable->initializer->get_datatype().to_string(), datatype.to_string()), member.variable->initializer);
+							} else {
+								// TODO: Add warning.
+								mark_node_unsafe(member.variable->initializer);
+							}
+						} else if (datatype.builtin_type == Variant::INT && member.variable->initializer->get_datatype().builtin_type == Variant::FLOAT) {
+#ifdef DEBUG_ENABLED
+							parser->push_warning(member.variable->initializer, GDScriptWarning::NARROWING_CONVERSION);
+#endif
+						}
+						if (member.variable->initializer->get_datatype().is_variant()) {
+							// TODO: Warn unsafe assign.
+							mark_node_unsafe(member.variable->initializer);
+						}
+					}
+				} else if (member.variable->infer_datatype) {
+					if (member.variable->initializer == nullptr) {
+						push_error(vformat(R"(Cannot infer the type of "%s" variable because there's no default value.)", member.variable->identifier->name), member.variable->identifier);
+					} else if (!datatype.is_set() || datatype.has_no_type()) {
+						push_error(vformat(R"(Cannot infer the type of "%s" variable because the initial value doesn't have a set type.)", member.variable->identifier->name), member.variable->initializer);
+					} else if (datatype.is_variant()) {
+						push_error(vformat(R"(Cannot infer the type of "%s" variable because the initial value is Variant. Use explicit "Variant" type if this is intended.)", member.variable->identifier->name), member.variable->initializer);
+					} else if (datatype.builtin_type == Variant::NIL) {
+						push_error(vformat(R"(Cannot infer the type of "%s" variable because the initial value is "null".)", member.variable->identifier->name), member.variable->initializer);
+					}
+					datatype.type_source = GDScriptParser::DataType::ANNOTATED_INFERRED;
+				}
+
+				datatype.is_constant = false;
+				member.variable->set_datatype(datatype);
+				if (!datatype.has_no_type()) {
+					// TODO: Move this out into a routine specific to validate annotations.
+					if (member.variable->export_info.hint == PROPERTY_HINT_TYPE_STRING) {
+						// @export annotation.
+						switch (datatype.kind) {
+							case GDScriptParser::DataType::BUILTIN:
+								member.variable->export_info.hint_string = Variant::get_type_name(datatype.builtin_type);
+								break;
+							case GDScriptParser::DataType::NATIVE:
+								if (ClassDB::is_parent_class(get_real_class_name(datatype.native_type), "Resource")) {
+									member.variable->export_info.hint = PROPERTY_HINT_RESOURCE_TYPE;
+									member.variable->export_info.hint_string = get_real_class_name(datatype.native_type);
+								} else {
+									push_error(R"(Export type can only be built-in or a resource.)", member.variable);
+								}
+								break;
+							default:
+								// TODO: Allow custom user resources.
+								push_error(R"(Export type can only be built-in or a resource.)", member.variable);
+								break;
+						}
+					}
+				}
+			} break;
+			case GDScriptParser::ClassNode::Member::CONSTANT: {
+				reduce_expression(member.constant->initializer);
+
+				GDScriptParser::DataType datatype = member.constant->get_datatype();
+				if (member.constant->initializer) {
+					if (!member.constant->initializer->is_constant) {
+						push_error(R"(Initializer for a constant must be a constant expression.)", member.constant->initializer);
+					}
+
+					if (member.constant->datatype_specifier != nullptr) {
+						datatype = resolve_datatype(member.constant->datatype_specifier);
+						datatype.is_meta_type = false;
+
+						if (!is_type_compatible(datatype, member.constant->initializer->get_datatype(), true)) {
+							push_error(vformat(R"(Value of type "%s" cannot be initialized to constant of type "%s".)", member.constant->initializer->get_datatype().to_string(), datatype.to_string()), member.constant->initializer);
+						} else if (datatype.builtin_type == Variant::INT && member.constant->initializer->get_datatype().builtin_type == Variant::FLOAT) {
+#ifdef DEBUG_ENABLED
+							parser->push_warning(member.constant->initializer, GDScriptWarning::NARROWING_CONVERSION);
+#endif
+						}
+					}
+				}
+				datatype.is_constant = true;
+
+				member.constant->set_datatype(datatype);
+			} break;
+			case GDScriptParser::ClassNode::Member::SIGNAL: {
+				for (int j = 0; j < member.signal->parameters.size(); j++) {
+					GDScriptParser::DataType signal_type = resolve_datatype(member.signal->parameters[j]->datatype_specifier);
+					signal_type.is_meta_type = false;
+					member.signal->parameters[j]->set_datatype(signal_type);
+				}
+				// TODO: Make MethodInfo from signal.
+				GDScriptParser::DataType signal_type;
+				signal_type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+				signal_type.kind = GDScriptParser::DataType::BUILTIN;
+				signal_type.builtin_type = Variant::SIGNAL;
+
+				member.signal->set_datatype(signal_type);
+			} break;
+			case GDScriptParser::ClassNode::Member::ENUM: {
+				GDScriptParser::DataType enum_type;
+				enum_type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+				enum_type.kind = GDScriptParser::DataType::ENUM;
+				enum_type.builtin_type = Variant::DICTIONARY;
+				enum_type.enum_type = member.m_enum->identifier->name;
+				enum_type.native_type = p_class->fqcn + "." + member.m_enum->identifier->name;
+				enum_type.is_meta_type = true;
+				enum_type.is_constant = true;
+
+				// Enums can't be nested, so we can safely override this.
+				current_enum = member.m_enum;
+
+				for (int j = 0; j < member.m_enum->values.size(); j++) {
+					GDScriptParser::EnumNode::Value &element = member.m_enum->values.write[j];
+
+					if (element.custom_value) {
+						reduce_expression(element.custom_value);
+						if (!element.custom_value->is_constant) {
+							push_error(R"(Enum values must be constant.)", element.custom_value);
+						} else if (element.custom_value->reduced_value.get_type() != Variant::INT) {
+							push_error(R"(Enum values must be integers.)", element.custom_value);
+						} else {
+							element.value = element.custom_value->reduced_value;
+							element.resolved = true;
+						}
+					} else {
+						if (element.index > 0) {
+							element.value = element.parent_enum->values[element.index - 1].value + 1;
+						} else {
+							element.value = 0;
+						}
+						element.resolved = true;
+					}
+
+					enum_type.enum_values[element.identifier->name] = element.value;
+				}
+
+				current_enum = nullptr;
+
+				member.m_enum->set_datatype(enum_type);
+			} break;
+			case GDScriptParser::ClassNode::Member::FUNCTION:
+				resolve_function_signature(member.function);
+				break;
+			case GDScriptParser::ClassNode::Member::ENUM_VALUE: {
+				if (member.enum_value.custom_value) {
+					current_enum = member.enum_value.parent_enum;
+					reduce_expression(member.enum_value.custom_value);
+					current_enum = nullptr;
+
+					if (!member.enum_value.custom_value->is_constant) {
+						push_error(R"(Enum values must be constant.)", member.enum_value.custom_value);
+					} else if (member.enum_value.custom_value->reduced_value.get_type() != Variant::INT) {
+						push_error(R"(Enum values must be integers.)", member.enum_value.custom_value);
+					} else {
+						member.enum_value.value = member.enum_value.custom_value->reduced_value;
+						member.enum_value.resolved = true;
+					}
+				} else {
+					if (member.enum_value.index > 0) {
+						member.enum_value.value = member.enum_value.parent_enum->values[member.enum_value.index - 1].value + 1;
+					} else {
+						member.enum_value.value = 0;
+					}
+					member.enum_value.resolved = true;
+				}
+				// Also update the original references.
+				member.enum_value.parent_enum->values.write[member.enum_value.index] = member.enum_value;
+				p_class->members.write[i].enum_value = member.enum_value;
+			} break;
+			case GDScriptParser::ClassNode::Member::CLASS:
+				break; // Done later.
+			case GDScriptParser::ClassNode::Member::UNDEFINED:
+				ERR_PRINT("Trying to resolve undefined member.");
+				break;
+		}
+	}
+
+	// Recurse nested classes.
+	for (int i = 0; i < p_class->members.size(); i++) {
+		GDScriptParser::ClassNode::Member member = p_class->members[i];
+		if (member.type != GDScriptParser::ClassNode::Member::CLASS) {
+			continue;
+		}
+
+		resolve_class_interface(member.m_class);
+	}
+
+	parser->current_class = previous_class;
+}
+
+void GDScriptAnalyzer::resolve_class_body(GDScriptParser::ClassNode *p_class) {
+	if (p_class->resolved_body) {
+		return;
+	}
+	p_class->resolved_body = true;
+
+	GDScriptParser::ClassNode *previous_class = parser->current_class;
+	parser->current_class = p_class;
+
+	// Do functions now.
+	for (int i = 0; i < p_class->members.size(); i++) {
+		GDScriptParser::ClassNode::Member member = p_class->members[i];
+		if (member.type != GDScriptParser::ClassNode::Member::FUNCTION) {
+			continue;
+		}
+
+		resolve_function_body(member.function);
+	}
+
+	parser->current_class = previous_class;
+
+	// Recurse nested classes.
+	for (int i = 0; i < p_class->members.size(); i++) {
+		GDScriptParser::ClassNode::Member member = p_class->members[i];
+		if (member.type != GDScriptParser::ClassNode::Member::CLASS) {
+			continue;
+		}
+
+		resolve_class_body(member.m_class);
+	}
+
+	// Check unused variables.
+	for (int i = 0; i < p_class->members.size(); i++) {
+		GDScriptParser::ClassNode::Member member = p_class->members[i];
+		if (member.type != GDScriptParser::ClassNode::Member::VARIABLE) {
+			continue;
+		}
+#ifdef DEBUG_ENABLED
+		if (member.variable->usages == 0 && String(member.variable->identifier->name).begins_with("_")) {
+			parser->push_warning(member.variable->identifier, GDScriptWarning::UNUSED_PRIVATE_CLASS_VARIABLE, member.variable->identifier->name);
+		}
+#endif
+	}
+}
+
+void GDScriptAnalyzer::resolve_node(GDScriptParser::Node *p_node) {
+	ERR_FAIL_COND_MSG(p_node == nullptr, "Trying to resolve type of a null node.");
+
+	switch (p_node->type) {
+		case GDScriptParser::Node::NONE:
+			break; // Unreachable.
+		case GDScriptParser::Node::CLASS:
+			resolve_class_interface(static_cast<GDScriptParser::ClassNode *>(p_node));
+			resolve_class_body(static_cast<GDScriptParser::ClassNode *>(p_node));
+			break;
+		case GDScriptParser::Node::CONSTANT:
+			resolve_constant(static_cast<GDScriptParser::ConstantNode *>(p_node));
+			break;
+		case GDScriptParser::Node::FOR:
+			resolve_for(static_cast<GDScriptParser::ForNode *>(p_node));
+			break;
+		case GDScriptParser::Node::FUNCTION:
+			resolve_function_signature(static_cast<GDScriptParser::FunctionNode *>(p_node));
+			resolve_function_body(static_cast<GDScriptParser::FunctionNode *>(p_node));
+			break;
+		case GDScriptParser::Node::IF:
+			resolve_if(static_cast<GDScriptParser::IfNode *>(p_node));
+			break;
+		case GDScriptParser::Node::SUITE:
+			resolve_suite(static_cast<GDScriptParser::SuiteNode *>(p_node));
+			break;
+		case GDScriptParser::Node::VARIABLE:
+			resolve_variable(static_cast<GDScriptParser::VariableNode *>(p_node));
+			break;
+		case GDScriptParser::Node::WHILE:
+			resolve_while(static_cast<GDScriptParser::WhileNode *>(p_node));
+			break;
+		case GDScriptParser::Node::ANNOTATION:
+			resolve_annotation(static_cast<GDScriptParser::AnnotationNode *>(p_node));
+			break;
+		case GDScriptParser::Node::ASSERT:
+			resolve_assert(static_cast<GDScriptParser::AssertNode *>(p_node));
+			break;
+		case GDScriptParser::Node::MATCH:
+			resolve_match(static_cast<GDScriptParser::MatchNode *>(p_node));
+			break;
+		case GDScriptParser::Node::MATCH_BRANCH:
+			resolve_match_branch(static_cast<GDScriptParser::MatchBranchNode *>(p_node), nullptr);
+			break;
+		case GDScriptParser::Node::PARAMETER:
+			resolve_parameter(static_cast<GDScriptParser::ParameterNode *>(p_node));
+			break;
+		case GDScriptParser::Node::PATTERN:
+			resolve_match_pattern(static_cast<GDScriptParser::PatternNode *>(p_node), nullptr);
+			break;
+		case GDScriptParser::Node::RETURN:
+			resolve_return(static_cast<GDScriptParser::ReturnNode *>(p_node));
+			break;
+		case GDScriptParser::Node::TYPE:
+			resolve_datatype(static_cast<GDScriptParser::TypeNode *>(p_node));
+			break;
+		// Resolving expression is the same as reducing them.
+		case GDScriptParser::Node::ARRAY:
+		case GDScriptParser::Node::ASSIGNMENT:
+		case GDScriptParser::Node::AWAIT:
+		case GDScriptParser::Node::BINARY_OPERATOR:
+		case GDScriptParser::Node::CALL:
+		case GDScriptParser::Node::CAST:
+		case GDScriptParser::Node::DICTIONARY:
+		case GDScriptParser::Node::GET_NODE:
+		case GDScriptParser::Node::IDENTIFIER:
+		case GDScriptParser::Node::LITERAL:
+		case GDScriptParser::Node::PRELOAD:
+		case GDScriptParser::Node::SELF:
+		case GDScriptParser::Node::SUBSCRIPT:
+		case GDScriptParser::Node::TERNARY_OPERATOR:
+		case GDScriptParser::Node::UNARY_OPERATOR:
+			reduce_expression(static_cast<GDScriptParser::ExpressionNode *>(p_node));
+			break;
+		case GDScriptParser::Node::BREAK:
+		case GDScriptParser::Node::BREAKPOINT:
+		case GDScriptParser::Node::CONTINUE:
+		case GDScriptParser::Node::ENUM:
+		case GDScriptParser::Node::PASS:
+		case GDScriptParser::Node::SIGNAL:
+			// Nothing to do.
+			break;
+	}
+}
+
+void GDScriptAnalyzer::resolve_annotation(GDScriptParser::AnnotationNode *p_annotation) {
+	// TODO: Add second validation function for annotations, so they can use checked types.
+}
+
+void GDScriptAnalyzer::resolve_function_signature(GDScriptParser::FunctionNode *p_function) {
+	if (p_function->resolved_signature) {
+		return;
+	}
+	p_function->resolved_signature = true;
+
+	GDScriptParser::FunctionNode *previous_function = parser->current_function;
+	parser->current_function = p_function;
+
+	for (int i = 0; i < p_function->parameters.size(); i++) {
+		resolve_parameter(p_function->parameters[i]);
+#ifdef DEBUG_ENABLED
+		if (p_function->parameters[i]->usages == 0 && !String(p_function->parameters[i]->identifier->name).begins_with("_")) {
+			parser->push_warning(p_function->parameters[i]->identifier, GDScriptWarning::UNUSED_PARAMETER, p_function->identifier->name, p_function->parameters[i]->identifier->name);
+		}
+		is_shadowing(p_function->parameters[i]->identifier, "function parameter");
+#endif
+	}
+
+	if (p_function->identifier->name == "_init") {
+		// Constructor.
+		GDScriptParser::DataType return_type = parser->current_class->get_datatype();
+		return_type.is_meta_type = false;
+		p_function->set_datatype(return_type);
+		if (p_function->return_type) {
+			push_error("Constructor cannot have an explicit return type.", p_function->return_type);
+		}
+	} else {
+		GDScriptParser::DataType return_type = resolve_datatype(p_function->return_type);
+		p_function->set_datatype(return_type);
+	}
+
+	parser->current_function = previous_function;
+}
+
+void GDScriptAnalyzer::resolve_function_body(GDScriptParser::FunctionNode *p_function) {
+	if (p_function->resolved_body) {
+		return;
+	}
+	p_function->resolved_body = true;
+
+	GDScriptParser::FunctionNode *previous_function = parser->current_function;
+	parser->current_function = p_function;
+
+	resolve_suite(p_function->body);
+
+	GDScriptParser::DataType return_type = p_function->body->get_datatype();
+
+	if (p_function->get_datatype().has_no_type() && return_type.is_set()) {
+		// Use the suite inferred type if return isn't explicitly set.
+		return_type.type_source = GDScriptParser::DataType::INFERRED;
+		p_function->set_datatype(p_function->body->get_datatype());
+	} else if (p_function->get_datatype().is_hard_type() && (p_function->get_datatype().kind != GDScriptParser::DataType::BUILTIN || p_function->get_datatype().builtin_type != Variant::NIL)) {
+		if (!p_function->body->has_return && p_function->identifier->name != GDScriptLanguage::get_singleton()->strings._init) {
+			push_error(R"(Not all code paths return a value.)", p_function);
+		}
+	}
+
+	parser->current_function = previous_function;
+}
+
+void GDScriptAnalyzer::decide_suite_type(GDScriptParser::Node *p_suite, GDScriptParser::Node *p_statement) {
+	if (p_statement == nullptr) {
+		return;
+	}
+	switch (p_statement->type) {
+		case GDScriptParser::Node::IF:
+		case GDScriptParser::Node::FOR:
+		case GDScriptParser::Node::MATCH:
+		case GDScriptParser::Node::PATTERN:
+		case GDScriptParser::Node::RETURN:
+		case GDScriptParser::Node::WHILE:
+			// Use return or nested suite type as this suite type.
+			if (p_suite->get_datatype().is_set() && (p_suite->get_datatype() != p_statement->get_datatype())) {
+				// Mixed types.
+				// TODO: This could use the common supertype instead.
+				p_suite->datatype.kind = GDScriptParser::DataType::VARIANT;
+				p_suite->datatype.type_source = GDScriptParser::DataType::UNDETECTED;
+			} else {
+				p_suite->set_datatype(p_statement->get_datatype());
+				p_suite->datatype.type_source = GDScriptParser::DataType::INFERRED;
+			}
+			break;
+		default:
+			break;
+	}
+}
+
+void GDScriptAnalyzer::resolve_suite(GDScriptParser::SuiteNode *p_suite) {
+	for (int i = 0; i < p_suite->statements.size(); i++) {
+		GDScriptParser::Node *stmt = p_suite->statements[i];
+		resolve_node(stmt);
+		decide_suite_type(p_suite, stmt);
+	}
+}
+
+void GDScriptAnalyzer::resolve_if(GDScriptParser::IfNode *p_if) {
+	reduce_expression(p_if->condition);
+
+	resolve_suite(p_if->true_block);
+	p_if->set_datatype(p_if->true_block->get_datatype());
+
+	if (p_if->false_block != nullptr) {
+		resolve_suite(p_if->false_block);
+		decide_suite_type(p_if, p_if->false_block);
+	}
+}
+
+void GDScriptAnalyzer::resolve_for(GDScriptParser::ForNode *p_for) {
+	bool list_resolved = false;
+
+	// Optimize constant range() call to not allocate an array.
+	// Use int, Vector2, Vector3 instead, which also can be used as range iterators.
+	if (p_for->list && p_for->list->type == GDScriptParser::Node::CALL) {
+		GDScriptParser::CallNode *call = static_cast<GDScriptParser::CallNode *>(p_for->list);
+		GDScriptParser::Node::Type callee_type = call->get_callee_type();
+		if (callee_type == GDScriptParser::Node::IDENTIFIER) {
+			GDScriptParser::IdentifierNode *callee = static_cast<GDScriptParser::IdentifierNode *>(call->callee);
+			if (callee->name == "range") {
+				list_resolved = true;
+				if (call->arguments.size() < 1) {
+					push_error(R"*(Invalid call for "range()" function. Expected at least 1 argument, none given.)*", call->callee);
+				} else if (call->arguments.size() > 3) {
+					push_error(vformat(R"*(Invalid call for "range()" function. Expected at most 3 arguments, %d given.)*", call->arguments.size()), call->callee);
+				} else {
+					// Now we can optimize it.
+					bool all_is_constant = true;
+					Vector<Variant> args;
+					args.resize(call->arguments.size());
+					for (int i = 0; i < call->arguments.size(); i++) {
+						reduce_expression(call->arguments[i]);
+
+						if (!call->arguments[i]->is_constant) {
+							all_is_constant = false;
+						} else {
+							args.write[i] = call->arguments[i]->reduced_value;
+						}
+
+						GDScriptParser::DataType arg_type = call->arguments[i]->get_datatype();
+						if (arg_type.kind != GDScriptParser::DataType::BUILTIN) {
+							all_is_constant = false;
+							push_error(vformat(R"*(Invalid argument for "range()" call. Argument %d should be int or float but "%s" was given.)*", i + 1, arg_type.to_string()), call->arguments[i]);
+						} else if (arg_type.builtin_type != Variant::INT && arg_type.builtin_type != Variant::FLOAT) {
+							all_is_constant = false;
+							push_error(vformat(R"*(Invalid argument for "range()" call. Argument %d should be int or float but "%s" was given.)*", i + 1, arg_type.to_string()), call->arguments[i]);
+						}
+					}
+
+					Variant reduced;
+
+					if (all_is_constant) {
+						switch (args.size()) {
+							case 1:
+								reduced = args[0];
+								break;
+							case 2:
+								reduced = Vector2i(args[0], args[1]);
+								break;
+							case 3:
+								reduced = Vector3i(args[0], args[1], args[2]);
+								break;
+						}
+						p_for->list->is_constant = true;
+						p_for->list->reduced_value = reduced;
+					}
+				}
+
+				GDScriptParser::DataType list_type;
+				list_type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+				list_type.kind = GDScriptParser::DataType::BUILTIN;
+				list_type.builtin_type = Variant::ARRAY;
+				p_for->list->set_datatype(list_type);
+			}
+		}
+	}
+
+	if (!list_resolved) {
+		resolve_node(p_for->list);
+	}
+
+	// TODO: If list is a typed array, the variable should be an element.
+	// Also applicable for constant range() (so variable is int or float).
+
+	resolve_suite(p_for->loop);
+	p_for->set_datatype(p_for->loop->get_datatype());
+#ifdef DEBUG_ENABLED
+	if (p_for->variable) {
+		is_shadowing(p_for->variable, R"("for" iterator variable)");
+	}
+#endif
+}
+
+void GDScriptAnalyzer::resolve_while(GDScriptParser::WhileNode *p_while) {
+	resolve_node(p_while->condition);
+
+	resolve_suite(p_while->loop);
+	p_while->set_datatype(p_while->loop->get_datatype());
+}
+
+void GDScriptAnalyzer::resolve_variable(GDScriptParser::VariableNode *p_variable) {
+	GDScriptParser::DataType type;
+	type.kind = GDScriptParser::DataType::VARIANT; // By default.
+
+	if (p_variable->initializer != nullptr) {
+		reduce_expression(p_variable->initializer);
+		type = p_variable->initializer->get_datatype();
+
+		if (p_variable->infer_datatype) {
+			type.type_source = GDScriptParser::DataType::ANNOTATED_INFERRED;
+
+			if (type.has_no_type()) {
+				push_error(vformat(R"(Could not infer the type of the variable "%s" because the initial value does not have a set type.)", p_variable->identifier->name), p_variable->initializer);
+			} else if (type.is_variant()) {
+				push_error(vformat(R"(Could not infer the type of the variable "%s" because the initial value is a variant. Use explicit "Variant" type if this is intended.)", p_variable->identifier->name), p_variable->initializer);
+			} else if (type.kind == GDScriptParser::DataType::BUILTIN && type.builtin_type == Variant::NIL) {
+				push_error(vformat(R"(Could not infer the type of the variable "%s" because the initial value is "null".)", p_variable->identifier->name), p_variable->initializer);
+			}
+		} else {
+			type.type_source = GDScriptParser::DataType::INFERRED;
+		}
+#ifdef DEBUG_ENABLED
+		if (p_variable->initializer->type == GDScriptParser::Node::CALL && type.kind == GDScriptParser::DataType::BUILTIN && type.builtin_type == Variant::NIL) {
+			parser->push_warning(p_variable->initializer, GDScriptWarning::VOID_ASSIGNMENT, static_cast<GDScriptParser::CallNode *>(p_variable->initializer)->function_name);
+		}
+#endif
+	}
+
+	if (p_variable->datatype_specifier != nullptr) {
+		type = resolve_datatype(p_variable->datatype_specifier);
+		type.is_meta_type = false;
+
+		if (p_variable->initializer != nullptr) {
+			if (!is_type_compatible(type, p_variable->initializer->get_datatype(), true)) {
+				// Try reverse test since it can be a masked subtype.
+				if (!is_type_compatible(p_variable->initializer->get_datatype(), type, true)) {
+					push_error(vformat(R"(Value of type "%s" cannot be assigned to a variable of type "%s".)", p_variable->initializer->get_datatype().to_string(), type.to_string()), p_variable->initializer);
+				} else {
+					// TODO: Add warning.
+					mark_node_unsafe(p_variable->initializer);
+				}
+#ifdef DEBUG_ENABLED
+			} else if (type.builtin_type == Variant::INT && p_variable->initializer->get_datatype().builtin_type == Variant::FLOAT) {
+				parser->push_warning(p_variable->initializer, GDScriptWarning::NARROWING_CONVERSION);
+#endif
+			}
+			if (p_variable->initializer->get_datatype().is_variant()) {
+				// TODO: Warn unsafe assign.
+				mark_node_unsafe(p_variable->initializer);
+			}
+		}
+	} else if (p_variable->infer_datatype) {
+		if (type.has_no_type()) {
+			push_error(vformat(R"(Cannot infer the type of variable "%s" because the initial value doesn't have a set type.)", p_variable->identifier->name), p_variable->identifier);
+		}
+		type.type_source = GDScriptParser::DataType::ANNOTATED_INFERRED;
+	}
+
+	type.is_constant = false;
+	p_variable->set_datatype(type);
+
+#ifdef DEBUG_ENABLED
+	if (p_variable->usages == 0 && !String(p_variable->identifier->name).begins_with("_")) {
+		parser->push_warning(p_variable, GDScriptWarning::UNUSED_VARIABLE, p_variable->identifier->name);
+	} else if (p_variable->assignments == 0) {
+		parser->push_warning(p_variable, GDScriptWarning::UNASSIGNED_VARIABLE, p_variable->identifier->name);
+	}
+
+	is_shadowing(p_variable->identifier, "variable");
+#endif
+}
+
+void GDScriptAnalyzer::resolve_constant(GDScriptParser::ConstantNode *p_constant) {
+	GDScriptParser::DataType type;
+
+	reduce_expression(p_constant->initializer);
+
+	if (!p_constant->initializer->is_constant) {
+		push_error(vformat(R"(Assigned value for constant "%s" isn't a constant expression.)", p_constant->identifier->name), p_constant->initializer);
+	}
+
+	type = p_constant->initializer->get_datatype();
+
+#ifdef DEBUG_ENABLED
+	if (p_constant->initializer->type == GDScriptParser::Node::CALL && type.kind == GDScriptParser::DataType::BUILTIN && type.builtin_type == Variant::NIL) {
+		parser->push_warning(p_constant->initializer, GDScriptWarning::VOID_ASSIGNMENT, static_cast<GDScriptParser::CallNode *>(p_constant->initializer)->function_name);
+	}
+#endif
+
+	if (p_constant->datatype_specifier != nullptr) {
+		GDScriptParser::DataType explicit_type = resolve_datatype(p_constant->datatype_specifier);
+		explicit_type.is_meta_type = false;
+		if (!is_type_compatible(explicit_type, type)) {
+			push_error(vformat(R"(Assigned value for constant "%s" has type %s which is not compatible with defined type %s.)", p_constant->identifier->name, type.to_string(), explicit_type.to_string()), p_constant->initializer);
+#ifdef DEBUG_ENABLED
+		} else if (explicit_type.builtin_type == Variant::INT && type.builtin_type == Variant::FLOAT) {
+			parser->push_warning(p_constant->initializer, GDScriptWarning::NARROWING_CONVERSION);
+#endif
+		}
+		type = explicit_type;
+	} else if (p_constant->infer_datatype) {
+		if (type.has_no_type()) {
+			push_error(vformat(R"(Cannot infer the type of constant "%s" because the initial value doesn't have a set type.)", p_constant->identifier->name), p_constant->identifier);
+		}
+		type.type_source = GDScriptParser::DataType::ANNOTATED_INFERRED;
+	}
+
+	type.is_constant = true;
+	p_constant->set_datatype(type);
+
+#ifdef DEBUG_ENABLED
+	if (p_constant->usages == 0) {
+		parser->push_warning(p_constant, GDScriptWarning::UNUSED_LOCAL_CONSTANT, p_constant->identifier->name);
+	}
+
+	is_shadowing(p_constant->identifier, "constant");
+#endif
+}
+
+void GDScriptAnalyzer::resolve_assert(GDScriptParser::AssertNode *p_assert) {
+	reduce_expression(p_assert->condition);
+	if (p_assert->message != nullptr) {
+		reduce_literal(p_assert->message);
+	}
+
+	p_assert->set_datatype(p_assert->condition->get_datatype());
+
+#ifdef DEBUG_ENABLED
+	if (p_assert->condition->is_constant) {
+		if (p_assert->condition->reduced_value.booleanize()) {
+			parser->push_warning(p_assert->condition, GDScriptWarning::ASSERT_ALWAYS_TRUE);
+		} else {
+			parser->push_warning(p_assert->condition, GDScriptWarning::ASSERT_ALWAYS_FALSE);
+		}
+	}
+#endif
+}
+
+void GDScriptAnalyzer::resolve_match(GDScriptParser::MatchNode *p_match) {
+	reduce_expression(p_match->test);
+
+	for (int i = 0; i < p_match->branches.size(); i++) {
+		resolve_match_branch(p_match->branches[i], p_match->test);
+
+		decide_suite_type(p_match, p_match->branches[i]);
+	}
+}
+
+void GDScriptAnalyzer::resolve_match_branch(GDScriptParser::MatchBranchNode *p_match_branch, GDScriptParser::ExpressionNode *p_match_test) {
+	for (int i = 0; i < p_match_branch->patterns.size(); i++) {
+		resolve_match_pattern(p_match_branch->patterns[i], p_match_test);
+	}
+
+	resolve_suite(p_match_branch->block);
+
+	decide_suite_type(p_match_branch, p_match_branch->block);
+}
+
+void GDScriptAnalyzer::resolve_match_pattern(GDScriptParser::PatternNode *p_match_pattern, GDScriptParser::ExpressionNode *p_match_test) {
+	if (p_match_pattern == nullptr) {
+		return;
+	}
+
+	GDScriptParser::DataType result;
+
+	switch (p_match_pattern->pattern_type) {
+		case GDScriptParser::PatternNode::PT_LITERAL:
+			if (p_match_pattern->literal) {
+				reduce_literal(p_match_pattern->literal);
+				result = p_match_pattern->literal->get_datatype();
+			}
+			break;
+		case GDScriptParser::PatternNode::PT_EXPRESSION:
+			if (p_match_pattern->expression) {
+				reduce_expression(p_match_pattern->expression);
+				if (!p_match_pattern->expression->is_constant) {
+					push_error(R"(Expression in match pattern must be a constant.)", p_match_pattern->expression);
+				}
+				result = p_match_pattern->expression->get_datatype();
+			}
+			break;
+		case GDScriptParser::PatternNode::PT_BIND:
+			if (p_match_test != nullptr) {
+				result = p_match_test->get_datatype();
+			} else {
+				result.kind = GDScriptParser::DataType::VARIANT;
+			}
+			p_match_pattern->bind->set_datatype(result);
+#ifdef DEBUG_ENABLED
+			is_shadowing(p_match_pattern->bind, "pattern bind");
+			if (p_match_pattern->bind->usages == 0) {
+				parser->push_warning(p_match_pattern->bind, GDScriptWarning::UNASSIGNED_VARIABLE, p_match_pattern->bind->name);
+			}
+#endif
+			break;
+		case GDScriptParser::PatternNode::PT_ARRAY:
+			for (int i = 0; i < p_match_pattern->array.size(); i++) {
+				resolve_match_pattern(p_match_pattern->array[i], nullptr);
+				decide_suite_type(p_match_pattern, p_match_pattern->array[i]);
+			}
+			result = p_match_pattern->get_datatype();
+			break;
+		case GDScriptParser::PatternNode::PT_DICTIONARY:
+			for (int i = 0; i < p_match_pattern->dictionary.size(); i++) {
+				if (p_match_pattern->dictionary[i].key) {
+					reduce_expression(p_match_pattern->dictionary[i].key);
+					if (!p_match_pattern->dictionary[i].key->is_constant) {
+						push_error(R"(Expression in dictionary pattern key must be a constant.)", p_match_pattern->expression);
+					}
+				}
+
+				if (p_match_pattern->dictionary[i].value_pattern) {
+					resolve_match_pattern(p_match_pattern->dictionary[i].value_pattern, nullptr);
+					decide_suite_type(p_match_pattern, p_match_pattern->dictionary[i].value_pattern);
+				}
+			}
+			result = p_match_pattern->get_datatype();
+			break;
+		case GDScriptParser::PatternNode::PT_WILDCARD:
+		case GDScriptParser::PatternNode::PT_REST:
+			result.kind = GDScriptParser::DataType::VARIANT;
+			break;
+	}
+
+	p_match_pattern->set_datatype(result);
+}
+
+void GDScriptAnalyzer::resolve_parameter(GDScriptParser::ParameterNode *p_parameter) {
+	GDScriptParser::DataType result;
+	result.kind = GDScriptParser::DataType::VARIANT;
+
+	if (p_parameter->default_value != nullptr) {
+		reduce_expression(p_parameter->default_value);
+		result = p_parameter->default_value->get_datatype();
+		if (p_parameter->infer_datatype) {
+			result.type_source = GDScriptParser::DataType::ANNOTATED_INFERRED;
+		} else {
+			result.type_source = GDScriptParser::DataType::INFERRED;
+		}
+		result.is_constant = false;
+	}
+
+	if (p_parameter->datatype_specifier != nullptr) {
+		resolve_datatype(p_parameter->datatype_specifier);
+		result = p_parameter->datatype_specifier->get_datatype();
+		result.is_meta_type = false;
+
+		if (p_parameter->default_value != nullptr) {
+			if (!is_type_compatible(result, p_parameter->default_value->get_datatype())) {
+				push_error(vformat(R"(Type of default value for parameter "%s" (%s) is not compatible with parameter type (%s).)", p_parameter->identifier->name, p_parameter->default_value->get_datatype().to_string(), p_parameter->datatype_specifier->get_datatype().to_string()), p_parameter->default_value);
+			} else if (p_parameter->default_value->get_datatype().is_variant()) {
+				mark_node_unsafe(p_parameter);
+			}
+		}
+	}
+
+	p_parameter->set_datatype(result);
+}
+
+void GDScriptAnalyzer::resolve_return(GDScriptParser::ReturnNode *p_return) {
+	GDScriptParser::DataType result;
+
+	if (p_return->return_value != nullptr) {
+		reduce_expression(p_return->return_value);
+		result = p_return->return_value->get_datatype();
+	} else {
+		// Return type is null by default.
+		result.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+		result.kind = GDScriptParser::DataType::BUILTIN;
+		result.builtin_type = Variant::NIL;
+		result.is_constant = true;
+	}
+
+	GDScriptParser::DataType function_type = parser->current_function->get_datatype();
+	function_type.is_meta_type = false;
+	if (function_type.is_hard_type()) {
+		if (!is_type_compatible(function_type, result)) {
+			// Try other way. Okay but not safe.
+			if (!is_type_compatible(result, function_type)) {
+				push_error(vformat(R"(Cannot return value of type "%s" because the function return type is "%s".)", result.to_string(), function_type.to_string()), p_return);
+			} else {
+				// TODO: Add warning.
+				mark_node_unsafe(p_return);
+			}
+#ifdef DEBUG_ENABLED
+		} else if (function_type.builtin_type == Variant::INT && result.builtin_type == Variant::FLOAT) {
+			parser->push_warning(p_return, GDScriptWarning::NARROWING_CONVERSION);
+		} else if (result.is_variant()) {
+			mark_node_unsafe(p_return);
+#endif
+		}
+	}
+
+	p_return->set_datatype(result);
+}
+
+void GDScriptAnalyzer::reduce_expression(GDScriptParser::ExpressionNode *p_expression) {
+	// This one makes some magic happen.
+
+	if (p_expression == nullptr) {
+		return;
+	}
+
+	if (p_expression->reduced) {
+		// Don't do this more than once.
+		return;
+	}
+
+	p_expression->reduced = true;
+
+	switch (p_expression->type) {
+		case GDScriptParser::Node::ARRAY:
+			reduce_array(static_cast<GDScriptParser::ArrayNode *>(p_expression));
+			break;
+		case GDScriptParser::Node::ASSIGNMENT:
+			reduce_assignment(static_cast<GDScriptParser::AssignmentNode *>(p_expression));
+			break;
+		case GDScriptParser::Node::AWAIT:
+			reduce_await(static_cast<GDScriptParser::AwaitNode *>(p_expression));
+			break;
+		case GDScriptParser::Node::BINARY_OPERATOR:
+			reduce_binary_op(static_cast<GDScriptParser::BinaryOpNode *>(p_expression));
+			break;
+		case GDScriptParser::Node::CALL:
+			reduce_call(static_cast<GDScriptParser::CallNode *>(p_expression));
+			break;
+		case GDScriptParser::Node::CAST:
+			reduce_cast(static_cast<GDScriptParser::CastNode *>(p_expression));
+			break;
+		case GDScriptParser::Node::DICTIONARY:
+			reduce_dictionary(static_cast<GDScriptParser::DictionaryNode *>(p_expression));
+			break;
+		case GDScriptParser::Node::GET_NODE:
+			reduce_get_node(static_cast<GDScriptParser::GetNodeNode *>(p_expression));
+			break;
+		case GDScriptParser::Node::IDENTIFIER:
+			reduce_identifier(static_cast<GDScriptParser::IdentifierNode *>(p_expression));
+			break;
+		case GDScriptParser::Node::LITERAL:
+			reduce_literal(static_cast<GDScriptParser::LiteralNode *>(p_expression));
+			break;
+		case GDScriptParser::Node::PRELOAD:
+			reduce_preload(static_cast<GDScriptParser::PreloadNode *>(p_expression));
+			break;
+		case GDScriptParser::Node::SELF:
+			reduce_self(static_cast<GDScriptParser::SelfNode *>(p_expression));
+			break;
+		case GDScriptParser::Node::SUBSCRIPT:
+			reduce_subscript(static_cast<GDScriptParser::SubscriptNode *>(p_expression));
+			break;
+		case GDScriptParser::Node::TERNARY_OPERATOR:
+			reduce_ternary_op(static_cast<GDScriptParser::TernaryOpNode *>(p_expression));
+			break;
+		case GDScriptParser::Node::UNARY_OPERATOR:
+			reduce_unary_op(static_cast<GDScriptParser::UnaryOpNode *>(p_expression));
+			break;
+		// Non-expressions. Here only to make sure new nodes aren't forgotten.
+		case GDScriptParser::Node::NONE:
+		case GDScriptParser::Node::ANNOTATION:
+		case GDScriptParser::Node::ASSERT:
+		case GDScriptParser::Node::BREAK:
+		case GDScriptParser::Node::BREAKPOINT:
+		case GDScriptParser::Node::CLASS:
+		case GDScriptParser::Node::CONSTANT:
+		case GDScriptParser::Node::CONTINUE:
+		case GDScriptParser::Node::ENUM:
+		case GDScriptParser::Node::FOR:
+		case GDScriptParser::Node::FUNCTION:
+		case GDScriptParser::Node::IF:
+		case GDScriptParser::Node::MATCH:
+		case GDScriptParser::Node::MATCH_BRANCH:
+		case GDScriptParser::Node::PARAMETER:
+		case GDScriptParser::Node::PASS:
+		case GDScriptParser::Node::PATTERN:
+		case GDScriptParser::Node::RETURN:
+		case GDScriptParser::Node::SIGNAL:
+		case GDScriptParser::Node::SUITE:
+		case GDScriptParser::Node::TYPE:
+		case GDScriptParser::Node::VARIABLE:
+		case GDScriptParser::Node::WHILE:
+			ERR_FAIL_MSG("Reaching unreachable case");
+	}
+}
+
+void GDScriptAnalyzer::reduce_array(GDScriptParser::ArrayNode *p_array) {
+	bool all_is_constant = true;
+
+	for (int i = 0; i < p_array->elements.size(); i++) {
+		GDScriptParser::ExpressionNode *element = p_array->elements[i];
+		reduce_expression(element);
+		all_is_constant = all_is_constant && element->is_constant;
+	}
+
+	if (all_is_constant) {
+		Array array;
+		array.resize(p_array->elements.size());
+		for (int i = 0; i < p_array->elements.size(); i++) {
+			array[i] = p_array->elements[i]->reduced_value;
+		}
+		p_array->is_constant = true;
+		p_array->reduced_value = array;
+	}
+
+	// It's array in any case.
+	GDScriptParser::DataType arr_type;
+	arr_type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+	arr_type.kind = GDScriptParser::DataType::BUILTIN;
+	arr_type.builtin_type = Variant::ARRAY;
+	arr_type.is_constant = true;
+
+	p_array->set_datatype(arr_type);
+}
+
+void GDScriptAnalyzer::reduce_assignment(GDScriptParser::AssignmentNode *p_assignment) {
+	reduce_expression(p_assignment->assignee);
+	reduce_expression(p_assignment->assigned_value);
+
+	if (p_assignment->assigned_value == nullptr || p_assignment->assignee == nullptr) {
+		return;
+	}
+
+	if (p_assignment->assignee->get_datatype().is_constant) {
+		push_error("Cannot assign a new value to a constant.", p_assignment->assignee);
+	}
+
+	if (!p_assignment->assignee->get_datatype().is_variant() && !p_assignment->assigned_value->get_datatype().is_variant()) {
+		bool compatible = true;
+		GDScriptParser::DataType op_type = p_assignment->assigned_value->get_datatype();
+		if (p_assignment->operation != GDScriptParser::AssignmentNode::OP_NONE) {
+			op_type = get_operation_type(p_assignment->variant_op, p_assignment->assignee->get_datatype(), p_assignment->assigned_value->get_datatype(), compatible, p_assignment->assigned_value);
+		}
+
+		if (compatible) {
+			compatible = is_type_compatible(p_assignment->assignee->get_datatype(), op_type, true);
+			if (!compatible) {
+				if (p_assignment->assignee->get_datatype().is_hard_type()) {
+					// Try reverse test since it can be a masked subtype.
+					if (!is_type_compatible(op_type, p_assignment->assignee->get_datatype(), true)) {
+						push_error(vformat(R"(Cannot assign a value of type "%s" to a target of type "%s".)", p_assignment->assigned_value->get_datatype().to_string(), p_assignment->assignee->get_datatype().to_string()), p_assignment->assigned_value);
+					} else {
+						// TODO: Add warning.
+						mark_node_unsafe(p_assignment);
+					}
+				} else {
+					// TODO: Warning in this case.
+					mark_node_unsafe(p_assignment);
+				}
+			}
+		} else {
+			push_error(vformat(R"(Invalid operands "%s" and "%s" for assignment operator.)", p_assignment->assignee->get_datatype().to_string(), p_assignment->assigned_value->get_datatype().to_string()), p_assignment);
+		}
+	}
+
+	if (p_assignment->assignee->get_datatype().has_no_type() || p_assignment->assigned_value->get_datatype().is_variant()) {
+		mark_node_unsafe(p_assignment);
+	}
+
+	if (p_assignment->assignee->type == GDScriptParser::Node::IDENTIFIER) {
+		// Change source type so it's not wrongly detected later.
+		GDScriptParser::IdentifierNode *identifier = static_cast<GDScriptParser::IdentifierNode *>(p_assignment->assignee);
+
+		switch (identifier->source) {
+			case GDScriptParser::IdentifierNode::MEMBER_VARIABLE: {
+				GDScriptParser::DataType id_type = identifier->variable_source->get_datatype();
+				if (!id_type.is_hard_type()) {
+					id_type.kind = GDScriptParser::DataType::VARIANT;
+					id_type.type_source = GDScriptParser::DataType::UNDETECTED;
+					identifier->variable_source->set_datatype(id_type);
+				}
+			} break;
+			case GDScriptParser::IdentifierNode::LOCAL_VARIABLE: {
+				GDScriptParser::DataType id_type = identifier->variable_source->get_datatype();
+				if (!id_type.is_hard_type()) {
+					id_type = p_assignment->assigned_value->get_datatype();
+					id_type.type_source = GDScriptParser::DataType::INFERRED;
+					id_type.is_constant = false;
+					identifier->variable_source->set_datatype(id_type);
+				}
+			} break;
+			case GDScriptParser::IdentifierNode::LOCAL_ITERATOR: {
+				GDScriptParser::DataType id_type = identifier->bind_source->get_datatype();
+				if (!id_type.is_hard_type()) {
+					id_type = p_assignment->assigned_value->get_datatype();
+					id_type.type_source = GDScriptParser::DataType::INFERRED;
+					id_type.is_constant = false;
+					identifier->variable_source->set_datatype(id_type);
+				}
+			} break;
+			default:
+				// Nothing to do.
+				break;
+		}
+	}
+
+	GDScriptParser::DataType assignee_type = p_assignment->assignee->get_datatype();
+	GDScriptParser::DataType assigned_type = p_assignment->assigned_value->get_datatype();
+#ifdef DEBUG_ENABLED
+	if (p_assignment->assigned_value->type == GDScriptParser::Node::CALL && assigned_type.kind == GDScriptParser::DataType::BUILTIN && assigned_type.builtin_type == Variant::NIL) {
+		parser->push_warning(p_assignment->assigned_value, GDScriptWarning::VOID_ASSIGNMENT, static_cast<GDScriptParser::CallNode *>(p_assignment->assigned_value)->function_name);
+	} else if (assignee_type.is_hard_type() && assignee_type.builtin_type == Variant::INT && assigned_type.builtin_type == Variant::FLOAT) {
+		parser->push_warning(p_assignment->assigned_value, GDScriptWarning::NARROWING_CONVERSION);
+	}
+#endif
+}
+
+void GDScriptAnalyzer::reduce_await(GDScriptParser::AwaitNode *p_await) {
+	if (p_await->to_await == nullptr) {
+		GDScriptParser::DataType await_type;
+		await_type.kind = GDScriptParser::DataType::VARIANT;
+		p_await->set_datatype(await_type);
+		return;
+	}
+	if (p_await->to_await->type == GDScriptParser::Node::CALL) {
+		reduce_call(static_cast<GDScriptParser::CallNode *>(p_await->to_await), true);
+	} else {
+		reduce_expression(p_await->to_await);
+	}
+
+	p_await->is_constant = p_await->to_await->is_constant;
+	p_await->reduced_value = p_await->to_await->reduced_value;
+
+	GDScriptParser::DataType awaiting_type = p_await->to_await->get_datatype();
+
+	p_await->set_datatype(awaiting_type);
+
+#ifdef DEBUG_ENABLED
+	if (!awaiting_type.is_coroutine && awaiting_type.builtin_type != Variant::SIGNAL) {
+		parser->push_warning(p_await, GDScriptWarning::REDUNDANT_AWAIT);
+	}
+#endif
+}
+
+void GDScriptAnalyzer::reduce_binary_op(GDScriptParser::BinaryOpNode *p_binary_op) {
+	reduce_expression(p_binary_op->left_operand);
+
+	if (p_binary_op->operation == GDScriptParser::BinaryOpNode::OP_TYPE_TEST && p_binary_op->right_operand && p_binary_op->right_operand->type == GDScriptParser::Node::IDENTIFIER) {
+		reduce_identifier(static_cast<GDScriptParser::IdentifierNode *>(p_binary_op->right_operand), true);
+	} else {
+		reduce_expression(p_binary_op->right_operand);
+	}
+	// TODO: Right operand must be a valid type with the `is` operator. Need to check here.
+
+	GDScriptParser::DataType left_type;
+	if (p_binary_op->left_operand) {
+		left_type = p_binary_op->left_operand->get_datatype();
+	}
+	GDScriptParser::DataType right_type;
+	if (p_binary_op->right_operand) {
+		right_type = p_binary_op->right_operand->get_datatype();
+	}
+
+	if (!left_type.is_set() || !right_type.is_set()) {
+		return;
+	}
+
+#ifdef DEBUG_ENABLED
+	if (p_binary_op->variant_op == Variant::OP_DIVIDE && left_type.builtin_type == Variant::INT && right_type.builtin_type == Variant::INT) {
+		parser->push_warning(p_binary_op, GDScriptWarning::INTEGER_DIVISION);
+	}
+#endif
+
+	if (p_binary_op->left_operand->is_constant && p_binary_op->right_operand->is_constant) {
+		p_binary_op->is_constant = true;
+		if (p_binary_op->variant_op < Variant::OP_MAX) {
+			bool valid = false;
+			Variant::evaluate(p_binary_op->variant_op, p_binary_op->left_operand->reduced_value, p_binary_op->right_operand->reduced_value, p_binary_op->reduced_value, valid);
+			if (!valid) {
+				if (p_binary_op->reduced_value.get_type() == Variant::STRING) {
+					push_error(vformat(R"(%s in operator %s.)", p_binary_op->reduced_value, Variant::get_operator_name(p_binary_op->variant_op)), p_binary_op);
+				} else {
+					push_error(vformat(R"(Invalid operands to operator %s, %s and %s.".)",
+									   Variant::get_operator_name(p_binary_op->variant_op),
+									   Variant::get_type_name(p_binary_op->left_operand->reduced_value.get_type()),
+									   Variant::get_type_name(p_binary_op->right_operand->reduced_value.get_type())),
+							p_binary_op);
+				}
+			}
+		} else {
+			if (p_binary_op->operation == GDScriptParser::BinaryOpNode::OP_TYPE_TEST) {
+				GDScriptParser::DataType test_type = right_type;
+				test_type.is_meta_type = false;
+
+				if (!is_type_compatible(test_type, p_binary_op->left_operand->get_datatype(), false)) {
+					push_error(vformat(R"(Expression is of type "%s" so it can't be of type "%s".)"), p_binary_op->left_operand);
+					p_binary_op->reduced_value = false;
+				} else {
+					p_binary_op->reduced_value = true;
+				}
+			} else {
+				ERR_PRINT("Parser bug: unknown binary operation.");
+			}
+		}
+		p_binary_op->set_datatype(type_from_variant(p_binary_op->reduced_value, p_binary_op));
+
+		return;
+	}
+
+	GDScriptParser::DataType result;
+
+	if (left_type.is_variant() || right_type.is_variant()) {
+		// Cannot infer type because one operand can be anything.
+		result.kind = GDScriptParser::DataType::VARIANT;
+		mark_node_unsafe(p_binary_op);
+	} else {
+		if (p_binary_op->variant_op < Variant::OP_MAX) {
+			bool valid = false;
+			result = get_operation_type(p_binary_op->variant_op, p_binary_op->left_operand->get_datatype(), right_type, valid, p_binary_op);
+
+			if (!valid) {
+				push_error(vformat(R"(Invalid operands "%s" and "%s" for "%s" operator.)", p_binary_op->left_operand->get_datatype().to_string(), right_type.to_string(), Variant::get_operator_name(p_binary_op->variant_op)), p_binary_op);
+			}
+		} else {
+			if (p_binary_op->operation == GDScriptParser::BinaryOpNode::OP_TYPE_TEST) {
+				GDScriptParser::DataType test_type = right_type;
+				test_type.is_meta_type = false;
+
+				if (!is_type_compatible(test_type, p_binary_op->left_operand->get_datatype(), false)) {
+					// Test reverse as well to consider for subtypes.
+					if (!is_type_compatible(p_binary_op->left_operand->get_datatype(), test_type, false)) {
+						if (p_binary_op->left_operand->get_datatype().is_hard_type()) {
+							push_error(vformat(R"(Expression is of type "%s" so it can't be of type "%s".)", p_binary_op->left_operand->get_datatype().to_string(), test_type.to_string()), p_binary_op->left_operand);
+						} else {
+							// TODO: Warning.
+							mark_node_unsafe(p_binary_op);
+						}
+					}
+				}
+
+				// "is" operator is always a boolean anyway.
+				result.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+				result.kind = GDScriptParser::DataType::BUILTIN;
+				result.builtin_type = Variant::BOOL;
+			} else {
+				ERR_PRINT("Parser bug: unknown binary operation.");
+			}
+		}
+	}
+
+	p_binary_op->set_datatype(result);
+}
+
+void GDScriptAnalyzer::reduce_call(GDScriptParser::CallNode *p_call, bool is_await) {
+	bool all_is_constant = true;
+	for (int i = 0; i < p_call->arguments.size(); i++) {
+		reduce_expression(p_call->arguments[i]);
+		all_is_constant = all_is_constant && p_call->arguments[i]->is_constant;
+	}
+
+	GDScriptParser::Node::Type callee_type = p_call->get_callee_type();
+	GDScriptParser::DataType call_type;
+
+	if (!p_call->is_super && callee_type == GDScriptParser::Node::IDENTIFIER) {
+		// Call to name directly.
+		StringName function_name = p_call->function_name;
+		Variant::Type builtin_type = GDScriptParser::get_builtin_type(function_name);
+		GDScriptFunctions::Function builtin_function = GDScriptParser::get_builtin_function(function_name);
+
+		if (builtin_type < Variant::VARIANT_MAX) {
+			// Is a builtin constructor.
+			call_type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+			call_type.kind = GDScriptParser::DataType::BUILTIN;
+			call_type.builtin_type = builtin_type;
+
+			if (builtin_type == Variant::OBJECT) {
+				call_type.kind = GDScriptParser::DataType::NATIVE;
+				call_type.native_type = function_name; // "Object".
+			}
+
+			if (all_is_constant) {
+				// Construct here.
+				Vector<const Variant *> args;
+				for (int i = 0; i < p_call->arguments.size(); i++) {
+					args.push_back(&(p_call->arguments[i]->reduced_value));
+				}
+
+				Callable::CallError err;
+				Variant value = Variant::construct(builtin_type, (const Variant **)args.ptr(), args.size(), err);
+
+				switch (err.error) {
+					case Callable::CallError::CALL_ERROR_INVALID_ARGUMENT:
+						push_error(vformat(R"(Invalid argument for %s constructor: argument %d should be %s but is %s.)", Variant::get_type_name(builtin_type), err.argument + 1,
+										   Variant::get_type_name(Variant::Type(err.expected)), p_call->arguments[err.argument]->get_datatype().to_string()),
+								p_call->arguments[err.argument]);
+						break;
+					case Callable::CallError::CALL_ERROR_INVALID_METHOD: {
+						String signature = Variant::get_type_name(builtin_type) + "(";
+						for (int i = 0; i < p_call->arguments.size(); i++) {
+							if (i > 0) {
+								signature += ", ";
+							}
+							signature += p_call->arguments[i]->get_datatype().to_string();
+						}
+						signature += ")";
+						push_error(vformat(R"(No constructor of "%s" matches the signature "%s".)", Variant::get_type_name(builtin_type), signature), p_call->callee);
+					} break;
+					case Callable::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS:
+						push_error(vformat(R"(Too many arguments for %s constructor. Received %d but expected %d.)", Variant::get_type_name(builtin_type), p_call->arguments.size(), err.expected), p_call);
+						break;
+					case Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS:
+						push_error(vformat(R"(Too few arguments for %s constructor. Received %d but expected %d.)", Variant::get_type_name(builtin_type), p_call->arguments.size(), err.expected), p_call);
+						break;
+					case Callable::CallError::CALL_ERROR_INSTANCE_IS_NULL:
+						break; // Can't happen in a builtin constructor.
+					case Callable::CallError::CALL_OK:
+						p_call->is_constant = true;
+						p_call->reduced_value = value;
+						break;
+				}
+			} else {
+				// TODO: Check constructors without constants.
+
+				// If there's one argument, try to use copy constructor (those aren't explicitly defined).
+				if (p_call->arguments.size() == 1) {
+					GDScriptParser::DataType arg_type = p_call->arguments[0]->get_datatype();
+					if (arg_type.is_variant()) {
+						mark_node_unsafe(p_call->arguments[0]);
+					} else {
+						if (arg_type.kind == GDScriptParser::DataType::BUILTIN && arg_type.builtin_type == builtin_type) {
+							// Okay.
+							p_call->set_datatype(call_type);
+							return;
+						}
+					}
+				}
+				List<MethodInfo> constructors;
+				Variant::get_constructor_list(builtin_type, &constructors);
+				bool match = false;
+
+				for (const List<MethodInfo>::Element *E = constructors.front(); E != nullptr; E = E->next()) {
+					const MethodInfo &info = E->get();
+
+					if (p_call->arguments.size() < info.arguments.size() - info.default_arguments.size()) {
+						continue;
+					}
+					if (p_call->arguments.size() > info.arguments.size()) {
+						continue;
+					}
+
+					bool types_match = true;
+
+					for (int i = 0; i < p_call->arguments.size(); i++) {
+						GDScriptParser::DataType par_type = type_from_property(info.arguments[i]);
+
+						if (!is_type_compatible(par_type, p_call->arguments[i]->get_datatype(), true)) {
+							types_match = false;
+							break;
+#ifdef DEBUG_ENABLED
+						} else {
+							if (par_type.builtin_type == Variant::INT && p_call->arguments[i]->get_datatype().builtin_type == Variant::FLOAT) {
+								parser->push_warning(p_call, GDScriptWarning::NARROWING_CONVERSION, p_call->function_name);
+							}
+#endif
+						}
+					}
+
+					if (types_match) {
+						match = true;
+						call_type = type_from_property(info.return_val);
+						break;
+					}
+				}
+
+				if (!match) {
+					String signature = Variant::get_type_name(builtin_type) + "(";
+					for (int i = 0; i < p_call->arguments.size(); i++) {
+						if (i > 0) {
+							signature += ", ";
+						}
+						signature += p_call->arguments[i]->get_datatype().to_string();
+					}
+					signature += ")";
+					push_error(vformat(R"(No constructor of "%s" matches the signature "%s".)", Variant::get_type_name(builtin_type), signature), p_call);
+				}
+			}
+			p_call->set_datatype(call_type);
+			return;
+		} else if (builtin_function < GDScriptFunctions::FUNC_MAX) {
+			MethodInfo function_info = GDScriptFunctions::get_info(builtin_function);
+
+			if (all_is_constant && GDScriptFunctions::is_deterministic(builtin_function)) {
+				// Can call on compilation.
+				Vector<const Variant *> args;
+				for (int i = 0; i < p_call->arguments.size(); i++) {
+					args.push_back(&(p_call->arguments[i]->reduced_value));
+				}
+
+				Variant value;
+				Callable::CallError err;
+				GDScriptFunctions::call(builtin_function, (const Variant **)args.ptr(), args.size(), value, err);
+
+				switch (err.error) {
+					case Callable::CallError::CALL_ERROR_INVALID_ARGUMENT: {
+						PropertyInfo wrong_arg = function_info.arguments[err.argument];
+						push_error(vformat(R"*(Invalid argument for "%s()" function: argument %d should be %s but is %s.)*", GDScriptFunctions::get_func_name(builtin_function), err.argument + 1,
+										   type_from_property(wrong_arg).to_string(), p_call->arguments[err.argument]->get_datatype().to_string()),
+								p_call->arguments[err.argument]);
+					} break;
+					case Callable::CallError::CALL_ERROR_INVALID_METHOD:
+						push_error(vformat(R"(Invalid call for function "%s".)", GDScriptFunctions::get_func_name(builtin_function)), p_call);
+						break;
+					case Callable::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS:
+						push_error(vformat(R"*(Too many arguments for "%s()" call. Expected at most %d but received %d.)*", GDScriptFunctions::get_func_name(builtin_function), err.expected, p_call->arguments.size()), p_call);
+						break;
+					case Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS:
+						push_error(vformat(R"*(Too few arguments for "%s()" call. Expected at least %d but received %d.)*", GDScriptFunctions::get_func_name(builtin_function), err.expected, p_call->arguments.size()), p_call);
+						break;
+					case Callable::CallError::CALL_ERROR_INSTANCE_IS_NULL:
+						break; // Can't happen in a builtin constructor.
+					case Callable::CallError::CALL_OK:
+						p_call->is_constant = true;
+						p_call->reduced_value = value;
+						break;
+				}
+			} else {
+				validate_call_arg(function_info, p_call);
+			}
+			p_call->set_datatype(type_from_property(function_info.return_val));
+			return;
+		}
+	}
+
+	GDScriptParser::DataType base_type;
+	call_type.kind = GDScriptParser::DataType::VARIANT;
+	bool is_self = false;
+
+	if (p_call->is_super) {
+		base_type = parser->current_class->base_type;
+		is_self = true;
+	} else if (callee_type == GDScriptParser::Node::IDENTIFIER) {
+		base_type = parser->current_class->get_datatype();
+		is_self = true;
+	} else if (callee_type == GDScriptParser::Node::SUBSCRIPT) {
+		GDScriptParser::SubscriptNode *subscript = static_cast<GDScriptParser::SubscriptNode *>(p_call->callee);
+		if (!subscript->is_attribute) {
+			// Invalid call. Error already sent in parser.
+			// TODO: Could check if Callable here.
+			p_call->set_datatype(call_type);
+			mark_node_unsafe(p_call);
+			return;
+		}
+		reduce_expression(subscript->base);
+
+		base_type = subscript->base->get_datatype();
+	} else {
+		// Invalid call. Error already sent in parser.
+		// TODO: Could check if Callable here too.
+		p_call->set_datatype(call_type);
+		mark_node_unsafe(p_call);
+		return;
+	}
+
+	bool is_static = false;
+	bool is_vararg = false;
+	int default_arg_count = 0;
+	GDScriptParser::DataType return_type;
+	List<GDScriptParser::DataType> par_types;
+
+	if (get_function_signature(p_call, base_type, p_call->function_name, return_type, par_types, default_arg_count, is_static, is_vararg)) {
+		validate_call_arg(par_types, default_arg_count, is_vararg, p_call);
+
+		if (is_self && parser->current_function != nullptr && parser->current_function->is_static && !is_static) {
+			push_error(vformat(R"*(Cannot call non-static function "%s()" from static function "%s()".)*", p_call->function_name, parser->current_function->identifier->name), p_call->callee);
+		}
+
+		call_type = return_type;
+	} else {
+		// Check if the name exists as something else.
+		bool found = false;
+		if (!p_call->is_super && callee_type != GDScriptParser::Node::NONE) {
+			GDScriptParser::IdentifierNode *callee_id;
+			if (callee_type == GDScriptParser::Node::IDENTIFIER) {
+				callee_id = static_cast<GDScriptParser::IdentifierNode *>(p_call->callee);
+			} else {
+				// Can only be attribute.
+				callee_id = static_cast<GDScriptParser::SubscriptNode *>(p_call->callee)->attribute;
+			}
+			if (callee_id) {
+				reduce_identifier_from_base(callee_id, &base_type);
+				GDScriptParser::DataType callee_datatype = callee_id->get_datatype();
+				if (callee_datatype.is_set() && !callee_datatype.is_variant()) {
+					found = true;
+					if (callee_datatype.builtin_type == Variant::CALLABLE) {
+						push_error(vformat(R"*(Name "%s" is a Callable. You can call it with "%s.call()" instead.)*", p_call->function_name, p_call->function_name), p_call->callee);
+					} else {
+						push_error(vformat(R"*(Name "%s" called as a function but is a "%s".)*", p_call->function_name, callee_datatype.to_string()), p_call->callee);
+					}
+#ifdef DEBUG_ENABLED
+				} else if (!is_self) {
+					parser->push_warning(p_call, GDScriptWarning::UNSAFE_METHOD_ACCESS, p_call->function_name, base_type.to_string());
+					mark_node_unsafe(p_call);
+#endif
+				}
+			}
+		}
+		if (!found && is_self) {
+			String base_name = is_self && !p_call->is_super ? "self" : base_type.to_string();
+			push_error(vformat(R"*(Function "%s()" not found in base %s.)*", p_call->function_name, base_name), p_call->is_super ? p_call : p_call->callee);
+		}
+	}
+
+	if (call_type.is_coroutine && !is_await) {
+		push_error(vformat(R"*(Function "%s()" is a coroutine, so it must be called with "await".)*", p_call->function_name), p_call->callee);
+	}
+
+	p_call->set_datatype(call_type);
+}
+
+void GDScriptAnalyzer::reduce_cast(GDScriptParser::CastNode *p_cast) {
+	reduce_expression(p_cast->operand);
+
+	GDScriptParser::DataType cast_type = resolve_datatype(p_cast->cast_type);
+
+	if (!cast_type.is_set()) {
+		return;
+	}
+
+	cast_type.is_meta_type = false; // The casted value won't be a type name.
+	p_cast->set_datatype(cast_type);
+
+	if (!cast_type.is_variant()) {
+		GDScriptParser::DataType op_type = p_cast->operand->get_datatype();
+		if (!op_type.is_variant()) {
+			bool valid = false;
+			if (op_type.kind == GDScriptParser::DataType::BUILTIN && cast_type.kind == GDScriptParser::DataType::BUILTIN) {
+				valid = Variant::can_convert(op_type.builtin_type, cast_type.builtin_type);
+			} else if (op_type.kind != GDScriptParser::DataType::BUILTIN && cast_type.kind != GDScriptParser::DataType::BUILTIN) {
+				valid = is_type_compatible(cast_type, op_type) || is_type_compatible(op_type, cast_type);
+			}
+
+			if (!valid) {
+				push_error(vformat(R"(Invalid cast. Cannot convert from "%s" to "%s".)", op_type.to_string(), cast_type.to_string()), p_cast->cast_type);
+			}
+		}
+	} else {
+		mark_node_unsafe(p_cast);
+	}
+#ifdef DEBUG_ENABLED
+	if (p_cast->operand->get_datatype().is_variant()) {
+		parser->push_warning(p_cast, GDScriptWarning::UNSAFE_CAST, cast_type.to_string());
+		mark_node_unsafe(p_cast);
+	}
+#endif
+
+	// TODO: Perform cast on constants.
+}
+
+void GDScriptAnalyzer::reduce_dictionary(GDScriptParser::DictionaryNode *p_dictionary) {
+	bool all_is_constant = true;
+
+	HashMap<Variant, GDScriptParser::ExpressionNode *, VariantHasher, VariantComparator> elements;
+
+	for (int i = 0; i < p_dictionary->elements.size(); i++) {
+		const GDScriptParser::DictionaryNode::Pair &element = p_dictionary->elements[i];
+		if (p_dictionary->style == GDScriptParser::DictionaryNode::PYTHON_DICT) {
+			reduce_expression(element.key);
+		}
+		reduce_expression(element.value);
+		all_is_constant = all_is_constant && element.key->is_constant && element.value->is_constant;
+
+		if (element.key->is_constant) {
+			if (elements.has(element.key->reduced_value)) {
+				push_error(vformat(R"(Key "%s" was already used in this dictionary (at line %d).)", element.key->reduced_value, elements[element.key->reduced_value]->start_line), element.key);
+			} else {
+				elements[element.key->reduced_value] = element.value;
+			}
+		}
+	}
+
+	if (all_is_constant) {
+		Dictionary dict;
+		for (int i = 0; i < p_dictionary->elements.size(); i++) {
+			const GDScriptParser::DictionaryNode::Pair &element = p_dictionary->elements[i];
+			dict[element.key->reduced_value] = element.value->reduced_value;
+		}
+		p_dictionary->is_constant = true;
+		p_dictionary->reduced_value = dict;
+	}
+
+	// It's dictionary in any case.
+	GDScriptParser::DataType dict_type;
+	dict_type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+	dict_type.kind = GDScriptParser::DataType::BUILTIN;
+	dict_type.builtin_type = Variant::DICTIONARY;
+	dict_type.is_constant = true;
+
+	p_dictionary->set_datatype(dict_type);
+}
+
+void GDScriptAnalyzer::reduce_get_node(GDScriptParser::GetNodeNode *p_get_node) {
+	GDScriptParser::DataType result;
+	result.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+	result.kind = GDScriptParser::DataType::NATIVE;
+	result.native_type = "Node";
+	result.builtin_type = Variant::OBJECT;
+
+	if (!ClassDB::is_parent_class(get_real_class_name(parser->current_class->base_type.native_type), result.native_type)) {
+		push_error(R"*(Cannot use shorthand "get_node()" notation ("$") on a class that isn't a node.)*", p_get_node);
+	}
+
+	p_get_node->set_datatype(result);
+}
+
+GDScriptParser::DataType GDScriptAnalyzer::make_global_class_meta_type(const StringName &p_class_name) {
+	Ref<GDScriptParserRef> ref = get_parser_for(ScriptServer::get_global_class_path(p_class_name));
+	ref->raise_status(GDScriptParserRef::INTERFACE_SOLVED);
+
+	GDScriptParser::DataType type;
+	type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+	type.kind = GDScriptParser::DataType::CLASS;
+	type.builtin_type = Variant::OBJECT;
+	type.native_type = ScriptServer::get_global_class_native_base(p_class_name);
+	type.class_type = ref->get_parser()->head;
+	type.script_path = ref->get_parser()->script_path;
+	type.is_constant = true;
+	type.is_meta_type = true;
+	return type;
+}
+
+void GDScriptAnalyzer::reduce_identifier_from_base(GDScriptParser::IdentifierNode *p_identifier, GDScriptParser::DataType *p_base) {
+	GDScriptParser::DataType base;
+	if (p_base == nullptr) {
+		base = type_from_metatype(parser->current_class->get_datatype());
+	} else {
+		base = *p_base;
+	}
+
+	const StringName &name = p_identifier->name;
+
+	if (base.kind == GDScriptParser::DataType::BUILTIN) {
+		if (base.is_meta_type) {
+			bool valid = true;
+			Variant result = Variant::get_constant_value(base.builtin_type, name, &valid);
+			if (valid) {
+				p_identifier->is_constant = true;
+				p_identifier->reduced_value = result;
+				p_identifier->set_datatype(type_from_variant(result, p_identifier));
+			} else {
+				push_error(vformat(R"(Cannot find constant "%s" on type "%s".)", name, base.to_string()), p_identifier);
+			}
+		} else {
+			switch (base.builtin_type) {
+				case Variant::NIL: {
+					push_error(vformat(R"(Invalid get index "%s" on base Nil)", name), p_identifier);
+					return;
+				}
+				case Variant::DICTIONARY: {
+					GDScriptParser::DataType dummy;
+					dummy.kind = GDScriptParser::DataType::VARIANT;
+					p_identifier->set_datatype(dummy);
+					return;
+				}
+				default: {
+					Callable::CallError temp;
+					Variant dummy = Variant::construct(base.builtin_type, nullptr, 0, temp);
+					List<PropertyInfo> properties;
+					dummy.get_property_list(&properties);
+					for (const List<PropertyInfo>::Element *E = properties.front(); E != nullptr; E = E->next()) {
+						const PropertyInfo &prop = E->get();
+						if (prop.name == name) {
+							p_identifier->set_datatype(type_from_property(prop));
+							return;
+						}
+					}
+					push_error(vformat(R"(Cannot find property "%s" on base "%s".)", name, base.to_string()), p_identifier);
+				}
+			}
+		}
+		return;
+	}
+
+	if (base.kind == GDScriptParser::DataType::ENUM) {
+		if (base.is_meta_type) {
+			if (base.enum_values.has(name)) {
+				p_identifier->is_constant = true;
+				p_identifier->reduced_value = base.enum_values[name];
+
+				GDScriptParser::DataType result;
+				result.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+				result.kind = GDScriptParser::DataType::ENUM_VALUE;
+				result.native_type = base.native_type;
+				result.enum_type = name;
+				p_identifier->set_datatype(result);
+			} else {
+				push_error(vformat(R"(Cannot find value "%s" in "%s".)", name, base.to_string()), p_identifier);
+			}
+		} else {
+			push_error(R"(Cannot get property from enum value.)", p_identifier);
+		}
+		return;
+	}
+
+	GDScriptParser::ClassNode *base_class = base.class_type;
+
+	// TODO: Switch current class/function/suite here to avoid misrepresenting identifiers (in recursive reduce calls).
+	while (base_class != nullptr) {
+		if (base_class->identifier && base_class->identifier->name == name) {
+			p_identifier->set_datatype(base_class->get_datatype());
+			return;
+		}
+		if (base_class->has_member(name)) {
+			const GDScriptParser::ClassNode::Member &member = base_class->get_member(name);
+			p_identifier->set_datatype(member.get_datatype());
+			switch (member.type) {
+				case GDScriptParser::ClassNode::Member::CONSTANT:
+					// For out-of-order resolution:
+					reduce_expression(member.constant->initializer);
+					p_identifier->is_constant = true;
+					p_identifier->reduced_value = member.constant->initializer->reduced_value;
+					p_identifier->set_datatype(member.constant->initializer->get_datatype());
+					p_identifier->source = GDScriptParser::IdentifierNode::MEMBER_CONSTANT;
+					p_identifier->constant_source = member.constant;
+					break;
+				case GDScriptParser::ClassNode::Member::ENUM_VALUE:
+					p_identifier->is_constant = true;
+					p_identifier->reduced_value = member.enum_value.value;
+					break;
+				case GDScriptParser::ClassNode::Member::VARIABLE:
+					p_identifier->source = GDScriptParser::IdentifierNode::MEMBER_VARIABLE;
+					p_identifier->variable_source = member.variable;
+					break;
+				case GDScriptParser::ClassNode::Member::FUNCTION:
+					resolve_function_signature(member.function);
+					p_identifier->set_datatype(make_callable_type(member.function->info));
+					break;
+				default:
+					break; // Type already set.
+			}
+			return;
+		}
+		// Check outer constants.
+		// TODO: Allow outer static functions.
+		GDScriptParser::ClassNode *outer = base_class->outer;
+		while (outer != nullptr) {
+			if (outer->has_member(name)) {
+				const GDScriptParser::ClassNode::Member &member = outer->get_member(name);
+				if (member.type == GDScriptParser::ClassNode::Member::CONSTANT) {
+					// TODO: Make sure loops won't cause problem. And make special error message for those.
+					// For out-of-order resolution:
+					reduce_expression(member.constant->initializer);
+					p_identifier->set_datatype(member.get_datatype());
+					p_identifier->is_constant = true;
+					p_identifier->reduced_value = member.constant->initializer->reduced_value;
+					return;
+				}
+			}
+			outer = outer->outer;
+		}
+
+		base_class = base_class->base_type.class_type;
+	}
+
+	// Check native members.
+	const StringName &native = get_real_class_name(base.native_type);
+
+	if (class_exists(native)) {
+		PropertyInfo prop_info;
+		MethodInfo method_info;
+		if (ClassDB::get_property_info(native, name, &prop_info)) {
+			p_identifier->set_datatype(type_from_property(prop_info));
+			return;
+		}
+		if (ClassDB::get_method_info(native, name, &method_info)) {
+			// Method is callable.
+			p_identifier->set_datatype(make_callable_type(method_info));
+			return;
+		}
+		if (ClassDB::get_signal(native, name, &method_info)) {
+			// Signal is a type too.
+			p_identifier->set_datatype(make_signal_type(method_info));
+			return;
+		}
+		if (ClassDB::has_enum(native, name)) {
+			p_identifier->set_datatype(make_native_enum_type(native, name));
+			return;
+		}
+		bool valid = false;
+		int int_constant = ClassDB::get_integer_constant(native, name, &valid);
+		if (valid) {
+			p_identifier->is_constant = true;
+			p_identifier->reduced_value = int_constant;
+			p_identifier->set_datatype(type_from_variant(int_constant, p_identifier));
+			return;
+		}
+	}
+}
+
+void GDScriptAnalyzer::reduce_identifier(GDScriptParser::IdentifierNode *p_identifier, bool can_be_builtin) {
+	// TODO: This is opportunity to further infer types.
+
+	// Check if we are inside and enum. This allows enum values to access other elements of the same enum.
+	if (current_enum) {
+		for (int i = 0; i < current_enum->values.size(); i++) {
+			const GDScriptParser::EnumNode::Value &element = current_enum->values[i];
+			if (element.identifier->name == p_identifier->name) {
+				GDScriptParser::DataType type;
+				type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+				type.kind = element.parent_enum->identifier ? GDScriptParser::DataType::ENUM_VALUE : GDScriptParser::DataType::BUILTIN;
+				type.builtin_type = Variant::INT;
+				type.is_constant = true;
+				if (element.parent_enum->identifier) {
+					type.enum_type = element.parent_enum->identifier->name;
+				}
+				p_identifier->set_datatype(type);
+
+				if (element.resolved) {
+					p_identifier->is_constant = true;
+					p_identifier->reduced_value = element.value;
+				} else {
+					push_error(R"(Cannot use another enum element before it was declared.)", p_identifier);
+				}
+				return; // Found anyway.
+			}
+		}
+	}
+
+	// Check if identifier is local.
+	// If that's the case, the declaration already was solved before.
+	switch (p_identifier->source) {
+		case GDScriptParser::IdentifierNode::FUNCTION_PARAMETER:
+			p_identifier->set_datatype(p_identifier->parameter_source->get_datatype());
+			return;
+		case GDScriptParser::IdentifierNode::LOCAL_CONSTANT:
+		case GDScriptParser::IdentifierNode::MEMBER_CONSTANT:
+			p_identifier->set_datatype(p_identifier->constant_source->get_datatype());
+			p_identifier->is_constant = true;
+			// TODO: Constant should have a value on the node itself.
+			p_identifier->reduced_value = p_identifier->constant_source->initializer->reduced_value;
+			return;
+		case GDScriptParser::IdentifierNode::MEMBER_VARIABLE:
+			p_identifier->variable_source->usages++;
+			[[fallthrough]];
+		case GDScriptParser::IdentifierNode::LOCAL_VARIABLE:
+			p_identifier->set_datatype(p_identifier->variable_source->get_datatype());
+			return;
+		case GDScriptParser::IdentifierNode::LOCAL_ITERATOR:
+			p_identifier->set_datatype(p_identifier->bind_source->get_datatype());
+			return;
+		case GDScriptParser::IdentifierNode::LOCAL_BIND: {
+			GDScriptParser::DataType result = p_identifier->bind_source->get_datatype();
+			result.is_constant = true;
+			p_identifier->set_datatype(result);
+			return;
+		}
+		case GDScriptParser::IdentifierNode::UNDEFINED_SOURCE:
+			break;
+	}
+
+	// Not a local, so check members.
+	reduce_identifier_from_base(p_identifier);
+	if (p_identifier->get_datatype().is_set()) {
+		// Found.
+		return;
+	}
+
+	StringName name = p_identifier->name;
+	p_identifier->source = GDScriptParser::IdentifierNode::UNDEFINED_SOURCE;
+
+	// Check globals.
+	if (GDScriptParser::get_builtin_type(name) < Variant::VARIANT_MAX) {
+		if (can_be_builtin) {
+			p_identifier->set_datatype(make_builtin_meta_type(GDScriptParser::get_builtin_type(name)));
+			return;
+		} else {
+			push_error(R"(Builtin type cannot be used as a name on its own.)", p_identifier);
+		}
+	}
+
+	if (class_exists(name)) {
+		p_identifier->set_datatype(make_native_meta_type(name));
+		return;
+	}
+
+	if (ScriptServer::is_global_class(name)) {
+		p_identifier->set_datatype(make_global_class_meta_type(name));
+		return;
+	}
+
+	// Try singletons.
+	// Do this before globals because this might be a singleton loading another one before it's compiled.
+	if (ProjectSettings::get_singleton()->has_autoload(name)) {
+		const ProjectSettings::AutoloadInfo &autoload = ProjectSettings::get_singleton()->get_autoload(name);
+		if (autoload.is_singleton) {
+			// Singleton exists, so it's at least a Node.
+			GDScriptParser::DataType result;
+			result.kind = GDScriptParser::DataType::NATIVE;
+			result.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+			if (autoload.path.to_lower().ends_with(GDScriptLanguage::get_singleton()->get_extension())) {
+				Ref<GDScriptParserRef> parser = get_parser_for(autoload.path);
+				if (parser.is_valid()) {
+					Error err = parser->raise_status(GDScriptParserRef::INTERFACE_SOLVED);
+					if (err == OK) {
+						result = type_from_metatype(parser->get_parser()->head->get_datatype());
+					}
+				}
+			}
+			result.is_constant = true;
+			p_identifier->set_datatype(result);
+			return;
+		}
+	}
+
+	if (GDScriptLanguage::get_singleton()->get_global_map().has(name)) {
+		int idx = GDScriptLanguage::get_singleton()->get_global_map()[name];
+		Variant constant = GDScriptLanguage::get_singleton()->get_global_array()[idx];
+		p_identifier->set_datatype(type_from_variant(constant, p_identifier));
+		p_identifier->is_constant = true;
+		p_identifier->reduced_value = constant;
+		return;
+	}
+
+	if (GDScriptLanguage::get_singleton()->get_named_globals_map().has(name)) {
+		Variant constant = GDScriptLanguage::get_singleton()->get_named_globals_map()[name];
+		p_identifier->set_datatype(type_from_variant(constant, p_identifier));
+		p_identifier->is_constant = true;
+		p_identifier->reduced_value = constant;
+		return;
+	}
+
+	// Not found.
+	// Check if it's a builtin function.
+	if (parser->get_builtin_function(name) < GDScriptFunctions::FUNC_MAX) {
+		push_error(vformat(R"(Built-in function "%s" cannot be used as an identifier.)", name), p_identifier);
+	} else {
+		push_error(vformat(R"(Identifier "%s" not declared in the current scope.)", name), p_identifier);
+	}
+	GDScriptParser::DataType dummy;
+	dummy.kind = GDScriptParser::DataType::VARIANT;
+	p_identifier->set_datatype(dummy); // Just so type is set to something.
+}
+
+void GDScriptAnalyzer::reduce_literal(GDScriptParser::LiteralNode *p_literal) {
+	p_literal->reduced_value = p_literal->value;
+	p_literal->is_constant = true;
+
+	p_literal->set_datatype(type_from_variant(p_literal->reduced_value, p_literal));
+}
+
+void GDScriptAnalyzer::reduce_preload(GDScriptParser::PreloadNode *p_preload) {
+	if (!p_preload->path) {
+		return;
+	}
+
+	reduce_expression(p_preload->path);
+
+	if (!p_preload->path->is_constant) {
+		push_error("Preloaded path must be a constant string.", p_preload->path);
+		return;
+	}
+
+	if (p_preload->path->reduced_value.get_type() != Variant::STRING) {
+		push_error("Preloaded path must be a constant string.", p_preload->path);
+	} else {
+		p_preload->resolved_path = p_preload->path->reduced_value;
+		// TODO: Save this as script dependency.
+		if (p_preload->resolved_path.is_rel_path()) {
+			p_preload->resolved_path = parser->script_path.get_base_dir().plus_file(p_preload->resolved_path);
+		}
+		p_preload->resolved_path = p_preload->resolved_path.simplify_path();
+		if (!FileAccess::exists(p_preload->resolved_path)) {
+			push_error(vformat(R"(Preload file "%s" does not exist.)", p_preload->resolved_path), p_preload->path);
+		} else {
+			// TODO: Don't load if validating: use completion cache.
+			p_preload->resource = ResourceLoader::load(p_preload->resolved_path);
+			if (p_preload->resource.is_null()) {
+				push_error(vformat(R"(Could not p_preload resource file "%s".)", p_preload->resolved_path), p_preload->path);
+			}
+		}
+	}
+
+	p_preload->is_constant = true;
+	p_preload->reduced_value = p_preload->resource;
+	p_preload->set_datatype(type_from_variant(p_preload->reduced_value, p_preload));
+}
+
+void GDScriptAnalyzer::reduce_self(GDScriptParser::SelfNode *p_self) {
+	p_self->is_constant = false;
+	p_self->set_datatype(type_from_metatype(parser->current_class->get_datatype()));
+}
+
+void GDScriptAnalyzer::reduce_subscript(GDScriptParser::SubscriptNode *p_subscript) {
+	if (p_subscript->base->type == GDScriptParser::Node::IDENTIFIER) {
+		reduce_identifier(static_cast<GDScriptParser::IdentifierNode *>(p_subscript->base), true);
+	} else {
+		reduce_expression(p_subscript->base);
+	}
+
+	GDScriptParser::DataType result_type;
+
+	// Reduce index first. If it's a constant StringName, use attribute instead.
+	if (!p_subscript->is_attribute) {
+		if (p_subscript->index == nullptr) {
+			return;
+		}
+		reduce_expression(p_subscript->index);
+
+		if (p_subscript->index->is_constant && p_subscript->index->reduced_value.get_type() == Variant::STRING_NAME) {
+			GDScriptParser::IdentifierNode *attribute = parser->alloc_node<GDScriptParser::IdentifierNode>();
+			// Copy location for better error message.
+			attribute->start_line = p_subscript->index->start_line;
+			attribute->end_line = p_subscript->index->end_line;
+			attribute->leftmost_column = p_subscript->index->leftmost_column;
+			attribute->rightmost_column = p_subscript->index->rightmost_column;
+			p_subscript->is_attribute = true;
+			p_subscript->attribute = attribute;
+		}
+	}
+
+	if (p_subscript->is_attribute) {
+		if (p_subscript->attribute == nullptr) {
+			return;
+		}
+		if (p_subscript->base->is_constant) {
+			// Just try to get it.
+			bool valid = false;
+			Variant value = p_subscript->base->reduced_value.get_named(p_subscript->attribute->name, &valid);
+			if (!valid) {
+				push_error(vformat(R"(Cannot get member "%s" from "%s".)", p_subscript->attribute->name, p_subscript->base->reduced_value), p_subscript->index);
+			} else {
+				p_subscript->is_constant = true;
+				p_subscript->reduced_value = value;
+				result_type = type_from_variant(value, p_subscript);
+			}
+			result_type.kind = GDScriptParser::DataType::VARIANT;
+		} else {
+			GDScriptParser::DataType base_type = p_subscript->base->get_datatype();
+
+			if (base_type.is_variant()) {
+				result_type.kind = GDScriptParser::DataType::VARIANT;
+				mark_node_unsafe(p_subscript);
+			} else {
+				reduce_identifier_from_base(p_subscript->attribute, &base_type);
+				GDScriptParser::DataType attr_type = p_subscript->attribute->get_datatype();
+				if (attr_type.is_set()) {
+					result_type = attr_type;
+					p_subscript->is_constant = p_subscript->attribute->is_constant;
+					p_subscript->reduced_value = p_subscript->attribute->reduced_value;
+				} else {
+					if (base_type.kind == GDScriptParser::DataType::BUILTIN) {
+						push_error(vformat(R"(Cannot find member "%s" in base "%s".)", p_subscript->attribute->name, base_type.to_string()), p_subscript->attribute);
+#ifdef DEBUG_ENABLED
+					} else {
+						parser->push_warning(p_subscript, GDScriptWarning::UNSAFE_PROPERTY_ACCESS, p_subscript->attribute->name, base_type.to_string());
+#endif
+					}
+					result_type.kind = GDScriptParser::DataType::VARIANT;
+				}
+			}
+		}
+	} else {
+		// Index was already reduced before.
+
+		if (p_subscript->base->is_constant && p_subscript->index->is_constant) {
+			// Just try to get it.
+			bool valid = false;
+			Variant value = p_subscript->base->reduced_value.get(p_subscript->index->reduced_value, &valid);
+			if (!valid) {
+				push_error(vformat(R"(Cannot get index "%s" from "%s".)", p_subscript->index->reduced_value, p_subscript->base->reduced_value), p_subscript->index);
+			} else {
+				p_subscript->is_constant = true;
+				p_subscript->reduced_value = value;
+				result_type = type_from_variant(value, p_subscript);
+			}
+			result_type.kind = GDScriptParser::DataType::VARIANT;
+		} else {
+			GDScriptParser::DataType base_type = p_subscript->base->get_datatype();
+			GDScriptParser::DataType index_type = p_subscript->index->get_datatype();
+
+			if (base_type.is_variant()) {
+				result_type.kind = GDScriptParser::DataType::VARIANT;
+				mark_node_unsafe(p_subscript);
+			} else {
+				if (base_type.kind == GDScriptParser::DataType::BUILTIN && !index_type.is_variant()) {
+					// Check if indexing is valid.
+					bool error = index_type.kind != GDScriptParser::DataType::BUILTIN && base_type.builtin_type != Variant::DICTIONARY;
+					if (!error) {
+						switch (base_type.builtin_type) {
+							// Expect int or real as index.
+							case Variant::PACKED_BYTE_ARRAY:
+							case Variant::PACKED_COLOR_ARRAY:
+							case Variant::PACKED_FLOAT32_ARRAY:
+							case Variant::PACKED_FLOAT64_ARRAY:
+							case Variant::PACKED_INT32_ARRAY:
+							case Variant::PACKED_INT64_ARRAY:
+							case Variant::PACKED_STRING_ARRAY:
+							case Variant::PACKED_VECTOR2_ARRAY:
+							case Variant::PACKED_VECTOR3_ARRAY:
+							case Variant::ARRAY:
+							case Variant::STRING:
+								error = index_type.builtin_type != Variant::INT && index_type.builtin_type != Variant::FLOAT;
+								break;
+							// Expect String only.
+							case Variant::RECT2:
+							case Variant::RECT2I:
+							case Variant::PLANE:
+							case Variant::QUAT:
+							case Variant::AABB:
+							case Variant::OBJECT:
+								error = index_type.builtin_type != Variant::STRING;
+								break;
+							// Expect String or number.
+							case Variant::BASIS:
+							case Variant::VECTOR2:
+							case Variant::VECTOR2I:
+							case Variant::VECTOR3:
+							case Variant::VECTOR3I:
+							case Variant::TRANSFORM:
+							case Variant::TRANSFORM2D:
+								error = index_type.builtin_type != Variant::INT && index_type.builtin_type != Variant::FLOAT &&
+										index_type.builtin_type != Variant::STRING;
+								break;
+							// Expect String or int.
+							case Variant::COLOR:
+								error = index_type.builtin_type != Variant::INT && index_type.builtin_type != Variant::STRING;
+								break;
+							// Don't support indexing, but we will check it later.
+							case Variant::_RID:
+							case Variant::BOOL:
+							case Variant::CALLABLE:
+							case Variant::FLOAT:
+							case Variant::INT:
+							case Variant::NIL:
+							case Variant::NODE_PATH:
+							case Variant::SIGNAL:
+							case Variant::STRING_NAME:
+								break;
+							// Here for completeness.
+							case Variant::DICTIONARY:
+							case Variant::VARIANT_MAX:
+								break;
+						}
+
+						if (error) {
+							push_error(vformat(R"(Invalid index type "%s" for a base of type "%s".)", index_type.to_string(), base_type.to_string()), p_subscript->index);
+						}
+					}
+				} else if (base_type.kind != GDScriptParser::DataType::BUILTIN && !index_type.is_variant()) {
+					if (index_type.builtin_type != Variant::STRING && index_type.builtin_type != Variant::STRING_NAME) {
+						push_error(vformat(R"(Only String or StringName can be used as index for type "%s", but received a "%s".)", base_type.to_string(), index_type.to_string()), p_subscript->index);
+					}
+				}
+
+				// Check resulting type if possible.
+				result_type.builtin_type = Variant::NIL;
+				result_type.kind = GDScriptParser::DataType::BUILTIN;
+				result_type.type_source = base_type.is_hard_type() ? GDScriptParser::DataType::ANNOTATED_INFERRED : GDScriptParser::DataType::INFERRED;
+
+				switch (base_type.builtin_type) {
+					// Can't index at all.
+					case Variant::_RID:
+					case Variant::BOOL:
+					case Variant::CALLABLE:
+					case Variant::FLOAT:
+					case Variant::INT:
+					case Variant::NIL:
+					case Variant::NODE_PATH:
+					case Variant::SIGNAL:
+					case Variant::STRING_NAME:
+						result_type.kind = GDScriptParser::DataType::VARIANT;
+						push_error(vformat(R"(Cannot use subscript operator on a base of type "%s".)", base_type.to_string()), p_subscript->base);
+						break;
+					// Return int.
+					case Variant::PACKED_BYTE_ARRAY:
+					case Variant::PACKED_INT32_ARRAY:
+					case Variant::PACKED_INT64_ARRAY:
+					case Variant::VECTOR2I:
+					case Variant::VECTOR3I:
+						result_type.builtin_type = Variant::INT;
+						break;
+					// Return float.
+					case Variant::PACKED_FLOAT32_ARRAY:
+					case Variant::PACKED_FLOAT64_ARRAY:
+					case Variant::VECTOR2:
+					case Variant::VECTOR3:
+					case Variant::QUAT:
+						result_type.builtin_type = Variant::FLOAT;
+						break;
+					// Return Color.
+					case Variant::PACKED_COLOR_ARRAY:
+						result_type.builtin_type = Variant::COLOR;
+						break;
+					// Return String.
+					case Variant::PACKED_STRING_ARRAY:
+					case Variant::STRING:
+						result_type.builtin_type = Variant::STRING;
+						break;
+					// Return Vector2.
+					case Variant::PACKED_VECTOR2_ARRAY:
+					case Variant::TRANSFORM2D:
+					case Variant::RECT2:
+						result_type.builtin_type = Variant::VECTOR2;
+						break;
+					// Return Vector2I.
+					case Variant::RECT2I:
+						result_type.builtin_type = Variant::VECTOR2I;
+						break;
+					// Return Vector3.
+					case Variant::PACKED_VECTOR3_ARRAY:
+					case Variant::AABB:
+					case Variant::BASIS:
+						result_type.builtin_type = Variant::VECTOR3;
+						break;
+					// Depends on the index.
+					case Variant::TRANSFORM:
+					case Variant::PLANE:
+					case Variant::COLOR:
+					case Variant::ARRAY:
+					case Variant::DICTIONARY:
+						result_type.kind = GDScriptParser::DataType::VARIANT;
+						result_type.type_source = GDScriptParser::DataType::UNDETECTED;
+						break;
+					// Here for completeness.
+					case Variant::OBJECT:
+					case Variant::VARIANT_MAX:
+						break;
+				}
+			}
+		}
+	}
+
+	p_subscript->set_datatype(result_type);
+}
+
+void GDScriptAnalyzer::reduce_ternary_op(GDScriptParser::TernaryOpNode *p_ternary_op) {
+	reduce_expression(p_ternary_op->condition);
+	reduce_expression(p_ternary_op->true_expr);
+	reduce_expression(p_ternary_op->false_expr);
+
+	GDScriptParser::DataType result;
+
+	if (p_ternary_op->condition && p_ternary_op->condition->is_constant && p_ternary_op->true_expr->is_constant && p_ternary_op->false_expr && p_ternary_op->false_expr->is_constant) {
+		p_ternary_op->is_constant = true;
+		if (p_ternary_op->condition->reduced_value.booleanize()) {
+			p_ternary_op->reduced_value = p_ternary_op->true_expr->reduced_value;
+		} else {
+			p_ternary_op->reduced_value = p_ternary_op->false_expr->reduced_value;
+		}
+	}
+
+	GDScriptParser::DataType true_type;
+	if (p_ternary_op->true_expr) {
+		true_type = p_ternary_op->true_expr->get_datatype();
+	} else {
+		true_type.kind = GDScriptParser::DataType::VARIANT;
+	}
+	GDScriptParser::DataType false_type;
+	if (p_ternary_op->false_expr) {
+		false_type = p_ternary_op->false_expr->get_datatype();
+	} else {
+		false_type.kind = GDScriptParser::DataType::VARIANT;
+	}
+
+	if (true_type.is_variant() || false_type.is_variant()) {
+		result.kind = GDScriptParser::DataType::VARIANT;
+	} else {
+		result = true_type;
+		if (!is_type_compatible(true_type, false_type)) {
+			result = false_type;
+			if (!is_type_compatible(false_type, true_type)) {
+				result.type_source = GDScriptParser::DataType::UNDETECTED;
+				result.kind = GDScriptParser::DataType::VARIANT;
+#ifdef DEBUG_ENABLED
+				parser->push_warning(p_ternary_op, GDScriptWarning::INCOMPATIBLE_TERNARY);
+#endif
+			}
+		}
+	}
+
+	p_ternary_op->set_datatype(result);
+}
+
+void GDScriptAnalyzer::reduce_unary_op(GDScriptParser::UnaryOpNode *p_unary_op) {
+	reduce_expression(p_unary_op->operand);
+
+	GDScriptParser::DataType result;
+
+	if (p_unary_op->operand == nullptr) {
+		result.kind = GDScriptParser::DataType::VARIANT;
+		p_unary_op->set_datatype(result);
+		return;
+	}
+
+	if (p_unary_op->operand->is_constant) {
+		p_unary_op->is_constant = true;
+		p_unary_op->reduced_value = Variant::evaluate(p_unary_op->variant_op, p_unary_op->operand->reduced_value, Variant());
+		result = type_from_variant(p_unary_op->reduced_value, p_unary_op);
+	} else if (p_unary_op->operand->get_datatype().is_variant()) {
+		result.kind = GDScriptParser::DataType::VARIANT;
+		mark_node_unsafe(p_unary_op);
+	} else {
+		bool valid = false;
+		result = get_operation_type(p_unary_op->variant_op, p_unary_op->operand->get_datatype(), p_unary_op->operand->get_datatype(), valid, p_unary_op);
+
+		if (!valid) {
+			push_error(vformat(R"(Invalid operand of type "%s" for unary operator "%s".)", p_unary_op->operand->get_datatype().to_string(), Variant::get_operator_name(p_unary_op->variant_op)), p_unary_op->operand);
+		}
+	}
+
+	p_unary_op->set_datatype(result);
+}
+
+GDScriptParser::DataType GDScriptAnalyzer::type_from_variant(const Variant &p_value, const GDScriptParser::Node *p_source) {
+	GDScriptParser::DataType result;
+	result.is_constant = true;
+	result.kind = GDScriptParser::DataType::BUILTIN;
+	result.builtin_type = p_value.get_type();
+	result.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT; // Constant has explicit type.
+
+	if (p_value.get_type() == Variant::OBJECT) {
+		Object *obj = p_value;
+		if (!obj) {
+			return GDScriptParser::DataType();
+		}
+		result.native_type = obj->get_class_name();
+
+		Ref<Script> scr = p_value; // Check if value is a script itself.
+		if (scr.is_valid()) {
+			result.is_meta_type = true;
+		} else {
+			result.is_meta_type = false;
+			scr = obj->get_script();
+		}
+		if (scr.is_valid()) {
+			if (scr->is_valid()) {
+				result.script_type = scr;
+				result.script_path = scr->get_path();
+				Ref<GDScript> gds = scr;
+				if (gds.is_valid()) {
+					result.kind = GDScriptParser::DataType::CLASS;
+					// This might be an inner class, so we want to get the parser for the root.
+					// But still get the inner class from that tree.
+					GDScript *current = gds.ptr();
+					List<StringName> class_chain;
+					while (current->_owner) {
+						// Push to front so it's in reverse.
+						class_chain.push_front(current->name);
+						current = current->_owner;
+					}
+
+					Ref<GDScriptParserRef> ref = get_parser_for(current->path);
+					ref->raise_status(GDScriptParserRef::INTERFACE_SOLVED);
+
+					GDScriptParser::ClassNode *found = ref->get_parser()->head;
+
+					// It should be okay to assume this exists, since we have a complete script already.
+					for (const List<StringName>::Element *E = class_chain.front(); E; E = E->next()) {
+						found = found->get_member(E->get()).m_class;
+					}
+
+					result.class_type = found;
+					result.script_path = ref->get_parser()->script_path;
+				} else {
+					result.kind = GDScriptParser::DataType::SCRIPT;
+				}
+				result.native_type = scr->get_instance_base_type();
+			} else {
+				push_error(vformat(R"(Constant value uses script from "%s" which is loaded but not compiled.)", scr->get_path()), p_source);
+				result.kind = GDScriptParser::DataType::VARIANT;
+				result.type_source = GDScriptParser::DataType::UNDETECTED;
+				result.is_meta_type = false;
+			}
+		} else {
+			result.kind = GDScriptParser::DataType::NATIVE;
+			if (result.native_type == GDScriptNativeClass::get_class_static()) {
+				result.is_meta_type = true;
+			}
+		}
+	}
+
+	return result;
+}
+
+GDScriptParser::DataType GDScriptAnalyzer::type_from_metatype(const GDScriptParser::DataType &p_meta_type) const {
+	GDScriptParser::DataType result = p_meta_type;
+	result.is_meta_type = false;
+	result.is_constant = false;
+	return result;
+}
+
+GDScriptParser::DataType GDScriptAnalyzer::type_from_property(const PropertyInfo &p_property) const {
+	GDScriptParser::DataType result;
+	result.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+	if (p_property.type == Variant::NIL && (p_property.usage & PROPERTY_USAGE_NIL_IS_VARIANT)) {
+		// Variant
+		result.kind = GDScriptParser::DataType::VARIANT;
+		return result;
+	}
+	result.builtin_type = p_property.type;
+	if (p_property.type == Variant::OBJECT) {
+		result.kind = GDScriptParser::DataType::NATIVE;
+		result.native_type = p_property.class_name == StringName() ? "Object" : p_property.class_name;
+	} else {
+		result.kind = GDScriptParser::DataType::BUILTIN;
+	}
+	return result;
+}
+
+bool GDScriptAnalyzer::get_function_signature(GDScriptParser::Node *p_source, GDScriptParser::DataType p_base_type, const StringName &p_function, GDScriptParser::DataType &r_return_type, List<GDScriptParser::DataType> &r_par_types, int &r_default_arg_count, bool &r_static, bool &r_vararg) {
+	r_static = false;
+	r_vararg = false;
+	r_default_arg_count = 0;
+	StringName function_name = p_function;
+
+	if (p_base_type.kind == GDScriptParser::DataType::BUILTIN) {
+		// Construct a base type to get methods.
+		Callable::CallError err;
+		Variant dummy = Variant::construct(p_base_type.builtin_type, nullptr, 0, err);
+		if (err.error != Callable::CallError::CALL_OK) {
+			ERR_FAIL_V_MSG(false, "Could not construct base Variant type.");
+		}
+		List<MethodInfo> methods;
+		dummy.get_method_list(&methods);
+
+		for (const List<MethodInfo>::Element *E = methods.front(); E != nullptr; E = E->next()) {
+			if (E->get().name == p_function) {
+				return function_signature_from_info(E->get(), r_return_type, r_par_types, r_default_arg_count, r_static, r_vararg);
+			}
+		}
+
+		return false;
+	}
+
+	bool is_constructor = p_base_type.is_meta_type && p_function == "new";
+	if (is_constructor) {
+		function_name = "_init";
+		r_static = true;
+	}
+
+	GDScriptParser::ClassNode *base_class = p_base_type.class_type;
+	GDScriptParser::FunctionNode *found_function = nullptr;
+
+	while (found_function == nullptr && base_class != nullptr) {
+		if (base_class->has_member(function_name)) {
+			if (base_class->get_member(function_name).type != GDScriptParser::ClassNode::Member::FUNCTION) {
+				// TODO: If this is Callable it can have a better error message.
+				push_error(vformat(R"(Member "%s" is not a function.)", function_name), p_source);
+				return false;
+			}
+			found_function = base_class->get_member(function_name).function;
+		}
+		base_class = base_class->base_type.class_type;
+	}
+
+	if (found_function != nullptr) {
+		r_static = is_constructor || found_function->is_static;
+		for (int i = 0; i < found_function->parameters.size(); i++) {
+			r_par_types.push_back(found_function->parameters[i]->get_datatype());
+			if (found_function->parameters[i]->default_value != nullptr) {
+				r_default_arg_count++;
+			}
+		}
+		r_return_type = found_function->get_datatype();
+		r_return_type.is_coroutine = found_function->is_coroutine;
+
+		return true;
+	}
+
+	Ref<Script> base_script = p_base_type.script_type;
+
+	while (base_script.is_valid() && base_script->is_valid()) {
+		MethodInfo info = base_script->get_method_info(function_name);
+
+		if (!(info == MethodInfo())) {
+			return function_signature_from_info(info, r_return_type, r_par_types, r_default_arg_count, r_static, r_vararg);
+		}
+		base_script = base_script->get_base_script();
+	}
+
+	// If the base is a script, it might be trying to access members of the Script class itself.
+	if (p_base_type.is_meta_type && !is_constructor && (p_base_type.kind == GDScriptParser::DataType::SCRIPT || p_base_type.kind == GDScriptParser::DataType::CLASS)) {
+		MethodInfo info;
+		StringName script_class = p_base_type.kind == GDScriptParser::DataType::SCRIPT ? p_base_type.script_type->get_class_name() : StringName(GDScript::get_class_static());
+
+		if (ClassDB::get_method_info(script_class, function_name, &info)) {
+			return function_signature_from_info(info, r_return_type, r_par_types, r_default_arg_count, r_static, r_vararg);
+		}
+	}
+
+	StringName base_native = p_base_type.native_type;
+#ifdef DEBUG_ENABLED
+	if (base_native != StringName()) {
+		// Empty native class might happen in some Script implementations.
+		// Just ignore it.
+		if (!class_exists(base_native)) {
+			ERR_FAIL_V_MSG(false, vformat("Native class %s used in script doesn't exist or isn't exposed.", base_native));
+		}
+	}
+#endif
+
+	if (is_constructor) {
+		// Native types always have a default constructor.
+		r_return_type = p_base_type;
+		r_return_type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+		r_return_type.is_meta_type = false;
+		return true;
+	}
+
+	StringName real_native = get_real_class_name(base_native);
+
+	MethodInfo info;
+	if (ClassDB::get_method_info(real_native, function_name, &info)) {
+		return function_signature_from_info(info, r_return_type, r_par_types, r_default_arg_count, r_static, r_vararg);
+	}
+
+	return false;
+}
+
+bool GDScriptAnalyzer::function_signature_from_info(const MethodInfo &p_info, GDScriptParser::DataType &r_return_type, List<GDScriptParser::DataType> &r_par_types, int &r_default_arg_count, bool &r_static, bool &r_vararg) {
+	r_return_type = type_from_property(p_info.return_val);
+	r_default_arg_count = p_info.default_arguments.size();
+	r_vararg = (p_info.flags & METHOD_FLAG_VARARG) != 0;
+
+	for (const List<PropertyInfo>::Element *E = p_info.arguments.front(); E != nullptr; E = E->next()) {
+		r_par_types.push_back(type_from_property(E->get()));
+	}
+	return true;
+}
+
+bool GDScriptAnalyzer::validate_call_arg(const MethodInfo &p_method, const GDScriptParser::CallNode *p_call) {
+	List<GDScriptParser::DataType> arg_types;
+
+	for (const List<PropertyInfo>::Element *E = p_method.arguments.front(); E != nullptr; E = E->next()) {
+		arg_types.push_back(type_from_property(E->get()));
+	}
+
+	return validate_call_arg(arg_types, p_method.default_arguments.size(), (p_method.flags & METHOD_FLAG_VARARG) != 0, p_call);
+}
+
+bool GDScriptAnalyzer::validate_call_arg(const List<GDScriptParser::DataType> &p_par_types, int p_default_args_count, bool p_is_vararg, const GDScriptParser::CallNode *p_call) {
+	bool valid = true;
+
+	if (p_call->arguments.size() < p_par_types.size() - p_default_args_count) {
+		push_error(vformat(R"*(Too few arguments for "%s()" call. Expected at least %d but received %d.)*", p_call->function_name, p_par_types.size() - p_default_args_count, p_call->arguments.size()), p_call);
+		valid = false;
+	}
+	if (!p_is_vararg && p_call->arguments.size() > p_par_types.size()) {
+		push_error(vformat(R"*(Too many arguments for "%s()" call. Expected at most %d but received %d.)*", p_call->function_name, p_par_types.size(), p_call->arguments.size()), p_call->arguments[p_par_types.size()]);
+		valid = false;
+	}
+
+	for (int i = 0; i < p_call->arguments.size(); i++) {
+		if (i >= p_par_types.size()) {
+			// Already on vararg place.
+			break;
+		}
+		GDScriptParser::DataType par_type = p_par_types[i];
+		GDScriptParser::DataType arg_type = p_call->arguments[i]->get_datatype();
+
+		if (arg_type.is_variant()) {
+			// Argument can be anything, so this is unsafe.
+			mark_node_unsafe(p_call->arguments[i]);
+		} else if (par_type.is_hard_type() && !is_type_compatible(par_type, arg_type, true)) {
+			// Supertypes are acceptable for dynamic compliance, but it's unsafe.
+			mark_node_unsafe(p_call);
+			if (!is_type_compatible(arg_type, par_type)) {
+				push_error(vformat(R"*(Invalid argument for "%s()" function: argument %d should be %s but is %s.)*",
+								   p_call->function_name, i + 1, par_type.to_string(), arg_type.to_string()),
+						p_call->arguments[i]);
+				valid = false;
+			}
+#ifdef DEBUG_ENABLED
+		} else {
+			if (par_type.kind == GDScriptParser::DataType::BUILTIN && par_type.builtin_type == Variant::INT && arg_type.kind == GDScriptParser::DataType::BUILTIN && arg_type.builtin_type == Variant::FLOAT) {
+				parser->push_warning(p_call, GDScriptWarning::NARROWING_CONVERSION, p_call->function_name);
+			}
+#endif
+		}
+	}
+	return valid;
+}
+
+#ifdef DEBUG_ENABLED
+bool GDScriptAnalyzer::is_shadowing(GDScriptParser::IdentifierNode *p_local, const String &p_context) {
+	const StringName &name = p_local->name;
+	GDScriptParser::DataType base = parser->current_class->get_datatype();
+
+	GDScriptParser::ClassNode *base_class = base.class_type;
+
+	while (base_class != nullptr) {
+		if (base_class->has_member(name)) {
+			parser->push_warning(p_local, GDScriptWarning::SHADOWED_VARIABLE, p_context, p_local->name, base_class->get_member(name).get_type_name(), itos(base_class->get_member(name).get_line()));
+			return true;
+		}
+		base_class = base_class->base_type.class_type;
+	}
+
+	StringName base_native = base.native_type;
+
+	ERR_FAIL_COND_V_MSG(!class_exists(base_native), false, "Non-existent native base class.");
+
+	StringName parent = base_native;
+	while (parent != StringName()) {
+		StringName real_class_name = get_real_class_name(parent);
+		if (ClassDB::has_method(real_class_name, name, true)) {
+			parser->push_warning(p_local, GDScriptWarning::SHADOWED_VARIABLE_BASE_CLASS, p_context, p_local->name, "method", parent);
+			return true;
+		} else if (ClassDB::has_signal(real_class_name, name, true)) {
+			parser->push_warning(p_local, GDScriptWarning::SHADOWED_VARIABLE_BASE_CLASS, p_context, p_local->name, "signal", parent);
+			return true;
+		} else if (ClassDB::has_property(real_class_name, name, true)) {
+			parser->push_warning(p_local, GDScriptWarning::SHADOWED_VARIABLE_BASE_CLASS, p_context, p_local->name, "property", parent);
+			return true;
+		} else if (ClassDB::has_integer_constant(real_class_name, name, true)) {
+			parser->push_warning(p_local, GDScriptWarning::SHADOWED_VARIABLE_BASE_CLASS, p_context, p_local->name, "constant", parent);
+			return true;
+		} else if (ClassDB::has_enum(real_class_name, name, true)) {
+			parser->push_warning(p_local, GDScriptWarning::SHADOWED_VARIABLE_BASE_CLASS, p_context, p_local->name, "enum", parent);
+			return true;
+		}
+		parent = ClassDB::get_parent_class(real_class_name);
+	}
+
+	return false;
+}
+#endif
+
+GDScriptParser::DataType GDScriptAnalyzer::get_operation_type(Variant::Operator p_operation, const GDScriptParser::DataType &p_a, const GDScriptParser::DataType &p_b, bool &r_valid, const GDScriptParser::Node *p_source) {
+	// This function creates dummy variant values and apply the operation to those. Less error-prone than keeping a table of valid operations.
+
+	GDScriptParser::DataType result;
+	result.kind = GDScriptParser::DataType::VARIANT;
+
+	Variant::Type a_type = p_a.builtin_type;
+	Variant::Type b_type = p_b.builtin_type;
+
+	Variant a;
+	REF a_ref;
+	if (a_type == Variant::OBJECT) {
+		a_ref.instance();
+		a = a_ref;
+	} else {
+		Callable::CallError err;
+		a = Variant::construct(a_type, nullptr, 0, err);
+		if (err.error != Callable::CallError::CALL_OK) {
+			r_valid = false;
+			ERR_FAIL_V_MSG(result, vformat("Could not construct value of type %s", Variant::get_type_name(a_type)));
+		}
+	}
+	Variant b;
+	REF b_ref;
+	if (b_type == Variant::OBJECT) {
+		b_ref.instance();
+		b = b_ref;
+	} else {
+		Callable::CallError err;
+		b = Variant::construct(b_type, nullptr, 0, err);
+		if (err.error != Callable::CallError::CALL_OK) {
+			r_valid = false;
+			ERR_FAIL_V_MSG(result, vformat("Could not construct value of type %s", Variant::get_type_name(b_type)));
+		}
+	}
+
+	// Avoid division by zero.
+	switch (b_type) {
+		case Variant::INT:
+			b = 1;
+			break;
+		case Variant::FLOAT:
+			b = 1.0;
+			break;
+		case Variant::VECTOR2:
+			b = Vector2(1.0, 1.0);
+			break;
+		case Variant::VECTOR2I:
+			b = Vector2i(1, 1);
+			break;
+		case Variant::VECTOR3:
+			b = Vector3(1.0, 1.0, 1.0);
+			break;
+		case Variant::VECTOR3I:
+			b = Vector3i(1, 1, 1);
+			break;
+		case Variant::COLOR:
+			b = Color(1.0, 1.0, 1.0, 1.0);
+			break;
+		default:
+			// No change needed.
+			break;
+	}
+
+	// Avoid error in formatting operator (%) where it doesn't find a placeholder.
+	if (a_type == Variant::STRING && b_type != Variant::ARRAY) {
+		a = String("%s");
+	}
+
+	Variant ret;
+	Variant::evaluate(p_operation, a, b, ret, r_valid);
+
+	if (r_valid) {
+		return type_from_variant(ret, p_source);
+	}
+
+	return result;
+}
+
+// TODO: Add safe/unsafe return variable (for variant cases)
+bool GDScriptAnalyzer::is_type_compatible(const GDScriptParser::DataType &p_target, const GDScriptParser::DataType &p_source, bool p_allow_implicit_conversion) const {
+	// These return "true" so it doesn't affect users negatively.
+	ERR_FAIL_COND_V_MSG(!p_target.is_set(), true, "Parser bug (please report): Trying to check compatibility of unset target type");
+	ERR_FAIL_COND_V_MSG(!p_source.is_set(), true, "Parser bug (please report): Trying to check compatibility of unset value type");
+
+	if (p_target.kind == GDScriptParser::DataType::VARIANT) {
+		// Variant can receive anything.
+		return true;
+	}
+
+	if (p_source.kind == GDScriptParser::DataType::VARIANT) {
+		// TODO: This is acceptable but unsafe. Make sure unsafe line is set.
+		return true;
+	}
+
+	if (p_target.kind == GDScriptParser::DataType::BUILTIN) {
+		bool valid = p_source.kind == GDScriptParser::DataType::BUILTIN && p_target.builtin_type == p_source.builtin_type;
+		if (!valid && p_allow_implicit_conversion) {
+			valid = Variant::can_convert_strict(p_source.builtin_type, p_target.builtin_type);
+		}
+		if (!valid && p_target.builtin_type == Variant::INT && p_source.kind == GDScriptParser::DataType::ENUM_VALUE) {
+			// Enum value is also integer.
+			valid = true;
+		}
+		return valid;
+	}
+
+	if (p_target.kind == GDScriptParser::DataType::ENUM) {
+		if (p_source.kind == GDScriptParser::DataType::BUILTIN && p_source.builtin_type == Variant::INT) {
+			return true;
+		}
+		if (p_source.kind == GDScriptParser::DataType::ENUM_VALUE) {
+			if (p_source.native_type == p_target.native_type && p_target.enum_values.has(p_source.enum_type)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	// From here on the target type is an object, so we have to test polymorphism.
+
+	if (p_source.kind == GDScriptParser::DataType::BUILTIN && p_source.builtin_type == Variant::NIL) {
+		// null is acceptable in object.
+		return true;
+	}
+
+	StringName src_native;
+	Ref<Script> src_script;
+	const GDScriptParser::ClassNode *src_class = nullptr;
+
+	switch (p_source.kind) {
+		case GDScriptParser::DataType::NATIVE:
+			if (p_target.kind != GDScriptParser::DataType::NATIVE) {
+				// Non-native class cannot be supertype of native.
+				return false;
+			}
+			if (p_source.is_meta_type) {
+				src_native = GDScriptNativeClass::get_class_static();
+			} else {
+				src_native = p_source.native_type;
+			}
+			break;
+		case GDScriptParser::DataType::SCRIPT:
+			if (p_target.kind == GDScriptParser::DataType::CLASS) {
+				// A script type cannot be a subtype of a GDScript class.
+				return false;
+			}
+			if (p_source.is_meta_type) {
+				src_native = p_source.script_type->get_class_name();
+			} else {
+				src_script = p_source.script_type;
+				src_native = src_script->get_instance_base_type();
+			}
+			break;
+		case GDScriptParser::DataType::CLASS:
+			if (p_source.is_meta_type) {
+				src_native = GDScript::get_class_static();
+			} else {
+				src_class = p_source.class_type;
+				const GDScriptParser::ClassNode *base = src_class;
+				while (base->base_type.kind == GDScriptParser::DataType::CLASS) {
+					base = base->base_type.class_type;
+				}
+				src_native = base->base_type.native_type;
+				src_script = base->base_type.script_type;
+			}
+			break;
+		case GDScriptParser::DataType::VARIANT:
+		case GDScriptParser::DataType::BUILTIN:
+		case GDScriptParser::DataType::ENUM:
+		case GDScriptParser::DataType::ENUM_VALUE:
+		case GDScriptParser::DataType::UNRESOLVED:
+			break; // Already solved before.
+	}
+
+	// Get underscore-prefixed version for some classes.
+	src_native = get_real_class_name(src_native);
+
+	switch (p_target.kind) {
+		case GDScriptParser::DataType::NATIVE: {
+			if (p_target.is_meta_type) {
+				return ClassDB::is_parent_class(src_native, GDScriptNativeClass::get_class_static());
+			}
+			StringName tgt_native = get_real_class_name(p_target.native_type);
+			return ClassDB::is_parent_class(src_native, tgt_native);
+		}
+		case GDScriptParser::DataType::SCRIPT:
+			if (p_target.is_meta_type) {
+				return ClassDB::is_parent_class(src_native, p_target.script_type->get_class_name());
+			}
+			while (src_script.is_valid()) {
+				if (src_script == p_target.script_type) {
+					return true;
+				}
+				src_script = src_script->get_base_script();
+			}
+			return false;
+		case GDScriptParser::DataType::CLASS:
+			if (p_target.is_meta_type) {
+				return ClassDB::is_parent_class(src_native, GDScript::get_class_static());
+			}
+			while (src_class != nullptr) {
+				if (src_class->fqcn == p_target.class_type->fqcn) {
+					return true;
+				}
+				src_class = src_class->base_type.class_type;
+			}
+			return false;
+		case GDScriptParser::DataType::VARIANT:
+		case GDScriptParser::DataType::BUILTIN:
+		case GDScriptParser::DataType::ENUM:
+		case GDScriptParser::DataType::ENUM_VALUE:
+		case GDScriptParser::DataType::UNRESOLVED:
+			break; // Already solved before.
+	}
+
+	return false;
+}
+
+void GDScriptAnalyzer::push_error(const String &p_message, const GDScriptParser::Node *p_origin) {
+	mark_node_unsafe(p_origin);
+	parser->push_error(p_message, p_origin);
+}
+
+void GDScriptAnalyzer::mark_node_unsafe(const GDScriptParser::Node *p_node) {
+#ifdef DEBUG_ENABLED
+	for (int i = p_node->start_line; i <= p_node->end_line; i++) {
+		parser->unsafe_lines.insert(i);
+	}
+#endif
+}
+
+bool GDScriptAnalyzer::class_exists(const StringName &p_class) {
+	StringName real_name = get_real_class_name(p_class);
+	return ClassDB::class_exists(real_name) && ClassDB::is_class_exposed(real_name);
+}
+
+Ref<GDScriptParserRef> GDScriptAnalyzer::get_parser_for(const String &p_path) {
+	Ref<GDScriptParserRef> ref;
+	if (depended_parsers.has(p_path)) {
+		ref = depended_parsers[p_path];
+	} else {
+		Error err = OK;
+		ref = GDScriptCache::get_parser(p_path, GDScriptParserRef::EMPTY, err, parser->script_path);
+		depended_parsers[p_path] = ref;
+	}
+
+	return ref;
+}
+
+Error GDScriptAnalyzer::resolve_inheritance() {
+	return resolve_inheritance(parser->head);
+}
+
+Error GDScriptAnalyzer::resolve_interface() {
+	resolve_class_interface(parser->head);
+	return parser->errors.empty() ? OK : ERR_PARSE_ERROR;
+}
+
+Error GDScriptAnalyzer::resolve_body() {
+	resolve_class_body(parser->head);
+	return parser->errors.empty() ? OK : ERR_PARSE_ERROR;
+}
+
+Error GDScriptAnalyzer::resolve_program() {
+	resolve_class_interface(parser->head);
+	resolve_class_body(parser->head);
+
+	List<String> parser_keys;
+	depended_parsers.get_key_list(&parser_keys);
+	for (const List<String>::Element *E = parser_keys.front(); E != nullptr; E = E->next()) {
+		if (depended_parsers[E->get()].is_null()) {
+			return ERR_PARSE_ERROR;
+		}
+		depended_parsers[E->get()]->raise_status(GDScriptParserRef::FULLY_SOLVED);
+	}
+	depended_parsers.clear();
+	return parser->errors.empty() ? OK : ERR_PARSE_ERROR;
+}
+
+Error GDScriptAnalyzer::analyze() {
+	parser->errors.clear();
+	Error err = resolve_inheritance(parser->head);
+	if (err) {
+		return err;
+	}
+	return resolve_program();
+}
+
+GDScriptAnalyzer::GDScriptAnalyzer(GDScriptParser *p_parser) {
+	parser = p_parser;
+}
diff --git a/modules/gdscript/gdscript_analyzer.h b/modules/gdscript/gdscript_analyzer.h
new file mode 100644
index 0000000000..c3911cce76
--- /dev/null
+++ b/modules/gdscript/gdscript_analyzer.h
@@ -0,0 +1,122 @@
+/*************************************************************************/
+/*  gdscript_analyzer.h                                                  */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef GDSCRIPT_ANALYZER_H
+#define GDSCRIPT_ANALYZER_H
+
+#include "core/object.h"
+#include "core/reference.h"
+#include "core/set.h"
+#include "gdscript_cache.h"
+#include "gdscript_parser.h"
+
+class GDScriptAnalyzer {
+	GDScriptParser *parser = nullptr;
+	HashMap<String, Ref<GDScriptParserRef>> depended_parsers;
+
+	const GDScriptParser::EnumNode *current_enum = nullptr;
+
+	Error resolve_inheritance(GDScriptParser::ClassNode *p_class, bool p_recursive = true);
+	GDScriptParser::DataType resolve_datatype(GDScriptParser::TypeNode *p_type);
+
+	void decide_suite_type(GDScriptParser::Node *p_suite, GDScriptParser::Node *p_statement);
+
+	// This traverses the tree to resolve all TypeNodes.
+	Error resolve_program();
+
+	void resolve_annotation(GDScriptParser::AnnotationNode *p_annotation);
+	void resolve_class_interface(GDScriptParser::ClassNode *p_class);
+	void resolve_class_body(GDScriptParser::ClassNode *p_class);
+	void resolve_function_signature(GDScriptParser::FunctionNode *p_function);
+	void resolve_function_body(GDScriptParser::FunctionNode *p_function);
+	void resolve_node(GDScriptParser::Node *p_node);
+	void resolve_suite(GDScriptParser::SuiteNode *p_suite);
+	void resolve_if(GDScriptParser::IfNode *p_if);
+	void resolve_for(GDScriptParser::ForNode *p_for);
+	void resolve_while(GDScriptParser::WhileNode *p_while);
+	void resolve_variable(GDScriptParser::VariableNode *p_variable);
+	void resolve_constant(GDScriptParser::ConstantNode *p_constant);
+	void resolve_assert(GDScriptParser::AssertNode *p_assert);
+	void resolve_match(GDScriptParser::MatchNode *p_match);
+	void resolve_match_branch(GDScriptParser::MatchBranchNode *p_match_branch, GDScriptParser::ExpressionNode *p_match_test);
+	void resolve_match_pattern(GDScriptParser::PatternNode *p_match_pattern, GDScriptParser::ExpressionNode *p_match_test);
+	void resolve_parameter(GDScriptParser::ParameterNode *p_parameter);
+	void resolve_return(GDScriptParser::ReturnNode *p_return);
+
+	// Reduction functions.
+	void reduce_expression(GDScriptParser::ExpressionNode *p_expression);
+	void reduce_array(GDScriptParser::ArrayNode *p_array);
+	void reduce_assignment(GDScriptParser::AssignmentNode *p_assignment);
+	void reduce_await(GDScriptParser::AwaitNode *p_await);
+	void reduce_binary_op(GDScriptParser::BinaryOpNode *p_binary_op);
+	void reduce_call(GDScriptParser::CallNode *p_call, bool is_await = false);
+	void reduce_cast(GDScriptParser::CastNode *p_cast);
+	void reduce_dictionary(GDScriptParser::DictionaryNode *p_dictionary);
+	void reduce_get_node(GDScriptParser::GetNodeNode *p_get_node);
+	void reduce_identifier(GDScriptParser::IdentifierNode *p_identifier, bool can_be_builtin = false);
+	void reduce_identifier_from_base(GDScriptParser::IdentifierNode *p_identifier, GDScriptParser::DataType *p_base = nullptr);
+	void reduce_literal(GDScriptParser::LiteralNode *p_literal);
+	void reduce_preload(GDScriptParser::PreloadNode *p_preload);
+	void reduce_self(GDScriptParser::SelfNode *p_self);
+	void reduce_subscript(GDScriptParser::SubscriptNode *p_subscript);
+	void reduce_ternary_op(GDScriptParser::TernaryOpNode *p_ternary_op);
+	void reduce_unary_op(GDScriptParser::UnaryOpNode *p_unary_op);
+
+	// Helpers.
+	GDScriptParser::DataType type_from_variant(const Variant &p_value, const GDScriptParser::Node *p_source);
+	GDScriptParser::DataType type_from_metatype(const GDScriptParser::DataType &p_meta_type) const;
+	GDScriptParser::DataType type_from_property(const PropertyInfo &p_property) const;
+	GDScriptParser::DataType make_global_class_meta_type(const StringName &p_class_name);
+	bool get_function_signature(GDScriptParser::Node *p_source, GDScriptParser::DataType base_type, const StringName &p_function, GDScriptParser::DataType &r_return_type, List<GDScriptParser::DataType> &r_par_types, int &r_default_arg_count, bool &r_static, bool &r_vararg);
+	bool function_signature_from_info(const MethodInfo &p_info, GDScriptParser::DataType &r_return_type, List<GDScriptParser::DataType> &r_par_types, int &r_default_arg_count, bool &r_static, bool &r_vararg);
+	bool validate_call_arg(const List<GDScriptParser::DataType> &p_par_types, int p_default_args_count, bool p_is_vararg, const GDScriptParser::CallNode *p_call);
+	bool validate_call_arg(const MethodInfo &p_method, const GDScriptParser::CallNode *p_call);
+	GDScriptParser::DataType get_operation_type(Variant::Operator p_operation, const GDScriptParser::DataType &p_a, const GDScriptParser::DataType &p_b, bool &r_valid, const GDScriptParser::Node *p_source);
+	bool is_type_compatible(const GDScriptParser::DataType &p_target, const GDScriptParser::DataType &p_source, bool p_allow_implicit_conversion = false) const;
+	void push_error(const String &p_message, const GDScriptParser::Node *p_origin);
+	void mark_node_unsafe(const GDScriptParser::Node *p_node);
+	bool class_exists(const StringName &p_class);
+	Ref<GDScriptParserRef> get_parser_for(const String &p_path);
+#ifdef DEBUG_ENABLED
+	bool is_shadowing(GDScriptParser::IdentifierNode *p_local, const String &p_context);
+#endif
+
+public:
+	Error resolve_inheritance();
+	Error resolve_interface();
+	Error resolve_body();
+	Error analyze();
+
+	GDScriptAnalyzer(GDScriptParser *p_parser);
+
+	static void cleanup();
+};
+
+#endif // GDSCRIPT_ANALYZER_H
diff --git a/modules/gdscript/gdscript_byte_codegen.cpp b/modules/gdscript/gdscript_byte_codegen.cpp
new file mode 100644
index 0000000000..8f0ce99de6
--- /dev/null
+++ b/modules/gdscript/gdscript_byte_codegen.cpp
@@ -0,0 +1,736 @@
+/*************************************************************************/
+/*  gdscript_byte_codegen.cpp                                            */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "gdscript_byte_codegen.h"
+
+#include "core/debugger/engine_debugger.h"
+#include "gdscript.h"
+
+uint32_t GDScriptByteCodeGenerator::add_parameter(const StringName &p_name, bool p_is_optional, const GDScriptDataType &p_type) {
+#ifdef TOOLS_ENABLED
+	function->arg_names.push_back(p_name);
+#endif
+	function->_argument_count++;
+	function->argument_types.push_back(p_type);
+	if (p_is_optional) {
+		if (function->_default_arg_count == 0) {
+			append(GDScriptFunction::OPCODE_JUMP_TO_DEF_ARGUMENT);
+		}
+		function->default_arguments.push_back(opcodes.size());
+		function->_default_arg_count++;
+	}
+
+	return add_local(p_name, p_type);
+}
+
+uint32_t GDScriptByteCodeGenerator::add_local(const StringName &p_name, const GDScriptDataType &p_type) {
+	int stack_pos = increase_stack();
+	add_stack_identifier(p_name, stack_pos);
+	return stack_pos;
+}
+
+uint32_t GDScriptByteCodeGenerator::add_local_constant(const StringName &p_name, const Variant &p_constant) {
+	int index = add_or_get_constant(p_constant);
+	local_constants[p_name] = index;
+	return index;
+}
+
+uint32_t GDScriptByteCodeGenerator::add_or_get_constant(const Variant &p_constant) {
+	if (constant_map.has(p_constant)) {
+		return constant_map[p_constant];
+	}
+	int index = constant_map.size();
+	constant_map[p_constant] = index;
+	return index;
+}
+
+uint32_t GDScriptByteCodeGenerator::add_or_get_name(const StringName &p_name) {
+	return get_name_map_pos(p_name);
+}
+
+uint32_t GDScriptByteCodeGenerator::add_temporary() {
+	current_temporaries++;
+	return increase_stack();
+}
+
+void GDScriptByteCodeGenerator::pop_temporary() {
+	current_stack_size--;
+	current_temporaries--;
+}
+
+void GDScriptByteCodeGenerator::start_parameters() {}
+
+void GDScriptByteCodeGenerator::end_parameters() {
+	function->default_arguments.invert();
+}
+
+void GDScriptByteCodeGenerator::write_start(GDScript *p_script, const StringName &p_function_name, bool p_static, MultiplayerAPI::RPCMode p_rpc_mode, const GDScriptDataType &p_return_type) {
+	function = memnew(GDScriptFunction);
+	debug_stack = EngineDebugger::is_active();
+
+	function->name = p_function_name;
+	function->_script = p_script;
+	function->source = p_script->get_path();
+
+#ifdef DEBUG_ENABLED
+	function->func_cname = (String(function->source) + " - " + String(p_function_name)).utf8();
+	function->_func_cname = function->func_cname.get_data();
+#endif
+
+	function->_static = p_static;
+	function->return_type = p_return_type;
+	function->rpc_mode = p_rpc_mode;
+	function->_argument_count = 0;
+}
+
+GDScriptFunction *GDScriptByteCodeGenerator::write_end() {
+	append(GDScriptFunction::OPCODE_END);
+
+	if (constant_map.size()) {
+		function->_constant_count = constant_map.size();
+		function->constants.resize(constant_map.size());
+		function->_constants_ptr = function->constants.ptrw();
+		const Variant *K = nullptr;
+		while ((K = constant_map.next(K))) {
+			int idx = constant_map[*K];
+			function->constants.write[idx] = *K;
+		}
+	} else {
+		function->_constants_ptr = nullptr;
+		function->_constant_count = 0;
+	}
+
+	if (name_map.size()) {
+		function->global_names.resize(name_map.size());
+		function->_global_names_ptr = &function->global_names[0];
+		for (Map<StringName, int>::Element *E = name_map.front(); E; E = E->next()) {
+			function->global_names.write[E->get()] = E->key();
+		}
+		function->_global_names_count = function->global_names.size();
+
+	} else {
+		function->_global_names_ptr = nullptr;
+		function->_global_names_count = 0;
+	}
+
+	if (opcodes.size()) {
+		function->code = opcodes;
+		function->_code_ptr = &function->code[0];
+		function->_code_size = opcodes.size();
+
+	} else {
+		function->_code_ptr = nullptr;
+		function->_code_size = 0;
+	}
+
+	if (function->default_arguments.size()) {
+		function->_default_arg_count = function->default_arguments.size();
+		function->_default_arg_ptr = &function->default_arguments[0];
+	} else {
+		function->_default_arg_count = 0;
+		function->_default_arg_ptr = nullptr;
+	}
+
+	if (debug_stack) {
+		function->stack_debug = stack_debug;
+	}
+	function->_stack_size = stack_max;
+	function->_call_size = call_max;
+
+	ended = true;
+	return function;
+}
+
+#ifdef DEBUG_ENABLED
+void GDScriptByteCodeGenerator::set_signature(const String &p_signature) {
+	function->profile.signature = p_signature;
+}
+#endif
+
+void GDScriptByteCodeGenerator::set_initial_line(int p_line) {
+	function->_initial_line = p_line;
+}
+
+void GDScriptByteCodeGenerator::write_operator(const Address &p_target, Variant::Operator p_operator, const Address &p_left_operand, const Address &p_right_operand) {
+	append(GDScriptFunction::OPCODE_OPERATOR);
+	append(p_operator);
+	append(p_left_operand);
+	append(p_right_operand);
+	append(p_target);
+}
+
+void GDScriptByteCodeGenerator::write_type_test(const Address &p_target, const Address &p_source, const Address &p_type) {
+	append(GDScriptFunction::OPCODE_EXTENDS_TEST);
+	append(p_source);
+	append(p_type);
+	append(p_target);
+}
+
+void GDScriptByteCodeGenerator::write_type_test_builtin(const Address &p_target, const Address &p_source, Variant::Type p_type) {
+	append(GDScriptFunction::OPCODE_IS_BUILTIN);
+	append(p_source);
+	append(p_type);
+	append(p_target);
+}
+
+void GDScriptByteCodeGenerator::write_and_left_operand(const Address &p_left_operand) {
+	append(GDScriptFunction::OPCODE_JUMP_IF_NOT);
+	append(p_left_operand);
+	logic_op_jump_pos1.push_back(opcodes.size());
+	append(0); // Jump target, will be patched.
+}
+
+void GDScriptByteCodeGenerator::write_and_right_operand(const Address &p_right_operand) {
+	append(GDScriptFunction::OPCODE_JUMP_IF_NOT);
+	append(p_right_operand);
+	logic_op_jump_pos2.push_back(opcodes.size());
+	append(0); // Jump target, will be patched.
+}
+
+void GDScriptByteCodeGenerator::write_end_and(const Address &p_target) {
+	// If here means both operands are true.
+	append(GDScriptFunction::OPCODE_ASSIGN_TRUE);
+	append(p_target);
+	// Jump away from the fail condition.
+	append(GDScriptFunction::OPCODE_JUMP);
+	append(opcodes.size() + 3);
+	// Here it means one of operands is false.
+	patch_jump(logic_op_jump_pos1.back()->get());
+	patch_jump(logic_op_jump_pos2.back()->get());
+	logic_op_jump_pos1.pop_back();
+	logic_op_jump_pos2.pop_back();
+	append(GDScriptFunction::OPCODE_ASSIGN_FALSE);
+	append(p_target);
+}
+
+void GDScriptByteCodeGenerator::write_or_left_operand(const Address &p_left_operand) {
+	append(GDScriptFunction::OPCODE_JUMP_IF);
+	append(p_left_operand);
+	logic_op_jump_pos1.push_back(opcodes.size());
+	append(0); // Jump target, will be patched.
+}
+
+void GDScriptByteCodeGenerator::write_or_right_operand(const Address &p_right_operand) {
+	append(GDScriptFunction::OPCODE_JUMP_IF);
+	append(p_right_operand);
+	logic_op_jump_pos2.push_back(opcodes.size());
+	append(0); // Jump target, will be patched.
+}
+
+void GDScriptByteCodeGenerator::write_end_or(const Address &p_target) {
+	// If here means both operands are false.
+	append(GDScriptFunction::OPCODE_ASSIGN_FALSE);
+	append(p_target);
+	// Jump away from the success condition.
+	append(GDScriptFunction::OPCODE_JUMP);
+	append(opcodes.size() + 3);
+	// Here it means one of operands is false.
+	patch_jump(logic_op_jump_pos1.back()->get());
+	patch_jump(logic_op_jump_pos2.back()->get());
+	logic_op_jump_pos1.pop_back();
+	logic_op_jump_pos2.pop_back();
+	append(GDScriptFunction::OPCODE_ASSIGN_TRUE);
+	append(p_target);
+}
+
+void GDScriptByteCodeGenerator::write_start_ternary(const Address &p_target) {
+	ternary_result.push_back(p_target);
+}
+
+void GDScriptByteCodeGenerator::write_ternary_condition(const Address &p_condition) {
+	append(GDScriptFunction::OPCODE_JUMP_IF_NOT);
+	append(p_condition);
+	ternary_jump_fail_pos.push_back(opcodes.size());
+	append(0); // Jump target, will be patched.
+}
+
+void GDScriptByteCodeGenerator::write_ternary_true_expr(const Address &p_expr) {
+	append(GDScriptFunction::OPCODE_ASSIGN);
+	append(ternary_result.back()->get());
+	append(p_expr);
+	// Jump away from the false path.
+	append(GDScriptFunction::OPCODE_JUMP);
+	ternary_jump_skip_pos.push_back(opcodes.size());
+	append(0);
+	// Fail must jump here.
+	patch_jump(ternary_jump_fail_pos.back()->get());
+	ternary_jump_fail_pos.pop_back();
+}
+
+void GDScriptByteCodeGenerator::write_ternary_false_expr(const Address &p_expr) {
+	append(GDScriptFunction::OPCODE_ASSIGN);
+	append(ternary_result.back()->get());
+	append(p_expr);
+}
+
+void GDScriptByteCodeGenerator::write_end_ternary() {
+	patch_jump(ternary_jump_skip_pos.back()->get());
+	ternary_jump_skip_pos.pop_back();
+}
+
+void GDScriptByteCodeGenerator::write_set(const Address &p_target, const Address &p_index, const Address &p_source) {
+	append(GDScriptFunction::OPCODE_SET);
+	append(p_target);
+	append(p_index);
+	append(p_source);
+}
+
+void GDScriptByteCodeGenerator::write_get(const Address &p_target, const Address &p_index, const Address &p_source) {
+	append(GDScriptFunction::OPCODE_GET);
+	append(p_source);
+	append(p_index);
+	append(p_target);
+}
+
+void GDScriptByteCodeGenerator::write_set_named(const Address &p_target, const StringName &p_name, const Address &p_source) {
+	append(GDScriptFunction::OPCODE_SET_NAMED);
+	append(p_target);
+	append(p_name);
+	append(p_source);
+}
+
+void GDScriptByteCodeGenerator::write_get_named(const Address &p_target, const StringName &p_name, const Address &p_source) {
+	append(GDScriptFunction::OPCODE_GET_NAMED);
+	append(p_source);
+	append(p_name);
+	append(p_target);
+}
+
+void GDScriptByteCodeGenerator::write_set_member(const Address &p_value, const StringName &p_name) {
+	append(GDScriptFunction::OPCODE_SET_MEMBER);
+	append(p_name);
+	append(p_value);
+}
+
+void GDScriptByteCodeGenerator::write_get_member(const Address &p_target, const StringName &p_name) {
+	append(GDScriptFunction::OPCODE_GET_MEMBER);
+	append(p_name);
+	append(p_target);
+}
+
+void GDScriptByteCodeGenerator::write_assign(const Address &p_target, const Address &p_source) {
+	if (p_target.type.has_type && !p_source.type.has_type) {
+		// Typed assignment.
+		switch (p_target.type.kind) {
+			case GDScriptDataType::BUILTIN: {
+				append(GDScriptFunction::OPCODE_ASSIGN_TYPED_BUILTIN);
+				append(p_target.type.builtin_type);
+				append(p_target);
+				append(p_source);
+			} break;
+			case GDScriptDataType::NATIVE: {
+				int class_idx = GDScriptLanguage::get_singleton()->get_global_map()[p_target.type.native_type];
+				class_idx |= (GDScriptFunction::ADDR_TYPE_GLOBAL << GDScriptFunction::ADDR_BITS);
+				append(GDScriptFunction::OPCODE_ASSIGN_TYPED_NATIVE);
+				append(class_idx);
+				append(p_target);
+				append(p_source);
+			} break;
+			case GDScriptDataType::SCRIPT:
+			case GDScriptDataType::GDSCRIPT: {
+				Variant script = p_target.type.script_type;
+				int idx = get_constant_pos(script);
+
+				append(GDScriptFunction::OPCODE_ASSIGN_TYPED_SCRIPT);
+				append(idx);
+				append(p_target);
+				append(p_source);
+			} break;
+			default: {
+				ERR_PRINT("Compiler bug: unresolved assign.");
+
+				// Shouldn't get here, but fail-safe to a regular assignment
+				append(GDScriptFunction::OPCODE_ASSIGN);
+				append(p_target);
+				append(p_source);
+			}
+		}
+	} else {
+		if (p_target.type.kind == GDScriptDataType::BUILTIN && p_source.type.kind == GDScriptDataType::BUILTIN && p_target.type.builtin_type != p_source.type.builtin_type) {
+			// Need conversion..
+			append(GDScriptFunction::OPCODE_ASSIGN_TYPED_BUILTIN);
+			append(p_target.type.builtin_type);
+			append(p_target);
+			append(p_source);
+		} else {
+			// Either untyped assignment or already type-checked by the parser
+			append(GDScriptFunction::OPCODE_ASSIGN);
+			append(p_target);
+			append(p_source);
+		}
+	}
+}
+
+void GDScriptByteCodeGenerator::write_assign_true(const Address &p_target) {
+	append(GDScriptFunction::OPCODE_ASSIGN_TRUE);
+	append(p_target);
+}
+
+void GDScriptByteCodeGenerator::write_assign_false(const Address &p_target) {
+	append(GDScriptFunction::OPCODE_ASSIGN_FALSE);
+	append(p_target);
+}
+
+void GDScriptByteCodeGenerator::write_cast(const Address &p_target, const Address &p_source, const GDScriptDataType &p_type) {
+	switch (p_type.kind) {
+		case GDScriptDataType::BUILTIN: {
+			append(GDScriptFunction::OPCODE_CAST_TO_BUILTIN);
+			append(p_type.builtin_type);
+		} break;
+		case GDScriptDataType::NATIVE: {
+			int class_idx = GDScriptLanguage::get_singleton()->get_global_map()[p_type.native_type];
+			class_idx |= (GDScriptFunction::ADDR_TYPE_GLOBAL << GDScriptFunction::ADDR_BITS);
+			append(GDScriptFunction::OPCODE_CAST_TO_NATIVE);
+			append(class_idx);
+		} break;
+		case GDScriptDataType::SCRIPT:
+		case GDScriptDataType::GDSCRIPT: {
+			Variant script = p_type.script_type;
+			int idx = get_constant_pos(script);
+
+			append(GDScriptFunction::OPCODE_CAST_TO_SCRIPT);
+			append(idx);
+		} break;
+		default: {
+			return;
+		}
+	}
+
+	append(p_source);
+	append(p_target);
+}
+
+void GDScriptByteCodeGenerator::write_call(const Address &p_target, const Address &p_base, const StringName &p_function_name, const Vector<Address> &p_arguments) {
+	append(p_target.mode == Address::NIL ? GDScriptFunction::OPCODE_CALL : GDScriptFunction::OPCODE_CALL_RETURN);
+	append(p_arguments.size());
+	append(p_base);
+	append(p_function_name);
+	for (int i = 0; i < p_arguments.size(); i++) {
+		append(p_arguments[i]);
+	}
+	append(p_target);
+	alloc_call(p_arguments.size());
+}
+
+void GDScriptByteCodeGenerator::write_super_call(const Address &p_target, const StringName &p_function_name, const Vector<Address> &p_arguments) {
+	append(GDScriptFunction::OPCODE_CALL_SELF_BASE);
+	append(p_function_name);
+	append(p_arguments.size());
+	for (int i = 0; i < p_arguments.size(); i++) {
+		append(p_arguments[i]);
+	}
+	append(p_target);
+	alloc_call(p_arguments.size());
+}
+
+void GDScriptByteCodeGenerator::write_call_async(const Address &p_target, const Address &p_base, const StringName &p_function_name, const Vector<Address> &p_arguments) {
+	append(GDScriptFunction::OPCODE_CALL_ASYNC);
+	append(p_arguments.size());
+	append(p_base);
+	append(p_function_name);
+	for (int i = 0; i < p_arguments.size(); i++) {
+		append(p_arguments[i]);
+	}
+	append(p_target);
+	alloc_call(p_arguments.size());
+}
+
+void GDScriptByteCodeGenerator::write_call_builtin(const Address &p_target, GDScriptFunctions::Function p_function, const Vector<Address> &p_arguments) {
+	append(GDScriptFunction::OPCODE_CALL_BUILT_IN);
+	append(p_function);
+	append(p_arguments.size());
+	for (int i = 0; i < p_arguments.size(); i++) {
+		append(p_arguments[i]);
+	}
+	append(p_target);
+	alloc_call(p_arguments.size());
+}
+
+void GDScriptByteCodeGenerator::write_call_method_bind(const Address &p_target, const Address &p_base, const MethodBind *p_method, const Vector<Address> &p_arguments) {
+	append(p_target.mode == Address::NIL ? GDScriptFunction::OPCODE_CALL : GDScriptFunction::OPCODE_CALL_RETURN);
+	append(p_arguments.size());
+	append(p_base);
+	append(p_method->get_name());
+	for (int i = 0; i < p_arguments.size(); i++) {
+		append(p_arguments[i]);
+	}
+	append(p_target);
+	alloc_call(p_arguments.size());
+}
+
+void GDScriptByteCodeGenerator::write_call_ptrcall(const Address &p_target, const Address &p_base, const MethodBind *p_method, const Vector<Address> &p_arguments) {
+	append(p_target.mode == Address::NIL ? GDScriptFunction::OPCODE_CALL : GDScriptFunction::OPCODE_CALL_RETURN);
+	append(p_arguments.size());
+	append(p_base);
+	append(p_method->get_name());
+	for (int i = 0; i < p_arguments.size(); i++) {
+		append(p_arguments[i]);
+	}
+	append(p_target);
+	alloc_call(p_arguments.size());
+}
+
+void GDScriptByteCodeGenerator::write_call_self(const Address &p_target, const StringName &p_function_name, const Vector<Address> &p_arguments) {
+	append(p_target.mode == Address::NIL ? GDScriptFunction::OPCODE_CALL : GDScriptFunction::OPCODE_CALL_RETURN);
+	append(p_arguments.size());
+	append(GDScriptFunction::ADDR_TYPE_SELF << GDScriptFunction::ADDR_BITS);
+	append(p_function_name);
+	for (int i = 0; i < p_arguments.size(); i++) {
+		append(p_arguments[i]);
+	}
+	append(p_target);
+	alloc_call(p_arguments.size());
+}
+
+void GDScriptByteCodeGenerator::write_call_script_function(const Address &p_target, const Address &p_base, const StringName &p_function_name, const Vector<Address> &p_arguments) {
+	append(p_target.mode == Address::NIL ? GDScriptFunction::OPCODE_CALL : GDScriptFunction::OPCODE_CALL_RETURN);
+	append(p_arguments.size());
+	append(p_base);
+	append(p_function_name);
+	for (int i = 0; i < p_arguments.size(); i++) {
+		append(p_arguments[i]);
+	}
+	append(p_target);
+	alloc_call(p_arguments.size());
+}
+
+void GDScriptByteCodeGenerator::write_construct(const Address &p_target, Variant::Type p_type, const Vector<Address> &p_arguments) {
+	append(GDScriptFunction::OPCODE_CONSTRUCT);
+	append(p_type);
+	append(p_arguments.size());
+	for (int i = 0; i < p_arguments.size(); i++) {
+		append(p_arguments[i]);
+	}
+	append(p_target);
+}
+
+void GDScriptByteCodeGenerator::write_construct_array(const Address &p_target, const Vector<Address> &p_arguments) {
+	append(GDScriptFunction::OPCODE_CONSTRUCT_ARRAY);
+	append(p_arguments.size());
+	for (int i = 0; i < p_arguments.size(); i++) {
+		append(p_arguments[i]);
+	}
+	append(p_target);
+}
+
+void GDScriptByteCodeGenerator::write_construct_dictionary(const Address &p_target, const Vector<Address> &p_arguments) {
+	append(GDScriptFunction::OPCODE_CONSTRUCT_DICTIONARY);
+	append(p_arguments.size() / 2); // This is number of key-value pairs, so only half of actual arguments.
+	for (int i = 0; i < p_arguments.size(); i++) {
+		append(p_arguments[i]);
+	}
+	append(p_target);
+}
+
+void GDScriptByteCodeGenerator::write_await(const Address &p_target, const Address &p_operand) {
+	append(GDScriptFunction::OPCODE_AWAIT);
+	append(p_operand);
+	append(GDScriptFunction::OPCODE_AWAIT_RESUME);
+	append(p_target);
+}
+
+void GDScriptByteCodeGenerator::write_if(const Address &p_condition) {
+	append(GDScriptFunction::OPCODE_JUMP_IF_NOT);
+	append(p_condition);
+	if_jmp_addrs.push_back(opcodes.size());
+	append(0); // Jump destination, will be patched.
+}
+
+void GDScriptByteCodeGenerator::write_else() {
+	append(GDScriptFunction::OPCODE_JUMP); // Jump from true if block;
+	int else_jmp_addr = opcodes.size();
+	append(0); // Jump destination, will be patched.
+
+	patch_jump(if_jmp_addrs.back()->get());
+	if_jmp_addrs.pop_back();
+	if_jmp_addrs.push_back(else_jmp_addr);
+}
+
+void GDScriptByteCodeGenerator::write_endif() {
+	patch_jump(if_jmp_addrs.back()->get());
+	if_jmp_addrs.pop_back();
+}
+
+void GDScriptByteCodeGenerator::write_for(const Address &p_variable, const Address &p_list) {
+	int counter_pos = increase_stack() | (GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS);
+	int container_pos = increase_stack() | (GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS);
+
+	current_breaks_to_patch.push_back(List<int>());
+
+	// Assign container.
+	append(GDScriptFunction::OPCODE_ASSIGN);
+	append(container_pos);
+	append(p_list);
+
+	// Begin loop.
+	append(GDScriptFunction::OPCODE_ITERATE_BEGIN);
+	append(counter_pos);
+	append(container_pos);
+	for_jmp_addrs.push_back(opcodes.size());
+	append(0); // End of loop address, will be patched.
+	append(p_variable);
+	append(GDScriptFunction::OPCODE_JUMP);
+	append(opcodes.size() + 6); // Skip over 'continue' code.
+
+	// Next iteration.
+	int continue_addr = opcodes.size();
+	continue_addrs.push_back(continue_addr);
+	append(GDScriptFunction::OPCODE_ITERATE);
+	append(counter_pos);
+	append(container_pos);
+	for_jmp_addrs.push_back(opcodes.size());
+	append(0); // Jump destination, will be patched.
+	append(p_variable);
+}
+
+void GDScriptByteCodeGenerator::write_endfor() {
+	// Jump back to loop check.
+	append(GDScriptFunction::OPCODE_JUMP);
+	append(continue_addrs.back()->get());
+	continue_addrs.pop_back();
+
+	// Patch end jumps (two of them).
+	for (int i = 0; i < 2; i++) {
+		patch_jump(for_jmp_addrs.back()->get());
+		for_jmp_addrs.pop_back();
+	}
+
+	// Patch break statements.
+	for (const List<int>::Element *E = current_breaks_to_patch.back()->get().front(); E; E = E->next()) {
+		patch_jump(E->get());
+	}
+	current_breaks_to_patch.pop_back();
+
+	current_stack_size -= 2; // Remove loop temporaries.
+}
+
+void GDScriptByteCodeGenerator::start_while_condition() {
+	current_breaks_to_patch.push_back(List<int>());
+	continue_addrs.push_back(opcodes.size());
+}
+
+void GDScriptByteCodeGenerator::write_while(const Address &p_condition) {
+	// Condition check.
+	append(GDScriptFunction::OPCODE_JUMP_IF_NOT);
+	append(p_condition);
+	while_jmp_addrs.push_back(opcodes.size());
+	append(0); // End of loop address, will be patched.
+}
+
+void GDScriptByteCodeGenerator::write_endwhile() {
+	// Jump back to loop check.
+	append(GDScriptFunction::OPCODE_JUMP);
+	append(continue_addrs.back()->get());
+	continue_addrs.pop_back();
+
+	// Patch end jump.
+	patch_jump(while_jmp_addrs.back()->get());
+	while_jmp_addrs.pop_back();
+
+	// Patch break statements.
+	for (const List<int>::Element *E = current_breaks_to_patch.back()->get().front(); E; E = E->next()) {
+		patch_jump(E->get());
+	}
+	current_breaks_to_patch.pop_back();
+}
+
+void GDScriptByteCodeGenerator::start_match() {
+	match_continues_to_patch.push_back(List<int>());
+}
+
+void GDScriptByteCodeGenerator::start_match_branch() {
+	// Patch continue statements.
+	for (const List<int>::Element *E = match_continues_to_patch.back()->get().front(); E; E = E->next()) {
+		patch_jump(E->get());
+	}
+	match_continues_to_patch.pop_back();
+	// Start a new list for next branch.
+	match_continues_to_patch.push_back(List<int>());
+}
+
+void GDScriptByteCodeGenerator::end_match() {
+	// Patch continue statements.
+	for (const List<int>::Element *E = match_continues_to_patch.back()->get().front(); E; E = E->next()) {
+		patch_jump(E->get());
+	}
+	match_continues_to_patch.pop_back();
+}
+
+void GDScriptByteCodeGenerator::write_break() {
+	append(GDScriptFunction::OPCODE_JUMP);
+	current_breaks_to_patch.back()->get().push_back(opcodes.size());
+	append(0);
+}
+
+void GDScriptByteCodeGenerator::write_continue() {
+	append(GDScriptFunction::OPCODE_JUMP);
+	append(continue_addrs.back()->get());
+}
+
+void GDScriptByteCodeGenerator::write_continue_match() {
+	append(GDScriptFunction::OPCODE_JUMP);
+	match_continues_to_patch.back()->get().push_back(opcodes.size());
+	append(0);
+}
+
+void GDScriptByteCodeGenerator::write_breakpoint() {
+	append(GDScriptFunction::OPCODE_BREAKPOINT);
+}
+
+void GDScriptByteCodeGenerator::write_newline(int p_line) {
+	append(GDScriptFunction::OPCODE_LINE);
+	append(p_line);
+	current_line = p_line;
+}
+
+void GDScriptByteCodeGenerator::write_return(const Address &p_return_value) {
+	append(GDScriptFunction::OPCODE_RETURN);
+	append(p_return_value);
+}
+
+void GDScriptByteCodeGenerator::write_assert(const Address &p_test, const Address &p_message) {
+	append(GDScriptFunction::OPCODE_ASSERT);
+	append(p_test);
+	append(p_message);
+}
+
+void GDScriptByteCodeGenerator::start_block() {
+	push_stack_identifiers();
+}
+
+void GDScriptByteCodeGenerator::end_block() {
+	pop_stack_identifiers();
+}
+
+GDScriptByteCodeGenerator::~GDScriptByteCodeGenerator() {
+	if (!ended && function != nullptr) {
+		memdelete(function);
+	}
+}
diff --git a/modules/gdscript/gdscript_byte_codegen.h b/modules/gdscript/gdscript_byte_codegen.h
new file mode 100644
index 0000000000..62438b6dd2
--- /dev/null
+++ b/modules/gdscript/gdscript_byte_codegen.h
@@ -0,0 +1,277 @@
+/*************************************************************************/
+/*  gdscript_byte_codegen.h                                              */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef GDSCRIPT_BYTE_CODEGEN
+#define GDSCRIPT_BYTE_CODEGEN
+
+#include "gdscript_codegen.h"
+
+class GDScriptByteCodeGenerator : public GDScriptCodeGenerator {
+	bool ended = false;
+	GDScriptFunction *function = nullptr;
+	bool debug_stack = false;
+
+	Vector<int> opcodes;
+	List<Map<StringName, int>> stack_id_stack;
+	Map<StringName, int> stack_identifiers;
+	Map<StringName, int> local_constants;
+
+	List<GDScriptFunction::StackDebug> stack_debug;
+	List<Map<StringName, int>> block_identifier_stack;
+	Map<StringName, int> block_identifiers;
+
+	int current_stack_size = 0;
+	int current_temporaries = 0;
+
+	HashMap<Variant, int, VariantHasher, VariantComparator> constant_map;
+	Map<StringName, int> name_map;
+#ifdef TOOLS_ENABLED
+	Vector<StringName> named_globals;
+#endif
+	int current_line = 0;
+	int stack_max = 0;
+	int call_max = 0;
+
+	List<int> if_jmp_addrs; // List since this can be nested.
+	List<int> for_jmp_addrs;
+	List<int> while_jmp_addrs;
+	List<int> continue_addrs;
+
+	// Used to patch jumps with `and` and `or` operators with short-circuit.
+	List<int> logic_op_jump_pos1;
+	List<int> logic_op_jump_pos2;
+
+	List<Address> ternary_result;
+	List<int> ternary_jump_fail_pos;
+	List<int> ternary_jump_skip_pos;
+
+	List<List<int>> current_breaks_to_patch;
+	List<List<int>> match_continues_to_patch;
+
+	void add_stack_identifier(const StringName &p_id, int p_stackpos) {
+		stack_identifiers[p_id] = p_stackpos;
+		if (debug_stack) {
+			block_identifiers[p_id] = p_stackpos;
+			GDScriptFunction::StackDebug sd;
+			sd.added = true;
+			sd.line = current_line;
+			sd.identifier = p_id;
+			sd.pos = p_stackpos;
+			stack_debug.push_back(sd);
+		}
+	}
+
+	void push_stack_identifiers() {
+		stack_id_stack.push_back(stack_identifiers);
+		if (debug_stack) {
+			block_identifier_stack.push_back(block_identifiers);
+			block_identifiers.clear();
+		}
+	}
+
+	void pop_stack_identifiers() {
+		stack_identifiers = stack_id_stack.back()->get();
+		current_stack_size = stack_identifiers.size() + current_temporaries;
+		stack_id_stack.pop_back();
+
+		if (debug_stack) {
+			for (Map<StringName, int>::Element *E = block_identifiers.front(); E; E = E->next()) {
+				GDScriptFunction::StackDebug sd;
+				sd.added = false;
+				sd.identifier = E->key();
+				sd.line = current_line;
+				sd.pos = E->get();
+				stack_debug.push_back(sd);
+			}
+			block_identifiers = block_identifier_stack.back()->get();
+			block_identifier_stack.pop_back();
+		}
+	}
+
+	int get_name_map_pos(const StringName &p_identifier) {
+		int ret;
+		if (!name_map.has(p_identifier)) {
+			ret = name_map.size();
+			name_map[p_identifier] = ret;
+		} else {
+			ret = name_map[p_identifier];
+		}
+		return ret;
+	}
+
+	int get_constant_pos(const Variant &p_constant) {
+		if (constant_map.has(p_constant))
+			return constant_map[p_constant];
+		int pos = constant_map.size();
+		constant_map[p_constant] = pos;
+		return pos;
+	}
+
+	void alloc_stack(int p_level) {
+		if (p_level >= stack_max)
+			stack_max = p_level + 1;
+	}
+
+	void alloc_call(int p_params) {
+		if (p_params >= call_max)
+			call_max = p_params;
+	}
+
+	int increase_stack() {
+		int top = current_stack_size++;
+		alloc_stack(current_stack_size);
+		return top;
+	}
+
+	int address_of(const Address &p_address) {
+		switch (p_address.mode) {
+			case Address::SELF:
+				return GDScriptFunction::ADDR_TYPE_SELF << GDScriptFunction::ADDR_BITS;
+			case Address::CLASS:
+				return GDScriptFunction::ADDR_TYPE_CLASS << GDScriptFunction::ADDR_BITS;
+			case Address::MEMBER:
+				return p_address.address | (GDScriptFunction::ADDR_TYPE_MEMBER << GDScriptFunction::ADDR_BITS);
+			case Address::CLASS_CONSTANT:
+				return p_address.address | (GDScriptFunction::ADDR_TYPE_CLASS_CONSTANT << GDScriptFunction::ADDR_BITS);
+			case Address::LOCAL_CONSTANT:
+			case Address::CONSTANT:
+				return p_address.address | (GDScriptFunction::ADDR_TYPE_LOCAL_CONSTANT << GDScriptFunction::ADDR_BITS);
+			case Address::LOCAL_VARIABLE:
+			case Address::TEMPORARY:
+			case Address::FUNCTION_PARAMETER:
+				return p_address.address | (GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS);
+			case Address::GLOBAL:
+				return p_address.address | (GDScriptFunction::ADDR_TYPE_GLOBAL << GDScriptFunction::ADDR_BITS);
+			case Address::NAMED_GLOBAL:
+				return p_address.address | (GDScriptFunction::ADDR_TYPE_NAMED_GLOBAL << GDScriptFunction::ADDR_BITS);
+			case Address::NIL:
+				return GDScriptFunction::ADDR_TYPE_NIL << GDScriptFunction::ADDR_BITS;
+		}
+		return -1; // Unreachable.
+	}
+
+	void append(int code) {
+		opcodes.push_back(code);
+	}
+
+	void append(const Address &p_address) {
+		opcodes.push_back(address_of(p_address));
+	}
+
+	void append(const StringName &p_name) {
+		opcodes.push_back(get_name_map_pos(p_name));
+	}
+
+	void patch_jump(int p_address) {
+		opcodes.write[p_address] = opcodes.size();
+	}
+
+public:
+	virtual uint32_t add_parameter(const StringName &p_name, bool p_is_optional, const GDScriptDataType &p_type) override;
+	virtual uint32_t add_local(const StringName &p_name, const GDScriptDataType &p_type) override;
+	virtual uint32_t add_local_constant(const StringName &p_name, const Variant &p_constant) override;
+	virtual uint32_t add_or_get_constant(const Variant &p_constant) override;
+	virtual uint32_t add_or_get_name(const StringName &p_name) override;
+	virtual uint32_t add_temporary() override;
+	virtual void pop_temporary() override;
+
+	virtual void start_parameters() override;
+	virtual void end_parameters() override;
+
+	virtual void start_block() override;
+	virtual void end_block() override;
+
+	virtual void write_start(GDScript *p_script, const StringName &p_function_name, bool p_static, MultiplayerAPI::RPCMode p_rpc_mode, const GDScriptDataType &p_return_type) override;
+	virtual GDScriptFunction *write_end() override;
+
+#ifdef DEBUG_ENABLED
+	virtual void set_signature(const String &p_signature) override;
+#endif
+	virtual void set_initial_line(int p_line) override;
+
+	virtual void write_operator(const Address &p_target, Variant::Operator p_operator, const Address &p_left_operand, const Address &p_right_operand) override;
+	virtual void write_type_test(const Address &p_target, const Address &p_source, const Address &p_type) override;
+	virtual void write_type_test_builtin(const Address &p_target, const Address &p_source, Variant::Type p_type) override;
+	virtual void write_and_left_operand(const Address &p_left_operand) override;
+	virtual void write_and_right_operand(const Address &p_right_operand) override;
+	virtual void write_end_and(const Address &p_target) override;
+	virtual void write_or_left_operand(const Address &p_left_operand) override;
+	virtual void write_or_right_operand(const Address &p_right_operand) override;
+	virtual void write_end_or(const Address &p_target) override;
+	virtual void write_start_ternary(const Address &p_target) override;
+	virtual void write_ternary_condition(const Address &p_condition) override;
+	virtual void write_ternary_true_expr(const Address &p_expr) override;
+	virtual void write_ternary_false_expr(const Address &p_expr) override;
+	virtual void write_end_ternary() override;
+	virtual void write_set(const Address &p_target, const Address &p_index, const Address &p_source) override;
+	virtual void write_get(const Address &p_target, const Address &p_index, const Address &p_source) override;
+	virtual void write_set_named(const Address &p_target, const StringName &p_name, const Address &p_source) override;
+	virtual void write_get_named(const Address &p_target, const StringName &p_name, const Address &p_source) override;
+	virtual void write_set_member(const Address &p_value, const StringName &p_name) override;
+	virtual void write_get_member(const Address &p_target, const StringName &p_name) override;
+	virtual void write_assign(const Address &p_target, const Address &p_source) override;
+	virtual void write_assign_true(const Address &p_target) override;
+	virtual void write_assign_false(const Address &p_target) override;
+	virtual void write_cast(const Address &p_target, const Address &p_source, const GDScriptDataType &p_type) override;
+	virtual void write_call(const Address &p_target, const Address &p_base, const StringName &p_function_name, const Vector<Address> &p_arguments) override;
+	virtual void write_super_call(const Address &p_target, const StringName &p_function_name, const Vector<Address> &p_arguments) override;
+	virtual void write_call_async(const Address &p_target, const Address &p_base, const StringName &p_function_name, const Vector<Address> &p_arguments) override;
+	virtual void write_call_builtin(const Address &p_target, GDScriptFunctions::Function p_function, const Vector<Address> &p_arguments) override;
+	virtual void write_call_method_bind(const Address &p_target, const Address &p_base, const MethodBind *p_method, const Vector<Address> &p_arguments) override;
+	virtual void write_call_ptrcall(const Address &p_target, const Address &p_base, const MethodBind *p_method, const Vector<Address> &p_arguments) override;
+	virtual void write_call_self(const Address &p_target, const StringName &p_function_name, const Vector<Address> &p_arguments) override;
+	virtual void write_call_script_function(const Address &p_target, const Address &p_base, const StringName &p_function_name, const Vector<Address> &p_arguments) override;
+	virtual void write_construct(const Address &p_target, Variant::Type p_type, const Vector<Address> &p_arguments) override;
+	virtual void write_construct_array(const Address &p_target, const Vector<Address> &p_arguments) override;
+	virtual void write_construct_dictionary(const Address &p_target, const Vector<Address> &p_arguments) override;
+	virtual void write_await(const Address &p_target, const Address &p_operand) override;
+	virtual void write_if(const Address &p_condition) override;
+	virtual void write_else() override;
+	virtual void write_endif() override;
+	virtual void write_for(const Address &p_variable, const Address &p_list) override;
+	virtual void write_endfor() override;
+	virtual void start_while_condition() override;
+	virtual void write_while(const Address &p_condition) override;
+	virtual void write_endwhile() override;
+	virtual void start_match() override;
+	virtual void start_match_branch() override;
+	virtual void end_match() override;
+	virtual void write_break() override;
+	virtual void write_continue() override;
+	virtual void write_continue_match() override;
+	virtual void write_breakpoint() override;
+	virtual void write_newline(int p_line) override;
+	virtual void write_return(const Address &p_return_value) override;
+	virtual void write_assert(const Address &p_test, const Address &p_message) override;
+
+	virtual ~GDScriptByteCodeGenerator();
+};
+
+#endif // GDSCRIPT_BYTE_CODEGEN
diff --git a/modules/gdscript/gdscript_cache.cpp b/modules/gdscript/gdscript_cache.cpp
new file mode 100644
index 0000000000..57b95f5b21
--- /dev/null
+++ b/modules/gdscript/gdscript_cache.cpp
@@ -0,0 +1,255 @@
+/*************************************************************************/
+/*  gdscript_cache.cpp                                                   */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "gdscript_cache.h"
+
+#include "core/os/file_access.h"
+#include "core/vector.h"
+#include "gdscript.h"
+#include "gdscript_analyzer.h"
+#include "gdscript_parser.h"
+
+bool GDScriptParserRef::is_valid() const {
+	return parser != nullptr;
+}
+
+GDScriptParserRef::Status GDScriptParserRef::get_status() const {
+	return status;
+}
+
+GDScriptParser *GDScriptParserRef::get_parser() const {
+	return parser;
+}
+
+Error GDScriptParserRef::raise_status(Status p_new_status) {
+	ERR_FAIL_COND_V(parser == nullptr, ERR_INVALID_DATA);
+
+	Error result = OK;
+
+	while (p_new_status > status) {
+		switch (status) {
+			case EMPTY:
+				result = parser->parse(GDScriptCache::get_source_code(path), path, false);
+				status = PARSED;
+				break;
+			case PARSED: {
+				analyzer = memnew(GDScriptAnalyzer(parser));
+				Error inheritance_result = analyzer->resolve_inheritance();
+				status = INHERITANCE_SOLVED;
+				if (result == OK) {
+					result = inheritance_result;
+				}
+			} break;
+			case INHERITANCE_SOLVED: {
+				Error interface_result = analyzer->resolve_interface();
+				status = INTERFACE_SOLVED;
+				if (result == OK) {
+					result = interface_result;
+				}
+			} break;
+			case INTERFACE_SOLVED: {
+				Error body_result = analyzer->resolve_body();
+				status = FULLY_SOLVED;
+				if (result == OK) {
+					result = body_result;
+				}
+			} break;
+			case FULLY_SOLVED: {
+				return result;
+			}
+		}
+		if (result != OK) {
+			if (parser != nullptr) {
+				memdelete(parser);
+				parser = nullptr;
+			}
+			if (analyzer != nullptr) {
+				memdelete(analyzer);
+				analyzer = nullptr;
+			}
+			return result;
+		}
+	}
+
+	return result;
+}
+
+GDScriptParserRef::~GDScriptParserRef() {
+	if (parser != nullptr) {
+		memdelete(parser);
+	}
+	if (analyzer != nullptr) {
+		memdelete(analyzer);
+	}
+	MutexLock lock(GDScriptCache::singleton->lock);
+	GDScriptCache::singleton->parser_map.erase(path);
+}
+
+GDScriptCache *GDScriptCache::singleton = nullptr;
+
+void GDScriptCache::remove_script(const String &p_path) {
+	MutexLock lock(singleton->lock);
+	singleton->shallow_gdscript_cache.erase(p_path);
+	singleton->full_gdscript_cache.erase(p_path);
+}
+
+Ref<GDScriptParserRef> GDScriptCache::get_parser(const String &p_path, GDScriptParserRef::Status p_status, Error &r_error, const String &p_owner) {
+	MutexLock lock(singleton->lock);
+	Ref<GDScriptParserRef> ref;
+	if (p_owner != String()) {
+		singleton->dependencies[p_owner].insert(p_path);
+	}
+	if (singleton->parser_map.has(p_path)) {
+		ref = Ref<GDScriptParserRef>(singleton->parser_map[p_path]);
+	} else {
+		if (!FileAccess::exists(p_path)) {
+			r_error = ERR_FILE_NOT_FOUND;
+			return ref;
+		}
+		GDScriptParser *parser = memnew(GDScriptParser);
+		ref.instance();
+		ref->parser = parser;
+		ref->path = p_path;
+		singleton->parser_map[p_path] = ref.ptr();
+	}
+
+	r_error = ref->raise_status(p_status);
+
+	return ref;
+}
+
+String GDScriptCache::get_source_code(const String &p_path) {
+	Vector<uint8_t> source_file;
+	Error err;
+	FileAccessRef f = FileAccess::open(p_path, FileAccess::READ, &err);
+	if (err) {
+		ERR_FAIL_COND_V(err, "");
+	}
+
+	int len = f->get_len();
+	source_file.resize(len + 1);
+	int r = f->get_buffer(source_file.ptrw(), len);
+	f->close();
+	ERR_FAIL_COND_V(r != len, "");
+	source_file.write[len] = 0;
+
+	String source;
+	if (source.parse_utf8((const char *)source_file.ptr())) {
+		ERR_FAIL_V_MSG("", "Script '" + p_path + "' contains invalid unicode (UTF-8), so it was not loaded. Please ensure that scripts are saved in valid UTF-8 unicode.");
+	}
+	return source;
+}
+
+Ref<GDScript> GDScriptCache::get_shallow_script(const String &p_path, const String &p_owner) {
+	MutexLock lock(singleton->lock);
+	if (p_owner != String()) {
+		singleton->dependencies[p_owner].insert(p_path);
+	}
+	if (singleton->full_gdscript_cache.has(p_path)) {
+		return singleton->full_gdscript_cache[p_path];
+	}
+	if (singleton->shallow_gdscript_cache.has(p_path)) {
+		return singleton->shallow_gdscript_cache[p_path];
+	}
+
+	Ref<GDScript> script;
+	script.instance();
+	script->set_path(p_path, true);
+	script->set_script_path(p_path);
+	script->load_source_code(p_path);
+
+	singleton->shallow_gdscript_cache[p_path] = script.ptr();
+	return script;
+}
+
+Ref<GDScript> GDScriptCache::get_full_script(const String &p_path, Error &r_error, const String &p_owner) {
+	MutexLock lock(singleton->lock);
+
+	if (p_owner != String()) {
+		singleton->dependencies[p_owner].insert(p_path);
+	}
+
+	r_error = OK;
+	if (singleton->full_gdscript_cache.has(p_path)) {
+		return singleton->full_gdscript_cache[p_path];
+	}
+	Ref<GDScript> script = get_shallow_script(p_path);
+
+	r_error = script->load_source_code(p_path);
+
+	if (r_error) {
+		return script;
+	}
+
+	r_error = script->reload();
+	if (r_error) {
+		return script;
+	}
+
+	singleton->full_gdscript_cache[p_path] = script.ptr();
+	singleton->shallow_gdscript_cache.erase(p_path);
+
+	return script;
+}
+
+Error GDScriptCache::finish_compiling(const String &p_owner) {
+	// Mark this as compiled.
+	Ref<GDScript> script = get_shallow_script(p_owner);
+	singleton->full_gdscript_cache[p_owner] = script.ptr();
+	singleton->shallow_gdscript_cache.erase(p_owner);
+
+	Set<String> depends = singleton->dependencies[p_owner];
+
+	Error err = OK;
+	for (const Set<String>::Element *E = depends.front(); E != nullptr; E = E->next()) {
+		Error this_err = OK;
+		// No need to save the script. We assume it's already referenced in the owner.
+		get_full_script(E->get(), this_err);
+
+		if (this_err != OK) {
+			err = this_err;
+		}
+	}
+
+	singleton->dependencies.erase(p_owner);
+
+	return err;
+}
+
+GDScriptCache::GDScriptCache() {
+	singleton = this;
+}
+
+GDScriptCache::~GDScriptCache() {
+	parser_map.clear();
+	shallow_gdscript_cache.clear();
+	full_gdscript_cache.clear();
+	singleton = nullptr;
+}
diff --git a/modules/gdscript/gdscript_cache.h b/modules/gdscript/gdscript_cache.h
new file mode 100644
index 0000000000..865df34051
--- /dev/null
+++ b/modules/gdscript/gdscript_cache.h
@@ -0,0 +1,97 @@
+/*************************************************************************/
+/*  gdscript_cache.h                                                     */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef GDSCRIPT_CACHE_H
+#define GDSCRIPT_CACHE_H
+
+#include "core/hash_map.h"
+#include "core/os/mutex.h"
+#include "core/reference.h"
+#include "core/set.h"
+#include "gdscript.h"
+
+class GDScriptAnalyzer;
+class GDScriptParser;
+
+class GDScriptParserRef : public Reference {
+public:
+	enum Status {
+		EMPTY,
+		PARSED,
+		INHERITANCE_SOLVED,
+		INTERFACE_SOLVED,
+		FULLY_SOLVED,
+	};
+
+private:
+	GDScriptParser *parser = nullptr;
+	GDScriptAnalyzer *analyzer = nullptr;
+	Status status = EMPTY;
+	String path;
+
+	friend class GDScriptCache;
+
+public:
+	bool is_valid() const;
+	Status get_status() const;
+	GDScriptParser *get_parser() const;
+	Error raise_status(Status p_new_status);
+
+	GDScriptParserRef() {}
+	~GDScriptParserRef();
+};
+
+class GDScriptCache {
+	// String key is full path.
+	HashMap<String, GDScriptParserRef *> parser_map;
+	HashMap<String, GDScript *> shallow_gdscript_cache;
+	HashMap<String, GDScript *> full_gdscript_cache;
+	HashMap<String, Set<String>> dependencies;
+
+	friend class GDScript;
+	friend class GDScriptParserRef;
+
+	static GDScriptCache *singleton;
+
+	Mutex lock;
+	static void remove_script(const String &p_path);
+
+public:
+	static Ref<GDScriptParserRef> get_parser(const String &p_path, GDScriptParserRef::Status status, Error &r_error, const String &p_owner = String());
+	static String get_source_code(const String &p_path);
+	static Ref<GDScript> get_shallow_script(const String &p_path, const String &p_owner = String());
+	static Ref<GDScript> get_full_script(const String &p_path, Error &r_error, const String &p_owner = String());
+	static Error finish_compiling(const String &p_owner);
+
+	GDScriptCache();
+	~GDScriptCache();
+};
+
+#endif // GDSCRIPT_CACHE_H
diff --git a/modules/gdscript/gdscript_codegen.h b/modules/gdscript/gdscript_codegen.h
new file mode 100644
index 0000000000..31e1e6ba23
--- /dev/null
+++ b/modules/gdscript/gdscript_codegen.h
@@ -0,0 +1,160 @@
+/*************************************************************************/
+/*  gdscript_codegen.h                                                   */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef GDSCRIPT_CODEGEN
+#define GDSCRIPT_CODEGEN
+
+#include "core/io/multiplayer_api.h"
+#include "core/string_name.h"
+#include "core/variant.h"
+#include "gdscript_function.h"
+#include "gdscript_functions.h"
+
+class GDScriptCodeGenerator {
+public:
+	struct Address {
+		enum AddressMode {
+			SELF,
+			CLASS,
+			MEMBER,
+			CONSTANT,
+			CLASS_CONSTANT,
+			LOCAL_CONSTANT,
+			LOCAL_VARIABLE,
+			FUNCTION_PARAMETER,
+			TEMPORARY,
+			GLOBAL,
+			NAMED_GLOBAL,
+			NIL,
+		};
+		AddressMode mode = NIL;
+		uint32_t address = 0;
+		GDScriptDataType type;
+
+		Address() {}
+		Address(AddressMode p_mode, const GDScriptDataType &p_type = GDScriptDataType()) {
+			mode = p_mode;
+			type = p_type;
+		}
+		Address(AddressMode p_mode, uint32_t p_address, const GDScriptDataType &p_type = GDScriptDataType()) {
+			mode = p_mode,
+			address = p_address;
+			type = p_type;
+		}
+	};
+
+	virtual uint32_t add_parameter(const StringName &p_name, bool p_is_optional, const GDScriptDataType &p_type) = 0;
+	virtual uint32_t add_local(const StringName &p_name, const GDScriptDataType &p_type) = 0;
+	virtual uint32_t add_local_constant(const StringName &p_name, const Variant &p_constant) = 0;
+	virtual uint32_t add_or_get_constant(const Variant &p_constant) = 0;
+	virtual uint32_t add_or_get_name(const StringName &p_name) = 0;
+	virtual uint32_t add_temporary() = 0;
+	virtual void pop_temporary() = 0;
+
+	virtual void start_parameters() = 0;
+	virtual void end_parameters() = 0;
+
+	virtual void start_block() = 0;
+	virtual void end_block() = 0;
+
+	// virtual int get_max_stack_level() = 0;
+	// virtual int get_max_function_arguments() = 0;
+
+	virtual void write_start(GDScript *p_script, const StringName &p_function_name, bool p_static, MultiplayerAPI::RPCMode p_rpc_mode, const GDScriptDataType &p_return_type) = 0;
+	virtual GDScriptFunction *write_end() = 0;
+
+#ifdef DEBUG_ENABLED
+	virtual void set_signature(const String &p_signature) = 0;
+#endif
+	virtual void set_initial_line(int p_line) = 0;
+
+	// virtual void alloc_stack(int p_level) = 0; // Is this needed?
+	// virtual void alloc_call(int p_arg_count) = 0; // This might be automatic from other functions.
+
+	virtual void write_operator(const Address &p_target, Variant::Operator p_operator, const Address &p_left_operand, const Address &p_right_operand) = 0;
+	virtual void write_type_test(const Address &p_target, const Address &p_source, const Address &p_type) = 0;
+	virtual void write_type_test_builtin(const Address &p_target, const Address &p_source, Variant::Type p_type) = 0;
+	virtual void write_and_left_operand(const Address &p_left_operand) = 0;
+	virtual void write_and_right_operand(const Address &p_right_operand) = 0;
+	virtual void write_end_and(const Address &p_target) = 0;
+	virtual void write_or_left_operand(const Address &p_left_operand) = 0;
+	virtual void write_or_right_operand(const Address &p_right_operand) = 0;
+	virtual void write_end_or(const Address &p_target) = 0;
+	virtual void write_start_ternary(const Address &p_target) = 0;
+	virtual void write_ternary_condition(const Address &p_condition) = 0;
+	virtual void write_ternary_true_expr(const Address &p_expr) = 0;
+	virtual void write_ternary_false_expr(const Address &p_expr) = 0;
+	virtual void write_end_ternary() = 0;
+	virtual void write_set(const Address &p_target, const Address &p_index, const Address &p_source) = 0;
+	virtual void write_get(const Address &p_target, const Address &p_index, const Address &p_source) = 0;
+	virtual void write_set_named(const Address &p_target, const StringName &p_name, const Address &p_source) = 0;
+	virtual void write_get_named(const Address &p_target, const StringName &p_name, const Address &p_source) = 0;
+	virtual void write_set_member(const Address &p_value, const StringName &p_name) = 0;
+	virtual void write_get_member(const Address &p_target, const StringName &p_name) = 0;
+	virtual void write_assign(const Address &p_target, const Address &p_source) = 0;
+	virtual void write_assign_true(const Address &p_target) = 0;
+	virtual void write_assign_false(const Address &p_target) = 0;
+	virtual void write_cast(const Address &p_target, const Address &p_source, const GDScriptDataType &p_type) = 0;
+	virtual void write_call(const Address &p_target, const Address &p_base, const StringName &p_function_name, const Vector<Address> &p_arguments) = 0;
+	virtual void write_super_call(const Address &p_target, const StringName &p_function_name, const Vector<Address> &p_arguments) = 0;
+	virtual void write_call_async(const Address &p_target, const Address &p_base, const StringName &p_function_name, const Vector<Address> &p_arguments) = 0;
+	virtual void write_call_builtin(const Address &p_target, GDScriptFunctions::Function p_function, const Vector<Address> &p_arguments) = 0;
+	virtual void write_call_method_bind(const Address &p_target, const Address &p_base, const MethodBind *p_method, const Vector<Address> &p_arguments) = 0;
+	virtual void write_call_ptrcall(const Address &p_target, const Address &p_base, const MethodBind *p_method, const Vector<Address> &p_arguments) = 0;
+	virtual void write_call_self(const Address &p_target, const StringName &p_function_name, const Vector<Address> &p_arguments) = 0;
+	virtual void write_call_script_function(const Address &p_target, const Address &p_base, const StringName &p_function_name, const Vector<Address> &p_arguments) = 0;
+	virtual void write_construct(const Address &p_target, Variant::Type p_type, const Vector<Address> &p_arguments) = 0;
+	virtual void write_construct_array(const Address &p_target, const Vector<Address> &p_arguments) = 0;
+	virtual void write_construct_dictionary(const Address &p_target, const Vector<Address> &p_arguments) = 0;
+	virtual void write_await(const Address &p_target, const Address &p_operand) = 0;
+	virtual void write_if(const Address &p_condition) = 0;
+	// virtual void write_elseif(const Address &p_condition) = 0; This kind of makes things more difficult for no real benefit.
+	virtual void write_else() = 0;
+	virtual void write_endif() = 0;
+	virtual void write_for(const Address &p_variable, const Address &p_list) = 0;
+	virtual void write_endfor() = 0;
+	virtual void start_while_condition() = 0; // Used to allow a jump to the expression evaluation.
+	virtual void write_while(const Address &p_condition) = 0;
+	virtual void write_endwhile() = 0;
+	virtual void start_match() = 0;
+	virtual void start_match_branch() = 0;
+	virtual void end_match() = 0;
+	virtual void write_break() = 0;
+	virtual void write_continue() = 0;
+	virtual void write_continue_match() = 0;
+	virtual void write_breakpoint() = 0;
+	virtual void write_newline(int p_line) = 0;
+	virtual void write_return(const Address &p_return_value) = 0;
+	virtual void write_assert(const Address &p_test, const Address &p_message) = 0;
+
+	virtual ~GDScriptCodeGenerator() {}
+};
+
+#endif // GDSCRIPT_CODEGEN
diff --git a/modules/gdscript/gdscript_compiler.cpp b/modules/gdscript/gdscript_compiler.cpp
index fba1b992ec..bad450c9f9 100644
--- a/modules/gdscript/gdscript_compiler.cpp
+++ b/modules/gdscript/gdscript_compiler.cpp
@@ -31,26 +31,28 @@
 #include "gdscript_compiler.h"
 
 #include "gdscript.h"
+#include "gdscript_byte_codegen.h"
+#include "gdscript_cache.h"
 
 bool GDScriptCompiler::_is_class_member_property(CodeGen &codegen, const StringName &p_name) {
-
-	if (codegen.function_node && codegen.function_node->_static)
+	if (codegen.function_node && codegen.function_node->is_static) {
 		return false;
+	}
 
-	if (codegen.stack_identifiers.has(p_name))
+	if (codegen.locals.has(p_name)) {
 		return false; //shadowed
+	}
 
 	return _is_class_member_property(codegen.script, p_name);
 }
 
 bool GDScriptCompiler::_is_class_member_property(GDScript *owner, const StringName &p_name) {
-
 	GDScript *scr = owner;
-	GDScriptNativeClass *nc = NULL;
+	GDScriptNativeClass *nc = nullptr;
 	while (scr) {
-
-		if (scr->native.is_valid())
+		if (scr->native.is_valid()) {
 			nc = scr->native.ptr();
+		}
 		scr = scr->_base;
 	}
 
@@ -60,59 +62,22 @@ bool GDScriptCompiler::_is_class_member_property(GDScript *owner, const StringNa
 }
 
 void GDScriptCompiler::_set_error(const String &p_error, const GDScriptParser::Node *p_node) {
-
-	if (error != "")
+	if (error != "") {
 		return;
+	}
 
 	error = p_error;
 	if (p_node) {
-		err_line = p_node->line;
-		err_column = p_node->column;
+		err_line = p_node->start_line;
+		err_column = p_node->leftmost_column;
 	} else {
 		err_line = 0;
 		err_column = 0;
 	}
 }
 
-bool GDScriptCompiler::_create_unary_operator(CodeGen &codegen, const GDScriptParser::OperatorNode *on, Variant::Operator op, int p_stack_level) {
-
-	ERR_FAIL_COND_V(on->arguments.size() != 1, false);
-
-	int src_address_a = _parse_expression(codegen, on->arguments[0], p_stack_level);
-	if (src_address_a < 0)
-		return false;
-
-	codegen.opcodes.push_back(GDScriptFunction::OPCODE_OPERATOR); // perform operator
-	codegen.opcodes.push_back(op); //which operator
-	codegen.opcodes.push_back(src_address_a); // argument 1
-	codegen.opcodes.push_back(src_address_a); // argument 2 (repeated)
-	//codegen.opcodes.push_back(GDScriptFunction::ADDR_TYPE_NIL); // argument 2 (unary only takes one parameter)
-	return true;
-}
-
-bool GDScriptCompiler::_create_binary_operator(CodeGen &codegen, const GDScriptParser::OperatorNode *on, Variant::Operator op, int p_stack_level, bool p_initializer, int p_index_addr) {
-
-	ERR_FAIL_COND_V(on->arguments.size() != 2, false);
-
-	int src_address_a = _parse_expression(codegen, on->arguments[0], p_stack_level, false, p_initializer, p_index_addr);
-	if (src_address_a < 0)
-		return false;
-	if (src_address_a & GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS)
-		p_stack_level++; //uses stack for return, increase stack
-
-	int src_address_b = _parse_expression(codegen, on->arguments[1], p_stack_level, false, p_initializer);
-	if (src_address_b < 0)
-		return false;
-
-	codegen.opcodes.push_back(GDScriptFunction::OPCODE_OPERATOR); // perform operator
-	codegen.opcodes.push_back(op); //which operator
-	codegen.opcodes.push_back(src_address_a); // argument 1
-	codegen.opcodes.push_back(src_address_b); // argument 2 (unary only takes one parameter)
-	return true;
-}
-
-GDScriptDataType GDScriptCompiler::_gdtype_from_datatype(const GDScriptParser::DataType &p_datatype) const {
-	if (!p_datatype.has_type) {
+GDScriptDataType GDScriptCompiler::_gdtype_from_datatype(const GDScriptParser::DataType &p_datatype, GDScript *p_owner) const {
+	if (!p_datatype.is_set() || !p_datatype.is_hard_type()) {
 		return GDScriptDataType();
 	}
 
@@ -120,6 +85,9 @@ GDScriptDataType GDScriptCompiler::_gdtype_from_datatype(const GDScriptParser::D
 	result.has_type = true;
 
 	switch (p_datatype.kind) {
+		case GDScriptParser::DataType::VARIANT: {
+			result.has_type = false;
+		} break;
 		case GDScriptParser::DataType::BUILTIN: {
 			result.kind = GDScriptDataType::BUILTIN;
 			result.builtin_type = p_datatype.builtin_type;
@@ -130,1706 +98,1806 @@ GDScriptDataType GDScriptCompiler::_gdtype_from_datatype(const GDScriptParser::D
 		} break;
 		case GDScriptParser::DataType::SCRIPT: {
 			result.kind = GDScriptDataType::SCRIPT;
-			result.script_type = p_datatype.script_type;
-			result.native_type = result.script_type->get_instance_base_type();
-		} break;
-		case GDScriptParser::DataType::GDSCRIPT: {
-			result.kind = GDScriptDataType::GDSCRIPT;
-			result.script_type = p_datatype.script_type;
+			result.script_type = Ref<Script>(p_datatype.script_type).ptr();
 			result.native_type = result.script_type->get_instance_base_type();
 		} break;
 		case GDScriptParser::DataType::CLASS: {
 			// Locate class by constructing the path to it and following that path
 			GDScriptParser::ClassNode *class_type = p_datatype.class_type;
-			List<StringName> names;
-			while (class_type->owner) {
-				names.push_back(class_type->name);
-				class_type = class_type->owner;
-			}
+			if (class_type) {
+				if (class_type->fqcn.begins_with(main_script->path) || (!main_script->name.empty() && class_type->fqcn.begins_with(main_script->name))) {
+					// Local class.
+					List<StringName> names;
+					while (class_type->outer) {
+						names.push_back(class_type->identifier->name);
+						class_type = class_type->outer;
+					}
 
-			Ref<GDScript> script = Ref<GDScript>(main_script);
-			while (names.back()) {
-				if (!script->subclasses.has(names.back()->get())) {
-					ERR_PRINT("Parser bug: Cannot locate datatype class.");
-					result.has_type = false;
-					return GDScriptDataType();
+					Ref<GDScript> script = Ref<GDScript>(main_script);
+					while (names.back()) {
+						if (!script->subclasses.has(names.back()->get())) {
+							ERR_PRINT("Parser bug: Cannot locate datatype class.");
+							result.has_type = false;
+							return GDScriptDataType();
+						}
+						script = script->subclasses[names.back()->get()];
+						names.pop_back();
+					}
+					result.kind = GDScriptDataType::GDSCRIPT;
+					result.script_type = script.ptr();
+					result.native_type = script->get_instance_base_type();
+				} else {
+					result.kind = GDScriptDataType::GDSCRIPT;
+					result.script_type = GDScriptCache::get_shallow_script(p_datatype.script_path, main_script->path).ptr();
+					result.native_type = p_datatype.native_type;
 				}
-				script = script->subclasses[names.back()->get()];
-				names.pop_back();
 			}
-
-			result.kind = GDScriptDataType::GDSCRIPT;
-			result.script_type = script;
-			result.native_type = script->get_instance_base_type();
 		} break;
-		default: {
+		case GDScriptParser::DataType::ENUM_VALUE:
+			result.has_type = true;
+			result.kind = GDScriptDataType::BUILTIN;
+			result.builtin_type = Variant::INT;
+			break;
+		case GDScriptParser::DataType::ENUM:
+			result.has_type = true;
+			result.kind = GDScriptDataType::BUILTIN;
+			result.builtin_type = Variant::DICTIONARY;
+			break;
+		case GDScriptParser::DataType::UNRESOLVED: {
 			ERR_PRINT("Parser bug: converting unresolved type.");
 			return GDScriptDataType();
 		}
 	}
 
-	return result;
-}
-
-int GDScriptCompiler::_parse_assign_right_expression(CodeGen &codegen, const GDScriptParser::OperatorNode *p_expression, int p_stack_level, int p_index_addr) {
-
-	Variant::Operator var_op = Variant::OP_MAX;
-
-	switch (p_expression->op) {
-
-		case GDScriptParser::OperatorNode::OP_ASSIGN_ADD: var_op = Variant::OP_ADD; break;
-		case GDScriptParser::OperatorNode::OP_ASSIGN_SUB: var_op = Variant::OP_SUBTRACT; break;
-		case GDScriptParser::OperatorNode::OP_ASSIGN_MUL: var_op = Variant::OP_MULTIPLY; break;
-		case GDScriptParser::OperatorNode::OP_ASSIGN_DIV: var_op = Variant::OP_DIVIDE; break;
-		case GDScriptParser::OperatorNode::OP_ASSIGN_MOD: var_op = Variant::OP_MODULE; break;
-		case GDScriptParser::OperatorNode::OP_ASSIGN_SHIFT_LEFT: var_op = Variant::OP_SHIFT_LEFT; break;
-		case GDScriptParser::OperatorNode::OP_ASSIGN_SHIFT_RIGHT: var_op = Variant::OP_SHIFT_RIGHT; break;
-		case GDScriptParser::OperatorNode::OP_ASSIGN_BIT_AND: var_op = Variant::OP_BIT_AND; break;
-		case GDScriptParser::OperatorNode::OP_ASSIGN_BIT_OR: var_op = Variant::OP_BIT_OR; break;
-		case GDScriptParser::OperatorNode::OP_ASSIGN_BIT_XOR: var_op = Variant::OP_BIT_XOR; break;
-		case GDScriptParser::OperatorNode::OP_INIT_ASSIGN:
-		case GDScriptParser::OperatorNode::OP_ASSIGN: {
-
-			//none
-		} break;
-		default: {
-
-			ERR_FAIL_V(-1);
-		}
+	// Only hold strong reference to the script if it's not the owner of the
+	// element qualified with this type, to avoid cyclic references (leaks).
+	if (result.script_type && result.script_type != p_owner) {
+		result.script_type_ref = Ref<Script>(result.script_type);
 	}
 
-	bool initializer = p_expression->op == GDScriptParser::OperatorNode::OP_INIT_ASSIGN;
-
-	if (var_op == Variant::OP_MAX) {
+	return result;
+}
 
-		return _parse_expression(codegen, p_expression->arguments[1], p_stack_level, false, initializer);
+GDScriptCodeGenerator::Address GDScriptCompiler::_parse_expression(CodeGen &codegen, Error &r_error, const GDScriptParser::ExpressionNode *p_expression, bool p_root, bool p_initializer, const GDScriptCodeGenerator::Address &p_index_addr) {
+	if (p_expression->is_constant) {
+		return codegen.add_constant(p_expression->reduced_value);
 	}
 
-	if (!_create_binary_operator(codegen, p_expression, var_op, p_stack_level, initializer, p_index_addr))
-		return -1;
-
-	int dst_addr = (p_stack_level) | (GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS);
-	codegen.opcodes.push_back(dst_addr); // append the stack level as destination address of the opcode
-	codegen.alloc_stack(p_stack_level);
-	return dst_addr;
-}
-
-int GDScriptCompiler::_parse_expression(CodeGen &codegen, const GDScriptParser::Node *p_expression, int p_stack_level, bool p_root, bool p_initializer, int p_index_addr) {
+	GDScriptCodeGenerator *gen = codegen.generator;
 
 	switch (p_expression->type) {
-		//should parse variable declaration and adjust stack accordingly...
-		case GDScriptParser::Node::TYPE_IDENTIFIER: {
-			//return identifier
-			//wait, identifier could be a local variable or something else... careful here, must reference properly
-			//as stack may be more interesting to work with
-
-			//This could be made much simpler by just indexing "self", but done this way (with custom self-addressing modes) increases performance a lot.
-
+		case GDScriptParser::Node::IDENTIFIER: {
+			// Look for identifiers in current scope.
 			const GDScriptParser::IdentifierNode *in = static_cast<const GDScriptParser::IdentifierNode *>(p_expression);
 
 			StringName identifier = in->name;
 
-			// TRY STACK!
-			if (!p_initializer && codegen.stack_identifiers.has(identifier)) {
+			// Try function parameters.
+			if (codegen.parameters.has(identifier)) {
+				return codegen.parameters[identifier];
+			}
 
-				int pos = codegen.stack_identifiers[identifier];
-				return pos | (GDScriptFunction::ADDR_TYPE_STACK_VARIABLE << GDScriptFunction::ADDR_BITS);
+			// Try local variables and constants.
+			if (!p_initializer && codegen.locals.has(identifier)) {
+				return codegen.locals[identifier];
 			}
 
-			// TRY CLASS MEMBER
+			// Try class members.
 			if (_is_class_member_property(codegen, identifier)) {
-				//get property
-				codegen.opcodes.push_back(GDScriptFunction::OPCODE_GET_MEMBER); // perform operator
-				codegen.opcodes.push_back(codegen.get_name_map_pos(identifier)); // argument 2 (unary only takes one parameter)
-				int dst_addr = (p_stack_level) | (GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS);
-				codegen.opcodes.push_back(dst_addr); // append the stack level as destination address of the opcode
-				codegen.alloc_stack(p_stack_level);
-				return dst_addr;
+				// Get property.
+				GDScriptCodeGenerator::Address temp = codegen.add_temporary(); // TODO: Could get the type of the class member here.
+				gen->write_get_member(temp, identifier);
+				return temp;
 			}
 
-			//TRY MEMBERS!
-			if (!codegen.function_node || !codegen.function_node->_static) {
-
-				// TRY MEMBER VARIABLES!
-				//static function
+			// Try members.
+			if (!codegen.function_node || !codegen.function_node->is_static) {
+				// Try member variables.
 				if (codegen.script->member_indices.has(identifier)) {
-
-					int idx = codegen.script->member_indices[identifier].index;
-					return idx | (GDScriptFunction::ADDR_TYPE_MEMBER << GDScriptFunction::ADDR_BITS); //argument (stack root)
+					if (codegen.script->member_indices[identifier].getter != StringName() && codegen.script->member_indices[identifier].getter != codegen.function_name) {
+						// Perform getter.
+						GDScriptCodeGenerator::Address temp = codegen.add_temporary();
+						Vector<GDScriptCodeGenerator::Address> args; // No argument needed.
+						gen->write_call_self(temp, codegen.script->member_indices[identifier].getter, args);
+						return temp;
+					} else {
+						// No getter or inside getter: direct member access.,
+						int idx = codegen.script->member_indices[identifier].index;
+						return GDScriptCodeGenerator::Address(GDScriptCodeGenerator::Address::MEMBER, idx, codegen.script->get_member_type(identifier));
+					}
 				}
 			}
 
-			//TRY CLASS CONSTANTS
-
+			// Try class constants.
 			GDScript *owner = codegen.script;
 			while (owner) {
-
 				GDScript *scr = owner;
-				GDScriptNativeClass *nc = NULL;
+				GDScriptNativeClass *nc = nullptr;
 				while (scr) {
-
 					if (scr->constants.has(identifier)) {
-
-						//int idx=scr->constants[identifier];
-						int idx = codegen.get_name_map_pos(identifier);
-						return idx | (GDScriptFunction::ADDR_TYPE_CLASS_CONSTANT << GDScriptFunction::ADDR_BITS); //argument (stack root)
+						return GDScriptCodeGenerator::Address(GDScriptCodeGenerator::Address::CLASS_CONSTANT, gen->add_or_get_name(identifier)); // TODO: Get type here.
 					}
-					if (scr->native.is_valid())
+					if (scr->native.is_valid()) {
 						nc = scr->native.ptr();
+					}
 					scr = scr->_base;
 				}
 
-				// CLASS C++ Integer Constant
-
+				// Class C++ integer constant.
 				if (nc) {
-
 					bool success = false;
 					int constant = ClassDB::get_integer_constant(nc->get_name(), identifier, &success);
 					if (success) {
-						Variant key = constant;
-						int idx;
-
-						if (!codegen.constant_map.has(key)) {
-
-							idx = codegen.constant_map.size();
-							codegen.constant_map[key] = idx;
-
-						} else {
-							idx = codegen.constant_map[key];
-						}
-
-						return idx | (GDScriptFunction::ADDR_TYPE_LOCAL_CONSTANT << GDScriptFunction::ADDR_BITS); //make it a local constant (faster access)
+						return codegen.add_constant(constant);
 					}
 				}
 
 				owner = owner->_owner;
 			}
 
-			if (GDScriptLanguage::get_singleton()->get_global_map().has(identifier)) {
+			// Try signals and methods (can be made callables);
+			if (codegen.class_node->members_indices.has(identifier)) {
+				const GDScriptParser::ClassNode::Member &member = codegen.class_node->members[codegen.class_node->members_indices[identifier]];
+				if (member.type == GDScriptParser::ClassNode::Member::FUNCTION || member.type == GDScriptParser::ClassNode::Member::SIGNAL) {
+					// Get like it was a property.
+					GDScriptCodeGenerator::Address temp = codegen.add_temporary(); // TODO: Get type here.
+					GDScriptCodeGenerator::Address self(GDScriptCodeGenerator::Address::SELF);
 
-				int idx = GDScriptLanguage::get_singleton()->get_global_map()[identifier];
-				return idx | (GDScriptFunction::ADDR_TYPE_GLOBAL << GDScriptFunction::ADDR_BITS); //argument (stack root)
+					gen->write_get_named(temp, identifier, self);
+					return temp;
+				}
 			}
 
-			/* TRY GLOBAL CLASSES */
+			if (GDScriptLanguage::get_singleton()->get_global_map().has(identifier)) {
+				int idx = GDScriptLanguage::get_singleton()->get_global_map()[identifier];
+				return GDScriptCodeGenerator::Address(GDScriptCodeGenerator::Address::GLOBAL, idx); // TODO: Get type.
+			}
 
+			// Try global classes.
 			if (ScriptServer::is_global_class(identifier)) {
-
 				const GDScriptParser::ClassNode *class_node = codegen.class_node;
-				while (class_node->owner) {
-					class_node = class_node->owner;
+				while (class_node->outer) {
+					class_node = class_node->outer;
 				}
 
-				if (class_node->name == identifier) {
-					_set_error("Using own name in class file is not allowed (creates a cyclic reference)", p_expression);
-					return -1;
-				}
-
-				RES res = ResourceLoader::load(ScriptServer::get_global_class_path(identifier));
-				if (res.is_null()) {
-					_set_error("Can't load global class " + String(identifier) + ", cyclic reference?", p_expression);
-					return -1;
-				}
-
-				Variant key = res;
-				int idx;
-
-				if (!codegen.constant_map.has(key)) {
-
-					idx = codegen.constant_map.size();
-					codegen.constant_map[key] = idx;
+				RES res;
 
+				if (class_node->identifier && class_node->identifier->name == identifier) {
+					res = Ref<GDScript>(main_script);
 				} else {
-					idx = codegen.constant_map[key];
+					res = ResourceLoader::load(ScriptServer::get_global_class_path(identifier));
+					if (res.is_null()) {
+						_set_error("Can't load global class " + String(identifier) + ", cyclic reference?", p_expression);
+						r_error = ERR_COMPILATION_FAILED;
+						return GDScriptCodeGenerator::Address();
+					}
 				}
 
-				return idx | (GDScriptFunction::ADDR_TYPE_LOCAL_CONSTANT << GDScriptFunction::ADDR_BITS); //make it a local constant (faster access)
+				return codegen.add_constant(res);
 			}
 
 #ifdef TOOLS_ENABLED
 			if (GDScriptLanguage::get_singleton()->get_named_globals_map().has(identifier)) {
-
-				int idx = codegen.named_globals.find(identifier);
-				if (idx == -1) {
-					idx = codegen.named_globals.size();
-					codegen.named_globals.push_back(identifier);
-				}
-				return idx | (GDScriptFunction::ADDR_TYPE_NAMED_GLOBAL << GDScriptFunction::ADDR_BITS);
+				return GDScriptCodeGenerator::Address(GDScriptCodeGenerator::Address::NAMED_GLOBAL, gen->add_or_get_name(identifier)); // TODO: Get type.
 			}
 #endif
 
-			//not found, error
-
+			// Not found, error.
 			_set_error("Identifier not found: " + String(identifier), p_expression);
-
-			return -1;
-
+			r_error = ERR_COMPILATION_FAILED;
+			return GDScriptCodeGenerator::Address();
 		} break;
-		case GDScriptParser::Node::TYPE_CONSTANT: {
-			//return constant
-			const GDScriptParser::ConstantNode *cn = static_cast<const GDScriptParser::ConstantNode *>(p_expression);
-
-			int idx;
-
-			if (!codegen.constant_map.has(cn->value)) {
-
-				idx = codegen.constant_map.size();
-				codegen.constant_map[cn->value] = idx;
-
-			} else {
-				idx = codegen.constant_map[cn->value];
-			}
-
-			return idx | (GDScriptFunction::ADDR_TYPE_LOCAL_CONSTANT << GDScriptFunction::ADDR_BITS); //argument (stack root)
+		case GDScriptParser::Node::LITERAL: {
+			// Return constant.
+			const GDScriptParser::LiteralNode *cn = static_cast<const GDScriptParser::LiteralNode *>(p_expression);
 
+			return codegen.add_constant(cn->value);
 		} break;
-		case GDScriptParser::Node::TYPE_SELF: {
+		case GDScriptParser::Node::SELF: {
 			//return constant
-			if (codegen.function_node && codegen.function_node->_static) {
+			if (codegen.function_node && codegen.function_node->is_static) {
 				_set_error("'self' not present in static function!", p_expression);
-				return -1;
+				r_error = ERR_COMPILATION_FAILED;
+				return GDScriptCodeGenerator::Address();
 			}
-			return (GDScriptFunction::ADDR_TYPE_SELF << GDScriptFunction::ADDR_BITS);
+			return GDScriptCodeGenerator::Address(GDScriptCodeGenerator::Address::SELF);
 		} break;
-		case GDScriptParser::Node::TYPE_ARRAY: {
-
+		case GDScriptParser::Node::ARRAY: {
 			const GDScriptParser::ArrayNode *an = static_cast<const GDScriptParser::ArrayNode *>(p_expression);
-			Vector<int> values;
+			Vector<GDScriptCodeGenerator::Address> values;
 
-			int slevel = p_stack_level;
+			// Create the result temporary first since it's the last to be killed.
+			GDScriptDataType array_type;
+			array_type.has_type = true;
+			array_type.kind = GDScriptDataType::BUILTIN;
+			array_type.builtin_type = Variant::ARRAY;
+			GDScriptCodeGenerator::Address result = codegen.add_temporary(array_type);
 
 			for (int i = 0; i < an->elements.size(); i++) {
-
-				int ret = _parse_expression(codegen, an->elements[i], slevel);
-				if (ret < 0)
-					return ret;
-				if ((ret >> GDScriptFunction::ADDR_BITS & GDScriptFunction::ADDR_TYPE_STACK) == GDScriptFunction::ADDR_TYPE_STACK) {
-					slevel++;
-					codegen.alloc_stack(slevel);
+				GDScriptCodeGenerator::Address val = _parse_expression(codegen, r_error, an->elements[i]);
+				if (r_error) {
+					return GDScriptCodeGenerator::Address();
 				}
-
-				values.push_back(ret);
+				values.push_back(val);
 			}
 
-			codegen.opcodes.push_back(GDScriptFunction::OPCODE_CONSTRUCT_ARRAY);
-			codegen.opcodes.push_back(values.size());
-			for (int i = 0; i < values.size(); i++)
-				codegen.opcodes.push_back(values[i]);
+			gen->write_construct_array(result, values);
 
-			int dst_addr = (p_stack_level) | (GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS);
-			codegen.opcodes.push_back(dst_addr); // append the stack level as destination address of the opcode
-			codegen.alloc_stack(p_stack_level);
-			return dst_addr;
+			for (int i = 0; i < values.size(); i++) {
+				if (values[i].mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+					gen->pop_temporary();
+				}
+			}
 
+			return result;
 		} break;
-		case GDScriptParser::Node::TYPE_DICTIONARY: {
-
+		case GDScriptParser::Node::DICTIONARY: {
 			const GDScriptParser::DictionaryNode *dn = static_cast<const GDScriptParser::DictionaryNode *>(p_expression);
-			Vector<int> values;
+			Vector<GDScriptCodeGenerator::Address> elements;
 
-			int slevel = p_stack_level;
+			// Create the result temporary first since it's the last to be killed.
+			GDScriptDataType dict_type;
+			dict_type.has_type = true;
+			dict_type.kind = GDScriptDataType::BUILTIN;
+			dict_type.builtin_type = Variant::DICTIONARY;
+			GDScriptCodeGenerator::Address result = codegen.add_temporary(dict_type);
 
 			for (int i = 0; i < dn->elements.size(); i++) {
-
-				int ret = _parse_expression(codegen, dn->elements[i].key, slevel);
-				if (ret < 0)
-					return ret;
-				if ((ret >> GDScriptFunction::ADDR_BITS & GDScriptFunction::ADDR_TYPE_STACK) == GDScriptFunction::ADDR_TYPE_STACK) {
-					slevel++;
-					codegen.alloc_stack(slevel);
+				// Key.
+				GDScriptCodeGenerator::Address element;
+				switch (dn->style) {
+					case GDScriptParser::DictionaryNode::PYTHON_DICT:
+						// Python-style: key is any expression.
+						element = _parse_expression(codegen, r_error, dn->elements[i].key);
+						if (r_error) {
+							return GDScriptCodeGenerator::Address();
+						}
+						break;
+					case GDScriptParser::DictionaryNode::LUA_TABLE:
+						// Lua-style: key is an identifier interpreted as string.
+						String key = static_cast<const GDScriptParser::IdentifierNode *>(dn->elements[i].key)->name;
+						element = codegen.add_constant(key);
+						break;
 				}
 
-				values.push_back(ret);
+				elements.push_back(element);
 
-				ret = _parse_expression(codegen, dn->elements[i].value, slevel);
-				if (ret < 0)
-					return ret;
-				if ((ret >> GDScriptFunction::ADDR_BITS & GDScriptFunction::ADDR_TYPE_STACK) == GDScriptFunction::ADDR_TYPE_STACK) {
-					slevel++;
-					codegen.alloc_stack(slevel);
+				element = _parse_expression(codegen, r_error, dn->elements[i].value);
+				if (r_error) {
+					return GDScriptCodeGenerator::Address();
 				}
 
-				values.push_back(ret);
+				elements.push_back(element);
 			}
 
-			codegen.opcodes.push_back(GDScriptFunction::OPCODE_CONSTRUCT_DICTIONARY);
-			codegen.opcodes.push_back(dn->elements.size());
-			for (int i = 0; i < values.size(); i++)
-				codegen.opcodes.push_back(values[i]);
+			gen->write_construct_dictionary(result, elements);
 
-			int dst_addr = (p_stack_level) | (GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS);
-			codegen.opcodes.push_back(dst_addr); // append the stack level as destination address of the opcode
-			codegen.alloc_stack(p_stack_level);
-			return dst_addr;
+			for (int i = 0; i < elements.size(); i++) {
+				if (elements[i].mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+					gen->pop_temporary();
+				}
+			}
 
+			return result;
 		} break;
-		case GDScriptParser::Node::TYPE_CAST: {
+		case GDScriptParser::Node::CAST: {
 			const GDScriptParser::CastNode *cn = static_cast<const GDScriptParser::CastNode *>(p_expression);
+			GDScriptDataType cast_type = _gdtype_from_datatype(cn->cast_type->get_datatype());
 
-			int slevel = p_stack_level;
-			int src_addr = _parse_expression(codegen, cn->source_node, slevel);
-			if (src_addr < 0)
-				return src_addr;
-			if (src_addr & GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS) {
-				slevel++;
-				codegen.alloc_stack(slevel);
-			}
-
-			GDScriptDataType cast_type = _gdtype_from_datatype(cn->cast_type);
+			// Create temporary for result first since it will be deleted last.
+			GDScriptCodeGenerator::Address result = codegen.add_temporary(cast_type);
 
-			switch (cast_type.kind) {
-				case GDScriptDataType::BUILTIN: {
-					codegen.opcodes.push_back(GDScriptFunction::OPCODE_CAST_TO_BUILTIN);
-					codegen.opcodes.push_back(cast_type.builtin_type);
-				} break;
-				case GDScriptDataType::NATIVE: {
-					int class_idx;
-					if (GDScriptLanguage::get_singleton()->get_global_map().has(cast_type.native_type)) {
-
-						class_idx = GDScriptLanguage::get_singleton()->get_global_map()[cast_type.native_type];
-						class_idx |= (GDScriptFunction::ADDR_TYPE_GLOBAL << GDScriptFunction::ADDR_BITS); //argument (stack root)
-					} else {
-						_set_error("Invalid native class type '" + String(cast_type.native_type) + "'.", cn);
-						return -1;
-					}
-					codegen.opcodes.push_back(GDScriptFunction::OPCODE_CAST_TO_NATIVE); // perform operator
-					codegen.opcodes.push_back(class_idx); // variable type
-				} break;
-				case GDScriptDataType::SCRIPT:
-				case GDScriptDataType::GDSCRIPT: {
+			GDScriptCodeGenerator::Address source = _parse_expression(codegen, r_error, cn->operand);
 
-					Variant script = cast_type.script_type;
-					int idx = codegen.get_constant_pos(script);
-					idx |= GDScriptFunction::ADDR_TYPE_LOCAL_CONSTANT << GDScriptFunction::ADDR_BITS; //make it a local constant (faster access)
+			gen->write_cast(result, source, cast_type);
 
-					codegen.opcodes.push_back(GDScriptFunction::OPCODE_CAST_TO_SCRIPT); // perform operator
-					codegen.opcodes.push_back(idx); // variable type
-				} break;
-				default: {
-					_set_error("Parser bug: unresolved data type.", cn);
-					return -1;
-				}
+			if (source.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+				gen->pop_temporary();
 			}
 
-			codegen.opcodes.push_back(src_addr); // source address
-			int dst_addr = (p_stack_level) | (GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS);
-			codegen.opcodes.push_back(dst_addr); // append the stack level as destination address of the opcode
-			codegen.alloc_stack(p_stack_level);
-			return dst_addr;
-
+			return source;
 		} break;
-		case GDScriptParser::Node::TYPE_OPERATOR: {
-			//hell breaks loose
-
-			const GDScriptParser::OperatorNode *on = static_cast<const GDScriptParser::OperatorNode *>(p_expression);
-			switch (on->op) {
-
-				//call/constructor operator
-				case GDScriptParser::OperatorNode::OP_PARENT_CALL: {
+		case GDScriptParser::Node::CALL: {
+			const GDScriptParser::CallNode *call = static_cast<const GDScriptParser::CallNode *>(p_expression);
+			GDScriptDataType type = _gdtype_from_datatype(call->get_datatype());
+			GDScriptCodeGenerator::Address result = codegen.add_temporary(type);
+
+			Vector<GDScriptCodeGenerator::Address> arguments;
+			for (int i = 0; i < call->arguments.size(); i++) {
+				GDScriptCodeGenerator::Address arg = _parse_expression(codegen, r_error, call->arguments[i]);
+				if (r_error) {
+					return GDScriptCodeGenerator::Address();
+				}
+				arguments.push_back(arg);
+			}
 
-					ERR_FAIL_COND_V(on->arguments.size() < 1, -1);
+			if (!call->is_super && call->callee->type == GDScriptParser::Node::IDENTIFIER && GDScriptParser::get_builtin_type(static_cast<GDScriptParser::IdentifierNode *>(call->callee)->name) != Variant::VARIANT_MAX) {
+				// Construct a built-in type.
+				Variant::Type vtype = GDScriptParser::get_builtin_type(static_cast<GDScriptParser::IdentifierNode *>(call->callee)->name);
 
-					const GDScriptParser::IdentifierNode *in = (const GDScriptParser::IdentifierNode *)on->arguments[0];
+				gen->write_construct(result, vtype, arguments);
+			} else if (!call->is_super && call->callee->type == GDScriptParser::Node::IDENTIFIER && GDScriptParser::get_builtin_function(static_cast<GDScriptParser::IdentifierNode *>(call->callee)->name) != GDScriptFunctions::FUNC_MAX) {
+				// Built-in function.
+				GDScriptFunctions::Function func = GDScriptParser::get_builtin_function(static_cast<GDScriptParser::IdentifierNode *>(call->callee)->name);
+				gen->write_call_builtin(result, func, arguments);
+			} else {
+				// Regular function.
+				const GDScriptParser::ExpressionNode *callee = call->callee;
 
-					Vector<int> arguments;
-					int slevel = p_stack_level;
-					for (int i = 1; i < on->arguments.size(); i++) {
+				if (call->is_super) {
+					// Super call.
+					gen->write_super_call(result, call->function_name, arguments);
+				} else {
+					if (callee->type == GDScriptParser::Node::IDENTIFIER) {
+						// Self function call.
+						if ((codegen.function_node && codegen.function_node->is_static) || call->function_name == "new") {
+							GDScriptCodeGenerator::Address self;
+							self.mode = GDScriptCodeGenerator::Address::CLASS;
+							gen->write_call(result, self, call->function_name, arguments);
+						} else {
+							gen->write_call_self(result, call->function_name, arguments);
+						}
+					} else if (callee->type == GDScriptParser::Node::SUBSCRIPT) {
+						const GDScriptParser::SubscriptNode *subscript = static_cast<const GDScriptParser::SubscriptNode *>(call->callee);
 
-						int ret = _parse_expression(codegen, on->arguments[i], slevel);
-						if (ret < 0)
-							return ret;
-						if ((ret >> GDScriptFunction::ADDR_BITS & GDScriptFunction::ADDR_TYPE_STACK) == GDScriptFunction::ADDR_TYPE_STACK) {
-							slevel++;
-							codegen.alloc_stack(slevel);
+						if (subscript->is_attribute) {
+							GDScriptCodeGenerator::Address base = _parse_expression(codegen, r_error, subscript->base);
+							if (r_error) {
+								return GDScriptCodeGenerator::Address();
+							}
+							if (within_await) {
+								gen->write_call_async(result, base, call->function_name, arguments);
+							} else {
+								gen->write_call(result, base, call->function_name, arguments);
+							}
+							if (base.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+								gen->pop_temporary();
+							}
+						} else {
+							_set_error("Cannot call something that isn't a function.", call->callee);
+							r_error = ERR_COMPILATION_FAILED;
+							return GDScriptCodeGenerator::Address();
 						}
-						arguments.push_back(ret);
+					} else {
+						r_error = ERR_COMPILATION_FAILED;
+						return GDScriptCodeGenerator::Address();
 					}
+				}
+			}
 
-					//push call bytecode
-					codegen.opcodes.push_back(GDScriptFunction::OPCODE_CALL_SELF_BASE); // basic type constructor
+			for (int i = 0; i < arguments.size(); i++) {
+				if (arguments[i].mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+					gen->pop_temporary();
+				}
+			}
+			return result;
+		} break;
+		case GDScriptParser::Node::GET_NODE: {
+			const GDScriptParser::GetNodeNode *get_node = static_cast<const GDScriptParser::GetNodeNode *>(p_expression);
 
-					codegen.opcodes.push_back(codegen.get_name_map_pos(in->name)); //instance
-					codegen.opcodes.push_back(arguments.size()); //argument count
-					codegen.alloc_call(arguments.size());
-					for (int i = 0; i < arguments.size(); i++)
-						codegen.opcodes.push_back(arguments[i]); //arguments
+			String node_name;
+			if (get_node->string != nullptr) {
+				node_name += String(get_node->string->value);
+			} else {
+				for (int i = 0; i < get_node->chain.size(); i++) {
+					if (i > 0) {
+						node_name += "/";
+					}
+					node_name += get_node->chain[i]->name;
+				}
+			}
 
-				} break;
-				case GDScriptParser::OperatorNode::OP_CALL: {
+			Vector<GDScriptCodeGenerator::Address> args;
+			args.push_back(codegen.add_constant(NodePath(node_name)));
 
-					if (on->arguments[0]->type == GDScriptParser::Node::TYPE_TYPE) {
-						//construct a basic type
-						ERR_FAIL_COND_V(on->arguments.size() < 1, -1);
+			GDScriptCodeGenerator::Address result = codegen.add_temporary(_gdtype_from_datatype(get_node->get_datatype()));
 
-						const GDScriptParser::TypeNode *tn = (const GDScriptParser::TypeNode *)on->arguments[0];
-						int vtype = tn->vtype;
+			MethodBind *get_node_method = ClassDB::get_method("Node", "get_node");
+			gen->write_call_method_bind(result, GDScriptCodeGenerator::Address(GDScriptCodeGenerator::Address::SELF), get_node_method, args);
 
-						Vector<int> arguments;
-						int slevel = p_stack_level;
-						for (int i = 1; i < on->arguments.size(); i++) {
+			return result;
+		} break;
+		case GDScriptParser::Node::PRELOAD: {
+			const GDScriptParser::PreloadNode *preload = static_cast<const GDScriptParser::PreloadNode *>(p_expression);
 
-							int ret = _parse_expression(codegen, on->arguments[i], slevel);
-							if (ret < 0)
-								return ret;
-							if ((ret >> GDScriptFunction::ADDR_BITS & GDScriptFunction::ADDR_TYPE_STACK) == GDScriptFunction::ADDR_TYPE_STACK) {
-								slevel++;
-								codegen.alloc_stack(slevel);
-							}
-							arguments.push_back(ret);
-						}
+			// Add resource as constant.
+			return codegen.add_constant(preload->resource);
+		} break;
+		case GDScriptParser::Node::AWAIT: {
+			const GDScriptParser::AwaitNode *await = static_cast<const GDScriptParser::AwaitNode *>(p_expression);
+
+			GDScriptCodeGenerator::Address result = codegen.add_temporary(_gdtype_from_datatype(p_expression->get_datatype()));
+			within_await = true;
+			GDScriptCodeGenerator::Address argument = _parse_expression(codegen, r_error, await->to_await);
+			within_await = false;
+			if (r_error) {
+				return GDScriptCodeGenerator::Address();
+			}
 
-						//push call bytecode
-						codegen.opcodes.push_back(GDScriptFunction::OPCODE_CONSTRUCT); // basic type constructor
-						codegen.opcodes.push_back(vtype); //instance
-						codegen.opcodes.push_back(arguments.size()); //argument count
-						codegen.alloc_call(arguments.size());
-						for (int i = 0; i < arguments.size(); i++)
-							codegen.opcodes.push_back(arguments[i]); //arguments
+			gen->write_await(result, argument);
 
-					} else if (on->arguments[0]->type == GDScriptParser::Node::TYPE_BUILT_IN_FUNCTION) {
-						//built in function
+			if (argument.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+				gen->pop_temporary();
+			}
 
-						ERR_FAIL_COND_V(on->arguments.size() < 1, -1);
+			return result;
+		} break;
+		// Indexing operator.
+		case GDScriptParser::Node::SUBSCRIPT: {
+			const GDScriptParser::SubscriptNode *subscript = static_cast<const GDScriptParser::SubscriptNode *>(p_expression);
+			GDScriptCodeGenerator::Address result = codegen.add_temporary(_gdtype_from_datatype(subscript->get_datatype()));
+
+			GDScriptCodeGenerator::Address base = _parse_expression(codegen, r_error, subscript->base);
+			if (r_error) {
+				return GDScriptCodeGenerator::Address();
+			}
 
-						Vector<int> arguments;
-						int slevel = p_stack_level;
-						for (int i = 1; i < on->arguments.size(); i++) {
+			bool named = subscript->is_attribute;
+			StringName name;
+			GDScriptCodeGenerator::Address index;
+			if (p_index_addr.mode != GDScriptCodeGenerator::Address::NIL) {
+				index = p_index_addr;
+			} else if (subscript->is_attribute) {
+				if (subscript->base->type == GDScriptParser::Node::SELF && codegen.script) {
+					GDScriptParser::IdentifierNode *identifier = subscript->attribute;
+					const Map<StringName, GDScript::MemberInfo>::Element *MI = codegen.script->member_indices.find(identifier->name);
 
-							int ret = _parse_expression(codegen, on->arguments[i], slevel);
-							if (ret < 0)
-								return ret;
+#ifdef DEBUG_ENABLED
+					if (MI && MI->get().getter == codegen.function_name) {
+						String n = identifier->name;
+						_set_error("Must use '" + n + "' instead of 'self." + n + "' in getter.", identifier);
+						r_error = ERR_COMPILATION_FAILED;
+						return GDScriptCodeGenerator::Address();
+					}
+#endif
 
-							if ((ret >> GDScriptFunction::ADDR_BITS & GDScriptFunction::ADDR_TYPE_STACK) == GDScriptFunction::ADDR_TYPE_STACK) {
-								slevel++;
-								codegen.alloc_stack(slevel);
-							}
+					if (MI && MI->get().getter == "") {
+						// Remove result temp as we don't need it.
+						gen->pop_temporary();
+						// Faster than indexing self (as if no self. had been used).
+						return GDScriptCodeGenerator::Address(GDScriptCodeGenerator::Address::MEMBER, MI->get().index, _gdtype_from_datatype(subscript->get_datatype()));
+					}
+				}
 
-							arguments.push_back(ret);
-						}
+				name = subscript->attribute->name;
+				named = true;
+			} else {
+				if (subscript->index->type == GDScriptParser::Node::LITERAL && static_cast<const GDScriptParser::LiteralNode *>(subscript->index)->value.get_type() == Variant::STRING) {
+					// Also, somehow, named (speed up anyway).
+					name = static_cast<const GDScriptParser::LiteralNode *>(subscript->index)->value;
+					named = true;
+				} else {
+					// Regular indexing.
+					index = _parse_expression(codegen, r_error, subscript->index);
+					if (r_error) {
+						return GDScriptCodeGenerator::Address();
+					}
+				}
+			}
 
-						codegen.opcodes.push_back(GDScriptFunction::OPCODE_CALL_BUILT_IN);
-						codegen.opcodes.push_back(static_cast<const GDScriptParser::BuiltInFunctionNode *>(on->arguments[0])->function);
-						codegen.opcodes.push_back(on->arguments.size() - 1);
-						codegen.alloc_call(on->arguments.size() - 1);
-						for (int i = 0; i < arguments.size(); i++)
-							codegen.opcodes.push_back(arguments[i]);
+			if (named) {
+				gen->write_get_named(result, name, base);
+			} else {
+				gen->write_get(result, index, base);
+			}
 
-					} else {
-						//regular function
-						ERR_FAIL_COND_V(on->arguments.size() < 2, -1);
+			if (index.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+				gen->pop_temporary();
+			}
+			if (base.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+				gen->pop_temporary();
+			}
 
-						const GDScriptParser::Node *instance = on->arguments[0];
+			return result;
+		} break;
+		case GDScriptParser::Node::UNARY_OPERATOR: {
+			const GDScriptParser::UnaryOpNode *unary = static_cast<const GDScriptParser::UnaryOpNode *>(p_expression);
 
-						if (instance->type == GDScriptParser::Node::TYPE_SELF) {
-							//room for optimization
-						}
+			GDScriptCodeGenerator::Address result = codegen.add_temporary();
 
-						Vector<int> arguments;
-						int slevel = p_stack_level;
+			GDScriptCodeGenerator::Address operand = _parse_expression(codegen, r_error, unary->operand);
+			if (r_error) {
+				return GDScriptCodeGenerator::Address();
+			}
 
-						for (int i = 0; i < on->arguments.size(); i++) {
+			gen->write_operator(result, unary->variant_op, operand, GDScriptCodeGenerator::Address());
 
-							int ret;
+			if (operand.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+				gen->pop_temporary();
+			}
 
-							if (i == 0 && on->arguments[i]->type == GDScriptParser::Node::TYPE_SELF && codegen.function_node && codegen.function_node->_static) {
-								//static call to self
-								ret = (GDScriptFunction::ADDR_TYPE_CLASS << GDScriptFunction::ADDR_BITS);
-							} else if (i == 1) {
+			return result;
+		}
+		case GDScriptParser::Node::BINARY_OPERATOR: {
+			const GDScriptParser::BinaryOpNode *binary = static_cast<const GDScriptParser::BinaryOpNode *>(p_expression);
 
-								if (on->arguments[i]->type != GDScriptParser::Node::TYPE_IDENTIFIER) {
-									_set_error("Attempt to call a non-identifier.", on);
-									return -1;
-								}
-								GDScriptParser::IdentifierNode *id = static_cast<GDScriptParser::IdentifierNode *>(on->arguments[i]);
-								ret = codegen.get_name_map_pos(id->name);
+			GDScriptCodeGenerator::Address result = codegen.add_temporary();
 
-							} else {
+			switch (binary->operation) {
+				case GDScriptParser::BinaryOpNode::OP_LOGIC_AND: {
+					// AND operator with early out on failure.
+					GDScriptCodeGenerator::Address left_operand = _parse_expression(codegen, r_error, binary->left_operand);
+					gen->write_and_left_operand(left_operand);
+					GDScriptCodeGenerator::Address right_operand = _parse_expression(codegen, r_error, binary->right_operand);
+					gen->write_and_right_operand(right_operand);
 
-								ret = _parse_expression(codegen, on->arguments[i], slevel);
-								if (ret < 0)
-									return ret;
-								if ((ret >> GDScriptFunction::ADDR_BITS & GDScriptFunction::ADDR_TYPE_STACK) == GDScriptFunction::ADDR_TYPE_STACK) {
-									slevel++;
-									codegen.alloc_stack(slevel);
-								}
-							}
-							arguments.push_back(ret);
-						}
+					gen->write_end_and(result);
 
-						codegen.opcodes.push_back(p_root ? GDScriptFunction::OPCODE_CALL : GDScriptFunction::OPCODE_CALL_RETURN); // perform operator
-						codegen.opcodes.push_back(on->arguments.size() - 2);
-						codegen.alloc_call(on->arguments.size() - 2);
-						for (int i = 0; i < arguments.size(); i++)
-							codegen.opcodes.push_back(arguments[i]);
+					if (right_operand.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+						gen->pop_temporary();
+					}
+					if (left_operand.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+						gen->pop_temporary();
 					}
 				} break;
-				case GDScriptParser::OperatorNode::OP_YIELD: {
+				case GDScriptParser::BinaryOpNode::OP_LOGIC_OR: {
+					// OR operator with early out on success.
+					GDScriptCodeGenerator::Address left_operand = _parse_expression(codegen, r_error, binary->left_operand);
+					gen->write_or_left_operand(left_operand);
+					GDScriptCodeGenerator::Address right_operand = _parse_expression(codegen, r_error, binary->right_operand);
+					gen->write_or_right_operand(right_operand);
 
-					ERR_FAIL_COND_V(on->arguments.size() && on->arguments.size() != 2, -1);
+					gen->write_end_or(result);
 
-					Vector<int> arguments;
-					int slevel = p_stack_level;
-					for (int i = 0; i < on->arguments.size(); i++) {
-
-						int ret = _parse_expression(codegen, on->arguments[i], slevel);
-						if (ret < 0)
-							return ret;
-						if ((ret >> GDScriptFunction::ADDR_BITS & GDScriptFunction::ADDR_TYPE_STACK) == GDScriptFunction::ADDR_TYPE_STACK) {
-							slevel++;
-							codegen.alloc_stack(slevel);
-						}
-						arguments.push_back(ret);
+					if (right_operand.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+						gen->pop_temporary();
+					}
+					if (left_operand.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+						gen->pop_temporary();
 					}
-
-					//push call bytecode
-					codegen.opcodes.push_back(arguments.size() == 0 ? GDScriptFunction::OPCODE_YIELD : GDScriptFunction::OPCODE_YIELD_SIGNAL); // basic type constructor
-					for (int i = 0; i < arguments.size(); i++)
-						codegen.opcodes.push_back(arguments[i]); //arguments
-					codegen.opcodes.push_back(GDScriptFunction::OPCODE_YIELD_RESUME);
-					//next will be where to place the result :)
-
 				} break;
+				case GDScriptParser::BinaryOpNode::OP_TYPE_TEST: {
+					GDScriptCodeGenerator::Address operand = _parse_expression(codegen, r_error, binary->left_operand);
 
-				//indexing operator
-				case GDScriptParser::OperatorNode::OP_INDEX:
-				case GDScriptParser::OperatorNode::OP_INDEX_NAMED: {
-
-					ERR_FAIL_COND_V(on->arguments.size() != 2, -1);
-
-					int slevel = p_stack_level;
-					bool named = (on->op == GDScriptParser::OperatorNode::OP_INDEX_NAMED);
-
-					int from = _parse_expression(codegen, on->arguments[0], slevel);
-					if (from < 0)
-						return from;
-
-					int index;
-					if (p_index_addr != 0) {
-						index = p_index_addr;
-					} else if (named) {
-						if (on->arguments[0]->type == GDScriptParser::Node::TYPE_SELF && codegen.script && codegen.function_node && !codegen.function_node->_static) {
-
-							GDScriptParser::IdentifierNode *identifier = static_cast<GDScriptParser::IdentifierNode *>(on->arguments[1]);
-							const Map<StringName, GDScript::MemberInfo>::Element *MI = codegen.script->member_indices.find(identifier->name);
-
-#ifdef DEBUG_ENABLED
-							if (MI && MI->get().getter == codegen.function_node->name) {
-								String n = static_cast<GDScriptParser::IdentifierNode *>(on->arguments[1])->name;
-								_set_error("Must use '" + n + "' instead of 'self." + n + "' in getter.", on);
-								return -1;
-							}
-#endif
-
-							if (MI && MI->get().getter == "") {
-								// Faster than indexing self (as if no self. had been used)
-								return (MI->get().index) | (GDScriptFunction::ADDR_TYPE_MEMBER << GDScriptFunction::ADDR_BITS);
-							}
-						}
-
-						index = codegen.get_name_map_pos(static_cast<GDScriptParser::IdentifierNode *>(on->arguments[1])->name);
-
+					if (binary->right_operand->type == GDScriptParser::Node::IDENTIFIER && GDScriptParser::get_builtin_type(static_cast<const GDScriptParser::IdentifierNode *>(binary->right_operand)->name) != Variant::VARIANT_MAX) {
+						// `is` with builtin type)
+						Variant::Type type = GDScriptParser::get_builtin_type(static_cast<const GDScriptParser::IdentifierNode *>(binary->right_operand)->name);
+						gen->write_type_test_builtin(result, operand, type);
 					} else {
-
-						if (on->arguments[1]->type == GDScriptParser::Node::TYPE_CONSTANT && static_cast<const GDScriptParser::ConstantNode *>(on->arguments[1])->value.get_type() == Variant::STRING) {
-							//also, somehow, named (speed up anyway)
-							StringName name = static_cast<const GDScriptParser::ConstantNode *>(on->arguments[1])->value;
-							index = codegen.get_name_map_pos(name);
-							named = true;
-
-						} else {
-							//regular indexing
-							if (from & GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS) {
-								slevel++;
-								codegen.alloc_stack(slevel);
-							}
-
-							index = _parse_expression(codegen, on->arguments[1], slevel);
-							if (index < 0)
-								return index;
+						GDScriptCodeGenerator::Address type = _parse_expression(codegen, r_error, binary->right_operand);
+						if (r_error) {
+							return GDScriptCodeGenerator::Address();
+						}
+						gen->write_type_test(result, operand, type);
+						if (type.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+							gen->pop_temporary();
 						}
 					}
-
-					codegen.opcodes.push_back(named ? GDScriptFunction::OPCODE_GET_NAMED : GDScriptFunction::OPCODE_GET); // perform operator
-					codegen.opcodes.push_back(from); // argument 1
-					codegen.opcodes.push_back(index); // argument 2 (unary only takes one parameter)
-
 				} break;
-				case GDScriptParser::OperatorNode::OP_AND: {
-
-					// AND operator with early out on failure
-
-					int res = _parse_expression(codegen, on->arguments[0], p_stack_level);
-					if (res < 0)
-						return res;
-					codegen.opcodes.push_back(GDScriptFunction::OPCODE_JUMP_IF_NOT);
-					codegen.opcodes.push_back(res);
-					int jump_fail_pos = codegen.opcodes.size();
-					codegen.opcodes.push_back(0);
-
-					res = _parse_expression(codegen, on->arguments[1], p_stack_level);
-					if (res < 0)
-						return res;
-
-					codegen.opcodes.push_back(GDScriptFunction::OPCODE_JUMP_IF_NOT);
-					codegen.opcodes.push_back(res);
-					int jump_fail_pos2 = codegen.opcodes.size();
-					codegen.opcodes.push_back(0);
-
-					codegen.alloc_stack(p_stack_level); //it will be used..
-					codegen.opcodes.push_back(GDScriptFunction::OPCODE_ASSIGN_TRUE);
-					codegen.opcodes.push_back(p_stack_level | GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS);
-					codegen.opcodes.push_back(GDScriptFunction::OPCODE_JUMP);
-					codegen.opcodes.push_back(codegen.opcodes.size() + 3);
-					codegen.opcodes.write[jump_fail_pos] = codegen.opcodes.size();
-					codegen.opcodes.write[jump_fail_pos2] = codegen.opcodes.size();
-					codegen.opcodes.push_back(GDScriptFunction::OPCODE_ASSIGN_FALSE);
-					codegen.opcodes.push_back(p_stack_level | GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS);
-					return p_stack_level | GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS;
-
-				} break;
-				case GDScriptParser::OperatorNode::OP_OR: {
-
-					// OR operator with early out on success
-
-					int res = _parse_expression(codegen, on->arguments[0], p_stack_level);
-					if (res < 0)
-						return res;
-					codegen.opcodes.push_back(GDScriptFunction::OPCODE_JUMP_IF);
-					codegen.opcodes.push_back(res);
-					int jump_success_pos = codegen.opcodes.size();
-					codegen.opcodes.push_back(0);
-
-					res = _parse_expression(codegen, on->arguments[1], p_stack_level);
-					if (res < 0)
-						return res;
-
-					codegen.opcodes.push_back(GDScriptFunction::OPCODE_JUMP_IF);
-					codegen.opcodes.push_back(res);
-					int jump_success_pos2 = codegen.opcodes.size();
-					codegen.opcodes.push_back(0);
-
-					codegen.alloc_stack(p_stack_level); //it will be used..
-					codegen.opcodes.push_back(GDScriptFunction::OPCODE_ASSIGN_FALSE);
-					codegen.opcodes.push_back(p_stack_level | GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS);
-					codegen.opcodes.push_back(GDScriptFunction::OPCODE_JUMP);
-					codegen.opcodes.push_back(codegen.opcodes.size() + 3);
-					codegen.opcodes.write[jump_success_pos] = codegen.opcodes.size();
-					codegen.opcodes.write[jump_success_pos2] = codegen.opcodes.size();
-					codegen.opcodes.push_back(GDScriptFunction::OPCODE_ASSIGN_TRUE);
-					codegen.opcodes.push_back(p_stack_level | GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS);
-					return p_stack_level | GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS;
+				default: {
+					GDScriptCodeGenerator::Address left_operand = _parse_expression(codegen, r_error, binary->left_operand);
+					GDScriptCodeGenerator::Address right_operand = _parse_expression(codegen, r_error, binary->right_operand);
 
-				} break;
-				// ternary operators
-				case GDScriptParser::OperatorNode::OP_TERNARY_IF: {
+					gen->write_operator(result, binary->variant_op, left_operand, right_operand);
 
-					// x IF a ELSE y operator with early out on failure
+					if (right_operand.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+						gen->pop_temporary();
+					}
+					if (left_operand.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+						gen->pop_temporary();
+					}
+				}
+			}
+			return result;
+		} break;
+		case GDScriptParser::Node::TERNARY_OPERATOR: {
+			// x IF a ELSE y operator with early out on failure.
+			const GDScriptParser::TernaryOpNode *ternary = static_cast<const GDScriptParser::TernaryOpNode *>(p_expression);
+			GDScriptCodeGenerator::Address result = codegen.add_temporary(_gdtype_from_datatype(ternary->get_datatype()));
 
-					int res = _parse_expression(codegen, on->arguments[0], p_stack_level);
-					if (res < 0)
-						return res;
-					codegen.opcodes.push_back(GDScriptFunction::OPCODE_JUMP_IF_NOT);
-					codegen.opcodes.push_back(res);
-					int jump_fail_pos = codegen.opcodes.size();
-					codegen.opcodes.push_back(0);
+			gen->write_start_ternary(result);
 
-					res = _parse_expression(codegen, on->arguments[1], p_stack_level);
-					if (res < 0)
-						return res;
+			GDScriptCodeGenerator::Address condition = _parse_expression(codegen, r_error, ternary->condition);
+			if (r_error) {
+				return GDScriptCodeGenerator::Address();
+			}
+			gen->write_ternary_condition(condition);
 
-					codegen.alloc_stack(p_stack_level); //it will be used..
-					codegen.opcodes.push_back(GDScriptFunction::OPCODE_ASSIGN);
-					codegen.opcodes.push_back(p_stack_level | GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS);
-					codegen.opcodes.push_back(res);
-					codegen.opcodes.push_back(GDScriptFunction::OPCODE_JUMP);
-					int jump_past_pos = codegen.opcodes.size();
-					codegen.opcodes.push_back(0);
+			if (condition.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+				gen->pop_temporary();
+			}
 
-					codegen.opcodes.write[jump_fail_pos] = codegen.opcodes.size();
-					res = _parse_expression(codegen, on->arguments[2], p_stack_level);
-					if (res < 0)
-						return res;
+			GDScriptCodeGenerator::Address true_expr = _parse_expression(codegen, r_error, ternary->true_expr);
+			if (r_error) {
+				return GDScriptCodeGenerator::Address();
+			}
+			gen->write_ternary_true_expr(true_expr);
+			if (true_expr.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+				gen->pop_temporary();
+			}
 
-					codegen.opcodes.push_back(GDScriptFunction::OPCODE_ASSIGN);
-					codegen.opcodes.push_back(p_stack_level | GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS);
-					codegen.opcodes.push_back(res);
+			GDScriptCodeGenerator::Address false_expr = _parse_expression(codegen, r_error, ternary->false_expr);
+			if (r_error) {
+				return GDScriptCodeGenerator::Address();
+			}
+			gen->write_ternary_false_expr(false_expr);
+			if (false_expr.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+				gen->pop_temporary();
+			}
 
-					codegen.opcodes.write[jump_past_pos] = codegen.opcodes.size();
+			gen->write_end_ternary();
 
-					return p_stack_level | GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS;
+			return result;
+		} break;
+		case GDScriptParser::Node::ASSIGNMENT: {
+			const GDScriptParser::AssignmentNode *assignment = static_cast<const GDScriptParser::AssignmentNode *>(p_expression);
 
-				} break;
-				//unary operators
-				case GDScriptParser::OperatorNode::OP_NEG: {
-					if (!_create_unary_operator(codegen, on, Variant::OP_NEGATE, p_stack_level)) return -1;
-				} break;
-				case GDScriptParser::OperatorNode::OP_POS: {
-					if (!_create_unary_operator(codegen, on, Variant::OP_POSITIVE, p_stack_level)) return -1;
-				} break;
-				case GDScriptParser::OperatorNode::OP_NOT: {
-					if (!_create_unary_operator(codegen, on, Variant::OP_NOT, p_stack_level)) return -1;
-				} break;
-				case GDScriptParser::OperatorNode::OP_BIT_INVERT: {
-					if (!_create_unary_operator(codegen, on, Variant::OP_BIT_NEGATE, p_stack_level)) return -1;
-				} break;
-				//binary operators (in precedence order)
-				case GDScriptParser::OperatorNode::OP_IN: {
-					if (!_create_binary_operator(codegen, on, Variant::OP_IN, p_stack_level)) return -1;
-				} break;
-				case GDScriptParser::OperatorNode::OP_EQUAL: {
-					if (!_create_binary_operator(codegen, on, Variant::OP_EQUAL, p_stack_level)) return -1;
-				} break;
-				case GDScriptParser::OperatorNode::OP_NOT_EQUAL: {
-					if (!_create_binary_operator(codegen, on, Variant::OP_NOT_EQUAL, p_stack_level)) return -1;
-				} break;
-				case GDScriptParser::OperatorNode::OP_LESS: {
-					if (!_create_binary_operator(codegen, on, Variant::OP_LESS, p_stack_level)) return -1;
-				} break;
-				case GDScriptParser::OperatorNode::OP_LESS_EQUAL: {
-					if (!_create_binary_operator(codegen, on, Variant::OP_LESS_EQUAL, p_stack_level)) return -1;
-				} break;
-				case GDScriptParser::OperatorNode::OP_GREATER: {
-					if (!_create_binary_operator(codegen, on, Variant::OP_GREATER, p_stack_level)) return -1;
-				} break;
-				case GDScriptParser::OperatorNode::OP_GREATER_EQUAL: {
-					if (!_create_binary_operator(codegen, on, Variant::OP_GREATER_EQUAL, p_stack_level)) return -1;
-				} break;
-				case GDScriptParser::OperatorNode::OP_ADD: {
-					if (!_create_binary_operator(codegen, on, Variant::OP_ADD, p_stack_level)) return -1;
-				} break;
-				case GDScriptParser::OperatorNode::OP_SUB: {
-					if (!_create_binary_operator(codegen, on, Variant::OP_SUBTRACT, p_stack_level)) return -1;
-				} break;
-				case GDScriptParser::OperatorNode::OP_MUL: {
-					if (!_create_binary_operator(codegen, on, Variant::OP_MULTIPLY, p_stack_level)) return -1;
-				} break;
-				case GDScriptParser::OperatorNode::OP_DIV: {
-					if (!_create_binary_operator(codegen, on, Variant::OP_DIVIDE, p_stack_level)) return -1;
-				} break;
-				case GDScriptParser::OperatorNode::OP_MOD: {
-					if (!_create_binary_operator(codegen, on, Variant::OP_MODULE, p_stack_level)) return -1;
-				} break;
-				//case GDScriptParser::OperatorNode::OP_SHIFT_LEFT: { if (!_create_binary_operator(codegen,on,Variant::OP_SHIFT_LEFT,p_stack_level)) return -1;} break;
-				//case GDScriptParser::OperatorNode::OP_SHIFT_RIGHT: { if (!_create_binary_operator(codegen,on,Variant::OP_SHIFT_RIGHT,p_stack_level)) return -1;} break;
-				case GDScriptParser::OperatorNode::OP_BIT_AND: {
-					if (!_create_binary_operator(codegen, on, Variant::OP_BIT_AND, p_stack_level)) return -1;
-				} break;
-				case GDScriptParser::OperatorNode::OP_BIT_OR: {
-					if (!_create_binary_operator(codegen, on, Variant::OP_BIT_OR, p_stack_level)) return -1;
-				} break;
-				case GDScriptParser::OperatorNode::OP_BIT_XOR: {
-					if (!_create_binary_operator(codegen, on, Variant::OP_BIT_XOR, p_stack_level)) return -1;
-				} break;
-				//shift
-				case GDScriptParser::OperatorNode::OP_SHIFT_LEFT: {
-					if (!_create_binary_operator(codegen, on, Variant::OP_SHIFT_LEFT, p_stack_level)) return -1;
-				} break;
-				case GDScriptParser::OperatorNode::OP_SHIFT_RIGHT: {
-					if (!_create_binary_operator(codegen, on, Variant::OP_SHIFT_RIGHT, p_stack_level)) return -1;
-				} break;
-				//assignment operators
-				case GDScriptParser::OperatorNode::OP_ASSIGN_ADD:
-				case GDScriptParser::OperatorNode::OP_ASSIGN_SUB:
-				case GDScriptParser::OperatorNode::OP_ASSIGN_MUL:
-				case GDScriptParser::OperatorNode::OP_ASSIGN_DIV:
-				case GDScriptParser::OperatorNode::OP_ASSIGN_MOD:
-				case GDScriptParser::OperatorNode::OP_ASSIGN_SHIFT_LEFT:
-				case GDScriptParser::OperatorNode::OP_ASSIGN_SHIFT_RIGHT:
-				case GDScriptParser::OperatorNode::OP_ASSIGN_BIT_AND:
-				case GDScriptParser::OperatorNode::OP_ASSIGN_BIT_OR:
-				case GDScriptParser::OperatorNode::OP_ASSIGN_BIT_XOR:
-				case GDScriptParser::OperatorNode::OP_INIT_ASSIGN:
-				case GDScriptParser::OperatorNode::OP_ASSIGN: {
-
-					ERR_FAIL_COND_V(on->arguments.size() != 2, -1);
-
-					if (on->arguments[0]->type == GDScriptParser::Node::TYPE_OPERATOR && (static_cast<GDScriptParser::OperatorNode *>(on->arguments[0])->op == GDScriptParser::OperatorNode::OP_INDEX || static_cast<GDScriptParser::OperatorNode *>(on->arguments[0])->op == GDScriptParser::OperatorNode::OP_INDEX_NAMED)) {
-
-						// SET (chained) MODE!
+			if (assignment->assignee->type == GDScriptParser::Node::SUBSCRIPT) {
+				// SET (chained) MODE!
+				const GDScriptParser::SubscriptNode *subscript = static_cast<GDScriptParser::SubscriptNode *>(assignment->assignee);
 #ifdef DEBUG_ENABLED
-						if (static_cast<GDScriptParser::OperatorNode *>(on->arguments[0])->op == GDScriptParser::OperatorNode::OP_INDEX_NAMED) {
-							const GDScriptParser::OperatorNode *inon = static_cast<GDScriptParser::OperatorNode *>(on->arguments[0]);
-
-							if (inon->arguments[0]->type == GDScriptParser::Node::TYPE_SELF && codegen.script && codegen.function_node && !codegen.function_node->_static) {
-
-								const Map<StringName, GDScript::MemberInfo>::Element *MI = codegen.script->member_indices.find(static_cast<GDScriptParser::IdentifierNode *>(inon->arguments[1])->name);
-								if (MI && MI->get().setter == codegen.function_node->name) {
-									String n = static_cast<GDScriptParser::IdentifierNode *>(inon->arguments[1])->name;
-									_set_error("Must use '" + n + "' instead of 'self." + n + "' in setter.", inon);
-									return -1;
+				if (subscript->is_attribute && subscript->base->type == GDScriptParser::Node::SELF && codegen.script) {
+					const Map<StringName, GDScript::MemberInfo>::Element *MI = codegen.script->member_indices.find(subscript->attribute->name);
+					if (MI && MI->get().setter == codegen.function_name) {
+						String n = subscript->attribute->name;
+						_set_error("Must use '" + n + "' instead of 'self." + n + "' in setter.", subscript);
+						r_error = ERR_COMPILATION_FAILED;
+						return GDScriptCodeGenerator::Address();
+					}
+				}
+#endif
+				/* Find chain of sets */
+
+				StringName assign_property;
+
+				List<const GDScriptParser::SubscriptNode *> chain;
+
+				{
+					// Create get/set chain.
+					const GDScriptParser::SubscriptNode *n = subscript;
+					while (true) {
+						chain.push_back(n);
+						if (n->base->type != GDScriptParser::Node::SUBSCRIPT) {
+							// Check for a built-in property.
+							if (n->base->type == GDScriptParser::Node::IDENTIFIER) {
+								GDScriptParser::IdentifierNode *identifier = static_cast<GDScriptParser::IdentifierNode *>(n->base);
+								if (_is_class_member_property(codegen, identifier->name)) {
+									assign_property = identifier->name;
 								}
 							}
+							break;
 						}
-#endif
-
-						int slevel = p_stack_level;
-
-						GDScriptParser::OperatorNode *op = static_cast<GDScriptParser::OperatorNode *>(on->arguments[0]);
-
-						/* Find chain of sets */
+						n = static_cast<const GDScriptParser::SubscriptNode *>(n->base);
+					}
+				}
 
-						StringName assign_property;
+				/* Chain of gets */
 
-						List<GDScriptParser::OperatorNode *> chain;
+				// Get at (potential) root stack pos, so it can be returned.
+				GDScriptCodeGenerator::Address base = _parse_expression(codegen, r_error, chain.back()->get()->base);
+				if (r_error) {
+					return GDScriptCodeGenerator::Address();
+				}
 
-						{
-							//create get/set chain
-							GDScriptParser::OperatorNode *n = op;
-							while (true) {
+				GDScriptCodeGenerator::Address prev_base = base;
 
-								chain.push_back(n);
-								if (n->arguments[0]->type != GDScriptParser::Node::TYPE_OPERATOR) {
+				struct ChainInfo {
+					bool is_named = false;
+					GDScriptCodeGenerator::Address base;
+					GDScriptCodeGenerator::Address key;
+					StringName name;
+				};
 
-									//check for a built-in property
-									if (n->arguments[0]->type == GDScriptParser::Node::TYPE_IDENTIFIER) {
+				List<ChainInfo> set_chain;
 
-										GDScriptParser::IdentifierNode *identifier = static_cast<GDScriptParser::IdentifierNode *>(n->arguments[0]);
-										if (_is_class_member_property(codegen, identifier->name)) {
-											assign_property = identifier->name;
-										}
-									}
-									break;
-								}
-								n = static_cast<GDScriptParser::OperatorNode *>(n->arguments[0]);
-								if (n->op != GDScriptParser::OperatorNode::OP_INDEX && n->op != GDScriptParser::OperatorNode::OP_INDEX_NAMED)
-									break;
-							}
+				for (List<const GDScriptParser::SubscriptNode *>::Element *E = chain.back(); E; E = E->prev()) {
+					if (E == chain.front()) {
+						// Skip the main subscript, since we'll assign to that.
+						break;
+					}
+					const GDScriptParser::SubscriptNode *subscript_elem = E->get();
+					GDScriptCodeGenerator::Address value = codegen.add_temporary(_gdtype_from_datatype(subscript_elem->get_datatype()));
+					GDScriptCodeGenerator::Address key;
+					StringName name;
+
+					if (subscript_elem->is_attribute) {
+						name = subscript_elem->attribute->name;
+						gen->write_get_named(value, name, prev_base);
+					} else {
+						key = _parse_expression(codegen, r_error, subscript_elem->index);
+						if (r_error) {
+							return GDScriptCodeGenerator::Address();
 						}
+						gen->write_get(value, key, prev_base);
+					}
 
-						/* Chain of gets */
+					// Store base and key for setting it back later.
+					set_chain.push_front({ subscript_elem->is_attribute, prev_base, key, name }); // Push to front to invert the list.
+					prev_base = value;
+				}
 
-						//get at (potential) root stack pos, so it can be returned
-						int prev_pos = _parse_expression(codegen, chain.back()->get()->arguments[0], slevel);
-						if (prev_pos < 0)
-							return prev_pos;
-						int retval = prev_pos;
+				// Get value to assign.
+				GDScriptCodeGenerator::Address assigned = _parse_expression(codegen, r_error, assignment->assigned_value);
+				if (r_error) {
+					return GDScriptCodeGenerator::Address();
+				}
+				// Get the key if needed.
+				GDScriptCodeGenerator::Address key;
+				StringName name;
+				if (subscript->is_attribute) {
+					name = subscript->attribute->name;
+				} else {
+					key = _parse_expression(codegen, r_error, subscript->index);
+					if (r_error) {
+						return GDScriptCodeGenerator::Address();
+					}
+				}
 
-						if (retval & GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS) {
-							slevel++;
-							codegen.alloc_stack(slevel);
-						}
+				// Perform operator if any.
+				if (assignment->operation != GDScriptParser::AssignmentNode::OP_NONE) {
+					GDScriptCodeGenerator::Address value = codegen.add_temporary();
+					if (subscript->is_attribute) {
+						gen->write_get_named(value, name, prev_base);
+					} else {
+						gen->write_get(value, key, prev_base);
+					}
+					gen->write_operator(value, assignment->variant_op, value, assigned);
+					if (assigned.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+						gen->pop_temporary();
+					}
+					assigned = value;
+				}
 
-						Vector<int> setchain;
+				// Perform assignment.
+				if (subscript->is_attribute) {
+					gen->write_set_named(prev_base, name, assigned);
+				} else {
+					gen->write_set(prev_base, key, assigned);
+				}
+				if (assigned.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+					gen->pop_temporary();
+				}
 
-						if (assign_property != StringName()) {
+				assigned = prev_base;
 
-							// recover and assign at the end, this allows stuff like
-							// position.x+=2.0
-							// in Node2D
-							setchain.push_back(prev_pos);
-							setchain.push_back(codegen.get_name_map_pos(assign_property));
-							setchain.push_back(GDScriptFunction::OPCODE_SET_MEMBER);
+				// Set back the values into their bases.
+				for (List<ChainInfo>::Element *E = set_chain.front(); E; E = E->next()) {
+					const ChainInfo &info = E->get();
+					if (!info.is_named) {
+						gen->write_set(info.base, info.key, assigned);
+						if (info.key.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+							gen->pop_temporary();
 						}
+					} else {
+						gen->write_set_named(info.base, info.name, assigned);
+					}
+					if (assigned.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+						gen->pop_temporary();
+					}
+					assigned = info.base;
+				}
 
-						for (List<GDScriptParser::OperatorNode *>::Element *E = chain.back(); E; E = E->prev()) {
-
-							if (E == chain.front()) //ignore first
-								break;
-
-							bool named = E->get()->op == GDScriptParser::OperatorNode::OP_INDEX_NAMED;
-							int key_idx;
-
-							if (named) {
-
-								key_idx = codegen.get_name_map_pos(static_cast<const GDScriptParser::IdentifierNode *>(E->get()->arguments[1])->name);
-								//printf("named key %x\n",key_idx);
-
-							} else {
+				// If this is a local member, also assign to it.
+				// This allow things like: position.x += 2.0
+				if (assign_property != StringName()) {
+					gen->write_set_member(assigned, assign_property);
+				}
 
-								if (prev_pos & (GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS)) {
-									slevel++;
-									codegen.alloc_stack(slevel);
-								}
+				if (assigned.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+					gen->pop_temporary();
+				}
+			} else if (assignment->assignee->type == GDScriptParser::Node::IDENTIFIER && _is_class_member_property(codegen, static_cast<GDScriptParser::IdentifierNode *>(assignment->assignee)->name)) {
+				// Assignment to member property.
+				GDScriptCodeGenerator::Address assigned = _parse_expression(codegen, r_error, assignment->assigned_value);
+				if (r_error) {
+					return GDScriptCodeGenerator::Address();
+				}
+				GDScriptCodeGenerator::Address assign_temp = assigned;
 
-								GDScriptParser::Node *key = E->get()->arguments[1];
-								key_idx = _parse_expression(codegen, key, slevel);
-								//printf("expr key %x\n",key_idx);
+				StringName name = static_cast<GDScriptParser::IdentifierNode *>(assignment->assignee)->name;
 
-								//stack was raised here if retval was stack but..
-							}
+				if (assignment->operation != GDScriptParser::AssignmentNode::OP_NONE) {
+					GDScriptCodeGenerator::Address member = codegen.add_temporary();
+					gen->write_get_member(member, name);
+					gen->write_operator(assigned, assignment->variant_op, member, assigned);
+					gen->pop_temporary();
+				}
 
-							if (key_idx < 0) //error
-								return key_idx;
+				gen->write_set_member(assigned, name);
 
-							codegen.opcodes.push_back(named ? GDScriptFunction::OPCODE_GET_NAMED : GDScriptFunction::OPCODE_GET);
-							codegen.opcodes.push_back(prev_pos);
-							codegen.opcodes.push_back(key_idx);
-							slevel++;
-							codegen.alloc_stack(slevel);
-							int dst_pos = (GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS) | slevel;
+				if (assign_temp.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+					gen->pop_temporary();
+				}
+			} else {
+				// Regular assignment.
+				GDScriptCodeGenerator::Address target;
+
+				bool has_setter = false;
+				bool is_in_setter = false;
+				StringName setter_function;
+				if (assignment->assignee->type == GDScriptParser::Node::IDENTIFIER) {
+					StringName var_name = static_cast<const GDScriptParser::IdentifierNode *>(assignment->assignee)->name;
+					if (!codegen.locals.has(var_name) && codegen.script->member_indices.has(var_name)) {
+						setter_function = codegen.script->member_indices[var_name].setter;
+						if (setter_function != StringName()) {
+							has_setter = true;
+							is_in_setter = setter_function == codegen.function_name;
+							target.mode = GDScriptCodeGenerator::Address::MEMBER;
+							target.address = codegen.script->member_indices[var_name].index;
+						}
+					}
+				}
 
-							codegen.opcodes.push_back(dst_pos);
+				if (has_setter) {
+					if (!is_in_setter) {
+						// Store stack slot for the temp value.
+						target = codegen.add_temporary(_gdtype_from_datatype(assignment->assignee->get_datatype()));
+					}
+				} else {
+					target = _parse_expression(codegen, r_error, assignment->assignee);
+					if (r_error) {
+						return GDScriptCodeGenerator::Address();
+					}
+				}
 
-							//add in reverse order, since it will be reverted
+				GDScriptCodeGenerator::Address assigned = _parse_expression(codegen, r_error, assignment->assigned_value);
+				GDScriptCodeGenerator::Address op_result;
+				if (r_error) {
+					return GDScriptCodeGenerator::Address();
+				}
 
-							setchain.push_back(dst_pos);
-							setchain.push_back(key_idx);
-							setchain.push_back(prev_pos);
-							setchain.push_back(named ? GDScriptFunction::OPCODE_SET_NAMED : GDScriptFunction::OPCODE_SET);
+				if (assignment->operation != GDScriptParser::AssignmentNode::OP_NONE) {
+					// Perform operation.
+					op_result = codegen.add_temporary();
+					gen->write_operator(op_result, assignment->variant_op, target, assigned);
+				} else {
+					op_result = assigned;
+					assigned = GDScriptCodeGenerator::Address();
+				}
 
-							prev_pos = dst_pos;
-						}
+				GDScriptDataType assign_type = _gdtype_from_datatype(assignment->assignee->get_datatype());
 
-						setchain.invert();
+				if (has_setter && !is_in_setter) {
+					// Call setter.
+					Vector<GDScriptCodeGenerator::Address> args;
+					args.push_back(op_result);
+					gen->write_call(GDScriptCodeGenerator::Address(), GDScriptCodeGenerator::Address(GDScriptCodeGenerator::Address::SELF), setter_function, args);
+				} else {
+					// Just assign.
+					gen->write_assign(target, op_result);
+				}
 
-						int set_index;
-						bool named = false;
+				if (op_result.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+					gen->pop_temporary();
+				}
+				if (assigned.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+					gen->pop_temporary();
+				}
+				if (target.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+					gen->pop_temporary();
+				}
+			}
+			return GDScriptCodeGenerator::Address(); // Assignment does not return a value.
+		} break;
+		default: {
+			ERR_FAIL_V_MSG(GDScriptCodeGenerator::Address(), "Bug in bytecode compiler, unexpected node in parse tree while parsing expression."); // Unreachable code.
+		} break;
+	}
+}
 
-						if (op->op == GDScriptParser::OperatorNode::OP_INDEX_NAMED) {
+GDScriptCodeGenerator::Address GDScriptCompiler::_parse_match_pattern(CodeGen &codegen, Error &r_error, const GDScriptParser::PatternNode *p_pattern, const GDScriptCodeGenerator::Address &p_value_addr, const GDScriptCodeGenerator::Address &p_type_addr, const GDScriptCodeGenerator::Address &p_previous_test, bool p_is_first, bool p_is_nested) {
+	switch (p_pattern->pattern_type) {
+		case GDScriptParser::PatternNode::PT_LITERAL: {
+			if (p_is_nested) {
+				codegen.generator->write_and_left_operand(p_previous_test);
+			} else if (!p_is_first) {
+				codegen.generator->write_or_left_operand(p_previous_test);
+			}
 
-							set_index = codegen.get_name_map_pos(static_cast<const GDScriptParser::IdentifierNode *>(op->arguments[1])->name);
-							named = true;
-						} else {
+			// Get literal type into constant map.
+			GDScriptCodeGenerator::Address literal_type_addr = codegen.add_constant((int)p_pattern->literal->value.get_type());
 
-							set_index = _parse_expression(codegen, op->arguments[1], slevel + 1);
-							named = false;
-						}
+			// Equality is always a boolean.
+			GDScriptDataType equality_type;
+			equality_type.has_type = true;
+			equality_type.kind = GDScriptDataType::BUILTIN;
+			equality_type.builtin_type = Variant::BOOL;
 
-						if (set_index < 0) //error
-							return set_index;
+			// Check type equality.
+			GDScriptCodeGenerator::Address type_equality_addr = codegen.add_temporary(equality_type);
+			codegen.generator->write_operator(type_equality_addr, Variant::OP_EQUAL, p_type_addr, literal_type_addr);
+			codegen.generator->write_and_left_operand(type_equality_addr);
 
-						if (set_index & GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS) {
-							slevel++;
-							codegen.alloc_stack(slevel);
-						}
+			// Get literal.
+			GDScriptCodeGenerator::Address literal_addr = _parse_expression(codegen, r_error, p_pattern->literal);
+			if (r_error) {
+				return GDScriptCodeGenerator::Address();
+			}
 
-						int set_value = _parse_assign_right_expression(codegen, on, slevel + 1, named ? 0 : set_index);
-						if (set_value < 0) //error
-							return set_value;
+			// Check value equality.
+			GDScriptCodeGenerator::Address equality_addr = codegen.add_temporary(equality_type);
+			codegen.generator->write_operator(equality_addr, Variant::OP_EQUAL, p_value_addr, literal_addr);
+			codegen.generator->write_and_right_operand(equality_addr);
 
-						codegen.opcodes.push_back(named ? GDScriptFunction::OPCODE_SET_NAMED : GDScriptFunction::OPCODE_SET);
-						codegen.opcodes.push_back(prev_pos);
-						codegen.opcodes.push_back(set_index);
-						codegen.opcodes.push_back(set_value);
+			// AND both together (reuse temporary location).
+			codegen.generator->write_end_and(type_equality_addr);
 
-						for (int i = 0; i < setchain.size(); i++) {
+			codegen.generator->pop_temporary(); // Remove equality_addr from stack.
 
-							codegen.opcodes.push_back(setchain[i]);
-						}
+			if (literal_addr.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+				codegen.generator->pop_temporary();
+			}
 
-						return retval;
+			// If this isn't the first, we need to OR with the previous pattern. If it's nested, we use AND instead.
+			if (p_is_nested) {
+				// Use the previous value as target, since we only need one temporary variable.
+				codegen.generator->write_and_right_operand(type_equality_addr);
+				codegen.generator->write_end_and(p_previous_test);
+			} else if (!p_is_first) {
+				// Use the previous value as target, since we only need one temporary variable.
+				codegen.generator->write_or_right_operand(type_equality_addr);
+				codegen.generator->write_end_or(p_previous_test);
+			} else {
+				// Just assign this value to the accumulator temporary.
+				codegen.generator->write_assign(p_previous_test, type_equality_addr);
+			}
+			codegen.generator->pop_temporary(); // Remove type_equality_addr.
 
-					} else if (on->arguments[0]->type == GDScriptParser::Node::TYPE_IDENTIFIER && _is_class_member_property(codegen, static_cast<GDScriptParser::IdentifierNode *>(on->arguments[0])->name)) {
-						//assignment to member property
+			return p_previous_test;
+		} break;
+		case GDScriptParser::PatternNode::PT_EXPRESSION: {
+			if (p_is_nested) {
+				codegen.generator->write_and_left_operand(p_previous_test);
+			} else if (!p_is_first) {
+				codegen.generator->write_or_left_operand(p_previous_test);
+			}
+			// Create the result temps first since it's the last to go away.
+			GDScriptCodeGenerator::Address result_addr = codegen.add_temporary();
+			GDScriptCodeGenerator::Address equality_test_addr = codegen.add_temporary();
+
+			// Evaluate expression.
+			GDScriptCodeGenerator::Address expr_addr;
+			expr_addr = _parse_expression(codegen, r_error, p_pattern->expression);
+			if (r_error) {
+				return GDScriptCodeGenerator::Address();
+			}
 
-						int slevel = p_stack_level;
+			// Evaluate expression type.
+			Vector<GDScriptCodeGenerator::Address> typeof_args;
+			typeof_args.push_back(expr_addr);
+			codegen.generator->write_call_builtin(result_addr, GDScriptFunctions::TYPE_OF, typeof_args);
 
-						int src_address = _parse_assign_right_expression(codegen, on, slevel);
-						if (src_address < 0)
-							return -1;
+			// Check type equality.
+			codegen.generator->write_operator(result_addr, Variant::OP_EQUAL, p_type_addr, result_addr);
+			codegen.generator->write_and_left_operand(result_addr);
 
-						StringName name = static_cast<GDScriptParser::IdentifierNode *>(on->arguments[0])->name;
+			// Check value equality.
+			codegen.generator->write_operator(result_addr, Variant::OP_EQUAL, p_value_addr, expr_addr);
+			codegen.generator->write_and_right_operand(equality_test_addr);
 
-						codegen.opcodes.push_back(GDScriptFunction::OPCODE_SET_MEMBER);
-						codegen.opcodes.push_back(codegen.get_name_map_pos(name));
-						codegen.opcodes.push_back(src_address);
+			// AND both type and value equality.
+			codegen.generator->write_end_and(result_addr);
 
-						return GDScriptFunction::ADDR_TYPE_NIL << GDScriptFunction::ADDR_BITS;
-					} else {
+			// We don't need the expression temporary anymore.
+			if (expr_addr.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+				codegen.generator->pop_temporary();
+			}
+			codegen.generator->pop_temporary(); // Remove type equality temporary.
+
+			// If this isn't the first, we need to OR with the previous pattern. If it's nested, we use AND instead.
+			if (p_is_nested) {
+				// Use the previous value as target, since we only need one temporary variable.
+				codegen.generator->write_and_right_operand(result_addr);
+				codegen.generator->write_end_and(p_previous_test);
+			} else if (!p_is_first) {
+				// Use the previous value as target, since we only need one temporary variable.
+				codegen.generator->write_or_right_operand(result_addr);
+				codegen.generator->write_end_or(p_previous_test);
+			} else {
+				// Just assign this value to the accumulator temporary.
+				codegen.generator->write_assign(p_previous_test, result_addr);
+			}
+			codegen.generator->pop_temporary(); // Remove temp result addr.
 
-						//REGULAR ASSIGNMENT MODE!!
+			return p_previous_test;
+		} break;
+		case GDScriptParser::PatternNode::PT_ARRAY: {
+			if (p_is_nested) {
+				codegen.generator->write_and_left_operand(p_previous_test);
+			} else if (!p_is_first) {
+				codegen.generator->write_or_left_operand(p_previous_test);
+			}
+			// Get array type into constant map.
+			GDScriptCodeGenerator::Address array_type_addr = codegen.add_constant((int)Variant::ARRAY);
+
+			// Equality is always a boolean.
+			GDScriptDataType temp_type;
+			temp_type.has_type = true;
+			temp_type.kind = GDScriptDataType::BUILTIN;
+			temp_type.builtin_type = Variant::BOOL;
+
+			// Check type equality.
+			GDScriptCodeGenerator::Address result_addr = codegen.add_temporary(temp_type);
+			codegen.generator->write_operator(result_addr, Variant::OP_EQUAL, p_type_addr, array_type_addr);
+			codegen.generator->write_and_left_operand(result_addr);
+
+			// Store pattern length in constant map.
+			GDScriptCodeGenerator::Address array_length_addr = codegen.add_constant(p_pattern->rest_used ? p_pattern->array.size() - 1 : p_pattern->array.size());
+
+			// Get value length.
+			temp_type.builtin_type = Variant::INT;
+			GDScriptCodeGenerator::Address value_length_addr = codegen.add_temporary(temp_type);
+			Vector<GDScriptCodeGenerator::Address> len_args;
+			len_args.push_back(p_value_addr);
+			codegen.generator->write_call_builtin(value_length_addr, GDScriptFunctions::LEN, len_args);
+
+			// Test length compatibility.
+			temp_type.builtin_type = Variant::BOOL;
+			GDScriptCodeGenerator::Address length_compat_addr = codegen.add_temporary(temp_type);
+			codegen.generator->write_operator(length_compat_addr, p_pattern->rest_used ? Variant::OP_GREATER_EQUAL : Variant::OP_EQUAL, value_length_addr, array_length_addr);
+			codegen.generator->write_and_right_operand(length_compat_addr);
+
+			// AND type and length check.
+			codegen.generator->write_end_and(result_addr);
+
+			// Remove length temporaries.
+			codegen.generator->pop_temporary();
+			codegen.generator->pop_temporary();
+
+			// If this isn't the first, we need to OR with the previous pattern. If it's nested, we use AND instead.
+			if (p_is_nested) {
+				// Use the previous value as target, since we only need one temporary variable.
+				codegen.generator->write_and_right_operand(result_addr);
+				codegen.generator->write_end_and(p_previous_test);
+			} else if (!p_is_first) {
+				// Use the previous value as target, since we only need one temporary variable.
+				codegen.generator->write_or_right_operand(result_addr);
+				codegen.generator->write_end_or(p_previous_test);
+			} else {
+				// Just assign this value to the accumulator temporary.
+				codegen.generator->write_assign(p_previous_test, result_addr);
+			}
+			codegen.generator->pop_temporary(); // Remove temp result addr.
+
+			// Create temporaries outside the loop so they can be reused.
+			GDScriptCodeGenerator::Address element_addr = codegen.add_temporary();
+			GDScriptCodeGenerator::Address element_type_addr = codegen.add_temporary();
+			GDScriptCodeGenerator::Address test_addr = p_previous_test;
+
+			// Evaluate element by element.
+			for (int i = 0; i < p_pattern->array.size(); i++) {
+				if (p_pattern->array[i]->pattern_type == GDScriptParser::PatternNode::PT_REST) {
+					// Don't want to access an extra element of the user array.
+					break;
+				}
 
-						int slevel = p_stack_level;
+				// Use AND here too, as we don't want to be checking elements if previous test failed (which means this might be an invalid get).
+				codegen.generator->write_and_left_operand(test_addr);
 
-						int dst_address_a = _parse_expression(codegen, on->arguments[0], slevel, false, on->op == GDScriptParser::OperatorNode::OP_INIT_ASSIGN);
-						if (dst_address_a < 0)
-							return -1;
+				// Add index to constant map.
+				GDScriptCodeGenerator::Address index_addr = codegen.add_constant(i);
 
-						if (dst_address_a & GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS) {
-							slevel++;
-							codegen.alloc_stack(slevel);
-						}
+				// Get the actual element from the user-sent array.
+				codegen.generator->write_get(element_addr, index_addr, p_value_addr);
 
-						int src_address_b = _parse_assign_right_expression(codegen, on, slevel);
-						if (src_address_b < 0)
-							return -1;
-
-						GDScriptDataType assign_type = _gdtype_from_datatype(on->arguments[0]->get_datatype());
-
-						if (assign_type.has_type && !on->datatype.has_type) {
-							// Typed assignment
-							switch (assign_type.kind) {
-								case GDScriptDataType::BUILTIN: {
-									codegen.opcodes.push_back(GDScriptFunction::OPCODE_ASSIGN_TYPED_BUILTIN); // perform operator
-									codegen.opcodes.push_back(assign_type.builtin_type); // variable type
-									codegen.opcodes.push_back(dst_address_a); // argument 1
-									codegen.opcodes.push_back(src_address_b); // argument 2
-								} break;
-								case GDScriptDataType::NATIVE: {
-									int class_idx;
-									if (GDScriptLanguage::get_singleton()->get_global_map().has(assign_type.native_type)) {
-
-										class_idx = GDScriptLanguage::get_singleton()->get_global_map()[assign_type.native_type];
-										class_idx |= (GDScriptFunction::ADDR_TYPE_GLOBAL << GDScriptFunction::ADDR_BITS); //argument (stack root)
-									} else {
-										_set_error("Invalid native class type '" + String(assign_type.native_type) + "'.", on->arguments[0]);
-										return -1;
-									}
-									codegen.opcodes.push_back(GDScriptFunction::OPCODE_ASSIGN_TYPED_NATIVE); // perform operator
-									codegen.opcodes.push_back(class_idx); // variable type
-									codegen.opcodes.push_back(dst_address_a); // argument 1
-									codegen.opcodes.push_back(src_address_b); // argument 2
-								} break;
-								case GDScriptDataType::SCRIPT:
-								case GDScriptDataType::GDSCRIPT: {
-
-									Variant script = assign_type.script_type;
-									int idx = codegen.get_constant_pos(script);
-									idx |= GDScriptFunction::ADDR_TYPE_LOCAL_CONSTANT << GDScriptFunction::ADDR_BITS; //make it a local constant (faster access)
-
-									codegen.opcodes.push_back(GDScriptFunction::OPCODE_ASSIGN_TYPED_SCRIPT); // perform operator
-									codegen.opcodes.push_back(idx); // variable type
-									codegen.opcodes.push_back(dst_address_a); // argument 1
-									codegen.opcodes.push_back(src_address_b); // argument 2
-								} break;
-								default: {
-									ERR_PRINT("Compiler bug: unresolved assign.");
-
-									// Shouldn't get here, but fail-safe to a regular assignment
-									codegen.opcodes.push_back(GDScriptFunction::OPCODE_ASSIGN); // perform operator
-									codegen.opcodes.push_back(dst_address_a); // argument 1
-									codegen.opcodes.push_back(src_address_b); // argument 2 (unary only takes one parameter)
-								}
-							}
-						} else {
-							// Either untyped assignment or already type-checked by the parser
-							codegen.opcodes.push_back(GDScriptFunction::OPCODE_ASSIGN); // perform operator
-							codegen.opcodes.push_back(dst_address_a); // argument 1
-							codegen.opcodes.push_back(src_address_b); // argument 2 (unary only takes one parameter)
-						}
-						return dst_address_a; //if anything, returns wathever was assigned or correct stack position
-					}
-				} break;
-				case GDScriptParser::OperatorNode::OP_IS: {
+				// Also get type of element.
+				Vector<GDScriptCodeGenerator::Address> typeof_args;
+				typeof_args.push_back(element_addr);
+				codegen.generator->write_call_builtin(element_type_addr, GDScriptFunctions::TYPE_OF, typeof_args);
 
-					ERR_FAIL_COND_V(on->arguments.size() != 2, false);
+				// Try the pattern inside the element.
+				test_addr = _parse_match_pattern(codegen, r_error, p_pattern->array[i], element_addr, element_type_addr, p_previous_test, false, true);
+				if (r_error != OK) {
+					return GDScriptCodeGenerator::Address();
+				}
 
-					int slevel = p_stack_level;
+				codegen.generator->write_and_right_operand(test_addr);
+				codegen.generator->write_end_and(test_addr);
+			}
+			// Remove element temporaries.
+			codegen.generator->pop_temporary();
+			codegen.generator->pop_temporary();
 
-					int src_address_a = _parse_expression(codegen, on->arguments[0], slevel);
-					if (src_address_a < 0)
-						return -1;
+			return test_addr;
+		} break;
+		case GDScriptParser::PatternNode::PT_DICTIONARY: {
+			if (p_is_nested) {
+				codegen.generator->write_and_left_operand(p_previous_test);
+			} else if (!p_is_first) {
+				codegen.generator->write_or_left_operand(p_previous_test);
+			}
+			// Get dictionary type into constant map.
+			GDScriptCodeGenerator::Address dict_type_addr = codegen.add_constant((int)Variant::DICTIONARY);
+
+			// Equality is always a boolean.
+			GDScriptDataType temp_type;
+			temp_type.has_type = true;
+			temp_type.kind = GDScriptDataType::BUILTIN;
+			temp_type.builtin_type = Variant::BOOL;
+
+			// Check type equality.
+			GDScriptCodeGenerator::Address result_addr = codegen.add_temporary(temp_type);
+			codegen.generator->write_operator(result_addr, Variant::OP_EQUAL, p_type_addr, dict_type_addr);
+			codegen.generator->write_and_left_operand(result_addr);
+
+			// Store pattern length in constant map.
+			GDScriptCodeGenerator::Address dict_length_addr = codegen.add_constant(p_pattern->rest_used ? p_pattern->dictionary.size() - 1 : p_pattern->dictionary.size());
+
+			// Get user's dictionary length.
+			temp_type.builtin_type = Variant::INT;
+			GDScriptCodeGenerator::Address value_length_addr = codegen.add_temporary(temp_type);
+			Vector<GDScriptCodeGenerator::Address> func_args;
+			func_args.push_back(p_value_addr);
+			codegen.generator->write_call_builtin(value_length_addr, GDScriptFunctions::LEN, func_args);
+
+			// Test length compatibility.
+			temp_type.builtin_type = Variant::BOOL;
+			GDScriptCodeGenerator::Address length_compat_addr = codegen.add_temporary(temp_type);
+			codegen.generator->write_operator(length_compat_addr, p_pattern->rest_used ? Variant::OP_GREATER_EQUAL : Variant::OP_EQUAL, value_length_addr, dict_length_addr);
+			codegen.generator->write_and_right_operand(length_compat_addr);
+
+			// AND type and length check.
+			codegen.generator->write_end_and(result_addr);
+
+			// Remove length temporaries.
+			codegen.generator->pop_temporary();
+			codegen.generator->pop_temporary();
+
+			// If this isn't the first, we need to OR with the previous pattern. If it's nested, we use AND instead.
+			if (p_is_nested) {
+				// Use the previous value as target, since we only need one temporary variable.
+				codegen.generator->write_and_right_operand(result_addr);
+				codegen.generator->write_end_and(p_previous_test);
+			} else if (!p_is_first) {
+				// Use the previous value as target, since we only need one temporary variable.
+				codegen.generator->write_or_right_operand(result_addr);
+				codegen.generator->write_end_or(p_previous_test);
+			} else {
+				// Just assign this value to the accumulator temporary.
+				codegen.generator->write_assign(p_previous_test, result_addr);
+			}
+			codegen.generator->pop_temporary(); // Remove temp result addr.
+
+			// Create temporaries outside the loop so they can be reused.
+			temp_type.builtin_type = Variant::BOOL;
+			GDScriptCodeGenerator::Address test_result = codegen.add_temporary(temp_type);
+			GDScriptCodeGenerator::Address element_addr = codegen.add_temporary();
+			GDScriptCodeGenerator::Address element_type_addr = codegen.add_temporary();
+			GDScriptCodeGenerator::Address test_addr = p_previous_test;
+
+			// Evaluate element by element.
+			for (int i = 0; i < p_pattern->dictionary.size(); i++) {
+				const GDScriptParser::PatternNode::Pair &element = p_pattern->dictionary[i];
+				if (element.value_pattern && element.value_pattern->pattern_type == GDScriptParser::PatternNode::PT_REST) {
+					// Ignore rest pattern.
+					break;
+				}
 
-					if (src_address_a & GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS)
-						slevel++; //uses stack for return, increase stack
+				// Use AND here too, as we don't want to be checking elements if previous test failed (which means this might be an invalid get).
+				codegen.generator->write_and_left_operand(test_addr);
 
-					int src_address_b = _parse_expression(codegen, on->arguments[1], slevel);
-					if (src_address_b < 0)
-						return -1;
+				// Get the pattern key.
+				GDScriptCodeGenerator::Address pattern_key_addr = _parse_expression(codegen, r_error, element.key);
+				if (r_error) {
+					return GDScriptCodeGenerator::Address();
+				}
 
-					codegen.opcodes.push_back(GDScriptFunction::OPCODE_EXTENDS_TEST); // perform operator
-					codegen.opcodes.push_back(src_address_a); // argument 1
-					codegen.opcodes.push_back(src_address_b); // argument 2 (unary only takes one parameter)
+				// Check if pattern key exists in user's dictionary. This will be AND-ed with next result.
+				func_args.clear();
+				func_args.push_back(pattern_key_addr);
+				codegen.generator->write_call(test_result, p_value_addr, "has", func_args);
 
-				} break;
-				case GDScriptParser::OperatorNode::OP_IS_BUILTIN: {
-					ERR_FAIL_COND_V(on->arguments.size() != 2, false);
-					ERR_FAIL_COND_V(on->arguments[1]->type != GDScriptParser::Node::TYPE_TYPE, false);
+				if (element.value_pattern != nullptr) {
+					// Use AND here too, as we don't want to be checking elements if previous test failed (which means this might be an invalid get).
+					codegen.generator->write_and_left_operand(test_result);
 
-					int slevel = p_stack_level;
+					// Get actual value from user dictionary.
+					codegen.generator->write_get(element_addr, pattern_key_addr, p_value_addr);
 
-					int src_address_a = _parse_expression(codegen, on->arguments[0], slevel);
-					if (src_address_a < 0)
-						return -1;
+					// Also get type of value.
+					func_args.clear();
+					func_args.push_back(element_addr);
+					codegen.generator->write_call_builtin(element_type_addr, GDScriptFunctions::TYPE_OF, func_args);
 
-					if (src_address_a & GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS)
-						slevel++; //uses stack for return, increase stack
+					// Try the pattern inside the value.
+					test_addr = _parse_match_pattern(codegen, r_error, element.value_pattern, element_addr, element_type_addr, test_addr, false, true);
+					if (r_error != OK) {
+						return GDScriptCodeGenerator::Address();
+					}
+					codegen.generator->write_and_right_operand(test_addr);
+					codegen.generator->write_end_and(test_addr);
+				}
 
-					const GDScriptParser::TypeNode *tn = static_cast<const GDScriptParser::TypeNode *>(on->arguments[1]);
+				codegen.generator->write_and_right_operand(test_addr);
+				codegen.generator->write_end_and(test_addr);
 
-					codegen.opcodes.push_back(GDScriptFunction::OPCODE_IS_BUILTIN); // perform operator
-					codegen.opcodes.push_back(src_address_a); // argument 1
-					codegen.opcodes.push_back((int)tn->vtype); // argument 2 (unary only takes one parameter)
-				} break;
-				default: {
+				// Remove pattern key temporary.
+				if (pattern_key_addr.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+					codegen.generator->pop_temporary();
+				}
+			}
 
-					ERR_FAIL_V_MSG(0, "Bug in bytecode compiler, unexpected operator #" + itos(on->op) + " in parse tree while parsing expression."); //unreachable code
+			// Remove element temporaries.
+			codegen.generator->pop_temporary();
+			codegen.generator->pop_temporary();
+			codegen.generator->pop_temporary();
 
-				} break;
+			return test_addr;
+		} break;
+		case GDScriptParser::PatternNode::PT_REST:
+			// Do nothing.
+			return p_previous_test;
+			break;
+		case GDScriptParser::PatternNode::PT_BIND: {
+			if (p_is_nested) {
+				codegen.generator->write_and_left_operand(p_previous_test);
+			} else if (!p_is_first) {
+				codegen.generator->write_or_left_operand(p_previous_test);
 			}
+			// Get the bind address.
+			GDScriptCodeGenerator::Address bind = codegen.locals[p_pattern->bind->name];
 
-			int dst_addr = (p_stack_level) | (GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS);
-			codegen.opcodes.push_back(dst_addr); // append the stack level as destination address of the opcode
-			codegen.alloc_stack(p_stack_level);
-			return dst_addr;
-		} break;
-		//TYPE_TYPE,
-		default: {
+			// Assign value to bound variable.
+			codegen.generator->write_assign(bind, p_value_addr);
+		}
+			[[fallthrough]]; // Act like matching anything too.
+		case GDScriptParser::PatternNode::PT_WILDCARD:
+			// If this is a fall through we don't want to do this again.
+			if (p_pattern->pattern_type != GDScriptParser::PatternNode::PT_BIND) {
+				if (p_is_nested) {
+					codegen.generator->write_and_left_operand(p_previous_test);
+				} else if (!p_is_first) {
+					codegen.generator->write_or_left_operand(p_previous_test);
+				}
+			}
+			// This matches anything so just do the same as `if(true)`.
+			// If this isn't the first, we need to OR with the previous pattern. If it's nested, we use AND instead.
+			if (p_is_nested) {
+				// Use the operator with the `true` constant so it works as always matching.
+				GDScriptCodeGenerator::Address constant = codegen.add_constant(true);
+				codegen.generator->write_and_right_operand(constant);
+				codegen.generator->write_end_and(p_previous_test);
+			} else if (!p_is_first) {
+				// Use the operator with the `true` constant so it works as always matching.
+				GDScriptCodeGenerator::Address constant = codegen.add_constant(true);
+				codegen.generator->write_or_right_operand(constant);
+				codegen.generator->write_end_or(p_previous_test);
+			} else {
+				// Just assign this value to the accumulator temporary.
+				codegen.generator->write_assign_true(p_previous_test);
+			}
+			return p_previous_test;
+	}
+	ERR_FAIL_V_MSG(p_previous_test, "Reaching the end of pattern compilation without matching a pattern.");
+}
 
-			ERR_FAIL_V_MSG(-1, "Bug in bytecode compiler, unexpected node in parse tree while parsing expression."); //unreachable code
-		} break;
+void GDScriptCompiler::_add_locals_in_block(CodeGen &codegen, const GDScriptParser::SuiteNode *p_block) {
+	for (int i = 0; i < p_block->locals.size(); i++) {
+		if (p_block->locals[i].type == GDScriptParser::SuiteNode::Local::PARAMETER || p_block->locals[i].type == GDScriptParser::SuiteNode::Local::FOR_VARIABLE) {
+			// Parameters are added directly from function and loop variables are declared explicitly.
+			continue;
+		}
+		codegen.add_local(p_block->locals[i].name, _gdtype_from_datatype(p_block->locals[i].get_datatype()));
 	}
 }
 
-Error GDScriptCompiler::_parse_block(CodeGen &codegen, const GDScriptParser::BlockNode *p_block, int p_stack_level, int p_break_addr, int p_continue_addr) {
+Error GDScriptCompiler::_parse_block(CodeGen &codegen, const GDScriptParser::SuiteNode *p_block, bool p_add_locals) {
+	Error error = OK;
+	GDScriptCodeGenerator *gen = codegen.generator;
 
-	codegen.push_stack_identifiers();
-	int new_identifiers = 0;
-	codegen.current_line = p_block->line;
+	codegen.start_block();
 
-	for (int i = 0; i < p_block->statements.size(); i++) {
+	if (p_add_locals) {
+		_add_locals_in_block(codegen, p_block);
+	}
 
+	for (int i = 0; i < p_block->statements.size(); i++) {
 		const GDScriptParser::Node *s = p_block->statements[i];
 
-		switch (s->type) {
-			case GDScriptParser::Node::TYPE_NEWLINE: {
 #ifdef DEBUG_ENABLED
-				const GDScriptParser::NewLineNode *nl = static_cast<const GDScriptParser::NewLineNode *>(s);
-				codegen.opcodes.push_back(GDScriptFunction::OPCODE_LINE);
-				codegen.opcodes.push_back(nl->line);
-				codegen.current_line = nl->line;
+		// Add a newline before each statement, since the debugger needs those.
+		gen->write_newline(s->start_line);
 #endif
-			} break;
-			case GDScriptParser::Node::TYPE_CONTROL_FLOW: {
-				// try subblocks
-
-				const GDScriptParser::ControlFlowNode *cf = static_cast<const GDScriptParser::ControlFlowNode *>(s);
-
-				switch (cf->cf_type) {
-
-					case GDScriptParser::ControlFlowNode::CF_MATCH: {
-						GDScriptParser::MatchNode *match = cf->match;
 
-						GDScriptParser::IdentifierNode *id = memnew(GDScriptParser::IdentifierNode);
-						id->name = "#match_value";
+		switch (s->type) {
+			case GDScriptParser::Node::MATCH: {
+				const GDScriptParser::MatchNode *match = static_cast<const GDScriptParser::MatchNode *>(s);
 
-						// var #match_value
-						// copied because there is no _parse_statement :(
-						codegen.add_stack_identifier(id->name, p_stack_level++);
-						codegen.alloc_stack(p_stack_level);
-						new_identifiers++;
+				gen->start_match();
+				codegen.start_block();
 
-						GDScriptParser::OperatorNode *op = memnew(GDScriptParser::OperatorNode);
-						op->op = GDScriptParser::OperatorNode::OP_ASSIGN;
-						op->arguments.push_back(id);
-						op->arguments.push_back(match->val_to_match);
+				// Evaluate the match expression.
+				GDScriptCodeGenerator::Address value = _parse_expression(codegen, error, match->test);
+				if (error) {
+					return error;
+				}
 
-						int ret = _parse_expression(codegen, op, p_stack_level);
-						if (ret < 0) {
-							memdelete(id);
-							memdelete(op);
-							return ERR_PARSE_ERROR;
-						}
+				// Then, let's save the type of the value in the stack too, so we can reuse for later comparisons.
+				GDScriptCodeGenerator::Address type = codegen.add_temporary();
+				Vector<GDScriptCodeGenerator::Address> typeof_args;
+				typeof_args.push_back(value);
+				gen->write_call_builtin(type, GDScriptFunctions::TYPE_OF, typeof_args);
+
+				// Now we can actually start testing.
+				// For each branch.
+				for (int j = 0; j < match->branches.size(); j++) {
+					if (j > 0) {
+						// Use `else` to not check the next branch after matching.
+						gen->write_else();
+					}
 
-						// break address
-						codegen.opcodes.push_back(GDScriptFunction::OPCODE_JUMP);
-						codegen.opcodes.push_back(codegen.opcodes.size() + 3);
-						int break_addr = codegen.opcodes.size();
-						codegen.opcodes.push_back(GDScriptFunction::OPCODE_JUMP);
-						codegen.opcodes.push_back(0); // break addr
-
-						for (int j = 0; j < match->compiled_pattern_branches.size(); j++) {
-							GDScriptParser::MatchNode::CompiledPatternBranch branch = match->compiled_pattern_branches[j];
-
-							// jump over continue
-							// jump unconditionally
-							// continue address
-							// compile the condition
-							int ret2 = _parse_expression(codegen, branch.compiled_pattern, p_stack_level);
-							if (ret2 < 0) {
-								memdelete(id);
-								memdelete(op);
-								return ERR_PARSE_ERROR;
-							}
+					const GDScriptParser::MatchBranchNode *branch = match->branches[j];
 
-							codegen.opcodes.push_back(GDScriptFunction::OPCODE_JUMP_IF);
-							codegen.opcodes.push_back(ret2);
-							codegen.opcodes.push_back(codegen.opcodes.size() + 3);
-							int continue_addr = codegen.opcodes.size();
-							codegen.opcodes.push_back(GDScriptFunction::OPCODE_JUMP);
-							codegen.opcodes.push_back(0);
-
-							Error err = _parse_block(codegen, branch.body, p_stack_level, p_break_addr, continue_addr);
-							if (err) {
-								memdelete(id);
-								memdelete(op);
-								return ERR_PARSE_ERROR;
-							}
+					gen->start_match_branch(); // Need so lower level code can patch 'continue' jumps.
+					codegen.start_block(); // Create an extra block around for binds.
 
-							codegen.opcodes.push_back(GDScriptFunction::OPCODE_JUMP);
-							codegen.opcodes.push_back(break_addr);
+					// Add locals in block before patterns, so temporaries don't use the stack address for binds.
+					_add_locals_in_block(codegen, branch->block);
 
-							codegen.opcodes.write[continue_addr + 1] = codegen.opcodes.size();
+#ifdef DEBUG_ENABLED
+					// Add a newline before each branch, since the debugger needs those.
+					gen->write_newline(branch->start_line);
+#endif
+					// For each pattern in branch.
+					GDScriptCodeGenerator::Address pattern_result = codegen.add_temporary();
+					for (int k = 0; k < branch->patterns.size(); k++) {
+						pattern_result = _parse_match_pattern(codegen, error, branch->patterns[k], value, type, pattern_result, k == 0, false);
+						if (error != OK) {
+							return error;
 						}
+					}
 
-						codegen.opcodes.write[break_addr + 1] = codegen.opcodes.size();
-
-						memdelete(id);
-						memdelete(op);
-
-					} break;
+					// Check if pattern did match.
+					gen->write_if(pattern_result);
 
-					case GDScriptParser::ControlFlowNode::CF_IF: {
+					// Remove the result from stack.
+					gen->pop_temporary();
 
-						int ret2 = _parse_expression(codegen, cf->arguments[0], p_stack_level, false);
-						if (ret2 < 0)
-							return ERR_PARSE_ERROR;
-
-						codegen.opcodes.push_back(GDScriptFunction::OPCODE_JUMP_IF_NOT);
-						codegen.opcodes.push_back(ret2);
-						int else_addr = codegen.opcodes.size();
-						codegen.opcodes.push_back(0); //temporary
+					// Parse the branch block.
+					error = _parse_block(codegen, branch->block, false); // Don't add locals again.
+					if (error) {
+						return error;
+					}
 
-						Error err = _parse_block(codegen, cf->body, p_stack_level, p_break_addr, p_continue_addr);
-						if (err)
-							return err;
+					codegen.end_block(); // Get out of extra block.
+				}
 
-						if (cf->body_else) {
+				// End all nested `if`s.
+				for (int j = 0; j < match->branches.size(); j++) {
+					gen->write_endif();
+				}
 
-							codegen.opcodes.push_back(GDScriptFunction::OPCODE_JUMP);
-							int end_addr = codegen.opcodes.size();
-							codegen.opcodes.push_back(0);
-							codegen.opcodes.write[else_addr] = codegen.opcodes.size();
+				gen->pop_temporary();
 
-							Error err2 = _parse_block(codegen, cf->body_else, p_stack_level, p_break_addr, p_continue_addr);
-							if (err2)
-								return err2;
+				if (value.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+					codegen.generator->pop_temporary();
+				}
 
-							codegen.opcodes.write[end_addr] = codegen.opcodes.size();
-						} else {
-							//end without else
-							codegen.opcodes.write[else_addr] = codegen.opcodes.size();
-						}
+				gen->end_match();
+			} break;
+			case GDScriptParser::Node::IF: {
+				const GDScriptParser::IfNode *if_n = static_cast<const GDScriptParser::IfNode *>(s);
+				GDScriptCodeGenerator::Address condition = _parse_expression(codegen, error, if_n->condition);
+				if (error) {
+					return error;
+				}
 
-					} break;
-					case GDScriptParser::ControlFlowNode::CF_FOR: {
-
-						int slevel = p_stack_level;
-						int iter_stack_pos = slevel;
-						int iterator_pos = (slevel++) | (GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS);
-						int counter_pos = (slevel++) | (GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS);
-						int container_pos = (slevel++) | (GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS);
-						codegen.alloc_stack(slevel);
-
-						codegen.push_stack_identifiers();
-						codegen.add_stack_identifier(static_cast<const GDScriptParser::IdentifierNode *>(cf->arguments[0])->name, iter_stack_pos);
-
-						int ret2 = _parse_expression(codegen, cf->arguments[1], slevel, false);
-						if (ret2 < 0)
-							return ERR_COMPILATION_FAILED;
-
-						//assign container
-						codegen.opcodes.push_back(GDScriptFunction::OPCODE_ASSIGN);
-						codegen.opcodes.push_back(container_pos);
-						codegen.opcodes.push_back(ret2);
-
-						//begin loop
-						codegen.opcodes.push_back(GDScriptFunction::OPCODE_ITERATE_BEGIN);
-						codegen.opcodes.push_back(counter_pos);
-						codegen.opcodes.push_back(container_pos);
-						codegen.opcodes.push_back(codegen.opcodes.size() + 4);
-						codegen.opcodes.push_back(iterator_pos);
-						codegen.opcodes.push_back(GDScriptFunction::OPCODE_JUMP); //skip code for next
-						codegen.opcodes.push_back(codegen.opcodes.size() + 8);
-						//break loop
-						int break_pos = codegen.opcodes.size();
-						codegen.opcodes.push_back(GDScriptFunction::OPCODE_JUMP); //skip code for next
-						codegen.opcodes.push_back(0); //skip code for next
-						//next loop
-						int continue_pos = codegen.opcodes.size();
-						codegen.opcodes.push_back(GDScriptFunction::OPCODE_ITERATE);
-						codegen.opcodes.push_back(counter_pos);
-						codegen.opcodes.push_back(container_pos);
-						codegen.opcodes.push_back(break_pos);
-						codegen.opcodes.push_back(iterator_pos);
-
-						Error err = _parse_block(codegen, cf->body, slevel, break_pos, continue_pos);
-						if (err)
-							return err;
+				gen->write_if(condition);
 
-						codegen.opcodes.push_back(GDScriptFunction::OPCODE_JUMP);
-						codegen.opcodes.push_back(continue_pos);
-						codegen.opcodes.write[break_pos + 1] = codegen.opcodes.size();
+				if (condition.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+					codegen.generator->pop_temporary();
+				}
 
-						codegen.pop_stack_identifiers();
+				error = _parse_block(codegen, if_n->true_block);
+				if (error) {
+					return error;
+				}
 
-					} break;
-					case GDScriptParser::ControlFlowNode::CF_WHILE: {
+				if (if_n->false_block) {
+					gen->write_else();
 
-						codegen.opcodes.push_back(GDScriptFunction::OPCODE_JUMP);
-						codegen.opcodes.push_back(codegen.opcodes.size() + 3);
-						int break_addr = codegen.opcodes.size();
-						codegen.opcodes.push_back(GDScriptFunction::OPCODE_JUMP);
-						codegen.opcodes.push_back(0);
-						int continue_addr = codegen.opcodes.size();
+					error = _parse_block(codegen, if_n->false_block);
+					if (error) {
+						return error;
+					}
+				}
 
-						int ret2 = _parse_expression(codegen, cf->arguments[0], p_stack_level, false);
-						if (ret2 < 0)
-							return ERR_PARSE_ERROR;
-						codegen.opcodes.push_back(GDScriptFunction::OPCODE_JUMP_IF_NOT);
-						codegen.opcodes.push_back(ret2);
-						codegen.opcodes.push_back(break_addr);
-						Error err = _parse_block(codegen, cf->body, p_stack_level, break_addr, continue_addr);
-						if (err)
-							return err;
-						codegen.opcodes.push_back(GDScriptFunction::OPCODE_JUMP);
-						codegen.opcodes.push_back(continue_addr);
+				gen->write_endif();
+			} break;
+			case GDScriptParser::Node::FOR: {
+				const GDScriptParser::ForNode *for_n = static_cast<const GDScriptParser::ForNode *>(s);
 
-						codegen.opcodes.write[break_addr + 1] = codegen.opcodes.size();
+				codegen.start_block();
+				GDScriptCodeGenerator::Address iterator = codegen.add_local(for_n->variable->name, _gdtype_from_datatype(for_n->variable->get_datatype()));
 
-					} break;
-					case GDScriptParser::ControlFlowNode::CF_BREAK: {
+				GDScriptCodeGenerator::Address list = _parse_expression(codegen, error, for_n->list);
+				if (error) {
+					return error;
+				}
 
-						if (p_break_addr < 0) {
+				gen->write_for(iterator, list);
 
-							_set_error("'break'' not within loop", cf);
-							return ERR_COMPILATION_FAILED;
-						}
-						codegen.opcodes.push_back(GDScriptFunction::OPCODE_JUMP);
-						codegen.opcodes.push_back(p_break_addr);
+				error = _parse_block(codegen, for_n->loop);
+				if (error) {
+					return error;
+				}
 
-					} break;
-					case GDScriptParser::ControlFlowNode::CF_CONTINUE: {
+				gen->write_endfor();
 
-						if (p_continue_addr < 0) {
+				if (list.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+					codegen.generator->pop_temporary();
+				}
 
-							_set_error("'continue' not within loop", cf);
-							return ERR_COMPILATION_FAILED;
-						}
+				codegen.end_block();
+			} break;
+			case GDScriptParser::Node::WHILE: {
+				const GDScriptParser::WhileNode *while_n = static_cast<const GDScriptParser::WhileNode *>(s);
 
-						codegen.opcodes.push_back(GDScriptFunction::OPCODE_JUMP);
-						codegen.opcodes.push_back(p_continue_addr);
+				gen->start_while_condition();
 
-					} break;
-					case GDScriptParser::ControlFlowNode::CF_RETURN: {
+				GDScriptCodeGenerator::Address condition = _parse_expression(codegen, error, while_n->condition);
+				if (error) {
+					return error;
+				}
 
-						int ret2;
+				gen->write_while(condition);
 
-						if (cf->arguments.size()) {
+				if (condition.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+					codegen.generator->pop_temporary();
+				}
 
-							ret2 = _parse_expression(codegen, cf->arguments[0], p_stack_level, false);
-							if (ret2 < 0)
-								return ERR_PARSE_ERROR;
+				error = _parse_block(codegen, while_n->loop);
+				if (error) {
+					return error;
+				}
 
-						} else {
+				gen->write_endwhile();
+			} break;
+			case GDScriptParser::Node::BREAK: {
+				gen->write_break();
+			} break;
+			case GDScriptParser::Node::CONTINUE: {
+				const GDScriptParser::ContinueNode *cont = static_cast<const GDScriptParser::ContinueNode *>(s);
+				if (cont->is_for_match) {
+					gen->write_continue_match();
+				} else {
+					gen->write_continue();
+				}
+			} break;
+			case GDScriptParser::Node::RETURN: {
+				const GDScriptParser::ReturnNode *return_n = static_cast<const GDScriptParser::ReturnNode *>(s);
 
-							ret2 = GDScriptFunction::ADDR_TYPE_NIL << GDScriptFunction::ADDR_BITS;
-						}
+				GDScriptCodeGenerator::Address return_value;
 
-						codegen.opcodes.push_back(GDScriptFunction::OPCODE_RETURN);
-						codegen.opcodes.push_back(ret2);
+				if (return_n->return_value != nullptr) {
+					return_value = _parse_expression(codegen, error, return_n->return_value);
+					if (error) {
+						return error;
+					}
+				}
 
-					} break;
+				gen->write_return(return_value);
+				if (return_value.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+					codegen.generator->pop_temporary();
 				}
 			} break;
-			case GDScriptParser::Node::TYPE_ASSERT: {
+			case GDScriptParser::Node::ASSERT: {
 #ifdef DEBUG_ENABLED
-				// try subblocks
-
 				const GDScriptParser::AssertNode *as = static_cast<const GDScriptParser::AssertNode *>(s);
 
-				int ret2 = _parse_expression(codegen, as->condition, p_stack_level, false);
-				if (ret2 < 0)
-					return ERR_PARSE_ERROR;
+				GDScriptCodeGenerator::Address condition = _parse_expression(codegen, error, as->condition);
+				if (error) {
+					return error;
+				}
+
+				GDScriptCodeGenerator::Address message;
 
-				int message_ret = 0;
 				if (as->message) {
-					message_ret = _parse_expression(codegen, as->message, p_stack_level + 1, false);
-					if (message_ret < 0)
-						return ERR_PARSE_ERROR;
+					message = _parse_expression(codegen, error, as->message);
+					if (error) {
+						return error;
+					}
 				}
+				gen->write_assert(condition, message);
 
-				codegen.opcodes.push_back(GDScriptFunction::OPCODE_ASSERT);
-				codegen.opcodes.push_back(ret2);
-				codegen.opcodes.push_back(message_ret);
+				if (condition.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+					codegen.generator->pop_temporary();
+				}
+				if (message.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+					codegen.generator->pop_temporary();
+				}
 #endif
 			} break;
-			case GDScriptParser::Node::TYPE_BREAKPOINT: {
+			case GDScriptParser::Node::BREAKPOINT: {
 #ifdef DEBUG_ENABLED
-				// try subblocks
-				codegen.opcodes.push_back(GDScriptFunction::OPCODE_BREAKPOINT);
+				gen->write_breakpoint();
 #endif
 			} break;
-			case GDScriptParser::Node::TYPE_LOCAL_VAR: {
-
-				const GDScriptParser::LocalVarNode *lv = static_cast<const GDScriptParser::LocalVarNode *>(s);
-
-				// since we are using properties now for most class access, allow shadowing of class members to make user's life easier.
-				//
-				//if (_is_class_member_property(codegen, lv->name)) {
-				//	_set_error("Name for local variable '" + String(lv->name) + "' can't shadow class property of the same name.", lv);
-				//	return ERR_ALREADY_EXISTS;
-				//}
-
-				codegen.add_stack_identifier(lv->name, p_stack_level++);
-				codegen.alloc_stack(p_stack_level);
-				new_identifiers++;
+			case GDScriptParser::Node::VARIABLE: {
+				const GDScriptParser::VariableNode *lv = static_cast<const GDScriptParser::VariableNode *>(s);
+				// Should be already in stack when the block began.
+				GDScriptCodeGenerator::Address local = codegen.locals[lv->identifier->name];
+
+				if (lv->initializer != nullptr) {
+					GDScriptCodeGenerator::Address src_address = _parse_expression(codegen, error, lv->initializer);
+					if (error) {
+						return error;
+					}
+					gen->write_assign(local, src_address);
+					if (src_address.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+						codegen.generator->pop_temporary();
+					}
+				}
+			} break;
+			case GDScriptParser::Node::CONSTANT: {
+				// Local constants.
+				const GDScriptParser::ConstantNode *lc = static_cast<const GDScriptParser::ConstantNode *>(s);
+				if (!lc->initializer->is_constant) {
+					_set_error("Local constant must have a constant value as initializer.", lc->initializer);
+					return ERR_PARSE_ERROR;
+				}
 
+				codegen.add_local_constant(lc->identifier->name, lc->initializer->reduced_value);
 			} break;
+			case GDScriptParser::Node::PASS:
+				// Nothing to do.
+				break;
 			default: {
-				//expression
-				int ret2 = _parse_expression(codegen, s, p_stack_level, true);
-				if (ret2 < 0)
-					return ERR_PARSE_ERROR;
+				// Expression.
+				if (s->is_expression()) {
+					GDScriptCodeGenerator::Address expr = _parse_expression(codegen, error, static_cast<const GDScriptParser::ExpressionNode *>(s), true);
+					if (error) {
+						return error;
+					}
+					if (expr.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+						codegen.generator->pop_temporary();
+					}
+				} else {
+					ERR_FAIL_V_MSG(ERR_INVALID_DATA, "Bug in bytecode compiler, unexpected node in parse tree while parsing statement."); // Unreachable code.
+				}
 			} break;
 		}
 	}
-	codegen.pop_stack_identifiers();
+
+	codegen.end_block();
 	return OK;
 }
 
 Error GDScriptCompiler::_parse_function(GDScript *p_script, const GDScriptParser::ClassNode *p_class, const GDScriptParser::FunctionNode *p_func, bool p_for_ready) {
-
-	Vector<int> bytecode;
+	Error error = OK;
 	CodeGen codegen;
+	codegen.generator = memnew(GDScriptByteCodeGenerator);
 
 	codegen.class_node = p_class;
 	codegen.script = p_script;
 	codegen.function_node = p_func;
-	codegen.stack_max = 0;
-	codegen.current_line = 0;
-	codegen.call_max = 0;
-	codegen.debug_stack = ScriptDebugger::get_singleton() != NULL;
-	Vector<StringName> argnames;
 
-	int stack_level = 0;
+	StringName func_name;
+	bool is_static = false;
+	MultiplayerAPI::RPCMode rpc_mode = MultiplayerAPI::RPC_MODE_DISABLED;
+	GDScriptDataType return_type;
+	return_type.has_type = true;
+	return_type.kind = GDScriptDataType::BUILTIN;
+	return_type.builtin_type = Variant::NIL;
 
 	if (p_func) {
-		for (int i = 0; i < p_func->arguments.size(); i++) {
-			// since we are using properties now for most class access, allow shadowing of class members to make user's life easier.
-			//
-			//if (_is_class_member_property(p_script, p_func->arguments[i])) {
-			//	_set_error("Name for argument '" + String(p_func->arguments[i]) + "' can't shadow class property of the same name.", p_func);
-			//	return ERR_ALREADY_EXISTS;
-			//}
-
-			codegen.add_stack_identifier(p_func->arguments[i], i);
-#ifdef TOOLS_ENABLED
-			argnames.push_back(p_func->arguments[i]);
-#endif
+		func_name = p_func->identifier->name;
+		is_static = p_func->is_static;
+		rpc_mode = p_func->rpc_mode;
+		return_type = _gdtype_from_datatype(p_func->get_datatype(), p_script);
+	} else {
+		if (p_for_ready) {
+			func_name = "_ready";
+		} else {
+			func_name = "@implicit_new";
 		}
-		stack_level = p_func->arguments.size();
 	}
 
-	codegen.alloc_stack(stack_level);
-
-	/* Parse initializer -if applies- */
-
-	bool is_initializer = !p_for_ready && !p_func;
+	codegen.function_name = func_name;
+	codegen.generator->write_start(p_script, func_name, is_static, rpc_mode, return_type);
 
-	if (is_initializer || (p_func && String(p_func->name) == "_init")) {
-		//parse initializer for class members
-		if (!p_func && p_class->extends_used && p_script->native.is_null()) {
+	int optional_parameters = 0;
 
-			//call implicit parent constructor
-			codegen.opcodes.push_back(GDScriptFunction::OPCODE_CALL_SELF_BASE);
-			codegen.opcodes.push_back(codegen.get_name_map_pos("_init"));
-			codegen.opcodes.push_back(0);
-			codegen.opcodes.push_back((GDScriptFunction::ADDR_TYPE_STACK << GDScriptFunction::ADDR_BITS) | 0);
-		}
-		Error err = _parse_block(codegen, p_class->initializer, stack_level);
-		if (err)
-			return err;
-		is_initializer = true;
-	}
-
-	if (p_for_ready || (p_func && String(p_func->name) == "_ready")) {
-		//parse initializer for class members
-		if (p_class->ready->statements.size()) {
-			Error err = _parse_block(codegen, p_class->ready, stack_level);
-			if (err)
-				return err;
+	if (p_func) {
+		for (int i = 0; i < p_func->parameters.size(); i++) {
+			const GDScriptParser::ParameterNode *parameter = p_func->parameters[i];
+			GDScriptDataType par_type = _gdtype_from_datatype(parameter->get_datatype(), p_script);
+			uint32_t par_addr = codegen.generator->add_parameter(parameter->identifier->name, parameter->default_value != nullptr, par_type);
+			codegen.parameters[parameter->identifier->name] = GDScriptCodeGenerator::Address(GDScriptCodeGenerator::Address::FUNCTION_PARAMETER, par_addr, par_type);
+
+			if (p_func->parameters[i]->default_value != nullptr) {
+				optional_parameters++;
+			}
 		}
 	}
 
-	/* Parse default argument code -if applies- */
+	// Parse initializer if applies.
+	bool is_implicit_initializer = !p_for_ready && !p_func;
+	bool is_initializer = p_func && String(p_func->identifier->name) == GDScriptLanguage::get_singleton()->strings._init;
+	bool is_for_ready = p_for_ready || (p_func && String(p_func->identifier->name) == "_ready");
 
-	Vector<int> defarg_addr;
-	StringName func_name;
-
-	if (p_func) {
+	if (is_implicit_initializer || is_for_ready) {
+		// Initialize class fields.
+		for (int i = 0; i < p_class->members.size(); i++) {
+			if (p_class->members[i].type != GDScriptParser::ClassNode::Member::VARIABLE) {
+				continue;
+			}
+			const GDScriptParser::VariableNode *field = p_class->members[i].variable;
+			if (field->onready != is_for_ready) {
+				// Only initialize in _ready.
+				continue;
+			}
 
-		if (p_func->default_values.size()) {
+			if (field->initializer) {
+				// Emit proper line change.
+				codegen.generator->write_newline(field->initializer->start_line);
 
-			codegen.opcodes.push_back(GDScriptFunction::OPCODE_JUMP_TO_DEF_ARGUMENT);
-			defarg_addr.push_back(codegen.opcodes.size());
-			for (int i = 0; i < p_func->default_values.size(); i++) {
+				GDScriptCodeGenerator::Address src_address = _parse_expression(codegen, error, field->initializer, false, true);
+				if (error) {
+					memdelete(codegen.generator);
+					return error;
+				}
+				GDScriptCodeGenerator::Address dst_address(GDScriptCodeGenerator::Address::MEMBER, codegen.script->member_indices[field->identifier->name].index, _gdtype_from_datatype(field->get_datatype()));
 
-				_parse_expression(codegen, p_func->default_values[i], stack_level, true);
-				defarg_addr.push_back(codegen.opcodes.size());
+				codegen.generator->write_assign(dst_address, src_address);
+				if (src_address.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+					codegen.generator->pop_temporary();
+				}
 			}
+		}
+	}
 
-			defarg_addr.invert();
+	// Parse default argument code if applies.
+	if (p_func) {
+		if (optional_parameters > 0) {
+			codegen.generator->start_parameters();
+			for (int i = p_func->parameters.size() - optional_parameters; i < p_func->parameters.size(); i++) {
+				const GDScriptParser::ParameterNode *parameter = p_func->parameters[i];
+				GDScriptCodeGenerator::Address src_addr = _parse_expression(codegen, error, parameter->default_value, true);
+				if (error) {
+					memdelete(codegen.generator);
+					return error;
+				}
+				GDScriptCodeGenerator::Address dst_addr = codegen.parameters[parameter->identifier->name];
+				codegen.generator->write_assign(dst_addr, src_addr);
+				if (src_addr.mode == GDScriptCodeGenerator::Address::TEMPORARY) {
+					codegen.generator->pop_temporary();
+				}
+			}
+			codegen.generator->end_parameters();
 		}
 
-		Error err = _parse_block(codegen, p_func->body, stack_level);
-		if (err)
+		Error err = _parse_block(codegen, p_func->body);
+		if (err) {
+			memdelete(codegen.generator);
 			return err;
-
-		func_name = p_func->name;
-	} else {
-		if (p_for_ready)
-			func_name = "_ready";
-		else
-			func_name = "_init";
+		}
 	}
 
-	codegen.opcodes.push_back(GDScriptFunction::OPCODE_END);
+#ifdef DEBUG_ENABLED
+	if (EngineDebugger::is_active()) {
+		String signature;
+		// Path.
+		if (p_script->get_path() != String()) {
+			signature += p_script->get_path();
+		}
+		// Location.
+		if (p_func) {
+			signature += "::" + itos(p_func->body->start_line);
+		} else {
+			signature += "::0";
+		}
 
-	/*
-	if (String(p_func->name)=="") { //initializer func
-		gdfunc = &p_script->initializer;
-	*/
-	//} else { //regular func
-	p_script->member_functions[func_name] = memnew(GDScriptFunction);
-	GDScriptFunction *gdfunc = p_script->member_functions[func_name];
-	//}
+		// Function and class.
 
-	if (p_func) {
-		gdfunc->_static = p_func->_static;
-		gdfunc->rpc_mode = p_func->rpc_mode;
-		gdfunc->argument_types.resize(p_func->argument_types.size());
-		for (int i = 0; i < p_func->argument_types.size(); i++) {
-			gdfunc->argument_types.write[i] = _gdtype_from_datatype(p_func->argument_types[i]);
+		if (p_class->identifier) {
+			signature += "::" + String(p_class->identifier->name) + "." + String(func_name);
+		} else {
+			signature += "::" + String(func_name);
 		}
-		gdfunc->return_type = _gdtype_from_datatype(p_func->return_type);
-	} else {
-		gdfunc->_static = false;
-		gdfunc->rpc_mode = MultiplayerAPI::RPC_MODE_DISABLED;
-		gdfunc->return_type = GDScriptDataType();
-		gdfunc->return_type.has_type = true;
-		gdfunc->return_type.kind = GDScriptDataType::BUILTIN;
-		gdfunc->return_type.builtin_type = Variant::NIL;
+
+		codegen.generator->set_signature(signature);
 	}
+#endif
 
+	if (p_func) {
+		codegen.generator->set_initial_line(p_func->start_line);
 #ifdef TOOLS_ENABLED
-	gdfunc->arg_names = argnames;
+		p_script->member_lines[func_name] = p_func->start_line;
 #endif
-	//constants
-	if (codegen.constant_map.size()) {
-		gdfunc->_constant_count = codegen.constant_map.size();
-		gdfunc->constants.resize(codegen.constant_map.size());
-		gdfunc->_constants_ptr = gdfunc->constants.ptrw();
-		const Variant *K = NULL;
-		while ((K = codegen.constant_map.next(K))) {
-			int idx = codegen.constant_map[*K];
-			gdfunc->constants.write[idx] = *K;
-		}
 	} else {
+		codegen.generator->set_initial_line(0);
+	}
 
-		gdfunc->_constants_ptr = NULL;
-		gdfunc->_constant_count = 0;
+	GDScriptFunction *gd_function = codegen.generator->write_end();
+
+	if (is_initializer) {
+		p_script->initializer = gd_function;
+	} else if (is_implicit_initializer) {
+		p_script->implicit_initializer = gd_function;
 	}
-	//global names
-	if (codegen.name_map.size()) {
 
-		gdfunc->global_names.resize(codegen.name_map.size());
-		gdfunc->_global_names_ptr = &gdfunc->global_names[0];
-		for (Map<StringName, int>::Element *E = codegen.name_map.front(); E; E = E->next()) {
+	p_script->member_functions[func_name] = gd_function;
 
-			gdfunc->global_names.write[E->get()] = E->key();
-		}
-		gdfunc->_global_names_count = gdfunc->global_names.size();
+	memdelete(codegen.generator);
 
-	} else {
-		gdfunc->_global_names_ptr = NULL;
-		gdfunc->_global_names_count = 0;
-	}
+	return OK;
+}
 
-#ifdef TOOLS_ENABLED
-	// Named globals
-	if (codegen.named_globals.size()) {
-		gdfunc->named_globals.resize(codegen.named_globals.size());
-		gdfunc->_named_globals_ptr = gdfunc->named_globals.ptr();
-		for (int i = 0; i < codegen.named_globals.size(); i++) {
-			gdfunc->named_globals.write[i] = codegen.named_globals[i];
-		}
-		gdfunc->_named_globals_count = gdfunc->named_globals.size();
-	}
-#endif
+Error GDScriptCompiler::_parse_setter_getter(GDScript *p_script, const GDScriptParser::ClassNode *p_class, const GDScriptParser::VariableNode *p_variable, bool p_is_setter) {
+	Error error = OK;
+	CodeGen codegen;
+	codegen.generator = memnew(GDScriptByteCodeGenerator);
 
-	if (codegen.opcodes.size()) {
+	codegen.class_node = p_class;
+	codegen.script = p_script;
 
-		gdfunc->code = codegen.opcodes;
-		gdfunc->_code_ptr = &gdfunc->code[0];
-		gdfunc->_code_size = codegen.opcodes.size();
+	StringName func_name;
 
+	if (p_is_setter) {
+		func_name = "@" + p_variable->identifier->name + "_setter";
 	} else {
+		func_name = "@" + p_variable->identifier->name + "_getter";
+	}
 
-		gdfunc->_code_ptr = NULL;
-		gdfunc->_code_size = 0;
+	GDScriptDataType return_type;
+	if (p_is_setter) {
+		return_type.has_type = true;
+		return_type.kind = GDScriptDataType::BUILTIN;
+		return_type.builtin_type = Variant::NIL;
+	} else {
+		return_type = _gdtype_from_datatype(p_variable->get_datatype(), p_script);
 	}
 
-	if (defarg_addr.size()) {
+	codegen.generator->write_start(p_script, func_name, false, p_variable->rpc_mode, return_type);
 
-		gdfunc->default_arguments = defarg_addr;
-		gdfunc->_default_arg_count = defarg_addr.size() - 1;
-		gdfunc->_default_arg_ptr = &gdfunc->default_arguments[0];
-	} else {
-		gdfunc->_default_arg_count = 0;
-		gdfunc->_default_arg_ptr = NULL;
+	if (p_is_setter) {
+		uint32_t par_addr = codegen.generator->add_parameter(p_variable->setter_parameter->name, false, _gdtype_from_datatype(p_variable->get_datatype()));
+		codegen.parameters[p_variable->setter_parameter->name] = GDScriptCodeGenerator::Address(GDScriptCodeGenerator::Address::FUNCTION_PARAMETER, par_addr, _gdtype_from_datatype(p_variable->get_datatype()));
 	}
 
-	gdfunc->_argument_count = p_func ? p_func->arguments.size() : 0;
-	gdfunc->_stack_size = codegen.stack_max;
-	gdfunc->_call_size = codegen.call_max;
-	gdfunc->name = func_name;
+	error = _parse_block(codegen, p_is_setter ? p_variable->setter : p_variable->getter);
+	if (error) {
+		memdelete(codegen.generator);
+		return error;
+	}
+
+	GDScriptFunction *gd_function = codegen.generator->write_end();
+
+	p_script->member_functions[func_name] = gd_function;
+
 #ifdef DEBUG_ENABLED
-	if (ScriptDebugger::get_singleton()) {
+	if (EngineDebugger::is_active()) {
 		String signature;
 		//path
-		if (p_script->get_path() != String())
+		if (p_script->get_path() != String()) {
 			signature += p_script->get_path();
-		//loc
-		if (p_func) {
-			signature += "::" + itos(p_func->body->line);
-		} else {
-			signature += "::0";
 		}
+		//loc
+		signature += "::" + itos(p_is_setter ? p_variable->setter->start_line : p_variable->getter->start_line);
 
 		//function and class
 
-		if (p_class->name) {
-			signature += "::" + String(p_class->name) + "." + String(func_name);
+		if (p_class->identifier) {
+			signature += "::" + String(p_class->identifier->name) + "." + String(func_name);
 		} else {
 			signature += "::" + String(func_name);
 		}
 
-		gdfunc->profile.signature = signature;
+		codegen.generator->set_signature(signature);
 	}
 #endif
-	gdfunc->_script = p_script;
-	gdfunc->source = source;
-
-#ifdef DEBUG_ENABLED
+	codegen.generator->set_initial_line(p_is_setter ? p_variable->setter->start_line : p_variable->getter->start_line);
 
-	{
-		gdfunc->func_cname = (String(source) + " - " + String(func_name)).utf8();
-		gdfunc->_func_cname = gdfunc->func_cname.get_data();
-	}
-
-#endif
-	if (p_func) {
-		gdfunc->_initial_line = p_func->line;
 #ifdef TOOLS_ENABLED
-
-		p_script->member_lines[func_name] = p_func->line;
+	p_script->member_lines[func_name] = p_is_setter ? p_variable->setter->start_line : p_variable->getter->start_line;
 #endif
-	} else {
-		gdfunc->_initial_line = 0;
-	}
-
-	if (codegen.debug_stack)
-		gdfunc->stack_debug = codegen.stack_debug;
-
-	if (is_initializer)
-		p_script->initializer = gdfunc;
+	memdelete(codegen.generator);
 
 	return OK;
 }
 
 Error GDScriptCompiler::_parse_class_level(GDScript *p_script, const GDScriptParser::ClassNode *p_class, bool p_keep_state) {
-
 	parsing_classes.insert(p_script);
 
-	if (p_class->owner && p_class->owner->owner) {
+	if (p_class->outer && p_class->outer->outer) {
 		// Owner is not root
 		if (!parsed_classes.has(p_script->_owner)) {
 			if (parsing_classes.has(p_script->_owner)) {
-				_set_error("Cyclic class reference for '" + String(p_class->name) + "'.", p_class);
+				_set_error("Cyclic class reference for '" + String(p_class->identifier->name) + "'.", p_class);
 				return ERR_PARSE_ERROR;
 			}
-			Error err = _parse_class_level(p_script->_owner, p_class->owner, p_keep_state);
+			Error err = _parse_class_level(p_script->_owner, p_class->outer, p_keep_state);
 			if (err) {
 				return err;
 			}
@@ -1838,7 +1906,7 @@ Error GDScriptCompiler::_parse_class_level(GDScript *p_script, const GDScriptPar
 
 	p_script->native = Ref<GDScriptNativeClass>();
 	p_script->base = Ref<GDScript>();
-	p_script->_base = NULL;
+	p_script->_base = nullptr;
 	p_script->members.clear();
 	p_script->constants.clear();
 	for (Map<StringName, GDScriptFunction *>::Element *E = p_script->member_functions.front(); E; E = E->next()) {
@@ -1848,10 +1916,10 @@ Error GDScriptCompiler::_parse_class_level(GDScript *p_script, const GDScriptPar
 	p_script->member_indices.clear();
 	p_script->member_info.clear();
 	p_script->_signals.clear();
-	p_script->initializer = NULL;
+	p_script->initializer = nullptr;
 
-	p_script->tool = p_class->tool;
-	p_script->name = p_class->name;
+	p_script->tool = parser->is_tool();
+	p_script->name = p_class->identifier ? p_class->identifier->name : "";
 
 	Ref<GDScriptNativeClass> native;
 
@@ -1865,23 +1933,36 @@ Error GDScriptCompiler::_parse_class_level(GDScript *p_script, const GDScriptPar
 			p_script->native = native;
 		} break;
 		case GDScriptDataType::GDSCRIPT: {
-			Ref<GDScript> base = base_type.script_type;
+			Ref<GDScript> base = Ref<GDScript>(base_type.script_type);
 			p_script->base = base;
 			p_script->_base = base.ptr();
-			p_script->member_indices = base->member_indices;
 
-			if (p_class->base_type.kind == GDScriptParser::DataType::CLASS) {
-				if (!parsed_classes.has(p_script->_base)) {
-					if (parsing_classes.has(p_script->_base)) {
-						_set_error("Cyclic class reference for '" + String(p_class->name) + "'.", p_class);
-						return ERR_PARSE_ERROR;
+			if (p_class->base_type.kind == GDScriptParser::DataType::CLASS && p_class->base_type.class_type != nullptr) {
+				if (p_class->base_type.script_path == main_script->path) {
+					if (!parsed_classes.has(p_script->_base)) {
+						if (parsing_classes.has(p_script->_base)) {
+							String class_name = p_class->identifier ? p_class->identifier->name : "<main>";
+							_set_error("Cyclic class reference for '" + class_name + "'.", p_class);
+							return ERR_PARSE_ERROR;
+						}
+						Error err = _parse_class_level(p_script->_base, p_class->base_type.class_type, p_keep_state);
+						if (err) {
+							return err;
+						}
 					}
-					Error err = _parse_class_level(p_script->_base, p_class->base_type.class_type, p_keep_state);
+				} else {
+					Error err = OK;
+					base = GDScriptCache::get_full_script(p_class->base_type.script_path, err, main_script->path);
 					if (err) {
 						return err;
 					}
+					if (base.is_null() && !base->is_valid()) {
+						return ERR_COMPILATION_FAILED;
+					}
 				}
 			}
+
+			p_script->member_indices = base->member_indices;
 		} break;
 		default: {
 			_set_error("Parser bug: invalid inheritance.", p_class);
@@ -1889,91 +1970,142 @@ Error GDScriptCompiler::_parse_class_level(GDScript *p_script, const GDScriptPar
 		} break;
 	}
 
-	for (int i = 0; i < p_class->variables.size(); i++) {
-
-		StringName name = p_class->variables[i].identifier;
-
-		GDScript::MemberInfo minfo;
-		minfo.index = p_script->member_indices.size();
-		minfo.setter = p_class->variables[i].setter;
-		minfo.getter = p_class->variables[i].getter;
-		minfo.rpc_mode = p_class->variables[i].rpc_mode;
-		minfo.data_type = _gdtype_from_datatype(p_class->variables[i].data_type);
-
-		PropertyInfo prop_info = minfo.data_type;
-		prop_info.name = name;
-		PropertyInfo export_info = p_class->variables[i]._export;
+	for (int i = 0; i < p_class->members.size(); i++) {
+		const GDScriptParser::ClassNode::Member &member = p_class->members[i];
+		switch (member.type) {
+			case GDScriptParser::ClassNode::Member::VARIABLE: {
+				const GDScriptParser::VariableNode *variable = member.variable;
+				StringName name = variable->identifier->name;
+
+				GDScript::MemberInfo minfo;
+				minfo.index = p_script->member_indices.size();
+				switch (variable->property) {
+					case GDScriptParser::VariableNode::PROP_NONE:
+						break; // Nothing to do.
+					case GDScriptParser::VariableNode::PROP_SETGET:
+						if (variable->setter_pointer != nullptr) {
+							minfo.setter = variable->setter_pointer->name;
+						}
+						if (variable->getter_pointer != nullptr) {
+							minfo.getter = variable->getter_pointer->name;
+						}
+						break;
+					case GDScriptParser::VariableNode::PROP_INLINE:
+						if (variable->setter != nullptr) {
+							minfo.setter = "@" + variable->identifier->name + "_setter";
+						}
+						if (variable->getter != nullptr) {
+							minfo.getter = "@" + variable->identifier->name + "_getter";
+						}
+						break;
+				}
+				minfo.rpc_mode = variable->rpc_mode;
+				minfo.data_type = _gdtype_from_datatype(variable->get_datatype(), p_script);
 
-		if (export_info.type != Variant::NIL) {
+				PropertyInfo prop_info = minfo.data_type;
+				prop_info.name = name;
+				PropertyInfo export_info = variable->export_info;
 
-			if (!minfo.data_type.has_type) {
-				prop_info.type = export_info.type;
-				prop_info.class_name = export_info.class_name;
-			}
-			prop_info.hint = export_info.hint;
-			prop_info.hint_string = export_info.hint_string;
-			prop_info.usage = export_info.usage;
+				if (variable->exported) {
+					if (!minfo.data_type.has_type) {
+						prop_info.type = export_info.type;
+						prop_info.class_name = export_info.class_name;
+					}
+					prop_info.hint = export_info.hint;
+					prop_info.hint_string = export_info.hint_string;
+					prop_info.usage = export_info.usage;
 #ifdef TOOLS_ENABLED
-			if (p_class->variables[i].default_value.get_type() != Variant::NIL) {
-				p_script->member_default_values[name] = p_class->variables[i].default_value;
-			}
+					if (variable->initializer != nullptr && variable->initializer->type == GDScriptParser::Node::LITERAL) {
+						p_script->member_default_values[name] = static_cast<const GDScriptParser::LiteralNode *>(variable->initializer)->value;
+					}
 #endif
-		} else {
-			prop_info.usage = PROPERTY_USAGE_SCRIPT_VARIABLE;
-		}
+				} else {
+					prop_info.usage = PROPERTY_USAGE_SCRIPT_VARIABLE;
+				}
 
-		p_script->member_info[name] = prop_info;
-		p_script->member_indices[name] = minfo;
-		p_script->members.insert(name);
+				p_script->member_info[name] = prop_info;
+				p_script->member_indices[name] = minfo;
+				p_script->members.insert(name);
 
 #ifdef TOOLS_ENABLED
-		p_script->member_lines[name] = p_class->variables[i].line;
+				p_script->member_lines[name] = variable->start_line;
 #endif
-	}
+			} break;
 
-	for (Map<StringName, GDScriptParser::ClassNode::Constant>::Element *E = p_class->constant_expressions.front(); E; E = E->next()) {
+			case GDScriptParser::ClassNode::Member::CONSTANT: {
+				const GDScriptParser::ConstantNode *constant = member.constant;
+				StringName name = constant->identifier->name;
 
-		StringName name = E->key();
+				p_script->constants.insert(name, constant->initializer->reduced_value);
+#ifdef TOOLS_ENABLED
 
-		ERR_CONTINUE(E->get().expression->type != GDScriptParser::Node::TYPE_CONSTANT);
+				p_script->member_lines[name] = constant->start_line;
+#endif
+			} break;
 
-		GDScriptParser::ConstantNode *constant = static_cast<GDScriptParser::ConstantNode *>(E->get().expression);
+			case GDScriptParser::ClassNode::Member::ENUM_VALUE: {
+				const GDScriptParser::EnumNode::Value &enum_value = member.enum_value;
+				StringName name = enum_value.identifier->name;
 
-		p_script->constants.insert(name, constant->value);
+				p_script->constants.insert(name, enum_value.value);
 #ifdef TOOLS_ENABLED
-
-		p_script->member_lines[name] = E->get().expression->line;
+				p_script->member_lines[name] = enum_value.identifier->start_line;
 #endif
-	}
+			} break;
+
+			case GDScriptParser::ClassNode::Member::SIGNAL: {
+				const GDScriptParser::SignalNode *signal = member.signal;
+				StringName name = signal->identifier->name;
 
-	for (int i = 0; i < p_class->_signals.size(); i++) {
+				GDScript *c = p_script;
 
-		StringName name = p_class->_signals[i].name;
+				while (c) {
+					if (c->_signals.has(name)) {
+						_set_error("Signal '" + name + "' redefined (in current or parent class)", p_class);
+						return ERR_ALREADY_EXISTS;
+					}
+
+					if (c->base.is_valid()) {
+						c = c->base.ptr();
+					} else {
+						c = nullptr;
+					}
+				}
 
-		GDScript *c = p_script;
+				if (native.is_valid()) {
+					if (ClassDB::has_signal(native->get_name(), name)) {
+						_set_error("Signal '" + name + "' redefined (original in native class '" + String(native->get_name()) + "')", p_class);
+						return ERR_ALREADY_EXISTS;
+					}
+				}
 
-		while (c) {
+				Vector<StringName> parameters_names;
+				parameters_names.resize(signal->parameters.size());
+				for (int j = 0; j < signal->parameters.size(); j++) {
+					parameters_names.write[j] = signal->parameters[j]->identifier->name;
+				}
+				p_script->_signals[name] = parameters_names;
+			} break;
 
-			if (c->_signals.has(name)) {
-				_set_error("Signal '" + name + "' redefined (in current or parent class)", p_class);
-				return ERR_ALREADY_EXISTS;
-			}
+			case GDScriptParser::ClassNode::Member::ENUM: {
+				const GDScriptParser::EnumNode *enum_n = member.m_enum;
 
-			if (c->base.is_valid()) {
-				c = c->base.ptr();
-			} else {
-				c = NULL;
-			}
-		}
+				// TODO: Make enums not be just a dictionary?
+				Dictionary new_enum;
+				for (int j = 0; j < enum_n->values.size(); j++) {
+					int value = enum_n->values[j].value;
+					// Needs to be string because Variant::get will convert to String.
+					new_enum[String(enum_n->values[j].identifier->name)] = value;
+				}
 
-		if (native.is_valid()) {
-			if (ClassDB::has_signal(native->get_name(), name)) {
-				_set_error("Signal '" + name + "' redefined (original in native class '" + String(native->get_name()) + "')", p_class);
-				return ERR_ALREADY_EXISTS;
-			}
+				p_script->constants.insert(enum_n->identifier->name, new_enum);
+#ifdef TOOLS_ENABLED
+				p_script->member_lines[enum_n->identifier->name] = enum_n->start_line;
+#endif
+			} break;
+			default:
+				break; // Nothing to do here.
 		}
-
-		p_script->_signals[name] = p_class->_signals[i].arguments;
 	}
 
 	parsed_classes.insert(p_script);
@@ -1981,21 +2113,27 @@ Error GDScriptCompiler::_parse_class_level(GDScript *p_script, const GDScriptPar
 
 	//parse sub-classes
 
-	for (int i = 0; i < p_class->subclasses.size(); i++) {
-		StringName name = p_class->subclasses[i]->name;
+	for (int i = 0; i < p_class->members.size(); i++) {
+		const GDScriptParser::ClassNode::Member &member = p_class->members[i];
+		if (member.type != member.CLASS) {
+			continue;
+		}
+		const GDScriptParser::ClassNode *inner_class = member.m_class;
+		StringName name = inner_class->identifier->name;
 		Ref<GDScript> &subclass = p_script->subclasses[name];
 		GDScript *subclass_ptr = subclass.ptr();
 
 		// Subclass might still be parsing, just skip it
 		if (!parsed_classes.has(subclass_ptr) && !parsing_classes.has(subclass_ptr)) {
-			Error err = _parse_class_level(subclass_ptr, p_class->subclasses[i], p_keep_state);
-			if (err)
+			Error err = _parse_class_level(subclass_ptr, inner_class, p_keep_state);
+			if (err) {
 				return err;
+			}
 		}
 
 #ifdef TOOLS_ENABLED
 
-		p_script->member_lines[name] = p_class->subclasses[i]->line;
+		p_script->member_lines[name] = inner_class->start_line;
 #endif
 
 		p_script->constants.insert(name, subclass); //once parsed, goes to the list of constants
@@ -2007,41 +2145,52 @@ Error GDScriptCompiler::_parse_class_level(GDScript *p_script, const GDScriptPar
 Error GDScriptCompiler::_parse_class_blocks(GDScript *p_script, const GDScriptParser::ClassNode *p_class, bool p_keep_state) {
 	//parse methods
 
-	bool has_initializer = false;
 	bool has_ready = false;
 
-	for (int i = 0; i < p_class->functions.size(); i++) {
-
-		if (!has_initializer && p_class->functions[i]->name == "_init")
-			has_initializer = true;
-		if (!has_ready && p_class->functions[i]->name == "_ready")
-			has_ready = true;
-		Error err = _parse_function(p_script, p_class, p_class->functions[i]);
-		if (err)
-			return err;
-	}
-
-	//parse static methods
-
-	for (int i = 0; i < p_class->static_functions.size(); i++) {
-
-		Error err = _parse_function(p_script, p_class, p_class->static_functions[i]);
-		if (err)
-			return err;
+	for (int i = 0; i < p_class->members.size(); i++) {
+		const GDScriptParser::ClassNode::Member &member = p_class->members[i];
+		if (member.type == member.FUNCTION) {
+			const GDScriptParser::FunctionNode *function = member.function;
+			if (!has_ready && function->identifier->name == "_ready") {
+				has_ready = true;
+			}
+			Error err = _parse_function(p_script, p_class, function);
+			if (err) {
+				return err;
+			}
+		} else if (member.type == member.VARIABLE) {
+			const GDScriptParser::VariableNode *variable = member.variable;
+			if (variable->property == GDScriptParser::VariableNode::PROP_INLINE) {
+				if (variable->setter != nullptr) {
+					Error err = _parse_setter_getter(p_script, p_class, variable, true);
+					if (err) {
+						return err;
+					}
+				}
+				if (variable->getter != nullptr) {
+					Error err = _parse_setter_getter(p_script, p_class, variable, false);
+					if (err) {
+						return err;
+					}
+				}
+			}
+		}
 	}
 
-	if (!has_initializer) {
-		//create a constructor
-		Error err = _parse_function(p_script, p_class, NULL);
-		if (err)
+	{
+		// Create an implicit constructor in any case.
+		Error err = _parse_function(p_script, p_class, nullptr);
+		if (err) {
 			return err;
+		}
 	}
 
-	if (!has_ready && p_class->ready->statements.size()) {
-		//create a constructor
-		Error err = _parse_function(p_script, p_class, NULL, true);
-		if (err)
+	if (!has_ready && p_class->onready_used) {
+		//create a _ready constructor
+		Error err = _parse_function(p_script, p_class, nullptr, true);
+		if (err) {
 			return err;
+		}
 	}
 
 #ifdef DEBUG_ENABLED
@@ -2050,7 +2199,6 @@ Error GDScriptCompiler::_parse_class_blocks(GDScript *p_script, const GDScriptPa
 
 	if (p_keep_state) {
 		for (Set<Object *>::Element *E = p_script->instances.front(); E;) {
-
 			Set<Object *>::Element *N = E->next();
 
 			ScriptInstance *si = E->get()->get_script_instance();
@@ -2076,16 +2224,15 @@ Error GDScriptCompiler::_parse_class_blocks(GDScript *p_script, const GDScriptPa
 
 					/* STEP 2, INITIALIZE AND CONSTRUCT */
 
-					Variant::CallError ce;
-					p_script->initializer->call(instance, NULL, 0, ce);
+					Callable::CallError ce;
+					p_script->initializer->call(instance, nullptr, 0, ce);
 
-					if (ce.error != Variant::CallError::CALL_OK) {
+					if (ce.error != Callable::CallError::CALL_OK) {
 						//well, tough luck, not goinna do anything here
 					}
 				}
 #endif
 			} else {
-
 				GDScriptInstance *gi = static_cast<GDScriptInstance *>(si);
 				gi->reload_members();
 			}
@@ -2095,11 +2242,15 @@ Error GDScriptCompiler::_parse_class_blocks(GDScript *p_script, const GDScriptPa
 	}
 #endif
 
-	for (int i = 0; i < p_class->subclasses.size(); i++) {
-		StringName name = p_class->subclasses[i]->name;
+	for (int i = 0; i < p_class->members.size(); i++) {
+		if (p_class->members[i].type != GDScriptParser::ClassNode::Member::CLASS) {
+			continue;
+		}
+		const GDScriptParser::ClassNode *inner_class = p_class->members[i].m_class;
+		StringName name = inner_class->identifier->name;
 		GDScript *subclass = p_script->subclasses[name].ptr();
 
-		Error err = _parse_class_blocks(subclass, p_class->subclasses[i], p_keep_state);
+		Error err = _parse_class_blocks(subclass, inner_class, p_keep_state);
 		if (err) {
 			return err;
 		}
@@ -2110,8 +2261,7 @@ Error GDScriptCompiler::_parse_class_blocks(GDScript *p_script, const GDScriptPa
 }
 
 void GDScriptCompiler::_make_scripts(GDScript *p_script, const GDScriptParser::ClassNode *p_class, bool p_keep_state) {
-
-	Map<StringName, Ref<GDScript> > old_subclasses;
+	Map<StringName, Ref<GDScript>> old_subclasses;
 
 	if (p_keep_state) {
 		old_subclasses = p_script->subclasses;
@@ -2119,8 +2269,12 @@ void GDScriptCompiler::_make_scripts(GDScript *p_script, const GDScriptParser::C
 
 	p_script->subclasses.clear();
 
-	for (int i = 0; i < p_class->subclasses.size(); i++) {
-		StringName name = p_class->subclasses[i]->name;
+	for (int i = 0; i < p_class->members.size(); i++) {
+		if (p_class->members[i].type != GDScriptParser::ClassNode::Member::CLASS) {
+			continue;
+		}
+		const GDScriptParser::ClassNode *inner_class = p_class->members[i].m_class;
+		StringName name = inner_class->identifier->name;
 
 		Ref<GDScript> subclass;
 		String fully_qualified_name = p_script->fully_qualified_name + "::" + name;
@@ -2140,19 +2294,17 @@ void GDScriptCompiler::_make_scripts(GDScript *p_script, const GDScriptParser::C
 		subclass->fully_qualified_name = fully_qualified_name;
 		p_script->subclasses.insert(name, subclass);
 
-		_make_scripts(subclass.ptr(), p_class->subclasses[i], false);
+		_make_scripts(subclass.ptr(), inner_class, false);
 	}
 }
 
 Error GDScriptCompiler::compile(const GDScriptParser *p_parser, GDScript *p_script, bool p_keep_state) {
-
 	err_line = -1;
 	err_column = -1;
 	error = "";
 	parser = p_parser;
 	main_script = p_script;
-	const GDScriptParser::Node *root = parser->get_parse_tree();
-	ERR_FAIL_COND_V(root->type != GDScriptParser::Node::TYPE_CLASS, ERR_INVALID_DATA);
+	const GDScriptParser::ClassNode *root = parser->get_tree();
 
 	source = p_script->get_path();
 
@@ -2160,32 +2312,33 @@ Error GDScriptCompiler::compile(const GDScriptParser *p_parser, GDScript *p_scri
 	p_script->fully_qualified_name = p_script->path;
 
 	// Create scripts for subclasses beforehand so they can be referenced
-	_make_scripts(p_script, static_cast<const GDScriptParser::ClassNode *>(root), p_keep_state);
+	_make_scripts(p_script, root, p_keep_state);
 
-	p_script->_owner = NULL;
-	Error err = _parse_class_level(p_script, static_cast<const GDScriptParser::ClassNode *>(root), p_keep_state);
+	p_script->_owner = nullptr;
+	Error err = _parse_class_level(p_script, root, p_keep_state);
 
-	if (err)
+	if (err) {
 		return err;
+	}
 
-	err = _parse_class_blocks(p_script, static_cast<const GDScriptParser::ClassNode *>(root), p_keep_state);
+	err = _parse_class_blocks(p_script, root, p_keep_state);
 
-	if (err)
+	if (err) {
 		return err;
+	}
 
-	return OK;
+	return GDScriptCache::finish_compiling(p_script->get_path());
 }
 
 String GDScriptCompiler::get_error() const {
-
 	return error;
 }
-int GDScriptCompiler::get_error_line() const {
 
+int GDScriptCompiler::get_error_line() const {
 	return err_line;
 }
-int GDScriptCompiler::get_error_column() const {
 
+int GDScriptCompiler::get_error_column() const {
 	return err_column;
 }
 
diff --git a/modules/gdscript/gdscript_compiler.h b/modules/gdscript/gdscript_compiler.h
index 7d5234a023..db02079d26 100644
--- a/modules/gdscript/gdscript_compiler.h
+++ b/modules/gdscript/gdscript_compiler.h
@@ -33,105 +33,88 @@
 
 #include "core/set.h"
 #include "gdscript.h"
+#include "gdscript_codegen.h"
+#include "gdscript_function.h"
 #include "gdscript_parser.h"
 
 class GDScriptCompiler {
-
-	const GDScriptParser *parser;
+	const GDScriptParser *parser = nullptr;
 	Set<GDScript *> parsed_classes;
 	Set<GDScript *> parsing_classes;
-	GDScript *main_script;
-	struct CodeGen {
+	GDScript *main_script = nullptr;
 
-		GDScript *script;
-		const GDScriptParser::ClassNode *class_node;
-		const GDScriptParser::FunctionNode *function_node;
-		bool debug_stack;
-
-		List<Map<StringName, int> > stack_id_stack;
-		Map<StringName, int> stack_identifiers;
-
-		List<GDScriptFunction::StackDebug> stack_debug;
-		List<Map<StringName, int> > block_identifier_stack;
-		Map<StringName, int> block_identifiers;
-
-		void add_stack_identifier(const StringName &p_id, int p_stackpos) {
-			stack_identifiers[p_id] = p_stackpos;
-			if (debug_stack) {
-				block_identifiers[p_id] = p_stackpos;
-				GDScriptFunction::StackDebug sd;
-				sd.added = true;
-				sd.line = current_line;
-				sd.identifier = p_id;
-				sd.pos = p_stackpos;
-				stack_debug.push_back(sd);
-			}
+	struct CodeGen {
+		GDScript *script = nullptr;
+		const GDScriptParser::ClassNode *class_node = nullptr;
+		const GDScriptParser::FunctionNode *function_node = nullptr;
+		StringName function_name;
+		GDScriptCodeGenerator *generator = nullptr;
+		Map<StringName, GDScriptCodeGenerator::Address> parameters;
+		Map<StringName, GDScriptCodeGenerator::Address> locals;
+		List<Set<StringName>> locals_in_scope;
+
+		GDScriptCodeGenerator::Address add_local(const StringName &p_name, const GDScriptDataType &p_type) {
+			uint32_t addr = generator->add_local(p_name, p_type);
+			locals[p_name] = GDScriptCodeGenerator::Address(GDScriptCodeGenerator::Address::LOCAL_VARIABLE, addr, p_type);
+			locals_in_scope.back()->get().insert(p_name);
+			return locals[p_name];
 		}
 
-		void push_stack_identifiers() {
-			stack_id_stack.push_back(stack_identifiers);
-			if (debug_stack) {
-
-				block_identifier_stack.push_back(block_identifiers);
-				block_identifiers.clear();
-			}
+		GDScriptCodeGenerator::Address add_local_constant(const StringName &p_name, const Variant &p_value) {
+			uint32_t addr = generator->add_local_constant(p_name, p_value);
+			locals[p_name] = GDScriptCodeGenerator::Address(GDScriptCodeGenerator::Address::LOCAL_CONSTANT, addr);
+			return locals[p_name];
 		}
 
-		void pop_stack_identifiers() {
-			stack_identifiers = stack_id_stack.back()->get();
-			stack_id_stack.pop_back();
-
-			if (debug_stack) {
-				for (Map<StringName, int>::Element *E = block_identifiers.front(); E; E = E->next()) {
+		GDScriptCodeGenerator::Address add_temporary(const GDScriptDataType &p_type = GDScriptDataType()) {
+			uint32_t addr = generator->add_temporary();
+			return GDScriptCodeGenerator::Address(GDScriptCodeGenerator::Address::TEMPORARY, addr, p_type);
+		}
 
-					GDScriptFunction::StackDebug sd;
-					sd.added = false;
-					sd.identifier = E->key();
-					sd.line = current_line;
-					sd.pos = E->get();
-					stack_debug.push_back(sd);
+		GDScriptCodeGenerator::Address add_constant(const Variant &p_constant) {
+			GDScriptDataType type;
+			type.has_type = true;
+			type.kind = GDScriptDataType::BUILTIN;
+			type.builtin_type = p_constant.get_type();
+			if (type.builtin_type == Variant::OBJECT) {
+				Object *obj = p_constant;
+				if (obj) {
+					type.kind = GDScriptDataType::NATIVE;
+					type.native_type = obj->get_class_name();
+
+					Ref<Script> script = obj->get_script();
+					if (script.is_valid()) {
+						type.script_type = script.ptr();
+						Ref<GDScript> gdscript = script;
+						if (gdscript.is_valid()) {
+							type.kind = GDScriptDataType::GDSCRIPT;
+						} else {
+							type.kind = GDScriptDataType::SCRIPT;
+						}
+					}
+				} else {
+					type.builtin_type = Variant::NIL;
 				}
-				block_identifiers = block_identifier_stack.back()->get();
-				block_identifier_stack.pop_back();
 			}
-		}
 
-		HashMap<Variant, int, VariantHasher, VariantComparator> constant_map;
-		Map<StringName, int> name_map;
-#ifdef TOOLS_ENABLED
-		Vector<StringName> named_globals;
-#endif
-
-		int get_name_map_pos(const StringName &p_identifier) {
-			int ret;
-			if (!name_map.has(p_identifier)) {
-				ret = name_map.size();
-				name_map[p_identifier] = ret;
-			} else {
-				ret = name_map[p_identifier];
-			}
-			return ret;
+			uint32_t addr = generator->add_or_get_constant(p_constant);
+			return GDScriptCodeGenerator::Address(GDScriptCodeGenerator::Address::CONSTANT, addr, type);
 		}
 
-		int get_constant_pos(const Variant &p_constant) {
-			if (constant_map.has(p_constant))
-				return constant_map[p_constant];
-			int pos = constant_map.size();
-			constant_map[p_constant] = pos;
-			return pos;
+		void start_block() {
+			Set<StringName> scope;
+			locals_in_scope.push_back(scope);
+			generator->start_block();
 		}
 
-		Vector<int> opcodes;
-		void alloc_stack(int p_level) {
-			if (p_level >= stack_max) stack_max = p_level + 1;
-		}
-		void alloc_call(int p_params) {
-			if (p_params >= call_max) call_max = p_params;
+		void end_block() {
+			Set<StringName> &scope = locals_in_scope.back()->get();
+			for (Set<StringName>::Element *E = scope.front(); E; E = E->next()) {
+				locals.erase(E->get());
+			}
+			locals_in_scope.pop_back();
+			generator->end_block();
 		}
-
-		int current_line;
-		int stack_max;
-		int call_max;
 	};
 
 	bool _is_class_member_property(CodeGen &codegen, const StringName &p_name);
@@ -139,15 +122,18 @@ class GDScriptCompiler {
 
 	void _set_error(const String &p_error, const GDScriptParser::Node *p_node);
 
-	bool _create_unary_operator(CodeGen &codegen, const GDScriptParser::OperatorNode *on, Variant::Operator op, int p_stack_level);
-	bool _create_binary_operator(CodeGen &codegen, const GDScriptParser::OperatorNode *on, Variant::Operator op, int p_stack_level, bool p_initializer = false, int p_index_addr = 0);
+	Error _create_binary_operator(CodeGen &codegen, const GDScriptParser::BinaryOpNode *on, Variant::Operator op, bool p_initializer = false, const GDScriptCodeGenerator::Address &p_index_addr = GDScriptCodeGenerator::Address());
+	Error _create_binary_operator(CodeGen &codegen, const GDScriptParser::ExpressionNode *p_left_operand, const GDScriptParser::ExpressionNode *p_right_operand, Variant::Operator op, bool p_initializer = false, const GDScriptCodeGenerator::Address &p_index_addr = GDScriptCodeGenerator::Address());
 
-	GDScriptDataType _gdtype_from_datatype(const GDScriptParser::DataType &p_datatype) const;
+	GDScriptDataType _gdtype_from_datatype(const GDScriptParser::DataType &p_datatype, GDScript *p_owner = nullptr) const;
 
-	int _parse_assign_right_expression(CodeGen &codegen, const GDScriptParser::OperatorNode *p_expression, int p_stack_level, int p_index_addr = 0);
-	int _parse_expression(CodeGen &codegen, const GDScriptParser::Node *p_expression, int p_stack_level, bool p_root = false, bool p_initializer = false, int p_index_addr = 0);
-	Error _parse_block(CodeGen &codegen, const GDScriptParser::BlockNode *p_block, int p_stack_level = 0, int p_break_addr = -1, int p_continue_addr = -1);
+	GDScriptCodeGenerator::Address _parse_assign_right_expression(CodeGen &codegen, Error &r_error, const GDScriptParser::AssignmentNode *p_assignmentint, const GDScriptCodeGenerator::Address &p_index_addr = GDScriptCodeGenerator::Address());
+	GDScriptCodeGenerator::Address _parse_expression(CodeGen &codegen, Error &r_error, const GDScriptParser::ExpressionNode *p_expression, bool p_root = false, bool p_initializer = false, const GDScriptCodeGenerator::Address &p_index_addr = GDScriptCodeGenerator::Address());
+	GDScriptCodeGenerator::Address _parse_match_pattern(CodeGen &codegen, Error &r_error, const GDScriptParser::PatternNode *p_pattern, const GDScriptCodeGenerator::Address &p_value_addr, const GDScriptCodeGenerator::Address &p_type_addr, const GDScriptCodeGenerator::Address &p_previous_test, bool p_is_first, bool p_is_nested);
+	void _add_locals_in_block(CodeGen &codegen, const GDScriptParser::SuiteNode *p_block);
+	Error _parse_block(CodeGen &codegen, const GDScriptParser::SuiteNode *p_block, bool p_add_locals = true);
 	Error _parse_function(GDScript *p_script, const GDScriptParser::ClassNode *p_class, const GDScriptParser::FunctionNode *p_func, bool p_for_ready = false);
+	Error _parse_setter_getter(GDScript *p_script, const GDScriptParser::ClassNode *p_class, const GDScriptParser::VariableNode *p_variable, bool p_is_setter);
 	Error _parse_class_level(GDScript *p_script, const GDScriptParser::ClassNode *p_class, bool p_keep_state);
 	Error _parse_class_blocks(GDScript *p_script, const GDScriptParser::ClassNode *p_class, bool p_keep_state);
 	void _make_scripts(GDScript *p_script, const GDScriptParser::ClassNode *p_class, bool p_keep_state);
@@ -155,6 +141,7 @@ class GDScriptCompiler {
 	int err_column;
 	StringName source;
 	String error;
+	bool within_await = false;
 
 public:
 	Error compile(const GDScriptParser *p_parser, GDScript *p_script, bool p_keep_state = false);
diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp
index 65c61cb57c..2e372575da 100644
--- a/modules/gdscript/gdscript_editor.cpp
+++ b/modules/gdscript/gdscript_editor.cpp
@@ -33,27 +33,28 @@
 #include "core/engine.h"
 #include "core/global_constants.h"
 #include "core/os/file_access.h"
+#include "gdscript_analyzer.h"
 #include "gdscript_compiler.h"
+#include "gdscript_parser.h"
+#include "gdscript_tokenizer.h"
 
 #ifdef TOOLS_ENABLED
+#include "core/project_settings.h"
 #include "editor/editor_file_system.h"
 #include "editor/editor_settings.h"
 #endif
 
 void GDScriptLanguage::get_comment_delimiters(List<String> *p_delimiters) const {
-
 	p_delimiters->push_back("#");
 }
 
 void GDScriptLanguage::get_string_delimiters(List<String> *p_delimiters) const {
-
 	p_delimiters->push_back("\" \"");
 	p_delimiters->push_back("' '");
 	p_delimiters->push_back("\"\"\" \"\"\"");
 }
 
 String GDScriptLanguage::_get_processed_template(const String &p_template, const String &p_base_class_name) const {
-
 	String processed_template = p_template;
 
 #ifdef TOOLS_ENABLED
@@ -109,27 +110,43 @@ Ref<Script> GDScriptLanguage::get_template(const String &p_class_name, const Str
 }
 
 bool GDScriptLanguage::is_using_templates() {
-
 	return true;
 }
 
 void GDScriptLanguage::make_template(const String &p_class_name, const String &p_base_class_name, Ref<Script> &p_script) {
-
 	String _template = _get_processed_template(p_script->get_source_code(), p_base_class_name);
 	p_script->set_source_code(_template);
 }
 
-bool GDScriptLanguage::validate(const String &p_script, int &r_line_error, int &r_col_error, String &r_test_error, const String &p_path, List<String> *r_functions, List<ScriptLanguage::Warning> *r_warnings, Set<int> *r_safe_lines) const {
+static void get_function_names_recursively(const GDScriptParser::ClassNode *p_class, const String &p_prefix, Map<int, String> &r_funcs) {
+	for (int i = 0; i < p_class->members.size(); i++) {
+		if (p_class->members[i].type == GDScriptParser::ClassNode::Member::FUNCTION) {
+			const GDScriptParser::FunctionNode *function = p_class->members[i].function;
+			r_funcs[function->start_line] = p_prefix.empty() ? String(function->identifier->name) : p_prefix + "." + String(function->identifier->name);
+		} else if (p_class->members[i].type == GDScriptParser::ClassNode::Member::CLASS) {
+			String new_prefix = p_class->members[i].m_class->identifier->name;
+			get_function_names_recursively(p_class->members[i].m_class, p_prefix.empty() ? new_prefix : p_prefix + "." + new_prefix, r_funcs);
+		}
+	}
+}
 
+bool GDScriptLanguage::validate(const String &p_script, int &r_line_error, int &r_col_error, String &r_test_error, const String &p_path, List<String> *r_functions, List<ScriptLanguage::Warning> *r_warnings, Set<int> *r_safe_lines) const {
 	GDScriptParser parser;
+	GDScriptAnalyzer analyzer(&parser);
 
-	Error err = parser.parse(p_script, p_path.get_base_dir(), true, p_path, false, r_safe_lines);
+	Error err = parser.parse(p_script, p_path, false);
+	if (err == OK) {
+		err = analyzer.analyze();
+	}
 #ifdef DEBUG_ENABLED
 	if (r_warnings) {
 		for (const List<GDScriptWarning>::Element *E = parser.get_warnings().front(); E; E = E->next()) {
 			const GDScriptWarning &warn = E->get();
 			ScriptLanguage::Warning w;
-			w.line = warn.line;
+			w.start_line = warn.start_line;
+			w.end_line = warn.end_line;
+			w.leftmost_column = warn.leftmost_column;
+			w.rightmost_column = warn.rightmost_column;
 			w.code = (int)warn.code;
 			w.string_code = GDScriptWarning::get_name_from_code(warn.code);
 			w.message = warn.get_message();
@@ -138,81 +155,70 @@ bool GDScriptLanguage::validate(const String &p_script, int &r_line_error, int &
 	}
 #endif
 	if (err) {
-		r_line_error = parser.get_error_line();
-		r_col_error = parser.get_error_column();
-		r_test_error = parser.get_error();
+		GDScriptParser::ParserError parse_error = parser.get_errors().front()->get();
+		r_line_error = parse_error.line;
+		r_col_error = parse_error.column;
+		r_test_error = parse_error.message;
 		return false;
 	} else {
-
-		const GDScriptParser::Node *root = parser.get_parse_tree();
-		ERR_FAIL_COND_V(root->type != GDScriptParser::Node::TYPE_CLASS, false);
-
-		const GDScriptParser::ClassNode *cl = static_cast<const GDScriptParser::ClassNode *>(root);
+		const GDScriptParser::ClassNode *cl = parser.get_tree();
 		Map<int, String> funcs;
-		for (int i = 0; i < cl->functions.size(); i++) {
-
-			funcs[cl->functions[i]->line] = cl->functions[i]->name;
-		}
 
-		for (int i = 0; i < cl->static_functions.size(); i++) {
+		get_function_names_recursively(cl, "", funcs);
 
-			funcs[cl->static_functions[i]->line] = cl->static_functions[i]->name;
+		for (Map<int, String>::Element *E = funcs.front(); E; E = E->next()) {
+			r_functions->push_back(E->get() + ":" + itos(E->key()));
 		}
+	}
 
-		for (int i = 0; i < cl->subclasses.size(); i++) {
-			for (int j = 0; j < cl->subclasses[i]->functions.size(); j++) {
-
-				funcs[cl->subclasses[i]->functions[j]->line] = String(cl->subclasses[i]->name) + "." + cl->subclasses[i]->functions[j]->name;
-			}
-			for (int j = 0; j < cl->subclasses[i]->static_functions.size(); j++) {
-
-				funcs[cl->subclasses[i]->static_functions[j]->line] = String(cl->subclasses[i]->name) + "." + cl->subclasses[i]->static_functions[j]->name;
+#ifdef DEBUG_ENABLED
+	if (r_safe_lines) {
+		const Set<int> &unsafe_lines = parser.get_unsafe_lines();
+		for (int i = 1; i <= parser.get_last_line_number(); i++) {
+			if (!unsafe_lines.has(i)) {
+				r_safe_lines->insert(i);
 			}
 		}
-
-		for (Map<int, String>::Element *E = funcs.front(); E; E = E->next()) {
-
-			r_functions->push_back(E->get() + ":" + itos(E->key()));
-		}
 	}
+#endif
 
 	return true;
 }
 
 bool GDScriptLanguage::has_named_classes() const {
-
 	return false;
 }
 
 bool GDScriptLanguage::supports_builtin_mode() const {
-
 	return true;
 }
 
 int GDScriptLanguage::find_function(const String &p_function, const String &p_code) const {
-
-	GDScriptTokenizerText tokenizer;
-	tokenizer.set_code(p_code);
+	GDScriptTokenizer tokenizer;
+	tokenizer.set_source_code(p_code);
 	int indent = 0;
-	while (tokenizer.get_token() != GDScriptTokenizer::TK_EOF && tokenizer.get_token() != GDScriptTokenizer::TK_ERROR) {
-
-		if (tokenizer.get_token() == GDScriptTokenizer::TK_NEWLINE) {
-			indent = tokenizer.get_token_line_indent();
+	GDScriptTokenizer::Token current = tokenizer.scan();
+	while (current.type != GDScriptTokenizer::Token::TK_EOF && current.type != GDScriptTokenizer::Token::ERROR) {
+		if (current.type == GDScriptTokenizer::Token::INDENT) {
+			indent++;
+		} else if (current.type == GDScriptTokenizer::Token::DEDENT) {
+			indent--;
 		}
-		if (indent == 0 && tokenizer.get_token() == GDScriptTokenizer::TK_PR_FUNCTION && tokenizer.get_token(1) == GDScriptTokenizer::TK_IDENTIFIER) {
-
-			String identifier = tokenizer.get_token_identifier(1);
-			if (identifier == p_function) {
-				return tokenizer.get_token_line();
+		if (indent == 0 && current.type == GDScriptTokenizer::Token::FUNC) {
+			current = tokenizer.scan();
+			if (current.is_identifier()) {
+				String identifier = current.get_identifier();
+				if (identifier == p_function) {
+					return current.start_line;
+				}
 			}
 		}
-		tokenizer.advance();
+		current = tokenizer.scan();
 	}
 	return -1;
 }
 
 Script *GDScriptLanguage::create_script() const {
-
 	return memnew(GDScript);
 }
 
@@ -221,12 +227,11 @@ Script *GDScriptLanguage::create_script() const {
 bool GDScriptLanguage::debug_break_parse(const String &p_file, int p_line, const String &p_error) {
 	//break because of parse error
 
-	if (ScriptDebugger::get_singleton() && Thread::get_caller_id() == Thread::get_main_id()) {
-
+	if (EngineDebugger::is_active() && Thread::get_caller_id() == Thread::get_main_id()) {
 		_debug_parse_err_line = p_line;
 		_debug_parse_err_file = p_file;
 		_debug_error = p_error;
-		ScriptDebugger::get_singleton()->debug(this, false, true);
+		EngineDebugger::get_script_debugger()->debug(this, false, true);
 		return true;
 	} else {
 		return false;
@@ -234,14 +239,12 @@ bool GDScriptLanguage::debug_break_parse(const String &p_file, int p_line, const
 }
 
 bool GDScriptLanguage::debug_break(const String &p_error, bool p_allow_continue) {
-
-	if (ScriptDebugger::get_singleton() && Thread::get_caller_id() == Thread::get_main_id()) {
-
+	if (EngineDebugger::is_active() && Thread::get_caller_id() == Thread::get_main_id()) {
 		_debug_parse_err_line = -1;
 		_debug_parse_err_file = "";
 		_debug_error = p_error;
 		bool is_error_breakpoint = p_error != "Breakpoint";
-		ScriptDebugger::get_singleton()->debug(this, p_allow_continue, is_error_breakpoint);
+		EngineDebugger::get_script_debugger()->debug(this, p_allow_continue, is_error_breakpoint);
 		return true;
 	} else {
 		return false;
@@ -249,21 +252,21 @@ bool GDScriptLanguage::debug_break(const String &p_error, bool p_allow_continue)
 }
 
 String GDScriptLanguage::debug_get_error() const {
-
 	return _debug_error;
 }
 
 int GDScriptLanguage::debug_get_stack_level_count() const {
-
-	if (_debug_parse_err_line >= 0)
+	if (_debug_parse_err_line >= 0) {
 		return 1;
+	}
 
 	return _debug_call_stack_pos;
 }
-int GDScriptLanguage::debug_get_stack_level_line(int p_level) const {
 
-	if (_debug_parse_err_line >= 0)
+int GDScriptLanguage::debug_get_stack_level_line(int p_level) const {
+	if (_debug_parse_err_line >= 0) {
 		return _debug_parse_err_line;
+	}
 
 	ERR_FAIL_INDEX_V(p_level, _debug_call_stack_pos, -1);
 
@@ -271,55 +274,59 @@ int GDScriptLanguage::debug_get_stack_level_line(int p_level) const {
 
 	return *(_call_stack[l].line);
 }
-String GDScriptLanguage::debug_get_stack_level_function(int p_level) const {
 
-	if (_debug_parse_err_line >= 0)
+String GDScriptLanguage::debug_get_stack_level_function(int p_level) const {
+	if (_debug_parse_err_line >= 0) {
 		return "";
+	}
 
 	ERR_FAIL_INDEX_V(p_level, _debug_call_stack_pos, "");
 	int l = _debug_call_stack_pos - p_level - 1;
 	return _call_stack[l].function->get_name();
 }
-String GDScriptLanguage::debug_get_stack_level_source(int p_level) const {
 
-	if (_debug_parse_err_line >= 0)
+String GDScriptLanguage::debug_get_stack_level_source(int p_level) const {
+	if (_debug_parse_err_line >= 0) {
 		return _debug_parse_err_file;
+	}
 
 	ERR_FAIL_INDEX_V(p_level, _debug_call_stack_pos, "");
 	int l = _debug_call_stack_pos - p_level - 1;
 	return _call_stack[l].function->get_source();
 }
-void GDScriptLanguage::debug_get_stack_level_locals(int p_level, List<String> *p_locals, List<Variant> *p_values, int p_max_subitems, int p_max_depth) {
 
-	if (_debug_parse_err_line >= 0)
+void GDScriptLanguage::debug_get_stack_level_locals(int p_level, List<String> *p_locals, List<Variant> *p_values, int p_max_subitems, int p_max_depth) {
+	if (_debug_parse_err_line >= 0) {
 		return;
+	}
 
 	ERR_FAIL_INDEX(p_level, _debug_call_stack_pos);
 	int l = _debug_call_stack_pos - p_level - 1;
 
 	GDScriptFunction *f = _call_stack[l].function;
 
-	List<Pair<StringName, int> > locals;
+	List<Pair<StringName, int>> locals;
 
 	f->debug_get_stack_member_state(*_call_stack[l].line, &locals);
-	for (List<Pair<StringName, int> >::Element *E = locals.front(); E; E = E->next()) {
-
+	for (List<Pair<StringName, int>>::Element *E = locals.front(); E; E = E->next()) {
 		p_locals->push_back(E->get().first);
 		p_values->push_back(_call_stack[l].stack[E->get().second]);
 	}
 }
-void GDScriptLanguage::debug_get_stack_level_members(int p_level, List<String> *p_members, List<Variant> *p_values, int p_max_subitems, int p_max_depth) {
 
-	if (_debug_parse_err_line >= 0)
+void GDScriptLanguage::debug_get_stack_level_members(int p_level, List<String> *p_members, List<Variant> *p_values, int p_max_subitems, int p_max_depth) {
+	if (_debug_parse_err_line >= 0) {
 		return;
+	}
 
 	ERR_FAIL_INDEX(p_level, _debug_call_stack_pos);
 	int l = _debug_call_stack_pos - p_level - 1;
 
 	GDScriptInstance *instance = _call_stack[l].instance;
 
-	if (!instance)
+	if (!instance) {
 		return;
+	}
 
 	Ref<GDScript> script = instance->get_script();
 	ERR_FAIL_COND(script.is_null());
@@ -327,18 +334,17 @@ void GDScriptLanguage::debug_get_stack_level_members(int p_level, List<String> *
 	const Map<StringName, GDScript::MemberInfo> &mi = script->debug_get_member_indices();
 
 	for (const Map<StringName, GDScript::MemberInfo>::Element *E = mi.front(); E; E = E->next()) {
-
 		p_members->push_back(E->key());
 		p_values->push_back(instance->debug_get_member_by_index(E->get().index));
 	}
 }
 
 ScriptInstance *GDScriptLanguage::debug_get_stack_level_instance(int p_level) {
+	if (_debug_parse_err_line >= 0) {
+		return nullptr;
+	}
 
-	if (_debug_parse_err_line >= 0)
-		return NULL;
-
-	ERR_FAIL_INDEX_V(p_level, _debug_call_stack_pos, NULL);
+	ERR_FAIL_INDEX_V(p_level, _debug_call_stack_pos, nullptr);
 
 	int l = _debug_call_stack_pos - p_level - 1;
 	ScriptInstance *instance = _call_stack[l].instance;
@@ -347,32 +353,33 @@ ScriptInstance *GDScriptLanguage::debug_get_stack_level_instance(int p_level) {
 }
 
 void GDScriptLanguage::debug_get_globals(List<String> *p_globals, List<Variant> *p_values, int p_max_subitems, int p_max_depth) {
-
 	const Map<StringName, int> &name_idx = GDScriptLanguage::get_singleton()->get_global_map();
 	const Variant *globals = GDScriptLanguage::get_singleton()->get_global_array();
 
-	List<Pair<String, Variant> > cinfo;
+	List<Pair<String, Variant>> cinfo;
 	get_public_constants(&cinfo);
 
 	for (const Map<StringName, int>::Element *E = name_idx.front(); E; E = E->next()) {
-
-		if (ClassDB::class_exists(E->key()) || Engine::get_singleton()->has_singleton(E->key()))
+		if (ClassDB::class_exists(E->key()) || Engine::get_singleton()->has_singleton(E->key())) {
 			continue;
+		}
 
 		bool is_script_constant = false;
-		for (List<Pair<String, Variant> >::Element *CE = cinfo.front(); CE; CE = CE->next()) {
+		for (List<Pair<String, Variant>>::Element *CE = cinfo.front(); CE; CE = CE->next()) {
 			if (CE->get().first == E->key()) {
 				is_script_constant = true;
 				break;
 			}
 		}
-		if (is_script_constant)
+		if (is_script_constant) {
 			continue;
+		}
 
 		const Variant &var = globals[E->value()];
 		if (Object *obj = var) {
-			if (Object::cast_to<GDScriptNativeClass>(obj))
+			if (Object::cast_to<GDScriptNativeClass>(obj)) {
 				continue;
+			}
 		}
 
 		bool skip = false;
@@ -382,8 +389,9 @@ void GDScriptLanguage::debug_get_globals(List<String> *p_globals, List<Variant>
 				break;
 			}
 		}
-		if (skip)
+		if (skip) {
 			continue;
+		}
 
 		p_globals->push_back(E->key());
 		p_values->push_back(var);
@@ -391,19 +399,15 @@ void GDScriptLanguage::debug_get_globals(List<String> *p_globals, List<Variant>
 }
 
 String GDScriptLanguage::debug_parse_stack_level_expression(int p_level, const String &p_expression, int p_max_subitems, int p_max_depth) {
-
 	return "";
 }
 
 void GDScriptLanguage::get_recognized_extensions(List<String> *p_extensions) const {
-
 	p_extensions->push_back("gd");
 }
 
 void GDScriptLanguage::get_public_functions(List<MethodInfo> *p_functions) const {
-
 	for (int i = 0; i < GDScriptFunctions::FUNC_MAX; i++) {
-
 		p_functions->push_back(GDScriptFunctions::get_info(GDScriptFunctions::Function(i)));
 	}
 
@@ -417,25 +421,16 @@ void GDScriptLanguage::get_public_functions(List<MethodInfo> *p_functions) const
 	}
 	{
 		MethodInfo mi;
-		mi.name = "yield";
-		mi.arguments.push_back(PropertyInfo(Variant::OBJECT, "object"));
-		mi.arguments.push_back(PropertyInfo(Variant::STRING, "signal"));
-		mi.default_arguments.push_back(Variant());
-		mi.default_arguments.push_back(String());
-		mi.return_val = PropertyInfo(Variant::OBJECT, "", PROPERTY_HINT_RESOURCE_TYPE, "GDScriptFunctionState");
-		p_functions->push_back(mi);
-	}
-	{
-		MethodInfo mi;
 		mi.name = "assert";
 		mi.return_val.type = Variant::NIL;
 		mi.arguments.push_back(PropertyInfo(Variant::BOOL, "condition"));
+		mi.arguments.push_back(PropertyInfo(Variant::STRING, "message"));
+		mi.default_arguments.push_back(String());
 		p_functions->push_back(mi);
 	}
 }
 
-void GDScriptLanguage::get_public_constants(List<Pair<String, Variant> > *p_constants) const {
-
+void GDScriptLanguage::get_public_constants(List<Pair<String, Variant>> *p_constants) const {
 	Pair<String, Variant> pi;
 	pi.first = "PI";
 	pi.second = Math_PI;
@@ -457,8 +452,7 @@ void GDScriptLanguage::get_public_constants(List<Pair<String, Variant> > *p_cons
 	p_constants->push_back(nan);
 }
 
-String GDScriptLanguage::make_function(const String &p_class, const String &p_name, const PoolStringArray &p_args) const {
-
+String GDScriptLanguage::make_function(const String &p_class, const String &p_name, const PackedStringArray &p_args) const {
 #ifdef TOOLS_ENABLED
 	bool th = EditorSettings::get_singleton()->get_setting("text_editor/completion/add_type_hints");
 #else
@@ -468,8 +462,9 @@ String GDScriptLanguage::make_function(const String &p_class, const String &p_na
 	String s = "func " + p_name + "(";
 	if (p_args.size()) {
 		for (int i = 0; i < p_args.size(); i++) {
-			if (i > 0)
+			if (i > 0) {
 				s += ", ";
+			}
 			s += p_args[i].get_slice(":", 0);
 			if (th) {
 				String type = p_args[i].get_slice(":", 1);
@@ -486,54 +481,48 @@ String GDScriptLanguage::make_function(const String &p_class, const String &p_na
 
 //////// COMPLETION //////////
 
-#if defined(DEBUG_METHODS_ENABLED) && defined(TOOLS_ENABLED)
-
-struct GDScriptCompletionContext {
-
-	const GDScriptParser::ClassNode *_class;
-	const GDScriptParser::FunctionNode *function;
-	const GDScriptParser::BlockNode *block;
-	Object *base;
-	String base_path;
-	int line;
-	uint32_t depth;
-
-	GDScriptCompletionContext() :
-			_class(NULL),
-			function(NULL),
-			block(NULL),
-			base(NULL),
-			line(0),
-			depth(0) {}
-};
+#ifdef TOOLS_ENABLED
+
+#define COMPLETION_RECURSION_LIMIT 200
 
 struct GDScriptCompletionIdentifier {
 	GDScriptParser::DataType type;
 	String enumeration;
 	Variant value;
-	const GDScriptParser::Node *assigned_expression;
-
-	GDScriptCompletionIdentifier() :
-			assigned_expression(NULL) {}
+	const GDScriptParser::ExpressionNode *assigned_expression = nullptr;
 };
 
-static void _get_directory_contents(EditorFileSystemDirectory *p_dir, Map<String, ScriptCodeCompletionOption> &r_list) {
-
-	const String quote_style = EDITOR_DEF("text_editor/completion/use_single_quotes", false) ? "'" : "\"";
-
-	for (int i = 0; i < p_dir->get_file_count(); i++) {
-		ScriptCodeCompletionOption option(p_dir->get_file_path(i), ScriptCodeCompletionOption::KIND_FILE_PATH);
-		option.insert_text = quote_style + option.display + quote_style;
-		r_list.insert(option.display, option);
-	}
-
-	for (int i = 0; i < p_dir->get_subdir_count(); i++) {
-		_get_directory_contents(p_dir->get_subdir(i), r_list);
+// TODO: Move this to a central location (maybe core?).
+static const char *underscore_classes[] = {
+	"ClassDB",
+	"Directory",
+	"Engine",
+	"File",
+	"Geometry",
+	"GodotSharp",
+	"JSON",
+	"Marshalls",
+	"Mutex",
+	"OS",
+	"ResourceLoader",
+	"ResourceSaver",
+	"Semaphore",
+	"Thread",
+	"VisualScriptEditor",
+	nullptr,
+};
+static StringName _get_real_class_name(const StringName &p_source) {
+	const char **class_name = underscore_classes;
+	while (*class_name != nullptr) {
+		if (p_source == *class_name) {
+			return String("_") + p_source;
+		}
+		class_name++;
 	}
+	return p_source;
 }
 
-static String _get_visual_datatype(const PropertyInfo &p_info, bool p_isarg = true) {
-
+static String _get_visual_datatype(const PropertyInfo &p_info, bool p_is_arg = true) {
 	if (p_info.usage & PROPERTY_USAGE_CLASS_IS_ENUM) {
 		String enum_name = p_info.class_name;
 		if (enum_name.find(".") == -1) {
@@ -556,7 +545,7 @@ static String _get_visual_datatype(const PropertyInfo &p_info, bool p_isarg = tr
 		}
 	}
 	if (p_info.type == Variant::NIL) {
-		if (p_isarg || (p_info.usage & PROPERTY_USAGE_NIL_IS_VARIANT)) {
+		if (p_is_arg || (p_info.usage & PROPERTY_USAGE_NIL_IS_VARIANT)) {
 			return "Variant";
 		} else {
 			return "void";
@@ -566,11 +555,541 @@ static String _get_visual_datatype(const PropertyInfo &p_info, bool p_isarg = tr
 	return Variant::get_type_name(p_info.type);
 }
 
+static String _make_arguments_hint(const MethodInfo &p_info, int p_arg_idx, bool p_is_annotation = false) {
+	String arghint;
+	if (!p_is_annotation) {
+		arghint += _get_visual_datatype(p_info.return_val, false) + " ";
+	}
+	arghint += p_info.name + "(";
+
+	int def_args = p_info.arguments.size() - p_info.default_arguments.size();
+	int i = 0;
+	for (const List<PropertyInfo>::Element *E = p_info.arguments.front(); E; E = E->next()) {
+		if (i > 0) {
+			arghint += ", ";
+		}
+
+		if (i == p_arg_idx) {
+			arghint += String::chr(0xFFFF);
+		}
+		arghint += E->get().name + ": " + _get_visual_datatype(E->get(), true);
+
+		if (i - def_args >= 0) {
+			arghint += String(" = ") + p_info.default_arguments[i - def_args].get_construct_string();
+		}
+
+		if (i == p_arg_idx) {
+			arghint += String::chr(0xFFFF);
+		}
+
+		i++;
+	}
+
+	if (p_info.flags & METHOD_FLAG_VARARG) {
+		if (p_info.arguments.size() > 0) {
+			arghint += ", ";
+		}
+		if (p_arg_idx >= p_info.arguments.size()) {
+			arghint += String::chr(0xFFFF);
+		}
+		arghint += "...";
+		if (p_arg_idx >= p_info.arguments.size()) {
+			arghint += String::chr(0xFFFF);
+		}
+	}
+
+	arghint += ")";
+
+	return arghint;
+}
+
+static String _make_arguments_hint(const GDScriptParser::FunctionNode *p_function, int p_arg_idx) {
+	String arghint = p_function->get_datatype().to_string() + " " + p_function->identifier->name.operator String() + "(";
+
+	for (int i = 0; i < p_function->parameters.size(); i++) {
+		if (i > 0) {
+			arghint += ", ";
+		}
+
+		if (i == p_arg_idx) {
+			arghint += String::chr(0xFFFF);
+		}
+		const GDScriptParser::ParameterNode *par = p_function->parameters[i];
+		arghint += par->identifier->name.operator String() + ": " + par->get_datatype().to_string();
+
+		if (par->default_value) {
+			String def_val = "<unknown>";
+			if (par->default_value->type == GDScriptParser::Node::LITERAL) {
+				const GDScriptParser::LiteralNode *literal = static_cast<const GDScriptParser::LiteralNode *>(par->default_value);
+				def_val = literal->value.get_construct_string();
+			} else if (par->default_value->type == GDScriptParser::Node::IDENTIFIER) {
+				const GDScriptParser::IdentifierNode *id = static_cast<const GDScriptParser::IdentifierNode *>(par->default_value);
+				def_val = id->name.operator String();
+			}
+			arghint += " = " + def_val;
+		}
+		if (i == p_arg_idx) {
+			arghint += String::chr(0xFFFF);
+		}
+	}
+
+	arghint += ")";
+
+	return arghint;
+}
+
+static void _get_directory_contents(EditorFileSystemDirectory *p_dir, Map<String, ScriptCodeCompletionOption> &r_list) {
+	const String quote_style = EDITOR_DEF("text_editor/completion/use_single_quotes", false) ? "'" : "\"";
+
+	for (int i = 0; i < p_dir->get_file_count(); i++) {
+		ScriptCodeCompletionOption option(p_dir->get_file_path(i), ScriptCodeCompletionOption::KIND_FILE_PATH);
+		option.insert_text = quote_style + option.display + quote_style;
+		r_list.insert(option.display, option);
+	}
+
+	for (int i = 0; i < p_dir->get_subdir_count(); i++) {
+		_get_directory_contents(p_dir->get_subdir(i), r_list);
+	}
+}
+
+static void _find_annotation_arguments(const GDScriptParser::AnnotationNode *p_annotation, int p_argument, const String p_quote_style, Map<String, ScriptCodeCompletionOption> &r_result) {
+	if (p_annotation->name == "@export_range" || p_annotation->name == "@export_exp_range") {
+		if (p_argument == 3 || p_argument == 4) {
+			// Slider hint.
+			ScriptCodeCompletionOption slider1("or_greater", ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
+			slider1.insert_text = p_quote_style + slider1.display + p_quote_style;
+			r_result.insert(slider1.display, slider1);
+			ScriptCodeCompletionOption slider2("or_lesser", ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
+			slider2.insert_text = p_quote_style + slider2.display + p_quote_style;
+			r_result.insert(slider2.display, slider2);
+		}
+	} else if (p_annotation->name == "@export_exp_easing") {
+		if (p_argument == 0 || p_argument == 1) {
+			// Easing hint.
+			ScriptCodeCompletionOption hint1("attenuation", ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
+			hint1.insert_text = p_quote_style + hint1.display + p_quote_style;
+			r_result.insert(hint1.display, hint1);
+			ScriptCodeCompletionOption hint2("inout", ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
+			hint2.insert_text = p_quote_style + hint2.display + p_quote_style;
+			r_result.insert(hint2.display, hint2);
+		}
+	} else if (p_annotation->name == "@export_node_path") {
+		ScriptCodeCompletionOption node("Node", ScriptCodeCompletionOption::KIND_CLASS);
+		r_result.insert(node.display, node);
+		List<StringName> node_types;
+		ClassDB::get_inheriters_from_class("Node", &node_types);
+		for (const List<StringName>::Element *E = node_types.front(); E != nullptr; E = E->next()) {
+			if (!ClassDB::is_class_exposed(E->get())) {
+				continue;
+			}
+			ScriptCodeCompletionOption option(E->get(), ScriptCodeCompletionOption::KIND_CLASS);
+			r_result.insert(option.display, option);
+		}
+	}
+}
+
+static void _list_available_types(bool p_inherit_only, GDScriptParser::CompletionContext &p_context, Map<String, ScriptCodeCompletionOption> &r_result) {
+	List<StringName> native_types;
+	ClassDB::get_class_list(&native_types);
+	for (const List<StringName>::Element *E = native_types.front(); E != nullptr; E = E->next()) {
+		if (ClassDB::is_class_exposed(E->get()) && !Engine::get_singleton()->has_singleton(E->get())) {
+			ScriptCodeCompletionOption option(E->get(), ScriptCodeCompletionOption::KIND_CLASS);
+			r_result.insert(option.display, option);
+		}
+	}
+
+	if (p_context.current_class) {
+		if (!p_inherit_only && p_context.current_class->base_type.is_set()) {
+			// Native enums from base class
+			List<StringName> enums;
+			ClassDB::get_enum_list(p_context.current_class->base_type.native_type, &enums);
+			for (const List<StringName>::Element *E = enums.front(); E != nullptr; E = E->next()) {
+				ScriptCodeCompletionOption option(E->get(), ScriptCodeCompletionOption::KIND_ENUM);
+				r_result.insert(option.display, option);
+			}
+		}
+		// Check current class for potential types
+		const GDScriptParser::ClassNode *current = p_context.current_class;
+		while (current) {
+			for (int i = 0; i < current->members.size(); i++) {
+				const GDScriptParser::ClassNode::Member &member = current->members[i];
+				switch (member.type) {
+					case GDScriptParser::ClassNode::Member::CLASS: {
+						ScriptCodeCompletionOption option(member.m_class->identifier->name, ScriptCodeCompletionOption::KIND_CLASS);
+						r_result.insert(option.display, option);
+					} break;
+					case GDScriptParser::ClassNode::Member::ENUM: {
+						if (!p_inherit_only) {
+							ScriptCodeCompletionOption option(member.m_enum->identifier->name, ScriptCodeCompletionOption::KIND_ENUM);
+							r_result.insert(option.display, option);
+						}
+					} break;
+					case GDScriptParser::ClassNode::Member::CONSTANT: {
+						if (member.constant->get_datatype().is_meta_type && p_context.current_class->outer != nullptr) {
+							ScriptCodeCompletionOption option(member.constant->identifier->name, ScriptCodeCompletionOption::KIND_CLASS);
+							r_result.insert(option.display, option);
+						}
+					} break;
+					default:
+						break;
+				}
+			}
+			current = current->outer;
+		}
+	}
+
+	// Global scripts
+	List<StringName> global_classes;
+	ScriptServer::get_global_class_list(&global_classes);
+	for (const List<StringName>::Element *E = global_classes.front(); E != nullptr; E = E->next()) {
+		ScriptCodeCompletionOption option(E->get(), ScriptCodeCompletionOption::KIND_CLASS);
+		r_result.insert(option.display, option);
+	}
+
+	// Autoload singletons
+	Map<StringName, ProjectSettings::AutoloadInfo> autoloads = ProjectSettings::get_singleton()->get_autoload_list();
+	for (const Map<StringName, ProjectSettings::AutoloadInfo>::Element *E = autoloads.front(); E != nullptr; E = E->next()) {
+		const ProjectSettings::AutoloadInfo &info = E->get();
+		if (!info.is_singleton || info.path.get_extension().to_lower() != "gd") {
+			continue;
+		}
+		ScriptCodeCompletionOption option(info.name, ScriptCodeCompletionOption::KIND_CLASS);
+		r_result.insert(option.display, option);
+	}
+}
+
+static void _find_identifiers_in_suite(const GDScriptParser::SuiteNode *p_suite, Map<String, ScriptCodeCompletionOption> &r_result) {
+	for (int i = 0; i < p_suite->locals.size(); i++) {
+		ScriptCodeCompletionOption option(p_suite->locals[i].name, ScriptCodeCompletionOption::KIND_VARIABLE);
+		r_result.insert(option.display, option);
+	}
+	if (p_suite->parent_block) {
+		_find_identifiers_in_suite(p_suite->parent_block, r_result);
+	}
+}
+
+static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base, bool p_only_functions, Map<String, ScriptCodeCompletionOption> &r_result, int p_recursion_depth);
+
+static void _find_identifiers_in_class(const GDScriptParser::ClassNode *p_class, bool p_only_functions, bool p_static, bool p_parent_only, Map<String, ScriptCodeCompletionOption> &r_result, int p_recursion_depth) {
+	ERR_FAIL_COND(p_recursion_depth > COMPLETION_RECURSION_LIMIT);
+
+	if (!p_parent_only) {
+		bool outer = false;
+		const GDScriptParser::ClassNode *clss = p_class;
+		while (clss) {
+			for (int i = 0; i < clss->members.size(); i++) {
+				const GDScriptParser::ClassNode::Member &member = clss->members[i];
+				ScriptCodeCompletionOption option;
+				switch (member.type) {
+					case GDScriptParser::ClassNode::Member::VARIABLE:
+						if (p_only_functions || outer || (p_static)) {
+							continue;
+						}
+						option = ScriptCodeCompletionOption(member.variable->identifier->name, ScriptCodeCompletionOption::KIND_MEMBER);
+						break;
+					case GDScriptParser::ClassNode::Member::CONSTANT:
+						if (p_only_functions) {
+							continue;
+						}
+						option = ScriptCodeCompletionOption(member.constant->identifier->name, ScriptCodeCompletionOption::KIND_CONSTANT);
+						break;
+					case GDScriptParser::ClassNode::Member::CLASS:
+						if (p_only_functions) {
+							continue;
+						}
+						option = ScriptCodeCompletionOption(member.m_class->identifier->name, ScriptCodeCompletionOption::KIND_CLASS);
+						break;
+					case GDScriptParser::ClassNode::Member::ENUM_VALUE:
+						if (p_only_functions) {
+							continue;
+						}
+						option = ScriptCodeCompletionOption(member.enum_value.identifier->name, ScriptCodeCompletionOption::KIND_CONSTANT);
+						break;
+					case GDScriptParser::ClassNode::Member::ENUM:
+						if (p_only_functions) {
+							continue;
+						}
+						option = ScriptCodeCompletionOption(member.m_enum->identifier->name, ScriptCodeCompletionOption::KIND_ENUM);
+						break;
+					case GDScriptParser::ClassNode::Member::FUNCTION:
+						if (outer || (p_static && !member.function->is_static) || member.function->identifier->name.operator String().begins_with("@")) {
+							continue;
+						}
+						option = ScriptCodeCompletionOption(member.function->identifier->name, ScriptCodeCompletionOption::KIND_FUNCTION);
+						if (member.function->parameters.size() > 0) {
+							option.insert_text += "(";
+						} else {
+							option.insert_text += "()";
+						}
+						break;
+					case GDScriptParser::ClassNode::Member::SIGNAL:
+						if (p_only_functions || outer) {
+							continue;
+						}
+						option = ScriptCodeCompletionOption(member.signal->identifier->name, ScriptCodeCompletionOption::KIND_SIGNAL);
+						break;
+					case GDScriptParser::ClassNode::Member::UNDEFINED:
+						break;
+				}
+				r_result.insert(option.display, option);
+			}
+			outer = true;
+			clss = clss->outer;
+		}
+	}
+
+	// Parents.
+	GDScriptCompletionIdentifier base_type;
+	base_type.type = p_class->base_type;
+	base_type.type.is_meta_type = p_static;
+
+	_find_identifiers_in_base(base_type, p_only_functions, r_result, p_recursion_depth + 1);
+}
+
+static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base, bool p_only_functions, Map<String, ScriptCodeCompletionOption> &r_result, int p_recursion_depth) {
+	ERR_FAIL_COND(p_recursion_depth > COMPLETION_RECURSION_LIMIT);
+
+	GDScriptParser::DataType base_type = p_base.type;
+	bool _static = base_type.is_meta_type;
+
+	if (_static && base_type.kind != GDScriptParser::DataType::BUILTIN) {
+		ScriptCodeCompletionOption option("new", ScriptCodeCompletionOption::KIND_FUNCTION);
+		option.insert_text += "(";
+		r_result.insert(option.display, option);
+	}
+
+	while (!base_type.has_no_type()) {
+		switch (base_type.kind) {
+			case GDScriptParser::DataType::CLASS: {
+				_find_identifiers_in_class(base_type.class_type, p_only_functions, _static, false, r_result, p_recursion_depth + 1);
+				// This already finds all parent identifiers, so we are done.
+				base_type = GDScriptParser::DataType();
+			} break;
+			case GDScriptParser::DataType::SCRIPT: {
+				Ref<Script> scr = base_type.script_type;
+				if (scr.is_valid()) {
+					if (!p_only_functions) {
+						if (!_static) {
+							List<PropertyInfo> members;
+							scr->get_script_property_list(&members);
+							for (List<PropertyInfo>::Element *E = members.front(); E; E = E->next()) {
+								ScriptCodeCompletionOption option(E->get().name, ScriptCodeCompletionOption::KIND_MEMBER);
+								r_result.insert(option.display, option);
+							}
+						}
+						Map<StringName, Variant> constants;
+						scr->get_constants(&constants);
+						for (Map<StringName, Variant>::Element *E = constants.front(); E; E = E->next()) {
+							ScriptCodeCompletionOption option(E->key().operator String(), ScriptCodeCompletionOption::KIND_CONSTANT);
+							r_result.insert(option.display, option);
+						}
+
+						List<MethodInfo> signals;
+						scr->get_script_signal_list(&signals);
+						for (List<MethodInfo>::Element *E = signals.front(); E; E = E->next()) {
+							ScriptCodeCompletionOption option(E->get().name, ScriptCodeCompletionOption::KIND_SIGNAL);
+							r_result.insert(option.display, option);
+						}
+					}
+
+					List<MethodInfo> methods;
+					scr->get_script_method_list(&methods);
+					for (List<MethodInfo>::Element *E = methods.front(); E; E = E->next()) {
+						if (E->get().name.begins_with("@")) {
+							continue;
+						}
+						ScriptCodeCompletionOption option(E->get().name, ScriptCodeCompletionOption::KIND_FUNCTION);
+						if (E->get().arguments.size()) {
+							option.insert_text += "(";
+						} else {
+							option.insert_text += "()";
+						}
+						r_result.insert(option.display, option);
+					}
+
+					Ref<Script> base_script = scr->get_base_script();
+					if (base_script.is_valid()) {
+						base_type.script_type = base_script;
+					} else {
+						base_type.kind = GDScriptParser::DataType::NATIVE;
+						base_type.native_type = scr->get_instance_base_type();
+					}
+				} else {
+					return;
+				}
+			} break;
+			case GDScriptParser::DataType::NATIVE: {
+				StringName type = _get_real_class_name(base_type.native_type);
+				if (!ClassDB::class_exists(type)) {
+					return;
+				}
+
+				if (!p_only_functions) {
+					List<String> constants;
+					ClassDB::get_integer_constant_list(type, &constants);
+					for (List<String>::Element *E = constants.front(); E; E = E->next()) {
+						ScriptCodeCompletionOption option(E->get(), ScriptCodeCompletionOption::KIND_CONSTANT);
+						r_result.insert(option.display, option);
+					}
+
+					if (!_static || Engine::get_singleton()->has_singleton(type)) {
+						List<PropertyInfo> pinfo;
+						ClassDB::get_property_list(type, &pinfo);
+						for (List<PropertyInfo>::Element *E = pinfo.front(); E; E = E->next()) {
+							if (E->get().usage & (PROPERTY_USAGE_GROUP | PROPERTY_USAGE_CATEGORY)) {
+								continue;
+							}
+							if (E->get().name.find("/") != -1) {
+								continue;
+							}
+							ScriptCodeCompletionOption option(E->get().name, ScriptCodeCompletionOption::KIND_MEMBER);
+							r_result.insert(option.display, option);
+						}
+					}
+				}
+
+				if (!_static || Engine::get_singleton()->has_singleton(type)) {
+					List<MethodInfo> methods;
+					bool is_autocompleting_getters = GLOBAL_GET("debug/gdscript/completion/autocomplete_setters_and_getters").booleanize();
+					ClassDB::get_method_list(type, &methods, false, !is_autocompleting_getters);
+					for (List<MethodInfo>::Element *E = methods.front(); E; E = E->next()) {
+						if (E->get().name.begins_with("_")) {
+							continue;
+						}
+						ScriptCodeCompletionOption option(E->get().name, ScriptCodeCompletionOption::KIND_FUNCTION);
+						if (E->get().arguments.size()) {
+							option.insert_text += "(";
+						} else {
+							option.insert_text += "()";
+						}
+						r_result.insert(option.display, option);
+					}
+				}
+
+				return;
+			} break;
+			case GDScriptParser::DataType::BUILTIN: {
+				Callable::CallError err;
+				Variant tmp = Variant::construct(base_type.builtin_type, nullptr, 0, err);
+				if (err.error != Callable::CallError::CALL_OK) {
+					return;
+				}
+
+				if (!p_only_functions) {
+					List<PropertyInfo> members;
+					if (p_base.value.get_type() != Variant::NIL) {
+						p_base.value.get_property_list(&members);
+					} else {
+						tmp.get_property_list(&members);
+					}
+
+					for (List<PropertyInfo>::Element *E = members.front(); E; E = E->next()) {
+						if (String(E->get().name).find("/") == -1) {
+							ScriptCodeCompletionOption option(E->get().name, ScriptCodeCompletionOption::KIND_MEMBER);
+							r_result.insert(option.display, option);
+						}
+					}
+				}
+
+				List<MethodInfo> methods;
+				tmp.get_method_list(&methods);
+				for (const List<MethodInfo>::Element *E = methods.front(); E; E = E->next()) {
+					ScriptCodeCompletionOption option(E->get().name, ScriptCodeCompletionOption::KIND_FUNCTION);
+					if (E->get().arguments.size()) {
+						option.insert_text += "(";
+					} else {
+						option.insert_text += "()";
+					}
+					r_result.insert(option.display, option);
+				}
+
+				return;
+			} break;
+			default: {
+				return;
+			} break;
+		}
+	}
+}
+
+static void _find_identifiers(GDScriptParser::CompletionContext &p_context, bool p_only_functions, Map<String, ScriptCodeCompletionOption> &r_result, int p_recursion_depth) {
+	if (!p_only_functions && p_context.current_suite) {
+		// This includes function parameters, since they are also locals.
+		_find_identifiers_in_suite(p_context.current_suite, r_result);
+	}
+
+	if (p_context.current_class) {
+		_find_identifiers_in_class(p_context.current_class, p_only_functions, (!p_context.current_function || p_context.current_function->is_static), false, r_result, p_recursion_depth + 1);
+	}
+
+	for (int i = 0; i < GDScriptFunctions::FUNC_MAX; i++) {
+		MethodInfo function = GDScriptFunctions::get_info(GDScriptFunctions::Function(i));
+		ScriptCodeCompletionOption option(String(GDScriptFunctions::get_func_name(GDScriptFunctions::Function(i))), ScriptCodeCompletionOption::KIND_FUNCTION);
+		if (function.arguments.size() || (function.flags & METHOD_FLAG_VARARG)) {
+			option.insert_text += "(";
+		} else {
+			option.insert_text += "()";
+		}
+		r_result.insert(option.display, option);
+	}
+
+	if (p_only_functions) {
+		return;
+	}
+
+	static const char *_type_names[Variant::VARIANT_MAX] = {
+		"null", "bool", "int", "float", "String", "StringName", "Vector2", "Vector2i", "Rect2", "Rect2i", "Vector3", "Vector3i", "Transform2D", "Plane", "Quat", "AABB", "Basis", "Transform",
+		"Color", "NodePath", "RID", "Signal", "Callable", "Object", "Dictionary", "Array", "PackedByteArray", "PackedInt32Array", "PackedInt64Array", "PackedFloat32Array", "PackedFloat64Array", "PackedStringArray",
+		"PackedVector2Array", "PackedVector3Array", "PackedColorArray"
+	};
+	static_assert((sizeof(_type_names) / sizeof(*_type_names)) == Variant::VARIANT_MAX, "Completion for builtin types is incomplete");
+
+	for (int i = 0; i < Variant::VARIANT_MAX; i++) {
+		ScriptCodeCompletionOption option(_type_names[i], ScriptCodeCompletionOption::KIND_CLASS);
+		r_result.insert(option.display, option);
+	}
+
+	static const char *_keywords[] = {
+		"and", "in", "not", "or", "false", "PI", "TAU", "INF", "NAN", "self", "true", "as", "assert",
+		"breakpoint", "class", "extends", "is", "func", "preload", "signal", "tool", "await",
+		"const", "enum", "static", "super", "var", "break", "continue", "if", "elif",
+		"else", "for", "pass", "return", "match", "while",
+		0
+	};
+
+	const char **kw = _keywords;
+	while (*kw) {
+		ScriptCodeCompletionOption option(*kw, ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
+		r_result.insert(option.display, option);
+		kw++;
+	}
+
+	Map<StringName, ProjectSettings::AutoloadInfo> autoloads = ProjectSettings::get_singleton()->get_autoload_list();
+	for (const Map<StringName, ProjectSettings::AutoloadInfo>::Element *E = autoloads.front(); E != nullptr; E = E->next()) {
+		if (!E->value().is_singleton) {
+			continue;
+		}
+		ScriptCodeCompletionOption option(E->key(), ScriptCodeCompletionOption::KIND_CONSTANT);
+		r_result.insert(option.display, option);
+	}
+
+	// Native classes and global constants.
+	for (const Map<StringName, int>::Element *E = GDScriptLanguage::get_singleton()->get_global_map().front(); E; E = E->next()) {
+		ScriptCodeCompletionOption option;
+		if (ClassDB::class_exists(E->key()) || Engine::get_singleton()->has_singleton(E->key())) {
+			option = ScriptCodeCompletionOption(E->key().operator String(), ScriptCodeCompletionOption::KIND_CLASS);
+		} else {
+			option = ScriptCodeCompletionOption(E->key().operator String(), ScriptCodeCompletionOption::KIND_CONSTANT);
+		}
+		r_result.insert(option.display, option);
+	}
+}
+
 static GDScriptCompletionIdentifier _type_from_variant(const Variant &p_value) {
 	GDScriptCompletionIdentifier ci;
 	ci.value = p_value;
 	ci.type.is_constant = true;
-	ci.type.has_type = true;
+	ci.type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
 	ci.type.kind = GDScriptParser::DataType::BUILTIN;
 	ci.type.builtin_type = p_value.get_type();
 
@@ -589,12 +1108,7 @@ static GDScriptCompletionIdentifier _type_from_variant(const Variant &p_value) {
 		}
 		if (scr.is_valid()) {
 			ci.type.script_type = scr;
-			Ref<GDScript> gds = scr;
-			if (gds.is_valid()) {
-				ci.type.kind = GDScriptParser::DataType::GDSCRIPT;
-			} else {
-				ci.type.kind = GDScriptParser::DataType::SCRIPT;
-			}
+			ci.type.kind = GDScriptParser::DataType::SCRIPT;
 			ci.type.native_type = scr->get_instance_base_type();
 		} else {
 			ci.type.kind = GDScriptParser::DataType::NATIVE;
@@ -616,7 +1130,7 @@ static GDScriptCompletionIdentifier _type_from_property(const PropertyInfo &p_pr
 		ci.enumeration = p_property.class_name;
 	}
 
-	ci.type.has_type = true;
+	ci.type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
 	ci.type.builtin_type = p_property.type;
 	if (p_property.type == Variant::OBJECT) {
 		ci.type.kind = GDScriptParser::DataType::NATIVE;
@@ -627,346 +1141,292 @@ static GDScriptCompletionIdentifier _type_from_property(const PropertyInfo &p_pr
 	return ci;
 }
 
-static GDScriptCompletionIdentifier _type_from_gdtype(const GDScriptDataType &p_gdtype) {
-	GDScriptCompletionIdentifier ci;
-	if (!p_gdtype.has_type) {
-		return ci;
-	}
-
-	ci.type.has_type = true;
-	ci.type.builtin_type = p_gdtype.builtin_type;
-	ci.type.native_type = p_gdtype.native_type;
-	ci.type.script_type = p_gdtype.script_type;
+static bool _guess_identifier_type(GDScriptParser::CompletionContext &p_context, const StringName &p_identifier, GDScriptCompletionIdentifier &r_type);
+static bool _guess_identifier_type_from_base(GDScriptParser::CompletionContext &p_context, const GDScriptCompletionIdentifier &p_base, const StringName &p_identifier, GDScriptCompletionIdentifier &r_type);
+static bool _guess_method_return_type_from_base(GDScriptParser::CompletionContext &p_context, const GDScriptCompletionIdentifier &p_base, const StringName &p_method, GDScriptCompletionIdentifier &r_type);
 
-	switch (p_gdtype.kind) {
-		case GDScriptDataType::UNINITIALIZED: {
-			ERR_PRINT("Uninitialized completion. Please report a bug.");
-		} break;
-		case GDScriptDataType::BUILTIN: {
-			ci.type.kind = GDScriptParser::DataType::BUILTIN;
-		} break;
-		case GDScriptDataType::NATIVE: {
-			ci.type.kind = GDScriptParser::DataType::NATIVE;
-		} break;
-		case GDScriptDataType::GDSCRIPT: {
-			ci.type.kind = GDScriptParser::DataType::GDSCRIPT;
-		} break;
-		case GDScriptDataType::SCRIPT: {
-			ci.type.kind = GDScriptParser::DataType::SCRIPT;
-		} break;
-	}
-	return ci;
-}
-
-static bool _guess_identifier_type(GDScriptCompletionContext &p_context, const StringName &p_identifier, GDScriptCompletionIdentifier &r_type);
-static bool _guess_identifier_type_from_base(GDScriptCompletionContext &p_context, const GDScriptCompletionIdentifier &p_base, const StringName &p_identifier, GDScriptCompletionIdentifier &r_type);
-static bool _guess_method_return_type_from_base(GDScriptCompletionContext &p_context, const GDScriptCompletionIdentifier &p_base, const StringName &p_method, GDScriptCompletionIdentifier &r_type);
-
-static bool _guess_expression_type(GDScriptCompletionContext &p_context, const GDScriptParser::Node *p_expression, GDScriptCompletionIdentifier &r_type) {
+static bool _guess_expression_type(GDScriptParser::CompletionContext &p_context, const GDScriptParser::ExpressionNode *p_expression, GDScriptCompletionIdentifier &r_type) {
 	bool found = false;
 
-	if (++p_context.depth > 100) {
-		print_error("Maximum _guess_expression_type depth limit reached. Please file a bugreport.");
-		return false;
-	}
-
-	switch (p_expression->type) {
-		case GDScriptParser::Node::TYPE_CONSTANT: {
-			const GDScriptParser::ConstantNode *cn = static_cast<const GDScriptParser::ConstantNode *>(p_expression);
-			r_type = _type_from_variant(cn->value);
-			found = true;
-		} break;
-		case GDScriptParser::Node::TYPE_SELF: {
-			if (p_context._class) {
-				r_type.type.has_type = true;
-				r_type.type.kind = GDScriptParser::DataType::CLASS;
-				r_type.type.class_type = const_cast<GDScriptParser::ClassNode *>(p_context._class);
-				r_type.type.is_constant = true;
-				r_type.value = p_context.base;
+	if (p_expression->is_constant) {
+		// Already has a value, so just use that.
+		r_type = _type_from_variant(p_expression->reduced_value);
+		found = true;
+	} else {
+		switch (p_expression->type) {
+			case GDScriptParser::Node::LITERAL: {
+				const GDScriptParser::LiteralNode *literal = static_cast<const GDScriptParser::LiteralNode *>(p_expression);
+				r_type = _type_from_variant(literal->value);
 				found = true;
-			}
-		} break;
-		case GDScriptParser::Node::TYPE_IDENTIFIER: {
-			const GDScriptParser::IdentifierNode *id = static_cast<const GDScriptParser::IdentifierNode *>(p_expression);
-			found = _guess_identifier_type(p_context, id->name, r_type);
-		} break;
-		case GDScriptParser::Node::TYPE_DICTIONARY: {
-			// Try to recreate the dictionary
-			const GDScriptParser::DictionaryNode *dn = static_cast<const GDScriptParser::DictionaryNode *>(p_expression);
-			Dictionary d;
-			bool full = true;
-			for (int i = 0; i < dn->elements.size(); i++) {
-				GDScriptCompletionIdentifier key;
-				if (_guess_expression_type(p_context, dn->elements[i].key, key)) {
-					GDScriptCompletionIdentifier value;
-					if (_guess_expression_type(p_context, dn->elements[i].value, value)) {
-						if (!value.type.is_constant) {
+			} break;
+			case GDScriptParser::Node::SELF: {
+				if (p_context.current_class) {
+					r_type.type.kind = GDScriptParser::DataType::CLASS;
+					r_type.type.type_source = GDScriptParser::DataType::INFERRED;
+					r_type.type.is_constant = true;
+					r_type.type.class_type = p_context.current_class;
+					r_type.value = p_context.base;
+					found = true;
+				}
+			} break;
+			case GDScriptParser::Node::IDENTIFIER: {
+				const GDScriptParser::IdentifierNode *id = static_cast<const GDScriptParser::IdentifierNode *>(p_expression);
+				found = _guess_identifier_type(p_context, id->name, r_type);
+			} break;
+			case GDScriptParser::Node::DICTIONARY: {
+				// Try to recreate the dictionary.
+				const GDScriptParser::DictionaryNode *dn = static_cast<const GDScriptParser::DictionaryNode *>(p_expression);
+				Dictionary d;
+				bool full = true;
+				for (int i = 0; i < dn->elements.size(); i++) {
+					GDScriptCompletionIdentifier key;
+					if (_guess_expression_type(p_context, dn->elements[i].key, key)) {
+						if (!key.type.is_constant) {
+							full = false;
+							break;
+						}
+						GDScriptCompletionIdentifier value;
+						if (_guess_expression_type(p_context, dn->elements[i].value, value)) {
+							if (!value.type.is_constant) {
+								full = false;
+								break;
+							}
+							d[key.value] = value.value;
+						} else {
 							full = false;
 							break;
 						}
-						d[key.value] = value.value;
 					} else {
 						full = false;
 						break;
 					}
-				} else {
-					full = false;
-					break;
 				}
-			}
-			if (full) {
-				// If not fully constant, setting this value is detrimental to the inference
-				r_type.value = d;
-				r_type.type.is_constant = true;
-			}
-			r_type.type.has_type = true;
-			r_type.type.kind = GDScriptParser::DataType::BUILTIN;
-			r_type.type.builtin_type = Variant::DICTIONARY;
-		} break;
-		case GDScriptParser::Node::TYPE_ARRAY: {
-			// Try to recreate the array
-			const GDScriptParser::ArrayNode *an = static_cast<const GDScriptParser::ArrayNode *>(p_expression);
-			Array a;
-			bool full = true;
-			a.resize(an->elements.size());
-			for (int i = 0; i < an->elements.size(); i++) {
-				GDScriptCompletionIdentifier value;
-				if (_guess_expression_type(p_context, an->elements[i], value)) {
-					a[i] = value.value;
-				} else {
-					full = false;
-					break;
+				if (full) {
+					r_type.value = d;
+					r_type.type.is_constant = true;
 				}
-			}
-			if (full) {
-				// If not fully constant, setting this value is detrimental to the inference
-				r_type.value = a;
-			}
-			r_type.type.has_type = true;
-			r_type.type.kind = GDScriptParser::DataType::BUILTIN;
-			r_type.type.builtin_type = Variant::ARRAY;
-		} break;
-		case GDScriptParser::Node::TYPE_CAST: {
-			const GDScriptParser::CastNode *cn = static_cast<const GDScriptParser::CastNode *>(p_expression);
-			GDScriptCompletionIdentifier value;
-			if (_guess_expression_type(p_context, cn->source_node, r_type)) {
-				r_type.type = cn->get_datatype();
+				r_type.type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+				r_type.type.kind = GDScriptParser::DataType::BUILTIN;
+				r_type.type.builtin_type = Variant::DICTIONARY;
 				found = true;
-			}
-		} break;
-		case GDScriptParser::Node::TYPE_OPERATOR: {
-			const GDScriptParser::OperatorNode *op = static_cast<const GDScriptParser::OperatorNode *>(p_expression);
-			switch (op->op) {
-				case GDScriptParser::OperatorNode::OP_CALL: {
-					if (op->arguments[0]->type == GDScriptParser::Node::TYPE_TYPE) {
-						const GDScriptParser::TypeNode *tn = static_cast<const GDScriptParser::TypeNode *>(op->arguments[0]);
-						r_type.type.has_type = true;
-						r_type.type.kind = GDScriptParser::DataType::BUILTIN;
-						r_type.type.builtin_type = tn->vtype;
-						found = true;
-						break;
-					} else if (op->arguments[0]->type == GDScriptParser::Node::TYPE_BUILT_IN_FUNCTION) {
-						const GDScriptParser::BuiltInFunctionNode *bin = static_cast<const GDScriptParser::BuiltInFunctionNode *>(op->arguments[0]);
-						MethodInfo mi = GDScriptFunctions::get_info(bin->function);
-						r_type = _type_from_property(mi.return_val);
-						found = true;
+			} break;
+			case GDScriptParser::Node::ARRAY: {
+				// Try to recreate the array
+				const GDScriptParser::ArrayNode *an = static_cast<const GDScriptParser::ArrayNode *>(p_expression);
+				Array a;
+				bool full = true;
+				a.resize(an->elements.size());
+				for (int i = 0; i < an->elements.size(); i++) {
+					GDScriptCompletionIdentifier value;
+					if (_guess_expression_type(p_context, an->elements[i], value)) {
+						if (value.type.is_constant) {
+							a[i] = value.value;
+						} else {
+							full = false;
+							break;
+						}
+					} else {
+						full = false;
 						break;
-					} else if (op->arguments.size() >= 2 && op->arguments[1]->type == GDScriptParser::Node::TYPE_IDENTIFIER) {
-						StringName id = static_cast<const GDScriptParser::IdentifierNode *>(op->arguments[1])->name;
+					}
+				}
+				if (full) {
+					// If not fully constant, setting this value is detrimental to the inference.
+					r_type.value = a;
+				}
+				r_type.type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+				r_type.type.kind = GDScriptParser::DataType::BUILTIN;
+				r_type.type.builtin_type = Variant::ARRAY;
+				found = true;
+			} break;
+			case GDScriptParser::Node::CAST: {
+				const GDScriptParser::CastNode *cn = static_cast<const GDScriptParser::CastNode *>(p_expression);
+				GDScriptCompletionIdentifier value;
+				if (_guess_expression_type(p_context, cn->operand, r_type)) {
+					r_type.type = cn->get_datatype();
+					found = true;
+				}
+			} break;
+			case GDScriptParser::Node::CALL: {
+				const GDScriptParser::CallNode *call = static_cast<const GDScriptParser::CallNode *>(p_expression);
+				if (GDScriptParser::get_builtin_type(call->function_name) < Variant::VARIANT_MAX) {
+					r_type.type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+					r_type.type.kind = GDScriptParser::DataType::BUILTIN;
+					r_type.type.builtin_type = GDScriptParser::get_builtin_type(call->function_name);
+					found = true;
+					break;
+				} else if (GDScriptParser::get_builtin_function(call->function_name) < GDScriptFunctions::FUNC_MAX) {
+					MethodInfo mi = GDScriptFunctions::get_info(GDScriptParser::get_builtin_function(call->function_name));
+					r_type = _type_from_property(mi.return_val);
+					found = true;
+					break;
+				} else {
+					GDScriptParser::CompletionContext c = p_context;
+					c.current_line = call->start_line;
 
-						GDScriptCompletionContext c = p_context;
-						c.line = op->line;
+					GDScriptParser::Node::Type callee_type = call->get_callee_type();
 
-						GDScriptCompletionIdentifier base;
-						if (!_guess_expression_type(c, op->arguments[0], base)) {
+					GDScriptCompletionIdentifier base;
+					if (callee_type == GDScriptParser::Node::IDENTIFIER || call->is_super) {
+						// Simple call, so base is 'self'.
+						if (p_context.current_class) {
+							base.type.kind = GDScriptParser::DataType::CLASS;
+							base.type.type_source = GDScriptParser::DataType::INFERRED;
+							base.type.is_constant = true;
+							base.type.class_type = p_context.current_class;
+							base.value = p_context.base;
+						} else {
+							break;
+						}
+					} else if (callee_type == GDScriptParser::Node::SUBSCRIPT && static_cast<const GDScriptParser::SubscriptNode *>(call->callee)->is_attribute) {
+						if (!_guess_expression_type(c, static_cast<const GDScriptParser::SubscriptNode *>(call->callee)->base, base)) {
 							found = false;
 							break;
 						}
+					} else {
+						break;
+					}
 
-						// Try call if constant methods with constant arguments
-						if (base.type.is_constant && base.value.get_type() == Variant::OBJECT) {
-							GDScriptParser::DataType native_type = base.type;
+					// Try call if constant methods with constant arguments
+					if (base.type.is_constant && base.value.get_type() == Variant::OBJECT) {
+						GDScriptParser::DataType native_type = base.type;
 
-							while (native_type.kind == GDScriptParser::DataType::CLASS) {
-								native_type = native_type.class_type->base_type;
-							}
+						while (native_type.kind == GDScriptParser::DataType::CLASS) {
+							native_type = native_type.class_type->base_type;
+						}
 
-							while (native_type.kind == GDScriptParser::DataType::GDSCRIPT || native_type.kind == GDScriptParser::DataType::SCRIPT) {
-								if (native_type.script_type.is_valid()) {
-									Ref<Script> parent = native_type.script_type->get_base_script();
-									if (parent.is_valid()) {
-										native_type.script_type = parent;
-									} else {
-										native_type.kind = GDScriptParser::DataType::NATIVE;
-										native_type.native_type = native_type.script_type->get_instance_base_type();
+						while (native_type.kind == GDScriptParser::DataType::SCRIPT) {
+							if (native_type.script_type.is_valid()) {
+								Ref<Script> parent = native_type.script_type->get_base_script();
+								if (parent.is_valid()) {
+									native_type.script_type = parent;
+								} else {
+									native_type.kind = GDScriptParser::DataType::NATIVE;
+									native_type.native_type = native_type.script_type->get_instance_base_type();
+									if (!ClassDB::class_exists(native_type.native_type)) {
+										native_type.native_type = String("_") + native_type.native_type;
 										if (!ClassDB::class_exists(native_type.native_type)) {
-											native_type.native_type = String("_") + native_type.native_type;
-											if (!ClassDB::class_exists(native_type.native_type)) {
-												native_type.has_type = false;
-											}
+											native_type.kind = GDScriptParser::DataType::UNRESOLVED;
 										}
 									}
 								}
 							}
+						}
 
-							if (native_type.has_type && native_type.kind == GDScriptParser::DataType::NATIVE) {
-								MethodBind *mb = ClassDB::get_method(native_type.native_type, id);
-								if (mb && mb->is_const()) {
-									bool all_is_const = true;
-									Vector<Variant> args;
-									GDScriptCompletionContext c2 = p_context;
-									c2.line = op->line;
-									for (int i = 2; all_is_const && i < op->arguments.size(); i++) {
-										GDScriptCompletionIdentifier arg;
-
-										if (_guess_expression_type(c2, op->arguments[i], arg)) {
-											if (arg.type.has_type && arg.type.is_constant && arg.value.get_type() != Variant::OBJECT) {
-												args.push_back(arg.value);
-											} else {
-												all_is_const = false;
-											}
-										} else {
-											all_is_const = false;
-										}
+						if (native_type.kind == GDScriptParser::DataType::NATIVE) {
+							MethodBind *mb = ClassDB::get_method(native_type.native_type, call->function_name);
+							if (mb && mb->is_const()) {
+								bool all_is_const = true;
+								Vector<Variant> args;
+								GDScriptParser::CompletionContext c2 = p_context;
+								c2.current_line = call->start_line;
+								for (int i = 0; all_is_const && i < call->arguments.size(); i++) {
+									GDScriptCompletionIdentifier arg;
+
+									if (!call->arguments[i]->is_constant) {
+										all_is_const = false;
 									}
+								}
 
-									Object *baseptr = base.value;
-
-									if (all_is_const && String(id) == "get_node" && ClassDB::is_parent_class(native_type.native_type, "Node") && args.size()) {
+								Object *baseptr = base.value;
 
-										String arg1 = args[0];
-										if (arg1.begins_with("/root/")) {
-											String which = arg1.get_slice("/", 2);
-											if (which != "") {
-												// Try singletons first
-												if (GDScriptLanguage::get_singleton()->get_named_globals_map().has(which)) {
-													r_type = _type_from_variant(GDScriptLanguage::get_singleton()->get_named_globals_map()[which]);
-													found = true;
-												} else {
-													List<PropertyInfo> props;
-													ProjectSettings::get_singleton()->get_property_list(&props);
+								if (all_is_const && String(call->function_name) == "get_node" && ClassDB::is_parent_class(native_type.native_type, "Node") && args.size()) {
+									String arg1 = args[0];
+									if (arg1.begins_with("/root/")) {
+										String which = arg1.get_slice("/", 2);
+										if (which != "") {
+											// Try singletons first
+											if (GDScriptLanguage::get_singleton()->get_named_globals_map().has(which)) {
+												r_type = _type_from_variant(GDScriptLanguage::get_singleton()->get_named_globals_map()[which]);
+												found = true;
+											} else {
+												Map<StringName, ProjectSettings::AutoloadInfo> autoloads = ProjectSettings::get_singleton()->get_autoload_list();
 
-													for (List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) {
+												for (Map<StringName, ProjectSettings::AutoloadInfo>::Element *E = autoloads.front(); E; E = E->next()) {
+													String name = E->key();
+													if (name == which) {
+														String script = E->value().path;
 
-														String s = E->get().name;
-														if (!s.begins_with("autoload/")) {
-															continue;
+														if (!script.begins_with("res://")) {
+															script = "res://" + script;
 														}
-														String name = s.get_slice("/", 1);
-														if (name == which) {
-															String script = ProjectSettings::get_singleton()->get(s);
 
-															if (script.begins_with("*")) {
-																script = script.right(1);
-															}
-
-															if (!script.begins_with("res://")) {
-																script = "res://" + script;
-															}
-
-															if (!script.ends_with(".gd")) {
-																//not a script, try find the script anyway,
-																//may have some success
-																script = script.get_basename() + ".gd";
-															}
+														if (!script.ends_with(".gd")) {
+															//not a script, try find the script anyway,
+															//may have some success
+															script = script.get_basename() + ".gd";
+														}
 
-															if (FileAccess::exists(script)) {
-																Ref<Script> scr;
-																if (ScriptCodeCompletionCache::get_singleton()) {
-																	scr = ScriptCodeCompletionCache::get_singleton()->get_cached_resource(script);
-																} else {
-																	scr = ResourceLoader::load(script);
-																}
-																if (scr.is_valid()) {
-																	r_type.type.has_type = true;
-																	r_type.type.script_type = scr;
-																	r_type.type.is_constant = false;
-																	Ref<GDScript> gds = scr;
-																	if (gds.is_valid()) {
-																		r_type.type.kind = GDScriptParser::DataType::GDSCRIPT;
-																	} else {
-																		r_type.type.kind = GDScriptParser::DataType::SCRIPT;
-																	}
-																	r_type.value = Variant();
-																	found = true;
-																}
+														if (FileAccess::exists(script)) {
+															Error err = OK;
+															Ref<GDScriptParserRef> parser = GDScriptCache::get_parser(script, GDScriptParserRef::INTERFACE_SOLVED, err);
+															if (err == OK) {
+																r_type.type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+																r_type.type.script_path = script;
+																r_type.type.class_type = parser->get_parser()->get_tree();
+																r_type.type.is_constant = false;
+																r_type.type.kind = GDScriptParser::DataType::CLASS;
+																r_type.value = Variant();
+																p_context.dependent_parsers.push_back(parser);
+																found = true;
 															}
-															break;
 														}
+														break;
 													}
 												}
 											}
 										}
 									}
+								}
 
-									if (!found && all_is_const && baseptr) {
-										Vector<const Variant *> argptr;
-										for (int i = 0; i < args.size(); i++) {
-											argptr.push_back(&args[i]);
-										}
+								if (!found && all_is_const && baseptr) {
+									Vector<const Variant *> argptr;
+									for (int i = 0; i < args.size(); i++) {
+										argptr.push_back(&args[i]);
+									}
 
-										Variant::CallError ce;
-										Variant ret = mb->call(baseptr, (const Variant **)argptr.ptr(), argptr.size(), ce);
+									Callable::CallError ce;
+									Variant ret = mb->call(baseptr, (const Variant **)argptr.ptr(), argptr.size(), ce);
 
-										if (ce.error == Variant::CallError::CALL_OK && ret.get_type() != Variant::NIL) {
-											if (ret.get_type() != Variant::OBJECT || ret.operator Object *() != NULL) {
-												r_type = _type_from_variant(ret);
-												found = true;
-											}
+									if (ce.error == Callable::CallError::CALL_OK && ret.get_type() != Variant::NIL) {
+										if (ret.get_type() != Variant::OBJECT || ret.operator Object *() != nullptr) {
+											r_type = _type_from_variant(ret);
+											found = true;
 										}
 									}
 								}
 							}
 						}
-
-						if (!found) {
-							found = _guess_method_return_type_from_base(c, base, id, r_type);
-						}
-					}
-				} break;
-				case GDScriptParser::OperatorNode::OP_PARENT_CALL: {
-					if (!p_context._class || !op->arguments.size() || op->arguments[0]->type != GDScriptParser::Node::TYPE_IDENTIFIER) {
-						break;
 					}
 
-					StringName id = static_cast<const GDScriptParser::IdentifierNode *>(op->arguments[0])->name;
-
-					GDScriptCompletionIdentifier base;
-					base.value = p_context.base;
-					base.type = p_context._class->base_type;
-
-					GDScriptCompletionContext c = p_context;
-					c.line = op->line;
-
-					found = _guess_method_return_type_from_base(c, base, id, r_type);
-				} break;
-				case GDScriptParser::OperatorNode::OP_INDEX_NAMED: {
-					if (op->arguments.size() < 2 || op->arguments[1]->type != GDScriptParser::Node::TYPE_IDENTIFIER) {
-						found = false;
-						break;
+					if (!found) {
+						found = _guess_method_return_type_from_base(c, base, call->function_name, r_type);
 					}
-					const GDScriptParser::IdentifierNode *id = static_cast<const GDScriptParser::IdentifierNode *>(op->arguments[1]);
-
-					GDScriptCompletionContext c = p_context;
-					c.line = op->line;
+				}
+			} break;
+			case GDScriptParser::Node::SUBSCRIPT: {
+				const GDScriptParser::SubscriptNode *subscript = static_cast<const GDScriptParser::SubscriptNode *>(p_expression);
+				if (subscript->is_attribute) {
+					GDScriptParser::CompletionContext c = p_context;
+					c.current_line = subscript->start_line;
 
 					GDScriptCompletionIdentifier base;
-					if (!_guess_expression_type(c, op->arguments[0], base)) {
+					if (!_guess_expression_type(c, subscript->base, base)) {
 						found = false;
 						break;
 					}
 
-					if (base.value.get_type() == Variant::DICTIONARY && base.value.operator Dictionary().has(String(id->name))) {
-						Variant value = base.value.operator Dictionary()[String(id->name)];
+					if (base.value.get_type() == Variant::DICTIONARY && base.value.operator Dictionary().has(String(subscript->attribute->name))) {
+						Variant value = base.value.operator Dictionary()[String(subscript->attribute->name)];
 						r_type = _type_from_variant(value);
 						found = true;
 						break;
 					}
 
-					const GDScriptParser::DictionaryNode *dn = NULL;
-					if (op->arguments[0]->type == GDScriptParser::Node::TYPE_DICTIONARY) {
-						dn = static_cast<const GDScriptParser::DictionaryNode *>(op->arguments[0]);
-					} else if (base.assigned_expression && base.assigned_expression->type == GDScriptParser::Node::TYPE_DICTIONARY) {
+					const GDScriptParser::DictionaryNode *dn = nullptr;
+					if (subscript->base->type == GDScriptParser::Node::DICTIONARY) {
+						dn = static_cast<const GDScriptParser::DictionaryNode *>(subscript->base);
+					} else if (base.assigned_expression && base.assigned_expression->type == GDScriptParser::Node::DICTIONARY) {
 						dn = static_cast<const GDScriptParser::DictionaryNode *>(base.assigned_expression);
 					}
 
@@ -976,7 +1436,7 @@ static bool _guess_expression_type(GDScriptCompletionContext &p_context, const G
 							if (!_guess_expression_type(c, dn->elements[i].key, key)) {
 								continue;
 							}
-							if (key.value == String(id->name)) {
+							if (key.value == String(subscript->attribute->name)) {
 								r_type.assigned_expression = dn->elements[i].value;
 								found = _guess_expression_type(c, dn->elements[i].value, r_type);
 								break;
@@ -985,26 +1445,25 @@ static bool _guess_expression_type(GDScriptCompletionContext &p_context, const G
 					}
 
 					if (!found) {
-						found = _guess_identifier_type_from_base(c, base, id->name, r_type);
+						found = _guess_identifier_type_from_base(c, base, subscript->attribute->name, r_type);
 					}
-				} break;
-				case GDScriptParser::OperatorNode::OP_INDEX: {
-					if (op->arguments.size() < 2) {
+				} else {
+					if (subscript->index == nullptr) {
 						found = false;
 						break;
 					}
 
-					GDScriptCompletionContext c = p_context;
-					c.line = op->line;
+					GDScriptParser::CompletionContext c = p_context;
+					c.current_line = subscript->start_line;
 
 					GDScriptCompletionIdentifier base;
-					if (!_guess_expression_type(c, op->arguments[0], base)) {
+					if (!_guess_expression_type(c, subscript->base, base)) {
 						found = false;
 						break;
 					}
 
 					GDScriptCompletionIdentifier index;
-					if (!_guess_expression_type(c, op->arguments[1], index)) {
+					if (!_guess_expression_type(c, subscript->index, index)) {
 						found = false;
 						break;
 					}
@@ -1016,11 +1475,11 @@ static bool _guess_expression_type(GDScriptCompletionContext &p_context, const G
 						break;
 					}
 
-					// Look if it is a dictionary node
-					const GDScriptParser::DictionaryNode *dn = NULL;
-					if (op->arguments[0]->type == GDScriptParser::Node::TYPE_DICTIONARY) {
-						dn = static_cast<const GDScriptParser::DictionaryNode *>(op->arguments[0]);
-					} else if (base.assigned_expression && base.assigned_expression->type == GDScriptParser::Node::TYPE_DICTIONARY) {
+					// Look if it is a dictionary node.
+					const GDScriptParser::DictionaryNode *dn = nullptr;
+					if (subscript->base->type == GDScriptParser::Node::DICTIONARY) {
+						dn = static_cast<const GDScriptParser::DictionaryNode *>(subscript->base);
+					} else if (base.assigned_expression && base.assigned_expression->type == GDScriptParser::Node::DICTIONARY) {
 						dn = static_cast<const GDScriptParser::DictionaryNode *>(base.assigned_expression);
 					}
 
@@ -1038,13 +1497,13 @@ static bool _guess_expression_type(GDScriptCompletionContext &p_context, const G
 						}
 					}
 
-					// Look if it is an array node
+					// Look if it is an array node.
 					if (!found && index.value.is_num()) {
 						int idx = index.value;
-						const GDScriptParser::ArrayNode *an = NULL;
-						if (op->arguments[0]->type == GDScriptParser::Node::TYPE_ARRAY) {
-							an = static_cast<const GDScriptParser::ArrayNode *>(op->arguments[0]);
-						} else if (base.assigned_expression && base.assigned_expression->type == GDScriptParser::Node::TYPE_ARRAY) {
+						const GDScriptParser::ArrayNode *an = nullptr;
+						if (subscript->base->type == GDScriptParser::Node::ARRAY) {
+							an = static_cast<const GDScriptParser::ArrayNode *>(subscript->base);
+						} else if (base.assigned_expression && base.assigned_expression->type == GDScriptParser::Node::ARRAY) {
 							an = static_cast<const GDScriptParser::ArrayNode *>(base.assigned_expression);
 						}
 
@@ -1060,8 +1519,8 @@ static bool _guess_expression_type(GDScriptCompletionContext &p_context, const G
 						StringName id = index.value;
 						found = _guess_identifier_type_from_base(c, base, id, r_type);
 					} else if (!found && index.type.kind == GDScriptParser::DataType::BUILTIN) {
-						Variant::CallError err;
-						Variant base_val = Variant::construct(base.type.builtin_type, NULL, 0, err);
+						Callable::CallError err;
+						Variant base_val = Variant::construct(base.type.builtin_type, nullptr, 0, err);
 						bool valid = false;
 						Variant res = base_val.get(index.value, &valid);
 						if (valid) {
@@ -1071,93 +1530,74 @@ static bool _guess_expression_type(GDScriptCompletionContext &p_context, const G
 							found = true;
 						}
 					}
-				} break;
-				default: {
-					if (op->arguments.size() < 2) {
-						found = false;
-						break;
-					}
-
-					Variant::Operator vop = Variant::OP_MAX;
-					switch (op->op) {
-						case GDScriptParser::OperatorNode::OP_ADD: vop = Variant::OP_ADD; break;
-						case GDScriptParser::OperatorNode::OP_SUB: vop = Variant::OP_SUBTRACT; break;
-						case GDScriptParser::OperatorNode::OP_MUL: vop = Variant::OP_MULTIPLY; break;
-						case GDScriptParser::OperatorNode::OP_DIV: vop = Variant::OP_DIVIDE; break;
-						case GDScriptParser::OperatorNode::OP_MOD: vop = Variant::OP_MODULE; break;
-						case GDScriptParser::OperatorNode::OP_SHIFT_LEFT: vop = Variant::OP_SHIFT_LEFT; break;
-						case GDScriptParser::OperatorNode::OP_SHIFT_RIGHT: vop = Variant::OP_SHIFT_RIGHT; break;
-						case GDScriptParser::OperatorNode::OP_BIT_AND: vop = Variant::OP_BIT_AND; break;
-						case GDScriptParser::OperatorNode::OP_BIT_OR: vop = Variant::OP_BIT_OR; break;
-						case GDScriptParser::OperatorNode::OP_BIT_XOR: vop = Variant::OP_BIT_XOR; break;
-						default: {
-						}
-					}
+				}
+			} break;
+			case GDScriptParser::Node::BINARY_OPERATOR: {
+				const GDScriptParser::BinaryOpNode *op = static_cast<const GDScriptParser::BinaryOpNode *>(p_expression);
 
-					if (vop == Variant::OP_MAX) {
-						break;
-					}
+				if (op->variant_op == Variant::OP_MAX) {
+					break;
+				}
 
-					GDScriptCompletionContext context = p_context;
-					context.line = op->line;
+				GDScriptParser::CompletionContext context = p_context;
+				context.current_line = op->start_line;
 
-					GDScriptCompletionIdentifier p1;
-					GDScriptCompletionIdentifier p2;
+				GDScriptCompletionIdentifier p1;
+				GDScriptCompletionIdentifier p2;
 
-					if (!_guess_expression_type(context, op->arguments[0], p1)) {
-						found = false;
-						break;
-					}
+				if (!_guess_expression_type(context, op->left_operand, p1)) {
+					found = false;
+					break;
+				}
 
-					if (!_guess_expression_type(context, op->arguments[1], p2)) {
-						found = false;
-						break;
-					}
+				if (!_guess_expression_type(context, op->right_operand, p2)) {
+					found = false;
+					break;
+				}
 
-					Variant::CallError ce;
-					bool v1_use_value = p1.value.get_type() != Variant::NIL && p1.value.get_type() != Variant::OBJECT;
-					Variant v1 = (v1_use_value) ? p1.value : Variant::construct(p1.type.builtin_type, NULL, 0, ce);
-					bool v2_use_value = p2.value.get_type() != Variant::NIL && p2.value.get_type() != Variant::OBJECT;
-					Variant v2 = (v2_use_value) ? p2.value : Variant::construct(p2.type.builtin_type, NULL, 0, ce);
-					// avoid potential invalid ops
-					if ((vop == Variant::OP_DIVIDE || vop == Variant::OP_MODULE) && v2.get_type() == Variant::INT) {
-						v2 = 1;
-						v2_use_value = false;
-					}
-					if (vop == Variant::OP_DIVIDE && v2.get_type() == Variant::REAL) {
-						v2 = 1.0;
-						v2_use_value = false;
-					}
+				Callable::CallError ce;
+				bool v1_use_value = p1.value.get_type() != Variant::NIL && p1.value.get_type() != Variant::OBJECT;
+				Variant v1 = (v1_use_value) ? p1.value : Variant::construct(p1.type.builtin_type, nullptr, 0, ce);
+				bool v2_use_value = p2.value.get_type() != Variant::NIL && p2.value.get_type() != Variant::OBJECT;
+				Variant v2 = (v2_use_value) ? p2.value : Variant::construct(p2.type.builtin_type, nullptr, 0, ce);
+				// avoid potential invalid ops
+				if ((op->variant_op == Variant::OP_DIVIDE || op->variant_op == Variant::OP_MODULE) && v2.get_type() == Variant::INT) {
+					v2 = 1;
+					v2_use_value = false;
+				}
+				if (op->variant_op == Variant::OP_DIVIDE && v2.get_type() == Variant::FLOAT) {
+					v2 = 1.0;
+					v2_use_value = false;
+				}
 
-					Variant res;
-					bool valid;
-					Variant::evaluate(vop, v1, v2, res, valid);
-					if (!valid) {
-						found = false;
-						break;
-					}
-					r_type = _type_from_variant(res);
-					if (!v1_use_value || !v2_use_value) {
-						r_type.value = Variant();
-						r_type.type.is_constant = false;
-					}
+				Variant res;
+				bool valid;
+				Variant::evaluate(op->variant_op, v1, v2, res, valid);
+				if (!valid) {
+					found = false;
+					break;
+				}
+				r_type = _type_from_variant(res);
+				if (!v1_use_value || !v2_use_value) {
+					r_type.value = Variant();
+					r_type.type.is_constant = false;
+				}
 
-					found = true;
-				} break;
-			}
-		} break;
-		default: {
+				found = true;
+			} break;
+			default:
+				break;
 		}
 	}
 
 	// It may have found a null, but that's never useful
-	if (found && r_type.type.has_type && r_type.type.kind == GDScriptParser::DataType::BUILTIN && r_type.type.builtin_type == Variant::NIL) {
+	if (found && r_type.type.kind == GDScriptParser::DataType::BUILTIN && r_type.type.builtin_type == Variant::NIL) {
 		found = false;
 	}
 
 	// Check type hint last. For collections we want chance to get the actual value first
 	// This way we can detect types from the content of dictionaries and arrays
-	if (!found && p_expression->get_datatype().has_type) {
+	if (!found && p_expression->get_datatype().is_hard_type()) {
 		r_type.type = p_expression->get_datatype();
 		if (!r_type.assigned_expression) {
 			r_type.assigned_expression = p_expression;
@@ -1168,306 +1608,289 @@ static bool _guess_expression_type(GDScriptCompletionContext &p_context, const G
 	return found;
 }
 
-static bool _guess_identifier_type(GDScriptCompletionContext &p_context, const StringName &p_identifier, GDScriptCompletionIdentifier &r_type) {
-
-	// Look in blocks first
-	const GDScriptParser::BlockNode *blk = p_context.block;
+static bool _guess_identifier_type(GDScriptParser::CompletionContext &p_context, const StringName &p_identifier, GDScriptCompletionIdentifier &r_type) {
+	// Look in blocks first.
 	int last_assign_line = -1;
-	const GDScriptParser::Node *last_assigned_expression = NULL;
-	GDScriptParser::DataType var_type;
-	while (blk) {
-		if (blk->variables.has(p_identifier)) {
-			if (blk->variables[p_identifier]->line > p_context.line) {
-				return false;
-			}
+	const GDScriptParser::ExpressionNode *last_assigned_expression = nullptr;
+	GDScriptParser::DataType id_type;
+	GDScriptParser::SuiteNode *suite = p_context.current_suite;
+	bool is_function_parameter = false;
 
-			var_type = blk->variables[p_identifier]->datatype;
+	if (suite) {
+		if (suite->has_local(p_identifier)) {
+			const GDScriptParser::SuiteNode::Local &local = suite->get_local(p_identifier);
 
-			if (!last_assigned_expression && blk->variables[p_identifier]->assign && blk->variables[p_identifier]->assign->type == GDScriptParser::Node::TYPE_OPERATOR) {
-				const GDScriptParser::OperatorNode *op = static_cast<const GDScriptParser::OperatorNode *>(blk->variables[p_identifier]->assign);
-				if (op->op == GDScriptParser::OperatorNode::OP_ASSIGN && op->arguments.size() >= 2) {
-					last_assign_line = op->line;
-					last_assigned_expression = op->arguments[1];
-				}
-			}
-		}
+			id_type = local.get_datatype();
 
-		for (const List<GDScriptParser::Node *>::Element *E = blk->statements.front(); E; E = E->next()) {
-			const GDScriptParser::Node *expr = E->get();
-			if (expr->line > p_context.line || expr->type != GDScriptParser::Node::TYPE_OPERATOR) {
-				continue;
+			// Check initializer as the first assignment.
+			switch (local.type) {
+				case GDScriptParser::SuiteNode::Local::VARIABLE:
+					if (local.variable->initializer) {
+						last_assign_line = local.variable->initializer->end_line;
+						last_assigned_expression = local.variable->initializer;
+					}
+					break;
+				case GDScriptParser::SuiteNode::Local::CONSTANT:
+					if (local.constant->initializer) {
+						last_assign_line = local.constant->initializer->end_line;
+						last_assigned_expression = local.constant->initializer;
+					}
+					break;
+				case GDScriptParser::SuiteNode::Local::PARAMETER:
+					if (local.parameter->default_value) {
+						last_assign_line = local.parameter->default_value->end_line;
+						last_assigned_expression = local.parameter->default_value;
+					}
+					is_function_parameter = true;
+					break;
+				default:
+					break;
 			}
+		}
+	}
 
-			const GDScriptParser::OperatorNode *op = static_cast<const GDScriptParser::OperatorNode *>(expr);
-			if (op->op != GDScriptParser::OperatorNode::OP_ASSIGN || op->line < last_assign_line) {
-				continue;
+	while (suite) {
+		for (int i = 0; i < suite->statements.size(); i++) {
+			if (suite->statements[i]->start_line > p_context.current_line) {
+				break;
 			}
 
-			if (op->arguments.size() >= 2 && op->arguments[0]->type == GDScriptParser::Node::TYPE_IDENTIFIER) {
-				const GDScriptParser::IdentifierNode *id = static_cast<const GDScriptParser::IdentifierNode *>(op->arguments[0]);
-				if (id->name == p_identifier) {
-					last_assign_line = op->line;
-					last_assigned_expression = op->arguments[1];
-				}
+			switch (suite->statements[i]->type) {
+				case GDScriptParser::Node::ASSIGNMENT: {
+					const GDScriptParser::AssignmentNode *assign = static_cast<const GDScriptParser::AssignmentNode *>(suite->statements[i]);
+					if (assign->end_line > last_assign_line && assign->assignee && assign->assigned_value && assign->assignee->type == GDScriptParser::Node::IDENTIFIER) {
+						const GDScriptParser::IdentifierNode *id = static_cast<const GDScriptParser::IdentifierNode *>(assign->assignee);
+						if (id->name == p_identifier) {
+							last_assign_line = assign->assigned_value->end_line;
+							last_assigned_expression = assign->assigned_value;
+						}
+					}
+				} break;
+				default:
+					// TODO: Check sub blocks (control flow statements) as they might also reassign stuff.
+					break;
 			}
 		}
 
-		if (blk->if_condition && blk->if_condition->type == GDScriptParser::Node::TYPE_OPERATOR && static_cast<const GDScriptParser::OperatorNode *>(blk->if_condition)->op == GDScriptParser::OperatorNode::OP_IS) {
-			//is used, check if identifier is in there! this helps resolve in blocks that are (if (identifier is value)): which are very common..
-			//super dirty hack, but very useful
-			//credit: Zylann
-			//TODO: this could be hacked to detect ANDed conditions too..
-			const GDScriptParser::OperatorNode *op = static_cast<const GDScriptParser::OperatorNode *>(blk->if_condition);
-			if (op->arguments[0]->type == GDScriptParser::Node::TYPE_IDENTIFIER && static_cast<const GDScriptParser::IdentifierNode *>(op->arguments[0])->name == p_identifier) {
-				//bingo
-				GDScriptCompletionContext c = p_context;
-				c.line = op->line;
-				c.block = blk;
-				if (_guess_expression_type(p_context, op->arguments[1], r_type)) {
-					r_type.type.is_meta_type = false; // Right-hand of `is` will be a meta type, but the left-hand value is not
-					// Not an assignment, it shouldn't carry any value
-					r_type.value = Variant();
-					r_type.assigned_expression = NULL;
-
-					return true;
+		if (suite->parent_if && suite->parent_if->condition && suite->parent_if->condition->type == GDScriptParser::Node::BINARY_OPERATOR && static_cast<const GDScriptParser::BinaryOpNode *>(suite->parent_if->condition)->operation == GDScriptParser::BinaryOpNode::OP_TYPE_TEST) {
+			// Operator `is` used, check if identifier is in there! this helps resolve in blocks that are (if (identifier is value)): which are very common..
+			// Super dirty hack, but very useful.
+			// Credit: Zylann.
+			// TODO: this could be hacked to detect ANDed conditions too...
+			const GDScriptParser::BinaryOpNode *op = static_cast<const GDScriptParser::BinaryOpNode *>(suite->parent_if->condition);
+			if (op->left_operand && op->right_operand && op->left_operand->type == GDScriptParser::Node::IDENTIFIER && static_cast<const GDScriptParser::IdentifierNode *>(op->left_operand)->name == p_identifier) {
+				// Bingo.
+				GDScriptParser::CompletionContext c = p_context;
+				c.current_line = op->left_operand->start_line;
+				c.current_suite = suite;
+				GDScriptCompletionIdentifier is_type;
+				if (_guess_expression_type(c, op->right_operand, is_type)) {
+					id_type = is_type.type;
+					id_type.is_meta_type = false;
+					if (last_assign_line < c.current_line) {
+						// Override last assignment.
+						last_assign_line = c.current_line;
+						last_assigned_expression = nullptr;
+					}
 				}
 			}
 		}
 
-		blk = blk->parent_block;
+		suite = suite->parent_block;
 	}
 
-	if (last_assigned_expression && last_assign_line != p_context.line) {
-		GDScriptCompletionContext c = p_context;
-		c.line = last_assign_line;
+	if (last_assigned_expression && last_assign_line != p_context.current_line) {
+		GDScriptParser::CompletionContext c = p_context;
+		c.current_line = last_assign_line;
 		r_type.assigned_expression = last_assigned_expression;
 		if (_guess_expression_type(c, last_assigned_expression, r_type)) {
-			if (var_type.has_type) {
-				r_type.type = var_type;
-			}
 			return true;
 		}
 	}
 
-	if (var_type.has_type) {
-		r_type.type = var_type;
-		return true;
-	}
-
-	if (p_context.function) {
-		for (int i = 0; i < p_context.function->arguments.size(); i++) {
-			if (p_context.function->arguments[i] == p_identifier) {
-				if (p_context.function->argument_types[i].has_type) {
-					r_type.type = p_context.function->argument_types[i];
-					return true;
-				}
-
-				int def_from = p_context.function->arguments.size() - p_context.function->default_values.size();
-				if (i >= def_from) {
-					int def_idx = i - def_from;
-					if (p_context.function->default_values[def_idx]->type == GDScriptParser::Node::TYPE_OPERATOR) {
-						const GDScriptParser::OperatorNode *op = static_cast<const GDScriptParser::OperatorNode *>(p_context.function->default_values[def_idx]);
-						if (op->arguments.size() < 2) {
-							return false;
-						}
-						GDScriptCompletionContext c = p_context;
-						c.function = NULL;
-						c.block = NULL;
-						return _guess_expression_type(c, op->arguments[1], r_type);
-					}
-				}
-				break;
-			}
-		}
-
-		GDScriptParser::DataType base_type = p_context._class->base_type;
-		while (base_type.has_type) {
+	if (is_function_parameter && p_context.current_function && p_context.current_class) {
+		// Check if it's override of native function, then we can assume the type from the signature.
+		GDScriptParser::DataType base_type = p_context.current_class->base_type;
+		while (base_type.is_set()) {
 			switch (base_type.kind) {
-				case GDScriptParser::DataType::GDSCRIPT: {
-					Ref<GDScript> gds = base_type.script_type;
-					if (gds.is_valid() && gds->has_method(p_context.function->name)) {
-						GDScriptFunction *func = gds->get_member_functions()[p_context.function->name];
-						if (func) {
-							for (int i = 0; i < func->get_argument_count(); i++) {
-								if (func->get_argument_name(i) == p_identifier) {
-									r_type = _type_from_gdtype(func->get_argument_type(i));
-									return true;
-								}
-							}
+				case GDScriptParser::DataType::CLASS:
+					if (base_type.class_type->has_function(p_context.current_function->identifier->name)) {
+						GDScriptParser::FunctionNode *parent_function = base_type.class_type->get_member(p_context.current_function->identifier->name).function;
+						const GDScriptParser::ParameterNode *parameter = parent_function->parameters[parent_function->parameters_indices[p_identifier]];
+						if ((!id_type.is_set() || id_type.is_variant()) && parameter->get_datatype().is_hard_type()) {
+							id_type = parameter->get_datatype();
 						}
-						Ref<GDScript> base_gds = gds->get_base_script();
-						if (base_gds.is_valid()) {
-							base_type.kind = GDScriptParser::DataType::GDSCRIPT;
-							base_type.script_type = base_gds;
-						} else {
-							base_type.kind = GDScriptParser::DataType::NATIVE;
-							base_type.native_type = gds->get_instance_base_type();
+						if (parameter->default_value) {
+							GDScriptParser::CompletionContext c = p_context;
+							c.current_function = parent_function;
+							c.current_class = base_type.class_type;
+							c.base = nullptr;
+							if (_guess_expression_type(c, parameter->default_value, r_type)) {
+								return true;
+							}
 						}
-					} else {
-						base_type.kind = GDScriptParser::DataType::NATIVE;
-						base_type.native_type = gds->get_instance_base_type();
+						base_type = base_type.class_type->base_type;
 					}
-				} break;
+					break;
 				case GDScriptParser::DataType::NATIVE: {
-					List<MethodInfo> methods;
-					ClassDB::get_method_list(base_type.native_type, &methods);
-					ClassDB::get_virtual_methods(base_type.native_type, &methods);
-
-					for (List<MethodInfo>::Element *E = methods.front(); E; E = E->next()) {
-						if (E->get().name == p_context.function->name) {
-							MethodInfo &mi = E->get();
-							for (List<PropertyInfo>::Element *F = mi.arguments.front(); F; F = F->next()) {
-								if (F->get().name == p_identifier) {
-									r_type = _type_from_property(F->get());
-									return true;
-								}
+					if (id_type.is_set() && !id_type.is_variant()) {
+						base_type = GDScriptParser::DataType();
+						break;
+					}
+					StringName real_native = _get_real_class_name(base_type.native_type);
+					MethodInfo info;
+					if (ClassDB::get_method_info(real_native, p_context.current_function->identifier->name, &info)) {
+						for (const List<PropertyInfo>::Element *E = info.arguments.front(); E; E = E->next()) {
+							if (E->get().name == p_identifier) {
+								r_type = _type_from_property(E->get());
+								return true;
 							}
 						}
 					}
-					base_type.has_type = false;
-				} break;
-				default: {
-					base_type.has_type = false;
+					base_type = GDScriptParser::DataType();
 				} break;
+				default:
+					break;
 			}
 		}
 	}
 
-	// Check current class (including inheritance)
-	if (p_context._class) {
-		GDScriptCompletionIdentifier context_base;
-		context_base.value = p_context.base;
-		context_base.type.has_type = true;
-		context_base.type.kind = GDScriptParser::DataType::CLASS;
-		context_base.type.class_type = const_cast<GDScriptParser::ClassNode *>(p_context._class);
-		context_base.type.is_meta_type = p_context.function && p_context.function->_static;
-
-		if (_guess_identifier_type_from_base(p_context, context_base, p_identifier, r_type)) {
-			return true;
-		}
+	if (id_type.is_set() && !id_type.is_variant()) {
+		r_type.type = id_type;
+		return true;
 	}
 
-	// Check named scripts
-	if (ScriptServer::is_global_class(p_identifier)) {
-		Ref<Script> scr = ResourceLoader::load(ScriptServer::get_global_class_path(p_identifier));
-		if (scr.is_valid()) {
-			r_type = _type_from_variant(scr);
-			r_type.type.is_meta_type = true;
+	// Check current class (including inheritance).
+	if (p_context.current_class) {
+		GDScriptCompletionIdentifier base;
+		base.value = p_context.base;
+		base.type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+		base.type.kind = GDScriptParser::DataType::CLASS;
+		base.type.class_type = p_context.current_class;
+		base.type.is_meta_type = p_context.current_function && p_context.current_function->is_static;
+
+		if (_guess_identifier_type_from_base(p_context, base, p_identifier, r_type)) {
 			return true;
 		}
-		return false;
 	}
 
-	for (int i = 0; i < 2; i++) {
-		StringName target_id;
-		switch (i) {
-			case 0:
-				// Check ClassDB
-				target_id = p_identifier;
-				break;
-			case 1:
-				// ClassDB again for underscore-prefixed classes
-				target_id = String("_") + p_identifier;
-				break;
-		}
-
-		if (ClassDB::class_exists(target_id)) {
-			r_type.type.has_type = true;
-			r_type.type.kind = GDScriptParser::DataType::NATIVE;
-			r_type.type.native_type = target_id;
-			if (Engine::get_singleton()->has_singleton(target_id)) {
-				r_type.type.is_meta_type = false;
-				r_type.value = Engine::get_singleton()->get_singleton_object(target_id);
-			} else {
+	// Check global scripts.
+	if (ScriptServer::is_global_class(p_identifier)) {
+		String script = ScriptServer::get_global_class_path(p_identifier);
+		if (script.to_lower().ends_with(".gd")) {
+			Error err = OK;
+			Ref<GDScriptParserRef> parser = GDScriptCache::get_parser(script, GDScriptParserRef::INTERFACE_SOLVED, err);
+			if (err == OK) {
+				r_type.type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+				r_type.type.script_path = script;
+				r_type.type.class_type = parser->get_parser()->get_tree();
+				r_type.type.is_constant = false;
+				r_type.type.kind = GDScriptParser::DataType::CLASS;
+				r_type.value = Variant();
+				p_context.dependent_parsers.push_back(parser);
+				return true;
+			}
+		} else {
+			Ref<Script> scr = ResourceLoader::load(ScriptServer::get_global_class_path(p_identifier));
+			if (scr.is_valid()) {
+				r_type = _type_from_variant(scr);
 				r_type.type.is_meta_type = true;
-				const Map<StringName, int>::Element *target_elem = GDScriptLanguage::get_singleton()->get_global_map().find(target_id);
-				// Check because classes like EditorNode are in ClassDB by now, but unknown to GDScript
-				if (!target_elem) {
-					return false;
-				}
-				int idx = target_elem->get();
-				r_type.value = GDScriptLanguage::get_singleton()->get_global_array()[idx];
+				return true;
 			}
-			return true;
 		}
+		return false;
 	}
 
-	// Check autoload singletons
-	if (GDScriptLanguage::get_singleton()->get_named_globals_map().has(p_identifier)) {
+	// Check autoloads.
+	if (ProjectSettings::get_singleton()->has_autoload(p_identifier)) {
 		r_type = _type_from_variant(GDScriptLanguage::get_singleton()->get_named_globals_map()[p_identifier]);
 		return true;
 	}
 
+	// Check ClassDB.
+	StringName class_name = _get_real_class_name(p_identifier);
+	if (ClassDB::class_exists(class_name) && ClassDB::is_class_exposed(class_name)) {
+		r_type.type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+		r_type.type.kind = GDScriptParser::DataType::NATIVE;
+		r_type.type.native_type = p_identifier;
+		r_type.type.is_constant = true;
+		r_type.type.is_meta_type = !Engine::get_singleton()->has_singleton(class_name);
+		r_type.value = Variant();
+	}
+
 	return false;
 }
 
-static bool _guess_identifier_type_from_base(GDScriptCompletionContext &p_context, const GDScriptCompletionIdentifier &p_base, const StringName &p_identifier, GDScriptCompletionIdentifier &r_type) {
+static bool _guess_identifier_type_from_base(GDScriptParser::CompletionContext &p_context, const GDScriptCompletionIdentifier &p_base, const StringName &p_identifier, GDScriptCompletionIdentifier &r_type) {
 	GDScriptParser::DataType base_type = p_base.type;
-	bool _static = base_type.is_meta_type;
-	while (base_type.has_type) {
+	bool is_static = base_type.is_meta_type;
+	while (base_type.is_set()) {
 		switch (base_type.kind) {
-			case GDScriptParser::DataType::CLASS: {
-				if (base_type.class_type->constant_expressions.has(p_identifier)) {
-					GDScriptParser::ClassNode::Constant c = base_type.class_type->constant_expressions[p_identifier];
-					r_type.type = c.type;
-					if (c.expression->type == GDScriptParser::Node::TYPE_CONSTANT) {
-						r_type.value = static_cast<const GDScriptParser::ConstantNode *>(c.expression)->value;
-					}
-					return true;
-				}
-
-				if (!_static) {
-					for (int i = 0; i < base_type.class_type->variables.size(); i++) {
-						GDScriptParser::ClassNode::Member m = base_type.class_type->variables[i];
-						if (m.identifier == p_identifier) {
-							if (m.expression) {
-								if (p_context.line == m.expression->line) {
-									// Variable used in the same expression
-									return false;
-								}
-								if (_guess_expression_type(p_context, m.expression, r_type)) {
-									return true;
-								}
-								if (m.expression->get_datatype().has_type) {
-									r_type.type = m.expression->get_datatype();
+			case GDScriptParser::DataType::CLASS:
+				if (base_type.class_type->has_member(p_identifier)) {
+					const GDScriptParser::ClassNode::Member &member = base_type.class_type->get_member(p_identifier);
+					switch (member.type) {
+						case GDScriptParser::ClassNode::Member::CONSTANT:
+							r_type.type = member.constant->get_datatype();
+							if (member.constant->initializer && member.constant->initializer->is_constant) {
+								r_type.value = member.constant->initializer->reduced_value;
+							}
+							return true;
+						case GDScriptParser::ClassNode::Member::VARIABLE:
+							if (!is_static) {
+								if (member.variable->initializer) {
+									const GDScriptParser::ExpressionNode *init = member.variable->initializer;
+									if (init->is_constant) {
+										r_type.value = init->reduced_value;
+										r_type = _type_from_variant(init->reduced_value);
+										return true;
+									} else if (init->start_line == p_context.current_line) {
+										return false;
+									} else if (_guess_expression_type(p_context, init, r_type)) {
+										return true;
+									} else if (init->get_datatype().is_set() && !init->get_datatype().is_variant()) {
+										r_type.type = init->get_datatype();
+										return true;
+									}
+								} else if (member.variable->get_datatype().is_set() && !member.variable->get_datatype().is_variant()) {
+									r_type.type = member.variable->get_datatype();
 									return true;
 								}
 							}
-							if (m.data_type.has_type) {
-								r_type.type = m.data_type;
-								return true;
-							}
+							// TODO: Check assignments in constructor.
 							return false;
-						}
-					}
-				}
-				base_type = base_type.class_type->base_type;
-			} break;
-			case GDScriptParser::DataType::GDSCRIPT: {
-				Ref<GDScript> gds = base_type.script_type;
-				if (gds.is_valid()) {
-					if (gds->get_constants().has(p_identifier)) {
-						r_type = _type_from_variant(gds->get_constants()[p_identifier]);
-						return true;
-					}
-					if (!_static) {
-						const Set<StringName>::Element *m = gds->get_members().find(p_identifier);
-						if (m) {
-							r_type = _type_from_gdtype(gds->get_member_type(p_identifier));
+						case GDScriptParser::ClassNode::Member::ENUM:
+							r_type.type = member.m_enum->get_datatype();
+							r_type.enumeration = member.m_enum->identifier->name;
 							return true;
-						}
-					}
-					Ref<GDScript> parent = gds->get_base_script();
-					if (parent.is_valid()) {
-						base_type.script_type = parent;
-					} else {
-						base_type.kind = GDScriptParser::DataType::NATIVE;
-						base_type.native_type = gds->get_instance_base_type();
+						case GDScriptParser::ClassNode::Member::ENUM_VALUE:
+							r_type = _type_from_variant(member.enum_value.value);
+							return true;
+						case GDScriptParser::ClassNode::Member::SIGNAL:
+							r_type.type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+							r_type.type.kind = GDScriptParser::DataType::BUILTIN;
+							r_type.type.builtin_type = Variant::SIGNAL;
+							return true;
+						case GDScriptParser::ClassNode::Member::FUNCTION:
+							if (is_static && !member.function->is_static) {
+								return false;
+							}
+							r_type.type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+							r_type.type.kind = GDScriptParser::DataType::BUILTIN;
+							r_type.type.builtin_type = Variant::CALLABLE;
+							return true;
+						case GDScriptParser::ClassNode::Member::CLASS:
+							r_type.type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+							r_type.type.kind = GDScriptParser::DataType::CLASS;
+							r_type.type.class_type = member.m_class;
+							return true;
+						case GDScriptParser::ClassNode::Member::UNDEFINED:
+							return false; // Unreachable.
 					}
-				} else {
 					return false;
 				}
-			} break;
+				base_type = base_type.class_type->base_type;
+				break;
 			case GDScriptParser::DataType::SCRIPT: {
 				Ref<Script> scr = base_type.script_type;
 				if (scr.is_valid()) {
@@ -1478,7 +1901,7 @@ static bool _guess_identifier_type_from_base(GDScriptCompletionContext &p_contex
 						return true;
 					}
 
-					if (!_static) {
+					if (!is_static) {
 						List<PropertyInfo> members;
 						scr->get_script_property_list(&members);
 						for (const List<PropertyInfo>::Element *E = members.front(); E; E = E->next()) {
@@ -1501,42 +1924,34 @@ static bool _guess_identifier_type_from_base(GDScriptCompletionContext &p_contex
 				}
 			} break;
 			case GDScriptParser::DataType::NATIVE: {
-				StringName class_name = base_type.native_type;
+				StringName class_name = _get_real_class_name(base_type.native_type);
 				if (!ClassDB::class_exists(class_name)) {
-					class_name = String("_") + class_name;
-					if (!ClassDB::class_exists(class_name)) {
-						return false;
-					}
+					return false;
 				}
 
-				// Skip constants since they're all integers. Type does not matter because int has no members
+				// Skip constants since they're all integers. Type does not matter because int has no members.
 
-				List<PropertyInfo> props;
-				ClassDB::get_property_list(class_name, &props);
-				for (const List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) {
-					const PropertyInfo &prop = E->get();
-					if (prop.name == p_identifier) {
-						StringName getter = ClassDB::get_property_getter(class_name, p_identifier);
-						if (getter != StringName()) {
-							MethodBind *g = ClassDB::get_method(class_name, getter);
-							if (g) {
-								r_type = _type_from_property(g->get_return_info());
-								return true;
-							}
-						} else {
-							r_type = _type_from_property(prop);
+				PropertyInfo prop;
+				if (ClassDB::get_property_info(class_name, p_identifier, &prop)) {
+					StringName getter = ClassDB::get_property_getter(class_name, p_identifier);
+					if (getter != StringName()) {
+						MethodBind *g = ClassDB::get_method(class_name, getter);
+						if (g) {
+							r_type = _type_from_property(g->get_return_info());
 							return true;
 						}
-						break;
+					} else {
+						r_type = _type_from_property(prop);
+						return true;
 					}
 				}
 				return false;
 			} break;
 			case GDScriptParser::DataType::BUILTIN: {
-				Variant::CallError err;
-				Variant tmp = Variant::construct(base_type.builtin_type, NULL, 0, err);
+				Callable::CallError err;
+				Variant tmp = Variant::construct(base_type.builtin_type, nullptr, 0, err);
 
-				if (err.error != Variant::CallError::CALL_OK) {
+				if (err.error != Callable::CallError::CALL_OK) {
 					return false;
 				}
 				bool valid = false;
@@ -1554,116 +1969,99 @@ static bool _guess_identifier_type_from_base(GDScriptCompletionContext &p_contex
 			} break;
 		}
 	}
-
 	return false;
 }
 
-static bool _find_last_return_in_block(const GDScriptCompletionContext &p_context, int &r_last_return_line, const GDScriptParser::Node **r_last_returned_value) {
-	if (!p_context.block) {
-		return false;
+static void _find_last_return_in_block(GDScriptParser::CompletionContext &p_context, int &r_last_return_line, const GDScriptParser::ExpressionNode **r_last_returned_value) {
+	if (!p_context.current_suite) {
+		return;
 	}
 
-	for (int i = 0; i < p_context.block->statements.size(); i++) {
-		if (p_context.block->statements[i]->line < r_last_return_line) {
-			continue;
-		}
-		if (p_context.block->statements[i]->type != GDScriptParser::Node::TYPE_CONTROL_FLOW) {
-			continue;
+	for (int i = 0; i < p_context.current_suite->statements.size(); i++) {
+		if (p_context.current_suite->statements[i]->start_line < r_last_return_line) {
+			break;
 		}
 
-		const GDScriptParser::ControlFlowNode *cf = static_cast<const GDScriptParser::ControlFlowNode *>(p_context.block->statements[i]);
-		if (cf->cf_type == GDScriptParser::ControlFlowNode::CF_RETURN && cf->arguments.size() > 0) {
-			if (cf->line > r_last_return_line) {
-				r_last_return_line = cf->line;
-				*r_last_returned_value = cf->arguments[0];
-			}
+		GDScriptParser::CompletionContext c = p_context;
+		switch (p_context.current_suite->statements[i]->type) {
+			case GDScriptParser::Node::FOR:
+				c.current_suite = static_cast<const GDScriptParser::ForNode *>(p_context.current_suite->statements[i])->loop;
+				_find_last_return_in_block(c, r_last_return_line, r_last_returned_value);
+				break;
+			case GDScriptParser::Node::WHILE:
+				c.current_suite = static_cast<const GDScriptParser::WhileNode *>(p_context.current_suite->statements[i])->loop;
+				_find_last_return_in_block(c, r_last_return_line, r_last_returned_value);
+				break;
+			case GDScriptParser::Node::IF: {
+				const GDScriptParser::IfNode *_if = static_cast<const GDScriptParser::IfNode *>(p_context.current_suite->statements[i]);
+				c.current_suite = _if->true_block;
+				_find_last_return_in_block(c, r_last_return_line, r_last_returned_value);
+				if (_if->false_block) {
+					c.current_suite = _if->false_block;
+					_find_last_return_in_block(c, r_last_return_line, r_last_returned_value);
+				}
+			} break;
+			case GDScriptParser::Node::MATCH: {
+				const GDScriptParser::MatchNode *match = static_cast<const GDScriptParser::MatchNode *>(p_context.current_suite->statements[i]);
+				for (int j = 0; j < match->branches.size(); j++) {
+					c.current_suite = match->branches[j]->block;
+					_find_last_return_in_block(c, r_last_return_line, r_last_returned_value);
+				}
+			} break;
+			case GDScriptParser::Node::RETURN: {
+				const GDScriptParser::ReturnNode *ret = static_cast<const GDScriptParser::ReturnNode *>(p_context.current_suite->statements[i]);
+				if (ret->return_value) {
+					if (ret->start_line > r_last_return_line) {
+						r_last_return_line = ret->start_line;
+						*r_last_returned_value = ret->return_value;
+					}
+				}
+			} break;
+			default:
+				break;
 		}
 	}
-
-	// Recurse into subblocks
-	for (int i = 0; i < p_context.block->sub_blocks.size(); i++) {
-		GDScriptCompletionContext c = p_context;
-		c.block = p_context.block->sub_blocks[i];
-		_find_last_return_in_block(c, r_last_return_line, r_last_returned_value);
-	}
-
-	return false;
 }
 
-static bool _guess_method_return_type_from_base(GDScriptCompletionContext &p_context, const GDScriptCompletionIdentifier &p_base, const StringName &p_method, GDScriptCompletionIdentifier &r_type) {
+static bool _guess_method_return_type_from_base(GDScriptParser::CompletionContext &p_context, const GDScriptCompletionIdentifier &p_base, const StringName &p_method, GDScriptCompletionIdentifier &r_type) {
 	GDScriptParser::DataType base_type = p_base.type;
-	bool _static = base_type.is_meta_type;
+	bool is_static = base_type.is_meta_type;
 
-	if (_static && p_method == "new") {
+	if (is_static && p_method == "new") {
 		r_type.type = base_type;
 		r_type.type.is_meta_type = false;
 		r_type.type.is_constant = false;
 		return true;
 	}
 
-	while (base_type.has_type) {
+	while (base_type.is_set() && !base_type.is_variant()) {
 		switch (base_type.kind) {
-			case GDScriptParser::DataType::CLASS: {
-				if (!base_type.class_type) {
-					base_type.has_type = false;
-					break;
-				}
-
-				for (int i = 0; i < base_type.class_type->static_functions.size(); i++) {
-					if (base_type.class_type->static_functions[i]->name == p_method) {
+			case GDScriptParser::DataType::CLASS:
+				if (base_type.class_type->has_function(p_method)) {
+					const GDScriptParser::FunctionNode *method = base_type.class_type->get_member(p_method).function;
+					if (!is_static || method->is_static) {
 						int last_return_line = -1;
-						const GDScriptParser::Node *last_returned_value = NULL;
-						GDScriptCompletionContext c = p_context;
-						c._class = base_type.class_type;
-						c.function = base_type.class_type->static_functions[i];
-						c.block = c.function->body;
+						const GDScriptParser::ExpressionNode *last_returned_value = nullptr;
+						GDScriptParser::CompletionContext c = p_context;
+						c.current_class = base_type.class_type;
+						c.current_function = const_cast<GDScriptParser::FunctionNode *>(method);
+						c.current_suite = method->body;
 
 						_find_last_return_in_block(c, last_return_line, &last_returned_value);
 						if (last_returned_value) {
-							c.line = c.block->end_line;
-							return _guess_expression_type(c, last_returned_value, r_type);
-						}
-					}
-				}
-				if (!_static) {
-					for (int i = 0; i < base_type.class_type->functions.size(); i++) {
-						if (base_type.class_type->functions[i]->name == p_method) {
-							int last_return_line = -1;
-							const GDScriptParser::Node *last_returned_value = NULL;
-							GDScriptCompletionContext c = p_context;
-							c._class = base_type.class_type;
-							c.function = base_type.class_type->functions[i];
-							c.block = c.function->body;
-
-							_find_last_return_in_block(c, last_return_line, &last_returned_value);
-							if (last_returned_value) {
-								c.line = c.block->end_line;
-								return _guess_expression_type(c, last_returned_value, r_type);
+							c.current_line = c.current_suite->end_line;
+							if (_guess_expression_type(c, last_returned_value, r_type)) {
+								return true;
+							}
+							if (method->get_datatype().is_set() && !method->get_datatype().is_variant()) {
+								r_type.type = method->get_datatype();
+								return true;
 							}
 						}
 					}
 				}
-
 				base_type = base_type.class_type->base_type;
-			} break;
-			case GDScriptParser::DataType::GDSCRIPT: {
-				Ref<GDScript> gds = base_type.script_type;
-				if (gds.is_valid()) {
-					if (gds->get_member_functions().has(p_method)) {
-						r_type = _type_from_gdtype(gds->get_member_functions()[p_method]->get_return_type());
-						return true;
-					}
-					Ref<GDScript> base_script = gds->get_base_script();
-					if (base_script.is_valid()) {
-						base_type.script_type = base_script;
-					} else {
-						base_type.kind = GDScriptParser::DataType::NATIVE;
-						base_type.native_type = gds->get_instance_base_type();
-					}
-				} else {
-					return false;
-				}
-			} break;
+				break;
 			case GDScriptParser::DataType::SCRIPT: {
 				Ref<Script> scr = base_type.script_type;
 				if (scr.is_valid()) {
@@ -1688,12 +2086,9 @@ static bool _guess_method_return_type_from_base(GDScriptCompletionContext &p_con
 				}
 			} break;
 			case GDScriptParser::DataType::NATIVE: {
-				StringName native = base_type.native_type;
+				StringName native = _get_real_class_name(base_type.native_type);
 				if (!ClassDB::class_exists(native)) {
-					native = String("_") + native;
-					if (!ClassDB::class_exists(native)) {
-						return false;
-					}
+					return false;
 				}
 				MethodBind *mb = ClassDB::get_method(native, p_method);
 				if (mb) {
@@ -1703,9 +2098,9 @@ static bool _guess_method_return_type_from_base(GDScriptCompletionContext &p_con
 				return false;
 			} break;
 			case GDScriptParser::DataType::BUILTIN: {
-				Variant::CallError err;
-				Variant tmp = Variant::construct(base_type.builtin_type, NULL, 0, err);
-				if (err.error != Variant::CallError::CALL_OK) {
+				Callable::CallError err;
+				Variant tmp = Variant::construct(base_type.builtin_type, nullptr, 0, err);
+				if (err.error != Callable::CallError::CALL_OK) {
 					return false;
 				}
 
@@ -1726,106 +2121,27 @@ static bool _guess_method_return_type_from_base(GDScriptCompletionContext &p_con
 			}
 		}
 	}
-	return false;
-}
-
-static String _make_arguments_hint(const MethodInfo &p_info, int p_arg_idx) {
-
-	String arghint = _get_visual_datatype(p_info.return_val, false) + " " + p_info.name + "(";
-
-	int def_args = p_info.arguments.size() - p_info.default_arguments.size();
-	int i = 0;
-	for (const List<PropertyInfo>::Element *E = p_info.arguments.front(); E; E = E->next()) {
-		if (i > 0) {
-			arghint += ", ";
-		}
-
-		if (i == p_arg_idx) {
-			arghint += String::chr(0xFFFF);
-		}
-		arghint += E->get().name + ": " + _get_visual_datatype(E->get(), true);
-
-		if (i - def_args >= 0) {
-			arghint += String(" = ") + p_info.default_arguments[i - def_args].get_construct_string();
-		}
-
-		if (i == p_arg_idx) {
-			arghint += String::chr(0xFFFF);
-		}
-
-		i++;
-	}
-
-	if (p_info.flags & METHOD_FLAG_VARARG) {
-		if (p_info.arguments.size() > 0) {
-			arghint += ", ";
-		}
-		if (p_arg_idx >= p_info.arguments.size()) {
-			arghint += String::chr(0xFFFF);
-		}
-		arghint += "...";
-		if (p_arg_idx >= p_info.arguments.size()) {
-			arghint += String::chr(0xFFFF);
-		}
-	}
 
-	arghint += ")";
-
-	return arghint;
-}
-
-static String _make_arguments_hint(const GDScriptParser::FunctionNode *p_function, int p_arg_idx) {
-
-	String arghint = p_function->return_type.to_string() + " " + p_function->name.operator String() + "(";
-
-	int def_args = p_function->arguments.size() - p_function->default_values.size();
-	for (int i = 0; i < p_function->arguments.size(); i++) {
-		if (i > 0) {
-			arghint += ", ";
-		}
-
-		if (i == p_arg_idx) {
-			arghint += String::chr(0xFFFF);
-		}
-		arghint += p_function->arguments[i].operator String() + ": " + p_function->argument_types[i].to_string();
-
-		if (i - def_args >= 0) {
-			String def_val = "<unknown>";
-			if (p_function->default_values[i - def_args] && p_function->default_values[i - def_args]->type == GDScriptParser::Node::TYPE_OPERATOR) {
-				const GDScriptParser::OperatorNode *assign = static_cast<const GDScriptParser::OperatorNode *>(p_function->default_values[i - def_args]);
-
-				if (assign->arguments.size() >= 2) {
-					if (assign->arguments[1]->type == GDScriptParser::Node::TYPE_CONSTANT) {
-						const GDScriptParser::ConstantNode *cn = static_cast<const GDScriptParser::ConstantNode *>(assign->arguments[1]);
-						def_val = cn->value.get_construct_string();
-					} else if (assign->arguments[1]->type == GDScriptParser::Node::TYPE_IDENTIFIER) {
-						const GDScriptParser::IdentifierNode *id = static_cast<const GDScriptParser::IdentifierNode *>(assign->arguments[1]);
-						def_val = id->name.operator String();
-					}
-				}
-			}
-			arghint += " = " + def_val;
-		}
-		if (i == p_arg_idx) {
-			arghint += String::chr(0xFFFF);
-		}
-	}
-
-	arghint += ")";
-
-	return arghint;
+	return false;
 }
 
-static void _find_enumeration_candidates(const String p_enum_hint, Map<String, ScriptCodeCompletionOption> &r_result) {
-
+static void _find_enumeration_candidates(GDScriptParser::CompletionContext &p_context, const String &p_enum_hint, Map<String, ScriptCodeCompletionOption> &r_result) {
 	if (p_enum_hint.find(".") == -1) {
-		// Global constant
+		// Global constant or in the current class.
 		StringName current_enum = p_enum_hint;
-		for (int i = 0; i < GlobalConstants::get_global_constant_count(); i++) {
-			if (GlobalConstants::get_global_constant_enum(i) == current_enum) {
-				ScriptCodeCompletionOption option(GlobalConstants::get_global_constant_name(i), ScriptCodeCompletionOption::KIND_ENUM);
+		if (p_context.current_class && p_context.current_class->has_member(current_enum) && p_context.current_class->get_member(current_enum).type == GDScriptParser::ClassNode::Member::ENUM) {
+			const GDScriptParser::EnumNode *_enum = p_context.current_class->get_member(current_enum).m_enum;
+			for (int i = 0; i < _enum->values.size(); i++) {
+				ScriptCodeCompletionOption option(_enum->values[i].identifier->name, ScriptCodeCompletionOption::KIND_ENUM);
 				r_result.insert(option.display, option);
 			}
+		} else {
+			for (int i = 0; i < GlobalConstants::get_global_constant_count(); i++) {
+				if (GlobalConstants::get_global_constant_enum(i) == current_enum) {
+					ScriptCodeCompletionOption option(GlobalConstants::get_global_constant_name(i), ScriptCodeCompletionOption::KIND_ENUM);
+					r_result.insert(option.display, option);
+				}
+			}
 		}
 	} else {
 		String class_name = p_enum_hint.get_slice(".", 0);
@@ -1845,494 +2161,59 @@ static void _find_enumeration_candidates(const String p_enum_hint, Map<String, S
 	}
 }
 
-static void _find_identifiers_in_block(const GDScriptCompletionContext &p_context, Map<String, ScriptCodeCompletionOption> &r_result) {
-	for (Map<StringName, GDScriptParser::LocalVarNode *>::Element *E = p_context.block->variables.front(); E; E = E->next()) {
-		if (E->get()->line < p_context.line) {
-			ScriptCodeCompletionOption option(E->key().operator String(), ScriptCodeCompletionOption::KIND_VARIABLE);
-			r_result.insert(option.display, option);
-		}
-	}
-	if (p_context.block->parent_block) {
-		GDScriptCompletionContext c = p_context;
-		c.block = p_context.block->parent_block;
-		_find_identifiers_in_block(c, r_result);
-	}
-}
-
-static void _find_identifiers_in_base(const GDScriptCompletionContext &p_context, const GDScriptCompletionIdentifier &p_base, bool p_only_functions, Map<String, ScriptCodeCompletionOption> &r_result);
-
-static void _find_identifiers_in_class(const GDScriptCompletionContext &p_context, bool p_static, bool p_only_functions, bool p_parent_only, Map<String, ScriptCodeCompletionOption> &r_result) {
-	if (!p_parent_only) {
-		if (!p_static && !p_only_functions) {
-			for (int i = 0; i < p_context._class->variables.size(); i++) {
-				ScriptCodeCompletionOption option(p_context._class->variables[i].identifier, ScriptCodeCompletionOption::KIND_MEMBER);
-				r_result.insert(option.display, option);
-			}
-		}
-
-		if (!p_only_functions) {
-			for (Map<StringName, GDScriptParser::ClassNode::Constant>::Element *E = p_context._class->constant_expressions.front(); E; E = E->next()) {
-				ScriptCodeCompletionOption option(E->key(), ScriptCodeCompletionOption::KIND_CONSTANT);
-				r_result.insert(option.display, option);
-			}
-			for (int i = 0; i < p_context._class->subclasses.size(); i++) {
-				ScriptCodeCompletionOption option(p_context._class->subclasses[i]->name, ScriptCodeCompletionOption::KIND_CLASS);
-				r_result.insert(option.display, option);
-			}
-		}
-
-		for (int i = 0; i < p_context._class->static_functions.size(); i++) {
-			ScriptCodeCompletionOption option(p_context._class->static_functions[i]->name.operator String(), ScriptCodeCompletionOption::KIND_FUNCTION);
-			if (p_context._class->static_functions[i]->arguments.size()) {
-				option.insert_text += "(";
-			} else {
-				option.insert_text += "()";
-			}
-			r_result.insert(option.display, option);
-		}
-
-		if (!p_static) {
-			for (int i = 0; i < p_context._class->functions.size(); i++) {
-				ScriptCodeCompletionOption option(p_context._class->functions[i]->name.operator String(), ScriptCodeCompletionOption::KIND_FUNCTION);
-				if (p_context._class->functions[i]->arguments.size()) {
-					option.insert_text += "(";
-				} else {
-					option.insert_text += "()";
-				}
-				r_result.insert(option.display, option);
-			}
-		}
-	}
-
-	// Parents
-	GDScriptCompletionIdentifier base_type;
-	base_type.type = p_context._class->base_type;
-	base_type.type.is_meta_type = p_static;
-	base_type.value = p_context.base;
-
-	GDScriptCompletionContext c = p_context;
-	c.block = NULL;
-	c.function = NULL;
-
-	_find_identifiers_in_base(c, base_type, p_only_functions, r_result);
-}
-
-static void _find_identifiers_in_base(const GDScriptCompletionContext &p_context, const GDScriptCompletionIdentifier &p_base, bool p_only_functions, Map<String, ScriptCodeCompletionOption> &r_result) {
-	GDScriptParser::DataType base_type = p_base.type;
-	bool _static = base_type.is_meta_type;
-
-	if (_static && base_type.kind != GDScriptParser::DataType::BUILTIN) {
-		ScriptCodeCompletionOption option("new", ScriptCodeCompletionOption::KIND_FUNCTION);
-		option.insert_text += "(";
-		r_result.insert(option.display, option);
-	}
-
-	while (base_type.has_type) {
-		switch (base_type.kind) {
-			case GDScriptParser::DataType::CLASS: {
-				GDScriptCompletionContext c = p_context;
-				c._class = base_type.class_type;
-				c.block = NULL;
-				c.function = NULL;
-				_find_identifiers_in_class(c, _static, p_only_functions, false, r_result);
-				base_type = base_type.class_type->base_type;
-			} break;
-			case GDScriptParser::DataType::GDSCRIPT: {
-				Ref<GDScript> script = base_type.script_type;
-				if (script.is_valid()) {
-					if (!_static && !p_only_functions) {
-						if (p_context.base && p_context.base->get_script_instance()) {
-							List<PropertyInfo> members;
-							p_context.base->get_script_instance()->get_property_list(&members);
-							for (List<PropertyInfo>::Element *E = members.front(); E; E = E->next()) {
-								ScriptCodeCompletionOption option(E->get().name, ScriptCodeCompletionOption::KIND_MEMBER);
-								r_result.insert(option.display, option);
-							}
-						}
-						for (const Set<StringName>::Element *E = script->get_members().front(); E; E = E->next()) {
-							ScriptCodeCompletionOption option(E->get().operator String(), ScriptCodeCompletionOption::KIND_MEMBER);
-							r_result.insert(option.display, option);
-						}
-					}
-					if (!p_only_functions) {
-						for (const Map<StringName, Variant>::Element *E = script->get_constants().front(); E; E = E->next()) {
-							ScriptCodeCompletionOption option(E->key().operator String(), ScriptCodeCompletionOption::KIND_CONSTANT);
-							r_result.insert(option.display, option);
-						}
-					}
-					for (const Map<StringName, GDScriptFunction *>::Element *E = script->get_member_functions().front(); E; E = E->next()) {
-						if (!_static || E->get()->is_static()) {
-							ScriptCodeCompletionOption option(E->key().operator String(), ScriptCodeCompletionOption::KIND_FUNCTION);
-							if (E->get()->get_argument_count()) {
-								option.insert_text += "(";
-							} else {
-								option.insert_text += "()";
-							}
-							r_result.insert(option.display, option);
-						}
-					}
-					if (!p_only_functions) {
-						for (const Map<StringName, Ref<GDScript> >::Element *E = script->get_subclasses().front(); E; E = E->next()) {
-							ScriptCodeCompletionOption option(E->key().operator String(), ScriptCodeCompletionOption::KIND_CLASS);
-							r_result.insert(option.display, option);
-						}
-					}
-					base_type = GDScriptParser::DataType();
-					if (script->get_base().is_valid()) {
-						base_type.has_type = true;
-						base_type.kind = GDScriptParser::DataType::GDSCRIPT;
-						base_type.script_type = script->get_base();
-					} else {
-						base_type.has_type = script->get_instance_base_type() != StringName();
-						base_type.kind = GDScriptParser::DataType::NATIVE;
-						base_type.native_type = script->get_instance_base_type();
-					}
-				} else {
-					return;
-				}
-			} break;
-			case GDScriptParser::DataType::SCRIPT: {
-				Ref<Script> scr = base_type.script_type;
-				if (scr.is_valid()) {
-					if (!_static && !p_only_functions) {
-						List<PropertyInfo> members;
-						scr->get_script_property_list(&members);
-						for (List<PropertyInfo>::Element *E = members.front(); E; E = E->next()) {
-							ScriptCodeCompletionOption option(E->get().name, ScriptCodeCompletionOption::KIND_MEMBER);
-							r_result.insert(option.display, option);
-						}
-					}
-					if (!p_only_functions) {
-						Map<StringName, Variant> constants;
-						scr->get_constants(&constants);
-						for (Map<StringName, Variant>::Element *E = constants.front(); E; E = E->next()) {
-							ScriptCodeCompletionOption option(E->key().operator String(), ScriptCodeCompletionOption::KIND_CONSTANT);
-							r_result.insert(option.display, option);
-						}
-					}
-
-					List<MethodInfo> methods;
-					scr->get_script_method_list(&methods);
-					for (List<MethodInfo>::Element *E = methods.front(); E; E = E->next()) {
-						ScriptCodeCompletionOption option(E->get().name, ScriptCodeCompletionOption::KIND_FUNCTION);
-						if (E->get().arguments.size()) {
-							option.insert_text += "(";
-						} else {
-							option.insert_text += "()";
-						}
-						r_result.insert(option.display, option);
-					}
-
-					Ref<Script> base_script = scr->get_base_script();
-					if (base_script.is_valid()) {
-						base_type.script_type = base_script;
-					} else {
-						base_type.kind = GDScriptParser::DataType::NATIVE;
-						base_type.native_type = scr->get_instance_base_type();
-					}
-				} else {
-					return;
-				}
-			} break;
-			case GDScriptParser::DataType::NATIVE: {
-				StringName type = base_type.native_type;
-				if (!ClassDB::class_exists(type)) {
-					type = String("_") + type;
-					if (!ClassDB::class_exists(type)) {
-						return;
-					}
-				}
-
-				if (!p_only_functions) {
-					List<String> constants;
-					ClassDB::get_integer_constant_list(type, &constants);
-					for (List<String>::Element *E = constants.front(); E; E = E->next()) {
-						ScriptCodeCompletionOption option(E->get(), ScriptCodeCompletionOption::KIND_CONSTANT);
-						r_result.insert(option.display, option);
-					}
-
-					if (!_static) {
-						List<PropertyInfo> pinfo;
-						ClassDB::get_property_list(type, &pinfo);
-						for (List<PropertyInfo>::Element *E = pinfo.front(); E; E = E->next()) {
-							if (E->get().usage & (PROPERTY_USAGE_GROUP | PROPERTY_USAGE_CATEGORY)) {
-								continue;
-							}
-							if (E->get().name.find("/") != -1) {
-								continue;
-							}
-							ScriptCodeCompletionOption option(E->get().name, ScriptCodeCompletionOption::KIND_MEMBER);
-							r_result.insert(option.display, option);
-						}
-					}
-				}
-
-				if (!_static) {
-					List<MethodInfo> methods;
-					bool is_autocompleting_getters = GLOBAL_GET("debug/gdscript/completion/autocomplete_setters_and_getters").booleanize();
-					ClassDB::get_method_list(type, &methods, false, !is_autocompleting_getters);
-					for (List<MethodInfo>::Element *E = methods.front(); E; E = E->next()) {
-						if (E->get().name.begins_with("_")) {
-							continue;
-						}
-						ScriptCodeCompletionOption option(E->get().name, ScriptCodeCompletionOption::KIND_FUNCTION);
-						if (E->get().arguments.size()) {
-							option.insert_text += "(";
-						} else {
-							option.insert_text += "()";
-						}
-						r_result.insert(option.display, option);
-					}
-				}
-
-				return;
-			} break;
-			case GDScriptParser::DataType::BUILTIN: {
-				Variant::CallError err;
-				Variant tmp = Variant::construct(base_type.builtin_type, NULL, 0, err);
-				if (err.error != Variant::CallError::CALL_OK) {
-					return;
-				}
-
-				if (!p_only_functions) {
-					List<PropertyInfo> members;
-					p_base.value.get_property_list(&members);
-
-					for (List<PropertyInfo>::Element *E = members.front(); E; E = E->next()) {
-						if (String(E->get().name).find("/") == -1) {
-							ScriptCodeCompletionOption option(E->get().name, ScriptCodeCompletionOption::KIND_MEMBER);
-							r_result.insert(option.display, option);
-						}
-					}
-				}
-
-				List<MethodInfo> methods;
-				tmp.get_method_list(&methods);
-				for (List<MethodInfo>::Element *E = methods.front(); E; E = E->next()) {
-					ScriptCodeCompletionOption option(E->get().name, ScriptCodeCompletionOption::KIND_FUNCTION);
-					if (E->get().arguments.size()) {
-						option.insert_text += "(";
-					} else {
-						option.insert_text += "()";
-					}
-					r_result.insert(option.display, option);
-				}
-
-				return;
-			} break;
-			default: {
-				return;
-			} break;
-		}
-	}
-}
-
-static void _find_identifiers(const GDScriptCompletionContext &p_context, bool p_only_functions, Map<String, ScriptCodeCompletionOption> &r_result) {
-
-	const GDScriptParser::BlockNode *block = p_context.block;
-
-	if (p_context.function) {
-
-		const GDScriptParser::FunctionNode *f = p_context.function;
-
-		for (int i = 0; i < f->arguments.size(); i++) {
-			ScriptCodeCompletionOption option(f->arguments[i].operator String(), ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
-			r_result.insert(option.display, option);
-		}
-	}
-
-	if (!p_only_functions && block) {
-		GDScriptCompletionContext c = p_context;
-		c.block = block;
-		_find_identifiers_in_block(c, r_result);
-	}
-
-	const GDScriptParser::ClassNode *clss = p_context._class;
-	bool _static = !p_context.function || p_context.function->_static;
-
-	while (clss) {
-		GDScriptCompletionContext c = p_context;
-		c._class = clss;
-		c.block = NULL;
-		c.function = NULL;
-		_find_identifiers_in_class(c, _static, p_only_functions, false, r_result);
-		_static = true;
-		clss = clss->owner;
-	}
-
-	for (int i = 0; i < GDScriptFunctions::FUNC_MAX; i++) {
-		MethodInfo mi = GDScriptFunctions::get_info(GDScriptFunctions::Function(i));
-		ScriptCodeCompletionOption option(String(GDScriptFunctions::get_func_name(GDScriptFunctions::Function(i))), ScriptCodeCompletionOption::KIND_FUNCTION);
-		if (mi.arguments.size() || (mi.flags & METHOD_FLAG_VARARG)) {
-			option.insert_text += "(";
-		} else {
-			option.insert_text += "()";
-		}
-		r_result.insert(option.display, option);
-	}
-
-	static const char *_type_names[Variant::VARIANT_MAX] = {
-		"null", "bool", "int", "float", "String", "Vector2", "Rect2", "Vector3", "Transform2D", "Plane", "Quat", "AABB", "Basis", "Transform",
-		"Color", "NodePath", "RID", "Object", "Dictionary", "Array", "PoolByteArray", "PoolIntArray", "PoolRealArray", "PoolStringArray",
-		"PoolVector2Array", "PoolVector3Array", "PoolColorArray"
-	};
-
-	for (int i = 0; i < Variant::VARIANT_MAX; i++) {
-		ScriptCodeCompletionOption option(_type_names[i], ScriptCodeCompletionOption::KIND_CLASS);
-		r_result.insert(option.display, option);
-	}
-
-	static const char *_keywords[] = {
-		"and", "in", "not", "or", "false", "PI", "TAU", "INF", "NAN", "self", "true", "as", "assert",
-		"breakpoint", "class", "extends", "is", "func", "preload", "setget", "signal", "tool", "yield",
-		"const", "enum", "export", "onready", "static", "var", "break", "continue", "if", "elif",
-		"else", "for", "pass", "return", "match", "while", "remote", "sync", "master", "puppet", "slave",
-		"remotesync", "mastersync", "puppetsync",
-		0
-	};
-
-	const char **kw = _keywords;
-	while (*kw) {
-		ScriptCodeCompletionOption option(*kw, ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
-		r_result.insert(option.display, option);
-		kw++;
-	}
-
-	// Autoload singletons
-	List<PropertyInfo> props;
-	ProjectSettings::get_singleton()->get_property_list(&props);
-	for (List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) {
-		String s = E->get().name;
-		if (!s.begins_with("autoload/")) {
-			continue;
-		}
-		String path = ProjectSettings::get_singleton()->get(s);
-		if (path.begins_with("*")) {
-			ScriptCodeCompletionOption option(s.get_slice("/", 1), ScriptCodeCompletionOption::KIND_CONSTANT);
-			r_result.insert(option.display, option);
-		}
-	}
-
-	// Named scripts
-	List<StringName> named_scripts;
-	ScriptServer::get_global_class_list(&named_scripts);
-	for (List<StringName>::Element *E = named_scripts.front(); E; E = E->next()) {
-		ScriptCodeCompletionOption option(E->get().operator String(), ScriptCodeCompletionOption::KIND_CLASS);
-		r_result.insert(option.display, option);
-	}
-
-	// Native classes
-	for (const Map<StringName, int>::Element *E = GDScriptLanguage::get_singleton()->get_global_map().front(); E; E = E->next()) {
-		ScriptCodeCompletionOption option(E->key().operator String(), ScriptCodeCompletionOption::KIND_CLASS);
-		r_result.insert(option.display, option);
-	}
-}
-
-static void _find_call_arguments(const GDScriptCompletionContext &p_context, const GDScriptCompletionIdentifier &p_base, const StringName &p_method, int p_argidx, bool p_static, Map<String, ScriptCodeCompletionOption> &r_result, String &r_arghint) {
+static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, const GDScriptCompletionIdentifier &p_base, const StringName &p_method, int p_argidx, bool p_static, Map<String, ScriptCodeCompletionOption> &r_result, String &r_arghint) {
 	Variant base = p_base.value;
 	GDScriptParser::DataType base_type = p_base.type;
 
 	const String quote_style = EDITOR_DEF("text_editor/completion/use_single_quotes", false) ? "'" : "\"";
 
-	while (base_type.has_type) {
+	while (base_type.is_set() && !base_type.is_variant()) {
 		switch (base_type.kind) {
 			case GDScriptParser::DataType::CLASS: {
-				for (int i = 0; i < base_type.class_type->static_functions.size(); i++) {
-					if (base_type.class_type->static_functions[i]->name == p_method) {
-						r_arghint = _make_arguments_hint(base_type.class_type->static_functions[i], p_argidx);
-						return;
-					}
-				}
-				for (int i = 0; i < base_type.class_type->functions.size(); i++) {
-					if (base_type.class_type->functions[i]->name == p_method) {
-						r_arghint = _make_arguments_hint(base_type.class_type->functions[i], p_argidx);
-						return;
-					}
-				}
+				if (base_type.class_type->has_member(p_method)) {
+					const GDScriptParser::ClassNode::Member &member = base_type.class_type->get_member(p_method);
 
-				if ((p_method == "connect" || p_method == "emit_signal") && p_argidx == 0) {
-					for (int i = 0; i < base_type.class_type->_signals.size(); i++) {
-						ScriptCodeCompletionOption option(base_type.class_type->_signals[i].name.operator String(), ScriptCodeCompletionOption::KIND_SIGNAL);
-						option.insert_text = quote_style + option.display + quote_style;
-						r_result.insert(option.display, option);
+					if (member.type == GDScriptParser::ClassNode::Member::FUNCTION) {
+						r_arghint = _make_arguments_hint(member.function, p_argidx);
+						return;
 					}
 				}
 
 				base_type = base_type.class_type->base_type;
 			} break;
-			case GDScriptParser::DataType::GDSCRIPT: {
-				Ref<GDScript> gds = base_type.script_type;
-				if (gds.is_valid()) {
-					if ((p_method == "connect" || p_method == "emit_signal") && p_argidx == 0) {
-						List<MethodInfo> signals;
-						gds->get_script_signal_list(&signals);
-						for (List<MethodInfo>::Element *E = signals.front(); E; E = E->next()) {
-							ScriptCodeCompletionOption option(E->get().name, ScriptCodeCompletionOption::KIND_SIGNAL);
-							option.insert_text = quote_style + option.display + quote_style;
-							r_result.insert(option.display, option);
-						}
-					}
-					Ref<GDScript> base_script = gds->get_base_script();
-					if (base_script.is_valid()) {
-						base_type.script_type = base_script;
-					} else {
-						base_type.kind = GDScriptParser::DataType::NATIVE;
-						base_type.native_type = gds->get_instance_base_type();
-					}
-				} else {
-					return;
-				}
-			} break;
 			case GDScriptParser::DataType::NATIVE: {
-				StringName class_name = base_type.native_type;
+				StringName class_name = _get_real_class_name(base_type.native_type);
 				if (!ClassDB::class_exists(class_name)) {
-					class_name = String("_") + class_name;
-					if (!ClassDB::class_exists(class_name)) {
-						base_type.has_type = false;
-						break;
-					}
+					base_type.kind = GDScriptParser::DataType::UNRESOLVED;
+					break;
 				}
 
-				List<MethodInfo> methods;
-				ClassDB::get_method_list(class_name, &methods);
-				ClassDB::get_virtual_methods(class_name, &methods);
+				MethodInfo info;
 				int method_args = 0;
 
-				for (List<MethodInfo>::Element *E = methods.front(); E; E = E->next()) {
-					if (E->get().name == p_method) {
-						method_args = E->get().arguments.size();
-						if (base.get_type() == Variant::OBJECT) {
-							Object *obj = base.operator Object *();
-							if (obj) {
-								List<String> options;
-								obj->get_argument_options(p_method, p_argidx, &options);
-								for (List<String>::Element *F = options.front(); F; F = F->next()) {
-									ScriptCodeCompletionOption option(F->get(), ScriptCodeCompletionOption::KIND_FUNCTION);
-									r_result.insert(option.display, option);
-								}
+				if (ClassDB::get_method_info(class_name, p_method, &info)) {
+					method_args = info.arguments.size();
+					if (base.get_type() == Variant::OBJECT) {
+						Object *obj = base.operator Object *();
+						if (obj) {
+							List<String> options;
+							obj->get_argument_options(p_method, p_argidx, &options);
+							for (List<String>::Element *F = options.front(); F; F = F->next()) {
+								ScriptCodeCompletionOption option(F->get(), ScriptCodeCompletionOption::KIND_FUNCTION);
+								r_result.insert(option.display, option);
 							}
 						}
+					}
 
-						if (p_argidx < method_args) {
-							PropertyInfo arg_info = E->get().arguments[p_argidx];
-							if (arg_info.usage & PROPERTY_USAGE_CLASS_IS_ENUM) {
-								_find_enumeration_candidates(arg_info.class_name, r_result);
-							}
+					if (p_argidx < method_args) {
+						PropertyInfo arg_info = info.arguments[p_argidx];
+						if (arg_info.usage & PROPERTY_USAGE_CLASS_IS_ENUM) {
+							_find_enumeration_candidates(p_context, arg_info.class_name, r_result);
 						}
-
-						r_arghint = _make_arguments_hint(E->get(), p_argidx);
-						break;
 					}
-				}
 
-				if ((p_method == "connect" || p_method == "emit_signal") && p_argidx == 0) {
-					List<MethodInfo> signals;
-					ClassDB::get_signal_list(class_name, &signals);
-					for (List<MethodInfo>::Element *E = signals.front(); E; E = E->next()) {
-						ScriptCodeCompletionOption option(E->get().name, ScriptCodeCompletionOption::KIND_SIGNAL);
-						option.insert_text = quote_style + option.display + quote_style;
-						r_result.insert(option.display, option);
-					}
+					r_arghint = _make_arguments_hint(info, p_argidx);
+					return;
 				}
 
 				if (ClassDB::is_parent_class(class_name, "Node") && (p_method == "get_node" || p_method == "has_node") && p_argidx == 0) {
@@ -2368,13 +2249,13 @@ static void _find_call_arguments(const GDScriptCompletionContext &p_context, con
 					}
 				}
 
-				base_type.has_type = false;
+				base_type.kind = GDScriptParser::DataType::UNRESOLVED;
 			} break;
 			case GDScriptParser::DataType::BUILTIN: {
 				if (base.get_type() == Variant::NIL) {
-					Variant::CallError err;
-					base = Variant::construct(base_type.builtin_type, NULL, 0, err);
-					if (err.error != Variant::CallError::CALL_OK) {
+					Callable::CallError err;
+					base = Variant::construct(base_type.builtin_type, nullptr, 0, err);
+					if (err.error != Callable::CallError::CALL_OK) {
 						return;
 					}
 				}
@@ -2388,295 +2269,308 @@ static void _find_call_arguments(const GDScriptCompletionContext &p_context, con
 					}
 				}
 
-				base_type.has_type = false;
+				base_type.kind = GDScriptParser::DataType::UNRESOLVED;
 			} break;
 			default: {
-				base_type.has_type = false;
+				base_type.kind = GDScriptParser::DataType::UNRESOLVED;
 			} break;
 		}
 	}
 }
 
-static void _find_call_arguments(GDScriptCompletionContext &p_context, const GDScriptParser::Node *p_node, int p_argidx, Map<String, ScriptCodeCompletionOption> &r_result, bool &r_forced, String &r_arghint) {
-
+static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, const GDScriptParser::Node *p_call, int p_argidx, Map<String, ScriptCodeCompletionOption> &r_result, bool &r_forced, String &r_arghint) {
 	const String quote_style = EDITOR_DEF("text_editor/completion/use_single_quotes", false) ? "'" : "\"";
 
-	if (!p_node || p_node->type != GDScriptParser::Node::TYPE_OPERATOR) {
+	if (p_call->type == GDScriptParser::Node::PRELOAD) {
+		if (p_argidx == 0 && bool(EditorSettings::get_singleton()->get("text_editor/completion/complete_file_paths"))) {
+			_get_directory_contents(EditorFileSystem::get_singleton()->get_filesystem(), r_result);
+		}
+
+		MethodInfo mi(PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "Resource"), "preload", PropertyInfo(Variant::STRING, "path"));
+		r_arghint = _make_arguments_hint(mi, p_argidx);
+		return;
+	} else if (p_call->type != GDScriptParser::Node::CALL) {
 		return;
 	}
 
 	Variant base;
 	GDScriptParser::DataType base_type;
-	StringName function;
 	bool _static = false;
-	const GDScriptParser::OperatorNode *op = static_cast<const GDScriptParser::OperatorNode *>(p_node);
+	const GDScriptParser::CallNode *call = static_cast<const GDScriptParser::CallNode *>(p_call);
+	GDScriptParser::Node::Type callee_type = GDScriptParser::Node::NONE;
 
 	GDScriptCompletionIdentifier connect_base;
 
-	if (op->op != GDScriptParser::OperatorNode::OP_CALL && op->op != GDScriptParser::OperatorNode::OP_PARENT_CALL) {
-		return;
-	}
+	if (GDScriptParser::get_builtin_function(call->function_name) < GDScriptFunctions::FUNC_MAX) {
+		MethodInfo info = GDScriptFunctions::get_info(GDScriptParser::get_builtin_function(call->function_name));
 
-	if (!op->arguments.size()) {
-		return;
-	}
-
-	if (op->op == GDScriptParser::OperatorNode::OP_CALL) {
-		if (op->arguments[0]->type == GDScriptParser::Node::TYPE_BUILT_IN_FUNCTION) {
-			// Complete built-in function
-			const GDScriptParser::BuiltInFunctionNode *fn = static_cast<const GDScriptParser::BuiltInFunctionNode *>(op->arguments[0]);
-			MethodInfo mi = GDScriptFunctions::get_info(fn->function);
-
-			if ((mi.name == "load" || mi.name == "preload") && bool(EditorSettings::get_singleton()->get("text_editor/completion/complete_file_paths"))) {
-				_get_directory_contents(EditorFileSystem::get_singleton()->get_filesystem(), r_result);
-			}
-
-			r_arghint = _make_arguments_hint(mi, p_argidx);
-			return;
-
-		} else if (op->arguments[0]->type == GDScriptParser::Node::TYPE_TYPE) {
-			// Complete constructor
-			const GDScriptParser::TypeNode *tn = static_cast<const GDScriptParser::TypeNode *>(op->arguments[0]);
-
-			List<MethodInfo> constructors;
-			Variant::get_constructor_list(tn->vtype, &constructors);
-
-			int i = 0;
-			for (List<MethodInfo>::Element *E = constructors.front(); E; E = E->next()) {
-				if (p_argidx >= E->get().arguments.size()) {
-					continue;
-				}
-				if (i > 0) {
-					r_arghint += "\n";
-				}
-				r_arghint += _make_arguments_hint(E->get(), p_argidx);
-				i++;
-			}
-			return;
-		} else if (op->arguments[0]->type == GDScriptParser::Node::TYPE_SELF) {
+		if ((info.name == "load" || info.name == "preload") && bool(EditorSettings::get_singleton()->get("text_editor/completion/complete_file_paths"))) {
+			_get_directory_contents(EditorFileSystem::get_singleton()->get_filesystem(), r_result);
+		}
 
-			if (op->arguments.size() < 2 || op->arguments[1]->type != GDScriptParser::Node::TYPE_IDENTIFIER) {
-				return;
+		r_arghint = _make_arguments_hint(info, p_argidx);
+		return;
+	} else if (GDScriptParser::get_builtin_type(call->function_name) < Variant::VARIANT_MAX) {
+		// Complete constructor
+		List<MethodInfo> constructors;
+		Variant::get_constructor_list(GDScriptParser::get_builtin_type(call->function_name), &constructors);
+
+		int i = 0;
+		for (List<MethodInfo>::Element *E = constructors.front(); E; E = E->next()) {
+			if (p_argidx >= E->get().arguments.size()) {
+				continue;
 			}
-
-			base = p_context.base;
-
-			const GDScriptParser::IdentifierNode *id = static_cast<const GDScriptParser::IdentifierNode *>(op->arguments[1]);
-			function = id->name;
-			base_type.has_type = true;
-			base_type.kind = GDScriptParser::DataType::CLASS;
-			base_type.class_type = const_cast<GDScriptParser::ClassNode *>(p_context._class);
-			_static = p_context.function && p_context.function->_static;
-
-			if (function == "connect" && op->arguments.size() >= 4) {
-				_guess_expression_type(p_context, op->arguments[3], connect_base);
+			if (i > 0) {
+				r_arghint += "\n";
 			}
+			r_arghint += _make_arguments_hint(E->get(), p_argidx);
+			i++;
+		}
+		return;
+	} else if (call->is_super || callee_type == GDScriptParser::Node::IDENTIFIER) {
+		base = p_context.base;
 
-		} else {
-			if (op->arguments.size() < 2 || op->arguments[1]->type != GDScriptParser::Node::TYPE_IDENTIFIER) {
-				return;
-			}
-			const GDScriptParser::IdentifierNode *id = static_cast<const GDScriptParser::IdentifierNode *>(op->arguments[1]);
-			function = id->name;
+		if (p_context.current_class) {
+			base_type = p_context.current_class->get_datatype();
+			_static = !p_context.current_function || p_context.current_function->is_static;
+		}
+	} else if (callee_type == GDScriptParser::Node::SUBSCRIPT) {
+		const GDScriptParser::SubscriptNode *subscript = static_cast<const GDScriptParser::SubscriptNode *>(call->callee);
 
+		if (subscript->is_attribute) {
 			GDScriptCompletionIdentifier ci;
-			if (_guess_expression_type(p_context, op->arguments[0], ci)) {
+			if (_guess_expression_type(p_context, subscript->base, ci)) {
 				base_type = ci.type;
 				base = ci.value;
 			} else {
 				return;
 			}
-			_static = ci.type.is_meta_type;
 
-			if (function == "connect" && op->arguments.size() >= 4) {
-				_guess_expression_type(p_context, op->arguments[3], connect_base);
-			}
+			_static = base_type.is_meta_type;
 		}
 	} else {
-		if (!p_context._class || op->arguments.size() < 1 || op->arguments[0]->type != GDScriptParser::Node::TYPE_IDENTIFIER) {
-			return;
-		}
-		base_type.has_type = true;
-		base_type.kind = GDScriptParser::DataType::CLASS;
-		base_type.class_type = const_cast<GDScriptParser::ClassNode *>(p_context._class);
-		base_type.is_meta_type = p_context.function && p_context.function->_static;
-		base = p_context.base;
-
-		function = static_cast<const GDScriptParser::IdentifierNode *>(op->arguments[0])->name;
-
-		if (function == "connect" && op->arguments.size() >= 4) {
-			_guess_expression_type(p_context, op->arguments[3], connect_base);
-		}
+		return;
 	}
 
 	GDScriptCompletionIdentifier ci;
 	ci.type = base_type;
 	ci.value = base;
-	_find_call_arguments(p_context, ci, function, p_argidx, _static, r_result, r_arghint);
-
-	if (function == "connect" && p_argidx == 2) {
-		Map<String, ScriptCodeCompletionOption> methods;
-		_find_identifiers_in_base(p_context, connect_base, true, methods);
-		for (Map<String, ScriptCodeCompletionOption>::Element *E = methods.front(); E; E = E->next()) {
-			ScriptCodeCompletionOption &option = E->value();
-			option.insert_text = quote_style + option.display + quote_style;
-			r_result.insert(option.display, option);
-		}
-	}
+	_find_call_arguments(p_context, ci, call->function_name, p_argidx, _static, r_result, r_arghint);
 
 	r_forced = r_result.size() > 0;
 }
 
 Error GDScriptLanguage::complete_code(const String &p_code, const String &p_path, Object *p_owner, List<ScriptCodeCompletionOption> *r_options, bool &r_forced, String &r_call_hint) {
-
 	const String quote_style = EDITOR_DEF("text_editor/completion/use_single_quotes", false) ? "'" : "\"";
 
 	GDScriptParser parser;
+	GDScriptAnalyzer analyzer(&parser);
+
+	parser.parse(p_code, p_path, true);
+	analyzer.analyze();
 
-	parser.parse(p_code, p_path.get_base_dir(), false, p_path, true);
 	r_forced = false;
 	Map<String, ScriptCodeCompletionOption> options;
-	GDScriptCompletionContext context;
-	context._class = parser.get_completion_class();
-	context.block = parser.get_completion_block();
-	context.function = parser.get_completion_function();
-	context.line = parser.get_completion_line();
-
-	if (!context._class || context._class->owner == NULL) {
-		context.base = p_owner;
-		context.base_path = p_path.get_base_dir();
-	}
 
+	GDScriptParser::CompletionContext completion_context = parser.get_completion_context();
+	completion_context.base = p_owner;
 	bool is_function = false;
 
-	switch (parser.get_completion_type()) {
-		case GDScriptParser::COMPLETION_NONE: {
+	switch (completion_context.type) {
+		case GDScriptParser::COMPLETION_NONE:
+			break;
+		case GDScriptParser::COMPLETION_ANNOTATION: {
+			List<MethodInfo> annotations;
+			parser.get_annotation_list(&annotations);
+			for (const List<MethodInfo>::Element *E = annotations.front(); E != nullptr; E = E->next()) {
+				ScriptCodeCompletionOption option(E->get().name.substr(1), ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
+				if (E->get().arguments.size() > 0) {
+					option.insert_text += "(";
+				}
+				options.insert(option.display, option);
+			}
+			r_forced = true;
+		} break;
+		case GDScriptParser::COMPLETION_ANNOTATION_ARGUMENTS: {
+			if (completion_context.node == nullptr || completion_context.node->type != GDScriptParser::Node::ANNOTATION) {
+				break;
+			}
+			const GDScriptParser::AnnotationNode *annotation = static_cast<const GDScriptParser::AnnotationNode *>(completion_context.node);
+			_find_annotation_arguments(annotation, completion_context.current_argument, quote_style, options);
+			r_forced = true;
 		} break;
 		case GDScriptParser::COMPLETION_BUILT_IN_TYPE_CONSTANT: {
 			List<StringName> constants;
-			Variant::get_constants_for_type(parser.get_completion_built_in_constant(), &constants);
-			for (List<StringName>::Element *E = constants.front(); E; E = E->next()) {
-				ScriptCodeCompletionOption option(E->get().operator String(), ScriptCodeCompletionOption::KIND_CONSTANT);
+			Variant::get_constants_for_type(completion_context.builtin_type, &constants);
+			for (const List<StringName>::Element *E = constants.front(); E != nullptr; E = E->next()) {
+				ScriptCodeCompletionOption option(E->get(), ScriptCodeCompletionOption::KIND_CONSTANT);
 				options.insert(option.display, option);
 			}
 		} break;
-		case GDScriptParser::COMPLETION_PARENT_FUNCTION: {
-			_find_identifiers_in_class(context, !context.function || context.function->_static, true, true, options);
+		case GDScriptParser::COMPLETION_INHERIT_TYPE: {
+			_list_available_types(true, completion_context, options);
+			r_forced = true;
 		} break;
-		case GDScriptParser::COMPLETION_FUNCTION: {
-			is_function = true;
-			FALLTHROUGH;
+		case GDScriptParser::COMPLETION_TYPE_NAME_OR_VOID: {
+			ScriptCodeCompletionOption option("void", ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
+			options.insert(option.display, option);
 		}
-		case GDScriptParser::COMPLETION_IDENTIFIER: {
-			_find_identifiers(context, is_function, options);
+			[[fallthrough]];
+		case GDScriptParser::COMPLETION_TYPE_NAME: {
+			_list_available_types(false, completion_context, options);
+			r_forced = true;
 		} break;
-		case GDScriptParser::COMPLETION_GET_NODE: {
-			if (p_owner) {
-				List<String> opts;
-				p_owner->get_argument_options("get_node", 0, &opts);
-
-				for (List<String>::Element *E = opts.front(); E; E = E->next()) {
-
-					String opt = E->get().strip_edges();
-					if (opt.is_quoted()) {
-						r_forced = true;
-						String idopt = opt.unquote();
-						if (idopt.replace("/", "_").is_valid_identifier()) {
-							ScriptCodeCompletionOption option(idopt, ScriptCodeCompletionOption::KIND_NODE_PATH);
-							options.insert(option.display, option);
-						} else {
-							ScriptCodeCompletionOption option(opt, ScriptCodeCompletionOption::KIND_NODE_PATH);
-							options.insert(option.display, option);
-						}
-					}
+		case GDScriptParser::COMPLETION_PROPERTY_DECLARATION_OR_TYPE: {
+			_list_available_types(false, completion_context, options);
+			ScriptCodeCompletionOption get("get", ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
+			options.insert(get.display, get);
+			ScriptCodeCompletionOption set("set", ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
+			options.insert(set.display, set);
+			r_forced = true;
+		} break;
+		case GDScriptParser::COMPLETION_PROPERTY_DECLARATION: {
+			ScriptCodeCompletionOption get("get", ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
+			options.insert(get.display, get);
+			ScriptCodeCompletionOption set("set", ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
+			options.insert(set.display, set);
+			r_forced = true;
+		} break;
+		case GDScriptParser::COMPLETION_PROPERTY_METHOD: {
+			if (!completion_context.current_class) {
+				break;
+			}
+			for (int i = 0; i < completion_context.current_class->members.size(); i++) {
+				const GDScriptParser::ClassNode::Member &member = completion_context.current_class->members[i];
+				if (member.type != GDScriptParser::ClassNode::Member::FUNCTION) {
+					continue;
 				}
-
-				// Get autoloads
-				List<PropertyInfo> props;
-				ProjectSettings::get_singleton()->get_property_list(&props);
-
-				for (List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) {
-					String s = E->get().name;
-					if (!s.begins_with("autoload/")) {
-						continue;
-					}
-					String name = s.get_slice("/", 1);
-					ScriptCodeCompletionOption option(quote_style + "/root/" + name + quote_style, ScriptCodeCompletionOption::KIND_NODE_PATH);
-					options.insert(option.display, option);
+				if (member.function->is_static) {
+					continue;
 				}
+				ScriptCodeCompletionOption option(member.function->identifier->name, ScriptCodeCompletionOption::KIND_FUNCTION);
+				options.insert(option.display, option);
 			}
+			r_forced = true;
 		} break;
-		case GDScriptParser::COMPLETION_METHOD: {
-			is_function = true;
-			FALLTHROUGH;
-		}
-		case GDScriptParser::COMPLETION_INDEX: {
-			const GDScriptParser::Node *node = parser.get_completion_node();
-			if (node->type != GDScriptParser::Node::TYPE_OPERATOR) {
+		case GDScriptParser::COMPLETION_ASSIGN: {
+			GDScriptCompletionIdentifier type;
+			if (!completion_context.node || completion_context.node->type != GDScriptParser::Node::ASSIGNMENT) {
 				break;
 			}
-			const GDScriptParser::OperatorNode *op = static_cast<const GDScriptParser::OperatorNode *>(node);
-			if (op->arguments.size() < 1) {
+			if (!_guess_expression_type(completion_context, static_cast<const GDScriptParser::AssignmentNode *>(completion_context.node)->assignee, type)) {
+				_find_identifiers(completion_context, false, options, 0);
+				r_forced = true;
 				break;
 			}
 
+			if (!type.enumeration.empty()) {
+				_find_enumeration_candidates(completion_context, type.enumeration, options);
+				r_forced = options.size() > 0;
+			} else {
+				_find_identifiers(completion_context, false, options, 0);
+				r_forced = true;
+			}
+		} break;
+		case GDScriptParser::COMPLETION_METHOD:
+			is_function = true;
+			[[fallthrough]];
+		case GDScriptParser::COMPLETION_IDENTIFIER: {
+			_find_identifiers(completion_context, is_function, options, 0);
+		} break;
+		case GDScriptParser::COMPLETION_ATTRIBUTE_METHOD:
+			is_function = true;
+			[[fallthrough]];
+		case GDScriptParser::COMPLETION_ATTRIBUTE: {
+			r_forced = true;
+			const GDScriptParser::SubscriptNode *attr = static_cast<const GDScriptParser::SubscriptNode *>(completion_context.node);
+			if (attr->base) {
+				GDScriptCompletionIdentifier base;
+				if (!_guess_expression_type(completion_context, attr->base, base)) {
+					break;
+				}
+
+				_find_identifiers_in_base(base, is_function, options, 0);
+			}
+		} break;
+		case GDScriptParser::COMPLETION_SUBSCRIPT: {
+			const GDScriptParser::SubscriptNode *subscript = static_cast<const GDScriptParser::SubscriptNode *>(completion_context.node);
 			GDScriptCompletionIdentifier base;
-			if (!_guess_expression_type(context, op->arguments[0], base)) {
+			if (!_guess_expression_type(completion_context, subscript->base, base)) {
 				break;
 			}
 
-			GDScriptCompletionContext c = context;
-			c.function = NULL;
-			c.block = NULL;
-			c.base = base.value.get_type() == Variant::OBJECT ? base.value.operator Object *() : NULL;
+			GDScriptParser::CompletionContext c = completion_context;
+			c.current_function = nullptr;
+			c.current_suite = nullptr;
+			c.base = base.value.get_type() == Variant::OBJECT ? base.value.operator Object *() : nullptr;
 			if (base.type.kind == GDScriptParser::DataType::CLASS) {
-				c._class = base.type.class_type;
+				c.current_class = base.type.class_type;
 			} else {
-				c._class = NULL;
+				c.current_class = nullptr;
+			}
+
+			_find_identifiers_in_base(base, false, options, 0);
+		} break;
+		case GDScriptParser::COMPLETION_TYPE_ATTRIBUTE: {
+			if (!completion_context.current_class) {
+				break;
+			}
+			const GDScriptParser::TypeNode *type = static_cast<const GDScriptParser::TypeNode *>(completion_context.node);
+			bool found = true;
+			GDScriptCompletionIdentifier base;
+			base.type.kind = GDScriptParser::DataType::CLASS;
+			base.type.type_source = GDScriptParser::DataType::INFERRED;
+			base.type.is_constant = true;
+			base.type.class_type = completion_context.current_class;
+			base.value = completion_context.base;
+
+			for (int i = 0; i < completion_context.current_argument; i++) {
+				GDScriptCompletionIdentifier ci;
+				if (!_guess_identifier_type_from_base(completion_context, base, type->type_chain[i]->name, ci)) {
+					found = false;
+					break;
+				}
+				base = ci;
 			}
 
-			_find_identifiers_in_base(c, base, is_function, options);
+			// TODO: Improve this to only list types.
+			if (found) {
+				_find_identifiers_in_base(base, false, options, 0);
+			}
+			r_forced = true;
+		} break;
+		case GDScriptParser::COMPLETION_RESOURCE_PATH: {
+			if (EditorSettings::get_singleton()->get("text_editor/completion/complete_file_paths")) {
+				_get_directory_contents(EditorFileSystem::get_singleton()->get_filesystem(), options);
+				r_forced = true;
+			}
 		} break;
 		case GDScriptParser::COMPLETION_CALL_ARGUMENTS: {
-			_find_call_arguments(context, parser.get_completion_node(), parser.get_completion_argument_index(), options, r_forced, r_call_hint);
+			if (!completion_context.node) {
+				break;
+			}
+			_find_call_arguments(completion_context, completion_context.node, completion_context.current_argument, options, r_forced, r_call_hint);
 		} break;
-		case GDScriptParser::COMPLETION_VIRTUAL_FUNC: {
-			GDScriptParser::DataType native_type = context._class->base_type;
-			while (native_type.has_type && native_type.kind != GDScriptParser::DataType::NATIVE) {
+		case GDScriptParser::COMPLETION_OVERRIDE_METHOD: {
+			GDScriptParser::DataType native_type = completion_context.current_class->base_type;
+			while (native_type.is_set() && native_type.kind != GDScriptParser::DataType::NATIVE) {
 				switch (native_type.kind) {
 					case GDScriptParser::DataType::CLASS: {
 						native_type = native_type.class_type->base_type;
 					} break;
-					case GDScriptParser::DataType::GDSCRIPT: {
-						Ref<GDScript> gds = native_type.script_type;
-						if (gds.is_valid()) {
-							Ref<GDScript> base = gds->get_base_script();
-							if (base.is_valid()) {
-								native_type.script_type = base;
-							} else {
-								native_type.native_type = gds->get_instance_base_type();
-								native_type.kind = GDScriptParser::DataType::NATIVE;
-							}
-						} else {
-							native_type.has_type = false;
-						}
-					} break;
 					default: {
-						native_type.has_type = false;
+						native_type.kind = GDScriptParser::DataType::UNRESOLVED;
 					} break;
 				}
 			}
 
-			if (!native_type.has_type) {
+			if (!native_type.is_set()) {
 				break;
 			}
 
-			StringName class_name = native_type.native_type;
+			StringName class_name = _get_real_class_name(native_type.native_type);
 			if (!ClassDB::class_exists(class_name)) {
-				class_name = String("_") + class_name;
-				if (!ClassDB::class_exists(class_name)) {
-					break;
-				}
+				break;
 			}
 
 			bool use_type_hint = EditorSettings::get_singleton()->get_setting("text_editor/completion/add_type_hints").operator bool();
@@ -2684,7 +2578,6 @@ Error GDScriptLanguage::complete_code(const String &p_code, const String &p_path
 			List<MethodInfo> virtual_methods;
 			ClassDB::get_virtual_methods(class_name, &virtual_methods);
 			for (List<MethodInfo>::Element *E = virtual_methods.front(); E; E = E->next()) {
-
 				MethodInfo &mi = E->get();
 				String method_hint = mi.name;
 				if (method_hint.find(":") != -1) {
@@ -2729,245 +2622,41 @@ Error GDScriptLanguage::complete_code(const String &p_code, const String &p_path
 				options.insert(option.display, option);
 			}
 		} break;
-		case GDScriptParser::COMPLETION_YIELD: {
-			const GDScriptParser::Node *node = parser.get_completion_node();
-
-			GDScriptCompletionContext c = context;
-			c.line = node->line;
-			GDScriptCompletionIdentifier type;
-			if (!_guess_expression_type(c, node, type)) {
-				break;
-			}
+		case GDScriptParser::COMPLETION_GET_NODE: {
+			if (p_owner) {
+				List<String> opts;
+				p_owner->get_argument_options("get_node", 0, &opts);
 
-			GDScriptParser::DataType base_type = type.type;
-			while (base_type.has_type) {
-				switch (base_type.kind) {
-					case GDScriptParser::DataType::CLASS: {
-						for (int i = 0; i < base_type.class_type->_signals.size(); i++) {
-							ScriptCodeCompletionOption option(base_type.class_type->_signals[i].name.operator String(), ScriptCodeCompletionOption::KIND_SIGNAL);
-							option.insert_text = quote_style + option.display + quote_style;
+				for (List<String>::Element *E = opts.front(); E; E = E->next()) {
+					String opt = E->get().strip_edges();
+					if (opt.is_quoted()) {
+						r_forced = true;
+						String idopt = opt.unquote();
+						if (idopt.replace("/", "_").is_valid_identifier()) {
+							ScriptCodeCompletionOption option(idopt, ScriptCodeCompletionOption::KIND_NODE_PATH);
 							options.insert(option.display, option);
-						}
-						base_type = base_type.class_type->base_type;
-					} break;
-					case GDScriptParser::DataType::SCRIPT:
-					case GDScriptParser::DataType::GDSCRIPT: {
-						Ref<Script> scr = base_type.script_type;
-						if (scr.is_valid()) {
-							List<MethodInfo> signals;
-							scr->get_script_signal_list(&signals);
-							for (List<MethodInfo>::Element *E = signals.front(); E; E = E->next()) {
-								ScriptCodeCompletionOption option(quote_style + E->get().name + quote_style, ScriptCodeCompletionOption::KIND_SIGNAL);
-								options.insert(option.display, option);
-							}
-							Ref<Script> base_script = scr->get_base_script();
-							if (base_script.is_valid()) {
-								base_type.script_type = base_script;
-							} else {
-								base_type.kind = GDScriptParser::DataType::NATIVE;
-								base_type.native_type = scr->get_instance_base_type();
-							}
 						} else {
-							base_type.has_type = false;
-						}
-					} break;
-					case GDScriptParser::DataType::NATIVE: {
-						base_type.has_type = false;
-
-						StringName class_name = base_type.native_type;
-						if (!ClassDB::class_exists(class_name)) {
-							class_name = String("_") + class_name;
-							if (!ClassDB::class_exists(class_name)) {
-								break;
-							}
-						}
-
-						List<MethodInfo> signals;
-						ClassDB::get_signal_list(class_name, &signals);
-						for (List<MethodInfo>::Element *E = signals.front(); E; E = E->next()) {
-							ScriptCodeCompletionOption option(quote_style + E->get().name + quote_style, ScriptCodeCompletionOption::KIND_SIGNAL);
+							ScriptCodeCompletionOption option(opt, ScriptCodeCompletionOption::KIND_NODE_PATH);
 							options.insert(option.display, option);
 						}
-					} break;
-					default: {
-						base_type.has_type = false;
 					}
 				}
-			}
-		} break;
-		case GDScriptParser::COMPLETION_RESOURCE_PATH: {
-			if (EditorSettings::get_singleton()->get("text_editor/completion/complete_file_paths")) {
-				_get_directory_contents(EditorFileSystem::get_singleton()->get_filesystem(), options);
-				r_forced = true;
-			}
-		} break;
-		case GDScriptParser::COMPLETION_ASSIGN: {
-			GDScriptCompletionIdentifier type;
-			if (!_guess_expression_type(context, parser.get_completion_node(), type)) {
-				break;
-			}
 
-			if (!type.enumeration.empty()) {
-				_find_enumeration_candidates(type.enumeration, options);
-				r_forced = options.size() > 0;
-			}
-		} break;
-		case GDScriptParser::COMPLETION_TYPE_HINT: {
-			const GDScriptParser::ClassNode *clss = context._class;
-			while (clss) {
-				for (Map<StringName, GDScriptParser::ClassNode::Constant>::Element *E = clss->constant_expressions.front(); E; E = E->next()) {
-					GDScriptCompletionIdentifier constant;
-					GDScriptCompletionContext c = context;
-					c.function = NULL;
-					c.block = NULL;
-					c.line = E->value().expression->line;
-					if (_guess_expression_type(c, E->value().expression, constant)) {
-						if (constant.type.has_type && constant.type.is_meta_type) {
-							ScriptCodeCompletionOption option(E->key().operator String(), ScriptCodeCompletionOption::KIND_CLASS);
-							options.insert(option.display, option);
-						}
-					}
-				}
-				for (int i = 0; i < clss->subclasses.size(); i++) {
-					if (clss->subclasses[i]->name != StringName()) {
-						ScriptCodeCompletionOption option(clss->subclasses[i]->name.operator String(), ScriptCodeCompletionOption::KIND_CLASS);
-						options.insert(option.display, option);
-					}
-				}
-				clss = clss->owner;
-				for (int i = 0; i < Variant::VARIANT_MAX; i++) {
-					ScriptCodeCompletionOption option(Variant::get_type_name((Variant::Type)i), ScriptCodeCompletionOption::KIND_CLASS);
-					options.insert(option.display, option);
-				}
-				List<PropertyInfo> props;
-				ProjectSettings::get_singleton()->get_property_list(&props);
-				for (List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) {
-					String s = E->get().name;
-					if (!s.begins_with("autoload/")) {
-						continue;
-					}
-					ScriptCodeCompletionOption option(s.get_slice("/", 1), ScriptCodeCompletionOption::KIND_CLASS);
-					options.insert(option.display, option);
-				}
-			}
+				// Get autoloads.
+				Map<StringName, ProjectSettings::AutoloadInfo> autoloads = ProjectSettings::get_singleton()->get_autoload_list();
 
-			List<StringName> native_classes;
-			ClassDB::get_class_list(&native_classes);
-			for (List<StringName>::Element *E = native_classes.front(); E; E = E->next()) {
-				String class_name = E->get().operator String();
-				if (class_name.begins_with("_")) {
-					class_name = class_name.right(1);
-				}
-				if (Engine::get_singleton()->has_singleton(class_name)) {
-					continue;
+				for (Map<StringName, ProjectSettings::AutoloadInfo>::Element *E = autoloads.front(); E; E = E->next()) {
+					String name = E->key();
+					ScriptCodeCompletionOption option(quote_style + "/root/" + name + quote_style, ScriptCodeCompletionOption::KIND_NODE_PATH);
+					options.insert(option.display, option);
 				}
-				ScriptCodeCompletionOption option(class_name, ScriptCodeCompletionOption::KIND_CLASS);
-				options.insert(option.display, option);
-			}
-
-			// Named scripts
-			List<StringName> named_scripts;
-			ScriptServer::get_global_class_list(&named_scripts);
-			for (List<StringName>::Element *E = named_scripts.front(); E; E = E->next()) {
-				ScriptCodeCompletionOption option(E->get().operator String(), ScriptCodeCompletionOption::KIND_CLASS);
-				options.insert(option.display, option);
-			}
-
-			if (parser.get_completion_identifier_is_function()) {
-				ScriptCodeCompletionOption option("void", ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
-				options.insert(option.display, option);
 			}
-			r_forced = true;
 		} break;
-		case GDScriptParser::COMPLETION_TYPE_HINT_INDEX: {
-			GDScriptCompletionIdentifier base;
-			String index = parser.get_completion_cursor().operator String();
-			if (!_guess_identifier_type(context, index.get_slice(".", 0), base)) {
-				break;
-			}
-
-			GDScriptCompletionContext c = context;
-			c._class = NULL;
-			c.function = NULL;
-			c.block = NULL;
-			bool finding = true;
-			index = index.right(index.find(".") + 1);
-			while (index.find(".") != -1) {
-				String id = index.get_slice(".", 0);
-
-				GDScriptCompletionIdentifier sub_base;
-				if (!_guess_identifier_type_from_base(c, base, id, sub_base)) {
-					finding = false;
-					break;
-				}
-				index = index.right(index.find(".") + 1);
-				base = sub_base;
-			}
-
-			if (!finding) {
+		case GDScriptParser::COMPLETION_SUPER_METHOD: {
+			if (!completion_context.current_class) {
 				break;
 			}
-
-			GDScriptParser::DataType base_type = base.type;
-			while (base_type.has_type) {
-				switch (base_type.kind) {
-					case GDScriptParser::DataType::CLASS: {
-						if (base_type.class_type) {
-							for (Map<StringName, GDScriptParser::ClassNode::Constant>::Element *E = base_type.class_type->constant_expressions.front(); E; E = E->next()) {
-								GDScriptCompletionIdentifier constant;
-								GDScriptCompletionContext c2 = context;
-								c2._class = base_type.class_type;
-								c2.function = NULL;
-								c2.block = NULL;
-								c2.line = E->value().expression->line;
-								if (_guess_expression_type(c2, E->value().expression, constant)) {
-									if (constant.type.has_type && constant.type.is_meta_type) {
-										ScriptCodeCompletionOption option(E->key().operator String(), ScriptCodeCompletionOption::KIND_CLASS);
-										options.insert(option.display, option);
-									}
-								}
-							}
-							for (int i = 0; i < base_type.class_type->subclasses.size(); i++) {
-								if (base_type.class_type->subclasses[i]->name != StringName()) {
-									ScriptCodeCompletionOption option(base_type.class_type->subclasses[i]->name.operator String(), ScriptCodeCompletionOption::KIND_CLASS);
-									options.insert(option.display, option);
-								}
-							}
-
-							base_type = base_type.class_type->base_type;
-						} else {
-							base_type.has_type = false;
-						}
-					} break;
-					case GDScriptParser::DataType::SCRIPT:
-					case GDScriptParser::DataType::GDSCRIPT: {
-						Ref<Script> scr = base_type.script_type;
-						if (scr.is_valid()) {
-							Map<StringName, Variant> constants;
-							scr->get_constants(&constants);
-							for (Map<StringName, Variant>::Element *E = constants.front(); E; E = E->next()) {
-								Ref<Script> const_scr = E->value();
-								if (const_scr.is_valid()) {
-									ScriptCodeCompletionOption option(E->key().operator String(), ScriptCodeCompletionOption::KIND_CLASS);
-									options.insert(option.display, option);
-								}
-							}
-							Ref<Script> base_script = scr->get_base_script();
-							if (base_script.is_valid()) {
-								base_type.script_type = base_script;
-							} else {
-								base_type.has_type = false;
-							}
-						} else {
-							base_type.has_type = false;
-						}
-					} break;
-					default: {
-						base_type.has_type = false;
-					} break;
-				}
-			}
-			r_forced = options.size() > 0;
+			_find_identifiers_in_class(completion_context.current_class, true, false, true, options, 0);
 		} break;
 	}
 
@@ -3008,19 +2697,16 @@ String GDScriptLanguage::_get_indentation() const {
 }
 
 void GDScriptLanguage::auto_indent_code(String &p_code, int p_from_line, int p_to_line) const {
-
 	String indent = _get_indentation();
 
 	Vector<String> lines = p_code.split("\n");
 	List<int> indent_stack;
 
 	for (int i = 0; i < lines.size(); i++) {
-
 		String l = lines[i];
 		int tc = 0;
 		for (int j = 0; j < l.length(); j++) {
 			if (l[j] == ' ' || l[j] == '\t') {
-
 				tc++;
 			} else {
 				break;
@@ -3028,8 +2714,9 @@ void GDScriptLanguage::auto_indent_code(String &p_code, int p_from_line, int p_t
 		}
 
 		String st = l.substr(tc, l.length()).strip_edges();
-		if (st == "" || st.begins_with("#"))
+		if (st == "" || st.begins_with("#")) {
 			continue; //ignore!
+		}
 
 		int ilevel = 0;
 		if (indent_stack.size()) {
@@ -3043,12 +2730,12 @@ void GDScriptLanguage::auto_indent_code(String &p_code, int p_from_line, int p_t
 				indent_stack.pop_back();
 			}
 
-			if (indent_stack.size() && indent_stack.back()->get() != tc)
+			if (indent_stack.size() && indent_stack.back()->get() != tc) {
 				indent_stack.push_back(tc); //this is not right but gets the job done
+			}
 		}
 
 		if (i >= p_from_line) {
-
 			l = "";
 			for (int j = 0; j < indent_stack.size(); j++) {
 				l += indent;
@@ -3064,8 +2751,9 @@ void GDScriptLanguage::auto_indent_code(String &p_code, int p_from_line, int p_t
 
 	p_code = "";
 	for (int i = 0; i < lines.size(); i++) {
-		if (i > 0)
+		if (i > 0) {
 			p_code += "\n";
+		}
 		p_code += lines[i];
 	}
 }
@@ -3075,45 +2763,19 @@ void GDScriptLanguage::auto_indent_code(String &p_code, int p_from_line, int p_t
 static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, const String &p_symbol, bool p_is_function, GDScriptLanguage::LookupResult &r_result) {
 	GDScriptParser::DataType base_type = p_base;
 
-	while (base_type.has_type) {
+	while (base_type.is_set()) {
 		switch (base_type.kind) {
 			case GDScriptParser::DataType::CLASS: {
 				if (base_type.class_type) {
-					if (p_is_function) {
-						for (int i = 0; i < base_type.class_type->functions.size(); i++) {
-							if (base_type.class_type->functions[i]->name == p_symbol) {
-								r_result.type = ScriptLanguage::LookupResult::RESULT_SCRIPT_LOCATION;
-								r_result.location = base_type.class_type->functions[i]->line;
-								return OK;
-							}
-						}
-						for (int i = 0; i < base_type.class_type->static_functions.size(); i++) {
-							if (base_type.class_type->static_functions[i]->name == p_symbol) {
-								r_result.type = ScriptLanguage::LookupResult::RESULT_SCRIPT_LOCATION;
-								r_result.location = base_type.class_type->static_functions[i]->line;
-								return OK;
-							}
-						}
-					} else {
-						if (base_type.class_type->constant_expressions.has(p_symbol)) {
-							r_result.type = ScriptLanguage::LookupResult::RESULT_SCRIPT_LOCATION;
-							r_result.location = base_type.class_type->constant_expressions[p_symbol].expression->line;
-							return OK;
-						}
-
-						for (int i = 0; i < base_type.class_type->variables.size(); i++) {
-							if (base_type.class_type->variables[i].identifier == p_symbol) {
-								r_result.type = ScriptLanguage::LookupResult::RESULT_SCRIPT_LOCATION;
-								r_result.location = base_type.class_type->variables[i].line;
-								return OK;
-							}
-						}
+					if (base_type.class_type->has_member(p_symbol)) {
+						r_result.type = ScriptLanguage::LookupResult::RESULT_SCRIPT_LOCATION;
+						r_result.location = base_type.class_type->get_member(p_symbol).get_line();
+						return OK;
 					}
 					base_type = base_type.class_type->base_type;
 				}
 			} break;
-			case GDScriptParser::DataType::SCRIPT:
-			case GDScriptParser::DataType::GDSCRIPT: {
+			case GDScriptParser::DataType::SCRIPT: {
 				Ref<Script> scr = base_type.script_type;
 				if (scr.is_valid()) {
 					int line = scr->get_member_line(p_symbol);
@@ -3131,17 +2793,14 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
 						base_type.native_type = scr->get_instance_base_type();
 					}
 				} else {
-					base_type.has_type = false;
+					base_type.kind = GDScriptParser::DataType::UNRESOLVED;
 				}
 			} break;
 			case GDScriptParser::DataType::NATIVE: {
-				StringName class_name = base_type.native_type;
+				StringName class_name = _get_real_class_name(base_type.native_type);
 				if (!ClassDB::class_exists(class_name)) {
-					class_name = String("_") + class_name;
-					if (!ClassDB::class_exists(class_name)) {
-						base_type.has_type = false;
-						break;
-					}
+					base_type.kind = GDScriptParser::DataType::UNRESOLVED;
+					break;
 				}
 
 				if (ClassDB::has_method(class_name, p_symbol, true)) {
@@ -3181,15 +2840,11 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
 					}
 				}
 
-				List<PropertyInfo> properties;
-				ClassDB::get_property_list(class_name, &properties, true);
-				for (List<PropertyInfo>::Element *E = properties.front(); E; E = E->next()) {
-					if (E->get().name == p_symbol) {
-						r_result.type = ScriptLanguage::LookupResult::RESULT_CLASS_PROPERTY;
-						r_result.class_name = base_type.native_type;
-						r_result.class_member = p_symbol;
-						return OK;
-					}
+				if (ClassDB::has_property(class_name, p_symbol, true)) {
+					r_result.type = ScriptLanguage::LookupResult::RESULT_CLASS_PROPERTY;
+					r_result.class_name = base_type.native_type;
+					r_result.class_member = p_symbol;
+					return OK;
 				}
 
 				StringName parent = ClassDB::get_parent_class(class_name);
@@ -3200,11 +2855,11 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
 						base_type.native_type = parent;
 					}
 				} else {
-					base_type.has_type = false;
+					base_type.kind = GDScriptParser::DataType::UNRESOLVED;
 				}
 			} break;
 			case GDScriptParser::DataType::BUILTIN: {
-				base_type.has_type = false;
+				base_type.kind = GDScriptParser::DataType::UNRESOLVED;
 
 				if (Variant::has_constant(base_type.builtin_type, p_symbol)) {
 					r_result.type = ScriptLanguage::LookupResult::RESULT_CLASS_CONSTANT;
@@ -3219,9 +2874,9 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
 					v_ref.instance();
 					v = v_ref;
 				} else {
-					Variant::CallError err;
+					Callable::CallError err;
 					v = Variant::construct(base_type.builtin_type, NULL, 0, err);
-					if (err.error != Variant::CallError::CALL_OK) {
+					if (err.error != Callable::CallError::CALL_OK) {
 						break;
 					}
 				}
@@ -3243,7 +2898,7 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
 				}
 			} break;
 			default: {
-				base_type.has_type = false;
+				base_type.kind = GDScriptParser::DataType::UNRESOLVED;
 			} break;
 		}
 	}
@@ -3252,7 +2907,6 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
 }
 
 Error GDScriptLanguage::lookup_code(const String &p_code, const String &p_symbol, const String &p_path, Object *p_owner, LookupResult &r_result) {
-
 	//before parsing, try the usual stuff
 	if (ClassDB::class_exists(p_symbol)) {
 		r_result.type = ScriptLanguage::LookupResult::RESULT_CLASS;
@@ -3293,26 +2947,18 @@ Error GDScriptLanguage::lookup_code(const String &p_code, const String &p_symbol
 	}
 
 	GDScriptParser parser;
-	parser.parse(p_code, p_path.get_base_dir(), false, p_path, true);
+	parser.parse(p_code, p_path, true);
+	GDScriptAnalyzer analyzer(&parser);
+	analyzer.analyze();
 
-	if (parser.get_completion_type() == GDScriptParser::COMPLETION_NONE) {
-		return ERR_CANT_RESOLVE;
-	}
-
-	GDScriptCompletionContext context;
-	context._class = parser.get_completion_class();
-	context.function = parser.get_completion_function();
-	context.block = parser.get_completion_block();
-	context.line = parser.get_completion_line();
-	context.base = p_owner;
-	context.base_path = p_path.get_base_dir();
+	GDScriptParser::CompletionContext context = parser.get_completion_context();
 
-	if (context._class && context._class->extends_class.size() > 0) {
+	if (context.current_class && context.current_class->extends.size() > 0) {
 		bool success = false;
-		ClassDB::get_integer_constant(context._class->extends_class[0], p_symbol, &success);
+		ClassDB::get_integer_constant(context.current_class->extends[0], p_symbol, &success);
 		if (success) {
 			r_result.type = ScriptLanguage::LookupResult::RESULT_CLASS_CONSTANT;
-			r_result.class_name = context._class->extends_class[0];
+			r_result.class_name = context.current_class->extends[0];
 			r_result.class_member = p_symbol;
 			return OK;
 		}
@@ -3320,58 +2966,40 @@ Error GDScriptLanguage::lookup_code(const String &p_code, const String &p_symbol
 
 	bool is_function = false;
 
-	switch (parser.get_completion_type()) {
+	switch (context.type) {
 		case GDScriptParser::COMPLETION_BUILT_IN_TYPE_CONSTANT: {
 			r_result.type = ScriptLanguage::LookupResult::RESULT_CLASS_CONSTANT;
-			r_result.class_name = Variant::get_type_name(parser.get_completion_built_in_constant());
+			r_result.class_name = Variant::get_type_name(context.builtin_type);
 			r_result.class_member = p_symbol;
 			return OK;
 		} break;
-		case GDScriptParser::COMPLETION_PARENT_FUNCTION:
-		case GDScriptParser::COMPLETION_FUNCTION: {
+		case GDScriptParser::COMPLETION_SUPER_METHOD:
+		case GDScriptParser::COMPLETION_METHOD: {
 			is_function = true;
-			FALLTHROUGH;
+			[[fallthrough]];
 		}
 		case GDScriptParser::COMPLETION_IDENTIFIER: {
-
-			if (!is_function) {
-				is_function = parser.get_completion_identifier_is_function();
-			}
-
 			GDScriptParser::DataType base_type;
-			if (context._class) {
-				if (parser.get_completion_type() != GDScriptParser::COMPLETION_PARENT_FUNCTION) {
-					base_type.has_type = true;
-					base_type.kind = GDScriptParser::DataType::CLASS;
-					base_type.class_type = const_cast<GDScriptParser::ClassNode *>(context._class);
+			if (context.current_class) {
+				if (context.type != GDScriptParser::COMPLETION_SUPER_METHOD) {
+					base_type = context.current_class->get_datatype();
 				} else {
-					base_type = context._class->base_type;
+					base_type = context.current_class->base_type;
 				}
 			} else {
 				break;
 			}
 
-			if (!is_function && context.block) {
-				// Lookup local variables
-				const GDScriptParser::BlockNode *block = context.block;
-				while (block) {
-					if (block->variables.has(p_symbol)) {
-						r_result.type = ScriptLanguage::LookupResult::RESULT_SCRIPT_LOCATION;
-						r_result.location = block->variables[p_symbol]->line;
-						return OK;
-					}
-					block = block->parent_block;
-				}
-			}
-
-			if (context.function && context.function->name != StringName()) {
-				// Lookup function arguments
-				for (int i = 0; i < context.function->arguments.size(); i++) {
-					if (context.function->arguments[i] == p_symbol) {
+			if (!is_function && context.current_suite) {
+				// Lookup local variables.
+				const GDScriptParser::SuiteNode *suite = context.current_suite;
+				while (suite) {
+					if (suite->has_local(p_symbol)) {
 						r_result.type = ScriptLanguage::LookupResult::RESULT_SCRIPT_LOCATION;
-						r_result.location = context.function->line;
+						r_result.location = suite->get_local(p_symbol).start_line;
 						return OK;
 					}
+					suite = suite->parent_block;
 				}
 			}
 
@@ -3380,40 +3008,27 @@ Error GDScriptLanguage::lookup_code(const String &p_code, const String &p_symbol
 			}
 
 			if (!is_function) {
-				// Guess in autoloads as singletons
-				List<PropertyInfo> props;
-				ProjectSettings::get_singleton()->get_property_list(&props);
-
-				for (List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) {
-
-					String s = E->get().name;
-					if (!s.begins_with("autoload/"))
-						continue;
-					String name = s.get_slice("/", 1);
-					if (name == String(p_symbol)) {
-
-						String path = ProjectSettings::get_singleton()->get(s);
-						if (path.begins_with("*")) {
-							String script = path.substr(1, path.length());
-
-							if (!script.ends_with(".gd")) {
-								// Not a script, try find the script anyway,
-								// may have some success
-								script = script.get_basename() + ".gd";
-							}
-
-							if (FileAccess::exists(script)) {
+				// Guess in autoloads as singletons.
+				if (ProjectSettings::get_singleton()->has_autoload(p_symbol)) {
+					const ProjectSettings::AutoloadInfo &singleton = ProjectSettings::get_singleton()->get_autoload(p_symbol);
+					if (singleton.is_singleton) {
+						String script = singleton.path;
+						if (!script.ends_with(".gd")) {
+							// Not a script, try find the script anyway,
+							// may have some success.
+							script = script.get_basename() + ".gd";
+						}
 
-								r_result.type = ScriptLanguage::LookupResult::RESULT_SCRIPT_LOCATION;
-								r_result.location = 0;
-								r_result.script = ResourceLoader::load(script);
-								return OK;
-							}
+						if (FileAccess::exists(script)) {
+							r_result.type = ScriptLanguage::LookupResult::RESULT_SCRIPT_LOCATION;
+							r_result.location = 0;
+							r_result.script = ResourceLoader::load(script);
+							return OK;
 						}
 					}
 				}
 
-				// Global
+				// Global.
 				Map<StringName, int> classes = GDScriptLanguage::get_singleton()->get_global_map();
 				if (classes.has(p_symbol)) {
 					Variant value = GDScriptLanguage::get_singleton()->get_global_array()[classes[p_symbol]];
@@ -3460,17 +3075,20 @@ Error GDScriptLanguage::lookup_code(const String &p_code, const String &p_symbol
 				}
 			}
 		} break;
-		case GDScriptParser::COMPLETION_METHOD: {
+		case GDScriptParser::COMPLETION_ATTRIBUTE_METHOD: {
 			is_function = true;
-			FALLTHROUGH;
+			[[fallthrough]];
 		}
-		case GDScriptParser::COMPLETION_INDEX: {
-			const GDScriptParser::Node *node = parser.get_completion_node();
-			if (node->type != GDScriptParser::Node::TYPE_OPERATOR) {
+		case GDScriptParser::COMPLETION_ATTRIBUTE: {
+			if (context.node->type != GDScriptParser::Node::SUBSCRIPT) {
+				break;
+			}
+			const GDScriptParser::SubscriptNode *subscript = static_cast<const GDScriptParser::SubscriptNode *>(context.node);
+			if (!subscript->is_attribute) {
 				break;
 			}
 			GDScriptCompletionIdentifier base;
-			if (!_guess_expression_type(context, static_cast<const GDScriptParser::OperatorNode *>(node)->arguments[0], base)) {
+			if (!_guess_expression_type(context, subscript->base, base)) {
 				break;
 			}
 
@@ -3478,13 +3096,21 @@ Error GDScriptLanguage::lookup_code(const String &p_code, const String &p_symbol
 				return OK;
 			}
 		} break;
-		case GDScriptParser::COMPLETION_VIRTUAL_FUNC: {
-			GDScriptParser::DataType base_type = context._class->base_type;
+		case GDScriptParser::COMPLETION_OVERRIDE_METHOD: {
+			GDScriptParser::DataType base_type = context.current_class->base_type;
 
 			if (_lookup_symbol_from_base(base_type, p_symbol, true, r_result) == OK) {
 				return OK;
 			}
 		} break;
+		case GDScriptParser::COMPLETION_TYPE_NAME_OR_VOID:
+		case GDScriptParser::COMPLETION_TYPE_NAME: {
+			GDScriptParser::DataType base_type = context.current_class->get_datatype();
+
+			if (_lookup_symbol_from_base(base_type, p_symbol, false, r_result) == OK) {
+				return OK;
+			}
+		} break;
 		default: {
 		}
 	}
diff --git a/modules/gdscript/gdscript_function.cpp b/modules/gdscript/gdscript_function.cpp
index 452b1933eb..e59f99fc56 100644
--- a/modules/gdscript/gdscript_function.cpp
+++ b/modules/gdscript/gdscript_function.cpp
@@ -34,49 +34,48 @@
 #include "gdscript.h"
 #include "gdscript_functions.h"
 
-Variant *GDScriptFunction::_get_variant(int p_address, GDScriptInstance *p_instance, GDScript *p_script, Variant &self, Variant *p_stack, String &r_error) const {
+#ifdef DEBUG_ENABLED
+#include "core/string_builder.h"
+#endif
 
+Variant *GDScriptFunction::_get_variant(int p_address, GDScriptInstance *p_instance, GDScript *p_script, Variant &self, Variant &static_ref, Variant *p_stack, String &r_error) const {
 	int address = p_address & ADDR_MASK;
 
 	//sequential table (jump table generated by compiler)
 	switch ((p_address & ADDR_TYPE_MASK) >> ADDR_BITS) {
-
 		case ADDR_TYPE_SELF: {
 #ifdef DEBUG_ENABLED
 			if (unlikely(!p_instance)) {
 				r_error = "Cannot access self without instance.";
-				return NULL;
+				return nullptr;
 			}
 #endif
 			return &self;
 		} break;
 		case ADDR_TYPE_CLASS: {
-
-			return &p_script->_static_ref;
+			return &static_ref;
 		} break;
 		case ADDR_TYPE_MEMBER: {
 #ifdef DEBUG_ENABLED
 			if (unlikely(!p_instance)) {
 				r_error = "Cannot access member without instance.";
-				return NULL;
+				return nullptr;
 			}
 #endif
 			//member indexing is O(1)
 			return &p_instance->members.write[address];
 		} break;
 		case ADDR_TYPE_CLASS_CONSTANT: {
-
 			//todo change to index!
 			GDScript *s = p_script;
 #ifdef DEBUG_ENABLED
-			ERR_FAIL_INDEX_V(address, _global_names_count, NULL);
+			ERR_FAIL_INDEX_V(address, _global_names_count, nullptr);
 #endif
 			const StringName *sn = &_global_names_ptr[address];
 
 			while (s) {
 				GDScript *o = s;
 				while (o) {
-
 					Map<StringName, Variant>::Element *E = o->constants.find(*sn);
 					if (E) {
 						return &E->get();
@@ -86,39 +85,39 @@ Variant *GDScriptFunction::_get_variant(int p_address, GDScriptInstance *p_insta
 				s = s->_base;
 			}
 
-			ERR_FAIL_V_MSG(NULL, "GDScriptCompiler bug.");
+			ERR_FAIL_V_MSG(nullptr, "GDScriptCompiler bug.");
 		} break;
 		case ADDR_TYPE_LOCAL_CONSTANT: {
 #ifdef DEBUG_ENABLED
-			ERR_FAIL_INDEX_V(address, _constant_count, NULL);
+			ERR_FAIL_INDEX_V(address, _constant_count, nullptr);
 #endif
 			return &_constants_ptr[address];
 		} break;
 		case ADDR_TYPE_STACK:
 		case ADDR_TYPE_STACK_VARIABLE: {
 #ifdef DEBUG_ENABLED
-			ERR_FAIL_INDEX_V(address, _stack_size, NULL);
+			ERR_FAIL_INDEX_V(address, _stack_size, nullptr);
 #endif
 			return &p_stack[address];
 		} break;
 		case ADDR_TYPE_GLOBAL: {
 #ifdef DEBUG_ENABLED
-			ERR_FAIL_INDEX_V(address, GDScriptLanguage::get_singleton()->get_global_array_size(), NULL);
+			ERR_FAIL_INDEX_V(address, GDScriptLanguage::get_singleton()->get_global_array_size(), nullptr);
 #endif
 			return &GDScriptLanguage::get_singleton()->get_global_array()[address];
 		} break;
 #ifdef TOOLS_ENABLED
 		case ADDR_TYPE_NAMED_GLOBAL: {
 #ifdef DEBUG_ENABLED
-			ERR_FAIL_INDEX_V(address, _named_globals_count, NULL);
+			ERR_FAIL_INDEX_V(address, _global_names_count, nullptr);
 #endif
-			StringName id = _named_globals_ptr[address];
+			StringName id = _global_names_ptr[address];
 
 			if (GDScriptLanguage::get_singleton()->get_named_globals_map().has(id)) {
 				return (Variant *)&GDScriptLanguage::get_singleton()->get_named_globals_map()[id];
 			} else {
 				r_error = "Autoload singleton '" + String(id) + "' has been removed.";
-				return NULL;
+				return nullptr;
 			}
 		} break;
 #endif
@@ -127,27 +126,28 @@ Variant *GDScriptFunction::_get_variant(int p_address, GDScriptInstance *p_insta
 		} break;
 	}
 
-	ERR_FAIL_V_MSG(NULL, "Bad code! (unknown addressing mode).");
-	return NULL;
+	ERR_FAIL_V_MSG(nullptr, "Bad code! (unknown addressing mode).");
+	return nullptr;
 }
 
 #ifdef DEBUG_ENABLED
 static String _get_var_type(const Variant *p_var) {
-
 	String basestr;
 
 	if (p_var->get_type() == Variant::OBJECT) {
-		Object *bobj = *p_var;
+		bool was_freed;
+		Object *bobj = p_var->get_validated_object_with_check(was_freed);
 		if (!bobj) {
-			basestr = "null instance";
+			if (was_freed) {
+				basestr = "null instance";
+			} else {
+				basestr = "previously freed";
+			}
 		} else {
-			if (ObjectDB::instance_validate(bobj)) {
-				if (bobj->get_script_instance())
-					basestr = bobj->get_class() + " (" + bobj->get_script_instance()->get_script()->get_path().get_file() + ")";
-				else
-					basestr = bobj->get_class();
+			if (bobj->get_script_instance()) {
+				basestr = bobj->get_class() + " (" + bobj->get_script_instance()->get_script()->get_path().get_file() + ")";
 			} else {
-				basestr = "previously freed instance";
+				basestr = bobj->get_class();
 			}
 		}
 
@@ -159,11 +159,10 @@ static String _get_var_type(const Variant *p_var) {
 }
 #endif // DEBUG_ENABLED
 
-String GDScriptFunction::_get_call_error(const Variant::CallError &p_err, const String &p_where, const Variant **argptrs) const {
-
+String GDScriptFunction::_get_call_error(const Callable::CallError &p_err, const String &p_where, const Variant **argptrs) const {
 	String err_text;
 
-	if (p_err.error == Variant::CallError::CALL_ERROR_INVALID_ARGUMENT) {
+	if (p_err.error == Callable::CallError::CALL_ERROR_INVALID_ARGUMENT) {
 		int errorarg = p_err.argument;
 		// Handle the Object to Object case separately as we don't have further class details.
 #ifdef DEBUG_ENABLED
@@ -172,15 +171,15 @@ String GDScriptFunction::_get_call_error(const Variant::CallError &p_err, const
 		} else
 #endif // DEBUG_ENABLED
 		{
-			err_text = "Invalid type in " + p_where + ". Cannot convert argument " + itos(errorarg + 1) + " from " + Variant::get_type_name(argptrs[errorarg]->get_type()) + " to " + Variant::get_type_name(p_err.expected) + ".";
+			err_text = "Invalid type in " + p_where + ". Cannot convert argument " + itos(errorarg + 1) + " from " + Variant::get_type_name(argptrs[errorarg]->get_type()) + " to " + Variant::get_type_name(Variant::Type(p_err.expected)) + ".";
 		}
-	} else if (p_err.error == Variant::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS) {
+	} else if (p_err.error == Callable::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS) {
 		err_text = "Invalid call to " + p_where + ". Expected " + itos(p_err.argument) + " arguments.";
-	} else if (p_err.error == Variant::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS) {
+	} else if (p_err.error == Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS) {
 		err_text = "Invalid call to " + p_where + ". Expected " + itos(p_err.argument) + " arguments.";
-	} else if (p_err.error == Variant::CallError::CALL_ERROR_INVALID_METHOD) {
+	} else if (p_err.error == Callable::CallError::CALL_ERROR_INVALID_METHOD) {
 		err_text = "Invalid call. Nonexistent " + p_where + ".";
-	} else if (p_err.error == Variant::CallError::CALL_ERROR_INSTANCE_IS_NULL) {
+	} else if (p_err.error == Callable::CallError::CALL_ERROR_INSTANCE_IS_NULL) {
 		err_text = "Attempt to call " + p_where + " on a null instance.";
 	} else {
 		err_text = "Bug, call error: #" + itos(p_err.error);
@@ -215,12 +214,11 @@ String GDScriptFunction::_get_call_error(const Variant::CallError &p_err, const
 		&&OPCODE_CONSTRUCT_DICTIONARY,        \
 		&&OPCODE_CALL,                        \
 		&&OPCODE_CALL_RETURN,                 \
+		&&OPCODE_CALL_ASYNC,                  \
 		&&OPCODE_CALL_BUILT_IN,               \
-		&&OPCODE_CALL_SELF,                   \
 		&&OPCODE_CALL_SELF_BASE,              \
-		&&OPCODE_YIELD,                       \
-		&&OPCODE_YIELD_SIGNAL,                \
-		&&OPCODE_YIELD_RESUME,                \
+		&&OPCODE_AWAIT,                       \
+		&&OPCODE_AWAIT_RESUME,                \
 		&&OPCODE_JUMP,                        \
 		&&OPCODE_JUMP_IF,                     \
 		&&OPCODE_JUMP_IF_NOT,                 \
@@ -232,7 +230,8 @@ String GDScriptFunction::_get_call_error(const Variant::CallError &p_err, const
 		&&OPCODE_BREAKPOINT,                  \
 		&&OPCODE_LINE,                        \
 		&&OPCODE_END                          \
-	};
+	};                                        \
+	static_assert((sizeof(switch_table_ops) / sizeof(switch_table_ops[0]) == (OPCODE_END + 1)), "Opcodes in jump table aren't the same as opcodes in enum.");
 
 #define OPCODE(m_op) \
 	m_op:
@@ -257,20 +256,19 @@ String GDScriptFunction::_get_call_error(const Variant::CallError &p_err, const
 #define OPCODE_OUT break
 #endif
 
-Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_args, int p_argcount, Variant::CallError &r_err, CallState *p_state) {
-
+Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_args, int p_argcount, Callable::CallError &r_err, CallState *p_state) {
 	OPCODES_TABLE;
 
 	if (!_code_ptr) {
-
 		return Variant();
 	}
 
-	r_err.error = Variant::CallError::CALL_OK;
+	r_err.error = Callable::CallError::CALL_OK;
 
 	Variant self;
+	Variant static_ref;
 	Variant retvalue;
-	Variant *stack = NULL;
+	Variant *stack = nullptr;
 	Variant **call_args;
 	int defarg = 0;
 
@@ -286,35 +284,29 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 	int line = _initial_line;
 
 	if (p_state) {
-		//use existing (supplied) state (yielded)
+		//use existing (supplied) state (awaited)
 		stack = (Variant *)p_state->stack.ptr();
 		call_args = (Variant **)&p_state->stack.ptr()[sizeof(Variant) * p_state->stack_size]; //ptr() to avoid bounds check
 		line = p_state->line;
 		ip = p_state->ip;
 		alloca_size = p_state->stack.size();
-		script = p_state->script.ptr();
+		script = p_state->script;
 		p_instance = p_state->instance;
 		defarg = p_state->defarg;
 		self = p_state->self;
-		//stack[p_state->result_pos]=p_state->result; //assign stack with result
 
 	} else {
-
 		if (p_argcount != _argument_count) {
-
 			if (p_argcount > _argument_count) {
-
-				r_err.error = Variant::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS;
+				r_err.error = Callable::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS;
 				r_err.argument = _argument_count;
 
 				return Variant();
 			} else if (p_argcount < _argument_count - _default_arg_count) {
-
-				r_err.error = Variant::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
+				r_err.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
 				r_err.argument = _argument_count - _default_arg_count;
 				return Variant();
 			} else {
-
 				defarg = _argument_count - p_argcount;
 			}
 		}
@@ -322,11 +314,9 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 		alloca_size = sizeof(Variant *) * _call_size + sizeof(Variant) * _stack_size;
 
 		if (alloca_size) {
-
 			uint8_t *aptr = (uint8_t *)alloca(alloca_size);
 
 			if (_stack_size) {
-
 				stack = (Variant *)aptr;
 				for (int i = 0; i < p_argcount; i++) {
 					if (!argument_types[i].has_type) {
@@ -335,15 +325,10 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 					}
 
 					if (!argument_types[i].is_type(*p_args[i], true)) {
-						if (argument_types[i].is_type(Variant(), true)) {
-							memnew_placement(&stack[i], Variant);
-							continue;
-						} else {
-							r_err.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
-							r_err.argument = i;
-							r_err.expected = argument_types[i].kind == GDScriptDataType::BUILTIN ? argument_types[i].builtin_type : Variant::OBJECT;
-							return Variant();
-						}
+						r_err.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
+						r_err.argument = i;
+						r_err.expected = argument_types[i].kind == GDScriptDataType::BUILTIN ? argument_types[i].builtin_type : Variant::OBJECT;
+						return Variant();
 					}
 					if (argument_types[i].kind == GDScriptDataType::BUILTIN) {
 						Variant arg = Variant::construct(argument_types[i].builtin_type, &p_args[i], 1, r_err);
@@ -356,25 +341,22 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 					memnew_placement(&stack[i], Variant);
 				}
 			} else {
-				stack = NULL;
+				stack = nullptr;
 			}
 
 			if (_call_size) {
-
 				call_args = (Variant **)&aptr[sizeof(Variant) * _stack_size];
 			} else {
-
-				call_args = NULL;
+				call_args = nullptr;
 			}
 
 		} else {
-			stack = NULL;
-			call_args = NULL;
+			stack = nullptr;
+			call_args = nullptr;
 		}
 
 		if (p_instance) {
 			if (p_instance->base_ref && static_cast<Reference *>(p_instance->owner)->is_referenced()) {
-
 				self = REF(static_cast<Reference *>(p_instance->owner));
 			} else {
 				self = p_instance->owner;
@@ -385,12 +367,15 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 		}
 	}
 
+	static_ref = script;
+
 	String err_text;
 
 #ifdef DEBUG_ENABLED
 
-	if (ScriptDebugger::get_singleton())
+	if (EngineDebugger::is_active()) {
 		GDScriptLanguage::get_singleton()->enter_function(p_instance, this, stack, &ip, &line);
+	}
 
 #define GD_ERR_BREAK(m_cond)                                                                                           \
 	{                                                                                                                  \
@@ -403,10 +388,10 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 #define CHECK_SPACE(m_space) \
 	GD_ERR_BREAK((ip + m_space) > _code_size)
 
-#define GET_VARIANT_PTR(m_v, m_code_ofs)                                                       \
-	Variant *m_v;                                                                              \
-	m_v = _get_variant(_code_ptr[ip + m_code_ofs], p_instance, script, self, stack, err_text); \
-	if (unlikely(!m_v))                                                                        \
+#define GET_VARIANT_PTR(m_v, m_code_ofs)                                                                   \
+	Variant *m_v;                                                                                          \
+	m_v = _get_variant(_code_ptr[ip + m_code_ofs], p_instance, script, self, static_ref, stack, err_text); \
+	if (unlikely(!m_v))                                                                                    \
 		OPCODE_BREAK;
 
 #else
@@ -414,7 +399,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 #define CHECK_SPACE(m_space)
 #define GET_VARIANT_PTR(m_v, m_code_ofs) \
 	Variant *m_v;                        \
-	m_v = _get_variant(_code_ptr[ip + m_code_ofs], p_instance, script, self, stack, err_text);
+	m_v = _get_variant(_code_ptr[ip + m_code_ofs], p_instance, script, self, static_ref, stack, err_text);
 
 #endif
 
@@ -430,7 +415,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 		profile.frame_call_count++;
 	}
 	bool exit_ok = false;
-	bool yielded = false;
+	bool awaited = false;
 #endif
 
 #ifdef DEBUG_ENABLED
@@ -441,9 +426,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 #endif
 
 		OPCODE_SWITCH(_code_ptr[ip]) {
-
 			OPCODE(OPCODE_OPERATOR) {
-
 				CHECK_SPACE(5);
 
 				bool valid;
@@ -463,7 +446,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 #endif
 #ifdef DEBUG_ENABLED
 				if (!valid) {
-
 					if (ret.get_type() == Variant::STRING) {
 						//return a string when invalid with the error
 						err_text = ret;
@@ -480,7 +462,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			DISPATCH_OPCODE;
 
 			OPCODE(OPCODE_EXTENDS_TEST) {
-
 				CHECK_SPACE(4);
 
 				GET_VARIANT_PTR(a, 1);
@@ -488,23 +469,33 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 				GET_VARIANT_PTR(dst, 3);
 
 #ifdef DEBUG_ENABLED
-				if (b->get_type() != Variant::OBJECT || b->operator Object *() == NULL) {
-
+				if (b->get_type() != Variant::OBJECT || b->operator Object *() == nullptr) {
 					err_text = "Right operand of 'is' is not a class.";
 					OPCODE_BREAK;
 				}
 #endif
 
 				bool extends_ok = false;
-				if (a->get_type() == Variant::OBJECT && a->operator Object *() != NULL) {
-					Object *obj_A = *a;
-					Object *obj_B = *b;
-
+				if (a->get_type() == Variant::OBJECT && a->operator Object *() != nullptr) {
 #ifdef DEBUG_ENABLED
-					if (!ObjectDB::instance_validate(obj_A)) {
-						err_text = "Left operand of 'is' was already freed.";
+					bool was_freed;
+					Object *obj_A = a->get_validated_object_with_check(was_freed);
+
+					if (was_freed) {
+						err_text = "Left operand of 'is' is a previously freed instance.";
 						OPCODE_BREAK;
 					}
+
+					Object *obj_B = b->get_validated_object_with_check(was_freed);
+
+					if (was_freed) {
+						err_text = "Right operand of 'is' is a previously freed instance.";
+						OPCODE_BREAK;
+					}
+#else
+
+					Object *obj_A = *a;
+					Object *obj_B = *b;
 #endif // DEBUG_ENABLED
 
 					GDScript *scr_B = Object::cast_to<GDScript>(obj_B);
@@ -514,11 +505,9 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 						//in other situation, this shoul return false.
 
 						if (obj_A->get_script_instance() && obj_A->get_script_instance()->get_language() == GDScriptLanguage::get_singleton()) {
-
 							GDScript *cmp = static_cast<GDScript *>(obj_A->get_script_instance()->get_script().ptr());
 							//bool found=false;
 							while (cmp) {
-
 								if (cmp == scr_B) {
 									//inherits from script, all ok
 									extends_ok = true;
@@ -530,12 +519,10 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 						}
 
 					} else {
-
 						GDScriptNativeClass *nc = Object::cast_to<GDScriptNativeClass>(obj_B);
 
 #ifdef DEBUG_ENABLED
 						if (!nc) {
-
 							err_text = "Right operand of 'is' is not a class (type: '" + obj_B->get_class() + "').";
 							OPCODE_BREAK;
 						}
@@ -550,7 +537,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			DISPATCH_OPCODE;
 
 			OPCODE(OPCODE_IS_BUILTIN) {
-
 				CHECK_SPACE(4);
 
 				GET_VARIANT_PTR(value, 1);
@@ -565,7 +551,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			DISPATCH_OPCODE;
 
 			OPCODE(OPCODE_SET) {
-
 				CHECK_SPACE(3);
 
 				GET_VARIANT_PTR(dst, 1);
@@ -592,7 +577,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			DISPATCH_OPCODE;
 
 			OPCODE(OPCODE_GET) {
-
 				CHECK_SPACE(3);
 
 				GET_VARIANT_PTR(src, 1);
@@ -625,7 +609,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			DISPATCH_OPCODE;
 
 			OPCODE(OPCODE_SET_NAMED) {
-
 				CHECK_SPACE(3);
 
 				GET_VARIANT_PTR(dst, 1);
@@ -651,7 +634,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			DISPATCH_OPCODE;
 
 			OPCODE(OPCODE_GET_NAMED) {
-
 				CHECK_SPACE(4);
 
 				GET_VARIANT_PTR(src, 1);
@@ -686,7 +668,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			DISPATCH_OPCODE;
 
 			OPCODE(OPCODE_SET_MEMBER) {
-
 				CHECK_SPACE(3);
 				int indexname = _code_ptr[ip + 1];
 				GD_ERR_BREAK(indexname < 0 || indexname >= _global_names_count);
@@ -711,7 +692,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			DISPATCH_OPCODE;
 
 			OPCODE(OPCODE_GET_MEMBER) {
-
 				CHECK_SPACE(3);
 				int indexname = _code_ptr[ip + 1];
 				GD_ERR_BREAK(indexname < 0 || indexname >= _global_names_count);
@@ -732,7 +712,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			DISPATCH_OPCODE;
 
 			OPCODE(OPCODE_ASSIGN) {
-
 				CHECK_SPACE(3);
 				GET_VARIANT_PTR(dst, 1);
 				GET_VARIANT_PTR(src, 2);
@@ -744,7 +723,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			DISPATCH_OPCODE;
 
 			OPCODE(OPCODE_ASSIGN_TRUE) {
-
 				CHECK_SPACE(2);
 				GET_VARIANT_PTR(dst, 1);
 
@@ -755,7 +733,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			DISPATCH_OPCODE;
 
 			OPCODE(OPCODE_ASSIGN_FALSE) {
-
 				CHECK_SPACE(2);
 				GET_VARIANT_PTR(dst, 1);
 
@@ -766,7 +743,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			DISPATCH_OPCODE;
 
 			OPCODE(OPCODE_ASSIGN_TYPED_BUILTIN) {
-
 				CHECK_SPACE(4);
 				GET_VARIANT_PTR(dst, 2);
 				GET_VARIANT_PTR(src, 3);
@@ -778,7 +754,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 #ifdef DEBUG_ENABLED
 					if (Variant::can_convert_strict(src->get_type(), var_type)) {
 #endif // DEBUG_ENABLED
-						Variant::CallError ce;
+						Callable::CallError ce;
 						*dst = Variant::construct(var_type, const_cast<const Variant **>(&src), 1, ce);
 					} else {
 #ifdef DEBUG_ENABLED
@@ -796,7 +772,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			DISPATCH_OPCODE;
 
 			OPCODE(OPCODE_ASSIGN_TYPED_NATIVE) {
-
 				CHECK_SPACE(4);
 				GET_VARIANT_PTR(dst, 2);
 				GET_VARIANT_PTR(src, 3);
@@ -825,7 +800,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			DISPATCH_OPCODE;
 
 			OPCODE(OPCODE_ASSIGN_TYPED_SCRIPT) {
-
 				CHECK_SPACE(4);
 				GET_VARIANT_PTR(dst, 2);
 				GET_VARIANT_PTR(src, 3);
@@ -841,8 +815,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 					OPCODE_BREAK;
 				}
 
-				if (src->get_type() != Variant::NIL && src->operator Object *() != NULL) {
-
+				if (src->get_type() != Variant::NIL && src->operator Object *() != nullptr) {
 					ScriptInstance *scr_inst = src->operator Object *()->get_script_instance();
 					if (!scr_inst) {
 						err_text = "Trying to assign value of type '" + src->operator Object *()->get_class_name() +
@@ -876,7 +849,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			DISPATCH_OPCODE;
 
 			OPCODE(OPCODE_CAST_TO_BUILTIN) {
-
 				CHECK_SPACE(4);
 				Variant::Type to_type = (Variant::Type)_code_ptr[ip + 1];
 				GET_VARIANT_PTR(src, 2);
@@ -884,11 +856,11 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 
 				GD_ERR_BREAK(to_type < 0 || to_type >= Variant::VARIANT_MAX);
 
-				Variant::CallError err;
+				Callable::CallError err;
 				*dst = Variant::construct(to_type, (const Variant **)&src, 1, err);
 
 #ifdef DEBUG_ENABLED
-				if (err.error != Variant::CallError::CALL_OK) {
+				if (err.error != Callable::CallError::CALL_OK) {
 					err_text = "Invalid cast: could not convert value to '" + Variant::get_type_name(to_type) + "'.";
 					OPCODE_BREAK;
 				}
@@ -899,7 +871,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			DISPATCH_OPCODE;
 
 			OPCODE(OPCODE_CAST_TO_NATIVE) {
-
 				CHECK_SPACE(4);
 				GET_VARIANT_PTR(to_type, 1);
 				GET_VARIANT_PTR(src, 2);
@@ -927,7 +898,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			DISPATCH_OPCODE;
 
 			OPCODE(OPCODE_CAST_TO_SCRIPT) {
-
 				CHECK_SPACE(4);
 				GET_VARIANT_PTR(to_type, 1);
 				GET_VARIANT_PTR(src, 2);
@@ -946,12 +916,10 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 
 				bool valid = false;
 
-				if (src->get_type() != Variant::NIL && src->operator Object *() != NULL) {
-
+				if (src->get_type() != Variant::NIL && src->operator Object *() != nullptr) {
 					ScriptInstance *scr_inst = src->operator Object *()->get_script_instance();
 
 					if (scr_inst) {
-
 						Script *src_type = src->operator Object *()->get_script_instance()->get_script().ptr();
 
 						while (src_type) {
@@ -975,7 +943,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			DISPATCH_OPCODE;
 
 			OPCODE(OPCODE_CONSTRUCT) {
-
 				CHECK_SPACE(2);
 				Variant::Type t = Variant::Type(_code_ptr[ip + 1]);
 				int argc = _code_ptr[ip + 2];
@@ -987,12 +954,11 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 				}
 
 				GET_VARIANT_PTR(dst, 3 + argc);
-				Variant::CallError err;
+				Callable::CallError err;
 				*dst = Variant::construct(t, (const Variant **)argptrs, argc, err);
 
 #ifdef DEBUG_ENABLED
-				if (err.error != Variant::CallError::CALL_OK) {
-
+				if (err.error != Callable::CallError::CALL_OK) {
 					err_text = _get_call_error(err, "'" + Variant::get_type_name(t) + "' constructor", (const Variant **)argptrs);
 					OPCODE_BREAK;
 				}
@@ -1004,7 +970,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			DISPATCH_OPCODE;
 
 			OPCODE(OPCODE_CONSTRUCT_ARRAY) {
-
 				CHECK_SPACE(1);
 				int argc = _code_ptr[ip + 1];
 				Array array; //arrays are always shared
@@ -1025,7 +990,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			DISPATCH_OPCODE;
 
 			OPCODE(OPCODE_CONSTRUCT_DICTIONARY) {
-
 				CHECK_SPACE(1);
 				int argc = _code_ptr[ip + 1];
 				Dictionary dict; //arrays are always shared
@@ -1033,7 +997,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 				CHECK_SPACE(argc * 2 + 2);
 
 				for (int i = 0; i < argc; i++) {
-
 					GET_VARIANT_PTR(k, 2 + i * 2 + 0);
 					GET_VARIANT_PTR(v, 2 + i * 2 + 1);
 					dict[*k] = *v;
@@ -1047,11 +1010,14 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			}
 			DISPATCH_OPCODE;
 
+			OPCODE(OPCODE_CALL_ASYNC)
 			OPCODE(OPCODE_CALL_RETURN)
 			OPCODE(OPCODE_CALL) {
-
 				CHECK_SPACE(4);
-				bool call_ret = _code_ptr[ip] == OPCODE_CALL_RETURN;
+				bool call_ret = _code_ptr[ip] != OPCODE_CALL;
+#ifdef DEBUG_ENABLED
+				bool call_async = _code_ptr[ip] == OPCODE_CALL_ASYNC;
+#endif
 
 				int argc = _code_ptr[ip + 1];
 				GET_VARIANT_PTR(base, 2);
@@ -1078,41 +1044,51 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 				}
 
 #endif
-				Variant::CallError err;
+				Callable::CallError err;
 				if (call_ret) {
-
 					GET_VARIANT_PTR(ret, argc);
 					base->call_ptr(*methodname, (const Variant **)argptrs, argc, ret, err);
-				} else {
+#ifdef DEBUG_ENABLED
+					if (!call_async && ret->get_type() == Variant::OBJECT) {
+						// Check if getting a function state without await.
+						bool was_freed = false;
+						Object *obj = ret->get_validated_object_with_check(was_freed);
 
-					base->call_ptr(*methodname, (const Variant **)argptrs, argc, NULL, err);
+						if (was_freed) {
+							err_text = "Got a freed object as a result of the call.";
+							OPCODE_BREAK;
+						}
+						if (obj && obj->is_class_ptr(GDScriptFunctionState::get_class_ptr_static())) {
+							err_text = R"(Trying to call an async function without "await".)";
+							OPCODE_BREAK;
+						}
+					}
+#endif
+				} else {
+					base->call_ptr(*methodname, (const Variant **)argptrs, argc, nullptr, err);
 				}
 #ifdef DEBUG_ENABLED
 				if (GDScriptLanguage::get_singleton()->profiling) {
 					function_call_time += OS::get_singleton()->get_ticks_usec() - call_time;
 				}
 
-				if (err.error != Variant::CallError::CALL_OK) {
-
+				if (err.error != Callable::CallError::CALL_OK) {
 					String methodstr = *methodname;
 					String basestr = _get_var_type(base);
 
 					if (methodstr == "call") {
 						if (argc >= 1) {
 							methodstr = String(*argptrs[0]) + " (via call)";
-							if (err.error == Variant::CallError::CALL_ERROR_INVALID_ARGUMENT) {
+							if (err.error == Callable::CallError::CALL_ERROR_INVALID_ARGUMENT) {
 								err.argument += 1;
 							}
 						}
 					} else if (methodstr == "free") {
-
-						if (err.error == Variant::CallError::CALL_ERROR_INVALID_METHOD) {
-
+						if (err.error == Callable::CallError::CALL_ERROR_INVALID_METHOD) {
 							if (base->is_ref()) {
 								err_text = "Attempted to free a reference.";
 								OPCODE_BREAK;
 							} else if (base->get_type() == Variant::OBJECT) {
-
 								err_text = "Attempted to free a locked object (calling or emitting).";
 								OPCODE_BREAK;
 							}
@@ -1123,13 +1099,12 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 				}
 #endif
 
-				//_call_func(NULL,base,*methodname,ip,argc,p_instance,stack);
+				//_call_func(nullptr,base,*methodname,ip,argc,p_instance,stack);
 				ip += argc + 1;
 			}
 			DISPATCH_OPCODE;
 
 			OPCODE(OPCODE_CALL_BUILT_IN) {
-
 				CHECK_SPACE(4);
 
 				GDScriptFunctions::Function func = GDScriptFunctions::Function(_code_ptr[ip + 1]);
@@ -1147,13 +1122,12 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 
 				GET_VARIANT_PTR(dst, argc);
 
-				Variant::CallError err;
+				Callable::CallError err;
 
 				GDScriptFunctions::call(func, (const Variant **)argptrs, argc, *dst, err);
 
 #ifdef DEBUG_ENABLED
-				if (err.error != Variant::CallError::CALL_OK) {
-
+				if (err.error != Callable::CallError::CALL_OK) {
 					String methodstr = GDScriptFunctions::get_func_name(func);
 					if (dst->get_type() == Variant::STRING) {
 						//call provided error string
@@ -1168,19 +1142,12 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			}
 			DISPATCH_OPCODE;
 
-			OPCODE(OPCODE_CALL_SELF) {
-
-				OPCODE_BREAK;
-			}
-
 			OPCODE(OPCODE_CALL_SELF_BASE) {
-
 				CHECK_SPACE(2);
 				int self_fun = _code_ptr[ip + 1];
 
 #ifdef DEBUG_ENABLED
 				if (self_fun < 0 || self_fun >= _global_names_count) {
-
 					err_text = "compiler bug, function name not found";
 					OPCODE_BREAK;
 				}
@@ -1202,43 +1169,39 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 
 				const GDScript *gds = _script;
 
-				const Map<StringName, GDScriptFunction *>::Element *E = NULL;
+				const Map<StringName, GDScriptFunction *>::Element *E = nullptr;
 				while (gds->base.ptr()) {
 					gds = gds->base.ptr();
 					E = gds->member_functions.find(*methodname);
-					if (E)
+					if (E) {
 						break;
+					}
 				}
 
-				Variant::CallError err;
+				Callable::CallError err;
 
 				if (E) {
-
 					*dst = E->get()->call(p_instance, (const Variant **)argptrs, argc, err);
 				} else if (gds->native.ptr()) {
-
 					if (*methodname != GDScriptLanguage::get_singleton()->strings._init) {
-
 						MethodBind *mb = ClassDB::get_method(gds->native->get_name(), *methodname);
 						if (!mb) {
-							err.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+							err.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 						} else {
 							*dst = mb->call(p_instance->owner, (const Variant **)argptrs, argc, err);
 						}
 					} else {
-						err.error = Variant::CallError::CALL_OK;
+						err.error = Callable::CallError::CALL_OK;
 					}
 				} else {
-
 					if (*methodname != GDScriptLanguage::get_singleton()->strings._init) {
-						err.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+						err.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 					} else {
-						err.error = Variant::CallError::CALL_OK;
+						err.error = Callable::CallError::CALL_OK;
 					}
 				}
 
-				if (err.error != Variant::CallError::CALL_OK) {
-
+				if (err.error != Callable::CallError::CALL_OK) {
 					String methodstr = *methodname;
 					err_text = _get_call_error(err, "function '" + methodstr + "'", (const Variant **)argptrs);
 
@@ -1249,94 +1212,95 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			}
 			DISPATCH_OPCODE;
 
-			OPCODE(OPCODE_YIELD)
-			OPCODE(OPCODE_YIELD_SIGNAL) {
+			OPCODE(OPCODE_AWAIT) {
+				CHECK_SPACE(2);
 
-				int ipofs = 1;
-				if (_code_ptr[ip] == OPCODE_YIELD_SIGNAL) {
-					CHECK_SPACE(4);
-					ipofs += 2;
-				} else {
-					CHECK_SPACE(2);
-				}
+				//do the oneshot connect
+				GET_VARIANT_PTR(argobj, 1);
 
-				Ref<GDScriptFunctionState> gdfs = memnew(GDScriptFunctionState);
-				gdfs->function = this;
+				Signal sig;
+				bool is_signal = true;
 
-				gdfs->state.stack.resize(alloca_size);
-				//copy variant stack
-				for (int i = 0; i < _stack_size; i++) {
-					memnew_placement(&gdfs->state.stack.write[sizeof(Variant) * i], Variant(stack[i]));
-				}
-				gdfs->state.stack_size = _stack_size;
-				gdfs->state.self = self;
-				gdfs->state.alloca_size = alloca_size;
-				gdfs->state.script = Ref<GDScript>(_script);
-				gdfs->state.ip = ip + ipofs;
-				gdfs->state.line = line;
-				gdfs->state.instance_id = (p_instance && p_instance->get_owner()) ? p_instance->get_owner()->get_instance_id() : 0;
-				//gdfs->state.result_pos=ip+ipofs-1;
-				gdfs->state.defarg = defarg;
-				gdfs->state.instance = p_instance;
-				gdfs->function = this;
-
-				retvalue = gdfs;
-
-				if (_code_ptr[ip] == OPCODE_YIELD_SIGNAL) {
-					//do the oneshot connect
-					GET_VARIANT_PTR(argobj, 1);
-					GET_VARIANT_PTR(argname, 2);
+				{
+					Variant result = *argobj;
 
-#ifdef DEBUG_ENABLED
-					if (argobj->get_type() != Variant::OBJECT) {
-						err_text = "First argument of yield() not of type object.";
-						OPCODE_BREAK;
+					if (argobj->get_type() == Variant::OBJECT) {
+						bool was_freed = false;
+						Object *obj = argobj->get_validated_object_with_check(was_freed);
+
+						if (was_freed) {
+							err_text = "Trying to await on a freed object.";
+							OPCODE_BREAK;
+						}
+
+						// Is this even possible to be null at this point?
+						if (obj) {
+							if (obj->is_class_ptr(GDScriptFunctionState::get_class_ptr_static())) {
+								static StringName completed = _scs_create("completed");
+								result = Signal(obj, completed);
+							}
+						}
 					}
-					if (argname->get_type() != Variant::STRING) {
-						err_text = "Second argument of yield() not a string (for signal name).";
-						OPCODE_BREAK;
+
+					if (result.get_type() != Variant::SIGNAL) {
+						ip += 4; // Skip OPCODE_AWAIT_RESUME and its data.
+						// The stack pointer should be the same, so we don't need to set a return value.
+						is_signal = false;
+					} else {
+						sig = result;
 					}
-#endif
+				}
 
-					Object *obj = argobj->operator Object *();
-					String signal = argname->operator String();
+				if (is_signal) {
+					Ref<GDScriptFunctionState> gdfs = memnew(GDScriptFunctionState);
+					gdfs->function = this;
 
-#ifdef DEBUG_ENABLED
-					if (!obj) {
-						err_text = "First argument of yield() is null.";
-						OPCODE_BREAK;
+					gdfs->state.stack.resize(alloca_size);
+					//copy variant stack
+					for (int i = 0; i < _stack_size; i++) {
+						memnew_placement(&gdfs->state.stack.write[sizeof(Variant) * i], Variant(stack[i]));
 					}
-					if (ScriptDebugger::get_singleton()) {
-						if (!ObjectDB::instance_validate(obj)) {
-							err_text = "First argument of yield() is a previously freed instance.";
-							OPCODE_BREAK;
+					gdfs->state.stack_size = _stack_size;
+					gdfs->state.self = self;
+					gdfs->state.alloca_size = alloca_size;
+					gdfs->state.ip = ip + 2;
+					gdfs->state.line = line;
+					gdfs->state.script = _script;
+					{
+						MutexLock lock(GDScriptLanguage::get_singleton()->lock);
+						_script->pending_func_states.add(&gdfs->scripts_list);
+						if (p_instance) {
+							gdfs->state.instance = p_instance;
+							p_instance->pending_func_states.add(&gdfs->instances_list);
+						} else {
+							gdfs->state.instance = nullptr;
 						}
 					}
-					if (signal.length() == 0) {
+#ifdef DEBUG_ENABLED
+					gdfs->state.function_name = name;
+					gdfs->state.script_path = _script->get_path();
+#endif
+					gdfs->state.defarg = defarg;
+					gdfs->function = this;
 
-						err_text = "Second argument of yield() is an empty string (for signal name).";
-						OPCODE_BREAK;
-					}
+					retvalue = gdfs;
 
-					Error err = obj->connect(signal, gdfs.ptr(), "_signal_callback", varray(gdfs), Object::CONNECT_ONESHOT);
+					Error err = sig.connect(Callable(gdfs.ptr(), "_signal_callback"), varray(gdfs), Object::CONNECT_ONESHOT);
 					if (err != OK) {
-						err_text = "Error connecting to signal: " + signal + " during yield().";
+						err_text = "Error connecting to signal: " + sig.get_name() + " during await.";
 						OPCODE_BREAK;
 					}
-#else
-					obj->connect(signal, gdfs.ptr(), "_signal_callback", varray(gdfs), Object::CONNECT_ONESHOT);
-#endif
-				}
 
 #ifdef DEBUG_ENABLED
-				exit_ok = true;
-				yielded = true;
+					exit_ok = true;
+					awaited = true;
 #endif
-				OPCODE_BREAK;
+					OPCODE_BREAK;
+				}
 			}
+			DISPATCH_OPCODE; // Needed for synchronous calls (when result is immediately available).
 
-			OPCODE(OPCODE_YIELD_RESUME) {
-
+			OPCODE(OPCODE_AWAIT_RESUME) {
 				CHECK_SPACE(2);
 #ifdef DEBUG_ENABLED
 				if (!p_state) {
@@ -1351,7 +1315,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			DISPATCH_OPCODE;
 
 			OPCODE(OPCODE_JUMP) {
-
 				CHECK_SPACE(2);
 				int to = _code_ptr[ip + 1];
 
@@ -1361,7 +1324,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			DISPATCH_OPCODE;
 
 			OPCODE(OPCODE_JUMP_IF) {
-
 				CHECK_SPACE(3);
 
 				GET_VARIANT_PTR(test, 1);
@@ -1379,7 +1341,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			DISPATCH_OPCODE;
 
 			OPCODE(OPCODE_JUMP_IF_NOT) {
-
 				CHECK_SPACE(3);
 
 				GET_VARIANT_PTR(test, 1);
@@ -1397,14 +1358,12 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			DISPATCH_OPCODE;
 
 			OPCODE(OPCODE_JUMP_TO_DEF_ARGUMENT) {
-
 				CHECK_SPACE(2);
 				ip = _default_arg_ptr[defarg];
 			}
 			DISPATCH_OPCODE;
 
 			OPCODE(OPCODE_RETURN) {
-
 				CHECK_SPACE(2);
 				GET_VARIANT_PTR(r, 1);
 				retvalue = *r;
@@ -1415,7 +1374,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			}
 
 			OPCODE(OPCODE_ITERATE_BEGIN) {
-
 				CHECK_SPACE(8); //space for this a regular iterate
 
 				GET_VARIANT_PTR(counter, 1);
@@ -1448,7 +1406,6 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			DISPATCH_OPCODE;
 
 			OPCODE(OPCODE_ITERATE) {
-
 				CHECK_SPACE(4);
 
 				GET_VARIANT_PTR(counter, 1);
@@ -1485,11 +1442,14 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 
 #ifdef DEBUG_ENABLED
 				GET_VARIANT_PTR(test, 1);
-				GET_VARIANT_PTR(message, 2);
 				bool result = test->booleanize();
 
 				if (!result) {
-					const String &message_str = *message;
+					String message_str;
+					if (_code_ptr[ip + 2] != 0) {
+						GET_VARIANT_PTR(message, 2);
+						message_str = *message;
+					}
 					if (message_str.empty()) {
 						err_text = "Assertion failed.";
 					} else {
@@ -1505,7 +1465,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 
 			OPCODE(OPCODE_BREAKPOINT) {
 #ifdef DEBUG_ENABLED
-				if (ScriptDebugger::get_singleton()) {
+				if (EngineDebugger::is_active()) {
 					GDScriptLanguage::get_singleton()->debug_break("Breakpoint Statement", true);
 				}
 #endif
@@ -1519,26 +1479,28 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 				line = _code_ptr[ip + 1];
 				ip += 2;
 
-				if (ScriptDebugger::get_singleton()) {
+				if (EngineDebugger::is_active()) {
 					// line
 					bool do_break = false;
 
-					if (ScriptDebugger::get_singleton()->get_lines_left() > 0) {
-
-						if (ScriptDebugger::get_singleton()->get_depth() <= 0)
-							ScriptDebugger::get_singleton()->set_lines_left(ScriptDebugger::get_singleton()->get_lines_left() - 1);
-						if (ScriptDebugger::get_singleton()->get_lines_left() <= 0)
+					if (EngineDebugger::get_script_debugger()->get_lines_left() > 0) {
+						if (EngineDebugger::get_script_debugger()->get_depth() <= 0) {
+							EngineDebugger::get_script_debugger()->set_lines_left(EngineDebugger::get_script_debugger()->get_lines_left() - 1);
+						}
+						if (EngineDebugger::get_script_debugger()->get_lines_left() <= 0) {
 							do_break = true;
+						}
 					}
 
-					if (ScriptDebugger::get_singleton()->is_breakpoint(line, source))
+					if (EngineDebugger::get_script_debugger()->is_breakpoint(line, source)) {
 						do_break = true;
+					}
 
 					if (do_break) {
 						GDScriptLanguage::get_singleton()->debug_break("Breakpoint", true);
 					}
 
-					ScriptDebugger::get_singleton()->line_poll();
+					EngineDebugger::get_singleton()->line_poll();
 				}
 			}
 			DISPATCH_OPCODE;
@@ -1560,20 +1522,24 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 
 		OPCODES_END
 #ifdef DEBUG_ENABLED
-		if (exit_ok)
+		if (exit_ok) {
 			OPCODE_OUT;
+		}
 		//error
 		// function, file, line, error, explanation
 		String err_file;
-		if (p_instance && ObjectDB::instance_validate(p_instance->owner) && p_instance->script->is_valid() && p_instance->script->path != "")
+		if (p_instance && ObjectDB::get_instance(p_instance->owner_id) != nullptr && p_instance->script->is_valid() && p_instance->script->path != "") {
 			err_file = p_instance->script->path;
-		else if (script)
+		} else if (script) {
 			err_file = script->path;
-		if (err_file == "")
+		}
+		if (err_file == "") {
 			err_file = "<built-in>";
+		}
 		String err_func = name;
-		if (p_instance && ObjectDB::instance_validate(p_instance->owner) && p_instance->script->is_valid() && p_instance->script->name != "")
+		if (p_instance && ObjectDB::get_instance(p_instance->owner_id) != nullptr && p_instance->script->is_valid() && p_instance->script->name != "") {
 			err_func = p_instance->script->name + "." + err_func;
+		}
 		int err_line = line;
 		if (err_text == "") {
 			err_text = "Internal Script Error! - opcode #" + itos(last_opcode) + " (report please).";
@@ -1600,19 +1566,21 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 		GDScriptLanguage::get_singleton()->script_frame_time += time_taken - function_call_time;
 	}
 
-	// Check if this is the last time the function is resuming from yield
-	// Will be true if never yielded as well
+	// Check if this is the last time the function is resuming from await
+	// Will be true if never awaited as well
 	// When it's the last resume it will postpone the exit from stack,
 	// so the debugger knows which function triggered the resume of the next function (if any)
-	if (!p_state || yielded) {
-		if (ScriptDebugger::get_singleton())
+	if (!p_state || awaited) {
+		if (EngineDebugger::is_active()) {
 			GDScriptLanguage::get_singleton()->exit_function();
+		}
 #endif
 
 		if (_stack_size) {
 			//free stack
-			for (int i = 0; i < _stack_size; i++)
+			for (int i = 0; i < _stack_size; i++) {
 				stack[i].~Variant();
+			}
 		}
 
 #ifdef DEBUG_ENABLED
@@ -1623,32 +1591,28 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 }
 
 const int *GDScriptFunction::get_code() const {
-
 	return _code_ptr;
 }
-int GDScriptFunction::get_code_size() const {
 
+int GDScriptFunction::get_code_size() const {
 	return _code_size;
 }
 
 Variant GDScriptFunction::get_constant(int p_idx) const {
-
 	ERR_FAIL_INDEX_V(p_idx, constants.size(), "<errconst>");
 	return constants[p_idx];
 }
 
 StringName GDScriptFunction::get_global_name(int p_idx) const {
-
 	ERR_FAIL_INDEX_V(p_idx, global_names.size(), "<errgname>");
 	return global_names[p_idx];
 }
 
 int GDScriptFunction::get_default_argument_count() const {
-
 	return _default_arg_count;
 }
-int GDScriptFunction::get_default_argument_addr(int p_idx) const {
 
+int GDScriptFunction::get_default_argument_addr(int p_idx) const {
 	ERR_FAIL_INDEX_V(p_idx, default_arguments.size(), -1);
 	return default_arguments[p_idx];
 }
@@ -1663,45 +1627,38 @@ GDScriptDataType GDScriptFunction::get_argument_type(int p_idx) const {
 }
 
 StringName GDScriptFunction::get_name() const {
-
 	return name;
 }
 
 int GDScriptFunction::get_max_stack_size() const {
-
 	return _stack_size;
 }
 
 struct _GDFKC {
-
 	int order;
 	List<int> pos;
 };
 
 struct _GDFKCS {
-
 	int order;
 	StringName id;
 	int pos;
 
 	bool operator<(const _GDFKCS &p_r) const {
-
 		return order < p_r.order;
 	}
 };
 
-void GDScriptFunction::debug_get_stack_member_state(int p_line, List<Pair<StringName, int> > *r_stackvars) const {
-
+void GDScriptFunction::debug_get_stack_member_state(int p_line, List<Pair<StringName, int>> *r_stackvars) const {
 	int oc = 0;
 	Map<StringName, _GDFKC> sdmap;
 	for (const List<StackDebug>::Element *E = stack_debug.front(); E; E = E->next()) {
-
 		const StackDebug &sd = E->get();
-		if (sd.line > p_line)
+		if (sd.line > p_line) {
 			break;
+		}
 
 		if (sd.added) {
-
 			if (!sdmap.has(sd.identifier)) {
 				_GDFKC d;
 				d.order = oc++;
@@ -1712,18 +1669,17 @@ void GDScriptFunction::debug_get_stack_member_state(int p_line, List<Pair<String
 				sdmap[sd.identifier].pos.push_back(sd.pos);
 			}
 		} else {
-
 			ERR_CONTINUE(!sdmap.has(sd.identifier));
 
 			sdmap[sd.identifier].pos.pop_back();
-			if (sdmap[sd.identifier].pos.empty())
+			if (sdmap[sd.identifier].pos.empty()) {
 				sdmap.erase(sd.identifier);
+			}
 		}
 	}
 
 	List<_GDFKCS> stackpositions;
 	for (Map<StringName, _GDFKC>::Element *E = sdmap.front(); E; E = E->next()) {
-
 		_GDFKCS spp;
 		spp.id = E->key();
 		spp.order = E->get().order;
@@ -1734,7 +1690,6 @@ void GDScriptFunction::debug_get_stack_member_state(int p_line, List<Pair<String
 	stackpositions.sort();
 
 	for (List<_GDFKCS>::Element *E = stackpositions.front(); E; E = E->next()) {
-
 		Pair<StringName, int> p;
 		p.first = E->get().id;
 		p.second = E->get().pos;
@@ -1744,21 +1699,17 @@ void GDScriptFunction::debug_get_stack_member_state(int p_line, List<Pair<String
 
 GDScriptFunction::GDScriptFunction() :
 		function_list(this) {
-
 	_stack_size = 0;
 	_call_size = 0;
 	rpc_mode = MultiplayerAPI::RPC_MODE_DISABLED;
 	name = "<anonymous>";
 #ifdef DEBUG_ENABLED
-	_func_cname = NULL;
+	_func_cname = nullptr;
 
-	if (GDScriptLanguage::get_singleton()->lock) {
-		GDScriptLanguage::get_singleton()->lock->lock();
-	}
-	GDScriptLanguage::get_singleton()->function_list.add(&function_list);
+	{
+		MutexLock lock(GDScriptLanguage::get_singleton()->lock);
 
-	if (GDScriptLanguage::get_singleton()->lock) {
-		GDScriptLanguage::get_singleton()->lock->unlock();
+		GDScriptLanguage::get_singleton()->function_list.add(&function_list);
 	}
 
 	profile.call_count = 0;
@@ -1776,26 +1727,21 @@ GDScriptFunction::GDScriptFunction() :
 
 GDScriptFunction::~GDScriptFunction() {
 #ifdef DEBUG_ENABLED
-	if (GDScriptLanguage::get_singleton()->lock) {
-		GDScriptLanguage::get_singleton()->lock->lock();
-	}
-	GDScriptLanguage::get_singleton()->function_list.remove(&function_list);
 
-	if (GDScriptLanguage::get_singleton()->lock) {
-		GDScriptLanguage::get_singleton()->lock->unlock();
-	}
+	MutexLock lock(GDScriptLanguage::get_singleton()->lock);
+
+	GDScriptLanguage::get_singleton()->function_list.remove(&function_list);
 #endif
 }
 
 /////////////////////
 
-Variant GDScriptFunctionState::_signal_callback(const Variant **p_args, int p_argcount, Variant::CallError &r_error) {
-
+Variant GDScriptFunctionState::_signal_callback(const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
 	Variant arg;
-	r_error.error = Variant::CallError::CALL_OK;
+	r_error.error = Callable::CallError::CALL_OK;
 
 	if (p_argcount == 0) {
-		r_error.error = Variant::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
+		r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
 		r_error.argument = 1;
 		return Variant();
 	} else if (p_argcount == 1) {
@@ -1813,7 +1759,7 @@ Variant GDScriptFunctionState::_signal_callback(const Variant **p_args, int p_ar
 	Ref<GDScriptFunctionState> self = *p_args[p_argcount - 1];
 
 	if (self.is_null()) {
-		r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+		r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 		r_error.argument = p_argcount - 1;
 		r_error.expected = Variant::OBJECT;
 		return Variant();
@@ -1823,38 +1769,58 @@ Variant GDScriptFunctionState::_signal_callback(const Variant **p_args, int p_ar
 }
 
 bool GDScriptFunctionState::is_valid(bool p_extended_check) const {
-
-	if (function == NULL)
+	if (function == nullptr) {
 		return false;
+	}
 
 	if (p_extended_check) {
-		//class instance gone?
-		if (state.instance_id && !ObjectDB::get_instance(state.instance_id))
+		MutexLock lock(GDScriptLanguage::get_singleton()->lock);
+
+		// Script gone?
+		if (!scripts_list.in_list()) {
+			return false;
+		}
+		// Class instance gone? (if not static function)
+		if (state.instance && !instances_list.in_list()) {
 			return false;
+		}
 	}
 
 	return true;
 }
 
 Variant GDScriptFunctionState::resume(const Variant &p_arg) {
-
 	ERR_FAIL_COND_V(!function, Variant());
-	if (state.instance_id && !ObjectDB::get_instance(state.instance_id)) {
+	{
+		MutexLock lock(GDScriptLanguage::singleton->lock);
+
+		if (!scripts_list.in_list()) {
 #ifdef DEBUG_ENABLED
-		ERR_FAIL_V_MSG(Variant(), "Resumed function '" + String(function->get_name()) + "()' after yield, but class instance is gone. At script: " + state.script->get_path() + ":" + itos(state.line));
+			ERR_FAIL_V_MSG(Variant(), "Resumed function '" + state.function_name + "()' after await, but script is gone. At script: " + state.script_path + ":" + itos(state.line));
 #else
-		return Variant();
+			return Variant();
+#endif
+		}
+		if (state.instance && !instances_list.in_list()) {
+#ifdef DEBUG_ENABLED
+			ERR_FAIL_V_MSG(Variant(), "Resumed function '" + state.function_name + "()' after await, but class instance is gone. At script: " + state.script_path + ":" + itos(state.line));
+#else
+			return Variant();
 #endif
+		}
+		// Do these now to avoid locking again after the call
+		scripts_list.remove_from_list();
+		instances_list.remove_from_list();
 	}
 
 	state.result = p_arg;
-	Variant::CallError err;
-	Variant ret = function->call(NULL, NULL, 0, err, &state);
+	Callable::CallError err;
+	Variant ret = function->call(nullptr, nullptr, 0, err, &state);
 
 	bool completed = true;
 
 	// If the return value is a GDScriptFunctionState reference,
-	// then the function did yield again after resuming.
+	// then the function did awaited again after resuming.
 	if (ret.is_ref()) {
 		GDScriptFunctionState *gdfs = Object::cast_to<GDScriptFunctionState>(ret);
 		if (gdfs && gdfs->function == function) {
@@ -1863,7 +1829,7 @@ Variant GDScriptFunctionState::resume(const Variant &p_arg) {
 		}
 	}
 
-	function = NULL; //cleaned up;
+	function = nullptr; //cleaned up;
 	state.result = Variant();
 
 	if (completed) {
@@ -1874,13 +1840,8 @@ Variant GDScriptFunctionState::resume(const Variant &p_arg) {
 		}
 
 #ifdef DEBUG_ENABLED
-		if (ScriptDebugger::get_singleton())
+		if (EngineDebugger::is_active()) {
 			GDScriptLanguage::get_singleton()->exit_function();
-		if (state.stack_size) {
-			//free stack
-			Variant *stack = (Variant *)state.stack.ptr();
-			for (int i = 0; i < state.stack_size; i++)
-				stack[i].~Variant();
 		}
 #endif
 	}
@@ -1888,8 +1849,17 @@ Variant GDScriptFunctionState::resume(const Variant &p_arg) {
 	return ret;
 }
 
-void GDScriptFunctionState::_bind_methods() {
+void GDScriptFunctionState::_clear_stack() {
+	if (state.stack_size) {
+		Variant *stack = (Variant *)state.stack.ptr();
+		for (int i = 0; i < state.stack_size; i++) {
+			stack[i].~Variant();
+		}
+		state.stack_size = 0;
+	}
+}
 
+void GDScriptFunctionState::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("resume", "arg"), &GDScriptFunctionState::resume, DEFVAL(Variant()));
 	ClassDB::bind_method(D_METHOD("is_valid", "extended_check"), &GDScriptFunctionState::is_valid, DEFVAL(false));
 	ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT, "_signal_callback", &GDScriptFunctionState::_signal_callback, MethodInfo("_signal_callback"));
@@ -1897,18 +1867,521 @@ void GDScriptFunctionState::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("completed", PropertyInfo(Variant::NIL, "result", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NIL_IS_VARIANT)));
 }
 
-GDScriptFunctionState::GDScriptFunctionState() {
-
-	function = NULL;
+GDScriptFunctionState::GDScriptFunctionState() :
+		scripts_list(this),
+		instances_list(this) {
+	function = nullptr;
 }
 
 GDScriptFunctionState::~GDScriptFunctionState() {
+	_clear_stack();
 
-	if (function != NULL) {
-		//never called, deinitialize stack
-		for (int i = 0; i < state.stack_size; i++) {
-			Variant *v = (Variant *)&state.stack[sizeof(Variant) * i];
-			v->~Variant();
+	{
+		MutexLock lock(GDScriptLanguage::singleton->lock);
+		scripts_list.remove_from_list();
+		instances_list.remove_from_list();
+	}
+}
+
+#ifdef DEBUG_ENABLED
+static String _get_variant_string(const Variant &p_variant) {
+	String txt;
+	if (p_variant.get_type() == Variant::STRING) {
+		txt = "\"" + String(p_variant) + "\"";
+	} else if (p_variant.get_type() == Variant::STRING_NAME) {
+		txt = "&\"" + String(p_variant) + "\"";
+	} else if (p_variant.get_type() == Variant::NODE_PATH) {
+		txt = "^\"" + String(p_variant) + "\"";
+	} else if (p_variant.get_type() == Variant::OBJECT) {
+		Object *obj = p_variant;
+		if (!obj) {
+			txt = "null";
+		} else {
+			GDScriptNativeClass *cls = Object::cast_to<GDScriptNativeClass>(obj);
+			if (cls) {
+				txt += cls->get_name();
+				txt += " (class)";
+			} else {
+				txt = obj->get_class();
+				if (obj->get_script_instance()) {
+					txt += "(" + obj->get_script_instance()->get_script()->get_path() + ")";
+				}
+			}
 		}
+	} else {
+		txt = p_variant;
+	}
+	return txt;
+}
+
+static String _disassemble_address(const GDScript *p_script, const GDScriptFunction &p_function, int p_address) {
+	int addr = p_address & GDScriptFunction::ADDR_MASK;
+
+	switch (p_address >> GDScriptFunction::ADDR_BITS) {
+		case GDScriptFunction::ADDR_TYPE_SELF: {
+			return "self";
+		} break;
+		case GDScriptFunction::ADDR_TYPE_CLASS: {
+			return "class";
+		} break;
+		case GDScriptFunction::ADDR_TYPE_MEMBER: {
+			return "member(" + p_script->debug_get_member_by_index(addr) + ")";
+		} break;
+		case GDScriptFunction::ADDR_TYPE_CLASS_CONSTANT: {
+			return "class_const(" + p_function.get_global_name(addr) + ")";
+		} break;
+		case GDScriptFunction::ADDR_TYPE_LOCAL_CONSTANT: {
+			return "const(" + _get_variant_string(p_function.get_constant(addr)) + ")";
+		} break;
+		case GDScriptFunction::ADDR_TYPE_STACK: {
+			return "stack(" + itos(addr) + ")";
+		} break;
+		case GDScriptFunction::ADDR_TYPE_STACK_VARIABLE: {
+			return "var_stack(" + itos(addr) + ")";
+		} break;
+		case GDScriptFunction::ADDR_TYPE_GLOBAL: {
+			return "global(" + _get_variant_string(GDScriptLanguage::get_singleton()->get_global_array()[addr]) + ")";
+		} break;
+		case GDScriptFunction::ADDR_TYPE_NAMED_GLOBAL: {
+			return "named_global(" + p_function.get_global_name(addr) + ")";
+		} break;
+		case GDScriptFunction::ADDR_TYPE_NIL: {
+			return "nil";
+		} break;
 	}
+
+	return "<err>";
 }
+
+void GDScriptFunction::disassemble(const Vector<String> &p_code_lines) const {
+#define DADDR(m_ip) (_disassemble_address(_script, *this, _code_ptr[ip + m_ip]))
+
+	for (int ip = 0; ip < _code_size;) {
+		StringBuilder text;
+		int incr = 0;
+
+		text += " ";
+		text += itos(ip);
+		text += ": ";
+
+		// This makes the compiler complain if some opcode is unchecked in the switch.
+		Opcode code = Opcode(_code_ptr[ip]);
+
+		switch (code) {
+			case OPCODE_OPERATOR: {
+				int operation = _code_ptr[ip + 1];
+
+				text += "operator ";
+
+				text += DADDR(4);
+				text += " = ";
+				text += DADDR(2);
+				text += " ";
+				text += Variant::get_operator_name(Variant::Operator(operation));
+				text += " ";
+				text += DADDR(3);
+
+				incr += 5;
+			} break;
+			case OPCODE_EXTENDS_TEST: {
+				text += "is object ";
+				text += DADDR(3);
+				text += " = ";
+				text += DADDR(1);
+				text += " is ";
+				text += DADDR(2);
+
+				incr += 4;
+			} break;
+			case OPCODE_IS_BUILTIN: {
+				text += "is builtin ";
+				text += DADDR(3);
+				text += " = ";
+				text += DADDR(1);
+				text += " is ";
+				text += Variant::get_type_name(Variant::Type(_code_ptr[ip + 2]));
+
+				incr += 4;
+			} break;
+			case OPCODE_SET: {
+				text += "set ";
+				text += DADDR(1);
+				text += "[";
+				text += DADDR(2);
+				text += "] = ";
+				text += DADDR(3);
+
+				incr += 4;
+			} break;
+			case OPCODE_GET: {
+				text += "get ";
+				text += DADDR(3);
+				text += " = ";
+				text += DADDR(1);
+				text += "[";
+				text += DADDR(2);
+				text += "]";
+
+				incr += 4;
+			} break;
+			case OPCODE_SET_NAMED: {
+				text += "set_named ";
+				text += DADDR(1);
+				text += "[\"";
+				text += _global_names_ptr[_code_ptr[ip + 2]];
+				text += "\"] = ";
+				text += DADDR(3);
+
+				incr += 4;
+			} break;
+			case OPCODE_GET_NAMED: {
+				text += "get_named ";
+				text += DADDR(3);
+				text += " = ";
+				text += DADDR(1);
+				text += "[\"";
+				text += _global_names_ptr[_code_ptr[ip + 2]];
+				text += "\"]";
+
+				incr += 4;
+			} break;
+			case OPCODE_SET_MEMBER: {
+				text += "set_member ";
+				text += "[\"";
+				text += _global_names_ptr[_code_ptr[ip + 1]];
+				text += "\"] = ";
+				text += DADDR(2);
+
+				incr += 3;
+			} break;
+			case OPCODE_GET_MEMBER: {
+				text += "get_member ";
+				text += DADDR(2);
+				text += " = ";
+				text += "[\"";
+				text += _global_names_ptr[_code_ptr[ip + 1]];
+				text += "\"]";
+
+				incr += 3;
+			} break;
+			case OPCODE_ASSIGN: {
+				text += "assign ";
+				text += DADDR(1);
+				text += " = ";
+				text += DADDR(2);
+
+				incr += 3;
+			} break;
+			case OPCODE_ASSIGN_TRUE: {
+				text += "assign ";
+				text += DADDR(1);
+				text += " = true";
+
+				incr += 2;
+			} break;
+			case OPCODE_ASSIGN_FALSE: {
+				text += "assign ";
+				text += DADDR(1);
+				text += " = false";
+
+				incr += 2;
+			} break;
+			case OPCODE_ASSIGN_TYPED_BUILTIN: {
+				text += "assign typed builtin (";
+				text += Variant::get_type_name((Variant::Type)_code_ptr[ip + 1]);
+				text += ") ";
+				text += DADDR(2);
+				text += " = ";
+				text += DADDR(3);
+
+				incr += 4;
+			} break;
+			case OPCODE_ASSIGN_TYPED_NATIVE: {
+				Variant class_name = _constants_ptr[_code_ptr[ip + 1]];
+				GDScriptNativeClass *nc = Object::cast_to<GDScriptNativeClass>(class_name.operator Object *());
+
+				text += "assign typed native (";
+				text += nc->get_name().operator String();
+				text += ") ";
+				text += DADDR(2);
+				text += " = ";
+				text += DADDR(3);
+
+				incr += 4;
+			} break;
+			case OPCODE_ASSIGN_TYPED_SCRIPT: {
+				Variant script = _constants_ptr[_code_ptr[ip + 1]];
+				Script *sc = Object::cast_to<Script>(script.operator Object *());
+
+				text += "assign typed script (";
+				text += sc->get_path();
+				text += ") ";
+				text += DADDR(2);
+				text += " = ";
+				text += DADDR(3);
+
+				incr += 4;
+			} break;
+			case OPCODE_CAST_TO_BUILTIN: {
+				text += "cast builtin ";
+				text += DADDR(3);
+				text += " = ";
+				text += DADDR(2);
+				text += " as ";
+				text += Variant::get_type_name(Variant::Type(_code_ptr[ip + 1]));
+
+				incr += 4;
+			} break;
+			case OPCODE_CAST_TO_NATIVE: {
+				Variant class_name = _constants_ptr[_code_ptr[ip + 1]];
+				GDScriptNativeClass *nc = Object::cast_to<GDScriptNativeClass>(class_name.operator Object *());
+
+				text += "cast native ";
+				text += DADDR(3);
+				text += " = ";
+				text += DADDR(2);
+				text += " as ";
+				text += nc->get_name();
+
+				incr += 4;
+			} break;
+			case OPCODE_CAST_TO_SCRIPT: {
+				text += "cast ";
+				text += DADDR(3);
+				text += " = ";
+				text += DADDR(2);
+				text += " as ";
+				text += DADDR(1);
+
+				incr += 4;
+			} break;
+			case OPCODE_CONSTRUCT: {
+				Variant::Type t = Variant::Type(_code_ptr[ip + 1]);
+				int argc = _code_ptr[ip + 2];
+
+				text += "construct ";
+				text += DADDR(3 + argc);
+				text += " = ";
+
+				text += Variant::get_type_name(t) + "(";
+				for (int i = 0; i < argc; i++) {
+					if (i > 0)
+						text += ", ";
+					text += DADDR(i + 3);
+				}
+				text += ")";
+
+				incr = 4 + argc;
+			} break;
+			case OPCODE_CONSTRUCT_ARRAY: {
+				int argc = _code_ptr[ip + 1];
+				text += " make_array ";
+				text += DADDR(2 + argc);
+				text += " = [";
+
+				for (int i = 0; i < argc; i++) {
+					if (i > 0)
+						text += ", ";
+					text += DADDR(2 + i);
+				}
+
+				text += "]";
+
+				incr += 3 + argc;
+			} break;
+			case OPCODE_CONSTRUCT_DICTIONARY: {
+				int argc = _code_ptr[ip + 1];
+				text += "make_dict ";
+				text += DADDR(2 + argc * 2);
+				text += " = {";
+
+				for (int i = 0; i < argc; i++) {
+					if (i > 0)
+						text += ", ";
+					text += DADDR(2 + i * 2 + 0);
+					text += ": ";
+					text += DADDR(2 + i * 2 + 1);
+				}
+
+				text += "}";
+
+				incr += 3 + argc * 2;
+			} break;
+			case OPCODE_CALL:
+			case OPCODE_CALL_RETURN:
+			case OPCODE_CALL_ASYNC: {
+				bool ret = _code_ptr[ip] == OPCODE_CALL_RETURN;
+				bool async = _code_ptr[ip] == OPCODE_CALL_ASYNC;
+
+				if (ret) {
+					text += "call-ret ";
+				} else if (async) {
+					text += "call-async ";
+				} else {
+					text += "call ";
+				}
+
+				int argc = _code_ptr[ip + 1];
+				if (ret || async) {
+					text += DADDR(4 + argc) + " = ";
+				}
+
+				text += DADDR(2) + ".";
+				text += String(_global_names_ptr[_code_ptr[ip + 3]]);
+				text += "(";
+
+				for (int i = 0; i < argc; i++) {
+					if (i > 0)
+						text += ", ";
+					text += DADDR(4 + i);
+				}
+				text += ")";
+
+				incr = 5 + argc;
+			} break;
+			case OPCODE_CALL_BUILT_IN: {
+				text += "call-built-in ";
+
+				int argc = _code_ptr[ip + 2];
+				text += DADDR(3 + argc) + " = ";
+
+				text += GDScriptFunctions::get_func_name(GDScriptFunctions::Function(_code_ptr[ip + 1]));
+				text += "(";
+
+				for (int i = 0; i < argc; i++) {
+					if (i > 0)
+						text += ", ";
+					text += DADDR(3 + i);
+				}
+				text += ")";
+
+				incr = 4 + argc;
+			} break;
+			case OPCODE_CALL_SELF_BASE: {
+				text += "call-self-base ";
+
+				int argc = _code_ptr[ip + 2];
+				text += DADDR(3 + argc) + " = ";
+
+				text += _global_names_ptr[_code_ptr[ip + 1]];
+				text += "(";
+
+				for (int i = 0; i < argc; i++) {
+					if (i > 0)
+						text += ", ";
+					text += DADDR(3 + i);
+				}
+				text += ")";
+
+				incr = 4 + argc;
+			} break;
+			case OPCODE_AWAIT: {
+				text += "await ";
+				text += DADDR(1);
+
+				incr += 2;
+			} break;
+			case OPCODE_AWAIT_RESUME: {
+				text += "await resume ";
+				text += DADDR(1);
+
+				incr = 2;
+			} break;
+			case OPCODE_JUMP: {
+				text += "jump ";
+				text += itos(_code_ptr[ip + 1]);
+
+				incr = 2;
+			} break;
+			case OPCODE_JUMP_IF: {
+				text += "jump-if ";
+				text += DADDR(1);
+				text += " to ";
+				text += itos(_code_ptr[ip + 2]);
+
+				incr = 3;
+			} break;
+			case OPCODE_JUMP_IF_NOT: {
+				text += "jump-if-not ";
+				text += DADDR(1);
+				text += " to ";
+				text += itos(_code_ptr[ip + 2]);
+
+				incr = 3;
+			} break;
+			case OPCODE_JUMP_TO_DEF_ARGUMENT: {
+				text += "jump-to-default-argument ";
+
+				incr = 1;
+			} break;
+			case OPCODE_RETURN: {
+				text += "return ";
+				text += DADDR(1);
+
+				incr = 2;
+			} break;
+			case OPCODE_ITERATE_BEGIN: {
+				text += "for-init ";
+				text += DADDR(4);
+				text += " in ";
+				text += DADDR(2);
+				text += " counter ";
+				text += DADDR(1);
+				text += " end ";
+				text += itos(_code_ptr[ip + 3]);
+
+				incr += 5;
+			} break;
+			case OPCODE_ITERATE: {
+				text += "for-loop ";
+				text += DADDR(4);
+				text += " in ";
+				text += DADDR(2);
+				text += " counter ";
+				text += DADDR(1);
+				text += " end ";
+				text += itos(_code_ptr[ip + 3]);
+
+				incr += 5;
+			} break;
+			case OPCODE_LINE: {
+				int line = _code_ptr[ip + 1] - 1;
+				if (line >= 0 && line < p_code_lines.size()) {
+					text += "line ";
+					text += itos(line + 1);
+					text += ": ";
+					text += p_code_lines[line];
+				} else {
+					text += "";
+				}
+
+				incr += 2;
+			} break;
+			case OPCODE_ASSERT: {
+				text += "assert (";
+				text += DADDR(1);
+				text += ", ";
+				text += DADDR(2);
+				text += ")";
+
+				incr += 3;
+			} break;
+			case OPCODE_BREAKPOINT: {
+				text += "breakpoint";
+
+				incr += 1;
+			} break;
+			case OPCODE_END: {
+				text += "== END ==";
+
+				incr += 1;
+			} break;
+		}
+
+		ip += incr;
+		if (text.get_string_length() > 0) {
+			print_line(text.as_string());
+		}
+	}
+}
+#endif
diff --git a/modules/gdscript/gdscript_function.h b/modules/gdscript/gdscript_function.h
index ad95ebc543..c98ac09310 100644
--- a/modules/gdscript/gdscript_function.h
+++ b/modules/gdscript/gdscript_function.h
@@ -43,20 +43,26 @@ class GDScriptInstance;
 class GDScript;
 
 struct GDScriptDataType {
-	bool has_type;
-	enum {
+	enum Kind {
 		UNINITIALIZED,
 		BUILTIN,
 		NATIVE,
 		SCRIPT,
 		GDSCRIPT,
-	} kind;
-	Variant::Type builtin_type;
+	};
+
+	Kind kind = UNINITIALIZED;
+
+	bool has_type = false;
+	Variant::Type builtin_type = Variant::NIL;
 	StringName native_type;
-	Ref<Script> script_type;
+	Script *script_type = nullptr;
+	Ref<Script> script_type_ref;
 
 	bool is_type(const Variant &p_variant, bool p_allow_implicit_conversion = false) const {
-		if (!has_type) return true; // Can't type check
+		if (!has_type) {
+			return true; // Can't type check
+		}
 
 		switch (kind) {
 			case UNINITIALIZED:
@@ -77,8 +83,8 @@ struct GDScriptDataType {
 					return false;
 				}
 
-				Object *obj = p_variant.operator Object *();
-				if (!obj || !ObjectDB::instance_validate(obj)) {
+				Object *obj = p_variant.get_validated_object();
+				if (!obj) {
 					return false;
 				}
 
@@ -100,12 +106,12 @@ struct GDScriptDataType {
 					return false;
 				}
 
-				Object *obj = p_variant.operator Object *();
-				if (!obj || !ObjectDB::instance_validate(obj)) {
+				Object *obj = p_variant.get_validated_object();
+				if (!obj) {
 					return false;
 				}
 
-				Ref<Script> base = obj && obj->get_script_instance() ? obj->get_script_instance()->get_script() : NULL;
+				Ref<Script> base = obj && obj->get_script_instance() ? obj->get_script_instance()->get_script() : nullptr;
 				bool valid = false;
 				while (base.is_valid()) {
 					if (base == script_type) {
@@ -146,10 +152,7 @@ struct GDScriptDataType {
 		return info;
 	}
 
-	GDScriptDataType() :
-			has_type(false),
-			kind(UNINITIALIZED),
-			builtin_type(Variant::NIL) {}
+	GDScriptDataType() {}
 };
 
 class GDScriptFunction {
@@ -178,12 +181,11 @@ public:
 		OPCODE_CONSTRUCT_DICTIONARY,
 		OPCODE_CALL,
 		OPCODE_CALL_RETURN,
+		OPCODE_CALL_ASYNC,
 		OPCODE_CALL_BUILT_IN,
-		OPCODE_CALL_SELF,
 		OPCODE_CALL_SELF_BASE,
-		OPCODE_YIELD,
-		OPCODE_YIELD_SIGNAL,
-		OPCODE_YIELD_RESUME,
+		OPCODE_AWAIT,
+		OPCODE_AWAIT_RESUME,
 		OPCODE_JUMP,
 		OPCODE_JUMP_IF,
 		OPCODE_JUMP_IF_NOT,
@@ -214,7 +216,6 @@ public:
 	};
 
 	struct StackDebug {
-
 		int line;
 		int pos;
 		bool added;
@@ -223,6 +224,7 @@ public:
 
 private:
 	friend class GDScriptCompiler;
+	friend class GDScriptByteCodeGenerator;
 
 	StringName source;
 
@@ -231,10 +233,6 @@ private:
 	int _constant_count;
 	const StringName *_global_names_ptr;
 	int _global_names_count;
-#ifdef TOOLS_ENABLED
-	const StringName *_named_globals_ptr;
-	int _named_globals_count;
-#endif
 	const int *_default_arg_ptr;
 	int _default_arg_count;
 	const int *_code_ptr;
@@ -251,9 +249,6 @@ private:
 	StringName name;
 	Vector<Variant> constants;
 	Vector<StringName> global_names;
-#ifdef TOOLS_ENABLED
-	Vector<StringName> named_globals;
-#endif
 	Vector<int> default_arguments;
 	Vector<int> code;
 	Vector<GDScriptDataType> argument_types;
@@ -265,8 +260,8 @@ private:
 
 	List<StackDebug> stack_debug;
 
-	_FORCE_INLINE_ Variant *_get_variant(int p_address, GDScriptInstance *p_instance, GDScript *p_script, Variant &self, Variant *p_stack, String &r_error) const;
-	_FORCE_INLINE_ String _get_call_error(const Variant::CallError &p_err, const String &p_where, const Variant **argptrs) const;
+	_FORCE_INLINE_ Variant *_get_variant(int p_address, GDScriptInstance *p_instance, GDScript *p_script, Variant &self, Variant &static_ref, Variant *p_stack, String &r_error) const;
+	_FORCE_INLINE_ String _get_call_error(const Callable::CallError &p_err, const String &p_where, const Variant **argptrs) const;
 
 	friend class GDScriptLanguage;
 
@@ -292,14 +287,16 @@ private:
 
 public:
 	struct CallState {
-
-		ObjectID instance_id;
+		GDScript *script;
 		GDScriptInstance *instance;
+#ifdef DEBUG_ENABLED
+		StringName function_name;
+		String script_path;
+#endif
 		Vector<uint8_t> stack;
 		int stack_size;
 		Variant self;
 		uint32_t alloca_size;
-		Ref<GDScript> script;
 		int ip;
 		int line;
 		int defarg;
@@ -321,7 +318,7 @@ public:
 	GDScript *get_script() const { return _script; }
 	StringName get_source() const { return source; }
 
-	void debug_get_stack_member_state(int p_line, List<Pair<StringName, int> > *r_stackvars) const;
+	void debug_get_stack_member_state(int p_line, List<Pair<StringName, int>> *r_stackvars) const;
 
 	_FORCE_INLINE_ bool is_empty() const { return _code_size == 0; }
 
@@ -339,7 +336,11 @@ public:
 		return default_arguments[p_idx];
 	}
 
-	Variant call(GDScriptInstance *p_instance, const Variant **p_args, int p_argcount, Variant::CallError &r_err, CallState *p_state = NULL);
+	Variant call(GDScriptInstance *p_instance, const Variant **p_args, int p_argcount, Callable::CallError &r_err, CallState *p_state = nullptr);
+
+#ifdef DEBUG_ENABLED
+	void disassemble(const Vector<String> &p_code_lines) const;
+#endif
 
 	_FORCE_INLINE_ MultiplayerAPI::RPCMode get_rpc_mode() const { return rpc_mode; }
 	GDScriptFunction();
@@ -347,20 +348,25 @@ public:
 };
 
 class GDScriptFunctionState : public Reference {
-
 	GDCLASS(GDScriptFunctionState, Reference);
 	friend class GDScriptFunction;
 	GDScriptFunction *function;
 	GDScriptFunction::CallState state;
-	Variant _signal_callback(const Variant **p_args, int p_argcount, Variant::CallError &r_error);
+	Variant _signal_callback(const Variant **p_args, int p_argcount, Callable::CallError &r_error);
 	Ref<GDScriptFunctionState> first_state;
 
+	SelfList<GDScriptFunctionState> scripts_list;
+	SelfList<GDScriptFunctionState> instances_list;
+
 protected:
 	static void _bind_methods();
 
 public:
 	bool is_valid(bool p_extended_check = false) const;
 	Variant resume(const Variant &p_arg = Variant());
+
+	void _clear_stack();
+
 	GDScriptFunctionState();
 	~GDScriptFunctionState();
 };
diff --git a/modules/gdscript/gdscript_functions.cpp b/modules/gdscript/gdscript_functions.cpp
index 01d62a1c62..31ce63bc6e 100644
--- a/modules/gdscript/gdscript_functions.cpp
+++ b/modules/gdscript/gdscript_functions.cpp
@@ -41,7 +41,6 @@
 #include "gdscript.h"
 
 const char *GDScriptFunctions::get_func_name(Function p_func) {
-
 	ERR_FAIL_INDEX_V(p_func, FUNC_MAX, "");
 
 	static const char *_names[FUNC_MAX] = {
@@ -72,7 +71,6 @@ const char *GDScriptFunctions::get_func_name(Function p_func) {
 		"is_equal_approx",
 		"is_zero_approx",
 		"ease",
-		"decimals",
 		"step_decimals",
 		"stepify",
 		"lerp",
@@ -140,32 +138,33 @@ const char *GDScriptFunctions::get_func_name(Function p_func) {
 	return _names[p_func];
 }
 
-void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_count, Variant &r_ret, Variant::CallError &r_error) {
-
-	r_error.error = Variant::CallError::CALL_OK;
+void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_count, Variant &r_ret, Callable::CallError &r_error) {
+	r_error.error = Callable::CallError::CALL_OK;
 #ifdef DEBUG_ENABLED
 
-#define VALIDATE_ARG_COUNT(m_count)                                        \
-	if (p_arg_count < m_count) {                                           \
-		r_error.error = Variant::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;  \
-		r_error.argument = m_count;                                        \
-		r_ret = Variant();                                                 \
-		return;                                                            \
-	}                                                                      \
-	if (p_arg_count > m_count) {                                           \
-		r_error.error = Variant::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS; \
-		r_error.argument = m_count;                                        \
-		r_ret = Variant();                                                 \
-		return;                                                            \
+#define VALIDATE_ARG_COUNT(m_count)                                         \
+	if (p_arg_count < m_count) {                                            \
+		r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;  \
+		r_error.argument = m_count;                                         \
+		r_error.expected = m_count;                                         \
+		r_ret = Variant();                                                  \
+		return;                                                             \
+	}                                                                       \
+	if (p_arg_count > m_count) {                                            \
+		r_error.error = Callable::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS; \
+		r_error.argument = m_count;                                         \
+		r_error.expected = m_count;                                         \
+		r_ret = Variant();                                                  \
+		return;                                                             \
 	}
 
-#define VALIDATE_ARG_NUM(m_arg)                                          \
-	if (!p_args[m_arg]->is_num()) {                                      \
-		r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT; \
-		r_error.argument = m_arg;                                        \
-		r_error.expected = Variant::REAL;                                \
-		r_ret = Variant();                                               \
-		return;                                                          \
+#define VALIDATE_ARG_NUM(m_arg)                                           \
+	if (!p_args[m_arg]->is_num()) {                                       \
+		r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; \
+		r_error.argument = m_arg;                                         \
+		r_error.expected = Variant::FLOAT;                                \
+		r_ret = Variant();                                                \
+		return;                                                           \
 	}
 
 #else
@@ -177,7 +176,6 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 	//using a switch, so the compiler generates a jumptable
 
 	switch (p_func) {
-
 		case MATH_SIN: {
 			VALIDATE_ARG_COUNT(1);
 			VALIDATE_ARG_NUM(0);
@@ -270,36 +268,30 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 		case MATH_ABS: {
 			VALIDATE_ARG_COUNT(1);
 			if (p_args[0]->get_type() == Variant::INT) {
-
 				int64_t i = *p_args[0];
 				r_ret = ABS(i);
-			} else if (p_args[0]->get_type() == Variant::REAL) {
-
+			} else if (p_args[0]->get_type() == Variant::FLOAT) {
 				double r = *p_args[0];
 				r_ret = Math::abs(r);
 			} else {
-
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
-				r_error.expected = Variant::REAL;
+				r_error.expected = Variant::FLOAT;
 				r_ret = Variant();
 			}
 		} break;
 		case MATH_SIGN: {
 			VALIDATE_ARG_COUNT(1);
 			if (p_args[0]->get_type() == Variant::INT) {
-
 				int64_t i = *p_args[0];
 				r_ret = i < 0 ? -1 : (i > 0 ? +1 : 0);
-			} else if (p_args[0]->get_type() == Variant::REAL) {
-
+			} else if (p_args[0]->get_type() == Variant::FLOAT) {
 				real_t r = *p_args[0];
 				r_ret = r < 0.0 ? -1.0 : (r > 0.0 ? +1.0 : 0.0);
 			} else {
-
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
-				r_error.expected = Variant::REAL;
+				r_error.expected = Variant::FLOAT;
 				r_ret = Variant();
 			}
 		} break;
@@ -346,12 +338,6 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 			VALIDATE_ARG_NUM(1);
 			r_ret = Math::ease((double)*p_args[0], (double)*p_args[1]);
 		} break;
-		case MATH_DECIMALS: {
-			VALIDATE_ARG_COUNT(1);
-			VALIDATE_ARG_NUM(0);
-			r_ret = Math::step_decimals((double)*p_args[0]);
-			WARN_DEPRECATED_MSG("GDScript method 'decimals' is deprecated and has been renamed to 'step_decimals', please update your code accordingly.");
-		} break;
 		case MATH_STEP_DECIMALS: {
 			VALIDATE_ARG_COUNT(1);
 			VALIDATE_ARG_NUM(0);
@@ -367,15 +353,15 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 			VALIDATE_ARG_COUNT(3);
 			VALIDATE_ARG_NUM(2);
 			const double t = (double)*p_args[2];
-			switch (p_args[0]->get_type() == p_args[1]->get_type() ? p_args[0]->get_type() : Variant::REAL) {
+			switch (p_args[0]->get_type() == p_args[1]->get_type() ? p_args[0]->get_type() : Variant::FLOAT) {
 				case Variant::VECTOR2: {
-					r_ret = ((Vector2)*p_args[0]).linear_interpolate((Vector2)*p_args[1], t);
+					r_ret = ((Vector2)*p_args[0]).lerp((Vector2)*p_args[1], t);
 				} break;
 				case Variant::VECTOR3: {
-					r_ret = ((Vector3)*p_args[0]).linear_interpolate((Vector3)*p_args[1], t);
+					r_ret = (p_args[0]->operator Vector3()).lerp(p_args[1]->operator Vector3(), t);
 				} break;
 				case Variant::COLOR: {
-					r_ret = ((Color)*p_args[0]).linear_interpolate((Color)*p_args[1], t);
+					r_ret = ((Color)*p_args[0]).lerp((Color)*p_args[1], t);
 				} break;
 				default: {
 					VALIDATE_ARG_NUM(0);
@@ -512,7 +498,6 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 		case LOGIC_MAX: {
 			VALIDATE_ARG_COUNT(2);
 			if (p_args[0]->get_type() == Variant::INT && p_args[1]->get_type() == Variant::INT) {
-
 				int64_t a = *p_args[0];
 				int64_t b = *p_args[1];
 				r_ret = MAX(a, b);
@@ -530,7 +515,6 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 		case LOGIC_MIN: {
 			VALIDATE_ARG_COUNT(2);
 			if (p_args[0]->get_type() == Variant::INT && p_args[1]->get_type() == Variant::INT) {
-
 				int64_t a = *p_args[0];
 				int64_t b = *p_args[1];
 				r_ret = MIN(a, b);
@@ -547,7 +531,6 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 		case LOGIC_CLAMP: {
 			VALIDATE_ARG_COUNT(3);
 			if (p_args[0]->get_type() == Variant::INT && p_args[1]->get_type() == Variant::INT && p_args[2]->get_type() == Variant::INT) {
-
 				int64_t a = *p_args[0];
 				int64_t b = *p_args[1];
 				int64_t c = *p_args[2];
@@ -592,7 +575,7 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 				Ref<WeakRef> wref = memnew(WeakRef);
 				r_ret = wref;
 			} else {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
 				r_error.expected = Variant::OBJECT;
 				r_ret = Variant();
@@ -602,16 +585,14 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 		case FUNC_FUNCREF: {
 			VALIDATE_ARG_COUNT(2);
 			if (p_args[0]->get_type() != Variant::OBJECT) {
-
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
 				r_error.expected = Variant::OBJECT;
 				r_ret = Variant();
 				return;
 			}
 			if (p_args[1]->get_type() != Variant::STRING && p_args[1]->get_type() != Variant::NODE_PATH) {
-
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 1;
 				r_error.expected = Variant::STRING;
 				r_ret = Variant();
@@ -631,26 +612,22 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 			VALIDATE_ARG_NUM(1);
 			int type = *p_args[1];
 			if (type < 0 || type >= Variant::VARIANT_MAX) {
-
 				r_ret = RTR("Invalid type argument to convert(), use TYPE_* constants.");
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
 				r_error.expected = Variant::INT;
 				return;
 
 			} else {
-
 				r_ret = Variant::construct(Variant::Type(type), p_args, 1, r_error);
 			}
 		} break;
 		case TYPE_OF: {
-
 			VALIDATE_ARG_COUNT(1);
 			r_ret = p_args[0]->get_type();
 
 		} break;
 		case TYPE_EXISTS: {
-
 			VALIDATE_ARG_COUNT(1);
 			r_ret = ClassDB::class_exists(*p_args[0]);
 
@@ -658,16 +635,14 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 		case TEXT_CHAR: {
 			VALIDATE_ARG_COUNT(1);
 			VALIDATE_ARG_NUM(0);
-			CharType result[2] = { *p_args[0], 0 };
+			char32_t result[2] = { *p_args[0], 0 };
 			r_ret = String(result);
 		} break;
 		case TEXT_ORD: {
-
 			VALIDATE_ARG_COUNT(1);
 
 			if (p_args[0]->get_type() != Variant::STRING) {
-
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
 				r_error.expected = Variant::STRING;
 				r_ret = Variant();
@@ -677,8 +652,7 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 			String str = p_args[0]->operator String();
 
 			if (str.length() != 1) {
-
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
 				r_error.expected = Variant::STRING;
 				r_ret = RTR("Expected a string of length 1 (a character).");
@@ -690,7 +664,7 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 		} break;
 		case TEXT_STR: {
 			if (p_arg_count < 1) {
-				r_error.error = Variant::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
+				r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
 				r_error.argument = 1;
 				r_ret = Variant();
 
@@ -698,23 +672,21 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 			}
 			String str;
 			for (int i = 0; i < p_arg_count; i++) {
-
 				String os = p_args[i]->operator String();
 
-				if (i == 0)
+				if (i == 0) {
 					str = os;
-				else
+				} else {
 					str += os;
+				}
 			}
 
 			r_ret = str;
 
 		} break;
 		case TEXT_PRINT: {
-
 			String str;
 			for (int i = 0; i < p_arg_count; i++) {
-
 				str += p_args[i]->operator String();
 			}
 
@@ -723,12 +695,11 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 
 		} break;
 		case TEXT_PRINT_TABBED: {
-
 			String str;
 			for (int i = 0; i < p_arg_count; i++) {
-
-				if (i)
+				if (i) {
 					str += "\t";
+				}
 				str += p_args[i]->operator String();
 			}
 
@@ -737,12 +708,11 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 
 		} break;
 		case TEXT_PRINT_SPACED: {
-
 			String str;
 			for (int i = 0; i < p_arg_count; i++) {
-
-				if (i)
+				if (i) {
 					str += " ";
+				}
 				str += p_args[i]->operator String();
 			}
 
@@ -752,10 +722,8 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 		} break;
 
 		case TEXT_PRINTERR: {
-
 			String str;
 			for (int i = 0; i < p_arg_count; i++) {
-
 				str += p_args[i]->operator String();
 			}
 
@@ -766,7 +734,6 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 		case TEXT_PRINTRAW: {
 			String str;
 			for (int i = 0; i < p_arg_count; i++) {
-
 				str += p_args[i]->operator String();
 			}
 
@@ -777,7 +744,6 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 		case TEXT_PRINT_DEBUG: {
 			String str;
 			for (int i = 0; i < p_arg_count; i++) {
-
 				str += p_args[i]->operator String();
 			}
 
@@ -792,7 +758,7 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 		case PUSH_ERROR: {
 			VALIDATE_ARG_COUNT(1);
 			if (p_args[0]->get_type() != Variant::STRING) {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
 				r_error.expected = Variant::STRING;
 				r_ret = Variant();
@@ -800,13 +766,13 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 			}
 
 			String message = *p_args[0];
-			ERR_PRINTS(message);
+			ERR_PRINT(message);
 			r_ret = Variant();
 		} break;
 		case PUSH_WARNING: {
 			VALIDATE_ARG_COUNT(1);
 			if (p_args[0]->get_type() != Variant::STRING) {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
 				r_error.expected = Variant::STRING;
 				r_ret = Variant();
@@ -814,7 +780,7 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 			}
 
 			String message = *p_args[0];
-			WARN_PRINTS(message);
+			WARN_PRINT(message);
 			r_ret = Variant();
 		} break;
 		case VAR_TO_STR: {
@@ -826,7 +792,7 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 		case STR_TO_VAR: {
 			VALIDATE_ARG_COUNT(1);
 			if (p_args[0]->get_type() != Variant::STRING) {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
 				r_error.expected = Variant::STRING;
 				r_ret = Variant();
@@ -844,17 +810,17 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 		case VAR_TO_BYTES: {
 			bool full_objects = false;
 			if (p_arg_count < 1) {
-				r_error.error = Variant::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
+				r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
 				r_error.argument = 1;
 				r_ret = Variant();
 				return;
 			} else if (p_arg_count > 2) {
-				r_error.error = Variant::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS;
+				r_error.error = Callable::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS;
 				r_error.argument = 2;
 				r_ret = Variant();
 			} else if (p_arg_count == 2) {
 				if (p_args[1]->get_type() != Variant::BOOL) {
-					r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+					r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 					r_error.argument = 1;
 					r_error.expected = Variant::BOOL;
 					r_ret = Variant();
@@ -863,11 +829,11 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 				full_objects = *p_args[1];
 			}
 
-			PoolByteArray barr;
+			PackedByteArray barr;
 			int len;
-			Error err = encode_variant(*p_args[0], NULL, len, full_objects);
+			Error err = encode_variant(*p_args[0], nullptr, len, full_objects);
 			if (err) {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
 				r_error.expected = Variant::NIL;
 				r_ret = "Unexpected error encoding variable to bytes, likely unserializable type found (Object or RID).";
@@ -876,25 +842,25 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 
 			barr.resize(len);
 			{
-				PoolByteArray::Write w = barr.write();
-				encode_variant(*p_args[0], w.ptr(), len, full_objects);
+				uint8_t *w = barr.ptrw();
+				encode_variant(*p_args[0], w, len, full_objects);
 			}
 			r_ret = barr;
 		} break;
 		case BYTES_TO_VAR: {
 			bool allow_objects = false;
 			if (p_arg_count < 1) {
-				r_error.error = Variant::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
+				r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
 				r_error.argument = 1;
 				r_ret = Variant();
 				return;
 			} else if (p_arg_count > 2) {
-				r_error.error = Variant::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS;
+				r_error.error = Callable::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS;
 				r_error.argument = 2;
 				r_ret = Variant();
 			} else if (p_arg_count == 2) {
 				if (p_args[1]->get_type() != Variant::BOOL) {
-					r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+					r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 					r_error.argument = 1;
 					r_error.expected = Variant::BOOL;
 					r_ret = Variant();
@@ -903,24 +869,24 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 				allow_objects = *p_args[1];
 			}
 
-			if (p_args[0]->get_type() != Variant::POOL_BYTE_ARRAY) {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+			if (p_args[0]->get_type() != Variant::PACKED_BYTE_ARRAY) {
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 1;
-				r_error.expected = Variant::POOL_BYTE_ARRAY;
+				r_error.expected = Variant::PACKED_BYTE_ARRAY;
 				r_ret = Variant();
 				return;
 			}
 
-			PoolByteArray varr = *p_args[0];
+			PackedByteArray varr = *p_args[0];
 			Variant ret;
 			{
-				PoolByteArray::Read r = varr.read();
-				Error err = decode_variant(ret, r.ptr(), varr.size(), NULL, allow_objects);
+				const uint8_t *r = varr.ptr();
+				Error err = decode_variant(ret, r, varr.size(), nullptr, allow_objects);
 				if (err != OK) {
 					r_ret = RTR("Not enough bytes for decoding bytes, or invalid format.");
-					r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+					r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 					r_error.argument = 0;
-					r_error.expected = Variant::POOL_BYTE_ARRAY;
+					r_error.expected = Variant::PACKED_BYTE_ARRAY;
 					return;
 				}
 			}
@@ -929,18 +895,15 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 
 		} break;
 		case GEN_RANGE: {
-
 			switch (p_arg_count) {
-
 				case 0: {
-
-					r_error.error = Variant::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
+					r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
 					r_error.argument = 1;
+					r_error.expected = 1;
 					r_ret = Variant();
 
 				} break;
 				case 1: {
-
 					VALIDATE_ARG_NUM(0);
 					int count = *p_args[0];
 					Array arr;
@@ -950,7 +913,7 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 					}
 					Error err = arr.resize(count);
 					if (err != OK) {
-						r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+						r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 						r_ret = Variant();
 						return;
 					}
@@ -962,7 +925,6 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 					r_ret = arr;
 				} break;
 				case 2: {
-
 					VALIDATE_ARG_NUM(0);
 					VALIDATE_ARG_NUM(1);
 
@@ -976,16 +938,16 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 					}
 					Error err = arr.resize(to - from);
 					if (err != OK) {
-						r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+						r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 						r_ret = Variant();
 						return;
 					}
-					for (int i = from; i < to; i++)
+					for (int i = from; i < to; i++) {
 						arr[i - from] = i;
+					}
 					r_ret = arr;
 				} break;
 				case 3: {
-
 					VALIDATE_ARG_NUM(0);
 					VALIDATE_ARG_NUM(1);
 					VALIDATE_ARG_NUM(2);
@@ -994,9 +956,8 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 					int to = *p_args[1];
 					int incr = *p_args[2];
 					if (incr == 0) {
-
 						r_ret = RTR("Step argument is zero!");
-						r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+						r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 						return;
 					}
 
@@ -1013,17 +974,15 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 					//calculate how many
 					int count = 0;
 					if (incr > 0) {
-
 						count = ((to - from - 1) / incr) + 1;
 					} else {
-
 						count = ((from - to - 1) / -incr) + 1;
 					}
 
 					Error err = arr.resize(count);
 
 					if (err != OK) {
-						r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+						r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 						r_ret = Variant();
 						return;
 					}
@@ -1034,7 +993,6 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 							arr[idx++] = i;
 						}
 					} else {
-
 						int idx = 0;
 						for (int i = from; i > to; i += incr) {
 							arr[idx++] = i;
@@ -1044,9 +1002,9 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 					r_ret = arr;
 				} break;
 				default: {
-
-					r_error.error = Variant::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS;
+					r_error.error = Callable::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS;
 					r_error.argument = 3;
+					r_error.expected = 3;
 					r_ret = Variant();
 
 				} break;
@@ -1056,7 +1014,7 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 		case RESOURCE_LOAD: {
 			VALIDATE_ARG_COUNT(1);
 			if (p_args[0]->get_type() != Variant::STRING) {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
 				r_error.expected = Variant::STRING;
 				r_ret = Variant();
@@ -1066,35 +1024,30 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 
 		} break;
 		case INST2DICT: {
-
 			VALIDATE_ARG_COUNT(1);
 
 			if (p_args[0]->get_type() == Variant::NIL) {
 				r_ret = Variant();
 			} else if (p_args[0]->get_type() != Variant::OBJECT) {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
 				r_ret = Variant();
 			} else {
-
 				Object *obj = *p_args[0];
 				if (!obj) {
 					r_ret = Variant();
 
 				} else if (!obj->get_script_instance() || obj->get_script_instance()->get_language() != GDScriptLanguage::get_singleton()) {
-
-					r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+					r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 					r_error.argument = 0;
 					r_error.expected = Variant::DICTIONARY;
 					r_ret = RTR("Not a script with an instance");
 					return;
 				} else {
-
 					GDScriptInstance *ins = static_cast<GDScriptInstance *>(obj->get_script_instance());
 					Ref<GDScript> base = ins->get_script();
 					if (base.is_null()) {
-
-						r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+						r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 						r_error.argument = 0;
 						r_error.expected = Variant::DICTIONARY;
 						r_ret = RTR("Not based on a script");
@@ -1105,14 +1058,13 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 					Vector<StringName> sname;
 
 					while (p->_owner) {
-
 						sname.push_back(p->name);
 						p = p->_owner;
 					}
 					sname.invert();
 
 					if (!p->path.is_resource_file()) {
-						r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+						r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 						r_error.argument = 0;
 						r_error.expected = Variant::DICTIONARY;
 						r_ret = Variant();
@@ -1139,12 +1091,10 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 
 		} break;
 		case DICT2INST: {
-
 			VALIDATE_ARG_COUNT(1);
 
 			if (p_args[0]->get_type() != Variant::DICTIONARY) {
-
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
 				r_error.expected = Variant::DICTIONARY;
 				r_ret = Variant();
@@ -1155,8 +1105,7 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 			Dictionary d = *p_args[0];
 
 			if (!d.has("@path")) {
-
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
 				r_error.expected = Variant::OBJECT;
 				r_ret = RTR("Invalid instance dictionary format (missing @path)");
@@ -1166,8 +1115,7 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 
 			Ref<Script> scr = ResourceLoader::load(d["@path"]);
 			if (!scr.is_valid()) {
-
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
 				r_error.expected = Variant::OBJECT;
 				r_ret = RTR("Invalid instance dictionary format (can't load script at @path)");
@@ -1177,8 +1125,7 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 			Ref<GDScript> gdscr = scr;
 
 			if (!gdscr.is_valid()) {
-
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
 				r_error.expected = Variant::OBJECT;
 				r_ret = Variant();
@@ -1192,11 +1139,9 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 			}
 
 			for (int i = 0; i < sub.get_name_count(); i++) {
-
 				gdscr = gdscr->subclasses[sub.get_name(i)];
 				if (!gdscr.is_valid()) {
-
-					r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+					r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 					r_error.argument = 0;
 					r_error.expected = Variant::OBJECT;
 					r_ret = Variant();
@@ -1204,8 +1149,12 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 					return;
 				}
 			}
+			r_ret = gdscr->_new(nullptr, -1 /*skip initializer*/, r_error);
 
-			r_ret = gdscr->_new(NULL, 0, r_error);
+			if (r_error.error != Callable::CallError::CALL_OK) {
+				r_ret = Variant();
+				return;
+			}
 
 			GDScriptInstance *ins = static_cast<GDScriptInstance *>(static_cast<Object *>(r_ret)->get_script_instance());
 			Ref<GDScript> gd_ref = ins->get_script();
@@ -1218,11 +1167,10 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 
 		} break;
 		case VALIDATE_JSON: {
-
 			VALIDATE_ARG_COUNT(1);
 
 			if (p_args[0]->get_type() != Variant::STRING) {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
 				r_error.expected = Variant::STRING;
 				r_ret = Variant();
@@ -1242,11 +1190,10 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 
 		} break;
 		case PARSE_JSON: {
-
 			VALIDATE_ARG_COUNT(1);
 
 			if (p_args[0]->get_type() != Variant::STRING) {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
 				r_error.expected = Variant::STRING;
 				r_ret = Variant();
@@ -1260,7 +1207,7 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 
 			if (err != OK) {
 				r_ret = Variant();
-				ERR_PRINTS(vformat("Error parsing JSON at line %s: %s", errl, errs));
+				ERR_PRINT(vformat("Error parsing JSON at line %s: %s", errl, errs));
 			}
 
 		} break;
@@ -1270,22 +1217,20 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 			r_ret = JSON::print(*p_args[0]);
 		} break;
 		case HASH: {
-
 			VALIDATE_ARG_COUNT(1);
 			r_ret = p_args[0]->hash();
 
 		} break;
 		case COLOR8: {
-
 			if (p_arg_count < 3) {
-				r_error.error = Variant::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
+				r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
 				r_error.argument = 3;
 				r_ret = Variant();
 
 				return;
 			}
 			if (p_arg_count > 4) {
-				r_error.error = Variant::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS;
+				r_error.error = Callable::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS;
 				r_error.argument = 4;
 				r_ret = Variant();
 
@@ -1307,23 +1252,22 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 
 		} break;
 		case COLORN: {
-
 			if (p_arg_count < 1) {
-				r_error.error = Variant::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
+				r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
 				r_error.argument = 1;
 				r_ret = Variant();
 				return;
 			}
 
 			if (p_arg_count > 2) {
-				r_error.error = Variant::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS;
+				r_error.error = Callable::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS;
 				r_error.argument = 2;
 				r_ret = Variant();
 				return;
 			}
 
 			if (p_args[0]->get_type() != Variant::STRING) {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
 				r_ret = Variant();
 			} else {
@@ -1342,7 +1286,6 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 
 			ScriptLanguage *script = GDScriptLanguage::get_singleton();
 			for (int i = 0; i < script->debug_get_stack_level_count(); i++) {
-
 				print_line("Frame " + itos(i) + " - " + script->debug_get_stack_level_source(i) + ":" + itos(script->debug_get_stack_level_line(i)) + " in function '" + script->debug_get_stack_level_function(i) + "'");
 			};
 		} break;
@@ -1353,7 +1296,6 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 			ScriptLanguage *script = GDScriptLanguage::get_singleton();
 			Array ret;
 			for (int i = 0; i < script->debug_get_stack_level_count(); i++) {
-
 				Dictionary frame;
 				frame["source"] = script->debug_get_stack_level_source(i);
 				frame["function"] = script->debug_get_stack_level_function(i);
@@ -1364,76 +1306,72 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 		} break;
 
 		case INSTANCE_FROM_ID: {
-
 			VALIDATE_ARG_COUNT(1);
-			if (p_args[0]->get_type() != Variant::INT && p_args[0]->get_type() != Variant::REAL) {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+			if (p_args[0]->get_type() != Variant::INT && p_args[0]->get_type() != Variant::FLOAT) {
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
 				r_error.expected = Variant::INT;
 				r_ret = Variant();
 				break;
 			}
 
-			uint32_t id = *p_args[0];
+			ObjectID id = *p_args[0];
 			r_ret = ObjectDB::get_instance(id);
 
 		} break;
 		case LEN: {
-
 			VALIDATE_ARG_COUNT(1);
 			switch (p_args[0]->get_type()) {
 				case Variant::STRING: {
-
 					String d = *p_args[0];
 					r_ret = d.length();
 				} break;
 				case Variant::DICTIONARY: {
-
 					Dictionary d = *p_args[0];
 					r_ret = d.size();
 				} break;
 				case Variant::ARRAY: {
-
 					Array d = *p_args[0];
 					r_ret = d.size();
 				} break;
-				case Variant::POOL_BYTE_ARRAY: {
-
-					PoolVector<uint8_t> d = *p_args[0];
+				case Variant::PACKED_BYTE_ARRAY: {
+					Vector<uint8_t> d = *p_args[0];
 					r_ret = d.size();
 				} break;
-				case Variant::POOL_INT_ARRAY: {
-
-					PoolVector<int> d = *p_args[0];
+				case Variant::PACKED_INT32_ARRAY: {
+					Vector<int32_t> d = *p_args[0];
 					r_ret = d.size();
 				} break;
-				case Variant::POOL_REAL_ARRAY: {
-
-					PoolVector<real_t> d = *p_args[0];
+				case Variant::PACKED_INT64_ARRAY: {
+					Vector<int64_t> d = *p_args[0];
 					r_ret = d.size();
 				} break;
-				case Variant::POOL_STRING_ARRAY: {
-
-					PoolVector<String> d = *p_args[0];
+				case Variant::PACKED_FLOAT32_ARRAY: {
+					Vector<float> d = *p_args[0];
 					r_ret = d.size();
 				} break;
-				case Variant::POOL_VECTOR2_ARRAY: {
-
-					PoolVector<Vector2> d = *p_args[0];
+				case Variant::PACKED_FLOAT64_ARRAY: {
+					Vector<double> d = *p_args[0];
 					r_ret = d.size();
 				} break;
-				case Variant::POOL_VECTOR3_ARRAY: {
-
-					PoolVector<Vector3> d = *p_args[0];
+				case Variant::PACKED_STRING_ARRAY: {
+					Vector<String> d = *p_args[0];
 					r_ret = d.size();
 				} break;
-				case Variant::POOL_COLOR_ARRAY: {
-
-					PoolVector<Color> d = *p_args[0];
+				case Variant::PACKED_VECTOR2_ARRAY: {
+					Vector<Vector2> d = *p_args[0];
+					r_ret = d.size();
+				} break;
+				case Variant::PACKED_VECTOR3_ARRAY: {
+					Vector<Vector3> d = *p_args[0];
+					r_ret = d.size();
+				} break;
+				case Variant::PACKED_COLOR_ARRAY: {
+					Vector<Color> d = *p_args[0];
 					r_ret = d.size();
 				} break;
 				default: {
-					r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+					r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 					r_error.argument = 0;
 					r_error.expected = Variant::OBJECT;
 					r_ret = Variant();
@@ -1443,30 +1381,26 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 
 		} break;
 		case IS_INSTANCE_VALID: {
-
 			VALIDATE_ARG_COUNT(1);
 			if (p_args[0]->get_type() != Variant::OBJECT) {
 				r_ret = false;
 			} else {
-				Object *obj = *p_args[0];
-				r_ret = ObjectDB::instance_validate(obj);
+				Object *obj = p_args[0]->get_validated_object();
+				r_ret = obj != nullptr;
 			}
 
 		} break;
 		case FUNC_MAX: {
-
 			ERR_FAIL();
 		} break;
 	}
 }
 
 bool GDScriptFunctions::is_deterministic(Function p_func) {
-
 	//man i couldn't have chosen a worse function name,
 	//way too controversial..
 
 	switch (p_func) {
-
 		case MATH_SIN:
 		case MATH_COS:
 		case MATH_TAN:
@@ -1492,7 +1426,6 @@ bool GDScriptFunctions::is_deterministic(Function p_func) {
 		case MATH_ISNAN:
 		case MATH_ISINF:
 		case MATH_EASE:
-		case MATH_DECIMALS:
 		case MATH_STEP_DECIMALS:
 		case MATH_STEPIFY:
 		case MATH_LERP:
@@ -1531,76 +1464,74 @@ bool GDScriptFunctions::is_deterministic(Function p_func) {
 }
 
 MethodInfo GDScriptFunctions::get_info(Function p_func) {
-
 #ifdef DEBUG_ENABLED
 	//using a switch, so the compiler generates a jumptable
 
 	switch (p_func) {
-
 		case MATH_SIN: {
-			MethodInfo mi("sin", PropertyInfo(Variant::REAL, "s"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("sin", PropertyInfo(Variant::FLOAT, "s"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 
 		} break;
 		case MATH_COS: {
-			MethodInfo mi("cos", PropertyInfo(Variant::REAL, "s"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("cos", PropertyInfo(Variant::FLOAT, "s"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_TAN: {
-			MethodInfo mi("tan", PropertyInfo(Variant::REAL, "s"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("tan", PropertyInfo(Variant::FLOAT, "s"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_SINH: {
-			MethodInfo mi("sinh", PropertyInfo(Variant::REAL, "s"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("sinh", PropertyInfo(Variant::FLOAT, "s"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_COSH: {
-			MethodInfo mi("cosh", PropertyInfo(Variant::REAL, "s"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("cosh", PropertyInfo(Variant::FLOAT, "s"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_TANH: {
-			MethodInfo mi("tanh", PropertyInfo(Variant::REAL, "s"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("tanh", PropertyInfo(Variant::FLOAT, "s"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_ASIN: {
-			MethodInfo mi("asin", PropertyInfo(Variant::REAL, "s"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("asin", PropertyInfo(Variant::FLOAT, "s"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_ACOS: {
-			MethodInfo mi("acos", PropertyInfo(Variant::REAL, "s"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("acos", PropertyInfo(Variant::FLOAT, "s"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_ATAN: {
-			MethodInfo mi("atan", PropertyInfo(Variant::REAL, "s"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("atan", PropertyInfo(Variant::FLOAT, "s"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_ATAN2: {
-			MethodInfo mi("atan2", PropertyInfo(Variant::REAL, "y"), PropertyInfo(Variant::REAL, "x"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("atan2", PropertyInfo(Variant::FLOAT, "y"), PropertyInfo(Variant::FLOAT, "x"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_SQRT: {
-			MethodInfo mi("sqrt", PropertyInfo(Variant::REAL, "s"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("sqrt", PropertyInfo(Variant::FLOAT, "s"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_FMOD: {
-			MethodInfo mi("fmod", PropertyInfo(Variant::REAL, "a"), PropertyInfo(Variant::REAL, "b"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("fmod", PropertyInfo(Variant::FLOAT, "a"), PropertyInfo(Variant::FLOAT, "b"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_FPOSMOD: {
-			MethodInfo mi("fposmod", PropertyInfo(Variant::REAL, "a"), PropertyInfo(Variant::REAL, "b"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("fposmod", PropertyInfo(Variant::FLOAT, "a"), PropertyInfo(Variant::FLOAT, "b"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_POSMOD: {
@@ -1609,119 +1540,114 @@ MethodInfo GDScriptFunctions::get_info(Function p_func) {
 			return mi;
 		} break;
 		case MATH_FLOOR: {
-			MethodInfo mi("floor", PropertyInfo(Variant::REAL, "s"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("floor", PropertyInfo(Variant::FLOAT, "s"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_CEIL: {
-			MethodInfo mi("ceil", PropertyInfo(Variant::REAL, "s"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("ceil", PropertyInfo(Variant::FLOAT, "s"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_ROUND: {
-			MethodInfo mi("round", PropertyInfo(Variant::REAL, "s"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("round", PropertyInfo(Variant::FLOAT, "s"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_ABS: {
-			MethodInfo mi("abs", PropertyInfo(Variant::REAL, "s"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("abs", PropertyInfo(Variant::FLOAT, "s"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_SIGN: {
-			MethodInfo mi("sign", PropertyInfo(Variant::REAL, "s"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("sign", PropertyInfo(Variant::FLOAT, "s"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_POW: {
-			MethodInfo mi("pow", PropertyInfo(Variant::REAL, "base"), PropertyInfo(Variant::REAL, "exp"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("pow", PropertyInfo(Variant::FLOAT, "base"), PropertyInfo(Variant::FLOAT, "exp"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_LOG: {
-			MethodInfo mi("log", PropertyInfo(Variant::REAL, "s"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("log", PropertyInfo(Variant::FLOAT, "s"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_EXP: {
-			MethodInfo mi("exp", PropertyInfo(Variant::REAL, "s"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("exp", PropertyInfo(Variant::FLOAT, "s"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_ISNAN: {
-			MethodInfo mi("is_nan", PropertyInfo(Variant::REAL, "s"));
+			MethodInfo mi("is_nan", PropertyInfo(Variant::FLOAT, "s"));
 			mi.return_val.type = Variant::BOOL;
 			return mi;
 		} break;
 		case MATH_ISINF: {
-			MethodInfo mi("is_inf", PropertyInfo(Variant::REAL, "s"));
+			MethodInfo mi("is_inf", PropertyInfo(Variant::FLOAT, "s"));
 			mi.return_val.type = Variant::BOOL;
 			return mi;
 		} break;
 		case MATH_ISEQUALAPPROX: {
-			MethodInfo mi("is_equal_approx", PropertyInfo(Variant::REAL, "a"), PropertyInfo(Variant::REAL, "b"));
+			MethodInfo mi("is_equal_approx", PropertyInfo(Variant::FLOAT, "a"), PropertyInfo(Variant::FLOAT, "b"));
 			mi.return_val.type = Variant::BOOL;
 			return mi;
 		} break;
 		case MATH_ISZEROAPPROX: {
-			MethodInfo mi("is_zero_approx", PropertyInfo(Variant::REAL, "s"));
+			MethodInfo mi("is_zero_approx", PropertyInfo(Variant::FLOAT, "s"));
 			mi.return_val.type = Variant::BOOL;
 			return mi;
 		} break;
 		case MATH_EASE: {
-			MethodInfo mi("ease", PropertyInfo(Variant::REAL, "s"), PropertyInfo(Variant::REAL, "curve"));
-			mi.return_val.type = Variant::REAL;
-			return mi;
-		} break;
-		case MATH_DECIMALS: {
-			MethodInfo mi("decimals", PropertyInfo(Variant::REAL, "step"));
-			mi.return_val.type = Variant::INT;
+			MethodInfo mi("ease", PropertyInfo(Variant::FLOAT, "s"), PropertyInfo(Variant::FLOAT, "curve"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_STEP_DECIMALS: {
-			MethodInfo mi("step_decimals", PropertyInfo(Variant::REAL, "step"));
+			MethodInfo mi("step_decimals", PropertyInfo(Variant::FLOAT, "step"));
 			mi.return_val.type = Variant::INT;
 			return mi;
 		} break;
 		case MATH_STEPIFY: {
-			MethodInfo mi("stepify", PropertyInfo(Variant::REAL, "s"), PropertyInfo(Variant::REAL, "step"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("stepify", PropertyInfo(Variant::FLOAT, "s"), PropertyInfo(Variant::FLOAT, "step"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_LERP: {
-			MethodInfo mi("lerp", PropertyInfo(Variant::NIL, "from"), PropertyInfo(Variant::NIL, "to"), PropertyInfo(Variant::REAL, "weight"));
+			MethodInfo mi("lerp", PropertyInfo(Variant::NIL, "from"), PropertyInfo(Variant::NIL, "to"), PropertyInfo(Variant::FLOAT, "weight"));
 			mi.return_val.type = Variant::NIL;
 			mi.return_val.usage |= PROPERTY_USAGE_NIL_IS_VARIANT;
 			return mi;
 		} break;
 		case MATH_LERP_ANGLE: {
-			MethodInfo mi("lerp_angle", PropertyInfo(Variant::REAL, "from"), PropertyInfo(Variant::REAL, "to"), PropertyInfo(Variant::REAL, "weight"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("lerp_angle", PropertyInfo(Variant::FLOAT, "from"), PropertyInfo(Variant::FLOAT, "to"), PropertyInfo(Variant::FLOAT, "weight"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_INVERSE_LERP: {
-			MethodInfo mi("inverse_lerp", PropertyInfo(Variant::REAL, "from"), PropertyInfo(Variant::REAL, "to"), PropertyInfo(Variant::REAL, "weight"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("inverse_lerp", PropertyInfo(Variant::FLOAT, "from"), PropertyInfo(Variant::FLOAT, "to"), PropertyInfo(Variant::FLOAT, "weight"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_RANGE_LERP: {
-			MethodInfo mi("range_lerp", PropertyInfo(Variant::REAL, "value"), PropertyInfo(Variant::REAL, "istart"), PropertyInfo(Variant::REAL, "istop"), PropertyInfo(Variant::REAL, "ostart"), PropertyInfo(Variant::REAL, "ostop"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("range_lerp", PropertyInfo(Variant::FLOAT, "value"), PropertyInfo(Variant::FLOAT, "istart"), PropertyInfo(Variant::FLOAT, "istop"), PropertyInfo(Variant::FLOAT, "ostart"), PropertyInfo(Variant::FLOAT, "ostop"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_SMOOTHSTEP: {
-			MethodInfo mi("smoothstep", PropertyInfo(Variant::REAL, "from"), PropertyInfo(Variant::REAL, "to"), PropertyInfo(Variant::REAL, "weight"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("smoothstep", PropertyInfo(Variant::FLOAT, "from"), PropertyInfo(Variant::FLOAT, "to"), PropertyInfo(Variant::FLOAT, "s"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_MOVE_TOWARD: {
-			MethodInfo mi("move_toward", PropertyInfo(Variant::REAL, "from"), PropertyInfo(Variant::REAL, "to"), PropertyInfo(Variant::REAL, "delta"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("move_toward", PropertyInfo(Variant::FLOAT, "from"), PropertyInfo(Variant::FLOAT, "to"), PropertyInfo(Variant::FLOAT, "delta"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_DECTIME: {
-			MethodInfo mi("dectime", PropertyInfo(Variant::REAL, "value"), PropertyInfo(Variant::REAL, "amount"), PropertyInfo(Variant::REAL, "step"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("dectime", PropertyInfo(Variant::FLOAT, "value"), PropertyInfo(Variant::FLOAT, "amount"), PropertyInfo(Variant::FLOAT, "step"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_RANDOMIZE: {
@@ -1736,12 +1662,12 @@ MethodInfo GDScriptFunctions::get_info(Function p_func) {
 		} break;
 		case MATH_RANDF: {
 			MethodInfo mi("randf");
-			mi.return_val.type = Variant::REAL;
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_RANDOM: {
-			MethodInfo mi("rand_range", PropertyInfo(Variant::REAL, "from"), PropertyInfo(Variant::REAL, "to"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("rand_range", PropertyInfo(Variant::FLOAT, "from"), PropertyInfo(Variant::FLOAT, "to"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_SEED: {
@@ -1755,32 +1681,32 @@ MethodInfo GDScriptFunctions::get_info(Function p_func) {
 			return mi;
 		} break;
 		case MATH_DEG2RAD: {
-			MethodInfo mi("deg2rad", PropertyInfo(Variant::REAL, "deg"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("deg2rad", PropertyInfo(Variant::FLOAT, "deg"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_RAD2DEG: {
-			MethodInfo mi("rad2deg", PropertyInfo(Variant::REAL, "rad"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("rad2deg", PropertyInfo(Variant::FLOAT, "rad"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_LINEAR2DB: {
-			MethodInfo mi("linear2db", PropertyInfo(Variant::REAL, "nrg"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("linear2db", PropertyInfo(Variant::FLOAT, "nrg"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_DB2LINEAR: {
-			MethodInfo mi("db2linear", PropertyInfo(Variant::REAL, "db"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("db2linear", PropertyInfo(Variant::FLOAT, "db"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case MATH_POLAR2CARTESIAN: {
-			MethodInfo mi("polar2cartesian", PropertyInfo(Variant::REAL, "r"), PropertyInfo(Variant::REAL, "th"));
+			MethodInfo mi("polar2cartesian", PropertyInfo(Variant::FLOAT, "r"), PropertyInfo(Variant::FLOAT, "th"));
 			mi.return_val.type = Variant::VECTOR2;
 			return mi;
 		} break;
 		case MATH_CARTESIAN2POLAR: {
-			MethodInfo mi("cartesian2polar", PropertyInfo(Variant::REAL, "x"), PropertyInfo(Variant::REAL, "y"));
+			MethodInfo mi("cartesian2polar", PropertyInfo(Variant::FLOAT, "x"), PropertyInfo(Variant::FLOAT, "y"));
 			mi.return_val.type = Variant::VECTOR2;
 			return mi;
 		} break;
@@ -1790,24 +1716,24 @@ MethodInfo GDScriptFunctions::get_info(Function p_func) {
 			return mi;
 		} break;
 		case MATH_WRAPF: {
-			MethodInfo mi("wrapf", PropertyInfo(Variant::REAL, "value"), PropertyInfo(Variant::REAL, "min"), PropertyInfo(Variant::REAL, "max"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("wrapf", PropertyInfo(Variant::FLOAT, "value"), PropertyInfo(Variant::FLOAT, "min"), PropertyInfo(Variant::FLOAT, "max"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case LOGIC_MAX: {
-			MethodInfo mi("max", PropertyInfo(Variant::REAL, "a"), PropertyInfo(Variant::REAL, "b"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("max", PropertyInfo(Variant::FLOAT, "a"), PropertyInfo(Variant::FLOAT, "b"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 
 		} break;
 		case LOGIC_MIN: {
-			MethodInfo mi("min", PropertyInfo(Variant::REAL, "a"), PropertyInfo(Variant::REAL, "b"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("min", PropertyInfo(Variant::FLOAT, "a"), PropertyInfo(Variant::FLOAT, "b"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case LOGIC_CLAMP: {
-			MethodInfo mi("clamp", PropertyInfo(Variant::REAL, "value"), PropertyInfo(Variant::REAL, "min"), PropertyInfo(Variant::REAL, "max"));
-			mi.return_val.type = Variant::REAL;
+			MethodInfo mi("clamp", PropertyInfo(Variant::FLOAT, "value"), PropertyInfo(Variant::FLOAT, "min"), PropertyInfo(Variant::FLOAT, "max"));
+			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
 		case LOGIC_NEAREST_PO2: {
@@ -1816,7 +1742,6 @@ MethodInfo GDScriptFunctions::get_info(Function p_func) {
 			return mi;
 		} break;
 		case OBJ_WEAKREF: {
-
 			MethodInfo mi("weakref", PropertyInfo(Variant::OBJECT, "obj"));
 			mi.return_val.type = Variant::OBJECT;
 			mi.return_val.class_name = "WeakRef";
@@ -1825,7 +1750,6 @@ MethodInfo GDScriptFunctions::get_info(Function p_func) {
 
 		} break;
 		case FUNC_FUNCREF: {
-
 			MethodInfo mi("funcref", PropertyInfo(Variant::OBJECT, "instance"), PropertyInfo(Variant::STRING, "funcname"));
 			mi.return_val.type = Variant::OBJECT;
 			mi.return_val.class_name = "FuncRef";
@@ -1833,42 +1757,36 @@ MethodInfo GDScriptFunctions::get_info(Function p_func) {
 
 		} break;
 		case TYPE_CONVERT: {
-
 			MethodInfo mi("convert", PropertyInfo(Variant::NIL, "what", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_NIL_IS_VARIANT), PropertyInfo(Variant::INT, "type"));
 			mi.return_val.type = Variant::NIL;
 			mi.return_val.usage |= PROPERTY_USAGE_NIL_IS_VARIANT;
 			return mi;
 		} break;
 		case TYPE_OF: {
-
 			MethodInfo mi("typeof", PropertyInfo(Variant::NIL, "what", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_NIL_IS_VARIANT));
 			mi.return_val.type = Variant::INT;
 			return mi;
 
 		} break;
 		case TYPE_EXISTS: {
-
 			MethodInfo mi("type_exists", PropertyInfo(Variant::STRING, "type"));
 			mi.return_val.type = Variant::BOOL;
 			return mi;
 
 		} break;
 		case TEXT_CHAR: {
-
 			MethodInfo mi("char", PropertyInfo(Variant::INT, "code"));
 			mi.return_val.type = Variant::STRING;
 			return mi;
 
 		} break;
 		case TEXT_ORD: {
-
 			MethodInfo mi("ord", PropertyInfo(Variant::STRING, "char"));
 			mi.return_val.type = Variant::INT;
 			return mi;
 
 		} break;
 		case TEXT_STR: {
-
 			MethodInfo mi("str");
 			mi.return_val.type = Variant::STRING;
 			mi.flags |= METHOD_FLAG_VARARG;
@@ -1876,7 +1794,6 @@ MethodInfo GDScriptFunctions::get_info(Function p_func) {
 
 		} break;
 		case TEXT_PRINT: {
-
 			MethodInfo mi("print");
 			mi.return_val.type = Variant::NIL;
 			mi.flags |= METHOD_FLAG_VARARG;
@@ -1884,7 +1801,6 @@ MethodInfo GDScriptFunctions::get_info(Function p_func) {
 
 		} break;
 		case TEXT_PRINT_TABBED: {
-
 			MethodInfo mi("printt");
 			mi.return_val.type = Variant::NIL;
 			mi.flags |= METHOD_FLAG_VARARG;
@@ -1892,7 +1808,6 @@ MethodInfo GDScriptFunctions::get_info(Function p_func) {
 
 		} break;
 		case TEXT_PRINT_SPACED: {
-
 			MethodInfo mi("prints");
 			mi.return_val.type = Variant::NIL;
 			mi.flags |= METHOD_FLAG_VARARG;
@@ -1900,7 +1815,6 @@ MethodInfo GDScriptFunctions::get_info(Function p_func) {
 
 		} break;
 		case TEXT_PRINTERR: {
-
 			MethodInfo mi("printerr");
 			mi.return_val.type = Variant::NIL;
 			mi.flags |= METHOD_FLAG_VARARG;
@@ -1908,7 +1822,6 @@ MethodInfo GDScriptFunctions::get_info(Function p_func) {
 
 		} break;
 		case TEXT_PRINTRAW: {
-
 			MethodInfo mi("printraw");
 			mi.return_val.type = Variant::NIL;
 			mi.flags |= METHOD_FLAG_VARARG;
@@ -1916,7 +1829,6 @@ MethodInfo GDScriptFunctions::get_info(Function p_func) {
 
 		} break;
 		case TEXT_PRINT_DEBUG: {
-
 			MethodInfo mi("print_debug");
 			mi.return_val.type = Variant::NIL;
 			mi.flags |= METHOD_FLAG_VARARG;
@@ -1924,108 +1836,92 @@ MethodInfo GDScriptFunctions::get_info(Function p_func) {
 
 		} break;
 		case PUSH_ERROR: {
-
 			MethodInfo mi(Variant::NIL, "push_error", PropertyInfo(Variant::STRING, "message"));
 			mi.return_val.type = Variant::NIL;
 			return mi;
 
 		} break;
 		case PUSH_WARNING: {
-
 			MethodInfo mi(Variant::NIL, "push_warning", PropertyInfo(Variant::STRING, "message"));
 			mi.return_val.type = Variant::NIL;
 			return mi;
 
 		} break;
 		case VAR_TO_STR: {
-
 			MethodInfo mi("var2str", PropertyInfo(Variant::NIL, "var", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_NIL_IS_VARIANT));
 			mi.return_val.type = Variant::STRING;
 			return mi;
 		} break;
 		case STR_TO_VAR: {
-
 			MethodInfo mi(Variant::NIL, "str2var", PropertyInfo(Variant::STRING, "string"));
 			mi.return_val.type = Variant::NIL;
 			mi.return_val.usage |= PROPERTY_USAGE_NIL_IS_VARIANT;
 			return mi;
 		} break;
 		case VAR_TO_BYTES: {
-
 			MethodInfo mi("var2bytes", PropertyInfo(Variant::NIL, "var", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_NIL_IS_VARIANT), PropertyInfo(Variant::BOOL, "full_objects"));
 			mi.default_arguments.push_back(false);
-			mi.return_val.type = Variant::POOL_BYTE_ARRAY;
+			mi.return_val.type = Variant::PACKED_BYTE_ARRAY;
 			return mi;
 		} break;
 		case BYTES_TO_VAR: {
-
-			MethodInfo mi(Variant::NIL, "bytes2var", PropertyInfo(Variant::POOL_BYTE_ARRAY, "bytes"), PropertyInfo(Variant::BOOL, "allow_objects"));
+			MethodInfo mi(Variant::NIL, "bytes2var", PropertyInfo(Variant::PACKED_BYTE_ARRAY, "bytes"), PropertyInfo(Variant::BOOL, "allow_objects"));
 			mi.default_arguments.push_back(false);
 			mi.return_val.type = Variant::NIL;
 			mi.return_val.usage |= PROPERTY_USAGE_NIL_IS_VARIANT;
 			return mi;
 		} break;
 		case GEN_RANGE: {
-
 			MethodInfo mi("range");
 			mi.return_val.type = Variant::ARRAY;
 			mi.flags |= METHOD_FLAG_VARARG;
 			return mi;
 		} break;
 		case RESOURCE_LOAD: {
-
 			MethodInfo mi("load", PropertyInfo(Variant::STRING, "path"));
 			mi.return_val.type = Variant::OBJECT;
 			mi.return_val.class_name = "Resource";
 			return mi;
 		} break;
 		case INST2DICT: {
-
 			MethodInfo mi("inst2dict", PropertyInfo(Variant::OBJECT, "inst"));
 			mi.return_val.type = Variant::DICTIONARY;
 			return mi;
 		} break;
 		case DICT2INST: {
-
 			MethodInfo mi("dict2inst", PropertyInfo(Variant::DICTIONARY, "dict"));
 			mi.return_val.type = Variant::OBJECT;
 			return mi;
 		} break;
 		case VALIDATE_JSON: {
-
 			MethodInfo mi("validate_json", PropertyInfo(Variant::STRING, "json"));
 			mi.return_val.type = Variant::STRING;
 			return mi;
 		} break;
 		case PARSE_JSON: {
-
 			MethodInfo mi(Variant::NIL, "parse_json", PropertyInfo(Variant::STRING, "json"));
 			mi.return_val.type = Variant::NIL;
 			mi.return_val.usage |= PROPERTY_USAGE_NIL_IS_VARIANT;
 			return mi;
 		} break;
 		case TO_JSON: {
-
 			MethodInfo mi("to_json", PropertyInfo(Variant::NIL, "var", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_NIL_IS_VARIANT));
 			mi.return_val.type = Variant::STRING;
 			return mi;
 		} break;
 		case HASH: {
-
 			MethodInfo mi("hash", PropertyInfo(Variant::NIL, "var", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_NIL_IS_VARIANT));
 			mi.return_val.type = Variant::INT;
 			return mi;
 		} break;
 		case COLOR8: {
-
 			MethodInfo mi("Color8", PropertyInfo(Variant::INT, "r8"), PropertyInfo(Variant::INT, "g8"), PropertyInfo(Variant::INT, "b8"), PropertyInfo(Variant::INT, "a8"));
 			mi.default_arguments.push_back(255);
 			mi.return_val.type = Variant::COLOR;
 			return mi;
 		} break;
 		case COLORN: {
-
-			MethodInfo mi("ColorN", PropertyInfo(Variant::STRING, "name"), PropertyInfo(Variant::REAL, "alpha"));
+			MethodInfo mi("ColorN", PropertyInfo(Variant::STRING, "name"), PropertyInfo(Variant::FLOAT, "alpha"));
 			mi.default_arguments.push_back(1.0f);
 			mi.return_val.type = Variant::COLOR;
 			return mi;
@@ -2058,7 +1954,6 @@ MethodInfo GDScriptFunctions::get_info(Function p_func) {
 			return mi;
 		} break;
 		default: {
-
 			ERR_FAIL_V(MethodInfo());
 		} break;
 	}
diff --git a/modules/gdscript/gdscript_functions.h b/modules/gdscript/gdscript_functions.h
index 1812ddf121..2c6dc02913 100644
--- a/modules/gdscript/gdscript_functions.h
+++ b/modules/gdscript/gdscript_functions.h
@@ -63,7 +63,6 @@ public:
 		MATH_ISEQUALAPPROX,
 		MATH_ISZEROAPPROX,
 		MATH_EASE,
-		MATH_DECIMALS,
 		MATH_STEP_DECIMALS,
 		MATH_STEPIFY,
 		MATH_LERP,
@@ -130,7 +129,7 @@ public:
 	};
 
 	static const char *get_func_name(Function p_func);
-	static void call(Function p_func, const Variant **p_args, int p_arg_count, Variant &r_ret, Variant::CallError &r_error);
+	static void call(Function p_func, const Variant **p_args, int p_arg_count, Variant &r_ret, Callable::CallError &r_error);
 	static bool is_deterministic(Function p_func);
 	static MethodInfo get_info(Function p_func);
 };
diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp
index d125da5b79..2a69db130b 100644
--- a/modules/gdscript/gdscript_parser.cpp
+++ b/modules/gdscript/gdscript_parser.cpp
@@ -30,8685 +30,3830 @@
 
 #include "gdscript_parser.h"
 
-#include "core/core_string_names.h"
-#include "core/engine.h"
 #include "core/io/resource_loader.h"
+#include "core/math/math_defs.h"
 #include "core/os/file_access.h"
-#include "core/print_string.h"
 #include "core/project_settings.h"
-#include "core/reference.h"
-#include "core/script_language.h"
 #include "gdscript.h"
 
-template <class T>
-T *GDScriptParser::alloc_node() {
-
-	T *t = memnew(T);
-
-	t->next = list;
-	list = t;
-
-	if (!head)
-		head = t;
-
-	t->line = tokenizer->get_token_line();
-	t->column = tokenizer->get_token_column();
-	return t;
-}
-
 #ifdef DEBUG_ENABLED
-static String _find_function_name(const GDScriptParser::OperatorNode *p_call);
+#include "core/os/os.h"
+#include "core/string_builder.h"
 #endif // DEBUG_ENABLED
 
-bool GDScriptParser::_end_statement() {
-
-	if (tokenizer->get_token() == GDScriptTokenizer::TK_SEMICOLON) {
-		tokenizer->advance();
-		return true; //handle next
-	} else if (tokenizer->get_token() == GDScriptTokenizer::TK_NEWLINE || tokenizer->get_token() == GDScriptTokenizer::TK_EOF) {
-		return true; //will be handled properly
+#ifdef TOOLS_ENABLED
+#include "editor/editor_settings.h"
+#endif // TOOLS_ENABLED
+
+static HashMap<StringName, Variant::Type> builtin_types;
+Variant::Type GDScriptParser::get_builtin_type(const StringName &p_type) {
+	if (builtin_types.empty()) {
+		builtin_types["bool"] = Variant::BOOL;
+		builtin_types["int"] = Variant::INT;
+		builtin_types["float"] = Variant::FLOAT;
+		builtin_types["String"] = Variant::STRING;
+		builtin_types["Vector2"] = Variant::VECTOR2;
+		builtin_types["Vector2i"] = Variant::VECTOR2I;
+		builtin_types["Rect2"] = Variant::RECT2;
+		builtin_types["Rect2i"] = Variant::RECT2I;
+		builtin_types["Transform2D"] = Variant::TRANSFORM2D;
+		builtin_types["Vector3"] = Variant::VECTOR3;
+		builtin_types["Vector3i"] = Variant::VECTOR3I;
+		builtin_types["AABB"] = Variant::AABB;
+		builtin_types["Plane"] = Variant::PLANE;
+		builtin_types["Quat"] = Variant::QUAT;
+		builtin_types["Basis"] = Variant::BASIS;
+		builtin_types["Transform"] = Variant::TRANSFORM;
+		builtin_types["Color"] = Variant::COLOR;
+		builtin_types["RID"] = Variant::_RID;
+		builtin_types["Object"] = Variant::OBJECT;
+		builtin_types["StringName"] = Variant::STRING_NAME;
+		builtin_types["NodePath"] = Variant::NODE_PATH;
+		builtin_types["Dictionary"] = Variant::DICTIONARY;
+		builtin_types["Callable"] = Variant::CALLABLE;
+		builtin_types["Signal"] = Variant::SIGNAL;
+		builtin_types["Array"] = Variant::ARRAY;
+		builtin_types["PackedByteArray"] = Variant::PACKED_BYTE_ARRAY;
+		builtin_types["PackedInt32Array"] = Variant::PACKED_INT32_ARRAY;
+		builtin_types["PackedInt64Array"] = Variant::PACKED_INT64_ARRAY;
+		builtin_types["PackedFloat32Array"] = Variant::PACKED_FLOAT32_ARRAY;
+		builtin_types["PackedFloat64Array"] = Variant::PACKED_FLOAT64_ARRAY;
+		builtin_types["PackedStringArray"] = Variant::PACKED_STRING_ARRAY;
+		builtin_types["PackedVector2Array"] = Variant::PACKED_VECTOR2_ARRAY;
+		builtin_types["PackedVector3Array"] = Variant::PACKED_VECTOR3_ARRAY;
+		builtin_types["PackedColorArray"] = Variant::PACKED_COLOR_ARRAY;
+		// NIL is not here, hence the -1.
+		if (builtin_types.size() != Variant::VARIANT_MAX - 1) {
+			ERR_PRINT("Outdated parser: amount of built-in types don't match the amount of types in Variant.");
+		}
+	}
+
+	if (builtin_types.has(p_type)) {
+		return builtin_types[p_type];
+	}
+	return Variant::VARIANT_MAX;
+}
+
+void GDScriptParser::cleanup() {
+	builtin_types.clear();
+}
+
+GDScriptFunctions::Function GDScriptParser::get_builtin_function(const StringName &p_name) {
+	for (int i = 0; i < GDScriptFunctions::FUNC_MAX; i++) {
+		if (p_name == GDScriptFunctions::get_func_name(GDScriptFunctions::Function(i))) {
+			return GDScriptFunctions::Function(i);
+		}
+	}
+	return GDScriptFunctions::FUNC_MAX;
+}
+
+void GDScriptParser::get_annotation_list(List<MethodInfo> *r_annotations) const {
+	List<StringName> keys;
+	valid_annotations.get_key_list(&keys);
+	for (const List<StringName>::Element *E = keys.front(); E != nullptr; E = E->next()) {
+		r_annotations->push_back(valid_annotations[E->get()].info);
 	}
+}
 
-	return false;
+GDScriptParser::GDScriptParser() {
+	// Register valid annotations.
+	// TODO: Should this be static?
+	// TODO: Validate applicable types (e.g. a VARIABLE annotation that only applies to string variables).
+	register_annotation(MethodInfo("@tool"), AnnotationInfo::SCRIPT, &GDScriptParser::tool_annotation);
+	register_annotation(MethodInfo("@icon", { Variant::STRING, "icon_path" }), AnnotationInfo::SCRIPT, &GDScriptParser::icon_annotation);
+	register_annotation(MethodInfo("@onready"), AnnotationInfo::VARIABLE, &GDScriptParser::onready_annotation);
+	// Export annotations.
+	register_annotation(MethodInfo("@export"), AnnotationInfo::VARIABLE, &GDScriptParser::export_annotations<PROPERTY_HINT_TYPE_STRING, Variant::NIL>);
+	register_annotation(MethodInfo("@export_enum", { Variant::STRING, "names" }), AnnotationInfo::VARIABLE, &GDScriptParser::export_annotations<PROPERTY_HINT_ENUM, Variant::INT>, 0, true);
+	register_annotation(MethodInfo("@export_file", { Variant::STRING, "filter" }), AnnotationInfo::VARIABLE, &GDScriptParser::export_annotations<PROPERTY_HINT_FILE, Variant::STRING>, 1, true);
+	register_annotation(MethodInfo("@export_dir"), AnnotationInfo::VARIABLE, &GDScriptParser::export_annotations<PROPERTY_HINT_DIR, Variant::STRING>);
+	register_annotation(MethodInfo("@export_global_file", { Variant::STRING, "filter" }), AnnotationInfo::VARIABLE, &GDScriptParser::export_annotations<PROPERTY_HINT_GLOBAL_FILE, Variant::STRING>, 1, true);
+	register_annotation(MethodInfo("@export_global_dir"), AnnotationInfo::VARIABLE, &GDScriptParser::export_annotations<PROPERTY_HINT_GLOBAL_DIR, Variant::STRING>);
+	register_annotation(MethodInfo("@export_multiline"), AnnotationInfo::VARIABLE, &GDScriptParser::export_annotations<PROPERTY_HINT_MULTILINE_TEXT, Variant::STRING>);
+	register_annotation(MethodInfo("@export_placeholder"), AnnotationInfo::VARIABLE, &GDScriptParser::export_annotations<PROPERTY_HINT_PLACEHOLDER_TEXT, Variant::STRING>);
+	register_annotation(MethodInfo("@export_range", { Variant::FLOAT, "min" }, { Variant::FLOAT, "max" }, { Variant::FLOAT, "step" }, { Variant::STRING, "slider1" }, { Variant::STRING, "slider2" }), AnnotationInfo::VARIABLE, &GDScriptParser::export_annotations<PROPERTY_HINT_RANGE, Variant::FLOAT>, 3);
+	register_annotation(MethodInfo("@export_exp_range", { Variant::FLOAT, "min" }, { Variant::FLOAT, "max" }, { Variant::FLOAT, "step" }, { Variant::STRING, "slider1" }, { Variant::STRING, "slider2" }), AnnotationInfo::VARIABLE, &GDScriptParser::export_annotations<PROPERTY_HINT_EXP_RANGE, Variant::FLOAT>, 3);
+	register_annotation(MethodInfo("@export_exp_easing", { Variant::STRING, "hint1" }, { Variant::STRING, "hint2" }), AnnotationInfo::VARIABLE, &GDScriptParser::export_annotations<PROPERTY_HINT_EXP_EASING, Variant::FLOAT>, 2);
+	register_annotation(MethodInfo("@export_color_no_alpha"), AnnotationInfo::VARIABLE, &GDScriptParser::export_annotations<PROPERTY_HINT_COLOR_NO_ALPHA, Variant::COLOR>);
+	register_annotation(MethodInfo("@export_node_path", { Variant::STRING, "type" }), AnnotationInfo::VARIABLE, &GDScriptParser::export_annotations<PROPERTY_HINT_NODE_PATH_VALID_TYPES, Variant::NODE_PATH>, 1, true);
+	register_annotation(MethodInfo("@export_flags", { Variant::STRING, "names" }), AnnotationInfo::VARIABLE, &GDScriptParser::export_annotations<PROPERTY_HINT_FLAGS, Variant::INT>, 0, true);
+	register_annotation(MethodInfo("@export_flags_2d_render"), AnnotationInfo::VARIABLE, &GDScriptParser::export_annotations<PROPERTY_HINT_LAYERS_2D_RENDER, Variant::INT>);
+	register_annotation(MethodInfo("@export_flags_2d_physics"), AnnotationInfo::VARIABLE, &GDScriptParser::export_annotations<PROPERTY_HINT_LAYERS_2D_PHYSICS, Variant::INT>);
+	register_annotation(MethodInfo("@export_flags_3d_render"), AnnotationInfo::VARIABLE, &GDScriptParser::export_annotations<PROPERTY_HINT_LAYERS_3D_RENDER, Variant::INT>);
+	register_annotation(MethodInfo("@export_flags_3d_physics"), AnnotationInfo::VARIABLE, &GDScriptParser::export_annotations<PROPERTY_HINT_LAYERS_3D_PHYSICS, Variant::INT>);
+	// Networking.
+	register_annotation(MethodInfo("@remote"), AnnotationInfo::VARIABLE | AnnotationInfo::FUNCTION, &GDScriptParser::network_annotations<MultiplayerAPI::RPC_MODE_REMOTE>);
+	register_annotation(MethodInfo("@master"), AnnotationInfo::VARIABLE | AnnotationInfo::FUNCTION, &GDScriptParser::network_annotations<MultiplayerAPI::RPC_MODE_MASTER>);
+	register_annotation(MethodInfo("@puppet"), AnnotationInfo::VARIABLE | AnnotationInfo::FUNCTION, &GDScriptParser::network_annotations<MultiplayerAPI::RPC_MODE_PUPPET>);
+	register_annotation(MethodInfo("@remotesync"), AnnotationInfo::VARIABLE | AnnotationInfo::FUNCTION, &GDScriptParser::network_annotations<MultiplayerAPI::RPC_MODE_REMOTESYNC>);
+	register_annotation(MethodInfo("@mastersync"), AnnotationInfo::VARIABLE | AnnotationInfo::FUNCTION, &GDScriptParser::network_annotations<MultiplayerAPI::RPC_MODE_MASTERSYNC>);
+	register_annotation(MethodInfo("@puppetsync"), AnnotationInfo::VARIABLE | AnnotationInfo::FUNCTION, &GDScriptParser::network_annotations<MultiplayerAPI::RPC_MODE_PUPPETSYNC>);
+	// TODO: Warning annotations.
 }
 
-bool GDScriptParser::_enter_indent_block(BlockNode *p_block) {
+GDScriptParser::~GDScriptParser() {
+	clear();
+}
 
-	if (tokenizer->get_token() != GDScriptTokenizer::TK_COLON) {
-		// report location at the previous token (on the previous line)
-		int error_line = tokenizer->get_token_line(-1);
-		int error_column = tokenizer->get_token_column(-1);
-		_set_error("':' expected at end of line.", error_line, error_column);
-		return false;
+void GDScriptParser::clear() {
+	while (list != nullptr) {
+		Node *element = list;
+		list = list->next;
+		memdelete(element);
 	}
-	tokenizer->advance();
 
-	if (tokenizer->get_token() == GDScriptTokenizer::TK_EOF) {
-		return false;
-	}
+	head = nullptr;
+	list = nullptr;
+	_is_tool = false;
+	for_completion = false;
+	errors.clear();
+	multiline_stack.clear();
+}
 
-	if (tokenizer->get_token() != GDScriptTokenizer::TK_NEWLINE) {
-		// be more python-like
-		IndentLevel current_level = indent_level.back()->get();
-		indent_level.push_back(current_level);
-		return true;
-		//_set_error("newline expected after ':'.");
-		//return false;
+void GDScriptParser::push_error(const String &p_message, const Node *p_origin) {
+	// TODO: Improve error reporting by pointing at source code.
+	// TODO: Errors might point at more than one place at once (e.g. show previous declaration).
+	panic_mode = true;
+	// TODO: Improve positional information.
+	if (p_origin == nullptr) {
+		errors.push_back({ p_message, current.start_line, current.start_column });
+	} else {
+		errors.push_back({ p_message, p_origin->start_line, p_origin->leftmost_column });
 	}
+}
 
-	while (true) {
-		if (tokenizer->get_token() != GDScriptTokenizer::TK_NEWLINE) {
-
-			return false; //wtf
-		} else if (tokenizer->get_token(1) == GDScriptTokenizer::TK_EOF) {
-			return false;
-		} else if (tokenizer->get_token(1) != GDScriptTokenizer::TK_NEWLINE) {
-
-			int indent = tokenizer->get_token_line_indent();
-			int tabs = tokenizer->get_token_line_tab_indent();
-			IndentLevel current_level = indent_level.back()->get();
-			IndentLevel new_indent(indent, tabs);
-			if (new_indent.is_mixed(current_level)) {
-				_set_error("Mixed tabs and spaces in indentation.");
-				return false;
-			}
+#ifdef DEBUG_ENABLED
+void GDScriptParser::push_warning(const Node *p_source, GDScriptWarning::Code p_code, const String &p_symbol1, const String &p_symbol2, const String &p_symbol3, const String &p_symbol4) {
+	Vector<String> symbols;
+	if (!p_symbol1.empty()) {
+		symbols.push_back(p_symbol1);
+	}
+	if (!p_symbol2.empty()) {
+		symbols.push_back(p_symbol2);
+	}
+	if (!p_symbol3.empty()) {
+		symbols.push_back(p_symbol3);
+	}
+	if (!p_symbol4.empty()) {
+		symbols.push_back(p_symbol4);
+	}
+	push_warning(p_source, p_code, symbols);
+}
 
-			if (indent <= current_level.indent) {
-				return false;
-			}
+void GDScriptParser::push_warning(const Node *p_source, GDScriptWarning::Code p_code, const Vector<String> &p_symbols) {
+	if (is_ignoring_warnings) {
+		return;
+	}
+	if (GLOBAL_GET("debug/gdscript/warnings/exclude_addons").booleanize() && script_path.begins_with("res://addons/")) {
+		return;
+	}
 
-			indent_level.push_back(new_indent);
-			tokenizer->advance();
-			return true;
+	String warn_name = GDScriptWarning::get_name_from_code((GDScriptWarning::Code)p_code).to_lower();
+	if (ignored_warnings.has(warn_name)) {
+		return;
+	}
+	if (!GLOBAL_GET("debug/gdscript/warnings/" + warn_name)) {
+		return;
+	}
 
-		} else if (p_block) {
+	GDScriptWarning warning;
+	warning.code = p_code;
+	warning.symbols = p_symbols;
+	warning.start_line = p_source->start_line;
+	warning.end_line = p_source->end_line;
+	warning.leftmost_column = p_source->leftmost_column;
+	warning.rightmost_column = p_source->rightmost_column;
 
-			NewLineNode *nl = alloc_node<NewLineNode>();
-			nl->line = tokenizer->get_token_line();
-			p_block->statements.push_back(nl);
+	List<GDScriptWarning>::Element *before = nullptr;
+	for (List<GDScriptWarning>::Element *E = warnings.front(); E != nullptr; E = E->next()) {
+		if (E->get().start_line > warning.start_line) {
+			break;
 		}
+		before = E;
+	}
+	if (before) {
+		warnings.insert_after(before, warning);
+	} else {
+		warnings.push_front(warning);
+	}
+}
+#endif
 
-		tokenizer->advance(); // go to next newline
+void GDScriptParser::make_completion_context(CompletionType p_type, Node *p_node, int p_argument, bool p_force) {
+	if (!for_completion || (!p_force && completion_context.type != COMPLETION_NONE)) {
+		return;
 	}
+	if (previous.cursor_place != GDScriptTokenizer::CURSOR_MIDDLE && previous.cursor_place != GDScriptTokenizer::CURSOR_END && current.cursor_place == GDScriptTokenizer::CURSOR_NONE) {
+		return;
+	}
+	CompletionContext context;
+	context.type = p_type;
+	context.current_class = current_class;
+	context.current_function = current_function;
+	context.current_suite = current_suite;
+	context.current_line = tokenizer.get_cursor_line();
+	context.current_argument = p_argument;
+	context.node = p_node;
+	completion_context = context;
 }
 
-bool GDScriptParser::_parse_arguments(Node *p_parent, Vector<Node *> &p_args, bool p_static, bool p_can_codecomplete, bool p_parsing_constant) {
+void GDScriptParser::make_completion_context(CompletionType p_type, Variant::Type p_builtin_type, bool p_force) {
+	if (!for_completion || (!p_force && completion_context.type != COMPLETION_NONE)) {
+		return;
+	}
+	if (previous.cursor_place != GDScriptTokenizer::CURSOR_MIDDLE && previous.cursor_place != GDScriptTokenizer::CURSOR_END && current.cursor_place == GDScriptTokenizer::CURSOR_NONE) {
+		return;
+	}
+	CompletionContext context;
+	context.type = p_type;
+	context.current_class = current_class;
+	context.current_function = current_function;
+	context.current_suite = current_suite;
+	context.current_line = tokenizer.get_cursor_line();
+	context.builtin_type = p_builtin_type;
+	completion_context = context;
+}
 
-	if (tokenizer->get_token() == GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
-		tokenizer->advance();
-	} else {
+void GDScriptParser::push_completion_call(Node *p_call) {
+	if (!for_completion) {
+		return;
+	}
+	CompletionCall call;
+	call.call = p_call;
+	call.argument = 0;
+	completion_call_stack.push_back(call);
+	if (previous.cursor_place == GDScriptTokenizer::CURSOR_MIDDLE || previous.cursor_place == GDScriptTokenizer::CURSOR_END || current.cursor_place == GDScriptTokenizer::CURSOR_BEGINNING) {
+		completion_call = call;
+	}
+}
 
-		parenthesis++;
-		int argidx = 0;
+void GDScriptParser::pop_completion_call() {
+	if (!for_completion) {
+		return;
+	}
+	ERR_FAIL_COND_MSG(completion_call_stack.empty(), "Trying to pop empty completion call stack");
+	completion_call_stack.pop_back();
+}
 
-		while (true) {
+void GDScriptParser::set_last_completion_call_arg(int p_argument) {
+	if (!for_completion || passed_cursor) {
+		return;
+	}
+	ERR_FAIL_COND_MSG(completion_call_stack.empty(), "Trying to set argument on empty completion call stack");
+	completion_call_stack.back()->get().argument = p_argument;
+}
 
-			if (tokenizer->get_token() == GDScriptTokenizer::TK_CURSOR) {
-				_make_completable_call(argidx);
-				completion_node = p_parent;
-			} else if (tokenizer->get_token() == GDScriptTokenizer::TK_CONSTANT && tokenizer->get_token_constant().get_type() == Variant::STRING && tokenizer->get_token(1) == GDScriptTokenizer::TK_CURSOR) {
-				//completing a string argument..
-				completion_cursor = tokenizer->get_token_constant();
+Error GDScriptParser::parse(const String &p_source_code, const String &p_script_path, bool p_for_completion) {
+	clear();
 
-				_make_completable_call(argidx);
-				completion_node = p_parent;
-				tokenizer->advance(1);
-				return false;
-			}
+	String source = p_source_code;
+	int cursor_line = -1;
+	int cursor_column = -1;
+	for_completion = p_for_completion;
 
-			Node *arg = _parse_expression(p_parent, p_static, false, p_parsing_constant);
-			if (!arg) {
-				return false;
+	int tab_size = 4;
+#ifdef TOOLS_ENABLED
+	if (EditorSettings::get_singleton()) {
+		tab_size = EditorSettings::get_singleton()->get_setting("text_editor/indent/size");
+	}
+#endif // TOOLS_ENABLED
+
+	if (p_for_completion) {
+		// Remove cursor sentinel char.
+		const Vector<String> lines = p_source_code.split("\n");
+		cursor_line = 1;
+		cursor_column = 1;
+		for (int i = 0; i < lines.size(); i++) {
+			bool found = false;
+			const String &line = lines[i];
+			for (int j = 0; j < line.size(); j++) {
+				if (line[j] == char32_t(0xFFFF)) {
+					found = true;
+					break;
+				} else if (line[j] == '\t') {
+					cursor_column += tab_size - 1;
+				}
+				cursor_column++;
 			}
-
-			p_args.push_back(arg);
-
-			if (tokenizer->get_token() == GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
-				tokenizer->advance();
+			if (found) {
 				break;
+			}
+			cursor_line++;
+			cursor_column = 1;
+		}
 
-			} else if (tokenizer->get_token() == GDScriptTokenizer::TK_COMMA) {
+		source = source.replace_first(String::chr(0xFFFF), String());
+	}
 
-				if (tokenizer->get_token(1) == GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
+	tokenizer.set_source_code(source);
+	tokenizer.set_cursor_position(cursor_line, cursor_column);
+	script_path = p_script_path;
+	current = tokenizer.scan();
+	// Avoid error as the first token.
+	while (current.type == GDScriptTokenizer::Token::ERROR) {
+		push_error(current.literal);
+		current = tokenizer.scan();
+	}
 
-					_set_error("Expression expected");
-					return false;
-				}
+	push_multiline(false); // Keep one for the whole parsing.
+	parse_program();
+	pop_multiline();
 
-				tokenizer->advance();
-				argidx++;
-			} else {
-				// something is broken
-				_set_error("Expected ',' or ')'");
-				return false;
-			}
-		}
-		parenthesis--;
+#ifdef DEBUG_ENABLED
+	if (multiline_stack.size() > 0) {
+		ERR_PRINT("Parser bug: Imbalanced multiline stack.");
 	}
+#endif
 
-	return true;
+	if (errors.empty()) {
+		return OK;
+	} else {
+		return ERR_PARSE_ERROR;
+	}
 }
 
-void GDScriptParser::_make_completable_call(int p_arg) {
-
-	completion_cursor = StringName();
-	completion_type = COMPLETION_CALL_ARGUMENTS;
-	completion_class = current_class;
-	completion_function = current_function;
-	completion_line = tokenizer->get_token_line();
-	completion_argument = p_arg;
-	completion_block = current_block;
-	completion_found = true;
-	tokenizer->advance();
+GDScriptTokenizer::Token GDScriptParser::advance() {
+	if (current.type == GDScriptTokenizer::Token::TK_EOF) {
+		ERR_FAIL_COND_V_MSG(current.type == GDScriptTokenizer::Token::TK_EOF, current, "GDScript parser bug: Trying to advance past the end of stream.");
+	}
+	if (for_completion && !completion_call_stack.empty()) {
+		if (completion_call.call == nullptr && tokenizer.is_past_cursor()) {
+			completion_call = completion_call_stack.back()->get();
+			passed_cursor = true;
+		}
+	}
+	previous = current;
+	current = tokenizer.scan();
+	while (current.type == GDScriptTokenizer::Token::ERROR) {
+		push_error(current.literal);
+		current = tokenizer.scan();
+	}
+	return previous;
 }
 
-bool GDScriptParser::_get_completable_identifier(CompletionType p_type, StringName &identifier) {
-
-	identifier = StringName();
-	if (tokenizer->is_token_literal()) {
-		identifier = tokenizer->get_token_literal();
-		tokenizer->advance();
+bool GDScriptParser::match(GDScriptTokenizer::Token::Type p_token_type) {
+	if (!check(p_token_type)) {
+		return false;
 	}
-	if (tokenizer->get_token() == GDScriptTokenizer::TK_CURSOR) {
-
-		completion_cursor = identifier;
-		completion_type = p_type;
-		completion_class = current_class;
-		completion_function = current_function;
-		completion_line = tokenizer->get_token_line();
-		completion_block = current_block;
-		completion_found = true;
-		completion_ident_is_call = false;
-		tokenizer->advance();
+	advance();
+	return true;
+}
 
-		if (tokenizer->is_token_literal()) {
-			identifier = identifier.operator String() + tokenizer->get_token_literal().operator String();
-			tokenizer->advance();
-		}
+bool GDScriptParser::check(GDScriptTokenizer::Token::Type p_token_type) {
+	if (p_token_type == GDScriptTokenizer::Token::IDENTIFIER) {
+		return current.is_identifier();
+	}
+	return current.type == p_token_type;
+}
 
-		if (tokenizer->get_token() == GDScriptTokenizer::TK_PARENTHESIS_OPEN) {
-			completion_ident_is_call = true;
-		}
+bool GDScriptParser::consume(GDScriptTokenizer::Token::Type p_token_type, const String &p_error_message) {
+	if (match(p_token_type)) {
 		return true;
 	}
-
+	push_error(p_error_message);
 	return false;
 }
 
-GDScriptParser::Node *GDScriptParser::_parse_expression(Node *p_parent, bool p_static, bool p_allow_assign, bool p_parsing_constant) {
-
-	//Vector<Node*> expressions;
-	//Vector<OperatorNode::Operator> operators;
-
-	Vector<Expression> expression;
-
-	Node *expr = NULL;
-
-	int op_line = tokenizer->get_token_line(); // when operators are created at the bottom, the line might have been changed (\n found)
-
-	while (true) {
-
-		/*****************/
-		/* Parse Operand */
-		/*****************/
+bool GDScriptParser::is_at_end() {
+	return check(GDScriptTokenizer::Token::TK_EOF);
+}
 
-		if (parenthesis > 0) {
-			//remove empty space (only allowed if inside parenthesis
-			while (tokenizer->get_token() == GDScriptTokenizer::TK_NEWLINE) {
-				tokenizer->advance();
-			}
+void GDScriptParser::synchronize() {
+	panic_mode = false;
+	while (!is_at_end()) {
+		if (previous.type == GDScriptTokenizer::Token::NEWLINE || previous.type == GDScriptTokenizer::Token::SEMICOLON) {
+			return;
 		}
 
-		// Check that the next token is not TK_CURSOR and if it is, the offset should be incremented.
-		int next_valid_offset = 1;
-		if (tokenizer->get_token(next_valid_offset) == GDScriptTokenizer::TK_CURSOR) {
-			next_valid_offset++;
-			// There is a chunk of the identifier that also needs to be ignored (not always there!)
-			if (tokenizer->get_token(next_valid_offset) == GDScriptTokenizer::TK_IDENTIFIER) {
-				next_valid_offset++;
-			}
+		switch (current.type) {
+			case GDScriptTokenizer::Token::CLASS:
+			case GDScriptTokenizer::Token::FUNC:
+			case GDScriptTokenizer::Token::STATIC:
+			case GDScriptTokenizer::Token::VAR:
+			case GDScriptTokenizer::Token::CONST:
+			case GDScriptTokenizer::Token::SIGNAL:
+			//case GDScriptTokenizer::Token::IF: // Can also be inside expressions.
+			case GDScriptTokenizer::Token::FOR:
+			case GDScriptTokenizer::Token::WHILE:
+			case GDScriptTokenizer::Token::MATCH:
+			case GDScriptTokenizer::Token::RETURN:
+			case GDScriptTokenizer::Token::ANNOTATION:
+				return;
+			default:
+				// Do nothing.
+				break;
 		}
 
-		if (tokenizer->get_token() == GDScriptTokenizer::TK_PARENTHESIS_OPEN) {
-			//subexpression ()
-			tokenizer->advance();
-			parenthesis++;
-			Node *subexpr = _parse_expression(p_parent, p_static, p_allow_assign, p_parsing_constant);
-			parenthesis--;
-			if (!subexpr)
-				return NULL;
-
-			if (tokenizer->get_token() != GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
-
-				_set_error("Expected ')' in expression");
-				return NULL;
-			}
-
-			tokenizer->advance();
-			expr = subexpr;
-		} else if (tokenizer->get_token() == GDScriptTokenizer::TK_DOLLAR) {
-			tokenizer->advance();
-
-			String path;
-
-			bool need_identifier = true;
-			bool done = false;
-			int line = tokenizer->get_token_line();
-
-			while (!done) {
-
-				switch (tokenizer->get_token()) {
-					case GDScriptTokenizer::TK_CURSOR: {
-						completion_type = COMPLETION_GET_NODE;
-						completion_class = current_class;
-						completion_function = current_function;
-						completion_line = tokenizer->get_token_line();
-						completion_cursor = path;
-						completion_argument = 0;
-						completion_block = current_block;
-						completion_found = true;
-						tokenizer->advance();
-					} break;
-					case GDScriptTokenizer::TK_CONSTANT: {
-
-						if (!need_identifier) {
-							done = true;
-							break;
-						}
+		advance();
+	}
+}
 
-						if (tokenizer->get_token_constant().get_type() != Variant::STRING) {
-							_set_error("Expected string constant or identifier after '$' or '/'.");
-							return NULL;
-						}
+void GDScriptParser::push_multiline(bool p_state) {
+	multiline_stack.push_back(p_state);
+	tokenizer.set_multiline_mode(p_state);
+	if (p_state) {
+		// Consume potential whitespace tokens already waiting in line.
+		while (current.type == GDScriptTokenizer::Token::NEWLINE || current.type == GDScriptTokenizer::Token::INDENT || current.type == GDScriptTokenizer::Token::DEDENT) {
+			current = tokenizer.scan(); // Don't call advance() here, as we don't want to change the previous token.
+		}
+	}
+}
 
-						path += String(tokenizer->get_token_constant());
-						tokenizer->advance();
-						need_identifier = false;
+void GDScriptParser::pop_multiline() {
+	ERR_FAIL_COND_MSG(multiline_stack.size() == 0, "Parser bug: trying to pop from multiline stack without available value.");
+	multiline_stack.pop_back();
+	tokenizer.set_multiline_mode(multiline_stack.size() > 0 ? multiline_stack.back()->get() : false);
+}
 
-					} break;
-					case GDScriptTokenizer::TK_OP_DIV: {
+bool GDScriptParser::is_statement_end() {
+	return check(GDScriptTokenizer::Token::NEWLINE) || check(GDScriptTokenizer::Token::SEMICOLON) || check(GDScriptTokenizer::Token::TK_EOF);
+}
 
-						if (need_identifier) {
-							done = true;
-							break;
-						}
+void GDScriptParser::end_statement(const String &p_context) {
+	bool found = false;
+	while (is_statement_end() && !is_at_end()) {
+		// Remove sequential newlines/semicolons.
+		found = true;
+		advance();
+	}
+	if (!found && !is_at_end()) {
+		push_error(vformat(R"(Expected end of statement after %s, found "%s" instead.)", p_context, current.get_name()));
+	}
+}
 
-						path += "/";
-						tokenizer->advance();
-						need_identifier = true;
-
-					} break;
-					default: {
-						// Instead of checking for TK_IDENTIFIER, we check with is_token_literal, as this allows us to use match/sync/etc. as a name
-						if (need_identifier && tokenizer->is_token_literal()) {
-							path += String(tokenizer->get_token_literal());
-							tokenizer->advance();
-							need_identifier = false;
-						} else {
-							done = true;
-						}
+void GDScriptParser::parse_program() {
+	head = alloc_node<ClassNode>();
+	current_class = head;
 
-						break;
-					}
+	if (match(GDScriptTokenizer::Token::ANNOTATION)) {
+		// Check for @tool annotation.
+		AnnotationNode *annotation = parse_annotation(AnnotationInfo::SCRIPT | AnnotationInfo::CLASS_LEVEL);
+		if (annotation != nullptr) {
+			if (annotation->name == "@tool") {
+				// TODO: don't allow @tool anywhere else. (Should all script annotations be the first thing?).
+				_is_tool = true;
+				if (previous.type != GDScriptTokenizer::Token::NEWLINE) {
+					push_error(R"(Expected newline after "@tool" annotation.)");
 				}
+				// @tool annotation has no specific target.
+				annotation->apply(this, nullptr);
+			} else {
+				annotation_stack.push_back(annotation);
 			}
+		}
+	}
 
-			if (path == "") {
-				_set_error("Path expected after $.");
-				return NULL;
-			}
-
-			OperatorNode *op = alloc_node<OperatorNode>();
-			op->op = OperatorNode::OP_CALL;
-			op->line = line;
-			op->arguments.push_back(alloc_node<SelfNode>());
-			op->arguments[0]->line = line;
-
-			IdentifierNode *funcname = alloc_node<IdentifierNode>();
-			funcname->name = "get_node";
-			funcname->line = line;
-			op->arguments.push_back(funcname);
-
-			ConstantNode *nodepath = alloc_node<ConstantNode>();
-			nodepath->value = NodePath(StringName(path));
-			nodepath->datatype = _type_from_variant(nodepath->value);
-			nodepath->line = line;
-			op->arguments.push_back(nodepath);
-
-			expr = op;
-
-		} else if (tokenizer->get_token() == GDScriptTokenizer::TK_CURSOR) {
-			tokenizer->advance();
-			continue; //no point in cursor in the middle of expression
-
-		} else if (tokenizer->get_token() == GDScriptTokenizer::TK_CONSTANT) {
-
-			//constant defined by tokenizer
-			ConstantNode *constant = alloc_node<ConstantNode>();
-			constant->value = tokenizer->get_token_constant();
-			constant->datatype = _type_from_variant(constant->value);
-			tokenizer->advance();
-			expr = constant;
-		} else if (tokenizer->get_token() == GDScriptTokenizer::TK_CONST_PI) {
-
-			//constant defined by tokenizer
-			ConstantNode *constant = alloc_node<ConstantNode>();
-			constant->value = Math_PI;
-			constant->datatype = _type_from_variant(constant->value);
-			tokenizer->advance();
-			expr = constant;
-		} else if (tokenizer->get_token() == GDScriptTokenizer::TK_CONST_TAU) {
-
-			//constant defined by tokenizer
-			ConstantNode *constant = alloc_node<ConstantNode>();
-			constant->value = Math_TAU;
-			constant->datatype = _type_from_variant(constant->value);
-			tokenizer->advance();
-			expr = constant;
-		} else if (tokenizer->get_token() == GDScriptTokenizer::TK_CONST_INF) {
-
-			//constant defined by tokenizer
-			ConstantNode *constant = alloc_node<ConstantNode>();
-			constant->value = Math_INF;
-			constant->datatype = _type_from_variant(constant->value);
-			tokenizer->advance();
-			expr = constant;
-		} else if (tokenizer->get_token() == GDScriptTokenizer::TK_CONST_NAN) {
-
-			//constant defined by tokenizer
-			ConstantNode *constant = alloc_node<ConstantNode>();
-			constant->value = Math_NAN;
-			constant->datatype = _type_from_variant(constant->value);
-			tokenizer->advance();
-			expr = constant;
-		} else if (tokenizer->get_token() == GDScriptTokenizer::TK_PR_PRELOAD) {
-
-			//constant defined by tokenizer
-			tokenizer->advance();
-			if (tokenizer->get_token() != GDScriptTokenizer::TK_PARENTHESIS_OPEN) {
-				_set_error("Expected '(' after 'preload'");
-				return NULL;
-			}
-			tokenizer->advance();
-
-			if (tokenizer->get_token() == GDScriptTokenizer::TK_CURSOR) {
-				completion_cursor = StringName();
-				completion_node = p_parent;
-				completion_type = COMPLETION_RESOURCE_PATH;
-				completion_class = current_class;
-				completion_function = current_function;
-				completion_line = tokenizer->get_token_line();
-				completion_block = current_block;
-				completion_argument = 0;
-				completion_found = true;
-				tokenizer->advance();
-			}
-
-			String path;
-			bool found_constant = false;
-			bool valid = false;
-			ConstantNode *cn;
-
-			Node *subexpr = _parse_and_reduce_expression(p_parent, p_static);
-			if (subexpr) {
-				if (subexpr->type == Node::TYPE_CONSTANT) {
-					cn = static_cast<ConstantNode *>(subexpr);
-					found_constant = true;
-				}
-				if (subexpr->type == Node::TYPE_IDENTIFIER) {
-					IdentifierNode *in = static_cast<IdentifierNode *>(subexpr);
-
-					// Try to find the constant expression by the identifier
-					if (current_class->constant_expressions.has(in->name)) {
-						Node *cn_exp = current_class->constant_expressions[in->name].expression;
-						if (cn_exp->type == Node::TYPE_CONSTANT) {
-							cn = static_cast<ConstantNode *>(cn_exp);
-							found_constant = true;
-						}
-					}
-				}
-
-				if (found_constant && cn->value.get_type() == Variant::STRING) {
-					valid = true;
-					path = (String)cn->value;
+	for (bool should_break = false; !should_break;) {
+		// Order here doesn't matter, but there should be only one of each at most.
+		switch (current.type) {
+			case GDScriptTokenizer::Token::CLASS_NAME:
+				if (!annotation_stack.empty()) {
+					push_error(R"("class_name" should be used before annotations.)");
 				}
-			}
-
-			if (!valid) {
-				_set_error("expected string constant as 'preload' argument.");
-				return NULL;
-			}
-
-			if (!path.is_abs_path() && base_path != "")
-				path = base_path.plus_file(path);
-			path = path.replace("///", "//").simplify_path();
-			if (path == self_path) {
-
-				_set_error("Can't preload itself (use 'get_script()').");
-				return NULL;
-			}
-
-			Ref<Resource> res;
-			dependencies.push_back(path);
-			if (!dependencies_only) {
-				if (!validating) {
-
-					//this can be too slow for just validating code
-					if (for_completion && ScriptCodeCompletionCache::get_singleton() && FileAccess::exists(path)) {
-						res = ScriptCodeCompletionCache::get_singleton()->get_cached_resource(path);
-					} else if (!for_completion || FileAccess::exists(path)) {
-						res = ResourceLoader::load(path);
-					}
+				advance();
+				if (head->identifier != nullptr) {
+					push_error(R"("class_name" can only be used once.)");
 				} else {
-
-					if (!FileAccess::exists(path)) {
-						_set_error("Can't preload resource at path: " + path);
-						return NULL;
-					} else if (ScriptCodeCompletionCache::get_singleton()) {
-						res = ScriptCodeCompletionCache::get_singleton()->get_cached_resource(path);
-					}
+					parse_class_name();
 				}
-				if (!res.is_valid()) {
-					_set_error("Can't preload resource at path: " + path);
-					return NULL;
-				}
-			}
-
-			if (tokenizer->get_token() != GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
-				_set_error("Expected ')' after 'preload' path");
-				return NULL;
-			}
-
-			Ref<GDScript> gds = res;
-			if (gds.is_valid() && !gds->is_valid()) {
-				_set_error("Couldn't fully preload the script, possible cyclic reference or compilation error. Use \"load()\" instead if a cyclic reference is intended.");
-				return NULL;
-			}
-
-			tokenizer->advance();
-
-			ConstantNode *constant = alloc_node<ConstantNode>();
-			constant->value = res;
-			constant->datatype = _type_from_variant(constant->value);
-
-			expr = constant;
-		} else if (tokenizer->get_token() == GDScriptTokenizer::TK_PR_YIELD) {
-
-			if (!current_function) {
-				_set_error("\"yield()\" can only be used inside function blocks.");
-				return NULL;
-			}
-
-			current_function->has_yield = true;
-
-			tokenizer->advance();
-			if (tokenizer->get_token() != GDScriptTokenizer::TK_PARENTHESIS_OPEN) {
-				_set_error("Expected \"(\" after \"yield\".");
-				return NULL;
-			}
-
-			tokenizer->advance();
-
-			OperatorNode *yield = alloc_node<OperatorNode>();
-			yield->op = OperatorNode::OP_YIELD;
-
-			while (tokenizer->get_token() == GDScriptTokenizer::TK_NEWLINE) {
-				tokenizer->advance();
-			}
-
-			if (tokenizer->get_token() == GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
-				expr = yield;
-				tokenizer->advance();
-			} else {
-
-				parenthesis++;
-
-				Node *object = _parse_and_reduce_expression(p_parent, p_static);
-				if (!object)
-					return NULL;
-				yield->arguments.push_back(object);
-
-				if (tokenizer->get_token() != GDScriptTokenizer::TK_COMMA) {
-					_set_error("Expected \",\" after the first argument of \"yield\".");
-					return NULL;
+				break;
+			case GDScriptTokenizer::Token::EXTENDS:
+				if (!annotation_stack.empty()) {
+					push_error(R"("extends" should be used before annotations.)");
 				}
-
-				tokenizer->advance();
-
-				if (tokenizer->get_token() == GDScriptTokenizer::TK_CURSOR) {
-
-					completion_cursor = StringName();
-					completion_node = object;
-					completion_type = COMPLETION_YIELD;
-					completion_class = current_class;
-					completion_function = current_function;
-					completion_line = tokenizer->get_token_line();
-					completion_argument = 0;
-					completion_block = current_block;
-					completion_found = true;
-					tokenizer->advance();
+				advance();
+				if (head->extends_used) {
+					push_error(R"("extends" can only be used once.)");
+				} else {
+					parse_extends();
+					end_statement("superclass");
 				}
+				break;
+			default:
+				should_break = true;
+				break;
+		}
 
-				Node *signal = _parse_and_reduce_expression(p_parent, p_static);
-				if (!signal)
-					return NULL;
-				yield->arguments.push_back(signal);
+		if (panic_mode) {
+			synchronize();
+		}
+	}
 
-				if (tokenizer->get_token() != GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
-					_set_error("Expected \")\" after the second argument of \"yield\".");
-					return NULL;
+	if (match(GDScriptTokenizer::Token::ANNOTATION)) {
+		// Check for @icon annotation.
+		AnnotationNode *annotation = parse_annotation(AnnotationInfo::SCRIPT | AnnotationInfo::CLASS_LEVEL);
+		if (annotation != nullptr) {
+			if (annotation->name == "@icon") {
+				if (previous.type != GDScriptTokenizer::Token::NEWLINE) {
+					push_error(R"(Expected newline after "@icon" annotation.)");
 				}
-
-				parenthesis--;
-
-				tokenizer->advance();
-
-				expr = yield;
+				annotation->apply(this, head);
+			} else {
+				annotation_stack.push_back(annotation);
 			}
+		}
+	}
 
-		} else if (tokenizer->get_token() == GDScriptTokenizer::TK_SELF) {
-
-			if (p_static) {
-				_set_error("\"self\" isn't allowed in a static function or constant expression.");
-				return NULL;
-			}
-			//constant defined by tokenizer
-			SelfNode *self = alloc_node<SelfNode>();
-			tokenizer->advance();
-			expr = self;
-		} else if (tokenizer->get_token() == GDScriptTokenizer::TK_BUILT_IN_TYPE && tokenizer->get_token(1) == GDScriptTokenizer::TK_PERIOD) {
+	parse_class_body();
 
-			Variant::Type bi_type = tokenizer->get_token_type();
-			tokenizer->advance(2);
+	if (!check(GDScriptTokenizer::Token::TK_EOF)) {
+		push_error("Expected end of file.");
+	}
 
-			StringName identifier;
+	clear_unused_annotations();
+}
 
-			if (_get_completable_identifier(COMPLETION_BUILT_IN_TYPE_CONSTANT, identifier)) {
+GDScriptParser::ClassNode *GDScriptParser::parse_class() {
+	ClassNode *n_class = alloc_node<ClassNode>();
 
-				completion_built_in_constant = bi_type;
-			}
+	ClassNode *previous_class = current_class;
+	current_class = n_class;
+	n_class->outer = previous_class;
 
-			if (identifier == StringName()) {
-
-				_set_error("Built-in type constant or static function expected after \".\".");
-				return NULL;
-			}
-			if (!Variant::has_constant(bi_type, identifier)) {
+	if (consume(GDScriptTokenizer::Token::IDENTIFIER, R"(Expected identifier for the class name after "class".)")) {
+		n_class->identifier = parse_identifier();
+	}
 
-				if (tokenizer->get_token() == GDScriptTokenizer::TK_PARENTHESIS_OPEN &&
-						Variant::is_method_const(bi_type, identifier) &&
-						Variant::get_method_return_type(bi_type, identifier) == bi_type) {
+	if (match(GDScriptTokenizer::Token::EXTENDS)) {
+		parse_extends();
+	}
 
-					tokenizer->advance();
+	consume(GDScriptTokenizer::Token::COLON, R"(Expected ":" after class declaration.)");
+	consume(GDScriptTokenizer::Token::NEWLINE, R"(Expected newline after class declaration.)");
 
-					OperatorNode *construct = alloc_node<OperatorNode>();
-					construct->op = OperatorNode::OP_CALL;
+	if (!consume(GDScriptTokenizer::Token::INDENT, R"(Expected indented block after class declaration.)")) {
+		current_class = previous_class;
+		return n_class;
+	}
 
-					TypeNode *tn = alloc_node<TypeNode>();
-					tn->vtype = bi_type;
-					construct->arguments.push_back(tn);
+	if (match(GDScriptTokenizer::Token::EXTENDS)) {
+		if (n_class->extends_used) {
+			push_error(R"(Cannot use "extends" more than once in the same class.)");
+		}
+		parse_extends();
+		end_statement("superclass");
+	}
 
-					OperatorNode *op = alloc_node<OperatorNode>();
-					op->op = OperatorNode::OP_CALL;
-					op->arguments.push_back(construct);
+	parse_class_body();
 
-					IdentifierNode *id = alloc_node<IdentifierNode>();
-					id->name = identifier;
-					op->arguments.push_back(id);
+	consume(GDScriptTokenizer::Token::DEDENT, R"(Missing unindent at the end of the class body.)");
 
-					if (!_parse_arguments(op, op->arguments, p_static, true, p_parsing_constant))
-						return NULL;
+	current_class = previous_class;
+	return n_class;
+}
 
-					expr = op;
-				} else {
-					// Object is a special case
-					bool valid = false;
-					if (bi_type == Variant::OBJECT) {
-						int object_constant = ClassDB::get_integer_constant("Object", identifier, &valid);
-						if (valid) {
-							ConstantNode *cn = alloc_node<ConstantNode>();
-							cn->value = object_constant;
-							cn->datatype = _type_from_variant(cn->value);
-							expr = cn;
-						}
-					}
-					if (!valid) {
-						_set_error("Static constant  '" + identifier.operator String() + "' not present in built-in type " + Variant::get_type_name(bi_type) + ".");
-						return NULL;
-					}
-				}
-			} else {
+void GDScriptParser::parse_class_name() {
+	if (consume(GDScriptTokenizer::Token::IDENTIFIER, R"(Expected identifier for the global class name after "class_name".)")) {
+		current_class->identifier = parse_identifier();
+	}
 
-				ConstantNode *cn = alloc_node<ConstantNode>();
-				cn->value = Variant::get_constant_value(bi_type, identifier);
-				cn->datatype = _type_from_variant(cn->value);
-				expr = cn;
+	// TODO: Move this to annotation
+	if (match(GDScriptTokenizer::Token::COMMA)) {
+		// Icon path.
+		if (consume(GDScriptTokenizer::Token::LITERAL, R"(Expected class icon path string after ",".)")) {
+			if (previous.literal.get_type() != Variant::STRING) {
+				push_error(vformat(R"(Only strings can be used for the class icon path, found "%s" instead.)", Variant::get_type_name(previous.literal.get_type())));
 			}
+			current_class->icon_path = previous.literal;
+		}
+	}
 
-		} else if (tokenizer->get_token(next_valid_offset) == GDScriptTokenizer::TK_PARENTHESIS_OPEN && tokenizer->is_token_literal()) {
-			// We check with is_token_literal, as this allows us to use match/sync/etc. as a name
-			//function or constructor
-
-			OperatorNode *op = alloc_node<OperatorNode>();
-			op->op = OperatorNode::OP_CALL;
-
-			//Do a quick Array and Dictionary Check.  Replace if either require no arguments.
-			bool replaced = false;
-
-			if (tokenizer->get_token() == GDScriptTokenizer::TK_BUILT_IN_TYPE) {
-				Variant::Type ct = tokenizer->get_token_type();
-				if (!p_parsing_constant) {
-					if (ct == Variant::ARRAY) {
-						if (tokenizer->get_token(2) == GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
-							ArrayNode *arr = alloc_node<ArrayNode>();
-							expr = arr;
-							replaced = true;
-							tokenizer->advance(3);
-						}
-					}
-					if (ct == Variant::DICTIONARY) {
-						if (tokenizer->get_token(2) == GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
-							DictionaryNode *dict = alloc_node<DictionaryNode>();
-							expr = dict;
-							replaced = true;
-							tokenizer->advance(3);
-						}
-					}
-				}
-
-				if (!replaced) {
-					TypeNode *tn = alloc_node<TypeNode>();
-					tn->vtype = tokenizer->get_token_type();
-					op->arguments.push_back(tn);
-					tokenizer->advance(2);
-				}
-			} else if (tokenizer->get_token() == GDScriptTokenizer::TK_BUILT_IN_FUNC) {
-
-				BuiltInFunctionNode *bn = alloc_node<BuiltInFunctionNode>();
-				bn->function = tokenizer->get_token_built_in_func();
-				op->arguments.push_back(bn);
-				tokenizer->advance(2);
-			} else {
-
-				SelfNode *self = alloc_node<SelfNode>();
-				op->arguments.push_back(self);
-
-				StringName identifier;
-				if (_get_completable_identifier(COMPLETION_FUNCTION, identifier)) {
-				}
+	if (match(GDScriptTokenizer::Token::EXTENDS)) {
+		// Allow extends on the same line.
+		parse_extends();
+		end_statement("superclass");
+	} else {
+		end_statement("class_name statement");
+	}
+}
 
-				IdentifierNode *id = alloc_node<IdentifierNode>();
-				id->name = identifier;
-				op->arguments.push_back(id);
-				tokenizer->advance(1);
-			}
+void GDScriptParser::parse_extends() {
+	current_class->extends_used = true;
 
-			if (tokenizer->get_token() == GDScriptTokenizer::TK_CURSOR) {
-				_make_completable_call(0);
-				completion_node = op;
-			}
-			if (!replaced) {
-				if (!_parse_arguments(op, op->arguments, p_static, true, p_parsing_constant))
-					return NULL;
-				expr = op;
-			}
-		} else if (tokenizer->is_token_literal(0, true)) {
-			// We check with is_token_literal, as this allows us to use match/sync/etc. as a name
-			//identifier (reference)
-
-			const ClassNode *cln = current_class;
-			bool bfn = false;
-			StringName identifier;
-			int id_line = tokenizer->get_token_line();
-			if (_get_completable_identifier(COMPLETION_IDENTIFIER, identifier)) {
-			}
+	int chain_index = 0;
 
-			BlockNode *b = current_block;
-			while (!bfn && b) {
-				if (b->variables.has(identifier)) {
-					IdentifierNode *id = alloc_node<IdentifierNode>();
-					id->name = identifier;
-					id->declared_block = b;
-					id->line = id_line;
-					expr = id;
-					bfn = true;
+	if (match(GDScriptTokenizer::Token::LITERAL)) {
+		if (previous.literal.get_type() != Variant::STRING) {
+			push_error(vformat(R"(Only strings or identifiers can be used after "extends", found "%s" instead.)", Variant::get_type_name(previous.literal.get_type())));
+		}
+		current_class->extends_path = previous.literal;
 
-#ifdef DEBUG_ENABLED
-					LocalVarNode *lv = b->variables[identifier];
-					switch (tokenizer->get_token()) {
-						case GDScriptTokenizer::TK_OP_ASSIGN_ADD:
-						case GDScriptTokenizer::TK_OP_ASSIGN_BIT_AND:
-						case GDScriptTokenizer::TK_OP_ASSIGN_BIT_OR:
-						case GDScriptTokenizer::TK_OP_ASSIGN_BIT_XOR:
-						case GDScriptTokenizer::TK_OP_ASSIGN_DIV:
-						case GDScriptTokenizer::TK_OP_ASSIGN_MOD:
-						case GDScriptTokenizer::TK_OP_ASSIGN_MUL:
-						case GDScriptTokenizer::TK_OP_ASSIGN_SHIFT_LEFT:
-						case GDScriptTokenizer::TK_OP_ASSIGN_SHIFT_RIGHT:
-						case GDScriptTokenizer::TK_OP_ASSIGN_SUB: {
-							if (lv->assignments == 0) {
-								if (!lv->datatype.has_type) {
-									_set_error("Using assignment with operation on a variable that was never assigned.");
-									return NULL;
-								}
-								_add_warning(GDScriptWarning::UNASSIGNED_VARIABLE_OP_ASSIGN, -1, identifier.operator String());
-							}
-							FALLTHROUGH;
-						}
-						case GDScriptTokenizer::TK_OP_ASSIGN: {
-							lv->assignments += 1;
-							lv->usages--; // Assignment is not really usage
-						} break;
-						default: {
-							lv->usages++;
-						}
-					}
-#endif // DEBUG_ENABLED
-					break;
-				}
-				b = b->parent_block;
-			}
+		if (!match(GDScriptTokenizer::Token::PERIOD)) {
+			return;
+		}
+	}
 
-			if (!bfn && p_parsing_constant) {
-				if (cln->constant_expressions.has(identifier)) {
-					expr = cln->constant_expressions[identifier].expression;
-					bfn = true;
-				} else if (GDScriptLanguage::get_singleton()->get_global_map().has(identifier)) {
-					//check from constants
-					ConstantNode *constant = alloc_node<ConstantNode>();
-					constant->value = GDScriptLanguage::get_singleton()->get_global_array()[GDScriptLanguage::get_singleton()->get_global_map()[identifier]];
-					constant->datatype = _type_from_variant(constant->value);
-					constant->line = id_line;
-					expr = constant;
-					bfn = true;
-				}
+	make_completion_context(COMPLETION_INHERIT_TYPE, current_class, chain_index++);
 
-				if (!bfn && GDScriptLanguage::get_singleton()->get_named_globals_map().has(identifier)) {
-					//check from singletons
-					ConstantNode *constant = alloc_node<ConstantNode>();
-					constant->value = GDScriptLanguage::get_singleton()->get_named_globals_map()[identifier];
-					expr = constant;
-					bfn = true;
-				}
+	if (!consume(GDScriptTokenizer::Token::IDENTIFIER, R"(Expected superclass name after "extends".)")) {
+		return;
+	}
+	current_class->extends.push_back(previous.literal);
 
-				if (!dependencies_only) {
-					if (!bfn && ScriptServer::is_global_class(identifier)) {
-						Ref<Script> scr = ResourceLoader::load(ScriptServer::get_global_class_path(identifier));
-						if (scr.is_valid() && scr->is_valid()) {
-							ConstantNode *constant = alloc_node<ConstantNode>();
-							constant->value = scr;
-							expr = constant;
-							bfn = true;
-						}
-					}
+	while (match(GDScriptTokenizer::Token::PERIOD)) {
+		make_completion_context(COMPLETION_INHERIT_TYPE, current_class, chain_index++);
+		if (!consume(GDScriptTokenizer::Token::IDENTIFIER, R"(Expected superclass name after ".".)")) {
+			return;
+		}
+		current_class->extends.push_back(previous.literal);
+	}
+}
 
-					// Check parents for the constant
-					if (!bfn) {
-						// Using current_class instead of cln here, since cln is const*
-						_determine_inheritance(current_class, false);
-						if (cln->base_type.has_type && cln->base_type.kind == DataType::GDSCRIPT && cln->base_type.script_type->is_valid()) {
-							Map<StringName, Variant> parent_constants;
-							current_class->base_type.script_type->get_constants(&parent_constants);
-							if (parent_constants.has(identifier)) {
-								ConstantNode *constant = alloc_node<ConstantNode>();
-								constant->value = parent_constants[identifier];
-								expr = constant;
-								bfn = true;
-							}
-						}
-					}
-				}
-			}
+template <class T>
+void GDScriptParser::parse_class_member(T *(GDScriptParser::*p_parse_function)(), AnnotationInfo::TargetKind p_target, const String &p_member_kind) {
+	advance();
+	T *member = (this->*p_parse_function)();
+	if (member == nullptr) {
+		return;
+	}
+	// Consume annotations.
+	while (!annotation_stack.empty()) {
+		AnnotationNode *last_annotation = annotation_stack.back()->get();
+		if (last_annotation->applies_to(p_target)) {
+			last_annotation->apply(this, member);
+			member->annotations.push_front(last_annotation);
+			annotation_stack.pop_back();
+		} else {
+			push_error(vformat(R"(Annotation "%s" cannot be applied to a %s.)", last_annotation->name, p_member_kind));
+			clear_unused_annotations();
+			return;
+		}
+	}
+	if (member->identifier != nullptr) {
+		// Enums may be unnamed.
+		// TODO: Consider names in outer scope too, for constants and classes (and static functions?)
+		if (current_class->members_indices.has(member->identifier->name)) {
+			push_error(vformat(R"(%s "%s" has the same name as a previously declared %s.)", p_member_kind.capitalize(), member->identifier->name, current_class->get_member(member->identifier->name).get_type_name()), member->identifier);
+		} else {
+			current_class->add_member(member);
+		}
+	}
+}
 
-			if (!bfn) {
-#ifdef DEBUG_ENABLED
-				if (current_function) {
-					int arg_idx = current_function->arguments.find(identifier);
-					if (arg_idx != -1) {
-						switch (tokenizer->get_token()) {
-							case GDScriptTokenizer::TK_OP_ASSIGN_ADD:
-							case GDScriptTokenizer::TK_OP_ASSIGN_BIT_AND:
-							case GDScriptTokenizer::TK_OP_ASSIGN_BIT_OR:
-							case GDScriptTokenizer::TK_OP_ASSIGN_BIT_XOR:
-							case GDScriptTokenizer::TK_OP_ASSIGN_DIV:
-							case GDScriptTokenizer::TK_OP_ASSIGN_MOD:
-							case GDScriptTokenizer::TK_OP_ASSIGN_MUL:
-							case GDScriptTokenizer::TK_OP_ASSIGN_SHIFT_LEFT:
-							case GDScriptTokenizer::TK_OP_ASSIGN_SHIFT_RIGHT:
-							case GDScriptTokenizer::TK_OP_ASSIGN_SUB:
-							case GDScriptTokenizer::TK_OP_ASSIGN: {
-								// Assignment is not really usage
-							} break;
-							default: {
-								current_function->arguments_usage.write[arg_idx] = current_function->arguments_usage[arg_idx] + 1;
-							}
-						}
-					}
+void GDScriptParser::parse_class_body() {
+	bool class_end = false;
+	while (!class_end && !is_at_end()) {
+		switch (current.type) {
+			case GDScriptTokenizer::Token::VAR:
+				parse_class_member(&GDScriptParser::parse_variable, AnnotationInfo::VARIABLE, "variable");
+				break;
+			case GDScriptTokenizer::Token::CONST:
+				parse_class_member(&GDScriptParser::parse_constant, AnnotationInfo::CONSTANT, "constant");
+				break;
+			case GDScriptTokenizer::Token::SIGNAL:
+				parse_class_member(&GDScriptParser::parse_signal, AnnotationInfo::SIGNAL, "signal");
+				break;
+			case GDScriptTokenizer::Token::STATIC:
+			case GDScriptTokenizer::Token::FUNC:
+				parse_class_member(&GDScriptParser::parse_function, AnnotationInfo::FUNCTION, "function");
+				break;
+			case GDScriptTokenizer::Token::CLASS:
+				parse_class_member(&GDScriptParser::parse_class, AnnotationInfo::CLASS, "class");
+				break;
+			case GDScriptTokenizer::Token::ENUM:
+				parse_class_member(&GDScriptParser::parse_enum, AnnotationInfo::NONE, "enum");
+				break;
+			case GDScriptTokenizer::Token::ANNOTATION: {
+				advance();
+				AnnotationNode *annotation = parse_annotation(AnnotationInfo::CLASS_LEVEL);
+				if (annotation != nullptr) {
+					annotation_stack.push_back(annotation);
 				}
-#endif // DEBUG_ENABLED
-				IdentifierNode *id = alloc_node<IdentifierNode>();
-				id->name = identifier;
-				id->line = id_line;
-				expr = id;
+				break;
 			}
+			case GDScriptTokenizer::Token::PASS:
+				advance();
+				end_statement(R"("pass")");
+				break;
+			case GDScriptTokenizer::Token::DEDENT:
+				class_end = true;
+				break;
+			default:
+				push_error(vformat(R"(Unexpected "%s" in class body.)", current.get_name()));
+				advance();
+				break;
+		}
+		if (panic_mode) {
+			synchronize();
+		}
+	}
+}
 
-		} else if (tokenizer->get_token() == GDScriptTokenizer::TK_OP_ADD || tokenizer->get_token() == GDScriptTokenizer::TK_OP_SUB || tokenizer->get_token() == GDScriptTokenizer::TK_OP_NOT || tokenizer->get_token() == GDScriptTokenizer::TK_OP_BIT_INVERT) {
-
-			//single prefix operators like !expr +expr -expr ++expr --expr
-			alloc_node<OperatorNode>();
-			Expression e;
-			e.is_op = true;
+GDScriptParser::VariableNode *GDScriptParser::parse_variable() {
+	return parse_variable(true);
+}
 
-			switch (tokenizer->get_token()) {
-				case GDScriptTokenizer::TK_OP_ADD: e.op = OperatorNode::OP_POS; break;
-				case GDScriptTokenizer::TK_OP_SUB: e.op = OperatorNode::OP_NEG; break;
-				case GDScriptTokenizer::TK_OP_NOT: e.op = OperatorNode::OP_NOT; break;
-				case GDScriptTokenizer::TK_OP_BIT_INVERT: e.op = OperatorNode::OP_BIT_INVERT; break;
-				default: {
-				}
-			}
+GDScriptParser::VariableNode *GDScriptParser::parse_variable(bool p_allow_property) {
+	if (!consume(GDScriptTokenizer::Token::IDENTIFIER, R"(Expected variable name after "var".)")) {
+		return nullptr;
+	}
 
-			tokenizer->advance();
+	VariableNode *variable = alloc_node<VariableNode>();
+	variable->identifier = parse_identifier();
 
-			if (e.op != OperatorNode::OP_NOT && tokenizer->get_token() == GDScriptTokenizer::TK_OP_NOT) {
-				_set_error("Misplaced 'not'.");
-				return NULL;
-			}
+	if (match(GDScriptTokenizer::Token::COLON)) {
+		if (check(GDScriptTokenizer::Token::NEWLINE)) {
+			if (p_allow_property) {
+				advance();
 
-			expression.push_back(e);
-			continue; //only exception, must continue...
-
-			/*
-			Node *subexpr=_parse_expression(op,p_static);
-			if (!subexpr)
-				return NULL;
-			op->arguments.push_back(subexpr);
-			expr=op;*/
-
-		} else if (tokenizer->get_token() == GDScriptTokenizer::TK_PR_IS && tokenizer->get_token(1) == GDScriptTokenizer::TK_BUILT_IN_TYPE) {
-			// 'is' operator with built-in type
-			if (!expr) {
-				_set_error("Expected identifier before 'is' operator");
-				return NULL;
+				return parse_property(variable, true);
+			} else {
+				push_error(R"(Expected type after ":")");
+				return nullptr;
 			}
-			OperatorNode *op = alloc_node<OperatorNode>();
-			op->op = OperatorNode::OP_IS_BUILTIN;
-			op->arguments.push_back(expr);
-
-			tokenizer->advance();
-
-			TypeNode *tn = alloc_node<TypeNode>();
-			tn->vtype = tokenizer->get_token_type();
-			op->arguments.push_back(tn);
-			tokenizer->advance();
-
-			expr = op;
-		} else if (tokenizer->get_token() == GDScriptTokenizer::TK_BRACKET_OPEN) {
-			// array
-			tokenizer->advance();
-
-			ArrayNode *arr = alloc_node<ArrayNode>();
-			bool expecting_comma = false;
-
-			while (true) {
-
-				if (tokenizer->get_token() == GDScriptTokenizer::TK_EOF) {
-
-					_set_error("Unterminated array");
-					return NULL;
-
-				} else if (tokenizer->get_token() == GDScriptTokenizer::TK_BRACKET_CLOSE) {
-					tokenizer->advance();
-					break;
-				} else if (tokenizer->get_token() == GDScriptTokenizer::TK_NEWLINE) {
-
-					tokenizer->advance(); //ignore newline
-				} else if (tokenizer->get_token() == GDScriptTokenizer::TK_COMMA) {
-					if (!expecting_comma) {
-						_set_error("expression or ']' expected");
-						return NULL;
-					}
-
-					expecting_comma = false;
-					tokenizer->advance(); //ignore newline
-				} else {
-					//parse expression
-					if (expecting_comma) {
-						_set_error("',' or ']' expected");
-						return NULL;
+		} else if (check((GDScriptTokenizer::Token::EQUAL))) {
+			// Infer type.
+			variable->infer_datatype = true;
+		} else {
+			if (p_allow_property) {
+				make_completion_context(COMPLETION_PROPERTY_DECLARATION_OR_TYPE, variable);
+				if (check(GDScriptTokenizer::Token::IDENTIFIER)) {
+					// Check if get or set.
+					if (current.get_identifier() == "get" || current.get_identifier() == "set") {
+						return parse_property(variable, false);
 					}
-					Node *n = _parse_expression(arr, p_static, p_allow_assign, p_parsing_constant);
-					if (!n)
-						return NULL;
-					arr->elements.push_back(n);
-					expecting_comma = true;
 				}
 			}
 
-			expr = arr;
-		} else if (tokenizer->get_token() == GDScriptTokenizer::TK_CURLY_BRACKET_OPEN) {
-			// array
-			tokenizer->advance();
-
-			DictionaryNode *dict = alloc_node<DictionaryNode>();
-
-			enum DictExpect {
-
-				DICT_EXPECT_KEY,
-				DICT_EXPECT_COLON,
-				DICT_EXPECT_VALUE,
-				DICT_EXPECT_COMMA
-
-			};
-
-			Node *key = NULL;
-			Set<Variant> keys;
-
-			DictExpect expecting = DICT_EXPECT_KEY;
-
-			while (true) {
-
-				if (tokenizer->get_token() == GDScriptTokenizer::TK_EOF) {
-
-					_set_error("Unterminated dictionary");
-					return NULL;
-
-				} else if (tokenizer->get_token() == GDScriptTokenizer::TK_CURLY_BRACKET_CLOSE) {
+			// Parse type.
+			variable->datatype_specifier = parse_type();
+		}
+	}
 
-					if (expecting == DICT_EXPECT_COLON) {
-						_set_error("':' expected");
-						return NULL;
-					}
-					if (expecting == DICT_EXPECT_VALUE) {
-						_set_error("value expected");
-						return NULL;
-					}
-					tokenizer->advance();
-					break;
-				} else if (tokenizer->get_token() == GDScriptTokenizer::TK_NEWLINE) {
+	if (match(GDScriptTokenizer::Token::EQUAL)) {
+		// Initializer.
+		variable->initializer = parse_expression(false);
+		variable->assignments++;
+	}
 
-					tokenizer->advance(); //ignore newline
-				} else if (tokenizer->get_token() == GDScriptTokenizer::TK_COMMA) {
+	if (p_allow_property && match(GDScriptTokenizer::Token::COLON)) {
+		if (match(GDScriptTokenizer::Token::NEWLINE)) {
+			return parse_property(variable, true);
+		} else {
+			return parse_property(variable, false);
+		}
+	}
 
-					if (expecting == DICT_EXPECT_KEY) {
-						_set_error("key or '}' expected");
-						return NULL;
-					}
-					if (expecting == DICT_EXPECT_VALUE) {
-						_set_error("value expected");
-						return NULL;
-					}
-					if (expecting == DICT_EXPECT_COLON) {
-						_set_error("':' expected");
-						return NULL;
-					}
+	end_statement("variable declaration");
 
-					expecting = DICT_EXPECT_KEY;
-					tokenizer->advance(); //ignore newline
+	variable->export_info.name = variable->identifier->name;
 
-				} else if (tokenizer->get_token() == GDScriptTokenizer::TK_COLON) {
+	return variable;
+}
 
-					if (expecting == DICT_EXPECT_KEY) {
-						_set_error("key or '}' expected");
-						return NULL;
-					}
-					if (expecting == DICT_EXPECT_VALUE) {
-						_set_error("value expected");
-						return NULL;
-					}
-					if (expecting == DICT_EXPECT_COMMA) {
-						_set_error("',' or '}' expected");
-						return NULL;
-					}
+GDScriptParser::VariableNode *GDScriptParser::parse_property(VariableNode *p_variable, bool p_need_indent) {
+	if (p_need_indent) {
+		if (!consume(GDScriptTokenizer::Token::INDENT, R"(Expected indented block for property after ":".)")) {
+			return nullptr;
+		}
+	}
 
-					expecting = DICT_EXPECT_VALUE;
-					tokenizer->advance(); //ignore newline
-				} else {
+	VariableNode *property = p_variable;
 
-					if (expecting == DICT_EXPECT_COMMA) {
-						_set_error("',' or '}' expected");
-						return NULL;
-					}
-					if (expecting == DICT_EXPECT_COLON) {
-						_set_error("':' expected");
-						return NULL;
-					}
+	make_completion_context(COMPLETION_PROPERTY_DECLARATION, property);
 
-					if (expecting == DICT_EXPECT_KEY) {
-
-						if (tokenizer->is_token_literal() && tokenizer->get_token(1) == GDScriptTokenizer::TK_OP_ASSIGN) {
-							// We check with is_token_literal, as this allows us to use match/sync/etc. as a name
-							//lua style identifier, easier to write
-							ConstantNode *cn = alloc_node<ConstantNode>();
-							cn->value = tokenizer->get_token_literal();
-							cn->datatype = _type_from_variant(cn->value);
-							key = cn;
-							tokenizer->advance(2);
-							expecting = DICT_EXPECT_VALUE;
-						} else {
-							//python/js style more flexible
-							key = _parse_expression(dict, p_static, p_allow_assign, p_parsing_constant);
-							if (!key)
-								return NULL;
-							expecting = DICT_EXPECT_COLON;
-						}
-					}
+	if (!consume(GDScriptTokenizer::Token::IDENTIFIER, R"(Expected "get" or "set" for property declaration.)")) {
+		return nullptr;
+	}
 
-					if (expecting == DICT_EXPECT_VALUE) {
-						Node *value = _parse_expression(dict, p_static, p_allow_assign, p_parsing_constant);
-						if (!value)
-							return NULL;
-						expecting = DICT_EXPECT_COMMA;
+	IdentifierNode *function = parse_identifier();
 
-						if (key->type == GDScriptParser::Node::TYPE_CONSTANT) {
-							Variant const &keyName = static_cast<const GDScriptParser::ConstantNode *>(key)->value;
+	if (check(GDScriptTokenizer::Token::EQUAL)) {
+		p_variable->property = VariableNode::PROP_SETGET;
+	} else {
+		p_variable->property = VariableNode::PROP_INLINE;
+		if (!p_need_indent) {
+			push_error("Property with inline code must go to an indented block.");
+		}
+	}
 
-							if (keys.has(keyName)) {
-								_set_error("Duplicate key found in Dictionary literal");
-								return NULL;
-							}
-							keys.insert(keyName);
-						}
+	bool getter_used = false;
+	bool setter_used = false;
 
-						DictionaryNode::Pair pair;
-						pair.key = key;
-						pair.value = value;
-						dict->elements.push_back(pair);
-						key = NULL;
-					}
-				}
+	// Run with a loop because order doesn't matter.
+	for (int i = 0; i < 2; i++) {
+		if (function->name == "set") {
+			if (setter_used) {
+				push_error(R"(Properties can only have one setter.)");
+			} else {
+				parse_property_setter(property);
+				setter_used = true;
 			}
-
-			expr = dict;
-
-		} else if (tokenizer->get_token() == GDScriptTokenizer::TK_PERIOD && (tokenizer->is_token_literal(1) || tokenizer->get_token(1) == GDScriptTokenizer::TK_CURSOR)) {
-			// We check with is_token_literal, as this allows us to use match/sync/etc. as a name
-			// parent call
-
-			tokenizer->advance(); //goto identifier
-			OperatorNode *op = alloc_node<OperatorNode>();
-			op->op = OperatorNode::OP_PARENT_CALL;
-
-			/*SelfNode *self = alloc_node<SelfNode>();
-			op->arguments.push_back(self);
-			forbidden for now */
-			StringName identifier;
-			bool is_completion = _get_completable_identifier(COMPLETION_PARENT_FUNCTION, identifier) && for_completion;
-
-			IdentifierNode *id = alloc_node<IdentifierNode>();
-			id->name = identifier;
-			op->arguments.push_back(id);
-
-			if (tokenizer->get_token() != GDScriptTokenizer::TK_PARENTHESIS_OPEN) {
-				if (!is_completion) {
-					_set_error("Expected '(' for parent function call.");
-					return NULL;
-				}
+		} else if (function->name == "get") {
+			if (getter_used) {
+				push_error(R"(Properties can only have one getter.)");
 			} else {
-				tokenizer->advance();
-				if (!_parse_arguments(op, op->arguments, p_static, false, p_parsing_constant)) {
-					return NULL;
-				}
+				parse_property_getter(property);
+				getter_used = true;
 			}
-
-			expr = op;
-
-		} else if (tokenizer->get_token() == GDScriptTokenizer::TK_BUILT_IN_TYPE && expression.size() > 0 && expression[expression.size() - 1].is_op && expression[expression.size() - 1].op == OperatorNode::OP_IS) {
-			Expression e = expression[expression.size() - 1];
-			e.op = OperatorNode::OP_IS_BUILTIN;
-			expression.write[expression.size() - 1] = e;
-
-			TypeNode *tn = alloc_node<TypeNode>();
-			tn->vtype = tokenizer->get_token_type();
-			expr = tn;
-			tokenizer->advance();
 		} else {
-
-			//find list [ or find dictionary {
-			_set_error("Error parsing expression, misplaced: " + String(tokenizer->get_token_name(tokenizer->get_token())));
-			return NULL; //nothing
+			// TODO: Update message to only have the missing one if it's the case.
+			push_error(R"(Expected "get" or "set" for property declaration.)");
 		}
 
-		ERR_FAIL_COND_V_MSG(!expr, NULL, "GDScriptParser bug, couldn't figure out what expression is.");
-
-		/******************/
-		/* Parse Indexing */
-		/******************/
-
-		while (true) {
-
-			//expressions can be indexed any number of times
-
-			if (tokenizer->get_token() == GDScriptTokenizer::TK_PERIOD) {
-
-				//indexing using "."
-
-				if (tokenizer->get_token(1) != GDScriptTokenizer::TK_CURSOR && !tokenizer->is_token_literal(1)) {
-					// We check with is_token_literal, as this allows us to use match/sync/etc. as a name
-					_set_error("Expected identifier as member");
-					return NULL;
-				} else if (tokenizer->get_token(2) == GDScriptTokenizer::TK_PARENTHESIS_OPEN) {
-					//call!!
-					OperatorNode *op = alloc_node<OperatorNode>();
-					op->op = OperatorNode::OP_CALL;
-
-					tokenizer->advance();
-
-					IdentifierNode *id = alloc_node<IdentifierNode>();
-					StringName identifier;
-					if (_get_completable_identifier(COMPLETION_METHOD, identifier)) {
-						completion_node = op;
-						//indexing stuff
+		if (i == 0 && p_variable->property == VariableNode::PROP_SETGET) {
+			if (match(GDScriptTokenizer::Token::COMMA)) {
+				// Consume potential newline.
+				if (match(GDScriptTokenizer::Token::NEWLINE)) {
+					if (!p_need_indent) {
+						push_error(R"(Inline setter/getter setting cannot span across multiple lines (use "\\"" if needed).)");
 					}
-
-					id->name = identifier;
-
-					op->arguments.push_back(expr); // call what
-					op->arguments.push_back(id); // call func
-					//get arguments
-					tokenizer->advance(1);
-					if (tokenizer->get_token() == GDScriptTokenizer::TK_CURSOR) {
-						_make_completable_call(0);
-						completion_node = op;
-					}
-					if (!_parse_arguments(op, op->arguments, p_static, true, p_parsing_constant))
-						return NULL;
-					expr = op;
-
-				} else {
-					//simple indexing!
-
-					OperatorNode *op = alloc_node<OperatorNode>();
-					op->op = OperatorNode::OP_INDEX_NAMED;
-					tokenizer->advance();
-
-					StringName identifier;
-					if (_get_completable_identifier(COMPLETION_INDEX, identifier)) {
-
-						if (identifier == StringName()) {
-							identifier = "@temp"; //so it parses alright
-						}
-						completion_node = op;
-
-						//indexing stuff
-					}
-
-					IdentifierNode *id = alloc_node<IdentifierNode>();
-					id->name = identifier;
-
-					op->arguments.push_back(expr);
-					op->arguments.push_back(id);
-
-					expr = op;
 				}
-
-			} else if (tokenizer->get_token() == GDScriptTokenizer::TK_BRACKET_OPEN) {
-				//indexing using "[]"
-				OperatorNode *op = alloc_node<OperatorNode>();
-				op->op = OperatorNode::OP_INDEX;
-
-				tokenizer->advance(1);
-
-				Node *subexpr = _parse_expression(op, p_static, p_allow_assign, p_parsing_constant);
-				if (!subexpr) {
-					return NULL;
-				}
-
-				if (tokenizer->get_token() != GDScriptTokenizer::TK_BRACKET_CLOSE) {
-					_set_error("Expected ']'");
-					return NULL;
-				}
-
-				op->arguments.push_back(expr);
-				op->arguments.push_back(subexpr);
-				tokenizer->advance(1);
-				expr = op;
-
-			} else
+			} else {
 				break;
-		}
-
-		/*****************/
-		/* Parse Casting */
-		/*****************/
-
-		bool has_casting = expr->type == Node::TYPE_CAST;
-		if (tokenizer->get_token() == GDScriptTokenizer::TK_PR_AS) {
-			if (has_casting) {
-				_set_error("Unexpected 'as'.");
-				return NULL;
-			}
-			CastNode *cn = alloc_node<CastNode>();
-			if (!_parse_type(cn->cast_type)) {
-				_set_error("Expected type after 'as'.");
-				return NULL;
-			}
-			has_casting = true;
-			cn->source_node = expr;
-			expr = cn;
-		}
-
-		/******************/
-		/* Parse Operator */
-		/******************/
-
-		if (parenthesis > 0) {
-			//remove empty space (only allowed if inside parenthesis
-			while (tokenizer->get_token() == GDScriptTokenizer::TK_NEWLINE) {
-				tokenizer->advance();
 			}
 		}
 
-		Expression e;
-		e.is_op = false;
-		e.node = expr;
-		expression.push_back(e);
-
-		// determine which operator is next
-
-		OperatorNode::Operator op;
-		bool valid = true;
-
-//assign, if allowed is only allowed on the first operator
-#define _VALIDATE_ASSIGN                  \
-	if (!p_allow_assign || has_casting) { \
-		_set_error("Unexpected assign."); \
-		return NULL;                      \
-	}                                     \
-	p_allow_assign = false;
-
-		switch (tokenizer->get_token()) { //see operator
-
-			case GDScriptTokenizer::TK_OP_IN: op = OperatorNode::OP_IN; break;
-			case GDScriptTokenizer::TK_OP_EQUAL: op = OperatorNode::OP_EQUAL; break;
-			case GDScriptTokenizer::TK_OP_NOT_EQUAL: op = OperatorNode::OP_NOT_EQUAL; break;
-			case GDScriptTokenizer::TK_OP_LESS: op = OperatorNode::OP_LESS; break;
-			case GDScriptTokenizer::TK_OP_LESS_EQUAL: op = OperatorNode::OP_LESS_EQUAL; break;
-			case GDScriptTokenizer::TK_OP_GREATER: op = OperatorNode::OP_GREATER; break;
-			case GDScriptTokenizer::TK_OP_GREATER_EQUAL: op = OperatorNode::OP_GREATER_EQUAL; break;
-			case GDScriptTokenizer::TK_OP_AND: op = OperatorNode::OP_AND; break;
-			case GDScriptTokenizer::TK_OP_OR: op = OperatorNode::OP_OR; break;
-			case GDScriptTokenizer::TK_OP_ADD: op = OperatorNode::OP_ADD; break;
-			case GDScriptTokenizer::TK_OP_SUB: op = OperatorNode::OP_SUB; break;
-			case GDScriptTokenizer::TK_OP_MUL: op = OperatorNode::OP_MUL; break;
-			case GDScriptTokenizer::TK_OP_DIV: op = OperatorNode::OP_DIV; break;
-			case GDScriptTokenizer::TK_OP_MOD:
-				op = OperatorNode::OP_MOD;
-				break;
-			//case GDScriptTokenizer::TK_OP_NEG: op=OperatorNode::OP_NEG ; break;
-			case GDScriptTokenizer::TK_OP_SHIFT_LEFT: op = OperatorNode::OP_SHIFT_LEFT; break;
-			case GDScriptTokenizer::TK_OP_SHIFT_RIGHT: op = OperatorNode::OP_SHIFT_RIGHT; break;
-			case GDScriptTokenizer::TK_OP_ASSIGN: {
-				_VALIDATE_ASSIGN op = OperatorNode::OP_ASSIGN;
-
-				if (tokenizer->get_token(1) == GDScriptTokenizer::TK_CURSOR) {
-					//code complete assignment
-					completion_type = COMPLETION_ASSIGN;
-					completion_node = expr;
-					completion_class = current_class;
-					completion_function = current_function;
-					completion_line = tokenizer->get_token_line();
-					completion_block = current_block;
-					completion_found = true;
-					tokenizer->advance();
-				}
-
-			} break;
-			case GDScriptTokenizer::TK_OP_ASSIGN_ADD: _VALIDATE_ASSIGN op = OperatorNode::OP_ASSIGN_ADD; break;
-			case GDScriptTokenizer::TK_OP_ASSIGN_SUB: _VALIDATE_ASSIGN op = OperatorNode::OP_ASSIGN_SUB; break;
-			case GDScriptTokenizer::TK_OP_ASSIGN_MUL: _VALIDATE_ASSIGN op = OperatorNode::OP_ASSIGN_MUL; break;
-			case GDScriptTokenizer::TK_OP_ASSIGN_DIV: _VALIDATE_ASSIGN op = OperatorNode::OP_ASSIGN_DIV; break;
-			case GDScriptTokenizer::TK_OP_ASSIGN_MOD: _VALIDATE_ASSIGN op = OperatorNode::OP_ASSIGN_MOD; break;
-			case GDScriptTokenizer::TK_OP_ASSIGN_SHIFT_LEFT: _VALIDATE_ASSIGN op = OperatorNode::OP_ASSIGN_SHIFT_LEFT; break;
-			case GDScriptTokenizer::TK_OP_ASSIGN_SHIFT_RIGHT: _VALIDATE_ASSIGN op = OperatorNode::OP_ASSIGN_SHIFT_RIGHT; break;
-			case GDScriptTokenizer::TK_OP_ASSIGN_BIT_AND: _VALIDATE_ASSIGN op = OperatorNode::OP_ASSIGN_BIT_AND; break;
-			case GDScriptTokenizer::TK_OP_ASSIGN_BIT_OR: _VALIDATE_ASSIGN op = OperatorNode::OP_ASSIGN_BIT_OR; break;
-			case GDScriptTokenizer::TK_OP_ASSIGN_BIT_XOR: _VALIDATE_ASSIGN op = OperatorNode::OP_ASSIGN_BIT_XOR; break;
-			case GDScriptTokenizer::TK_OP_BIT_AND: op = OperatorNode::OP_BIT_AND; break;
-			case GDScriptTokenizer::TK_OP_BIT_OR: op = OperatorNode::OP_BIT_OR; break;
-			case GDScriptTokenizer::TK_OP_BIT_XOR: op = OperatorNode::OP_BIT_XOR; break;
-			case GDScriptTokenizer::TK_PR_IS: op = OperatorNode::OP_IS; break;
-			case GDScriptTokenizer::TK_CF_IF: op = OperatorNode::OP_TERNARY_IF; break;
-			case GDScriptTokenizer::TK_CF_ELSE: op = OperatorNode::OP_TERNARY_ELSE; break;
-			default: valid = false; break;
-		}
-
-		if (valid) {
-			e.is_op = true;
-			e.op = op;
-			expression.push_back(e);
-			tokenizer->advance();
-		} else {
+		if (!match(GDScriptTokenizer::Token::IDENTIFIER)) {
 			break;
 		}
+		function = parse_identifier();
 	}
 
-	/* Reduce the set set of expressions and place them in an operator tree, respecting precedence */
-
-	while (expression.size() > 1) {
-
-		int next_op = -1;
-		int min_priority = 0xFFFFF;
-		bool is_unary = false;
-		bool is_ternary = false;
-
-		for (int i = 0; i < expression.size(); i++) {
+	if (p_variable->property == VariableNode::PROP_SETGET) {
+		end_statement("property declaration");
+	}
 
-			if (!expression[i].is_op) {
+	if (p_need_indent) {
+		consume(GDScriptTokenizer::Token::DEDENT, R"(Expected end of indented block for property.)");
+	}
+	return property;
+}
 
-				continue;
+void GDScriptParser::parse_property_setter(VariableNode *p_variable) {
+	switch (p_variable->property) {
+		case VariableNode::PROP_INLINE:
+			consume(GDScriptTokenizer::Token::PARENTHESIS_OPEN, R"(Expected "(" after "set".)");
+			if (consume(GDScriptTokenizer::Token::IDENTIFIER, R"(Expected parameter name after "(".)")) {
+				p_variable->setter_parameter = parse_identifier();
 			}
+			consume(GDScriptTokenizer::Token::PARENTHESIS_CLOSE, R"*(Expected ")" after parameter name.)*");
+			consume(GDScriptTokenizer::Token::COLON, R"*(Expected ":" after ")".)*");
 
-			int priority;
-
-			bool unary = false;
-			bool ternary = false;
-			bool error = false;
-			bool right_to_left = false;
-
-			switch (expression[i].op) {
-
-				case OperatorNode::OP_IS:
-				case OperatorNode::OP_IS_BUILTIN:
-					priority = -1;
-					break; //before anything
-
-				case OperatorNode::OP_BIT_INVERT:
-					priority = 0;
-					unary = true;
-					break;
-				case OperatorNode::OP_NEG:
-				case OperatorNode::OP_POS:
-					priority = 1;
-					unary = true;
-					break;
+			p_variable->setter = parse_suite("setter definition");
+			break;
 
-				case OperatorNode::OP_MUL: priority = 2; break;
-				case OperatorNode::OP_DIV: priority = 2; break;
-				case OperatorNode::OP_MOD: priority = 2; break;
+		case VariableNode::PROP_SETGET:
+			consume(GDScriptTokenizer::Token::EQUAL, R"(Expected "=" after "set")");
+			make_completion_context(COMPLETION_PROPERTY_METHOD, p_variable);
+			if (consume(GDScriptTokenizer::Token::IDENTIFIER, R"(Expected setter function name after "=".)")) {
+				p_variable->setter_pointer = parse_identifier();
+			}
+			break;
+		case VariableNode::PROP_NONE:
+			break; // Unreachable.
+	}
+}
 
-				case OperatorNode::OP_ADD: priority = 3; break;
-				case OperatorNode::OP_SUB: priority = 3; break;
+void GDScriptParser::parse_property_getter(VariableNode *p_variable) {
+	switch (p_variable->property) {
+		case VariableNode::PROP_INLINE:
+			consume(GDScriptTokenizer::Token::COLON, R"(Expected ":" after "get".)");
 
-				case OperatorNode::OP_SHIFT_LEFT: priority = 4; break;
-				case OperatorNode::OP_SHIFT_RIGHT: priority = 4; break;
+			p_variable->getter = parse_suite("getter definition");
+			break;
+		case VariableNode::PROP_SETGET:
+			consume(GDScriptTokenizer::Token::EQUAL, R"(Expected "=" after "get")");
+			make_completion_context(COMPLETION_PROPERTY_METHOD, p_variable);
+			if (consume(GDScriptTokenizer::Token::IDENTIFIER, R"(Expected getter function name after "=".)")) {
+				p_variable->getter_pointer = parse_identifier();
+			}
+			break;
+		case VariableNode::PROP_NONE:
+			break; // Unreachable.
+	}
+}
 
-				case OperatorNode::OP_BIT_AND: priority = 5; break;
-				case OperatorNode::OP_BIT_XOR: priority = 6; break;
-				case OperatorNode::OP_BIT_OR: priority = 7; break;
+GDScriptParser::ConstantNode *GDScriptParser::parse_constant() {
+	if (!consume(GDScriptTokenizer::Token::IDENTIFIER, R"(Expected constant name after "const".)")) {
+		return nullptr;
+	}
 
-				case OperatorNode::OP_LESS: priority = 8; break;
-				case OperatorNode::OP_LESS_EQUAL: priority = 8; break;
-				case OperatorNode::OP_GREATER: priority = 8; break;
-				case OperatorNode::OP_GREATER_EQUAL: priority = 8; break;
+	ConstantNode *constant = alloc_node<ConstantNode>();
+	constant->identifier = parse_identifier();
 
-				case OperatorNode::OP_EQUAL: priority = 8; break;
-				case OperatorNode::OP_NOT_EQUAL: priority = 8; break;
+	if (match(GDScriptTokenizer::Token::COLON)) {
+		if (check((GDScriptTokenizer::Token::EQUAL))) {
+			// Infer type.
+			constant->infer_datatype = true;
+		} else {
+			// Parse type.
+			constant->datatype_specifier = parse_type();
+		}
+	}
 
-				case OperatorNode::OP_IN: priority = 10; break;
+	if (consume(GDScriptTokenizer::Token::EQUAL, R"(Expected initializer after constant name.)")) {
+		// Initializer.
+		constant->initializer = parse_expression(false);
 
-				case OperatorNode::OP_NOT:
-					priority = 11;
-					unary = true;
-					break;
-				case OperatorNode::OP_AND: priority = 12; break;
-				case OperatorNode::OP_OR: priority = 13; break;
+		if (constant->initializer == nullptr) {
+			push_error(R"(Expected initializer expression for constant.)");
+			return nullptr;
+		}
+	}
 
-				case OperatorNode::OP_TERNARY_IF:
-					priority = 14;
-					ternary = true;
-					right_to_left = true;
-					break;
-				case OperatorNode::OP_TERNARY_ELSE:
-					priority = 14;
-					error = true;
-					// Rigth-to-left should be false in this case, otherwise it would always error.
-					break;
+	end_statement("constant declaration");
 
-				case OperatorNode::OP_ASSIGN: priority = 15; break;
-				case OperatorNode::OP_ASSIGN_ADD: priority = 15; break;
-				case OperatorNode::OP_ASSIGN_SUB: priority = 15; break;
-				case OperatorNode::OP_ASSIGN_MUL: priority = 15; break;
-				case OperatorNode::OP_ASSIGN_DIV: priority = 15; break;
-				case OperatorNode::OP_ASSIGN_MOD: priority = 15; break;
-				case OperatorNode::OP_ASSIGN_SHIFT_LEFT: priority = 15; break;
-				case OperatorNode::OP_ASSIGN_SHIFT_RIGHT: priority = 15; break;
-				case OperatorNode::OP_ASSIGN_BIT_AND: priority = 15; break;
-				case OperatorNode::OP_ASSIGN_BIT_OR: priority = 15; break;
-				case OperatorNode::OP_ASSIGN_BIT_XOR: priority = 15; break;
-
-				default: {
-					_set_error("GDScriptParser bug, invalid operator in expression: " + itos(expression[i].op));
-					return NULL;
-				}
-			}
+	return constant;
+}
 
-			if (priority < min_priority || (right_to_left && priority == min_priority)) {
-				// < is used for left to right (default)
-				// <= is used for right to left
-				if (error) {
-					_set_error("Unexpected operator");
-					return NULL;
-				}
-				next_op = i;
-				min_priority = priority;
-				is_unary = unary;
-				is_ternary = ternary;
-			}
-		}
+GDScriptParser::ParameterNode *GDScriptParser::parse_parameter() {
+	if (!consume(GDScriptTokenizer::Token::IDENTIFIER, R"(Expected parameter name.)")) {
+		return nullptr;
+	}
 
-		if (next_op == -1) {
+	ParameterNode *parameter = alloc_node<ParameterNode>();
+	parameter->identifier = parse_identifier();
 
-			_set_error("Yet another parser bug....");
-			ERR_FAIL_V(NULL);
+	if (match(GDScriptTokenizer::Token::COLON)) {
+		if (check((GDScriptTokenizer::Token::EQUAL))) {
+			// Infer type.
+			parameter->infer_datatype = true;
+		} else {
+			// Parse type.
+			make_completion_context(COMPLETION_TYPE_NAME, parameter);
+			parameter->datatype_specifier = parse_type();
 		}
+	}
 
-		// OK! create operator..
-		if (is_unary) {
+	if (match(GDScriptTokenizer::Token::EQUAL)) {
+		// Default value.
+		parameter->default_value = parse_expression(false);
+	}
 
-			int expr_pos = next_op;
-			while (expression[expr_pos].is_op) {
+	return parameter;
+}
 
-				expr_pos++;
-				if (expr_pos == expression.size()) {
-					//can happen..
-					_set_error("Unexpected end of expression...");
-					return NULL;
-				}
-			}
+GDScriptParser::SignalNode *GDScriptParser::parse_signal() {
+	if (!consume(GDScriptTokenizer::Token::IDENTIFIER, R"(Expected signal name after "signal".)")) {
+		return nullptr;
+	}
 
-			//consecutively do unary opeators
-			for (int i = expr_pos - 1; i >= next_op; i--) {
+	SignalNode *signal = alloc_node<SignalNode>();
+	signal->identifier = parse_identifier();
 
-				OperatorNode *op = alloc_node<OperatorNode>();
-				op->op = expression[i].op;
-				op->arguments.push_back(expression[i + 1].node);
-				op->line = op_line; //line might have been changed from a \n
-				expression.write[i].is_op = false;
-				expression.write[i].node = op;
-				expression.remove(i + 1);
+	if (match(GDScriptTokenizer::Token::PARENTHESIS_OPEN)) {
+		do {
+			if (check(GDScriptTokenizer::Token::PARENTHESIS_CLOSE)) {
+				// Allow for trailing comma.
+				break;
 			}
 
-		} else if (is_ternary) {
-			if (next_op < 1 || next_op >= (expression.size() - 1)) {
-				_set_error("Parser bug...");
-				ERR_FAIL_V(NULL);
+			ParameterNode *parameter = parse_parameter();
+			if (parameter == nullptr) {
+				push_error("Expected signal parameter name.");
+				break;
 			}
-
-			if (next_op >= (expression.size() - 2) || expression[next_op + 2].op != OperatorNode::OP_TERNARY_ELSE) {
-				_set_error("Expected else after ternary if.");
-				return NULL;
+			if (parameter->default_value != nullptr) {
+				push_error(R"(Signal parameters cannot have a default value.)");
 			}
-			if (next_op >= (expression.size() - 3)) {
-				_set_error("Expected value after ternary else.");
-				return NULL;
+			if (signal->parameters_indices.has(parameter->identifier->name)) {
+				push_error(vformat(R"(Parameter with name "%s" was already declared for this signal.)", parameter->identifier->name));
+			} else {
+				signal->parameters_indices[parameter->identifier->name] = signal->parameters.size();
+				signal->parameters.push_back(parameter);
 			}
+		} while (match(GDScriptTokenizer::Token::COMMA) && !is_at_end());
 
-			OperatorNode *op = alloc_node<OperatorNode>();
-			op->op = expression[next_op].op;
-			op->line = op_line; //line might have been changed from a \n
+		consume(GDScriptTokenizer::Token::PARENTHESIS_CLOSE, R"*(Expected closing ")" after signal parameters.)*");
+	}
 
-			if (expression[next_op - 1].is_op) {
+	end_statement("signal declaration");
 
-				_set_error("Parser bug...");
-				ERR_FAIL_V(NULL);
-			}
+	return signal;
+}
 
-			if (expression[next_op + 1].is_op) {
-				// this is not invalid and can really appear
-				// but it becomes invalid anyway because no binary op
-				// can be followed by a unary op in a valid combination,
-				// due to how precedence works, unaries will always disappear first
+GDScriptParser::EnumNode *GDScriptParser::parse_enum() {
+	EnumNode *enum_node = alloc_node<EnumNode>();
+	bool named = false;
 
-				_set_error("Unexpected two consecutive operators after ternary if.");
-				return NULL;
-			}
-
-			if (expression[next_op + 3].is_op) {
-				// this is not invalid and can really appear
-				// but it becomes invalid anyway because no binary op
-				// can be followed by a unary op in a valid combination,
-				// due to how precedence works, unaries will always disappear first
+	if (check(GDScriptTokenizer::Token::IDENTIFIER)) {
+		advance();
+		enum_node->identifier = parse_identifier();
+		named = true;
+	}
 
-				_set_error("Unexpected two consecutive operators after ternary else.");
-				return NULL;
-			}
+	push_multiline(true);
+	consume(GDScriptTokenizer::Token::BRACE_OPEN, vformat(R"(Expected "{" after %s.)", named ? "enum name" : R"("enum")"));
 
-			op->arguments.push_back(expression[next_op + 1].node); //next expression goes as first
-			op->arguments.push_back(expression[next_op - 1].node); //left expression goes as when-true
-			op->arguments.push_back(expression[next_op + 3].node); //expression after next goes as when-false
+	HashMap<StringName, int> elements;
 
-			//replace all 3 nodes by this operator and make it an expression
-			expression.write[next_op - 1].node = op;
-			expression.remove(next_op);
-			expression.remove(next_op);
-			expression.remove(next_op);
-			expression.remove(next_op);
-		} else {
+	do {
+		if (check(GDScriptTokenizer::Token::BRACE_CLOSE)) {
+			break; // Allow trailing comma.
+		}
+		if (consume(GDScriptTokenizer::Token::IDENTIFIER, R"(Expected identifier for enum key.)")) {
+			EnumNode::Value item;
+			item.identifier = parse_identifier();
+			item.parent_enum = enum_node;
+			item.line = previous.start_line;
+			item.leftmost_column = previous.leftmost_column;
 
-			if (next_op < 1 || next_op >= (expression.size() - 1)) {
-				_set_error("Parser bug...");
-				ERR_FAIL_V(NULL);
+			if (elements.has(item.identifier->name)) {
+				push_error(vformat(R"(Name "%s" was already in this enum (at line %d).)", item.identifier->name, elements[item.identifier->name]), item.identifier);
+			} else if (!named) {
+				// TODO: Abstract this recursive member check.
+				ClassNode *parent = current_class;
+				while (parent != nullptr) {
+					if (parent->members_indices.has(item.identifier->name)) {
+						push_error(vformat(R"(Name "%s" is already used as a class %s.)", item.identifier->name, parent->get_member(item.identifier->name).get_type_name()));
+						break;
+					}
+					parent = parent->outer;
+				}
 			}
 
-			OperatorNode *op = alloc_node<OperatorNode>();
-			op->op = expression[next_op].op;
-			op->line = op_line; //line might have been changed from a \n
+			elements[item.identifier->name] = item.line;
 
-			if (expression[next_op - 1].is_op) {
-
-				_set_error("Parser bug...");
-				ERR_FAIL_V(NULL);
+			if (match(GDScriptTokenizer::Token::EQUAL)) {
+				ExpressionNode *value = parse_expression(false);
+				if (value == nullptr) {
+					push_error(R"(Expected expression value after "=".)");
+				}
+				item.custom_value = value;
 			}
+			item.rightmost_column = previous.rightmost_column;
 
-			if (expression[next_op + 1].is_op) {
-				// this is not invalid and can really appear
-				// but it becomes invalid anyway because no binary op
-				// can be followed by a unary op in a valid combination,
-				// due to how precedence works, unaries will always disappear first
-
-				_set_error("Unexpected two consecutive operators.");
-				return NULL;
+			item.index = enum_node->values.size();
+			enum_node->values.push_back(item);
+			if (!named) {
+				// Add as member of current class.
+				current_class->add_member(item);
 			}
-
-			op->arguments.push_back(expression[next_op - 1].node); //expression goes as left
-			op->arguments.push_back(expression[next_op + 1].node); //next expression goes as right
-
-			//replace all 3 nodes by this operator and make it an expression
-			expression.write[next_op - 1].node = op;
-			expression.remove(next_op);
-			expression.remove(next_op);
 		}
-	}
+	} while (match(GDScriptTokenizer::Token::COMMA));
 
-	return expression[0].node;
-}
+	pop_multiline();
+	consume(GDScriptTokenizer::Token::BRACE_CLOSE, R"(Expected closing "}" for enum.)");
 
-GDScriptParser::Node *GDScriptParser::_reduce_expression(Node *p_node, bool p_to_const) {
+	end_statement("enum");
 
-	switch (p_node->type) {
-
-		case Node::TYPE_BUILT_IN_FUNCTION: {
-			//many may probably be optimizable
-			return p_node;
-		} break;
-		case Node::TYPE_ARRAY: {
-
-			ArrayNode *an = static_cast<ArrayNode *>(p_node);
-			bool all_constants = true;
-
-			for (int i = 0; i < an->elements.size(); i++) {
+	return enum_node;
+}
 
-				an->elements.write[i] = _reduce_expression(an->elements[i], p_to_const);
-				if (an->elements[i]->type != Node::TYPE_CONSTANT)
-					all_constants = false;
-			}
+GDScriptParser::FunctionNode *GDScriptParser::parse_function() {
+	bool _static = false;
+	if (previous.type == GDScriptTokenizer::Token::STATIC) {
+		// TODO: Improve message if user uses "static" with "var" or "const"
+		if (!consume(GDScriptTokenizer::Token::FUNC, R"(Expected "func" after "static".)")) {
+			return nullptr;
+		}
+		_static = true;
+	}
 
-			if (all_constants && p_to_const) {
-				//reduce constant array expression
+	FunctionNode *function = alloc_node<FunctionNode>();
+	make_completion_context(COMPLETION_OVERRIDE_METHOD, function);
 
-				ConstantNode *cn = alloc_node<ConstantNode>();
-				Array arr;
-				arr.resize(an->elements.size());
-				for (int i = 0; i < an->elements.size(); i++) {
-					ConstantNode *acn = static_cast<ConstantNode *>(an->elements[i]);
-					arr[i] = acn->value;
-				}
-				cn->value = arr;
-				cn->datatype = _type_from_variant(cn->value);
-				return cn;
-			}
+	if (!consume(GDScriptTokenizer::Token::IDENTIFIER, R"(Expected function name after "func".)")) {
+		return nullptr;
+	}
 
-			return an;
+	FunctionNode *previous_function = current_function;
+	current_function = function;
 
-		} break;
-		case Node::TYPE_DICTIONARY: {
+	function->identifier = parse_identifier();
+	function->is_static = _static;
 
-			DictionaryNode *dn = static_cast<DictionaryNode *>(p_node);
-			bool all_constants = true;
+	push_multiline(true);
+	consume(GDScriptTokenizer::Token::PARENTHESIS_OPEN, R"(Expected opening "(" after function name.)");
 
-			for (int i = 0; i < dn->elements.size(); i++) {
+	SuiteNode *body = alloc_node<SuiteNode>();
+	SuiteNode *previous_suite = current_suite;
+	current_suite = body;
 
-				dn->elements.write[i].key = _reduce_expression(dn->elements[i].key, p_to_const);
-				if (dn->elements[i].key->type != Node::TYPE_CONSTANT)
-					all_constants = false;
-				dn->elements.write[i].value = _reduce_expression(dn->elements[i].value, p_to_const);
-				if (dn->elements[i].value->type != Node::TYPE_CONSTANT)
-					all_constants = false;
+	if (!check(GDScriptTokenizer::Token::PARENTHESIS_CLOSE) && !is_at_end()) {
+		bool default_used = false;
+		do {
+			if (check(GDScriptTokenizer::Token::PARENTHESIS_CLOSE)) {
+				// Allow for trailing comma.
+				break;
 			}
-
-			if (all_constants && p_to_const) {
-				//reduce constant array expression
-
-				ConstantNode *cn = alloc_node<ConstantNode>();
-				Dictionary dict;
-				for (int i = 0; i < dn->elements.size(); i++) {
-					ConstantNode *key_c = static_cast<ConstantNode *>(dn->elements[i].key);
-					ConstantNode *value_c = static_cast<ConstantNode *>(dn->elements[i].value);
-
-					dict[key_c->value] = value_c->value;
-				}
-				cn->value = dict;
-				cn->datatype = _type_from_variant(cn->value);
-				return cn;
+			ParameterNode *parameter = parse_parameter();
+			if (parameter == nullptr) {
+				break;
 			}
-
-			return dn;
-
-		} break;
-		case Node::TYPE_OPERATOR: {
-
-			OperatorNode *op = static_cast<OperatorNode *>(p_node);
-
-			bool all_constants = true;
-			int last_not_constant = -1;
-
-			for (int i = 0; i < op->arguments.size(); i++) {
-
-				op->arguments.write[i] = _reduce_expression(op->arguments[i], p_to_const);
-				if (op->arguments[i]->type != Node::TYPE_CONSTANT) {
-					all_constants = false;
-					last_not_constant = i;
+			if (parameter->default_value != nullptr) {
+				default_used = true;
+			} else {
+				if (default_used) {
+					push_error("Cannot have a mandatory parameters after optional parameters.");
+					continue;
 				}
 			}
-
-			if (op->op == OperatorNode::OP_IS) {
-				//nothing much
-				return op;
+			if (function->parameters_indices.has(parameter->identifier->name)) {
+				push_error(vformat(R"(Parameter with name "%s" was already declared for this function.)", parameter->identifier->name));
+			} else {
+				function->parameters_indices[parameter->identifier->name] = function->parameters.size();
+				function->parameters.push_back(parameter);
+				body->add_local(parameter);
 			}
-			if (op->op == OperatorNode::OP_PARENT_CALL) {
-				//nothing much
-				return op;
-
-			} else if (op->op == OperatorNode::OP_CALL) {
-				//can reduce base type constructors
-				if ((op->arguments[0]->type == Node::TYPE_TYPE || (op->arguments[0]->type == Node::TYPE_BUILT_IN_FUNCTION && GDScriptFunctions::is_deterministic(static_cast<BuiltInFunctionNode *>(op->arguments[0])->function))) && last_not_constant == 0) {
-
-					//native type constructor or intrinsic function
-					const Variant **vptr = NULL;
-					Vector<Variant *> ptrs;
-					if (op->arguments.size() > 1) {
-
-						ptrs.resize(op->arguments.size() - 1);
-						for (int i = 0; i < ptrs.size(); i++) {
-
-							ConstantNode *cn = static_cast<ConstantNode *>(op->arguments[i + 1]);
-							ptrs.write[i] = &cn->value;
-						}
-
-						vptr = (const Variant **)&ptrs[0];
-					}
-
-					Variant::CallError ce;
-					Variant v;
-
-					if (op->arguments[0]->type == Node::TYPE_TYPE) {
-						TypeNode *tn = static_cast<TypeNode *>(op->arguments[0]);
-						v = Variant::construct(tn->vtype, vptr, ptrs.size(), ce);
-
-					} else {
-						GDScriptFunctions::Function func = static_cast<BuiltInFunctionNode *>(op->arguments[0])->function;
-						GDScriptFunctions::call(func, vptr, ptrs.size(), v, ce);
-					}
-
-					if (ce.error != Variant::CallError::CALL_OK) {
-
-						String errwhere;
-						if (op->arguments[0]->type == Node::TYPE_TYPE) {
-							TypeNode *tn = static_cast<TypeNode *>(op->arguments[0]);
-							errwhere = "'" + Variant::get_type_name(tn->vtype) + "' constructor";
-
-						} else {
-							GDScriptFunctions::Function func = static_cast<BuiltInFunctionNode *>(op->arguments[0])->function;
-							errwhere = String("'") + GDScriptFunctions::get_func_name(func) + "' intrinsic function";
-						}
-
-						switch (ce.error) {
-
-							case Variant::CallError::CALL_ERROR_INVALID_ARGUMENT: {
-
-								_set_error("Invalid argument (#" + itos(ce.argument + 1) + ") for " + errwhere + ".");
-
-							} break;
-							case Variant::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS: {
-
-								_set_error("Too many arguments for " + errwhere + ".");
-							} break;
-							case Variant::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS: {
-
-								_set_error("Too few arguments for " + errwhere + ".");
-							} break;
-							default: {
-								_set_error("Invalid arguments for " + errwhere + ".");
-
-							} break;
-						}
-
-						error_line = op->line;
-
-						return p_node;
-					}
-
-					ConstantNode *cn = alloc_node<ConstantNode>();
-					cn->value = v;
-					cn->datatype = _type_from_variant(v);
-					return cn;
-				}
+		} while (match(GDScriptTokenizer::Token::COMMA));
+	}
 
-				return op; //don't reduce yet
+	pop_multiline();
+	consume(GDScriptTokenizer::Token::PARENTHESIS_CLOSE, R"*(Expected closing ")" after function parameters.)*");
 
-			} else if (op->op == OperatorNode::OP_YIELD) {
-				return op;
+	if (match(GDScriptTokenizer::Token::FORWARD_ARROW)) {
+		make_completion_context(COMPLETION_TYPE_NAME_OR_VOID, function);
+		function->return_type = parse_type(true);
+		if (function->return_type == nullptr) {
+			push_error(R"(Expected return type or "void" after "->".)");
+		}
+	}
 
-			} else if (op->op == OperatorNode::OP_INDEX) {
-				//can reduce indices into constant arrays or dictionaries
+	// TODO: Improve token consumption so it synchronizes to a statement boundary. This way we can get into the function body with unrecognized tokens.
+	consume(GDScriptTokenizer::Token::COLON, R"(Expected ":" after function declaration.)");
 
-				if (all_constants) {
+	current_suite = previous_suite;
+	function->body = parse_suite("function declaration", body);
 
-					ConstantNode *ca = static_cast<ConstantNode *>(op->arguments[0]);
-					ConstantNode *cb = static_cast<ConstantNode *>(op->arguments[1]);
+	current_function = previous_function;
+	return function;
+}
 
-					bool valid;
+GDScriptParser::AnnotationNode *GDScriptParser::parse_annotation(uint32_t p_valid_targets) {
+	AnnotationNode *annotation = alloc_node<AnnotationNode>();
 
-					Variant v = ca->value.get(cb->value, &valid);
-					if (!valid) {
-						_set_error("invalid index in constant expression");
-						error_line = op->line;
-						return op;
-					}
+	annotation->name = previous.literal;
 
-					ConstantNode *cn = alloc_node<ConstantNode>();
-					cn->value = v;
-					cn->datatype = _type_from_variant(v);
-					return cn;
-				}
+	make_completion_context(COMPLETION_ANNOTATION, annotation);
 
-				return op;
+	bool valid = true;
 
-			} else if (op->op == OperatorNode::OP_INDEX_NAMED) {
-
-				if (op->arguments[0]->type == Node::TYPE_CONSTANT && op->arguments[1]->type == Node::TYPE_IDENTIFIER) {
+	if (!valid_annotations.has(annotation->name)) {
+		push_error(vformat(R"(Unrecognized annotation: "%s".)", annotation->name));
+		valid = false;
+	}
 
-					ConstantNode *ca = static_cast<ConstantNode *>(op->arguments[0]);
-					IdentifierNode *ib = static_cast<IdentifierNode *>(op->arguments[1]);
+	annotation->info = &valid_annotations[annotation->name];
 
-					bool valid;
-					Variant v = ca->value.get_named(ib->name, &valid);
-					if (!valid) {
-						_set_error("invalid index '" + String(ib->name) + "' in constant expression");
-						error_line = op->line;
-						return op;
-					}
+	if (!annotation->applies_to(p_valid_targets)) {
+		push_error(vformat(R"(Annotation "%s" is not allowed in this level.)", annotation->name));
+		valid = false;
+	}
 
-					ConstantNode *cn = alloc_node<ConstantNode>();
-					cn->value = v;
-					cn->datatype = _type_from_variant(v);
-					return cn;
+	if (match(GDScriptTokenizer::Token::PARENTHESIS_OPEN)) {
+		// Arguments.
+		push_completion_call(annotation);
+		make_completion_context(COMPLETION_ANNOTATION_ARGUMENTS, annotation, 0, true);
+		if (!check(GDScriptTokenizer::Token::PARENTHESIS_CLOSE) && !is_at_end()) {
+			int argument_index = 0;
+			do {
+				make_completion_context(COMPLETION_ANNOTATION_ARGUMENTS, annotation, argument_index, true);
+				set_last_completion_call_arg(argument_index++);
+				ExpressionNode *argument = parse_expression(false);
+				if (argument == nullptr) {
+					valid = false;
+					continue;
 				}
+				annotation->arguments.push_back(argument);
+			} while (match(GDScriptTokenizer::Token::COMMA));
 
-				return op;
-			}
-
-			//validate assignment (don't assign to constant expression
-			switch (op->op) {
-
-				case OperatorNode::OP_ASSIGN:
-				case OperatorNode::OP_ASSIGN_ADD:
-				case OperatorNode::OP_ASSIGN_SUB:
-				case OperatorNode::OP_ASSIGN_MUL:
-				case OperatorNode::OP_ASSIGN_DIV:
-				case OperatorNode::OP_ASSIGN_MOD:
-				case OperatorNode::OP_ASSIGN_SHIFT_LEFT:
-				case OperatorNode::OP_ASSIGN_SHIFT_RIGHT:
-				case OperatorNode::OP_ASSIGN_BIT_AND:
-				case OperatorNode::OP_ASSIGN_BIT_OR:
-				case OperatorNode::OP_ASSIGN_BIT_XOR: {
-
-					if (op->arguments[0]->type == Node::TYPE_CONSTANT) {
-						_set_error("Can't assign to constant", tokenizer->get_token_line() - 1);
-						error_line = op->line;
-						return op;
-					} else if (op->arguments[0]->type == Node::TYPE_SELF) {
-						_set_error("Can't assign to self.", op->line);
-						error_line = op->line;
-						return op;
-					}
+			consume(GDScriptTokenizer::Token::PARENTHESIS_CLOSE, R"*(Expected ")" after annotation arguments.)*");
+		}
+		pop_completion_call();
+	}
 
-					if (op->arguments[0]->type == Node::TYPE_OPERATOR) {
-						OperatorNode *on = static_cast<OperatorNode *>(op->arguments[0]);
-						if (on->op != OperatorNode::OP_INDEX && on->op != OperatorNode::OP_INDEX_NAMED) {
-							_set_error("Can't assign to an expression", tokenizer->get_token_line() - 1);
-							error_line = op->line;
-							return op;
-						}
-					}
+	match(GDScriptTokenizer::Token::NEWLINE); // Newline after annotation is optional.
 
-				} break;
-				default: {
-					break;
-				}
-			}
-			//now se if all are constants
-			if (!all_constants)
-				return op; //nothing to reduce from here on
-#define _REDUCE_UNARY(m_vop)                                                                               \
-	bool valid = false;                                                                                    \
-	Variant res;                                                                                           \
-	Variant::evaluate(m_vop, static_cast<ConstantNode *>(op->arguments[0])->value, Variant(), res, valid); \
-	if (!valid) {                                                                                          \
-		_set_error("Invalid operand for unary operator");                                                  \
-		error_line = op->line;                                                                             \
-		return p_node;                                                                                     \
-	}                                                                                                      \
-	ConstantNode *cn = alloc_node<ConstantNode>();                                                         \
-	cn->value = res;                                                                                       \
-	cn->datatype = _type_from_variant(res);                                                                \
-	return cn;
-
-#define _REDUCE_BINARY(m_vop)                                                                                                                         \
-	bool valid = false;                                                                                                                               \
-	Variant res;                                                                                                                                      \
-	Variant::evaluate(m_vop, static_cast<ConstantNode *>(op->arguments[0])->value, static_cast<ConstantNode *>(op->arguments[1])->value, res, valid); \
-	if (!valid) {                                                                                                                                     \
-		_set_error("Invalid operands for operator");                                                                                                  \
-		error_line = op->line;                                                                                                                        \
-		return p_node;                                                                                                                                \
-	}                                                                                                                                                 \
-	ConstantNode *cn = alloc_node<ConstantNode>();                                                                                                    \
-	cn->value = res;                                                                                                                                  \
-	cn->datatype = _type_from_variant(res);                                                                                                           \
-	return cn;
-
-			switch (op->op) {
-
-				//unary operators
-				case OperatorNode::OP_NEG: {
-					_REDUCE_UNARY(Variant::OP_NEGATE);
-				} break;
-				case OperatorNode::OP_POS: {
-					_REDUCE_UNARY(Variant::OP_POSITIVE);
-				} break;
-				case OperatorNode::OP_NOT: {
-					_REDUCE_UNARY(Variant::OP_NOT);
-				} break;
-				case OperatorNode::OP_BIT_INVERT: {
-					_REDUCE_UNARY(Variant::OP_BIT_NEGATE);
-				} break;
-				//binary operators (in precedence order)
-				case OperatorNode::OP_IN: {
-					_REDUCE_BINARY(Variant::OP_IN);
-				} break;
-				case OperatorNode::OP_EQUAL: {
-					_REDUCE_BINARY(Variant::OP_EQUAL);
-				} break;
-				case OperatorNode::OP_NOT_EQUAL: {
-					_REDUCE_BINARY(Variant::OP_NOT_EQUAL);
-				} break;
-				case OperatorNode::OP_LESS: {
-					_REDUCE_BINARY(Variant::OP_LESS);
-				} break;
-				case OperatorNode::OP_LESS_EQUAL: {
-					_REDUCE_BINARY(Variant::OP_LESS_EQUAL);
-				} break;
-				case OperatorNode::OP_GREATER: {
-					_REDUCE_BINARY(Variant::OP_GREATER);
-				} break;
-				case OperatorNode::OP_GREATER_EQUAL: {
-					_REDUCE_BINARY(Variant::OP_GREATER_EQUAL);
-				} break;
-				case OperatorNode::OP_AND: {
-					_REDUCE_BINARY(Variant::OP_AND);
-				} break;
-				case OperatorNode::OP_OR: {
-					_REDUCE_BINARY(Variant::OP_OR);
-				} break;
-				case OperatorNode::OP_ADD: {
-					_REDUCE_BINARY(Variant::OP_ADD);
-				} break;
-				case OperatorNode::OP_SUB: {
-					_REDUCE_BINARY(Variant::OP_SUBTRACT);
-				} break;
-				case OperatorNode::OP_MUL: {
-					_REDUCE_BINARY(Variant::OP_MULTIPLY);
-				} break;
-				case OperatorNode::OP_DIV: {
-					_REDUCE_BINARY(Variant::OP_DIVIDE);
-				} break;
-				case OperatorNode::OP_MOD: {
-					_REDUCE_BINARY(Variant::OP_MODULE);
-				} break;
-				case OperatorNode::OP_SHIFT_LEFT: {
-					_REDUCE_BINARY(Variant::OP_SHIFT_LEFT);
-				} break;
-				case OperatorNode::OP_SHIFT_RIGHT: {
-					_REDUCE_BINARY(Variant::OP_SHIFT_RIGHT);
-				} break;
-				case OperatorNode::OP_BIT_AND: {
-					_REDUCE_BINARY(Variant::OP_BIT_AND);
-				} break;
-				case OperatorNode::OP_BIT_OR: {
-					_REDUCE_BINARY(Variant::OP_BIT_OR);
-				} break;
-				case OperatorNode::OP_BIT_XOR: {
-					_REDUCE_BINARY(Variant::OP_BIT_XOR);
-				} break;
-				case OperatorNode::OP_TERNARY_IF: {
-					if (static_cast<ConstantNode *>(op->arguments[0])->value.booleanize()) {
-						return op->arguments[1];
-					} else {
-						return op->arguments[2];
-					}
-				} break;
-				default: {
-					ERR_FAIL_V(op);
-				}
-			}
-
-		} break;
-		default: {
-			return p_node;
-		} break;
+	if (valid) {
+		valid = validate_annotation_arguments(annotation);
 	}
+
+	return valid ? annotation : nullptr;
 }
 
-GDScriptParser::Node *GDScriptParser::_parse_and_reduce_expression(Node *p_parent, bool p_static, bool p_reduce_const, bool p_allow_assign) {
+void GDScriptParser::clear_unused_annotations() {
+	for (const List<AnnotationNode *>::Element *E = annotation_stack.front(); E != nullptr; E = E->next()) {
+		AnnotationNode *annotation = E->get();
+		push_error(vformat(R"(Annotation "%s" does not precedes a valid target, so it will have no effect.)", annotation->name), annotation);
+	}
 
-	Node *expr = _parse_expression(p_parent, p_static, p_allow_assign, p_reduce_const);
-	if (!expr || error_set)
-		return NULL;
-	expr = _reduce_expression(expr, p_reduce_const);
-	if (!expr || error_set)
-		return NULL;
-	return expr;
+	annotation_stack.clear();
 }
 
-bool GDScriptParser::_recover_from_completion() {
+bool GDScriptParser::register_annotation(const MethodInfo &p_info, uint32_t p_target_kinds, AnnotationAction p_apply, int p_optional_arguments, bool p_is_vararg) {
+	ERR_FAIL_COND_V_MSG(valid_annotations.has(p_info.name), false, vformat(R"(Annotation "%s" already registered.)", p_info.name));
 
-	if (!completion_found) {
-		return false; //can't recover if no completion
-	}
-	//skip stuff until newline
-	while (tokenizer->get_token() != GDScriptTokenizer::TK_NEWLINE && tokenizer->get_token() != GDScriptTokenizer::TK_EOF && tokenizer->get_token() != GDScriptTokenizer::TK_ERROR) {
-		tokenizer->advance();
-	}
-	completion_found = false;
-	error_set = false;
-	if (tokenizer->get_token() == GDScriptTokenizer::TK_ERROR) {
-		error_set = true;
+	AnnotationInfo new_annotation;
+	new_annotation.info = p_info;
+	new_annotation.info.default_arguments.resize(p_optional_arguments);
+	if (p_is_vararg) {
+		new_annotation.info.flags |= METHOD_FLAG_VARARG;
 	}
+	new_annotation.apply = p_apply;
+	new_annotation.target_kind = p_target_kinds;
 
+	valid_annotations[p_info.name] = new_annotation;
 	return true;
 }
 
-GDScriptParser::PatternNode *GDScriptParser::_parse_pattern(bool p_static) {
-
-	PatternNode *pattern = alloc_node<PatternNode>();
+GDScriptParser::SuiteNode *GDScriptParser::parse_suite(const String &p_context, SuiteNode *p_suite) {
+	SuiteNode *suite = p_suite != nullptr ? p_suite : alloc_node<SuiteNode>();
+	suite->parent_block = current_suite;
+	current_suite = suite;
 
-	GDScriptTokenizer::Token token = tokenizer->get_token();
-	if (error_set)
-		return NULL;
+	bool multiline = false;
 
-	if (token == GDScriptTokenizer::TK_EOF) {
-		return NULL;
+	if (check(GDScriptTokenizer::Token::NEWLINE)) {
+		multiline = true;
 	}
 
-	switch (token) {
-		// array
-		case GDScriptTokenizer::TK_BRACKET_OPEN: {
-			tokenizer->advance();
-			pattern->pt_type = GDScriptParser::PatternNode::PT_ARRAY;
-			while (true) {
+	if (multiline) {
+		consume(GDScriptTokenizer::Token::NEWLINE, vformat(R"(Expected newline after %s.)", p_context));
 
-				if (tokenizer->get_token() == GDScriptTokenizer::TK_BRACKET_CLOSE) {
-					tokenizer->advance();
-					break;
-				}
-
-				if (tokenizer->get_token() == GDScriptTokenizer::TK_PERIOD && tokenizer->get_token(1) == GDScriptTokenizer::TK_PERIOD) {
-					// match everything
-					tokenizer->advance(2);
-					PatternNode *sub_pattern = alloc_node<PatternNode>();
-					sub_pattern->pt_type = GDScriptParser::PatternNode::PT_IGNORE_REST;
-					pattern->array.push_back(sub_pattern);
-					if (tokenizer->get_token() == GDScriptTokenizer::TK_COMMA && tokenizer->get_token(1) == GDScriptTokenizer::TK_BRACKET_CLOSE) {
-						tokenizer->advance(2);
-						break;
-					} else if (tokenizer->get_token() == GDScriptTokenizer::TK_BRACKET_CLOSE) {
-						tokenizer->advance(1);
-						break;
-					} else {
-						_set_error("'..' pattern only allowed at the end of an array pattern");
-						return NULL;
-					}
-				}
-
-				PatternNode *sub_pattern = _parse_pattern(p_static);
-				if (!sub_pattern) {
-					return NULL;
-				}
+		if (!consume(GDScriptTokenizer::Token::INDENT, vformat(R"(Expected indented block after %s.)", p_context))) {
+			current_suite = suite->parent_block;
+			return suite;
+		}
+	}
 
-				pattern->array.push_back(sub_pattern);
+	do {
+		Node *statement = parse_statement();
+		if (statement == nullptr) {
+			continue;
+		}
+		suite->statements.push_back(statement);
 
-				if (tokenizer->get_token() == GDScriptTokenizer::TK_COMMA) {
-					tokenizer->advance();
-					continue;
-				} else if (tokenizer->get_token() == GDScriptTokenizer::TK_BRACKET_CLOSE) {
-					tokenizer->advance();
-					break;
-				} else {
-					_set_error("Not a valid pattern");
-					return NULL;
-				}
-			}
-		} break;
-		// bind
-		case GDScriptTokenizer::TK_PR_VAR: {
-			tokenizer->advance();
-			if (!tokenizer->is_token_literal()) {
-				_set_error("Expected identifier for binding variable name.");
-				return NULL;
-			}
-			pattern->pt_type = GDScriptParser::PatternNode::PT_BIND;
-			pattern->bind = tokenizer->get_token_literal();
-			// Check if variable name is already used
-			BlockNode *bl = current_block;
-			while (bl) {
-				if (bl->variables.has(pattern->bind)) {
-					_set_error("Binding name of '" + pattern->bind.operator String() + "' is already declared in this scope.");
-					return NULL;
+		// Register locals.
+		switch (statement->type) {
+			case Node::VARIABLE: {
+				VariableNode *variable = static_cast<VariableNode *>(statement);
+				const SuiteNode::Local &local = current_suite->get_local(variable->identifier->name);
+				if (local.type != SuiteNode::Local::UNDEFINED) {
+					push_error(vformat(R"(There is already a %s named "%s" declared in this scope.)", local.get_name(), variable->identifier->name));
 				}
-				bl = bl->parent_block;
+				current_suite->add_local(variable);
+				break;
 			}
-			// Create local variable for proper identifier detection later
-			LocalVarNode *lv = alloc_node<LocalVarNode>();
-			lv->name = pattern->bind;
-			current_block->variables.insert(lv->name, lv);
-			tokenizer->advance();
-		} break;
-		// dictionary
-		case GDScriptTokenizer::TK_CURLY_BRACKET_OPEN: {
-			tokenizer->advance();
-			pattern->pt_type = GDScriptParser::PatternNode::PT_DICTIONARY;
-			while (true) {
-
-				if (tokenizer->get_token() == GDScriptTokenizer::TK_CURLY_BRACKET_CLOSE) {
-					tokenizer->advance();
-					break;
-				}
-
-				if (tokenizer->get_token() == GDScriptTokenizer::TK_PERIOD && tokenizer->get_token(1) == GDScriptTokenizer::TK_PERIOD) {
-					// match everything
-					tokenizer->advance(2);
-					PatternNode *sub_pattern = alloc_node<PatternNode>();
-					sub_pattern->pt_type = PatternNode::PT_IGNORE_REST;
-					pattern->array.push_back(sub_pattern);
-					if (tokenizer->get_token() == GDScriptTokenizer::TK_COMMA && tokenizer->get_token(1) == GDScriptTokenizer::TK_CURLY_BRACKET_CLOSE) {
-						tokenizer->advance(2);
-						break;
-					} else if (tokenizer->get_token() == GDScriptTokenizer::TK_CURLY_BRACKET_CLOSE) {
-						tokenizer->advance(1);
-						break;
+			case Node::CONSTANT: {
+				ConstantNode *constant = static_cast<ConstantNode *>(statement);
+				const SuiteNode::Local &local = current_suite->get_local(constant->identifier->name);
+				if (local.type != SuiteNode::Local::UNDEFINED) {
+					String name;
+					if (local.type == SuiteNode::Local::CONSTANT) {
+						name = "constant";
 					} else {
-						_set_error("'..' pattern only allowed at the end of a dictionary pattern");
-						return NULL;
+						name = "variable";
 					}
+					push_error(vformat(R"(There is already a %s named "%s" declared in this scope.)", name, constant->identifier->name));
 				}
+				current_suite->add_local(constant);
+				break;
+			}
+			default:
+				break;
+		}
 
-				Node *key = _parse_and_reduce_expression(pattern, p_static);
-				if (!key) {
-					_set_error("Not a valid key in pattern");
-					return NULL;
-				}
+	} while (multiline && !check(GDScriptTokenizer::Token::DEDENT) && !is_at_end());
 
-				if (key->type != GDScriptParser::Node::TYPE_CONSTANT) {
-					_set_error("Not a constant expression as key");
-					return NULL;
-				}
+	if (multiline) {
+		consume(GDScriptTokenizer::Token::DEDENT, vformat(R"(Missing unindent at the end of %s.)", p_context));
+	}
 
-				if (tokenizer->get_token() == GDScriptTokenizer::TK_COLON) {
-					tokenizer->advance();
+	current_suite = suite->parent_block;
+	return suite;
+}
 
-					PatternNode *value = _parse_pattern(p_static);
-					if (!value) {
-						_set_error("Expected pattern in dictionary value");
-						return NULL;
-					}
+GDScriptParser::Node *GDScriptParser::parse_statement() {
+	Node *result = nullptr;
+#ifdef DEBUG_ENABLED
+	bool unreachable = current_suite->has_return && !current_suite->has_unreachable_code;
+#endif
 
-					pattern->dictionary.insert(static_cast<ConstantNode *>(key), value);
-				} else {
-					pattern->dictionary.insert(static_cast<ConstantNode *>(key), NULL);
+	switch (current.type) {
+		case GDScriptTokenizer::Token::PASS:
+			advance();
+			result = alloc_node<PassNode>();
+			end_statement(R"("pass")");
+			break;
+		case GDScriptTokenizer::Token::VAR:
+			advance();
+			result = parse_variable();
+			break;
+		case GDScriptTokenizer::Token::CONST:
+			advance();
+			result = parse_constant();
+			break;
+		case GDScriptTokenizer::Token::IF:
+			advance();
+			result = parse_if();
+			break;
+		case GDScriptTokenizer::Token::FOR:
+			advance();
+			result = parse_for();
+			break;
+		case GDScriptTokenizer::Token::WHILE:
+			advance();
+			result = parse_while();
+			break;
+		case GDScriptTokenizer::Token::MATCH:
+			advance();
+			result = parse_match();
+			break;
+		case GDScriptTokenizer::Token::BREAK:
+			advance();
+			result = parse_break();
+			break;
+		case GDScriptTokenizer::Token::CONTINUE:
+			advance();
+			result = parse_continue();
+			break;
+		case GDScriptTokenizer::Token::RETURN: {
+			advance();
+			ReturnNode *n_return = alloc_node<ReturnNode>();
+			if (!is_statement_end()) {
+				if (current_function && current_function->identifier->name == GDScriptLanguage::get_singleton()->strings._init) {
+					push_error(R"(Constructor cannot return a value.)");
 				}
+				n_return->return_value = parse_expression(false);
+			}
+			result = n_return;
 
-				if (tokenizer->get_token() == GDScriptTokenizer::TK_COMMA) {
-					tokenizer->advance();
-					continue;
-				} else if (tokenizer->get_token() == GDScriptTokenizer::TK_CURLY_BRACKET_CLOSE) {
-					tokenizer->advance();
-					break;
-				} else {
-					_set_error("Not a valid pattern");
-					return NULL;
-				}
+			current_suite->has_return = true;
+
+			end_statement("return statement");
+			break;
+		}
+		case GDScriptTokenizer::Token::BREAKPOINT:
+			advance();
+			result = alloc_node<BreakpointNode>();
+			end_statement(R"("breakpoint")");
+			break;
+		case GDScriptTokenizer::Token::ASSERT:
+			advance();
+			result = parse_assert();
+			break;
+		case GDScriptTokenizer::Token::ANNOTATION: {
+			advance();
+			AnnotationNode *annotation = parse_annotation(AnnotationInfo::STATEMENT);
+			if (annotation != nullptr) {
+				annotation_stack.push_back(annotation);
 			}
-		} break;
-		case GDScriptTokenizer::TK_WILDCARD: {
-			tokenizer->advance();
-			pattern->pt_type = PatternNode::PT_WILDCARD;
-		} break;
-		// all the constants like strings and numbers
+			break;
+		}
 		default: {
-			Node *value = _parse_and_reduce_expression(pattern, p_static);
-			if (!value) {
-				_set_error("Expect constant expression or variables in a pattern");
-				return NULL;
+			// Expression statement.
+			ExpressionNode *expression = parse_expression(true); // Allow assignment here.
+			if (expression == nullptr) {
+				push_error(vformat(R"(Expected statement, found "%s" instead.)", previous.get_name()));
 			}
+			end_statement("expression");
+			result = expression;
 
-			if (value->type == Node::TYPE_OPERATOR) {
-				// Maybe it's SomeEnum.VALUE
-				Node *current_value = value;
-
-				while (current_value->type == Node::TYPE_OPERATOR) {
-					OperatorNode *op_node = static_cast<OperatorNode *>(current_value);
-
-					if (op_node->op != OperatorNode::OP_INDEX_NAMED) {
-						_set_error("Invalid operator in pattern. Only index (`A.B`) is allowed");
-						return NULL;
-					}
-					current_value = op_node->arguments[0];
-				}
-
-				if (current_value->type != Node::TYPE_IDENTIFIER) {
-					_set_error("Only constant expression or variables allowed in a pattern");
-					return NULL;
+#ifdef DEBUG_ENABLED
+			if (expression != nullptr) {
+				switch (expression->type) {
+					case Node::CALL:
+					case Node::ASSIGNMENT:
+					case Node::AWAIT:
+						// Fine.
+						break;
+					default:
+						push_warning(expression, GDScriptWarning::STANDALONE_EXPRESSION);
 				}
-
-			} else if (value->type != Node::TYPE_IDENTIFIER && value->type != Node::TYPE_CONSTANT) {
-				_set_error("Only constant expressions or variables allowed in a pattern");
-				return NULL;
 			}
-
-			pattern->pt_type = PatternNode::PT_CONSTANT;
-			pattern->constant = value;
-		} break;
-	}
-
-	return pattern;
-}
-
-void GDScriptParser::_parse_pattern_block(BlockNode *p_block, Vector<PatternBranchNode *> &p_branches, bool p_static) {
-	IndentLevel current_level = indent_level.back()->get();
-
-	p_block->has_return = true;
-
-	bool catch_all_appeared = false;
-
-	while (true) {
-
-		while (tokenizer->get_token() == GDScriptTokenizer::TK_NEWLINE && _parse_newline())
-			;
-
-		// GDScriptTokenizer::Token token = tokenizer->get_token();
-		if (error_set)
-			return;
-
-		if (current_level.indent > indent_level.back()->get().indent) {
-			break; // go back a level
-		}
-
-		pending_newline = -1;
-
-		PatternBranchNode *branch = alloc_node<PatternBranchNode>();
-		branch->body = alloc_node<BlockNode>();
-		branch->body->parent_block = p_block;
-		p_block->sub_blocks.push_back(branch->body);
-		current_block = branch->body;
-
-		branch->patterns.push_back(_parse_pattern(p_static));
-		if (!branch->patterns[0]) {
+#endif
 			break;
 		}
-
-		bool has_binding = branch->patterns[0]->pt_type == PatternNode::PT_BIND;
-		bool catch_all = has_binding || branch->patterns[0]->pt_type == PatternNode::PT_WILDCARD;
+	}
 
 #ifdef DEBUG_ENABLED
-		// Branches after a wildcard or binding are unreachable
-		if (catch_all_appeared && !current_function->has_unreachable_code) {
-			_add_warning(GDScriptWarning::UNREACHABLE_CODE, -1, current_function->name.operator String());
-			current_function->has_unreachable_code = true;
-		}
+	if (unreachable) {
+		current_suite->has_unreachable_code = true;
+		push_warning(result, GDScriptWarning::UNREACHABLE_CODE, current_function->identifier->name);
+	}
 #endif
 
-		while (tokenizer->get_token() == GDScriptTokenizer::TK_COMMA) {
-			tokenizer->advance();
-			branch->patterns.push_back(_parse_pattern(p_static));
-			if (!branch->patterns[branch->patterns.size() - 1]) {
-				return;
-			}
-
-			PatternNode::PatternType pt = branch->patterns[branch->patterns.size() - 1]->pt_type;
+	if (panic_mode) {
+		synchronize();
+	}
 
-			if (pt == PatternNode::PT_BIND) {
-				_set_error("Cannot use bindings with multipattern.");
-				return;
-			}
+	return result;
+}
 
-			catch_all = catch_all || pt == PatternNode::PT_WILDCARD;
-		}
+GDScriptParser::AssertNode *GDScriptParser::parse_assert() {
+	// TODO: Add assert message.
+	AssertNode *assert = alloc_node<AssertNode>();
 
-		catch_all_appeared = catch_all_appeared || catch_all;
+	consume(GDScriptTokenizer::Token::PARENTHESIS_OPEN, R"(Expected "(" after "assert".)");
+	assert->condition = parse_expression(false);
+	if (assert->condition == nullptr) {
+		push_error("Expected expression to assert.");
+		return nullptr;
+	}
 
-		if (!_enter_indent_block()) {
-			_set_error("Expected block in pattern branch");
-			return;
+	if (match(GDScriptTokenizer::Token::COMMA)) {
+		// Error message.
+		if (consume(GDScriptTokenizer::Token::LITERAL, R"(Expected error message for assert after ",".)")) {
+			assert->message = parse_literal();
+			if (assert->message->value.get_type() != Variant::STRING) {
+				push_error(R"(Expected string for assert error message.)");
+			}
+		} else {
+			return nullptr;
 		}
+	}
 
-		_parse_block(branch->body, p_static);
+	consume(GDScriptTokenizer::Token::PARENTHESIS_CLOSE, R"*(Expected ")" after assert expression.)*");
 
-		current_block = p_block;
+	end_statement(R"("assert")");
 
-		if (!branch->body->has_return) {
-			p_block->has_return = false;
-		}
+	return assert;
+}
 
-		p_branches.push_back(branch);
+GDScriptParser::BreakNode *GDScriptParser::parse_break() {
+	if (!can_break) {
+		push_error(R"(Cannot use "break" outside of a loop.)");
 	}
+	end_statement(R"("break")");
+	return alloc_node<BreakNode>();
+}
 
-	// Even if all branches return, there is possibility of default fallthrough
-	if (!catch_all_appeared) {
-		p_block->has_return = false;
+GDScriptParser::ContinueNode *GDScriptParser::parse_continue() {
+	if (!can_continue) {
+		push_error(R"(Cannot use "continue" outside of a loop or pattern matching block.)");
 	}
+	current_suite->has_continue = true;
+	end_statement(R"("continue")");
+	ContinueNode *cont = alloc_node<ContinueNode>();
+	cont->is_for_match = is_continue_match;
+	return cont;
 }
 
-void GDScriptParser::_generate_pattern(PatternNode *p_pattern, Node *p_node_to_match, Node *&p_resulting_node, Map<StringName, Node *> &p_bindings) {
-
-	const DataType &to_match_type = p_node_to_match->get_datatype();
-
-	switch (p_pattern->pt_type) {
-		case PatternNode::PT_CONSTANT: {
-
-			DataType pattern_type = _reduce_node_type(p_pattern->constant);
-			if (error_set) {
-				return;
-			}
-
-			OperatorNode *type_comp = NULL;
-
-			// static type check if possible
-			if (pattern_type.has_type && to_match_type.has_type) {
-				if (!_is_type_compatible(to_match_type, pattern_type) && !_is_type_compatible(pattern_type, to_match_type)) {
-					_set_error("The pattern type (" + pattern_type.to_string() + ") isn't compatible with the type of the value to match (" + to_match_type.to_string() + ").",
-							p_pattern->line);
-					return;
-				}
-			} else {
-				// runtime typecheck
-				BuiltInFunctionNode *typeof_node = alloc_node<BuiltInFunctionNode>();
-				typeof_node->function = GDScriptFunctions::TYPE_OF;
-
-				OperatorNode *typeof_match_value = alloc_node<OperatorNode>();
-				typeof_match_value->op = OperatorNode::OP_CALL;
-				typeof_match_value->arguments.push_back(typeof_node);
-				typeof_match_value->arguments.push_back(p_node_to_match);
-
-				OperatorNode *typeof_pattern_value = alloc_node<OperatorNode>();
-				typeof_pattern_value->op = OperatorNode::OP_CALL;
-				typeof_pattern_value->arguments.push_back(typeof_node);
-				typeof_pattern_value->arguments.push_back(p_pattern->constant);
-
-				type_comp = alloc_node<OperatorNode>();
-				type_comp->op = OperatorNode::OP_EQUAL;
-				type_comp->arguments.push_back(typeof_match_value);
-				type_comp->arguments.push_back(typeof_pattern_value);
-			}
-
-			// compare the actual values
-			OperatorNode *value_comp = alloc_node<OperatorNode>();
-			value_comp->op = OperatorNode::OP_EQUAL;
-			value_comp->arguments.push_back(p_pattern->constant);
-			value_comp->arguments.push_back(p_node_to_match);
-
-			if (type_comp) {
-				OperatorNode *full_comparison = alloc_node<OperatorNode>();
-				full_comparison->op = OperatorNode::OP_AND;
-				full_comparison->arguments.push_back(type_comp);
-				full_comparison->arguments.push_back(value_comp);
-
-				p_resulting_node = full_comparison;
-			} else {
-				p_resulting_node = value_comp;
-			}
-
-		} break;
-		case PatternNode::PT_BIND: {
-			p_bindings[p_pattern->bind] = p_node_to_match;
-
-			// a bind always matches
-			ConstantNode *true_value = alloc_node<ConstantNode>();
-			true_value->value = Variant(true);
-			p_resulting_node = true_value;
-		} break;
-		case PatternNode::PT_ARRAY: {
-
-			bool open_ended = false;
-
-			if (p_pattern->array.size() > 0) {
-				if (p_pattern->array[p_pattern->array.size() - 1]->pt_type == PatternNode::PT_IGNORE_REST) {
-					open_ended = true;
-				}
-			}
-
-			// typeof(value_to_match) == TYPE_ARRAY && value_to_match.size() >= length
-			// typeof(value_to_match) == TYPE_ARRAY && value_to_match.size() == length
-
-			{
-				OperatorNode *type_comp = NULL;
-				// static type check if possible
-				if (to_match_type.has_type) {
-					// must be an array
-					if (to_match_type.kind != DataType::BUILTIN || to_match_type.builtin_type != Variant::ARRAY) {
-						_set_error("Cannot match an array pattern with a non-array expression.", p_pattern->line);
-						return;
-					}
-				} else {
-					// runtime typecheck
-					BuiltInFunctionNode *typeof_node = alloc_node<BuiltInFunctionNode>();
-					typeof_node->function = GDScriptFunctions::TYPE_OF;
-
-					OperatorNode *typeof_match_value = alloc_node<OperatorNode>();
-					typeof_match_value->op = OperatorNode::OP_CALL;
-					typeof_match_value->arguments.push_back(typeof_node);
-					typeof_match_value->arguments.push_back(p_node_to_match);
-
-					IdentifierNode *typeof_array = alloc_node<IdentifierNode>();
-					typeof_array->name = "TYPE_ARRAY";
-
-					type_comp = alloc_node<OperatorNode>();
-					type_comp->op = OperatorNode::OP_EQUAL;
-					type_comp->arguments.push_back(typeof_match_value);
-					type_comp->arguments.push_back(typeof_array);
-				}
-
-				// size
-				ConstantNode *length = alloc_node<ConstantNode>();
-				length->value = Variant(open_ended ? p_pattern->array.size() - 1 : p_pattern->array.size());
-
-				OperatorNode *call = alloc_node<OperatorNode>();
-				call->op = OperatorNode::OP_CALL;
-				call->arguments.push_back(p_node_to_match);
-
-				IdentifierNode *size = alloc_node<IdentifierNode>();
-				size->name = "size";
-				call->arguments.push_back(size);
-
-				OperatorNode *length_comparison = alloc_node<OperatorNode>();
-				length_comparison->op = open_ended ? OperatorNode::OP_GREATER_EQUAL : OperatorNode::OP_EQUAL;
-				length_comparison->arguments.push_back(call);
-				length_comparison->arguments.push_back(length);
-
-				if (type_comp) {
-					OperatorNode *type_and_length_comparison = alloc_node<OperatorNode>();
-					type_and_length_comparison->op = OperatorNode::OP_AND;
-					type_and_length_comparison->arguments.push_back(type_comp);
-					type_and_length_comparison->arguments.push_back(length_comparison);
-
-					p_resulting_node = type_and_length_comparison;
-				} else {
-					p_resulting_node = length_comparison;
-				}
-			}
-
-			for (int i = 0; i < p_pattern->array.size(); i++) {
-				PatternNode *pattern = p_pattern->array[i];
-
-				Node *condition = NULL;
-
-				ConstantNode *index = alloc_node<ConstantNode>();
-				index->value = Variant(i);
-
-				OperatorNode *indexed_value = alloc_node<OperatorNode>();
-				indexed_value->op = OperatorNode::OP_INDEX;
-				indexed_value->arguments.push_back(p_node_to_match);
-				indexed_value->arguments.push_back(index);
-
-				_generate_pattern(pattern, indexed_value, condition, p_bindings);
+GDScriptParser::ForNode *GDScriptParser::parse_for() {
+	ForNode *n_for = alloc_node<ForNode>();
 
-				// concatenate all the patterns with &&
-				OperatorNode *and_node = alloc_node<OperatorNode>();
-				and_node->op = OperatorNode::OP_AND;
-				and_node->arguments.push_back(p_resulting_node);
-				and_node->arguments.push_back(condition);
-
-				p_resulting_node = and_node;
-			}
-
-		} break;
-		case PatternNode::PT_DICTIONARY: {
-
-			bool open_ended = false;
-
-			if (p_pattern->array.size() > 0) {
-				open_ended = true;
-			}
-
-			// typeof(value_to_match) == TYPE_DICTIONARY && value_to_match.size() >= length
-			// typeof(value_to_match) == TYPE_DICTIONARY && value_to_match.size() == length
-
-			{
-				OperatorNode *type_comp = NULL;
-				// static type check if possible
-				if (to_match_type.has_type) {
-					// must be an dictionary
-					if (to_match_type.kind != DataType::BUILTIN || to_match_type.builtin_type != Variant::DICTIONARY) {
-						_set_error("Cannot match an dictionary pattern with a non-dictionary expression.", p_pattern->line);
-						return;
-					}
-				} else {
-					// runtime typecheck
-					BuiltInFunctionNode *typeof_node = alloc_node<BuiltInFunctionNode>();
-					typeof_node->function = GDScriptFunctions::TYPE_OF;
-
-					OperatorNode *typeof_match_value = alloc_node<OperatorNode>();
-					typeof_match_value->op = OperatorNode::OP_CALL;
-					typeof_match_value->arguments.push_back(typeof_node);
-					typeof_match_value->arguments.push_back(p_node_to_match);
-
-					IdentifierNode *typeof_dictionary = alloc_node<IdentifierNode>();
-					typeof_dictionary->name = "TYPE_DICTIONARY";
-
-					type_comp = alloc_node<OperatorNode>();
-					type_comp->op = OperatorNode::OP_EQUAL;
-					type_comp->arguments.push_back(typeof_match_value);
-					type_comp->arguments.push_back(typeof_dictionary);
-				}
-
-				// size
-				ConstantNode *length = alloc_node<ConstantNode>();
-				length->value = Variant(open_ended ? p_pattern->dictionary.size() - 1 : p_pattern->dictionary.size());
-
-				OperatorNode *call = alloc_node<OperatorNode>();
-				call->op = OperatorNode::OP_CALL;
-				call->arguments.push_back(p_node_to_match);
+	if (consume(GDScriptTokenizer::Token::IDENTIFIER, R"(Expected loop variable name after "for".)")) {
+		n_for->variable = parse_identifier();
+	}
 
-				IdentifierNode *size = alloc_node<IdentifierNode>();
-				size->name = "size";
-				call->arguments.push_back(size);
+	consume(GDScriptTokenizer::Token::IN, R"(Expected "in" after "for" variable name.)");
 
-				OperatorNode *length_comparison = alloc_node<OperatorNode>();
-				length_comparison->op = open_ended ? OperatorNode::OP_GREATER_EQUAL : OperatorNode::OP_EQUAL;
-				length_comparison->arguments.push_back(call);
-				length_comparison->arguments.push_back(length);
+	n_for->list = parse_expression(false);
 
-				if (type_comp) {
-					OperatorNode *type_and_length_comparison = alloc_node<OperatorNode>();
-					type_and_length_comparison->op = OperatorNode::OP_AND;
-					type_and_length_comparison->arguments.push_back(type_comp);
-					type_and_length_comparison->arguments.push_back(length_comparison);
+	consume(GDScriptTokenizer::Token::COLON, R"(Expected ":" after "for" condition.)");
 
-					p_resulting_node = type_and_length_comparison;
-				} else {
-					p_resulting_node = length_comparison;
-				}
-			}
+	// Save break/continue state.
+	bool could_break = can_break;
+	bool could_continue = can_continue;
+	bool was_continue_match = is_continue_match;
 
-			for (Map<ConstantNode *, PatternNode *>::Element *e = p_pattern->dictionary.front(); e; e = e->next()) {
+	// Allow break/continue.
+	can_break = true;
+	can_continue = true;
+	is_continue_match = false;
 
-				Node *condition = NULL;
-
-				// check for has, then for pattern
-
-				IdentifierNode *has = alloc_node<IdentifierNode>();
-				has->name = "has";
-
-				OperatorNode *has_call = alloc_node<OperatorNode>();
-				has_call->op = OperatorNode::OP_CALL;
-				has_call->arguments.push_back(p_node_to_match);
-				has_call->arguments.push_back(has);
-				has_call->arguments.push_back(e->key());
+	SuiteNode *suite = alloc_node<SuiteNode>();
+	if (n_for->variable) {
+		suite->add_local(SuiteNode::Local(n_for->variable));
+	}
+	suite->parent_for = n_for;
 
-				if (e->value()) {
+	n_for->loop = parse_suite(R"("for" block)", suite);
 
-					OperatorNode *indexed_value = alloc_node<OperatorNode>();
-					indexed_value->op = OperatorNode::OP_INDEX;
-					indexed_value->arguments.push_back(p_node_to_match);
-					indexed_value->arguments.push_back(e->key());
+	// Reset break/continue state.
+	can_break = could_break;
+	can_continue = could_continue;
+	is_continue_match = was_continue_match;
 
-					_generate_pattern(e->value(), indexed_value, condition, p_bindings);
+	return n_for;
+}
 
-					OperatorNode *has_and_pattern = alloc_node<OperatorNode>();
-					has_and_pattern->op = OperatorNode::OP_AND;
-					has_and_pattern->arguments.push_back(has_call);
-					has_and_pattern->arguments.push_back(condition);
+GDScriptParser::IfNode *GDScriptParser::parse_if(const String &p_token) {
+	IfNode *n_if = alloc_node<IfNode>();
 
-					condition = has_and_pattern;
+	n_if->condition = parse_expression(false);
+	if (n_if->condition == nullptr) {
+		push_error(vformat(R"(Expected conditional expression after "%s".)", p_token));
+	}
 
-				} else {
-					condition = has_call;
-				}
+	consume(GDScriptTokenizer::Token::COLON, vformat(R"(Expected ":" after "%s" condition.)", p_token));
 
-				// concatenate all the patterns with &&
-				OperatorNode *and_node = alloc_node<OperatorNode>();
-				and_node->op = OperatorNode::OP_AND;
-				and_node->arguments.push_back(p_resulting_node);
-				and_node->arguments.push_back(condition);
+	n_if->true_block = parse_suite(vformat(R"("%s" block)", p_token));
+	n_if->true_block->parent_if = n_if;
 
-				p_resulting_node = and_node;
-			}
+	if (n_if->true_block->has_continue) {
+		current_suite->has_continue = true;
+	}
 
-		} break;
-		case PatternNode::PT_IGNORE_REST:
-		case PatternNode::PT_WILDCARD: {
-			// simply generate a `true`
-			ConstantNode *true_value = alloc_node<ConstantNode>();
-			true_value->value = Variant(true);
-			p_resulting_node = true_value;
-		} break;
-		default: {
+	if (match(GDScriptTokenizer::Token::ELIF)) {
+		IfNode *elif = parse_if("elif");
 
-		} break;
+		SuiteNode *else_block = alloc_node<SuiteNode>();
+		else_block->statements.push_back(elif);
+		n_if->false_block = else_block;
+	} else if (match(GDScriptTokenizer::Token::ELSE)) {
+		consume(GDScriptTokenizer::Token::COLON, R"(Expected ":" after "else".)");
+		n_if->false_block = parse_suite(R"("else" block)");
 	}
-}
 
-void GDScriptParser::_transform_match_statment(MatchNode *p_match_statement) {
-	IdentifierNode *id = alloc_node<IdentifierNode>();
-	id->name = "#match_value";
-	id->line = p_match_statement->line;
-	id->datatype = _reduce_node_type(p_match_statement->val_to_match);
-	if (id->datatype.has_type) {
-		_mark_line_as_safe(id->line);
-	} else {
-		_mark_line_as_unsafe(id->line);
+	if (n_if->false_block != nullptr && n_if->false_block->has_return && n_if->true_block->has_return) {
+		current_suite->has_return = true;
 	}
-
-	if (error_set) {
-		return;
+	if (n_if->false_block != nullptr && n_if->false_block->has_continue) {
+		current_suite->has_continue = true;
 	}
 
-	for (int i = 0; i < p_match_statement->branches.size(); i++) {
-
-		PatternBranchNode *branch = p_match_statement->branches[i];
+	return n_if;
+}
 
-		MatchNode::CompiledPatternBranch compiled_branch;
-		compiled_branch.compiled_pattern = NULL;
+GDScriptParser::MatchNode *GDScriptParser::parse_match() {
+	MatchNode *match = alloc_node<MatchNode>();
 
-		Map<StringName, Node *> binding;
+	match->test = parse_expression(false);
+	if (match->test == nullptr) {
+		push_error(R"(Expected expression to test after "match".)");
+	}
 
-		for (int j = 0; j < branch->patterns.size(); j++) {
-			PatternNode *pattern = branch->patterns[j];
-			_mark_line_as_safe(pattern->line);
+	consume(GDScriptTokenizer::Token::COLON, R"(Expected ":" after "match" expression.)");
+	consume(GDScriptTokenizer::Token::NEWLINE, R"(Expected a newline after "match" statement.)");
 
-			Map<StringName, Node *> bindings;
-			Node *resulting_node = NULL;
-			_generate_pattern(pattern, id, resulting_node, bindings);
+	if (!consume(GDScriptTokenizer::Token::INDENT, R"(Expected an indented block after "match" statement.)")) {
+		return match;
+	}
 
-			if (!resulting_node) {
-				return;
-			}
+#ifdef DEBUG_ENABLED
+	bool all_have_return = true;
+	bool have_wildcard = false;
+	bool wildcard_has_return = false;
+	bool have_wildcard_without_continue = false;
+#endif
 
-			if (!binding.empty() && !bindings.empty()) {
-				_set_error("Multipatterns can't contain bindings");
-				return;
-			} else {
-				binding = bindings;
-			}
+	while (!check(GDScriptTokenizer::Token::DEDENT) && !is_at_end()) {
+		MatchBranchNode *branch = parse_match_branch();
+		if (branch == nullptr) {
+			continue;
+		}
 
-			// Result is always a boolean
-			DataType resulting_node_type;
-			resulting_node_type.has_type = true;
-			resulting_node_type.is_constant = true;
-			resulting_node_type.kind = DataType::BUILTIN;
-			resulting_node_type.builtin_type = Variant::BOOL;
-			resulting_node->set_datatype(resulting_node_type);
-
-			if (compiled_branch.compiled_pattern) {
-				OperatorNode *or_node = alloc_node<OperatorNode>();
-				or_node->op = OperatorNode::OP_OR;
-				or_node->arguments.push_back(compiled_branch.compiled_pattern);
-				or_node->arguments.push_back(resulting_node);
-
-				compiled_branch.compiled_pattern = or_node;
-			} else {
-				// single pattern | first one
-				compiled_branch.compiled_pattern = resulting_node;
-			}
+#ifdef DEBUG_ENABLED
+		if (have_wildcard_without_continue) {
+			push_warning(branch->patterns[0], GDScriptWarning::UNREACHABLE_PATTERN);
 		}
 
-		// prepare the body ...hehe
-		for (Map<StringName, Node *>::Element *e = binding.front(); e; e = e->next()) {
-			if (!branch->body->variables.has(e->key())) {
-				_set_error("Parser bug: missing pattern bind variable.", branch->line);
-				ERR_FAIL();
+		if (branch->has_wildcard) {
+			have_wildcard = true;
+			if (branch->block->has_return) {
+				wildcard_has_return = true;
+			}
+			if (!branch->block->has_continue) {
+				have_wildcard_without_continue = true;
 			}
-
-			LocalVarNode *local_var = branch->body->variables[e->key()];
-			local_var->assign = e->value();
-			local_var->set_datatype(local_var->assign->get_datatype());
-
-			IdentifierNode *id2 = alloc_node<IdentifierNode>();
-			id2->name = local_var->name;
-			id2->declared_block = branch->body;
-			id2->set_datatype(local_var->assign->get_datatype());
-
-			OperatorNode *op = alloc_node<OperatorNode>();
-			op->op = OperatorNode::OP_ASSIGN;
-			op->arguments.push_back(id2);
-			op->arguments.push_back(local_var->assign);
-			local_var->assign_op = op;
-
-			branch->body->statements.push_front(op);
-			branch->body->statements.push_front(local_var);
 		}
-
-		compiled_branch.body = branch->body;
-
-		p_match_statement->compiled_pattern_branches.push_back(compiled_branch);
+		if (!branch->block->has_return) {
+			all_have_return = false;
+		}
+#endif
+		match->branches.push_back(branch);
 	}
-}
-
-void GDScriptParser::_parse_block(BlockNode *p_block, bool p_static) {
 
-	IndentLevel current_level = indent_level.back()->get();
+	consume(GDScriptTokenizer::Token::DEDENT, R"(Expected an indented block after "match" statement.)");
 
 #ifdef DEBUG_ENABLED
-
-	NewLineNode *nl = alloc_node<NewLineNode>();
-
-	nl->line = tokenizer->get_token_line();
-	p_block->statements.push_back(nl);
+	if (wildcard_has_return || (all_have_return && have_wildcard)) {
+		current_suite->has_return = true;
+	}
 #endif
 
-	bool is_first_line = true;
+	return match;
+}
 
-	while (true) {
-		if (!is_first_line && indent_level.back()->prev() && indent_level.back()->prev()->get().indent == current_level.indent) {
-			if (indent_level.back()->prev()->get().is_mixed(current_level)) {
-				_set_error("Mixed tabs and spaces in indentation.");
-				return;
-			}
-			// pythonic single-line expression, don't parse future lines
-			indent_level.pop_back();
-			p_block->end_line = tokenizer->get_token_line();
-			return;
-		}
-		is_first_line = false;
+GDScriptParser::MatchBranchNode *GDScriptParser::parse_match_branch() {
+	MatchBranchNode *branch = alloc_node<MatchBranchNode>();
 
-		GDScriptTokenizer::Token token = tokenizer->get_token();
-		if (error_set)
-			return;
+	bool has_bind = false;
 
-		if (current_level.indent > indent_level.back()->get().indent) {
-			p_block->end_line = tokenizer->get_token_line();
-			return; //go back a level
+	do {
+		PatternNode *pattern = parse_match_pattern();
+		if (pattern == nullptr) {
+			continue;
 		}
-
-		if (pending_newline != -1) {
-
-			NewLineNode *nl2 = alloc_node<NewLineNode>();
-			nl2->line = pending_newline;
-			p_block->statements.push_back(nl2);
-			pending_newline = -1;
+		if (pattern->pattern_type == PatternNode::PT_BIND) {
+			has_bind = true;
 		}
-
-#ifdef DEBUG_ENABLED
-		switch (token) {
-			case GDScriptTokenizer::TK_EOF:
-			case GDScriptTokenizer::TK_ERROR:
-			case GDScriptTokenizer::TK_NEWLINE:
-			case GDScriptTokenizer::TK_CF_PASS: {
-				// will check later
-			} break;
-			default: {
-				if (p_block->has_return && !current_function->has_unreachable_code) {
-					_add_warning(GDScriptWarning::UNREACHABLE_CODE, -1, current_function->name.operator String());
-					current_function->has_unreachable_code = true;
-				}
-			} break;
+		if (branch->patterns.size() > 0 && has_bind) {
+			push_error(R"(Cannot use a variable bind with multiple patterns.)");
 		}
-#endif // DEBUG_ENABLED
-		switch (token) {
-			case GDScriptTokenizer::TK_EOF:
-				p_block->end_line = tokenizer->get_token_line();
-			case GDScriptTokenizer::TK_ERROR: {
-				return; //go back
-
-				//end of file!
-
-			} break;
-			case GDScriptTokenizer::TK_NEWLINE: {
-
-				int line = tokenizer->get_token_line();
-
-				if (!_parse_newline()) {
-					if (!error_set) {
-						p_block->end_line = tokenizer->get_token_line();
-						pending_newline = p_block->end_line;
-					}
-					return;
-				}
+		if (pattern->pattern_type == PatternNode::PT_REST) {
+			push_error(R"(Rest pattern can only be used inside array and dictionary patterns.)");
+		} else if (pattern->pattern_type == PatternNode::PT_BIND || pattern->pattern_type == PatternNode::PT_WILDCARD) {
+			branch->has_wildcard = true;
+		}
+		branch->patterns.push_back(pattern);
+	} while (match(GDScriptTokenizer::Token::COMMA));
 
-				NewLineNode *nl2 = alloc_node<NewLineNode>();
-				nl2->line = line;
-				p_block->statements.push_back(nl2);
+	if (branch->patterns.empty()) {
+		push_error(R"(No pattern found for "match" branch.)");
+	}
 
-			} break;
-			case GDScriptTokenizer::TK_CF_PASS: {
-				if (tokenizer->get_token(1) != GDScriptTokenizer::TK_SEMICOLON && tokenizer->get_token(1) != GDScriptTokenizer::TK_NEWLINE && tokenizer->get_token(1) != GDScriptTokenizer::TK_EOF) {
+	consume(GDScriptTokenizer::Token::COLON, R"(Expected ":" after "match" patterns.)");
 
-					_set_error("Expected \";\" or a line break.");
-					return;
-				}
-				_mark_line_as_safe(tokenizer->get_token_line());
-				tokenizer->advance();
-				if (tokenizer->get_token() == GDScriptTokenizer::TK_SEMICOLON) {
-					// Ignore semicolon after 'pass'.
-					tokenizer->advance();
-				}
-			} break;
-			case GDScriptTokenizer::TK_PR_VAR: {
-				// Variable declaration and (eventual) initialization.
+	// Save continue state.
+	bool could_continue = can_continue;
+	bool was_continue_match = is_continue_match;
+	// Allow continue for match.
+	can_continue = true;
+	is_continue_match = true;
 
-				tokenizer->advance();
-				int var_line = tokenizer->get_token_line();
-				if (!tokenizer->is_token_literal(0, true)) {
+	SuiteNode *suite = alloc_node<SuiteNode>();
+	if (branch->patterns.size() > 0) {
+		List<StringName> binds;
+		branch->patterns[0]->binds.get_key_list(&binds);
 
-					_set_error("Expected an identifier for the local variable name.");
-					return;
-				}
-				StringName n = tokenizer->get_token_literal();
-				tokenizer->advance();
-				if (current_function) {
-					for (int i = 0; i < current_function->arguments.size(); i++) {
-						if (n == current_function->arguments[i]) {
-							_set_error("Variable \"" + String(n) + "\" already defined in the scope (at line " + itos(current_function->line) + ").");
-							return;
-						}
-					}
-				}
-				BlockNode *check_block = p_block;
-				while (check_block) {
-					if (check_block->variables.has(n)) {
-						_set_error("Variable \"" + String(n) + "\" already defined in the scope (at line " + itos(check_block->variables[n]->line) + ").");
-						return;
-					}
-					check_block = check_block->parent_block;
-				}
+		for (List<StringName>::Element *E = binds.front(); E != nullptr; E = E->next()) {
+			SuiteNode::Local local(branch->patterns[0]->binds[E->get()]);
+			suite->add_local(local);
+		}
+	}
 
-				//must know when the local variable is declared
-				LocalVarNode *lv = alloc_node<LocalVarNode>();
-				lv->name = n;
-				lv->line = var_line;
-				p_block->statements.push_back(lv);
+	branch->block = parse_suite("match pattern block", suite);
 
-				Node *assigned = NULL;
+	// Restore continue state.
+	can_continue = could_continue;
+	is_continue_match = was_continue_match;
 
-				if (tokenizer->get_token() == GDScriptTokenizer::TK_COLON) {
-					if (tokenizer->get_token(1) == GDScriptTokenizer::TK_OP_ASSIGN) {
-						lv->datatype = DataType();
-#ifdef DEBUG_ENABLED
-						lv->datatype.infer_type = true;
-#endif
-						tokenizer->advance();
-					} else if (!_parse_type(lv->datatype)) {
-						_set_error("Expected a type for the variable.");
-						return;
-					}
-				}
+	return branch;
+}
 
-				if (tokenizer->get_token() == GDScriptTokenizer::TK_OP_ASSIGN) {
+GDScriptParser::PatternNode *GDScriptParser::parse_match_pattern(PatternNode *p_root_pattern) {
+	PatternNode *pattern = alloc_node<PatternNode>();
 
-					tokenizer->advance();
-					Node *subexpr = _parse_and_reduce_expression(p_block, p_static);
-					if (!subexpr) {
-						if (_recover_from_completion()) {
-							break;
-						}
-						return;
-					}
+	switch (current.type) {
+		case GDScriptTokenizer::Token::LITERAL:
+			advance();
+			pattern->pattern_type = PatternNode::PT_LITERAL;
+			pattern->literal = parse_literal();
+			if (pattern->literal == nullptr) {
+				// Error happened.
+				return nullptr;
+			}
+			break;
+		case GDScriptTokenizer::Token::VAR: {
+			// Bind.
+			advance();
+			if (!consume(GDScriptTokenizer::Token::IDENTIFIER, R"(Expected bind name after "var".)")) {
+				return nullptr;
+			}
+			pattern->pattern_type = PatternNode::PT_BIND;
+			pattern->bind = parse_identifier();
 
-					lv->assignments++;
-					assigned = subexpr;
-				} else {
+			PatternNode *root_pattern = p_root_pattern == nullptr ? pattern : p_root_pattern;
 
-					assigned = _get_default_value_for_type(lv->datatype, var_line);
-				}
-				//must be added later, to avoid self-referencing.
-				p_block->variables.insert(n, lv);
-
-				IdentifierNode *id = alloc_node<IdentifierNode>();
-				id->name = n;
-				id->declared_block = p_block;
-				id->line = var_line;
-
-				OperatorNode *op = alloc_node<OperatorNode>();
-				op->op = OperatorNode::OP_ASSIGN;
-				op->arguments.push_back(id);
-				op->arguments.push_back(assigned);
-				op->line = var_line;
-				p_block->statements.push_back(op);
-				lv->assign_op = op;
-				lv->assign = assigned;
-
-				if (!_end_statement()) {
-					_set_error("Expected end of statement (\"var\").");
-					return;
+			if (p_root_pattern != nullptr) {
+				if (p_root_pattern->has_bind(pattern->bind->name)) {
+					push_error(vformat(R"(Bind variable name "%s" was already used in this pattern.)", pattern->bind->name));
+					return nullptr;
 				}
+			}
 
-			} break;
-			case GDScriptTokenizer::TK_CF_IF: {
+			if (current_suite->has_local(pattern->bind->name)) {
+				push_error(vformat(R"(There's already a %s named "%s" in this scope.)", current_suite->get_local(pattern->bind->name).get_name(), pattern->bind->name));
+				return nullptr;
+			}
 
-				tokenizer->advance();
+			root_pattern->binds[pattern->bind->name] = pattern->bind;
 
-				Node *condition = _parse_and_reduce_expression(p_block, p_static);
-				if (!condition) {
-					if (_recover_from_completion()) {
-						break;
+		} break;
+		case GDScriptTokenizer::Token::UNDERSCORE:
+			// Wildcard.
+			advance();
+			pattern->pattern_type = PatternNode::PT_WILDCARD;
+			break;
+		case GDScriptTokenizer::Token::PERIOD_PERIOD:
+			// Rest.
+			advance();
+			pattern->pattern_type = PatternNode::PT_REST;
+			break;
+		case GDScriptTokenizer::Token::BRACKET_OPEN: {
+			// Array.
+			advance();
+			pattern->pattern_type = PatternNode::PT_ARRAY;
+
+			if (!check(GDScriptTokenizer::Token::BRACKET_CLOSE)) {
+				do {
+					PatternNode *sub_pattern = parse_match_pattern(p_root_pattern != nullptr ? p_root_pattern : pattern);
+					if (sub_pattern == nullptr) {
+						continue;
 					}
-					return;
-				}
-
-				ControlFlowNode *cf_if = alloc_node<ControlFlowNode>();
-
-				cf_if->cf_type = ControlFlowNode::CF_IF;
-				cf_if->arguments.push_back(condition);
-
-				cf_if->body = alloc_node<BlockNode>();
-				cf_if->body->parent_block = p_block;
-				cf_if->body->if_condition = condition; //helps code completion
-
-				p_block->sub_blocks.push_back(cf_if->body);
-
-				if (!_enter_indent_block(cf_if->body)) {
-					_set_error("Expected an indented block after \"if\".");
-					p_block->end_line = tokenizer->get_token_line();
-					return;
-				}
-
-				current_block = cf_if->body;
-				_parse_block(cf_if->body, p_static);
-				current_block = p_block;
-
-				if (error_set)
-					return;
-				p_block->statements.push_back(cf_if);
-
-				bool all_have_return = cf_if->body->has_return;
-				bool have_else = false;
-
-				while (true) {
-
-					while (tokenizer->get_token() == GDScriptTokenizer::TK_NEWLINE && _parse_newline())
-						;
-
-					if (indent_level.back()->get().indent < current_level.indent) { //not at current indent level
-						p_block->end_line = tokenizer->get_token_line();
-						return;
+					if (pattern->rest_used) {
+						push_error(R"(The ".." pattern must be the last element in the pattern array.)");
+					} else if (sub_pattern->pattern_type == PatternNode::PT_REST) {
+						pattern->rest_used = true;
 					}
-
-					if (tokenizer->get_token() == GDScriptTokenizer::TK_CF_ELIF) {
-
-						if (indent_level.back()->get().indent > current_level.indent) {
-
-							_set_error("Invalid indentation.");
-							return;
-						}
-
-						tokenizer->advance();
-
-						cf_if->body_else = alloc_node<BlockNode>();
-						cf_if->body_else->parent_block = p_block;
-						p_block->sub_blocks.push_back(cf_if->body_else);
-
-						ControlFlowNode *cf_else = alloc_node<ControlFlowNode>();
-						cf_else->cf_type = ControlFlowNode::CF_IF;
-
-						//condition
-						Node *condition2 = _parse_and_reduce_expression(p_block, p_static);
-						if (!condition2) {
-							if (_recover_from_completion()) {
-								break;
-							}
-							return;
-						}
-						cf_else->arguments.push_back(condition2);
-						cf_else->cf_type = ControlFlowNode::CF_IF;
-
-						cf_if->body_else->statements.push_back(cf_else);
-						cf_if = cf_else;
-						cf_if->body = alloc_node<BlockNode>();
-						cf_if->body->parent_block = p_block;
-						p_block->sub_blocks.push_back(cf_if->body);
-
-						if (!_enter_indent_block(cf_if->body)) {
-							_set_error("Expected an indented block after \"elif\".");
-							p_block->end_line = tokenizer->get_token_line();
-							return;
-						}
-
-						current_block = cf_else->body;
-						_parse_block(cf_else->body, p_static);
-						current_block = p_block;
-						if (error_set)
-							return;
-
-						all_have_return = all_have_return && cf_else->body->has_return;
-
-					} else if (tokenizer->get_token() == GDScriptTokenizer::TK_CF_ELSE) {
-
-						if (indent_level.back()->get().indent > current_level.indent) {
-							_set_error("Invalid indentation.");
-							return;
-						}
-
-						tokenizer->advance();
-						cf_if->body_else = alloc_node<BlockNode>();
-						cf_if->body_else->parent_block = p_block;
-						p_block->sub_blocks.push_back(cf_if->body_else);
-
-						if (!_enter_indent_block(cf_if->body_else)) {
-							_set_error("Expected an indented block after \"else\".");
-							p_block->end_line = tokenizer->get_token_line();
-							return;
+					pattern->array.push_back(sub_pattern);
+				} while (match(GDScriptTokenizer::Token::COMMA));
+			}
+			consume(GDScriptTokenizer::Token::BRACKET_CLOSE, R"(Expected "]" to close the array pattern.)");
+			break;
+		}
+		case GDScriptTokenizer::Token::BRACE_OPEN: {
+			// Dictionary.
+			advance();
+			pattern->pattern_type = PatternNode::PT_DICTIONARY;
+
+			if (!check(GDScriptTokenizer::Token::BRACE_CLOSE) && !is_at_end()) {
+				do {
+					if (match(GDScriptTokenizer::Token::PERIOD_PERIOD)) {
+						// Rest.
+						if (pattern->rest_used) {
+							push_error(R"(The ".." pattern must be the last element in the pattern dictionary.)");
+						} else {
+							PatternNode *sub_pattern = alloc_node<PatternNode>();
+							sub_pattern->pattern_type = PatternNode::PT_REST;
+							pattern->dictionary.push_back({ nullptr, sub_pattern });
+							pattern->rest_used = true;
 						}
-						current_block = cf_if->body_else;
-						_parse_block(cf_if->body_else, p_static);
-						current_block = p_block;
-						if (error_set)
-							return;
-
-						all_have_return = all_have_return && cf_if->body_else->has_return;
-						have_else = true;
-
-						break; //after else, exit
-
-					} else
-						break;
-				}
-
-				cf_if->body->has_return = all_have_return;
-				// If there's no else block, path out of the if might not have a return
-				p_block->has_return = all_have_return && have_else;
-
-			} break;
-			case GDScriptTokenizer::TK_CF_WHILE: {
-
-				tokenizer->advance();
-				Node *condition2 = _parse_and_reduce_expression(p_block, p_static);
-				if (!condition2) {
-					if (_recover_from_completion()) {
-						break;
-					}
-					return;
-				}
-
-				ControlFlowNode *cf_while = alloc_node<ControlFlowNode>();
-
-				cf_while->cf_type = ControlFlowNode::CF_WHILE;
-				cf_while->arguments.push_back(condition2);
-
-				cf_while->body = alloc_node<BlockNode>();
-				cf_while->body->parent_block = p_block;
-				p_block->sub_blocks.push_back(cf_while->body);
-
-				if (!_enter_indent_block(cf_while->body)) {
-					_set_error("Expected an indented block after \"while\".");
-					p_block->end_line = tokenizer->get_token_line();
-					return;
-				}
-
-				current_block = cf_while->body;
-				_parse_block(cf_while->body, p_static);
-				current_block = p_block;
-				if (error_set)
-					return;
-				p_block->has_return = cf_while->body->has_return;
-				p_block->statements.push_back(cf_while);
-			} break;
-			case GDScriptTokenizer::TK_CF_FOR: {
-
-				tokenizer->advance();
-
-				if (!tokenizer->is_token_literal(0, true)) {
-
-					_set_error("Identifier expected after \"for\".");
-				}
-
-				IdentifierNode *id = alloc_node<IdentifierNode>();
-				id->name = tokenizer->get_token_identifier();
-
-				tokenizer->advance();
-
-				if (tokenizer->get_token() != GDScriptTokenizer::TK_OP_IN) {
-					_set_error("\"in\" expected after identifier.");
-					return;
-				}
-
-				tokenizer->advance();
-
-				Node *container = _parse_and_reduce_expression(p_block, p_static);
-				if (!container) {
-					if (_recover_from_completion()) {
-						break;
-					}
-					return;
-				}
-
-				DataType iter_type;
-
-				if (container->type == Node::TYPE_OPERATOR) {
-
-					OperatorNode *op = static_cast<OperatorNode *>(container);
-					if (op->op == OperatorNode::OP_CALL && op->arguments[0]->type == Node::TYPE_BUILT_IN_FUNCTION && static_cast<BuiltInFunctionNode *>(op->arguments[0])->function == GDScriptFunctions::GEN_RANGE) {
-						//iterating a range, so see if range() can be optimized without allocating memory, by replacing it by vectors (which can work as iterable too!)
-
-						Vector<Node *> args;
-						Vector<double> constants;
-
-						bool constant = false;
-
-						for (int i = 1; i < op->arguments.size(); i++) {
-							args.push_back(op->arguments[i]);
-							if (constant && op->arguments[i]->type == Node::TYPE_CONSTANT) {
-								ConstantNode *c = static_cast<ConstantNode *>(op->arguments[i]);
-								if (c->value.get_type() == Variant::REAL || c->value.get_type() == Variant::INT) {
-									constants.push_back(c->value);
-									constant = true;
-								}
-							} else {
-								constant = false;
+					} else {
+						ExpressionNode *key = parse_expression(false);
+						if (key == nullptr) {
+							push_error(R"(Expected expression as key for dictionary pattern.)");
+						}
+						if (match(GDScriptTokenizer::Token::COLON)) {
+							// Value pattern.
+							PatternNode *sub_pattern = parse_match_pattern(p_root_pattern != nullptr ? p_root_pattern : pattern);
+							if (sub_pattern == nullptr) {
+								continue;
 							}
-						}
-
-						if (args.size() > 0 && args.size() < 4) {
-
-							if (constant) {
-
-								ConstantNode *cn = alloc_node<ConstantNode>();
-								switch (args.size()) {
-									case 1: cn->value = (int)constants[0]; break;
-									case 2: cn->value = Vector2(constants[0], constants[1]); break;
-									case 3: cn->value = Vector3(constants[0], constants[1], constants[2]); break;
-								}
-								cn->datatype = _type_from_variant(cn->value);
-								container = cn;
+							if (pattern->rest_used) {
+								push_error(R"(The ".." pattern must be the last element in the pattern dictionary.)");
+							} else if (sub_pattern->pattern_type == PatternNode::PT_REST) {
+								push_error(R"(The ".." pattern cannot be used as a value.)");
 							} else {
-								OperatorNode *on = alloc_node<OperatorNode>();
-								on->op = OperatorNode::OP_CALL;
-
-								TypeNode *tn = alloc_node<TypeNode>();
-								on->arguments.push_back(tn);
-
-								switch (args.size()) {
-									case 1: tn->vtype = Variant::INT; break;
-									case 2: tn->vtype = Variant::VECTOR2; break;
-									case 3: tn->vtype = Variant::VECTOR3; break;
-								}
-
-								for (int i = 0; i < args.size(); i++) {
-									on->arguments.push_back(args[i]);
-								}
-
-								container = on;
+								pattern->dictionary.push_back({ key, sub_pattern });
 							}
+						} else {
+							// Key match only.
+							pattern->dictionary.push_back({ key, nullptr });
 						}
-
-						iter_type.has_type = true;
-						iter_type.kind = DataType::BUILTIN;
-						iter_type.builtin_type = Variant::INT;
-					}
-				}
-
-				ControlFlowNode *cf_for = alloc_node<ControlFlowNode>();
-
-				cf_for->cf_type = ControlFlowNode::CF_FOR;
-				cf_for->arguments.push_back(id);
-				cf_for->arguments.push_back(container);
-
-				cf_for->body = alloc_node<BlockNode>();
-				cf_for->body->parent_block = p_block;
-				p_block->sub_blocks.push_back(cf_for->body);
-
-				if (!_enter_indent_block(cf_for->body)) {
-					_set_error("Expected indented block after \"for\".");
-					p_block->end_line = tokenizer->get_token_line();
-					return;
-				}
-
-				current_block = cf_for->body;
-
-				// this is for checking variable for redefining
-				// inside this _parse_block
-				LocalVarNode *lv = alloc_node<LocalVarNode>();
-				lv->name = id->name;
-				lv->line = id->line;
-				lv->assignments++;
-				id->declared_block = cf_for->body;
-				lv->set_datatype(iter_type);
-				id->set_datatype(iter_type);
-				cf_for->body->variables.insert(id->name, lv);
-				_parse_block(cf_for->body, p_static);
-				current_block = p_block;
-
-				if (error_set)
-					return;
-				p_block->has_return = cf_for->body->has_return;
-				p_block->statements.push_back(cf_for);
-			} break;
-			case GDScriptTokenizer::TK_CF_CONTINUE: {
-
-				_mark_line_as_safe(tokenizer->get_token_line());
-				tokenizer->advance();
-				ControlFlowNode *cf_continue = alloc_node<ControlFlowNode>();
-				cf_continue->cf_type = ControlFlowNode::CF_CONTINUE;
-				p_block->statements.push_back(cf_continue);
-				if (!_end_statement()) {
-					_set_error("Expected end of statement (\"continue\").");
-					return;
-				}
-			} break;
-			case GDScriptTokenizer::TK_CF_BREAK: {
-
-				_mark_line_as_safe(tokenizer->get_token_line());
-				tokenizer->advance();
-				ControlFlowNode *cf_break = alloc_node<ControlFlowNode>();
-				cf_break->cf_type = ControlFlowNode::CF_BREAK;
-				p_block->statements.push_back(cf_break);
-				if (!_end_statement()) {
-					_set_error("Expected end of statement (\"break\").");
-					return;
-				}
-			} break;
-			case GDScriptTokenizer::TK_CF_RETURN: {
-
-				tokenizer->advance();
-				ControlFlowNode *cf_return = alloc_node<ControlFlowNode>();
-				cf_return->cf_type = ControlFlowNode::CF_RETURN;
-				cf_return->line = tokenizer->get_token_line(-1);
-
-				if (tokenizer->get_token() == GDScriptTokenizer::TK_SEMICOLON || tokenizer->get_token() == GDScriptTokenizer::TK_NEWLINE || tokenizer->get_token() == GDScriptTokenizer::TK_EOF) {
-					//expect end of statement
-					p_block->statements.push_back(cf_return);
-					if (!_end_statement()) {
-						return;
-					}
-				} else {
-					//expect expression
-					Node *retexpr = _parse_and_reduce_expression(p_block, p_static);
-					if (!retexpr) {
-						if (_recover_from_completion()) {
-							break;
-						}
-						return;
-					}
-					cf_return->arguments.push_back(retexpr);
-					p_block->statements.push_back(cf_return);
-					if (!_end_statement()) {
-						_set_error("Expected end of statement after return expression.");
-						return;
 					}
-				}
-				p_block->has_return = true;
-
-			} break;
-			case GDScriptTokenizer::TK_CF_MATCH: {
-
-				tokenizer->advance();
-
-				MatchNode *match_node = alloc_node<MatchNode>();
-
-				Node *val_to_match = _parse_and_reduce_expression(p_block, p_static);
-
-				if (!val_to_match) {
-					if (_recover_from_completion()) {
-						break;
-					}
-					return;
-				}
-
-				match_node->val_to_match = val_to_match;
-
-				if (!_enter_indent_block()) {
-					_set_error("Expected indented pattern matching block after \"match\".");
-					return;
-				}
-
-				BlockNode *compiled_branches = alloc_node<BlockNode>();
-				compiled_branches->parent_block = p_block;
-				compiled_branches->parent_class = p_block->parent_class;
-
-				p_block->sub_blocks.push_back(compiled_branches);
-
-				_parse_pattern_block(compiled_branches, match_node->branches, p_static);
-
-				if (error_set) return;
-
-				ControlFlowNode *match_cf_node = alloc_node<ControlFlowNode>();
-				match_cf_node->cf_type = ControlFlowNode::CF_MATCH;
-				match_cf_node->match = match_node;
-				match_cf_node->body = compiled_branches;
-
-				p_block->has_return = p_block->has_return || compiled_branches->has_return;
-				p_block->statements.push_back(match_cf_node);
-
-				_end_statement();
-			} break;
-			case GDScriptTokenizer::TK_PR_ASSERT: {
-
-				tokenizer->advance();
-
-				if (tokenizer->get_token() != GDScriptTokenizer::TK_PARENTHESIS_OPEN) {
-					_set_error("Expected '(' after assert");
-					return;
-				}
-
-				tokenizer->advance();
-
-				Vector<Node *> args;
-				const bool result = _parse_arguments(p_block, args, p_static);
-				if (!result) {
-					return;
-				}
-
-				if (args.empty() || args.size() > 2) {
-					_set_error("Wrong number of arguments, expected 1 or 2");
-					return;
-				}
-
-				AssertNode *an = alloc_node<AssertNode>();
-				an->condition = _reduce_expression(args[0], p_static);
-
-				if (args.size() == 2) {
-					an->message = _reduce_expression(args[1], p_static);
-				} else {
-					ConstantNode *message_node = alloc_node<ConstantNode>();
-					message_node->value = String();
-					an->message = message_node;
-				}
-
-				p_block->statements.push_back(an);
-
-				if (!_end_statement()) {
-					_set_error("Expected end of statement after \"assert\".");
-					return;
-				}
-			} break;
-			case GDScriptTokenizer::TK_PR_BREAKPOINT: {
-
-				tokenizer->advance();
-				BreakpointNode *bn = alloc_node<BreakpointNode>();
-				p_block->statements.push_back(bn);
-
-				if (!_end_statement()) {
-					_set_error("Expected end of statement after \"breakpoint\".");
-					return;
-				}
-			} break;
-			default: {
-
-				Node *expression = _parse_and_reduce_expression(p_block, p_static, false, true);
-				if (!expression) {
-					if (_recover_from_completion()) {
-						break;
-					}
-					return;
-				}
-				p_block->statements.push_back(expression);
-				if (!_end_statement()) {
-					// Attempt to guess a better error message if the user "retypes" a variable
-					if (tokenizer->get_token() == GDScriptTokenizer::TK_COLON && tokenizer->get_token(1) == GDScriptTokenizer::TK_OP_ASSIGN) {
-						_set_error("Unexpected ':=', use '=' instead. Expected end of statement after expression.");
-					} else {
-						_set_error(String() + "Expected end of statement after expression, got " + tokenizer->get_token_name(tokenizer->get_token()) + " instead");
-					}
-					return;
-				}
-
-			} break;
-		}
-	}
-}
-
-bool GDScriptParser::_parse_newline() {
-
-	if (tokenizer->get_token(1) != GDScriptTokenizer::TK_EOF && tokenizer->get_token(1) != GDScriptTokenizer::TK_NEWLINE) {
-
-		IndentLevel current_level = indent_level.back()->get();
-		int indent = tokenizer->get_token_line_indent();
-		int tabs = tokenizer->get_token_line_tab_indent();
-		IndentLevel new_level(indent, tabs);
-
-		if (new_level.is_mixed(current_level)) {
-			_set_error("Mixed tabs and spaces in indentation.");
-			return false;
-		}
-
-		if (indent > current_level.indent) {
-			_set_error("Unexpected indentation.");
-			return false;
+				} while (match(GDScriptTokenizer::Token::COMMA));
+			}
+			consume(GDScriptTokenizer::Token::BRACE_CLOSE, R"(Expected "}" to close the dictionary pattern.)");
+			break;
 		}
-
-		if (indent < current_level.indent) {
-
-			while (indent < current_level.indent) {
-
-				//exit block
-				if (indent_level.size() == 1) {
-					_set_error("Invalid indentation. Bug?");
-					return false;
-				}
-
-				indent_level.pop_back();
-
-				if (indent_level.back()->get().indent < indent) {
-
-					_set_error("Unindent does not match any outer indentation level.");
-					return false;
-				}
-
-				if (indent_level.back()->get().is_mixed(current_level)) {
-					_set_error("Mixed tabs and spaces in indentation.");
-					return false;
-				}
-
-				current_level = indent_level.back()->get();
+		default: {
+			// Expression.
+			ExpressionNode *expression = parse_expression(false);
+			if (expression == nullptr) {
+				push_error(R"(Expected expression for match pattern.)");
+			} else {
+				pattern->pattern_type = PatternNode::PT_EXPRESSION;
+				pattern->expression = expression;
 			}
-
-			tokenizer->advance();
-			return false;
+			break;
 		}
 	}
 
-	tokenizer->advance();
-	return true;
+	return pattern;
 }
 
-void GDScriptParser::_parse_extends(ClassNode *p_class) {
-
-	if (p_class->extends_used) {
+bool GDScriptParser::PatternNode::has_bind(const StringName &p_name) {
+	return binds.has(p_name);
+}
 
-		_set_error("\"extends\" can only be present once per script.");
-		return;
-	}
+GDScriptParser::IdentifierNode *GDScriptParser::PatternNode::get_bind(const StringName &p_name) {
+	return binds[p_name];
+}
 
-	if (!p_class->constant_expressions.empty() || !p_class->subclasses.empty() || !p_class->functions.empty() || !p_class->variables.empty()) {
+GDScriptParser::WhileNode *GDScriptParser::parse_while() {
+	WhileNode *n_while = alloc_node<WhileNode>();
 
-		_set_error("\"extends\" must be used before anything else.");
-		return;
+	n_while->condition = parse_expression(false);
+	if (n_while->condition == nullptr) {
+		push_error(R"(Expected conditional expression after "while".)");
 	}
 
-	p_class->extends_used = true;
-
-	tokenizer->advance();
-
-	if (tokenizer->get_token() == GDScriptTokenizer::TK_BUILT_IN_TYPE && tokenizer->get_token_type() == Variant::OBJECT) {
-		p_class->extends_class.push_back(Variant::get_type_name(Variant::OBJECT));
-		tokenizer->advance();
-		return;
-	}
+	consume(GDScriptTokenizer::Token::COLON, R"(Expected ":" after "while" condition.)");
 
-	// see if inheritance happens from a file
-	if (tokenizer->get_token() == GDScriptTokenizer::TK_CONSTANT) {
+	// Save break/continue state.
+	bool could_break = can_break;
+	bool could_continue = can_continue;
+	bool was_continue_match = is_continue_match;
 
-		Variant constant = tokenizer->get_token_constant();
-		if (constant.get_type() != Variant::STRING) {
+	// Allow break/continue.
+	can_break = true;
+	can_continue = true;
+	is_continue_match = false;
 
-			_set_error("\"extends\" constant must be a string.");
-			return;
-		}
+	n_while->loop = parse_suite(R"("while" block)");
 
-		p_class->extends_file = constant;
-		tokenizer->advance();
+	// Reset break/continue state.
+	can_break = could_break;
+	can_continue = could_continue;
+	is_continue_match = was_continue_match;
 
-		// Add parent script as a dependency
-		String parent = constant;
-		if (parent.is_rel_path()) {
-			parent = base_path.plus_file(parent).simplify_path();
-		}
-		dependencies.push_back(parent);
+	return n_while;
+}
 
-		if (tokenizer->get_token() != GDScriptTokenizer::TK_PERIOD) {
-			return;
-		} else
-			tokenizer->advance();
+GDScriptParser::ExpressionNode *GDScriptParser::parse_precedence(Precedence p_precedence, bool p_can_assign, bool p_stop_on_assign) {
+	// Switch multiline mode on for grouping tokens.
+	// Do this early to avoid the tokenizer generating whitespace tokens.
+	switch (current.type) {
+		case GDScriptTokenizer::Token::PARENTHESIS_OPEN:
+		case GDScriptTokenizer::Token::BRACE_OPEN:
+		case GDScriptTokenizer::Token::BRACKET_OPEN:
+			push_multiline(true);
+			break;
+		default:
+			break; // Nothing to do.
 	}
 
-	while (true) {
-
-		switch (tokenizer->get_token()) {
+	// Completion can appear whenever an expression is expected.
+	make_completion_context(COMPLETION_IDENTIFIER, nullptr);
 
-			case GDScriptTokenizer::TK_IDENTIFIER: {
+	GDScriptTokenizer::Token token = advance();
+	ParseFunction prefix_rule = get_rule(token.type)->prefix;
 
-				StringName identifier = tokenizer->get_token_identifier();
-				p_class->extends_class.push_back(identifier);
-			} break;
-
-			case GDScriptTokenizer::TK_PERIOD:
-				break;
+	if (prefix_rule == nullptr) {
+		// Expected expression. Let the caller give the proper error message.
+		return nullptr;
+	}
 
-			default: {
+	ExpressionNode *previous_operand = (this->*prefix_rule)(nullptr, p_can_assign);
 
-				_set_error("Invalid \"extends\" syntax, expected string constant (path) and/or identifier (parent class).");
-				return;
-			}
+	while (p_precedence <= get_rule(current.type)->precedence) {
+		if (p_stop_on_assign && current.type == GDScriptTokenizer::Token::EQUAL) {
+			return previous_operand;
 		}
-
-		tokenizer->advance(1);
-
-		switch (tokenizer->get_token()) {
-
-			case GDScriptTokenizer::TK_IDENTIFIER:
-			case GDScriptTokenizer::TK_PERIOD:
-				continue;
-
+		// Also switch multiline mode on here for infix operators.
+		switch (current.type) {
+			// case GDScriptTokenizer::Token::BRACE_OPEN: // Not an infix operator.
+			case GDScriptTokenizer::Token::PARENTHESIS_OPEN:
+			case GDScriptTokenizer::Token::BRACKET_OPEN:
+				push_multiline(true);
+				break;
 			default:
-				return;
+				break; // Nothing to do.
 		}
+		token = advance();
+		ParseFunction infix_rule = get_rule(token.type)->infix;
+		previous_operand = (this->*infix_rule)(previous_operand, p_can_assign);
 	}
-}
 
-void GDScriptParser::_parse_class(ClassNode *p_class) {
+	return previous_operand;
+}
 
-	IndentLevel current_level = indent_level.back()->get();
+GDScriptParser::ExpressionNode *GDScriptParser::parse_expression(bool p_can_assign, bool p_stop_on_assign) {
+	return parse_precedence(PREC_ASSIGNMENT, p_can_assign, p_stop_on_assign);
+}
 
-	while (true) {
+GDScriptParser::IdentifierNode *GDScriptParser::parse_identifier() {
+	return static_cast<IdentifierNode *>(parse_identifier(nullptr, false));
+}
 
-		GDScriptTokenizer::Token token = tokenizer->get_token();
-		if (error_set)
-			return;
+GDScriptParser::ExpressionNode *GDScriptParser::parse_identifier(ExpressionNode *p_previous_operand, bool p_can_assign) {
+	if (!previous.is_identifier()) {
+		ERR_FAIL_V_MSG(nullptr, "Parser bug: parsing literal node without literal token.");
+	}
+	IdentifierNode *identifier = alloc_node<IdentifierNode>();
+	identifier->name = previous.get_identifier();
 
-		if (current_level.indent > indent_level.back()->get().indent) {
-			p_class->end_line = tokenizer->get_token_line();
-			return; //go back a level
+	if (current_suite != nullptr && current_suite->has_local(identifier->name)) {
+		const SuiteNode::Local &declaration = current_suite->get_local(identifier->name);
+		switch (declaration.type) {
+			case SuiteNode::Local::CONSTANT:
+				identifier->source = IdentifierNode::LOCAL_CONSTANT;
+				identifier->constant_source = declaration.constant;
+				declaration.constant->usages++;
+				break;
+			case SuiteNode::Local::VARIABLE:
+				identifier->source = IdentifierNode::LOCAL_VARIABLE;
+				identifier->variable_source = declaration.variable;
+				declaration.variable->usages++;
+				break;
+			case SuiteNode::Local::PARAMETER:
+				identifier->source = IdentifierNode::FUNCTION_PARAMETER;
+				identifier->parameter_source = declaration.parameter;
+				declaration.parameter->usages++;
+				break;
+			case SuiteNode::Local::FOR_VARIABLE:
+				identifier->source = IdentifierNode::LOCAL_ITERATOR;
+				identifier->bind_source = declaration.bind;
+				declaration.bind->usages++;
+				break;
+			case SuiteNode::Local::PATTERN_BIND:
+				identifier->source = IdentifierNode::LOCAL_BIND;
+				identifier->bind_source = declaration.bind;
+				declaration.bind->usages++;
+				break;
+			case SuiteNode::Local::UNDEFINED:
+				ERR_FAIL_V_MSG(nullptr, "Undefined local found.");
 		}
+	}
 
-		switch (token) {
-
-			case GDScriptTokenizer::TK_CURSOR: {
-				tokenizer->advance();
-			} break;
-			case GDScriptTokenizer::TK_EOF:
-				p_class->end_line = tokenizer->get_token_line();
-			case GDScriptTokenizer::TK_ERROR: {
-				return; //go back
-				//end of file!
-			} break;
-			case GDScriptTokenizer::TK_NEWLINE: {
-				if (!_parse_newline()) {
-					if (!error_set) {
-						p_class->end_line = tokenizer->get_token_line();
-					}
-					return;
-				}
-			} break;
-			case GDScriptTokenizer::TK_PR_EXTENDS: {
-
-				_mark_line_as_safe(tokenizer->get_token_line());
-				_parse_extends(p_class);
-				if (error_set)
-					return;
-				if (!_end_statement()) {
-					_set_error("Expected end of statement after \"extends\".");
-					return;
-				}
-
-			} break;
-			case GDScriptTokenizer::TK_PR_CLASS_NAME: {
-
-				_mark_line_as_safe(tokenizer->get_token_line());
-				if (p_class->owner) {
-					_set_error("\"class_name\" is only valid for the main class namespace.");
-					return;
-				}
-				if (self_path.begins_with("res://") && self_path.find("::") != -1) {
-					_set_error("\"class_name\" isn't allowed in built-in scripts.");
-					return;
-				}
-				if (tokenizer->get_token(1) != GDScriptTokenizer::TK_IDENTIFIER) {
-
-					_set_error("\"class_name\" syntax: \"class_name <UniqueName>\"");
-					return;
-				}
-				if (p_class->classname_used) {
-					_set_error("\"class_name\" can only be present once per script.");
-					return;
-				}
-
-				p_class->classname_used = true;
-
-				p_class->name = tokenizer->get_token_identifier(1);
-
-				if (self_path != String() && ScriptServer::is_global_class(p_class->name) && ScriptServer::get_global_class_path(p_class->name) != self_path) {
-					_set_error("Unique global class \"" + p_class->name + "\" already exists at path: " + ScriptServer::get_global_class_path(p_class->name));
-					return;
-				}
-
-				if (ClassDB::class_exists(p_class->name)) {
-					_set_error("The class \"" + p_class->name + "\" shadows a native class.");
-					return;
-				}
-
-				if (p_class->classname_used && ProjectSettings::get_singleton()->has_setting("autoload/" + p_class->name)) {
-					const String autoload_path = ProjectSettings::get_singleton()->get_setting("autoload/" + p_class->name);
-					if (autoload_path.begins_with("*")) {
-						// It's a singleton, and not just a regular AutoLoad script.
-						_set_error("The class \"" + p_class->name + "\" conflicts with the AutoLoad singleton of the same name, and is therefore redundant. Remove the class_name declaration to fix this error.");
-					}
-					return;
-				}
-
-				tokenizer->advance(2);
-
-				if (tokenizer->get_token() == GDScriptTokenizer::TK_COMMA) {
-					tokenizer->advance();
-
-					if ((tokenizer->get_token() == GDScriptTokenizer::TK_CONSTANT && tokenizer->get_token_constant().get_type() == Variant::STRING)) {
-#ifdef TOOLS_ENABLED
-						if (Engine::get_singleton()->is_editor_hint()) {
-							Variant constant = tokenizer->get_token_constant();
-							String icon_path = constant.operator String();
-
-							String abs_icon_path = icon_path.is_rel_path() ? self_path.get_base_dir().plus_file(icon_path).simplify_path() : icon_path;
-							if (!FileAccess::exists(abs_icon_path)) {
-								_set_error("No class icon found at: " + abs_icon_path);
-								return;
-							}
-
-							p_class->icon_path = icon_path;
-						}
-#endif
-
-						tokenizer->advance();
-					} else {
-						_set_error("The optional parameter after \"class_name\" must be a string constant file path to an icon.");
-						return;
-					}
-
-				} else if (tokenizer->get_token() == GDScriptTokenizer::TK_CONSTANT) {
-					_set_error("The class icon must be separated by a comma.");
-					return;
-				}
-
-			} break;
-			case GDScriptTokenizer::TK_PR_TOOL: {
-
-				if (p_class->tool) {
-
-					_set_error("The \"tool\" keyword can only be present once per script.");
-					return;
-				}
-
-				p_class->tool = true;
-				tokenizer->advance();
-
-			} break;
-			case GDScriptTokenizer::TK_PR_CLASS: {
-				//class inside class :D
-
-				StringName name;
-
-				if (tokenizer->get_token(1) != GDScriptTokenizer::TK_IDENTIFIER) {
-
-					_set_error("\"class\" syntax: \"class <Name>:\" or \"class <Name> extends <BaseClass>:\"");
-					return;
-				}
-				name = tokenizer->get_token_identifier(1);
-				tokenizer->advance(2);
-
-				// Check if name is shadowing something else
-				if (ClassDB::class_exists(name) || ClassDB::class_exists("_" + name.operator String())) {
-					_set_error("The class \"" + String(name) + "\" shadows a native class.");
-					return;
-				}
-				if (ScriptServer::is_global_class(name)) {
-					_set_error("Can't override name of the unique global class \"" + name + "\". It already exists at: " + ScriptServer::get_global_class_path(p_class->name));
-					return;
-				}
-				ClassNode *outer_class = p_class;
-				while (outer_class) {
-					for (int i = 0; i < outer_class->subclasses.size(); i++) {
-						if (outer_class->subclasses[i]->name == name) {
-							_set_error("Another class named \"" + String(name) + "\" already exists in this scope (at line " + itos(outer_class->subclasses[i]->line) + ").");
-							return;
-						}
-					}
-					if (outer_class->constant_expressions.has(name)) {
-						_set_error("A constant named \"" + String(name) + "\" already exists in the outer class scope (at line" + itos(outer_class->constant_expressions[name].expression->line) + ").");
-						return;
-					}
-
-					outer_class = outer_class->owner;
-				}
-
-				ClassNode *newclass = alloc_node<ClassNode>();
-				newclass->initializer = alloc_node<BlockNode>();
-				newclass->initializer->parent_class = newclass;
-				newclass->ready = alloc_node<BlockNode>();
-				newclass->ready->parent_class = newclass;
-				newclass->name = name;
-				newclass->owner = p_class;
-
-				p_class->subclasses.push_back(newclass);
-
-				if (tokenizer->get_token() == GDScriptTokenizer::TK_PR_EXTENDS) {
-
-					_parse_extends(newclass);
-					if (error_set)
-						return;
-				}
-
-				if (!_enter_indent_block()) {
-
-					_set_error("Indented block expected.");
-					return;
-				}
-				current_class = newclass;
-				_parse_class(newclass);
-				current_class = p_class;
-
-			} break;
-			/* this is for functions....
-			case GDScriptTokenizer::TK_CF_PASS: {
-
-				tokenizer->advance(1);
-			} break;
-			*/
-			case GDScriptTokenizer::TK_PR_STATIC: {
-				tokenizer->advance();
-				if (tokenizer->get_token() != GDScriptTokenizer::TK_PR_FUNCTION) {
-
-					_set_error("Expected \"func\".");
-					return;
-				}
-
-				FALLTHROUGH;
-			}
-			case GDScriptTokenizer::TK_PR_FUNCTION: {
-
-				bool _static = false;
-				pending_newline = -1;
-
-				if (tokenizer->get_token(-1) == GDScriptTokenizer::TK_PR_STATIC) {
-
-					_static = true;
-				}
-
-				tokenizer->advance();
-				StringName name;
-
-				if (_get_completable_identifier(COMPLETION_VIRTUAL_FUNC, name)) {
-				}
-
-				if (name == StringName()) {
-
-					_set_error("Expected an identifier after \"func\" (syntax: \"func <identifier>([arguments]):\").");
-					return;
-				}
-
-				for (int i = 0; i < p_class->functions.size(); i++) {
-					if (p_class->functions[i]->name == name) {
-						_set_error("The function \"" + String(name) + "\" already exists in this class (at line " + itos(p_class->functions[i]->line) + ").");
-					}
-				}
-				for (int i = 0; i < p_class->static_functions.size(); i++) {
-					if (p_class->static_functions[i]->name == name) {
-						_set_error("The function \"" + String(name) + "\" already exists in this class (at line " + itos(p_class->static_functions[i]->line) + ").");
-					}
-				}
-
-#ifdef DEBUG_ENABLED
-				if (p_class->constant_expressions.has(name)) {
-					_add_warning(GDScriptWarning::FUNCTION_CONFLICTS_CONSTANT, -1, name);
-				}
-				for (int i = 0; i < p_class->variables.size(); i++) {
-					if (p_class->variables[i].identifier == name) {
-						_add_warning(GDScriptWarning::FUNCTION_CONFLICTS_VARIABLE, -1, name);
-					}
-				}
-				for (int i = 0; i < p_class->subclasses.size(); i++) {
-					if (p_class->subclasses[i]->name == name) {
-						_add_warning(GDScriptWarning::FUNCTION_CONFLICTS_CONSTANT, -1, name);
-					}
-				}
-#endif // DEBUG_ENABLED
-
-				if (tokenizer->get_token() != GDScriptTokenizer::TK_PARENTHESIS_OPEN) {
-
-					_set_error("Expected \"(\" after the identifier (syntax: \"func <identifier>([arguments]):\" ).");
-					return;
-				}
-
-				tokenizer->advance();
-
-				Vector<StringName> arguments;
-				Vector<DataType> argument_types;
-				Vector<Node *> default_values;
-#ifdef DEBUG_ENABLED
-				Vector<int> arguments_usage;
-#endif // DEBUG_ENABLED
-
-				int fnline = tokenizer->get_token_line();
-
-				if (tokenizer->get_token() != GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
-					//has arguments
-					bool defaulting = false;
-					while (true) {
-
-						if (tokenizer->get_token() == GDScriptTokenizer::TK_NEWLINE) {
-							tokenizer->advance();
-							continue;
-						}
-
-						if (tokenizer->get_token() == GDScriptTokenizer::TK_PR_VAR) {
-
-							tokenizer->advance(); //var before the identifier is allowed
-						}
-
-						if (!tokenizer->is_token_literal(0, true)) {
-
-							_set_error("Expected an identifier for an argument.");
-							return;
-						}
-
-						StringName argname = tokenizer->get_token_identifier();
-						arguments.push_back(argname);
-#ifdef DEBUG_ENABLED
-						arguments_usage.push_back(0);
-#endif // DEBUG_ENABLED
-
-						tokenizer->advance();
-
-						DataType argtype;
-						if (tokenizer->get_token() == GDScriptTokenizer::TK_COLON) {
-							if (tokenizer->get_token(1) == GDScriptTokenizer::TK_OP_ASSIGN) {
-								argtype.infer_type = true;
-								tokenizer->advance();
-							} else if (!_parse_type(argtype)) {
-								_set_error("Expected a type for an argument.");
-								return;
-							}
-						}
-						argument_types.push_back(argtype);
-
-						if (defaulting && tokenizer->get_token() != GDScriptTokenizer::TK_OP_ASSIGN) {
-
-							_set_error("Default parameter expected.");
-							return;
-						}
-
-						//tokenizer->advance();
-
-						if (tokenizer->get_token() == GDScriptTokenizer::TK_OP_ASSIGN) {
-							defaulting = true;
-							tokenizer->advance(1);
-							Node *defval = _parse_and_reduce_expression(p_class, _static);
-							if (!defval || error_set)
-								return;
-
-							OperatorNode *on = alloc_node<OperatorNode>();
-							on->op = OperatorNode::OP_ASSIGN;
-							on->line = fnline;
-
-							IdentifierNode *in = alloc_node<IdentifierNode>();
-							in->name = argname;
-							in->line = fnline;
-
-							on->arguments.push_back(in);
-							on->arguments.push_back(defval);
-							/* no ..
-							if (defval->type!=Node::TYPE_CONSTANT) {
-
-								_set_error("default argument must be constant");
-							}
-							*/
-							default_values.push_back(on);
-						}
-
-						while (tokenizer->get_token() == GDScriptTokenizer::TK_NEWLINE) {
-							tokenizer->advance();
-						}
-
-						if (tokenizer->get_token() == GDScriptTokenizer::TK_COMMA) {
-							tokenizer->advance();
-							continue;
-						} else if (tokenizer->get_token() != GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
-
-							_set_error("Expected \",\" or \")\".");
-							return;
-						}
-
-						break;
-					}
-				}
-
-				tokenizer->advance();
-
-				BlockNode *block = alloc_node<BlockNode>();
-				block->parent_class = p_class;
-
-				FunctionNode *function = alloc_node<FunctionNode>();
-				function->name = name;
-				function->arguments = arguments;
-				function->argument_types = argument_types;
-				function->default_values = default_values;
-				function->_static = _static;
-				function->line = fnline;
-#ifdef DEBUG_ENABLED
-				function->arguments_usage = arguments_usage;
-#endif // DEBUG_ENABLED
-				function->rpc_mode = rpc_mode;
-				rpc_mode = MultiplayerAPI::RPC_MODE_DISABLED;
-
-				if (name == "_init") {
-
-					if (_static) {
-						_set_error("The constructor cannot be static.");
-						return;
-					}
-
-					if (p_class->extends_used) {
-
-						OperatorNode *cparent = alloc_node<OperatorNode>();
-						cparent->op = OperatorNode::OP_PARENT_CALL;
-						block->statements.push_back(cparent);
-
-						IdentifierNode *id = alloc_node<IdentifierNode>();
-						id->name = "_init";
-						cparent->arguments.push_back(id);
-
-						if (tokenizer->get_token() == GDScriptTokenizer::TK_PERIOD) {
-							tokenizer->advance();
-							if (tokenizer->get_token() != GDScriptTokenizer::TK_PARENTHESIS_OPEN) {
-								_set_error("Expected \"(\" for parent constructor arguments.");
-								return;
-							}
-							tokenizer->advance();
-
-							if (tokenizer->get_token() != GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
-								//has arguments
-								parenthesis++;
-								while (true) {
-
-									current_function = function;
-									Node *arg = _parse_and_reduce_expression(p_class, _static);
-									current_function = NULL;
-									cparent->arguments.push_back(arg);
-
-									if (tokenizer->get_token() == GDScriptTokenizer::TK_COMMA) {
-										tokenizer->advance();
-										continue;
-									} else if (tokenizer->get_token() != GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
-
-										_set_error("Expected \",\" or \")\".");
-										return;
-									}
-
-									break;
-								}
-								parenthesis--;
-							}
-
-							tokenizer->advance();
-						}
-					} else {
-
-						if (tokenizer->get_token() == GDScriptTokenizer::TK_PERIOD) {
-
-							_set_error("Parent constructor call found for a class without inheritance.");
-							return;
-						}
-					}
-				}
-
-				DataType return_type;
-				if (tokenizer->get_token() == GDScriptTokenizer::TK_FORWARD_ARROW) {
-
-					if (!_parse_type(return_type, true)) {
-						_set_error("Expected a return type for the function.");
-						return;
-					}
-				}
-
-				if (!_enter_indent_block(block)) {
-
-					_set_error("Indented block expected.");
-					return;
-				}
-
-				function->return_type = return_type;
-
-				if (_static)
-					p_class->static_functions.push_back(function);
-				else
-					p_class->functions.push_back(function);
-
-				current_function = function;
-				function->body = block;
-				current_block = block;
-				_parse_block(block, _static);
-				current_block = NULL;
-
-				//arguments
-			} break;
-			case GDScriptTokenizer::TK_PR_SIGNAL: {
-				tokenizer->advance();
-
-				if (!tokenizer->is_token_literal()) {
-					_set_error("Expected an identifier after \"signal\".");
-					return;
-				}
-
-				ClassNode::Signal sig;
-				sig.name = tokenizer->get_token_identifier();
-				sig.emissions = 0;
-				sig.line = tokenizer->get_token_line();
-				tokenizer->advance();
-
-				if (tokenizer->get_token() == GDScriptTokenizer::TK_PARENTHESIS_OPEN) {
-					tokenizer->advance();
-					while (true) {
-						if (tokenizer->get_token() == GDScriptTokenizer::TK_NEWLINE) {
-							tokenizer->advance();
-							continue;
-						}
-
-						if (tokenizer->get_token() == GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
-							tokenizer->advance();
-							break;
-						}
-
-						if (!tokenizer->is_token_literal(0, true)) {
-							_set_error("Expected an identifier in a \"signal\" argument.");
-							return;
-						}
-
-						sig.arguments.push_back(tokenizer->get_token_identifier());
-						tokenizer->advance();
-
-						while (tokenizer->get_token() == GDScriptTokenizer::TK_NEWLINE) {
-							tokenizer->advance();
-						}
-
-						if (tokenizer->get_token() == GDScriptTokenizer::TK_COMMA) {
-							tokenizer->advance();
-						} else if (tokenizer->get_token() != GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
-							_set_error("Expected \",\" or \")\" after a \"signal\" parameter identifier.");
-							return;
-						}
-					}
-				}
-
-				p_class->_signals.push_back(sig);
-
-				if (!_end_statement()) {
-					_set_error("Expected end of statement (\"signal\").");
-					return;
-				}
-			} break;
-			case GDScriptTokenizer::TK_PR_EXPORT: {
-
-				tokenizer->advance();
-
-				if (tokenizer->get_token() == GDScriptTokenizer::TK_PARENTHESIS_OPEN) {
-
-#define _ADVANCE_AND_CONSUME_NEWLINES \
-	do {                              \
-		tokenizer->advance();         \
-	} while (tokenizer->get_token() == GDScriptTokenizer::TK_NEWLINE)
-
-					_ADVANCE_AND_CONSUME_NEWLINES;
-					parenthesis++;
-
-					String hint_prefix = "";
-					bool is_arrayed = false;
-
-					while (tokenizer->get_token() == GDScriptTokenizer::TK_BUILT_IN_TYPE &&
-							tokenizer->get_token_type() == Variant::ARRAY &&
-							tokenizer->get_token(1) == GDScriptTokenizer::TK_COMMA) {
-						tokenizer->advance(); // Array
-						tokenizer->advance(); // Comma
-						if (is_arrayed) {
-							hint_prefix += itos(Variant::ARRAY) + ":";
-						} else {
-							is_arrayed = true;
-						}
-					}
-
-					if (tokenizer->get_token() == GDScriptTokenizer::TK_BUILT_IN_TYPE) {
+	return identifier;
+}
 
-						Variant::Type type = tokenizer->get_token_type();
-						if (type == Variant::NIL) {
-							_set_error("Can't export null type.");
-							return;
-						}
-						if (type == Variant::OBJECT) {
-							_set_error("Can't export raw object type.");
-							return;
-						}
-						current_export.type = type;
-						current_export.usage |= PROPERTY_USAGE_SCRIPT_VARIABLE;
-						_ADVANCE_AND_CONSUME_NEWLINES;
-
-						if (tokenizer->get_token() == GDScriptTokenizer::TK_COMMA) {
-							// hint expected next!
-							_ADVANCE_AND_CONSUME_NEWLINES;
-
-							switch (type) {
-
-								case Variant::INT: {
-
-									if (tokenizer->get_token() == GDScriptTokenizer::TK_IDENTIFIER && tokenizer->get_token_identifier() == "FLAGS") {
-
-										_ADVANCE_AND_CONSUME_NEWLINES;
-
-										if (tokenizer->get_token() == GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
-											WARN_DEPRECATED_MSG("Exporting bit flags hint requires string constants.");
-											break;
-										}
-										if (tokenizer->get_token() != GDScriptTokenizer::TK_COMMA) {
-											_set_error("Expected \",\" in the bit flags hint.");
-											return;
-										}
-
-										current_export.hint = PROPERTY_HINT_FLAGS;
-										_ADVANCE_AND_CONSUME_NEWLINES;
-
-										bool first = true;
-										while (true) {
-
-											if (tokenizer->get_token() != GDScriptTokenizer::TK_CONSTANT || tokenizer->get_token_constant().get_type() != Variant::STRING) {
-												current_export = PropertyInfo();
-												_set_error("Expected a string constant in the named bit flags hint.");
-												return;
-											}
-
-											String c = tokenizer->get_token_constant();
-											if (!first)
-												current_export.hint_string += ",";
-											else
-												first = false;
-
-											current_export.hint_string += c.xml_escape();
-
-											_ADVANCE_AND_CONSUME_NEWLINES;
-											if (tokenizer->get_token() == GDScriptTokenizer::TK_PARENTHESIS_CLOSE)
-												break;
-
-											if (tokenizer->get_token() != GDScriptTokenizer::TK_COMMA) {
-												current_export = PropertyInfo();
-												_set_error("Expected \")\" or \",\" in the named bit flags hint.");
-												return;
-											}
-											_ADVANCE_AND_CONSUME_NEWLINES;
-										}
-
-										break;
-									}
-
-									if (tokenizer->get_token() == GDScriptTokenizer::TK_IDENTIFIER && tokenizer->get_token_identifier() == "LAYERS_2D_RENDER") {
-
-										_ADVANCE_AND_CONSUME_NEWLINES;
-										if (tokenizer->get_token() != GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
-											_set_error("Expected \")\" in the layers 2D render hint.");
-											return;
-										}
-										current_export.hint = PROPERTY_HINT_LAYERS_2D_RENDER;
-										break;
-									}
-
-									if (tokenizer->get_token() == GDScriptTokenizer::TK_IDENTIFIER && tokenizer->get_token_identifier() == "LAYERS_2D_PHYSICS") {
-
-										_ADVANCE_AND_CONSUME_NEWLINES;
-										if (tokenizer->get_token() != GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
-											_set_error("Expected \")\" in the layers 2D physics hint.");
-											return;
-										}
-										current_export.hint = PROPERTY_HINT_LAYERS_2D_PHYSICS;
-										break;
-									}
-
-									if (tokenizer->get_token() == GDScriptTokenizer::TK_IDENTIFIER && tokenizer->get_token_identifier() == "LAYERS_3D_RENDER") {
-
-										_ADVANCE_AND_CONSUME_NEWLINES;
-										if (tokenizer->get_token() != GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
-											_set_error("Expected \")\" in the layers 3D render hint.");
-											return;
-										}
-										current_export.hint = PROPERTY_HINT_LAYERS_3D_RENDER;
-										break;
-									}
-
-									if (tokenizer->get_token() == GDScriptTokenizer::TK_IDENTIFIER && tokenizer->get_token_identifier() == "LAYERS_3D_PHYSICS") {
-
-										_ADVANCE_AND_CONSUME_NEWLINES;
-										if (tokenizer->get_token() != GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
-											_set_error("Expected \")\" in the layers 3D physics hint.");
-											return;
-										}
-										current_export.hint = PROPERTY_HINT_LAYERS_3D_PHYSICS;
-										break;
-									}
-
-									if (tokenizer->get_token() == GDScriptTokenizer::TK_CONSTANT && tokenizer->get_token_constant().get_type() == Variant::STRING) {
-										//enumeration
-										current_export.hint = PROPERTY_HINT_ENUM;
-										bool first = true;
-										while (true) {
-
-											if (tokenizer->get_token() != GDScriptTokenizer::TK_CONSTANT || tokenizer->get_token_constant().get_type() != Variant::STRING) {
-
-												current_export = PropertyInfo();
-												_set_error("Expected a string constant in the enumeration hint.");
-												return;
-											}
-
-											String c = tokenizer->get_token_constant();
-											if (!first)
-												current_export.hint_string += ",";
-											else
-												first = false;
-
-											current_export.hint_string += c.xml_escape();
-
-											_ADVANCE_AND_CONSUME_NEWLINES;
-											if (tokenizer->get_token() == GDScriptTokenizer::TK_PARENTHESIS_CLOSE)
-												break;
-
-											if (tokenizer->get_token() != GDScriptTokenizer::TK_COMMA) {
-												current_export = PropertyInfo();
-												_set_error("Expected \")\" or \",\" in the enumeration hint.");
-												return;
-											}
-
-											_ADVANCE_AND_CONSUME_NEWLINES;
-										}
-
-										break;
-									}
-
-									FALLTHROUGH;
-								}
-								case Variant::REAL: {
-
-									if (tokenizer->get_token() == GDScriptTokenizer::TK_IDENTIFIER && tokenizer->get_token_identifier() == "EASE") {
-										current_export.hint = PROPERTY_HINT_EXP_EASING;
-										_ADVANCE_AND_CONSUME_NEWLINES;
-										if (tokenizer->get_token() != GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
-											_set_error("Expected \")\" in the hint.");
-											return;
-										}
-										break;
-									}
-
-									// range
-									if (tokenizer->get_token() == GDScriptTokenizer::TK_IDENTIFIER && tokenizer->get_token_identifier() == "EXP") {
-
-										current_export.hint = PROPERTY_HINT_EXP_RANGE;
-										_ADVANCE_AND_CONSUME_NEWLINES;
-
-										if (tokenizer->get_token() == GDScriptTokenizer::TK_PARENTHESIS_CLOSE)
-											break;
-										else if (tokenizer->get_token() != GDScriptTokenizer::TK_COMMA) {
-											_set_error("Expected \")\" or \",\" in the exponential range hint.");
-											return;
-										}
-										_ADVANCE_AND_CONSUME_NEWLINES;
-									} else
-										current_export.hint = PROPERTY_HINT_RANGE;
-
-									float sign = 1.0;
-
-									if (tokenizer->get_token() == GDScriptTokenizer::TK_OP_SUB) {
-										sign = -1;
-										_ADVANCE_AND_CONSUME_NEWLINES;
-									}
-									if (tokenizer->get_token() != GDScriptTokenizer::TK_CONSTANT || !tokenizer->get_token_constant().is_num()) {
-
-										current_export = PropertyInfo();
-										_set_error("Expected a range in the numeric hint.");
-										return;
-									}
-
-									current_export.hint_string = rtos(sign * double(tokenizer->get_token_constant()));
-									_ADVANCE_AND_CONSUME_NEWLINES;
-
-									if (tokenizer->get_token() == GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
-										current_export.hint_string = "0," + current_export.hint_string;
-										break;
-									}
-
-									if (tokenizer->get_token() != GDScriptTokenizer::TK_COMMA) {
-
-										current_export = PropertyInfo();
-										_set_error("Expected \",\" or \")\" in the numeric range hint.");
-										return;
-									}
-
-									_ADVANCE_AND_CONSUME_NEWLINES;
-
-									sign = 1.0;
-									if (tokenizer->get_token() == GDScriptTokenizer::TK_OP_SUB) {
-										sign = -1;
-										_ADVANCE_AND_CONSUME_NEWLINES;
-									}
-
-									if (tokenizer->get_token() != GDScriptTokenizer::TK_CONSTANT || !tokenizer->get_token_constant().is_num()) {
-
-										current_export = PropertyInfo();
-										_set_error("Expected a number as upper bound in the numeric range hint.");
-										return;
-									}
-
-									current_export.hint_string += "," + rtos(sign * double(tokenizer->get_token_constant()));
-									_ADVANCE_AND_CONSUME_NEWLINES;
-
-									if (tokenizer->get_token() == GDScriptTokenizer::TK_PARENTHESIS_CLOSE)
-										break;
-
-									if (tokenizer->get_token() != GDScriptTokenizer::TK_COMMA) {
-
-										current_export = PropertyInfo();
-										_set_error("Expected \",\" or \")\" in the numeric range hint.");
-										return;
-									}
-
-									_ADVANCE_AND_CONSUME_NEWLINES;
-									sign = 1.0;
-									if (tokenizer->get_token() == GDScriptTokenizer::TK_OP_SUB) {
-										sign = -1;
-										_ADVANCE_AND_CONSUME_NEWLINES;
-									}
-
-									if (tokenizer->get_token() != GDScriptTokenizer::TK_CONSTANT || !tokenizer->get_token_constant().is_num()) {
-
-										current_export = PropertyInfo();
-										_set_error("Expected a number as step in the numeric range hint.");
-										return;
-									}
-
-									current_export.hint_string += "," + rtos(sign * double(tokenizer->get_token_constant()));
-									_ADVANCE_AND_CONSUME_NEWLINES;
-
-								} break;
-								case Variant::STRING: {
-
-									if (tokenizer->get_token() == GDScriptTokenizer::TK_CONSTANT && tokenizer->get_token_constant().get_type() == Variant::STRING) {
-										//enumeration
-										current_export.hint = PROPERTY_HINT_ENUM;
-										bool first = true;
-										while (true) {
-
-											if (tokenizer->get_token() != GDScriptTokenizer::TK_CONSTANT || tokenizer->get_token_constant().get_type() != Variant::STRING) {
-
-												current_export = PropertyInfo();
-												_set_error("Expected a string constant in the enumeration hint.");
-												return;
-											}
-
-											String c = tokenizer->get_token_constant();
-											if (!first)
-												current_export.hint_string += ",";
-											else
-												first = false;
-
-											current_export.hint_string += c.xml_escape();
-											_ADVANCE_AND_CONSUME_NEWLINES;
-											if (tokenizer->get_token() == GDScriptTokenizer::TK_PARENTHESIS_CLOSE)
-												break;
-
-											if (tokenizer->get_token() != GDScriptTokenizer::TK_COMMA) {
-												current_export = PropertyInfo();
-												_set_error("Expected \")\" or \",\" in the enumeration hint.");
-												return;
-											}
-											_ADVANCE_AND_CONSUME_NEWLINES;
-										}
-
-										break;
-									}
-
-									if (tokenizer->get_token() == GDScriptTokenizer::TK_IDENTIFIER && tokenizer->get_token_identifier() == "DIR") {
-
-										_ADVANCE_AND_CONSUME_NEWLINES;
-
-										if (tokenizer->get_token() == GDScriptTokenizer::TK_PARENTHESIS_CLOSE)
-											current_export.hint = PROPERTY_HINT_DIR;
-										else if (tokenizer->get_token() == GDScriptTokenizer::TK_COMMA) {
-
-											_ADVANCE_AND_CONSUME_NEWLINES;
-
-											if (tokenizer->get_token() != GDScriptTokenizer::TK_IDENTIFIER || !(tokenizer->get_token_identifier() == "GLOBAL")) {
-												_set_error("Expected \"GLOBAL\" after comma in the directory hint.");
-												return;
-											}
-											if (!p_class->tool) {
-												_set_error("Global filesystem hints may only be used in tool scripts.");
-												return;
-											}
-											current_export.hint = PROPERTY_HINT_GLOBAL_DIR;
-											_ADVANCE_AND_CONSUME_NEWLINES;
-
-											if (tokenizer->get_token() != GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
-												_set_error("Expected \")\" in the hint.");
-												return;
-											}
-										} else {
-											_set_error("Expected \")\" or \",\" in the hint.");
-											return;
-										}
-										break;
-									}
-
-									if (tokenizer->get_token() == GDScriptTokenizer::TK_IDENTIFIER && tokenizer->get_token_identifier() == "FILE") {
-
-										current_export.hint = PROPERTY_HINT_FILE;
-										_ADVANCE_AND_CONSUME_NEWLINES;
-
-										if (tokenizer->get_token() == GDScriptTokenizer::TK_COMMA) {
-
-											_ADVANCE_AND_CONSUME_NEWLINES;
-
-											if (tokenizer->get_token() == GDScriptTokenizer::TK_IDENTIFIER && tokenizer->get_token_identifier() == "GLOBAL") {
-
-												if (!p_class->tool) {
-													_set_error("Global filesystem hints may only be used in tool scripts.");
-													return;
-												}
-												current_export.hint = PROPERTY_HINT_GLOBAL_FILE;
-												_ADVANCE_AND_CONSUME_NEWLINES;
-
-												if (tokenizer->get_token() == GDScriptTokenizer::TK_PARENTHESIS_CLOSE)
-													break;
-												else if (tokenizer->get_token() == GDScriptTokenizer::TK_COMMA)
-													_ADVANCE_AND_CONSUME_NEWLINES;
-												else {
-													_set_error("Expected \")\" or \",\" in the hint.");
-													return;
-												}
-											}
-
-											if (tokenizer->get_token() != GDScriptTokenizer::TK_CONSTANT || tokenizer->get_token_constant().get_type() != Variant::STRING) {
-
-												if (current_export.hint == PROPERTY_HINT_GLOBAL_FILE)
-													_set_error("Expected string constant with filter.");
-												else
-													_set_error("Expected \"GLOBAL\" or string constant with filter.");
-												return;
-											}
-											current_export.hint_string = tokenizer->get_token_constant();
-											_ADVANCE_AND_CONSUME_NEWLINES;
-										}
-
-										if (tokenizer->get_token() != GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
-											_set_error("Expected \")\" in the hint.");
-											return;
-										}
-										break;
-									}
-
-									if (tokenizer->get_token() == GDScriptTokenizer::TK_IDENTIFIER && tokenizer->get_token_identifier() == "MULTILINE") {
-
-										current_export.hint = PROPERTY_HINT_MULTILINE_TEXT;
-										_ADVANCE_AND_CONSUME_NEWLINES;
-										if (tokenizer->get_token() != GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
-											_set_error("Expected \")\" in the hint.");
-											return;
-										}
-										break;
-									}
-								} break;
-								case Variant::COLOR: {
-
-									if (tokenizer->get_token() != GDScriptTokenizer::TK_IDENTIFIER) {
-
-										current_export = PropertyInfo();
-										_set_error("Color type hint expects RGB or RGBA as hints.");
-										return;
-									}
-
-									String identifier = tokenizer->get_token_identifier();
-									if (identifier == "RGB") {
-										current_export.hint = PROPERTY_HINT_COLOR_NO_ALPHA;
-									} else if (identifier == "RGBA") {
-										//none
-									} else {
-										current_export = PropertyInfo();
-										_set_error("Color type hint expects RGB or RGBA as hints.");
-										return;
-									}
-									_ADVANCE_AND_CONSUME_NEWLINES;
-
-								} break;
-								default: {
-
-									current_export = PropertyInfo();
-									_set_error("Type \"" + Variant::get_type_name(type) + "\" can't take hints.");
-									return;
-								} break;
-							}
-						}
+GDScriptParser::LiteralNode *GDScriptParser::parse_literal() {
+	return static_cast<LiteralNode *>(parse_literal(nullptr, false));
+}
 
-					} else {
+GDScriptParser::ExpressionNode *GDScriptParser::parse_literal(ExpressionNode *p_previous_operand, bool p_can_assign) {
+	if (previous.type != GDScriptTokenizer::Token::LITERAL) {
+		push_error("Parser bug: parsing literal node without literal token.");
+		ERR_FAIL_V_MSG(nullptr, "Parser bug: parsing literal node without literal token.");
+	}
 
-						parenthesis++;
-						Node *subexpr = _parse_and_reduce_expression(p_class, true, true);
-						if (!subexpr) {
-							if (_recover_from_completion()) {
-								break;
-							}
-							return;
-						}
-						parenthesis--;
+	LiteralNode *literal = alloc_node<LiteralNode>();
+	literal->value = previous.literal;
+	return literal;
+}
 
-						if (subexpr->type != Node::TYPE_CONSTANT) {
-							current_export = PropertyInfo();
-							_set_error("Expected a constant expression.");
-						}
+GDScriptParser::ExpressionNode *GDScriptParser::parse_self(ExpressionNode *p_previous_operand, bool p_can_assign) {
+	if (current_function && current_function->is_static) {
+		push_error(R"(Cannot use "self" inside a static function.)");
+	}
+	SelfNode *self = alloc_node<SelfNode>();
+	self->current_class = current_class;
+	return self;
+}
 
-						Variant constant = static_cast<ConstantNode *>(subexpr)->value;
+GDScriptParser::ExpressionNode *GDScriptParser::parse_builtin_constant(ExpressionNode *p_previous_operand, bool p_can_assign) {
+	GDScriptTokenizer::Token::Type op_type = previous.type;
+	LiteralNode *constant = alloc_node<LiteralNode>();
 
-						if (constant.get_type() == Variant::OBJECT) {
-							GDScriptNativeClass *native_class = Object::cast_to<GDScriptNativeClass>(constant);
+	switch (op_type) {
+		case GDScriptTokenizer::Token::CONST_PI:
+			constant->value = Math_PI;
+			break;
+		case GDScriptTokenizer::Token::CONST_TAU:
+			constant->value = Math_TAU;
+			break;
+		case GDScriptTokenizer::Token::CONST_INF:
+			constant->value = Math_INF;
+			break;
+		case GDScriptTokenizer::Token::CONST_NAN:
+			constant->value = Math_NAN;
+			break;
+		default:
+			return nullptr; // Unreachable.
+	}
 
-							if (native_class && ClassDB::is_parent_class(native_class->get_name(), "Resource")) {
-								current_export.type = Variant::OBJECT;
-								current_export.hint = PROPERTY_HINT_RESOURCE_TYPE;
-								current_export.usage |= PROPERTY_USAGE_SCRIPT_VARIABLE;
+	return constant;
+}
 
-								current_export.hint_string = native_class->get_name();
-								current_export.class_name = native_class->get_name();
+GDScriptParser::ExpressionNode *GDScriptParser::parse_unary_operator(ExpressionNode *p_previous_operand, bool p_can_assign) {
+	GDScriptTokenizer::Token::Type op_type = previous.type;
+	UnaryOpNode *operation = alloc_node<UnaryOpNode>();
 
-							} else {
-								current_export = PropertyInfo();
-								_set_error("The export hint isn't a resource type.");
-							}
-						} else if (constant.get_type() == Variant::DICTIONARY) {
-							// Enumeration
-							bool is_flags = false;
-
-							if (tokenizer->get_token() == GDScriptTokenizer::TK_COMMA) {
-								_ADVANCE_AND_CONSUME_NEWLINES;
-
-								if (tokenizer->get_token() == GDScriptTokenizer::TK_IDENTIFIER && tokenizer->get_token_identifier() == "FLAGS") {
-									is_flags = true;
-									_ADVANCE_AND_CONSUME_NEWLINES;
-								} else {
-									current_export = PropertyInfo();
-									_set_error("Expected \"FLAGS\" after comma.");
-								}
-							}
+	switch (op_type) {
+		case GDScriptTokenizer::Token::MINUS:
+			operation->operation = UnaryOpNode::OP_NEGATIVE;
+			operation->variant_op = Variant::OP_NEGATE;
+			operation->operand = parse_precedence(PREC_SIGN, false);
+			break;
+		case GDScriptTokenizer::Token::PLUS:
+			operation->operation = UnaryOpNode::OP_POSITIVE;
+			operation->variant_op = Variant::OP_POSITIVE;
+			operation->operand = parse_precedence(PREC_SIGN, false);
+			break;
+		case GDScriptTokenizer::Token::TILDE:
+			operation->operation = UnaryOpNode::OP_COMPLEMENT;
+			operation->variant_op = Variant::OP_BIT_NEGATE;
+			operation->operand = parse_precedence(PREC_BIT_NOT, false);
+			break;
+		case GDScriptTokenizer::Token::NOT:
+		case GDScriptTokenizer::Token::BANG:
+			operation->operation = UnaryOpNode::OP_LOGIC_NOT;
+			operation->variant_op = Variant::OP_NOT;
+			operation->operand = parse_precedence(PREC_LOGIC_NOT, false);
+			break;
+		default:
+			return nullptr; // Unreachable.
+	}
 
-							current_export.type = Variant::INT;
-							current_export.hint = is_flags ? PROPERTY_HINT_FLAGS : PROPERTY_HINT_ENUM;
-							current_export.usage |= PROPERTY_USAGE_SCRIPT_VARIABLE;
-							Dictionary enum_values = constant;
-
-							List<Variant> keys;
-							enum_values.get_key_list(&keys);
-
-							bool first = true;
-							for (List<Variant>::Element *E = keys.front(); E; E = E->next()) {
-								if (enum_values[E->get()].get_type() == Variant::INT) {
-									if (!first)
-										current_export.hint_string += ",";
-									else
-										first = false;
-
-									current_export.hint_string += E->get().operator String().camelcase_to_underscore(true).capitalize().xml_escape();
-									if (!is_flags) {
-										current_export.hint_string += ":";
-										current_export.hint_string += enum_values[E->get()].operator String().xml_escape();
-									}
-								}
-							}
-						} else {
-							current_export = PropertyInfo();
-							_set_error("Expected type for export.");
-							return;
-						}
-					}
+	return operation;
+}
 
-					if (tokenizer->get_token() != GDScriptTokenizer::TK_PARENTHESIS_CLOSE) {
+GDScriptParser::ExpressionNode *GDScriptParser::parse_binary_operator(ExpressionNode *p_previous_operand, bool p_can_assign) {
+	GDScriptTokenizer::Token op = previous;
+	BinaryOpNode *operation = alloc_node<BinaryOpNode>();
 
-						current_export = PropertyInfo();
-						_set_error("Expected \")\" or \",\" after the export hint.");
-						return;
-					}
+	Precedence precedence = (Precedence)(get_rule(op.type)->precedence + 1);
+	operation->left_operand = p_previous_operand;
+	operation->right_operand = parse_precedence(precedence, false);
 
-					tokenizer->advance();
-					parenthesis--;
+	if (operation->right_operand == nullptr) {
+		push_error(vformat(R"(Expected expression after "%s" operator.")", op.get_name()));
+	}
 
-					if (is_arrayed) {
-						hint_prefix += itos(current_export.type);
-						if (current_export.hint) {
-							hint_prefix += "/" + itos(current_export.hint);
-						}
-						current_export.hint_string = hint_prefix + ":" + current_export.hint_string;
-						current_export.hint = PROPERTY_HINT_TYPE_STRING;
-						current_export.type = Variant::ARRAY;
-					}
-#undef _ADVANCE_AND_CONSUME_NEWLINES
-				}
+	// TODO: Also for unary, ternary, and assignment.
+	switch (op.type) {
+		case GDScriptTokenizer::Token::PLUS:
+			operation->operation = BinaryOpNode::OP_ADDITION;
+			operation->variant_op = Variant::OP_ADD;
+			break;
+		case GDScriptTokenizer::Token::MINUS:
+			operation->operation = BinaryOpNode::OP_SUBTRACTION;
+			operation->variant_op = Variant::OP_SUBTRACT;
+			break;
+		case GDScriptTokenizer::Token::STAR:
+			operation->operation = BinaryOpNode::OP_MULTIPLICATION;
+			operation->variant_op = Variant::OP_MULTIPLY;
+			break;
+		case GDScriptTokenizer::Token::SLASH:
+			operation->operation = BinaryOpNode::OP_DIVISION;
+			operation->variant_op = Variant::OP_DIVIDE;
+			break;
+		case GDScriptTokenizer::Token::PERCENT:
+			operation->operation = BinaryOpNode::OP_MODULO;
+			operation->variant_op = Variant::OP_MODULE;
+			break;
+		case GDScriptTokenizer::Token::LESS_LESS:
+			operation->operation = BinaryOpNode::OP_BIT_LEFT_SHIFT;
+			operation->variant_op = Variant::OP_SHIFT_LEFT;
+			break;
+		case GDScriptTokenizer::Token::GREATER_GREATER:
+			operation->operation = BinaryOpNode::OP_BIT_RIGHT_SHIFT;
+			operation->variant_op = Variant::OP_SHIFT_RIGHT;
+			break;
+		case GDScriptTokenizer::Token::AMPERSAND:
+			operation->operation = BinaryOpNode::OP_BIT_AND;
+			operation->variant_op = Variant::OP_BIT_AND;
+			break;
+		case GDScriptTokenizer::Token::PIPE:
+			operation->operation = BinaryOpNode::OP_BIT_OR;
+			operation->variant_op = Variant::OP_BIT_OR;
+			break;
+		case GDScriptTokenizer::Token::CARET:
+			operation->operation = BinaryOpNode::OP_BIT_XOR;
+			operation->variant_op = Variant::OP_BIT_XOR;
+			break;
+		case GDScriptTokenizer::Token::AND:
+		case GDScriptTokenizer::Token::AMPERSAND_AMPERSAND:
+			operation->operation = BinaryOpNode::OP_LOGIC_AND;
+			operation->variant_op = Variant::OP_AND;
+			break;
+		case GDScriptTokenizer::Token::OR:
+		case GDScriptTokenizer::Token::PIPE_PIPE:
+			operation->operation = BinaryOpNode::OP_LOGIC_OR;
+			operation->variant_op = Variant::OP_OR;
+			break;
+		case GDScriptTokenizer::Token::IS:
+			operation->operation = BinaryOpNode::OP_TYPE_TEST;
+			break;
+		case GDScriptTokenizer::Token::IN:
+			operation->operation = BinaryOpNode::OP_CONTENT_TEST;
+			operation->variant_op = Variant::OP_IN;
+			break;
+		case GDScriptTokenizer::Token::EQUAL_EQUAL:
+			operation->operation = BinaryOpNode::OP_COMP_EQUAL;
+			operation->variant_op = Variant::OP_EQUAL;
+			break;
+		case GDScriptTokenizer::Token::BANG_EQUAL:
+			operation->operation = BinaryOpNode::OP_COMP_NOT_EQUAL;
+			operation->variant_op = Variant::OP_NOT_EQUAL;
+			break;
+		case GDScriptTokenizer::Token::LESS:
+			operation->operation = BinaryOpNode::OP_COMP_LESS;
+			operation->variant_op = Variant::OP_LESS;
+			break;
+		case GDScriptTokenizer::Token::LESS_EQUAL:
+			operation->operation = BinaryOpNode::OP_COMP_LESS_EQUAL;
+			operation->variant_op = Variant::OP_LESS_EQUAL;
+			break;
+		case GDScriptTokenizer::Token::GREATER:
+			operation->operation = BinaryOpNode::OP_COMP_GREATER;
+			operation->variant_op = Variant::OP_GREATER;
+			break;
+		case GDScriptTokenizer::Token::GREATER_EQUAL:
+			operation->operation = BinaryOpNode::OP_COMP_GREATER_EQUAL;
+			operation->variant_op = Variant::OP_GREATER_EQUAL;
+			break;
+		default:
+			return nullptr; // Unreachable.
+	}
 
-				if (tokenizer->get_token() != GDScriptTokenizer::TK_PR_VAR && tokenizer->get_token() != GDScriptTokenizer::TK_PR_ONREADY && tokenizer->get_token() != GDScriptTokenizer::TK_PR_REMOTE && tokenizer->get_token() != GDScriptTokenizer::TK_PR_MASTER && tokenizer->get_token() != GDScriptTokenizer::TK_PR_PUPPET && tokenizer->get_token() != GDScriptTokenizer::TK_PR_SYNC && tokenizer->get_token() != GDScriptTokenizer::TK_PR_REMOTESYNC && tokenizer->get_token() != GDScriptTokenizer::TK_PR_MASTERSYNC && tokenizer->get_token() != GDScriptTokenizer::TK_PR_PUPPETSYNC && tokenizer->get_token() != GDScriptTokenizer::TK_PR_SLAVE) {
+	return operation;
+}
 
-					current_export = PropertyInfo();
-					_set_error("Expected \"var\", \"onready\", \"remote\", \"master\", \"puppet\", \"sync\", \"remotesync\", \"mastersync\", \"puppetsync\".");
-					return;
-				}
+GDScriptParser::ExpressionNode *GDScriptParser::parse_ternary_operator(ExpressionNode *p_previous_operand, bool p_can_assign) {
+	// Only one ternary operation exists, so no abstraction here.
+	TernaryOpNode *operation = alloc_node<TernaryOpNode>();
+	operation->true_expr = p_previous_operand;
 
-				continue;
-			} break;
-			case GDScriptTokenizer::TK_PR_ONREADY: {
+	operation->condition = parse_precedence(PREC_TERNARY, false);
 
-				//may be fallthrough from export, ignore if so
-				tokenizer->advance();
-				if (tokenizer->get_token() != GDScriptTokenizer::TK_PR_VAR) {
-					_set_error("Expected \"var\".");
-					return;
-				}
+	if (operation->condition == nullptr) {
+		push_error(R"(Expected expression as ternary condition after "if".)");
+	}
 
-				continue;
-			} break;
-			case GDScriptTokenizer::TK_PR_REMOTE: {
+	consume(GDScriptTokenizer::Token::ELSE, R"(Expected "else" after ternary operator condition.)");
 
-				//may be fallthrough from export, ignore if so
-				tokenizer->advance();
-				if (current_export.type) {
-					if (tokenizer->get_token() != GDScriptTokenizer::TK_PR_VAR) {
-						_set_error("Expected \"var\".");
-						return;
-					}
+	operation->false_expr = parse_precedence(PREC_TERNARY, false);
 
-				} else {
-					if (tokenizer->get_token() != GDScriptTokenizer::TK_PR_VAR && tokenizer->get_token() != GDScriptTokenizer::TK_PR_FUNCTION) {
-						_set_error("Expected \"var\" or \"func\".");
-						return;
-					}
-				}
-				rpc_mode = MultiplayerAPI::RPC_MODE_REMOTE;
-
-				continue;
-			} break;
-			case GDScriptTokenizer::TK_PR_MASTER: {
-
-				//may be fallthrough from export, ignore if so
-				tokenizer->advance();
-				if (current_export.type) {
-					if (tokenizer->get_token() != GDScriptTokenizer::TK_PR_VAR) {
-						_set_error("Expected \"var\".");
-						return;
-					}
+	return operation;
+}
 
-				} else {
-					if (tokenizer->get_token() != GDScriptTokenizer::TK_PR_VAR && tokenizer->get_token() != GDScriptTokenizer::TK_PR_FUNCTION) {
-						_set_error("Expected \"var\" or \"func\".");
-						return;
-					}
-				}
+GDScriptParser::ExpressionNode *GDScriptParser::parse_assignment(ExpressionNode *p_previous_operand, bool p_can_assign) {
+	if (!p_can_assign) {
+		push_error("Assignment is not allowed inside an expression.");
+		return parse_expression(false); // Return the following expression.
+	}
 
-				rpc_mode = MultiplayerAPI::RPC_MODE_MASTER;
-				continue;
-			} break;
-			case GDScriptTokenizer::TK_PR_SLAVE:
 #ifdef DEBUG_ENABLED
-				_add_warning(GDScriptWarning::DEPRECATED_KEYWORD, tokenizer->get_token_line(), "slave", "puppet");
+	VariableNode *source_variable = nullptr;
 #endif
-				FALLTHROUGH;
-			case GDScriptTokenizer::TK_PR_PUPPET: {
-
-				//may be fallthrough from export, ignore if so
-				tokenizer->advance();
-				if (current_export.type) {
-					if (tokenizer->get_token() != GDScriptTokenizer::TK_PR_VAR) {
-						_set_error("Expected \"var\".");
-						return;
-					}
 
-				} else {
-					if (tokenizer->get_token() != GDScriptTokenizer::TK_PR_VAR && tokenizer->get_token() != GDScriptTokenizer::TK_PR_FUNCTION) {
-						_set_error("Expected \"var\" or \"func\".");
-						return;
-					}
-				}
-
-				rpc_mode = MultiplayerAPI::RPC_MODE_PUPPET;
-				continue;
-			} break;
-			case GDScriptTokenizer::TK_PR_REMOTESYNC:
-			case GDScriptTokenizer::TK_PR_SYNC: {
-
-				//may be fallthrough from export, ignore if so
-				tokenizer->advance();
-				if (tokenizer->get_token() != GDScriptTokenizer::TK_PR_VAR && tokenizer->get_token() != GDScriptTokenizer::TK_PR_FUNCTION) {
-					if (current_export.type)
-						_set_error("Expected \"var\".");
-					else
-						_set_error("Expected \"var\" or \"func\".");
-					return;
-				}
-
-				rpc_mode = MultiplayerAPI::RPC_MODE_REMOTESYNC;
-				continue;
-			} break;
-			case GDScriptTokenizer::TK_PR_MASTERSYNC: {
-
-				//may be fallthrough from export, ignore if so
-				tokenizer->advance();
-				if (tokenizer->get_token() != GDScriptTokenizer::TK_PR_VAR && tokenizer->get_token() != GDScriptTokenizer::TK_PR_FUNCTION) {
-					if (current_export.type)
-						_set_error("Expected \"var\".");
-					else
-						_set_error("Expected \"var\" or \"func\".");
-					return;
-				}
-
-				rpc_mode = MultiplayerAPI::RPC_MODE_MASTERSYNC;
-				continue;
-			} break;
-			case GDScriptTokenizer::TK_PR_PUPPETSYNC: {
-
-				//may be fallthrough from export, ignore if so
-				tokenizer->advance();
-				if (tokenizer->get_token() != GDScriptTokenizer::TK_PR_VAR && tokenizer->get_token() != GDScriptTokenizer::TK_PR_FUNCTION) {
-					if (current_export.type)
-						_set_error("Expected \"var\".");
-					else
-						_set_error("Expected \"var\" or \"func\".");
-					return;
-				}
-
-				rpc_mode = MultiplayerAPI::RPC_MODE_PUPPETSYNC;
-				continue;
-			} break;
-			case GDScriptTokenizer::TK_PR_VAR: {
-				// variable declaration and (eventual) initialization
-
-				ClassNode::Member member;
-
-				bool autoexport = tokenizer->get_token(-1) == GDScriptTokenizer::TK_PR_EXPORT;
-				if (current_export.type != Variant::NIL) {
-					member._export = current_export;
-					current_export = PropertyInfo();
-				}
-
-				bool onready = tokenizer->get_token(-1) == GDScriptTokenizer::TK_PR_ONREADY;
-
-				tokenizer->advance();
-				if (!tokenizer->is_token_literal(0, true)) {
-
-					_set_error("Expected an identifier for the member variable name.");
-					return;
-				}
-
-				member.identifier = tokenizer->get_token_literal();
-				member.expression = NULL;
-				member._export.name = member.identifier;
-				member.line = tokenizer->get_token_line();
-				member.usages = 0;
-				member.rpc_mode = rpc_mode;
-
-				if (current_class->constant_expressions.has(member.identifier)) {
-					_set_error("A constant named \"" + String(member.identifier) + "\" already exists in this class (at line: " +
-							   itos(current_class->constant_expressions[member.identifier].expression->line) + ").");
-					return;
-				}
-
-				for (int i = 0; i < current_class->variables.size(); i++) {
-					if (current_class->variables[i].identifier == member.identifier) {
-						_set_error("Variable \"" + String(member.identifier) + "\" already exists in this class (at line: " +
-								   itos(current_class->variables[i].line) + ").");
-						return;
-					}
-				}
-
-				for (int i = 0; i < current_class->subclasses.size(); i++) {
-					if (current_class->subclasses[i]->name == member.identifier) {
-						_set_error("A class named \"" + String(member.identifier) + "\" already exists in this class (at line " + itos(current_class->subclasses[i]->line) + ").");
-						return;
-					}
-				}
+	switch (p_previous_operand->type) {
+		case Node::IDENTIFIER: {
 #ifdef DEBUG_ENABLED
-				for (int i = 0; i < current_class->functions.size(); i++) {
-					if (current_class->functions[i]->name == member.identifier) {
-						_add_warning(GDScriptWarning::VARIABLE_CONFLICTS_FUNCTION, member.line, member.identifier);
-						break;
-					}
-				}
-				for (int i = 0; i < current_class->static_functions.size(); i++) {
-					if (current_class->static_functions[i]->name == member.identifier) {
-						_add_warning(GDScriptWarning::VARIABLE_CONFLICTS_FUNCTION, member.line, member.identifier);
-						break;
-					}
-				}
-#endif // DEBUG_ENABLED
-				tokenizer->advance();
-
-				rpc_mode = MultiplayerAPI::RPC_MODE_DISABLED;
-
-				if (tokenizer->get_token() == GDScriptTokenizer::TK_COLON) {
-					if (tokenizer->get_token(1) == GDScriptTokenizer::TK_OP_ASSIGN) {
-						member.data_type = DataType();
-#ifdef DEBUG_ENABLED
-						member.data_type.infer_type = true;
-#endif
-						tokenizer->advance();
-					} else if (!_parse_type(member.data_type)) {
-						_set_error("Expected a type for the class variable.");
-						return;
-					}
-				}
-
-				if (autoexport && member.data_type.has_type) {
-					if (member.data_type.kind == DataType::BUILTIN) {
-						member._export.type = member.data_type.builtin_type;
-					} else if (member.data_type.kind == DataType::NATIVE) {
-						if (ClassDB::is_parent_class(member.data_type.native_type, "Resource")) {
-							member._export.type = Variant::OBJECT;
-							member._export.hint = PROPERTY_HINT_RESOURCE_TYPE;
-							member._export.usage |= PROPERTY_USAGE_SCRIPT_VARIABLE;
-							member._export.hint_string = member.data_type.native_type;
-							member._export.class_name = member.data_type.native_type;
-						} else {
-							_set_error("Invalid export type. Only built-in and native resource types can be exported.", member.line);
-							return;
-						}
-
-					} else {
-						_set_error("Invalid export type. Only built-in and native resource types can be exported.", member.line);
-						return;
-					}
-				}
-
-#ifdef TOOLS_ENABLED
-				Variant::CallError ce;
-				member.default_value = Variant::construct(member._export.type, NULL, 0, ce);
+			// Get source to store assignment count.
+			// Also remove one usage since assignment isn't usage.
+			IdentifierNode *id = static_cast<IdentifierNode *>(p_previous_operand);
+			switch (id->source) {
+				case IdentifierNode::LOCAL_VARIABLE:
+
+					source_variable = id->variable_source;
+					id->variable_source->usages--;
+					break;
+				case IdentifierNode::LOCAL_CONSTANT:
+					id->constant_source->usages--;
+					break;
+				case IdentifierNode::FUNCTION_PARAMETER:
+					id->parameter_source->usages--;
+					break;
+				case IdentifierNode::LOCAL_ITERATOR:
+				case IdentifierNode::LOCAL_BIND:
+					id->bind_source->usages--;
+					break;
+				default:
+					break;
+			}
 #endif
+		} break;
+		case Node::SUBSCRIPT:
+			// Okay.
+			break;
+		default:
+			push_error(R"(Only identifier, attribute access, and subscription access can be used as assignment target.)");
+			return parse_expression(false); // Return the following expression.
+	}
 
-				if (tokenizer->get_token() == GDScriptTokenizer::TK_OP_ASSIGN) {
-
+	AssignmentNode *assignment = alloc_node<AssignmentNode>();
+	make_completion_context(COMPLETION_ASSIGN, assignment);
 #ifdef DEBUG_ENABLED
-					int line = tokenizer->get_token_line();
+	bool has_operator = true;
 #endif
-					tokenizer->advance();
-
-					Node *subexpr = _parse_and_reduce_expression(p_class, false, autoexport || member._export.type != Variant::NIL);
-					if (!subexpr) {
-						if (_recover_from_completion()) {
-							break;
-						}
-						return;
-					}
-
-					//discourage common error
-					if (!onready && subexpr->type == Node::TYPE_OPERATOR) {
-
-						OperatorNode *op = static_cast<OperatorNode *>(subexpr);
-						if (op->op == OperatorNode::OP_CALL && op->arguments[0]->type == Node::TYPE_SELF && op->arguments[1]->type == Node::TYPE_IDENTIFIER) {
-							IdentifierNode *id = static_cast<IdentifierNode *>(op->arguments[1]);
-							if (id->name == "get_node") {
-
-								_set_error("Use \"onready var " + String(member.identifier) + " = get_node(...)\" instead.");
-								return;
-							}
-						}
-					}
-
-					member.expression = subexpr;
-
-					if (autoexport && !member.data_type.has_type) {
-
-						if (subexpr->type != Node::TYPE_CONSTANT) {
-
-							_set_error("Type-less export needs a constant expression assigned to infer type.");
-							return;
-						}
-
-						ConstantNode *cn = static_cast<ConstantNode *>(subexpr);
-						if (cn->value.get_type() == Variant::NIL) {
-
-							_set_error("Can't accept a null constant expression for inferring export type.");
-							return;
-						}
-						member._export.type = cn->value.get_type();
-						member._export.usage |= PROPERTY_USAGE_SCRIPT_VARIABLE;
-						if (cn->value.get_type() == Variant::OBJECT) {
-							Object *obj = cn->value;
-							Resource *res = Object::cast_to<Resource>(obj);
-							if (res == NULL) {
-								_set_error("The exported constant isn't a type or resource.");
-								return;
-							}
-							member._export.hint = PROPERTY_HINT_RESOURCE_TYPE;
-							member._export.hint_string = res->get_class();
-						}
-					}
-#ifdef TOOLS_ENABLED
-					if (subexpr->type == Node::TYPE_CONSTANT && (member._export.type != Variant::NIL || member.data_type.has_type)) {
-
-						ConstantNode *cn = static_cast<ConstantNode *>(subexpr);
-						if (cn->value.get_type() != Variant::NIL) {
-							if (member._export.type != Variant::NIL && cn->value.get_type() != member._export.type) {
-								if (Variant::can_convert(cn->value.get_type(), member._export.type)) {
-									Variant::CallError err;
-									const Variant *args = &cn->value;
-									cn->value = Variant::construct(member._export.type, &args, 1, err);
-								} else {
-									_set_error("Can't convert the provided value to the export type.");
-									return;
-								}
-							}
-							member.default_value = cn->value;
-						}
-					}
-#endif
-
-					IdentifierNode *id = alloc_node<IdentifierNode>();
-					id->name = member.identifier;
-
-					OperatorNode *op = alloc_node<OperatorNode>();
-					op->op = OperatorNode::OP_INIT_ASSIGN;
-					op->arguments.push_back(id);
-					op->arguments.push_back(subexpr);
-
+	switch (previous.type) {
+		case GDScriptTokenizer::Token::EQUAL:
+			assignment->operation = AssignmentNode::OP_NONE;
+			assignment->variant_op = Variant::OP_MAX;
 #ifdef DEBUG_ENABLED
-					NewLineNode *nl2 = alloc_node<NewLineNode>();
-					nl2->line = line;
-					if (onready)
-						p_class->ready->statements.push_back(nl2);
-					else
-						p_class->initializer->statements.push_back(nl2);
+			has_operator = false;
 #endif
-					if (onready)
-						p_class->ready->statements.push_back(op);
-					else
-						p_class->initializer->statements.push_back(op);
-
-					member.initial_assignment = op;
-
-				} else {
-
-					if (autoexport && !member.data_type.has_type) {
-						_set_error("Type-less export needs a constant expression assigned to infer type.");
-						return;
-					}
-
-					Node *expr;
-
-					if (member.data_type.has_type) {
-						expr = _get_default_value_for_type(member.data_type);
-					} else {
-						DataType exported_type;
-						exported_type.has_type = true;
-						exported_type.kind = DataType::BUILTIN;
-						exported_type.builtin_type = member._export.type;
-						expr = _get_default_value_for_type(exported_type);
-					}
-
-					IdentifierNode *id = alloc_node<IdentifierNode>();
-					id->name = member.identifier;
-
-					OperatorNode *op = alloc_node<OperatorNode>();
-					op->op = OperatorNode::OP_INIT_ASSIGN;
-					op->arguments.push_back(id);
-					op->arguments.push_back(expr);
-
-					p_class->initializer->statements.push_back(op);
-
-					member.initial_assignment = op;
-				}
-
-				if (tokenizer->get_token() == GDScriptTokenizer::TK_PR_SETGET) {
-
-					tokenizer->advance();
-
-					if (tokenizer->get_token() != GDScriptTokenizer::TK_COMMA) {
-						//just comma means using only getter
-						if (!tokenizer->is_token_literal()) {
-							_set_error("Expected an identifier for the setter function after \"setget\".");
-						}
-
-						member.setter = tokenizer->get_token_literal();
-
-						tokenizer->advance();
-					}
-
-					if (tokenizer->get_token() == GDScriptTokenizer::TK_COMMA) {
-						//there is a getter
-						tokenizer->advance();
-
-						if (!tokenizer->is_token_literal()) {
-							_set_error("Expected an identifier for the getter function after \",\".");
-						}
-
-						member.getter = tokenizer->get_token_literal();
-						tokenizer->advance();
-					}
-				}
-
-				p_class->variables.push_back(member);
-
-				if (!_end_statement()) {
-					_set_error("Expected end of statement (\"continue\").");
-					return;
-				}
-			} break;
-			case GDScriptTokenizer::TK_PR_CONST: {
-				// constant declaration and initialization
-
-				ClassNode::Constant constant;
-
-				tokenizer->advance();
-				if (!tokenizer->is_token_literal(0, true)) {
-
-					_set_error("Expected an identifier for the constant.");
-					return;
-				}
-
-				StringName const_id = tokenizer->get_token_literal();
-				int line = tokenizer->get_token_line();
-
-				if (current_class->constant_expressions.has(const_id)) {
-					_set_error("Constant \"" + String(const_id) + "\" already exists in this class (at line " +
-							   itos(current_class->constant_expressions[const_id].expression->line) + ").");
-					return;
-				}
-
-				for (int i = 0; i < current_class->variables.size(); i++) {
-					if (current_class->variables[i].identifier == const_id) {
-						_set_error("A variable named \"" + String(const_id) + "\" already exists in this class (at line " +
-								   itos(current_class->variables[i].line) + ").");
-						return;
-					}
-				}
-
-				for (int i = 0; i < current_class->subclasses.size(); i++) {
-					if (current_class->subclasses[i]->name == const_id) {
-						_set_error("A class named \"" + String(const_id) + "\" already exists in this class (at line " + itos(current_class->subclasses[i]->line) + ").");
-						return;
-					}
-				}
-
-				tokenizer->advance();
+			break;
+		case GDScriptTokenizer::Token::PLUS_EQUAL:
+			assignment->operation = AssignmentNode::OP_ADDITION;
+			assignment->variant_op = Variant::OP_ADD;
+			break;
+		case GDScriptTokenizer::Token::MINUS_EQUAL:
+			assignment->operation = AssignmentNode::OP_SUBTRACTION;
+			assignment->variant_op = Variant::OP_SUBTRACT;
+			break;
+		case GDScriptTokenizer::Token::STAR_EQUAL:
+			assignment->operation = AssignmentNode::OP_MULTIPLICATION;
+			assignment->variant_op = Variant::OP_MULTIPLY;
+			break;
+		case GDScriptTokenizer::Token::SLASH_EQUAL:
+			assignment->operation = AssignmentNode::OP_DIVISION;
+			assignment->variant_op = Variant::OP_DIVIDE;
+			break;
+		case GDScriptTokenizer::Token::PERCENT_EQUAL:
+			assignment->operation = AssignmentNode::OP_MODULO;
+			assignment->variant_op = Variant::OP_MODULE;
+			break;
+		case GDScriptTokenizer::Token::LESS_LESS_EQUAL:
+			assignment->operation = AssignmentNode::OP_BIT_SHIFT_LEFT;
+			assignment->variant_op = Variant::OP_SHIFT_LEFT;
+			break;
+		case GDScriptTokenizer::Token::GREATER_GREATER_EQUAL:
+			assignment->operation = AssignmentNode::OP_BIT_SHIFT_RIGHT;
+			assignment->variant_op = Variant::OP_SHIFT_RIGHT;
+			break;
+		case GDScriptTokenizer::Token::AMPERSAND_EQUAL:
+			assignment->operation = AssignmentNode::OP_BIT_AND;
+			assignment->variant_op = Variant::OP_BIT_AND;
+			break;
+		case GDScriptTokenizer::Token::PIPE_EQUAL:
+			assignment->operation = AssignmentNode::OP_BIT_OR;
+			assignment->variant_op = Variant::OP_BIT_OR;
+			break;
+		case GDScriptTokenizer::Token::CARET_EQUAL:
+			assignment->operation = AssignmentNode::OP_BIT_XOR;
+			assignment->variant_op = Variant::OP_BIT_XOR;
+			break;
+		default:
+			break; // Unreachable.
+	}
+	assignment->assignee = p_previous_operand;
+	assignment->assigned_value = parse_expression(false);
 
-				if (tokenizer->get_token() == GDScriptTokenizer::TK_COLON) {
-					if (tokenizer->get_token(1) == GDScriptTokenizer::TK_OP_ASSIGN) {
-						constant.type = DataType();
 #ifdef DEBUG_ENABLED
-						constant.type.infer_type = true;
+	if (has_operator && source_variable != nullptr && source_variable->assignments == 0) {
+		push_warning(assignment, GDScriptWarning::UNASSIGNED_VARIABLE_OP_ASSIGN, source_variable->identifier->name);
+	}
 #endif
-						tokenizer->advance();
-					} else if (!_parse_type(constant.type)) {
-						_set_error("Expected a type for the class constant.");
-						return;
-					}
-				}
-
-				if (tokenizer->get_token() != GDScriptTokenizer::TK_OP_ASSIGN) {
-					_set_error("Constants must be assigned immediately.");
-					return;
-				}
-
-				tokenizer->advance();
-
-				Node *subexpr = _parse_and_reduce_expression(p_class, true, true);
-				if (!subexpr) {
-					if (_recover_from_completion()) {
-						break;
-					}
-					return;
-				}
-
-				if (subexpr->type != Node::TYPE_CONSTANT) {
-					_set_error("Expected a constant expression.", line);
-					return;
-				}
-				subexpr->line = line;
-				constant.expression = subexpr;
-
-				p_class->constant_expressions.insert(const_id, constant);
-
-				if (!_end_statement()) {
-					_set_error("Expected end of statement (constant).", line);
-					return;
-				}
-
-			} break;
-			case GDScriptTokenizer::TK_PR_ENUM: {
-				//multiple constant declarations..
-
-				int last_assign = -1; // Incremented by 1 right before the assignment.
-				String enum_name;
-				Dictionary enum_dict;
-
-				tokenizer->advance();
-				if (tokenizer->is_token_literal(0, true)) {
-					enum_name = tokenizer->get_token_literal();
-
-					if (current_class->constant_expressions.has(enum_name)) {
-						_set_error("A constant named \"" + String(enum_name) + "\" already exists in this class (at line " +
-								   itos(current_class->constant_expressions[enum_name].expression->line) + ").");
-						return;
-					}
-
-					for (int i = 0; i < current_class->variables.size(); i++) {
-						if (current_class->variables[i].identifier == enum_name) {
-							_set_error("A variable named \"" + String(enum_name) + "\" already exists in this class (at line " +
-									   itos(current_class->variables[i].line) + ").");
-							return;
-						}
-					}
-
-					for (int i = 0; i < current_class->subclasses.size(); i++) {
-						if (current_class->subclasses[i]->name == enum_name) {
-							_set_error("A class named \"" + String(enum_name) + "\" already exists in this class (at line " + itos(current_class->subclasses[i]->line) + ").");
-							return;
-						}
-					}
-
-					tokenizer->advance();
-				}
-				if (tokenizer->get_token() != GDScriptTokenizer::TK_CURLY_BRACKET_OPEN) {
-					_set_error("Expected \"{\" in the enum declaration.");
-					return;
-				}
-				tokenizer->advance();
-
-				while (true) {
-					if (tokenizer->get_token() == GDScriptTokenizer::TK_NEWLINE) {
-
-						tokenizer->advance(); // Ignore newlines
-					} else if (tokenizer->get_token() == GDScriptTokenizer::TK_CURLY_BRACKET_CLOSE) {
 
-						tokenizer->advance();
-						break; // End of enum
-					} else if (!tokenizer->is_token_literal(0, true)) {
-
-						if (tokenizer->get_token() == GDScriptTokenizer::TK_EOF) {
-							_set_error("Unexpected end of file.");
-						} else {
-							_set_error(String("Unexpected ") + GDScriptTokenizer::get_token_name(tokenizer->get_token()) + ", expected an identifier.");
-						}
-
-						return;
-					} else { // tokenizer->is_token_literal(0, true)
-						StringName const_id = tokenizer->get_token_literal();
-
-						tokenizer->advance();
-
-						ConstantNode *enum_value_expr;
-
-						if (tokenizer->get_token() == GDScriptTokenizer::TK_OP_ASSIGN) {
-							tokenizer->advance();
-
-							Node *subexpr = _parse_and_reduce_expression(p_class, true, true);
-							if (!subexpr) {
-								if (_recover_from_completion()) {
-									break;
-								}
-								return;
-							}
-
-							if (subexpr->type != Node::TYPE_CONSTANT) {
-								_set_error("Expected a constant expression.");
-								return;
-							}
-
-							enum_value_expr = static_cast<ConstantNode *>(subexpr);
-
-							if (enum_value_expr->value.get_type() != Variant::INT) {
-								_set_error("Expected an integer value for \"enum\".");
-								return;
-							}
-
-							last_assign = enum_value_expr->value;
-
-						} else {
-							last_assign = last_assign + 1;
-							enum_value_expr = alloc_node<ConstantNode>();
-							enum_value_expr->value = last_assign;
-							enum_value_expr->datatype = _type_from_variant(enum_value_expr->value);
-						}
-
-						if (tokenizer->get_token() == GDScriptTokenizer::TK_COMMA) {
-							tokenizer->advance();
-						} else if (tokenizer->is_token_literal(0, true)) {
-							_set_error("Unexpected identifier.");
-							return;
-						}
-
-						if (enum_name != "") {
-							enum_dict[const_id] = enum_value_expr->value;
-						} else {
-							if (current_class->constant_expressions.has(const_id)) {
-								_set_error("A constant named \"" + String(const_id) + "\" already exists in this class (at line " +
-										   itos(current_class->constant_expressions[const_id].expression->line) + ").");
-								return;
-							}
-
-							for (int i = 0; i < current_class->variables.size(); i++) {
-								if (current_class->variables[i].identifier == const_id) {
-									_set_error("A variable named \"" + String(const_id) + "\" already exists in this class (at line " +
-											   itos(current_class->variables[i].line) + ").");
-									return;
-								}
-							}
-
-							for (int i = 0; i < current_class->subclasses.size(); i++) {
-								if (current_class->subclasses[i]->name == const_id) {
-									_set_error("A class named \"" + String(const_id) + "\" already exists in this class (at line " + itos(current_class->subclasses[i]->line) + ").");
-									return;
-								}
-							}
-
-							ClassNode::Constant constant;
-							constant.type.has_type = true;
-							constant.type.kind = DataType::BUILTIN;
-							constant.type.builtin_type = Variant::INT;
-							constant.expression = enum_value_expr;
-							p_class->constant_expressions.insert(const_id, constant);
-						}
-					}
-				}
-
-				if (enum_name != "") {
-					ClassNode::Constant enum_constant;
-					ConstantNode *cn = alloc_node<ConstantNode>();
-					cn->value = enum_dict;
-					cn->datatype = _type_from_variant(cn->value);
-
-					enum_constant.expression = cn;
-					enum_constant.type = cn->datatype;
-					p_class->constant_expressions.insert(enum_name, enum_constant);
-				}
-
-				if (!_end_statement()) {
-					_set_error("Expected end of statement (\"enum\").");
-					return;
-				}
-
-			} break;
-
-			case GDScriptTokenizer::TK_CONSTANT: {
-				if (tokenizer->get_token_constant().get_type() == Variant::STRING) {
-					tokenizer->advance();
-					// Ignore
-				} else {
-					_set_error(String() + "Unexpected constant of type: " + Variant::get_type_name(tokenizer->get_token_constant().get_type()));
-					return;
-				}
-			} break;
-
-			default: {
-
-				_set_error(String() + "Unexpected token: " + tokenizer->get_token_name(tokenizer->get_token()) + ":" + tokenizer->get_token_identifier());
-				return;
-
-			} break;
-		}
-	}
+	return assignment;
 }
 
-void GDScriptParser::_determine_inheritance(ClassNode *p_class, bool p_recursive) {
-
-	if (p_class->base_type.has_type) {
-		// Already determined
-	} else if (p_class->extends_used) {
-		//do inheritance
-		String path = p_class->extends_file;
-
-		Ref<GDScript> script;
-		StringName native;
-		ClassNode *base_class = NULL;
+GDScriptParser::ExpressionNode *GDScriptParser::parse_await(ExpressionNode *p_previous_operand, bool p_can_assign) {
+	AwaitNode *await = alloc_node<AwaitNode>();
+	await->to_await = parse_precedence(PREC_AWAIT, false);
 
-		if (path != "") {
-			//path (and optionally subclasses)
+	current_function->is_coroutine = true;
 
-			if (path.is_rel_path()) {
+	return await;
+}
 
-				String base = base_path;
+GDScriptParser::ExpressionNode *GDScriptParser::parse_array(ExpressionNode *p_previous_operand, bool p_can_assign) {
+	ArrayNode *array = alloc_node<ArrayNode>();
 
-				if (base == "" || base.is_rel_path()) {
-					_set_error("Couldn't resolve relative path for the parent class: " + path, p_class->line);
-					return;
-				}
-				path = base.plus_file(path).simplify_path();
-			}
-			script = ResourceLoader::load(path);
-			if (script.is_null()) {
-				_set_error("Couldn't load the base class: " + path, p_class->line);
-				return;
+	if (!check(GDScriptTokenizer::Token::BRACKET_CLOSE)) {
+		do {
+			if (check(GDScriptTokenizer::Token::BRACKET_CLOSE)) {
+				// Allow for trailing comma.
+				break;
 			}
-			if (!script->is_valid()) {
 
-				_set_error("Script isn't fully loaded (cyclic preload?): " + path, p_class->line);
-				return;
+			ExpressionNode *element = parse_expression(false);
+			if (element == nullptr) {
+				push_error(R"(Expected expression as array element.)");
+			} else {
+				array->elements.push_back(element);
 			}
+		} while (match(GDScriptTokenizer::Token::COMMA) && !is_at_end());
+	}
+	pop_multiline();
+	consume(GDScriptTokenizer::Token::BRACKET_CLOSE, R"(Expected closing "]" after array elements.)");
 
-			if (p_class->extends_class.size()) {
-
-				for (int i = 0; i < p_class->extends_class.size(); i++) {
+	return array;
+}
 
-					String sub = p_class->extends_class[i];
-					if (script->get_subclasses().has(sub)) {
+GDScriptParser::ExpressionNode *GDScriptParser::parse_dictionary(ExpressionNode *p_previous_operand, bool p_can_assign) {
+	DictionaryNode *dictionary = alloc_node<DictionaryNode>();
 
-						Ref<Script> subclass = script->get_subclasses()[sub]; //avoid reference from disappearing
-						script = subclass;
-					} else {
-
-						_set_error("Couldn't find the subclass: " + sub, p_class->line);
-						return;
-					}
-				}
+	bool decided_style = false;
+	if (!check(GDScriptTokenizer::Token::BRACE_CLOSE)) {
+		do {
+			if (check(GDScriptTokenizer::Token::BRACE_CLOSE)) {
+				// Allow for trailing comma.
+				break;
 			}
 
-		} else {
+			// Key.
+			ExpressionNode *key = parse_expression(false, true); // Stop on "=" so we can check for Lua table style.
 
-			if (p_class->extends_class.size() == 0) {
-				_set_error("Parser bug: undecidable inheritance.", p_class->line);
-				ERR_FAIL();
+			if (key == nullptr) {
+				push_error(R"(Expected expression as dictionary key.)");
 			}
-			//look around for the subclasses
-
-			int extend_iter = 1;
-			String base = p_class->extends_class[0];
-			ClassNode *p = p_class->owner;
-			Ref<GDScript> base_script;
-
-			if (ScriptServer::is_global_class(base)) {
-				base_script = ResourceLoader::load(ScriptServer::get_global_class_path(base));
-				if (!base_script.is_valid()) {
-					_set_error("The class \"" + base + "\" couldn't be fully loaded (script error or cyclic dependency).", p_class->line);
-					return;
-				}
-				p = NULL;
-			} else {
-				List<PropertyInfo> props;
-				ProjectSettings::get_singleton()->get_property_list(&props);
-				for (List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) {
-					String s = E->get().name;
-					if (!s.begins_with("autoload/")) {
-						continue;
-					}
-					String name = s.get_slice("/", 1);
-					if (name == base) {
-						String singleton_path = ProjectSettings::get_singleton()->get(s);
-						if (singleton_path.begins_with("*")) {
-							singleton_path = singleton_path.right(1);
-						}
-						if (!singleton_path.begins_with("res://")) {
-							singleton_path = "res://" + singleton_path;
-						}
-						base_script = ResourceLoader::load(singleton_path);
-						if (!base_script.is_valid()) {
-							_set_error("Class '" + base + "' could not be fully loaded (script error or cyclic inheritance).", p_class->line);
-							return;
-						}
-						p = NULL;
-					}
-				}
-			}
-
-			while (p) {
 
-				bool found = false;
-
-				for (int i = 0; i < p->subclasses.size(); i++) {
-					if (p->subclasses[i]->name == base) {
-						ClassNode *test = p->subclasses[i];
-						while (test) {
-							if (test == p_class) {
-								_set_error("Cyclic inheritance.", test->line);
-								return;
-							}
-							if (test->base_type.kind == DataType::CLASS) {
-								test = test->base_type.class_type;
-							} else {
-								break;
-							}
-						}
-						found = true;
-						if (extend_iter < p_class->extends_class.size()) {
-							// Keep looking at current classes if possible
-							base = p_class->extends_class[extend_iter++];
-							p = p->subclasses[i];
-						} else {
-							base_class = p->subclasses[i];
-						}
+			if (!decided_style) {
+				switch (current.type) {
+					case GDScriptTokenizer::Token::COLON:
+						dictionary->style = DictionaryNode::PYTHON_DICT;
+						break;
+					case GDScriptTokenizer::Token::EQUAL:
+						dictionary->style = DictionaryNode::LUA_TABLE;
+						break;
+					default:
+						push_error(R"(Expected ":" or "=" after dictionary key.)");
 						break;
-					}
 				}
+				decided_style = true;
+			}
 
-				if (base_class) break;
-				if (found) continue;
-
-				if (p->constant_expressions.has(base)) {
-					if (p->constant_expressions[base].expression->type != Node::TYPE_CONSTANT) {
-						_set_error("Couldn't resolve the constant \"" + base + "\".", p_class->line);
-						return;
+			switch (dictionary->style) {
+				case DictionaryNode::LUA_TABLE:
+					if (key != nullptr && key->type != Node::IDENTIFIER) {
+						push_error("Expected identifier as dictionary key.");
 					}
-					const ConstantNode *cn = static_cast<const ConstantNode *>(p->constant_expressions[base].expression);
-					base_script = cn->value;
-					if (base_script.is_null()) {
-						_set_error("Constant isn't a class: " + base, p_class->line);
-						return;
+					if (!match(GDScriptTokenizer::Token::EQUAL)) {
+						if (match(GDScriptTokenizer::Token::COLON)) {
+							push_error(R"(Expected "=" after dictionary key. Mixing dictionary styles is not allowed.)");
+							advance(); // Consume wrong separator anyway.
+						} else {
+							push_error(R"(Expected "=" after dictionary key.)");
+						}
 					}
 					break;
-				}
-
-				p = p->owner;
-			}
-
-			if (base_script.is_valid()) {
-
-				String ident = base;
-				Ref<GDScript> find_subclass = base_script;
-
-				for (int i = extend_iter; i < p_class->extends_class.size(); i++) {
-
-					String subclass = p_class->extends_class[i];
-
-					ident += ("." + subclass);
-
-					if (find_subclass->get_subclasses().has(subclass)) {
-
-						find_subclass = find_subclass->get_subclasses()[subclass];
-					} else if (find_subclass->get_constants().has(subclass)) {
-
-						Ref<GDScript> new_base_class = find_subclass->get_constants()[subclass];
-						if (new_base_class.is_null()) {
-							_set_error("Constant isn't a class: " + ident, p_class->line);
-							return;
+				case DictionaryNode::PYTHON_DICT:
+					if (!match(GDScriptTokenizer::Token::COLON)) {
+						if (match(GDScriptTokenizer::Token::EQUAL)) {
+							push_error(R"(Expected ":" after dictionary key. Mixing dictionary styles is not allowed.)");
+							advance(); // Consume wrong separator anyway.
+						} else {
+							push_error(R"(Expected ":" after dictionary key.)");
 						}
-						find_subclass = new_base_class;
-					} else {
-
-						_set_error("Couldn't find the subclass: " + ident, p_class->line);
-						return;
 					}
-				}
-
-				script = find_subclass;
-
-			} else if (!base_class) {
-
-				if (p_class->extends_class.size() > 1) {
-
-					_set_error("Invalid inheritance (unknown class + subclasses).", p_class->line);
-					return;
-				}
-				//if not found, try engine classes
-				if (!GDScriptLanguage::get_singleton()->get_global_map().has(base)) {
-
-					_set_error("Unknown class: \"" + base + "\"", p_class->line);
-					return;
-				}
-
-				native = base;
+					break;
 			}
-		}
-
-		if (base_class) {
-			p_class->base_type.has_type = true;
-			p_class->base_type.kind = DataType::CLASS;
-			p_class->base_type.class_type = base_class;
-		} else if (script.is_valid()) {
-			p_class->base_type.has_type = true;
-			p_class->base_type.kind = DataType::GDSCRIPT;
-			p_class->base_type.script_type = script;
-			p_class->base_type.native_type = script->get_instance_base_type();
-		} else if (native != StringName()) {
-			p_class->base_type.has_type = true;
-			p_class->base_type.kind = DataType::NATIVE;
-			p_class->base_type.native_type = native;
-		} else {
-			_set_error("Couldn't determine inheritance.", p_class->line);
-			return;
-		}
 
-	} else {
-		// without extends, implicitly extend Reference
-		p_class->base_type.has_type = true;
-		p_class->base_type.kind = DataType::NATIVE;
-		p_class->base_type.native_type = "Reference";
-	}
-
-	if (p_recursive) {
-		// Recursively determine subclasses
-		for (int i = 0; i < p_class->subclasses.size(); i++) {
-			_determine_inheritance(p_class->subclasses[i], p_recursive);
-		}
-	}
-}
-
-String GDScriptParser::DataType::to_string() const {
-	if (!has_type) return "var";
-	switch (kind) {
-		case BUILTIN: {
-			if (builtin_type == Variant::NIL) return "null";
-			return Variant::get_type_name(builtin_type);
-		} break;
-		case NATIVE: {
-			if (is_meta_type) {
-				return "GDScriptNativeClass";
+			// Value.
+			ExpressionNode *value = parse_expression(false);
+			if (value == nullptr) {
+				push_error(R"(Expected expression as dictionary value.)");
 			}
-			return native_type.operator String();
-		} break;
 
-		case GDSCRIPT: {
-			Ref<GDScript> gds = script_type;
-			const String &gds_class = gds->get_script_class_name();
-			if (!gds_class.empty()) {
-				return gds_class;
-			}
-			FALLTHROUGH;
-		}
-		case SCRIPT: {
-			if (is_meta_type) {
-				return script_type->get_class_name().operator String();
-			}
-			String name = script_type->get_name();
-			if (name != String()) {
-				return name;
-			}
-			name = script_type->get_path().get_file();
-			if (name != String()) {
-				return name;
+			if (key != nullptr && value != nullptr) {
+				dictionary->elements.push_back({ key, value });
 			}
-			return native_type.operator String();
-		} break;
-		case CLASS: {
-			ERR_FAIL_COND_V(!class_type, String());
-			if (is_meta_type) {
-				return "GDScript";
-			}
-			if (class_type->name == StringName()) {
-				return "self";
-			}
-			return class_type->name.operator String();
-		} break;
-		case UNRESOLVED: {
-		} break;
+		} while (match(GDScriptTokenizer::Token::COMMA) && !is_at_end());
 	}
+	pop_multiline();
+	consume(GDScriptTokenizer::Token::BRACE_CLOSE, R"(Expected closing "}" after dictionary elements.)");
 
-	return "Unresolved";
+	return dictionary;
 }
 
-bool GDScriptParser::_parse_type(DataType &r_type, bool p_can_be_void) {
-	tokenizer->advance();
-	r_type.has_type = true;
-
-	bool finished = false;
-	bool can_index = false;
-	String full_name;
-
-	if (tokenizer->get_token() == GDScriptTokenizer::TK_CURSOR) {
-		completion_cursor = StringName();
-		completion_type = COMPLETION_TYPE_HINT;
-		completion_class = current_class;
-		completion_function = current_function;
-		completion_line = tokenizer->get_token_line();
-		completion_argument = 0;
-		completion_block = current_block;
-		completion_found = true;
-		completion_ident_is_call = p_can_be_void;
-		tokenizer->advance();
-	}
-
-	switch (tokenizer->get_token()) {
-		case GDScriptTokenizer::TK_PR_VOID: {
-			if (!p_can_be_void) {
-				return false;
-			}
-			r_type.kind = DataType::BUILTIN;
-			r_type.builtin_type = Variant::NIL;
-		} break;
-		case GDScriptTokenizer::TK_BUILT_IN_TYPE: {
-			r_type.builtin_type = tokenizer->get_token_type();
-			if (tokenizer->get_token_type() == Variant::OBJECT) {
-				r_type.kind = DataType::NATIVE;
-				r_type.native_type = "Object";
-			} else {
-				r_type.kind = DataType::BUILTIN;
-			}
-		} break;
-		case GDScriptTokenizer::TK_IDENTIFIER: {
-			r_type.native_type = tokenizer->get_token_identifier();
-			if (ClassDB::class_exists(r_type.native_type) || ClassDB::class_exists("_" + r_type.native_type.operator String())) {
-				r_type.kind = DataType::NATIVE;
-			} else {
-				r_type.kind = DataType::UNRESOLVED;
-				can_index = true;
-				full_name = r_type.native_type;
-			}
-		} break;
-		default: {
-			return false;
-		}
-	}
-
-	tokenizer->advance();
-
-	if (tokenizer->get_token() == GDScriptTokenizer::TK_CURSOR) {
-		completion_cursor = r_type.native_type;
-		completion_type = COMPLETION_TYPE_HINT;
-		completion_class = current_class;
-		completion_function = current_function;
-		completion_line = tokenizer->get_token_line();
-		completion_argument = 0;
-		completion_block = current_block;
-		completion_found = true;
-		completion_ident_is_call = p_can_be_void;
-		tokenizer->advance();
+GDScriptParser::ExpressionNode *GDScriptParser::parse_grouping(ExpressionNode *p_previous_operand, bool p_can_assign) {
+	ExpressionNode *grouped = parse_expression(false);
+	pop_multiline();
+	if (grouped == nullptr) {
+		push_error(R"(Expected grouping expression.)");
+	} else {
+		consume(GDScriptTokenizer::Token::PARENTHESIS_CLOSE, R"*(Expected closing ")" after grouping expression.)*");
 	}
+	return grouped;
+}
 
-	if (can_index) {
-		while (!finished) {
-			switch (tokenizer->get_token()) {
-				case GDScriptTokenizer::TK_PERIOD: {
-					if (!can_index) {
-						_set_error("Unexpected \".\".");
-						return false;
-					}
-					can_index = false;
-					tokenizer->advance();
-				} break;
-				case GDScriptTokenizer::TK_IDENTIFIER: {
-					if (can_index) {
-						_set_error("Unexpected identifier.");
-						return false;
-					}
-
-					StringName id;
-					bool has_completion = _get_completable_identifier(COMPLETION_TYPE_HINT_INDEX, id);
-					if (id == StringName()) {
-						id = "@temp";
-					}
+GDScriptParser::ExpressionNode *GDScriptParser::parse_attribute(ExpressionNode *p_previous_operand, bool p_can_assign) {
+	SubscriptNode *attribute = alloc_node<SubscriptNode>();
 
-					full_name += "." + id.operator String();
-					can_index = true;
-					if (has_completion) {
-						completion_cursor = full_name;
-					}
-				} break;
-				default: {
-					finished = true;
-				} break;
+	if (for_completion) {
+		bool is_builtin = false;
+		if (p_previous_operand->type == Node::IDENTIFIER) {
+			const IdentifierNode *id = static_cast<const IdentifierNode *>(p_previous_operand);
+			Variant::Type builtin_type = get_builtin_type(id->name);
+			if (builtin_type < Variant::VARIANT_MAX) {
+				make_completion_context(COMPLETION_BUILT_IN_TYPE_CONSTANT, builtin_type, true);
+				is_builtin = true;
 			}
 		}
-
-		if (tokenizer->get_token(-1) == GDScriptTokenizer::TK_PERIOD) {
-			_set_error("Expected a subclass identifier.");
-			return false;
+		if (!is_builtin) {
+			make_completion_context(COMPLETION_ATTRIBUTE, attribute, -1, true);
 		}
-
-		r_type.native_type = full_name;
 	}
 
-	return true;
-}
+	attribute->is_attribute = true;
+	attribute->base = p_previous_operand;
 
-GDScriptParser::DataType GDScriptParser::_resolve_type(const DataType &p_source, int p_line) {
-	if (!p_source.has_type) return p_source;
-	if (p_source.kind != DataType::UNRESOLVED) return p_source;
+	if (!consume(GDScriptTokenizer::Token::IDENTIFIER, R"(Expected identifier after "." for attribute access.)")) {
+		return attribute;
+	}
+	attribute->attribute = parse_identifier();
 
-	Vector<String> full_name = p_source.native_type.operator String().split(".", false);
-	int name_part = 0;
+	return attribute;
+}
 
-	DataType result;
-	result.has_type = true;
+GDScriptParser::ExpressionNode *GDScriptParser::parse_subscript(ExpressionNode *p_previous_operand, bool p_can_assign) {
+	SubscriptNode *subscript = alloc_node<SubscriptNode>();
 
-	while (name_part < full_name.size()) {
+	make_completion_context(COMPLETION_SUBSCRIPT, subscript);
 
-		bool found = false;
-		StringName id = full_name[name_part];
-		DataType base_type = result;
+	subscript->base = p_previous_operand;
+	subscript->index = parse_expression(false);
 
-		ClassNode *p = NULL;
-		if (name_part == 0) {
-			if (ScriptServer::is_global_class(id)) {
-				String script_path = ScriptServer::get_global_class_path(id);
-				if (script_path == self_path) {
-					result.kind = DataType::CLASS;
-					result.class_type = static_cast<ClassNode *>(head);
-				} else {
-					Ref<Script> script = ResourceLoader::load(script_path);
-					Ref<GDScript> gds = script;
-					if (gds.is_valid()) {
-						if (!gds->is_valid()) {
-							_set_error("The class \"" + id + "\" couldn't be fully loaded (script error or cyclic dependency).", p_line);
-							return DataType();
-						}
-						result.kind = DataType::GDSCRIPT;
-						result.script_type = gds;
-					} else if (script.is_valid()) {
-						result.kind = DataType::SCRIPT;
-						result.script_type = script;
-					} else {
-						_set_error("The class \"" + id + "\" was found in global scope, but its script couldn't be loaded.", p_line);
-						return DataType();
-					}
-				}
-				name_part++;
-				continue;
-			}
-			List<PropertyInfo> props;
-			ProjectSettings::get_singleton()->get_property_list(&props);
-			String singleton_path;
-			for (List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) {
-				String s = E->get().name;
-				if (!s.begins_with("autoload/")) {
-					continue;
-				}
-				String name = s.get_slice("/", 1);
-				if (name == id) {
-					singleton_path = ProjectSettings::get_singleton()->get(s);
-					if (singleton_path.begins_with("*")) {
-						singleton_path = singleton_path.right(1);
-					}
-					if (!singleton_path.begins_with("res://")) {
-						singleton_path = "res://" + singleton_path;
-					}
-					break;
-				}
-			}
-			if (!singleton_path.empty()) {
-				Ref<Script> script = ResourceLoader::load(singleton_path);
-				Ref<GDScript> gds = script;
-				if (gds.is_valid()) {
-					if (!gds->is_valid()) {
-						_set_error("Class '" + id + "' could not be fully loaded (script error or cyclic inheritance).", p_line);
-						return DataType();
-					}
-					result.kind = DataType::GDSCRIPT;
-					result.script_type = gds;
-				} else if (script.is_valid()) {
-					result.kind = DataType::SCRIPT;
-					result.script_type = script;
-				} else {
-					_set_error("Couldn't fully load singleton script '" + id + "' (possible cyclic reference or parse error).", p_line);
-					return DataType();
-				}
-				name_part++;
-				continue;
-			}
-
-			p = current_class;
-		} else if (base_type.kind == DataType::CLASS) {
-			p = base_type.class_type;
-		}
-		while (p) {
-			if (p->constant_expressions.has(id)) {
-				if (p->constant_expressions[id].expression->type != Node::TYPE_CONSTANT) {
-					_set_error("Parser bug: unresolved constant.", p_line);
-					ERR_FAIL_V(result);
-				}
-				const ConstantNode *cn = static_cast<const ConstantNode *>(p->constant_expressions[id].expression);
-				Ref<GDScript> gds = cn->value;
-				if (gds.is_valid()) {
-					result.kind = DataType::GDSCRIPT;
-					result.script_type = gds;
-					found = true;
-				} else {
-					Ref<Script> scr = cn->value;
-					if (scr.is_valid()) {
-						result.kind = DataType::SCRIPT;
-						result.script_type = scr;
-						found = true;
-					}
-				}
-				break;
-			}
-
-			// Inner classes
-			ClassNode *outer_class = p;
-			while (outer_class) {
-				if (outer_class->name == id) {
-					found = true;
-					result.kind = DataType::CLASS;
-					result.class_type = outer_class;
-					break;
-				}
-				for (int i = 0; i < outer_class->subclasses.size(); i++) {
-					if (outer_class->subclasses[i] == p) {
-						continue;
-					}
-					if (outer_class->subclasses[i]->name == id) {
-						found = true;
-						result.kind = DataType::CLASS;
-						result.class_type = outer_class->subclasses[i];
-						break;
-					}
-				}
-				if (found) {
-					break;
-				}
-				outer_class = outer_class->owner;
-			}
+	pop_multiline();
+	consume(GDScriptTokenizer::Token::BRACKET_CLOSE, R"(Expected "]" after subscription index.)");
 
-			if (!found && p->base_type.kind == DataType::CLASS) {
-				p = p->base_type.class_type;
-			} else {
-				base_type = p->base_type;
-				break;
-			}
-		}
+	return subscript;
+}
 
-		// Still look for class constants in parent scripts
-		if (!found && (base_type.kind == DataType::GDSCRIPT || base_type.kind == DataType::SCRIPT)) {
-			Ref<Script> scr = base_type.script_type;
-			ERR_FAIL_COND_V(scr.is_null(), result);
-			while (scr.is_valid()) {
-				Map<StringName, Variant> constants;
-				scr->get_constants(&constants);
-
-				if (constants.has(id)) {
-					Ref<GDScript> gds = constants[id];
-
-					if (gds.is_valid()) {
-						result.kind = DataType::GDSCRIPT;
-						result.script_type = gds;
-						found = true;
-					} else {
-						Ref<Script> scr2 = constants[id];
-						if (scr2.is_valid()) {
-							result.kind = DataType::SCRIPT;
-							result.script_type = scr2;
-							found = true;
-						}
-					}
-				}
-				if (found) {
-					break;
-				} else {
-					scr = scr->get_base_script();
-				}
-			}
-		}
+GDScriptParser::ExpressionNode *GDScriptParser::parse_cast(ExpressionNode *p_previous_operand, bool p_can_assign) {
+	CastNode *cast = alloc_node<CastNode>();
 
-		if (!found && !for_completion) {
-			String base;
-			if (name_part == 0) {
-				base = "self";
-			} else {
-				base = result.to_string();
-			}
-			_set_error("The identifier \"" + String(id) + "\" isn't a valid type (not a script or class), or couldn't be found on base \"" +
-							   base + "\".",
-					p_line);
-			return DataType();
-		}
+	cast->operand = p_previous_operand;
+	cast->cast_type = parse_type();
 
-		name_part++;
+	if (cast->cast_type == nullptr) {
+		push_error(R"(Expected type specifier after "as".)");
+		return p_previous_operand;
 	}
 
-	return result;
+	return cast;
 }
 
-GDScriptParser::DataType GDScriptParser::_type_from_variant(const Variant &p_value) const {
-	DataType result;
-	result.has_type = true;
-	result.is_constant = true;
-	result.kind = DataType::BUILTIN;
-	result.builtin_type = p_value.get_type();
+GDScriptParser::ExpressionNode *GDScriptParser::parse_call(ExpressionNode *p_previous_operand, bool p_can_assign) {
+	CallNode *call = alloc_node<CallNode>();
 
-	if (result.builtin_type == Variant::OBJECT) {
-		Object *obj = p_value.operator Object *();
-		if (!obj) {
-			return DataType();
-		}
-		result.native_type = obj->get_class_name();
-		Ref<Script> scr = p_value;
-		if (scr.is_valid()) {
-			result.is_meta_type = true;
+	if (previous.type == GDScriptTokenizer::Token::SUPER) {
+		// Super call.
+		call->is_super = true;
+		push_multiline(true);
+		if (match(GDScriptTokenizer::Token::PARENTHESIS_OPEN)) {
+			// Implicit call to the parent method of the same name.
+			if (current_function == nullptr) {
+				push_error(R"(Cannot use implicit "super" call outside of a function.)");
+				pop_multiline();
+				return nullptr;
+			}
+			call->function_name = current_function->identifier->name;
 		} else {
-			result.is_meta_type = false;
-			scr = obj->get_script();
+			consume(GDScriptTokenizer::Token::PERIOD, R"(Expected "." or "(" after "super".)");
+			make_completion_context(COMPLETION_SUPER_METHOD, call, true);
+			if (!consume(GDScriptTokenizer::Token::IDENTIFIER, R"(Expected function name after ".".)")) {
+				pop_multiline();
+				return nullptr;
+			}
+			IdentifierNode *identifier = parse_identifier();
+			call->callee = identifier;
+			call->function_name = identifier->name;
+			consume(GDScriptTokenizer::Token::PARENTHESIS_OPEN, R"(Expected "(" after function name.)");
 		}
-		if (scr.is_valid()) {
-			result.script_type = scr;
-			Ref<GDScript> gds = scr;
-			if (gds.is_valid()) {
-				result.kind = DataType::GDSCRIPT;
+	} else {
+		call->callee = p_previous_operand;
+
+		if (call->callee == nullptr) {
+			push_error(R"*(Cannot call on an expression. Use ".call()" if it's a Callable.)*");
+		} else if (call->callee->type == Node::IDENTIFIER) {
+			call->function_name = static_cast<IdentifierNode *>(call->callee)->name;
+			make_completion_context(COMPLETION_METHOD, call->callee);
+		} else if (call->callee->type == Node::SUBSCRIPT) {
+			SubscriptNode *attribute = static_cast<SubscriptNode *>(call->callee);
+			if (attribute->is_attribute) {
+				if (attribute->attribute) {
+					call->function_name = attribute->attribute->name;
+				}
+				make_completion_context(COMPLETION_ATTRIBUTE_METHOD, call->callee);
 			} else {
-				result.kind = DataType::SCRIPT;
+				// TODO: The analyzer can see if this is actually a Callable and give better error message.
+				push_error(R"*(Cannot call on an expression. Use ".call()" if it's a Callable.)*");
 			}
-			result.native_type = scr->get_instance_base_type();
 		} else {
-			result.kind = DataType::NATIVE;
+			push_error(R"*(Cannot call on an expression. Use ".call()" if it's a Callable.)*");
 		}
 	}
 
-	return result;
-}
-
-GDScriptParser::DataType GDScriptParser::_type_from_property(const PropertyInfo &p_property, bool p_nil_is_variant) const {
-	DataType ret;
-	if (p_property.type == Variant::NIL && (p_nil_is_variant || (p_property.usage & PROPERTY_USAGE_NIL_IS_VARIANT))) {
-		// Variant
-		return ret;
-	}
-	ret.has_type = true;
-	ret.builtin_type = p_property.type;
-	if (p_property.type == Variant::OBJECT) {
-		ret.kind = DataType::NATIVE;
-		ret.native_type = p_property.class_name == StringName() ? "Object" : p_property.class_name;
+	if (!check(GDScriptTokenizer::Token::PARENTHESIS_CLOSE)) {
+		// Arguments.
+		push_completion_call(call);
+		make_completion_context(COMPLETION_CALL_ARGUMENTS, call, 0, true);
+		int argument_index = 0;
+		do {
+			make_completion_context(COMPLETION_CALL_ARGUMENTS, call, argument_index++, true);
+			if (check(GDScriptTokenizer::Token::PARENTHESIS_CLOSE)) {
+				// Allow for trailing comma.
+				break;
+			}
+			ExpressionNode *argument = parse_expression(false);
+			if (argument == nullptr) {
+				push_error(R"(Expected expression as the function argument.)");
+			} else {
+				call->arguments.push_back(argument);
+			}
+		} while (match(GDScriptTokenizer::Token::COMMA));
+		pop_completion_call();
+	}
+
+	pop_multiline();
+	consume(GDScriptTokenizer::Token::PARENTHESIS_CLOSE, R"*(Expected closing ")" after call arguments.)*");
+
+	return call;
+}
+
+GDScriptParser::ExpressionNode *GDScriptParser::parse_get_node(ExpressionNode *p_previous_operand, bool p_can_assign) {
+	if (match(GDScriptTokenizer::Token::LITERAL)) {
+		if (previous.literal.get_type() != Variant::STRING) {
+			push_error(R"(Expect node path as string or identifier after "$".)");
+			return nullptr;
+		}
+		GetNodeNode *get_node = alloc_node<GetNodeNode>();
+		make_completion_context(COMPLETION_GET_NODE, get_node);
+		get_node->string = parse_literal();
+		return get_node;
+	} else if (current.is_node_name()) {
+		GetNodeNode *get_node = alloc_node<GetNodeNode>();
+		int chain_position = 0;
+		do {
+			make_completion_context(COMPLETION_GET_NODE, get_node, chain_position++);
+			if (!current.is_node_name()) {
+				push_error(R"(Expect node path after "/".)");
+				return nullptr;
+			}
+			advance();
+			IdentifierNode *identifier = alloc_node<IdentifierNode>();
+			identifier->name = previous.get_identifier();
+			get_node->chain.push_back(identifier);
+		} while (match(GDScriptTokenizer::Token::SLASH));
+		return get_node;
 	} else {
-		ret.kind = DataType::BUILTIN;
+		push_error(R"(Expect node path as string or identifier after "$".)");
+		return nullptr;
 	}
-	return ret;
 }
 
-GDScriptParser::DataType GDScriptParser::_type_from_gdtype(const GDScriptDataType &p_gdtype) const {
-	DataType result;
-	if (!p_gdtype.has_type) {
-		return result;
-	}
-
-	result.has_type = true;
-	result.builtin_type = p_gdtype.builtin_type;
-	result.native_type = p_gdtype.native_type;
-	result.script_type = p_gdtype.script_type;
-
-	switch (p_gdtype.kind) {
-		case GDScriptDataType::UNINITIALIZED: {
-			ERR_PRINT("Uninitialized datatype. Please report a bug.");
-		} break;
-		case GDScriptDataType::BUILTIN: {
-			result.kind = DataType::BUILTIN;
-		} break;
-		case GDScriptDataType::NATIVE: {
-			result.kind = DataType::NATIVE;
-		} break;
-		case GDScriptDataType::GDSCRIPT: {
-			result.kind = DataType::GDSCRIPT;
-		} break;
-		case GDScriptDataType::SCRIPT: {
-			result.kind = DataType::SCRIPT;
-		} break;
-	}
-	return result;
-}
+GDScriptParser::ExpressionNode *GDScriptParser::parse_preload(ExpressionNode *p_previous_operand, bool p_can_assign) {
+	PreloadNode *preload = alloc_node<PreloadNode>();
+	preload->resolved_path = "<missing path>";
 
-GDScriptParser::DataType GDScriptParser::_get_operation_type(const Variant::Operator p_op, const DataType &p_a, const DataType &p_b, bool &r_valid) const {
-	if (!p_a.has_type || !p_b.has_type) {
-		r_valid = true;
-		return DataType();
-	}
+	push_multiline(true);
+	consume(GDScriptTokenizer::Token::PARENTHESIS_OPEN, R"(Expected "(" after "preload".)");
 
-	Variant::Type a_type = p_a.kind == DataType::BUILTIN ? p_a.builtin_type : Variant::OBJECT;
-	Variant::Type b_type = p_b.kind == DataType::BUILTIN ? p_b.builtin_type : Variant::OBJECT;
+	make_completion_context(COMPLETION_RESOURCE_PATH, preload);
+	push_completion_call(preload);
 
-	Variant a;
-	REF a_ref;
-	if (a_type == Variant::OBJECT) {
-		a_ref.instance();
-		a = a_ref;
-	} else {
-		Variant::CallError err;
-		a = Variant::construct(a_type, NULL, 0, err);
-		if (err.error != Variant::CallError::CALL_OK) {
-			r_valid = false;
-			return DataType();
-		}
-	}
-	Variant b;
-	REF b_ref;
-	if (b_type == Variant::OBJECT) {
-		b_ref.instance();
-		b = b_ref;
-	} else {
-		Variant::CallError err;
-		b = Variant::construct(b_type, NULL, 0, err);
-		if (err.error != Variant::CallError::CALL_OK) {
-			r_valid = false;
-			return DataType();
-		}
-	}
+	preload->path = parse_expression(false);
 
-	// Avoid division by zero
-	if (a_type == Variant::INT || a_type == Variant::REAL) {
-		Variant::evaluate(Variant::OP_ADD, a, 1, a, r_valid);
-	}
-	if (b_type == Variant::INT || b_type == Variant::REAL) {
-		Variant::evaluate(Variant::OP_ADD, b, 1, b, r_valid);
-	}
-	if (a_type == Variant::STRING && b_type != Variant::ARRAY) {
-		a = "%s"; // Work around for formatting operator (%)
+	if (preload->path == nullptr) {
+		push_error(R"(Expected resource path after "(".)");
 	}
 
-	Variant ret;
-	Variant::evaluate(p_op, a, b, ret, r_valid);
+	pop_completion_call();
 
-	if (r_valid) {
-		return _type_from_variant(ret);
-	}
+	pop_multiline();
+	consume(GDScriptTokenizer::Token::PARENTHESIS_CLOSE, R"*(Expected ")" after preload path.)*");
 
-	return DataType();
-}
-
-Variant::Operator GDScriptParser::_get_variant_operation(const OperatorNode::Operator &p_op) const {
-	switch (p_op) {
-		case OperatorNode::OP_NEG: {
-			return Variant::OP_NEGATE;
-		} break;
-		case OperatorNode::OP_POS: {
-			return Variant::OP_POSITIVE;
-		} break;
-		case OperatorNode::OP_NOT: {
-			return Variant::OP_NOT;
-		} break;
-		case OperatorNode::OP_BIT_INVERT: {
-			return Variant::OP_BIT_NEGATE;
-		} break;
-		case OperatorNode::OP_IN: {
-			return Variant::OP_IN;
-		} break;
-		case OperatorNode::OP_EQUAL: {
-			return Variant::OP_EQUAL;
-		} break;
-		case OperatorNode::OP_NOT_EQUAL: {
-			return Variant::OP_NOT_EQUAL;
-		} break;
-		case OperatorNode::OP_LESS: {
-			return Variant::OP_LESS;
-		} break;
-		case OperatorNode::OP_LESS_EQUAL: {
-			return Variant::OP_LESS_EQUAL;
-		} break;
-		case OperatorNode::OP_GREATER: {
-			return Variant::OP_GREATER;
-		} break;
-		case OperatorNode::OP_GREATER_EQUAL: {
-			return Variant::OP_GREATER_EQUAL;
-		} break;
-		case OperatorNode::OP_AND: {
-			return Variant::OP_AND;
-		} break;
-		case OperatorNode::OP_OR: {
-			return Variant::OP_OR;
-		} break;
-		case OperatorNode::OP_ASSIGN_ADD:
-		case OperatorNode::OP_ADD: {
-			return Variant::OP_ADD;
-		} break;
-		case OperatorNode::OP_ASSIGN_SUB:
-		case OperatorNode::OP_SUB: {
-			return Variant::OP_SUBTRACT;
-		} break;
-		case OperatorNode::OP_ASSIGN_MUL:
-		case OperatorNode::OP_MUL: {
-			return Variant::OP_MULTIPLY;
-		} break;
-		case OperatorNode::OP_ASSIGN_DIV:
-		case OperatorNode::OP_DIV: {
-			return Variant::OP_DIVIDE;
-		} break;
-		case OperatorNode::OP_ASSIGN_MOD:
-		case OperatorNode::OP_MOD: {
-			return Variant::OP_MODULE;
-		} break;
-		case OperatorNode::OP_ASSIGN_BIT_AND:
-		case OperatorNode::OP_BIT_AND: {
-			return Variant::OP_BIT_AND;
-		} break;
-		case OperatorNode::OP_ASSIGN_BIT_OR:
-		case OperatorNode::OP_BIT_OR: {
-			return Variant::OP_BIT_OR;
-		} break;
-		case OperatorNode::OP_ASSIGN_BIT_XOR:
-		case OperatorNode::OP_BIT_XOR: {
-			return Variant::OP_BIT_XOR;
-		} break;
-		case OperatorNode::OP_ASSIGN_SHIFT_LEFT:
-		case OperatorNode::OP_SHIFT_LEFT: {
-			return Variant::OP_SHIFT_LEFT;
-		}
-		case OperatorNode::OP_ASSIGN_SHIFT_RIGHT:
-		case OperatorNode::OP_SHIFT_RIGHT: {
-			return Variant::OP_SHIFT_RIGHT;
-		}
-		default: {
-			return Variant::OP_MAX;
-		} break;
-	}
+	return preload;
 }
 
-bool GDScriptParser::_is_type_compatible(const DataType &p_container, const DataType &p_expression, bool p_allow_implicit_conversion) const {
-	// Ignore for completion
-	if (!check_types || for_completion) {
-		return true;
-	}
-	// Can't test if not all have type
-	if (!p_container.has_type || !p_expression.has_type) {
-		return true;
-	}
-
-	// Should never get here unresolved
-	ERR_FAIL_COND_V(p_container.kind == DataType::UNRESOLVED, false);
-	ERR_FAIL_COND_V(p_expression.kind == DataType::UNRESOLVED, false);
-
-	if (p_container.kind == DataType::BUILTIN && p_expression.kind == DataType::BUILTIN) {
-		bool valid = p_container.builtin_type == p_expression.builtin_type;
-		if (p_allow_implicit_conversion) {
-			valid = valid || Variant::can_convert_strict(p_expression.builtin_type, p_container.builtin_type);
-		}
-		return valid;
-	}
-
-	if (p_container.kind == DataType::BUILTIN && p_container.builtin_type == Variant::OBJECT) {
-		// Object built-in is a special case, it's compatible with any object and with null
-		if (p_expression.kind == DataType::BUILTIN) {
-			return p_expression.builtin_type == Variant::NIL;
-		}
-		// If it's not a built-in, must be an object
-		return true;
-	}
-
-	if (p_container.kind == DataType::BUILTIN || (p_expression.kind == DataType::BUILTIN && p_expression.builtin_type != Variant::NIL)) {
-		// Can't mix built-ins with objects
-		return false;
-	}
-
-	// From now on everything is objects, check polymorphism
-	// The container must be the same class or a superclass of the expression
-
-	if (p_expression.kind == DataType::BUILTIN && p_expression.builtin_type == Variant::NIL) {
-		// Null can be assigned to object types
-		return true;
-	}
+GDScriptParser::ExpressionNode *GDScriptParser::parse_invalid_token(ExpressionNode *p_previous_operand, bool p_can_assign) {
+	// Just for better error messages.
+	GDScriptTokenizer::Token::Type invalid = previous.type;
 
-	StringName expr_native;
-	Ref<Script> expr_script;
-	ClassNode *expr_class = NULL;
-
-	switch (p_expression.kind) {
-		case DataType::NATIVE: {
-			if (p_container.kind != DataType::NATIVE) {
-				// Non-native type can't be a superclass of a native type
-				return false;
-			}
-			if (p_expression.is_meta_type) {
-				expr_native = GDScriptNativeClass::get_class_static();
-			} else {
-				expr_native = p_expression.native_type;
-			}
-		} break;
-		case DataType::SCRIPT:
-		case DataType::GDSCRIPT: {
-			if (p_container.kind == DataType::CLASS) {
-				// This cannot be resolved without cyclic dependencies, so just bail out
-				return false;
-			}
-			if (p_expression.is_meta_type) {
-				expr_native = p_expression.script_type->get_class_name();
-			} else {
-				expr_script = p_expression.script_type;
-				expr_native = expr_script->get_instance_base_type();
-			}
-		} break;
-		case DataType::CLASS: {
-			if (p_expression.is_meta_type) {
-				expr_native = GDScript::get_class_static();
-			} else {
-				expr_class = p_expression.class_type;
-				ClassNode *base = expr_class;
-				while (base->base_type.kind == DataType::CLASS) {
-					base = base->base_type.class_type;
-				}
-				expr_native = base->base_type.native_type;
-				expr_script = base->base_type.script_type;
-			}
-		} break;
-		case DataType::BUILTIN: // Already handled above
-		case DataType::UNRESOLVED: // Not allowed, see above
+	switch (invalid) {
+		case GDScriptTokenizer::Token::QUESTION_MARK:
+			push_error(R"(Unexpected "?" in source. If you want a ternary operator, use "truthy_value if true_condition else falsy_value".)");
 			break;
+		default:
+			return nullptr; // Unreachable.
 	}
 
-	// Some classes are prefixed with `_` internally
-	if (!ClassDB::class_exists(expr_native)) {
-		expr_native = "_" + expr_native;
-	}
+	// Return the previous expression.
+	return p_previous_operand;
+}
 
-	switch (p_container.kind) {
-		case DataType::NATIVE: {
-			if (p_container.is_meta_type) {
-				return ClassDB::is_parent_class(expr_native, GDScriptNativeClass::get_class_static());
+GDScriptParser::TypeNode *GDScriptParser::parse_type(bool p_allow_void) {
+	TypeNode *type = alloc_node<TypeNode>();
+	make_completion_context(p_allow_void ? COMPLETION_TYPE_NAME_OR_VOID : COMPLETION_TYPE_NAME, type);
+	if (!match(GDScriptTokenizer::Token::IDENTIFIER)) {
+		if (match(GDScriptTokenizer::Token::VOID)) {
+			if (p_allow_void) {
+				TypeNode *void_type = alloc_node<TypeNode>();
+				return void_type;
 			} else {
-				StringName container_native = ClassDB::class_exists(p_container.native_type) ? p_container.native_type : StringName("_" + p_container.native_type);
-				return ClassDB::is_parent_class(expr_native, container_native);
-			}
-		} break;
-		case DataType::SCRIPT:
-		case DataType::GDSCRIPT: {
-			if (p_container.is_meta_type) {
-				return ClassDB::is_parent_class(expr_native, GDScript::get_class_static());
-			}
-			if (expr_class == head && p_container.script_type->get_path() == self_path) {
-				// Special case: container is self script and expression is self
-				return true;
-			}
-			while (expr_script.is_valid()) {
-				if (expr_script == p_container.script_type) {
-					return true;
-				}
-				expr_script = expr_script->get_base_script();
-			}
-			return false;
-		} break;
-		case DataType::CLASS: {
-			if (p_container.is_meta_type) {
-				return ClassDB::is_parent_class(expr_native, GDScript::get_class_static());
-			}
-			if (p_container.class_type == head && expr_script.is_valid() && expr_script->get_path() == self_path) {
-				// Special case: container is self and expression is self script
-				return true;
-			}
-			while (expr_class) {
-				if (expr_class == p_container.class_type) {
-					return true;
-				}
-				expr_class = expr_class->base_type.class_type;
-			}
-			return false;
-		} break;
-		case DataType::BUILTIN: // Already handled above
-		case DataType::UNRESOLVED: // Not allowed, see above
-			break;
+				push_error(R"("void" is only allowed for a function return type.)");
+			}
+		}
+		// Leave error message to the caller who knows the context.
+		return nullptr;
+	}
+
+	IdentifierNode *type_element = parse_identifier();
+
+	type->type_chain.push_back(type_element);
+
+	int chain_index = 1;
+	while (match(GDScriptTokenizer::Token::PERIOD)) {
+		make_completion_context(COMPLETION_TYPE_ATTRIBUTE, type, chain_index++);
+		if (consume(GDScriptTokenizer::Token::IDENTIFIER, R"(Expected inner type name after ".".)")) {
+			type_element = parse_identifier();
+			type->type_chain.push_back(type_element);
+		}
+	}
+
+	return type;
+}
+
+GDScriptParser::ParseRule *GDScriptParser::get_rule(GDScriptTokenizer::Token::Type p_token_type) {
+	// Function table for expression parsing.
+	// clang-format destroys the alignment here, so turn off for the table.
+	/* clang-format off */
+	static ParseRule rules[] = {
+		// PREFIX                                           INFIX                                           PRECEDENCE (for infix)
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // EMPTY,
+		// Basic
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // ANNOTATION,
+		{ &GDScriptParser::parse_identifier,             	nullptr,                                        PREC_NONE }, // IDENTIFIER,
+		{ &GDScriptParser::parse_literal,                	nullptr,                                        PREC_NONE }, // LITERAL,
+		// Comparison
+		{ nullptr,                                          &GDScriptParser::parse_binary_operator,      	PREC_COMPARISON }, // LESS,
+		{ nullptr,                                          &GDScriptParser::parse_binary_operator,      	PREC_COMPARISON }, // LESS_EQUAL,
+		{ nullptr,                                          &GDScriptParser::parse_binary_operator,      	PREC_COMPARISON }, // GREATER,
+		{ nullptr,                                          &GDScriptParser::parse_binary_operator,      	PREC_COMPARISON }, // GREATER_EQUAL,
+		{ nullptr,                                          &GDScriptParser::parse_binary_operator,      	PREC_COMPARISON }, // EQUAL_EQUAL,
+		{ nullptr,                                          &GDScriptParser::parse_binary_operator,      	PREC_COMPARISON }, // BANG_EQUAL,
+		// Logical
+		{ nullptr,                                          &GDScriptParser::parse_binary_operator,      	PREC_LOGIC_AND }, // AND,
+		{ nullptr,                                          &GDScriptParser::parse_binary_operator,      	PREC_LOGIC_OR }, // OR,
+		{ &GDScriptParser::parse_unary_operator,         	nullptr,                                        PREC_NONE }, // NOT,
+		{ nullptr,                                          &GDScriptParser::parse_binary_operator,			PREC_LOGIC_AND }, // AMPERSAND_AMPERSAND,
+		{ nullptr,                                          &GDScriptParser::parse_binary_operator,			PREC_LOGIC_OR }, // PIPE_PIPE,
+		{ &GDScriptParser::parse_unary_operator,			nullptr,                                        PREC_NONE }, // BANG,
+		// Bitwise
+		{ nullptr,                                          &GDScriptParser::parse_binary_operator,      	PREC_BIT_AND }, // AMPERSAND,
+		{ nullptr,                                          &GDScriptParser::parse_binary_operator,      	PREC_BIT_OR }, // PIPE,
+		{ &GDScriptParser::parse_unary_operator,         	nullptr,                                        PREC_NONE }, // TILDE,
+		{ nullptr,                                          &GDScriptParser::parse_binary_operator,      	PREC_BIT_XOR }, // CARET,
+		{ nullptr,                                          &GDScriptParser::parse_binary_operator,      	PREC_BIT_SHIFT }, // LESS_LESS,
+		{ nullptr,                                          &GDScriptParser::parse_binary_operator,      	PREC_BIT_SHIFT }, // GREATER_GREATER,
+		// Math
+		{ &GDScriptParser::parse_unary_operator,         	&GDScriptParser::parse_binary_operator,      	PREC_ADDITION }, // PLUS,
+		{ &GDScriptParser::parse_unary_operator,         	&GDScriptParser::parse_binary_operator,      	PREC_SUBTRACTION }, // MINUS,
+		{ nullptr,                                          &GDScriptParser::parse_binary_operator,      	PREC_FACTOR }, // STAR,
+		{ nullptr,                                          &GDScriptParser::parse_binary_operator,      	PREC_FACTOR }, // SLASH,
+		{ nullptr,                                          &GDScriptParser::parse_binary_operator,      	PREC_FACTOR }, // PERCENT,
+		// Assignment
+		{ nullptr,                                          &GDScriptParser::parse_assignment,           	PREC_ASSIGNMENT }, // EQUAL,
+		{ nullptr,                                          &GDScriptParser::parse_assignment,           	PREC_ASSIGNMENT }, // PLUS_EQUAL,
+		{ nullptr,                                          &GDScriptParser::parse_assignment,           	PREC_ASSIGNMENT }, // MINUS_EQUAL,
+		{ nullptr,                                          &GDScriptParser::parse_assignment,           	PREC_ASSIGNMENT }, // STAR_EQUAL,
+		{ nullptr,                                          &GDScriptParser::parse_assignment,           	PREC_ASSIGNMENT }, // SLASH_EQUAL,
+		{ nullptr,                                          &GDScriptParser::parse_assignment,           	PREC_ASSIGNMENT }, // PERCENT_EQUAL,
+		{ nullptr,                                          &GDScriptParser::parse_assignment,           	PREC_ASSIGNMENT }, // LESS_LESS_EQUAL,
+		{ nullptr,                                          &GDScriptParser::parse_assignment,           	PREC_ASSIGNMENT }, // GREATER_GREATER_EQUAL,
+		{ nullptr,                                          &GDScriptParser::parse_assignment,           	PREC_ASSIGNMENT }, // AMPERSAND_EQUAL,
+		{ nullptr,                                          &GDScriptParser::parse_assignment,           	PREC_ASSIGNMENT }, // PIPE_EQUAL,
+		{ nullptr,                                          &GDScriptParser::parse_assignment,           	PREC_ASSIGNMENT }, // CARET_EQUAL,
+		// Control flow
+		{ nullptr,                                          &GDScriptParser::parse_ternary_operator,     	PREC_TERNARY }, // IF,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // ELIF,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // ELSE,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // FOR,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // WHILE,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // BREAK,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // CONTINUE,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // PASS,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // RETURN,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // MATCH,
+		// Keywords
+		{ nullptr,                                          &GDScriptParser::parse_cast,                 	PREC_CAST }, // AS,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // ASSERT,
+		{ &GDScriptParser::parse_await,                  	nullptr,                                        PREC_NONE }, // AWAIT,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // BREAKPOINT,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // CLASS,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // CLASS_NAME,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // CONST,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // ENUM,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // EXTENDS,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // FUNC,
+		{ nullptr,                                          &GDScriptParser::parse_binary_operator,      	PREC_CONTENT_TEST }, // IN,
+		{ nullptr,                                          &GDScriptParser::parse_binary_operator,      	PREC_TYPE_TEST }, // IS,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // NAMESPACE,
+		{ &GDScriptParser::parse_preload,					nullptr,                                        PREC_NONE }, // PRELOAD,
+		{ &GDScriptParser::parse_self,                   	nullptr,                                        PREC_NONE }, // SELF,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // SIGNAL,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // STATIC,
+		{ &GDScriptParser::parse_call,						nullptr,                                        PREC_NONE }, // SUPER,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // TRAIT,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // VAR,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // VOID,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // YIELD,
+		// Punctuation
+		{ &GDScriptParser::parse_array,                  	&GDScriptParser::parse_subscript,            	PREC_SUBSCRIPT }, // BRACKET_OPEN,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // BRACKET_CLOSE,
+		{ &GDScriptParser::parse_dictionary,             	nullptr,                                        PREC_NONE }, // BRACE_OPEN,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // BRACE_CLOSE,
+		{ &GDScriptParser::parse_grouping,               	&GDScriptParser::parse_call,                 	PREC_CALL }, // PARENTHESIS_OPEN,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // PARENTHESIS_CLOSE,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // COMMA,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // SEMICOLON,
+		{ nullptr,                                          &GDScriptParser::parse_attribute,            	PREC_ATTRIBUTE }, // PERIOD,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // PERIOD_PERIOD,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // COLON,
+		{ &GDScriptParser::parse_get_node,               	nullptr,                                        PREC_NONE }, // DOLLAR,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // FORWARD_ARROW,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // UNDERSCORE,
+		// Whitespace
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // NEWLINE,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // INDENT,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // DEDENT,
+		// Constants
+		{ &GDScriptParser::parse_builtin_constant,			nullptr,                                        PREC_NONE }, // CONST_PI,
+		{ &GDScriptParser::parse_builtin_constant,			nullptr,                                        PREC_NONE }, // CONST_TAU,
+		{ &GDScriptParser::parse_builtin_constant,			nullptr,                                        PREC_NONE }, // CONST_INF,
+		{ &GDScriptParser::parse_builtin_constant,			nullptr,                                        PREC_NONE }, // CONST_NAN,
+		// Error message improvement
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // VCS_CONFLICT_MARKER,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // BACKTICK,
+		{ nullptr,                                          &GDScriptParser::parse_invalid_token,        	PREC_CAST }, // QUESTION_MARK,
+		// Special
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // ERROR,
+		{ nullptr,                                          nullptr,                                        PREC_NONE }, // TK_EOF,
+	};
+	/* clang-format on */
+	// Avoid desync.
+	static_assert(sizeof(rules) / sizeof(rules[0]) == GDScriptTokenizer::Token::TK_MAX, "Amount of parse rules don't match the amount of token types.");
+
+	// Let's assume this this never invalid, since nothing generates a TK_MAX.
+	return &rules[p_token_type];
+}
+
+bool GDScriptParser::SuiteNode::has_local(const StringName &p_name) const {
+	if (locals_indices.has(p_name)) {
+		return true;
+	}
+	if (parent_block != nullptr) {
+		return parent_block->has_local(p_name);
 	}
-
 	return false;
 }
 
-GDScriptParser::Node *GDScriptParser::_get_default_value_for_type(const DataType &p_type, int p_line) {
-	Node *result;
-
-	if (p_type.has_type && p_type.kind == DataType::BUILTIN && p_type.builtin_type != Variant::NIL && p_type.builtin_type != Variant::OBJECT) {
-		if (p_type.builtin_type == Variant::ARRAY) {
-			result = alloc_node<ArrayNode>();
-		} else if (p_type.builtin_type == Variant::DICTIONARY) {
-			result = alloc_node<DictionaryNode>();
-		} else {
-			ConstantNode *c = alloc_node<ConstantNode>();
-			Variant::CallError err;
-			c->value = Variant::construct(p_type.builtin_type, NULL, 0, err);
-			result = c;
-		}
-	} else {
-		ConstantNode *c = alloc_node<ConstantNode>();
-		c->value = Variant();
-		result = c;
+const GDScriptParser::SuiteNode::Local &GDScriptParser::SuiteNode::get_local(const StringName &p_name) const {
+	if (locals_indices.has(p_name)) {
+		return locals[locals_indices[p_name]];
 	}
+	if (parent_block != nullptr) {
+		return parent_block->get_local(p_name);
+	}
+	return empty;
+}
 
-	result->line = p_line;
-
-	return result;
+bool GDScriptParser::AnnotationNode::apply(GDScriptParser *p_this, Node *p_target) const {
+	return (p_this->*(p_this->valid_annotations[name].apply))(this, p_target);
 }
 
-GDScriptParser::DataType GDScriptParser::_reduce_node_type(Node *p_node) {
-#ifdef DEBUG_ENABLED
-	if (p_node->get_datatype().has_type && p_node->type != Node::TYPE_ARRAY && p_node->type != Node::TYPE_DICTIONARY) {
-#else
-	if (p_node->get_datatype().has_type) {
-#endif
-		return p_node->get_datatype();
-	}
+bool GDScriptParser::AnnotationNode::applies_to(uint32_t p_target_kinds) const {
+	return (info->target_kind & p_target_kinds) > 0;
+}
 
-	DataType node_type;
+bool GDScriptParser::validate_annotation_arguments(AnnotationNode *p_annotation) {
+	ERR_FAIL_COND_V_MSG(!valid_annotations.has(p_annotation->name), false, vformat(R"(Annotation "%s" not found to validate.)", p_annotation->name));
 
-	switch (p_node->type) {
-		case Node::TYPE_CONSTANT: {
-			node_type = _type_from_variant(static_cast<ConstantNode *>(p_node)->value);
-		} break;
-		case Node::TYPE_TYPE: {
-			TypeNode *tn = static_cast<TypeNode *>(p_node);
-			node_type.has_type = true;
-			node_type.is_meta_type = true;
-			node_type.kind = DataType::BUILTIN;
-			node_type.builtin_type = tn->vtype;
-		} break;
-		case Node::TYPE_ARRAY: {
-			node_type.has_type = true;
-			node_type.kind = DataType::BUILTIN;
-			node_type.builtin_type = Variant::ARRAY;
-#ifdef DEBUG_ENABLED
-			// Check stuff inside the array
-			ArrayNode *an = static_cast<ArrayNode *>(p_node);
-			for (int i = 0; i < an->elements.size(); i++) {
-				_reduce_node_type(an->elements[i]);
-			}
-#endif // DEBUG_ENABLED
-		} break;
-		case Node::TYPE_DICTIONARY: {
-			node_type.has_type = true;
-			node_type.kind = DataType::BUILTIN;
-			node_type.builtin_type = Variant::DICTIONARY;
-#ifdef DEBUG_ENABLED
-			// Check stuff inside the dictionarty
-			DictionaryNode *dn = static_cast<DictionaryNode *>(p_node);
-			for (int i = 0; i < dn->elements.size(); i++) {
-				_reduce_node_type(dn->elements[i].key);
-				_reduce_node_type(dn->elements[i].value);
-			}
-#endif // DEBUG_ENABLED
-		} break;
-		case Node::TYPE_SELF: {
-			node_type.has_type = true;
-			node_type.kind = DataType::CLASS;
-			node_type.class_type = current_class;
-			node_type.is_constant = true;
-		} break;
-		case Node::TYPE_IDENTIFIER: {
-			IdentifierNode *id = static_cast<IdentifierNode *>(p_node);
-			if (id->declared_block) {
-				node_type = id->declared_block->variables[id->name]->get_datatype();
-				id->declared_block->variables[id->name]->usages += 1;
-			} else if (id->name == "#match_value") {
-				// It's a special id just for the match statetement, ignore
-				break;
-			} else if (current_function && current_function->arguments.find(id->name) >= 0) {
-				int idx = current_function->arguments.find(id->name);
-				node_type = current_function->argument_types[idx];
-			} else {
-				node_type = _reduce_identifier_type(NULL, id->name, id->line, false);
-			}
-		} break;
-		case Node::TYPE_CAST: {
-			CastNode *cn = static_cast<CastNode *>(p_node);
+	const MethodInfo &info = valid_annotations[p_annotation->name].info;
 
-			DataType source_type = _reduce_node_type(cn->source_node);
-			cn->cast_type = _resolve_type(cn->cast_type, cn->line);
-			if (source_type.has_type) {
+	if (((info.flags & METHOD_FLAG_VARARG) == 0) && p_annotation->arguments.size() > info.arguments.size()) {
+		push_error(vformat(R"(Annotation "%s" requires at most %d arguments, but %d were given.)", p_annotation->name, info.arguments.size(), p_annotation->arguments.size()));
+		return false;
+	}
 
-				bool valid = false;
-				if (check_types) {
-					if (cn->cast_type.kind == DataType::BUILTIN && source_type.kind == DataType::BUILTIN) {
-						valid = Variant::can_convert(source_type.builtin_type, cn->cast_type.builtin_type);
-					}
-					if (cn->cast_type.kind != DataType::BUILTIN && source_type.kind != DataType::BUILTIN) {
-						valid = _is_type_compatible(cn->cast_type, source_type) || _is_type_compatible(source_type, cn->cast_type);
-					}
+	if (p_annotation->arguments.size() < info.arguments.size() - info.default_arguments.size()) {
+		push_error(vformat(R"(Annotation "%s" requires at least %d arguments, but %d were given.)", p_annotation->name, info.arguments.size() - info.default_arguments.size(), p_annotation->arguments.size()));
+		return false;
+	}
 
-					if (!valid) {
-						_set_error("Invalid cast. Cannot convert from \"" + source_type.to_string() +
-										   "\" to \"" + cn->cast_type.to_string() + "\".",
-								cn->line);
-						return DataType();
+	const List<PropertyInfo>::Element *E = info.arguments.front();
+	for (int i = 0; i < p_annotation->arguments.size(); i++) {
+		ExpressionNode *argument = p_annotation->arguments[i];
+		const PropertyInfo &parameter = E->get();
+
+		if (E->next() != nullptr) {
+			E = E->next();
+		}
+
+		switch (parameter.type) {
+			case Variant::STRING:
+			case Variant::STRING_NAME:
+			case Variant::NODE_PATH:
+				// Allow "quote-less strings", as long as they are recognized as identifiers.
+				if (argument->type == Node::IDENTIFIER) {
+					IdentifierNode *string = static_cast<IdentifierNode *>(argument);
+					Callable::CallError error;
+					Vector<Variant> args = varray(string->name);
+					const Variant *name = args.ptr();
+					p_annotation->resolved_arguments.push_back(Variant::construct(parameter.type, &(name), 1, error));
+					if (error.error != Callable::CallError::CALL_OK) {
+						push_error(vformat(R"(Expected %s as argument %d of annotation "%s").)", Variant::get_type_name(parameter.type), i + 1, p_annotation->name));
+						p_annotation->resolved_arguments.remove(p_annotation->resolved_arguments.size() - 1);
+						return false;
 					}
+					break;
+				}
+				[[fallthrough]];
+			default: {
+				if (argument->type != Node::LITERAL) {
+					push_error(vformat(R"(Expected %s as argument %d of annotation "%s").)", Variant::get_type_name(parameter.type), i + 1, p_annotation->name));
+					return false;
 				}
-			} else {
-#ifdef DEBUG_ENABLED
-				_add_warning(GDScriptWarning::UNSAFE_CAST, cn->line, cn->cast_type.to_string());
-#endif // DEBUG_ENABLED
-				_mark_line_as_unsafe(cn->line);
-			}
-
-			node_type = cn->cast_type;
-
-		} break;
-		case Node::TYPE_OPERATOR: {
-			OperatorNode *op = static_cast<OperatorNode *>(p_node);
-
-			switch (op->op) {
-				case OperatorNode::OP_CALL:
-				case OperatorNode::OP_PARENT_CALL: {
-					node_type = _reduce_function_call_type(op);
-				} break;
-				case OperatorNode::OP_YIELD: {
-					if (op->arguments.size() == 2) {
-						DataType base_type = _reduce_node_type(op->arguments[0]);
-						DataType signal_type = _reduce_node_type(op->arguments[1]);
-						// TODO: Check if signal exists when it's a constant
-						if (base_type.has_type && base_type.kind == DataType::BUILTIN && base_type.builtin_type != Variant::NIL && base_type.builtin_type != Variant::OBJECT) {
-							_set_error("The first argument of \"yield()\" must be an object.", op->line);
-							return DataType();
-						}
-						if (signal_type.has_type && (signal_type.kind != DataType::BUILTIN || signal_type.builtin_type != Variant::STRING)) {
-							_set_error("The second argument of \"yield()\" must be a string.", op->line);
-							return DataType();
-						}
-					}
-					// yield can return anything
-					node_type.has_type = false;
-				} break;
-				case OperatorNode::OP_IS:
-				case OperatorNode::OP_IS_BUILTIN: {
-
-					if (op->arguments.size() != 2) {
-						_set_error("Parser bug: binary operation without 2 arguments.", op->line);
-						ERR_FAIL_V(DataType());
-					}
-
-					DataType value_type = _reduce_node_type(op->arguments[0]);
-					DataType type_type = _reduce_node_type(op->arguments[1]);
-
-					if (check_types && type_type.has_type) {
-						if (!type_type.is_meta_type && (type_type.kind != DataType::NATIVE || !ClassDB::is_parent_class(type_type.native_type, "Script"))) {
-							_set_error("Invalid \"is\" test: the right operand isn't a type (neither a native type nor a script).", op->line);
-							return DataType();
-						}
-						type_type.is_meta_type = false; // Test the actual type
-						if (!_is_type_compatible(type_type, value_type) && !_is_type_compatible(value_type, type_type)) {
-							if (op->op == OperatorNode::OP_IS) {
-								_set_error("A value of type \"" + value_type.to_string() + "\" will never be an instance of \"" + type_type.to_string() + "\".", op->line);
-							} else {
-								_set_error("A value of type \"" + value_type.to_string() + "\" will never be of type \"" + type_type.to_string() + "\".", op->line);
-							}
-							return DataType();
-						}
-					}
-
-					node_type.has_type = true;
-					node_type.is_constant = true;
-					node_type.is_meta_type = false;
-					node_type.kind = DataType::BUILTIN;
-					node_type.builtin_type = Variant::BOOL;
-				} break;
-				// Unary operators
-				case OperatorNode::OP_NEG:
-				case OperatorNode::OP_POS:
-				case OperatorNode::OP_NOT:
-				case OperatorNode::OP_BIT_INVERT: {
-
-					DataType argument_type = _reduce_node_type(op->arguments[0]);
-					if (!argument_type.has_type) {
-						break;
-					}
-
-					Variant::Operator var_op = _get_variant_operation(op->op);
-					bool valid = false;
-					node_type = _get_operation_type(var_op, argument_type, argument_type, valid);
-
-					if (check_types && !valid) {
-						_set_error("Invalid operand type (\"" + argument_type.to_string() +
-										   "\") to unary operator \"" + Variant::get_operator_name(var_op) + "\".",
-								op->line, op->column);
-						return DataType();
-					}
-
-				} break;
-				// Binary operators
-				case OperatorNode::OP_IN:
-				case OperatorNode::OP_EQUAL:
-				case OperatorNode::OP_NOT_EQUAL:
-				case OperatorNode::OP_LESS:
-				case OperatorNode::OP_LESS_EQUAL:
-				case OperatorNode::OP_GREATER:
-				case OperatorNode::OP_GREATER_EQUAL:
-				case OperatorNode::OP_AND:
-				case OperatorNode::OP_OR:
-				case OperatorNode::OP_ADD:
-				case OperatorNode::OP_SUB:
-				case OperatorNode::OP_MUL:
-				case OperatorNode::OP_DIV:
-				case OperatorNode::OP_MOD:
-				case OperatorNode::OP_SHIFT_LEFT:
-				case OperatorNode::OP_SHIFT_RIGHT:
-				case OperatorNode::OP_BIT_AND:
-				case OperatorNode::OP_BIT_OR:
-				case OperatorNode::OP_BIT_XOR: {
-
-					if (op->arguments.size() != 2) {
-						_set_error("Parser bug: binary operation without 2 arguments.", op->line);
-						ERR_FAIL_V(DataType());
-					}
-
-					DataType argument_a_type = _reduce_node_type(op->arguments[0]);
-					DataType argument_b_type = _reduce_node_type(op->arguments[1]);
-					if (!argument_a_type.has_type || !argument_b_type.has_type) {
-						_mark_line_as_unsafe(op->line);
-						break;
-					}
-
-					Variant::Operator var_op = _get_variant_operation(op->op);
-					bool valid = false;
-					node_type = _get_operation_type(var_op, argument_a_type, argument_b_type, valid);
-
-					if (check_types && !valid) {
-						_set_error("Invalid operand types (\"" + argument_a_type.to_string() + "\" and \"" +
-										   argument_b_type.to_string() + "\") to operator \"" + Variant::get_operator_name(var_op) + "\".",
-								op->line, op->column);
-						return DataType();
-					}
-#ifdef DEBUG_ENABLED
-					if (var_op == Variant::OP_DIVIDE && argument_a_type.kind == DataType::BUILTIN && argument_a_type.builtin_type == Variant::INT &&
-							argument_b_type.kind == DataType::BUILTIN && argument_b_type.builtin_type == Variant::INT) {
-						_add_warning(GDScriptWarning::INTEGER_DIVISION, op->line);
-					}
-#endif // DEBUG_ENABLED
-
-				} break;
-				// Ternary operators
-				case OperatorNode::OP_TERNARY_IF: {
-					if (op->arguments.size() != 3) {
-						_set_error("Parser bug: ternary operation without 3 arguments.");
-						ERR_FAIL_V(DataType());
-					}
-
-					DataType true_type = _reduce_node_type(op->arguments[1]);
-					DataType false_type = _reduce_node_type(op->arguments[2]);
-					// Check arguments[0] errors.
-					_reduce_node_type(op->arguments[0]);
-
-					// If types are equal, then the expression is of the same type
-					// If they are compatible, return the broader type
-					if (true_type == false_type || _is_type_compatible(true_type, false_type)) {
-						node_type = true_type;
-					} else if (_is_type_compatible(false_type, true_type)) {
-						node_type = false_type;
-					} else {
-#ifdef DEBUG_ENABLED
-						_add_warning(GDScriptWarning::INCOMPATIBLE_TERNARY, op->line);
-#endif // DEBUG_ENABLED
-					}
-				} break;
-				// Assignment should never happen within an expression
-				case OperatorNode::OP_ASSIGN:
-				case OperatorNode::OP_ASSIGN_ADD:
-				case OperatorNode::OP_ASSIGN_SUB:
-				case OperatorNode::OP_ASSIGN_MUL:
-				case OperatorNode::OP_ASSIGN_DIV:
-				case OperatorNode::OP_ASSIGN_MOD:
-				case OperatorNode::OP_ASSIGN_SHIFT_LEFT:
-				case OperatorNode::OP_ASSIGN_SHIFT_RIGHT:
-				case OperatorNode::OP_ASSIGN_BIT_AND:
-				case OperatorNode::OP_ASSIGN_BIT_OR:
-				case OperatorNode::OP_ASSIGN_BIT_XOR:
-				case OperatorNode::OP_INIT_ASSIGN: {
-
-					_set_error("Assignment inside an expression isn't allowed (parser bug?).", op->line);
-					return DataType();
-
-				} break;
-				case OperatorNode::OP_INDEX_NAMED: {
-					if (op->arguments.size() != 2) {
-						_set_error("Parser bug: named index with invalid arguments.", op->line);
-						ERR_FAIL_V(DataType());
-					}
-					if (op->arguments[1]->type != Node::TYPE_IDENTIFIER) {
-						_set_error("Parser bug: named index without identifier argument.", op->line);
-						ERR_FAIL_V(DataType());
-					}
-
-					DataType base_type = _reduce_node_type(op->arguments[0]);
-					IdentifierNode *member_id = static_cast<IdentifierNode *>(op->arguments[1]);
-
-					if (base_type.has_type) {
-						if (check_types && base_type.kind == DataType::BUILTIN) {
-							// Variant type, just test if it's possible
-							DataType result;
-							switch (base_type.builtin_type) {
-								case Variant::NIL:
-								case Variant::DICTIONARY: {
-									result.has_type = false;
-								} break;
-								default: {
-									Variant::CallError err;
-									Variant temp = Variant::construct(base_type.builtin_type, NULL, 0, err);
-
-									bool valid = false;
-									Variant res = temp.get(member_id->name.operator String(), &valid);
-
-									if (valid) {
-										result = _type_from_variant(res);
-									} else if (check_types) {
-										_set_error("Can't get index \"" + String(member_id->name.operator String()) + "\" on base \"" +
-														   base_type.to_string() + "\".",
-												op->line);
-										return DataType();
-									}
-								} break;
-							}
-							result.is_constant = false;
-							node_type = result;
-						} else {
-							node_type = _reduce_identifier_type(&base_type, member_id->name, op->line, true);
-#ifdef DEBUG_ENABLED
-							if (!node_type.has_type) {
-								_add_warning(GDScriptWarning::UNSAFE_PROPERTY_ACCESS, op->line, member_id->name.operator String(), base_type.to_string());
-							}
-#endif // DEBUG_ENABLED
-						}
-					} else {
-						_mark_line_as_unsafe(op->line);
-					}
-					if (error_set) {
-						return DataType();
-					}
-				} break;
-				case OperatorNode::OP_INDEX: {
-
-					if (op->arguments[1]->type == Node::TYPE_CONSTANT) {
-						ConstantNode *cn = static_cast<ConstantNode *>(op->arguments[1]);
-						if (cn->value.get_type() == Variant::STRING) {
-							// Treat this as named indexing
-
-							IdentifierNode *id = alloc_node<IdentifierNode>();
-							id->name = cn->value.operator StringName();
-
-							op->op = OperatorNode::OP_INDEX_NAMED;
-							op->arguments.write[1] = id;
-
-							return _reduce_node_type(op);
-						}
-					}
-
-					DataType base_type = _reduce_node_type(op->arguments[0]);
-					DataType index_type = _reduce_node_type(op->arguments[1]);
-
-					if (!base_type.has_type) {
-						_mark_line_as_unsafe(op->line);
-						break;
-					}
-
-					if (check_types && index_type.has_type) {
-						if (base_type.kind == DataType::BUILTIN) {
-							// Check if indexing is valid
-							bool error = index_type.kind != DataType::BUILTIN && base_type.builtin_type != Variant::DICTIONARY;
-							if (!error) {
-								switch (base_type.builtin_type) {
-									// Expect int or real as index
-									case Variant::POOL_BYTE_ARRAY:
-									case Variant::POOL_COLOR_ARRAY:
-									case Variant::POOL_INT_ARRAY:
-									case Variant::POOL_REAL_ARRAY:
-									case Variant::POOL_STRING_ARRAY:
-									case Variant::POOL_VECTOR2_ARRAY:
-									case Variant::POOL_VECTOR3_ARRAY:
-									case Variant::ARRAY:
-									case Variant::STRING: {
-										error = index_type.builtin_type != Variant::INT && index_type.builtin_type != Variant::REAL;
-									} break;
-									// Expect String only
-									case Variant::RECT2:
-									case Variant::PLANE:
-									case Variant::QUAT:
-									case Variant::AABB:
-									case Variant::OBJECT: {
-										error = index_type.builtin_type != Variant::STRING;
-									} break;
-									// Expect String or number
-									case Variant::VECTOR2:
-									case Variant::VECTOR3:
-									case Variant::TRANSFORM2D:
-									case Variant::BASIS:
-									case Variant::TRANSFORM: {
-										error = index_type.builtin_type != Variant::INT && index_type.builtin_type != Variant::REAL &&
-												index_type.builtin_type != Variant::STRING;
-									} break;
-									// Expect String or int
-									case Variant::COLOR: {
-										error = index_type.builtin_type != Variant::INT && index_type.builtin_type != Variant::STRING;
-									} break;
-									default: {
-									}
-								}
-							}
-							if (error) {
-								_set_error("Invalid index type (" + index_type.to_string() + ") for base \"" + base_type.to_string() + "\".",
-										op->line);
-								return DataType();
-							}
 
-							if (op->arguments[1]->type == GDScriptParser::Node::TYPE_CONSTANT) {
-								ConstantNode *cn = static_cast<ConstantNode *>(op->arguments[1]);
-								// Index is a constant, just try it if possible
-								switch (base_type.builtin_type) {
-									// Arrays/string have variable indexing, can't test directly
-									case Variant::STRING:
-									case Variant::ARRAY:
-									case Variant::DICTIONARY:
-									case Variant::POOL_BYTE_ARRAY:
-									case Variant::POOL_COLOR_ARRAY:
-									case Variant::POOL_INT_ARRAY:
-									case Variant::POOL_REAL_ARRAY:
-									case Variant::POOL_STRING_ARRAY:
-									case Variant::POOL_VECTOR2_ARRAY:
-									case Variant::POOL_VECTOR3_ARRAY: {
-										break;
-									}
-									default: {
-										Variant::CallError err;
-										Variant temp = Variant::construct(base_type.builtin_type, NULL, 0, err);
-
-										bool valid = false;
-										Variant res = temp.get(cn->value, &valid);
-
-										if (valid) {
-											node_type = _type_from_variant(res);
-											node_type.is_constant = false;
-										} else if (check_types) {
-											_set_error("Can't get index \"" + String(cn->value) + "\" on base \"" +
-															   base_type.to_string() + "\".",
-													op->line);
-											return DataType();
-										}
-									} break;
-								}
-							} else {
-								_mark_line_as_unsafe(op->line);
-							}
-						} else if (!for_completion && (index_type.kind != DataType::BUILTIN || index_type.builtin_type != Variant::STRING)) {
-							_set_error("Only strings can be used as an index in the base type \"" + base_type.to_string() + "\".", op->line);
-							return DataType();
-						}
-					}
-					if (check_types && !node_type.has_type && base_type.kind == DataType::BUILTIN) {
-						// Can infer indexing type for some variant types
-						DataType result;
-						result.has_type = true;
-						result.kind = DataType::BUILTIN;
-						switch (base_type.builtin_type) {
-							// Can't index at all
-							case Variant::NIL:
-							case Variant::BOOL:
-							case Variant::INT:
-							case Variant::REAL:
-							case Variant::NODE_PATH:
-							case Variant::_RID: {
-								_set_error("Can't index on a value of type \"" + base_type.to_string() + "\".", op->line);
-								return DataType();
-							} break;
-								// Return int
-							case Variant::POOL_BYTE_ARRAY:
-							case Variant::POOL_INT_ARRAY: {
-								result.builtin_type = Variant::INT;
-							} break;
-								// Return real
-							case Variant::POOL_REAL_ARRAY:
-							case Variant::VECTOR2:
-							case Variant::VECTOR3:
-							case Variant::QUAT: {
-								result.builtin_type = Variant::REAL;
-							} break;
-								// Return color
-							case Variant::POOL_COLOR_ARRAY: {
-								result.builtin_type = Variant::COLOR;
-							} break;
-								// Return string
-							case Variant::POOL_STRING_ARRAY:
-							case Variant::STRING: {
-								result.builtin_type = Variant::STRING;
-							} break;
-								// Return Vector2
-							case Variant::POOL_VECTOR2_ARRAY:
-							case Variant::TRANSFORM2D:
-							case Variant::RECT2: {
-								result.builtin_type = Variant::VECTOR2;
-							} break;
-								// Return Vector3
-							case Variant::POOL_VECTOR3_ARRAY:
-							case Variant::AABB:
-							case Variant::BASIS: {
-								result.builtin_type = Variant::VECTOR3;
-							} break;
-								// Depends on the index
-							case Variant::TRANSFORM:
-							case Variant::PLANE:
-							case Variant::COLOR:
-							default: {
-								result.has_type = false;
-							} break;
-						}
-						node_type = result;
-					}
-				} break;
-				default: {
-					_set_error("Parser bug: unhandled operation.", op->line);
-					ERR_FAIL_V(DataType());
+				Variant value = static_cast<LiteralNode *>(argument)->value;
+				if (!Variant::can_convert_strict(value.get_type(), parameter.type)) {
+					push_error(vformat(R"(Expected %s as argument %d of annotation "%s").)", Variant::get_type_name(parameter.type), i + 1, p_annotation->name));
+					return false;
+				}
+				Callable::CallError error;
+				const Variant *args = &value;
+				p_annotation->resolved_arguments.push_back(Variant::construct(parameter.type, &(args), 1, error));
+				if (error.error != Callable::CallError::CALL_OK) {
+					push_error(vformat(R"(Expected %s as argument %d of annotation "%s").)", Variant::get_type_name(parameter.type), i + 1, p_annotation->name));
+					p_annotation->resolved_arguments.remove(p_annotation->resolved_arguments.size() - 1);
+					return false;
 				}
+				break;
 			}
-		} break;
-		default: {
 		}
 	}
 
-	node_type = _resolve_type(node_type, p_node->line);
-	p_node->set_datatype(node_type);
-	return node_type;
+	return true;
 }
 
-bool GDScriptParser::_get_function_signature(DataType &p_base_type, const StringName &p_function, DataType &r_return_type, List<DataType> &r_arg_types, int &r_default_arg_count, bool &r_static, bool &r_vararg) const {
-
-	r_static = false;
-	r_default_arg_count = 0;
+bool GDScriptParser::tool_annotation(const AnnotationNode *p_annotation, Node *p_node) {
+	this->_is_tool = true;
+	return true;
+}
 
-	DataType original_type = p_base_type;
-	ClassNode *base = NULL;
-	FunctionNode *callee = NULL;
+bool GDScriptParser::icon_annotation(const AnnotationNode *p_annotation, Node *p_node) {
+	ERR_FAIL_COND_V_MSG(p_node->type != Node::CLASS, false, R"("@icon" annotation can only be applied to classes.)");
+	ClassNode *p_class = static_cast<ClassNode *>(p_node);
+	p_class->icon_path = p_annotation->resolved_arguments[0];
+	return true;
+}
 
-	if (p_base_type.kind == DataType::CLASS) {
-		base = p_base_type.class_type;
-	}
+bool GDScriptParser::onready_annotation(const AnnotationNode *p_annotation, Node *p_node) {
+	ERR_FAIL_COND_V_MSG(p_node->type != Node::VARIABLE, false, R"("@onready" annotation can only be applied to class variables.)");
 
-	// Look up the current file (parse tree)
-	while (!callee && base) {
-		for (int i = 0; i < base->static_functions.size(); i++) {
-			FunctionNode *func = base->static_functions[i];
-			if (p_function == func->name) {
-				r_static = true;
-				callee = func;
-				break;
-			}
-		}
-		if (!callee && !p_base_type.is_meta_type) {
-			for (int i = 0; i < base->functions.size(); i++) {
-				FunctionNode *func = base->functions[i];
-				if (p_function == func->name) {
-					callee = func;
-					break;
-				}
-			}
-		}
-		p_base_type = base->base_type;
-		if (p_base_type.kind == DataType::CLASS) {
-			base = p_base_type.class_type;
-		} else {
-			break;
-		}
+	VariableNode *variable = static_cast<VariableNode *>(p_node);
+	if (variable->onready) {
+		push_error(R"("@onready" annotation can only be used once per variable.)");
+		return false;
 	}
+	variable->onready = true;
+	current_class->onready_used = true;
+	return true;
+}
 
-	if (callee) {
-		r_return_type = callee->get_datatype();
-		for (int i = 0; i < callee->argument_types.size(); i++) {
-			r_arg_types.push_back(callee->argument_types[i]);
-		}
-		r_default_arg_count = callee->default_values.size();
-		return true;
-	}
+template <PropertyHint t_hint, Variant::Type t_type>
+bool GDScriptParser::export_annotations(const AnnotationNode *p_annotation, Node *p_node) {
+	ERR_FAIL_COND_V_MSG(p_node->type != Node::VARIABLE, false, vformat(R"("%s" annotation can only be applied to variables.)", p_annotation->name));
 
-	// Nothing in current file, check parent script
-	Ref<GDScript> base_gdscript;
-	Ref<Script> base_script;
-	StringName native;
-	if (p_base_type.kind == DataType::GDSCRIPT) {
-		base_gdscript = p_base_type.script_type;
-		if (base_gdscript.is_null() || !base_gdscript->is_valid()) {
-			// GDScript wasn't properly compíled, don't bother trying
-			return false;
-		}
-	} else if (p_base_type.kind == DataType::SCRIPT) {
-		base_script = p_base_type.script_type;
-	} else if (p_base_type.kind == DataType::NATIVE) {
-		native = p_base_type.native_type;
+	VariableNode *variable = static_cast<VariableNode *>(p_node);
+	if (variable->exported) {
+		push_error(vformat(R"(Annotation "%s" cannot be used with another "@export" annotation.)", p_annotation->name), p_annotation);
+		return false;
 	}
 
-	while (base_gdscript.is_valid()) {
-		native = base_gdscript->get_instance_base_type();
-
-		Map<StringName, GDScriptFunction *> funcs = base_gdscript->get_member_functions();
+	variable->exported = true;
+	// TODO: Improving setting type, especially for range hints, which can be int or float.
+	variable->export_info.type = t_type;
+	variable->export_info.hint = t_hint;
 
-		if (funcs.has(p_function)) {
-			GDScriptFunction *f = funcs[p_function];
-			r_static = f->is_static();
-			r_default_arg_count = f->get_default_argument_count();
-			r_return_type = _type_from_gdtype(f->get_return_type());
-			for (int i = 0; i < f->get_argument_count(); i++) {
-				r_arg_types.push_back(_type_from_gdtype(f->get_argument_type(i)));
+	if (p_annotation->name == "@export") {
+		if (variable->datatype_specifier == nullptr) {
+			if (variable->initializer == nullptr) {
+				push_error(R"(Cannot use "@export" annotation with variable without type or initializer, since type can't be inferred.)", p_annotation);
+				return false;
 			}
-			return true;
-		}
-
-		base_gdscript = base_gdscript->get_base_script();
-	}
-
-	while (base_script.is_valid()) {
-		native = base_script->get_instance_base_type();
-		MethodInfo mi = base_script->get_method_info(p_function);
-
-		if (!(mi == MethodInfo())) {
-			r_return_type = _type_from_property(mi.return_val, false);
-			r_default_arg_count = mi.default_arguments.size();
-			for (List<PropertyInfo>::Element *E = mi.arguments.front(); E; E = E->next()) {
-				r_arg_types.push_back(_type_from_property(E->get()));
+			if (variable->initializer->type != Node::LITERAL) {
+				push_error(R"(To use "@export" annotation with type-less variable, the default value must be a literal.)", p_annotation);
+				return false;
 			}
-			return true;
-		}
-		base_script = base_script->get_base_script();
+			variable->export_info.type = static_cast<LiteralNode *>(variable->initializer)->value.get_type();
+		} // else: Actual type will be set by the analyzer, which can infer the proper type.
 	}
 
-	if (native == StringName()) {
-		// Empty native class, might happen in some Script implementations
-		// Just ignore it
-		return false;
+	String hint_string;
+	for (int i = 0; i < p_annotation->resolved_arguments.size(); i++) {
+		if (i > 0) {
+			hint_string += ",";
+		}
+		hint_string += String(p_annotation->resolved_arguments[i]);
 	}
 
-#ifdef DEBUG_METHODS_ENABLED
+	variable->export_info.hint_string = hint_string;
 
-	// Only native remains
-	if (!ClassDB::class_exists(native)) {
-		native = "_" + native.operator String();
-	}
-	if (!ClassDB::class_exists(native)) {
-		if (!check_types) return false;
-		ERR_FAIL_V_MSG(false, "Parser bug: Class '" + String(native) + "' not found.");
-	}
+	return true;
+}
 
-	MethodBind *method = ClassDB::get_method(native, p_function);
+bool GDScriptParser::warning_annotations(const AnnotationNode *p_annotation, Node *p_node) {
+	ERR_FAIL_V_MSG(false, "Not implemented.");
+}
 
-	if (!method) {
-		// Try virtual methods
-		List<MethodInfo> virtuals;
-		ClassDB::get_virtual_methods(native, &virtuals);
+template <MultiplayerAPI::RPCMode t_mode>
+bool GDScriptParser::network_annotations(const AnnotationNode *p_annotation, Node *p_node) {
+	ERR_FAIL_COND_V_MSG(p_node->type != Node::VARIABLE && p_node->type != Node::FUNCTION, false, vformat(R"("%s" annotation can only be applied to variables and functions.)", p_annotation->name));
 
-		for (const List<MethodInfo>::Element *E = virtuals.front(); E; E = E->next()) {
-			const MethodInfo &mi = E->get();
-			if (mi.name == p_function) {
-				r_default_arg_count = mi.default_arguments.size();
-				for (const List<PropertyInfo>::Element *pi = mi.arguments.front(); pi; pi = pi->next()) {
-					r_arg_types.push_back(_type_from_property(pi->get()));
-				}
-				r_return_type = _type_from_property(mi.return_val, false);
-				r_vararg = mi.flags & METHOD_FLAG_VARARG;
-				return true;
+	switch (p_node->type) {
+		case Node::VARIABLE: {
+			VariableNode *variable = static_cast<VariableNode *>(p_node);
+			if (variable->rpc_mode != MultiplayerAPI::RPC_MODE_DISABLED) {
+				push_error(R"(RPC annotations can only be used once per variable.)", p_annotation);
 			}
+			variable->rpc_mode = t_mode;
+			break;
 		}
-
-		// If the base is a script, it might be trying to access members of the Script class itself
-		if (original_type.is_meta_type && !(p_function == "new") && (original_type.kind == DataType::SCRIPT || original_type.kind == DataType::GDSCRIPT)) {
-			method = ClassDB::get_method(original_type.script_type->get_class_name(), p_function);
-
-			if (method) {
-				r_static = true;
-			} else {
-				// Try virtual methods of the script type
-				virtuals.clear();
-				ClassDB::get_virtual_methods(original_type.script_type->get_class_name(), &virtuals);
-				for (const List<MethodInfo>::Element *E = virtuals.front(); E; E = E->next()) {
-					const MethodInfo &mi = E->get();
-					if (mi.name == p_function) {
-						r_default_arg_count = mi.default_arguments.size();
-						for (const List<PropertyInfo>::Element *pi = mi.arguments.front(); pi; pi = pi->next()) {
-							r_arg_types.push_back(_type_from_property(pi->get()));
-						}
-						r_return_type = _type_from_property(mi.return_val, false);
-						r_static = true;
-						r_vararg = mi.flags & METHOD_FLAG_VARARG;
-						return true;
-					}
-				}
-				return false;
+		case Node::FUNCTION: {
+			FunctionNode *function = static_cast<FunctionNode *>(p_node);
+			if (function->rpc_mode != MultiplayerAPI::RPC_MODE_DISABLED) {
+				push_error(R"(RPC annotations can only be used once per function.)", p_annotation);
 			}
-		} else {
-			return false;
+			function->rpc_mode = t_mode;
+			break;
 		}
+		default:
+			return false; // Unreachable.
 	}
 
-	r_default_arg_count = method->get_default_argument_count();
-	r_return_type = _type_from_property(method->get_return_info(), false);
-	r_vararg = method->is_vararg();
-
-	for (int i = 0; i < method->get_argument_count(); i++) {
-		r_arg_types.push_back(_type_from_property(method->get_argument_info(i)));
-	}
 	return true;
-#else
-	return false;
-#endif
 }
 
-GDScriptParser::DataType GDScriptParser::_reduce_function_call_type(const OperatorNode *p_call) {
-	if (p_call->arguments.size() < 1) {
-		_set_error("Parser bug: function call without enough arguments.", p_call->line);
-		ERR_FAIL_V(DataType());
-	}
-
-	DataType return_type;
-	List<DataType> arg_types;
-	int default_args_count = 0;
-	int arg_count = p_call->arguments.size();
-	String callee_name;
-	bool is_vararg = false;
-
-	switch (p_call->arguments[0]->type) {
-		case GDScriptParser::Node::TYPE_TYPE: {
-			// Built-in constructor, special case
-			TypeNode *tn = static_cast<TypeNode *>(p_call->arguments[0]);
-
-			Vector<DataType> par_types;
-			par_types.resize(p_call->arguments.size() - 1);
-			for (int i = 1; i < p_call->arguments.size(); i++) {
-				par_types.write[i - 1] = _reduce_node_type(p_call->arguments[i]);
-			}
-
-			if (error_set) return DataType();
-
-			// Special case: check copy constructor. Those are defined implicitly in Variant.
-			if (par_types.size() == 1) {
-				if (!par_types[0].has_type || (par_types[0].kind == DataType::BUILTIN && par_types[0].builtin_type == tn->vtype)) {
-					DataType result;
-					result.has_type = true;
-					result.kind = DataType::BUILTIN;
-					result.builtin_type = tn->vtype;
-					return result;
-				}
-			}
-
-			bool match = false;
-			List<MethodInfo> constructors;
-			Variant::get_constructor_list(tn->vtype, &constructors);
-			PropertyInfo return_type2;
-
-			for (List<MethodInfo>::Element *E = constructors.front(); E; E = E->next()) {
-				MethodInfo &mi = E->get();
-
-				if (p_call->arguments.size() - 1 < mi.arguments.size() - mi.default_arguments.size()) {
-					continue;
-				}
-				if (p_call->arguments.size() - 1 > mi.arguments.size()) {
-					continue;
-				}
-
-				bool types_match = true;
-				for (int i = 0; i < par_types.size(); i++) {
-					DataType arg_type;
-					if (mi.arguments[i].type != Variant::NIL) {
-						arg_type.has_type = true;
-						arg_type.kind = mi.arguments[i].type == Variant::OBJECT ? DataType::NATIVE : DataType::BUILTIN;
-						arg_type.builtin_type = mi.arguments[i].type;
-						arg_type.native_type = mi.arguments[i].class_name;
-					}
-
-					if (!_is_type_compatible(arg_type, par_types[i], true)) {
-						types_match = false;
-						break;
-					} else {
-#ifdef DEBUG_ENABLED
-						if (arg_type.kind == DataType::BUILTIN && arg_type.builtin_type == Variant::INT && par_types[i].kind == DataType::BUILTIN && par_types[i].builtin_type == Variant::REAL) {
-							_add_warning(GDScriptWarning::NARROWING_CONVERSION, p_call->line, Variant::get_type_name(tn->vtype));
-						}
-						if (par_types[i].may_yield && p_call->arguments[i + 1]->type == Node::TYPE_OPERATOR) {
-							_add_warning(GDScriptWarning::FUNCTION_MAY_YIELD, p_call->line, _find_function_name(static_cast<OperatorNode *>(p_call->arguments[i + 1])));
-						}
-#endif // DEBUG_ENABLED
-					}
-				}
-
-				if (types_match) {
-					match = true;
-					return_type2 = mi.return_val;
-					break;
-				}
-			}
-
-			if (match) {
-				return _type_from_property(return_type2, false);
-			} else if (check_types) {
-				String err = "No constructor of '";
-				err += Variant::get_type_name(tn->vtype);
-				err += "' matches the signature '";
-				err += Variant::get_type_name(tn->vtype) + "(";
-				for (int i = 0; i < par_types.size(); i++) {
-					if (i > 0) err += ", ";
-					err += par_types[i].to_string();
-				}
-				err += ")'.";
-				_set_error(err, p_call->line, p_call->column);
-				return DataType();
-			}
+GDScriptParser::DataType GDScriptParser::SuiteNode::Local::get_datatype() const {
+	switch (type) {
+		case CONSTANT:
+			return constant->get_datatype();
+		case VARIABLE:
+			return variable->get_datatype();
+		case PARAMETER:
+			return parameter->get_datatype();
+		case FOR_VARIABLE:
+		case PATTERN_BIND:
+			return bind->get_datatype();
+		case UNDEFINED:
 			return DataType();
-		} break;
-		case GDScriptParser::Node::TYPE_BUILT_IN_FUNCTION: {
-			BuiltInFunctionNode *func = static_cast<BuiltInFunctionNode *>(p_call->arguments[0]);
-			MethodInfo mi = GDScriptFunctions::get_info(func->function);
-
-			return_type = _type_from_property(mi.return_val, false);
-
-			// Check all arguments beforehand to solve warnings
-			for (int i = 1; i < p_call->arguments.size(); i++) {
-				_reduce_node_type(p_call->arguments[i]);
-			}
-
-			// Check arguments
-
-			is_vararg = mi.flags & METHOD_FLAG_VARARG;
-
-			default_args_count = mi.default_arguments.size();
-			callee_name = mi.name;
-			arg_count -= 1;
-
-			// Check each argument type
-			for (List<PropertyInfo>::Element *E = mi.arguments.front(); E; E = E->next()) {
-				arg_types.push_back(_type_from_property(E->get()));
-			}
-		} break;
-		default: {
-			if (p_call->op == OperatorNode::OP_CALL && p_call->arguments.size() < 2) {
-				_set_error("Parser bug: self method call without enough arguments.", p_call->line);
-				ERR_FAIL_V(DataType());
-			}
-
-			int arg_id = p_call->op == OperatorNode::OP_CALL ? 1 : 0;
-
-			if (p_call->arguments[arg_id]->type != Node::TYPE_IDENTIFIER) {
-				_set_error("Parser bug: invalid function call argument.", p_call->line);
-				ERR_FAIL_V(DataType());
-			}
-
-			// Check all arguments beforehand to solve warnings
-			for (int i = arg_id + 1; i < p_call->arguments.size(); i++) {
-				_reduce_node_type(p_call->arguments[i]);
-			}
-
-			IdentifierNode *func_id = static_cast<IdentifierNode *>(p_call->arguments[arg_id]);
-			callee_name = func_id->name;
-			arg_count -= 1 + arg_id;
-
-			DataType base_type;
-			if (p_call->op == OperatorNode::OP_PARENT_CALL) {
-				base_type = current_class->base_type;
-			} else {
-				base_type = _reduce_node_type(p_call->arguments[0]);
-			}
-
-			if (!base_type.has_type || (base_type.kind == DataType::BUILTIN && base_type.builtin_type == Variant::NIL)) {
-				_mark_line_as_unsafe(p_call->line);
-				return DataType();
-			}
-
-			if (base_type.kind == DataType::BUILTIN) {
-				Variant::CallError err;
-				Variant tmp = Variant::construct(base_type.builtin_type, NULL, 0, err);
-
-				if (check_types) {
-					if (!tmp.has_method(callee_name)) {
-						_set_error("The method \"" + callee_name + "\" isn't declared on base \"" + base_type.to_string() + "\".", p_call->line);
-						return DataType();
-					}
-
-					default_args_count = Variant::get_method_default_arguments(base_type.builtin_type, callee_name).size();
-					const Vector<Variant::Type> &var_arg_types = Variant::get_method_argument_types(base_type.builtin_type, callee_name);
-
-					for (int i = 0; i < var_arg_types.size(); i++) {
-						DataType argtype;
-						if (var_arg_types[i] != Variant::NIL) {
-							argtype.has_type = true;
-							argtype.kind = DataType::BUILTIN;
-							argtype.builtin_type = var_arg_types[i];
-						}
-						arg_types.push_back(argtype);
-					}
-				}
-
-				bool rets = false;
-				return_type.has_type = true;
-				return_type.kind = DataType::BUILTIN;
-				return_type.builtin_type = Variant::get_method_return_type(base_type.builtin_type, callee_name, &rets);
-				// If the method returns, but it might return any type, (Variant::NIL), pretend we don't know the type.
-				// At least make sure we know that it returns
-				if (rets && return_type.builtin_type == Variant::NIL) {
-					return_type.has_type = false;
-				}
-				break;
-			}
-
-			DataType original_type = base_type;
-			bool is_initializer = callee_name == "new";
-			bool is_static = false;
-			bool valid = false;
-
-			if (is_initializer && original_type.is_meta_type) {
-				// Try to check it as initializer
-				base_type = original_type;
-				callee_name = "_init";
-				base_type.is_meta_type = false;
-
-				valid = _get_function_signature(base_type, callee_name, return_type, arg_types,
-						default_args_count, is_static, is_vararg);
-
-				return_type = original_type;
-				return_type.is_meta_type = false;
-
-				valid = true; // There's always an initializer, we can assume this is true
-			}
+	}
+	return DataType();
+}
 
-			if (!valid) {
-				base_type = original_type;
-				return_type = DataType();
-				valid = _get_function_signature(base_type, callee_name, return_type, arg_types,
-						default_args_count, is_static, is_vararg);
-			}
+String GDScriptParser::SuiteNode::Local::get_name() const {
+	String name;
+	switch (type) {
+		case SuiteNode::Local::PARAMETER:
+			name = "parameter";
+			break;
+		case SuiteNode::Local::CONSTANT:
+			name = "constant";
+			break;
+		case SuiteNode::Local::VARIABLE:
+			name = "variable";
+			break;
+		case SuiteNode::Local::FOR_VARIABLE:
+			name = "for loop iterator";
+			break;
+		case SuiteNode::Local::PATTERN_BIND:
+			name = "pattern_bind";
+			break;
+		case SuiteNode::Local::UNDEFINED:
+			name = "<undefined>";
+			break;
+	}
+	return name;
+}
 
-			if (!valid) {
-#ifdef DEBUG_ENABLED
-				if (p_call->arguments[0]->type == Node::TYPE_SELF) {
-					_set_error("The method \"" + callee_name + "\" isn't declared in the current class.", p_call->line);
-					return DataType();
-				}
-				DataType tmp_type;
-				valid = _get_member_type(original_type, func_id->name, tmp_type);
-				if (valid) {
-					if (tmp_type.is_constant) {
-						_add_warning(GDScriptWarning::CONSTANT_USED_AS_FUNCTION, p_call->line, callee_name, original_type.to_string());
-					} else {
-						_add_warning(GDScriptWarning::PROPERTY_USED_AS_FUNCTION, p_call->line, callee_name, original_type.to_string());
-					}
-				}
-				_add_warning(GDScriptWarning::UNSAFE_METHOD_ACCESS, p_call->line, callee_name, original_type.to_string());
-				_mark_line_as_unsafe(p_call->line);
-#endif // DEBUG_ENABLED
-				return DataType();
+String GDScriptParser::DataType::to_string() const {
+	switch (kind) {
+		case VARIANT:
+			return "Variant";
+		case BUILTIN:
+			if (builtin_type == Variant::NIL) {
+				return "null";
 			}
-
-#ifdef DEBUG_ENABLED
-			if (current_function && !for_completion && !is_static && p_call->arguments[0]->type == Node::TYPE_SELF && current_function->_static) {
-				_set_error("Can't call non-static function from a static function.", p_call->line);
-				return DataType();
+			return Variant::get_type_name(builtin_type);
+		case NATIVE:
+			if (is_meta_type) {
+				return GDScriptNativeClass::get_class_static();
 			}
-
-			if (check_types && !is_static && !is_initializer && base_type.is_meta_type) {
-				_set_error("Non-static function \"" + String(callee_name) + "\" can only be called from an instance.", p_call->line);
-				return DataType();
+			return native_type.operator String();
+		case CLASS:
+			if (is_meta_type) {
+				return GDScript::get_class_static();
 			}
-
-			// Check signal emission for warnings
-			if (callee_name == "emit_signal" && p_call->op == OperatorNode::OP_CALL && p_call->arguments[0]->type == Node::TYPE_SELF && p_call->arguments.size() >= 3 && p_call->arguments[2]->type == Node::TYPE_CONSTANT) {
-				ConstantNode *sig = static_cast<ConstantNode *>(p_call->arguments[2]);
-				String emitted = sig->value.get_type() == Variant::STRING ? sig->value.operator String() : "";
-				for (int i = 0; i < current_class->_signals.size(); i++) {
-					if (current_class->_signals[i].name == emitted) {
-						current_class->_signals.write[i].emissions += 1;
-						break;
-					}
-				}
+			if (class_type->identifier != nullptr) {
+				return class_type->identifier->name.operator String();
 			}
-#endif // DEBUG_ENABLED
-		} break;
-	}
-
-#ifdef DEBUG_ENABLED
-	if (!check_types) {
-		return return_type;
-	}
-
-	if (arg_count < arg_types.size() - default_args_count) {
-		_set_error("Too few arguments for \"" + callee_name + "()\" call. Expected at least " + itos(arg_types.size() - default_args_count) + ".", p_call->line);
-		return return_type;
-	}
-	if (!is_vararg && arg_count > arg_types.size()) {
-		_set_error("Too many arguments for \"" + callee_name + "()\" call. Expected at most " + itos(arg_types.size()) + ".", p_call->line);
-		return return_type;
-	}
-
-	int arg_diff = p_call->arguments.size() - arg_count;
-	for (int i = arg_diff; i < p_call->arguments.size(); i++) {
-		DataType par_type = _reduce_node_type(p_call->arguments[i]);
-
-		if ((i - arg_diff) >= arg_types.size()) {
-			continue;
-		}
-
-		DataType arg_type = arg_types[i - arg_diff];
-
-		if (!par_type.has_type) {
-			_mark_line_as_unsafe(p_call->line);
-			if (par_type.may_yield && p_call->arguments[i]->type == Node::TYPE_OPERATOR) {
-				_add_warning(GDScriptWarning::FUNCTION_MAY_YIELD, p_call->line, _find_function_name(static_cast<OperatorNode *>(p_call->arguments[i])));
+			return class_type->fqcn;
+		case SCRIPT: {
+			if (is_meta_type) {
+				return script_type->get_class_name().operator String();
 			}
-		} else if (!_is_type_compatible(arg_types[i - arg_diff], par_type, true)) {
-			// Supertypes are acceptable for dynamic compliance
-			if (!_is_type_compatible(par_type, arg_types[i - arg_diff])) {
-				_set_error("At \"" + callee_name + "()\" call, argument " + itos(i - arg_diff + 1) + ". Assigned type (" +
-								   par_type.to_string() + ") doesn't match the function argument's type (" +
-								   arg_types[i - arg_diff].to_string() + ").",
-						p_call->line);
-				return DataType();
-			} else {
-				_mark_line_as_unsafe(p_call->line);
+			String name = script_type->get_name();
+			if (!name.empty()) {
+				return name;
 			}
-		} else {
-			if (arg_type.kind == DataType::BUILTIN && arg_type.builtin_type == Variant::INT && par_type.kind == DataType::BUILTIN && par_type.builtin_type == Variant::REAL) {
-				_add_warning(GDScriptWarning::NARROWING_CONVERSION, p_call->line, callee_name);
+			name = script_path;
+			if (!name.empty()) {
+				return name;
 			}
+			return native_type.operator String();
 		}
+		case ENUM:
+			return enum_type.operator String() + " (enum)";
+		case ENUM_VALUE:
+			return enum_type.operator String() + " (enum value)";
+		case UNRESOLVED:
+			return "<unresolved type>";
 	}
 
-#endif // DEBUG_ENABLED
-
-	return return_type;
+	ERR_FAIL_V_MSG("<unresolved type", "Kind set outside the enum range.");
 }
 
-bool GDScriptParser::_get_member_type(const DataType &p_base_type, const StringName &p_member, DataType &r_member_type) const {
-	DataType base_type = p_base_type;
+/*---------- PRETTY PRINT FOR DEBUG ----------*/
 
-	// Check classes in current file
-	ClassNode *base = NULL;
-	if (base_type.kind == DataType::CLASS) {
-		base = base_type.class_type;
-	}
-
-	while (base) {
-		if (base->constant_expressions.has(p_member)) {
-			r_member_type = base->constant_expressions[p_member].expression->get_datatype();
-			return true;
-		}
-
-		if (!base_type.is_meta_type) {
-			for (int i = 0; i < base->variables.size(); i++) {
-				if (base->variables[i].identifier == p_member) {
-					r_member_type = base->variables[i].data_type;
-					base->variables.write[i].usages += 1;
-					return true;
-				}
-			}
-		} else {
-			for (int i = 0; i < base->subclasses.size(); i++) {
-				ClassNode *c = base->subclasses[i];
-				if (c->name == p_member) {
-					DataType class_type;
-					class_type.has_type = true;
-					class_type.is_constant = true;
-					class_type.is_meta_type = true;
-					class_type.kind = DataType::CLASS;
-					class_type.class_type = c;
-					r_member_type = class_type;
-					return true;
-				}
-			}
-		}
+#ifdef DEBUG_ENABLED
 
-		base_type = base->base_type;
-		if (base_type.kind == DataType::CLASS) {
-			base = base_type.class_type;
+void GDScriptParser::TreePrinter::increase_indent() {
+	indent_level++;
+	indent = "";
+	for (int i = 0; i < indent_level * 4; i++) {
+		if (i % 4 == 0) {
+			indent += "|";
 		} else {
-			break;
+			indent += " ";
 		}
 	}
+}
 
-	Ref<GDScript> gds;
-	if (base_type.kind == DataType::GDSCRIPT) {
-		gds = base_type.script_type;
-		if (gds.is_null() || !gds->is_valid()) {
-			// GDScript wasn't properly compíled, don't bother trying
-			return false;
+void GDScriptParser::TreePrinter::decrease_indent() {
+	indent_level--;
+	indent = "";
+	for (int i = 0; i < indent_level * 4; i++) {
+		if (i % 4 == 0) {
+			indent += "|";
+		} else {
+			indent += " ";
 		}
 	}
+}
 
-	Ref<Script> scr;
-	if (base_type.kind == DataType::SCRIPT) {
-		scr = base_type.script_type;
+void GDScriptParser::TreePrinter::push_line(const String &p_line) {
+	if (!p_line.empty()) {
+		push_text(p_line);
 	}
+	printed += "\n";
+	pending_indent = true;
+}
 
-	StringName native;
-	if (base_type.kind == DataType::NATIVE) {
-		native = base_type.native_type;
+void GDScriptParser::TreePrinter::push_text(const String &p_text) {
+	if (pending_indent) {
+		printed += indent;
+		pending_indent = false;
 	}
+	printed += p_text;
+}
 
-	// Check GDScripts
-	while (gds.is_valid()) {
-		if (gds->get_constants().has(p_member)) {
-			Variant c = gds->get_constants()[p_member];
-			r_member_type = _type_from_variant(c);
-			return true;
-		}
-
-		if (!base_type.is_meta_type) {
-			if (gds->get_members().has(p_member)) {
-				r_member_type = _type_from_gdtype(gds->get_member_type(p_member));
-				return true;
-			}
-		}
-
-		native = gds->get_instance_base_type();
-		if (gds->get_base_script().is_valid()) {
-			gds = gds->get_base_script();
-			scr = gds->get_base_script();
-			bool is_meta = base_type.is_meta_type;
-			base_type = _type_from_variant(scr.operator Variant());
-			base_type.is_meta_type = is_meta;
-		} else {
-			break;
+void GDScriptParser::TreePrinter::print_annotation(AnnotationNode *p_annotation) {
+	push_text(p_annotation->name);
+	push_text(" (");
+	for (int i = 0; i < p_annotation->arguments.size(); i++) {
+		if (i > 0) {
+			push_text(" , ");
 		}
+		print_expression(p_annotation->arguments[i]);
 	}
+	push_line(")");
+}
 
-	// Check other script types
-	while (scr.is_valid()) {
-		Map<StringName, Variant> constants;
-		scr->get_constants(&constants);
-		if (constants.has(p_member)) {
-			r_member_type = _type_from_variant(constants[p_member]);
-			return true;
+void GDScriptParser::TreePrinter::print_array(ArrayNode *p_array) {
+	push_text("[ ");
+	for (int i = 0; i < p_array->elements.size(); i++) {
+		if (i > 0) {
+			push_text(" , ");
 		}
+		print_expression(p_array->elements[i]);
+	}
+	push_text(" ]");
+}
 
-		List<PropertyInfo> properties;
-		scr->get_script_property_list(&properties);
-		for (List<PropertyInfo>::Element *E = properties.front(); E; E = E->next()) {
-			if (E->get().name == p_member) {
-				r_member_type = _type_from_property(E->get());
-				return true;
-			}
-		}
+void GDScriptParser::TreePrinter::print_assert(AssertNode *p_assert) {
+	push_text("Assert ( ");
+	print_expression(p_assert->condition);
+	push_line(" )");
+}
 
-		base_type = _type_from_variant(scr.operator Variant());
-		native = scr->get_instance_base_type();
-		scr = scr->get_base_script();
+void GDScriptParser::TreePrinter::print_assignment(AssignmentNode *p_assignment) {
+	switch (p_assignment->assignee->type) {
+		case Node::IDENTIFIER:
+			print_identifier(static_cast<IdentifierNode *>(p_assignment->assignee));
+			break;
+		case Node::SUBSCRIPT:
+			print_subscript(static_cast<SubscriptNode *>(p_assignment->assignee));
+			break;
+		default:
+			break; // Unreachable.
 	}
 
-	if (native == StringName()) {
-		// Empty native class, might happen in some Script implementations
-		// Just ignore it
-		return false;
+	push_text(" ");
+	switch (p_assignment->operation) {
+		case AssignmentNode::OP_ADDITION:
+			push_text("+");
+			break;
+		case AssignmentNode::OP_SUBTRACTION:
+			push_text("-");
+			break;
+		case AssignmentNode::OP_MULTIPLICATION:
+			push_text("*");
+			break;
+		case AssignmentNode::OP_DIVISION:
+			push_text("/");
+			break;
+		case AssignmentNode::OP_MODULO:
+			push_text("%");
+			break;
+		case AssignmentNode::OP_BIT_SHIFT_LEFT:
+			push_text("<<");
+			break;
+		case AssignmentNode::OP_BIT_SHIFT_RIGHT:
+			push_text(">>");
+			break;
+		case AssignmentNode::OP_BIT_AND:
+			push_text("&");
+			break;
+		case AssignmentNode::OP_BIT_OR:
+			push_text("|");
+			break;
+		case AssignmentNode::OP_BIT_XOR:
+			push_text("^");
+			break;
+		case AssignmentNode::OP_NONE:
+			break;
 	}
+	push_text("= ");
+	print_expression(p_assignment->assigned_value);
+	push_line();
+}
 
-	// Check ClassDB
-	if (!ClassDB::class_exists(native)) {
-		native = "_" + native.operator String();
-	}
-	if (!ClassDB::class_exists(native)) {
-		if (!check_types) return false;
-		ERR_FAIL_V_MSG(false, "Parser bug: Class \"" + String(native) + "\" not found.");
-	}
+void GDScriptParser::TreePrinter::print_await(AwaitNode *p_await) {
+	push_text("Await ");
+	print_expression(p_await->to_await);
+}
 
-	bool valid = false;
-	ClassDB::get_integer_constant(native, p_member, &valid);
-	if (valid) {
-		DataType ct;
-		ct.has_type = true;
-		ct.is_constant = true;
-		ct.kind = DataType::BUILTIN;
-		ct.builtin_type = Variant::INT;
-		r_member_type = ct;
-		return true;
+void GDScriptParser::TreePrinter::print_binary_op(BinaryOpNode *p_binary_op) {
+	// Surround in parenthesis for disambiguation.
+	push_text("(");
+	print_expression(p_binary_op->left_operand);
+	switch (p_binary_op->operation) {
+		case BinaryOpNode::OP_ADDITION:
+			push_text(" + ");
+			break;
+		case BinaryOpNode::OP_SUBTRACTION:
+			push_text(" - ");
+			break;
+		case BinaryOpNode::OP_MULTIPLICATION:
+			push_text(" * ");
+			break;
+		case BinaryOpNode::OP_DIVISION:
+			push_text(" / ");
+			break;
+		case BinaryOpNode::OP_MODULO:
+			push_text(" % ");
+			break;
+		case BinaryOpNode::OP_BIT_LEFT_SHIFT:
+			push_text(" << ");
+			break;
+		case BinaryOpNode::OP_BIT_RIGHT_SHIFT:
+			push_text(" >> ");
+			break;
+		case BinaryOpNode::OP_BIT_AND:
+			push_text(" & ");
+			break;
+		case BinaryOpNode::OP_BIT_OR:
+			push_text(" | ");
+			break;
+		case BinaryOpNode::OP_BIT_XOR:
+			push_text(" ^ ");
+			break;
+		case BinaryOpNode::OP_LOGIC_AND:
+			push_text(" AND ");
+			break;
+		case BinaryOpNode::OP_LOGIC_OR:
+			push_text(" OR ");
+			break;
+		case BinaryOpNode::OP_TYPE_TEST:
+			push_text(" IS ");
+			break;
+		case BinaryOpNode::OP_CONTENT_TEST:
+			push_text(" IN ");
+			break;
+		case BinaryOpNode::OP_COMP_EQUAL:
+			push_text(" == ");
+			break;
+		case BinaryOpNode::OP_COMP_NOT_EQUAL:
+			push_text(" != ");
+			break;
+		case BinaryOpNode::OP_COMP_LESS:
+			push_text(" < ");
+			break;
+		case BinaryOpNode::OP_COMP_LESS_EQUAL:
+			push_text(" <= ");
+			break;
+		case BinaryOpNode::OP_COMP_GREATER:
+			push_text(" > ");
+			break;
+		case BinaryOpNode::OP_COMP_GREATER_EQUAL:
+			push_text(" >= ");
+			break;
 	}
+	print_expression(p_binary_op->right_operand);
+	// Surround in parenthesis for disambiguation.
+	push_text(")");
+}
 
-	if (!base_type.is_meta_type) {
-		List<PropertyInfo> properties;
-		ClassDB::get_property_list(native, &properties);
-		for (List<PropertyInfo>::Element *E = properties.front(); E; E = E->next()) {
-			if (E->get().name == p_member) {
-				// Check if a getter exists
-				StringName getter_name = ClassDB::get_property_getter(native, p_member);
-				if (getter_name != StringName()) {
-					// Use the getter return type
-#ifdef DEBUG_METHODS_ENABLED
-					MethodBind *getter_method = ClassDB::get_method(native, getter_name);
-					if (getter_method) {
-						r_member_type = _type_from_property(getter_method->get_return_info());
-					} else {
-						r_member_type = DataType();
-					}
-#else
-					r_member_type = DataType();
-#endif
-				} else {
-					r_member_type = _type_from_property(E->get());
-				}
-				return true;
-			}
+void GDScriptParser::TreePrinter::print_call(CallNode *p_call) {
+	if (p_call->is_super) {
+		push_text("super");
+		if (p_call->callee != nullptr) {
+			push_text(".");
+			print_expression(p_call->callee);
 		}
+	} else {
+		print_expression(p_call->callee);
 	}
-
-	// If the base is a script, it might be trying to access members of the Script class itself
-	if (p_base_type.is_meta_type && (p_base_type.kind == DataType::SCRIPT || p_base_type.kind == DataType::GDSCRIPT)) {
-		native = p_base_type.script_type->get_class_name();
-		ClassDB::get_integer_constant(native, p_member, &valid);
-		if (valid) {
-			DataType ct;
-			ct.has_type = true;
-			ct.is_constant = true;
-			ct.kind = DataType::BUILTIN;
-			ct.builtin_type = Variant::INT;
-			r_member_type = ct;
-			return true;
-		}
-
-		List<PropertyInfo> properties;
-		ClassDB::get_property_list(native, &properties);
-		for (List<PropertyInfo>::Element *E = properties.front(); E; E = E->next()) {
-			if (E->get().name == p_member) {
-				// Check if a getter exists
-				StringName getter_name = ClassDB::get_property_getter(native, p_member);
-				if (getter_name != StringName()) {
-					// Use the getter return type
-#ifdef DEBUG_METHODS_ENABLED
-					MethodBind *getter_method = ClassDB::get_method(native, getter_name);
-					if (getter_method) {
-						r_member_type = _type_from_property(getter_method->get_return_info());
-					} else {
-						r_member_type = DataType();
-					}
-#else
-					r_member_type = DataType();
-#endif
-				} else {
-					r_member_type = _type_from_property(E->get());
-				}
-				return true;
-			}
+	push_text("( ");
+	for (int i = 0; i < p_call->arguments.size(); i++) {
+		if (i > 0) {
+			push_text(" , ");
 		}
+		print_expression(p_call->arguments[i]);
 	}
-
-	return false;
+	push_text(" )");
 }
 
-GDScriptParser::DataType GDScriptParser::_reduce_identifier_type(const DataType *p_base_type, const StringName &p_identifier, int p_line, bool p_is_indexing) {
-
-	if (p_base_type && !p_base_type->has_type) {
-		return DataType();
-	}
-
-	DataType base_type;
-	DataType member_type;
+void GDScriptParser::TreePrinter::print_cast(CastNode *p_cast) {
+	print_expression(p_cast->operand);
+	push_text(" AS ");
+	print_type(p_cast->cast_type);
+}
 
-	if (!p_base_type) {
-		base_type.has_type = true;
-		base_type.is_constant = true;
-		base_type.kind = DataType::CLASS;
-		base_type.class_type = current_class;
+void GDScriptParser::TreePrinter::print_class(ClassNode *p_class) {
+	push_text("Class ");
+	if (p_class->identifier == nullptr) {
+		push_text("<unnamed>");
 	} else {
-		base_type = DataType(*p_base_type);
-	}
-
-	if (_get_member_type(base_type, p_identifier, member_type)) {
-		return member_type;
+		print_identifier(p_class->identifier);
 	}
 
-	if (p_is_indexing) {
-		// Don't look for globals since this is an indexed identifier
-		return DataType();
-	}
-
-	if (!p_base_type) {
-		// Possibly this is a global, check before failing
-
-		if (ClassDB::class_exists(p_identifier) || ClassDB::class_exists("_" + p_identifier.operator String())) {
-			DataType result;
-			result.has_type = true;
-			result.is_constant = true;
-			result.is_meta_type = true;
-			if (Engine::get_singleton()->has_singleton(p_identifier) || Engine::get_singleton()->has_singleton("_" + p_identifier.operator String())) {
-				result.is_meta_type = false;
-			}
-			result.kind = DataType::NATIVE;
-			result.native_type = p_identifier;
-			return result;
-		}
-
-		ClassNode *outer_class = current_class;
-		while (outer_class) {
-			if (outer_class->name == p_identifier) {
-				DataType result;
-				result.has_type = true;
-				result.is_constant = true;
-				result.is_meta_type = true;
-				result.kind = DataType::CLASS;
-				result.class_type = outer_class;
-				return result;
-			}
-			if (outer_class->constant_expressions.has(p_identifier)) {
-				return outer_class->constant_expressions[p_identifier].type;
-			}
-			for (int i = 0; i < outer_class->subclasses.size(); i++) {
-				if (outer_class->subclasses[i] == current_class) {
-					continue;
-				}
-				if (outer_class->subclasses[i]->name == p_identifier) {
-					DataType result;
-					result.has_type = true;
-					result.is_constant = true;
-					result.is_meta_type = true;
-					result.kind = DataType::CLASS;
-					result.class_type = outer_class->subclasses[i];
-					return result;
-				}
-			}
-			outer_class = outer_class->owner;
-		}
-
-		if (ScriptServer::is_global_class(p_identifier)) {
-			Ref<Script> scr = ResourceLoader::load(ScriptServer::get_global_class_path(p_identifier));
-			if (scr.is_valid()) {
-				DataType result;
-				result.has_type = true;
-				result.script_type = scr;
-				result.is_constant = true;
-				result.is_meta_type = true;
-				Ref<GDScript> gds = scr;
-				if (gds.is_valid()) {
-					if (!gds->is_valid()) {
-						_set_error("The class \"" + p_identifier + "\" couldn't be fully loaded (script error or cyclic dependency).");
-						return DataType();
-					}
-					result.kind = DataType::GDSCRIPT;
-				} else {
-					result.kind = DataType::SCRIPT;
-				}
-				return result;
+	if (p_class->extends_used) {
+		bool first = true;
+		push_text(" Extends ");
+		if (!p_class->extends_path.empty()) {
+			push_text(vformat(R"("%s")", p_class->extends_path));
+			first = false;
+		}
+		for (int i = 0; i < p_class->extends.size(); i++) {
+			if (!first) {
+				push_text(".");
+			} else {
+				first = false;
 			}
-			_set_error("The class \"" + p_identifier + "\" was found in global scope, but its script couldn't be loaded.");
-			return DataType();
-		}
-
-		if (GDScriptLanguage::get_singleton()->get_global_map().has(p_identifier)) {
-			int idx = GDScriptLanguage::get_singleton()->get_global_map()[p_identifier];
-			Variant g = GDScriptLanguage::get_singleton()->get_global_array()[idx];
-			return _type_from_variant(g);
-		}
-
-		if (GDScriptLanguage::get_singleton()->get_named_globals_map().has(p_identifier)) {
-			Variant g = GDScriptLanguage::get_singleton()->get_named_globals_map()[p_identifier];
-			return _type_from_variant(g);
+			push_text(p_class->extends[i]);
 		}
+	}
 
-		// Non-tool singletons aren't loaded, check project settings
-		List<PropertyInfo> props;
-		ProjectSettings::get_singleton()->get_property_list(&props);
+	push_line(" :");
 
-		for (List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) {
-			String s = E->get().name;
-			if (!s.begins_with("autoload/")) {
-				continue;
-			}
-			String name = s.get_slice("/", 1);
-			if (name == p_identifier) {
-				String script = ProjectSettings::get_singleton()->get(s);
-				if (script.begins_with("*")) {
-					script = script.right(1);
-				}
-				if (!script.begins_with("res://")) {
-					script = "res://" + script;
-				}
-				Ref<Script> singleton = ResourceLoader::load(script);
-				if (singleton.is_valid()) {
-					DataType result;
-					result.has_type = true;
-					result.is_constant = true;
-					result.script_type = singleton;
-
-					Ref<GDScript> gds = singleton;
-					if (gds.is_valid()) {
-						if (!gds->is_valid()) {
-							_set_error("Couldn't fully load the singleton script \"" + p_identifier + "\" (possible cyclic reference or parse error).", p_line);
-							return DataType();
-						}
-						result.kind = DataType::GDSCRIPT;
-					} else {
-						result.kind = DataType::SCRIPT;
-					}
-				}
-			}
-		}
+	increase_indent();
 
-		// This means looking in the current class, which type is always known
-		_set_error("The identifier \"" + p_identifier.operator String() + "\" isn't declared in the current scope.", p_line);
-	}
+	for (int i = 0; i < p_class->members.size(); i++) {
+		const ClassNode::Member &m = p_class->members[i];
 
-#ifdef DEBUG_ENABLED
-	{
-		DataType tmp_type;
-		List<DataType> arg_types;
-		int argcount;
-		bool _static;
-		bool vararg;
-		if (_get_function_signature(base_type, p_identifier, tmp_type, arg_types, argcount, _static, vararg)) {
-			_add_warning(GDScriptWarning::FUNCTION_USED_AS_PROPERTY, p_line, p_identifier.operator String(), base_type.to_string());
+		switch (m.type) {
+			case ClassNode::Member::CLASS:
+				print_class(m.m_class);
+				break;
+			case ClassNode::Member::VARIABLE:
+				print_variable(m.variable);
+				break;
+			case ClassNode::Member::CONSTANT:
+				print_constant(m.constant);
+				break;
+			case ClassNode::Member::SIGNAL:
+				print_signal(m.signal);
+				break;
+			case ClassNode::Member::FUNCTION:
+				print_function(m.function);
+				break;
+			case ClassNode::Member::ENUM:
+				print_enum(m.m_enum);
+				break;
+			case ClassNode::Member::ENUM_VALUE:
+				break; // Nothing. Will be printed by enum.
+			case ClassNode::Member::UNDEFINED:
+				push_line("<unknown member>");
+				break;
 		}
 	}
-#endif // DEBUG_ENABLED
 
-	_mark_line_as_unsafe(p_line);
-	return DataType();
+	decrease_indent();
 }
 
-void GDScriptParser::_check_class_level_types(ClassNode *p_class) {
-
-	// Names of internal object properties that we check to avoid overriding them.
-	// "__meta__" could also be in here, but since it doesn't really affect object metadata,
-	// it is okay to override it on script.
-	StringName script_name = CoreStringNames::get_singleton()->_script;
+void GDScriptParser::TreePrinter::print_constant(ConstantNode *p_constant) {
+	push_text("Constant ");
+	print_identifier(p_constant->identifier);
 
-	_mark_line_as_safe(p_class->line);
+	increase_indent();
 
-	// Constants
-	for (Map<StringName, ClassNode::Constant>::Element *E = p_class->constant_expressions.front(); E; E = E->next()) {
-		ClassNode::Constant &c = E->get();
-		_mark_line_as_safe(c.expression->line);
-		DataType cont = _resolve_type(c.type, c.expression->line);
-		DataType expr = _resolve_type(c.expression->get_datatype(), c.expression->line);
-
-		if (check_types && !_is_type_compatible(cont, expr)) {
-			_set_error("The constant value type (" + expr.to_string() + ") isn't compatible with declared type (" + cont.to_string() + ").",
-					c.expression->line);
-			return;
-		}
-
-		expr.is_constant = true;
-		c.type = expr;
-		c.expression->set_datatype(expr);
+	push_line();
+	push_text("= ");
+	if (p_constant->initializer == nullptr) {
+		push_text("<missing value>");
+	} else {
+		print_expression(p_constant->initializer);
+	}
+	decrease_indent();
+	push_line();
+}
 
-		DataType tmp;
-		const StringName &constant_name = E->key();
-		if (constant_name == script_name || _get_member_type(p_class->base_type, constant_name, tmp)) {
-			_set_error("The member \"" + String(constant_name) + "\" already exists in a parent class.", c.expression->line);
-			return;
+void GDScriptParser::TreePrinter::print_dictionary(DictionaryNode *p_dictionary) {
+	push_line("{");
+	increase_indent();
+	for (int i = 0; i < p_dictionary->elements.size(); i++) {
+		print_expression(p_dictionary->elements[i].key);
+		if (p_dictionary->style == DictionaryNode::PYTHON_DICT) {
+			push_text(" : ");
+		} else {
+			push_text(" = ");
 		}
+		print_expression(p_dictionary->elements[i].value);
+		push_line(" ,");
 	}
+	decrease_indent();
+	push_text("}");
+}
 
-	// Function declarations
-	for (int i = 0; i < p_class->static_functions.size(); i++) {
-		_check_function_types(p_class->static_functions[i]);
-		if (error_set) return;
+void GDScriptParser::TreePrinter::print_expression(ExpressionNode *p_expression) {
+	switch (p_expression->type) {
+		case Node::ARRAY:
+			print_array(static_cast<ArrayNode *>(p_expression));
+			break;
+		case Node::ASSIGNMENT:
+			print_assignment(static_cast<AssignmentNode *>(p_expression));
+			break;
+		case Node::AWAIT:
+			print_await(static_cast<AwaitNode *>(p_expression));
+			break;
+		case Node::BINARY_OPERATOR:
+			print_binary_op(static_cast<BinaryOpNode *>(p_expression));
+			break;
+		case Node::CALL:
+			print_call(static_cast<CallNode *>(p_expression));
+			break;
+		case Node::CAST:
+			print_cast(static_cast<CastNode *>(p_expression));
+			break;
+		case Node::DICTIONARY:
+			print_dictionary(static_cast<DictionaryNode *>(p_expression));
+			break;
+		case Node::GET_NODE:
+			print_get_node(static_cast<GetNodeNode *>(p_expression));
+			break;
+		case Node::IDENTIFIER:
+			print_identifier(static_cast<IdentifierNode *>(p_expression));
+			break;
+		case Node::LITERAL:
+			print_literal(static_cast<LiteralNode *>(p_expression));
+			break;
+		case Node::PRELOAD:
+			print_preload(static_cast<PreloadNode *>(p_expression));
+			break;
+		case Node::SELF:
+			print_self(static_cast<SelfNode *>(p_expression));
+			break;
+		case Node::SUBSCRIPT:
+			print_subscript(static_cast<SubscriptNode *>(p_expression));
+			break;
+		case Node::TERNARY_OPERATOR:
+			print_ternary_op(static_cast<TernaryOpNode *>(p_expression));
+			break;
+		case Node::UNARY_OPERATOR:
+			print_unary_op(static_cast<UnaryOpNode *>(p_expression));
+			break;
+		default:
+			push_text(vformat("<unknown expression %d>", p_expression->type));
+			break;
 	}
+}
 
-	for (int i = 0; i < p_class->functions.size(); i++) {
-		_check_function_types(p_class->functions[i]);
-		if (error_set) return;
+void GDScriptParser::TreePrinter::print_enum(EnumNode *p_enum) {
+	push_text("Enum ");
+	if (p_enum->identifier != nullptr) {
+		print_identifier(p_enum->identifier);
+	} else {
+		push_text("<unnamed>");
 	}
 
-	// Class variables
-	for (int i = 0; i < p_class->variables.size(); i++) {
-		ClassNode::Member &v = p_class->variables.write[i];
-
-		DataType tmp;
-		if (v.identifier == script_name || _get_member_type(p_class->base_type, v.identifier, tmp)) {
-			_set_error("The member \"" + String(v.identifier) + "\" already exists in a parent class.", v.line);
-			return;
-		}
-
-		_mark_line_as_safe(v.line);
-		v.data_type = _resolve_type(v.data_type, v.line);
-
-		if (v.expression) {
-			DataType expr_type = _reduce_node_type(v.expression);
-
-			if (check_types && !_is_type_compatible(v.data_type, expr_type)) {
-				// Try supertype test
-				if (_is_type_compatible(expr_type, v.data_type)) {
-					_mark_line_as_unsafe(v.line);
-				} else {
-					// Try with implicit conversion
-					if (v.data_type.kind != DataType::BUILTIN || !_is_type_compatible(v.data_type, expr_type, true)) {
-						_set_error("The assigned expression's type (" + expr_type.to_string() + ") doesn't match the variable's type (" +
-										   v.data_type.to_string() + ").",
-								v.line);
-						return;
-					}
-
-					// Replace assignment with implicit conversion
-					BuiltInFunctionNode *convert = alloc_node<BuiltInFunctionNode>();
-					convert->line = v.line;
-					convert->function = GDScriptFunctions::TYPE_CONVERT;
-
-					ConstantNode *tgt_type = alloc_node<ConstantNode>();
-					tgt_type->line = v.line;
-					tgt_type->value = (int)v.data_type.builtin_type;
-
-					OperatorNode *convert_call = alloc_node<OperatorNode>();
-					convert_call->line = v.line;
-					convert_call->op = OperatorNode::OP_CALL;
-					convert_call->arguments.push_back(convert);
-					convert_call->arguments.push_back(v.expression);
-					convert_call->arguments.push_back(tgt_type);
-
-					v.expression = convert_call;
-					v.initial_assignment->arguments.write[1] = convert_call;
-				}
-			}
-
-			if (v.data_type.infer_type) {
-				if (!expr_type.has_type) {
-					_set_error("The assigned value doesn't have a set type; the variable type can't be inferred.", v.line);
-					return;
-				}
-				v.data_type = expr_type;
-				v.data_type.is_constant = false;
-			}
-		}
-
-		// Check export hint
-		if (v.data_type.has_type && v._export.type != Variant::NIL) {
-			DataType export_type = _type_from_property(v._export);
-			if (!_is_type_compatible(v.data_type, export_type, true)) {
-				_set_error("The export hint's type (" + export_type.to_string() + ") doesn't match the variable's type (" +
-								   v.data_type.to_string() + ").",
-						v.line);
-				return;
-			}
-		}
+	push_line(" {");
+	increase_indent();
+	for (int i = 0; i < p_enum->values.size(); i++) {
+		const EnumNode::Value &item = p_enum->values[i];
+		print_identifier(item.identifier);
+		push_text(" = ");
+		push_text(itos(item.value));
+		push_line(" ,");
+	}
+	decrease_indent();
+	push_line("}");
+}
 
-		// Setter and getter
-		if (v.setter == StringName() && v.getter == StringName()) continue;
-
-		bool found_getter = false;
-		bool found_setter = false;
-		for (int j = 0; j < p_class->functions.size(); j++) {
-			if (v.setter == p_class->functions[j]->name) {
-				found_setter = true;
-				FunctionNode *setter = p_class->functions[j];
-
-				if (setter->get_required_argument_count() != 1 &&
-						!(setter->get_required_argument_count() == 0 && setter->default_values.size() > 0)) {
-					_set_error("The setter function needs to receive exactly 1 argument. See \"" + setter->name +
-									   "()\" definition at line " + itos(setter->line) + ".",
-							v.line);
-					return;
-				}
-				if (!_is_type_compatible(v.data_type, setter->argument_types[0])) {
-					_set_error("The setter argument's type (" + setter->argument_types[0].to_string() +
-									   ") doesn't match the variable's type (" + v.data_type.to_string() + "). See \"" +
-									   setter->name + "()\" definition at line " + itos(setter->line) + ".",
-							v.line);
-					return;
-				}
-				continue;
-			}
-			if (v.getter == p_class->functions[j]->name) {
-				found_getter = true;
-				FunctionNode *getter = p_class->functions[j];
-
-				if (getter->get_required_argument_count() != 0) {
-					_set_error("The getter function can't receive arguments. See \"" + getter->name +
-									   "()\" definition at line " + itos(getter->line) + ".",
-							v.line);
-					return;
-				}
-				if (!_is_type_compatible(v.data_type, getter->get_datatype())) {
-					_set_error("The getter return type (" + getter->get_datatype().to_string() +
-									   ") doesn't match the variable's type (" + v.data_type.to_string() +
-									   "). See \"" + getter->name + "()\" definition at line " + itos(getter->line) + ".",
-							v.line);
-					return;
-				}
-			}
-			if (found_getter && found_setter) break;
-		}
+void GDScriptParser::TreePrinter::print_for(ForNode *p_for) {
+	push_text("For ");
+	print_identifier(p_for->variable);
+	push_text(" IN ");
+	print_expression(p_for->list);
+	push_line(" :");
 
-		if ((found_getter || v.getter == StringName()) && (found_setter || v.setter == StringName())) continue;
+	increase_indent();
 
-		// Check for static functions
-		for (int j = 0; j < p_class->static_functions.size(); j++) {
-			if (v.setter == p_class->static_functions[j]->name) {
-				FunctionNode *setter = p_class->static_functions[j];
-				_set_error("The setter can't be a static function. See \"" + setter->name + "()\" definition at line " + itos(setter->line) + ".", v.line);
-				return;
-			}
-			if (v.getter == p_class->static_functions[j]->name) {
-				FunctionNode *getter = p_class->static_functions[j];
-				_set_error("The getter can't be a static function. See \"" + getter->name + "()\" definition at line " + itos(getter->line) + ".", v.line);
-				return;
-			}
-		}
+	print_suite(p_for->loop);
 
-		if (!found_setter && v.setter != StringName()) {
-			_set_error("The setter function isn't defined.", v.line);
-			return;
-		}
+	decrease_indent();
+}
 
-		if (!found_getter && v.getter != StringName()) {
-			_set_error("The getter function isn't defined.", v.line);
-			return;
-		}
+void GDScriptParser::TreePrinter::print_function(FunctionNode *p_function) {
+	for (const List<AnnotationNode *>::Element *E = p_function->annotations.front(); E != nullptr; E = E->next()) {
+		print_annotation(E->get());
 	}
-
-	// Inner classes
-	for (int i = 0; i < p_class->subclasses.size(); i++) {
-		current_class = p_class->subclasses[i];
-		_check_class_level_types(current_class);
-		if (error_set) return;
-		current_class = p_class;
+	push_text("Function ");
+	print_identifier(p_function->identifier);
+	push_text("( ");
+	for (int i = 0; i < p_function->parameters.size(); i++) {
+		if (i > 0) {
+			push_text(" , ");
+		}
+		print_parameter(p_function->parameters[i]);
 	}
+	push_line(" ) :");
+	increase_indent();
+	print_suite(p_function->body);
+	decrease_indent();
 }
 
-void GDScriptParser::_check_function_types(FunctionNode *p_function) {
-
-	p_function->return_type = _resolve_type(p_function->return_type, p_function->line);
-
-	// Arguments
-	int defaults_ofs = p_function->arguments.size() - p_function->default_values.size();
-	for (int i = 0; i < p_function->arguments.size(); i++) {
-		if (i < defaults_ofs) {
-			p_function->argument_types.write[i] = _resolve_type(p_function->argument_types[i], p_function->line);
-		} else {
-			if (p_function->default_values[i - defaults_ofs]->type != Node::TYPE_OPERATOR) {
-				_set_error("Parser bug: invalid argument default value.", p_function->line, p_function->column);
-				return;
-			}
-
-			OperatorNode *op = static_cast<OperatorNode *>(p_function->default_values[i - defaults_ofs]);
-
-			if (op->op != OperatorNode::OP_ASSIGN || op->arguments.size() != 2) {
-				_set_error("Parser bug: invalid argument default value operation.", p_function->line);
-				return;
-			}
-
-			DataType def_type = _reduce_node_type(op->arguments[1]);
-
-			if (p_function->argument_types[i].infer_type) {
-				def_type.is_constant = false;
-				p_function->argument_types.write[i] = def_type;
-			} else {
-				p_function->argument_types.write[i] = _resolve_type(p_function->argument_types[i], p_function->line);
-
-				if (!_is_type_compatible(p_function->argument_types[i], def_type, true)) {
-					String arg_name = p_function->arguments[i];
-					_set_error("Value type (" + def_type.to_string() + ") doesn't match the type of argument '" +
-									   arg_name + "' (" + p_function->argument_types[i].to_string() + ").",
-							p_function->line);
-				}
-			}
-		}
-#ifdef DEBUG_ENABLED
-		if (p_function->arguments_usage[i] == 0 && !p_function->arguments[i].operator String().begins_with("_")) {
-			_add_warning(GDScriptWarning::UNUSED_ARGUMENT, p_function->line, p_function->name, p_function->arguments[i].operator String());
-		}
-		for (int j = 0; j < current_class->variables.size(); j++) {
-			if (current_class->variables[j].identifier == p_function->arguments[i]) {
-				_add_warning(GDScriptWarning::SHADOWED_VARIABLE, p_function->line, p_function->arguments[i], itos(current_class->variables[j].line));
+void GDScriptParser::TreePrinter::print_get_node(GetNodeNode *p_get_node) {
+	push_text("$");
+	if (p_get_node->string != nullptr) {
+		print_literal(p_get_node->string);
+	} else {
+		for (int i = 0; i < p_get_node->chain.size(); i++) {
+			if (i > 0) {
+				push_text("/");
 			}
+			print_identifier(p_get_node->chain[i]);
 		}
-#endif // DEBUG_ENABLED
 	}
+}
 
-	if (!(p_function->name == "_init")) {
-		// Signature for the initializer may vary
-#ifdef DEBUG_ENABLED
-		DataType return_type;
-		List<DataType> arg_types;
-		int default_arg_count = 0;
-		bool _static = false;
-		bool vararg = false;
-
-		DataType base_type = current_class->base_type;
-		if (_get_function_signature(base_type, p_function->name, return_type, arg_types, default_arg_count, _static, vararg)) {
-			bool valid = _static == p_function->_static;
-			valid = valid && return_type == p_function->return_type;
-			int argsize_diff = p_function->arguments.size() - arg_types.size();
-			valid = valid && argsize_diff >= 0;
-			valid = valid && p_function->default_values.size() >= default_arg_count + argsize_diff;
-			int i = 0;
-			for (List<DataType>::Element *E = arg_types.front(); valid && E; E = E->next()) {
-				valid = valid && E->get() == p_function->argument_types[i++];
-			}
-
-			if (!valid) {
-				String parent_signature = return_type.has_type ? return_type.to_string() : "Variant";
-				if (parent_signature == "null") {
-					parent_signature = "void";
-				}
-				parent_signature += " " + p_function->name + "(";
-				if (arg_types.size()) {
-					int j = 0;
-					for (List<DataType>::Element *E = arg_types.front(); E; E = E->next()) {
-						if (E != arg_types.front()) {
-							parent_signature += ", ";
-						}
-						String arg = E->get().to_string();
-						if (arg == "null" || arg == "var") {
-							arg = "Variant";
-						}
-						parent_signature += arg;
-						if (j == arg_types.size() - default_arg_count) {
-							parent_signature += "=default";
-						}
+void GDScriptParser::TreePrinter::print_identifier(IdentifierNode *p_identifier) {
+	push_text(p_identifier->name);
+}
 
-						j++;
-					}
-				}
-				parent_signature += ")";
-				_set_error("The function signature doesn't match the parent. Parent signature is: \"" + parent_signature + "\".", p_function->line);
-				return;
-			}
-		}
-#endif // DEBUG_ENABLED
+void GDScriptParser::TreePrinter::print_if(IfNode *p_if, bool p_is_elif) {
+	if (p_is_elif) {
+		push_text("Elif ");
 	} else {
-		if (p_function->return_type.has_type && (p_function->return_type.kind != DataType::BUILTIN || p_function->return_type.builtin_type != Variant::NIL)) {
-			_set_error("The constructor can't return a value.", p_function->line);
-			return;
-		}
+		push_text("If ");
 	}
+	print_expression(p_if->condition);
+	push_line(" :");
 
-	if (p_function->return_type.has_type && (p_function->return_type.kind != DataType::BUILTIN || p_function->return_type.builtin_type != Variant::NIL)) {
-		if (!p_function->body->has_return) {
-			_set_error("A non-void function must return a value in all possible paths.", p_function->line);
-			return;
-		}
-	}
+	increase_indent();
+	print_suite(p_if->true_block);
+	decrease_indent();
 
-	if (p_function->has_yield) {
-		// yield() will make the function return a GDScriptFunctionState, so the type is ambiguous
-		p_function->return_type.has_type = false;
-		p_function->return_type.may_yield = true;
+	// FIXME: Properly detect "elif" blocks.
+	if (p_if->false_block != nullptr) {
+		push_line("Else :");
+		increase_indent();
+		print_suite(p_if->false_block);
+		decrease_indent();
 	}
-
-#ifdef DEBUG_ENABLED
-	for (Map<StringName, LocalVarNode *>::Element *E = p_function->body->variables.front(); E; E = E->next()) {
-		LocalVarNode *lv = E->get();
-		for (int i = 0; i < current_class->variables.size(); i++) {
-			if (current_class->variables[i].identifier == lv->name) {
-				_add_warning(GDScriptWarning::SHADOWED_VARIABLE, lv->line, lv->name, itos(current_class->variables[i].line));
-			}
-		}
-	}
-#endif // DEBUG_ENABLED
 }
 
-void GDScriptParser::_check_class_blocks_types(ClassNode *p_class) {
-
-	// Function blocks
-	for (int i = 0; i < p_class->static_functions.size(); i++) {
-		current_function = p_class->static_functions[i];
-		current_block = current_function->body;
-		_mark_line_as_safe(current_function->line);
-		_check_block_types(current_block);
-		current_block = NULL;
-		current_function = NULL;
-		if (error_set) return;
+void GDScriptParser::TreePrinter::print_literal(LiteralNode *p_literal) {
+	// Prefix for string types.
+	switch (p_literal->value.get_type()) {
+		case Variant::NODE_PATH:
+			push_text("^\"");
+			break;
+		case Variant::STRING:
+			push_text("\"");
+			break;
+		case Variant::STRING_NAME:
+			push_text("&\"");
+			break;
+		default:
+			break;
 	}
-
-	for (int i = 0; i < p_class->functions.size(); i++) {
-		current_function = p_class->functions[i];
-		current_block = current_function->body;
-		_mark_line_as_safe(current_function->line);
-		_check_block_types(current_block);
-		current_block = NULL;
-		current_function = NULL;
-		if (error_set) return;
+	push_text(p_literal->value);
+	// Suffix for string types.
+	switch (p_literal->value.get_type()) {
+		case Variant::NODE_PATH:
+		case Variant::STRING:
+		case Variant::STRING_NAME:
+			push_text("\"");
+			break;
+		default:
+			break;
 	}
+}
 
-#ifdef DEBUG_ENABLED
-	// Warnings
-	for (int i = 0; i < p_class->variables.size(); i++) {
-		if (p_class->variables[i].usages == 0) {
-			_add_warning(GDScriptWarning::UNUSED_CLASS_VARIABLE, p_class->variables[i].line, p_class->variables[i].identifier);
-		}
-	}
-	for (int i = 0; i < p_class->_signals.size(); i++) {
-		if (p_class->_signals[i].emissions == 0) {
-			_add_warning(GDScriptWarning::UNUSED_SIGNAL, p_class->_signals[i].line, p_class->_signals[i].name);
-		}
-	}
-#endif // DEBUG_ENABLED
+void GDScriptParser::TreePrinter::print_match(MatchNode *p_match) {
+	push_text("Match ");
+	print_expression(p_match->test);
+	push_line(" :");
 
-	// Inner classes
-	for (int i = 0; i < p_class->subclasses.size(); i++) {
-		current_class = p_class->subclasses[i];
-		_check_class_blocks_types(current_class);
-		if (error_set) return;
-		current_class = p_class;
+	increase_indent();
+	for (int i = 0; i < p_match->branches.size(); i++) {
+		print_match_branch(p_match->branches[i]);
 	}
+	decrease_indent();
 }
 
-#ifdef DEBUG_ENABLED
-static String _find_function_name(const GDScriptParser::OperatorNode *p_call) {
-	switch (p_call->arguments[0]->type) {
-		case GDScriptParser::Node::TYPE_TYPE: {
-			return Variant::get_type_name(static_cast<GDScriptParser::TypeNode *>(p_call->arguments[0])->vtype);
-		} break;
-		case GDScriptParser::Node::TYPE_BUILT_IN_FUNCTION: {
-			return GDScriptFunctions::get_func_name(static_cast<GDScriptParser::BuiltInFunctionNode *>(p_call->arguments[0])->function);
-		} break;
-		default: {
-			int id_index = p_call->op == GDScriptParser::OperatorNode::OP_PARENT_CALL ? 0 : 1;
-			if (p_call->arguments.size() > id_index && p_call->arguments[id_index]->type == GDScriptParser::Node::TYPE_IDENTIFIER) {
-				return static_cast<GDScriptParser::IdentifierNode *>(p_call->arguments[id_index])->name;
-			}
-		} break;
+void GDScriptParser::TreePrinter::print_match_branch(MatchBranchNode *p_match_branch) {
+	for (int i = 0; i < p_match_branch->patterns.size(); i++) {
+		if (i > 0) {
+			push_text(" , ");
+		}
+		print_match_pattern(p_match_branch->patterns[i]);
 	}
-	return String();
-}
-#endif // DEBUG_ENABLED
-
-void GDScriptParser::_check_block_types(BlockNode *p_block) {
-
-	Node *last_var_assign = NULL;
-
-	// Check each statement
-	for (List<Node *>::Element *E = p_block->statements.front(); E; E = E->next()) {
-		Node *statement = E->get();
-		switch (statement->type) {
-			case Node::TYPE_NEWLINE:
-			case Node::TYPE_BREAKPOINT:
-			case Node::TYPE_ASSERT: {
-				// Nothing to do
-			} break;
-			case Node::TYPE_LOCAL_VAR: {
-				LocalVarNode *lv = static_cast<LocalVarNode *>(statement);
-				lv->datatype = _resolve_type(lv->datatype, lv->line);
-				_mark_line_as_safe(lv->line);
-
-				last_var_assign = lv->assign;
-				if (lv->assign) {
-					lv->assign_op->arguments[0]->set_datatype(lv->datatype);
-					DataType assign_type = _reduce_node_type(lv->assign);
-#ifdef DEBUG_ENABLED
-					if (assign_type.has_type && assign_type.kind == DataType::BUILTIN && assign_type.builtin_type == Variant::NIL) {
-						if (lv->assign->type == Node::TYPE_OPERATOR) {
-							OperatorNode *call = static_cast<OperatorNode *>(lv->assign);
-							if (call->op == OperatorNode::OP_CALL || call->op == OperatorNode::OP_PARENT_CALL) {
-								_add_warning(GDScriptWarning::VOID_ASSIGNMENT, lv->line, _find_function_name(call));
-							}
-						}
-					}
-					if (lv->datatype.has_type && assign_type.may_yield && lv->assign->type == Node::TYPE_OPERATOR) {
-						_add_warning(GDScriptWarning::FUNCTION_MAY_YIELD, lv->line, _find_function_name(static_cast<OperatorNode *>(lv->assign)));
-					}
-#endif // DEBUG_ENABLED
 
-					if (!_is_type_compatible(lv->datatype, assign_type)) {
-						// Try supertype test
-						if (_is_type_compatible(assign_type, lv->datatype)) {
-							_mark_line_as_unsafe(lv->line);
-						} else {
-							// Try implicit conversion
-							if (lv->datatype.kind != DataType::BUILTIN || !_is_type_compatible(lv->datatype, assign_type, true)) {
-								_set_error("The assigned value type (" + assign_type.to_string() + ") doesn't match the variable's type (" +
-												   lv->datatype.to_string() + ").",
-										lv->line);
-								return;
-							}
-							// Replace assignment with implicit conversion
-							BuiltInFunctionNode *convert = alloc_node<BuiltInFunctionNode>();
-							convert->line = lv->line;
-							convert->function = GDScriptFunctions::TYPE_CONVERT;
-
-							ConstantNode *tgt_type = alloc_node<ConstantNode>();
-							tgt_type->line = lv->line;
-							tgt_type->value = (int)lv->datatype.builtin_type;
-
-							OperatorNode *convert_call = alloc_node<OperatorNode>();
-							convert_call->line = lv->line;
-							convert_call->op = OperatorNode::OP_CALL;
-							convert_call->arguments.push_back(convert);
-							convert_call->arguments.push_back(lv->assign);
-							convert_call->arguments.push_back(tgt_type);
-
-							lv->assign = convert_call;
-							lv->assign_op->arguments.write[1] = convert_call;
-#ifdef DEBUG_ENABLED
-							if (lv->datatype.builtin_type == Variant::INT && assign_type.builtin_type == Variant::REAL) {
-								_add_warning(GDScriptWarning::NARROWING_CONVERSION, lv->line);
-							}
-#endif // DEBUG_ENABLED
-						}
-					}
-					if (lv->datatype.infer_type) {
-						if (!assign_type.has_type) {
-							_set_error("The assigned value doesn't have a set type; the variable type can't be inferred.", lv->line);
-							return;
-						}
-						lv->datatype = assign_type;
-						lv->datatype.is_constant = false;
-					}
-					if (lv->datatype.has_type && !assign_type.has_type) {
-						_mark_line_as_unsafe(lv->line);
-					}
-				}
-			} break;
-			case Node::TYPE_OPERATOR: {
-				OperatorNode *op = static_cast<OperatorNode *>(statement);
-
-				switch (op->op) {
-					case OperatorNode::OP_ASSIGN:
-					case OperatorNode::OP_ASSIGN_ADD:
-					case OperatorNode::OP_ASSIGN_SUB:
-					case OperatorNode::OP_ASSIGN_MUL:
-					case OperatorNode::OP_ASSIGN_DIV:
-					case OperatorNode::OP_ASSIGN_MOD:
-					case OperatorNode::OP_ASSIGN_SHIFT_LEFT:
-					case OperatorNode::OP_ASSIGN_SHIFT_RIGHT:
-					case OperatorNode::OP_ASSIGN_BIT_AND:
-					case OperatorNode::OP_ASSIGN_BIT_OR:
-					case OperatorNode::OP_ASSIGN_BIT_XOR: {
-						if (op->arguments.size() < 2) {
-							_set_error("Parser bug: operation without enough arguments.", op->line, op->column);
-							return;
-						}
-
-						if (op->arguments[1] == last_var_assign) {
-							// Assignment was already checked
-							break;
-						}
-
-						_mark_line_as_safe(op->line);
-
-						DataType lh_type = _reduce_node_type(op->arguments[0]);
-
-						if (error_set) {
-							return;
-						}
-
-						if (check_types) {
-							if (!lh_type.has_type) {
-								if (op->arguments[0]->type == Node::TYPE_OPERATOR) {
-									_mark_line_as_unsafe(op->line);
-								}
-							}
-							if (lh_type.is_constant) {
-								_set_error("Can't assign a new value to a constant.", op->line);
-								return;
-							}
-						}
-
-						DataType rh_type;
-						if (op->op != OperatorNode::OP_ASSIGN) {
-							// Validate operation
-							DataType arg_type = _reduce_node_type(op->arguments[1]);
-							if (!arg_type.has_type) {
-								_mark_line_as_unsafe(op->line);
-								break;
-							}
-
-							Variant::Operator oper = _get_variant_operation(op->op);
-							bool valid = false;
-							rh_type = _get_operation_type(oper, lh_type, arg_type, valid);
-
-							if (check_types && !valid) {
-								_set_error("Invalid operand types (\"" + lh_type.to_string() + "\" and \"" + arg_type.to_string() +
-												   "\") to assignment operator \"" + Variant::get_operator_name(oper) + "\".",
-										op->line);
-								return;
-							}
-						} else {
-							rh_type = _reduce_node_type(op->arguments[1]);
-						}
-#ifdef DEBUG_ENABLED
-						if (rh_type.has_type && rh_type.kind == DataType::BUILTIN && rh_type.builtin_type == Variant::NIL) {
-							if (op->arguments[1]->type == Node::TYPE_OPERATOR) {
-								OperatorNode *call = static_cast<OperatorNode *>(op->arguments[1]);
-								if (call->op == OperatorNode::OP_CALL || call->op == OperatorNode::OP_PARENT_CALL) {
-									_add_warning(GDScriptWarning::VOID_ASSIGNMENT, op->line, _find_function_name(call));
-								}
-							}
-						}
-						if (lh_type.has_type && rh_type.may_yield && op->arguments[1]->type == Node::TYPE_OPERATOR) {
-							_add_warning(GDScriptWarning::FUNCTION_MAY_YIELD, op->line, _find_function_name(static_cast<OperatorNode *>(op->arguments[1])));
-						}
+	push_line(" :");
 
-#endif // DEBUG_ENABLED
-						bool type_match = lh_type.has_type && rh_type.has_type;
-						if (check_types && !_is_type_compatible(lh_type, rh_type)) {
-							type_match = false;
+	increase_indent();
+	print_suite(p_match_branch->block);
+	decrease_indent();
+}
 
-							// Try supertype test
-							if (_is_type_compatible(rh_type, lh_type)) {
-								_mark_line_as_unsafe(op->line);
-							} else {
-								// Try implicit conversion
-								if (lh_type.kind != DataType::BUILTIN || !_is_type_compatible(lh_type, rh_type, true)) {
-									_set_error("The assigned value's type (" + rh_type.to_string() + ") doesn't match the variable's type (" +
-													   lh_type.to_string() + ").",
-											op->line);
-									return;
-								}
-								if (op->op == OperatorNode::OP_ASSIGN) {
-									// Replace assignment with implicit conversion
-									BuiltInFunctionNode *convert = alloc_node<BuiltInFunctionNode>();
-									convert->line = op->line;
-									convert->function = GDScriptFunctions::TYPE_CONVERT;
-
-									ConstantNode *tgt_type = alloc_node<ConstantNode>();
-									tgt_type->line = op->line;
-									tgt_type->value = (int)lh_type.builtin_type;
-
-									OperatorNode *convert_call = alloc_node<OperatorNode>();
-									convert_call->line = op->line;
-									convert_call->op = OperatorNode::OP_CALL;
-									convert_call->arguments.push_back(convert);
-									convert_call->arguments.push_back(op->arguments[1]);
-									convert_call->arguments.push_back(tgt_type);
-
-									op->arguments.write[1] = convert_call;
-
-									type_match = true; // Since we are converting, the type is matching
-								}
-#ifdef DEBUG_ENABLED
-								if (lh_type.builtin_type == Variant::INT && rh_type.builtin_type == Variant::REAL) {
-									_add_warning(GDScriptWarning::NARROWING_CONVERSION, op->line);
-								}
-#endif // DEBUG_ENABLED
-							}
-						}
-#ifdef DEBUG_ENABLED
-						if (!rh_type.has_type && (op->op != OperatorNode::OP_ASSIGN || lh_type.has_type || op->arguments[0]->type == Node::TYPE_OPERATOR)) {
-							_mark_line_as_unsafe(op->line);
-						}
-#endif // DEBUG_ENABLED
-						op->datatype.has_type = type_match;
-					} break;
-					case OperatorNode::OP_CALL:
-					case OperatorNode::OP_PARENT_CALL: {
-						_mark_line_as_safe(op->line);
-						DataType func_type = _reduce_function_call_type(op);
-#ifdef DEBUG_ENABLED
-						if (func_type.has_type && (func_type.kind != DataType::BUILTIN || func_type.builtin_type != Variant::NIL)) {
-							// Figure out function name for warning
-							String func_name = _find_function_name(op);
-							if (func_name.empty()) {
-								func_name = "<undetected name>";
-							}
-							_add_warning(GDScriptWarning::RETURN_VALUE_DISCARDED, op->line, func_name);
-						}
-#endif // DEBUG_ENABLED
-						if (error_set) return;
-					} break;
-					case OperatorNode::OP_YIELD: {
-						_mark_line_as_safe(op->line);
-						_reduce_node_type(op);
-					} break;
-					default: {
-						_mark_line_as_safe(op->line);
-						_reduce_node_type(op); // Test for safety anyway
-#ifdef DEBUG_ENABLED
-						if (op->op == OperatorNode::OP_TERNARY_IF) {
-							_add_warning(GDScriptWarning::STANDALONE_TERNARY, statement->line);
-						} else {
-							_add_warning(GDScriptWarning::STANDALONE_EXPRESSION, statement->line);
-						}
-#endif // DEBUG_ENABLED
-					}
+void GDScriptParser::TreePrinter::print_match_pattern(PatternNode *p_match_pattern) {
+	switch (p_match_pattern->pattern_type) {
+		case PatternNode::PT_LITERAL:
+			print_literal(p_match_pattern->literal);
+			break;
+		case PatternNode::PT_WILDCARD:
+			push_text("_");
+			break;
+		case PatternNode::PT_REST:
+			push_text("..");
+			break;
+		case PatternNode::PT_BIND:
+			push_text("Var ");
+			print_identifier(p_match_pattern->bind);
+			break;
+		case PatternNode::PT_EXPRESSION:
+			print_expression(p_match_pattern->expression);
+			break;
+		case PatternNode::PT_ARRAY:
+			push_text("[ ");
+			for (int i = 0; i < p_match_pattern->array.size(); i++) {
+				if (i > 0) {
+					push_text(" , ");
 				}
-			} break;
-			case Node::TYPE_CONTROL_FLOW: {
-				ControlFlowNode *cf = static_cast<ControlFlowNode *>(statement);
-				_mark_line_as_safe(cf->line);
-
-				switch (cf->cf_type) {
-					case ControlFlowNode::CF_RETURN: {
-						DataType function_type = current_function->get_datatype();
-
-						DataType ret_type;
-						if (cf->arguments.size() > 0) {
-							ret_type = _reduce_node_type(cf->arguments[0]);
-							if (error_set) {
-								return;
-							}
-						}
-
-						if (!function_type.has_type) break;
-
-						if (function_type.kind == DataType::BUILTIN && function_type.builtin_type == Variant::NIL) {
-							// Return void, should not have arguments
-							if (cf->arguments.size() > 0) {
-								_set_error("A void function cannot return a value.", cf->line, cf->column);
-								return;
-							}
-						} else {
-							// Return something, cannot be empty
-							if (cf->arguments.size() == 0) {
-								_set_error("A non-void function must return a value.", cf->line, cf->column);
-								return;
-							}
-
-							if (!_is_type_compatible(function_type, ret_type)) {
-								_set_error("The returned value type (" + ret_type.to_string() + ") doesn't match the function return type (" +
-												   function_type.to_string() + ").",
-										cf->line, cf->column);
-								return;
-							}
-						}
-					} break;
-					case ControlFlowNode::CF_MATCH: {
-						MatchNode *match_node = cf->match;
-						_transform_match_statment(match_node);
-					} break;
-					default: {
-						if (cf->body_else) {
-							_mark_line_as_safe(cf->body_else->line);
-						}
-						for (int i = 0; i < cf->arguments.size(); i++) {
-							_reduce_node_type(cf->arguments[i]);
-						}
-					} break;
+				print_match_pattern(p_match_pattern->array[i]);
+			}
+			push_text(" ]");
+			break;
+		case PatternNode::PT_DICTIONARY:
+			push_text("{ ");
+			for (int i = 0; i < p_match_pattern->dictionary.size(); i++) {
+				if (i > 0) {
+					push_text(" , ");
 				}
-			} break;
-			case Node::TYPE_CONSTANT: {
-				ConstantNode *cn = static_cast<ConstantNode *>(statement);
-				// Strings are fine since they can be multiline comments
-				if (cn->value.get_type() == Variant::STRING) {
-					break;
+				if (p_match_pattern->dictionary[i].key != nullptr) {
+					// Key can be null for rest pattern.
+					print_expression(p_match_pattern->dictionary[i].key);
+					push_text(" : ");
 				}
-				FALLTHROUGH;
+				print_match_pattern(p_match_pattern->dictionary[i].value_pattern);
 			}
-			default: {
-				_mark_line_as_safe(statement->line);
-				_reduce_node_type(statement); // Test for safety anyway
-#ifdef DEBUG_ENABLED
-				_add_warning(GDScriptWarning::STANDALONE_EXPRESSION, statement->line);
-#endif // DEBUG_ENABLED
-			}
-		}
+			push_text(" }");
+			break;
 	}
+}
 
-	// Parse sub blocks
-	for (int i = 0; i < p_block->sub_blocks.size(); i++) {
-		current_block = p_block->sub_blocks[i];
-		_check_block_types(current_block);
-		current_block = p_block;
-		if (error_set) return;
+void GDScriptParser::TreePrinter::print_parameter(ParameterNode *p_parameter) {
+	print_identifier(p_parameter->identifier);
+	if (p_parameter->datatype_specifier != nullptr) {
+		push_text(" : ");
+		print_type(p_parameter->datatype_specifier);
 	}
-
-#ifdef DEBUG_ENABLED
-	// Warnings check
-	for (Map<StringName, LocalVarNode *>::Element *E = p_block->variables.front(); E; E = E->next()) {
-		LocalVarNode *lv = E->get();
-		if (!lv->name.operator String().begins_with("_")) {
-			if (lv->usages == 0) {
-				_add_warning(GDScriptWarning::UNUSED_VARIABLE, lv->line, lv->name);
-			} else if (lv->assignments == 0) {
-				_add_warning(GDScriptWarning::UNASSIGNED_VARIABLE, lv->line, lv->name);
-			}
-		}
+	if (p_parameter->default_value != nullptr) {
+		push_text(" = ");
+		print_expression(p_parameter->default_value);
 	}
-#endif // DEBUG_ENABLED
 }
 
-void GDScriptParser::_set_error(const String &p_error, int p_line, int p_column) {
-
-	if (error_set)
-		return; //allow no further errors
-
-	error = p_error;
-	error_line = p_line < 0 ? tokenizer->get_token_line() : p_line;
-	error_column = p_column < 0 ? tokenizer->get_token_column() : p_column;
-	error_set = true;
+void GDScriptParser::TreePrinter::print_preload(PreloadNode *p_preload) {
+	push_text(R"(Preload ( ")");
+	push_text(p_preload->resolved_path);
+	push_text(R"(" )");
 }
 
-#ifdef DEBUG_ENABLED
-void GDScriptParser::_add_warning(int p_code, int p_line, const String &p_symbol1, const String &p_symbol2, const String &p_symbol3, const String &p_symbol4) {
-	Vector<String> symbols;
-	if (!p_symbol1.empty()) {
-		symbols.push_back(p_symbol1);
+void GDScriptParser::TreePrinter::print_return(ReturnNode *p_return) {
+	push_text("Return");
+	if (p_return->return_value != nullptr) {
+		push_text(" ");
+		print_expression(p_return->return_value);
 	}
-	if (!p_symbol2.empty()) {
-		symbols.push_back(p_symbol2);
-	}
-	if (!p_symbol3.empty()) {
-		symbols.push_back(p_symbol3);
-	}
-	if (!p_symbol4.empty()) {
-		symbols.push_back(p_symbol4);
-	}
-	_add_warning(p_code, p_line, symbols);
+	push_line();
 }
 
-void GDScriptParser::_add_warning(int p_code, int p_line, const Vector<String> &p_symbols) {
-	if (GLOBAL_GET("debug/gdscript/warnings/exclude_addons").booleanize() && base_path.begins_with("res://addons/")) {
-		return;
-	}
-	if (tokenizer->is_ignoring_warnings() || !GLOBAL_GET("debug/gdscript/warnings/enable").booleanize()) {
-		return;
-	}
-	String warn_name = GDScriptWarning::get_name_from_code((GDScriptWarning::Code)p_code).to_lower();
-	if (tokenizer->get_warning_global_skips().has(warn_name)) {
-		return;
-	}
-	if (!GLOBAL_GET("debug/gdscript/warnings/" + warn_name)) {
-		return;
-	}
-
-	GDScriptWarning warn;
-	warn.code = (GDScriptWarning::Code)p_code;
-	warn.symbols = p_symbols;
-	warn.line = p_line == -1 ? tokenizer->get_token_line() : p_line;
-
-	List<GDScriptWarning>::Element *before = NULL;
-	for (List<GDScriptWarning>::Element *E = warnings.front(); E; E = E->next()) {
-		if (E->get().line > warn.line) {
-			break;
-		}
-		before = E;
-	}
-	if (before) {
-		warnings.insert_after(before, warn);
+void GDScriptParser::TreePrinter::print_self(SelfNode *p_self) {
+	push_text("Self(");
+	if (p_self->current_class->identifier != nullptr) {
+		print_identifier(p_self->current_class->identifier);
 	} else {
-		warnings.push_front(warn);
+		push_text("<main class>");
 	}
+	push_text(")");
 }
-#endif // DEBUG_ENABLED
-
-String GDScriptParser::get_error() const {
-
-	return error;
-}
-
-int GDScriptParser::get_error_line() const {
 
-	return error_line;
+void GDScriptParser::TreePrinter::print_signal(SignalNode *p_signal) {
+	push_text("Signal ");
+	print_identifier(p_signal->identifier);
+	push_text("( ");
+	for (int i = 0; i < p_signal->parameters.size(); i++) {
+		print_parameter(p_signal->parameters[i]);
+	}
+	push_line(" )");
 }
-int GDScriptParser::get_error_column() const {
 
-	return error_column;
+void GDScriptParser::TreePrinter::print_subscript(SubscriptNode *p_subscript) {
+	print_expression(p_subscript->base);
+	if (p_subscript->is_attribute) {
+		push_text(".");
+		print_identifier(p_subscript->attribute);
+	} else {
+		push_text("[ ");
+		print_expression(p_subscript->index);
+		push_text(" ]");
+	}
 }
 
-bool GDScriptParser::has_error() const {
-	return error_set;
+void GDScriptParser::TreePrinter::print_statement(Node *p_statement) {
+	switch (p_statement->type) {
+		case Node::ASSERT:
+			print_assert(static_cast<AssertNode *>(p_statement));
+			break;
+		case Node::VARIABLE:
+			print_variable(static_cast<VariableNode *>(p_statement));
+			break;
+		case Node::CONSTANT:
+			print_constant(static_cast<ConstantNode *>(p_statement));
+			break;
+		case Node::IF:
+			print_if(static_cast<IfNode *>(p_statement));
+			break;
+		case Node::FOR:
+			print_for(static_cast<ForNode *>(p_statement));
+			break;
+		case Node::WHILE:
+			print_while(static_cast<WhileNode *>(p_statement));
+			break;
+		case Node::MATCH:
+			print_match(static_cast<MatchNode *>(p_statement));
+			break;
+		case Node::RETURN:
+			print_return(static_cast<ReturnNode *>(p_statement));
+			break;
+		case Node::BREAK:
+			push_line("Break");
+			break;
+		case Node::CONTINUE:
+			push_line("Continue");
+			break;
+		case Node::PASS:
+			push_line("Pass");
+			break;
+		case Node::BREAKPOINT:
+			push_line("Breakpoint");
+			break;
+		case Node::ASSIGNMENT:
+			print_assignment(static_cast<AssignmentNode *>(p_statement));
+			break;
+		default:
+			if (p_statement->is_expression()) {
+				print_expression(static_cast<ExpressionNode *>(p_statement));
+				push_line();
+			} else {
+				push_line(vformat("<unknown statement %d>", p_statement->type));
+			}
+			break;
+	}
 }
 
-Error GDScriptParser::_parse(const String &p_base_path) {
-
-	base_path = p_base_path;
-
-	//assume class
-	ClassNode *main_class = alloc_node<ClassNode>();
-	main_class->initializer = alloc_node<BlockNode>();
-	main_class->initializer->parent_class = main_class;
-	main_class->ready = alloc_node<BlockNode>();
-	main_class->ready->parent_class = main_class;
-	current_class = main_class;
-
-	_parse_class(main_class);
-
-	if (tokenizer->get_token() == GDScriptTokenizer::TK_ERROR) {
-		error_set = false;
-		_set_error("Parse error: " + tokenizer->get_token_error());
+void GDScriptParser::TreePrinter::print_suite(SuiteNode *p_suite) {
+	for (int i = 0; i < p_suite->statements.size(); i++) {
+		print_statement(p_suite->statements[i]);
 	}
+}
 
-	if (error_set && !for_completion) {
-		return ERR_PARSE_ERROR;
-	}
+void GDScriptParser::TreePrinter::print_ternary_op(TernaryOpNode *p_ternary_op) {
+	// Surround in parenthesis for disambiguation.
+	push_text("(");
+	print_expression(p_ternary_op->true_expr);
+	push_text(") IF (");
+	print_expression(p_ternary_op->condition);
+	push_text(") ELSE (");
+	print_expression(p_ternary_op->false_expr);
+	push_text(")");
+}
 
-	if (dependencies_only) {
-		return OK;
+void GDScriptParser::TreePrinter::print_type(TypeNode *p_type) {
+	if (p_type->type_chain.empty()) {
+		push_text("Void");
+	} else {
+		for (int i = 0; i < p_type->type_chain.size(); i++) {
+			if (i > 0) {
+				push_text(".");
+			}
+			print_identifier(p_type->type_chain[i]);
+		}
 	}
+}
 
-	_determine_inheritance(main_class);
-
-	if (error_set) {
-		return ERR_PARSE_ERROR;
+void GDScriptParser::TreePrinter::print_unary_op(UnaryOpNode *p_unary_op) {
+	// Surround in parenthesis for disambiguation.
+	push_text("(");
+	switch (p_unary_op->operation) {
+		case UnaryOpNode::OP_POSITIVE:
+			push_text("+");
+			break;
+		case UnaryOpNode::OP_NEGATIVE:
+			push_text("-");
+			break;
+		case UnaryOpNode::OP_LOGIC_NOT:
+			push_text("NOT");
+			break;
+		case UnaryOpNode::OP_COMPLEMENT:
+			push_text("~");
+			break;
 	}
+	print_expression(p_unary_op->operand);
+	// Surround in parenthesis for disambiguation.
+	push_text(")");
+}
 
-	current_class = main_class;
-	current_function = NULL;
-	current_block = NULL;
-
-	if (for_completion) check_types = false;
-
-	// Resolve all class-level stuff before getting into function blocks
-	_check_class_level_types(main_class);
-
-	if (error_set) {
-		return ERR_PARSE_ERROR;
+void GDScriptParser::TreePrinter::print_variable(VariableNode *p_variable) {
+	for (const List<AnnotationNode *>::Element *E = p_variable->annotations.front(); E != nullptr; E = E->next()) {
+		print_annotation(E->get());
 	}
 
-	// Resolve the function blocks
-	_check_class_blocks_types(main_class);
+	push_text("Variable ");
+	print_identifier(p_variable->identifier);
 
-	if (error_set) {
-		return ERR_PARSE_ERROR;
+	push_text(" : ");
+	if (p_variable->datatype_specifier != nullptr) {
+		print_type(p_variable->datatype_specifier);
+	} else if (p_variable->infer_datatype) {
+		push_text("<inferred type>");
+	} else {
+		push_text("Variant");
 	}
 
-#ifdef DEBUG_ENABLED
+	increase_indent();
 
-	// Resolve warning ignores
-	Vector<Pair<int, String> > warning_skips = tokenizer->get_warning_skips();
-	bool warning_is_error = GLOBAL_GET("debug/gdscript/warnings/treat_warnings_as_errors").booleanize();
-	for (List<GDScriptWarning>::Element *E = warnings.front(); E;) {
-		GDScriptWarning &w = E->get();
-		int skip_index = -1;
-		for (int i = 0; i < warning_skips.size(); i++) {
-			if (warning_skips[i].first >= w.line) {
-				break;
-			}
-			skip_index = i;
-		}
-		List<GDScriptWarning>::Element *next = E->next();
-		bool erase = false;
-		if (skip_index != -1) {
-			if (warning_skips[skip_index].second == GDScriptWarning::get_name_from_code(w.code).to_lower()) {
-				erase = true;
+	push_line();
+	push_text("= ");
+	if (p_variable->initializer == nullptr) {
+		push_text("<default value>");
+	} else {
+		print_expression(p_variable->initializer);
+	}
+	push_line();
+
+	if (p_variable->property != VariableNode::PROP_NONE) {
+		if (p_variable->getter != nullptr) {
+			push_text("Get");
+			if (p_variable->property == VariableNode::PROP_INLINE) {
+				push_line(":");
+				increase_indent();
+				print_suite(p_variable->getter);
+				decrease_indent();
+			} else {
+				push_line(" =");
+				increase_indent();
+				print_identifier(p_variable->getter_pointer);
+				push_line();
+				decrease_indent();
+			}
+		}
+		if (p_variable->setter != nullptr) {
+			push_text("Set (");
+			if (p_variable->property == VariableNode::PROP_INLINE) {
+				if (p_variable->setter_parameter != nullptr) {
+					print_identifier(p_variable->setter_parameter);
+				} else {
+					push_text("<missing>");
+				}
+				push_line("):");
+				increase_indent();
+				print_suite(p_variable->setter);
+				decrease_indent();
+			} else {
+				push_line(" =");
+				increase_indent();
+				print_identifier(p_variable->setter_pointer);
+				push_line();
+				decrease_indent();
 			}
-			warning_skips.remove(skip_index);
-		}
-		if (erase) {
-			warnings.erase(E);
-		} else if (warning_is_error) {
-			_set_error(w.get_message() + " (warning treated as error)", w.line);
-			return ERR_PARSE_ERROR;
 		}
-		E = next;
 	}
-#endif // DEBUG_ENABLED
 
-	return OK;
+	decrease_indent();
+	push_line();
 }
 
-Error GDScriptParser::parse_bytecode(const Vector<uint8_t> &p_bytecode, const String &p_base_path, const String &p_self_path) {
+void GDScriptParser::TreePrinter::print_while(WhileNode *p_while) {
+	push_text("While ");
+	print_expression(p_while->condition);
+	push_line(" :");
 
-	clear();
-
-	self_path = p_self_path;
-	GDScriptTokenizerBuffer *tb = memnew(GDScriptTokenizerBuffer);
-	tb->set_code_buffer(p_bytecode);
-	tokenizer = tb;
-	Error ret = _parse(p_base_path);
-	memdelete(tb);
-	tokenizer = NULL;
-	return ret;
+	increase_indent();
+	print_suite(p_while->loop);
+	decrease_indent();
 }
 
-Error GDScriptParser::parse(const String &p_code, const String &p_base_path, bool p_just_validate, const String &p_self_path, bool p_for_completion, Set<int> *r_safe_lines, bool p_dependencies_only) {
-
-	clear();
-
-	self_path = p_self_path;
-	GDScriptTokenizerText *tt = memnew(GDScriptTokenizerText);
-	tt->set_code(p_code);
+void GDScriptParser::TreePrinter::print_tree(const GDScriptParser &p_parser) {
+	ERR_FAIL_COND_MSG(p_parser.get_tree() == nullptr, "Parse the code before printing the parse tree.");
 
-	validating = p_just_validate;
-	for_completion = p_for_completion;
-	dependencies_only = p_dependencies_only;
-#ifdef DEBUG_ENABLED
-	safe_lines = r_safe_lines;
-#endif // DEBUG_ENABLED
-	tokenizer = tt;
-	Error ret = _parse(p_base_path);
-	memdelete(tt);
-	tokenizer = NULL;
-	return ret;
-}
-
-bool GDScriptParser::is_tool_script() const {
-
-	return (head && head->type == Node::TYPE_CLASS && static_cast<const ClassNode *>(head)->tool);
-}
-
-const GDScriptParser::Node *GDScriptParser::get_parse_tree() const {
-
-	return head;
-}
-
-void GDScriptParser::clear() {
-
-	while (list) {
-
-		Node *l = list;
-		list = list->next;
-		memdelete(l);
+	if (p_parser.is_tool()) {
+		push_line("@tool");
 	}
+	if (!p_parser.get_tree()->icon_path.empty()) {
+		push_text(R"(@icon (")");
+		push_text(p_parser.get_tree()->icon_path);
+		push_line("\")");
+	}
+	print_class(p_parser.get_tree());
 
-	head = NULL;
-	list = NULL;
-
-	completion_type = COMPLETION_NONE;
-	completion_node = NULL;
-	completion_class = NULL;
-	completion_function = NULL;
-	completion_block = NULL;
-	current_block = NULL;
-	current_class = NULL;
-
-	completion_found = false;
-	rpc_mode = MultiplayerAPI::RPC_MODE_DISABLED;
-
-	current_function = NULL;
-
-	validating = false;
-	for_completion = false;
-	error_set = false;
-	indent_level.clear();
-	indent_level.push_back(IndentLevel(0, 0));
-	error_line = 0;
-	error_column = 0;
-	pending_newline = -1;
-	parenthesis = 0;
-	current_export.type = Variant::NIL;
-	check_types = true;
-	dependencies_only = false;
-	dependencies.clear();
-	error = "";
-#ifdef DEBUG_ENABLED
-	safe_lines = NULL;
-#endif // DEBUG_ENABLED
-}
-
-GDScriptParser::CompletionType GDScriptParser::get_completion_type() {
-
-	return completion_type;
-}
-
-StringName GDScriptParser::get_completion_cursor() {
-
-	return completion_cursor;
-}
-
-int GDScriptParser::get_completion_line() {
-
-	return completion_line;
-}
-
-Variant::Type GDScriptParser::get_completion_built_in_constant() {
-
-	return completion_built_in_constant;
-}
-
-GDScriptParser::Node *GDScriptParser::get_completion_node() {
-
-	return completion_node;
-}
-
-GDScriptParser::BlockNode *GDScriptParser::get_completion_block() {
-
-	return completion_block;
-}
-
-GDScriptParser::ClassNode *GDScriptParser::get_completion_class() {
-
-	return completion_class;
-}
-
-GDScriptParser::FunctionNode *GDScriptParser::get_completion_function() {
-
-	return completion_function;
-}
-
-int GDScriptParser::get_completion_argument_index() {
-
-	return completion_argument;
-}
-
-int GDScriptParser::get_completion_identifier_is_function() {
-
-	return completion_ident_is_call;
-}
-
-GDScriptParser::GDScriptParser() {
-
-	head = NULL;
-	list = NULL;
-	tokenizer = NULL;
-	pending_newline = -1;
-	clear();
+	print_line(printed);
 }
 
-GDScriptParser::~GDScriptParser() {
-
-	clear();
-}
+#endif // DEBUG_ENABLED
diff --git a/modules/gdscript/gdscript_parser.h b/modules/gdscript/gdscript_parser.h
index c74d7dd856..4c9473c7bd 100644
--- a/modules/gdscript/gdscript_parser.h
+++ b/modules/gdscript/gdscript_parser.h
@@ -31,664 +31,1324 @@
 #ifndef GDSCRIPT_PARSER_H
 #define GDSCRIPT_PARSER_H
 
+#include "core/hash_map.h"
+#include "core/io/multiplayer_api.h"
+#include "core/list.h"
 #include "core/map.h"
-#include "core/object.h"
+#include "core/reference.h"
+#include "core/resource.h"
 #include "core/script_language.h"
+#include "core/string_name.h"
+#include "core/ustring.h"
+#include "core/variant.h"
+#include "core/vector.h"
+#include "gdscript_cache.h"
 #include "gdscript_functions.h"
 #include "gdscript_tokenizer.h"
 
-struct GDScriptDataType;
-struct GDScriptWarning;
+#ifdef DEBUG_ENABLED
+#include "core/string_builder.h"
+#include "gdscript_warning.h"
+#endif // DEBUG_ENABLED
 
 class GDScriptParser {
+	struct AnnotationInfo;
+
 public:
+	// Forward-declare all parser nodes, to avoid ordering issues.
+	struct AnnotationNode;
+	struct ArrayNode;
+	struct AssertNode;
+	struct AssignmentNode;
+	struct AwaitNode;
+	struct BinaryOpNode;
+	struct BreakNode;
+	struct BreakpointNode;
+	struct CallNode;
+	struct CastNode;
 	struct ClassNode;
+	struct ConstantNode;
+	struct ContinueNode;
+	struct DictionaryNode;
+	struct EnumNode;
+	struct ExpressionNode;
+	struct ForNode;
+	struct FunctionNode;
+	struct GetNodeNode;
+	struct IdentifierNode;
+	struct IfNode;
+	struct LiteralNode;
+	struct MatchNode;
+	struct MatchBranchNode;
+	struct ParameterNode;
+	struct PassNode;
+	struct PatternNode;
+	struct PreloadNode;
+	struct ReturnNode;
+	struct SelfNode;
+	struct SignalNode;
+	struct SubscriptNode;
+	struct SuiteNode;
+	struct TernaryOpNode;
+	struct TypeNode;
+	struct UnaryOpNode;
+	struct VariableNode;
+	struct WhileNode;
 
 	struct DataType {
-		enum {
+		enum Kind {
 			BUILTIN,
 			NATIVE,
 			SCRIPT,
-			GDSCRIPT,
-			CLASS,
-			UNRESOLVED
-		} kind;
+			CLASS, // GDScript.
+			ENUM, // Full enumeration.
+			ENUM_VALUE, // Value from enumeration.
+			VARIANT, // Can be any type.
+			UNRESOLVED,
+			// TODO: Enum
+		};
+		Kind kind = UNRESOLVED;
+
+		enum TypeSource {
+			UNDETECTED, // Can be any type.
+			INFERRED, // Has inferred type, but still dynamic.
+			ANNOTATED_EXPLICIT, // Has a specific type annotated.
+			ANNOTATED_INFERRED, // Has a static type but comes from the assigned value.
+		};
+		TypeSource type_source = UNDETECTED;
 
-		bool has_type;
-		bool is_constant;
-		bool is_meta_type; // Whether the value can be used as a type
-		bool infer_type;
-		bool may_yield; // For function calls
+		bool is_constant = false;
+		bool is_meta_type = false;
+		bool is_coroutine = false; // For function calls.
 
-		Variant::Type builtin_type;
+		Variant::Type builtin_type = Variant::NIL;
 		StringName native_type;
+		StringName enum_type; // Enum name or the value name in an enum.
 		Ref<Script> script_type;
-		ClassNode *class_type;
+		String script_path;
+		ClassNode *class_type = nullptr;
 
+		MethodInfo method_info; // For callable/signals.
+		HashMap<StringName, int> enum_values; // For enums.
+
+		_FORCE_INLINE_ bool is_set() const { return kind != UNRESOLVED; }
+		_FORCE_INLINE_ bool has_no_type() const { return type_source == UNDETECTED; }
+		_FORCE_INLINE_ bool is_variant() const { return kind == VARIANT || kind == UNRESOLVED; }
+		_FORCE_INLINE_ bool is_hard_type() const { return type_source > INFERRED; }
 		String to_string() const;
 
-		bool operator==(const DataType &other) const {
-			if (!has_type || !other.has_type) {
-				return true; // Can be considered equal for parsing purpose
+		bool operator==(const DataType &p_other) const {
+			if (type_source == UNDETECTED || p_other.type_source == UNDETECTED) {
+				return true; // Can be consireded equal for parsing purposes.
+			}
+
+			if (type_source == INFERRED || p_other.type_source == INFERRED) {
+				return true; // Can be consireded equal for parsing purposes.
 			}
-			if (kind != other.kind) {
+
+			if (kind != p_other.kind) {
 				return false;
 			}
+
 			switch (kind) {
-				case BUILTIN: {
-					return builtin_type == other.builtin_type;
-				} break;
-				case NATIVE: {
-					return native_type == other.native_type;
-				} break;
-				case GDSCRIPT:
-				case SCRIPT: {
-					return script_type == other.script_type;
-				} break;
-				case CLASS: {
-					return class_type == other.class_type;
-				} break;
-				case UNRESOLVED: {
-				} break;
+				case VARIANT:
+					return true; // All variants are the same.
+				case BUILTIN:
+					return builtin_type == p_other.builtin_type;
+				case NATIVE:
+				case ENUM:
+					return native_type == p_other.native_type;
+				case ENUM_VALUE:
+					return native_type == p_other.native_type && enum_type == p_other.enum_type;
+				case SCRIPT:
+					return script_type == p_other.script_type;
+				case CLASS:
+					return class_type == p_other.class_type;
+				case UNRESOLVED:
+					break;
 			}
+
 			return false;
 		}
 
-		DataType() :
-				kind(UNRESOLVED),
-				has_type(false),
-				is_constant(false),
-				is_meta_type(false),
-				infer_type(false),
-				may_yield(false),
-				builtin_type(Variant::NIL),
-				class_type(NULL) {}
+		bool operator!=(const DataType &p_other) const {
+			return !(this->operator==(p_other));
+		}
 	};
 
-	struct Node {
+	struct ParserError {
+		// TODO: Do I really need a "type"?
+		// enum Type {
+		//     NO_ERROR,
+		//     EMPTY_FILE,
+		//     CLASS_NAME_USED_TWICE,
+		//     EXTENDS_USED_TWICE,
+		//     EXPECTED_END_STATEMENT,
+		// };
+		// Type type = NO_ERROR;
+		String message;
+		int line = 0, column = 0;
+	};
 
+	struct Node {
 		enum Type {
-			TYPE_CLASS,
-			TYPE_FUNCTION,
-			TYPE_BUILT_IN_FUNCTION,
-			TYPE_BLOCK,
-			TYPE_IDENTIFIER,
-			TYPE_TYPE,
-			TYPE_CONSTANT,
-			TYPE_ARRAY,
-			TYPE_DICTIONARY,
-			TYPE_SELF,
-			TYPE_OPERATOR,
-			TYPE_CONTROL_FLOW,
-			TYPE_LOCAL_VAR,
-			TYPE_CAST,
-			TYPE_ASSERT,
-			TYPE_BREAKPOINT,
-			TYPE_NEWLINE,
+			NONE,
+			ANNOTATION,
+			ARRAY,
+			ASSERT,
+			ASSIGNMENT,
+			AWAIT,
+			BINARY_OPERATOR,
+			BREAK,
+			BREAKPOINT,
+			CALL,
+			CAST,
+			CLASS,
+			CONSTANT,
+			CONTINUE,
+			DICTIONARY,
+			ENUM,
+			FOR,
+			FUNCTION,
+			GET_NODE,
+			IDENTIFIER,
+			IF,
+			LITERAL,
+			MATCH,
+			MATCH_BRANCH,
+			PARAMETER,
+			PASS,
+			PATTERN,
+			PRELOAD,
+			RETURN,
+			SELF,
+			SIGNAL,
+			SUBSCRIPT,
+			SUITE,
+			TERNARY_OPERATOR,
+			TYPE,
+			UNARY_OPERATOR,
+			VARIABLE,
+			WHILE,
 		};
 
-		Node *next;
-		int line;
-		int column;
-		Type type;
+		Type type = NONE;
+		int start_line = 0, end_line = 0;
+		int start_column = 0, end_column = 0;
+		int leftmost_column = 0, rightmost_column = 0;
+		Node *next = nullptr;
+		List<AnnotationNode *> annotations;
 
-		virtual DataType get_datatype() const { return DataType(); }
-		virtual void set_datatype(const DataType &p_datatype) {}
+		DataType datatype;
+
+		virtual DataType get_datatype() const { return datatype; }
+		virtual void set_datatype(const DataType &p_datatype) { datatype = p_datatype; }
+
+		virtual bool is_expression() const { return false; }
 
 		virtual ~Node() {}
 	};
 
-	struct FunctionNode;
-	struct BlockNode;
-	struct ConstantNode;
-	struct LocalVarNode;
-	struct OperatorNode;
+	struct ExpressionNode : public Node {
+		// Base type for all expression kinds.
+		bool reduced = false;
+		bool is_constant = false;
+		Variant reduced_value;
 
-	struct ClassNode : public Node {
+		virtual bool is_expression() const { return true; }
+		virtual ~ExpressionNode() {}
+
+	protected:
+		ExpressionNode() {}
+	};
 
-		bool tool;
+	struct AnnotationNode : public Node {
 		StringName name;
-		bool extends_used;
-		bool classname_used;
-		StringName extends_file;
-		Vector<StringName> extends_class;
-		DataType base_type;
-		String icon_path;
+		Vector<ExpressionNode *> arguments;
+		Vector<Variant> resolved_arguments;
 
-		struct Member {
-			PropertyInfo _export;
-#ifdef TOOLS_ENABLED
-			Variant default_value;
-#endif
-			StringName identifier;
-			DataType data_type;
-			StringName setter;
-			StringName getter;
-			int line;
-			Node *expression;
-			OperatorNode *initial_assignment;
-			MultiplayerAPI::RPCMode rpc_mode;
-			int usages;
-		};
+		AnnotationInfo *info = nullptr;
 
-		struct Constant {
-			Node *expression;
-			DataType type;
-		};
+		bool apply(GDScriptParser *p_this, Node *p_target) const;
+		bool applies_to(uint32_t p_target_kinds) const;
 
-		struct Signal {
-			StringName name;
-			Vector<StringName> arguments;
-			int emissions;
-			int line;
-		};
+		AnnotationNode() {
+			type = ANNOTATION;
+		}
+	};
 
-		Vector<ClassNode *> subclasses;
-		Vector<Member> variables;
-		Map<StringName, Constant> constant_expressions;
-		Vector<FunctionNode *> functions;
-		Vector<FunctionNode *> static_functions;
-		Vector<Signal> _signals;
-		BlockNode *initializer;
-		BlockNode *ready;
-		ClassNode *owner;
-		//Vector<Node*> initializers;
-		int end_line;
+	struct ArrayNode : public ExpressionNode {
+		Vector<ExpressionNode *> elements;
 
-		ClassNode() {
-			tool = false;
-			type = TYPE_CLASS;
-			extends_used = false;
-			classname_used = false;
-			end_line = -1;
-			owner = NULL;
+		ArrayNode() {
+			type = ARRAY;
 		}
 	};
 
-	struct FunctionNode : public Node {
+	struct AssertNode : public Node {
+		ExpressionNode *condition = nullptr;
+		LiteralNode *message = nullptr;
 
-		bool _static;
-		MultiplayerAPI::RPCMode rpc_mode;
-		bool has_yield;
-		bool has_unreachable_code;
-		StringName name;
-		DataType return_type;
-		Vector<StringName> arguments;
-		Vector<DataType> argument_types;
-		Vector<Node *> default_values;
-		BlockNode *body;
-#ifdef DEBUG_ENABLED
-		Vector<int> arguments_usage;
-#endif // DEBUG_ENABLED
+		AssertNode() {
+			type = ASSERT;
+		}
+	};
 
-		virtual DataType get_datatype() const { return return_type; }
-		virtual void set_datatype(const DataType &p_datatype) { return_type = p_datatype; }
-		int get_required_argument_count() { return arguments.size() - default_values.size(); }
+	struct AssignmentNode : public ExpressionNode {
+		// Assignment is not really an expression but it's easier to parse as if it were.
+		enum Operation {
+			OP_NONE,
+			OP_ADDITION,
+			OP_SUBTRACTION,
+			OP_MULTIPLICATION,
+			OP_DIVISION,
+			OP_MODULO,
+			OP_BIT_SHIFT_LEFT,
+			OP_BIT_SHIFT_RIGHT,
+			OP_BIT_AND,
+			OP_BIT_OR,
+			OP_BIT_XOR,
+		};
 
-		FunctionNode() {
-			type = TYPE_FUNCTION;
-			_static = false;
-			rpc_mode = MultiplayerAPI::RPC_MODE_DISABLED;
-			has_yield = false;
-			has_unreachable_code = false;
+		Operation operation = OP_NONE;
+		Variant::Operator variant_op = Variant::OP_MAX;
+		ExpressionNode *assignee = nullptr;
+		ExpressionNode *assigned_value = nullptr;
+
+		AssignmentNode() {
+			type = ASSIGNMENT;
 		}
 	};
 
-	struct BlockNode : public Node {
+	struct AwaitNode : public ExpressionNode {
+		ExpressionNode *to_await = nullptr;
 
-		ClassNode *parent_class;
-		BlockNode *parent_block;
-		List<Node *> statements;
-		Map<StringName, LocalVarNode *> variables;
-		bool has_return;
+		AwaitNode() {
+			type = AWAIT;
+		}
+	};
 
-		Node *if_condition; //tiny hack to improve code completion on if () blocks
+	struct BinaryOpNode : public ExpressionNode {
+		enum OpType {
+			OP_ADDITION,
+			OP_SUBTRACTION,
+			OP_MULTIPLICATION,
+			OP_DIVISION,
+			OP_MODULO,
+			OP_BIT_LEFT_SHIFT,
+			OP_BIT_RIGHT_SHIFT,
+			OP_BIT_AND,
+			OP_BIT_OR,
+			OP_BIT_XOR,
+			OP_LOGIC_AND,
+			OP_LOGIC_OR,
+			OP_TYPE_TEST,
+			OP_CONTENT_TEST,
+			OP_COMP_EQUAL,
+			OP_COMP_NOT_EQUAL,
+			OP_COMP_LESS,
+			OP_COMP_LESS_EQUAL,
+			OP_COMP_GREATER,
+			OP_COMP_GREATER_EQUAL,
+		};
 
-		//the following is useful for code completion
-		List<BlockNode *> sub_blocks;
-		int end_line;
-		BlockNode() {
-			if_condition = NULL;
-			type = TYPE_BLOCK;
-			end_line = -1;
-			parent_block = NULL;
-			parent_class = NULL;
-			has_return = false;
+		OpType operation;
+		Variant::Operator variant_op = Variant::OP_MAX;
+		ExpressionNode *left_operand = nullptr;
+		ExpressionNode *right_operand = nullptr;
+
+		BinaryOpNode() {
+			type = BINARY_OPERATOR;
 		}
 	};
 
-	struct TypeNode : public Node {
-
-		Variant::Type vtype;
-		TypeNode() { type = TYPE_TYPE; }
+	struct BreakNode : public Node {
+		BreakNode() {
+			type = BREAK;
+		}
 	};
-	struct BuiltInFunctionNode : public Node {
-		GDScriptFunctions::Function function;
-		BuiltInFunctionNode() { type = TYPE_BUILT_IN_FUNCTION; }
+
+	struct BreakpointNode : public Node {
+		BreakpointNode() {
+			type = BREAKPOINT;
+		}
 	};
 
-	struct IdentifierNode : public Node {
+	struct CallNode : public ExpressionNode {
+		ExpressionNode *callee = nullptr;
+		Vector<ExpressionNode *> arguments;
+		StringName function_name;
+		bool is_super = false;
 
-		StringName name;
-		BlockNode *declared_block; // Simplify lookup by checking if it is declared locally
-		DataType datatype;
-		virtual DataType get_datatype() const { return datatype; }
-		virtual void set_datatype(const DataType &p_datatype) { datatype = p_datatype; }
-		IdentifierNode() {
-			type = TYPE_IDENTIFIER;
-			declared_block = NULL;
+		CallNode() {
+			type = CALL;
+		}
+
+		Type get_callee_type() const {
+			if (callee == nullptr) {
+				return Type::NONE;
+			} else {
+				return callee->type;
+			}
 		}
 	};
 
-	struct LocalVarNode : public Node {
+	struct CastNode : public ExpressionNode {
+		ExpressionNode *operand = nullptr;
+		TypeNode *cast_type = nullptr;
 
-		StringName name;
-		Node *assign;
-		OperatorNode *assign_op;
-		int assignments;
-		int usages;
-		DataType datatype;
-		virtual DataType get_datatype() const { return datatype; }
-		virtual void set_datatype(const DataType &p_datatype) { datatype = p_datatype; }
-		LocalVarNode() {
-			type = TYPE_LOCAL_VAR;
-			assign = NULL;
-			assign_op = NULL;
-			assignments = 0;
-			usages = 0;
+		CastNode() {
+			type = CAST;
 		}
 	};
 
-	struct ConstantNode : public Node {
-		Variant value;
-		DataType datatype;
-		virtual DataType get_datatype() const { return datatype; }
-		virtual void set_datatype(const DataType &p_datatype) { datatype = p_datatype; }
-		ConstantNode() { type = TYPE_CONSTANT; }
+	struct EnumNode : public Node {
+		struct Value {
+			IdentifierNode *identifier = nullptr;
+			ExpressionNode *custom_value = nullptr;
+			EnumNode *parent_enum = nullptr;
+			int index = -1;
+			bool resolved = false;
+			int value = 0;
+			int line = 0;
+			int leftmost_column = 0;
+			int rightmost_column = 0;
+		};
+		IdentifierNode *identifier = nullptr;
+		Vector<Value> values;
+
+		EnumNode() {
+			type = ENUM;
+		}
 	};
 
-	struct ArrayNode : public Node {
+	struct ClassNode : public Node {
+		struct Member {
+			enum Type {
+				UNDEFINED,
+				CLASS,
+				CONSTANT,
+				FUNCTION,
+				SIGNAL,
+				VARIABLE,
+				ENUM,
+				ENUM_VALUE, // For unnamed enums.
+			};
+
+			Type type = UNDEFINED;
+
+			union {
+				ClassNode *m_class = nullptr;
+				ConstantNode *constant;
+				FunctionNode *function;
+				SignalNode *signal;
+				VariableNode *variable;
+				EnumNode *m_enum;
+			};
+			EnumNode::Value enum_value;
+
+			String get_type_name() const {
+				switch (type) {
+					case UNDEFINED:
+						return "???";
+					case CLASS:
+						return "class";
+					case CONSTANT:
+						return "constant";
+					case FUNCTION:
+						return "function";
+					case SIGNAL:
+						return "signal";
+					case VARIABLE:
+						return "variable";
+					case ENUM:
+						return "enum";
+					case ENUM_VALUE:
+						return "enum value";
+				}
+				return "";
+			}
+
+			int get_line() const {
+				switch (type) {
+					case CLASS:
+						return m_class->start_line;
+					case CONSTANT:
+						return constant->start_line;
+					case FUNCTION:
+						return function->start_line;
+					case VARIABLE:
+						return variable->start_line;
+					case ENUM_VALUE:
+						return enum_value.line;
+					case ENUM:
+						return m_enum->start_line;
+					case SIGNAL:
+						return signal->start_line;
+					case UNDEFINED:
+						ERR_FAIL_V_MSG(-1, "Reaching undefined member type.");
+				}
+				ERR_FAIL_V_MSG(-1, "Reaching unhandled type.");
+			}
 
-		Vector<Node *> elements;
-		DataType datatype;
-		virtual DataType get_datatype() const { return datatype; }
-		virtual void set_datatype(const DataType &p_datatype) { datatype = p_datatype; }
-		ArrayNode() {
-			type = TYPE_ARRAY;
-			datatype.has_type = true;
-			datatype.kind = DataType::BUILTIN;
-			datatype.builtin_type = Variant::ARRAY;
+			DataType get_datatype() const {
+				switch (type) {
+					case CLASS:
+						return m_class->get_datatype();
+					case CONSTANT:
+						return constant->get_datatype();
+					case FUNCTION:
+						return function->get_datatype();
+					case VARIABLE:
+						return variable->get_datatype();
+					case ENUM:
+						return m_enum->get_datatype();
+					case ENUM_VALUE: {
+						// Always integer.
+						DataType type;
+						type.type_source = DataType::ANNOTATED_EXPLICIT;
+						type.kind = DataType::BUILTIN;
+						type.builtin_type = Variant::INT;
+						return type;
+					}
+					case SIGNAL: {
+						DataType type;
+						type.type_source = DataType::ANNOTATED_EXPLICIT;
+						type.kind = DataType::BUILTIN;
+						type.builtin_type = Variant::SIGNAL;
+						// TODO: Add parameter info.
+						return type;
+					}
+					case UNDEFINED:
+						return DataType();
+				}
+				ERR_FAIL_V_MSG(DataType(), "Reaching unhandled type.");
+			}
+
+			Member() {}
+
+			Member(ClassNode *p_class) {
+				type = CLASS;
+				m_class = p_class;
+			}
+			Member(ConstantNode *p_constant) {
+				type = CONSTANT;
+				constant = p_constant;
+			}
+			Member(VariableNode *p_variable) {
+				type = VARIABLE;
+				variable = p_variable;
+			}
+			Member(SignalNode *p_signal) {
+				type = SIGNAL;
+				signal = p_signal;
+			}
+			Member(FunctionNode *p_function) {
+				type = FUNCTION;
+				function = p_function;
+			}
+			Member(EnumNode *p_enum) {
+				type = ENUM;
+				m_enum = p_enum;
+			}
+			Member(const EnumNode::Value &p_enum_value) {
+				type = ENUM_VALUE;
+				enum_value = p_enum_value;
+			}
+		};
+
+		IdentifierNode *identifier = nullptr;
+		String icon_path;
+		Vector<Member> members;
+		HashMap<StringName, int> members_indices;
+		ClassNode *outer = nullptr;
+		bool extends_used = false;
+		bool onready_used = false;
+		String extends_path;
+		Vector<StringName> extends; // List for indexing: extends A.B.C
+		DataType base_type;
+		String fqcn; // Fully-qualified class name. Identifies uniquely any class in the project.
+
+		bool resolved_interface = false;
+		bool resolved_body = false;
+
+		Member get_member(const StringName &p_name) const {
+			return members[members_indices[p_name]];
+		}
+		bool has_member(const StringName &p_name) const {
+			return members_indices.has(p_name);
+		}
+		bool has_function(const StringName &p_name) const {
+			return has_member(p_name) && members[members_indices[p_name]].type == Member::FUNCTION;
+		}
+		template <class T>
+		void add_member(T *p_member_node) {
+			members_indices[p_member_node->identifier->name] = members.size();
+			members.push_back(Member(p_member_node));
+		}
+		void add_member(const EnumNode::Value &p_enum_value) {
+			members_indices[p_enum_value.identifier->name] = members.size();
+			members.push_back(Member(p_enum_value));
+		}
+
+		ClassNode() {
+			type = CLASS;
 		}
 	};
 
-	struct DictionaryNode : public Node {
+	struct ConstantNode : public Node {
+		IdentifierNode *identifier = nullptr;
+		ExpressionNode *initializer = nullptr;
+		TypeNode *datatype_specifier = nullptr;
+		bool infer_datatype = false;
+		int usages = 0;
+
+		ConstantNode() {
+			type = CONSTANT;
+		}
+	};
+
+	struct ContinueNode : public Node {
+		bool is_for_match = false;
+		ContinueNode() {
+			type = CONTINUE;
+		}
+	};
 
+	struct DictionaryNode : public ExpressionNode {
 		struct Pair {
+			ExpressionNode *key = nullptr;
+			ExpressionNode *value = nullptr;
+		};
+		Vector<Pair> elements;
 
-			Node *key;
-			Node *value;
+		enum Style {
+			LUA_TABLE,
+			PYTHON_DICT,
 		};
+		Style style = PYTHON_DICT;
 
-		Vector<Pair> elements;
-		DataType datatype;
-		virtual DataType get_datatype() const { return datatype; }
-		virtual void set_datatype(const DataType &p_datatype) { datatype = p_datatype; }
 		DictionaryNode() {
-			type = TYPE_DICTIONARY;
-			datatype.has_type = true;
-			datatype.kind = DataType::BUILTIN;
-			datatype.builtin_type = Variant::DICTIONARY;
-		}
-	};
-
-	struct SelfNode : public Node {
-		SelfNode() { type = TYPE_SELF; }
-	};
-
-	struct OperatorNode : public Node {
-		enum Operator {
-			//call/constructor operator
-			OP_CALL,
-			OP_PARENT_CALL,
-			OP_YIELD,
-			OP_IS,
-			OP_IS_BUILTIN,
-			//indexing operator
-			OP_INDEX,
-			OP_INDEX_NAMED,
-			//unary operators
-			OP_NEG,
-			OP_POS,
-			OP_NOT,
-			OP_BIT_INVERT,
-			//binary operators (in precedence order)
-			OP_IN,
-			OP_EQUAL,
-			OP_NOT_EQUAL,
-			OP_LESS,
-			OP_LESS_EQUAL,
-			OP_GREATER,
-			OP_GREATER_EQUAL,
-			OP_AND,
-			OP_OR,
-			OP_ADD,
-			OP_SUB,
-			OP_MUL,
-			OP_DIV,
-			OP_MOD,
-			OP_SHIFT_LEFT,
-			OP_SHIFT_RIGHT,
-			OP_INIT_ASSIGN,
-			OP_ASSIGN,
-			OP_ASSIGN_ADD,
-			OP_ASSIGN_SUB,
-			OP_ASSIGN_MUL,
-			OP_ASSIGN_DIV,
-			OP_ASSIGN_MOD,
-			OP_ASSIGN_SHIFT_LEFT,
-			OP_ASSIGN_SHIFT_RIGHT,
-			OP_ASSIGN_BIT_AND,
-			OP_ASSIGN_BIT_OR,
-			OP_ASSIGN_BIT_XOR,
-			OP_BIT_AND,
-			OP_BIT_OR,
-			OP_BIT_XOR,
-			//ternary operators
-			OP_TERNARY_IF,
-			OP_TERNARY_ELSE,
-		};
+			type = DICTIONARY;
+		}
+	};
 
-		Operator op;
+	struct ForNode : public Node {
+		IdentifierNode *variable = nullptr;
+		ExpressionNode *list = nullptr;
+		SuiteNode *loop = nullptr;
 
-		Vector<Node *> arguments;
-		DataType datatype;
-		virtual DataType get_datatype() const { return datatype; }
-		virtual void set_datatype(const DataType &p_datatype) { datatype = p_datatype; }
-		OperatorNode() { type = TYPE_OPERATOR; }
+		ForNode() {
+			type = FOR;
+		}
 	};
 
-	struct PatternNode : public Node {
+	struct FunctionNode : public Node {
+		IdentifierNode *identifier = nullptr;
+		Vector<ParameterNode *> parameters;
+		HashMap<StringName, int> parameters_indices;
+		TypeNode *return_type = nullptr;
+		SuiteNode *body = nullptr;
+		bool is_static = false;
+		bool is_coroutine = false;
+		MultiplayerAPI::RPCMode rpc_mode = MultiplayerAPI::RPC_MODE_DISABLED;
+		MethodInfo info;
+
+		bool resolved_signature = false;
+		bool resolved_body = false;
 
-		enum PatternType {
-			PT_CONSTANT,
-			PT_BIND,
-			PT_DICTIONARY,
-			PT_ARRAY,
-			PT_IGNORE_REST,
-			PT_WILDCARD
+		FunctionNode() {
+			type = FUNCTION;
+		}
+	};
+
+	struct GetNodeNode : public ExpressionNode {
+		LiteralNode *string = nullptr;
+		Vector<IdentifierNode *> chain;
+
+		GetNodeNode() {
+			type = GET_NODE;
+		}
+	};
+
+	struct IdentifierNode : public ExpressionNode {
+		StringName name;
+
+		enum Source {
+			UNDEFINED_SOURCE,
+			FUNCTION_PARAMETER,
+			LOCAL_CONSTANT,
+			LOCAL_VARIABLE,
+			LOCAL_ITERATOR, // `for` loop iterator.
+			LOCAL_BIND, // Pattern bind.
+			MEMBER_VARIABLE,
+			MEMBER_CONSTANT,
 		};
+		Source source = UNDEFINED_SOURCE;
 
-		PatternType pt_type;
+		union {
+			ParameterNode *parameter_source = nullptr;
+			ConstantNode *constant_source;
+			VariableNode *variable_source;
+			IdentifierNode *bind_source;
+		};
 
-		Node *constant;
-		StringName bind;
-		Map<ConstantNode *, PatternNode *> dictionary;
-		Vector<PatternNode *> array;
+		int usages = 0; // Useful for binds/iterator variable.
+
+		IdentifierNode() {
+			type = IDENTIFIER;
+		}
 	};
 
-	struct PatternBranchNode : public Node {
-		Vector<PatternNode *> patterns;
-		BlockNode *body;
+	struct IfNode : public Node {
+		ExpressionNode *condition = nullptr;
+		SuiteNode *true_block = nullptr;
+		SuiteNode *false_block = nullptr;
+
+		IfNode() {
+			type = IF;
+		}
+	};
+
+	struct LiteralNode : public ExpressionNode {
+		Variant value;
+
+		LiteralNode() {
+			type = LITERAL;
+		}
 	};
 
 	struct MatchNode : public Node {
-		Node *val_to_match;
-		Vector<PatternBranchNode *> branches;
+		ExpressionNode *test = nullptr;
+		Vector<MatchBranchNode *> branches;
 
-		struct CompiledPatternBranch {
-			Node *compiled_pattern;
-			BlockNode *body;
-		};
+		MatchNode() {
+			type = MATCH;
+		}
+	};
 
-		Vector<CompiledPatternBranch> compiled_pattern_branches;
+	struct MatchBranchNode : public Node {
+		Vector<PatternNode *> patterns;
+		SuiteNode *block;
+		bool has_wildcard = false;
+
+		MatchBranchNode() {
+			type = MATCH_BRANCH;
+		}
 	};
 
-	struct ControlFlowNode : public Node {
-		enum CFType {
-			CF_IF,
-			CF_FOR,
-			CF_WHILE,
-			CF_BREAK,
-			CF_CONTINUE,
-			CF_RETURN,
-			CF_MATCH
+	struct ParameterNode : public Node {
+		IdentifierNode *identifier = nullptr;
+		ExpressionNode *default_value = nullptr;
+		TypeNode *datatype_specifier = nullptr;
+		bool infer_datatype = false;
+		int usages = 0;
+
+		ParameterNode() {
+			type = PARAMETER;
+		}
+	};
+
+	struct PassNode : public Node {
+		PassNode() {
+			type = PASS;
+		}
+	};
+
+	struct PatternNode : public Node {
+		enum Type {
+			PT_LITERAL,
+			PT_EXPRESSION,
+			PT_BIND,
+			PT_ARRAY,
+			PT_DICTIONARY,
+			PT_REST,
+			PT_WILDCARD,
 		};
+		Type pattern_type = PT_LITERAL;
 
-		CFType cf_type;
-		Vector<Node *> arguments;
-		BlockNode *body;
-		BlockNode *body_else;
+		union {
+			LiteralNode *literal = nullptr;
+			IdentifierNode *bind;
+			ExpressionNode *expression;
+		};
+		Vector<PatternNode *> array;
+		bool rest_used = false; // For array/dict patterns.
 
-		MatchNode *match;
+		struct Pair {
+			ExpressionNode *key = nullptr;
+			PatternNode *value_pattern = nullptr;
+		};
+		Vector<Pair> dictionary;
+
+		HashMap<StringName, IdentifierNode *> binds;
 
-		ControlFlowNode *_else; //used for if
-		ControlFlowNode() {
-			type = TYPE_CONTROL_FLOW;
-			cf_type = CF_IF;
-			body = NULL;
-			body_else = NULL;
+		bool has_bind(const StringName &p_name);
+		IdentifierNode *get_bind(const StringName &p_name);
+
+		PatternNode() {
+			type = PATTERN;
 		}
 	};
+	struct PreloadNode : public ExpressionNode {
+		ExpressionNode *path = nullptr;
+		String resolved_path;
+		Ref<Resource> resource;
 
-	struct CastNode : public Node {
-		Node *source_node;
-		DataType cast_type;
-		DataType return_type;
-		virtual DataType get_datatype() const { return return_type; }
-		virtual void set_datatype(const DataType &p_datatype) { return_type = p_datatype; }
-		CastNode() { type = TYPE_CAST; }
+		PreloadNode() {
+			type = PRELOAD;
+		}
 	};
 
-	struct AssertNode : public Node {
-		Node *condition;
-		Node *message;
-		AssertNode() :
-				condition(0),
-				message(0) {
-			type = TYPE_ASSERT;
+	struct ReturnNode : public Node {
+		ExpressionNode *return_value = nullptr;
+
+		ReturnNode() {
+			type = RETURN;
 		}
 	};
 
-	struct BreakpointNode : public Node {
-		BreakpointNode() { type = TYPE_BREAKPOINT; }
-	};
+	struct SelfNode : public ExpressionNode {
+		ClassNode *current_class = nullptr;
 
-	struct NewLineNode : public Node {
-		NewLineNode() { type = TYPE_NEWLINE; }
+		SelfNode() {
+			type = SELF;
+		}
 	};
 
-	struct Expression {
+	struct SignalNode : public Node {
+		IdentifierNode *identifier = nullptr;
+		Vector<ParameterNode *> parameters;
+		HashMap<StringName, int> parameters_indices;
 
-		bool is_op;
+		SignalNode() {
+			type = SIGNAL;
+		}
+	};
+
+	struct SubscriptNode : public ExpressionNode {
+		ExpressionNode *base = nullptr;
 		union {
-			OperatorNode::Operator op;
-			Node *node;
+			ExpressionNode *index = nullptr;
+			IdentifierNode *attribute;
 		};
-	};
 
-	enum CompletionType {
-		COMPLETION_NONE,
-		COMPLETION_BUILT_IN_TYPE_CONSTANT,
-		COMPLETION_GET_NODE,
-		COMPLETION_FUNCTION,
-		COMPLETION_IDENTIFIER,
-		COMPLETION_PARENT_FUNCTION,
-		COMPLETION_METHOD,
-		COMPLETION_CALL_ARGUMENTS,
-		COMPLETION_RESOURCE_PATH,
-		COMPLETION_INDEX,
-		COMPLETION_VIRTUAL_FUNC,
-		COMPLETION_YIELD,
-		COMPLETION_ASSIGN,
-		COMPLETION_TYPE_HINT,
-		COMPLETION_TYPE_HINT_INDEX,
+		bool is_attribute = false;
+
+		SubscriptNode() {
+			type = SUBSCRIPT;
+		}
 	};
 
-private:
-	GDScriptTokenizer *tokenizer;
+	struct SuiteNode : public Node {
+		SuiteNode *parent_block = nullptr;
+		Vector<Node *> statements;
+		struct Local {
+			enum Type {
+				UNDEFINED,
+				CONSTANT,
+				VARIABLE,
+				PARAMETER,
+				FOR_VARIABLE,
+				PATTERN_BIND,
+			};
+			Type type = UNDEFINED;
+			union {
+				ConstantNode *constant = nullptr;
+				VariableNode *variable;
+				ParameterNode *parameter;
+				IdentifierNode *bind;
+			};
+			StringName name;
 
-	Node *head;
-	Node *list;
-	template <class T>
-	T *alloc_node();
-
-	bool validating;
-	bool for_completion;
-	int parenthesis;
-	bool error_set;
-	String error;
-	int error_line;
-	int error_column;
-	bool check_types;
-	bool dependencies_only;
-	List<String> dependencies;
-#ifdef DEBUG_ENABLED
-	Set<int> *safe_lines;
-#endif // DEBUG_ENABLED
+			int start_line = 0, end_line = 0;
+			int start_column = 0, end_column = 0;
+			int leftmost_column = 0, rightmost_column = 0;
+
+			DataType get_datatype() const;
+			String get_name() const;
+
+			Local() {}
+			Local(ConstantNode *p_constant) {
+				type = CONSTANT;
+				constant = p_constant;
+				name = p_constant->identifier->name;
+
+				start_line = p_constant->start_line;
+				end_line = p_constant->end_line;
+				start_column = p_constant->start_column;
+				end_column = p_constant->end_column;
+				leftmost_column = p_constant->leftmost_column;
+				rightmost_column = p_constant->rightmost_column;
+			}
+			Local(VariableNode *p_variable) {
+				type = VARIABLE;
+				variable = p_variable;
+				name = p_variable->identifier->name;
+
+				start_line = p_variable->start_line;
+				end_line = p_variable->end_line;
+				start_column = p_variable->start_column;
+				end_column = p_variable->end_column;
+				leftmost_column = p_variable->leftmost_column;
+				rightmost_column = p_variable->rightmost_column;
+			}
+			Local(ParameterNode *p_parameter) {
+				type = PARAMETER;
+				parameter = p_parameter;
+				name = p_parameter->identifier->name;
+
+				start_line = p_parameter->start_line;
+				end_line = p_parameter->end_line;
+				start_column = p_parameter->start_column;
+				end_column = p_parameter->end_column;
+				leftmost_column = p_parameter->leftmost_column;
+				rightmost_column = p_parameter->rightmost_column;
+			}
+			Local(IdentifierNode *p_identifier) {
+				type = FOR_VARIABLE;
+				bind = p_identifier;
+				name = p_identifier->name;
+
+				start_line = p_identifier->start_line;
+				end_line = p_identifier->end_line;
+				start_column = p_identifier->start_column;
+				end_column = p_identifier->end_column;
+				leftmost_column = p_identifier->leftmost_column;
+				rightmost_column = p_identifier->rightmost_column;
+			}
+		};
+		Local empty;
+		Vector<Local> locals;
+		HashMap<StringName, int> locals_indices;
+
+		FunctionNode *parent_function = nullptr;
+		ForNode *parent_for = nullptr;
+		IfNode *parent_if = nullptr;
+
+		bool has_return = false;
+		bool has_continue = false;
+		bool has_unreachable_code = false; // Just so warnings aren't given more than once per block.
+
+		bool has_local(const StringName &p_name) const;
+		const Local &get_local(const StringName &p_name) const;
+		template <class T>
+		void add_local(T *p_local) {
+			locals_indices[p_local->identifier->name] = locals.size();
+			locals.push_back(Local(p_local));
+		}
+		void add_local(const Local &p_local) {
+			locals_indices[p_local.name] = locals.size();
+			locals.push_back(p_local);
+		}
 
-#ifdef DEBUG_ENABLED
-	List<GDScriptWarning> warnings;
-#endif // DEBUG_ENABLED
+		SuiteNode() {
+			type = SUITE;
+		}
+	};
 
-	int pending_newline;
+	struct TernaryOpNode : public ExpressionNode {
+		// Only one ternary operation exists, so no abstraction here.
+		ExpressionNode *condition = nullptr;
+		ExpressionNode *true_expr = nullptr;
+		ExpressionNode *false_expr = nullptr;
 
-	struct IndentLevel {
-		int indent;
-		int tabs;
+		TernaryOpNode() {
+			type = TERNARY_OPERATOR;
+		}
+	};
+
+	struct TypeNode : public Node {
+		Vector<IdentifierNode *> type_chain;
 
-		bool is_mixed(IndentLevel other) {
-			return (
-					(indent == other.indent && tabs != other.tabs) ||
-					(indent > other.indent && tabs < other.tabs) ||
-					(indent < other.indent && tabs > other.tabs));
+		TypeNode() {
+			type = TYPE;
 		}
+	};
 
-		IndentLevel() :
-				indent(0),
-				tabs(0) {}
+	struct UnaryOpNode : public ExpressionNode {
+		enum OpType {
+			OP_POSITIVE,
+			OP_NEGATIVE,
+			OP_COMPLEMENT,
+			OP_LOGIC_NOT,
+		};
+
+		OpType operation;
+		Variant::Operator variant_op = Variant::OP_MAX;
+		ExpressionNode *operand = nullptr;
 
-		IndentLevel(int p_indent, int p_tabs) :
-				indent(p_indent),
-				tabs(p_tabs) {}
+		UnaryOpNode() {
+			type = UNARY_OPERATOR;
+		}
 	};
 
-	List<IndentLevel> indent_level;
+	struct VariableNode : public Node {
+		enum PropertyStyle {
+			PROP_NONE,
+			PROP_INLINE,
+			PROP_SETGET,
+		};
 
-	String base_path;
-	String self_path;
+		IdentifierNode *identifier = nullptr;
+		ExpressionNode *initializer = nullptr;
+		TypeNode *datatype_specifier = nullptr;
+		bool infer_datatype = false;
 
-	ClassNode *current_class;
-	FunctionNode *current_function;
-	BlockNode *current_block;
+		PropertyStyle property = PROP_NONE;
+		union {
+			SuiteNode *setter = nullptr;
+			IdentifierNode *setter_pointer;
+		};
+		IdentifierNode *setter_parameter = nullptr;
+		union {
+			SuiteNode *getter = nullptr;
+			IdentifierNode *getter_pointer;
+		};
 
-	bool _get_completable_identifier(CompletionType p_type, StringName &identifier);
-	void _make_completable_call(int p_arg);
+		bool exported = false;
+		bool onready = false;
+		PropertyInfo export_info;
+		MultiplayerAPI::RPCMode rpc_mode = MultiplayerAPI::RPC_MODE_DISABLED;
+		int assignments = 0;
+		int usages = 0;
 
-	CompletionType completion_type;
-	StringName completion_cursor;
-	Variant::Type completion_built_in_constant;
-	Node *completion_node;
-	ClassNode *completion_class;
-	FunctionNode *completion_function;
-	BlockNode *completion_block;
-	int completion_line;
-	int completion_argument;
-	bool completion_found;
-	bool completion_ident_is_call;
+		VariableNode() {
+			type = VARIABLE;
+		}
+	};
 
-	PropertyInfo current_export;
+	struct WhileNode : public Node {
+		ExpressionNode *condition = nullptr;
+		SuiteNode *loop = nullptr;
 
-	MultiplayerAPI::RPCMode rpc_mode;
+		WhileNode() {
+			type = WHILE;
+		}
+	};
 
-	void _set_error(const String &p_error, int p_line = -1, int p_column = -1);
-#ifdef DEBUG_ENABLED
-	void _add_warning(int p_code, int p_line = -1, const String &p_symbol1 = String(), const String &p_symbol2 = String(), const String &p_symbol3 = String(), const String &p_symbol4 = String());
-	void _add_warning(int p_code, int p_line, const Vector<String> &p_symbols);
-#endif // DEBUG_ENABLED
-	bool _recover_from_completion();
-
-	bool _parse_arguments(Node *p_parent, Vector<Node *> &p_args, bool p_static, bool p_can_codecomplete = false, bool p_parsing_constant = false);
-	bool _enter_indent_block(BlockNode *p_block = NULL);
-	bool _parse_newline();
-	Node *_parse_expression(Node *p_parent, bool p_static, bool p_allow_assign = false, bool p_parsing_constant = false);
-	Node *_reduce_expression(Node *p_node, bool p_to_const = false);
-	Node *_parse_and_reduce_expression(Node *p_parent, bool p_static, bool p_reduce_const = false, bool p_allow_assign = false);
-
-	PatternNode *_parse_pattern(bool p_static);
-	void _parse_pattern_block(BlockNode *p_block, Vector<PatternBranchNode *> &p_branches, bool p_static);
-	void _transform_match_statment(MatchNode *p_match_statement);
-	void _generate_pattern(PatternNode *p_pattern, Node *p_node_to_match, Node *&p_resulting_node, Map<StringName, Node *> &p_bindings);
-
-	void _parse_block(BlockNode *p_block, bool p_static);
-	void _parse_extends(ClassNode *p_class);
-	void _parse_class(ClassNode *p_class);
-	bool _end_statement();
-
-	void _determine_inheritance(ClassNode *p_class, bool p_recursive = true);
-	bool _parse_type(DataType &r_type, bool p_can_be_void = false);
-	DataType _resolve_type(const DataType &p_source, int p_line);
-	DataType _type_from_variant(const Variant &p_value) const;
-	DataType _type_from_property(const PropertyInfo &p_property, bool p_nil_is_variant = true) const;
-	DataType _type_from_gdtype(const GDScriptDataType &p_gdtype) const;
-	DataType _get_operation_type(const Variant::Operator p_op, const DataType &p_a, const DataType &p_b, bool &r_valid) const;
-	Variant::Operator _get_variant_operation(const OperatorNode::Operator &p_op) const;
-	bool _get_function_signature(DataType &p_base_type, const StringName &p_function, DataType &r_return_type, List<DataType> &r_arg_types, int &r_default_arg_count, bool &r_static, bool &r_vararg) const;
-	bool _get_member_type(const DataType &p_base_type, const StringName &p_member, DataType &r_member_type) const;
-	bool _is_type_compatible(const DataType &p_container, const DataType &p_expression, bool p_allow_implicit_conversion = false) const;
-	Node *_get_default_value_for_type(const DataType &p_type, int p_line = -1);
-
-	DataType _reduce_node_type(Node *p_node);
-	DataType _reduce_function_call_type(const OperatorNode *p_call);
-	DataType _reduce_identifier_type(const DataType *p_base_type, const StringName &p_identifier, int p_line, bool p_is_indexing);
-	void _check_class_level_types(ClassNode *p_class);
-	void _check_class_blocks_types(ClassNode *p_class);
-	void _check_function_types(FunctionNode *p_function);
-	void _check_block_types(BlockNode *p_block);
-	_FORCE_INLINE_ void _mark_line_as_safe(int p_line) const {
-#ifdef DEBUG_ENABLED
-		if (safe_lines) safe_lines->insert(p_line);
-#endif // DEBUG_ENABLED
-	}
-	_FORCE_INLINE_ void _mark_line_as_unsafe(int p_line) const {
-#ifdef DEBUG_ENABLED
-		if (safe_lines) safe_lines->erase(p_line);
-#endif // DEBUG_ENABLED
-	}
+	enum CompletionType {
+		COMPLETION_NONE,
+		COMPLETION_ANNOTATION, // Annotation (following @).
+		COMPLETION_ANNOTATION_ARGUMENTS, // Annotation arguments hint.
+		COMPLETION_ASSIGN, // Assignment based on type (e.g. enum values).
+		COMPLETION_ATTRIBUTE, // After id.| to look for members.
+		COMPLETION_ATTRIBUTE_METHOD, // After id.| to look for methods.
+		COMPLETION_BUILT_IN_TYPE_CONSTANT, // Constants inside a built-in type (e.g. Color.blue).
+		COMPLETION_CALL_ARGUMENTS, // Complete with nodes, input actions, enum values (or usual expressions).
+		// TODO: COMPLETION_DECLARATION, // Potential declaration (var, const, func).
+		COMPLETION_GET_NODE, // Get node with $ notation.
+		COMPLETION_IDENTIFIER, // List available identifiers in scope.
+		COMPLETION_INHERIT_TYPE, // Type after extends. Exclude non-viable types (built-ins, enums, void). Includes subtypes using the argument index.
+		COMPLETION_METHOD, // List available methods in scope.
+		COMPLETION_OVERRIDE_METHOD, // Override implementation, also for native virtuals.
+		COMPLETION_PROPERTY_DECLARATION, // Property declaration (get, set).
+		COMPLETION_PROPERTY_DECLARATION_OR_TYPE, // Property declaration (get, set) or a type hint.
+		COMPLETION_PROPERTY_METHOD, // Property setter or getter (list available methods).
+		COMPLETION_RESOURCE_PATH, // For load/preload.
+		COMPLETION_SUBSCRIPT, // Inside id[|].
+		COMPLETION_SUPER_METHOD, // After super.
+		COMPLETION_TYPE_ATTRIBUTE, // Attribute in type name (Type.|).
+		COMPLETION_TYPE_NAME, // Name of type (after :).
+		COMPLETION_TYPE_NAME_OR_VOID, // Same as TYPE_NAME, but allows void (in function return type).
+	};
 
-	Error _parse(const String &p_base_path);
+	struct CompletionContext {
+		CompletionType type = COMPLETION_NONE;
+		ClassNode *current_class = nullptr;
+		FunctionNode *current_function = nullptr;
+		SuiteNode *current_suite = nullptr;
+		int current_line = -1;
+		int current_argument = -1;
+		Variant::Type builtin_type = Variant::VARIANT_MAX;
+		Node *node = nullptr;
+		Object *base = nullptr;
+		List<Ref<GDScriptParserRef>> dependent_parsers;
+	};
 
-public:
-	bool has_error() const;
-	String get_error() const;
-	int get_error_line() const;
-	int get_error_column() const;
+	struct CompletionCall {
+		Node *call = nullptr;
+		int argument = -1;
+	};
+
+private:
+	friend class GDScriptAnalyzer;
+
+	bool _is_tool = false;
+	String script_path;
+	bool for_completion = false;
+	bool panic_mode = false;
+	bool can_break = false;
+	bool can_continue = false;
+	bool is_continue_match = false; // Whether a `continue` will act on a `match`.
+	bool is_ignoring_warnings = false;
+	List<bool> multiline_stack;
+
+	ClassNode *head = nullptr;
+	Node *list = nullptr;
+	List<ParserError> errors;
 #ifdef DEBUG_ENABLED
-	const List<GDScriptWarning> &get_warnings() const { return warnings; }
-#endif // DEBUG_ENABLED
-	Error parse(const String &p_code, const String &p_base_path = "", bool p_just_validate = false, const String &p_self_path = "", bool p_for_completion = false, Set<int> *r_safe_lines = NULL, bool p_dependencies_only = false);
-	Error parse_bytecode(const Vector<uint8_t> &p_bytecode, const String &p_base_path = "", const String &p_self_path = "");
+	List<GDScriptWarning> warnings;
+	Set<String> ignored_warnings;
+	Set<int> unsafe_lines;
+#endif
 
-	bool is_tool_script() const;
-	const Node *get_parse_tree() const;
+	GDScriptTokenizer tokenizer;
+	GDScriptTokenizer::Token previous;
+	GDScriptTokenizer::Token current;
+
+	ClassNode *current_class = nullptr;
+	FunctionNode *current_function = nullptr;
+	SuiteNode *current_suite = nullptr;
+
+	CompletionContext completion_context;
+	CompletionCall completion_call;
+	List<CompletionCall> completion_call_stack;
+	bool passed_cursor = false;
+
+	typedef bool (GDScriptParser::*AnnotationAction)(const AnnotationNode *p_annotation, Node *p_target);
+	struct AnnotationInfo {
+		enum TargetKind {
+			NONE = 0,
+			SCRIPT = 1 << 0,
+			CLASS = 1 << 1,
+			VARIABLE = 1 << 2,
+			CONSTANT = 1 << 3,
+			SIGNAL = 1 << 4,
+			FUNCTION = 1 << 5,
+			STATEMENT = 1 << 6,
+			CLASS_LEVEL = CLASS | VARIABLE | FUNCTION,
+		};
+		uint32_t target_kind = 0; // Flags.
+		AnnotationAction apply = nullptr;
+		MethodInfo info;
+	};
+	HashMap<StringName, AnnotationInfo> valid_annotations;
+	List<AnnotationNode *> annotation_stack;
+
+	typedef ExpressionNode *(GDScriptParser::*ParseFunction)(ExpressionNode *p_previous_operand, bool p_can_assign);
+	// Higher value means higher precedence (i.e. is evaluated first).
+	enum Precedence {
+		PREC_NONE,
+		PREC_ASSIGNMENT,
+		PREC_CAST,
+		PREC_TERNARY,
+		PREC_LOGIC_OR,
+		PREC_LOGIC_AND,
+		PREC_LOGIC_NOT,
+		PREC_CONTENT_TEST,
+		PREC_COMPARISON,
+		PREC_BIT_OR,
+		PREC_BIT_XOR,
+		PREC_BIT_AND,
+		PREC_BIT_SHIFT,
+		PREC_SUBTRACTION,
+		PREC_ADDITION,
+		PREC_FACTOR,
+		PREC_SIGN,
+		PREC_BIT_NOT,
+		PREC_TYPE_TEST,
+		PREC_AWAIT,
+		PREC_CALL,
+		PREC_ATTRIBUTE,
+		PREC_SUBSCRIPT,
+		PREC_PRIMARY,
+	};
+	struct ParseRule {
+		ParseFunction prefix = nullptr;
+		ParseFunction infix = nullptr;
+		Precedence precedence = PREC_NONE;
+	};
+	static ParseRule *get_rule(GDScriptTokenizer::Token::Type p_token_type);
 
-	//completion info
+	template <class T>
+	T *alloc_node() {
+		T *node = memnew(T);
 
-	CompletionType get_completion_type();
-	StringName get_completion_cursor();
-	int get_completion_line();
-	Variant::Type get_completion_built_in_constant();
-	Node *get_completion_node();
-	ClassNode *get_completion_class();
-	BlockNode *get_completion_block();
-	FunctionNode *get_completion_function();
-	int get_completion_argument_index();
-	int get_completion_identifier_is_function();
+		node->next = list;
+		list = node;
 
-	const List<String> &get_dependencies() const { return dependencies; }
+		// TODO: Properly set positions for all nodes.
+		node->start_line = previous.start_line;
+		node->end_line = previous.end_line;
+		node->start_column = previous.start_column;
+		node->end_column = previous.end_column;
+		node->leftmost_column = previous.leftmost_column;
+		node->rightmost_column = previous.rightmost_column;
 
+		return node;
+	}
 	void clear();
+	void push_error(const String &p_message, const Node *p_origin = nullptr);
+#ifdef DEBUG_ENABLED
+	void push_warning(const Node *p_source, GDScriptWarning::Code p_code, const String &p_symbol1 = String(), const String &p_symbol2 = String(), const String &p_symbol3 = String(), const String &p_symbol4 = String());
+	void push_warning(const Node *p_source, GDScriptWarning::Code p_code, const Vector<String> &p_symbols);
+#endif
+
+	void make_completion_context(CompletionType p_type, Node *p_node, int p_argument = -1, bool p_force = false);
+	void make_completion_context(CompletionType p_type, Variant::Type p_builtin_type, bool p_force = false);
+	void push_completion_call(Node *p_call);
+	void pop_completion_call();
+	void set_last_completion_call_arg(int p_argument);
+
+	GDScriptTokenizer::Token advance();
+	bool match(GDScriptTokenizer::Token::Type p_token_type);
+	bool check(GDScriptTokenizer::Token::Type p_token_type);
+	bool consume(GDScriptTokenizer::Token::Type p_token_type, const String &p_error_message);
+	bool is_at_end();
+	bool is_statement_end();
+	void end_statement(const String &p_context);
+	void synchronize();
+	void push_multiline(bool p_state);
+	void pop_multiline();
+
+	// Main blocks.
+	void parse_program();
+	ClassNode *parse_class();
+	void parse_class_name();
+	void parse_extends();
+	void parse_class_body();
+	template <class T>
+	void parse_class_member(T *(GDScriptParser::*p_parse_function)(), AnnotationInfo::TargetKind p_target, const String &p_member_kind);
+	SignalNode *parse_signal();
+	EnumNode *parse_enum();
+	ParameterNode *parse_parameter();
+	FunctionNode *parse_function();
+	SuiteNode *parse_suite(const String &p_context, SuiteNode *p_suite = nullptr);
+	// Annotations
+	AnnotationNode *parse_annotation(uint32_t p_valid_targets);
+	bool register_annotation(const MethodInfo &p_info, uint32_t p_target_kinds, AnnotationAction p_apply, int p_optional_arguments = 0, bool p_is_vararg = false);
+	bool validate_annotation_arguments(AnnotationNode *p_annotation);
+	void clear_unused_annotations();
+	bool tool_annotation(const AnnotationNode *p_annotation, Node *p_target);
+	bool icon_annotation(const AnnotationNode *p_annotation, Node *p_target);
+	bool onready_annotation(const AnnotationNode *p_annotation, Node *p_target);
+	template <PropertyHint t_hint, Variant::Type t_type>
+	bool export_annotations(const AnnotationNode *p_annotation, Node *p_target);
+	bool warning_annotations(const AnnotationNode *p_annotation, Node *p_target);
+	template <MultiplayerAPI::RPCMode t_mode>
+	bool network_annotations(const AnnotationNode *p_annotation, Node *p_target);
+	// Statements.
+	Node *parse_statement();
+	VariableNode *parse_variable();
+	VariableNode *parse_variable(bool p_allow_property);
+	VariableNode *parse_property(VariableNode *p_variable, bool p_need_indent);
+	void parse_property_getter(VariableNode *p_variable);
+	void parse_property_setter(VariableNode *p_variable);
+	ConstantNode *parse_constant();
+	AssertNode *parse_assert();
+	BreakNode *parse_break();
+	ContinueNode *parse_continue();
+	ForNode *parse_for();
+	IfNode *parse_if(const String &p_token = "if");
+	MatchNode *parse_match();
+	MatchBranchNode *parse_match_branch();
+	PatternNode *parse_match_pattern(PatternNode *p_root_pattern = nullptr);
+	WhileNode *parse_while();
+	// Expressions.
+	ExpressionNode *parse_expression(bool p_can_assign, bool p_stop_on_assign = false);
+	ExpressionNode *parse_precedence(Precedence p_precedence, bool p_can_assign, bool p_stop_on_assign = false);
+	ExpressionNode *parse_literal(ExpressionNode *p_previous_operand, bool p_can_assign);
+	LiteralNode *parse_literal();
+	ExpressionNode *parse_self(ExpressionNode *p_previous_operand, bool p_can_assign);
+	ExpressionNode *parse_identifier(ExpressionNode *p_previous_operand, bool p_can_assign);
+	IdentifierNode *parse_identifier();
+	ExpressionNode *parse_builtin_constant(ExpressionNode *p_previous_operand, bool p_can_assign);
+	ExpressionNode *parse_unary_operator(ExpressionNode *p_previous_operand, bool p_can_assign);
+	ExpressionNode *parse_binary_operator(ExpressionNode *p_previous_operand, bool p_can_assign);
+	ExpressionNode *parse_ternary_operator(ExpressionNode *p_previous_operand, bool p_can_assign);
+	ExpressionNode *parse_assignment(ExpressionNode *p_previous_operand, bool p_can_assign);
+	ExpressionNode *parse_array(ExpressionNode *p_previous_operand, bool p_can_assign);
+	ExpressionNode *parse_dictionary(ExpressionNode *p_previous_operand, bool p_can_assign);
+	ExpressionNode *parse_call(ExpressionNode *p_previous_operand, bool p_can_assign);
+	ExpressionNode *parse_get_node(ExpressionNode *p_previous_operand, bool p_can_assign);
+	ExpressionNode *parse_preload(ExpressionNode *p_previous_operand, bool p_can_assign);
+	ExpressionNode *parse_grouping(ExpressionNode *p_previous_operand, bool p_can_assign);
+	ExpressionNode *parse_cast(ExpressionNode *p_previous_operand, bool p_can_assign);
+	ExpressionNode *parse_await(ExpressionNode *p_previous_operand, bool p_can_assign);
+	ExpressionNode *parse_attribute(ExpressionNode *p_previous_operand, bool p_can_assign);
+	ExpressionNode *parse_subscript(ExpressionNode *p_previous_operand, bool p_can_assign);
+	ExpressionNode *parse_invalid_token(ExpressionNode *p_previous_operand, bool p_can_assign);
+	TypeNode *parse_type(bool p_allow_void = false);
+
+public:
+	Error parse(const String &p_source_code, const String &p_script_path, bool p_for_completion);
+	ClassNode *get_tree() const { return head; }
+	bool is_tool() const { return _is_tool; }
+	static Variant::Type get_builtin_type(const StringName &p_type);
+	static GDScriptFunctions::Function get_builtin_function(const StringName &p_name);
+
+	CompletionContext get_completion_context() const { return completion_context; }
+	CompletionCall get_completion_call() const { return completion_call; }
+	void get_annotation_list(List<MethodInfo> *r_annotations) const;
+
+	const List<ParserError> &get_errors() const { return errors; }
+	const List<String> get_dependencies() const {
+		// TODO: Keep track of deps.
+		return List<String>();
+	}
+#ifdef DEBUG_ENABLED
+	const List<GDScriptWarning> &get_warnings() const { return warnings; }
+	const Set<int> &get_unsafe_lines() const { return unsafe_lines; }
+	int get_last_line_number() const { return current.end_line; }
+#endif
+
 	GDScriptParser();
 	~GDScriptParser();
+
+#ifdef DEBUG_ENABLED
+	class TreePrinter {
+		int indent_level = 0;
+		String indent;
+		StringBuilder printed;
+		bool pending_indent = false;
+
+		void increase_indent();
+		void decrease_indent();
+		void push_line(const String &p_line = String());
+		void push_text(const String &p_text);
+
+		void print_annotation(AnnotationNode *p_annotation);
+		void print_array(ArrayNode *p_array);
+		void print_assert(AssertNode *p_assert);
+		void print_assignment(AssignmentNode *p_assignment);
+		void print_await(AwaitNode *p_await);
+		void print_binary_op(BinaryOpNode *p_binary_op);
+		void print_call(CallNode *p_call);
+		void print_cast(CastNode *p_cast);
+		void print_class(ClassNode *p_class);
+		void print_constant(ConstantNode *p_constant);
+		void print_dictionary(DictionaryNode *p_dictionary);
+		void print_expression(ExpressionNode *p_expression);
+		void print_enum(EnumNode *p_enum);
+		void print_for(ForNode *p_for);
+		void print_function(FunctionNode *p_function);
+		void print_get_node(GetNodeNode *p_get_node);
+		void print_if(IfNode *p_if, bool p_is_elif = false);
+		void print_identifier(IdentifierNode *p_identifier);
+		void print_literal(LiteralNode *p_literal);
+		void print_match(MatchNode *p_match);
+		void print_match_branch(MatchBranchNode *p_match_branch);
+		void print_match_pattern(PatternNode *p_match_pattern);
+		void print_parameter(ParameterNode *p_parameter);
+		void print_preload(PreloadNode *p_preload);
+		void print_return(ReturnNode *p_return);
+		void print_self(SelfNode *p_self);
+		void print_signal(SignalNode *p_signal);
+		void print_statement(Node *p_statement);
+		void print_subscript(SubscriptNode *p_subscript);
+		void print_suite(SuiteNode *p_suite);
+		void print_type(TypeNode *p_type);
+		void print_ternary_op(TernaryOpNode *p_ternary_op);
+		void print_unary_op(UnaryOpNode *p_unary_op);
+		void print_variable(VariableNode *p_variable);
+		void print_while(WhileNode *p_while);
+
+	public:
+		void print_tree(const GDScriptParser &p_parser);
+	};
+#endif // DEBUG_ENABLED
+	static void cleanup();
 };
 
 #endif // GDSCRIPT_PARSER_H
diff --git a/modules/gdscript/gdscript_tokenizer.cpp b/modules/gdscript/gdscript_tokenizer.cpp
index 11ffa22906..9a40aa50ac 100644
--- a/modules/gdscript/gdscript_tokenizer.cpp
+++ b/modules/gdscript/gdscript_tokenizer.cpp
@@ -30,1500 +30,1384 @@
 
 #include "gdscript_tokenizer.h"
 
-#include "core/io/marshalls.h"
-#include "core/map.h"
-#include "core/print_string.h"
-#include "gdscript_functions.h"
-
-const char *GDScriptTokenizer::token_names[TK_MAX] = {
-	"Empty",
-	"Identifier",
-	"Constant",
-	"Self",
-	"Built-In Type",
-	"Built-In Func",
-	"In",
-	"'=='",
-	"'!='",
-	"'<'",
-	"'<='",
-	"'>'",
-	"'>='",
-	"'and'",
-	"'or'",
-	"'not'",
-	"'+'",
-	"'-'",
-	"'*'",
-	"'/'",
-	"'%'",
-	"'<<'",
-	"'>>'",
-	"'='",
-	"'+='",
-	"'-='",
-	"'*='",
-	"'/='",
-	"'%='",
-	"'<<='",
-	"'>>='",
-	"'&='",
-	"'|='",
-	"'^='",
-	"'&'",
-	"'|'",
-	"'^'",
-	"'~'",
-	//"Plus Plus",
-	//"Minus Minus",
-	"if",
-	"elif",
-	"else",
-	"for",
-	"while",
-	"break",
-	"continue",
-	"pass",
-	"return",
-	"match",
-	"func",
-	"class",
-	"class_name",
-	"extends",
-	"is",
-	"onready",
-	"tool",
-	"static",
-	"export",
-	"setget",
-	"const",
-	"var",
-	"as",
-	"void",
-	"enum",
-	"preload",
-	"assert",
-	"yield",
-	"signal",
-	"breakpoint",
-	"rpc",
-	"sync",
-	"master",
-	"puppet",
-	"slave",
-	"remotesync",
-	"mastersync",
-	"puppetsync",
-	"'['",
-	"']'",
-	"'{'",
-	"'}'",
-	"'('",
-	"')'",
-	"','",
-	"';'",
-	"'.'",
-	"'?'",
-	"':'",
-	"'$'",
-	"'->'",
-	"'\\n'",
-	"PI",
-	"TAU",
-	"_",
-	"INF",
-	"NAN",
-	"Error",
-	"EOF",
-	"Cursor"
+#include "core/error_macros.h"
+
+#ifdef TOOLS_ENABLED
+#include "editor/editor_settings.h"
+#endif
+
+static const char *token_names[] = {
+	"Empty", // EMPTY,
+	// Basic
+	"Annotation", // ANNOTATION
+	"Identifier", // IDENTIFIER,
+	"Literal", // LITERAL,
+	// Comparison
+	"<", // LESS,
+	"<=", // LESS_EQUAL,
+	">", // GREATER,
+	">=", // GREATER_EQUAL,
+	"==", // EQUAL_EQUAL,
+	"!=", // BANG_EQUAL,
+	// Logical
+	"and", // AND,
+	"or", // OR,
+	"not", // NOT,
+	"&&", // AMPERSAND_AMPERSAND,
+	"||", // PIPE_PIPE,
+	"!", // BANG,
+	// Bitwise
+	"&", // AMPERSAND,
+	"|", // PIPE,
+	"~", // TILDE,
+	"^", // CARET,
+	"<<", // LESS_LESS,
+	">>", // GREATER_GREATER,
+	// Math
+	"+", // PLUS,
+	"-", // MINUS,
+	"*", // STAR,
+	"/", // SLASH,
+	"%", // PERCENT,
+	// Assignment
+	"=", // EQUAL,
+	"+=", // PLUS_EQUAL,
+	"-=", // MINUS_EQUAL,
+	"*=", // STAR_EQUAL,
+	"/=", // SLASH_EQUAL,
+	"%=", // PERCENT_EQUAL,
+	"<<=", // LESS_LESS_EQUAL,
+	">>=", // GREATER_GREATER_EQUAL,
+	"&=", // AMPERSAND_EQUAL,
+	"|=", // PIPE_EQUAL,
+	"^=", // CARET_EQUAL,
+	// Control flow
+	"if", // IF,
+	"elif", // ELIF,
+	"else", // ELSE,
+	"for", // FOR,
+	"while", // WHILE,
+	"break", // BREAK,
+	"continue", // CONTINUE,
+	"pass", // PASS,
+	"return", // RETURN,
+	"match", // MATCH,
+	// Keywords
+	"as", // AS,
+	"assert", // ASSERT,
+	"await", // AWAIT,
+	"breakpoint", // BREAKPOINT,
+	"class", // CLASS,
+	"class_name", // CLASS_NAME,
+	"const", // CONST,
+	"enum", // ENUM,
+	"extends", // EXTENDS,
+	"func", // FUNC,
+	"in", // IN,
+	"is", // IS,
+	"namespace", // NAMESPACE
+	"preload", // PRELOAD,
+	"self", // SELF,
+	"signal", // SIGNAL,
+	"static", // STATIC,
+	"super", // SUPER,
+	"trait", // TRAIT,
+	"var", // VAR,
+	"void", // VOID,
+	"yield", // YIELD,
+	// Punctuation
+	"[", // BRACKET_OPEN,
+	"]", // BRACKET_CLOSE,
+	"{", // BRACE_OPEN,
+	"}", // BRACE_CLOSE,
+	"(", // PARENTHESIS_OPEN,
+	")", // PARENTHESIS_CLOSE,
+	",", // COMMA,
+	";", // SEMICOLON,
+	".", // PERIOD,
+	"..", // PERIOD_PERIOD,
+	":", // COLON,
+	"$", // DOLLAR,
+	"->", // FORWARD_ARROW,
+	"_", // UNDERSCORE,
+	// Whitespace
+	"Newline", // NEWLINE,
+	"Indent", // INDENT,
+	"Dedent", // DEDENT,
+	// Constants
+	"PI", // CONST_PI,
+	"TAU", // CONST_TAU,
+	"INF", // CONST_INF,
+	"NaN", // CONST_NAN,
+	// Error message improvement
+	"VCS conflict marker", // VCS_CONFLICT_MARKER,
+	"`", // BACKTICK,
+	"?", // QUESTION_MARK,
+	// Special
+	"Error", // ERROR,
+	"End of file", // EOF,
 };
 
-struct _bit {
-	Variant::Type type;
-	const char *text;
-};
-//built in types
-
-static const _bit _type_list[] = {
-	//types
-	{ Variant::BOOL, "bool" },
-	{ Variant::INT, "int" },
-	{ Variant::REAL, "float" },
-	{ Variant::STRING, "String" },
-	{ Variant::VECTOR2, "Vector2" },
-	{ Variant::RECT2, "Rect2" },
-	{ Variant::TRANSFORM2D, "Transform2D" },
-	{ Variant::VECTOR3, "Vector3" },
-	{ Variant::AABB, "AABB" },
-	{ Variant::PLANE, "Plane" },
-	{ Variant::QUAT, "Quat" },
-	{ Variant::BASIS, "Basis" },
-	{ Variant::TRANSFORM, "Transform" },
-	{ Variant::COLOR, "Color" },
-	{ Variant::_RID, "RID" },
-	{ Variant::OBJECT, "Object" },
-	{ Variant::NODE_PATH, "NodePath" },
-	{ Variant::DICTIONARY, "Dictionary" },
-	{ Variant::ARRAY, "Array" },
-	{ Variant::POOL_BYTE_ARRAY, "PoolByteArray" },
-	{ Variant::POOL_INT_ARRAY, "PoolIntArray" },
-	{ Variant::POOL_REAL_ARRAY, "PoolRealArray" },
-	{ Variant::POOL_STRING_ARRAY, "PoolStringArray" },
-	{ Variant::POOL_VECTOR2_ARRAY, "PoolVector2Array" },
-	{ Variant::POOL_VECTOR3_ARRAY, "PoolVector3Array" },
-	{ Variant::POOL_COLOR_ARRAY, "PoolColorArray" },
-	{ Variant::VARIANT_MAX, NULL },
-};
-
-struct _kws {
-	GDScriptTokenizer::Token token;
-	const char *text;
-};
-
-static const _kws _keyword_list[] = {
-	//ops
-	{ GDScriptTokenizer::TK_OP_IN, "in" },
-	{ GDScriptTokenizer::TK_OP_NOT, "not" },
-	{ GDScriptTokenizer::TK_OP_OR, "or" },
-	{ GDScriptTokenizer::TK_OP_AND, "and" },
-	//func
-	{ GDScriptTokenizer::TK_PR_FUNCTION, "func" },
-	{ GDScriptTokenizer::TK_PR_CLASS, "class" },
-	{ GDScriptTokenizer::TK_PR_CLASS_NAME, "class_name" },
-	{ GDScriptTokenizer::TK_PR_EXTENDS, "extends" },
-	{ GDScriptTokenizer::TK_PR_IS, "is" },
-	{ GDScriptTokenizer::TK_PR_ONREADY, "onready" },
-	{ GDScriptTokenizer::TK_PR_TOOL, "tool" },
-	{ GDScriptTokenizer::TK_PR_STATIC, "static" },
-	{ GDScriptTokenizer::TK_PR_EXPORT, "export" },
-	{ GDScriptTokenizer::TK_PR_SETGET, "setget" },
-	{ GDScriptTokenizer::TK_PR_VAR, "var" },
-	{ GDScriptTokenizer::TK_PR_AS, "as" },
-	{ GDScriptTokenizer::TK_PR_VOID, "void" },
-	{ GDScriptTokenizer::TK_PR_PRELOAD, "preload" },
-	{ GDScriptTokenizer::TK_PR_ASSERT, "assert" },
-	{ GDScriptTokenizer::TK_PR_YIELD, "yield" },
-	{ GDScriptTokenizer::TK_PR_SIGNAL, "signal" },
-	{ GDScriptTokenizer::TK_PR_BREAKPOINT, "breakpoint" },
-	{ GDScriptTokenizer::TK_PR_REMOTE, "remote" },
-	{ GDScriptTokenizer::TK_PR_MASTER, "master" },
-	{ GDScriptTokenizer::TK_PR_SLAVE, "slave" },
-	{ GDScriptTokenizer::TK_PR_PUPPET, "puppet" },
-	{ GDScriptTokenizer::TK_PR_SYNC, "sync" },
-	{ GDScriptTokenizer::TK_PR_REMOTESYNC, "remotesync" },
-	{ GDScriptTokenizer::TK_PR_MASTERSYNC, "mastersync" },
-	{ GDScriptTokenizer::TK_PR_PUPPETSYNC, "puppetsync" },
-	{ GDScriptTokenizer::TK_PR_CONST, "const" },
-	{ GDScriptTokenizer::TK_PR_ENUM, "enum" },
-	//controlflow
-	{ GDScriptTokenizer::TK_CF_IF, "if" },
-	{ GDScriptTokenizer::TK_CF_ELIF, "elif" },
-	{ GDScriptTokenizer::TK_CF_ELSE, "else" },
-	{ GDScriptTokenizer::TK_CF_FOR, "for" },
-	{ GDScriptTokenizer::TK_CF_WHILE, "while" },
-	{ GDScriptTokenizer::TK_CF_BREAK, "break" },
-	{ GDScriptTokenizer::TK_CF_CONTINUE, "continue" },
-	{ GDScriptTokenizer::TK_CF_RETURN, "return" },
-	{ GDScriptTokenizer::TK_CF_MATCH, "match" },
-	{ GDScriptTokenizer::TK_CF_PASS, "pass" },
-	{ GDScriptTokenizer::TK_SELF, "self" },
-	{ GDScriptTokenizer::TK_CONST_PI, "PI" },
-	{ GDScriptTokenizer::TK_CONST_TAU, "TAU" },
-	{ GDScriptTokenizer::TK_WILDCARD, "_" },
-	{ GDScriptTokenizer::TK_CONST_INF, "INF" },
-	{ GDScriptTokenizer::TK_CONST_NAN, "NAN" },
-	{ GDScriptTokenizer::TK_ERROR, NULL }
-};
-
-const char *GDScriptTokenizer::get_token_name(Token p_token) {
+// Avoid desync.
+static_assert(sizeof(token_names) / sizeof(token_names[0]) == GDScriptTokenizer::Token::TK_MAX, "Amount of token names don't match the amount of token types.");
 
-	ERR_FAIL_INDEX_V(p_token, TK_MAX, "<error>");
-	return token_names[p_token];
+const char *GDScriptTokenizer::Token::get_name() const {
+	ERR_FAIL_INDEX_V_MSG(type, TK_MAX, "<error>", "Using token type out of the enum.");
+	return token_names[type];
 }
 
-bool GDScriptTokenizer::is_token_literal(int p_offset, bool variable_safe) const {
-	switch (get_token(p_offset)) {
-		// Can always be literal:
-		case TK_IDENTIFIER:
-
-		case TK_PR_ONREADY:
-		case TK_PR_TOOL:
-		case TK_PR_STATIC:
-		case TK_PR_EXPORT:
-		case TK_PR_SETGET:
-		case TK_PR_SIGNAL:
-		case TK_PR_REMOTE:
-		case TK_PR_MASTER:
-		case TK_PR_PUPPET:
-		case TK_PR_SYNC:
-		case TK_PR_REMOTESYNC:
-		case TK_PR_MASTERSYNC:
-		case TK_PR_PUPPETSYNC:
+bool GDScriptTokenizer::Token::is_identifier() const {
+	// Note: Most keywords should not be recognized as identifiers.
+	// These are only exceptions for stuff that already is on the engine's API.
+	switch (type) {
+		case IDENTIFIER:
+		case MATCH: // Used in String.match().
 			return true;
-
-		// Literal for non-variables only:
-		case TK_BUILT_IN_TYPE:
-		case TK_BUILT_IN_FUNC:
-
-		case TK_OP_IN:
-			//case TK_OP_NOT:
-			//case TK_OP_OR:
-			//case TK_OP_AND:
-
-		case TK_PR_CLASS:
-		case TK_PR_CONST:
-		case TK_PR_ENUM:
-		case TK_PR_PRELOAD:
-		case TK_PR_FUNCTION:
-		case TK_PR_EXTENDS:
-		case TK_PR_ASSERT:
-		case TK_PR_YIELD:
-		case TK_PR_VAR:
-
-		case TK_CF_IF:
-		case TK_CF_ELIF:
-		case TK_CF_ELSE:
-		case TK_CF_FOR:
-		case TK_CF_WHILE:
-		case TK_CF_BREAK:
-		case TK_CF_CONTINUE:
-		case TK_CF_RETURN:
-		case TK_CF_MATCH:
-		case TK_CF_PASS:
-		case TK_SELF:
-		case TK_CONST_PI:
-		case TK_CONST_TAU:
-		case TK_WILDCARD:
-		case TK_CONST_INF:
-		case TK_CONST_NAN:
-		case TK_ERROR:
-			return !variable_safe;
-
-		case TK_CONSTANT: {
-			switch (get_token_constant(p_offset).get_type()) {
-				case Variant::NIL:
-				case Variant::BOOL:
-					return true;
-				default:
-					return false;
-			}
-		}
 		default:
 			return false;
 	}
 }
 
-StringName GDScriptTokenizer::get_token_literal(int p_offset) const {
-	Token token = get_token(p_offset);
-	switch (token) {
-		case TK_IDENTIFIER:
-			return get_token_identifier(p_offset);
-		case TK_BUILT_IN_TYPE: {
-			Variant::Type type = get_token_type(p_offset);
-			int idx = 0;
-
-			while (_type_list[idx].text) {
-				if (type == _type_list[idx].type) {
-					return _type_list[idx].text;
-				}
-				idx++;
-			}
-		} break; // Shouldn't get here, stuff happens
-		case TK_BUILT_IN_FUNC:
-			return GDScriptFunctions::get_func_name(get_token_built_in_func(p_offset));
-		case TK_CONSTANT: {
-			const Variant value = get_token_constant(p_offset);
-
-			switch (value.get_type()) {
-				case Variant::NIL:
-					return "null";
-				case Variant::BOOL:
-					return value ? "true" : "false";
-				default: {
-				}
-			}
-		}
-		case TK_OP_AND:
-		case TK_OP_OR:
-			break; // Don't get into default, since they can be non-literal
-		default: {
-			int idx = 0;
-
-			while (_keyword_list[idx].text) {
-				if (token == _keyword_list[idx].token) {
-					return _keyword_list[idx].text;
-				}
-				idx++;
-			}
-		}
+bool GDScriptTokenizer::Token::is_node_name() const {
+	// This is meant to allow keywords with the $ notation, but not as general identifiers.
+	switch (type) {
+		case IDENTIFIER:
+		case AND:
+		case AS:
+		case ASSERT:
+		case AWAIT:
+		case BREAK:
+		case BREAKPOINT:
+		case CLASS_NAME:
+		case CLASS:
+		case CONST:
+		case CONTINUE:
+		case ELIF:
+		case ELSE:
+		case ENUM:
+		case EXTENDS:
+		case FOR:
+		case FUNC:
+		case IF:
+		case IN:
+		case IS:
+		case MATCH:
+		case NAMESPACE:
+		case NOT:
+		case OR:
+		case PASS:
+		case PRELOAD:
+		case RETURN:
+		case SELF:
+		case SIGNAL:
+		case STATIC:
+		case SUPER:
+		case TRAIT:
+		case UNDERSCORE:
+		case VAR:
+		case VOID:
+		case WHILE:
+		case YIELD:
+			return true;
+		default:
+			return false;
 	}
-	ERR_FAIL_V_MSG("", "Failed to get token literal.");
 }
 
-static bool _is_text_char(CharType c) {
-
-	return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '_';
+String GDScriptTokenizer::get_token_name(Token::Type p_token_type) {
+	ERR_FAIL_INDEX_V_MSG(p_token_type, Token::TK_MAX, "<error>", "Using token type out of the enum.");
+	return token_names[p_token_type];
 }
 
-static bool _is_number(CharType c) {
-
-	return (c >= '0' && c <= '9');
+void GDScriptTokenizer::set_source_code(const String &p_source_code) {
+	source = p_source_code;
+	if (source.empty()) {
+		_source = U"";
+	} else {
+		_source = source.ptr();
+	}
+	_current = _source;
+	line = 1;
+	column = 1;
+	length = p_source_code.length();
+	position = 0;
 }
 
-static bool _is_hex(CharType c) {
-
-	return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F');
+void GDScriptTokenizer::set_cursor_position(int p_line, int p_column) {
+	cursor_line = p_line;
+	cursor_column = p_column;
 }
 
-static bool _is_bin(CharType c) {
-
-	return (c == '0' || c == '1');
+void GDScriptTokenizer::set_multiline_mode(bool p_state) {
+	multiline_mode = p_state;
 }
 
-void GDScriptTokenizerText::_make_token(Token p_type) {
-
-	TokenData &tk = tk_rb[tk_rb_pos];
-
-	tk.type = p_type;
-	tk.line = line;
-	tk.col = column;
-
-	tk_rb_pos = (tk_rb_pos + 1) % TK_RB_SIZE;
+int GDScriptTokenizer::get_cursor_line() const {
+	return cursor_line;
 }
-void GDScriptTokenizerText::_make_identifier(const StringName &p_identifier) {
-
-	TokenData &tk = tk_rb[tk_rb_pos];
 
-	tk.type = TK_IDENTIFIER;
-	tk.identifier = p_identifier;
-	tk.line = line;
-	tk.col = column;
-
-	tk_rb_pos = (tk_rb_pos + 1) % TK_RB_SIZE;
+int GDScriptTokenizer::get_cursor_column() const {
+	return cursor_column;
 }
 
-void GDScriptTokenizerText::_make_built_in_func(GDScriptFunctions::Function p_func) {
-
-	TokenData &tk = tk_rb[tk_rb_pos];
-
-	tk.type = TK_BUILT_IN_FUNC;
-	tk.func = p_func;
-	tk.line = line;
-	tk.col = column;
-
-	tk_rb_pos = (tk_rb_pos + 1) % TK_RB_SIZE;
+bool GDScriptTokenizer::is_past_cursor() const {
+	if (line < cursor_line) {
+		return false;
+	}
+	if (line > cursor_line) {
+		return true;
+	}
+	if (column < cursor_column) {
+		return false;
+	}
+	return true;
 }
-void GDScriptTokenizerText::_make_constant(const Variant &p_constant) {
 
-	TokenData &tk = tk_rb[tk_rb_pos];
-
-	tk.type = TK_CONSTANT;
-	tk.constant = p_constant;
-	tk.line = line;
-	tk.col = column;
-
-	tk_rb_pos = (tk_rb_pos + 1) % TK_RB_SIZE;
+char32_t GDScriptTokenizer::_advance() {
+	if (unlikely(_is_at_end())) {
+		return '\0';
+	}
+	_current++;
+	column++;
+	position++;
+	if (column > rightmost_column) {
+		rightmost_column = column;
+	}
+	if (unlikely(_is_at_end())) {
+		// Add extra newline even if it's not there, to satisfy the parser.
+		newline(true);
+		// Also add needed unindent.
+		check_indent();
+	}
+	return _peek(-1);
 }
 
-void GDScriptTokenizerText::_make_type(const Variant::Type &p_type) {
-
-	TokenData &tk = tk_rb[tk_rb_pos];
-
-	tk.type = TK_BUILT_IN_TYPE;
-	tk.vtype = p_type;
-	tk.line = line;
-	tk.col = column;
-
-	tk_rb_pos = (tk_rb_pos + 1) % TK_RB_SIZE;
+void GDScriptTokenizer::push_paren(char32_t p_char) {
+	paren_stack.push_back(p_char);
 }
 
-void GDScriptTokenizerText::_make_error(const String &p_error) {
-
-	error_flag = true;
-	last_error = p_error;
+bool GDScriptTokenizer::pop_paren(char32_t p_expected) {
+	if (paren_stack.empty()) {
+		return false;
+	}
+	char32_t actual = paren_stack.back()->get();
+	paren_stack.pop_back();
 
-	TokenData &tk = tk_rb[tk_rb_pos];
-	tk.type = TK_ERROR;
-	tk.constant = p_error;
-	tk.line = line;
-	tk.col = column;
-	tk_rb_pos = (tk_rb_pos + 1) % TK_RB_SIZE;
+	return actual == p_expected;
 }
 
-void GDScriptTokenizerText::_make_newline(int p_indentation, int p_tabs) {
-
-	TokenData &tk = tk_rb[tk_rb_pos];
-	tk.type = TK_NEWLINE;
-	tk.constant = Vector2(p_indentation, p_tabs);
-	tk.line = line;
-	tk.col = column;
-	tk_rb_pos = (tk_rb_pos + 1) % TK_RB_SIZE;
+GDScriptTokenizer::Token GDScriptTokenizer::pop_error() {
+	Token error = error_stack.back()->get();
+	error_stack.pop_back();
+	return error;
 }
 
-void GDScriptTokenizerText::_advance() {
-
-	if (error_flag) {
-		//parser broke
-		_make_error(last_error);
-		return;
-	}
-
-	if (code_pos >= len) {
-		_make_token(TK_EOF);
-		return;
-	}
-#define GETCHAR(m_ofs) ((m_ofs + code_pos) >= len ? 0 : _code[m_ofs + code_pos])
-#define INCPOS(m_amount)      \
-	{                         \
-		code_pos += m_amount; \
-		column += m_amount;   \
-	}
-	while (true) {
-
-		bool is_node_path = false;
-		StringMode string_mode = STRING_DOUBLE_QUOTE;
-
-		switch (GETCHAR(0)) {
-			case 0:
-				_make_token(TK_EOF);
-				break;
-			case '\\':
-				INCPOS(1);
-				if (GETCHAR(0) == '\r') {
-					INCPOS(1);
-				}
-
-				if (GETCHAR(0) != '\n') {
-					_make_error("Expected newline after '\\'.");
-					return;
-				}
-
-				INCPOS(1);
-				line++;
-
-				while (GETCHAR(0) == ' ' || GETCHAR(0) == '\t') {
-					INCPOS(1);
-				}
-
-				continue;
-			case '\t':
-			case '\r':
-			case ' ':
-				INCPOS(1);
-				continue;
-			case '#': { // line comment skip
-#ifdef DEBUG_ENABLED
-				String comment;
-#endif // DEBUG_ENABLED
-				while (GETCHAR(0) != '\n') {
-#ifdef DEBUG_ENABLED
-					comment += GETCHAR(0);
-#endif // DEBUG_ENABLED
-					code_pos++;
-					if (GETCHAR(0) == 0) { //end of file
-						//_make_error("Unterminated Comment");
-						_make_token(TK_EOF);
-						return;
-					}
-				}
-#ifdef DEBUG_ENABLED
-				String comment_content = comment.trim_prefix("#").trim_prefix(" ");
-				if (comment_content.begins_with("warning-ignore:")) {
-					String code = comment_content.get_slice(":", 1);
-					warning_skips.push_back(Pair<int, String>(line, code.strip_edges().to_lower()));
-				} else if (comment_content.begins_with("warning-ignore-all:")) {
-					String code = comment_content.get_slice(":", 1);
-					warning_global_skips.insert(code.strip_edges().to_lower());
-				} else if (comment_content.strip_edges() == "warnings-disable") {
-					ignore_warnings = true;
-				}
-#endif // DEBUG_ENABLED
-				FALLTHROUGH;
-			}
-			case '\n': {
-				line++;
-				INCPOS(1);
-				bool used_spaces = false;
-				int tabs = 0;
-				column = 1;
-				int i = 0;
-				while (true) {
-					if (GETCHAR(i) == ' ') {
-						i++;
-						used_spaces = true;
-					} else if (GETCHAR(i) == '\t') {
-						if (used_spaces) {
-							_make_error("Spaces used before tabs on a line");
-							return;
-						}
-						i++;
-						tabs++;
-					} else {
-						break; // not indentation anymore
-					}
-				}
-
-				_make_newline(i, tabs);
-				return;
-			}
-			case '/': {
-
-				switch (GETCHAR(1)) {
-					case '=': { // diveq
-
-						_make_token(TK_OP_ASSIGN_DIV);
-						INCPOS(1);
-
-					} break;
-					default:
-						_make_token(TK_OP_DIV);
-				}
-			} break;
-			case '=': {
-				if (GETCHAR(1) == '=') {
-					_make_token(TK_OP_EQUAL);
-					INCPOS(1);
-
-				} else
-					_make_token(TK_OP_ASSIGN);
-
-			} break;
-			case '<': {
-				if (GETCHAR(1) == '=') {
-
-					_make_token(TK_OP_LESS_EQUAL);
-					INCPOS(1);
-				} else if (GETCHAR(1) == '<') {
-					if (GETCHAR(2) == '=') {
-						_make_token(TK_OP_ASSIGN_SHIFT_LEFT);
-						INCPOS(1);
-					} else {
-						_make_token(TK_OP_SHIFT_LEFT);
-					}
-					INCPOS(1);
-				} else
-					_make_token(TK_OP_LESS);
-
-			} break;
-			case '>': {
-				if (GETCHAR(1) == '=') {
-					_make_token(TK_OP_GREATER_EQUAL);
-					INCPOS(1);
-				} else if (GETCHAR(1) == '>') {
-					if (GETCHAR(2) == '=') {
-						_make_token(TK_OP_ASSIGN_SHIFT_RIGHT);
-						INCPOS(1);
-
-					} else {
-						_make_token(TK_OP_SHIFT_RIGHT);
-					}
-					INCPOS(1);
-				} else {
-					_make_token(TK_OP_GREATER);
-				}
-
-			} break;
-			case '!': {
-				if (GETCHAR(1) == '=') {
-					_make_token(TK_OP_NOT_EQUAL);
-					INCPOS(1);
-				} else {
-					_make_token(TK_OP_NOT);
-				}
-
-			} break;
-			//case '"' //string - no strings in shader
-			//case '\'' //string - no strings in shader
-			case '{':
-				_make_token(TK_CURLY_BRACKET_OPEN);
-				break;
-			case '}':
-				_make_token(TK_CURLY_BRACKET_CLOSE);
-				break;
-			case '[':
-				_make_token(TK_BRACKET_OPEN);
-				break;
-			case ']':
-				_make_token(TK_BRACKET_CLOSE);
-				break;
-			case '(':
-				_make_token(TK_PARENTHESIS_OPEN);
-				break;
-			case ')':
-				_make_token(TK_PARENTHESIS_CLOSE);
-				break;
-			case ',':
-				_make_token(TK_COMMA);
-				break;
-			case ';':
-				_make_token(TK_SEMICOLON);
-				break;
-			case '?':
-				_make_token(TK_QUESTION_MARK);
-				break;
-			case ':':
-				_make_token(TK_COLON); //for methods maybe but now useless.
-				break;
-			case '$':
-				_make_token(TK_DOLLAR); //for the get_node() shortener
-				break;
-			case '^': {
-				if (GETCHAR(1) == '=') {
-					_make_token(TK_OP_ASSIGN_BIT_XOR);
-					INCPOS(1);
-				} else {
-					_make_token(TK_OP_BIT_XOR);
-				}
+static bool _is_alphanumeric(char32_t c) {
+	return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '_';
+}
 
-			} break;
-			case '~':
-				_make_token(TK_OP_BIT_INVERT);
-				break;
-			case '&': {
-				if (GETCHAR(1) == '&') {
-
-					_make_token(TK_OP_AND);
-					INCPOS(1);
-				} else if (GETCHAR(1) == '=') {
-					_make_token(TK_OP_ASSIGN_BIT_AND);
-					INCPOS(1);
-				} else {
-					_make_token(TK_OP_BIT_AND);
-				}
-			} break;
-			case '|': {
-				if (GETCHAR(1) == '|') {
-
-					_make_token(TK_OP_OR);
-					INCPOS(1);
-				} else if (GETCHAR(1) == '=') {
-					_make_token(TK_OP_ASSIGN_BIT_OR);
-					INCPOS(1);
-				} else {
-					_make_token(TK_OP_BIT_OR);
-				}
-			} break;
-			case '*': {
+static bool _is_digit(char32_t c) {
+	return (c >= '0' && c <= '9');
+}
 
-				if (GETCHAR(1) == '=') {
-					_make_token(TK_OP_ASSIGN_MUL);
-					INCPOS(1);
-				} else {
-					_make_token(TK_OP_MUL);
-				}
-			} break;
-			case '+': {
-
-				if (GETCHAR(1) == '=') {
-					_make_token(TK_OP_ASSIGN_ADD);
-					INCPOS(1);
-					/*
-				}  else if (GETCHAR(1)=='+') {
-					_make_token(TK_OP_PLUS_PLUS);
-					INCPOS(1);
-				*/
-				} else {
-					_make_token(TK_OP_ADD);
-				}
+static bool _is_hex_digit(char32_t c) {
+	return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F');
+}
 
-			} break;
-			case '-': {
+static bool _is_binary_digit(char32_t c) {
+	return (c == '0' || c == '1');
+}
 
-				if (GETCHAR(1) == '=') {
-					_make_token(TK_OP_ASSIGN_SUB);
-					INCPOS(1);
-				} else if (GETCHAR(1) == '>') {
-					_make_token(TK_FORWARD_ARROW);
-					INCPOS(1);
+GDScriptTokenizer::Token GDScriptTokenizer::make_token(Token::Type p_type) {
+	Token token(p_type);
+	token.start_line = start_line;
+	token.end_line = line;
+	token.start_column = start_column;
+	token.end_column = column;
+	token.leftmost_column = leftmost_column;
+	token.rightmost_column = rightmost_column;
+	token.source = String(_start, _current - _start);
+
+	if (p_type != Token::ERROR && cursor_line > -1) {
+		// Also count whitespace after token.
+		int offset = 0;
+		while (_peek(offset) == ' ' || _peek(offset) == '\t') {
+			offset++;
+		}
+		int last_column = column + offset;
+		// Check cursor position in token.
+		if (start_line == line) {
+			// Single line token.
+			if (cursor_line == start_line && cursor_column >= start_column && cursor_column <= last_column) {
+				token.cursor_position = cursor_column - start_column;
+				if (cursor_column == start_column) {
+					token.cursor_place = CURSOR_BEGINNING;
+				} else if (cursor_column < column) {
+					token.cursor_place = CURSOR_MIDDLE;
 				} else {
-					_make_token(TK_OP_SUB);
+					token.cursor_place = CURSOR_END;
 				}
-			} break;
-			case '%': {
-
-				if (GETCHAR(1) == '=') {
-					_make_token(TK_OP_ASSIGN_MOD);
-					INCPOS(1);
+			}
+		} else {
+			// Multi line token.
+			if (cursor_line == start_line && cursor_column >= start_column) {
+				// Is in first line.
+				token.cursor_position = cursor_column - start_column;
+				if (cursor_column == start_column) {
+					token.cursor_place = CURSOR_BEGINNING;
 				} else {
-					_make_token(TK_OP_MOD);
-				}
-			} break;
-			case '@':
-				if (CharType(GETCHAR(1)) != '"' && CharType(GETCHAR(1)) != '\'') {
-					_make_error("Unexpected '@'");
-					return;
-				}
-				INCPOS(1);
-				is_node_path = true;
-				FALLTHROUGH;
-			case '\'':
-			case '"': {
-
-				if (GETCHAR(0) == '\'')
-					string_mode = STRING_SINGLE_QUOTE;
-
-				int i = 1;
-				if (string_mode == STRING_DOUBLE_QUOTE && GETCHAR(i) == '"' && GETCHAR(i + 1) == '"') {
-					i += 2;
-					string_mode = STRING_MULTILINE;
-				}
-
-				String str;
-				while (true) {
-					if (CharType(GETCHAR(i)) == 0) {
-
-						_make_error("Unterminated String");
-						return;
-					} else if (string_mode == STRING_DOUBLE_QUOTE && CharType(GETCHAR(i)) == '"') {
-						break;
-					} else if (string_mode == STRING_SINGLE_QUOTE && CharType(GETCHAR(i)) == '\'') {
-						break;
-					} else if (string_mode == STRING_MULTILINE && CharType(GETCHAR(i)) == '\"' && CharType(GETCHAR(i + 1)) == '\"' && CharType(GETCHAR(i + 2)) == '\"') {
-						i += 2;
-						break;
-					} else if (string_mode != STRING_MULTILINE && CharType(GETCHAR(i)) == '\n') {
-						_make_error("Unexpected EOL at String.");
-						return;
-					} else if (CharType(GETCHAR(i)) == 0xFFFF) {
-						//string ends here, next will be TK
-						i--;
-						break;
-					} else if (CharType(GETCHAR(i)) == '\\') {
-						//escaped characters...
-						i++;
-						CharType next = GETCHAR(i);
-						if (next == 0) {
-							_make_error("Unterminated String");
-							return;
-						}
-						CharType res = 0;
-
-						switch (next) {
-
-							case 'a': res = 7; break;
-							case 'b': res = 8; break;
-							case 't': res = 9; break;
-							case 'n': res = 10; break;
-							case 'v': res = 11; break;
-							case 'f': res = 12; break;
-							case 'r': res = 13; break;
-							case '\'': res = '\''; break;
-							case '\"': res = '\"'; break;
-							case '\\': res = '\\'; break;
-							case '/':
-								res = '/';
-								break; //wtf
-
-							case 'u': {
-								//hexnumbarh - oct is deprecated
-								i += 1;
-								for (int j = 0; j < 4; j++) {
-									CharType c = GETCHAR(i + j);
-									if (c == 0) {
-										_make_error("Unterminated String");
-										return;
-									}
-
-									CharType v = 0;
-									if (c >= '0' && c <= '9') {
-										v = c - '0';
-									} else if (c >= 'a' && c <= 'f') {
-										v = c - 'a';
-										v += 10;
-									} else if (c >= 'A' && c <= 'F') {
-										v = c - 'A';
-										v += 10;
-									} else {
-										_make_error("Malformed hex constant in string");
-										return;
-									}
-
-									res <<= 4;
-									res |= v;
-								}
-								i += 3;
-
-							} break;
-							default: {
-
-								_make_error("Invalid escape sequence");
-								return;
-							} break;
-						}
-
-						str += res;
-
-					} else {
-						if (CharType(GETCHAR(i)) == '\n') {
-							line++;
-							column = 1;
-						}
-
-						str += CharType(GETCHAR(i));
-					}
-					i++;
+					token.cursor_place = CURSOR_MIDDLE;
 				}
-				INCPOS(i);
-
-				if (is_node_path) {
-					_make_constant(NodePath(str));
+			} else if (cursor_line == line && cursor_column <= last_column) {
+				// Is in last line.
+				token.cursor_position = cursor_column - start_column;
+				if (cursor_column < column) {
+					token.cursor_place = CURSOR_MIDDLE;
 				} else {
-					_make_constant(str);
-				}
-
-			} break;
-			case 0xFFFF: {
-				_make_token(TK_CURSOR);
-			} break;
-			default: {
-
-				if (_is_number(GETCHAR(0)) || (GETCHAR(0) == '.' && _is_number(GETCHAR(1)))) {
-					// parse number
-					bool period_found = false;
-					bool exponent_found = false;
-					bool hexa_found = false;
-					bool bin_found = false;
-					bool sign_found = false;
-
-					String str;
-					int i = 0;
-
-					while (true) {
-						if (GETCHAR(i) == '.') {
-							if (period_found || exponent_found) {
-								_make_error("Invalid numeric constant at '.'");
-								return;
-							} else if (bin_found) {
-								_make_error("Invalid binary constant at '.'");
-								return;
-							} else if (hexa_found) {
-								_make_error("Invalid hexadecimal constant at '.'");
-								return;
-							}
-							period_found = true;
-						} else if (GETCHAR(i) == 'x') {
-							if (hexa_found || bin_found || str.length() != 1 || !((i == 1 && str[0] == '0') || (i == 2 && str[1] == '0' && str[0] == '-'))) {
-								_make_error("Invalid numeric constant at 'x'");
-								return;
-							}
-							hexa_found = true;
-						} else if (hexa_found && _is_hex(GETCHAR(i))) {
-
-						} else if (!hexa_found && GETCHAR(i) == 'b') {
-							if (bin_found || str.length() != 1 || !((i == 1 && str[0] == '0') || (i == 2 && str[1] == '0' && str[0] == '-'))) {
-								_make_error("Invalid numeric constant at 'b'");
-								return;
-							}
-							bin_found = true;
-						} else if (!hexa_found && GETCHAR(i) == 'e') {
-							if (exponent_found || bin_found) {
-								_make_error("Invalid numeric constant at 'e'");
-								return;
-							}
-							exponent_found = true;
-						} else if (_is_number(GETCHAR(i))) {
-							//all ok
-
-						} else if (bin_found && _is_bin(GETCHAR(i))) {
-
-						} else if ((GETCHAR(i) == '-' || GETCHAR(i) == '+') && exponent_found) {
-							if (sign_found) {
-								_make_error("Invalid numeric constant at '-'");
-								return;
-							}
-							sign_found = true;
-						} else if (GETCHAR(i) == '_') {
-							i++;
-							continue; // Included for readability, shouldn't be a part of the string
-						} else
-							break;
-
-						str += CharType(GETCHAR(i));
-						i++;
-					}
-
-					if (!(_is_number(str[str.length() - 1]) || (hexa_found && _is_hex(str[str.length() - 1])))) {
-						_make_error("Invalid numeric constant: " + str);
-						return;
-					}
-
-					INCPOS(i);
-					if (hexa_found) {
-						int64_t val = str.hex_to_int64();
-						_make_constant(val);
-					} else if (bin_found) {
-						int64_t val = str.bin_to_int64();
-						_make_constant(val);
-					} else if (period_found || exponent_found) {
-						double val = str.to_double();
-						_make_constant(val);
-					} else {
-						int64_t val = str.to_int64();
-						_make_constant(val);
-					}
-
-					return;
-				}
-
-				if (GETCHAR(0) == '.') {
-					//parse period
-					_make_token(TK_PERIOD);
-					break;
-				}
-
-				if (_is_text_char(GETCHAR(0))) {
-					// parse identifier
-					String str;
-					str += CharType(GETCHAR(0));
-
-					int i = 1;
-					while (_is_text_char(GETCHAR(i))) {
-						str += CharType(GETCHAR(i));
-						i++;
-					}
-
-					bool identifier = false;
-
-					if (str == "null") {
-						_make_constant(Variant());
-
-					} else if (str == "true") {
-						_make_constant(true);
-
-					} else if (str == "false") {
-						_make_constant(false);
-					} else {
-
-						bool found = false;
-
-						{
-
-							int idx = 0;
-
-							while (_type_list[idx].text) {
-
-								if (str == _type_list[idx].text) {
-									_make_type(_type_list[idx].type);
-									found = true;
-									break;
-								}
-								idx++;
-							}
-						}
-
-						if (!found) {
-
-							//built in func?
-
-							for (int j = 0; j < GDScriptFunctions::FUNC_MAX; j++) {
-
-								if (str == GDScriptFunctions::get_func_name(GDScriptFunctions::Function(j))) {
-
-									_make_built_in_func(GDScriptFunctions::Function(j));
-									found = true;
-									break;
-								}
-							}
-						}
-
-						if (!found) {
-							//keyword
-
-							int idx = 0;
-							found = false;
-
-							while (_keyword_list[idx].text) {
-
-								if (str == _keyword_list[idx].text) {
-									_make_token(_keyword_list[idx].token);
-									found = true;
-									break;
-								}
-								idx++;
-							}
-						}
-
-						if (!found)
-							identifier = true;
-					}
-
-					if (identifier) {
-						_make_identifier(str);
-					}
-					INCPOS(str.length());
-					return;
+					token.cursor_place = CURSOR_END;
 				}
-
-				_make_error("Unknown character");
-				return;
-
-			} break;
+			} else if (cursor_line > start_line && cursor_line < line) {
+				// Is in middle line.
+				token.cursor_position = CURSOR_MIDDLE;
+			}
 		}
-
-		INCPOS(1);
-		break;
 	}
-}
 
-void GDScriptTokenizerText::set_code(const String &p_code) {
-
-	code = p_code;
-	len = p_code.length();
-	if (len) {
-		_code = &code[0];
-	} else {
-		_code = NULL;
-	}
-	code_pos = 0;
-	line = 1; //it is stand-ar-ized that lines begin in 1 in code..
-	column = 1; //the same holds for columns
-	tk_rb_pos = 0;
-	error_flag = false;
-#ifdef DEBUG_ENABLED
-	ignore_warnings = false;
-#endif // DEBUG_ENABLED
-	last_error = "";
-	for (int i = 0; i < MAX_LOOKAHEAD + 1; i++)
-		_advance();
+	return token;
 }
 
-GDScriptTokenizerText::Token GDScriptTokenizerText::get_token(int p_offset) const {
-	ERR_FAIL_COND_V(p_offset <= -MAX_LOOKAHEAD, TK_ERROR);
-	ERR_FAIL_COND_V(p_offset >= MAX_LOOKAHEAD, TK_ERROR);
-
-	int ofs = (TK_RB_SIZE + tk_rb_pos + p_offset - MAX_LOOKAHEAD - 1) % TK_RB_SIZE;
-	return tk_rb[ofs].type;
+GDScriptTokenizer::Token GDScriptTokenizer::make_literal(const Variant &p_literal) {
+	Token token = make_token(Token::LITERAL);
+	token.literal = p_literal;
+	return token;
 }
 
-int GDScriptTokenizerText::get_token_line(int p_offset) const {
-	ERR_FAIL_COND_V(p_offset <= -MAX_LOOKAHEAD, -1);
-	ERR_FAIL_COND_V(p_offset >= MAX_LOOKAHEAD, -1);
-
-	int ofs = (TK_RB_SIZE + tk_rb_pos + p_offset - MAX_LOOKAHEAD - 1) % TK_RB_SIZE;
-	return tk_rb[ofs].line;
+GDScriptTokenizer::Token GDScriptTokenizer::make_identifier(const StringName &p_identifier) {
+	Token identifier = make_token(Token::IDENTIFIER);
+	identifier.literal = p_identifier;
+	return identifier;
 }
 
-int GDScriptTokenizerText::get_token_column(int p_offset) const {
-	ERR_FAIL_COND_V(p_offset <= -MAX_LOOKAHEAD, -1);
-	ERR_FAIL_COND_V(p_offset >= MAX_LOOKAHEAD, -1);
+GDScriptTokenizer::Token GDScriptTokenizer::make_error(const String &p_message) {
+	Token error = make_token(Token::ERROR);
+	error.literal = p_message;
 
-	int ofs = (TK_RB_SIZE + tk_rb_pos + p_offset - MAX_LOOKAHEAD - 1) % TK_RB_SIZE;
-	return tk_rb[ofs].col;
+	return error;
 }
 
-const Variant &GDScriptTokenizerText::get_token_constant(int p_offset) const {
-	ERR_FAIL_COND_V(p_offset <= -MAX_LOOKAHEAD, tk_rb[0].constant);
-	ERR_FAIL_COND_V(p_offset >= MAX_LOOKAHEAD, tk_rb[0].constant);
-
-	int ofs = (TK_RB_SIZE + tk_rb_pos + p_offset - MAX_LOOKAHEAD - 1) % TK_RB_SIZE;
-	ERR_FAIL_COND_V(tk_rb[ofs].type != TK_CONSTANT, tk_rb[0].constant);
-	return tk_rb[ofs].constant;
+void GDScriptTokenizer::push_error(const String &p_message) {
+	Token error = make_error(p_message);
+	error_stack.push_back(error);
 }
 
-StringName GDScriptTokenizerText::get_token_identifier(int p_offset) const {
-
-	ERR_FAIL_COND_V(p_offset <= -MAX_LOOKAHEAD, StringName());
-	ERR_FAIL_COND_V(p_offset >= MAX_LOOKAHEAD, StringName());
-
-	int ofs = (TK_RB_SIZE + tk_rb_pos + p_offset - MAX_LOOKAHEAD - 1) % TK_RB_SIZE;
-	ERR_FAIL_COND_V(tk_rb[ofs].type != TK_IDENTIFIER, StringName());
-	return tk_rb[ofs].identifier;
+void GDScriptTokenizer::push_error(const Token &p_error) {
+	error_stack.push_back(p_error);
 }
 
-GDScriptFunctions::Function GDScriptTokenizerText::get_token_built_in_func(int p_offset) const {
-
-	ERR_FAIL_COND_V(p_offset <= -MAX_LOOKAHEAD, GDScriptFunctions::FUNC_MAX);
-	ERR_FAIL_COND_V(p_offset >= MAX_LOOKAHEAD, GDScriptFunctions::FUNC_MAX);
-
-	int ofs = (TK_RB_SIZE + tk_rb_pos + p_offset - MAX_LOOKAHEAD - 1) % TK_RB_SIZE;
-	ERR_FAIL_COND_V(tk_rb[ofs].type != TK_BUILT_IN_FUNC, GDScriptFunctions::FUNC_MAX);
-	return tk_rb[ofs].func;
+GDScriptTokenizer::Token GDScriptTokenizer::make_paren_error(char32_t p_paren) {
+	if (paren_stack.empty()) {
+		return make_error(vformat("Closing \"%c\" doesn't have an opening counterpart.", p_paren));
+	}
+	Token error = make_error(vformat("Closing \"%c\" doesn't match the opening \"%c\".", p_paren, paren_stack.back()->get()));
+	paren_stack.pop_back(); // Remove opening one anyway.
+	return error;
 }
 
-Variant::Type GDScriptTokenizerText::get_token_type(int p_offset) const {
+GDScriptTokenizer::Token GDScriptTokenizer::check_vcs_marker(char32_t p_test, Token::Type p_double_type) {
+	const char32_t *next = _current + 1;
+	int chars = 2; // Two already matched.
 
-	ERR_FAIL_COND_V(p_offset <= -MAX_LOOKAHEAD, Variant::NIL);
-	ERR_FAIL_COND_V(p_offset >= MAX_LOOKAHEAD, Variant::NIL);
+	// Test before consuming characters, since we don't want to consume more than needed.
+	while (*next == p_test) {
+		chars++;
+		next++;
+	}
+	if (chars >= 7) {
+		// It is a VCS conflict marker.
+		while (chars > 1) {
+			// Consume all characters (first was already consumed by scan()).
+			_advance();
+			chars--;
+		}
+		return make_token(Token::VCS_CONFLICT_MARKER);
+	} else {
+		// It is only a regular double character token, so we consume the second character.
+		_advance();
+		return make_token(p_double_type);
+	}
+}
 
-	int ofs = (TK_RB_SIZE + tk_rb_pos + p_offset - MAX_LOOKAHEAD - 1) % TK_RB_SIZE;
-	ERR_FAIL_COND_V(tk_rb[ofs].type != TK_BUILT_IN_TYPE, Variant::NIL);
-	return tk_rb[ofs].vtype;
+GDScriptTokenizer::Token GDScriptTokenizer::annotation() {
+	if (!_is_alphanumeric(_peek())) {
+		push_error("Expected annotation identifier after \"@\".");
+	}
+	while (_is_alphanumeric(_peek())) {
+		// Consume all identifier characters.
+		_advance();
+	}
+	Token annotation = make_token(Token::ANNOTATION);
+	annotation.literal = StringName(annotation.source);
+	return annotation;
 }
 
-int GDScriptTokenizerText::get_token_line_indent(int p_offset) const {
+GDScriptTokenizer::Token GDScriptTokenizer::potential_identifier() {
+#define KEYWORDS(KEYWORD_GROUP, KEYWORD)     \
+	KEYWORD_GROUP('a')                       \
+	KEYWORD("as", Token::AS)                 \
+	KEYWORD("and", Token::AND)               \
+	KEYWORD("assert", Token::ASSERT)         \
+	KEYWORD("await", Token::AWAIT)           \
+	KEYWORD_GROUP('b')                       \
+	KEYWORD("break", Token::BREAK)           \
+	KEYWORD("breakpoint", Token::BREAKPOINT) \
+	KEYWORD_GROUP('c')                       \
+	KEYWORD("class", Token::CLASS)           \
+	KEYWORD("class_name", Token::CLASS_NAME) \
+	KEYWORD("const", Token::CONST)           \
+	KEYWORD("continue", Token::CONTINUE)     \
+	KEYWORD_GROUP('e')                       \
+	KEYWORD("elif", Token::ELIF)             \
+	KEYWORD("else", Token::ELSE)             \
+	KEYWORD("enum", Token::ENUM)             \
+	KEYWORD("extends", Token::EXTENDS)       \
+	KEYWORD_GROUP('f')                       \
+	KEYWORD("for", Token::FOR)               \
+	KEYWORD("func", Token::FUNC)             \
+	KEYWORD_GROUP('i')                       \
+	KEYWORD("if", Token::IF)                 \
+	KEYWORD("in", Token::IN)                 \
+	KEYWORD("is", Token::IS)                 \
+	KEYWORD_GROUP('m')                       \
+	KEYWORD("match", Token::MATCH)           \
+	KEYWORD_GROUP('n')                       \
+	KEYWORD("namespace", Token::NAMESPACE)   \
+	KEYWORD("not", Token::NOT)               \
+	KEYWORD_GROUP('o')                       \
+	KEYWORD("or", Token::OR)                 \
+	KEYWORD_GROUP('p')                       \
+	KEYWORD("pass", Token::PASS)             \
+	KEYWORD("preload", Token::PRELOAD)       \
+	KEYWORD_GROUP('r')                       \
+	KEYWORD("return", Token::RETURN)         \
+	KEYWORD_GROUP('s')                       \
+	KEYWORD("self", Token::SELF)             \
+	KEYWORD("signal", Token::SIGNAL)         \
+	KEYWORD("static", Token::STATIC)         \
+	KEYWORD("super", Token::SUPER)           \
+	KEYWORD_GROUP('t')                       \
+	KEYWORD("trait", Token::TRAIT)           \
+	KEYWORD_GROUP('v')                       \
+	KEYWORD("var", Token::VAR)               \
+	KEYWORD("void", Token::VOID)             \
+	KEYWORD_GROUP('w')                       \
+	KEYWORD("while", Token::WHILE)           \
+	KEYWORD_GROUP('y')                       \
+	KEYWORD("yield", Token::YIELD)           \
+	KEYWORD_GROUP('I')                       \
+	KEYWORD("INF", Token::CONST_INF)         \
+	KEYWORD_GROUP('N')                       \
+	KEYWORD("NAN", Token::CONST_NAN)         \
+	KEYWORD_GROUP('P')                       \
+	KEYWORD("PI", Token::CONST_PI)           \
+	KEYWORD_GROUP('T')                       \
+	KEYWORD("TAU", Token::CONST_TAU)
+
+#define MIN_KEYWORD_LENGTH 2
+#define MAX_KEYWORD_LENGTH 10
+
+	// Consume all alphanumeric characters.
+	while (_is_alphanumeric(_peek())) {
+		_advance();
+	}
 
-	ERR_FAIL_COND_V(p_offset <= -MAX_LOOKAHEAD, 0);
-	ERR_FAIL_COND_V(p_offset >= MAX_LOOKAHEAD, 0);
+	int length = _current - _start;
 
-	int ofs = (TK_RB_SIZE + tk_rb_pos + p_offset - MAX_LOOKAHEAD - 1) % TK_RB_SIZE;
-	ERR_FAIL_COND_V(tk_rb[ofs].type != TK_NEWLINE, 0);
-	return tk_rb[ofs].constant.operator Vector2().x;
-}
+	if (length == 1 && _peek(-1) == '_') {
+		// Lone underscore.
+		return make_token(Token::UNDERSCORE);
+	}
 
-int GDScriptTokenizerText::get_token_line_tab_indent(int p_offset) const {
+	String name(_start, length);
+	if (length < MIN_KEYWORD_LENGTH || length > MAX_KEYWORD_LENGTH) {
+		// Cannot be a keyword, as the length doesn't match any.
+		return make_identifier(name);
+	}
 
-	ERR_FAIL_COND_V(p_offset <= -MAX_LOOKAHEAD, 0);
-	ERR_FAIL_COND_V(p_offset >= MAX_LOOKAHEAD, 0);
+	// Define some helper macros for the switch case.
+#define KEYWORD_GROUP_CASE(char) \
+	break;                       \
+	case char:
+#define KEYWORD(keyword, token_type)                                                                                      \
+	{                                                                                                                     \
+		const int keyword_length = sizeof(keyword) - 1;                                                                   \
+		static_assert(keyword_length <= MAX_KEYWORD_LENGTH, "There's a keyword longer than the defined maximum length");  \
+		static_assert(keyword_length >= MIN_KEYWORD_LENGTH, "There's a keyword shorter than the defined minimum length"); \
+		if (keyword_length == length && name == keyword) {                                                                \
+			return make_token(token_type);                                                                                \
+		}                                                                                                                 \
+	}
 
-	int ofs = (TK_RB_SIZE + tk_rb_pos + p_offset - MAX_LOOKAHEAD - 1) % TK_RB_SIZE;
-	ERR_FAIL_COND_V(tk_rb[ofs].type != TK_NEWLINE, 0);
-	return tk_rb[ofs].constant.operator Vector2().y;
-}
+	// Find if it's a keyword.
+	switch (_start[0]) {
+		default:
+			KEYWORDS(KEYWORD_GROUP_CASE, KEYWORD)
+			break;
+	}
 
-String GDScriptTokenizerText::get_token_error(int p_offset) const {
+	// Check if it's a special literal
+	if (length == 4) {
+		if (name == "true") {
+			return make_literal(true);
+		} else if (name == "null") {
+			return make_literal(Variant());
+		}
+	} else if (length == 5) {
+		if (name == "false") {
+			return make_literal(false);
+		}
+	}
 
-	ERR_FAIL_COND_V(p_offset <= -MAX_LOOKAHEAD, String());
-	ERR_FAIL_COND_V(p_offset >= MAX_LOOKAHEAD, String());
+	// Not a keyword, so must be an identifier.
+	return make_identifier(name);
 
-	int ofs = (TK_RB_SIZE + tk_rb_pos + p_offset - MAX_LOOKAHEAD - 1) % TK_RB_SIZE;
-	ERR_FAIL_COND_V(tk_rb[ofs].type != TK_ERROR, String());
-	return tk_rb[ofs].constant;
+#undef KEYWORDS
+#undef MIN_KEYWORD_LENGTH
+#undef MAX_KEYWORD_LENGTH
+#undef KEYWORD_GROUP_CASE
+#undef KEYWORD
 }
 
-void GDScriptTokenizerText::advance(int p_amount) {
+void GDScriptTokenizer::newline(bool p_make_token) {
+	// Don't overwrite previous newline, nor create if we want a line continuation.
+	if (p_make_token && !pending_newline && !line_continuation) {
+		Token newline(Token::NEWLINE);
+		newline.start_line = line;
+		newline.end_line = line;
+		newline.start_column = column - 1;
+		newline.end_column = column;
+		newline.leftmost_column = newline.start_column;
+		newline.rightmost_column = newline.end_column;
+		pending_newline = true;
+		last_newline = newline;
+	}
 
-	ERR_FAIL_COND(p_amount <= 0);
-	for (int i = 0; i < p_amount; i++)
-		_advance();
+	// Increment line/column counters.
+	line++;
+	column = 1;
+	leftmost_column = 1;
 }
 
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#define BYTECODE_VERSION 13
-
-Error GDScriptTokenizerBuffer::set_code_buffer(const Vector<uint8_t> &p_buffer) {
-
-	const uint8_t *buf = p_buffer.ptr();
-	int total_len = p_buffer.size();
-	ERR_FAIL_COND_V(p_buffer.size() < 24 || p_buffer[0] != 'G' || p_buffer[1] != 'D' || p_buffer[2] != 'S' || p_buffer[3] != 'C', ERR_INVALID_DATA);
-
-	int version = decode_uint32(&buf[4]);
-	ERR_FAIL_COND_V_MSG(version > BYTECODE_VERSION, ERR_INVALID_DATA, "Bytecode is too recent! Please use a newer engine version.");
-
-	int identifier_count = decode_uint32(&buf[8]);
-	int constant_count = decode_uint32(&buf[12]);
-	int line_count = decode_uint32(&buf[16]);
-	int token_count = decode_uint32(&buf[20]);
-
-	const uint8_t *b = &buf[24];
-	total_len -= 24;
-
-	identifiers.resize(identifier_count);
-	for (int i = 0; i < identifier_count; i++) {
-
-		int len = decode_uint32(b);
-		ERR_FAIL_COND_V(len > total_len, ERR_INVALID_DATA);
-		b += 4;
-		Vector<uint8_t> cs;
-		cs.resize(len);
-		for (int j = 0; j < len; j++) {
-			cs.write[j] = b[j] ^ 0xb6;
+GDScriptTokenizer::Token GDScriptTokenizer::number() {
+	int base = 10;
+	bool has_decimal = false;
+	bool has_exponent = false;
+	bool has_error = false;
+	bool (*digit_check_func)(char32_t) = _is_digit;
+
+	if (_peek(-1) == '.') {
+		has_decimal = true;
+	} else if (_peek(-1) == '0') {
+		if (_peek() == 'x') {
+			// Hexadecimal.
+			base = 16;
+			digit_check_func = _is_hex_digit;
+			_advance();
+		} else if (_peek() == 'b') {
+			// Binary.
+			base = 2;
+			digit_check_func = _is_binary_digit;
+			_advance();
 		}
-
-		cs.write[cs.size() - 1] = 0;
-		String s;
-		s.parse_utf8((const char *)cs.ptr());
-		b += len;
-		total_len -= len + 4;
-		identifiers.write[i] = s;
 	}
 
-	constants.resize(constant_count);
-	for (int i = 0; i < constant_count; i++) {
-
-		Variant v;
-		int len;
-		// An object cannot be constant, never decode objects
-		Error err = decode_variant(v, b, total_len, &len, false);
-		if (err)
-			return err;
-		b += len;
-		total_len -= len;
-		constants.write[i] = v;
+	// Allow '_' to be used in a number, for readability.
+	bool previous_was_underscore = false;
+	while (digit_check_func(_peek()) || _peek() == '_') {
+		if (_peek() == '_') {
+			if (previous_was_underscore) {
+				Token error = make_error(R"(Only one underscore can be used as a numeric separator.)");
+				error.start_column = column;
+				error.leftmost_column = column;
+				error.end_column = column + 1;
+				error.rightmost_column = column + 1;
+				push_error(error);
+			}
+			previous_was_underscore = true;
+		}
+		_advance();
 	}
 
-	ERR_FAIL_COND_V(line_count * 8 > total_len, ERR_INVALID_DATA);
-
-	for (int i = 0; i < line_count; i++) {
-
-		uint32_t token = decode_uint32(b);
-		b += 4;
-		uint32_t linecol = decode_uint32(b);
-		b += 4;
+	// It might be a ".." token (instead of decimal point) so we check if it's not.
+	if (_peek() == '.' && _peek(1) != '.') {
+		if (base == 10 && !has_decimal) {
+			has_decimal = true;
+		} else if (base == 10) {
+			Token error = make_error("Cannot use a decimal point twice in a number.");
+			error.start_column = column;
+			error.leftmost_column = column;
+			error.end_column = column + 1;
+			error.rightmost_column = column + 1;
+			push_error(error);
+			has_error = true;
+		} else if (base == 16) {
+			Token error = make_error("Cannot use a decimal point in a hexadecimal number.");
+			error.start_column = column;
+			error.leftmost_column = column;
+			error.end_column = column + 1;
+			error.rightmost_column = column + 1;
+			push_error(error);
+			has_error = true;
+		} else {
+			Token error = make_error("Cannot use a decimal point in a binary number.");
+			error.start_column = column;
+			error.leftmost_column = column;
+			error.end_column = column + 1;
+			error.rightmost_column = column + 1;
+			push_error(error);
+			has_error = true;
+		}
+		if (!has_error) {
+			_advance();
 
-		lines.insert(token, linecol);
-		total_len -= 8;
+			// Consume decimal digits.
+			while (_is_digit(_peek()) || _peek() == '_') {
+				_advance();
+			}
+		}
 	}
-
-	tokens.resize(token_count);
-
-	for (int i = 0; i < token_count; i++) {
-
-		ERR_FAIL_COND_V(total_len < 1, ERR_INVALID_DATA);
-
-		if ((*b) & TOKEN_BYTE_MASK) { //little endian always
-			ERR_FAIL_COND_V(total_len < 4, ERR_INVALID_DATA);
-
-			tokens.write[i] = decode_uint32(b) & ~TOKEN_BYTE_MASK;
-			b += 4;
-		} else {
-			tokens.write[i] = *b;
-			b += 1;
-			total_len--;
+	if (base == 10) {
+		if (_peek() == 'e' || _peek() == 'E') {
+			has_exponent = true;
+			_advance();
+			if (_peek() == '+' || _peek() == '-') {
+				// Exponent sign.
+				_advance();
+			}
+			// Consume exponent digits.
+			if (!_is_digit(_peek())) {
+				Token error = make_error(R"(Expected exponent value after "e".)");
+				error.start_column = column;
+				error.leftmost_column = column;
+				error.end_column = column + 1;
+				error.rightmost_column = column + 1;
+				push_error(error);
+			}
+			previous_was_underscore = false;
+			while (_is_digit(_peek()) || _peek() == '_') {
+				if (_peek() == '_') {
+					if (previous_was_underscore) {
+						Token error = make_error(R"(Only one underscore can be used as a numeric separator.)");
+						error.start_column = column;
+						error.leftmost_column = column;
+						error.end_column = column + 1;
+						error.rightmost_column = column + 1;
+						push_error(error);
+					}
+					previous_was_underscore = true;
+				}
+				_advance();
+			}
 		}
 	}
 
-	token = 0;
+	// Detect extra decimal point.
+	if (!has_error && has_decimal && _peek() == '.' && _peek(1) != '.') {
+		Token error = make_error("Cannot use a decimal point twice in a number.");
+		error.start_column = column;
+		error.leftmost_column = column;
+		error.end_column = column + 1;
+		error.rightmost_column = column + 1;
+		push_error(error);
+		has_error = true;
+	} else if (_is_alphanumeric(_peek())) {
+		// Letter at the end of the number.
+		push_error("Invalid numeric notation.");
+	}
 
-	return OK;
+	// Create a string with the whole number.
+	int length = _current - _start;
+	String number = String(_start, length).replace("_", "");
+
+	// Convert to the appropriate literal type.
+	if (base == 16) {
+		int64_t value = number.hex_to_int();
+		return make_literal(value);
+	} else if (base == 2) {
+		int64_t value = number.bin_to_int();
+		return make_literal(value);
+	} else if (has_decimal || has_exponent) {
+		double value = number.to_float();
+		return make_literal(value);
+	} else {
+		int64_t value = number.to_int();
+		return make_literal(value);
+	}
 }
 
-Vector<uint8_t> GDScriptTokenizerBuffer::parse_code_string(const String &p_code) {
+GDScriptTokenizer::Token GDScriptTokenizer::string() {
+	enum StringType {
+		STRING_REGULAR,
+		STRING_NAME,
+		STRING_NODEPATH,
+	};
 
-	Vector<uint8_t> buf;
+	bool is_multiline = false;
+	StringType type = STRING_REGULAR;
 
-	Map<StringName, int> identifier_map;
-	HashMap<Variant, int, VariantHasher, VariantComparator> constant_map;
-	Map<uint32_t, int> line_map;
-	Vector<uint32_t> token_array;
+	if (_peek(-1) == '&') {
+		type = STRING_NAME;
+		_advance();
+	} else if (_peek(-1) == '^') {
+		type = STRING_NODEPATH;
+		_advance();
+	}
 
-	GDScriptTokenizerText tt;
-	tt.set_code(p_code);
-	int line = -1;
+	char32_t quote_char = _peek(-1);
 
-	while (true) {
+	if (_peek() == quote_char && _peek(1) == quote_char) {
+		is_multiline = true;
+		// Consume all quotes.
+		_advance();
+		_advance();
+	}
 
-		if (tt.get_token_line() != line) {
+	String result;
 
-			line = tt.get_token_line();
-			line_map[line] = token_array.size();
+	for (;;) {
+		// Consume actual string.
+		if (_is_at_end()) {
+			return make_error("Unterminated string.");
 		}
 
-		uint32_t token = tt.get_token();
-		switch (tt.get_token()) {
+		char32_t ch = _peek();
 
-			case TK_IDENTIFIER: {
-				StringName id = tt.get_token_identifier();
-				if (!identifier_map.has(id)) {
-					int idx = identifier_map.size();
-					identifier_map[id] = idx;
-				}
-				token |= identifier_map[id] << TOKEN_BITS;
-			} break;
-			case TK_CONSTANT: {
-
-				const Variant &c = tt.get_token_constant();
-				if (!constant_map.has(c)) {
-					int idx = constant_map.size();
-					constant_map[c] = idx;
-				}
-				token |= constant_map[c] << TOKEN_BITS;
-			} break;
-			case TK_BUILT_IN_TYPE: {
+		if (ch == '\\') {
+			// Escape pattern.
+			_advance();
+			if (_is_at_end()) {
+				return make_error("Unterminated string.");
+			}
 
-				token |= tt.get_token_type() << TOKEN_BITS;
-			} break;
-			case TK_BUILT_IN_FUNC: {
+			// Grab escape character.
+			char32_t code = _peek();
+			_advance();
+			if (_is_at_end()) {
+				return make_error("Unterminated string.");
+			}
 
-				token |= tt.get_token_built_in_func() << TOKEN_BITS;
+			char32_t escaped = 0;
+			bool valid_escape = true;
+
+			switch (code) {
+				case 'a':
+					escaped = '\a';
+					break;
+				case 'b':
+					escaped = '\b';
+					break;
+				case 'f':
+					escaped = '\f';
+					break;
+				case 'n':
+					escaped = '\n';
+					break;
+				case 'r':
+					escaped = '\r';
+					break;
+				case 't':
+					escaped = '\t';
+					break;
+				case 'v':
+					escaped = '\v';
+					break;
+				case '\'':
+					escaped = '\'';
+					break;
+				case '\"':
+					escaped = '\"';
+					break;
+				case '\\':
+					escaped = '\\';
+					break;
+				case 'u':
+					// Hexadecimal sequence.
+					for (int i = 0; i < 4; i++) {
+						if (_is_at_end()) {
+							return make_error("Unterminated string.");
+						}
 
-			} break;
-			case TK_NEWLINE: {
+						char32_t digit = _peek();
+						char32_t value = 0;
+						if (digit >= '0' && digit <= '9') {
+							value = digit - '0';
+						} else if (digit >= 'a' && digit <= 'f') {
+							value = digit - 'a';
+							value += 10;
+						} else if (digit >= 'A' && digit <= 'F') {
+							value = digit - 'A';
+							value += 10;
+						} else {
+							// Make error, but keep parsing the string.
+							Token error = make_error("Invalid hexadecimal digit in unicode escape sequence.");
+							error.start_column = column;
+							error.leftmost_column = error.start_column;
+							error.end_column = column + 1;
+							error.rightmost_column = error.end_column;
+							push_error(error);
+							valid_escape = false;
+							break;
+						}
 
-				token |= tt.get_token_line_indent() << TOKEN_BITS;
-			} break;
-			case TK_ERROR: {
+						escaped <<= 4;
+						escaped |= value;
 
-				ERR_FAIL_V(Vector<uint8_t>());
-			} break;
-			default: {
+						_advance();
+					}
+					break;
+				case '\r':
+					if (_peek() != '\n') {
+						// Carriage return without newline in string. (???)
+						// Just add it to the string and keep going.
+						result += ch;
+						_advance();
+						break;
+					}
+					[[fallthrough]];
+				case '\n':
+					// Escaping newline.
+					newline(false);
+					valid_escape = false; // Don't add to the string.
+					break;
+				default:
+					Token error = make_error("Invalid escape in string.");
+					error.start_column = column - 2;
+					error.leftmost_column = error.start_column;
+					push_error(error);
+					valid_escape = false;
+					break;
 			}
-		};
 
-		token_array.push_back(token);
+			if (valid_escape) {
+				result += escaped;
+			}
+		} else if (ch == quote_char) {
+			_advance();
+			if (is_multiline) {
+				if (_peek() == quote_char && _peek(1) == quote_char) {
+					// Ended the multiline string. Consume all quotes.
+					_advance();
+					_advance();
+					break;
+				}
+			} else {
+				// Ended single-line string.
+				break;
+			}
+		} else {
+			result += ch;
+			_advance();
+			if (ch == '\n') {
+				newline(false);
+			}
+		}
+	}
 
-		if (tt.get_token() == TK_EOF)
+	// Make the literal.
+	Variant string;
+	switch (type) {
+		case STRING_NAME:
+			string = StringName(result);
+			break;
+		case STRING_NODEPATH:
+			string = NodePath(result);
+			break;
+		case STRING_REGULAR:
+			string = result;
 			break;
-		tt.advance();
 	}
 
-	//reverse maps
+	return make_literal(string);
+}
 
-	Map<int, StringName> rev_identifier_map;
-	for (Map<StringName, int>::Element *E = identifier_map.front(); E; E = E->next()) {
-		rev_identifier_map[E->get()] = E->key();
-	}
+void GDScriptTokenizer::check_indent() {
+	ERR_FAIL_COND_MSG(column != 1, "Checking tokenizer indentation in the middle of a line.");
 
-	Map<int, Variant> rev_constant_map;
-	const Variant *K = NULL;
-	while ((K = constant_map.next(K))) {
-		rev_constant_map[constant_map[*K]] = *K;
+	if (_is_at_end()) {
+		// Send dedents for every indent level.
+		pending_indents -= indent_level();
+		indent_stack.clear();
+		return;
 	}
 
-	Map<int, uint32_t> rev_line_map;
-	for (Map<uint32_t, int>::Element *E = line_map.front(); E; E = E->next()) {
-		rev_line_map[E->get()] = E->key();
-	}
+	for (;;) {
+		char32_t current_indent_char = _peek();
+		int indent_count = 0;
 
-	//save header
-	buf.resize(24);
-	buf.write[0] = 'G';
-	buf.write[1] = 'D';
-	buf.write[2] = 'S';
-	buf.write[3] = 'C';
-	encode_uint32(BYTECODE_VERSION, &buf.write[4]);
-	encode_uint32(identifier_map.size(), &buf.write[8]);
-	encode_uint32(constant_map.size(), &buf.write[12]);
-	encode_uint32(line_map.size(), &buf.write[16]);
-	encode_uint32(token_array.size(), &buf.write[20]);
-
-	//save identifiers
-
-	for (Map<int, StringName>::Element *E = rev_identifier_map.front(); E; E = E->next()) {
-
-		CharString cs = String(E->get()).utf8();
-		int len = cs.length() + 1;
-		int extra = 4 - (len % 4);
-		if (extra == 4)
-			extra = 0;
-
-		uint8_t ibuf[4];
-		encode_uint32(len + extra, ibuf);
-		for (int i = 0; i < 4; i++) {
-			buf.push_back(ibuf[i]);
+		if (current_indent_char != ' ' && current_indent_char != '\t' && current_indent_char != '\r' && current_indent_char != '\n' && current_indent_char != '#') {
+			// First character of the line is not whitespace, so we clear all indentation levels.
+			// Unless we are in a continuation or in multiline mode (inside expression).
+			if (line_continuation || multiline_mode) {
+				return;
+			}
+			pending_indents -= indent_level();
+			indent_stack.clear();
+			return;
 		}
-		for (int i = 0; i < len; i++) {
-			buf.push_back(cs[i] ^ 0xb6);
+
+		if (_peek() == '\r') {
+			_advance();
+			if (_peek() != '\n') {
+				push_error("Stray carriage return character in source code.");
+			}
 		}
-		for (int i = 0; i < extra; i++) {
-			buf.push_back(0 ^ 0xb6);
+		if (_peek() == '\n') {
+			// Empty line, keep going.
+			_advance();
+			newline(false);
+			continue;
 		}
-	}
-
-	for (Map<int, Variant>::Element *E = rev_constant_map.front(); E; E = E->next()) {
 
-		int len;
-		// Objects cannot be constant, never encode objects
-		Error err = encode_variant(E->get(), NULL, len, false);
-		ERR_FAIL_COND_V_MSG(err != OK, Vector<uint8_t>(), "Error when trying to encode Variant.");
-		int pos = buf.size();
-		buf.resize(pos + len);
-		encode_variant(E->get(), &buf.write[pos], len, false);
-	}
-
-	for (Map<int, uint32_t>::Element *E = rev_line_map.front(); E; E = E->next()) {
-
-		uint8_t ibuf[8];
-		encode_uint32(E->key(), &ibuf[0]);
-		encode_uint32(E->get(), &ibuf[4]);
-		for (int i = 0; i < 8; i++)
-			buf.push_back(ibuf[i]);
-	}
+		// Check indent level.
+		bool mixed = false;
+		while (!_is_at_end()) {
+			char32_t space = _peek();
+			if (space == '\t') {
+				// Consider individual tab columns.
+				column += tab_size - 1;
+				indent_count += tab_size;
+			} else if (space == ' ') {
+				indent_count += 1;
+			} else {
+				break;
+			}
+			mixed = mixed || space != current_indent_char;
+			_advance();
+		}
 
-	for (int i = 0; i < token_array.size(); i++) {
+		if (mixed) {
+			Token error = make_error("Mixed use of tabs and spaces for indentation.");
+			error.start_line = line;
+			error.start_column = 1;
+			error.leftmost_column = 1;
+			error.rightmost_column = column;
+			push_error(error);
+		}
 
-		uint32_t token = token_array[i];
+		if (_is_at_end()) {
+			// Reached the end with an empty line, so just dedent as much as needed.
+			pending_indents -= indent_level();
+			indent_stack.clear();
+			return;
+		}
 
-		if (token & ~TOKEN_MASK) {
-			uint8_t buf4[4];
-			encode_uint32(token_array[i] | TOKEN_BYTE_MASK, &buf4[0]);
-			for (int j = 0; j < 4; j++) {
-				buf.push_back(buf4[j]);
+		if (_peek() == '\r') {
+			_advance();
+			if (_peek() != '\n') {
+				push_error("Stray carriage return character in source code.");
 			}
-		} else {
-			buf.push_back(token);
 		}
-	}
-
-	return buf;
-}
+		if (_peek() == '\n') {
+			// Empty line, keep going.
+			_advance();
+			newline(false);
+			continue;
+		}
+		if (_peek() == '#') {
+			// Comment. Advance to the next line.
+			while (_peek() != '\n' && !_is_at_end()) {
+				_advance();
+			}
+			if (_is_at_end()) {
+				// Reached the end with an empty line, so just dedent as much as needed.
+				pending_indents -= indent_level();
+				indent_stack.clear();
+				return;
+			}
+			_advance(); // Consume '\n'.
+			newline(false);
+			continue;
+		}
 
-GDScriptTokenizerBuffer::Token GDScriptTokenizerBuffer::get_token(int p_offset) const {
+		if (line_continuation || multiline_mode) {
+			// We cleared up all the whitespace at the beginning of the line.
+			// But if this is a continuation or multiline mode and we don't want any indentation change.
+			return;
+		}
 
-	int offset = token + p_offset;
+		// Check if indentation character is consistent.
+		if (indent_char == '\0') {
+			// First time indenting, choose character now.
+			indent_char = current_indent_char;
+		} else if (current_indent_char != indent_char) {
+			Token error = make_error(vformat("Used \"%s\" for indentation instead \"%s\" as used before in the file.", String(&current_indent_char, 1).c_escape(), String(&indent_char, 1).c_escape()));
+			error.start_line = line;
+			error.start_column = 1;
+			error.leftmost_column = 1;
+			error.rightmost_column = column;
+			push_error(error);
+		}
 
-	if (offset < 0 || offset >= tokens.size())
-		return TK_EOF;
+		// Now we can do actual indentation changes.
 
-	return GDScriptTokenizerBuffer::Token(tokens[offset] & TOKEN_MASK);
+		// Check if indent or dedent.
+		int previous_indent = 0;
+		if (indent_level() > 0) {
+			previous_indent = indent_stack.back()->get();
+		}
+		if (indent_count == previous_indent) {
+			// No change in indentation.
+			return;
+		}
+		if (indent_count > previous_indent) {
+			// Indentation increased.
+			indent_stack.push_back(indent_count);
+			pending_indents++;
+		} else {
+			// Indentation decreased (dedent).
+			if (indent_level() == 0) {
+				push_error("Tokenizer bug: trying to dedent without previous indent.");
+				return;
+			}
+			while (indent_level() > 0 && indent_stack.back()->get() > indent_count) {
+				indent_stack.pop_back();
+				pending_indents--;
+			}
+			if ((indent_level() > 0 && indent_stack.back()->get() != indent_count) || (indent_level() == 0 && indent_count != 0)) {
+				// Mismatched indentation alignment.
+				Token error = make_error("Unindent doesn't match the previous indentation level.");
+				error.start_line = line;
+				error.start_column = 1;
+				error.leftmost_column = 1;
+				error.end_column = column + 1;
+				error.rightmost_column = column + 1;
+				push_error(error);
+				// Still, we'll be lenient and keep going, so keep this level in the stack.
+				indent_stack.push_back(indent_count);
+			}
+		}
+		break; // Get out of the loop in any case.
+	}
 }
 
-StringName GDScriptTokenizerBuffer::get_token_identifier(int p_offset) const {
-
-	int offset = token + p_offset;
-
-	ERR_FAIL_INDEX_V(offset, tokens.size(), StringName());
-	uint32_t identifier = tokens[offset] >> TOKEN_BITS;
-	ERR_FAIL_UNSIGNED_INDEX_V(identifier, (uint32_t)identifiers.size(), StringName());
+void GDScriptTokenizer::_skip_whitespace() {
+	if (pending_indents != 0) {
+		// Still have some indent/dedent tokens to give.
+		return;
+	}
 
-	return identifiers[identifier];
-}
+	bool is_bol = column == 1; // Beginning of line.
 
-GDScriptFunctions::Function GDScriptTokenizerBuffer::get_token_built_in_func(int p_offset) const {
+	if (is_bol) {
+		check_indent();
+		return;
+	}
 
-	int offset = token + p_offset;
-	ERR_FAIL_INDEX_V(offset, tokens.size(), GDScriptFunctions::FUNC_MAX);
-	return GDScriptFunctions::Function(tokens[offset] >> TOKEN_BITS);
+	for (;;) {
+		char32_t c = _peek();
+		switch (c) {
+			case ' ':
+				_advance();
+				break;
+			case '\t':
+				_advance();
+				// Consider individual tab columns.
+				column += tab_size - 1;
+				break;
+			case '\r':
+				_advance(); // Consume either way.
+				if (_peek() != '\n') {
+					push_error("Stray carriage return character in source code.");
+					return;
+				}
+				break;
+			case '\n':
+				_advance();
+				newline(!is_bol); // Don't create new line token if line is empty.
+				check_indent();
+				break;
+			case '#':
+				// Comment.
+				while (_peek() != '\n' && !_is_at_end()) {
+					_advance();
+				}
+				if (_is_at_end()) {
+					return;
+				}
+				_advance(); // Consume '\n'
+				newline(!is_bol);
+				check_indent();
+				break;
+			default:
+				return;
+		}
+	}
 }
 
-Variant::Type GDScriptTokenizerBuffer::get_token_type(int p_offset) const {
-
-	int offset = token + p_offset;
-	ERR_FAIL_INDEX_V(offset, tokens.size(), Variant::NIL);
+GDScriptTokenizer::Token GDScriptTokenizer::scan() {
+	if (has_error()) {
+		return pop_error();
+	}
 
-	return Variant::Type(tokens[offset] >> TOKEN_BITS);
-}
+	_skip_whitespace();
 
-int GDScriptTokenizerBuffer::get_token_line(int p_offset) const {
+	if (pending_newline) {
+		pending_newline = false;
+		if (!multiline_mode) {
+			// Don't return newline tokens on multine mode.
+			return last_newline;
+		}
+	}
 
-	int offset = token + p_offset;
-	int pos = lines.find_nearest(offset);
+	// Check for potential errors after skipping whitespace().
+	if (has_error()) {
+		return pop_error();
+	}
 
-	if (pos < 0)
-		return -1;
-	if (pos >= lines.size())
-		pos = lines.size() - 1;
+	_start = _current;
+	start_line = line;
+	start_column = column;
+	leftmost_column = column;
+	rightmost_column = column;
+
+	if (pending_indents != 0) {
+		// Adjust position for indent.
+		_start -= start_column - 1;
+		start_column = 1;
+		leftmost_column = 1;
+		if (pending_indents > 0) {
+			// Indents.
+			pending_indents--;
+			return make_token(Token::INDENT);
+		} else {
+			// Dedents.
+			pending_indents++;
+			Token dedent = make_token(Token::DEDENT);
+			dedent.end_column += 1;
+			dedent.rightmost_column += 1;
+			return dedent;
+		}
+	}
 
-	uint32_t l = lines.getv(pos);
-	return l & TOKEN_LINE_MASK;
-}
-int GDScriptTokenizerBuffer::get_token_column(int p_offset) const {
+	if (_is_at_end()) {
+		return make_token(Token::TK_EOF);
+	}
 
-	int offset = token + p_offset;
-	int pos = lines.find_nearest(offset);
-	if (pos < 0)
-		return -1;
-	if (pos >= lines.size())
-		pos = lines.size() - 1;
+	const char32_t c = _advance();
 
-	uint32_t l = lines.getv(pos);
-	return l >> TOKEN_LINE_BITS;
-}
-int GDScriptTokenizerBuffer::get_token_line_indent(int p_offset) const {
+	if (c == '\\') {
+		// Line continuation with backslash.
+		if (_peek() == '\r') {
+			if (_peek(1) != '\n') {
+				return make_error("Unexpected carriage return character.");
+			}
+			_advance();
+		}
+		if (_peek() != '\n') {
+			return make_error("Expected new line after \"\\\".");
+		}
+		_advance();
+		newline(false);
+		line_continuation = true;
+		return scan(); // Recurse to get next token.
+	}
 
-	int offset = token + p_offset;
-	ERR_FAIL_INDEX_V(offset, tokens.size(), 0);
-	return tokens[offset] >> TOKEN_BITS;
-}
-const Variant &GDScriptTokenizerBuffer::get_token_constant(int p_offset) const {
+	line_continuation = false;
 
-	int offset = token + p_offset;
-	ERR_FAIL_INDEX_V(offset, tokens.size(), nil);
-	uint32_t constant = tokens[offset] >> TOKEN_BITS;
-	ERR_FAIL_UNSIGNED_INDEX_V(constant, (uint32_t)constants.size(), nil);
-	return constants[constant];
-}
-String GDScriptTokenizerBuffer::get_token_error(int p_offset) const {
+	if (_is_digit(c)) {
+		return number();
+	} else if (_is_alphanumeric(c)) {
+		return potential_identifier();
+	}
 
-	ERR_FAIL_V(String());
-}
+	switch (c) {
+		// String literals.
+		case '"':
+		case '\'':
+			return string();
+
+		// Annotation.
+		case '@':
+			return annotation();
+
+		// Single characters.
+		case '~':
+			return make_token(Token::TILDE);
+		case ',':
+			return make_token(Token::COMMA);
+		case ':':
+			return make_token(Token::COLON);
+		case ';':
+			return make_token(Token::SEMICOLON);
+		case '$':
+			return make_token(Token::DOLLAR);
+		case '?':
+			return make_token(Token::QUESTION_MARK);
+		case '`':
+			return make_token(Token::BACKTICK);
+
+		// Parens.
+		case '(':
+			push_paren('(');
+			return make_token(Token::PARENTHESIS_OPEN);
+		case '[':
+			push_paren('[');
+			return make_token(Token::BRACKET_OPEN);
+		case '{':
+			push_paren('{');
+			return make_token(Token::BRACE_OPEN);
+		case ')':
+			if (!pop_paren('(')) {
+				return make_paren_error(c);
+			}
+			return make_token(Token::PARENTHESIS_CLOSE);
+		case ']':
+			if (!pop_paren('[')) {
+				return make_paren_error(c);
+			}
+			return make_token(Token::BRACKET_CLOSE);
+		case '}':
+			if (!pop_paren('{')) {
+				return make_paren_error(c);
+			}
+			return make_token(Token::BRACE_CLOSE);
+
+		// Double characters.
+		case '!':
+			if (_peek() == '=') {
+				_advance();
+				return make_token(Token::BANG_EQUAL);
+			} else {
+				return make_token(Token::BANG);
+			}
+		case '.':
+			if (_peek() == '.') {
+				_advance();
+				return make_token(Token::PERIOD_PERIOD);
+			} else if (_is_digit(_peek())) {
+				// Number starting with '.'.
+				return number();
+			} else {
+				return make_token(Token::PERIOD);
+			}
+		case '+':
+			if (_peek() == '=') {
+				_advance();
+				return make_token(Token::PLUS_EQUAL);
+			} else {
+				return make_token(Token::PLUS);
+			}
+		case '-':
+			if (_peek() == '=') {
+				_advance();
+				return make_token(Token::MINUS_EQUAL);
+			} else if (_peek() == '>') {
+				_advance();
+				return make_token(Token::FORWARD_ARROW);
+			} else {
+				return make_token(Token::MINUS);
+			}
+		case '*':
+			if (_peek() == '=') {
+				_advance();
+				return make_token(Token::STAR_EQUAL);
+			} else {
+				return make_token(Token::STAR);
+			}
+		case '/':
+			if (_peek() == '=') {
+				_advance();
+				return make_token(Token::SLASH_EQUAL);
+			} else {
+				return make_token(Token::SLASH);
+			}
+		case '%':
+			if (_peek() == '=') {
+				_advance();
+				return make_token(Token::PERCENT_EQUAL);
+			} else {
+				return make_token(Token::PERCENT);
+			}
+		case '^':
+			if (_peek() == '=') {
+				_advance();
+				return make_token(Token::CARET_EQUAL);
+			} else if (_peek() == '"' || _peek() == '\'') {
+				// Node path
+				return string();
+			} else {
+				return make_token(Token::CARET);
+			}
+		case '&':
+			if (_peek() == '&') {
+				_advance();
+				return make_token(Token::AMPERSAND_AMPERSAND);
+			} else if (_peek() == '=') {
+				_advance();
+				return make_token(Token::AMPERSAND_EQUAL);
+			} else if (_peek() == '"' || _peek() == '\'') {
+				// String Name
+				return string();
+			} else {
+				return make_token(Token::AMPERSAND);
+			}
+		case '|':
+			if (_peek() == '|') {
+				_advance();
+				return make_token(Token::PIPE_PIPE);
+			} else if (_peek() == '=') {
+				_advance();
+				return make_token(Token::PIPE_EQUAL);
+			} else {
+				return make_token(Token::PIPE);
+			}
 
-void GDScriptTokenizerBuffer::advance(int p_amount) {
+		// Potential VCS conflict markers.
+		case '=':
+			if (_peek() == '=') {
+				return check_vcs_marker('=', Token::EQUAL_EQUAL);
+			} else {
+				return make_token(Token::EQUAL);
+			}
+		case '<':
+			if (_peek() == '=') {
+				_advance();
+				return make_token(Token::LESS_EQUAL);
+			} else if (_peek() == '<') {
+				if (_peek(1) == '=') {
+					_advance();
+					_advance(); // Advance both '<' and '='
+					return make_token(Token::LESS_LESS_EQUAL);
+				} else {
+					return check_vcs_marker('<', Token::LESS_LESS);
+				}
+			} else {
+				return make_token(Token::LESS);
+			}
+		case '>':
+			if (_peek() == '=') {
+				_advance();
+				return make_token(Token::GREATER_EQUAL);
+			} else if (_peek() == '>') {
+				if (_peek(1) == '=') {
+					_advance();
+					_advance(); // Advance both '>' and '='
+					return make_token(Token::GREATER_GREATER_EQUAL);
+				} else {
+					return check_vcs_marker('>', Token::GREATER_GREATER);
+				}
+			} else {
+				return make_token(Token::GREATER);
+			}
 
-	ERR_FAIL_INDEX(p_amount + token, tokens.size());
-	token += p_amount;
+		default:
+			return make_error(vformat(R"(Unknown character "%s".")", String(&c, 1)));
+	}
 }
-GDScriptTokenizerBuffer::GDScriptTokenizerBuffer() {
 
-	token = 0;
+GDScriptTokenizer::GDScriptTokenizer() {
+#ifdef TOOLS_ENABLED
+	if (EditorSettings::get_singleton()) {
+		tab_size = EditorSettings::get_singleton()->get_setting("text_editor/indent/size");
+	}
+#endif // TOOLS_ENABLED
 }
diff --git a/modules/gdscript/gdscript_tokenizer.h b/modules/gdscript/gdscript_tokenizer.h
index 0efc8551cb..4453982d08 100644
--- a/modules/gdscript/gdscript_tokenizer.h
+++ b/modules/gdscript/gdscript_tokenizer.h
@@ -31,271 +31,221 @@
 #ifndef GDSCRIPT_TOKENIZER_H
 #define GDSCRIPT_TOKENIZER_H
 
-#include "core/pair.h"
-#include "core/string_name.h"
-#include "core/ustring.h"
+#include "core/list.h"
+#include "core/set.h"
 #include "core/variant.h"
-#include "core/vmap.h"
-#include "gdscript_functions.h"
+#include "core/vector.h"
 
 class GDScriptTokenizer {
 public:
-	enum Token {
-
-		TK_EMPTY,
-		TK_IDENTIFIER,
-		TK_CONSTANT,
-		TK_SELF,
-		TK_BUILT_IN_TYPE,
-		TK_BUILT_IN_FUNC,
-		TK_OP_IN,
-		TK_OP_EQUAL,
-		TK_OP_NOT_EQUAL,
-		TK_OP_LESS,
-		TK_OP_LESS_EQUAL,
-		TK_OP_GREATER,
-		TK_OP_GREATER_EQUAL,
-		TK_OP_AND,
-		TK_OP_OR,
-		TK_OP_NOT,
-		TK_OP_ADD,
-		TK_OP_SUB,
-		TK_OP_MUL,
-		TK_OP_DIV,
-		TK_OP_MOD,
-		TK_OP_SHIFT_LEFT,
-		TK_OP_SHIFT_RIGHT,
-		TK_OP_ASSIGN,
-		TK_OP_ASSIGN_ADD,
-		TK_OP_ASSIGN_SUB,
-		TK_OP_ASSIGN_MUL,
-		TK_OP_ASSIGN_DIV,
-		TK_OP_ASSIGN_MOD,
-		TK_OP_ASSIGN_SHIFT_LEFT,
-		TK_OP_ASSIGN_SHIFT_RIGHT,
-		TK_OP_ASSIGN_BIT_AND,
-		TK_OP_ASSIGN_BIT_OR,
-		TK_OP_ASSIGN_BIT_XOR,
-		TK_OP_BIT_AND,
-		TK_OP_BIT_OR,
-		TK_OP_BIT_XOR,
-		TK_OP_BIT_INVERT,
-		//TK_OP_PLUS_PLUS,
-		//TK_OP_MINUS_MINUS,
-		TK_CF_IF,
-		TK_CF_ELIF,
-		TK_CF_ELSE,
-		TK_CF_FOR,
-		TK_CF_WHILE,
-		TK_CF_BREAK,
-		TK_CF_CONTINUE,
-		TK_CF_PASS,
-		TK_CF_RETURN,
-		TK_CF_MATCH,
-		TK_PR_FUNCTION,
-		TK_PR_CLASS,
-		TK_PR_CLASS_NAME,
-		TK_PR_EXTENDS,
-		TK_PR_IS,
-		TK_PR_ONREADY,
-		TK_PR_TOOL,
-		TK_PR_STATIC,
-		TK_PR_EXPORT,
-		TK_PR_SETGET,
-		TK_PR_CONST,
-		TK_PR_VAR,
-		TK_PR_AS,
-		TK_PR_VOID,
-		TK_PR_ENUM,
-		TK_PR_PRELOAD,
-		TK_PR_ASSERT,
-		TK_PR_YIELD,
-		TK_PR_SIGNAL,
-		TK_PR_BREAKPOINT,
-		TK_PR_REMOTE,
-		TK_PR_SYNC,
-		TK_PR_MASTER,
-		TK_PR_SLAVE, // Deprecated by TK_PR_PUPPET, to remove in 4.0
-		TK_PR_PUPPET,
-		TK_PR_REMOTESYNC,
-		TK_PR_MASTERSYNC,
-		TK_PR_PUPPETSYNC,
-		TK_BRACKET_OPEN,
-		TK_BRACKET_CLOSE,
-		TK_CURLY_BRACKET_OPEN,
-		TK_CURLY_BRACKET_CLOSE,
-		TK_PARENTHESIS_OPEN,
-		TK_PARENTHESIS_CLOSE,
-		TK_COMMA,
-		TK_SEMICOLON,
-		TK_PERIOD,
-		TK_QUESTION_MARK,
-		TK_COLON,
-		TK_DOLLAR,
-		TK_FORWARD_ARROW,
-		TK_NEWLINE,
-		TK_CONST_PI,
-		TK_CONST_TAU,
-		TK_WILDCARD,
-		TK_CONST_INF,
-		TK_CONST_NAN,
-		TK_ERROR,
-		TK_EOF,
-		TK_CURSOR, //used for code completion
-		TK_MAX
-	};
-
-protected:
-	enum StringMode {
-		STRING_SINGLE_QUOTE,
-		STRING_DOUBLE_QUOTE,
-		STRING_MULTILINE
+	enum CursorPlace {
+		CURSOR_NONE,
+		CURSOR_BEGINNING,
+		CURSOR_MIDDLE,
+		CURSOR_END,
 	};
 
-	static const char *token_names[TK_MAX];
-
-public:
-	static const char *get_token_name(Token p_token);
-
-	bool is_token_literal(int p_offset = 0, bool variable_safe = false) const;
-	StringName get_token_literal(int p_offset = 0) const;
-
-	virtual const Variant &get_token_constant(int p_offset = 0) const = 0;
-	virtual Token get_token(int p_offset = 0) const = 0;
-	virtual StringName get_token_identifier(int p_offset = 0) const = 0;
-	virtual GDScriptFunctions::Function get_token_built_in_func(int p_offset = 0) const = 0;
-	virtual Variant::Type get_token_type(int p_offset = 0) const = 0;
-	virtual int get_token_line(int p_offset = 0) const = 0;
-	virtual int get_token_column(int p_offset = 0) const = 0;
-	virtual int get_token_line_indent(int p_offset = 0) const = 0;
-	virtual int get_token_line_tab_indent(int p_offset = 0) const = 0;
-	virtual String get_token_error(int p_offset = 0) const = 0;
-	virtual void advance(int p_amount = 1) = 0;
-#ifdef DEBUG_ENABLED
-	virtual const Vector<Pair<int, String> > &get_warning_skips() const = 0;
-	virtual const Set<String> &get_warning_global_skips() const = 0;
-	virtual bool is_ignoring_warnings() const = 0;
-#endif // DEBUG_ENABLED
-
-	virtual ~GDScriptTokenizer(){};
-};
-
-class GDScriptTokenizerText : public GDScriptTokenizer {
-
-	enum {
-		MAX_LOOKAHEAD = 4,
-		TK_RB_SIZE = MAX_LOOKAHEAD * 2 + 1
+	struct Token {
+		enum Type {
+			EMPTY,
+			// Basic
+			ANNOTATION,
+			IDENTIFIER,
+			LITERAL,
+			// Comparison
+			LESS,
+			LESS_EQUAL,
+			GREATER,
+			GREATER_EQUAL,
+			EQUAL_EQUAL,
+			BANG_EQUAL,
+			// Logical
+			AND,
+			OR,
+			NOT,
+			AMPERSAND_AMPERSAND,
+			PIPE_PIPE,
+			BANG,
+			// Bitwise
+			AMPERSAND,
+			PIPE,
+			TILDE,
+			CARET,
+			LESS_LESS,
+			GREATER_GREATER,
+			// Math
+			PLUS,
+			MINUS,
+			STAR,
+			SLASH,
+			PERCENT,
+			// Assignment
+			EQUAL,
+			PLUS_EQUAL,
+			MINUS_EQUAL,
+			STAR_EQUAL,
+			SLASH_EQUAL,
+			PERCENT_EQUAL,
+			LESS_LESS_EQUAL,
+			GREATER_GREATER_EQUAL,
+			AMPERSAND_EQUAL,
+			PIPE_EQUAL,
+			CARET_EQUAL,
+			// Control flow
+			IF,
+			ELIF,
+			ELSE,
+			FOR,
+			WHILE,
+			BREAK,
+			CONTINUE,
+			PASS,
+			RETURN,
+			MATCH,
+			// Keywords
+			AS,
+			ASSERT,
+			AWAIT,
+			BREAKPOINT,
+			CLASS,
+			CLASS_NAME,
+			CONST,
+			ENUM,
+			EXTENDS,
+			FUNC,
+			IN,
+			IS,
+			NAMESPACE,
+			PRELOAD,
+			SELF,
+			SIGNAL,
+			STATIC,
+			SUPER,
+			TRAIT,
+			VAR,
+			VOID,
+			YIELD,
+			// Punctuation
+			BRACKET_OPEN,
+			BRACKET_CLOSE,
+			BRACE_OPEN,
+			BRACE_CLOSE,
+			PARENTHESIS_OPEN,
+			PARENTHESIS_CLOSE,
+			COMMA,
+			SEMICOLON,
+			PERIOD,
+			PERIOD_PERIOD,
+			COLON,
+			DOLLAR,
+			FORWARD_ARROW,
+			UNDERSCORE,
+			// Whitespace
+			NEWLINE,
+			INDENT,
+			DEDENT,
+			// Constants
+			CONST_PI,
+			CONST_TAU,
+			CONST_INF,
+			CONST_NAN,
+			// Error message improvement
+			VCS_CONFLICT_MARKER,
+			BACKTICK,
+			QUESTION_MARK,
+			// Special
+			ERROR,
+			TK_EOF, // "EOF" is reserved
+			TK_MAX
+		};
 
-	};
+		Type type = EMPTY;
+		Variant literal;
+		int start_line = 0, end_line = 0, start_column = 0, end_column = 0;
+		int leftmost_column = 0, rightmost_column = 0; // Column span for multiline tokens.
+		int cursor_position = -1;
+		CursorPlace cursor_place = CURSOR_NONE;
+		String source;
+
+		const char *get_name() const;
+		bool is_identifier() const;
+		bool is_node_name() const;
+		StringName get_identifier() const { return source; }
+
+		Token(Type p_type) {
+			type = p_type;
+		}
 
-	struct TokenData {
-		Token type;
-		StringName identifier; //for identifier types
-		Variant constant; //for constant types
-		union {
-			Variant::Type vtype; //for type types
-			GDScriptFunctions::Function func; //function for built in functions
-			int warning_code; //for warning skip
-		};
-		int line, col;
-		TokenData() {
-			type = TK_EMPTY;
-			line = col = 0;
-			vtype = Variant::NIL;
+		Token() {
+			type = EMPTY;
 		}
 	};
 
-	void _make_token(Token p_type);
-	void _make_newline(int p_indentation = 0, int p_tabs = 0);
-	void _make_identifier(const StringName &p_identifier);
-	void _make_built_in_func(GDScriptFunctions::Function p_func);
-	void _make_constant(const Variant &p_constant);
-	void _make_type(const Variant::Type &p_type);
-	void _make_error(const String &p_error);
-
-	String code;
-	int len;
-	int code_pos;
-	const CharType *_code;
-	int line;
-	int column;
-	TokenData tk_rb[TK_RB_SIZE * 2 + 1];
-	int tk_rb_pos;
-	String last_error;
-	bool error_flag;
-
-#ifdef DEBUG_ENABLED
-	Vector<Pair<int, String> > warning_skips;
-	Set<String> warning_global_skips;
-	bool ignore_warnings;
-#endif // DEBUG_ENABLED
-
-	void _advance();
+private:
+	String source;
+	const char32_t *_source = nullptr;
+	const char32_t *_current = nullptr;
+	int line = -1, column = -1;
+	int cursor_line = -1, cursor_column = -1;
+	int tab_size = 4;
+
+	// Keep track of multichar tokens.
+	const char32_t *_start = nullptr;
+	int start_line = 0, start_column = 0;
+	int leftmost_column = 0, rightmost_column = 0;
+
+	// Info cache.
+	bool line_continuation = false; // Whether this line is a continuation of the previous, like when using '\'.
+	bool multiline_mode = false;
+	List<Token> error_stack;
+	bool pending_newline = false;
+	Token last_newline;
+	int pending_indents = 0;
+	List<int> indent_stack;
+	List<char32_t> paren_stack;
+	char32_t indent_char = '\0';
+	int position = 0;
+	int length = 0;
+
+	_FORCE_INLINE_ bool _is_at_end() { return position >= length; }
+	_FORCE_INLINE_ char32_t _peek(int p_offset = 0) { return position + p_offset >= 0 && position + p_offset < length ? _current[p_offset] : '\0'; }
+	int indent_level() const { return indent_stack.size(); }
+	bool has_error() const { return !error_stack.empty(); }
+	Token pop_error();
+	char32_t _advance();
+	void _skip_whitespace();
+	void check_indent();
+
+	Token make_error(const String &p_message);
+	void push_error(const String &p_message);
+	void push_error(const Token &p_error);
+	Token make_paren_error(char32_t p_paren);
+	Token make_token(Token::Type p_type);
+	Token make_literal(const Variant &p_literal);
+	Token make_identifier(const StringName &p_identifier);
+	Token check_vcs_marker(char32_t p_test, Token::Type p_double_type);
+	void push_paren(char32_t p_char);
+	bool pop_paren(char32_t p_expected);
+
+	void newline(bool p_make_token);
+	Token number();
+	Token potential_identifier();
+	Token string();
+	Token annotation();
 
 public:
-	void set_code(const String &p_code);
-	virtual Token get_token(int p_offset = 0) const;
-	virtual StringName get_token_identifier(int p_offset = 0) const;
-	virtual GDScriptFunctions::Function get_token_built_in_func(int p_offset = 0) const;
-	virtual Variant::Type get_token_type(int p_offset = 0) const;
-	virtual int get_token_line(int p_offset = 0) const;
-	virtual int get_token_column(int p_offset = 0) const;
-	virtual int get_token_line_indent(int p_offset = 0) const;
-	virtual int get_token_line_tab_indent(int p_offset = 0) const;
-	virtual const Variant &get_token_constant(int p_offset = 0) const;
-	virtual String get_token_error(int p_offset = 0) const;
-	virtual void advance(int p_amount = 1);
-#ifdef DEBUG_ENABLED
-	virtual const Vector<Pair<int, String> > &get_warning_skips() const { return warning_skips; }
-	virtual const Set<String> &get_warning_global_skips() const { return warning_global_skips; }
-	virtual bool is_ignoring_warnings() const { return ignore_warnings; }
-#endif // DEBUG_ENABLED
-};
-
-class GDScriptTokenizerBuffer : public GDScriptTokenizer {
+	Token scan();
 
-	enum {
+	void set_source_code(const String &p_source_code);
 
-		TOKEN_BYTE_MASK = 0x80,
-		TOKEN_BITS = 8,
-		TOKEN_MASK = (1 << TOKEN_BITS) - 1,
-		TOKEN_LINE_BITS = 24,
-		TOKEN_LINE_MASK = (1 << TOKEN_LINE_BITS) - 1,
-	};
+	int get_cursor_line() const;
+	int get_cursor_column() const;
+	void set_cursor_position(int p_line, int p_column);
+	void set_multiline_mode(bool p_state);
+	bool is_past_cursor() const;
+	static String get_token_name(Token::Type p_token_type);
 
-	Vector<StringName> identifiers;
-	Vector<Variant> constants;
-	VMap<uint32_t, uint32_t> lines;
-	Vector<uint32_t> tokens;
-	Variant nil;
-	int token;
-
-public:
-	Error set_code_buffer(const Vector<uint8_t> &p_buffer);
-	static Vector<uint8_t> parse_code_string(const String &p_code);
-	virtual Token get_token(int p_offset = 0) const;
-	virtual StringName get_token_identifier(int p_offset = 0) const;
-	virtual GDScriptFunctions::Function get_token_built_in_func(int p_offset = 0) const;
-	virtual Variant::Type get_token_type(int p_offset = 0) const;
-	virtual int get_token_line(int p_offset = 0) const;
-	virtual int get_token_column(int p_offset = 0) const;
-	virtual int get_token_line_indent(int p_offset = 0) const;
-	virtual int get_token_line_tab_indent(int p_offset = 0) const { return 0; }
-	virtual const Variant &get_token_constant(int p_offset = 0) const;
-	virtual String get_token_error(int p_offset = 0) const;
-	virtual void advance(int p_amount = 1);
-#ifdef DEBUG_ENABLED
-	virtual const Vector<Pair<int, String> > &get_warning_skips() const {
-		static Vector<Pair<int, String> > v;
-		return v;
-	}
-	virtual const Set<String> &get_warning_global_skips() const {
-		static Set<String> s;
-		return s;
-	}
-	virtual bool is_ignoring_warnings() const { return true; }
-#endif // DEBUG_ENABLED
-	GDScriptTokenizerBuffer();
+	GDScriptTokenizer();
 };
 
-#endif // GDSCRIPT_TOKENIZER_H
+#endif
diff --git a/modules/gdscript/gdscript_warning.cpp b/modules/gdscript/gdscript_warning.cpp
new file mode 100644
index 0000000000..105facd9d0
--- /dev/null
+++ b/modules/gdscript/gdscript_warning.cpp
@@ -0,0 +1,210 @@
+/*************************************************************************/
+/*  gdscript_warning.cpp                                                 */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "gdscript_warning.h"
+
+#include "core/variant.h"
+
+#ifdef DEBUG_ENABLED
+
+String GDScriptWarning::get_message() const {
+#define CHECK_SYMBOLS(m_amount) ERR_FAIL_COND_V(symbols.size() < m_amount, String());
+
+	switch (code) {
+		case UNASSIGNED_VARIABLE_OP_ASSIGN: {
+			CHECK_SYMBOLS(1);
+			return "Using assignment with operation but the variable '" + symbols[0] + "' was not previously assigned a value.";
+		} break;
+		case UNASSIGNED_VARIABLE: {
+			CHECK_SYMBOLS(1);
+			return "The variable '" + symbols[0] + "' was used but never assigned a value.";
+		} break;
+		case UNUSED_VARIABLE: {
+			CHECK_SYMBOLS(1);
+			return "The local variable '" + symbols[0] + "' is declared but never used in the block. If this is intended, prefix it with an underscore: '_" + symbols[0] + "'";
+		} break;
+		case UNUSED_LOCAL_CONSTANT: {
+			CHECK_SYMBOLS(1);
+			return "The local constant '" + symbols[0] + "' is declared but never used in the block. If this is intended, prefix it with an underscore: '_" + symbols[0] + "'";
+		} break;
+		case SHADOWED_VARIABLE: {
+			CHECK_SYMBOLS(4);
+			return vformat(R"(The local %s "%s" is shadowing an already-declared %s at line %s.)", symbols[0], symbols[1], symbols[2], symbols[3]);
+		} break;
+		case SHADOWED_VARIABLE_BASE_CLASS: {
+			CHECK_SYMBOLS(4);
+			return vformat(R"(The local %s "%s" is shadowing an already-declared %s at the base class "%s".)", symbols[0], symbols[1], symbols[2], symbols[3]);
+		} break;
+		case UNUSED_PRIVATE_CLASS_VARIABLE: {
+			CHECK_SYMBOLS(1);
+			return "The class variable '" + symbols[0] + "' is declared but never used in the script.";
+		} break;
+		case UNUSED_PARAMETER: {
+			CHECK_SYMBOLS(2);
+			return "The parameter '" + symbols[1] + "' is never used in the function '" + symbols[0] + "'. If this is intended, prefix it with an underscore: '_" + symbols[1] + "'";
+		} break;
+		case UNREACHABLE_CODE: {
+			CHECK_SYMBOLS(1);
+			return "Unreachable code (statement after return) in function '" + symbols[0] + "()'.";
+		} break;
+		case UNREACHABLE_PATTERN: {
+			return "Unreachable pattern (pattern after wildcard or bind).";
+		} break;
+		case STANDALONE_EXPRESSION: {
+			return "Standalone expression (the line has no effect).";
+		} break;
+		case VOID_ASSIGNMENT: {
+			CHECK_SYMBOLS(1);
+			return "Assignment operation, but the function '" + symbols[0] + "()' returns void.";
+		} break;
+		case NARROWING_CONVERSION: {
+			return "Narrowing conversion (float is converted to int and loses precision).";
+		} break;
+		case INCOMPATIBLE_TERNARY: {
+			return "Values of the ternary conditional are not mutually compatible.";
+		} break;
+		case UNUSED_SIGNAL: {
+			CHECK_SYMBOLS(1);
+			return "The signal '" + symbols[0] + "' is declared but never emitted.";
+		} break;
+		case RETURN_VALUE_DISCARDED: {
+			CHECK_SYMBOLS(1);
+			return "The function '" + symbols[0] + "()' returns a value, but this value is never used.";
+		} break;
+		case PROPERTY_USED_AS_FUNCTION: {
+			CHECK_SYMBOLS(2);
+			return "The method '" + symbols[0] + "()' was not found in base '" + symbols[1] + "' but there's a property with the same name. Did you mean to access it?";
+		} break;
+		case CONSTANT_USED_AS_FUNCTION: {
+			CHECK_SYMBOLS(2);
+			return "The method '" + symbols[0] + "()' was not found in base '" + symbols[1] + "' but there's a constant with the same name. Did you mean to access it?";
+		} break;
+		case FUNCTION_USED_AS_PROPERTY: {
+			CHECK_SYMBOLS(2);
+			return "The property '" + symbols[0] + "' was not found in base '" + symbols[1] + "' but there's a method with the same name. Did you mean to call it?";
+		} break;
+		case INTEGER_DIVISION: {
+			return "Integer division, decimal part will be discarded.";
+		} break;
+		case UNSAFE_PROPERTY_ACCESS: {
+			CHECK_SYMBOLS(2);
+			return "The property '" + symbols[0] + "' is not present on the inferred type '" + symbols[1] + "' (but may be present on a subtype).";
+		} break;
+		case UNSAFE_METHOD_ACCESS: {
+			CHECK_SYMBOLS(2);
+			return "The method '" + symbols[0] + "' is not present on the inferred type '" + symbols[1] + "' (but may be present on a subtype).";
+		} break;
+		case UNSAFE_CAST: {
+			CHECK_SYMBOLS(1);
+			return "The value is cast to '" + symbols[0] + "' but has an unknown type.";
+		} break;
+		case UNSAFE_CALL_ARGUMENT: {
+			CHECK_SYMBOLS(4);
+			return "The argument '" + symbols[0] + "' of the function '" + symbols[1] + "' requires a the subtype '" + symbols[2] + "' but the supertype '" + symbols[3] + "' was provided";
+		} break;
+		case DEPRECATED_KEYWORD: {
+			CHECK_SYMBOLS(2);
+			return "The '" + symbols[0] + "' keyword is deprecated and will be removed in a future release, please replace its uses by '" + symbols[1] + "'.";
+		} break;
+		case STANDALONE_TERNARY: {
+			return "Standalone ternary conditional operator: the return value is being discarded.";
+		}
+		case ASSERT_ALWAYS_TRUE: {
+			return "Assert statement is redundant because the expression is always true.";
+		}
+		case ASSERT_ALWAYS_FALSE: {
+			return "Assert statement will raise an error because the expression is always false.";
+		}
+		case REDUNDANT_AWAIT: {
+			return R"("await" keyword not needed in this case, because the expression isn't a coroutine nor a signal.)";
+		}
+		case WARNING_MAX:
+			break; // Can't happen, but silences warning
+	}
+	ERR_FAIL_V_MSG(String(), "Invalid GDScript warning code: " + get_name_from_code(code) + ".");
+
+#undef CHECK_SYMBOLS
+}
+
+String GDScriptWarning::get_name() const {
+	return get_name_from_code(code);
+}
+
+String GDScriptWarning::get_name_from_code(Code p_code) {
+	ERR_FAIL_COND_V(p_code < 0 || p_code >= WARNING_MAX, String());
+
+	static const char *names[] = {
+		"UNASSIGNED_VARIABLE",
+		"UNASSIGNED_VARIABLE_OP_ASSIGN",
+		"UNUSED_VARIABLE",
+		"UNUSED_LOCAL_CONSTANT",
+		"SHADOWED_VARIABLE",
+		"SHADOWED_VARIABLE_BASE_CLASS",
+		"UNUSED_PRIVATE_CLASS_VARIABLE",
+		"UNUSED_PARAMETER",
+		"UNREACHABLE_CODE",
+		"UNREACHABLE_PATTERN",
+		"STANDALONE_EXPRESSION",
+		"VOID_ASSIGNMENT",
+		"NARROWING_CONVERSION",
+		"INCOMPATIBLE_TERNARY",
+		"UNUSED_SIGNAL",
+		"RETURN_VALUE_DISCARDED",
+		"PROPERTY_USED_AS_FUNCTION",
+		"CONSTANT_USED_AS_FUNCTION",
+		"FUNCTION_USED_AS_PROPERTY",
+		"INTEGER_DIVISION",
+		"UNSAFE_PROPERTY_ACCESS",
+		"UNSAFE_METHOD_ACCESS",
+		"UNSAFE_CAST",
+		"UNSAFE_CALL_ARGUMENT",
+		"DEPRECATED_KEYWORD",
+		"STANDALONE_TERNARY",
+		"ASSERT_ALWAYS_TRUE",
+		"ASSERT_ALWAYS_FALSE",
+		"REDUNDANT_AWAIT",
+	};
+
+	static_assert((sizeof(names) / sizeof(*names)) == WARNING_MAX, "Amount of warning types don't match the amount of warning names.");
+
+	return names[(int)p_code];
+}
+
+GDScriptWarning::Code GDScriptWarning::get_code_from_name(const String &p_name) {
+	for (int i = 0; i < WARNING_MAX; i++) {
+		if (get_name_from_code((Code)i) == p_name) {
+			return (Code)i;
+		}
+	}
+
+	ERR_FAIL_V_MSG(WARNING_MAX, "Invalid GDScript warning name: " + p_name);
+}
+
+#endif // DEBUG_ENABLED
diff --git a/modules/gdscript/gdscript_warning.h b/modules/gdscript/gdscript_warning.h
new file mode 100644
index 0000000000..e183d6f302
--- /dev/null
+++ b/modules/gdscript/gdscript_warning.h
@@ -0,0 +1,87 @@
+/*************************************************************************/
+/*  gdscript_warning.h                                                   */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef GDSCRIPT_WARNINGS
+#define GDSCRIPT_WARNINGS
+
+#ifdef DEBUG_ENABLED
+
+#include "core/ustring.h"
+#include "core/vector.h"
+
+class GDScriptWarning {
+public:
+	enum Code {
+		UNASSIGNED_VARIABLE, // Variable used but never assigned.
+		UNASSIGNED_VARIABLE_OP_ASSIGN, // Variable never assigned but used in an assignment operation (+=, *=, etc).
+		UNUSED_VARIABLE, // Local variable is declared but never used.
+		UNUSED_LOCAL_CONSTANT, // Local constant is declared but never used.
+		SHADOWED_VARIABLE, // Variable name shadowed by other variable in same class.
+		SHADOWED_VARIABLE_BASE_CLASS, // Variable name shadowed by other variable in some base class.
+		UNUSED_PRIVATE_CLASS_VARIABLE, // Class variable is declared private ("_" prefix) but never used in the file.
+		UNUSED_PARAMETER, // Function parameter is never used.
+		UNREACHABLE_CODE, // Code after a return statement.
+		UNREACHABLE_PATTERN, // Pattern in a match statement after a catch all pattern (wildcard or bind).
+		STANDALONE_EXPRESSION, // Expression not assigned to a variable.
+		VOID_ASSIGNMENT, // Function returns void but it's assigned to a variable.
+		NARROWING_CONVERSION, // Float value into an integer slot, precision is lost.
+		INCOMPATIBLE_TERNARY, // Possible values of a ternary if are not mutually compatible.
+		UNUSED_SIGNAL, // Signal is defined but never emitted.
+		RETURN_VALUE_DISCARDED, // Function call returns something but the value isn't used.
+		PROPERTY_USED_AS_FUNCTION, // Function not found, but there's a property with the same name.
+		CONSTANT_USED_AS_FUNCTION, // Function not found, but there's a constant with the same name.
+		FUNCTION_USED_AS_PROPERTY, // Property not found, but there's a function with the same name.
+		INTEGER_DIVISION, // Integer divide by integer, decimal part is discarded.
+		UNSAFE_PROPERTY_ACCESS, // Property not found in the detected type (but can be in subtypes).
+		UNSAFE_METHOD_ACCESS, // Function not found in the detected type (but can be in subtypes).
+		UNSAFE_CAST, // Cast used in an unknown type.
+		UNSAFE_CALL_ARGUMENT, // Function call argument is of a supertype of the require argument.
+		DEPRECATED_KEYWORD, // The keyword is deprecated and should be replaced.
+		STANDALONE_TERNARY, // Return value of ternary expression is discarded.
+		ASSERT_ALWAYS_TRUE, // Expression for assert argument is always true.
+		ASSERT_ALWAYS_FALSE, // Expression for assert argument is always false.
+		REDUNDANT_AWAIT, // await is used but expression is synchronous (not a signal nor a coroutine).
+		WARNING_MAX,
+	};
+
+	Code code = WARNING_MAX;
+	int start_line = -1, end_line = -1;
+	int leftmost_column = -1, rightmost_column = -1;
+	Vector<String> symbols;
+
+	String get_name() const;
+	String get_message() const;
+	static String get_name_from_code(Code p_code);
+	static Code get_code_from_name(const String &p_name);
+};
+
+#endif // DEBUG_ENABLED
+
+#endif // GDSCRIPT_WARNINGS
diff --git a/modules/gdscript/icons/icon_g_d_script.svg b/modules/gdscript/icons/GDScript.svg
index 953bb9ae9e..953bb9ae9e 100644
--- a/modules/gdscript/icons/icon_g_d_script.svg
+++ b/modules/gdscript/icons/GDScript.svg
diff --git a/modules/gdscript/language_server/gdscript_extend_parser.cpp b/modules/gdscript/language_server/gdscript_extend_parser.cpp
index 0f6f13944b..668dfd4835 100644
--- a/modules/gdscript/language_server/gdscript_extend_parser.cpp
+++ b/modules/gdscript/language_server/gdscript_extend_parser.cpp
@@ -29,24 +29,27 @@
 /*************************************************************************/
 
 #include "gdscript_extend_parser.h"
+
 #include "../gdscript.h"
+#include "../gdscript_analyzer.h"
 #include "core/io/json.h"
 #include "gdscript_language_protocol.h"
 #include "gdscript_workspace.h"
 
 void ExtendGDScriptParser::update_diagnostics() {
-
 	diagnostics.clear();
 
-	if (has_error()) {
+	const List<ParserError> &errors = get_errors();
+	for (const List<ParserError>::Element *E = errors.front(); E != nullptr; E = E->next()) {
+		const ParserError &error = E->get();
 		lsp::Diagnostic diagnostic;
 		diagnostic.severity = lsp::DiagnosticSeverity::Error;
-		diagnostic.message = get_error();
+		diagnostic.message = error.message;
 		diagnostic.source = "gdscript";
 		diagnostic.code = -1;
 		lsp::Range range;
 		lsp::Position pos;
-		int line = LINE_NUMBER_TO_INDEX(get_error_line());
+		int line = LINE_NUMBER_TO_INDEX(error.line);
 		const String &line_text = get_lines()[line];
 		pos.line = line;
 		pos.character = line_text.length() - line_text.strip_edges(true, false).length();
@@ -62,12 +65,12 @@ void ExtendGDScriptParser::update_diagnostics() {
 		const GDScriptWarning &warning = E->get();
 		lsp::Diagnostic diagnostic;
 		diagnostic.severity = lsp::DiagnosticSeverity::Warning;
-		diagnostic.message = warning.get_message();
+		diagnostic.message = "(" + warning.get_name() + "): " + warning.get_message();
 		diagnostic.source = "gdscript";
 		diagnostic.code = warning.code;
 		lsp::Range range;
 		lsp::Position pos;
-		int line = LINE_NUMBER_TO_INDEX(warning.line);
+		int line = LINE_NUMBER_TO_INDEX(warning.start_line);
 		const String &line_text = get_lines()[line];
 		pos.line = line;
 		pos.character = line_text.length() - line_text.strip_edges(true, false).length();
@@ -80,12 +83,10 @@ void ExtendGDScriptParser::update_diagnostics() {
 }
 
 void ExtendGDScriptParser::update_symbols() {
-
 	members.clear();
 
-	const GDScriptParser::Node *head = get_parse_tree();
+	const GDScriptParser::Node *head = get_tree();
 	if (const GDScriptParser::ClassNode *gdclass = dynamic_cast<const GDScriptParser::ClassNode *>(head)) {
-
 		parse_class_symbol(gdclass, class_symbol);
 
 		for (int i = 0; i < class_symbol.children.size(); i++) {
@@ -108,15 +109,15 @@ void ExtendGDScriptParser::update_symbols() {
 void ExtendGDScriptParser::update_document_links(const String &p_code) {
 	document_links.clear();
 
-	GDScriptTokenizerText tokenizer;
+	GDScriptTokenizer tokenizer;
 	FileAccessRef fs = FileAccess::create(FileAccess::ACCESS_RESOURCES);
-	tokenizer.set_code(p_code);
+	tokenizer.set_source_code(p_code);
 	while (true) {
-		GDScriptTokenizerText::Token token = tokenizer.get_token();
-		if (token == GDScriptTokenizer::TK_EOF || token == GDScriptTokenizer::TK_ERROR) {
+		GDScriptTokenizer::Token token = tokenizer.scan();
+		if (token.type == GDScriptTokenizer::Token::TK_EOF) {
 			break;
-		} else if (token == GDScriptTokenizer::TK_CONSTANT) {
-			const Variant &const_val = tokenizer.get_token_constant();
+		} else if (token.type == GDScriptTokenizer::Token::LITERAL) {
+			const Variant &const_val = token.literal;
 			if (const_val.get_type() == Variant::STRING) {
 				String path = const_val;
 				bool exists = fs->file_exists(path);
@@ -128,239 +129,255 @@ void ExtendGDScriptParser::update_document_links(const String &p_code) {
 					String value = const_val;
 					lsp::DocumentLink link;
 					link.target = GDScriptLanguageProtocol::get_singleton()->get_workspace()->get_file_uri(path);
-					link.range.start.line = LINE_NUMBER_TO_INDEX(tokenizer.get_token_line());
-					link.range.end.line = link.range.start.line;
-					link.range.end.character = LINE_NUMBER_TO_INDEX(tokenizer.get_token_column());
-					link.range.start.character = link.range.end.character - value.length();
+					link.range.start.line = LINE_NUMBER_TO_INDEX(token.start_line);
+					link.range.end.line = LINE_NUMBER_TO_INDEX(token.end_line);
+					link.range.start.character = LINE_NUMBER_TO_INDEX(token.start_column);
+					link.range.end.character = LINE_NUMBER_TO_INDEX(token.end_column);
 					document_links.push_back(link);
 				}
 			}
 		}
-		tokenizer.advance();
 	}
 }
 
 void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p_class, lsp::DocumentSymbol &r_symbol) {
-
 	const String uri = get_uri();
 
 	r_symbol.uri = uri;
 	r_symbol.script_path = path;
 	r_symbol.children.clear();
-	r_symbol.name = p_class->name;
-	if (r_symbol.name.empty())
+	r_symbol.name = p_class->identifier != nullptr ? String(p_class->identifier->name) : String();
+	if (r_symbol.name.empty()) {
 		r_symbol.name = path.get_file();
+	}
 	r_symbol.kind = lsp::SymbolKind::Class;
 	r_symbol.deprecated = false;
-	r_symbol.range.start.line = LINE_NUMBER_TO_INDEX(p_class->line);
-	r_symbol.range.start.character = p_class->column;
+	r_symbol.range.start.line = LINE_NUMBER_TO_INDEX(p_class->start_line);
+	r_symbol.range.start.character = LINE_NUMBER_TO_INDEX(p_class->start_column);
 	r_symbol.range.end.line = LINE_NUMBER_TO_INDEX(p_class->end_line);
 	r_symbol.selectionRange.start.line = r_symbol.range.start.line;
 	r_symbol.detail = "class " + r_symbol.name;
 	bool is_root_class = &r_symbol == &class_symbol;
-	r_symbol.documentation = parse_documentation(is_root_class ? 0 : LINE_NUMBER_TO_INDEX(p_class->line), is_root_class);
-
-	for (int i = 0; i < p_class->variables.size(); ++i) {
-
-		const GDScriptParser::ClassNode::Member &m = p_class->variables[i];
-
-		lsp::DocumentSymbol symbol;
-		symbol.name = m.identifier;
-		symbol.kind = lsp::SymbolKind::Variable;
-		symbol.deprecated = false;
-		const int line = LINE_NUMBER_TO_INDEX(m.line);
-		symbol.range.start.line = line;
-		symbol.range.start.character = lines[line].length() - lines[line].strip_edges(true, false).length();
-		symbol.range.end.line = line;
-		symbol.range.end.character = lines[line].length();
-		symbol.selectionRange.start.line = symbol.range.start.line;
-		if (m._export.type != Variant::NIL) {
-			symbol.detail += "export ";
-		}
-		symbol.detail += "var " + m.identifier;
-		if (m.data_type.kind != GDScriptParser::DataType::UNRESOLVED) {
-			symbol.detail += ": " + m.data_type.to_string();
-		}
-		if (m.default_value.get_type() != Variant::NIL) {
-			symbol.detail += " = " + JSON::print(m.default_value);
-		}
-
-		symbol.documentation = parse_documentation(line);
-		symbol.uri = uri;
-		symbol.script_path = path;
-
-		r_symbol.children.push_back(symbol);
-	}
-
-	for (int i = 0; i < p_class->_signals.size(); ++i) {
-		const GDScriptParser::ClassNode::Signal &signal = p_class->_signals[i];
-
-		lsp::DocumentSymbol symbol;
-		symbol.name = signal.name;
-		symbol.kind = lsp::SymbolKind::Event;
-		symbol.deprecated = false;
-		const int line = LINE_NUMBER_TO_INDEX(signal.line);
-		symbol.range.start.line = line;
-		symbol.range.start.character = lines[line].length() - lines[line].strip_edges(true, false).length();
-		symbol.range.end.line = symbol.range.start.line;
-		symbol.range.end.character = lines[line].length();
-		symbol.selectionRange.start.line = symbol.range.start.line;
-		symbol.documentation = parse_documentation(line);
-		symbol.uri = uri;
-		symbol.script_path = path;
-		symbol.detail = "signal " + signal.name + "(";
-		for (int j = 0; j < signal.arguments.size(); j++) {
-			if (j > 0) {
-				symbol.detail += ", ";
-			}
-			symbol.detail += signal.arguments[j];
-		}
-		symbol.detail += ")";
-
-		r_symbol.children.push_back(symbol);
-	}
+	r_symbol.documentation = parse_documentation(is_root_class ? 0 : LINE_NUMBER_TO_INDEX(p_class->start_line), is_root_class);
+
+	for (int i = 0; i < p_class->members.size(); i++) {
+		const ClassNode::Member &m = p_class->members[i];
+
+		switch (m.type) {
+			case ClassNode::Member::VARIABLE: {
+				lsp::DocumentSymbol symbol;
+				symbol.name = m.variable->identifier->name;
+				symbol.kind = lsp::SymbolKind::Variable;
+				symbol.deprecated = false;
+				symbol.range.start.line = LINE_NUMBER_TO_INDEX(m.variable->start_line);
+				symbol.range.start.character = LINE_NUMBER_TO_INDEX(m.variable->start_column);
+				symbol.range.end.line = LINE_NUMBER_TO_INDEX(m.variable->end_line);
+				symbol.range.end.character = LINE_NUMBER_TO_INDEX(m.variable->end_column);
+				symbol.selectionRange.start.line = symbol.range.start.line;
+				if (m.variable->exported) {
+					symbol.detail += "@export ";
+				}
+				symbol.detail += "var " + m.variable->identifier->name;
+				if (m.get_datatype().is_hard_type()) {
+					symbol.detail += ": " + m.get_datatype().to_string();
+				}
+				if (m.variable->initializer != nullptr && m.variable->initializer->is_constant) {
+					symbol.detail += " = " + JSON::print(m.variable->initializer->reduced_value);
+				}
 
-	for (Map<StringName, GDScriptParser::ClassNode::Constant>::Element *E = p_class->constant_expressions.front(); E; E = E->next()) {
-		lsp::DocumentSymbol symbol;
-		const GDScriptParser::ClassNode::Constant &c = E->value();
-		const GDScriptParser::ConstantNode *node = dynamic_cast<const GDScriptParser::ConstantNode *>(c.expression);
-		ERR_FAIL_COND(!node);
-		symbol.name = E->key();
-		symbol.kind = lsp::SymbolKind::Constant;
-		symbol.deprecated = false;
-		const int line = LINE_NUMBER_TO_INDEX(E->get().expression->line);
-		symbol.range.start.line = line;
-		symbol.range.start.character = E->get().expression->column;
-		symbol.range.end.line = symbol.range.start.line;
-		symbol.range.end.character = lines[line].length();
-		symbol.selectionRange.start.line = symbol.range.start.line;
-		symbol.documentation = parse_documentation(line);
-		symbol.uri = uri;
-		symbol.script_path = path;
+				symbol.documentation = parse_documentation(LINE_NUMBER_TO_INDEX(m.variable->start_line));
+				symbol.uri = uri;
+				symbol.script_path = path;
+
+				r_symbol.children.push_back(symbol);
+			} break;
+			case ClassNode::Member::CONSTANT: {
+				lsp::DocumentSymbol symbol;
+
+				symbol.name = m.constant->identifier->name;
+				symbol.kind = lsp::SymbolKind::Constant;
+				symbol.deprecated = false;
+				symbol.range.start.line = LINE_NUMBER_TO_INDEX(m.constant->start_line);
+				symbol.range.start.character = LINE_NUMBER_TO_INDEX(m.constant->start_column);
+				symbol.range.end.line = LINE_NUMBER_TO_INDEX(m.constant->end_line);
+				symbol.range.end.character = LINE_NUMBER_TO_INDEX(m.constant->start_column);
+				symbol.selectionRange.start.line = LINE_NUMBER_TO_INDEX(m.constant->start_line);
+				symbol.documentation = parse_documentation(LINE_NUMBER_TO_INDEX(m.constant->start_line));
+				symbol.uri = uri;
+				symbol.script_path = path;
+
+				symbol.detail = "const " + symbol.name;
+				if (m.constant->get_datatype().is_hard_type()) {
+					symbol.detail += ": " + m.constant->get_datatype().to_string();
+				}
 
-		symbol.detail = "const " + symbol.name;
-		if (c.type.kind != GDScriptParser::DataType::UNRESOLVED) {
-			symbol.detail += ": " + c.type.to_string();
-		}
+				const Variant &default_value = m.constant->initializer->reduced_value;
+				String value_text;
+				if (default_value.get_type() == Variant::OBJECT) {
+					RES res = default_value;
+					if (res.is_valid() && !res->get_path().empty()) {
+						value_text = "preload(\"" + res->get_path() + "\")";
+						if (symbol.documentation.empty()) {
+							if (Map<String, ExtendGDScriptParser *>::Element *S = GDScriptLanguageProtocol::get_singleton()->get_workspace()->scripts.find(res->get_path())) {
+								symbol.documentation = S->get()->class_symbol.documentation;
+							}
+						}
+					} else {
+						value_text = JSON::print(default_value);
+					}
+				} else {
+					value_text = JSON::print(default_value);
+				}
+				if (!value_text.empty()) {
+					symbol.detail += " = " + value_text;
+				}
 
-		String value_text;
-		if (node->value.get_type() == Variant::OBJECT) {
-			RES res = node->value;
-			if (res.is_valid() && !res->get_path().empty()) {
-				value_text = "preload(\"" + res->get_path() + "\")";
-				if (symbol.documentation.empty()) {
-					if (Map<String, ExtendGDScriptParser *>::Element *S = GDScriptLanguageProtocol::get_singleton()->get_workspace()->scripts.find(res->get_path())) {
-						symbol.documentation = S->get()->class_symbol.documentation;
+				r_symbol.children.push_back(symbol);
+			} break;
+			case ClassNode::Member::ENUM_VALUE: {
+				lsp::DocumentSymbol symbol;
+
+				symbol.name = m.enum_value.identifier->name;
+				symbol.kind = lsp::SymbolKind::EnumMember;
+				symbol.deprecated = false;
+				symbol.range.start.line = LINE_NUMBER_TO_INDEX(m.enum_value.line);
+				symbol.range.start.character = LINE_NUMBER_TO_INDEX(m.enum_value.leftmost_column);
+				symbol.range.end.line = LINE_NUMBER_TO_INDEX(m.enum_value.line);
+				symbol.range.end.character = LINE_NUMBER_TO_INDEX(m.enum_value.rightmost_column);
+				symbol.selectionRange.start.line = LINE_NUMBER_TO_INDEX(m.enum_value.line);
+				symbol.documentation = parse_documentation(LINE_NUMBER_TO_INDEX(m.enum_value.line));
+				symbol.uri = uri;
+				symbol.script_path = path;
+
+				symbol.detail = symbol.name + " = " + itos(m.enum_value.value);
+
+				r_symbol.children.push_back(symbol);
+			} break;
+			case ClassNode::Member::SIGNAL: {
+				lsp::DocumentSymbol symbol;
+				symbol.name = m.signal->identifier->name;
+				symbol.kind = lsp::SymbolKind::Event;
+				symbol.deprecated = false;
+				symbol.range.start.line = LINE_NUMBER_TO_INDEX(m.signal->start_line);
+				symbol.range.start.character = LINE_NUMBER_TO_INDEX(m.signal->start_column);
+				symbol.range.end.line = LINE_NUMBER_TO_INDEX(m.signal->end_line);
+				symbol.range.end.character = LINE_NUMBER_TO_INDEX(m.signal->end_column);
+				symbol.selectionRange.start.line = symbol.range.start.line;
+				symbol.documentation = parse_documentation(LINE_NUMBER_TO_INDEX(m.signal->start_line));
+				symbol.uri = uri;
+				symbol.script_path = path;
+				symbol.detail = "signal " + String(m.signal->identifier->name) + "(";
+				for (int j = 0; j < m.signal->parameters.size(); j++) {
+					if (j > 0) {
+						symbol.detail += ", ";
 					}
+					symbol.detail += m.signal->parameters[i]->identifier->name;
 				}
-			} else {
-				value_text = JSON::print(node->value);
-			}
-		} else {
-			value_text = JSON::print(node->value);
-		}
-		if (!value_text.empty()) {
-			symbol.detail += " = " + value_text;
+				symbol.detail += ")";
+
+				r_symbol.children.push_back(symbol);
+			} break;
+			case ClassNode::Member::ENUM: {
+				lsp::DocumentSymbol symbol;
+				symbol.kind = lsp::SymbolKind::Enum;
+				symbol.range.start.line = LINE_NUMBER_TO_INDEX(m.m_enum->start_line);
+				symbol.range.start.character = LINE_NUMBER_TO_INDEX(m.m_enum->start_column);
+				symbol.range.end.line = LINE_NUMBER_TO_INDEX(m.m_enum->end_line);
+				symbol.range.end.character = LINE_NUMBER_TO_INDEX(m.m_enum->end_column);
+				symbol.selectionRange.start.line = symbol.range.start.line;
+				symbol.documentation = parse_documentation(LINE_NUMBER_TO_INDEX(m.m_enum->start_line));
+				symbol.uri = uri;
+				symbol.script_path = path;
+
+				symbol.detail = "enum " + String(m.m_enum->identifier->name) + "{";
+				for (int j = 0; j < m.m_enum->values.size(); j++) {
+					if (j > 0) {
+						symbol.detail += ", ";
+					}
+					symbol.detail += String(m.m_enum->values[j].identifier->name) + " = " + itos(m.m_enum->values[j].value);
+				}
+				symbol.detail += "}";
+				r_symbol.children.push_back(symbol);
+			} break;
+			case ClassNode::Member::FUNCTION: {
+				lsp::DocumentSymbol symbol;
+				parse_function_symbol(m.function, symbol);
+				r_symbol.children.push_back(symbol);
+			} break;
+			case ClassNode::Member::CLASS: {
+				lsp::DocumentSymbol symbol;
+				parse_class_symbol(m.m_class, symbol);
+				r_symbol.children.push_back(symbol);
+			} break;
+			case ClassNode::Member::UNDEFINED:
+				break; // Unreachable.
 		}
-
-		r_symbol.children.push_back(symbol);
-	}
-
-	for (int i = 0; i < p_class->functions.size(); ++i) {
-		const GDScriptParser::FunctionNode *func = p_class->functions[i];
-		lsp::DocumentSymbol symbol;
-		parse_function_symbol(func, symbol);
-		r_symbol.children.push_back(symbol);
-	}
-
-	for (int i = 0; i < p_class->static_functions.size(); ++i) {
-		const GDScriptParser::FunctionNode *func = p_class->static_functions[i];
-		lsp::DocumentSymbol symbol;
-		parse_function_symbol(func, symbol);
-		r_symbol.children.push_back(symbol);
-	}
-
-	for (int i = 0; i < p_class->subclasses.size(); ++i) {
-		const GDScriptParser::ClassNode *subclass = p_class->subclasses[i];
-		lsp::DocumentSymbol symbol;
-		parse_class_symbol(subclass, symbol);
-		r_symbol.children.push_back(symbol);
 	}
 }
 
 void ExtendGDScriptParser::parse_function_symbol(const GDScriptParser::FunctionNode *p_func, lsp::DocumentSymbol &r_symbol) {
-
 	const String uri = get_uri();
 
-	r_symbol.name = p_func->name;
+	r_symbol.name = p_func->identifier->name;
 	r_symbol.kind = lsp::SymbolKind::Function;
-	r_symbol.detail = "func " + p_func->name + "(";
+	r_symbol.detail = "func " + String(p_func->identifier->name) + "(";
 	r_symbol.deprecated = false;
-	const int line = LINE_NUMBER_TO_INDEX(p_func->line);
-	r_symbol.range.start.line = line;
-	r_symbol.range.start.character = p_func->column;
-	r_symbol.range.end.line = MAX(p_func->body->end_line - 2, r_symbol.range.start.line);
-	r_symbol.range.end.character = lines[r_symbol.range.end.line].length();
+	r_symbol.range.start.line = LINE_NUMBER_TO_INDEX(p_func->start_line);
+	r_symbol.range.start.character = LINE_NUMBER_TO_INDEX(p_func->start_column);
+	r_symbol.range.end.line = LINE_NUMBER_TO_INDEX(p_func->start_line);
+	r_symbol.range.end.character = LINE_NUMBER_TO_INDEX(p_func->end_column);
 	r_symbol.selectionRange.start.line = r_symbol.range.start.line;
-	r_symbol.documentation = parse_documentation(line);
+	r_symbol.documentation = parse_documentation(LINE_NUMBER_TO_INDEX(p_func->start_line));
 	r_symbol.uri = uri;
 	r_symbol.script_path = path;
 
-	String arguments;
-	for (int i = 0; i < p_func->arguments.size(); i++) {
+	String parameters;
+	for (int i = 0; i < p_func->parameters.size(); i++) {
+		const ParameterNode *parameter = p_func->parameters[i];
 		lsp::DocumentSymbol symbol;
 		symbol.kind = lsp::SymbolKind::Variable;
-		symbol.name = p_func->arguments[i];
-		symbol.range.start.line = LINE_NUMBER_TO_INDEX(p_func->body->line);
-		symbol.range.start.character = p_func->body->column;
-		symbol.range.end = symbol.range.start;
+		symbol.name = parameter->identifier->name;
+		symbol.range.start.line = LINE_NUMBER_TO_INDEX(parameter->start_line);
+		symbol.range.start.character = LINE_NUMBER_TO_INDEX(parameter->start_line);
+		symbol.range.end.line = LINE_NUMBER_TO_INDEX(parameter->end_line);
+		symbol.range.end.character = LINE_NUMBER_TO_INDEX(parameter->end_column);
 		symbol.uri = uri;
 		symbol.script_path = path;
 		r_symbol.children.push_back(symbol);
 		if (i > 0) {
-			arguments += ", ";
+			parameters += ", ";
 		}
-		arguments += String(p_func->arguments[i]);
-		if (p_func->argument_types[i].kind != GDScriptParser::DataType::UNRESOLVED) {
-			arguments += ": " + p_func->argument_types[i].to_string();
+		parameters += String(parameter->identifier->name);
+		if (parameter->get_datatype().is_hard_type()) {
+			parameters += ": " + parameter->get_datatype().to_string();
 		}
-		int default_value_idx = i - (p_func->arguments.size() - p_func->default_values.size());
-		if (default_value_idx >= 0) {
-			const GDScriptParser::ConstantNode *const_node = dynamic_cast<const GDScriptParser::ConstantNode *>(p_func->default_values[default_value_idx]);
-			if (const_node == NULL) {
-				const GDScriptParser::OperatorNode *operator_node = dynamic_cast<const GDScriptParser::OperatorNode *>(p_func->default_values[default_value_idx]);
-				if (operator_node) {
-					const_node = dynamic_cast<const GDScriptParser::ConstantNode *>(operator_node->next);
-				}
-			}
-
-			if (const_node) {
-				String value = JSON::print(const_node->value);
-				arguments += " = " + value;
-			}
+		if (parameter->default_value != nullptr) {
+			String value = JSON::print(parameter->default_value->reduced_value);
+			parameters += " = " + value;
 		}
 	}
-	r_symbol.detail += arguments + ")";
-	if (p_func->return_type.kind != GDScriptParser::DataType::UNRESOLVED) {
-		r_symbol.detail += " -> " + p_func->return_type.to_string();
+	r_symbol.detail += parameters + ")";
+	if (p_func->get_datatype().is_hard_type()) {
+		r_symbol.detail += " -> " + p_func->get_datatype().to_string();
 	}
 
-	for (const Map<StringName, LocalVarNode *>::Element *E = p_func->body->variables.front(); E; E = E->next()) {
+	for (int i = 0; i < p_func->body->locals.size(); i++) {
+		const SuiteNode::Local &local = p_func->body->locals[i];
 		lsp::DocumentSymbol symbol;
-		const GDScriptParser::LocalVarNode *var = E->value();
-		symbol.name = E->key();
-		symbol.kind = lsp::SymbolKind::Variable;
-		symbol.range.start.line = LINE_NUMBER_TO_INDEX(E->get()->line);
-		symbol.range.start.character = E->get()->column;
-		symbol.range.end.line = symbol.range.start.line;
-		symbol.range.end.character = lines[symbol.range.end.line].length();
+		symbol.name = local.name;
+		symbol.kind = local.type == SuiteNode::Local::CONSTANT ? lsp::SymbolKind::Constant : lsp::SymbolKind::Variable;
+		symbol.range.start.line = LINE_NUMBER_TO_INDEX(local.start_line);
+		symbol.range.start.character = LINE_NUMBER_TO_INDEX(local.start_column);
+		symbol.range.end.line = LINE_NUMBER_TO_INDEX(local.end_line);
+		symbol.range.end.character = LINE_NUMBER_TO_INDEX(local.end_column);
 		symbol.uri = uri;
 		symbol.script_path = path;
-		symbol.detail = "var " + symbol.name;
-		if (var->datatype.kind != GDScriptParser::DataType::UNRESOLVED) {
-			symbol.detail += ": " + var->datatype.to_string();
+		symbol.detail = SuiteNode::Local::CONSTANT ? "const " : "var ";
+		symbol.detail += symbol.name;
+		if (local.get_datatype().is_hard_type()) {
+			symbol.detail += ": " + local.get_datatype().to_string();
 		}
-		symbol.documentation = parse_documentation(line);
+		symbol.documentation = parse_documentation(LINE_NUMBER_TO_INDEX(local.start_line));
 		r_symbol.children.push_back(symbol);
 	}
 }
@@ -384,8 +401,9 @@ String ExtendGDScriptParser::parse_documentation(int p_line, bool p_docs_down) {
 	int step = p_docs_down ? 1 : -1;
 	int start_line = p_docs_down ? p_line : p_line - 1;
 	for (int i = start_line; true; i += step) {
-
-		if (i < 0 || i >= lines.size()) break;
+		if (i < 0 || i >= lines.size()) {
+			break;
+		}
 
 		String line_comment = lines[i].strip_edges(true, false);
 		if (line_comment.begins_with("#")) {
@@ -408,22 +426,20 @@ String ExtendGDScriptParser::parse_documentation(int p_line, bool p_docs_down) {
 }
 
 String ExtendGDScriptParser::get_text_for_completion(const lsp::Position &p_cursor) const {
-
 	String longthing;
 	int len = lines.size();
 	for (int i = 0; i < len; i++) {
-
 		if (i == p_cursor.line) {
 			longthing += lines[i].substr(0, p_cursor.character);
 			longthing += String::chr(0xFFFF); //not unicode, represents the cursor
 			longthing += lines[i].substr(p_cursor.character, lines[i].size());
 		} else {
-
 			longthing += lines[i];
 		}
 
-		if (i != len - 1)
+		if (i != len - 1) {
 			longthing += "\n";
+		}
 	}
 
 	return longthing;
@@ -433,7 +449,6 @@ String ExtendGDScriptParser::get_text_for_lookup_symbol(const lsp::Position &p_c
 	String longthing;
 	int len = lines.size();
 	for (int i = 0; i < len; i++) {
-
 		if (i == p_cursor.line) {
 			String line = lines[i];
 			String first_part = line.substr(0, p_cursor.character);
@@ -457,19 +472,18 @@ String ExtendGDScriptParser::get_text_for_lookup_symbol(const lsp::Position &p_c
 			}
 			longthing += last_part;
 		} else {
-
 			longthing += lines[i];
 		}
 
-		if (i != len - 1)
+		if (i != len - 1) {
 			longthing += "\n";
+		}
 	}
 
 	return longthing;
 }
 
 String ExtendGDScriptParser::get_identifier_under_position(const lsp::Position &p_position, Vector2i &p_offset) const {
-
 	ERR_FAIL_INDEX_V(p_position.line, lines.size(), "");
 	String line = lines[p_position.line];
 	ERR_FAIL_INDEX_V(p_position.character, line.size(), "");
@@ -477,7 +491,7 @@ String ExtendGDScriptParser::get_identifier_under_position(const lsp::Position &
 	int start_pos = p_position.character;
 	for (int c = p_position.character; c >= 0; c--) {
 		start_pos = c;
-		CharType ch = line[c];
+		char32_t ch = line[c];
 		bool valid_char = (ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || ch == '_';
 		if (!valid_char) {
 			break;
@@ -486,7 +500,7 @@ String ExtendGDScriptParser::get_identifier_under_position(const lsp::Position &
 
 	int end_pos = p_position.character;
 	for (int c = p_position.character; c < line.length(); c++) {
-		CharType ch = line[c];
+		char32_t ch = line[c];
 		bool valid_char = (ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || ch == '_';
 		if (!valid_char) {
 			break;
@@ -507,7 +521,7 @@ String ExtendGDScriptParser::get_uri() const {
 }
 
 const lsp::DocumentSymbol *ExtendGDScriptParser::search_symbol_defined_at_line(int p_line, const lsp::DocumentSymbol &p_parent) const {
-	const lsp::DocumentSymbol *ret = NULL;
+	const lsp::DocumentSymbol *ret = nullptr;
 	if (p_line < p_parent.range.start.line) {
 		return ret;
 	} else if (p_parent.range.start.line == p_line) {
@@ -524,7 +538,6 @@ const lsp::DocumentSymbol *ExtendGDScriptParser::search_symbol_defined_at_line(i
 }
 
 Error ExtendGDScriptParser::get_left_function_call(const lsp::Position &p_position, lsp::Position &r_func_pos, int &r_arg_index) const {
-
 	ERR_FAIL_INDEX_V(p_position.line, lines.size(), ERR_INVALID_PARAMETER);
 
 	int bracket_stack = 0;
@@ -539,7 +552,7 @@ Error ExtendGDScriptParser::get_left_function_call(const lsp::Position &p_positi
 		}
 
 		while (c >= 0) {
-			const CharType &character = line[c];
+			const char32_t &character = line[c];
 			if (character == ')') {
 				++bracket_stack;
 			} else if (character == '(') {
@@ -576,7 +589,6 @@ const lsp::DocumentSymbol *ExtendGDScriptParser::get_symbol_defined_at_line(int
 }
 
 const lsp::DocumentSymbol *ExtendGDScriptParser::get_member_symbol(const String &p_name, const String &p_subclass) const {
-
 	if (p_subclass.empty()) {
 		const lsp::DocumentSymbol *const *ptr = members.getptr(p_name);
 		if (ptr) {
@@ -591,7 +603,7 @@ const lsp::DocumentSymbol *ExtendGDScriptParser::get_member_symbol(const String
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 const List<lsp::DocumentLink> &ExtendGDScriptParser::get_document_links() const {
@@ -599,12 +611,9 @@ const List<lsp::DocumentLink> &ExtendGDScriptParser::get_document_links() const
 }
 
 const Array &ExtendGDScriptParser::get_member_completions() {
-
 	if (member_completions.empty()) {
-
-		const String *name = members.next(NULL);
+		const String *name = members.next(nullptr);
 		while (name) {
-
 			const lsp::DocumentSymbol *symbol = members.get(*name);
 			lsp::CompletionItem item = symbol->make_completion_item();
 			item.data = JOIN_SYMBOLS(path, *name);
@@ -613,11 +622,10 @@ const Array &ExtendGDScriptParser::get_member_completions() {
 			name = members.next(name);
 		}
 
-		const String *_class = inner_classes.next(NULL);
+		const String *_class = inner_classes.next(nullptr);
 		while (_class) {
-
 			const ClassMembers *inner_class = inner_classes.getptr(*_class);
-			const String *member_name = inner_class->next(NULL);
+			const String *member_name = inner_class->next(nullptr);
 			while (member_name) {
 				const lsp::DocumentSymbol *symbol = inner_class->get(*member_name);
 				lsp::CompletionItem item = symbol->make_completion_item();
@@ -637,34 +645,24 @@ const Array &ExtendGDScriptParser::get_member_completions() {
 Dictionary ExtendGDScriptParser::dump_function_api(const GDScriptParser::FunctionNode *p_func) const {
 	Dictionary func;
 	ERR_FAIL_NULL_V(p_func, func);
-	func["name"] = p_func->name;
-	func["return_type"] = p_func->return_type.to_string();
+	func["name"] = p_func->identifier->name;
+	func["return_type"] = p_func->get_datatype().to_string();
 	func["rpc_mode"] = p_func->rpc_mode;
-	Array arguments;
-	for (int i = 0; i < p_func->arguments.size(); i++) {
+	Array parameters;
+	for (int i = 0; i < p_func->parameters.size(); i++) {
 		Dictionary arg;
-		arg["name"] = p_func->arguments[i];
-		arg["type"] = p_func->argument_types[i].to_string();
-		int default_value_idx = i - (p_func->arguments.size() - p_func->default_values.size());
-		if (default_value_idx >= 0) {
-			const GDScriptParser::ConstantNode *const_node = dynamic_cast<const GDScriptParser::ConstantNode *>(p_func->default_values[default_value_idx]);
-			if (const_node == NULL) {
-				const GDScriptParser::OperatorNode *operator_node = dynamic_cast<const GDScriptParser::OperatorNode *>(p_func->default_values[default_value_idx]);
-				if (operator_node) {
-					const_node = dynamic_cast<const GDScriptParser::ConstantNode *>(operator_node->next);
-				}
-			}
-			if (const_node) {
-				arg["default_value"] = const_node->value;
-			}
+		arg["name"] = p_func->parameters[i]->identifier->name;
+		arg["type"] = p_func->parameters[i]->get_datatype().to_string();
+		if (p_func->parameters[i]->default_value != nullptr) {
+			arg["default_value"] = p_func->parameters[i]->default_value->reduced_value;
 		}
-		arguments.push_back(arg);
+		parameters.push_back(arg);
 	}
-	if (const lsp::DocumentSymbol *symbol = get_symbol_defined_at_line(LINE_NUMBER_TO_INDEX(p_func->line))) {
+	if (const lsp::DocumentSymbol *symbol = get_symbol_defined_at_line(LINE_NUMBER_TO_INDEX(p_func->start_line))) {
 		func["signature"] = symbol->detail;
 		func["description"] = symbol->documentation;
 	}
-	func["arguments"] = arguments;
+	func["arguments"] = parameters;
 	return func;
 }
 
@@ -673,101 +671,125 @@ Dictionary ExtendGDScriptParser::dump_class_api(const GDScriptParser::ClassNode
 
 	ERR_FAIL_NULL_V(p_class, class_api);
 
-	class_api["name"] = String(p_class->name);
+	class_api["name"] = p_class->identifier != nullptr ? String(p_class->identifier->name) : String();
 	class_api["path"] = path;
 	Array extends_class;
-	for (int i = 0; i < p_class->extends_class.size(); i++) {
-		extends_class.append(String(p_class->extends_class[i]));
+	for (int i = 0; i < p_class->extends.size(); i++) {
+		extends_class.append(String(p_class->extends[i]));
 	}
 	class_api["extends_class"] = extends_class;
-	class_api["extends_file"] = String(p_class->extends_file);
+	class_api["extends_file"] = String(p_class->extends_path);
 	class_api["icon"] = String(p_class->icon_path);
 
-	if (const lsp::DocumentSymbol *symbol = get_symbol_defined_at_line(LINE_NUMBER_TO_INDEX(p_class->line))) {
+	if (const lsp::DocumentSymbol *symbol = get_symbol_defined_at_line(LINE_NUMBER_TO_INDEX(p_class->start_line))) {
 		class_api["signature"] = symbol->detail;
 		class_api["description"] = symbol->documentation;
 	}
 
-	Array subclasses;
-	for (int i = 0; i < p_class->subclasses.size(); i++) {
-		subclasses.push_back(dump_class_api(p_class->subclasses[i]));
-	}
-	class_api["sub_classes"] = subclasses;
-
+	Array nested_classes;
 	Array constants;
-	for (Map<StringName, GDScriptParser::ClassNode::Constant>::Element *E = p_class->constant_expressions.front(); E; E = E->next()) {
-
-		const GDScriptParser::ClassNode::Constant &c = E->value();
-		const GDScriptParser::ConstantNode *node = dynamic_cast<const GDScriptParser::ConstantNode *>(c.expression);
-		ERR_FAIL_COND_V(!node, class_api);
-
-		Dictionary api;
-		api["name"] = E->key();
-		api["value"] = node->value;
-		api["data_type"] = node->datatype.to_string();
-		if (const lsp::DocumentSymbol *symbol = get_symbol_defined_at_line(LINE_NUMBER_TO_INDEX(node->line))) {
-			api["signature"] = symbol->detail;
-			api["description"] = symbol->documentation;
-		}
-		constants.push_back(api);
-	}
-	class_api["constants"] = constants;
-
 	Array members;
-	for (int i = 0; i < p_class->variables.size(); ++i) {
-		const GDScriptParser::ClassNode::Member &m = p_class->variables[i];
-		Dictionary api;
-		api["name"] = m.identifier;
-		api["data_type"] = m.data_type.to_string();
-		api["default_value"] = m.default_value;
-		api["setter"] = String(m.setter);
-		api["getter"] = String(m.getter);
-		api["export"] = m._export.type != Variant::NIL;
-		if (const lsp::DocumentSymbol *symbol = get_symbol_defined_at_line(LINE_NUMBER_TO_INDEX(m.line))) {
-			api["signature"] = symbol->detail;
-			api["description"] = symbol->documentation;
-		}
-		members.push_back(api);
-	}
-	class_api["members"] = members;
-
 	Array signals;
-	for (int i = 0; i < p_class->_signals.size(); ++i) {
-		const GDScriptParser::ClassNode::Signal &signal = p_class->_signals[i];
-		Dictionary api;
-		api["name"] = signal.name;
-		Array args;
-		for (int j = 0; j < signal.arguments.size(); j++) {
-			args.append(signal.arguments[j]);
-		}
-		api["arguments"] = args;
-		if (const lsp::DocumentSymbol *symbol = get_symbol_defined_at_line(LINE_NUMBER_TO_INDEX(signal.line))) {
-			api["signature"] = symbol->detail;
-			api["description"] = symbol->documentation;
+	Array methods;
+	Array static_functions;
+
+	for (int i = 0; i < p_class->members.size(); i++) {
+		const ClassNode::Member &m = p_class->members[i];
+		switch (m.type) {
+			case ClassNode::Member::CLASS:
+				nested_classes.push_back(dump_class_api(m.m_class));
+				break;
+			case ClassNode::Member::CONSTANT: {
+				Dictionary api;
+				api["name"] = m.constant->identifier->name;
+				api["value"] = m.constant->initializer->reduced_value;
+				api["data_type"] = m.constant->get_datatype().to_string();
+				if (const lsp::DocumentSymbol *symbol = get_symbol_defined_at_line(LINE_NUMBER_TO_INDEX(m.constant->start_line))) {
+					api["signature"] = symbol->detail;
+					api["description"] = symbol->documentation;
+				}
+				constants.push_back(api);
+			} break;
+			case ClassNode::Member::ENUM_VALUE: {
+				Dictionary api;
+				api["name"] = m.enum_value.identifier->name;
+				api["value"] = m.enum_value.value;
+				api["data_type"] = m.get_datatype().to_string();
+				if (const lsp::DocumentSymbol *symbol = get_symbol_defined_at_line(LINE_NUMBER_TO_INDEX(m.enum_value.line))) {
+					api["signature"] = symbol->detail;
+					api["description"] = symbol->documentation;
+				}
+				constants.push_back(api);
+			} break;
+			case ClassNode::Member::ENUM: {
+				Dictionary enum_dict;
+				for (int j = 0; j < m.m_enum->values.size(); i++) {
+					enum_dict[m.m_enum->values[i].identifier->name] = m.m_enum->values[i].value;
+				}
+
+				Dictionary api;
+				api["name"] = m.m_enum->identifier->name;
+				api["value"] = enum_dict;
+				api["data_type"] = m.get_datatype().to_string();
+				if (const lsp::DocumentSymbol *symbol = get_symbol_defined_at_line(LINE_NUMBER_TO_INDEX(m.m_enum->start_line))) {
+					api["signature"] = symbol->detail;
+					api["description"] = symbol->documentation;
+				}
+				constants.push_back(api);
+			} break;
+			case ClassNode::Member::VARIABLE: {
+				Dictionary api;
+				api["name"] = m.variable->identifier->name;
+				api["data_type"] = m.variable->get_datatype().to_string();
+				api["default_value"] = m.variable->initializer != nullptr ? m.variable->initializer->reduced_value : Variant();
+				api["setter"] = m.variable->setter ? ("@" + String(m.variable->identifier->name) + "_setter") : (m.variable->setter_pointer != nullptr ? String(m.variable->setter_pointer->name) : String());
+				api["getter"] = m.variable->getter ? ("@" + String(m.variable->identifier->name) + "_getter") : (m.variable->getter_pointer != nullptr ? String(m.variable->getter_pointer->name) : String());
+				api["export"] = m.variable->exported;
+				if (const lsp::DocumentSymbol *symbol = get_symbol_defined_at_line(LINE_NUMBER_TO_INDEX(m.variable->start_line))) {
+					api["signature"] = symbol->detail;
+					api["description"] = symbol->documentation;
+				}
+				members.push_back(api);
+			} break;
+			case ClassNode::Member::SIGNAL: {
+				Dictionary api;
+				api["name"] = m.signal->identifier->name;
+				Array pars;
+				for (int j = 0; j < m.signal->parameters.size(); j++) {
+					pars.append(String(m.signal->parameters[i]->identifier->name));
+				}
+				api["arguments"] = pars;
+				if (const lsp::DocumentSymbol *symbol = get_symbol_defined_at_line(LINE_NUMBER_TO_INDEX(m.signal->start_line))) {
+					api["signature"] = symbol->detail;
+					api["description"] = symbol->documentation;
+				}
+				signals.push_back(api);
+			} break;
+			case ClassNode::Member::FUNCTION: {
+				if (m.function->is_static) {
+					static_functions.append(dump_function_api(m.function));
+				} else {
+					methods.append(dump_function_api(m.function));
+				}
+			} break;
+			case ClassNode::Member::UNDEFINED:
+				break; // Unreachable.
 		}
-		signals.push_back(api);
 	}
-	class_api["signals"] = signals;
 
-	Array methods;
-	for (int i = 0; i < p_class->functions.size(); ++i) {
-		methods.append(dump_function_api(p_class->functions[i]));
-	}
+	class_api["sub_classes"] = nested_classes;
+	class_api["constants"] = constants;
+	class_api["members"] = members;
+	class_api["signals"] = signals;
 	class_api["methods"] = methods;
-
-	Array static_functions;
-	for (int i = 0; i < p_class->static_functions.size(); ++i) {
-		static_functions.append(dump_function_api(p_class->static_functions[i]));
-	}
 	class_api["static_functions"] = static_functions;
 
 	return class_api;
 }
 
 Dictionary ExtendGDScriptParser::generate_api() const {
-
 	Dictionary api;
-	const GDScriptParser::Node *head = get_parse_tree();
+	const GDScriptParser::Node *head = get_tree();
 	if (const GDScriptParser::ClassNode *gdclass = dynamic_cast<const GDScriptParser::ClassNode *>(head)) {
 		api = dump_class_api(gdclass);
 	}
@@ -778,7 +800,11 @@ Error ExtendGDScriptParser::parse(const String &p_code, const String &p_path) {
 	path = p_path;
 	lines = p_code.split("\n");
 
-	Error err = GDScriptParser::parse(p_code, p_path.get_base_dir(), false, p_path, false, NULL, false);
+	Error err = GDScriptParser::parse(p_code, p_path, false);
+	if (err == OK) {
+		GDScriptAnalyzer analyzer(this);
+		err = analyzer.analyze();
+	}
 	update_diagnostics();
 	update_symbols();
 	update_document_links(p_code);
diff --git a/modules/gdscript/language_server/gdscript_extend_parser.h b/modules/gdscript/language_server/gdscript_extend_parser.h
index 43dfce994b..0c031d7883 100644
--- a/modules/gdscript/language_server/gdscript_extend_parser.h
+++ b/modules/gdscript/language_server/gdscript_extend_parser.h
@@ -50,7 +50,6 @@
 typedef HashMap<String, const lsp::DocumentSymbol *> ClassMembers;
 
 class ExtendGDScriptParser : public GDScriptParser {
-
 	String path;
 	Vector<String> lines;
 
diff --git a/modules/gdscript/language_server/gdscript_language_protocol.cpp b/modules/gdscript/language_server/gdscript_language_protocol.cpp
index 7133c6b4be..2a67d2ff4f 100644
--- a/modules/gdscript/language_server/gdscript_language_protocol.cpp
+++ b/modules/gdscript/language_server/gdscript_language_protocol.cpp
@@ -29,35 +29,113 @@
 /*************************************************************************/
 
 #include "gdscript_language_protocol.h"
+
 #include "core/io/json.h"
 #include "core/os/copymem.h"
 #include "core/project_settings.h"
+#include "editor/editor_log.h"
 #include "editor/editor_node.h"
 
-GDScriptLanguageProtocol *GDScriptLanguageProtocol::singleton = NULL;
-
-void GDScriptLanguageProtocol::on_data_received(int p_id) {
-	lastest_client_id = p_id;
-	Ref<WebSocketPeer> peer = server->get_peer(p_id);
-	PoolByteArray data;
-	if (OK == peer->get_packet_buffer(data)) {
-		String message;
-		message.parse_utf8((const char *)data.read().ptr(), data.size());
-		if (message.begins_with("Content-Length:")) return;
-		String output = process_message(message);
+GDScriptLanguageProtocol *GDScriptLanguageProtocol::singleton = nullptr;
+
+Error GDScriptLanguageProtocol::LSPeer::handle_data() {
+	int read = 0;
+	// Read headers
+	if (!has_header) {
+		while (true) {
+			if (req_pos >= LSP_MAX_BUFFER_SIZE) {
+				req_pos = 0;
+				ERR_FAIL_COND_V_MSG(true, ERR_OUT_OF_MEMORY, "Response header too big");
+			}
+			Error err = connection->get_partial_data(&req_buf[req_pos], 1, read);
+			if (err != OK) {
+				return FAILED;
+			} else if (read != 1) { // Busy, wait until next poll
+				return ERR_BUSY;
+			}
+			char *r = (char *)req_buf;
+			int l = req_pos;
+
+			// End of headers
+			if (l > 3 && r[l] == '\n' && r[l - 1] == '\r' && r[l - 2] == '\n' && r[l - 3] == '\r') {
+				r[l - 3] = '\0'; // Null terminate to read string
+				String header;
+				header.parse_utf8(r);
+				content_length = header.substr(16).to_int();
+				has_header = true;
+				req_pos = 0;
+				break;
+			}
+			req_pos++;
+		}
+	}
+	if (has_header) {
+		while (req_pos < content_length) {
+			if (req_pos >= LSP_MAX_BUFFER_SIZE) {
+				req_pos = 0;
+				has_header = false;
+				ERR_FAIL_COND_V_MSG(req_pos >= LSP_MAX_BUFFER_SIZE, ERR_OUT_OF_MEMORY, "Response content too big");
+			}
+			Error err = connection->get_partial_data(&req_buf[req_pos], 1, read);
+			if (err != OK) {
+				return FAILED;
+			} else if (read != 1) {
+				return ERR_BUSY;
+			}
+			req_pos++;
+		}
+
+		// Parse data
+		String msg;
+		msg.parse_utf8((const char *)req_buf, req_pos);
+
+		// Reset to read again
+		req_pos = 0;
+		has_header = false;
+
+		// Response
+		String output = GDScriptLanguageProtocol::get_singleton()->process_message(msg);
 		if (!output.empty()) {
-			CharString charstr = output.utf8();
-			peer->put_packet((const uint8_t *)charstr.ptr(), charstr.length());
+			res_queue.push_back(output.utf8());
+		}
+	}
+	return OK;
+}
+
+Error GDScriptLanguageProtocol::LSPeer::send_data() {
+	int sent = 0;
+	if (!res_queue.empty()) {
+		CharString c_res = res_queue[0];
+		if (res_sent < c_res.size()) {
+			Error err = connection->put_partial_data((const uint8_t *)c_res.get_data() + res_sent, c_res.size() - res_sent - 1, sent);
+			if (err != OK) {
+				return err;
+			}
+			res_sent += sent;
+		}
+		// Response sent
+		if (res_sent >= c_res.size() - 1) {
+			res_sent = 0;
+			res_queue.remove(0);
 		}
 	}
+	return OK;
 }
 
-void GDScriptLanguageProtocol::on_client_connected(int p_id, const String &p_protocal) {
-	clients.set(p_id, server->get_peer(p_id));
+Error GDScriptLanguageProtocol::on_client_connected() {
+	Ref<StreamPeerTCP> tcp_peer = server->take_connection();
+	ERR_FAIL_COND_V_MSG(clients.size() >= LSP_MAX_CLIENTS, FAILED, "Max client limits reached");
+	Ref<LSPeer> peer = memnew(LSPeer);
+	peer->connection = tcp_peer;
+	clients.set(next_client_id, peer);
+	next_client_id++;
+	EditorNode::get_log()->add_message("Connection Taken", EditorLog::MSG_TYPE_EDITOR);
+	return OK;
 }
 
-void GDScriptLanguageProtocol::on_client_disconnected(int p_id, bool p_was_clean_close) {
-	clients.erase(p_id);
+void GDScriptLanguageProtocol::on_client_disconnected(const int &p_client_id) {
+	clients.erase(p_client_id);
+	EditorNode::get_log()->add_message("Disconnected", EditorLog::MSG_TYPE_EDITOR);
 }
 
 String GDScriptLanguageProtocol::process_message(const String &p_text) {
@@ -70,7 +148,6 @@ String GDScriptLanguageProtocol::process_message(const String &p_text) {
 }
 
 String GDScriptLanguageProtocol::format_output(const String &p_text) {
-
 	String header = "Content-Length: ";
 	CharString charstr = p_text.utf8();
 	size_t len = charstr.length();
@@ -83,11 +160,9 @@ String GDScriptLanguageProtocol::format_output(const String &p_text) {
 void GDScriptLanguageProtocol::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("initialize", "params"), &GDScriptLanguageProtocol::initialize);
 	ClassDB::bind_method(D_METHOD("initialized", "params"), &GDScriptLanguageProtocol::initialized);
-	ClassDB::bind_method(D_METHOD("on_data_received"), &GDScriptLanguageProtocol::on_data_received);
 	ClassDB::bind_method(D_METHOD("on_client_connected"), &GDScriptLanguageProtocol::on_client_connected);
 	ClassDB::bind_method(D_METHOD("on_client_disconnected"), &GDScriptLanguageProtocol::on_client_disconnected);
-	ClassDB::bind_method(D_METHOD("notify_all_clients", "p_method", "p_params"), &GDScriptLanguageProtocol::notify_all_clients, DEFVAL(Variant()));
-	ClassDB::bind_method(D_METHOD("notify_client", "p_method", "p_params", "p_client"), &GDScriptLanguageProtocol::notify_client, DEFVAL(Variant()), DEFVAL(-1));
+	ClassDB::bind_method(D_METHOD("notify_client", "method", "params"), &GDScriptLanguageProtocol::notify_client, DEFVAL(Variant()), DEFVAL(-1));
 	ClassDB::bind_method(D_METHOD("is_smart_resolve_enabled"), &GDScriptLanguageProtocol::is_smart_resolve_enabled);
 	ClassDB::bind_method(D_METHOD("get_text_document"), &GDScriptLanguageProtocol::get_text_document);
 	ClassDB::bind_method(D_METHOD("get_workspace"), &GDScriptLanguageProtocol::get_workspace);
@@ -95,7 +170,6 @@ void GDScriptLanguageProtocol::_bind_methods() {
 }
 
 Dictionary GDScriptLanguageProtocol::initialize(const Dictionary &p_params) {
-
 	lsp::InitializeResult ret;
 
 	String root_uri = p_params["rootUri"];
@@ -110,17 +184,19 @@ Dictionary GDScriptLanguageProtocol::initialize(const Dictionary &p_params) {
 	if (root_uri.length() && is_same_workspace) {
 		workspace->root_uri = root_uri;
 	} else {
-
 		workspace->root_uri = "file://" + workspace->root;
 
 		Dictionary params;
 		params["path"] = workspace->root;
-		Dictionary request = make_notification("gdscrip_client/changeWorkspace", params);
-		if (Ref<WebSocketPeer> *peer = clients.getptr(lastest_client_id)) {
+		Dictionary request = make_notification("gdscript_client/changeWorkspace", params);
+
+		ERR_FAIL_COND_V_MSG(!clients.has(latest_client_id), ret.to_json(),
+				vformat("GDScriptLanguageProtocol: Can't initialize invalid peer '%d'.", latest_client_id));
+		Ref<LSPeer> peer = clients.get(latest_client_id);
+		if (peer != nullptr) {
 			String msg = JSON::print(request);
 			msg = format_output(msg);
-			CharString charstr = msg.utf8();
-			(*peer)->put_packet((const uint8_t *)charstr.ptr(), charstr.length());
+			(*peer)->res_queue.push_back(msg.utf8());
 		}
 	}
 
@@ -134,12 +210,10 @@ Dictionary GDScriptLanguageProtocol::initialize(const Dictionary &p_params) {
 }
 
 void GDScriptLanguageProtocol::initialized(const Variant &p_params) {
-
 	lsp::GodotCapabilities capabilities;
 
 	DocData *doc = EditorHelp::get_doc_data();
 	for (Map<String, DocData::ClassDoc>::Element *E = doc->class_list.front(); E; E = E->next()) {
-
 		lsp::GodotNativeClassInfo gdclass;
 		gdclass.name = E->get().name;
 		gdclass.class_doc = &(E->get());
@@ -153,61 +227,62 @@ void GDScriptLanguageProtocol::initialized(const Variant &p_params) {
 }
 
 void GDScriptLanguageProtocol::poll() {
-	server->poll();
+	if (server->is_connection_available()) {
+		on_client_connected();
+	}
+	const int *id = nullptr;
+	while ((id = clients.next(id))) {
+		Ref<LSPeer> peer = clients.get(*id);
+		StreamPeerTCP::Status status = peer->connection->get_status();
+		if (status == StreamPeerTCP::STATUS_NONE || status == StreamPeerTCP::STATUS_ERROR) {
+			on_client_disconnected(*id);
+			id = nullptr;
+		} else {
+			if (peer->connection->get_available_bytes() > 0) {
+				latest_client_id = *id;
+				Error err = peer->handle_data();
+				if (err != OK && err != ERR_BUSY) {
+					on_client_disconnected(*id);
+					id = nullptr;
+				}
+			}
+			Error err = peer->send_data();
+			if (err != OK && err != ERR_BUSY) {
+				on_client_disconnected(*id);
+				id = nullptr;
+			}
+		}
+	}
 }
 
 Error GDScriptLanguageProtocol::start(int p_port, const IP_Address &p_bind_ip) {
-	if (server == NULL) {
-		server = dynamic_cast<WebSocketServer *>(ClassDB::instance("WebSocketServer"));
-		ERR_FAIL_COND_V(!server, FAILED);
-		server->set_buffers(8192, 1024, 8192, 1024); // 8mb should be way more than enough
-		server->connect("data_received", this, "on_data_received");
-		server->connect("client_connected", this, "on_client_connected");
-		server->connect("client_disconnected", this, "on_client_disconnected");
-	}
-	server->set_bind_ip(p_bind_ip);
-	return server->listen(p_port);
+	return server->listen(p_port, p_bind_ip);
 }
 
 void GDScriptLanguageProtocol::stop() {
-	const int *ptr = clients.next(NULL);
-	while (ptr) {
-		clients.get(*ptr)->close();
-		ptr = clients.next(ptr);
+	const int *id = nullptr;
+	while ((id = clients.next(id))) {
+		Ref<LSPeer> peer = clients.get(*id);
+		peer->connection->disconnect_from_host();
 	}
-	server->stop();
-	clients.clear();
-}
-
-void GDScriptLanguageProtocol::notify_all_clients(const String &p_method, const Variant &p_params) {
 
-	Dictionary message = make_notification(p_method, p_params);
-	String msg = JSON::print(message);
-	msg = format_output(msg);
-	CharString charstr = msg.utf8();
-	const int *p_id = clients.next(NULL);
-	while (p_id != NULL) {
-		Ref<WebSocketPeer> peer = clients.get(*p_id);
-		(*peer)->put_packet((const uint8_t *)charstr.ptr(), charstr.length());
-		p_id = clients.next(p_id);
-	}
+	server->stop();
 }
 
-void GDScriptLanguageProtocol::notify_client(const String &p_method, const Variant &p_params, int p_client) {
-
-	if (p_client == -1) {
-		p_client = lastest_client_id;
+void GDScriptLanguageProtocol::notify_client(const String &p_method, const Variant &p_params, int p_client_id) {
+	if (p_client_id == -1) {
+		ERR_FAIL_COND_MSG(latest_client_id == -1,
+				"GDScript LSP: Can't notify client as none was connected.");
+		p_client_id = latest_client_id;
 	}
-
-	Ref<WebSocketPeer> *peer = clients.getptr(p_client);
-	ERR_FAIL_COND(peer == NULL);
+	ERR_FAIL_COND(!clients.has(p_client_id));
+	Ref<LSPeer> peer = clients.get(p_client_id);
+	ERR_FAIL_COND(peer == nullptr);
 
 	Dictionary message = make_notification(p_method, p_params);
 	String msg = JSON::print(message);
 	msg = format_output(msg);
-	CharString charstr = msg.utf8();
-
-	(*peer)->put_packet((const uint8_t *)charstr.ptr(), charstr.length());
+	peer->res_queue.push_back(msg.utf8());
 }
 
 bool GDScriptLanguageProtocol::is_smart_resolve_enabled() const {
@@ -219,9 +294,8 @@ bool GDScriptLanguageProtocol::is_goto_native_symbols_enabled() const {
 }
 
 GDScriptLanguageProtocol::GDScriptLanguageProtocol() {
-	server = NULL;
+	server.instance();
 	singleton = this;
-	_initialized = false;
 	workspace.instance();
 	text_document.instance();
 	set_scope("textDocument", text_document.ptr());
@@ -229,8 +303,3 @@ GDScriptLanguageProtocol::GDScriptLanguageProtocol() {
 	set_scope("workspace", workspace.ptr());
 	workspace->root = ProjectSettings::get_singleton()->get_resource_path();
 }
-
-GDScriptLanguageProtocol::~GDScriptLanguageProtocol() {
-	memdelete(server);
-	server = NULL;
-}
diff --git a/modules/gdscript/language_server/gdscript_language_protocol.h b/modules/gdscript/language_server/gdscript_language_protocol.h
index 52c680ab19..cf5242e8c5 100644
--- a/modules/gdscript/language_server/gdscript_language_protocol.h
+++ b/modules/gdscript/language_server/gdscript_language_protocol.h
@@ -31,16 +31,36 @@
 #ifndef GDSCRIPT_PROTOCAL_SERVER_H
 #define GDSCRIPT_PROTOCAL_SERVER_H
 
+#include "core/io/stream_peer.h"
+#include "core/io/stream_peer_tcp.h"
+#include "core/io/tcp_server.h"
 #include "gdscript_text_document.h"
 #include "gdscript_workspace.h"
 #include "lsp.hpp"
 #include "modules/jsonrpc/jsonrpc.h"
-#include "modules/websocket/websocket_peer.h"
-#include "modules/websocket/websocket_server.h"
+
+#define LSP_MAX_BUFFER_SIZE 4194304
+#define LSP_MAX_CLIENTS 8
 
 class GDScriptLanguageProtocol : public JSONRPC {
 	GDCLASS(GDScriptLanguageProtocol, JSONRPC)
 
+private:
+	struct LSPeer : Reference {
+		Ref<StreamPeerTCP> connection;
+
+		uint8_t req_buf[LSP_MAX_BUFFER_SIZE];
+		int req_pos = 0;
+		bool has_header = false;
+		bool has_content = false;
+		int content_length = 0;
+		Vector<CharString> res_queue;
+		int res_sent = 0;
+
+		Error handle_data();
+		Error send_data();
+	};
+
 	enum LSPErrorCode {
 		RequestCancelled = -32800,
 		ContentModified = -32801,
@@ -48,21 +68,21 @@ class GDScriptLanguageProtocol : public JSONRPC {
 
 	static GDScriptLanguageProtocol *singleton;
 
-	HashMap<int, Ref<WebSocketPeer> > clients;
-	WebSocketServer *server;
-	int lastest_client_id;
+	HashMap<int, Ref<LSPeer>> clients;
+	Ref<TCP_Server> server;
+	int latest_client_id = 0;
+	int next_client_id = 0;
 
 	Ref<GDScriptTextDocument> text_document;
 	Ref<GDScriptWorkspace> workspace;
 
-	void on_data_received(int p_id);
-	void on_client_connected(int p_id, const String &p_protocal);
-	void on_client_disconnected(int p_id, bool p_was_clean_close);
+	Error on_client_connected();
+	void on_client_disconnected(const int &p_client_id);
 
 	String process_message(const String &p_text);
 	String format_output(const String &p_text);
 
-	bool _initialized;
+	bool _initialized = false;
 
 protected:
 	static void _bind_methods();
@@ -80,14 +100,12 @@ public:
 	Error start(int p_port, const IP_Address &p_bind_ip);
 	void stop();
 
-	void notify_all_clients(const String &p_method, const Variant &p_params = Variant());
-	void notify_client(const String &p_method, const Variant &p_params = Variant(), int p_client = -1);
+	void notify_client(const String &p_method, const Variant &p_params = Variant(), int p_client_id = -1);
 
 	bool is_smart_resolve_enabled() const;
 	bool is_goto_native_symbols_enabled() const;
 
 	GDScriptLanguageProtocol();
-	~GDScriptLanguageProtocol();
 };
 
 #endif
diff --git a/modules/gdscript/language_server/gdscript_language_server.cpp b/modules/gdscript/language_server/gdscript_language_server.cpp
index 7170c63058..3387d262f8 100644
--- a/modules/gdscript/language_server/gdscript_language_server.cpp
+++ b/modules/gdscript/language_server/gdscript_language_server.cpp
@@ -29,13 +29,14 @@
 /*************************************************************************/
 
 #include "gdscript_language_server.h"
+
 #include "core/os/file_access.h"
 #include "core/os/os.h"
 #include "editor/editor_log.h"
 #include "editor/editor_node.h"
 
 GDScriptLanguageServer::GDScriptLanguageServer() {
-	thread = NULL;
+	thread = nullptr;
 	thread_running = false;
 	started = false;
 
@@ -48,7 +49,6 @@ GDScriptLanguageServer::GDScriptLanguageServer() {
 }
 
 void GDScriptLanguageServer::_notification(int p_what) {
-
 	switch (p_what) {
 		case NOTIFICATION_ENTER_TREE:
 			start();
@@ -87,7 +87,7 @@ void GDScriptLanguageServer::start() {
 	if (protocol.start(port, IP_Address("127.0.0.1")) == OK) {
 		EditorNode::get_log()->add_message("--- GDScript language server started ---", EditorLog::MSG_TYPE_EDITOR);
 		if (use_thread) {
-			ERR_FAIL_COND(thread != NULL);
+			ERR_FAIL_COND(thread != nullptr);
 			thread_running = true;
 			thread = Thread::create(GDScriptLanguageServer::thread_main, this);
 		}
@@ -98,11 +98,11 @@ void GDScriptLanguageServer::start() {
 
 void GDScriptLanguageServer::stop() {
 	if (use_thread) {
-		ERR_FAIL_COND(NULL == thread);
+		ERR_FAIL_COND(nullptr == thread);
 		thread_running = false;
 		Thread::wait_to_finish(thread);
 		memdelete(thread);
-		thread = NULL;
+		thread = nullptr;
 	}
 	protocol.stop();
 	started = false;
diff --git a/modules/gdscript/language_server/gdscript_text_document.cpp b/modules/gdscript/language_server/gdscript_text_document.cpp
index 0572c5f746..c6fe3169dc 100644
--- a/modules/gdscript/language_server/gdscript_text_document.cpp
+++ b/modules/gdscript/language_server/gdscript_text_document.cpp
@@ -29,12 +29,14 @@
 /*************************************************************************/
 
 #include "gdscript_text_document.h"
+
 #include "../gdscript.h"
 #include "core/os/os.h"
 #include "editor/editor_settings.h"
 #include "editor/plugins/script_text_editor.h"
 #include "gdscript_extend_parser.h"
 #include "gdscript_language_protocol.h"
+#include "servers/display_server.h"
 
 void GDScriptTextDocument::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("didOpen"), &GDScriptTextDocument::didOpen);
@@ -84,19 +86,15 @@ void GDScriptTextDocument::notify_client_show_symbol(const lsp::DocumentSymbol *
 }
 
 void GDScriptTextDocument::initialize() {
-
 	if (GDScriptLanguageProtocol::get_singleton()->is_smart_resolve_enabled()) {
-
 		const HashMap<StringName, ClassMembers> &native_members = GDScriptLanguageProtocol::get_singleton()->get_workspace()->native_members;
 
-		const StringName *class_ptr = native_members.next(NULL);
+		const StringName *class_ptr = native_members.next(nullptr);
 		while (class_ptr) {
-
 			const ClassMembers &members = native_members.get(*class_ptr);
 
-			const String *name = members.next(NULL);
+			const String *name = members.next(nullptr);
 			while (name) {
-
 				const lsp::DocumentSymbol *symbol = members.get(*name);
 				lsp::CompletionItem item = symbol->make_completion_item();
 				item.data = JOIN_SYMBOLS(String(*class_ptr), *name);
@@ -111,7 +109,6 @@ void GDScriptTextDocument::initialize() {
 }
 
 Variant GDScriptTextDocument::nativeSymbol(const Dictionary &p_params) {
-
 	Variant ret;
 
 	lsp::NativeSymbolInspectParams params;
@@ -141,7 +138,6 @@ Array GDScriptTextDocument::documentSymbol(const Dictionary &p_params) {
 }
 
 Array GDScriptTextDocument::completion(const Dictionary &p_params) {
-
 	Array arr;
 
 	lsp::CompletionParams params;
@@ -152,12 +148,10 @@ Array GDScriptTextDocument::completion(const Dictionary &p_params) {
 	GDScriptLanguageProtocol::get_singleton()->get_workspace()->completion(params, &options);
 
 	if (!options.empty()) {
-
 		int i = 0;
 		arr.resize(options.size());
 
 		for (const List<ScriptCodeCompletionOption>::Element *E = options.front(); E; E = E->next()) {
-
 			const ScriptCodeCompletionOption &option = E->get();
 			lsp::CompletionItem item;
 			item.label = option.display;
@@ -200,11 +194,9 @@ Array GDScriptTextDocument::completion(const Dictionary &p_params) {
 			i++;
 		}
 	} else if (GDScriptLanguageProtocol::get_singleton()->is_smart_resolve_enabled()) {
-
 		arr = native_member_completions.duplicate();
 
 		for (Map<String, ExtendGDScriptParser *>::Element *E = GDScriptLanguageProtocol::get_singleton()->get_workspace()->scripts.front(); E; E = E->next()) {
-
 			ExtendGDScriptParser *script = E->get();
 			const Array &items = script->get_member_completions();
 
@@ -219,28 +211,24 @@ Array GDScriptTextDocument::completion(const Dictionary &p_params) {
 }
 
 Dictionary GDScriptTextDocument::resolve(const Dictionary &p_params) {
-
 	lsp::CompletionItem item;
 	item.load(p_params);
 
 	lsp::CompletionParams params;
 	Variant data = p_params["data"];
 
-	const lsp::DocumentSymbol *symbol = NULL;
+	const lsp::DocumentSymbol *symbol = nullptr;
 
 	if (data.get_type() == Variant::DICTIONARY) {
-
 		params.load(p_params["data"]);
 		symbol = GDScriptLanguageProtocol::get_singleton()->get_workspace()->resolve_symbol(params, item.label, item.kind == lsp::CompletionItemKind::Method || item.kind == lsp::CompletionItemKind::Function);
 
 	} else if (data.get_type() == Variant::STRING) {
-
 		String query = data;
 
 		Vector<String> param_symbols = query.split(SYMBOL_SEPERATOR, false);
 
 		if (param_symbols.size() >= 2) {
-
 			String class_ = param_symbols[0];
 			StringName class_name = class_;
 			String member_name = param_symbols[param_symbols.size() - 1];
@@ -312,19 +300,18 @@ Array GDScriptTextDocument::colorPresentation(const Dictionary &p_params) {
 }
 
 Variant GDScriptTextDocument::hover(const Dictionary &p_params) {
-
 	lsp::TextDocumentPositionParams params;
 	params.load(p_params);
 
 	const lsp::DocumentSymbol *symbol = GDScriptLanguageProtocol::get_singleton()->get_workspace()->resolve_symbol(params);
 	if (symbol) {
-
 		lsp::Hover hover;
 		hover.contents = symbol->render();
+		hover.range.start = params.position;
+		hover.range.end = params.position;
 		return hover.to_json();
 
 	} else if (GDScriptLanguageProtocol::get_singleton()->is_smart_resolve_enabled()) {
-
 		Dictionary ret;
 		Array contents;
 		List<const lsp::DocumentSymbol *> list;
@@ -417,7 +404,8 @@ void GDScriptTextDocument::sync_script_content(const String &p_path, const Strin
 
 void GDScriptTextDocument::show_native_symbol_in_editor(const String &p_symbol_id) {
 	ScriptEditor::get_singleton()->call_deferred("_help_class_goto", p_symbol_id);
-	OS::get_singleton()->move_window_to_foreground();
+
+	DisplayServer::get_singleton()->window_move_to_foreground();
 }
 
 Array GDScriptTextDocument::find_symbols(const lsp::TextDocumentPositionParams &p_location, List<const lsp::DocumentSymbol *> &r_list) {
diff --git a/modules/gdscript/language_server/gdscript_workspace.cpp b/modules/gdscript/language_server/gdscript_workspace.cpp
index 1c0590cff1..776193e37c 100644
--- a/modules/gdscript/language_server/gdscript_workspace.cpp
+++ b/modules/gdscript/language_server/gdscript_workspace.cpp
@@ -29,28 +29,32 @@
 /*************************************************************************/
 
 #include "gdscript_workspace.h"
+
 #include "../gdscript.h"
 #include "../gdscript_parser.h"
 #include "core/project_settings.h"
 #include "core/script_language.h"
+#include "editor/editor_file_system.h"
 #include "editor/editor_help.h"
+#include "editor/editor_node.h"
 #include "gdscript_language_protocol.h"
+#include "scene/resources/packed_scene.h"
 
 void GDScriptWorkspace::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("symbol"), &GDScriptWorkspace::symbol);
-	ClassDB::bind_method(D_METHOD("parse_script", "p_path", "p_content"), &GDScriptWorkspace::parse_script);
-	ClassDB::bind_method(D_METHOD("parse_local_script", "p_path"), &GDScriptWorkspace::parse_local_script);
-	ClassDB::bind_method(D_METHOD("get_file_path", "p_uri"), &GDScriptWorkspace::get_file_path);
-	ClassDB::bind_method(D_METHOD("get_file_uri", "p_path"), &GDScriptWorkspace::get_file_uri);
-	ClassDB::bind_method(D_METHOD("publish_diagnostics", "p_path"), &GDScriptWorkspace::publish_diagnostics);
-	ClassDB::bind_method(D_METHOD("generate_script_api", "p_path"), &GDScriptWorkspace::generate_script_api);
+	ClassDB::bind_method(D_METHOD("parse_script", "path", "content"), &GDScriptWorkspace::parse_script);
+	ClassDB::bind_method(D_METHOD("parse_local_script", "path"), &GDScriptWorkspace::parse_local_script);
+	ClassDB::bind_method(D_METHOD("get_file_path", "uri"), &GDScriptWorkspace::get_file_path);
+	ClassDB::bind_method(D_METHOD("get_file_uri", "path"), &GDScriptWorkspace::get_file_uri);
+	ClassDB::bind_method(D_METHOD("publish_diagnostics", "path"), &GDScriptWorkspace::publish_diagnostics);
+	ClassDB::bind_method(D_METHOD("generate_script_api", "path"), &GDScriptWorkspace::generate_script_api);
 }
 
 void GDScriptWorkspace::remove_cache_parser(const String &p_path) {
 	Map<String, ExtendGDScriptParser *>::Element *parser = parse_results.find(p_path);
 	Map<String, ExtendGDScriptParser *>::Element *script = scripts.find(p_path);
 	if (parser && script) {
-		if (script->get() && script->get() == script->get()) {
+		if (script->get() && script->get() == parser->get()) {
 			memdelete(script->get());
 		} else {
 			memdelete(script->get());
@@ -68,7 +72,6 @@ void GDScriptWorkspace::remove_cache_parser(const String &p_path) {
 }
 
 const lsp::DocumentSymbol *GDScriptWorkspace::get_native_symbol(const String &p_class, const String &p_member) const {
-
 	StringName class_name = p_class;
 	StringName empty;
 
@@ -90,7 +93,7 @@ const lsp::DocumentSymbol *GDScriptWorkspace::get_native_symbol(const String &p_
 		class_name = ClassDB::get_parent_class(class_name);
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 const lsp::DocumentSymbol *GDScriptWorkspace::get_script_symbol(const String &p_path) const {
@@ -98,7 +101,7 @@ const lsp::DocumentSymbol *GDScriptWorkspace::get_script_symbol(const String &p_
 	if (S) {
 		return &(S->get()->get_symbols());
 	}
-	return NULL;
+	return nullptr;
 }
 
 void GDScriptWorkspace::reload_all_workspace_scripts() {
@@ -115,7 +118,7 @@ void GDScriptWorkspace::reload_all_workspace_scripts() {
 			Map<String, ExtendGDScriptParser *>::Element *S = parse_results.find(path);
 			String err_msg = "Failed parse script " + path;
 			if (S) {
-				err_msg += "\n" + S->get()->get_error();
+				err_msg += "\n" + S->get()->get_errors()[0].message;
 			}
 			ERR_CONTINUE_MSG(err != OK, err_msg);
 		}
@@ -149,7 +152,7 @@ ExtendGDScriptParser *GDScriptWorkspace::get_parse_successed_script(const String
 	if (S) {
 		return S->get();
 	}
-	return NULL;
+	return nullptr;
 }
 
 ExtendGDScriptParser *GDScriptWorkspace::get_parse_result(const String &p_path) {
@@ -161,7 +164,7 @@ ExtendGDScriptParser *GDScriptWorkspace::get_parse_result(const String &p_path)
 	if (S) {
 		return S->get();
 	}
-	return NULL;
+	return nullptr;
 }
 
 Array GDScriptWorkspace::symbol(const Dictionary &p_params) {
@@ -182,11 +185,12 @@ Array GDScriptWorkspace::symbol(const Dictionary &p_params) {
 }
 
 Error GDScriptWorkspace::initialize() {
-	if (initialized) return OK;
+	if (initialized) {
+		return OK;
+	}
 
 	DocData *doc = EditorHelp::get_doc_data();
 	for (Map<String, DocData::ClassDoc>::Element *E = doc->class_list.front(); E; E = E->next()) {
-
 		const DocData::ClassDoc &class_data = E->value();
 		lsp::DocumentSymbol class_symbol;
 		String class_name = E->key();
@@ -311,14 +315,12 @@ Error GDScriptWorkspace::initialize() {
 }
 
 Error GDScriptWorkspace::parse_script(const String &p_path, const String &p_content) {
-
 	ExtendGDScriptParser *parser = memnew(ExtendGDScriptParser);
 	Error err = parser->parse(p_content, p_path);
 	Map<String, ExtendGDScriptParser *>::Element *last_parser = parse_results.find(p_path);
 	Map<String, ExtendGDScriptParser *>::Element *last_script = scripts.find(p_path);
 
 	if (err == OK) {
-
 		remove_cache_parser(p_path);
 		parse_results[p_path] = parser;
 		scripts[p_path] = parser;
@@ -373,25 +375,71 @@ void GDScriptWorkspace::publish_diagnostics(const String &p_path) {
 	GDScriptLanguageProtocol::get_singleton()->notify_client("textDocument/publishDiagnostics", params);
 }
 
-void GDScriptWorkspace::completion(const lsp::CompletionParams &p_params, List<ScriptCodeCompletionOption> *r_options) {
+void GDScriptWorkspace::_get_owners(EditorFileSystemDirectory *efsd, String p_path, List<String> &owners) {
+	if (!efsd) {
+		return;
+	}
 
+	for (int i = 0; i < efsd->get_subdir_count(); i++) {
+		_get_owners(efsd->get_subdir(i), p_path, owners);
+	}
+
+	for (int i = 0; i < efsd->get_file_count(); i++) {
+		Vector<String> deps = efsd->get_file_deps(i);
+		bool found = false;
+		for (int j = 0; j < deps.size(); j++) {
+			if (deps[j] == p_path) {
+				found = true;
+				break;
+			}
+		}
+		if (!found) {
+			continue;
+		}
+
+		owners.push_back(efsd->get_file_path(i));
+	}
+}
+
+Node *GDScriptWorkspace::_get_owner_scene_node(String p_path) {
+	Node *owner_scene_node = nullptr;
+	List<String> owners;
+
+	_get_owners(EditorFileSystem::get_singleton()->get_filesystem(), p_path, owners);
+
+	for (int i = 0; i < owners.size(); i++) {
+		NodePath owner_path = owners[i];
+		RES owner_res = ResourceLoader::load(owner_path);
+		if (Object::cast_to<PackedScene>(owner_res.ptr())) {
+			Ref<PackedScene> owner_packed_scene = Ref<PackedScene>(Object::cast_to<PackedScene>(*owner_res));
+			owner_scene_node = owner_packed_scene->instance();
+			break;
+		}
+	}
+
+	return owner_scene_node;
+}
+
+void GDScriptWorkspace::completion(const lsp::CompletionParams &p_params, List<ScriptCodeCompletionOption> *r_options) {
 	String path = get_file_path(p_params.textDocument.uri);
 	String call_hint;
 	bool forced = false;
 
 	if (const ExtendGDScriptParser *parser = get_parse_result(path)) {
+		Node *owner_scene_node = _get_owner_scene_node(path);
 		String code = parser->get_text_for_completion(p_params.position);
-		GDScriptLanguage::get_singleton()->complete_code(code, path, NULL, r_options, forced, call_hint);
+		GDScriptLanguage::get_singleton()->complete_code(code, path, owner_scene_node, r_options, forced, call_hint);
+		if (owner_scene_node) {
+			memdelete(owner_scene_node);
+		}
 	}
 }
 
 const lsp::DocumentSymbol *GDScriptWorkspace::resolve_symbol(const lsp::TextDocumentPositionParams &p_doc_pos, const String &p_symbol_name, bool p_func_requred) {
-
-	const lsp::DocumentSymbol *symbol = NULL;
+	const lsp::DocumentSymbol *symbol = nullptr;
 
 	String path = get_file_path(p_doc_pos.textDocument.uri);
 	if (const ExtendGDScriptParser *parser = get_parse_result(path)) {
-
 		String symbol_identifier = p_symbol_name;
 		Vector<String> identifier_parts = symbol_identifier.split("(");
 		if (identifier_parts.size()) {
@@ -406,19 +454,14 @@ const lsp::DocumentSymbol *GDScriptWorkspace::resolve_symbol(const lsp::TextDocu
 		}
 
 		if (!symbol_identifier.empty()) {
-
 			if (ScriptServer::is_global_class(symbol_identifier)) {
-
 				String class_path = ScriptServer::get_global_class_path(symbol_identifier);
 				symbol = get_script_symbol(class_path);
 
 			} else {
-
 				ScriptLanguage::LookupResult ret;
-				if (OK == GDScriptLanguage::get_singleton()->lookup_code(parser->get_text_for_lookup_symbol(pos, symbol_identifier, p_func_requred), symbol_identifier, path, NULL, ret)) {
-
+				if (OK == GDScriptLanguage::get_singleton()->lookup_code(parser->get_text_for_lookup_symbol(pos, symbol_identifier, p_func_requred), symbol_identifier, path, nullptr, ret)) {
 					if (ret.type == ScriptLanguage::LookupResult::RESULT_SCRIPT_LOCATION) {
-
 						String target_script_path = path;
 						if (!ret.script.is_null()) {
 							target_script_path = ret.script->get_path();
@@ -429,7 +472,6 @@ const lsp::DocumentSymbol *GDScriptWorkspace::resolve_symbol(const lsp::TextDocu
 						}
 
 					} else {
-
 						String member = ret.class_member;
 						if (member.empty() && symbol_identifier != ret.class_name) {
 							member = symbol_identifier;
@@ -447,15 +489,13 @@ const lsp::DocumentSymbol *GDScriptWorkspace::resolve_symbol(const lsp::TextDocu
 }
 
 void GDScriptWorkspace::resolve_related_symbols(const lsp::TextDocumentPositionParams &p_doc_pos, List<const lsp::DocumentSymbol *> &r_list) {
-
 	String path = get_file_path(p_doc_pos.textDocument.uri);
 	if (const ExtendGDScriptParser *parser = get_parse_result(path)) {
-
 		String symbol_identifier;
 		Vector2i offset;
 		symbol_identifier = parser->get_identifier_under_position(p_doc_pos.position, offset);
 
-		const StringName *class_ptr = native_members.next(NULL);
+		const StringName *class_ptr = native_members.next(nullptr);
 		while (class_ptr) {
 			const ClassMembers &members = native_members.get(*class_ptr);
 			if (const lsp::DocumentSymbol *const *symbol = members.getptr(symbol_identifier)) {
@@ -472,9 +512,8 @@ void GDScriptWorkspace::resolve_related_symbols(const lsp::TextDocumentPositionP
 			}
 
 			const HashMap<String, ClassMembers> &inner_classes = script->get_inner_classes();
-			const String *_class = inner_classes.next(NULL);
+			const String *_class = inner_classes.next(nullptr);
 			while (_class) {
-
 				const ClassMembers *inner_class = inner_classes.getptr(*_class);
 				if (const lsp::DocumentSymbol *const *symbol = inner_class->getptr(symbol_identifier)) {
 					r_list.push_back(*symbol);
@@ -487,7 +526,6 @@ void GDScriptWorkspace::resolve_related_symbols(const lsp::TextDocumentPositionP
 }
 
 const lsp::DocumentSymbol *GDScriptWorkspace::resolve_native_symbol(const lsp::NativeSymbolInspectParams &p_params) {
-
 	if (Map<StringName, lsp::DocumentSymbol>::Element *E = native_symbols.find(p_params.native_class)) {
 		const lsp::DocumentSymbol &symbol = E->get();
 		if (p_params.symbol_name.empty() || p_params.symbol_name == symbol.name) {
@@ -501,7 +539,7 @@ const lsp::DocumentSymbol *GDScriptWorkspace::resolve_native_symbol(const lsp::N
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 void GDScriptWorkspace::resolve_document_links(const String &p_uri, List<lsp::DocumentLink> &r_list) {
@@ -523,12 +561,10 @@ Dictionary GDScriptWorkspace::generate_script_api(const String &p_path) {
 
 Error GDScriptWorkspace::resolve_signature(const lsp::TextDocumentPositionParams &p_doc_pos, lsp::SignatureHelp &r_signature) {
 	if (const ExtendGDScriptParser *parser = get_parse_result(get_file_path(p_doc_pos.textDocument.uri))) {
-
 		lsp::TextDocumentPositionParams text_pos;
 		text_pos.textDocument = p_doc_pos.textDocument;
 
 		if (parser->get_left_function_call(p_doc_pos.position, text_pos.position, r_signature.activeParameter) == OK) {
-
 			List<const lsp::DocumentSymbol *> symbols;
 
 			if (const lsp::DocumentSymbol *symbol = resolve_symbol(text_pos)) {
@@ -540,7 +576,6 @@ Error GDScriptWorkspace::resolve_signature(const lsp::TextDocumentPositionParams
 			for (List<const lsp::DocumentSymbol *>::Element *E = symbols.front(); E; E = E->next()) {
 				const lsp::DocumentSymbol *symbol = E->get();
 				if (symbol->kind == lsp::SymbolKind::Method || symbol->kind == lsp::SymbolKind::Function) {
-
 					lsp::SignatureInformation signature_info;
 					signature_info.label = symbol->detail;
 					signature_info.documentation = symbol->render();
diff --git a/modules/gdscript/language_server/gdscript_workspace.h b/modules/gdscript/language_server/gdscript_workspace.h
index 146a5cb7c9..e45b06747d 100644
--- a/modules/gdscript/language_server/gdscript_workspace.h
+++ b/modules/gdscript/language_server/gdscript_workspace.h
@@ -33,12 +33,17 @@
 
 #include "../gdscript_parser.h"
 #include "core/variant.h"
+#include "editor/editor_file_system.h"
 #include "gdscript_extend_parser.h"
 #include "lsp.hpp"
 
 class GDScriptWorkspace : public Reference {
 	GDCLASS(GDScriptWorkspace, Reference);
 
+private:
+	void _get_owners(EditorFileSystemDirectory *efsd, String p_path, List<String> &owners);
+	Node *_get_owner_scene_node(String p_path);
+
 protected:
 	static void _bind_methods();
 	void remove_cache_parser(const String &p_path);
diff --git a/modules/gdscript/language_server/lsp.hpp b/modules/gdscript/language_server/lsp.hpp
index a2dcc48820..cf27a1578c 100644
--- a/modules/gdscript/language_server/lsp.hpp
+++ b/modules/gdscript/language_server/lsp.hpp
@@ -33,7 +33,7 @@
 
 #include "core/class_db.h"
 #include "core/list.h"
-#include "editor/doc/doc_data.h"
+#include "editor/doc_data.h"
 
 namespace lsp {
 
@@ -149,14 +149,13 @@ struct Location {
  * Represents a link between a source and a target location.
  */
 struct LocationLink {
-
 	/**
 	 * Span of the origin of this link.
 	 *
 	 * Used as the underlined span for mouse interaction. Defaults to the word range at
 	 * the mouse position.
 	 */
-	Range *originSelectionRange = NULL;
+	Range *originSelectionRange = nullptr;
 
 	/**
 	 * The target resource identifier of this link.
@@ -220,7 +219,6 @@ struct DocumentLinkParams {
  * text document or a web site.
  */
 struct DocumentLink {
-
 	/**
 	 * The range this link applies to.
 	 */
@@ -282,7 +280,9 @@ struct Command {
 		Dictionary dict;
 		dict["title"] = title;
 		dict["command"] = command;
-		if (arguments.size()) dict["arguments"] = arguments;
+		if (arguments.size()) {
+			dict["arguments"] = arguments;
+		}
 		return dict;
 	}
 };
@@ -486,7 +486,7 @@ struct TextDocumentSyncOptions {
 	 * If present save notifications are sent to the server. If omitted the notification should not be
 	 * sent.
 	 */
-	SaveOptions save;
+	bool save = false;
 
 	Dictionary to_json() {
 		Dictionary dict;
@@ -494,7 +494,7 @@ struct TextDocumentSyncOptions {
 		dict["willSave"] = willSave;
 		dict["openClose"] = openClose;
 		dict["change"] = change;
-		dict["save"] = save.to_json();
+		dict["save"] = save;
 		return dict;
 	}
 };
@@ -946,16 +946,24 @@ struct CompletionItem {
 			dict["preselect"] = preselect;
 			dict["sortText"] = sortText;
 			dict["filterText"] = filterText;
-			if (commitCharacters.size()) dict["commitCharacters"] = commitCharacters;
+			if (commitCharacters.size()) {
+				dict["commitCharacters"] = commitCharacters;
+			}
 			dict["command"] = command.to_json();
 		}
 		return dict;
 	}
 
 	void load(const Dictionary &p_dict) {
-		if (p_dict.has("label")) label = p_dict["label"];
-		if (p_dict.has("kind")) kind = p_dict["kind"];
-		if (p_dict.has("detail")) detail = p_dict["detail"];
+		if (p_dict.has("label")) {
+			label = p_dict["label"];
+		}
+		if (p_dict.has("kind")) {
+			kind = p_dict["kind"];
+		}
+		if (p_dict.has("detail")) {
+			detail = p_dict["detail"];
+		}
 		if (p_dict.has("documentation")) {
 			Variant doc = p_dict["documentation"];
 			if (doc.get_type() == Variant::STRING) {
@@ -965,12 +973,24 @@ struct CompletionItem {
 				documentation.value = v["value"];
 			}
 		}
-		if (p_dict.has("deprecated")) deprecated = p_dict["deprecated"];
-		if (p_dict.has("preselect")) preselect = p_dict["preselect"];
-		if (p_dict.has("sortText")) sortText = p_dict["sortText"];
-		if (p_dict.has("filterText")) filterText = p_dict["filterText"];
-		if (p_dict.has("insertText")) insertText = p_dict["insertText"];
-		if (p_dict.has("data")) data = p_dict["data"];
+		if (p_dict.has("deprecated")) {
+			deprecated = p_dict["deprecated"];
+		}
+		if (p_dict.has("preselect")) {
+			preselect = p_dict["preselect"];
+		}
+		if (p_dict.has("sortText")) {
+			sortText = p_dict["sortText"];
+		}
+		if (p_dict.has("filterText")) {
+			filterText = p_dict["filterText"];
+		}
+		if (p_dict.has("insertText")) {
+			insertText = p_dict["insertText"];
+		}
+		if (p_dict.has("data")) {
+			data = p_dict["data"];
+		}
 	}
 };
 
@@ -1096,7 +1116,6 @@ struct DocumentedSymbolInformation : public SymbolInformation {
  * e.g. the range of an identifier.
  */
 struct DocumentSymbol {
-
 	/**
 	 * The name of this symbol. Will be displayed in the user interface and therefore must not be
 	 * an empty string or a string only consisting of white spaces.
@@ -1205,7 +1224,6 @@ struct DocumentSymbol {
 	}
 
 	_FORCE_INLINE_ CompletionItem make_completion_item(bool resolved = false) const {
-
 		lsp::CompletionItem item;
 		item.label = name;
 
@@ -1249,7 +1267,6 @@ struct DocumentSymbol {
 };
 
 struct NativeSymbolInspectParams {
-
 	String native_class;
 	String symbol_name;
 
@@ -1281,7 +1298,6 @@ static const String Region = "region";
  * Represents a folding range.
  */
 struct FoldingRange {
-
 	/**
 	 * The zero-based line number from where the folded range starts.
 	 */
@@ -1364,7 +1380,6 @@ struct CompletionContext {
 };
 
 struct CompletionParams : public TextDocumentPositionParams {
-
 	/**
 	 * The completion context. This is only available if the client specifies
 	 * to send this using `ClientCapabilities.textDocument.completion.contextSupport === true`
@@ -1405,7 +1420,6 @@ struct Hover {
  * have a label and a doc-comment.
  */
 struct ParameterInformation {
-
 	/**
 	 * The label of this parameter information.
 	 *
@@ -1642,7 +1656,7 @@ struct ServerCapabilities {
 
 	_FORCE_INLINE_ Dictionary to_json() {
 		Dictionary dict;
-		dict["textDocumentSync"] = (int)textDocumentSync.change;
+		dict["textDocumentSync"] = textDocumentSync.to_json();
 		dict["completionProvider"] = completionProvider.to_json();
 		signatureHelpProvider.triggerCharacters.push_back(",");
 		signatureHelpProvider.triggerCharacters.push_back("(");
@@ -1684,10 +1698,9 @@ struct InitializeResult {
 };
 
 struct GodotNativeClassInfo {
-
 	String name;
-	const DocData::ClassDoc *class_doc = NULL;
-	const ClassDB::ClassInfo *class_info = NULL;
+	const DocData::ClassDoc *class_doc = nullptr;
+	const ClassDB::ClassInfo *class_info = nullptr;
 
 	Dictionary to_json() {
 		Dictionary dict;
@@ -1699,7 +1712,6 @@ struct GodotNativeClassInfo {
 
 /** Features not included in the standard lsp specifications */
 struct GodotCapabilities {
-
 	/**
 	 * Native class list
 	*/
@@ -1718,7 +1730,6 @@ struct GodotCapabilities {
 
 /** Format BBCode documentation from DocData to markdown */
 static String marked_documentation(const String &p_bbcode) {
-
 	String markdown = p_bbcode.strip_edges();
 
 	Vector<String> lines = markdown.split("\n");
diff --git a/modules/gdscript/register_types.cpp b/modules/gdscript/register_types.cpp
index b5eb09d6ba..da4cbe34c7 100644
--- a/modules/gdscript/register_types.cpp
+++ b/modules/gdscript/register_types.cpp
@@ -35,31 +35,41 @@
 #include "core/os/dir_access.h"
 #include "core/os/file_access.h"
 #include "gdscript.h"
+#include "gdscript_analyzer.h"
+#include "gdscript_cache.h"
 #include "gdscript_tokenizer.h"
 
-GDScriptLanguage *script_language_gd = NULL;
+#ifdef TESTS_ENABLED
+#include "tests/test_gdscript.h"
+#include "tests/test_macros.h"
+#endif
+
+GDScriptLanguage *script_language_gd = nullptr;
 Ref<ResourceFormatLoaderGDScript> resource_loader_gd;
 Ref<ResourceFormatSaverGDScript> resource_saver_gd;
+GDScriptCache *gdscript_cache = nullptr;
 
 #ifdef TOOLS_ENABLED
 
 #include "editor/editor_export.h"
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
+#include "editor/editor_translation_parser.h"
 #include "editor/gdscript_highlighter.h"
+#include "editor/gdscript_translation_parser_plugin.h"
 
 #ifndef GDSCRIPT_NO_LSP
 #include "core/engine.h"
 #include "language_server/gdscript_language_server.h"
 #endif // !GDSCRIPT_NO_LSP
 
-class EditorExportGDScript : public EditorExportPlugin {
+Ref<GDScriptEditorTranslationParserPlugin> gdscript_translation_parser_plugin;
 
+class EditorExportGDScript : public EditorExportPlugin {
 	GDCLASS(EditorExportGDScript, EditorExportPlugin);
 
 public:
-	virtual void _export_file(const String &p_path, const String &p_type, const Set<String> &p_features) {
-
+	virtual void _export_file(const String &p_path, const String &p_type, const Set<String> &p_features) override {
 		int script_mode = EditorExportPreset::MODE_SCRIPT_COMPILED;
 		String script_key;
 
@@ -70,76 +80,26 @@ public:
 			script_key = preset->get_script_encryption_key().to_lower();
 		}
 
-		if (!p_path.ends_with(".gd") || script_mode == EditorExportPreset::MODE_SCRIPT_TEXT)
+		if (!p_path.ends_with(".gd") || script_mode == EditorExportPreset::MODE_SCRIPT_TEXT) {
 			return;
-
-		Vector<uint8_t> file = FileAccess::get_file_as_array(p_path);
-		if (file.empty())
-			return;
-
-		String txt;
-		txt.parse_utf8((const char *)file.ptr(), file.size());
-		file = GDScriptTokenizerBuffer::parse_code_string(txt);
-
-		if (!file.empty()) {
-
-			if (script_mode == EditorExportPreset::MODE_SCRIPT_ENCRYPTED) {
-
-				String tmp_path = EditorSettings::get_singleton()->get_cache_dir().plus_file("script.gde");
-				FileAccess *fa = FileAccess::open(tmp_path, FileAccess::WRITE);
-
-				Vector<uint8_t> key;
-				key.resize(32);
-				for (int i = 0; i < 32; i++) {
-					int v = 0;
-					if (i * 2 < script_key.length()) {
-						CharType ct = script_key[i * 2];
-						if (ct >= '0' && ct <= '9')
-							ct = ct - '0';
-						else if (ct >= 'a' && ct <= 'f')
-							ct = 10 + ct - 'a';
-						v |= ct << 4;
-					}
-
-					if (i * 2 + 1 < script_key.length()) {
-						CharType ct = script_key[i * 2 + 1];
-						if (ct >= '0' && ct <= '9')
-							ct = ct - '0';
-						else if (ct >= 'a' && ct <= 'f')
-							ct = 10 + ct - 'a';
-						v |= ct;
-					}
-					key.write[i] = v;
-				}
-				FileAccessEncrypted *fae = memnew(FileAccessEncrypted);
-				Error err = fae->open_and_parse(fa, key, FileAccessEncrypted::MODE_WRITE_AES256);
-
-				if (err == OK) {
-					fae->store_buffer(file.ptr(), file.size());
-				}
-
-				memdelete(fae);
-
-				file = FileAccess::get_file_as_array(tmp_path);
-				add_file(p_path.get_basename() + ".gde", file, true);
-
-				// Clean up temporary file.
-				DirAccess::remove_file_or_error(tmp_path);
-
-			} else {
-
-				add_file(p_path.get_basename() + ".gdc", file, true);
-			}
 		}
+
+		// TODO: Readd compiled GDScript on export.
+		return;
 	}
 };
 
 static void _editor_init() {
-
 	Ref<EditorExportGDScript> gd_export;
 	gd_export.instance();
 	EditorExport::get_singleton()->add_export_plugin(gd_export);
 
+#ifdef TOOLS_ENABLED
+	Ref<GDScriptSyntaxHighlighter> gdscript_syntax_highlighter;
+	gdscript_syntax_highlighter.instance();
+	ScriptEditor::get_singleton()->register_syntax_highlighter(gdscript_syntax_highlighter);
+#endif
+
 #ifndef GDSCRIPT_NO_LSP
 	register_lsp_types();
 	GDScriptLanguageServer *lsp_plugin = memnew(GDScriptLanguageServer);
@@ -151,7 +111,6 @@ static void _editor_init() {
 #endif // TOOLS_ENABLED
 
 void register_gdscript_types() {
-
 	ClassDB::register_class<GDScript>();
 	ClassDB::register_virtual_class<GDScriptFunctionState>();
 
@@ -164,22 +123,61 @@ void register_gdscript_types() {
 	resource_saver_gd.instance();
 	ResourceSaver::add_resource_format_saver(resource_saver_gd);
 
+	gdscript_cache = memnew(GDScriptCache);
+
 #ifdef TOOLS_ENABLED
-	ScriptEditor::register_create_syntax_highlighter_function(GDScriptSyntaxHighlighter::create);
 	EditorNode::add_init_callback(_editor_init);
+
+	gdscript_translation_parser_plugin.instance();
+	EditorTranslationParser::get_singleton()->add_parser(gdscript_translation_parser_plugin, EditorTranslationParser::STANDARD);
 #endif // TOOLS_ENABLED
 }
 
 void unregister_gdscript_types() {
-
 	ScriptServer::unregister_language(script_language_gd);
 
-	if (script_language_gd)
+	if (gdscript_cache) {
+		memdelete(gdscript_cache);
+	}
+
+	if (script_language_gd) {
 		memdelete(script_language_gd);
+	}
 
 	ResourceLoader::remove_resource_format_loader(resource_loader_gd);
 	resource_loader_gd.unref();
 
 	ResourceSaver::remove_resource_format_saver(resource_saver_gd);
 	resource_saver_gd.unref();
+
+#ifdef TOOLS_ENABLED
+	EditorTranslationParser::get_singleton()->remove_parser(gdscript_translation_parser_plugin, EditorTranslationParser::STANDARD);
+	gdscript_translation_parser_plugin.unref();
+#endif // TOOLS_ENABLED
+
+	GDScriptParser::cleanup();
+	GDScriptAnalyzer::cleanup();
+}
+
+#ifdef TESTS_ENABLED
+void test_tokenizer() {
+	TestGDScript::test(TestGDScript::TestType::TEST_TOKENIZER);
 }
+
+void test_parser() {
+	TestGDScript::test(TestGDScript::TestType::TEST_PARSER);
+}
+
+void test_compiler() {
+	TestGDScript::test(TestGDScript::TestType::TEST_COMPILER);
+}
+
+void test_bytecode() {
+	TestGDScript::test(TestGDScript::TestType::TEST_BYTECODE);
+}
+
+REGISTER_TEST_COMMAND("gdscript-tokenizer", &test_tokenizer);
+REGISTER_TEST_COMMAND("gdscript-parser", &test_parser);
+REGISTER_TEST_COMMAND("gdscript-compiler", &test_compiler);
+REGISTER_TEST_COMMAND("gdscript-bytecode", &test_bytecode);
+#endif
diff --git a/modules/gdscript/register_types.h b/modules/gdscript/register_types.h
index 55920e8b97..18e57c1211 100644
--- a/modules/gdscript/register_types.h
+++ b/modules/gdscript/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef GDSCRIPT_REGISTER_TYPES_H
+#define GDSCRIPT_REGISTER_TYPES_H
+
 void register_gdscript_types();
 void unregister_gdscript_types();
+
+#endif // GDSCRIPT_REGISTER_TYPES_H
diff --git a/modules/gdscript/tests/test_gdscript.cpp b/modules/gdscript/tests/test_gdscript.cpp
new file mode 100644
index 0000000000..68d9984b43
--- /dev/null
+++ b/modules/gdscript/tests/test_gdscript.cpp
@@ -0,0 +1,231 @@
+/*************************************************************************/
+/*  test_gdscript.cpp                                                    */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "test_gdscript.h"
+
+#include "core/os/file_access.h"
+#include "core/os/main_loop.h"
+#include "core/os/os.h"
+#include "core/string_builder.h"
+
+#include "modules/gdscript/gdscript_analyzer.h"
+#include "modules/gdscript/gdscript_compiler.h"
+#include "modules/gdscript/gdscript_parser.h"
+#include "modules/gdscript/gdscript_tokenizer.h"
+
+#ifdef TOOLS_ENABLED
+#include "editor/editor_settings.h"
+#endif
+
+namespace TestGDScript {
+
+static void test_tokenizer(const String &p_code, const Vector<String> &p_lines) {
+	GDScriptTokenizer tokenizer;
+	tokenizer.set_source_code(p_code);
+
+	int tab_size = 4;
+#ifdef TOOLS_ENABLED
+	if (EditorSettings::get_singleton()) {
+		tab_size = EditorSettings::get_singleton()->get_setting("text_editor/indent/size");
+	}
+#endif // TOOLS_ENABLED
+	String tab = String(" ").repeat(tab_size);
+
+	GDScriptTokenizer::Token current = tokenizer.scan();
+	while (current.type != GDScriptTokenizer::Token::TK_EOF) {
+		StringBuilder token;
+		token += " --> "; // Padding for line number.
+
+		for (int l = current.start_line; l <= current.end_line; l++) {
+			print_line(vformat("%04d %s", l, p_lines[l - 1]).replace("\t", tab));
+		}
+
+		{
+			// Print carets to point at the token.
+			StringBuilder pointer;
+			pointer += "     "; // Padding for line number.
+			int rightmost_column = current.rightmost_column;
+			if (current.end_line > current.start_line) {
+				rightmost_column--; // Don't point to the newline as a column.
+			}
+			for (int col = 1; col < rightmost_column; col++) {
+				if (col < current.leftmost_column) {
+					pointer += " ";
+				} else {
+					pointer += "^";
+				}
+			}
+			print_line(pointer.as_string());
+		}
+
+		token += current.get_name();
+
+		if (current.type == GDScriptTokenizer::Token::ERROR || current.type == GDScriptTokenizer::Token::LITERAL || current.type == GDScriptTokenizer::Token::IDENTIFIER || current.type == GDScriptTokenizer::Token::ANNOTATION) {
+			token += "(";
+			token += Variant::get_type_name(current.literal.get_type());
+			token += ") ";
+			token += current.literal;
+		}
+
+		print_line(token.as_string());
+
+		print_line("-------------------------------------------------------");
+
+		current = tokenizer.scan();
+	}
+
+	print_line(current.get_name()); // Should be EOF
+}
+
+static void test_parser(const String &p_code, const String &p_script_path, const Vector<String> &p_lines) {
+	GDScriptParser parser;
+	Error err = parser.parse(p_code, p_script_path, false);
+
+	if (err != OK) {
+		const List<GDScriptParser::ParserError> &errors = parser.get_errors();
+		for (const List<GDScriptParser::ParserError>::Element *E = errors.front(); E != nullptr; E = E->next()) {
+			const GDScriptParser::ParserError &error = E->get();
+			print_line(vformat("%02d:%02d: %s", error.line, error.column, error.message));
+		}
+	}
+
+	GDScriptParser::TreePrinter printer;
+
+	printer.print_tree(parser);
+}
+
+static void test_compiler(const String &p_code, const String &p_script_path, const Vector<String> &p_lines) {
+	GDScriptParser parser;
+	Error err = parser.parse(p_code, p_script_path, false);
+
+	if (err != OK) {
+		print_line("Error in parser:");
+		const List<GDScriptParser::ParserError> &errors = parser.get_errors();
+		for (const List<GDScriptParser::ParserError>::Element *E = errors.front(); E != nullptr; E = E->next()) {
+			const GDScriptParser::ParserError &error = E->get();
+			print_line(vformat("%02d:%02d: %s", error.line, error.column, error.message));
+		}
+		return;
+	}
+
+	GDScriptAnalyzer analyzer(&parser);
+	err = analyzer.analyze();
+
+	if (err != OK) {
+		print_line("Error in analyzer:");
+		const List<GDScriptParser::ParserError> &errors = parser.get_errors();
+		for (const List<GDScriptParser::ParserError>::Element *E = errors.front(); E != nullptr; E = E->next()) {
+			const GDScriptParser::ParserError &error = E->get();
+			print_line(vformat("%02d:%02d: %s", error.line, error.column, error.message));
+		}
+		return;
+	}
+
+	GDScriptCompiler compiler;
+	Ref<GDScript> script;
+	script.instance();
+	script->set_path(p_script_path);
+
+	err = compiler.compile(&parser, script.ptr(), false);
+
+	if (err) {
+		print_line("Error in compiler:");
+		print_line(vformat("%02d:%02d: %s", compiler.get_error_line(), compiler.get_error_column(), compiler.get_error()));
+		return;
+	}
+
+	for (const Map<StringName, GDScriptFunction *>::Element *E = script->get_member_functions().front(); E; E = E->next()) {
+		const GDScriptFunction *func = E->value();
+
+		String signature = "Disassembling " + func->get_name().operator String() + "(";
+		for (int i = 0; i < func->get_argument_count(); i++) {
+			if (i > 0) {
+				signature += ", ";
+			}
+			signature += func->get_argument_name(i);
+		}
+		print_line(signature + ")");
+
+		func->disassemble(p_lines);
+		print_line("");
+		print_line("");
+	}
+}
+
+void test(TestType p_type) {
+	List<String> cmdlargs = OS::get_singleton()->get_cmdline_args();
+
+	if (cmdlargs.empty()) {
+		return;
+	}
+
+	String test = cmdlargs.back()->get();
+	if (!test.ends_with(".gd")) {
+		print_line("This test expects a path to a GDScript file as its last parameter. Got: " + test);
+		return;
+	}
+
+	FileAccessRef fa = FileAccess::open(test, FileAccess::READ);
+	ERR_FAIL_COND_MSG(!fa, "Could not open file: " + test);
+
+	Vector<uint8_t> buf;
+	int flen = fa->get_len();
+	buf.resize(fa->get_len() + 1);
+	fa->get_buffer(buf.ptrw(), flen);
+	buf.write[flen] = 0;
+
+	String code;
+	code.parse_utf8((const char *)&buf[0]);
+
+	Vector<String> lines;
+	int last = 0;
+	for (int i = 0; i <= code.length(); i++) {
+		if (code[i] == '\n' || code[i] == 0) {
+			lines.push_back(code.substr(last, i - last));
+			last = i + 1;
+		}
+	}
+
+	switch (p_type) {
+		case TEST_TOKENIZER:
+			test_tokenizer(code, lines);
+			break;
+		case TEST_PARSER:
+			test_parser(code, test, lines);
+			break;
+		case TEST_COMPILER:
+			test_compiler(code, test, lines);
+			break;
+		case TEST_BYTECODE:
+			print_line("Not implemented.");
+	}
+}
+
+} // namespace TestGDScript
diff --git a/modules/gdscript/tests/test_gdscript.h b/modules/gdscript/tests/test_gdscript.h
new file mode 100644
index 0000000000..5aa962dcf8
--- /dev/null
+++ b/modules/gdscript/tests/test_gdscript.h
@@ -0,0 +1,47 @@
+/*************************************************************************/
+/*  test_gdscript.h                                                      */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef TEST_GDSCRIPT_H
+#define TEST_GDSCRIPT_H
+
+namespace TestGDScript {
+
+enum TestType {
+	TEST_TOKENIZER,
+	TEST_PARSER,
+	TEST_COMPILER,
+	TEST_BYTECODE,
+};
+
+void test(TestType p_type);
+
+} // namespace TestGDScript
+
+#endif // TEST_GDSCRIPT_H
diff --git a/modules/glslang/SCsub b/modules/glslang/SCsub
new file mode 100644
index 0000000000..c1d23a138b
--- /dev/null
+++ b/modules/glslang/SCsub
@@ -0,0 +1,72 @@
+#!/usr/bin/env python
+
+Import("env")
+Import("env_modules")
+
+env_glslang = env_modules.Clone()
+
+# Thirdparty source files
+if env["builtin_glslang"]:
+    thirdparty_dir = "#thirdparty/glslang/"
+    thirdparty_sources = [
+        "glslang/MachineIndependent/RemoveTree.cpp",
+        "glslang/MachineIndependent/ParseHelper.cpp",
+        "glslang/MachineIndependent/iomapper.cpp",
+        "glslang/MachineIndependent/propagateNoContraction.cpp",
+        "glslang/MachineIndependent/Intermediate.cpp",
+        "glslang/MachineIndependent/linkValidate.cpp",
+        "glslang/MachineIndependent/attribute.cpp",
+        "glslang/MachineIndependent/Scan.cpp",
+        "glslang/MachineIndependent/Initialize.cpp",
+        "glslang/MachineIndependent/Constant.cpp",
+        "glslang/MachineIndependent/reflection.cpp",
+        "glslang/MachineIndependent/limits.cpp",
+        "glslang/MachineIndependent/preprocessor/PpScanner.cpp",
+        "glslang/MachineIndependent/preprocessor/PpTokens.cpp",
+        "glslang/MachineIndependent/preprocessor/PpAtom.cpp",
+        "glslang/MachineIndependent/preprocessor/PpContext.cpp",
+        "glslang/MachineIndependent/preprocessor/Pp.cpp",
+        "glslang/MachineIndependent/InfoSink.cpp",
+        "glslang/MachineIndependent/intermOut.cpp",
+        "glslang/MachineIndependent/SymbolTable.cpp",
+        "glslang/MachineIndependent/glslang_tab.cpp",
+        "glslang/MachineIndependent/pch.cpp",
+        "glslang/MachineIndependent/Versions.cpp",
+        "glslang/MachineIndependent/ShaderLang.cpp",
+        "glslang/MachineIndependent/parseConst.cpp",
+        "glslang/MachineIndependent/PoolAlloc.cpp",
+        "glslang/MachineIndependent/ParseContextBase.cpp",
+        "glslang/MachineIndependent/IntermTraverse.cpp",
+        "glslang/GenericCodeGen/Link.cpp",
+        "glslang/GenericCodeGen/CodeGen.cpp",
+        "OGLCompilersDLL/InitializeDll.cpp",
+        "SPIRV/InReadableOrder.cpp",
+        "SPIRV/GlslangToSpv.cpp",
+        "SPIRV/SpvBuilder.cpp",
+        "SPIRV/SpvTools.cpp",
+        "SPIRV/disassemble.cpp",
+        "SPIRV/doc.cpp",
+        "SPIRV/SPVRemapper.cpp",
+        "SPIRV/SpvPostProcess.cpp",
+        "SPIRV/Logger.cpp",
+    ]
+
+    if env["platform"] == "windows":
+        thirdparty_sources.append("glslang/OSDependent/Windows/ossource.cpp")
+    else:
+        thirdparty_sources.append("glslang/OSDependent/Unix/ossource.cpp")
+
+    thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
+
+    # Treat glslang headers as system headers to avoid raising warnings. Not supported on MSVC.
+    if not env.msvc:
+        env_glslang.Append(CPPFLAGS=["-isystem", Dir(thirdparty_dir).path])
+    else:
+        env_glslang.Prepend(CPPPATH=[thirdparty_dir])
+
+    env_thirdparty = env_glslang.Clone()
+    env_thirdparty.disable_warnings()
+    env_thirdparty.add_source_files(env.modules_sources, thirdparty_sources)
+
+# Godot's own source files
+env_glslang.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/glslang/config.py b/modules/glslang/config.py
new file mode 100644
index 0000000000..d22f9454ed
--- /dev/null
+++ b/modules/glslang/config.py
@@ -0,0 +1,6 @@
+def can_build(env, platform):
+    return True
+
+
+def configure(env):
+    pass
diff --git a/modules/glslang/register_types.cpp b/modules/glslang/register_types.cpp
new file mode 100644
index 0000000000..dd28c4ad4a
--- /dev/null
+++ b/modules/glslang/register_types.cpp
@@ -0,0 +1,244 @@
+/*************************************************************************/
+/*  register_types.cpp                                                   */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "register_types.h"
+
+#include "servers/rendering/rendering_device.h"
+
+#include <SPIRV/GlslangToSpv.h>
+#include <glslang/Include/Types.h>
+#include <glslang/Public/ShaderLang.h>
+
+static const TBuiltInResource default_builtin_resource = {
+	/*maxLights*/ 32,
+	/*maxClipPlanes*/ 6,
+	/*maxTextureUnits*/ 32,
+	/*maxTextureCoords*/ 32,
+	/*maxVertexAttribs*/ 64,
+	/*maxVertexUniformComponents*/ 4096,
+	/*maxVaryingFloats*/ 64,
+	/*maxVertexTextureImageUnits*/ 32,
+	/*maxCombinedTextureImageUnits*/ 80,
+	/*maxTextureImageUnits*/ 32,
+	/*maxFragmentUniformComponents*/ 4096,
+	/*maxDrawBuffers*/ 32,
+	/*maxVertexUniformVectors*/ 128,
+	/*maxVaryingVectors*/ 8,
+	/*maxFragmentUniformVectors*/ 16,
+	/*maxVertexOutputVectors*/ 16,
+	/*maxFragmentInputVectors*/ 15,
+	/*minProgramTexelOffset*/ -8,
+	/*maxProgramTexelOffset*/ 7,
+	/*maxClipDistances*/ 8,
+	/*maxComputeWorkGroupCountX*/ 65535,
+	/*maxComputeWorkGroupCountY*/ 65535,
+	/*maxComputeWorkGroupCountZ*/ 65535,
+	/*maxComputeWorkGroupSizeX*/ 1024,
+	/*maxComputeWorkGroupSizeY*/ 1024,
+	/*maxComputeWorkGroupSizeZ*/ 64,
+	/*maxComputeUniformComponents*/ 1024,
+	/*maxComputeTextureImageUnits*/ 16,
+	/*maxComputeImageUniforms*/ 8,
+	/*maxComputeAtomicCounters*/ 8,
+	/*maxComputeAtomicCounterBuffers*/ 1,
+	/*maxVaryingComponents*/ 60,
+	/*maxVertexOutputComponents*/ 64,
+	/*maxGeometryInputComponents*/ 64,
+	/*maxGeometryOutputComponents*/ 128,
+	/*maxFragmentInputComponents*/ 128,
+	/*maxImageUnits*/ 8,
+	/*maxCombinedImageUnitsAndFragmentOutputs*/ 8,
+	/*maxCombinedShaderOutputResources*/ 8,
+	/*maxImageSamples*/ 0,
+	/*maxVertexImageUniforms*/ 0,
+	/*maxTessControlImageUniforms*/ 0,
+	/*maxTessEvaluationImageUniforms*/ 0,
+	/*maxGeometryImageUniforms*/ 0,
+	/*maxFragmentImageUniforms*/ 8,
+	/*maxCombinedImageUniforms*/ 8,
+	/*maxGeometryTextureImageUnits*/ 16,
+	/*maxGeometryOutputVertices*/ 256,
+	/*maxGeometryTotalOutputComponents*/ 1024,
+	/*maxGeometryUniformComponents*/ 1024,
+	/*maxGeometryVaryingComponents*/ 64,
+	/*maxTessControlInputComponents*/ 128,
+	/*maxTessControlOutputComponents*/ 128,
+	/*maxTessControlTextureImageUnits*/ 16,
+	/*maxTessControlUniformComponents*/ 1024,
+	/*maxTessControlTotalOutputComponents*/ 4096,
+	/*maxTessEvaluationInputComponents*/ 128,
+	/*maxTessEvaluationOutputComponents*/ 128,
+	/*maxTessEvaluationTextureImageUnits*/ 16,
+	/*maxTessEvaluationUniformComponents*/ 1024,
+	/*maxTessPatchComponents*/ 120,
+	/*maxPatchVertices*/ 32,
+	/*maxTessGenLevel*/ 64,
+	/*maxViewports*/ 16,
+	/*maxVertexAtomicCounters*/ 0,
+	/*maxTessControlAtomicCounters*/ 0,
+	/*maxTessEvaluationAtomicCounters*/ 0,
+	/*maxGeometryAtomicCounters*/ 0,
+	/*maxFragmentAtomicCounters*/ 8,
+	/*maxCombinedAtomicCounters*/ 8,
+	/*maxAtomicCounterBindings*/ 1,
+	/*maxVertexAtomicCounterBuffers*/ 0,
+	/*maxTessControlAtomicCounterBuffers*/ 0,
+	/*maxTessEvaluationAtomicCounterBuffers*/ 0,
+	/*maxGeometryAtomicCounterBuffers*/ 0,
+	/*maxFragmentAtomicCounterBuffers*/ 1,
+	/*maxCombinedAtomicCounterBuffers*/ 1,
+	/*maxAtomicCounterBufferSize*/ 16384,
+	/*maxTransformFeedbackBuffers*/ 4,
+	/*maxTransformFeedbackInterleavedComponents*/ 64,
+	/*maxCullDistances*/ 8,
+	/*maxCombinedClipAndCullDistances*/ 8,
+	/*maxSamples*/ 4,
+	/*maxMeshOutputVerticesNV*/ 0,
+	/*maxMeshOutputPrimitivesNV*/ 0,
+	/*maxMeshWorkGroupSizeX_NV*/ 0,
+	/*maxMeshWorkGroupSizeY_NV*/ 0,
+	/*maxMeshWorkGroupSizeZ_NV*/ 0,
+	/*maxTaskWorkGroupSizeX_NV*/ 0,
+	/*maxTaskWorkGroupSizeY_NV*/ 0,
+	/*maxTaskWorkGroupSizeZ_NV*/ 0,
+	/*maxMeshViewCountNV*/ 0,
+	/*limits*/ {
+			/*nonInductiveForLoops*/ true,
+			/*whileLoops*/ true,
+			/*doWhileLoops*/ true,
+			/*generalUniformIndexing*/ true,
+			/*generalAttributeMatrixVectorIndexing*/ true,
+			/*generalVaryingIndexing*/ true,
+			/*generalSamplerIndexing*/ true,
+			/*generalVariableIndexing*/ true,
+			/*generalConstantMatrixVectorIndexing*/ true,
+	}
+};
+
+static Vector<uint8_t> _compile_shader_glsl(RenderingDevice::ShaderStage p_stage, const String &p_source_code, RenderingDevice::ShaderLanguage p_language, String *r_error) {
+	Vector<uint8_t> ret;
+
+	ERR_FAIL_COND_V(p_language == RenderingDevice::SHADER_LANGUAGE_HLSL, ret);
+
+	EShLanguage stages[RenderingDevice::SHADER_STAGE_MAX] = {
+		EShLangVertex,
+		EShLangFragment,
+		EShLangTessControl,
+		EShLangTessEvaluation,
+		EShLangCompute
+	};
+
+	int ClientInputSemanticsVersion = 100; // maps to, say, #define VULKAN 100
+
+	glslang::EShTargetClientVersion VulkanClientVersion = glslang::EShTargetVulkan_1_0;
+	glslang::EShTargetLanguageVersion TargetVersion = glslang::EShTargetSpv_1_0;
+	glslang::TShader::ForbidIncluder includer;
+
+	glslang::TShader shader(stages[p_stage]);
+	CharString cs = p_source_code.ascii();
+	const char *cs_strings = cs.get_data();
+
+	shader.setStrings(&cs_strings, 1);
+	shader.setEnvInput(glslang::EShSourceGlsl, stages[p_stage], glslang::EShClientVulkan, ClientInputSemanticsVersion);
+	shader.setEnvClient(glslang::EShClientVulkan, VulkanClientVersion);
+	shader.setEnvTarget(glslang::EShTargetSpv, TargetVersion);
+
+	EShMessages messages = (EShMessages)(EShMsgSpvRules | EShMsgVulkanRules);
+	const int DefaultVersion = 100;
+	std::string pre_processed_code;
+
+	//preprocess
+	if (!shader.preprocess(&default_builtin_resource, DefaultVersion, ENoProfile, false, false, messages, &pre_processed_code, includer)) {
+		if (r_error) {
+			(*r_error) = "Failed pre-process:\n";
+			(*r_error) += shader.getInfoLog();
+			(*r_error) += "\n";
+			(*r_error) += shader.getInfoDebugLog();
+		}
+
+		return ret;
+	}
+	//set back..
+	cs_strings = pre_processed_code.c_str();
+	shader.setStrings(&cs_strings, 1);
+
+	//parse
+	if (!shader.parse(&default_builtin_resource, DefaultVersion, false, messages)) {
+		if (r_error) {
+			(*r_error) = "Failed parse:\n";
+			(*r_error) += shader.getInfoLog();
+			(*r_error) += "\n";
+			(*r_error) += shader.getInfoDebugLog();
+		}
+		return ret;
+	}
+
+	//link
+	glslang::TProgram program;
+	program.addShader(&shader);
+
+	if (!program.link(messages)) {
+		if (r_error) {
+			(*r_error) = "Failed link:\n";
+			(*r_error) += program.getInfoLog();
+			(*r_error) += "\n";
+			(*r_error) += program.getInfoDebugLog();
+		}
+
+		return ret;
+	}
+
+	std::vector<uint32_t> SpirV;
+	spv::SpvBuildLogger logger;
+	glslang::SpvOptions spvOptions;
+	glslang::GlslangToSpv(*program.getIntermediate(stages[p_stage]), SpirV, &logger, &spvOptions);
+
+	ret.resize(SpirV.size() * sizeof(uint32_t));
+	{
+		uint8_t *w = ret.ptrw();
+		copymem(w, &SpirV[0], SpirV.size() * sizeof(uint32_t));
+	}
+
+	return ret;
+}
+
+void preregister_glslang_types() {
+	// initialize in case it's not initialized. This is done once per thread
+	// and it's safe to call multiple times
+	glslang::InitializeProcess();
+	RenderingDevice::shader_set_compile_function(_compile_shader_glsl);
+}
+
+void register_glslang_types() {
+}
+
+void unregister_glslang_types() {
+	glslang::FinalizeProcess();
+}
diff --git a/modules/glslang/register_types.h b/modules/glslang/register_types.h
new file mode 100644
index 0000000000..2437e2b27a
--- /dev/null
+++ b/modules/glslang/register_types.h
@@ -0,0 +1,40 @@
+/*************************************************************************/
+/*  register_types.h                                                     */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef GLSLANG_REGISTER_TYPES_H
+#define GLSLANG_REGISTER_TYPES_H
+
+#define MODULE_GLSLANG_HAS_PREREGISTER
+
+void preregister_glslang_types();
+void register_glslang_types();
+void unregister_glslang_types();
+
+#endif // GLSLANG_REGISTER_TYPES_H
diff --git a/modules/gridmap/SCsub b/modules/gridmap/SCsub
index 62b8a0ff93..970ce534f0 100644
--- a/modules/gridmap/SCsub
+++ b/modules/gridmap/SCsub
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_gridmap = env_modules.Clone()
 
diff --git a/modules/gridmap/config.py b/modules/gridmap/config.py
index 5022116c9b..a6319fe1ea 100644
--- a/modules/gridmap/config.py
+++ b/modules/gridmap/config.py
@@ -1,13 +1,16 @@
 def can_build(env, platform):
     return True
 
+
 def configure(env):
     pass
 
+
 def get_doc_classes():
     return [
         "GridMap",
     ]
 
+
 def get_doc_path():
     return "doc_classes"
diff --git a/modules/gridmap/doc_classes/GridMap.xml b/modules/gridmap/doc_classes/GridMap.xml
index 37ebb3e5d5..57fbc5bfc0 100644
--- a/modules/gridmap/doc_classes/GridMap.xml
+++ b/modules/gridmap/doc_classes/GridMap.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GridMap" inherits="Spatial" version="4.0">
+<class name="GridMap" inherits="Node3D" version="4.0">
 	<brief_description>
 		Node for 3D tile-based maps.
 	</brief_description>
@@ -10,7 +10,7 @@
 		Internally, a GridMap is split into a sparse collection of octants for efficient rendering and physics processing. Every octant has the same dimensions and can contain several cells.
 	</description>
 	<tutorials>
-		<link>https://docs.godotengine.org/en/latest/tutorials/3d/using_gridmaps.html</link>
+		<link title="Using gridmaps">https://docs.godotengine.org/en/latest/tutorials/3d/using_gridmaps.html</link>
 	</tutorials>
 	<methods>
 		<method name="clear">
@@ -43,27 +43,19 @@
 		<method name="get_cell_item" qualifiers="const">
 			<return type="int">
 			</return>
-			<argument index="0" name="x" type="int">
-			</argument>
-			<argument index="1" name="y" type="int">
-			</argument>
-			<argument index="2" name="z" type="int">
+			<argument index="0" name="position" type="Vector3i">
 			</argument>
 			<description>
-				The [MeshLibrary] item index located at the grid-based X, Y and Z coordinates. If the cell is empty, [constant INVALID_CELL_ITEM] will be returned.
+				The [MeshLibrary] item index located at the given grid coordinates. If the cell is empty, [constant INVALID_CELL_ITEM] will be returned.
 			</description>
 		</method>
 		<method name="get_cell_item_orientation" qualifiers="const">
 			<return type="int">
 			</return>
-			<argument index="0" name="x" type="int">
-			</argument>
-			<argument index="1" name="y" type="int">
-			</argument>
-			<argument index="2" name="z" type="int">
+			<argument index="0" name="position" type="Vector3i">
 			</argument>
 			<description>
-				The orientation of the cell at the grid-based X, Y and Z coordinates. -1 is returned if the cell is empty.
+				The orientation of the cell at the given grid coordinates. [code]-1[/code] is returned if the cell is empty.
 			</description>
 		</method>
 		<method name="get_collision_layer_bit" qualifiers="const">
@@ -111,11 +103,7 @@
 		<method name="map_to_world" qualifiers="const">
 			<return type="Vector3">
 			</return>
-			<argument index="0" name="x" type="int">
-			</argument>
-			<argument index="1" name="y" type="int">
-			</argument>
-			<argument index="2" name="z" type="int">
+			<argument index="0" name="map_position" type="Vector3i">
 			</argument>
 			<description>
 				Returns the position of a grid cell in the GridMap's local coordinate space.
@@ -132,18 +120,14 @@
 		<method name="set_cell_item">
 			<return type="void">
 			</return>
-			<argument index="0" name="x" type="int">
-			</argument>
-			<argument index="1" name="y" type="int">
+			<argument index="0" name="position" type="Vector3i">
 			</argument>
-			<argument index="2" name="z" type="int">
+			<argument index="1" name="item" type="int">
 			</argument>
-			<argument index="3" name="item" type="int">
-			</argument>
-			<argument index="4" name="orientation" type="int" default="0">
+			<argument index="2" name="orientation" type="int" default="0">
 			</argument>
 			<description>
-				Sets the mesh index for the cell referenced by its grid-based X, Y and Z coordinates.
+				Sets the mesh index for the cell referenced by its grid coordinates.
 				A negative item index such as [constant INVALID_CELL_ITEM] will clear the cell.
 				Optionally, the item's orientation can be passed. For valid orientation values, see [method Basis.get_orthogonal_index].
 			</description>
@@ -185,9 +169,9 @@
 			</description>
 		</method>
 		<method name="world_to_map" qualifiers="const">
-			<return type="Vector3">
+			<return type="Vector3i">
 			</return>
-			<argument index="0" name="pos" type="Vector3">
+			<argument index="0" name="world_position" type="Vector3">
 			</argument>
 			<description>
 				Returns the coordinates of the grid cell containing the given point.
@@ -221,7 +205,7 @@
 			GridMaps act as static bodies, meaning they aren't affected by gravity or other forces. They only affect other physics bodies that collide with them.
 		</member>
 		<member name="collision_mask" type="int" setter="set_collision_mask" getter="get_collision_mask" default="1">
-			The physics layers this GridMap detects collisions in.
+			The physics layers this GridMap detects collisions in. See [url=https://docs.godotengine.org/en/latest/tutorials/physics/physics_introduction.html#collision-layers-and-masks]Collision layers and masks[/url] in the documentation for more information.
 		</member>
 		<member name="mesh_library" type="MeshLibrary" setter="set_mesh_library" getter="get_mesh_library">
 			The assigned [MeshLibrary].
diff --git a/modules/gridmap/doc_classes/README.md b/modules/gridmap/doc_classes/README.md
index b1ec9058c8..37ad93b6d3 100644
--- a/modules/gridmap/doc_classes/README.md
+++ b/modules/gridmap/doc_classes/README.md
@@ -1 +1 @@
-Doc classes will appear here when generating
\ No newline at end of file
+Doc classes will appear here when generating
diff --git a/modules/gridmap/grid_map.cpp b/modules/gridmap/grid_map.cpp
index 3d40220869..ccf1e49693 100644
--- a/modules/gridmap/grid_map.cpp
+++ b/modules/gridmap/grid_map.cpp
@@ -32,29 +32,26 @@
 
 #include "core/io/marshalls.h"
 #include "core/message_queue.h"
-#include "scene/3d/light.h"
+#include "scene/3d/light_3d.h"
 #include "scene/resources/mesh_library.h"
 #include "scene/resources/surface_tool.h"
 #include "scene/scene_string_names.h"
-#include "servers/visual_server.h"
+#include "servers/navigation_server_3d.h"
+#include "servers/rendering_server.h"
 
 bool GridMap::_set(const StringName &p_name, const Variant &p_value) {
-
 	String name = p_name;
 
 	if (name == "data") {
-
 		Dictionary d = p_value;
 
 		if (d.has("cells")) {
-
-			PoolVector<int> cells = d["cells"];
+			Vector<int> cells = d["cells"];
 			int amount = cells.size();
-			PoolVector<int>::Read r = cells.read();
+			const int *r = cells.ptr();
 			ERR_FAIL_COND_V(amount % 3, false); // not even
 			cell_map.clear();
 			for (int i = 0; i < amount / 3; i++) {
-
 				IndexKey ik;
 				ik.key = decode_uint64((const uint8_t *)&r[i * 3]);
 				Cell cell;
@@ -66,7 +63,6 @@ bool GridMap::_set(const StringName &p_name, const Variant &p_value) {
 		_recreate_octant_data();
 
 	} else if (name == "baked_meshes") {
-
 		clear_baked_meshes();
 
 		Array meshes = p_value;
@@ -75,12 +71,12 @@ bool GridMap::_set(const StringName &p_name, const Variant &p_value) {
 			BakedMesh bm;
 			bm.mesh = meshes[i];
 			ERR_CONTINUE(!bm.mesh.is_valid());
-			bm.instance = VS::get_singleton()->instance_create();
-			VS::get_singleton()->get_singleton()->instance_set_base(bm.instance, bm.mesh->get_rid());
-			VS::get_singleton()->instance_attach_object_instance_id(bm.instance, get_instance_id());
+			bm.instance = RS::get_singleton()->instance_create();
+			RS::get_singleton()->get_singleton()->instance_set_base(bm.instance, bm.mesh->get_rid());
+			RS::get_singleton()->instance_attach_object_instance_id(bm.instance, get_instance_id());
 			if (is_inside_tree()) {
-				VS::get_singleton()->instance_set_scenario(bm.instance, get_world()->get_scenario());
-				VS::get_singleton()->instance_set_transform(bm.instance, get_global_transform());
+				RS::get_singleton()->instance_set_scenario(bm.instance, get_world_3d()->get_scenario());
+				RS::get_singleton()->instance_set_transform(bm.instance, get_global_transform());
 			}
 			baked_meshes.push_back(bm);
 		}
@@ -95,20 +91,17 @@ bool GridMap::_set(const StringName &p_name, const Variant &p_value) {
 }
 
 bool GridMap::_get(const StringName &p_name, Variant &r_ret) const {
-
 	String name = p_name;
 
 	if (name == "data") {
-
 		Dictionary d;
 
-		PoolVector<int> cells;
+		Vector<int> cells;
 		cells.resize(cell_map.size() * 3);
 		{
-			PoolVector<int>::Write w = cells.write();
+			int *w = cells.ptrw();
 			int i = 0;
 			for (Map<IndexKey, Cell>::Element *E = cell_map.front(); E; E = E->next(), i++) {
-
 				encode_uint64(E->key().key, (uint8_t *)&w[i * 3]);
 				encode_uint32(E->get().cell, (uint8_t *)&w[i * 3 + 2]);
 			}
@@ -118,7 +111,6 @@ bool GridMap::_get(const StringName &p_name, Variant &r_ret) const {
 
 		r_ret = d;
 	} else if (name == "baked_meshes") {
-
 		Array ret;
 		ret.resize(baked_meshes.size());
 		for (int i = 0; i < baked_meshes.size(); i++) {
@@ -126,14 +118,14 @@ bool GridMap::_get(const StringName &p_name, Variant &r_ret) const {
 		}
 		r_ret = ret;
 
-	} else
+	} else {
 		return false;
+	}
 
 	return true;
 }
 
 void GridMap::_get_property_list(List<PropertyInfo> *p_list) const {
-
 	if (baked_meshes.size()) {
 		p_list->push_back(PropertyInfo(Variant::ARRAY, "baked_meshes", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
 	}
@@ -142,71 +134,65 @@ void GridMap::_get_property_list(List<PropertyInfo> *p_list) const {
 }
 
 void GridMap::set_collision_layer(uint32_t p_layer) {
-
 	collision_layer = p_layer;
 	_reset_physic_bodies_collision_filters();
 }
 
 uint32_t GridMap::get_collision_layer() const {
-
 	return collision_layer;
 }
 
 void GridMap::set_collision_mask(uint32_t p_mask) {
-
 	collision_mask = p_mask;
 	_reset_physic_bodies_collision_filters();
 }
 
 uint32_t GridMap::get_collision_mask() const {
-
 	return collision_mask;
 }
 
 void GridMap::set_collision_mask_bit(int p_bit, bool p_value) {
-
 	uint32_t mask = get_collision_mask();
-	if (p_value)
+	if (p_value) {
 		mask |= 1 << p_bit;
-	else
+	} else {
 		mask &= ~(1 << p_bit);
+	}
 	set_collision_mask(mask);
 }
 
 bool GridMap::get_collision_mask_bit(int p_bit) const {
-
 	return get_collision_mask() & (1 << p_bit);
 }
 
 void GridMap::set_collision_layer_bit(int p_bit, bool p_value) {
-
 	uint32_t mask = get_collision_layer();
-	if (p_value)
+	if (p_value) {
 		mask |= 1 << p_bit;
-	else
+	} else {
 		mask &= ~(1 << p_bit);
+	}
 	set_collision_layer(mask);
 }
 
 bool GridMap::get_collision_layer_bit(int p_bit) const {
-
 	return get_collision_layer() & (1 << p_bit);
 }
 
 void GridMap::set_mesh_library(const Ref<MeshLibrary> &p_mesh_library) {
-
-	if (!mesh_library.is_null())
+	if (!mesh_library.is_null()) {
 		mesh_library->unregister_owner(this);
+	}
 	mesh_library = p_mesh_library;
-	if (!mesh_library.is_null())
+	if (!mesh_library.is_null()) {
 		mesh_library->register_owner(this);
+	}
 
 	_recreate_octant_data();
 	_change_notify("mesh_library");
 }
 
 Ref<MeshLibrary> GridMap::get_mesh_library() const {
-
 	return mesh_library;
 }
 
@@ -216,24 +202,22 @@ void GridMap::set_cell_size(const Vector3 &p_size) {
 	_recreate_octant_data();
 	emit_signal("cell_size_changed", cell_size);
 }
-Vector3 GridMap::get_cell_size() const {
 
+Vector3 GridMap::get_cell_size() const {
 	return cell_size;
 }
 
 void GridMap::set_octant_size(int p_size) {
-
 	ERR_FAIL_COND(p_size == 0);
 	octant_size = p_size;
 	_recreate_octant_data();
 }
-int GridMap::get_octant_size() const {
 
+int GridMap::get_octant_size() const {
 	return octant_size;
 }
 
 void GridMap::set_center_x(bool p_enable) {
-
 	center_x = p_enable;
 	_recreate_octant_data();
 }
@@ -243,7 +227,6 @@ bool GridMap::get_center_x() const {
 }
 
 void GridMap::set_center_y(bool p_enable) {
-
 	center_y = p_enable;
 	_recreate_octant_data();
 }
@@ -253,7 +236,6 @@ bool GridMap::get_center_y() const {
 }
 
 void GridMap::set_center_z(bool p_enable) {
-
 	center_z = p_enable;
 	_recreate_octant_data();
 }
@@ -262,27 +244,26 @@ bool GridMap::get_center_z() const {
 	return center_z;
 }
 
-void GridMap::set_cell_item(int p_x, int p_y, int p_z, int p_item, int p_rot) {
-
+void GridMap::set_cell_item(const Vector3i &p_position, int p_item, int p_rot) {
 	if (baked_meshes.size() && !recreating_octants) {
 		//if you set a cell item, baked meshes go good bye
 		clear_baked_meshes();
 		_recreate_octant_data();
 	}
 
-	ERR_FAIL_INDEX(ABS(p_x), 1 << 20);
-	ERR_FAIL_INDEX(ABS(p_y), 1 << 20);
-	ERR_FAIL_INDEX(ABS(p_z), 1 << 20);
+	ERR_FAIL_INDEX(ABS(p_position.x), 1 << 20);
+	ERR_FAIL_INDEX(ABS(p_position.y), 1 << 20);
+	ERR_FAIL_INDEX(ABS(p_position.z), 1 << 20);
 
 	IndexKey key;
-	key.x = p_x;
-	key.y = p_y;
-	key.z = p_z;
+	key.x = p_position.x;
+	key.y = p_position.y;
+	key.z = p_position.z;
 
 	OctantKey ok;
-	ok.x = p_x / octant_size;
-	ok.y = p_y / octant_size;
-	ok.z = p_z / octant_size;
+	ok.x = p_position.x / octant_size;
+	ok.y = p_position.y / octant_size;
+	ok.z = p_position.z / octant_size;
 
 	if (p_item < 0) {
 		//erase
@@ -305,17 +286,16 @@ void GridMap::set_cell_item(int p_x, int p_y, int p_z, int p_item, int p_rot) {
 		//create octant because it does not exist
 		Octant *g = memnew(Octant);
 		g->dirty = true;
-		g->static_body = PhysicsServer::get_singleton()->body_create(PhysicsServer::BODY_MODE_STATIC);
-		PhysicsServer::get_singleton()->body_attach_object_instance_id(g->static_body, get_instance_id());
-		PhysicsServer::get_singleton()->body_set_collision_layer(g->static_body, collision_layer);
-		PhysicsServer::get_singleton()->body_set_collision_mask(g->static_body, collision_mask);
+		g->static_body = PhysicsServer3D::get_singleton()->body_create(PhysicsServer3D::BODY_MODE_STATIC);
+		PhysicsServer3D::get_singleton()->body_attach_object_instance_id(g->static_body, get_instance_id());
+		PhysicsServer3D::get_singleton()->body_set_collision_layer(g->static_body, collision_layer);
+		PhysicsServer3D::get_singleton()->body_set_collision_mask(g->static_body, collision_mask);
 		SceneTree *st = SceneTree::get_singleton();
 
 		if (st && st->is_debugging_collisions_hint()) {
-
-			g->collision_debug = VisualServer::get_singleton()->mesh_create();
-			g->collision_debug_instance = VisualServer::get_singleton()->instance_create();
-			VisualServer::get_singleton()->instance_set_base(g->collision_debug_instance, g->collision_debug);
+			g->collision_debug = RenderingServer::get_singleton()->mesh_create();
+			g->collision_debug_instance = RenderingServer::get_singleton()->instance_create();
+			RenderingServer::get_singleton()->instance_set_base(g->collision_debug_instance, g->collision_debug);
 		}
 
 		octant_map[octantkey] = g;
@@ -338,99 +318,95 @@ void GridMap::set_cell_item(int p_x, int p_y, int p_z, int p_item, int p_rot) {
 	cell_map[key] = c;
 }
 
-int GridMap::get_cell_item(int p_x, int p_y, int p_z) const {
-
-	ERR_FAIL_INDEX_V(ABS(p_x), 1 << 20, INVALID_CELL_ITEM);
-	ERR_FAIL_INDEX_V(ABS(p_y), 1 << 20, INVALID_CELL_ITEM);
-	ERR_FAIL_INDEX_V(ABS(p_z), 1 << 20, INVALID_CELL_ITEM);
+int GridMap::get_cell_item(const Vector3i &p_position) const {
+	ERR_FAIL_INDEX_V(ABS(p_position.x), 1 << 20, INVALID_CELL_ITEM);
+	ERR_FAIL_INDEX_V(ABS(p_position.y), 1 << 20, INVALID_CELL_ITEM);
+	ERR_FAIL_INDEX_V(ABS(p_position.z), 1 << 20, INVALID_CELL_ITEM);
 
 	IndexKey key;
-	key.x = p_x;
-	key.y = p_y;
-	key.z = p_z;
+	key.x = p_position.x;
+	key.y = p_position.y;
+	key.z = p_position.z;
 
-	if (!cell_map.has(key))
+	if (!cell_map.has(key)) {
 		return INVALID_CELL_ITEM;
+	}
 	return cell_map[key].item;
 }
 
-int GridMap::get_cell_item_orientation(int p_x, int p_y, int p_z) const {
-
-	ERR_FAIL_INDEX_V(ABS(p_x), 1 << 20, -1);
-	ERR_FAIL_INDEX_V(ABS(p_y), 1 << 20, -1);
-	ERR_FAIL_INDEX_V(ABS(p_z), 1 << 20, -1);
+int GridMap::get_cell_item_orientation(const Vector3i &p_position) const {
+	ERR_FAIL_INDEX_V(ABS(p_position.x), 1 << 20, -1);
+	ERR_FAIL_INDEX_V(ABS(p_position.y), 1 << 20, -1);
+	ERR_FAIL_INDEX_V(ABS(p_position.z), 1 << 20, -1);
 
 	IndexKey key;
-	key.x = p_x;
-	key.y = p_y;
-	key.z = p_z;
+	key.x = p_position.x;
+	key.y = p_position.y;
+	key.z = p_position.z;
 
-	if (!cell_map.has(key))
+	if (!cell_map.has(key)) {
 		return -1;
+	}
 	return cell_map[key].rot;
 }
 
-Vector3 GridMap::world_to_map(const Vector3 &p_world_pos) const {
-	Vector3 map_pos = p_world_pos / cell_size;
-	map_pos.x = floor(map_pos.x);
-	map_pos.y = floor(map_pos.y);
-	map_pos.z = floor(map_pos.z);
-	return map_pos;
+Vector3i GridMap::world_to_map(const Vector3 &p_world_position) const {
+	Vector3 map_position = p_world_position / cell_size;
+	map_position.x = floor(map_position.x);
+	map_position.y = floor(map_position.y);
+	map_position.z = floor(map_position.z);
+	return Vector3i(map_position);
 }
 
-Vector3 GridMap::map_to_world(int p_x, int p_y, int p_z) const {
+Vector3 GridMap::map_to_world(const Vector3i &p_map_position) const {
 	Vector3 offset = _get_offset();
 	Vector3 world_pos(
-			p_x * cell_size.x + offset.x,
-			p_y * cell_size.y + offset.y,
-			p_z * cell_size.z + offset.z);
+			p_map_position.x * cell_size.x + offset.x,
+			p_map_position.y * cell_size.y + offset.y,
+			p_map_position.z * cell_size.z + offset.z);
 	return world_pos;
 }
 
 void GridMap::_octant_transform(const OctantKey &p_key) {
-
 	ERR_FAIL_COND(!octant_map.has(p_key));
 	Octant &g = *octant_map[p_key];
-	PhysicsServer::get_singleton()->body_set_state(g.static_body, PhysicsServer::BODY_STATE_TRANSFORM, get_global_transform());
+	PhysicsServer3D::get_singleton()->body_set_state(g.static_body, PhysicsServer3D::BODY_STATE_TRANSFORM, get_global_transform());
 
 	if (g.collision_debug_instance.is_valid()) {
-		VS::get_singleton()->instance_set_transform(g.collision_debug_instance, get_global_transform());
+		RS::get_singleton()->instance_set_transform(g.collision_debug_instance, get_global_transform());
 	}
 
 	for (int i = 0; i < g.multimesh_instances.size(); i++) {
-		VS::get_singleton()->instance_set_transform(g.multimesh_instances[i].instance, get_global_transform());
+		RS::get_singleton()->instance_set_transform(g.multimesh_instances[i].instance, get_global_transform());
 	}
 }
 
 bool GridMap::_octant_update(const OctantKey &p_key) {
 	ERR_FAIL_COND_V(!octant_map.has(p_key), false);
 	Octant &g = *octant_map[p_key];
-	if (!g.dirty)
+	if (!g.dirty) {
 		return false;
+	}
 
 	//erase body shapes
-	PhysicsServer::get_singleton()->body_clear_shapes(g.static_body);
+	PhysicsServer3D::get_singleton()->body_clear_shapes(g.static_body);
 
 	//erase body shapes debug
 	if (g.collision_debug.is_valid()) {
-
-		VS::get_singleton()->mesh_clear(g.collision_debug);
+		RS::get_singleton()->mesh_clear(g.collision_debug);
 	}
 
 	//erase navigation
-	if (navigation) {
-		for (Map<IndexKey, Octant::NavMesh>::Element *E = g.navmesh_ids.front(); E; E = E->next()) {
-			navigation->navmesh_remove(E->get().id);
-		}
-		g.navmesh_ids.clear();
+	for (Map<IndexKey, Octant::NavMesh>::Element *E = g.navmesh_ids.front(); E; E = E->next()) {
+		NavigationServer3D::get_singleton()->free(E->get().region);
 	}
+	g.navmesh_ids.clear();
 
 	//erase multimeshes
 
 	for (int i = 0; i < g.multimesh_instances.size(); i++) {
-
-		VS::get_singleton()->free(g.multimesh_instances[i].instance);
-		VS::get_singleton()->free(g.multimesh_instances[i].multimesh);
+		RS::get_singleton()->free(g.multimesh_instances[i].instance);
+		RS::get_singleton()->free(g.multimesh_instances[i].multimesh);
 	}
 	g.multimesh_instances.clear();
 
@@ -440,7 +416,7 @@ bool GridMap::_octant_update(const OctantKey &p_key) {
 		return true;
 	}
 
-	PoolVector<Vector3> col_debug;
+	Vector<Vector3> col_debug;
 
 	/*
 	 * foreach item in this octant,
@@ -448,15 +424,15 @@ bool GridMap::_octant_update(const OctantKey &p_key) {
 	 * and set said multimesh bounding box to one containing all cells which have this item
 	 */
 
-	Map<int, List<Pair<Transform, IndexKey> > > multimesh_items;
+	Map<int, List<Pair<Transform, IndexKey>>> multimesh_items;
 
 	for (Set<IndexKey>::Element *E = g.cells.front(); E; E = E->next()) {
-
 		ERR_CONTINUE(!cell_map.has(E->get()));
 		const Cell &c = cell_map[E->get()];
 
-		if (!mesh_library.is_valid() || !mesh_library->has_item(c.item))
+		if (!mesh_library.is_valid() || !mesh_library->has_item(c.item)) {
 			continue;
+		}
 
 		Vector3 cellpos = Vector3(E->get().x, E->get().y, E->get().z);
 		Vector3 ofs = _get_offset();
@@ -469,7 +445,7 @@ bool GridMap::_octant_update(const OctantKey &p_key) {
 		if (baked_meshes.size() == 0) {
 			if (mesh_library->get_item_mesh(c.item).is_valid()) {
 				if (!multimesh_items.has(c.item)) {
-					multimesh_items[c.item] = List<Pair<Transform, IndexKey> >();
+					multimesh_items[c.item] = List<Pair<Transform, IndexKey>>();
 				}
 
 				Pair<Transform, IndexKey> p;
@@ -483,9 +459,10 @@ bool GridMap::_octant_update(const OctantKey &p_key) {
 		// add the item's shape at given xform to octant's static_body
 		for (int i = 0; i < shapes.size(); i++) {
 			// add the item's shape
-			if (!shapes[i].shape.is_valid())
+			if (!shapes[i].shape.is_valid()) {
 				continue;
-			PhysicsServer::get_singleton()->body_add_shape(g.static_body, shapes[i].shape->get_rid(), xform * shapes[i].local_transform);
+			}
+			PhysicsServer3D::get_singleton()->body_add_shape(g.static_body, shapes[i].shape->get_rid(), xform * shapes[i].local_transform);
 			if (g.collision_debug.is_valid()) {
 				shapes.write[i].shape->add_vertices_to_array(col_debug, xform * shapes[i].local_transform);
 			}
@@ -498,9 +475,11 @@ bool GridMap::_octant_update(const OctantKey &p_key) {
 			nm.xform = xform * mesh_library->get_item_navmesh_transform(c.item);
 
 			if (navigation) {
-				nm.id = navigation->navmesh_add(navmesh, xform, this);
-			} else {
-				nm.id = -1;
+				RID region = NavigationServer3D::get_singleton()->region_create();
+				NavigationServer3D::get_singleton()->region_set_navmesh(region, navmesh);
+				NavigationServer3D::get_singleton()->region_set_transform(region, navigation->get_global_transform() * nm.xform);
+				NavigationServer3D::get_singleton()->region_set_map(region, navigation->get_rid());
+				nm.region = region;
 			}
 			g.navmesh_ids[E->get()] = nm;
 		}
@@ -508,17 +487,16 @@ bool GridMap::_octant_update(const OctantKey &p_key) {
 
 	//update multimeshes, only if not baked
 	if (baked_meshes.size() == 0) {
-
-		for (Map<int, List<Pair<Transform, IndexKey> > >::Element *E = multimesh_items.front(); E; E = E->next()) {
+		for (Map<int, List<Pair<Transform, IndexKey>>>::Element *E = multimesh_items.front(); E; E = E->next()) {
 			Octant::MultimeshInstance mmi;
 
-			RID mm = VS::get_singleton()->multimesh_create();
-			VS::get_singleton()->multimesh_allocate(mm, E->get().size(), VS::MULTIMESH_TRANSFORM_3D, VS::MULTIMESH_COLOR_NONE);
-			VS::get_singleton()->multimesh_set_mesh(mm, mesh_library->get_item_mesh(E->key())->get_rid());
+			RID mm = RS::get_singleton()->multimesh_create();
+			RS::get_singleton()->multimesh_allocate(mm, E->get().size(), RS::MULTIMESH_TRANSFORM_3D);
+			RS::get_singleton()->multimesh_set_mesh(mm, mesh_library->get_item_mesh(E->key())->get_rid());
 
 			int idx = 0;
-			for (List<Pair<Transform, IndexKey> >::Element *F = E->get().front(); F; F = F->next()) {
-				VS::get_singleton()->multimesh_instance_set_transform(mm, idx, F->get().first);
+			for (List<Pair<Transform, IndexKey>>::Element *F = E->get().front(); F; F = F->next()) {
+				RS::get_singleton()->multimesh_instance_set_transform(mm, idx, F->get().first);
 #ifdef TOOLS_ENABLED
 
 				Octant::MultimeshInstance::Item it;
@@ -531,12 +509,12 @@ bool GridMap::_octant_update(const OctantKey &p_key) {
 				idx++;
 			}
 
-			RID instance = VS::get_singleton()->instance_create();
-			VS::get_singleton()->instance_set_base(instance, mm);
+			RID instance = RS::get_singleton()->instance_create();
+			RS::get_singleton()->instance_set_base(instance, mm);
 
 			if (is_inside_tree()) {
-				VS::get_singleton()->instance_set_scenario(instance, get_world()->get_scenario());
-				VS::get_singleton()->instance_set_transform(instance, get_global_transform());
+				RS::get_singleton()->instance_set_scenario(instance, get_world_3d()->get_scenario());
+				RS::get_singleton()->instance_set_transform(instance, get_global_transform());
 			}
 
 			mmi.multimesh = mm;
@@ -547,15 +525,14 @@ bool GridMap::_octant_update(const OctantKey &p_key) {
 	}
 
 	if (col_debug.size()) {
-
 		Array arr;
-		arr.resize(VS::ARRAY_MAX);
-		arr[VS::ARRAY_VERTEX] = col_debug;
+		arr.resize(RS::ARRAY_MAX);
+		arr[RS::ARRAY_VERTEX] = col_debug;
 
-		VS::get_singleton()->mesh_add_surface_from_arrays(g.collision_debug, VS::PRIMITIVE_LINES, arr);
+		RS::get_singleton()->mesh_add_surface_from_arrays(g.collision_debug, RS::PRIMITIVE_LINES, arr);
 		SceneTree *st = SceneTree::get_singleton();
 		if (st) {
-			VS::get_singleton()->mesh_surface_set_material(g.collision_debug, 0, st->get_debug_collision_material()->get_rid());
+			RS::get_singleton()->mesh_surface_set_material(g.collision_debug, 0, st->get_debug_collision_material()->get_rid());
 		}
 	}
 
@@ -566,35 +543,37 @@ bool GridMap::_octant_update(const OctantKey &p_key) {
 
 void GridMap::_reset_physic_bodies_collision_filters() {
 	for (Map<OctantKey, Octant *>::Element *E = octant_map.front(); E; E = E->next()) {
-		PhysicsServer::get_singleton()->body_set_collision_layer(E->get()->static_body, collision_layer);
-		PhysicsServer::get_singleton()->body_set_collision_mask(E->get()->static_body, collision_mask);
+		PhysicsServer3D::get_singleton()->body_set_collision_layer(E->get()->static_body, collision_layer);
+		PhysicsServer3D::get_singleton()->body_set_collision_mask(E->get()->static_body, collision_mask);
 	}
 }
 
 void GridMap::_octant_enter_world(const OctantKey &p_key) {
-
 	ERR_FAIL_COND(!octant_map.has(p_key));
 	Octant &g = *octant_map[p_key];
-	PhysicsServer::get_singleton()->body_set_state(g.static_body, PhysicsServer::BODY_STATE_TRANSFORM, get_global_transform());
-	PhysicsServer::get_singleton()->body_set_space(g.static_body, get_world()->get_space());
+	PhysicsServer3D::get_singleton()->body_set_state(g.static_body, PhysicsServer3D::BODY_STATE_TRANSFORM, get_global_transform());
+	PhysicsServer3D::get_singleton()->body_set_space(g.static_body, get_world_3d()->get_space());
 
 	if (g.collision_debug_instance.is_valid()) {
-		VS::get_singleton()->instance_set_scenario(g.collision_debug_instance, get_world()->get_scenario());
-		VS::get_singleton()->instance_set_transform(g.collision_debug_instance, get_global_transform());
+		RS::get_singleton()->instance_set_scenario(g.collision_debug_instance, get_world_3d()->get_scenario());
+		RS::get_singleton()->instance_set_transform(g.collision_debug_instance, get_global_transform());
 	}
 
 	for (int i = 0; i < g.multimesh_instances.size(); i++) {
-		VS::get_singleton()->instance_set_scenario(g.multimesh_instances[i].instance, get_world()->get_scenario());
-		VS::get_singleton()->instance_set_transform(g.multimesh_instances[i].instance, get_global_transform());
+		RS::get_singleton()->instance_set_scenario(g.multimesh_instances[i].instance, get_world_3d()->get_scenario());
+		RS::get_singleton()->instance_set_transform(g.multimesh_instances[i].instance, get_global_transform());
 	}
 
 	if (navigation && mesh_library.is_valid()) {
 		for (Map<IndexKey, Octant::NavMesh>::Element *F = g.navmesh_ids.front(); F; F = F->next()) {
-
-			if (cell_map.has(F->key()) && F->get().id < 0) {
+			if (cell_map.has(F->key()) && F->get().region.is_valid() == false) {
 				Ref<NavigationMesh> nm = mesh_library->get_item_navmesh(cell_map[F->key()].item);
 				if (nm.is_valid()) {
-					F->get().id = navigation->navmesh_add(nm, F->get().xform, this);
+					RID region = NavigationServer3D::get_singleton()->region_create();
+					NavigationServer3D::get_singleton()->region_set_navmesh(region, nm);
+					NavigationServer3D::get_singleton()->region_set_transform(region, navigation->get_global_transform() * F->get().xform);
+					NavigationServer3D::get_singleton()->region_set_map(region, navigation->get_rid());
+					F->get().region = region;
 				}
 			}
 		}
@@ -602,76 +581,68 @@ void GridMap::_octant_enter_world(const OctantKey &p_key) {
 }
 
 void GridMap::_octant_exit_world(const OctantKey &p_key) {
-
 	ERR_FAIL_COND(!octant_map.has(p_key));
 	Octant &g = *octant_map[p_key];
-	PhysicsServer::get_singleton()->body_set_state(g.static_body, PhysicsServer::BODY_STATE_TRANSFORM, get_global_transform());
-	PhysicsServer::get_singleton()->body_set_space(g.static_body, RID());
+	PhysicsServer3D::get_singleton()->body_set_state(g.static_body, PhysicsServer3D::BODY_STATE_TRANSFORM, get_global_transform());
+	PhysicsServer3D::get_singleton()->body_set_space(g.static_body, RID());
 
 	if (g.collision_debug_instance.is_valid()) {
-
-		VS::get_singleton()->instance_set_scenario(g.collision_debug_instance, RID());
+		RS::get_singleton()->instance_set_scenario(g.collision_debug_instance, RID());
 	}
 
 	for (int i = 0; i < g.multimesh_instances.size(); i++) {
-		VS::get_singleton()->instance_set_scenario(g.multimesh_instances[i].instance, RID());
+		RS::get_singleton()->instance_set_scenario(g.multimesh_instances[i].instance, RID());
 	}
 
 	if (navigation) {
 		for (Map<IndexKey, Octant::NavMesh>::Element *F = g.navmesh_ids.front(); F; F = F->next()) {
-
-			if (F->get().id >= 0) {
-				navigation->navmesh_remove(F->get().id);
-				F->get().id = -1;
+			if (F->get().region.is_valid()) {
+				NavigationServer3D::get_singleton()->free(F->get().region);
+				F->get().region = RID();
 			}
 		}
 	}
 }
 
 void GridMap::_octant_clean_up(const OctantKey &p_key) {
-
 	ERR_FAIL_COND(!octant_map.has(p_key));
 	Octant &g = *octant_map[p_key];
 
-	if (g.collision_debug.is_valid())
-		VS::get_singleton()->free(g.collision_debug);
-	if (g.collision_debug_instance.is_valid())
-		VS::get_singleton()->free(g.collision_debug_instance);
+	if (g.collision_debug.is_valid()) {
+		RS::get_singleton()->free(g.collision_debug);
+	}
+	if (g.collision_debug_instance.is_valid()) {
+		RS::get_singleton()->free(g.collision_debug_instance);
+	}
 
-	PhysicsServer::get_singleton()->free(g.static_body);
+	PhysicsServer3D::get_singleton()->free(g.static_body);
 
-	//erase navigation
-	if (navigation) {
-		for (Map<IndexKey, Octant::NavMesh>::Element *E = g.navmesh_ids.front(); E; E = E->next()) {
-			navigation->navmesh_remove(E->get().id);
-		}
-		g.navmesh_ids.clear();
+	// Erase navigation
+	for (Map<IndexKey, Octant::NavMesh>::Element *E = g.navmesh_ids.front(); E; E = E->next()) {
+		NavigationServer3D::get_singleton()->free(E->get().region);
 	}
+	g.navmesh_ids.clear();
 
 	//erase multimeshes
 
 	for (int i = 0; i < g.multimesh_instances.size(); i++) {
-
-		VS::get_singleton()->free(g.multimesh_instances[i].instance);
-		VS::get_singleton()->free(g.multimesh_instances[i].multimesh);
+		RS::get_singleton()->free(g.multimesh_instances[i].instance);
+		RS::get_singleton()->free(g.multimesh_instances[i].multimesh);
 	}
 	g.multimesh_instances.clear();
 }
 
 void GridMap::_notification(int p_what) {
-
 	switch (p_what) {
-
 		case NOTIFICATION_ENTER_WORLD: {
-
-			Spatial *c = this;
+			Node3D *c = this;
 			while (c) {
-				navigation = Object::cast_to<Navigation>(c);
+				navigation = Object::cast_to<Navigation3D>(c);
 				if (navigation) {
 					break;
 				}
 
-				c = Object::cast_to<Spatial>(c->get_parent());
+				c = Object::cast_to<Node3D>(c->get_parent());
 			}
 
 			last_transform = get_global_transform();
@@ -681,16 +652,16 @@ void GridMap::_notification(int p_what) {
 			}
 
 			for (int i = 0; i < baked_meshes.size(); i++) {
-				VS::get_singleton()->instance_set_scenario(baked_meshes[i].instance, get_world()->get_scenario());
-				VS::get_singleton()->instance_set_transform(baked_meshes[i].instance, get_global_transform());
+				RS::get_singleton()->instance_set_scenario(baked_meshes[i].instance, get_world_3d()->get_scenario());
+				RS::get_singleton()->instance_set_transform(baked_meshes[i].instance, get_global_transform());
 			}
 
 		} break;
 		case NOTIFICATION_TRANSFORM_CHANGED: {
-
 			Transform new_xform = get_global_transform();
-			if (new_xform == last_transform)
+			if (new_xform == last_transform) {
 				break;
+			}
 			//update run
 			for (Map<OctantKey, Octant *>::Element *E = octant_map.front(); E; E = E->next()) {
 				_octant_transform(E->key());
@@ -699,23 +670,22 @@ void GridMap::_notification(int p_what) {
 			last_transform = new_xform;
 
 			for (int i = 0; i < baked_meshes.size(); i++) {
-				VS::get_singleton()->instance_set_transform(baked_meshes[i].instance, get_global_transform());
+				RS::get_singleton()->instance_set_transform(baked_meshes[i].instance, get_global_transform());
 			}
 
 		} break;
 		case NOTIFICATION_EXIT_WORLD: {
-
 			for (Map<OctantKey, Octant *>::Element *E = octant_map.front(); E; E = E->next()) {
 				_octant_exit_world(E->key());
 			}
 
-			navigation = NULL;
+			navigation = nullptr;
 
 			//_queue_octants_dirty(MAP_DIRTY_INSTANCES|MAP_DIRTY_TRANSFORMS);
 			//_update_octants_callback();
 			//_update_area_instances();
 			for (int i = 0; i < baked_meshes.size(); i++) {
-				VS::get_singleton()->instance_set_scenario(baked_meshes[i].instance, RID());
+				RS::get_singleton()->instance_set_scenario(baked_meshes[i].instance, RID());
 			}
 
 		} break;
@@ -726,8 +696,9 @@ void GridMap::_notification(int p_what) {
 }
 
 void GridMap::_update_visibility() {
-	if (!is_inside_tree())
+	if (!is_inside_tree()) {
 		return;
+	}
 
 	_change_notify("visible");
 
@@ -735,37 +706,35 @@ void GridMap::_update_visibility() {
 		Octant *octant = e->value();
 		for (int i = 0; i < octant->multimesh_instances.size(); i++) {
 			const Octant::MultimeshInstance &mi = octant->multimesh_instances[i];
-			VS::get_singleton()->instance_set_visible(mi.instance, is_visible());
+			RS::get_singleton()->instance_set_visible(mi.instance, is_visible());
 		}
 	}
 }
 
 void GridMap::_queue_octants_dirty() {
-
-	if (awaiting_update)
+	if (awaiting_update) {
 		return;
+	}
 
 	MessageQueue::get_singleton()->push_call(this, "_update_octants_callback");
 	awaiting_update = true;
 }
 
 void GridMap::_recreate_octant_data() {
-
 	recreating_octants = true;
 	Map<IndexKey, Cell> cell_copy = cell_map;
 	_clear_internal();
 	for (Map<IndexKey, Cell>::Element *E = cell_copy.front(); E; E = E->next()) {
-
-		set_cell_item(E->key().x, E->key().y, E->key().z, E->get().item, E->get().rot);
+		set_cell_item(Vector3i(E->key()), E->get().item, E->get().rot);
 	}
 	recreating_octants = false;
 }
 
 void GridMap::_clear_internal() {
-
 	for (Map<OctantKey, Octant *>::Element *E = octant_map.front(); E; E = E->next()) {
-		if (is_inside_world())
+		if (is_inside_world()) {
 			_octant_exit_world(E->key());
+		}
 
 		_octant_clean_up(E->key());
 		memdelete(E->get());
@@ -776,24 +745,21 @@ void GridMap::_clear_internal() {
 }
 
 void GridMap::clear() {
-
 	_clear_internal();
 	clear_baked_meshes();
 }
 
 void GridMap::resource_changed(const RES &p_res) {
-
 	_recreate_octant_data();
 }
 
 void GridMap::_update_octants_callback() {
-
-	if (!awaiting_update)
+	if (!awaiting_update) {
 		return;
+	}
 
 	List<OctantKey> to_delete;
 	for (Map<OctantKey, Octant *>::Element *E = octant_map.front(); E; E = E->next()) {
-
 		if (_octant_update(E->key())) {
 			to_delete.push_back(E->key());
 		}
@@ -809,7 +775,6 @@ void GridMap::_update_octants_callback() {
 }
 
 void GridMap::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_collision_layer", "layer"), &GridMap::set_collision_layer);
 	ClassDB::bind_method(D_METHOD("get_collision_layer"), &GridMap::get_collision_layer);
 
@@ -834,12 +799,12 @@ void GridMap::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_octant_size", "size"), &GridMap::set_octant_size);
 	ClassDB::bind_method(D_METHOD("get_octant_size"), &GridMap::get_octant_size);
 
-	ClassDB::bind_method(D_METHOD("set_cell_item", "x", "y", "z", "item", "orientation"), &GridMap::set_cell_item, DEFVAL(0));
-	ClassDB::bind_method(D_METHOD("get_cell_item", "x", "y", "z"), &GridMap::get_cell_item);
-	ClassDB::bind_method(D_METHOD("get_cell_item_orientation", "x", "y", "z"), &GridMap::get_cell_item_orientation);
+	ClassDB::bind_method(D_METHOD("set_cell_item", "position", "item", "orientation"), &GridMap::set_cell_item, DEFVAL(0));
+	ClassDB::bind_method(D_METHOD("get_cell_item", "position"), &GridMap::get_cell_item);
+	ClassDB::bind_method(D_METHOD("get_cell_item_orientation", "position"), &GridMap::get_cell_item_orientation);
 
-	ClassDB::bind_method(D_METHOD("world_to_map", "pos"), &GridMap::world_to_map);
-	ClassDB::bind_method(D_METHOD("map_to_world", "x", "y", "z"), &GridMap::map_to_world);
+	ClassDB::bind_method(D_METHOD("world_to_map", "world_position"), &GridMap::world_to_map);
+	ClassDB::bind_method(D_METHOD("map_to_world", "map_position"), &GridMap::map_to_world);
 
 	ClassDB::bind_method(D_METHOD("_update_octants_callback"), &GridMap::_update_octants_callback);
 	ClassDB::bind_method(D_METHOD("resource_changed", "resource"), &GridMap::resource_changed);
@@ -871,7 +836,7 @@ void GridMap::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "cell_center_x"), "set_center_x", "get_center_x");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "cell_center_y"), "set_center_y", "get_center_y");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "cell_center_z"), "set_center_z", "get_center_z");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "cell_scale"), "set_cell_scale", "get_cell_scale");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "cell_scale"), "set_cell_scale", "get_cell_scale");
 	ADD_GROUP("Collision", "collision_");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "collision_layer", PROPERTY_HINT_LAYERS_3D_PHYSICS), "set_collision_layer", "get_collision_layer");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "collision_mask", PROPERTY_HINT_LAYERS_3D_PHYSICS), "set_collision_mask", "get_collision_mask");
@@ -882,11 +847,12 @@ void GridMap::_bind_methods() {
 }
 
 void GridMap::set_clip(bool p_enabled, bool p_clip_above, int p_floor, Vector3::Axis p_axis) {
-
-	if (!p_enabled && !clip)
+	if (!p_enabled && !clip) {
 		return;
-	if (clip && p_enabled && clip_floor == p_floor && p_clip_above == clip_above && p_axis == clip_axis)
+	}
+	if (clip && p_enabled && clip_floor == p_floor && p_clip_above == clip_above && p_axis == clip_axis) {
 		return;
+	}
 
 	clip = p_enabled;
 	clip_floor = p_floor;
@@ -895,7 +861,6 @@ void GridMap::set_clip(bool p_enabled, bool p_clip_above, int p_floor, Vector3::
 
 	//make it all update
 	for (Map<OctantKey, Octant *>::Element *E = octant_map.front(); E; E = E->next()) {
-
 		Octant *g = E->get();
 		g->dirty = true;
 	}
@@ -904,18 +869,15 @@ void GridMap::set_clip(bool p_enabled, bool p_clip_above, int p_floor, Vector3::
 }
 
 void GridMap::set_cell_scale(float p_scale) {
-
 	cell_scale = p_scale;
 	_recreate_octant_data();
 }
 
 float GridMap::get_cell_scale() const {
-
 	return cell_scale;
 }
 
 Array GridMap::get_used_cells() const {
-
 	Array a;
 	a.resize(cell_map.size());
 	int i = 0;
@@ -928,21 +890,22 @@ Array GridMap::get_used_cells() const {
 }
 
 Array GridMap::get_meshes() {
-
-	if (mesh_library.is_null())
+	if (mesh_library.is_null()) {
 		return Array();
+	}
 
 	Vector3 ofs = _get_offset();
 	Array meshes;
 
 	for (Map<IndexKey, Cell>::Element *E = cell_map.front(); E; E = E->next()) {
-
 		int id = E->get().item;
-		if (!mesh_library->has_item(id))
+		if (!mesh_library->has_item(id)) {
 			continue;
+		}
 		Ref<Mesh> mesh = mesh_library->get_item_mesh(id);
-		if (mesh.is_null())
+		if (mesh.is_null()) {
 			continue;
+		}
 
 		IndexKey ik = E->key();
 
@@ -970,9 +933,8 @@ Vector3 GridMap::_get_offset() const {
 }
 
 void GridMap::clear_baked_meshes() {
-
 	for (int i = 0; i < baked_meshes.size(); i++) {
-		VS::get_singleton()->free(baked_meshes[i].instance);
+		RS::get_singleton()->free(baked_meshes[i].instance);
 	}
 	baked_meshes.clear();
 
@@ -980,24 +942,25 @@ void GridMap::clear_baked_meshes() {
 }
 
 void GridMap::make_baked_meshes(bool p_gen_lightmap_uv, float p_lightmap_uv_texel_size) {
-
-	if (!mesh_library.is_valid())
+	if (!mesh_library.is_valid()) {
 		return;
+	}
 
 	//generate
-	Map<OctantKey, Map<Ref<Material>, Ref<SurfaceTool> > > surface_map;
+	Map<OctantKey, Map<Ref<Material>, Ref<SurfaceTool>>> surface_map;
 
 	for (Map<IndexKey, Cell>::Element *E = cell_map.front(); E; E = E->next()) {
-
 		IndexKey key = E->key();
 
 		int item = E->get().item;
-		if (!mesh_library->has_item(item))
+		if (!mesh_library->has_item(item)) {
 			continue;
+		}
 
 		Ref<Mesh> mesh = mesh_library->get_item_mesh(item);
-		if (!mesh.is_valid())
+		if (!mesh.is_valid()) {
 			continue;
+		}
 
 		Vector3 cellpos = Vector3(key.x, key.y, key.z);
 		Vector3 ofs = _get_offset();
@@ -1014,15 +977,15 @@ void GridMap::make_baked_meshes(bool p_gen_lightmap_uv, float p_lightmap_uv_texe
 		ok.z = key.z / octant_size;
 
 		if (!surface_map.has(ok)) {
-			surface_map[ok] = Map<Ref<Material>, Ref<SurfaceTool> >();
+			surface_map[ok] = Map<Ref<Material>, Ref<SurfaceTool>>();
 		}
 
-		Map<Ref<Material>, Ref<SurfaceTool> > &mat_map = surface_map[ok];
+		Map<Ref<Material>, Ref<SurfaceTool>> &mat_map = surface_map[ok];
 
 		for (int i = 0; i < mesh->get_surface_count(); i++) {
-
-			if (mesh->surface_get_primitive_type(i) != Mesh::PRIMITIVE_TRIANGLES)
+			if (mesh->surface_get_primitive_type(i) != Mesh::PRIMITIVE_TRIANGLES) {
 				continue;
+			}
 
 			Ref<Material> surf_mat = mesh->surface_get_material(i);
 			if (!mat_map.has(surf_mat)) {
@@ -1037,22 +1000,21 @@ void GridMap::make_baked_meshes(bool p_gen_lightmap_uv, float p_lightmap_uv_texe
 		}
 	}
 
-	for (Map<OctantKey, Map<Ref<Material>, Ref<SurfaceTool> > >::Element *E = surface_map.front(); E; E = E->next()) {
-
+	for (Map<OctantKey, Map<Ref<Material>, Ref<SurfaceTool>>>::Element *E = surface_map.front(); E; E = E->next()) {
 		Ref<ArrayMesh> mesh;
 		mesh.instance();
-		for (Map<Ref<Material>, Ref<SurfaceTool> >::Element *F = E->get().front(); F; F = F->next()) {
+		for (Map<Ref<Material>, Ref<SurfaceTool>>::Element *F = E->get().front(); F; F = F->next()) {
 			F->get()->commit(mesh);
 		}
 
 		BakedMesh bm;
 		bm.mesh = mesh;
-		bm.instance = VS::get_singleton()->instance_create();
-		VS::get_singleton()->get_singleton()->instance_set_base(bm.instance, bm.mesh->get_rid());
-		VS::get_singleton()->instance_attach_object_instance_id(bm.instance, get_instance_id());
+		bm.instance = RS::get_singleton()->instance_create();
+		RS::get_singleton()->get_singleton()->instance_set_base(bm.instance, bm.mesh->get_rid());
+		RS::get_singleton()->instance_attach_object_instance_id(bm.instance, get_instance_id());
 		if (is_inside_tree()) {
-			VS::get_singleton()->instance_set_scenario(bm.instance, get_world()->get_scenario());
-			VS::get_singleton()->instance_set_transform(bm.instance, get_global_transform());
+			RS::get_singleton()->instance_set_scenario(bm.instance, get_world_3d()->get_scenario());
+			RS::get_singleton()->instance_set_transform(bm.instance, get_global_transform());
 		}
 
 		if (p_gen_lightmap_uv) {
@@ -1065,7 +1027,6 @@ void GridMap::make_baked_meshes(bool p_gen_lightmap_uv, float p_lightmap_uv_texe
 }
 
 Array GridMap::get_bake_meshes() {
-
 	if (!baked_meshes.size()) {
 		make_baked_meshes(true);
 	}
@@ -1080,13 +1041,11 @@ Array GridMap::get_bake_meshes() {
 }
 
 RID GridMap::get_bake_mesh_instance(int p_idx) {
-
 	ERR_FAIL_INDEX_V(p_idx, baked_meshes.size(), RID());
 	return baked_meshes[p_idx].instance;
 }
 
 GridMap::GridMap() {
-
 	collision_layer = 1;
 	collision_mask = 1;
 
@@ -1104,15 +1063,15 @@ GridMap::GridMap() {
 	clip_above = true;
 	cell_scale = 1.0;
 
-	navigation = NULL;
+	navigation = nullptr;
 	set_notify_transform(true);
 	recreating_octants = false;
 }
 
 GridMap::~GridMap() {
-
-	if (!mesh_library.is_null())
+	if (!mesh_library.is_null()) {
 		mesh_library->unregister_owner(this);
+	}
 
 	clear();
 }
diff --git a/modules/gridmap/grid_map.h b/modules/gridmap/grid_map.h
index 705f4929e1..ca7429ea26 100644
--- a/modules/gridmap/grid_map.h
+++ b/modules/gridmap/grid_map.h
@@ -31,17 +31,16 @@
 #ifndef GRID_MAP_H
 #define GRID_MAP_H
 
-#include "scene/3d/navigation.h"
-#include "scene/3d/spatial.h"
+#include "scene/3d/navigation_3d.h"
+#include "scene/3d/node_3d.h"
 #include "scene/resources/mesh_library.h"
 #include "scene/resources/multimesh.h"
 
 //heh heh, godotsphir!! this shares no code and the design is completely different with previous projects i've done..
 //should scale better with hardware that supports instancing
 
-class GridMap : public Spatial {
-
-	GDCLASS(GridMap, Spatial);
+class GridMap : public Node3D {
+	GDCLASS(GridMap, Node3D);
 
 	enum {
 		MAP_DIRTY_TRANSFORMS = 1,
@@ -49,7 +48,6 @@ class GridMap : public Spatial {
 	};
 
 	union IndexKey {
-
 		struct {
 			int16_t x;
 			int16_t y;
@@ -58,10 +56,18 @@ class GridMap : public Spatial {
 		uint64_t key;
 
 		_FORCE_INLINE_ bool operator<(const IndexKey &p_key) const {
-
 			return key < p_key.key;
 		}
 
+		_FORCE_INLINE_ operator Vector3i() const {
+			return Vector3i(x, y, z);
+		}
+
+		IndexKey(Vector3i p_vector) {
+			x = (int16_t)p_vector.x;
+			y = (int16_t)p_vector.y;
+			z = (int16_t)p_vector.z;
+		}
 		IndexKey() { key = 0; }
 	};
 
@@ -69,7 +75,6 @@ class GridMap : public Spatial {
 	 * @brief A Cell is a single cell in the cube map space; it is defined by its coordinates and the populating Item, identified by int id.
 	 */
 	union Cell {
-
 		struct {
 			unsigned int item : 16;
 			unsigned int rot : 5;
@@ -89,9 +94,8 @@ class GridMap : public Spatial {
 	 * A GridMap can have multiple Octants.
 	 */
 	struct Octant {
-
 		struct NavMesh {
-			int id;
+			RID region;
 			Transform xform;
 		};
 
@@ -118,7 +122,6 @@ class GridMap : public Spatial {
 	};
 
 	union OctantKey {
-
 		struct {
 			int16_t x;
 			int16_t y;
@@ -129,7 +132,6 @@ class GridMap : public Spatial {
 		uint64_t key;
 
 		_FORCE_INLINE_ bool operator<(const OctantKey &p_key) const {
-
 			return key < p_key.key;
 		}
 
@@ -147,7 +149,7 @@ class GridMap : public Spatial {
 	int octant_size;
 	bool center_x, center_y, center_z;
 	float cell_scale;
-	Navigation *navigation;
+	Navigation3D *navigation;
 
 	bool clip;
 	bool clip_above;
@@ -165,15 +167,13 @@ class GridMap : public Spatial {
 	void _recreate_octant_data();
 
 	struct BakeLight {
-
-		VS::LightType type;
+		RS::LightType type;
 		Vector3 pos;
 		Vector3 dir;
-		float param[VS::LIGHT_PARAM_MAX];
+		float param[RS::LIGHT_PARAM_MAX];
 	};
 
 	_FORCE_INLINE_ Vector3 _octant_get_offset(const OctantKey &p_key) const {
-
 		return Vector3(p_key.x, p_key.y, p_key.z) * cell_size * octant_size;
 	}
 
@@ -243,12 +243,12 @@ public:
 	void set_center_z(bool p_enable);
 	bool get_center_z() const;
 
-	void set_cell_item(int p_x, int p_y, int p_z, int p_item, int p_rot = 0);
-	int get_cell_item(int p_x, int p_y, int p_z) const;
-	int get_cell_item_orientation(int p_x, int p_y, int p_z) const;
+	void set_cell_item(const Vector3i &p_position, int p_item, int p_rot = 0);
+	int get_cell_item(const Vector3i &p_position) const;
+	int get_cell_item_orientation(const Vector3i &p_position) const;
 
-	Vector3 world_to_map(const Vector3 &p_world_pos) const;
-	Vector3 map_to_world(int p_x, int p_y, int p_z) const;
+	Vector3i world_to_map(const Vector3 &p_world_position) const;
+	Vector3 map_to_world(const Vector3i &p_map_position) const;
 
 	void set_clip(bool p_enabled, bool p_clip_above = true, int p_floor = 0, Vector3::Axis p_axis = Vector3::AXIS_X);
 
diff --git a/modules/gridmap/grid_map_editor_plugin.cpp b/modules/gridmap/grid_map_editor_plugin.cpp
index 4aa407f966..0e6ec7f520 100644
--- a/modules/gridmap/grid_map_editor_plugin.cpp
+++ b/modules/gridmap/grid_map_editor_plugin.cpp
@@ -29,33 +29,31 @@
 /*************************************************************************/
 
 #include "grid_map_editor_plugin.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
-#include "editor/plugins/spatial_editor_plugin.h"
-#include "scene/3d/camera.h"
+#include "editor/plugins/node_3d_editor_plugin.h"
+#include "scene/3d/camera_3d.h"
 
-#include "core/math/geometry.h"
 #include "core/os/keyboard.h"
+#include "scene/main/window.h"
 
 void GridMapEditor::_node_removed(Node *p_node) {
-
-	if (p_node == node)
-		node = NULL;
+	if (p_node == node) {
+		node = nullptr;
+	}
 }
 
 void GridMapEditor::_configure() {
-
-	if (!node)
+	if (!node) {
 		return;
+	}
 
 	update_grid();
 }
 
 void GridMapEditor::_menu_option(int p_option) {
-
 	switch (p_option) {
-
 		case MENU_OPTION_PREV_LEVEL: {
 			floor->set_value(floor->get_value() - 1);
 		} break;
@@ -65,7 +63,6 @@ void GridMapEditor::_menu_option(int p_option) {
 		} break;
 
 		case MENU_OPTION_LOCK_VIEW: {
-
 			int index = options->get_popup()->get_item_index(MENU_OPTION_LOCK_VIEW);
 			lock_view = !options->get_popup()->is_item_checked(index);
 
@@ -74,10 +71,8 @@ void GridMapEditor::_menu_option(int p_option) {
 		case MENU_OPTION_CLIP_DISABLED:
 		case MENU_OPTION_CLIP_ABOVE:
 		case MENU_OPTION_CLIP_BELOW: {
-
 			clip_mode = ClipMode(p_option - MENU_OPTION_CLIP_DISABLED);
 			for (int i = 0; i < 3; i++) {
-
 				int index = options->get_popup()->get_item_index(MENU_OPTION_CLIP_DISABLED + i);
 				options->get_popup()->set_item_checked(index, i == clip_mode);
 			}
@@ -87,7 +82,6 @@ void GridMapEditor::_menu_option(int p_option) {
 		case MENU_OPTION_X_AXIS:
 		case MENU_OPTION_Y_AXIS:
 		case MENU_OPTION_Z_AXIS: {
-
 			int new_axis = p_option - MENU_OPTION_X_AXIS;
 			for (int i = 0; i < 3; i++) {
 				int idx = options->get_popup()->get_item_index(MENU_OPTION_X_AXIS + i);
@@ -113,10 +107,8 @@ void GridMapEditor::_menu_option(int p_option) {
 
 		} break;
 		case MENU_OPTION_CURSOR_ROTATE_Y: {
-
 			Basis r;
 			if (input_action == INPUT_PASTE) {
-
 				r.set_orthogonal_index(paste_indicator.orientation);
 				r.rotate(Vector3(0, 1, 0), -Math_PI / 2.0);
 				paste_indicator.orientation = r.get_orthogonal_index();
@@ -130,10 +122,8 @@ void GridMapEditor::_menu_option(int p_option) {
 			_update_cursor_transform();
 		} break;
 		case MENU_OPTION_CURSOR_ROTATE_X: {
-
 			Basis r;
 			if (input_action == INPUT_PASTE) {
-
 				r.set_orthogonal_index(paste_indicator.orientation);
 				r.rotate(Vector3(1, 0, 0), -Math_PI / 2.0);
 				paste_indicator.orientation = r.get_orthogonal_index();
@@ -147,10 +137,8 @@ void GridMapEditor::_menu_option(int p_option) {
 			_update_cursor_transform();
 		} break;
 		case MENU_OPTION_CURSOR_ROTATE_Z: {
-
 			Basis r;
 			if (input_action == INPUT_PASTE) {
-
 				r.set_orthogonal_index(paste_indicator.orientation);
 				r.rotate(Vector3(0, 0, 1), -Math_PI / 2.0);
 				paste_indicator.orientation = r.get_orthogonal_index();
@@ -164,10 +152,8 @@ void GridMapEditor::_menu_option(int p_option) {
 			_update_cursor_transform();
 		} break;
 		case MENU_OPTION_CURSOR_BACK_ROTATE_Y: {
-
 			Basis r;
 			if (input_action == INPUT_PASTE) {
-
 				r.set_orthogonal_index(paste_indicator.orientation);
 				r.rotate(Vector3(0, 1, 0), Math_PI / 2.0);
 				paste_indicator.orientation = r.get_orthogonal_index();
@@ -181,10 +167,8 @@ void GridMapEditor::_menu_option(int p_option) {
 			_update_cursor_transform();
 		} break;
 		case MENU_OPTION_CURSOR_BACK_ROTATE_X: {
-
 			Basis r;
 			if (input_action == INPUT_PASTE) {
-
 				r.set_orthogonal_index(paste_indicator.orientation);
 				r.rotate(Vector3(1, 0, 0), Math_PI / 2.0);
 				paste_indicator.orientation = r.get_orthogonal_index();
@@ -198,10 +182,8 @@ void GridMapEditor::_menu_option(int p_option) {
 			_update_cursor_transform();
 		} break;
 		case MENU_OPTION_CURSOR_BACK_ROTATE_Z: {
-
 			Basis r;
 			if (input_action == INPUT_PASTE) {
-
 				r.set_orthogonal_index(paste_indicator.orientation);
 				r.rotate(Vector3(0, 0, 1), Math_PI / 2.0);
 				paste_indicator.orientation = r.get_orthogonal_index();
@@ -215,9 +197,7 @@ void GridMapEditor::_menu_option(int p_option) {
 			_update_cursor_transform();
 		} break;
 		case MENU_OPTION_CURSOR_CLEAR_ROTATION: {
-
 			if (input_action == INPUT_PASTE) {
-
 				paste_indicator.orientation = 0;
 				_update_paste_indicator();
 				break;
@@ -234,8 +214,9 @@ void GridMapEditor::_menu_option(int p_option) {
 
 		case MENU_OPTION_SELECTION_DUPLICATE:
 		case MENU_OPTION_SELECTION_CUT: {
-			if (!(selection.active && input_action == INPUT_NONE))
+			if (!(selection.active && input_action == INPUT_NONE)) {
 				break;
+			}
 
 			_set_clipboard_data();
 
@@ -252,15 +233,17 @@ void GridMapEditor::_menu_option(int p_option) {
 			_update_paste_indicator();
 		} break;
 		case MENU_OPTION_SELECTION_CLEAR: {
-			if (!selection.active)
+			if (!selection.active) {
 				break;
+			}
 
 			_delete_selection();
 
 		} break;
 		case MENU_OPTION_SELECTION_FILL: {
-			if (!selection.active)
+			if (!selection.active) {
 				return;
+			}
 
 			_fill_selection();
 
@@ -272,7 +255,6 @@ void GridMapEditor::_menu_option(int p_option) {
 }
 
 void GridMapEditor::_update_cursor_transform() {
-
 	cursor_transform = Transform();
 	cursor_transform.origin = cursor_origin;
 	cursor_transform.basis.set_orthogonal_index(cursor_rot);
@@ -280,8 +262,8 @@ void GridMapEditor::_update_cursor_transform() {
 	cursor_transform = node->get_global_transform() * cursor_transform;
 
 	if (cursor_instance.is_valid()) {
-		VisualServer::get_singleton()->instance_set_transform(cursor_instance, cursor_transform);
-		VisualServer::get_singleton()->instance_set_visible(cursor_instance, cursor_visible);
+		RenderingServer::get_singleton()->instance_set_transform(cursor_instance, cursor_transform);
+		RenderingServer::get_singleton()->instance_set_visible(cursor_instance, cursor_visible);
 	}
 }
 
@@ -290,10 +272,9 @@ void GridMapEditor::_update_selection_transform() {
 	xf_zero.basis.set_zero();
 
 	if (!selection.active) {
-
-		VisualServer::get_singleton()->instance_set_transform(selection_instance, xf_zero);
+		RenderingServer::get_singleton()->instance_set_transform(selection_instance, xf_zero);
 		for (int i = 0; i < 3; i++) {
-			VisualServer::get_singleton()->instance_set_transform(selection_level_instance[i], xf_zero);
+			RenderingServer::get_singleton()->instance_set_transform(selection_level_instance[i], xf_zero);
 		}
 		return;
 	}
@@ -302,49 +283,50 @@ void GridMapEditor::_update_selection_transform() {
 	xf.scale((Vector3(1, 1, 1) + (selection.end - selection.begin)) * node->get_cell_size());
 	xf.origin = selection.begin * node->get_cell_size();
 
-	VisualServer::get_singleton()->instance_set_transform(selection_instance, node->get_global_transform() * xf);
+	RenderingServer::get_singleton()->instance_set_transform(selection_instance, node->get_global_transform() * xf);
 
 	for (int i = 0; i < 3; i++) {
 		if (i != edit_axis || (edit_floor[edit_axis] < selection.begin[edit_axis]) || (edit_floor[edit_axis] > selection.end[edit_axis] + 1)) {
-			VisualServer::get_singleton()->instance_set_transform(selection_level_instance[i], xf_zero);
+			RenderingServer::get_singleton()->instance_set_transform(selection_level_instance[i], xf_zero);
 		} else {
-
 			Vector3 scale = (selection.end - selection.begin + Vector3(1, 1, 1));
 			scale[edit_axis] = 1.0;
-			Vector3 pos = selection.begin;
-			pos[edit_axis] = edit_floor[edit_axis];
+			Vector3 position = selection.begin;
+			position[edit_axis] = edit_floor[edit_axis];
 
 			scale *= node->get_cell_size();
-			pos *= node->get_cell_size();
+			position *= node->get_cell_size();
 
 			Transform xf2;
 			xf2.basis.scale(scale);
-			xf2.origin = pos;
+			xf2.origin = position;
 
-			VisualServer::get_singleton()->instance_set_transform(selection_level_instance[i], xf2);
+			RenderingServer::get_singleton()->instance_set_transform(selection_level_instance[i], xf2);
 		}
 	}
 }
 
 void GridMapEditor::_validate_selection() {
-
-	if (!selection.active)
+	if (!selection.active) {
 		return;
+	}
 	selection.begin = selection.click;
 	selection.end = selection.current;
 
-	if (selection.begin.x > selection.end.x)
+	if (selection.begin.x > selection.end.x) {
 		SWAP(selection.begin.x, selection.end.x);
-	if (selection.begin.y > selection.end.y)
+	}
+	if (selection.begin.y > selection.end.y) {
 		SWAP(selection.begin.y, selection.end.y);
-	if (selection.begin.z > selection.end.z)
+	}
+	if (selection.begin.z > selection.end.z) {
 		SWAP(selection.begin.z, selection.end.z);
+	}
 
 	_update_selection_transform();
 }
 
 void GridMapEditor::_set_selection(bool p_active, const Vector3 &p_begin, const Vector3 &p_end) {
-
 	selection.active = p_active;
 	selection.begin = p_begin;
 	selection.end = p_end;
@@ -361,20 +343,23 @@ void GridMapEditor::_set_selection(bool p_active, const Vector3 &p_begin, const
 	options->get_popup()->set_item_disabled(options->get_popup()->get_item_index(MENU_OPTION_SELECTION_FILL), !selection.active);
 }
 
-bool GridMapEditor::do_input_action(Camera *p_camera, const Point2 &p_point, bool p_click) {
-
-	if (!spatial_editor)
+bool GridMapEditor::do_input_action(Camera3D *p_camera, const Point2 &p_point, bool p_click) {
+	if (!spatial_editor) {
 		return false;
+	}
 
-	if (selected_palette < 0 && input_action != INPUT_PICK && input_action != INPUT_SELECT && input_action != INPUT_PASTE)
+	if (selected_palette < 0 && input_action != INPUT_PICK && input_action != INPUT_SELECT && input_action != INPUT_PASTE) {
 		return false;
+	}
 	Ref<MeshLibrary> mesh_library = node->get_mesh_library();
-	if (mesh_library.is_null())
+	if (mesh_library.is_null()) {
 		return false;
-	if (input_action != INPUT_PICK && input_action != INPUT_SELECT && input_action != INPUT_PASTE && !mesh_library->has_item(selected_palette))
+	}
+	if (input_action != INPUT_PICK && input_action != INPUT_SELECT && input_action != INPUT_PASTE && !mesh_library->has_item(selected_palette)) {
 		return false;
+	}
 
-	Camera *camera = p_camera;
+	Camera3D *camera = p_camera;
 	Vector3 from = camera->project_ray_origin(p_point);
 	Vector3 normal = camera->project_ray_normal(p_point);
 	Transform local_xform = node->get_global_transform().affine_inverse();
@@ -387,38 +372,37 @@ bool GridMapEditor::do_input_action(Camera *p_camera, const Point2 &p_point, boo
 	p.d = edit_floor[edit_axis] * node->get_cell_size()[edit_axis];
 
 	Vector3 inters;
-	if (!p.intersects_segment(from, from + normal * settings_pick_distance->get_value(), &inters))
+	if (!p.intersects_segment(from, from + normal * settings_pick_distance->get_value(), &inters)) {
 		return false;
+	}
 
 	// Make sure the intersection is inside the frustum planes, to avoid
 	// Painting on invisible regions.
 	for (int i = 0; i < planes.size(); i++) {
-
 		Plane fp = local_xform.xform(planes[i]);
-		if (fp.is_point_over(inters))
+		if (fp.is_point_over(inters)) {
 			return false;
+		}
 	}
 
 	int cell[3];
 	float cell_size[3] = { node->get_cell_size().x, node->get_cell_size().y, node->get_cell_size().z };
 
 	for (int i = 0; i < 3; i++) {
-
-		if (i == edit_axis)
+		if (i == edit_axis) {
 			cell[i] = edit_floor[i];
-		else {
-
+		} else {
 			cell[i] = inters[i] / node->get_cell_size()[i];
-			if (inters[i] < 0)
+			if (inters[i] < 0) {
 				cell[i] -= 1; // Compensate negative.
+			}
 			grid_ofs[i] = cell[i] * cell_size[i];
 		}
 	}
 
-	VS::get_singleton()->instance_set_transform(grid_instance[edit_axis], node->get_global_transform() * edit_grid_xform);
+	RS::get_singleton()->instance_set_transform(grid_instance[edit_axis], node->get_global_transform() * edit_grid_xform);
 
 	if (cursor_instance.is_valid()) {
-
 		cursor_origin = (Vector3(cell[0], cell[1], cell[2]) + Vector3(0.5 * node->get_center_x(), 0.5 * node->get_center_y(), 0.5 * node->get_center_z())) * node->get_cell_size();
 		cursor_visible = true;
 
@@ -430,22 +414,20 @@ bool GridMapEditor::do_input_action(Camera *p_camera, const Point2 &p_point, boo
 	}
 
 	if (input_action == INPUT_PASTE) {
-
-		paste_indicator.current = Vector3(cell[0], cell[1], cell[2]);
+		paste_indicator.current = Vector3i(cell[0], cell[1], cell[2]);
 		_update_paste_indicator();
 
 	} else if (input_action == INPUT_SELECT) {
-
-		selection.current = Vector3(cell[0], cell[1], cell[2]);
-		if (p_click)
+		selection.current = Vector3i(cell[0], cell[1], cell[2]);
+		if (p_click) {
 			selection.click = selection.current;
+		}
 		selection.active = true;
 		_validate_selection();
 
 		return true;
 	} else if (input_action == INPUT_PICK) {
-
-		int item = node->get_cell_item(cell[0], cell[1], cell[2]);
+		int item = node->get_cell_item(Vector3i(cell[0], cell[1], cell[2]));
 		if (item >= 0) {
 			selected_palette = item;
 			mesh_library_palette->set_current(item);
@@ -456,23 +438,23 @@ bool GridMapEditor::do_input_action(Camera *p_camera, const Point2 &p_point, boo
 	}
 	if (input_action == INPUT_PAINT) {
 		SetItem si;
-		si.pos = Vector3(cell[0], cell[1], cell[2]);
+		si.position = Vector3i(cell[0], cell[1], cell[2]);
 		si.new_value = selected_palette;
 		si.new_orientation = cursor_rot;
-		si.old_value = node->get_cell_item(cell[0], cell[1], cell[2]);
-		si.old_orientation = node->get_cell_item_orientation(cell[0], cell[1], cell[2]);
+		si.old_value = node->get_cell_item(Vector3i(cell[0], cell[1], cell[2]));
+		si.old_orientation = node->get_cell_item_orientation(Vector3i(cell[0], cell[1], cell[2]));
 		set_items.push_back(si);
-		node->set_cell_item(cell[0], cell[1], cell[2], selected_palette, cursor_rot);
+		node->set_cell_item(Vector3i(cell[0], cell[1], cell[2]), selected_palette, cursor_rot);
 		return true;
 	} else if (input_action == INPUT_ERASE) {
 		SetItem si;
-		si.pos = Vector3(cell[0], cell[1], cell[2]);
+		si.position = Vector3i(cell[0], cell[1], cell[2]);
 		si.new_value = -1;
 		si.new_orientation = 0;
-		si.old_value = node->get_cell_item(cell[0], cell[1], cell[2]);
-		si.old_orientation = node->get_cell_item_orientation(cell[0], cell[1], cell[2]);
+		si.old_value = node->get_cell_item(Vector3i(cell[0], cell[1], cell[2]));
+		si.old_orientation = node->get_cell_item_orientation(Vector3i(cell[0], cell[1], cell[2]));
 		set_items.push_back(si);
-		node->set_cell_item(cell[0], cell[1], cell[2], -1);
+		node->set_cell_item(Vector3i(cell[0], cell[1], cell[2]), -1);
 		return true;
 	}
 
@@ -480,19 +462,17 @@ bool GridMapEditor::do_input_action(Camera *p_camera, const Point2 &p_point, boo
 }
 
 void GridMapEditor::_delete_selection() {
-
-	if (!selection.active)
+	if (!selection.active) {
 		return;
+	}
 
 	undo_redo->create_action(TTR("GridMap Delete Selection"));
 	for (int i = selection.begin.x; i <= selection.end.x; i++) {
-
 		for (int j = selection.begin.y; j <= selection.end.y; j++) {
-
 			for (int k = selection.begin.z; k <= selection.end.z; k++) {
-
-				undo_redo->add_do_method(node, "set_cell_item", i, j, k, GridMap::INVALID_CELL_ITEM);
-				undo_redo->add_undo_method(node, "set_cell_item", i, j, k, node->get_cell_item(i, j, k), node->get_cell_item_orientation(i, j, k));
+				Vector3i selected = Vector3i(i, j, k);
+				undo_redo->add_do_method(node, "set_cell_item", selected, GridMap::INVALID_CELL_ITEM);
+				undo_redo->add_undo_method(node, "set_cell_item", selected, node->get_cell_item(selected), node->get_cell_item_orientation(selected));
 			}
 		}
 	}
@@ -502,19 +482,17 @@ void GridMapEditor::_delete_selection() {
 }
 
 void GridMapEditor::_fill_selection() {
-
-	if (!selection.active)
+	if (!selection.active) {
 		return;
+	}
 
 	undo_redo->create_action(TTR("GridMap Fill Selection"));
 	for (int i = selection.begin.x; i <= selection.end.x; i++) {
-
 		for (int j = selection.begin.y; j <= selection.end.y; j++) {
-
 			for (int k = selection.begin.z; k <= selection.end.z; k++) {
-
-				undo_redo->add_do_method(node, "set_cell_item", i, j, k, selected_palette, cursor_rot);
-				undo_redo->add_undo_method(node, "set_cell_item", i, j, k, node->get_cell_item(i, j, k), node->get_cell_item_orientation(i, j, k));
+				Vector3i selected = Vector3i(i, j, k);
+				undo_redo->add_do_method(node, "set_cell_item", selected, selected_palette, cursor_rot);
+				undo_redo->add_undo_method(node, "set_cell_item", selected, node->get_cell_item(selected), node->get_cell_item_orientation(selected));
 			}
 		}
 	}
@@ -524,38 +502,34 @@ void GridMapEditor::_fill_selection() {
 }
 
 void GridMapEditor::_clear_clipboard_data() {
-
 	for (List<ClipboardItem>::Element *E = clipboard_items.front(); E; E = E->next()) {
-
-		VisualServer::get_singleton()->free(E->get().instance);
+		RenderingServer::get_singleton()->free(E->get().instance);
 	}
 
 	clipboard_items.clear();
 }
 
 void GridMapEditor::_set_clipboard_data() {
-
 	_clear_clipboard_data();
 
 	Ref<MeshLibrary> meshLibrary = node->get_mesh_library();
 
 	for (int i = selection.begin.x; i <= selection.end.x; i++) {
-
 		for (int j = selection.begin.y; j <= selection.end.y; j++) {
-
 			for (int k = selection.begin.z; k <= selection.end.z; k++) {
-
-				int itm = node->get_cell_item(i, j, k);
-				if (itm == GridMap::INVALID_CELL_ITEM)
+				Vector3i selected = Vector3i(i, j, k);
+				int itm = node->get_cell_item(selected);
+				if (itm == GridMap::INVALID_CELL_ITEM) {
 					continue;
+				}
 
 				Ref<Mesh> mesh = meshLibrary->get_item_mesh(itm);
 
 				ClipboardItem item;
 				item.cell_item = itm;
-				item.grid_offset = Vector3(i, j, k) - selection.begin;
-				item.orientation = node->get_cell_item_orientation(i, j, k);
-				item.instance = VisualServer::get_singleton()->instance_create2(mesh->get_rid(), get_tree()->get_root()->get_world()->get_scenario());
+				item.grid_offset = Vector3(selected) - selection.begin;
+				item.orientation = node->get_cell_item_orientation(selected);
+				item.instance = RenderingServer::get_singleton()->instance_create2(mesh->get_rid(), get_tree()->get_root()->get_world_3d()->get_scenario());
 
 				clipboard_items.push_back(item);
 			}
@@ -564,12 +538,10 @@ void GridMapEditor::_set_clipboard_data() {
 }
 
 void GridMapEditor::_update_paste_indicator() {
-
 	if (input_action != INPUT_PASTE) {
-
 		Transform xf;
 		xf.basis.set_zero();
-		VisualServer::get_singleton()->instance_set_transform(paste_instance, xf);
+		RenderingServer::get_singleton()->instance_set_transform(paste_instance, xf);
 		return;
 	}
 
@@ -583,10 +555,9 @@ void GridMapEditor::_update_paste_indicator() {
 	xf.basis = rot * xf.basis;
 	xf.translate((-center * node->get_cell_size()) / scale);
 
-	VisualServer::get_singleton()->instance_set_transform(paste_instance, node->get_global_transform() * xf);
+	RenderingServer::get_singleton()->instance_set_transform(paste_instance, node->get_global_transform() * xf);
 
 	for (List<ClipboardItem>::Element *E = clipboard_items.front(); E; E = E->next()) {
-
 		ClipboardItem &item = E->get();
 
 		xf = Transform();
@@ -598,12 +569,11 @@ void GridMapEditor::_update_paste_indicator() {
 		item_rot.set_orthogonal_index(item.orientation);
 		xf.basis = item_rot * xf.basis * node->get_cell_scale();
 
-		VisualServer::get_singleton()->instance_set_transform(item.instance, node->get_global_transform() * xf);
+		RenderingServer::get_singleton()->instance_set_transform(item.instance, node->get_global_transform() * xf);
 	}
 }
 
 void GridMapEditor::_do_paste() {
-
 	int idx = options->get_popup()->get_item_index(MENU_OPTION_PASTE_SELECTS);
 	bool reselect = options->get_popup()->is_item_checked(idx);
 
@@ -614,21 +584,19 @@ void GridMapEditor::_do_paste() {
 	undo_redo->create_action(TTR("GridMap Paste Selection"));
 
 	for (List<ClipboardItem>::Element *E = clipboard_items.front(); E; E = E->next()) {
-
 		ClipboardItem &item = E->get();
 
-		Vector3 pos = rot.xform(item.grid_offset) + paste_indicator.begin + ofs;
+		Vector3 position = rot.xform(item.grid_offset) + paste_indicator.begin + ofs;
 
 		Basis orm;
 		orm.set_orthogonal_index(item.orientation);
 		orm = rot * orm;
 
-		undo_redo->add_do_method(node, "set_cell_item", pos.x, pos.y, pos.z, item.cell_item, orm.get_orthogonal_index());
-		undo_redo->add_undo_method(node, "set_cell_item", pos.x, pos.y, pos.z, node->get_cell_item(pos.x, pos.y, pos.z), node->get_cell_item_orientation(pos.x, pos.y, pos.z));
+		undo_redo->add_do_method(node, "set_cell_item", position, item.cell_item, orm.get_orthogonal_index());
+		undo_redo->add_undo_method(node, "set_cell_item", position, node->get_cell_item(position), node->get_cell_item_orientation(position));
 	}
 
 	if (reselect) {
-
 		undo_redo->add_do_method(this, "_set_selection", true, paste_indicator.begin + ofs, paste_indicator.end + ofs);
 		undo_redo->add_undo_method(this, "_set_selection", selection.active, selection.begin, selection.end);
 	}
@@ -638,7 +606,7 @@ void GridMapEditor::_do_paste() {
 	_clear_clipboard_data();
 }
 
-bool GridMapEditor::forward_spatial_input_event(Camera *p_camera, const Ref<InputEvent> &p_event) {
+bool GridMapEditor::forward_spatial_input_event(Camera3D *p_camera, const Ref<InputEvent> &p_event) {
 	if (!node) {
 		return false;
 	}
@@ -646,24 +614,24 @@ bool GridMapEditor::forward_spatial_input_event(Camera *p_camera, const Ref<Inpu
 	Ref<InputEventMouseButton> mb = p_event;
 
 	if (mb.is_valid()) {
-
 		if (mb->get_button_index() == BUTTON_WHEEL_UP && (mb->get_command() || mb->get_shift())) {
-			if (mb->is_pressed())
+			if (mb->is_pressed()) {
 				floor->set_value(floor->get_value() + mb->get_factor());
+			}
 
 			return true; // Eaten.
 		} else if (mb->get_button_index() == BUTTON_WHEEL_DOWN && (mb->get_command() || mb->get_shift())) {
-			if (mb->is_pressed())
+			if (mb->is_pressed()) {
 				floor->set_value(floor->get_value() - mb->get_factor());
+			}
 			return true;
 		}
 
 		if (mb->is_pressed()) {
-			SpatialEditorViewport::NavigationScheme nav_scheme = (SpatialEditorViewport::NavigationScheme)EditorSettings::get_singleton()->get("editors/3d/navigation/navigation_scheme").operator int();
-			if ((nav_scheme == SpatialEditorViewport::NAVIGATION_MAYA || nav_scheme == SpatialEditorViewport::NAVIGATION_MODO) && mb->get_alt()) {
+			Node3DEditorViewport::NavigationScheme nav_scheme = (Node3DEditorViewport::NavigationScheme)EditorSettings::get_singleton()->get("editors/3d/navigation/navigation_scheme").operator int();
+			if ((nav_scheme == Node3DEditorViewport::NAVIGATION_MAYA || nav_scheme == Node3DEditorViewport::NAVIGATION_MODO) && mb->get_alt()) {
 				input_action = INPUT_NONE;
 			} else if (mb->get_button_index() == BUTTON_LEFT) {
-
 				bool can_edit = (node && node->get_mesh_library().is_valid());
 				if (input_action == INPUT_PASTE) {
 					_do_paste();
@@ -697,20 +665,16 @@ bool GridMapEditor::forward_spatial_input_event(Camera *p_camera, const Ref<Inpu
 
 			return do_input_action(p_camera, Point2(mb->get_position().x, mb->get_position().y), true);
 		} else {
-
 			if ((mb->get_button_index() == BUTTON_RIGHT && input_action == INPUT_ERASE) || (mb->get_button_index() == BUTTON_LEFT && input_action == INPUT_PAINT)) {
-
 				if (set_items.size()) {
 					undo_redo->create_action(TTR("GridMap Paint"));
 					for (List<SetItem>::Element *E = set_items.front(); E; E = E->next()) {
-
 						const SetItem &si = E->get();
-						undo_redo->add_do_method(node, "set_cell_item", si.pos.x, si.pos.y, si.pos.z, si.new_value, si.new_orientation);
+						undo_redo->add_do_method(node, "set_cell_item", si.position, si.new_value, si.new_orientation);
 					}
 					for (List<SetItem>::Element *E = set_items.back(); E; E = E->prev()) {
-
 						const SetItem &si = E->get();
-						undo_redo->add_undo_method(node, "set_cell_item", si.pos.x, si.pos.y, si.pos.z, si.old_value, si.old_orientation);
+						undo_redo->add_undo_method(node, "set_cell_item", si.position, si.old_value, si.old_orientation);
 					}
 
 					undo_redo->commit_action();
@@ -721,7 +685,6 @@ bool GridMapEditor::forward_spatial_input_event(Camera *p_camera, const Ref<Inpu
 			}
 
 			if (mb->get_button_index() == BUTTON_LEFT && input_action == INPUT_SELECT) {
-
 				undo_redo->create_action("GridMap Selection");
 				undo_redo->add_do_method(this, "_set_selection", selection.active, selection.begin, selection.end);
 				undo_redo->add_undo_method(this, "_set_selection", last_selection.active, last_selection.begin, last_selection.end);
@@ -729,7 +692,6 @@ bool GridMapEditor::forward_spatial_input_event(Camera *p_camera, const Ref<Inpu
 			}
 
 			if (mb->get_button_index() == BUTTON_LEFT && input_action != INPUT_NONE) {
-
 				set_items.clear();
 				input_action = INPUT_NONE;
 				return true;
@@ -744,7 +706,6 @@ bool GridMapEditor::forward_spatial_input_event(Camera *p_camera, const Ref<Inpu
 	Ref<InputEventMouseMotion> mm = p_event;
 
 	if (mm.is_valid()) {
-
 		return do_input_action(p_camera, mm->get_position(), false);
 	}
 
@@ -752,8 +713,7 @@ bool GridMapEditor::forward_spatial_input_event(Camera *p_camera, const Ref<Inpu
 
 	if (k.is_valid()) {
 		if (k->is_pressed()) {
-			if (k->get_scancode() == KEY_ESCAPE) {
-
+			if (k->get_keycode() == KEY_ESCAPE) {
 				if (input_action == INPUT_PASTE) {
 					_clear_clipboard_data();
 					input_action = INPUT_NONE;
@@ -772,13 +732,12 @@ bool GridMapEditor::forward_spatial_input_event(Camera *p_camera, const Ref<Inpu
 			}
 
 			if (k->get_shift() && selection.active && input_action != INPUT_PASTE) {
-
-				if (k->get_scancode() == options->get_popup()->get_item_accelerator(options->get_popup()->get_item_index(MENU_OPTION_PREV_LEVEL))) {
+				if (k->get_keycode() == options->get_popup()->get_item_accelerator(options->get_popup()->get_item_index(MENU_OPTION_PREV_LEVEL))) {
 					selection.click[edit_axis]--;
 					_validate_selection();
 					return true;
 				}
-				if (k->get_scancode() == options->get_popup()->get_item_accelerator(options->get_popup()->get_item_index(MENU_OPTION_NEXT_LEVEL))) {
+				if (k->get_keycode() == options->get_popup()->get_item_accelerator(options->get_popup()->get_item_index(MENU_OPTION_NEXT_LEVEL))) {
 					selection.click[edit_axis]++;
 					_validate_selection();
 					return true;
@@ -789,7 +748,6 @@ bool GridMapEditor::forward_spatial_input_event(Camera *p_camera, const Ref<Inpu
 
 	Ref<InputEventPanGesture> pan_gesture = p_event;
 	if (pan_gesture.is_valid()) {
-
 		if (pan_gesture->get_alt() && (pan_gesture->get_command() || pan_gesture->get_shift())) {
 			const real_t delta = pan_gesture->get_delta().y * 0.5;
 			accumulated_floor_delta += delta;
@@ -810,7 +768,6 @@ bool GridMapEditor::forward_spatial_input_event(Camera *p_camera, const Ref<Inpu
 }
 
 struct _CGMEItemSort {
-
 	String name;
 	int id;
 	_FORCE_INLINE_ bool operator<(const _CGMEItemSort &r_it) const { return name < r_it.name; }
@@ -839,16 +796,30 @@ void GridMapEditor::_text_changed(const String &p_text) {
 }
 
 void GridMapEditor::_sbox_input(const Ref<InputEvent> &p_ie) {
+	const Ref<InputEventKey> k = p_ie;
 
-	Ref<InputEventKey> k = p_ie;
-
-	if (k.is_valid() && (k->get_scancode() == KEY_UP || k->get_scancode() == KEY_DOWN || k->get_scancode() == KEY_PAGEUP || k->get_scancode() == KEY_PAGEDOWN)) {
-
+	if (k.is_valid() && (k->get_keycode() == KEY_UP || k->get_keycode() == KEY_DOWN || k->get_keycode() == KEY_PAGEUP || k->get_keycode() == KEY_PAGEDOWN)) {
+		// Forward the key input to the ItemList so it can be scrolled
 		mesh_library_palette->call("_gui_input", k);
 		search_box->accept_event();
 	}
 }
 
+void GridMapEditor::_mesh_library_palette_input(const Ref<InputEvent> &p_ie) {
+	const Ref<InputEventMouseButton> mb = p_ie;
+
+	// Zoom in/out using Ctrl + mouse wheel
+	if (mb.is_valid() && mb->is_pressed() && mb->get_command()) {
+		if (mb->is_pressed() && mb->get_button_index() == BUTTON_WHEEL_UP) {
+			size_slider->set_value(size_slider->get_value() + 0.2);
+		}
+
+		if (mb->is_pressed() && mb->get_button_index() == BUTTON_WHEEL_DOWN) {
+			size_slider->set_value(size_slider->get_value() - 0.2);
+		}
+	}
+}
+
 void GridMapEditor::_icon_size_changed(float p_value) {
 	mesh_library_palette->set_icon_scale(p_value);
 	update_palette();
@@ -877,7 +848,7 @@ void GridMapEditor::update_palette() {
 	Ref<MeshLibrary> mesh_library = node->get_mesh_library();
 
 	if (mesh_library.is_null()) {
-		last_mesh_library = NULL;
+		last_mesh_library = nullptr;
 		search_box->set_text("");
 		search_box->set_editable(false);
 		info_message->show();
@@ -892,7 +863,6 @@ void GridMapEditor::update_palette() {
 
 	List<_CGMEItemSort> il;
 	for (int i = 0; i < ids.size(); i++) {
-
 		_CGMEItemSort is;
 		is.id = ids[i];
 		is.name = mesh_library->get_item_name(ids[i]);
@@ -907,14 +877,15 @@ void GridMapEditor::update_palette() {
 	for (List<_CGMEItemSort>::Element *E = il.front(); E; E = E->next()) {
 		int id = E->get().id;
 		String name = mesh_library->get_item_name(id);
-		Ref<Texture> preview = mesh_library->get_item_preview(id);
+		Ref<Texture2D> preview = mesh_library->get_item_preview(id);
 
 		if (name == "") {
 			name = "#" + itos(id);
 		}
 
-		if (filter != "" && !filter.is_subsequence_ofi(name))
+		if (filter != "" && !filter.is_subsequence_ofi(name)) {
 			continue;
+		}
 
 		mesh_library_palette->add_item("");
 		if (!preview.is_null()) {
@@ -935,8 +906,9 @@ void GridMapEditor::update_palette() {
 }
 
 void GridMapEditor::edit(GridMap *p_gridmap) {
-	if (!p_gridmap && node)
-		node->disconnect("cell_size_changed", this, "_draw_grids");
+	if (!p_gridmap && node) {
+		node->disconnect("cell_size_changed", callable_mp(this, &GridMapEditor::_draw_grids));
+	}
 
 	node = p_gridmap;
 
@@ -945,16 +917,16 @@ void GridMapEditor::edit(GridMap *p_gridmap) {
 	_update_selection_transform();
 	_update_paste_indicator();
 
-	spatial_editor = Object::cast_to<SpatialEditorPlugin>(editor->get_editor_plugin_screen());
+	spatial_editor = Object::cast_to<Node3DEditorPlugin>(editor->get_editor_plugin_screen());
 
 	if (!node) {
 		set_process(false);
 		for (int i = 0; i < 3; i++) {
-			VisualServer::get_singleton()->instance_set_visible(grid_instance[i], false);
+			RenderingServer::get_singleton()->instance_set_visible(grid_instance[i], false);
 		}
 
 		if (cursor_instance.is_valid()) {
-			VisualServer::get_singleton()->instance_set_visible(cursor_instance, false);
+			RenderingServer::get_singleton()->instance_set_visible(cursor_instance, false);
 		}
 
 		return;
@@ -970,20 +942,19 @@ void GridMapEditor::edit(GridMap *p_gridmap) {
 	update_grid();
 	_update_clip();
 
-	node->connect("cell_size_changed", this, "_draw_grids");
+	node->connect("cell_size_changed", callable_mp(this, &GridMapEditor::_draw_grids));
 }
 
 void GridMapEditor::_update_clip() {
-
 	node->set_meta("_editor_clip_", clip_mode);
-	if (clip_mode == CLIP_DISABLED)
+	if (clip_mode == CLIP_DISABLED) {
 		node->set_clip(false);
-	else
+	} else {
 		node->set_clip(true, clip_mode == CLIP_ABOVE, edit_floor[edit_axis], edit_axis);
+	}
 }
 
 void GridMapEditor::update_grid() {
-
 	grid_xform.origin.x -= 1; // Force update in hackish way.
 
 	grid_ofs[edit_axis] = edit_floor[edit_axis] * node->get_cell_size()[edit_axis];
@@ -992,7 +963,7 @@ void GridMapEditor::update_grid() {
 	edit_grid_xform.basis = Basis();
 
 	for (int i = 0; i < 3; i++) {
-		VisualServer::get_singleton()->instance_set_visible(grid_instance[i], i == edit_axis);
+		RenderingServer::get_singleton()->instance_set_visible(grid_instance[i], i == edit_axis);
 	}
 
 	updating = true;
@@ -1004,8 +975,7 @@ void GridMapEditor::_draw_grids(const Vector3 &cell_size) {
 	Vector3 edited_floor = node->has_meta("_editor_floor_") ? node->get_meta("_editor_floor_") : Variant();
 
 	for (int i = 0; i < 3; i++) {
-		if (VS::get_singleton()->mesh_get_surface_count(grid[i]) > 0)
-			VS::get_singleton()->mesh_remove_surface(grid[i], 0);
+		RS::get_singleton()->mesh_clear(grid[i]);
 		edit_floor[i] = edited_floor[i];
 	}
 
@@ -1013,7 +983,6 @@ void GridMapEditor::_draw_grids(const Vector3 &cell_size) {
 	Vector<Color> grid_colors[3];
 
 	for (int i = 0; i < 3; i++) {
-
 		Vector3 axis;
 		axis[i] = 1;
 		Vector3 axis_n1;
@@ -1022,9 +991,7 @@ void GridMapEditor::_draw_grids(const Vector3 &cell_size) {
 		axis_n2[(i + 2) % 3] = cell_size[(i + 2) % 3];
 
 		for (int j = -GRID_CURSOR_SIZE; j <= GRID_CURSOR_SIZE; j++) {
-
 			for (int k = -GRID_CURSOR_SIZE; k <= GRID_CURSOR_SIZE; k++) {
-
 				Vector3 p = axis_n1 * j + axis_n2 * k;
 				float trans = Math::pow(MAX(0, 1.0 - (Vector2(j, k).length() / GRID_CURSOR_SIZE)), 2);
 
@@ -1047,50 +1014,46 @@ void GridMapEditor::_draw_grids(const Vector3 &cell_size) {
 		}
 
 		Array d;
-		d.resize(VS::ARRAY_MAX);
-		d[VS::ARRAY_VERTEX] = grid_points[i];
-		d[VS::ARRAY_COLOR] = grid_colors[i];
-		VisualServer::get_singleton()->mesh_add_surface_from_arrays(grid[i], VisualServer::PRIMITIVE_LINES, d);
-		VisualServer::get_singleton()->mesh_surface_set_material(grid[i], 0, indicator_mat->get_rid());
+		d.resize(RS::ARRAY_MAX);
+		d[RS::ARRAY_VERTEX] = grid_points[i];
+		d[RS::ARRAY_COLOR] = grid_colors[i];
+		RenderingServer::get_singleton()->mesh_add_surface_from_arrays(grid[i], RenderingServer::PRIMITIVE_LINES, d);
+		RenderingServer::get_singleton()->mesh_surface_set_material(grid[i], 0, indicator_mat->get_rid());
 	}
 }
 
 void GridMapEditor::_notification(int p_what) {
-
 	switch (p_what) {
-
 		case NOTIFICATION_ENTER_TREE: {
-			get_tree()->connect("node_removed", this, "_node_removed");
-			mesh_library_palette->connect("item_selected", this, "_item_selected_cbk");
+			get_tree()->connect("node_removed", callable_mp(this, &GridMapEditor::_node_removed));
+			mesh_library_palette->connect("item_selected", callable_mp(this, &GridMapEditor::_item_selected_cbk));
 			for (int i = 0; i < 3; i++) {
-
-				grid[i] = VS::get_singleton()->mesh_create();
-				grid_instance[i] = VS::get_singleton()->instance_create2(grid[i], get_tree()->get_root()->get_world()->get_scenario());
-				selection_level_instance[i] = VisualServer::get_singleton()->instance_create2(selection_level_mesh[i], get_tree()->get_root()->get_world()->get_scenario());
+				grid[i] = RS::get_singleton()->mesh_create();
+				grid_instance[i] = RS::get_singleton()->instance_create2(grid[i], get_tree()->get_root()->get_world_3d()->get_scenario());
+				selection_level_instance[i] = RenderingServer::get_singleton()->instance_create2(selection_level_mesh[i], get_tree()->get_root()->get_world_3d()->get_scenario());
 			}
 
-			selection_instance = VisualServer::get_singleton()->instance_create2(selection_mesh, get_tree()->get_root()->get_world()->get_scenario());
-			paste_instance = VisualServer::get_singleton()->instance_create2(paste_mesh, get_tree()->get_root()->get_world()->get_scenario());
+			selection_instance = RenderingServer::get_singleton()->instance_create2(selection_mesh, get_tree()->get_root()->get_world_3d()->get_scenario());
+			paste_instance = RenderingServer::get_singleton()->instance_create2(paste_mesh, get_tree()->get_root()->get_world_3d()->get_scenario());
 
 			_update_selection_transform();
 			_update_paste_indicator();
 		} break;
 
 		case NOTIFICATION_EXIT_TREE: {
-			get_tree()->disconnect("node_removed", this, "_node_removed");
+			get_tree()->disconnect("node_removed", callable_mp(this, &GridMapEditor::_node_removed));
 			_clear_clipboard_data();
 
 			for (int i = 0; i < 3; i++) {
-
-				VS::get_singleton()->free(grid_instance[i]);
-				VS::get_singleton()->free(grid[i]);
+				RS::get_singleton()->free(grid_instance[i]);
+				RS::get_singleton()->free(grid[i]);
 				grid_instance[i] = RID();
 				grid[i] = RID();
-				VisualServer::get_singleton()->free(selection_level_instance[i]);
+				RenderingServer::get_singleton()->free(selection_level_instance[i]);
 			}
 
-			VisualServer::get_singleton()->free(selection_instance);
-			VisualServer::get_singleton()->free(paste_instance);
+			RenderingServer::get_singleton()->free(selection_instance);
+			RenderingServer::get_singleton()->free(paste_instance);
 			selection_instance = RID();
 			paste_instance = RID();
 		} break;
@@ -1104,17 +1067,16 @@ void GridMapEditor::_notification(int p_what) {
 
 			if (xf != grid_xform) {
 				for (int i = 0; i < 3; i++) {
-
-					VS::get_singleton()->instance_set_transform(grid_instance[i], xf * edit_grid_xform);
+					RS::get_singleton()->instance_set_transform(grid_instance[i], xf * edit_grid_xform);
 				}
 				grid_xform = xf;
 			}
 			Ref<MeshLibrary> cgmt = node->get_mesh_library();
-			if (cgmt.operator->() != last_mesh_library)
+			if (cgmt.operator->() != last_mesh_library) {
 				update_palette();
+			}
 
 			if (lock_view) {
-
 				EditorNode *editor = Object::cast_to<EditorNode>(get_tree()->get_root()->get_child(0));
 
 				Plane p;
@@ -1122,15 +1084,16 @@ void GridMapEditor::_notification(int p_what) {
 				p.d = edit_floor[edit_axis] * node->get_cell_size()[edit_axis];
 				p = node->get_transform().xform(p); // plane to snap
 
-				SpatialEditorPlugin *sep = Object::cast_to<SpatialEditorPlugin>(editor->get_editor_plugin_screen());
-				if (sep)
+				Node3DEditorPlugin *sep = Object::cast_to<Node3DEditorPlugin>(editor->get_editor_plugin_screen());
+				if (sep) {
 					sep->snap_cursor_to_plane(p);
+				}
 			}
 		} break;
 
 		case NOTIFICATION_THEME_CHANGED: {
-			options->set_icon(get_icon("GridMap", "EditorIcons"));
-			search_box->set_right_icon(get_icon("Search", "EditorIcons"));
+			options->set_icon(get_theme_icon("GridMap", "EditorIcons"));
+			search_box->set_right_icon(get_theme_icon("Search", "EditorIcons"));
 		} break;
 	}
 }
@@ -1140,18 +1103,17 @@ void GridMapEditor::_update_cursor_instance() {
 		return;
 	}
 
-	if (cursor_instance.is_valid())
-		VisualServer::get_singleton()->free(cursor_instance);
+	if (cursor_instance.is_valid()) {
+		RenderingServer::get_singleton()->free(cursor_instance);
+	}
 	cursor_instance = RID();
 
 	if (selected_palette >= 0) {
-
 		if (node && !node->get_mesh_library().is_null()) {
 			Ref<Mesh> mesh = node->get_mesh_library()->get_item_mesh(selected_palette);
 			if (!mesh.is_null() && mesh->get_rid().is_valid()) {
-
-				cursor_instance = VisualServer::get_singleton()->instance_create2(mesh->get_rid(), get_tree()->get_root()->get_world()->get_scenario());
-				VisualServer::get_singleton()->instance_set_transform(cursor_instance, cursor_transform);
+				cursor_instance = RenderingServer::get_singleton()->instance_create2(mesh->get_rid(), get_tree()->get_root()->get_world_3d()->get_scenario());
+				RenderingServer::get_singleton()->instance_set_transform(cursor_instance, cursor_transform);
 			}
 		}
 	}
@@ -1164,9 +1126,9 @@ void GridMapEditor::_item_selected_cbk(int idx) {
 }
 
 void GridMapEditor::_floor_changed(float p_value) {
-
-	if (updating)
+	if (updating) {
 		return;
+	}
 
 	edit_floor[edit_axis] = p_value;
 	node->set_meta("_editor_floor_", Vector3(edit_floor[0], edit_floor[1], edit_floor[2]));
@@ -1180,24 +1142,11 @@ void GridMapEditor::_floor_mouse_exited() {
 }
 
 void GridMapEditor::_bind_methods() {
-
-	ClassDB::bind_method("_text_changed", &GridMapEditor::_text_changed);
-	ClassDB::bind_method("_sbox_input", &GridMapEditor::_sbox_input);
-	ClassDB::bind_method("_icon_size_changed", &GridMapEditor::_icon_size_changed);
-	ClassDB::bind_method("_menu_option", &GridMapEditor::_menu_option);
 	ClassDB::bind_method("_configure", &GridMapEditor::_configure);
-	ClassDB::bind_method("_item_selected_cbk", &GridMapEditor::_item_selected_cbk);
-	ClassDB::bind_method("_floor_changed", &GridMapEditor::_floor_changed);
-	ClassDB::bind_method("_floor_mouse_exited", &GridMapEditor::_floor_mouse_exited);
 	ClassDB::bind_method("_set_selection", &GridMapEditor::_set_selection);
-	ClassDB::bind_method("_node_removed", &GridMapEditor::_node_removed);
-
-	ClassDB::bind_method(D_METHOD("_set_display_mode", "mode"), &GridMapEditor::_set_display_mode);
-	ClassDB::bind_method("_draw_grids", &GridMapEditor::_draw_grids);
 }
 
 GridMapEditor::GridMapEditor(EditorNode *p_editor) {
-
 	input_action = INPUT_NONE;
 	editor = p_editor;
 	undo_redo = p_editor->get_undo_redo();
@@ -1210,7 +1159,7 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) {
 	spatial_editor_hb = memnew(HBoxContainer);
 	spatial_editor_hb->set_h_size_flags(SIZE_EXPAND_FILL);
 	spatial_editor_hb->set_alignment(BoxContainer::ALIGN_END);
-	SpatialEditor::get_singleton()->add_control_to_menu_panel(spatial_editor_hb);
+	Node3DEditor::get_singleton()->add_control_to_menu_panel(spatial_editor_hb);
 
 	spin_box_label = memnew(Label);
 	spin_box_label->set_text(TTR("Floor:"));
@@ -1220,12 +1169,12 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) {
 	floor->set_min(-32767);
 	floor->set_max(32767);
 	floor->set_step(1);
-	floor->get_line_edit()->add_constant_override("minimum_spaces", 16);
+	floor->get_line_edit()->add_theme_constant_override("minimum_spaces", 16);
 
 	spatial_editor_hb->add_child(floor);
-	floor->connect("value_changed", this, "_floor_changed");
-	floor->connect("mouse_exited", this, "_floor_mouse_exited");
-	floor->get_line_edit()->connect("mouse_exited", this, "_floor_mouse_exited");
+	floor->connect("value_changed", callable_mp(this, &GridMapEditor::_floor_changed));
+	floor->connect("mouse_exited", callable_mp(this, &GridMapEditor::_floor_mouse_exited));
+	floor->get_line_edit()->connect("mouse_exited", callable_mp(this, &GridMapEditor::_floor_mouse_exited));
 
 	spatial_editor_hb->add_child(memnew(VSeparator));
 
@@ -1282,7 +1231,7 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) {
 	settings_vbc->add_margin_child(TTR("Pick Distance:"), settings_pick_distance);
 
 	clip_mode = CLIP_DISABLED;
-	options->get_popup()->connect("id_pressed", this, "_menu_option");
+	options->get_popup()->connect("id_pressed", callable_mp(this, &GridMapEditor::_menu_option));
 
 	HBoxContainer *hb = memnew(HBoxContainer);
 	add_child(hb);
@@ -1292,30 +1241,32 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) {
 	search_box->set_h_size_flags(SIZE_EXPAND_FILL);
 	search_box->set_placeholder(TTR("Filter meshes"));
 	hb->add_child(search_box);
-	search_box->connect("text_changed", this, "_text_changed");
-	search_box->connect("gui_input", this, "_sbox_input");
+	search_box->connect("text_changed", callable_mp(this, &GridMapEditor::_text_changed));
+	search_box->connect("gui_input", callable_mp(this, &GridMapEditor::_sbox_input));
 
-	mode_thumbnail = memnew(ToolButton);
+	mode_thumbnail = memnew(Button);
+	mode_thumbnail->set_flat(true);
 	mode_thumbnail->set_toggle_mode(true);
 	mode_thumbnail->set_pressed(true);
-	mode_thumbnail->set_icon(p_editor->get_gui_base()->get_icon("FileThumbnail", "EditorIcons"));
+	mode_thumbnail->set_icon(p_editor->get_gui_base()->get_theme_icon("FileThumbnail", "EditorIcons"));
 	hb->add_child(mode_thumbnail);
-	mode_thumbnail->connect("pressed", this, "_set_display_mode", varray(DISPLAY_THUMBNAIL));
+	mode_thumbnail->connect("pressed", callable_mp(this, &GridMapEditor::_set_display_mode), varray(DISPLAY_THUMBNAIL));
 
-	mode_list = memnew(ToolButton);
+	mode_list = memnew(Button);
+	mode_list->set_flat(true);
 	mode_list->set_toggle_mode(true);
 	mode_list->set_pressed(false);
-	mode_list->set_icon(p_editor->get_gui_base()->get_icon("FileList", "EditorIcons"));
+	mode_list->set_icon(p_editor->get_gui_base()->get_theme_icon("FileList", "EditorIcons"));
 	hb->add_child(mode_list);
-	mode_list->connect("pressed", this, "_set_display_mode", varray(DISPLAY_LIST));
+	mode_list->connect("pressed", callable_mp(this, &GridMapEditor::_set_display_mode), varray(DISPLAY_LIST));
 
 	size_slider = memnew(HSlider);
 	size_slider->set_h_size_flags(SIZE_EXPAND_FILL);
-	size_slider->set_min(0.1f);
+	size_slider->set_min(0.2f);
 	size_slider->set_max(4.0f);
 	size_slider->set_step(0.1f);
 	size_slider->set_value(1.0f);
-	size_slider->connect("value_changed", this, "_icon_size_changed");
+	size_slider->connect("value_changed", callable_mp(this, &GridMapEditor::_icon_size_changed));
 	add_child(size_slider);
 
 	EDITOR_DEF("editors/grid_map/preview_size", 64);
@@ -1325,6 +1276,7 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) {
 	mesh_library_palette = memnew(ItemList);
 	add_child(mesh_library_palette);
 	mesh_library_palette->set_v_size_flags(SIZE_EXPAND_FILL);
+	mesh_library_palette->connect("gui_input", callable_mp(this, &GridMapEditor::_mesh_library_palette_input));
 
 	info_message = memnew(Label);
 	info_message->set_text(TTR("Give a MeshLibrary resource to this GridMap to use its meshes."));
@@ -1345,33 +1297,31 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) {
 	lock_view = false;
 	cursor_rot = 0;
 
-	selection_mesh = VisualServer::get_singleton()->mesh_create();
-	paste_mesh = VisualServer::get_singleton()->mesh_create();
+	selection_mesh = RenderingServer::get_singleton()->mesh_create();
+	paste_mesh = RenderingServer::get_singleton()->mesh_create();
 
 	{
 		// Selection mesh create.
 
-		PoolVector<Vector3> lines;
-		PoolVector<Vector3> triangles;
-		PoolVector<Vector3> square[3];
+		Vector<Vector3> lines;
+		Vector<Vector3> triangles;
+		Vector<Vector3> square[3];
 
 		for (int i = 0; i < 6; i++) {
-
 			Vector3 face_points[4];
 
 			for (int j = 0; j < 4; j++) {
-
 				float v[3];
 				v[0] = 1.0;
 				v[1] = 1 - 2 * ((j >> 1) & 1);
 				v[2] = v[1] * (1 - 2 * (j & 1));
 
 				for (int k = 0; k < 3; k++) {
-
-					if (i < 3)
+					if (i < 3) {
 						face_points[j][(i + k) % 3] = v[k];
-					else
+					} else {
 						face_points[3 - j][(i + k) % 3] = -v[k];
+					}
 				}
 			}
 
@@ -1385,7 +1335,6 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) {
 		}
 
 		for (int i = 0; i < 12; i++) {
-
 			AABB base(Vector3(0, 0, 0), Vector3(1, 1, 1));
 			Vector3 a, b;
 			base.get_edge(i, a, b);
@@ -1396,9 +1345,8 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) {
 		for (int i = 0; i < 3; i++) {
 			Vector3 points[4];
 			for (int j = 0; j < 4; j++) {
-
-				static const bool orderx[4] = { 0, 1, 1, 0 };
-				static const bool ordery[4] = { 0, 0, 1, 1 };
+				static const bool orderx[4] = { false, true, true, false };
+				static const bool ordery[4] = { false, false, true, true };
 
 				Vector3 sp;
 				if (orderx[j]) {
@@ -1412,7 +1360,6 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) {
 			}
 
 			for (int j = 0; j < 4; j++) {
-
 				Vector3 ofs;
 				ofs[i] += 0.01;
 				square[i].push_back(points[j] - ofs);
@@ -1423,47 +1370,46 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) {
 		}
 
 		Array d;
-		d.resize(VS::ARRAY_MAX);
+		d.resize(RS::ARRAY_MAX);
 
 		inner_mat.instance();
 		inner_mat->set_albedo(Color(0.7, 0.7, 1.0, 0.2));
-		inner_mat->set_flag(SpatialMaterial::FLAG_UNSHADED, true);
-		inner_mat->set_feature(SpatialMaterial::FEATURE_TRANSPARENT, true);
+		inner_mat->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED);
+		inner_mat->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA);
 
-		d[VS::ARRAY_VERTEX] = triangles;
-		VisualServer::get_singleton()->mesh_add_surface_from_arrays(selection_mesh, VS::PRIMITIVE_TRIANGLES, d);
-		VisualServer::get_singleton()->mesh_surface_set_material(selection_mesh, 0, inner_mat->get_rid());
+		d[RS::ARRAY_VERTEX] = triangles;
+		RenderingServer::get_singleton()->mesh_add_surface_from_arrays(selection_mesh, RS::PRIMITIVE_TRIANGLES, d);
+		RenderingServer::get_singleton()->mesh_surface_set_material(selection_mesh, 0, inner_mat->get_rid());
 
 		outer_mat.instance();
 		outer_mat->set_albedo(Color(0.7, 0.7, 1.0, 0.8));
 		outer_mat->set_on_top_of_alpha();
-		outer_mat->set_flag(SpatialMaterial::FLAG_UNSHADED, true);
-		outer_mat->set_line_width(3.0);
-		outer_mat->set_feature(SpatialMaterial::FEATURE_TRANSPARENT, true);
+
+		outer_mat->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED);
+		outer_mat->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA);
 
 		selection_floor_mat.instance();
 		selection_floor_mat->set_albedo(Color(0.80, 0.80, 1.0, 1));
 		selection_floor_mat->set_on_top_of_alpha();
-		selection_floor_mat->set_flag(SpatialMaterial::FLAG_UNSHADED, true);
-		selection_floor_mat->set_line_width(3.0);
+		selection_floor_mat->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED);
 
-		d[VS::ARRAY_VERTEX] = lines;
-		VisualServer::get_singleton()->mesh_add_surface_from_arrays(selection_mesh, VS::PRIMITIVE_LINES, d);
-		VisualServer::get_singleton()->mesh_surface_set_material(selection_mesh, 1, outer_mat->get_rid());
+		d[RS::ARRAY_VERTEX] = lines;
+		RenderingServer::get_singleton()->mesh_add_surface_from_arrays(selection_mesh, RS::PRIMITIVE_LINES, d);
+		RenderingServer::get_singleton()->mesh_surface_set_material(selection_mesh, 1, outer_mat->get_rid());
 
-		d[VS::ARRAY_VERTEX] = triangles;
-		VisualServer::get_singleton()->mesh_add_surface_from_arrays(paste_mesh, VS::PRIMITIVE_TRIANGLES, d);
-		VisualServer::get_singleton()->mesh_surface_set_material(paste_mesh, 0, inner_mat->get_rid());
+		d[RS::ARRAY_VERTEX] = triangles;
+		RenderingServer::get_singleton()->mesh_add_surface_from_arrays(paste_mesh, RS::PRIMITIVE_TRIANGLES, d);
+		RenderingServer::get_singleton()->mesh_surface_set_material(paste_mesh, 0, inner_mat->get_rid());
 
-		d[VS::ARRAY_VERTEX] = lines;
-		VisualServer::get_singleton()->mesh_add_surface_from_arrays(paste_mesh, VS::PRIMITIVE_LINES, d);
-		VisualServer::get_singleton()->mesh_surface_set_material(paste_mesh, 1, outer_mat->get_rid());
+		d[RS::ARRAY_VERTEX] = lines;
+		RenderingServer::get_singleton()->mesh_add_surface_from_arrays(paste_mesh, RS::PRIMITIVE_LINES, d);
+		RenderingServer::get_singleton()->mesh_surface_set_material(paste_mesh, 1, outer_mat->get_rid());
 
 		for (int i = 0; i < 3; i++) {
-			d[VS::ARRAY_VERTEX] = square[i];
-			selection_level_mesh[i] = VS::get_singleton()->mesh_create();
-			VisualServer::get_singleton()->mesh_add_surface_from_arrays(selection_level_mesh[i], VS::PRIMITIVE_LINES, d);
-			VisualServer::get_singleton()->mesh_surface_set_material(selection_level_mesh[i], 0, selection_floor_mat->get_rid());
+			d[RS::ARRAY_VERTEX] = square[i];
+			selection_level_mesh[i] = RS::get_singleton()->mesh_create();
+			RenderingServer::get_singleton()->mesh_add_surface_from_arrays(selection_level_mesh[i], RS::PRIMITIVE_LINES, d);
+			RenderingServer::get_singleton()->mesh_surface_set_material(selection_level_mesh[i], 0, selection_floor_mat->get_rid());
 		}
 	}
 
@@ -1472,82 +1418,80 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) {
 	accumulated_floor_delta = 0.0;
 
 	indicator_mat.instance();
-	indicator_mat->set_flag(SpatialMaterial::FLAG_UNSHADED, true);
-	indicator_mat->set_feature(SpatialMaterial::FEATURE_TRANSPARENT, true);
-	indicator_mat->set_flag(SpatialMaterial::FLAG_SRGB_VERTEX_COLOR, true);
-	indicator_mat->set_flag(SpatialMaterial::FLAG_ALBEDO_FROM_VERTEX_COLOR, true);
+	indicator_mat->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED);
+	indicator_mat->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA);
+	indicator_mat->set_flag(StandardMaterial3D::FLAG_SRGB_VERTEX_COLOR, true);
+	indicator_mat->set_flag(StandardMaterial3D::FLAG_ALBEDO_FROM_VERTEX_COLOR, true);
 	indicator_mat->set_albedo(Color(0.8, 0.5, 0.1));
 }
 
 GridMapEditor::~GridMapEditor() {
-
 	_clear_clipboard_data();
 
 	for (int i = 0; i < 3; i++) {
-
-		if (grid[i].is_valid())
-			VisualServer::get_singleton()->free(grid[i]);
-		if (grid_instance[i].is_valid())
-			VisualServer::get_singleton()->free(grid_instance[i]);
-		if (cursor_instance.is_valid())
-			VisualServer::get_singleton()->free(cursor_instance);
-		if (selection_level_instance[i].is_valid())
-			VisualServer::get_singleton()->free(selection_level_instance[i]);
-		if (selection_level_mesh[i].is_valid())
-			VisualServer::get_singleton()->free(selection_level_mesh[i]);
+		if (grid[i].is_valid()) {
+			RenderingServer::get_singleton()->free(grid[i]);
+		}
+		if (grid_instance[i].is_valid()) {
+			RenderingServer::get_singleton()->free(grid_instance[i]);
+		}
+		if (cursor_instance.is_valid()) {
+			RenderingServer::get_singleton()->free(cursor_instance);
+		}
+		if (selection_level_instance[i].is_valid()) {
+			RenderingServer::get_singleton()->free(selection_level_instance[i]);
+		}
+		if (selection_level_mesh[i].is_valid()) {
+			RenderingServer::get_singleton()->free(selection_level_mesh[i]);
+		}
 	}
 
-	VisualServer::get_singleton()->free(selection_mesh);
-	if (selection_instance.is_valid())
-		VisualServer::get_singleton()->free(selection_instance);
+	RenderingServer::get_singleton()->free(selection_mesh);
+	if (selection_instance.is_valid()) {
+		RenderingServer::get_singleton()->free(selection_instance);
+	}
 
-	VisualServer::get_singleton()->free(paste_mesh);
-	if (paste_instance.is_valid())
-		VisualServer::get_singleton()->free(paste_instance);
+	RenderingServer::get_singleton()->free(paste_mesh);
+	if (paste_instance.is_valid()) {
+		RenderingServer::get_singleton()->free(paste_instance);
+	}
 }
 
 void GridMapEditorPlugin::_notification(int p_what) {
-
 	if (p_what == EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED) {
-
 		switch ((int)EditorSettings::get_singleton()->get("editors/grid_map/editor_side")) {
 			case 0: { // Left.
-				SpatialEditor::get_singleton()->get_palette_split()->move_child(grid_map_editor, 0);
+				Node3DEditor::get_singleton()->get_palette_split()->move_child(grid_map_editor, 0);
 			} break;
 			case 1: { // Right.
-				SpatialEditor::get_singleton()->get_palette_split()->move_child(grid_map_editor, 1);
+				Node3DEditor::get_singleton()->get_palette_split()->move_child(grid_map_editor, 1);
 			} break;
 		}
 	}
 }
 
 void GridMapEditorPlugin::edit(Object *p_object) {
-
 	grid_map_editor->edit(Object::cast_to<GridMap>(p_object));
 }
 
 bool GridMapEditorPlugin::handles(Object *p_object) const {
-
 	return p_object->is_class("GridMap");
 }
 
 void GridMapEditorPlugin::make_visible(bool p_visible) {
-
 	if (p_visible) {
 		grid_map_editor->show();
 		grid_map_editor->spatial_editor_hb->show();
 		grid_map_editor->set_process(true);
 	} else {
-
 		grid_map_editor->spatial_editor_hb->hide();
 		grid_map_editor->hide();
-		grid_map_editor->edit(NULL);
+		grid_map_editor->edit(nullptr);
 		grid_map_editor->set_process(false);
 	}
 }
 
 GridMapEditorPlugin::GridMapEditorPlugin(EditorNode *p_node) {
-
 	editor = p_node;
 
 	EDITOR_DEF("editors/grid_map/editor_side", 1);
diff --git a/modules/gridmap/grid_map_editor_plugin.h b/modules/gridmap/grid_map_editor_plugin.h
index 404e95b74c..7e136ff9bb 100644
--- a/modules/gridmap/grid_map_editor_plugin.h
+++ b/modules/gridmap/grid_map_editor_plugin.h
@@ -33,10 +33,9 @@
 
 #include "editor/editor_node.h"
 #include "editor/editor_plugin.h"
-#include "editor/pane_drag.h"
 #include "grid_map.h"
 
-class SpatialEditorPlugin;
+class Node3DEditorPlugin;
 
 class GridMapEditor : public VBoxContainer {
 	GDCLASS(GridMapEditor, VBoxContainer);
@@ -74,8 +73,8 @@ class GridMapEditor : public VBoxContainer {
 	MenuButton *options;
 	SpinBox *floor;
 	double accumulated_floor_delta;
-	ToolButton *mode_thumbnail;
-	ToolButton *mode_list;
+	Button *mode_thumbnail;
+	Button *mode_list;
 	LineEdit *search_box;
 	HSlider *size_slider;
 	HBoxContainer *spatial_editor_hb;
@@ -85,8 +84,7 @@ class GridMapEditor : public VBoxContainer {
 	Label *spin_box_label;
 
 	struct SetItem {
-
-		Vector3 pos;
+		Vector3i position;
 		int new_value;
 		int new_orientation;
 		int old_value;
@@ -125,15 +123,14 @@ class GridMapEditor : public VBoxContainer {
 
 	List<ClipboardItem> clipboard_items;
 
-	Ref<SpatialMaterial> indicator_mat;
-	Ref<SpatialMaterial> inner_mat;
-	Ref<SpatialMaterial> outer_mat;
-	Ref<SpatialMaterial> selection_floor_mat;
+	Ref<StandardMaterial3D> indicator_mat;
+	Ref<StandardMaterial3D> inner_mat;
+	Ref<StandardMaterial3D> outer_mat;
+	Ref<StandardMaterial3D> selection_floor_mat;
 
 	bool updating;
 
 	struct Selection {
-
 		Vector3 click;
 		Vector3 current;
 		Vector3 begin;
@@ -143,7 +140,6 @@ class GridMapEditor : public VBoxContainer {
 	Selection last_selection;
 
 	struct PasteIndicator {
-
 		Vector3 click;
 		Vector3 current;
 		Vector3 begin;
@@ -188,10 +184,9 @@ class GridMapEditor : public VBoxContainer {
 
 	};
 
-	SpatialEditorPlugin *spatial_editor;
+	Node3DEditorPlugin *spatial_editor;
 
 	struct AreaDisplay {
-
 		RID mesh;
 		RID instance;
 	};
@@ -214,6 +209,7 @@ class GridMapEditor : public VBoxContainer {
 
 	void _text_changed(const String &p_text);
 	void _sbox_input(const Ref<InputEvent> &p_ie);
+	void _mesh_library_palette_input(const Ref<InputEvent> &p_ie);
 
 	void _icon_size_changed(float p_value);
 
@@ -231,7 +227,7 @@ class GridMapEditor : public VBoxContainer {
 	void _delete_selection();
 	void _fill_selection();
 
-	bool do_input_action(Camera *p_camera, const Point2 &p_point, bool p_click);
+	bool do_input_action(Camera3D *p_camera, const Point2 &p_point, bool p_click);
 
 	friend class GridMapEditorPlugin;
 
@@ -241,7 +237,7 @@ protected:
 	static void _bind_methods();
 
 public:
-	bool forward_spatial_input_event(Camera *p_camera, const Ref<InputEvent> &p_event);
+	bool forward_spatial_input_event(Camera3D *p_camera, const Ref<InputEvent> &p_event);
 
 	void edit(GridMap *p_gridmap);
 	GridMapEditor() {}
@@ -250,7 +246,6 @@ public:
 };
 
 class GridMapEditorPlugin : public EditorPlugin {
-
 	GDCLASS(GridMapEditorPlugin, EditorPlugin);
 
 	GridMapEditor *grid_map_editor;
@@ -260,12 +255,12 @@ protected:
 	void _notification(int p_what);
 
 public:
-	virtual bool forward_spatial_gui_input(Camera *p_camera, const Ref<InputEvent> &p_event) { return grid_map_editor->forward_spatial_input_event(p_camera, p_event); }
-	virtual String get_name() const { return "GridMap"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
-	virtual void make_visible(bool p_visible);
+	virtual bool forward_spatial_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event) override { return grid_map_editor->forward_spatial_input_event(p_camera, p_event); }
+	virtual String get_name() const override { return "GridMap"; }
+	bool has_main_screen() const override { return false; }
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
 
 	GridMapEditorPlugin(EditorNode *p_node);
 	~GridMapEditorPlugin();
diff --git a/modules/gridmap/icons/icon_grid_map.svg b/modules/gridmap/icons/GridMap.svg
index eafe1211f2..eafe1211f2 100644
--- a/modules/gridmap/icons/icon_grid_map.svg
+++ b/modules/gridmap/icons/GridMap.svg
diff --git a/modules/gridmap/register_types.cpp b/modules/gridmap/register_types.cpp
index afd51945ab..906e506b62 100644
--- a/modules/gridmap/register_types.cpp
+++ b/modules/gridmap/register_types.cpp
@@ -36,7 +36,6 @@
 #endif
 
 void register_gridmap_types() {
-
 #ifndef _3D_DISABLED
 	ClassDB::register_class<GridMap>();
 #ifdef TOOLS_ENABLED
diff --git a/modules/gridmap/register_types.h b/modules/gridmap/register_types.h
index bc720f460c..c0e3c39ca8 100644
--- a/modules/gridmap/register_types.h
+++ b/modules/gridmap/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef GRIDMAP_REGISTER_TYPES_H
+#define GRIDMAP_REGISTER_TYPES_H
+
 void register_gridmap_types();
 void unregister_gridmap_types();
+
+#endif // GRIDMAP_REGISTER_TYPES_H
diff --git a/modules/hdr/SCsub b/modules/hdr/SCsub
index c960e8126b..a709397c9a 100644
--- a/modules/hdr/SCsub
+++ b/modules/hdr/SCsub
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_hdr = env_modules.Clone()
 
diff --git a/modules/hdr/config.py b/modules/hdr/config.py
index 1c8cd12a2d..d22f9454ed 100644
--- a/modules/hdr/config.py
+++ b/modules/hdr/config.py
@@ -1,5 +1,6 @@
 def can_build(env, platform):
     return True
 
+
 def configure(env):
     pass
diff --git a/modules/hdr/image_loader_hdr.cpp b/modules/hdr/image_loader_hdr.cpp
index 4505df0f8f..333b1cf377 100644
--- a/modules/hdr/image_loader_hdr.cpp
+++ b/modules/hdr/image_loader_hdr.cpp
@@ -34,7 +34,6 @@
 #include "core/print_string.h"
 
 Error ImageLoaderHDR::load_image(Ref<Image> p_image, FileAccess *f, bool p_force_linear, float p_scale) {
-
 	String header = f->get_token();
 
 	ERR_FAIL_COND_V_MSG(header != "#?RADIANCE" && header != "#?RGBE", ERR_FILE_UNRECOGNIZED, "Unsupported header information in HDR: " + header + ".");
@@ -42,12 +41,13 @@ Error ImageLoaderHDR::load_image(Ref<Image> p_image, FileAccess *f, bool p_force
 	while (true) {
 		String line = f->get_line();
 		ERR_FAIL_COND_V(f->eof_reached(), ERR_FILE_UNRECOGNIZED);
-		if (line == "") // empty line indicates end of header
+		if (line == "") { // empty line indicates end of header
 			break;
+		}
 		if (line.begins_with("FORMAT=")) { // leave option to implement other commands
 			ERR_FAIL_COND_V_MSG(line != "FORMAT=32-bit_rle_rgbe", ERR_FILE_UNRECOGNIZED, "Only 32-bit_rle_rgbe is supported for HDR files.");
 		} else if (!line.begins_with("#")) { // not comment
-			WARN_PRINTS("Ignoring unsupported header information in HDR: " + line + ".");
+			WARN_PRINT("Ignoring unsupported header information in HDR: " + line + ".");
 		}
 	}
 
@@ -63,15 +63,14 @@ Error ImageLoaderHDR::load_image(Ref<Image> p_image, FileAccess *f, bool p_force
 
 	int width = f->get_line().to_int();
 
-	PoolVector<uint8_t> imgdata;
+	Vector<uint8_t> imgdata;
 
 	imgdata.resize(height * width * sizeof(uint32_t));
 
 	{
+		uint8_t *w = imgdata.ptrw();
 
-		PoolVector<uint8_t>::Write w = imgdata.write();
-
-		uint8_t *ptr = (uint8_t *)w.ptr();
+		uint8_t *ptr = (uint8_t *)w;
 
 		if (width < 8 || width >= 32768) {
 			// Read flat data
@@ -109,12 +108,14 @@ Error ImageLoaderHDR::load_image(Ref<Image> p_image, FileAccess *f, bool p_force
 							// Run
 							int value = f->get_8();
 							count -= 128;
-							for (int z = 0; z < count; ++z)
+							for (int z = 0; z < count; ++z) {
 								ptr[(j * width + i++) * 4 + k] = uint8_t(value);
+							}
 						} else {
 							// Dump
-							for (int z = 0; z < count; ++z)
+							for (int z = 0; z < count; ++z) {
 								ptr[(j * width + i++) * 4 + k] = f->get_8();
+							}
 						}
 					}
 				}
@@ -123,7 +124,6 @@ Error ImageLoaderHDR::load_image(Ref<Image> p_image, FileAccess *f, bool p_force
 
 		//convert
 		for (int i = 0; i < width * height; i++) {
-
 			float exp = pow(2.0f, ptr[3] - 128.0f);
 
 			Color c(
@@ -146,7 +146,6 @@ Error ImageLoaderHDR::load_image(Ref<Image> p_image, FileAccess *f, bool p_force
 }
 
 void ImageLoaderHDR::get_recognized_extensions(List<String> *p_extensions) const {
-
 	p_extensions->push_back("hdr");
 }
 
diff --git a/modules/hdr/image_loader_hdr.h b/modules/hdr/image_loader_hdr.h
index a5f1f9c387..ef8e116616 100644
--- a/modules/hdr/image_loader_hdr.h
+++ b/modules/hdr/image_loader_hdr.h
@@ -34,7 +34,6 @@
 #include "core/io/image_loader.h"
 
 class ImageLoaderHDR : public ImageFormatLoader {
-
 public:
 	virtual Error load_image(Ref<Image> p_image, FileAccess *f, bool p_force_linear, float p_scale);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
diff --git a/modules/hdr/register_types.cpp b/modules/hdr/register_types.cpp
index 2ef6b7cd07..e749928f60 100644
--- a/modules/hdr/register_types.cpp
+++ b/modules/hdr/register_types.cpp
@@ -32,15 +32,13 @@
 
 #include "image_loader_hdr.h"
 
-static ImageLoaderHDR *image_loader_hdr = NULL;
+static ImageLoaderHDR *image_loader_hdr = nullptr;
 
 void register_hdr_types() {
-
 	image_loader_hdr = memnew(ImageLoaderHDR);
 	ImageLoader::add_image_format_loader(image_loader_hdr);
 }
 
 void unregister_hdr_types() {
-
 	memdelete(image_loader_hdr);
 }
diff --git a/modules/hdr/register_types.h b/modules/hdr/register_types.h
index c1c69a1e27..02441516ec 100644
--- a/modules/hdr/register_types.h
+++ b/modules/hdr/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef HDR_REGISTER_TYPES_H
+#define HDR_REGISTER_TYPES_H
+
 void register_hdr_types();
 void unregister_hdr_types();
+
+#endif // HDR_REGISTER_TYPES_H
diff --git a/modules/jpg/SCsub b/modules/jpg/SCsub
index 96e8e704dd..8ee8e6dd6e 100644
--- a/modules/jpg/SCsub
+++ b/modules/jpg/SCsub
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_jpg = env_modules.Clone()
 
diff --git a/modules/jpg/config.py b/modules/jpg/config.py
index 1c8cd12a2d..d22f9454ed 100644
--- a/modules/jpg/config.py
+++ b/modules/jpg/config.py
@@ -1,5 +1,6 @@
 def can_build(env, platform):
     return True
 
+
 def configure(env):
     pass
diff --git a/modules/jpg/image_loader_jpegd.cpp b/modules/jpg/image_loader_jpegd.cpp
index a1f0f0ef6a..9c7ace5cf2 100644
--- a/modules/jpg/image_loader_jpegd.cpp
+++ b/modules/jpg/image_loader_jpegd.cpp
@@ -37,7 +37,6 @@
 #include <string.h>
 
 Error jpeg_load_image_from_buffer(Image *p_image, const uint8_t *p_buffer, int p_buffer_len) {
-
 	jpgd::jpeg_decoder_mem_stream mem_stream(p_buffer, p_buffer_len);
 
 	jpgd::jpeg_decoder decoder(&mem_stream);
@@ -49,21 +48,23 @@ Error jpeg_load_image_from_buffer(Image *p_image, const uint8_t *p_buffer, int p
 	const int image_width = decoder.get_width();
 	const int image_height = decoder.get_height();
 	const int comps = decoder.get_num_components();
-	if (comps != 1 && comps != 3)
+	if (comps != 1 && comps != 3) {
 		return ERR_FILE_CORRUPT;
+	}
 
-	if (decoder.begin_decoding() != jpgd::JPGD_SUCCESS)
+	if (decoder.begin_decoding() != jpgd::JPGD_SUCCESS) {
 		return ERR_FILE_CORRUPT;
+	}
 
 	const int dst_bpl = image_width * comps;
 
-	PoolVector<uint8_t> data;
+	Vector<uint8_t> data;
 
 	data.resize(dst_bpl * image_height);
 
-	PoolVector<uint8_t>::Write dw = data.write();
+	uint8_t *dw = data.ptrw();
 
-	jpgd::uint8 *pImage_data = (jpgd::uint8 *)dw.ptr();
+	jpgd::uint8 *pImage_data = (jpgd::uint8 *)dw;
 
 	for (int y = 0; y < image_height; y++) {
 		const jpgd::uint8 *pScan_line;
@@ -91,43 +92,40 @@ Error jpeg_load_image_from_buffer(Image *p_image, const uint8_t *p_buffer, int p
 	//all good
 
 	Image::Format fmt;
-	if (comps == 1)
+	if (comps == 1) {
 		fmt = Image::FORMAT_L8;
-	else
+	} else {
 		fmt = Image::FORMAT_RGB8;
+	}
 
-	dw.release();
-	p_image->create(image_width, image_height, 0, fmt, data);
+	p_image->create(image_width, image_height, false, fmt, data);
 
 	return OK;
 }
 
 Error ImageLoaderJPG::load_image(Ref<Image> p_image, FileAccess *f, bool p_force_linear, float p_scale) {
-
-	PoolVector<uint8_t> src_image;
+	Vector<uint8_t> src_image;
 	int src_image_len = f->get_len();
 	ERR_FAIL_COND_V(src_image_len == 0, ERR_FILE_CORRUPT);
 	src_image.resize(src_image_len);
 
-	PoolVector<uint8_t>::Write w = src_image.write();
+	uint8_t *w = src_image.ptrw();
 
 	f->get_buffer(&w[0], src_image_len);
 
 	f->close();
 
-	Error err = jpeg_load_image_from_buffer(p_image.ptr(), w.ptr(), src_image_len);
+	Error err = jpeg_load_image_from_buffer(p_image.ptr(), w, src_image_len);
 
 	return err;
 }
 
 void ImageLoaderJPG::get_recognized_extensions(List<String> *p_extensions) const {
-
 	p_extensions->push_back("jpg");
 	p_extensions->push_back("jpeg");
 }
 
 static Ref<Image> _jpegd_mem_loader_func(const uint8_t *p_png, int p_size) {
-
 	Ref<Image> img;
 	img.instance();
 	Error err = jpeg_load_image_from_buffer(img.ptr(), p_png, p_size);
@@ -136,6 +134,5 @@ static Ref<Image> _jpegd_mem_loader_func(const uint8_t *p_png, int p_size) {
 }
 
 ImageLoaderJPG::ImageLoaderJPG() {
-
 	Image::_jpg_mem_loader_func = _jpegd_mem_loader_func;
 }
diff --git a/modules/jpg/image_loader_jpegd.h b/modules/jpg/image_loader_jpegd.h
index 9ef37ae303..9aebaad9e3 100644
--- a/modules/jpg/image_loader_jpegd.h
+++ b/modules/jpg/image_loader_jpegd.h
@@ -34,7 +34,6 @@
 #include "core/io/image_loader.h"
 
 class ImageLoaderJPG : public ImageFormatLoader {
-
 public:
 	virtual Error load_image(Ref<Image> p_image, FileAccess *f, bool p_force_linear, float p_scale);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
diff --git a/modules/jpg/register_types.cpp b/modules/jpg/register_types.cpp
index f6077d5c68..b31746f769 100644
--- a/modules/jpg/register_types.cpp
+++ b/modules/jpg/register_types.cpp
@@ -32,15 +32,13 @@
 
 #include "image_loader_jpegd.h"
 
-static ImageLoaderJPG *image_loader_jpg = NULL;
+static ImageLoaderJPG *image_loader_jpg = nullptr;
 
 void register_jpg_types() {
-
 	image_loader_jpg = memnew(ImageLoaderJPG);
 	ImageLoader::add_image_format_loader(image_loader_jpg);
 }
 
 void unregister_jpg_types() {
-
 	memdelete(image_loader_jpg);
 }
diff --git a/modules/jpg/register_types.h b/modules/jpg/register_types.h
index 291098fae2..52cd378b3a 100644
--- a/modules/jpg/register_types.h
+++ b/modules/jpg/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef JPG_REGISTER_TYPES_H
+#define JPG_REGISTER_TYPES_H
+
 void register_jpg_types();
 void unregister_jpg_types();
+
+#endif // JPG_REGISTER_TYPES_H
diff --git a/modules/jsonrpc/SCsub b/modules/jsonrpc/SCsub
index 13c9ffb253..fe5312670a 100644
--- a/modules/jsonrpc/SCsub
+++ b/modules/jsonrpc/SCsub
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_jsonrpc = env_modules.Clone()
 env_jsonrpc.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/jsonrpc/config.py b/modules/jsonrpc/config.py
index 53bc827027..d22f9454ed 100644
--- a/modules/jsonrpc/config.py
+++ b/modules/jsonrpc/config.py
@@ -1,5 +1,6 @@
 def can_build(env, platform):
-	return True
+    return True
+
 
 def configure(env):
-	pass
+    pass
diff --git a/modules/jsonrpc/jsonrpc.cpp b/modules/jsonrpc/jsonrpc.cpp
index 014b65e3e2..320da182f8 100644
--- a/modules/jsonrpc/jsonrpc.cpp
+++ b/modules/jsonrpc/jsonrpc.cpp
@@ -98,6 +98,10 @@ Variant JSONRPC::process_action(const Variant &p_action, bool p_process_arr_elem
 	if (p_action.get_type() == Variant::DICTIONARY) {
 		Dictionary dict = p_action;
 		String method = dict.get("method", "");
+		if (method.begins_with("$/")) {
+			return ret;
+		}
+
 		Array args;
 		if (dict.has("params")) {
 			Variant params = dict.get("params", Variant());
@@ -119,8 +123,8 @@ Variant JSONRPC::process_action(const Variant &p_action, bool p_process_arr_elem
 			id = dict["id"];
 		}
 
-		if (object == NULL || !object->has_method(method)) {
-			ret = make_response_error(JSONRPC::METHOD_NOT_FOUND, "Method not found", id);
+		if (object == nullptr || !object->has_method(method)) {
+			ret = make_response_error(JSONRPC::METHOD_NOT_FOUND, "Method not found: " + method, id);
 		} else {
 			Variant call_ret = object->callv(method, args);
 			if (id.get_type() != Variant::NIL) {
@@ -147,8 +151,9 @@ Variant JSONRPC::process_action(const Variant &p_action, bool p_process_arr_elem
 }
 
 String JSONRPC::process_string(const String &p_input) {
-
-	if (p_input.empty()) return String();
+	if (p_input.empty()) {
+		return String();
+	}
 
 	Variant ret;
 	Variant input;
diff --git a/modules/jsonrpc/register_types.h b/modules/jsonrpc/register_types.h
index 958f16344a..854d73a21f 100644
--- a/modules/jsonrpc/register_types.h
+++ b/modules/jsonrpc/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef JSONRPC_REGISTER_TYPES_H
+#define JSONRPC_REGISTER_TYPES_H
+
 void register_jsonrpc_types();
 void unregister_jsonrpc_types();
+
+#endif // JSONRPC_REGISTER_TYPES_H
diff --git a/modules/lightmapper_rd/SCsub b/modules/lightmapper_rd/SCsub
new file mode 100644
index 0000000000..2f04f1833e
--- /dev/null
+++ b/modules/lightmapper_rd/SCsub
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+Import("env")
+Import("env_modules")
+
+env_lightmapper_rd = env_modules.Clone()
+env_lightmapper_rd.GLSL_HEADER("lm_raster.glsl")
+env_lightmapper_rd.GLSL_HEADER("lm_compute.glsl")
+env_lightmapper_rd.GLSL_HEADER("lm_blendseams.glsl")
+
+# Godot source files
+env_lightmapper_rd.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/lightmapper_rd/config.py b/modules/lightmapper_rd/config.py
new file mode 100644
index 0000000000..d22f9454ed
--- /dev/null
+++ b/modules/lightmapper_rd/config.py
@@ -0,0 +1,6 @@
+def can_build(env, platform):
+    return True
+
+
+def configure(env):
+    pass
diff --git a/modules/lightmapper_rd/lightmapper_rd.cpp b/modules/lightmapper_rd/lightmapper_rd.cpp
new file mode 100644
index 0000000000..4de523baa0
--- /dev/null
+++ b/modules/lightmapper_rd/lightmapper_rd.cpp
@@ -0,0 +1,1752 @@
+/*************************************************************************/
+/*  lightmapper_rd.cpp                                                   */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "lightmapper_rd.h"
+#include "core/math/geometry_2d.h"
+#include "core/project_settings.h"
+#include "lm_blendseams.glsl.gen.h"
+#include "lm_compute.glsl.gen.h"
+#include "lm_raster.glsl.gen.h"
+#include "servers/rendering/rendering_device_binds.h"
+
+//uncomment this if you want to see textures from all the process saved
+//#define DEBUG_TEXTURES
+
+void LightmapperRD::add_mesh(const MeshData &p_mesh) {
+	ERR_FAIL_COND(p_mesh.albedo_on_uv2.is_null() || p_mesh.albedo_on_uv2->empty());
+	ERR_FAIL_COND(p_mesh.emission_on_uv2.is_null() || p_mesh.emission_on_uv2->empty());
+	ERR_FAIL_COND(p_mesh.albedo_on_uv2->get_width() != p_mesh.emission_on_uv2->get_width());
+	ERR_FAIL_COND(p_mesh.albedo_on_uv2->get_height() != p_mesh.emission_on_uv2->get_height());
+	ERR_FAIL_COND(p_mesh.points.size() == 0);
+	MeshInstance mi;
+	mi.data = p_mesh;
+	mesh_instances.push_back(mi);
+}
+
+void LightmapperRD::add_directional_light(bool p_static, const Vector3 &p_direction, const Color &p_color, float p_energy, float p_angular_distance) {
+	Light l;
+	l.type = LIGHT_TYPE_DIRECTIONAL;
+	l.direction[0] = p_direction.x;
+	l.direction[1] = p_direction.y;
+	l.direction[2] = p_direction.z;
+	l.color[0] = p_color.r;
+	l.color[1] = p_color.g;
+	l.color[2] = p_color.b;
+	l.energy = p_energy;
+	l.static_bake = p_static;
+	l.size = p_angular_distance;
+	lights.push_back(l);
+}
+
+void LightmapperRD::add_omni_light(bool p_static, const Vector3 &p_position, const Color &p_color, float p_energy, float p_range, float p_attenuation, float p_size) {
+	Light l;
+	l.type = LIGHT_TYPE_OMNI;
+	l.position[0] = p_position.x;
+	l.position[1] = p_position.y;
+	l.position[2] = p_position.z;
+	l.range = p_range;
+	l.attenuation = p_attenuation;
+	l.color[0] = p_color.r;
+	l.color[1] = p_color.g;
+	l.color[2] = p_color.b;
+	l.energy = p_energy;
+	l.static_bake = p_static;
+	l.size = p_size;
+	lights.push_back(l);
+}
+
+void LightmapperRD::add_spot_light(bool p_static, const Vector3 &p_position, const Vector3 p_direction, const Color &p_color, float p_energy, float p_range, float p_attenuation, float p_spot_angle, float p_spot_attenuation, float p_size) {
+	Light l;
+	l.type = LIGHT_TYPE_SPOT;
+	l.position[0] = p_position.x;
+	l.position[1] = p_position.y;
+	l.position[2] = p_position.z;
+	l.direction[0] = p_direction.x;
+	l.direction[1] = p_direction.y;
+	l.direction[2] = p_direction.z;
+	l.range = p_range;
+	l.attenuation = p_attenuation;
+	l.spot_angle = Math::deg2rad(p_spot_angle);
+	l.spot_attenuation = p_spot_attenuation;
+	l.color[0] = p_color.r;
+	l.color[1] = p_color.g;
+	l.color[2] = p_color.b;
+	l.energy = p_energy;
+	l.static_bake = p_static;
+	l.size = p_size;
+	lights.push_back(l);
+}
+
+void LightmapperRD::add_probe(const Vector3 &p_position) {
+	Probe probe;
+	probe.position[0] = p_position.x;
+	probe.position[1] = p_position.y;
+	probe.position[2] = p_position.z;
+	probe.position[3] = 0;
+	probe_positions.push_back(probe);
+}
+
+void LightmapperRD::_plot_triangle_into_triangle_index_list(int p_size, const Vector3i &p_ofs, const AABB &p_bounds, const Vector3 p_points[3], uint32_t p_triangle_index, LocalVector<TriangleSort> &triangles, uint32_t p_grid_size) {
+	int half_size = p_size / 2;
+
+	for (int i = 0; i < 8; i++) {
+		AABB aabb = p_bounds;
+		aabb.size *= 0.5;
+		Vector3i n = p_ofs;
+
+		if (i & 1) {
+			aabb.position.x += aabb.size.x;
+			n.x += half_size;
+		}
+		if (i & 2) {
+			aabb.position.y += aabb.size.y;
+			n.y += half_size;
+		}
+		if (i & 4) {
+			aabb.position.z += aabb.size.z;
+			n.z += half_size;
+		}
+
+		{
+			Vector3 qsize = aabb.size * 0.5; //quarter size, for fast aabb test
+
+			if (!Geometry3D::triangle_box_overlap(aabb.position + qsize, qsize, p_points)) {
+				//does not fit in child, go on
+				continue;
+			}
+		}
+
+		if (half_size == 1) {
+			//got to the end
+			TriangleSort ts;
+			ts.cell_index = n.x + (n.y * p_grid_size) + (n.z * p_grid_size * p_grid_size);
+			ts.triangle_index = p_triangle_index;
+			triangles.push_back(ts);
+		} else {
+			_plot_triangle_into_triangle_index_list(half_size, n, aabb, p_points, p_triangle_index, triangles, p_grid_size);
+		}
+	}
+}
+
+Lightmapper::BakeError LightmapperRD::_blit_meshes_into_atlas(int p_max_texture_size, Vector<Ref<Image>> &albedo_images, Vector<Ref<Image>> &emission_images, AABB &bounds, Size2i &atlas_size, int &atlas_slices, BakeStepFunc p_step_function, void *p_bake_userdata) {
+	Vector<Size2i> sizes;
+
+	for (int m_i = 0; m_i < mesh_instances.size(); m_i++) {
+		MeshInstance &mi = mesh_instances.write[m_i];
+		Size2i s = Size2i(mi.data.albedo_on_uv2->get_width(), mi.data.albedo_on_uv2->get_height());
+		sizes.push_back(s);
+		atlas_size.width = MAX(atlas_size.width, s.width);
+		atlas_size.height = MAX(atlas_size.height, s.height);
+	}
+
+	int max = nearest_power_of_2_templated(atlas_size.width);
+	max = MAX(max, nearest_power_of_2_templated(atlas_size.height));
+
+	if (max > p_max_texture_size) {
+		return BAKE_ERROR_LIGHTMAP_TOO_SMALL;
+	}
+
+	if (p_step_function) {
+		p_step_function(0.1, TTR("Determining optimal atlas size"), p_bake_userdata, true);
+	}
+
+	atlas_size = Size2i(max, max);
+
+	Size2i best_atlas_size;
+	int best_atlas_slices = 0;
+	int best_atlas_memory = 0x7FFFFFFF;
+	Vector<Vector3i> best_atlas_offsets;
+
+	//determine best texture array atlas size by bruteforce fitting
+	while (atlas_size.x <= p_max_texture_size && atlas_size.y <= p_max_texture_size) {
+		Vector<Vector2i> source_sizes = sizes;
+		Vector<int> source_indices;
+		source_indices.resize(source_sizes.size());
+		for (int i = 0; i < source_indices.size(); i++) {
+			source_indices.write[i] = i;
+		}
+		Vector<Vector3i> atlas_offsets;
+		atlas_offsets.resize(source_sizes.size());
+
+		int slices = 0;
+
+		while (source_sizes.size() > 0) {
+			Vector<Vector3i> offsets = Geometry2D::partial_pack_rects(source_sizes, atlas_size);
+			Vector<int> new_indices;
+			Vector<Vector2i> new_sources;
+			for (int i = 0; i < offsets.size(); i++) {
+				Vector3i ofs = offsets[i];
+				int sidx = source_indices[i];
+				if (ofs.z > 0) {
+					//valid
+					ofs.z = slices;
+					atlas_offsets.write[sidx] = ofs;
+				} else {
+					new_indices.push_back(sidx);
+					new_sources.push_back(source_sizes[i]);
+				}
+			}
+
+			source_sizes = new_sources;
+			source_indices = new_indices;
+			slices++;
+		}
+
+		int mem_used = atlas_size.x * atlas_size.y * slices;
+		if (mem_used < best_atlas_memory) {
+			best_atlas_size = atlas_size;
+			best_atlas_offsets = atlas_offsets;
+			best_atlas_slices = slices;
+			best_atlas_memory = mem_used;
+		}
+
+		if (atlas_size.width == atlas_size.height) {
+			atlas_size.width *= 2;
+		} else {
+			atlas_size.height *= 2;
+		}
+	}
+	atlas_size = best_atlas_size;
+	atlas_slices = best_atlas_slices;
+
+	// apply the offsets and slice to all images, and also blit albedo and emission
+	albedo_images.resize(atlas_slices);
+	emission_images.resize(atlas_slices);
+
+	if (p_step_function) {
+		p_step_function(0.2, TTR("Blitting albedo and emission"), p_bake_userdata, true);
+	}
+
+	for (int i = 0; i < atlas_slices; i++) {
+		Ref<Image> albedo;
+		albedo.instance();
+		albedo->create(atlas_size.width, atlas_size.height, false, Image::FORMAT_RGBA8);
+		albedo->set_as_black();
+		albedo_images.write[i] = albedo;
+
+		Ref<Image> emission;
+		emission.instance();
+		emission->create(atlas_size.width, atlas_size.height, false, Image::FORMAT_RGBAH);
+		emission->set_as_black();
+		emission_images.write[i] = emission;
+	}
+
+	//assign uv positions
+
+	for (int m_i = 0; m_i < mesh_instances.size(); m_i++) {
+		MeshInstance &mi = mesh_instances.write[m_i];
+		mi.offset.x = best_atlas_offsets[m_i].x;
+		mi.offset.y = best_atlas_offsets[m_i].y;
+		mi.slice = best_atlas_offsets[m_i].z;
+		albedo_images.write[mi.slice]->blit_rect(mi.data.albedo_on_uv2, Rect2(Vector2(), Size2i(mi.data.albedo_on_uv2->get_width(), mi.data.albedo_on_uv2->get_height())), mi.offset);
+		emission_images.write[mi.slice]->blit_rect(mi.data.emission_on_uv2, Rect2(Vector2(), Size2i(mi.data.emission_on_uv2->get_width(), mi.data.emission_on_uv2->get_height())), mi.offset);
+	}
+
+	return BAKE_OK;
+}
+
+void LightmapperRD::_create_acceleration_structures(RenderingDevice *rd, Size2i atlas_size, int atlas_slices, AABB &bounds, int grid_size, Vector<Probe> &probe_positions, GenerateProbes p_generate_probes, Vector<int> &slice_triangle_count, Vector<int> &slice_seam_count, RID &vertex_buffer, RID &triangle_buffer, RID &box_buffer, RID &lights_buffer, RID &triangle_cell_indices_buffer, RID &probe_positions_buffer, RID &grid_texture, RID &grid_texture_sdf, RID &seams_buffer, BakeStepFunc p_step_function, void *p_bake_userdata) {
+	HashMap<Vertex, uint32_t, VertexHash> vertex_map;
+
+	//fill triangles array and vertex array
+	LocalVector<Triangle> triangles;
+	LocalVector<Vertex> vertex_array;
+	LocalVector<Box> box_array;
+	LocalVector<Seam> seams;
+
+	slice_triangle_count.resize(atlas_slices);
+	slice_seam_count.resize(atlas_slices);
+
+	for (int i = 0; i < atlas_slices; i++) {
+		slice_triangle_count.write[i] = 0;
+		slice_seam_count.write[i] = 0;
+	}
+
+	bounds = AABB();
+
+	for (int m_i = 0; m_i < mesh_instances.size(); m_i++) {
+		if (p_step_function) {
+			float p = float(m_i + 1) / mesh_instances.size() * 0.1;
+			p_step_function(0.3 + p, vformat(TTR("Plotting mesh into acceleration structure %d/%d"), m_i + 1, mesh_instances.size()), p_bake_userdata, false);
+		}
+
+		HashMap<Edge, EdgeUV2, EdgeHash> edges;
+
+		MeshInstance &mi = mesh_instances.write[m_i];
+
+		Vector2 uv_scale = Vector2(mi.data.albedo_on_uv2->get_width(), mi.data.albedo_on_uv2->get_height()) / Vector2(atlas_size);
+		Vector2 uv_offset = Vector2(mi.offset) / Vector2(atlas_size);
+		if (m_i == 0) {
+			bounds.position = mi.data.points[0];
+		}
+
+		for (int i = 0; i < mi.data.points.size(); i += 3) {
+			Vector3 vtxs[3] = { mi.data.points[i + 0], mi.data.points[i + 1], mi.data.points[i + 2] };
+			Vector2 uvs[3] = { mi.data.uv2[i + 0] * uv_scale + uv_offset, mi.data.uv2[i + 1] * uv_scale + uv_offset, mi.data.uv2[i + 2] * uv_scale + uv_offset };
+			Vector3 normal[3] = { mi.data.normal[i + 0], mi.data.normal[i + 1], mi.data.normal[i + 2] };
+
+			AABB taabb;
+			Triangle t;
+			t.slice = mi.slice;
+			for (int k = 0; k < 3; k++) {
+				bounds.expand_to(vtxs[k]);
+
+				Vertex v;
+				v.position[0] = vtxs[k].x;
+				v.position[1] = vtxs[k].y;
+				v.position[2] = vtxs[k].z;
+				v.uv[0] = uvs[k].x;
+				v.uv[1] = uvs[k].y;
+				v.normal_xy[0] = normal[k].x;
+				v.normal_xy[1] = normal[k].y;
+				v.normal_z = normal[k].z;
+
+				uint32_t *indexptr = vertex_map.getptr(v);
+
+				if (indexptr) {
+					t.indices[k] = *indexptr;
+				} else {
+					uint32_t new_index = vertex_map.size();
+					t.indices[k] = new_index;
+					vertex_map[v] = new_index;
+					vertex_array.push_back(v);
+				}
+
+				if (k == 0) {
+					taabb.position = vtxs[k];
+				} else {
+					taabb.expand_to(vtxs[k]);
+				}
+			}
+
+			//compute seams that will need to be blended later
+			for (int k = 0; k < 3; k++) {
+				int n = (k + 1) % 3;
+
+				Edge edge(vtxs[k], vtxs[n], normal[k], normal[n]);
+				Vector2i edge_indices(t.indices[k], t.indices[n]);
+				EdgeUV2 uv2(uvs[k], uvs[n], edge_indices);
+
+				if (edge.b == edge.a) {
+					continue; //degenerate, somehow
+				}
+				if (edge.b < edge.a) {
+					SWAP(edge.a, edge.b);
+					SWAP(edge.na, edge.nb);
+					SWAP(uv2.a, uv2.b);
+					SWAP(edge_indices.x, edge_indices.y);
+				}
+
+				EdgeUV2 *euv2 = edges.getptr(edge);
+				if (!euv2) {
+					edges[edge] = uv2;
+				} else {
+					if (*euv2 == uv2) {
+						continue; // seam shared UV space, no need to blend
+					}
+					if (euv2->seam_found) {
+						continue; //bad geometry
+					}
+
+					Seam seam;
+					seam.a = edge_indices;
+					seam.b = euv2->indices;
+					seam.slice = mi.slice;
+					seams.push_back(seam);
+					slice_seam_count.write[mi.slice]++;
+					euv2->seam_found = true;
+				}
+			}
+
+			Box box;
+			box.min_bounds[0] = taabb.position.x;
+			box.min_bounds[1] = taabb.position.y;
+			box.min_bounds[2] = taabb.position.z;
+			box.max_bounds[0] = taabb.position.x + MAX(taabb.size.x, 0.0001);
+			box.max_bounds[1] = taabb.position.y + MAX(taabb.size.y, 0.0001);
+			box.max_bounds[2] = taabb.position.z + MAX(taabb.size.z, 0.0001);
+			box.pad0 = box.pad1 = 0; //make valgrind not complain
+			box_array.push_back(box);
+
+			triangles.push_back(t);
+			slice_triangle_count.write[t.slice]++;
+		}
+	}
+
+	//also consider probe positions for bounds
+	for (int i = 0; i < probe_positions.size(); i++) {
+		Vector3 pp(probe_positions[i].position[0], probe_positions[i].position[1], probe_positions[i].position[2]);
+		bounds.expand_to(pp);
+	}
+	bounds.grow_by(0.1); //grow a bit to avoid numerical error
+
+	triangles.sort(); //sort by slice
+	seams.sort();
+
+	if (p_step_function) {
+		p_step_function(0.4, TTR("Optimizing acceleration structure"), p_bake_userdata, true);
+	}
+
+	//fill list of triangles in grid
+	LocalVector<TriangleSort> triangle_sort;
+	for (uint32_t i = 0; i < triangles.size(); i++) {
+		const Triangle &t = triangles[i];
+		Vector3 face[3] = {
+			Vector3(vertex_array[t.indices[0]].position[0], vertex_array[t.indices[0]].position[1], vertex_array[t.indices[0]].position[2]),
+			Vector3(vertex_array[t.indices[1]].position[0], vertex_array[t.indices[1]].position[1], vertex_array[t.indices[1]].position[2]),
+			Vector3(vertex_array[t.indices[2]].position[0], vertex_array[t.indices[2]].position[1], vertex_array[t.indices[2]].position[2])
+		};
+		_plot_triangle_into_triangle_index_list(grid_size, Vector3i(), bounds, face, i, triangle_sort, grid_size);
+	}
+	//sort it
+	triangle_sort.sort();
+
+	Vector<uint32_t> triangle_indices;
+	triangle_indices.resize(triangle_sort.size());
+	Vector<uint32_t> grid_indices;
+	grid_indices.resize(grid_size * grid_size * grid_size * 2);
+	zeromem(grid_indices.ptrw(), grid_indices.size() * sizeof(uint32_t));
+	Vector<bool> solid;
+	solid.resize(grid_size * grid_size * grid_size);
+	zeromem(solid.ptrw(), solid.size() * sizeof(bool));
+
+	{
+		uint32_t *tiw = triangle_indices.ptrw();
+		uint32_t last_cell = 0xFFFFFFFF;
+		uint32_t *giw = grid_indices.ptrw();
+		bool *solidw = solid.ptrw();
+		for (uint32_t i = 0; i < triangle_sort.size(); i++) {
+			uint32_t cell = triangle_sort[i].cell_index;
+			if (cell != last_cell) {
+				//cell changed, update pointer to indices
+				giw[cell * 2 + 1] = i;
+				last_cell = cell;
+				solidw[cell] = true;
+			}
+			tiw[i] = triangle_sort[i].triangle_index;
+			giw[cell * 2]++; //update counter
+			last_cell = cell;
+		}
+	}
+#if 0
+	for (int i = 0; i < grid_size; i++) {
+		for (int j = 0; j < grid_size; j++) {
+			for (int k = 0; k < grid_size; k++) {
+				uint32_t index = i * (grid_size * grid_size) + j * grid_size + k;
+				grid_indices.write[index * 2] = float(i) / grid_size * 255;
+				grid_indices.write[index * 2 + 1] = float(j) / grid_size * 255;
+			}
+		}
+	}
+#endif
+
+#if 0
+	for (int i = 0; i < grid_size; i++) {
+		Vector<uint8_t> grid_usage;
+		grid_usage.resize(grid_size * grid_size);
+		for (int j = 0; j < grid_usage.size(); j++) {
+			uint32_t ofs = i * grid_size * grid_size + j;
+			uint32_t count = grid_indices[ofs * 2];
+			grid_usage.write[j] = count > 0 ? 255 : 0;
+		}
+
+		Ref<Image> img;
+		img.instance();
+		img->create(grid_size, grid_size, false, Image::FORMAT_L8, grid_usage);
+		img->save_png("res://grid_layer_" + itos(1000 + i).substr(1, 3) + ".png");
+	}
+#endif
+	if (p_step_function) {
+		p_step_function(0.45, TTR("Generating Signed Distance Field"), p_bake_userdata, true);
+	}
+
+	//generate SDF for raytracing
+	Vector<uint32_t> euclidean_pos = Geometry3D::generate_edf(solid, Vector3i(grid_size, grid_size, grid_size), false);
+	Vector<uint32_t> euclidean_neg = Geometry3D::generate_edf(solid, Vector3i(grid_size, grid_size, grid_size), true);
+	Vector<int8_t> sdf8 = Geometry3D::generate_sdf8(euclidean_pos, euclidean_neg);
+
+	/*****************************/
+	/*** CREATE GPU STRUCTURES ***/
+	/*****************************/
+
+	lights.sort();
+
+	Vector<Vector2i> seam_buffer_vec;
+	seam_buffer_vec.resize(seams.size() * 2);
+	for (uint32_t i = 0; i < seams.size(); i++) {
+		seam_buffer_vec.write[i * 2 + 0] = seams[i].a;
+		seam_buffer_vec.write[i * 2 + 1] = seams[i].b;
+	}
+
+	{ //buffers
+		Vector<uint8_t> vb = vertex_array.to_byte_array();
+		vertex_buffer = rd->storage_buffer_create(vb.size(), vb);
+
+		Vector<uint8_t> tb = triangles.to_byte_array();
+		triangle_buffer = rd->storage_buffer_create(tb.size(), tb);
+
+		Vector<uint8_t> bb = box_array.to_byte_array();
+		box_buffer = rd->storage_buffer_create(bb.size(), bb);
+
+		Vector<uint8_t> tib = triangle_indices.to_byte_array();
+		triangle_cell_indices_buffer = rd->storage_buffer_create(tib.size(), tib);
+
+		Vector<uint8_t> lb = lights.to_byte_array();
+		if (lb.size() == 0) {
+			lb.resize(sizeof(Light)); //even if no lights, the buffer must exist
+		}
+		lights_buffer = rd->storage_buffer_create(lb.size(), lb);
+
+		Vector<uint8_t> sb = seam_buffer_vec.to_byte_array();
+		if (sb.size() == 0) {
+			sb.resize(sizeof(Vector2i) * 2); //even if no seams, the buffer must exist
+		}
+		seams_buffer = rd->storage_buffer_create(sb.size(), sb);
+
+		Vector<uint8_t> pb = probe_positions.to_byte_array();
+		if (pb.size() == 0) {
+			pb.resize(sizeof(Probe));
+		}
+		probe_positions_buffer = rd->storage_buffer_create(pb.size(), pb);
+	}
+
+	{ //grid
+
+		RD::TextureFormat tf;
+		tf.width = grid_size;
+		tf.height = grid_size;
+		tf.depth = grid_size;
+		tf.type = RD::TEXTURE_TYPE_3D;
+		tf.usage_bits = RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_CAN_UPDATE_BIT;
+
+		Vector<Vector<uint8_t>> texdata;
+		texdata.resize(1);
+		//grid and indices
+		tf.format = RD::DATA_FORMAT_R32G32_UINT;
+		texdata.write[0] = grid_indices.to_byte_array();
+		grid_texture = rd->texture_create(tf, RD::TextureView(), texdata);
+		//sdf
+		tf.format = RD::DATA_FORMAT_R8_SNORM;
+		texdata.write[0] = sdf8.to_byte_array();
+		grid_texture_sdf = rd->texture_create(tf, RD::TextureView(), texdata);
+	}
+}
+
+void LightmapperRD::_raster_geometry(RenderingDevice *rd, Size2i atlas_size, int atlas_slices, int grid_size, AABB bounds, float p_bias, Vector<int> slice_triangle_count, RID position_tex, RID unocclude_tex, RID normal_tex, RID raster_depth_buffer, RID rasterize_shader, RID raster_base_uniform) {
+	Vector<RID> framebuffers;
+
+	for (int i = 0; i < atlas_slices; i++) {
+		RID slice_pos_tex = rd->texture_create_shared_from_slice(RD::TextureView(), position_tex, i, 0);
+		RID slice_unoc_tex = rd->texture_create_shared_from_slice(RD::TextureView(), unocclude_tex, i, 0);
+		RID slice_norm_tex = rd->texture_create_shared_from_slice(RD::TextureView(), normal_tex, i, 0);
+		Vector<RID> fb;
+		fb.push_back(slice_pos_tex);
+		fb.push_back(slice_norm_tex);
+		fb.push_back(slice_unoc_tex);
+		fb.push_back(raster_depth_buffer);
+		framebuffers.push_back(rd->framebuffer_create(fb));
+	}
+
+	RD::PipelineDepthStencilState ds;
+	ds.enable_depth_test = true;
+	ds.enable_depth_write = true;
+	ds.depth_compare_operator = RD::COMPARE_OP_LESS; //so it does render same pixel twice
+
+	RID raster_pipeline = rd->render_pipeline_create(rasterize_shader, rd->framebuffer_get_format(framebuffers[0]), RD::INVALID_FORMAT_ID, RD::RENDER_PRIMITIVE_TRIANGLES, RD::PipelineRasterizationState(), RD::PipelineMultisampleState(), ds, RD::PipelineColorBlendState::create_disabled(3), 0);
+	RID raster_pipeline_wire;
+	{
+		RD::PipelineRasterizationState rw;
+		rw.wireframe = true;
+		raster_pipeline_wire = rd->render_pipeline_create(rasterize_shader, rd->framebuffer_get_format(framebuffers[0]), RD::INVALID_FORMAT_ID, RD::RENDER_PRIMITIVE_TRIANGLES, rw, RD::PipelineMultisampleState(), ds, RD::PipelineColorBlendState::create_disabled(3), 0);
+	}
+
+	uint32_t triangle_offset = 0;
+	Vector<Color> clear_colors;
+	clear_colors.push_back(Color(0, 0, 0, 0));
+	clear_colors.push_back(Color(0, 0, 0, 0));
+	clear_colors.push_back(Color(0, 0, 0, 0));
+
+	for (int i = 0; i < atlas_slices; i++) {
+		RasterPushConstant raster_push_constant;
+		raster_push_constant.atlas_size[0] = atlas_size.x;
+		raster_push_constant.atlas_size[1] = atlas_size.y;
+		raster_push_constant.base_triangle = triangle_offset;
+		raster_push_constant.to_cell_offset[0] = bounds.position.x;
+		raster_push_constant.to_cell_offset[1] = bounds.position.y;
+		raster_push_constant.to_cell_offset[2] = bounds.position.z;
+		raster_push_constant.bias = p_bias;
+		raster_push_constant.to_cell_size[0] = (1.0 / bounds.size.x) * float(grid_size);
+		raster_push_constant.to_cell_size[1] = (1.0 / bounds.size.y) * float(grid_size);
+		raster_push_constant.to_cell_size[2] = (1.0 / bounds.size.z) * float(grid_size);
+		raster_push_constant.grid_size[0] = grid_size;
+		raster_push_constant.grid_size[1] = grid_size;
+		raster_push_constant.grid_size[2] = grid_size;
+		raster_push_constant.uv_offset[0] = 0;
+		raster_push_constant.uv_offset[1] = 0;
+
+		RD::DrawListID draw_list = rd->draw_list_begin(framebuffers[i], RD::INITIAL_ACTION_CLEAR, RD::FINAL_ACTION_READ, RD::INITIAL_ACTION_CLEAR, RD::FINAL_ACTION_DISCARD, clear_colors);
+		//draw opaque
+		rd->draw_list_bind_render_pipeline(draw_list, raster_pipeline);
+		rd->draw_list_bind_uniform_set(draw_list, raster_base_uniform, 0);
+		rd->draw_list_set_push_constant(draw_list, &raster_push_constant, sizeof(RasterPushConstant));
+		rd->draw_list_draw(draw_list, false, 1, slice_triangle_count[i] * 3);
+		//draw wire
+		rd->draw_list_bind_render_pipeline(draw_list, raster_pipeline_wire);
+		rd->draw_list_bind_uniform_set(draw_list, raster_base_uniform, 0);
+		rd->draw_list_set_push_constant(draw_list, &raster_push_constant, sizeof(RasterPushConstant));
+		rd->draw_list_draw(draw_list, false, 1, slice_triangle_count[i] * 3);
+
+		rd->draw_list_end();
+
+		triangle_offset += slice_triangle_count[i];
+	}
+}
+
+LightmapperRD::BakeError LightmapperRD::bake(BakeQuality p_quality, bool p_use_denoiser, int p_bounces, float p_bias, int p_max_texture_size, bool p_bake_sh, GenerateProbes p_generate_probes, const Ref<Image> &p_environment_panorama, const Basis &p_environment_transform, BakeStepFunc p_step_function, void *p_bake_userdata) {
+	if (p_step_function) {
+		p_step_function(0.0, TTR("Begin Bake"), p_bake_userdata, true);
+	}
+	bake_textures.clear();
+	int grid_size = 128;
+
+	/* STEP 1: Fetch material textures and compute the bounds */
+
+	AABB bounds;
+	Size2i atlas_size;
+	int atlas_slices;
+	Vector<Ref<Image>> albedo_images;
+	Vector<Ref<Image>> emission_images;
+
+	BakeError bake_error = _blit_meshes_into_atlas(p_max_texture_size, albedo_images, emission_images, bounds, atlas_size, atlas_slices, p_step_function, p_bake_userdata);
+	if (bake_error != BAKE_OK) {
+		return bake_error;
+	}
+
+#ifdef DEBUG_TEXTURES
+	for (int i = 0; i < atlas_slices; i++) {
+		albedo_images[i]->save_png("res://0_albedo_" + itos(i) + ".png");
+		emission_images[i]->save_png("res://0_emission_" + itos(i) + ".png");
+	}
+#endif
+
+	RenderingDevice *rd = RenderingDevice::get_singleton()->create_local_device();
+
+	RID albedo_array_tex;
+	RID emission_array_tex;
+	RID normal_tex;
+	RID position_tex;
+	RID unocclude_tex;
+	RID light_source_tex;
+	RID light_dest_tex;
+	RID light_accum_tex;
+	RID light_accum_tex2;
+	RID light_primary_dynamic_tex;
+	RID light_environment_tex;
+
+#define FREE_TEXTURES                    \
+	rd->free(albedo_array_tex);          \
+	rd->free(emission_array_tex);        \
+	rd->free(normal_tex);                \
+	rd->free(position_tex);              \
+	rd->free(unocclude_tex);             \
+	rd->free(light_source_tex);          \
+	rd->free(light_accum_tex2);          \
+	rd->free(light_accum_tex);           \
+	rd->free(light_primary_dynamic_tex); \
+	rd->free(light_environment_tex);
+
+	{ // create all textures
+
+		Vector<Vector<uint8_t>> albedo_data;
+		Vector<Vector<uint8_t>> emission_data;
+		for (int i = 0; i < atlas_slices; i++) {
+			albedo_data.push_back(albedo_images[i]->get_data());
+			emission_data.push_back(emission_images[i]->get_data());
+		}
+
+		RD::TextureFormat tf;
+		tf.width = atlas_size.width;
+		tf.height = atlas_size.height;
+		tf.array_layers = atlas_slices;
+		tf.type = RD::TEXTURE_TYPE_2D_ARRAY;
+		tf.usage_bits = RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_CAN_UPDATE_BIT;
+		tf.format = RD::DATA_FORMAT_R8G8B8A8_UNORM;
+
+		albedo_array_tex = rd->texture_create(tf, RD::TextureView(), albedo_data);
+
+		tf.format = RD::DATA_FORMAT_R16G16B16A16_SFLOAT;
+
+		emission_array_tex = rd->texture_create(tf, RD::TextureView(), emission_data);
+
+		//this will be rastered to
+		tf.usage_bits = RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_COLOR_ATTACHMENT_BIT | RD::TEXTURE_USAGE_CAN_COPY_FROM_BIT | RD::TEXTURE_USAGE_STORAGE_BIT;
+		normal_tex = rd->texture_create(tf, RD::TextureView());
+		tf.format = RD::DATA_FORMAT_R32G32B32A32_SFLOAT;
+		position_tex = rd->texture_create(tf, RD::TextureView());
+		unocclude_tex = rd->texture_create(tf, RD::TextureView());
+
+		tf.format = RD::DATA_FORMAT_R16G16B16A16_SFLOAT;
+		tf.usage_bits = RD::TEXTURE_USAGE_COLOR_ATTACHMENT_BIT | RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_STORAGE_BIT | RD::TEXTURE_USAGE_CAN_COPY_FROM_BIT | RD::TEXTURE_USAGE_CAN_COPY_TO_BIT | RD::TEXTURE_USAGE_CAN_UPDATE_BIT;
+
+		light_source_tex = rd->texture_create(tf, RD::TextureView());
+		rd->texture_clear(light_source_tex, Color(0, 0, 0, 0), 0, 1, 0, atlas_slices);
+		light_primary_dynamic_tex = rd->texture_create(tf, RD::TextureView());
+		rd->texture_clear(light_primary_dynamic_tex, Color(0, 0, 0, 0), 0, 1, 0, atlas_slices);
+
+		if (p_bake_sh) {
+			tf.array_layers *= 4;
+		}
+		light_accum_tex = rd->texture_create(tf, RD::TextureView());
+		rd->texture_clear(light_accum_tex, Color(0, 0, 0, 0), 0, 1, 0, tf.array_layers);
+		light_dest_tex = rd->texture_create(tf, RD::TextureView());
+		rd->texture_clear(light_dest_tex, Color(0, 0, 0, 0), 0, 1, 0, tf.array_layers);
+		light_accum_tex2 = light_dest_tex;
+
+		//env
+		{
+			Ref<Image> panorama_tex;
+			if (p_environment_panorama.is_valid()) {
+				panorama_tex = p_environment_panorama;
+				panorama_tex->convert(Image::FORMAT_RGBAF);
+			} else {
+				panorama_tex.instance();
+				panorama_tex->create(8, 8, false, Image::FORMAT_RGBAF);
+				for (int i = 0; i < 8; i++) {
+					for (int j = 0; j < 8; j++) {
+						panorama_tex->set_pixel(i, j, Color(0, 0, 0, 1));
+					}
+				}
+			}
+
+			RD::TextureFormat tfp;
+			tfp.width = panorama_tex->get_width();
+			tfp.height = panorama_tex->get_height();
+			tfp.usage_bits = RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_CAN_UPDATE_BIT;
+			tfp.format = RD::DATA_FORMAT_R32G32B32A32_SFLOAT;
+
+			Vector<Vector<uint8_t>> tdata;
+			tdata.push_back(panorama_tex->get_data());
+			light_environment_tex = rd->texture_create(tfp, RD::TextureView(), tdata);
+
+#ifdef DEBUG_TEXTURES
+			panorama_tex->convert(Image::FORMAT_RGB8);
+			panorama_tex->save_png("res://0_panorama.png");
+#endif
+		}
+	}
+
+	/* STEP 2: create the acceleration structure for the GPU*/
+
+	Vector<int> slice_triangle_count;
+	RID vertex_buffer;
+	RID triangle_buffer;
+	RID box_buffer;
+	RID lights_buffer;
+	RID triangle_cell_indices_buffer;
+	RID grid_texture;
+	RID grid_texture_sdf;
+	RID seams_buffer;
+	RID probe_positions_buffer;
+
+	Vector<int> slice_seam_count;
+
+#define FREE_BUFFERS                        \
+	rd->free(vertex_buffer);                \
+	rd->free(triangle_buffer);              \
+	rd->free(box_buffer);                   \
+	rd->free(lights_buffer);                \
+	rd->free(triangle_cell_indices_buffer); \
+	rd->free(grid_texture);                 \
+	rd->free(grid_texture_sdf);             \
+	rd->free(seams_buffer);                 \
+	rd->free(probe_positions_buffer);
+
+	_create_acceleration_structures(rd, atlas_size, atlas_slices, bounds, grid_size, probe_positions, p_generate_probes, slice_triangle_count, slice_seam_count, vertex_buffer, triangle_buffer, box_buffer, lights_buffer, triangle_cell_indices_buffer, probe_positions_buffer, grid_texture, grid_texture_sdf, seams_buffer, p_step_function, p_bake_userdata);
+
+	if (p_step_function) {
+		p_step_function(0.47, TTR("Preparing shaders"), p_bake_userdata, true);
+	}
+
+	//shaders
+	Ref<RDShaderFile> raster_shader;
+	raster_shader.instance();
+	Error err = raster_shader->parse_versions_from_text(lm_raster_shader_glsl);
+	if (err != OK) {
+		raster_shader->print_errors("raster_shader");
+
+		FREE_TEXTURES
+		FREE_BUFFERS
+
+		memdelete(rd);
+	}
+	ERR_FAIL_COND_V(err != OK, BAKE_ERROR_LIGHTMAP_CANT_PRE_BAKE_MESHES);
+
+	RID rasterize_shader = rd->shader_create_from_bytecode(raster_shader->get_bytecode());
+
+	ERR_FAIL_COND_V(rasterize_shader.is_null(), BAKE_ERROR_LIGHTMAP_CANT_PRE_BAKE_MESHES); //this is a bug check, though, should not happen
+
+	RID sampler;
+	{
+		RD::SamplerState s;
+		s.mag_filter = RD::SAMPLER_FILTER_LINEAR;
+		s.min_filter = RD::SAMPLER_FILTER_LINEAR;
+		s.max_lod = 0;
+
+		sampler = rd->sampler_create(s);
+	}
+
+	Vector<RD::Uniform> base_uniforms;
+	{
+		{
+			RD::Uniform u;
+			u.type = RD::UNIFORM_TYPE_STORAGE_BUFFER;
+			u.binding = 1;
+			u.ids.push_back(vertex_buffer);
+			base_uniforms.push_back(u);
+		}
+		{
+			RD::Uniform u;
+			u.type = RD::UNIFORM_TYPE_STORAGE_BUFFER;
+			u.binding = 2;
+			u.ids.push_back(triangle_buffer);
+			base_uniforms.push_back(u);
+		}
+		{
+			RD::Uniform u;
+			u.type = RD::UNIFORM_TYPE_STORAGE_BUFFER;
+			u.binding = 3;
+			u.ids.push_back(box_buffer);
+			base_uniforms.push_back(u);
+		}
+		{
+			RD::Uniform u;
+			u.type = RD::UNIFORM_TYPE_STORAGE_BUFFER;
+			u.binding = 4;
+			u.ids.push_back(triangle_cell_indices_buffer);
+			base_uniforms.push_back(u);
+		}
+		{
+			RD::Uniform u;
+			u.type = RD::UNIFORM_TYPE_STORAGE_BUFFER;
+			u.binding = 5;
+			u.ids.push_back(lights_buffer);
+			base_uniforms.push_back(u);
+		}
+		{
+			RD::Uniform u;
+			u.type = RD::UNIFORM_TYPE_STORAGE_BUFFER;
+			u.binding = 6;
+			u.ids.push_back(seams_buffer);
+			base_uniforms.push_back(u);
+		}
+		{
+			RD::Uniform u;
+			u.type = RD::UNIFORM_TYPE_STORAGE_BUFFER;
+			u.binding = 7;
+			u.ids.push_back(probe_positions_buffer);
+			base_uniforms.push_back(u);
+		}
+		{
+			RD::Uniform u;
+			u.type = RD::UNIFORM_TYPE_TEXTURE;
+			u.binding = 8;
+			u.ids.push_back(grid_texture);
+			base_uniforms.push_back(u);
+		}
+		{
+			RD::Uniform u;
+			u.type = RD::UNIFORM_TYPE_TEXTURE;
+			u.binding = 9;
+			u.ids.push_back(grid_texture_sdf);
+			base_uniforms.push_back(u);
+		}
+		{
+			RD::Uniform u;
+			u.type = RD::UNIFORM_TYPE_TEXTURE;
+			u.binding = 10;
+			u.ids.push_back(albedo_array_tex);
+			base_uniforms.push_back(u);
+		}
+		{
+			RD::Uniform u;
+			u.type = RD::UNIFORM_TYPE_TEXTURE;
+			u.binding = 11;
+			u.ids.push_back(emission_array_tex);
+			base_uniforms.push_back(u);
+		}
+		{
+			RD::Uniform u;
+			u.type = RD::UNIFORM_TYPE_SAMPLER;
+			u.binding = 12;
+			u.ids.push_back(sampler);
+			base_uniforms.push_back(u);
+		}
+	}
+
+	RID raster_base_uniform = rd->uniform_set_create(base_uniforms, rasterize_shader, 0);
+	RID raster_depth_buffer;
+	{
+		RD::TextureFormat tf;
+		tf.width = atlas_size.width;
+		tf.height = atlas_size.height;
+		tf.depth = 1;
+		tf.type = RD::TEXTURE_TYPE_2D;
+		tf.usage_bits = RD::TEXTURE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
+		tf.format = RD::DATA_FORMAT_D32_SFLOAT;
+
+		raster_depth_buffer = rd->texture_create(tf, RD::TextureView());
+	}
+
+	rd->submit();
+	rd->sync();
+
+	/* STEP 3: Raster the geometry to UV2 coords in the atlas textures GPU*/
+
+	_raster_geometry(rd, atlas_size, atlas_slices, grid_size, bounds, p_bias, slice_triangle_count, position_tex, unocclude_tex, normal_tex, raster_depth_buffer, rasterize_shader, raster_base_uniform);
+
+#ifdef DEBUG_TEXTURES
+
+	for (int i = 0; i < atlas_slices; i++) {
+		Vector<uint8_t> s = rd->texture_get_data(position_tex, i);
+		Ref<Image> img;
+		img.instance();
+		img->create(atlas_size.width, atlas_size.height, false, Image::FORMAT_RGBAF, s);
+		img->convert(Image::FORMAT_RGBA8);
+		img->save_png("res://1_position_" + itos(i) + ".png");
+
+		s = rd->texture_get_data(normal_tex, i);
+		img->create(atlas_size.width, atlas_size.height, false, Image::FORMAT_RGBAH, s);
+		img->convert(Image::FORMAT_RGBA8);
+		img->save_png("res://1_normal_" + itos(i) + ".png");
+	}
+#endif
+
+#define FREE_RASTER_RESOURCES   \
+	rd->free(rasterize_shader); \
+	rd->free(sampler);          \
+	rd->free(raster_depth_buffer);
+
+	/* Plot direct light */
+
+	Ref<RDShaderFile> compute_shader;
+	compute_shader.instance();
+	err = compute_shader->parse_versions_from_text(lm_compute_shader_glsl, p_bake_sh ? "\n#define USE_SH_LIGHTMAPS\n" : "");
+	if (err != OK) {
+		FREE_TEXTURES
+		FREE_BUFFERS
+		FREE_RASTER_RESOURCES
+		memdelete(rd);
+		compute_shader->print_errors("compute_shader");
+	}
+	ERR_FAIL_COND_V(err != OK, BAKE_ERROR_LIGHTMAP_CANT_PRE_BAKE_MESHES);
+
+	//unoccluder
+	RID compute_shader_unocclude = rd->shader_create_from_bytecode(compute_shader->get_bytecode("unocclude"));
+	ERR_FAIL_COND_V(compute_shader_unocclude.is_null(), BAKE_ERROR_LIGHTMAP_CANT_PRE_BAKE_MESHES); // internal check, should not happen
+	RID compute_shader_unocclude_pipeline = rd->compute_pipeline_create(compute_shader_unocclude);
+
+	//direct light
+	RID compute_shader_primary = rd->shader_create_from_bytecode(compute_shader->get_bytecode("primary"));
+	ERR_FAIL_COND_V(compute_shader_primary.is_null(), BAKE_ERROR_LIGHTMAP_CANT_PRE_BAKE_MESHES); // internal check, should not happen
+	RID compute_shader_primary_pipeline = rd->compute_pipeline_create(compute_shader_primary);
+
+	//indirect light
+	RID compute_shader_secondary = rd->shader_create_from_bytecode(compute_shader->get_bytecode("secondary"));
+	ERR_FAIL_COND_V(compute_shader_secondary.is_null(), BAKE_ERROR_LIGHTMAP_CANT_PRE_BAKE_MESHES); //internal check, should not happen
+	RID compute_shader_secondary_pipeline = rd->compute_pipeline_create(compute_shader_secondary);
+
+	//dilate
+	RID compute_shader_dilate = rd->shader_create_from_bytecode(compute_shader->get_bytecode("dilate"));
+	ERR_FAIL_COND_V(compute_shader_dilate.is_null(), BAKE_ERROR_LIGHTMAP_CANT_PRE_BAKE_MESHES); //internal check, should not happen
+	RID compute_shader_dilate_pipeline = rd->compute_pipeline_create(compute_shader_dilate);
+
+	//dilate
+	RID compute_shader_light_probes = rd->shader_create_from_bytecode(compute_shader->get_bytecode("light_probes"));
+	ERR_FAIL_COND_V(compute_shader_light_probes.is_null(), BAKE_ERROR_LIGHTMAP_CANT_PRE_BAKE_MESHES); //internal check, should not happen
+	RID compute_shader_light_probes_pipeline = rd->compute_pipeline_create(compute_shader_light_probes);
+
+	RID compute_base_uniform_set = rd->uniform_set_create(base_uniforms, compute_shader_primary, 0);
+
+#define FREE_COMPUTE_RESOURCES          \
+	rd->free(compute_shader_unocclude); \
+	rd->free(compute_shader_primary);   \
+	rd->free(compute_shader_secondary); \
+	rd->free(compute_shader_dilate);    \
+	rd->free(compute_shader_light_probes);
+
+	PushConstant push_constant;
+	{
+		//set defaults
+		push_constant.atlas_size[0] = atlas_size.width;
+		push_constant.atlas_size[1] = atlas_size.height;
+		push_constant.world_size[0] = bounds.size.x;
+		push_constant.world_size[1] = bounds.size.y;
+		push_constant.world_size[2] = bounds.size.z;
+		push_constant.to_cell_offset[0] = bounds.position.x;
+		push_constant.to_cell_offset[1] = bounds.position.y;
+		push_constant.to_cell_offset[2] = bounds.position.z;
+		push_constant.bias = p_bias;
+		push_constant.to_cell_size[0] = (1.0 / bounds.size.x) * float(grid_size);
+		push_constant.to_cell_size[1] = (1.0 / bounds.size.y) * float(grid_size);
+		push_constant.to_cell_size[2] = (1.0 / bounds.size.z) * float(grid_size);
+		push_constant.light_count = lights.size();
+		push_constant.grid_size = grid_size;
+		push_constant.atlas_slice = 0;
+		push_constant.region_ofs[0] = 0;
+		push_constant.region_ofs[1] = 0;
+		push_constant.environment_xform[0] = p_environment_transform.elements[0][0];
+		push_constant.environment_xform[1] = p_environment_transform.elements[1][0];
+		push_constant.environment_xform[2] = p_environment_transform.elements[2][0];
+		push_constant.environment_xform[3] = 0;
+		push_constant.environment_xform[4] = p_environment_transform.elements[0][1];
+		push_constant.environment_xform[5] = p_environment_transform.elements[1][1];
+		push_constant.environment_xform[6] = p_environment_transform.elements[2][1];
+		push_constant.environment_xform[7] = 0;
+		push_constant.environment_xform[8] = p_environment_transform.elements[0][2];
+		push_constant.environment_xform[9] = p_environment_transform.elements[1][2];
+		push_constant.environment_xform[10] = p_environment_transform.elements[2][2];
+		push_constant.environment_xform[11] = 0;
+	}
+
+	Vector3i group_size((atlas_size.x - 1) / 8 + 1, (atlas_size.y - 1) / 8 + 1, 1);
+	rd->submit();
+	rd->sync();
+
+	if (p_step_function) {
+		p_step_function(0.49, TTR("Un-occluding geometry"), p_bake_userdata, true);
+	}
+
+	/* UNOCCLUDE */
+	{
+		Vector<RD::Uniform> uniforms;
+		{
+			{
+				RD::Uniform u;
+				u.type = RD::UNIFORM_TYPE_IMAGE;
+				u.binding = 0;
+				u.ids.push_back(position_tex);
+				uniforms.push_back(u);
+			}
+			{
+				RD::Uniform u;
+				u.type = RD::UNIFORM_TYPE_IMAGE;
+				u.binding = 1;
+				u.ids.push_back(unocclude_tex); //will be unused
+				uniforms.push_back(u);
+			}
+		}
+
+		RID unocclude_uniform_set = rd->uniform_set_create(uniforms, compute_shader_unocclude, 1);
+
+		RD::ComputeListID compute_list = rd->compute_list_begin();
+		rd->compute_list_bind_compute_pipeline(compute_list, compute_shader_unocclude_pipeline);
+		rd->compute_list_bind_uniform_set(compute_list, compute_base_uniform_set, 0);
+		rd->compute_list_bind_uniform_set(compute_list, unocclude_uniform_set, 1);
+
+		for (int i = 0; i < atlas_slices; i++) {
+			push_constant.atlas_slice = i;
+			rd->compute_list_set_push_constant(compute_list, &push_constant, sizeof(PushConstant));
+			rd->compute_list_dispatch(compute_list, group_size.x, group_size.y, group_size.z);
+			//no barrier, let them run all together
+		}
+		rd->compute_list_end(); //done
+	}
+
+	if (p_step_function) {
+		p_step_function(0.5, TTR("Plot direct lighting"), p_bake_userdata, true);
+	}
+
+	/* PRIMARY (direct) LIGHT PASS */
+	{
+		Vector<RD::Uniform> uniforms;
+		{
+			{
+				RD::Uniform u;
+				u.type = RD::UNIFORM_TYPE_IMAGE;
+				u.binding = 0;
+				u.ids.push_back(light_source_tex);
+				uniforms.push_back(u);
+			}
+			{
+				RD::Uniform u;
+				u.type = RD::UNIFORM_TYPE_TEXTURE;
+				u.binding = 1;
+				u.ids.push_back(light_dest_tex); //will be unused
+				uniforms.push_back(u);
+			}
+			{
+				RD::Uniform u;
+				u.type = RD::UNIFORM_TYPE_TEXTURE;
+				u.binding = 2;
+				u.ids.push_back(position_tex);
+				uniforms.push_back(u);
+			}
+			{
+				RD::Uniform u;
+				u.type = RD::UNIFORM_TYPE_TEXTURE;
+				u.binding = 3;
+				u.ids.push_back(normal_tex);
+				uniforms.push_back(u);
+			}
+			{
+				RD::Uniform u;
+				u.type = RD::UNIFORM_TYPE_IMAGE;
+				u.binding = 4;
+				u.ids.push_back(light_accum_tex);
+				uniforms.push_back(u);
+			}
+			{
+				RD::Uniform u;
+				u.type = RD::UNIFORM_TYPE_IMAGE;
+				u.binding = 5;
+				u.ids.push_back(light_primary_dynamic_tex);
+				uniforms.push_back(u);
+			}
+		}
+
+		RID light_uniform_set = rd->uniform_set_create(uniforms, compute_shader_primary, 1);
+
+		RD::ComputeListID compute_list = rd->compute_list_begin();
+		rd->compute_list_bind_compute_pipeline(compute_list, compute_shader_primary_pipeline);
+		rd->compute_list_bind_uniform_set(compute_list, compute_base_uniform_set, 0);
+		rd->compute_list_bind_uniform_set(compute_list, light_uniform_set, 1);
+
+		for (int i = 0; i < atlas_slices; i++) {
+			push_constant.atlas_slice = i;
+			rd->compute_list_set_push_constant(compute_list, &push_constant, sizeof(PushConstant));
+			rd->compute_list_dispatch(compute_list, group_size.x, group_size.y, group_size.z);
+			//no barrier, let them run all together
+		}
+		rd->compute_list_end(); //done
+	}
+
+#ifdef DEBUG_TEXTURES
+
+	for (int i = 0; i < atlas_slices; i++) {
+		Vector<uint8_t> s = rd->texture_get_data(light_source_tex, i);
+		Ref<Image> img;
+		img.instance();
+		img->create(atlas_size.width, atlas_size.height, false, Image::FORMAT_RGBAH, s);
+		img->convert(Image::FORMAT_RGBA8);
+		img->save_png("res://2_light_primary_" + itos(i) + ".png");
+	}
+#endif
+
+	/* SECONDARY (indirect) LIGHT PASS(ES) */
+	if (p_step_function) {
+		p_step_function(0.6, TTR("Integrate indirect lighting"), p_bake_userdata, true);
+	}
+
+	if (p_bounces > 0) {
+		Vector<RD::Uniform> uniforms;
+		{
+			{
+				RD::Uniform u;
+				u.type = RD::UNIFORM_TYPE_IMAGE;
+				u.binding = 0;
+				u.ids.push_back(light_dest_tex);
+				uniforms.push_back(u);
+			}
+			{
+				RD::Uniform u;
+				u.type = RD::UNIFORM_TYPE_TEXTURE;
+				u.binding = 1;
+				u.ids.push_back(light_source_tex);
+				uniforms.push_back(u);
+			}
+			{
+				RD::Uniform u;
+				u.type = RD::UNIFORM_TYPE_TEXTURE;
+				u.binding = 2;
+				u.ids.push_back(position_tex);
+				uniforms.push_back(u);
+			}
+			{
+				RD::Uniform u;
+				u.type = RD::UNIFORM_TYPE_TEXTURE;
+				u.binding = 3;
+				u.ids.push_back(normal_tex);
+				uniforms.push_back(u);
+			}
+			{
+				RD::Uniform u;
+				u.type = RD::UNIFORM_TYPE_IMAGE;
+				u.binding = 4;
+				u.ids.push_back(light_accum_tex);
+				uniforms.push_back(u);
+			}
+			{
+				RD::Uniform u;
+				u.type = RD::UNIFORM_TYPE_IMAGE;
+				u.binding = 5;
+				u.ids.push_back(unocclude_tex); //reuse unocclude tex
+				uniforms.push_back(u);
+			}
+			{
+				RD::Uniform u;
+				u.type = RD::UNIFORM_TYPE_TEXTURE;
+				u.binding = 6;
+				u.ids.push_back(light_environment_tex); //reuse unocclude tex
+				uniforms.push_back(u);
+			}
+		}
+
+		RID secondary_uniform_set[2];
+		secondary_uniform_set[0] = rd->uniform_set_create(uniforms, compute_shader_secondary, 1);
+		uniforms.write[0].ids.write[0] = light_source_tex;
+		uniforms.write[1].ids.write[0] = light_dest_tex;
+		secondary_uniform_set[1] = rd->uniform_set_create(uniforms, compute_shader_secondary, 1);
+
+		switch (p_quality) {
+			case BAKE_QUALITY_LOW: {
+				push_constant.ray_count = GLOBAL_GET("rendering/gpu_lightmapper/quality/low_quality_ray_count");
+			} break;
+			case BAKE_QUALITY_MEDIUM: {
+				push_constant.ray_count = GLOBAL_GET("rendering/gpu_lightmapper/quality/medium_quality_ray_count");
+			} break;
+			case BAKE_QUALITY_HIGH: {
+				push_constant.ray_count = GLOBAL_GET("rendering/gpu_lightmapper/quality/high_quality_ray_count");
+			} break;
+			case BAKE_QUALITY_ULTRA: {
+				push_constant.ray_count = GLOBAL_GET("rendering/gpu_lightmapper/quality/ultra_quality_ray_count");
+			} break;
+		}
+
+		push_constant.ray_count = CLAMP(push_constant.ray_count, 16, 8192);
+
+		int max_region_size = nearest_power_of_2_templated(int(GLOBAL_GET("rendering/gpu_lightmapper/performance/region_size")));
+		int max_rays = GLOBAL_GET("rendering/gpu_lightmapper/performance/max_rays_per_pass");
+
+		int x_regions = (atlas_size.width - 1) / max_region_size + 1;
+		int y_regions = (atlas_size.height - 1) / max_region_size + 1;
+		int ray_iterations = (push_constant.ray_count - 1) / max_rays + 1;
+
+		rd->submit();
+		rd->sync();
+
+		for (int b = 0; b < p_bounces; b++) {
+			int count = 0;
+			if (b > 0) {
+				SWAP(light_source_tex, light_dest_tex);
+				SWAP(secondary_uniform_set[0], secondary_uniform_set[1]);
+			}
+
+			for (int s = 0; s < atlas_slices; s++) {
+				push_constant.atlas_slice = s;
+
+				for (int i = 0; i < x_regions; i++) {
+					for (int j = 0; j < y_regions; j++) {
+						int x = i * max_region_size;
+						int y = j * max_region_size;
+						int w = MIN((i + 1) * max_region_size, atlas_size.width) - x;
+						int h = MIN((j + 1) * max_region_size, atlas_size.height) - y;
+
+						push_constant.region_ofs[0] = x;
+						push_constant.region_ofs[1] = y;
+
+						group_size = Vector3i((w - 1) / 8 + 1, (h - 1) / 8 + 1, 1);
+
+						for (int k = 0; k < ray_iterations; k++) {
+							RD::ComputeListID compute_list = rd->compute_list_begin();
+							rd->compute_list_bind_compute_pipeline(compute_list, compute_shader_secondary_pipeline);
+							rd->compute_list_bind_uniform_set(compute_list, compute_base_uniform_set, 0);
+							rd->compute_list_bind_uniform_set(compute_list, secondary_uniform_set[0], 1);
+
+							push_constant.ray_from = k * max_rays;
+							push_constant.ray_to = MIN((k + 1) * max_rays, int32_t(push_constant.ray_count));
+							rd->compute_list_set_push_constant(compute_list, &push_constant, sizeof(PushConstant));
+							rd->compute_list_dispatch(compute_list, group_size.x, group_size.y, group_size.z);
+
+							rd->compute_list_end(); //done
+							rd->submit();
+							rd->sync();
+
+							count++;
+							if (p_step_function) {
+								int total = (atlas_slices * x_regions * y_regions * ray_iterations);
+								int percent = count * 100 / total;
+								float p = float(count) / total * 0.1;
+								p_step_function(0.6 + p, vformat(TTR("Bounce %d/%d: Integrate indirect lighting %d%%"), b + 1, p_bounces, percent), p_bake_userdata, false);
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	/* LIGHPROBES */
+
+	RID light_probe_buffer;
+
+	if (probe_positions.size()) {
+		light_probe_buffer = rd->storage_buffer_create(sizeof(float) * 4 * 9 * probe_positions.size());
+
+		if (p_step_function) {
+			p_step_function(0.7, TTR("Baking lightprobes"), p_bake_userdata, true);
+		}
+
+		Vector<RD::Uniform> uniforms;
+		{
+			{
+				RD::Uniform u;
+				u.type = RD::UNIFORM_TYPE_STORAGE_BUFFER;
+				u.binding = 0;
+				u.ids.push_back(light_probe_buffer);
+				uniforms.push_back(u);
+			}
+			{
+				RD::Uniform u;
+				u.type = RD::UNIFORM_TYPE_TEXTURE;
+				u.binding = 1;
+				u.ids.push_back(light_dest_tex);
+				uniforms.push_back(u);
+			}
+			{
+				RD::Uniform u;
+				u.type = RD::UNIFORM_TYPE_TEXTURE;
+				u.binding = 2;
+				u.ids.push_back(light_primary_dynamic_tex);
+				uniforms.push_back(u);
+			}
+			{
+				RD::Uniform u;
+				u.type = RD::UNIFORM_TYPE_TEXTURE;
+				u.binding = 3;
+				u.ids.push_back(light_environment_tex);
+				uniforms.push_back(u);
+			}
+		}
+		RID light_probe_uniform_set = rd->uniform_set_create(uniforms, compute_shader_light_probes, 1);
+
+		switch (p_quality) {
+			case BAKE_QUALITY_LOW: {
+				push_constant.ray_count = GLOBAL_GET("rendering/gpu_lightmapper/quality/low_quality_probe_ray_count");
+			} break;
+			case BAKE_QUALITY_MEDIUM: {
+				push_constant.ray_count = GLOBAL_GET("rendering/gpu_lightmapper/quality/medium_quality_probe_ray_count");
+			} break;
+			case BAKE_QUALITY_HIGH: {
+				push_constant.ray_count = GLOBAL_GET("rendering/gpu_lightmapper/quality/high_quality_probe_ray_count");
+			} break;
+			case BAKE_QUALITY_ULTRA: {
+				push_constant.ray_count = GLOBAL_GET("rendering/gpu_lightmapper/quality/ultra_quality_probe_ray_count");
+			} break;
+		}
+
+		push_constant.atlas_size[0] = probe_positions.size();
+		push_constant.ray_count = CLAMP(push_constant.ray_count, 16, 8192);
+
+		int max_rays = GLOBAL_GET("rendering/gpu_lightmapper/performance/max_rays_per_probe_pass");
+		int ray_iterations = (push_constant.ray_count - 1) / max_rays + 1;
+
+		for (int i = 0; i < ray_iterations; i++) {
+			RD::ComputeListID compute_list = rd->compute_list_begin();
+			rd->compute_list_bind_compute_pipeline(compute_list, compute_shader_light_probes_pipeline);
+			rd->compute_list_bind_uniform_set(compute_list, compute_base_uniform_set, 0);
+			rd->compute_list_bind_uniform_set(compute_list, light_probe_uniform_set, 1);
+
+			push_constant.ray_from = i * max_rays;
+			push_constant.ray_to = MIN((i + 1) * max_rays, int32_t(push_constant.ray_count));
+			rd->compute_list_set_push_constant(compute_list, &push_constant, sizeof(PushConstant));
+			rd->compute_list_dispatch(compute_list, (probe_positions.size() - 1) / 64 + 1, 1, 1);
+
+			rd->compute_list_end(); //done
+			rd->submit();
+			rd->sync();
+
+			if (p_step_function) {
+				int percent = i * 100 / ray_iterations;
+				float p = float(i) / ray_iterations * 0.1;
+				p_step_function(0.7 + p, vformat(TTR("Integrating light probes %d%%"), percent), p_bake_userdata, false);
+			}
+		}
+
+		push_constant.atlas_size[0] = atlas_size.x; //restore
+	}
+
+#if 0
+	for (int i = 0; i < probe_positions.size(); i++) {
+		Ref<Image> img;
+		img.instance();
+		img->create(6, 4, false, Image::FORMAT_RGB8);
+		for (int j = 0; j < 6; j++) {
+			Vector<uint8_t> s = rd->texture_get_data(lightprobe_tex, i * 6 + j);
+			Ref<Image> img2;
+			img2.instance();
+			img2->create(2, 2, false, Image::FORMAT_RGBAF, s);
+			img2->convert(Image::FORMAT_RGB8);
+			img->blit_rect(img2, Rect2(0, 0, 2, 2), Point2((j % 3) * 2, (j / 3) * 2));
+		}
+		img->save_png("res://3_light_probe_" + itos(i) + ".png");
+	}
+#endif
+
+	/* DENOISE */
+
+	if (p_use_denoiser) {
+		if (p_step_function) {
+			p_step_function(0.8, TTR("Denoising"), p_bake_userdata, true);
+		}
+
+		Ref<LightmapDenoiser> denoiser = LightmapDenoiser::create();
+		if (denoiser.is_valid()) {
+			for (int i = 0; i < atlas_slices * (p_bake_sh ? 4 : 1); i++) {
+				Vector<uint8_t> s = rd->texture_get_data(light_accum_tex, i);
+				Ref<Image> img;
+				img.instance();
+				img->create(atlas_size.width, atlas_size.height, false, Image::FORMAT_RGBAH, s);
+
+				Ref<Image> denoised = denoiser->denoise_image(img);
+				if (denoised != img) {
+					denoised->convert(Image::FORMAT_RGBAH);
+					Vector<uint8_t> ds = denoised->get_data();
+					denoised.unref(); //avoid copy on write
+					{ //restore alpha
+						uint32_t count = s.size() / 2; //uint16s
+						const uint16_t *src = (const uint16_t *)s.ptr();
+						uint16_t *dst = (uint16_t *)ds.ptrw();
+						for (uint32_t j = 0; j < count; j += 4) {
+							dst[j + 3] = src[j + 3];
+						}
+					}
+					rd->texture_update(light_accum_tex, i, ds, true);
+				}
+			}
+		}
+	}
+
+#ifdef DEBUG_TEXTURES
+
+	for (int i = 0; i < atlas_slices * (p_bake_sh ? 4 : 1); i++) {
+		Vector<uint8_t> s = rd->texture_get_data(light_accum_tex, i);
+		Ref<Image> img;
+		img.instance();
+		img->create(atlas_size.width, atlas_size.height, false, Image::FORMAT_RGBAH, s);
+		img->convert(Image::FORMAT_RGBA8);
+		img->save_png("res://4_light_secondary_" + itos(i) + ".png");
+	}
+#endif
+
+	/* DILATE LIGHTMAP */
+	{
+		SWAP(light_accum_tex, light_accum_tex2);
+
+		Vector<RD::Uniform> uniforms;
+		{
+			{
+				RD::Uniform u;
+				u.type = RD::UNIFORM_TYPE_IMAGE;
+				u.binding = 0;
+				u.ids.push_back(light_accum_tex);
+				uniforms.push_back(u);
+			}
+			{
+				RD::Uniform u;
+				u.type = RD::UNIFORM_TYPE_TEXTURE;
+				u.binding = 1;
+				u.ids.push_back(light_accum_tex2);
+				uniforms.push_back(u);
+			}
+		}
+
+		RID dilate_uniform_set = rd->uniform_set_create(uniforms, compute_shader_dilate, 1);
+
+		RD::ComputeListID compute_list = rd->compute_list_begin();
+		rd->compute_list_bind_compute_pipeline(compute_list, compute_shader_dilate_pipeline);
+		rd->compute_list_bind_uniform_set(compute_list, compute_base_uniform_set, 0);
+		rd->compute_list_bind_uniform_set(compute_list, dilate_uniform_set, 1);
+		push_constant.region_ofs[0] = 0;
+		push_constant.region_ofs[1] = 0;
+		group_size = Vector3i((atlas_size.x - 1) / 8 + 1, (atlas_size.y - 1) / 8 + 1, 1); //restore group size
+
+		for (int i = 0; i < atlas_slices * (p_bake_sh ? 4 : 1); i++) {
+			push_constant.atlas_slice = i;
+			rd->compute_list_set_push_constant(compute_list, &push_constant, sizeof(PushConstant));
+			rd->compute_list_dispatch(compute_list, group_size.x, group_size.y, group_size.z);
+			//no barrier, let them run all together
+		}
+		rd->compute_list_end();
+	}
+
+#ifdef DEBUG_TEXTURES
+
+	for (int i = 0; i < atlas_slices * (p_bake_sh ? 4 : 1); i++) {
+		Vector<uint8_t> s = rd->texture_get_data(light_accum_tex, i);
+		Ref<Image> img;
+		img.instance();
+		img->create(atlas_size.width, atlas_size.height, false, Image::FORMAT_RGBAH, s);
+		img->convert(Image::FORMAT_RGBA8);
+		img->save_png("res://5_dilated_" + itos(i) + ".png");
+	}
+#endif
+
+	/* BLEND SEAMS */
+	//shaders
+	Ref<RDShaderFile> blendseams_shader;
+	blendseams_shader.instance();
+	err = blendseams_shader->parse_versions_from_text(lm_blendseams_shader_glsl);
+	if (err != OK) {
+		FREE_TEXTURES
+		FREE_BUFFERS
+		FREE_RASTER_RESOURCES
+		FREE_COMPUTE_RESOURCES
+		memdelete(rd);
+		blendseams_shader->print_errors("blendseams_shader");
+	}
+	ERR_FAIL_COND_V(err != OK, BAKE_ERROR_LIGHTMAP_CANT_PRE_BAKE_MESHES);
+
+	RID blendseams_line_raster_shader = rd->shader_create_from_bytecode(blendseams_shader->get_bytecode("lines"));
+
+	ERR_FAIL_COND_V(blendseams_line_raster_shader.is_null(), BAKE_ERROR_LIGHTMAP_CANT_PRE_BAKE_MESHES);
+
+	RID blendseams_triangle_raster_shader = rd->shader_create_from_bytecode(blendseams_shader->get_bytecode("triangles"));
+
+	ERR_FAIL_COND_V(blendseams_triangle_raster_shader.is_null(), BAKE_ERROR_LIGHTMAP_CANT_PRE_BAKE_MESHES);
+
+#define FREE_BLENDSEAMS_RESOURCES            \
+	rd->free(blendseams_line_raster_shader); \
+	rd->free(blendseams_triangle_raster_shader);
+
+	{
+		//pre copy
+		for (int i = 0; i < atlas_slices * (p_bake_sh ? 4 : 1); i++) {
+			rd->texture_copy(light_accum_tex, light_accum_tex2, Vector3(), Vector3(), Vector3(atlas_size.width, atlas_size.height, 1), 0, 0, i, i, true);
+		}
+
+		Vector<RID> framebuffers;
+		for (int i = 0; i < atlas_slices * (p_bake_sh ? 4 : 1); i++) {
+			RID slice_tex = rd->texture_create_shared_from_slice(RD::TextureView(), light_accum_tex, i, 0);
+			Vector<RID> fb;
+			fb.push_back(slice_tex);
+			fb.push_back(raster_depth_buffer);
+			framebuffers.push_back(rd->framebuffer_create(fb));
+		}
+
+		Vector<RD::Uniform> uniforms;
+		{
+			{
+				RD::Uniform u;
+				u.type = RD::UNIFORM_TYPE_TEXTURE;
+				u.binding = 0;
+				u.ids.push_back(light_accum_tex2);
+				uniforms.push_back(u);
+			}
+		}
+
+		RID blendseams_raster_uniform = rd->uniform_set_create(uniforms, blendseams_line_raster_shader, 1);
+
+		bool debug = false;
+		RD::PipelineColorBlendState bs = RD::PipelineColorBlendState::create_blend(1);
+		bs.attachments.write[0].src_alpha_blend_factor = RD::BLEND_FACTOR_ZERO;
+		bs.attachments.write[0].dst_alpha_blend_factor = RD::BLEND_FACTOR_ONE;
+
+		RD::PipelineDepthStencilState ds;
+		ds.enable_depth_test = true;
+		ds.enable_depth_write = true;
+		ds.depth_compare_operator = RD::COMPARE_OP_LESS; //so it does not render same pixel twice, this avoids wrong blending
+
+		RID blendseams_line_raster_pipeline = rd->render_pipeline_create(blendseams_line_raster_shader, rd->framebuffer_get_format(framebuffers[0]), RD::INVALID_FORMAT_ID, RD::RENDER_PRIMITIVE_LINES, RD::PipelineRasterizationState(), RD::PipelineMultisampleState(), ds, bs, 0);
+		RID blendseams_triangle_raster_pipeline = rd->render_pipeline_create(blendseams_triangle_raster_shader, rd->framebuffer_get_format(framebuffers[0]), RD::INVALID_FORMAT_ID, RD::RENDER_PRIMITIVE_TRIANGLES, RD::PipelineRasterizationState(), RD::PipelineMultisampleState(), ds, bs, 0);
+
+		uint32_t seam_offset = 0;
+		uint32_t triangle_offset = 0;
+
+		Vector<Color> clear_colors;
+		clear_colors.push_back(Color(0, 0, 0, 1));
+		for (int i = 0; i < atlas_slices; i++) {
+			int subslices = (p_bake_sh ? 4 : 1);
+			for (int k = 0; k < subslices; k++) {
+				RasterSeamsPushConstant seams_push_constant;
+				seams_push_constant.slice = uint32_t(i * subslices + k);
+				seams_push_constant.debug = debug;
+
+				RD::DrawListID draw_list = rd->draw_list_begin(framebuffers[i], RD::INITIAL_ACTION_KEEP, RD::FINAL_ACTION_READ, RD::INITIAL_ACTION_CLEAR, RD::FINAL_ACTION_DISCARD, clear_colors);
+
+				rd->draw_list_bind_uniform_set(draw_list, raster_base_uniform, 0);
+				rd->draw_list_bind_uniform_set(draw_list, blendseams_raster_uniform, 1);
+
+				const int uv_offset_count = 9;
+				static const Vector3 uv_offsets[uv_offset_count] = {
+					Vector3(0, 0, 0.5), //using zbuffer, so go inwards-outwards
+					Vector3(0, 1, 0.2),
+					Vector3(0, -1, 0.2),
+					Vector3(1, 0, 0.2),
+					Vector3(-1, 0, 0.2),
+					Vector3(-1, -1, 0.1),
+					Vector3(1, -1, 0.1),
+					Vector3(1, 1, 0.1),
+					Vector3(-1, 1, 0.1),
+				};
+
+				/* step 1 use lines to blend the edges */
+				{
+					seams_push_constant.base_index = seam_offset;
+					rd->draw_list_bind_render_pipeline(draw_list, blendseams_line_raster_pipeline);
+					seams_push_constant.uv_offset[0] = uv_offsets[0].x / float(atlas_size.width);
+					seams_push_constant.uv_offset[1] = uv_offsets[0].y / float(atlas_size.height);
+					seams_push_constant.blend = uv_offsets[0].z;
+
+					rd->draw_list_set_push_constant(draw_list, &seams_push_constant, sizeof(RasterSeamsPushConstant));
+					rd->draw_list_draw(draw_list, false, 1, slice_seam_count[i] * 4);
+				}
+
+				/* step 2 use triangles to mask the interior */
+
+				{
+					seams_push_constant.base_index = triangle_offset;
+					rd->draw_list_bind_render_pipeline(draw_list, blendseams_triangle_raster_pipeline);
+					seams_push_constant.blend = 0; //do not draw them, just fill the z-buffer so its used as a mask
+
+					rd->draw_list_set_push_constant(draw_list, &seams_push_constant, sizeof(RasterSeamsPushConstant));
+					rd->draw_list_draw(draw_list, false, 1, slice_triangle_count[i] * 3);
+				}
+				/* step 3 blend around the triangle */
+
+				rd->draw_list_bind_render_pipeline(draw_list, blendseams_line_raster_pipeline);
+
+				for (int j = 1; j < uv_offset_count; j++) {
+					seams_push_constant.base_index = seam_offset;
+					seams_push_constant.uv_offset[0] = uv_offsets[j].x / float(atlas_size.width);
+					seams_push_constant.uv_offset[1] = uv_offsets[j].y / float(atlas_size.height);
+					seams_push_constant.blend = uv_offsets[0].z;
+
+					rd->draw_list_set_push_constant(draw_list, &seams_push_constant, sizeof(RasterSeamsPushConstant));
+					rd->draw_list_draw(draw_list, false, 1, slice_seam_count[i] * 4);
+				}
+				rd->draw_list_end();
+			}
+			seam_offset += slice_seam_count[i];
+			triangle_offset += slice_triangle_count[i];
+		}
+	}
+
+#ifdef DEBUG_TEXTURES
+
+	for (int i = 0; i < atlas_slices * (p_bake_sh ? 4 : 1); i++) {
+		Vector<uint8_t> s = rd->texture_get_data(light_accum_tex, i);
+		Ref<Image> img;
+		img.instance();
+		img->create(atlas_size.width, atlas_size.height, false, Image::FORMAT_RGBAH, s);
+		img->convert(Image::FORMAT_RGBA8);
+		img->save_png("res://5_blendseams" + itos(i) + ".png");
+	}
+#endif
+	if (p_step_function) {
+		p_step_function(0.9, TTR("Retrieving textures"), p_bake_userdata, true);
+	}
+
+	for (int i = 0; i < atlas_slices * (p_bake_sh ? 4 : 1); i++) {
+		Vector<uint8_t> s = rd->texture_get_data(light_accum_tex, i);
+		Ref<Image> img;
+		img.instance();
+		img->create(atlas_size.width, atlas_size.height, false, Image::FORMAT_RGBAH, s);
+		img->convert(Image::FORMAT_RGBH); //remove alpha
+		bake_textures.push_back(img);
+	}
+
+	if (probe_positions.size() > 0) {
+		probe_values.resize(probe_positions.size() * 9);
+		Vector<uint8_t> probe_data = rd->buffer_get_data(light_probe_buffer);
+		copymem(probe_values.ptrw(), probe_data.ptr(), probe_data.size());
+		rd->free(light_probe_buffer);
+
+#ifdef DEBUG_TEXTURES
+		{
+			Ref<Image> img2;
+			img2.instance();
+			img2->create(probe_values.size(), 1, false, Image::FORMAT_RGBAF, probe_data);
+			img2->save_png("res://6_lightprobes.png");
+		}
+#endif
+	}
+
+	FREE_TEXTURES
+	FREE_BUFFERS
+	FREE_RASTER_RESOURCES
+	FREE_COMPUTE_RESOURCES
+	FREE_BLENDSEAMS_RESOURCES
+
+	memdelete(rd);
+
+	return BAKE_OK;
+}
+
+int LightmapperRD::get_bake_texture_count() const {
+	return bake_textures.size();
+}
+
+Ref<Image> LightmapperRD::get_bake_texture(int p_index) const {
+	ERR_FAIL_INDEX_V(p_index, bake_textures.size(), Ref<Image>());
+	return bake_textures[p_index];
+}
+
+int LightmapperRD::get_bake_mesh_count() const {
+	return mesh_instances.size();
+}
+
+Variant LightmapperRD::get_bake_mesh_userdata(int p_index) const {
+	ERR_FAIL_INDEX_V(p_index, mesh_instances.size(), Variant());
+	return mesh_instances[p_index].data.userdata;
+}
+
+Rect2 LightmapperRD::get_bake_mesh_uv_scale(int p_index) const {
+	ERR_FAIL_COND_V(bake_textures.size() == 0, Rect2());
+	Rect2 uv_ofs;
+	Vector2 atlas_size = Vector2(bake_textures[0]->get_width(), bake_textures[0]->get_height());
+	uv_ofs.position = Vector2(mesh_instances[p_index].offset) / atlas_size;
+	uv_ofs.size = Vector2(mesh_instances[p_index].data.albedo_on_uv2->get_width(), mesh_instances[p_index].data.albedo_on_uv2->get_height()) / atlas_size;
+	return uv_ofs;
+}
+
+int LightmapperRD::get_bake_mesh_texture_slice(int p_index) const {
+	ERR_FAIL_INDEX_V(p_index, mesh_instances.size(), Variant());
+	return mesh_instances[p_index].slice;
+}
+
+int LightmapperRD::get_bake_probe_count() const {
+	return probe_positions.size();
+}
+
+Vector3 LightmapperRD::get_bake_probe_point(int p_probe) const {
+	ERR_FAIL_INDEX_V(p_probe, probe_positions.size(), Variant());
+	return Vector3(probe_positions[p_probe].position[0], probe_positions[p_probe].position[1], probe_positions[p_probe].position[2]);
+}
+
+Vector<Color> LightmapperRD::get_bake_probe_sh(int p_probe) const {
+	ERR_FAIL_INDEX_V(p_probe, probe_positions.size(), Vector<Color>());
+	Vector<Color> ret;
+	ret.resize(9);
+	copymem(ret.ptrw(), &probe_values[p_probe * 9], sizeof(Color) * 9);
+	return ret;
+}
+
+LightmapperRD::LightmapperRD() {
+}
diff --git a/modules/lightmapper_rd/lightmapper_rd.h b/modules/lightmapper_rd/lightmapper_rd.h
new file mode 100644
index 0000000000..cd000414cf
--- /dev/null
+++ b/modules/lightmapper_rd/lightmapper_rd.h
@@ -0,0 +1,258 @@
+/*************************************************************************/
+/*  lightmapper_rd.h                                                     */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef LIGHTMAPPER_RD_H
+#define LIGHTMAPPER_RD_H
+
+#include "core/local_vector.h"
+#include "scene/3d/lightmapper.h"
+#include "scene/resources/mesh.h"
+#include "servers/rendering/rendering_device.h"
+
+class LightmapperRD : public Lightmapper {
+	GDCLASS(LightmapperRD, Lightmapper)
+
+	struct MeshInstance {
+		MeshData data;
+		int slice = 0;
+		Vector2i offset;
+	};
+
+	struct Light {
+		float position[3];
+		uint32_t type = LIGHT_TYPE_DIRECTIONAL;
+		float direction[3];
+		float energy;
+		float color[3];
+		float size;
+		float range;
+		float attenuation;
+		float spot_angle;
+		float spot_attenuation;
+		uint32_t static_bake;
+		uint32_t pad[3];
+
+		bool operator<(const Light &p_light) const {
+			return type < p_light.type;
+		}
+	};
+
+	struct Vertex {
+		float position[3];
+		float normal_z;
+		float uv[2];
+		float normal_xy[2];
+
+		bool operator==(const Vertex &p_vtx) const {
+			return (position[0] == p_vtx.position[0]) &&
+				   (position[1] == p_vtx.position[1]) &&
+				   (position[2] == p_vtx.position[2]) &&
+				   (uv[0] == p_vtx.uv[0]) &&
+				   (uv[1] == p_vtx.uv[1]) &&
+				   (normal_xy[0] == p_vtx.normal_xy[0]) &&
+				   (normal_xy[1] == p_vtx.normal_xy[1]) &&
+				   (normal_z == p_vtx.normal_z);
+		}
+	};
+
+	struct Edge {
+		Vector3 a;
+		Vector3 b;
+		Vector3 na;
+		Vector3 nb;
+		bool operator==(const Edge &p_seam) const {
+			return a == p_seam.a && b == p_seam.b && na == p_seam.na && nb == p_seam.nb;
+		}
+		Edge() {
+		}
+
+		Edge(const Vector3 &p_a, const Vector3 &p_b, const Vector3 &p_na, const Vector3 &p_nb) {
+			a = p_a;
+			b = p_b;
+			na = p_na;
+			nb = p_nb;
+		}
+	};
+
+	struct Probe {
+		float position[4];
+	};
+
+	Vector<Probe> probe_positions;
+
+	struct EdgeHash {
+		_FORCE_INLINE_ static uint32_t hash(const Edge &p_edge) {
+			uint32_t h = hash_djb2_one_float(p_edge.a.x);
+			h = hash_djb2_one_float(p_edge.a.y, h);
+			h = hash_djb2_one_float(p_edge.a.z, h);
+			h = hash_djb2_one_float(p_edge.b.x, h);
+			h = hash_djb2_one_float(p_edge.b.y, h);
+			h = hash_djb2_one_float(p_edge.b.z, h);
+			return h;
+		}
+	};
+	struct EdgeUV2 {
+		Vector2 a;
+		Vector2 b;
+		Vector2i indices;
+		bool operator==(const EdgeUV2 &p_uv2) const {
+			return a == p_uv2.a && b == p_uv2.b;
+		}
+		bool seam_found = false;
+		EdgeUV2(Vector2 p_a, Vector2 p_b, Vector2i p_indices) {
+			a = p_a;
+			b = p_b;
+			indices = p_indices;
+		}
+		EdgeUV2() {}
+	};
+
+	struct Seam {
+		Vector2i a;
+		Vector2i b;
+		uint32_t slice;
+		bool operator<(const Seam &p_seam) const {
+			return slice < p_seam.slice;
+		}
+	};
+
+	struct VertexHash {
+		_FORCE_INLINE_ static uint32_t hash(const Vertex &p_vtx) {
+			uint32_t h = hash_djb2_one_float(p_vtx.position[0]);
+			h = hash_djb2_one_float(p_vtx.position[1], h);
+			h = hash_djb2_one_float(p_vtx.position[2], h);
+			h = hash_djb2_one_float(p_vtx.uv[0], h);
+			h = hash_djb2_one_float(p_vtx.uv[1], h);
+			h = hash_djb2_one_float(p_vtx.normal_xy[0], h);
+			h = hash_djb2_one_float(p_vtx.normal_xy[1], h);
+			h = hash_djb2_one_float(p_vtx.normal_z, h);
+			return h;
+		}
+	};
+
+	struct Box {
+		float min_bounds[3];
+		float pad0;
+		float max_bounds[3];
+		float pad1;
+	};
+
+	struct Triangle {
+		uint32_t indices[3];
+		uint32_t slice;
+		bool operator<(const Triangle &p_triangle) const {
+			return slice < p_triangle.slice;
+		}
+	};
+
+	Vector<MeshInstance> mesh_instances;
+
+	Vector<Light> lights;
+
+	struct TriangleSort {
+		uint32_t cell_index;
+		uint32_t triangle_index;
+		bool operator<(const TriangleSort &p_triangle_sort) const {
+			return cell_index < p_triangle_sort.cell_index; //sorting by triangle index in this case makes no sense
+		}
+	};
+
+	void _plot_triangle_into_triangle_index_list(int p_size, const Vector3i &p_ofs, const AABB &p_bounds, const Vector3 p_points[], uint32_t p_triangle_index, LocalVector<TriangleSort> &triangles, uint32_t p_grid_size);
+
+	struct RasterPushConstant {
+		float atlas_size[2];
+		float uv_offset[2];
+		float to_cell_size[3];
+		uint32_t base_triangle;
+		float to_cell_offset[3];
+		float bias;
+		int32_t grid_size[3];
+		uint32_t pad2;
+	};
+
+	struct RasterSeamsPushConstant {
+		uint32_t base_index;
+		uint32_t slice;
+		float uv_offset[2];
+		uint32_t debug;
+		float blend;
+		uint32_t pad[2];
+	};
+
+	struct PushConstant {
+		int32_t atlas_size[2];
+		uint32_t ray_count;
+		uint32_t ray_to;
+
+		float world_size[3];
+		float bias;
+
+		float to_cell_offset[3];
+		uint32_t ray_from;
+
+		float to_cell_size[3];
+		uint32_t light_count;
+
+		int32_t grid_size;
+		int32_t atlas_slice;
+		int32_t region_ofs[2];
+
+		float environment_xform[12];
+	};
+
+	Vector<Ref<Image>> bake_textures;
+	Vector<Color> probe_values;
+
+	BakeError _blit_meshes_into_atlas(int p_max_texture_size, Vector<Ref<Image>> &albedo_images, Vector<Ref<Image>> &emission_images, AABB &bounds, Size2i &atlas_size, int &atlas_slices, BakeStepFunc p_step_function, void *p_bake_userdata);
+	void _create_acceleration_structures(RenderingDevice *rd, Size2i atlas_size, int atlas_slices, AABB &bounds, int grid_size, Vector<Probe> &probe_positions, GenerateProbes p_generate_probes, Vector<int> &slice_triangle_count, Vector<int> &slice_seam_count, RID &vertex_buffer, RID &triangle_buffer, RID &box_buffer, RID &lights_buffer, RID &triangle_cell_indices_buffer, RID &probe_positions_buffer, RID &grid_texture, RID &grid_texture_sdf, RID &seams_buffer, BakeStepFunc p_step_function, void *p_bake_userdata);
+	void _raster_geometry(RenderingDevice *rd, Size2i atlas_size, int atlas_slices, int grid_size, AABB bounds, float p_bias, Vector<int> slice_triangle_count, RID position_tex, RID unocclude_tex, RID normal_tex, RID raster_depth_buffer, RID rasterize_shader, RID raster_base_uniform);
+
+public:
+	virtual void add_mesh(const MeshData &p_mesh) override;
+	virtual void add_directional_light(bool p_static, const Vector3 &p_direction, const Color &p_color, float p_energy, float p_angular_distance) override;
+	virtual void add_omni_light(bool p_static, const Vector3 &p_position, const Color &p_color, float p_energy, float p_range, float p_attenuation, float p_size) override;
+	virtual void add_spot_light(bool p_static, const Vector3 &p_position, const Vector3 p_direction, const Color &p_color, float p_energy, float p_range, float p_attenuation, float p_spot_angle, float p_spot_attenuation, float p_size) override;
+	virtual void add_probe(const Vector3 &p_position) override;
+	virtual BakeError bake(BakeQuality p_quality, bool p_use_denoiser, int p_bounces, float p_bias, int p_max_texture_size, bool p_bake_sh, GenerateProbes p_generate_probes, const Ref<Image> &p_environment_panorama, const Basis &p_environment_transform, BakeStepFunc p_step_function = nullptr, void *p_bake_userdata = nullptr) override;
+
+	int get_bake_texture_count() const override;
+	Ref<Image> get_bake_texture(int p_index) const override;
+	int get_bake_mesh_count() const override;
+	Variant get_bake_mesh_userdata(int p_index) const override;
+	Rect2 get_bake_mesh_uv_scale(int p_index) const override;
+	int get_bake_mesh_texture_slice(int p_index) const override;
+	int get_bake_probe_count() const override;
+	Vector3 get_bake_probe_point(int p_probe) const override;
+	Vector<Color> get_bake_probe_sh(int p_probe) const override;
+
+	LightmapperRD();
+};
+
+#endif // LIGHTMAPPER_H
diff --git a/modules/lightmapper_rd/lm_blendseams.glsl b/modules/lightmapper_rd/lm_blendseams.glsl
new file mode 100644
index 0000000000..e47e5fcc51
--- /dev/null
+++ b/modules/lightmapper_rd/lm_blendseams.glsl
@@ -0,0 +1,108 @@
+#[versions]
+
+lines = "#define MODE_LINES";
+triangles = "#define MODE_TRIANGLES";
+
+#[vertex]
+
+#version 450
+
+VERSION_DEFINES
+
+#include "lm_common_inc.glsl"
+
+layout(push_constant, binding = 0, std430) uniform Params {
+	uint base_index;
+	uint slice;
+	vec2 uv_offset;
+	bool debug;
+	float blend;
+	uint pad[2];
+}
+params;
+
+layout(location = 0) out vec3 uv_interp;
+
+void main() {
+#ifdef MODE_TRIANGLES
+	uint triangle_idx = params.base_index + gl_VertexIndex / 3;
+	uint triangle_subidx = gl_VertexIndex % 3;
+
+	vec2 uv;
+	if (triangle_subidx == 0) {
+		uv = vertices.data[triangles.data[triangle_idx].indices.x].uv;
+	} else if (triangle_subidx == 1) {
+		uv = vertices.data[triangles.data[triangle_idx].indices.y].uv;
+	} else {
+		uv = vertices.data[triangles.data[triangle_idx].indices.z].uv;
+	}
+
+	uv_interp = vec3(uv, float(params.slice));
+	gl_Position = vec4((uv + params.uv_offset) * 2.0 - 1.0, 0.0001, 1.0);
+#endif
+
+#ifdef MODE_LINES
+	uint seam_idx = params.base_index + gl_VertexIndex / 4;
+	uint seam_subidx = gl_VertexIndex % 4;
+
+	uint src_idx;
+	uint dst_idx;
+
+	if (seam_subidx == 0) {
+		src_idx = seams.data[seam_idx].b.x;
+		dst_idx = seams.data[seam_idx].a.x;
+	} else if (seam_subidx == 1) {
+		src_idx = seams.data[seam_idx].b.y;
+		dst_idx = seams.data[seam_idx].a.y;
+	} else if (seam_subidx == 2) {
+		src_idx = seams.data[seam_idx].a.x;
+		dst_idx = seams.data[seam_idx].b.x;
+	} else if (seam_subidx == 3) {
+		src_idx = seams.data[seam_idx].a.y;
+		dst_idx = seams.data[seam_idx].b.y;
+	}
+
+	vec2 src_uv = vertices.data[src_idx].uv;
+	vec2 dst_uv = vertices.data[dst_idx].uv + params.uv_offset;
+
+	uv_interp = vec3(src_uv, float(params.slice));
+	gl_Position = vec4(dst_uv * 2.0 - 1.0, 0.0001, 1.0);
+#endif
+}
+
+#[fragment]
+
+#version 450
+
+VERSION_DEFINES
+
+#include "lm_common_inc.glsl"
+
+layout(push_constant, binding = 0, std430) uniform Params {
+	uint base_index;
+	uint slice;
+	vec2 uv_offset;
+	bool debug;
+	float blend;
+	uint pad[2];
+}
+params;
+
+layout(location = 0) in vec3 uv_interp;
+
+layout(location = 0) out vec4 dst_color;
+
+layout(set = 1, binding = 0) uniform texture2DArray src_color_tex;
+
+void main() {
+	if (params.debug) {
+#ifdef MODE_TRIANGLES
+		dst_color = vec4(1, 0, 1, 1);
+#else
+		dst_color = vec4(1, 1, 0, 1);
+#endif
+	} else {
+		vec4 src_color = textureLod(sampler2DArray(src_color_tex, linear_sampler), uv_interp, 0.0);
+		dst_color = vec4(src_color.rgb, params.blend); //mix
+	}
+}
diff --git a/modules/lightmapper_rd/lm_common_inc.glsl b/modules/lightmapper_rd/lm_common_inc.glsl
new file mode 100644
index 0000000000..0ff455936e
--- /dev/null
+++ b/modules/lightmapper_rd/lm_common_inc.glsl
@@ -0,0 +1,92 @@
+
+/* SET 0, static data that does not change between any call */
+
+struct Vertex {
+	vec3 position;
+	float normal_z;
+	vec2 uv;
+	vec2 normal_xy;
+};
+
+layout(set = 0, binding = 1, std430) restrict readonly buffer Vertices {
+	Vertex data[];
+}
+vertices;
+
+struct Triangle {
+	uvec3 indices;
+	uint slice;
+};
+
+layout(set = 0, binding = 2, std430) restrict readonly buffer Triangles {
+	Triangle data[];
+}
+triangles;
+
+struct Box {
+	vec3 min_bounds;
+	uint pad0;
+	vec3 max_bounds;
+	uint pad1;
+};
+
+layout(set = 0, binding = 3, std430) restrict readonly buffer Boxes {
+	Box data[];
+}
+boxes;
+
+layout(set = 0, binding = 4, std430) restrict readonly buffer GridIndices {
+	uint data[];
+}
+grid_indices;
+
+#define LIGHT_TYPE_DIRECTIONAL 0
+#define LIGHT_TYPE_OMNI 1
+#define LIGHT_TYPE_SPOT 2
+
+struct Light {
+	vec3 position;
+	uint type;
+
+	vec3 direction;
+	float energy;
+
+	vec3 color;
+	float size;
+
+	float range;
+	float attenuation;
+	float spot_angle;
+	float spot_attenuation;
+
+	bool static_bake;
+	uint pad[3];
+};
+
+layout(set = 0, binding = 5, std430) restrict readonly buffer Lights {
+	Light data[];
+}
+lights;
+
+struct Seam {
+	uvec2 a;
+	uvec2 b;
+};
+
+layout(set = 0, binding = 6, std430) restrict readonly buffer Seams {
+	Seam data[];
+}
+seams;
+
+layout(set = 0, binding = 7, std430) restrict readonly buffer Probes {
+	vec4 data[];
+}
+probe_positions;
+
+layout(set = 0, binding = 8) uniform utexture3D grid;
+layout(set = 0, binding = 9) uniform texture3D grid_sdf;
+
+layout(set = 0, binding = 10) uniform texture2DArray albedo_tex;
+layout(set = 0, binding = 11) uniform texture2DArray emission_tex;
+
+layout(set = 0, binding = 12) uniform sampler linear_sampler;
diff --git a/modules/lightmapper_rd/lm_compute.glsl b/modules/lightmapper_rd/lm_compute.glsl
new file mode 100644
index 0000000000..56976bd623
--- /dev/null
+++ b/modules/lightmapper_rd/lm_compute.glsl
@@ -0,0 +1,644 @@
+#[versions]
+
+primary = "#define MODE_DIRECT_LIGHT";
+secondary = "#define MODE_BOUNCE_LIGHT";
+dilate = "#define MODE_DILATE";
+unocclude = "#define MODE_UNOCCLUDE";
+light_probes = "#define MODE_LIGHT_PROBES";
+
+#[compute]
+
+#version 450
+
+VERSION_DEFINES
+
+// One 2D local group focusing in one layer at a time, though all
+// in parallel (no barriers) makes more sense than a 3D local group
+// as this can take more advantage of the cache for each group.
+
+#ifdef MODE_LIGHT_PROBES
+
+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1) in;
+
+#else
+
+layout(local_size_x = 8, local_size_y = 8, local_size_z = 1) in;
+
+#endif
+
+#include "lm_common_inc.glsl"
+
+#ifdef MODE_LIGHT_PROBES
+
+layout(set = 1, binding = 0, std430) restrict buffer LightProbeData {
+	vec4 data[];
+}
+light_probes;
+
+layout(set = 1, binding = 1) uniform texture2DArray source_light;
+layout(set = 1, binding = 2) uniform texture2DArray source_direct_light; //also need the direct light, which was omitted
+layout(set = 1, binding = 3) uniform texture2D environment;
+#endif
+
+#ifdef MODE_UNOCCLUDE
+
+layout(rgba32f, set = 1, binding = 0) uniform restrict image2DArray position;
+layout(rgba32f, set = 1, binding = 1) uniform restrict readonly image2DArray unocclude;
+
+#endif
+
+#if defined(MODE_DIRECT_LIGHT) || defined(MODE_BOUNCE_LIGHT)
+
+layout(rgba16f, set = 1, binding = 0) uniform restrict writeonly image2DArray dest_light;
+layout(set = 1, binding = 1) uniform texture2DArray source_light;
+layout(set = 1, binding = 2) uniform texture2DArray source_position;
+layout(set = 1, binding = 3) uniform texture2DArray source_normal;
+layout(rgba16f, set = 1, binding = 4) uniform restrict image2DArray accum_light;
+
+#endif
+
+#ifdef MODE_BOUNCE_LIGHT
+layout(rgba32f, set = 1, binding = 5) uniform restrict image2DArray bounce_accum;
+layout(set = 1, binding = 6) uniform texture2D environment;
+#endif
+#ifdef MODE_DIRECT_LIGHT
+layout(rgba32f, set = 1, binding = 5) uniform restrict writeonly image2DArray primary_dynamic;
+#endif
+
+#ifdef MODE_DILATE
+layout(rgba16f, set = 1, binding = 0) uniform restrict writeonly image2DArray dest_light;
+layout(set = 1, binding = 1) uniform texture2DArray source_light;
+#endif
+
+layout(push_constant, binding = 0, std430) uniform Params {
+	ivec2 atlas_size; // x used for light probe mode total probes
+	uint ray_count;
+	uint ray_to;
+
+	vec3 world_size;
+	float bias;
+
+	vec3 to_cell_offset;
+	uint ray_from;
+
+	vec3 to_cell_size;
+	uint light_count;
+
+	int grid_size;
+	int atlas_slice;
+	ivec2 region_ofs;
+
+	mat3x4 env_transform;
+}
+params;
+
+//check it, but also return distance and barycentric coords (for uv lookup)
+bool ray_hits_triangle(vec3 from, vec3 dir, float max_dist, vec3 p0, vec3 p1, vec3 p2, out float r_distance, out vec3 r_barycentric) {
+	const vec3 e0 = p1 - p0;
+	const vec3 e1 = p0 - p2;
+	vec3 triangleNormal = cross(e1, e0);
+
+	const vec3 e2 = (1.0 / dot(triangleNormal, dir)) * (p0 - from);
+	const vec3 i = cross(dir, e2);
+
+	r_barycentric.y = dot(i, e1);
+	r_barycentric.z = dot(i, e0);
+	r_barycentric.x = 1.0 - (r_barycentric.z + r_barycentric.y);
+	r_distance = dot(triangleNormal, e2);
+	return (r_distance > params.bias) && (r_distance < max_dist) && all(greaterThanEqual(r_barycentric, vec3(0.0)));
+}
+
+bool trace_ray(vec3 p_from, vec3 p_to
+#if defined(MODE_BOUNCE_LIGHT) || defined(MODE_LIGHT_PROBES)
+		,
+		out uint r_triangle, out vec3 r_barycentric
+#endif
+#if defined(MODE_UNOCCLUDE)
+		,
+		out float r_distance, out vec3 r_normal
+#endif
+) {
+	/* world coords */
+
+	vec3 rel = p_to - p_from;
+	float rel_len = length(rel);
+	vec3 dir = normalize(rel);
+	vec3 inv_dir = 1.0 / dir;
+
+	/* cell coords */
+
+	vec3 from_cell = (p_from - params.to_cell_offset) * params.to_cell_size;
+	vec3 to_cell = (p_to - params.to_cell_offset) * params.to_cell_size;
+
+	//prepare DDA
+	vec3 rel_cell = to_cell - from_cell;
+	ivec3 icell = ivec3(from_cell);
+	ivec3 iendcell = ivec3(to_cell);
+	vec3 dir_cell = normalize(rel_cell);
+	vec3 delta = abs(1.0 / dir_cell); //vec3(length(rel_cell)) / rel_cell);
+	ivec3 step = ivec3(sign(rel_cell));
+	vec3 side = (sign(rel_cell) * (vec3(icell) - from_cell) + (sign(rel_cell) * 0.5) + 0.5) * delta;
+
+	uint iters = 0;
+	while (all(greaterThanEqual(icell, ivec3(0))) && all(lessThan(icell, ivec3(params.grid_size))) && iters < 1000) {
+		uvec2 cell_data = texelFetch(usampler3D(grid, linear_sampler), icell, 0).xy;
+		if (cell_data.x > 0) { //triangles here
+			bool hit = false;
+#if defined(MODE_UNOCCLUDE)
+			bool hit_backface = false;
+#endif
+			float best_distance = 1e20;
+
+			for (uint i = 0; i < cell_data.x; i++) {
+				uint tidx = grid_indices.data[cell_data.y + i];
+
+				//Ray-Box test
+				vec3 t0 = (boxes.data[tidx].min_bounds - p_from) * inv_dir;
+				vec3 t1 = (boxes.data[tidx].max_bounds - p_from) * inv_dir;
+				vec3 tmin = min(t0, t1), tmax = max(t0, t1);
+
+				if (max(tmin.x, max(tmin.y, tmin.z)) <= min(tmax.x, min(tmax.y, tmax.z))) {
+					continue; //ray box failed
+				}
+
+				//prepare triangle vertices
+				vec3 vtx0 = vertices.data[triangles.data[tidx].indices.x].position;
+				vec3 vtx1 = vertices.data[triangles.data[tidx].indices.y].position;
+				vec3 vtx2 = vertices.data[triangles.data[tidx].indices.z].position;
+#if defined(MODE_UNOCCLUDE)
+				vec3 normal = -normalize(cross((vtx0 - vtx1), (vtx0 - vtx2)));
+
+				bool backface = dot(normal, dir) >= 0.0;
+#endif
+				float distance;
+				vec3 barycentric;
+
+				if (ray_hits_triangle(p_from, dir, rel_len, vtx0, vtx1, vtx2, distance, barycentric)) {
+#ifdef MODE_DIRECT_LIGHT
+					return true; //any hit good
+#endif
+
+#if defined(MODE_UNOCCLUDE)
+					if (!backface) {
+						// the case of meshes having both a front and back face in the same plane is more common than
+						// expected, so if this is a front-face, bias it closer to the ray origin, so it always wins over the back-face
+						distance = max(params.bias, distance - params.bias);
+					}
+
+					hit = true;
+
+					if (distance < best_distance) {
+						hit_backface = backface;
+						best_distance = distance;
+						r_distance = distance;
+						r_normal = normal;
+					}
+
+#endif
+
+#if defined(MODE_BOUNCE_LIGHT) || defined(MODE_LIGHT_PROBES)
+
+					hit = true;
+					if (distance < best_distance) {
+						best_distance = distance;
+						r_triangle = tidx;
+						r_barycentric = barycentric;
+					}
+#endif
+				}
+			}
+#if defined(MODE_UNOCCLUDE)
+
+			if (hit) {
+				return hit_backface;
+			}
+#endif
+#if defined(MODE_BOUNCE_LIGHT) || defined(MODE_LIGHT_PROBES)
+			if (hit) {
+				return true;
+			}
+#endif
+		}
+
+		if (icell == iendcell) {
+			break;
+		}
+
+		bvec3 mask = lessThanEqual(side.xyz, min(side.yzx, side.zxy));
+		side += vec3(mask) * delta;
+		icell += ivec3(vec3(mask)) * step;
+
+		iters++;
+	}
+
+	return false;
+}
+
+const float PI = 3.14159265f;
+const float GOLDEN_ANGLE = PI * (3.0 - sqrt(5.0));
+
+vec3 vogel_hemisphere(uint p_index, uint p_count, float p_offset) {
+	float r = sqrt(float(p_index) + 0.5f) / sqrt(float(p_count));
+	float theta = float(p_index) * GOLDEN_ANGLE + p_offset;
+	float y = cos(r * PI * 0.5);
+	float l = sin(r * PI * 0.5);
+	return vec3(l * cos(theta), l * sin(theta), y);
+}
+
+float quick_hash(vec2 pos) {
+	return fract(sin(dot(pos * 19.19, vec2(49.5791, 97.413))) * 49831.189237);
+}
+
+void main() {
+#ifdef MODE_LIGHT_PROBES
+	int probe_index = int(gl_GlobalInvocationID.x);
+	if (probe_index >= params.atlas_size.x) { //too large, do nothing
+		return;
+	}
+
+#else
+	ivec2 atlas_pos = ivec2(gl_GlobalInvocationID.xy) + params.region_ofs;
+	if (any(greaterThanEqual(atlas_pos, params.atlas_size))) { //too large, do nothing
+		return;
+	}
+#endif
+
+#ifdef MODE_DIRECT_LIGHT
+
+	vec3 normal = texelFetch(sampler2DArray(source_normal, linear_sampler), ivec3(atlas_pos, params.atlas_slice), 0).xyz;
+	if (length(normal) < 0.5) {
+		return; //empty texel, no process
+	}
+	vec3 position = texelFetch(sampler2DArray(source_position, linear_sampler), ivec3(atlas_pos, params.atlas_slice), 0).xyz;
+
+	//go through all lights
+	//start by own light (emissive)
+	vec3 static_light = vec3(0.0);
+	vec3 dynamic_light = vec3(0.0);
+
+#ifdef USE_SH_LIGHTMAPS
+	vec4 sh_accum[4] = vec4[](
+			vec4(0.0, 0.0, 0.0, 1.0),
+			vec4(0.0, 0.0, 0.0, 1.0),
+			vec4(0.0, 0.0, 0.0, 1.0),
+			vec4(0.0, 0.0, 0.0, 1.0));
+#endif
+
+	for (uint i = 0; i < params.light_count; i++) {
+		vec3 light_pos;
+		float attenuation;
+		if (lights.data[i].type == LIGHT_TYPE_DIRECTIONAL) {
+			vec3 light_vec = lights.data[i].direction;
+			light_pos = position - light_vec * length(params.world_size);
+			attenuation = 1.0;
+		} else {
+			light_pos = lights.data[i].position;
+			float d = distance(position, light_pos);
+			if (d > lights.data[i].range) {
+				continue;
+			}
+
+			d /= lights.data[i].range;
+
+			attenuation = pow(max(1.0 - d, 0.0), lights.data[i].attenuation);
+
+			if (lights.data[i].type == LIGHT_TYPE_SPOT) {
+				vec3 rel = normalize(position - light_pos);
+				float angle = acos(dot(rel, lights.data[i].direction));
+				if (angle > lights.data[i].spot_angle) {
+					continue; //invisible, dont try
+				}
+
+				float d = clamp(angle / lights.data[i].spot_angle, 0, 1);
+				attenuation *= pow(1.0 - d, lights.data[i].spot_attenuation);
+			}
+		}
+
+		vec3 light_dir = normalize(light_pos - position);
+		attenuation *= max(0.0, dot(normal, light_dir));
+
+		if (attenuation <= 0.0001) {
+			continue; //no need to do anything
+		}
+
+		if (!trace_ray(position + light_dir * params.bias, light_pos)) {
+			vec3 light = lights.data[i].color * lights.data[i].energy * attenuation;
+			if (lights.data[i].static_bake) {
+				static_light += light;
+#ifdef USE_SH_LIGHTMAPS
+
+				float c[4] = float[](
+						0.282095, //l0
+						0.488603 * light_dir.y, //l1n1
+						0.488603 * light_dir.z, //l1n0
+						0.488603 * light_dir.x //l1p1
+				);
+
+				for (uint j = 0; j < 4; j++) {
+					sh_accum[j].rgb += light * c[j] * (1.0 / 3.0);
+				}
+#endif
+
+			} else {
+				dynamic_light += light;
+			}
+		}
+	}
+
+	vec3 albedo = texelFetch(sampler2DArray(albedo_tex, linear_sampler), ivec3(atlas_pos, params.atlas_slice), 0).rgb;
+	vec3 emissive = texelFetch(sampler2DArray(emission_tex, linear_sampler), ivec3(atlas_pos, params.atlas_slice), 0).rgb;
+
+	dynamic_light *= albedo; //if it will bounce, must multiply by albedo
+	dynamic_light += emissive;
+
+	//keep for lightprobes
+	imageStore(primary_dynamic, ivec3(atlas_pos, params.atlas_slice), vec4(dynamic_light, 1.0));
+
+	dynamic_light += static_light * albedo; //send for bounces
+	imageStore(dest_light, ivec3(atlas_pos, params.atlas_slice), vec4(dynamic_light, 1.0));
+
+#ifdef USE_SH_LIGHTMAPS
+	//keep for adding at the end
+	imageStore(accum_light, ivec3(atlas_pos, params.atlas_slice * 4 + 0), sh_accum[0]);
+	imageStore(accum_light, ivec3(atlas_pos, params.atlas_slice * 4 + 1), sh_accum[1]);
+	imageStore(accum_light, ivec3(atlas_pos, params.atlas_slice * 4 + 2), sh_accum[2]);
+	imageStore(accum_light, ivec3(atlas_pos, params.atlas_slice * 4 + 3), sh_accum[3]);
+
+#else
+	imageStore(accum_light, ivec3(atlas_pos, params.atlas_slice), vec4(static_light, 1.0));
+#endif
+
+#endif
+
+#ifdef MODE_BOUNCE_LIGHT
+
+	vec3 normal = texelFetch(sampler2DArray(source_normal, linear_sampler), ivec3(atlas_pos, params.atlas_slice), 0).xyz;
+	if (length(normal) < 0.5) {
+		return; //empty texel, no process
+	}
+
+	vec3 position = texelFetch(sampler2DArray(source_position, linear_sampler), ivec3(atlas_pos, params.atlas_slice), 0).xyz;
+
+	vec3 v0 = abs(normal.z) < 0.999 ? vec3(0.0, 0.0, 1.0) : vec3(0.0, 1.0, 0.0);
+	vec3 tangent = normalize(cross(v0, normal));
+	vec3 bitangent = normalize(cross(tangent, normal));
+	mat3 normal_mat = mat3(tangent, bitangent, normal);
+
+#ifdef USE_SH_LIGHTMAPS
+	vec4 sh_accum[4] = vec4[](
+			vec4(0.0, 0.0, 0.0, 1.0),
+			vec4(0.0, 0.0, 0.0, 1.0),
+			vec4(0.0, 0.0, 0.0, 1.0),
+			vec4(0.0, 0.0, 0.0, 1.0));
+#endif
+	vec3 light_average = vec3(0.0);
+	for (uint i = params.ray_from; i < params.ray_to; i++) {
+		vec3 ray_dir = normal_mat * vogel_hemisphere(i, params.ray_count, quick_hash(vec2(atlas_pos)));
+
+		uint tidx;
+		vec3 barycentric;
+
+		vec3 light;
+		if (trace_ray(position + ray_dir * params.bias, position + ray_dir * length(params.world_size), tidx, barycentric)) {
+			//hit a triangle
+			vec2 uv0 = vertices.data[triangles.data[tidx].indices.x].uv;
+			vec2 uv1 = vertices.data[triangles.data[tidx].indices.y].uv;
+			vec2 uv2 = vertices.data[triangles.data[tidx].indices.z].uv;
+			vec3 uvw = vec3(barycentric.x * uv0 + barycentric.y * uv1 + barycentric.z * uv2, float(triangles.data[tidx].slice));
+
+			light = textureLod(sampler2DArray(source_light, linear_sampler), uvw, 0.0).rgb;
+		} else {
+			//did not hit a triangle, reach out for the sky
+			vec3 sky_dir = normalize(mat3(params.env_transform) * ray_dir);
+
+			vec2 st = vec2(
+					atan(sky_dir.x, sky_dir.z),
+					acos(sky_dir.y));
+
+			if (st.x < 0.0)
+				st.x += PI * 2.0;
+
+			st /= vec2(PI * 2.0, PI);
+
+			light = textureLod(sampler2D(environment, linear_sampler), st, 0.0).rgb;
+		}
+
+		light_average += light;
+
+#ifdef USE_SH_LIGHTMAPS
+
+		float c[4] = float[](
+				0.282095, //l0
+				0.488603 * ray_dir.y, //l1n1
+				0.488603 * ray_dir.z, //l1n0
+				0.488603 * ray_dir.x //l1p1
+		);
+
+		for (uint j = 0; j < 4; j++) {
+			sh_accum[j].rgb += light * c[j] * (8.0 / float(params.ray_count));
+		}
+#endif
+	}
+
+	vec3 light_total;
+	if (params.ray_from == 0) {
+		light_total = vec3(0.0);
+	} else {
+		light_total = imageLoad(bounce_accum, ivec3(atlas_pos, params.atlas_slice)).rgb;
+	}
+
+	light_total += light_average;
+
+#ifdef USE_SH_LIGHTMAPS
+
+	for (int i = 0; i < 4; i++) {
+		vec4 accum = imageLoad(accum_light, ivec3(atlas_pos, params.atlas_slice * 4 + i));
+		accum.rgb += sh_accum[i].rgb;
+		imageStore(accum_light, ivec3(atlas_pos, params.atlas_slice * 4 + i), accum);
+	}
+
+#endif
+	if (params.ray_to == params.ray_count) {
+		light_total /= float(params.ray_count);
+		imageStore(dest_light, ivec3(atlas_pos, params.atlas_slice), vec4(light_total, 1.0));
+#ifndef USE_SH_LIGHTMAPS
+		vec4 accum = imageLoad(accum_light, ivec3(atlas_pos, params.atlas_slice));
+		accum.rgb += light_total;
+		imageStore(accum_light, ivec3(atlas_pos, params.atlas_slice), accum);
+#endif
+	} else {
+		imageStore(bounce_accum, ivec3(atlas_pos, params.atlas_slice), vec4(light_total, 1.0));
+	}
+
+#endif
+
+#ifdef MODE_UNOCCLUDE
+
+	//texel_size = 0.5;
+	//compute tangents
+
+	vec4 position_alpha = imageLoad(position, ivec3(atlas_pos, params.atlas_slice));
+	if (position_alpha.a < 0.5) {
+		return;
+	}
+
+	vec3 vertex_pos = position_alpha.xyz;
+	vec4 normal_tsize = imageLoad(unocclude, ivec3(atlas_pos, params.atlas_slice));
+
+	vec3 face_normal = normal_tsize.xyz;
+	float texel_size = normal_tsize.w;
+
+	vec3 v0 = abs(face_normal.z) < 0.999 ? vec3(0.0, 0.0, 1.0) : vec3(0.0, 1.0, 0.0);
+	vec3 tangent = normalize(cross(v0, face_normal));
+	vec3 bitangent = normalize(cross(tangent, face_normal));
+	vec3 base_pos = vertex_pos + face_normal * params.bias; //raise a bit
+
+	vec3 rays[4] = vec3[](tangent, bitangent, -tangent, -bitangent);
+	float min_d = 1e20;
+	for (int i = 0; i < 4; i++) {
+		vec3 ray_to = base_pos + rays[i] * texel_size;
+		float d;
+		vec3 norm;
+
+		if (trace_ray(base_pos, ray_to, d, norm)) {
+			if (d < min_d) {
+				vertex_pos = base_pos + rays[i] * d + norm * params.bias * 10.0; //this bias needs to be greater than the regular bias, because otherwise later, rays will go the other side when pointing back.
+				min_d = d;
+			}
+		}
+	}
+
+	position_alpha.xyz = vertex_pos;
+
+	imageStore(position, ivec3(atlas_pos, params.atlas_slice), position_alpha);
+
+#endif
+
+#ifdef MODE_LIGHT_PROBES
+
+	vec3 position = probe_positions.data[probe_index].xyz;
+
+	vec4 probe_sh_accum[9] = vec4[](
+			vec4(0.0),
+			vec4(0.0),
+			vec4(0.0),
+			vec4(0.0),
+			vec4(0.0),
+			vec4(0.0),
+			vec4(0.0),
+			vec4(0.0),
+			vec4(0.0));
+
+	for (uint i = params.ray_from; i < params.ray_to; i++) {
+		vec3 ray_dir = vogel_hemisphere(i, params.ray_count, quick_hash(vec2(float(probe_index), 0.0)));
+		if (bool(i & 1)) {
+			//throw to both sides, so alternate them
+			ray_dir.z *= -1.0;
+		}
+
+		uint tidx;
+		vec3 barycentric;
+		vec3 light;
+
+		if (trace_ray(position + ray_dir * params.bias, position + ray_dir * length(params.world_size), tidx, barycentric)) {
+			vec2 uv0 = vertices.data[triangles.data[tidx].indices.x].uv;
+			vec2 uv1 = vertices.data[triangles.data[tidx].indices.y].uv;
+			vec2 uv2 = vertices.data[triangles.data[tidx].indices.z].uv;
+			vec3 uvw = vec3(barycentric.x * uv0 + barycentric.y * uv1 + barycentric.z * uv2, float(triangles.data[tidx].slice));
+
+			light = textureLod(sampler2DArray(source_light, linear_sampler), uvw, 0.0).rgb;
+			light += textureLod(sampler2DArray(source_direct_light, linear_sampler), uvw, 0.0).rgb;
+		} else {
+			//did not hit a triangle, reach out for the sky
+			vec3 sky_dir = normalize(mat3(params.env_transform) * ray_dir);
+
+			vec2 st = vec2(
+					atan(sky_dir.x, sky_dir.z),
+					acos(sky_dir.y));
+
+			if (st.x < 0.0)
+				st.x += PI * 2.0;
+
+			st /= vec2(PI * 2.0, PI);
+
+			light = textureLod(sampler2D(environment, linear_sampler), st, 0.0).rgb;
+		}
+
+		{
+			float c[9] = float[](
+					0.282095, //l0
+					0.488603 * ray_dir.y, //l1n1
+					0.488603 * ray_dir.z, //l1n0
+					0.488603 * ray_dir.x, //l1p1
+					1.092548 * ray_dir.x * ray_dir.y, //l2n2
+					1.092548 * ray_dir.y * ray_dir.z, //l2n1
+					//0.315392 * (ray_dir.x * ray_dir.x + ray_dir.y * ray_dir.y + 2.0 * ray_dir.z * ray_dir.z), //l20
+					0.315392 * (3.0 * ray_dir.z * ray_dir.z - 1.0), //l20
+					1.092548 * ray_dir.x * ray_dir.z, //l2p1
+					0.546274 * (ray_dir.x * ray_dir.x - ray_dir.y * ray_dir.y) //l2p2
+			);
+
+			for (uint j = 0; j < 9; j++) {
+				probe_sh_accum[j].rgb += light * c[j];
+			}
+		}
+	}
+
+	if (params.ray_from > 0) {
+		for (uint j = 0; j < 9; j++) { //accum from existing
+			probe_sh_accum[j] += light_probes.data[probe_index * 9 + j];
+		}
+	}
+
+	if (params.ray_to == params.ray_count) {
+		for (uint j = 0; j < 9; j++) { //accum from existing
+			probe_sh_accum[j] *= 4.0 / float(params.ray_count);
+		}
+	}
+
+	for (uint j = 0; j < 9; j++) { //accum from existing
+		light_probes.data[probe_index * 9 + j] = probe_sh_accum[j];
+	}
+
+#endif
+
+#ifdef MODE_DILATE
+
+	vec4 c = texelFetch(sampler2DArray(source_light, linear_sampler), ivec3(atlas_pos, params.atlas_slice), 0);
+	//sides first, as they are closer
+	c = c.a > 0.5 ? c : texelFetch(sampler2DArray(source_light, linear_sampler), ivec3(atlas_pos + ivec2(-1, 0), params.atlas_slice), 0);
+	c = c.a > 0.5 ? c : texelFetch(sampler2DArray(source_light, linear_sampler), ivec3(atlas_pos + ivec2(0, 1), params.atlas_slice), 0);
+	c = c.a > 0.5 ? c : texelFetch(sampler2DArray(source_light, linear_sampler), ivec3(atlas_pos + ivec2(1, 0), params.atlas_slice), 0);
+	c = c.a > 0.5 ? c : texelFetch(sampler2DArray(source_light, linear_sampler), ivec3(atlas_pos + ivec2(0, -1), params.atlas_slice), 0);
+	//endpoints second
+	c = c.a > 0.5 ? c : texelFetch(sampler2DArray(source_light, linear_sampler), ivec3(atlas_pos + ivec2(-1, -1), params.atlas_slice), 0);
+	c = c.a > 0.5 ? c : texelFetch(sampler2DArray(source_light, linear_sampler), ivec3(atlas_pos + ivec2(-1, 1), params.atlas_slice), 0);
+	c = c.a > 0.5 ? c : texelFetch(sampler2DArray(source_light, linear_sampler), ivec3(atlas_pos + ivec2(1, -1), params.atlas_slice), 0);
+	c = c.a > 0.5 ? c : texelFetch(sampler2DArray(source_light, linear_sampler), ivec3(atlas_pos + ivec2(1, 1), params.atlas_slice), 0);
+
+	//far sides third
+	c = c.a > 0.5 ? c : texelFetch(sampler2DArray(source_light, linear_sampler), ivec3(atlas_pos + ivec2(-2, 0), params.atlas_slice), 0);
+	c = c.a > 0.5 ? c : texelFetch(sampler2DArray(source_light, linear_sampler), ivec3(atlas_pos + ivec2(0, 2), params.atlas_slice), 0);
+	c = c.a > 0.5 ? c : texelFetch(sampler2DArray(source_light, linear_sampler), ivec3(atlas_pos + ivec2(2, 0), params.atlas_slice), 0);
+	c = c.a > 0.5 ? c : texelFetch(sampler2DArray(source_light, linear_sampler), ivec3(atlas_pos + ivec2(0, -2), params.atlas_slice), 0);
+
+	//far-mid endpoints
+	c = c.a > 0.5 ? c : texelFetch(sampler2DArray(source_light, linear_sampler), ivec3(atlas_pos + ivec2(-2, -1), params.atlas_slice), 0);
+	c = c.a > 0.5 ? c : texelFetch(sampler2DArray(source_light, linear_sampler), ivec3(atlas_pos + ivec2(-2, 1), params.atlas_slice), 0);
+	c = c.a > 0.5 ? c : texelFetch(sampler2DArray(source_light, linear_sampler), ivec3(atlas_pos + ivec2(2, -1), params.atlas_slice), 0);
+	c = c.a > 0.5 ? c : texelFetch(sampler2DArray(source_light, linear_sampler), ivec3(atlas_pos + ivec2(2, 1), params.atlas_slice), 0);
+
+	c = c.a > 0.5 ? c : texelFetch(sampler2DArray(source_light, linear_sampler), ivec3(atlas_pos + ivec2(-1, -2), params.atlas_slice), 0);
+	c = c.a > 0.5 ? c : texelFetch(sampler2DArray(source_light, linear_sampler), ivec3(atlas_pos + ivec2(-1, 2), params.atlas_slice), 0);
+	c = c.a > 0.5 ? c : texelFetch(sampler2DArray(source_light, linear_sampler), ivec3(atlas_pos + ivec2(1, -2), params.atlas_slice), 0);
+	c = c.a > 0.5 ? c : texelFetch(sampler2DArray(source_light, linear_sampler), ivec3(atlas_pos + ivec2(1, 2), params.atlas_slice), 0);
+	//far endpoints
+	c = c.a > 0.5 ? c : texelFetch(sampler2DArray(source_light, linear_sampler), ivec3(atlas_pos + ivec2(-2, -2), params.atlas_slice), 0);
+	c = c.a > 0.5 ? c : texelFetch(sampler2DArray(source_light, linear_sampler), ivec3(atlas_pos + ivec2(-2, 2), params.atlas_slice), 0);
+	c = c.a > 0.5 ? c : texelFetch(sampler2DArray(source_light, linear_sampler), ivec3(atlas_pos + ivec2(2, -2), params.atlas_slice), 0);
+	c = c.a > 0.5 ? c : texelFetch(sampler2DArray(source_light, linear_sampler), ivec3(atlas_pos + ivec2(2, 2), params.atlas_slice), 0);
+
+	imageStore(dest_light, ivec3(atlas_pos, params.atlas_slice), c);
+
+#endif
+}
diff --git a/modules/lightmapper_rd/lm_raster.glsl b/modules/lightmapper_rd/lm_raster.glsl
new file mode 100644
index 0000000000..6c2904192b
--- /dev/null
+++ b/modules/lightmapper_rd/lm_raster.glsl
@@ -0,0 +1,157 @@
+#[vertex]
+
+#version 450
+
+VERSION_DEFINES
+
+#include "lm_common_inc.glsl"
+
+layout(location = 0) out vec3 vertex_interp;
+layout(location = 1) out vec3 normal_interp;
+layout(location = 2) out vec2 uv_interp;
+layout(location = 3) out vec3 barycentric;
+layout(location = 4) flat out uvec3 vertex_indices;
+layout(location = 5) flat out vec3 face_normal;
+
+layout(push_constant, binding = 0, std430) uniform Params {
+	vec2 atlas_size;
+	vec2 uv_offset;
+	vec3 to_cell_size;
+	uint base_triangle;
+	vec3 to_cell_offset;
+	float bias;
+	ivec3 grid_size;
+	uint pad2;
+}
+params;
+
+void main() {
+	uint triangle_idx = params.base_triangle + gl_VertexIndex / 3;
+	uint triangle_subidx = gl_VertexIndex % 3;
+
+	vertex_indices = triangles.data[triangle_idx].indices;
+
+	uint vertex_idx;
+	if (triangle_subidx == 0) {
+		vertex_idx = vertex_indices.x;
+		barycentric = vec3(1, 0, 0);
+	} else if (triangle_subidx == 1) {
+		vertex_idx = vertex_indices.y;
+		barycentric = vec3(0, 1, 0);
+	} else {
+		vertex_idx = vertex_indices.z;
+		barycentric = vec3(0, 0, 1);
+	}
+
+	vertex_interp = vertices.data[vertex_idx].position;
+	uv_interp = vertices.data[vertex_idx].uv;
+	normal_interp = vec3(vertices.data[vertex_idx].normal_xy, vertices.data[vertex_idx].normal_z);
+
+	face_normal = -normalize(cross((vertices.data[vertex_indices.x].position - vertices.data[vertex_indices.y].position), (vertices.data[vertex_indices.x].position - vertices.data[vertex_indices.z].position)));
+
+	gl_Position = vec4((uv_interp + params.uv_offset) * 2.0 - 1.0, 0.0001, 1.0);
+}
+
+#[fragment]
+
+#version 450
+
+VERSION_DEFINES
+
+#include "lm_common_inc.glsl"
+
+layout(push_constant, binding = 0, std430) uniform Params {
+	vec2 atlas_size;
+	vec2 uv_offset;
+	vec3 to_cell_size;
+	uint base_triangle;
+	vec3 to_cell_offset;
+	float bias;
+	ivec3 grid_size;
+	uint pad2;
+}
+params;
+
+layout(location = 0) in vec3 vertex_interp;
+layout(location = 1) in vec3 normal_interp;
+layout(location = 2) in vec2 uv_interp;
+layout(location = 3) in vec3 barycentric;
+layout(location = 4) in flat uvec3 vertex_indices;
+layout(location = 5) in flat vec3 face_normal;
+
+layout(location = 0) out vec4 position;
+layout(location = 1) out vec4 normal;
+layout(location = 2) out vec4 unocclude;
+
+void main() {
+	vec3 vertex_pos = vertex_interp;
+
+	{
+		// smooth out vertex position by interpolating its projection in the 3 normal planes (normal plane is created by vertex pos and normal)
+		// because we don't want to interpolate inwards, normals found pointing inwards are pushed out.
+		vec3 pos_a = vertices.data[vertex_indices.x].position;
+		vec3 pos_b = vertices.data[vertex_indices.y].position;
+		vec3 pos_c = vertices.data[vertex_indices.z].position;
+		vec3 center = (pos_a + pos_b + pos_c) * 0.3333333;
+		vec3 norm_a = vec3(vertices.data[vertex_indices.x].normal_xy, vertices.data[vertex_indices.x].normal_z);
+		vec3 norm_b = vec3(vertices.data[vertex_indices.y].normal_xy, vertices.data[vertex_indices.y].normal_z);
+		vec3 norm_c = vec3(vertices.data[vertex_indices.z].normal_xy, vertices.data[vertex_indices.z].normal_z);
+
+		{
+			vec3 dir_a = normalize(pos_a - center);
+			float d_a = dot(dir_a, norm_a);
+			if (d_a < 0) {
+				//pointing inwards
+				norm_a = normalize(norm_a - dir_a * d_a);
+			}
+		}
+		{
+			vec3 dir_b = normalize(pos_b - center);
+			float d_b = dot(dir_b, norm_b);
+			if (d_b < 0) {
+				//pointing inwards
+				norm_b = normalize(norm_b - dir_b * d_b);
+			}
+		}
+		{
+			vec3 dir_c = normalize(pos_c - center);
+			float d_c = dot(dir_c, norm_c);
+			if (d_c < 0) {
+				//pointing inwards
+				norm_c = normalize(norm_c - dir_c * d_c);
+			}
+		}
+
+		float d_a = dot(norm_a, pos_a);
+		float d_b = dot(norm_b, pos_b);
+		float d_c = dot(norm_c, pos_c);
+
+		vec3 proj_a = vertex_pos - norm_a * (dot(norm_a, vertex_pos) - d_a);
+		vec3 proj_b = vertex_pos - norm_b * (dot(norm_b, vertex_pos) - d_b);
+		vec3 proj_c = vertex_pos - norm_c * (dot(norm_c, vertex_pos) - d_c);
+
+		vec3 smooth_position = proj_a * barycentric.x + proj_b * barycentric.y + proj_c * barycentric.z;
+
+		if (dot(face_normal, smooth_position) > dot(face_normal, vertex_pos)) { //only project outwards
+			vertex_pos = smooth_position;
+		}
+	}
+
+	{
+		// unocclusion technique based on:
+		// https://ndotl.wordpress.com/2018/08/29/baking-artifact-free-lightmaps/
+
+		/* compute texel size */
+		vec3 delta_uv = max(abs(dFdx(vertex_interp)), abs(dFdy(vertex_interp)));
+		float texel_size = max(delta_uv.x, max(delta_uv.y, delta_uv.z));
+		texel_size *= sqrt(2.0); //expand to unit box edge length (again, worst case)
+
+		unocclude.xyz = face_normal;
+		unocclude.w = texel_size;
+
+		//continued on lm_compute.glsl
+	}
+
+	position = vec4(vertex_pos, 1.0);
+	normal = vec4(normalize(normal_interp), 1.0);
+}
diff --git a/modules/lightmapper_rd/register_types.cpp b/modules/lightmapper_rd/register_types.cpp
new file mode 100644
index 0000000000..0e6d7590cc
--- /dev/null
+++ b/modules/lightmapper_rd/register_types.cpp
@@ -0,0 +1,63 @@
+/*************************************************************************/
+/*  register_types.cpp                                                   */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "register_types.h"
+
+#include "core/project_settings.h"
+#include "lightmapper_rd.h"
+#include "scene/3d/lightmapper.h"
+
+#ifndef _3D_DISABLED
+static Lightmapper *create_lightmapper_rd() {
+	return memnew(LightmapperRD);
+}
+#endif
+
+void register_lightmapper_rd_types() {
+	GLOBAL_DEF("rendering/gpu_lightmapper/quality/low_quality_ray_count", 16);
+	GLOBAL_DEF("rendering/gpu_lightmapper/quality/medium_quality_ray_count", 64);
+	GLOBAL_DEF("rendering/gpu_lightmapper/quality/high_quality_ray_count", 256);
+	GLOBAL_DEF("rendering/gpu_lightmapper/quality/ultra_quality_ray_count", 1024);
+	GLOBAL_DEF("rendering/gpu_lightmapper/performance/max_rays_per_pass", 32);
+	GLOBAL_DEF("rendering/gpu_lightmapper/performance/region_size", 512);
+
+	GLOBAL_DEF("rendering/gpu_lightmapper/quality/low_quality_probe_ray_count", 64);
+	GLOBAL_DEF("rendering/gpu_lightmapper/quality/medium_quality_probe_ray_count", 256);
+	GLOBAL_DEF("rendering/gpu_lightmapper/quality/high_quality_probe_ray_count", 512);
+	GLOBAL_DEF("rendering/gpu_lightmapper/quality/ultra_quality_probe_ray_count", 2048);
+	GLOBAL_DEF("rendering/gpu_lightmapper/performance/max_rays_per_probe_pass", 64);
+#ifndef _3D_DISABLED
+	ClassDB::register_class<LightmapperRD>();
+	Lightmapper::create_gpu = create_lightmapper_rd;
+#endif
+}
+
+void unregister_lightmapper_rd_types() {
+}
diff --git a/modules/vorbis/stub/register_types.h b/modules/lightmapper_rd/register_types.h
index 83d4904a87..b0e15a927f 100644
--- a/modules/vorbis/stub/register_types.h
+++ b/modules/lightmapper_rd/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-void register_vorbis_types();
-void unregister_vorbis_types();
+#ifndef LIGHTMAPPER_RD_REGISTER_TYPES_H
+#define LIGHTMAPPER_RD_REGISTER_TYPES_H
+
+void register_lightmapper_rd_types();
+void unregister_lightmapper_rd_types();
+
+#endif // XATLAS_UNWRAP_REGISTER_TYPES_H
diff --git a/modules/mbedtls/SCsub b/modules/mbedtls/SCsub
index 0c6c703e16..5f5d25a3ee 100755
--- a/modules/mbedtls/SCsub
+++ b/modules/mbedtls/SCsub
@@ -1,11 +1,11 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_mbed_tls = env_modules.Clone()
 
-if env['builtin_mbedtls']:
+if env["builtin_mbedtls"]:
     # Thirdparty source files
     thirdparty_sources = [
         "aes.c",
@@ -86,7 +86,7 @@ if env['builtin_mbedtls']:
         "x509_csr.c",
         "x509write_crt.c",
         "x509write_csr.c",
-        "xtea.c"
+        "xtea.c",
     ]
 
     thirdparty_dir = "#thirdparty/mbedtls/library/"
diff --git a/modules/mbedtls/config.py b/modules/mbedtls/config.py
index 1c8cd12a2d..d22f9454ed 100755
--- a/modules/mbedtls/config.py
+++ b/modules/mbedtls/config.py
@@ -1,5 +1,6 @@
 def can_build(env, platform):
     return True
 
+
 def configure(env):
     pass
diff --git a/modules/mbedtls/crypto_mbedtls.cpp b/modules/mbedtls/crypto_mbedtls.cpp
index 9b072785af..12a982df6e 100644
--- a/modules/mbedtls/crypto_mbedtls.cpp
+++ b/modules/mbedtls/crypto_mbedtls.cpp
@@ -43,58 +43,97 @@
 #define PEM_BEGIN_CRT "-----BEGIN CERTIFICATE-----\n"
 #define PEM_END_CRT "-----END CERTIFICATE-----\n"
 
-#include "mbedtls/pem.h"
 #include <mbedtls/debug.h>
+#include <mbedtls/pem.h>
 
 CryptoKey *CryptoKeyMbedTLS::create() {
 	return memnew(CryptoKeyMbedTLS);
 }
 
-Error CryptoKeyMbedTLS::load(String p_path) {
+Error CryptoKeyMbedTLS::load(String p_path, bool p_public_only) {
 	ERR_FAIL_COND_V_MSG(locks, ERR_ALREADY_IN_USE, "Key is in use");
 
-	PoolByteArray out;
+	PackedByteArray out;
 	FileAccess *f = FileAccess::open(p_path, FileAccess::READ);
 	ERR_FAIL_COND_V_MSG(!f, ERR_INVALID_PARAMETER, "Cannot open CryptoKeyMbedTLS file '" + p_path + "'.");
 
 	int flen = f->get_len();
 	out.resize(flen + 1);
-	{
-		PoolByteArray::Write w = out.write();
-		f->get_buffer(w.ptr(), flen);
-		w[flen] = 0; //end f string
-	}
+	f->get_buffer(out.ptrw(), flen);
+	out.write[flen] = 0; // string terminator
 	memdelete(f);
 
-	int ret = mbedtls_pk_parse_key(&pkey, out.read().ptr(), out.size(), NULL, 0);
+	int ret = 0;
+	if (p_public_only) {
+		ret = mbedtls_pk_parse_public_key(&pkey, out.ptr(), out.size());
+	} else {
+		ret = mbedtls_pk_parse_key(&pkey, out.ptr(), out.size(), nullptr, 0);
+	}
 	// We MUST zeroize the memory for safety!
-	mbedtls_platform_zeroize(out.write().ptr(), out.size());
-	ERR_FAIL_COND_V_MSG(ret, FAILED, "Error parsing private key '" + itos(ret) + "'.");
+	mbedtls_platform_zeroize(out.ptrw(), out.size());
+	ERR_FAIL_COND_V_MSG(ret, FAILED, "Error parsing key '" + itos(ret) + "'.");
 
+	public_only = p_public_only;
 	return OK;
 }
 
-Error CryptoKeyMbedTLS::save(String p_path) {
+Error CryptoKeyMbedTLS::save(String p_path, bool p_public_only) {
 	FileAccess *f = FileAccess::open(p_path, FileAccess::WRITE);
 	ERR_FAIL_COND_V_MSG(!f, ERR_INVALID_PARAMETER, "Cannot save CryptoKeyMbedTLS file '" + p_path + "'.");
 
 	unsigned char w[16000];
 	memset(w, 0, sizeof(w));
 
-	int ret = mbedtls_pk_write_key_pem(&pkey, w, sizeof(w));
+	int ret = 0;
+	if (p_public_only) {
+		ret = mbedtls_pk_write_pubkey_pem(&pkey, w, sizeof(w));
+	} else {
+		ret = mbedtls_pk_write_key_pem(&pkey, w, sizeof(w));
+	}
 	if (ret != 0) {
 		memdelete(f);
-		memset(w, 0, sizeof(w)); // Zeroize anything we might have written.
+		mbedtls_platform_zeroize(w, sizeof(w)); // Zeroize anything we might have written.
 		ERR_FAIL_V_MSG(FAILED, "Error writing key '" + itos(ret) + "'.");
 	}
 
 	size_t len = strlen((char *)w);
 	f->store_buffer(w, len);
 	memdelete(f);
-	memset(w, 0, sizeof(w)); // Zeroize temporary buffer.
+	mbedtls_platform_zeroize(w, sizeof(w)); // Zeroize temporary buffer.
+	return OK;
+}
+
+Error CryptoKeyMbedTLS::load_from_string(String p_string_key, bool p_public_only) {
+	int ret = 0;
+	if (p_public_only) {
+		ret = mbedtls_pk_parse_public_key(&pkey, (unsigned char *)p_string_key.utf8().get_data(), p_string_key.utf8().size());
+	} else {
+		ret = mbedtls_pk_parse_key(&pkey, (unsigned char *)p_string_key.utf8().get_data(), p_string_key.utf8().size(), nullptr, 0);
+	}
+	ERR_FAIL_COND_V_MSG(ret, FAILED, "Error parsing key '" + itos(ret) + "'.");
+
+	public_only = p_public_only;
 	return OK;
 }
 
+String CryptoKeyMbedTLS::save_to_string(bool p_public_only) {
+	unsigned char w[16000];
+	memset(w, 0, sizeof(w));
+
+	int ret = 0;
+	if (p_public_only) {
+		ret = mbedtls_pk_write_pubkey_pem(&pkey, w, sizeof(w));
+	} else {
+		ret = mbedtls_pk_write_key_pem(&pkey, w, sizeof(w));
+	}
+	if (ret != 0) {
+		mbedtls_platform_zeroize(w, sizeof(w));
+		ERR_FAIL_V_MSG("", "Error saving key '" + itos(ret) + "'.");
+	}
+	String s = String::utf8((char *)w);
+	return s;
+}
+
 X509Certificate *X509CertificateMbedTLS::create() {
 	return memnew(X509CertificateMbedTLS);
 }
@@ -102,20 +141,17 @@ X509Certificate *X509CertificateMbedTLS::create() {
 Error X509CertificateMbedTLS::load(String p_path) {
 	ERR_FAIL_COND_V_MSG(locks, ERR_ALREADY_IN_USE, "Certificate is in use");
 
-	PoolByteArray out;
+	PackedByteArray out;
 	FileAccess *f = FileAccess::open(p_path, FileAccess::READ);
 	ERR_FAIL_COND_V_MSG(!f, ERR_INVALID_PARAMETER, "Cannot open X509CertificateMbedTLS file '" + p_path + "'.");
 
 	int flen = f->get_len();
 	out.resize(flen + 1);
-	{
-		PoolByteArray::Write w = out.write();
-		f->get_buffer(w.ptr(), flen);
-		w[flen] = 0; //end f string
-	}
+	f->get_buffer(out.ptrw(), flen);
+	out.write[flen] = 0; // string terminator
 	memdelete(f);
 
-	int ret = mbedtls_x509_crt_parse(&cert, out.read().ptr(), out.size());
+	int ret = mbedtls_x509_crt_parse(&cert, out.ptr(), out.size());
 	ERR_FAIL_COND_V_MSG(ret, FAILED, "Error parsing some certificates: " + itos(ret));
 
 	return OK;
@@ -155,7 +191,6 @@ Crypto *CryptoMbedTLS::create() {
 }
 
 void CryptoMbedTLS::initialize_crypto() {
-
 #ifdef DEBUG_ENABLED
 	mbedtls_debug_set_threshold(1);
 #endif
@@ -167,11 +202,11 @@ void CryptoMbedTLS::initialize_crypto() {
 }
 
 void CryptoMbedTLS::finalize_crypto() {
-	Crypto::_create = NULL;
-	Crypto::_load_default_certificates = NULL;
+	Crypto::_create = nullptr;
+	Crypto::_load_default_certificates = nullptr;
 	if (default_certs) {
 		memdelete(default_certs);
-		default_certs = NULL;
+		default_certs = nullptr;
 	}
 	X509CertificateMbedTLS::finalize();
 	CryptoKeyMbedTLS::finalize();
@@ -180,9 +215,9 @@ void CryptoMbedTLS::finalize_crypto() {
 CryptoMbedTLS::CryptoMbedTLS() {
 	mbedtls_ctr_drbg_init(&ctr_drbg);
 	mbedtls_entropy_init(&entropy);
-	int ret = mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy, NULL, 0);
+	int ret = mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy, nullptr, 0);
 	if (ret != 0) {
-		ERR_PRINTS(" failed\n  ! mbedtls_ctr_drbg_seed returned an error" + itos(ret));
+		ERR_PRINT(" failed\n  ! mbedtls_ctr_drbg_seed returned an error" + itos(ret));
 	}
 }
 
@@ -191,17 +226,17 @@ CryptoMbedTLS::~CryptoMbedTLS() {
 	mbedtls_entropy_free(&entropy);
 }
 
-X509CertificateMbedTLS *CryptoMbedTLS::default_certs = NULL;
+X509CertificateMbedTLS *CryptoMbedTLS::default_certs = nullptr;
 
 X509CertificateMbedTLS *CryptoMbedTLS::get_default_certificates() {
 	return default_certs;
 }
 
 void CryptoMbedTLS::load_default_certificates(String p_path) {
-	ERR_FAIL_COND(default_certs != NULL);
+	ERR_FAIL_COND(default_certs != nullptr);
 
 	default_certs = memnew(X509CertificateMbedTLS);
-	ERR_FAIL_COND(default_certs == NULL);
+	ERR_FAIL_COND(default_certs == nullptr);
 
 	if (p_path != "") {
 		// Use certs defined in project settings.
@@ -210,15 +245,14 @@ void CryptoMbedTLS::load_default_certificates(String p_path) {
 #ifdef BUILTIN_CERTS_ENABLED
 	else {
 		// Use builtin certs only if user did not override it in project settings.
-		PoolByteArray out;
+		PackedByteArray out;
 		out.resize(_certs_uncompressed_size + 1);
-		PoolByteArray::Write w = out.write();
-		Compression::decompress(w.ptr(), _certs_uncompressed_size, _certs_compressed, _certs_compressed_size, Compression::MODE_DEFLATE);
-		w[_certs_uncompressed_size] = 0; // Make sure it ends with string terminator
+		Compression::decompress(out.ptrw(), _certs_uncompressed_size, _certs_compressed, _certs_compressed_size, Compression::MODE_DEFLATE);
+		out.write[_certs_uncompressed_size] = 0; // Make sure it ends with string terminator
 #ifdef DEBUG_ENABLED
 		print_verbose("Loaded builtin certs");
 #endif
-		default_certs->load_from_memory(out.read().ptr(), out.size());
+		default_certs->load_from_memory(out.ptr(), out.size());
 	}
 #endif
 }
@@ -227,15 +261,16 @@ Ref<CryptoKey> CryptoMbedTLS::generate_rsa(int p_bytes) {
 	Ref<CryptoKeyMbedTLS> out;
 	out.instance();
 	int ret = mbedtls_pk_setup(&(out->pkey), mbedtls_pk_info_from_type(MBEDTLS_PK_RSA));
-	ERR_FAIL_COND_V(ret != 0, NULL);
+	ERR_FAIL_COND_V(ret != 0, nullptr);
 	ret = mbedtls_rsa_gen_key(mbedtls_pk_rsa(out->pkey), mbedtls_ctr_drbg_random, &ctr_drbg, p_bytes, 65537);
-	ERR_FAIL_COND_V(ret != 0, NULL);
+	out->public_only = false;
+	ERR_FAIL_COND_V(ret != 0, nullptr);
 	return out;
 }
 
 Ref<X509Certificate> CryptoMbedTLS::generate_self_signed_certificate(Ref<CryptoKey> p_key, String p_issuer_name, String p_not_before, String p_not_after) {
-	Ref<CryptoKeyMbedTLS> key = static_cast<Ref<CryptoKeyMbedTLS> >(p_key);
-	ERR_FAIL_COND_V_MSG(key.is_null(), NULL, "Invalid private key argument.");
+	Ref<CryptoKeyMbedTLS> key = static_cast<Ref<CryptoKeyMbedTLS>>(p_key);
+	ERR_FAIL_COND_V_MSG(key.is_null(), nullptr, "Invalid private key argument.");
 	mbedtls_x509write_cert crt;
 	mbedtls_x509write_crt_init(&crt);
 
@@ -250,7 +285,7 @@ Ref<X509Certificate> CryptoMbedTLS::generate_self_signed_certificate(Ref<CryptoK
 	mbedtls_mpi_init(&serial);
 	uint8_t rand_serial[20];
 	mbedtls_ctr_drbg_random(&ctr_drbg, rand_serial, 20);
-	ERR_FAIL_COND_V(mbedtls_mpi_read_binary(&serial, rand_serial, 20), NULL);
+	ERR_FAIL_COND_V(mbedtls_mpi_read_binary(&serial, rand_serial, 20), nullptr);
 	mbedtls_x509write_crt_set_serial(&crt, &serial);
 
 	mbedtls_x509write_crt_set_validity(&crt, p_not_before.utf8().get_data(), p_not_after.utf8().get_data());
@@ -259,26 +294,93 @@ Ref<X509Certificate> CryptoMbedTLS::generate_self_signed_certificate(Ref<CryptoK
 
 	unsigned char buf[4096];
 	memset(buf, 0, 4096);
+	int ret = mbedtls_x509write_crt_pem(&crt, buf, 4096, mbedtls_ctr_drbg_random, &ctr_drbg);
+	mbedtls_mpi_free(&serial);
+	mbedtls_x509write_crt_free(&crt);
+	ERR_FAIL_COND_V_MSG(ret != 0, nullptr, "Failed to generate certificate: " + itos(ret));
+	buf[4095] = '\0'; // Make sure strlen can't fail.
+
 	Ref<X509CertificateMbedTLS> out;
 	out.instance();
-	mbedtls_x509write_crt_pem(&crt, buf, 4096, mbedtls_ctr_drbg_random, &ctr_drbg);
-
-	int err = mbedtls_x509_crt_parse(&(out->cert), buf, 4096);
-	if (err != 0) {
-		mbedtls_mpi_free(&serial);
-		mbedtls_x509write_crt_free(&crt);
-		ERR_PRINTS("Generated invalid certificate: " + itos(err));
-		return NULL;
+	out->load_from_memory(buf, strlen((char *)buf) + 1); // Use strlen to find correct output size.
+	return out;
+}
+
+PackedByteArray CryptoMbedTLS::generate_random_bytes(int p_bytes) {
+	PackedByteArray out;
+	out.resize(p_bytes);
+	mbedtls_ctr_drbg_random(&ctr_drbg, out.ptrw(), p_bytes);
+	return out;
+}
+
+mbedtls_md_type_t CryptoMbedTLS::_md_type_from_hashtype(HashingContext::HashType p_hash_type, int &r_size) {
+	switch (p_hash_type) {
+		case HashingContext::HASH_MD5:
+			r_size = 16;
+			return MBEDTLS_MD_MD5;
+		case HashingContext::HASH_SHA1:
+			r_size = 20;
+			return MBEDTLS_MD_SHA1;
+		case HashingContext::HASH_SHA256:
+			r_size = 32;
+			return MBEDTLS_MD_SHA256;
+		default:
+			r_size = 0;
+			ERR_FAIL_V_MSG(MBEDTLS_MD_NONE, "Invalid hash type.");
 	}
+}
 
-	mbedtls_mpi_free(&serial);
-	mbedtls_x509write_crt_free(&crt);
+Vector<uint8_t> CryptoMbedTLS::sign(HashingContext::HashType p_hash_type, Vector<uint8_t> p_hash, Ref<CryptoKey> p_key) {
+	int size;
+	mbedtls_md_type_t type = _md_type_from_hashtype(p_hash_type, size);
+	ERR_FAIL_COND_V_MSG(type == MBEDTLS_MD_NONE, Vector<uint8_t>(), "Invalid hash type.");
+	ERR_FAIL_COND_V_MSG(p_hash.size() != size, Vector<uint8_t>(), "Invalid hash provided. Size must be " + itos(size));
+	Ref<CryptoKeyMbedTLS> key = static_cast<Ref<CryptoKeyMbedTLS>>(p_key);
+	ERR_FAIL_COND_V_MSG(!key.is_valid(), Vector<uint8_t>(), "Invalid key provided.");
+	ERR_FAIL_COND_V_MSG(key->is_public_only(), Vector<uint8_t>(), "Invalid key provided. Cannot sign with public_only keys.");
+	size_t sig_size = 0;
+	unsigned char buf[MBEDTLS_MPI_MAX_SIZE];
+	Vector<uint8_t> out;
+	int ret = mbedtls_pk_sign(&(key->pkey), type, p_hash.ptr(), size, buf, &sig_size, mbedtls_ctr_drbg_random, &ctr_drbg);
+	ERR_FAIL_COND_V_MSG(ret, out, "Error while signing: " + itos(ret));
+	out.resize(sig_size);
+	copymem(out.ptrw(), buf, sig_size);
 	return out;
 }
 
-PoolByteArray CryptoMbedTLS::generate_random_bytes(int p_bytes) {
-	PoolByteArray out;
-	out.resize(p_bytes);
-	mbedtls_ctr_drbg_random(&ctr_drbg, out.write().ptr(), p_bytes);
+bool CryptoMbedTLS::verify(HashingContext::HashType p_hash_type, Vector<uint8_t> p_hash, Vector<uint8_t> p_signature, Ref<CryptoKey> p_key) {
+	int size;
+	mbedtls_md_type_t type = _md_type_from_hashtype(p_hash_type, size);
+	ERR_FAIL_COND_V_MSG(type == MBEDTLS_MD_NONE, false, "Invalid hash type.");
+	ERR_FAIL_COND_V_MSG(p_hash.size() != size, false, "Invalid hash provided. Size must be " + itos(size));
+	Ref<CryptoKeyMbedTLS> key = static_cast<Ref<CryptoKeyMbedTLS>>(p_key);
+	ERR_FAIL_COND_V_MSG(!key.is_valid(), false, "Invalid key provided.");
+	return mbedtls_pk_verify(&(key->pkey), type, p_hash.ptr(), size, p_signature.ptr(), p_signature.size()) == 0;
+}
+
+Vector<uint8_t> CryptoMbedTLS::encrypt(Ref<CryptoKey> p_key, Vector<uint8_t> p_plaintext) {
+	Ref<CryptoKeyMbedTLS> key = static_cast<Ref<CryptoKeyMbedTLS>>(p_key);
+	ERR_FAIL_COND_V_MSG(!key.is_valid(), Vector<uint8_t>(), "Invalid key provided.");
+	uint8_t buf[1024];
+	size_t size;
+	Vector<uint8_t> out;
+	int ret = mbedtls_pk_encrypt(&(key->pkey), p_plaintext.ptr(), p_plaintext.size(), buf, &size, sizeof(buf), mbedtls_ctr_drbg_random, &ctr_drbg);
+	ERR_FAIL_COND_V_MSG(ret, out, "Error while encrypting: " + itos(ret));
+	out.resize(size);
+	copymem(out.ptrw(), buf, size);
+	return out;
+}
+
+Vector<uint8_t> CryptoMbedTLS::decrypt(Ref<CryptoKey> p_key, Vector<uint8_t> p_ciphertext) {
+	Ref<CryptoKeyMbedTLS> key = static_cast<Ref<CryptoKeyMbedTLS>>(p_key);
+	ERR_FAIL_COND_V_MSG(!key.is_valid(), Vector<uint8_t>(), "Invalid key provided.");
+	ERR_FAIL_COND_V_MSG(key->is_public_only(), Vector<uint8_t>(), "Invalid key provided. Cannot decrypt using a public_only key.");
+	uint8_t buf[2048];
+	size_t size;
+	Vector<uint8_t> out;
+	int ret = mbedtls_pk_decrypt(&(key->pkey), p_ciphertext.ptr(), p_ciphertext.size(), buf, &size, sizeof(buf), mbedtls_ctr_drbg_random, &ctr_drbg);
+	ERR_FAIL_COND_V_MSG(ret, out, "Error while decrypting: " + itos(ret));
+	out.resize(size);
+	copymem(out.ptrw(), buf, size);
 	return out;
 }
diff --git a/modules/mbedtls/crypto_mbedtls.h b/modules/mbedtls/crypto_mbedtls.h
index edb5841761..2a446f9d48 100644
--- a/modules/mbedtls/crypto_mbedtls.h
+++ b/modules/mbedtls/crypto_mbedtls.h
@@ -41,18 +41,21 @@
 class CryptoMbedTLS;
 class SSLContextMbedTLS;
 class CryptoKeyMbedTLS : public CryptoKey {
-
 private:
 	mbedtls_pk_context pkey;
-	int locks;
+	int locks = 0;
+	bool public_only = true;
 
 public:
 	static CryptoKey *create();
 	static void make_default() { CryptoKey::_create = create; }
-	static void finalize() { CryptoKey::_create = NULL; }
+	static void finalize() { CryptoKey::_create = nullptr; }
 
-	virtual Error load(String p_path);
-	virtual Error save(String p_path);
+	virtual Error load(String p_path, bool p_public_only);
+	virtual Error save(String p_path, bool p_public_only);
+	virtual String save_to_string(bool p_public_only);
+	virtual Error load_from_string(String p_string_key, bool p_public_only);
+	virtual bool is_public_only() const { return public_only; };
 
 	CryptoKeyMbedTLS() {
 		mbedtls_pk_init(&pkey);
@@ -70,7 +73,6 @@ public:
 };
 
 class X509CertificateMbedTLS : public X509Certificate {
-
 private:
 	mbedtls_x509_crt cert;
 	int locks;
@@ -78,7 +80,7 @@ private:
 public:
 	static X509Certificate *create();
 	static void make_default() { X509Certificate::_create = create; }
-	static void finalize() { X509Certificate::_create = NULL; }
+	static void finalize() { X509Certificate::_create = nullptr; }
 
 	virtual Error load(String p_path);
 	virtual Error load_from_memory(const uint8_t *p_buffer, int p_len);
@@ -100,11 +102,11 @@ public:
 };
 
 class CryptoMbedTLS : public Crypto {
-
 private:
 	mbedtls_entropy_context entropy;
 	mbedtls_ctr_drbg_context ctr_drbg;
 	static X509CertificateMbedTLS *default_certs;
+	mbedtls_md_type_t _md_type_from_hashtype(HashingContext::HashType p_hash_type, int &r_size);
 
 public:
 	static Crypto *create();
@@ -113,9 +115,13 @@ public:
 	static X509CertificateMbedTLS *get_default_certificates();
 	static void load_default_certificates(String p_path);
 
-	virtual PoolByteArray generate_random_bytes(int p_bytes);
+	virtual PackedByteArray generate_random_bytes(int p_bytes);
 	virtual Ref<CryptoKey> generate_rsa(int p_bytes);
 	virtual Ref<X509Certificate> generate_self_signed_certificate(Ref<CryptoKey> p_key, String p_issuer_name, String p_not_before, String p_not_after);
+	virtual Vector<uint8_t> sign(HashingContext::HashType p_hash_type, Vector<uint8_t> p_hash, Ref<CryptoKey> p_key);
+	virtual bool verify(HashingContext::HashType p_hash_type, Vector<uint8_t> p_hash, Vector<uint8_t> p_signature, Ref<CryptoKey> p_key);
+	virtual Vector<uint8_t> encrypt(Ref<CryptoKey> p_key, Vector<uint8_t> p_plaintext);
+	virtual Vector<uint8_t> decrypt(Ref<CryptoKey> p_key, Vector<uint8_t> p_ciphertext);
 
 	CryptoMbedTLS();
 	~CryptoMbedTLS();
diff --git a/modules/mbedtls/dtls_server_mbedtls.cpp b/modules/mbedtls/dtls_server_mbedtls.cpp
new file mode 100644
index 0000000000..d9961b026f
--- /dev/null
+++ b/modules/mbedtls/dtls_server_mbedtls.cpp
@@ -0,0 +1,76 @@
+/*************************************************************************/
+/*  dtls_server_mbedtls.cpp                                              */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "dtls_server_mbedtls.h"
+#include "packet_peer_mbed_dtls.h"
+
+Error DTLSServerMbedTLS::setup(Ref<CryptoKey> p_key, Ref<X509Certificate> p_cert, Ref<X509Certificate> p_ca_chain) {
+	ERR_FAIL_COND_V(_cookies->setup() != OK, ERR_ALREADY_IN_USE);
+	_key = p_key;
+	_cert = p_cert;
+	_ca_chain = p_ca_chain;
+	return OK;
+}
+
+void DTLSServerMbedTLS::stop() {
+	_cookies->clear();
+}
+
+Ref<PacketPeerDTLS> DTLSServerMbedTLS::take_connection(Ref<PacketPeerUDP> p_udp_peer) {
+	Ref<PacketPeerMbedDTLS> out;
+	out.instance();
+
+	ERR_FAIL_COND_V(!out.is_valid(), out);
+	ERR_FAIL_COND_V(!p_udp_peer.is_valid(), out);
+	out->accept_peer(p_udp_peer, _key, _cert, _ca_chain, _cookies);
+	return out;
+}
+
+DTLSServer *DTLSServerMbedTLS::_create_func() {
+	return memnew(DTLSServerMbedTLS);
+}
+
+void DTLSServerMbedTLS::initialize() {
+	_create = _create_func;
+	available = true;
+}
+
+void DTLSServerMbedTLS::finalize() {
+	_create = nullptr;
+	available = false;
+}
+
+DTLSServerMbedTLS::DTLSServerMbedTLS() {
+	_cookies.instance();
+}
+
+DTLSServerMbedTLS::~DTLSServerMbedTLS() {
+	stop();
+}
diff --git a/modules/mono/utils/mutex_utils.h b/modules/mbedtls/dtls_server_mbedtls.h
index bafd875395..d93553bf7f 100644
--- a/modules/mono/utils/mutex_utils.h
+++ b/modules/mbedtls/dtls_server_mbedtls.h
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  mutex_utils.h                                                        */
+/*  dtls_server_mbedtls.h                                                */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,40 +28,30 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef MUTEX_UTILS_H
-#define MUTEX_UTILS_H
+#ifndef MBED_DTLS_SERVER_H
+#define MBED_DTLS_SERVER_H
 
-#include "core/error_macros.h"
-#include "core/os/mutex.h"
+#include "core/io/dtls_server.h"
+#include "ssl_context_mbedtls.h"
 
-#include "macros.h"
-
-class ScopedMutexLock {
-	Mutex *mutex;
+class DTLSServerMbedTLS : public DTLSServer {
+private:
+	static DTLSServer *_create_func();
+	Ref<CryptoKey> _key;
+	Ref<X509Certificate> _cert;
+	Ref<X509Certificate> _ca_chain;
+	Ref<CookieContextMbedTLS> _cookies;
 
 public:
-	ScopedMutexLock(Mutex *mutex) {
-		this->mutex = mutex;
-#ifndef NO_THREADS
-#ifdef DEBUG_ENABLED
-		CRASH_COND(!mutex);
-#endif
-		this->mutex->lock();
-#endif
-	}
-
-	~ScopedMutexLock() {
-#ifndef NO_THREADS
-#ifdef DEBUG_ENABLED
-		CRASH_COND(!mutex);
-#endif
-		mutex->unlock();
-#endif
-	}
-};
+	static void initialize();
+	static void finalize();
 
-#define SCOPED_MUTEX_LOCK(m_mutex) ScopedMutexLock GD_UNIQUE_NAME(__scoped_mutex_lock__)(m_mutex);
+	virtual Error setup(Ref<CryptoKey> p_key, Ref<X509Certificate> p_cert, Ref<X509Certificate> p_ca_chain = Ref<X509Certificate>());
+	virtual void stop();
+	virtual Ref<PacketPeerDTLS> take_connection(Ref<PacketPeerUDP> p_peer);
 
-// TODO: Add version that receives a lambda instead, once C++11 is allowed
+	DTLSServerMbedTLS();
+	~DTLSServerMbedTLS();
+};
 
-#endif // MUTEX_UTILS_H
+#endif // MBED_DTLS_SERVER_H
diff --git a/modules/mbedtls/packet_peer_mbed_dtls.cpp b/modules/mbedtls/packet_peer_mbed_dtls.cpp
new file mode 100644
index 0000000000..8206d739ae
--- /dev/null
+++ b/modules/mbedtls/packet_peer_mbed_dtls.cpp
@@ -0,0 +1,288 @@
+/*************************************************************************/
+/*  packet_peer_mbed_dtls.cpp                                            */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "packet_peer_mbed_dtls.h"
+#include "mbedtls/platform_util.h"
+
+#include "core/io/stream_peer_ssl.h"
+#include "core/os/file_access.h"
+
+int PacketPeerMbedDTLS::bio_send(void *ctx, const unsigned char *buf, size_t len) {
+	if (buf == nullptr || len <= 0) {
+		return 0;
+	}
+
+	PacketPeerMbedDTLS *sp = (PacketPeerMbedDTLS *)ctx;
+
+	ERR_FAIL_COND_V(sp == nullptr, 0);
+
+	Error err = sp->base->put_packet((const uint8_t *)buf, len);
+	if (err == ERR_BUSY) {
+		return MBEDTLS_ERR_SSL_WANT_WRITE;
+	} else if (err != OK) {
+		ERR_FAIL_V(MBEDTLS_ERR_SSL_INTERNAL_ERROR);
+	}
+	return len;
+}
+
+int PacketPeerMbedDTLS::bio_recv(void *ctx, unsigned char *buf, size_t len) {
+	if (buf == nullptr || len <= 0) {
+		return 0;
+	}
+
+	PacketPeerMbedDTLS *sp = (PacketPeerMbedDTLS *)ctx;
+
+	ERR_FAIL_COND_V(sp == nullptr, 0);
+
+	int pc = sp->base->get_available_packet_count();
+	if (pc == 0) {
+		return MBEDTLS_ERR_SSL_WANT_READ;
+	} else if (pc < 0) {
+		ERR_FAIL_V(MBEDTLS_ERR_SSL_INTERNAL_ERROR);
+	}
+
+	const uint8_t *buffer;
+	int buffer_size = 0;
+	Error err = sp->base->get_packet(&buffer, buffer_size);
+	if (err != OK) {
+		return MBEDTLS_ERR_SSL_INTERNAL_ERROR;
+	}
+	copymem(buf, buffer, buffer_size);
+	return buffer_size;
+}
+
+void PacketPeerMbedDTLS::_cleanup() {
+	ssl_ctx->clear();
+	base = Ref<PacketPeer>();
+	status = STATUS_DISCONNECTED;
+}
+
+int PacketPeerMbedDTLS::_set_cookie() {
+	// Setup DTLS session cookie for this client
+	uint8_t client_id[18];
+	IP_Address addr = base->get_packet_address();
+	uint16_t port = base->get_packet_port();
+	copymem(client_id, addr.get_ipv6(), 16);
+	copymem(&client_id[16], (uint8_t *)&port, 2);
+	return mbedtls_ssl_set_client_transport_id(ssl_ctx->get_context(), client_id, 18);
+}
+
+Error PacketPeerMbedDTLS::_do_handshake() {
+	int ret = 0;
+	while ((ret = mbedtls_ssl_handshake(ssl_ctx->get_context())) != 0) {
+		if (ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE) {
+			if (ret != MBEDTLS_ERR_SSL_HELLO_VERIFY_REQUIRED) {
+				ERR_PRINT("TLS handshake error: " + itos(ret));
+				SSLContextMbedTLS::print_mbedtls_error(ret);
+			}
+			_cleanup();
+			status = STATUS_ERROR;
+			return FAILED;
+		}
+		// Will retry via poll later
+		return OK;
+	}
+
+	status = STATUS_CONNECTED;
+	return OK;
+}
+
+Error PacketPeerMbedDTLS::connect_to_peer(Ref<PacketPeerUDP> p_base, bool p_validate_certs, const String &p_for_hostname, Ref<X509Certificate> p_ca_certs) {
+	ERR_FAIL_COND_V(!p_base.is_valid() || !p_base->is_connected_to_host(), ERR_INVALID_PARAMETER);
+
+	base = p_base;
+	int ret = 0;
+	int authmode = p_validate_certs ? MBEDTLS_SSL_VERIFY_REQUIRED : MBEDTLS_SSL_VERIFY_NONE;
+
+	Error err = ssl_ctx->init_client(MBEDTLS_SSL_TRANSPORT_DATAGRAM, authmode, p_ca_certs);
+	ERR_FAIL_COND_V(err != OK, err);
+
+	mbedtls_ssl_set_hostname(ssl_ctx->get_context(), p_for_hostname.utf8().get_data());
+	mbedtls_ssl_set_bio(ssl_ctx->get_context(), this, bio_send, bio_recv, nullptr);
+	mbedtls_ssl_set_timer_cb(ssl_ctx->get_context(), &timer, mbedtls_timing_set_delay, mbedtls_timing_get_delay);
+
+	status = STATUS_HANDSHAKING;
+
+	if ((ret = _do_handshake()) != OK) {
+		status = STATUS_ERROR_HOSTNAME_MISMATCH;
+		return FAILED;
+	}
+
+	return OK;
+}
+
+Error PacketPeerMbedDTLS::accept_peer(Ref<PacketPeerUDP> p_base, Ref<CryptoKey> p_key, Ref<X509Certificate> p_cert, Ref<X509Certificate> p_ca_chain, Ref<CookieContextMbedTLS> p_cookies) {
+	Error err = ssl_ctx->init_server(MBEDTLS_SSL_TRANSPORT_DATAGRAM, MBEDTLS_SSL_VERIFY_NONE, p_key, p_cert, p_cookies);
+	ERR_FAIL_COND_V(err != OK, err);
+
+	base = p_base;
+	base->set_blocking_mode(false);
+
+	mbedtls_ssl_session_reset(ssl_ctx->get_context());
+
+	int ret = _set_cookie();
+	if (ret != 0) {
+		_cleanup();
+		ERR_FAIL_V_MSG(FAILED, "Error setting DTLS client cookie");
+	}
+
+	mbedtls_ssl_set_bio(ssl_ctx->get_context(), this, bio_send, bio_recv, nullptr);
+	mbedtls_ssl_set_timer_cb(ssl_ctx->get_context(), &timer, mbedtls_timing_set_delay, mbedtls_timing_get_delay);
+
+	status = STATUS_HANDSHAKING;
+
+	if ((ret = _do_handshake()) != OK) {
+		status = STATUS_ERROR;
+		return FAILED;
+	}
+
+	return OK;
+}
+
+Error PacketPeerMbedDTLS::put_packet(const uint8_t *p_buffer, int p_bytes) {
+	ERR_FAIL_COND_V(status != STATUS_CONNECTED, ERR_UNCONFIGURED);
+
+	if (p_bytes == 0) {
+		return OK;
+	}
+
+	int ret = mbedtls_ssl_write(ssl_ctx->get_context(), p_buffer, p_bytes);
+	if (ret == MBEDTLS_ERR_SSL_WANT_READ || ret == MBEDTLS_ERR_SSL_WANT_WRITE) {
+		ret = 0; // non blocking io
+	} else if (ret <= 0) {
+		SSLContextMbedTLS::print_mbedtls_error(ret);
+		_cleanup();
+		return ERR_CONNECTION_ERROR;
+	}
+
+	return OK;
+}
+
+Error PacketPeerMbedDTLS::get_packet(const uint8_t **r_buffer, int &r_bytes) {
+	ERR_FAIL_COND_V(status != STATUS_CONNECTED, ERR_UNCONFIGURED);
+
+	r_bytes = 0;
+
+	int ret = mbedtls_ssl_read(ssl_ctx->get_context(), packet_buffer, PACKET_BUFFER_SIZE);
+	if (ret == MBEDTLS_ERR_SSL_WANT_READ || ret == MBEDTLS_ERR_SSL_WANT_WRITE) {
+		ret = 0; // non blocking io
+	} else if (ret <= 0) {
+		if (ret == MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY) {
+			// Also send close notify back
+			disconnect_from_peer();
+		} else {
+			_cleanup();
+			status = STATUS_ERROR;
+			SSLContextMbedTLS::print_mbedtls_error(ret);
+		}
+		return ERR_CONNECTION_ERROR;
+	}
+	*r_buffer = packet_buffer;
+	r_bytes = ret;
+
+	return OK;
+}
+
+void PacketPeerMbedDTLS::poll() {
+	if (status == STATUS_HANDSHAKING) {
+		_do_handshake();
+		return;
+	} else if (status != STATUS_CONNECTED) {
+		return;
+	}
+
+	ERR_FAIL_COND(!base.is_valid());
+
+	int ret = mbedtls_ssl_read(ssl_ctx->get_context(), nullptr, 0);
+
+	if (ret < 0 && ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE) {
+		if (ret == MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY) {
+			// Also send close notify back
+			disconnect_from_peer();
+		} else {
+			_cleanup();
+			status = STATUS_ERROR;
+			SSLContextMbedTLS::print_mbedtls_error(ret);
+		}
+	}
+}
+
+int PacketPeerMbedDTLS::get_available_packet_count() const {
+	ERR_FAIL_COND_V(status != STATUS_CONNECTED, 0);
+
+	return mbedtls_ssl_get_bytes_avail(&(ssl_ctx->ssl)) > 0 ? 1 : 0;
+}
+
+int PacketPeerMbedDTLS::get_max_packet_size() const {
+	return 488; // 512 (UDP in Godot) - 24 (DTLS header)
+}
+
+PacketPeerMbedDTLS::PacketPeerMbedDTLS() {
+	ssl_ctx.instance();
+	status = STATUS_DISCONNECTED;
+}
+
+PacketPeerMbedDTLS::~PacketPeerMbedDTLS() {
+	disconnect_from_peer();
+}
+
+void PacketPeerMbedDTLS::disconnect_from_peer() {
+	if (status != STATUS_CONNECTED && status != STATUS_HANDSHAKING) {
+		return;
+	}
+
+	if (status == STATUS_CONNECTED) {
+		int ret = 0;
+		// Send SSL close notification, blocking, but ignore other errors.
+		do {
+			ret = mbedtls_ssl_close_notify(ssl_ctx->get_context());
+		} while (ret == MBEDTLS_ERR_SSL_WANT_WRITE);
+	}
+
+	_cleanup();
+}
+
+PacketPeerMbedDTLS::Status PacketPeerMbedDTLS::get_status() const {
+	return status;
+}
+
+PacketPeerDTLS *PacketPeerMbedDTLS::_create_func() {
+	return memnew(PacketPeerMbedDTLS);
+}
+
+void PacketPeerMbedDTLS::initialize_dtls() {
+	_create = _create_func;
+	available = true;
+}
+
+void PacketPeerMbedDTLS::finalize_dtls() {
+	_create = nullptr;
+	available = false;
+}
diff --git a/modules/mono/glue/gd_glue.h b/modules/mbedtls/packet_peer_mbed_dtls.h
index f00e2efc5d..b958fa3b95 100644..100755
--- a/modules/mono/glue/gd_glue.h
+++ b/modules/mbedtls/packet_peer_mbed_dtls.h
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  gd_glue.h                                                            */
+/*  packet_peer_mbed_dtls.h                                              */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,59 +28,61 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GD_GLUE_H
-#define GD_GLUE_H
+#ifndef PACKET_PEER_MBED_DTLS_H
+#define PACKET_PEER_MBED_DTLS_H
 
-#ifdef MONO_GLUE_ENABLED
+#include "core/io/packet_peer_dtls.h"
+#include "ssl_context_mbedtls.h"
 
-#include "../mono_gd/gd_mono_marshal.h"
+#include <mbedtls/timing.h>
 
-MonoObject *godot_icall_GD_bytes2var(MonoArray *p_bytes, MonoBoolean p_allow_objects);
+class PacketPeerMbedDTLS : public PacketPeerDTLS {
+private:
+	enum {
+		PACKET_BUFFER_SIZE = 65536
+	};
 
-MonoObject *godot_icall_GD_convert(MonoObject *p_what, int32_t p_type);
+	uint8_t packet_buffer[PACKET_BUFFER_SIZE];
 
-int godot_icall_GD_hash(MonoObject *p_var);
+	Status status;
+	String hostname;
 
-MonoObject *godot_icall_GD_instance_from_id(uint64_t p_instance_id);
+	Ref<PacketPeerUDP> base;
 
-void godot_icall_GD_print(MonoArray *p_what);
+	static PacketPeerDTLS *_create_func();
 
-void godot_icall_GD_printerr(MonoArray *p_what);
+	static int bio_recv(void *ctx, unsigned char *buf, size_t len);
+	static int bio_send(void *ctx, const unsigned char *buf, size_t len);
+	void _cleanup();
 
-void godot_icall_GD_printraw(MonoArray *p_what);
+protected:
+	Ref<SSLContextMbedTLS> ssl_ctx;
+	mbedtls_timing_delay_context timer;
 
-void godot_icall_GD_prints(MonoArray *p_what);
+	static void _bind_methods();
 
-void godot_icall_GD_printt(MonoArray *p_what);
+	Error _do_handshake();
+	int _set_cookie();
 
-float godot_icall_GD_randf();
+public:
+	virtual void poll();
+	virtual Error accept_peer(Ref<PacketPeerUDP> p_base, Ref<CryptoKey> p_key, Ref<X509Certificate> p_cert = Ref<X509Certificate>(), Ref<X509Certificate> p_ca_chain = Ref<X509Certificate>(), Ref<CookieContextMbedTLS> p_cookies = Ref<CookieContextMbedTLS>());
+	virtual Error connect_to_peer(Ref<PacketPeerUDP> p_base, bool p_validate_certs = true, const String &p_for_hostname = String(), Ref<X509Certificate> p_ca_certs = Ref<X509Certificate>());
+	virtual Status get_status() const;
 
-uint32_t godot_icall_GD_randi();
+	virtual void disconnect_from_peer();
 
-void godot_icall_GD_randomize();
+	virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size);
+	virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size);
 
-double godot_icall_GD_rand_range(double from, double to);
+	virtual int get_available_packet_count() const;
+	virtual int get_max_packet_size() const;
 
-uint32_t godot_icall_GD_rand_seed(uint64_t seed, uint64_t *newSeed);
+	static void initialize_dtls();
+	static void finalize_dtls();
 
-void godot_icall_GD_seed(uint64_t p_seed);
+	PacketPeerMbedDTLS();
+	~PacketPeerMbedDTLS();
+};
 
-MonoString *godot_icall_GD_str(MonoArray *p_what);
-
-MonoObject *godot_icall_GD_str2var(MonoString *p_str);
-
-MonoBoolean godot_icall_GD_type_exists(MonoString *p_type);
-
-MonoArray *godot_icall_GD_var2bytes(MonoObject *p_var, MonoBoolean p_full_objects);
-
-MonoString *godot_icall_GD_var2str(MonoObject *p_var);
-
-MonoObject *godot_icall_DefaultGodotTaskScheduler();
-
-// Register internal calls
-
-void godot_register_gd_icalls();
-
-#endif // MONO_GLUE_ENABLED
-
-#endif // GD_GLUE_H
+#endif // PACKET_PEER_MBED_DTLS_H
diff --git a/modules/mbedtls/register_types.cpp b/modules/mbedtls/register_types.cpp
index 8f9e2c370b..84a27c29bd 100755..100644
--- a/modules/mbedtls/register_types.cpp
+++ b/modules/mbedtls/register_types.cpp
@@ -31,16 +31,20 @@
 #include "register_types.h"
 
 #include "crypto_mbedtls.h"
+#include "dtls_server_mbedtls.h"
+#include "packet_peer_mbed_dtls.h"
 #include "stream_peer_mbedtls.h"
 
 void register_mbedtls_types() {
-
 	CryptoMbedTLS::initialize_crypto();
 	StreamPeerMbedTLS::initialize_ssl();
+	PacketPeerMbedDTLS::initialize_dtls();
+	DTLSServerMbedTLS::initialize();
 }
 
 void unregister_mbedtls_types() {
-
+	DTLSServerMbedTLS::finalize();
+	PacketPeerMbedDTLS::finalize_dtls();
 	StreamPeerMbedTLS::finalize_ssl();
 	CryptoMbedTLS::finalize_crypto();
 }
diff --git a/modules/mbedtls/register_types.h b/modules/mbedtls/register_types.h
index f179d39438..90c81b1682 100755
--- a/modules/mbedtls/register_types.h
+++ b/modules/mbedtls/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef MBEDTLS_REGISTER_TYPES_H
+#define MBEDTLS_REGISTER_TYPES_H
+
 void register_mbedtls_types();
 void unregister_mbedtls_types();
+
+#endif // MBEDTLS_REGISTER_TYPES_H
diff --git a/modules/mbedtls/ssl_context_mbedtls.cpp b/modules/mbedtls/ssl_context_mbedtls.cpp
index 82584e3494..a2200e0644 100644
--- a/modules/mbedtls/ssl_context_mbedtls.cpp
+++ b/modules/mbedtls/ssl_context_mbedtls.cpp
@@ -33,11 +33,58 @@
 static void my_debug(void *ctx, int level,
 		const char *file, int line,
 		const char *str) {
-
 	printf("%s:%04d: %s", file, line, str);
 	fflush(stdout);
 }
 
+void SSLContextMbedTLS::print_mbedtls_error(int p_ret) {
+	printf("mbedtls error: returned -0x%x\n\n", -p_ret);
+	fflush(stdout);
+}
+
+/// CookieContextMbedTLS
+
+Error CookieContextMbedTLS::setup() {
+	ERR_FAIL_COND_V_MSG(inited, ERR_ALREADY_IN_USE, "This cookie context is already in use");
+
+	mbedtls_ctr_drbg_init(&ctr_drbg);
+	mbedtls_entropy_init(&entropy);
+	mbedtls_ssl_cookie_init(&cookie_ctx);
+	inited = true;
+
+	int ret = mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy, nullptr, 0);
+	if (ret != 0) {
+		clear(); // Never leave unusable resources around.
+		ERR_FAIL_V_MSG(FAILED, "mbedtls_ctr_drbg_seed returned an error " + itos(ret));
+	}
+
+	ret = mbedtls_ssl_cookie_setup(&cookie_ctx, mbedtls_ctr_drbg_random, &ctr_drbg);
+	if (ret != 0) {
+		clear();
+		ERR_FAIL_V_MSG(FAILED, "mbedtls_ssl_cookie_setup returned an error " + itos(ret));
+	}
+	return OK;
+}
+
+void CookieContextMbedTLS::clear() {
+	if (!inited) {
+		return;
+	}
+	mbedtls_ctr_drbg_free(&ctr_drbg);
+	mbedtls_entropy_free(&entropy);
+	mbedtls_ssl_cookie_free(&cookie_ctx);
+}
+
+CookieContextMbedTLS::CookieContextMbedTLS() {
+	inited = false;
+}
+
+CookieContextMbedTLS::~CookieContextMbedTLS() {
+	clear();
+}
+
+/// SSLContextMbedTLS
+
 Error SSLContextMbedTLS::_setup(int p_endpoint, int p_transport, int p_authmode) {
 	ERR_FAIL_COND_V_MSG(inited, ERR_ALREADY_IN_USE, "This SSL context is already active");
 
@@ -47,10 +94,10 @@ Error SSLContextMbedTLS::_setup(int p_endpoint, int p_transport, int p_authmode)
 	mbedtls_entropy_init(&entropy);
 	inited = true;
 
-	int ret = mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy, NULL, 0);
+	int ret = mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy, nullptr, 0);
 	if (ret != 0) {
 		clear(); // Never leave unusable resources around.
-		ERR_FAIL_V_MSG(FAILED, "mbedtls_ctr_drbg_seed returned an error" + itos(ret));
+		ERR_FAIL_V_MSG(FAILED, "mbedtls_ctr_drbg_seed returned an error " + itos(ret));
 	}
 
 	ret = mbedtls_ssl_config_defaults(&conf, p_endpoint, p_transport, MBEDTLS_SSL_PRESET_DEFAULT);
@@ -64,7 +111,7 @@ Error SSLContextMbedTLS::_setup(int p_endpoint, int p_transport, int p_authmode)
 	return OK;
 }
 
-Error SSLContextMbedTLS::init_server(int p_transport, int p_authmode, Ref<CryptoKeyMbedTLS> p_pkey, Ref<X509CertificateMbedTLS> p_cert) {
+Error SSLContextMbedTLS::init_server(int p_transport, int p_authmode, Ref<CryptoKeyMbedTLS> p_pkey, Ref<X509CertificateMbedTLS> p_cert, Ref<CookieContextMbedTLS> p_cookies) {
 	ERR_FAIL_COND_V(!p_pkey.is_valid(), ERR_INVALID_PARAMETER);
 	ERR_FAIL_COND_V(!p_cert.is_valid(), ERR_INVALID_PARAMETER);
 
@@ -74,10 +121,12 @@ Error SSLContextMbedTLS::init_server(int p_transport, int p_authmode, Ref<Crypto
 	// Locking key and certificate(s)
 	pkey = p_pkey;
 	certs = p_cert;
-	if (pkey.is_valid())
+	if (pkey.is_valid()) {
 		pkey->lock();
-	if (certs.is_valid())
+	}
+	if (certs.is_valid()) {
 		certs->lock();
+	}
 
 	// Adding key and certificate
 	int ret = mbedtls_ssl_conf_own_cert(&conf, &(certs->cert), &(pkey->pkey));
@@ -87,7 +136,16 @@ Error SSLContextMbedTLS::init_server(int p_transport, int p_authmode, Ref<Crypto
 	}
 	// Adding CA chain if available.
 	if (certs->cert.next) {
-		mbedtls_ssl_conf_ca_chain(&conf, certs->cert.next, NULL);
+		mbedtls_ssl_conf_ca_chain(&conf, certs->cert.next, nullptr);
+	}
+	// DTLS Cookies
+	if (p_transport == MBEDTLS_SSL_TRANSPORT_DATAGRAM) {
+		if (p_cookies.is_null() || !p_cookies->inited) {
+			clear();
+			ERR_FAIL_V(ERR_BUG);
+		}
+		cookies = p_cookies;
+		mbedtls_ssl_conf_dtls_cookies(&conf, mbedtls_ssl_cookie_write, mbedtls_ssl_cookie_check, &(cookies->cookie_ctx));
 	}
 	mbedtls_ssl_setup(&ssl, &conf);
 	return OK;
@@ -97,7 +155,7 @@ Error SSLContextMbedTLS::init_client(int p_transport, int p_authmode, Ref<X509Ce
 	Error err = _setup(MBEDTLS_SSL_IS_CLIENT, p_transport, p_authmode);
 	ERR_FAIL_COND_V(err != OK, err);
 
-	X509CertificateMbedTLS *cas = NULL;
+	X509CertificateMbedTLS *cas = nullptr;
 
 	if (p_valid_cas.is_valid()) {
 		// Locking CA certificates
@@ -107,38 +165,42 @@ Error SSLContextMbedTLS::init_client(int p_transport, int p_authmode, Ref<X509Ce
 	} else {
 		// Fall back to default certificates (no need to lock those).
 		cas = CryptoMbedTLS::get_default_certificates();
-		if (cas == NULL) {
+		if (cas == nullptr) {
 			clear();
 			ERR_FAIL_V_MSG(ERR_UNCONFIGURED, "SSL module failed to initialize!");
 		}
 	}
 
 	// Set valid CAs
-	mbedtls_ssl_conf_ca_chain(&conf, &(cas->cert), NULL);
+	mbedtls_ssl_conf_ca_chain(&conf, &(cas->cert), nullptr);
 	mbedtls_ssl_setup(&ssl, &conf);
 	return OK;
 }
 
 void SSLContextMbedTLS::clear() {
-	if (!inited)
+	if (!inited) {
 		return;
+	}
 	mbedtls_ssl_free(&ssl);
 	mbedtls_ssl_config_free(&conf);
 	mbedtls_ctr_drbg_free(&ctr_drbg);
 	mbedtls_entropy_free(&entropy);
 
 	// Unlock and key and certificates
-	if (certs.is_valid())
+	if (certs.is_valid()) {
 		certs->unlock();
+	}
 	certs = Ref<X509Certificate>();
-	if (pkey.is_valid())
+	if (pkey.is_valid()) {
 		pkey->unlock();
+	}
 	pkey = Ref<CryptoKeyMbedTLS>();
+	cookies = Ref<CookieContextMbedTLS>();
 	inited = false;
 }
 
 mbedtls_ssl_context *SSLContextMbedTLS::get_context() {
-	ERR_FAIL_COND_V(!inited, NULL);
+	ERR_FAIL_COND_V(!inited, nullptr);
 	return &ssl;
 }
 
diff --git a/modules/mbedtls/ssl_context_mbedtls.h b/modules/mbedtls/ssl_context_mbedtls.h
index 9145e0fd72..baaeb6eb85 100644
--- a/modules/mbedtls/ssl_context_mbedtls.h
+++ b/modules/mbedtls/ssl_context_mbedtls.h
@@ -34,7 +34,7 @@
 #include "crypto_mbedtls.h"
 
 #include "core/os/file_access.h"
-#include "core/pool_vector.h"
+
 #include "core/reference.h"
 
 #include <mbedtls/config.h>
@@ -42,25 +42,47 @@
 #include <mbedtls/debug.h>
 #include <mbedtls/entropy.h>
 #include <mbedtls/ssl.h>
+#include <mbedtls/ssl_cookie.h>
 
-class SSLContextMbedTLS : public Reference {
+class SSLContextMbedTLS;
+
+class CookieContextMbedTLS : public Reference {
+	friend class SSLContextMbedTLS;
 
 protected:
 	bool inited;
+	mbedtls_entropy_context entropy;
+	mbedtls_ctr_drbg_context ctr_drbg;
+	mbedtls_ssl_cookie_ctx cookie_ctx;
 
-	static PoolByteArray _read_file(String p_path);
+public:
+	Error setup();
+	void clear();
+
+	CookieContextMbedTLS();
+	~CookieContextMbedTLS();
+};
+
+class SSLContextMbedTLS : public Reference {
+protected:
+	bool inited;
+
+	static PackedByteArray _read_file(String p_path);
 
 public:
+	static void print_mbedtls_error(int p_ret);
+
 	Ref<X509CertificateMbedTLS> certs;
 	mbedtls_entropy_context entropy;
 	mbedtls_ctr_drbg_context ctr_drbg;
 	mbedtls_ssl_context ssl;
 	mbedtls_ssl_config conf;
 
+	Ref<CookieContextMbedTLS> cookies;
 	Ref<CryptoKeyMbedTLS> pkey;
 
 	Error _setup(int p_endpoint, int p_transport, int p_authmode);
-	Error init_server(int p_transport, int p_authmode, Ref<CryptoKeyMbedTLS> p_pkey, Ref<X509CertificateMbedTLS> p_cert);
+	Error init_server(int p_transport, int p_authmode, Ref<CryptoKeyMbedTLS> p_pkey, Ref<X509CertificateMbedTLS> p_cert, Ref<CookieContextMbedTLS> p_cookies = Ref<CookieContextMbedTLS>());
 	Error init_client(int p_transport, int p_authmode, Ref<X509CertificateMbedTLS> p_valid_cas);
 	void clear();
 
diff --git a/modules/mbedtls/stream_peer_mbedtls.cpp b/modules/mbedtls/stream_peer_mbedtls.cpp
index b88d9e48a4..e9a610b7ee 100755..100644
--- a/modules/mbedtls/stream_peer_mbedtls.cpp
+++ b/modules/mbedtls/stream_peer_mbedtls.cpp
@@ -33,18 +33,14 @@
 #include "core/io/stream_peer_tcp.h"
 #include "core/os/file_access.h"
 
-void _print_error(int ret) {
-	printf("mbedtls error: returned -0x%x\n\n", -ret);
-	fflush(stdout);
-}
-
 int StreamPeerMbedTLS::bio_send(void *ctx, const unsigned char *buf, size_t len) {
-
-	if (buf == NULL || len <= 0) return 0;
+	if (buf == nullptr || len <= 0) {
+		return 0;
+	}
 
 	StreamPeerMbedTLS *sp = (StreamPeerMbedTLS *)ctx;
 
-	ERR_FAIL_COND_V(sp == NULL, 0);
+	ERR_FAIL_COND_V(sp == nullptr, 0);
 
 	int sent;
 	Error err = sp->base->put_partial_data((const uint8_t *)buf, len, sent);
@@ -58,12 +54,13 @@ int StreamPeerMbedTLS::bio_send(void *ctx, const unsigned char *buf, size_t len)
 }
 
 int StreamPeerMbedTLS::bio_recv(void *ctx, unsigned char *buf, size_t len) {
-
-	if (buf == NULL || len <= 0) return 0;
+	if (buf == nullptr || len <= 0) {
+		return 0;
+	}
 
 	StreamPeerMbedTLS *sp = (StreamPeerMbedTLS *)ctx;
 
-	ERR_FAIL_COND_V(sp == NULL, 0);
+	ERR_FAIL_COND_V(sp == nullptr, 0);
 
 	int got;
 	Error err = sp->base->get_partial_data((uint8_t *)buf, len, got);
@@ -77,7 +74,6 @@ int StreamPeerMbedTLS::bio_recv(void *ctx, unsigned char *buf, size_t len) {
 }
 
 void StreamPeerMbedTLS::_cleanup() {
-
 	ssl_ctx->clear();
 	base = Ref<StreamPeer>();
 	status = STATUS_DISCONNECTED;
@@ -88,8 +84,8 @@ Error StreamPeerMbedTLS::_do_handshake() {
 	while ((ret = mbedtls_ssl_handshake(ssl_ctx->get_context())) != 0) {
 		if (ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE) {
 			// An error occurred.
-			ERR_PRINTS("TLS handshake error: " + itos(ret));
-			_print_error(ret);
+			ERR_PRINT("TLS handshake error: " + itos(ret));
+			SSLContextMbedTLS::print_mbedtls_error(ret);
 			disconnect_from_stream();
 			status = STATUS_ERROR;
 			return FAILED;
@@ -107,7 +103,6 @@ Error StreamPeerMbedTLS::_do_handshake() {
 }
 
 Error StreamPeerMbedTLS::connect_to_stream(Ref<StreamPeer> p_base, bool p_validate_certs, const String &p_for_hostname, Ref<X509Certificate> p_ca_certs) {
-
 	ERR_FAIL_COND_V(p_base.is_null(), ERR_INVALID_PARAMETER);
 
 	base = p_base;
@@ -117,7 +112,7 @@ Error StreamPeerMbedTLS::connect_to_stream(Ref<StreamPeer> p_base, bool p_valida
 	ERR_FAIL_COND_V(err != OK, err);
 
 	mbedtls_ssl_set_hostname(ssl_ctx->get_context(), p_for_hostname.utf8().get_data());
-	mbedtls_ssl_set_bio(ssl_ctx->get_context(), this, bio_send, bio_recv, NULL);
+	mbedtls_ssl_set_bio(ssl_ctx->get_context(), this, bio_send, bio_recv, nullptr);
 
 	status = STATUS_HANDSHAKING;
 
@@ -130,7 +125,6 @@ Error StreamPeerMbedTLS::connect_to_stream(Ref<StreamPeer> p_base, bool p_valida
 }
 
 Error StreamPeerMbedTLS::accept_stream(Ref<StreamPeer> p_base, Ref<CryptoKey> p_key, Ref<X509Certificate> p_cert, Ref<X509Certificate> p_ca_chain) {
-
 	ERR_FAIL_COND_V(p_base.is_null(), ERR_INVALID_PARAMETER);
 
 	Error err = ssl_ctx->init_server(MBEDTLS_SSL_TRANSPORT_STREAM, MBEDTLS_SSL_VERIFY_NONE, p_key, p_cert);
@@ -138,7 +132,7 @@ Error StreamPeerMbedTLS::accept_stream(Ref<StreamPeer> p_base, Ref<CryptoKey> p_
 
 	base = p_base;
 
-	mbedtls_ssl_set_bio(ssl_ctx->get_context(), this, bio_send, bio_recv, NULL);
+	mbedtls_ssl_set_bio(ssl_ctx->get_context(), this, bio_send, bio_recv, nullptr);
 
 	status = STATUS_HANDSHAKING;
 
@@ -149,8 +143,8 @@ Error StreamPeerMbedTLS::accept_stream(Ref<StreamPeer> p_base, Ref<CryptoKey> p_
 	status = STATUS_CONNECTED;
 	return OK;
 }
-Error StreamPeerMbedTLS::put_data(const uint8_t *p_data, int p_bytes) {
 
+Error StreamPeerMbedTLS::put_data(const uint8_t *p_data, int p_bytes) {
 	ERR_FAIL_COND_V(status != STATUS_CONNECTED, ERR_UNCONFIGURED);
 
 	Error err;
@@ -171,13 +165,13 @@ Error StreamPeerMbedTLS::put_data(const uint8_t *p_data, int p_bytes) {
 }
 
 Error StreamPeerMbedTLS::put_partial_data(const uint8_t *p_data, int p_bytes, int &r_sent) {
-
 	ERR_FAIL_COND_V(status != STATUS_CONNECTED, ERR_UNCONFIGURED);
 
 	r_sent = 0;
 
-	if (p_bytes == 0)
+	if (p_bytes == 0) {
 		return OK;
+	}
 
 	int ret = mbedtls_ssl_write(ssl_ctx->get_context(), p_data, p_bytes);
 	if (ret == MBEDTLS_ERR_SSL_WANT_READ || ret == MBEDTLS_ERR_SSL_WANT_WRITE) {
@@ -188,7 +182,7 @@ Error StreamPeerMbedTLS::put_partial_data(const uint8_t *p_data, int p_bytes, in
 		disconnect_from_stream();
 		return ERR_FILE_EOF;
 	} else if (ret <= 0) {
-		_print_error(ret);
+		SSLContextMbedTLS::print_mbedtls_error(ret);
 		disconnect_from_stream();
 		return ERR_CONNECTION_ERROR;
 	}
@@ -198,14 +192,12 @@ Error StreamPeerMbedTLS::put_partial_data(const uint8_t *p_data, int p_bytes, in
 }
 
 Error StreamPeerMbedTLS::get_data(uint8_t *p_buffer, int p_bytes) {
-
 	ERR_FAIL_COND_V(status != STATUS_CONNECTED, ERR_UNCONFIGURED);
 
 	Error err;
 
 	int got = 0;
 	while (p_bytes > 0) {
-
 		err = get_partial_data(p_buffer, p_bytes, got);
 
 		if (err != OK) {
@@ -220,7 +212,6 @@ Error StreamPeerMbedTLS::get_data(uint8_t *p_buffer, int p_bytes) {
 }
 
 Error StreamPeerMbedTLS::get_partial_data(uint8_t *p_buffer, int p_bytes, int &r_received) {
-
 	ERR_FAIL_COND_V(status != STATUS_CONNECTED, ERR_UNCONFIGURED);
 
 	r_received = 0;
@@ -233,7 +224,7 @@ Error StreamPeerMbedTLS::get_partial_data(uint8_t *p_buffer, int p_bytes, int &r
 		disconnect_from_stream();
 		return ERR_FILE_EOF;
 	} else if (ret <= 0) {
-		_print_error(ret);
+		SSLContextMbedTLS::print_mbedtls_error(ret);
 		disconnect_from_stream();
 		return ERR_CONNECTION_ERROR;
 	}
@@ -243,7 +234,6 @@ Error StreamPeerMbedTLS::get_partial_data(uint8_t *p_buffer, int p_bytes, int &r
 }
 
 void StreamPeerMbedTLS::poll() {
-
 	ERR_FAIL_COND(status != STATUS_CONNECTED && status != STATUS_HANDSHAKING);
 	ERR_FAIL_COND(!base.is_valid());
 
@@ -264,7 +254,7 @@ void StreamPeerMbedTLS::poll() {
 		disconnect_from_stream();
 		return;
 	} else if (ret < 0) {
-		_print_error(ret);
+		SSLContextMbedTLS::print_mbedtls_error(ret);
 		disconnect_from_stream();
 		return;
 	}
@@ -277,13 +267,12 @@ void StreamPeerMbedTLS::poll() {
 }
 
 int StreamPeerMbedTLS::get_available_bytes() const {
-
 	ERR_FAIL_COND_V(status != STATUS_CONNECTED, 0);
 
 	return mbedtls_ssl_get_bytes_avail(&(ssl_ctx->ssl));
 }
-StreamPeerMbedTLS::StreamPeerMbedTLS() {
 
+StreamPeerMbedTLS::StreamPeerMbedTLS() {
 	ssl_ctx.instance();
 	status = STATUS_DISCONNECTED;
 }
@@ -293,9 +282,9 @@ StreamPeerMbedTLS::~StreamPeerMbedTLS() {
 }
 
 void StreamPeerMbedTLS::disconnect_from_stream() {
-
-	if (status != STATUS_CONNECTED && status != STATUS_HANDSHAKING)
+	if (status != STATUS_CONNECTED && status != STATUS_HANDSHAKING) {
 		return;
+	}
 
 	Ref<StreamPeerTCP> tcp = base;
 	if (tcp.is_valid() && tcp->get_status() == StreamPeerTCP::STATUS_CONNECTED) {
@@ -307,23 +296,19 @@ void StreamPeerMbedTLS::disconnect_from_stream() {
 }
 
 StreamPeerMbedTLS::Status StreamPeerMbedTLS::get_status() const {
-
 	return status;
 }
 
 StreamPeerSSL *StreamPeerMbedTLS::_create_func() {
-
 	return memnew(StreamPeerMbedTLS);
 }
 
 void StreamPeerMbedTLS::initialize_ssl() {
-
 	_create = _create_func;
 	available = true;
 }
 
 void StreamPeerMbedTLS::finalize_ssl() {
-
 	available = false;
-	_create = NULL;
+	_create = nullptr;
 }
diff --git a/modules/mobile_vr/SCsub b/modules/mobile_vr/SCsub
index 4bd184f025..e6c43228b4 100644
--- a/modules/mobile_vr/SCsub
+++ b/modules/mobile_vr/SCsub
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_mobile_vr = env_modules.Clone()
 
-env_mobile_vr.add_source_files(env.modules_sources, '*.cpp')
+env_mobile_vr.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/mobile_vr/config.py b/modules/mobile_vr/config.py
index e85fa631dd..ee401c1a2a 100644
--- a/modules/mobile_vr/config.py
+++ b/modules/mobile_vr/config.py
@@ -1,13 +1,16 @@
 def can_build(env, platform):
     return True
 
+
 def configure(env):
     pass
 
+
 def get_doc_classes():
     return [
         "MobileVRInterface",
     ]
 
+
 def get_doc_path():
     return "doc_classes"
diff --git a/modules/mobile_vr/doc_classes/MobileVRInterface.xml b/modules/mobile_vr/doc_classes/MobileVRInterface.xml
index 7552abe61d..120535bd41 100644
--- a/modules/mobile_vr/doc_classes/MobileVRInterface.xml
+++ b/modules/mobile_vr/doc_classes/MobileVRInterface.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="MobileVRInterface" inherits="ARVRInterface" version="4.0">
+<class name="MobileVRInterface" inherits="XRInterface" version="4.0">
 	<brief_description>
 		Generic mobile VR implementation.
 	</brief_description>
@@ -8,9 +8,9 @@
 		Note that even though there is no positional tracking, the camera will assume the headset is at a height of 1.85 meters. You can change this by setting [member eye_height].
 		You can initialise this interface as follows:
 		[codeblock]
-		var interface = ARVRServer.find_interface("Native mobile")
+		var interface = XRServer.find_interface("Native mobile")
 		if interface and interface.initialize():
-		    get_viewport().arvr = true
+		    get_viewport().xr = true
 		[/codeblock]
 	</description>
 	<tutorials>
@@ -25,7 +25,7 @@
 			The width of the display in centimeters.
 		</member>
 		<member name="eye_height" type="float" setter="set_eye_height" getter="get_eye_height" default="1.85">
-			The height at which the camera is placed in relation to the ground (i.e. [ARVROrigin] node).
+			The height at which the camera is placed in relation to the ground (i.e. [XROrigin3D] node).
 		</member>
 		<member name="iod" type="float" setter="set_iod" getter="get_iod" default="6.0">
 			The interocular distance, also known as the interpupillary distance. The distance between the pupils of the left and right eye.
diff --git a/modules/mobile_vr/mobile_vr_interface.cpp b/modules/mobile_vr/mobile_vr_interface.cpp
index 22b708f206..a2fb443ef0 100644
--- a/modules/mobile_vr/mobile_vr_interface.cpp
+++ b/modules/mobile_vr/mobile_vr_interface.cpp
@@ -29,16 +29,18 @@
 /*************************************************************************/
 
 #include "mobile_vr_interface.h"
-#include "core/os/input.h"
+
+#include "core/input/input.h"
 #include "core/os/os.h"
-#include "servers/visual/visual_server_globals.h"
+#include "servers/display_server.h"
+#include "servers/rendering/rendering_server_globals.h"
 
 StringName MobileVRInterface::get_name() const {
 	return "Native mobile";
 };
 
 int MobileVRInterface::get_capabilities() const {
-	return ARVRInterface::ARVR_STEREO;
+	return XRInterface::XR_STEREO;
 };
 
 Vector3 MobileVRInterface::scale_magneto(const Vector3 &p_magnetometer) {
@@ -59,13 +61,25 @@ Vector3 MobileVRInterface::scale_magneto(const Vector3 &p_magnetometer) {
 	};
 
 	// adjust our min and max
-	if (mag_raw.x > mag_next_max.x) mag_next_max.x = mag_raw.x;
-	if (mag_raw.y > mag_next_max.y) mag_next_max.y = mag_raw.y;
-	if (mag_raw.z > mag_next_max.z) mag_next_max.z = mag_raw.z;
+	if (mag_raw.x > mag_next_max.x) {
+		mag_next_max.x = mag_raw.x;
+	}
+	if (mag_raw.y > mag_next_max.y) {
+		mag_next_max.y = mag_raw.y;
+	}
+	if (mag_raw.z > mag_next_max.z) {
+		mag_next_max.z = mag_raw.z;
+	}
 
-	if (mag_raw.x < mag_next_min.x) mag_next_min.x = mag_raw.x;
-	if (mag_raw.y < mag_next_min.y) mag_next_min.y = mag_raw.y;
-	if (mag_raw.z < mag_next_min.z) mag_next_min.z = mag_raw.z;
+	if (mag_raw.x < mag_next_min.x) {
+		mag_next_min.x = mag_raw.x;
+	}
+	if (mag_raw.y < mag_next_min.y) {
+		mag_next_min.y = mag_raw.y;
+	}
+	if (mag_raw.z < mag_next_min.z) {
+		mag_next_min.z = mag_raw.z;
+	}
 
 	// scale our x, y and z
 	if (!(mag_current_max.x - mag_current_min.x)) {
@@ -164,7 +178,7 @@ void MobileVRInterface::set_position_from_sensors() {
 		rotate.rotate(orientation.get_axis(2), gyro.z * delta_time);
 		orientation = rotate * orientation;
 
-		tracking_state = ARVRInterface::ARVR_NORMAL_TRACKING;
+		tracking_state = XRInterface::XR_NORMAL_TRACKING;
 	};
 
 	///@TODO improve this, the magnetometer is very fidgity sometimes flipping the axis for no apparent reason (probably a bug on my part)
@@ -176,7 +190,7 @@ void MobileVRInterface::set_position_from_sensors() {
 		transform_quat = transform_quat.slerp(acc_mag_quat, 0.1);
 		orientation = Basis(transform_quat);
 
-		tracking_state = ARVRInterface::ARVR_NORMAL_TRACKING;
+		tracking_state = XRInterface::XR_NORMAL_TRACKING;
 	} else if (has_grav) {
 		// use gravity vector to make sure down is down...
 		// transform gravity into our world space
@@ -221,13 +235,13 @@ void MobileVRInterface::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_k2", "k"), &MobileVRInterface::set_k2);
 	ClassDB::bind_method(D_METHOD("get_k2"), &MobileVRInterface::get_k2);
 
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "eye_height", PROPERTY_HINT_RANGE, "0.0,3.0,0.1"), "set_eye_height", "get_eye_height");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "iod", PROPERTY_HINT_RANGE, "4.0,10.0,0.1"), "set_iod", "get_iod");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "display_width", PROPERTY_HINT_RANGE, "5.0,25.0,0.1"), "set_display_width", "get_display_width");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "display_to_lens", PROPERTY_HINT_RANGE, "5.0,25.0,0.1"), "set_display_to_lens", "get_display_to_lens");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "oversample", PROPERTY_HINT_RANGE, "1.0,2.0,0.1"), "set_oversample", "get_oversample");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "k1", PROPERTY_HINT_RANGE, "0.1,10.0,0.0001"), "set_k1", "get_k1");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "k2", PROPERTY_HINT_RANGE, "0.1,10.0,0.0001"), "set_k2", "get_k2");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "eye_height", PROPERTY_HINT_RANGE, "0.0,3.0,0.1"), "set_eye_height", "get_eye_height");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "iod", PROPERTY_HINT_RANGE, "4.0,10.0,0.1"), "set_iod", "get_iod");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "display_width", PROPERTY_HINT_RANGE, "5.0,25.0,0.1"), "set_display_width", "get_display_width");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "display_to_lens", PROPERTY_HINT_RANGE, "5.0,25.0,0.1"), "set_display_to_lens", "get_display_to_lens");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "oversample", PROPERTY_HINT_RANGE, "1.0,2.0,0.1"), "set_oversample", "get_oversample");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "k1", PROPERTY_HINT_RANGE, "0.1,10.0,0.0001"), "set_k1", "get_k1");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "k2", PROPERTY_HINT_RANGE, "0.1,10.0,0.0001"), "set_k2", "get_k2");
 }
 
 void MobileVRInterface::set_eye_height(const real_t p_eye_height) {
@@ -296,8 +310,8 @@ bool MobileVRInterface::is_initialized() const {
 };
 
 bool MobileVRInterface::initialize() {
-	ARVRServer *arvr_server = ARVRServer::get_singleton();
-	ERR_FAIL_NULL_V(arvr_server, false);
+	XRServer *xr_server = XRServer::get_singleton();
+	ERR_FAIL_NULL_V(xr_server, false);
 
 	if (!initialized) {
 		// reset our sensor data and orientation
@@ -313,7 +327,7 @@ bool MobileVRInterface::initialize() {
 		orientation = Basis();
 
 		// make this our primary interface
-		arvr_server->set_primary_interface(this);
+		xr_server->set_primary_interface(this);
 
 		last_ticks = OS::get_singleton()->get_ticks_usec();
 
@@ -325,10 +339,10 @@ bool MobileVRInterface::initialize() {
 
 void MobileVRInterface::uninitialize() {
 	if (initialized) {
-		ARVRServer *arvr_server = ARVRServer::get_singleton();
-		if (arvr_server != NULL) {
+		XRServer *xr_server = XRServer::get_singleton();
+		if (xr_server != nullptr) {
 			// no longer our primary interface
-			arvr_server->clear_primary_interface_if(this);
+			xr_server->clear_primary_interface_if(this);
 		}
 
 		initialized = false;
@@ -339,7 +353,7 @@ Size2 MobileVRInterface::get_render_targetsize() {
 	_THREAD_SAFE_METHOD_
 
 	// we use half our window size
-	Size2 target_size = OS::get_singleton()->get_window_size();
+	Size2 target_size = DisplayServer::get_singleton()->window_get_size();
 
 	target_size.x *= 0.5 * oversample;
 	target_size.y *= oversample;
@@ -347,22 +361,22 @@ Size2 MobileVRInterface::get_render_targetsize() {
 	return target_size;
 };
 
-Transform MobileVRInterface::get_transform_for_eye(ARVRInterface::Eyes p_eye, const Transform &p_cam_transform) {
+Transform MobileVRInterface::get_transform_for_eye(XRInterface::Eyes p_eye, const Transform &p_cam_transform) {
 	_THREAD_SAFE_METHOD_
 
 	Transform transform_for_eye;
 
-	ARVRServer *arvr_server = ARVRServer::get_singleton();
-	ERR_FAIL_NULL_V(arvr_server, transform_for_eye);
+	XRServer *xr_server = XRServer::get_singleton();
+	ERR_FAIL_NULL_V(xr_server, transform_for_eye);
 
 	if (initialized) {
-		float world_scale = arvr_server->get_world_scale();
+		float world_scale = xr_server->get_world_scale();
 
 		// we don't need to check for the existence of our HMD, doesn't effect our values...
 		// note * 0.01 to convert cm to m and * 0.5 as we're moving half in each direction...
-		if (p_eye == ARVRInterface::EYE_LEFT) {
+		if (p_eye == XRInterface::EYE_LEFT) {
 			transform_for_eye.origin.x = -(intraocular_dist * 0.01 * 0.5 * world_scale);
-		} else if (p_eye == ARVRInterface::EYE_RIGHT) {
+		} else if (p_eye == XRInterface::EYE_RIGHT) {
 			transform_for_eye.origin.x = intraocular_dist * 0.01 * 0.5 * world_scale;
 		} else {
 			// for mono we don't reposition, we want our center position.
@@ -373,7 +387,7 @@ Transform MobileVRInterface::get_transform_for_eye(ARVRInterface::Eyes p_eye, co
 		hmd_transform.basis = orientation;
 		hmd_transform.origin = Vector3(0.0, eye_height * world_scale, 0.0);
 
-		transform_for_eye = p_cam_transform * (arvr_server->get_reference_frame()) * hmd_transform * transform_for_eye;
+		transform_for_eye = p_cam_transform * (xr_server->get_reference_frame()) * hmd_transform * transform_for_eye;
 	} else {
 		// huh? well just return what we got....
 		transform_for_eye = p_cam_transform;
@@ -382,12 +396,12 @@ Transform MobileVRInterface::get_transform_for_eye(ARVRInterface::Eyes p_eye, co
 	return transform_for_eye;
 };
 
-CameraMatrix MobileVRInterface::get_projection_for_eye(ARVRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far) {
+CameraMatrix MobileVRInterface::get_projection_for_eye(XRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far) {
 	_THREAD_SAFE_METHOD_
 
 	CameraMatrix eye;
 
-	if (p_eye == ARVRInterface::EYE_MONO) {
+	if (p_eye == XRInterface::EYE_MONO) {
 		///@TODO for now hardcode some of this, what is really needed here is that this needs to be in sync with the real cameras properties
 		// which probably means implementing a specific class for iOS and Android. For now this is purely here as an example.
 		// Note also that if you use a normal viewport with AR/VR turned off you can still use the tracker output of this interface
@@ -395,13 +409,13 @@ CameraMatrix MobileVRInterface::get_projection_for_eye(ARVRInterface::Eyes p_eye
 		// This will make more sense when we implement ARkit on iOS (probably a separate interface).
 		eye.set_perspective(60.0, p_aspect, p_z_near, p_z_far, false);
 	} else {
-		eye.set_for_hmd(p_eye == ARVRInterface::EYE_LEFT ? 1 : 2, p_aspect, intraocular_dist, display_width, display_to_lens, oversample, p_z_near, p_z_far);
+		eye.set_for_hmd(p_eye == XRInterface::EYE_LEFT ? 1 : 2, p_aspect, intraocular_dist, display_width, display_to_lens, oversample, p_z_near, p_z_far);
 	};
 
 	return eye;
 };
 
-void MobileVRInterface::commit_for_eye(ARVRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect) {
+void MobileVRInterface::commit_for_eye(XRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect) {
 	_THREAD_SAFE_METHOD_
 
 	// We must have a valid render target
@@ -416,21 +430,15 @@ void MobileVRInterface::commit_for_eye(ARVRInterface::Eyes p_eye, RID p_render_t
 	// we output half a screen
 	dest.size.x *= 0.5;
 
-	if (p_eye == ARVRInterface::EYE_LEFT) {
+	if (p_eye == XRInterface::EYE_LEFT) {
 		eye_center.x = ((-intraocular_dist / 2.0) + (display_width / 4.0)) / (display_width / 2.0);
-	} else if (p_eye == ARVRInterface::EYE_RIGHT) {
+	} else if (p_eye == XRInterface::EYE_RIGHT) {
 		dest.position.x = dest.size.x;
 		eye_center.x = ((intraocular_dist / 2.0) - (display_width / 4.0)) / (display_width / 2.0);
 	}
 	// we don't offset the eye center vertically (yet)
 	eye_center.y = 0.0;
-
-	// unset our render target so we are outputting to our main screen by making RasterizerStorageGLES3::system_fbo our current FBO
-	VSG::rasterizer->set_current_render_target(RID());
-
-	// and output
-	VSG::rasterizer->output_lens_distorted_to_screen(p_render_target, dest, k1, k2, eye_center, oversample);
-};
+}
 
 void MobileVRInterface::process() {
 	_THREAD_SAFE_METHOD_
@@ -440,12 +448,6 @@ void MobileVRInterface::process() {
 	};
 };
 
-void MobileVRInterface::notification(int p_what){
-	_THREAD_SAFE_METHOD_
-
-	// nothing to do here, I guess we could pauze our sensors...
-}
-
 MobileVRInterface::MobileVRInterface() {
 	initialized = false;
 
diff --git a/modules/mobile_vr/mobile_vr_interface.h b/modules/mobile_vr/mobile_vr_interface.h
index c762c9b799..9b03fff777 100644
--- a/modules/mobile_vr/mobile_vr_interface.h
+++ b/modules/mobile_vr/mobile_vr_interface.h
@@ -31,8 +31,8 @@
 #ifndef MOBILE_VR_INTERFACE_H
 #define MOBILE_VR_INTERFACE_H
 
-#include "servers/arvr/arvr_interface.h"
-#include "servers/arvr/arvr_positional_tracker.h"
+#include "servers/xr/xr_interface.h"
+#include "servers/xr/xr_positional_tracker.h"
 
 /**
 	@author Bastiaan Olij <mux213@gmail.com>
@@ -47,8 +47,8 @@
 	more advanced interfaces.
 */
 
-class MobileVRInterface : public ARVRInterface {
-	GDCLASS(MobileVRInterface, ARVRInterface);
+class MobileVRInterface : public XRInterface {
+	GDCLASS(MobileVRInterface, XRInterface);
 
 private:
 	bool initialized;
@@ -128,21 +128,21 @@ public:
 	void set_k2(const real_t p_k2);
 	real_t get_k2() const;
 
-	virtual StringName get_name() const;
-	virtual int get_capabilities() const;
+	virtual StringName get_name() const override;
+	virtual int get_capabilities() const override;
 
-	virtual bool is_initialized() const;
-	virtual bool initialize();
-	virtual void uninitialize();
+	virtual bool is_initialized() const override;
+	virtual bool initialize() override;
+	virtual void uninitialize() override;
 
-	virtual Size2 get_render_targetsize();
-	virtual bool is_stereo();
-	virtual Transform get_transform_for_eye(ARVRInterface::Eyes p_eye, const Transform &p_cam_transform);
-	virtual CameraMatrix get_projection_for_eye(ARVRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far);
-	virtual void commit_for_eye(ARVRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect);
+	virtual Size2 get_render_targetsize() override;
+	virtual bool is_stereo() override;
+	virtual Transform get_transform_for_eye(XRInterface::Eyes p_eye, const Transform &p_cam_transform) override;
+	virtual CameraMatrix get_projection_for_eye(XRInterface::Eyes p_eye, real_t p_aspect, real_t p_z_near, real_t p_z_far) override;
+	virtual void commit_for_eye(XRInterface::Eyes p_eye, RID p_render_target, const Rect2 &p_screen_rect) override;
 
-	virtual void process();
-	virtual void notification(int p_what);
+	virtual void process() override;
+	virtual void notification(int p_what) override {}
 
 	MobileVRInterface();
 	~MobileVRInterface();
diff --git a/modules/mobile_vr/register_types.cpp b/modules/mobile_vr/register_types.cpp
index faf6c3b151..0bb555e780 100644
--- a/modules/mobile_vr/register_types.cpp
+++ b/modules/mobile_vr/register_types.cpp
@@ -35,9 +35,11 @@
 void register_mobile_vr_types() {
 	ClassDB::register_class<MobileVRInterface>();
 
-	Ref<MobileVRInterface> mobile_vr;
-	mobile_vr.instance();
-	ARVRServer::get_singleton()->add_interface(mobile_vr);
+	if (XRServer::get_singleton()) {
+		Ref<MobileVRInterface> mobile_vr;
+		mobile_vr.instance();
+		XRServer::get_singleton()->add_interface(mobile_vr);
+	}
 }
 
 void unregister_mobile_vr_types() {
diff --git a/modules/mobile_vr/register_types.h b/modules/mobile_vr/register_types.h
index 602fae1f4e..33f608b6ed 100644
--- a/modules/mobile_vr/register_types.h
+++ b/modules/mobile_vr/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef MOBILE_VR_REGISTER_TYPES_H
+#define MOBILE_VR_REGISTER_TYPES_H
+
 void register_mobile_vr_types();
 void unregister_mobile_vr_types();
+
+#endif // MOBILE_VR_REGISTER_TYPES_H
diff --git a/modules/modules_builders.py b/modules/modules_builders.py
new file mode 100644
index 0000000000..2243162555
--- /dev/null
+++ b/modules/modules_builders.py
@@ -0,0 +1,27 @@
+"""Functions used to generate source files during build time
+
+All such functions are invoked in a subprocess on Windows to prevent build flakiness.
+"""
+
+from platform_methods import subprocess_main
+
+
+def generate_modules_enabled(target, source, env):
+    with open(target[0].path, "w") as f:
+        for module in env.module_list:
+            f.write("#define %s\n" % ("MODULE_" + module.upper() + "_ENABLED"))
+
+
+def generate_modules_tests(target, source, env):
+    import os
+    import glob
+
+    with open(target[0].path, "w") as f:
+        for name, path in env.module_list.items():
+            headers = glob.glob(os.path.join(path, "tests", "*.h"))
+            for h in headers:
+                f.write('#include "%s"\n' % (os.path.normpath(h)))
+
+
+if __name__ == "__main__":
+    subprocess_main(globals())
diff --git a/modules/mono/SCsub b/modules/mono/SCsub
index 41be367f2f..e8f3174a0a 100644
--- a/modules/mono/SCsub
+++ b/modules/mono/SCsub
@@ -1,54 +1,57 @@
 #!/usr/bin/env python
 
-import build_scripts.tls_configure as tls_configure
 import build_scripts.mono_configure as mono_configure
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_mono = env_modules.Clone()
 
-if env_mono['tools']:
+if env_mono["tools"]:
     # NOTE: It is safe to generate this file here, since this is still executed serially
     import build_scripts.gen_cs_glue_version as gen_cs_glue_version
-    gen_cs_glue_version.generate_header('glue/GodotSharp', 'glue/cs_glue_version.gen.h')
+
+    gen_cs_glue_version.generate_header("glue/GodotSharp", "glue/cs_glue_version.gen.h")
 
 # Glue sources
-if env_mono['mono_glue']:
-    env_mono.Append(CPPDEFINES=['MONO_GLUE_ENABLED'])
+if env_mono["mono_glue"]:
+    env_mono.Append(CPPDEFINES=["MONO_GLUE_ENABLED"])
 
     import os.path
-    if not os.path.isfile('glue/mono_glue.gen.cpp'):
-        raise RuntimeError("Mono glue sources not found. Did you forget to run '--generate-mono-glue'?")
 
-if env_mono['tools'] or env_mono['target'] != 'release':
-    env_mono.Append(CPPDEFINES=['GD_MONO_HOT_RELOAD'])
-
-# Configure Thread Local Storage
+    if not os.path.isfile("glue/mono_glue.gen.cpp"):
+        raise RuntimeError("Mono glue sources not found. Did you forget to run '--generate-mono-glue'?")
 
-conf = Configure(env_mono)
-tls_configure.configure(conf)
-env_mono = conf.Finish()
+if env_mono["tools"] or env_mono["target"] != "release":
+    env_mono.Append(CPPDEFINES=["GD_MONO_HOT_RELOAD"])
 
 # Configure Mono
 
 mono_configure.configure(env, env_mono)
 
-if env_mono['tools'] and env_mono['mono_glue']:
+if env_mono["tools"] and env_mono["mono_glue"] and env_mono["build_cil"]:
     # Build Godot API solution
     import build_scripts.api_solution_build as api_solution_build
+
     api_sln_cmd = api_solution_build.build(env_mono)
 
     # Build GodotTools
     import build_scripts.godot_tools_build as godot_tools_build
+
     godot_tools_build.build(env_mono, api_sln_cmd)
 
 # Add sources
 
-env_mono.add_source_files(env.modules_sources, '*.cpp')
-env_mono.add_source_files(env.modules_sources, 'glue/*.cpp')
-env_mono.add_source_files(env.modules_sources, 'mono_gd/*.cpp')
-env_mono.add_source_files(env.modules_sources, 'utils/*.cpp')
+env_mono.add_source_files(env.modules_sources, "*.cpp")
+env_mono.add_source_files(env.modules_sources, "glue/*.cpp")
+env_mono.add_source_files(env.modules_sources, "mono_gd/*.cpp")
+env_mono.add_source_files(env.modules_sources, "utils/*.cpp")
+
+env_mono.add_source_files(env.modules_sources, "mono_gd/support/*.cpp")
+
+if env["platform"] in ["osx", "iphone"]:
+    env_mono.add_source_files(env.modules_sources, "mono_gd/support/*.mm")
+    env_mono.add_source_files(env.modules_sources, "mono_gd/support/*.m")
 
-if env['tools']:
-    env_mono.add_source_files(env.modules_sources, 'editor/*.cpp')
+if env["tools"]:
+    env_mono.add_source_files(env.modules_sources, "editor/*.cpp")
diff --git a/modules/mono/build_scripts/api_solution_build.py b/modules/mono/build_scripts/api_solution_build.py
index 639197c285..9abac22df6 100644
--- a/modules/mono/build_scripts/api_solution_build.py
+++ b/modules/mono/build_scripts/api_solution_build.py
@@ -8,21 +8,22 @@ from SCons.Script import Dir
 def build_api_solution(source, target, env):
     # source and target elements are of type SCons.Node.FS.File, hence why we convert them to str
 
-    module_dir = env['module_dir']
+    module_dir = env["module_dir"]
 
-    solution_path = os.path.join(module_dir, 'glue/GodotSharp/GodotSharp.sln')
+    solution_path = os.path.join(module_dir, "glue/GodotSharp/GodotSharp.sln")
 
-    build_config = env['solution_build_config']
+    build_config = env["solution_build_config"]
 
-    extra_msbuild_args = ['/p:NoWarn=1591']  # Ignore missing documentation warnings
+    extra_msbuild_args = ["/p:NoWarn=1591"]  # Ignore missing documentation warnings
 
     from .solution_builder import build_solution
+
     build_solution(env, solution_path, build_config, extra_msbuild_args=extra_msbuild_args)
 
     # Copy targets
 
-    core_src_dir = os.path.abspath(os.path.join(solution_path, os.pardir, 'GodotSharp', 'bin', build_config))
-    editor_src_dir = os.path.abspath(os.path.join(solution_path, os.pardir, 'GodotSharpEditor', 'bin', build_config))
+    core_src_dir = os.path.abspath(os.path.join(solution_path, os.pardir, "GodotSharp", "bin", build_config))
+    editor_src_dir = os.path.abspath(os.path.join(solution_path, os.pardir, "GodotSharpEditor", "bin", build_config))
 
     dst_dir = os.path.abspath(os.path.join(str(target[0]), os.pardir))
 
@@ -32,6 +33,7 @@ def build_api_solution(source, target, env):
 
     def copy_target(target_path):
         from shutil import copy
+
         filename = os.path.basename(target_path)
 
         src_path = os.path.join(core_src_dir, filename)
@@ -45,23 +47,28 @@ def build_api_solution(source, target, env):
 
 
 def build(env_mono):
-    assert env_mono['tools']
+    assert env_mono["tools"]
 
     target_filenames = [
-        'GodotSharp.dll', 'GodotSharp.pdb', 'GodotSharp.xml',
-        'GodotSharpEditor.dll', 'GodotSharpEditor.pdb', 'GodotSharpEditor.xml'
+        "GodotSharp.dll",
+        "GodotSharp.pdb",
+        "GodotSharp.xml",
+        "GodotSharpEditor.dll",
+        "GodotSharpEditor.pdb",
+        "GodotSharpEditor.xml",
     ]
 
     depend_cmd = []
 
-    for build_config in ['Debug', 'Release']:
-        output_dir = Dir('#bin').abspath
-        editor_api_dir = os.path.join(output_dir, 'GodotSharp', 'Api', build_config)
+    for build_config in ["Debug", "Release"]:
+        output_dir = Dir("#bin").abspath
+        editor_api_dir = os.path.join(output_dir, "GodotSharp", "Api", build_config)
 
         targets = [os.path.join(editor_api_dir, filename) for filename in target_filenames]
 
-        cmd = env_mono.CommandNoCache(targets, depend_cmd, build_api_solution,
-                                      module_dir=os.getcwd(), solution_build_config=build_config)
+        cmd = env_mono.CommandNoCache(
+            targets, depend_cmd, build_api_solution, module_dir=os.getcwd(), solution_build_config=build_config
+        )
         env_mono.AlwaysBuild(cmd)
 
         # Make the Release build of the API solution depend on the Debug build.
diff --git a/modules/mono/build_scripts/gen_cs_glue_version.py b/modules/mono/build_scripts/gen_cs_glue_version.py
index 5d1056c2fc..98bbb4d9be 100644
--- a/modules/mono/build_scripts/gen_cs_glue_version.py
+++ b/modules/mono/build_scripts/gen_cs_glue_version.py
@@ -1,20 +1,20 @@
-
 def generate_header(solution_dir, version_header_dst):
     import os
+
     latest_mtime = 0
     for root, dirs, files in os.walk(solution_dir, topdown=True):
-        dirs[:] = [d for d in dirs if d not in ['Generated']] # Ignored generated files
-        files = [f for f in files if f.endswith('.cs')]
+        dirs[:] = [d for d in dirs if d not in ["Generated"]]  # Ignored generated files
+        files = [f for f in files if f.endswith(".cs")]
         for file in files:
             filepath = os.path.join(root, file)
             mtime = os.path.getmtime(filepath)
             latest_mtime = mtime if mtime > latest_mtime else latest_mtime
 
-    glue_version = int(latest_mtime) # The latest modified time will do for now
+    glue_version = int(latest_mtime)  # The latest modified time will do for now
 
-    with open(version_header_dst, 'w') as version_header:
-        version_header.write('/* THIS FILE IS GENERATED DO NOT EDIT */\n')
-        version_header.write('#ifndef CS_GLUE_VERSION_H\n')
-        version_header.write('#define CS_GLUE_VERSION_H\n\n')
-        version_header.write('#define CS_GLUE_VERSION UINT32_C(' + str(glue_version) + ')\n')
-        version_header.write('\n#endif // CS_GLUE_VERSION_H\n')
+    with open(version_header_dst, "w") as version_header:
+        version_header.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n")
+        version_header.write("#ifndef CS_GLUE_VERSION_H\n")
+        version_header.write("#define CS_GLUE_VERSION_H\n\n")
+        version_header.write("#define CS_GLUE_VERSION UINT32_C(" + str(glue_version) + ")\n")
+        version_header.write("\n#endif // CS_GLUE_VERSION_H\n")
diff --git a/modules/mono/build_scripts/godot_tools_build.py b/modules/mono/build_scripts/godot_tools_build.py
index 99341c631e..3bbbf29d3b 100644
--- a/modules/mono/build_scripts/godot_tools_build.py
+++ b/modules/mono/build_scripts/godot_tools_build.py
@@ -8,30 +8,29 @@ from SCons.Script import Dir
 def build_godot_tools(source, target, env):
     # source and target elements are of type SCons.Node.FS.File, hence why we convert them to str
 
-    module_dir = env['module_dir']
+    module_dir = env["module_dir"]
 
-    solution_path = os.path.join(module_dir, 'editor/GodotTools/GodotTools.sln')
-    build_config = 'Debug' if env['target'] == 'debug' else 'Release'
+    solution_path = os.path.join(module_dir, "editor/GodotTools/GodotTools.sln")
+    build_config = "Debug" if env["target"] == "debug" else "Release"
 
-    # Custom build target to make sure output is always copied to the data dir.
-    extra_build_args = ['/Target:Build;GodotTools:BuildAlwaysCopyToDataDir']
+    from .solution_builder import build_solution
 
-    from . solution_builder import build_solution, nuget_restore
-    nuget_restore(env, solution_path)
-    build_solution(env, solution_path, build_config, extra_build_args)
+    extra_msbuild_args = ["/p:GodotPlatform=" + env["platform"]]
+
+    build_solution(env, solution_path, build_config, extra_msbuild_args)
     # No need to copy targets. The GodotTools csproj takes care of copying them.
 
 
 def build(env_mono, api_sln_cmd):
-    assert env_mono['tools']
+    assert env_mono["tools"]
 
-    output_dir = Dir('#bin').abspath
-    editor_tools_dir = os.path.join(output_dir, 'GodotSharp', 'Tools')
+    output_dir = Dir("#bin").abspath
+    editor_tools_dir = os.path.join(output_dir, "GodotSharp", "Tools")
 
-    target_filenames = ['GodotTools.dll']
+    target_filenames = ["GodotTools.dll"]
 
-    if env_mono['target'] == 'debug':
-        target_filenames += ['GodotTools.pdb']
+    if env_mono["target"] == "debug":
+        target_filenames += ["GodotTools.pdb"]
 
     targets = [os.path.join(editor_tools_dir, filename) for filename in target_filenames]
 
diff --git a/modules/mono/build_scripts/make_android_mono_config.py b/modules/mono/build_scripts/make_android_mono_config.py
index 8cad204d7b..d276d7d886 100644
--- a/modules/mono/build_scripts/make_android_mono_config.py
+++ b/modules/mono/build_scripts/make_android_mono_config.py
@@ -1,30 +1,30 @@
-
 def generate_compressed_config(config_src, output_dir):
     import os.path
-    from compat import byte_to_str
 
     # Source file
-    with open(os.path.join(output_dir, 'android_mono_config.gen.cpp'), 'w') as cpp:
-        with open(config_src, 'rb') as f:
+    with open(os.path.join(output_dir, "android_mono_config.gen.cpp"), "w") as cpp:
+        with open(config_src, "rb") as f:
             buf = f.read()
             decompr_size = len(buf)
             import zlib
+
             buf = zlib.compress(buf)
             compr_size = len(buf)
 
-            bytes_seq_str = ''
+            bytes_seq_str = ""
             for i, buf_idx in enumerate(range(compr_size)):
                 if i > 0:
-                    bytes_seq_str += ', '
-                bytes_seq_str += byte_to_str(buf[buf_idx])
+                    bytes_seq_str += ", "
+                bytes_seq_str += str(buf[buf_idx])
 
-            cpp.write('''/* THIS FILE IS GENERATED DO NOT EDIT */
+            cpp.write(
+                """/* THIS FILE IS GENERATED DO NOT EDIT */
 #include "android_mono_config.h"
 
 #ifdef ANDROID_ENABLED
 
 #include "core/io/compression.h"
-#include "core/pool_vector.h"
+
 
 namespace {
 
@@ -36,9 +36,9 @@ static const unsigned char config_compressed_data[] = { %s };
 } // namespace
 
 String get_godot_android_mono_config() {
-	PoolVector<uint8_t> data;
+	Vector<uint8_t> data;
 	data.resize(config_uncompressed_size);
-	PoolVector<uint8_t>::Write w = data.write();
+	uint8_t* w = data.ptrw();
 	Compression::decompress(w.ptr(), config_uncompressed_size, config_compressed_data,
 			config_compressed_size, Compression::MODE_DEFLATE);
 	String s;
@@ -49,4 +49,6 @@ String get_godot_android_mono_config() {
 }
 
 #endif // ANDROID_ENABLED
-''' % (compr_size, decompr_size, bytes_seq_str))
+"""
+                % (compr_size, decompr_size, bytes_seq_str)
+            )
diff --git a/modules/mono/build_scripts/mono_configure.py b/modules/mono/build_scripts/mono_configure.py
index 033c467da9..6057004166 100644
--- a/modules/mono/build_scripts/mono_configure.py
+++ b/modules/mono/build_scripts/mono_configure.py
@@ -1,182 +1,233 @@
 import os
 import os.path
-import sys
 import subprocess
 
 from SCons.Script import Dir, Environment
 
-if os.name == 'nt':
+if os.name == "nt":
     from . import mono_reg_utils as monoreg
 
 
 android_arch_dirs = {
-    'armv7': 'armeabi-v7a',
-    'arm64v8': 'arm64-v8a',
-    'x86': 'x86',
-    'x86_64': 'x86_64'
+    "armv7": "armeabi-v7a",
+    "arm64v8": "arm64-v8a",
+    "x86": "x86",
+    "x86_64": "x86_64",
 }
 
 
 def get_android_out_dir(env):
-    return os.path.join(Dir('#platform/android/java/lib/libs').abspath,
-                        'release' if env['target'] == 'release' else 'debug',
-                        android_arch_dirs[env['android_arch']])
-
-
-def find_file_in_dir(directory, files, prefix='', extension=''):
-    if not extension.startswith('.'):
-        extension = '.' + extension
-    for curfile in files:
-        if os.path.isfile(os.path.join(directory, prefix + curfile + extension)):
-            return curfile
-    return ''
-
-
-def copy_file(src_dir, dst_dir, name):
+    return os.path.join(
+        Dir("#platform/android/java/lib/libs").abspath,
+        "release" if env["target"] == "release" else "debug",
+        android_arch_dirs[env["android_arch"]],
+    )
+
+
+def find_name_in_dir_files(directory, names, prefixes=[""], extensions=[""]):
+    for extension in extensions:
+        if extension and not extension.startswith("."):
+            extension = "." + extension
+        for prefix in prefixes:
+            for curname in names:
+                if os.path.isfile(os.path.join(directory, prefix + curname + extension)):
+                    return curname
+    return ""
+
+
+def find_file_in_dir(directory, names, prefixes=[""], extensions=[""]):
+    for extension in extensions:
+        if extension and not extension.startswith("."):
+            extension = "." + extension
+        for prefix in prefixes:
+            for curname in names:
+                filename = prefix + curname + extension
+                if os.path.isfile(os.path.join(directory, filename)):
+                    return filename
+    return ""
+
+
+def copy_file(src_dir, dst_dir, src_name, dst_name=""):
     from shutil import copy
 
-    src_path = os.path.join(Dir(src_dir).abspath, name)
+    src_path = os.path.join(Dir(src_dir).abspath, src_name)
     dst_dir = Dir(dst_dir).abspath
 
     if not os.path.isdir(dst_dir):
         os.makedirs(dst_dir)
 
-    copy(src_path, dst_dir)
+    if dst_name:
+        copy(src_path, os.path.join(dst_dir, dst_name))
+    else:
+        copy(src_path, dst_dir)
 
 
 def is_desktop(platform):
-    return platform in ['windows', 'osx', 'x11', 'server', 'uwp', 'haiku']
+    return platform in ["windows", "osx", "linuxbsd", "server", "uwp", "haiku"]
 
 
 def is_unix_like(platform):
-    return platform in ['osx', 'x11', 'server', 'android', 'haiku']
+    return platform in ["osx", "linuxbsd", "server", "android", "haiku", "iphone"]
 
 
 def module_supports_tools_on(platform):
-    return platform not in ['android', 'javascript']
+    return platform not in ["android", "javascript", "iphone"]
 
 
 def find_wasm_src_dir(mono_root):
     hint_dirs = [
-        os.path.join(mono_root, 'src'),
-        os.path.join(mono_root, '../src'),
+        os.path.join(mono_root, "src"),
+        os.path.join(mono_root, "../src"),
     ]
     for hint_dir in hint_dirs:
-        if os.path.isfile(os.path.join(hint_dir, 'driver.c')):
+        if os.path.isfile(os.path.join(hint_dir, "driver.c")):
             return hint_dir
-    return ''
+    return ""
 
 
 def configure(env, env_mono):
-    bits = env['bits']
-    is_android = env['platform'] == 'android'
-    is_javascript = env['platform'] == 'javascript'
+    bits = env["bits"]
+    is_android = env["platform"] == "android"
+    is_javascript = env["platform"] == "javascript"
+    is_ios = env["platform"] == "iphone"
+    is_ios_sim = is_ios and env["arch"] in ["x86", "x86_64"]
 
-    tools_enabled = env['tools']
-    mono_static = env['mono_static']
-    copy_mono_root = env['copy_mono_root']
+    tools_enabled = env["tools"]
+    mono_static = env["mono_static"]
+    copy_mono_root = env["copy_mono_root"]
 
-    mono_prefix = env['mono_prefix']
+    mono_prefix = env["mono_prefix"]
 
-    mono_lib_names = ['mono-2.0-sgen', 'monosgen-2.0']
+    mono_lib_names = ["mono-2.0-sgen", "monosgen-2.0"]
 
-    is_travis = os.environ.get('TRAVIS') == 'true'
+    is_travis = os.environ.get("TRAVIS") == "true"
 
     if is_travis:
         # Travis CI may have a Mono version lower than 5.12
-        env_mono.Append(CPPDEFINES=['NO_PENDING_EXCEPTIONS'])
+        env_mono.Append(CPPDEFINES=["NO_PENDING_EXCEPTIONS"])
 
-    if is_android and not env['android_arch'] in android_arch_dirs:
-        raise RuntimeError('This module does not support the specified \'android_arch\': ' + env['android_arch'])
+    if is_android and not env["android_arch"] in android_arch_dirs:
+        raise RuntimeError("This module does not support the specified 'android_arch': " + env["android_arch"])
 
-    if tools_enabled and not module_supports_tools_on(env['platform']):
+    if tools_enabled and not module_supports_tools_on(env["platform"]):
         # TODO:
         # Android: We have to add the data directory to the apk, concretely the Api and Tools folders.
-        raise RuntimeError('This module does not currently support building for this platform with tools enabled')
+        raise RuntimeError("This module does not currently support building for this platform with tools enabled")
 
     if is_android and mono_static:
-        # Android: When static linking and doing something that requires libmono-native, we get a dlopen error as libmono-native seems to depend on libmonosgen-2.0
-        raise RuntimeError('Statically linking Mono is not currently supported on this platform')
+        # FIXME: When static linking and doing something that requires libmono-native, we get a dlopen error as 'libmono-native'
+        # seems to depend on 'libmonosgen-2.0'. Could be fixed by re-directing to '__Internal' with a dllmap or in the dlopen hook.
+        raise RuntimeError("Statically linking Mono is not currently supported for this platform")
+
+    if not mono_static and (is_javascript or is_ios):
+        raise RuntimeError("Dynamically linking Mono is not currently supported for this platform")
+
+    if not mono_prefix and (os.getenv("MONO32_PREFIX") or os.getenv("MONO64_PREFIX")):
+        print(
+            "WARNING: The environment variables 'MONO32_PREFIX' and 'MONO64_PREFIX' are deprecated; use the"
+            " 'mono_prefix' SCons parameter instead"
+        )
+
+    # Although we don't support building with tools for any platform where we currently use static AOT,
+    # if these are supported in the future, we won't be using static AOT for them as that would be
+    # too restrictive for the editor. These builds would probably be made to only use the interpreter.
+    mono_aot_static = (is_ios and not is_ios_sim) and not env["tools"]
 
-    if is_javascript:
-        mono_static = True
+    # Static AOT is only supported on the root domain
+    mono_single_appdomain = mono_aot_static
 
-    if not mono_prefix and (os.getenv('MONO32_PREFIX') or os.getenv('MONO64_PREFIX')):
-        print("WARNING: The environment variables 'MONO32_PREFIX' and 'MONO64_PREFIX' are deprecated; use the 'mono_prefix' SCons parameter instead")
+    if mono_single_appdomain:
+        env_mono.Append(CPPDEFINES=["GD_MONO_SINGLE_APPDOMAIN"])
 
-    if env['platform'] == 'windows':
+    if (env["tools"] or env["target"] != "release") and not mono_single_appdomain:
+        env_mono.Append(CPPDEFINES=["GD_MONO_HOT_RELOAD"])
+
+    if env["platform"] == "windows":
         mono_root = mono_prefix
 
-        if not mono_root and os.name == 'nt':
+        if not mono_root and os.name == "nt":
             mono_root = monoreg.find_mono_root_dir(bits)
 
         if not mono_root:
-            raise RuntimeError("Mono installation directory not found; specify one manually with the 'mono_prefix' SCons parameter")
+            raise RuntimeError(
+                "Mono installation directory not found; specify one manually with the 'mono_prefix' SCons parameter"
+            )
 
-        print('Found Mono root directory: ' + mono_root)
+        print("Found Mono root directory: " + mono_root)
 
-        mono_lib_path = os.path.join(mono_root, 'lib')
+        mono_lib_path = os.path.join(mono_root, "lib")
 
         env.Append(LIBPATH=mono_lib_path)
-        env_mono.Prepend(CPPPATH=os.path.join(mono_root, 'include', 'mono-2.0'))
+        env_mono.Prepend(CPPPATH=os.path.join(mono_root, "include", "mono-2.0"))
+
+        lib_suffixes = [".lib"]
 
-        lib_suffix = Environment()['LIBSUFFIX']
+        if not env.msvc:
+            # MingW supports both '.a' and '.lib'
+            lib_suffixes.insert(0, ".a")
 
         if mono_static:
             if env.msvc:
-                mono_static_lib_name = 'libmono-static-sgen'
+                mono_static_lib_name = "libmono-static-sgen"
             else:
-                mono_static_lib_name = 'libmonosgen-2.0'
+                mono_static_lib_name = "libmonosgen-2.0"
 
-            if not os.path.isfile(os.path.join(mono_lib_path, mono_static_lib_name + lib_suffix)):
-                raise RuntimeError('Could not find static mono library in: ' + mono_lib_path)
+            mono_static_lib_file = find_file_in_dir(mono_lib_path, [mono_static_lib_name], extensions=lib_suffixes)
+
+            if not mono_static_lib_file:
+                raise RuntimeError("Could not find static mono library in: " + mono_lib_path)
 
             if env.msvc:
-                env.Append(LINKFLAGS=mono_static_lib_name + lib_suffix)
+                env.Append(LINKFLAGS=mono_static_lib_file)
 
-                env.Append(LINKFLAGS='Mincore' + lib_suffix)
-                env.Append(LINKFLAGS='msvcrt' + lib_suffix)
-                env.Append(LINKFLAGS='LIBCMT' + lib_suffix)
-                env.Append(LINKFLAGS='Psapi' + lib_suffix)
+                env.Append(LINKFLAGS="Mincore.lib")
+                env.Append(LINKFLAGS="msvcrt.lib")
+                env.Append(LINKFLAGS="LIBCMT.lib")
+                env.Append(LINKFLAGS="Psapi.lib")
             else:
-                env.Append(LINKFLAGS=os.path.join(mono_lib_path, mono_static_lib_name + lib_suffix))
+                mono_static_lib_file_path = os.path.join(mono_lib_path, mono_static_lib_file)
+                env.Append(LINKFLAGS=["-Wl,-whole-archive", mono_static_lib_file_path, "-Wl,-no-whole-archive"])
 
-                env.Append(LIBS=['psapi'])
-                env.Append(LIBS=['version'])
+                env.Append(LIBS=["psapi"])
+                env.Append(LIBS=["version"])
         else:
-            mono_lib_name = find_file_in_dir(mono_lib_path, mono_lib_names, extension=lib_suffix)
+            mono_lib_file = find_file_in_dir(mono_lib_path, mono_lib_names, extensions=lib_suffixes)
 
-            if not mono_lib_name:
-                raise RuntimeError('Could not find mono library in: ' + mono_lib_path)
+            if not mono_lib_file:
+                raise RuntimeError("Could not find mono library in: " + mono_lib_path)
 
             if env.msvc:
-                env.Append(LINKFLAGS=mono_lib_name + lib_suffix)
+                env.Append(LINKFLAGS=mono_lib_file)
             else:
-                env.Append(LIBS=[mono_lib_name])
+                mono_lib_file_path = os.path.join(mono_lib_path, mono_lib_file)
+                env.Append(LINKFLAGS=mono_lib_file_path)
 
-            mono_bin_path = os.path.join(mono_root, 'bin')
+            mono_bin_path = os.path.join(mono_root, "bin")
 
-            mono_dll_name = find_file_in_dir(mono_bin_path, mono_lib_names, extension='.dll')
+            mono_dll_file = find_file_in_dir(mono_bin_path, mono_lib_names, prefixes=["", "lib"], extensions=[".dll"])
 
-            if not mono_dll_name:
-                raise RuntimeError('Could not find mono shared library in: ' + mono_bin_path)
+            if not mono_dll_file:
+                raise RuntimeError("Could not find mono shared library in: " + mono_bin_path)
 
-            copy_file(mono_bin_path, '#bin', mono_dll_name + '.dll')
+            copy_file(mono_bin_path, "#bin", mono_dll_file)
     else:
-        is_apple = (sys.platform == 'darwin' or "osxcross" in env)
+        is_apple = env["platform"] in ["osx", "iphone"]
+        is_macos = is_apple and not is_ios
 
-        sharedlib_ext = '.dylib' if is_apple else '.so'
+        sharedlib_ext = ".dylib" if is_apple else ".so"
 
         mono_root = mono_prefix
-        mono_lib_path = ''
-        mono_so_name = ''
+        mono_lib_path = ""
+        mono_so_file = ""
 
-        if not mono_root and (is_android or is_javascript):
-            raise RuntimeError("Mono installation directory not found; specify one manually with the 'mono_prefix' SCons parameter")
+        if not mono_root and (is_android or is_javascript or is_ios):
+            raise RuntimeError(
+                "Mono installation directory not found; specify one manually with the 'mono_prefix' SCons parameter"
+            )
 
-        if not mono_root and is_apple:
+        if not mono_root and is_macos:
             # Try with some known directories under OSX
-            hint_dirs = ['/Library/Frameworks/Mono.framework/Versions/Current', '/usr/local/var/homebrew/linked/mono']
+            hint_dirs = ["/Library/Frameworks/Mono.framework/Versions/Current", "/usr/local/var/homebrew/linked/mono"]
             for hint_dir in hint_dirs:
                 if os.path.isdir(hint_dir):
                     mono_root = hint_dir
@@ -187,153 +238,191 @@ def configure(env, env_mono):
         if not mono_root and mono_static:
             mono_root = pkgconfig_try_find_mono_root(mono_lib_names, sharedlib_ext)
             if not mono_root:
-                raise RuntimeError("Building with mono_static=yes, but failed to find the mono prefix with pkg-config; " + \
-                    "specify one manually with the 'mono_prefix' SCons parameter")
+                raise RuntimeError(
+                    "Building with mono_static=yes, but failed to find the mono prefix with pkg-config; "
+                    + "specify one manually with the 'mono_prefix' SCons parameter"
+                )
+
+        if is_ios and not is_ios_sim:
+            env_mono.Append(CPPDEFINES=["IOS_DEVICE"])
 
         if mono_root:
-            print('Found Mono root directory: ' + mono_root)
+            print("Found Mono root directory: " + mono_root)
 
-            mono_lib_path = os.path.join(mono_root, 'lib')
+            mono_lib_path = os.path.join(mono_root, "lib")
 
             env.Append(LIBPATH=[mono_lib_path])
-            env_mono.Prepend(CPPPATH=os.path.join(mono_root, 'include', 'mono-2.0'))
+            env_mono.Prepend(CPPPATH=os.path.join(mono_root, "include", "mono-2.0"))
 
-            mono_lib = find_file_in_dir(mono_lib_path, mono_lib_names, prefix='lib', extension='.a')
+            mono_lib = find_name_in_dir_files(mono_lib_path, mono_lib_names, prefixes=["lib"], extensions=[".a"])
 
             if not mono_lib:
-                raise RuntimeError('Could not find mono library in: ' + mono_lib_path)
+                raise RuntimeError("Could not find mono library in: " + mono_lib_path)
 
-            env_mono.Append(CPPDEFINES=['_REENTRANT'])
+            env_mono.Append(CPPDEFINES=["_REENTRANT"])
 
             if mono_static:
-                env.Append(LINKFLAGS=['-rdynamic'])
+                env.Append(LINKFLAGS=["-rdynamic"])
 
-                mono_lib_file = os.path.join(mono_lib_path, 'lib' + mono_lib + '.a')
+                mono_lib_file = os.path.join(mono_lib_path, "lib" + mono_lib + ".a")
 
                 if is_apple:
-                    env.Append(LINKFLAGS=['-Wl,-force_load,' + mono_lib_file])
+                    if is_macos:
+                        env.Append(LINKFLAGS=["-Wl,-force_load," + mono_lib_file])
+                    else:
+                        arch = env["arch"]
+
+                        def copy_mono_lib(libname_wo_ext):
+                            copy_file(
+                                mono_lib_path, "#bin", libname_wo_ext + ".a", "%s.iphone.%s.a" % (libname_wo_ext, arch)
+                            )
+
+                        # Copy Mono libraries to the output folder. These are meant to be bundled with
+                        # the export templates and added to the Xcode project when exporting a game.
+                        copy_mono_lib("lib" + mono_lib)
+                        copy_mono_lib("libmono-native")
+                        copy_mono_lib("libmono-profiler-log")
+
+                        if not is_ios_sim:
+                            copy_mono_lib("libmono-ee-interp")
+                            copy_mono_lib("libmono-icall-table")
+                            copy_mono_lib("libmono-ilgen")
                 else:
-                    assert is_desktop(env['platform']) or is_android or is_javascript
-                    env.Append(LINKFLAGS=['-Wl,-whole-archive', mono_lib_file, '-Wl,-no-whole-archive'])
+                    assert is_desktop(env["platform"]) or is_android or is_javascript
+                    env.Append(LINKFLAGS=["-Wl,-whole-archive", mono_lib_file, "-Wl,-no-whole-archive"])
 
                 if is_javascript:
-                    env.Append(LIBS=['mono-icall-table', 'mono-native', 'mono-ilgen', 'mono-ee-interp'])
+                    env.Append(LIBS=["mono-icall-table", "mono-native", "mono-ilgen", "mono-ee-interp"])
 
-                    wasm_src_dir = os.path.join(mono_root, 'src')
+                    wasm_src_dir = os.path.join(mono_root, "src")
                     if not os.path.isdir(wasm_src_dir):
-                        raise RuntimeError('Could not find mono wasm src directory')
+                        raise RuntimeError("Could not find mono wasm src directory")
 
                     # Ideally this should be defined only for 'driver.c', but I can't fight scons for another 2 hours
-                    env_mono.Append(CPPDEFINES=['CORE_BINDINGS'])
-
-                    env_mono.add_source_files(env.modules_sources, [
-                        os.path.join(wasm_src_dir, 'driver.c'),
-                        os.path.join(wasm_src_dir, 'zlib-helper.c'),
-                        os.path.join(wasm_src_dir, 'corebindings.c')
-                    ])
-
-                    env.Append(LINKFLAGS=[
-                        '--js-library', os.path.join(wasm_src_dir, 'library_mono.js'),
-                        '--js-library', os.path.join(wasm_src_dir, 'binding_support.js'),
-                        '--js-library', os.path.join(wasm_src_dir, 'dotnet_support.js')
-                    ])
+                    env_mono.Append(CPPDEFINES=["CORE_BINDINGS"])
+
+                    env_mono.add_source_files(
+                        env.modules_sources,
+                        [
+                            os.path.join(wasm_src_dir, "driver.c"),
+                            os.path.join(wasm_src_dir, "zlib-helper.c"),
+                            os.path.join(wasm_src_dir, "corebindings.c"),
+                        ],
+                    )
+
+                    env.Append(
+                        LINKFLAGS=[
+                            "--js-library",
+                            os.path.join(wasm_src_dir, "library_mono.js"),
+                            "--js-library",
+                            os.path.join(wasm_src_dir, "binding_support.js"),
+                            "--js-library",
+                            os.path.join(wasm_src_dir, "dotnet_support.js"),
+                        ]
+                    )
             else:
                 env.Append(LIBS=[mono_lib])
 
-            if is_apple:
-                env.Append(LIBS=['iconv', 'pthread'])
+            if is_macos:
+                env.Append(LIBS=["iconv", "pthread"])
             elif is_android:
-                pass # Nothing
+                pass  # Nothing
+            elif is_ios:
+                pass  # Nothing, linking is delegated to the exported Xcode project
             elif is_javascript:
-                env.Append(LIBS=['m', 'rt', 'dl', 'pthread'])
+                env.Append(LIBS=["m", "rt", "dl", "pthread"])
             else:
-                env.Append(LIBS=['m', 'rt', 'dl', 'pthread'])
+                env.Append(LIBS=["m", "rt", "dl", "pthread"])
 
             if not mono_static:
-                mono_so_name = find_file_in_dir(mono_lib_path, mono_lib_names, prefix='lib', extension=sharedlib_ext)
+                mono_so_file = find_file_in_dir(
+                    mono_lib_path, mono_lib_names, prefixes=["lib"], extensions=[sharedlib_ext]
+                )
 
-                if not mono_so_name:
-                    raise RuntimeError('Could not find mono shared library in: ' + mono_lib_path)
-
-                copy_file(mono_lib_path, '#bin', 'lib' + mono_so_name + sharedlib_ext)
+                if not mono_so_file:
+                    raise RuntimeError("Could not find mono shared library in: " + mono_lib_path)
         else:
             assert not mono_static
 
             # TODO: Add option to force using pkg-config
-            print('Mono root directory not found. Using pkg-config instead')
+            print("Mono root directory not found. Using pkg-config instead")
 
-            env.ParseConfig('pkg-config monosgen-2 --libs')
-            env_mono.ParseConfig('pkg-config monosgen-2 --cflags')
+            env.ParseConfig("pkg-config monosgen-2 --libs")
+            env_mono.ParseConfig("pkg-config monosgen-2 --cflags")
 
             tmpenv = Environment()
-            tmpenv.AppendENVPath('PKG_CONFIG_PATH', os.getenv('PKG_CONFIG_PATH'))
-            tmpenv.ParseConfig('pkg-config monosgen-2 --libs-only-L')
+            tmpenv.AppendENVPath("PKG_CONFIG_PATH", os.getenv("PKG_CONFIG_PATH"))
+            tmpenv.ParseConfig("pkg-config monosgen-2 --libs-only-L")
 
-            for hint_dir in tmpenv['LIBPATH']:
-                name_found = find_file_in_dir(hint_dir, mono_lib_names, prefix='lib', extension=sharedlib_ext)
-                if name_found:
+            for hint_dir in tmpenv["LIBPATH"]:
+                file_found = find_file_in_dir(hint_dir, mono_lib_names, prefixes=["lib"], extensions=[sharedlib_ext])
+                if file_found:
                     mono_lib_path = hint_dir
-                    mono_so_name = name_found
+                    mono_so_file = file_found
                     break
 
-            if not mono_so_name:
-                raise RuntimeError('Could not find mono shared library in: ' + str(tmpenv['LIBPATH']))
+            if not mono_so_file:
+                raise RuntimeError("Could not find mono shared library in: " + str(tmpenv["LIBPATH"]))
 
         if not mono_static:
-            libs_output_dir = get_android_out_dir(env) if is_android else '#bin'
-            copy_file(mono_lib_path, libs_output_dir, 'lib' + mono_so_name + sharedlib_ext)
+            libs_output_dir = get_android_out_dir(env) if is_android else "#bin"
+            copy_file(mono_lib_path, libs_output_dir, mono_so_file)
 
     if not tools_enabled:
-        if is_desktop(env['platform']):
+        if is_desktop(env["platform"]):
             if not mono_root:
-                mono_root = subprocess.check_output(['pkg-config', 'mono-2', '--variable=prefix']).decode('utf8').strip()
+                mono_root = (
+                    subprocess.check_output(["pkg-config", "mono-2", "--variable=prefix"]).decode("utf8").strip()
+                )
 
             make_template_dir(env, mono_root)
         elif is_android:
             # Compress Android Mono Config
             from . import make_android_mono_config
+
             module_dir = os.getcwd()
-            config_file_path = os.path.join(module_dir, 'build_scripts', 'mono_android_config.xml')
-            make_android_mono_config.generate_compressed_config(config_file_path, 'mono_gd/')
+            config_file_path = os.path.join(module_dir, "build_scripts", "mono_android_config.xml")
+            make_android_mono_config.generate_compressed_config(config_file_path, "mono_gd/")
 
             # Copy the required shared libraries
             copy_mono_shared_libs(env, mono_root, None)
         elif is_javascript:
-            pass # No data directory for this platform
+            pass  # No data directory for this platform
+        elif is_ios:
+            pass  # No data directory for this platform
 
     if copy_mono_root:
         if not mono_root:
-            mono_root = subprocess.check_output(['pkg-config', 'mono-2', '--variable=prefix']).decode('utf8').strip()
+            mono_root = subprocess.check_output(["pkg-config", "mono-2", "--variable=prefix"]).decode("utf8").strip()
 
         if tools_enabled:
-           copy_mono_root_files(env, mono_root)
-        else:
-            print("Ignoring option: 'copy_mono_root'; only available for builds with 'tools' enabled.")
+            # Only supported for editor builds.
+            copy_mono_root_files(env, mono_root)
 
 
 def make_template_dir(env, mono_root):
     from shutil import rmtree
 
-    platform = env['platform']
-    target = env['target']
+    platform = env["platform"]
+    target = env["target"]
 
-    template_dir_name = ''
+    template_dir_name = ""
 
     assert is_desktop(platform)
 
-    template_dir_name = 'data.mono.%s.%s.%s' % (platform, env['bits'], target)
+    template_dir_name = "data.mono.%s.%s.%s" % (platform, env["bits"], target)
 
-    output_dir = Dir('#bin').abspath
+    output_dir = Dir("#bin").abspath
     template_dir = os.path.join(output_dir, template_dir_name)
 
-    template_mono_root_dir = os.path.join(template_dir, 'Mono')
+    template_mono_root_dir = os.path.join(template_dir, "Mono")
 
     if os.path.isdir(template_mono_root_dir):
-        rmtree(template_mono_root_dir) # Clean first
+        rmtree(template_mono_root_dir)  # Clean first
 
     # Copy etc/mono/
 
-    template_mono_config_dir = os.path.join(template_mono_root_dir, 'etc', 'mono')
+    template_mono_config_dir = os.path.join(template_mono_root_dir, "etc", "mono")
     copy_mono_etc_dir(mono_root, template_mono_config_dir, platform)
 
     # Copy the required shared libraries
@@ -347,18 +436,18 @@ def copy_mono_root_files(env, mono_root):
     from shutil import rmtree
 
     if not mono_root:
-        raise RuntimeError('Mono installation directory not found')
+        raise RuntimeError("Mono installation directory not found")
 
-    output_dir = Dir('#bin').abspath
-    editor_mono_root_dir = os.path.join(output_dir, 'GodotSharp', 'Mono')
+    output_dir = Dir("#bin").abspath
+    editor_mono_root_dir = os.path.join(output_dir, "GodotSharp", "Mono")
 
     if os.path.isdir(editor_mono_root_dir):
-        rmtree(editor_mono_root_dir) # Clean first
+        rmtree(editor_mono_root_dir)  # Clean first
 
     # Copy etc/mono/
 
-    editor_mono_config_dir = os.path.join(editor_mono_root_dir, 'etc', 'mono')
-    copy_mono_etc_dir(mono_root, editor_mono_config_dir, env['platform'])
+    editor_mono_config_dir = os.path.join(editor_mono_root_dir, "etc", "mono")
+    copy_mono_etc_dir(mono_root, editor_mono_config_dir, env["platform"])
 
     # Copy the required shared libraries
 
@@ -366,20 +455,20 @@ def copy_mono_root_files(env, mono_root):
 
     # Copy framework assemblies
 
-    mono_framework_dir = os.path.join(mono_root, 'lib', 'mono', '4.5')
-    mono_framework_facades_dir = os.path.join(mono_framework_dir, 'Facades')
+    mono_framework_dir = os.path.join(mono_root, "lib", "mono", "4.5")
+    mono_framework_facades_dir = os.path.join(mono_framework_dir, "Facades")
 
-    editor_mono_framework_dir = os.path.join(editor_mono_root_dir, 'lib', 'mono', '4.5')
-    editor_mono_framework_facades_dir = os.path.join(editor_mono_framework_dir, 'Facades')
+    editor_mono_framework_dir = os.path.join(editor_mono_root_dir, "lib", "mono", "4.5")
+    editor_mono_framework_facades_dir = os.path.join(editor_mono_framework_dir, "Facades")
 
     if not os.path.isdir(editor_mono_framework_dir):
         os.makedirs(editor_mono_framework_dir)
     if not os.path.isdir(editor_mono_framework_facades_dir):
         os.makedirs(editor_mono_framework_facades_dir)
 
-    for assembly in glob(os.path.join(mono_framework_dir, '*.dll')):
+    for assembly in glob(os.path.join(mono_framework_dir, "*.dll")):
         copy(assembly, editor_mono_framework_dir)
-    for assembly in glob(os.path.join(mono_framework_facades_dir, '*.dll')):
+    for assembly in glob(os.path.join(mono_framework_facades_dir, "*.dll")):
         copy(assembly, editor_mono_framework_facades_dir)
 
 
@@ -391,28 +480,28 @@ def copy_mono_etc_dir(mono_root, target_mono_config_dir, platform):
     if not os.path.isdir(target_mono_config_dir):
         os.makedirs(target_mono_config_dir)
 
-    mono_etc_dir = os.path.join(mono_root, 'etc', 'mono')
+    mono_etc_dir = os.path.join(mono_root, "etc", "mono")
     if not os.path.isdir(mono_etc_dir):
-        mono_etc_dir = ''
+        mono_etc_dir = ""
         etc_hint_dirs = []
-        if platform != 'windows':
-            etc_hint_dirs += ['/etc/mono', '/usr/local/etc/mono']
-        if 'MONO_CFG_DIR' in os.environ:
-            etc_hint_dirs += [os.path.join(os.environ['MONO_CFG_DIR'], 'mono')]
+        if platform != "windows":
+            etc_hint_dirs += ["/etc/mono", "/usr/local/etc/mono"]
+        if "MONO_CFG_DIR" in os.environ:
+            etc_hint_dirs += [os.path.join(os.environ["MONO_CFG_DIR"], "mono")]
         for etc_hint_dir in etc_hint_dirs:
             if os.path.isdir(etc_hint_dir):
                 mono_etc_dir = etc_hint_dir
                 break
         if not mono_etc_dir:
-            raise RuntimeError('Mono installation etc directory not found')
+            raise RuntimeError("Mono installation etc directory not found")
 
-    copy_tree(os.path.join(mono_etc_dir, '2.0'), os.path.join(target_mono_config_dir, '2.0'))
-    copy_tree(os.path.join(mono_etc_dir, '4.0'), os.path.join(target_mono_config_dir, '4.0'))
-    copy_tree(os.path.join(mono_etc_dir, '4.5'), os.path.join(target_mono_config_dir, '4.5'))
-    if os.path.isdir(os.path.join(mono_etc_dir, 'mconfig')):
-        copy_tree(os.path.join(mono_etc_dir, 'mconfig'), os.path.join(target_mono_config_dir, 'mconfig'))
+    copy_tree(os.path.join(mono_etc_dir, "2.0"), os.path.join(target_mono_config_dir, "2.0"))
+    copy_tree(os.path.join(mono_etc_dir, "4.0"), os.path.join(target_mono_config_dir, "4.0"))
+    copy_tree(os.path.join(mono_etc_dir, "4.5"), os.path.join(target_mono_config_dir, "4.5"))
+    if os.path.isdir(os.path.join(mono_etc_dir, "mconfig")):
+        copy_tree(os.path.join(mono_etc_dir, "mconfig"), os.path.join(target_mono_config_dir, "mconfig"))
 
-    for file in glob(os.path.join(mono_etc_dir, '*')):
+    for file in glob(os.path.join(mono_etc_dir, "*")):
         if os.path.isfile(file):
             copy(file, target_mono_config_dir)
 
@@ -424,48 +513,66 @@ def copy_mono_shared_libs(env, mono_root, target_mono_root_dir):
         if os.path.isfile(src):
             copy(src, dst)
 
-    platform = env['platform']
+    platform = env["platform"]
 
-    if platform == 'windows':
-        src_mono_bin_dir = os.path.join(mono_root, 'bin')
-        target_mono_bin_dir = os.path.join(target_mono_root_dir, 'bin')
+    if platform == "windows":
+        src_mono_bin_dir = os.path.join(mono_root, "bin")
+        target_mono_bin_dir = os.path.join(target_mono_root_dir, "bin")
 
         if not os.path.isdir(target_mono_bin_dir):
             os.makedirs(target_mono_bin_dir)
 
-        mono_posix_helper_name = find_file_in_dir(src_mono_bin_dir, ['MonoPosixHelper', 'libMonoPosixHelper'], extension='.dll')
-        copy(os.path.join(src_mono_bin_dir, mono_posix_helper_name + '.dll'), os.path.join(target_mono_bin_dir, 'MonoPosixHelper.dll'))
+        mono_posix_helper_file = find_file_in_dir(
+            src_mono_bin_dir, ["MonoPosixHelper"], prefixes=["", "lib"], extensions=[".dll"]
+        )
+        copy(
+            os.path.join(src_mono_bin_dir, mono_posix_helper_file),
+            os.path.join(target_mono_bin_dir, "MonoPosixHelper.dll"),
+        )
 
         # For newer versions
-        btls_dll_path = os.path.join(src_mono_bin_dir, 'libmono-btls-shared.dll')
+        btls_dll_path = os.path.join(src_mono_bin_dir, "libmono-btls-shared.dll")
         if os.path.isfile(btls_dll_path):
             copy(btls_dll_path, target_mono_bin_dir)
     else:
-        target_mono_lib_dir = get_android_out_dir(env) if platform == 'android' else os.path.join(target_mono_root_dir, 'lib')
+        target_mono_lib_dir = (
+            get_android_out_dir(env) if platform == "android" else os.path.join(target_mono_root_dir, "lib")
+        )
 
         if not os.path.isdir(target_mono_lib_dir):
             os.makedirs(target_mono_lib_dir)
 
         lib_file_names = []
-        if platform == 'osx':
-            lib_file_names = [lib_name + '.dylib' for lib_name in [
-                'libmono-btls-shared', 'libmono-native-compat', 'libMonoPosixHelper'
-            ]]
+        if platform == "osx":
+            lib_file_names = [
+                lib_name + ".dylib"
+                for lib_name in ["libmono-btls-shared", "libmono-native-compat", "libMonoPosixHelper"]
+            ]
         elif is_unix_like(platform):
-            lib_file_names = [lib_name + '.so' for lib_name in [
-                'libmono-btls-shared', 'libmono-ee-interp', 'libmono-native', 'libMonoPosixHelper',
-                'libmono-profiler-aot', 'libmono-profiler-coverage', 'libmono-profiler-log', 'libMonoSupportW'
-            ]]
+            lib_file_names = [
+                lib_name + ".so"
+                for lib_name in [
+                    "libmono-btls-shared",
+                    "libmono-ee-interp",
+                    "libmono-native",
+                    "libMonoPosixHelper",
+                    "libmono-profiler-aot",
+                    "libmono-profiler-coverage",
+                    "libmono-profiler-log",
+                    "libMonoSupportW",
+                ]
+            ]
 
         for lib_file_name in lib_file_names:
-            copy_if_exists(os.path.join(mono_root, 'lib', lib_file_name), target_mono_lib_dir)
+            copy_if_exists(os.path.join(mono_root, "lib", lib_file_name), target_mono_lib_dir)
+
 
 def pkgconfig_try_find_mono_root(mono_lib_names, sharedlib_ext):
     tmpenv = Environment()
-    tmpenv.AppendENVPath('PKG_CONFIG_PATH', os.getenv('PKG_CONFIG_PATH'))
-    tmpenv.ParseConfig('pkg-config monosgen-2 --libs-only-L')
-    for hint_dir in tmpenv['LIBPATH']:
-        name_found = find_file_in_dir(hint_dir, mono_lib_names, prefix='lib', extension=sharedlib_ext)
-        if name_found and os.path.isdir(os.path.join(hint_dir, '..', 'include', 'mono-2.0')):
-            return os.path.join(hint_dir, '..')
-    return ''
+    tmpenv.AppendENVPath("PKG_CONFIG_PATH", os.getenv("PKG_CONFIG_PATH"))
+    tmpenv.ParseConfig("pkg-config monosgen-2 --libs-only-L")
+    for hint_dir in tmpenv["LIBPATH"]:
+        name_found = find_name_in_dir_files(hint_dir, mono_lib_names, prefixes=["lib"], extensions=[sharedlib_ext])
+        if name_found and os.path.isdir(os.path.join(hint_dir, "..", "include", "mono-2.0")):
+            return os.path.join(hint_dir, "..")
+    return ""
diff --git a/modules/mono/build_scripts/mono_reg_utils.py b/modules/mono/build_scripts/mono_reg_utils.py
index b2c48f0a61..0ec7e2f433 100644
--- a/modules/mono/build_scripts/mono_reg_utils.py
+++ b/modules/mono/build_scripts/mono_reg_utils.py
@@ -1,21 +1,16 @@
 import os
 import platform
 
-from compat import decode_utf8
-
-if os.name == 'nt':
+if os.name == "nt":
     import sys
-    if sys.version_info < (3,):
-        import _winreg as winreg
-    else:
-        import winreg
+    import winreg
 
 
 def _reg_open_key(key, subkey):
     try:
         return winreg.OpenKey(key, subkey)
-    except (WindowsError, OSError):
-        if platform.architecture()[0] == '32bit':
+    except OSError:
+        if platform.architecture()[0] == "32bit":
             bitness_sam = winreg.KEY_WOW64_64KEY
         else:
             bitness_sam = winreg.KEY_WOW64_32KEY
@@ -25,12 +20,12 @@ def _reg_open_key(key, subkey):
 def _reg_open_key_bits(key, subkey, bits):
     sam = winreg.KEY_READ
 
-    if platform.architecture()[0] == '32bit':
-        if bits == '64':
+    if platform.architecture()[0] == "32bit":
+        if bits == "64":
             # Force 32bit process to search in 64bit registry
             sam |= winreg.KEY_WOW64_64KEY
     else:
-        if bits == '32':
+        if bits == "32":
             # Force 64bit process to search in 32bit registry
             sam |= winreg.KEY_WOW64_32KEY
 
@@ -40,79 +35,79 @@ def _reg_open_key_bits(key, subkey, bits):
 def _find_mono_in_reg(subkey, bits):
     try:
         with _reg_open_key_bits(winreg.HKEY_LOCAL_MACHINE, subkey, bits) as hKey:
-            value = winreg.QueryValueEx(hKey, 'SdkInstallRoot')[0]
+            value = winreg.QueryValueEx(hKey, "SdkInstallRoot")[0]
             return value
-    except (WindowsError, OSError):
+    except OSError:
         return None
 
 
 def _find_mono_in_reg_old(subkey, bits):
     try:
         with _reg_open_key_bits(winreg.HKEY_LOCAL_MACHINE, subkey, bits) as hKey:
-            default_clr = winreg.QueryValueEx(hKey, 'DefaultCLR')[0]
+            default_clr = winreg.QueryValueEx(hKey, "DefaultCLR")[0]
             if default_clr:
-                return _find_mono_in_reg(subkey + '\\' + default_clr, bits)
+                return _find_mono_in_reg(subkey + "\\" + default_clr, bits)
             return None
-    except (WindowsError, EnvironmentError):
+    except OSError:
         return None
 
 
 def find_mono_root_dir(bits):
-    root_dir = _find_mono_in_reg(r'SOFTWARE\Mono', bits)
+    root_dir = _find_mono_in_reg(r"SOFTWARE\Mono", bits)
     if root_dir is not None:
         return str(root_dir)
-    root_dir = _find_mono_in_reg_old(r'SOFTWARE\Novell\Mono', bits)
+    root_dir = _find_mono_in_reg_old(r"SOFTWARE\Novell\Mono", bits)
     if root_dir is not None:
         return str(root_dir)
-    return ''
+    return ""
 
 
 def find_msbuild_tools_path_reg():
     import subprocess
 
-    vswhere = os.getenv('PROGRAMFILES(X86)')
+    vswhere = os.getenv("PROGRAMFILES(X86)")
     if not vswhere:
-        vswhere = os.getenv('PROGRAMFILES')
-    vswhere += r'\Microsoft Visual Studio\Installer\vswhere.exe'
+        vswhere = os.getenv("PROGRAMFILES")
+    vswhere += r"\Microsoft Visual Studio\Installer\vswhere.exe"
 
-    vswhere_args = ['-latest', '-products', '*', '-requires', 'Microsoft.Component.MSBuild']
+    vswhere_args = ["-latest", "-products", "*", "-requires", "Microsoft.Component.MSBuild"]
 
     try:
         lines = subprocess.check_output([vswhere] + vswhere_args).splitlines()
 
         for line in lines:
-            parts = decode_utf8(line).split(':', 1)
+            parts = line.decode("utf-8").split(":", 1)
 
-            if len(parts) < 2 or parts[0] != 'installationPath':
+            if len(parts) < 2 or parts[0] != "installationPath":
                 continue
 
             val = parts[1].strip()
 
             if not val:
-                raise ValueError('Value of `installationPath` entry is empty')
+                raise ValueError("Value of `installationPath` entry is empty")
 
             # Since VS2019, the directory is simply named "Current"
-            msbuild_dir = os.path.join(val, 'MSBuild\\Current\\Bin')
+            msbuild_dir = os.path.join(val, "MSBuild\\Current\\Bin")
             if os.path.isdir(msbuild_dir):
                 return msbuild_dir
 
             # Directory name "15.0" is used in VS 2017
-            return os.path.join(val, 'MSBuild\\15.0\\Bin')
+            return os.path.join(val, "MSBuild\\15.0\\Bin")
 
-        raise ValueError('Cannot find `installationPath` entry')
+        raise ValueError("Cannot find `installationPath` entry")
     except ValueError as e:
-        print('Error reading output from vswhere: ' + e.message)
-    except WindowsError:
-        pass # Fine, vswhere not found
+        print("Error reading output from vswhere: " + e.message)
+    except OSError:
+        pass  # Fine, vswhere not found
     except (subprocess.CalledProcessError, OSError):
         pass
 
     # Try to find 14.0 in the Registry
 
     try:
-        subkey = r'SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0'
+        subkey = r"SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0"
         with _reg_open_key(winreg.HKEY_LOCAL_MACHINE, subkey) as hKey:
-            value = winreg.QueryValueEx(hKey, 'MSBuildToolsPath')[0]
+            value = winreg.QueryValueEx(hKey, "MSBuildToolsPath")[0]
             return value
-    except (WindowsError, OSError):
-        return ''
+    except OSError:
+        return ""
diff --git a/modules/mono/build_scripts/solution_builder.py b/modules/mono/build_scripts/solution_builder.py
index d1529a64d2..6a621c3c8b 100644
--- a/modules/mono/build_scripts/solution_builder.py
+++ b/modules/mono/build_scripts/solution_builder.py
@@ -1,129 +1,81 @@
-
 import os
 
 
 verbose = False
 
 
-def find_nuget_unix():
-    import os
-
-    if 'NUGET_PATH' in os.environ:
-        hint_path = os.environ['NUGET_PATH']
-        if os.path.isfile(hint_path) and os.access(hint_path, os.X_OK):
-            return hint_path
-        hint_path = os.path.join(hint_path, 'nuget')
-        if os.path.isfile(hint_path) and os.access(hint_path, os.X_OK):
-            return hint_path
-
+def find_dotnet_cli():
     import os.path
-    import sys
-
-    hint_dirs = ['/opt/novell/mono/bin']
-    if sys.platform == 'darwin':
-        hint_dirs = ['/Library/Frameworks/Mono.framework/Versions/Current/bin', '/usr/local/var/homebrew/linked/mono/bin'] + hint_dirs
-
-    for hint_dir in hint_dirs:
-        hint_path = os.path.join(hint_dir, 'nuget')
-        if os.path.isfile(hint_path):
-            return hint_path
-        elif os.path.isfile(hint_path + '.exe'):
-            return hint_path + '.exe'
-
-    for hint_dir in os.environ['PATH'].split(os.pathsep):
-        hint_dir = hint_dir.strip('"')
-        hint_path = os.path.join(hint_dir, 'nuget')
-        if os.path.isfile(hint_path) and os.access(hint_path, os.X_OK):
-            return hint_path
-        if os.path.isfile(hint_path + '.exe') and os.access(hint_path + '.exe', os.X_OK):
-            return hint_path + '.exe'
-
-    return None
-
-
-def find_nuget_windows(env):
-    import os
-
-    if 'NUGET_PATH' in os.environ:
-        hint_path = os.environ['NUGET_PATH']
-        if os.path.isfile(hint_path) and os.access(hint_path, os.X_OK):
-            return hint_path
-        hint_path = os.path.join(hint_path, 'nuget.exe')
-        if os.path.isfile(hint_path) and os.access(hint_path, os.X_OK):
-            return hint_path
-
-    from . mono_reg_utils import find_mono_root_dir
-
-    mono_root = env['mono_prefix'] or find_mono_root_dir(env['bits'])
-
-    if mono_root:
-        mono_bin_dir = os.path.join(mono_root, 'bin')
-        nuget_mono = os.path.join(mono_bin_dir, 'nuget.bat')
-
-        if os.path.isfile(nuget_mono):
-            return nuget_mono
 
-    # Standalone NuGet
-
-    for hint_dir in os.environ['PATH'].split(os.pathsep):
-        hint_dir = hint_dir.strip('"')
-        hint_path = os.path.join(hint_dir, 'nuget.exe')
-        if os.path.isfile(hint_path) and os.access(hint_path, os.X_OK):
-            return hint_path
-
-    return None
+    if os.name == "nt":
+        for hint_dir in os.environ["PATH"].split(os.pathsep):
+            hint_dir = hint_dir.strip('"')
+            hint_path = os.path.join(hint_dir, "dotnet")
+            if os.path.isfile(hint_path) and os.access(hint_path, os.X_OK):
+                return hint_path
+            if os.path.isfile(hint_path + ".exe") and os.access(hint_path + ".exe", os.X_OK):
+                return hint_path + ".exe"
+    else:
+        for hint_dir in os.environ["PATH"].split(os.pathsep):
+            hint_dir = hint_dir.strip('"')
+            hint_path = os.path.join(hint_dir, "dotnet")
+            if os.path.isfile(hint_path) and os.access(hint_path, os.X_OK):
+                return hint_path
 
 
-def find_msbuild_unix(filename):
+def find_msbuild_unix():
     import os.path
     import sys
 
-    hint_dirs = ['/opt/novell/mono/bin']
-    if sys.platform == 'darwin':
-        hint_dirs = ['/Library/Frameworks/Mono.framework/Versions/Current/bin', '/usr/local/var/homebrew/linked/mono/bin'] + hint_dirs
+    hint_dirs = []
+    if sys.platform == "darwin":
+        hint_dirs[:0] = [
+            "/Library/Frameworks/Mono.framework/Versions/Current/bin",
+            "/usr/local/var/homebrew/linked/mono/bin",
+        ]
 
     for hint_dir in hint_dirs:
-        hint_path = os.path.join(hint_dir, filename)
+        hint_path = os.path.join(hint_dir, "msbuild")
         if os.path.isfile(hint_path):
             return hint_path
-        elif os.path.isfile(hint_path + '.exe'):
-            return hint_path + '.exe'
+        elif os.path.isfile(hint_path + ".exe"):
+            return hint_path + ".exe"
 
-    for hint_dir in os.environ['PATH'].split(os.pathsep):
+    for hint_dir in os.environ["PATH"].split(os.pathsep):
         hint_dir = hint_dir.strip('"')
-        hint_path = os.path.join(hint_dir, filename)
+        hint_path = os.path.join(hint_dir, "msbuild")
         if os.path.isfile(hint_path) and os.access(hint_path, os.X_OK):
             return hint_path
-        if os.path.isfile(hint_path + '.exe') and os.access(hint_path + '.exe', os.X_OK):
-            return hint_path + '.exe'
+        if os.path.isfile(hint_path + ".exe") and os.access(hint_path + ".exe", os.X_OK):
+            return hint_path + ".exe"
 
     return None
 
 
 def find_msbuild_windows(env):
-    from . mono_reg_utils import find_mono_root_dir, find_msbuild_tools_path_reg
+    from .mono_reg_utils import find_mono_root_dir, find_msbuild_tools_path_reg
 
-    mono_root = env['mono_prefix'] or find_mono_root_dir(env['bits'])
+    mono_root = env["mono_prefix"] or find_mono_root_dir(env["bits"])
 
     if not mono_root:
-        raise RuntimeError('Cannot find mono root directory')
+        raise RuntimeError("Cannot find mono root directory")
 
-    mono_bin_dir = os.path.join(mono_root, 'bin')
-    msbuild_mono = os.path.join(mono_bin_dir, 'msbuild.bat')
+    mono_bin_dir = os.path.join(mono_root, "bin")
+    msbuild_mono = os.path.join(mono_bin_dir, "msbuild.bat")
 
     msbuild_tools_path = find_msbuild_tools_path_reg()
 
     if msbuild_tools_path:
-        return (os.path.join(msbuild_tools_path, 'MSBuild.exe'), {})
+        return (os.path.join(msbuild_tools_path, "MSBuild.exe"), {})
 
     if os.path.isfile(msbuild_mono):
         # The (Csc/Vbc/Fsc)ToolExe environment variables are required when
         # building with Mono's MSBuild. They must point to the batch files
         # in Mono's bin directory to make sure they are executed with Mono.
         mono_msbuild_env = {
-            'CscToolExe': os.path.join(mono_bin_dir, 'csc.bat'),
-            'VbcToolExe': os.path.join(mono_bin_dir, 'vbc.bat'),
-            'FscToolExe': os.path.join(mono_bin_dir, 'fsharpc.bat')
+            "CscToolExe": os.path.join(mono_bin_dir, "csc.bat"),
+            "VbcToolExe": os.path.join(mono_bin_dir, "vbc.bat"),
+            "FscToolExe": os.path.join(mono_bin_dir, "fsharpc.bat"),
         }
         return (msbuild_mono, mono_msbuild_env)
 
@@ -132,7 +84,7 @@ def find_msbuild_windows(env):
 
 def run_command(command, args, env_override=None, name=None):
     def cmd_args_to_str(cmd_args):
-        return ' '.join([arg if not ' ' in arg else '"%s"' % arg for arg in cmd_args])
+        return " ".join([arg if not " " in arg else '"%s"' % arg for arg in cmd_args])
 
     args = [command] + args
 
@@ -143,6 +95,7 @@ def run_command(command, args, env_override=None, name=None):
         print("Running '%s': %s" % (name, cmd_args_to_str(args)))
 
     import subprocess
+
     try:
         if env_override is None:
             subprocess.check_call(args)
@@ -152,63 +105,41 @@ def run_command(command, args, env_override=None, name=None):
         raise RuntimeError("'%s' exited with error code: %s" % (name, e.returncode))
 
 
-def nuget_restore(env, *args):
-    global verbose
-    verbose = env['verbose']
-
-    # Find NuGet
-    nuget_path = find_nuget_windows(env) if os.name == 'nt' else find_nuget_unix()
-    if nuget_path is None:
-        raise RuntimeError('Cannot find NuGet executable')
-
-    print('NuGet path: ' + nuget_path)
-
-    # Do NuGet restore
-    run_command(nuget_path, ['restore'] + list(args), name='nuget restore')
-
-
 def build_solution(env, solution_path, build_config, extra_msbuild_args=[]):
     global verbose
-    verbose = env['verbose']
+    verbose = env["verbose"]
 
     msbuild_env = os.environ.copy()
 
     # Needed when running from Developer Command Prompt for VS
-    if 'PLATFORM' in msbuild_env:
-        del msbuild_env['PLATFORM']
-
-    # Find MSBuild
-    if os.name == 'nt':
-        msbuild_info = find_msbuild_windows(env)
-        if msbuild_info is None:
-            raise RuntimeError('Cannot find MSBuild executable')
-        msbuild_path = msbuild_info[0]
-        msbuild_env.update(msbuild_info[1])
-    else:
-        msbuild_path = find_msbuild_unix('msbuild')
-        if msbuild_path is None:
-            xbuild_fallback = env['xbuild_fallback']
+    if "PLATFORM" in msbuild_env:
+        del msbuild_env["PLATFORM"]
 
-            if xbuild_fallback and os.name == 'nt':
-                print('Option \'xbuild_fallback\' not supported on Windows')
-                xbuild_fallback = False
+    msbuild_args = []
 
-            if xbuild_fallback:
-                print('Cannot find MSBuild executable, trying with xbuild')
-                print('Warning: xbuild is deprecated')
+    dotnet_cli = find_dotnet_cli()
 
-                msbuild_path = find_msbuild_unix('xbuild')
-
-                if msbuild_path is None:
-                    raise RuntimeError('Cannot find xbuild executable')
-            else:
-                raise RuntimeError('Cannot find MSBuild executable')
+    if dotnet_cli:
+        msbuild_path = dotnet_cli
+        msbuild_args += ["msbuild"]  # `dotnet msbuild` command
+    else:
+        # Find MSBuild
+        if os.name == "nt":
+            msbuild_info = find_msbuild_windows(env)
+            if msbuild_info is None:
+                raise RuntimeError("Cannot find MSBuild executable")
+            msbuild_path = msbuild_info[0]
+            msbuild_env.update(msbuild_info[1])
+        else:
+            msbuild_path = find_msbuild_unix()
+            if msbuild_path is None:
+                raise RuntimeError("Cannot find MSBuild executable")
 
-    print('MSBuild path: ' + msbuild_path)
+    print("MSBuild path: " + msbuild_path)
 
     # Build solution
 
-    msbuild_args = [solution_path, '/p:Configuration=' + build_config]
+    msbuild_args += [solution_path, "/restore", "/t:Build", "/p:Configuration=" + build_config]
     msbuild_args += extra_msbuild_args
 
-    run_command(msbuild_path, msbuild_args, env_override=msbuild_env, name='msbuild')
+    run_command(msbuild_path, msbuild_args, env_override=msbuild_env, name="msbuild")
diff --git a/modules/mono/build_scripts/tls_configure.py b/modules/mono/build_scripts/tls_configure.py
deleted file mode 100644
index 622280b00b..0000000000
--- a/modules/mono/build_scripts/tls_configure.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from __future__ import print_function
-
-def supported(result):
-    return 'supported' if result else 'not supported'
-
-
-def check_cxx11_thread_local(conf):
-    print('Checking for `thread_local` support...', end=" ")
-    result = conf.TryCompile('thread_local int foo = 0; int main() { return foo; }', '.cpp')
-    print(supported(result))
-    return bool(result)
-
-
-def check_declspec_thread(conf):
-    print('Checking for `__declspec(thread)` support...', end=" ")
-    result = conf.TryCompile('__declspec(thread) int foo = 0; int main() { return foo; }', '.cpp')
-    print(supported(result))
-    return bool(result)
-
-
-def check_gcc___thread(conf):
-    print('Checking for `__thread` support...', end=" ")
-    result = conf.TryCompile('__thread int foo = 0; int main() { return foo; }', '.cpp')
-    print(supported(result))
-    return bool(result)
-
-
-def configure(conf):
-    if check_cxx11_thread_local(conf):
-        conf.env.Append(CPPDEFINES=['HAVE_CXX11_THREAD_LOCAL'])
-    else:
-        if conf.env.msvc:
-            if check_declspec_thread(conf):
-                conf.env.Append(CPPDEFINES=['HAVE_DECLSPEC_THREAD'])
-        elif check_gcc___thread(conf):
-            conf.env.Append(CPPDEFINES=['HAVE_GCC___THREAD'])
diff --git a/modules/mono/class_db_api_json.cpp b/modules/mono/class_db_api_json.cpp
index b04e53bd81..d7b2028204 100644
--- a/modules/mono/class_db_api_json.cpp
+++ b/modules/mono/class_db_api_json.cpp
@@ -42,21 +42,20 @@ void class_db_api_to_json(const String &p_output_file, ClassDB::APIType p_api) {
 
 	List<StringName> names;
 
-	const StringName *k = NULL;
+	const StringName *k = nullptr;
 
 	while ((k = ClassDB::classes.next(k))) {
-
 		names.push_back(*k);
 	}
 	//must be alphabetically sorted for hash to compute
 	names.sort_custom<StringName::AlphCompare>();
 
 	for (List<StringName>::Element *E = names.front(); E; E = E->next()) {
-
 		ClassDB::ClassInfo *t = ClassDB::classes.getptr(E->get());
 		ERR_FAIL_COND(!t);
-		if (t->api != p_api || !t->exposed)
+		if (t->api != p_api || !t->exposed) {
 			continue;
+		}
 
 		Dictionary class_dict;
 		classes_dict[t->name] = class_dict;
@@ -67,16 +66,16 @@ void class_db_api_to_json(const String &p_output_file, ClassDB::APIType p_api) {
 
 			List<StringName> snames;
 
-			k = NULL;
+			k = nullptr;
 
 			while ((k = t->method_map.next(k))) {
-
 				String name = k->operator String();
 
 				ERR_CONTINUE(name.empty());
 
-				if (name[0] == '_')
+				if (name[0] == '_') {
 					continue; // Ignore non-virtual methods that start with an underscore
+				}
 
 				snames.push_back(*k);
 			}
@@ -132,10 +131,9 @@ void class_db_api_to_json(const String &p_output_file, ClassDB::APIType p_api) {
 
 			List<StringName> snames;
 
-			k = NULL;
+			k = nullptr;
 
 			while ((k = t->constant_map.next(k))) {
-
 				snames.push_back(*k);
 			}
 
@@ -160,10 +158,9 @@ void class_db_api_to_json(const String &p_output_file, ClassDB::APIType p_api) {
 
 			List<StringName> snames;
 
-			k = NULL;
+			k = nullptr;
 
 			while ((k = t->signal_map.next(k))) {
-
 				snames.push_back(*k);
 			}
 
@@ -196,10 +193,9 @@ void class_db_api_to_json(const String &p_output_file, ClassDB::APIType p_api) {
 
 			List<StringName> snames;
 
-			k = NULL;
+			k = nullptr;
 
 			while ((k = t->property_setget.next(k))) {
-
 				snames.push_back(*k);
 			}
 
diff --git a/modules/mono/config.py b/modules/mono/config.py
index 70cb464c7a..d060ae9b28 100644
--- a/modules/mono/config.py
+++ b/modules/mono/config.py
@@ -1,42 +1,67 @@
+supported_platforms = ["windows", "osx", "linuxbsd", "server", "android", "haiku", "javascript", "iphone"]
+
+
 def can_build(env, platform):
     return True
 
 
 def configure(env):
-    if env['platform'] not in ['windows', 'osx', 'x11', 'server', 'android', 'haiku', 'javascript']:
-        raise RuntimeError('This module does not currently support building for this platform')
+    platform = env["platform"]
+
+    if platform not in supported_platforms:
+        raise RuntimeError("This module does not currently support building for this platform")
 
     env.use_ptrcall = True
-    env.add_module_version_string('mono')
+    env.add_module_version_string("mono")
 
-    from SCons.Script import BoolVariable, PathVariable, Variables
+    from SCons.Script import BoolVariable, PathVariable, Variables, Help
+
+    default_mono_static = platform in ["iphone", "javascript"]
+    default_mono_bundles_zlib = platform in ["javascript"]
 
     envvars = Variables()
-    envvars.Add(PathVariable('mono_prefix', 'Path to the mono installation directory for the target platform and architecture', '', PathVariable.PathAccept))
-    envvars.Add(BoolVariable('mono_static', 'Statically link mono', False))
-    envvars.Add(BoolVariable('mono_glue', 'Build with the mono glue sources', True))
-    envvars.Add(BoolVariable('copy_mono_root', 'Make a copy of the mono installation directory to bundle with the editor', False))
-    envvars.Add(BoolVariable('xbuild_fallback', 'If MSBuild is not found, fallback to xbuild', False))
+    envvars.Add(
+        PathVariable(
+            "mono_prefix",
+            "Path to the Mono installation directory for the target platform and architecture",
+            "",
+            PathVariable.PathAccept,
+        )
+    )
+    envvars.Add(BoolVariable("mono_static", "Statically link Mono", default_mono_static))
+    envvars.Add(BoolVariable("mono_glue", "Build with the Mono glue sources", True))
+    envvars.Add(BoolVariable("build_cil", "Build C# solutions", True))
+    envvars.Add(
+        BoolVariable("copy_mono_root", "Make a copy of the Mono installation directory to bundle with the editor", True)
+    )
+
+    # TODO: It would be great if this could be detected automatically instead
+    envvars.Add(
+        BoolVariable(
+            "mono_bundles_zlib", "Specify if the Mono runtime was built with bundled zlib", default_mono_bundles_zlib
+        )
+    )
+
     envvars.Update(env)
+    Help(envvars.GenerateHelpText(env))
 
-    if env['platform'] == 'javascript':
-        # Mono wasm already has zlib builtin, so we need this workaround to avoid symbol collisions
-        print('Compiling with Mono wasm disables \'builtin_zlib\'')
-        env['builtin_zlib'] = False
+    if env["mono_bundles_zlib"]:
+        # Mono may come with zlib bundled for WASM or on newer version when built with MinGW.
+        print("This Mono runtime comes with zlib bundled. Disabling 'builtin_zlib'...")
+        env["builtin_zlib"] = False
         thirdparty_zlib_dir = "#thirdparty/zlib/"
         env.Prepend(CPPPATH=[thirdparty_zlib_dir])
 
 
 def get_doc_classes():
     return [
-        '@C#',
-        'CSharpScript',
-        'GodotSharp',
+        "CSharpScript",
+        "GodotSharp",
     ]
 
 
 def get_doc_path():
-    return 'doc_classes'
+    return "doc_classes"
 
 
 def is_enabled():
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp
index 9e19e5f8c4..bbdec224f0 100644
--- a/modules/mono/csharp_script.cpp
+++ b/modules/mono/csharp_script.cpp
@@ -31,16 +31,19 @@
 #include "csharp_script.h"
 
 #include <mono/metadata/threads.h>
+#include <stdint.h>
 
+#include "core/debugger/engine_debugger.h"
+#include "core/debugger/script_debugger.h"
 #include "core/io/json.h"
 #include "core/os/file_access.h"
+#include "core/os/mutex.h"
 #include "core/os/os.h"
 #include "core/os/thread.h"
 #include "core/project_settings.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/bindings_generator.h"
-#include "editor/csharp_project.h"
 #include "editor/editor_node.h"
 #include "editor/node_dock.h"
 #endif
@@ -57,22 +60,19 @@
 #include "mono_gd/gd_mono_utils.h"
 #include "signal_awaiter_utils.h"
 #include "utils/macros.h"
-#include "utils/mutex_utils.h"
 #include "utils/string_utils.h"
-#include "utils/thread_local.h"
 
 #define CACHED_STRING_NAME(m_var) (CSharpLanguage::get_singleton()->get_string_names().m_var)
 
 #ifdef TOOLS_ENABLED
 static bool _create_project_solution_if_needed() {
-
 	String sln_path = GodotSharpDirs::get_project_sln_path();
 	String csproj_path = GodotSharpDirs::get_project_csproj_path();
 
 	if (!FileAccess::exists(sln_path) || !FileAccess::exists(csproj_path)) {
 		// A solution does not yet exist, create a new one
 
-		CRASH_COND(CSharpLanguage::get_singleton()->get_godotsharp_editor() == NULL);
+		CRASH_COND(CSharpLanguage::get_singleton()->get_godotsharp_editor() == nullptr);
 		return CSharpLanguage::get_singleton()->get_godotsharp_editor()->call("CreateProjectSolution");
 	}
 
@@ -80,31 +80,26 @@ static bool _create_project_solution_if_needed() {
 }
 #endif
 
-CSharpLanguage *CSharpLanguage::singleton = NULL;
+CSharpLanguage *CSharpLanguage::singleton = nullptr;
 
 String CSharpLanguage::get_name() const {
-
 	return "C#";
 }
 
 String CSharpLanguage::get_type() const {
-
 	return "CSharpScript";
 }
 
 String CSharpLanguage::get_extension() const {
-
 	return "cs";
 }
 
 Error CSharpLanguage::execute_file(const String &p_path) {
-
 	// ??
 	return OK;
 }
 
 void CSharpLanguage::init() {
-
 #ifdef DEBUG_METHODS_ENABLED
 	if (OS::get_singleton()->get_cmdline_args().find("--class-db-json")) {
 		class_db_api_to_json("user://class_db_api.json", ClassDB::API_CORE);
@@ -129,8 +124,9 @@ void CSharpLanguage::init() {
 	print_line("Run this binary with '--generate-mono-glue path/to/modules/mono/glue'");
 #endif
 
-	if (gdmono->is_runtime_initialized())
+	if (gdmono->is_runtime_initialized()) {
 		gdmono->initialize_load_assemblies();
+	}
 
 #ifdef TOOLS_ENABLED
 	EditorNode::add_init_callback(&_editor_init_callback);
@@ -138,6 +134,13 @@ void CSharpLanguage::init() {
 }
 
 void CSharpLanguage::finish() {
+	finalize();
+}
+
+void CSharpLanguage::finalize() {
+	if (finalized) {
+		return;
+	}
 
 	finalizing = true;
 
@@ -145,15 +148,15 @@ void CSharpLanguage::finish() {
 	for (Map<Object *, CSharpScriptBinding>::Element *E = script_bindings.front(); E; E = E->next()) {
 		CSharpScriptBinding &script_binding = E->value();
 
-		if (script_binding.gchandle.is_valid()) {
-			script_binding.gchandle->release();
+		if (!script_binding.gchandle.is_released()) {
+			script_binding.gchandle.release();
 			script_binding.inited = false;
 		}
 	}
 
 	if (gdmono) {
 		memdelete(gdmono);
-		gdmono = NULL;
+		gdmono = nullptr;
 	}
 
 	// Clear here, after finalizing all domains to make sure there is nothing else referencing the elements.
@@ -161,22 +164,24 @@ void CSharpLanguage::finish() {
 
 #ifdef DEBUG_ENABLED
 	for (Map<ObjectID, int>::Element *E = unsafe_object_references.front(); E; E = E->next()) {
-		const ObjectID &id = E->get();
+		const ObjectID &id = E->key();
 		Object *obj = ObjectDB::get_instance(id);
 
 		if (obj) {
-			ERR_PRINTS("Leaked unsafe reference to object: " + obj->get_class() + ":" + itos(id));
+			ERR_PRINT("Leaked unsafe reference to object: " + obj->to_string());
 		} else {
-			ERR_PRINTS("Leaked unsafe reference to deleted object: " + itos(id));
+			ERR_PRINT("Leaked unsafe reference to deleted object: " + itos(id));
 		}
 	}
 #endif
 
+	memdelete(managed_callable_middleman);
+
 	finalizing = false;
+	finalized = true;
 }
 
 void CSharpLanguage::get_reserved_words(List<String> *p_words) const {
-
 	static const char *_reserved_words[] = {
 		// Reserved keywords
 		"abstract",
@@ -287,7 +292,7 @@ void CSharpLanguage::get_reserved_words(List<String> *p_words) const {
 		"when",
 		"where",
 		"yield",
-		0
+		nullptr
 	};
 
 	const char **w = _reserved_words;
@@ -299,20 +304,18 @@ void CSharpLanguage::get_reserved_words(List<String> *p_words) const {
 }
 
 void CSharpLanguage::get_comment_delimiters(List<String> *p_delimiters) const {
-
 	p_delimiters->push_back("//"); // single-line comment
 	p_delimiters->push_back("/* */"); // delimited comment
 }
 
 void CSharpLanguage::get_string_delimiters(List<String> *p_delimiters) const {
-
 	p_delimiters->push_back("' '"); // character literal
 	p_delimiters->push_back("\" \""); // regular string literal
-	p_delimiters->push_back("@\" \""); // verbatim string literal
+	// Verbatim string literals (`@" "`) don't render correctly, so don't highlight them.
+	// Generic string highlighting suffices as a workaround for now.
 }
 
 static String get_base_class_name(const String &p_base_class_name, const String p_class_name) {
-
 	String base_class = p_base_class_name;
 	if (p_class_name == base_class) {
 		base_class = "Godot." + base_class;
@@ -321,7 +324,6 @@ static String get_base_class_name(const String &p_base_class_name, const String
 }
 
 Ref<Script> CSharpLanguage::get_template(const String &p_class_name, const String &p_base_class_name) const {
-
 	String script_template = "using " BINDINGS_NAMESPACE ";\n"
 							 "using System;\n"
 							 "\n"
@@ -357,12 +359,10 @@ Ref<Script> CSharpLanguage::get_template(const String &p_class_name, const Strin
 }
 
 bool CSharpLanguage::is_using_templates() {
-
 	return true;
 }
 
 void CSharpLanguage::make_template(const String &p_class_name, const String &p_base_class_name, Ref<Script> &p_script) {
-
 	String src = p_script->get_source_code();
 	String base_class_name = get_base_class_name(p_base_class_name, p_class_name);
 	src = src.replace("%BASE%", base_class_name)
@@ -372,7 +372,6 @@ void CSharpLanguage::make_template(const String &p_class_name, const String &p_b
 }
 
 String CSharpLanguage::validate_path(const String &p_path) const {
-
 	String class_name = p_path.get_file().get_basename();
 	List<String> keywords;
 	get_reserved_words(&keywords);
@@ -383,34 +382,32 @@ String CSharpLanguage::validate_path(const String &p_path) const {
 }
 
 Script *CSharpLanguage::create_script() const {
-
 	return memnew(CSharpScript);
 }
 
 bool CSharpLanguage::has_named_classes() const {
-
 	return false;
 }
 
 bool CSharpLanguage::supports_builtin_mode() const {
-
 	return false;
 }
 
 #ifdef TOOLS_ENABLED
 static String variant_type_to_managed_name(const String &p_var_type_name) {
-
-	if (p_var_type_name.empty())
+	if (p_var_type_name.empty()) {
 		return "object";
+	}
 
 	if (!ClassDB::class_exists(p_var_type_name)) {
 		return p_var_type_name;
 	}
 
-	if (p_var_type_name == Variant::get_type_name(Variant::OBJECT))
+	if (p_var_type_name == Variant::get_type_name(Variant::OBJECT)) {
 		return "Godot.Object";
+	}
 
-	if (p_var_type_name == Variant::get_type_name(Variant::REAL)) {
+	if (p_var_type_name == Variant::get_type_name(Variant::FLOAT)) {
 #ifdef REAL_T_IS_DOUBLE
 		return "double";
 #else
@@ -418,41 +415,59 @@ static String variant_type_to_managed_name(const String &p_var_type_name) {
 #endif
 	}
 
-	if (p_var_type_name == Variant::get_type_name(Variant::STRING))
+	if (p_var_type_name == Variant::get_type_name(Variant::STRING)) {
 		return "string"; // I prefer this one >:[
+	}
 
-	if (p_var_type_name == Variant::get_type_name(Variant::DICTIONARY))
+	if (p_var_type_name == Variant::get_type_name(Variant::DICTIONARY)) {
 		return "Collections.Dictionary";
+	}
 
-	if (p_var_type_name == Variant::get_type_name(Variant::ARRAY))
+	if (p_var_type_name == Variant::get_type_name(Variant::ARRAY)) {
 		return "Collections.Array";
+	}
 
-	if (p_var_type_name == Variant::get_type_name(Variant::POOL_BYTE_ARRAY))
+	if (p_var_type_name == Variant::get_type_name(Variant::PACKED_BYTE_ARRAY)) {
 		return "byte[]";
-	if (p_var_type_name == Variant::get_type_name(Variant::POOL_INT_ARRAY))
+	}
+	if (p_var_type_name == Variant::get_type_name(Variant::PACKED_INT32_ARRAY)) {
 		return "int[]";
-	if (p_var_type_name == Variant::get_type_name(Variant::POOL_REAL_ARRAY)) {
-#ifdef REAL_T_IS_DOUBLE
-		return "double[]";
-#else
+	}
+	if (p_var_type_name == Variant::get_type_name(Variant::PACKED_INT64_ARRAY)) {
+		return "long[]";
+	}
+	if (p_var_type_name == Variant::get_type_name(Variant::PACKED_FLOAT32_ARRAY)) {
 		return "float[]";
-#endif
 	}
-	if (p_var_type_name == Variant::get_type_name(Variant::POOL_STRING_ARRAY))
+	if (p_var_type_name == Variant::get_type_name(Variant::PACKED_FLOAT64_ARRAY)) {
+		return "double[]";
+	}
+	if (p_var_type_name == Variant::get_type_name(Variant::PACKED_STRING_ARRAY)) {
 		return "string[]";
-	if (p_var_type_name == Variant::get_type_name(Variant::POOL_VECTOR2_ARRAY))
+	}
+	if (p_var_type_name == Variant::get_type_name(Variant::PACKED_VECTOR2_ARRAY)) {
 		return "Vector2[]";
-	if (p_var_type_name == Variant::get_type_name(Variant::POOL_VECTOR3_ARRAY))
+	}
+	if (p_var_type_name == Variant::get_type_name(Variant::PACKED_VECTOR3_ARRAY)) {
 		return "Vector3[]";
-	if (p_var_type_name == Variant::get_type_name(Variant::POOL_COLOR_ARRAY))
+	}
+	if (p_var_type_name == Variant::get_type_name(Variant::PACKED_COLOR_ARRAY)) {
 		return "Color[]";
+	}
+
+	if (p_var_type_name == Variant::get_type_name(Variant::SIGNAL)) {
+		return "SignalInfo";
+	}
 
 	Variant::Type var_types[] = {
 		Variant::BOOL,
 		Variant::INT,
 		Variant::VECTOR2,
+		Variant::VECTOR2I,
 		Variant::RECT2,
+		Variant::RECT2I,
 		Variant::VECTOR3,
+		Variant::VECTOR3I,
 		Variant::TRANSFORM2D,
 		Variant::PLANE,
 		Variant::QUAT,
@@ -460,19 +475,22 @@ static String variant_type_to_managed_name(const String &p_var_type_name) {
 		Variant::BASIS,
 		Variant::TRANSFORM,
 		Variant::COLOR,
+		Variant::STRING_NAME,
 		Variant::NODE_PATH,
-		Variant::_RID
+		Variant::_RID,
+		Variant::CALLABLE
 	};
 
 	for (unsigned int i = 0; i < sizeof(var_types) / sizeof(Variant::Type); i++) {
-		if (p_var_type_name == Variant::get_type_name(var_types[i]))
+		if (p_var_type_name == Variant::get_type_name(var_types[i])) {
 			return p_var_type_name;
+		}
 	}
 
 	return "object";
 }
 
-String CSharpLanguage::make_function(const String &, const String &p_name, const PoolStringArray &p_args) const {
+String CSharpLanguage::make_function(const String &, const String &p_name, const PackedStringArray &p_args) const {
 	// FIXME
 	// - Due to Godot's API limitation this just appends the function to the end of the file
 	// - Use fully qualified name if there is ambiguity
@@ -480,8 +498,9 @@ String CSharpLanguage::make_function(const String &, const String &p_name, const
 	for (int i = 0; i < p_args.size(); i++) {
 		const String &arg = p_args[i];
 
-		if (i > 0)
+		if (i > 0) {
 			s += ", ";
+		}
 
 		s += variant_type_to_managed_name(arg.get_slice(":", 1)) + " " + escape_csharp_keyword(arg.get_slice(":", 0));
 	}
@@ -490,7 +509,7 @@ String CSharpLanguage::make_function(const String &, const String &p_name, const
 	return s;
 }
 #else
-String CSharpLanguage::make_function(const String &, const String &, const PoolStringArray &) const {
+String CSharpLanguage::make_function(const String &, const String &, const PackedStringArray &) const {
 	return String();
 }
 #endif
@@ -515,54 +534,60 @@ String CSharpLanguage::_get_indentation() const {
 }
 
 String CSharpLanguage::debug_get_error() const {
-
 	return _debug_error;
 }
 
 int CSharpLanguage::debug_get_stack_level_count() const {
-
-	if (_debug_parse_err_line >= 0)
+	if (_debug_parse_err_line >= 0) {
 		return 1;
+	}
 
 	// TODO: StackTrace
 	return 1;
 }
 
 int CSharpLanguage::debug_get_stack_level_line(int p_level) const {
-
-	if (_debug_parse_err_line >= 0)
+	if (_debug_parse_err_line >= 0) {
 		return _debug_parse_err_line;
+	}
 
 	// TODO: StackTrace
 	return 1;
 }
 
 String CSharpLanguage::debug_get_stack_level_function(int p_level) const {
-
-	if (_debug_parse_err_line >= 0)
+	if (_debug_parse_err_line >= 0) {
 		return String();
+	}
 
 	// TODO: StackTrace
 	return String();
 }
 
 String CSharpLanguage::debug_get_stack_level_source(int p_level) const {
-
-	if (_debug_parse_err_line >= 0)
+	if (_debug_parse_err_line >= 0) {
 		return _debug_parse_err_file;
+	}
 
 	// TODO: StackTrace
 	return String();
 }
 
 Vector<ScriptLanguage::StackInfo> CSharpLanguage::debug_get_current_stack_info() {
-
 #ifdef DEBUG_ENABLED
-	_TLS_RECURSION_GUARD_V_(Vector<StackInfo>());
+	// Printing an error here will result in endless recursion, so we must be careful
+	static thread_local bool _recursion_flag_ = false;
+	if (_recursion_flag_) {
+		return Vector<StackInfo>();
+	}
+	_recursion_flag_ = true;
+	SCOPE_EXIT { _recursion_flag_ = false; };
+
 	GD_MONO_SCOPE_THREAD_ATTACH;
 
-	if (!gdmono->is_runtime_initialized() || !GDMono::get_singleton()->get_core_api_assembly() || !GDMonoCache::cached_data.corlib_cache_updated)
+	if (!gdmono->is_runtime_initialized() || !GDMono::get_singleton()->get_core_api_assembly() || !GDMonoCache::cached_data.corlib_cache_updated) {
 		return Vector<StackInfo>();
+	}
 
 	MonoObject *stack_trace = mono_object_new(mono_domain_get(), CACHED_CLASS(System_Diagnostics_StackTrace)->get_mono_ptr());
 
@@ -582,11 +607,17 @@ Vector<ScriptLanguage::StackInfo> CSharpLanguage::debug_get_current_stack_info()
 
 #ifdef DEBUG_ENABLED
 Vector<ScriptLanguage::StackInfo> CSharpLanguage::stack_trace_get_info(MonoObject *p_stack_trace) {
+	// Printing an error here will result in endless recursion, so we must be careful
+	static thread_local bool _recursion_flag_ = false;
+	if (_recursion_flag_) {
+		return Vector<StackInfo>();
+	}
+	_recursion_flag_ = true;
+	SCOPE_EXIT { _recursion_flag_ = false; };
 
-	_TLS_RECURSION_GUARD_V_(Vector<StackInfo>());
 	GD_MONO_SCOPE_THREAD_ATTACH;
 
-	MonoException *exc = NULL;
+	MonoException *exc = nullptr;
 
 	MonoArray *frames = CACHED_METHOD_THUNK(System_Diagnostics_StackTrace, GetFrames).invoke(p_stack_trace, &exc);
 
@@ -597,8 +628,9 @@ Vector<ScriptLanguage::StackInfo> CSharpLanguage::stack_trace_get_info(MonoObjec
 
 	int frame_count = mono_array_length(frames);
 
-	if (frame_count <= 0)
+	if (frame_count <= 0) {
 		return Vector<StackInfo>();
+	}
 
 	Vector<StackInfo> si;
 	si.resize(frame_count);
@@ -632,7 +664,7 @@ Vector<ScriptLanguage::StackInfo> CSharpLanguage::stack_trace_get_info(MonoObjec
 
 void CSharpLanguage::post_unsafe_reference(Object *p_obj) {
 #ifdef DEBUG_ENABLED
-	SCOPED_MUTEX_LOCK(unsafe_object_references_lock);
+	MutexLock lock(unsafe_object_references_lock);
 	ObjectID id = p_obj->get_instance_id();
 	unsafe_object_references[id]++;
 #endif
@@ -640,25 +672,25 @@ void CSharpLanguage::post_unsafe_reference(Object *p_obj) {
 
 void CSharpLanguage::pre_unsafe_unreference(Object *p_obj) {
 #ifdef DEBUG_ENABLED
-	SCOPED_MUTEX_LOCK(unsafe_object_references_lock);
+	MutexLock lock(unsafe_object_references_lock);
 	ObjectID id = p_obj->get_instance_id();
 	Map<ObjectID, int>::Element *elem = unsafe_object_references.find(id);
 	ERR_FAIL_NULL(elem);
-	if (--elem->value() == 0)
+	if (--elem->value() == 0) {
 		unsafe_object_references.erase(elem);
+	}
 #endif
 }
 
 void CSharpLanguage::frame() {
-
-	if (gdmono && gdmono->is_runtime_initialized() && gdmono->get_core_api_assembly() != NULL) {
-		const Ref<MonoGCHandle> &task_scheduler_handle = GDMonoCache::cached_data.task_scheduler_handle;
+	if (gdmono && gdmono->is_runtime_initialized() && gdmono->get_core_api_assembly() != nullptr) {
+		const Ref<MonoGCHandleRef> &task_scheduler_handle = GDMonoCache::cached_data.task_scheduler_handle;
 
 		if (task_scheduler_handle.is_valid()) {
 			MonoObject *task_scheduler = task_scheduler_handle->get_target();
 
 			if (task_scheduler) {
-				MonoException *exc = NULL;
+				MonoException *exc = nullptr;
 				CACHED_METHOD_THUNK(GodotTaskScheduler, Activate).invoke(task_scheduler, &exc);
 
 				if (exc) {
@@ -670,11 +702,11 @@ void CSharpLanguage::frame() {
 }
 
 struct CSharpScriptDepSort {
-
 	// must support sorting so inheritance works properly (parent must be reloaded first)
 	bool operator()(const Ref<CSharpScript> &A, const Ref<CSharpScript> &B) const {
-		if (A == B)
+		if (A == B) {
 			return false; // shouldn't happen but..
+		}
 		GDMonoClass *I = B->base;
 		while (I) {
 			if (I == A->script_class) {
@@ -690,7 +722,6 @@ struct CSharpScriptDepSort {
 };
 
 void CSharpLanguage::reload_all_scripts() {
-
 #ifdef GD_MONO_HOT_RELOAD
 	if (is_assembly_reloading_needed()) {
 		GD_MONO_SCOPE_THREAD_ATTACH;
@@ -700,7 +731,6 @@ void CSharpLanguage::reload_all_scripts() {
 }
 
 void CSharpLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_soft_reload) {
-
 	(void)p_script; // UNUSED
 
 	CRASH_COND(!Engine::get_singleton()->is_editor_hint());
@@ -719,9 +749,9 @@ void CSharpLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_soft
 
 #ifdef GD_MONO_HOT_RELOAD
 bool CSharpLanguage::is_assembly_reloading_needed() {
-
-	if (!gdmono->is_runtime_initialized())
+	if (!gdmono->is_runtime_initialized()) {
 		return false;
+	}
 
 	GDMonoAssembly *proj_assembly = gdmono->get_project_assembly();
 
@@ -736,34 +766,37 @@ bool CSharpLanguage::is_assembly_reloading_needed() {
 	if (proj_assembly) {
 		String proj_asm_path = proj_assembly->get_path();
 
-		if (!FileAccess::exists(proj_assembly->get_path())) {
+		if (!FileAccess::exists(proj_asm_path)) {
 			// Maybe it wasn't loaded from the default path, so check this as well
 			proj_asm_path = GodotSharpDirs::get_res_temp_assemblies_dir().plus_file(appname_safe);
-			if (!FileAccess::exists(proj_asm_path))
+			if (!FileAccess::exists(proj_asm_path)) {
 				return false; // No assembly to load
+			}
 		}
 
-		if (FileAccess::get_modified_time(proj_asm_path) <= proj_assembly->get_modified_time())
+		if (FileAccess::get_modified_time(proj_asm_path) <= proj_assembly->get_modified_time()) {
 			return false; // Already up to date
+		}
 	} else {
-		if (!FileAccess::exists(GodotSharpDirs::get_res_temp_assemblies_dir().plus_file(appname_safe)))
+		if (!FileAccess::exists(GodotSharpDirs::get_res_temp_assemblies_dir().plus_file(appname_safe))) {
 			return false; // No assembly to load
+		}
 	}
 
 	return true;
 }
 
 void CSharpLanguage::reload_assemblies(bool p_soft_reload) {
-
-	if (!gdmono->is_runtime_initialized())
+	if (!gdmono->is_runtime_initialized()) {
 		return;
+	}
 
 	// There is no soft reloading with Mono. It's always hard reloading.
 
-	List<Ref<CSharpScript> > scripts;
+	List<Ref<CSharpScript>> scripts;
 
 	{
-		SCOPED_MUTEX_LOCK(script_instances_mutex);
+		MutexLock lock(script_instances_mutex);
 
 		for (SelfList<CSharpScript> *elem = script_list.first(); elem; elem = elem->next()) {
 			// Cast to CSharpScript to avoid being erased by accident
@@ -771,10 +804,40 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) {
 		}
 	}
 
-	List<Ref<CSharpScript> > to_reload;
+	scripts.sort_custom<CSharpScriptDepSort>(); // Update in inheritance dependency order
+
+	// Serialize managed callables
+	{
+		MutexLock lock(ManagedCallable::instances_mutex);
+
+		for (SelfList<ManagedCallable> *elem = ManagedCallable::instances.first(); elem; elem = elem->next()) {
+			ManagedCallable *managed_callable = elem->self();
+
+			MonoDelegate *delegate = (MonoDelegate *)managed_callable->delegate_handle.get_target();
+
+			Array serialized_data;
+			MonoObject *managed_serialized_data = GDMonoMarshal::variant_to_mono_object(serialized_data);
+
+			MonoException *exc = nullptr;
+			bool success = (bool)CACHED_METHOD_THUNK(DelegateUtils, TrySerializeDelegate).invoke(delegate, managed_serialized_data, &exc);
+
+			if (exc) {
+				GDMonoUtils::debug_print_unhandled_exception(exc);
+				continue;
+			}
+
+			if (success) {
+				ManagedCallable::instances_pending_reload.insert(managed_callable, serialized_data);
+			} else if (OS::get_singleton()->is_stdout_verbose()) {
+				OS::get_singleton()->print("Failed to serialize delegate\n");
+			}
+		}
+	}
+
+	List<Ref<CSharpScript>> to_reload;
 
 	// We need to keep reference instances alive during reloading
-	List<Ref<Reference> > ref_instances;
+	List<Ref<Reference>> ref_instances;
 
 	for (Map<Object *, CSharpScriptBinding>::Element *E = script_bindings.front(); E; E = E->next()) {
 		CSharpScriptBinding &script_binding = E->value();
@@ -786,15 +849,13 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) {
 
 	// As scripts are going to be reloaded, must proceed without locking here
 
-	scripts.sort_custom<CSharpScriptDepSort>(); // Update in inheritance dependency order
-
-	for (List<Ref<CSharpScript> >::Element *E = scripts.front(); E; E = E->next()) {
+	for (List<Ref<CSharpScript>>::Element *E = scripts.front(); E; E = E->next()) {
 		Ref<CSharpScript> &script = E->get();
 
 		to_reload.push_back(script);
 
 		if (script->get_path().empty()) {
-			script->tied_class_name_for_reload = script->script_class->get_name();
+			script->tied_class_name_for_reload = script->script_class->get_name_for_lookup();
 			script->tied_class_namespace_for_reload = script->script_class->get_namespace();
 		}
 
@@ -834,26 +895,28 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) {
 			CSharpInstance *csi = static_cast<CSharpInstance *>(obj->get_script_instance());
 
 			// Call OnBeforeSerialize
-			if (csi->script->script_class->implements_interface(CACHED_CLASS(ISerializationListener)))
-				obj->get_script_instance()->call_multilevel(string_names.on_before_serialize);
+			if (csi->script->script_class->implements_interface(CACHED_CLASS(ISerializationListener))) {
+				obj->get_script_instance()->call(string_names.on_before_serialize);
+			}
 
 			// Save instance info
 			CSharpScript::StateBackup state;
 
 			// TODO: Proper state backup (Not only variants, serialize managed state of scripts)
 			csi->get_properties_state_for_reloading(state.properties);
+			csi->get_event_signals_state_for_reloading(state.event_signals);
 
 			owners_map[obj->get_instance_id()] = state;
 		}
 	}
 
 	// After the state of all instances is saved, clear scripts and script instances
-	for (List<Ref<CSharpScript> >::Element *E = scripts.front(); E; E = E->next()) {
+	for (List<Ref<CSharpScript>>::Element *E = scripts.front(); E; E = E->next()) {
 		Ref<CSharpScript> &script = E->get();
 
 		while (script->instances.front()) {
 			Object *obj = script->instances.front()->get();
-			obj->set_script(RefPtr()); // Remove script and existing script instances (placeholder are not removed before domain reload)
+			obj->set_script(REF()); // Remove script and existing script instances (placeholder are not removed before domain reload)
 		}
 
 		script->_clear();
@@ -863,20 +926,21 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) {
 	if (gdmono->reload_scripts_domain() != OK) {
 		// Failed to reload the scripts domain
 		// Make sure to add the scripts back to their owners before returning
-		for (List<Ref<CSharpScript> >::Element *E = to_reload.front(); E; E = E->next()) {
+		for (List<Ref<CSharpScript>>::Element *E = to_reload.front(); E; E = E->next()) {
 			Ref<CSharpScript> scr = E->get();
 
 			for (const Map<ObjectID, CSharpScript::StateBackup>::Element *F = scr->pending_reload_state.front(); F; F = F->next()) {
 				Object *obj = ObjectDB::get_instance(F->key());
 
-				if (!obj)
+				if (!obj) {
 					continue;
+				}
 
 				ObjectID obj_id = obj->get_instance_id();
 
 				// Use a placeholder for now to avoid losing the state when saving a scene
 
-				obj->set_script(scr.get_ref_ptr());
+				obj->set_script(scr);
 
 				PlaceHolderScriptInstance *placeholder = scr->placeholder_instance_create(obj);
 				obj->set_script_instance(placeholder);
@@ -888,8 +952,8 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) {
 #endif
 
 				// Restore Variant properties state, it will be kept by the placeholder until the next script reloading
-				for (List<Pair<StringName, Variant> >::Element *G = scr->pending_reload_state[obj_id].properties.front(); G; G = G->next()) {
-					placeholder->property_set_fallback(G->get().first, G->get().second, NULL);
+				for (List<Pair<StringName, Variant>>::Element *G = scr->pending_reload_state[obj_id].properties.front(); G; G = G->next()) {
+					placeholder->property_set_fallback(G->get().first, G->get().second, nullptr);
 				}
 
 				scr->pending_reload_state.erase(obj_id);
@@ -899,9 +963,9 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) {
 		return;
 	}
 
-	List<Ref<CSharpScript> > to_reload_state;
+	List<Ref<CSharpScript>> to_reload_state;
 
-	for (List<Ref<CSharpScript> >::Element *E = to_reload.front(); E; E = E->next()) {
+	for (List<Ref<CSharpScript>>::Element *E = to_reload.front(); E; E = E->next()) {
 		Ref<CSharpScript> script = E->get();
 
 		if (!script->get_path().empty()) {
@@ -923,12 +987,12 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) {
 			GDMonoAssembly *project_assembly = gdmono->get_project_assembly();
 
 			// Search in project and tools assemblies first as those are the most likely to have the class
-			GDMonoClass *script_class = (project_assembly ? project_assembly->get_class(class_namespace, class_name) : NULL);
+			GDMonoClass *script_class = (project_assembly ? project_assembly->get_class(class_namespace, class_name) : nullptr);
 
 #ifdef TOOLS_ENABLED
 			if (!script_class) {
 				GDMonoAssembly *tools_assembly = gdmono->get_tools_assembly();
-				script_class = (tools_assembly ? tools_assembly->get_class(class_namespace, class_name) : NULL);
+				script_class = (tools_assembly ? tools_assembly->get_class(class_namespace, class_name) : nullptr);
 			}
 #endif
 
@@ -954,7 +1018,7 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) {
 			CSharpScript::initialize_for_managed_type(script, script_class, native);
 		}
 
-		String native_name = NATIVE_GDMONOCLASS_NAME(script->native);
+		StringName native_name = NATIVE_GDMONOCLASS_NAME(script->native);
 
 		{
 			for (Set<ObjectID>::Element *F = script->pending_reload_instances.front(); F; F = F->next()) {
@@ -999,17 +1063,17 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) {
 					continue;
 				}
 #else
-				CRASH_COND(si != NULL);
+				CRASH_COND(si != nullptr);
 #endif
 				// Re-create script instance
-				obj->set_script(script.get_ref_ptr()); // will create the script instance as well
+				obj->set_script(script); // will create the script instance as well
 			}
 		}
 
 		to_reload_state.push_back(script);
 	}
 
-	for (List<Ref<CSharpScript> >::Element *E = to_reload_state.front(); E; E = E->next()) {
+	for (List<Ref<CSharpScript>>::Element *E = to_reload_state.front(); E; E = E->next()) {
 		Ref<CSharpScript> script = E->get();
 
 		for (Set<ObjectID>::Element *F = script->pending_reload_instances.front(); F; F = F->next()) {
@@ -1027,19 +1091,85 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) {
 
 			CSharpScript::StateBackup &state_backup = script->pending_reload_state[obj_id];
 
-			for (List<Pair<StringName, Variant> >::Element *G = state_backup.properties.front(); G; G = G->next()) {
+			for (List<Pair<StringName, Variant>>::Element *G = state_backup.properties.front(); G; G = G->next()) {
 				obj->get_script_instance()->set(G->get().first, G->get().second);
 			}
 
-			// Call OnAfterDeserialization
 			CSharpInstance *csi = CAST_CSHARP_INSTANCE(obj->get_script_instance());
-			if (csi && csi->script->script_class->implements_interface(CACHED_CLASS(ISerializationListener)))
-				obj->get_script_instance()->call_multilevel(string_names.on_after_deserialize);
+
+			if (csi) {
+				for (List<Pair<StringName, Array>>::Element *G = state_backup.event_signals.front(); G; G = G->next()) {
+					const StringName &name = G->get().first;
+					const Array &serialized_data = G->get().second;
+
+					Map<StringName, CSharpScript::EventSignal>::Element *match = script->event_signals.find(name);
+
+					if (!match) {
+						// The event or its signal attribute were removed
+						continue;
+					}
+
+					const CSharpScript::EventSignal &event_signal = match->value();
+
+					MonoObject *managed_serialized_data = GDMonoMarshal::variant_to_mono_object(serialized_data);
+					MonoDelegate *delegate = nullptr;
+
+					MonoException *exc = nullptr;
+					bool success = (bool)CACHED_METHOD_THUNK(DelegateUtils, TryDeserializeDelegate).invoke(managed_serialized_data, &delegate, &exc);
+
+					if (exc) {
+						GDMonoUtils::debug_print_unhandled_exception(exc);
+						continue;
+					}
+
+					if (success) {
+						ERR_CONTINUE(delegate == nullptr);
+						event_signal.field->set_value(csi->get_mono_object(), (MonoObject *)delegate);
+					} else if (OS::get_singleton()->is_stdout_verbose()) {
+						OS::get_singleton()->print("Failed to deserialize event signal delegate\n");
+					}
+				}
+
+				// Call OnAfterDeserialization
+				if (csi->script->script_class->implements_interface(CACHED_CLASS(ISerializationListener))) {
+					obj->get_script_instance()->call(string_names.on_after_deserialize);
+				}
+			}
 		}
 
 		script->pending_reload_instances.clear();
 	}
 
+	// Deserialize managed callables
+	{
+		MutexLock lock(ManagedCallable::instances_mutex);
+
+		for (Map<ManagedCallable *, Array>::Element *elem = ManagedCallable::instances_pending_reload.front(); elem; elem = elem->next()) {
+			ManagedCallable *managed_callable = elem->key();
+			const Array &serialized_data = elem->value();
+
+			MonoObject *managed_serialized_data = GDMonoMarshal::variant_to_mono_object(serialized_data);
+			MonoDelegate *delegate = nullptr;
+
+			MonoException *exc = nullptr;
+			bool success = (bool)CACHED_METHOD_THUNK(DelegateUtils, TryDeserializeDelegate).invoke(managed_serialized_data, &delegate, &exc);
+
+			if (exc) {
+				GDMonoUtils::debug_print_unhandled_exception(exc);
+				continue;
+			}
+
+			if (success) {
+				ERR_CONTINUE(delegate == nullptr);
+				managed_callable->set_delegate(delegate);
+			} else if (OS::get_singleton()->is_stdout_verbose()) {
+				OS::get_singleton()->print("Failed to deserialize delegate\n");
+			}
+		}
+
+		ManagedCallable::instances_pending_reload.clear();
+	}
+
 #ifdef TOOLS_ENABLED
 	// FIXME: Hack to refresh editor in order to display new properties and signals. See if there is a better alternative.
 	if (Engine::get_singleton()->is_editor_hint()) {
@@ -1051,7 +1181,6 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) {
 #endif
 
 void CSharpLanguage::_load_scripts_metadata() {
-
 	scripts_metadata.clear();
 
 	String scripts_metadata_filename = "scripts_metadata.";
@@ -1080,7 +1209,7 @@ void CSharpLanguage::_load_scripts_metadata() {
 		int err_line;
 		Error json_err = JSON::parse(old_json, old_dict_var, err_str, err_line);
 		if (json_err != OK) {
-			ERR_PRINTS("Failed to parse metadata file: '" + err_str + "' (" + String::num_int64(err_line) + ").");
+			ERR_PRINT("Failed to parse metadata file: '" + err_str + "' (" + String::num_int64(err_line) + ").");
 			return;
 		}
 
@@ -1096,24 +1225,20 @@ void CSharpLanguage::_load_scripts_metadata() {
 }
 
 void CSharpLanguage::get_recognized_extensions(List<String> *p_extensions) const {
-
 	p_extensions->push_back("cs");
 }
 
 #ifdef TOOLS_ENABLED
 Error CSharpLanguage::open_in_external_editor(const Ref<Script> &p_script, int p_line, int p_col) {
-
 	return (Error)(int)get_godotsharp_editor()->call("OpenInExternalEditor", p_script, p_line, p_col);
 }
 
 bool CSharpLanguage::overrides_external_editor() {
-
 	return get_godotsharp_editor()->call("OverridesExternalEditor");
 }
 #endif
 
 void CSharpLanguage::thread_enter() {
-
 #if 0
 	if (gdmono->is_runtime_initialized()) {
 		GDMonoUtils::attach_current_thread();
@@ -1122,7 +1247,6 @@ void CSharpLanguage::thread_enter() {
 }
 
 void CSharpLanguage::thread_exit() {
-
 #if 0
 	if (gdmono->is_runtime_initialized()) {
 		GDMonoUtils::detach_current_thread();
@@ -1131,13 +1255,12 @@ void CSharpLanguage::thread_exit() {
 }
 
 bool CSharpLanguage::debug_break_parse(const String &p_file, int p_line, const String &p_error) {
-
 	// Not a parser error in our case, but it's still used for other type of errors
-	if (ScriptDebugger::get_singleton() && Thread::get_caller_id() == Thread::get_main_id()) {
+	if (EngineDebugger::is_active() && Thread::get_caller_id() == Thread::get_main_id()) {
 		_debug_parse_err_line = p_line;
 		_debug_parse_err_file = p_file;
 		_debug_error = p_error;
-		ScriptDebugger::get_singleton()->debug(this, false, true);
+		EngineDebugger::get_script_debugger()->debug(this, false, true);
 		return true;
 	} else {
 		return false;
@@ -1145,12 +1268,11 @@ bool CSharpLanguage::debug_break_parse(const String &p_file, int p_line, const S
 }
 
 bool CSharpLanguage::debug_break(const String &p_error, bool p_allow_continue) {
-
-	if (ScriptDebugger::get_singleton() && Thread::get_caller_id() == Thread::get_main_id()) {
+	if (EngineDebugger::is_active() && Thread::get_caller_id() == Thread::get_main_id()) {
 		_debug_parse_err_line = -1;
 		_debug_parse_err_file = "";
 		_debug_error = p_error;
-		ScriptDebugger::get_singleton()->debug(this, p_allow_continue);
+		EngineDebugger::get_script_debugger()->debug(this, p_allow_continue);
 		return true;
 	} else {
 		return false;
@@ -1160,31 +1282,44 @@ bool CSharpLanguage::debug_break(const String &p_error, bool p_allow_continue) {
 void CSharpLanguage::_on_scripts_domain_unloaded() {
 	for (Map<Object *, CSharpScriptBinding>::Element *E = script_bindings.front(); E; E = E->next()) {
 		CSharpScriptBinding &script_binding = E->value();
+		script_binding.gchandle.release();
 		script_binding.inited = false;
 	}
 
+#ifdef GD_MONO_HOT_RELOAD
+	{
+		MutexLock lock(ManagedCallable::instances_mutex);
+
+		for (SelfList<ManagedCallable> *elem = ManagedCallable::instances.first(); elem; elem = elem->next()) {
+			ManagedCallable *managed_callable = elem->self();
+			managed_callable->delegate_handle.release();
+			managed_callable->delegate_invoke = nullptr;
+		}
+	}
+#endif
+
 	scripts_metadata_invalidated = true;
 }
 
 #ifdef TOOLS_ENABLED
 void CSharpLanguage::_editor_init_callback() {
-
 	register_editor_internal_calls();
 
 	// Initialize GodotSharpEditor
 
 	GDMonoClass *editor_klass = GDMono::get_singleton()->get_tools_assembly()->get_class("GodotTools", "GodotSharpEditor");
-	CRASH_COND(editor_klass == NULL);
+	CRASH_COND(editor_klass == nullptr);
 
 	MonoObject *mono_object = mono_object_new(mono_domain_get(), editor_klass->get_mono_ptr());
-	CRASH_COND(mono_object == NULL);
+	CRASH_COND(mono_object == nullptr);
 
-	MonoException *exc = NULL;
+	MonoException *exc = nullptr;
 	GDMonoUtils::runtime_object_init(mono_object, editor_klass, &exc);
 	UNHANDLED_EXCEPTION(exc);
 
-	EditorPlugin *godotsharp_editor = Object::cast_to<EditorPlugin>(GDMonoMarshal::mono_object_to_variant(mono_object));
-	CRASH_COND(godotsharp_editor == NULL);
+	EditorPlugin *godotsharp_editor = Object::cast_to<EditorPlugin>(
+			GDMonoMarshal::mono_object_to_variant(mono_object).operator Object *());
+	CRASH_COND(godotsharp_editor == nullptr);
 
 	// Enable it as a plugin
 	EditorNode::add_editor_plugin(godotsharp_editor);
@@ -1195,112 +1330,53 @@ void CSharpLanguage::_editor_init_callback() {
 #endif
 
 void CSharpLanguage::set_language_index(int p_idx) {
-
 	ERR_FAIL_COND(lang_idx != -1);
 	lang_idx = p_idx;
 }
 
-void CSharpLanguage::release_script_gchandle(Ref<MonoGCHandle> &p_gchandle) {
-
-	if (!p_gchandle->is_released()) { // Do not lock unnecessarily
-		SCOPED_MUTEX_LOCK(get_singleton()->script_gchandle_release_mutex);
-		p_gchandle->release();
+void CSharpLanguage::release_script_gchandle(MonoGCHandleData &p_gchandle) {
+	if (!p_gchandle.is_released()) { // Do not lock unnecessarily
+		MutexLock lock(get_singleton()->script_gchandle_release_mutex);
+		p_gchandle.release();
 	}
 }
 
-void CSharpLanguage::release_script_gchandle(MonoObject *p_expected_obj, Ref<MonoGCHandle> &p_gchandle) {
-
-	uint32_t pinned_gchandle = MonoGCHandle::new_strong_handle_pinned(p_expected_obj); // We might lock after this, so pin it
+void CSharpLanguage::release_script_gchandle(MonoObject *p_expected_obj, MonoGCHandleData &p_gchandle) {
+	uint32_t pinned_gchandle = GDMonoUtils::new_strong_gchandle_pinned(p_expected_obj); // We might lock after this, so pin it
 
-	if (!p_gchandle->is_released()) { // Do not lock unnecessarily
-		SCOPED_MUTEX_LOCK(get_singleton()->script_gchandle_release_mutex);
+	if (!p_gchandle.is_released()) { // Do not lock unnecessarily
+		MutexLock lock(get_singleton()->script_gchandle_release_mutex);
 
-		MonoObject *target = p_gchandle->get_target();
+		MonoObject *target = p_gchandle.get_target();
 
 		// We release the gchandle if it points to the MonoObject* we expect (otherwise it was
 		// already released and could have been replaced) or if we can't get its target MonoObject*
 		// (which doesn't necessarily mean it was released, and we want it released in order to
 		// avoid locking other threads unnecessarily).
-		if (target == p_expected_obj || target == NULL) {
-			p_gchandle->release();
+		if (target == p_expected_obj || target == nullptr) {
+			p_gchandle.release();
 		}
 	}
 
-	MonoGCHandle::free_handle(pinned_gchandle);
+	GDMonoUtils::free_gchandle(pinned_gchandle);
 }
 
 CSharpLanguage::CSharpLanguage() {
-
 	ERR_FAIL_COND_MSG(singleton, "C# singleton already exist.");
 	singleton = this;
-
-	finalizing = false;
-
-	gdmono = NULL;
-
-#ifdef NO_THREADS
-	script_instances_mutex = NULL;
-	script_gchandle_release_mutex = NULL;
-	language_bind_mutex = NULL;
-#else
-	script_instances_mutex = Mutex::create();
-	script_gchandle_release_mutex = Mutex::create();
-	language_bind_mutex = Mutex::create();
-#endif
-
-#ifdef DEBUG_ENABLED
-#ifdef NO_THREADS
-	unsafe_object_references_lock = NULL;
-#else
-	unsafe_object_references_lock = Mutex::create();
-#endif
-#endif
-
-	lang_idx = -1;
-
-	scripts_metadata_invalidated = true;
-
-#ifdef TOOLS_ENABLED
-	godotsharp_editor = NULL;
-#endif
 }
 
 CSharpLanguage::~CSharpLanguage() {
-
-	finish();
-
-	if (script_instances_mutex) {
-		memdelete(script_instances_mutex);
-		script_instances_mutex = NULL;
-	}
-
-	if (language_bind_mutex) {
-		memdelete(language_bind_mutex);
-		language_bind_mutex = NULL;
-	}
-
-	if (script_gchandle_release_mutex) {
-		memdelete(script_gchandle_release_mutex);
-		script_gchandle_release_mutex = NULL;
-	}
-
-#ifdef DEBUG_ENABLED
-	if (unsafe_object_references_lock) {
-		memdelete(unsafe_object_references_lock);
-		unsafe_object_references_lock = NULL;
-	}
-#endif
-
-	singleton = NULL;
+	finalize();
+	singleton = nullptr;
 }
 
 bool CSharpLanguage::setup_csharp_script_binding(CSharpScriptBinding &r_script_binding, Object *p_object) {
-
 #ifdef DEBUG_ENABLED
 	// I don't trust you
 	if (p_object->get_script_instance()) {
 		CSharpInstance *csharp_instance = CAST_CSHARP_INSTANCE(p_object->get_script_instance());
-		CRASH_COND(csharp_instance != NULL && !csharp_instance->is_destructing_script_instance());
+		CRASH_COND(csharp_instance != nullptr && !csharp_instance->is_destructing_script_instance());
 	}
 #endif
 
@@ -1308,8 +1384,9 @@ bool CSharpLanguage::setup_csharp_script_binding(CSharpScriptBinding &r_script_b
 
 	// ¯\_(ツ)_/¯
 	const ClassDB::ClassInfo *classinfo = ClassDB::classes.getptr(type_name);
-	while (classinfo && !classinfo->exposed)
+	while (classinfo && !classinfo->exposed) {
 		classinfo = classinfo->inherits_ptr;
+	}
 	ERR_FAIL_NULL_V(classinfo, false);
 	type_name = classinfo->name;
 
@@ -1324,7 +1401,7 @@ bool CSharpLanguage::setup_csharp_script_binding(CSharpScriptBinding &r_script_b
 	r_script_binding.inited = true;
 	r_script_binding.type_name = type_name;
 	r_script_binding.wrapper_class = type_class; // cache
-	r_script_binding.gchandle = MonoGCHandle::create_strong(mono_object);
+	r_script_binding.gchandle = MonoGCHandleData::new_strong_handle(mono_object);
 	r_script_binding.owner = p_object;
 
 	// Tie managed to unmanaged
@@ -1344,29 +1421,28 @@ bool CSharpLanguage::setup_csharp_script_binding(CSharpScriptBinding &r_script_b
 }
 
 void *CSharpLanguage::alloc_instance_binding_data(Object *p_object) {
-
-	SCOPED_MUTEX_LOCK(language_bind_mutex);
+	MutexLock lock(language_bind_mutex);
 
 	Map<Object *, CSharpScriptBinding>::Element *match = script_bindings.find(p_object);
-	if (match)
+	if (match) {
 		return (void *)match;
+	}
 
 	CSharpScriptBinding script_binding;
 
-	if (!setup_csharp_script_binding(script_binding, p_object))
-		return NULL;
+	if (!setup_csharp_script_binding(script_binding, p_object)) {
+		return nullptr;
+	}
 
 	return (void *)insert_script_binding(p_object, script_binding);
 }
 
 Map<Object *, CSharpScriptBinding>::Element *CSharpLanguage::insert_script_binding(Object *p_object, const CSharpScriptBinding &p_script_binding) {
-
 	return script_bindings.insert(p_object, p_script_binding);
 }
 
 void CSharpLanguage::free_instance_binding_data(void *p_data) {
-
-	if (GDMono::get_singleton() == NULL) {
+	if (GDMono::get_singleton() == nullptr) {
 #ifdef DEBUG_ENABLED
 		CRASH_COND(!script_bindings.empty());
 #endif
@@ -1374,13 +1450,14 @@ void CSharpLanguage::free_instance_binding_data(void *p_data) {
 		return;
 	}
 
-	if (finalizing)
+	if (finalizing) {
 		return; // inside CSharpLanguage::finish(), all the gchandle bindings are released there
+	}
 
 	GD_MONO_ASSERT_THREAD_ATTACHED;
 
 	{
-		SCOPED_MUTEX_LOCK(language_bind_mutex);
+		MutexLock lock(language_bind_mutex);
 
 		Map<Object *, CSharpScriptBinding>::Element *data = (Map<Object *, CSharpScriptBinding>::Element *)p_data;
 
@@ -1389,10 +1466,11 @@ void CSharpLanguage::free_instance_binding_data(void *p_data) {
 		if (script_binding.inited) {
 			// Set the native instance field to IntPtr.Zero, if not yet garbage collected.
 			// This is done to avoid trying to dispose the native instance from Dispose(bool).
-			MonoObject *mono_object = script_binding.gchandle->get_target();
+			MonoObject *mono_object = script_binding.gchandle.get_target();
 			if (mono_object) {
-				CACHED_FIELD(GodotObject, ptr)->set_value_raw(mono_object, NULL);
+				CACHED_FIELD(GodotObject, ptr)->set_value_raw(mono_object, nullptr);
 			}
+			script_binding.gchandle.release();
 		}
 
 		script_bindings.erase(data);
@@ -1400,7 +1478,6 @@ void CSharpLanguage::free_instance_binding_data(void *p_data) {
 }
 
 void CSharpLanguage::refcount_incremented_instance_binding(Object *p_object) {
-
 	Reference *ref_owner = Object::cast_to<Reference>(p_object);
 
 #ifdef DEBUG_ENABLED
@@ -1412,31 +1489,32 @@ void CSharpLanguage::refcount_incremented_instance_binding(Object *p_object) {
 	CRASH_COND(!data);
 
 	CSharpScriptBinding &script_binding = ((Map<Object *, CSharpScriptBinding>::Element *)data)->get();
-	Ref<MonoGCHandle> &gchandle = script_binding.gchandle;
+	MonoGCHandleData &gchandle = script_binding.gchandle;
 
-	if (!script_binding.inited)
+	if (!script_binding.inited) {
 		return;
+	}
 
-	if (ref_owner->reference_get_count() > 1 && gchandle->is_weak()) { // The managed side also holds a reference, hence 1 instead of 0
+	if (ref_owner->reference_get_count() > 1 && gchandle.is_weak()) { // The managed side also holds a reference, hence 1 instead of 0
 		GD_MONO_SCOPE_THREAD_ATTACH;
 
 		// The reference count was increased after the managed side was the only one referencing our owner.
 		// This means the owner is being referenced again by the unmanaged side,
 		// so the owner must hold the managed side alive again to avoid it from being GCed.
 
-		MonoObject *target = gchandle->get_target();
-		if (!target)
+		MonoObject *target = gchandle.get_target();
+		if (!target) {
 			return; // Called after the managed side was collected, so nothing to do here
+		}
 
 		// Release the current weak handle and replace it with a strong handle.
-		uint32_t strong_gchandle = MonoGCHandle::new_strong_handle(target);
-		gchandle->release();
-		gchandle->set_handle(strong_gchandle, MonoGCHandle::STRONG_HANDLE);
+		MonoGCHandleData strong_gchandle = MonoGCHandleData::new_strong_handle(target);
+		gchandle.release();
+		gchandle = strong_gchandle;
 	}
 }
 
 bool CSharpLanguage::refcount_decremented_instance_binding(Object *p_object) {
-
 	Reference *ref_owner = Object::cast_to<Reference>(p_object);
 
 #ifdef DEBUG_ENABLED
@@ -1448,27 +1526,29 @@ bool CSharpLanguage::refcount_decremented_instance_binding(Object *p_object) {
 	CRASH_COND(!data);
 
 	CSharpScriptBinding &script_binding = ((Map<Object *, CSharpScriptBinding>::Element *)data)->get();
-	Ref<MonoGCHandle> &gchandle = script_binding.gchandle;
+	MonoGCHandleData &gchandle = script_binding.gchandle;
 
 	int refcount = ref_owner->reference_get_count();
 
-	if (!script_binding.inited)
+	if (!script_binding.inited) {
 		return refcount == 0;
+	}
 
-	if (refcount == 1 && gchandle.is_valid() && !gchandle->is_weak()) { // The managed side also holds a reference, hence 1 instead of 0
+	if (refcount == 1 && !gchandle.is_released() && !gchandle.is_weak()) { // The managed side also holds a reference, hence 1 instead of 0
 		GD_MONO_SCOPE_THREAD_ATTACH;
 
 		// If owner owner is no longer referenced by the unmanaged side,
 		// the managed instance takes responsibility of deleting the owner when GCed.
 
-		MonoObject *target = gchandle->get_target();
-		if (!target)
+		MonoObject *target = gchandle.get_target();
+		if (!target) {
 			return refcount == 0; // Called after the managed side was collected, so nothing to do here
+		}
 
 		// Release the current strong handle and replace it with a weak handle.
-		uint32_t weak_gchandle = MonoGCHandle::new_weak_handle(target);
-		gchandle->release();
-		gchandle->set_handle(weak_gchandle, MonoGCHandle::WEAK_HANDLE);
+		MonoGCHandleData weak_gchandle = MonoGCHandleData::new_weak_handle(target);
+		gchandle.release();
+		gchandle = weak_gchandle;
 
 		return false;
 	}
@@ -1476,19 +1556,18 @@ bool CSharpLanguage::refcount_decremented_instance_binding(Object *p_object) {
 	return refcount == 0;
 }
 
-CSharpInstance *CSharpInstance::create_for_managed_type(Object *p_owner, CSharpScript *p_script, const Ref<MonoGCHandle> &p_gchandle) {
-
-	CSharpInstance *instance = memnew(CSharpInstance);
+CSharpInstance *CSharpInstance::create_for_managed_type(Object *p_owner, CSharpScript *p_script, const MonoGCHandleData &p_gchandle) {
+	CSharpInstance *instance = memnew(CSharpInstance(Ref<CSharpScript>(p_script)));
 
 	Reference *ref = Object::cast_to<Reference>(p_owner);
 
-	instance->base_ref = ref != NULL;
-	instance->script = Ref<CSharpScript>(p_script);
+	instance->base_ref = ref != nullptr;
 	instance->owner = p_owner;
 	instance->gchandle = p_gchandle;
 
-	if (instance->base_ref)
+	if (instance->base_ref) {
 		instance->_reference_owner_unsafe();
+	}
 
 	p_script->instances.insert(p_owner);
 
@@ -1496,9 +1575,8 @@ CSharpInstance *CSharpInstance::create_for_managed_type(Object *p_owner, CSharpS
 }
 
 MonoObject *CSharpInstance::get_mono_object() const {
-
-	ERR_FAIL_COND_V(gchandle.is_null(), NULL);
-	return gchandle->get_target();
+	ERR_FAIL_COND_V(gchandle.is_released(), nullptr);
+	return gchandle.get_target();
 }
 
 Object *CSharpInstance::get_owner() {
@@ -1506,7 +1584,6 @@ Object *CSharpInstance::get_owner() {
 }
 
 bool CSharpInstance::set(const StringName &p_name, const Variant &p_value) {
-
 	ERR_FAIL_COND_V(!script.is_valid(), false);
 
 	GD_MONO_SCOPE_THREAD_ATTACH;
@@ -1547,8 +1624,9 @@ bool CSharpInstance::set(const StringName &p_name, const Variant &p_value) {
 
 			MonoObject *ret = method->invoke(mono_object, args);
 
-			if (ret && GDMonoMarshal::unbox<MonoBoolean>(ret))
+			if (ret && GDMonoMarshal::unbox<MonoBoolean>(ret)) {
 				return true;
+			}
 
 			break;
 		}
@@ -1560,7 +1638,6 @@ bool CSharpInstance::set(const StringName &p_name, const Variant &p_value) {
 }
 
 bool CSharpInstance::get(const StringName &p_name, Variant &r_ret) const {
-
 	ERR_FAIL_COND_V(!script.is_valid(), false);
 
 	GD_MONO_SCOPE_THREAD_ATTACH;
@@ -1582,7 +1659,7 @@ bool CSharpInstance::get(const StringName &p_name, Variant &r_ret) const {
 		GDMonoProperty *property = top->get_property(p_name);
 
 		if (property) {
-			MonoException *exc = NULL;
+			MonoException *exc = nullptr;
 			MonoObject *value = property->get_value(mono_object, &exc);
 			if (exc) {
 				r_ret = Variant();
@@ -1623,8 +1700,7 @@ bool CSharpInstance::get(const StringName &p_name, Variant &r_ret) const {
 	return false;
 }
 
-void CSharpInstance::get_properties_state_for_reloading(List<Pair<StringName, Variant> > &r_state) {
-
+void CSharpInstance::get_properties_state_for_reloading(List<Pair<StringName, Variant>> &r_state) {
 	List<PropertyInfo> pinfo;
 	get_property_list(&pinfo);
 
@@ -1635,8 +1711,9 @@ void CSharpInstance::get_properties_state_for_reloading(List<Pair<StringName, Va
 		ManagedType managedType;
 
 		GDMonoField *field = script->script_class->get_field(state_pair.first);
-		if (!field)
+		if (!field) {
 			continue; // Properties ignored. We get the property baking fields instead.
+		}
 
 		managedType = field->get_type();
 
@@ -1648,8 +1725,38 @@ void CSharpInstance::get_properties_state_for_reloading(List<Pair<StringName, Va
 	}
 }
 
-void CSharpInstance::get_property_list(List<PropertyInfo> *p_properties) const {
+void CSharpInstance::get_event_signals_state_for_reloading(List<Pair<StringName, Array>> &r_state) {
+	MonoObject *owner_managed = get_mono_object();
+	ERR_FAIL_NULL(owner_managed);
+
+	for (const Map<StringName, CSharpScript::EventSignal>::Element *E = script->event_signals.front(); E; E = E->next()) {
+		const CSharpScript::EventSignal &event_signal = E->value();
+
+		MonoDelegate *delegate_field_value = (MonoDelegate *)event_signal.field->get_value(owner_managed);
+		if (!delegate_field_value) {
+			continue; // Empty
+		}
+
+		Array serialized_data;
+		MonoObject *managed_serialized_data = GDMonoMarshal::variant_to_mono_object(serialized_data);
+
+		MonoException *exc = nullptr;
+		bool success = (bool)CACHED_METHOD_THUNK(DelegateUtils, TrySerializeDelegate).invoke(delegate_field_value, managed_serialized_data, &exc);
 
+		if (exc) {
+			GDMonoUtils::debug_print_unhandled_exception(exc);
+			continue;
+		}
+
+		if (success) {
+			r_state.push_back(Pair<StringName, Array>(event_signal.field->get_name(), serialized_data));
+		} else if (OS::get_singleton()->is_stdout_verbose()) {
+			OS::get_singleton()->print("Failed to serialize event signal delegate\n");
+		}
+	}
+}
+
+void CSharpInstance::get_property_list(List<PropertyInfo> *p_properties) const {
 	for (Map<StringName, PropertyInfo>::Element *E = script->member_info.front(); E; E = E->next()) {
 		p_properties->push_back(E->value());
 	}
@@ -1673,8 +1780,9 @@ void CSharpInstance::get_property_list(List<PropertyInfo> *p_properties) const {
 
 			if (ret) {
 				Array array = Array(GDMonoMarshal::mono_object_to_variant(ret));
-				for (int i = 0, size = array.size(); i < size; i++)
+				for (int i = 0, size = array.size(); i < size; i++) {
 					p_properties->push_back(PropertyInfo::from_dict(array.get(i)));
+				}
 				return;
 			}
 
@@ -1686,23 +1794,24 @@ void CSharpInstance::get_property_list(List<PropertyInfo> *p_properties) const {
 }
 
 Variant::Type CSharpInstance::get_property_type(const StringName &p_name, bool *r_is_valid) const {
-
 	if (script->member_info.has(p_name)) {
-		if (r_is_valid)
+		if (r_is_valid) {
 			*r_is_valid = true;
+		}
 		return script->member_info[p_name].type;
 	}
 
-	if (r_is_valid)
+	if (r_is_valid) {
 		*r_is_valid = false;
+	}
 
 	return Variant::NIL;
 }
 
 bool CSharpInstance::has_method(const StringName &p_method) const {
-
-	if (!script.is_valid())
+	if (!script.is_valid()) {
 		return false;
+	}
 
 	GD_MONO_SCOPE_THREAD_ATTACH;
 
@@ -1719,17 +1828,15 @@ bool CSharpInstance::has_method(const StringName &p_method) const {
 	return false;
 }
 
-Variant CSharpInstance::call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error) {
-
-	if (!script.is_valid())
-		ERR_FAIL_V(Variant());
+Variant CSharpInstance::call(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
+	ERR_FAIL_COND_V(!script.is_valid(), Variant());
 
 	GD_MONO_SCOPE_THREAD_ATTACH;
 
 	MonoObject *mono_object = get_mono_object();
 
 	if (!mono_object) {
-		r_error.error = Variant::CallError::CALL_ERROR_INSTANCE_IS_NULL;
+		r_error.error = Callable::CallError::CALL_ERROR_INSTANCE_IS_NULL;
 		ERR_FAIL_V(Variant());
 	}
 
@@ -1741,7 +1848,7 @@ Variant CSharpInstance::call(const StringName &p_method, const Variant **p_args,
 		if (method) {
 			MonoObject *return_value = method->invoke(mono_object, p_args);
 
-			r_error.error = Variant::CallError::CALL_OK;
+			r_error.error = Callable::CallError::CALL_OK;
 
 			if (return_value) {
 				return GDMonoMarshal::mono_object_to_variant(return_value);
@@ -1753,54 +1860,15 @@ Variant CSharpInstance::call(const StringName &p_method, const Variant **p_args,
 		top = top->get_parent_class();
 	}
 
-	r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+	r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 
 	return Variant();
 }
 
-void CSharpInstance::call_multilevel(const StringName &p_method, const Variant **p_args, int p_argcount) {
-
-	GD_MONO_SCOPE_THREAD_ATTACH;
-
-	if (script.is_valid()) {
-		MonoObject *mono_object = get_mono_object();
-
-		ERR_FAIL_NULL(mono_object);
-
-		_call_multilevel(mono_object, p_method, p_args, p_argcount);
-	}
-}
-
-void CSharpInstance::_call_multilevel(MonoObject *p_mono_object, const StringName &p_method, const Variant **p_args, int p_argcount) {
-
-	GD_MONO_ASSERT_THREAD_ATTACHED;
-
-	GDMonoClass *top = script->script_class;
-
-	while (top && top != script->native) {
-		GDMonoMethod *method = top->get_method(p_method, p_argcount);
-
-		if (method) {
-			method->invoke(p_mono_object, p_args);
-			return;
-		}
-
-		top = top->get_parent_class();
-	}
-}
-
-void CSharpInstance::call_multilevel_reversed(const StringName &p_method, const Variant **p_args, int p_argcount) {
-
-	// Sorry, the method is the one that controls the call order
-
-	call_multilevel(p_method, p_args, p_argcount);
-}
-
 bool CSharpInstance::_reference_owner_unsafe() {
-
 #ifdef DEBUG_ENABLED
 	CRASH_COND(!base_ref);
-	CRASH_COND(owner == NULL);
+	CRASH_COND(owner == nullptr);
 	CRASH_COND(unsafe_referenced); // already referenced
 #endif
 
@@ -1819,14 +1887,14 @@ bool CSharpInstance::_reference_owner_unsafe() {
 }
 
 bool CSharpInstance::_unreference_owner_unsafe() {
-
 #ifdef DEBUG_ENABLED
 	CRASH_COND(!base_ref);
-	CRASH_COND(owner == NULL);
+	CRASH_COND(owner == nullptr);
 #endif
 
-	if (!unsafe_referenced)
+	if (!unsafe_referenced) {
 		return false; // Already unreferenced
+	}
 
 	unsafe_referenced = false;
 
@@ -1841,19 +1909,15 @@ bool CSharpInstance::_unreference_owner_unsafe() {
 }
 
 MonoObject *CSharpInstance::_internal_new_managed() {
-#ifdef DEBUG_ENABLED
-	CRASH_COND(!gchandle.is_valid());
-#endif
-
 	// Search the constructor first, to fail with an error if it's not found before allocating anything else.
 	GDMonoMethod *ctor = script->script_class->get_method(CACHED_STRING_NAME(dotctor), 0);
-	ERR_FAIL_NULL_V_MSG(ctor, NULL,
+	ERR_FAIL_NULL_V_MSG(ctor, nullptr,
 			"Cannot create script instance because the class does not define a parameterless constructor: '" + script->get_path() + "'.");
 
 	CSharpLanguage::get_singleton()->release_script_gchandle(gchandle);
 
-	ERR_FAIL_NULL_V(owner, NULL);
-	ERR_FAIL_COND_V(script.is_null(), NULL);
+	ERR_FAIL_NULL_V(owner, nullptr);
+	ERR_FAIL_COND_V(script.is_null(), nullptr);
 
 	MonoObject *mono_object = mono_object_new(mono_domain_get(), script->script_class->get_mono_ptr());
 
@@ -1863,41 +1927,42 @@ MonoObject *CSharpInstance::_internal_new_managed() {
 
 		bool die = _unreference_owner_unsafe();
 		// Not ok for the owner to die here. If there is a situation where this can happen, it will be considered a bug.
-		CRASH_COND(die == true);
+		CRASH_COND(die);
 
-		owner = NULL;
+		owner = nullptr;
 
-		ERR_FAIL_V_MSG(NULL, "Failed to allocate memory for the object.");
+		ERR_FAIL_V_MSG(nullptr, "Failed to allocate memory for the object.");
 	}
 
 	// Tie managed to unmanaged
-	gchandle = MonoGCHandle::create_strong(mono_object);
+	gchandle = MonoGCHandleData::new_strong_handle(mono_object);
 
-	if (base_ref)
+	if (base_ref) {
 		_reference_owner_unsafe(); // Here, after assigning the gchandle (for the refcount_incremented callback)
+	}
 
 	CACHED_FIELD(GodotObject, ptr)->set_value_raw(mono_object, owner);
 
 	// Construct
-	ctor->invoke_raw(mono_object, NULL);
+	ctor->invoke_raw(mono_object, nullptr);
 
 	return mono_object;
 }
 
 void CSharpInstance::mono_object_disposed(MonoObject *p_obj) {
+	disconnect_event_signals();
 
 #ifdef DEBUG_ENABLED
 	CRASH_COND(base_ref);
-	CRASH_COND(gchandle.is_null());
+	CRASH_COND(gchandle.is_released());
 #endif
 	CSharpLanguage::get_singleton()->release_script_gchandle(p_obj, gchandle);
 }
 
 void CSharpInstance::mono_object_disposed_baseref(MonoObject *p_obj, bool p_is_finalizer, bool &r_delete_owner, bool &r_remove_script_instance) {
-
 #ifdef DEBUG_ENABLED
 	CRASH_COND(!base_ref);
-	CRASH_COND(gchandle.is_null());
+	CRASH_COND(gchandle.is_released());
 #endif
 
 	r_remove_script_instance = false;
@@ -1927,16 +1992,42 @@ void CSharpInstance::mono_object_disposed_baseref(MonoObject *p_obj, bool p_is_f
 	}
 }
 
-void CSharpInstance::refcount_incremented() {
+void CSharpInstance::connect_event_signals() {
+	for (const Map<StringName, CSharpScript::EventSignal>::Element *E = script->event_signals.front(); E; E = E->next()) {
+		const CSharpScript::EventSignal &event_signal = E->value();
+
+		StringName signal_name = event_signal.field->get_name();
 
+		// TODO: Use pooling for ManagedCallable instances.
+		auto event_signal_callable = memnew(EventSignalCallable(owner, &event_signal));
+
+		owner->connect(signal_name, Callable(event_signal_callable));
+	}
+}
+
+void CSharpInstance::disconnect_event_signals() {
+	for (const Map<StringName, CSharpScript::EventSignal>::Element *E = script->event_signals.front(); E; E = E->next()) {
+		const CSharpScript::EventSignal &event_signal = E->value();
+
+		StringName signal_name = event_signal.field->get_name();
+
+		// TODO: It would be great if we could store this EventSignalCallable on the stack.
+		// The problem is that Callable memdeletes it when it's destructed...
+		auto event_signal_callable = memnew(EventSignalCallable(owner, &event_signal));
+
+		owner->disconnect(signal_name, Callable(event_signal_callable));
+	}
+}
+
+void CSharpInstance::refcount_incremented() {
 #ifdef DEBUG_ENABLED
 	CRASH_COND(!base_ref);
-	CRASH_COND(owner == NULL);
+	CRASH_COND(owner == nullptr);
 #endif
 
 	Reference *ref_owner = Object::cast_to<Reference>(owner);
 
-	if (ref_owner->reference_get_count() > 1 && gchandle->is_weak()) { // The managed side also holds a reference, hence 1 instead of 0
+	if (ref_owner->reference_get_count() > 1 && gchandle.is_weak()) { // The managed side also holds a reference, hence 1 instead of 0
 		GD_MONO_SCOPE_THREAD_ATTACH;
 
 		// The reference count was increased after the managed side was the only one referencing our owner.
@@ -1944,33 +2035,32 @@ void CSharpInstance::refcount_incremented() {
 		// so the owner must hold the managed side alive again to avoid it from being GCed.
 
 		// Release the current weak handle and replace it with a strong handle.
-		uint32_t strong_gchandle = MonoGCHandle::new_strong_handle(gchandle->get_target());
-		gchandle->release();
-		gchandle->set_handle(strong_gchandle, MonoGCHandle::STRONG_HANDLE);
+		MonoGCHandleData strong_gchandle = MonoGCHandleData::new_strong_handle(gchandle.get_target());
+		gchandle.release();
+		gchandle = strong_gchandle;
 	}
 }
 
 bool CSharpInstance::refcount_decremented() {
-
 #ifdef DEBUG_ENABLED
 	CRASH_COND(!base_ref);
-	CRASH_COND(owner == NULL);
+	CRASH_COND(owner == nullptr);
 #endif
 
 	Reference *ref_owner = Object::cast_to<Reference>(owner);
 
 	int refcount = ref_owner->reference_get_count();
 
-	if (refcount == 1 && !gchandle->is_weak()) { // The managed side also holds a reference, hence 1 instead of 0
+	if (refcount == 1 && !gchandle.is_weak()) { // The managed side also holds a reference, hence 1 instead of 0
 		GD_MONO_SCOPE_THREAD_ATTACH;
 
 		// If owner owner is no longer referenced by the unmanaged side,
 		// the managed instance takes responsibility of deleting the owner when GCed.
 
 		// Release the current strong handle and replace it with a weak handle.
-		uint32_t weak_gchandle = MonoGCHandle::new_weak_handle(gchandle->get_target());
-		gchandle->release();
-		gchandle->set_handle(weak_gchandle, MonoGCHandle::WEAK_HANDLE);
+		MonoGCHandleData weak_gchandle = MonoGCHandleData::new_weak_handle(gchandle.get_target());
+		gchandle.release();
+		gchandle = weak_gchandle;
 
 		return false;
 	}
@@ -1980,71 +2070,47 @@ bool CSharpInstance::refcount_decremented() {
 	return ref_dying;
 }
 
-MultiplayerAPI::RPCMode CSharpInstance::_member_get_rpc_mode(IMonoClassMember *p_member) const {
-
-	if (p_member->has_attribute(CACHED_CLASS(RemoteAttribute)))
-		return MultiplayerAPI::RPC_MODE_REMOTE;
-	if (p_member->has_attribute(CACHED_CLASS(MasterAttribute)))
-		return MultiplayerAPI::RPC_MODE_MASTER;
-	if (p_member->has_attribute(CACHED_CLASS(PuppetAttribute)))
-		return MultiplayerAPI::RPC_MODE_PUPPET;
-	if (p_member->has_attribute(CACHED_CLASS(SlaveAttribute)))
-		return MultiplayerAPI::RPC_MODE_PUPPET;
-	if (p_member->has_attribute(CACHED_CLASS(RemoteSyncAttribute)))
-		return MultiplayerAPI::RPC_MODE_REMOTESYNC;
-	if (p_member->has_attribute(CACHED_CLASS(SyncAttribute)))
-		return MultiplayerAPI::RPC_MODE_REMOTESYNC;
-	if (p_member->has_attribute(CACHED_CLASS(MasterSyncAttribute)))
-		return MultiplayerAPI::RPC_MODE_MASTERSYNC;
-	if (p_member->has_attribute(CACHED_CLASS(PuppetSyncAttribute)))
-		return MultiplayerAPI::RPC_MODE_PUPPETSYNC;
+Vector<ScriptNetData> CSharpInstance::get_rpc_methods() const {
+	return script->get_rpc_methods();
+}
 
-	return MultiplayerAPI::RPC_MODE_DISABLED;
+uint16_t CSharpInstance::get_rpc_method_id(const StringName &p_method) const {
+	return script->get_rpc_method_id(p_method);
 }
 
-MultiplayerAPI::RPCMode CSharpInstance::get_rpc_mode(const StringName &p_method) const {
+StringName CSharpInstance::get_rpc_method(const uint16_t p_rpc_method_id) const {
+	return script->get_rpc_method(p_rpc_method_id);
+}
 
-	GD_MONO_SCOPE_THREAD_ATTACH;
+MultiplayerAPI::RPCMode CSharpInstance::get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const {
+	return script->get_rpc_mode_by_id(p_rpc_method_id);
+}
 
-	GDMonoClass *top = script->script_class;
+MultiplayerAPI::RPCMode CSharpInstance::get_rpc_mode(const StringName &p_method) const {
+	return script->get_rpc_mode(p_method);
+}
 
-	while (top && top != script->native) {
-		GDMonoMethod *method = top->get_fetched_method_unknown_params(p_method);
+Vector<ScriptNetData> CSharpInstance::get_rset_properties() const {
+	return script->get_rset_properties();
+}
 
-		if (method && !method->is_static())
-			return _member_get_rpc_mode(method);
+uint16_t CSharpInstance::get_rset_property_id(const StringName &p_variable) const {
+	return script->get_rset_property_id(p_variable);
+}
 
-		top = top->get_parent_class();
-	}
+StringName CSharpInstance::get_rset_property(const uint16_t p_rset_member_id) const {
+	return script->get_rset_property(p_rset_member_id);
+}
 
-	return MultiplayerAPI::RPC_MODE_DISABLED;
+MultiplayerAPI::RPCMode CSharpInstance::get_rset_mode_by_id(const uint16_t p_rset_member_id) const {
+	return script->get_rset_mode_by_id(p_rset_member_id);
 }
 
 MultiplayerAPI::RPCMode CSharpInstance::get_rset_mode(const StringName &p_variable) const {
-
-	GD_MONO_SCOPE_THREAD_ATTACH;
-
-	GDMonoClass *top = script->script_class;
-
-	while (top && top != script->native) {
-		GDMonoField *field = top->get_field(p_variable);
-
-		if (field && !field->is_static())
-			return _member_get_rpc_mode(field);
-
-		GDMonoProperty *property = top->get_property(p_variable);
-
-		if (property && !property->is_static())
-			return _member_get_rpc_mode(property);
-
-		top = top->get_parent_class();
-	}
-
-	return MultiplayerAPI::RPC_MODE_DISABLED;
+	return script->get_rset_mode(p_variable);
 }
 
 void CSharpInstance::notification(int p_notification) {
-
 	GD_MONO_SCOPE_THREAD_ATTACH;
 
 	if (p_notification == Object::NOTIFICATION_PREDELETE) {
@@ -2069,7 +2135,7 @@ void CSharpInstance::notification(int p_notification) {
 		MonoObject *mono_object = get_mono_object();
 		ERR_FAIL_NULL(mono_object);
 
-		MonoException *exc = NULL;
+		MonoException *exc = nullptr;
 		GDMonoUtils::dispose(mono_object, &exc);
 
 		if (exc) {
@@ -2083,7 +2149,6 @@ void CSharpInstance::notification(int p_notification) {
 }
 
 void CSharpInstance::_call_notification(int p_notification) {
-
 	GD_MONO_ASSERT_THREAD_ATTACHED;
 
 	MonoObject *mono_object = get_mono_object();
@@ -2091,7 +2156,7 @@ void CSharpInstance::_call_notification(int p_notification) {
 
 	// Custom version of _call_multilevel, optimized for _notification
 
-	uint32_t arg = p_notification;
+	int32_t arg = p_notification;
 	void *args[1] = { &arg };
 	StringName method_name = CACHED_STRING_NAME(_notification);
 
@@ -2114,25 +2179,28 @@ String CSharpInstance::to_string(bool *r_valid) {
 
 	MonoObject *mono_object = get_mono_object();
 
-	if (mono_object == NULL) {
-		if (r_valid)
+	if (mono_object == nullptr) {
+		if (r_valid) {
 			*r_valid = false;
+		}
 		return String();
 	}
 
-	MonoException *exc = NULL;
+	MonoException *exc = nullptr;
 	MonoString *result = GDMonoUtils::object_to_string(mono_object, &exc);
 
 	if (exc) {
 		GDMonoUtils::set_pending_exception(exc);
-		if (r_valid)
+		if (r_valid) {
 			*r_valid = false;
+		}
 		return String();
 	}
 
-	if (result == NULL) {
-		if (r_valid)
+	if (result == nullptr) {
+		if (r_valid) {
 			*r_valid = false;
+		}
 		return String();
 	}
 
@@ -2140,42 +2208,34 @@ String CSharpInstance::to_string(bool *r_valid) {
 }
 
 Ref<Script> CSharpInstance::get_script() const {
-
 	return script;
 }
 
 ScriptLanguage *CSharpInstance::get_language() {
-
 	return CSharpLanguage::get_singleton();
 }
 
-CSharpInstance::CSharpInstance() :
-		owner(NULL),
-		base_ref(false),
-		ref_dying(false),
-		unsafe_referenced(false),
-		predelete_notified(false),
-		destructing_script_instance(false) {
+CSharpInstance::CSharpInstance(const Ref<CSharpScript> &p_script) :
+		script(p_script) {
 }
 
 CSharpInstance::~CSharpInstance() {
-
 	GD_MONO_SCOPE_THREAD_ATTACH;
 
 	destructing_script_instance = true;
 
-	if (gchandle.is_valid()) {
+	if (!gchandle.is_released()) {
 		if (!predelete_notified && !ref_dying) {
 			// This destructor is not called from the owners destructor.
 			// This could be being called from the owner's set_script_instance method,
 			// meaning this script is being replaced with another one. If this is the case,
-			// we must call Dispose here, because Dispose calls owner->set_script_instance(NULL)
+			// we must call Dispose here, because Dispose calls owner->set_script_instance(nullptr)
 			// and that would mess up with the new script instance if called later.
 
-			MonoObject *mono_object = gchandle->get_target();
+			MonoObject *mono_object = gchandle.get_target();
 
 			if (mono_object) {
-				MonoException *exc = NULL;
+				MonoException *exc = nullptr;
 				GDMonoUtils::dispose(mono_object, &exc);
 
 				if (exc) {
@@ -2184,7 +2244,7 @@ CSharpInstance::~CSharpInstance() {
 			}
 		}
 
-		gchandle->release(); // Make sure the gchandle is released
+		gchandle.release(); // Make sure the gchandle is released
 	}
 
 	// If not being called from the owner's destructor, and we still hold a reference to the owner
@@ -2202,15 +2262,15 @@ CSharpInstance::~CSharpInstance() {
 		// Unreference the owner here, before the new "instance binding" references it.
 		// Otherwise, the unsafe reference debug checks will incorrectly detect a bug.
 		bool die = _unreference_owner_unsafe();
-		CRASH_COND(die == true); // `owner_keep_alive` holds a reference, so it can't die
+		CRASH_COND(die); // `owner_keep_alive` holds a reference, so it can't die
 
 		void *data = owner->get_script_instance_binding(CSharpLanguage::get_singleton()->get_language_index());
-		CRASH_COND(data == NULL);
+		CRASH_COND(data == nullptr);
 
 		CSharpScriptBinding &script_binding = ((Map<Object *, CSharpScriptBinding>::Element *)data)->get();
 
 		if (!script_binding.inited) {
-			SCOPED_MUTEX_LOCK(CSharpLanguage::get_singleton()->get_language_bind_mutex());
+			MutexLock lock(CSharpLanguage::get_singleton()->get_language_bind_mutex());
 
 			if (!script_binding.inited) { // Other thread may have set it up
 				// Already had a binding that needs to be setup
@@ -2226,7 +2286,7 @@ CSharpInstance::~CSharpInstance() {
 	}
 
 	if (script.is_valid() && owner) {
-		SCOPED_MUTEX_LOCK(CSharpLanguage::get_singleton()->script_instances_mutex);
+		MutexLock lock(CSharpLanguage::get_singleton()->script_instances_mutex);
 
 #ifdef DEBUG_ENABLED
 		// CSharpInstance must not be created unless it's going to be added to the list for sure
@@ -2241,14 +2301,12 @@ CSharpInstance::~CSharpInstance() {
 
 #ifdef TOOLS_ENABLED
 void CSharpScript::_placeholder_erased(PlaceHolderScriptInstance *p_placeholder) {
-
 	placeholders.erase(p_placeholder);
 }
 #endif
 
 #ifdef TOOLS_ENABLED
 void CSharpScript::_update_exports_values(Map<StringName, Variant> &values, List<PropertyInfo> &propnames) {
-
 	if (base_cache.is_valid()) {
 		base_cache->_update_exports_values(values, propnames);
 	}
@@ -2263,7 +2321,6 @@ void CSharpScript::_update_exports_values(Map<StringName, Variant> &values, List
 }
 
 void CSharpScript::_update_member_info_no_exports() {
-
 	if (exports_invalidated) {
 		GD_MONO_ASSERT_THREAD_ATTACHED;
 
@@ -2312,60 +2369,71 @@ void CSharpScript::_update_member_info_no_exports() {
 #endif
 
 bool CSharpScript::_update_exports() {
-
 #ifdef TOOLS_ENABLED
-	if (!Engine::get_singleton()->is_editor_hint())
-		return false;
-
-	placeholder_fallback_enabled = true; // until proven otherwise
-
-	if (!valid)
+	bool is_editor = Engine::get_singleton()->is_editor_hint();
+	if (is_editor) {
+		placeholder_fallback_enabled = true; // until proven otherwise
+	}
+#endif
+	if (!valid) {
 		return false;
+	}
 
 	bool changed = false;
 
-	if (exports_invalidated) {
+#ifdef TOOLS_ENABLED
+	if (exports_invalidated)
+#endif
+	{
 		GD_MONO_SCOPE_THREAD_ATTACH;
 
-		exports_invalidated = false;
-
 		changed = true;
 
 		member_info.clear();
-		exported_members_cache.clear();
-		exported_members_defval_cache.clear();
 
-		// Here we create a temporary managed instance of the class to get the initial values
+#ifdef TOOLS_ENABLED
+		MonoObject *tmp_object = nullptr;
+		Object *tmp_native = nullptr;
+		uint32_t tmp_pinned_gchandle = 0;
 
-		MonoObject *tmp_object = mono_object_new(mono_domain_get(), script_class->get_mono_ptr());
+		if (is_editor) {
+			exports_invalidated = false;
 
-		if (!tmp_object) {
-			ERR_PRINT("Failed to allocate temporary MonoObject.");
-			return false;
-		}
+			exported_members_cache.clear();
+			exported_members_defval_cache.clear();
 
-		uint32_t tmp_pinned_gchandle = MonoGCHandle::new_strong_handle_pinned(tmp_object); // pin it (not sure if needed)
+			// Here we create a temporary managed instance of the class to get the initial values
+			tmp_object = mono_object_new(mono_domain_get(), script_class->get_mono_ptr());
 
-		GDMonoMethod *ctor = script_class->get_method(CACHED_STRING_NAME(dotctor), 0);
+			if (!tmp_object) {
+				ERR_PRINT("Failed to allocate temporary MonoObject.");
+				return false;
+			}
 
-		ERR_FAIL_NULL_V_MSG(ctor, NULL,
-				"Cannot construct temporary MonoObject because the class does not define a parameterless constructor: '" + get_path() + "'.");
+			tmp_pinned_gchandle = GDMonoUtils::new_strong_gchandle_pinned(tmp_object); // pin it (not sure if needed)
 
-		MonoException *ctor_exc = NULL;
-		ctor->invoke(tmp_object, NULL, &ctor_exc);
+			GDMonoMethod *ctor = script_class->get_method(CACHED_STRING_NAME(dotctor), 0);
 
-		Object *tmp_native = GDMonoMarshal::unbox<Object *>(CACHED_FIELD(GodotObject, ptr)->get_value(tmp_object));
+			ERR_FAIL_NULL_V_MSG(ctor, false,
+					"Cannot construct temporary MonoObject because the class does not define a parameterless constructor: '" + get_path() + "'.");
 
-		if (ctor_exc) {
-			// TODO: Should we free 'tmp_native' if the exception was thrown after its creation?
+			MonoException *ctor_exc = nullptr;
+			ctor->invoke(tmp_object, nullptr, &ctor_exc);
 
-			MonoGCHandle::free_handle(tmp_pinned_gchandle);
-			tmp_object = NULL;
+			tmp_native = GDMonoMarshal::unbox<Object *>(CACHED_FIELD(GodotObject, ptr)->get_value(tmp_object));
 
-			ERR_PRINT("Exception thrown from constructor of temporary MonoObject:");
-			GDMonoUtils::debug_print_unhandled_exception(ctor_exc);
-			return false;
+			if (ctor_exc) {
+				// TODO: Should we free 'tmp_native' if the exception was thrown after its creation?
+
+				GDMonoUtils::free_gchandle(tmp_pinned_gchandle);
+				tmp_object = nullptr;
+
+				ERR_PRINT("Exception thrown from constructor of temporary MonoObject:");
+				GDMonoUtils::debug_print_unhandled_exception(ctor_exc);
+				return false;
+			}
 		}
+#endif
 
 		GDMonoClass *top = script_class;
 
@@ -2381,15 +2449,22 @@ bool CSharpScript::_update_exports() {
 				if (_get_member_export(field, /* inspect export: */ true, prop_info, exported)) {
 					StringName member_name = field->get_name();
 
+					member_info[member_name] = prop_info;
+
 					if (exported) {
-						member_info[member_name] = prop_info;
-						exported_members_cache.push_front(prop_info);
+#ifdef TOOLS_ENABLED
+						if (is_editor) {
+							exported_members_cache.push_front(prop_info);
 
-						if (tmp_object) {
-							exported_members_defval_cache[member_name] = GDMonoMarshal::mono_object_to_variant(field->get_value(tmp_object));
+							if (tmp_object) {
+								exported_members_defval_cache[member_name] = GDMonoMarshal::mono_object_to_variant(field->get_value(tmp_object));
+							}
 						}
-					} else {
-						member_info[member_name] = prop_info;
+#endif
+
+#if defined(TOOLS_ENABLED) || defined(DEBUG_ENABLED)
+						exported_members_names.insert(member_name);
+#endif
 					}
 				}
 			}
@@ -2402,22 +2477,28 @@ bool CSharpScript::_update_exports() {
 				if (_get_member_export(property, /* inspect export: */ true, prop_info, exported)) {
 					StringName member_name = property->get_name();
 
+					member_info[member_name] = prop_info;
+
 					if (exported) {
-						member_info[member_name] = prop_info;
-						exported_members_cache.push_front(prop_info);
-
-						if (tmp_object) {
-							MonoException *exc = NULL;
-							MonoObject *ret = property->get_value(tmp_object, &exc);
-							if (exc) {
-								exported_members_defval_cache[member_name] = Variant();
-								GDMonoUtils::debug_print_unhandled_exception(exc);
-							} else {
-								exported_members_defval_cache[member_name] = GDMonoMarshal::mono_object_to_variant(ret);
+#ifdef TOOLS_ENABLED
+						if (is_editor) {
+							exported_members_cache.push_front(prop_info);
+							if (tmp_object) {
+								MonoException *exc = nullptr;
+								MonoObject *ret = property->get_value(tmp_object, &exc);
+								if (exc) {
+									exported_members_defval_cache[member_name] = Variant();
+									GDMonoUtils::debug_print_unhandled_exception(exc);
+								} else {
+									exported_members_defval_cache[member_name] = GDMonoMarshal::mono_object_to_variant(ret);
+								}
 							}
 						}
-					} else {
-						member_info[member_name] = prop_info;
+#endif
+
+#if defined(TOOLS_ENABLED) || defined(DEBUG_ENABLED)
+						exported_members_names.insert(member_name);
+#endif
 					}
 				}
 			}
@@ -2425,52 +2506,57 @@ bool CSharpScript::_update_exports() {
 			top = top->get_parent_class();
 		}
 
-		// Need to check this here, before disposal
-		bool base_ref = Object::cast_to<Reference>(tmp_native) != NULL;
+#ifdef TOOLS_ENABLED
+		if (is_editor) {
+			// Need to check this here, before disposal
+			bool base_ref = Object::cast_to<Reference>(tmp_native) != nullptr;
 
-		// Dispose the temporary managed instance
+			// Dispose the temporary managed instance
 
-		MonoException *exc = NULL;
-		GDMonoUtils::dispose(tmp_object, &exc);
+			MonoException *exc = nullptr;
+			GDMonoUtils::dispose(tmp_object, &exc);
 
-		if (exc) {
-			ERR_PRINT("Exception thrown from method Dispose() of temporary MonoObject:");
-			GDMonoUtils::debug_print_unhandled_exception(exc);
-		}
+			if (exc) {
+				ERR_PRINT("Exception thrown from method Dispose() of temporary MonoObject:");
+				GDMonoUtils::debug_print_unhandled_exception(exc);
+			}
 
-		MonoGCHandle::free_handle(tmp_pinned_gchandle);
-		tmp_object = NULL;
+			GDMonoUtils::free_gchandle(tmp_pinned_gchandle);
+			tmp_object = nullptr;
 
-		if (tmp_native && !base_ref) {
-			Node *node = Object::cast_to<Node>(tmp_native);
-			if (node && node->is_inside_tree()) {
-				ERR_PRINTS("Temporary instance was added to the scene tree.");
-			} else {
-				memdelete(tmp_native);
+			if (tmp_native && !base_ref) {
+				Node *node = Object::cast_to<Node>(tmp_native);
+				if (node && node->is_inside_tree()) {
+					ERR_PRINT("Temporary instance was added to the scene tree.");
+				} else {
+					memdelete(tmp_native);
+				}
 			}
 		}
+#endif
 	}
 
-	placeholder_fallback_enabled = false;
+#ifdef TOOLS_ENABLED
+	if (is_editor) {
+		placeholder_fallback_enabled = false;
 
-	if (placeholders.size()) {
-		// Update placeholders if any
-		Map<StringName, Variant> values;
-		List<PropertyInfo> propnames;
-		_update_exports_values(values, propnames);
+		if (placeholders.size()) {
+			// Update placeholders if any
+			Map<StringName, Variant> values;
+			List<PropertyInfo> propnames;
+			_update_exports_values(values, propnames);
 
-		for (Set<PlaceHolderScriptInstance *>::Element *E = placeholders.front(); E; E = E->next()) {
-			E->get()->update(propnames, values);
+			for (Set<PlaceHolderScriptInstance *>::Element *E = placeholders.front(); E; E = E->next()) {
+				E->get()->update(propnames, values);
+			}
 		}
 	}
+#endif
 
 	return changed;
-#endif
-	return false;
 }
 
 void CSharpScript::load_script_signals(GDMonoClass *p_class, GDMonoClass *p_native_class) {
-
 	// no need to load the script's signals more than once
 	if (!signals_invalidated) {
 		return;
@@ -2478,6 +2564,7 @@ void CSharpScript::load_script_signals(GDMonoClass *p_class, GDMonoClass *p_nati
 
 	// make sure this classes signals are empty when loading for the first time
 	_signals.clear();
+	event_signals.clear();
 
 	GD_MONO_SCOPE_THREAD_ATTACH;
 
@@ -2485,65 +2572,100 @@ void CSharpScript::load_script_signals(GDMonoClass *p_class, GDMonoClass *p_nati
 	while (top && top != p_native_class) {
 		const Vector<GDMonoClass *> &delegates = top->get_all_delegates();
 		for (int i = delegates.size() - 1; i >= 0; --i) {
-			Vector<Argument> parameters;
-
 			GDMonoClass *delegate = delegates[i];
 
-			if (_get_signal(top, delegate, parameters)) {
+			if (!delegate->has_attribute(CACHED_CLASS(SignalAttribute))) {
+				continue;
+			}
+
+			// Arguments are accessibles as arguments of .Invoke method
+			GDMonoMethod *invoke_method = delegate->get_method(mono_get_delegate_invoke(delegate->get_mono_ptr()));
+
+			Vector<SignalParameter> parameters;
+			if (_get_signal(top, invoke_method, parameters)) {
 				_signals[delegate->get_name()] = parameters;
 			}
 		}
 
+		List<StringName> found_event_signals;
+
+		void *iter = nullptr;
+		MonoEvent *raw_event = nullptr;
+		while ((raw_event = mono_class_get_events(top->get_mono_ptr(), &iter)) != nullptr) {
+			MonoCustomAttrInfo *event_attrs = mono_custom_attrs_from_event(top->get_mono_ptr(), raw_event);
+			if (event_attrs) {
+				if (mono_custom_attrs_has_attr(event_attrs, CACHED_CLASS(SignalAttribute)->get_mono_ptr())) {
+					const char *event_name = mono_event_get_name(raw_event);
+					found_event_signals.push_back(StringName(event_name));
+				}
+
+				mono_custom_attrs_free(event_attrs);
+			}
+		}
+
+		const Vector<GDMonoField *> &fields = top->get_all_fields();
+		for (int i = 0; i < fields.size(); i++) {
+			GDMonoField *field = fields[i];
+
+			GDMonoClass *field_class = field->get_type().type_class;
+
+			if (!mono_class_is_delegate(field_class->get_mono_ptr())) {
+				continue;
+			}
+
+			if (!found_event_signals.find(field->get_name())) {
+				continue;
+			}
+
+			GDMonoMethod *invoke_method = field_class->get_method(mono_get_delegate_invoke(field_class->get_mono_ptr()));
+
+			Vector<SignalParameter> parameters;
+			if (_get_signal(top, invoke_method, parameters)) {
+				event_signals[field->get_name()] = { field, invoke_method, parameters };
+			}
+		}
+
 		top = top->get_parent_class();
 	}
 
 	signals_invalidated = false;
 }
 
-bool CSharpScript::_get_signal(GDMonoClass *p_class, GDMonoClass *p_delegate, Vector<Argument> &params) {
+bool CSharpScript::_get_signal(GDMonoClass *p_class, GDMonoMethod *p_delegate_invoke, Vector<SignalParameter> &params) {
 	GD_MONO_ASSERT_THREAD_ATTACHED;
 
-	if (p_delegate->has_attribute(CACHED_CLASS(SignalAttribute))) {
-		MonoType *raw_type = p_delegate->get_mono_type();
+	Vector<StringName> names;
+	Vector<ManagedType> types;
+	p_delegate_invoke->get_parameter_names(names);
+	p_delegate_invoke->get_parameter_types(types);
 
-		if (mono_type_get_type(raw_type) == MONO_TYPE_CLASS) {
-			// Arguments are accessibles as arguments of .Invoke method
-			GDMonoMethod *invoke = p_delegate->get_method("Invoke", -1);
-
-			Vector<StringName> names;
-			Vector<ManagedType> types;
-			invoke->get_parameter_names(names);
-			invoke->get_parameter_types(types);
-
-			if (names.size() == types.size()) {
-				for (int i = 0; i < names.size(); ++i) {
-					Argument arg;
-					arg.name = names[i];
-					arg.type = GDMonoMarshal::managed_to_variant_type(types[i]);
-
-					if (arg.type == Variant::NIL) {
-						ERR_PRINTS("Unknown type of signal parameter: '" + arg.name + "' in '" + p_class->get_full_name() + "'.");
-						return false;
-					}
+	for (int i = 0; i < names.size(); ++i) {
+		SignalParameter arg;
+		arg.name = names[i];
 
-					params.push_back(arg);
-				}
+		bool nil_is_variant = false;
+		arg.type = GDMonoMarshal::managed_to_variant_type(types[i], &nil_is_variant);
 
-				return true;
+		if (arg.type == Variant::NIL) {
+			if (nil_is_variant) {
+				arg.nil_is_variant = true;
+			} else {
+				ERR_PRINT("Unknown type of signal parameter: '" + arg.name + "' in '" + p_class->get_full_name() + "'.");
+				return false;
 			}
 		}
+
+		params.push_back(arg);
 	}
 
-	return false;
+	return true;
 }
 
-#ifdef TOOLS_ENABLED
 /**
  * Returns false if there was an error, otherwise true.
  * If there was an error, r_prop_info and r_exported are not assigned any value.
  */
 bool CSharpScript::_get_member_export(IMonoClassMember *p_member, bool p_inspect_export, PropertyInfo &r_prop_info, bool &r_exported) {
-
 	GD_MONO_ASSERT_THREAD_ATTACHED;
 
 	// Goddammit, C++. All I wanted was some nested functions.
@@ -2551,13 +2673,17 @@ bool CSharpScript::_get_member_export(IMonoClassMember *p_member, bool p_inspect
 	(m_member->get_enclosing_class()->get_full_name() + "." + (String)m_member->get_name())
 
 	if (p_member->is_static()) {
-		if (p_member->has_attribute(CACHED_CLASS(ExportAttribute)))
-			ERR_PRINTS("Cannot export member because it is static: '" + MEMBER_FULL_QUALIFIED_NAME(p_member) + "'.");
+#ifdef TOOLS_ENABLED
+		if (p_member->has_attribute(CACHED_CLASS(ExportAttribute))) {
+			ERR_PRINT("Cannot export member because it is static: '" + MEMBER_FULL_QUALIFIED_NAME(p_member) + "'.");
+		}
+#endif
 		return false;
 	}
 
-	if (member_info.has(p_member->get_name()))
+	if (member_info.has(p_member->get_name())) {
 		return false;
+	}
 
 	ManagedType type;
 
@@ -2574,18 +2700,25 @@ bool CSharpScript::_get_member_export(IMonoClassMember *p_member, bool p_inspect
 	if (p_member->get_member_type() == IMonoClassMember::MEMBER_TYPE_PROPERTY) {
 		GDMonoProperty *property = static_cast<GDMonoProperty *>(p_member);
 		if (!property->has_getter()) {
-			if (exported)
-				ERR_PRINTS("Read-only property cannot be exported: '" + MEMBER_FULL_QUALIFIED_NAME(p_member) + "'.");
+#ifdef TOOLS_ENABLED
+			if (exported) {
+				ERR_PRINT("Read-only property cannot be exported: '" + MEMBER_FULL_QUALIFIED_NAME(p_member) + "'.");
+			}
+#endif
 			return false;
 		}
 		if (!property->has_setter()) {
-			if (exported)
-				ERR_PRINTS("Write-only property (without getter) cannot be exported: '" + MEMBER_FULL_QUALIFIED_NAME(p_member) + "'.");
+#ifdef TOOLS_ENABLED
+			if (exported) {
+				ERR_PRINT("Write-only property (without getter) cannot be exported: '" + MEMBER_FULL_QUALIFIED_NAME(p_member) + "'.");
+			}
+#endif
 			return false;
 		}
 	}
 
-	Variant::Type variant_type = GDMonoMarshal::managed_to_variant_type(type);
+	bool nil_is_variant = false;
+	Variant::Type variant_type = GDMonoMarshal::managed_to_variant_type(type, &nil_is_variant);
 
 	if (!p_inspect_export || !exported) {
 		r_prop_info = PropertyInfo(variant_type, (String)p_member->get_name(), PROPERTY_HINT_NONE, "", PROPERTY_USAGE_SCRIPT_VARIABLE);
@@ -2593,16 +2726,21 @@ bool CSharpScript::_get_member_export(IMonoClassMember *p_member, bool p_inspect
 		return true;
 	}
 
+#ifdef TOOLS_ENABLED
 	MonoObject *attr = p_member->get_attribute(CACHED_CLASS(ExportAttribute));
+#endif
 
 	PropertyHint hint = PROPERTY_HINT_NONE;
 	String hint_string;
 
-	if (variant_type == Variant::NIL) {
-		ERR_PRINTS("Unknown exported member type: '" + MEMBER_FULL_QUALIFIED_NAME(p_member) + "'.");
+	if (variant_type == Variant::NIL && !nil_is_variant) {
+#ifdef TOOLS_ENABLED
+		ERR_PRINT("Unknown exported member type: '" + MEMBER_FULL_QUALIFIED_NAME(p_member) + "'.");
+#endif
 		return false;
 	}
 
+#ifdef TOOLS_ENABLED
 	int hint_res = _try_get_member_export_hint(p_member, type, variant_type, /* allow_generics: */ true, hint, hint_string);
 
 	ERR_FAIL_COND_V_MSG(hint_res == -1, false,
@@ -2613,8 +2751,16 @@ bool CSharpScript::_get_member_export(IMonoClassMember *p_member, bool p_inspect
 		hint = PropertyHint(CACHED_FIELD(ExportAttribute, hint)->get_int_value(attr));
 		hint_string = CACHED_FIELD(ExportAttribute, hintString)->get_string_value(attr);
 	}
+#endif
+
+	uint32_t prop_usage = PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_SCRIPT_VARIABLE;
 
-	r_prop_info = PropertyInfo(variant_type, (String)p_member->get_name(), hint, hint_string, PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_SCRIPT_VARIABLE);
+	if (variant_type == Variant::NIL) {
+		// System.Object (Variant)
+		prop_usage |= PROPERTY_USAGE_NIL_IS_VARIANT;
+	}
+
+	r_prop_info = PropertyInfo(variant_type, (String)p_member->get_name(), hint, hint_string, prop_usage);
 	r_exported = true;
 
 	return true;
@@ -2622,7 +2768,12 @@ bool CSharpScript::_get_member_export(IMonoClassMember *p_member, bool p_inspect
 #undef MEMBER_FULL_QUALIFIED_NAME
 }
 
+#ifdef TOOLS_ENABLED
 int CSharpScript::_try_get_member_export_hint(IMonoClassMember *p_member, ManagedType p_type, Variant::Type p_variant_type, bool p_allow_generics, PropertyHint &r_hint, String &r_hint_string) {
+	if (p_variant_type == Variant::NIL) {
+		// System.Object (Variant)
+		return 1;
+	}
 
 	GD_MONO_ASSERT_THREAD_ATTACHED;
 
@@ -2656,7 +2807,7 @@ int CSharpScript::_try_get_member_export_hint(IMonoClassMember *p_member, Manage
 			// Instead of using mono_field_get_value_object, we can do this without boxing. Check the
 			// internal mono functions: ves_icall_System_Enum_GetEnumValuesAndNames and the get_enum_field.
 
-			MonoObject *val_obj = mono_field_get_value_object(mono_domain_get(), field, NULL);
+			MonoObject *val_obj = mono_field_get_value_object(mono_domain_get(), field, nullptr);
 
 			ERR_FAIL_NULL_V_MSG(val_obj, -1, "Failed to get '" + enum_field_name + "' constant enum value.");
 
@@ -2680,17 +2831,18 @@ int CSharpScript::_try_get_member_export_hint(IMonoClassMember *p_member, Manage
 		}
 	} else if (p_variant_type == Variant::OBJECT && CACHED_CLASS(GodotResource)->is_assignable_from(p_type.type_class)) {
 		GDMonoClass *field_native_class = GDMonoUtils::get_class_native_base(p_type.type_class);
-		CRASH_COND(field_native_class == NULL);
+		CRASH_COND(field_native_class == nullptr);
 
 		r_hint = PROPERTY_HINT_RESOURCE_TYPE;
-		r_hint_string = NATIVE_GDMONOCLASS_NAME(field_native_class);
+		r_hint_string = String(NATIVE_GDMONOCLASS_NAME(field_native_class));
 	} else if (p_allow_generics && p_variant_type == Variant::ARRAY) {
 		// Nested arrays are not supported in the inspector
 
 		ManagedType elem_type;
 
-		if (!GDMonoMarshal::try_get_array_element_type(p_type, elem_type))
+		if (!GDMonoMarshal::try_get_array_element_type(p_type, elem_type)) {
 			return 0;
+		}
 
 		Variant::Type elem_variant_type = GDMonoMarshal::managed_to_variant_type(elem_type);
 
@@ -2717,21 +2869,10 @@ int CSharpScript::_try_get_member_export_hint(IMonoClassMember *p_member, Manage
 }
 #endif
 
-void CSharpScript::_clear() {
-
-	tool = false;
-	valid = false;
-
-	base = NULL;
-	native = NULL;
-	script_class = NULL;
-}
-
-Variant CSharpScript::call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error) {
-
-	if (unlikely(GDMono::get_singleton() == NULL)) {
+Variant CSharpScript::call(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
+	if (unlikely(GDMono::get_singleton() == nullptr)) {
 		// Probably not the best error but eh.
-		r_error.error = Variant::CallError::CALL_ERROR_INSTANCE_IS_NULL;
+		r_error.error = Callable::CallError::CALL_ERROR_INSTANCE_IS_NULL;
 		return Variant();
 	}
 
@@ -2743,7 +2884,7 @@ Variant CSharpScript::call(const StringName &p_method, const Variant **p_args, i
 		GDMonoMethod *method = top->get_method(p_method, p_argcount);
 
 		if (method && method->is_static()) {
-			MonoObject *result = method->invoke(NULL, p_args);
+			MonoObject *result = method->invoke(nullptr, p_args);
 
 			if (result) {
 				return GDMonoMarshal::mono_object_to_variant(result);
@@ -2760,18 +2901,11 @@ Variant CSharpScript::call(const StringName &p_method, const Variant **p_args, i
 }
 
 void CSharpScript::_resource_path_changed() {
-
-	String path = get_path();
-
-	if (!path.empty()) {
-		name = get_path().get_file().get_basename();
-	}
+	_update_name();
 }
 
 bool CSharpScript::_get(const StringName &p_name, Variant &r_ret) const {
-
 	if (p_name == CSharpLanguage::singleton->string_names._script_source) {
-
 		r_ret = get_source_code();
 		return true;
 	}
@@ -2780,9 +2914,7 @@ bool CSharpScript::_get(const StringName &p_name, Variant &r_ret) const {
 }
 
 bool CSharpScript::_set(const StringName &p_name, const Variant &p_value) {
-
 	if (p_name == CSharpLanguage::singleton->string_names._script_source) {
-
 		set_source_code(p_value);
 		reload();
 		return true;
@@ -2792,20 +2924,17 @@ bool CSharpScript::_set(const StringName &p_name, const Variant &p_value) {
 }
 
 void CSharpScript::_get_property_list(List<PropertyInfo> *p_properties) const {
-
 	p_properties->push_back(PropertyInfo(Variant::STRING, CSharpLanguage::singleton->string_names._script_source, PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL));
 }
 
 void CSharpScript::_bind_methods() {
-
 	ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT, "new", &CSharpScript::_new, MethodInfo("new"));
 }
 
 Ref<CSharpScript> CSharpScript::create_for_managed_type(GDMonoClass *p_class, GDMonoClass *p_native) {
-
 	// This method should not fail, only assertions allowed
 
-	CRASH_COND(p_class == NULL);
+	CRASH_COND(p_class == nullptr);
 
 	// TODO OPTIMIZE: Cache the 'CSharpScript' associated with this 'p_class' instead of allocating a new one every time
 	Ref<CSharpScript> script = memnew(CSharpScript);
@@ -2816,21 +2945,21 @@ Ref<CSharpScript> CSharpScript::create_for_managed_type(GDMonoClass *p_class, GD
 }
 
 void CSharpScript::initialize_for_managed_type(Ref<CSharpScript> p_script, GDMonoClass *p_class, GDMonoClass *p_native) {
-
 	// This method should not fail, only assertions allowed
 
-	CRASH_COND(p_class == NULL);
+	CRASH_COND(p_class == nullptr);
 
 	p_script->name = p_class->get_name();
 	p_script->script_class = p_class;
 	p_script->native = p_native;
 
-	CRASH_COND(p_script->native == NULL);
+	CRASH_COND(p_script->native == nullptr);
 
 	GDMonoClass *base = p_script->script_class->get_parent_class();
 
-	if (base != p_script->native)
+	if (base != p_script->native) {
 		p_script->base = base;
+	}
 
 	p_script->valid = true;
 	p_script->tool = p_script->script_class->has_attribute(CACHED_CLASS(ToolAttribute));
@@ -2856,8 +2985,9 @@ void CSharpScript::initialize_for_managed_type(Ref<CSharpScript> p_script, GDMon
 		while (native_top) {
 			native_top->fetch_methods_with_godot_api_checks(p_script->native);
 
-			if (native_top == CACHED_CLASS(GodotObject))
+			if (native_top == CACHED_CLASS(GodotObject)) {
 				break;
+			}
 
 			native_top = native_top->get_parent_class();
 		}
@@ -2880,23 +3010,6 @@ void CSharpScript::initialize_for_managed_type(Ref<CSharpScript> p_script, GDMon
 }
 
 bool CSharpScript::can_instance() const {
-
-#ifdef TOOLS_ENABLED
-	if (Engine::get_singleton()->is_editor_hint()) {
-
-		// Hack to lower the risk of attached scripts not being added to the C# project
-		if (!get_path().empty() && get_path().find("::") == -1) { // Ignore if built-in script. Can happen if the file is deleted...
-			if (_create_project_solution_if_needed()) {
-				CSharpProject::add_item(GodotSharpDirs::get_project_csproj_path(),
-						"Compile",
-						ProjectSettings::get_singleton()->globalize_path(get_path()));
-			} else {
-				ERR_PRINTS("C# project could not be created; cannot add file: '" + get_path() + "'.");
-			}
-		}
-	}
-#endif
-
 #ifdef TOOLS_ENABLED
 	bool extra_cond = tool || ScriptServer::is_scripting_enabled();
 #else
@@ -2907,12 +3020,12 @@ bool CSharpScript::can_instance() const {
 	// For tool scripts, this will never fire if the class is not found. That's because we
 	// don't know if it's a tool script if we can't find the class to access the attributes.
 	if (extra_cond && !script_class) {
-		if (GDMono::get_singleton()->get_project_assembly() == NULL) {
+		if (GDMono::get_singleton()->get_project_assembly() == nullptr) {
 			// The project assembly is not loaded
-			ERR_FAIL_V_MSG(NULL, "Cannot instance script because the project assembly is not loaded. Script: '" + get_path() + "'.");
+			ERR_FAIL_V_MSG(false, "Cannot instance script because the project assembly is not loaded. Script: '" + get_path() + "'.");
 		} else {
 			// The project assembly is loaded, but the class could not found
-			ERR_FAIL_V_MSG(NULL, "Cannot instance script because the class '" + name + "' could not be found. Script: '" + get_path() + "'.");
+			ERR_FAIL_V_MSG(false, "Cannot instance script because the class '" + name + "' could not be found. Script: '" + get_path() + "'.");
 		}
 	}
 
@@ -2920,28 +3033,27 @@ bool CSharpScript::can_instance() const {
 }
 
 StringName CSharpScript::get_instance_base_type() const {
-
-	if (native)
+	if (native) {
 		return native->get_name();
-	else
+	} else {
 		return StringName();
+	}
 }
 
-CSharpInstance *CSharpScript::_create_instance(const Variant **p_args, int p_argcount, Object *p_owner, bool p_isref, Variant::CallError &r_error) {
-
+CSharpInstance *CSharpScript::_create_instance(const Variant **p_args, int p_argcount, Object *p_owner, bool p_isref, Callable::CallError &r_error) {
 	GD_MONO_ASSERT_THREAD_ATTACHED;
 
 	/* STEP 1, CREATE */
 
 	// Search the constructor first, to fail with an error if it's not found before allocating anything else.
 	GDMonoMethod *ctor = script_class->get_method(CACHED_STRING_NAME(dotctor), p_argcount);
-	if (ctor == NULL) {
-		ERR_FAIL_COND_V_MSG(p_argcount == 0, NULL,
+	if (ctor == nullptr) {
+		ERR_FAIL_COND_V_MSG(p_argcount == 0, nullptr,
 				"Cannot create script instance. The class '" + script_class->get_full_name() +
 						"' does not define a parameterless constructor." +
 						(get_path().empty() ? String() : " Path: '" + get_path() + "'."));
 
-		ERR_FAIL_V_MSG(NULL, "Constructor not found.");
+		ERR_FAIL_V_MSG(nullptr, "Constructor not found.");
 	}
 
 	Ref<Reference> ref;
@@ -2953,13 +3065,13 @@ CSharpInstance *CSharpScript::_create_instance(const Variant **p_args, int p_arg
 	// If the object had a script instance binding, dispose it before adding the CSharpInstance
 	if (p_owner->has_script_instance_binding(CSharpLanguage::get_singleton()->get_language_index())) {
 		void *data = p_owner->get_script_instance_binding(CSharpLanguage::get_singleton()->get_language_index());
-		CRASH_COND(data == NULL);
+		CRASH_COND(data == nullptr);
 
 		CSharpScriptBinding &script_binding = ((Map<Object *, CSharpScriptBinding>::Element *)data)->get();
-		if (script_binding.inited && script_binding.gchandle.is_valid()) {
-			MonoObject *mono_object = script_binding.gchandle->get_target();
+		if (script_binding.inited && !script_binding.gchandle.is_released()) {
+			MonoObject *mono_object = script_binding.gchandle.get_target();
 			if (mono_object) {
-				MonoException *exc = NULL;
+				MonoException *exc = nullptr;
 				GDMonoUtils::dispose(mono_object, &exc);
 
 				if (exc) {
@@ -2967,13 +3079,13 @@ CSharpInstance *CSharpScript::_create_instance(const Variant **p_args, int p_arg
 				}
 			}
 
+			script_binding.gchandle.release(); // Just in case
 			script_binding.inited = false;
 		}
 	}
 
-	CSharpInstance *instance = memnew(CSharpInstance);
+	CSharpInstance *instance = memnew(CSharpInstance(Ref<CSharpScript>(this)));
 	instance->base_ref = p_isref;
-	instance->script = Ref<CSharpScript>(this);
 	instance->owner = p_owner;
 	instance->owner->set_script_instance(instance);
 
@@ -2984,25 +3096,26 @@ CSharpInstance *CSharpScript::_create_instance(const Variant **p_args, int p_arg
 	if (!mono_object) {
 		// Important to clear this before destroying the script instance here
 		instance->script = Ref<CSharpScript>();
-		instance->owner = NULL;
+		instance->owner = nullptr;
 
 		bool die = instance->_unreference_owner_unsafe();
 		// Not ok for the owner to die here. If there is a situation where this can happen, it will be considered a bug.
-		CRASH_COND(die == true);
+		CRASH_COND(die);
 
-		p_owner->set_script_instance(NULL);
-		r_error.error = Variant::CallError::CALL_ERROR_INSTANCE_IS_NULL;
-		ERR_FAIL_V_MSG(NULL, "Failed to allocate memory for the object.");
+		p_owner->set_script_instance(nullptr);
+		r_error.error = Callable::CallError::CALL_ERROR_INSTANCE_IS_NULL;
+		ERR_FAIL_V_MSG(nullptr, "Failed to allocate memory for the object.");
 	}
 
 	// Tie managed to unmanaged
-	instance->gchandle = MonoGCHandle::create_strong(mono_object);
+	instance->gchandle = MonoGCHandleData::new_strong_handle(mono_object);
 
-	if (instance->base_ref)
+	if (instance->base_ref) {
 		instance->_reference_owner_unsafe(); // Here, after assigning the gchandle (for the refcount_incremented callback)
+	}
 
 	{
-		SCOPED_MUTEX_LOCK(CSharpLanguage::get_singleton()->script_instances_mutex);
+		MutexLock lock(CSharpLanguage::get_singleton()->script_instances_mutex);
 		instances.insert(instance->owner);
 	}
 
@@ -3017,14 +3130,13 @@ CSharpInstance *CSharpScript::_create_instance(const Variant **p_args, int p_arg
 	return instance;
 }
 
-Variant CSharpScript::_new(const Variant **p_args, int p_argcount, Variant::CallError &r_error) {
-
+Variant CSharpScript::_new(const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
 	if (!valid) {
-		r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+		r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 		return Variant();
 	}
 
-	r_error.error = Variant::CallError::CALL_OK;
+	r_error.error = Callable::CallError::CALL_OK;
 
 	ERR_FAIL_NULL_V(native, Variant());
 
@@ -3038,7 +3150,7 @@ Variant CSharpScript::_new(const Variant **p_args, int p_argcount, Variant::Call
 		ref = REF(r);
 	}
 
-	CSharpInstance *instance = _create_instance(p_args, p_argcount, owner, r != NULL, r_error);
+	CSharpInstance *instance = _create_instance(p_args, p_argcount, owner, r != nullptr, r_error);
 	if (!instance) {
 		if (ref.is_null()) {
 			memdelete(owner); //no owner, sorry
@@ -3054,60 +3166,57 @@ Variant CSharpScript::_new(const Variant **p_args, int p_argcount, Variant::Call
 }
 
 ScriptInstance *CSharpScript::instance_create(Object *p_this) {
-
 #ifdef DEBUG_ENABLED
 	CRASH_COND(!valid);
 #endif
 
 	if (native) {
-		String native_name = NATIVE_GDMONOCLASS_NAME(native);
+		StringName native_name = NATIVE_GDMONOCLASS_NAME(native);
 		if (!ClassDB::is_parent_class(p_this->get_class_name(), native_name)) {
-			if (ScriptDebugger::get_singleton()) {
-				CSharpLanguage::get_singleton()->debug_break_parse(get_path(), 0, "Script inherits from native type '" + native_name + "', so it can't be instanced in object of type: '" + p_this->get_class() + "'");
+			if (EngineDebugger::is_active()) {
+				CSharpLanguage::get_singleton()->debug_break_parse(get_path(), 0,
+						"Script inherits from native type '" + String(native_name) +
+								"', so it can't be instanced in object of type: '" + p_this->get_class() + "'");
 			}
-			ERR_FAIL_V_MSG(NULL, "Script inherits from native type '" + native_name +
-										 "', so it can't be instanced in object of type: '" + p_this->get_class() + "'.");
+			ERR_FAIL_V_MSG(nullptr, "Script inherits from native type '" + String(native_name) +
+											"', so it can't be instanced in object of type: '" + p_this->get_class() + "'.");
 		}
 	}
 
 	GD_MONO_SCOPE_THREAD_ATTACH;
 
-	Variant::CallError unchecked_error;
-	return _create_instance(NULL, 0, p_this, Object::cast_to<Reference>(p_this) != NULL, unchecked_error);
+	Callable::CallError unchecked_error;
+	return _create_instance(nullptr, 0, p_this, Object::cast_to<Reference>(p_this) != nullptr, unchecked_error);
 }
 
 PlaceHolderScriptInstance *CSharpScript::placeholder_instance_create(Object *p_this) {
-
 #ifdef TOOLS_ENABLED
 	PlaceHolderScriptInstance *si = memnew(PlaceHolderScriptInstance(CSharpLanguage::get_singleton(), Ref<Script>(this), p_this));
 	placeholders.insert(si);
 	_update_exports();
 	return si;
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
 bool CSharpScript::instance_has(const Object *p_this) const {
-
-	SCOPED_MUTEX_LOCK(CSharpLanguage::get_singleton()->script_instances_mutex);
+	MutexLock lock(CSharpLanguage::get_singleton()->script_instances_mutex);
 	return instances.has((Object *)p_this);
 }
 
 bool CSharpScript::has_source_code() const {
-
 	return !source.empty();
 }
 
 String CSharpScript::get_source_code() const {
-
 	return source;
 }
 
 void CSharpScript::set_source_code(const String &p_code) {
-
-	if (source == p_code)
+	if (source == p_code) {
 		return;
+	}
 	source = p_code;
 #ifdef TOOLS_ENABLED
 	source_changed_cache = true;
@@ -3115,9 +3224,9 @@ void CSharpScript::set_source_code(const String &p_code) {
 }
 
 void CSharpScript::get_script_method_list(List<MethodInfo> *p_list) const {
-
-	if (!script_class)
+	if (!script_class) {
 		return;
+	}
 
 	GD_MONO_SCOPE_THREAD_ATTACH;
 
@@ -3129,9 +3238,9 @@ void CSharpScript::get_script_method_list(List<MethodInfo> *p_list) const {
 }
 
 bool CSharpScript::has_method(const StringName &p_method) const {
-
-	if (!script_class)
+	if (!script_class) {
 		return false;
+	}
 
 	GD_MONO_SCOPE_THREAD_ATTACH;
 
@@ -3139,9 +3248,9 @@ bool CSharpScript::has_method(const StringName &p_method) const {
 }
 
 MethodInfo CSharpScript::get_method_info(const StringName &p_method) const {
-
-	if (!script_class)
+	if (!script_class) {
 		return MethodInfo();
+	}
 
 	GD_MONO_SCOPE_THREAD_ATTACH;
 
@@ -3160,10 +3269,9 @@ MethodInfo CSharpScript::get_method_info(const StringName &p_method) const {
 }
 
 Error CSharpScript::reload(bool p_keep_state) {
-
 	bool has_instances;
 	{
-		SCOPED_MUTEX_LOCK(CSharpLanguage::get_singleton()->script_instances_mutex);
+		MutexLock lock(CSharpLanguage::get_singleton()->script_instances_mutex);
 		has_instances = instances.size();
 	}
 
@@ -3182,9 +3290,7 @@ Error CSharpScript::reload(bool p_keep_state) {
 			ERR_FAIL_NULL_V(namespace_, ERR_BUG);
 			ERR_FAIL_NULL_V(class_name, ERR_BUG);
 			GDMonoClass *klass = project_assembly->get_class(namespace_->operator String(), class_name->operator String());
-			if (klass) {
-				bool obj_type = CACHED_CLASS(GodotObject)->is_assignable_from(klass);
-				ERR_FAIL_COND_V(!obj_type, ERR_BUG);
+			if (klass && CACHED_CLASS(GodotObject)->is_assignable_from(klass)) {
 				script_class = klass;
 			}
 		} else {
@@ -3192,7 +3298,7 @@ Error CSharpScript::reload(bool p_keep_state) {
 			script_class = project_assembly->get_object_derived_class(name);
 		}
 
-		valid = script_class != NULL;
+		valid = script_class != nullptr;
 
 		if (script_class) {
 #ifdef DEBUG_ENABLED
@@ -3214,12 +3320,13 @@ Error CSharpScript::reload(bool p_keep_state) {
 
 			native = GDMonoUtils::get_class_native_base(script_class);
 
-			CRASH_COND(native == NULL);
+			CRASH_COND(native == nullptr);
 
 			GDMonoClass *base_class = script_class->get_parent_class();
 
-			if (base_class != native)
+			if (base_class != native) {
 				base = base_class;
+			}
 
 #ifdef DEBUG_ENABLED
 			// For debug builds, we must fetch from all native base methods as well.
@@ -3231,8 +3338,9 @@ Error CSharpScript::reload(bool p_keep_state) {
 				while (native_top) {
 					native_top->fetch_methods_with_godot_api_checks(native);
 
-					if (native_top == CACHED_CLASS(GodotObject))
+					if (native_top == CACHED_CLASS(GodotObject)) {
 						break;
+					}
 
 					native_top = native_top->get_parent_class();
 				}
@@ -3252,6 +3360,69 @@ Error CSharpScript::reload(bool p_keep_state) {
 			_update_exports();
 		}
 
+		rpc_functions.clear();
+		rpc_variables.clear();
+
+		GDMonoClass *top = script_class;
+		while (top && top != native) {
+			{
+				Vector<GDMonoMethod *> methods = top->get_all_methods();
+				for (int i = 0; i < methods.size(); i++) {
+					if (!methods[i]->is_static()) {
+						MultiplayerAPI::RPCMode mode = _member_get_rpc_mode(methods[i]);
+						if (MultiplayerAPI::RPC_MODE_DISABLED != mode) {
+							ScriptNetData nd;
+							nd.name = methods[i]->get_name();
+							nd.mode = mode;
+							if (-1 == rpc_functions.find(nd)) {
+								rpc_functions.push_back(nd);
+							}
+						}
+					}
+				}
+			}
+
+			{
+				Vector<GDMonoField *> fields = top->get_all_fields();
+				for (int i = 0; i < fields.size(); i++) {
+					if (!fields[i]->is_static()) {
+						MultiplayerAPI::RPCMode mode = _member_get_rpc_mode(fields[i]);
+						if (MultiplayerAPI::RPC_MODE_DISABLED != mode) {
+							ScriptNetData nd;
+							nd.name = fields[i]->get_name();
+							nd.mode = mode;
+							if (-1 == rpc_variables.find(nd)) {
+								rpc_variables.push_back(nd);
+							}
+						}
+					}
+				}
+			}
+
+			{
+				Vector<GDMonoProperty *> properties = top->get_all_properties();
+				for (int i = 0; i < properties.size(); i++) {
+					if (!properties[i]->is_static()) {
+						MultiplayerAPI::RPCMode mode = _member_get_rpc_mode(properties[i]);
+						if (MultiplayerAPI::RPC_MODE_DISABLED != mode) {
+							ScriptNetData nd;
+							nd.name = properties[i]->get_name();
+							nd.mode = mode;
+							if (-1 == rpc_variables.find(nd)) {
+								rpc_variables.push_back(nd);
+							}
+						}
+					}
+				}
+			}
+
+			top = top->get_parent_class();
+		}
+
+		// Sort so we are 100% that they are always the same.
+		rpc_functions.sort_custom<SortNetData>();
+		rpc_variables.sort_custom<SortNetData>();
+
 		return OK;
 	}
 
@@ -3259,12 +3430,10 @@ Error CSharpScript::reload(bool p_keep_state) {
 }
 
 ScriptLanguage *CSharpScript::get_language() const {
-
 	return CSharpLanguage::get_singleton();
 }
 
 bool CSharpScript::get_property_default_value(const StringName &p_property, Variant &r_value) const {
-
 #ifdef TOOLS_ENABLED
 
 	const Map<StringName, Variant>::Element *E = exported_members_defval_cache.find(p_property);
@@ -3282,51 +3451,167 @@ bool CSharpScript::get_property_default_value(const StringName &p_property, Vari
 }
 
 void CSharpScript::update_exports() {
-
 #ifdef TOOLS_ENABLED
 	_update_exports();
 #endif
 }
 
 bool CSharpScript::has_script_signal(const StringName &p_signal) const {
-	return _signals.has(p_signal);
+	return event_signals.has(p_signal) || _signals.has(p_signal);
 }
 
 void CSharpScript::get_script_signal_list(List<MethodInfo> *r_signals) const {
-	for (const Map<StringName, Vector<Argument> >::Element *E = _signals.front(); E; E = E->next()) {
+	for (const Map<StringName, Vector<SignalParameter>>::Element *E = _signals.front(); E; E = E->next()) {
 		MethodInfo mi;
+		mi.name = E->key();
+
+		const Vector<SignalParameter> &params = E->value();
+		for (int i = 0; i < params.size(); i++) {
+			const SignalParameter &param = params[i];
 
+			PropertyInfo arg_info = PropertyInfo(param.type, param.name);
+			if (param.type == Variant::NIL && param.nil_is_variant) {
+				arg_info.usage |= PROPERTY_USAGE_NIL_IS_VARIANT;
+			}
+
+			mi.arguments.push_back(arg_info);
+		}
+
+		r_signals->push_back(mi);
+	}
+
+	for (const Map<StringName, EventSignal>::Element *E = event_signals.front(); E; E = E->next()) {
+		MethodInfo mi;
 		mi.name = E->key();
-		for (int i = 0; i < E->get().size(); i++) {
-			PropertyInfo arg;
-			arg.name = E->get()[i].name;
-			mi.arguments.push_back(arg);
+
+		const EventSignal &event_signal = E->value();
+		const Vector<SignalParameter> &params = event_signal.parameters;
+		for (int i = 0; i < params.size(); i++) {
+			const SignalParameter &param = params[i];
+
+			PropertyInfo arg_info = PropertyInfo(param.type, param.name);
+			if (param.type == Variant::NIL && param.nil_is_variant) {
+				arg_info.usage |= PROPERTY_USAGE_NIL_IS_VARIANT;
+			}
+
+			mi.arguments.push_back(arg_info);
 		}
+
 		r_signals->push_back(mi);
 	}
 }
 
-Ref<Script> CSharpScript::get_base_script() const {
+bool CSharpScript::inherits_script(const Ref<Script> &p_script) const {
+	Ref<CSharpScript> cs = p_script;
+	if (cs.is_null()) {
+		return false;
+	}
+
+	if (script_class == nullptr || cs->script_class == nullptr) {
+		return false;
+	}
+
+	if (script_class == cs->script_class) {
+		return true;
+	}
 
+	return cs->script_class->is_assignable_from(script_class);
+}
+
+Ref<Script> CSharpScript::get_base_script() const {
 	// TODO search in metadata file once we have it, not important any way?
 	return Ref<Script>();
 }
 
 void CSharpScript::get_script_property_list(List<PropertyInfo> *p_list) const {
-
 	for (Map<StringName, PropertyInfo>::Element *E = member_info.front(); E; E = E->next()) {
 		p_list->push_back(E->value());
 	}
 }
 
 int CSharpScript::get_member_line(const StringName &p_member) const {
-
 	// TODO omnisharp
 	return -1;
 }
 
-Error CSharpScript::load_source_code(const String &p_path) {
+MultiplayerAPI::RPCMode CSharpScript::_member_get_rpc_mode(IMonoClassMember *p_member) const {
+	if (p_member->has_attribute(CACHED_CLASS(RemoteAttribute))) {
+		return MultiplayerAPI::RPC_MODE_REMOTE;
+	}
+	if (p_member->has_attribute(CACHED_CLASS(MasterAttribute))) {
+		return MultiplayerAPI::RPC_MODE_MASTER;
+	}
+	if (p_member->has_attribute(CACHED_CLASS(PuppetAttribute))) {
+		return MultiplayerAPI::RPC_MODE_PUPPET;
+	}
+	if (p_member->has_attribute(CACHED_CLASS(RemoteSyncAttribute))) {
+		return MultiplayerAPI::RPC_MODE_REMOTESYNC;
+	}
+	if (p_member->has_attribute(CACHED_CLASS(MasterSyncAttribute))) {
+		return MultiplayerAPI::RPC_MODE_MASTERSYNC;
+	}
+	if (p_member->has_attribute(CACHED_CLASS(PuppetSyncAttribute))) {
+		return MultiplayerAPI::RPC_MODE_PUPPETSYNC;
+	}
+
+	return MultiplayerAPI::RPC_MODE_DISABLED;
+}
+
+Vector<ScriptNetData> CSharpScript::get_rpc_methods() const {
+	return rpc_functions;
+}
+
+uint16_t CSharpScript::get_rpc_method_id(const StringName &p_method) const {
+	for (int i = 0; i < rpc_functions.size(); i++) {
+		if (rpc_functions[i].name == p_method) {
+			return i;
+		}
+	}
+	return UINT16_MAX;
+}
+
+StringName CSharpScript::get_rpc_method(const uint16_t p_rpc_method_id) const {
+	ERR_FAIL_COND_V(p_rpc_method_id >= rpc_functions.size(), StringName());
+	return rpc_functions[p_rpc_method_id].name;
+}
+
+MultiplayerAPI::RPCMode CSharpScript::get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const {
+	ERR_FAIL_COND_V(p_rpc_method_id >= rpc_functions.size(), MultiplayerAPI::RPC_MODE_DISABLED);
+	return rpc_functions[p_rpc_method_id].mode;
+}
+
+MultiplayerAPI::RPCMode CSharpScript::get_rpc_mode(const StringName &p_method) const {
+	return get_rpc_mode_by_id(get_rpc_method_id(p_method));
+}
+
+Vector<ScriptNetData> CSharpScript::get_rset_properties() const {
+	return rpc_variables;
+}
+
+uint16_t CSharpScript::get_rset_property_id(const StringName &p_variable) const {
+	for (int i = 0; i < rpc_variables.size(); i++) {
+		if (rpc_variables[i].name == p_variable) {
+			return i;
+		}
+	}
+	return UINT16_MAX;
+}
 
+StringName CSharpScript::get_rset_property(const uint16_t p_rset_member_id) const {
+	ERR_FAIL_COND_V(p_rset_member_id >= rpc_variables.size(), StringName());
+	return rpc_variables[p_rset_member_id].name;
+}
+
+MultiplayerAPI::RPCMode CSharpScript::get_rset_mode_by_id(const uint16_t p_rset_member_id) const {
+	ERR_FAIL_COND_V(p_rset_member_id >= rpc_functions.size(), MultiplayerAPI::RPC_MODE_DISABLED);
+	return rpc_functions[p_rset_member_id].mode;
+}
+
+MultiplayerAPI::RPCMode CSharpScript::get_rset_mode(const StringName &p_variable) const {
+	return get_rset_mode_by_id(get_rset_property_id(p_variable));
+}
+
+Error CSharpScript::load_source_code(const String &p_path) {
 	Error ferr = read_all_file_utf8(p_path, source);
 
 	ERR_FAIL_COND_V_MSG(ferr != OK, ferr,
@@ -3342,48 +3627,59 @@ Error CSharpScript::load_source_code(const String &p_path) {
 	return OK;
 }
 
-StringName CSharpScript::get_script_name() const {
+void CSharpScript::_update_name() {
+	String path = get_path();
 
-	return name;
+	if (!path.empty()) {
+		name = get_path().get_file().get_basename();
+	}
 }
 
-CSharpScript::CSharpScript() :
-		script_list(this) {
-
-	_clear();
+void CSharpScript::_clear() {
+	tool = false;
+	valid = false;
 
-#ifdef TOOLS_ENABLED
-	source_changed_cache = false;
-	placeholder_fallback_enabled = false;
-	exports_invalidated = true;
-#endif
+	base = nullptr;
+	native = nullptr;
+	script_class = nullptr;
+}
 
-	signals_invalidated = true;
+CSharpScript::CSharpScript() {
+	_clear();
 
-	_resource_path_changed();
+	_update_name();
 
 #ifdef DEBUG_ENABLED
 	{
-		SCOPED_MUTEX_LOCK(CSharpLanguage::get_singleton()->script_instances_mutex);
+		MutexLock lock(CSharpLanguage::get_singleton()->script_instances_mutex);
 		CSharpLanguage::get_singleton()->script_list.add(&this->script_list);
 	}
 #endif
 }
 
 CSharpScript::~CSharpScript() {
-
 #ifdef DEBUG_ENABLED
-	SCOPED_MUTEX_LOCK(CSharpLanguage::get_singleton()->script_instances_mutex);
+	MutexLock lock(CSharpLanguage::get_singleton()->script_instances_mutex);
 	CSharpLanguage::get_singleton()->script_list.remove(&this->script_list);
 #endif
 }
 
-/*************** RESOURCE ***************/
+void CSharpScript::get_members(Set<StringName> *p_members) {
+#if defined(TOOLS_ENABLED) || defined(DEBUG_ENABLED)
+	if (p_members) {
+		for (Set<StringName>::Element *E = exported_members_names.front(); E; E = E->next()) {
+			p_members->insert(E->get());
+		}
+	}
+#endif
+}
 
-RES ResourceFormatLoaderCSharpScript::load(const String &p_path, const String &p_original_path, Error *r_error) {
+/*************** RESOURCE ***************/
 
-	if (r_error)
+RES ResourceFormatLoaderCSharpScript::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, bool p_no_cache) {
+	if (r_error) {
 		*r_error = ERR_FILE_CANT_OPEN;
+	}
 
 	// TODO ignore anything inside bin/ and obj/ in tools builds?
 
@@ -3400,29 +3696,26 @@ RES ResourceFormatLoaderCSharpScript::load(const String &p_path, const String &p
 
 	script->reload();
 
-	if (r_error)
+	if (r_error) {
 		*r_error = OK;
+	}
 
 	return scriptres;
 }
 
 void ResourceFormatLoaderCSharpScript::get_recognized_extensions(List<String> *p_extensions) const {
-
 	p_extensions->push_back("cs");
 }
 
 bool ResourceFormatLoaderCSharpScript::handles_type(const String &p_type) const {
-
 	return p_type == "Script" || p_type == CSharpLanguage::get_singleton()->get_type();
 }
 
 String ResourceFormatLoaderCSharpScript::get_resource_type(const String &p_path) const {
-
 	return p_path.get_extension().to_lower() == "cs" ? CSharpLanguage::get_singleton()->get_type() : "";
 }
 
 Error ResourceFormatSaverCSharpScript::save(const String &p_path, const RES &p_resource, uint32_t p_flags) {
-
 	Ref<CSharpScript> sqscr = p_resource;
 	ERR_FAIL_COND_V(sqscr.is_null(), ERR_INVALID_PARAMETER);
 
@@ -3430,14 +3723,10 @@ Error ResourceFormatSaverCSharpScript::save(const String &p_path, const RES &p_r
 
 #ifdef TOOLS_ENABLED
 	if (!FileAccess::exists(p_path)) {
-		// The file does not yet exists, let's assume the user just created this script
-
-		if (_create_project_solution_if_needed()) {
-			CSharpProject::add_item(GodotSharpDirs::get_project_csproj_path(),
-					"Compile",
-					ProjectSettings::get_singleton()->globalize_path(p_path));
-		} else {
-			ERR_PRINTS("C# project could not be created; cannot add file: '" + p_path + "'.");
+		// The file does not yet exist, let's assume the user just created this script. In such
+		// cases we need to check whether the solution and csproj were already created or not.
+		if (!_create_project_solution_if_needed()) {
+			ERR_PRINT("C# project could not be created; cannot add file: '" + p_path + "'.");
 		}
 	}
 #endif
@@ -3466,19 +3755,16 @@ Error ResourceFormatSaverCSharpScript::save(const String &p_path, const RES &p_r
 }
 
 void ResourceFormatSaverCSharpScript::get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const {
-
 	if (Object::cast_to<CSharpScript>(p_resource.ptr())) {
 		p_extensions->push_back("cs");
 	}
 }
 
 bool ResourceFormatSaverCSharpScript::recognize(const RES &p_resource) const {
-
-	return Object::cast_to<CSharpScript>(p_resource.ptr()) != NULL;
+	return Object::cast_to<CSharpScript>(p_resource.ptr()) != nullptr;
 }
 
 CSharpLanguage::StringNameCache::StringNameCache() {
-
 	_signal_callback = StaticCString::create("_signal_callback");
 	_set = StaticCString::create("_set");
 	_get = StaticCString::create("_get");
@@ -3488,4 +3774,5 @@ CSharpLanguage::StringNameCache::StringNameCache() {
 	on_before_serialize = StaticCString::create("OnBeforeSerialize");
 	on_after_deserialize = StaticCString::create("OnAfterDeserialize");
 	dotctor = StaticCString::create(".ctor");
+	delegate_invoke_method_name = StaticCString::create("Invoke");
 }
diff --git a/modules/mono/csharp_script.h b/modules/mono/csharp_script.h
index f244bc4119..f0b43a40f9 100644
--- a/modules/mono/csharp_script.h
+++ b/modules/mono/csharp_script.h
@@ -53,8 +53,8 @@ class CSharpLanguage;
 template <typename TScriptInstance, typename TScriptLanguage>
 TScriptInstance *cast_script_instance(ScriptInstance *p_inst) {
 	if (!p_inst)
-		return NULL;
-	return p_inst->get_language() == TScriptLanguage::get_singleton() ? static_cast<TScriptInstance *>(p_inst) : NULL;
+		return nullptr;
+	return p_inst->get_language() == TScriptLanguage::get_singleton() ? static_cast<TScriptInstance *>(p_inst) : nullptr;
 }
 #else
 template <typename TScriptInstance, typename TScriptLanguage>
@@ -66,21 +66,34 @@ TScriptInstance *cast_script_instance(ScriptInstance *p_inst) {
 #define CAST_CSHARP_INSTANCE(m_inst) (cast_script_instance<CSharpInstance, CSharpLanguage>(m_inst))
 
 class CSharpScript : public Script {
-
 	GDCLASS(CSharpScript, Script);
 
+public:
+	struct SignalParameter {
+		String name;
+		Variant::Type type;
+		bool nil_is_variant = false;
+	};
+
+	struct EventSignal {
+		GDMonoField *field = nullptr;
+		GDMonoMethod *invoke_method = nullptr;
+		Vector<SignalParameter> parameters;
+	};
+
+private:
 	friend class CSharpInstance;
 	friend class CSharpLanguage;
 	friend struct CSharpScriptDepSort;
 
-	bool tool;
-	bool valid;
+	bool tool = false;
+	bool valid = false;
 
 	bool builtin;
 
-	GDMonoClass *base;
-	GDMonoClass *native;
-	GDMonoClass *script_class;
+	GDMonoClass *base = nullptr;
+	GDMonoClass *native = nullptr;
+	GDMonoClass *script_class = nullptr;
 
 	Ref<CSharpScript> base_cache; // TODO what's this for?
 
@@ -91,7 +104,8 @@ class CSharpScript : public Script {
 		// TODO
 		// Replace with buffer containing the serialized state of managed scripts.
 		// Keep variant state backup to use only with script instance placeholders.
-		List<Pair<StringName, Variant> > properties;
+		List<Pair<StringName, Variant>> properties;
+		List<Pair<StringName, Array>> event_signals;
 	};
 
 	Set<ObjectID> pending_reload_instances;
@@ -103,116 +117,137 @@ class CSharpScript : public Script {
 	String source;
 	StringName name;
 
-	SelfList<CSharpScript> script_list;
+	SelfList<CSharpScript> script_list = this;
 
-	struct Argument {
-		String name;
-		Variant::Type type;
-	};
+	Map<StringName, Vector<SignalParameter>> _signals;
+	Map<StringName, EventSignal> event_signals;
+	bool signals_invalidated = true;
 
-	Map<StringName, Vector<Argument> > _signals;
-	bool signals_invalidated;
+	Vector<ScriptNetData> rpc_functions;
+	Vector<ScriptNetData> rpc_variables;
 
 #ifdef TOOLS_ENABLED
 	List<PropertyInfo> exported_members_cache; // members_cache
 	Map<StringName, Variant> exported_members_defval_cache; // member_default_values_cache
 	Set<PlaceHolderScriptInstance *> placeholders;
-	bool source_changed_cache;
-	bool placeholder_fallback_enabled;
-	bool exports_invalidated;
+	bool source_changed_cache = false;
+	bool placeholder_fallback_enabled = false;
+	bool exports_invalidated = true;
 	void _update_exports_values(Map<StringName, Variant> &values, List<PropertyInfo> &propnames);
 	void _update_member_info_no_exports();
-	virtual void _placeholder_erased(PlaceHolderScriptInstance *p_placeholder);
+	void _placeholder_erased(PlaceHolderScriptInstance *p_placeholder) override;
+#endif
+
+#if defined(TOOLS_ENABLED) || defined(DEBUG_ENABLED)
+	Set<StringName> exported_members_names;
 #endif
 
 	Map<StringName, PropertyInfo> member_info;
 
 	void _clear();
 
+	void _update_name();
+
 	void load_script_signals(GDMonoClass *p_class, GDMonoClass *p_native_class);
-	bool _get_signal(GDMonoClass *p_class, GDMonoClass *p_delegate, Vector<Argument> &params);
+	bool _get_signal(GDMonoClass *p_class, GDMonoMethod *p_delegate_invoke, Vector<SignalParameter> &params);
 
 	bool _update_exports();
-#ifdef TOOLS_ENABLED
+
 	bool _get_member_export(IMonoClassMember *p_member, bool p_inspect_export, PropertyInfo &r_prop_info, bool &r_exported);
+#ifdef TOOLS_ENABLED
 	static int _try_get_member_export_hint(IMonoClassMember *p_member, ManagedType p_type, Variant::Type p_variant_type, bool p_allow_generics, PropertyHint &r_hint, String &r_hint_string);
 #endif
 
-	CSharpInstance *_create_instance(const Variant **p_args, int p_argcount, Object *p_owner, bool p_isref, Variant::CallError &r_error);
-	Variant _new(const Variant **p_args, int p_argcount, Variant::CallError &r_error);
+	CSharpInstance *_create_instance(const Variant **p_args, int p_argcount, Object *p_owner, bool p_isref, Callable::CallError &r_error);
+	Variant _new(const Variant **p_args, int p_argcount, Callable::CallError &r_error);
 
 	// Do not use unless you know what you are doing
 	friend void GDMonoInternals::tie_managed_to_unmanaged(MonoObject *, Object *);
 	static Ref<CSharpScript> create_for_managed_type(GDMonoClass *p_class, GDMonoClass *p_native);
 	static void initialize_for_managed_type(Ref<CSharpScript> p_script, GDMonoClass *p_class, GDMonoClass *p_native);
 
+	MultiplayerAPI::RPCMode _member_get_rpc_mode(IMonoClassMember *p_member) const;
+
 protected:
 	static void _bind_methods();
 
-	Variant call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error);
-	virtual void _resource_path_changed();
+	Variant call(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error) override;
+	void _resource_path_changed() override;
 	bool _get(const StringName &p_name, Variant &r_ret) const;
 	bool _set(const StringName &p_name, const Variant &p_value);
 	void _get_property_list(List<PropertyInfo> *p_properties) const;
 
 public:
-	virtual bool can_instance() const;
-	virtual StringName get_instance_base_type() const;
-	virtual ScriptInstance *instance_create(Object *p_this);
-	virtual PlaceHolderScriptInstance *placeholder_instance_create(Object *p_this);
-	virtual bool instance_has(const Object *p_this) const;
+	bool can_instance() const override;
+	StringName get_instance_base_type() const override;
+	ScriptInstance *instance_create(Object *p_this) override;
+	PlaceHolderScriptInstance *placeholder_instance_create(Object *p_this) override;
+	bool instance_has(const Object *p_this) const override;
+
+	bool has_source_code() const override;
+	String get_source_code() const override;
+	void set_source_code(const String &p_code) override;
 
-	virtual bool has_source_code() const;
-	virtual String get_source_code() const;
-	virtual void set_source_code(const String &p_code);
+	Error reload(bool p_keep_state = false) override;
 
-	virtual Error reload(bool p_keep_state = false);
+	bool has_script_signal(const StringName &p_signal) const override;
+	void get_script_signal_list(List<MethodInfo> *r_signals) const override;
 
-	virtual bool has_script_signal(const StringName &p_signal) const;
-	virtual void get_script_signal_list(List<MethodInfo> *r_signals) const;
+	bool get_property_default_value(const StringName &p_property, Variant &r_value) const override;
+	void get_script_property_list(List<PropertyInfo> *p_list) const override;
+	void update_exports() override;
 
-	virtual bool get_property_default_value(const StringName &p_property, Variant &r_value) const;
-	virtual void get_script_property_list(List<PropertyInfo> *p_list) const;
-	virtual void update_exports();
+	void get_members(Set<StringName> *p_members) override;
 
-	virtual bool is_tool() const { return tool; }
-	virtual bool is_valid() const { return valid; }
+	bool is_tool() const override { return tool; }
+	bool is_valid() const override { return valid; }
 
-	virtual Ref<Script> get_base_script() const;
-	virtual ScriptLanguage *get_language() const;
+	bool inherits_script(const Ref<Script> &p_script) const override;
 
-	virtual void get_script_method_list(List<MethodInfo> *p_list) const;
-	bool has_method(const StringName &p_method) const;
-	MethodInfo get_method_info(const StringName &p_method) const;
+	Ref<Script> get_base_script() const override;
+	ScriptLanguage *get_language() const override;
 
-	virtual int get_member_line(const StringName &p_member) const;
+	void get_script_method_list(List<MethodInfo> *p_list) const override;
+	bool has_method(const StringName &p_method) const override;
+	MethodInfo get_method_info(const StringName &p_method) const override;
+
+	int get_member_line(const StringName &p_member) const override;
+
+	Vector<ScriptNetData> get_rpc_methods() const override;
+	uint16_t get_rpc_method_id(const StringName &p_method) const override;
+	StringName get_rpc_method(const uint16_t p_rpc_method_id) const override;
+	MultiplayerAPI::RPCMode get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const override;
+	MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const override;
+
+	Vector<ScriptNetData> get_rset_properties() const override;
+	uint16_t get_rset_property_id(const StringName &p_variable) const override;
+	StringName get_rset_property(const uint16_t p_variable_id) const override;
+	MultiplayerAPI::RPCMode get_rset_mode_by_id(const uint16_t p_variable_id) const override;
+	MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const override;
 
 #ifdef TOOLS_ENABLED
-	virtual bool is_placeholder_fallback_enabled() const { return placeholder_fallback_enabled; }
+	bool is_placeholder_fallback_enabled() const override { return placeholder_fallback_enabled; }
 #endif
 
 	Error load_source_code(const String &p_path);
 
-	StringName get_script_name() const;
-
 	CSharpScript();
 	~CSharpScript();
 };
 
 class CSharpInstance : public ScriptInstance {
-
 	friend class CSharpScript;
 	friend class CSharpLanguage;
 
-	Object *owner;
-	bool base_ref;
-	bool ref_dying;
-	bool unsafe_referenced;
-	bool predelete_notified;
-	bool destructing_script_instance;
+	Object *owner = nullptr;
+	bool base_ref = false;
+	bool ref_dying = false;
+	bool unsafe_referenced = false;
+	bool predelete_notified = false;
+	bool destructing_script_instance = false;
 
 	Ref<CSharpScript> script;
-	Ref<MonoGCHandle> gchandle;
+	MonoGCHandleData gchandle;
 
 	bool _reference_owner_unsafe();
 
@@ -222,99 +257,113 @@ class CSharpInstance : public ScriptInstance {
 	bool _unreference_owner_unsafe();
 
 	/*
-	 * If NULL is returned, the caller must destroy the script instance by removing it from its owner.
+	 * If nullptr is returned, the caller must destroy the script instance by removing it from its owner.
 	 */
 	MonoObject *_internal_new_managed();
 
 	// Do not use unless you know what you are doing
 	friend void GDMonoInternals::tie_managed_to_unmanaged(MonoObject *, Object *);
-	static CSharpInstance *create_for_managed_type(Object *p_owner, CSharpScript *p_script, const Ref<MonoGCHandle> &p_gchandle);
+	static CSharpInstance *create_for_managed_type(Object *p_owner, CSharpScript *p_script, const MonoGCHandleData &p_gchandle);
 
-	void _call_multilevel(MonoObject *p_mono_object, const StringName &p_method, const Variant **p_args, int p_argcount);
-
-	MultiplayerAPI::RPCMode _member_get_rpc_mode(IMonoClassMember *p_member) const;
-
-	void get_properties_state_for_reloading(List<Pair<StringName, Variant> > &r_state);
+	void get_properties_state_for_reloading(List<Pair<StringName, Variant>> &r_state);
+	void get_event_signals_state_for_reloading(List<Pair<StringName, Array>> &r_state);
 
 public:
 	MonoObject *get_mono_object() const;
 
 	_FORCE_INLINE_ bool is_destructing_script_instance() { return destructing_script_instance; }
 
-	virtual Object *get_owner();
+	Object *get_owner() override;
 
-	virtual bool set(const StringName &p_name, const Variant &p_value);
-	virtual bool get(const StringName &p_name, Variant &r_ret) const;
-	virtual void get_property_list(List<PropertyInfo> *p_properties) const;
-	virtual Variant::Type get_property_type(const StringName &p_name, bool *r_is_valid) const;
+	bool set(const StringName &p_name, const Variant &p_value) override;
+	bool get(const StringName &p_name, Variant &r_ret) const override;
+	void get_property_list(List<PropertyInfo> *p_properties) const override;
+	Variant::Type get_property_type(const StringName &p_name, bool *r_is_valid) const override;
 
-	/* TODO */ virtual void get_method_list(List<MethodInfo> *p_list) const {}
-	virtual bool has_method(const StringName &p_method) const;
-	virtual Variant call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error);
-	virtual void call_multilevel(const StringName &p_method, const Variant **p_args, int p_argcount);
-	virtual void call_multilevel_reversed(const StringName &p_method, const Variant **p_args, int p_argcount);
+	/* TODO */ void get_method_list(List<MethodInfo> *p_list) const override {}
+	bool has_method(const StringName &p_method) const override;
+	Variant call(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error) override;
 
 	void mono_object_disposed(MonoObject *p_obj);
 
 	/*
-	 * If 'r_delete_owner' is set to true, the caller must memdelete the script instance's owner. Otherwise, if
+	 * If 'r_delete_owner' is set to true, the caller must memdelete the script instance's owner. Otherwise, ifevent_signal
 	 * 'r_remove_script_instance' is set to true, the caller must destroy the script instance by removing it from its owner.
 	 */
 	void mono_object_disposed_baseref(MonoObject *p_obj, bool p_is_finalizer, bool &r_delete_owner, bool &r_remove_script_instance);
 
-	virtual void refcount_incremented();
-	virtual bool refcount_decremented();
+	void connect_event_signals();
+	void disconnect_event_signals();
+
+	void refcount_incremented() override;
+	bool refcount_decremented() override;
+
+	Vector<ScriptNetData> get_rpc_methods() const override;
+	uint16_t get_rpc_method_id(const StringName &p_method) const override;
+	StringName get_rpc_method(const uint16_t p_rpc_method_id) const override;
+	MultiplayerAPI::RPCMode get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const override;
+	MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const override;
 
-	virtual MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const;
-	virtual MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const;
+	Vector<ScriptNetData> get_rset_properties() const override;
+	uint16_t get_rset_property_id(const StringName &p_variable) const override;
+	StringName get_rset_property(const uint16_t p_variable_id) const override;
+	MultiplayerAPI::RPCMode get_rset_mode_by_id(const uint16_t p_variable_id) const override;
+	MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const override;
 
-	virtual void notification(int p_notification);
+	void notification(int p_notification) override;
 	void _call_notification(int p_notification);
 
-	virtual String to_string(bool *r_valid);
+	String to_string(bool *r_valid) override;
 
-	virtual Ref<Script> get_script() const;
+	Ref<Script> get_script() const override;
 
-	virtual ScriptLanguage *get_language();
+	ScriptLanguage *get_language() override;
 
-	CSharpInstance();
+	CSharpInstance(const Ref<CSharpScript> &p_script);
 	~CSharpInstance();
 };
 
 struct CSharpScriptBinding {
-	bool inited;
+	bool inited = false;
 	StringName type_name;
-	GDMonoClass *wrapper_class;
-	Ref<MonoGCHandle> gchandle;
-	Object *owner;
+	GDMonoClass *wrapper_class = nullptr;
+	MonoGCHandleData gchandle;
+	Object *owner = nullptr;
+
+	CSharpScriptBinding() {}
 };
 
-class CSharpLanguage : public ScriptLanguage {
+class ManagedCallableMiddleman : public Object {
+	GDCLASS(ManagedCallableMiddleman, Object);
+};
 
+class CSharpLanguage : public ScriptLanguage {
 	friend class CSharpScript;
 	friend class CSharpInstance;
 
 	static CSharpLanguage *singleton;
 
-	bool finalizing;
+	bool finalizing = false;
+	bool finalized = false;
 
-	GDMono *gdmono;
+	GDMono *gdmono = nullptr;
 	SelfList<CSharpScript>::List script_list;
 
-	Mutex *script_instances_mutex;
-	Mutex *script_gchandle_release_mutex;
-	Mutex *language_bind_mutex;
+	Mutex script_instances_mutex;
+	Mutex script_gchandle_release_mutex;
+	Mutex language_bind_mutex;
 
 	Map<Object *, CSharpScriptBinding> script_bindings;
 
 #ifdef DEBUG_ENABLED
 	// List of unsafe object references
 	Map<ObjectID, int> unsafe_object_references;
-	Mutex *unsafe_object_references_lock;
+	Mutex unsafe_object_references_lock;
 #endif
 
-	struct StringNameCache {
+	ManagedCallableMiddleman *managed_callable_middleman = memnew(ManagedCallableMiddleman);
 
+	struct StringNameCache {
 		StringName _signal_callback;
 		StringName _set;
 		StringName _get;
@@ -324,17 +373,18 @@ class CSharpLanguage : public ScriptLanguage {
 		StringName dotctor; // .ctor
 		StringName on_before_serialize; // OnBeforeSerialize
 		StringName on_after_deserialize; // OnAfterDeserialize
+		StringName delegate_invoke_method_name;
 
 		StringNameCache();
 	};
 
-	int lang_idx;
+	int lang_idx = -1;
 
 	Dictionary scripts_metadata;
-	bool scripts_metadata_invalidated;
+	bool scripts_metadata_invalidated = true;
 
 	// For debug_break and debug_break_parse
-	int _debug_parse_err_line;
+	int _debug_parse_err_line = -1;
 	String _debug_parse_err_file;
 	String _debug_error;
 
@@ -344,7 +394,7 @@ class CSharpLanguage : public ScriptLanguage {
 	void _on_scripts_domain_unloaded();
 
 #ifdef TOOLS_ENABLED
-	EditorPlugin *godotsharp_editor;
+	EditorPlugin *godotsharp_editor = nullptr;
 
 	static void _editor_init_callback();
 #endif
@@ -352,7 +402,7 @@ class CSharpLanguage : public ScriptLanguage {
 public:
 	StringNameCache string_names;
 
-	Mutex *get_language_bind_mutex() { return language_bind_mutex; }
+	const Mutex &get_language_bind_mutex() { return language_bind_mutex; }
 
 	_FORCE_INLINE_ int get_language_index() { return lang_idx; }
 	void set_language_index(int p_idx);
@@ -365,8 +415,8 @@ public:
 	_FORCE_INLINE_ EditorPlugin *get_godotsharp_editor() const { return godotsharp_editor; }
 #endif
 
-	static void release_script_gchandle(Ref<MonoGCHandle> &p_gchandle);
-	static void release_script_gchandle(MonoObject *p_expected_obj, Ref<MonoGCHandle> &p_gchandle);
+	static void release_script_gchandle(MonoGCHandleData &p_gchandle);
+	static void release_script_gchandle(MonoObject *p_expected_obj, MonoGCHandleData &p_gchandle);
 
 	bool debug_break(const String &p_error, bool p_allow_continue = true);
 	bool debug_break_parse(const String &p_file, int p_line, const String &p_error);
@@ -381,81 +431,90 @@ public:
 	}
 
 	_FORCE_INLINE_ const Dictionary &get_scripts_metadata() {
-		if (scripts_metadata_invalidated)
+		if (scripts_metadata_invalidated) {
 			_load_scripts_metadata();
+		}
 		return scripts_metadata;
 	}
 
-	virtual String get_name() const;
+	_FORCE_INLINE_ ManagedCallableMiddleman *get_managed_callable_middleman() const { return managed_callable_middleman; }
+
+	String get_name() const override;
 
 	/* LANGUAGE FUNCTIONS */
-	virtual String get_type() const;
-	virtual String get_extension() const;
-	virtual Error execute_file(const String &p_path);
-	virtual void init();
-	virtual void finish();
+	String get_type() const override;
+	String get_extension() const override;
+	Error execute_file(const String &p_path) override;
+	void init() override;
+	void finish() override;
+
+	void finalize();
 
 	/* EDITOR FUNCTIONS */
-	virtual void get_reserved_words(List<String> *p_words) const;
-	virtual void get_comment_delimiters(List<String> *p_delimiters) const;
-	virtual void get_string_delimiters(List<String> *p_delimiters) const;
-	virtual Ref<Script> get_template(const String &p_class_name, const String &p_base_class_name) const;
-	virtual bool is_using_templates();
-	virtual void make_template(const String &p_class_name, const String &p_base_class_name, Ref<Script> &p_script);
-	/* TODO */ virtual bool validate(const String &p_script, int &r_line_error, int &r_col_error, String &r_test_error, const String &p_path, List<String> *r_functions, List<ScriptLanguage::Warning> *r_warnings = NULL, Set<int> *r_safe_lines = NULL) const { return true; }
-	virtual String validate_path(const String &p_path) const;
-	virtual Script *create_script() const;
-	virtual bool has_named_classes() const;
-	virtual bool supports_builtin_mode() const;
-	/* TODO? */ virtual int find_function(const String &p_function, const String &p_code) const { return -1; }
-	virtual String make_function(const String &p_class, const String &p_name, const PoolStringArray &p_args) const;
+	void get_reserved_words(List<String> *p_words) const override;
+	void get_comment_delimiters(List<String> *p_delimiters) const override;
+	void get_string_delimiters(List<String> *p_delimiters) const override;
+	Ref<Script> get_template(const String &p_class_name, const String &p_base_class_name) const override;
+	bool is_using_templates() override;
+	void make_template(const String &p_class_name, const String &p_base_class_name, Ref<Script> &p_script) override;
+	/* TODO */ bool validate(const String &p_script, int &r_line_error, int &r_col_error,
+			String &r_test_error, const String &p_path, List<String> *r_functions,
+			List<ScriptLanguage::Warning> *r_warnings = nullptr, Set<int> *r_safe_lines = nullptr) const override {
+		return true;
+	}
+	String validate_path(const String &p_path) const override;
+	Script *create_script() const override;
+	bool has_named_classes() const override;
+	bool supports_builtin_mode() const override;
+	/* TODO? */ int find_function(const String &p_function, const String &p_code) const override { return -1; }
+	String make_function(const String &p_class, const String &p_name, const PackedStringArray &p_args) const override;
 	virtual String _get_indentation() const;
-	/* TODO? */ virtual void auto_indent_code(String &p_code, int p_from_line, int p_to_line) const {}
-	/* TODO */ virtual void add_global_constant(const StringName &p_variable, const Variant &p_value) {}
+	/* TODO? */ void auto_indent_code(String &p_code, int p_from_line, int p_to_line) const override {}
+	/* TODO */ void add_global_constant(const StringName &p_variable, const Variant &p_value) override {}
 
 	/* DEBUGGER FUNCTIONS */
-	virtual String debug_get_error() const;
-	virtual int debug_get_stack_level_count() const;
-	virtual int debug_get_stack_level_line(int p_level) const;
-	virtual String debug_get_stack_level_function(int p_level) const;
-	virtual String debug_get_stack_level_source(int p_level) const;
-	/* TODO */ virtual void debug_get_stack_level_locals(int p_level, List<String> *p_locals, List<Variant> *p_values, int p_max_subitems, int p_max_depth) {}
-	/* TODO */ virtual void debug_get_stack_level_members(int p_level, List<String> *p_members, List<Variant> *p_values, int p_max_subitems, int p_max_depth) {}
-	/* TODO */ virtual void debug_get_globals(List<String> *p_locals, List<Variant> *p_values, int p_max_subitems, int p_max_depth) {}
-	/* TODO */ virtual String debug_parse_stack_level_expression(int p_level, const String &p_expression, int p_max_subitems, int p_max_depth) { return ""; }
-	virtual Vector<StackInfo> debug_get_current_stack_info();
+	String debug_get_error() const override;
+	int debug_get_stack_level_count() const override;
+	int debug_get_stack_level_line(int p_level) const override;
+	String debug_get_stack_level_function(int p_level) const override;
+	String debug_get_stack_level_source(int p_level) const override;
+	/* TODO */ void debug_get_stack_level_locals(int p_level, List<String> *p_locals, List<Variant> *p_values, int p_max_subitems, int p_max_depth) override {}
+	/* TODO */ void debug_get_stack_level_members(int p_level, List<String> *p_members, List<Variant> *p_values, int p_max_subitems, int p_max_depth) override {}
+	/* TODO */ void debug_get_globals(List<String> *p_locals, List<Variant> *p_values, int p_max_subitems, int p_max_depth) override {}
+	/* TODO */ String debug_parse_stack_level_expression(int p_level, const String &p_expression, int p_max_subitems, int p_max_depth) override { return ""; }
+	Vector<StackInfo> debug_get_current_stack_info() override;
 
 	/* PROFILING FUNCTIONS */
-	/* TODO */ virtual void profiling_start() {}
-	/* TODO */ virtual void profiling_stop() {}
-	/* TODO */ virtual int profiling_get_accumulated_data(ProfilingInfo *p_info_arr, int p_info_max) { return 0; }
-	/* TODO */ virtual int profiling_get_frame_data(ProfilingInfo *p_info_arr, int p_info_max) { return 0; }
+	/* TODO */ void profiling_start() override {}
+	/* TODO */ void profiling_stop() override {}
+	/* TODO */ int profiling_get_accumulated_data(ProfilingInfo *p_info_arr, int p_info_max) override { return 0; }
+	/* TODO */ int profiling_get_frame_data(ProfilingInfo *p_info_arr, int p_info_max) override { return 0; }
 
-	virtual void frame();
+	void frame() override;
 
-	/* TODO? */ virtual void get_public_functions(List<MethodInfo> *p_functions) const {}
-	/* TODO? */ virtual void get_public_constants(List<Pair<String, Variant> > *p_constants) const {}
+	/* TODO? */ void get_public_functions(List<MethodInfo> *p_functions) const override {}
+	/* TODO? */ void get_public_constants(List<Pair<String, Variant>> *p_constants) const override {}
 
-	virtual void reload_all_scripts();
-	virtual void reload_tool_script(const Ref<Script> &p_script, bool p_soft_reload);
+	void reload_all_scripts() override;
+	void reload_tool_script(const Ref<Script> &p_script, bool p_soft_reload) override;
 
 	/* LOADER FUNCTIONS */
-	virtual void get_recognized_extensions(List<String> *p_extensions) const;
+	void get_recognized_extensions(List<String> *p_extensions) const override;
 
 #ifdef TOOLS_ENABLED
-	virtual Error open_in_external_editor(const Ref<Script> &p_script, int p_line, int p_col);
-	virtual bool overrides_external_editor();
+	Error open_in_external_editor(const Ref<Script> &p_script, int p_line, int p_col) override;
+	bool overrides_external_editor() override;
 #endif
 
 	/* THREAD ATTACHING */
-	virtual void thread_enter();
-	virtual void thread_exit();
+	void thread_enter() override;
+	void thread_exit() override;
 
 	// Don't use these. I'm watching you
-	virtual void *alloc_instance_binding_data(Object *p_object);
-	virtual void free_instance_binding_data(void *p_data);
-	virtual void refcount_incremented_instance_binding(Object *p_object);
-	virtual bool refcount_decremented_instance_binding(Object *p_object);
+	void *alloc_instance_binding_data(Object *p_object) override;
+	void free_instance_binding_data(void *p_data) override;
+	void refcount_incremented_instance_binding(Object *p_object) override;
+	bool refcount_decremented_instance_binding(Object *p_object) override;
 
 	Map<Object *, CSharpScriptBinding>::Element *insert_script_binding(Object *p_object, const CSharpScriptBinding &p_script_binding);
 	bool setup_csharp_script_binding(CSharpScriptBinding &r_script_binding, Object *p_object);
@@ -473,17 +532,17 @@ public:
 
 class ResourceFormatLoaderCSharpScript : public ResourceFormatLoader {
 public:
-	virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
-	virtual void get_recognized_extensions(List<String> *p_extensions) const;
-	virtual bool handles_type(const String &p_type) const;
-	virtual String get_resource_type(const String &p_path) const;
+	RES load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, bool p_no_cache = false) override;
+	void get_recognized_extensions(List<String> *p_extensions) const override;
+	bool handles_type(const String &p_type) const override;
+	String get_resource_type(const String &p_path) const override;
 };
 
 class ResourceFormatSaverCSharpScript : public ResourceFormatSaver {
 public:
-	virtual Error save(const String &p_path, const RES &p_resource, uint32_t p_flags = 0);
-	virtual void get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const;
-	virtual bool recognize(const RES &p_resource) const;
+	Error save(const String &p_path, const RES &p_resource, uint32_t p_flags = 0) override;
+	void get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const override;
+	bool recognize(const RES &p_resource) const override;
 };
 
 #endif // CSHARP_SCRIPT_H
diff --git a/modules/mono/doc_classes/@C#.xml b/modules/mono/doc_classes/@C#.xml
deleted file mode 100644
index 826c106d7e..0000000000
--- a/modules/mono/doc_classes/@C#.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="@C#" category="Core" version="3.2">
-	<brief_description>
-	</brief_description>
-	<description>
-	</description>
-	<tutorials>
-	</tutorials>
-	<methods>
-	</methods>
-	<constants>
-	</constants>
-</class>
diff --git a/modules/mono/doc_classes/CSharpScript.xml b/modules/mono/doc_classes/CSharpScript.xml
index de2e246ea9..45a6f991bf 100644
--- a/modules/mono/doc_classes/CSharpScript.xml
+++ b/modules/mono/doc_classes/CSharpScript.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="CSharpScript" inherits="Script" category="Core" version="3.2">
+<class name="CSharpScript" inherits="Script" version="4.0">
 	<brief_description>
+		A script implemented in the C# programming language (Mono-enabled builds only).
 	</brief_description>
 	<description>
+		This class represents a C# script. It is the C# equivalent of the [GDScript] class and is only available in Mono-enabled Godot builds.
+		See also [GodotSharp].
 	</description>
 	<tutorials>
+		<link title="C# tutorial index">https://docs.godotengine.org/en/latest/getting_started/scripting/c_sharp/index.html</link>
 	</tutorials>
 	<methods>
 		<method name="new" qualifiers="vararg">
-			<return type="Object">
+			<return type="Variant">
 			</return>
 			<description>
+				Returns a new instance of the script.
 			</description>
 		</method>
 	</methods>
diff --git a/modules/mono/doc_classes/GodotSharp.xml b/modules/mono/doc_classes/GodotSharp.xml
index 18556a84ba..417f8ac704 100644
--- a/modules/mono/doc_classes/GodotSharp.xml
+++ b/modules/mono/doc_classes/GodotSharp.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GodotSharp" inherits="Object" category="Core" version="3.2">
+<class name="GodotSharp" inherits="Object" version="4.0">
 	<brief_description>
+		Bridge between Godot and the Mono runtime (Mono-enabled builds only).
 	</brief_description>
 	<description>
+		This class is a bridge between Godot and the Mono runtime. It exposes several low-level operations and is only available in Mono-enabled Godot builds.
+		See also [CSharpScript].
 	</description>
 	<tutorials>
 	</tutorials>
@@ -11,26 +14,30 @@
 			<return type="void">
 			</return>
 			<description>
-				Attaches the current thread to the mono runtime.
+				Attaches the current thread to the Mono runtime.
 			</description>
 		</method>
 		<method name="detach_thread">
 			<return type="void">
 			</return>
 			<description>
-				Detaches the current thread from the mono runtime.
+				Detaches the current thread from the Mono runtime.
 			</description>
 		</method>
 		<method name="get_domain_id">
 			<return type="int">
 			</return>
 			<description>
+				Returns the current MonoDomain ID.
+				[b]Note:[/b] The Mono runtime must be initialized for this method to work (use [method is_runtime_initialized] to check). If the Mono runtime isn't initialized at the time this method is called, the engine will crash.
 			</description>
 		</method>
 		<method name="get_scripts_domain_id">
 			<return type="int">
 			</return>
 			<description>
+				Returns the scripts MonoDomain's ID. This will be the same MonoDomain ID as [method get_domain_id], unless the scripts domain isn't loaded.
+				[b]Note:[/b] The Mono runtime must be initialized for this method to work (use [method is_runtime_initialized] to check). If the Mono runtime isn't initialized at the time this method is called, the engine will crash.
 			</description>
 		</method>
 		<method name="is_domain_finalizing_for_unload">
@@ -39,26 +46,28 @@
 			<argument index="0" name="domain_id" type="int">
 			</argument>
 			<description>
-				Returns whether the domain is being finalized.
+				Returns [code]true[/code] if the domain is being finalized, [code]false[/code] otherwise.
 			</description>
 		</method>
 		<method name="is_runtime_initialized">
 			<return type="bool">
 			</return>
 			<description>
+				Returns [code]true[/code] if the Mono runtime is initialized, [code]false[/code] otherwise.
 			</description>
 		</method>
 		<method name="is_runtime_shutting_down">
 			<return type="bool">
 			</return>
 			<description>
+				Returns [code]true[/code] if the Mono runtime is shutting down, [code]false[/code] otherwise.
 			</description>
 		</method>
 		<method name="is_scripts_domain_loaded">
 			<return type="bool">
 			</return>
 			<description>
-				Returns whether the scripts domain is loaded.
+				Returns [code]true[/code] if the scripts domain is loaded, [code]false[/code] otherwise.
 			</description>
 		</method>
 	</methods>
diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk.sln b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk.sln
new file mode 100644
index 0000000000..56c0cb7703
--- /dev/null
+++ b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk.sln
@@ -0,0 +1,16 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Godot.NET.Sdk", "Godot.NET.Sdk\Godot.NET.Sdk.csproj", "{31B00BFA-DEA1-42FA-A472-9E54A92A8A5F}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{31B00BFA-DEA1-42FA-A472-9E54A92A8A5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{31B00BFA-DEA1-42FA-A472-9E54A92A8A5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31B00BFA-DEA1-42FA-A472-9E54A92A8A5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{31B00BFA-DEA1-42FA-A472-9E54A92A8A5F}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal
diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj
new file mode 100644
index 0000000000..86a0a4393e
--- /dev/null
+++ b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj
@@ -0,0 +1,35 @@
+<Project Sdk="Microsoft.Build.NoTargets/2.0.1">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+
+    <Description>MSBuild .NET Sdk for Godot projects.</Description>
+    <Authors>Godot Engine contributors</Authors>
+
+    <PackageId>Godot.NET.Sdk</PackageId>
+    <Version>4.0.0</Version>
+    <PackageVersion>4.0.0-dev2</PackageVersion>
+    <PackageProjectUrl>https://github.com/godotengine/godot/tree/master/modules/mono/editor/Godot.NET.Sdk</PackageProjectUrl>
+    <PackageType>MSBuildSdk</PackageType>
+    <PackageTags>MSBuildSdk</PackageTags>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <NuspecFile>Godot.NET.Sdk.nuspec</NuspecFile>
+    <GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);SetNuSpecProperties</GenerateNuspecDependsOn>
+  </PropertyGroup>
+
+  <Target Name="SetNuSpecProperties" Condition=" Exists('$(NuspecFile)') ">
+    <PropertyGroup>
+      <NuspecProperties>
+        id=$(PackageId);
+        description=$(Description);
+        authors=$(Authors);
+        version=$(PackageVersion);
+        packagetype=$(PackageType);
+        tags=$(PackageTags);
+        projecturl=$(PackageProjectUrl)
+      </NuspecProperties>
+    </PropertyGroup>
+  </Target>
+</Project>
diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.nuspec b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.nuspec
new file mode 100644
index 0000000000..5b5cefe80e
--- /dev/null
+++ b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.nuspec
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
+  <metadata>
+    <id>$id$</id>
+    <version>$version$</version>
+    <description>$description$</description>
+    <authors>$authors$</authors>
+    <owners>$authors$</owners>
+    <projectUrl>$projecturl$</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <license type="expression">MIT</license>
+    <licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
+    <tags>$tags$</tags>
+    <packageTypes>
+      <packageType name="$packagetype$" />
+    </packageTypes>
+    <repository url="$projecturl$" />
+  </metadata>
+  <files>
+    <file src="Sdk\**" target="Sdk" />\
+  </files>
+</package>
diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.props b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.props
new file mode 100644
index 0000000000..4f8faffde2
--- /dev/null
+++ b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.props
@@ -0,0 +1,112 @@
+<Project>
+  <PropertyGroup>
+    <!-- Determines if we should import Microsoft.NET.Sdk, if it wasn't already imported. -->
+    <GodotSdkImportsMicrosoftNetSdk Condition=" '$(UsingMicrosoftNETSdk)' != 'true' ">true</GodotSdkImportsMicrosoftNetSdk>
+
+    <GodotProjectTypeGuid>{8F3E2DF0-C35C-4265-82FC-BEA011F4A7ED}</GodotProjectTypeGuid>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <Configurations>Debug;ExportDebug;ExportRelease</Configurations>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+
+    <GodotProjectDir Condition=" '$(SolutionDir)' != '' ">$(SolutionDir)</GodotProjectDir>
+    <GodotProjectDir Condition=" '$(SolutionDir)' == '' ">$(MSBuildProjectDirectory)</GodotProjectDir>
+    <GodotProjectDir>$([MSBuild]::EnsureTrailingSlash('$(GodotProjectDir)'))</GodotProjectDir>
+
+    <!-- Custom output paths for Godot projects. In brief, 'bin\' and 'obj\' are moved to '$(GodotProjectDir)\.mono\temp\'. -->
+    <BaseOutputPath>$(GodotProjectDir).mono\temp\bin\</BaseOutputPath>
+    <OutputPath>$(GodotProjectDir).mono\temp\bin\$(Configuration)\</OutputPath>
+    <!--
+    Use custom IntermediateOutputPath and BaseIntermediateOutputPath only if it wasn't already set.
+    Otherwise the old values may have already been changed by MSBuild which can cause problems with NuGet.
+    -->
+    <IntermediateOutputPath Condition=" '$(IntermediateOutputPath)' == '' ">$(GodotProjectDir).mono\temp\obj\$(Configuration)\</IntermediateOutputPath>
+    <BaseIntermediateOutputPath Condition=" '$(BaseIntermediateOutputPath)' == '' ">$(GodotProjectDir).mono\temp\obj\</BaseIntermediateOutputPath>
+
+    <!-- Do not append the target framework name to the output path. -->
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+  </PropertyGroup>
+
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" Condition=" '$(GodotSdkImportsMicrosoftNetSdk)' == 'true' " />
+
+  <PropertyGroup>
+    <EnableDefaultNoneItems>false</EnableDefaultNoneItems>
+  </PropertyGroup>
+
+  <!--
+  The Microsoft.NET.Sdk only understands of the Debug and Release configurations.
+  We need to set the following properties manually for ExportDebug and ExportRelease.
+  -->
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' or '$(Configuration)' == 'ExportDebug' ">
+    <DebugSymbols Condition=" '$(DebugSymbols)' == '' ">true</DebugSymbols>
+    <Optimize Condition=" '$(Optimize)' == '' ">false</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'ExportRelease' ">
+    <Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <GodotApiConfiguration Condition=" '$(Configuration)' != 'ExportRelease' ">Debug</GodotApiConfiguration>
+    <GodotApiConfiguration Condition=" '$(Configuration)' == 'ExportRelease' ">Release</GodotApiConfiguration>
+  </PropertyGroup>
+
+  <!-- Auto-detect the target Godot platform if it was not specified. -->
+  <PropertyGroup Condition=" '$(GodotTargetPlatform)' == '' ">
+    <GodotTargetPlatform Condition=" '$([MSBuild]::IsOsPlatform(Linux))' ">linuxbsd</GodotTargetPlatform>
+    <GodotTargetPlatform Condition=" '$([MSBuild]::IsOsPlatform(FreeBSD))' ">linuxbsd</GodotTargetPlatform>
+    <GodotTargetPlatform Condition=" '$([MSBuild]::IsOsPlatform(OSX))' ">osx</GodotTargetPlatform>
+    <GodotTargetPlatform Condition=" '$([MSBuild]::IsOsPlatform(Windows))' ">windows</GodotTargetPlatform>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <GodotRealTIsDouble Condition=" '$(GodotRealTIsDouble)' == '' ">false</GodotRealTIsDouble>
+  </PropertyGroup>
+
+  <!-- Godot DefineConstants. -->
+  <PropertyGroup>
+    <!-- Define constant to identify Godot builds. -->
+    <GodotDefineConstants>GODOT</GodotDefineConstants>
+
+    <!--
+    Define constant to determine the target Godot platform. This includes the
+    recognized platform names and the platform category (PC, MOBILE or WEB).
+    -->
+    <GodotPlatformConstants Condition=" '$(GodotTargetPlatform)' == 'windows' ">GODOT_WINDOWS;GODOT_PC</GodotPlatformConstants>
+    <GodotPlatformConstants Condition=" '$(GodotTargetPlatform)' == 'linuxbsd' ">GODOT_LINUXBSD;GODOT_PC</GodotPlatformConstants>
+    <GodotPlatformConstants Condition=" '$(GodotTargetPlatform)' == 'osx' ">GODOT_OSX;GODOT_MACOS;GODOT_PC</GodotPlatformConstants>
+    <GodotPlatformConstants Condition=" '$(GodotTargetPlatform)' == 'server' ">GODOT_SERVER;GODOT_PC</GodotPlatformConstants>
+    <GodotPlatformConstants Condition=" '$(GodotTargetPlatform)' == 'uwp' ">GODOT_UWP;GODOT_PC</GodotPlatformConstants>
+    <GodotPlatformConstants Condition=" '$(GodotTargetPlatform)' == 'haiku' ">GODOT_HAIKU;GODOT_PC</GodotPlatformConstants>
+    <GodotPlatformConstants Condition=" '$(GodotTargetPlatform)' == 'android' ">GODOT_ANDROID;GODOT_MOBILE</GodotPlatformConstants>
+    <GodotPlatformConstants Condition=" '$(GodotTargetPlatform)' == 'iphone' ">GODOT_IPHONE;GODOT_IOS;GODOT_MOBILE</GodotPlatformConstants>
+    <GodotPlatformConstants Condition=" '$(GodotTargetPlatform)' == 'javascript' ">GODOT_JAVASCRIPT;GODOT_HTML5;GODOT_WASM;GODOT_WEB</GodotPlatformConstants>
+
+    <GodotDefineConstants>$(GodotDefineConstants);$(GodotPlatformConstants)</GodotDefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- ExportDebug also defines DEBUG like Debug does. -->
+    <DefineConstants Condition=" '$(Configuration)' == 'ExportDebug' ">$(DefineConstants);DEBUG</DefineConstants>
+    <!-- Debug defines TOOLS to differentiate between Debug and ExportDebug configurations. -->
+    <DefineConstants Condition=" '$(Configuration)' == 'Debug' ">$(DefineConstants);TOOLS</DefineConstants>
+
+    <DefineConstants>$(GodotDefineConstants);$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!--
+    TODO:
+    We should consider a nuget package for reference assemblies. This is difficult because the
+    Godot scripting API is continuaslly breaking backwards compatibility even in patch releases.
+    -->
+    <Reference Include="GodotSharp">
+      <Private>false</Private>
+      <HintPath>$(GodotProjectDir).mono\assemblies\$(GodotApiConfiguration)\GodotSharp.dll</HintPath>
+    </Reference>
+    <Reference Include="GodotSharpEditor" Condition=" '$(Configuration)' == 'Debug' ">
+      <Private>false</Private>
+      <HintPath>$(GodotProjectDir).mono\assemblies\$(GodotApiConfiguration)\GodotSharpEditor.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+</Project>
diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.targets b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.targets
new file mode 100644
index 0000000000..f5afd75505
--- /dev/null
+++ b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.targets
@@ -0,0 +1,17 @@
+<Project>
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" Condition=" '$(GodotSdkImportsMicrosoftNetSdk)' == 'true' " />
+
+  <PropertyGroup>
+    <EnableGodotProjectTypeGuid Condition=" '$(EnableGodotProjectTypeGuid)' == '' ">true</EnableGodotProjectTypeGuid>
+    <ProjectTypeGuids Condition=" '$(EnableGodotProjectTypeGuid)' == 'true' ">$(GodotProjectTypeGuid);$(DefaultProjectTypeGuid)</ProjectTypeGuids>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!--
+    Define constant to determine whether the real_t type in Godot is double precision or not.
+    By default this is false, like the official Godot builds. If someone is using a custom
+    Godot build where real_t is double, they can override the GodotRealTIsDouble property.
+    -->
+    <DefineConstants Condition=" '$(GodotRealTIsDouble)' == 'true' ">GODOT_REAL_T_IS_DOUBLE;$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+</Project>
diff --git a/modules/mono/editor/GodotTools/GodotTools.BuildLogger/GodotBuildLogger.cs b/modules/mono/editor/GodotTools/GodotTools.BuildLogger/GodotBuildLogger.cs
index 6015cb22b6..5edf72d63e 100644
--- a/modules/mono/editor/GodotTools/GodotTools.BuildLogger/GodotBuildLogger.cs
+++ b/modules/mono/editor/GodotTools/GodotTools.BuildLogger/GodotBuildLogger.cs
@@ -2,7 +2,6 @@ using System;
 using System.IO;
 using System.Security;
 using Microsoft.Build.Framework;
-using GodotTools.Core;
 
 namespace GodotTools.BuildLogger
 {
@@ -71,13 +70,14 @@ namespace GodotTools.BuildLogger
         {
             string line = $"{e.File}({e.LineNumber},{e.ColumnNumber}): error {e.Code}: {e.Message}";
 
-            if (e.ProjectFile.Length > 0)
+            if (!string.IsNullOrEmpty(e.ProjectFile))
                 line += $" [{e.ProjectFile}]";
 
             WriteLine(line);
 
             string errorLine = $@"error,{e.File.CsvEscape()},{e.LineNumber},{e.ColumnNumber}," +
-                               $@"{e.Code.CsvEscape()},{e.Message.CsvEscape()},{e.ProjectFile.CsvEscape()}";
+                               $"{e.Code?.CsvEscape() ?? string.Empty},{e.Message.CsvEscape()}," +
+                               $"{e.ProjectFile?.CsvEscape() ?? string.Empty}";
             issuesStreamWriter.WriteLine(errorLine);
         }
 
@@ -90,8 +90,9 @@ namespace GodotTools.BuildLogger
 
             WriteLine(line);
 
-            string warningLine = $@"warning,{e.File.CsvEscape()},{e.LineNumber},{e.ColumnNumber},{e.Code.CsvEscape()}," +
-                                 $@"{e.Message.CsvEscape()},{(e.ProjectFile != null ? e.ProjectFile.CsvEscape() : string.Empty)}";
+            string warningLine = $@"warning,{e.File.CsvEscape()},{e.LineNumber},{e.ColumnNumber}," +
+                                 $"{e.Code?.CsvEscape() ?? string.Empty},{e.Message.CsvEscape()}," +
+                                 $"{e.ProjectFile?.CsvEscape() ?? string.Empty}";
             issuesStreamWriter.WriteLine(warningLine);
         }
 
@@ -183,4 +184,17 @@ namespace GodotTools.BuildLogger
         private StreamWriter issuesStreamWriter;
         private int indent;
     }
+
+    internal static class StringExtensions
+    {
+        public static string CsvEscape(this string value, char delimiter = ',')
+        {
+            bool hasSpecialChar = value.IndexOfAny(new[] { '\"', '\n', '\r', delimiter }) != -1;
+
+            if (hasSpecialChar)
+                return "\"" + value.Replace("\"", "\"\"") + "\"";
+
+            return value;
+        }
+    }
 }
diff --git a/modules/mono/editor/GodotTools/GodotTools.BuildLogger/GodotTools.BuildLogger.csproj b/modules/mono/editor/GodotTools/GodotTools.BuildLogger/GodotTools.BuildLogger.csproj
index 8fdd485209..0afec970c6 100644
--- a/modules/mono/editor/GodotTools/GodotTools.BuildLogger/GodotTools.BuildLogger.csproj
+++ b/modules/mono/editor/GodotTools/GodotTools.BuildLogger/GodotTools.BuildLogger.csproj
@@ -1,60 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{6CE9A984-37B1-4F8A-8FE9-609F05F071B3}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>GodotTools.BuildLogger</RootNamespace>
-    <AssemblyName>GodotTools.BuildLogger</AssemblyName>
-    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <LangVersion>7</LangVersion>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>7.2</LangVersion>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>portable</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>portable</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="GodotBuildLogger.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\GodotTools.Core\GodotTools.Core.csproj">
-      <Project>{639e48bd-44e5-4091-8edd-22d36dc0768d}</Project>
-      <Name>GodotTools.Core</Name>
-    </ProjectReference>
+    <PackageReference Include="Microsoft.Build.Framework" Version="16.5.0" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-         Other similar extension points exist, see Microsoft.Common.targets.
-    <Target Name="BeforeBuild">
-    </Target>
-    <Target Name="AfterBuild">
-    </Target>
-    -->
 </Project>
diff --git a/modules/mono/editor/GodotTools/GodotTools.BuildLogger/Properties/AssemblyInfo.cs b/modules/mono/editor/GodotTools/GodotTools.BuildLogger/Properties/AssemblyInfo.cs
deleted file mode 100644
index 8717c4901e..0000000000
--- a/modules/mono/editor/GodotTools/GodotTools.BuildLogger/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("GodotTools.BuildLogger")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("Godot Engine contributors")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("6CE9A984-37B1-4F8A-8FE9-609F05F071B3")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/modules/mono/editor/GodotTools/GodotTools.Core/FileUtils.cs b/modules/mono/editor/GodotTools/GodotTools.Core/FileUtils.cs
new file mode 100644
index 0000000000..e1ccf0454a
--- /dev/null
+++ b/modules/mono/editor/GodotTools/GodotTools.Core/FileUtils.cs
@@ -0,0 +1,30 @@
+using System.IO;
+
+namespace GodotTools.Core
+{
+    public static class FileUtils
+    {
+        public static void SaveBackupCopy(string filePath)
+        {
+            string backupPathBase = filePath + ".old";
+            string backupPath = backupPathBase;
+
+            const int maxAttempts = 5;
+            int attempt = 1;
+
+            while (File.Exists(backupPath) && attempt <= maxAttempts)
+            {
+                backupPath = backupPathBase + "." + (attempt);
+                attempt++;
+            }
+
+            if (attempt > maxAttempts + 1)
+            {
+                // Overwrite the oldest one
+                backupPath = backupPathBase;
+            }
+
+            File.Copy(filePath, backupPath, overwrite: true);
+        }
+    }
+}
diff --git a/modules/mono/editor/GodotTools/GodotTools.Core/GodotTools.Core.csproj b/modules/mono/editor/GodotTools/GodotTools.Core/GodotTools.Core.csproj
index 2c35ef540a..d6d8962f90 100644
--- a/modules/mono/editor/GodotTools/GodotTools.Core/GodotTools.Core.csproj
+++ b/modules/mono/editor/GodotTools/GodotTools.Core/GodotTools.Core.csproj
@@ -1,39 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{639E48BD-44E5-4091-8EDD-22D36DC0768D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>GodotTools.Core</RootNamespace>
-    <AssemblyName>GodotTools.Core</AssemblyName>
-    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
-    <LangVersion>7</LangVersion>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>7.2</LangVersion>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ProcessExtensions.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="StringExtensions.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/modules/mono/editor/GodotTools/GodotTools.Core/Properties/AssemblyInfo.cs b/modules/mono/editor/GodotTools/GodotTools.Core/Properties/AssemblyInfo.cs
deleted file mode 100644
index 699ae6e741..0000000000
--- a/modules/mono/editor/GodotTools/GodotTools.Core/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle("GodotTools.Core")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("Godot Engine contributors")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
diff --git a/modules/mono/editor/GodotTools/GodotTools.Core/StringExtensions.cs b/modules/mono/editor/GodotTools/GodotTools.Core/StringExtensions.cs
index b531b6aeee..b217ae4bf7 100644
--- a/modules/mono/editor/GodotTools/GodotTools.Core/StringExtensions.cs
+++ b/modules/mono/editor/GodotTools/GodotTools.Core/StringExtensions.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Runtime.InteropServices;
 
 namespace GodotTools.Core
 {
@@ -14,47 +15,52 @@ namespace GodotTools.Core
             if (Path.DirectorySeparatorChar == '\\')
                 dir = dir.Replace("/", "\\") + "\\";
 
-            Uri fullPath = new Uri(Path.GetFullPath(path), UriKind.Absolute);
-            Uri relRoot = new Uri(Path.GetFullPath(dir), UriKind.Absolute);
+            var fullPath = new Uri(Path.GetFullPath(path), UriKind.Absolute);
+            var relRoot = new Uri(Path.GetFullPath(dir), UriKind.Absolute);
 
-            return relRoot.MakeRelativeUri(fullPath).ToString();
+            // MakeRelativeUri converts spaces to %20, hence why we need UnescapeDataString
+            return Uri.UnescapeDataString(relRoot.MakeRelativeUri(fullPath).ToString());
         }
 
         public static string NormalizePath(this string path)
         {
+            if (string.IsNullOrEmpty(path))
+                return path;
+
             bool rooted = path.IsAbsolutePath();
 
             path = path.Replace('\\', '/');
+            path = path[path.Length - 1] == '/' ? path.Substring(0, path.Length - 1) : path;
 
-            string[] parts = path.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
+            string[] parts = path.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
 
             path = string.Join(Path.DirectorySeparatorChar.ToString(), parts).Trim();
 
-            return rooted ? Path.DirectorySeparatorChar.ToString() + path : path;
+            if (!rooted)
+                return path;
+
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                string maybeDrive = parts[0];
+                if (maybeDrive.Length == 2 && maybeDrive[1] == ':')
+                    return path; // Already has drive letter
+            }
+
+            return Path.DirectorySeparatorChar + path;
         }
 
-        private static readonly string driveRoot = Path.GetPathRoot(Environment.CurrentDirectory);
+        private static readonly string DriveRoot = Path.GetPathRoot(Environment.CurrentDirectory);
 
         public static bool IsAbsolutePath(this string path)
         {
             return path.StartsWith("/", StringComparison.Ordinal) ||
                    path.StartsWith("\\", StringComparison.Ordinal) ||
-                   path.StartsWith(driveRoot, StringComparison.Ordinal);
-        }
-
-        public static string CsvEscape(this string value, char delimiter = ',')
-        {
-            bool hasSpecialChar = value.IndexOfAny(new char[] { '\"', '\n', '\r', delimiter }) != -1;
-
-            if (hasSpecialChar)
-                return "\"" + value.Replace("\"", "\"\"") + "\"";
-
-            return value;
+                   path.StartsWith(DriveRoot, StringComparison.Ordinal);
         }
 
-        public static string ToSafeDirName(this string dirName, bool allowDirSeparator)
+        public static string ToSafeDirName(this string dirName, bool allowDirSeparator = false)
         {
-            var invalidChars = new List<string> { ":", "*", "?", "\"", "<", ">", "|" };
+            var invalidChars = new List<string> {":", "*", "?", "\"", "<", ">", "|"};
 
             if (allowDirSeparator)
             {
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/ConsoleLogger.cs b/modules/mono/editor/GodotTools/GodotTools.IdeConnection/ConsoleLogger.cs
deleted file mode 100644
index 7a2ff2ca56..0000000000
--- a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/ConsoleLogger.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-
-namespace GodotTools.IdeConnection
-{
-    public class ConsoleLogger : ILogger
-    {
-        public void LogDebug(string message)
-        {
-            Console.WriteLine("DEBUG: " + message);
-        }
-
-        public void LogInfo(string message)
-        {
-            Console.WriteLine("INFO: " + message);
-        }
-
-        public void LogWarning(string message)
-        {
-            Console.WriteLine("WARN: " + message);
-        }
-
-        public void LogError(string message)
-        {
-            Console.WriteLine("ERROR: " + message);
-        }
-
-        public void LogError(string message, Exception e)
-        {
-            Console.WriteLine("EXCEPTION: " + message);
-            Console.WriteLine(e);
-        }
-    }
-}
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotIdeBase.cs b/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotIdeBase.cs
deleted file mode 100644
index be89638241..0000000000
--- a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotIdeBase.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using System;
-using Path = System.IO.Path;
-
-namespace GodotTools.IdeConnection
-{
-    public class GodotIdeBase : IDisposable
-    {
-        private ILogger logger;
-
-        public ILogger Logger
-        {
-            get => logger ?? (logger = new ConsoleLogger());
-            set => logger = value;
-        }
-
-        private readonly string projectMetadataDir;
-
-        protected const string MetaFileName = "ide_server_meta.txt";
-        protected string MetaFilePath => Path.Combine(projectMetadataDir, MetaFileName);
-
-        private GodotIdeConnection connection;
-        protected readonly object ConnectionLock = new object();
-
-        public bool IsDisposed { get; private set; } = false;
-
-        public bool IsConnected => connection != null && !connection.IsDisposed && connection.IsConnected;
-
-        public event Action Connected
-        {
-            add
-            {
-                if (connection != null && !connection.IsDisposed)
-                    connection.Connected += value;
-            }
-            remove
-            {
-                if (connection != null && !connection.IsDisposed)
-                    connection.Connected -= value;
-            }
-        }
-
-        protected GodotIdeConnection Connection
-        {
-            get => connection;
-            set
-            {
-                connection?.Dispose();
-                connection = value;
-            }
-        }
-
-        protected GodotIdeBase(string projectMetadataDir)
-        {
-            this.projectMetadataDir = projectMetadataDir;
-        }
-
-        protected void DisposeConnection()
-        {
-            lock (ConnectionLock)
-            {
-                connection?.Dispose();
-            }
-        }
-
-        ~GodotIdeBase()
-        {
-            Dispose(disposing: false);
-        }
-
-        public void Dispose()
-        {
-            if (IsDisposed)
-                return;
-
-            lock (ConnectionLock)
-            {
-                if (IsDisposed) // lock may not be fair
-                    return;
-                IsDisposed = true;
-            }
-
-            Dispose(disposing: true);
-            GC.SuppressFinalize(this);
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                connection?.Dispose();
-            }
-        }
-    }
-}
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotIdeClient.cs b/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotIdeClient.cs
deleted file mode 100644
index 2bf3b83c75..0000000000
--- a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotIdeClient.cs
+++ /dev/null
@@ -1,219 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Net.Sockets;
-using System.Threading;
-
-namespace GodotTools.IdeConnection
-{
-    public abstract class GodotIdeClient : GodotIdeBase
-    {
-        protected GodotIdeMetadata GodotIdeMetadata;
-
-        private readonly FileSystemWatcher fsWatcher;
-
-        protected GodotIdeClient(string projectMetadataDir) : base(projectMetadataDir)
-        {
-            messageHandlers = InitializeMessageHandlers();
-
-            // FileSystemWatcher requires an existing directory
-            if (!File.Exists(projectMetadataDir))
-                Directory.CreateDirectory(projectMetadataDir);
-
-            fsWatcher = new FileSystemWatcher(projectMetadataDir, MetaFileName);
-        }
-
-        private void OnMetaFileChanged(object sender, FileSystemEventArgs e)
-        {
-            if (IsDisposed)
-                return;
-
-            lock (ConnectionLock)
-            {
-                if (IsDisposed)
-                    return;
-
-                if (!File.Exists(MetaFilePath))
-                    return;
-
-                var metadata = ReadMetadataFile();
-
-                if (metadata != null && metadata != GodotIdeMetadata)
-                {
-                    GodotIdeMetadata = metadata.Value;
-                    ConnectToServer();
-                }
-            }
-        }
-
-        private void OnMetaFileDeleted(object sender, FileSystemEventArgs e)
-        {
-            if (IsDisposed)
-                return;
-
-            if (IsConnected)
-                DisposeConnection();
-
-            // The file may have been re-created
-
-            lock (ConnectionLock)
-            {
-                if (IsDisposed)
-                    return;
-
-                if (IsConnected || !File.Exists(MetaFilePath))
-                    return;
-
-                var metadata = ReadMetadataFile();
-
-                if (metadata != null)
-                {
-                    GodotIdeMetadata = metadata.Value;
-                    ConnectToServer();
-                }
-            }
-        }
-
-        private GodotIdeMetadata? ReadMetadataFile()
-        {
-            using (var reader = File.OpenText(MetaFilePath))
-            {
-                string portStr = reader.ReadLine();
-
-                if (portStr == null)
-                    return null;
-
-                string editorExecutablePath = reader.ReadLine();
-
-                if (editorExecutablePath == null)
-                    return null;
-
-                if (!int.TryParse(portStr, out int port))
-                    return null;
-
-                return new GodotIdeMetadata(port, editorExecutablePath);
-            }
-        }
-
-        private void ConnectToServer()
-        {
-            var tcpClient = new TcpClient();
-
-            Connection = new GodotIdeConnectionClient(tcpClient, HandleMessage);
-            Connection.Logger = Logger;
-
-            try
-            {
-                Logger.LogInfo("Connecting to Godot Ide Server");
-
-                tcpClient.Connect(IPAddress.Loopback, GodotIdeMetadata.Port);
-
-                Logger.LogInfo("Connection open with Godot Ide Server");
-
-                var clientThread = new Thread(Connection.Start)
-                {
-                    IsBackground = true,
-                    Name = "Godot Ide Connection Client"
-                };
-                clientThread.Start();
-            }
-            catch (SocketException e)
-            {
-                if (e.SocketErrorCode == SocketError.ConnectionRefused)
-                    Logger.LogError("The connection to the Godot Ide Server was refused");
-                else
-                    throw;
-            }
-        }
-
-        public void Start()
-        {
-            Logger.LogInfo("Starting Godot Ide Client");
-
-            fsWatcher.Changed += OnMetaFileChanged;
-            fsWatcher.Deleted += OnMetaFileDeleted;
-            fsWatcher.EnableRaisingEvents = true;
-
-            lock (ConnectionLock)
-            {
-                if (IsDisposed)
-                    return;
-
-                if (!File.Exists(MetaFilePath))
-                {
-                    Logger.LogInfo("There is no Godot Ide Server running");
-                    return;
-                }
-
-                var metadata = ReadMetadataFile();
-
-                if (metadata != null)
-                {
-                    GodotIdeMetadata = metadata.Value;
-                    ConnectToServer();
-                }
-                else
-                {
-                    Logger.LogError("Failed to read Godot Ide metadata file");
-                }
-            }
-        }
-
-        public bool WriteMessage(Message message)
-        {
-            return Connection.WriteMessage(message);
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (disposing)
-            {
-                fsWatcher?.Dispose();
-            }
-        }
-
-        protected virtual bool HandleMessage(Message message)
-        {
-            if (messageHandlers.TryGetValue(message.Id, out var action))
-            {
-                action(message.Arguments);
-                return true;
-            }
-
-            return false;
-        }
-
-        private readonly Dictionary<string, Action<string[]>> messageHandlers;
-
-        private Dictionary<string, Action<string[]>> InitializeMessageHandlers()
-        {
-            return new Dictionary<string, Action<string[]>>
-            {
-                ["OpenFile"] = args =>
-                {
-                    switch (args.Length)
-                    {
-                        case 1:
-                            OpenFile(file: args[0]);
-                            return;
-                        case 2:
-                            OpenFile(file: args[0], line: int.Parse(args[1]));
-                            return;
-                        case 3:
-                            OpenFile(file: args[0], line: int.Parse(args[1]), column: int.Parse(args[2]));
-                            return;
-                        default:
-                            throw new ArgumentException();
-                    }
-                }
-            };
-        }
-
-        protected abstract void OpenFile(string file);
-        protected abstract void OpenFile(string file, int line);
-        protected abstract void OpenFile(string file, int line, int column);
-    }
-}
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotIdeConnection.cs b/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotIdeConnection.cs
deleted file mode 100644
index 6441be8d6e..0000000000
--- a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotIdeConnection.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Net.Sockets;
-using System.Text;
-
-namespace GodotTools.IdeConnection
-{
-    public abstract class GodotIdeConnection : IDisposable
-    {
-        protected const string Version = "1.0";
-
-        protected static readonly string ClientHandshake = $"Godot Ide Client Version {Version}";
-        protected static readonly string ServerHandshake = $"Godot Ide Server Version {Version}";
-
-        private const int ClientWriteTimeout = 8000;
-        private readonly TcpClient tcpClient;
-
-        private TextReader clientReader;
-        private TextWriter clientWriter;
-
-        private readonly object writeLock = new object();
-
-        private readonly Func<Message, bool> messageHandler;
-
-        public event Action Connected;
-
-        private ILogger logger;
-
-        public ILogger Logger
-        {
-            get => logger ?? (logger = new ConsoleLogger());
-            set => logger = value;
-        }
-
-        public bool IsDisposed { get; private set; } = false;
-
-        public bool IsConnected => tcpClient.Client != null && tcpClient.Client.Connected;
-
-        protected GodotIdeConnection(TcpClient tcpClient, Func<Message, bool> messageHandler)
-        {
-            this.tcpClient = tcpClient;
-            this.messageHandler = messageHandler;
-        }
-
-        public void Start()
-        {
-            try
-            {
-                if (!StartConnection())
-                    return;
-
-                string messageLine;
-                while ((messageLine = ReadLine()) != null)
-                {
-                    if (!MessageParser.TryParse(messageLine, out Message msg))
-                    {
-                        Logger.LogError($"Received message with invalid format: {messageLine}");
-                        continue;
-                    }
-
-                    Logger.LogDebug($"Received message: {msg}");
-
-                    if (msg.Id == "close")
-                    {
-                        Logger.LogInfo("Closing connection");
-                        return;
-                    }
-
-                    try
-                    {
-                        try
-                        {
-                            Debug.Assert(messageHandler != null);
-
-                            if (!messageHandler(msg))
-                                Logger.LogError($"Received unknown message: {msg}");
-                        }
-                        catch (Exception e)
-                        {
-                            Logger.LogError($"Message handler for '{msg}' failed with exception", e);
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        Logger.LogError($"Exception thrown from message handler. Message: {msg}", e);
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                Logger.LogError($"Unhandled exception in the Godot Ide Connection thread", e);
-            }
-            finally
-            {
-                Dispose();
-            }
-        }
-
-        private bool StartConnection()
-        {
-            NetworkStream clientStream = tcpClient.GetStream();
-
-            clientReader = new StreamReader(clientStream, Encoding.UTF8);
-
-            lock (writeLock)
-                clientWriter = new StreamWriter(clientStream, Encoding.UTF8);
-
-            clientStream.WriteTimeout = ClientWriteTimeout;
-
-            if (!WriteHandshake())
-            {
-                Logger.LogError("Could not write handshake");
-                return false;
-            }
-
-            if (!IsValidResponseHandshake(ReadLine()))
-            {
-                Logger.LogError("Received invalid handshake");
-                return false;
-            }
-
-            Connected?.Invoke();
-
-            Logger.LogInfo("Godot Ide connection started");
-
-            return true;
-        }
-
-        private string ReadLine()
-        {
-            try
-            {
-                return clientReader?.ReadLine();
-            }
-            catch (Exception e)
-            {
-                if (IsDisposed)
-                {
-                    var se = e as SocketException ?? e.InnerException as SocketException;
-                    if (se != null && se.SocketErrorCode == SocketError.Interrupted)
-                        return null;
-                }
-
-                throw;
-            }
-        }
-
-        public bool WriteMessage(Message message)
-        {
-            Logger.LogDebug($"Sending message {message}");
-
-            var messageComposer = new MessageComposer();
-
-            messageComposer.AddArgument(message.Id);
-            foreach (string argument in message.Arguments)
-                messageComposer.AddArgument(argument);
-
-            return WriteLine(messageComposer.ToString());
-        }
-
-        protected bool WriteLine(string text)
-        {
-            if (clientWriter == null || IsDisposed || !IsConnected)
-                return false;
-
-            lock (writeLock)
-            {
-                try
-                {
-                    clientWriter.WriteLine(text);
-                    clientWriter.Flush();
-                }
-                catch (Exception e)
-                {
-                    if (!IsDisposed)
-                    {
-                        var se = e as SocketException ?? e.InnerException as SocketException;
-                        if (se != null && se.SocketErrorCode == SocketError.Shutdown)
-                            Logger.LogInfo("Client disconnected ungracefully");
-                        else
-                            Logger.LogError("Exception thrown when trying to write to client", e);
-
-                        Dispose();
-                    }
-                }
-            }
-
-            return true;
-        }
-
-        protected abstract bool WriteHandshake();
-        protected abstract bool IsValidResponseHandshake(string handshakeLine);
-
-        public void Dispose()
-        {
-            if (IsDisposed)
-                return;
-
-            IsDisposed = true;
-
-            clientReader?.Dispose();
-            clientWriter?.Dispose();
-            ((IDisposable)tcpClient)?.Dispose();
-        }
-    }
-}
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotIdeConnectionClient.cs b/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotIdeConnectionClient.cs
deleted file mode 100644
index 1b11a14358..0000000000
--- a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotIdeConnectionClient.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Net.Sockets;
-using System.Threading.Tasks;
-
-namespace GodotTools.IdeConnection
-{
-    public class GodotIdeConnectionClient : GodotIdeConnection
-    {
-        public GodotIdeConnectionClient(TcpClient tcpClient, Func<Message, bool> messageHandler)
-            : base(tcpClient, messageHandler)
-        {
-        }
-
-        protected override bool WriteHandshake()
-        {
-            return WriteLine(ClientHandshake);
-        }
-
-        protected override bool IsValidResponseHandshake(string handshakeLine)
-        {
-            return handshakeLine == ServerHandshake;
-        }
-    }
-}
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotIdeConnectionServer.cs b/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotIdeConnectionServer.cs
deleted file mode 100644
index aa98dc7ca3..0000000000
--- a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotIdeConnectionServer.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Net.Sockets;
-using System.Threading.Tasks;
-
-namespace GodotTools.IdeConnection
-{
-    public class GodotIdeConnectionServer : GodotIdeConnection
-    {
-        public GodotIdeConnectionServer(TcpClient tcpClient, Func<Message, bool> messageHandler)
-            : base(tcpClient, messageHandler)
-        {
-        }
-
-        protected override bool WriteHandshake()
-        {
-            return WriteLine(ServerHandshake);
-        }
-
-        protected override bool IsValidResponseHandshake(string handshakeLine)
-        {
-            return handshakeLine == ClientHandshake;
-        }
-    }
-}
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotTools.IdeConnection.csproj b/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotTools.IdeConnection.csproj
deleted file mode 100644
index 8454535fba..0000000000
--- a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotTools.IdeConnection.csproj
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{92600954-25F0-4291-8E11-1FEE9FC4BE20}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>GodotTools.IdeConnection</RootNamespace>
-    <AssemblyName>GodotTools.IdeConnection</AssemblyName>
-    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <LangVersion>7</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>portable</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>portable</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ConsoleLogger.cs" />
-    <Compile Include="GodotIdeMetadata.cs" />
-    <Compile Include="GodotIdeBase.cs" />
-    <Compile Include="GodotIdeClient.cs" />
-    <Compile Include="GodotIdeConnection.cs" />
-    <Compile Include="GodotIdeConnectionClient.cs" />
-    <Compile Include="GodotIdeConnectionServer.cs" />
-    <Compile Include="ILogger.cs" />
-    <Compile Include="Message.cs" />
-    <Compile Include="MessageComposer.cs" />
-    <Compile Include="MessageParser.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/Message.cs b/modules/mono/editor/GodotTools/GodotTools.IdeConnection/Message.cs
deleted file mode 100644
index f24d324ae3..0000000000
--- a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/Message.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Linq;
-
-namespace GodotTools.IdeConnection
-{
-    public struct Message
-    {
-        public string Id { get; set; }
-        public string[] Arguments { get; set; }
-
-        public Message(string id, params string[] arguments)
-        {
-            Id = id;
-            Arguments = arguments;
-        }
-
-        public override string ToString()
-        {
-            return $"(Id: '{Id}', Arguments: '{string.Join(",", Arguments)}')";
-        }
-    }
-}
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/MessageComposer.cs b/modules/mono/editor/GodotTools/GodotTools.IdeConnection/MessageComposer.cs
deleted file mode 100644
index 30ffe7a06e..0000000000
--- a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/MessageComposer.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System.Linq;
-using System.Text;
-
-namespace GodotTools.IdeConnection
-{
-    public class MessageComposer
-    {
-        private readonly StringBuilder stringBuilder = new StringBuilder();
-
-        private static readonly char[] CharsToEscape = { '\\', '"' };
-
-        public void AddArgument(string argument)
-        {
-            AddArgument(argument, quoted: argument.Contains(","));
-        }
-
-        public void AddArgument(string argument, bool quoted)
-        {
-            if (stringBuilder.Length > 0)
-                stringBuilder.Append(',');
-
-            if (quoted)
-            {
-                stringBuilder.Append('"');
-
-                foreach (char @char in argument)
-                {
-                    if (CharsToEscape.Contains(@char))
-                        stringBuilder.Append('\\');
-                    stringBuilder.Append(@char);
-                }
-
-                stringBuilder.Append('"');
-            }
-            else
-            {
-                stringBuilder.Append(argument);
-            }
-        }
-
-        public override string ToString()
-        {
-            return stringBuilder.ToString();
-        }
-    }
-}
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/MessageParser.cs b/modules/mono/editor/GodotTools/GodotTools.IdeConnection/MessageParser.cs
deleted file mode 100644
index 4365d69989..0000000000
--- a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/MessageParser.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace GodotTools.IdeConnection
-{
-    public static class MessageParser
-    {
-        public static bool TryParse(string messageLine, out Message message)
-        {
-            var arguments = new List<string>();
-            var stringBuilder = new StringBuilder();
-
-            bool expectingArgument = true;
-
-            for (int i = 0; i < messageLine.Length; i++)
-            {
-                char @char = messageLine[i];
-
-                if (@char == ',')
-                {
-                    if (expectingArgument)
-                        arguments.Add(string.Empty);
-
-                    expectingArgument = true;
-                    continue;
-                }
-
-                bool quoted = false;
-
-                if (messageLine[i] == '"')
-                {
-                    quoted = true;
-                    i++;
-                }
-
-                while (i < messageLine.Length)
-                {
-                    @char = messageLine[i];
-
-                    if (quoted && @char == '"')
-                    {
-                        i++;
-                        break;
-                    }
-
-                    if (@char == '\\')
-                    {
-                        i++;
-                        if (i < messageLine.Length)
-                            break;
-
-                        stringBuilder.Append(messageLine[i]);
-                    }
-                    else if (!quoted && @char == ',')
-                    {
-                        break; // We don't increment the counter to allow the colon to be parsed after this
-                    }
-                    else
-                    {
-                        stringBuilder.Append(@char);
-                    }
-
-                    i++;
-                }
-
-                arguments.Add(stringBuilder.ToString());
-                stringBuilder.Clear();
-
-                expectingArgument = false;
-            }
-
-            if (arguments.Count == 0)
-            {
-                message = new Message();
-                return false;
-            }
-
-            message = new Message
-            {
-                Id = arguments[0],
-                Arguments = arguments.Skip(1).ToArray()
-            };
-
-            return true;
-        }
-    }
-}
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/Properties/AssemblyInfo.cs b/modules/mono/editor/GodotTools/GodotTools.IdeConnection/Properties/AssemblyInfo.cs
deleted file mode 100644
index c7c00e66a2..0000000000
--- a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("GodotTools.IdeConnection")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("Godot Engine contributors")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("92600954-25F0-4291-8E11-1FEE9FC4BE20")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging.CLI/ForwarderMessageHandler.cs b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging.CLI/ForwarderMessageHandler.cs
new file mode 100644
index 0000000000..3cb6a6687e
--- /dev/null
+++ b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging.CLI/ForwarderMessageHandler.cs
@@ -0,0 +1,57 @@
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using GodotTools.IdeMessaging.Utils;
+
+namespace GodotTools.IdeMessaging.CLI
+{
+    public class ForwarderMessageHandler : IMessageHandler
+    {
+        private readonly StreamWriter outputWriter;
+        private readonly SemaphoreSlim outputWriteSem = new SemaphoreSlim(1);
+
+        public ForwarderMessageHandler(StreamWriter outputWriter)
+        {
+            this.outputWriter = outputWriter;
+        }
+
+        public async Task<MessageContent> HandleRequest(Peer peer, string id, MessageContent content, ILogger logger)
+        {
+            await WriteRequestToOutput(id, content);
+            return new MessageContent(MessageStatus.RequestNotSupported, "null");
+        }
+
+        private async Task WriteRequestToOutput(string id, MessageContent content)
+        {
+            using (await outputWriteSem.UseAsync())
+            {
+                await outputWriter.WriteLineAsync("======= Request =======");
+                await outputWriter.WriteLineAsync(id);
+                await outputWriter.WriteLineAsync(content.Body.Count(c => c == '\n').ToString());
+                await outputWriter.WriteLineAsync(content.Body);
+                await outputWriter.WriteLineAsync("=======================");
+                await outputWriter.FlushAsync();
+            }
+        }
+
+        public async Task WriteResponseToOutput(string id, MessageContent content)
+        {
+            using (await outputWriteSem.UseAsync())
+            {
+                await outputWriter.WriteLineAsync("======= Response =======");
+                await outputWriter.WriteLineAsync(id);
+                await outputWriter.WriteLineAsync(content.Body.Count(c => c == '\n').ToString());
+                await outputWriter.WriteLineAsync(content.Body);
+                await outputWriter.WriteLineAsync("========================");
+                await outputWriter.FlushAsync();
+            }
+        }
+
+        public async Task WriteLineToOutput(string eventName)
+        {
+            using (await outputWriteSem.UseAsync())
+                await outputWriter.WriteLineAsync($"======= {eventName} =======");
+        }
+    }
+}
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging.CLI/GodotTools.IdeMessaging.CLI.csproj b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging.CLI/GodotTools.IdeMessaging.CLI.csproj
new file mode 100644
index 0000000000..ae78da27bc
--- /dev/null
+++ b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging.CLI/GodotTools.IdeMessaging.CLI.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <ProjectGuid>{B06C2951-C8E3-4F28-80B2-717CF327EB19}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net472</TargetFramework>
+    <LangVersion>7.2</LangVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\GodotTools.IdeMessaging\GodotTools.IdeMessaging.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+  </ItemGroup>
+</Project>
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging.CLI/Program.cs b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging.CLI/Program.cs
new file mode 100644
index 0000000000..4db71500da
--- /dev/null
+++ b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging.CLI/Program.cs
@@ -0,0 +1,218 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using GodotTools.IdeMessaging.Requests;
+using Newtonsoft.Json;
+
+namespace GodotTools.IdeMessaging.CLI
+{
+    internal static class Program
+    {
+        private static readonly ILogger Logger = new CustomLogger();
+
+        public static int Main(string[] args)
+        {
+            try
+            {
+                var mainTask = StartAsync(args, Console.OpenStandardInput(), Console.OpenStandardOutput());
+                mainTask.Wait();
+                return mainTask.Result;
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("Unhandled exception: ", ex);
+                return 1;
+            }
+        }
+
+        private static async Task<int> StartAsync(string[] args, Stream inputStream, Stream outputStream)
+        {
+            var inputReader = new StreamReader(inputStream, Encoding.UTF8);
+            var outputWriter = new StreamWriter(outputStream, Encoding.UTF8);
+
+            try
+            {
+                if (args.Length == 0)
+                {
+                    Logger.LogError("Expected at least 1 argument");
+                    return 1;
+                }
+
+                string godotProjectDir = args[0];
+
+                if (!Directory.Exists(godotProjectDir))
+                {
+                    Logger.LogError($"The specified Godot project directory does not exist: {godotProjectDir}");
+                    return 1;
+                }
+
+                var forwarder = new ForwarderMessageHandler(outputWriter);
+
+                using (var fwdClient = new Client("VisualStudioCode", godotProjectDir, forwarder, Logger))
+                {
+                    fwdClient.Start();
+
+                    // ReSharper disable AccessToDisposedClosure
+                    fwdClient.Connected += async () => await forwarder.WriteLineToOutput("Event=Connected");
+                    fwdClient.Disconnected += async () => await forwarder.WriteLineToOutput("Event=Disconnected");
+                    // ReSharper restore AccessToDisposedClosure
+
+                    // TODO: Await connected with timeout
+
+                    while (!fwdClient.IsDisposed)
+                    {
+                        string firstLine = await inputReader.ReadLineAsync();
+
+                        if (firstLine == null || firstLine == "QUIT")
+                            goto ExitMainLoop;
+
+                        string messageId = firstLine;
+
+                        string messageArgcLine = await inputReader.ReadLineAsync();
+
+                        if (messageArgcLine == null)
+                        {
+                            Logger.LogInfo("EOF when expecting argument count");
+                            goto ExitMainLoop;
+                        }
+
+                        if (!int.TryParse(messageArgcLine, out int messageArgc))
+                        {
+                            Logger.LogError("Received invalid line for argument count: " + firstLine);
+                            continue;
+                        }
+
+                        var body = new StringBuilder();
+
+                        for (int i = 0; i < messageArgc; i++)
+                        {
+                            string bodyLine = await inputReader.ReadLineAsync();
+
+                            if (bodyLine == null)
+                            {
+                                Logger.LogInfo($"EOF when expecting body line #{i + 1}");
+                                goto ExitMainLoop;
+                            }
+
+                            body.AppendLine(bodyLine);
+                        }
+
+                        var response = await SendRequest(fwdClient, messageId, new MessageContent(MessageStatus.Ok, body.ToString()));
+
+                        if (response == null)
+                        {
+                            Logger.LogError($"Failed to write message to the server: {messageId}");
+                        }
+                        else
+                        {
+                            var content = new MessageContent(response.Status, JsonConvert.SerializeObject(response));
+                            await forwarder.WriteResponseToOutput(messageId, content);
+                        }
+                    }
+
+                    ExitMainLoop:
+
+                    await forwarder.WriteLineToOutput("Event=Quit");
+                }
+
+                return 0;
+            }
+            catch (Exception e)
+            {
+                Logger.LogError("Unhandled exception", e);
+                return 1;
+            }
+        }
+
+        private static async Task<Response> SendRequest(Client client, string id, MessageContent content)
+        {
+            var handlers = new Dictionary<string, Func<Task<Response>>>
+            {
+                [PlayRequest.Id] = async () =>
+                {
+                    var request = JsonConvert.DeserializeObject<PlayRequest>(content.Body);
+                    return await client.SendRequest<PlayResponse>(request);
+                },
+                [DebugPlayRequest.Id] = async () =>
+                {
+                    var request = JsonConvert.DeserializeObject<DebugPlayRequest>(content.Body);
+                    return await client.SendRequest<DebugPlayResponse>(request);
+                },
+                [ReloadScriptsRequest.Id] = async () =>
+                {
+                    var request = JsonConvert.DeserializeObject<ReloadScriptsRequest>(content.Body);
+                    return await client.SendRequest<ReloadScriptsResponse>(request);
+                },
+                [CodeCompletionRequest.Id] = async () =>
+                {
+                    var request = JsonConvert.DeserializeObject<CodeCompletionRequest>(content.Body);
+                    return await client.SendRequest<CodeCompletionResponse>(request);
+                }
+            };
+
+            if (handlers.TryGetValue(id, out var handler))
+                return await handler();
+
+            Console.WriteLine("INVALID REQUEST");
+            return null;
+        }
+
+        private class CustomLogger : ILogger
+        {
+            private static string ThisAppPath => Assembly.GetExecutingAssembly().Location;
+            private static string ThisAppPathWithoutExtension => Path.ChangeExtension(ThisAppPath, null);
+
+            private static readonly string LogPath = $"{ThisAppPathWithoutExtension}.log";
+
+            private static StreamWriter NewWriter() => new StreamWriter(LogPath, append: true, encoding: Encoding.UTF8);
+
+            private static void Log(StreamWriter writer, string message)
+            {
+                writer.WriteLine($"{DateTime.Now:HH:mm:ss.ffffff}: {message}");
+            }
+
+            public void LogDebug(string message)
+            {
+                using (var writer = NewWriter())
+                {
+                    Log(writer, "DEBUG: " + message);
+                }
+            }
+
+            public void LogInfo(string message)
+            {
+                using (var writer = NewWriter())
+                {
+                    Log(writer, "INFO: " + message);
+                }
+            }
+
+            public void LogWarning(string message)
+            {
+                using (var writer = NewWriter())
+                {
+                    Log(writer, "WARN: " + message);
+                }
+            }
+
+            public void LogError(string message)
+            {
+                using (var writer = NewWriter())
+                {
+                    Log(writer, "ERROR: " + message);
+                }
+            }
+
+            public void LogError(string message, Exception e)
+            {
+                using (var writer = NewWriter())
+                {
+                    Log(writer, "EXCEPTION: " + message + '\n' + e);
+                }
+            }
+        }
+    }
+}
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Client.cs b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Client.cs
new file mode 100644
index 0000000000..572c541412
--- /dev/null
+++ b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Client.cs
@@ -0,0 +1,351 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Net.Sockets;
+using Newtonsoft.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using GodotTools.IdeMessaging.Requests;
+using GodotTools.IdeMessaging.Utils;
+
+namespace GodotTools.IdeMessaging
+{
+    // ReSharper disable once UnusedType.Global
+    public sealed class Client : IDisposable
+    {
+        private readonly ILogger logger;
+
+        private readonly string identity;
+
+        private string MetaFilePath { get; }
+        private DateTime? metaFileModifiedTime;
+        private GodotIdeMetadata godotIdeMetadata;
+        private readonly FileSystemWatcher fsWatcher;
+
+        public string GodotEditorExecutablePath => godotIdeMetadata.EditorExecutablePath;
+
+        private readonly IMessageHandler messageHandler;
+
+        private Peer peer;
+        private readonly SemaphoreSlim connectionSem = new SemaphoreSlim(1);
+
+        private readonly Queue<NotifyAwaiter<bool>> clientConnectedAwaiters = new Queue<NotifyAwaiter<bool>>();
+        private readonly Queue<NotifyAwaiter<bool>> clientDisconnectedAwaiters = new Queue<NotifyAwaiter<bool>>();
+
+        // ReSharper disable once UnusedMember.Global
+        public async Task<bool> AwaitConnected()
+        {
+            var awaiter = new NotifyAwaiter<bool>();
+            clientConnectedAwaiters.Enqueue(awaiter);
+            return await awaiter;
+        }
+
+        // ReSharper disable once UnusedMember.Global
+        public async Task<bool> AwaitDisconnected()
+        {
+            var awaiter = new NotifyAwaiter<bool>();
+            clientDisconnectedAwaiters.Enqueue(awaiter);
+            return await awaiter;
+        }
+
+        // ReSharper disable once MemberCanBePrivate.Global
+        public bool IsDisposed { get; private set; }
+
+        // ReSharper disable once MemberCanBePrivate.Global
+        public bool IsConnected => peer != null && !peer.IsDisposed && peer.IsTcpClientConnected;
+
+        // ReSharper disable once EventNeverSubscribedTo.Global
+        public event Action Connected
+        {
+            add
+            {
+                if (peer != null && !peer.IsDisposed)
+                    peer.Connected += value;
+            }
+            remove
+            {
+                if (peer != null && !peer.IsDisposed)
+                    peer.Connected -= value;
+            }
+        }
+
+        // ReSharper disable once EventNeverSubscribedTo.Global
+        public event Action Disconnected
+        {
+            add
+            {
+                if (peer != null && !peer.IsDisposed)
+                    peer.Disconnected += value;
+            }
+            remove
+            {
+                if (peer != null && !peer.IsDisposed)
+                    peer.Disconnected -= value;
+            }
+        }
+
+        ~Client()
+        {
+            Dispose(disposing: false);
+        }
+
+        public async void Dispose()
+        {
+            if (IsDisposed)
+                return;
+
+            using (await connectionSem.UseAsync())
+            {
+                if (IsDisposed) // lock may not be fair
+                    return;
+                IsDisposed = true;
+            }
+
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
+        }
+
+        private void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                peer?.Dispose();
+                fsWatcher?.Dispose();
+            }
+        }
+
+        public Client(string identity, string godotProjectDir, IMessageHandler messageHandler, ILogger logger)
+        {
+            this.identity = identity;
+            this.messageHandler = messageHandler;
+            this.logger = logger;
+
+            string projectMetadataDir = Path.Combine(godotProjectDir, ".mono", "metadata");
+
+            MetaFilePath = Path.Combine(projectMetadataDir, GodotIdeMetadata.DefaultFileName);
+
+            // FileSystemWatcher requires an existing directory
+            if (!Directory.Exists(projectMetadataDir))
+                Directory.CreateDirectory(projectMetadataDir);
+
+            fsWatcher = new FileSystemWatcher(projectMetadataDir, GodotIdeMetadata.DefaultFileName);
+        }
+
+        private async void OnMetaFileChanged(object sender, FileSystemEventArgs e)
+        {
+            if (IsDisposed)
+                return;
+
+            using (await connectionSem.UseAsync())
+            {
+                if (IsDisposed)
+                    return;
+
+                if (!File.Exists(MetaFilePath))
+                    return;
+
+                var lastWriteTime = File.GetLastWriteTime(MetaFilePath);
+
+                if (lastWriteTime == metaFileModifiedTime)
+                    return;
+
+                metaFileModifiedTime = lastWriteTime;
+
+                var metadata = ReadMetadataFile();
+
+                if (metadata != null && metadata != godotIdeMetadata)
+                {
+                    godotIdeMetadata = metadata.Value;
+                    _ = Task.Run(ConnectToServer);
+                }
+            }
+        }
+
+        private async void OnMetaFileDeleted(object sender, FileSystemEventArgs e)
+        {
+            if (IsDisposed)
+                return;
+
+            if (IsConnected)
+            {
+                using (await connectionSem.UseAsync())
+                    peer?.Dispose();
+            }
+
+            // The file may have been re-created
+
+            using (await connectionSem.UseAsync())
+            {
+                if (IsDisposed)
+                    return;
+
+                if (IsConnected || !File.Exists(MetaFilePath))
+                    return;
+
+                var lastWriteTime = File.GetLastWriteTime(MetaFilePath);
+
+                if (lastWriteTime == metaFileModifiedTime)
+                    return;
+
+                metaFileModifiedTime = lastWriteTime;
+
+                var metadata = ReadMetadataFile();
+
+                if (metadata != null)
+                {
+                    godotIdeMetadata = metadata.Value;
+                    _ = Task.Run(ConnectToServer);
+                }
+            }
+        }
+
+        private GodotIdeMetadata? ReadMetadataFile()
+        {
+            using (var fileStream = new FileStream(MetaFilePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+            using (var reader = new StreamReader(fileStream))
+            {
+                string portStr = reader.ReadLine();
+
+                if (portStr == null)
+                    return null;
+
+                string editorExecutablePath = reader.ReadLine();
+
+                if (editorExecutablePath == null)
+                    return null;
+
+                if (!int.TryParse(portStr, out int port))
+                    return null;
+
+                return new GodotIdeMetadata(port, editorExecutablePath);
+            }
+        }
+
+        private async Task AcceptClient(TcpClient tcpClient)
+        {
+            logger.LogDebug("Accept client...");
+
+            using (peer = new Peer(tcpClient, new ClientHandshake(), messageHandler, logger))
+            {
+                // ReSharper disable AccessToDisposedClosure
+                peer.Connected += () =>
+                {
+                    logger.LogInfo("Connection open with Ide Client");
+
+                    while (clientConnectedAwaiters.Count > 0)
+                        clientConnectedAwaiters.Dequeue().SetResult(true);
+                };
+
+                peer.Disconnected += () =>
+                {
+                    while (clientDisconnectedAwaiters.Count > 0)
+                        clientDisconnectedAwaiters.Dequeue().SetResult(true);
+                };
+                // ReSharper restore AccessToDisposedClosure
+
+                try
+                {
+                    if (!await peer.DoHandshake(identity))
+                    {
+                        logger.LogError("Handshake failed");
+                        return;
+                    }
+                }
+                catch (Exception e)
+                {
+                    logger.LogError("Handshake failed with unhandled exception: ", e);
+                    return;
+                }
+
+                await peer.Process();
+
+                logger.LogInfo("Connection closed with Ide Client");
+            }
+        }
+
+        private async Task ConnectToServer()
+        {
+            var tcpClient = new TcpClient();
+
+            try
+            {
+                logger.LogInfo("Connecting to Godot Ide Server");
+
+                await tcpClient.ConnectAsync(IPAddress.Loopback, godotIdeMetadata.Port);
+
+                logger.LogInfo("Connection open with Godot Ide Server");
+
+                await AcceptClient(tcpClient);
+            }
+            catch (SocketException e)
+            {
+                if (e.SocketErrorCode == SocketError.ConnectionRefused)
+                    logger.LogError("The connection to the Godot Ide Server was refused");
+                else
+                    throw;
+            }
+        }
+
+        // ReSharper disable once UnusedMember.Global
+        public async void Start()
+        {
+            fsWatcher.Created += OnMetaFileChanged;
+            fsWatcher.Changed += OnMetaFileChanged;
+            fsWatcher.Deleted += OnMetaFileDeleted;
+            fsWatcher.EnableRaisingEvents = true;
+
+            using (await connectionSem.UseAsync())
+            {
+                if (IsDisposed)
+                    return;
+
+                if (IsConnected)
+                    return;
+
+                if (!File.Exists(MetaFilePath))
+                {
+                    logger.LogInfo("There is no Godot Ide Server running");
+                    return;
+                }
+
+                var metadata = ReadMetadataFile();
+
+                if (metadata != null)
+                {
+                    godotIdeMetadata = metadata.Value;
+                    _ = Task.Run(ConnectToServer);
+                }
+                else
+                {
+                    logger.LogError("Failed to read Godot Ide metadata file");
+                }
+            }
+        }
+
+        public async Task<TResponse> SendRequest<TResponse>(Request request)
+            where TResponse : Response, new()
+        {
+            if (!IsConnected)
+            {
+                logger.LogError("Cannot write request. Not connected to the Godot Ide Server.");
+                return null;
+            }
+
+            string body = JsonConvert.SerializeObject(request);
+            return await peer.SendRequest<TResponse>(request.Id, body);
+        }
+
+        public async Task<TResponse> SendRequest<TResponse>(string id, string body)
+            where TResponse : Response, new()
+        {
+            if (!IsConnected)
+            {
+                logger.LogError("Cannot write request. Not connected to the Godot Ide Server.");
+                return null;
+            }
+
+            return await peer.SendRequest<TResponse>(id, body);
+        }
+    }
+}
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/ClientHandshake.cs b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/ClientHandshake.cs
new file mode 100644
index 0000000000..43041be7be
--- /dev/null
+++ b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/ClientHandshake.cs
@@ -0,0 +1,44 @@
+using System.Text.RegularExpressions;
+
+namespace GodotTools.IdeMessaging
+{
+    public class ClientHandshake : IHandshake
+    {
+        private static readonly string ClientHandshakeBase = $"{Peer.ClientHandshakeName},Version={Peer.ProtocolVersionMajor}.{Peer.ProtocolVersionMinor}.{Peer.ProtocolVersionRevision}";
+        private static readonly string ServerHandshakePattern = $@"{Regex.Escape(Peer.ServerHandshakeName)},Version=([0-9]+)\.([0-9]+)\.([0-9]+),([_a-zA-Z][_a-zA-Z0-9]{{0,63}})";
+
+        public string GetHandshakeLine(string identity) => $"{ClientHandshakeBase},{identity}";
+
+        public bool IsValidPeerHandshake(string handshake, out string identity, ILogger logger)
+        {
+            identity = null;
+
+            var match = Regex.Match(handshake, ServerHandshakePattern);
+
+            if (!match.Success)
+                return false;
+
+            if (!uint.TryParse(match.Groups[1].Value, out uint serverMajor) || Peer.ProtocolVersionMajor != serverMajor)
+            {
+                logger.LogDebug("Incompatible major version: " + match.Groups[1].Value);
+                return false;
+            }
+
+            if (!uint.TryParse(match.Groups[2].Value, out uint serverMinor) || Peer.ProtocolVersionMinor < serverMinor)
+            {
+                logger.LogDebug("Incompatible minor version: " + match.Groups[2].Value);
+                return false;
+            }
+
+            if (!uint.TryParse(match.Groups[3].Value, out uint _)) // Revision
+            {
+                logger.LogDebug("Incompatible revision build: " + match.Groups[3].Value);
+                return false;
+            }
+
+            identity = match.Groups[4].Value;
+
+            return true;
+        }
+    }
+}
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/ClientMessageHandler.cs b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/ClientMessageHandler.cs
new file mode 100644
index 0000000000..64bcfd824c
--- /dev/null
+++ b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/ClientMessageHandler.cs
@@ -0,0 +1,52 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using GodotTools.IdeMessaging.Requests;
+using Newtonsoft.Json;
+
+namespace GodotTools.IdeMessaging
+{
+    // ReSharper disable once UnusedType.Global
+    public abstract class ClientMessageHandler : IMessageHandler
+    {
+        private readonly Dictionary<string, Peer.RequestHandler> requestHandlers;
+
+        protected ClientMessageHandler()
+        {
+            requestHandlers = InitializeRequestHandlers();
+        }
+
+        public async Task<MessageContent> HandleRequest(Peer peer, string id, MessageContent content, ILogger logger)
+        {
+            if (!requestHandlers.TryGetValue(id, out var handler))
+            {
+                logger.LogError($"Received unknown request: {id}");
+                return new MessageContent(MessageStatus.RequestNotSupported, "null");
+            }
+
+            try
+            {
+                var response = await handler(peer, content);
+                return new MessageContent(response.Status, JsonConvert.SerializeObject(response));
+            }
+            catch (JsonException)
+            {
+                logger.LogError($"Received request with invalid body: {id}");
+                return new MessageContent(MessageStatus.InvalidRequestBody, "null");
+            }
+        }
+
+        private Dictionary<string, Peer.RequestHandler> InitializeRequestHandlers()
+        {
+            return new Dictionary<string, Peer.RequestHandler>
+            {
+                [OpenFileRequest.Id] = async (peer, content) =>
+                {
+                    var request = JsonConvert.DeserializeObject<OpenFileRequest>(content.Body);
+                    return await HandleOpenFile(request);
+                }
+            };
+        }
+
+        protected abstract Task<Response> HandleOpenFile(OpenFileRequest request);
+    }
+}
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotIdeMetadata.cs b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/GodotIdeMetadata.cs
index d16daba0e2..686202e81e 100644
--- a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/GodotIdeMetadata.cs
+++ b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/GodotIdeMetadata.cs
@@ -1,10 +1,12 @@
-namespace GodotTools.IdeConnection
+namespace GodotTools.IdeMessaging
 {
-    public struct GodotIdeMetadata
+    public readonly struct GodotIdeMetadata
     {
         public int Port { get; }
         public string EditorExecutablePath { get; }
 
+        public const string DefaultFileName = "ide_messaging_meta.txt";
+
         public GodotIdeMetadata(int port, string editorExecutablePath)
         {
             Port = port;
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/GodotTools.IdeMessaging.csproj b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/GodotTools.IdeMessaging.csproj
new file mode 100644
index 0000000000..dad6b9ae7a
--- /dev/null
+++ b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/GodotTools.IdeMessaging.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <ProjectGuid>{92600954-25F0-4291-8E11-1FEE9FC4BE20}</ProjectGuid>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>7.2</LangVersion>
+    <PackageId>GodotTools.IdeMessaging</PackageId>
+    <Version>1.1.1</Version>
+    <AssemblyVersion>$(Version)</AssemblyVersion>
+    <Authors>Godot Engine contributors</Authors>
+    <Company />
+    <PackageTags>godot</PackageTags>
+    <RepositoryUrl>https://github.com/godotengine/godot/tree/master/modules/mono/editor/GodotTools/GodotTools.IdeMessaging</RepositoryUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <Description>
+This library enables communication with the Godot Engine editor (the version with .NET support).
+It's intended for use in IDEs/editors plugins for a better experience working with Godot C# projects.
+
+A client using this library is only compatible with servers of the same major version and of a lower or equal minor version.
+    </Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+  </ItemGroup>
+</Project>
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/IHandshake.cs b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/IHandshake.cs
new file mode 100644
index 0000000000..6387145a28
--- /dev/null
+++ b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/IHandshake.cs
@@ -0,0 +1,8 @@
+namespace GodotTools.IdeMessaging
+{
+    public interface IHandshake
+    {
+        string GetHandshakeLine(string identity);
+        bool IsValidPeerHandshake(string handshake, out string identity, ILogger logger);
+    }
+}
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/ILogger.cs b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/ILogger.cs
index 614bb30271..d2855f93a1 100644
--- a/modules/mono/editor/GodotTools/GodotTools.IdeConnection/ILogger.cs
+++ b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/ILogger.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace GodotTools.IdeConnection
+namespace GodotTools.IdeMessaging
 {
     public interface ILogger
     {
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/IMessageHandler.cs b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/IMessageHandler.cs
new file mode 100644
index 0000000000..9622fcc96d
--- /dev/null
+++ b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/IMessageHandler.cs
@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace GodotTools.IdeMessaging
+{
+    public interface IMessageHandler
+    {
+        Task<MessageContent> HandleRequest(Peer peer, string id, MessageContent content, ILogger logger);
+    }
+}
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Message.cs b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Message.cs
new file mode 100644
index 0000000000..6903ec197b
--- /dev/null
+++ b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Message.cs
@@ -0,0 +1,52 @@
+namespace GodotTools.IdeMessaging
+{
+    public class Message
+    {
+        public MessageKind Kind { get; }
+        public string Id { get; }
+        public MessageContent Content { get; }
+
+        public Message(MessageKind kind, string id, MessageContent content)
+        {
+            Kind = kind;
+            Id = id;
+            Content = content;
+        }
+
+        public override string ToString()
+        {
+            return $"{Kind} | {Id}";
+        }
+    }
+
+    public enum MessageKind
+    {
+        Request,
+        Response
+    }
+
+    public enum MessageStatus
+    {
+        Ok,
+        RequestNotSupported,
+        InvalidRequestBody
+    }
+
+    public readonly struct MessageContent
+    {
+        public MessageStatus Status { get; }
+        public string Body { get; }
+
+        public MessageContent(string body)
+        {
+            Status = MessageStatus.Ok;
+            Body = body;
+        }
+
+        public MessageContent(MessageStatus status, string body)
+        {
+            Status = status;
+            Body = body;
+        }
+    }
+}
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/MessageDecoder.cs b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/MessageDecoder.cs
new file mode 100644
index 0000000000..a00575a2a1
--- /dev/null
+++ b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/MessageDecoder.cs
@@ -0,0 +1,100 @@
+using System;
+using System.Text;
+
+namespace GodotTools.IdeMessaging
+{
+    public class MessageDecoder
+    {
+        private class DecodedMessage
+        {
+            public MessageKind? Kind;
+            public string Id;
+            public MessageStatus? Status;
+            public readonly StringBuilder Body = new StringBuilder();
+            public uint? PendingBodyLines;
+
+            public void Clear()
+            {
+                Kind = null;
+                Id = null;
+                Status = null;
+                Body.Clear();
+                PendingBodyLines = null;
+            }
+
+            public Message ToMessage()
+            {
+                if (!Kind.HasValue || Id == null || !Status.HasValue ||
+                    !PendingBodyLines.HasValue || PendingBodyLines.Value > 0)
+                    throw new InvalidOperationException();
+
+                return new Message(Kind.Value, Id, new MessageContent(Status.Value, Body.ToString()));
+            }
+        }
+
+        public enum State
+        {
+            Decoding,
+            Decoded,
+            Errored
+        }
+
+        private readonly DecodedMessage decodingMessage = new DecodedMessage();
+
+        public State Decode(string messageLine, out Message decodedMessage)
+        {
+            decodedMessage = null;
+
+            if (!decodingMessage.Kind.HasValue)
+            {
+                if (!Enum.TryParse(messageLine, ignoreCase: true, out MessageKind kind))
+                {
+                    decodingMessage.Clear();
+                    return State.Errored;
+                }
+
+                decodingMessage.Kind = kind;
+            }
+            else if (decodingMessage.Id == null)
+            {
+                decodingMessage.Id = messageLine;
+            }
+            else if (decodingMessage.Status == null)
+            {
+                if (!Enum.TryParse(messageLine, ignoreCase: true, out MessageStatus status))
+                {
+                    decodingMessage.Clear();
+                    return State.Errored;
+                }
+
+                decodingMessage.Status = status;
+            }
+            else if (decodingMessage.PendingBodyLines == null)
+            {
+                if (!uint.TryParse(messageLine, out uint pendingBodyLines))
+                {
+                    decodingMessage.Clear();
+                    return State.Errored;
+                }
+
+                decodingMessage.PendingBodyLines = pendingBodyLines;
+            }
+            else
+            {
+                if (decodingMessage.PendingBodyLines > 0)
+                {
+                    decodingMessage.Body.AppendLine(messageLine);
+                    decodingMessage.PendingBodyLines -= 1;
+                }
+                else
+                {
+                    decodedMessage = decodingMessage.ToMessage();
+                    decodingMessage.Clear();
+                    return State.Decoded;
+                }
+            }
+
+            return State.Decoding;
+        }
+    }
+}
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Peer.cs b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Peer.cs
new file mode 100644
index 0000000000..10d7e1898e
--- /dev/null
+++ b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Peer.cs
@@ -0,0 +1,298 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net.Sockets;
+using System.Reflection;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using GodotTools.IdeMessaging.Requests;
+using GodotTools.IdeMessaging.Utils;
+
+namespace GodotTools.IdeMessaging
+{
+    public sealed class Peer : IDisposable
+    {
+        /// <summary>
+        /// Major version.
+        /// There is no forward nor backward compatibility between different major versions.
+        /// Connection is refused if client and server have different major versions.
+        /// </summary>
+        public static readonly int ProtocolVersionMajor = Assembly.GetAssembly(typeof(Peer)).GetName().Version.Major;
+
+        /// <summary>
+        /// Minor version, which clients must be backward compatible with.
+        /// Connection is refused if the client's minor version is lower than the server's.
+        /// </summary>
+        public static readonly int ProtocolVersionMinor = Assembly.GetAssembly(typeof(Peer)).GetName().Version.Minor;
+
+        /// <summary>
+        /// Revision, which doesn't affect compatibility.
+        /// </summary>
+        public static readonly int ProtocolVersionRevision = Assembly.GetAssembly(typeof(Peer)).GetName().Version.Revision;
+
+        public const string ClientHandshakeName = "GodotIdeClient";
+        public const string ServerHandshakeName = "GodotIdeServer";
+
+        private const int ClientWriteTimeout = 8000;
+
+        public delegate Task<Response> RequestHandler(Peer peer, MessageContent content);
+
+        private readonly TcpClient tcpClient;
+
+        private readonly TextReader clientReader;
+        private readonly TextWriter clientWriter;
+
+        private readonly SemaphoreSlim writeSem = new SemaphoreSlim(1);
+
+        private string remoteIdentity = string.Empty;
+        public string RemoteIdentity => remoteIdentity;
+
+        public event Action Connected;
+        public event Action Disconnected;
+
+        private ILogger Logger { get; }
+
+        public bool IsDisposed { get; private set; }
+
+        public bool IsTcpClientConnected => tcpClient.Client != null && tcpClient.Client.Connected;
+
+        private bool IsConnected { get; set; }
+
+        private readonly IHandshake handshake;
+        private readonly IMessageHandler messageHandler;
+
+        private readonly Dictionary<string, Queue<ResponseAwaiter>> requestAwaiterQueues = new Dictionary<string, Queue<ResponseAwaiter>>();
+        private readonly SemaphoreSlim requestsSem = new SemaphoreSlim(1);
+
+        public Peer(TcpClient tcpClient, IHandshake handshake, IMessageHandler messageHandler, ILogger logger)
+        {
+            this.tcpClient = tcpClient;
+            this.handshake = handshake;
+            this.messageHandler = messageHandler;
+
+            Logger = logger;
+
+            NetworkStream clientStream = tcpClient.GetStream();
+            clientStream.WriteTimeout = ClientWriteTimeout;
+
+            clientReader = new StreamReader(clientStream, Encoding.UTF8);
+            clientWriter = new StreamWriter(clientStream, Encoding.UTF8) {NewLine = "\n"};
+        }
+
+        public async Task Process()
+        {
+            try
+            {
+                var decoder = new MessageDecoder();
+
+                string messageLine;
+                while ((messageLine = await ReadLine()) != null)
+                {
+                    var state = decoder.Decode(messageLine, out var msg);
+
+                    if (state == MessageDecoder.State.Decoding)
+                        continue; // Not finished decoding yet
+
+                    if (state == MessageDecoder.State.Errored)
+                    {
+                        Logger.LogError($"Received message line with invalid format: {messageLine}");
+                        continue;
+                    }
+
+                    Logger.LogDebug($"Received message: {msg}");
+
+                    try
+                    {
+                        if (msg.Kind == MessageKind.Request)
+                        {
+                            var responseContent = await messageHandler.HandleRequest(this, msg.Id, msg.Content, Logger);
+                            await WriteMessage(new Message(MessageKind.Response, msg.Id, responseContent));
+                        }
+                        else if (msg.Kind == MessageKind.Response)
+                        {
+                            ResponseAwaiter responseAwaiter;
+
+                            using (await requestsSem.UseAsync())
+                            {
+                                if (!requestAwaiterQueues.TryGetValue(msg.Id, out var queue) || queue.Count <= 0)
+                                {
+                                    Logger.LogError($"Received unexpected response: {msg.Id}");
+                                    return;
+                                }
+
+                                responseAwaiter = queue.Dequeue();
+                            }
+
+                            responseAwaiter.SetResult(msg.Content);
+                        }
+                        else
+                        {
+                            throw new IndexOutOfRangeException($"Invalid message kind {msg.Kind}");
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.LogError($"Message handler for '{msg}' failed with exception", e);
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                if (!IsDisposed || !(e is SocketException || e.InnerException is SocketException))
+                {
+                    Logger.LogError("Unhandled exception in the peer loop", e);
+                }
+            }
+        }
+
+        public async Task<bool> DoHandshake(string identity)
+        {
+            if (!await WriteLine(handshake.GetHandshakeLine(identity)))
+            {
+                Logger.LogError("Could not write handshake");
+                return false;
+            }
+
+            var readHandshakeTask = ReadLine();
+
+            if (await Task.WhenAny(readHandshakeTask, Task.Delay(8000)) != readHandshakeTask)
+            {
+                Logger.LogError("Timeout waiting for the client handshake");
+                return false;
+            }
+
+            string peerHandshake = await readHandshakeTask;
+
+            if (handshake == null || !handshake.IsValidPeerHandshake(peerHandshake, out remoteIdentity, Logger))
+            {
+                Logger.LogError("Received invalid handshake: " + peerHandshake);
+                return false;
+            }
+
+            IsConnected = true;
+            Connected?.Invoke();
+
+            Logger.LogInfo("Peer connection started");
+
+            return true;
+        }
+
+        private async Task<string> ReadLine()
+        {
+            try
+            {
+                return await clientReader.ReadLineAsync();
+            }
+            catch (Exception e)
+            {
+                if (IsDisposed)
+                {
+                    var se = e as SocketException ?? e.InnerException as SocketException;
+                    if (se != null && se.SocketErrorCode == SocketError.Interrupted)
+                        return null;
+                }
+
+                throw;
+            }
+        }
+
+        private Task<bool> WriteMessage(Message message)
+        {
+            Logger.LogDebug($"Sending message: {message}");
+            int bodyLineCount = message.Content.Body.Count(c => c == '\n');
+
+            bodyLineCount += 1; // Extra line break at the end
+
+            var builder = new StringBuilder();
+
+            builder.AppendLine(message.Kind.ToString());
+            builder.AppendLine(message.Id);
+            builder.AppendLine(message.Content.Status.ToString());
+            builder.AppendLine(bodyLineCount.ToString());
+            builder.AppendLine(message.Content.Body);
+
+            return WriteLine(builder.ToString());
+        }
+
+        public async Task<TResponse> SendRequest<TResponse>(string id, string body)
+            where TResponse : Response, new()
+        {
+            ResponseAwaiter responseAwaiter;
+
+            using (await requestsSem.UseAsync())
+            {
+                bool written = await WriteMessage(new Message(MessageKind.Request, id, new MessageContent(body)));
+
+                if (!written)
+                    return null;
+
+                if (!requestAwaiterQueues.TryGetValue(id, out var queue))
+                {
+                    queue = new Queue<ResponseAwaiter>();
+                    requestAwaiterQueues.Add(id, queue);
+                }
+
+                responseAwaiter = new ResponseAwaiter<TResponse>();
+                queue.Enqueue(responseAwaiter);
+            }
+
+            return (TResponse)await responseAwaiter;
+        }
+
+        private async Task<bool> WriteLine(string text)
+        {
+            if (clientWriter == null || IsDisposed || !IsTcpClientConnected)
+                return false;
+
+            using (await writeSem.UseAsync())
+            {
+                try
+                {
+                    await clientWriter.WriteLineAsync(text);
+                    await clientWriter.FlushAsync();
+                }
+                catch (Exception e)
+                {
+                    if (!IsDisposed)
+                    {
+                        var se = e as SocketException ?? e.InnerException as SocketException;
+                        if (se != null && se.SocketErrorCode == SocketError.Shutdown)
+                            Logger.LogInfo("Client disconnected ungracefully");
+                        else
+                            Logger.LogError("Exception thrown when trying to write to client", e);
+
+                        Dispose();
+                    }
+                }
+            }
+
+            return true;
+        }
+
+        // ReSharper disable once UnusedMember.Global
+        public void ShutdownSocketSend()
+        {
+            tcpClient.Client.Shutdown(SocketShutdown.Send);
+        }
+
+        public void Dispose()
+        {
+            if (IsDisposed)
+                return;
+
+            IsDisposed = true;
+
+            if (IsTcpClientConnected)
+            {
+                if (IsConnected)
+                    Disconnected?.Invoke();
+            }
+
+            clientReader?.Dispose();
+            clientWriter?.Dispose();
+            ((IDisposable)tcpClient)?.Dispose();
+        }
+    }
+}
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Requests/Requests.cs b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Requests/Requests.cs
new file mode 100644
index 0000000000..e93db9377b
--- /dev/null
+++ b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Requests/Requests.cs
@@ -0,0 +1,129 @@
+// ReSharper disable ClassNeverInstantiated.Global
+// ReSharper disable UnusedMember.Global
+// ReSharper disable UnusedAutoPropertyAccessor.Global
+
+using Newtonsoft.Json;
+
+namespace GodotTools.IdeMessaging.Requests
+{
+    public abstract class Request
+    {
+        [JsonIgnore] public string Id { get; }
+
+        protected Request(string id)
+        {
+            Id = id;
+        }
+    }
+
+    public abstract class Response
+    {
+        [JsonIgnore] public MessageStatus Status { get; set; } = MessageStatus.Ok;
+    }
+
+    public sealed class CodeCompletionRequest : Request
+    {
+        public enum CompletionKind
+        {
+            InputActions = 0,
+            NodePaths,
+            ResourcePaths,
+            ScenePaths,
+            ShaderParams,
+            Signals,
+            ThemeColors,
+            ThemeConstants,
+            ThemeFonts,
+            ThemeStyles
+        }
+
+        public CompletionKind Kind { get; set; }
+        public string ScriptFile { get; set; }
+
+        public new const string Id = "CodeCompletion";
+
+        public CodeCompletionRequest() : base(Id)
+        {
+        }
+    }
+
+    public sealed class CodeCompletionResponse : Response
+    {
+        public CodeCompletionRequest.CompletionKind Kind;
+        public string ScriptFile { get; set; }
+        public string[] Suggestions { get; set; }
+    }
+
+    public sealed class PlayRequest : Request
+    {
+        public new const string Id = "Play";
+
+        public PlayRequest() : base(Id)
+        {
+        }
+    }
+
+    public sealed class PlayResponse : Response
+    {
+    }
+
+    public sealed class StopPlayRequest : Request
+    {
+        public new const string Id = "StopPlay";
+
+        public StopPlayRequest() : base(Id)
+        {
+        }
+    }
+
+    public sealed class StopPlayResponse : Response
+    {
+    }
+
+    public sealed class DebugPlayRequest : Request
+    {
+        public string DebuggerHost { get; set; }
+        public int DebuggerPort { get; set; }
+        public bool? BuildBeforePlaying { get; set; }
+
+        public new const string Id = "DebugPlay";
+
+        public DebugPlayRequest() : base(Id)
+        {
+        }
+    }
+
+    public sealed class DebugPlayResponse : Response
+    {
+    }
+
+    public sealed class OpenFileRequest : Request
+    {
+        public string File { get; set; }
+        public int? Line { get; set; }
+        public int? Column { get; set; }
+
+        public new const string Id = "OpenFile";
+
+        public OpenFileRequest() : base(Id)
+        {
+        }
+    }
+
+    public sealed class OpenFileResponse : Response
+    {
+    }
+
+    public sealed class ReloadScriptsRequest : Request
+    {
+        public new const string Id = "ReloadScripts";
+
+        public ReloadScriptsRequest() : base(Id)
+        {
+        }
+    }
+
+    public sealed class ReloadScriptsResponse : Response
+    {
+    }
+}
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/ResponseAwaiter.cs b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/ResponseAwaiter.cs
new file mode 100644
index 0000000000..548e7f06ee
--- /dev/null
+++ b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/ResponseAwaiter.cs
@@ -0,0 +1,23 @@
+using GodotTools.IdeMessaging.Requests;
+using GodotTools.IdeMessaging.Utils;
+using Newtonsoft.Json;
+
+namespace GodotTools.IdeMessaging
+{
+    public abstract class ResponseAwaiter : NotifyAwaiter<Response>
+    {
+        public abstract void SetResult(MessageContent content);
+    }
+
+    public class ResponseAwaiter<T> : ResponseAwaiter
+        where T : Response, new()
+    {
+        public override void SetResult(MessageContent content)
+        {
+            if (content.Status == MessageStatus.Ok)
+                SetResult(JsonConvert.DeserializeObject<T>(content.Body));
+            else
+                SetResult(new T {Status = content.Status});
+        }
+    }
+}
diff --git a/modules/mono/editor/GodotTools/GodotTools/Utils/NotifyAwaiter.cs b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Utils/NotifyAwaiter.cs
index 700b786752..d84a63c83c 100644
--- a/modules/mono/editor/GodotTools/GodotTools/Utils/NotifyAwaiter.cs
+++ b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Utils/NotifyAwaiter.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Runtime.CompilerServices;
 
-namespace GodotTools.Utils
+namespace GodotTools.IdeMessaging.Utils
 {
-    public sealed class NotifyAwaiter<T> : INotifyCompletion
+    public class NotifyAwaiter<T> : INotifyCompletion
     {
         private Action continuation;
         private Exception exception;
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Utils/SemaphoreExtensions.cs b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Utils/SemaphoreExtensions.cs
new file mode 100644
index 0000000000..9d593fbf8a
--- /dev/null
+++ b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Utils/SemaphoreExtensions.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace GodotTools.IdeMessaging.Utils
+{
+    public static class SemaphoreExtensions
+    {
+        public static ConfiguredTaskAwaitable<IDisposable> UseAsync(this SemaphoreSlim semaphoreSlim, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            var wrapper = new SemaphoreSlimWaitReleaseWrapper(semaphoreSlim, out Task waitAsyncTask, cancellationToken);
+            return waitAsyncTask.ContinueWith<IDisposable>(t => wrapper, cancellationToken).ConfigureAwait(false);
+        }
+
+        private struct SemaphoreSlimWaitReleaseWrapper : IDisposable
+        {
+            private readonly SemaphoreSlim semaphoreSlim;
+
+            public SemaphoreSlimWaitReleaseWrapper(SemaphoreSlim semaphoreSlim, out Task waitAsyncTask, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                this.semaphoreSlim = semaphoreSlim;
+                waitAsyncTask = this.semaphoreSlim.WaitAsync(cancellationToken);
+            }
+
+            public void Dispose()
+            {
+                semaphoreSlim.Release();
+            }
+        }
+    }
+}
diff --git a/modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/GodotTools.OpenVisualStudio.csproj b/modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/GodotTools.OpenVisualStudio.csproj
new file mode 100644
index 0000000000..5b3ed0b1b7
--- /dev/null
+++ b/modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/GodotTools.OpenVisualStudio.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <ProjectGuid>{EAFFF236-FA96-4A4D-BD23-0E51EF988277}</ProjectGuid>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net472</TargetFramework>
+        <LangVersion>7.2</LangVersion>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
+        <PackageReference Include="EnvDTE" Version="8.0.2" />
+    </ItemGroup>
+</Project>
diff --git a/modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/Program.cs b/modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/Program.cs
new file mode 100644
index 0000000000..ce2b378623
--- /dev/null
+++ b/modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/Program.cs
@@ -0,0 +1,270 @@
+using System;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.ComTypes;
+using System.Text.RegularExpressions;
+using EnvDTE;
+
+namespace GodotTools.OpenVisualStudio
+{
+    internal static class Program
+    {
+        [DllImport("ole32.dll")]
+        private static extern int GetRunningObjectTable(int reserved, out IRunningObjectTable pprot);
+
+        [DllImport("ole32.dll")]
+        private static extern void CreateBindCtx(int reserved, out IBindCtx ppbc);
+
+        [DllImport("user32.dll")]
+        private static extern bool SetForegroundWindow(IntPtr hWnd);
+
+        private static void ShowHelp()
+        {
+            Console.WriteLine("Opens the file(s) in a Visual Studio instance that is editing the specified solution.");
+            Console.WriteLine("If an existing instance for the solution is not found, a new one is created.");
+            Console.WriteLine();
+            Console.WriteLine("Usage:");
+            Console.WriteLine(@"  GodotTools.OpenVisualStudio.exe solution [file[;line[;col]]...]");
+            Console.WriteLine();
+            Console.WriteLine("Lines and columns begin at one. Zero or lower will result in an error.");
+            Console.WriteLine("If a line is specified but a column is not, the line is selected in the text editor.");
+        }
+
+        // STAThread needed, otherwise CoRegisterMessageFilter may return CO_E_NOT_SUPPORTED.
+        [STAThread]
+        private static int Main(string[] args)
+        {
+            if (args.Length == 0 || args[0] == "--help" || args[0] == "-h")
+            {
+                ShowHelp();
+                return 0;
+            }
+
+            string solutionFile = NormalizePath(args[0]);
+
+            var dte = FindInstanceEditingSolution(solutionFile);
+
+            if (dte == null)
+            {
+                // Open a new instance
+
+                var visualStudioDteType = Type.GetTypeFromProgID("VisualStudio.DTE.16.0", throwOnError: true);
+                dte = (DTE)Activator.CreateInstance(visualStudioDteType);
+
+                dte.UserControl = true;
+
+                try
+                {
+                    dte.Solution.Open(solutionFile);
+                }
+                catch (ArgumentException)
+                {
+                    Console.Error.WriteLine("Solution.Open: Invalid path or file not found");
+                    return 1;
+                }
+
+                dte.MainWindow.Visible = true;
+            }
+
+            MessageFilter.Register();
+
+            try
+            {
+                // Open files
+
+                for (int i = 1; i < args.Length; i++)
+                {
+                    // Both the line number and the column begin at one
+
+                    string[] fileArgumentParts = args[i].Split(';');
+
+                    string filePath = NormalizePath(fileArgumentParts[0]);
+
+                    try
+                    {
+                        dte.ItemOperations.OpenFile(filePath);
+                    }
+                    catch (ArgumentException)
+                    {
+                        Console.Error.WriteLine("ItemOperations.OpenFile: Invalid path or file not found");
+                        return 1;
+                    }
+
+                    if (fileArgumentParts.Length > 1)
+                    {
+                        if (int.TryParse(fileArgumentParts[1], out int line))
+                        {
+                            var textSelection = (TextSelection)dte.ActiveDocument.Selection;
+
+                            if (fileArgumentParts.Length > 2)
+                            {
+                                if (int.TryParse(fileArgumentParts[2], out int column))
+                                {
+                                    textSelection.MoveToLineAndOffset(line, column);
+                                }
+                                else
+                                {
+                                    Console.Error.WriteLine("The column part of the argument must be a valid integer");
+                                    return 1;
+                                }
+                            }
+                            else
+                            {
+                                textSelection.GotoLine(line, Select: true);
+                            }
+                        }
+                        else
+                        {
+                            Console.Error.WriteLine("The line part of the argument must be a valid integer");
+                            return 1;
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                var mainWindow = dte.MainWindow;
+                mainWindow.Activate();
+                SetForegroundWindow(new IntPtr(mainWindow.HWnd));
+
+                MessageFilter.Revoke();
+            }
+
+            return 0;
+        }
+
+        private static DTE FindInstanceEditingSolution(string solutionPath)
+        {
+            if (GetRunningObjectTable(0, out IRunningObjectTable pprot) != 0)
+                return null;
+
+            try
+            {
+                pprot.EnumRunning(out IEnumMoniker ppenumMoniker);
+                ppenumMoniker.Reset();
+
+                var moniker = new IMoniker[1];
+
+                while (ppenumMoniker.Next(1, moniker, IntPtr.Zero) == 0)
+                {
+                    string ppszDisplayName;
+
+                    CreateBindCtx(0, out IBindCtx ppbc);
+
+                    try
+                    {
+                        moniker[0].GetDisplayName(ppbc, null, out ppszDisplayName);
+                    }
+                    finally
+                    {
+                        Marshal.ReleaseComObject(ppbc);
+                    }
+
+                    if (ppszDisplayName == null)
+                        continue;
+
+                    // The digits after the colon are the process ID
+                    if (!Regex.IsMatch(ppszDisplayName, "!VisualStudio.DTE.16.0:[0-9]"))
+                        continue;
+
+                    if (pprot.GetObject(moniker[0], out object ppunkObject) == 0)
+                    {
+                        if (ppunkObject is DTE dte && dte.Solution.FullName.Length > 0)
+                        {
+                            if (NormalizePath(dte.Solution.FullName) == solutionPath)
+                                return dte;
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                Marshal.ReleaseComObject(pprot);
+            }
+
+            return null;
+        }
+
+        static string NormalizePath(string path)
+        {
+            return new Uri(Path.GetFullPath(path)).LocalPath
+                .TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar)
+                .ToUpperInvariant();
+        }
+
+        #region MessageFilter. See: http: //msdn.microsoft.com/en-us/library/ms228772.aspx
+
+        private class MessageFilter : IOleMessageFilter
+        {
+            // Class containing the IOleMessageFilter
+            // thread error-handling functions
+
+            private static IOleMessageFilter _oldFilter;
+
+            // Start the filter
+            public static void Register()
+            {
+                IOleMessageFilter newFilter = new MessageFilter();
+                int ret = CoRegisterMessageFilter(newFilter, out _oldFilter);
+                if (ret != 0)
+                    Console.Error.WriteLine($"CoRegisterMessageFilter failed with error code: {ret}");
+            }
+
+            // Done with the filter, close it
+            public static void Revoke()
+            {
+                int ret = CoRegisterMessageFilter(_oldFilter, out _);
+                if (ret != 0)
+                    Console.Error.WriteLine($"CoRegisterMessageFilter failed with error code: {ret}");
+            }
+
+            //
+            // IOleMessageFilter functions
+            // Handle incoming thread requests
+            int IOleMessageFilter.HandleInComingCall(int dwCallType, IntPtr hTaskCaller, int dwTickCount, IntPtr lpInterfaceInfo)
+            {
+                // Return the flag SERVERCALL_ISHANDLED
+                return 0;
+            }
+
+            // Thread call was rejected, so try again.
+            int IOleMessageFilter.RetryRejectedCall(IntPtr hTaskCallee, int dwTickCount, int dwRejectType)
+            {
+                if (dwRejectType == 2)
+                    // flag = SERVERCALL_RETRYLATER
+                {
+                    // Retry the thread call immediately if return >= 0 & < 100
+                    return 99;
+                }
+
+                // Too busy; cancel call
+                return -1;
+            }
+
+            int IOleMessageFilter.MessagePending(IntPtr hTaskCallee, int dwTickCount, int dwPendingType)
+            {
+                // Return the flag PENDINGMSG_WAITDEFPROCESS
+                return 2;
+            }
+
+            // Implement the IOleMessageFilter interface
+            [DllImport("ole32.dll")]
+            private static extern int CoRegisterMessageFilter(IOleMessageFilter newFilter, out IOleMessageFilter oldFilter);
+        }
+
+        [ComImport(), Guid("00000016-0000-0000-C000-000000000046"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+        private interface IOleMessageFilter
+        {
+            [PreserveSig]
+            int HandleInComingCall(int dwCallType, IntPtr hTaskCaller, int dwTickCount, IntPtr lpInterfaceInfo);
+
+            [PreserveSig]
+            int RetryRejectedCall(IntPtr hTaskCallee, int dwTickCount, int dwRejectType);
+
+            [PreserveSig]
+            int MessagePending(IntPtr hTaskCallee, int dwTickCount, int dwPendingType);
+        }
+
+        #endregion
+    }
+}
diff --git a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/DotNetSolution.cs b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/DotNetSolution.cs
index 76cb249acf..cc0da44a13 100644
--- a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/DotNetSolution.cs
+++ b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/DotNetSolution.cs
@@ -1,6 +1,9 @@
 using GodotTools.Core;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
 
 namespace GodotTools.ProjectEditor
 {
@@ -86,7 +89,7 @@ namespace GodotTools.ProjectEditor
             string solutionPath = Path.Combine(DirectoryPath, Name + ".sln");
             string content = string.Format(SolutionTemplate, projectsDecl, slnPlatformsCfg, projPlatformsCfg);
 
-            File.WriteAllText(solutionPath, content);
+            File.WriteAllText(solutionPath, content, Encoding.UTF8); // UTF-8 with BOM
         }
 
         public DotNetSolution(string name)
@@ -118,5 +121,45 @@ EndProject";
         const string ProjectPlatformsConfig =
 @"		{{{0}}}.{1}|Any CPU.ActiveCfg = {1}|Any CPU
 		{{{0}}}.{1}|Any CPU.Build.0 = {1}|Any CPU";
+
+        public static void MigrateFromOldConfigNames(string slnPath)
+        {
+            if (!File.Exists(slnPath))
+                return;
+
+            var input = File.ReadAllText(slnPath);
+
+            if (!Regex.IsMatch(input, Regex.Escape("Tools|Any CPU")))
+                return;
+
+            // This method renames old configurations in solutions to the new ones.
+            //
+            // This is the order configs appear in the solution and what we want to rename them to:
+            //   Debug|Any CPU = Debug|Any CPU        ->    ExportDebug|Any CPU = ExportDebug|Any CPU
+            //   Tools|Any CPU = Tools|Any CPU        ->    Debug|Any CPU = Debug|Any CPU
+            //
+            // But we want to move Tools (now Debug) to the top, so it's easier to rename like this:
+            //   Debug|Any CPU = Debug|Any CPU        ->    Debug|Any CPU = Debug|Any CPU
+            //   Release|Any CPU = Release|Any CPU    ->    ExportDebug|Any CPU = ExportDebug|Any CPU
+            //   Tools|Any CPU = Tools|Any CPU        ->    ExportRelease|Any CPU = ExportRelease|Any CPU
+
+            var dict = new Dictionary<string, string>
+            {
+                {"Debug|Any CPU", "Debug|Any CPU"},
+                {"Release|Any CPU", "ExportDebug|Any CPU"},
+                {"Tools|Any CPU", "ExportRelease|Any CPU"}
+            };
+
+            var regex = new Regex(string.Join("|",dict.Keys.Select(Regex.Escape)));
+            var result = regex.Replace(input,m => dict[m.Value]);
+
+            if (result != input)
+            {
+                // Save a copy of the solution before replacing it
+                FileUtils.SaveBackupCopy(slnPath);
+
+                File.WriteAllText(slnPath, result);
+            }
+        }
     }
 }
diff --git a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/GodotTools.ProjectEditor.csproj b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/GodotTools.ProjectEditor.csproj
index b60e501beb..e4d6b2e010 100644
--- a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/GodotTools.ProjectEditor.csproj
+++ b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/GodotTools.ProjectEditor.csproj
@@ -1,57 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{A8CDAD94-C6D4-4B19-A7E7-76C53CC92984}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>GodotTools.ProjectEditor</RootNamespace>
-    <AssemblyName>GodotTools.ProjectEditor</AssemblyName>
-    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
-    <BaseIntermediateOutputPath>obj</BaseIntermediateOutputPath>
-    <LangVersion>7</LangVersion>
+    <TargetFramework>net472</TargetFramework>
+    <LangVersion>7.2</LangVersion>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>portable</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="Microsoft.Build" />
-    <Reference Include="DotNet.Glob, Version=2.1.1.0, Culture=neutral, PublicKeyToken=b68cc888b4f632d1, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\DotNet.Glob.2.1.1\lib\net45\DotNet.Glob.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
-    <Compile Include="ApiAssembliesInfo.cs" />
-    <Compile Include="DotNetSolution.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="IdentifierUtils.cs" />
-    <Compile Include="ProjectExtensions.cs" />
-    <Compile Include="ProjectGenerator.cs" />
-    <Compile Include="ProjectUtils.cs" />
+    <PackageReference Include="Microsoft.Build" Version="16.5.0" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <ProjectReference Include="..\GodotTools.Core\GodotTools.Core.csproj" />
   </ItemGroup>
+  <!--
+  The Microsoft.Build.Runtime package is too problematic so we create a MSBuild.exe stub. The workaround described
+  here doesn't work with Microsoft.NETFramework.ReferenceAssemblies: https://github.com/microsoft/msbuild/issues/3486
+  We need a MSBuild.exe file as there's an issue in Microsoft.Build where it executes platform dependent code when
+  searching for MSBuild.exe before the fallback to not using it. A stub is fine as it should never be executed.
+  -->
   <ItemGroup>
-    <ProjectReference Include="..\GodotTools.Core\GodotTools.Core.csproj">
-      <Project>{639E48BD-44E5-4091-8EDD-22D36DC0768D}</Project>
-      <Name>GodotTools.Core</Name>
-    </ProjectReference>
+    <None Include="MSBuild.exe" CopyToOutputDirectory="Always" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Target Name="CopyMSBuildStubWindows" AfterTargets="Build" Condition=" '$(GodotPlatform)' == 'windows' Or ( '$(GodotPlatform)' == '' And '$(OS)' == 'Windows_NT' ) ">
+    <PropertyGroup>
+      <GodotSourceRootPath>$(SolutionDir)/../../../../</GodotSourceRootPath>
+      <GodotOutputDataDir>$(GodotSourceRootPath)/bin/GodotSharp</GodotOutputDataDir>
+    </PropertyGroup>
+    <!-- Need to copy it here as well on Windows -->
+    <Copy SourceFiles="MSBuild.exe" DestinationFiles="$(GodotOutputDataDir)\Mono\lib\mono\v4.0\MSBuild.exe" />
+  </Target>
 </Project>
diff --git a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/IdentifierUtils.cs b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/IdentifierUtils.cs
index f93eb9a1fa..ed77076df3 100644
--- a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/IdentifierUtils.cs
+++ b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/IdentifierUtils.cs
@@ -22,6 +22,37 @@ namespace GodotTools.ProjectEditor
             return string.Join(".", identifiers);
         }
 
+        /// <summary>
+        /// Skips invalid identifier characters including decimal digit numbers at the start of the identifier.
+        /// </summary>
+        private static void SkipInvalidCharacters(string source, int startIndex, StringBuilder outputBuilder)
+        {
+            for (int i = startIndex; i < source.Length; i++)
+            {
+                char @char = source[i];
+
+                switch (char.GetUnicodeCategory(@char))
+                {
+                    case UnicodeCategory.UppercaseLetter:
+                    case UnicodeCategory.LowercaseLetter:
+                    case UnicodeCategory.TitlecaseLetter:
+                    case UnicodeCategory.ModifierLetter:
+                    case UnicodeCategory.LetterNumber:
+                    case UnicodeCategory.OtherLetter:
+                        outputBuilder.Append(@char);
+                        break;
+                    case UnicodeCategory.NonSpacingMark:
+                    case UnicodeCategory.SpacingCombiningMark:
+                    case UnicodeCategory.ConnectorPunctuation:
+                    case UnicodeCategory.DecimalDigitNumber:
+                        // Identifiers may start with underscore
+                        if (outputBuilder.Length > startIndex || @char == '_')
+                            outputBuilder.Append(@char);
+                        break;
+                }
+            }
+        }
+
         public static string SanitizeIdentifier(string identifier, bool allowEmpty)
         {
             if (string.IsNullOrEmpty(identifier))
@@ -44,30 +75,7 @@ namespace GodotTools.ProjectEditor
                 startIndex += 1;
             }
 
-            for (int i = startIndex; i < identifier.Length; i++)
-            {
-                char @char = identifier[i];
-
-                switch (Char.GetUnicodeCategory(@char))
-                {
-                    case UnicodeCategory.UppercaseLetter:
-                    case UnicodeCategory.LowercaseLetter:
-                    case UnicodeCategory.TitlecaseLetter:
-                    case UnicodeCategory.ModifierLetter:
-                    case UnicodeCategory.LetterNumber:
-                    case UnicodeCategory.OtherLetter:
-                        identifierBuilder.Append(@char);
-                        break;
-                    case UnicodeCategory.NonSpacingMark:
-                    case UnicodeCategory.SpacingCombiningMark:
-                    case UnicodeCategory.ConnectorPunctuation:
-                    case UnicodeCategory.DecimalDigitNumber:
-                        // Identifiers may start with underscore
-                        if (identifierBuilder.Length > startIndex || @char == '_')
-                            identifierBuilder.Append(@char);
-                        break;
-                }
-            }
+            SkipInvalidCharacters(identifier, startIndex, identifierBuilder);
 
             if (identifierBuilder.Length == startIndex)
             {
diff --git a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/MSBuild.exe b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/MSBuild.exe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/MSBuild.exe
diff --git a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectExtensions.cs b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectExtensions.cs
deleted file mode 100644
index 36961eb45e..0000000000
--- a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectExtensions.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using GodotTools.Core;
-using System;
-using DotNet.Globbing;
-using Microsoft.Build.Construction;
-
-namespace GodotTools.ProjectEditor
-{
-    public static class ProjectExtensions
-    {
-        public static bool HasItem(this ProjectRootElement root, string itemType, string include)
-        {
-            GlobOptions globOptions = new GlobOptions();
-            globOptions.Evaluation.CaseInsensitive = false;
-
-            string normalizedInclude = include.NormalizePath();
-
-            foreach (var itemGroup in root.ItemGroups)
-            {
-                if (itemGroup.Condition.Length != 0)
-                    continue;
-
-                foreach (var item in itemGroup.Items)
-                {
-                    if (item.ItemType != itemType)
-                        continue;
-
-                    var glob = Glob.Parse(item.Include.NormalizePath(), globOptions);
-
-                    if (glob.IsMatch(normalizedInclude))
-                    {
-                        return true;
-                    }
-                }
-            }
-
-            return false;
-        }
-
-        public static bool AddItemChecked(this ProjectRootElement root, string itemType, string include)
-        {
-            if (!root.HasItem(itemType, include))
-            {
-                root.AddItem(itemType, include);
-                return true;
-            }
-
-            return false;
-        }
-
-        public static Guid GetGuid(this ProjectRootElement root)
-        {
-            foreach (var property in root.Properties)
-            {
-                if (property.Name == "ProjectGuid")
-                    return Guid.Parse(property.Value);
-            }
-
-            return Guid.Empty;
-        }
-    }
-}
diff --git a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectGenerator.cs b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectGenerator.cs
index 28b7832f90..01d7c99662 100644
--- a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectGenerator.cs
+++ b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectGenerator.cs
@@ -1,162 +1,51 @@
-using GodotTools.Core;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Reflection;
+using System.Text;
 using Microsoft.Build.Construction;
+using Microsoft.Build.Evaluation;
 
 namespace GodotTools.ProjectEditor
 {
     public static class ProjectGenerator
     {
-        private const string CoreApiProjectName = "GodotSharp";
-        private const string EditorApiProjectName = "GodotSharpEditor";
+        public const string GodotSdkVersionToUse = "4.0.0-dev2";
 
-        public static string GenGameProject(string dir, string name, IEnumerable<string> compileItems)
-        {
-            string path = Path.Combine(dir, name + ".csproj");
-
-            ProjectPropertyGroupElement mainGroup;
-            var root = CreateLibraryProject(name, "Tools", out mainGroup);
-
-            mainGroup.SetProperty("OutputPath", Path.Combine(".mono", "temp", "bin", "$(Configuration)"));
-            mainGroup.SetProperty("BaseIntermediateOutputPath", Path.Combine(".mono", "temp", "obj"));
-            mainGroup.SetProperty("IntermediateOutputPath", Path.Combine("$(BaseIntermediateOutputPath)", "$(Configuration)"));
-            mainGroup.SetProperty("ApiConfiguration", "Debug").Condition = " '$(Configuration)' != 'Release' ";
-            mainGroup.SetProperty("ApiConfiguration", "Release").Condition = " '$(Configuration)' == 'Release' ";
-
-            var toolsGroup = root.AddPropertyGroup();
-            toolsGroup.Condition = " '$(Configuration)|$(Platform)' == 'Tools|AnyCPU' ";
-            toolsGroup.AddProperty("DebugSymbols", "true");
-            toolsGroup.AddProperty("DebugType", "portable");
-            toolsGroup.AddProperty("Optimize", "false");
-            toolsGroup.AddProperty("DefineConstants", "$(GodotDefineConstants);GODOT;DEBUG;TOOLS;");
-            toolsGroup.AddProperty("ErrorReport", "prompt");
-            toolsGroup.AddProperty("WarningLevel", "4");
-            toolsGroup.AddProperty("ConsolePause", "false");
-
-            var coreApiRef = root.AddItem("Reference", CoreApiProjectName);
-            coreApiRef.AddMetadata("HintPath", Path.Combine("$(ProjectDir)", ".mono", "assemblies", "$(ApiConfiguration)", CoreApiProjectName + ".dll"));
-            coreApiRef.AddMetadata("Private", "False");
-
-            var editorApiRef = root.AddItem("Reference", EditorApiProjectName);
-            editorApiRef.Condition = " '$(Configuration)' == 'Tools' ";
-            editorApiRef.AddMetadata("HintPath", Path.Combine("$(ProjectDir)", ".mono", "assemblies", "$(ApiConfiguration)", EditorApiProjectName + ".dll"));
-            editorApiRef.AddMetadata("Private", "False");
+        public static string GodotSdkAttrValue => $"Godot.NET.Sdk/{GodotSdkVersionToUse}";
 
-            GenAssemblyInfoFile(root, dir, name);
-
-            foreach (var item in compileItems)
-            {
-                root.AddItem("Compile", item.RelativeToPath(dir).Replace("/", "\\"));
-            }
-
-            root.Save(path);
-
-            return root.GetGuid().ToString().ToUpper();
-        }
-
-        private static void GenAssemblyInfoFile(ProjectRootElement root, string dir, string name, string[] assemblyLines = null, string[] usingDirectives = null)
+        public static ProjectRootElement GenGameProject(string name)
         {
-            string propertiesDir = Path.Combine(dir, "Properties");
-            if (!Directory.Exists(propertiesDir))
-                Directory.CreateDirectory(propertiesDir);
-
-            string usingDirectivesText = string.Empty;
-
-            if (usingDirectives != null)
-            {
-                foreach (var usingDirective in usingDirectives)
-                    usingDirectivesText += "\nusing " + usingDirective + ";";
-            }
+            if (name.Length == 0)
+                throw new ArgumentException("Project name is empty", nameof(name));
 
-            string assemblyLinesText = string.Empty;
+            var root = ProjectRootElement.Create(NewProjectFileOptions.None);
 
-            if (assemblyLines != null)
-                assemblyLinesText += string.Join("\n", assemblyLines) + "\n";
+            root.Sdk = GodotSdkAttrValue;
 
-            string content = string.Format(AssemblyInfoTemplate, usingDirectivesText, name, assemblyLinesText);
+            var mainGroup = root.AddPropertyGroup();
+            mainGroup.AddProperty("TargetFramework", "netstandard2.1");
 
-            string assemblyInfoFile = Path.Combine(propertiesDir, "AssemblyInfo.cs");
+            string sanitizedName = IdentifierUtils.SanitizeQualifiedIdentifier(name, allowEmptyIdentifiers: true);
 
-            File.WriteAllText(assemblyInfoFile, content);
+            // If the name is not a valid namespace, manually set RootNamespace to a sanitized one.
+            if (sanitizedName != name)
+                mainGroup.AddProperty("RootNamespace", sanitizedName);
 
-            root.AddItem("Compile", assemblyInfoFile.RelativeToPath(dir).Replace("/", "\\"));
+            return root;
         }
 
-        public static ProjectRootElement CreateLibraryProject(string name, string defaultConfig, out ProjectPropertyGroupElement mainGroup)
+        public static string GenAndSaveGameProject(string dir, string name)
         {
-            if (string.IsNullOrEmpty(name))
-                throw new ArgumentException($"{nameof(name)} cannot be empty", nameof(name));
-
-            var root = ProjectRootElement.Create();
-            root.DefaultTargets = "Build";
-
-            mainGroup = root.AddPropertyGroup();
-            mainGroup.AddProperty("Configuration", defaultConfig).Condition = " '$(Configuration)' == '' ";
-            mainGroup.AddProperty("Platform", "AnyCPU").Condition = " '$(Platform)' == '' ";
-            mainGroup.AddProperty("ProjectGuid", "{" + Guid.NewGuid().ToString().ToUpper() + "}");
-            mainGroup.AddProperty("OutputType", "Library");
-            mainGroup.AddProperty("OutputPath", Path.Combine("bin", "$(Configuration)"));
-            mainGroup.AddProperty("RootNamespace", IdentifierUtils.SanitizeQualifiedIdentifier(name, allowEmptyIdentifiers: true));
-            mainGroup.AddProperty("AssemblyName", name);
-            mainGroup.AddProperty("TargetFrameworkVersion", "v4.7");
-            mainGroup.AddProperty("GodotProjectGeneratorVersion", Assembly.GetExecutingAssembly().GetName().Version.ToString());
-
-            var debugGroup = root.AddPropertyGroup();
-            debugGroup.Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ";
-            debugGroup.AddProperty("DebugSymbols", "true");
-            debugGroup.AddProperty("DebugType", "portable");
-            debugGroup.AddProperty("Optimize", "false");
-            debugGroup.AddProperty("DefineConstants", "$(GodotDefineConstants);GODOT;DEBUG;");
-            debugGroup.AddProperty("ErrorReport", "prompt");
-            debugGroup.AddProperty("WarningLevel", "4");
-            debugGroup.AddProperty("ConsolePause", "false");
+            if (name.Length == 0)
+                throw new ArgumentException("Project name is empty", nameof(name));
 
-            var releaseGroup = root.AddPropertyGroup();
-            releaseGroup.Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ";
-            releaseGroup.AddProperty("DebugType", "portable");
-            releaseGroup.AddProperty("Optimize", "true");
-            releaseGroup.AddProperty("DefineConstants", "$(GodotDefineConstants);GODOT;");
-            releaseGroup.AddProperty("ErrorReport", "prompt");
-            releaseGroup.AddProperty("WarningLevel", "4");
-            releaseGroup.AddProperty("ConsolePause", "false");
+            string path = Path.Combine(dir, name + ".csproj");
 
-            // References
-            var referenceGroup = root.AddItemGroup();
-            referenceGroup.AddItem("Reference", "System");
+            var root = GenGameProject(name);
 
-            root.AddImport(Path.Combine("$(MSBuildBinPath)", "Microsoft.CSharp.targets").Replace("/", "\\"));
+            // Save (without BOM)
+            root.Save(path, new UTF8Encoding(encoderShouldEmitUTF8Identifier: false));
 
-            return root;
+            return Guid.NewGuid().ToString().ToUpper();
         }
-
-        private const string AssemblyInfoTemplate =
-            @"using System.Reflection;{0}
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle(""{1}"")]
-[assembly: AssemblyDescription("""")]
-[assembly: AssemblyConfiguration("""")]
-[assembly: AssemblyCompany("""")]
-[assembly: AssemblyProduct("""")]
-[assembly: AssemblyCopyright("""")]
-[assembly: AssemblyTrademark("""")]
-[assembly: AssemblyCulture("""")]
-
-// The assembly version has the format ""{{Major}}.{{Minor}}.{{Build}}.{{Revision}}"".
-// The form ""{{Major}}.{{Minor}}.*"" will automatically update the build and revision,
-// and ""{{Major}}.{{Minor}}.{{Build}}.*"" will update just the revision.
-
-[assembly: AssemblyVersion(""1.0.*"")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("""")]
-{2}";
     }
 }
diff --git a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectUtils.cs b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectUtils.cs
index 233aab45b3..4e2c0f17cc 100644
--- a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectUtils.cs
+++ b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectUtils.cs
@@ -1,28 +1,37 @@
+using System;
 using GodotTools.Core;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using DotNet.Globbing;
 using Microsoft.Build.Construction;
+using Microsoft.Build.Globbing;
 
 namespace GodotTools.ProjectEditor
 {
-    public static class ProjectUtils
+    public sealed class MSBuildProject
     {
-        public static void AddItemToProjectChecked(string projectPath, string itemType, string include)
-        {
-            var dir = Directory.GetParent(projectPath).FullName;
-            var root = ProjectRootElement.Open(projectPath);
-            Debug.Assert(root != null);
+        internal ProjectRootElement Root { get; set; }
 
-            var normalizedInclude = include.RelativeToPath(dir).Replace("/", "\\");
+        public bool HasUnsavedChanges { get; set; }
 
-            if (root.AddItemChecked(itemType, normalizedInclude))
-                root.Save();
+        public void Save() => Root.Save();
+
+        public MSBuildProject(ProjectRootElement root)
+        {
+            Root = root;
         }
+    }
 
-        private static string[] GetAllFilesRecursive(string rootDirectory, string mask)
+    public static class ProjectUtils
+    {
+        public static MSBuildProject Open(string path)
+        {
+            var root = ProjectRootElement.Open(path);
+            return root != null ? new MSBuildProject(root) : null;
+        }
+
+        private static List<string> GetAllFilesRecursive(string rootDirectory, string mask)
         {
             string[] files = Directory.GetFiles(rootDirectory, mask, SearchOption.AllDirectories);
 
@@ -32,144 +41,59 @@ namespace GodotTools.ProjectEditor
                 files[i] = files[i].RelativeToPath(rootDirectory);
             }
 
-            return files;
+            return new List<string>(files);
         }
 
-        public static string[] GetIncludeFiles(string projectPath, string itemType)
+        // NOTE: Assumes auto-including items. Only used by the scripts metadata generator, which will be replaced with source generators in the future.
+        public static IEnumerable<string> GetIncludeFiles(string projectPath, string itemType)
         {
-            var result = new List<string>();
-            var existingFiles = GetAllFilesRecursive(Path.GetDirectoryName(projectPath), "*.cs");
-
-            var globOptions = new GlobOptions();
-            globOptions.Evaluation.CaseInsensitive = false;
+            var excluded = new List<string>();
+            var includedFiles = GetAllFilesRecursive(Path.GetDirectoryName(projectPath), "*.cs");
 
             var root = ProjectRootElement.Open(projectPath);
+            Debug.Assert(root != null);
 
-            foreach (var itemGroup in root.ItemGroups)
+            foreach (var item in root.Items)
             {
-                if (itemGroup.Condition.Length != 0)
+                if (string.IsNullOrEmpty(item.Condition))
                     continue;
 
-                foreach (var item in itemGroup.Items)
-                {
-                    if (item.ItemType != itemType)
-                        continue;
-
-                    string normalizedInclude = item.Include.NormalizePath();
-
-                    var glob = Glob.Parse(normalizedInclude, globOptions);
+                if (item.ItemType != itemType)
+                    continue;
 
-                    // TODO Check somehow if path has no blob to avoid the following loop...
+                string normalizedRemove = item.Remove.NormalizePath();
 
-                    foreach (var existingFile in existingFiles)
-                    {
-                        if (glob.IsMatch(existingFile))
-                        {
-                            result.Add(existingFile);
-                        }
-                    }
-                }
+                var glob = MSBuildGlob.Parse(normalizedRemove);
+                excluded.AddRange(includedFiles.Where(includedFile => glob.IsMatch(includedFile)));
             }
 
-            return result.ToArray();
+            includedFiles.RemoveAll(f => excluded.Contains(f));
+
+            return includedFiles;
         }
 
-        ///  Simple function to make sure the Api assembly references are configured correctly
-        public static void FixApiHintPath(string projectPath)
+        public static void MigrateToProjectSdksStyle(MSBuildProject project, string projectName)
         {
-            var root = ProjectRootElement.Open(projectPath);
-            Debug.Assert(root != null);
-
-            bool dirty = false;
+            var origRoot = project.Root;
 
-            void AddPropertyIfNotPresent(string name, string condition, string value)
-            {
-                if (root.PropertyGroups
-                    .Any(g => (g.Condition == string.Empty || g.Condition == condition) &&
-                              g.Properties
-                                  .Any(p => p.Name == name &&
-                                            p.Value == value &&
-                                            (p.Condition == condition || g.Condition == condition))))
-                {
-                    return;
-                }
-
-                root.AddProperty(name, value).Condition = condition;
-                dirty = true;
-            }
+            if (!string.IsNullOrEmpty(origRoot.Sdk))
+                return;
 
-            AddPropertyIfNotPresent(name: "ApiConfiguration",
-                condition: " '$(Configuration)' != 'Release' ",
-                value: "Debug");
-            AddPropertyIfNotPresent(name: "ApiConfiguration",
-                condition: " '$(Configuration)' == 'Release' ",
-                value: "Release");
-
-            void SetReferenceHintPath(string referenceName, string condition, string hintPath)
-            {
-                foreach (var itemGroup in root.ItemGroups.Where(g =>
-                    g.Condition == string.Empty || g.Condition == condition))
-                {
-                    var references = itemGroup.Items.Where(item =>
-                        item.ItemType == "Reference" &&
-                        item.Include == referenceName &&
-                        (item.Condition == condition || itemGroup.Condition == condition));
-
-                    var referencesWithHintPath = references.Where(reference =>
-                        reference.Metadata.Any(m => m.Name == "HintPath"));
-
-                    if (referencesWithHintPath.Any(reference => reference.Metadata
-                        .Any(m => m.Name == "HintPath" && m.Value == hintPath)))
-                    {
-                        // Found a Reference item with the right HintPath
-                        return;
-                    }
-
-                    var referenceWithHintPath = referencesWithHintPath.FirstOrDefault();
-                    if (referenceWithHintPath != null)
-                    {
-                        // Found a Reference item with a wrong HintPath
-                        foreach (var metadata in referenceWithHintPath.Metadata.ToList()
-                            .Where(m => m.Name == "HintPath"))
-                        {
-                            // Safe to remove as we duplicate with ToList() to loop
-                            referenceWithHintPath.RemoveChild(metadata);
-                        }
-
-                        referenceWithHintPath.AddMetadata("HintPath", hintPath);
-                        dirty = true;
-                        return;
-                    }
-
-                    var referenceWithoutHintPath = references.FirstOrDefault();
-                    if (referenceWithoutHintPath != null)
-                    {
-                        // Found a Reference item without a HintPath
-                        referenceWithoutHintPath.AddMetadata("HintPath", hintPath);
-                        dirty = true;
-                        return;
-                    }
-                }
-
-                // Found no Reference item at all. Add it.
-                root.AddItem("Reference", referenceName).Condition = condition;
-                dirty = true;
-            }
-
-            const string coreProjectName = "GodotSharp";
-            const string editorProjectName = "GodotSharpEditor";
-
-            const string coreCondition = "";
-            const string editorCondition = " '$(Configuration)' == 'Tools' ";
+            project.Root = ProjectGenerator.GenGameProject(projectName);
+            project.Root.FullPath = origRoot.FullPath;
+            project.HasUnsavedChanges = true;
+        }
 
-            var coreHintPath = $"$(ProjectDir)/.mono/assemblies/$(ApiConfiguration)/{coreProjectName}.dll";
-            var editorHintPath = $"$(ProjectDir)/.mono/assemblies/$(ApiConfiguration)/{editorProjectName}.dll";
+        public static void EnsureGodotSdkIsUpToDate(MSBuildProject project)
+        {
+            var root = project.Root;
+            string godotSdkAttrValue = ProjectGenerator.GodotSdkAttrValue;
 
-            SetReferenceHintPath(coreProjectName, coreCondition, coreHintPath);
-            SetReferenceHintPath(editorProjectName, editorCondition, editorHintPath);
+            if (!string.IsNullOrEmpty(root.Sdk) && root.Sdk.Trim().Equals(godotSdkAttrValue, StringComparison.OrdinalIgnoreCase))
+                return;
 
-            if (dirty)
-                root.Save();
+            root.Sdk = godotSdkAttrValue;
+            project.HasUnsavedChanges = true;
         }
     }
 }
diff --git a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/Properties/AssemblyInfo.cs b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/Properties/AssemblyInfo.cs
deleted file mode 100644
index 09333850fc..0000000000
--- a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle("GodotTools.ProjectEditor")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("Godot Engine contributors")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
diff --git a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/packages.config b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/packages.config
deleted file mode 100644
index 2db030f9d8..0000000000
--- a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="DotNet.Glob" version="2.1.1" targetFramework="net45" />
-</packages>
diff --git a/modules/mono/editor/GodotTools/GodotTools.sln b/modules/mono/editor/GodotTools/GodotTools.sln
index a3438ea5f3..ba5379e562 100644
--- a/modules/mono/editor/GodotTools/GodotTools.sln
+++ b/modules/mono/editor/GodotTools/GodotTools.sln
@@ -9,7 +9,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GodotTools.Core", "GodotToo
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GodotTools.BuildLogger", "GodotTools.BuildLogger\GodotTools.BuildLogger.csproj", "{6CE9A984-37B1-4F8A-8FE9-609F05F071B3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GodotTools.IdeConnection", "GodotTools.IdeConnection\GodotTools.IdeConnection.csproj", "{92600954-25F0-4291-8E11-1FEE9FC4BE20}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GodotTools.IdeMessaging", "GodotTools.IdeMessaging\GodotTools.IdeMessaging.csproj", "{92600954-25F0-4291-8E11-1FEE9FC4BE20}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GodotTools.OpenVisualStudio", "GodotTools.OpenVisualStudio\GodotTools.OpenVisualStudio.csproj", "{EAFFF236-FA96-4A4D-BD23-0E51EF988277}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -37,5 +39,9 @@ Global
 		{92600954-25F0-4291-8E11-1FEE9FC4BE20}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{92600954-25F0-4291-8E11-1FEE9FC4BE20}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{92600954-25F0-4291-8E11-1FEE9FC4BE20}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EAFFF236-FA96-4A4D-BD23-0E51EF988277}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EAFFF236-FA96-4A4D-BD23-0E51EF988277}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EAFFF236-FA96-4A4D-BD23-0E51EF988277}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EAFFF236-FA96-4A4D-BD23-0E51EF988277}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/modules/mono/editor/GodotTools/GodotTools/BottomPanel.cs b/modules/mono/editor/GodotTools/GodotTools/BottomPanel.cs
index 4c76d2abf1..3ab669a9f3 100644
--- a/modules/mono/editor/GodotTools/GodotTools/BottomPanel.cs
+++ b/modules/mono/editor/GodotTools/GodotTools/BottomPanel.cs
@@ -20,52 +20,54 @@ namespace GodotTools
         private ItemList buildTabsList;
         private TabContainer buildTabs;
 
-        private ToolButton warningsBtn;
-        private ToolButton errorsBtn;
+        private Button warningsBtn;
+        private Button errorsBtn;
         private Button viewLogBtn;
 
-        private void _UpdateBuildTabsList()
+        private void _UpdateBuildTab(int index, int? currentTab)
         {
-            buildTabsList.Clear();
+            var tab = (BuildTab)buildTabs.GetChild(index);
 
-            int currentTab = buildTabs.CurrentTab;
+            string itemName = Path.GetFileNameWithoutExtension(tab.BuildInfo.Solution);
+            itemName += " [" + tab.BuildInfo.Configuration + "]";
 
-            bool noCurrentTab = currentTab < 0 || currentTab >= buildTabs.GetTabCount();
+            buildTabsList.AddItem(itemName, tab.IconTexture);
 
-            for (int i = 0; i < buildTabs.GetChildCount(); i++)
-            {
-                var tab = (BuildTab)buildTabs.GetChild(i);
+            string itemTooltip = "Solution: " + tab.BuildInfo.Solution;
+            itemTooltip += "\nConfiguration: " + tab.BuildInfo.Configuration;
+            itemTooltip += "\nStatus: ";
 
-                if (tab == null)
-                    continue;
+            if (tab.BuildExited)
+                itemTooltip += tab.BuildResult == BuildTab.BuildResults.Success ? "Succeeded" : "Errored";
+            else
+                itemTooltip += "Running";
 
-                string itemName = Path.GetFileNameWithoutExtension(tab.BuildInfo.Solution);
-                itemName += " [" + tab.BuildInfo.Configuration + "]";
+            if (!tab.BuildExited || tab.BuildResult == BuildTab.BuildResults.Error)
+                itemTooltip += $"\nErrors: {tab.ErrorCount}";
 
-                buildTabsList.AddItem(itemName, tab.IconTexture);
+            itemTooltip += $"\nWarnings: {tab.WarningCount}";
 
-                string itemTooltip = "Solution: " + tab.BuildInfo.Solution;
-                itemTooltip += "\nConfiguration: " + tab.BuildInfo.Configuration;
-                itemTooltip += "\nStatus: ";
+            buildTabsList.SetItemTooltip(index, itemTooltip);
 
-                if (tab.BuildExited)
-                    itemTooltip += tab.BuildResult == BuildTab.BuildResults.Success ? "Succeeded" : "Errored";
-                else
-                    itemTooltip += "Running";
+            // If this tab was already selected before the changes or if no tab was selected
+            if (currentTab == null || currentTab == index)
+            {
+                buildTabsList.Select(index);
+                _BuildTabsItemSelected(index);
+            }
+        }
 
-                if (!tab.BuildExited || tab.BuildResult == BuildTab.BuildResults.Error)
-                    itemTooltip += $"\nErrors: {tab.ErrorCount}";
+        private void _UpdateBuildTabsList()
+        {
+            buildTabsList.Clear();
 
-                itemTooltip += $"\nWarnings: {tab.WarningCount}";
+            int? currentTab = buildTabs.CurrentTab;
 
-                buildTabsList.SetItemTooltip(i, itemTooltip);
+            if (currentTab < 0 || currentTab >= buildTabs.GetTabCount())
+                currentTab = null;
 
-                if (noCurrentTab || currentTab == i)
-                {
-                    buildTabsList.Select(i);
-                    _BuildTabsItemSelected(i);
-                }
-            }
+            for (int i = 0; i < buildTabs.GetChildCount(); i++)
+                _UpdateBuildTab(i, currentTab);
         }
 
         public BuildTab GetBuildTabFor(BuildInfo buildInfo)
@@ -160,19 +162,13 @@ namespace GodotTools
                 }
             }
 
-            var godotDefines = new[]
-            {
-                OS.GetName(),
-                Internal.GodotIs32Bits() ? "32" : "64"
-            };
-
-            bool buildSuccess = BuildManager.BuildProjectBlocking("Tools", godotDefines);
+            bool buildSuccess = BuildManager.BuildProjectBlocking("Debug");
 
             if (!buildSuccess)
                 return;
 
             // Notify running game for hot-reload
-            Internal.ScriptEditorDebuggerReloadScripts();
+            Internal.EditorDebuggerNodeReloadScripts();
 
             // Hot-reload in the editor
             GodotSharpEditor.Instance.GetNode<HotReloadAssemblyWatcher>("HotReloadAssemblyWatcher").RestartTimer();
@@ -205,9 +201,9 @@ namespace GodotTools
             if (what == EditorSettings.NotificationEditorSettingsChanged)
             {
                 var editorBaseControl = editorInterface.GetBaseControl();
-                panelTabs.AddStyleboxOverride("panel", editorBaseControl.GetStylebox("DebuggerPanel", "EditorStyles"));
-                panelTabs.AddStyleboxOverride("tab_fg", editorBaseControl.GetStylebox("DebuggerTabFG", "EditorStyles"));
-                panelTabs.AddStyleboxOverride("tab_bg", editorBaseControl.GetStylebox("DebuggerTabBG", "EditorStyles"));
+                panelTabs.AddThemeStyleboxOverride("panel", editorBaseControl.GetThemeStylebox("DebuggerPanel", "EditorStyles"));
+                panelTabs.AddThemeStyleboxOverride("tab_fg", editorBaseControl.GetThemeStylebox("DebuggerTabFG", "EditorStyles"));
+                panelTabs.AddThemeStyleboxOverride("tab_bg", editorBaseControl.GetThemeStylebox("DebuggerTabBG", "EditorStyles"));
             }
         }
 
@@ -258,9 +254,9 @@ namespace GodotTools
                 RectMinSize = new Vector2(0, 228) * EditorScale,
                 SizeFlagsVertical = (int)SizeFlags.ExpandFill
             };
-            panelTabs.AddStyleboxOverride("panel", editorBaseControl.GetStylebox("DebuggerPanel", "EditorStyles"));
-            panelTabs.AddStyleboxOverride("tab_fg", editorBaseControl.GetStylebox("DebuggerTabFG", "EditorStyles"));
-            panelTabs.AddStyleboxOverride("tab_bg", editorBaseControl.GetStylebox("DebuggerTabBG", "EditorStyles"));
+            panelTabs.AddThemeStyleboxOverride("panel", editorBaseControl.GetThemeStylebox("DebuggerPanel", "EditorStyles"));
+            panelTabs.AddThemeStyleboxOverride("tab_fg", editorBaseControl.GetThemeStylebox("DebuggerTabFG", "EditorStyles"));
+            panelTabs.AddThemeStyleboxOverride("tab_bg", editorBaseControl.GetThemeStylebox("DebuggerTabBG", "EditorStyles"));
             AddChild(panelTabs);
 
             {
@@ -272,7 +268,7 @@ namespace GodotTools
                 };
                 panelTabs.AddChild(panelBuildsTab);
 
-                var toolBarHBox = new HBoxContainer { SizeFlagsHorizontal = (int)SizeFlags.ExpandFill };
+                var toolBarHBox = new HBoxContainer {SizeFlagsHorizontal = (int)SizeFlags.ExpandFill};
                 panelBuildsTab.AddChild(toolBarHBox);
 
                 var buildProjectBtn = new Button
@@ -280,12 +276,12 @@ namespace GodotTools
                     Text = "Build Project".TTR(),
                     FocusMode = FocusModeEnum.None
                 };
-                buildProjectBtn.Connect("pressed", this, nameof(BuildProjectPressed));
+                buildProjectBtn.PressedSignal += BuildProjectPressed;
                 toolBarHBox.AddChild(buildProjectBtn);
 
                 toolBarHBox.AddSpacer(begin: false);
 
-                warningsBtn = new ToolButton
+                warningsBtn = new Button
                 {
                     Text = "Warnings".TTR(),
                     ToggleMode = true,
@@ -293,10 +289,10 @@ namespace GodotTools
                     Visible = false,
                     FocusMode = FocusModeEnum.None
                 };
-                warningsBtn.Connect("toggled", this, nameof(_WarningsToggled));
+                warningsBtn.Toggled += _WarningsToggled;
                 toolBarHBox.AddChild(warningsBtn);
 
-                errorsBtn = new ToolButton
+                errorsBtn = new Button
                 {
                     Text = "Errors".TTR(),
                     ToggleMode = true,
@@ -304,7 +300,7 @@ namespace GodotTools
                     Visible = false,
                     FocusMode = FocusModeEnum.None
                 };
-                errorsBtn.Connect("toggled", this, nameof(_ErrorsToggled));
+                errorsBtn.Toggled += _ErrorsToggled;
                 toolBarHBox.AddChild(errorsBtn);
 
                 toolBarHBox.AddSpacer(begin: false);
@@ -315,7 +311,7 @@ namespace GodotTools
                     FocusMode = FocusModeEnum.None,
                     Visible = false
                 };
-                viewLogBtn.Connect("pressed", this, nameof(_ViewLogPressed));
+                viewLogBtn.PressedSignal += _ViewLogPressed;
                 toolBarHBox.AddChild(viewLogBtn);
 
                 var hsc = new HSplitContainer
@@ -325,9 +321,9 @@ namespace GodotTools
                 };
                 panelBuildsTab.AddChild(hsc);
 
-                buildTabsList = new ItemList { SizeFlagsHorizontal = (int)SizeFlags.ExpandFill };
-                buildTabsList.Connect("item_selected", this, nameof(_BuildTabsItemSelected));
-                buildTabsList.Connect("nothing_selected", this, nameof(_BuildTabsNothingSelected));
+                buildTabsList = new ItemList {SizeFlagsHorizontal = (int)SizeFlags.ExpandFill};
+                buildTabsList.ItemSelected += _BuildTabsItemSelected;
+                buildTabsList.NothingSelected += _BuildTabsNothingSelected;
                 hsc.AddChild(buildTabsList);
 
                 buildTabs = new TabContainer
diff --git a/modules/mono/editor/GodotTools/GodotTools/Build/BuildSystem.cs b/modules/mono/editor/GodotTools/GodotTools/Build/BuildSystem.cs
index 43c96d2e30..d9862ae361 100644
--- a/modules/mono/editor/GodotTools/GodotTools/Build/BuildSystem.cs
+++ b/modules/mono/editor/GodotTools/GodotTools/Build/BuildSystem.cs
@@ -14,16 +14,6 @@ namespace GodotTools.Build
 {
     public static class BuildSystem
     {
-        private static string GetMsBuildPath()
-        {
-            string msbuildPath = MsBuildFinder.FindMsBuild();
-
-            if (msbuildPath == null)
-                throw new FileNotFoundException("Cannot find the MSBuild executable.");
-
-            return msbuildPath;
-        }
-
         private static string MonoWindowsBinDir
         {
             get
@@ -46,8 +36,8 @@ namespace GodotTools.Build
             {
                 if (OS.IsWindows)
                 {
-                    return (BuildManager.BuildTool)EditorSettings.GetSetting("mono/builds/build_tool")
-                           == BuildManager.BuildTool.MsBuildMono;
+                    return (BuildTool)EditorSettings.GetSetting("mono/builds/build_tool")
+                           == BuildTool.MsBuildMono;
                 }
 
                 return false;
@@ -57,16 +47,16 @@ namespace GodotTools.Build
         private static bool PrintBuildOutput =>
             (bool)EditorSettings.GetSetting("mono/builds/print_build_output");
 
-        private static Process LaunchBuild(string solution, string config, string loggerOutputDir, IEnumerable<string> customProperties = null)
+        private static Process LaunchBuild(BuildInfo buildInfo)
         {
-            var customPropertiesList = new List<string>();
+            (string msbuildPath, BuildTool buildTool) = MsBuildFinder.FindMsBuild();
 
-            if (customProperties != null)
-                customPropertiesList.AddRange(customProperties);
+            if (msbuildPath == null)
+                throw new FileNotFoundException("Cannot find the MSBuild executable.");
 
-            string compilerArgs = BuildArguments(solution, config, loggerOutputDir, customPropertiesList);
+            string compilerArgs = BuildArguments(buildTool, buildInfo);
 
-            var startInfo = new ProcessStartInfo(GetMsBuildPath(), compilerArgs);
+            var startInfo = new ProcessStartInfo(msbuildPath, compilerArgs);
 
             bool redirectOutput = !IsDebugMsBuildRequested() && !PrintBuildOutput;
 
@@ -90,7 +80,7 @@ namespace GodotTools.Build
             // Needed when running from Developer Command Prompt for VS
             RemovePlatformVariable(startInfo.EnvironmentVariables);
 
-            var process = new Process { StartInfo = startInfo };
+            var process = new Process {StartInfo = startInfo};
 
             process.Start();
 
@@ -105,19 +95,7 @@ namespace GodotTools.Build
 
         public static int Build(BuildInfo buildInfo)
         {
-            return Build(buildInfo.Solution, buildInfo.Configuration,
-                buildInfo.LogsDirPath, buildInfo.CustomProperties);
-        }
-
-        public static async Task<int> BuildAsync(BuildInfo buildInfo)
-        {
-            return await BuildAsync(buildInfo.Solution, buildInfo.Configuration,
-                buildInfo.LogsDirPath, buildInfo.CustomProperties);
-        }
-
-        public static int Build(string solution, string config, string loggerOutputDir, IEnumerable<string> customProperties = null)
-        {
-            using (var process = LaunchBuild(solution, config, loggerOutputDir, customProperties))
+            using (var process = LaunchBuild(buildInfo))
             {
                 process.WaitForExit();
 
@@ -125,9 +103,9 @@ namespace GodotTools.Build
             }
         }
 
-        public static async Task<int> BuildAsync(string solution, string config, string loggerOutputDir, IEnumerable<string> customProperties = null)
+        public static async Task<int> BuildAsync(BuildInfo buildInfo)
         {
-            using (var process = LaunchBuild(solution, config, loggerOutputDir, customProperties))
+            using (var process = LaunchBuild(buildInfo))
             {
                 await process.WaitForExitAsync();
 
@@ -135,12 +113,23 @@ namespace GodotTools.Build
             }
         }
 
-        private static string BuildArguments(string solution, string config, string loggerOutputDir, List<string> customProperties)
+        private static string BuildArguments(BuildTool buildTool, BuildInfo buildInfo)
         {
-            string arguments = $@"""{solution}"" /v:normal /t:Build ""/p:{"Configuration=" + config}"" " +
-                               $@"""/l:{typeof(GodotBuildLogger).FullName},{GodotBuildLogger.AssemblyPath};{loggerOutputDir}""";
+            string arguments = string.Empty;
+
+            if (buildTool == BuildTool.DotnetCli)
+                arguments += "msbuild"; // `dotnet msbuild` command
+
+            arguments += $@" ""{buildInfo.Solution}""";
+
+            if (buildInfo.Restore)
+                arguments += " /restore";
+
+            arguments += $@" /t:{string.Join(",", buildInfo.Targets)} " +
+                         $@"""/p:{"Configuration=" + buildInfo.Configuration}"" /v:normal " +
+                         $@"""/l:{typeof(GodotBuildLogger).FullName},{GodotBuildLogger.AssemblyPath};{buildInfo.LogsDirPath}""";
 
-            foreach (string customProperty in customProperties)
+            foreach (string customProperty in buildInfo.CustomProperties)
             {
                 arguments += " /p:" + customProperty;
             }
diff --git a/modules/mono/editor/GodotTools/GodotTools/Build/BuildTool.cs b/modules/mono/editor/GodotTools/GodotTools/Build/BuildTool.cs
new file mode 100644
index 0000000000..837c8adddb
--- /dev/null
+++ b/modules/mono/editor/GodotTools/GodotTools/Build/BuildTool.cs
@@ -0,0 +1,10 @@
+namespace GodotTools.Build
+{
+    public enum BuildTool : long
+    {
+        MsBuildMono,
+        MsBuildVs,
+        JetBrainsMsBuild,
+        DotnetCli
+    }
+}
diff --git a/modules/mono/editor/GodotTools/GodotTools/Build/MsBuildFinder.cs b/modules/mono/editor/GodotTools/GodotTools/Build/MsBuildFinder.cs
index c3db52aa9e..7bfba779fb 100644
--- a/modules/mono/editor/GodotTools/GodotTools/Build/MsBuildFinder.cs
+++ b/modules/mono/editor/GodotTools/GodotTools/Build/MsBuildFinder.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using Godot;
+using GodotTools.Ides.Rider;
 using GodotTools.Internals;
 using Directory = System.IO.Directory;
 using Environment = System.Environment;
@@ -16,69 +17,96 @@ namespace GodotTools.Build
         private static string _msbuildToolsPath = string.Empty;
         private static string _msbuildUnixPath = string.Empty;
 
-        public static string FindMsBuild()
+        public static (string, BuildTool) FindMsBuild()
         {
             var editorSettings = GodotSharpEditor.Instance.GetEditorInterface().GetEditorSettings();
-            var buildTool = (BuildManager.BuildTool)editorSettings.GetSetting("mono/builds/build_tool");
+            var buildTool = (BuildTool)editorSettings.GetSetting("mono/builds/build_tool");
 
             if (OS.IsWindows)
             {
                 switch (buildTool)
                 {
-                    case BuildManager.BuildTool.MsBuildVs:
+                    case BuildTool.DotnetCli:
                     {
-                        if (_msbuildToolsPath.Empty() || !File.Exists(_msbuildToolsPath))
+                        string dotnetCliPath = OS.PathWhich("dotnet");
+                        if (!string.IsNullOrEmpty(dotnetCliPath))
+                            return (dotnetCliPath, BuildTool.DotnetCli);
+                        GD.PushError("Cannot find dotnet CLI executable. Fallback to MSBuild from Visual Studio.");
+                        goto case BuildTool.MsBuildVs;
+                    }
+                    case BuildTool.MsBuildVs:
+                    {
+                        if (string.IsNullOrEmpty(_msbuildToolsPath) || !File.Exists(_msbuildToolsPath))
                         {
                             // Try to search it again if it wasn't found last time or if it was removed from its location
                             _msbuildToolsPath = FindMsBuildToolsPathOnWindows();
 
-                            if (_msbuildToolsPath.Empty())
-                            {
-                                throw new FileNotFoundException($"Cannot find executable for '{BuildManager.PropNameMsbuildVs}'.");
-                            }
+                            if (string.IsNullOrEmpty(_msbuildToolsPath))
+                                throw new FileNotFoundException($"Cannot find executable for '{BuildManager.PropNameMSBuildVs}'.");
                         }
 
                         if (!_msbuildToolsPath.EndsWith("\\"))
                             _msbuildToolsPath += "\\";
 
-                        return Path.Combine(_msbuildToolsPath, "MSBuild.exe");
+                        return (Path.Combine(_msbuildToolsPath, "MSBuild.exe"), BuildTool.MsBuildVs);
                     }
-                    case BuildManager.BuildTool.MsBuildMono:
+                    case BuildTool.MsBuildMono:
                     {
                         string msbuildPath = Path.Combine(Internal.MonoWindowsInstallRoot, "bin", "msbuild.bat");
 
                         if (!File.Exists(msbuildPath))
-                        {
-                            throw new FileNotFoundException($"Cannot find executable for '{BuildManager.PropNameMsbuildMono}'. Tried with path: {msbuildPath}");
-                        }
+                            throw new FileNotFoundException($"Cannot find executable for '{BuildManager.PropNameMSBuildMono}'. Tried with path: {msbuildPath}");
 
-                        return msbuildPath;
+                        return (msbuildPath, BuildTool.MsBuildMono);
+                    }
+                    case BuildTool.JetBrainsMsBuild:
+                    {
+                        var editorPath = (string)editorSettings.GetSetting(RiderPathManager.EditorPathSettingName);
+
+                        if (!File.Exists(editorPath))
+                            throw new FileNotFoundException($"Cannot find Rider executable. Tried with path: {editorPath}");
+
+                        var riderDir = new FileInfo(editorPath).Directory?.Parent;
+
+                        string msbuildPath = Path.Combine(riderDir.FullName, @"tools\MSBuild\Current\Bin\MSBuild.exe");
+
+                        if (!File.Exists(msbuildPath))
+                            throw new FileNotFoundException($"Cannot find executable for '{BuildManager.PropNameMSBuildJetBrains}'. Tried with path: {msbuildPath}");
+
+                        return (msbuildPath, BuildTool.JetBrainsMsBuild);
                     }
                     default:
                         throw new IndexOutOfRangeException("Invalid build tool in editor settings");
                 }
             }
 
-            if (OS.IsUnixLike())
+            if (OS.IsUnixLike)
             {
-                if (buildTool == BuildManager.BuildTool.MsBuildMono)
+                switch (buildTool)
                 {
-                    if (_msbuildUnixPath.Empty() || !File.Exists(_msbuildUnixPath))
+                    case BuildTool.DotnetCli:
                     {
-                        // Try to search it again if it wasn't found last time or if it was removed from its location
-                        _msbuildUnixPath = FindBuildEngineOnUnix("msbuild");
+                        string dotnetCliPath = OS.PathWhich("dotnet");
+                        if (!string.IsNullOrEmpty(dotnetCliPath))
+                            return (dotnetCliPath, BuildTool.DotnetCli);
+                        GD.PushError("Cannot find dotnet CLI executable. Fallback to MSBuild from Mono.");
+                        goto case BuildTool.MsBuildMono;
                     }
-
-                    if (_msbuildUnixPath.Empty())
+                    case BuildTool.MsBuildMono:
                     {
-                        throw new FileNotFoundException($"Cannot find binary for '{BuildManager.PropNameMsbuildMono}'");
-                    }
+                        if (string.IsNullOrEmpty(_msbuildUnixPath) || !File.Exists(_msbuildUnixPath))
+                        {
+                            // Try to search it again if it wasn't found last time or if it was removed from its location
+                            _msbuildUnixPath = FindBuildEngineOnUnix("msbuild");
+                        }
 
-                    return _msbuildUnixPath;
-                }
-                else
-                {
-                    throw new IndexOutOfRangeException("Invalid build tool in editor settings");
+                        if (string.IsNullOrEmpty(_msbuildUnixPath))
+                            throw new FileNotFoundException($"Cannot find binary for '{BuildManager.PropNameMSBuildMono}'");
+
+                        return (_msbuildUnixPath, BuildTool.MsBuildMono);
+                    }
+                    default:
+                        throw new IndexOutOfRangeException("Invalid build tool in editor settings");
                 }
             }
 
@@ -107,12 +135,12 @@ namespace GodotTools.Build
         {
             string ret = OS.PathWhich(name);
 
-            if (!ret.Empty())
+            if (!string.IsNullOrEmpty(ret))
                 return ret;
 
             string retFallback = OS.PathWhich($"{name}.exe");
 
-            if (!retFallback.Empty())
+            if (!string.IsNullOrEmpty(retFallback))
                 return retFallback;
 
             foreach (string hintDir in MsBuildHintDirs)
@@ -133,10 +161,23 @@ namespace GodotTools.Build
 
             // Try to find 15.0 with vswhere
 
-            string vsWherePath = Environment.GetEnvironmentVariable(Internal.GodotIs32Bits() ? "ProgramFiles" : "ProgramFiles(x86)");
-            vsWherePath += "\\Microsoft Visual Studio\\Installer\\vswhere.exe";
+            var envNames = Internal.GodotIs32Bits() ? new[] { "ProgramFiles", "ProgramW6432" } : new[] { "ProgramFiles(x86)", "ProgramFiles" };
+
+            string vsWherePath = null;
+            foreach (var envName in envNames)
+            {
+                vsWherePath = Environment.GetEnvironmentVariable(envName);
+                if (!string.IsNullOrEmpty(vsWherePath))
+                {
+                    vsWherePath += "\\Microsoft Visual Studio\\Installer\\vswhere.exe";
+                    if (File.Exists(vsWherePath))
+                        break;
+                }
+
+                vsWherePath = null;
+            }
 
-            var vsWhereArgs = new[] { "-latest", "-products", "*", "-requires", "Microsoft.Component.MSBuild" };
+            var vsWhereArgs = new[] {"-latest", "-products", "*", "-requires", "Microsoft.Component.MSBuild"};
 
             var outputArray = new Godot.Collections.Array<string>();
             int exitCode = Godot.OS.Execute(vsWherePath, vsWhereArgs,
@@ -164,7 +205,7 @@ namespace GodotTools.Build
 
                 string value = line.Substring(sepIdx + 1).StripEdges();
 
-                if (value.Empty())
+                if (string.IsNullOrEmpty(value))
                     throw new FormatException("installationPath value is empty");
 
                 if (!value.EndsWith("\\"))
diff --git a/modules/mono/editor/GodotTools/GodotTools/BuildInfo.cs b/modules/mono/editor/GodotTools/GodotTools/BuildInfo.cs
index 70bd552f2f..ab090c46e7 100644
--- a/modules/mono/editor/GodotTools/GodotTools/BuildInfo.cs
+++ b/modules/mono/editor/GodotTools/GodotTools/BuildInfo.cs
@@ -10,7 +10,9 @@ namespace GodotTools
     public sealed class BuildInfo : Reference // TODO Remove Reference once we have proper serialization
     {
         public string Solution { get; }
+        public string[] Targets { get; }
         public string Configuration { get; }
+        public bool Restore { get; }
         public Array<string> CustomProperties { get; } = new Array<string>(); // TODO Use List once we have proper serialization
 
         public string LogsDirPath => Path.Combine(GodotSharpDirs.BuildLogsDirs, $"{Solution.MD5Text()}_{Configuration}");
@@ -38,10 +40,12 @@ namespace GodotTools
         {
         }
 
-        public BuildInfo(string solution, string configuration)
+        public BuildInfo(string solution, string[] targets, string configuration, bool restore)
         {
             Solution = solution;
+            Targets = targets;
             Configuration = configuration;
+            Restore = restore;
         }
     }
 }
diff --git a/modules/mono/editor/GodotTools/GodotTools/BuildManager.cs b/modules/mono/editor/GodotTools/GodotTools/BuildManager.cs
index fa6bf4dafd..ff7ce97c47 100644
--- a/modules/mono/editor/GodotTools/GodotTools/BuildManager.cs
+++ b/modules/mono/editor/GodotTools/GodotTools/BuildManager.cs
@@ -3,8 +3,10 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using GodotTools.Build;
+using GodotTools.Ides.Rider;
 using GodotTools.Internals;
 using GodotTools.Utils;
+using JetBrains.Annotations;
 using static GodotTools.Internals.Globals;
 using File = GodotTools.Utils.File;
 
@@ -14,18 +16,14 @@ namespace GodotTools
     {
         private static readonly List<BuildInfo> BuildsInProgress = new List<BuildInfo>();
 
-        public const string PropNameMsbuildMono = "MSBuild (Mono)";
-        public const string PropNameMsbuildVs = "MSBuild (VS Build Tools)";
+        public const string PropNameMSBuildMono = "MSBuild (Mono)";
+        public const string PropNameMSBuildVs = "MSBuild (VS Build Tools)";
+        public const string PropNameMSBuildJetBrains = "MSBuild (JetBrains Rider)";
+        public const string PropNameDotnetCli = "dotnet CLI";
 
         public const string MsBuildIssuesFileName = "msbuild_issues.csv";
         public const string MsBuildLogFileName = "msbuild_log.txt";
 
-        public enum BuildTool
-        {
-            MsBuildMono,
-            MsBuildVs
-        }
-
         private static void RemoveOldIssuesFile(BuildInfo buildInfo)
         {
             var issuesFile = GetIssuesFilePath(buildInfo);
@@ -155,7 +153,7 @@ namespace GodotTools
             }
         }
 
-        public static bool BuildProjectBlocking(string config, IEnumerable<string> godotDefines)
+        public static bool BuildProjectBlocking(string config, [CanBeNull] string platform = null)
         {
             if (!File.Exists(GodotSharpDirs.ProjectSlnPath))
                 return true; // No solution to build
@@ -163,7 +161,7 @@ namespace GodotTools
             // Make sure the API assemblies are up to date before building the project.
             // We may not have had the chance to update the release API assemblies, and the debug ones
             // may have been deleted by the user at some point after they were loaded by the Godot editor.
-            string apiAssembliesUpdateError = Internal.UpdateApiAssembliesFromPrebuilt(config == "Release" ? "Release" : "Debug");
+            string apiAssembliesUpdateError = Internal.UpdateApiAssembliesFromPrebuilt(config == "ExportRelease" ? "Release" : "Debug");
 
             if (!string.IsNullOrEmpty(apiAssembliesUpdateError))
             {
@@ -171,27 +169,18 @@ namespace GodotTools
                 return false;
             }
 
-            var editorSettings = GodotSharpEditor.Instance.GetEditorInterface().GetEditorSettings();
-            var buildTool = (BuildTool)editorSettings.GetSetting("mono/builds/build_tool");
-
             using (var pr = new EditorProgress("mono_project_debug_build", "Building project solution...", 1))
             {
                 pr.Step("Building project solution", 0);
 
-                var buildInfo = new BuildInfo(GodotSharpDirs.ProjectSlnPath, config);
-
-                // Add Godot defines
-                string constants = buildTool == BuildTool.MsBuildVs ? "GodotDefineConstants=\"" : "GodotDefineConstants=\\\"";
+                var buildInfo = new BuildInfo(GodotSharpDirs.ProjectSlnPath, targets: new[] {"Build"}, config, restore: true);
 
-                foreach (var godotDefine in godotDefines)
-                    constants += $"GODOT_{godotDefine.ToUpper().Replace("-", "_").Replace(" ", "_").Replace(";", "_")};";
+                // If a platform was not specified, try determining the current one. If that fails, let MSBuild auto-detect it.
+                if (platform != null || OS.PlatformNameMap.TryGetValue(Godot.OS.GetName(), out platform))
+                    buildInfo.CustomProperties.Add($"GodotTargetPlatform={platform}");
 
                 if (Internal.GodotIsRealTDouble())
-                    constants += "GODOT_REAL_T_IS_DOUBLE;";
-
-                constants += buildTool == BuildTool.MsBuildVs ? "\"" : "\\\"";
-
-                buildInfo.CustomProperties.Add(constants);
+                    buildInfo.CustomProperties.Add("GodotRealTIsDouble=true");
 
                 if (!Build(buildInfo))
                 {
@@ -216,48 +205,54 @@ namespace GodotTools
             if (File.Exists(editorScriptsMetadataPath))
                 File.Copy(editorScriptsMetadataPath, playerScriptsMetadataPath);
 
-            var currentPlayRequest = GodotSharpEditor.Instance.GodotIdeManager.GodotIdeServer.CurrentPlayRequest;
-
-            if (currentPlayRequest != null)
-            {
-                if (currentPlayRequest.Value.HasDebugger)
-                {
-                    // Set the environment variable that will tell the player to connect to the IDE debugger
-                    // TODO: We should probably add a better way to do this
-                    Environment.SetEnvironmentVariable("GODOT_MONO_DEBUGGER_AGENT",
-                        "--debugger-agent=transport=dt_socket" +
-                        $",address={currentPlayRequest.Value.DebuggerHost}:{currentPlayRequest.Value.DebuggerPort}" +
-                        ",server=n");
-                }
-
+            if (GodotSharpEditor.Instance.SkipBuildBeforePlaying)
                 return true; // Requested play from an external editor/IDE which already built the project
-            }
 
-            var godotDefines = new[]
-            {
-                Godot.OS.GetName(),
-                Internal.GodotIs32Bits() ? "32" : "64"
-            };
-
-            return BuildProjectBlocking("Tools", godotDefines);
+            return BuildProjectBlocking("Debug");
         }
 
         public static void Initialize()
         {
             // Build tool settings
+            var editorSettings = GodotSharpEditor.Instance.GetEditorInterface().GetEditorSettings();
 
-            EditorDef("mono/builds/build_tool", OS.IsWindows ? BuildTool.MsBuildVs : BuildTool.MsBuildMono);
+            BuildTool msbuildDefault;
 
-            var editorSettings = GodotSharpEditor.Instance.GetEditorInterface().GetEditorSettings();
+            if (OS.IsWindows)
+            {
+                if (RiderPathManager.IsExternalEditorSetToRider(editorSettings))
+                    msbuildDefault = BuildTool.JetBrainsMsBuild;
+                else
+                    msbuildDefault = !string.IsNullOrEmpty(OS.PathWhich("dotnet")) ? BuildTool.DotnetCli : BuildTool.MsBuildVs;
+            }
+            else
+            {
+                msbuildDefault = !string.IsNullOrEmpty(OS.PathWhich("dotnet")) ? BuildTool.DotnetCli : BuildTool.MsBuildMono;
+            }
+
+            EditorDef("mono/builds/build_tool", msbuildDefault);
+
+            string hintString;
+
+            if (OS.IsWindows)
+            {
+                hintString = $"{PropNameMSBuildMono}:{(int)BuildTool.MsBuildMono}," +
+                             $"{PropNameMSBuildVs}:{(int)BuildTool.MsBuildVs}," +
+                             $"{PropNameMSBuildJetBrains}:{(int)BuildTool.JetBrainsMsBuild}," +
+                             $"{PropNameDotnetCli}:{(int)BuildTool.DotnetCli}";
+            }
+            else
+            {
+                hintString = $"{PropNameMSBuildMono}:{(int)BuildTool.MsBuildMono}," +
+                             $"{PropNameDotnetCli}:{(int)BuildTool.DotnetCli}";
+            }
 
             editorSettings.AddPropertyInfo(new Godot.Collections.Dictionary
             {
                 ["type"] = Godot.Variant.Type.Int,
                 ["name"] = "mono/builds/build_tool",
                 ["hint"] = Godot.PropertyHint.Enum,
-                ["hint_string"] = OS.IsWindows ?
-                    $"{PropNameMsbuildMono},{PropNameMsbuildVs}" :
-                    $"{PropNameMsbuildMono}"
+                ["hint_string"] = hintString
             });
 
             EditorDef("mono/builds/print_build_output", false);
diff --git a/modules/mono/editor/GodotTools/GodotTools/BuildTab.cs b/modules/mono/editor/GodotTools/GodotTools/BuildTab.cs
index 727581daab..8596cd24af 100644
--- a/modules/mono/editor/GodotTools/GodotTools/BuildTab.cs
+++ b/modules/mono/editor/GodotTools/GodotTools/BuildTab.cs
@@ -41,17 +41,17 @@ namespace GodotTools
         public bool ErrorsVisible { get; set; } = true;
         public bool WarningsVisible { get; set; } = true;
 
-        public Texture IconTexture
+        public Texture2D IconTexture
         {
             get
             {
                 if (!BuildExited)
-                    return GetIcon("Stop", "EditorIcons");
+                    return GetThemeIcon("Stop", "EditorIcons");
 
                 if (BuildResult == BuildResults.Error)
-                    return GetIcon("StatusError", "EditorIcons");
+                    return GetThemeIcon("StatusError", "EditorIcons");
 
-                return GetIcon("StatusSuccess", "EditorIcons");
+                return GetThemeIcon("StatusSuccess", "EditorIcons");
             }
         }
 
@@ -72,7 +72,7 @@ namespace GodotTools
                     {
                         string[] csvColumns = file.GetCsvLine();
 
-                        if (csvColumns.Length == 1 && csvColumns[0].Empty())
+                        if (csvColumns.Length == 1 && string.IsNullOrEmpty(csvColumns[0]))
                             return;
 
                         if (csvColumns.Length != 7)
@@ -113,14 +113,14 @@ namespace GodotTools
                 throw new IndexOutOfRangeException("Item list index out of range");
 
             // Get correct issue idx from issue list
-            int issueIndex = (int)issuesList.GetItemMetadata(idx);
+            int issueIndex = (int)(long)issuesList.GetItemMetadata(idx);
 
-            if (idx < 0 || idx >= issues.Count)
+            if (issueIndex < 0 || issueIndex >= issues.Count)
                 throw new IndexOutOfRangeException("Issue index out of range");
 
             BuildIssue issue = issues[issueIndex];
 
-            if (issue.ProjectFile.Empty() && issue.File.Empty())
+            if (string.IsNullOrEmpty(issue.ProjectFile) && string.IsNullOrEmpty(issue.File))
                 return;
 
             string projectDir = issue.ProjectFile.Length > 0 ? issue.ProjectFile.GetBaseDir() : BuildInfo.Solution.GetBaseDir();
@@ -145,8 +145,8 @@ namespace GodotTools
         {
             issuesList.Clear();
 
-            using (var warningIcon = GetIcon("Warning", "EditorIcons"))
-            using (var errorIcon = GetIcon("Error", "EditorIcons"))
+            using (var warningIcon = GetThemeIcon("Warning", "EditorIcons"))
+            using (var errorIcon = GetThemeIcon("Error", "EditorIcons"))
             {
                 for (int i = 0; i < issues.Count; i++)
                 {
@@ -158,14 +158,14 @@ namespace GodotTools
                     string tooltip = string.Empty;
                     tooltip += $"Message: {issue.Message}";
 
-                    if (!issue.Code.Empty())
+                    if (!string.IsNullOrEmpty(issue.Code))
                         tooltip += $"\nCode: {issue.Code}";
 
                     tooltip += $"\nType: {(issue.Warning ? "warning" : "error")}";
 
                     string text = string.Empty;
 
-                    if (!issue.File.Empty())
+                    if (!string.IsNullOrEmpty(issue.File))
                     {
                         text += $"{issue.File}({issue.Line},{issue.Column}): ";
 
@@ -174,7 +174,7 @@ namespace GodotTools
                         tooltip += $"\nColumn: {issue.Column}";
                     }
 
-                    if (!issue.ProjectFile.Empty())
+                    if (!string.IsNullOrEmpty(issue.ProjectFile))
                         tooltip += $"\nProject: {issue.ProjectFile}";
 
                     text += issue.Message;
@@ -251,7 +251,7 @@ namespace GodotTools
             base._Ready();
 
             issuesList = new ItemList { SizeFlagsVertical = (int)SizeFlags.ExpandFill };
-            issuesList.Connect("item_activated", this, nameof(_IssueActivated));
+            issuesList.ItemActivated += _IssueActivated;
             AddChild(issuesList);
         }
 
diff --git a/modules/mono/editor/GodotTools/GodotTools/CsProjOperations.cs b/modules/mono/editor/GodotTools/GodotTools/CsProjOperations.cs
index 9abfda4538..1d800b8151 100644
--- a/modules/mono/editor/GodotTools/GodotTools/CsProjOperations.cs
+++ b/modules/mono/editor/GodotTools/GodotTools/CsProjOperations.cs
@@ -1,9 +1,9 @@
 using Godot;
 using System;
+using System.Linq;
 using Godot.Collections;
 using GodotTools.Internals;
 using GodotTools.ProjectEditor;
-using static GodotTools.Internals.Globals;
 using File = GodotTools.Utils.File;
 using Directory = GodotTools.Utils.Directory;
 
@@ -15,7 +15,7 @@ namespace GodotTools
         {
             try
             {
-                return ProjectGenerator.GenGameProject(dir, name, compileItems: new string[] { });
+                return ProjectGenerator.GenAndSaveGameProject(dir, name);
             }
             catch (Exception e)
             {
@@ -24,26 +24,6 @@ namespace GodotTools
             }
         }
 
-        public static void AddItem(string projectPath, string itemType, string include)
-        {
-            if (!(bool)GlobalDef("mono/project/auto_update_project", true))
-                return;
-
-            ProjectUtils.AddItemToProjectChecked(projectPath, itemType, include);
-        }
-
-        public static void FixApiHintPath(string projectPath)
-        {
-            try
-            {
-                ProjectUtils.FixApiHintPath(projectPath);
-            }
-            catch (Exception e)
-            {
-                GD.PushError(e.ToString());
-            }
-        }
-
         private static readonly DateTime Epoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
 
         private static ulong ConvertToTimestamp(this DateTime value)
@@ -52,81 +32,77 @@ namespace GodotTools
             return (ulong)elapsedTime.TotalSeconds;
         }
 
-        public static void GenerateScriptsMetadata(string projectPath, string outputPath)
+        private static bool TryParseFileMetadata(string includeFile, ulong modifiedTime, out Dictionary fileMetadata)
         {
-            if (File.Exists(outputPath))
-                File.Delete(outputPath);
+            fileMetadata = null;
 
-            var oldDict = Internal.GetScriptsMetadataOrNothing();
-            var newDict = new Godot.Collections.Dictionary<string, object>();
+            var parseError = ScriptClassParser.ParseFile(includeFile, out var classes, out string errorStr);
 
-            foreach (var includeFile in ProjectUtils.GetIncludeFiles(projectPath, "Compile"))
+            if (parseError != Error.Ok)
             {
-                string projectIncludeFile = ("res://" + includeFile).SimplifyGodotPath();
+                GD.PushError($"Failed to determine namespace and class for script: {includeFile}. Parse error: {errorStr ?? parseError.ToString()}");
+                return false;
+            }
 
-                ulong modifiedTime = File.GetLastWriteTime(projectIncludeFile).ConvertToTimestamp();
+            string searchName = System.IO.Path.GetFileNameWithoutExtension(includeFile);
 
-                if (oldDict.TryGetValue(projectIncludeFile, out var oldFileVar))
-                {
-                    var oldFileDict = (Dictionary)oldFileVar;
-
-                    if (ulong.TryParse(oldFileDict["modified_time"] as string, out ulong storedModifiedTime))
-                    {
-                        if (storedModifiedTime == modifiedTime)
-                        {
-                            // No changes so no need to parse again
-                            newDict[projectIncludeFile] = oldFileDict;
-                            continue;
-                        }
-                    }
-                }
+            var firstMatch = classes.FirstOrDefault(classDecl =>
+                    classDecl.BaseCount != 0 && // If it doesn't inherit anything, it can't be a Godot.Object.
+                    classDecl.SearchName == searchName // Filter by the name we're looking for
+            );
 
-                Error parseError = ScriptClassParser.ParseFile(projectIncludeFile, out var classes, out string errorStr);
-                if (parseError != Error.Ok)
+            if (firstMatch == null)
+                return false; // Not found
+
+            fileMetadata = new Dictionary
+            {
+                ["modified_time"] = $"{modifiedTime}",
+                ["class"] = new Dictionary
                 {
-                    GD.PushError($"Failed to determine namespace and class for script: {projectIncludeFile}. Parse error: {errorStr ?? parseError.ToString()}");
-                    continue;
+                    ["namespace"] = firstMatch.Namespace,
+                    ["class_name"] = firstMatch.Name,
+                    ["nested"] = firstMatch.Nested
                 }
+            };
 
-                string searchName = System.IO.Path.GetFileNameWithoutExtension(projectIncludeFile);
-
-                var classDict = new Dictionary();
+            return true;
+        }
 
-                foreach (var classDecl in classes)
-                {
-                    if (classDecl.BaseCount == 0)
-                        continue; // Does not inherit nor implement anything, so it can't be a script class
+        public static void GenerateScriptsMetadata(string projectPath, string outputPath)
+        {
+            var metadataDict = Internal.GetScriptsMetadataOrNothing().Duplicate();
 
-                    string classCmp = classDecl.Nested ?
-                        classDecl.Name.Substring(classDecl.Name.LastIndexOf(".", StringComparison.Ordinal) + 1) :
-                        classDecl.Name;
+            bool IsUpToDate(string includeFile, ulong modifiedTime)
+            {
+                return metadataDict.TryGetValue(includeFile, out var oldFileVar) &&
+                       ulong.TryParse(((Dictionary)oldFileVar)["modified_time"] as string,
+                           out ulong storedModifiedTime) && storedModifiedTime == modifiedTime;
+            }
 
-                    if (classCmp != searchName)
-                        continue;
+            var outdatedFiles = ProjectUtils.GetIncludeFiles(projectPath, "Compile")
+                .Select(path => ("res://" + path).SimplifyGodotPath())
+                .ToDictionary(path => path, path => File.GetLastWriteTime(path).ConvertToTimestamp())
+                .Where(pair => !IsUpToDate(includeFile: pair.Key, modifiedTime: pair.Value))
+                .ToArray();
 
-                    classDict["namespace"] = classDecl.Namespace;
-                    classDict["class_name"] = classDecl.Name;
-                    classDict["nested"] = classDecl.Nested;
-                    break;
-                }
+            foreach (var pair in outdatedFiles)
+            {
+                metadataDict.Remove(pair.Key);
 
-                if (classDict.Count == 0)
-                    continue; // Not found
+                string includeFile = pair.Key;
 
-                newDict[projectIncludeFile] = new Dictionary { ["modified_time"] = $"{modifiedTime}", ["class"] = classDict };
+                if (TryParseFileMetadata(includeFile, modifiedTime: pair.Value, out var fileMetadata))
+                    metadataDict[includeFile] = fileMetadata;
             }
 
-            if (newDict.Count > 0)
-            {
-                string json = JSON.Print(newDict);
+            string json = metadataDict.Count <= 0 ? "{}" : JSON.Print(metadataDict);
 
-                string baseDir = outputPath.GetBaseDir();
+            string baseDir = outputPath.GetBaseDir();
 
-                if (!Directory.Exists(baseDir))
-                    Directory.CreateDirectory(baseDir);
+            if (!Directory.Exists(baseDir))
+                Directory.CreateDirectory(baseDir);
 
-                File.WriteAllText(outputPath, json);
-            }
+            File.WriteAllText(outputPath, json);
         }
     }
 }
diff --git a/modules/mono/editor/GodotTools/GodotTools/Export/AotBuilder.cs b/modules/mono/editor/GodotTools/GodotTools/Export/AotBuilder.cs
new file mode 100755
index 0000000000..42ede3f3f3
--- /dev/null
+++ b/modules/mono/editor/GodotTools/GodotTools/Export/AotBuilder.cs
@@ -0,0 +1,618 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text;
+using GodotTools.Internals;
+using Directory = GodotTools.Utils.Directory;
+using File = GodotTools.Utils.File;
+using OS = GodotTools.Utils.OS;
+using Path = System.IO.Path;
+
+namespace GodotTools.Export
+{
+    public struct AotOptions
+    {
+        public bool EnableLLVM;
+        public bool LLVMOnly;
+        public string LLVMPath;
+        public string LLVMOutputPath;
+
+        public bool FullAot;
+
+        private bool _useInterpreter;
+        public bool UseInterpreter { get => _useInterpreter && !LLVMOnly; set => _useInterpreter = value; }
+
+        public string[] ExtraAotOptions;
+        public string[] ExtraOptimizerOptions;
+
+        public string ToolchainPath;
+    }
+
+    public static class AotBuilder
+    {
+        public static void CompileAssemblies(ExportPlugin exporter, AotOptions aotOpts, string[] features, string platform, bool isDebug, string bclDir, string outputDir, string outputDataDir, IDictionary<string, string> assemblies)
+        {
+            // TODO: WASM
+
+            string aotTempDir = Path.Combine(Path.GetTempPath(), $"godot-aot-{Process.GetCurrentProcess().Id}");
+
+            if (!Directory.Exists(aotTempDir))
+                Directory.CreateDirectory(aotTempDir);
+
+            var assembliesPrepared = new Dictionary<string, string>();
+
+            foreach (var dependency in assemblies)
+            {
+                string assemblyName = dependency.Key;
+                string assemblyPath = dependency.Value;
+
+                string assemblyPathInBcl = Path.Combine(bclDir, assemblyName + ".dll");
+
+                if (File.Exists(assemblyPathInBcl))
+                {
+                    // Don't create teporaries for assemblies from the BCL
+                    assembliesPrepared.Add(assemblyName, assemblyPathInBcl);
+                }
+                else
+                {
+                    string tempAssemblyPath = Path.Combine(aotTempDir, assemblyName + ".dll");
+                    File.Copy(assemblyPath, tempAssemblyPath);
+                    assembliesPrepared.Add(assemblyName, tempAssemblyPath);
+                }
+            }
+
+            if (platform == OS.Platforms.iOS)
+            {
+                var architectures = GetEnablediOSArchs(features).ToArray();
+                CompileAssembliesForiOS(exporter, isDebug, architectures, aotOpts, aotTempDir, assembliesPrepared, bclDir);
+            }
+            else if (platform == OS.Platforms.Android)
+            {
+                var abis = GetEnabledAndroidAbis(features).ToArray();
+                CompileAssembliesForAndroid(exporter, isDebug, abis, aotOpts, aotTempDir, assembliesPrepared, bclDir);
+            }
+            else
+            {
+                string bits = features.Contains("64") ? "64" : features.Contains("32") ? "32" : null;
+                CompileAssembliesForDesktop(exporter, platform, isDebug, bits, aotOpts, aotTempDir, outputDataDir, assembliesPrepared, bclDir);
+            }
+        }
+
+        public static void CompileAssembliesForAndroid(ExportPlugin exporter, bool isDebug, string[] abis, AotOptions aotOpts, string aotTempDir, IDictionary<string, string> assemblies, string bclDir)
+        {
+
+            foreach (var assembly in assemblies)
+            {
+                string assemblyName = assembly.Key;
+                string assemblyPath = assembly.Value;
+
+                // Not sure if the 'lib' prefix is an Android thing or just Godot being picky,
+                // but we use '-aot-' as well just in case to avoid conflicts with other libs.
+                string outputFileName = "lib-aot-" + assemblyName + ".dll.so";
+
+                foreach (string abi in abis)
+                {
+                    string aotAbiTempDir = Path.Combine(aotTempDir, abi);
+                    string soFilePath = Path.Combine(aotAbiTempDir, outputFileName);
+
+                    var compilerArgs = GetAotCompilerArgs(OS.Platforms.Android, isDebug, abi, aotOpts, assemblyPath, soFilePath);
+
+                    // Make sure the output directory exists
+                    Directory.CreateDirectory(aotAbiTempDir);
+
+                    string compilerDirPath = Path.Combine(GodotSharpDirs.DataEditorToolsDir, "aot-compilers", $"{OS.Platforms.Android}-{abi}");
+
+                    ExecuteCompiler(FindCrossCompiler(compilerDirPath), compilerArgs, bclDir);
+
+                    // The Godot exporter expects us to pass the abi in the tags parameter
+                    exporter.AddSharedObject(soFilePath, tags: new[] { abi });
+                }
+            }
+        }
+
+        public static void CompileAssembliesForDesktop(ExportPlugin exporter, string platform, bool isDebug, string bits, AotOptions aotOpts, string aotTempDir, string outputDataDir, IDictionary<string, string> assemblies, string bclDir)
+        {
+            foreach (var assembly in assemblies)
+            {
+                string assemblyName = assembly.Key;
+                string assemblyPath = assembly.Value;
+
+                string outputFileExtension = platform == OS.Platforms.Windows ? ".dll" :
+                    platform == OS.Platforms.OSX ? ".dylib" :
+                    ".so";
+
+                string outputFileName = assemblyName + ".dll" + outputFileExtension;
+                string tempOutputFilePath = Path.Combine(aotTempDir, outputFileName);
+
+                var compilerArgs = GetAotCompilerArgs(platform, isDebug, bits, aotOpts, assemblyPath, tempOutputFilePath);
+
+                string compilerDirPath = GetMonoCrossDesktopDirName(platform, bits);
+
+                ExecuteCompiler(FindCrossCompiler(compilerDirPath), compilerArgs, bclDir);
+
+                if (platform == OS.Platforms.OSX)
+                {
+                    exporter.AddSharedObject(tempOutputFilePath, tags: null);
+                }
+                else
+                {
+                    string outputDataLibDir = Path.Combine(outputDataDir, "Mono", platform == OS.Platforms.Windows ? "bin" : "lib");
+                    File.Copy(tempOutputFilePath, Path.Combine(outputDataLibDir, outputFileName));
+                }
+            }
+        }
+
+        public static void CompileAssembliesForiOS(ExportPlugin exporter, bool isDebug, string[] architectures, AotOptions aotOpts, string aotTempDir, IDictionary<string, string> assemblies, string bclDir)
+        {
+            var cppCode = new StringBuilder();
+            var aotModuleInfoSymbols = new List<string>(assemblies.Count);
+
+            // {arch: paths}
+            var objFilePathsForiOSArch = architectures.ToDictionary(arch => arch, arch => new List<string>(assemblies.Count));
+
+            foreach (var assembly in assemblies)
+            {
+                string assemblyName = assembly.Key;
+                string assemblyPath = assembly.Value;
+
+                string asmFileName = assemblyName + ".dll.S";
+                string objFileName = assemblyName + ".dll.o";
+
+                foreach (string arch in architectures)
+                {
+                    string aotArchTempDir = Path.Combine(aotTempDir, arch);
+                    string asmFilePath = Path.Combine(aotArchTempDir, asmFileName);
+
+                    var compilerArgs = GetAotCompilerArgs(OS.Platforms.iOS, isDebug, arch, aotOpts, assemblyPath, asmFilePath);
+
+                    // Make sure the output directory exists
+                    Directory.CreateDirectory(aotArchTempDir);
+
+                    string compilerDirPath = Path.Combine(GodotSharpDirs.DataEditorToolsDir, "aot-compilers", $"{OS.Platforms.iOS}-{arch}");
+
+                    ExecuteCompiler(FindCrossCompiler(compilerDirPath), compilerArgs, bclDir);
+
+                    // Assembling
+                    bool isSim = arch == "i386" || arch == "x86_64"; // Shouldn't really happen as we don't do AOT for the simulator
+                    string versionMinName = isSim ? "iphonesimulator" : "iphoneos";
+                    string iOSPlatformName = isSim ? "iPhoneSimulator" : "iPhoneOS";
+                    const string versionMin = "10.0"; // TODO: Turn this hard-coded version into an exporter setting
+                    string iOSSdkPath = Path.Combine(XcodeHelper.XcodePath,
+                            $"Contents/Developer/Platforms/{iOSPlatformName}.platform/Developer/SDKs/{iOSPlatformName}.sdk");
+
+                    string objFilePath = Path.Combine(aotArchTempDir, objFileName);
+
+                    var clangArgs = new List<string>()
+                    {
+                        "-isysroot", iOSSdkPath,
+                        "-Qunused-arguments",
+                        $"-m{versionMinName}-version-min={versionMin}",
+                        "-arch", arch,
+                        "-c",
+                        "-o", objFilePath,
+                        "-x", "assembler"
+                    };
+
+                    if (isDebug)
+                        clangArgs.Add("-DDEBUG");
+
+                    clangArgs.Add(asmFilePath);
+
+                    int clangExitCode = OS.ExecuteCommand(XcodeHelper.FindXcodeTool("clang"), clangArgs);
+                    if (clangExitCode != 0)
+                        throw new Exception($"Command 'clang' exited with code: {clangExitCode}");
+
+                    objFilePathsForiOSArch[arch].Add(objFilePath);
+                }
+
+                aotModuleInfoSymbols.Add($"mono_aot_module_{AssemblyNameToAotSymbol(assemblyName)}_info");
+            }
+
+            // Generate driver code
+            cppCode.AppendLine("#if defined(__arm__) || defined(__arm64__) || defined(__aarch64__)");
+            cppCode.AppendLine("#define IOS_DEVICE");
+            cppCode.AppendLine("#endif");
+
+            cppCode.AppendLine("#ifdef IOS_DEVICE");
+            cppCode.AppendLine("extern \"C\" {");
+            cppCode.AppendLine("// Mono API");
+            cppCode.AppendLine(@"
+typedef enum {
+MONO_AOT_MODE_NONE,
+MONO_AOT_MODE_NORMAL,
+MONO_AOT_MODE_HYBRID,
+MONO_AOT_MODE_FULL,
+MONO_AOT_MODE_LLVMONLY,
+MONO_AOT_MODE_INTERP,
+MONO_AOT_MODE_INTERP_LLVMONLY,
+MONO_AOT_MODE_LLVMONLY_INTERP,
+MONO_AOT_MODE_LAST = 1000,
+} MonoAotMode;");
+            cppCode.AppendLine("void mono_jit_set_aot_mode(MonoAotMode);");
+            cppCode.AppendLine("void mono_aot_register_module(void *);");
+
+            if (aotOpts.UseInterpreter)
+            {
+                cppCode.AppendLine("void mono_ee_interp_init(const char *);");
+                cppCode.AppendLine("void mono_icall_table_init();");
+                cppCode.AppendLine("void mono_marshal_ilgen_init();");
+                cppCode.AppendLine("void mono_method_builder_ilgen_init();");
+                cppCode.AppendLine("void mono_sgen_mono_ilgen_init();");
+            }
+
+            foreach (string symbol in aotModuleInfoSymbols)
+                cppCode.AppendLine($"extern void *{symbol};");
+
+            cppCode.AppendLine("void gd_mono_setup_aot() {");
+
+            foreach (string symbol in aotModuleInfoSymbols)
+                cppCode.AppendLine($"\tmono_aot_register_module({symbol});");
+
+            if (aotOpts.UseInterpreter)
+            {
+                cppCode.AppendLine("\tmono_icall_table_init();");
+                cppCode.AppendLine("\tmono_marshal_ilgen_init();");
+                cppCode.AppendLine("\tmono_method_builder_ilgen_init();");
+                cppCode.AppendLine("\tmono_sgen_mono_ilgen_init();");
+                cppCode.AppendLine("\tmono_ee_interp_init(0);");
+            }
+
+            string aotModeStr = null;
+
+            if (aotOpts.LLVMOnly)
+            {
+                aotModeStr = "MONO_AOT_MODE_LLVMONLY"; // --aot=llvmonly
+            }
+            else
+            {
+                if (aotOpts.UseInterpreter)
+                    aotModeStr = "MONO_AOT_MODE_INTERP"; // --aot=interp or --aot=interp,full
+                else if (aotOpts.FullAot)
+                    aotModeStr = "MONO_AOT_MODE_FULL"; // --aot=full
+            }
+
+            // One of the options above is always set for iOS
+            Debug.Assert(aotModeStr != null);
+
+            cppCode.AppendLine($"\tmono_jit_set_aot_mode({aotModeStr});");
+
+            cppCode.AppendLine("} // gd_mono_setup_aot");
+            cppCode.AppendLine("} // extern \"C\"");
+            cppCode.AppendLine("#endif // IOS_DEVICE");
+
+            // Add the driver code to the Xcode project
+            exporter.AddIosCppCode(cppCode.ToString());
+
+            // Archive the AOT object files into a static library
+
+            var arFilePathsForAllArchs = new List<string>();
+            string projectAssemblyName = GodotSharpEditor.ProjectAssemblyName;
+
+            foreach (var archPathsPair in objFilePathsForiOSArch)
+            {
+                string arch = archPathsPair.Key;
+                var objFilePaths = archPathsPair.Value;
+
+                string arOutputFilePath = Path.Combine(aotTempDir, $"lib-aot-{projectAssemblyName}.{arch}.a");
+
+                var arArgs = new List<string>()
+                {
+                    "cr",
+                    arOutputFilePath
+                };
+
+                foreach (string objFilePath in objFilePaths)
+                    arArgs.Add(objFilePath);
+
+                int arExitCode = OS.ExecuteCommand(XcodeHelper.FindXcodeTool("ar"), arArgs);
+                if (arExitCode != 0)
+                    throw new Exception($"Command 'ar' exited with code: {arExitCode}");
+
+                arFilePathsForAllArchs.Add(arOutputFilePath);
+            }
+
+            // It's lipo time
+
+            string fatOutputFileName = $"lib-aot-{projectAssemblyName}.fat.a";
+            string fatOutputFilePath = Path.Combine(aotTempDir, fatOutputFileName);
+
+            var lipoArgs = new List<string>();
+            lipoArgs.Add("-create");
+            lipoArgs.AddRange(arFilePathsForAllArchs);
+            lipoArgs.Add("-output");
+            lipoArgs.Add(fatOutputFilePath);
+
+            int lipoExitCode = OS.ExecuteCommand(XcodeHelper.FindXcodeTool("lipo"), lipoArgs);
+            if (lipoExitCode != 0)
+                throw new Exception($"Command 'lipo' exited with code: {lipoExitCode}");
+
+            // TODO: Add the AOT lib and interpreter libs as device only to suppress warnings when targeting the simulator
+
+            // Add the fat AOT static library to the Xcode project
+            exporter.AddIosProjectStaticLib(fatOutputFilePath);
+
+            // Add the required Mono libraries to the Xcode project
+
+            string MonoLibFile(string libFileName) => libFileName + ".iphone.fat.a";
+
+            string MonoLibFromTemplate(string libFileName) =>
+                Path.Combine(Internal.FullTemplatesDir, "iphone-mono-libs", MonoLibFile(libFileName));
+
+            exporter.AddIosProjectStaticLib(MonoLibFromTemplate("libmonosgen-2.0"));
+
+            exporter.AddIosProjectStaticLib(MonoLibFromTemplate("libmono-native"));
+
+            if (aotOpts.UseInterpreter)
+            {
+                exporter.AddIosProjectStaticLib(MonoLibFromTemplate("libmono-ee-interp"));
+                exporter.AddIosProjectStaticLib(MonoLibFromTemplate("libmono-icall-table"));
+                exporter.AddIosProjectStaticLib(MonoLibFromTemplate("libmono-ilgen"));
+            }
+
+            // TODO: Turn into an exporter option
+            bool enableProfiling = false;
+            if (enableProfiling)
+                exporter.AddIosProjectStaticLib(MonoLibFromTemplate("libmono-profiler-log"));
+
+            // Add frameworks required by Mono to the Xcode project
+            exporter.AddIosFramework("libiconv.tbd");
+            exporter.AddIosFramework("GSS.framework");
+            exporter.AddIosFramework("CFNetwork.framework");
+
+            // Force load and export dynamic are needed for the linker to not strip required symbols.
+            // In theory we shouldn't be relying on this for P/Invoked functions (as is the case with
+            // functions in System.Native/libmono-native). Instead, we should use cecil to search for
+            // DllImports in assemblies and pass them to 'ld' as '-u/--undefined {pinvoke_symbol}'.
+            exporter.AddIosLinkerFlags("-rdynamic");
+            exporter.AddIosLinkerFlags($"-force_load \"$(SRCROOT)/{MonoLibFile("libmono-native")}\"");
+        }
+
+        /// Converts an assembly name to a valid symbol name in the same way the AOT compiler does
+        private static string AssemblyNameToAotSymbol(string assemblyName)
+        {
+            var builder = new StringBuilder();
+
+            foreach (var charByte in Encoding.UTF8.GetBytes(assemblyName))
+            {
+                char @char = (char)charByte;
+                builder.Append(Char.IsLetterOrDigit(@char) || @char == '_' ? @char : '_');
+            }
+
+            return builder.ToString();
+        }
+
+        private static IEnumerable<string> GetAotCompilerArgs(string platform, bool isDebug, string target, AotOptions aotOpts, string assemblyPath, string outputFilePath)
+        {
+            // TODO: LLVM
+
+            bool aotSoftDebug = isDebug && !aotOpts.EnableLLVM;
+            bool aotDwarfDebug = platform == OS.Platforms.iOS;
+
+            var aotOptions = new List<string>();
+            var optimizerOptions = new List<string>();
+
+            if (aotOpts.LLVMOnly)
+            {
+                aotOptions.Add("llvmonly");
+            }
+            else
+            {
+                // Can be both 'interp' and 'full'
+                if (aotOpts.UseInterpreter)
+                    aotOptions.Add("interp");
+                if (aotOpts.FullAot)
+                    aotOptions.Add("full");
+            }
+
+            aotOptions.Add(aotSoftDebug ? "soft-debug" : "nodebug");
+
+            if (aotDwarfDebug)
+                aotOptions.Add("dwarfdebug");
+
+            if (platform == OS.Platforms.Android)
+            {
+                string abi = target;
+
+                string androidToolchain = aotOpts.ToolchainPath;
+
+                if (string.IsNullOrEmpty(androidToolchain))
+                {
+                    androidToolchain = Path.Combine(GodotSharpDirs.DataEditorToolsDir, "android-toolchains", $"{abi}"); // TODO: $"{abi}-{apiLevel}{(clang?"clang":"")}"
+
+                    if (!Directory.Exists(androidToolchain))
+                        throw new FileNotFoundException("Missing android toolchain. Specify one in the AOT export settings.");
+                }
+                else if (!Directory.Exists(androidToolchain))
+                {
+                    throw new FileNotFoundException("Android toolchain not found: " + androidToolchain);
+                }
+
+                var androidToolPrefixes = new Dictionary<string, string>
+                {
+                    ["armeabi-v7a"] = "arm-linux-androideabi-",
+                    ["arm64-v8a"] = "aarch64-linux-android-",
+                    ["x86"] = "i686-linux-android-",
+                    ["x86_64"] = "x86_64-linux-android-"
+                };
+
+                aotOptions.Add("tool-prefix=" + Path.Combine(androidToolchain, "bin", androidToolPrefixes[abi]));
+
+                string triple = GetAndroidTriple(abi);
+                aotOptions.Add($"mtriple={triple}");
+            }
+            else if (platform == OS.Platforms.iOS)
+            {
+                if (!aotOpts.LLVMOnly && !aotOpts.UseInterpreter)
+                    optimizerOptions.Add("gsharedvt");
+
+                aotOptions.Add("static");
+
+                // I couldn't get the Mono cross-compiler to do assembling, so we'll have to do it ourselves
+                aotOptions.Add("asmonly");
+
+                aotOptions.Add("direct-icalls");
+
+                if (aotSoftDebug)
+                    aotOptions.Add("no-direct-calls");
+
+                if (aotOpts.LLVMOnly || !aotOpts.UseInterpreter)
+                    aotOptions.Add("direct-pinvoke");
+
+                string arch = target;
+                aotOptions.Add($"mtriple={arch}-ios");
+            }
+
+            aotOptions.Add($"outfile={outputFilePath}");
+
+            if (aotOpts.EnableLLVM)
+            {
+                aotOptions.Add($"llvm-path={aotOpts.LLVMPath}");
+                aotOptions.Add($"llvm-outfile={aotOpts.LLVMOutputPath}");
+            }
+
+            if (aotOpts.ExtraAotOptions.Length > 0)
+                aotOptions.AddRange(aotOpts.ExtraAotOptions);
+
+            if (aotOpts.ExtraOptimizerOptions.Length > 0)
+                optimizerOptions.AddRange(aotOpts.ExtraOptimizerOptions);
+
+            string EscapeOption(string option) => option.Contains(',') ? $"\"{option}\"" : option;
+            string OptionsToString(IEnumerable<string> options) => string.Join(",", options.Select(EscapeOption));
+
+            var runtimeArgs = new List<string>();
+
+            // The '--debug' runtime option is required when using the 'soft-debug' and 'dwarfdebug' AOT options
+            if (aotSoftDebug || aotDwarfDebug)
+                runtimeArgs.Add("--debug");
+
+            if (aotOpts.EnableLLVM)
+                runtimeArgs.Add("--llvm");
+
+            runtimeArgs.Add(aotOptions.Count > 0 ? $"--aot={OptionsToString(aotOptions)}" : "--aot");
+
+            if (optimizerOptions.Count > 0)
+                runtimeArgs.Add($"-O={OptionsToString(optimizerOptions)}");
+
+            runtimeArgs.Add(assemblyPath);
+
+            return runtimeArgs;
+        }
+
+        private static void ExecuteCompiler(string compiler, IEnumerable<string> compilerArgs, string bclDir)
+        {
+            // TODO: Once we move to .NET Standard 2.1 we can use ProcessStartInfo.ArgumentList instead
+            string CmdLineArgsToString(IEnumerable<string> args)
+            {
+                // Not perfect, but as long as we are careful...
+                return string.Join(" ", args.Select(arg => arg.Contains(" ") ? $@"""{arg}""" : arg));
+            }
+
+            using (var process = new Process())
+            {
+                process.StartInfo = new ProcessStartInfo(compiler, CmdLineArgsToString(compilerArgs))
+                {
+                    UseShellExecute = false
+                };
+
+                process.StartInfo.EnvironmentVariables.Remove("MONO_ENV_OPTIONS");
+                process.StartInfo.EnvironmentVariables.Remove("MONO_THREADS_SUSPEND");
+                process.StartInfo.EnvironmentVariables.Add("MONO_PATH", bclDir);
+
+                Console.WriteLine($"Running: \"{process.StartInfo.FileName}\" {process.StartInfo.Arguments}");
+
+                if (!process.Start())
+                    throw new Exception("Failed to start process for Mono AOT compiler");
+
+                process.WaitForExit();
+
+                if (process.ExitCode != 0)
+                    throw new Exception($"Mono AOT compiler exited with code: {process.ExitCode}");
+            }
+        }
+
+        private static IEnumerable<string> GetEnablediOSArchs(string[] features)
+        {
+            var iosArchs = new[]
+            {
+                "armv7",
+                "arm64"
+            };
+
+            return iosArchs.Where(features.Contains);
+        }
+
+        private static IEnumerable<string> GetEnabledAndroidAbis(string[] features)
+        {
+            var androidAbis = new[]
+            {
+                "armeabi-v7a",
+                "arm64-v8a",
+                "x86",
+                "x86_64"
+            };
+
+            return androidAbis.Where(features.Contains);
+        }
+
+        private static string GetAndroidTriple(string abi)
+        {
+            var abiArchs = new Dictionary<string, string>
+            {
+                ["armeabi-v7a"] = "armv7",
+                ["arm64-v8a"] = "aarch64-v8a",
+                ["x86"] = "i686",
+                ["x86_64"] = "x86_64"
+            };
+
+            string arch = abiArchs[abi];
+
+            return $"{arch}-linux-android";
+        }
+
+        private static string GetMonoCrossDesktopDirName(string platform, string bits)
+        {
+            switch (platform)
+            {
+                case OS.Platforms.Windows:
+                case OS.Platforms.UWP:
+                    {
+                        string arch = bits == "64" ? "x86_64" : "i686";
+                        return $"windows-{arch}";
+                    }
+                case OS.Platforms.OSX:
+                    {
+                        Debug.Assert(bits == null || bits == "64");
+                        string arch = "x86_64";
+                        return $"{platform}-{arch}";
+                    }
+                case OS.Platforms.LinuxBSD:
+                case OS.Platforms.Server:
+                    {
+                        string arch = bits == "64" ? "x86_64" : "i686";
+                        return $"linux-{arch}";
+                    }
+                case OS.Platforms.Haiku:
+                    {
+                        string arch = bits == "64" ? "x86_64" : "i686";
+                        return $"{platform}-{arch}";
+                    }
+                default:
+                    throw new NotSupportedException($"Platform not supported: {platform}");
+            }
+        }
+
+        // TODO: Replace this for a specific path for each platform
+        private static string FindCrossCompiler(string monoCrossBin)
+        {
+            string exeExt = OS.IsWindows ? ".exe" : string.Empty;
+
+            var files = new DirectoryInfo(monoCrossBin).GetFiles($"*mono-sgen{exeExt}", SearchOption.TopDirectoryOnly);
+            if (files.Length > 0)
+                return Path.Combine(monoCrossBin, files[0].Name);
+
+            throw new FileNotFoundException($"Cannot find the mono runtime executable in {monoCrossBin}");
+        }
+    }
+}
diff --git a/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs b/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs
index 3e2a8c22a9..599ca94699 100644
--- a/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs
+++ b/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using System.Runtime.CompilerServices;
 using GodotTools.Core;
 using GodotTools.Internals;
+using JetBrains.Annotations;
 using static GodotTools.Internals.Globals;
 using Directory = GodotTools.Utils.Directory;
 using File = GodotTools.Utils.File;
@@ -18,7 +19,7 @@ namespace GodotTools.Export
     public class ExportPlugin : EditorExportPlugin
     {
         [Flags]
-        enum I18NCodesets
+        enum I18NCodesets : long
         {
             None = 0,
             CJK = 1,
@@ -29,15 +30,13 @@ namespace GodotTools.Export
             All = CJK | MidEast | Other | Rare | West
         }
 
-        private void AddI18NAssemblies(Godot.Collections.Dictionary<string, string> assemblies, string platform)
+        private void AddI18NAssemblies(Godot.Collections.Dictionary<string, string> assemblies, string bclDir)
         {
-            var codesets = (I18NCodesets) ProjectSettings.GetSetting("mono/export/i18n_codesets");
+            var codesets = (I18NCodesets)ProjectSettings.GetSetting("mono/export/i18n_codesets");
 
             if (codesets == I18NCodesets.None)
                 return;
 
-            string bclDir = DeterminePlatformBclDir(platform) ?? typeof(object).Assembly.Location.GetBaseDir();
-
             void AddI18NAssembly(string name) => assemblies.Add(name, Path.Combine(bclDir, $"{name}.dll"));
 
             AddI18NAssembly("I18N");
@@ -73,6 +72,7 @@ namespace GodotTools.Export
 
             GlobalDef("mono/export/aot/enabled", false);
             GlobalDef("mono/export/aot/full_aot", false);
+            GlobalDef("mono/export/aot/use_interpreter", true);
 
             // --aot or --aot=opt1,opt2 (use 'mono --aot=help AuxAssembly.dll' to list AOT options)
             GlobalDef("mono/export/aot/extra_aot_options", new string[] { });
@@ -86,9 +86,11 @@ namespace GodotTools.Export
 
         private void AddFile(string srcPath, string dstPath, bool remap = false)
         {
+            // Add file to the PCK
             AddFile(dstPath.Replace("\\", "/"), File.ReadAllBytes(srcPath), remap);
         }
 
+        // With this method we can override how a file is exported in the PCK
         public override void _ExportFile(string path, string type, string[] features)
         {
             base._ExportFile(path, type, features);
@@ -96,7 +98,7 @@ namespace GodotTools.Export
             if (type != Internal.CSharpLanguageType)
                 return;
 
-            if (Path.GetExtension(path) != $".{Internal.CSharpLanguageExtension}")
+            if (Path.GetExtension(path) != Internal.CSharpLanguageExtension)
                 throw new ArgumentException($"Resource of type {Internal.CSharpLanguageType} has an invalid file extension: {path}", nameof(path));
 
             // TODO What if the source file is not part of the game's C# project
@@ -110,6 +112,8 @@ namespace GodotTools.Export
                 // Sadly, Godot prints errors when adding an empty file (nothing goes wrong, it's just noise).
                 // Because of this, we add a file which contains a line break.
                 AddFile(path, System.Text.Encoding.UTF8.GetBytes("\n"), remap: false);
+
+                // Tell the Godot exporter that we already took care of the file
                 Skip();
             }
         }
@@ -142,41 +146,31 @@ namespace GodotTools.Export
             if (!File.Exists(GodotSharpDirs.ProjectSlnPath))
                 return;
 
-            string platform = DeterminePlatformFromFeatures(features);
-
-            if (platform == null)
+            if (!DeterminePlatformFromFeatures(features, out string platform))
                 throw new NotSupportedException("Target platform not supported");
 
             string outputDir = new FileInfo(path).Directory?.FullName ??
                                throw new FileNotFoundException("Base directory not found");
 
-            string buildConfig = isDebug ? "Debug" : "Release";
+            string buildConfig = isDebug ? "ExportDebug" : "ExportRelease";
 
             string scriptsMetadataPath = Path.Combine(GodotSharpDirs.ResMetadataDir, $"scripts_metadata.{(isDebug ? "debug" : "release")}");
             CsProjOperations.GenerateScriptsMetadata(GodotSharpDirs.ProjectCsProjPath, scriptsMetadataPath);
 
             AddFile(scriptsMetadataPath, scriptsMetadataPath);
 
-            // Turn export features into defines
-            var godotDefines = features;
-
-            if (!BuildManager.BuildProjectBlocking(buildConfig, godotDefines))
+            if (!BuildManager.BuildProjectBlocking(buildConfig, platform))
                 throw new Exception("Failed to build project");
 
             // Add dependency assemblies
 
-            var dependencies = new Godot.Collections.Dictionary<string, string>();
-
-            var projectDllName = (string)ProjectSettings.GetSetting("application/config/name");
-            if (projectDllName.Empty())
-            {
-                projectDllName = "UnnamedProject";
-            }
+            var assemblies = new Godot.Collections.Dictionary<string, string>();
 
+            string projectDllName = GodotSharpEditor.ProjectAssemblyName;
             string projectDllSrcDir = Path.Combine(GodotSharpDirs.ResTempAssembliesBaseDir, buildConfig);
             string projectDllSrcPath = Path.Combine(projectDllSrcDir, $"{projectDllName}.dll");
 
-            dependencies[projectDllName] = projectDllSrcPath;
+            assemblies[projectDllName] = projectDllSrcPath;
 
             if (platform == OS.Platforms.Android)
             {
@@ -186,13 +180,15 @@ namespace GodotTools.Export
                 if (!File.Exists(monoAndroidAssemblyPath))
                     throw new FileNotFoundException("Assembly not found: 'Mono.Android'", monoAndroidAssemblyPath);
 
-                dependencies["Mono.Android"] = monoAndroidAssemblyPath;
+                assemblies["Mono.Android"] = monoAndroidAssemblyPath;
             }
 
-            var initialDependencies = dependencies.Duplicate();
-            internal_GetExportedAssemblyDependencies(initialDependencies, buildConfig, DeterminePlatformBclDir(platform), dependencies);
+            string bclDir = DeterminePlatformBclDir(platform);
+
+            var initialAssemblies = assemblies.Duplicate();
+            internal_GetExportedAssemblyDependencies(initialAssemblies, buildConfig, bclDir, assemblies);
 
-            AddI18NAssemblies(dependencies, platform);
+            AddI18NAssemblies(assemblies, bclDir);
 
             string outputDataDir = null;
 
@@ -211,27 +207,62 @@ namespace GodotTools.Export
                     Directory.CreateDirectory(outputDataGameAssembliesDir);
             }
 
-            foreach (var dependency in dependencies)
+            foreach (var assembly in assemblies)
             {
-                string dependSrcPath = dependency.Value;
-
-                if (assembliesInsidePck)
-                {
-                    string dependDstPath = Path.Combine(resAssembliesDir, dependSrcPath.GetFile());
-                    AddFile(dependSrcPath, dependDstPath);
-                }
-                else
+                void AddToAssembliesDir(string fileSrcPath)
                 {
-                    string dependDstPath = Path.Combine(outputDataDir, "Assemblies", dependSrcPath.GetFile());
-                    File.Copy(dependSrcPath, dependDstPath);
+                    if (assembliesInsidePck)
+                    {
+                        string fileDstPath = Path.Combine(resAssembliesDir, fileSrcPath.GetFile());
+                        AddFile(fileSrcPath, fileDstPath);
+                    }
+                    else
+                    {
+                        Debug.Assert(outputDataDir != null);
+                        string fileDstPath = Path.Combine(outputDataDir, "Assemblies", fileSrcPath.GetFile());
+                        File.Copy(fileSrcPath, fileDstPath);
+                    }
                 }
+
+                string assemblySrcPath = assembly.Value;
+
+                string assemblyPathWithoutExtension = Path.ChangeExtension(assemblySrcPath, null);
+                string pdbSrcPath = assemblyPathWithoutExtension + ".pdb";
+
+                AddToAssembliesDir(assemblySrcPath);
+
+                if (File.Exists(pdbSrcPath))
+                    AddToAssembliesDir(pdbSrcPath);
             }
 
-            // AOT
+            // AOT compilation
+            bool aotEnabled = platform == OS.Platforms.iOS || (bool)ProjectSettings.GetSetting("mono/export/aot/enabled");
 
-            if ((bool)ProjectSettings.GetSetting("mono/export/aot/enabled"))
+            if (aotEnabled)
             {
-                AotCompileDependencies(features, platform, isDebug, outputDir, outputDataDir, dependencies);
+                string aotToolchainPath = null;
+
+                if (platform == OS.Platforms.Android)
+                    aotToolchainPath = (string)ProjectSettings.GetSetting("mono/export/aot/android_toolchain_path");
+
+                if (aotToolchainPath == string.Empty)
+                    aotToolchainPath = null; // Don't risk it being used as current working dir
+
+                // TODO: LLVM settings are hard-coded and disabled for now
+                var aotOpts = new AotOptions
+                {
+                    EnableLLVM = false,
+                    LLVMOnly = false,
+                    LLVMPath = "",
+                    LLVMOutputPath = "",
+                    FullAot = platform == OS.Platforms.iOS || (bool)(ProjectSettings.GetSetting("mono/export/aot/full_aot") ?? false),
+                    UseInterpreter = (bool)ProjectSettings.GetSetting("mono/export/aot/use_interpreter"),
+                    ExtraAotOptions = (string[])ProjectSettings.GetSetting("mono/export/aot/extra_aot_options") ?? new string[] { },
+                    ExtraOptimizerOptions = (string[])ProjectSettings.GetSetting("mono/export/aot/extra_optimizer_options") ?? new string[] { },
+                    ToolchainPath = aotToolchainPath
+                };
+
+                AotBuilder.CompileAssemblies(this, aotOpts, features, platform, isDebug, bclDir, outputDir, outputDataDir, assemblies);
             }
         }
 
@@ -254,11 +285,13 @@ namespace GodotTools.Export
             }
         }
 
+        [NotNull]
         private static string ExportDataDirectory(string[] features, string platform, bool isDebug, string outputDir)
         {
             string target = isDebug ? "release_debug" : "release";
 
-            // NOTE: Bits is ok for now as all platforms with a data directory have it, but that may change in the future.
+            // NOTE: Bits is ok for now as all platforms with a data directory only have one or two architectures.
+            // However, this may change in the future if we add arm linux or windows desktop templates.
             string bits = features.Contains("64") ? "64" : "32";
 
             string TemplateDirName() => $"data.mono.{platform}.{bits}.{target}";
@@ -284,7 +317,7 @@ namespace GodotTools.Export
             if (!validTemplatePathFound)
                 throw new FileNotFoundException("Data template directory not found", templateDirPath);
 
-            string outputDataDir = Path.Combine(outputDir, DataDirName);
+            string outputDataDir = Path.Combine(outputDir, DetermineDataDirNameForProject());
 
             if (Directory.Exists(outputDataDir))
                 Directory.Delete(outputDataDir, recursive: true); // Clean first
@@ -304,344 +337,22 @@ namespace GodotTools.Export
             return outputDataDir;
         }
 
-        private void AotCompileDependencies(string[] features, string platform, bool isDebug, string outputDir, string outputDataDir, IDictionary<string, string> dependencies)
-        {
-            // TODO: WASM
-
-            string bclDir = DeterminePlatformBclDir(platform) ?? typeof(object).Assembly.Location.GetBaseDir();
-
-            string aotTempDir = Path.Combine(Path.GetTempPath(), $"godot-aot-{Process.GetCurrentProcess().Id}");
-
-            if (!Directory.Exists(aotTempDir))
-                Directory.CreateDirectory(aotTempDir);
-
-            var assemblies = new Dictionary<string, string>();
-
-            foreach (var dependency in dependencies)
-            {
-                string assemblyName = dependency.Key;
-                string assemblyPath = dependency.Value;
-
-                string assemblyPathInBcl = Path.Combine(bclDir, assemblyName + ".dll");
-
-                if (File.Exists(assemblyPathInBcl))
-                {
-                    // Don't create teporaries for assemblies from the BCL
-                    assemblies.Add(assemblyName, assemblyPathInBcl);
-                }
-                else
-                {
-                    string tempAssemblyPath = Path.Combine(aotTempDir, assemblyName + ".dll");
-                    File.Copy(assemblyPath, tempAssemblyPath);
-                    assemblies.Add(assemblyName, tempAssemblyPath);
-                }
-            }
-
-            foreach (var assembly in assemblies)
-            {
-                string assemblyName = assembly.Key;
-                string assemblyPath = assembly.Value;
-
-                string sharedLibExtension = platform == OS.Platforms.Windows ? ".dll" :
-                    platform == OS.Platforms.OSX ? ".dylib" :
-                    platform == OS.Platforms.HTML5 ? ".wasm" :
-                    ".so";
-
-                string outputFileName = assemblyName + ".dll" + sharedLibExtension;
-
-                if (platform == OS.Platforms.Android)
-                {
-                    // Not sure if the 'lib' prefix is an Android thing or just Godot being picky,
-                    // but we use '-aot-' as well just in case to avoid conflicts with other libs.
-                    outputFileName = "lib-aot-" + outputFileName;
-                }
-
-                string outputFilePath = null;
-                string tempOutputFilePath;
-
-                switch (platform)
-                {
-                    case OS.Platforms.OSX:
-                        tempOutputFilePath = Path.Combine(aotTempDir, outputFileName);
-                        break;
-                    case OS.Platforms.Android:
-                        tempOutputFilePath = Path.Combine(aotTempDir, "%%ANDROID_ABI%%", outputFileName);
-                        break;
-                    case OS.Platforms.HTML5:
-                        tempOutputFilePath = Path.Combine(aotTempDir, outputFileName);
-                        outputFilePath = Path.Combine(outputDir, outputFileName);
-                        break;
-                    default:
-                        tempOutputFilePath = Path.Combine(aotTempDir, outputFileName);
-                        outputFilePath = Path.Combine(outputDataDir, "Mono", platform == OS.Platforms.Windows ? "bin" : "lib", outputFileName);
-                        break;
-                }
-
-                var data = new Dictionary<string, string>();
-                var enabledAndroidAbis = platform == OS.Platforms.Android ? GetEnabledAndroidAbis(features).ToArray() : null;
-
-                if (platform == OS.Platforms.Android)
-                {
-                    Debug.Assert(enabledAndroidAbis != null);
-
-                    foreach (var abi in enabledAndroidAbis)
-                    {
-                        data["abi"] = abi;
-                        var outputFilePathForThisAbi = tempOutputFilePath.Replace("%%ANDROID_ABI%%", abi);
-
-                        AotCompileAssembly(platform, isDebug, data, assemblyPath, outputFilePathForThisAbi);
-
-                        AddSharedObject(outputFilePathForThisAbi, tags: new[] { abi });
-                    }
-                }
-                else
-                {
-                    string bits = features.Contains("64") ? "64" : features.Contains("64") ? "32" : null;
-
-                    if (bits != null)
-                        data["bits"] = bits;
-
-                    AotCompileAssembly(platform, isDebug, data, assemblyPath, tempOutputFilePath);
-
-                    if (platform == OS.Platforms.OSX)
-                    {
-                        AddSharedObject(tempOutputFilePath, tags: null);
-                    }
-                    else
-                    {
-                        Debug.Assert(outputFilePath != null);
-                        File.Copy(tempOutputFilePath, outputFilePath);
-                    }
-                }
-            }
-        }
-
-        private static void AotCompileAssembly(string platform, bool isDebug, Dictionary<string, string> data, string assemblyPath, string outputFilePath)
-        {
-            // Make sure the output directory exists
-            Directory.CreateDirectory(outputFilePath.GetBaseDir());
-
-            string exeExt = OS.IsWindows ? ".exe" : string.Empty;
-
-            string monoCrossDirName = DetermineMonoCrossDirName(platform, data);
-            string monoCrossRoot = Path.Combine(GodotSharpDirs.DataEditorToolsDir, "aot-compilers", monoCrossDirName);
-            string monoCrossBin = Path.Combine(monoCrossRoot, "bin");
-
-            string toolPrefix = DetermineToolPrefix(monoCrossBin);
-            string monoExeName = System.IO.File.Exists(Path.Combine(monoCrossBin, $"{toolPrefix}mono{exeExt}")) ? "mono" : "mono-sgen";
-
-            string compilerCommand = Path.Combine(monoCrossBin, $"{toolPrefix}{monoExeName}{exeExt}");
-
-            bool fullAot = (bool)ProjectSettings.GetSetting("mono/export/aot/full_aot");
-
-            string EscapeOption(string option) => option.Contains(',') ? $"\"{option}\"" : option;
-            string OptionsToString(IEnumerable<string> options) => string.Join(",", options.Select(EscapeOption));
-
-            var aotOptions = new List<string>();
-            var optimizerOptions = new List<string>();
-
-            if (fullAot)
-                aotOptions.Add("full");
-
-            aotOptions.Add(isDebug ? "soft-debug" : "nodebug");
-
-            if (platform == OS.Platforms.Android)
-            {
-                string abi = data["abi"];
-
-                string androidToolchain = (string)ProjectSettings.GetSetting("mono/export/aot/android_toolchain_path");
-
-                if (string.IsNullOrEmpty(androidToolchain))
-                {
-                    androidToolchain = Path.Combine(GodotSharpDirs.DataEditorToolsDir, "android-toolchains", $"{abi}"); // TODO: $"{abi}-{apiLevel}{(clang?"clang":"")}"
-
-                    if (!Directory.Exists(androidToolchain))
-                        throw new FileNotFoundException("Missing android toolchain. Specify one in the AOT export settings.");
-                }
-                else if (!Directory.Exists(androidToolchain))
-                {
-                    throw new FileNotFoundException("Android toolchain not found: " + androidToolchain);
-                }
-
-                var androidToolPrefixes = new Dictionary<string, string>
-                {
-                    ["armeabi-v7a"] = "arm-linux-androideabi-",
-                    ["arm64-v8a"] = "aarch64-linux-android-",
-                    ["x86"] = "i686-linux-android-",
-                    ["x86_64"] = "x86_64-linux-android-"
-                };
-
-                aotOptions.Add("tool-prefix=" + Path.Combine(androidToolchain, "bin", androidToolPrefixes[abi]));
-
-                string triple = GetAndroidTriple(abi);
-                aotOptions.Add($"mtriple={triple}");
-            }
-
-            aotOptions.Add($"outfile={outputFilePath}");
-
-            var extraAotOptions = (string[])ProjectSettings.GetSetting("mono/export/aot/extra_aot_options");
-            var extraOptimizerOptions = (string[])ProjectSettings.GetSetting("mono/export/aot/extra_optimizer_options");
-
-            if (extraAotOptions.Length > 0)
-                aotOptions.AddRange(extraAotOptions);
-
-            if (extraOptimizerOptions.Length > 0)
-                optimizerOptions.AddRange(extraOptimizerOptions);
-
-            var compilerArgs = new List<string>();
-
-            if (isDebug)
-                compilerArgs.Add("--debug"); // Required for --aot=soft-debug
-
-            compilerArgs.Add(aotOptions.Count > 0 ? $"--aot={OptionsToString(aotOptions)}" : "--aot");
-
-            if (optimizerOptions.Count > 0)
-                compilerArgs.Add($"-O={OptionsToString(optimizerOptions)}");
-
-            compilerArgs.Add(ProjectSettings.GlobalizePath(assemblyPath));
-
-            // TODO: Once we move to .NET Standard 2.1 we can use ProcessStartInfo.ArgumentList instead
-            string CmdLineArgsToString(IEnumerable<string> args)
-            {
-                // Not perfect, but as long as we are careful...
-                return string.Join(" ", args.Select(arg => arg.Contains(" ") ? $@"""{arg}""" : arg));
-            }
-
-            using (var process = new Process())
-            {
-                process.StartInfo = new ProcessStartInfo(compilerCommand, CmdLineArgsToString(compilerArgs))
-                {
-                    UseShellExecute = false
-                };
-
-                string platformBclDir = DeterminePlatformBclDir(platform);
-                process.StartInfo.EnvironmentVariables.Add("MONO_PATH", string.IsNullOrEmpty(platformBclDir) ?
-                    typeof(object).Assembly.Location.GetBaseDir() :
-                    platformBclDir);
-
-                Console.WriteLine($"Running: \"{process.StartInfo.FileName}\" {process.StartInfo.Arguments}");
-
-                if (!process.Start())
-                    throw new Exception("Failed to start process for Mono AOT compiler");
-
-                process.WaitForExit();
-
-                if (process.ExitCode != 0)
-                    throw new Exception($"Mono AOT compiler exited with error code: {process.ExitCode}");
-
-                if (!System.IO.File.Exists(outputFilePath))
-                    throw new Exception("Mono AOT compiler finished successfully but the output file is missing");
-            }
-        }
-
-        private static string DetermineMonoCrossDirName(string platform, IReadOnlyDictionary<string, string> data)
-        {
-            switch (platform)
-            {
-                case OS.Platforms.Windows:
-                case OS.Platforms.UWP:
-                {
-                    string arch = data["bits"] == "64" ? "x86_64" : "i686";
-                    return $"windows-{arch}";
-                }
-                case OS.Platforms.OSX:
-                {
-                    string arch = "x86_64";
-                    return $"{platform}-{arch}";
-                }
-                case OS.Platforms.X11:
-                case OS.Platforms.Server:
-                {
-                    string arch = data["bits"] == "64" ? "x86_64" : "i686";
-                    return $"linux-{arch}";
-                }
-                case OS.Platforms.Haiku:
-                {
-                    string arch = data["bits"] == "64" ? "x86_64" : "i686";
-                    return $"{platform}-{arch}";
-                }
-                case OS.Platforms.Android:
-                {
-                    string abi = data["abi"];
-                    return $"{platform}-{abi}";
-                }
-                case OS.Platforms.HTML5:
-                    return "wasm-wasm32";
-                default:
-                    throw new NotSupportedException($"Platform not supported: {platform}");
-            }
-        }
-
-        private static string DetermineToolPrefix(string monoCrossBin)
-        {
-            string exeExt = OS.IsWindows ? ".exe" : string.Empty;
-
-            if (System.IO.File.Exists(Path.Combine(monoCrossBin, $"mono{exeExt}")))
-                return string.Empty;
-
-            if (System.IO.File.Exists(Path.Combine(monoCrossBin, $"mono-sgen{exeExt}" + exeExt)))
-                return string.Empty;
-
-            var files = new DirectoryInfo(monoCrossBin).GetFiles($"*mono{exeExt}" + exeExt, SearchOption.TopDirectoryOnly);
-            if (files.Length > 0)
-            {
-                string fileName = files[0].Name;
-                return fileName.Substring(0, fileName.Length - $"mono{exeExt}".Length);
-            }
-
-            files = new DirectoryInfo(monoCrossBin).GetFiles($"*mono-sgen{exeExt}" + exeExt, SearchOption.TopDirectoryOnly);
-            if (files.Length > 0)
-            {
-                string fileName = files[0].Name;
-                return fileName.Substring(0, fileName.Length - $"mono-sgen{exeExt}".Length);
-            }
-
-            throw new FileNotFoundException($"Cannot find the mono runtime executable in {monoCrossBin}");
-        }
-
-        private static IEnumerable<string> GetEnabledAndroidAbis(string[] features)
-        {
-            var androidAbis = new[]
-            {
-                "armeabi-v7a",
-                "arm64-v8a",
-                "x86",
-                "x86_64"
-            };
-
-            return androidAbis.Where(features.Contains);
-        }
-
-        private static string GetAndroidTriple(string abi)
-        {
-            var abiArchs = new Dictionary<string, string>
-            {
-                ["armeabi-v7a"] = "armv7",
-                ["arm64-v8a"] = "aarch64-v8a",
-                ["x86"] = "i686",
-                ["x86_64"] = "x86_64"
-            };
-
-            string arch = abiArchs[abi];
-
-            return $"{arch}-linux-android";
-        }
-
         private static bool PlatformHasTemplateDir(string platform)
         {
             // OSX export templates are contained in a zip, so we place our custom template inside it and let Godot do the rest.
-            return !new[] { OS.Platforms.OSX, OS.Platforms.Android, OS.Platforms.HTML5 }.Contains(platform);
+            return !new[] {OS.Platforms.OSX, OS.Platforms.Android, OS.Platforms.iOS, OS.Platforms.HTML5}.Contains(platform);
         }
 
-        private static string DeterminePlatformFromFeatures(IEnumerable<string> features)
+        private static bool DeterminePlatformFromFeatures(IEnumerable<string> features, out string platform)
         {
             foreach (var feature in features)
             {
-                if (OS.PlatformNameMap.TryGetValue(feature, out string platform))
-                    return platform;
+                if (OS.PlatformNameMap.TryGetValue(feature, out platform))
+                    return true;
             }
 
-            return null;
+            platform = null;
+            return false;
         }
 
         private static string GetBclProfileDir(string profile)
@@ -665,7 +376,7 @@ namespace GodotTools.Export
                     if (PlatformRequiresCustomBcl(platform))
                         throw new FileNotFoundException($"Missing BCL (Base Class Library) for platform: {platform}");
 
-                    platformBclDir = null; // Use the one we're running on
+                    platformBclDir = typeof(object).Assembly.Location.GetBaseDir(); // Use the one we're running on
                 }
             }
 
@@ -678,7 +389,7 @@ namespace GodotTools.Export
         /// </summary>
         private static bool PlatformRequiresCustomBcl(string platform)
         {
-            if (new[] { OS.Platforms.Android, OS.Platforms.HTML5 }.Contains(platform))
+            if (new[] {OS.Platforms.Android, OS.Platforms.iOS, OS.Platforms.HTML5}.Contains(platform))
                 return true;
 
             // The 'net_4_x' BCL is not compatible between Windows and the other platforms.
@@ -701,12 +412,14 @@ namespace GodotTools.Export
                 case OS.Platforms.UWP:
                     return "net_4_x_win";
                 case OS.Platforms.OSX:
-                case OS.Platforms.X11:
+                case OS.Platforms.LinuxBSD:
                 case OS.Platforms.Server:
                 case OS.Platforms.Haiku:
                     return "net_4_x";
                 case OS.Platforms.Android:
                     return "monodroid";
+                case OS.Platforms.iOS:
+                    return "monotouch";
                 case OS.Platforms.HTML5:
                     return "wasm";
                 default:
@@ -714,18 +427,15 @@ namespace GodotTools.Export
             }
         }
 
-        private static string DataDirName
+        private static string DetermineDataDirNameForProject()
         {
-            get
-            {
-                var appName = (string)ProjectSettings.GetSetting("application/config/name");
-                string appNameSafe = appName.ToSafeDirName(allowDirSeparator: false);
-                return $"data_{appNameSafe}";
-            }
+            var appName = (string)ProjectSettings.GetSetting("application/config/name");
+            string appNameSafe = appName.ToSafeDirName();
+            return $"data_{appNameSafe}";
         }
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        private static extern void internal_GetExportedAssemblyDependencies(Godot.Collections.Dictionary<string, string> initialDependencies,
-            string buildConfig, string customBclDir, Godot.Collections.Dictionary<string, string> dependencies);
+        private static extern void internal_GetExportedAssemblyDependencies(Godot.Collections.Dictionary<string, string> initialAssemblies,
+            string buildConfig, string customBclDir, Godot.Collections.Dictionary<string, string> dependencyAssemblies);
     }
 }
diff --git a/modules/mono/editor/GodotTools/GodotTools/Export/XcodeHelper.cs b/modules/mono/editor/GodotTools/GodotTools/Export/XcodeHelper.cs
new file mode 100755
index 0000000000..219b7a698a
--- /dev/null
+++ b/modules/mono/editor/GodotTools/GodotTools/Export/XcodeHelper.cs
@@ -0,0 +1,93 @@
+using System;
+using System.IO;
+
+namespace GodotTools.Export
+{
+    public static class XcodeHelper
+    {
+        private static string _XcodePath = null;
+
+        public static string XcodePath
+        {
+            get
+            {
+                if (_XcodePath == null)
+                {
+                    _XcodePath = FindXcode();
+
+                    if (_XcodePath == null)
+                        throw new Exception("Could not find Xcode");
+                }
+
+                return _XcodePath;
+            }
+        }
+
+        private static string FindSelectedXcode()
+        {
+            var outputWrapper = new Godot.Collections.Array();
+
+            int exitCode = Godot.OS.Execute("xcode-select", new string[] { "--print-path" }, blocking: true, output: outputWrapper);
+
+            if (exitCode == 0)
+            {
+                string output = (string)outputWrapper[0];
+                return output.Trim();
+            }
+
+            Console.Error.WriteLine($"'xcode-select --print-path' exited with code: {exitCode}");
+
+            return null;
+        }
+
+        public static string FindXcode()
+        {
+            string selectedXcode = FindSelectedXcode();
+            if (selectedXcode != null)
+            {
+                if (Directory.Exists(Path.Combine(selectedXcode, "Contents", "Developer")))
+                    return selectedXcode;
+
+                // The path already pointed to Contents/Developer
+                var dirInfo = new DirectoryInfo(selectedXcode);
+                if (dirInfo.Name != "Developer" || dirInfo.Parent.Name != "Contents")
+                {
+                    Console.WriteLine(Path.GetDirectoryName(selectedXcode));
+                    Console.WriteLine(System.IO.Directory.GetParent(selectedXcode).Name);
+                    Console.Error.WriteLine("Unrecognized path for selected Xcode");
+                }
+                else
+                {
+                    return System.IO.Path.GetFullPath($"{selectedXcode}/../..");
+                }
+            }
+            else
+            {
+                Console.Error.WriteLine("Could not find the selected Xcode; trying with a hint path");
+            }
+
+            const string XcodeHintPath = "/Applications/Xcode.app";
+
+            if (Directory.Exists(XcodeHintPath))
+            {
+                if (Directory.Exists(Path.Combine(XcodeHintPath, "Contents", "Developer")))
+                    return XcodeHintPath;
+
+                Console.Error.WriteLine($"Found Xcode at '{XcodeHintPath}' but it's missing the 'Contents/Developer' sub-directory");
+            }
+
+            return null;
+        }
+
+        public static string FindXcodeTool(string toolName)
+        {
+            string XcodeDefaultToolchain = Path.Combine(XcodePath, "Contents", "Developer", "Toolchains", "XcodeDefault.xctoolchain");
+
+            string path = Path.Combine(XcodeDefaultToolchain, "usr", "bin", toolName);
+            if (File.Exists(path))
+                return path;
+
+            throw new FileNotFoundException($"Cannot find Xcode tool: {toolName}");
+        }
+    }
+}
diff --git a/modules/mono/editor/GodotTools/GodotTools/ExternalEditorId.cs b/modules/mono/editor/GodotTools/GodotTools/ExternalEditorId.cs
index bb218c2f19..90d6eb960e 100644
--- a/modules/mono/editor/GodotTools/GodotTools/ExternalEditorId.cs
+++ b/modules/mono/editor/GodotTools/GodotTools/ExternalEditorId.cs
@@ -1,6 +1,6 @@
 namespace GodotTools
 {
-    public enum ExternalEditorId
+    public enum ExternalEditorId : long
     {
         None,
         VisualStudio, // TODO (Windows-only)
diff --git a/modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs b/modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs
index 147bc95bb8..2a450c5b87 100644
--- a/modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs
+++ b/modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs
@@ -1,10 +1,12 @@
 using Godot;
+using GodotTools.Core;
 using GodotTools.Export;
 using GodotTools.Utils;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
+using System.Linq;
 using GodotTools.Ides;
 using GodotTools.Ides.Rider;
 using GodotTools.Internals;
@@ -13,6 +15,7 @@ using JetBrains.Annotations;
 using static GodotTools.Internals.Globals;
 using File = GodotTools.Utils.File;
 using OS = GodotTools.Utils.OS;
+using Path = System.IO.Path;
 
 namespace GodotTools
 {
@@ -27,7 +30,8 @@ namespace GodotTools
         private AcceptDialog aboutDialog;
         private CheckBox aboutDialogCheckBox;
 
-        private ToolButton bottomPanelBtn;
+        private Button bottomPanelBtn;
+        private Button toolBarBuildButton;
 
         public GodotIdeManager GodotIdeManager { get; private set; }
 
@@ -35,6 +39,20 @@ namespace GodotTools
 
         public BottomPanel BottomPanel { get; private set; }
 
+        public bool SkipBuildBeforePlaying { get; set; } = false;
+
+        public static string ProjectAssemblyName
+        {
+            get
+            {
+                var projectAssemblyName = (string)ProjectSettings.GetSetting("application/config/name");
+                projectAssemblyName = projectAssemblyName.ToSafeDirName();
+                if (string.IsNullOrEmpty(projectAssemblyName))
+                    projectAssemblyName = "UnnamedProject";
+                return projectAssemblyName;
+            }
+        }
+
         private bool CreateProjectSolution()
         {
             using (var pr = new EditorProgress("create_csharp_solution", "Generating solution...".TTR(), 3))
@@ -44,9 +62,7 @@ namespace GodotTools
                 string resourceDir = ProjectSettings.GlobalizePath("res://");
 
                 string path = resourceDir;
-                string name = (string)ProjectSettings.GetSetting("application/config/name");
-                if (name.Empty())
-                    name = "UnnamedProject";
+                string name = ProjectAssemblyName;
 
                 string guid = CsProjOperations.GenerateGameProject(path, name);
 
@@ -61,7 +77,7 @@ namespace GodotTools
                     {
                         Guid = guid,
                         PathRelativeToSolution = name + ".csproj",
-                        Configs = new List<string> { "Debug", "Release", "Tools" }
+                        Configs = new List<string> {"Debug", "ExportDebug", "ExportRelease"}
                     };
 
                     solution.AddNewProject(name, projectInfo);
@@ -112,25 +128,19 @@ namespace GodotTools
         {
             menuPopup.RemoveItem(menuPopup.GetItemIndex((int)MenuOptions.CreateSln));
             bottomPanelBtn.Show();
+            toolBarBuildButton.Show();
         }
 
         private void _ShowAboutDialog()
         {
             bool showOnStart = (bool)editorSettings.GetSetting("mono/editor/show_info_on_start");
             aboutDialogCheckBox.Pressed = showOnStart;
-            aboutDialog.PopupCenteredMinsize();
-        }
-
-        private void _ToggleAboutDialogOnStart(bool enabled)
-        {
-            bool showOnStart = (bool)editorSettings.GetSetting("mono/editor/show_info_on_start");
-            if (showOnStart != enabled)
-                editorSettings.SetSetting("mono/editor/show_info_on_start", enabled);
+            aboutDialog.PopupCentered();
         }
 
-        private void _MenuOptionPressed(MenuOptions id)
+        private void _MenuOptionPressed(int id)
         {
-            switch (id)
+            switch ((MenuOptions)id)
             {
                 case MenuOptions.CreateSln:
                     CreateProjectSolution();
@@ -163,10 +173,10 @@ namespace GodotTools
                 bool showInfoDialog = (bool)editorSettings.GetSetting("mono/editor/show_info_on_start");
                 if (showInfoDialog)
                 {
-                    aboutDialog.PopupExclusive = true;
+                    aboutDialog.Exclusive = true;
                     _ShowAboutDialog();
                     // Once shown a first time, it can be seen again via the Mono menu - it doesn't have to be exclusive from that time on.
-                    aboutDialog.PopupExclusive = false;
+                    aboutDialog.Exclusive = false;
                 }
             }
         }
@@ -179,9 +189,9 @@ namespace GodotTools
 
         public void ShowErrorDialog(string message, string title = "Error")
         {
-            errorDialog.WindowTitle = title;
+            errorDialog.Title = title;
             errorDialog.DialogText = message;
-            errorDialog.PopupCenteredMinsize();
+            errorDialog.PopupCentered();
         }
 
         private static string _vsCodePath = string.Empty;
@@ -194,15 +204,39 @@ namespace GodotTools
         [UsedImplicitly]
         public Error OpenInExternalEditor(Script script, int line, int col)
         {
-            var editor = (ExternalEditorId)editorSettings.GetSetting("mono/editor/external_editor");
+            var editorId = (ExternalEditorId)editorSettings.GetSetting("mono/editor/external_editor");
 
-            switch (editor)
+            switch (editorId)
             {
                 case ExternalEditorId.None:
-                    // Tells the caller to fallback to the global external editor settings or the built-in editor
+                    // Not an error. Tells the caller to fallback to the global external editor settings or the built-in editor.
                     return Error.Unavailable;
                 case ExternalEditorId.VisualStudio:
-                    throw new NotSupportedException();
+                {
+                    string scriptPath = ProjectSettings.GlobalizePath(script.ResourcePath);
+
+                    var args = new List<string>
+                    {
+                        GodotSharpDirs.ProjectSlnPath,
+                        line >= 0 ? $"{scriptPath};{line + 1};{col + 1}" : scriptPath
+                    };
+
+                    string command = Path.Combine(GodotSharpDirs.DataEditorToolsDir, "GodotTools.OpenVisualStudio.exe");
+
+                    try
+                    {
+                        if (Godot.OS.IsStdoutVerbose())
+                            Console.WriteLine($"Running: \"{command}\" {string.Join(" ", args.Select(a => $"\"{a}\""))}");
+
+                        OS.RunProcess(command, args);
+                    }
+                    catch (Exception e)
+                    {
+                        GD.PushError($"Error when trying to run code editor: VisualStudio. Exception message: '{e.Message}'");
+                    }
+
+                    break;
+                }
                 case ExternalEditorId.VisualStudioForMac:
                     goto case ExternalEditorId.MonoDevelop;
                 case ExternalEditorId.Rider:
@@ -210,22 +244,25 @@ namespace GodotTools
                     string scriptPath = ProjectSettings.GlobalizePath(script.ResourcePath);
                     RiderPathManager.OpenFile(GodotSharpDirs.ProjectSlnPath, scriptPath, line);
                     return Error.Ok;
-                }        
+                }
                 case ExternalEditorId.MonoDevelop:
                 {
                     string scriptPath = ProjectSettings.GlobalizePath(script.ResourcePath);
 
-                    if (line >= 0)
-                        GodotIdeManager.SendOpenFile(scriptPath, line + 1, col);
-                    else
-                        GodotIdeManager.SendOpenFile(scriptPath);
+                    GodotIdeManager.LaunchIdeAsync().ContinueWith(launchTask =>
+                    {
+                        var editorPick = launchTask.Result;
+                        if (line >= 0)
+                            editorPick?.SendOpenFile(scriptPath, line + 1, col);
+                        else
+                            editorPick?.SendOpenFile(scriptPath);
+                    });
 
                     break;
                 }
-
                 case ExternalEditorId.VsCode:
                 {
-                    if (_vsCodePath.Empty() || !File.Exists(_vsCodePath))
+                    if (string.IsNullOrEmpty(_vsCodePath) || !File.Exists(_vsCodePath))
                     {
                         // Try to search it again if it wasn't found last time or if it was removed from its location
                         _vsCodePath = VsCodeNames.SelectFirstNotNull(OS.PathWhich, orElse: string.Empty);
@@ -266,7 +303,7 @@ namespace GodotTools
                     if (line >= 0)
                     {
                         args.Add("-g");
-                        args.Add($"{scriptPath}:{line + 1}:{col}");
+                        args.Add($"{scriptPath}:{line}:{col}");
                     }
                     else
                     {
@@ -277,7 +314,7 @@ namespace GodotTools
 
                     if (OS.IsOSX)
                     {
-                        if (!osxAppBundleInstalled && _vsCodePath.Empty())
+                        if (!osxAppBundleInstalled && string.IsNullOrEmpty(_vsCodePath))
                         {
                             GD.PushError("Cannot find code editor: VSCode");
                             return Error.FileNotFound;
@@ -287,7 +324,7 @@ namespace GodotTools
                     }
                     else
                     {
-                        if (_vsCodePath.Empty())
+                        if (string.IsNullOrEmpty(_vsCodePath))
                         {
                             GD.PushError("Cannot find code editor: VSCode");
                             return Error.FileNotFound;
@@ -307,7 +344,6 @@ namespace GodotTools
 
                     break;
                 }
-
                 default:
                     throw new ArgumentOutOfRangeException();
             }
@@ -326,6 +362,37 @@ namespace GodotTools
             return BuildManager.EditorBuildCallback();
         }
 
+        private void ApplyNecessaryChangesToSolution()
+        {
+            try
+            {
+                // Migrate solution from old configuration names to: Debug, ExportDebug and ExportRelease
+                DotNetSolution.MigrateFromOldConfigNames(GodotSharpDirs.ProjectSlnPath);
+
+                var msbuildProject = ProjectUtils.Open(GodotSharpDirs.ProjectCsProjPath)
+                                     ?? throw new Exception("Cannot open C# project");
+
+                // NOTE: The order in which changes are made to the project is important
+
+                // Migrate to MSBuild project Sdks style if using the old style
+                ProjectUtils.MigrateToProjectSdksStyle(msbuildProject, ProjectAssemblyName);
+
+                ProjectUtils.EnsureGodotSdkIsUpToDate(msbuildProject);
+
+                if (msbuildProject.HasUnsavedChanges)
+                {
+                    // Save a copy of the project before replacing it
+                    FileUtils.SaveBackupCopy(GodotSharpDirs.ProjectCsProjPath);
+
+                    msbuildProject.Save();
+                }
+            }
+            catch (Exception e)
+            {
+                GD.PushError(e.ToString());
+            }
+        }
+
         public override void EnablePlugin()
         {
             base.EnablePlugin();
@@ -346,11 +413,10 @@ namespace GodotTools
 
             bottomPanelBtn = AddControlToBottomPanel(BottomPanel, "Mono".TTR());
 
-            AddChild(new HotReloadAssemblyWatcher { Name = "HotReloadAssemblyWatcher" });
+            AddChild(new HotReloadAssemblyWatcher {Name = "HotReloadAssemblyWatcher"});
 
             menuPopup = new PopupMenu();
             menuPopup.Hide();
-            menuPopup.SetAsToplevel(true);
 
             AddToolSubmenuItem("Mono", menuPopup);
 
@@ -359,7 +425,7 @@ namespace GodotTools
                 menuPopup.AddItem("About C# support".TTR(), (int)MenuOptions.AboutCSharp);
                 aboutDialog = new AcceptDialog();
                 editorBaseControl.AddChild(aboutDialog);
-                aboutDialog.WindowTitle = "Important: C# support is not feature-complete";
+                aboutDialog.Title = "Important: C# support is not feature-complete";
 
                 // We don't use DialogText as the default AcceptDialog Label doesn't play well with the TextureRect and CheckBox
                 // we'll add. Instead we add containers and a new autowrapped Label inside.
@@ -373,7 +439,7 @@ namespace GodotTools
                 aboutVBox.AddChild(aboutHBox);
 
                 var aboutIcon = new TextureRect();
-                aboutIcon.Texture = aboutIcon.GetIcon("NodeWarning", "EditorIcons");
+                aboutIcon.Texture = aboutIcon.GetThemeIcon("NodeWarning", "EditorIcons");
                 aboutHBox.AddChild(aboutIcon);
 
                 var aboutLabel = new Label();
@@ -384,7 +450,7 @@ namespace GodotTools
                 aboutLabel.Text =
                     "C# support in Godot Engine is in late alpha stage and, while already usable, " +
                     "it is not meant for use in production.\n\n" +
-                    "Projects can be exported to Linux, macOS, Windows and Android, but not yet to iOS, HTML5 or UWP. " +
+                    "Projects can be exported to Linux, macOS, Windows, Android, iOS and HTML5, but not yet to UWP. " +
                     "Bugs and usability issues will be addressed gradually over future releases, " +
                     "potentially including compatibility breaking changes as new features are implemented for a better overall C# experience.\n\n" +
                     "If you experience issues with this Mono build, please report them on Godot's issue tracker with details about your system, MSBuild version, IDE, etc.:\n\n" +
@@ -394,32 +460,37 @@ namespace GodotTools
                 EditorDef("mono/editor/show_info_on_start", true);
 
                 // CheckBox in main container
-                aboutDialogCheckBox = new CheckBox { Text = "Show this warning when starting the editor" };
-                aboutDialogCheckBox.Connect("toggled", this, nameof(_ToggleAboutDialogOnStart));
+                aboutDialogCheckBox = new CheckBox {Text = "Show this warning when starting the editor"};
+                aboutDialogCheckBox.Toggled += enabled =>
+                {
+                    bool showOnStart = (bool)editorSettings.GetSetting("mono/editor/show_info_on_start");
+                    if (showOnStart != enabled)
+                        editorSettings.SetSetting("mono/editor/show_info_on_start", enabled);
+                };
                 aboutVBox.AddChild(aboutDialogCheckBox);
             }
 
+            toolBarBuildButton = new Button
+            {
+                Text = "Build",
+                HintTooltip = "Build solution",
+                FocusMode = Control.FocusModeEnum.None
+            };
+            toolBarBuildButton.PressedSignal += _BuildSolutionPressed;
+            AddControlToContainer(CustomControlContainer.Toolbar, toolBarBuildButton);
+
             if (File.Exists(GodotSharpDirs.ProjectSlnPath) && File.Exists(GodotSharpDirs.ProjectCsProjPath))
             {
-                // Make sure the existing project has Api assembly references configured correctly
-                CsProjOperations.FixApiHintPath(GodotSharpDirs.ProjectCsProjPath);
+                ApplyNecessaryChangesToSolution();
             }
             else
             {
                 bottomPanelBtn.Hide();
+                toolBarBuildButton.Hide();
                 menuPopup.AddItem("Create C# solution".TTR(), (int)MenuOptions.CreateSln);
             }
 
-            menuPopup.Connect("id_pressed", this, nameof(_MenuOptionPressed));
-
-            var buildButton = new ToolButton
-            {
-                Text = "Build",
-                HintTooltip = "Build solution",
-                FocusMode = Control.FocusModeEnum.None
-            };
-            buildButton.Connect("pressed", this, nameof(_BuildSolutionPressed));
-            AddControlToContainer(CustomControlContainer.Toolbar, buildButton);
+            menuPopup.IdPressed += _MenuOptionPressed;
 
             // External editor settings
             EditorDef("mono/editor/external_editor", ExternalEditorId.None);
@@ -428,7 +499,8 @@ namespace GodotTools
 
             if (OS.IsWindows)
             {
-                settingsHintStr += $",MonoDevelop:{(int)ExternalEditorId.MonoDevelop}" +
+                settingsHintStr += $",Visual Studio:{(int)ExternalEditorId.VisualStudio}" +
+                                   $",MonoDevelop:{(int)ExternalEditorId.MonoDevelop}" +
                                    $",Visual Studio Code:{(int)ExternalEditorId.VsCode}" +
                                    $",JetBrains Rider:{(int)ExternalEditorId.Rider}";
             }
@@ -439,7 +511,7 @@ namespace GodotTools
                                    $",Visual Studio Code:{(int)ExternalEditorId.VsCode}" +
                                    $",JetBrains Rider:{(int)ExternalEditorId.Rider}";
             }
-            else if (OS.IsUnixLike())
+            else if (OS.IsUnixLike)
             {
                 settingsHintStr += $",MonoDevelop:{(int)ExternalEditorId.MonoDevelop}" +
                                    $",Visual Studio Code:{(int)ExternalEditorId.VsCode}" +
diff --git a/modules/mono/editor/GodotTools/GodotTools/GodotTools.csproj b/modules/mono/editor/GodotTools/GodotTools/GodotTools.csproj
index 379dfd9f7d..3f14629b11 100644
--- a/modules/mono/editor/GodotTools/GodotTools/GodotTools.csproj
+++ b/modules/mono/editor/GodotTools/GodotTools/GodotTools.csproj
@@ -1,121 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{27B00618-A6F2-4828-B922-05CAEB08C286}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>GodotTools</RootNamespace>
-    <AssemblyName>GodotTools</AssemblyName>
-    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
+    <TargetFramework>net472</TargetFramework>
+    <LangVersion>7.2</LangVersion>
+    <GodotApiConfiguration>Debug</GodotApiConfiguration> <!-- The Godot editor uses the Debug Godot API assemblies -->
     <GodotSourceRootPath>$(SolutionDir)/../../../../</GodotSourceRootPath>
-    <DataDirToolsOutputPath>$(GodotSourceRootPath)/bin/GodotSharp/Tools</DataDirToolsOutputPath>
-    <GodotApiConfiguration>Debug</GodotApiConfiguration>
-    <LangVersion>7</LangVersion>
+    <GodotOutputDataDir>$(GodotSourceRootPath)/bin/GodotSharp</GodotOutputDataDir>
+    <GodotApiAssembliesDir>$(GodotOutputDataDir)/Api/$(GodotApiConfiguration)</GodotApiAssembliesDir>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>portable</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
+  <PropertyGroup Condition=" Exists('$(GodotApiAssembliesDir)/GodotSharp.dll') ">
+    <!-- The project is part of the Godot source tree -->
+    <!-- Use the Godot source tree output folder instead of '$(ProjectDir)/bin' -->
+    <OutputPath>$(GodotOutputDataDir)/Tools</OutputPath>
+    <!-- Must not append '$(TargetFramework)' to the output path in this case -->
+    <AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="JetBrains.Annotations, Version=2019.1.3.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325">
-      <HintPath>..\packages\JetBrains.Annotations.2019.1.3\lib\net20\JetBrains.Annotations.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
+    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3.0" ExcludeAssets="runtime" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <Reference Include="GodotSharp">
-      <HintPath>$(GodotSourceRootPath)/bin/GodotSharp/Api/$(GodotApiConfiguration)/GodotSharp.dll</HintPath>
+      <HintPath>$(GodotApiAssembliesDir)/GodotSharp.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="GodotSharpEditor">
-      <HintPath>$(GodotSourceRootPath)/bin/GodotSharp/Api/$(GodotApiConfiguration)/GodotSharpEditor.dll</HintPath>
+      <HintPath>$(GodotApiAssembliesDir)/GodotSharpEditor.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Build\MsBuildFinder.cs" />
-    <Compile Include="Export\ExportPlugin.cs" />
-    <Compile Include="ExternalEditorId.cs" />
-    <Compile Include="Ides\GodotIdeManager.cs" />
-    <Compile Include="Ides\GodotIdeServer.cs" />
-    <Compile Include="Ides\MonoDevelop\EditorId.cs" />
-    <Compile Include="Ides\MonoDevelop\Instance.cs" />
-    <Compile Include="Ides\Rider\RiderPathLocator.cs" />
-    <Compile Include="Ides\Rider\RiderPathManager.cs" />
-    <Compile Include="Internals\EditorProgress.cs" />
-    <Compile Include="Internals\GodotSharpDirs.cs" />
-    <Compile Include="Internals\Internal.cs" />
-    <Compile Include="Internals\ScriptClassParser.cs" />
-    <Compile Include="Internals\Globals.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Build\BuildSystem.cs" />
-    <Compile Include="Utils\Directory.cs" />
-    <Compile Include="Utils\File.cs" />
-    <Compile Include="Utils\NotifyAwaiter.cs" />
-    <Compile Include="Utils\OS.cs" />
-    <Compile Include="GodotSharpEditor.cs" />
-    <Compile Include="BuildManager.cs" />
-    <Compile Include="HotReloadAssemblyWatcher.cs" />
-    <Compile Include="BuildInfo.cs" />
-    <Compile Include="BuildTab.cs" />
-    <Compile Include="BottomPanel.cs" />
-    <Compile Include="CsProjOperations.cs" />
-    <Compile Include="Utils\CollectionExtensions.cs" />
-    <Compile Include="Utils\User32Dll.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\GodotTools.BuildLogger\GodotTools.BuildLogger.csproj">
-      <Project>{6ce9a984-37b1-4f8a-8fe9-609f05f071b3}</Project>
-      <Name>GodotTools.BuildLogger</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\GodotTools.IdeConnection\GodotTools.IdeConnection.csproj">
-      <Project>{92600954-25f0-4291-8e11-1fee9fc4be20}</Project>
-      <Name>GodotTools.IdeConnection</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\GodotTools.ProjectEditor\GodotTools.ProjectEditor.csproj">
-      <Project>{A8CDAD94-C6D4-4B19-A7E7-76C53CC92984}</Project>
-      <Name>GodotTools.ProjectEditor</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\GodotTools.Core\GodotTools.Core.csproj">
-      <Project>{639E48BD-44E5-4091-8EDD-22D36DC0768D}</Project>
-      <Name>GodotTools.Core</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
+    <ProjectReference Include="..\GodotTools.BuildLogger\GodotTools.BuildLogger.csproj" />
+    <ProjectReference Include="..\GodotTools.IdeMessaging\GodotTools.IdeMessaging.csproj" />
+    <ProjectReference Include="..\GodotTools.ProjectEditor\GodotTools.ProjectEditor.csproj" />
+    <ProjectReference Include="..\GodotTools.Core\GodotTools.Core.csproj" />
+    <!-- Include it if this is an SCons build targeting Windows, or if it's not an SCons build but we're on Windows -->
+    <ProjectReference Include="..\GodotTools.OpenVisualStudio\GodotTools.OpenVisualStudio.csproj" Condition=" '$(GodotPlatform)' == 'windows' Or ( '$(GodotPlatform)' == '' And '$(OS)' == 'Windows_NT' ) " />
   </ItemGroup>
-  <Target Name="CopyToDataDir" AfterTargets="Build">
-    <ItemGroup>
-      <GodotToolsCopy Include="$(OutputPath)\GodotTools*.dll" />
-      <GodotToolsCopy Include="$(OutputPath)\Newtonsoft.Json.dll" />
-      <GodotToolsCopy Include="$(OutputPath)\DotNet.Glob.dll" />
-    </ItemGroup>
-    <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
-      <GodotToolsCopy Include="$(OutputPath)\GodotTools*.pdb" />
-    </ItemGroup>
-    <Copy SourceFiles="@(GodotToolsCopy)" DestinationFolder="$(DataDirToolsOutputPath)" ContinueOnError="false" />
-  </Target>
-  <Target Name="BuildAlwaysCopyToDataDir">
-    <!-- Custom target run by SCons to make sure the CopyToDataDir target is always executed, without having to use DisableFastUpToDateCheck -->
-    <CallTarget Targets="Build" />
-    <CallTarget Targets="CopyToDataDir" />
-  </Target>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/modules/mono/editor/GodotTools/GodotTools/HotReloadAssemblyWatcher.cs b/modules/mono/editor/GodotTools/GodotTools/HotReloadAssemblyWatcher.cs
index 0ed567afd1..b30c857c64 100644
--- a/modules/mono/editor/GodotTools/GodotTools/HotReloadAssemblyWatcher.cs
+++ b/modules/mono/editor/GodotTools/GodotTools/HotReloadAssemblyWatcher.cs
@@ -10,7 +10,7 @@ namespace GodotTools
 
         public override void _Notification(int what)
         {
-            if (what == MainLoop.NotificationWmFocusIn)
+            if (what == Node.NotificationWmWindowFocusIn)
             {
                 RestartTimer();
 
@@ -40,7 +40,7 @@ namespace GodotTools
                 OneShot = false,
                 WaitTime = (float)EditorDef("mono/assembly_watch_interval_sec", 0.5)
             };
-            watchTimer.Connect("timeout", this, nameof(TimerTimeout));
+            watchTimer.Timeout += TimerTimeout;
             AddChild(watchTimer);
             watchTimer.Start();
         }
diff --git a/modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeManager.cs b/modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeManager.cs
index 54f0ffab96..e4932ca217 100644
--- a/modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeManager.cs
+++ b/modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeManager.cs
@@ -1,73 +1,104 @@
 using System;
 using System.IO;
+using System.Threading.Tasks;
 using Godot;
-using GodotTools.IdeConnection;
+using GodotTools.IdeMessaging;
+using GodotTools.IdeMessaging.Requests;
 using GodotTools.Internals;
 
 namespace GodotTools.Ides
 {
-    public class GodotIdeManager : Node, ISerializationListener
+    public sealed class GodotIdeManager : Node, ISerializationListener
     {
-        public GodotIdeServer GodotIdeServer { get; private set; }
+        private MessagingServer MessagingServer { get; set; }
 
         private MonoDevelop.Instance monoDevelInstance;
         private MonoDevelop.Instance vsForMacInstance;
 
-        private GodotIdeServer GetRunningServer()
+        private MessagingServer GetRunningOrNewServer()
         {
-            if (GodotIdeServer != null && !GodotIdeServer.IsDisposed)
-                return GodotIdeServer;
-            StartServer();
-            return GodotIdeServer;
+            if (MessagingServer != null && !MessagingServer.IsDisposed)
+                return MessagingServer;
+
+            MessagingServer?.Dispose();
+            MessagingServer = new MessagingServer(OS.GetExecutablePath(), ProjectSettings.GlobalizePath(GodotSharpDirs.ResMetadataDir), new GodotLogger());
+
+            _ = MessagingServer.Listen();
+
+            return MessagingServer;
         }
 
         public override void _Ready()
         {
-            StartServer();
+            _ = GetRunningOrNewServer();
         }
 
         public void OnBeforeSerialize()
         {
-            GodotIdeServer?.Dispose();
         }
 
         public void OnAfterDeserialize()
         {
-            StartServer();
+            _ = GetRunningOrNewServer();
         }
 
-        private ILogger logger;
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
 
-        protected ILogger Logger
+            if (disposing)
+            {
+                MessagingServer?.Dispose();
+            }
+        }
+
+        private string GetExternalEditorIdentity(ExternalEditorId editorId)
         {
-            get => logger ?? (logger = new GodotLogger());
+            // Manually convert to string to avoid breaking compatibility in case we rename the enum fields.
+            switch (editorId)
+            {
+                case ExternalEditorId.None:
+                    return null;
+                case ExternalEditorId.VisualStudio:
+                    return "VisualStudio";
+                case ExternalEditorId.VsCode:
+                    return "VisualStudioCode";
+                case ExternalEditorId.Rider:
+                    return "Rider";
+                case ExternalEditorId.VisualStudioForMac:
+                    return "VisualStudioForMac";
+                case ExternalEditorId.MonoDevelop:
+                    return "MonoDevelop";
+                default:
+                    throw new NotImplementedException();
+            }
         }
 
-        private void StartServer()
+        public async Task<EditorPick?> LaunchIdeAsync(int millisecondsTimeout = 10000)
         {
-            GodotIdeServer?.Dispose();
-            GodotIdeServer = new GodotIdeServer(LaunchIde,
-                OS.GetExecutablePath(),
-                ProjectSettings.GlobalizePath(GodotSharpDirs.ResMetadataDir));
+            var editorId = (ExternalEditorId)GodotSharpEditor.Instance.GetEditorInterface()
+                .GetEditorSettings().GetSetting("mono/editor/external_editor");
+            string editorIdentity = GetExternalEditorIdentity(editorId);
 
-            GodotIdeServer.Logger = Logger;
+            var runningServer = GetRunningOrNewServer();
 
-            GodotIdeServer.StartServer();
-        }
+            if (runningServer.IsAnyConnected(editorIdentity))
+                return new EditorPick(editorIdentity);
 
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
+            LaunchIde(editorId, editorIdentity);
+
+            var timeoutTask = Task.Delay(millisecondsTimeout);
+            var completedTask = await Task.WhenAny(timeoutTask, runningServer.AwaitClientConnected(editorIdentity));
+
+            if (completedTask != timeoutTask)
+                return new EditorPick(editorIdentity);
 
-            GodotIdeServer?.Dispose();
+            return null;
         }
 
-        private void LaunchIde()
+        private void LaunchIde(ExternalEditorId editorId, string editorIdentity)
         {
-            var editor = (ExternalEditorId)GodotSharpEditor.Instance.GetEditorInterface()
-                .GetEditorSettings().GetSetting("mono/editor/external_editor");
-
-            switch (editor)
+            switch (editorId)
             {
                 case ExternalEditorId.None:
                 case ExternalEditorId.VisualStudio:
@@ -80,14 +111,14 @@ namespace GodotTools.Ides
                 {
                     MonoDevelop.Instance GetMonoDevelopInstance(string solutionPath)
                     {
-                        if (Utils.OS.IsOSX && editor == ExternalEditorId.VisualStudioForMac)
+                        if (Utils.OS.IsOSX && editorId == ExternalEditorId.VisualStudioForMac)
                         {
-                            vsForMacInstance = vsForMacInstance ??
+                            vsForMacInstance = (vsForMacInstance?.IsDisposed ?? true ? null : vsForMacInstance) ??
                                                new MonoDevelop.Instance(solutionPath, MonoDevelop.EditorId.VisualStudioForMac);
                             return vsForMacInstance;
                         }
 
-                        monoDevelInstance = monoDevelInstance ??
+                        monoDevelInstance = (monoDevelInstance?.IsDisposed ?? true ? null : monoDevelInstance) ??
                                             new MonoDevelop.Instance(solutionPath, MonoDevelop.EditorId.MonoDevelop);
                         return monoDevelInstance;
                     }
@@ -96,12 +127,25 @@ namespace GodotTools.Ides
                     {
                         var instance = GetMonoDevelopInstance(GodotSharpDirs.ProjectSlnPath);
 
-                        if (!instance.IsRunning)
+                        if (instance.IsRunning && !GetRunningOrNewServer().IsAnyConnected(editorIdentity))
+                        {
+                            // After launch we wait up to 30 seconds for the IDE to connect to our messaging server.
+                            var waitAfterLaunch = TimeSpan.FromSeconds(30);
+                            var timeSinceLaunch = DateTime.Now - instance.LaunchTime;
+                            if (timeSinceLaunch > waitAfterLaunch)
+                            {
+                                instance.Dispose();
+                                instance.Execute();
+                            }
+                        }
+                        else if (!instance.IsRunning)
+                        {
                             instance.Execute();
+                        }
                     }
                     catch (FileNotFoundException)
                     {
-                        string editorName = editor == ExternalEditorId.VisualStudioForMac ? "Visual Studio" : "MonoDevelop";
+                        string editorName = editorId == ExternalEditorId.VisualStudioForMac ? "Visual Studio" : "MonoDevelop";
                         GD.PushError($"Cannot find code editor: {editorName}");
                     }
 
@@ -113,26 +157,45 @@ namespace GodotTools.Ides
             }
         }
 
-        private void WriteMessage(string id, params string[] arguments)
+        public readonly struct EditorPick
         {
-            GetRunningServer().WriteMessage(new Message(id, arguments));
-        }
+            private readonly string identity;
 
-        public void SendOpenFile(string file)
-        {
-            WriteMessage("OpenFile", file);
-        }
+            public EditorPick(string identity)
+            {
+                this.identity = identity;
+            }
 
-        public void SendOpenFile(string file, int line)
-        {
-            WriteMessage("OpenFile", file, line.ToString());
-        }
+            public bool IsAnyConnected() =>
+                GodotSharpEditor.Instance.GodotIdeManager.GetRunningOrNewServer().IsAnyConnected(identity);
 
-        public void SendOpenFile(string file, int line, int column)
-        {
-            WriteMessage("OpenFile", file, line.ToString(), column.ToString());
+            private void SendRequest<TResponse>(Request request)
+                where TResponse : Response, new()
+            {
+                // Logs an error if no client is connected with the specified identity
+                GodotSharpEditor.Instance.GodotIdeManager
+                    .GetRunningOrNewServer()
+                    .BroadcastRequest<TResponse>(identity, request);
+            }
+
+            public void SendOpenFile(string file)
+            {
+                SendRequest<OpenFileResponse>(new OpenFileRequest {File = file});
+            }
+
+            public void SendOpenFile(string file, int line)
+            {
+                SendRequest<OpenFileResponse>(new OpenFileRequest {File = file, Line = line});
+            }
+
+            public void SendOpenFile(string file, int line, int column)
+            {
+                SendRequest<OpenFileResponse>(new OpenFileRequest {File = file, Line = line, Column = column});
+            }
         }
 
+        public EditorPick PickEditor(ExternalEditorId editorId) => new EditorPick(GetExternalEditorIdentity(editorId));
+
         private class GodotLogger : ILogger
         {
             public void LogDebug(string message)
diff --git a/modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeServer.cs b/modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeServer.cs
deleted file mode 100644
index 72676a8b24..0000000000
--- a/modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeServer.cs
+++ /dev/null
@@ -1,212 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using GodotTools.IdeConnection;
-using GodotTools.Internals;
-using GodotTools.Utils;
-using Directory = System.IO.Directory;
-using File = System.IO.File;
-using Thread = System.Threading.Thread;
-
-namespace GodotTools.Ides
-{
-    public class GodotIdeServer : GodotIdeBase
-    {
-        private readonly TcpListener listener;
-        private readonly FileStream metaFile;
-        private readonly Action launchIdeAction;
-        private readonly NotifyAwaiter<bool> clientConnectedAwaiter = new NotifyAwaiter<bool>();
-
-        private async Task<bool> AwaitClientConnected()
-        {
-            return await clientConnectedAwaiter.Reset();
-        }
-
-        public GodotIdeServer(Action launchIdeAction, string editorExecutablePath, string projectMetadataDir)
-            : base(projectMetadataDir)
-        {
-            messageHandlers = InitializeMessageHandlers();
-
-            this.launchIdeAction = launchIdeAction;
-
-            // Make sure the directory exists
-            Directory.CreateDirectory(projectMetadataDir);
-
-            // The Godot editor's file system thread can keep the file open for writing, so we are forced to allow write sharing...
-            const FileShare metaFileShare = FileShare.ReadWrite;
-
-            metaFile = File.Open(MetaFilePath, FileMode.Create, FileAccess.Write, metaFileShare);
-
-            listener = new TcpListener(new IPEndPoint(IPAddress.Loopback, port: 0));
-            listener.Start();
-
-            int port = ((IPEndPoint)listener.Server.LocalEndPoint).Port;
-            using (var metaFileWriter = new StreamWriter(metaFile, Encoding.UTF8))
-            {
-                metaFileWriter.WriteLine(port);
-                metaFileWriter.WriteLine(editorExecutablePath);
-            }
-
-            StartServer();
-        }
-
-        public void StartServer()
-        {
-            var serverThread = new Thread(RunServerThread) { Name = "Godot Ide Connection Server" };
-            serverThread.Start();
-        }
-
-        private void RunServerThread()
-        {
-            SynchronizationContext.SetSynchronizationContext(Godot.Dispatcher.SynchronizationContext);
-
-            try
-            {
-                while (!IsDisposed)
-                {
-                    TcpClient tcpClient = listener.AcceptTcpClient();
-
-                    Logger.LogInfo("Connection open with Ide Client");
-
-                    lock (ConnectionLock)
-                    {
-                        Connection = new GodotIdeConnectionServer(tcpClient, HandleMessage);
-                        Connection.Logger = Logger;
-                    }
-
-                    Connected += () => clientConnectedAwaiter.SetResult(true);
-
-                    Connection.Start();
-                }
-            }
-            catch (Exception e)
-            {
-                if (!IsDisposed && !(e is SocketException se && se.SocketErrorCode == SocketError.Interrupted))
-                    throw;
-            }
-        }
-
-        public async void WriteMessage(Message message)
-        {
-            async Task LaunchIde()
-            {
-                if (IsConnected)
-                    return;
-
-                launchIdeAction();
-                await Task.WhenAny(Task.Delay(10000), AwaitClientConnected());
-            }
-
-            await LaunchIde();
-
-            if (!IsConnected)
-            {
-                Logger.LogError("Cannot write message: Godot Ide Server not connected");
-                return;
-            }
-
-            Connection.WriteMessage(message);
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (disposing)
-            {
-                listener?.Stop();
-
-                metaFile?.Dispose();
-
-                File.Delete(MetaFilePath);
-            }
-        }
-
-        protected virtual bool HandleMessage(Message message)
-        {
-            if (messageHandlers.TryGetValue(message.Id, out var action))
-            {
-                action(message.Arguments);
-                return true;
-            }
-
-            return false;
-        }
-
-        private readonly Dictionary<string, Action<string[]>> messageHandlers;
-
-        private Dictionary<string, Action<string[]>> InitializeMessageHandlers()
-        {
-            return new Dictionary<string, Action<string[]>>
-            {
-                ["Play"] = args =>
-                {
-                    switch (args.Length)
-                    {
-                        case 0:
-                            Play();
-                            return;
-                        case 2:
-                            Play(debuggerHost: args[0], debuggerPort: int.Parse(args[1]));
-                            return;
-                        default:
-                            throw new ArgumentException();
-                    }
-                },
-                ["ReloadScripts"] = args => ReloadScripts()
-            };
-        }
-
-        private void DispatchToMainThread(Action action)
-        {
-            var d = new SendOrPostCallback(state => action());
-            Godot.Dispatcher.SynchronizationContext.Post(d, null);
-        }
-
-        private void Play()
-        {
-            DispatchToMainThread(() =>
-            {
-                CurrentPlayRequest = new PlayRequest();
-                Internal.EditorRunPlay();
-                CurrentPlayRequest = null;
-            });
-        }
-
-        private void Play(string debuggerHost, int debuggerPort)
-        {
-            DispatchToMainThread(() =>
-            {
-                CurrentPlayRequest = new PlayRequest(debuggerHost, debuggerPort);
-                Internal.EditorRunPlay();
-                CurrentPlayRequest = null;
-            });
-        }
-
-        private void ReloadScripts()
-        {
-            DispatchToMainThread(Internal.ScriptEditorDebugger_ReloadScripts);
-        }
-
-        public PlayRequest? CurrentPlayRequest { get; private set; }
-
-        public struct PlayRequest
-        {
-            public bool HasDebugger { get; }
-            public string DebuggerHost { get; }
-            public int DebuggerPort { get; }
-
-            public PlayRequest(string debuggerHost, int debuggerPort)
-            {
-                HasDebugger = true;
-                DebuggerHost = debuggerHost;
-                DebuggerPort = debuggerPort;
-            }
-        }
-    }
-}
diff --git a/modules/mono/editor/GodotTools/GodotTools/Ides/MessagingServer.cs b/modules/mono/editor/GodotTools/GodotTools/Ides/MessagingServer.cs
new file mode 100644
index 0000000000..eb34a2d0f7
--- /dev/null
+++ b/modules/mono/editor/GodotTools/GodotTools/Ides/MessagingServer.cs
@@ -0,0 +1,390 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+using GodotTools.IdeMessaging;
+using GodotTools.IdeMessaging.Requests;
+using GodotTools.IdeMessaging.Utils;
+using GodotTools.Internals;
+using GodotTools.Utils;
+using Newtonsoft.Json;
+using Directory = System.IO.Directory;
+using File = System.IO.File;
+
+namespace GodotTools.Ides
+{
+    public sealed class MessagingServer : IDisposable
+    {
+        private readonly ILogger logger;
+
+        private readonly FileStream metaFile;
+        private string MetaFilePath { get; }
+
+        private readonly SemaphoreSlim peersSem = new SemaphoreSlim(1);
+
+        private readonly TcpListener listener;
+
+        private readonly Dictionary<string, Queue<NotifyAwaiter<bool>>> clientConnectedAwaiters = new Dictionary<string, Queue<NotifyAwaiter<bool>>>();
+        private readonly Dictionary<string, Queue<NotifyAwaiter<bool>>> clientDisconnectedAwaiters = new Dictionary<string, Queue<NotifyAwaiter<bool>>>();
+
+        public async Task<bool> AwaitClientConnected(string identity)
+        {
+            if (!clientConnectedAwaiters.TryGetValue(identity, out var queue))
+            {
+                queue = new Queue<NotifyAwaiter<bool>>();
+                clientConnectedAwaiters.Add(identity, queue);
+            }
+
+            var awaiter = new NotifyAwaiter<bool>();
+            queue.Enqueue(awaiter);
+            return await awaiter;
+        }
+
+        public async Task<bool> AwaitClientDisconnected(string identity)
+        {
+            if (!clientDisconnectedAwaiters.TryGetValue(identity, out var queue))
+            {
+                queue = new Queue<NotifyAwaiter<bool>>();
+                clientDisconnectedAwaiters.Add(identity, queue);
+            }
+
+            var awaiter = new NotifyAwaiter<bool>();
+            queue.Enqueue(awaiter);
+            return await awaiter;
+        }
+
+        public bool IsDisposed { get; private set; }
+
+        public bool IsAnyConnected(string identity) => string.IsNullOrEmpty(identity) ?
+            Peers.Count > 0 :
+            Peers.Any(c => c.RemoteIdentity == identity);
+
+        private List<Peer> Peers { get; } = new List<Peer>();
+
+        ~MessagingServer()
+        {
+            Dispose(disposing: false);
+        }
+
+        public async void Dispose()
+        {
+            if (IsDisposed)
+                return;
+
+            using (await peersSem.UseAsync())
+            {
+                if (IsDisposed) // lock may not be fair
+                    return;
+                IsDisposed = true;
+            }
+
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
+        }
+
+        private void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                foreach (var connection in Peers)
+                    connection.Dispose();
+                Peers.Clear();
+                listener?.Stop();
+
+                metaFile?.Dispose();
+
+                File.Delete(MetaFilePath);
+            }
+        }
+
+        public MessagingServer(string editorExecutablePath, string projectMetadataDir, ILogger logger)
+        {
+            this.logger = logger;
+
+            MetaFilePath = Path.Combine(projectMetadataDir, GodotIdeMetadata.DefaultFileName);
+
+            // Make sure the directory exists
+            Directory.CreateDirectory(projectMetadataDir);
+
+            // The Godot editor's file system thread can keep the file open for writing, so we are forced to allow write sharing...
+            const FileShare metaFileShare = FileShare.ReadWrite;
+
+            metaFile = File.Open(MetaFilePath, FileMode.Create, FileAccess.Write, metaFileShare);
+
+            listener = new TcpListener(new IPEndPoint(IPAddress.Loopback, port: 0));
+            listener.Start();
+
+            int port = ((IPEndPoint)listener.Server.LocalEndPoint).Port;
+            using (var metaFileWriter = new StreamWriter(metaFile, Encoding.UTF8))
+            {
+                metaFileWriter.WriteLine(port);
+                metaFileWriter.WriteLine(editorExecutablePath);
+            }
+        }
+
+        private async Task AcceptClient(TcpClient tcpClient)
+        {
+            logger.LogDebug("Accept client...");
+
+            using (var peer = new Peer(tcpClient, new ServerHandshake(), new ServerMessageHandler(), logger))
+            {
+                // ReSharper disable AccessToDisposedClosure
+                peer.Connected += () =>
+                {
+                    logger.LogInfo("Connection open with Ide Client");
+
+                    if (clientConnectedAwaiters.TryGetValue(peer.RemoteIdentity, out var queue))
+                    {
+                        while (queue.Count > 0)
+                            queue.Dequeue().SetResult(true);
+                        clientConnectedAwaiters.Remove(peer.RemoteIdentity);
+                    }
+                };
+
+                peer.Disconnected += () =>
+                {
+                    if (clientDisconnectedAwaiters.TryGetValue(peer.RemoteIdentity, out var queue))
+                    {
+                        while (queue.Count > 0)
+                            queue.Dequeue().SetResult(true);
+                        clientDisconnectedAwaiters.Remove(peer.RemoteIdentity);
+                    }
+                };
+                // ReSharper restore AccessToDisposedClosure
+
+                try
+                {
+                    if (!await peer.DoHandshake("server"))
+                    {
+                        logger.LogError("Handshake failed");
+                        return;
+                    }
+                }
+                catch (Exception e)
+                {
+                    logger.LogError("Handshake failed with unhandled exception: ", e);
+                    return;
+                }
+
+                using (await peersSem.UseAsync())
+                    Peers.Add(peer);
+
+                try
+                {
+                    await peer.Process();
+                }
+                finally
+                {
+                    using (await peersSem.UseAsync())
+                        Peers.Remove(peer);
+                }
+            }
+        }
+
+        public async Task Listen()
+        {
+            try
+            {
+                while (!IsDisposed)
+                    _ = AcceptClient(await listener.AcceptTcpClientAsync());
+            }
+            catch (Exception e)
+            {
+                if (!IsDisposed && !(e is SocketException se && se.SocketErrorCode == SocketError.Interrupted))
+                    throw;
+            }
+        }
+
+        public async void BroadcastRequest<TResponse>(string identity, Request request)
+            where TResponse : Response, new()
+        {
+            using (await peersSem.UseAsync())
+            {
+                if (!IsAnyConnected(identity))
+                {
+                    logger.LogError("Cannot write request. No client connected to the Godot Ide Server.");
+                    return;
+                }
+
+                var selectedConnections = string.IsNullOrEmpty(identity) ?
+                    Peers :
+                    Peers.Where(c => c.RemoteIdentity == identity);
+
+                string body = JsonConvert.SerializeObject(request);
+
+                foreach (var connection in selectedConnections)
+                    _ = connection.SendRequest<TResponse>(request.Id, body);
+            }
+        }
+
+        private class ServerHandshake : IHandshake
+        {
+            private static readonly string ServerHandshakeBase = $"{Peer.ServerHandshakeName},Version={Peer.ProtocolVersionMajor}.{Peer.ProtocolVersionMinor}.{Peer.ProtocolVersionRevision}";
+            private static readonly string ClientHandshakePattern = $@"{Regex.Escape(Peer.ClientHandshakeName)},Version=([0-9]+)\.([0-9]+)\.([0-9]+),([_a-zA-Z][_a-zA-Z0-9]{{0,63}})";
+
+            public string GetHandshakeLine(string identity) => $"{ServerHandshakeBase},{identity}";
+
+            public bool IsValidPeerHandshake(string handshake, out string identity, ILogger logger)
+            {
+                identity = null;
+
+                var match = Regex.Match(handshake, ClientHandshakePattern);
+
+                if (!match.Success)
+                    return false;
+
+                if (!uint.TryParse(match.Groups[1].Value, out uint clientMajor) || Peer.ProtocolVersionMajor != clientMajor)
+                {
+                    logger.LogDebug("Incompatible major version: " + match.Groups[1].Value);
+                    return false;
+                }
+
+                // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+                if (!uint.TryParse(match.Groups[2].Value, out uint clientMinor) || Peer.ProtocolVersionMinor > clientMinor)
+                {
+                    logger.LogDebug("Incompatible minor version: " + match.Groups[2].Value);
+                    return false;
+                }
+
+                if (!uint.TryParse(match.Groups[3].Value, out uint _)) // Revision
+                {
+                    logger.LogDebug("Incompatible revision build: " + match.Groups[3].Value);
+                    return false;
+                }
+
+                identity = match.Groups[4].Value;
+
+                return true;
+            }
+        }
+
+        private class ServerMessageHandler : IMessageHandler
+        {
+            private static void DispatchToMainThread(Action action)
+            {
+                var d = new SendOrPostCallback(state => action());
+                Godot.Dispatcher.SynchronizationContext.Post(d, null);
+            }
+
+            private readonly Dictionary<string, Peer.RequestHandler> requestHandlers = InitializeRequestHandlers();
+
+            public async Task<MessageContent> HandleRequest(Peer peer, string id, MessageContent content, ILogger logger)
+            {
+                if (!requestHandlers.TryGetValue(id, out var handler))
+                {
+                    logger.LogError($"Received unknown request: {id}");
+                    return new MessageContent(MessageStatus.RequestNotSupported, "null");
+                }
+
+                try
+                {
+                    var response = await handler(peer, content);
+                    return new MessageContent(response.Status, JsonConvert.SerializeObject(response));
+                }
+                catch (JsonException)
+                {
+                    logger.LogError($"Received request with invalid body: {id}");
+                    return new MessageContent(MessageStatus.InvalidRequestBody, "null");
+                }
+            }
+
+            private static Dictionary<string, Peer.RequestHandler> InitializeRequestHandlers()
+            {
+                return new Dictionary<string, Peer.RequestHandler>
+                {
+                    [PlayRequest.Id] = async (peer, content) =>
+                    {
+                        _ = JsonConvert.DeserializeObject<PlayRequest>(content.Body);
+                        return await HandlePlay();
+                    },
+                    [DebugPlayRequest.Id] = async (peer, content) =>
+                    {
+                        var request = JsonConvert.DeserializeObject<DebugPlayRequest>(content.Body);
+                        return await HandleDebugPlay(request);
+                    },
+                    [StopPlayRequest.Id] = async (peer, content) =>
+                    {
+                        var request = JsonConvert.DeserializeObject<StopPlayRequest>(content.Body);
+                        return await HandleStopPlay(request);
+                    },
+                    [ReloadScriptsRequest.Id] = async (peer, content) =>
+                    {
+                        _ = JsonConvert.DeserializeObject<ReloadScriptsRequest>(content.Body);
+                        return await HandleReloadScripts();
+                    },
+                    [CodeCompletionRequest.Id] = async (peer, content) =>
+                    {
+                        var request = JsonConvert.DeserializeObject<CodeCompletionRequest>(content.Body);
+                        return await HandleCodeCompletionRequest(request);
+                    }
+                };
+            }
+
+            private static Task<Response> HandlePlay()
+            {
+                DispatchToMainThread(() =>
+                {
+                    // TODO: Add BuildBeforePlaying flag to PlayRequest
+
+                    // Run the game
+                    Internal.EditorRunPlay();
+                });
+                return Task.FromResult<Response>(new PlayResponse());
+            }
+
+            private static Task<Response> HandleDebugPlay(DebugPlayRequest request)
+            {
+                DispatchToMainThread(() =>
+                {
+                    // Tell the build callback whether the editor already built the solution or not
+                    GodotSharpEditor.Instance.SkipBuildBeforePlaying = !(request.BuildBeforePlaying ?? true);
+
+                    // Pass the debugger agent settings to the player via an environment variables
+                    // TODO: It would be better if this was an argument in EditorRunPlay instead
+                    Environment.SetEnvironmentVariable("GODOT_MONO_DEBUGGER_AGENT",
+                        "--debugger-agent=transport=dt_socket" +
+                        $",address={request.DebuggerHost}:{request.DebuggerPort}" +
+                        ",server=n");
+
+                    // Run the game
+                    Internal.EditorRunPlay();
+
+                    // Restore normal settings
+                    Environment.SetEnvironmentVariable("GODOT_MONO_DEBUGGER_AGENT", "");
+                    GodotSharpEditor.Instance.SkipBuildBeforePlaying = false;
+                });
+                return Task.FromResult<Response>(new DebugPlayResponse());
+            }
+
+            private static Task<Response> HandleStopPlay(StopPlayRequest request)
+            {
+                DispatchToMainThread(Internal.EditorRunStop);
+                return Task.FromResult<Response>(new StopPlayResponse());
+            }
+
+            private static Task<Response> HandleReloadScripts()
+            {
+                DispatchToMainThread(Internal.ScriptEditorDebugger_ReloadScripts);
+                return Task.FromResult<Response>(new ReloadScriptsResponse());
+            }
+
+            private static async Task<Response> HandleCodeCompletionRequest(CodeCompletionRequest request)
+            {
+                // This is needed if the "resource path" part of the path is case insensitive.
+                // However, it doesn't fix resource loading if the rest of the path is also case insensitive.
+                string scriptFileLocalized = FsPathUtils.LocalizePathWithCaseChecked(request.ScriptFile);
+
+                var response = new CodeCompletionResponse {Kind = request.Kind, ScriptFile = request.ScriptFile};
+                response.Suggestions = await Task.Run(() =>
+                    Internal.CodeCompletionRequest(response.Kind, scriptFileLocalized ?? request.ScriptFile));
+                return response;
+            }
+        }
+    }
+}
diff --git a/modules/mono/editor/GodotTools/GodotTools/Ides/MonoDevelop/Instance.cs b/modules/mono/editor/GodotTools/GodotTools/Ides/MonoDevelop/Instance.cs
index 6026c109ad..d6fa2eeba7 100644
--- a/modules/mono/editor/GodotTools/GodotTools/Ides/MonoDevelop/Instance.cs
+++ b/modules/mono/editor/GodotTools/GodotTools/Ides/MonoDevelop/Instance.cs
@@ -7,14 +7,16 @@ using GodotTools.Utils;
 
 namespace GodotTools.Ides.MonoDevelop
 {
-    public class Instance
+    public class Instance : IDisposable
     {
+        public DateTime LaunchTime { get; private set; }
         private readonly string solutionFile;
         private readonly EditorId editorId;
 
         private Process process;
 
         public bool IsRunning => process != null && !process.HasExited;
+        public bool IsDisposed { get; private set; }
 
         public void Execute()
         {
@@ -59,6 +61,8 @@ namespace GodotTools.Ides.MonoDevelop
             if (command == null)
                 throw new FileNotFoundException();
 
+            LaunchTime = DateTime.Now;
+
             if (newWindow)
             {
                 process = Process.Start(new ProcessStartInfo
@@ -88,6 +92,12 @@ namespace GodotTools.Ides.MonoDevelop
             this.editorId = editorId;
         }
 
+        public void Dispose()
+        {
+            IsDisposed = true;
+            process?.Dispose();
+        }
+
         private static readonly IReadOnlyDictionary<EditorId, string> ExecutableNames;
         private static readonly IReadOnlyDictionary<EditorId, string> BundleIds;
 
@@ -118,7 +128,7 @@ namespace GodotTools.Ides.MonoDevelop
                     {EditorId.MonoDevelop, "MonoDevelop.exe"}
                 };
             }
-            else if (OS.IsUnixLike())
+            else if (OS.IsUnixLike)
             {
                 ExecutableNames = new Dictionary<EditorId, string>
                 {
diff --git a/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathLocator.cs b/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathLocator.cs
index 9038333d38..e22e9af919 100644
--- a/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathLocator.cs
+++ b/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathLocator.cs
@@ -11,6 +11,10 @@ using Environment = System.Environment;
 using File = System.IO.File;
 using Path = System.IO.Path;
 using OS = GodotTools.Utils.OS;
+// ReSharper disable UnassignedField.Local
+// ReSharper disable InconsistentNaming
+// ReSharper disable UnassignedField.Global
+// ReSharper disable MemberHidesStaticFromOuterClass
 
 namespace GodotTools.Ides.Rider
 {
@@ -32,7 +36,7 @@ namespace GodotTools.Ides.Rider
                 {
                     return CollectRiderInfosMac();
                 }
-                if (OS.IsUnixLike())
+                if (OS.IsUnixLike)
                 {
                     return CollectAllRiderPathsLinux();
                 }
@@ -131,28 +135,45 @@ namespace GodotTools.Ides.Rider
             if (OS.IsWindows)
             {
                 var localAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
-                return Path.Combine(localAppData, @"JetBrains\Toolbox\apps\Rider");
+                return GetToolboxRiderRootPath(localAppData);
             }
 
             if (OS.IsOSX)
             {
                 var home = Environment.GetEnvironmentVariable("HOME");
-                if (!string.IsNullOrEmpty(home))
-                {
-                    return Path.Combine(home, @"Library/Application Support/JetBrains/Toolbox/apps/Rider");
-                }
+                if (string.IsNullOrEmpty(home))
+                    return string.Empty;
+                var localAppData = Path.Combine(home, @"Library/Application Support");
+                return GetToolboxRiderRootPath(localAppData);
             }
 
-            if (OS.IsUnixLike())
+            if (OS.IsUnixLike)
             {
                 var home = Environment.GetEnvironmentVariable("HOME");
-                if (!string.IsNullOrEmpty(home))
-                {
-                    return Path.Combine(home, @".local/share/JetBrains/Toolbox/apps/Rider");
-                }
+                if (string.IsNullOrEmpty(home))
+                    return string.Empty;
+                var localAppData = Path.Combine(home, @".local/share");
+                return GetToolboxRiderRootPath(localAppData);
             }
 
-            throw new Exception("Unexpected OS.");
+            return string.Empty;
+        }
+
+
+        private static string GetToolboxRiderRootPath(string localAppData)
+        {
+            var toolboxPath = Path.Combine(localAppData, @"JetBrains/Toolbox");
+            var settingsJson = Path.Combine(toolboxPath, ".settings.json");
+
+            if (File.Exists(settingsJson))
+            {
+                var path = SettingsJson.GetInstallLocationFromJson(File.ReadAllText(settingsJson));
+                if (!string.IsNullOrEmpty(path))
+                    toolboxPath = path;
+            }
+
+            var toolboxRiderRootPath = Path.Combine(toolboxPath, @"apps/Rider");
+            return toolboxRiderRootPath;
         }
 
         internal static ProductInfo GetBuildVersion(string path)
@@ -188,7 +209,7 @@ namespace GodotTools.Ides.Rider
 
         private static string GetRelativePathToBuildTxt()
         {
-            if (OS.IsWindows || OS.IsUnixLike())
+            if (OS.IsWindows || OS.IsUnixLike)
                 return "../../build.txt";
             if (OS.IsOSX)
                 return "Contents/Resources/build.txt";
@@ -197,20 +218,29 @@ namespace GodotTools.Ides.Rider
 
         private static void CollectPathsFromRegistry(string registryKey, List<string> installPaths)
         {
+            using (var key = Registry.CurrentUser.OpenSubKey(registryKey))
+            {
+                CollectPathsFromRegistry(installPaths, key);
+            }
             using (var key = Registry.LocalMachine.OpenSubKey(registryKey))
             {
-                if (key == null) return;
-                foreach (var subkeyName in key.GetSubKeyNames().Where(a => a.Contains("Rider")))
+                CollectPathsFromRegistry(installPaths, key);
+            }
+        }
+
+        private static void CollectPathsFromRegistry(List<string> installPaths, RegistryKey key)
+        {
+            if (key == null) return;
+            foreach (var subkeyName in key.GetSubKeyNames().Where(a => a.Contains("Rider")))
+            {
+                using (var subkey = key.OpenSubKey(subkeyName))
                 {
-                    using (var subkey = key.OpenSubKey(subkeyName))
-                    {
-                        var folderObject = subkey?.GetValue("InstallLocation");
-                        if (folderObject == null) continue;
-                        var folder = folderObject.ToString();
-                        var possiblePath = Path.Combine(folder, @"bin\rider64.exe");
-                        if (File.Exists(possiblePath))
-                            installPaths.Add(possiblePath);
-                    }
+                    var folderObject = subkey?.GetValue("InstallLocation");
+                    if (folderObject == null) continue;
+                    var folder = folderObject.ToString();
+                    var possiblePath = Path.Combine(folder, @"bin\rider64.exe");
+                    if (File.Exists(possiblePath))
+                        installPaths.Add(possiblePath);
                 }
             }
         }
@@ -226,8 +256,8 @@ namespace GodotTools.Ides.Rider
               {
                   try
                   {
-                // use history.json - last entry stands for the active build https://jetbrains.slack.com/archives/C07KNP99D/p1547807024066500?thread_ts=1547731708.057700&cid=C07KNP99D
-                var historyFile = Path.Combine(channelDir, ".history.json");
+                      // use history.json - last entry stands for the active build https://jetbrains.slack.com/archives/C07KNP99D/p1547807024066500?thread_ts=1547731708.057700&cid=C07KNP99D
+                      var historyFile = Path.Combine(channelDir, ".history.json");
                       if (File.Exists(historyFile))
                       {
                           var json = File.ReadAllText(historyFile);
@@ -255,14 +285,14 @@ namespace GodotTools.Ides.Rider
                           }
                       }
 
-                // changes in toolbox json files format may brake the logic above, so return all found Rider installations
-                return Directory.GetDirectories(channelDir)
-                  .SelectMany(buildDir => GetExecutablePaths(dirName, searchPattern, isMac, buildDir));
+                      // changes in toolbox json files format may brake the logic above, so return all found Rider installations
+                      return Directory.GetDirectories(channelDir)
+                          .SelectMany(buildDir => GetExecutablePaths(dirName, searchPattern, isMac, buildDir));
                   }
                   catch (Exception e)
                   {
-                // do not write to Debug.Log, just log it.
-                Logger.Warn($"Failed to get RiderPath from {channelDir}", e);
+                      // do not write to Debug.Log, just log it.
+                      Logger.Warn($"Failed to get RiderPath from {channelDir}", e);
                   }
 
                   return new string[0];
@@ -289,6 +319,27 @@ namespace GodotTools.Ides.Rider
 #pragma warning disable 0649
 
         [Serializable]
+        class SettingsJson
+        {
+            public string install_location;
+
+            [CanBeNull]
+            public static string GetInstallLocationFromJson(string json)
+            {
+                try
+                {
+                    return JsonConvert.DeserializeObject<SettingsJson>(json).install_location;
+                }
+                catch (Exception)
+                {
+                    Logger.Warn($"Failed to get install_location from json {json}");
+                }
+
+                return null;
+            }
+        }
+
+        [Serializable]
         class ToolboxHistory
         {
             public List<ItemNode> history;
@@ -372,7 +423,6 @@ namespace GodotTools.Ides.Rider
         [Serializable]
         class ActiveApplication
         {
-            // ReSharper disable once InconsistentNaming
             public List<string> builds;
         }
 
@@ -380,6 +430,7 @@ namespace GodotTools.Ides.Rider
 
         public struct RiderInfo
         {
+            // ReSharper disable once NotAccessedField.Global
             public bool IsToolbox;
             public string Presentation;
             public Version BuildNumber;
diff --git a/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathManager.cs b/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathManager.cs
index 558a242bf9..16f91a0925 100644
--- a/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathManager.cs
+++ b/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathManager.cs
@@ -9,13 +9,13 @@ namespace GodotTools.Ides.Rider
 {
     public static class RiderPathManager
     {
-        private static readonly string editorPathSettingName = "mono/editor/editor_path_optional";
+        public static readonly string EditorPathSettingName = "mono/editor/editor_path_optional";
 
         private static string GetRiderPathFromSettings()
         {
             var editorSettings = GodotSharpEditor.Instance.GetEditorInterface().GetEditorSettings();
-            if (editorSettings.HasSetting(editorPathSettingName))
-                return (string)editorSettings.GetSetting(editorPathSettingName);
+            if (editorSettings.HasSetting(EditorPathSettingName))
+                return (string)editorSettings.GetSetting(EditorPathSettingName);
             return null;
         }
 
@@ -25,22 +25,22 @@ namespace GodotTools.Ides.Rider
             var editor = (ExternalEditorId)editorSettings.GetSetting("mono/editor/external_editor");
             if (editor == ExternalEditorId.Rider)
             {
-                if (!editorSettings.HasSetting(editorPathSettingName))
+                if (!editorSettings.HasSetting(EditorPathSettingName))
                 {
-                    Globals.EditorDef(editorPathSettingName, "Optional");
+                    Globals.EditorDef(EditorPathSettingName, "Optional");
                     editorSettings.AddPropertyInfo(new Godot.Collections.Dictionary
                     {
                         ["type"] = Variant.Type.String,
-                        ["name"] = editorPathSettingName,
+                        ["name"] = EditorPathSettingName,
                         ["hint"] = PropertyHint.File,
                         ["hint_string"] = ""
                     });
                 }
 
-                var riderPath = (string)editorSettings.GetSetting(editorPathSettingName);
+                var riderPath = (string)editorSettings.GetSetting(EditorPathSettingName);
                 if (IsRiderAndExists(riderPath))
                 {
-                    Globals.EditorDef(editorPathSettingName, riderPath);
+                    Globals.EditorDef(EditorPathSettingName, riderPath);
                     return;
                 }
 
@@ -50,17 +50,20 @@ namespace GodotTools.Ides.Rider
                     return;
 
                 var newPath = paths.Last().Path;
-                Globals.EditorDef(editorPathSettingName, newPath);
-                editorSettings.SetSetting(editorPathSettingName, newPath);
+                Globals.EditorDef(EditorPathSettingName, newPath);
+                editorSettings.SetSetting(EditorPathSettingName, newPath);
             }
         }
 
-        private static bool IsRider(string path)
+        public static bool IsExternalEditorSetToRider(EditorSettings editorSettings)
+        {
+            return editorSettings.HasSetting(EditorPathSettingName) && IsRider((string) editorSettings.GetSetting(EditorPathSettingName));
+        }
+
+        public static bool IsRider(string path)
         {
             if (string.IsNullOrEmpty(path))
-            {
                 return false;
-            }
 
             var fileInfo = new FileInfo(path);
             var filename = fileInfo.Name.ToLowerInvariant();
@@ -81,8 +84,8 @@ namespace GodotTools.Ides.Rider
                 return null;
 
             var newPath = paths.Last().Path;
-            editorSettings.SetSetting(editorPathSettingName, newPath);
-            Globals.EditorDef(editorPathSettingName, newPath);
+            editorSettings.SetSetting(EditorPathSettingName, newPath);
+            Globals.EditorDef(EditorPathSettingName, newPath);
             return newPath;
         }
 
diff --git a/modules/mono/editor/GodotTools/GodotTools/Internals/Internal.cs b/modules/mono/editor/GodotTools/GodotTools/Internals/Internal.cs
index de361ba844..7e5049e4b7 100644
--- a/modules/mono/editor/GodotTools/GodotTools/Internals/Internal.cs
+++ b/modules/mono/editor/GodotTools/GodotTools/Internals/Internal.cs
@@ -2,13 +2,14 @@ using System;
 using System.Runtime.CompilerServices;
 using Godot;
 using Godot.Collections;
+using GodotTools.IdeMessaging.Requests;
 
 namespace GodotTools.Internals
 {
     public static class Internal
     {
         public const string CSharpLanguageType = "CSharpScript";
-        public const string CSharpLanguageExtension = "cs";
+        public const string CSharpLanguageExtension = ".cs";
 
         public static string UpdateApiAssembliesFromPrebuilt(string config) =>
             internal_UpdateApiAssembliesFromPrebuilt(config);
@@ -34,7 +35,7 @@ namespace GodotTools.Internals
 
         public static void ReloadAssemblies(bool softReload) => internal_ReloadAssemblies(softReload);
 
-        public static void ScriptEditorDebuggerReloadScripts() => internal_ScriptEditorDebuggerReloadScripts();
+        public static void EditorDebuggerNodeReloadScripts() => internal_EditorDebuggerNodeReloadScripts();
 
         public static bool ScriptEditorEdit(Resource resource, int line, int col, bool grabFocus = true) =>
             internal_ScriptEditorEdit(resource, line, col, grabFocus);
@@ -52,6 +53,9 @@ namespace GodotTools.Internals
 
         public static void ScriptEditorDebugger_ReloadScripts() => internal_ScriptEditorDebugger_ReloadScripts();
 
+        public static string[] CodeCompletionRequest(CodeCompletionRequest.CompletionKind kind, string scriptFile) =>
+            internal_CodeCompletionRequest((int)kind, scriptFile);
+
         #region Internal
 
         [MethodImpl(MethodImplOptions.InternalCall)]
@@ -88,7 +92,7 @@ namespace GodotTools.Internals
         private static extern void internal_ReloadAssemblies(bool softReload);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        private static extern void internal_ScriptEditorDebuggerReloadScripts();
+        private static extern void internal_EditorDebuggerNodeReloadScripts();
 
         [MethodImpl(MethodImplOptions.InternalCall)]
         private static extern bool internal_ScriptEditorEdit(Resource resource, int line, int col, bool grabFocus);
@@ -111,6 +115,9 @@ namespace GodotTools.Internals
         [MethodImpl(MethodImplOptions.InternalCall)]
         private static extern void internal_ScriptEditorDebugger_ReloadScripts();
 
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        private static extern string[] internal_CodeCompletionRequest(int kind, string scriptFile);
+
         #endregion
     }
 }
diff --git a/modules/mono/editor/GodotTools/GodotTools/Internals/ScriptClassParser.cs b/modules/mono/editor/GodotTools/GodotTools/Internals/ScriptClassParser.cs
index 7fb087467f..c72a84c513 100644
--- a/modules/mono/editor/GodotTools/GodotTools/Internals/ScriptClassParser.cs
+++ b/modules/mono/editor/GodotTools/GodotTools/Internals/ScriptClassParser.cs
@@ -13,9 +13,13 @@ namespace GodotTools.Internals
             public string Name { get; }
             public string Namespace { get; }
             public bool Nested { get; }
-            public int BaseCount { get; }
+            public long BaseCount { get; }
 
-            public ClassDecl(string name, string @namespace, bool nested, int baseCount)
+            public string SearchName => Nested ?
+                Name.Substring(Name.LastIndexOf(".", StringComparison.Ordinal) + 1) :
+                Name;
+
+            public ClassDecl(string name, string @namespace, bool nested, long baseCount)
             {
                 Name = name;
                 Namespace = @namespace;
@@ -45,7 +49,7 @@ namespace GodotTools.Internals
                     (string)classDeclDict["name"],
                     (string)classDeclDict["namespace"],
                     (bool)classDeclDict["nested"],
-                    (int)classDeclDict["base_count"]
+                    (long)classDeclDict["base_count"]
                 ));
             }
 
diff --git a/modules/mono/editor/GodotTools/GodotTools/PlaySettings.cs b/modules/mono/editor/GodotTools/GodotTools/PlaySettings.cs
new file mode 100644
index 0000000000..820d0c0b83
--- /dev/null
+++ b/modules/mono/editor/GodotTools/GodotTools/PlaySettings.cs
@@ -0,0 +1,19 @@
+namespace GodotTools
+{
+    public struct PlaySettings
+    {
+        public bool HasDebugger { get; }
+        public string DebuggerHost { get; }
+        public int DebuggerPort { get; }
+
+        public bool BuildBeforePlaying { get; }
+
+        public PlaySettings(string debuggerHost, int debuggerPort, bool buildBeforePlaying)
+        {
+            HasDebugger = true;
+            DebuggerHost = debuggerHost;
+            DebuggerPort = debuggerPort;
+            BuildBeforePlaying = buildBeforePlaying;
+        }
+    }
+}
diff --git a/modules/mono/editor/GodotTools/GodotTools/Properties/AssemblyInfo.cs b/modules/mono/editor/GodotTools/GodotTools/Properties/AssemblyInfo.cs
deleted file mode 100644
index f5fe85c722..0000000000
--- a/modules/mono/editor/GodotTools/GodotTools/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle("GodotTools")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("Godot Engine contributors")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
diff --git a/modules/mono/editor/GodotTools/GodotTools/Utils/FsPathUtils.cs b/modules/mono/editor/GodotTools/GodotTools/Utils/FsPathUtils.cs
new file mode 100644
index 0000000000..c6724ccaf7
--- /dev/null
+++ b/modules/mono/editor/GodotTools/GodotTools/Utils/FsPathUtils.cs
@@ -0,0 +1,48 @@
+using System;
+using System.IO;
+using Godot;
+using GodotTools.Core;
+using JetBrains.Annotations;
+
+namespace GodotTools.Utils
+{
+    public static class FsPathUtils
+    {
+        private static readonly string ResourcePath = ProjectSettings.GlobalizePath("res://");
+
+        private static bool PathStartsWithAlreadyNorm(this string childPath, string parentPath)
+        {
+            // This won't work for Linux/macOS case insensitive file systems, but it's enough for our current problems
+            bool caseSensitive = !OS.IsWindows;
+
+            string parentPathNorm = parentPath.NormalizePath() + Path.DirectorySeparatorChar;
+            string childPathNorm = childPath.NormalizePath() + Path.DirectorySeparatorChar;
+
+            return childPathNorm.StartsWith(parentPathNorm,
+                caseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase);
+        }
+
+        public static bool PathStartsWith(this string childPath, string parentPath)
+        {
+            string childPathNorm = childPath.NormalizePath() + Path.DirectorySeparatorChar;
+            string parentPathNorm = parentPath.NormalizePath() + Path.DirectorySeparatorChar;
+
+            return childPathNorm.PathStartsWithAlreadyNorm(parentPathNorm);
+        }
+
+        [CanBeNull]
+        public static string LocalizePathWithCaseChecked(string path)
+        {
+            string pathNorm = path.NormalizePath() + Path.DirectorySeparatorChar;
+            string resourcePathNorm = ResourcePath.NormalizePath() + Path.DirectorySeparatorChar;
+
+            if (!pathNorm.PathStartsWithAlreadyNorm(resourcePathNorm))
+                return null;
+
+            string result = "res://" + pathNorm.Substring(resourcePathNorm.Length);
+
+            // Remove the last separator we added
+            return result.Substring(0, result.Length - 1);
+        }
+    }
+}
diff --git a/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs b/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs
index 279e67b3eb..6c05891f2c 100644
--- a/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs
+++ b/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs
@@ -5,6 +5,7 @@ using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
+using JetBrains.Annotations;
 
 namespace GodotTools.Utils
 {
@@ -21,11 +22,15 @@ namespace GodotTools.Utils
         {
             public const string Windows = "Windows";
             public const string OSX = "OSX";
-            public const string X11 = "X11";
+            public const string Linux = "Linux";
+            public const string FreeBSD = "FreeBSD";
+            public const string NetBSD = "NetBSD";
+            public const string BSD = "BSD";
             public const string Server = "Server";
             public const string UWP = "UWP";
             public const string Haiku = "Haiku";
             public const string Android = "Android";
+            public const string iOS = "iOS";
             public const string HTML5 = "HTML5";
         }
 
@@ -33,11 +38,12 @@ namespace GodotTools.Utils
         {
             public const string Windows = "windows";
             public const string OSX = "osx";
-            public const string X11 = "x11";
+            public const string LinuxBSD = "linuxbsd";
             public const string Server = "server";
             public const string UWP = "uwp";
             public const string Haiku = "haiku";
             public const string Android = "android";
+            public const string iOS = "iphone";
             public const string HTML5 = "javascript";
         }
 
@@ -45,11 +51,15 @@ namespace GodotTools.Utils
         {
             [Names.Windows] = Platforms.Windows,
             [Names.OSX] = Platforms.OSX,
-            [Names.X11] = Platforms.X11,
+            [Names.Linux] = Platforms.LinuxBSD,
+            [Names.FreeBSD] = Platforms.LinuxBSD,
+            [Names.NetBSD] = Platforms.LinuxBSD,
+            [Names.BSD] = Platforms.LinuxBSD,
             [Names.Server] = Platforms.Server,
             [Names.UWP] = Platforms.UWP,
             [Names.Haiku] = Platforms.Haiku,
             [Names.Android] = Platforms.Android,
+            [Names.iOS] = Platforms.iOS,
             [Names.HTML5] = Platforms.HTML5
         };
 
@@ -58,45 +68,48 @@ namespace GodotTools.Utils
             return name.Equals(GetPlatformName(), StringComparison.OrdinalIgnoreCase);
         }
 
+        private static bool IsAnyOS(IEnumerable<string> names)
+        {
+            return names.Any(p => p.Equals(GetPlatformName(), StringComparison.OrdinalIgnoreCase));
+        }
+
+        private static readonly IEnumerable<string> LinuxBSDPlatforms =
+            new[] {Names.Linux, Names.FreeBSD, Names.NetBSD, Names.BSD};
+
+        private static readonly IEnumerable<string> UnixLikePlatforms =
+            new[] {Names.OSX, Names.Server, Names.Haiku, Names.Android, Names.iOS}
+                .Concat(LinuxBSDPlatforms).ToArray();
+
         private static readonly Lazy<bool> _isWindows = new Lazy<bool>(() => IsOS(Names.Windows));
         private static readonly Lazy<bool> _isOSX = new Lazy<bool>(() => IsOS(Names.OSX));
-        private static readonly Lazy<bool> _isX11 = new Lazy<bool>(() => IsOS(Names.X11));
+        private static readonly Lazy<bool> _isLinuxBSD = new Lazy<bool>(() => IsAnyOS(LinuxBSDPlatforms));
         private static readonly Lazy<bool> _isServer = new Lazy<bool>(() => IsOS(Names.Server));
         private static readonly Lazy<bool> _isUWP = new Lazy<bool>(() => IsOS(Names.UWP));
         private static readonly Lazy<bool> _isHaiku = new Lazy<bool>(() => IsOS(Names.Haiku));
         private static readonly Lazy<bool> _isAndroid = new Lazy<bool>(() => IsOS(Names.Android));
+        private static readonly Lazy<bool> _isiOS = new Lazy<bool>(() => IsOS(Names.iOS));
         private static readonly Lazy<bool> _isHTML5 = new Lazy<bool>(() => IsOS(Names.HTML5));
+        private static readonly Lazy<bool> _isUnixLike = new Lazy<bool>(() => IsAnyOS(UnixLikePlatforms));
 
         public static bool IsWindows => _isWindows.Value || IsUWP;
         public static bool IsOSX => _isOSX.Value;
-        public static bool IsX11 => _isX11.Value;
+        public static bool IsLinuxBSD => _isLinuxBSD.Value;
         public static bool IsServer => _isServer.Value;
         public static bool IsUWP => _isUWP.Value;
         public static bool IsHaiku => _isHaiku.Value;
         public static bool IsAndroid => _isAndroid.Value;
+        public static bool IsiOS => _isiOS.Value;
         public static bool IsHTML5 => _isHTML5.Value;
-
-        private static bool? _isUnixCache;
-        private static readonly string[] UnixLikePlatforms = { Names.OSX, Names.X11, Names.Server, Names.Haiku, Names.Android };
-
-        public static bool IsUnixLike()
-        {
-            if (_isUnixCache.HasValue)
-                return _isUnixCache.Value;
-
-            string osName = GetPlatformName();
-            _isUnixCache = UnixLikePlatforms.Any(p => p.Equals(osName, StringComparison.OrdinalIgnoreCase));
-            return _isUnixCache.Value;
-        }
+        public static bool IsUnixLike => _isUnixLike.Value;
 
         public static char PathSep => IsWindows ? ';' : ':';
 
-        public static string PathWhich(string name)
+        public static string PathWhich([NotNull] string name)
         {
             return IsWindows ? PathWhichWindows(name) : PathWhichUnix(name);
         }
 
-        private static string PathWhichWindows(string name)
+        private static string PathWhichWindows([NotNull] string name)
         {
             string[] windowsExts = Environment.GetEnvironmentVariable("PATHEXT")?.Split(PathSep) ?? new string[] { };
             string[] pathDirs = Environment.GetEnvironmentVariable("PATH")?.Split(PathSep);
@@ -115,13 +128,13 @@ namespace GodotTools.Utils
                 return searchDirs.Select(dir => Path.Combine(dir, name)).FirstOrDefault(File.Exists);
 
             return (from dir in searchDirs
-                    select Path.Combine(dir, name)
+                select Path.Combine(dir, name)
                 into path
-                    from ext in windowsExts
-                    select path + ext).FirstOrDefault(File.Exists);
+                from ext in windowsExts
+                select path + ext).FirstOrDefault(File.Exists);
         }
 
-        private static string PathWhichUnix(string name)
+        private static string PathWhichUnix([NotNull] string name)
         {
             string[] pathDirs = Environment.GetEnvironmentVariable("PATH")?.Split(PathSep);
 
@@ -163,5 +176,33 @@ namespace GodotTools.Utils
                     User32Dll.AllowSetForegroundWindow(process.Id); // allows application to focus itself
             }
         }
+
+        public static int ExecuteCommand(string command, IEnumerable<string> arguments)
+        {
+            // TODO: Once we move to .NET Standard 2.1 we can use ProcessStartInfo.ArgumentList instead
+            string CmdLineArgsToString(IEnumerable<string> args)
+            {
+                // Not perfect, but as long as we are careful...
+                return string.Join(" ", args.Select(arg => arg.Contains(" ") ? $@"""{arg}""" : arg));
+            }
+
+            var startInfo = new ProcessStartInfo(command, CmdLineArgsToString(arguments));
+
+            Console.WriteLine($"Executing: \"{startInfo.FileName}\" {startInfo.Arguments}");
+
+            // Print the output
+            startInfo.RedirectStandardOutput = false;
+            startInfo.RedirectStandardError = false;
+
+            startInfo.UseShellExecute = false;
+
+            using (var process = new Process {StartInfo = startInfo})
+            {
+                process.Start();
+                process.WaitForExit();
+
+                return process.ExitCode;
+            }
+        }
     }
 }
diff --git a/modules/mono/editor/GodotTools/GodotTools/packages.config b/modules/mono/editor/GodotTools/GodotTools/packages.config
deleted file mode 100644
index dd3de2865a..0000000000
--- a/modules/mono/editor/GodotTools/GodotTools/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="JetBrains.Annotations" version="2019.1.3" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net45" />
-</packages>
diff --git a/modules/mono/editor/bindings_generator.cpp b/modules/mono/editor/bindings_generator.cpp
index 9beadb1778..a17c371117 100644
--- a/modules/mono/editor/bindings_generator.cpp
+++ b/modules/mono/editor/bindings_generator.cpp
@@ -45,7 +45,6 @@
 #include "../mono_gd/gd_mono_marshal.h"
 #include "../utils/path_utils.h"
 #include "../utils/string_utils.h"
-#include "csharp_project.h"
 
 #define CS_INDENT "    " // 4 whitespaces
 
@@ -62,10 +61,8 @@
 
 #define OPEN_BLOCK_L2 INDENT2 OPEN_BLOCK INDENT3
 #define OPEN_BLOCK_L3 INDENT3 OPEN_BLOCK INDENT4
-#define OPEN_BLOCK_L4 INDENT4 OPEN_BLOCK INDENT5
 #define CLOSE_BLOCK_L2 INDENT2 CLOSE_BLOCK
 #define CLOSE_BLOCK_L3 INDENT3 CLOSE_BLOCK
-#define CLOSE_BLOCK_L4 INDENT4 CLOSE_BLOCK
 
 #define CS_FIELD_MEMORYOWN "memoryOwn"
 #define CS_PARAM_METHODBIND "method"
@@ -76,7 +73,7 @@
 #define GLUE_HEADER_FILE "glue_header.h"
 #define ICALL_PREFIX "godot_icall_"
 #define SINGLETON_ICALL_SUFFIX "_get_singleton"
-#define ICALL_GET_METHODBIND ICALL_PREFIX "Object_ClassDB_get_method"
+#define ICALL_GET_METHODBIND "__ClassDB_get_method"
 
 #define C_LOCAL_RET "ret"
 #define C_LOCAL_VARARG_RET "vararg_ret"
@@ -95,13 +92,16 @@
 #define C_METHOD_MONOSTR_FROM_GODOT C_NS_MONOMARSHAL "::mono_string_from_godot"
 #define C_METHOD_MONOARRAY_TO(m_type) C_NS_MONOMARSHAL "::mono_array_to_" #m_type
 #define C_METHOD_MONOARRAY_FROM(m_type) C_NS_MONOMARSHAL "::" #m_type "_to_mono_array"
+#define C_METHOD_MANAGED_TO_CALLABLE C_NS_MONOMARSHAL "::managed_to_callable"
+#define C_METHOD_MANAGED_FROM_CALLABLE C_NS_MONOMARSHAL "::callable_to_managed"
+#define C_METHOD_MANAGED_TO_SIGNAL C_NS_MONOMARSHAL "::signal_info_to_callable"
+#define C_METHOD_MANAGED_FROM_SIGNAL C_NS_MONOMARSHAL "::callable_to_signal_info"
 
 #define BINDINGS_GENERATOR_VERSION UINT32_C(11)
 
 const char *BindingsGenerator::TypeInterface::DEFAULT_VARARG_C_IN("\t%0 %1_in = %1;\n");
 
 static String fix_doc_description(const String &p_bbcode) {
-
 	// This seems to be the correct way to do this. It's the same EditorHelp does.
 
 	return p_bbcode.dedent()
@@ -111,7 +111,6 @@ static String fix_doc_description(const String &p_bbcode) {
 }
 
 static String snake_to_pascal_case(const String &p_identifier, bool p_input_is_upper = false) {
-
 	String ret;
 	Vector<String> parts = p_identifier.split("_", true);
 
@@ -121,8 +120,9 @@ static String snake_to_pascal_case(const String &p_identifier, bool p_input_is_u
 		if (part.length()) {
 			part[0] = _find_upper(part[0]);
 			if (p_input_is_upper) {
-				for (int j = 1; j < part.length(); j++)
+				for (int j = 1; j < part.length(); j++) {
 					part[j] = _find_lower(part[j]);
+				}
 			}
 			ret += part;
 		} else {
@@ -144,7 +144,6 @@ static String snake_to_pascal_case(const String &p_identifier, bool p_input_is_u
 }
 
 static String snake_to_camel_case(const String &p_identifier, bool p_input_is_upper = false) {
-
 	String ret;
 	Vector<String> parts = p_identifier.split("_", true);
 
@@ -156,8 +155,9 @@ static String snake_to_camel_case(const String &p_identifier, bool p_input_is_up
 				part[0] = _find_upper(part[0]);
 			}
 			if (p_input_is_upper) {
-				for (int j = i != 0 ? 1 : 0; j < part.length(); j++)
+				for (int j = i != 0 ? 1 : 0; j < part.length(); j++) {
 					part[j] = _find_lower(part[j]);
+				}
 			}
 			ret += part;
 		} else {
@@ -179,11 +179,11 @@ static String snake_to_camel_case(const String &p_identifier, bool p_input_is_up
 }
 
 String BindingsGenerator::bbcode_to_xml(const String &p_bbcode, const TypeInterface *p_itype) {
-
 	// Based on the version in EditorHelp
 
-	if (p_bbcode.empty())
+	if (p_bbcode.empty()) {
 		return String();
+	}
 
 	DocData *doc = EditorHelp::get_doc_data();
 
@@ -200,8 +200,9 @@ String BindingsGenerator::bbcode_to_xml(const String &p_bbcode, const TypeInterf
 	while (pos < bbcode.length()) {
 		int brk_pos = bbcode.find("[", pos);
 
-		if (brk_pos < 0)
+		if (brk_pos < 0) {
 			brk_pos = bbcode.length();
+		}
 
 		if (brk_pos > pos) {
 			String text = bbcode.substr(pos, brk_pos - pos);
@@ -210,19 +211,22 @@ String BindingsGenerator::bbcode_to_xml(const String &p_bbcode, const TypeInterf
 			} else {
 				Vector<String> lines = text.split("\n");
 				for (int i = 0; i < lines.size(); i++) {
-					if (i != 0)
+					if (i != 0) {
 						xml_output.append("<para>");
+					}
 
 					xml_output.append(lines[i].xml_escape());
 
-					if (i != lines.size() - 1)
+					if (i != lines.size() - 1) {
 						xml_output.append("</para>\n");
+					}
 				}
 			}
 		}
 
-		if (brk_pos == bbcode.length())
+		if (brk_pos == bbcode.length()) {
 			break; // nothing else to add
+		}
 
 		int brk_end = bbcode.find("]", brk_pos + 1);
 
@@ -233,13 +237,15 @@ String BindingsGenerator::bbcode_to_xml(const String &p_bbcode, const TypeInterf
 			} else {
 				Vector<String> lines = text.split("\n");
 				for (int i = 0; i < lines.size(); i++) {
-					if (i != 0)
+					if (i != 0) {
 						xml_output.append("<para>");
+					}
 
 					xml_output.append(lines[i].xml_escape());
 
-					if (i != lines.size() - 1)
+					if (i != lines.size() - 1) {
 						xml_output.append("</para>\n");
+					}
 				}
 			}
 
@@ -278,7 +284,7 @@ String BindingsGenerator::bbcode_to_xml(const String &p_bbcode, const TypeInterf
 			Vector<String> link_target_parts = link_target.split(".");
 
 			if (link_target_parts.size() <= 0 || link_target_parts.size() > 2) {
-				ERR_PRINTS("Invalid reference format: '" + tag + "'.");
+				ERR_PRINT("Invalid reference format: '" + tag + "'.");
 
 				xml_output.append("<c>");
 				xml_output.append(tag);
@@ -374,7 +380,7 @@ String BindingsGenerator::bbcode_to_xml(const String &p_bbcode, const TypeInterf
 					xml_output.append(target_enum_itype.proxy_name); // Includes nesting class if any
 					xml_output.append("\"/>");
 				} else {
-					ERR_PRINTS("Cannot resolve enum reference in documentation: '" + link_target + "'.");
+					ERR_PRINT("Cannot resolve enum reference in documentation: '" + link_target + "'.");
 
 					xml_output.append("<c>");
 					xml_output.append(link_target);
@@ -407,13 +413,14 @@ String BindingsGenerator::bbcode_to_xml(const String &p_bbcode, const TypeInterf
 						xml_output.append("\"/>");
 					} else {
 						// Try to find as global enum constant
-						const EnumInterface *target_ienum = NULL;
+						const EnumInterface *target_ienum = nullptr;
 
 						for (const List<EnumInterface>::Element *E = global_enums.front(); E; E = E->next()) {
 							target_ienum = &E->get();
 							target_iconst = find_constant_by_name(target_name, target_ienum->constants);
-							if (target_iconst)
+							if (target_iconst) {
 								break;
+							}
 						}
 
 						if (target_iconst) {
@@ -423,7 +430,7 @@ String BindingsGenerator::bbcode_to_xml(const String &p_bbcode, const TypeInterf
 							xml_output.append(target_iconst->proxy_name);
 							xml_output.append("\"/>");
 						} else {
-							ERR_PRINTS("Cannot resolve global constant reference in documentation: '" + link_target + "'.");
+							ERR_PRINT("Cannot resolve global constant reference in documentation: '" + link_target + "'.");
 
 							xml_output.append("<c>");
 							xml_output.append(link_target);
@@ -445,13 +452,14 @@ String BindingsGenerator::bbcode_to_xml(const String &p_bbcode, const TypeInterf
 						xml_output.append("\"/>");
 					} else {
 						// Try to find as enum constant in the current class
-						const EnumInterface *target_ienum = NULL;
+						const EnumInterface *target_ienum = nullptr;
 
 						for (const List<EnumInterface>::Element *E = target_itype->enums.front(); E; E = E->next()) {
 							target_ienum = &E->get();
 							target_iconst = find_constant_by_name(target_name, target_ienum->constants);
-							if (target_iconst)
+							if (target_iconst) {
 								break;
+							}
 						}
 
 						if (target_iconst) {
@@ -463,7 +471,7 @@ String BindingsGenerator::bbcode_to_xml(const String &p_bbcode, const TypeInterf
 							xml_output.append(target_iconst->proxy_name);
 							xml_output.append("\"/>");
 						} else {
-							ERR_PRINTS("Cannot resolve constant reference in documentation: '" + link_target + "'.");
+							ERR_PRINT("Cannot resolve constant reference in documentation: '" + link_target + "'.");
 
 							xml_output.append("<c>");
 							xml_output.append(link_target);
@@ -503,24 +511,24 @@ String BindingsGenerator::bbcode_to_xml(const String &p_bbcode, const TypeInterf
 				xml_output.append("<c>");
 				xml_output.append(tag);
 				xml_output.append("</c>");
-			} else if (tag == "PoolByteArray") {
-				xml_output.append("<see cref=\"byte\"/>");
-			} else if (tag == "PoolIntArray") {
-				xml_output.append("<see cref=\"int\"/>");
-			} else if (tag == "PoolRealArray") {
-#ifdef REAL_T_IS_DOUBLE
-				xml_output.append("<see cref=\"double\"/>");
-#else
-				xml_output.append("<see cref=\"float\"/>");
-#endif
-			} else if (tag == "PoolStringArray") {
-				xml_output.append("<see cref=\"string\"/>");
-			} else if (tag == "PoolVector2Array") {
-				xml_output.append("<see cref=\"" BINDINGS_NAMESPACE ".Vector2\"/>");
-			} else if (tag == "PoolVector3Array") {
-				xml_output.append("<see cref=\"" BINDINGS_NAMESPACE ".Vector3\"/>");
-			} else if (tag == "PoolColorArray") {
-				xml_output.append("<see cref=\"" BINDINGS_NAMESPACE ".Color\"/>");
+			} else if (tag == "PackedByteArray") {
+				xml_output.append("<see cref=\"T:byte[]\"/>");
+			} else if (tag == "PackedInt32Array") {
+				xml_output.append("<see cref=\"T:int[]\"/>");
+			} else if (tag == "PackedInt64Array") {
+				xml_output.append("<see cref=\"T:long[]\"/>");
+			} else if (tag == "PackedFloat32Array") {
+				xml_output.append("<see cref=\"T:float[]\"/>");
+			} else if (tag == "PackedFloat64Array") {
+				xml_output.append("<see cref=\"T:double[]\"/>");
+			} else if (tag == "PackedStringArray") {
+				xml_output.append("<see cref=\"T:string[]\"/>");
+			} else if (tag == "PackedVector2Array") {
+				xml_output.append("<see cref=\"T:" BINDINGS_NAMESPACE ".Vector2[]\"/>");
+			} else if (tag == "PackedVector3Array") {
+				xml_output.append("<see cref=\"T:" BINDINGS_NAMESPACE ".Vector3[]\"/>");
+			} else if (tag == "PackedColorArray") {
+				xml_output.append("<see cref=\"T:" BINDINGS_NAMESPACE ".Color[]\"/>");
 			} else {
 				const TypeInterface *target_itype = _get_type_or_null(TypeReference(tag));
 
@@ -533,7 +541,7 @@ String BindingsGenerator::bbcode_to_xml(const String &p_bbcode, const TypeInterf
 					xml_output.append(target_itype->proxy_name);
 					xml_output.append("\"/>");
 				} else {
-					ERR_PRINTS("Cannot resolve type reference in documentation: '" + tag + "'.");
+					ERR_PRINT("Cannot resolve type reference in documentation: '" + tag + "'.");
 
 					xml_output.append("<c>");
 					xml_output.append(tag);
@@ -562,8 +570,12 @@ String BindingsGenerator::bbcode_to_xml(const String &p_bbcode, const TypeInterf
 			code_tag = true;
 			pos = brk_end + 1;
 			tag_stack.push_front(tag);
+		} else if (tag == "kbd") {
+			// keyboard combinations are not supported in xml comments
+			pos = brk_end + 1;
+			tag_stack.push_front(tag);
 		} else if (tag == "center") {
-			// center is alignment not supported in xml comments
+			// center alignment is not supported in xml comments
 			pos = brk_end + 1;
 			tag_stack.push_front(tag);
 		} else if (tag == "br") {
@@ -579,8 +591,9 @@ String BindingsGenerator::bbcode_to_xml(const String &p_bbcode, const TypeInterf
 			tag_stack.push_front(tag);
 		} else if (tag == "url") {
 			int end = bbcode.find("[", brk_end);
-			if (end == -1)
+			if (end == -1) {
 				end = bbcode.length();
+			}
 			String url = bbcode.substr(brk_end + 1, end - brk_end - 1);
 			xml_output.append("<a href=\"");
 			xml_output.append(url);
@@ -599,8 +612,9 @@ String BindingsGenerator::bbcode_to_xml(const String &p_bbcode, const TypeInterf
 			tag_stack.push_front("url");
 		} else if (tag == "img") {
 			int end = bbcode.find("[", brk_end);
-			if (end == -1)
+			if (end == -1) {
 				end = bbcode.length();
+			}
 			String image = bbcode.substr(brk_end + 1, end - brk_end - 1);
 
 			// Not supported. Just append the bbcode.
@@ -630,15 +644,15 @@ String BindingsGenerator::bbcode_to_xml(const String &p_bbcode, const TypeInterf
 }
 
 int BindingsGenerator::_determine_enum_prefix(const EnumInterface &p_ienum) {
-
 	CRASH_COND(p_ienum.constants.empty());
 
 	const ConstantInterface &front_iconstant = p_ienum.constants.front()->get();
 	Vector<String> front_parts = front_iconstant.name.split("_", /* p_allow_empty: */ true);
 	int candidate_len = front_parts.size() - 1;
 
-	if (candidate_len == 0)
+	if (candidate_len == 0) {
 		return 0;
+	}
 
 	for (const List<ConstantInterface>::Element *E = p_ienum.constants.front()->next(); E; E = E->next()) {
 		const ConstantInterface &iconstant = E->get();
@@ -650,21 +664,22 @@ int BindingsGenerator::_determine_enum_prefix(const EnumInterface &p_ienum) {
 			if (front_parts[i] != parts[i]) {
 				// HARDCODED: Some Flag enums have the prefix 'FLAG_' for everything except 'FLAGS_DEFAULT' (same for 'METHOD_FLAG_' and'METHOD_FLAGS_DEFAULT').
 				bool hardcoded_exc = (i == candidate_len - 1 && ((front_parts[i] == "FLAGS" && parts[i] == "FLAG") || (front_parts[i] == "FLAG" && parts[i] == "FLAGS")));
-				if (!hardcoded_exc)
+				if (!hardcoded_exc) {
 					break;
+				}
 			}
 		}
 		candidate_len = i;
 
-		if (candidate_len == 0)
+		if (candidate_len == 0) {
 			return 0;
+		}
 	}
 
 	return candidate_len;
 }
 
 void BindingsGenerator::_apply_prefix_to_enum_constants(BindingsGenerator::EnumInterface &p_ienum, int p_prefix_length) {
-
 	if (p_prefix_length > 0) {
 		for (List<ConstantInterface>::Element *E = p_ienum.constants.front(); E; E = E->next()) {
 			int curr_prefix_length = p_prefix_length;
@@ -675,22 +690,25 @@ void BindingsGenerator::_apply_prefix_to_enum_constants(BindingsGenerator::EnumI
 
 			Vector<String> parts = constant_name.split("_", /* p_allow_empty: */ true);
 
-			if (parts.size() <= curr_prefix_length)
+			if (parts.size() <= curr_prefix_length) {
 				continue;
+			}
 
 			if (parts[curr_prefix_length][0] >= '0' && parts[curr_prefix_length][0] <= '9') {
 				// The name of enum constants may begin with a numeric digit when strip from the enum prefix,
 				// so we make the prefix for this constant one word shorter in those cases.
 				for (curr_prefix_length = curr_prefix_length - 1; curr_prefix_length > 0; curr_prefix_length--) {
-					if (parts[curr_prefix_length][0] < '0' || parts[curr_prefix_length][0] > '9')
+					if (parts[curr_prefix_length][0] < '0' || parts[curr_prefix_length][0] > '9') {
 						break;
+					}
 				}
 			}
 
 			constant_name = "";
 			for (int i = curr_prefix_length; i < parts.size(); i++) {
-				if (i > curr_prefix_length)
+				if (i > curr_prefix_length) {
 					constant_name += "_";
+				}
 				constant_name += parts[i];
 			}
 
@@ -700,12 +718,12 @@ void BindingsGenerator::_apply_prefix_to_enum_constants(BindingsGenerator::EnumI
 }
 
 void BindingsGenerator::_generate_method_icalls(const TypeInterface &p_itype) {
-
 	for (const List<MethodInterface>::Element *E = p_itype.methods.front(); E; E = E->next()) {
 		const MethodInterface &imethod = E->get();
 
-		if (imethod.is_virtual)
+		if (imethod.is_virtual) {
 			continue;
+		}
 
 		const TypeInterface *return_type = _get_type_or_placeholder(imethod.return_type);
 
@@ -754,8 +772,9 @@ void BindingsGenerator::_generate_method_icalls(const TypeInterface &p_itype) {
 		List<InternalCall>::Element *match = method_icalls.find(im_icall);
 
 		if (match) {
-			if (p_itype.api_type != ClassDB::API_EDITOR)
+			if (p_itype.api_type != ClassDB::API_EDITOR) {
 				match->get().editor_only = false;
+			}
 			method_icalls_map.insert(&E->get(), &match->get());
 		} else {
 			List<InternalCall>::Element *added = method_icalls.push_back(im_icall);
@@ -765,7 +784,6 @@ void BindingsGenerator::_generate_method_icalls(const TypeInterface &p_itype) {
 }
 
 void BindingsGenerator::_generate_global_constants(StringBuilder &p_output) {
-
 	// Constants (in partial GD class)
 
 	p_output.append("\n#pragma warning disable CS1591 // Disable warning: "
@@ -778,7 +796,7 @@ void BindingsGenerator::_generate_global_constants(StringBuilder &p_output) {
 		const ConstantInterface &iconstant = E->get();
 
 		if (iconstant.const_doc && iconstant.const_doc->description.size()) {
-			String xml_summary = bbcode_to_xml(fix_doc_description(iconstant.const_doc->description), NULL);
+			String xml_summary = bbcode_to_xml(fix_doc_description(iconstant.const_doc->description), nullptr);
 			Vector<String> summary_lines = xml_summary.length() ? xml_summary.split("\n") : Vector<String>();
 
 			if (summary_lines.size()) {
@@ -801,8 +819,9 @@ void BindingsGenerator::_generate_global_constants(StringBuilder &p_output) {
 		p_output.append(";");
 	}
 
-	if (!global_constants.empty())
+	if (!global_constants.empty()) {
 		p_output.append("\n");
+	}
 
 	p_output.append(INDENT1 CLOSE_BLOCK); // end of GD class
 
@@ -839,7 +858,7 @@ void BindingsGenerator::_generate_global_constants(StringBuilder &p_output) {
 			const ConstantInterface &iconstant = F->get();
 
 			if (iconstant.const_doc && iconstant.const_doc->description.size()) {
-				String xml_summary = bbcode_to_xml(fix_doc_description(iconstant.const_doc->description), NULL);
+				String xml_summary = bbcode_to_xml(fix_doc_description(iconstant.const_doc->description), nullptr);
 				Vector<String> summary_lines = xml_summary.length() ? xml_summary.split("\n") : Vector<String>();
 
 				if (summary_lines.size()) {
@@ -864,8 +883,9 @@ void BindingsGenerator::_generate_global_constants(StringBuilder &p_output) {
 
 		p_output.append(INDENT1 CLOSE_BLOCK);
 
-		if (enum_in_static_class)
+		if (enum_in_static_class) {
 			p_output.append(INDENT1 CLOSE_BLOCK);
+		}
 	}
 
 	p_output.append(CLOSE_BLOCK); // end of namespace
@@ -874,7 +894,6 @@ void BindingsGenerator::_generate_global_constants(StringBuilder &p_output) {
 }
 
 Error BindingsGenerator::generate_cs_core_project(const String &p_proj_dir) {
-
 	ERR_FAIL_COND_V(!initialized, ERR_UNCONFIGURED);
 
 	DirAccessRef da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
@@ -900,8 +919,9 @@ Error BindingsGenerator::generate_cs_core_project(const String &p_proj_dir) {
 		_generate_global_constants(constants_source);
 		String output_file = path::join(base_gen_dir, BINDINGS_GLOBAL_SCOPE_CLASS "_constants.cs");
 		Error save_err = _save_file(output_file, constants_source);
-		if (save_err != OK)
+		if (save_err != OK) {
 			return save_err;
+		}
 
 		compile_items.push_back(output_file);
 	}
@@ -909,17 +929,20 @@ Error BindingsGenerator::generate_cs_core_project(const String &p_proj_dir) {
 	for (OrderedHashMap<StringName, TypeInterface>::Element E = obj_types.front(); E; E = E.next()) {
 		const TypeInterface &itype = E.get();
 
-		if (itype.api_type == ClassDB::API_EDITOR)
+		if (itype.api_type == ClassDB::API_EDITOR) {
 			continue;
+		}
 
 		String output_file = path::join(godot_objects_gen_dir, itype.proxy_name + ".cs");
 		Error err = _generate_cs_type(itype, output_file);
 
-		if (err == ERR_SKIP)
+		if (err == ERR_SKIP) {
 			continue;
+		}
 
-		if (err != OK)
+		if (err != OK) {
 			return err;
+		}
 
 		compile_items.push_back(output_file);
 	}
@@ -932,7 +955,7 @@ Error BindingsGenerator::generate_cs_core_project(const String &p_proj_dir) {
 							 "using System.Runtime.CompilerServices;\n"
 							 "\n");
 	cs_icalls_content.append("namespace " BINDINGS_NAMESPACE "\n" OPEN_BLOCK);
-	cs_icalls_content.append(INDENT1 "internal static class " BINDINGS_CLASS_NATIVECALLS "\n" INDENT1 OPEN_BLOCK);
+	cs_icalls_content.append(INDENT1 "internal static class " BINDINGS_CLASS_NATIVECALLS "\n" INDENT1 "{");
 
 	cs_icalls_content.append(MEMBER_BEGIN "internal static ulong godot_api_hash = ");
 	cs_icalls_content.append(String::num_uint64(GDMono::get_singleton()->get_api_core_hash()) + ";\n");
@@ -944,16 +967,18 @@ Error BindingsGenerator::generate_cs_core_project(const String &p_proj_dir) {
 #define ADD_INTERNAL_CALL(m_icall)                                                               \
 	if (!m_icall.editor_only) {                                                                  \
 		cs_icalls_content.append(MEMBER_BEGIN "[MethodImpl(MethodImplOptions.InternalCall)]\n"); \
-		cs_icalls_content.append(INDENT2 "internal extern static ");                             \
+		cs_icalls_content.append(INDENT2 "internal static extern ");                             \
 		cs_icalls_content.append(m_icall.im_type_out + " ");                                     \
 		cs_icalls_content.append(m_icall.name + "(");                                            \
 		cs_icalls_content.append(m_icall.im_sig + ");\n");                                       \
 	}
 
-	for (const List<InternalCall>::Element *E = core_custom_icalls.front(); E; E = E->next())
+	for (const List<InternalCall>::Element *E = core_custom_icalls.front(); E; E = E->next()) {
 		ADD_INTERNAL_CALL(E->get());
-	for (const List<InternalCall>::Element *E = method_icalls.front(); E; E = E->next())
+	}
+	for (const List<InternalCall>::Element *E = method_icalls.front(); E; E = E->next()) {
 		ADD_INTERNAL_CALL(E->get());
+	}
 
 #undef ADD_INTERNAL_CALL
 
@@ -962,8 +987,9 @@ Error BindingsGenerator::generate_cs_core_project(const String &p_proj_dir) {
 	String internal_methods_file = path::join(base_gen_dir, BINDINGS_CLASS_NATIVECALLS ".cs");
 
 	Error err = _save_file(internal_methods_file, cs_icalls_content);
-	if (err != OK)
+	if (err != OK) {
 		return err;
+	}
 
 	compile_items.push_back(internal_methods_file);
 
@@ -982,14 +1008,14 @@ Error BindingsGenerator::generate_cs_core_project(const String &p_proj_dir) {
 	String includes_props_file = path::join(base_gen_dir, "GeneratedIncludes.props");
 
 	err = _save_file(includes_props_file, includes_props_content);
-	if (err != OK)
+	if (err != OK) {
 		return err;
+	}
 
 	return OK;
 }
 
 Error BindingsGenerator::generate_cs_editor_project(const String &p_proj_dir) {
-
 	ERR_FAIL_COND_V(!initialized, ERR_UNCONFIGURED);
 
 	DirAccessRef da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
@@ -1012,17 +1038,20 @@ Error BindingsGenerator::generate_cs_editor_project(const String &p_proj_dir) {
 	for (OrderedHashMap<StringName, TypeInterface>::Element E = obj_types.front(); E; E = E.next()) {
 		const TypeInterface &itype = E.get();
 
-		if (itype.api_type != ClassDB::API_EDITOR)
+		if (itype.api_type != ClassDB::API_EDITOR) {
 			continue;
+		}
 
 		String output_file = path::join(godot_objects_gen_dir, itype.proxy_name + ".cs");
 		Error err = _generate_cs_type(itype, output_file);
 
-		if (err == ERR_SKIP)
+		if (err == ERR_SKIP) {
 			continue;
+		}
 
-		if (err != OK)
+		if (err != OK) {
 			return err;
+		}
 
 		compile_items.push_back(output_file);
 	}
@@ -1046,16 +1075,18 @@ Error BindingsGenerator::generate_cs_editor_project(const String &p_proj_dir) {
 #define ADD_INTERNAL_CALL(m_icall)                                                          \
 	if (m_icall.editor_only) {                                                              \
 		cs_icalls_content.append(INDENT2 "[MethodImpl(MethodImplOptions.InternalCall)]\n"); \
-		cs_icalls_content.append(INDENT2 "internal extern static ");                        \
+		cs_icalls_content.append(INDENT2 "internal static extern ");                        \
 		cs_icalls_content.append(m_icall.im_type_out + " ");                                \
 		cs_icalls_content.append(m_icall.name + "(");                                       \
 		cs_icalls_content.append(m_icall.im_sig + ");\n");                                  \
 	}
 
-	for (const List<InternalCall>::Element *E = editor_custom_icalls.front(); E; E = E->next())
+	for (const List<InternalCall>::Element *E = editor_custom_icalls.front(); E; E = E->next()) {
 		ADD_INTERNAL_CALL(E->get());
-	for (const List<InternalCall>::Element *E = method_icalls.front(); E; E = E->next())
+	}
+	for (const List<InternalCall>::Element *E = method_icalls.front(); E; E = E->next()) {
 		ADD_INTERNAL_CALL(E->get());
+	}
 
 #undef ADD_INTERNAL_CALL
 
@@ -1064,8 +1095,9 @@ Error BindingsGenerator::generate_cs_editor_project(const String &p_proj_dir) {
 	String internal_methods_file = path::join(base_gen_dir, BINDINGS_CLASS_NATIVECALLS_EDITOR ".cs");
 
 	Error err = _save_file(internal_methods_file, cs_icalls_content);
-	if (err != OK)
+	if (err != OK) {
 		return err;
+	}
 
 	compile_items.push_back(internal_methods_file);
 
@@ -1084,14 +1116,14 @@ Error BindingsGenerator::generate_cs_editor_project(const String &p_proj_dir) {
 	String includes_props_file = path::join(base_gen_dir, "GeneratedIncludes.props");
 
 	err = _save_file(includes_props_file, includes_props_content);
-	if (err != OK)
+	if (err != OK) {
 		return err;
+	}
 
 	return OK;
 }
 
 Error BindingsGenerator::generate_cs_api(const String &p_output_dir) {
-
 	ERR_FAIL_COND_V(!initialized, ERR_UNCONFIGURED);
 
 	String output_dir = path::abspath(path::realpath(p_output_dir));
@@ -1139,7 +1171,6 @@ Error BindingsGenerator::generate_cs_api(const String &p_output_dir) {
 // - Csc warning e.g.:
 // ObjectType/LineEdit.cs(140,38): warning CS0108: 'LineEdit.FocusMode' hides inherited member 'Control.FocusMode'. Use the new keyword if hiding was intended.
 Error BindingsGenerator::_generate_cs_type(const TypeInterface &itype, const String &p_output_file) {
-
 	CRASH_COND(!itype.is_object_type);
 
 	bool is_derived_type = itype.base_name != StringName();
@@ -1207,100 +1238,96 @@ Error BindingsGenerator::_generate_cs_type(const TypeInterface &itype, const Str
 			output.append(obj_types[itype.base_name].proxy_name);
 			output.append("\n");
 		} else {
-			ERR_PRINTS("Base type '" + itype.base_name.operator String() + "' does not exist, for class '" + itype.name + "'.");
+			ERR_PRINT("Base type '" + itype.base_name.operator String() + "' does not exist, for class '" + itype.name + "'.");
 			return ERR_INVALID_DATA;
 		}
 	}
 
 	output.append(INDENT1 "{");
 
-	if (class_doc) {
+	// Add constants
 
-		// Add constants
-
-		for (const List<ConstantInterface>::Element *E = itype.constants.front(); E; E = E->next()) {
-			const ConstantInterface &iconstant = E->get();
-
-			if (iconstant.const_doc && iconstant.const_doc->description.size()) {
-				String xml_summary = bbcode_to_xml(fix_doc_description(iconstant.const_doc->description), &itype);
-				Vector<String> summary_lines = xml_summary.length() ? xml_summary.split("\n") : Vector<String>();
+	for (const List<ConstantInterface>::Element *E = itype.constants.front(); E; E = E->next()) {
+		const ConstantInterface &iconstant = E->get();
 
-				if (summary_lines.size()) {
-					output.append(MEMBER_BEGIN "/// <summary>\n");
+		if (iconstant.const_doc && iconstant.const_doc->description.size()) {
+			String xml_summary = bbcode_to_xml(fix_doc_description(iconstant.const_doc->description), &itype);
+			Vector<String> summary_lines = xml_summary.length() ? xml_summary.split("\n") : Vector<String>();
 
-					for (int i = 0; i < summary_lines.size(); i++) {
-						output.append(INDENT2 "/// ");
-						output.append(summary_lines[i]);
-						output.append("\n");
-					}
+			if (summary_lines.size()) {
+				output.append(MEMBER_BEGIN "/// <summary>\n");
 
-					output.append(INDENT2 "/// </summary>");
+				for (int i = 0; i < summary_lines.size(); i++) {
+					output.append(INDENT2 "/// ");
+					output.append(summary_lines[i]);
+					output.append("\n");
 				}
-			}
 
-			output.append(MEMBER_BEGIN "public const int ");
-			output.append(iconstant.proxy_name);
-			output.append(" = ");
-			output.append(itos(iconstant.value));
-			output.append(";");
+				output.append(INDENT2 "/// </summary>");
+			}
 		}
 
-		if (itype.constants.size())
-			output.append("\n");
+		output.append(MEMBER_BEGIN "public const int ");
+		output.append(iconstant.proxy_name);
+		output.append(" = ");
+		output.append(itos(iconstant.value));
+		output.append(";");
+	}
 
-		// Add enums
+	if (itype.constants.size()) {
+		output.append("\n");
+	}
 
-		for (const List<EnumInterface>::Element *E = itype.enums.front(); E; E = E->next()) {
-			const EnumInterface &ienum = E->get();
+	// Add enums
 
-			ERR_FAIL_COND_V(ienum.constants.empty(), ERR_BUG);
+	for (const List<EnumInterface>::Element *E = itype.enums.front(); E; E = E->next()) {
+		const EnumInterface &ienum = E->get();
 
-			output.append(MEMBER_BEGIN "public enum ");
-			output.append(ienum.cname.operator String());
-			output.append(MEMBER_BEGIN OPEN_BLOCK);
+		ERR_FAIL_COND_V(ienum.constants.empty(), ERR_BUG);
 
-			for (const List<ConstantInterface>::Element *F = ienum.constants.front(); F; F = F->next()) {
-				const ConstantInterface &iconstant = F->get();
+		output.append(MEMBER_BEGIN "public enum ");
+		output.append(ienum.cname.operator String());
+		output.append(MEMBER_BEGIN OPEN_BLOCK);
 
-				if (iconstant.const_doc && iconstant.const_doc->description.size()) {
-					String xml_summary = bbcode_to_xml(fix_doc_description(iconstant.const_doc->description), &itype);
-					Vector<String> summary_lines = xml_summary.length() ? xml_summary.split("\n") : Vector<String>();
+		for (const List<ConstantInterface>::Element *F = ienum.constants.front(); F; F = F->next()) {
+			const ConstantInterface &iconstant = F->get();
 
-					if (summary_lines.size()) {
-						output.append(INDENT3 "/// <summary>\n");
+			if (iconstant.const_doc && iconstant.const_doc->description.size()) {
+				String xml_summary = bbcode_to_xml(fix_doc_description(iconstant.const_doc->description), &itype);
+				Vector<String> summary_lines = xml_summary.length() ? xml_summary.split("\n") : Vector<String>();
 
-						for (int i = 0; i < summary_lines.size(); i++) {
-							output.append(INDENT3 "/// ");
-							output.append(summary_lines[i]);
-							output.append("\n");
-						}
+				if (summary_lines.size()) {
+					output.append(INDENT3 "/// <summary>\n");
 
-						output.append(INDENT3 "/// </summary>\n");
+					for (int i = 0; i < summary_lines.size(); i++) {
+						output.append(INDENT3 "/// ");
+						output.append(summary_lines[i]);
+						output.append("\n");
 					}
-				}
 
-				output.append(INDENT3);
-				output.append(iconstant.proxy_name);
-				output.append(" = ");
-				output.append(itos(iconstant.value));
-				output.append(F != ienum.constants.back() ? ",\n" : "\n");
+					output.append(INDENT3 "/// </summary>\n");
+				}
 			}
 
-			output.append(INDENT2 CLOSE_BLOCK);
+			output.append(INDENT3);
+			output.append(iconstant.proxy_name);
+			output.append(" = ");
+			output.append(itos(iconstant.value));
+			output.append(F != ienum.constants.back() ? ",\n" : "\n");
 		}
 
-		// Add properties
-
-		for (const List<PropertyInterface>::Element *E = itype.properties.front(); E; E = E->next()) {
-			const PropertyInterface &iprop = E->get();
-			Error prop_err = _generate_cs_property(itype, iprop, output);
-			ERR_FAIL_COND_V_MSG(prop_err != OK, prop_err,
-					"Failed to generate property '" + iprop.cname.operator String() +
-							"' for class '" + itype.name + "'.");
-		}
+		output.append(INDENT2 CLOSE_BLOCK);
 	}
 
-	// TODO: BINDINGS_NATIVE_NAME_FIELD should be StringName, once we support it in C#
+	// Add properties
+
+	for (const List<PropertyInterface>::Element *E = itype.properties.front(); E; E = E->next()) {
+		const PropertyInterface &iprop = E->get();
+		Error prop_err = _generate_cs_property(itype, iprop, output);
+		ERR_FAIL_COND_V_MSG(prop_err != OK, prop_err,
+				"Failed to generate property '" + iprop.cname.operator String() +
+						"' for class '" + itype.name + "'.");
+	}
 
 	if (itype.is_singleton) {
 		// Add the type name and the singleton pointer as static fields
@@ -1312,7 +1339,7 @@ Error BindingsGenerator::_generate_cs_type(const TypeInterface &itype, const Str
 		output.append(itype.proxy_name);
 		output.append(").Name);\n" INDENT4 "return singleton;\n" INDENT3 "}\n" INDENT2 "}\n");
 
-		output.append(MEMBER_BEGIN "private const string " BINDINGS_NATIVE_NAME_FIELD " = \"");
+		output.append(MEMBER_BEGIN "private static StringName " BINDINGS_NATIVE_NAME_FIELD " = \"");
 		output.append(itype.name);
 		output.append("\";\n");
 
@@ -1324,7 +1351,7 @@ Error BindingsGenerator::_generate_cs_type(const TypeInterface &itype, const Str
 	} else if (is_derived_type) {
 		// Add member fields
 
-		output.append(MEMBER_BEGIN "private const string " BINDINGS_NATIVE_NAME_FIELD " = \"");
+		output.append(MEMBER_BEGIN "private static StringName " BINDINGS_NATIVE_NAME_FIELD " = \"");
 		output.append(itype.name);
 		output.append("\";\n");
 
@@ -1363,18 +1390,27 @@ Error BindingsGenerator::_generate_cs_type(const TypeInterface &itype, const Str
 				"Failed to generate method '" + imethod.name + "' for class '" + itype.name + "'.");
 	}
 
+	for (const List<SignalInterface>::Element *E = itype.signals_.front(); E; E = E->next()) {
+		const SignalInterface &isignal = E->get();
+		Error method_err = _generate_cs_signal(itype, isignal, output);
+		ERR_FAIL_COND_V_MSG(method_err != OK, method_err,
+				"Failed to generate signal '" + isignal.name + "' for class '" + itype.name + "'.");
+	}
+
 	if (itype.is_singleton) {
 		InternalCall singleton_icall = InternalCall(itype.api_type, ICALL_PREFIX + itype.name + SINGLETON_ICALL_SUFFIX, "IntPtr");
 
-		if (!find_icall_by_name(singleton_icall.name, custom_icalls))
+		if (!find_icall_by_name(singleton_icall.name, custom_icalls)) {
 			custom_icalls.push_back(singleton_icall);
+		}
 	}
 
 	if (is_derived_type && itype.is_instantiable) {
 		InternalCall ctor_icall = InternalCall(itype.api_type, ctor_method, "IntPtr", itype.proxy_name + " obj");
 
-		if (!find_icall_by_name(ctor_icall.name, custom_icalls))
+		if (!find_icall_by_name(ctor_icall.name, custom_icalls)) {
 			custom_icalls.push_back(ctor_icall);
+		}
 	}
 
 	output.append(INDENT1 CLOSE_BLOCK /* class */
@@ -1388,14 +1424,13 @@ Error BindingsGenerator::_generate_cs_type(const TypeInterface &itype, const Str
 }
 
 Error BindingsGenerator::_generate_cs_property(const BindingsGenerator::TypeInterface &p_itype, const PropertyInterface &p_iprop, StringBuilder &p_output) {
-
 	const MethodInterface *setter = p_itype.find_method_by_name(p_iprop.setter);
 
 	// Search it in base types too
 	const TypeInterface *current_type = &p_itype;
 	while (!setter && current_type->base_name != StringName()) {
 		OrderedHashMap<StringName, TypeInterface>::Element base_match = obj_types.find(current_type->base_name);
-		ERR_FAIL_COND_V(!base_match, ERR_BUG);
+		ERR_FAIL_COND_V_MSG(!base_match, ERR_BUG, "Type not found '" + current_type->base_name + "'. Inherited by '" + current_type->name + "'.");
 		current_type = &base_match.get();
 		setter = current_type->find_method_by_name(p_iprop.setter);
 	}
@@ -1406,7 +1441,7 @@ Error BindingsGenerator::_generate_cs_property(const BindingsGenerator::TypeInte
 	current_type = &p_itype;
 	while (!getter && current_type->base_name != StringName()) {
 		OrderedHashMap<StringName, TypeInterface>::Element base_match = obj_types.find(current_type->base_name);
-		ERR_FAIL_COND_V(!base_match, ERR_BUG);
+		ERR_FAIL_COND_V_MSG(!base_match, ERR_BUG, "Type not found '" + current_type->base_name + "'. Inherited by '" + current_type->name + "'.");
 		current_type = &base_match.get();
 		getter = current_type->find_method_by_name(p_iprop.getter);
 	}
@@ -1424,7 +1459,16 @@ Error BindingsGenerator::_generate_cs_property(const BindingsGenerator::TypeInte
 	}
 
 	if (getter && setter) {
-		ERR_FAIL_COND_V(getter->return_type.cname != setter->arguments.back()->get().type.cname, ERR_BUG);
+		const ArgumentInterface &setter_first_arg = setter->arguments.back()->get();
+		if (getter->return_type.cname != setter_first_arg.type.cname) {
+			// Special case for Node::set_name
+			bool whitelisted = getter->return_type.cname == name_cache.type_StringName &&
+							   setter_first_arg.type.cname == name_cache.type_String;
+
+			ERR_FAIL_COND_V_MSG(!whitelisted, ERR_BUG,
+					"Return type from getter doesn't match first argument of setter for property: '" +
+							p_itype.name + "." + String(p_iprop.cname) + "'.");
+		}
 	}
 
 	const TypeReference &proptype_name = getter ? getter->return_type : setter->arguments.back()->get().type;
@@ -1432,6 +1476,9 @@ Error BindingsGenerator::_generate_cs_property(const BindingsGenerator::TypeInte
 	const TypeInterface *prop_itype = _get_type_or_null(proptype_name);
 	ERR_FAIL_NULL_V(prop_itype, ERR_BUG); // Property type not found
 
+	ERR_FAIL_COND_V_MSG(prop_itype->is_singleton, ERR_BUG,
+			"Property type is a singleton: '" + p_itype.name + "." + String(p_iprop.cname) + "'.");
+
 	if (p_iprop.prop_doc && p_iprop.prop_doc->description.size()) {
 		String xml_summary = bbcode_to_xml(fix_doc_description(p_iprop.prop_doc->description), &p_itype);
 		Vector<String> summary_lines = xml_summary.length() ? xml_summary.split("\n") : Vector<String>();
@@ -1451,8 +1498,9 @@ Error BindingsGenerator::_generate_cs_property(const BindingsGenerator::TypeInte
 
 	p_output.append(MEMBER_BEGIN "public ");
 
-	if (p_itype.is_singleton)
+	if (p_itype.is_singleton) {
 		p_output.append("static ");
+	}
 
 	p_output.append(prop_itype->cs_type);
 	p_output.append(" ");
@@ -1474,7 +1522,7 @@ Error BindingsGenerator::_generate_cs_property(const BindingsGenerator::TypeInte
 			if (idx_arg.type.cname != name_cache.type_int) {
 				// Assume the index parameter is an enum
 				const TypeInterface *idx_arg_type = _get_type_or_null(idx_arg.type);
-				CRASH_COND(idx_arg_type == NULL);
+				CRASH_COND(idx_arg_type == nullptr);
 				p_output.append("(" + idx_arg_type->proxy_name + ")" + itos(p_iprop.index));
 			} else {
 				p_output.append(itos(p_iprop.index));
@@ -1502,7 +1550,7 @@ Error BindingsGenerator::_generate_cs_property(const BindingsGenerator::TypeInte
 			if (idx_arg.type.cname != name_cache.type_int) {
 				// Assume the index parameter is an enum
 				const TypeInterface *idx_arg_type = _get_type_or_null(idx_arg.type);
-				CRASH_COND(idx_arg_type == NULL);
+				CRASH_COND(idx_arg_type == nullptr);
 				p_output.append("(" + idx_arg_type->proxy_name + ")" + itos(p_iprop.index) + ", ");
 			} else {
 				p_output.append(itos(p_iprop.index) + ", ");
@@ -1522,10 +1570,12 @@ Error BindingsGenerator::_generate_cs_property(const BindingsGenerator::TypeInte
 }
 
 Error BindingsGenerator::_generate_cs_method(const BindingsGenerator::TypeInterface &p_itype, const BindingsGenerator::MethodInterface &p_imethod, int &p_method_bind_count, StringBuilder &p_output) {
-
 	const TypeInterface *return_type = _get_type_or_placeholder(p_imethod.return_type);
 
-	String method_bind_field = "method_bind_" + itos(p_method_bind_count);
+	ERR_FAIL_COND_V_MSG(return_type->is_singleton, ERR_BUG,
+			"Method return type is a singleton: '" + p_itype.name + "." + p_imethod.name + "'.");
+
+	String method_bind_field = "__method_bind_" + itos(p_method_bind_count);
 
 	String arguments_sig;
 	String cs_in_statements;
@@ -1540,29 +1590,41 @@ Error BindingsGenerator::_generate_cs_method(const BindingsGenerator::TypeInterf
 		const ArgumentInterface &iarg = F->get();
 		const TypeInterface *arg_type = _get_type_or_placeholder(iarg.type);
 
+		ERR_FAIL_COND_V_MSG(arg_type->is_singleton, ERR_BUG,
+				"Argument type is a singleton: '" + iarg.name + "' of method '" + p_itype.name + "." + p_imethod.name + "'.");
+
+		if (iarg.default_argument.size()) {
+			CRASH_COND_MSG(!_arg_default_value_is_assignable_to_type(iarg.def_param_value, *arg_type),
+					"Invalid default value for parameter '" + iarg.name + "' of method '" + p_itype.name + "." + p_imethod.name + "'.");
+		}
+
 		// Add the current arguments to the signature
 		// If the argument has a default value which is not a constant, we will make it Nullable
 		{
-			if (F != p_imethod.arguments.front())
+			if (F != p_imethod.arguments.front()) {
 				arguments_sig += ", ";
+			}
 
-			if (iarg.def_param_mode == ArgumentInterface::NULLABLE_VAL)
+			if (iarg.def_param_mode == ArgumentInterface::NULLABLE_VAL) {
 				arguments_sig += "Nullable<";
+			}
 
 			arguments_sig += arg_type->cs_type;
 
-			if (iarg.def_param_mode == ArgumentInterface::NULLABLE_VAL)
+			if (iarg.def_param_mode == ArgumentInterface::NULLABLE_VAL) {
 				arguments_sig += "> ";
-			else
+			} else {
 				arguments_sig += " ";
+			}
 
 			arguments_sig += iarg.name;
 
 			if (iarg.default_argument.size()) {
-				if (iarg.def_param_mode != ArgumentInterface::CONSTANT)
+				if (iarg.def_param_mode != ArgumentInterface::CONSTANT) {
 					arguments_sig += " = null";
-				else
+				} else {
 					arguments_sig += " = " + sformat(iarg.default_argument, arg_type->cs_type);
+				}
 			}
 		}
 
@@ -1580,17 +1642,19 @@ Error BindingsGenerator::_generate_cs_method(const BindingsGenerator::TypeInterf
 			cs_in_statements += " = ";
 			cs_in_statements += iarg.name;
 
-			if (iarg.def_param_mode == ArgumentInterface::NULLABLE_VAL)
+			if (iarg.def_param_mode == ArgumentInterface::NULLABLE_VAL) {
 				cs_in_statements += ".HasValue ? ";
-			else
+			} else {
 				cs_in_statements += " != null ? ";
+			}
 
 			cs_in_statements += iarg.name;
 
-			if (iarg.def_param_mode == ArgumentInterface::NULLABLE_VAL)
+			if (iarg.def_param_mode == ArgumentInterface::NULLABLE_VAL) {
 				cs_in_statements += ".Value : ";
-			else
+			} else {
 				cs_in_statements += " : ";
+			}
 
 			String def_arg = sformat(iarg.default_argument, arg_type->cs_type);
 
@@ -1611,8 +1675,9 @@ Error BindingsGenerator::_generate_cs_method(const BindingsGenerator::TypeInterf
 	// Generate method
 	{
 		if (!p_imethod.is_virtual && !p_imethod.requires_object_call) {
-			p_output.append(MEMBER_BEGIN "[DebuggerBrowsable(DebuggerBrowsableState.Never)]" MEMBER_BEGIN "private static IntPtr ");
-			p_output.append(method_bind_field + " = Object." ICALL_GET_METHODBIND "(" BINDINGS_NATIVE_NAME_FIELD ", \"");
+			p_output.append(MEMBER_BEGIN "[DebuggerBrowsable(DebuggerBrowsableState.Never)]" MEMBER_BEGIN "private static readonly IntPtr ");
+			p_output.append(method_bind_field);
+			p_output.append(" = Object." ICALL_GET_METHODBIND "(" BINDINGS_NATIVE_NAME_FIELD ", \"");
 			p_output.append(p_imethod.name);
 			p_output.append("\");\n");
 		}
@@ -1639,14 +1704,19 @@ Error BindingsGenerator::_generate_cs_method(const BindingsGenerator::TypeInterf
 		}
 
 		if (!p_imethod.is_internal) {
+			// TODO: This alone adds ~0.2 MB of bloat to the core API assembly. It would be
+			// better to generate a table in the C++ glue instead. That way the strings wouldn't
+			// add that much extra bloat as they're already used in engine code. Also, it would
+			// probably be much faster than looking up the attributes when fetching methods.
 			p_output.append(MEMBER_BEGIN "[GodotMethod(\"");
 			p_output.append(p_imethod.name);
 			p_output.append("\")]");
 		}
 
 		if (p_imethod.is_deprecated) {
-			if (p_imethod.deprecation_message.empty())
-				WARN_PRINTS("An empty deprecation message is discouraged. Method: '" + p_imethod.proxy_name + "'.");
+			if (p_imethod.deprecation_message.empty()) {
+				WARN_PRINT("An empty deprecation message is discouraged. Method: '" + p_imethod.proxy_name + "'.");
+			}
 
 			p_output.append(MEMBER_BEGIN "[Obsolete(\"");
 			p_output.append(p_imethod.deprecation_message);
@@ -1706,8 +1776,9 @@ Error BindingsGenerator::_generate_cs_method(const BindingsGenerator::TypeInterf
 		im_call += ".";
 		im_call += im_icall->name;
 
-		if (p_imethod.arguments.size())
+		if (p_imethod.arguments.size()) {
 			p_output.append(cs_in_statements);
+		}
 
 		if (return_type->cname == name_cache.type_void) {
 			p_output.append(im_call + "(" + icall_params + ");\n");
@@ -1726,8 +1797,115 @@ Error BindingsGenerator::_generate_cs_method(const BindingsGenerator::TypeInterf
 	return OK;
 }
 
-Error BindingsGenerator::generate_glue(const String &p_output_dir) {
+Error BindingsGenerator::_generate_cs_signal(const BindingsGenerator::TypeInterface &p_itype, const BindingsGenerator::SignalInterface &p_isignal, StringBuilder &p_output) {
+	String arguments_sig;
+
+	// Retrieve information from the arguments
+	for (const List<ArgumentInterface>::Element *F = p_isignal.arguments.front(); F; F = F->next()) {
+		const ArgumentInterface &iarg = F->get();
+		const TypeInterface *arg_type = _get_type_or_placeholder(iarg.type);
+
+		ERR_FAIL_COND_V_MSG(arg_type->is_singleton, ERR_BUG,
+				"Argument type is a singleton: '" + iarg.name + "' of signal" + p_itype.name + "." + p_isignal.name + "'.");
+
+		// Add the current arguments to the signature
+
+		if (F != p_isignal.arguments.front()) {
+			arguments_sig += ", ";
+		}
+
+		arguments_sig += arg_type->cs_type;
+		arguments_sig += " ";
+		arguments_sig += iarg.name;
+	}
+
+	// Generate signal
+	{
+		if (p_isignal.method_doc && p_isignal.method_doc->description.size()) {
+			String xml_summary = bbcode_to_xml(fix_doc_description(p_isignal.method_doc->description), &p_itype);
+			Vector<String> summary_lines = xml_summary.length() ? xml_summary.split("\n") : Vector<String>();
+
+			if (summary_lines.size()) {
+				p_output.append(MEMBER_BEGIN "/// <summary>\n");
+
+				for (int i = 0; i < summary_lines.size(); i++) {
+					p_output.append(INDENT2 "/// ");
+					p_output.append(summary_lines[i]);
+					p_output.append("\n");
+				}
+
+				p_output.append(INDENT2 "/// </summary>");
+			}
+		}
+
+		if (p_isignal.is_deprecated) {
+			if (p_isignal.deprecation_message.empty()) {
+				WARN_PRINT("An empty deprecation message is discouraged. Signal: '" + p_isignal.proxy_name + "'.");
+			}
+
+			p_output.append(MEMBER_BEGIN "[Obsolete(\"");
+			p_output.append(p_isignal.deprecation_message);
+			p_output.append("\")]");
+		}
+
+		String delegate_name = p_isignal.proxy_name;
+		delegate_name += "Handler"; // Delegate name is [SignalName]Handler
+
+		// Generate delegate
+		p_output.append(MEMBER_BEGIN "public delegate void ");
+		p_output.append(delegate_name);
+		p_output.append("(");
+		p_output.append(arguments_sig);
+		p_output.append(");\n");
+
+		// TODO:
+		// Could we assume the StringName instance of signal name will never be freed (it's stored in ClassDB) before the managed world is unloaded?
+		// If so, we could store the pointer we get from `data_unique_pointer()` instead of allocating StringName here.
+
+		// Cached signal name (StringName)
+		p_output.append(MEMBER_BEGIN "[DebuggerBrowsable(DebuggerBrowsableState.Never)]" MEMBER_BEGIN "private static StringName __signal_name_");
+		p_output.append(p_isignal.name);
+		p_output.append(" = \"");
+		p_output.append(p_isignal.name);
+		p_output.append("\";\n");
+
+		// Generate event
+		p_output.append(MEMBER_BEGIN "[Signal]" MEMBER_BEGIN "public ");
+
+		if (p_itype.is_singleton) {
+			p_output.append("static ");
+		}
+
+		p_output.append("event ");
+		p_output.append(delegate_name);
+		p_output.append(" ");
+		p_output.append(p_isignal.proxy_name);
+		p_output.append("\n" OPEN_BLOCK_L2);
 
+		if (p_itype.is_singleton) {
+			p_output.append("add => Singleton.Connect(__signal_name_");
+		} else {
+			p_output.append("add => Connect(__signal_name_");
+		}
+
+		p_output.append(p_isignal.name);
+		p_output.append(", new Callable(value));\n");
+
+		if (p_itype.is_singleton) {
+			p_output.append(INDENT3 "remove => Singleton.Disconnect(__signal_name_");
+		} else {
+			p_output.append(INDENT3 "remove => Disconnect(__signal_name_");
+		}
+
+		p_output.append(p_isignal.name);
+		p_output.append(", new Callable(value));\n");
+		p_output.append(CLOSE_BLOCK_L2);
+	}
+
+	return OK;
+}
+
+Error BindingsGenerator::generate_glue(const String &p_output_dir) {
 	ERR_FAIL_COND_V(!initialized, ERR_UNCONFIGURED);
 
 	bool dir_exists = DirAccess::exists(p_output_dir);
@@ -1751,7 +1929,6 @@ Error BindingsGenerator::generate_glue(const String &p_output_dir) {
 			CRASH_COND(itype.cname != name_cache.type_Object);
 			CRASH_COND(!itype.is_instantiable);
 			CRASH_COND(itype.api_type != ClassDB::API_CORE);
-			CRASH_COND(itype.is_reference);
 			CRASH_COND(itype.is_singleton);
 		}
 
@@ -1772,8 +1949,9 @@ Error BindingsGenerator::generate_glue(const String &p_output_dir) {
 			String singleton_icall_name = ICALL_PREFIX + itype.name + SINGLETON_ICALL_SUFFIX;
 			InternalCall singleton_icall = InternalCall(itype.api_type, singleton_icall_name, "IntPtr");
 
-			if (!find_icall_by_name(singleton_icall.name, custom_icalls))
+			if (!find_icall_by_name(singleton_icall.name, custom_icalls)) {
 				custom_icalls.push_back(singleton_icall);
+			}
 
 			output.append("Object* ");
 			output.append(singleton_icall_name);
@@ -1785,8 +1963,9 @@ Error BindingsGenerator::generate_glue(const String &p_output_dir) {
 		if (is_derived_type && itype.is_instantiable) {
 			InternalCall ctor_icall = InternalCall(itype.api_type, ctor_method, "IntPtr", itype.proxy_name + " obj");
 
-			if (!find_icall_by_name(ctor_icall.name, custom_icalls))
+			if (!find_icall_by_name(ctor_icall.name, custom_icalls)) {
 				custom_icalls.push_back(ctor_icall);
+			}
 
 			output.append("Object* ");
 			output.append(ctor_method);
@@ -1832,7 +2011,6 @@ Error BindingsGenerator::generate_glue(const String &p_output_dir) {
 
 	bool tools_sequence = false;
 	for (const List<InternalCall>::Element *E = core_custom_icalls.front(); E; E = E->next()) {
-
 		if (tools_sequence) {
 			if (!E->get().editor_only) {
 				tools_sequence = false;
@@ -1886,8 +2064,9 @@ Error BindingsGenerator::generate_glue(const String &p_output_dir) {
 	output.append("\n#endif // MONO_GLUE_ENABLED\n");
 
 	Error save_err = _save_file(path::join(p_output_dir, "mono_glue.gen.cpp"), output);
-	if (save_err != OK)
+	if (save_err != OK) {
 		return save_err;
+	}
 
 	OS::get_singleton()->print("Mono glue generated successfully\n");
 
@@ -1899,7 +2078,6 @@ uint32_t BindingsGenerator::get_version() {
 }
 
 Error BindingsGenerator::_save_file(const String &p_path, const StringBuilder &p_content) {
-
 	FileAccessRef file = FileAccess::open(p_path, FileAccess::WRITE);
 
 	ERR_FAIL_COND_V_MSG(!file, ERR_FILE_CANT_WRITE, "Cannot open file: '" + p_path + "'.");
@@ -1911,9 +2089,9 @@ Error BindingsGenerator::_save_file(const String &p_path, const StringBuilder &p
 }
 
 Error BindingsGenerator::_generate_glue_method(const BindingsGenerator::TypeInterface &p_itype, const BindingsGenerator::MethodInterface &p_imethod, StringBuilder &p_output) {
-
-	if (p_imethod.is_virtual)
+	if (p_imethod.is_virtual) {
 		return OK; // Ignore
+	}
 
 	bool ret_void = p_imethod.return_type.cname == name_cache.type_void;
 
@@ -1941,10 +2119,12 @@ Error BindingsGenerator::_generate_glue_method(const BindingsGenerator::TypeInte
 				c_in_statements += sformat(", &%s_in);\n", c_param_name);
 			}
 		} else {
-			if (i > 0)
+			if (i > 0) {
 				c_args_var_content += ", ";
-			if (arg_type->c_in.size())
+			}
+			if (arg_type->c_in.size()) {
 				c_in_statements += sformat(arg_type->c_in, arg_type->c_type, c_param_name);
+			}
 			c_args_var_content += sformat(arg_type->c_arg_in, c_param_name);
 		}
 
@@ -1974,8 +2154,9 @@ Error BindingsGenerator::_generate_glue_method(const BindingsGenerator::TypeInte
 	if (!generated_icall_funcs.find(im_icall)) {
 		generated_icall_funcs.push_back(im_icall);
 
-		if (im_icall->editor_only)
+		if (im_icall->editor_only) {
 			p_output.append("#ifdef TOOLS_ENABLED\n");
+		}
 
 		// Generate icall function
 
@@ -2000,7 +2181,7 @@ Error BindingsGenerator::_generate_glue_method(const BindingsGenerator::TypeInte
 
 			if (return_type->is_object_type) {
 				ptrcall_return_type = return_type->is_reference ? "Ref<Reference>" : return_type->c_type;
-				initialization = return_type->is_reference ? "" : " = NULL";
+				initialization = return_type->is_reference ? "" : " = nullptr";
 			} else {
 				ptrcall_return_type = return_type->c_type;
 			}
@@ -2009,12 +2190,12 @@ Error BindingsGenerator::_generate_glue_method(const BindingsGenerator::TypeInte
 			p_output.append(" " C_LOCAL_RET);
 			p_output.append(initialization + ";\n");
 
-			String fail_ret = return_type->c_type_out.ends_with("*") && !return_type->ret_as_byref_arg ? "NULL" : return_type->c_type_out + "()";
+			String fail_ret = return_type->c_type_out.ends_with("*") && !return_type->ret_as_byref_arg ? "nullptr" : return_type->c_type_out + "()";
 
 			if (return_type->ret_as_byref_arg) {
-				p_output.append("\tif (" CS_PARAM_INSTANCE " == NULL) { *arg_ret = ");
+				p_output.append("\tif (" CS_PARAM_INSTANCE " == nullptr) { *arg_ret = ");
 				p_output.append(fail_ret);
-				p_output.append("; ERR_FAIL_MSG(\"Parameter ' arg_ret ' is null.\"); }\n");
+				p_output.append("; ERR_FAIL_MSG(\"Parameter ' " CS_PARAM_INSTANCE " ' is null.\"); }\n");
 			} else {
 				p_output.append("\tERR_FAIL_NULL_V(" CS_PARAM_INSTANCE ", ");
 				p_output.append(fail_ret);
@@ -2054,7 +2235,7 @@ Error BindingsGenerator::_generate_glue_method(const BindingsGenerator::TypeInte
 		}
 
 		if (p_imethod.is_vararg) {
-			p_output.append("\tVariant::CallError vcall_error;\n\t");
+			p_output.append("\tCallable::CallError vcall_error;\n\t");
 
 			if (!ret_void) {
 				// See the comment on the C_LOCAL_VARARG_RET declaration
@@ -2066,7 +2247,7 @@ Error BindingsGenerator::_generate_glue_method(const BindingsGenerator::TypeInte
 			}
 
 			p_output.append(CS_PARAM_METHODBIND "->call(" CS_PARAM_INSTANCE ", ");
-			p_output.append(p_imethod.arguments.size() ? C_LOCAL_PTRCALL_ARGS ".ptr()" : "NULL");
+			p_output.append(p_imethod.arguments.size() ? C_LOCAL_PTRCALL_ARGS ".ptr()" : "nullptr");
 			p_output.append(", total_length, vcall_error);\n");
 
 			if (!ret_void) {
@@ -2077,8 +2258,8 @@ Error BindingsGenerator::_generate_glue_method(const BindingsGenerator::TypeInte
 			}
 		} else {
 			p_output.append("\t" CS_PARAM_METHODBIND "->ptrcall(" CS_PARAM_INSTANCE ", ");
-			p_output.append(p_imethod.arguments.size() ? C_LOCAL_PTRCALL_ARGS ", " : "NULL, ");
-			p_output.append(!ret_void ? "&" C_LOCAL_RET ");\n" : "NULL);\n");
+			p_output.append(p_imethod.arguments.size() ? C_LOCAL_PTRCALL_ARGS ", " : "nullptr, ");
+			p_output.append(!ret_void ? "&" C_LOCAL_RET ");\n" : "nullptr);\n");
 		}
 
 		if (!ret_void) {
@@ -2093,53 +2274,57 @@ Error BindingsGenerator::_generate_glue_method(const BindingsGenerator::TypeInte
 
 		p_output.append(CLOSE_BLOCK "\n");
 
-		if (im_icall->editor_only)
+		if (im_icall->editor_only) {
 			p_output.append("#endif // TOOLS_ENABLED\n");
+		}
 	}
 
 	return OK;
 }
 
 const BindingsGenerator::TypeInterface *BindingsGenerator::_get_type_or_null(const TypeReference &p_typeref) {
-
 	const Map<StringName, TypeInterface>::Element *builtin_type_match = builtin_types.find(p_typeref.cname);
 
-	if (builtin_type_match)
+	if (builtin_type_match) {
 		return &builtin_type_match->get();
+	}
 
 	const OrderedHashMap<StringName, TypeInterface>::Element obj_type_match = obj_types.find(p_typeref.cname);
 
-	if (obj_type_match)
+	if (obj_type_match) {
 		return &obj_type_match.get();
+	}
 
 	if (p_typeref.is_enum) {
 		const Map<StringName, TypeInterface>::Element *enum_match = enum_types.find(p_typeref.cname);
 
-		if (enum_match)
+		if (enum_match) {
 			return &enum_match->get();
+		}
 
 		// Enum not found. Most likely because none of its constants were bound, so it's empty. That's fine. Use int instead.
 		const Map<StringName, TypeInterface>::Element *int_match = builtin_types.find(name_cache.type_int);
-		ERR_FAIL_NULL_V(int_match, NULL);
+		ERR_FAIL_NULL_V(int_match, nullptr);
 		return &int_match->get();
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 const BindingsGenerator::TypeInterface *BindingsGenerator::_get_type_or_placeholder(const TypeReference &p_typeref) {
-
 	const TypeInterface *found = _get_type_or_null(p_typeref);
 
-	if (found)
+	if (found) {
 		return found;
+	}
 
-	ERR_PRINTS(String() + "Type not found. Creating placeholder: '" + p_typeref.cname.operator String() + "'.");
+	ERR_PRINT(String() + "Type not found. Creating placeholder: '" + p_typeref.cname.operator String() + "'.");
 
 	const Map<StringName, TypeInterface>::Element *match = placeholder_types.find(p_typeref.cname);
 
-	if (match)
+	if (match) {
 		return &match->get();
+	}
 
 	TypeInterface placeholder;
 	TypeInterface::create_placeholder_type(placeholder, p_typeref.cname);
@@ -2148,7 +2333,6 @@ const BindingsGenerator::TypeInterface *BindingsGenerator::_get_type_or_placehol
 }
 
 StringName BindingsGenerator::_get_int_type_name_from_meta(GodotTypeInfo::Metadata p_meta) {
-
 	switch (p_meta) {
 		case GodotTypeInfo::METADATA_INT_IS_INT8:
 			return "sbyte";
@@ -2181,7 +2365,6 @@ StringName BindingsGenerator::_get_int_type_name_from_meta(GodotTypeInfo::Metada
 }
 
 StringName BindingsGenerator::_get_float_type_name_from_meta(GodotTypeInfo::Metadata p_meta) {
-
 	switch (p_meta) {
 		case GodotTypeInfo::METADATA_REAL_IS_FLOAT:
 			return "float";
@@ -2199,8 +2382,85 @@ StringName BindingsGenerator::_get_float_type_name_from_meta(GodotTypeInfo::Meta
 	}
 }
 
-bool BindingsGenerator::_populate_object_type_interfaces() {
+bool BindingsGenerator::_arg_default_value_is_assignable_to_type(const Variant &p_val, const TypeInterface &p_arg_type) {
+	if (p_arg_type.name == name_cache.type_Variant) {
+		// Variant can take anything
+		return true;
+	}
 
+	switch (p_val.get_type()) {
+		case Variant::NIL:
+			return p_arg_type.is_object_type ||
+				   name_cache.is_nullable_type(p_arg_type.name);
+		case Variant::BOOL:
+			return p_arg_type.name == name_cache.type_bool;
+		case Variant::INT:
+			return p_arg_type.name == name_cache.type_sbyte ||
+				   p_arg_type.name == name_cache.type_short ||
+				   p_arg_type.name == name_cache.type_int ||
+				   p_arg_type.name == name_cache.type_byte ||
+				   p_arg_type.name == name_cache.type_ushort ||
+				   p_arg_type.name == name_cache.type_uint ||
+				   p_arg_type.name == name_cache.type_long ||
+				   p_arg_type.name == name_cache.type_ulong ||
+				   p_arg_type.name == name_cache.type_float ||
+				   p_arg_type.name == name_cache.type_double ||
+				   p_arg_type.is_enum;
+		case Variant::FLOAT:
+			return p_arg_type.name == name_cache.type_float ||
+				   p_arg_type.name == name_cache.type_double;
+		case Variant::STRING:
+		case Variant::STRING_NAME:
+			return p_arg_type.name == name_cache.type_String ||
+				   p_arg_type.name == name_cache.type_StringName ||
+				   p_arg_type.name == name_cache.type_NodePath;
+		case Variant::NODE_PATH:
+			return p_arg_type.name == name_cache.type_NodePath;
+		case Variant::TRANSFORM:
+		case Variant::TRANSFORM2D:
+		case Variant::BASIS:
+		case Variant::QUAT:
+		case Variant::PLANE:
+		case Variant::AABB:
+		case Variant::COLOR:
+		case Variant::VECTOR2:
+		case Variant::RECT2:
+		case Variant::VECTOR3:
+		case Variant::_RID:
+		case Variant::ARRAY:
+		case Variant::DICTIONARY:
+		case Variant::PACKED_BYTE_ARRAY:
+		case Variant::PACKED_INT32_ARRAY:
+		case Variant::PACKED_INT64_ARRAY:
+		case Variant::PACKED_FLOAT32_ARRAY:
+		case Variant::PACKED_FLOAT64_ARRAY:
+		case Variant::PACKED_STRING_ARRAY:
+		case Variant::PACKED_VECTOR2_ARRAY:
+		case Variant::PACKED_VECTOR3_ARRAY:
+		case Variant::PACKED_COLOR_ARRAY:
+		case Variant::CALLABLE:
+		case Variant::SIGNAL:
+			return p_arg_type.name == Variant::get_type_name(p_val.get_type());
+		case Variant::OBJECT:
+			return p_arg_type.is_object_type;
+		case Variant::VECTOR2I:
+			return p_arg_type.name == name_cache.type_Vector2 ||
+				   p_arg_type.name == Variant::get_type_name(p_val.get_type());
+		case Variant::RECT2I:
+			return p_arg_type.name == name_cache.type_Rect2 ||
+				   p_arg_type.name == Variant::get_type_name(p_val.get_type());
+		case Variant::VECTOR3I:
+			return p_arg_type.name == name_cache.type_Vector3 ||
+				   p_arg_type.name == Variant::get_type_name(p_val.get_type());
+		default:
+			CRASH_NOW_MSG("Unexpected Variant type: " + itos(p_val.get_type()));
+			break;
+	}
+
+	return false;
+}
+
+bool BindingsGenerator::_populate_object_type_interfaces() {
 	obj_types.clear();
 
 	List<StringName> class_list;
@@ -2262,22 +2522,30 @@ bool BindingsGenerator::_populate_object_type_interfaces() {
 		for (const List<PropertyInfo>::Element *E = property_list.front(); E; E = E->next()) {
 			const PropertyInfo &property = E->get();
 
-			if (property.usage & PROPERTY_USAGE_GROUP || property.usage & PROPERTY_USAGE_CATEGORY)
+			if (property.usage & PROPERTY_USAGE_GROUP || property.usage & PROPERTY_USAGE_SUBGROUP || property.usage & PROPERTY_USAGE_CATEGORY) {
 				continue;
+			}
+
+			if (property.name.find("/") >= 0) {
+				// Ignore properties with '/' (slash) in the name. These are only meant for use in the inspector.
+				continue;
+			}
 
 			PropertyInterface iprop;
 			iprop.cname = property.name;
 			iprop.setter = ClassDB::get_property_setter(type_cname, iprop.cname);
 			iprop.getter = ClassDB::get_property_getter(type_cname, iprop.cname);
 
-			if (iprop.setter != StringName())
+			if (iprop.setter != StringName()) {
 				accessor_methods[iprop.setter] = iprop.cname;
-			if (iprop.getter != StringName())
+			}
+			if (iprop.getter != StringName()) {
 				accessor_methods[iprop.getter] = iprop.cname;
+			}
 
 			bool valid = false;
 			iprop.index = ClassDB::get_property_index(type_cname, iprop.cname, &valid);
-			ERR_FAIL_COND_V(!valid, false);
+			ERR_FAIL_COND_V_MSG(!valid, false, "Invalid property: '" + itype.name + "." + String(iprop.cname) + "'.");
 
 			iprop.proxy_name = escape_csharp_keyword(snake_to_pascal_case(iprop.cname));
 
@@ -2289,9 +2557,7 @@ bool BindingsGenerator::_populate_object_type_interfaces() {
 				iprop.proxy_name += "_";
 			}
 
-			iprop.proxy_name = iprop.proxy_name.replace("/", "__"); // Some members have a slash...
-
-			iprop.prop_doc = NULL;
+			iprop.prop_doc = nullptr;
 
 			for (int i = 0; i < itype.class_doc->properties.size(); i++) {
 				const DocData::PropertyDoc &prop_doc = itype.class_doc->properties[i];
@@ -2319,24 +2585,27 @@ bool BindingsGenerator::_populate_object_type_interfaces() {
 
 			int argc = method_info.arguments.size();
 
-			if (method_info.name.empty())
+			if (method_info.name.empty()) {
 				continue;
+			}
 
 			String cname = method_info.name;
 
-			if (blacklisted_methods.find(itype.cname) && blacklisted_methods[itype.cname].find(cname))
+			if (blacklisted_methods.find(itype.cname) && blacklisted_methods[itype.cname].find(cname)) {
 				continue;
+			}
 
 			MethodInterface imethod;
 			imethod.name = method_info.name;
 			imethod.cname = cname;
 
-			if (method_info.flags & METHOD_FLAG_VIRTUAL)
+			if (method_info.flags & METHOD_FLAG_VIRTUAL) {
 				imethod.is_virtual = true;
+			}
 
 			PropertyInfo return_info = method_info.return_val;
 
-			MethodBind *m = imethod.is_virtual ? NULL : ClassDB::get_method(type_cname, method_info.name);
+			MethodBind *m = imethod.is_virtual ? nullptr : ClassDB::get_method(type_cname, method_info.name);
 
 			imethod.is_vararg = m && m->is_vararg();
 
@@ -2354,26 +2623,24 @@ bool BindingsGenerator::_populate_object_type_interfaces() {
 				// We assume the return type is void.
 				imethod.return_type.cname = name_cache.type_void;
 
-				// Actually, more methods like this may be added in the future,
-				// which could actually will return something different.
-				// Let's put this to notify us if that ever happens.
+				// Actually, more methods like this may be added in the future, which could return
+				// something different. Let's put this check to notify us if that ever happens.
 				if (itype.cname != name_cache.type_Object || imethod.name != "free") {
-					WARN_PRINTS("Notification: New unexpected virtual non-overridable method found."
-								" We only expected Object.free, but found '" +
-								itype.name + "." + imethod.name + "'.");
+					WARN_PRINT("Notification: New unexpected virtual non-overridable method found."
+							   " We only expected Object.free, but found '" +
+							   itype.name + "." + imethod.name + "'.");
 				}
 			} else if (return_info.type == Variant::INT && return_info.usage & PROPERTY_USAGE_CLASS_IS_ENUM) {
 				imethod.return_type.cname = return_info.class_name;
 				imethod.return_type.is_enum = true;
 			} else if (return_info.class_name != StringName()) {
 				imethod.return_type.cname = return_info.class_name;
-				if (!imethod.is_virtual && ClassDB::is_parent_class(return_info.class_name, name_cache.type_Reference) && return_info.hint != PROPERTY_HINT_RESOURCE_TYPE) {
-					/* clang-format off */
-					ERR_PRINTS("Return type is reference but hint is not '" _STR(PROPERTY_HINT_RESOURCE_TYPE) "'."
-							" Are you returning a reference type by pointer? Method: '" + itype.name + "." + imethod.name + "'.");
-					/* clang-format on */
-					ERR_FAIL_V(false);
-				}
+
+				bool bad_reference_hint = !imethod.is_virtual && return_info.hint != PROPERTY_HINT_RESOURCE_TYPE &&
+										  ClassDB::is_parent_class(return_info.class_name, name_cache.type_Reference);
+				ERR_FAIL_COND_V_MSG(bad_reference_hint, false,
+						String() + "Return type is reference but hint is not '" _STR(PROPERTY_HINT_RESOURCE_TYPE) "'." +
+								" Are you returning a reference type by pointer? Method: '" + itype.name + "." + imethod.name + "'.");
 			} else if (return_info.hint == PROPERTY_HINT_RESOURCE_TYPE) {
 				imethod.return_type.cname = return_info.hint_string;
 			} else if (return_info.type == Variant::NIL && return_info.usage & PROPERTY_USAGE_NIL_IS_VARIANT) {
@@ -2383,7 +2650,7 @@ bool BindingsGenerator::_populate_object_type_interfaces() {
 			} else {
 				if (return_info.type == Variant::INT) {
 					imethod.return_type.cname = _get_int_type_name_from_meta(m ? m->get_argument_meta(-1) : GodotTypeInfo::METADATA_NONE);
-				} else if (return_info.type == Variant::REAL) {
+				} else if (return_info.type == Variant::FLOAT) {
 					imethod.return_type.cname = _get_float_type_name_from_meta(m ? m->get_argument_meta(-1) : GodotTypeInfo::METADATA_NONE);
 				} else {
 					imethod.return_type.cname = Variant::get_type_name(return_info.type);
@@ -2410,7 +2677,7 @@ bool BindingsGenerator::_populate_object_type_interfaces() {
 				} else {
 					if (arginfo.type == Variant::INT) {
 						iarg.type.cname = _get_int_type_name_from_meta(m ? m->get_argument_meta(i) : GodotTypeInfo::METADATA_NONE);
-					} else if (arginfo.type == Variant::REAL) {
+					} else if (arginfo.type == Variant::FLOAT) {
 						iarg.type.cname = _get_float_type_name_from_meta(m ? m->get_argument_meta(i) : GodotTypeInfo::METADATA_NONE);
 					} else {
 						iarg.type.cname = Variant::get_type_name(arginfo.type);
@@ -2464,6 +2731,10 @@ bool BindingsGenerator::_populate_object_type_interfaces() {
 				}
 			}
 
+			ERR_FAIL_COND_V_MSG(itype.find_property_by_name(imethod.cname), false,
+					"Method name conflicts with property: '" + itype.name + "." + imethod.name + "'.");
+
+			// Classes starting with an underscore are ignored unless they're used as a property setter or getter
 			if (!imethod.is_virtual && imethod.name[0] == '_') {
 				for (const List<PropertyInterface>::Element *F = itype.properties.front(); F; F = F->next()) {
 					const PropertyInterface &iprop = F->get();
@@ -2479,13 +2750,92 @@ bool BindingsGenerator::_populate_object_type_interfaces() {
 			}
 		}
 
+		// Populate signals
+
+		const HashMap<StringName, MethodInfo> &signal_map = class_info->signal_map;
+		const StringName *k = nullptr;
+
+		while ((k = signal_map.next(k))) {
+			SignalInterface isignal;
+
+			const MethodInfo &method_info = signal_map.get(*k);
+
+			isignal.name = method_info.name;
+			isignal.cname = method_info.name;
+
+			int argc = method_info.arguments.size();
+
+			for (int i = 0; i < argc; i++) {
+				PropertyInfo arginfo = method_info.arguments[i];
+
+				String orig_arg_name = arginfo.name;
+
+				ArgumentInterface iarg;
+				iarg.name = orig_arg_name;
+
+				if (arginfo.type == Variant::INT && arginfo.usage & PROPERTY_USAGE_CLASS_IS_ENUM) {
+					iarg.type.cname = arginfo.class_name;
+					iarg.type.is_enum = true;
+				} else if (arginfo.class_name != StringName()) {
+					iarg.type.cname = arginfo.class_name;
+				} else if (arginfo.hint == PROPERTY_HINT_RESOURCE_TYPE) {
+					iarg.type.cname = arginfo.hint_string;
+				} else if (arginfo.type == Variant::NIL) {
+					iarg.type.cname = name_cache.type_Variant;
+				} else {
+					if (arginfo.type == Variant::INT) {
+						iarg.type.cname = _get_int_type_name_from_meta(GodotTypeInfo::METADATA_NONE);
+					} else if (arginfo.type == Variant::FLOAT) {
+						iarg.type.cname = _get_float_type_name_from_meta(GodotTypeInfo::METADATA_NONE);
+					} else {
+						iarg.type.cname = Variant::get_type_name(arginfo.type);
+					}
+				}
+
+				iarg.name = escape_csharp_keyword(snake_to_camel_case(iarg.name));
+
+				isignal.add_argument(iarg);
+			}
+
+			isignal.proxy_name = escape_csharp_keyword(snake_to_pascal_case(isignal.name));
+
+			// Prevent the signal and its enclosing type from sharing the same name
+			if (isignal.proxy_name == itype.proxy_name) {
+				_log("Name of signal '%s' is ambiguous with the name of its enclosing class '%s'. Renaming signal to '%s_'\n",
+						isignal.proxy_name.utf8().get_data(), itype.proxy_name.utf8().get_data(), isignal.proxy_name.utf8().get_data());
+
+				isignal.proxy_name += "_";
+			}
+
+			if (itype.find_property_by_proxy_name(isignal.proxy_name) || itype.find_method_by_proxy_name(isignal.proxy_name)) {
+				// ClassDB allows signal names that conflict with method or property names.
+				// While registering a signal with a conflicting name is considered wrong,
+				// it may still happen and it may take some time until someone fixes the name.
+				// We can't allow the bindings to be in a broken state while we wait for a fix;
+				// that's why we must handle this possibility by renaming the signal.
+				isignal.proxy_name += "Signal";
+			}
+
+			if (itype.class_doc) {
+				for (int i = 0; i < itype.class_doc->signals.size(); i++) {
+					const DocData::MethodDoc &signal_doc = itype.class_doc->signals[i];
+					if (signal_doc.name == isignal.name) {
+						isignal.method_doc = &signal_doc;
+						break;
+					}
+				}
+			}
+
+			itype.signals_.push_back(isignal);
+		}
+
 		// Populate enums and constants
 
 		List<String> constants;
 		ClassDB::get_integer_constant_list(type_cname, &constants, true);
 
-		const HashMap<StringName, List<StringName> > &enum_map = class_info->enum_map;
-		const StringName *k = NULL;
+		const HashMap<StringName, List<StringName>> &enum_map = class_info->enum_map;
+		k = nullptr;
 
 		while ((k = enum_map.next(k))) {
 			StringName enum_proxy_cname = *k;
@@ -2507,7 +2857,7 @@ bool BindingsGenerator::_populate_object_type_interfaces() {
 
 				ConstantInterface iconstant(constant_name, snake_to_pascal_case(constant_name, true), *value);
 
-				iconstant.const_doc = NULL;
+				iconstant.const_doc = nullptr;
 				for (int i = 0; i < itype.class_doc->constants.size(); i++) {
 					const DocData::ConstantDoc &const_doc = itype.class_doc->constants[i];
 
@@ -2542,7 +2892,7 @@ bool BindingsGenerator::_populate_object_type_interfaces() {
 
 			ConstantInterface iconstant(constant_name, snake_to_pascal_case(constant_name, true), *value);
 
-			iconstant.const_doc = NULL;
+			iconstant.const_doc = nullptr;
 			for (int i = 0; i < itype.class_doc->constants.size(); i++) {
 				const DocData::ConstantDoc &const_doc = itype.class_doc->constants[i];
 
@@ -2564,8 +2914,8 @@ bool BindingsGenerator::_populate_object_type_interfaces() {
 }
 
 bool BindingsGenerator::_arg_default_value_from_variant(const Variant &p_val, ArgumentInterface &r_iarg) {
-
-	r_iarg.default_argument = p_val;
+	r_iarg.def_param_value = p_val;
+	r_iarg.default_argument = p_val.operator String();
 
 	switch (p_val.get_type()) {
 		case Variant::NIL:
@@ -2581,18 +2931,26 @@ bool BindingsGenerator::_arg_default_value_from_variant(const Variant &p_val, Ar
 				r_iarg.default_argument = "(%s)" + r_iarg.default_argument;
 			}
 			break;
-		case Variant::REAL:
+		case Variant::FLOAT:
 #ifndef REAL_T_IS_DOUBLE
 			r_iarg.default_argument += "f";
 #endif
 			break;
 		case Variant::STRING:
+		case Variant::STRING_NAME:
 		case Variant::NODE_PATH:
-			r_iarg.default_argument = "\"" + r_iarg.default_argument + "\"";
+			if (r_iarg.type.cname == name_cache.type_StringName || r_iarg.type.cname == name_cache.type_NodePath) {
+				r_iarg.default_argument = "(%s)\"" + r_iarg.default_argument + "\"";
+				r_iarg.def_param_mode = ArgumentInterface::NULLABLE_REF;
+			} else {
+				CRASH_COND(r_iarg.type.cname != name_cache.type_String);
+				r_iarg.default_argument = "\"" + r_iarg.default_argument + "\"";
+			}
 			break;
 		case Variant::TRANSFORM:
-			if (p_val.operator Transform() == Transform())
+			if (p_val.operator Transform() == Transform()) {
 				r_iarg.default_argument.clear();
+			}
 			r_iarg.default_argument = "new %s(" + r_iarg.default_argument + ")";
 			r_iarg.def_param_mode = ArgumentInterface::NULLABLE_VAL;
 			break;
@@ -2603,8 +2961,11 @@ bool BindingsGenerator::_arg_default_value_from_variant(const Variant &p_val, Ar
 			r_iarg.def_param_mode = ArgumentInterface::NULLABLE_VAL;
 			break;
 		case Variant::VECTOR2:
+		case Variant::VECTOR2I:
 		case Variant::RECT2:
+		case Variant::RECT2I:
 		case Variant::VECTOR3:
+		case Variant::VECTOR3I:
 			r_iarg.default_argument = "new %s" + r_iarg.default_argument;
 			r_iarg.def_param_mode = ArgumentInterface::NULLABLE_VAL;
 			break;
@@ -2628,13 +2989,15 @@ bool BindingsGenerator::_arg_default_value_from_variant(const Variant &p_val, Ar
 			r_iarg.default_argument = "null";
 			break;
 		case Variant::ARRAY:
-		case Variant::POOL_BYTE_ARRAY:
-		case Variant::POOL_INT_ARRAY:
-		case Variant::POOL_REAL_ARRAY:
-		case Variant::POOL_STRING_ARRAY:
-		case Variant::POOL_VECTOR2_ARRAY:
-		case Variant::POOL_VECTOR3_ARRAY:
-		case Variant::POOL_COLOR_ARRAY:
+		case Variant::PACKED_BYTE_ARRAY:
+		case Variant::PACKED_INT32_ARRAY:
+		case Variant::PACKED_INT64_ARRAY:
+		case Variant::PACKED_FLOAT32_ARRAY:
+		case Variant::PACKED_FLOAT64_ARRAY:
+		case Variant::PACKED_STRING_ARRAY:
+		case Variant::PACKED_VECTOR2_ARRAY:
+		case Variant::PACKED_VECTOR3_ARRAY:
+		case Variant::PACKED_COLOR_ARRAY:
 			r_iarg.default_argument = "new %s {}";
 			r_iarg.def_param_mode = ArgumentInterface::NULLABLE_REF;
 			break;
@@ -2644,18 +3007,23 @@ bool BindingsGenerator::_arg_default_value_from_variant(const Variant &p_val, Ar
 			r_iarg.default_argument = Variant::get_type_name(p_val.get_type()) + ".Identity";
 			r_iarg.def_param_mode = ArgumentInterface::NULLABLE_VAL;
 			break;
-		default: {
-		}
+		case Variant::CALLABLE:
+		case Variant::SIGNAL:
+			CRASH_NOW_MSG("Parameter of type '" + String(r_iarg.type.cname) + "' cannot have a default value.");
+			break;
+		default:
+			CRASH_NOW_MSG("Unexpected Variant type: " + itos(p_val.get_type()));
+			break;
 	}
 
-	if (r_iarg.def_param_mode == ArgumentInterface::CONSTANT && r_iarg.type.cname == name_cache.type_Variant && r_iarg.default_argument != "null")
+	if (r_iarg.def_param_mode == ArgumentInterface::CONSTANT && r_iarg.type.cname == name_cache.type_Variant && r_iarg.default_argument != "null") {
 		r_iarg.def_param_mode = ArgumentInterface::NULLABLE_REF;
+	}
 
 	return true;
 }
 
 void BindingsGenerator::_populate_builtin_type_interfaces() {
-
 	builtin_types.clear();
 
 	TypeInterface itype;
@@ -2670,16 +3038,19 @@ void BindingsGenerator::_populate_builtin_type_interfaces() {
 		itype.c_type_out = "GDMonoMarshal::M_" #m_type;                \
 		itype.cs_in = "ref %s";                                        \
 		/* in cs_out, im_type_out (%3) includes the 'out ' part */     \
-		itype.cs_out = "%0(%1, %3 argRet); return (%2)argRet;";        \
+		itype.cs_out = "%0(%1, %3 argRet); return argRet;";            \
 		itype.im_type_out = "out " + itype.cs_type;                    \
 		itype.ret_as_byref_arg = true;                                 \
 		builtin_types.insert(itype.cname, itype);                      \
 	}
 
 	INSERT_STRUCT_TYPE(Vector2)
+	INSERT_STRUCT_TYPE(Vector2i)
 	INSERT_STRUCT_TYPE(Rect2)
+	INSERT_STRUCT_TYPE(Rect2i)
 	INSERT_STRUCT_TYPE(Transform2D)
 	INSERT_STRUCT_TYPE(Vector3)
+	INSERT_STRUCT_TYPE(Vector3i)
 	INSERT_STRUCT_TYPE(Basis)
 	INSERT_STRUCT_TYPE(Quat)
 	INSERT_STRUCT_TYPE(Transform)
@@ -2747,7 +3118,7 @@ void BindingsGenerator::_populate_builtin_type_interfaces() {
 		itype.im_type_out = "out " + itype.name;
 		itype.cs_in = "ref %0";
 		/* in cs_out, im_type_out (%3) includes the 'out ' part */
-		itype.cs_out = "%0(%1, %3 argRet); return (%2)argRet;";
+		itype.cs_out = "%0(%1, %3 argRet); return argRet;";
 		itype.ret_as_byref_arg = true;
 		builtin_types.insert(itype.cname, itype);
 
@@ -2764,7 +3135,7 @@ void BindingsGenerator::_populate_builtin_type_interfaces() {
 		itype.im_type_out = "out " + itype.name;
 		itype.cs_in = "ref %0";
 		/* in cs_out, im_type_out (%3) includes the 'out ' part */
-		itype.cs_out = "%0(%1, %3 argRet); return (%2)argRet;";
+		itype.cs_out = "%0(%1, %3 argRet); return argRet;";
 		itype.ret_as_byref_arg = true;
 		builtin_types.insert(itype.cname, itype);
 	}
@@ -2790,7 +3161,7 @@ void BindingsGenerator::_populate_builtin_type_interfaces() {
 		itype.im_type_out = "out " + itype.proxy_name;
 		itype.cs_in = "ref %0";
 		/* in cs_out, im_type_out (%3) includes the 'out ' part */
-		itype.cs_out = "%0(%1, %3 argRet); return (%2)argRet;";
+		itype.cs_out = "%0(%1, %3 argRet); return argRet;";
 		itype.ret_as_byref_arg = true;
 		builtin_types.insert(itype.cname, itype);
 
@@ -2812,7 +3183,7 @@ void BindingsGenerator::_populate_builtin_type_interfaces() {
 		itype.im_type_out = "out " + itype.proxy_name;
 		itype.cs_in = "ref %0";
 		/* in cs_out, im_type_out (%3) includes the 'out ' part */
-		itype.cs_out = "%0(%1, %3 argRet); return (%2)argRet;";
+		itype.cs_out = "%0(%1, %3 argRet); return argRet;";
 		itype.ret_as_byref_arg = true;
 		builtin_types.insert(itype.cname, itype);
 	}
@@ -2833,6 +3204,24 @@ void BindingsGenerator::_populate_builtin_type_interfaces() {
 	itype.im_type_out = itype.proxy_name;
 	builtin_types.insert(itype.cname, itype);
 
+	// StringName
+	itype = TypeInterface();
+	itype.name = "StringName";
+	itype.cname = itype.name;
+	itype.proxy_name = "StringName";
+	itype.c_in = "\t%0 %1_in = %1 ? *%1 : StringName();\n";
+	itype.c_out = "\treturn memnew(StringName(%1));\n";
+	itype.c_arg_in = "&%s_in";
+	itype.c_type = itype.name;
+	itype.c_type_in = itype.c_type + "*";
+	itype.c_type_out = itype.c_type + "*";
+	itype.cs_type = itype.proxy_name;
+	itype.cs_in = "StringName." CS_SMETHOD_GETINSTANCE "(%0)";
+	itype.cs_out = "return new %2(%0(%1));";
+	itype.im_type_in = "IntPtr";
+	itype.im_type_out = "IntPtr";
+	builtin_types.insert(itype.cname, itype);
+
 	// NodePath
 	itype = TypeInterface();
 	itype.name = "NodePath";
@@ -2881,6 +3270,40 @@ void BindingsGenerator::_populate_builtin_type_interfaces() {
 	itype.im_type_out = itype.proxy_name;
 	builtin_types.insert(itype.cname, itype);
 
+	// Callable
+	itype = TypeInterface::create_value_type(String("Callable"));
+	itype.c_in = "\t%0 %1_in = " C_METHOD_MANAGED_TO_CALLABLE "(*%1);\n";
+	itype.c_out = "\t*%3 = " C_METHOD_MANAGED_FROM_CALLABLE "(%1);\n";
+	itype.c_arg_in = "&%s_in";
+	itype.c_type_in = "GDMonoMarshal::M_Callable*";
+	itype.c_type_out = "GDMonoMarshal::M_Callable";
+	itype.cs_in = "ref %s";
+	/* in cs_out, im_type_out (%3) includes the 'out ' part */
+	itype.cs_out = "%0(%1, %3 argRet); return argRet;";
+	itype.im_type_out = "out " + itype.cs_type;
+	itype.ret_as_byref_arg = true;
+	builtin_types.insert(itype.cname, itype);
+
+	// Signal
+	itype = TypeInterface();
+	itype.name = "Signal";
+	itype.cname = itype.name;
+	itype.proxy_name = "SignalInfo";
+	itype.c_in = "\t%0 %1_in = " C_METHOD_MANAGED_TO_SIGNAL "(*%1);\n";
+	itype.c_out = "\t*%3 = " C_METHOD_MANAGED_FROM_SIGNAL "(%1);\n";
+	itype.c_arg_in = "&%s_in";
+	itype.c_type = itype.name;
+	itype.c_type_in = "GDMonoMarshal::M_SignalInfo*";
+	itype.c_type_out = "GDMonoMarshal::M_SignalInfo";
+	itype.cs_in = "ref %s";
+	/* in cs_out, im_type_out (%3) includes the 'out ' part */
+	itype.cs_out = "%0(%1, %3 argRet); return argRet;";
+	itype.cs_type = itype.proxy_name;
+	itype.im_type_in = "ref " + itype.cs_type;
+	itype.im_type_out = "out " + itype.cs_type;
+	itype.ret_as_byref_arg = true;
+	builtin_types.insert(itype.cname, itype);
+
 	// VarArg (fictitious type to represent variable arguments)
 	itype = TypeInterface();
 	itype.name = "VarArg";
@@ -2914,20 +3337,18 @@ void BindingsGenerator::_populate_builtin_type_interfaces() {
 
 #define INSERT_ARRAY(m_type, m_proxy_t) INSERT_ARRAY_FULL(m_type, m_type, m_proxy_t)
 
-	INSERT_ARRAY(PoolIntArray, int);
-	INSERT_ARRAY_FULL(PoolByteArray, PoolByteArray, byte);
+	INSERT_ARRAY(PackedInt32Array, int);
+	INSERT_ARRAY(PackedInt64Array, long);
+	INSERT_ARRAY_FULL(PackedByteArray, PackedByteArray, byte);
 
-#ifdef REAL_T_IS_DOUBLE
-	INSERT_ARRAY(PoolRealArray, double);
-#else
-	INSERT_ARRAY(PoolRealArray, float);
-#endif
+	INSERT_ARRAY(PackedFloat32Array, float);
+	INSERT_ARRAY(PackedFloat64Array, double);
 
-	INSERT_ARRAY(PoolStringArray, string);
+	INSERT_ARRAY(PackedStringArray, string);
 
-	INSERT_ARRAY(PoolColorArray, Color);
-	INSERT_ARRAY(PoolVector2Array, Vector2);
-	INSERT_ARRAY(PoolVector3Array, Vector3);
+	INSERT_ARRAY(PackedColorArray, Color);
+	INSERT_ARRAY(PackedVector2Array, Vector2);
+	INSERT_ARRAY(PackedVector3Array, Vector3);
 
 #undef INSERT_ARRAY
 
@@ -2978,7 +3399,6 @@ void BindingsGenerator::_populate_builtin_type_interfaces() {
 }
 
 void BindingsGenerator::_populate_global_constants() {
-
 	int global_constants_count = GlobalConstants::get_global_constant_count();
 
 	if (global_constants_count > 0) {
@@ -2989,10 +3409,9 @@ void BindingsGenerator::_populate_global_constants() {
 		const DocData::ClassDoc &global_scope_doc = match->value();
 
 		for (int i = 0; i < global_constants_count; i++) {
-
 			String constant_name = GlobalConstants::get_global_constant_name(i);
 
-			const DocData::ConstantDoc *const_doc = NULL;
+			const DocData::ConstantDoc *const_doc = nullptr;
 			for (int j = 0; j < global_scope_doc.constants.size(); j++) {
 				const DocData::ConstantDoc &curr_const_doc = global_scope_doc.constants[j];
 
@@ -3038,7 +3457,7 @@ void BindingsGenerator::_populate_global_constants() {
 			// HARDCODED: The Error enum have the prefix 'ERR_' for everything except 'OK' and 'FAILED'.
 			if (ienum.cname == name_cache.enum_Error) {
 				if (prefix_length > 0) { // Just in case it ever changes
-					ERR_PRINTS("Prefix for enum '" _STR(Error) "' is not empty.");
+					ERR_PRINT("Prefix for enum '" _STR(Error) "' is not empty.");
 				}
 
 				prefix_length = 1; // 'ERR_'
@@ -3050,7 +3469,10 @@ void BindingsGenerator::_populate_global_constants() {
 
 	// HARDCODED
 	List<StringName> hardcoded_enums;
+	hardcoded_enums.push_back("Vector2.Axis");
+	hardcoded_enums.push_back("Vector2i.Axis");
 	hardcoded_enums.push_back("Vector3.Axis");
+	hardcoded_enums.push_back("Vector3i.Axis");
 	for (List<StringName>::Element *E = hardcoded_enums.front(); E; E = E->next()) {
 		// These enums are not generated and must be written manually (e.g.: Vector3.Axis)
 		// Here, we assume core types do not begin with underscore
@@ -3065,14 +3487,12 @@ void BindingsGenerator::_populate_global_constants() {
 }
 
 void BindingsGenerator::_initialize_blacklisted_methods() {
-
 	blacklisted_methods["Object"].push_back("to_string"); // there is already ToString
 	blacklisted_methods["Object"].push_back("_to_string"); // override ToString instead
 	blacklisted_methods["Object"].push_back("_init"); // never called in C# (TODO: implement it)
 }
 
 void BindingsGenerator::_log(const char *p_format, ...) {
-
 	if (log_print_enabled) {
 		va_list list;
 
@@ -3083,7 +3503,6 @@ void BindingsGenerator::_log(const char *p_format, ...) {
 }
 
 void BindingsGenerator::_initialize() {
-
 	initialized = false;
 
 	EditorHelp::generate_doc();
@@ -3104,14 +3523,14 @@ void BindingsGenerator::_initialize() {
 	core_custom_icalls.clear();
 	editor_custom_icalls.clear();
 
-	for (OrderedHashMap<StringName, TypeInterface>::Element E = obj_types.front(); E; E = E.next())
+	for (OrderedHashMap<StringName, TypeInterface>::Element E = obj_types.front(); E; E = E.next()) {
 		_generate_method_icalls(E.get());
+	}
 
 	initialized = true;
 }
 
 void BindingsGenerator::handle_cmdline_args(const List<String> &p_cmdline_args) {
-
 	const int NUM_OPTIONS = 2;
 	String generate_all_glue_option = "--generate-mono-glue";
 	String generate_cs_glue_option = "--generate-mono-cs-glue";
@@ -3133,7 +3552,7 @@ void BindingsGenerator::handle_cmdline_args(const List<String> &p_cmdline_args)
 				glue_dir_path = path_elem->get();
 				elem = elem->next();
 			} else {
-				ERR_PRINTS(generate_all_glue_option + ": No output directory specified (expected path to '{GODOT_ROOT}/modules/mono/glue').");
+				ERR_PRINT(generate_all_glue_option + ": No output directory specified (expected path to '{GODOT_ROOT}/modules/mono/glue').");
 			}
 
 			--options_left;
@@ -3144,7 +3563,7 @@ void BindingsGenerator::handle_cmdline_args(const List<String> &p_cmdline_args)
 				cs_dir_path = path_elem->get();
 				elem = elem->next();
 			} else {
-				ERR_PRINTS(generate_cs_glue_option + ": No output directory specified.");
+				ERR_PRINT(generate_cs_glue_option + ": No output directory specified.");
 			}
 
 			--options_left;
@@ -3155,7 +3574,7 @@ void BindingsGenerator::handle_cmdline_args(const List<String> &p_cmdline_args)
 				cpp_dir_path = path_elem->get();
 				elem = elem->next();
 			} else {
-				ERR_PRINTS(generate_cpp_glue_option + ": No output directory specified.");
+				ERR_PRINT(generate_cpp_glue_option + ": No output directory specified.");
 			}
 
 			--options_left;
@@ -3169,26 +3588,30 @@ void BindingsGenerator::handle_cmdline_args(const List<String> &p_cmdline_args)
 		bindings_generator.set_log_print_enabled(true);
 
 		if (!bindings_generator.initialized) {
-			ERR_PRINTS("Failed to initialize the bindings generator");
+			ERR_PRINT("Failed to initialize the bindings generator");
 			::exit(0);
 		}
 
 		if (glue_dir_path.length()) {
-			if (bindings_generator.generate_glue(glue_dir_path) != OK)
-				ERR_PRINTS(generate_all_glue_option + ": Failed to generate the C++ glue.");
+			if (bindings_generator.generate_glue(glue_dir_path) != OK) {
+				ERR_PRINT(generate_all_glue_option + ": Failed to generate the C++ glue.");
+			}
 
-			if (bindings_generator.generate_cs_api(glue_dir_path.plus_file(API_SOLUTION_NAME)) != OK)
-				ERR_PRINTS(generate_all_glue_option + ": Failed to generate the C# API.");
+			if (bindings_generator.generate_cs_api(glue_dir_path.plus_file(API_SOLUTION_NAME)) != OK) {
+				ERR_PRINT(generate_all_glue_option + ": Failed to generate the C# API.");
+			}
 		}
 
 		if (cs_dir_path.length()) {
-			if (bindings_generator.generate_cs_api(cs_dir_path) != OK)
-				ERR_PRINTS(generate_cs_glue_option + ": Failed to generate the C# API.");
+			if (bindings_generator.generate_cs_api(cs_dir_path) != OK) {
+				ERR_PRINT(generate_cs_glue_option + ": Failed to generate the C# API.");
+			}
 		}
 
 		if (cpp_dir_path.length()) {
-			if (bindings_generator.generate_glue(cpp_dir_path) != OK)
-				ERR_PRINTS(generate_cpp_glue_option + ": Failed to generate the C++ glue.");
+			if (bindings_generator.generate_glue(cpp_dir_path) != OK) {
+				ERR_PRINT(generate_cpp_glue_option + ": Failed to generate the C++ glue.");
+			}
 		}
 
 		// Exit once done
diff --git a/modules/mono/editor/bindings_generator.h b/modules/mono/editor/bindings_generator.h
index d3a8937313..90c1c9f3ee 100644
--- a/modules/mono/editor/bindings_generator.h
+++ b/modules/mono/editor/bindings_generator.h
@@ -33,7 +33,7 @@
 
 #include "core/class_db.h"
 #include "core/string_builder.h"
-#include "editor/doc/doc_data.h"
+#include "editor/doc_data.h"
 #include "editor/editor_help.h"
 
 #if defined(DEBUG_METHODS_ENABLED) && defined(TOOLS_ENABLED)
@@ -41,7 +41,6 @@
 #include "core/ustring.h"
 
 class BindingsGenerator {
-
 	struct ConstantInterface {
 		String name;
 		String proxy_name;
@@ -85,16 +84,12 @@ class BindingsGenerator {
 
 	struct TypeReference {
 		StringName cname;
-		bool is_enum;
+		bool is_enum = false;
 
-		TypeReference() :
-				is_enum(false) {
-		}
+		TypeReference() {}
 
 		TypeReference(const StringName &p_cname) :
-				cname(p_cname),
-				is_enum(false) {
-		}
+				cname(p_cname) {}
 	};
 
 	struct ArgumentInterface {
@@ -107,12 +102,18 @@ class BindingsGenerator {
 		TypeReference type;
 
 		String name;
+
+		Variant def_param_value;
+		DefaultParamMode def_param_mode = CONSTANT;
+
+		/**
+		 * Determines the expression for the parameter default value.
+		 * Formatting elements:
+		 * %0 or %s: [cs_type] of the argument type
+		 */
 		String default_argument;
-		DefaultParamMode def_param_mode;
 
-		ArgumentInterface() {
-			def_param_mode = CONSTANT;
-		}
+		ArgumentInterface() {}
 	};
 
 	struct MethodInterface {
@@ -132,19 +133,19 @@ class BindingsGenerator {
 		/**
 		 * Determines if the method has a variable number of arguments (VarArg)
 		 */
-		bool is_vararg;
+		bool is_vararg = false;
 
 		/**
 		 * Virtual methods ("virtual" as defined by the Godot API) are methods that by default do nothing,
 		 * but can be overridden by the user to add custom functionality.
 		 * e.g.: _ready, _process, etc.
 		 */
-		bool is_virtual;
+		bool is_virtual = false;
 
 		/**
 		 * Determines if the call should fallback to Godot's object.Call(string, params) in C#.
 		 */
-		bool requires_object_call;
+		bool requires_object_call = false;
 
 		/**
 		 * Determines if the method visibility is 'internal' (visible only to files in the same assembly).
@@ -152,27 +153,43 @@ class BindingsGenerator {
 		 * but are required by properties as getters or setters.
 		 * Methods that are not meant to be exposed are those that begin with underscore and are not virtual.
 		 */
-		bool is_internal;
+		bool is_internal = false;
 
 		List<ArgumentInterface> arguments;
 
-		const DocData::MethodDoc *method_doc;
+		const DocData::MethodDoc *method_doc = nullptr;
 
-		bool is_deprecated;
+		bool is_deprecated = false;
 		String deprecation_message;
 
 		void add_argument(const ArgumentInterface &argument) {
 			arguments.push_back(argument);
 		}
 
-		MethodInterface() {
-			is_vararg = false;
-			is_virtual = false;
-			requires_object_call = false;
-			is_internal = false;
-			method_doc = NULL;
-			is_deprecated = false;
+		MethodInterface() {}
+	};
+
+	struct SignalInterface {
+		String name;
+		StringName cname;
+
+		/**
+		 * Name of the C# method
+		 */
+		String proxy_name;
+
+		List<ArgumentInterface> arguments;
+
+		const DocData::MethodDoc *method_doc = nullptr;
+
+		bool is_deprecated = false;
+		String deprecation_message;
+
+		void add_argument(const ArgumentInterface &argument) {
+			arguments.push_back(argument);
 		}
+
+		SignalInterface() {}
 	};
 
 	struct TypeInterface {
@@ -193,26 +210,26 @@ class BindingsGenerator {
 		 */
 		String proxy_name;
 
-		ClassDB::APIType api_type;
+		ClassDB::APIType api_type = ClassDB::API_NONE;
 
-		bool is_enum;
-		bool is_object_type;
-		bool is_singleton;
-		bool is_reference;
+		bool is_enum = false;
+		bool is_object_type = false;
+		bool is_singleton = false;
+		bool is_reference = false;
 
 		/**
 		 * Used only by Object-derived types.
 		 * Determines if this type is not abstract (incomplete).
 		 * e.g.: CanvasItem cannot be instantiated.
 		 */
-		bool is_instantiable;
+		bool is_instantiable = false;
 
 		/**
 		 * Used only by Object-derived types.
 		 * Determines if the C# class owns the native handle and must free it somehow when disposed.
 		 * e.g.: Reference types must notify when the C# instance is disposed, for proper refcounting.
 		 */
-		bool memory_own;
+		bool memory_own = false;
 
 		/**
 		 * This must be set to true for any struct bigger than 32-bits. Those cannot be passed/returned by value
@@ -220,7 +237,7 @@ class BindingsGenerator {
 		 * In this case, [c_out] and [cs_out] must have a different format, explained below.
 		 * The Mono IL interpreter icall trampolines don't support passing structs bigger than 32-bits by value (at least not on WASM).
 		 */
-		bool ret_as_byref_arg;
+		bool ret_as_byref_arg = false;
 
 		// !! The comments of the following fields make reference to other fields via square brackets, e.g.: [field_name]
 		// !! When renaming those fields, make sure to rename their references in the comments
@@ -247,7 +264,7 @@ class BindingsGenerator {
 		 * Formatting elements:
 		 * %0 or %s: name of the parameter
 		 */
-		String c_arg_in;
+		String c_arg_in = "%s";
 
 		/**
 		 * One or more statements that determine how a variable of this type is returned from a function.
@@ -330,38 +347,52 @@ class BindingsGenerator {
 		 */
 		String im_type_out;
 
-		const DocData::ClassDoc *class_doc;
+		const DocData::ClassDoc *class_doc = nullptr;
 
 		List<ConstantInterface> constants;
 		List<EnumInterface> enums;
 		List<PropertyInterface> properties;
 		List<MethodInterface> methods;
+		List<SignalInterface> signals_;
 
 		const MethodInterface *find_method_by_name(const StringName &p_cname) const {
 			for (const List<MethodInterface>::Element *E = methods.front(); E; E = E->next()) {
-				if (E->get().cname == p_cname)
+				if (E->get().cname == p_cname) {
 					return &E->get();
+				}
 			}
 
-			return NULL;
+			return nullptr;
 		}
 
 		const PropertyInterface *find_property_by_name(const StringName &p_cname) const {
 			for (const List<PropertyInterface>::Element *E = properties.front(); E; E = E->next()) {
-				if (E->get().cname == p_cname)
+				if (E->get().cname == p_cname) {
 					return &E->get();
+				}
 			}
 
-			return NULL;
+			return nullptr;
 		}
 
 		const PropertyInterface *find_property_by_proxy_name(const String &p_proxy_name) const {
 			for (const List<PropertyInterface>::Element *E = properties.front(); E; E = E->next()) {
-				if (E->get().proxy_name == p_proxy_name)
+				if (E->get().proxy_name == p_proxy_name) {
+					return &E->get();
+				}
+			}
+
+			return nullptr;
+		}
+
+		const MethodInterface *find_method_by_proxy_name(const String &p_proxy_name) const {
+			for (const List<MethodInterface>::Element *E = methods.front(); E; E = E->next()) {
+				if (E->get().proxy_name == p_proxy_name) {
 					return &E->get();
+				}
 			}
 
-			return NULL;
+			return nullptr;
 		}
 
 	private:
@@ -440,24 +471,7 @@ class BindingsGenerator {
 			r_enum_itype.class_doc = &EditorHelp::get_doc_data()->class_list[r_enum_itype.proxy_name];
 		}
 
-		TypeInterface() {
-
-			api_type = ClassDB::API_NONE;
-
-			is_enum = false;
-			is_object_type = false;
-			is_singleton = false;
-			is_reference = false;
-			is_instantiable = false;
-
-			memory_own = false;
-
-			ret_as_byref_arg = false;
-
-			c_arg_in = "%s";
-
-			class_doc = NULL;
-		}
+		TypeInterface() {}
 	};
 
 	struct InternalCall {
@@ -490,8 +504,8 @@ class BindingsGenerator {
 		}
 	};
 
-	bool log_print_enabled;
-	bool initialized;
+	bool log_print_enabled = true;
+	bool initialized = false;
 
 	OrderedHashMap<StringName, TypeInterface> obj_types;
 
@@ -510,59 +524,75 @@ class BindingsGenerator {
 	List<InternalCall> core_custom_icalls;
 	List<InternalCall> editor_custom_icalls;
 
-	Map<StringName, List<StringName> > blacklisted_methods;
+	Map<StringName, List<StringName>> blacklisted_methods;
 
 	void _initialize_blacklisted_methods();
 
 	struct NameCache {
-		StringName type_void;
-		StringName type_Array;
-		StringName type_Dictionary;
-		StringName type_Variant;
-		StringName type_VarArg;
-		StringName type_Object;
-		StringName type_Reference;
-		StringName type_RID;
-		StringName type_String;
-		StringName type_at_GlobalScope;
-		StringName enum_Error;
-
-		StringName type_sbyte;
-		StringName type_short;
-		StringName type_int;
-		StringName type_long;
-		StringName type_byte;
-		StringName type_ushort;
-		StringName type_uint;
-		StringName type_ulong;
-		StringName type_float;
-		StringName type_double;
-
-		NameCache() {
-			type_void = StaticCString::create("void");
-			type_Array = StaticCString::create("Array");
-			type_Dictionary = StaticCString::create("Dictionary");
-			type_Variant = StaticCString::create("Variant");
-			type_VarArg = StaticCString::create("VarArg");
-			type_Object = StaticCString::create("Object");
-			type_Reference = StaticCString::create("Reference");
-			type_RID = StaticCString::create("RID");
-			type_String = StaticCString::create("String");
-			type_at_GlobalScope = StaticCString::create("@GlobalScope");
-			enum_Error = StaticCString::create("Error");
-
-			type_sbyte = StaticCString::create("sbyte");
-			type_short = StaticCString::create("short");
-			type_int = StaticCString::create("int");
-			type_long = StaticCString::create("long");
-			type_byte = StaticCString::create("byte");
-			type_ushort = StaticCString::create("ushort");
-			type_uint = StaticCString::create("uint");
-			type_ulong = StaticCString::create("ulong");
-			type_float = StaticCString::create("float");
-			type_double = StaticCString::create("double");
+		StringName type_void = StaticCString::create("void");
+		StringName type_Variant = StaticCString::create("Variant");
+		StringName type_VarArg = StaticCString::create("VarArg");
+		StringName type_Object = StaticCString::create("Object");
+		StringName type_Reference = StaticCString::create("Reference");
+		StringName type_RID = StaticCString::create("RID");
+		StringName type_String = StaticCString::create("String");
+		StringName type_StringName = StaticCString::create("StringName");
+		StringName type_NodePath = StaticCString::create("NodePath");
+		StringName type_at_GlobalScope = StaticCString::create("@GlobalScope");
+		StringName enum_Error = StaticCString::create("Error");
+
+		StringName type_sbyte = StaticCString::create("sbyte");
+		StringName type_short = StaticCString::create("short");
+		StringName type_int = StaticCString::create("int");
+		StringName type_byte = StaticCString::create("byte");
+		StringName type_ushort = StaticCString::create("ushort");
+		StringName type_uint = StaticCString::create("uint");
+		StringName type_long = StaticCString::create("long");
+		StringName type_ulong = StaticCString::create("ulong");
+
+		StringName type_bool = StaticCString::create("bool");
+		StringName type_float = StaticCString::create("float");
+		StringName type_double = StaticCString::create("double");
+
+		StringName type_Vector2 = StaticCString::create("Vector2");
+		StringName type_Rect2 = StaticCString::create("Rect2");
+		StringName type_Vector3 = StaticCString::create("Vector3");
+
+		// Object not included as it must be checked for all derived classes
+		static constexpr int nullable_types_count = 17;
+		StringName nullable_types[nullable_types_count] = {
+			type_String,
+			type_StringName,
+			type_NodePath,
+
+			StaticCString::create(_STR(Array)),
+			StaticCString::create(_STR(Dictionary)),
+			StaticCString::create(_STR(Callable)),
+			StaticCString::create(_STR(Signal)),
+
+			StaticCString::create(_STR(PackedByteArray)),
+			StaticCString::create(_STR(PackedInt32Array)),
+			StaticCString::create(_STR(PackedInt64rray)),
+			StaticCString::create(_STR(PackedFloat32Array)),
+			StaticCString::create(_STR(PackedFloat64Array)),
+			StaticCString::create(_STR(PackedStringArray)),
+			StaticCString::create(_STR(PackedVector2Array)),
+			StaticCString::create(_STR(PackedVector3Array)),
+			StaticCString::create(_STR(PackedColorArray)),
+		};
+
+		bool is_nullable_type(const StringName &p_type) const {
+			for (int i = 0; i < nullable_types_count; i++) {
+				if (p_type == nullable_types[i]) {
+					return true;
+				}
+			}
+
+			return false;
 		}
 
+		NameCache() {}
+
 	private:
 		NameCache(const NameCache &);
 		NameCache &operator=(const NameCache &);
@@ -573,28 +603,32 @@ class BindingsGenerator {
 	const List<InternalCall>::Element *find_icall_by_name(const String &p_name, const List<InternalCall> &p_list) {
 		const List<InternalCall>::Element *it = p_list.front();
 		while (it) {
-			if (it->get().name == p_name) return it;
+			if (it->get().name == p_name) {
+				return it;
+			}
 			it = it->next();
 		}
-		return NULL;
+		return nullptr;
 	}
 
 	const ConstantInterface *find_constant_by_name(const String &p_name, const List<ConstantInterface> &p_constants) const {
 		for (const List<ConstantInterface>::Element *E = p_constants.front(); E; E = E->next()) {
-			if (E->get().name == p_name)
+			if (E->get().name == p_name) {
 				return &E->get();
+			}
 		}
 
-		return NULL;
+		return nullptr;
 	}
 
 	inline String get_unique_sig(const TypeInterface &p_type) {
-		if (p_type.is_reference)
+		if (p_type.is_reference) {
 			return "Ref";
-		else if (p_type.is_object_type)
+		} else if (p_type.is_object_type) {
 			return "Obj";
-		else if (p_type.is_enum)
+		} else if (p_type.is_enum) {
 			return "int";
+		}
 
 		return p_type.name;
 	}
@@ -613,6 +647,7 @@ class BindingsGenerator {
 	StringName _get_float_type_name_from_meta(GodotTypeInfo::Metadata p_meta);
 
 	bool _arg_default_value_from_variant(const Variant &p_val, ArgumentInterface &r_iarg);
+	bool _arg_default_value_is_assignable_to_type(const Variant &p_val, const TypeInterface &p_arg_type);
 
 	bool _populate_object_type_interfaces();
 	void _populate_builtin_type_interfaces();
@@ -623,6 +658,7 @@ class BindingsGenerator {
 
 	Error _generate_cs_property(const TypeInterface &p_itype, const PropertyInterface &p_iprop, StringBuilder &p_output);
 	Error _generate_cs_method(const TypeInterface &p_itype, const MethodInterface &p_imethod, int &p_method_bind_count, StringBuilder &p_output);
+	Error _generate_cs_signal(const BindingsGenerator::TypeInterface &p_itype, const BindingsGenerator::SignalInterface &p_isignal, StringBuilder &p_output);
 
 	void _generate_global_constants(StringBuilder &p_output);
 
@@ -649,9 +685,7 @@ public:
 
 	static void handle_cmdline_args(const List<String> &p_cmdline_args);
 
-	BindingsGenerator() :
-			log_print_enabled(true),
-			initialized(false) {
+	BindingsGenerator() {
 		_initialize();
 	}
 };
diff --git a/modules/mono/editor/code_completion.cpp b/modules/mono/editor/code_completion.cpp
new file mode 100644
index 0000000000..942c6d26a6
--- /dev/null
+++ b/modules/mono/editor/code_completion.cpp
@@ -0,0 +1,250 @@
+/*************************************************************************/
+/*  code_completion.cpp                                                  */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "code_completion.h"
+
+#include "core/project_settings.h"
+#include "editor/editor_file_system.h"
+#include "editor/editor_settings.h"
+#include "scene/gui/control.h"
+#include "scene/main/node.h"
+
+namespace gdmono {
+
+// Almost everything here is taken from functions used by GDScript for code completion, adapted for C#.
+
+_FORCE_INLINE_ String quoted(const String &p_str) {
+	return "\"" + p_str + "\"";
+}
+
+void _add_nodes_suggestions(const Node *p_base, const Node *p_node, PackedStringArray &r_suggestions) {
+	if (p_node != p_base && !p_node->get_owner()) {
+		return;
+	}
+
+	String path_relative_to_orig = p_base->get_path_to(p_node);
+
+	r_suggestions.push_back(quoted(path_relative_to_orig));
+
+	for (int i = 0; i < p_node->get_child_count(); i++) {
+		_add_nodes_suggestions(p_base, p_node->get_child(i), r_suggestions);
+	}
+}
+
+Node *_find_node_for_script(Node *p_base, Node *p_current, const Ref<Script> &p_script) {
+	if (p_current->get_owner() != p_base && p_base != p_current) {
+		return nullptr;
+	}
+
+	Ref<Script> c = p_current->get_script();
+
+	if (c == p_script) {
+		return p_current;
+	}
+
+	for (int i = 0; i < p_current->get_child_count(); i++) {
+		Node *found = _find_node_for_script(p_base, p_current->get_child(i), p_script);
+		if (found) {
+			return found;
+		}
+	}
+
+	return nullptr;
+}
+
+void _get_directory_contents(EditorFileSystemDirectory *p_dir, PackedStringArray &r_suggestions) {
+	for (int i = 0; i < p_dir->get_file_count(); i++) {
+		r_suggestions.push_back(quoted(p_dir->get_file_path(i)));
+	}
+
+	for (int i = 0; i < p_dir->get_subdir_count(); i++) {
+		_get_directory_contents(p_dir->get_subdir(i), r_suggestions);
+	}
+}
+
+Node *_try_find_owner_node_in_tree(const Ref<Script> p_script) {
+	SceneTree *tree = SceneTree::get_singleton();
+	if (!tree) {
+		return nullptr;
+	}
+	Node *base = tree->get_edited_scene_root();
+	if (base) {
+		base = _find_node_for_script(base, base, p_script);
+	}
+	return base;
+}
+
+PackedStringArray get_code_completion(CompletionKind p_kind, const String &p_script_file) {
+	PackedStringArray suggestions;
+
+	switch (p_kind) {
+		case CompletionKind::INPUT_ACTIONS: {
+			List<PropertyInfo> project_props;
+			ProjectSettings::get_singleton()->get_property_list(&project_props);
+
+			for (List<PropertyInfo>::Element *E = project_props.front(); E; E = E->next()) {
+				const PropertyInfo &prop = E->get();
+
+				if (!prop.name.begins_with("input/")) {
+					continue;
+				}
+
+				String name = prop.name.substr(prop.name.find("/") + 1, prop.name.length());
+				suggestions.push_back(quoted(name));
+			}
+		} break;
+		case CompletionKind::NODE_PATHS: {
+			{
+				// AutoLoads
+				Map<StringName, ProjectSettings::AutoloadInfo> autoloads = ProjectSettings::get_singleton()->get_autoload_list();
+
+				for (Map<StringName, ProjectSettings::AutoloadInfo>::Element *E = autoloads.front(); E; E = E->next()) {
+					const ProjectSettings::AutoloadInfo &info = E->value();
+					suggestions.push_back(quoted("/root/" + String(info.name)));
+				}
+			}
+
+			{
+				// Current edited scene tree
+				Ref<Script> script = ResourceLoader::load(p_script_file.simplify_path());
+				Node *base = _try_find_owner_node_in_tree(script);
+				if (base) {
+					_add_nodes_suggestions(base, base, suggestions);
+				}
+			}
+		} break;
+		case CompletionKind::RESOURCE_PATHS: {
+			if (bool(EditorSettings::get_singleton()->get("text_editor/completion/complete_file_paths"))) {
+				_get_directory_contents(EditorFileSystem::get_singleton()->get_filesystem(), suggestions);
+			}
+		} break;
+		case CompletionKind::SCENE_PATHS: {
+			DirAccessRef dir_access = DirAccess::create(DirAccess::ACCESS_RESOURCES);
+			List<String> directories;
+			directories.push_back(dir_access->get_current_dir());
+
+			while (!directories.empty()) {
+				dir_access->change_dir(directories.back()->get());
+				directories.pop_back();
+
+				dir_access->list_dir_begin();
+				String filename = dir_access->get_next();
+
+				while (filename != "") {
+					if (filename == "." || filename == "..") {
+						filename = dir_access->get_next();
+						continue;
+					}
+
+					if (dir_access->dir_exists(filename)) {
+						directories.push_back(dir_access->get_current_dir().plus_file(filename));
+					} else if (filename.ends_with(".tscn") || filename.ends_with(".scn")) {
+						suggestions.push_back(quoted(dir_access->get_current_dir().plus_file(filename)));
+					}
+
+					filename = dir_access->get_next();
+				}
+			}
+		} break;
+		case CompletionKind::SHADER_PARAMS: {
+			print_verbose("Shared params completion for C# not implemented.");
+		} break;
+		case CompletionKind::SIGNALS: {
+			Ref<Script> script = ResourceLoader::load(p_script_file.simplify_path());
+
+			List<MethodInfo> signals;
+			script->get_script_signal_list(&signals);
+
+			StringName native = script->get_instance_base_type();
+			if (native != StringName()) {
+				ClassDB::get_signal_list(native, &signals, /* p_no_inheritance: */ false);
+			}
+
+			for (List<MethodInfo>::Element *E = signals.front(); E; E = E->next()) {
+				const String &signal = E->get().name;
+				suggestions.push_back(quoted(signal));
+			}
+		} break;
+		case CompletionKind::THEME_COLORS: {
+			Ref<Script> script = ResourceLoader::load(p_script_file.simplify_path());
+			Node *base = _try_find_owner_node_in_tree(script);
+			if (base && Object::cast_to<Control>(base)) {
+				List<StringName> sn;
+				Theme::get_default()->get_color_list(base->get_class(), &sn);
+
+				for (List<StringName>::Element *E = sn.front(); E; E = E->next()) {
+					suggestions.push_back(quoted(E->get()));
+				}
+			}
+		} break;
+		case CompletionKind::THEME_CONSTANTS: {
+			Ref<Script> script = ResourceLoader::load(p_script_file.simplify_path());
+			Node *base = _try_find_owner_node_in_tree(script);
+			if (base && Object::cast_to<Control>(base)) {
+				List<StringName> sn;
+				Theme::get_default()->get_constant_list(base->get_class(), &sn);
+
+				for (List<StringName>::Element *E = sn.front(); E; E = E->next()) {
+					suggestions.push_back(quoted(E->get()));
+				}
+			}
+		} break;
+		case CompletionKind::THEME_FONTS: {
+			Ref<Script> script = ResourceLoader::load(p_script_file.simplify_path());
+			Node *base = _try_find_owner_node_in_tree(script);
+			if (base && Object::cast_to<Control>(base)) {
+				List<StringName> sn;
+				Theme::get_default()->get_font_list(base->get_class(), &sn);
+
+				for (List<StringName>::Element *E = sn.front(); E; E = E->next()) {
+					suggestions.push_back(quoted(E->get()));
+				}
+			}
+		} break;
+		case CompletionKind::THEME_STYLES: {
+			Ref<Script> script = ResourceLoader::load(p_script_file.simplify_path());
+			Node *base = _try_find_owner_node_in_tree(script);
+			if (base && Object::cast_to<Control>(base)) {
+				List<StringName> sn;
+				Theme::get_default()->get_stylebox_list(base->get_class(), &sn);
+
+				for (List<StringName>::Element *E = sn.front(); E; E = E->next()) {
+					suggestions.push_back(quoted(E->get()));
+				}
+			}
+		} break;
+		default:
+			ERR_FAIL_V_MSG(suggestions, "Invalid completion kind.");
+	}
+
+	return suggestions;
+}
+
+} // namespace gdmono
diff --git a/modules/mono/glue/rid_glue.h b/modules/mono/editor/code_completion.h
index 506d715451..77673b766f 100644
--- a/modules/mono/glue/rid_glue.h
+++ b/modules/mono/editor/code_completion.h
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  rid_glue.h                                                           */
+/*  code_completion.h                                                    */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,26 +28,29 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef RID_GLUE_H
-#define RID_GLUE_H
+#ifndef CODE_COMPLETION_H
+#define CODE_COMPLETION_H
 
-#ifdef MONO_GLUE_ENABLED
+#include "core/ustring.h"
+#include "core/variant.h"
 
-#include "core/object.h"
-#include "core/rid.h"
+namespace gdmono {
 
-#include "../mono_gd/gd_mono_marshal.h"
+enum class CompletionKind {
+	INPUT_ACTIONS = 0,
+	NODE_PATHS,
+	RESOURCE_PATHS,
+	SCENE_PATHS,
+	SHADER_PARAMS,
+	SIGNALS,
+	THEME_COLORS,
+	THEME_CONSTANTS,
+	THEME_FONTS,
+	THEME_STYLES
+};
 
-RID *godot_icall_RID_Ctor(Object *p_from);
+PackedStringArray get_code_completion(CompletionKind p_kind, const String &p_script_file);
 
-void godot_icall_RID_Dtor(RID *p_ptr);
+} // namespace gdmono
 
-uint32_t godot_icall_RID_get_id(RID *p_ptr);
-
-// Register internal calls
-
-void godot_register_rid_icalls();
-
-#endif // MONO_GLUE_ENABLED
-
-#endif // RID_GLUE_H
+#endif // CODE_COMPLETION_H
diff --git a/modules/mono/editor/editor_internal_calls.cpp b/modules/mono/editor/editor_internal_calls.cpp
index c8d20e80be..68fc372959 100644
--- a/modules/mono/editor/editor_internal_calls.cpp
+++ b/modules/mono/editor/editor_internal_calls.cpp
@@ -36,10 +36,10 @@
 
 #include "core/os/os.h"
 #include "core/version.h"
+#include "editor/debugger/editor_debugger_node.h"
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/plugins/script_editor_plugin.h"
-#include "editor/script_editor_debugger.h"
 #include "main/main.h"
 
 #include "../csharp_script.h"
@@ -48,6 +48,7 @@
 #include "../mono_gd/gd_mono_marshal.h"
 #include "../utils/osx_utils.h"
 #include "bindings_generator.h"
+#include "code_completion.h"
 #include "godotsharp_export.h"
 #include "script_class_parser.h"
 
@@ -95,7 +96,7 @@ MonoString *godot_icall_GodotSharpDirs_MonoSolutionsDir() {
 #ifdef TOOLS_ENABLED
 	return GDMonoMarshal::mono_string_from_godot(GodotSharpDirs::get_mono_solutions_dir());
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -103,7 +104,7 @@ MonoString *godot_icall_GodotSharpDirs_BuildLogsDirs() {
 #ifdef TOOLS_ENABLED
 	return GDMonoMarshal::mono_string_from_godot(GodotSharpDirs::get_build_logs_dir());
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -111,7 +112,7 @@ MonoString *godot_icall_GodotSharpDirs_ProjectSlnPath() {
 #ifdef TOOLS_ENABLED
 	return GDMonoMarshal::mono_string_from_godot(GodotSharpDirs::get_project_sln_path());
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -119,7 +120,7 @@ MonoString *godot_icall_GodotSharpDirs_ProjectCsProjPath() {
 #ifdef TOOLS_ENABLED
 	return GDMonoMarshal::mono_string_from_godot(GodotSharpDirs::get_project_csproj_path());
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -127,7 +128,7 @@ MonoString *godot_icall_GodotSharpDirs_DataEditorToolsDir() {
 #ifdef TOOLS_ENABLED
 	return GDMonoMarshal::mono_string_from_godot(GodotSharpDirs::get_data_editor_tools_dir());
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -135,7 +136,7 @@ MonoString *godot_icall_GodotSharpDirs_DataEditorPrebuiltApiDir() {
 #ifdef TOOLS_ENABLED
 	return GDMonoMarshal::mono_string_from_godot(GodotSharpDirs::get_data_editor_prebuilt_api_dir());
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -151,7 +152,7 @@ MonoString *godot_icall_GodotSharpDirs_DataMonoBinDir() {
 #ifdef WINDOWS_ENABLED
 	return GDMonoMarshal::mono_string_from_godot(GodotSharpDirs::get_data_mono_bin_dir());
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -202,7 +203,7 @@ uint32_t godot_icall_BindingsGenerator_CsGlueVersion() {
 }
 
 int32_t godot_icall_ScriptClassParser_ParseFile(MonoString *p_filepath, MonoObject *p_classes, MonoString **r_error_str) {
-	*r_error_str = NULL;
+	*r_error_str = nullptr;
 
 	String filepath = GDMonoMarshal::mono_string_to_godot(p_filepath);
 
@@ -231,14 +232,14 @@ int32_t godot_icall_ScriptClassParser_ParseFile(MonoString *p_filepath, MonoObje
 	return err;
 }
 
-uint32_t godot_icall_ExportPlugin_GetExportedAssemblyDependencies(MonoObject *p_initial_dependencies,
-		MonoString *p_build_config, MonoString *p_custom_bcl_dir, MonoObject *r_dependencies) {
-	Dictionary initial_dependencies = GDMonoMarshal::mono_object_to_variant(p_initial_dependencies);
+uint32_t godot_icall_ExportPlugin_GetExportedAssemblyDependencies(MonoObject *p_initial_assemblies,
+		MonoString *p_build_config, MonoString *p_custom_bcl_dir, MonoObject *r_assembly_dependencies) {
+	Dictionary initial_dependencies = GDMonoMarshal::mono_object_to_variant(p_initial_assemblies);
 	String build_config = GDMonoMarshal::mono_string_to_godot(p_build_config);
 	String custom_bcl_dir = GDMonoMarshal::mono_string_to_godot(p_custom_bcl_dir);
-	Dictionary dependencies = GDMonoMarshal::mono_object_to_variant(r_dependencies);
+	Dictionary assembly_dependencies = GDMonoMarshal::mono_object_to_variant(r_assembly_dependencies);
 
-	return GodotSharpExport::get_exported_assembly_dependencies(initial_dependencies, build_config, custom_bcl_dir, dependencies);
+	return GodotSharpExport::get_exported_assembly_dependencies(initial_dependencies, build_config, custom_bcl_dir, assembly_dependencies);
 }
 
 MonoString *godot_icall_Internal_UpdateApiAssembliesFromPrebuilt(MonoString *p_config) {
@@ -305,8 +306,8 @@ void godot_icall_Internal_ReloadAssemblies(MonoBoolean p_soft_reload) {
 #endif
 }
 
-void godot_icall_Internal_ScriptEditorDebuggerReloadScripts() {
-	ScriptEditor::get_singleton()->get_debugger()->reload_scripts();
+void godot_icall_Internal_EditorDebuggerNodeReloadScripts() {
+	EditorDebuggerNode::get_singleton()->reload_scripts();
 }
 
 MonoBoolean godot_icall_Internal_ScriptEditorEdit(MonoObject *p_resource, int32_t p_line, int32_t p_col, MonoBoolean p_grab_focus) {
@@ -323,7 +324,7 @@ MonoObject *godot_icall_Internal_GetScriptsMetadataOrNothing(MonoReflectionType
 
 	MonoType *dict_type = mono_reflection_type_get_type(p_dict_reftype);
 
-	uint32_t type_encoding = mono_type_get_type(dict_type);
+	int type_encoding = mono_type_get_type(dict_type);
 	MonoClass *type_class_raw = mono_class_from_mono_type(dict_type);
 	GDMonoClass *type_class = GDMono::get_singleton()->get_class(type_class_raw);
 
@@ -335,7 +336,7 @@ MonoString *godot_icall_Internal_MonoWindowsInstallRoot() {
 	String install_root_dir = GDMono::get_singleton()->get_mono_reg_info().install_root_dir;
 	return GDMonoMarshal::mono_string_from_godot(install_root_dir);
 #else
-	return NULL;
+	return nullptr;
 #endif
 }
 
@@ -348,12 +349,18 @@ void godot_icall_Internal_EditorRunStop() {
 }
 
 void godot_icall_Internal_ScriptEditorDebugger_ReloadScripts() {
-	ScriptEditorDebugger *sed = ScriptEditor::get_singleton()->get_debugger();
-	if (sed) {
-		sed->reload_scripts();
+	EditorDebuggerNode *ed = EditorDebuggerNode::get_singleton();
+	if (ed) {
+		ed->reload_scripts();
 	}
 }
 
+MonoArray *godot_icall_Internal_CodeCompletionRequest(int32_t p_kind, MonoString *p_script_file) {
+	String script_file = GDMonoMarshal::mono_string_to_godot(p_script_file);
+	PackedStringArray suggestions = gdmono::get_code_completion((gdmono::CompletionKind)p_kind, script_file);
+	return GDMonoMarshal::PackedStringArray_to_mono_array(suggestions);
+}
+
 float godot_icall_Globals_EditorScale() {
 	return EDSCALE;
 }
@@ -392,7 +399,6 @@ MonoBoolean godot_icall_Utils_OS_UnixFileHasExecutableAccess(MonoString *p_file_
 }
 
 void register_editor_internal_calls() {
-
 	// GodotSharpDirs
 	mono_add_internal_call("GodotTools.Internals.GodotSharpDirs::internal_ResDataDir", (void *)godot_icall_GodotSharpDirs_ResDataDir);
 	mono_add_internal_call("GodotTools.Internals.GodotSharpDirs::internal_ResMetadataDir", (void *)godot_icall_GodotSharpDirs_ResMetadataDir);
@@ -446,7 +452,7 @@ void register_editor_internal_calls() {
 	mono_add_internal_call("GodotTools.Internals.Internal::internal_GetEditorApiHash", (void *)godot_icall_Internal_GetEditorApiHash);
 	mono_add_internal_call("GodotTools.Internals.Internal::internal_IsAssembliesReloadingNeeded", (void *)godot_icall_Internal_IsAssembliesReloadingNeeded);
 	mono_add_internal_call("GodotTools.Internals.Internal::internal_ReloadAssemblies", (void *)godot_icall_Internal_ReloadAssemblies);
-	mono_add_internal_call("GodotTools.Internals.Internal::internal_ScriptEditorDebuggerReloadScripts", (void *)godot_icall_Internal_ScriptEditorDebuggerReloadScripts);
+	mono_add_internal_call("GodotTools.Internals.Internal::internal_EditorDebuggerNodeReloadScripts", (void *)godot_icall_Internal_EditorDebuggerNodeReloadScripts);
 	mono_add_internal_call("GodotTools.Internals.Internal::internal_ScriptEditorEdit", (void *)godot_icall_Internal_ScriptEditorEdit);
 	mono_add_internal_call("GodotTools.Internals.Internal::internal_EditorNodeShowScriptScreen", (void *)godot_icall_Internal_EditorNodeShowScriptScreen);
 	mono_add_internal_call("GodotTools.Internals.Internal::internal_GetScriptsMetadataOrNothing", (void *)godot_icall_Internal_GetScriptsMetadataOrNothing);
@@ -454,6 +460,7 @@ void register_editor_internal_calls() {
 	mono_add_internal_call("GodotTools.Internals.Internal::internal_EditorRunPlay", (void *)godot_icall_Internal_EditorRunPlay);
 	mono_add_internal_call("GodotTools.Internals.Internal::internal_EditorRunStop", (void *)godot_icall_Internal_EditorRunStop);
 	mono_add_internal_call("GodotTools.Internals.Internal::internal_ScriptEditorDebugger_ReloadScripts", (void *)godot_icall_Internal_ScriptEditorDebugger_ReloadScripts);
+	mono_add_internal_call("GodotTools.Internals.Internal::internal_CodeCompletionRequest", (void *)godot_icall_Internal_CodeCompletionRequest);
 
 	// Globals
 	mono_add_internal_call("GodotTools.Internals.Globals::internal_EditorScale", (void *)godot_icall_Globals_EditorScale);
diff --git a/modules/mono/editor/godotsharp_export.cpp b/modules/mono/editor/godotsharp_export.cpp
index ce0b6ad0e6..2edd8c87dc 100644
--- a/modules/mono/editor/godotsharp_export.cpp
+++ b/modules/mono/editor/godotsharp_export.cpp
@@ -32,77 +32,81 @@
 
 #include <mono/metadata/image.h>
 
+#include "core/io/file_access_pack.h"
 #include "core/os/os.h"
+#include "core/project_settings.h"
 
 #include "../mono_gd/gd_mono.h"
 #include "../mono_gd/gd_mono_assembly.h"
 #include "../mono_gd/gd_mono_cache.h"
+#include "../utils/macros.h"
 
 namespace GodotSharpExport {
 
-String get_assemblyref_name(MonoImage *p_image, int index) {
+MonoAssemblyName *new_mono_assembly_name() {
+	// Mono has no public API to create an empty MonoAssemblyName and the struct is private.
+	// As such the only way to create it is with a stub name and then clear it.
+
+	MonoAssemblyName *aname = mono_assembly_name_new("stub");
+	CRASH_COND(aname == nullptr);
+	mono_assembly_name_free(aname); // Frees the string fields, not the struct
+	return aname;
+}
+
+struct AssemblyRefInfo {
+	String name;
+	uint16_t major;
+	uint16_t minor;
+	uint16_t build;
+	uint16_t revision;
+};
+
+AssemblyRefInfo get_assemblyref_name(MonoImage *p_image, int index) {
 	const MonoTableInfo *table_info = mono_image_get_table_info(p_image, MONO_TABLE_ASSEMBLYREF);
 
 	uint32_t cols[MONO_ASSEMBLYREF_SIZE];
 
 	mono_metadata_decode_row(table_info, index, cols, MONO_ASSEMBLYREF_SIZE);
 
-	return String::utf8(mono_metadata_string_heap(p_image, cols[MONO_ASSEMBLYREF_NAME]));
+	return {
+		String::utf8(mono_metadata_string_heap(p_image, cols[MONO_ASSEMBLYREF_NAME])),
+		(uint16_t)cols[MONO_ASSEMBLYREF_MAJOR_VERSION],
+		(uint16_t)cols[MONO_ASSEMBLYREF_MINOR_VERSION],
+		(uint16_t)cols[MONO_ASSEMBLYREF_BUILD_NUMBER],
+		(uint16_t)cols[MONO_ASSEMBLYREF_REV_NUMBER]
+	};
 }
 
-Error get_assembly_dependencies(GDMonoAssembly *p_assembly, const Vector<String> &p_search_dirs, Dictionary &r_dependencies) {
+Error get_assembly_dependencies(GDMonoAssembly *p_assembly, MonoAssemblyName *reusable_aname, const Vector<String> &p_search_dirs, Dictionary &r_assembly_dependencies) {
 	MonoImage *image = p_assembly->get_image();
 
 	for (int i = 0; i < mono_image_get_table_rows(image, MONO_TABLE_ASSEMBLYREF); i++) {
-		String ref_name = get_assemblyref_name(image, i);
+		AssemblyRefInfo ref_info = get_assemblyref_name(image, i);
+
+		const String &ref_name = ref_info.name;
 
-		if (r_dependencies.has(ref_name))
+		if (r_assembly_dependencies.has(ref_name)) {
 			continue;
+		}
+
+		mono_assembly_get_assemblyref(image, i, reusable_aname);
 
 		GDMonoAssembly *ref_assembly = NULL;
-		String path;
-		bool has_extension = ref_name.ends_with(".dll") || ref_name.ends_with(".exe");
-
-		for (int j = 0; j < p_search_dirs.size(); j++) {
-			const String &search_dir = p_search_dirs[j];
-
-			if (has_extension) {
-				path = search_dir.plus_file(ref_name);
-				if (FileAccess::exists(path)) {
-					GDMono::get_singleton()->load_assembly_from(ref_name.get_basename(), path, &ref_assembly, true);
-					if (ref_assembly != NULL)
-						break;
-				}
-			} else {
-				path = search_dir.plus_file(ref_name + ".dll");
-				if (FileAccess::exists(path)) {
-					GDMono::get_singleton()->load_assembly_from(ref_name, path, &ref_assembly, true);
-					if (ref_assembly != NULL)
-						break;
-				}
-
-				path = search_dir.plus_file(ref_name + ".exe");
-				if (FileAccess::exists(path)) {
-					GDMono::get_singleton()->load_assembly_from(ref_name, path, &ref_assembly, true);
-					if (ref_assembly != NULL)
-						break;
-				}
-			}
+		if (!GDMono::get_singleton()->load_assembly(ref_name, reusable_aname, &ref_assembly, /* refonly: */ true, p_search_dirs)) {
+			ERR_FAIL_V_MSG(ERR_CANT_RESOLVE, "Cannot load assembly (refonly): '" + ref_name + "'.");
 		}
 
-		ERR_FAIL_COND_V_MSG(!ref_assembly, ERR_CANT_RESOLVE, "Cannot load assembly (refonly): '" + ref_name + "'.");
-
-		r_dependencies[ref_name] = ref_assembly->get_path();
+		r_assembly_dependencies[ref_name] = ref_assembly->get_path();
 
-		Error err = get_assembly_dependencies(ref_assembly, p_search_dirs, r_dependencies);
+		Error err = get_assembly_dependencies(ref_assembly, reusable_aname, p_search_dirs, r_assembly_dependencies);
 		ERR_FAIL_COND_V_MSG(err != OK, err, "Cannot load one of the dependencies for the assembly: '" + ref_name + "'.");
 	}
 
 	return OK;
 }
 
-Error get_exported_assembly_dependencies(const Dictionary &p_initial_dependencies,
-		const String &p_build_config, const String &p_custom_bcl_dir, Dictionary &r_dependencies) {
+Error get_exported_assembly_dependencies(const Dictionary &p_initial_assemblies,
+		const String &p_build_config, const String &p_custom_bcl_dir, Dictionary &r_assembly_dependencies) {
 	MonoDomain *export_domain = GDMonoUtils::create_domain("GodotEngine.Domain.ProjectExport");
 	ERR_FAIL_NULL_V(export_domain, FAILED);
 	_GDMONO_SCOPE_EXIT_DOMAIN_UNLOAD_(export_domain);
@@ -112,18 +116,27 @@ Error get_exported_assembly_dependencies(const Dictionary &p_initial_dependencie
 	Vector<String> search_dirs;
 	GDMonoAssembly::fill_search_dirs(search_dirs, p_build_config, p_custom_bcl_dir);
 
-	for (const Variant *key = p_initial_dependencies.next(); key; key = p_initial_dependencies.next(key)) {
+	if (p_custom_bcl_dir.length()) {
+		// Only one mscorlib can be loaded. We need this workaround to make sure we get it from the right BCL directory.
+		r_assembly_dependencies["mscorlib"] = p_custom_bcl_dir.plus_file("mscorlib.dll").simplify_path();
+	}
+
+	for (const Variant *key = p_initial_assemblies.next(); key; key = p_initial_assemblies.next(key)) {
 		String assembly_name = *key;
-		String assembly_path = p_initial_dependencies[*key];
+		String assembly_path = p_initial_assemblies[*key];
 
-		GDMonoAssembly *assembly = NULL;
+		GDMonoAssembly *assembly = nullptr;
 		bool load_success = GDMono::get_singleton()->load_assembly_from(assembly_name, assembly_path, &assembly, /* refonly: */ true);
 
 		ERR_FAIL_COND_V_MSG(!load_success, ERR_CANT_RESOLVE, "Cannot load assembly (refonly): '" + assembly_name + "'.");
 
-		Error err = get_assembly_dependencies(assembly, search_dirs, r_dependencies);
-		if (err != OK)
+		MonoAssemblyName *reusable_aname = new_mono_assembly_name();
+		SCOPE_EXIT { mono_free(reusable_aname); };
+
+		Error err = get_assembly_dependencies(assembly, reusable_aname, search_dirs, r_assembly_dependencies);
+		if (err != OK) {
 			return err;
+		}
 	}
 
 	return OK;
diff --git a/modules/mono/editor/godotsharp_export.h b/modules/mono/editor/godotsharp_export.h
index 36138f81b7..9ab57755de 100644
--- a/modules/mono/editor/godotsharp_export.h
+++ b/modules/mono/editor/godotsharp_export.h
@@ -41,8 +41,8 @@ namespace GodotSharpExport {
 
 Error get_assembly_dependencies(GDMonoAssembly *p_assembly, const Vector<String> &p_search_dirs, Dictionary &r_dependencies);
 
-Error get_exported_assembly_dependencies(const Dictionary &p_initial_dependencies,
-		const String &p_build_config, const String &p_custom_lib_dir, Dictionary &r_dependencies);
+Error get_exported_assembly_dependencies(const Dictionary &p_initial_assemblies,
+		const String &p_build_config, const String &p_custom_lib_dir, Dictionary &r_assembly_dependencies);
 
 } // namespace GodotSharpExport
 
diff --git a/modules/mono/editor/script_class_parser.cpp b/modules/mono/editor/script_class_parser.cpp
index bece23c9a6..f7d6e7e302 100644
--- a/modules/mono/editor/script_class_parser.cpp
+++ b/modules/mono/editor/script_class_parser.cpp
@@ -54,13 +54,11 @@ const char *ScriptClassParser::token_names[ScriptClassParser::TK_MAX] = {
 };
 
 String ScriptClassParser::get_token_name(ScriptClassParser::Token p_token) {
-
 	ERR_FAIL_INDEX_V(p_token, TK_MAX, "<error>");
 	return token_names[p_token];
 }
 
 ScriptClassParser::Token ScriptClassParser::get_token() {
-
 	while (true) {
 		switch (code[idx]) {
 			case '\n': {
@@ -153,7 +151,7 @@ ScriptClassParser::Token ScriptClassParser::get_token() {
 			case '"': {
 				bool verbatim = idx != 0 && code[idx - 1] == '@';
 
-				CharType begin_str = code[idx];
+				char32_t begin_str = code[idx];
 				idx++;
 				String tk_string = String();
 				while (true) {
@@ -172,23 +170,33 @@ ScriptClassParser::Token ScriptClassParser::get_token() {
 					} else if (code[idx] == '\\' && !verbatim) {
 						//escaped characters...
 						idx++;
-						CharType next = code[idx];
+						char32_t next = code[idx];
 						if (next == 0) {
 							error_str = "Unterminated String";
 							error = true;
 							return TK_ERROR;
 						}
-						CharType res = 0;
+						char32_t res = 0;
 
 						switch (next) {
-							case 'b': res = 8; break;
-							case 't': res = 9; break;
-							case 'n': res = 10; break;
-							case 'f': res = 12; break;
+							case 'b':
+								res = 8;
+								break;
+							case 't':
+								res = 9;
+								break;
+							case 'n':
+								res = 10;
+								break;
+							case 'f':
+								res = 12;
+								break;
 							case 'r':
 								res = 13;
 								break;
-							case '\"': res = '\"'; break;
+							case '\"':
+								res = '\"';
+								break;
 							case '\\':
 								res = '\\';
 								break;
@@ -200,8 +208,9 @@ ScriptClassParser::Token ScriptClassParser::get_token() {
 						tk_string += res;
 
 					} else {
-						if (code[idx] == '\n')
+						if (code[idx] == '\n') {
 							line++;
+						}
 						tk_string += code[idx];
 					}
 					idx++;
@@ -225,8 +234,8 @@ ScriptClassParser::Token ScriptClassParser::get_token() {
 
 				if (code[idx] == '-' || (code[idx] >= '0' && code[idx] <= '9')) {
 					//a number
-					const CharType *rptr;
-					double number = String::to_double(&code[idx], &rptr);
+					const char32_t *rptr;
+					double number = String::to_float(&code[idx], &rptr);
 					idx += (rptr - &code[idx]);
 					value = number;
 					return TK_NUMBER;
@@ -258,7 +267,6 @@ ScriptClassParser::Token ScriptClassParser::get_token() {
 }
 
 Error ScriptClassParser::_skip_generic_type_params() {
-
 	Token tk;
 
 	while (true) {
@@ -293,15 +301,17 @@ Error ScriptClassParser::_skip_generic_type_params() {
 
 					tk = get_token();
 
-					if (tk != TK_PERIOD)
+					if (tk != TK_PERIOD) {
 						break;
+					}
 				}
 			}
 
 			if (tk == TK_OP_LESS) {
 				Error err = _skip_generic_type_params();
-				if (err)
+				if (err) {
 					return err;
+				}
 				tk = get_token();
 			}
 
@@ -327,7 +337,6 @@ Error ScriptClassParser::_skip_generic_type_params() {
 }
 
 Error ScriptClassParser::_parse_type_full_name(String &r_full_name) {
-
 	Token tk = get_token();
 
 	if (tk != TK_IDENTIFIER) {
@@ -343,12 +352,14 @@ Error ScriptClassParser::_parse_type_full_name(String &r_full_name) {
 
 		// We don't mind if the base is generic, but we skip it any ways since this information is not needed
 		Error err = _skip_generic_type_params();
-		if (err)
+		if (err) {
 			return err;
+		}
 	}
 
-	if (code[idx] != '.') // We only want to take the next token if it's a period
+	if (code[idx] != '.') { // We only want to take the next token if it's a period
 		return OK;
+	}
 
 	tk = get_token();
 
@@ -360,19 +371,20 @@ Error ScriptClassParser::_parse_type_full_name(String &r_full_name) {
 }
 
 Error ScriptClassParser::_parse_class_base(Vector<String> &r_base) {
-
 	String name;
 
 	Error err = _parse_type_full_name(name);
-	if (err)
+	if (err) {
 		return err;
+	}
 
 	Token tk = get_token();
 
 	if (tk == TK_COMMA) {
 		err = _parse_class_base(r_base);
-		if (err)
+		if (err) {
 			return err;
+		}
 	} else if (tk == TK_IDENTIFIER && String(value) == "where") {
 		err = _parse_type_constraints();
 		if (err) {
@@ -428,8 +440,9 @@ Error ScriptClassParser::_parse_type_constraints() {
 
 					tk = get_token();
 
-					if (tk != TK_PERIOD)
+					if (tk != TK_PERIOD) {
 						break;
+					}
 				}
 			}
 		}
@@ -447,8 +460,9 @@ Error ScriptClassParser::_parse_type_constraints() {
 			}
 		} else if (tk == TK_OP_LESS) {
 			Error err = _skip_generic_type_params();
-			if (err)
+			if (err) {
 				return err;
+			}
 		} else if (tk == TK_CURLY_BRACKET_OPEN) {
 			return OK;
 		} else {
@@ -460,7 +474,6 @@ Error ScriptClassParser::_parse_type_constraints() {
 }
 
 Error ScriptClassParser::_parse_namespace_name(String &r_name, int &r_curly_stack) {
-
 	Token tk = get_token();
 
 	if (tk == TK_IDENTIFIER) {
@@ -487,7 +500,6 @@ Error ScriptClassParser::_parse_namespace_name(String &r_name, int &r_curly_stac
 }
 
 Error ScriptClassParser::parse(const String &p_code) {
-
 	code = p_code;
 	idx = 0;
 	line = 0;
@@ -519,8 +531,9 @@ Error ScriptClassParser::parse(const String &p_code) {
 					const NameDecl &name_decl = E->value();
 
 					if (name_decl.type == NameDecl::NAMESPACE_DECL) {
-						if (E != name_stack.front())
+						if (E != name_stack.front()) {
 							class_decl.namespace_ += ".";
+						}
 						class_decl.namespace_ += name_decl.name;
 					} else {
 						class_decl.name += name_decl.name + ".";
@@ -537,8 +550,9 @@ Error ScriptClassParser::parse(const String &p_code) {
 
 					if (tk == TK_COLON) {
 						Error err = _parse_class_base(class_decl.base);
-						if (err)
+						if (err) {
 							return err;
+						}
 
 						curly_stack++;
 						type_curly_stack++;
@@ -552,8 +566,9 @@ Error ScriptClassParser::parse(const String &p_code) {
 						generic = true;
 
 						Error err = _skip_generic_type_params();
-						if (err)
+						if (err) {
 							return err;
+						}
 					} else if (tk == TK_IDENTIFIER && String(value) == "where") {
 						Error err = _parse_type_constraints();
 						if (err) {
@@ -581,8 +596,9 @@ Error ScriptClassParser::parse(const String &p_code) {
 						classes.push_back(class_decl);
 					} else if (OS::get_singleton()->is_stdout_verbose()) {
 						String full_name = class_decl.namespace_;
-						if (full_name.length())
+						if (full_name.length()) {
 							full_name += ".";
+						}
 						full_name += class_decl.name;
 						OS::get_singleton()->print("Ignoring generic class declaration: %s\n", full_name.utf8().get_data());
 					}
@@ -599,8 +615,9 @@ Error ScriptClassParser::parse(const String &p_code) {
 			int at_level = curly_stack;
 
 			Error err = _parse_namespace_name(name, curly_stack);
-			if (err)
+			if (err) {
 				return err;
+			}
 
 			NameDecl name_decl;
 			name_decl.name = name;
@@ -611,8 +628,9 @@ Error ScriptClassParser::parse(const String &p_code) {
 		} else if (tk == TK_CURLY_BRACKET_CLOSE) {
 			curly_stack--;
 			if (name_stack.has(curly_stack)) {
-				if (name_stack[curly_stack].type != NameDecl::NAMESPACE_DECL)
+				if (name_stack[curly_stack].type != NameDecl::NAMESPACE_DECL) {
 					type_curly_stack--;
+				}
 				name_stack.erase(curly_stack);
 			}
 		}
@@ -625,8 +643,9 @@ Error ScriptClassParser::parse(const String &p_code) {
 		error = true;
 	}
 
-	if (error)
+	if (error) {
 		return ERR_PARSE_ERROR;
+	}
 
 	return OK;
 }
@@ -643,7 +662,6 @@ static String get_preprocessor_directive(const String &p_line, int p_from) {
 }
 
 static void run_dummy_preprocessor(String &r_source, const String &p_filepath) {
-
 	Vector<String> lines = r_source.split("\n", /* p_allow_empty: */ true);
 
 	bool *include_lines = memnew_arr(bool, lines.size());
@@ -700,8 +718,9 @@ static void run_dummy_preprocessor(String &r_source, const String &p_filepath) {
 
 	// Custom join ignoring lines removed by the preprocessor
 	for (int i = 0; i < lines.size(); i++) {
-		if (i > 0 && include_lines[i - 1])
+		if (i > 0 && include_lines[i - 1]) {
 			r_source += '\n';
+		}
 
 		if (include_lines[i]) {
 			r_source += lines[i];
@@ -710,7 +729,6 @@ static void run_dummy_preprocessor(String &r_source, const String &p_filepath) {
 }
 
 Error ScriptClassParser::parse_file(const String &p_filepath) {
-
 	String source;
 
 	Error ferr = read_all_file_utf8(p_filepath, source);
diff --git a/modules/mono/editor/script_class_parser.h b/modules/mono/editor/script_class_parser.h
index a76a3a50a9..d611e8fb74 100644
--- a/modules/mono/editor/script_class_parser.h
+++ b/modules/mono/editor/script_class_parser.h
@@ -36,7 +36,6 @@
 #include "core/vector.h"
 
 class ScriptClassParser {
-
 public:
 	struct NameDecl {
 		enum Type {
@@ -54,7 +53,6 @@ public:
 		String namespace_;
 		Vector<String> base;
 		bool nested;
-		bool has_script_attr;
 	};
 
 private:
diff --git a/modules/mono/glue/GodotSharp/GodotSharp.sln b/modules/mono/glue/GodotSharp/GodotSharp.sln
index a496e36da3..4896d0a07d 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp.sln
+++ b/modules/mono/glue/GodotSharp/GodotSharp.sln
@@ -8,8 +8,6 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 	Debug|Any CPU = Debug|Any CPU
 	Release|Any CPU = Release|Any CPU
-	Debug|Any CPU = Debug|Any CPU
-	Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{AEBF0036-DA76-4341-B651-A3F2856AB2FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/AABB.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/AABB.cs
index 6a4f785551..3aecce50f5 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/AABB.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/AABB.cs
@@ -14,6 +14,10 @@ using real_t = System.Single;
 
 namespace Godot
 {
+    /// <summary>
+    /// Axis-Aligned Bounding Box. AABB consists of a position, a size, and
+    /// several utility functions. It is typically used for fast overlap tests.
+    /// </summary>
     [Serializable]
     [StructLayout(LayoutKind.Sequential)]
     public struct AABB : IEquatable<AABB>
@@ -21,24 +25,55 @@ namespace Godot
         private Vector3 _position;
         private Vector3 _size;
 
+        /// <summary>
+        /// Beginning corner. Typically has values lower than End.
+        /// </summary>
+        /// <value>Directly uses a private field.</value>
         public Vector3 Position
         {
             get { return _position; }
             set { _position = value; }
         }
 
+        /// <summary>
+        /// Size from Position to End. Typically all components are positive.
+        /// If the size is negative, you can use <see cref="Abs"/> to fix it.
+        /// </summary>
+        /// <value>Directly uses a private field.</value>
         public Vector3 Size
         {
             get { return _size; }
             set { _size = value; }
         }
 
+        /// <summary>
+        /// Ending corner. This is calculated as <see cref="Position"/> plus
+        /// <see cref="Size"/>. Setting this value will change the size.
+        /// </summary>
+        /// <value>Getting is equivalent to `value = Position + Size`, setting is equivalent to `Size = value - Position`.</value>
         public Vector3 End
         {
             get { return _position + _size; }
             set { _size = value - _position; }
         }
 
+        /// <summary>
+        /// Returns an AABB with equivalent position and size, modified so that
+        /// the most-negative corner is the origin and the size is positive.
+        /// </summary>
+        /// <returns>The modified AABB.</returns>
+        public AABB Abs()
+        {
+            Vector3 end = End;
+            Vector3 topLeft = new Vector3(Mathf.Min(_position.x, end.x), Mathf.Min(_position.y, end.y), Mathf.Min(_position.z, end.z));
+            return new AABB(topLeft, _size.Abs());
+        }
+
+        /// <summary>
+        /// Returns true if this AABB completely encloses another one.
+        /// </summary>
+        /// <param name="with">The other AABB that may be enclosed.</param>
+        /// <returns>A bool for whether or not this AABB encloses `b`.</returns>
         public bool Encloses(AABB with)
         {
             Vector3 src_min = _position;
@@ -54,33 +89,59 @@ namespace Godot
                    src_max.z > dst_max.z;
         }
 
+        /// <summary>
+        /// Returns this AABB expanded to include a given point.
+        /// </summary>
+        /// <param name="point">The point to include.</param>
+        /// <returns>The expanded AABB.</returns>
         public AABB Expand(Vector3 point)
         {
             Vector3 begin = _position;
             Vector3 end = _position + _size;
 
             if (point.x < begin.x)
+            {
                 begin.x = point.x;
+            }
             if (point.y < begin.y)
+            {
                 begin.y = point.y;
+            }
             if (point.z < begin.z)
+            {
                 begin.z = point.z;
+            }
 
             if (point.x > end.x)
+            {
                 end.x = point.x;
+            }
             if (point.y > end.y)
+            {
                 end.y = point.y;
+            }
             if (point.z > end.z)
+            {
                 end.z = point.z;
+            }
 
             return new AABB(begin, end - begin);
         }
 
+        /// <summary>
+        /// Returns the area of the AABB.
+        /// </summary>
+        /// <returns>The area.</returns>
         public real_t GetArea()
         {
             return _size.x * _size.y * _size.z;
         }
 
+        /// <summary>
+        /// Gets the position of one of the 8 endpoints of the AABB.
+        /// </summary>
+        /// <param name="idx">Which endpoint to get.</param>
+        /// <returns>An endpoint of the AABB.</returns>
         public Vector3 GetEndpoint(int idx)
         {
             switch (idx)
@@ -106,6 +167,10 @@ namespace Godot
             }
         }
 
+        /// <summary>
+        /// Returns the normalized longest axis of the AABB.
+        /// </summary>
+        /// <returns>A vector representing the normalized longest axis of the AABB.</returns>
         public Vector3 GetLongestAxis()
         {
             var axis = new Vector3(1f, 0f, 0f);
@@ -125,6 +190,10 @@ namespace Godot
             return axis;
         }
 
+        /// <summary>
+        /// Returns the <see cref="Vector3.Axis"/> index of the longest axis of the AABB.
+        /// </summary>
+        /// <returns>A <see cref="Vector3.Axis"/> index for which axis is longest.</returns>
         public Vector3.Axis GetLongestAxisIndex()
         {
             var axis = Vector3.Axis.X;
@@ -144,6 +213,10 @@ namespace Godot
             return axis;
         }
 
+        /// <summary>
+        /// Returns the scalar length of the longest axis of the AABB.
+        /// </summary>
+        /// <returns>The scalar length of the longest axis of the AABB.</returns>
         public real_t GetLongestAxisSize()
         {
             real_t max_size = _size.x;
@@ -157,6 +230,10 @@ namespace Godot
             return max_size;
         }
 
+        /// <summary>
+        /// Returns the normalized shortest axis of the AABB.
+        /// </summary>
+        /// <returns>A vector representing the normalized shortest axis of the AABB.</returns>
         public Vector3 GetShortestAxis()
         {
             var axis = new Vector3(1f, 0f, 0f);
@@ -176,6 +253,10 @@ namespace Godot
             return axis;
         }
 
+        /// <summary>
+        /// Returns the <see cref="Vector3.Axis"/> index of the shortest axis of the AABB.
+        /// </summary>
+        /// <returns>A <see cref="Vector3.Axis"/> index for which axis is shortest.</returns>
         public Vector3.Axis GetShortestAxisIndex()
         {
             var axis = Vector3.Axis.X;
@@ -195,6 +276,10 @@ namespace Godot
             return axis;
         }
 
+        /// <summary>
+        /// Returns the scalar length of the shortest axis of the AABB.
+        /// </summary>
+        /// <returns>The scalar length of the shortest axis of the AABB.</returns>
         public real_t GetShortestAxisSize()
         {
             real_t max_size = _size.x;
@@ -208,6 +293,12 @@ namespace Godot
             return max_size;
         }
 
+        /// <summary>
+        /// Returns the support point in a given direction.
+        /// This is useful for collision detection algorithms.
+        /// </summary>
+        /// <param name="dir">The direction to find support for.</param>
+        /// <returns>A vector representing the support.</returns>
         public Vector3 GetSupport(Vector3 dir)
         {
             Vector3 half_extents = _size * 0.5f;
@@ -219,6 +310,11 @@ namespace Godot
                 dir.z > 0f ? -half_extents.z : half_extents.z);
         }
 
+        /// <summary>
+        /// Returns a copy of the AABB grown a given amount of units towards all the sides.
+        /// </summary>
+        /// <param name="by">The amount to grow by.</param>
+        /// <returns>The grown AABB.</returns>
         public AABB Grow(real_t by)
         {
             var res = this;
@@ -233,16 +329,29 @@ namespace Godot
             return res;
         }
 
+        /// <summary>
+        /// Returns true if the AABB is flat or empty, or false otherwise.
+        /// </summary>
+        /// <returns>A bool for whether or not the AABB has area.</returns>
         public bool HasNoArea()
         {
             return _size.x <= 0f || _size.y <= 0f || _size.z <= 0f;
         }
 
+        /// <summary>
+        /// Returns true if the AABB has no surface (no size), or false otherwise.
+        /// </summary>
+        /// <returns>A bool for whether or not the AABB has area.</returns>
         public bool HasNoSurface()
         {
             return _size.x <= 0f && _size.y <= 0f && _size.z <= 0f;
         }
 
+        /// <summary>
+        /// Returns true if the AABB contains a point, or false otherwise.
+        /// </summary>
+        /// <param name="point">The point to check.</param>
+        /// <returns>A bool for whether or not the AABB contains `point`.</returns>
         public bool HasPoint(Vector3 point)
         {
             if (point.x < _position.x)
@@ -261,6 +370,11 @@ namespace Godot
             return true;
         }
 
+        /// <summary>
+        /// Returns the intersection of this AABB and `b`.
+        /// </summary>
+        /// <param name="with">The other AABB.</param>
+        /// <returns>The clipped AABB.</returns>
         public AABB Intersection(AABB with)
         {
             Vector3 src_min = _position;
@@ -297,24 +411,57 @@ namespace Godot
             return new AABB(min, max - min);
         }
 
-        public bool Intersects(AABB with)
+        /// <summary>
+        /// Returns true if the AABB overlaps with `b`
+        /// (i.e. they have at least one point in common).
+        ///
+        /// If `includeBorders` is true, they will also be considered overlapping
+        /// if their borders touch, even without intersection.
+        /// </summary>
+        /// <param name="with">The other AABB to check for intersections with.</param>
+        /// <param name="includeBorders">Whether or not to consider borders.</param>
+        /// <returns>A bool for whether or not they are intersecting.</returns>
+        public bool Intersects(AABB with, bool includeBorders = false)
         {
-            if (_position.x >= with._position.x + with._size.x)
-                return false;
-            if (_position.x + _size.x <= with._position.x)
-                return false;
-            if (_position.y >= with._position.y + with._size.y)
-                return false;
-            if (_position.y + _size.y <= with._position.y)
-                return false;
-            if (_position.z >= with._position.z + with._size.z)
-                return false;
-            if (_position.z + _size.z <= with._position.z)
-                return false;
+            if (includeBorders)
+            {
+                if (_position.x > with._position.x + with._size.x)
+                    return false;
+                if (_position.x + _size.x < with._position.x)
+                    return false;
+                if (_position.y > with._position.y + with._size.y)
+                    return false;
+                if (_position.y + _size.y < with._position.y)
+                    return false;
+                if (_position.z > with._position.z + with._size.z)
+                    return false;
+                if (_position.z + _size.z < with._position.z)
+                    return false;
+            }
+            else
+            {
+                if (_position.x >= with._position.x + with._size.x)
+                    return false;
+                if (_position.x + _size.x <= with._position.x)
+                    return false;
+                if (_position.y >= with._position.y + with._size.y)
+                    return false;
+                if (_position.y + _size.y <= with._position.y)
+                    return false;
+                if (_position.z >= with._position.z + with._size.z)
+                    return false;
+                if (_position.z + _size.z <= with._position.z)
+                    return false;
+            }
 
             return true;
         }
 
+        /// <summary>
+        /// Returns true if the AABB is on both sides of `plane`.
+        /// </summary>
+        /// <param name="plane">The plane to check for intersection.</param>
+        /// <returns>A bool for whether or not the AABB intersects the plane.</returns>
         public bool IntersectsPlane(Plane plane)
         {
             Vector3[] points =
@@ -335,14 +482,24 @@ namespace Godot
             for (int i = 0; i < 8; i++)
             {
                 if (plane.DistanceTo(points[i]) > 0)
+                {
                     over = true;
+                }
                 else
+                {
                     under = true;
+                }
             }
 
             return under && over;
         }
 
+        /// <summary>
+        /// Returns true if the AABB intersects the line segment between `from` and `to`.
+        /// </summary>
+        /// <param name="from">The start of the line segment.</param>
+        /// <param name="to">The end of the line segment.</param>
+        /// <returns>A bool for whether or not the AABB intersects the line segment.</returns>
         public bool IntersectsSegment(Vector3 from, Vector3 to)
         {
             real_t min = 0f;
@@ -359,7 +516,9 @@ namespace Godot
                 if (segFrom < segTo)
                 {
                     if (segFrom > boxEnd || segTo < boxBegin)
+                    {
                         return false;
+                    }
 
                     real_t length = segTo - segFrom;
                     cmin = segFrom < boxBegin ? (boxBegin - segFrom) / length : 0f;
@@ -368,7 +527,9 @@ namespace Godot
                 else
                 {
                     if (segTo > boxEnd || segFrom < boxBegin)
+                    {
                         return false;
+                    }
 
                     real_t length = segTo - segFrom;
                     cmin = segFrom > boxEnd ? (boxEnd - segFrom) / length : 0f;
@@ -381,14 +542,23 @@ namespace Godot
                 }
 
                 if (cmax < max)
+                {
                     max = cmax;
+                }
                 if (max < min)
+                {
                     return false;
+                }
             }
 
             return true;
         }
 
+        /// <summary>
+        /// Returns a larger AABB that contains this AABB and `b`.
+        /// </summary>
+        /// <param name="with">The other AABB.</param>
+        /// <returns>The merged AABB.</returns>
         public AABB Merge(AABB with)
         {
             Vector3 beg1 = _position;
@@ -411,22 +581,52 @@ namespace Godot
             return new AABB(min, max - min);
         }
 
-        // Constructors
+        /// <summary>
+        /// Constructs an AABB from a position and size.
+        /// </summary>
+        /// <param name="position">The position.</param>
+        /// <param name="size">The size, typically positive.</param>
         public AABB(Vector3 position, Vector3 size)
         {
             _position = position;
             _size = size;
         }
+
+        /// <summary>
+        /// Constructs an AABB from a position, width, height, and depth.
+        /// </summary>
+        /// <param name="position">The position.</param>
+        /// <param name="width">The width, typically positive.</param>
+        /// <param name="height">The height, typically positive.</param>
+        /// <param name="depth">The depth, typically positive.</param>
         public AABB(Vector3 position, real_t width, real_t height, real_t depth)
         {
             _position = position;
             _size = new Vector3(width, height, depth);
         }
+
+        /// <summary>
+        /// Constructs an AABB from x, y, z, and size.
+        /// </summary>
+        /// <param name="x">The position's X coordinate.</param>
+        /// <param name="y">The position's Y coordinate.</param>
+        /// <param name="z">The position's Z coordinate.</param>
+        /// <param name="size">The size, typically positive.</param>
         public AABB(real_t x, real_t y, real_t z, Vector3 size)
         {
             _position = new Vector3(x, y, z);
             _size = size;
         }
+
+        /// <summary>
+        /// Constructs an AABB from x, y, z, width, height, and depth.
+        /// </summary>
+        /// <param name="x">The position's X coordinate.</param>
+        /// <param name="y">The position's Y coordinate.</param>
+        /// <param name="z">The position's Z coordinate.</param>
+        /// <param name="width">The width, typically positive.</param>
+        /// <param name="height">The height, typically positive.</param>
+        /// <param name="depth">The depth, typically positive.</param>
         public AABB(real_t x, real_t y, real_t z, real_t width, real_t height, real_t depth)
         {
             _position = new Vector3(x, y, z);
@@ -458,6 +658,12 @@ namespace Godot
             return _position == other._position && _size == other._size;
         }
 
+        /// <summary>
+        /// Returns true if this AABB and `other` are approximately equal, by running
+        /// <see cref="Vector3.IsEqualApprox(Vector3)"/> on each component.
+        /// </summary>
+        /// <param name="other">The other AABB to compare.</param>
+        /// <returns>Whether or not the AABBs are approximately equal.</returns>
         public bool IsEqualApprox(AABB other)
         {
             return _position.IsEqualApprox(other._position) && _size.IsEqualApprox(other._size);
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Array.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Array.cs
index aba1065498..f77d3052f4 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Array.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Array.cs
@@ -15,10 +15,7 @@ namespace Godot.Collections
 
         public override bool IsInvalid
         {
-            get
-            {
-                return handle == IntPtr.Zero;
-            }
+            get { return handle == IntPtr.Zero; }
         }
 
         protected override bool ReleaseHandle()
@@ -43,7 +40,17 @@ namespace Godot.Collections
             if (collection == null)
                 throw new NullReferenceException($"Parameter '{nameof(collection)} cannot be null.'");
 
-            MarshalUtils.EnumerableToArray(collection, GetPtr());
+            foreach (object element in collection)
+                Add(element);
+        }
+
+        public Array(params object[] array) : this()
+        {
+            if (array == null)
+            {
+                throw new NullReferenceException($"Parameter '{nameof(array)} cannot be null.'");
+            }
+            safeHandle = new ArraySafeHandle(godot_icall_Array_Ctor_MonoArray(array));
         }
 
         internal Array(ArraySafeHandle handle)
@@ -74,6 +81,11 @@ namespace Godot.Collections
             return godot_icall_Array_Resize(GetPtr(), newSize);
         }
 
+        public static Array operator +(Array left, Array right)
+        {
+            return new Array(godot_icall_Array_Concatenate(left.GetPtr(), right.GetPtr()));
+        }
+
         // IDisposable
 
         public void Dispose()
@@ -157,6 +169,9 @@ namespace Godot.Collections
         internal extern static IntPtr godot_icall_Array_Ctor();
 
         [MethodImpl(MethodImplOptions.InternalCall)]
+        internal extern static IntPtr godot_icall_Array_Ctor_MonoArray(System.Array array);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
         internal extern static void godot_icall_Array_Dtor(IntPtr ptr);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
@@ -178,6 +193,9 @@ namespace Godot.Collections
         internal extern static void godot_icall_Array_Clear(IntPtr ptr);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
+        internal extern static IntPtr godot_icall_Array_Concatenate(IntPtr left, IntPtr right);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
         internal extern static bool godot_icall_Array_Contains(IntPtr ptr, object item);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
@@ -233,6 +251,15 @@ namespace Godot.Collections
             objectArray = new Array(collection);
         }
 
+        public Array(params T[] array) : this()
+        {
+            if (array == null)
+            {
+                throw new NullReferenceException($"Parameter '{nameof(array)} cannot be null.'");
+            }
+            objectArray = new Array(array);
+        }
+
         public Array(Array array)
         {
             objectArray = array;
@@ -268,18 +295,17 @@ namespace Godot.Collections
             return objectArray.Resize(newSize);
         }
 
+        public static Array<T> operator +(Array<T> left, Array<T> right)
+        {
+            return new Array<T>(left.objectArray + right.objectArray);
+        }
+
         // IList<T>
 
         public T this[int index]
         {
-            get
-            {
-                return (T)Array.godot_icall_Array_At_Generic(GetPtr(), index, elemTypeEncoding, elemTypeClass);
-            }
-            set
-            {
-                objectArray[index] = value;
-            }
+            get { return (T)Array.godot_icall_Array_At_Generic(GetPtr(), index, elemTypeEncoding, elemTypeClass); }
+            set { objectArray[index] = value; }
         }
 
         public int IndexOf(T item)
@@ -301,18 +327,12 @@ namespace Godot.Collections
 
         public int Count
         {
-            get
-            {
-                return objectArray.Count;
-            }
+            get { return objectArray.Count; }
         }
 
         public bool IsReadOnly
         {
-            get
-            {
-                return objectArray.IsReadOnly;
-            }
+            get { return objectArray.IsReadOnly; }
         }
 
         public void Add(T item)
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Attributes/RPCAttributes.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Attributes/RPCAttributes.cs
index 1bf6d5199a..8fc430b6bc 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Attributes/RPCAttributes.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Attributes/RPCAttributes.cs
@@ -6,18 +6,12 @@ namespace Godot
     public class RemoteAttribute : Attribute {}
 
     [AttributeUsage(AttributeTargets.Method | AttributeTargets.Field | AttributeTargets.Property)]
-    public class SyncAttribute : Attribute {}
-
-    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Field | AttributeTargets.Property)]
     public class MasterAttribute : Attribute {}
 
     [AttributeUsage(AttributeTargets.Method | AttributeTargets.Field | AttributeTargets.Property)]
     public class PuppetAttribute : Attribute {}
 
     [AttributeUsage(AttributeTargets.Method | AttributeTargets.Field | AttributeTargets.Property)]
-    public class SlaveAttribute : Attribute {}
-
-    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Field | AttributeTargets.Property)]
     public class RemoteSyncAttribute : Attribute {}
 
     [AttributeUsage(AttributeTargets.Method | AttributeTargets.Field | AttributeTargets.Property)]
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Attributes/SignalAttribute.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Attributes/SignalAttribute.cs
index 3957387be9..39d5782db8 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Attributes/SignalAttribute.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Attributes/SignalAttribute.cs
@@ -2,7 +2,7 @@ using System;
 
 namespace Godot
 {
-    [AttributeUsage(AttributeTargets.Delegate)]
+    [AttributeUsage(AttributeTargets.Delegate | AttributeTargets.Event)]
     public class SignalAttribute : Attribute
     {
     }
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Basis.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Basis.cs
index d38589013e..3f1120575f 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Basis.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Basis.cs
@@ -8,6 +8,20 @@ using real_t = System.Single;
 
 namespace Godot
 {
+    /// <summary>
+    /// 3×3 matrix used for 3D rotation and scale.
+    /// Almost always used as an orthogonal basis for a Transform.
+    ///
+    /// Contains 3 vector fields X, Y and Z as its columns, which are typically
+    /// interpreted as the local basis vectors of a 3D transformation. For such use,
+    /// it is composed of a scaling and a rotation matrix, in that order (M = R.S).
+    ///
+    /// Can also be accessed as array of 3D vectors. These vectors are normally
+    /// orthogonal to each other, but are not necessarily normalized (due to scaling).
+    ///
+    /// For more information, read this documentation article:
+    /// https://docs.godotengine.org/en/latest/tutorials/math/matrices_and_transforms.html
+    /// </summary>
     [Serializable]
     [StructLayout(LayoutKind.Sequential)]
     public struct Basis : IEquatable<Basis>
@@ -15,9 +29,9 @@ namespace Godot
         // NOTE: x, y and z are public-only. Use Column0, Column1 and Column2 internally.
 
         /// <summary>
-        /// Returns the basis matrix’s x vector.
-        /// This is equivalent to <see cref="Column0"/>.
+        /// The basis matrix's X vector (column 0).
         /// </summary>
+        /// <value>Equivalent to <see cref="Column0"/> and array index `[0]`.</value>
         public Vector3 x
         {
             get => Column0;
@@ -25,9 +39,9 @@ namespace Godot
         }
 
         /// <summary>
-        /// Returns the basis matrix’s y vector.
-        /// This is equivalent to <see cref="Column1"/>.
+        /// The basis matrix's Y vector (column 1).
         /// </summary>
+        /// <value>Equivalent to <see cref="Column1"/> and array index `[1]`.</value>
         public Vector3 y
         {
             get => Column1;
@@ -35,19 +49,40 @@ namespace Godot
         }
 
         /// <summary>
-        /// Returns the basis matrix’s z vector.
-        /// This is equivalent to <see cref="Column2"/>.
+        /// The basis matrix's Z vector (column 2).
         /// </summary>
+        /// <value>Equivalent to <see cref="Column2"/> and array index `[2]`.</value>
         public Vector3 z
         {
             get => Column2;
             set => Column2 = value;
         }
 
+        /// <summary>
+        /// Row 0 of the basis matrix. Shows which vectors contribute
+        /// to the X direction. Rows are not very useful for user code,
+        /// but are more efficient for some internal calculations.
+        /// </summary>
         public Vector3 Row0;
+
+        /// <summary>
+        /// Row 1 of the basis matrix. Shows which vectors contribute
+        /// to the Y direction. Rows are not very useful for user code,
+        /// but are more efficient for some internal calculations.
+        /// </summary>
         public Vector3 Row1;
+
+        /// <summary>
+        /// Row 2 of the basis matrix. Shows which vectors contribute
+        /// to the Z direction. Rows are not very useful for user code,
+        /// but are more efficient for some internal calculations.
+        /// </summary>
         public Vector3 Row2;
 
+        /// <summary>
+        /// Column 0 of the basis matrix (the X vector).
+        /// </summary>
+        /// <value>Equivalent to <see cref="x"/> and array index `[0]`.</value>
         public Vector3 Column0
         {
             get => new Vector3(Row0.x, Row1.x, Row2.x);
@@ -58,6 +93,11 @@ namespace Godot
                 this.Row2.x = value.z;
             }
         }
+
+        /// <summary>
+        /// Column 1 of the basis matrix (the Y vector).
+        /// </summary>
+        /// <value>Equivalent to <see cref="y"/> and array index `[1]`.</value>
         public Vector3 Column1
         {
             get => new Vector3(Row0.y, Row1.y, Row2.y);
@@ -68,6 +108,11 @@ namespace Godot
                 this.Row2.y = value.z;
             }
         }
+
+        /// <summary>
+        /// Column 2 of the basis matrix (the Z vector).
+        /// </summary>
+        /// <value>Equivalent to <see cref="z"/> and array index `[2]`.</value>
         public Vector3 Column2
         {
             get => new Vector3(Row0.z, Row1.z, Row2.z);
@@ -79,6 +124,10 @@ namespace Godot
             }
         }
 
+        /// <summary>
+        /// The scale of this basis.
+        /// </summary>
+        /// <value>Equivalent to the lengths of each column vector, but negative if the determinant is negative.</value>
         public Vector3 Scale
         {
             get
@@ -86,18 +135,29 @@ namespace Godot
                 real_t detSign = Mathf.Sign(Determinant());
                 return detSign * new Vector3
                 (
-                    new Vector3(this.Row0[0], this.Row1[0], this.Row2[0]).Length(),
-                    new Vector3(this.Row0[1], this.Row1[1], this.Row2[1]).Length(),
-                    new Vector3(this.Row0[2], this.Row1[2], this.Row2[2]).Length()
+                    Column0.Length(),
+                    Column1.Length(),
+                    Column2.Length()
                 );
             }
+            set
+            {
+                value /= Scale; // Value becomes what's called "delta_scale" in core.
+                Column0 *= value.x;
+                Column1 *= value.y;
+                Column2 *= value.z;
+            }
         }
 
-        public Vector3 this[int columnIndex]
+        /// <summary>
+        /// Access whole columns in the form of Vector3.
+        /// </summary>
+        /// <param name="column">Which column vector.</param>
+        public Vector3 this[int column]
         {
             get
             {
-                switch (columnIndex)
+                switch (column)
                 {
                     case 0:
                         return Column0;
@@ -111,7 +171,7 @@ namespace Godot
             }
             set
             {
-                switch (columnIndex)
+                switch (column)
                 {
                     case 0:
                         Column0 = value;
@@ -128,61 +188,34 @@ namespace Godot
             }
         }
 
-        public real_t this[int columnIndex, int rowIndex]
+        /// <summary>
+        /// Access matrix elements in column-major order.
+        /// </summary>
+        /// <param name="column">Which column, the matrix horizontal position.</param>
+        /// <param name="row">Which row, the matrix vertical position.</param>
+        public real_t this[int column, int row]
         {
             get
             {
-                switch (columnIndex)
-                {
-                    case 0:
-                        return Column0[rowIndex];
-                    case 1:
-                        return Column1[rowIndex];
-                    case 2:
-                        return Column2[rowIndex];
-                    default:
-                        throw new IndexOutOfRangeException();
-                }
+                return this[column][row];
             }
             set
             {
-                switch (columnIndex)
-                {
-                    case 0:
-                    {
-                        var column0 = Column0;
-                        column0[rowIndex] = value;
-                        Column0 = column0;
-                        return;
-                    }
-                    case 1:
-                    {
-                        var column1 = Column1;
-                        column1[rowIndex] = value;
-                        Column1 = column1;
-                        return;
-                    }
-                    case 2:
-                    {
-                        var column2 = Column2;
-                        column2[rowIndex] = value;
-                        Column2 = column2;
-                        return;
-                    }
-                    default:
-                        throw new IndexOutOfRangeException();
-                }
+                Vector3 columnVector = this[column];
+                columnVector[row] = value;
+                this[column] = columnVector;
             }
         }
 
-        internal Quat RotationQuat()
+        public Quat RotationQuat()
         {
             Basis orthonormalizedBasis = Orthonormalized();
             real_t det = orthonormalizedBasis.Determinant();
             if (det < 0)
             {
-                // Ensure that the determinant is 1, such that result is a proper rotation matrix which can be represented by Euler angles.
-                orthonormalizedBasis = orthonormalizedBasis.Scaled(Vector3.NegOne);
+                // Ensure that the determinant is 1, such that result is a proper
+                // rotation matrix which can be represented by Euler angles.
+                orthonormalizedBasis = orthonormalizedBasis.Scaled(-Vector3.One);
             }
 
             return orthonormalizedBasis.Quat();
@@ -206,6 +239,15 @@ namespace Godot
             Row2 = new Vector3(0, 0, diagonal.z);
         }
 
+        /// <summary>
+        /// Returns the determinant of the basis matrix. If the basis is
+        /// uniformly scaled, its determinant is the square of the scale.
+        ///
+        /// A negative determinant means the basis has a negative scale.
+        /// A zero determinant means the basis isn't invertible,
+        /// and is usually considered invalid.
+        /// </summary>
+        /// <returns>The determinant of the basis matrix.</returns>
         public real_t Determinant()
         {
             real_t cofac00 = Row1[1] * Row2[2] - Row1[2] * Row2[1];
@@ -215,6 +257,16 @@ namespace Godot
             return Row0[0] * cofac00 + Row0[1] * cofac10 + Row0[2] * cofac20;
         }
 
+        /// <summary>
+        /// Returns the basis's rotation in the form of Euler angles
+        /// (in the YXZ convention: when *decomposing*, first Z, then X, and Y last).
+        /// The returned vector contains the rotation angles in
+        /// the format (X angle, Y angle, Z angle).
+        ///
+        /// Consider using the <see cref="Basis.Quat()"/> method instead, which
+        /// returns a <see cref="Godot.Quat"/> quaternion instead of Euler angles.
+        /// </summary>
+        /// <returns>A Vector3 representing the basis rotation in Euler angles.</returns>
         public Vector3 GetEuler()
         {
             Basis m = Orthonormalized();
@@ -247,6 +299,12 @@ namespace Godot
             return euler;
         }
 
+        /// <summary>
+        /// Get rows by index. Rows are not very useful for user code,
+        /// but are more efficient for some internal calculations.
+        /// </summary>
+        /// <param name="index">Which row.</param>
+        /// <returns>One of `Row0`, `Row1`, or `Row2`.</returns>
         public Vector3 GetRow(int index)
         {
             switch (index)
@@ -262,6 +320,12 @@ namespace Godot
             }
         }
 
+        /// <summary>
+        /// Sets rows by index. Rows are not very useful for user code,
+        /// but are more efficient for some internal calculations.
+        /// </summary>
+        /// <param name="index">Which row.</param>
+        /// <param name="value">The vector to set the row to.</param>
         public void SetRow(int index, Vector3 value)
         {
             switch (index)
@@ -280,22 +344,16 @@ namespace Godot
             }
         }
 
-        public Vector3 GetColumn(int index)
-        {
-            return this[index];
-        }
-
-        public void SetColumn(int index, Vector3 value)
-        {
-            this[index] = value;
-        }
-
-        [Obsolete("GetAxis is deprecated. Use GetColumn instead.")]
-        public Vector3 GetAxis(int axis)
-        {
-            return new Vector3(this.Row0[axis], this.Row1[axis], this.Row2[axis]);
-        }
-
+        /// <summary>
+        /// This function considers a discretization of rotations into
+        /// 24 points on unit sphere, lying along the vectors (x, y, z) with
+        /// each component being either -1, 0, or 1, and returns the index
+        /// of the point best representing the orientation of the object.
+        /// It is mainly used by the <see cref="GridMap"/> editor.
+        ///
+        /// For further details, refer to the Godot source code.
+        /// </summary>
+        /// <returns>The orthogonal index.</returns>
         public int GetOrthogonalIndex()
         {
             var orth = this;
@@ -309,11 +367,17 @@ namespace Godot
                     real_t v = row[j];
 
                     if (v > 0.5f)
+                    {
                         v = 1.0f;
+                    }
                     else if (v < -0.5f)
+                    {
                         v = -1.0f;
+                    }
                     else
+                    {
                         v = 0f;
+                    }
 
                     row[j] = v;
 
@@ -324,12 +388,18 @@ namespace Godot
             for (int i = 0; i < 24; i++)
             {
                 if (orth == _orthoBases[i])
+                {
                     return i;
+                }
             }
 
             return 0;
         }
 
+        /// <summary>
+        /// Returns the inverse of the matrix.
+        /// </summary>
+        /// <returns>The inverse matrix.</returns>
         public Basis Inverse()
         {
             real_t cofac00 = Row1[1] * Row2[2] - Row1[2] * Row2[1];
@@ -339,7 +409,9 @@ namespace Godot
             real_t det = Row0[0] * cofac00 + Row0[1] * cofac10 + Row0[2] * cofac20;
 
             if (det == 0)
+            {
                 throw new InvalidOperationException("Matrix determinant is zero and cannot be inverted.");
+            }
 
             real_t detInv = 1.0f / det;
 
@@ -358,11 +430,17 @@ namespace Godot
             );
         }
 
+        /// <summary>
+        /// Returns the orthonormalized version of the basis matrix (useful to
+        /// call occasionally to avoid rounding errors for orthogonal matrices).
+        /// This performs a Gram-Schmidt orthonormalization on the basis of the matrix.
+        /// </summary>
+        /// <returns>An orthonormalized basis matrix.</returns>
         public Basis Orthonormalized()
         {
-            Vector3 column0 = GetColumn(0);
-            Vector3 column1 = GetColumn(1);
-            Vector3 column2 = GetColumn(2);
+            Vector3 column0 = this[0];
+            Vector3 column1 = this[1];
+            Vector3 column2 = this[2];
 
             column0.Normalize();
             column1 = column1 - column0 * column0.Dot(column1);
@@ -373,48 +451,86 @@ namespace Godot
             return new Basis(column0, column1, column2);
         }
 
+        /// <summary>
+        /// Introduce an additional rotation around the given `axis`
+        /// by `phi` (in radians). The axis must be a normalized vector.
+        /// </summary>
+        /// <param name="axis">The axis to rotate around. Must be normalized.</param>
+        /// <param name="phi">The angle to rotate, in radians.</param>
+        /// <returns>The rotated basis matrix.</returns>
         public Basis Rotated(Vector3 axis, real_t phi)
         {
             return new Basis(axis, phi) * this;
         }
 
+        /// <summary>
+        /// Introduce an additional scaling specified by the given 3D scaling factor.
+        /// </summary>
+        /// <param name="scale">The scale to introduce.</param>
+        /// <returns>The scaled basis matrix.</returns>
         public Basis Scaled(Vector3 scale)
         {
-            var b = this;
+            Basis b = this;
             b.Row0 *= scale.x;
             b.Row1 *= scale.y;
             b.Row2 *= scale.z;
             return b;
         }
 
-        public Basis Slerp(Basis target, real_t t)
+        /// <summary>
+        /// Assuming that the matrix is a proper rotation matrix, slerp performs
+        /// a spherical-linear interpolation with another rotation matrix.
+        /// </summary>
+        /// <param name="target">The destination basis for interpolation.</param>
+        /// <param name="weight">A value on the range of 0.0 to 1.0, representing the amount of interpolation.</param>
+        /// <returns>The resulting basis matrix of the interpolation.</returns>
+        public Basis Slerp(Basis target, real_t weight)
         {
-            var from = new Quat(this);
-            var to = new Quat(target);
+            Quat from = new Quat(this);
+            Quat to = new Quat(target);
 
-            var b = new Basis(from.Slerp(to, t));
-            b.Row0 *= Mathf.Lerp(Row0.Length(), target.Row0.Length(), t);
-            b.Row1 *= Mathf.Lerp(Row1.Length(), target.Row1.Length(), t);
-            b.Row2 *= Mathf.Lerp(Row2.Length(), target.Row2.Length(), t);
+            Basis b = new Basis(from.Slerp(to, weight));
+            b.Row0 *= Mathf.Lerp(Row0.Length(), target.Row0.Length(), weight);
+            b.Row1 *= Mathf.Lerp(Row1.Length(), target.Row1.Length(), weight);
+            b.Row2 *= Mathf.Lerp(Row2.Length(), target.Row2.Length(), weight);
 
             return b;
         }
 
+        /// <summary>
+        /// Transposed dot product with the X axis of the matrix.
+        /// </summary>
+        /// <param name="with">A vector to calculate the dot product with.</param>
+        /// <returns>The resulting dot product.</returns>
         public real_t Tdotx(Vector3 with)
         {
             return this.Row0[0] * with[0] + this.Row1[0] * with[1] + this.Row2[0] * with[2];
         }
 
+        /// <summary>
+        /// Transposed dot product with the Y axis of the matrix.
+        /// </summary>
+        /// <param name="with">A vector to calculate the dot product with.</param>
+        /// <returns>The resulting dot product.</returns>
         public real_t Tdoty(Vector3 with)
         {
             return this.Row0[1] * with[0] + this.Row1[1] * with[1] + this.Row2[1] * with[2];
         }
 
+        /// <summary>
+        /// Transposed dot product with the Z axis of the matrix.
+        /// </summary>
+        /// <param name="with">A vector to calculate the dot product with.</param>
+        /// <returns>The resulting dot product.</returns>
         public real_t Tdotz(Vector3 with)
         {
             return this.Row0[2] * with[0] + this.Row1[2] * with[1] + this.Row2[2] * with[2];
         }
 
+        /// <summary>
+        /// Returns the transposed version of the basis matrix.
+        /// </summary>
+        /// <returns>The transposed basis matrix.</returns>
         public Basis Transposed()
         {
             var tr = this;
@@ -434,6 +550,11 @@ namespace Godot
             return tr;
         }
 
+        /// <summary>
+        /// Returns a vector transformed (multiplied) by the basis matrix.
+        /// </summary>
+        /// <param name="v">A vector to transform.</param>
+        /// <returns>The transformed vector.</returns>
         public Vector3 Xform(Vector3 v)
         {
             return new Vector3
@@ -444,6 +565,14 @@ namespace Godot
             );
         }
 
+        /// <summary>
+        /// Returns a vector transformed (multiplied) by the transposed basis matrix.
+        ///
+        /// Note: This results in a multiplication by the inverse of the
+        /// basis matrix only if it represents a rotation-reflection.
+        /// </summary>
+        /// <param name="v">A vector to inversely transform.</param>
+        /// <returns>The inversely transformed vector.</returns>
         public Vector3 XformInv(Vector3 v)
         {
             return new Vector3
@@ -454,6 +583,12 @@ namespace Godot
             );
         }
 
+        /// <summary>
+        /// Returns the basis's rotation in the form of a quaternion.
+        /// See <see cref="GetEuler()"/> if you need Euler angles, but keep in
+        /// mind that quaternions should generally be preferred to Euler angles.
+        /// </summary>
+        /// <returns>A <see cref="Godot.Quat"/> representing the basis's rotation.</returns>
         public Quat Quat()
         {
             real_t trace = Row0[0] + Row1[1] + Row2[2];
@@ -538,11 +673,33 @@ namespace Godot
         private static readonly Basis _flipY = new Basis(1, 0, 0, 0, -1, 0, 0, 0, 1);
         private static readonly Basis _flipZ = new Basis(1, 0, 0, 0, 1, 0, 0, 0, -1);
 
+        /// <summary>
+        /// The identity basis, with no rotation or scaling applied.
+        /// This is used as a replacement for `Basis()` in GDScript.
+        /// Do not use `new Basis()` with no arguments in C#, because it sets all values to zero.
+        /// </summary>
+        /// <value>Equivalent to `new Basis(Vector3.Right, Vector3.Up, Vector3.Back)`.</value>
         public static Basis Identity { get { return _identity; } }
+        /// <summary>
+        /// The basis that will flip something along the X axis when used in a transformation.
+        /// </summary>
+        /// <value>Equivalent to `new Basis(Vector3.Left, Vector3.Up, Vector3.Back)`.</value>
         public static Basis FlipX { get { return _flipX; } }
+        /// <summary>
+        /// The basis that will flip something along the Y axis when used in a transformation.
+        /// </summary>
+        /// <value>Equivalent to `new Basis(Vector3.Right, Vector3.Down, Vector3.Back)`.</value>
         public static Basis FlipY { get { return _flipY; } }
+        /// <summary>
+        /// The basis that will flip something along the Z axis when used in a transformation.
+        /// </summary>
+        /// <value>Equivalent to `new Basis(Vector3.Right, Vector3.Up, Vector3.Forward)`.</value>
         public static Basis FlipZ { get { return _flipZ; } }
 
+        /// <summary>
+        /// Constructs a pure rotation basis matrix from the given quaternion.
+        /// </summary>
+        /// <param name="quat">The quaternion to create the basis from.</param>
         public Basis(Quat quat)
         {
             real_t s = 2.0f / quat.LengthSquared;
@@ -565,26 +722,41 @@ namespace Godot
             Row2 = new Vector3(xz - wy, yz + wx, 1.0f - (xx + yy));
         }
 
-        public Basis(Vector3 euler)
+        /// <summary>
+        /// Constructs a pure rotation basis matrix from the given Euler angles
+        /// (in the YXZ convention: when *composing*, first Y, then X, and Z last),
+        /// given in the vector format as (X angle, Y angle, Z angle).
+        ///
+        /// Consider using the <see cref="Basis(Quat)"/> constructor instead, which
+        /// uses a <see cref="Godot.Quat"/> quaternion instead of Euler angles.
+        /// </summary>
+        /// <param name="eulerYXZ">The Euler angles to create the basis from.</param>
+        public Basis(Vector3 eulerYXZ)
         {
             real_t c;
             real_t s;
 
-            c = Mathf.Cos(euler.x);
-            s = Mathf.Sin(euler.x);
+            c = Mathf.Cos(eulerYXZ.x);
+            s = Mathf.Sin(eulerYXZ.x);
             var xmat = new Basis(1, 0, 0, 0, c, -s, 0, s, c);
 
-            c = Mathf.Cos(euler.y);
-            s = Mathf.Sin(euler.y);
+            c = Mathf.Cos(eulerYXZ.y);
+            s = Mathf.Sin(eulerYXZ.y);
             var ymat = new Basis(c, 0, s, 0, 1, 0, -s, 0, c);
 
-            c = Mathf.Cos(euler.z);
-            s = Mathf.Sin(euler.z);
+            c = Mathf.Cos(eulerYXZ.z);
+            s = Mathf.Sin(eulerYXZ.z);
             var zmat = new Basis(c, -s, 0, s, c, 0, 0, 0, 1);
 
             this = ymat * xmat * zmat;
         }
 
+        /// <summary>
+        /// Constructs a pure rotation basis matrix, rotated around the given `axis`
+        /// by `phi` (in radians). The axis must be a normalized vector.
+        /// </summary>
+        /// <param name="axis">The axis to rotate around. Must be normalized.</param>
+        /// <param name="phi">The angle to rotate, in radians.</param>
         public Basis(Vector3 axis, real_t phi)
         {
             Vector3 axisSq = new Vector3(axis.x * axis.x, axis.y * axis.y, axis.z * axis.z);
@@ -612,6 +784,12 @@ namespace Godot
             Row2.y = xyzt + zyxs;
         }
 
+        /// <summary>
+        /// Constructs a basis matrix from 3 axis vectors (matrix columns).
+        /// </summary>
+        /// <param name="column0">The X vector, or Column0.</param>
+        /// <param name="column1">The Y vector, or Column1.</param>
+        /// <param name="column2">The Z vector, or Column2.</param>
         public Basis(Vector3 column0, Vector3 column1, Vector3 column2)
         {
             Row0 = new Vector3(column0.x, column1.x, column2.x);
@@ -667,6 +845,12 @@ namespace Godot
             return Row0.Equals(other.Row0) && Row1.Equals(other.Row1) && Row2.Equals(other.Row2);
         }
 
+        /// <summary>
+        /// Returns true if this basis and `other` are approximately equal, by running
+        /// <see cref="Vector3.IsEqualApprox(Vector3)"/> on each component.
+        /// </summary>
+        /// <param name="other">The other basis to compare.</param>
+        /// <returns>Whether or not the matrices are approximately equal.</returns>
         public bool IsEqualApprox(Basis other)
         {
             return Row0.IsEqualApprox(other.Row0) && Row1.IsEqualApprox(other.Row1) && Row2.IsEqualApprox(other.Row2);
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Callable.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Callable.cs
new file mode 100644
index 0000000000..c85cc1884c
--- /dev/null
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Callable.cs
@@ -0,0 +1,31 @@
+using System;
+
+namespace Godot
+{
+    public struct Callable
+    {
+        private readonly Object _target;
+        private readonly StringName _method;
+        private readonly Delegate _delegate;
+
+        public Object Target => _target;
+        public StringName Method => _method;
+        public Delegate Delegate => _delegate;
+
+        public static implicit operator Callable(Delegate @delegate) => new Callable(@delegate);
+
+        public Callable(Object target, StringName method)
+        {
+            _target = target;
+            _method = method;
+            _delegate = null;
+        }
+
+        public Callable(Delegate @delegate)
+        {
+            _target = null;
+            _method = null;
+            _delegate = @delegate;
+        }
+    }
+}
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Color.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Color.cs
index 0462ef1125..3700a6194f 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Color.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Color.cs
@@ -3,15 +3,44 @@ using System.Runtime.InteropServices;
 
 namespace Godot
 {
+    /// <summary>
+    /// A color represented by red, green, blue, and alpha (RGBA) components.
+    /// The alpha component is often used for transparency.
+    /// Values are in floating-point and usually range from 0 to 1.
+    /// Some properties (such as CanvasItem.modulate) may accept values
+    /// greater than 1 (overbright or HDR colors).
+    ///
+    /// If you want to supply values in a range of 0 to 255, you should use
+    /// <see cref="Color8"/> and the `r8`/`g8`/`b8`/`a8` properties.
+    /// </summary>
     [Serializable]
     [StructLayout(LayoutKind.Sequential)]
     public struct Color : IEquatable<Color>
     {
+        /// <summary>
+        /// The color's red component, typically on the range of 0 to 1.
+        /// </summary>
         public float r;
+
+        /// <summary>
+        /// The color's green component, typically on the range of 0 to 1.
+        /// </summary>
         public float g;
+
+        /// <summary>
+        /// The color's blue component, typically on the range of 0 to 1.
+        /// </summary>
         public float b;
+
+        /// <summary>
+        /// The color's alpha (transparency) component, typically on the range of 0 to 1.
+        /// </summary>
         public float a;
 
+        /// <summary>
+        /// Wrapper for <see cref="r"/> that uses the range 0 to 255 instead of 0 to 1.
+        /// </summary>
+        /// <value>Getting is equivalent to multiplying by 255 and rounding. Setting is equivalent to dividing by 255.</value>
         public int r8
         {
             get
@@ -24,6 +53,10 @@ namespace Godot
             }
         }
 
+        /// <summary>
+        /// Wrapper for <see cref="g"/> that uses the range 0 to 255 instead of 0 to 1.
+        /// </summary>
+        /// <value>Getting is equivalent to multiplying by 255 and rounding. Setting is equivalent to dividing by 255.</value>
         public int g8
         {
             get
@@ -36,6 +69,10 @@ namespace Godot
             }
         }
 
+        /// <summary>
+        /// Wrapper for <see cref="b"/> that uses the range 0 to 255 instead of 0 to 1.
+        /// </summary>
+        /// <value>Getting is equivalent to multiplying by 255 and rounding. Setting is equivalent to dividing by 255.</value>
         public int b8
         {
             get
@@ -48,6 +85,10 @@ namespace Godot
             }
         }
 
+        /// <summary>
+        /// Wrapper for <see cref="a"/> that uses the range 0 to 255 instead of 0 to 1.
+        /// </summary>
+        /// <value>Getting is equivalent to multiplying by 255 and rounding. Setting is equivalent to dividing by 255.</value>
         public int a8
         {
             get
@@ -60,6 +101,10 @@ namespace Godot
             }
         }
 
+        /// <summary>
+        /// The HSV hue of this color, on the range 0 to 1.
+        /// </summary>
+        /// <value>Getting is a long process, refer to the source code for details. Setting uses <see cref="FromHsv"/>.</value>
         public float h
         {
             get
@@ -70,21 +115,31 @@ namespace Godot
                 float delta = max - min;
 
                 if (delta == 0)
+                {
                     return 0;
+                }
 
                 float h;
 
                 if (r == max)
+                {
                     h = (g - b) / delta; // Between yellow & magenta
+                }
                 else if (g == max)
+                {
                     h = 2 + (b - r) / delta; // Between cyan & yellow
+                }
                 else
+                {
                     h = 4 + (r - g) / delta; // Between magenta & cyan
+                }
 
                 h /= 6.0f;
 
                 if (h < 0)
+                {
                     h += 1.0f;
+                }
 
                 return h;
             }
@@ -94,6 +149,10 @@ namespace Godot
             }
         }
 
+        /// <summary>
+        /// The HSV saturation of this color, on the range 0 to 1.
+        /// </summary>
+        /// <value>Getting is equivalent to the ratio between the min and max RGB value. Setting uses <see cref="FromHsv"/>.</value>
         public float s
         {
             get
@@ -103,7 +162,7 @@ namespace Godot
 
                 float delta = max - min;
 
-                return max != 0 ? delta / max : 0;
+                return max == 0 ? 0 : delta / max;
             }
             set
             {
@@ -111,6 +170,10 @@ namespace Godot
             }
         }
 
+        /// <summary>
+        /// The HSV value (brightness) of this color, on the range 0 to 1.
+        /// </summary>
+        /// <value>Getting is equivalent to using `Max()` on the RGB components. Setting uses <see cref="FromHsv"/>.</value>
         public float v
         {
             get
@@ -123,25 +186,10 @@ namespace Godot
             }
         }
 
-        public static Color ColorN(string name, float alpha = 1f)
-        {
-            name = name.Replace(" ", String.Empty);
-            name = name.Replace("-", String.Empty);
-            name = name.Replace("_", String.Empty);
-            name = name.Replace("'", String.Empty);
-            name = name.Replace(".", String.Empty);
-            name = name.ToLower();
-
-            if (!Colors.namedColors.ContainsKey(name))
-            {
-                throw new ArgumentOutOfRangeException($"Invalid Color Name: {name}");
-            }
-
-            Color color = Colors.namedColors[name];
-            color.a = alpha;
-            return color;
-        }
-
+        /// <summary>
+        /// Access color components using their index.
+        /// </summary>
+        /// <value>`[0]` is equivalent to `.r`, `[1]` is equivalent to `.g`, `[2]` is equivalent to `.b`, `[3]` is equivalent to `.a`.</value>
         public float this[int index]
         {
             get
@@ -182,73 +230,13 @@ namespace Godot
             }
         }
 
-        public void ToHsv(out float hue, out float saturation, out float value)
-        {
-            float max = (float)Mathf.Max(r, Mathf.Max(g, b));
-            float min = (float)Mathf.Min(r, Mathf.Min(g, b));
-
-            float delta = max - min;
-
-            if (delta == 0)
-            {
-                hue = 0;
-            }
-            else
-            {
-                if (r == max)
-                    hue = (g - b) / delta; // Between yellow & magenta
-                else if (g == max)
-                    hue = 2 + (b - r) / delta; // Between cyan & yellow
-                else
-                    hue = 4 + (r - g) / delta; // Between magenta & cyan
-
-                hue /= 6.0f;
-
-                if (hue < 0)
-                    hue += 1.0f;
-            }
-
-            saturation = max == 0 ? 0 : 1f - 1f * min / max;
-            value = max;
-        }
-
-        public static Color FromHsv(float hue, float saturation, float value, float alpha = 1.0f)
-        {
-            if (saturation == 0)
-            {
-                // acp_hromatic (grey)
-                return new Color(value, value, value, alpha);
-            }
-
-            int i;
-            float f, p, q, t;
-
-            hue *= 6.0f;
-            hue %= 6f;
-            i = (int)hue;
-
-            f = hue - i;
-            p = value * (1 - saturation);
-            q = value * (1 - saturation * f);
-            t = value * (1 - saturation * (1 - f));
-
-            switch (i)
-            {
-                case 0: // Red is the dominant color
-                    return new Color(value, t, p, alpha);
-                case 1: // Green is the dominant color
-                    return new Color(q, value, p, alpha);
-                case 2:
-                    return new Color(p, value, t, alpha);
-                case 3: // Blue is the dominant color
-                    return new Color(p, q, value, alpha);
-                case 4:
-                    return new Color(t, p, value, alpha);
-                default: // (5) Red is the dominant color
-                    return new Color(value, p, q, alpha);
-            }
-        }
-
+        /// <summary>
+        /// Returns a new color resulting from blending this color over another.
+        /// If the color is opaque, the result is also opaque.
+        /// The second color may have a range of alpha values.
+        /// </summary>
+        /// <param name="over">The color to blend over.</param>
+        /// <returns>This color blended over `over`.</returns>
         public Color Blend(Color over)
         {
             Color res;
@@ -268,6 +256,10 @@ namespace Godot
             return res;
         }
 
+        /// <summary>
+        /// Returns the most contrasting color.
+        /// </summary>
+        /// <returns>The most contrasting color</returns>
         public Color Contrasted()
         {
             return new Color(
@@ -278,6 +270,12 @@ namespace Godot
             );
         }
 
+        /// <summary>
+        /// Returns a new color resulting from making this color darker
+        /// by the specified ratio (on the range of 0 to 1).
+        /// </summary>
+        /// <param name="amount">The ratio to darken by.</param>
+        /// <returns>The darkened color.</returns>
         public Color Darkened(float amount)
         {
             Color res = this;
@@ -287,6 +285,10 @@ namespace Godot
             return res;
         }
 
+        /// <summary>
+        /// Returns the inverted color: `(1 - r, 1 - g, 1 - b, a)`.
+        /// </summary>
+        /// <returns>The inverted color.</returns>
         public Color Inverted()
         {
             return new Color(
@@ -297,6 +299,12 @@ namespace Godot
             );
         }
 
+        /// <summary>
+        /// Returns a new color resulting from making this color lighter
+        /// by the specified ratio (on the range of 0 to 1).
+        /// </summary>
+        /// <param name="amount">The ratio to lighten by.</param>
+        /// <returns>The darkened color.</returns>
         public Color Lightened(float amount)
         {
             Color res = this;
@@ -306,21 +314,51 @@ namespace Godot
             return res;
         }
 
-        public Color LinearInterpolate(Color c, float t)
-        {
-            var res = this;
-
-            res.r += t * (c.r - r);
-            res.g += t * (c.g - g);
-            res.b += t * (c.b - b);
-            res.a += t * (c.a - a);
+        /// <summary>
+        /// Returns the result of the linear interpolation between
+        /// this color and `to` by amount `weight`.
+        /// </summary>
+        /// <param name="to">The destination color for interpolation.</param>
+        /// <param name="weight">A value on the range of 0.0 to 1.0, representing the amount of interpolation.</param>
+        /// <returns>The resulting color of the interpolation.</returns>
+        public Color Lerp(Color to, float weight)
+        {
+            return new Color
+            (
+                Mathf.Lerp(r, to.r, weight),
+                Mathf.Lerp(g, to.g, weight),
+                Mathf.Lerp(b, to.b, weight),
+                Mathf.Lerp(a, to.a, weight)
+            );
+        }
 
-            return res;
+        /// <summary>
+        /// Returns the result of the linear interpolation between
+        /// this color and `to` by color amount `weight`.
+        /// </summary>
+        /// <param name="to">The destination color for interpolation.</param>
+        /// <param name="weight">A color with components on the range of 0.0 to 1.0, representing the amount of interpolation.</param>
+        /// <returns>The resulting color of the interpolation.</returns>
+        public Color Lerp(Color to, Color weight)
+        {
+            return new Color
+            (
+                Mathf.Lerp(r, to.r, weight.r),
+                Mathf.Lerp(g, to.g, weight.g),
+                Mathf.Lerp(b, to.b, weight.b),
+                Mathf.Lerp(a, to.a, weight.a)
+            );
         }
 
-        public int ToAbgr32()
+        /// <summary>
+        /// Returns the color's 32-bit integer in ABGR format
+        /// (each byte represents a component of the ABGR profile).
+        /// ABGR is the reversed version of the default format.
+        /// </summary>
+        /// <returns>A uint representing this color in ABGR32 format.</returns>
+        public uint ToAbgr32()
         {
-            int c = (byte)Math.Round(a * 255);
+            uint c = (byte)Math.Round(a * 255);
             c <<= 8;
             c |= (byte)Math.Round(b * 255);
             c <<= 8;
@@ -331,9 +369,15 @@ namespace Godot
             return c;
         }
 
-        public long ToAbgr64()
+        /// <summary>
+        /// Returns the color's 64-bit integer in ABGR format
+        /// (each word represents a component of the ABGR profile).
+        /// ABGR is the reversed version of the default format.
+        /// </summary>
+        /// <returns>A ulong representing this color in ABGR64 format.</returns>
+        public ulong ToAbgr64()
         {
-            long c = (ushort)Math.Round(a * 65535);
+            ulong c = (ushort)Math.Round(a * 65535);
             c <<= 16;
             c |= (ushort)Math.Round(b * 65535);
             c <<= 16;
@@ -344,9 +388,15 @@ namespace Godot
             return c;
         }
 
-        public int ToArgb32()
+        /// <summary>
+        /// Returns the color's 32-bit integer in ARGB format
+        /// (each byte represents a component of the ARGB profile).
+        /// ARGB is more compatible with DirectX, but not used much in Godot.
+        /// </summary>
+        /// <returns>A uint representing this color in ARGB32 format.</returns>
+        public uint ToArgb32()
         {
-            int c = (byte)Math.Round(a * 255);
+            uint c = (byte)Math.Round(a * 255);
             c <<= 8;
             c |= (byte)Math.Round(r * 255);
             c <<= 8;
@@ -357,9 +407,15 @@ namespace Godot
             return c;
         }
 
-        public long ToArgb64()
+        /// <summary>
+        /// Returns the color's 64-bit integer in ARGB format
+        /// (each word represents a component of the ARGB profile).
+        /// ARGB is more compatible with DirectX, but not used much in Godot.
+        /// </summary>
+        /// <returns>A ulong representing this color in ARGB64 format.</returns>
+        public ulong ToArgb64()
         {
-            long c = (ushort)Math.Round(a * 65535);
+            ulong c = (ushort)Math.Round(a * 65535);
             c <<= 16;
             c |= (ushort)Math.Round(r * 65535);
             c <<= 16;
@@ -370,9 +426,15 @@ namespace Godot
             return c;
         }
 
-        public int ToRgba32()
+        /// <summary>
+        /// Returns the color's 32-bit integer in RGBA format
+        /// (each byte represents a component of the RGBA profile).
+        /// RGBA is Godot's default and recommended format.
+        /// </summary>
+        /// <returns>A uint representing this color in RGBA32 format.</returns>
+        public uint ToRgba32()
         {
-            int c = (byte)Math.Round(r * 255);
+            uint c = (byte)Math.Round(r * 255);
             c <<= 8;
             c |= (byte)Math.Round(g * 255);
             c <<= 8;
@@ -383,9 +445,15 @@ namespace Godot
             return c;
         }
 
-        public long ToRgba64()
+        /// <summary>
+        /// Returns the color's 64-bit integer in RGBA format
+        /// (each word represents a component of the RGBA profile).
+        /// RGBA is Godot's default and recommended format.
+        /// </summary>
+        /// <returns>A ulong representing this color in RGBA64 format.</returns>
+        public ulong ToRgba64()
         {
-            long c = (ushort)Math.Round(r * 65535);
+            ulong c = (ushort)Math.Round(r * 65535);
             c <<= 16;
             c |= (ushort)Math.Round(g * 65535);
             c <<= 16;
@@ -396,6 +464,11 @@ namespace Godot
             return c;
         }
 
+        /// <summary>
+        /// Returns the color's HTML hexadecimal color string in RGBA format.
+        /// </summary>
+        /// <param name="includeAlpha">Whether or not to include alpha. If false, the color is RGB instead of RGBA.</param>
+        /// <returns>A string for the HTML hexadecimal representation of this color.</returns>
         public string ToHtml(bool includeAlpha = true)
         {
             var txt = string.Empty;
@@ -405,12 +478,20 @@ namespace Godot
             txt += ToHex32(b);
 
             if (includeAlpha)
-                txt = ToHex32(a) + txt;
+            {
+                txt += ToHex32(a);
+            }
 
             return txt;
         }
 
-        // Constructors 
+        /// <summary>
+        /// Constructs a color from RGBA values on the range of 0 to 1.
+        /// </summary>
+        /// <param name="r">The color's red component, typically on the range of 0 to 1.</param>
+        /// <param name="g">The color's green component, typically on the range of 0 to 1.</param>
+        /// <param name="b">The color's blue component, typically on the range of 0 to 1.</param>
+        /// <param name="a">The color's alpha (transparency) value, typically on the range of 0 to 1. Default: 1.</param>
         public Color(float r, float g, float b, float a = 1.0f)
         {
             this.r = r;
@@ -419,7 +500,25 @@ namespace Godot
             this.a = a;
         }
 
-        public Color(int rgba)
+        /// <summary>
+        /// Constructs a color from an existing color and an alpha value.
+        /// </summary>
+        /// <param name="c">The color to construct from. Only its RGB values are used.</param>
+        /// <param name="a">The color's alpha (transparency) value, typically on the range of 0 to 1. Default: 1.</param>
+        public Color(Color c, float a = 1.0f)
+        {
+            r = c.r;
+            g = c.g;
+            b = c.b;
+            this.a = a;
+        }
+
+        /// <summary>
+        /// Constructs a color from a 32-bit integer
+        /// (each byte represents a component of the RGBA profile).
+        /// </summary>
+        /// <param name="rgba">The uint representing the color.</param>
+        public Color(uint rgba)
         {
             a = (rgba & 0xFF) / 255.0f;
             rgba >>= 8;
@@ -430,7 +529,12 @@ namespace Godot
             r = (rgba & 0xFF) / 255.0f;
         }
 
-        public Color(long rgba)
+        /// <summary>
+        /// Constructs a color from a 64-bit integer
+        /// (each word represents a component of the RGBA profile).
+        /// </summary>
+        /// <param name="rgba">The ulong representing the color.</param>
+        public Color(ulong rgba)
         {
             a = (rgba & 0xFFFF) / 65535.0f;
             rgba >>= 16;
@@ -441,41 +545,250 @@ namespace Godot
             r = (rgba & 0xFFFF) / 65535.0f;
         }
 
-        private static int ParseCol8(string str, int ofs)
+        /// <summary>
+        /// Constructs a color from the HTML hexadecimal color string in RGBA format.
+        /// </summary>
+        /// <param name="rgba">A string for the HTML hexadecimal representation of this color.</param>
+        public Color(string rgba)
         {
-            int ig = 0;
+            if (rgba.Length == 0)
+            {
+                r = 0f;
+                g = 0f;
+                b = 0f;
+                a = 1.0f;
+                return;
+            }
 
-            for (int i = 0; i < 2; i++)
+            if (rgba[0] == '#')
+            {
+                rgba = rgba.Substring(1);
+            }
+
+            // If enabled, use 1 hex digit per channel instead of 2.
+            // Other sizes aren't in the HTML/CSS spec but we could add them if desired.
+            bool isShorthand = rgba.Length < 5;
+            bool alpha;
+
+            if (rgba.Length == 8)
+            {
+                alpha = true;
+            }
+            else if (rgba.Length == 6)
+            {
+                alpha = false;
+            }
+            else if (rgba.Length == 4)
+            {
+                alpha = true;
+            }
+            else if (rgba.Length == 3)
+            {
+                alpha = false;
+            }
+            else
             {
-                int c = str[i + ofs];
-                int v;
+                throw new ArgumentOutOfRangeException("Invalid color code. Length is " + rgba.Length + " but a length of 6 or 8 is expected: " + rgba);
+            }
 
-                if (c >= '0' && c <= '9')
+            a = 1.0f;
+            if (isShorthand)
+            {
+                r = ParseCol4(rgba, 0) / 15f;
+                g = ParseCol4(rgba, 1) / 15f;
+                b = ParseCol4(rgba, 2) / 15f;
+                if (alpha)
                 {
-                    v = c - '0';
+                    a = ParseCol4(rgba, 3) / 15f;
                 }
-                else if (c >= 'a' && c <= 'f')
+            }
+            else
+            {
+                r = ParseCol8(rgba, 0) / 255f;
+                g = ParseCol8(rgba, 2) / 255f;
+                b = ParseCol8(rgba, 4) / 255f;
+                if (alpha)
                 {
-                    v = c - 'a';
-                    v += 10;
+                    a = ParseCol8(rgba, 6) / 255f;
                 }
-                else if (c >= 'A' && c <= 'F')
+            }
+
+            if (r < 0)
+            {
+                throw new ArgumentOutOfRangeException("Invalid color code. Red part is not valid hexadecimal: " + rgba);
+            }
+
+            if (g < 0)
+            {
+                throw new ArgumentOutOfRangeException("Invalid color code. Green part is not valid hexadecimal: " + rgba);
+            }
+
+            if (b < 0)
+            {
+                throw new ArgumentOutOfRangeException("Invalid color code. Blue part is not valid hexadecimal: " + rgba);
+            }
+
+            if (a < 0)
+            {
+                throw new ArgumentOutOfRangeException("Invalid color code. Alpha part is not valid hexadecimal: " + rgba);
+            }
+        }
+
+        /// <summary>
+        /// Returns a color constructed from integer red, green, blue, and alpha channels.
+        /// Each channel should have 8 bits of information ranging from 0 to 255.
+        /// </summary>
+        /// <param name="r8">The red component represented on the range of 0 to 255.</param>
+        /// <param name="g8">The green component represented on the range of 0 to 255.</param>
+        /// <param name="b8">The blue component represented on the range of 0 to 255.</param>
+        /// <param name="a8">The alpha (transparency) component represented on the range of 0 to 255.</param>
+        /// <returns>The constructed color.</returns>
+        public static Color Color8(byte r8, byte g8, byte b8, byte a8 = 255)
+        {
+            return new Color(r8 / 255f, g8 / 255f, b8 / 255f, a8 / 255f);
+        }
+
+        /// <summary>
+        /// Returns a color according to the standardized name, with the
+        /// specified alpha value. Supported color names are the same as
+        /// the constants defined in <see cref="Colors"/>.
+        /// </summary>
+        /// <param name="name">The name of the color.</param>
+        /// <param name="alpha">The alpha (transparency) component represented on the range of 0 to 1. Default: 1.</param>
+        /// <returns>The constructed color.</returns>
+        public static Color ColorN(string name, float alpha = 1f)
+        {
+            name = name.Replace(" ", String.Empty);
+            name = name.Replace("-", String.Empty);
+            name = name.Replace("_", String.Empty);
+            name = name.Replace("'", String.Empty);
+            name = name.Replace(".", String.Empty);
+            name = name.ToLower();
+
+            if (!Colors.namedColors.ContainsKey(name))
+            {
+                throw new ArgumentOutOfRangeException($"Invalid Color Name: {name}");
+            }
+
+            Color color = Colors.namedColors[name];
+            color.a = alpha;
+            return color;
+        }
+
+        /// <summary>
+        /// Constructs a color from an HSV profile, with values on the
+        /// range of 0 to 1. This is equivalent to using each of
+        /// the `h`/`s`/`v` properties, but much more efficient.
+        /// </summary>
+        /// <param name="hue">The HSV hue, typically on the range of 0 to 1.</param>
+        /// <param name="saturation">The HSV saturation, typically on the range of 0 to 1.</param>
+        /// <param name="value">The HSV value (brightness), typically on the range of 0 to 1.</param>
+        /// <param name="alpha">The alpha (transparency) value, typically on the range of 0 to 1.</param>
+        /// <returns>The constructed color.</returns>
+        public static Color FromHsv(float hue, float saturation, float value, float alpha = 1.0f)
+        {
+            if (saturation == 0)
+            {
+                // acp_hromatic (grey)
+                return new Color(value, value, value, alpha);
+            }
+
+            int i;
+            float f, p, q, t;
+
+            hue *= 6.0f;
+            hue %= 6f;
+            i = (int)hue;
+
+            f = hue - i;
+            p = value * (1 - saturation);
+            q = value * (1 - saturation * f);
+            t = value * (1 - saturation * (1 - f));
+
+            switch (i)
+            {
+                case 0: // Red is the dominant color
+                    return new Color(value, t, p, alpha);
+                case 1: // Green is the dominant color
+                    return new Color(q, value, p, alpha);
+                case 2:
+                    return new Color(p, value, t, alpha);
+                case 3: // Blue is the dominant color
+                    return new Color(p, q, value, alpha);
+                case 4:
+                    return new Color(t, p, value, alpha);
+                default: // (5) Red is the dominant color
+                    return new Color(value, p, q, alpha);
+            }
+        }
+
+        /// <summary>
+        /// Converts a color to HSV values. This is equivalent to using each of
+        /// the `h`/`s`/`v` properties, but much more efficient.
+        /// </summary>
+        /// <param name="hue">Output parameter for the HSV hue.</param>
+        /// <param name="saturation">Output parameter for the HSV saturation.</param>
+        /// <param name="value">Output parameter for the HSV value.</param>
+        public void ToHsv(out float hue, out float saturation, out float value)
+        {
+            float max = (float)Mathf.Max(r, Mathf.Max(g, b));
+            float min = (float)Mathf.Min(r, Mathf.Min(g, b));
+
+            float delta = max - min;
+
+            if (delta == 0)
+            {
+                hue = 0;
+            }
+            else
+            {
+                if (r == max)
                 {
-                    v = c - 'A';
-                    v += 10;
+                    hue = (g - b) / delta; // Between yellow & magenta
+                }
+                else if (g == max)
+                {
+                    hue = 2 + (b - r) / delta; // Between cyan & yellow
                 }
                 else
                 {
-                    return -1;
+                    hue = 4 + (r - g) / delta; // Between magenta & cyan
                 }
 
-                if (i == 0)
-                    ig += v * 16;
-                else
-                    ig += v;
+                hue /= 6.0f;
+
+                if (hue < 0)
+                {
+                    hue += 1.0f;
+                }
+            }
+
+            saturation = max == 0 ? 0 : 1f - 1f * min / max;
+            value = max;
+        }
+
+        private static int ParseCol4(string str, int ofs)
+        {
+            char character = str[ofs];
+
+            if (character >= '0' && character <= '9')
+            {
+                return character - '0';
             }
+            else if (character >= 'a' && character <= 'f')
+            {
+                return character + (10 - 'a');
+            }
+            else if (character >= 'A' && character <= 'F')
+            {
+                return character + (10 - 'A');
+            }
+            return -1;
+        }
 
-            return ig;
+        private static int ParseCol8(string str, int ofs)
+        {
+            return ParseCol4(str, ofs) * 16 + ParseCol4(str, ofs + 1);
         }
 
         private String ToHex32(float val)
@@ -490,9 +803,13 @@ namespace Godot
                 int lv = v & 0xF;
 
                 if (lv < 10)
+                {
                     c = (char)('0' + lv);
+                }
                 else
+                {
                     c = (char)('a' + lv - 10);
+                }
 
                 v >>= 4;
                 ret = c + ret;
@@ -504,105 +821,31 @@ namespace Godot
         internal static bool HtmlIsValid(string color)
         {
             if (color.Length == 0)
+            {
                 return false;
+            }
 
             if (color[0] == '#')
-                color = color.Substring(1, color.Length - 1);
-
-            bool alpha;
-
-            switch (color.Length)
             {
-                case 8:
-                    alpha = true;
-                    break;
-                case 6:
-                    alpha = false;
-                    break;
-                default:
-                    return false;
+                color = color.Substring(1);
             }
 
-            if (alpha)
+            // Check if the amount of hex digits is valid.
+            int len = color.Length;
+            if (!(len == 3 || len == 4 || len == 6 || len == 8))
             {
-                if (ParseCol8(color, 0) < 0)
-                    return false;
-            }
-
-            int from = alpha ? 2 : 0;
-
-            if (ParseCol8(color, from + 0) < 0)
-                return false;
-            if (ParseCol8(color, from + 2) < 0)
                 return false;
-            if (ParseCol8(color, from + 4) < 0)
-                return false;
-
-            return true;
-        }
-
-        public static Color Color8(byte r8, byte g8, byte b8, byte a8 = 255)
-        {
-            return new Color(r8 / 255f, g8 / 255f, b8 / 255f, a8 / 255f);
-        }
-
-        public Color(string rgba)
-        {
-            if (rgba.Length == 0)
-            {
-                r = 0f;
-                g = 0f;
-                b = 0f;
-                a = 1.0f;
-                return;
             }
 
-            if (rgba[0] == '#')
-                rgba = rgba.Substring(1);
-
-            bool alpha;
-
-            if (rgba.Length == 8)
-            {
-                alpha = true;
-            }
-            else if (rgba.Length == 6)
-            {
-                alpha = false;
-            }
-            else
-            {
-                throw new ArgumentOutOfRangeException("Invalid color code. Length is " + rgba.Length + " but a length of 6 or 8 is expected: " + rgba);
-            }
-
-            if (alpha)
-            {
-                a = ParseCol8(rgba, 0) / 255f;
-
-                if (a < 0)
-                    throw new ArgumentOutOfRangeException("Invalid color code. Alpha part is not valid hexadecimal: " + rgba);
-            }
-            else
-            {
-                a = 1.0f;
+            // Check if each hex digit is valid.
+            for (int i = 0; i < len; i++) {
+                if (ParseCol4(color, i) == -1)
+                {
+                    return false;
+                }
             }
 
-            int from = alpha ? 2 : 0;
-
-            r = ParseCol8(rgba, from + 0) / 255f;
-
-            if (r < 0)
-                throw new ArgumentOutOfRangeException("Invalid color code. Red part is not valid hexadecimal: " + rgba);
-
-            g = ParseCol8(rgba, from + 2) / 255f;
-
-            if (g < 0)
-                throw new ArgumentOutOfRangeException("Invalid color code. Green part is not valid hexadecimal: " + rgba);
-
-            b = ParseCol8(rgba, from + 4) / 255f;
-
-            if (b < 0)
-                throw new ArgumentOutOfRangeException("Invalid color code. Blue part is not valid hexadecimal: " + rgba);
+            return true;
         }
 
         public static Color operator +(Color left, Color right)
@@ -690,13 +933,13 @@ namespace Godot
                 if (Mathf.IsEqualApprox(left.g, right.g))
                 {
                     if (Mathf.IsEqualApprox(left.b, right.b))
+                    {
                         return left.a < right.a;
+                    }
                     return left.b < right.b;
                 }
-
                 return left.g < right.g;
             }
-
             return left.r < right.r;
         }
 
@@ -707,13 +950,13 @@ namespace Godot
                 if (Mathf.IsEqualApprox(left.g, right.g))
                 {
                     if (Mathf.IsEqualApprox(left.b, right.b))
+                    {
                         return left.a > right.a;
+                    }
                     return left.b > right.b;
                 }
-
                 return left.g > right.g;
             }
-
             return left.r > right.r;
         }
 
@@ -732,6 +975,12 @@ namespace Godot
             return r == other.r && g == other.g && b == other.b && a == other.a;
         }
 
+        /// <summary>
+        /// Returns true if this color and `other` are approximately equal, by running
+        /// <see cref="Godot.Mathf.IsEqualApprox(float, float)"/> on each component.
+        /// </summary>
+        /// <param name="other">The other color to compare.</param>
+        /// <returns>Whether or not the colors are approximately equal.</returns>
         public bool IsEqualApprox(Color other)
         {
             return Mathf.IsEqualApprox(r, other.r) && Mathf.IsEqualApprox(g, other.g) && Mathf.IsEqualApprox(b, other.b) && Mathf.IsEqualApprox(a, other.a);
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Colors.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Colors.cs
index f41f5e9fc8..d05a0414aa 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Colors.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Colors.cs
@@ -3,6 +3,10 @@ using System.Collections.Generic;
 
 namespace Godot
 {
+    /// <summary>
+    /// This class contains color constants created from standardized color names.
+    /// The standardized color set is based on the X11 and .NET color names.
+    /// </summary>
     public static class Colors
     {
         // Color names and values are derived from core/color_names.inc
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/DelegateUtils.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/DelegateUtils.cs
new file mode 100644
index 0000000000..785e87a043
--- /dev/null
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/DelegateUtils.cs
@@ -0,0 +1,395 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+namespace Godot
+{
+    internal static class DelegateUtils
+    {
+        private enum TargetKind : uint
+        {
+            Static,
+            GodotObject,
+            CompilerGenerated
+        }
+
+        internal static bool TrySerializeDelegate(Delegate @delegate, Collections.Array serializedData)
+        {
+            if (@delegate is MulticastDelegate multicastDelegate)
+            {
+                bool someDelegatesSerialized = false;
+
+                Delegate[] invocationList = multicastDelegate.GetInvocationList();
+
+                if (invocationList.Length > 1)
+                {
+                    var multiCastData = new Collections.Array();
+
+                    foreach (Delegate oneDelegate in invocationList)
+                        someDelegatesSerialized |= TrySerializeDelegate(oneDelegate, multiCastData);
+
+                    if (!someDelegatesSerialized)
+                        return false;
+
+                    serializedData.Add(multiCastData);
+                    return true;
+                }
+            }
+
+            if (TrySerializeSingleDelegate(@delegate, out byte[] buffer))
+            {
+                serializedData.Add(buffer);
+                return true;
+            }
+
+            return false;
+        }
+
+        private static bool TrySerializeSingleDelegate(Delegate @delegate, out byte[] buffer)
+        {
+            buffer = null;
+
+            object target = @delegate.Target;
+
+            switch (target)
+            {
+                case null:
+                {
+                    using (var stream = new MemoryStream())
+                    using (var writer = new BinaryWriter(stream))
+                    {
+                        writer.Write((ulong) TargetKind.Static);
+
+                        SerializeType(writer, @delegate.GetType());
+
+                        if (!TrySerializeMethodInfo(writer, @delegate.Method))
+                            return false;
+
+                        buffer = stream.ToArray();
+                        return true;
+                    }
+                }
+                case Godot.Object godotObject:
+                {
+                    using (var stream = new MemoryStream())
+                    using (var writer = new BinaryWriter(stream))
+                    {
+                        writer.Write((ulong) TargetKind.GodotObject);
+                        writer.Write((ulong) godotObject.GetInstanceId());
+
+                        SerializeType(writer, @delegate.GetType());
+
+                        if (!TrySerializeMethodInfo(writer, @delegate.Method))
+                            return false;
+
+                        buffer = stream.ToArray();
+                        return true;
+                    }
+                }
+                default:
+                {
+                    Type targetType = target.GetType();
+
+                    if (targetType.GetCustomAttribute(typeof(CompilerGeneratedAttribute), true) != null)
+                    {
+                        // Compiler generated. Probably a closure. Try to serialize it.
+
+                        using (var stream = new MemoryStream())
+                        using (var writer = new BinaryWriter(stream))
+                        {
+                            writer.Write((ulong) TargetKind.CompilerGenerated);
+                            SerializeType(writer, targetType);
+
+                            SerializeType(writer, @delegate.GetType());
+
+                            if (!TrySerializeMethodInfo(writer, @delegate.Method))
+                                return false;
+
+                            FieldInfo[] fields = targetType.GetFields(BindingFlags.Instance | BindingFlags.Public);
+
+                            writer.Write(fields.Length);
+
+                            foreach (FieldInfo field in fields)
+                            {
+                                Type fieldType = field.GetType();
+
+                                Variant.Type variantType = GD.TypeToVariantType(fieldType);
+
+                                if (variantType == Variant.Type.Nil)
+                                    return false;
+
+                                writer.Write(field.Name);
+                                byte[] valueBuffer = GD.Var2Bytes(field.GetValue(target));
+                                writer.Write(valueBuffer.Length);
+                                writer.Write(valueBuffer);
+                            }
+
+                            buffer = stream.ToArray();
+                            return true;
+                        }
+                    }
+
+                    return false;
+                }
+            }
+        }
+
+        private static bool TrySerializeMethodInfo(BinaryWriter writer, MethodInfo methodInfo)
+        {
+            if (methodInfo == null)
+                return false;
+
+            SerializeType(writer, methodInfo.DeclaringType);
+
+            writer.Write(methodInfo.Name);
+
+            int flags = 0;
+
+            if (methodInfo.IsPublic)
+                flags |= (int) BindingFlags.Public;
+            else
+                flags |= (int) BindingFlags.NonPublic;
+
+            if (methodInfo.IsStatic)
+                flags |= (int) BindingFlags.Static;
+            else
+                flags |= (int) BindingFlags.Instance;
+
+            writer.Write(flags);
+
+            Type returnType = methodInfo.ReturnType;
+            bool hasReturn = methodInfo.ReturnType != typeof(void);
+
+            writer.Write(hasReturn);
+            if (hasReturn)
+                SerializeType(writer, returnType);
+
+            ParameterInfo[] parameters = methodInfo.GetParameters();
+
+            writer.Write(parameters.Length);
+
+            if (parameters.Length > 0)
+            {
+                for (int i = 0; i < parameters.Length; i++)
+                    SerializeType(writer, parameters[i].ParameterType);
+            }
+
+            return true;
+        }
+
+        private static void SerializeType(BinaryWriter writer, Type type)
+        {
+            if (type == null)
+            {
+                int genericArgumentsCount = -1;
+                writer.Write(genericArgumentsCount);
+            }
+            else if (type.IsGenericType)
+            {
+                Type genericTypeDef = type.GetGenericTypeDefinition();
+                Type[] genericArgs = type.GetGenericArguments();
+
+                int genericArgumentsCount = genericArgs.Length;
+                writer.Write(genericArgumentsCount);
+
+                string assemblyQualifiedName = genericTypeDef.AssemblyQualifiedName;
+                Debug.Assert(assemblyQualifiedName != null);
+                writer.Write(assemblyQualifiedName);
+
+                for (int i = 0; i < genericArgs.Length; i++)
+                    SerializeType(writer, genericArgs[i]);
+            }
+            else
+            {
+                int genericArgumentsCount = 0;
+                writer.Write(genericArgumentsCount);
+
+                string assemblyQualifiedName = type.AssemblyQualifiedName;
+                Debug.Assert(assemblyQualifiedName != null);
+                writer.Write(assemblyQualifiedName);
+            }
+        }
+
+        private static bool TryDeserializeDelegate(Collections.Array serializedData, out Delegate @delegate)
+        {
+            if (serializedData.Count == 1)
+            {
+                object elem = serializedData[0];
+
+                if (elem is Collections.Array multiCastData)
+                    return TryDeserializeDelegate(multiCastData, out @delegate);
+
+                return TryDeserializeSingleDelegate((byte[])elem, out @delegate);
+            }
+
+            @delegate = null;
+
+            var delegates = new List<Delegate>(serializedData.Count);
+
+            foreach (object elem in serializedData)
+            {
+                if (elem is Collections.Array multiCastData)
+                {
+                    if (TryDeserializeDelegate(multiCastData, out Delegate oneDelegate))
+                        delegates.Add(oneDelegate);
+                }
+                else
+                {
+                    if (TryDeserializeSingleDelegate((byte[]) elem, out Delegate oneDelegate))
+                        delegates.Add(oneDelegate);
+                }
+            }
+
+            if (delegates.Count <= 0)
+                return false;
+
+            @delegate = delegates.Count == 1 ? delegates[0] : Delegate.Combine(delegates.ToArray());
+            return true;
+        }
+
+        private static bool TryDeserializeSingleDelegate(byte[] buffer, out Delegate @delegate)
+        {
+            @delegate = null;
+
+            using (var stream = new MemoryStream(buffer, writable: false))
+            using (var reader = new BinaryReader(stream))
+            {
+                var targetKind = (TargetKind) reader.ReadUInt64();
+
+                switch (targetKind)
+                {
+                    case TargetKind.Static:
+                    {
+                        Type delegateType = DeserializeType(reader);
+                        if (delegateType == null)
+                            return false;
+
+                        if (!TryDeserializeMethodInfo(reader, out MethodInfo methodInfo))
+                            return false;
+
+                        @delegate = Delegate.CreateDelegate(delegateType, null, methodInfo);
+                        return true;
+                    }
+                    case TargetKind.GodotObject:
+                    {
+                        ulong objectId = reader.ReadUInt64();
+                        Godot.Object godotObject = GD.InstanceFromId(objectId);
+                        if (godotObject == null)
+                            return false;
+
+                        Type delegateType = DeserializeType(reader);
+                        if (delegateType == null)
+                            return false;
+
+                        if (!TryDeserializeMethodInfo(reader, out MethodInfo methodInfo))
+                            return false;
+
+                        @delegate = Delegate.CreateDelegate(delegateType, godotObject, methodInfo);
+                        return true;
+                    }
+                    case TargetKind.CompilerGenerated:
+                    {
+                        Type targetType = DeserializeType(reader);
+                        if (targetType == null)
+                            return false;
+
+                        Type delegateType = DeserializeType(reader);
+                        if (delegateType == null)
+                            return false;
+
+                        if (!TryDeserializeMethodInfo(reader, out MethodInfo methodInfo))
+                            return false;
+
+                        int fieldCount = reader.ReadInt32();
+
+                        object recreatedTarget = Activator.CreateInstance(targetType);
+
+                        for (int i = 0; i < fieldCount; i++)
+                        {
+                            string name = reader.ReadString();
+                            int valueBufferLength = reader.ReadInt32();
+                            byte[] valueBuffer = reader.ReadBytes(valueBufferLength);
+
+                            FieldInfo fieldInfo = targetType.GetField(name, BindingFlags.Instance | BindingFlags.Public);
+                            fieldInfo?.SetValue(recreatedTarget, GD.Bytes2Var(valueBuffer));
+                        }
+
+                        @delegate = Delegate.CreateDelegate(delegateType, recreatedTarget, methodInfo);
+                        return true;
+                    }
+                    default:
+                        return false;
+                }
+            }
+        }
+
+        private static bool TryDeserializeMethodInfo(BinaryReader reader, out MethodInfo methodInfo)
+        {
+            methodInfo = null;
+
+            Type declaringType = DeserializeType(reader);
+
+            string methodName = reader.ReadString();
+
+            int flags = reader.ReadInt32();
+
+            bool hasReturn = reader.ReadBoolean();
+            Type returnType = hasReturn ? DeserializeType(reader) : typeof(void);
+
+            int parametersCount = reader.ReadInt32();
+
+            if (parametersCount > 0)
+            {
+                var parameterTypes = new Type[parametersCount];
+
+                for (int i = 0; i < parametersCount; i++)
+                {
+                    Type parameterType = DeserializeType(reader);
+                    if (parameterType == null)
+                        return false;
+                    parameterTypes[i] = parameterType;
+                }
+
+                methodInfo = declaringType.GetMethod(methodName, (BindingFlags) flags, null, parameterTypes, null);
+                return methodInfo != null && methodInfo.ReturnType == returnType;
+            }
+
+            methodInfo = declaringType.GetMethod(methodName, (BindingFlags) flags);
+            return methodInfo != null && methodInfo.ReturnType == returnType;
+        }
+
+        private static Type DeserializeType(BinaryReader reader)
+        {
+            int genericArgumentsCount = reader.ReadInt32();
+
+            if (genericArgumentsCount == -1)
+                return null;
+
+            string assemblyQualifiedName = reader.ReadString();
+            var type = Type.GetType(assemblyQualifiedName);
+
+            if (type == null)
+                return null; // Type not found
+
+            if (genericArgumentsCount != 0)
+            {
+                var genericArgumentTypes = new Type[genericArgumentsCount];
+
+                for (int i = 0; i < genericArgumentsCount; i++)
+                {
+                    Type genericArgumentType = DeserializeType(reader);
+                    if (genericArgumentType == null)
+                        return null;
+                    genericArgumentTypes[i] = genericArgumentType;
+                }
+
+                type = type.MakeGenericType(genericArgumentTypes);
+            }
+
+            return type;
+        }
+    }
+}
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Dictionary.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Dictionary.cs
index d72109de92..213fc181c1 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Dictionary.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Dictionary.cs
@@ -15,10 +15,7 @@ namespace Godot.Collections
 
         public override bool IsInvalid
         {
-            get
-            {
-                return handle == IntPtr.Zero;
-            }
+            get { return handle == IntPtr.Zero; }
         }
 
         protected override bool ReleaseHandle()
@@ -45,7 +42,8 @@ namespace Godot.Collections
             if (dictionary == null)
                 throw new NullReferenceException($"Parameter '{nameof(dictionary)} cannot be null.'");
 
-            MarshalUtils.IDictionaryToDictionary(dictionary, GetPtr());
+            foreach (DictionaryEntry entry in dictionary)
+                Add(entry.Key, entry.Value);
         }
 
         internal Dictionary(DictionarySafeHandle handle)
@@ -330,14 +328,8 @@ namespace Godot.Collections
 
         public TValue this[TKey key]
         {
-            get
-            {
-                return (TValue)Dictionary.godot_icall_Dictionary_GetValue_Generic(objectDict.GetPtr(), key, valTypeEncoding, valTypeClass);
-            }
-            set
-            {
-                objectDict[key] = value;
-            }
+            get { return (TValue)Dictionary.godot_icall_Dictionary_GetValue_Generic(objectDict.GetPtr(), key, valTypeEncoding, valTypeClass); }
+            set { objectDict[key] = value; }
         }
 
         public ICollection<TKey> Keys
@@ -385,18 +377,12 @@ namespace Godot.Collections
 
         public int Count
         {
-            get
-            {
-                return objectDict.Count;
-            }
+            get { return objectDict.Count; }
         }
 
         public bool IsReadOnly
         {
-            get
-            {
-                return objectDict.IsReadOnly;
-            }
+            get { return objectDict.IsReadOnly; }
         }
 
         public void Add(KeyValuePair<TKey, TValue> item)
@@ -440,7 +426,8 @@ namespace Godot.Collections
 
         public bool Remove(KeyValuePair<TKey, TValue> item)
         {
-            return Dictionary.godot_icall_Dictionary_Remove(GetPtr(), item.Key, item.Value); ;
+            return Dictionary.godot_icall_Dictionary_Remove(GetPtr(), item.Key, item.Value);
+            ;
         }
 
         // IEnumerable<KeyValuePair<TKey, TValue>>
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/DynamicObject.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/DynamicObject.cs
index a0f105d55e..c4c911b863 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/DynamicObject.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/DynamicObject.cs
@@ -23,7 +23,7 @@ namespace Godot
     /// <example>
     /// This sample shows how to use <see cref="Godot.DynamicGodotObject"/> to dynamically access the engine members of a <see cref="Godot.Object"/>.
     /// <code>
-    /// dynamic sprite = GetNode("Sprite").DynamicGodotObject;
+    /// dynamic sprite = GetNode("Sprite2D").DynamicGodotObject;
     /// sprite.add_child(this);
     ///
     /// if ((sprite.hframes * sprite.vframes) &gt; 0)
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Extensions/ResourceLoaderExtensions.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Extensions/ResourceLoaderExtensions.cs
index 684d160b57..5f64c09a89 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Extensions/ResourceLoaderExtensions.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Extensions/ResourceLoaderExtensions.cs
@@ -2,9 +2,9 @@ namespace Godot
 {
     public static partial class ResourceLoader
     {
-        public static T Load<T>(string path) where T : class
+        public static T Load<T>(string path, string typeHint = null, bool noCache = false) where T : class
         {
-            return (T)(object)Load(path);
+            return (T)(object)Load(path, typeHint, noCache);
         }
     }
 }
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Extensions/SceneTreeExtensions.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Extensions/SceneTreeExtensions.cs
new file mode 100644
index 0000000000..20b11a48dd
--- /dev/null
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Extensions/SceneTreeExtensions.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Runtime.CompilerServices;
+using Godot.Collections;
+
+namespace Godot
+{
+    public partial class SceneTree
+    {
+        public Array<T> GetNodesInGroup<T>(StringName group) where T : class
+        {
+            return new Array<T>(godot_icall_SceneTree_get_nodes_in_group_Generic(Object.GetPtr(this), StringName.GetPtr(group), typeof(T)));
+        }
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal extern static IntPtr godot_icall_SceneTree_get_nodes_in_group_Generic(IntPtr obj, IntPtr group, Type elemType);
+    }
+}
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/GD.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/GD.cs
index 19962d418a..e050d1fdd1 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/GD.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/GD.cs
@@ -5,6 +5,7 @@ using System.Runtime.CompilerServices;
 using real_t = System.Double;
 #else
 using real_t = System.Single;
+
 #endif
 
 // TODO: Add comments describing what this class does. It is not obvious.
@@ -13,9 +14,9 @@ namespace Godot
 {
     public static partial class GD
     {
-        public static object Bytes2Var(byte[] bytes, bool allow_objects = false)
+        public static object Bytes2Var(byte[] bytes, bool allowObjects = false)
         {
-            return godot_icall_GD_bytes2var(bytes, allow_objects);
+            return godot_icall_GD_bytes2var(bytes, allowObjects);
         }
 
         public static object Convert(object what, Variant.Type type)
@@ -25,7 +26,7 @@ namespace Godot
 
         public static real_t Db2Linear(real_t db)
         {
-            return (real_t)Math.Exp(db * 0.11512925464970228420089957273422);
+            return (real_t) Math.Exp(db * 0.11512925464970228420089957273422);
         }
 
         public static real_t DecTime(real_t value, real_t amount, real_t step)
@@ -38,11 +39,11 @@ namespace Godot
             return val * sgn;
         }
 
-        public static FuncRef FuncRef(Object instance, string funcname)
+        public static FuncRef FuncRef(Object instance, StringName funcName)
         {
             var ret = new FuncRef();
             ret.SetInstance(instance);
-            ret.SetFunction(funcname);
+            ret.SetFunction(funcName);
             return ret;
         }
 
@@ -58,7 +59,7 @@ namespace Godot
 
         public static real_t Linear2Db(real_t linear)
         {
-            return (real_t)(Math.Log(linear) * 8.6858896380650365530225783783321);
+            return (real_t) (Math.Log(linear) * 8.6858896380650365530225783783321);
         }
 
         public static Resource Load(string path)
@@ -83,7 +84,7 @@ namespace Godot
 
         public static void Print(params object[] what)
         {
-            godot_icall_GD_print(Array.ConvertAll(what, x => x.ToString()));
+            godot_icall_GD_print(Array.ConvertAll(what ?? new object[]{"null"}, x => x != null ? x.ToString() : "null"));
         }
 
         public static void PrintStack()
@@ -93,22 +94,22 @@ namespace Godot
 
         public static void PrintErr(params object[] what)
         {
-            godot_icall_GD_printerr(Array.ConvertAll(what, x => x?.ToString()));
+            godot_icall_GD_printerr(Array.ConvertAll(what ?? new object[]{"null"}, x => x != null ? x.ToString() : "null"));
         }
 
         public static void PrintRaw(params object[] what)
         {
-            godot_icall_GD_printraw(Array.ConvertAll(what, x => x?.ToString()));
+            godot_icall_GD_printraw(Array.ConvertAll(what ?? new object[]{"null"}, x => x != null ? x.ToString() : "null"));
         }
 
         public static void PrintS(params object[] what)
         {
-            godot_icall_GD_prints(Array.ConvertAll(what, x => x?.ToString()));
+            godot_icall_GD_prints(Array.ConvertAll(what ?? new object[]{"null"}, x => x != null ? x.ToString() : "null"));
         }
 
         public static void PrintT(params object[] what)
         {
-            godot_icall_GD_printt(Array.ConvertAll(what, x => x?.ToString()));
+            godot_icall_GD_printt(Array.ConvertAll(what ?? new object[]{"null"}, x => x != null ? x.ToString() : "null"));
         }
 
         public static float Randf()
@@ -181,14 +182,14 @@ namespace Godot
             return godot_icall_GD_str2var(str);
         }
 
-        public static bool TypeExists(string type)
+        public static bool TypeExists(StringName type)
         {
-            return godot_icall_GD_type_exists(type);
+            return godot_icall_GD_type_exists(StringName.GetPtr(type));
         }
 
-        public static byte[] Var2Bytes(object var, bool full_objects = false)
+        public static byte[] Var2Bytes(object var, bool fullObjects = false)
         {
-            return godot_icall_GD_var2bytes(var, full_objects);
+            return godot_icall_GD_var2bytes(var, fullObjects);
         }
 
         public static string Var2Str(object var)
@@ -196,8 +197,13 @@ namespace Godot
             return godot_icall_GD_var2str(var);
         }
 
+        public static Variant.Type TypeToVariantType(Type type)
+        {
+            return godot_icall_TypeToVariantType(type);
+        }
+
         [MethodImpl(MethodImplOptions.InternalCall)]
-        internal extern static object godot_icall_GD_bytes2var(byte[] bytes, bool allow_objects);
+        internal extern static object godot_icall_GD_bytes2var(byte[] bytes, bool allowObjects);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
         internal extern static object godot_icall_GD_convert(object what, Variant.Type type);
@@ -206,7 +212,7 @@ namespace Godot
         internal extern static int godot_icall_GD_hash(object var);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        internal extern static Object godot_icall_GD_instance_from_id(ulong instance_id);
+        internal extern static Object godot_icall_GD_instance_from_id(ulong instanceId);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
         internal extern static void godot_icall_GD_print(object[] what);
@@ -249,10 +255,10 @@ namespace Godot
         internal extern static object godot_icall_GD_str2var(string str);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        internal extern static bool godot_icall_GD_type_exists(string type);
+        internal extern static bool godot_icall_GD_type_exists(IntPtr type);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        internal extern static byte[] godot_icall_GD_var2bytes(object what, bool full_objects);
+        internal extern static byte[] godot_icall_GD_var2bytes(object what, bool fullObjects);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
         internal extern static string godot_icall_GD_var2str(object var);
@@ -262,5 +268,8 @@ namespace Godot
 
         [MethodImpl(MethodImplOptions.InternalCall)]
         internal extern static void godot_icall_GD_pushwarning(string type);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        private static extern Variant.Type godot_icall_TypeToVariantType(Type type);
     }
 }
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/MarshalUtils.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/MarshalUtils.cs
index a1d63a62ef..c59d083080 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/MarshalUtils.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/MarshalUtils.cs
@@ -16,10 +16,8 @@ namespace Godot
         /// <exception cref="System.InvalidOperationException">
         /// <paramref name="type"/> is not a generic type. That is, IsGenericType returns false.
         /// </exception>
-        static bool TypeIsGenericArray(Type type)
-        {
-            return type.GetGenericTypeDefinition() == typeof(Godot.Collections.Array<>);
-        }
+        static bool TypeIsGenericArray(Type type) =>
+            type.GetGenericTypeDefinition() == typeof(Godot.Collections.Array<>);
 
         /// <summary>
         /// Returns <see langword="true"/> if the generic type definition of <paramref name="type"/>
@@ -28,10 +26,20 @@ namespace Godot
         /// <exception cref="System.InvalidOperationException">
         /// <paramref name="type"/> is not a generic type. That is, IsGenericType returns false.
         /// </exception>
-        static bool TypeIsGenericDictionary(Type type)
-        {
-            return type.GetGenericTypeDefinition() == typeof(Godot.Collections.Dictionary<,>);
-        }
+        static bool TypeIsGenericDictionary(Type type) =>
+            type.GetGenericTypeDefinition() == typeof(Godot.Collections.Dictionary<,>);
+
+        static bool TypeIsSystemGenericList(Type type) =>
+            type.GetGenericTypeDefinition() == typeof(System.Collections.Generic.List<>);
+
+        static bool TypeIsSystemGenericDictionary(Type type) =>
+            type.GetGenericTypeDefinition() == typeof(System.Collections.Generic.Dictionary<,>);
+
+        static bool TypeIsGenericIEnumerable(Type type) => type.GetGenericTypeDefinition() == typeof(IEnumerable<>);
+
+        static bool TypeIsGenericICollection(Type type) => type.GetGenericTypeDefinition() == typeof(ICollection<>);
+
+        static bool TypeIsGenericIDictionary(Type type) => type.GetGenericTypeDefinition() == typeof(IDictionary<,>);
 
         static void ArrayGetElementType(Type arrayType, out Type elementType)
         {
@@ -45,105 +53,6 @@ namespace Godot
             valueType = genericArgs[1];
         }
 
-        static bool GenericIEnumerableIsAssignableFromType(Type type)
-        {
-            if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(IEnumerable<>))
-                return true;
-
-            foreach (var interfaceType in type.GetInterfaces())
-            {
-                if (interfaceType.IsGenericType && interfaceType.GetGenericTypeDefinition() == typeof(IEnumerable<>))
-                    return true;
-            }
-
-            Type baseType = type.BaseType;
-
-            if (baseType == null)
-                return false;
-
-            return GenericIEnumerableIsAssignableFromType(baseType);
-        }
-
-        static bool GenericIDictionaryIsAssignableFromType(Type type)
-        {
-            if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(IDictionary<,>))
-                return true;
-
-            foreach (var interfaceType in type.GetInterfaces())
-            {
-                if (interfaceType.IsGenericType && interfaceType.GetGenericTypeDefinition() == typeof(IDictionary<,>))
-                    return true;
-            }
-
-            Type baseType = type.BaseType;
-
-            if (baseType == null)
-                return false;
-
-            return GenericIDictionaryIsAssignableFromType(baseType);
-        }
-
-        static bool GenericIEnumerableIsAssignableFromType(Type type, out Type elementType)
-        {
-            if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(IEnumerable<>))
-            {
-                elementType = type.GetGenericArguments()[0];
-                return true;
-            }
-
-            foreach (var interfaceType in type.GetInterfaces())
-            {
-                if (interfaceType.IsGenericType && interfaceType.GetGenericTypeDefinition() == typeof(IEnumerable<>))
-                {
-                    elementType = interfaceType.GetGenericArguments()[0];
-                    return true;
-                }
-            }
-
-            Type baseType = type.BaseType;
-
-            if (baseType == null)
-            {
-                elementType = null;
-                return false;
-            }
-
-            return GenericIEnumerableIsAssignableFromType(baseType, out elementType);
-        }
-
-        static bool GenericIDictionaryIsAssignableFromType(Type type, out Type keyType, out Type valueType)
-        {
-            if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(IDictionary<,>))
-            {
-                var genericArgs = type.GetGenericArguments();
-                keyType = genericArgs[0];
-                valueType = genericArgs[1];
-                return true;
-            }
-
-            foreach (var interfaceType in type.GetInterfaces())
-            {
-                if (interfaceType.IsGenericType && interfaceType.GetGenericTypeDefinition() == typeof(IDictionary<,>))
-                {
-                    var genericArgs = interfaceType.GetGenericArguments();
-                    keyType = genericArgs[0];
-                    valueType = genericArgs[1];
-                    return true;
-                }
-            }
-
-            Type baseType = type.BaseType;
-
-            if (baseType == null)
-            {
-                keyType = null;
-                valueType = null;
-                return false;
-            }
-
-            return GenericIDictionaryIsAssignableFromType(baseType, out keyType, out valueType);
-        }
-
         static Type MakeGenericArrayType(Type elemType)
         {
             return typeof(Godot.Collections.Array<>).MakeGenericType(elemType);
@@ -153,60 +62,5 @@ namespace Godot
         {
             return typeof(Godot.Collections.Dictionary<,>).MakeGenericType(keyType, valueType);
         }
-
-        // TODO Add support for IEnumerable<T> and IDictionary<TKey, TValue>
-        // TODO: EnumerableToArray and IDictionaryToDictionary can be optimized
-
-        internal static void EnumerableToArray(IEnumerable enumerable, IntPtr godotArrayPtr)
-        {
-            if (enumerable is ICollection collection)
-            {
-                int count = collection.Count;
-
-                object[] tempArray = new object[count];
-                collection.CopyTo(tempArray, 0);
-
-                for (int i = 0; i < count; i++)
-                {
-                    Array.godot_icall_Array_Add(godotArrayPtr, tempArray[i]);
-                }
-            }
-            else
-            {
-                foreach (object element in enumerable)
-                {
-                    Array.godot_icall_Array_Add(godotArrayPtr, element);
-                }
-            }
-        }
-
-        internal static void IDictionaryToDictionary(IDictionary dictionary, IntPtr godotDictionaryPtr)
-        {
-            foreach (DictionaryEntry entry in dictionary)
-            {
-                Dictionary.godot_icall_Dictionary_Add(godotDictionaryPtr, entry.Key, entry.Value);
-            }
-        }
-
-        internal static void GenericIDictionaryToDictionary(object dictionary, IntPtr godotDictionaryPtr)
-        {
-#if DEBUG
-            if (!GenericIDictionaryIsAssignableFromType(dictionary.GetType()))
-                throw new InvalidOperationException("The type does not implement IDictionary<,>");
-#endif
-
-            // TODO: Can we optimize this?
-
-            var keys = ((IEnumerable)dictionary.GetType().GetProperty("Keys").GetValue(dictionary)).GetEnumerator();
-            var values = ((IEnumerable)dictionary.GetType().GetProperty("Values").GetValue(dictionary)).GetEnumerator();
-
-            while (keys.MoveNext() && values.MoveNext())
-            {
-                object key = keys.Current;
-                object value = values.Current;
-
-                Dictionary.godot_icall_Dictionary_Add(godotDictionaryPtr, key, value);
-            }
-        }
     }
 }
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Mathf.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Mathf.cs
index ddfed180b5..6eecc262d6 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Mathf.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Mathf.cs
@@ -11,79 +11,185 @@ namespace Godot
     {
         // Define constants with Decimal precision and cast down to double or float.
 
+        /// <summary>
+        /// The circle constant, the circumference of the unit circle in radians.
+        /// </summary>
         public const real_t Tau = (real_t) 6.2831853071795864769252867666M; // 6.2831855f and 6.28318530717959
+
+        /// <summary>
+        /// Constant that represents how many times the diameter of a circle
+        /// fits around its perimeter. This is equivalent to `Mathf.Tau / 2`.
+        /// </summary>
         public const real_t Pi = (real_t) 3.1415926535897932384626433833M; // 3.1415927f and 3.14159265358979
+
+        /// <summary>
+        /// Positive infinity. For negative infinity, use `-Mathf.Inf`.
+        /// </summary>
         public const real_t Inf = real_t.PositiveInfinity;
+
+        /// <summary>
+        /// "Not a Number", an invalid value. `NaN` has special properties, including
+        /// that it is not equal to itself. It is output by some invalid operations,
+        /// such as dividing zero by zero.
+        /// </summary>
         public const real_t NaN = real_t.NaN;
 
         private const real_t Deg2RadConst = (real_t) 0.0174532925199432957692369077M; // 0.0174532924f and 0.0174532925199433
         private const real_t Rad2DegConst = (real_t) 57.295779513082320876798154814M; // 57.29578f and 57.2957795130823
 
+        /// <summary>
+        /// Returns the absolute value of `s` (i.e. positive value).
+        /// </summary>
+        /// <param name="s">The input number.</param>
+        /// <returns>The absolute value of `s`.</returns>
         public static int Abs(int s)
         {
             return Math.Abs(s);
         }
 
+        /// <summary>
+        /// Returns the absolute value of `s` (i.e. positive value).
+        /// </summary>
+        /// <param name="s">The input number.</param>
+        /// <returns>The absolute value of `s`.</returns>
         public static real_t Abs(real_t s)
         {
             return Math.Abs(s);
         }
 
+        /// <summary>
+        /// Returns the arc cosine of `s` in radians. Use to get the angle of cosine s.
+        /// </summary>
+        /// <param name="s">The input cosine value. Must be on the range of -1.0 to 1.0.</param>
+        /// <returns>An angle that would result in the given cosine value. On the range `0` to `Tau/2`.</returns>
         public static real_t Acos(real_t s)
         {
             return (real_t)Math.Acos(s);
         }
 
+        /// <summary>
+        /// Returns the arc sine of `s` in radians. Use to get the angle of sine s.
+        /// </summary>
+        /// <param name="s">The input sine value. Must be on the range of -1.0 to 1.0.</param>
+        /// <returns>An angle that would result in the given sine value. On the range `-Tau/4` to `Tau/4`.</returns>
         public static real_t Asin(real_t s)
         {
             return (real_t)Math.Asin(s);
         }
 
+        /// <summary>
+        /// Returns the arc tangent of `s` in radians. Use to get the angle of tangent s.
+        ///
+        /// The method cannot know in which quadrant the angle should fall.
+        /// See <see cref="Atan2(real_t, real_t)"/> if you have both `y` and `x`.
+        /// </summary>
+        /// <param name="s">The input tangent value.</param>
+        /// <returns>An angle that would result in the given tangent value. On the range `-Tau/4` to `Tau/4`.</returns>
         public static real_t Atan(real_t s)
         {
             return (real_t)Math.Atan(s);
         }
 
+        /// <summary>
+        /// Returns the arc tangent of `y` and `x` in radians. Use to get the angle
+        /// of the tangent of `y/x`. To compute the value, the method takes into
+        /// account the sign of both arguments in order to determine the quadrant.
+        ///
+        /// Important note: The Y coordinate comes first, by convention.
+        /// </summary>
+        /// <param name="y">The Y coordinate of the point to find the angle to.</param>
+        /// <param name="x">The X coordinate of the point to find the angle to.</param>
+        /// <returns>An angle that would result in the given tangent value. On the range `-Tau/2` to `Tau/2`.</returns>
         public static real_t Atan2(real_t y, real_t x)
         {
             return (real_t)Math.Atan2(y, x);
         }
 
+        /// <summary>
+        /// Converts a 2D point expressed in the cartesian coordinate
+        /// system (X and Y axis) to the polar coordinate system
+        /// (a distance from the origin and an angle).
+        /// </summary>
+        /// <param name="x">The input X coordinate.</param>
+        /// <param name="y">The input Y coordinate.</param>
+        /// <returns>A <see cref="Vector2"/> with X representing the distance and Y representing the angle.</returns>
         public static Vector2 Cartesian2Polar(real_t x, real_t y)
         {
             return new Vector2(Sqrt(x * x + y * y), Atan2(y, x));
         }
 
+        /// <summary>
+        /// Rounds `s` upward (towards positive infinity).
+        /// </summary>
+        /// <param name="s">The number to ceil.</param>
+        /// <returns>The smallest whole number that is not less than `s`.</returns>
         public static real_t Ceil(real_t s)
         {
             return (real_t)Math.Ceiling(s);
         }
 
+        /// <summary>
+        /// Clamps a `value` so that it is not less than `min` and not more than `max`.
+        /// </summary>
+        /// <param name="value">The value to clamp.</param>
+        /// <param name="min">The minimum allowed value.</param>
+        /// <param name="max">The maximum allowed value.</param>
+        /// <returns>The clamped value.</returns>
         public static int Clamp(int value, int min, int max)
         {
             return value < min ? min : value > max ? max : value;
         }
 
+        /// <summary>
+        /// Clamps a `value` so that it is not less than `min` and not more than `max`.
+        /// </summary>
+        /// <param name="value">The value to clamp.</param>
+        /// <param name="min">The minimum allowed value.</param>
+        /// <param name="max">The maximum allowed value.</param>
+        /// <returns>The clamped value.</returns>
         public static real_t Clamp(real_t value, real_t min, real_t max)
         {
             return value < min ? min : value > max ? max : value;
         }
 
+        /// <summary>
+        /// Returns the cosine of angle `s` in radians.
+        /// </summary>
+        /// <param name="s">The angle in radians.</param>
+        /// <returns>The cosine of that angle.</returns>
         public static real_t Cos(real_t s)
         {
             return (real_t)Math.Cos(s);
         }
 
+        /// <summary>
+        /// Returns the hyperbolic cosine of angle `s` in radians.
+        /// </summary>
+        /// <param name="s">The angle in radians.</param>
+        /// <returns>The hyperbolic cosine of that angle.</returns>
         public static real_t Cosh(real_t s)
         {
             return (real_t)Math.Cosh(s);
         }
 
+        /// <summary>
+        /// Converts an angle expressed in degrees to radians.
+        /// </summary>
+        /// <param name="deg">An angle expressed in degrees.</param>
+        /// <returns>The same angle expressed in radians.</returns>
         public static real_t Deg2Rad(real_t deg)
         {
             return deg * Deg2RadConst;
         }
 
+        /// <summary>
+        /// Easing function, based on exponent. The curve values are:
+        /// `0` is constant, `1` is linear, `0` to `1` is ease-in, `1` or more is ease-out.
+        /// Negative values are in-out/out-in.
+        /// </summary>
+        /// <param name="s">The value to ease.</param>
+        /// <param name="curve">`0` is constant, `1` is linear, `0` to `1` is ease-in, `1` or more is ease-out.</param>
+        /// <returns>The eased value.</returns>
         public static real_t Ease(real_t s, real_t curve)
         {
             if (s < 0f)
@@ -118,21 +224,47 @@ namespace Godot
             return 0f;
         }
 
+        /// <summary>
+        /// The natural exponential function. It raises the mathematical
+        /// constant `e` to the power of `s` and returns it.
+        /// </summary>
+        /// <param name="s">The exponent to raise `e` to.</param>
+        /// <returns>`e` raised to the power of `s`.</returns>
         public static real_t Exp(real_t s)
         {
             return (real_t)Math.Exp(s);
         }
 
+        /// <summary>
+        /// Rounds `s` downward (towards negative infinity).
+        /// </summary>
+        /// <param name="s">The number to floor.</param>
+        /// <returns>The largest whole number that is not more than `s`.</returns>
         public static real_t Floor(real_t s)
         {
             return (real_t)Math.Floor(s);
         }
 
+        /// <summary>
+        /// Returns a normalized value considering the given range.
+        /// This is the opposite of <see cref="Lerp(real_t, real_t, real_t)"/>.
+        /// </summary>
+        /// <param name="from">The interpolated value.</param>
+        /// <param name="to">The destination value for interpolation.</param>
+        /// <param name="weight">A value on the range of 0.0 to 1.0, representing the amount of interpolation.</param>
+        /// <returns>The resulting value of the inverse interpolation.</returns>
         public static real_t InverseLerp(real_t from, real_t to, real_t weight)
         {
-           return (weight - from) / (to - from);
+            return (weight - from) / (to - from);
         }
 
+        /// <summary>
+        /// Returns true if `a` and `b` are approximately equal to each other.
+        /// The comparison is done using a tolerance calculation with <see cref="Epsilon"/>.
+        /// </summary>
+        /// <param name="a">One of the values.</param>
+        /// <param name="b">The other value.</param>
+        /// <returns>A bool for whether or not the two values are approximately equal.</returns>
         public static bool IsEqualApprox(real_t a, real_t b)
         {
             // Check for exact equality first, required to handle "infinity" values.
@@ -149,26 +281,62 @@ namespace Godot
             return Abs(a - b) < tolerance;
         }
 
+        /// <summary>
+        /// Returns whether `s` is an infinity value (either positive infinity or negative infinity).
+        /// </summary>
+        /// <param name="s">The value to check.</param>
+        /// <returns>A bool for whether or not the value is an infinity value.</returns>
         public static bool IsInf(real_t s)
         {
-           return real_t.IsInfinity(s);
+            return real_t.IsInfinity(s);
         }
 
+        /// <summary>
+        /// Returns whether `s` is a `NaN` ("Not a Number" or invalid) value.
+        /// </summary>
+        /// <param name="s">The value to check.</param>
+        /// <returns>A bool for whether or not the value is a `NaN` value.</returns>
         public static bool IsNaN(real_t s)
         {
-           return real_t.IsNaN(s);
+            return real_t.IsNaN(s);
         }
 
+        /// <summary>
+        /// Returns true if `s` is approximately zero.
+        /// The comparison is done using a tolerance calculation with <see cref="Epsilon"/>.
+        ///
+        /// This method is faster than using <see cref="IsEqualApprox(real_t, real_t)"/> with one value as zero.
+        /// </summary>
+        /// <param name="s">The value to check.</param>
+        /// <returns>A bool for whether or not the value is nearly zero.</returns>
         public static bool IsZeroApprox(real_t s)
         {
             return Abs(s) < Epsilon;
         }
 
+        /// <summary>
+        /// Linearly interpolates between two values by a normalized value.
+        /// This is the opposite <see cref="InverseLerp(real_t, real_t, real_t)"/>.
+        /// </summary>
+        /// <param name="from">The start value for interpolation.</param>
+        /// <param name="to">The destination value for interpolation.</param>
+        /// <param name="weight">A value on the range of 0.0 to 1.0, representing the amount of interpolation.</param>
+        /// <returns>The resulting value of the interpolation.</returns>
         public static real_t Lerp(real_t from, real_t to, real_t weight)
         {
             return from + (to - from) * weight;
         }
 
+        /// <summary>
+        /// Linearly interpolates between two angles (in radians) by a normalized value.
+        ///
+        /// Similar to <see cref="Lerp(real_t, real_t, real_t)"/>,
+        /// but interpolates correctly when the angles wrap around <see cref="Tau"/>.
+        /// </summary>
+        /// <param name="from">The start angle for interpolation.</param>
+        /// <param name="to">The destination angle for interpolation.</param>
+        /// <param name="weight">A value on the range of 0.0 to 1.0, representing the amount of interpolation.</param>
+        /// <returns>The resulting angle of the interpolation.</returns>
         public static real_t LerpAngle(real_t from, real_t to, real_t weight)
         {
             real_t difference = (to - from) % Mathf.Tau;
@@ -176,36 +344,81 @@ namespace Godot
             return from + distance * weight;
         }
 
+        /// <summary>
+        /// Natural logarithm. The amount of time needed to reach a certain level of continuous growth.
+        ///
+        /// Note: This is not the same as the "log" function on most calculators, which uses a base 10 logarithm.
+        /// </summary>
+        /// <param name="s">The input value.</param>
+        /// <returns>The natural log of `s`.</returns>
         public static real_t Log(real_t s)
         {
             return (real_t)Math.Log(s);
         }
 
+        /// <summary>
+        /// Returns the maximum of two values.
+        /// </summary>
+        /// <param name="a">One of the values.</param>
+        /// <param name="b">The other value.</param>
+        /// <returns>Whichever of the two values is higher.</returns>
         public static int Max(int a, int b)
         {
             return a > b ? a : b;
         }
 
+        /// <summary>
+        /// Returns the maximum of two values.
+        /// </summary>
+        /// <param name="a">One of the values.</param>
+        /// <param name="b">The other value.</param>
+        /// <returns>Whichever of the two values is higher.</returns>
         public static real_t Max(real_t a, real_t b)
         {
             return a > b ? a : b;
         }
 
+        /// <summary>
+        /// Returns the minimum of two values.
+        /// </summary>
+        /// <param name="a">One of the values.</param>
+        /// <param name="b">The other value.</param>
+        /// <returns>Whichever of the two values is lower.</returns>
         public static int Min(int a, int b)
         {
             return a < b ? a : b;
         }
 
+        /// <summary>
+        /// Returns the minimum of two values.
+        /// </summary>
+        /// <param name="a">One of the values.</param>
+        /// <param name="b">The other value.</param>
+        /// <returns>Whichever of the two values is lower.</returns>
         public static real_t Min(real_t a, real_t b)
         {
             return a < b ? a : b;
         }
 
+        /// <summary>
+        /// Moves `from` toward `to` by the `delta` value.
+        ///
+        /// Use a negative delta value to move away.
+        /// </summary>
+        /// <param name="from">The start value.</param>
+        /// <param name="to">The value to move towards.</param>
+        /// <param name="delta">The amount to move by.</param>
+        /// <returns>The value after moving.</returns>
         public static real_t MoveToward(real_t from, real_t to, real_t delta)
         {
             return Abs(to - from) <= delta ? to : from + Sign(to - from) * delta;
         }
 
+        /// <summary>
+        /// Returns the nearest larger power of 2 for the integer `value`.
+        /// </summary>
+        /// <param name="value">The input value.</param>
+        /// <returns>The nearest larger power of 2.</returns>
         public static int NearestPo2(int value)
         {
             value--;
@@ -218,14 +431,25 @@ namespace Godot
             return value;
         }
 
+        /// <summary>
+        /// Converts a 2D point expressed in the polar coordinate
+        /// system (a distance from the origin `r` and an angle `th`)
+        /// to the cartesian coordinate system (X and Y axis).
+        /// </summary>
+        /// <param name="r">The distance from the origin.</param>
+        /// <param name="th">The angle of the point.</param>
+        /// <returns>A <see cref="Vector2"/> representing the cartesian coordinate.</returns>
         public static Vector2 Polar2Cartesian(real_t r, real_t th)
         {
             return new Vector2(r * Cos(th), r * Sin(th));
         }
 
         /// <summary>
-        /// Performs a canonical Modulus operation, where the output is on the range [0, b).
+        /// Performs a canonical Modulus operation, where the output is on the range `[0, b)`.
         /// </summary>
+        /// <param name="a">The dividend, the primary input.</param>
+        /// <param name="b">The divisor. The output is on the range `[0, b)`.</param>
+        /// <returns>The resulting output.</returns>
         public static int PosMod(int a, int b)
         {
             int c = a % b;
@@ -237,8 +461,11 @@ namespace Godot
         }
 
         /// <summary>
-        /// Performs a canonical Modulus operation, where the output is on the range [0, b).
+        /// Performs a canonical Modulus operation, where the output is on the range `[0, b)`.
         /// </summary>
+        /// <param name="a">The dividend, the primary input.</param>
+        /// <param name="b">The divisor. The output is on the range `[0, b)`.</param>
+        /// <returns>The resulting output.</returns>
         public static real_t PosMod(real_t a, real_t b)
         {
             real_t c = a % b;
@@ -249,43 +476,89 @@ namespace Godot
             return c;
         }
 
+        /// <summary>
+        /// Returns the result of `x` raised to the power of `y`.
+        /// </summary>
+        /// <param name="x">The base.</param>
+        /// <param name="y">The exponent.</param>
+        /// <returns>`x` raised to the power of `y`.</returns>
         public static real_t Pow(real_t x, real_t y)
         {
             return (real_t)Math.Pow(x, y);
         }
 
+        /// <summary>
+        /// Converts an angle expressed in radians to degrees.
+        /// </summary>
+        /// <param name="rad">An angle expressed in radians.</param>
+        /// <returns>The same angle expressed in degrees.</returns>
         public static real_t Rad2Deg(real_t rad)
         {
             return rad * Rad2DegConst;
         }
 
+        /// <summary>
+        /// Rounds `s` to the nearest whole number,
+        /// with halfway cases rounded towards the nearest multiple of two.
+        /// </summary>
+        /// <param name="s">The number to round.</param>
+        /// <returns>The rounded number.</returns>
         public static real_t Round(real_t s)
         {
             return (real_t)Math.Round(s);
         }
 
+        /// <summary>
+        /// Returns the sign of `s`: `-1` or `1`. Returns `0` if `s` is `0`.
+        /// </summary>
+        /// <param name="s">The input number.</param>
+        /// <returns>One of three possible values: `1`, `-1`, or `0`.</returns>
         public static int Sign(int s)
         {
             if (s == 0) return 0;
             return s < 0 ? -1 : 1;
         }
 
+        /// <summary>
+        /// Returns the sign of `s`: `-1` or `1`. Returns `0` if `s` is `0`.
+        /// </summary>
+        /// <param name="s">The input number.</param>
+        /// <returns>One of three possible values: `1`, `-1`, or `0`.</returns>
         public static int Sign(real_t s)
         {
             if (s == 0) return 0;
             return s < 0 ? -1 : 1;
         }
 
+        /// <summary>
+        /// Returns the sine of angle `s` in radians.
+        /// </summary>
+        /// <param name="s">The angle in radians.</param>
+        /// <returns>The sine of that angle.</returns>
         public static real_t Sin(real_t s)
         {
             return (real_t)Math.Sin(s);
         }
 
+        /// <summary>
+        /// Returns the hyperbolic sine of angle `s` in radians.
+        /// </summary>
+        /// <param name="s">The angle in radians.</param>
+        /// <returns>The hyperbolic sine of that angle.</returns>
         public static real_t Sinh(real_t s)
         {
             return (real_t)Math.Sinh(s);
         }
 
+        /// <summary>
+        /// Returns a number smoothly interpolated between `from` and `to`,
+        /// based on the `weight`. Similar to <see cref="Lerp(real_t, real_t, real_t)"/>,
+        /// but interpolates faster at the beginning and slower at the end.
+        /// </summary>
+        /// <param name="from">The start value for interpolation.</param>
+        /// <param name="to">The destination value for interpolation.</param>
+        /// <param name="weight">A value representing the amount of interpolation.</param>
+        /// <returns>The resulting value of the interpolation.</returns>
         public static real_t SmoothStep(real_t from, real_t to, real_t weight)
         {
             if (IsEqualApprox(from, to))
@@ -296,11 +569,25 @@ namespace Godot
             return x * x * (3 - 2 * x);
         }
 
+        /// <summary>
+        /// Returns the square root of `s`, where `s` is a non-negative number.
+        ///
+        /// If you need negative inputs, use `System.Numerics.Complex`.
+        /// </summary>
+        /// <param name="s">The input number. Must not be negative.</param>
+        /// <returns>The square root of `s`.</returns>
         public static real_t Sqrt(real_t s)
         {
             return (real_t)Math.Sqrt(s);
         }
 
+        /// <summary>
+        /// Returns the position of the first non-zero digit, after the
+        /// decimal point. Note that the maximum return value is 10,
+        /// which is a design decision in the implementation.
+        /// </summary>
+        /// <param name="step">The input value.</param>
+        /// <returns>The position of the first non-zero digit.</returns>
         public static int StepDecimals(real_t step)
         {
             double[] sd = new double[] {
@@ -326,32 +613,68 @@ namespace Godot
             return 0;
         }
 
+        /// <summary>
+        /// Snaps float value `s` to a given `step`.
+        /// This can also be used to round a floating point
+        /// number to an arbitrary number of decimals.
+        /// </summary>
+        /// <param name="s">The value to stepify.</param>
+        /// <param name="step">The step size to snap to.</param>
+        /// <returns></returns>
         public static real_t Stepify(real_t s, real_t step)
         {
             if (step != 0f)
             {
-                s = Floor(s / step + 0.5f) * step;
+                return Floor(s / step + 0.5f) * step;
             }
 
             return s;
         }
 
+        /// <summary>
+        /// Returns the tangent of angle `s` in radians.
+        /// </summary>
+        /// <param name="s">The angle in radians.</param>
+        /// <returns>The tangent of that angle.</returns>
         public static real_t Tan(real_t s)
         {
             return (real_t)Math.Tan(s);
         }
 
+        /// <summary>
+        /// Returns the hyperbolic tangent of angle `s` in radians.
+        /// </summary>
+        /// <param name="s">The angle in radians.</param>
+        /// <returns>The hyperbolic tangent of that angle.</returns>
         public static real_t Tanh(real_t s)
         {
             return (real_t)Math.Tanh(s);
         }
 
+        /// <summary>
+        /// Wraps `value` between `min` and `max`. Usable for creating loop-alike
+        /// behavior or infinite surfaces. If `min` is `0`, this is equivalent
+        /// to <see cref="PosMod(int, int)"/>, so prefer using that instead.
+        /// </summary>
+        /// <param name="value">The value to wrap.</param>
+        /// <param name="min">The minimum allowed value and lower bound of the range.</param>
+        /// <param name="max">The maximum allowed value and upper bound of the range.</param>
+        /// <returns>The wrapped value.</returns>
         public static int Wrap(int value, int min, int max)
         {
             int range = max - min;
             return range == 0 ? min : min + ((value - min) % range + range) % range;
         }
 
+        /// <summary>
+        /// Wraps `value` between `min` and `max`. Usable for creating loop-alike
+        /// behavior or infinite surfaces. If `min` is `0`, this is equivalent
+        /// to <see cref="PosMod(real_t, real_t)"/>, so prefer using that instead.
+        /// </summary>
+        /// <param name="value">The value to wrap.</param>
+        /// <param name="min">The minimum allowed value and lower bound of the range.</param>
+        /// <param name="max">The maximum allowed value and upper bound of the range.</param>
+        /// <returns>The wrapped value.</returns>
         public static real_t Wrap(real_t value, real_t min, real_t max)
         {
             real_t range = max - min;
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/MathfEx.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/MathfEx.cs
index 1b7fd4906f..c2f4701b5f 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/MathfEx.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/MathfEx.cs
@@ -12,40 +12,89 @@ namespace Godot
     {
         // Define constants with Decimal precision and cast down to double or float.
 
+        /// <summary>
+        /// The natural number `e`.
+        /// </summary>
         public const real_t E = (real_t) 2.7182818284590452353602874714M; // 2.7182817f and 2.718281828459045
+
+        /// <summary>
+        /// The square root of 2.
+        /// </summary>
         public const real_t Sqrt2 = (real_t) 1.4142135623730950488016887242M; // 1.4142136f and 1.414213562373095
 
+        /// <summary>
+        /// A very small number used for float comparison with error tolerance.
+        /// 1e-06 with single-precision floats, but 1e-14 if `REAL_T_IS_DOUBLE`.
+        /// </summary>
 #if REAL_T_IS_DOUBLE
         public const real_t Epsilon = 1e-14; // Epsilon size should depend on the precision used.
 #else
         public const real_t Epsilon = 1e-06f;
 #endif
 
+        /// <summary>
+        /// Returns the amount of digits after the decimal place.
+        /// </summary>
+        /// <param name="s">The input value.</param>
+        /// <returns>The amount of digits.</returns>
         public static int DecimalCount(real_t s)
         {
             return DecimalCount((decimal)s);
         }
 
+        /// <summary>
+        /// Returns the amount of digits after the decimal place.
+        /// </summary>
+        /// <param name="s">The input <see cref="System.Decimal"/> value.</param>
+        /// <returns>The amount of digits.</returns>
         public static int DecimalCount(decimal s)
         {
             return BitConverter.GetBytes(decimal.GetBits(s)[3])[2];
         }
 
+        /// <summary>
+        /// Rounds `s` upward (towards positive infinity).
+        ///
+        /// This is the same as <see cref="Ceil(real_t)"/>, but returns an `int`.
+        /// </summary>
+        /// <param name="s">The number to ceil.</param>
+        /// <returns>The smallest whole number that is not less than `s`.</returns>
         public static int CeilToInt(real_t s)
         {
             return (int)Math.Ceiling(s);
         }
 
+        /// <summary>
+        /// Rounds `s` downward (towards negative infinity).
+        ///
+        /// This is the same as <see cref="Floor(real_t)"/>, but returns an `int`.
+        /// </summary>
+        /// <param name="s">The number to floor.</param>
+        /// <returns>The largest whole number that is not more than `s`.</returns>
         public static int FloorToInt(real_t s)
         {
             return (int)Math.Floor(s);
         }
 
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="s"></param>
+        /// <returns></returns>
         public static int RoundToInt(real_t s)
         {
             return (int)Math.Round(s);
         }
 
+        /// <summary>
+        /// Returns true if `a` and `b` are approximately equal to each other.
+        /// The comparison is done using the provided tolerance value.
+        /// If you want the tolerance to be calculated for you, use <see cref="IsEqualApprox(real_t, real_t)"/>.
+        /// </summary>
+        /// <param name="a">One of the values.</param>
+        /// <param name="b">The other value.</param>
+        /// <param name="tolerance">The pre-calculated tolerance value.</param>
+        /// <returns>A bool for whether or not the two values are equal.</returns>
         public static bool IsEqualApprox(real_t a, real_t b, real_t tolerance)
         {
             // Check for exact equality first, required to handle "infinity" values.
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/NodePath.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/NodePath.cs
index 8c5872ba5a..4ecc55f94e 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/NodePath.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/NodePath.cs
@@ -7,7 +7,7 @@ namespace Godot
     {
         private bool disposed = false;
 
-        internal IntPtr ptr;
+        private IntPtr ptr;
 
         internal static IntPtr GetPtr(NodePath instance)
         {
@@ -50,104 +50,93 @@ namespace Godot
             this.ptr = ptr;
         }
 
-        public IntPtr NativeInstance
-        {
-            get { return ptr; }
-        }
-
         public NodePath() : this(string.Empty) {}
 
         public NodePath(string path)
         {
-            this.ptr = godot_icall_NodePath_Ctor(path);
+            ptr = godot_icall_NodePath_Ctor(path);
         }
 
-        public static implicit operator NodePath(string from)
-        {
-            return new NodePath(from);
-        }
+        public static implicit operator NodePath(string from) => new NodePath(from);
 
-        public static implicit operator string(NodePath from)
-        {
-            return godot_icall_NodePath_operator_String(NodePath.GetPtr(from));
-        }
+        public static implicit operator string(NodePath from) => from.ToString();
 
         public override string ToString()
         {
-            return (string)this;
+            return godot_icall_NodePath_operator_String(GetPtr(this));
         }
 
         public NodePath GetAsPropertyPath()
         {
-            return new NodePath(godot_icall_NodePath_get_as_property_path(NodePath.GetPtr(this)));
+            return new NodePath(godot_icall_NodePath_get_as_property_path(GetPtr(this)));
         }
 
         public string GetConcatenatedSubnames()
         {
-            return godot_icall_NodePath_get_concatenated_subnames(NodePath.GetPtr(this));
+            return godot_icall_NodePath_get_concatenated_subnames(GetPtr(this));
         }
 
         public string GetName(int idx)
         {
-            return godot_icall_NodePath_get_name(NodePath.GetPtr(this), idx);
+            return godot_icall_NodePath_get_name(GetPtr(this), idx);
         }
 
         public int GetNameCount()
         {
-            return godot_icall_NodePath_get_name_count(NodePath.GetPtr(this));
+            return godot_icall_NodePath_get_name_count(GetPtr(this));
         }
 
         public string GetSubname(int idx)
         {
-            return godot_icall_NodePath_get_subname(NodePath.GetPtr(this), idx);
+            return godot_icall_NodePath_get_subname(GetPtr(this), idx);
         }
 
         public int GetSubnameCount()
         {
-            return godot_icall_NodePath_get_subname_count(NodePath.GetPtr(this));
+            return godot_icall_NodePath_get_subname_count(GetPtr(this));
         }
 
         public bool IsAbsolute()
         {
-            return godot_icall_NodePath_is_absolute(NodePath.GetPtr(this));
+            return godot_icall_NodePath_is_absolute(GetPtr(this));
         }
 
         public bool IsEmpty()
         {
-            return godot_icall_NodePath_is_empty(NodePath.GetPtr(this));
+            return godot_icall_NodePath_is_empty(GetPtr(this));
         }
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        internal extern static IntPtr godot_icall_NodePath_Ctor(string path);
+        private static extern IntPtr godot_icall_NodePath_Ctor(string path);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        internal extern static void godot_icall_NodePath_Dtor(IntPtr ptr);
+        private static extern void godot_icall_NodePath_Dtor(IntPtr ptr);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        internal extern static string godot_icall_NodePath_operator_String(IntPtr ptr);
+        private static extern string godot_icall_NodePath_operator_String(IntPtr ptr);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        internal extern static IntPtr godot_icall_NodePath_get_as_property_path(IntPtr ptr);
+        private static extern IntPtr godot_icall_NodePath_get_as_property_path(IntPtr ptr);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        internal extern static string godot_icall_NodePath_get_concatenated_subnames(IntPtr ptr);
+        private static extern string godot_icall_NodePath_get_concatenated_subnames(IntPtr ptr);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        internal extern static string godot_icall_NodePath_get_name(IntPtr ptr, int arg1);
+        private static extern string godot_icall_NodePath_get_name(IntPtr ptr, int arg1);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        internal extern static int godot_icall_NodePath_get_name_count(IntPtr ptr);
+        private static extern int godot_icall_NodePath_get_name_count(IntPtr ptr);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        internal extern static string godot_icall_NodePath_get_subname(IntPtr ptr, int arg1);
+        private static extern string godot_icall_NodePath_get_subname(IntPtr ptr, int arg1);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        internal extern static int godot_icall_NodePath_get_subname_count(IntPtr ptr);
+        private static extern int godot_icall_NodePath_get_subname_count(IntPtr ptr);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        internal extern static bool godot_icall_NodePath_is_absolute(IntPtr ptr);
+        private static extern bool godot_icall_NodePath_is_absolute(IntPtr ptr);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        internal extern static bool godot_icall_NodePath_is_empty(IntPtr ptr);
+        private static extern bool godot_icall_NodePath_is_empty(IntPtr ptr);
     }
 }
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Object.base.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Object.base.cs
index de80f7fddc..42610c5ef7 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Object.base.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Object.base.cs
@@ -7,7 +7,7 @@ namespace Godot
     {
         private bool disposed = false;
 
-        private const string nativeName = "Object";
+        private static StringName nativeName = "Object";
 
         internal IntPtr ptr;
         internal bool memoryOwn;
@@ -15,7 +15,14 @@ namespace Godot
         public Object() : this(false)
         {
             if (ptr == IntPtr.Zero)
+            {
                 ptr = godot_icall_Object_Ctor(this);
+            }
+            else
+            {
+                // This is called inside godot_icall_Object_Ctor, so we must call it as well in this case.
+                godot_icall_Object_ConnectEventSignals(ptr);
+            }
         }
 
         internal Object(bool memoryOwn)
@@ -101,7 +108,7 @@ namespace Godot
         /// }
         /// </code>
         /// </example>
-        public SignalAwaiter ToSignal(Object source, string signal)
+        public SignalAwaiter ToSignal(Object source, StringName signal)
         {
             return new SignalAwaiter(source, signal, this);
         }
@@ -111,20 +118,28 @@ namespace Godot
         /// </summary>
         public dynamic DynamicObject => new DynamicGodotObject(this);
 
+        internal static IntPtr __ClassDB_get_method(StringName type, string method)
+        {
+            return godot_icall_Object_ClassDB_get_method(StringName.GetPtr(type), method);
+        }
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern IntPtr godot_icall_Object_Ctor(Object obj);
+
         [MethodImpl(MethodImplOptions.InternalCall)]
-        internal extern static IntPtr godot_icall_Object_Ctor(Object obj);
+        internal static extern void godot_icall_Object_Disposed(Object obj, IntPtr ptr);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        internal extern static void godot_icall_Object_Disposed(Object obj, IntPtr ptr);
+        internal static extern void godot_icall_Reference_Disposed(Object obj, IntPtr ptr, bool isFinalizer);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        internal extern static void godot_icall_Reference_Disposed(Object obj, IntPtr ptr, bool isFinalizer);
+        internal static extern void godot_icall_Object_ConnectEventSignals(IntPtr obj);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        internal extern static string godot_icall_Object_ToString(IntPtr ptr);
+        internal static extern string godot_icall_Object_ToString(IntPtr ptr);
 
         // Used by the generated API
         [MethodImpl(MethodImplOptions.InternalCall)]
-        internal extern static IntPtr godot_icall_Object_ClassDB_get_method(string type, string method);
+        internal static extern IntPtr godot_icall_Object_ClassDB_get_method(IntPtr type, string method);
     }
 }
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Plane.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Plane.cs
index 885845e3a4..2f8b5f297c 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Plane.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Plane.cs
@@ -8,18 +8,33 @@ using real_t = System.Single;
 
 namespace Godot
 {
+    /// <summary>
+    /// Plane represents a normalized plane equation.
+    /// "Over" or "Above" the plane is considered the side of
+    /// the plane towards where the normal is pointing.
+    /// </summary>
     [Serializable]
     [StructLayout(LayoutKind.Sequential)]
     public struct Plane : IEquatable<Plane>
     {
         private Vector3 _normal;
 
+        /// <summary>
+        /// The normal of the plane, which must be normalized.
+        /// In the scalar equation of the plane `ax + by + cz = d`, this is
+        /// the vector `(a, b, c)`, where `d` is the <see cref="D"/> property.
+        /// </summary>
+        /// <value>Equivalent to `x`, `y`, and `z`.</value>
         public Vector3 Normal
         {
             get { return _normal; }
             set { _normal = value; }
         }
 
+        /// <summary>
+        /// The X component of the plane's normal vector.
+        /// </summary>
+        /// <value>Equivalent to <see cref="Normal"/>'s X value.</value>
         public real_t x
         {
             get
@@ -32,6 +47,10 @@ namespace Godot
             }
         }
 
+        /// <summary>
+        /// The Y component of the plane's normal vector.
+        /// </summary>
+        /// <value>Equivalent to <see cref="Normal"/>'s Y value.</value>
         public real_t y
         {
             get
@@ -44,6 +63,10 @@ namespace Godot
             }
         }
 
+        /// <summary>
+        /// The Z component of the plane's normal vector.
+        /// </summary>
+        /// <value>Equivalent to <see cref="Normal"/>'s Z value.</value>
         public real_t z
         {
             get
@@ -56,38 +79,71 @@ namespace Godot
             }
         }
 
+        /// <summary>
+        /// The distance from the origin to the plane (in the direction of
+        /// <see cref="Normal"/>). This value is typically non-negative.
+        /// In the scalar equation of the plane `ax + by + cz = d`,
+        /// this is `d`, while the `(a, b, c)` coordinates are represented
+        /// by the <see cref="Normal"/> property.
+        /// </summary>
+        /// <value>The plane's distance from the origin.</value>
         public real_t D { get; set; }
 
+        /// <summary>
+        /// The center of the plane, the point where the normal line intersects the plane.
+        /// </summary>
+        /// <value>Equivalent to <see cref="Normal"/> multiplied by `D`.</value>
         public Vector3 Center
         {
             get
             {
                 return _normal * D;
             }
+            set
+            {
+                _normal = value.Normalized();
+                D = value.Length();
+            }
         }
 
+        /// <summary>
+        /// Returns the shortest distance from this plane to the position `point`.
+        /// </summary>
+        /// <param name="point">The position to use for the calculation.</param>
+        /// <returns>The shortest distance.</returns>
         public real_t DistanceTo(Vector3 point)
         {
             return _normal.Dot(point) - D;
         }
 
-        public Vector3 GetAnyPoint()
-        {
-            return _normal * D;
-        }
-
+        /// <summary>
+        /// Returns true if point is inside the plane.
+        /// Comparison uses a custom minimum epsilon threshold.
+        /// </summary>
+        /// <param name="point">The point to check.</param>
+        /// <param name="epsilon">The tolerance threshold.</param>
+        /// <returns>A bool for whether or not the plane has the point.</returns>
         public bool HasPoint(Vector3 point, real_t epsilon = Mathf.Epsilon)
         {
             real_t dist = _normal.Dot(point) - D;
             return Mathf.Abs(dist) <= epsilon;
         }
 
+        /// <summary>
+        /// Returns the intersection point of the three planes: `b`, `c`,
+        /// and this plane. If no intersection is found, `null` is returned.
+        /// </summary>
+        /// <param name="b">One of the three planes to use in the calculation.</param>
+        /// <param name="c">One of the three planes to use in the calculation.</param>
+        /// <returns>The intersection, or `null` if none is found.</returns>
         public Vector3? Intersect3(Plane b, Plane c)
         {
             real_t denom = _normal.Cross(b._normal).Dot(c._normal);
 
             if (Mathf.IsZeroApprox(denom))
+            {
                 return null;
+            }
 
             Vector3 result = b._normal.Cross(c._normal) * D +
                                 c._normal.Cross(_normal) * b.D +
@@ -96,54 +152,94 @@ namespace Godot
             return result / denom;
         }
 
+        /// <summary>
+        /// Returns the intersection point of a ray consisting of the
+        /// position `from` and the direction normal `dir` with this plane.
+        /// If no intersection is found, `null` is returned.
+        /// </summary>
+        /// <param name="from">The start of the ray.</param>
+        /// <param name="dir">The direction of the ray, normalized.</param>
+        /// <returns>The intersection, or `null` if none is found.</returns>
         public Vector3? IntersectRay(Vector3 from, Vector3 dir)
         {
             real_t den = _normal.Dot(dir);
 
             if (Mathf.IsZeroApprox(den))
+            {
                 return null;
+            }
 
             real_t dist = (_normal.Dot(from) - D) / den;
 
             // This is a ray, before the emitting pos (from) does not exist
             if (dist > Mathf.Epsilon)
+            {
                 return null;
+            }
 
             return from + dir * -dist;
         }
 
+        /// <summary>
+        /// Returns the intersection point of a line segment from
+        /// position `begin` to position `end` with this plane.
+        /// If no intersection is found, `null` is returned.
+        /// </summary>
+        /// <param name="begin">The start of the line segment.</param>
+        /// <param name="end">The end of the line segment.</param>
+        /// <returns>The intersection, or `null` if none is found.</returns>
         public Vector3? IntersectSegment(Vector3 begin, Vector3 end)
         {
             Vector3 segment = begin - end;
             real_t den = _normal.Dot(segment);
 
             if (Mathf.IsZeroApprox(den))
+            {
                 return null;
+            }
 
             real_t dist = (_normal.Dot(begin) - D) / den;
 
             // Only allow dist to be in the range of 0 to 1, with tolerance.
             if (dist < -Mathf.Epsilon || dist > 1.0f + Mathf.Epsilon)
+            {
                 return null;
+            }
 
             return begin + segment * -dist;
         }
 
+        /// <summary>
+        /// Returns true if `point` is located above the plane.
+        /// </summary>
+        /// <param name="point">The point to check.</param>
+        /// <returns>A bool for whether or not the point is above the plane.</returns>
         public bool IsPointOver(Vector3 point)
         {
             return _normal.Dot(point) > D;
         }
 
+        /// <summary>
+        /// Returns the plane scaled to unit length.
+        /// </summary>
+        /// <returns>A normalized version of the plane.</returns>
         public Plane Normalized()
         {
             real_t len = _normal.Length();
 
             if (len == 0)
+            {
                 return new Plane(0, 0, 0, 0);
+            }
 
             return new Plane(_normal / len, D / len);
         }
 
+        /// <summary>
+        /// Returns the orthogonal projection of `point` into the plane.
+        /// </summary>
+        /// <param name="point">The point to project.</param>
+        /// <returns>The projected point.</returns>
         public Vector3 Project(Vector3 point)
         {
             return point - _normal * DistanceTo(point);
@@ -154,22 +250,56 @@ namespace Godot
         private static readonly Plane _planeXZ = new Plane(0, 1, 0, 0);
         private static readonly Plane _planeXY = new Plane(0, 0, 1, 0);
 
+        /// <summary>
+        /// A plane that extends in the Y and Z axes (normal vector points +X).
+        /// </summary>
+        /// <value>Equivalent to `new Plane(1, 0, 0, 0)`.</value>
         public static Plane PlaneYZ { get { return _planeYZ; } }
+
+        /// <summary>
+        /// A plane that extends in the X and Z axes (normal vector points +Y).
+        /// </summary>
+        /// <value>Equivalent to `new Plane(0, 1, 0, 0)`.</value>
         public static Plane PlaneXZ { get { return _planeXZ; } }
+
+        /// <summary>
+        /// A plane that extends in the X and Y axes (normal vector points +Z).
+        /// </summary>
+        /// <value>Equivalent to `new Plane(0, 0, 1, 0)`.</value>
         public static Plane PlaneXY { get { return _planeXY; } }
 
-        // Constructors
+        /// <summary>
+        /// Constructs a plane from four values. `a`, `b` and `c` become the
+        /// components of the resulting plane's <see cref="Normal"/> vector.
+        /// `d` becomes the plane's distance from the origin.
+        /// </summary>
+        /// <param name="a">The X component of the plane's normal vector.</param>
+        /// <param name="b">The Y component of the plane's normal vector.</param>
+        /// <param name="c">The Z component of the plane's normal vector.</param>
+        /// <param name="d">The plane's distance from the origin. This value is typically non-negative.</param>
         public Plane(real_t a, real_t b, real_t c, real_t d)
         {
             _normal = new Vector3(a, b, c);
             this.D = d;
         }
+
+        /// <summary>
+        /// Constructs a plane from a normal vector and the plane's distance to the origin.
+        /// </summary>
+        /// <param name="normal">The normal of the plane, must be normalized.</param>
+        /// <param name="d">The plane's distance from the origin. This value is typically non-negative.</param>
         public Plane(Vector3 normal, real_t d)
         {
             this._normal = normal;
             this.D = d;
         }
 
+        /// <summary>
+        /// Constructs a plane from the three points, given in clockwise order.
+        /// </summary>
+        /// <param name="v1">The first point.</param>
+        /// <param name="v2">The second point.</param>
+        /// <param name="v3">The third point.</param>
         public Plane(Vector3 v1, Vector3 v2, Vector3 v3)
         {
             _normal = (v1 - v3).Cross(v1 - v2);
@@ -207,6 +337,12 @@ namespace Godot
             return _normal == other._normal && D == other.D;
         }
 
+        /// <summary>
+        /// Returns true if this plane and `other` are approximately equal, by running
+        /// <see cref="Mathf.IsEqualApprox(real_t, real_t)"/> on each component.
+        /// </summary>
+        /// <param name="other">The other plane to compare.</param>
+        /// <returns>Whether or not the planes are approximately equal.</returns>
         public bool IsEqualApprox(Plane other)
         {
             return _normal.IsEqualApprox(other._normal) && Mathf.IsEqualApprox(D, other.D);
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Quat.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Quat.cs
index 6702634c51..b33490f9cb 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Quat.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Quat.cs
@@ -8,15 +8,51 @@ using real_t = System.Single;
 
 namespace Godot
 {
+    /// <summary>
+    /// A unit quaternion used for representing 3D rotations.
+    /// Quaternions need to be normalized to be used for rotation.
+    ///
+    /// It is similar to Basis, which implements matrix representation of
+    /// rotations, and can be parametrized using both an axis-angle pair
+    /// or Euler angles. Basis stores rotation, scale, and shearing,
+    /// while Quat only stores rotation.
+    ///
+    /// Due to its compactness and the way it is stored in memory, certain
+    /// operations (obtaining axis-angle and performing SLERP, in particular)
+    /// are more efficient and robust against floating-point errors.
+    /// </summary>
     [Serializable]
     [StructLayout(LayoutKind.Sequential)]
     public struct Quat : IEquatable<Quat>
     {
+        /// <summary>
+        /// X component of the quaternion (imaginary `i` axis part).
+        /// Quaternion components should usually not be manipulated directly.
+        /// </summary>
         public real_t x;
+
+        /// <summary>
+        /// Y component of the quaternion (imaginary `j` axis part).
+        /// Quaternion components should usually not be manipulated directly.
+        /// </summary>
         public real_t y;
+
+        /// <summary>
+        /// Z component of the quaternion (imaginary `k` axis part).
+        /// Quaternion components should usually not be manipulated directly.
+        /// </summary>
         public real_t z;
+
+        /// <summary>
+        /// W component of the quaternion (real part).
+        /// Quaternion components should usually not be manipulated directly.
+        /// </summary>
         public real_t w;
 
+        /// <summary>
+        /// Access quaternion components using their index.
+        /// </summary>
+        /// <value>`[0]` is equivalent to `.x`, `[1]` is equivalent to `.y`, `[2]` is equivalent to `.z`, `[3]` is equivalent to `.w`.</value>
         public real_t this[int index]
         {
             get
@@ -57,16 +93,35 @@ namespace Godot
             }
         }
 
+        /// <summary>
+        /// Returns the length (magnitude) of the quaternion.
+        /// </summary>
+        /// <value>Equivalent to `Mathf.Sqrt(LengthSquared)`.</value>
         public real_t Length
         {
             get { return Mathf.Sqrt(LengthSquared); }
         }
 
+        /// <summary>
+        /// Returns the squared length (squared magnitude) of the quaternion.
+        /// This method runs faster than <see cref="Length"/>, so prefer it if
+        /// you need to compare quaternions or need the squared length for some formula.
+        /// </summary>
+        /// <value>Equivalent to `Dot(this)`.</value>
         public real_t LengthSquared
         {
             get { return Dot(this); }
         }
 
+        /// <summary>
+        /// Performs a cubic spherical interpolation between quaternions `preA`,
+        /// this vector, `b`, and `postB`, by the given amount `t`.
+        /// </summary>
+        /// <param name="b">The destination quaternion.</param>
+        /// <param name="preA">A quaternion before this quaternion.</param>
+        /// <param name="postB">A quaternion after `b`.</param>
+        /// <param name="t">A value on the range of 0.0 to 1.0, representing the amount of interpolation.</param>
+        /// <returns>The interpolated quaternion.</returns>
         public Quat CubicSlerp(Quat b, Quat preA, Quat postB, real_t t)
         {
             real_t t2 = (1.0f - t) * t * 2f;
@@ -75,112 +130,131 @@ namespace Godot
             return sp.Slerpni(sq, t2);
         }
 
+        /// <summary>
+        /// Returns the dot product of two quaternions.
+        /// </summary>
+        /// <param name="b">The other quaternion.</param>
+        /// <returns>The dot product.</returns>
         public real_t Dot(Quat b)
         {
             return x * b.x + y * b.y + z * b.z + w * b.w;
         }
 
+        /// <summary>
+        /// Returns Euler angles (in the YXZ convention: when decomposing,
+        /// first Z, then X, and Y last) corresponding to the rotation
+        /// represented by the unit quaternion. Returned vector contains
+        /// the rotation angles in the format (X angle, Y angle, Z angle).
+        /// </summary>
+        /// <returns>The Euler angle representation of this quaternion.</returns>
         public Vector3 GetEuler()
         {
 #if DEBUG
             if (!IsNormalized())
+            {
                 throw new InvalidOperationException("Quat is not normalized");
+            }
 #endif
             var basis = new Basis(this);
             return basis.GetEuler();
         }
 
+        /// <summary>
+        /// Returns the inverse of the quaternion.
+        /// </summary>
+        /// <returns>The inverse quaternion.</returns>
         public Quat Inverse()
         {
 #if DEBUG
             if (!IsNormalized())
+            {
                 throw new InvalidOperationException("Quat is not normalized");
+            }
 #endif
             return new Quat(-x, -y, -z, w);
         }
 
-        public Quat Normalized()
-        {
-            return this / Length;
-        }
-
-        [Obsolete("Set is deprecated. Use the Quat(" + nameof(real_t) + ", " + nameof(real_t) + ", " + nameof(real_t) + ", " + nameof(real_t) + ") constructor instead.", error: true)]
-        public void Set(real_t x, real_t y, real_t z, real_t w)
-        {
-            this.x = x;
-            this.y = y;
-            this.z = z;
-            this.w = w;
-        }
-
-        [Obsolete("Set is deprecated. Use the Quat(" + nameof(Quat) + ") constructor instead.", error: true)]
-        public void Set(Quat q)
-        {
-            this = q;
-        }
-
-        [Obsolete("SetAxisAngle is deprecated. Use the Quat(" + nameof(Vector3) + ", " + nameof(real_t) + ") constructor instead.", error: true)]
-        public void SetAxisAngle(Vector3 axis, real_t angle)
+        /// <summary>
+        /// Returns whether the quaternion is normalized or not.
+        /// </summary>
+        /// <returns>A bool for whether the quaternion is normalized or not.</returns>
+        public bool IsNormalized()
         {
-            this = new Quat(axis, angle);
+            return Mathf.Abs(LengthSquared - 1) <= Mathf.Epsilon;
         }
 
-        [Obsolete("SetEuler is deprecated. Use the Quat(" + nameof(Vector3) + ") constructor instead.", error: true)]
-        public void SetEuler(Vector3 eulerYXZ)
+        /// <summary>
+        /// Returns a copy of the quaternion, normalized to unit length.
+        /// </summary>
+        /// <returns>The normalized quaternion.</returns>
+        public Quat Normalized()
         {
-            this = new Quat(eulerYXZ);
+            return this / Length;
         }
 
-        public Quat Slerp(Quat b, real_t t)
+        /// <summary>
+        /// Returns the result of the spherical linear interpolation between
+        /// this quaternion and `to` by amount `weight`.
+        ///
+        /// Note: Both quaternions must be normalized.
+        /// </summary>
+        /// <param name="to">The destination quaternion for interpolation. Must be normalized.</param>
+        /// <param name="weight">A value on the range of 0.0 to 1.0, representing the amount of interpolation.</param>
+        /// <returns>The resulting quaternion of the interpolation.</returns>
+        public Quat Slerp(Quat to, real_t weight)
         {
 #if DEBUG
             if (!IsNormalized())
+            {
                 throw new InvalidOperationException("Quat is not normalized");
-            if (!b.IsNormalized())
-                throw new ArgumentException("Argument is not normalized", nameof(b));
+            }
+            if (!to.IsNormalized())
+            {
+                throw new ArgumentException("Argument is not normalized", nameof(to));
+            }
 #endif
 
-            // Calculate cosine
-            real_t cosom = x * b.x + y * b.y + z * b.z + w * b.w;
+            // Calculate cosine.
+            real_t cosom = x * to.x + y * to.y + z * to.z + w * to.w;
 
             var to1 = new Quat();
 
-            // Adjust signs if necessary
+            // Adjust signs if necessary.
             if (cosom < 0.0)
             {
                 cosom = -cosom;
-                to1.x = -b.x;
-                to1.y = -b.y;
-                to1.z = -b.z;
-                to1.w = -b.w;
+                to1.x = -to.x;
+                to1.y = -to.y;
+                to1.z = -to.z;
+                to1.w = -to.w;
             }
             else
             {
-                to1.x = b.x;
-                to1.y = b.y;
-                to1.z = b.z;
-                to1.w = b.w;
+                to1.x = to.x;
+                to1.y = to.y;
+                to1.z = to.z;
+                to1.w = to.w;
             }
 
             real_t sinom, scale0, scale1;
 
-            // Calculate coefficients
+            // Calculate coefficients.
             if (1.0 - cosom > Mathf.Epsilon)
             {
-                // Standard case (Slerp)
+                // Standard case (Slerp).
                 real_t omega = Mathf.Acos(cosom);
                 sinom = Mathf.Sin(omega);
-                scale0 = Mathf.Sin((1.0f - t) * omega) / sinom;
-                scale1 = Mathf.Sin(t * omega) / sinom;
+                scale0 = Mathf.Sin((1.0f - weight) * omega) / sinom;
+                scale1 = Mathf.Sin(weight * omega) / sinom;
             }
             else
             {
-                // Quaternions are very close so we can do a linear interpolation
-                scale0 = 1.0f - t;
-                scale1 = t;
+                // Quaternions are very close so we can do a linear interpolation.
+                scale0 = 1.0f - weight;
+                scale1 = weight;
             }
 
-            // Calculate final values
+            // Calculate final values.
             return new Quat
             (
                 scale0 * x + scale1 * to1.x,
@@ -190,9 +264,17 @@ namespace Godot
             );
         }
 
-        public Quat Slerpni(Quat b, real_t t)
+        /// <summary>
+        /// Returns the result of the spherical linear interpolation between
+        /// this quaternion and `to` by amount `weight`, but without
+        /// checking if the rotation path is not bigger than 90 degrees.
+        /// </summary>
+        /// <param name="to">The destination quaternion for interpolation. Must be normalized.</param>
+        /// <param name="weight">A value on the range of 0.0 to 1.0, representing the amount of interpolation.</param>
+        /// <returns>The resulting quaternion of the interpolation.</returns>
+        public Quat Slerpni(Quat to, real_t weight)
         {
-            real_t dot = Dot(b);
+            real_t dot = Dot(to);
 
             if (Mathf.Abs(dot) > 0.9999f)
             {
@@ -201,33 +283,54 @@ namespace Godot
 
             real_t theta = Mathf.Acos(dot);
             real_t sinT = 1.0f / Mathf.Sin(theta);
-            real_t newFactor = Mathf.Sin(t * theta) * sinT;
-            real_t invFactor = Mathf.Sin((1.0f - t) * theta) * sinT;
+            real_t newFactor = Mathf.Sin(weight * theta) * sinT;
+            real_t invFactor = Mathf.Sin((1.0f - weight) * theta) * sinT;
 
             return new Quat
             (
-                invFactor * x + newFactor * b.x,
-                invFactor * y + newFactor * b.y,
-                invFactor * z + newFactor * b.z,
-                invFactor * w + newFactor * b.w
+                invFactor * x + newFactor * to.x,
+                invFactor * y + newFactor * to.y,
+                invFactor * z + newFactor * to.z,
+                invFactor * w + newFactor * to.w
             );
         }
 
+        /// <summary>
+        /// Returns a vector transformed (multiplied) by this quaternion.
+        /// </summary>
+        /// <param name="v">A vector to transform.</param>
+        /// <returns>The transformed vector.</returns>
         public Vector3 Xform(Vector3 v)
         {
 #if DEBUG
             if (!IsNormalized())
+            {
                 throw new InvalidOperationException("Quat is not normalized");
+            }
 #endif
             var u = new Vector3(x, y, z);
             Vector3 uv = u.Cross(v);
             return v + ((uv * w) + u.Cross(uv)) * 2;
         }
 
-        // Static Readonly Properties
-        public static Quat Identity { get; } = new Quat(0f, 0f, 0f, 1f);
-
-        // Constructors
+        // Constants
+        private static readonly Quat _identity = new Quat(0, 0, 0, 1);
+
+        /// <summary>
+        /// The identity quaternion, representing no rotation.
+        /// Equivalent to an identity <see cref="Basis"/> matrix. If a vector is transformed by
+        /// an identity quaternion, it will not change.
+        /// </summary>
+        /// <value>Equivalent to `new Quat(0, 0, 0, 1)`.</value>
+        public static Quat Identity { get { return _identity; } }
+
+        /// <summary>
+        /// Constructs a quaternion defined by the given values.
+        /// </summary>
+        /// <param name="x">X component of the quaternion (imaginary `i` axis part).</param>
+        /// <param name="y">Y component of the quaternion (imaginary `j` axis part).</param>
+        /// <param name="z">Z component of the quaternion (imaginary `k` axis part).</param>
+        /// <param name="w">W component of the quaternion (real part).</param>
         public Quat(real_t x, real_t y, real_t z, real_t w)
         {
             this.x = x;
@@ -236,21 +339,31 @@ namespace Godot
             this.w = w;
         }
 
-        public bool IsNormalized()
-        {
-            return Mathf.Abs(LengthSquared - 1) <= Mathf.Epsilon;
-        }
-
+        /// <summary>
+        /// Constructs a quaternion from the given quaternion.
+        /// </summary>
+        /// <param name="q">The existing quaternion.</param>
         public Quat(Quat q)
         {
             this = q;
         }
 
+        /// <summary>
+        /// Constructs a quaternion from the given <see cref="Basis"/>.
+        /// </summary>
+        /// <param name="basis">The basis to construct from.</param>
         public Quat(Basis basis)
         {
             this = basis.Quat();
         }
 
+        /// <summary>
+        /// Constructs a quaternion that will perform a rotation specified by
+        /// Euler angles (in the YXZ convention: when decomposing,
+        /// first Z, then X, and Y last),
+        /// given in the vector format as (X angle, Y angle, Z angle).
+        /// </summary>
+        /// <param name="eulerYXZ"></param>
         public Quat(Vector3 eulerYXZ)
         {
             real_t half_a1 = eulerYXZ.y * 0.5f;
@@ -274,11 +387,19 @@ namespace Godot
             w = sin_a1 * sin_a2 * sin_a3 + cos_a1 * cos_a2 * cos_a3;
         }
 
+        /// <summary>
+        /// Constructs a quaternion that will rotate around the given axis
+        /// by the specified angle. The axis must be a normalized vector.
+        /// </summary>
+        /// <param name="axis">The axis to rotate around. Must be normalized.</param>
+        /// <param name="angle">The angle to rotate, in radians.</param>
         public Quat(Vector3 axis, real_t angle)
         {
 #if DEBUG
             if (!axis.IsNormalized())
+            {
                 throw new ArgumentException("Argument is not normalized", nameof(axis));
+            }
 #endif
 
             real_t d = axis.Length();
@@ -391,6 +512,12 @@ namespace Godot
             return x == other.x && y == other.y && z == other.z && w == other.w;
         }
 
+        /// <summary>
+        /// Returns true if this quaternion and `other` are approximately equal, by running
+        /// <see cref="Mathf.IsEqualApprox(real_t, real_t)"/> on each component.
+        /// </summary>
+        /// <param name="other">The other quaternion to compare.</param>
+        /// <returns>Whether or not the quaternions are approximately equal.</returns>
         public bool IsEqualApprox(Quat other)
         {
             return Mathf.IsEqualApprox(x, other.x) && Mathf.IsEqualApprox(y, other.y) && Mathf.IsEqualApprox(z, other.z) && Mathf.IsEqualApprox(w, other.w);
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Rect2.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Rect2.cs
index 91e614dc7b..f7703c77cc 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Rect2.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Rect2.cs
@@ -8,6 +8,10 @@ using real_t = System.Single;
 
 namespace Godot
 {
+    /// <summary>
+    /// 2D axis-aligned bounding box. Rect2 consists of a position, a size, and
+    /// several utility functions. It is typically used for fast overlap tests.
+    /// </summary>
     [Serializable]
     [StructLayout(LayoutKind.Sequential)]
     public struct Rect2 : IEquatable<Rect2>
@@ -15,29 +19,52 @@ namespace Godot
         private Vector2 _position;
         private Vector2 _size;
 
+        /// <summary>
+        /// Beginning corner. Typically has values lower than End.
+        /// </summary>
+        /// <value>Directly uses a private field.</value>
         public Vector2 Position
         {
             get { return _position; }
             set { _position = value; }
         }
 
+        /// <summary>
+        /// Size from Position to End. Typically all components are positive.
+        /// If the size is negative, you can use <see cref="Abs"/> to fix it.
+        /// </summary>
+        /// <value>Directly uses a private field.</value>
         public Vector2 Size
         {
             get { return _size; }
             set { _size = value; }
         }
 
+        /// <summary>
+        /// Ending corner. This is calculated as <see cref="Position"/> plus
+        /// <see cref="Size"/>. Setting this value will change the size.
+        /// </summary>
+        /// <value>Getting is equivalent to `value = Position + Size`, setting is equivalent to `Size = value - Position`.</value>
         public Vector2 End
         {
             get { return _position + _size; }
             set { _size = value - _position; }
         }
 
+        /// <summary>
+        /// The area of this rect.
+        /// </summary>
+        /// <value>Equivalent to <see cref="GetArea()"/>.</value>
         public real_t Area
         {
             get { return GetArea(); }
         }
 
+        /// <summary>
+        /// Returns a Rect2 with equivalent position and size, modified so that
+        /// the top-left corner is the origin and width and height are positive.
+        /// </summary>
+        /// <returns>The modified rect.</returns>
         public Rect2 Abs()
         {
             Vector2 end = End;
@@ -45,12 +72,19 @@ namespace Godot
             return new Rect2(topLeft, _size.Abs());
         }
 
+        /// <summary>
+        /// Returns the intersection of this Rect2 and `b`.
+        /// </summary>
+        /// <param name="b">The other rect.</param>
+        /// <returns>The clipped rect.</returns>
         public Rect2 Clip(Rect2 b)
         {
             var newRect = b;
 
             if (!Intersects(newRect))
+            {
                 return new Rect2();
+            }
 
             newRect._position.x = Mathf.Max(b._position.x, _position.x);
             newRect._position.y = Mathf.Max(b._position.y, _position.y);
@@ -64,6 +98,11 @@ namespace Godot
             return newRect;
         }
 
+        /// <summary>
+        /// Returns true if this Rect2 completely encloses another one.
+        /// </summary>
+        /// <param name="b">The other rect that may be enclosed.</param>
+        /// <returns>A bool for whether or not this rect encloses `b`.</returns>
         public bool Encloses(Rect2 b)
         {
             return b._position.x >= _position.x && b._position.y >= _position.y &&
@@ -71,6 +110,11 @@ namespace Godot
                b._position.y + b._size.y < _position.y + _size.y;
         }
 
+        /// <summary>
+        /// Returns this Rect2 expanded to include a given point.
+        /// </summary>
+        /// <param name="to">The point to include.</param>
+        /// <returns>The expanded rect.</returns>
         public Rect2 Expand(Vector2 to)
         {
             var expanded = this;
@@ -79,14 +123,22 @@ namespace Godot
             Vector2 end = expanded._position + expanded._size;
 
             if (to.x < begin.x)
+            {
                 begin.x = to.x;
+            }
             if (to.y < begin.y)
+            {
                 begin.y = to.y;
+            }
 
             if (to.x > end.x)
+            {
                 end.x = to.x;
+            }
             if (to.y > end.y)
+            {
                 end.y = to.y;
+            }
 
             expanded._position = begin;
             expanded._size = end - begin;
@@ -94,11 +146,20 @@ namespace Godot
             return expanded;
         }
 
+        /// <summary>
+        /// Returns the area of the Rect2.
+        /// </summary>
+        /// <returns>The area.</returns>
         public real_t GetArea()
         {
             return _size.x * _size.y;
         }
 
+        /// <summary>
+        /// Returns a copy of the Rect2 grown a given amount of units towards all the sides.
+        /// </summary>
+        /// <param name="by">The amount to grow by.</param>
+        /// <returns>The grown rect.</returns>
         public Rect2 Grow(real_t by)
         {
             var g = this;
@@ -111,6 +172,14 @@ namespace Godot
             return g;
         }
 
+        /// <summary>
+        /// Returns a copy of the Rect2 grown a given amount of units towards each direction individually.
+        /// </summary>
+        /// <param name="left">The amount to grow by on the left.</param>
+        /// <param name="top">The amount to grow by on the top.</param>
+        /// <param name="right">The amount to grow by on the right.</param>
+        /// <param name="bottom">The amount to grow by on the bottom.</param>
+        /// <returns>The grown rect.</returns>
         public Rect2 GrowIndividual(real_t left, real_t top, real_t right, real_t bottom)
         {
             var g = this;
@@ -123,11 +192,17 @@ namespace Godot
             return g;
         }
 
+        /// <summary>
+        /// Returns a copy of the Rect2 grown a given amount of units towards the <see cref="Margin"/> direction.
+        /// </summary>
+        /// <param name="margin">The direction to grow in.</param>
+        /// <param name="by">The amount to grow by.</param>
+        /// <returns>The grown rect.</returns>
         public Rect2 GrowMargin(Margin margin, real_t by)
         {
             var g = this;
 
-            g.GrowIndividual(Margin.Left == margin ? by : 0,
+            g = g.GrowIndividual(Margin.Left == margin ? by : 0,
                     Margin.Top == margin ? by : 0,
                     Margin.Right == margin ? by : 0,
                     Margin.Bottom == margin ? by : 0);
@@ -135,11 +210,20 @@ namespace Godot
             return g;
         }
 
+        /// <summary>
+        /// Returns true if the Rect2 is flat or empty, or false otherwise.
+        /// </summary>
+        /// <returns>A bool for whether or not the rect has area.</returns>
         public bool HasNoArea()
         {
             return _size.x <= 0 || _size.y <= 0;
         }
 
+        /// <summary>
+        /// Returns true if the Rect2 contains a point, or false otherwise.
+        /// </summary>
+        /// <param name="point">The point to check.</param>
+        /// <returns>A bool for whether or not the rect contains `point`.</returns>
         public bool HasPoint(Vector2 point)
         {
             if (point.x < _position.x)
@@ -155,20 +239,65 @@ namespace Godot
             return true;
         }
 
-        public bool Intersects(Rect2 b)
+        /// <summary>
+        /// Returns true if the Rect2 overlaps with `b`
+        /// (i.e. they have at least one point in common).
+        ///
+        /// If `includeBorders` is true, they will also be considered overlapping
+        /// if their borders touch, even without intersection.
+        /// </summary>
+        /// <param name="b">The other rect to check for intersections with.</param>
+        /// <param name="includeBorders">Whether or not to consider borders.</param>
+        /// <returns>A bool for whether or not they are intersecting.</returns>
+        public bool Intersects(Rect2 b, bool includeBorders = false)
         {
-            if (_position.x >= b._position.x + b._size.x)
-                return false;
-            if (_position.x + _size.x <= b._position.x)
-                return false;
-            if (_position.y >= b._position.y + b._size.y)
-                return false;
-            if (_position.y + _size.y <= b._position.y)
-                return false;
+            if (includeBorders)
+            {
+                if (_position.x > b._position.x + b._size.x)
+                {
+                    return false;
+                }
+                if (_position.x + _size.x < b._position.x)
+                {
+                    return false;
+                }
+                if (_position.y > b._position.y + b._size.y)
+                {
+                    return false;
+                }
+                if (_position.y + _size.y < b._position.y)
+                {
+                    return false;
+                }
+            }
+            else
+            {
+                if (_position.x >= b._position.x + b._size.x)
+                {
+                    return false;
+                }
+                if (_position.x + _size.x <= b._position.x)
+                {
+                    return false;
+                }
+                if (_position.y >= b._position.y + b._size.y)
+                {
+                    return false;
+                }
+                if (_position.y + _size.y <= b._position.y)
+                {
+                    return false;
+                }
+            }
 
             return true;
         }
 
+        /// <summary>
+        /// Returns a larger Rect2 that contains this Rect2 and `b`.
+        /// </summary>
+        /// <param name="b">The other rect.</param>
+        /// <returns>The merged rect.</returns>
         public Rect2 Merge(Rect2 b)
         {
             Rect2 newRect;
@@ -179,27 +308,53 @@ namespace Godot
             newRect._size.x = Mathf.Max(b._position.x + b._size.x, _position.x + _size.x);
             newRect._size.y = Mathf.Max(b._position.y + b._size.y, _position.y + _size.y);
 
-            newRect._size = newRect._size - newRect._position; // Make relative again
+            newRect._size -= newRect._position; // Make relative again
 
             return newRect;
         }
 
-        // Constructors
+        /// <summary>
+        /// Constructs a Rect2 from a position and size.
+        /// </summary>
+        /// <param name="position">The position.</param>
+        /// <param name="size">The size.</param>
         public Rect2(Vector2 position, Vector2 size)
         {
             _position = position;
             _size = size;
         }
+
+        /// <summary>
+        /// Constructs a Rect2 from a position, width, and height.
+        /// </summary>
+        /// <param name="position">The position.</param>
+        /// <param name="width">The width.</param>
+        /// <param name="height">The height.</param>
         public Rect2(Vector2 position, real_t width, real_t height)
         {
             _position = position;
             _size = new Vector2(width, height);
         }
+
+        /// <summary>
+        /// Constructs a Rect2 from x, y, and size.
+        /// </summary>
+        /// <param name="x">The position's X coordinate.</param>
+        /// <param name="y">The position's Y coordinate.</param>
+        /// <param name="size">The size.</param>
         public Rect2(real_t x, real_t y, Vector2 size)
         {
             _position = new Vector2(x, y);
             _size = size;
         }
+
+        /// <summary>
+        /// Constructs a Rect2 from x, y, width, and height.
+        /// </summary>
+        /// <param name="x">The position's X coordinate.</param>
+        /// <param name="y">The position's Y coordinate.</param>
+        /// <param name="width">The width.</param>
+        /// <param name="height">The height.</param>
         public Rect2(real_t x, real_t y, real_t width, real_t height)
         {
             _position = new Vector2(x, y);
@@ -231,6 +386,12 @@ namespace Godot
             return _position.Equals(other._position) && _size.Equals(other._size);
         }
 
+        /// <summary>
+        /// Returns true if this rect and `other` are approximately equal, by running
+        /// <see cref="Vector2.IsEqualApprox(Vector2)"/> on each component.
+        /// </summary>
+        /// <param name="other">The other rect to compare.</param>
+        /// <returns>Whether or not the rects are approximately equal.</returns>
         public bool IsEqualApprox(Rect2 other)
         {
             return _position.IsEqualApprox(other._position) && _size.IsEqualApprox(other.Size);
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Rect2i.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Rect2i.cs
new file mode 100644
index 0000000000..8f71c00d76
--- /dev/null
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Rect2i.cs
@@ -0,0 +1,401 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Godot
+{
+    /// <summary>
+    /// 2D axis-aligned bounding box using integers. Rect2i consists of a position, a size, and
+    /// several utility functions. It is typically used for fast overlap tests.
+    /// </summary>
+    [Serializable]
+    [StructLayout(LayoutKind.Sequential)]
+    public struct Rect2i : IEquatable<Rect2i>
+    {
+        private Vector2i _position;
+        private Vector2i _size;
+
+        /// <summary>
+        /// Beginning corner. Typically has values lower than End.
+        /// </summary>
+        /// <value>Directly uses a private field.</value>
+        public Vector2i Position
+        {
+            get { return _position; }
+            set { _position = value; }
+        }
+
+        /// <summary>
+        /// Size from Position to End. Typically all components are positive.
+        /// If the size is negative, you can use <see cref="Abs"/> to fix it.
+        /// </summary>
+        /// <value>Directly uses a private field.</value>
+        public Vector2i Size
+        {
+            get { return _size; }
+            set { _size = value; }
+        }
+
+        /// <summary>
+        /// Ending corner. This is calculated as <see cref="Position"/> plus
+        /// <see cref="Size"/>. Setting this value will change the size.
+        /// </summary>
+        /// <value>Getting is equivalent to `value = Position + Size`, setting is equivalent to `Size = value - Position`.</value>
+        public Vector2i End
+        {
+            get { return _position + _size; }
+            set { _size = value - _position; }
+        }
+
+        /// <summary>
+        /// The area of this rect.
+        /// </summary>
+        /// <value>Equivalent to <see cref="GetArea()"/>.</value>
+        public int Area
+        {
+            get { return GetArea(); }
+        }
+
+        /// <summary>
+        /// Returns a Rect2i with equivalent position and size, modified so that
+        /// the top-left corner is the origin and width and height are positive.
+        /// </summary>
+        /// <returns>The modified rect.</returns>
+        public Rect2i Abs()
+        {
+            Vector2i end = End;
+            Vector2i topLeft = new Vector2i(Mathf.Min(_position.x, end.x), Mathf.Min(_position.y, end.y));
+            return new Rect2i(topLeft, _size.Abs());
+        }
+
+        /// <summary>
+        /// Returns the intersection of this Rect2i and `b`.
+        /// </summary>
+        /// <param name="b">The other rect.</param>
+        /// <returns>The clipped rect.</returns>
+        public Rect2i Clip(Rect2i b)
+        {
+            var newRect = b;
+
+            if (!Intersects(newRect))
+            {
+                return new Rect2i();
+            }
+
+            newRect._position.x = Mathf.Max(b._position.x, _position.x);
+            newRect._position.y = Mathf.Max(b._position.y, _position.y);
+
+            Vector2i bEnd = b._position + b._size;
+            Vector2i end = _position + _size;
+
+            newRect._size.x = Mathf.Min(bEnd.x, end.x) - newRect._position.x;
+            newRect._size.y = Mathf.Min(bEnd.y, end.y) - newRect._position.y;
+
+            return newRect;
+        }
+
+        /// <summary>
+        /// Returns true if this Rect2i completely encloses another one.
+        /// </summary>
+        /// <param name="b">The other rect that may be enclosed.</param>
+        /// <returns>A bool for whether or not this rect encloses `b`.</returns>
+        public bool Encloses(Rect2i b)
+        {
+            return b._position.x >= _position.x && b._position.y >= _position.y &&
+               b._position.x + b._size.x < _position.x + _size.x &&
+               b._position.y + b._size.y < _position.y + _size.y;
+        }
+
+        /// <summary>
+        /// Returns this Rect2i expanded to include a given point.
+        /// </summary>
+        /// <param name="to">The point to include.</param>
+        /// <returns>The expanded rect.</returns>
+        public Rect2i Expand(Vector2i to)
+        {
+            var expanded = this;
+
+            Vector2i begin = expanded._position;
+            Vector2i end = expanded._position + expanded._size;
+
+            if (to.x < begin.x)
+            {
+                begin.x = to.x;
+            }
+            if (to.y < begin.y)
+            {
+                begin.y = to.y;
+            }
+
+            if (to.x > end.x)
+            {
+                end.x = to.x;
+            }
+            if (to.y > end.y)
+            {
+                end.y = to.y;
+            }
+
+            expanded._position = begin;
+            expanded._size = end - begin;
+
+            return expanded;
+        }
+
+        /// <summary>
+        /// Returns the area of the Rect2.
+        /// </summary>
+        /// <returns>The area.</returns>
+        public int GetArea()
+        {
+            return _size.x * _size.y;
+        }
+
+        /// <summary>
+        /// Returns a copy of the Rect2i grown a given amount of units towards all the sides.
+        /// </summary>
+        /// <param name="by">The amount to grow by.</param>
+        /// <returns>The grown rect.</returns>
+        public Rect2i Grow(int by)
+        {
+            var g = this;
+
+            g._position.x -= by;
+            g._position.y -= by;
+            g._size.x += by * 2;
+            g._size.y += by * 2;
+
+            return g;
+        }
+
+        /// <summary>
+        /// Returns a copy of the Rect2i grown a given amount of units towards each direction individually.
+        /// </summary>
+        /// <param name="left">The amount to grow by on the left.</param>
+        /// <param name="top">The amount to grow by on the top.</param>
+        /// <param name="right">The amount to grow by on the right.</param>
+        /// <param name="bottom">The amount to grow by on the bottom.</param>
+        /// <returns>The grown rect.</returns>
+        public Rect2i GrowIndividual(int left, int top, int right, int bottom)
+        {
+            var g = this;
+
+            g._position.x -= left;
+            g._position.y -= top;
+            g._size.x += left + right;
+            g._size.y += top + bottom;
+
+            return g;
+        }
+
+        /// <summary>
+        /// Returns a copy of the Rect2i grown a given amount of units towards the <see cref="Margin"/> direction.
+        /// </summary>
+        /// <param name="margin">The direction to grow in.</param>
+        /// <param name="by">The amount to grow by.</param>
+        /// <returns>The grown rect.</returns>
+        public Rect2i GrowMargin(Margin margin, int by)
+        {
+            var g = this;
+
+            g = g.GrowIndividual(Margin.Left == margin ? by : 0,
+                    Margin.Top == margin ? by : 0,
+                    Margin.Right == margin ? by : 0,
+                    Margin.Bottom == margin ? by : 0);
+
+            return g;
+        }
+
+        /// <summary>
+        /// Returns true if the Rect2 is flat or empty, or false otherwise.
+        /// </summary>
+        /// <returns>A bool for whether or not the rect has area.</returns>
+        public bool HasNoArea()
+        {
+            return _size.x <= 0 || _size.y <= 0;
+        }
+
+        /// <summary>
+        /// Returns true if the Rect2 contains a point, or false otherwise.
+        /// </summary>
+        /// <param name="point">The point to check.</param>
+        /// <returns>A bool for whether or not the rect contains `point`.</returns>
+        public bool HasPoint(Vector2i point)
+        {
+            if (point.x < _position.x)
+                return false;
+            if (point.y < _position.y)
+                return false;
+
+            if (point.x >= _position.x + _size.x)
+                return false;
+            if (point.y >= _position.y + _size.y)
+                return false;
+
+            return true;
+        }
+
+        /// <summary>
+        /// Returns true if the Rect2i overlaps with `b`
+        /// (i.e. they have at least one point in common).
+        ///
+        /// If `includeBorders` is true, they will also be considered overlapping
+        /// if their borders touch, even without intersection.
+        /// </summary>
+        /// <param name="b">The other rect to check for intersections with.</param>
+        /// <param name="includeBorders">Whether or not to consider borders.</param>
+        /// <returns>A bool for whether or not they are intersecting.</returns>
+        public bool Intersects(Rect2i b, bool includeBorders = false)
+        {
+            if (includeBorders)
+            {
+                if (_position.x > b._position.x + b._size.x)
+                    return false;
+                if (_position.x + _size.x < b._position.x)
+                    return false;
+                if (_position.y > b._position.y + b._size.y)
+                    return false;
+                if (_position.y + _size.y < b._position.y)
+                    return false;
+            }
+            else
+            {
+                if (_position.x >= b._position.x + b._size.x)
+                    return false;
+                if (_position.x + _size.x <= b._position.x)
+                    return false;
+                if (_position.y >= b._position.y + b._size.y)
+                    return false;
+                if (_position.y + _size.y <= b._position.y)
+                    return false;
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Returns a larger Rect2i that contains this Rect2 and `b`.
+        /// </summary>
+        /// <param name="b">The other rect.</param>
+        /// <returns>The merged rect.</returns>
+        public Rect2i Merge(Rect2i b)
+        {
+            Rect2i newRect;
+
+            newRect._position.x = Mathf.Min(b._position.x, _position.x);
+            newRect._position.y = Mathf.Min(b._position.y, _position.y);
+
+            newRect._size.x = Mathf.Max(b._position.x + b._size.x, _position.x + _size.x);
+            newRect._size.y = Mathf.Max(b._position.y + b._size.y, _position.y + _size.y);
+
+            newRect._size -= newRect._position; // Make relative again
+
+            return newRect;
+        }
+
+        /// <summary>
+        /// Constructs a Rect2i from a position and size.
+        /// </summary>
+        /// <param name="position">The position.</param>
+        /// <param name="size">The size.</param>
+        public Rect2i(Vector2i position, Vector2i size)
+        {
+            _position = position;
+            _size = size;
+        }
+
+        /// <summary>
+        /// Constructs a Rect2i from a position, width, and height.
+        /// </summary>
+        /// <param name="position">The position.</param>
+        /// <param name="width">The width.</param>
+        /// <param name="height">The height.</param>
+        public Rect2i(Vector2i position, int width, int height)
+        {
+            _position = position;
+            _size = new Vector2i(width, height);
+        }
+
+        /// <summary>
+        /// Constructs a Rect2i from x, y, and size.
+        /// </summary>
+        /// <param name="x">The position's X coordinate.</param>
+        /// <param name="y">The position's Y coordinate.</param>
+        /// <param name="size">The size.</param>
+        public Rect2i(int x, int y, Vector2i size)
+        {
+            _position = new Vector2i(x, y);
+            _size = size;
+        }
+
+        /// <summary>
+        /// Constructs a Rect2i from x, y, width, and height.
+        /// </summary>
+        /// <param name="x">The position's X coordinate.</param>
+        /// <param name="y">The position's Y coordinate.</param>
+        /// <param name="width">The width.</param>
+        /// <param name="height">The height.</param>
+        public Rect2i(int x, int y, int width, int height)
+        {
+            _position = new Vector2i(x, y);
+            _size = new Vector2i(width, height);
+        }
+
+        public static bool operator ==(Rect2i left, Rect2i right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(Rect2i left, Rect2i right)
+        {
+            return !left.Equals(right);
+        }
+
+        public static implicit operator Rect2(Rect2i value)
+        {
+            return new Rect2(value._position, value._size);
+        }
+
+        public static explicit operator Rect2i(Rect2 value)
+        {
+            return new Rect2i((Vector2i)value.Position, (Vector2i)value.Size);
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj is Rect2i)
+            {
+                return Equals((Rect2i)obj);
+            }
+
+            return false;
+        }
+
+        public bool Equals(Rect2i other)
+        {
+            return _position.Equals(other._position) && _size.Equals(other._size);
+        }
+
+        public override int GetHashCode()
+        {
+            return _position.GetHashCode() ^ _size.GetHashCode();
+        }
+
+        public override string ToString()
+        {
+            return String.Format("{0}, {1}", new object[]
+            {
+                _position.ToString(),
+                _size.ToString()
+            });
+        }
+
+        public string ToString(string format)
+        {
+            return String.Format("{0}, {1}", new object[]
+            {
+                _position.ToString(format),
+                _size.ToString(format)
+            });
+        }
+    }
+}
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/SignalAwaiter.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/SignalAwaiter.cs
index 9483b6ffb4..4dc630238b 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/SignalAwaiter.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/SignalAwaiter.cs
@@ -9,13 +9,13 @@ namespace Godot
         private object[] result;
         private Action action;
 
-        public SignalAwaiter(Object source, string signal, Object target)
+        public SignalAwaiter(Object source, StringName signal, Object target)
         {
-            godot_icall_SignalAwaiter_connect(Object.GetPtr(source), signal, Object.GetPtr(target), this);
+            godot_icall_SignalAwaiter_connect(Object.GetPtr(source), StringName.GetPtr(signal), Object.GetPtr(target), this);
         }
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        internal extern static Error godot_icall_SignalAwaiter_connect(IntPtr source, string signal, IntPtr target, SignalAwaiter awaiter);
+        internal extern static Error godot_icall_SignalAwaiter_connect(IntPtr source, IntPtr signal, IntPtr target, SignalAwaiter awaiter);
 
         public bool IsCompleted
         {
@@ -50,11 +50,5 @@ namespace Godot
                 action();
             }
         }
-
-        internal void FailureCallback()
-        {
-            action = null;
-            completed = true;
-        }
     }
 }
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/SignalInfo.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/SignalInfo.cs
new file mode 100644
index 0000000000..dc92de7a61
--- /dev/null
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/SignalInfo.cs
@@ -0,0 +1,17 @@
+namespace Godot
+{
+    public struct SignalInfo
+    {
+        private readonly Object _owner;
+        private readonly StringName _signalName;
+
+        public Object Owner => _owner;
+        public StringName Name => _signalName;
+
+        public SignalInfo(Object owner, StringName name)
+        {
+            _owner = owner;
+            _signalName = name;
+        }
+    }
+}
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/StringExtensions.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/StringExtensions.cs
index b926037e5a..bd1dbc1229 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/StringExtensions.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/StringExtensions.cs
@@ -12,7 +12,7 @@ namespace Godot
     {
         private static int GetSliceCount(this string instance, string splitter)
         {
-            if (instance.Empty() || splitter.Empty())
+            if (string.IsNullOrEmpty(instance) || string.IsNullOrEmpty(splitter))
                 return 0;
 
             int pos = 0;
@@ -29,7 +29,7 @@ namespace Godot
 
         private static string GetSliceCharacter(this string instance, char splitter, int slice)
         {
-            if (!instance.Empty() && slice >= 0)
+            if (!string.IsNullOrEmpty(instance) && slice >= 0)
             {
                 int i = 0;
                 int prev = 0;
@@ -237,10 +237,10 @@ namespace Godot
         // </summary>
         public static int CompareTo(this string instance, string to, bool caseSensitive = true)
         {
-            if (instance.Empty())
-                return to.Empty() ? 0 : -1;
+            if (string.IsNullOrEmpty(instance))
+                return string.IsNullOrEmpty(to) ? 0 : -1;
 
-            if (to.Empty())
+            if (string.IsNullOrEmpty(to))
                 return 1;
 
             int instanceIndex = 0;
@@ -264,7 +264,8 @@ namespace Godot
                     instanceIndex++;
                     toIndex++;
                 }
-            } else
+            }
+            else
             {
                 while (true)
                 {
@@ -286,14 +287,6 @@ namespace Godot
         }
 
         // <summary>
-        // Return true if the string is empty.
-        // </summary>
-        public static bool Empty(this string instance)
-        {
-            return string.IsNullOrEmpty(instance);
-        }
-
-        // <summary>
         // Return true if the strings ends with the given string.
         // </summary>
         public static bool EndsWith(this string instance, string text)
@@ -447,7 +440,12 @@ namespace Godot
         // </summary>
         public static bool IsAbsPath(this string instance)
         {
-            return System.IO.Path.IsPathRooted(instance);
+            if (string.IsNullOrEmpty(instance))
+                return false;
+            else if (instance.Length > 1)
+                return instance[0] == '/' || instance[0] == '\\' || instance.Contains(":/") || instance.Contains(":\\");
+            else
+                return instance[0] == '/' || instance[0] == '\\';
         }
 
         // <summary>
@@ -455,7 +453,7 @@ namespace Godot
         // </summary>
         public static bool IsRelPath(this string instance)
         {
-            return !System.IO.Path.IsPathRooted(instance);
+            return !IsAbsPath(instance);
         }
 
         // <summary>
@@ -474,7 +472,7 @@ namespace Godot
             int source = 0;
             int target = 0;
 
-            while (instance[source] != 0 && text[target] != 0)
+            while (source < len && target < text.Length)
             {
                 bool match;
 
@@ -491,7 +489,7 @@ namespace Godot
                 if (match)
                 {
                     source++;
-                    if (instance[source] == 0)
+                    if (source >= len)
                         return true;
                 }
 
@@ -631,41 +629,46 @@ namespace Godot
             return instance.Length;
         }
 
-        // <summary>
-        // Do a simple expression match, where '*' matches zero or more arbitrary characters and '?' matches any single character except '.'.
-        // </summary>
-        public static bool ExprMatch(this string instance, string expr, bool caseSensitive)
+        /// <summary>
+        /// Do a simple expression match, where '*' matches zero or more arbitrary characters and '?' matches any single character except '.'.
+        /// </summary>
+        private static bool ExprMatch(this string instance, string expr, bool caseSensitive)
         {
-            if (expr.Length == 0 || instance.Length == 0)
-                return false;
+            // case '\0':
+            if (expr.Length == 0)
+                return instance.Length == 0;
 
             switch (expr[0])
             {
-                case '\0':
-                    return instance[0] == 0;
                 case '*':
-                    return ExprMatch(expr + 1, instance, caseSensitive) || instance[0] != 0 && ExprMatch(expr, instance + 1, caseSensitive);
+                    return ExprMatch(instance, expr.Substring(1), caseSensitive) || (instance.Length > 0 && ExprMatch(instance.Substring(1), expr, caseSensitive));
                 case '?':
-                    return instance[0] != 0 && instance[0] != '.' && ExprMatch(expr + 1, instance + 1, caseSensitive);
+                    return instance.Length > 0 && instance[0] != '.' && ExprMatch(instance.Substring(1), expr.Substring(1), caseSensitive);
                 default:
-                    return (caseSensitive ? instance[0] == expr[0] : char.ToUpper(instance[0]) == char.ToUpper(expr[0])) &&
-                                ExprMatch(expr + 1, instance + 1, caseSensitive);
+                    if (instance.Length == 0) return false;
+                    return (caseSensitive ? instance[0] == expr[0] : char.ToUpper(instance[0]) == char.ToUpper(expr[0])) && ExprMatch(instance.Substring(1), expr.Substring(1), caseSensitive);
             }
         }
 
-        // <summary>
-        // Do a simple case sensitive expression match, using ? and * wildcards (see [method expr_match]).
-        // </summary>
+        /// <summary>
+        /// Do a simple case sensitive expression match, using ? and * wildcards (see [method expr_match]).
+        /// </summary>
         public static bool Match(this string instance, string expr, bool caseSensitive = true)
         {
+            if (instance.Length == 0 || expr.Length == 0)
+                return false;
+
             return instance.ExprMatch(expr, caseSensitive);
         }
 
-        // <summary>
-        // Do a simple case insensitive expression match, using ? and * wildcards (see [method expr_match]).
-        // </summary>
+        /// <summary>
+        /// Do a simple case insensitive expression match, using ? and * wildcards (see [method expr_match]).
+        /// </summary>
         public static bool MatchN(this string instance, string expr)
         {
+            if (instance.Length == 0 || expr.Length == 0)
+                return false;
+
             return instance.ExprMatch(expr, caseSensitive: false);
         }
 
@@ -980,7 +983,7 @@ namespace Godot
         }
 
         // <summary>
-        // Convert the String (which is a character array) to PoolByteArray (which is an array of bytes). The conversion is speeded up in comparison to to_utf8() with the assumption that all the characters the String contains are only ASCII characters.
+        // Convert the String (which is a character array) to PackedByteArray (which is an array of bytes). The conversion is speeded up in comparison to to_utf8() with the assumption that all the characters the String contains are only ASCII characters.
         // </summary>
         public static byte[] ToAscii(this string instance)
         {
@@ -1020,7 +1023,7 @@ namespace Godot
         }
 
         // <summary>
-        // Convert the String (which is an array of characters) to PoolByteArray (which is an array of bytes). The conversion is a bit slower than to_ascii(), but supports all UTF-8 characters. Therefore, you should prefer this function over to_ascii().
+        // Convert the String (which is an array of characters) to PackedByteArray (which is an array of bytes). The conversion is a bit slower than to_ascii(), but supports all UTF-8 characters. Therefore, you should prefer this function over to_ascii().
         // </summary>
         public static byte[] ToUTF8(this string instance)
         {
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/StringName.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/StringName.cs
new file mode 100644
index 0000000000..7700b6d4ed
--- /dev/null
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/StringName.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Godot
+{
+    public sealed partial class StringName : IDisposable
+    {
+        private IntPtr ptr;
+
+        internal static IntPtr GetPtr(StringName instance)
+        {
+            if (instance == null)
+                throw new NullReferenceException($"The instance of type {nameof(StringName)} is null.");
+
+            if (instance.ptr == IntPtr.Zero)
+                throw new ObjectDisposedException(instance.GetType().FullName);
+
+            return instance.ptr;
+        }
+
+        ~StringName()
+        {
+            Dispose(false);
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        private void Dispose(bool disposing)
+        {
+            if (ptr != IntPtr.Zero)
+            {
+                godot_icall_StringName_Dtor(ptr);
+                ptr = IntPtr.Zero;
+            }
+        }
+
+        internal StringName(IntPtr ptr)
+        {
+            this.ptr = ptr;
+        }
+
+        public StringName()
+        {
+            ptr = IntPtr.Zero;
+        }
+
+        public StringName(string path)
+        {
+            ptr = path == null ? IntPtr.Zero : godot_icall_StringName_Ctor(path);
+        }
+
+        public static implicit operator StringName(string from) => new StringName(from);
+
+        public static implicit operator string(StringName from) => from.ToString();
+
+        public override string ToString()
+        {
+            return ptr == IntPtr.Zero ? string.Empty : godot_icall_StringName_operator_String(GetPtr(this));
+        }
+
+        public bool IsEmpty()
+        {
+            return ptr == IntPtr.Zero || godot_icall_StringName_is_empty(GetPtr(this));
+        }
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        private static extern IntPtr godot_icall_StringName_Ctor(string path);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        private static extern void godot_icall_StringName_Dtor(IntPtr ptr);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        private static extern string godot_icall_StringName_operator_String(IntPtr ptr);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        private static extern bool godot_icall_StringName_is_empty(IntPtr ptr);
+    }
+}
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Transform.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Transform.cs
index 0b84050f07..ac47f6029f 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Transform.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Transform.cs
@@ -8,20 +8,118 @@ using real_t = System.Single;
 
 namespace Godot
 {
+    /// <summary>
+    /// 3×4 matrix (3 rows, 4 columns) used for 3D linear transformations.
+    /// It can represent transformations such as translation, rotation, or scaling.
+    /// It consists of a <see cref="Basis"/> (first 3 columns) and a
+    /// <see cref="Vector3"/> for the origin (last column).
+    ///
+    /// For more information, read this documentation article:
+    /// https://docs.godotengine.org/en/latest/tutorials/math/matrices_and_transforms.html
+    /// </summary>
     [Serializable]
     [StructLayout(LayoutKind.Sequential)]
     public struct Transform : IEquatable<Transform>
     {
+        /// <summary>
+        /// The <see cref="Basis"/> of this transform. Contains the X, Y, and Z basis
+        /// vectors (columns 0 to 2) and is responsible for rotation and scale.
+        /// </summary>
         public Basis basis;
+
+        /// <summary>
+        /// The origin vector (column 3, the fourth column). Equivalent to array index `[3]`.
+        /// </summary>
         public Vector3 origin;
 
+        /// <summary>
+        /// Access whole columns in the form of Vector3. The fourth column is the origin vector.
+        /// </summary>
+        /// <param name="column">Which column vector.</param>
+        public Vector3 this[int column]
+        {
+            get
+            {
+                switch (column)
+                {
+                    case 0:
+                        return basis.Column0;
+                    case 1:
+                        return basis.Column1;
+                    case 2:
+                        return basis.Column2;
+                    case 3:
+                        return origin;
+                    default:
+                        throw new IndexOutOfRangeException();
+                }
+            }
+            set
+            {
+                switch (column)
+                {
+                    case 0:
+                        basis.Column0 = value;
+                        return;
+                    case 1:
+                        basis.Column1 = value;
+                        return;
+                    case 2:
+                        basis.Column2 = value;
+                        return;
+                    case 3:
+                        origin = value;
+                        return;
+                    default:
+                        throw new IndexOutOfRangeException();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Access matrix elements in column-major order. The fourth column is the origin vector.
+        /// </summary>
+        /// <param name="column">Which column, the matrix horizontal position.</param>
+        /// <param name="row">Which row, the matrix vertical position.</param>
+        public real_t this[int column, int row]
+        {
+            get
+            {
+                if (column == 3)
+                {
+                    return origin[row];
+                }
+                return basis[column, row];
+            }
+            set
+            {
+                if (column == 3)
+                {
+                    origin[row] = value;
+                    return;
+                }
+                basis[column, row] = value;
+            }
+        }
+
+        /// <summary>
+        /// Returns the inverse of the transform, under the assumption that
+        /// the transformation is composed of rotation, scaling, and translation.
+        /// </summary>
+        /// <returns>The inverse transformation matrix.</returns>
         public Transform AffineInverse()
         {
             Basis basisInv = basis.Inverse();
             return new Transform(basisInv, basisInv.Xform(-origin));
         }
 
-        public Transform InterpolateWith(Transform transform, real_t c)
+        /// <summary>
+        /// Interpolates this transform to the other `transform` by `weight`.
+        /// </summary>
+        /// <param name="transform">The other transform.</param>
+        /// <param name="weight">A value on the range of 0.0 to 1.0, representing the amount of interpolation.</param>
+        /// <returns>The interpolated transform.</returns>
+        public Transform InterpolateWith(Transform transform, real_t weight)
         {
             /* not sure if very "efficient" but good enough? */
 
@@ -34,18 +132,37 @@ namespace Godot
             Vector3 destinationLocation = transform.origin;
 
             var interpolated = new Transform();
-            interpolated.basis.SetQuatScale(sourceRotation.Slerp(destinationRotation, c).Normalized(), sourceScale.LinearInterpolate(destinationScale, c));
-            interpolated.origin = sourceLocation.LinearInterpolate(destinationLocation, c);
+            interpolated.basis.SetQuatScale(sourceRotation.Slerp(destinationRotation, weight).Normalized(), sourceScale.Lerp(destinationScale, weight));
+            interpolated.origin = sourceLocation.Lerp(destinationLocation, weight);
 
             return interpolated;
         }
 
+        /// <summary>
+        /// Returns the inverse of the transform, under the assumption that
+        /// the transformation is composed of rotation and translation
+        /// (no scaling, use <see cref="AffineInverse"/> for transforms with scaling).
+        /// </summary>
+        /// <returns>The inverse matrix.</returns>
         public Transform Inverse()
         {
             Basis basisTr = basis.Transposed();
             return new Transform(basisTr, basisTr.Xform(-origin));
         }
 
+        /// <summary>
+        /// Returns a copy of the transform rotated such that its
+        /// -Z axis (forward) points towards the target position.
+        ///
+        /// The transform will first be rotated around the given up vector,
+        /// and then fully aligned to the target by a further rotation around
+        /// an axis perpendicular to both the target and up vectors.
+        ///
+        /// Operations take place in global space.
+        /// </summary>
+        /// <param name="target">The object to look at.</param>
+        /// <param name="up">The relative up direction</param>
+        /// <returns>The resulting transform.</returns>
         public Transform LookingAt(Vector3 target, Vector3 up)
         {
             var t = this;
@@ -53,22 +170,39 @@ namespace Godot
             return t;
         }
 
+        /// <summary>
+        /// Returns the transform with the basis orthogonal (90 degrees),
+        /// and normalized axis vectors (scale of 1 or -1).
+        /// </summary>
+        /// <returns>The orthonormalized transform.</returns>
         public Transform Orthonormalized()
         {
             return new Transform(basis.Orthonormalized(), origin);
         }
 
+        /// <summary>
+        /// Rotates the transform around the given `axis` by `phi` (in radians),
+        /// using matrix multiplication. The axis must be a normalized vector.
+        /// </summary>
+        /// <param name="axis">The axis to rotate around. Must be normalized.</param>
+        /// <param name="phi">The angle to rotate, in radians.</param>
+        /// <returns>The rotated transformation matrix.</returns>
         public Transform Rotated(Vector3 axis, real_t phi)
         {
             return new Transform(new Basis(axis, phi), new Vector3()) * this;
         }
 
+        /// <summary>
+        /// Scales the transform by the given 3D scaling factor, using matrix multiplication.
+        /// </summary>
+        /// <param name="scale">The scale to introduce.</param>
+        /// <returns>The scaled transformation matrix.</returns>
         public Transform Scaled(Vector3 scale)
         {
             return new Transform(basis.Scaled(scale), origin * scale);
         }
 
-        public void SetLookAt(Vector3 eye, Vector3 target, Vector3 up)
+        private void SetLookAt(Vector3 eye, Vector3 target, Vector3 up)
         {
             // Make rotation matrix
             // Z vector
@@ -91,16 +225,30 @@ namespace Godot
             origin = eye;
         }
 
-        public Transform Translated(Vector3 ofs)
+        /// <summary>
+        /// Translates the transform by the given `offset`,
+        /// relative to the transform's basis vectors.
+        ///
+        /// Unlike <see cref="Rotated"/> and <see cref="Scaled"/>,
+        /// this does not use matrix multiplication.
+        /// </summary>
+        /// <param name="offset">The offset to translate by.</param>
+        /// <returns>The translated matrix.</returns>
+        public Transform Translated(Vector3 offset)
         {
             return new Transform(basis, new Vector3
             (
-                origin[0] += basis.Row0.Dot(ofs),
-                origin[1] += basis.Row1.Dot(ofs),
-                origin[2] += basis.Row2.Dot(ofs)
+                origin[0] += basis.Row0.Dot(offset),
+                origin[1] += basis.Row1.Dot(offset),
+                origin[2] += basis.Row2.Dot(offset)
             ));
         }
 
+        /// <summary>
+        /// Returns a vector transformed (multiplied) by this transformation matrix.
+        /// </summary>
+        /// <param name="v">A vector to transform.</param>
+        /// <returns>The transformed vector.</returns>
         public Vector3 Xform(Vector3 v)
         {
             return new Vector3
@@ -111,6 +259,14 @@ namespace Godot
             );
         }
 
+        /// <summary>
+        /// Returns a vector transformed (multiplied) by the transposed transformation matrix.
+        ///
+        /// Note: This results in a multiplication by the inverse of the
+        /// transformation matrix only if it represents a rotation-reflection.
+        /// </summary>
+        /// <param name="v">A vector to inversely transform.</param>
+        /// <returns>The inversely transformed vector.</returns>
         public Vector3 XformInv(Vector3 v)
         {
             Vector3 vInv = v - origin;
@@ -129,24 +285,58 @@ namespace Godot
         private static readonly Transform _flipY = new Transform(new Basis(1, 0, 0, 0, -1, 0, 0, 0, 1), Vector3.Zero);
         private static readonly Transform _flipZ = new Transform(new Basis(1, 0, 0, 0, 1, 0, 0, 0, -1), Vector3.Zero);
 
+        /// <summary>
+        /// The identity transform, with no translation, rotation, or scaling applied.
+        /// This is used as a replacement for `Transform()` in GDScript.
+        /// Do not use `new Transform()` with no arguments in C#, because it sets all values to zero.
+        /// </summary>
+        /// <value>Equivalent to `new Transform(Vector3.Right, Vector3.Up, Vector3.Back, Vector3.Zero)`.</value>
         public static Transform Identity { get { return _identity; } }
+        /// <summary>
+        /// The transform that will flip something along the X axis.
+        /// </summary>
+        /// <value>Equivalent to `new Transform(Vector3.Left, Vector3.Up, Vector3.Back, Vector3.Zero)`.</value>
         public static Transform FlipX { get { return _flipX; } }
+        /// <summary>
+        /// The transform that will flip something along the Y axis.
+        /// </summary>
+        /// <value>Equivalent to `new Transform(Vector3.Right, Vector3.Down, Vector3.Back, Vector3.Zero)`.</value>
         public static Transform FlipY { get { return _flipY; } }
+        /// <summary>
+        /// The transform that will flip something along the Z axis.
+        /// </summary>
+        /// <value>Equivalent to `new Transform(Vector3.Right, Vector3.Up, Vector3.Forward, Vector3.Zero)`.</value>
         public static Transform FlipZ { get { return _flipZ; } }
 
-        // Constructors
+        /// <summary>
+        /// Constructs a transformation matrix from 4 vectors (matrix columns).
+        /// </summary>
+        /// <param name="column0">The X vector, or column index 0.</param>
+        /// <param name="column1">The Y vector, or column index 1.</param>
+        /// <param name="column2">The Z vector, or column index 2.</param>
+        /// <param name="origin">The origin vector, or column index 3.</param>
         public Transform(Vector3 column0, Vector3 column1, Vector3 column2, Vector3 origin)
         {
             basis = new Basis(column0, column1, column2);
             this.origin = origin;
         }
 
+        /// <summary>
+        /// Constructs a transformation matrix from the given quaternion and origin vector.
+        /// </summary>
+        /// <param name="quat">The <see cref="Godot.Quat"/> to create the basis from.</param>
+        /// <param name="origin">The origin vector, or column index 3.</param>
         public Transform(Quat quat, Vector3 origin)
         {
             basis = new Basis(quat);
             this.origin = origin;
         }
 
+        /// <summary>
+        /// Constructs a transformation matrix from the given basis and origin vector.
+        /// </summary>
+        /// <param name="basis">The <see cref="Godot.Basis"/> to create the basis from.</param>
+        /// <param name="origin">The origin vector, or column index 3.</param>
         public Transform(Basis basis, Vector3 origin)
         {
             this.basis = basis;
@@ -185,6 +375,12 @@ namespace Godot
             return basis.Equals(other.basis) && origin.Equals(other.origin);
         }
 
+        /// <summary>
+        /// Returns true if this transform and `other` are approximately equal, by running
+        /// <see cref="Vector3.IsEqualApprox(Vector3)"/> on each component.
+        /// </summary>
+        /// <param name="other">The other transform to compare.</param>
+        /// <returns>Whether or not the matrices are approximately equal.</returns>
         public bool IsEqualApprox(Transform other)
         {
             return basis.IsEqualApprox(other.basis) && origin.IsEqualApprox(other.origin);
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Transform2D.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Transform2D.cs
index 77ea3e5830..06bbe98497 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Transform2D.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Transform2D.cs
@@ -8,25 +8,44 @@ using real_t = System.Single;
 
 namespace Godot
 {
+    /// <summary>
+    /// 2×3 matrix (2 rows, 3 columns) used for 2D linear transformations.
+    /// It can represent transformations such as translation, rotation, or scaling.
+    /// It consists of a three <see cref="Vector2"/> values: x, y, and the origin.
+    ///
+    /// For more information, read this documentation article:
+    /// https://docs.godotengine.org/en/latest/tutorials/math/matrices_and_transforms.html
+    /// </summary>
     [Serializable]
     [StructLayout(LayoutKind.Sequential)]
     public struct Transform2D : IEquatable<Transform2D>
     {
+        /// <summary>
+        /// The basis matrix's X vector (column 0). Equivalent to array index `[0]`.
+        /// </summary>
+        /// <value></value>
         public Vector2 x;
+
+        /// <summary>
+        /// The basis matrix's Y vector (column 1). Equivalent to array index `[1]`.
+        /// </summary>
         public Vector2 y;
+
+        /// <summary>
+        /// The origin vector (column 2, the third column). Equivalent to array index `[2]`.
+        /// The origin vector represents translation.
+        /// </summary>
         public Vector2 origin;
 
+        /// <summary>
+        /// The rotation of this transformation matrix.
+        /// </summary>
+        /// <value>Getting is equivalent to calling <see cref="Mathf.Atan2(real_t, real_t)"/> with the values of <see cref="x"/>.</value>
         public real_t Rotation
         {
             get
             {
-                real_t det = BasisDeterminant();
-                Transform2D t = Orthonormalized();
-                if (det < 0)
-                {
-                    t.ScaleBasis(new Vector2(1, -1));
-                }
-                return Mathf.Atan2(t.x.y, t.x.x);
+                return Mathf.Atan2(x.y, x.x);
             }
             set
             {
@@ -38,6 +57,10 @@ namespace Godot
             }
         }
 
+        /// <summary>
+        /// The scale of this transformation matrix.
+        /// </summary>
+        /// <value>Equivalent to the lengths of each column vector, but Y is negative if the determinant is negative.</value>
         public Vector2 Scale
         {
             get
@@ -47,18 +70,21 @@ namespace Godot
             }
             set
             {
-                x = x.Normalized();
-                y = y.Normalized();
+                value /= Scale; // Value becomes what's called "delta_scale" in core.
                 x *= value.x;
                 y *= value.y;
             }
         }
 
-        public Vector2 this[int rowIndex]
+        /// <summary>
+        /// Access whole columns in the form of Vector2. The third column is the origin vector.
+        /// </summary>
+        /// <param name="column">Which column vector.</param>
+        public Vector2 this[int column]
         {
             get
             {
-                switch (rowIndex)
+                switch (column)
                 {
                     case 0:
                         return x;
@@ -72,7 +98,7 @@ namespace Godot
             }
             set
             {
-                switch (rowIndex)
+                switch (column)
                 {
                     case 0:
                         x = value;
@@ -89,41 +115,30 @@ namespace Godot
             }
         }
 
-        public real_t this[int rowIndex, int columnIndex]
+        /// <summary>
+        /// Access matrix elements in column-major order. The third column is the origin vector.
+        /// </summary>
+        /// <param name="column">Which column, the matrix horizontal position.</param>
+        /// <param name="row">Which row, the matrix vertical position.</param>
+        public real_t this[int column, int row]
         {
             get
             {
-                switch (rowIndex)
-                {
-                    case 0:
-                        return x[columnIndex];
-                    case 1:
-                        return y[columnIndex];
-                    case 2:
-                        return origin[columnIndex];
-                    default:
-                        throw new IndexOutOfRangeException();
-                }
+                return this[column][row];
             }
             set
             {
-                switch (rowIndex)
-                {
-                    case 0:
-                        x[columnIndex] = value;
-                        return;
-                    case 1:
-                        y[columnIndex] = value;
-                        return;
-                    case 2:
-                        origin[columnIndex] = value;
-                        return;
-                    default:
-                        throw new IndexOutOfRangeException();
-                }
+                Vector2 columnVector = this[column];
+                columnVector[row] = value;
+                this[column] = columnVector;
             }
         }
 
+        /// <summary>
+        /// Returns the inverse of the transform, under the assumption that
+        /// the transformation is composed of rotation, scaling, and translation.
+        /// </summary>
+        /// <returns>The inverse transformation matrix.</returns>
         public Transform2D AffineInverse()
         {
             real_t det = BasisDeterminant();
@@ -147,28 +162,58 @@ namespace Godot
             return inv;
         }
 
+        /// <summary>
+        /// Returns the determinant of the basis matrix. If the basis is
+        /// uniformly scaled, its determinant is the square of the scale.
+        ///
+        /// A negative determinant means the Y scale is negative.
+        /// A zero determinant means the basis isn't invertible,
+        /// and is usually considered invalid.
+        /// </summary>
+        /// <returns>The determinant of the basis matrix.</returns>
         private real_t BasisDeterminant()
         {
             return x.x * y.y - x.y * y.x;
         }
 
+        /// <summary>
+        /// Returns a vector transformed (multiplied) by the basis matrix.
+        /// This method does not account for translation (the origin vector).
+        /// </summary>
+        /// <param name="v">A vector to transform.</param>
+        /// <returns>The transformed vector.</returns>
         public Vector2 BasisXform(Vector2 v)
         {
             return new Vector2(Tdotx(v), Tdoty(v));
         }
 
+        /// <summary>
+        /// Returns a vector transformed (multiplied) by the inverse basis matrix.
+        /// This method does not account for translation (the origin vector).
+        ///
+        /// Note: This results in a multiplication by the inverse of the
+        /// basis matrix only if it represents a rotation-reflection.
+        /// </summary>
+        /// <param name="v">A vector to inversely transform.</param>
+        /// <returns>The inversely transformed vector.</returns>
         public Vector2 BasisXformInv(Vector2 v)
         {
             return new Vector2(x.Dot(v), y.Dot(v));
         }
 
-        public Transform2D InterpolateWith(Transform2D m, real_t c)
+        /// <summary>
+        /// Interpolates this transform to the other `transform` by `weight`.
+        /// </summary>
+        /// <param name="transform">The other transform.</param>
+        /// <param name="weight">A value on the range of 0.0 to 1.0, representing the amount of interpolation.</param>
+        /// <returns>The interpolated transform.</returns>
+        public Transform2D InterpolateWith(Transform2D transform, real_t weight)
         {
             real_t r1 = Rotation;
-            real_t r2 = m.Rotation;
+            real_t r2 = transform.Rotation;
 
             Vector2 s1 = Scale;
-            Vector2 s2 = m.Scale;
+            Vector2 s2 = transform.Scale;
 
             // Slerp rotation
             var v1 = new Vector2(Mathf.Cos(r1), Mathf.Sin(r1));
@@ -184,28 +229,34 @@ namespace Godot
             if (dot > 0.9995f)
             {
                 // Linearly interpolate to avoid numerical precision issues
-                v = v1.LinearInterpolate(v2, c).Normalized();
+                v = v1.Lerp(v2, weight).Normalized();
             }
             else
             {
-                real_t angle = c * Mathf.Acos(dot);
+                real_t angle = weight * Mathf.Acos(dot);
                 Vector2 v3 = (v2 - v1 * dot).Normalized();
                 v = v1 * Mathf.Cos(angle) + v3 * Mathf.Sin(angle);
             }
 
             // Extract parameters
             Vector2 p1 = origin;
-            Vector2 p2 = m.origin;
+            Vector2 p2 = transform.origin;
 
             // Construct matrix
-            var res = new Transform2D(Mathf.Atan2(v.y, v.x), p1.LinearInterpolate(p2, c));
-            Vector2 scale = s1.LinearInterpolate(s2, c);
+            var res = new Transform2D(Mathf.Atan2(v.y, v.x), p1.Lerp(p2, weight));
+            Vector2 scale = s1.Lerp(s2, weight);
             res.x *= scale;
             res.y *= scale;
 
             return res;
         }
 
+        /// <summary>
+        /// Returns the inverse of the transform, under the assumption that
+        /// the transformation is composed of rotation and translation
+        /// (no scaling, use <see cref="AffineInverse"/> for transforms with scaling).
+        /// </summary>
+        /// <returns>The inverse matrix.</returns>
         public Transform2D Inverse()
         {
             var inv = this;
@@ -220,6 +271,11 @@ namespace Godot
             return inv;
         }
 
+        /// <summary>
+        /// Returns the transform with the basis orthogonal (90 degrees),
+        /// and normalized axis vectors (scale of 1 or -1).
+        /// </summary>
+        /// <returns>The orthonormalized transform.</returns>
         public Transform2D Orthonormalized()
         {
             var on = this;
@@ -237,11 +293,21 @@ namespace Godot
             return on;
         }
 
+        /// <summary>
+        /// Rotates the transform by `phi` (in radians), using matrix multiplication.
+        /// </summary>
+        /// <param name="phi">The angle to rotate, in radians.</param>
+        /// <returns>The rotated transformation matrix.</returns>
         public Transform2D Rotated(real_t phi)
         {
             return this * new Transform2D(phi, new Vector2());
         }
 
+        /// <summary>
+        /// Scales the transform by the given scaling factor, using matrix multiplication.
+        /// </summary>
+        /// <param name="scale">The scale to introduce.</param>
+        /// <returns>The scaled transformation matrix.</returns>
         public Transform2D Scaled(Vector2 scale)
         {
             var copy = this;
@@ -269,6 +335,15 @@ namespace Godot
             return this[0, 1] * with[0] + this[1, 1] * with[1];
         }
 
+        /// <summary>
+        /// Translates the transform by the given `offset`,
+        /// relative to the transform's basis vectors.
+        ///
+        /// Unlike <see cref="Rotated"/> and <see cref="Scaled"/>,
+        /// this does not use matrix multiplication.
+        /// </summary>
+        /// <param name="offset">The offset to translate by.</param>
+        /// <returns>The translated matrix.</returns>
         public Transform2D Translated(Vector2 offset)
         {
             var copy = this;
@@ -276,11 +351,21 @@ namespace Godot
             return copy;
         }
 
+        /// <summary>
+        /// Returns a vector transformed (multiplied) by this transformation matrix.
+        /// </summary>
+        /// <param name="v">A vector to transform.</param>
+        /// <returns>The transformed vector.</returns>
         public Vector2 Xform(Vector2 v)
         {
             return new Vector2(Tdotx(v), Tdoty(v)) + origin;
         }
 
+        /// <summary>
+        /// Returns a vector transformed (multiplied) by the inverse transformation matrix.
+        /// </summary>
+        /// <param name="v">A vector to inversely transform.</param>
+        /// <returns>The inversely transformed vector.</returns>
         public Vector2 XformInv(Vector2 v)
         {
             Vector2 vInv = v - origin;
@@ -292,11 +377,30 @@ namespace Godot
         private static readonly Transform2D _flipX = new Transform2D(-1, 0, 0, 1, 0, 0);
         private static readonly Transform2D _flipY = new Transform2D(1, 0, 0, -1, 0, 0);
 
-        public static Transform2D Identity => _identity;
-        public static Transform2D FlipX => _flipX;
-        public static Transform2D FlipY => _flipY;
-
-        // Constructors
+        /// <summary>
+        /// The identity transform, with no translation, rotation, or scaling applied.
+        /// This is used as a replacement for `Transform2D()` in GDScript.
+        /// Do not use `new Transform2D()` with no arguments in C#, because it sets all values to zero.
+        /// </summary>
+        /// <value>Equivalent to `new Transform2D(Vector2.Right, Vector2.Down, Vector2.Zero)`.</value>
+        public static Transform2D Identity { get { return _identity; } }
+        /// <summary>
+        /// The transform that will flip something along the X axis.
+        /// </summary>
+        /// <value>Equivalent to `new Transform2D(Vector2.Left, Vector2.Down, Vector2.Zero)`.</value>
+        public static Transform2D FlipX { get { return _flipX; } }
+        /// <summary>
+        /// The transform that will flip something along the Y axis.
+        /// </summary>
+        /// <value>Equivalent to `new Transform2D(Vector2.Right, Vector2.Up, Vector2.Zero)`.</value>
+        public static Transform2D FlipY { get { return _flipY; } }
+
+        /// <summary>
+        /// Constructs a transformation matrix from 3 vectors (matrix columns).
+        /// </summary>
+        /// <param name="xAxis">The X vector, or column index 0.</param>
+        /// <param name="yAxis">The Y vector, or column index 1.</param>
+        /// <param name="originPos">The origin vector, or column index 2.</param>
         public Transform2D(Vector2 xAxis, Vector2 yAxis, Vector2 originPos)
         {
             x = xAxis;
@@ -304,7 +408,16 @@ namespace Godot
             origin = originPos;
         }
 
-        // Arguments are named such that xy is equal to calling x.y
+        /// <summary>
+        /// Constructs a transformation matrix from the given components.
+        /// Arguments are named such that xy is equal to calling x.y
+        /// </summary>
+        /// <param name="xx">The X component of the X column vector, accessed via `t.x.x` or `[0][0]`</param>
+        /// <param name="xy">The Y component of the X column vector, accessed via `t.x.y` or `[0][1]`</param>
+        /// <param name="yx">The X component of the Y column vector, accessed via `t.y.x` or `[1][0]`</param>
+        /// <param name="yy">The Y component of the Y column vector, accessed via `t.y.y` or `[1][1]`</param>
+        /// <param name="ox">The X component of the origin vector, accessed via `t.origin.x` or `[2][0]`</param>
+        /// <param name="oy">The Y component of the origin vector, accessed via `t.origin.y` or `[2][1]`</param>
         public Transform2D(real_t xx, real_t xy, real_t yx, real_t yy, real_t ox, real_t oy)
         {
             x = new Vector2(xx, xy);
@@ -312,6 +425,11 @@ namespace Godot
             origin = new Vector2(ox, oy);
         }
 
+        /// <summary>
+        /// Constructs a transformation matrix from a rotation value and origin vector.
+        /// </summary>
+        /// <param name="rot">The rotation of the new transform, in radians.</param>
+        /// <param name="pos">The origin vector, or column index 2.</param>
         public Transform2D(real_t rot, Vector2 pos)
         {
             x.x = y.y = Mathf.Cos(rot);
@@ -357,6 +475,12 @@ namespace Godot
             return x.Equals(other.x) && y.Equals(other.y) && origin.Equals(other.origin);
         }
 
+        /// <summary>
+        /// Returns true if this transform and `other` are approximately equal, by running
+        /// <see cref="Vector2.IsEqualApprox(Vector2)"/> on each component.
+        /// </summary>
+        /// <param name="other">The other transform to compare.</param>
+        /// <returns>Whether or not the matrices are approximately equal.</returns>
         public bool IsEqualApprox(Transform2D other)
         {
             return x.IsEqualApprox(other.x) && y.IsEqualApprox(other.y) && origin.IsEqualApprox(other.origin);
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector2.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector2.cs
index f92453f546..3dff37279b 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector2.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector2.cs
@@ -21,15 +21,29 @@ namespace Godot
     [StructLayout(LayoutKind.Sequential)]
     public struct Vector2 : IEquatable<Vector2>
     {
+        /// <summary>
+        /// Enumerated index values for the axes.
+        /// Returned by <see cref="MaxAxis"/> and <see cref="MinAxis"/>.
+        /// </summary>
         public enum Axis
         {
             X = 0,
             Y
         }
 
+        /// <summary>
+        /// The vector's X component. Also accessible by using the index position `[0]`.
+        /// </summary>
         public real_t x;
+        /// <summary>
+        /// The vector's Y component. Also accessible by using the index position `[1]`.
+        /// </summary>
         public real_t y;
 
+        /// <summary>
+        /// Access vector components using their index.
+        /// </summary>
+        /// <value>`[0]` is equivalent to `.x`, `[1]` is equivalent to `.y`.</value>
         public real_t this[int index]
         {
             get
@@ -76,46 +90,80 @@ namespace Godot
             }
         }
 
-        public real_t Cross(Vector2 b)
-        {
-            return x * b.y - y * b.x;
-        }
-
+        /// <summary>
+        /// Returns a new vector with all components in absolute values (i.e. positive).
+        /// </summary>
+        /// <returns>A vector with <see cref="Mathf.Abs(real_t)"/> called on each component.</returns>
         public Vector2 Abs()
         {
             return new Vector2(Mathf.Abs(x), Mathf.Abs(y));
         }
 
+        /// <summary>
+        /// Returns this vector's angle with respect to the X axis, or (1, 0) vector, in radians.
+        ///
+        /// Equivalent to the result of <see cref="Mathf.Atan2(real_t, real_t)"/> when
+        /// called with the vector's `y` and `x` as parameters: `Mathf.Atan2(v.y, v.x)`.
+        /// </summary>
+        /// <returns>The angle of this vector, in radians.</returns>
         public real_t Angle()
         {
             return Mathf.Atan2(y, x);
         }
 
+        /// <summary>
+        /// Returns the angle to the given vector, in radians.
+        /// </summary>
+        /// <param name="to">The other vector to compare this vector to.</param>
+        /// <returns>The angle between the two vectors, in radians.</returns>
         public real_t AngleTo(Vector2 to)
         {
             return Mathf.Atan2(Cross(to), Dot(to));
         }
 
+        /// <summary>
+        /// Returns the angle between the line connecting the two points and the X axis, in radians.
+        /// </summary>
+        /// <param name="to">The other vector to compare this vector to.</param>
+        /// <returns>The angle between the two vectors, in radians.</returns>
         public real_t AngleToPoint(Vector2 to)
         {
             return Mathf.Atan2(y - to.y, x - to.x);
         }
 
+        /// <summary>
+        /// Returns the aspect ratio of this vector, the ratio of `x` to `y`.
+        /// </summary>
+        /// <returns>The `x` component divided by the `y` component.</returns>
         public real_t Aspect()
         {
             return x / y;
         }
 
-        public Vector2 Bounce(Vector2 n)
+        /// <summary>
+        /// Returns the vector "bounced off" from a plane defined by the given normal.
+        /// </summary>
+        /// <param name="normal">The normal vector defining the plane to bounce off. Must be normalized.</param>
+        /// <returns>The bounced vector.</returns>
+        public Vector2 Bounce(Vector2 normal)
         {
-            return -Reflect(n);
+            return -Reflect(normal);
         }
 
+        /// <summary>
+        /// Returns a new vector with all components rounded up (towards positive infinity).
+        /// </summary>
+        /// <returns>A vector with <see cref="Mathf.Ceil"/> called on each component.</returns>
         public Vector2 Ceil()
         {
             return new Vector2(Mathf.Ceil(x), Mathf.Ceil(y));
         }
 
+        /// <summary>
+        /// Returns the vector with a maximum length by limiting its length to `length`.
+        /// </summary>
+        /// <param name="length">The length to limit to.</param>
+        /// <returns>The vector with its length limited.</returns>
         public Vector2 Clamped(real_t length)
         {
             var v = this;
@@ -130,12 +178,30 @@ namespace Godot
             return v;
         }
 
+        /// <summary>
+        /// Returns the cross product of this vector and `b`.
+        /// </summary>
+        /// <param name="b">The other vector.</param>
+        /// <returns>The cross product value.</returns>
+        public real_t Cross(Vector2 b)
+        {
+            return x * b.y - y * b.x;
+        }
+
+        /// <summary>
+        /// Performs a cubic interpolation between vectors `preA`, this vector, `b`, and `postB`, by the given amount `t`.
+        /// </summary>
+        /// <param name="b">The destination vector.</param>
+        /// <param name="preA">A vector before this vector.</param>
+        /// <param name="postB">A vector after `b`.</param>
+        /// <param name="t">A value on the range of 0.0 to 1.0, representing the amount of interpolation.</param>
+        /// <returns>The interpolated vector.</returns>
         public Vector2 CubicInterpolate(Vector2 b, Vector2 preA, Vector2 postB, real_t t)
         {
-            var p0 = preA;
-            var p1 = this;
-            var p2 = b;
-            var p3 = postB;
+            Vector2 p0 = preA;
+            Vector2 p1 = this;
+            Vector2 p2 = b;
+            Vector2 p3 = postB;
 
             real_t t2 = t * t;
             real_t t3 = t2 * t;
@@ -146,56 +212,153 @@ namespace Godot
                                 (-p0 + 3.0f * p1 - 3.0f * p2 + p3) * t3);
         }
 
+        /// <summary>
+        /// Returns the normalized vector pointing from this vector to `b`.
+        /// </summary>
+        /// <param name="b">The other vector to point towards.</param>
+        /// <returns>The direction from this vector to `b`.</returns>
         public Vector2 DirectionTo(Vector2 b)
         {
             return new Vector2(b.x - x, b.y - y).Normalized();
         }
 
+        /// <summary>
+        /// Returns the squared distance between this vector and `to`.
+        /// This method runs faster than <see cref="DistanceTo"/>, so prefer it if
+        /// you need to compare vectors or need the squared distance for some formula.
+        /// </summary>
+        /// <param name="to">The other vector to use.</param>
+        /// <returns>The squared distance between the two vectors.</returns>
         public real_t DistanceSquaredTo(Vector2 to)
         {
             return (x - to.x) * (x - to.x) + (y - to.y) * (y - to.y);
         }
 
+        /// <summary>
+        /// Returns the distance between this vector and `to`.
+        /// </summary>
+        /// <param name="to">The other vector to use.</param>
+        /// <returns>The distance between the two vectors.</returns>
         public real_t DistanceTo(Vector2 to)
         {
             return Mathf.Sqrt((x - to.x) * (x - to.x) + (y - to.y) * (y - to.y));
         }
 
+        /// <summary>
+        /// Returns the dot product of this vector and `with`.
+        /// </summary>
+        /// <param name="with">The other vector to use.</param>
+        /// <returns>The dot product of the two vectors.</returns>
         public real_t Dot(Vector2 with)
         {
             return x * with.x + y * with.y;
         }
 
+        /// <summary>
+        /// Returns a new vector with all components rounded down (towards negative infinity).
+        /// </summary>
+        /// <returns>A vector with <see cref="Mathf.Floor"/> called on each component.</returns>
         public Vector2 Floor()
         {
             return new Vector2(Mathf.Floor(x), Mathf.Floor(y));
         }
 
+        /// <summary>
+        /// Returns the inverse of this vector. This is the same as `new Vector2(1 / v.x, 1 / v.y)`.
+        /// </summary>
+        /// <returns>The inverse of this vector.</returns>
+        public Vector2 Inverse()
+        {
+            return new Vector2(1 / x, 1 / y);
+        }
+
+        /// <summary>
+        /// Returns true if the vector is normalized, and false otherwise.
+        /// </summary>
+        /// <returns>A bool indicating whether or not the vector is normalized.</returns>
         public bool IsNormalized()
         {
             return Mathf.Abs(LengthSquared() - 1.0f) < Mathf.Epsilon;
         }
 
+        /// <summary>
+        /// Returns the length (magnitude) of this vector.
+        /// </summary>
+        /// <returns>The length of this vector.</returns>
         public real_t Length()
         {
             return Mathf.Sqrt(x * x + y * y);
         }
 
+        /// <summary>
+        /// Returns the squared length (squared magnitude) of this vector.
+        /// This method runs faster than <see cref="Length"/>, so prefer it if
+        /// you need to compare vectors or need the squared length for some formula.
+        /// </summary>
+        /// <returns>The squared length of this vector.</returns>
         public real_t LengthSquared()
         {
             return x * x + y * y;
         }
 
-        public Vector2 LinearInterpolate(Vector2 b, real_t t)
-        {
-            var res = this;
-
-            res.x += t * (b.x - x);
-            res.y += t * (b.y - y);
-
-            return res;
-        }
-
+        /// <summary>
+        /// Returns the result of the linear interpolation between
+        /// this vector and `to` by amount `weight`.
+        /// </summary>
+        /// <param name="to">The destination vector for interpolation.</param>
+        /// <param name="weight">A value on the range of 0.0 to 1.0, representing the amount of interpolation.</param>
+        /// <returns>The resulting vector of the interpolation.</returns>
+        public Vector2 Lerp(Vector2 to, real_t weight)
+        {
+            return new Vector2
+            (
+                Mathf.Lerp(x, to.x, weight),
+                Mathf.Lerp(y, to.y, weight)
+            );
+        }
+
+        /// <summary>
+        /// Returns the result of the linear interpolation between
+        /// this vector and `to` by the vector amount `weight`.
+        /// </summary>
+        /// <param name="to">The destination vector for interpolation.</param>
+        /// <param name="weight">A vector with components on the range of 0.0 to 1.0, representing the amount of interpolation.</param>
+        /// <returns>The resulting vector of the interpolation.</returns>
+        public Vector2 Lerp(Vector2 to, Vector2 weight)
+        {
+            return new Vector2
+            (
+                Mathf.Lerp(x, to.x, weight.x),
+                Mathf.Lerp(y, to.y, weight.y)
+            );
+        }
+
+        /// <summary>
+        /// Returns the axis of the vector's largest value. See <see cref="Axis"/>.
+        /// If both components are equal, this method returns <see cref="Axis.X"/>.
+        /// </summary>
+        /// <returns>The index of the largest axis.</returns>
+        public Axis MaxAxis()
+        {
+            return x < y ? Axis.Y : Axis.X;
+        }
+
+        /// <summary>
+        /// Returns the axis of the vector's smallest value. See <see cref="Axis"/>.
+        /// If both components are equal, this method returns <see cref="Axis.Y"/>.
+        /// </summary>
+        /// <returns>The index of the smallest axis.</returns>
+        public Axis MinAxis()
+        {
+            return x < y ? Axis.X : Axis.Y;
+        }
+
+        /// <summary>
+        /// Moves this vector toward `to` by the fixed `delta` amount.
+        /// </summary>
+        /// <param name="to">The vector to move towards.</param>
+        /// <param name="delta">The amount to move towards by.</param>
+        /// <returns>The resulting vector.</returns>
         public Vector2 MoveToward(Vector2 to, real_t delta)
         {
             var v = this;
@@ -204,6 +367,10 @@ namespace Godot
             return len <= delta || len < Mathf.Epsilon ? to : v + vd / len * delta;
         }
 
+        /// <summary>
+        /// Returns the vector scaled to unit length. Equivalent to `v / v.Length()`.
+        /// </summary>
+        /// <returns>A normalized version of the vector.</returns>
         public Vector2 Normalized()
         {
             var v = this;
@@ -211,6 +378,11 @@ namespace Godot
             return v;
         }
 
+        /// <summary>
+        /// Returns a vector composed of the <see cref="Mathf.PosMod(real_t, real_t)"/> of this vector's components and `mod`.
+        /// </summary>
+        /// <param name="mod">A value representing the divisor of the operation.</param>
+        /// <returns>A vector with each component <see cref="Mathf.PosMod(real_t, real_t)"/> by `mod`.</returns>
         public Vector2 PosMod(real_t mod)
         {
             Vector2 v;
@@ -219,6 +391,11 @@ namespace Godot
             return v;
         }
 
+        /// <summary>
+        /// Returns a vector composed of the <see cref="Mathf.PosMod(real_t, real_t)"/> of this vector's components and `modv`'s components.
+        /// </summary>
+        /// <param name="modv">A vector representing the divisors of the operation.</param>
+        /// <returns>A vector with each component <see cref="Mathf.PosMod(real_t, real_t)"/> by `modv`'s components.</returns>
         public Vector2 PosMod(Vector2 modv)
         {
             Vector2 v;
@@ -227,40 +404,59 @@ namespace Godot
             return v;
         }
 
+        /// <summary>
+        /// Returns this vector projected onto another vector `b`.
+        /// </summary>
+        /// <param name="onNormal">The vector to project onto.</param>
+        /// <returns>The projected vector.</returns>
         public Vector2 Project(Vector2 onNormal)
         {
             return onNormal * (Dot(onNormal) / onNormal.LengthSquared());
         }
 
-        public Vector2 Reflect(Vector2 n)
+        /// <summary>
+        /// Returns this vector reflected from a plane defined by the given `normal`.
+        /// </summary>
+        /// <param name="normal">The normal vector defining the plane to reflect from. Must be normalized.</param>
+        /// <returns>The reflected vector.</returns>
+        public Vector2 Reflect(Vector2 normal)
         {
-            return 2.0f * n * Dot(n) - this;
+#if DEBUG
+            if (!normal.IsNormalized())
+            {
+                throw new ArgumentException("Argument  is not normalized", nameof(normal));
+            }
+#endif
+            return 2 * Dot(normal) * normal - this;
         }
 
+        /// <summary>
+        /// Rotates this vector by `phi` radians.
+        /// </summary>
+        /// <param name="phi">The angle to rotate by, in radians.</param>
+        /// <returns>The rotated vector.</returns>
         public Vector2 Rotated(real_t phi)
         {
             real_t rads = Angle() + phi;
             return new Vector2(Mathf.Cos(rads), Mathf.Sin(rads)) * Length();
         }
 
+        /// <summary>
+        /// Returns this vector with all components rounded to the nearest integer,
+        /// with halfway cases rounded towards the nearest multiple of two.
+        /// </summary>
+        /// <returns>The rounded vector.</returns>
         public Vector2 Round()
         {
             return new Vector2(Mathf.Round(x), Mathf.Round(y));
         }
 
-        [Obsolete("Set is deprecated. Use the Vector2(" + nameof(real_t) + ", " + nameof(real_t) + ") constructor instead.", error: true)]
-        public void Set(real_t x, real_t y)
-        {
-            this.x = x;
-            this.y = y;
-        }
-        [Obsolete("Set is deprecated. Use the Vector2(" + nameof(Vector2) + ") constructor instead.", error: true)]
-        public void Set(Vector2 v)
-        {
-            x = v.x;
-            y = v.y;
-        }
-
+        /// <summary>
+        /// Returns a vector with each component set to one or negative one, depending
+        /// on the signs of this vector's components, or zero if the component is zero,
+        /// by calling <see cref="Mathf.Sign(real_t)"/> on each component.
+        /// </summary>
+        /// <returns>A vector with all components as either `1`, `-1`, or `0`.</returns>
         public Vector2 Sign()
         {
             Vector2 v;
@@ -269,23 +465,57 @@ namespace Godot
             return v;
         }
 
-        public Vector2 Slerp(Vector2 b, real_t t)
+        /// <summary>
+        /// Returns the result of the spherical linear interpolation between
+        /// this vector and `to` by amount `weight`.
+        ///
+        /// Note: Both vectors must be normalized.
+        /// </summary>
+        /// <param name="to">The destination vector for interpolation. Must be normalized.</param>
+        /// <param name="weight">A value on the range of 0.0 to 1.0, representing the amount of interpolation.</param>
+        /// <returns>The resulting vector of the interpolation.</returns>
+        public Vector2 Slerp(Vector2 to, real_t weight)
         {
-            real_t theta = AngleTo(b);
-            return Rotated(theta * t);
+#if DEBUG
+            if (!IsNormalized())
+            {
+                throw new InvalidOperationException("Vector2.Slerp: From vector is not normalized.");
+            }
+            if (!to.IsNormalized())
+            {
+                throw new InvalidOperationException("Vector2.Slerp: `to` is not normalized.");
+            }
+#endif
+            return Rotated(AngleTo(to) * weight);
         }
 
-        public Vector2 Slide(Vector2 n)
+        /// <summary>
+        /// Returns this vector slid along a plane defined by the given normal.
+        /// </summary>
+        /// <param name="normal">The normal vector defining the plane to slide on.</param>
+        /// <returns>The slid vector.</returns>
+        public Vector2 Slide(Vector2 normal)
         {
-            return this - n * Dot(n);
+            return this - normal * Dot(normal);
         }
 
-        public Vector2 Snapped(Vector2 by)
+        /// <summary>
+        /// Returns this vector with each component snapped to the nearest multiple of `step`.
+        /// This can also be used to round to an arbitrary number of decimals.
+        /// </summary>
+        /// <param name="step">A vector value representing the step size to snap to.</param>
+        /// <returns>The snapped vector.</returns>
+        public Vector2 Snapped(Vector2 step)
         {
-            return new Vector2(Mathf.Stepify(x, by.x), Mathf.Stepify(y, by.y));
+            return new Vector2(Mathf.Stepify(x, step.x), Mathf.Stepify(y, step.y));
         }
 
-        public Vector2 Tangent()
+        /// <summary>
+        /// Returns a perpendicular vector rotated 90 degrees counter-clockwise
+        /// compared to the original, with the same length.
+        /// </summary>
+        /// <returns>The perpendicular vector.</returns>
+        public Vector2 Perpendicular()
         {
             return new Vector2(y, -x);
         }
@@ -293,7 +523,6 @@ namespace Godot
         // Constants
         private static readonly Vector2 _zero = new Vector2(0, 0);
         private static readonly Vector2 _one = new Vector2(1, 1);
-        private static readonly Vector2 _negOne = new Vector2(-1, -1);
         private static readonly Vector2 _inf = new Vector2(Mathf.Inf, Mathf.Inf);
 
         private static readonly Vector2 _up = new Vector2(0, -1);
@@ -301,22 +530,58 @@ namespace Godot
         private static readonly Vector2 _right = new Vector2(1, 0);
         private static readonly Vector2 _left = new Vector2(-1, 0);
 
+        /// <summary>
+        /// Zero vector, a vector with all components set to `0`.
+        /// </summary>
+        /// <value>Equivalent to `new Vector2(0, 0)`</value>
         public static Vector2 Zero { get { return _zero; } }
-        public static Vector2 NegOne { get { return _negOne; } }
+        /// <summary>
+        /// One vector, a vector with all components set to `1`.
+        /// </summary>
+        /// <value>Equivalent to `new Vector2(1, 1)`</value>
         public static Vector2 One { get { return _one; } }
+        /// <summary>
+        /// Infinity vector, a vector with all components set to `Mathf.Inf`.
+        /// </summary>
+        /// <value>Equivalent to `new Vector2(Mathf.Inf, Mathf.Inf)`</value>
         public static Vector2 Inf { get { return _inf; } }
 
+        /// <summary>
+        /// Up unit vector. Y is down in 2D, so this vector points -Y.
+        /// </summary>
+        /// <value>Equivalent to `new Vector2(0, -1)`</value>
         public static Vector2 Up { get { return _up; } }
+        /// <summary>
+        /// Down unit vector. Y is down in 2D, so this vector points +Y.
+        /// </summary>
+        /// <value>Equivalent to `new Vector2(0, 1)`</value>
         public static Vector2 Down { get { return _down; } }
+        /// <summary>
+        /// Right unit vector. Represents the direction of right.
+        /// </summary>
+        /// <value>Equivalent to `new Vector2(1, 0)`</value>
         public static Vector2 Right { get { return _right; } }
+        /// <summary>
+        /// Left unit vector. Represents the direction of left.
+        /// </summary>
+        /// <value>Equivalent to `new Vector2(-1, 0)`</value>
         public static Vector2 Left { get { return _left; } }
 
-        // Constructors
+        /// <summary>
+        /// Constructs a new <see cref="Vector2"/> with the given components.
+        /// </summary>
+        /// <param name="x">The vector's X component.</param>
+        /// <param name="y">The vector's Y component.</param>
         public Vector2(real_t x, real_t y)
         {
             this.x = x;
             this.y = y;
         }
+
+        /// <summary>
+        /// Constructs a new <see cref="Vector2"/> from an existing <see cref="Vector2"/>.
+        /// </summary>
+        /// <param name="v">The existing <see cref="Vector2"/>.</param>
         public Vector2(Vector2 v)
         {
             x = v.x;
@@ -365,18 +630,18 @@ namespace Godot
             return left;
         }
 
-        public static Vector2 operator /(Vector2 vec, real_t scale)
+        public static Vector2 operator /(Vector2 vec, real_t divisor)
         {
-            vec.x /= scale;
-            vec.y /= scale;
+            vec.x /= divisor;
+            vec.y /= divisor;
             return vec;
         }
 
-        public static Vector2 operator /(Vector2 left, Vector2 right)
+        public static Vector2 operator /(Vector2 vec, Vector2 divisorv)
         {
-            left.x /= right.x;
-            left.y /= right.y;
-            return left;
+            vec.x /= divisorv.x;
+            vec.y /= divisorv.y;
+            return vec;
         }
 
         public static Vector2 operator %(Vector2 vec, real_t divisor)
@@ -405,41 +670,37 @@ namespace Godot
 
         public static bool operator <(Vector2 left, Vector2 right)
         {
-            if (Mathf.IsEqualApprox(left.x, right.x))
+            if (left.x == right.x)
             {
                 return left.y < right.y;
             }
-
             return left.x < right.x;
         }
 
         public static bool operator >(Vector2 left, Vector2 right)
         {
-            if (Mathf.IsEqualApprox(left.x, right.x))
+            if (left.x == right.x)
             {
                 return left.y > right.y;
             }
-
             return left.x > right.x;
         }
 
         public static bool operator <=(Vector2 left, Vector2 right)
         {
-            if (Mathf.IsEqualApprox(left.x, right.x))
+            if (left.x == right.x)
             {
                 return left.y <= right.y;
             }
-
             return left.x <= right.x;
         }
 
         public static bool operator >=(Vector2 left, Vector2 right)
         {
-            if (Mathf.IsEqualApprox(left.x, right.x))
+            if (left.x == right.x)
             {
                 return left.y >= right.y;
             }
-
             return left.x >= right.x;
         }
 
@@ -449,7 +710,6 @@ namespace Godot
             {
                 return Equals((Vector2)obj);
             }
-
             return false;
         }
 
@@ -458,6 +718,12 @@ namespace Godot
             return x == other.x && y == other.y;
         }
 
+        /// <summary>
+        /// Returns true if this vector and `other` are approximately equal, by running
+        /// <see cref="Mathf.IsEqualApprox(real_t, real_t)"/> on each component.
+        /// </summary>
+        /// <param name="other">The other vector to compare.</param>
+        /// <returns>Whether or not the vectors are approximately equal.</returns>
         public bool IsEqualApprox(Vector2 other)
         {
             return Mathf.IsEqualApprox(x, other.x) && Mathf.IsEqualApprox(y, other.y);
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector2i.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector2i.cs
new file mode 100644
index 0000000000..8dd9ab2f0d
--- /dev/null
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector2i.cs
@@ -0,0 +1,511 @@
+using System;
+using System.Runtime.InteropServices;
+
+#if REAL_T_IS_DOUBLE
+using real_t = System.Double;
+#else
+using real_t = System.Single;
+#endif
+
+namespace Godot
+{
+    /// <summary>
+    /// 2-element structure that can be used to represent 2D grid coordinates or pairs of integers.
+    /// </summary>
+    [Serializable]
+    [StructLayout(LayoutKind.Sequential)]
+    public struct Vector2i : IEquatable<Vector2i>
+    {
+        /// <summary>
+        /// Enumerated index values for the axes.
+        /// Returned by <see cref="MaxAxis"/> and <see cref="MinAxis"/>.
+        /// </summary>
+        public enum Axis
+        {
+            X = 0,
+            Y
+        }
+
+        /// <summary>
+        /// The vector's X component. Also accessible by using the index position `[0]`.
+        /// </summary>
+        public int x;
+        /// <summary>
+        /// The vector's Y component. Also accessible by using the index position `[1]`.
+        /// </summary>
+        public int y;
+
+        /// <summary>
+        /// Access vector components using their index.
+        /// </summary>
+        /// <value>`[0]` is equivalent to `.x`, `[1]` is equivalent to `.y`.</value>
+        public int this[int index]
+        {
+            get
+            {
+                switch (index)
+                {
+                    case 0:
+                        return x;
+                    case 1:
+                        return y;
+                    default:
+                        throw new IndexOutOfRangeException();
+                }
+            }
+            set
+            {
+                switch (index)
+                {
+                    case 0:
+                        x = value;
+                        return;
+                    case 1:
+                        y = value;
+                        return;
+                    default:
+                        throw new IndexOutOfRangeException();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns a new vector with all components in absolute values (i.e. positive).
+        /// </summary>
+        /// <returns>A vector with <see cref="Mathf.Abs(int)"/> called on each component.</returns>
+        public Vector2i Abs()
+        {
+            return new Vector2i(Mathf.Abs(x), Mathf.Abs(y));
+        }
+
+        /// <summary>
+        /// Returns this vector's angle with respect to the X axis, or (1, 0) vector, in radians.
+        ///
+        /// Equivalent to the result of <see cref="Mathf.Atan2(real_t, real_t)"/> when
+        /// called with the vector's `y` and `x` as parameters: `Mathf.Atan2(v.y, v.x)`.
+        /// </summary>
+        /// <returns>The angle of this vector, in radians.</returns>
+        public real_t Angle()
+        {
+            return Mathf.Atan2(y, x);
+        }
+
+        /// <summary>
+        /// Returns the angle to the given vector, in radians.
+        /// </summary>
+        /// <param name="to">The other vector to compare this vector to.</param>
+        /// <returns>The angle between the two vectors, in radians.</returns>
+        public real_t AngleTo(Vector2i to)
+        {
+            return Mathf.Atan2(Cross(to), Dot(to));
+        }
+
+        /// <summary>
+        /// Returns the angle between the line connecting the two points and the X axis, in radians.
+        /// </summary>
+        /// <param name="to">The other vector to compare this vector to.</param>
+        /// <returns>The angle between the two vectors, in radians.</returns>
+        public real_t AngleToPoint(Vector2i to)
+        {
+            return Mathf.Atan2(y - to.y, x - to.x);
+        }
+
+        /// <summary>
+        /// Returns the aspect ratio of this vector, the ratio of `x` to `y`.
+        /// </summary>
+        /// <returns>The `x` component divided by the `y` component.</returns>
+        public real_t Aspect()
+        {
+            return x / (real_t)y;
+        }
+
+        /// <summary>
+        /// Returns the cross product of this vector and `b`.
+        /// </summary>
+        /// <param name="b">The other vector.</param>
+        /// <returns>The cross product vector.</returns>
+        public int Cross(Vector2i b)
+        {
+            return x * b.y - y * b.x;
+        }
+
+        /// <summary>
+        /// Returns the squared distance between this vector and `b`.
+        /// This method runs faster than <see cref="DistanceTo"/>, so prefer it if
+        /// you need to compare vectors or need the squared distance for some formula.
+        /// </summary>
+        /// <param name="b">The other vector to use.</param>
+        /// <returns>The squared distance between the two vectors.</returns>
+        public int DistanceSquaredTo(Vector2i b)
+        {
+            return (b - this).LengthSquared();
+        }
+
+        /// <summary>
+        /// Returns the distance between this vector and `b`.
+        /// </summary>
+        /// <param name="b">The other vector to use.</param>
+        /// <returns>The distance between the two vectors.</returns>
+        public real_t DistanceTo(Vector2i b)
+        {
+            return (b - this).Length();
+        }
+
+        /// <summary>
+        /// Returns the dot product of this vector and `b`.
+        /// </summary>
+        /// <param name="b">The other vector to use.</param>
+        /// <returns>The dot product of the two vectors.</returns>
+        public int Dot(Vector2i b)
+        {
+            return x * b.x + y * b.y;
+        }
+
+        /// <summary>
+        /// Returns the length (magnitude) of this vector.
+        /// </summary>
+        /// <returns>The length of this vector.</returns>
+        public real_t Length()
+        {
+            int x2 = x * x;
+            int y2 = y * y;
+
+            return Mathf.Sqrt(x2 + y2);
+        }
+
+        /// <summary>
+        /// Returns the squared length (squared magnitude) of this vector.
+        /// This method runs faster than <see cref="Length"/>, so prefer it if
+        /// you need to compare vectors or need the squared length for some formula.
+        /// </summary>
+        /// <returns>The squared length of this vector.</returns>
+        public int LengthSquared()
+        {
+            int x2 = x * x;
+            int y2 = y * y;
+
+            return x2 + y2;
+        }
+
+        /// <summary>
+        /// Returns the axis of the vector's largest value. See <see cref="Axis"/>.
+        /// If both components are equal, this method returns <see cref="Axis.X"/>.
+        /// </summary>
+        /// <returns>The index of the largest axis.</returns>
+        public Axis MaxAxis()
+        {
+            return x < y ? Axis.Y : Axis.X;
+        }
+
+        /// <summary>
+        /// Returns the axis of the vector's smallest value. See <see cref="Axis"/>.
+        /// If both components are equal, this method returns <see cref="Axis.Y"/>.
+        /// </summary>
+        /// <returns>The index of the smallest axis.</returns>
+        public Axis MinAxis()
+        {
+            return x < y ? Axis.X : Axis.Y;
+        }
+
+        /// <summary>
+        /// Returns a vector composed of the <see cref="Mathf.PosMod(int, int)"/> of this vector's components and `mod`.
+        /// </summary>
+        /// <param name="mod">A value representing the divisor of the operation.</param>
+        /// <returns>A vector with each component <see cref="Mathf.PosMod(int, int)"/> by `mod`.</returns>
+        public Vector2i PosMod(int mod)
+        {
+            Vector2i v = this;
+            v.x = Mathf.PosMod(v.x, mod);
+            v.y = Mathf.PosMod(v.y, mod);
+            return v;
+        }
+
+        /// <summary>
+        /// Returns a vector composed of the <see cref="Mathf.PosMod(int, int)"/> of this vector's components and `modv`'s components.
+        /// </summary>
+        /// <param name="modv">A vector representing the divisors of the operation.</param>
+        /// <returns>A vector with each component <see cref="Mathf.PosMod(int, int)"/> by `modv`'s components.</returns>
+        public Vector2i PosMod(Vector2i modv)
+        {
+            Vector2i v = this;
+            v.x = Mathf.PosMod(v.x, modv.x);
+            v.y = Mathf.PosMod(v.y, modv.y);
+            return v;
+        }
+
+        /// <summary>
+        /// Returns a vector with each component set to one or negative one, depending
+        /// on the signs of this vector's components, or zero if the component is zero,
+        /// by calling <see cref="Mathf.Sign(int)"/> on each component.
+        /// </summary>
+        /// <returns>A vector with all components as either `1`, `-1`, or `0`.</returns>
+        public Vector2i Sign()
+        {
+            Vector2i v = this;
+            v.x = Mathf.Sign(v.x);
+            v.y = Mathf.Sign(v.y);
+            return v;
+        }
+
+        /// <summary>
+        /// Returns a vector rotated 90 degrees counter-clockwise
+        /// compared to the original, with the same length.
+        /// </summary>
+        /// <returns>The perpendicular vector.</returns>
+        public Vector2 Perpendicular()
+        {
+            return new Vector2(y, -x);
+        }
+
+        // Constants
+        private static readonly Vector2i _zero = new Vector2i(0, 0);
+        private static readonly Vector2i _one = new Vector2i(1, 1);
+
+        private static readonly Vector2i _up = new Vector2i(0, -1);
+        private static readonly Vector2i _down = new Vector2i(0, 1);
+        private static readonly Vector2i _right = new Vector2i(1, 0);
+        private static readonly Vector2i _left = new Vector2i(-1, 0);
+
+        /// <summary>
+        /// Zero vector, a vector with all components set to `0`.
+        /// </summary>
+        /// <value>Equivalent to `new Vector2i(0, 0)`</value>
+        public static Vector2i Zero { get { return _zero; } }
+        /// <summary>
+        /// One vector, a vector with all components set to `1`.
+        /// </summary>
+        /// <value>Equivalent to `new Vector2i(1, 1)`</value>
+        public static Vector2i One { get { return _one; } }
+
+        /// <summary>
+        /// Up unit vector. Y is down in 2D, so this vector points -Y.
+        /// </summary>
+        /// <value>Equivalent to `new Vector2i(0, -1)`</value>
+        public static Vector2i Up { get { return _up; } }
+        /// <summary>
+        /// Down unit vector. Y is down in 2D, so this vector points +Y.
+        /// </summary>
+        /// <value>Equivalent to `new Vector2i(0, 1)`</value>
+        public static Vector2i Down { get { return _down; } }
+        /// <summary>
+        /// Right unit vector. Represents the direction of right.
+        /// </summary>
+        /// <value>Equivalent to `new Vector2i(1, 0)`</value>
+        public static Vector2i Right { get { return _right; } }
+        /// <summary>
+        /// Left unit vector. Represents the direction of left.
+        /// </summary>
+        /// <value>Equivalent to `new Vector2i(-1, 0)`</value>
+        public static Vector2i Left { get { return _left; } }
+
+        /// <summary>
+        /// Constructs a new <see cref="Vector2i"/> with the given components.
+        /// </summary>
+        /// <param name="x">The vector's X component.</param>
+        /// <param name="y">The vector's Y component.</param>
+        public Vector2i(int x, int y)
+        {
+            this.x = x;
+            this.y = y;
+        }
+
+        /// <summary>
+        /// Constructs a new <see cref="Vector2i"/> from an existing <see cref="Vector2i"/>.
+        /// </summary>
+        /// <param name="vi">The existing <see cref="Vector2i"/>.</param>
+        public Vector2i(Vector2i vi)
+        {
+            this.x = vi.x;
+            this.y = vi.y;
+        }
+
+        /// <summary>
+        /// Constructs a new <see cref="Vector2i"/> from an existing <see cref="Vector2"/>
+        /// by rounding the components via <see cref="Mathf.RoundToInt(real_t)"/>.
+        /// </summary>
+        /// <param name="v">The <see cref="Vector2"/> to convert.</param>
+        public Vector2i(Vector2 v)
+        {
+            this.x = Mathf.RoundToInt(v.x);
+            this.y = Mathf.RoundToInt(v.y);
+        }
+
+        public static Vector2i operator +(Vector2i left, Vector2i right)
+        {
+            left.x += right.x;
+            left.y += right.y;
+            return left;
+        }
+
+        public static Vector2i operator -(Vector2i left, Vector2i right)
+        {
+            left.x -= right.x;
+            left.y -= right.y;
+            return left;
+        }
+
+        public static Vector2i operator -(Vector2i vec)
+        {
+            vec.x = -vec.x;
+            vec.y = -vec.y;
+            return vec;
+        }
+
+        public static Vector2i operator *(Vector2i vec, int scale)
+        {
+            vec.x *= scale;
+            vec.y *= scale;
+            return vec;
+        }
+
+        public static Vector2i operator *(int scale, Vector2i vec)
+        {
+            vec.x *= scale;
+            vec.y *= scale;
+            return vec;
+        }
+
+        public static Vector2i operator *(Vector2i left, Vector2i right)
+        {
+            left.x *= right.x;
+            left.y *= right.y;
+            return left;
+        }
+
+        public static Vector2i operator /(Vector2i vec, int divisor)
+        {
+            vec.x /= divisor;
+            vec.y /= divisor;
+            return vec;
+        }
+
+        public static Vector2i operator /(Vector2i vec, Vector2i divisorv)
+        {
+            vec.x /= divisorv.x;
+            vec.y /= divisorv.y;
+            return vec;
+        }
+
+        public static Vector2i operator %(Vector2i vec, int divisor)
+        {
+            vec.x %= divisor;
+            vec.y %= divisor;
+            return vec;
+        }
+
+        public static Vector2i operator %(Vector2i vec, Vector2i divisorv)
+        {
+            vec.x %= divisorv.x;
+            vec.y %= divisorv.y;
+            return vec;
+        }
+
+        public static Vector2i operator &(Vector2i vec, int and)
+        {
+            vec.x &= and;
+            vec.y &= and;
+            return vec;
+        }
+
+        public static Vector2i operator &(Vector2i vec, Vector2i andv)
+        {
+            vec.x &= andv.x;
+            vec.y &= andv.y;
+            return vec;
+        }
+
+        public static bool operator ==(Vector2i left, Vector2i right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(Vector2i left, Vector2i right)
+        {
+            return !left.Equals(right);
+        }
+
+        public static bool operator <(Vector2i left, Vector2i right)
+        {
+            if (left.x.Equals(right.x))
+            {
+                return left.y < right.y;
+            }
+            return left.x < right.x;
+        }
+
+        public static bool operator >(Vector2i left, Vector2i right)
+        {
+            if (left.x.Equals(right.x))
+            {
+                return left.y > right.y;
+            }
+            return left.x > right.x;
+        }
+
+        public static bool operator <=(Vector2i left, Vector2i right)
+        {
+            if (left.x.Equals(right.x))
+            {
+                return left.y <= right.y;
+            }
+            return left.x <= right.x;
+        }
+
+        public static bool operator >=(Vector2i left, Vector2i right)
+        {
+            if (left.x.Equals(right.x))
+            {
+                return left.y >= right.y;
+            }
+            return left.x >= right.x;
+        }
+
+        public static implicit operator Vector2(Vector2i value)
+        {
+            return new Vector2(value.x, value.y);
+        }
+
+        public static explicit operator Vector2i(Vector2 value)
+        {
+            return new Vector2i(value);
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj is Vector2i)
+            {
+                return Equals((Vector2i)obj);
+            }
+
+            return false;
+        }
+
+        public bool Equals(Vector2i other)
+        {
+            return x == other.x && y == other.y;
+        }
+
+        public override int GetHashCode()
+        {
+            return y.GetHashCode() ^ x.GetHashCode();
+        }
+
+        public override string ToString()
+        {
+            return String.Format("({0}, {1})", new object[]
+            {
+                this.x.ToString(),
+                this.y.ToString()
+            });
+        }
+
+        public string ToString(string format)
+        {
+            return String.Format("({0}, {1})", new object[]
+            {
+                this.x.ToString(format),
+                this.y.ToString(format)
+            });
+        }
+    }
+}
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector3.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector3.cs
index fded34002d..4a4a2a43cd 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector3.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector3.cs
@@ -21,6 +21,10 @@ namespace Godot
     [StructLayout(LayoutKind.Sequential)]
     public struct Vector3 : IEquatable<Vector3>
     {
+        /// <summary>
+        /// Enumerated index values for the axes.
+        /// Returned by <see cref="MaxAxis"/> and <see cref="MinAxis"/>.
+        /// </summary>
         public enum Axis
         {
             X = 0,
@@ -28,10 +32,23 @@ namespace Godot
             Z
         }
 
+        /// <summary>
+        /// The vector's X component. Also accessible by using the index position `[0]`.
+        /// </summary>
         public real_t x;
+        /// <summary>
+        /// The vector's Y component. Also accessible by using the index position `[1]`.
+        /// </summary>
         public real_t y;
+        /// <summary>
+        /// The vector's Z component. Also accessible by using the index position `[2]`.
+        /// </summary>
         public real_t z;
 
+        /// <summary>
+        /// Access vector components using their index.
+        /// </summary>
+        /// <value>`[0]` is equivalent to `.x`, `[1]` is equivalent to `.y`, `[2]` is equivalent to `.z`.</value>
         public real_t this[int index]
         {
             get
@@ -84,26 +101,49 @@ namespace Godot
             }
         }
 
+        /// <summary>
+        /// Returns a new vector with all components in absolute values (i.e. positive).
+        /// </summary>
+        /// <returns>A vector with <see cref="Mathf.Abs(real_t)"/> called on each component.</returns>
         public Vector3 Abs()
         {
             return new Vector3(Mathf.Abs(x), Mathf.Abs(y), Mathf.Abs(z));
         }
 
+        /// <summary>
+        /// Returns the minimum angle to the given vector, in radians.
+        /// </summary>
+        /// <param name="to">The other vector to compare this vector to.</param>
+        /// <returns>The angle between the two vectors, in radians.</returns>
         public real_t AngleTo(Vector3 to)
         {
             return Mathf.Atan2(Cross(to).Length(), Dot(to));
         }
 
-        public Vector3 Bounce(Vector3 n)
+        /// <summary>
+        /// Returns this vector "bounced off" from a plane defined by the given normal.
+        /// </summary>
+        /// <param name="normal">The normal vector defining the plane to bounce off. Must be normalized.</param>
+        /// <returns>The bounced vector.</returns>
+        public Vector3 Bounce(Vector3 normal)
         {
-            return -Reflect(n);
+            return -Reflect(normal);
         }
 
+        /// <summary>
+        /// Returns a new vector with all components rounded up (towards positive infinity).
+        /// </summary>
+        /// <returns>A vector with <see cref="Mathf.Ceil"/> called on each component.</returns>
         public Vector3 Ceil()
         {
             return new Vector3(Mathf.Ceil(x), Mathf.Ceil(y), Mathf.Ceil(z));
         }
 
+        /// <summary>
+        /// Returns the cross product of this vector and `b`.
+        /// </summary>
+        /// <param name="b">The other vector.</param>
+        /// <returns>The cross product vector.</returns>
         public Vector3 Cross(Vector3 b)
         {
             return new Vector3
@@ -114,12 +154,21 @@ namespace Godot
             );
         }
 
+        /// <summary>
+        /// Performs a cubic interpolation between vectors `preA`, this vector,
+        /// `b`, and `postB`, by the given amount `t`.
+        /// </summary>
+        /// <param name="b">The destination vector.</param>
+        /// <param name="preA">A vector before this vector.</param>
+        /// <param name="postB">A vector after `b`.</param>
+        /// <param name="t">A value on the range of 0.0 to 1.0, representing the amount of interpolation.</param>
+        /// <returns>The interpolated vector.</returns>
         public Vector3 CubicInterpolate(Vector3 b, Vector3 preA, Vector3 postB, real_t t)
         {
-            var p0 = preA;
-            var p1 = this;
-            var p2 = b;
-            var p3 = postB;
+            Vector3 p0 = preA;
+            Vector3 p1 = this;
+            Vector3 p2 = b;
+            Vector3 p3 = postB;
 
             real_t t2 = t * t;
             real_t t3 = t2 * t;
@@ -131,41 +180,79 @@ namespace Godot
                     );
         }
 
+        /// <summary>
+        /// Returns the normalized vector pointing from this vector to `b`.
+        /// </summary>
+        /// <param name="b">The other vector to point towards.</param>
+        /// <returns>The direction from this vector to `b`.</returns>
         public Vector3 DirectionTo(Vector3 b)
         {
             return new Vector3(b.x - x, b.y - y, b.z - z).Normalized();
         }
 
+        /// <summary>
+        /// Returns the squared distance between this vector and `b`.
+        /// This method runs faster than <see cref="DistanceTo"/>, so prefer it if
+        /// you need to compare vectors or need the squared distance for some formula.
+        /// </summary>
+        /// <param name="b">The other vector to use.</param>
+        /// <returns>The squared distance between the two vectors.</returns>
         public real_t DistanceSquaredTo(Vector3 b)
         {
             return (b - this).LengthSquared();
         }
 
+        /// <summary>
+        /// Returns the distance between this vector and `b`.
+        /// </summary>
+        /// <param name="b">The other vector to use.</param>
+        /// <returns>The distance between the two vectors.</returns>
         public real_t DistanceTo(Vector3 b)
         {
             return (b - this).Length();
         }
 
+        /// <summary>
+        /// Returns the dot product of this vector and `b`.
+        /// </summary>
+        /// <param name="b">The other vector to use.</param>
+        /// <returns>The dot product of the two vectors.</returns>
         public real_t Dot(Vector3 b)
         {
             return x * b.x + y * b.y + z * b.z;
         }
 
+        /// <summary>
+        /// Returns a new vector with all components rounded down (towards negative infinity).
+        /// </summary>
+        /// <returns>A vector with <see cref="Mathf.Floor"/> called on each component.</returns>
         public Vector3 Floor()
         {
             return new Vector3(Mathf.Floor(x), Mathf.Floor(y), Mathf.Floor(z));
         }
 
+        /// <summary>
+        /// Returns the inverse of this vector. This is the same as `new Vector3(1 / v.x, 1 / v.y, 1 / v.z)`.
+        /// </summary>
+        /// <returns>The inverse of this vector.</returns>
         public Vector3 Inverse()
         {
-            return new Vector3(1.0f / x, 1.0f / y, 1.0f / z);
+            return new Vector3(1 / x, 1 / y, 1 / z);
         }
 
+        /// <summary>
+        /// Returns true if the vector is normalized, and false otherwise.
+        /// </summary>
+        /// <returns>A bool indicating whether or not the vector is normalized.</returns>
         public bool IsNormalized()
         {
             return Mathf.Abs(LengthSquared() - 1.0f) < Mathf.Epsilon;
         }
 
+        /// <summary>
+        /// Returns the length (magnitude) of this vector.
+        /// </summary>
+        /// <returns>The length of this vector.</returns>
         public real_t Length()
         {
             real_t x2 = x * x;
@@ -175,6 +262,12 @@ namespace Godot
             return Mathf.Sqrt(x2 + y2 + z2);
         }
 
+        /// <summary>
+        /// Returns the squared length (squared magnitude) of this vector.
+        /// This method runs faster than <see cref="Length"/>, so prefer it if
+        /// you need to compare vectors or need the squared length for some formula.
+        /// </summary>
+        /// <returns>The squared length of this vector.</returns>
         public real_t LengthSquared()
         {
             real_t x2 = x * x;
@@ -184,34 +277,78 @@ namespace Godot
             return x2 + y2 + z2;
         }
 
-        public Vector3 LinearInterpolate(Vector3 b, real_t t)
+        /// <summary>
+        /// Returns the result of the linear interpolation between
+        /// this vector and `to` by amount `weight`.
+        /// </summary>
+        /// <param name="to">The destination vector for interpolation.</param>
+        /// <param name="weight">A value on the range of 0.0 to 1.0, representing the amount of interpolation.</param>
+        /// <returns>The resulting vector of the interpolation.</returns>
+        public Vector3 Lerp(Vector3 to, real_t weight)
         {
             return new Vector3
             (
-                x + t * (b.x - x),
-                y + t * (b.y - y),
-                z + t * (b.z - z)
+                Mathf.Lerp(x, to.x, weight),
+                Mathf.Lerp(y, to.y, weight),
+                Mathf.Lerp(z, to.z, weight)
             );
         }
 
-        public Vector3 MoveToward(Vector3 to, real_t delta)
+        /// <summary>
+        /// Returns the result of the linear interpolation between
+        /// this vector and `to` by the vector amount `weight`.
+        /// </summary>
+        /// <param name="to">The destination vector for interpolation.</param>
+        /// <param name="weight">A vector with components on the range of 0.0 to 1.0, representing the amount of interpolation.</param>
+        /// <returns>The resulting vector of the interpolation.</returns>
+        public Vector3 Lerp(Vector3 to, Vector3 weight)
         {
-            var v = this;
-            var vd = to - v;
-            var len = vd.Length();
-            return len <= delta || len < Mathf.Epsilon ? to : v + vd / len * delta;
+            return new Vector3
+            (
+                Mathf.Lerp(x, to.x, weight.x),
+                Mathf.Lerp(y, to.y, weight.y),
+                Mathf.Lerp(z, to.z, weight.z)
+            );
         }
 
+        /// <summary>
+        /// Returns the axis of the vector's largest value. See <see cref="Axis"/>.
+        /// If all components are equal, this method returns <see cref="Axis.X"/>.
+        /// </summary>
+        /// <returns>The index of the largest axis.</returns>
         public Axis MaxAxis()
         {
             return x < y ? (y < z ? Axis.Z : Axis.Y) : (x < z ? Axis.Z : Axis.X);
         }
 
+        /// <summary>
+        /// Returns the axis of the vector's smallest value. See <see cref="Axis"/>.
+        /// If all components are equal, this method returns <see cref="Axis.Z"/>.
+        /// </summary>
+        /// <returns>The index of the smallest axis.</returns>
         public Axis MinAxis()
         {
             return x < y ? (x < z ? Axis.X : Axis.Z) : (y < z ? Axis.Y : Axis.Z);
         }
 
+        /// <summary>
+        /// Moves this vector toward `to` by the fixed `delta` amount.
+        /// </summary>
+        /// <param name="to">The vector to move towards.</param>
+        /// <param name="delta">The amount to move towards by.</param>
+        /// <returns>The resulting vector.</returns>
+        public Vector3 MoveToward(Vector3 to, real_t delta)
+        {
+            var v = this;
+            var vd = to - v;
+            var len = vd.Length();
+            return len <= delta || len < Mathf.Epsilon ? to : v + vd / len * delta;
+        }
+
+        /// <summary>
+        /// Returns the vector scaled to unit length. Equivalent to `v / v.Length()`.
+        /// </summary>
+        /// <returns>A normalized version of the vector.</returns>
         public Vector3 Normalized()
         {
             var v = this;
@@ -219,6 +356,11 @@ namespace Godot
             return v;
         }
 
+        /// <summary>
+        /// Returns the outer product with `b`.
+        /// </summary>
+        /// <param name="b">The other vector.</param>
+        /// <returns>A <see cref="Basis"/> representing the outer product matrix.</returns>
         public Basis Outer(Vector3 b)
         {
             return new Basis(
@@ -228,6 +370,11 @@ namespace Godot
             );
         }
 
+        /// <summary>
+        /// Returns a vector composed of the <see cref="Mathf.PosMod(real_t, real_t)"/> of this vector's components and `mod`.
+        /// </summary>
+        /// <param name="mod">A value representing the divisor of the operation.</param>
+        /// <returns>A vector with each component <see cref="Mathf.PosMod(real_t, real_t)"/> by `mod`.</returns>
         public Vector3 PosMod(real_t mod)
         {
             Vector3 v;
@@ -237,6 +384,11 @@ namespace Godot
             return v;
         }
 
+        /// <summary>
+        /// Returns a vector composed of the <see cref="Mathf.PosMod(real_t, real_t)"/> of this vector's components and `modv`'s components.
+        /// </summary>
+        /// <param name="modv">A vector representing the divisors of the operation.</param>
+        /// <returns>A vector with each component <see cref="Mathf.PosMod(real_t, real_t)"/> by `modv`'s components.</returns>
         public Vector3 PosMod(Vector3 modv)
         {
             Vector3 v;
@@ -246,45 +398,66 @@ namespace Godot
             return v;
         }
 
+        /// <summary>
+        /// Returns this vector projected onto another vector `b`.
+        /// </summary>
+        /// <param name="onNormal">The vector to project onto.</param>
+        /// <returns>The projected vector.</returns>
         public Vector3 Project(Vector3 onNormal)
         {
             return onNormal * (Dot(onNormal) / onNormal.LengthSquared());
         }
 
-        public Vector3 Reflect(Vector3 n)
+        /// <summary>
+        /// Returns this vector reflected from a plane defined by the given `normal`.
+        /// </summary>
+        /// <param name="normal">The normal vector defining the plane to reflect from. Must be normalized.</param>
+        /// <returns>The reflected vector.</returns>
+        public Vector3 Reflect(Vector3 normal)
         {
 #if DEBUG
-            if (!n.IsNormalized())
-                throw new ArgumentException("Argument  is not normalized", nameof(n));
+            if (!normal.IsNormalized())
+            {
+                throw new ArgumentException("Argument  is not normalized", nameof(normal));
+            }
 #endif
-            return 2.0f * n * Dot(n) - this;
-        }
-
-        public Vector3 Round()
-        {
-            return new Vector3(Mathf.Round(x), Mathf.Round(y), Mathf.Round(z));
+            return 2.0f * Dot(normal) * normal - this;
         }
 
+        /// <summary>
+        /// Rotates this vector around a given `axis` vector by `phi` radians.
+        /// The `axis` vector must be a normalized vector.
+        /// </summary>
+        /// <param name="axis">The vector to rotate around. Must be normalized.</param>
+        /// <param name="phi">The angle to rotate by, in radians.</param>
+        /// <returns>The rotated vector.</returns>
         public Vector3 Rotated(Vector3 axis, real_t phi)
         {
+#if DEBUG
+            if (!axis.IsNormalized())
+            {
+                throw new ArgumentException("Argument  is not normalized", nameof(axis));
+            }
+#endif
             return new Basis(axis, phi).Xform(this);
         }
 
-        [Obsolete("Set is deprecated. Use the Vector3(" + nameof(real_t) + ", " + nameof(real_t) + ", " + nameof(real_t) + ") constructor instead.", error: true)]
-        public void Set(real_t x, real_t y, real_t z)
-        {
-            this.x = x;
-            this.y = y;
-            this.z = z;
-        }
-        [Obsolete("Set is deprecated. Use the Vector3(" + nameof(Vector3) + ") constructor instead.", error: true)]
-        public void Set(Vector3 v)
+        /// <summary>
+        /// Returns this vector with all components rounded to the nearest integer,
+        /// with halfway cases rounded towards the nearest multiple of two.
+        /// </summary>
+        /// <returns>The rounded vector.</returns>
+        public Vector3 Round()
         {
-            x = v.x;
-            y = v.y;
-            z = v.z;
+            return new Vector3(Mathf.Round(x), Mathf.Round(y), Mathf.Round(z));
         }
 
+        /// <summary>
+        /// Returns a vector with each component set to one or negative one, depending
+        /// on the signs of this vector's components, or zero if the component is zero,
+        /// by calling <see cref="Mathf.Sign(real_t)"/> on each component.
+        /// </summary>
+        /// <returns>A vector with all components as either `1`, `-1`, or `0`.</returns>
         public Vector3 Sign()
         {
             Vector3 v;
@@ -294,44 +467,76 @@ namespace Godot
             return v;
         }
 
-        public Vector3 Slerp(Vector3 b, real_t t)
+        /// <summary>
+        /// Returns the result of the spherical linear interpolation between
+        /// this vector and `to` by amount `weight`.
+        ///
+        /// Note: Both vectors must be normalized.
+        /// </summary>
+        /// <param name="to">The destination vector for interpolation. Must be normalized.</param>
+        /// <param name="weight">A value on the range of 0.0 to 1.0, representing the amount of interpolation.</param>
+        /// <returns>The resulting vector of the interpolation.</returns>
+        public Vector3 Slerp(Vector3 to, real_t weight)
         {
 #if DEBUG
             if (!IsNormalized())
-                throw new InvalidOperationException("Vector3 is not normalized");
+            {
+                throw new InvalidOperationException("Vector3.Slerp: From vector is not normalized.");
+            }
+            if (!to.IsNormalized())
+            {
+                throw new InvalidOperationException("Vector3.Slerp: `to` is not normalized.");
+            }
 #endif
-            real_t theta = AngleTo(b);
-            return Rotated(Cross(b), theta * t);
+            real_t theta = AngleTo(to);
+            return Rotated(Cross(to), theta * weight);
         }
 
-        public Vector3 Slide(Vector3 n)
+        /// <summary>
+        /// Returns this vector slid along a plane defined by the given normal.
+        /// </summary>
+        /// <param name="normal">The normal vector defining the plane to slide on.</param>
+        /// <returns>The slid vector.</returns>
+        public Vector3 Slide(Vector3 normal)
         {
-            return this - n * Dot(n);
+            return this - normal * Dot(normal);
         }
 
-        public Vector3 Snapped(Vector3 by)
+        /// <summary>
+        /// Returns this vector with each component snapped to the nearest multiple of `step`.
+        /// This can also be used to round to an arbitrary number of decimals.
+        /// </summary>
+        /// <param name="step">A vector value representing the step size to snap to.</param>
+        /// <returns>The snapped vector.</returns>
+        public Vector3 Snapped(Vector3 step)
         {
             return new Vector3
             (
-                Mathf.Stepify(x, by.x),
-                Mathf.Stepify(y, by.y),
-                Mathf.Stepify(z, by.z)
+                Mathf.Stepify(x, step.x),
+                Mathf.Stepify(y, step.y),
+                Mathf.Stepify(z, step.z)
             );
         }
 
+        /// <summary>
+        /// Returns a diagonal matrix with the vector as main diagonal.
+        ///
+        /// This is equivalent to a Basis with no rotation or shearing and
+        /// this vector's components set as the scale.
+        /// </summary>
+        /// <returns>A Basis with the vector as its main diagonal.</returns>
         public Basis ToDiagonalMatrix()
         {
             return new Basis(
-                x, 0f, 0f,
-                0f, y, 0f,
-                0f, 0f, z
+                x, 0, 0,
+                0, y, 0,
+                0, 0, z
             );
         }
 
         // Constants
         private static readonly Vector3 _zero = new Vector3(0, 0, 0);
         private static readonly Vector3 _one = new Vector3(1, 1, 1);
-        private static readonly Vector3 _negOne = new Vector3(-1, -1, -1);
         private static readonly Vector3 _inf = new Vector3(Mathf.Inf, Mathf.Inf, Mathf.Inf);
 
         private static readonly Vector3 _up = new Vector3(0, 1, 0);
@@ -341,25 +546,74 @@ namespace Godot
         private static readonly Vector3 _forward = new Vector3(0, 0, -1);
         private static readonly Vector3 _back = new Vector3(0, 0, 1);
 
+        /// <summary>
+        /// Zero vector, a vector with all components set to `0`.
+        /// </summary>
+        /// <value>Equivalent to `new Vector3(0, 0, 0)`</value>
         public static Vector3 Zero { get { return _zero; } }
+        /// <summary>
+        /// One vector, a vector with all components set to `1`.
+        /// </summary>
+        /// <value>Equivalent to `new Vector3(1, 1, 1)`</value>
         public static Vector3 One { get { return _one; } }
-        public static Vector3 NegOne { get { return _negOne; } }
+        /// <summary>
+        /// Infinity vector, a vector with all components set to `Mathf.Inf`.
+        /// </summary>
+        /// <value>Equivalent to `new Vector3(Mathf.Inf, Mathf.Inf, Mathf.Inf)`</value>
         public static Vector3 Inf { get { return _inf; } }
 
+        /// <summary>
+        /// Up unit vector.
+        /// </summary>
+        /// <value>Equivalent to `new Vector3(0, 1, 0)`</value>
         public static Vector3 Up { get { return _up; } }
+        /// <summary>
+        /// Down unit vector.
+        /// </summary>
+        /// <value>Equivalent to `new Vector3(0, -1, 0)`</value>
         public static Vector3 Down { get { return _down; } }
+        /// <summary>
+        /// Right unit vector. Represents the local direction of right,
+        /// and the global direction of east.
+        /// </summary>
+        /// <value>Equivalent to `new Vector3(1, 0, 0)`</value>
         public static Vector3 Right { get { return _right; } }
+        /// <summary>
+        /// Left unit vector. Represents the local direction of left,
+        /// and the global direction of west.
+        /// </summary>
+        /// <value>Equivalent to `new Vector3(-1, 0, 0)`</value>
         public static Vector3 Left { get { return _left; } }
+        /// <summary>
+        /// Forward unit vector. Represents the local direction of forward,
+        /// and the global direction of north.
+        /// </summary>
+        /// <value>Equivalent to `new Vector3(0, 0, -1)`</value>
         public static Vector3 Forward { get { return _forward; } }
+        /// <summary>
+        /// Back unit vector. Represents the local direction of back,
+        /// and the global direction of south.
+        /// </summary>
+        /// <value>Equivalent to `new Vector3(0, 0, 1)`</value>
         public static Vector3 Back { get { return _back; } }
 
-        // Constructors
+        /// <summary>
+        /// Constructs a new <see cref="Vector3"/> with the given components.
+        /// </summary>
+        /// <param name="x">The vector's X component.</param>
+        /// <param name="y">The vector's Y component.</param>
+        /// <param name="z">The vector's Z component.</param>
         public Vector3(real_t x, real_t y, real_t z)
         {
             this.x = x;
             this.y = y;
             this.z = z;
         }
+
+        /// <summary>
+        /// Constructs a new <see cref="Vector3"/> from an existing <see cref="Vector3"/>.
+        /// </summary>
+        /// <param name="v">The existing <see cref="Vector3"/>.</param>
         public Vector3(Vector3 v)
         {
             x = v.x;
@@ -415,20 +669,20 @@ namespace Godot
             return left;
         }
 
-        public static Vector3 operator /(Vector3 vec, real_t scale)
+        public static Vector3 operator /(Vector3 vec, real_t divisor)
         {
-            vec.x /= scale;
-            vec.y /= scale;
-            vec.z /= scale;
+            vec.x /= divisor;
+            vec.y /= divisor;
+            vec.z /= divisor;
             return vec;
         }
 
-        public static Vector3 operator /(Vector3 left, Vector3 right)
+        public static Vector3 operator /(Vector3 vec, Vector3 divisorv)
         {
-            left.x /= right.x;
-            left.y /= right.y;
-            left.z /= right.z;
-            return left;
+            vec.x /= divisorv.x;
+            vec.y /= divisorv.y;
+            vec.z /= divisorv.z;
+            return vec;
         }
 
         public static Vector3 operator %(Vector3 vec, real_t divisor)
@@ -459,49 +713,53 @@ namespace Godot
 
         public static bool operator <(Vector3 left, Vector3 right)
         {
-            if (Mathf.IsEqualApprox(left.x, right.x))
+            if (left.x == right.x)
             {
-                if (Mathf.IsEqualApprox(left.y, right.y))
+                if (left.y == right.y)
+                {
                     return left.z < right.z;
+                }
                 return left.y < right.y;
             }
-
             return left.x < right.x;
         }
 
         public static bool operator >(Vector3 left, Vector3 right)
         {
-            if (Mathf.IsEqualApprox(left.x, right.x))
+            if (left.x == right.x)
             {
-                if (Mathf.IsEqualApprox(left.y, right.y))
+                if (left.y == right.y)
+                {
                     return left.z > right.z;
+                }
                 return left.y > right.y;
             }
-
             return left.x > right.x;
         }
 
         public static bool operator <=(Vector3 left, Vector3 right)
         {
-            if (Mathf.IsEqualApprox(left.x, right.x))
+            if (left.x == right.x)
             {
-                if (Mathf.IsEqualApprox(left.y, right.y))
+                if (left.y == right.y)
+                {
                     return left.z <= right.z;
+                }
                 return left.y < right.y;
             }
-
             return left.x < right.x;
         }
 
         public static bool operator >=(Vector3 left, Vector3 right)
         {
-            if (Mathf.IsEqualApprox(left.x, right.x))
+            if (left.x == right.x)
             {
-                if (Mathf.IsEqualApprox(left.y, right.y))
+                if (left.y == right.y)
+                {
                     return left.z >= right.z;
+                }
                 return left.y > right.y;
             }
-
             return left.x > right.x;
         }
 
@@ -520,6 +778,12 @@ namespace Godot
             return x == other.x && y == other.y && z == other.z;
         }
 
+        /// <summary>
+        /// Returns true if this vector and `other` are approximately equal, by running
+        /// <see cref="Mathf.IsEqualApprox(real_t, real_t)"/> on each component.
+        /// </summary>
+        /// <param name="other">The other vector to compare.</param>
+        /// <returns>Whether or not the vectors are approximately equal.</returns>
         public bool IsEqualApprox(Vector3 other)
         {
             return Mathf.IsEqualApprox(x, other.x) && Mathf.IsEqualApprox(y, other.y) && Mathf.IsEqualApprox(z, other.z);
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector3i.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector3i.cs
new file mode 100644
index 0000000000..bf25ba9cb3
--- /dev/null
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector3i.cs
@@ -0,0 +1,515 @@
+using System;
+using System.Runtime.InteropServices;
+
+#if REAL_T_IS_DOUBLE
+using real_t = System.Double;
+#else
+using real_t = System.Single;
+#endif
+
+namespace Godot
+{
+    /// <summary>
+    /// 3-element structure that can be used to represent 3D grid coordinates or sets of integers.
+    /// </summary>
+    [Serializable]
+    [StructLayout(LayoutKind.Sequential)]
+    public struct Vector3i : IEquatable<Vector3i>
+    {
+        /// <summary>
+        /// Enumerated index values for the axes.
+        /// Returned by <see cref="MaxAxis"/> and <see cref="MinAxis"/>.
+        /// </summary>
+        public enum Axis
+        {
+            X = 0,
+            Y,
+            Z
+        }
+
+        /// <summary>
+        /// The vector's X component. Also accessible by using the index position `[0]`.
+        /// </summary>
+        public int x;
+        /// <summary>
+        /// The vector's Y component. Also accessible by using the index position `[1]`.
+        /// </summary>
+        public int y;
+        /// <summary>
+        /// The vector's Z component. Also accessible by using the index position `[2]`.
+        /// </summary>
+        public int z;
+
+        /// <summary>
+        /// Access vector components using their index.
+        /// </summary>
+        /// <value>`[0]` is equivalent to `.x`, `[1]` is equivalent to `.y`, `[2]` is equivalent to `.z`.</value>
+        public int this[int index]
+        {
+            get
+            {
+                switch (index)
+                {
+                    case 0:
+                        return x;
+                    case 1:
+                        return y;
+                    case 2:
+                        return z;
+                    default:
+                        throw new IndexOutOfRangeException();
+                }
+            }
+            set
+            {
+                switch (index)
+                {
+                    case 0:
+                        x = value;
+                        return;
+                    case 1:
+                        y = value;
+                        return;
+                    case 2:
+                        z = value;
+                        return;
+                    default:
+                        throw new IndexOutOfRangeException();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns a new vector with all components in absolute values (i.e. positive).
+        /// </summary>
+        /// <returns>A vector with <see cref="Mathf.Abs(int)"/> called on each component.</returns>
+        public Vector3i Abs()
+        {
+            return new Vector3i(Mathf.Abs(x), Mathf.Abs(y), Mathf.Abs(z));
+        }
+
+        /// <summary>
+        /// Returns the squared distance between this vector and `b`.
+        /// This method runs faster than <see cref="DistanceTo"/>, so prefer it if
+        /// you need to compare vectors or need the squared distance for some formula.
+        /// </summary>
+        /// <param name="b">The other vector to use.</param>
+        /// <returns>The squared distance between the two vectors.</returns>
+        public int DistanceSquaredTo(Vector3i b)
+        {
+            return (b - this).LengthSquared();
+        }
+
+        /// <summary>
+        /// Returns the distance between this vector and `b`.
+        /// </summary>
+        /// <param name="b">The other vector to use.</param>
+        /// <returns>The distance between the two vectors.</returns>
+        public real_t DistanceTo(Vector3i b)
+        {
+            return (b - this).Length();
+        }
+
+        /// <summary>
+        /// Returns the dot product of this vector and `b`.
+        /// </summary>
+        /// <param name="b">The other vector to use.</param>
+        /// <returns>The dot product of the two vectors.</returns>
+        public int Dot(Vector3i b)
+        {
+            return x * b.x + y * b.y + z * b.z;
+        }
+
+        /// <summary>
+        /// Returns the length (magnitude) of this vector.
+        /// </summary>
+        /// <returns>The length of this vector.</returns>
+        public real_t Length()
+        {
+            int x2 = x * x;
+            int y2 = y * y;
+            int z2 = z * z;
+
+            return Mathf.Sqrt(x2 + y2 + z2);
+        }
+
+        /// <summary>
+        /// Returns the squared length (squared magnitude) of this vector.
+        /// This method runs faster than <see cref="Length"/>, so prefer it if
+        /// you need to compare vectors or need the squared length for some formula.
+        /// </summary>
+        /// <returns>The squared length of this vector.</returns>
+        public int LengthSquared()
+        {
+            int x2 = x * x;
+            int y2 = y * y;
+            int z2 = z * z;
+
+            return x2 + y2 + z2;
+        }
+
+        /// <summary>
+        /// Returns the axis of the vector's largest value. See <see cref="Axis"/>.
+        /// If all components are equal, this method returns <see cref="Axis.X"/>.
+        /// </summary>
+        /// <returns>The index of the largest axis.</returns>
+        public Axis MaxAxis()
+        {
+            return x < y ? (y < z ? Axis.Z : Axis.Y) : (x < z ? Axis.Z : Axis.X);
+        }
+
+        /// <summary>
+        /// Returns the axis of the vector's smallest value. See <see cref="Axis"/>.
+        /// If all components are equal, this method returns <see cref="Axis.Z"/>.
+        /// </summary>
+        /// <returns>The index of the smallest axis.</returns>
+        public Axis MinAxis()
+        {
+            return x < y ? (x < z ? Axis.X : Axis.Z) : (y < z ? Axis.Y : Axis.Z);
+        }
+
+        /// <summary>
+        /// Returns a vector composed of the <see cref="Mathf.PosMod(int, int)"/> of this vector's components and `mod`.
+        /// </summary>
+        /// <param name="mod">A value representing the divisor of the operation.</param>
+        /// <returns>A vector with each component <see cref="Mathf.PosMod(int, int)"/> by `mod`.</returns>
+        public Vector3i PosMod(int mod)
+        {
+            Vector3i v = this;
+            v.x = Mathf.PosMod(v.x, mod);
+            v.y = Mathf.PosMod(v.y, mod);
+            v.z = Mathf.PosMod(v.z, mod);
+            return v;
+        }
+
+        /// <summary>
+        /// Returns a vector composed of the <see cref="Mathf.PosMod(int, int)"/> of this vector's components and `modv`'s components.
+        /// </summary>
+        /// <param name="modv">A vector representing the divisors of the operation.</param>
+        /// <returns>A vector with each component <see cref="Mathf.PosMod(int, int)"/> by `modv`'s components.</returns>
+        public Vector3i PosMod(Vector3i modv)
+        {
+            Vector3i v = this;
+            v.x = Mathf.PosMod(v.x, modv.x);
+            v.y = Mathf.PosMod(v.y, modv.y);
+            v.z = Mathf.PosMod(v.z, modv.z);
+            return v;
+        }
+
+        /// <summary>
+        /// Returns a vector with each component set to one or negative one, depending
+        /// on the signs of this vector's components, or zero if the component is zero,
+        /// by calling <see cref="Mathf.Sign(int)"/> on each component.
+        /// </summary>
+        /// <returns>A vector with all components as either `1`, `-1`, or `0`.</returns>
+        public Vector3i Sign()
+        {
+            Vector3i v = this;
+            v.x = Mathf.Sign(v.x);
+            v.y = Mathf.Sign(v.y);
+            v.z = Mathf.Sign(v.z);
+            return v;
+        }
+
+        // Constants
+        private static readonly Vector3i _zero = new Vector3i(0, 0, 0);
+        private static readonly Vector3i _one = new Vector3i(1, 1, 1);
+
+        private static readonly Vector3i _up = new Vector3i(0, 1, 0);
+        private static readonly Vector3i _down = new Vector3i(0, -1, 0);
+        private static readonly Vector3i _right = new Vector3i(1, 0, 0);
+        private static readonly Vector3i _left = new Vector3i(-1, 0, 0);
+        private static readonly Vector3i _forward = new Vector3i(0, 0, -1);
+        private static readonly Vector3i _back = new Vector3i(0, 0, 1);
+
+        /// <summary>
+        /// Zero vector, a vector with all components set to `0`.
+        /// </summary>
+        /// <value>Equivalent to `new Vector3i(0, 0, 0)`</value>
+        public static Vector3i Zero { get { return _zero; } }
+        /// <summary>
+        /// One vector, a vector with all components set to `1`.
+        /// </summary>
+        /// <value>Equivalent to `new Vector3i(1, 1, 1)`</value>
+        public static Vector3i One { get { return _one; } }
+
+        /// <summary>
+        /// Up unit vector.
+        /// </summary>
+        /// <value>Equivalent to `new Vector3i(0, 1, 0)`</value>
+        public static Vector3i Up { get { return _up; } }
+        /// <summary>
+        /// Down unit vector.
+        /// </summary>
+        /// <value>Equivalent to `new Vector3i(0, -1, 0)`</value>
+        public static Vector3i Down { get { return _down; } }
+        /// <summary>
+        /// Right unit vector. Represents the local direction of right,
+        /// and the global direction of east.
+        /// </summary>
+        /// <value>Equivalent to `new Vector3i(1, 0, 0)`</value>
+        public static Vector3i Right { get { return _right; } }
+        /// <summary>
+        /// Left unit vector. Represents the local direction of left,
+        /// and the global direction of west.
+        /// </summary>
+        /// <value>Equivalent to `new Vector3i(-1, 0, 0)`</value>
+        public static Vector3i Left { get { return _left; } }
+        /// <summary>
+        /// Forward unit vector. Represents the local direction of forward,
+        /// and the global direction of north.
+        /// </summary>
+        /// <value>Equivalent to `new Vector3i(0, 0, -1)`</value>
+        public static Vector3i Forward { get { return _forward; } }
+        /// <summary>
+        /// Back unit vector. Represents the local direction of back,
+        /// and the global direction of south.
+        /// </summary>
+        /// <value>Equivalent to `new Vector3i(0, 0, 1)`</value>
+        public static Vector3i Back { get { return _back; } }
+
+        /// <summary>
+        /// Constructs a new <see cref="Vector3i"/> with the given components.
+        /// </summary>
+        /// <param name="x">The vector's X component.</param>
+        /// <param name="y">The vector's Y component.</param>
+        /// <param name="z">The vector's Z component.</param>
+        public Vector3i(int x, int y, int z)
+        {
+            this.x = x;
+            this.y = y;
+            this.z = z;
+        }
+
+        /// <summary>
+        /// Constructs a new <see cref="Vector3i"/> from an existing <see cref="Vector3i"/>.
+        /// </summary>
+        /// <param name="vi">The existing <see cref="Vector3i"/>.</param>
+        public Vector3i(Vector3i vi)
+        {
+            this.x = vi.x;
+            this.y = vi.y;
+            this.z = vi.z;
+        }
+
+        /// <summary>
+        /// Constructs a new <see cref="Vector3i"/> from an existing <see cref="Vector3"/>
+        /// by rounding the components via <see cref="Mathf.RoundToInt(real_t)"/>.
+        /// </summary>
+        /// <param name="v">The <see cref="Vector3"/> to convert.</param>
+        public Vector3i(Vector3 v)
+        {
+            this.x = Mathf.RoundToInt(v.x);
+            this.y = Mathf.RoundToInt(v.y);
+            this.z = Mathf.RoundToInt(v.z);
+        }
+
+        public static Vector3i operator +(Vector3i left, Vector3i right)
+        {
+            left.x += right.x;
+            left.y += right.y;
+            left.z += right.z;
+            return left;
+        }
+
+        public static Vector3i operator -(Vector3i left, Vector3i right)
+        {
+            left.x -= right.x;
+            left.y -= right.y;
+            left.z -= right.z;
+            return left;
+        }
+
+        public static Vector3i operator -(Vector3i vec)
+        {
+            vec.x = -vec.x;
+            vec.y = -vec.y;
+            vec.z = -vec.z;
+            return vec;
+        }
+
+        public static Vector3i operator *(Vector3i vec, int scale)
+        {
+            vec.x *= scale;
+            vec.y *= scale;
+            vec.z *= scale;
+            return vec;
+        }
+
+        public static Vector3i operator *(int scale, Vector3i vec)
+        {
+            vec.x *= scale;
+            vec.y *= scale;
+            vec.z *= scale;
+            return vec;
+        }
+
+        public static Vector3i operator *(Vector3i left, Vector3i right)
+        {
+            left.x *= right.x;
+            left.y *= right.y;
+            left.z *= right.z;
+            return left;
+        }
+
+        public static Vector3i operator /(Vector3i vec, int divisor)
+        {
+            vec.x /= divisor;
+            vec.y /= divisor;
+            vec.z /= divisor;
+            return vec;
+        }
+
+        public static Vector3i operator /(Vector3i vec, Vector3i divisorv)
+        {
+            vec.x /= divisorv.x;
+            vec.y /= divisorv.y;
+            vec.z /= divisorv.z;
+            return vec;
+        }
+
+        public static Vector3i operator %(Vector3i vec, int divisor)
+        {
+            vec.x %= divisor;
+            vec.y %= divisor;
+            vec.z %= divisor;
+            return vec;
+        }
+
+        public static Vector3i operator %(Vector3i vec, Vector3i divisorv)
+        {
+            vec.x %= divisorv.x;
+            vec.y %= divisorv.y;
+            vec.z %= divisorv.z;
+            return vec;
+        }
+
+        public static Vector3i operator &(Vector3i vec, int and)
+        {
+            vec.x &= and;
+            vec.y &= and;
+            vec.z &= and;
+            return vec;
+        }
+
+        public static Vector3i operator &(Vector3i vec, Vector3i andv)
+        {
+            vec.x &= andv.x;
+            vec.y &= andv.y;
+            vec.z &= andv.z;
+            return vec;
+        }
+
+        public static bool operator ==(Vector3i left, Vector3i right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(Vector3i left, Vector3i right)
+        {
+            return !left.Equals(right);
+        }
+
+        public static bool operator <(Vector3i left, Vector3i right)
+        {
+            if (left.x == right.x)
+            {
+                if (left.y == right.y)
+                    return left.z < right.z;
+                else
+                    return left.y < right.y;
+            }
+
+            return left.x < right.x;
+        }
+
+        public static bool operator >(Vector3i left, Vector3i right)
+        {
+            if (left.x == right.x)
+            {
+                if (left.y == right.y)
+                    return left.z > right.z;
+                else
+                    return left.y > right.y;
+            }
+
+            return left.x > right.x;
+        }
+
+        public static bool operator <=(Vector3i left, Vector3i right)
+        {
+            if (left.x == right.x)
+            {
+                if (left.y == right.y)
+                    return left.z <= right.z;
+                else
+                    return left.y < right.y;
+            }
+
+            return left.x < right.x;
+        }
+
+        public static bool operator >=(Vector3i left, Vector3i right)
+        {
+            if (left.x == right.x)
+            {
+                if (left.y == right.y)
+                    return left.z >= right.z;
+                else
+                    return left.y > right.y;
+            }
+
+            return left.x > right.x;
+        }
+
+        public static implicit operator Vector3(Vector3i value)
+        {
+            return new Vector3(value.x, value.y, value.z);
+        }
+
+        public static explicit operator Vector3i(Vector3 value)
+        {
+            return new Vector3i(value);
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj is Vector3i)
+            {
+                return Equals((Vector3i)obj);
+            }
+
+            return false;
+        }
+
+        public bool Equals(Vector3i other)
+        {
+            return x == other.x && y == other.y && z == other.z;
+        }
+
+        public override int GetHashCode()
+        {
+            return y.GetHashCode() ^ x.GetHashCode() ^ z.GetHashCode();
+        }
+
+        public override string ToString()
+        {
+            return String.Format("({0}, {1}, {2})", new object[]
+            {
+                this.x.ToString(),
+                this.y.ToString(),
+                this.z.ToString()
+            });
+        }
+
+        public string ToString(string format)
+        {
+            return String.Format("({0}, {1}, {2})", new object[]
+            {
+                this.x.ToString(format),
+                this.y.ToString(format),
+                this.z.ToString(format)
+            });
+        }
+    }
+}
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj b/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj
index 5419cd06e6..86a16c17f1 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj
+++ b/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj
@@ -1,38 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{AEBF0036-DA76-4341-B651-A3F2856AB2FA}</ProjectGuid>
-    <OutputType>Library</OutputType>
     <OutputPath>bin/$(Configuration)</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <RootNamespace>Godot</RootNamespace>
-    <AssemblyName>GodotSharp</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <DocumentationFile>$(OutputPath)/$(AssemblyName).xml</DocumentationFile>
-    <BaseIntermediateOutputPath>obj</BaseIntermediateOutputPath>
+    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>portable</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>$(GodotDefineConstants);GODOT;DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>portable</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>$(GodotDefineConstants);GODOT;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
+  <PropertyGroup>
+    <DefineConstants>$(DefineConstants);GODOT</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
     <Compile Include="Core\AABB.cs" />
     <Compile Include="Core\Array.cs" />
     <Compile Include="Core\Attributes\ExportAttribute.cs" />
@@ -41,15 +20,18 @@
     <Compile Include="Core\Attributes\SignalAttribute.cs" />
     <Compile Include="Core\Attributes\ToolAttribute.cs" />
     <Compile Include="Core\Basis.cs" />
+    <Compile Include="Core\Callable.cs" />
     <Compile Include="Core\Color.cs" />
     <Compile Include="Core\Colors.cs" />
     <Compile Include="Core\DebuggingUtils.cs" />
+    <Compile Include="Core\DelegateUtils.cs" />
     <Compile Include="Core\Dictionary.cs" />
     <Compile Include="Core\Dispatcher.cs" />
     <Compile Include="Core\DynamicObject.cs" />
     <Compile Include="Core\Extensions\NodeExtensions.cs" />
     <Compile Include="Core\Extensions\ObjectExtensions.cs" />
     <Compile Include="Core\Extensions\ResourceLoaderExtensions.cs" />
+    <Compile Include="Core\Extensions\SceneTreeExtensions.cs" />
     <Compile Include="Core\GD.cs" />
     <Compile Include="Core\GodotSynchronizationContext.cs" />
     <Compile Include="Core\GodotTaskScheduler.cs" />
@@ -65,13 +47,18 @@
     <Compile Include="Core\Plane.cs" />
     <Compile Include="Core\Quat.cs" />
     <Compile Include="Core\Rect2.cs" />
+    <Compile Include="Core\Rect2i.cs" />
     <Compile Include="Core\RID.cs" />
+    <Compile Include="Core\SignalInfo.cs" />
     <Compile Include="Core\SignalAwaiter.cs" />
     <Compile Include="Core\StringExtensions.cs" />
+    <Compile Include="Core\StringName.cs" />
     <Compile Include="Core\Transform.cs" />
     <Compile Include="Core\Transform2D.cs" />
     <Compile Include="Core\Vector2.cs" />
+    <Compile Include="Core\Vector2i.cs" />
     <Compile Include="Core\Vector3.cs" />
+    <Compile Include="Core\Vector3i.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <!--
@@ -81,5 +68,4 @@
   Fortunately code completion, go to definition and such still work.
   -->
   <Import Project="Generated\GeneratedIncludes.props" />
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Properties/AssemblyInfo.cs b/modules/mono/glue/GodotSharp/GodotSharp/Properties/AssemblyInfo.cs
index f84e0183f6..da6f293871 100644
--- a/modules/mono/glue/GodotSharp/GodotSharp/Properties/AssemblyInfo.cs
+++ b/modules/mono/glue/GodotSharp/GodotSharp/Properties/AssemblyInfo.cs
@@ -1,27 +1,3 @@
-using System.Reflection;
 using System.Runtime.CompilerServices;
 
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle("GodotSharp")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
 [assembly: InternalsVisibleTo("GodotSharpEditor")]
diff --git a/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj b/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj
index 22853797c1..a8c4ba96b5 100644
--- a/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj
+++ b/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj
@@ -1,45 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{8FBEC238-D944-4074-8548-B3B524305905}</ProjectGuid>
-    <OutputType>Library</OutputType>
     <OutputPath>bin/$(Configuration)</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <RootNamespace>Godot</RootNamespace>
-    <AssemblyName>GodotSharpEditor</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <DocumentationFile>$(OutputPath)/$(AssemblyName).xml</DocumentationFile>
-    <BaseIntermediateOutputPath>obj</BaseIntermediateOutputPath>
+    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>portable</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>$(GodotDefineConstants);GODOT;DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>portable</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>$(GodotDefineConstants);GODOT;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
+  <PropertyGroup>
+    <DefineConstants>$(DefineConstants);GODOT</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="Generated\GeneratedIncludes.props" />
-  <ItemGroup>
     <ProjectReference Include="..\GodotSharp\GodotSharp.csproj">
-      <Private>False</Private>
+      <Private>false</Private>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!--
+  We import a props file with auto-generated includes. This works well with Rider.
+  However, Visual Studio and MonoDevelop won't list them in the solution explorer.
+  We can't use wildcards as there may be undesired old files still hanging around.
+  Fortunately code completion, go to definition and such still work.
+  -->
+  <Import Project="Generated\GeneratedIncludes.props" />
 </Project>
diff --git a/modules/mono/glue/GodotSharp/GodotSharpEditor/Properties/AssemblyInfo.cs b/modules/mono/glue/GodotSharp/GodotSharpEditor/Properties/AssemblyInfo.cs
deleted file mode 100644
index 3684b7a3cb..0000000000
--- a/modules/mono/glue/GodotSharp/GodotSharpEditor/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Reflection;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle("GodotSharpEditor")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
diff --git a/modules/mono/glue/arguments_vector.h b/modules/mono/glue/arguments_vector.h
index aeb466ba72..ab48904571 100644
--- a/modules/mono/glue/arguments_vector.h
+++ b/modules/mono/glue/arguments_vector.h
@@ -35,14 +35,13 @@
 
 template <typename T, int POOL_SIZE = 5>
 struct ArgumentsVector {
-
 private:
 	T pool[POOL_SIZE];
 	T *_ptr;
 	int size;
 
-	ArgumentsVector();
-	ArgumentsVector(const ArgumentsVector &);
+	ArgumentsVector() = delete;
+	ArgumentsVector(const ArgumentsVector &) = delete;
 
 public:
 	T *ptr() { return _ptr; }
diff --git a/modules/mono/glue/base_object_glue.cpp b/modules/mono/glue/base_object_glue.cpp
index 02246b2f2f..ebcd6d5e9c 100644
--- a/modules/mono/glue/base_object_glue.cpp
+++ b/modules/mono/glue/base_object_glue.cpp
@@ -28,10 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "base_object_glue.h"
-
 #ifdef MONO_GLUE_ENABLED
 
+#include "core/class_db.h"
+#include "core/object.h"
 #include "core/reference.h"
 #include "core/string_name.h"
 
@@ -39,6 +39,7 @@
 #include "../mono_gd/gd_mono_cache.h"
 #include "../mono_gd/gd_mono_class.h"
 #include "../mono_gd/gd_mono_internals.h"
+#include "../mono_gd/gd_mono_marshal.h"
 #include "../mono_gd/gd_mono_utils.h"
 #include "../signal_awaiter_utils.h"
 #include "arguments_vector.h"
@@ -51,7 +52,7 @@ Object *godot_icall_Object_Ctor(MonoObject *p_obj) {
 
 void godot_icall_Object_Disposed(MonoObject *p_obj, Object *p_ptr) {
 #ifdef DEBUG_ENABLED
-	CRASH_COND(p_ptr == NULL);
+	CRASH_COND(p_ptr == nullptr);
 #endif
 
 	if (p_ptr->get_script_instance()) {
@@ -59,7 +60,7 @@ void godot_icall_Object_Disposed(MonoObject *p_obj, Object *p_ptr) {
 		if (cs_instance) {
 			if (!cs_instance->is_destructing_script_instance()) {
 				cs_instance->mono_object_disposed(p_obj);
-				p_ptr->set_script_instance(NULL);
+				p_ptr->set_script_instance(nullptr);
 			}
 			return;
 		}
@@ -70,8 +71,8 @@ void godot_icall_Object_Disposed(MonoObject *p_obj, Object *p_ptr) {
 	if (data) {
 		CSharpScriptBinding &script_binding = ((Map<Object *, CSharpScriptBinding>::Element *)data)->get();
 		if (script_binding.inited) {
-			Ref<MonoGCHandle> &gchandle = script_binding.gchandle;
-			if (gchandle.is_valid()) {
+			MonoGCHandleData &gchandle = script_binding.gchandle;
+			if (!gchandle.is_released()) {
 				CSharpLanguage::release_script_gchandle(p_obj, gchandle);
 			}
 		}
@@ -80,7 +81,7 @@ void godot_icall_Object_Disposed(MonoObject *p_obj, Object *p_ptr) {
 
 void godot_icall_Reference_Disposed(MonoObject *p_obj, Object *p_ptr, MonoBoolean p_is_finalizer) {
 #ifdef DEBUG_ENABLED
-	CRASH_COND(p_ptr == NULL);
+	CRASH_COND(p_ptr == nullptr);
 	// This is only called with Reference derived classes
 	CRASH_COND(!Object::cast_to<Reference>(p_ptr));
 #endif
@@ -99,7 +100,7 @@ void godot_icall_Reference_Disposed(MonoObject *p_obj, Object *p_ptr, MonoBoolea
 				if (delete_owner) {
 					memdelete(ref);
 				} else if (remove_script_instance) {
-					ref->set_script_instance(NULL);
+					ref->set_script_instance(nullptr);
 				}
 			}
 			return;
@@ -117,8 +118,8 @@ void godot_icall_Reference_Disposed(MonoObject *p_obj, Object *p_ptr, MonoBoolea
 		if (data) {
 			CSharpScriptBinding &script_binding = ((Map<Object *, CSharpScriptBinding>::Element *)data)->get();
 			if (script_binding.inited) {
-				Ref<MonoGCHandle> &gchandle = script_binding.gchandle;
-				if (gchandle.is_valid()) {
+				MonoGCHandleData &gchandle = script_binding.gchandle;
+				if (!gchandle.is_released()) {
 					CSharpLanguage::release_script_gchandle(p_obj, gchandle);
 				}
 			}
@@ -126,37 +127,46 @@ void godot_icall_Reference_Disposed(MonoObject *p_obj, Object *p_ptr, MonoBoolea
 	}
 }
 
-MethodBind *godot_icall_Object_ClassDB_get_method(MonoString *p_type, MonoString *p_method) {
-	StringName type(GDMonoMarshal::mono_string_to_godot(p_type));
+void godot_icall_Object_ConnectEventSignals(Object *p_ptr) {
+	CSharpInstance *csharp_instance = CAST_CSHARP_INSTANCE(p_ptr->get_script_instance());
+	if (csharp_instance) {
+		csharp_instance->connect_event_signals();
+	}
+}
+
+MethodBind *godot_icall_Object_ClassDB_get_method(StringName *p_type, MonoString *p_method) {
+	StringName type = p_type ? *p_type : StringName();
 	StringName method(GDMonoMarshal::mono_string_to_godot(p_method));
 	return ClassDB::get_method(type, method);
 }
 
-MonoObject *godot_icall_Object_weakref(Object *p_obj) {
-	if (!p_obj)
-		return NULL;
+MonoObject *godot_icall_Object_weakref(Object *p_ptr) {
+	if (!p_ptr) {
+		return nullptr;
+	}
 
 	Ref<WeakRef> wref;
-	Reference *ref = Object::cast_to<Reference>(p_obj);
+	Reference *ref = Object::cast_to<Reference>(p_ptr);
 
 	if (ref) {
 		REF r = ref;
-		if (!r.is_valid())
-			return NULL;
+		if (!r.is_valid()) {
+			return nullptr;
+		}
 
 		wref.instance();
 		wref->set_ref(r);
 	} else {
 		wref.instance();
-		wref->set_obj(p_obj);
+		wref->set_obj(p_ptr);
 	}
 
 	return GDMonoUtils::unmanaged_get_managed(wref.ptr());
 }
 
-Error godot_icall_SignalAwaiter_connect(Object *p_source, MonoString *p_signal, Object *p_target, MonoObject *p_awaiter) {
-	String signal = GDMonoMarshal::mono_string_to_godot(p_signal);
-	return SignalAwaiterUtils::connect_signal_awaiter(p_source, signal, p_target, p_awaiter);
+Error godot_icall_SignalAwaiter_connect(Object *p_source, StringName *p_signal, Object *p_target, MonoObject *p_awaiter) {
+	StringName signal = p_signal ? *p_signal : StringName();
+	return gd_mono_connect_signal_awaiter(p_source, signal, p_target, p_awaiter);
 }
 
 MonoArray *godot_icall_DynamicGodotObject_SetMemberList(Object *p_ptr) {
@@ -189,12 +199,12 @@ MonoBoolean godot_icall_DynamicGodotObject_InvokeMember(Object *p_ptr, MonoStrin
 		args.set(i, &arg_store.get(i));
 	}
 
-	Variant::CallError error;
+	Callable::CallError error;
 	Variant result = p_ptr->call(StringName(name), args.ptr(), argc, error);
 
 	*r_result = GDMonoMarshal::variant_to_mono_object(result);
 
-	return error.error == Variant::CallError::CALL_OK;
+	return error.error == Callable::CallError::CALL_OK;
 }
 
 MonoBoolean godot_icall_DynamicGodotObject_GetMember(Object *p_ptr, MonoString *p_name, MonoObject **r_result) {
@@ -223,14 +233,9 @@ MonoBoolean godot_icall_DynamicGodotObject_SetMember(Object *p_ptr, MonoString *
 MonoString *godot_icall_Object_ToString(Object *p_ptr) {
 #ifdef DEBUG_ENABLED
 	// Cannot happen in C#; would get an ObjectDisposedException instead.
-	CRASH_COND(p_ptr == NULL);
-
-	if (ScriptDebugger::get_singleton() && !Object::cast_to<Reference>(p_ptr)) { // Only if debugging!
-		// Cannot happen either in C#; the handle is nullified when the object is destroyed
-		CRASH_COND(!ObjectDB::instance_validate(p_ptr));
-	}
+	CRASH_COND(p_ptr == nullptr);
 #endif
-
+	// Can't call 'Object::to_string()' here, as that can end up calling 'ToString' again resulting in an endless circular loop.
 	String result = "[" + p_ptr->get_class() + ":" + itos(p_ptr->get_instance_id()) + "]";
 	return GDMonoMarshal::mono_string_from_godot(result);
 }
@@ -239,6 +244,7 @@ void godot_register_object_icalls() {
 	mono_add_internal_call("Godot.Object::godot_icall_Object_Ctor", (void *)godot_icall_Object_Ctor);
 	mono_add_internal_call("Godot.Object::godot_icall_Object_Disposed", (void *)godot_icall_Object_Disposed);
 	mono_add_internal_call("Godot.Object::godot_icall_Reference_Disposed", (void *)godot_icall_Reference_Disposed);
+	mono_add_internal_call("Godot.Object::godot_icall_Object_ConnectEventSignals", (void *)godot_icall_Object_ConnectEventSignals);
 	mono_add_internal_call("Godot.Object::godot_icall_Object_ClassDB_get_method", (void *)godot_icall_Object_ClassDB_get_method);
 	mono_add_internal_call("Godot.Object::godot_icall_Object_ToString", (void *)godot_icall_Object_ToString);
 	mono_add_internal_call("Godot.Object::godot_icall_Object_weakref", (void *)godot_icall_Object_weakref);
diff --git a/modules/mono/glue/collections_glue.cpp b/modules/mono/glue/collections_glue.cpp
index b7fa7fcab2..3313e8cb77 100644
--- a/modules/mono/glue/collections_glue.cpp
+++ b/modules/mono/glue/collections_glue.cpp
@@ -28,14 +28,15 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "collections_glue.h"
-
 #ifdef MONO_GLUE_ENABLED
 
 #include <mono/metadata/exception.h>
 
+#include "core/array.h"
+
 #include "../mono_gd/gd_mono_cache.h"
 #include "../mono_gd/gd_mono_class.h"
+#include "../mono_gd/gd_mono_marshal.h"
 #include "../mono_gd/gd_mono_utils.h"
 
 Array *godot_icall_Array_Ctor() {
@@ -49,7 +50,7 @@ void godot_icall_Array_Dtor(Array *ptr) {
 MonoObject *godot_icall_Array_At(Array *ptr, int index) {
 	if (index < 0 || index >= ptr->size()) {
 		GDMonoUtils::set_pending_exception(mono_get_exception_index_out_of_range());
-		return NULL;
+		return nullptr;
 	}
 	return GDMonoMarshal::variant_to_mono_object(ptr->operator[](index));
 }
@@ -57,7 +58,7 @@ MonoObject *godot_icall_Array_At(Array *ptr, int index) {
 MonoObject *godot_icall_Array_At_Generic(Array *ptr, int index, uint32_t type_encoding, GDMonoClass *type_class) {
 	if (index < 0 || index >= ptr->size()) {
 		GDMonoUtils::set_pending_exception(mono_get_exception_index_out_of_range());
-		return NULL;
+		return nullptr;
 	}
 	return GDMonoMarshal::variant_to_mono_object(ptr->operator[](index), ManagedType(type_encoding, type_class));
 }
@@ -103,10 +104,31 @@ void godot_icall_Array_CopyTo(Array *ptr, MonoArray *array, int array_index) {
 	}
 }
 
+Array *godot_icall_Array_Ctor_MonoArray(MonoArray *mono_array) {
+	Array *godot_array = memnew(Array);
+	unsigned int count = mono_array_length(mono_array);
+	godot_array->resize(count);
+	for (unsigned int i = 0; i < count; i++) {
+		MonoObject *item = mono_array_get(mono_array, MonoObject *, i);
+		godot_icall_Array_SetAt(godot_array, i, item);
+	}
+	return godot_array;
+}
+
 Array *godot_icall_Array_Duplicate(Array *ptr, MonoBoolean deep) {
 	return memnew(Array(ptr->duplicate(deep)));
 }
 
+Array *godot_icall_Array_Concatenate(Array *left, Array *right) {
+	int count = left->size() + right->size();
+	Array *new_array = memnew(Array(left->duplicate(false)));
+	new_array->resize(count);
+	for (unsigned int i = 0; i < (unsigned int)right->size(); i++) {
+		new_array->operator[](i + left->size()) = right->operator[](i);
+	}
+	return new_array;
+}
+
 int godot_icall_Array_IndexOf(Array *ptr, MonoObject *item) {
 	return ptr->find(GDMonoMarshal::mono_object_to_variant(item));
 }
@@ -162,28 +184,28 @@ void godot_icall_Dictionary_Dtor(Dictionary *ptr) {
 
 MonoObject *godot_icall_Dictionary_GetValue(Dictionary *ptr, MonoObject *key) {
 	Variant *ret = ptr->getptr(GDMonoMarshal::mono_object_to_variant(key));
-	if (ret == NULL) {
+	if (ret == nullptr) {
 		MonoObject *exc = mono_object_new(mono_domain_get(), CACHED_CLASS(KeyNotFoundException)->get_mono_ptr());
 #ifdef DEBUG_ENABLED
 		CRASH_COND(!exc);
 #endif
 		GDMonoUtils::runtime_object_init(exc, CACHED_CLASS(KeyNotFoundException));
 		GDMonoUtils::set_pending_exception((MonoException *)exc);
-		return NULL;
+		return nullptr;
 	}
 	return GDMonoMarshal::variant_to_mono_object(ret);
 }
 
 MonoObject *godot_icall_Dictionary_GetValue_Generic(Dictionary *ptr, MonoObject *key, uint32_t type_encoding, GDMonoClass *type_class) {
 	Variant *ret = ptr->getptr(GDMonoMarshal::mono_object_to_variant(key));
-	if (ret == NULL) {
+	if (ret == nullptr) {
 		MonoObject *exc = mono_object_new(mono_domain_get(), CACHED_CLASS(KeyNotFoundException)->get_mono_ptr());
 #ifdef DEBUG_ENABLED
 		CRASH_COND(!exc);
 #endif
 		GDMonoUtils::runtime_object_init(exc, CACHED_CLASS(KeyNotFoundException));
 		GDMonoUtils::set_pending_exception((MonoException *)exc);
-		return NULL;
+		return nullptr;
 	}
 	return GDMonoMarshal::variant_to_mono_object(ret, ManagedType(type_encoding, type_class));
 }
@@ -207,7 +229,7 @@ int godot_icall_Dictionary_Count(Dictionary *ptr) {
 void godot_icall_Dictionary_Add(Dictionary *ptr, MonoObject *key, MonoObject *value) {
 	Variant varKey = GDMonoMarshal::mono_object_to_variant(key);
 	Variant *ret = ptr->getptr(varKey);
-	if (ret != NULL) {
+	if (ret != nullptr) {
 		GDMonoUtils::set_pending_exception(mono_get_exception_argument("key", "An element with the same key already exists"));
 		return;
 	}
@@ -221,7 +243,7 @@ void godot_icall_Dictionary_Clear(Dictionary *ptr) {
 MonoBoolean godot_icall_Dictionary_Contains(Dictionary *ptr, MonoObject *key, MonoObject *value) {
 	// no dupes
 	Variant *ret = ptr->getptr(GDMonoMarshal::mono_object_to_variant(key));
-	return ret != NULL && *ret == GDMonoMarshal::mono_object_to_variant(value);
+	return ret != nullptr && *ret == GDMonoMarshal::mono_object_to_variant(value);
 }
 
 MonoBoolean godot_icall_Dictionary_ContainsKey(Dictionary *ptr, MonoObject *key) {
@@ -241,7 +263,7 @@ MonoBoolean godot_icall_Dictionary_Remove(Dictionary *ptr, MonoObject *key, Mono
 
 	// no dupes
 	Variant *ret = ptr->getptr(varKey);
-	if (ret != NULL && *ret == GDMonoMarshal::mono_object_to_variant(value)) {
+	if (ret != nullptr && *ret == GDMonoMarshal::mono_object_to_variant(value)) {
 		ptr->erase(varKey);
 		return true;
 	}
@@ -251,8 +273,8 @@ MonoBoolean godot_icall_Dictionary_Remove(Dictionary *ptr, MonoObject *key, Mono
 
 MonoBoolean godot_icall_Dictionary_TryGetValue(Dictionary *ptr, MonoObject *key, MonoObject **value) {
 	Variant *ret = ptr->getptr(GDMonoMarshal::mono_object_to_variant(key));
-	if (ret == NULL) {
-		*value = NULL;
+	if (ret == nullptr) {
+		*value = nullptr;
 		return false;
 	}
 	*value = GDMonoMarshal::variant_to_mono_object(ret);
@@ -261,8 +283,8 @@ MonoBoolean godot_icall_Dictionary_TryGetValue(Dictionary *ptr, MonoObject *key,
 
 MonoBoolean godot_icall_Dictionary_TryGetValue_Generic(Dictionary *ptr, MonoObject *key, MonoObject **value, uint32_t type_encoding, GDMonoClass *type_class) {
 	Variant *ret = ptr->getptr(GDMonoMarshal::mono_object_to_variant(key));
-	if (ret == NULL) {
-		*value = NULL;
+	if (ret == nullptr) {
+		*value = nullptr;
 		return false;
 	}
 	*value = GDMonoMarshal::variant_to_mono_object(ret, ManagedType(type_encoding, type_class));
@@ -283,6 +305,7 @@ MonoString *godot_icall_Dictionary_ToString(Dictionary *ptr) {
 
 void godot_register_collections_icalls() {
 	mono_add_internal_call("Godot.Collections.Array::godot_icall_Array_Ctor", (void *)godot_icall_Array_Ctor);
+	mono_add_internal_call("Godot.Collections.Array::godot_icall_Array_Ctor_MonoArray", (void *)godot_icall_Array_Ctor_MonoArray);
 	mono_add_internal_call("Godot.Collections.Array::godot_icall_Array_Dtor", (void *)godot_icall_Array_Dtor);
 	mono_add_internal_call("Godot.Collections.Array::godot_icall_Array_At", (void *)godot_icall_Array_At);
 	mono_add_internal_call("Godot.Collections.Array::godot_icall_Array_At_Generic", (void *)godot_icall_Array_At_Generic);
@@ -290,6 +313,7 @@ void godot_register_collections_icalls() {
 	mono_add_internal_call("Godot.Collections.Array::godot_icall_Array_Count", (void *)godot_icall_Array_Count);
 	mono_add_internal_call("Godot.Collections.Array::godot_icall_Array_Add", (void *)godot_icall_Array_Add);
 	mono_add_internal_call("Godot.Collections.Array::godot_icall_Array_Clear", (void *)godot_icall_Array_Clear);
+	mono_add_internal_call("Godot.Collections.Array::godot_icall_Array_Concatenate", (void *)godot_icall_Array_Concatenate);
 	mono_add_internal_call("Godot.Collections.Array::godot_icall_Array_Contains", (void *)godot_icall_Array_Contains);
 	mono_add_internal_call("Godot.Collections.Array::godot_icall_Array_CopyTo", (void *)godot_icall_Array_CopyTo);
 	mono_add_internal_call("Godot.Collections.Array::godot_icall_Array_Duplicate", (void *)godot_icall_Array_Duplicate);
diff --git a/modules/mono/glue/collections_glue.h b/modules/mono/glue/collections_glue.h
deleted file mode 100644
index f8351a1fc7..0000000000
--- a/modules/mono/glue/collections_glue.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*************************************************************************/
-/*  collections_glue.h                                                   */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
-/*                                                                       */
-/* Permission is hereby granted, free of charge, to any person obtaining */
-/* a copy of this software and associated documentation files (the       */
-/* "Software"), to deal in the Software without restriction, including   */
-/* without limitation the rights to use, copy, modify, merge, publish,   */
-/* distribute, sublicense, and/or sell copies of the Software, and to    */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions:                                             */
-/*                                                                       */
-/* The above copyright notice and this permission notice shall be        */
-/* included in all copies or substantial portions of the Software.       */
-/*                                                                       */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
-/*************************************************************************/
-
-#ifndef COLLECTIONS_GLUE_H
-#define COLLECTIONS_GLUE_H
-
-#ifdef MONO_GLUE_ENABLED
-
-#include "core/array.h"
-
-#include "../mono_gd/gd_mono_marshal.h"
-
-// Array
-
-Array *godot_icall_Array_Ctor();
-
-void godot_icall_Array_Dtor(Array *ptr);
-
-MonoObject *godot_icall_Array_At(Array *ptr, int index);
-
-MonoObject *godot_icall_Array_At_Generic(Array *ptr, int index, uint32_t type_encoding, GDMonoClass *type_class);
-
-void godot_icall_Array_SetAt(Array *ptr, int index, MonoObject *value);
-
-int godot_icall_Array_Count(Array *ptr);
-
-int godot_icall_Array_Add(Array *ptr, MonoObject *item);
-
-void godot_icall_Array_Clear(Array *ptr);
-
-MonoBoolean godot_icall_Array_Contains(Array *ptr, MonoObject *item);
-
-void godot_icall_Array_CopyTo(Array *ptr, MonoArray *array, int array_index);
-
-Array *godot_icall_Array_Duplicate(Array *ptr, MonoBoolean deep);
-
-int godot_icall_Array_IndexOf(Array *ptr, MonoObject *item);
-
-void godot_icall_Array_Insert(Array *ptr, int index, MonoObject *item);
-
-MonoBoolean godot_icall_Array_Remove(Array *ptr, MonoObject *item);
-
-void godot_icall_Array_RemoveAt(Array *ptr, int index);
-
-Error godot_icall_Array_Resize(Array *ptr, int new_size);
-
-void godot_icall_Array_Generic_GetElementTypeInfo(MonoReflectionType *refltype, uint32_t *type_encoding, GDMonoClass **type_class);
-
-MonoString *godot_icall_Array_ToString(Array *ptr);
-
-// Dictionary
-
-Dictionary *godot_icall_Dictionary_Ctor();
-
-void godot_icall_Dictionary_Dtor(Dictionary *ptr);
-
-MonoObject *godot_icall_Dictionary_GetValue(Dictionary *ptr, MonoObject *key);
-
-MonoObject *godot_icall_Dictionary_GetValue_Generic(Dictionary *ptr, MonoObject *key, uint32_t type_encoding, GDMonoClass *type_class);
-
-void godot_icall_Dictionary_SetValue(Dictionary *ptr, MonoObject *key, MonoObject *value);
-
-Array *godot_icall_Dictionary_Keys(Dictionary *ptr);
-
-Array *godot_icall_Dictionary_Values(Dictionary *ptr);
-
-int godot_icall_Dictionary_Count(Dictionary *ptr);
-
-void godot_icall_Dictionary_Add(Dictionary *ptr, MonoObject *key, MonoObject *value);
-
-void godot_icall_Dictionary_Clear(Dictionary *ptr);
-
-MonoBoolean godot_icall_Dictionary_Contains(Dictionary *ptr, MonoObject *key, MonoObject *value);
-
-MonoBoolean godot_icall_Dictionary_ContainsKey(Dictionary *ptr, MonoObject *key);
-
-Dictionary *godot_icall_Dictionary_Duplicate(Dictionary *ptr, MonoBoolean deep);
-
-MonoBoolean godot_icall_Dictionary_RemoveKey(Dictionary *ptr, MonoObject *key);
-
-MonoBoolean godot_icall_Dictionary_Remove(Dictionary *ptr, MonoObject *key, MonoObject *value);
-
-MonoBoolean godot_icall_Dictionary_TryGetValue(Dictionary *ptr, MonoObject *key, MonoObject **value);
-
-MonoBoolean godot_icall_Dictionary_TryGetValue_Generic(Dictionary *ptr, MonoObject *key, MonoObject **value, uint32_t type_encoding, GDMonoClass *type_class);
-
-void godot_icall_Dictionary_Generic_GetValueTypeInfo(MonoReflectionType *refltype, uint32_t *type_encoding, GDMonoClass **type_class);
-
-MonoString *godot_icall_Dictionary_ToString(Dictionary *ptr);
-
-// Register internal calls
-
-void godot_register_collections_icalls();
-
-#endif // MONO_GLUE_ENABLED
-
-#endif // COLLECTIONS_GLUE_H
diff --git a/modules/mono/glue/gd_glue.cpp b/modules/mono/glue/gd_glue.cpp
index 9bea625450..5e892b616b 100644
--- a/modules/mono/glue/gd_glue.cpp
+++ b/modules/mono/glue/gd_glue.cpp
@@ -28,8 +28,6 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "gd_glue.h"
-
 #ifdef MONO_GLUE_ENABLED
 
 #include "core/array.h"
@@ -40,13 +38,13 @@
 #include "core/variant_parser.h"
 
 #include "../mono_gd/gd_mono_cache.h"
+#include "../mono_gd/gd_mono_marshal.h"
 #include "../mono_gd/gd_mono_utils.h"
 
 MonoObject *godot_icall_GD_bytes2var(MonoArray *p_bytes, MonoBoolean p_allow_objects) {
 	Variant ret;
-	PoolByteArray varr = GDMonoMarshal::mono_array_to_PoolByteArray(p_bytes);
-	PoolByteArray::Read r = varr.read();
-	Error err = decode_variant(ret, r.ptr(), varr.size(), NULL, p_allow_objects);
+	PackedByteArray varr = GDMonoMarshal::mono_array_to_PackedByteArray(p_bytes);
+	Error err = decode_variant(ret, varr.ptr(), varr.size(), nullptr, p_allow_objects);
 	if (err != OK) {
 		ret = RTR("Not enough bytes for decoding bytes, or invalid format.");
 	}
@@ -56,9 +54,9 @@ MonoObject *godot_icall_GD_bytes2var(MonoArray *p_bytes, MonoBoolean p_allow_obj
 MonoObject *godot_icall_GD_convert(MonoObject *p_what, int32_t p_type) {
 	Variant what = GDMonoMarshal::mono_object_to_variant(p_what);
 	const Variant *args[1] = { &what };
-	Variant::CallError ce;
+	Callable::CallError ce;
 	Variant ret = Variant::construct(Variant::Type(p_type), args, 1, ce);
-	ERR_FAIL_COND_V(ce.error != Variant::CallError::CALL_OK, NULL);
+	ERR_FAIL_COND_V(ce.error != Callable::CallError::CALL_OK, nullptr);
 	return GDMonoMarshal::variant_to_mono_object(ret);
 }
 
@@ -67,7 +65,7 @@ int godot_icall_GD_hash(MonoObject *p_var) {
 }
 
 MonoObject *godot_icall_GD_instance_from_id(uint64_t p_instance_id) {
-	return GDMonoUtils::unmanaged_get_managed(ObjectDB::get_instance(p_instance_id));
+	return GDMonoUtils::unmanaged_get_managed(ObjectDB::get_instance(ObjectID(p_instance_id)));
 }
 
 void godot_icall_GD_print(MonoArray *p_what) {
@@ -77,7 +75,7 @@ void godot_icall_GD_print(MonoArray *p_what) {
 	for (int i = 0; i < length; i++) {
 		MonoObject *elem = mono_array_get(p_what, MonoObject *, i);
 
-		MonoException *exc = NULL;
+		MonoException *exc = nullptr;
 		String elem_str = GDMonoMarshal::mono_object_to_variant_string(elem, &exc);
 
 		if (exc) {
@@ -92,14 +90,13 @@ void godot_icall_GD_print(MonoArray *p_what) {
 }
 
 void godot_icall_GD_printerr(MonoArray *p_what) {
-
 	String str;
 	int length = mono_array_length(p_what);
 
 	for (int i = 0; i < length; i++) {
 		MonoObject *elem = mono_array_get(p_what, MonoObject *, i);
 
-		MonoException *exc = NULL;
+		MonoException *exc = nullptr;
 		String elem_str = GDMonoMarshal::mono_object_to_variant_string(elem, &exc);
 
 		if (exc) {
@@ -120,7 +117,7 @@ void godot_icall_GD_printraw(MonoArray *p_what) {
 	for (int i = 0; i < length; i++) {
 		MonoObject *elem = mono_array_get(p_what, MonoObject *, i);
 
-		MonoException *exc = NULL;
+		MonoException *exc = nullptr;
 		String elem_str = GDMonoMarshal::mono_object_to_variant_string(elem, &exc);
 
 		if (exc) {
@@ -141,7 +138,7 @@ void godot_icall_GD_prints(MonoArray *p_what) {
 	for (int i = 0; i < length; i++) {
 		MonoObject *elem = mono_array_get(p_what, MonoObject *, i);
 
-		MonoException *exc = NULL;
+		MonoException *exc = nullptr;
 		String elem_str = GDMonoMarshal::mono_object_to_variant_string(elem, &exc);
 
 		if (exc) {
@@ -149,8 +146,9 @@ void godot_icall_GD_prints(MonoArray *p_what) {
 			return;
 		}
 
-		if (i)
+		if (i) {
 			str += " ";
+		}
 
 		str += elem_str;
 	}
@@ -165,7 +163,7 @@ void godot_icall_GD_printt(MonoArray *p_what) {
 	for (int i = 0; i < length; i++) {
 		MonoObject *elem = mono_array_get(p_what, MonoObject *, i);
 
-		MonoException *exc = NULL;
+		MonoException *exc = nullptr;
 		String elem_str = GDMonoMarshal::mono_object_to_variant_string(elem, &exc);
 
 		if (exc) {
@@ -173,8 +171,9 @@ void godot_icall_GD_printt(MonoArray *p_what) {
 			return;
 		}
 
-		if (i)
+		if (i) {
 			str += "\t";
+		}
 
 		str += elem_str;
 	}
@@ -199,7 +198,7 @@ double godot_icall_GD_rand_range(double from, double to) {
 }
 
 uint32_t godot_icall_GD_rand_seed(uint64_t seed, uint64_t *newSeed) {
-	int ret = Math::rand_from_seed(&seed);
+	uint32_t ret = Math::rand_from_seed(&seed);
 	*newSeed = seed;
 	return ret;
 }
@@ -215,10 +214,11 @@ MonoString *godot_icall_GD_str(MonoArray *p_what) {
 	for (int i = 0; i < what.size(); i++) {
 		String os = what[i].operator String();
 
-		if (i == 0)
+		if (i == 0) {
 			str = os;
-		else
+		} else {
 			str += os;
+		}
 	}
 
 	return GDMonoMarshal::mono_string_from_godot(str);
@@ -235,40 +235,38 @@ MonoObject *godot_icall_GD_str2var(MonoString *p_str) {
 	Error err = VariantParser::parse(&ss, ret, errs, line);
 	if (err != OK) {
 		String err_str = "Parse error at line " + itos(line) + ": " + errs + ".";
-		ERR_PRINTS(err_str);
+		ERR_PRINT(err_str);
 		ret = err_str;
 	}
 
 	return GDMonoMarshal::variant_to_mono_object(ret);
 }
 
-MonoBoolean godot_icall_GD_type_exists(MonoString *p_type) {
-	return ClassDB::class_exists(GDMonoMarshal::mono_string_to_godot(p_type));
+MonoBoolean godot_icall_GD_type_exists(StringName *p_type) {
+	StringName type = p_type ? *p_type : StringName();
+	return ClassDB::class_exists(type);
 }
 
 void godot_icall_GD_pusherror(MonoString *p_str) {
-	ERR_PRINTS(GDMonoMarshal::mono_string_to_godot(p_str));
+	ERR_PRINT(GDMonoMarshal::mono_string_to_godot(p_str));
 }
 
 void godot_icall_GD_pushwarning(MonoString *p_str) {
-	WARN_PRINTS(GDMonoMarshal::mono_string_to_godot(p_str));
+	WARN_PRINT(GDMonoMarshal::mono_string_to_godot(p_str));
 }
 
 MonoArray *godot_icall_GD_var2bytes(MonoObject *p_var, MonoBoolean p_full_objects) {
 	Variant var = GDMonoMarshal::mono_object_to_variant(p_var);
 
-	PoolByteArray barr;
+	PackedByteArray barr;
 	int len;
-	Error err = encode_variant(var, NULL, len, p_full_objects);
-	ERR_FAIL_COND_V_MSG(err != OK, NULL, "Unexpected error encoding variable to bytes, likely unserializable type found (Object or RID).");
+	Error err = encode_variant(var, nullptr, len, p_full_objects);
+	ERR_FAIL_COND_V_MSG(err != OK, nullptr, "Unexpected error encoding variable to bytes, likely unserializable type found (Object or RID).");
 
 	barr.resize(len);
-	{
-		PoolByteArray::Write w = barr.write();
-		encode_variant(var, w.ptr(), len, p_full_objects);
-	}
+	encode_variant(var, barr.ptrw(), len, p_full_objects);
 
-	return GDMonoMarshal::PoolByteArray_to_mono_array(barr);
+	return GDMonoMarshal::PackedByteArray_to_mono_array(barr);
 }
 
 MonoString *godot_icall_GD_var2str(MonoObject *p_var) {
@@ -277,6 +275,10 @@ MonoString *godot_icall_GD_var2str(MonoObject *p_var) {
 	return GDMonoMarshal::mono_string_from_godot(vars);
 }
 
+uint32_t godot_icall_TypeToVariantType(MonoReflectionType *p_refl_type) {
+	return (uint32_t)GDMonoMarshal::managed_to_variant_type(ManagedType::from_reftype(p_refl_type));
+}
+
 MonoObject *godot_icall_DefaultGodotTaskScheduler() {
 	return GDMonoCache::cached_data.task_scheduler_handle->get_target();
 }
@@ -304,6 +306,7 @@ void godot_register_gd_icalls() {
 	mono_add_internal_call("Godot.GD::godot_icall_GD_type_exists", (void *)godot_icall_GD_type_exists);
 	mono_add_internal_call("Godot.GD::godot_icall_GD_var2bytes", (void *)godot_icall_GD_var2bytes);
 	mono_add_internal_call("Godot.GD::godot_icall_GD_var2str", (void *)godot_icall_GD_var2str);
+	mono_add_internal_call("Godot.GD::godot_icall_TypeToVariantType", (void *)godot_icall_TypeToVariantType);
 
 	// Dispatcher
 	mono_add_internal_call("Godot.Dispatcher::godot_icall_DefaultGodotTaskScheduler", (void *)godot_icall_DefaultGodotTaskScheduler);
diff --git a/modules/mono/glue/glue_header.h b/modules/mono/glue/glue_header.h
index 758b71f719..c1f1936711 100644
--- a/modules/mono/glue/glue_header.h
+++ b/modules/mono/glue/glue_header.h
@@ -30,12 +30,16 @@
 
 #ifdef MONO_GLUE_ENABLED
 
-#include "base_object_glue.h"
-#include "collections_glue.h"
-#include "gd_glue.h"
-#include "nodepath_glue.h"
-#include "rid_glue.h"
-#include "string_glue.h"
+#include "../mono_gd/gd_mono_marshal.h"
+
+void godot_register_collections_icalls();
+void godot_register_gd_icalls();
+void godot_register_string_name_icalls();
+void godot_register_nodepath_icalls();
+void godot_register_object_icalls();
+void godot_register_rid_icalls();
+void godot_register_string_icalls();
+void godot_register_scene_tree_icalls();
 
 /**
  * Registers internal calls that were not generated. This function is called
@@ -44,10 +48,12 @@
 void godot_register_glue_header_icalls() {
 	godot_register_collections_icalls();
 	godot_register_gd_icalls();
+	godot_register_string_name_icalls();
 	godot_register_nodepath_icalls();
 	godot_register_object_icalls();
 	godot_register_rid_icalls();
 	godot_register_string_icalls();
+	godot_register_scene_tree_icalls();
 }
 
 // Used by the generated glue
@@ -68,7 +74,7 @@ void godot_register_glue_header_icalls() {
 #include "../mono_gd/gd_mono_utils.h"
 
 #define GODOTSHARP_INSTANCE_OBJECT(m_instance, m_type) \
-	static ClassDB::ClassInfo *ci = NULL;              \
+	static ClassDB::ClassInfo *ci = nullptr;           \
 	if (!ci) {                                         \
 		ci = ClassDB::classes.getptr(m_type);          \
 	}                                                  \
diff --git a/modules/mono/glue/nodepath_glue.cpp b/modules/mono/glue/nodepath_glue.cpp
index e413f404d8..2aa75dd309 100644
--- a/modules/mono/glue/nodepath_glue.cpp
+++ b/modules/mono/glue/nodepath_glue.cpp
@@ -28,12 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "nodepath_glue.h"
-
 #ifdef MONO_GLUE_ENABLED
 
+#include "core/node_path.h"
 #include "core/ustring.h"
 
+#include "../mono_gd/gd_mono_marshal.h"
+
 NodePath *godot_icall_NodePath_Ctor(MonoString *p_path) {
 	return memnew(NodePath(GDMonoMarshal::mono_string_to_godot(p_path)));
 }
@@ -51,7 +52,7 @@ MonoBoolean godot_icall_NodePath_is_absolute(NodePath *p_ptr) {
 	return (MonoBoolean)p_ptr->is_absolute();
 }
 
-uint32_t godot_icall_NodePath_get_name_count(NodePath *p_ptr) {
+int32_t godot_icall_NodePath_get_name_count(NodePath *p_ptr) {
 	return p_ptr->get_name_count();
 }
 
@@ -59,7 +60,7 @@ MonoString *godot_icall_NodePath_get_name(NodePath *p_ptr, uint32_t p_idx) {
 	return GDMonoMarshal::mono_string_from_godot(p_ptr->get_name(p_idx));
 }
 
-uint32_t godot_icall_NodePath_get_subname_count(NodePath *p_ptr) {
+int32_t godot_icall_NodePath_get_subname_count(NodePath *p_ptr) {
 	return p_ptr->get_subname_count();
 }
 
diff --git a/modules/mono/glue/rid_glue.cpp b/modules/mono/glue/rid_glue.cpp
index 66a49d8fec..6d2e6b559f 100644
--- a/modules/mono/glue/rid_glue.cpp
+++ b/modules/mono/glue/rid_glue.cpp
@@ -28,17 +28,20 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "rid_glue.h"
-
 #ifdef MONO_GLUE_ENABLED
 
+#include "core/object.h"
 #include "core/resource.h"
+#include "core/rid.h"
+
+#include "../mono_gd/gd_mono_marshal.h"
 
 RID *godot_icall_RID_Ctor(Object *p_from) {
 	Resource *res_from = Object::cast_to<Resource>(p_from);
 
-	if (res_from)
+	if (res_from) {
 		return memnew(RID(res_from->get_rid()));
+	}
 
 	return memnew(RID);
 }
diff --git a/modules/mono/glue/base_object_glue.h b/modules/mono/glue/scene_tree_glue.cpp
index 22532dcff9..b43daccc1b 100644
--- a/modules/mono/glue/base_object_glue.h
+++ b/modules/mono/glue/scene_tree_glue.cpp
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  base_object_glue.h                                                   */
+/*  scene_tree_glue.cpp                                                  */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,44 +28,59 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef BASE_OBJECT_GLUE_H
-#define BASE_OBJECT_GLUE_H
-
 #ifdef MONO_GLUE_ENABLED
 
+#include "core/array.h"
 #include "core/class_db.h"
-#include "core/object.h"
+#include "core/string_name.h"
+#include "scene/main/node.h"
+#include "scene/main/scene_tree.h"
 
+#include "../csharp_script.h"
 #include "../mono_gd/gd_mono_marshal.h"
-
-Object *godot_icall_Object_Ctor(MonoObject *p_obj);
-
-void godot_icall_Object_Disposed(MonoObject *p_obj, Object *p_ptr);
-
-void godot_icall_Reference_Disposed(MonoObject *p_obj, Object *p_ptr, MonoBoolean p_is_finalizer);
-
-MethodBind *godot_icall_Object_ClassDB_get_method(MonoString *p_type, MonoString *p_method);
-
-MonoObject *godot_icall_Object_weakref(Object *p_obj);
-
-Error godot_icall_SignalAwaiter_connect(Object *p_source, MonoString *p_signal, Object *p_target, MonoObject *p_awaiter);
-
-// DynamicGodotObject
-
-MonoArray *godot_icall_DynamicGodotObject_SetMemberList(Object *p_ptr);
-
-MonoBoolean godot_icall_DynamicGodotObject_InvokeMember(Object *p_ptr, MonoString *p_name, MonoArray *p_args, MonoObject **r_result);
-
-MonoBoolean godot_icall_DynamicGodotObject_GetMember(Object *p_ptr, MonoString *p_name, MonoObject **r_result);
-
-MonoBoolean godot_icall_DynamicGodotObject_SetMember(Object *p_ptr, MonoString *p_name, MonoObject *p_value);
-
-MonoString *godot_icall_Object_ToString(Object *p_ptr);
-
-// Register internal calls
-
-void godot_register_object_icalls();
+#include "../mono_gd/gd_mono_utils.h"
+
+Array *godot_icall_SceneTree_get_nodes_in_group_Generic(SceneTree *ptr, StringName *group, MonoReflectionType *refltype) {
+	List<Node *> nodes;
+	Array ret;
+
+	// Retrieve all the nodes in the group
+	ptr->get_nodes_in_group(*group, &nodes);
+
+	// No need to bother if the group is empty
+	if (!nodes.empty()) {
+		MonoType *elem_type = mono_reflection_type_get_type(refltype);
+		MonoClass *mono_class = mono_class_from_mono_type(elem_type);
+		GDMonoClass *klass = GDMono::get_singleton()->get_class(mono_class);
+
+		if (klass == GDMonoUtils::get_class_native_base(klass)) {
+			// If we're trying to get native objects, just check the inheritance list
+			StringName native_class_name = GDMonoUtils::get_native_godot_class_name(klass);
+			for (int i = 0; i < nodes.size(); ++i) {
+				if (ClassDB::is_parent_class(nodes[i]->get_class(), native_class_name)) {
+					ret.push_back(nodes[i]);
+				}
+			}
+		} else {
+			// If we're trying to get csharpscript instances, get the mono object and compare the classes
+			for (int i = 0; i < nodes.size(); ++i) {
+				CSharpInstance *si = CAST_CSHARP_INSTANCE(nodes[i]->get_script_instance());
+
+				if (si != nullptr) {
+					MonoObject *obj = si->get_mono_object();
+					if (obj != nullptr && mono_object_get_class(obj) == mono_class) {
+						ret.push_back(nodes[i]);
+					}
+				}
+			}
+		}
+	}
+
+	return memnew(Array(ret));
+}
+
+void godot_register_scene_tree_icalls() {
+	mono_add_internal_call("Godot.SceneTree::godot_icall_SceneTree_get_nodes_in_group_Generic", (void *)godot_icall_SceneTree_get_nodes_in_group_Generic);
+}
 
 #endif // MONO_GLUE_ENABLED
-
-#endif // BASE_OBJECT_GLUE_H
diff --git a/modules/mono/glue/string_glue.cpp b/modules/mono/glue/string_glue.cpp
index e407a70db9..595b8d71f1 100644
--- a/modules/mono/glue/string_glue.cpp
+++ b/modules/mono/glue/string_glue.cpp
@@ -28,14 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "string_glue.h"
-
 #ifdef MONO_GLUE_ENABLED
 
 #include "core/ustring.h"
 #include "core/variant.h"
 #include "core/vector.h"
 
+#include "../mono_gd/gd_mono_marshal.h"
+
 MonoArray *godot_icall_String_md5_buffer(MonoString *p_str) {
 	Vector<uint8_t> ret = GDMonoMarshal::mono_string_to_godot(p_str).md5_buffer();
 	// TODO Check possible Array/Vector<uint8_t> problem?
diff --git a/modules/mono/glue/nodepath_glue.h b/modules/mono/glue/string_name_glue.cpp
index 727679c278..4b2e88569b 100644
--- a/modules/mono/glue/nodepath_glue.h
+++ b/modules/mono/glue/string_name_glue.cpp
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  nodepath_glue.h                                                      */
+/*  string_name_glue.cpp                                                 */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,41 +28,35 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef NODEPATH_GLUE_H
-#define NODEPATH_GLUE_H
-
 #ifdef MONO_GLUE_ENABLED
 
-#include "core/node_path.h"
+#include "core/string_name.h"
+#include "core/ustring.h"
 
 #include "../mono_gd/gd_mono_marshal.h"
 
-NodePath *godot_icall_NodePath_Ctor(MonoString *p_path);
-
-void godot_icall_NodePath_Dtor(NodePath *p_ptr);
-
-MonoString *godot_icall_NodePath_operator_String(NodePath *p_np);
-
-MonoBoolean godot_icall_NodePath_is_absolute(NodePath *p_ptr);
-
-uint32_t godot_icall_NodePath_get_name_count(NodePath *p_ptr);
+StringName *godot_icall_StringName_Ctor(MonoString *p_path) {
+	return memnew(StringName(GDMonoMarshal::mono_string_to_godot(p_path)));
+}
 
-MonoString *godot_icall_NodePath_get_name(NodePath *p_ptr, uint32_t p_idx);
+void godot_icall_StringName_Dtor(StringName *p_ptr) {
+	ERR_FAIL_NULL(p_ptr);
+	memdelete(p_ptr);
+}
 
-uint32_t godot_icall_NodePath_get_subname_count(NodePath *p_ptr);
+MonoString *godot_icall_StringName_operator_String(StringName *p_np) {
+	return GDMonoMarshal::mono_string_from_godot(p_np->operator String());
+}
 
-MonoString *godot_icall_NodePath_get_subname(NodePath *p_ptr, uint32_t p_idx);
+MonoBoolean godot_icall_StringName_is_empty(StringName *p_ptr) {
+	return (MonoBoolean)(*p_ptr == StringName());
+}
 
-MonoString *godot_icall_NodePath_get_concatenated_subnames(NodePath *p_ptr);
-
-NodePath *godot_icall_NodePath_get_as_property_path(NodePath *p_ptr);
-
-MonoBoolean godot_icall_NodePath_is_empty(NodePath *p_ptr);
-
-// Register internal calls
-
-void godot_register_nodepath_icalls();
+void godot_register_string_name_icalls() {
+	mono_add_internal_call("Godot.StringName::godot_icall_StringName_Ctor", (void *)godot_icall_StringName_Ctor);
+	mono_add_internal_call("Godot.StringName::godot_icall_StringName_Dtor", (void *)godot_icall_StringName_Dtor);
+	mono_add_internal_call("Godot.StringName::godot_icall_StringName_operator_String", (void *)godot_icall_StringName_operator_String);
+	mono_add_internal_call("Godot.StringName::godot_icall_StringName_is_empty", (void *)godot_icall_StringName_is_empty);
+}
 
 #endif // MONO_GLUE_ENABLED
-
-#endif // NODEPATH_GLUE_H
diff --git a/modules/mono/godotsharp_dirs.cpp b/modules/mono/godotsharp_dirs.cpp
index 47eb432490..692da991c7 100644
--- a/modules/mono/godotsharp_dirs.cpp
+++ b/modules/mono/godotsharp_dirs.cpp
@@ -40,7 +40,7 @@
 #endif
 
 #ifdef ANDROID_ENABLED
-#include "mono_gd/gd_mono_android.h"
+#include "mono_gd/support/android_support.h"
 #endif
 
 #include "mono_gd/gd_mono.h"
@@ -49,13 +49,13 @@ namespace GodotSharpDirs {
 
 String _get_expected_build_config() {
 #ifdef TOOLS_ENABLED
-	return "Tools";
+	return "Debug";
 #else
 
 #ifdef DEBUG_ENABLED
-	return "Debug";
+	return "ExportDebug";
 #else
-	return "Release";
+	return "ExportRelease";
 #endif
 
 #endif
@@ -86,7 +86,6 @@ String _get_mono_user_dir() {
 }
 
 class _GodotSharpDirs {
-
 public:
 	String res_data_dir;
 	String res_metadata_dir;
@@ -169,7 +168,7 @@ private:
 		data_mono_etc_dir = data_mono_root_dir.plus_file("etc");
 
 #ifdef ANDROID_ENABLED
-		data_mono_lib_dir = GDMonoAndroid::get_app_native_lib_dir();
+		data_mono_lib_dir = gdmono::android::support::get_app_native_lib_dir();
 #else
 		data_mono_lib_dir = data_mono_root_dir.plus_file("lib");
 #endif
@@ -206,7 +205,7 @@ private:
 		data_mono_etc_dir = data_mono_root_dir.plus_file("etc");
 
 #ifdef ANDROID_ENABLED
-		data_mono_lib_dir = GDMonoAndroid::get_app_native_lib_dir();
+		data_mono_lib_dir = gdmono::android::support::get_app_native_lib_dir();
 #else
 		data_mono_lib_dir = data_mono_root_dir.plus_file("lib");
 		data_game_assemblies_dir = data_dir_root.plus_file("Assemblies");
diff --git a/modules/mono/icons/icon_c_sharp_script.svg b/modules/mono/icons/CSharpScript.svg
index 69664ca553..69664ca553 100644
--- a/modules/mono/icons/icon_c_sharp_script.svg
+++ b/modules/mono/icons/CSharpScript.svg
diff --git a/modules/mono/managed_callable.cpp b/modules/mono/managed_callable.cpp
new file mode 100644
index 0000000000..dbe9c7fc5d
--- /dev/null
+++ b/modules/mono/managed_callable.cpp
@@ -0,0 +1,148 @@
+/*************************************************************************/
+/*  managed_callable.cpp                                                 */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "managed_callable.h"
+
+#include "csharp_script.h"
+#include "mono_gd/gd_mono_marshal.h"
+#include "mono_gd/gd_mono_utils.h"
+
+#ifdef GD_MONO_HOT_RELOAD
+SelfList<ManagedCallable>::List ManagedCallable::instances;
+Map<ManagedCallable *, Array> ManagedCallable::instances_pending_reload;
+Mutex ManagedCallable::instances_mutex;
+#endif
+
+bool ManagedCallable::compare_equal(const CallableCustom *p_a, const CallableCustom *p_b) {
+	const ManagedCallable *a = static_cast<const ManagedCallable *>(p_a);
+	const ManagedCallable *b = static_cast<const ManagedCallable *>(p_b);
+
+	MonoDelegate *delegate_a = (MonoDelegate *)a->delegate_handle.get_target();
+	MonoDelegate *delegate_b = (MonoDelegate *)b->delegate_handle.get_target();
+
+	if (!delegate_a || !delegate_b) {
+		if (!delegate_a && !delegate_b) {
+			return true;
+		}
+		return false;
+	}
+
+	// Call Delegate's 'Equals'
+	return GDMonoUtils::mono_delegate_equal(delegate_a, delegate_b);
+}
+
+bool ManagedCallable::compare_less(const CallableCustom *p_a, const CallableCustom *p_b) {
+	if (compare_equal(p_a, p_b)) {
+		return false;
+	}
+	return p_a < p_b;
+}
+
+uint32_t ManagedCallable::hash() const {
+	// hmm
+	uint32_t hash = delegate_invoke->get_name().hash();
+	return hash_djb2_one_64(delegate_handle.handle, hash);
+}
+
+String ManagedCallable::get_as_text() const {
+	return "Delegate::Invoke";
+}
+
+CallableCustom::CompareEqualFunc ManagedCallable::get_compare_equal_func() const {
+	return compare_equal_func_ptr;
+}
+
+CallableCustom::CompareLessFunc ManagedCallable::get_compare_less_func() const {
+	return compare_less_func_ptr;
+}
+
+ObjectID ManagedCallable::get_object() const {
+	// TODO: If the delegate target extends Godot.Object, use that instead!
+	return CSharpLanguage::get_singleton()->get_managed_callable_middleman()->get_instance_id();
+}
+
+void ManagedCallable::call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, Callable::CallError &r_call_error) const {
+	r_call_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD; // Can't find anything better
+	r_return_value = Variant();
+
+#ifdef GD_MONO_HOT_RELOAD
+	// Lost during hot-reload
+	ERR_FAIL_NULL(delegate_invoke);
+	ERR_FAIL_COND(delegate_handle.is_released());
+#endif
+
+	ERR_FAIL_COND(delegate_invoke->get_parameters_count() < p_argcount);
+
+	MonoObject *delegate = delegate_handle.get_target();
+
+	MonoException *exc = nullptr;
+	MonoObject *ret = delegate_invoke->invoke(delegate, p_arguments, &exc);
+
+	if (exc) {
+		GDMonoUtils::set_pending_exception(exc);
+	} else {
+		r_return_value = GDMonoMarshal::mono_object_to_variant(ret);
+		r_call_error.error = Callable::CallError::CALL_OK;
+	}
+}
+
+void ManagedCallable::set_delegate(MonoDelegate *p_delegate) {
+	delegate_handle = MonoGCHandleData::new_strong_handle((MonoObject *)p_delegate);
+	MonoMethod *delegate_invoke_raw = mono_get_delegate_invoke(mono_object_get_class((MonoObject *)p_delegate));
+	const StringName &delegate_invoke_name = CSharpLanguage::get_singleton()->get_string_names().delegate_invoke_method_name;
+	delegate_invoke = memnew(GDMonoMethod(delegate_invoke_name, delegate_invoke_raw)); // TODO: Use pooling for this GDMonoMethod instances
+}
+
+ManagedCallable::ManagedCallable(MonoDelegate *p_delegate) {
+#ifdef DEBUG_ENABLED
+	CRASH_COND(p_delegate == nullptr);
+#endif
+
+	set_delegate(p_delegate);
+
+#ifdef GD_MONO_HOT_RELOAD
+	{
+		MutexLock lock(instances_mutex);
+		instances.add(&self_instance);
+	}
+#endif
+}
+
+ManagedCallable::~ManagedCallable() {
+#ifdef GD_MONO_HOT_RELOAD
+	{
+		MutexLock lock(instances_mutex);
+		instances.remove(&self_instance);
+		instances_pending_reload.erase(this);
+	}
+#endif
+
+	delegate_handle.release();
+}
diff --git a/modules/mono/utils/thread_local.cpp b/modules/mono/managed_callable.h
index 4f10e3fb85..4f71e14a2f 100644
--- a/modules/mono/utils/thread_local.cpp
+++ b/modules/mono/managed_callable.h
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  thread_local.cpp                                                     */
+/*  managed_callable.h                                                   */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,80 +28,50 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "thread_local.h"
+#ifndef MANAGED_CALLABLE_H
+#define MANAGED_CALLABLE_H
 
-#ifdef WINDOWS_ENABLED
-#include <windows.h>
-#else
-#include <pthread.h>
-#endif
-
-#include "core/os/memory.h"
-#include "core/print_string.h"
+#include <mono/metadata/object.h>
 
-struct ThreadLocalStorage::Impl {
+#include "core/callable.h"
+#include "core/os/mutex.h"
+#include "core/self_list.h"
 
-#ifdef WINDOWS_ENABLED
-	DWORD dwFlsIndex;
-#else
-	pthread_key_t key;
-#endif
-
-	void *get_value() const {
-#ifdef WINDOWS_ENABLED
-		return FlsGetValue(dwFlsIndex);
-#else
-		return pthread_getspecific(key);
-#endif
-	}
+#include "mono_gc_handle.h"
+#include "mono_gd/gd_mono_method.h"
 
-	void set_value(void *p_value) const {
-#ifdef WINDOWS_ENABLED
-		FlsSetValue(dwFlsIndex, p_value);
-#else
-		pthread_setspecific(key, p_value);
-#endif
-	}
+class ManagedCallable : public CallableCustom {
+	friend class CSharpLanguage;
+	MonoGCHandleData delegate_handle;
+	GDMonoMethod *delegate_invoke;
 
-#ifdef WINDOWS_ENABLED
-#define _CALLBACK_FUNC_ __stdcall
-#else
-#define _CALLBACK_FUNC_
+#ifdef GD_MONO_HOT_RELOAD
+	SelfList<ManagedCallable> self_instance = this;
+	static SelfList<ManagedCallable>::List instances;
+	static Map<ManagedCallable *, Array> instances_pending_reload;
+	static Mutex instances_mutex;
 #endif
 
-	Impl(void(_CALLBACK_FUNC_ *p_destr_callback_func)(void *)) {
-#ifdef WINDOWS_ENABLED
-		dwFlsIndex = FlsAlloc(p_destr_callback_func);
-		ERR_FAIL_COND(dwFlsIndex == FLS_OUT_OF_INDEXES);
-#else
-		pthread_key_create(&key, p_destr_callback_func);
-#endif
-	}
+public:
+	uint32_t hash() const override;
+	String get_as_text() const override;
+	CompareEqualFunc get_compare_equal_func() const override;
+	CompareLessFunc get_compare_less_func() const override;
+	ObjectID get_object() const override;
+	void call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, Callable::CallError &r_call_error) const override;
 
-	~Impl() {
-#ifdef WINDOWS_ENABLED
-		FlsFree(dwFlsIndex);
-#else
-		pthread_key_delete(key);
-#endif
-	}
-};
+	_FORCE_INLINE_ MonoDelegate *get_delegate() { return (MonoDelegate *)delegate_handle.get_target(); }
 
-void *ThreadLocalStorage::get_value() const {
-	return pimpl->get_value();
-}
+	void set_delegate(MonoDelegate *p_delegate);
 
-void ThreadLocalStorage::set_value(void *p_value) const {
-	pimpl->set_value(p_value);
-}
+	static bool compare_equal(const CallableCustom *p_a, const CallableCustom *p_b);
+	static bool compare_less(const CallableCustom *p_a, const CallableCustom *p_b);
 
-void ThreadLocalStorage::alloc(void(_CALLBACK_FUNC_ *p_destr_callback)(void *)) {
-	pimpl = memnew(ThreadLocalStorage::Impl(p_destr_callback));
-}
+	static constexpr CompareEqualFunc compare_equal_func_ptr = &ManagedCallable::compare_equal;
+	static constexpr CompareEqualFunc compare_less_func_ptr = &ManagedCallable::compare_less;
 
-#undef _CALLBACK_FUNC_
+	ManagedCallable(MonoDelegate *p_delegate);
+	~ManagedCallable();
+};
 
-void ThreadLocalStorage::free() {
-	memdelete(pimpl);
-	pimpl = NULL;
-}
+#endif // MANAGED_CALLABLE_H
diff --git a/modules/mono/mono_gc_handle.cpp b/modules/mono/mono_gc_handle.cpp
index feeea848ee..16a6875406 100644
--- a/modules/mono/mono_gc_handle.cpp
+++ b/modules/mono/mono_gc_handle.cpp
@@ -32,56 +32,33 @@
 
 #include "mono_gd/gd_mono.h"
 
-uint32_t MonoGCHandle::new_strong_handle(MonoObject *p_object) {
-
-	return mono_gchandle_new(p_object, /* pinned: */ false);
-}
-
-uint32_t MonoGCHandle::new_strong_handle_pinned(MonoObject *p_object) {
-
-	return mono_gchandle_new(p_object, /* pinned: */ true);
-}
-
-uint32_t MonoGCHandle::new_weak_handle(MonoObject *p_object) {
-
-	return mono_gchandle_new_weakref(p_object, /* track_resurrection: */ false);
-}
-
-void MonoGCHandle::free_handle(uint32_t p_gchandle) {
+void MonoGCHandleData::release() {
+#ifdef DEBUG_ENABLED
+	CRASH_COND(handle && GDMono::get_singleton() == nullptr);
+#endif
 
-	mono_gchandle_free(p_gchandle);
+	if (handle && GDMono::get_singleton()->is_runtime_initialized()) {
+		GDMonoUtils::free_gchandle(handle);
+		handle = 0;
+	}
 }
 
-Ref<MonoGCHandle> MonoGCHandle::create_strong(MonoObject *p_object) {
-
-	return memnew(MonoGCHandle(new_strong_handle(p_object), STRONG_HANDLE));
+MonoGCHandleData MonoGCHandleData::new_strong_handle(MonoObject *p_object) {
+	return MonoGCHandleData(GDMonoUtils::new_strong_gchandle(p_object), gdmono::GCHandleType::STRONG_HANDLE);
 }
 
-Ref<MonoGCHandle> MonoGCHandle::create_weak(MonoObject *p_object) {
-
-	return memnew(MonoGCHandle(new_weak_handle(p_object), WEAK_HANDLE));
+MonoGCHandleData MonoGCHandleData::new_strong_handle_pinned(MonoObject *p_object) {
+	return MonoGCHandleData(GDMonoUtils::new_strong_gchandle_pinned(p_object), gdmono::GCHandleType::STRONG_HANDLE);
 }
 
-void MonoGCHandle::release() {
-
-#ifdef DEBUG_ENABLED
-	CRASH_COND(!released && GDMono::get_singleton() == NULL);
-#endif
-
-	if (!released && GDMono::get_singleton()->is_runtime_initialized()) {
-		free_handle(handle);
-		released = true;
-	}
+MonoGCHandleData MonoGCHandleData::new_weak_handle(MonoObject *p_object) {
+	return MonoGCHandleData(GDMonoUtils::new_weak_gchandle(p_object), gdmono::GCHandleType::WEAK_HANDLE);
 }
 
-MonoGCHandle::MonoGCHandle(uint32_t p_handle, HandleType p_handle_type) {
-
-	released = false;
-	weak = p_handle_type == WEAK_HANDLE;
-	handle = p_handle;
+Ref<MonoGCHandleRef> MonoGCHandleRef::create_strong(MonoObject *p_object) {
+	return memnew(MonoGCHandleRef(MonoGCHandleData::new_strong_handle(p_object)));
 }
 
-MonoGCHandle::~MonoGCHandle() {
-
-	release();
+Ref<MonoGCHandleRef> MonoGCHandleRef::create_weak(MonoObject *p_object) {
+	return memnew(MonoGCHandleRef(MonoGCHandleData::new_weak_handle(p_object)));
 }
diff --git a/modules/mono/mono_gc_handle.h b/modules/mono/mono_gc_handle.h
index 37fc7d8a17..13cfad4654 100644
--- a/modules/mono/mono_gc_handle.h
+++ b/modules/mono/mono_gc_handle.h
@@ -35,42 +35,75 @@
 
 #include "core/reference.h"
 
-class MonoGCHandle : public Reference {
+namespace gdmono {
 
-	GDCLASS(MonoGCHandle, Reference);
+enum class GCHandleType : char {
+	NIL,
+	STRONG_HANDLE,
+	WEAK_HANDLE
+};
 
-	bool released;
-	bool weak;
-	uint32_t handle;
+}
 
-public:
-	enum HandleType {
-		STRONG_HANDLE,
-		WEAK_HANDLE
-	};
+// Manual release of the GC handle must be done when using this struct
+struct MonoGCHandleData {
+	uint32_t handle = 0;
+	gdmono::GCHandleType type = gdmono::GCHandleType::NIL;
+
+	_FORCE_INLINE_ bool is_released() const { return !handle; }
+	_FORCE_INLINE_ bool is_weak() const { return type == gdmono::GCHandleType::WEAK_HANDLE; }
 
-	static uint32_t new_strong_handle(MonoObject *p_object);
-	static uint32_t new_strong_handle_pinned(MonoObject *p_object);
-	static uint32_t new_weak_handle(MonoObject *p_object);
-	static void free_handle(uint32_t p_gchandle);
+	_FORCE_INLINE_ MonoObject *get_target() const { return handle ? mono_gchandle_get_target(handle) : nullptr; }
+
+	void release();
 
-	static Ref<MonoGCHandle> create_strong(MonoObject *p_object);
-	static Ref<MonoGCHandle> create_weak(MonoObject *p_object);
+	MonoGCHandleData &operator=(const MonoGCHandleData &p_other) {
+#ifdef DEBUG_ENABLED
+		CRASH_COND(!is_released());
+#endif
+		handle = p_other.handle;
+		type = p_other.type;
+		return *this;
+	}
 
-	_FORCE_INLINE_ bool is_released() { return released; }
-	_FORCE_INLINE_ bool is_weak() { return weak; }
+	MonoGCHandleData(const MonoGCHandleData &) = default;
 
-	_FORCE_INLINE_ MonoObject *get_target() const { return released ? NULL : mono_gchandle_get_target(handle); }
+	MonoGCHandleData() {}
 
-	_FORCE_INLINE_ void set_handle(uint32_t p_handle, HandleType p_handle_type) {
-		released = false;
-		weak = p_handle_type == WEAK_HANDLE;
-		handle = p_handle;
+	MonoGCHandleData(uint32_t p_handle, gdmono::GCHandleType p_type) :
+			handle(p_handle),
+			type(p_type) {
 	}
-	void release();
 
-	MonoGCHandle(uint32_t p_handle, HandleType p_handle_type);
-	~MonoGCHandle();
+	static MonoGCHandleData new_strong_handle(MonoObject *p_object);
+	static MonoGCHandleData new_strong_handle_pinned(MonoObject *p_object);
+	static MonoGCHandleData new_weak_handle(MonoObject *p_object);
+};
+
+class MonoGCHandleRef : public Reference {
+	GDCLASS(MonoGCHandleRef, Reference);
+
+	MonoGCHandleData data;
+
+public:
+	static Ref<MonoGCHandleRef> create_strong(MonoObject *p_object);
+	static Ref<MonoGCHandleRef> create_weak(MonoObject *p_object);
+
+	_FORCE_INLINE_ bool is_released() const { return data.is_released(); }
+	_FORCE_INLINE_ bool is_weak() const { return data.is_weak(); }
+
+	_FORCE_INLINE_ MonoObject *get_target() const { return data.get_target(); }
+
+	void release() { data.release(); }
+
+	_FORCE_INLINE_ void set_handle(uint32_t p_handle, gdmono::GCHandleType p_handle_type) {
+		data = MonoGCHandleData(p_handle, p_handle_type);
+	}
+
+	MonoGCHandleRef(const MonoGCHandleData &p_gc_handle_data) :
+			data(p_gc_handle_data) {
+	}
+	~MonoGCHandleRef() { release(); }
 };
 
 #endif // CSHARP_GC_HANDLE_H
diff --git a/modules/mono/mono_gd/gd_mono.cpp b/modules/mono/mono_gd/gd_mono.cpp
index 60008f8fab..cf5ac33d20 100644
--- a/modules/mono/mono_gd/gd_mono.cpp
+++ b/modules/mono/mono_gd/gd_mono.cpp
@@ -37,6 +37,7 @@
 #include <mono/metadata/mono-gc.h>
 #include <mono/metadata/profiler.h>
 
+#include "core/debugger/engine_debugger.h"
 #include "core/os/dir_access.h"
 #include "core/os/file_access.h"
 #include "core/os/os.h"
@@ -57,14 +58,25 @@
 
 #ifdef ANDROID_ENABLED
 #include "android_mono_config.h"
-#include "gd_mono_android.h"
+#include "support/android_support.h"
+#elif defined(IPHONE_ENABLED)
+#include "support/ios_support.h"
+#endif
+
+#if defined(TOOL_ENABLED) && defined(GD_MONO_SINGLE_APPDOMAIN)
+// This will no longer be the case if we replace appdomains with AssemblyLoadContext
+#error "Editor build requires support for multiple appdomains"
+#endif
+
+#if defined(GD_MONO_HOT_RELOAD) && defined(GD_MONO_SINGLE_APPDOMAIN)
+#error "Hot reloading requires multiple appdomains"
 #endif
 
 // TODO:
 // This has turn into a gigantic mess. There's too much going on here. Too much #ifdef as well.
 // It's just painful to read... It needs to be re-structured. Please, clean this up, future me.
 
-GDMono *GDMono::singleton = NULL;
+GDMono *GDMono::singleton = nullptr;
 
 namespace {
 
@@ -117,14 +129,13 @@ void gd_mono_profiler_init() {
 	}
 }
 
-#if defined(DEBUG_ENABLED)
-
 void gd_mono_debug_init() {
-
-	mono_debug_init(MONO_DEBUG_FORMAT_MONO);
-
 	CharString da_args = OS::get_singleton()->get_environment("GODOT_MONO_DEBUGGER_AGENT").utf8();
 
+	if (da_args.length()) {
+		OS::get_singleton()->set_environment("GODOT_MONO_DEBUGGER_AGENT", String());
+	}
+
 #ifdef TOOLS_ENABLED
 	int da_port = GLOBAL_DEF("mono/debugger_agent/port", 23685);
 	bool da_suspend = GLOBAL_DEF("mono/debugger_agent/wait_for_debugger", false);
@@ -133,8 +144,9 @@ void gd_mono_debug_init() {
 	if (Engine::get_singleton()->is_editor_hint() ||
 			ProjectSettings::get_singleton()->get_resource_path().empty() ||
 			Main::is_project_manager()) {
-		if (da_args.size() == 0)
+		if (da_args.size() == 0) {
 			return;
+		}
 	}
 
 	if (da_args.length() == 0) {
@@ -147,6 +159,10 @@ void gd_mono_debug_init() {
 		return; // Exported games don't use the project settings to setup the debugger agent
 #endif
 
+	// Debugging enabled
+
+	mono_debug_init(MONO_DEBUG_FORMAT_MONO);
+
 	// --debugger-agent=help
 	const char *options[] = {
 		"--soft-breakpoints",
@@ -155,7 +171,6 @@ void gd_mono_debug_init() {
 	mono_jit_parse_options(2, (char **)options);
 }
 
-#endif // defined(DEBUG_ENABLED)
 #endif // !defined(JAVASCRIPT_ENABLED)
 
 #if defined(JAVASCRIPT_ENABLED)
@@ -163,6 +178,7 @@ MonoDomain *gd_initialize_mono_runtime() {
 	const char *vfs_prefix = "managed";
 	int enable_debugging = 0;
 
+	// TODO: Provide a way to enable debugging on WASM release builds.
 #ifdef DEBUG_ENABLED
 	enable_debugging = 1;
 #endif
@@ -173,11 +189,16 @@ MonoDomain *gd_initialize_mono_runtime() {
 }
 #else
 MonoDomain *gd_initialize_mono_runtime() {
-#ifdef DEBUG_ENABLED
 	gd_mono_debug_init();
+
+#if defined(IPHONE_ENABLED) || defined(ANDROID_ENABLED)
+	// I don't know whether this actually matters or not
+	const char *runtime_version = "mobile";
+#else
+	const char *runtime_version = "v4.0.30319";
 #endif
 
-	return mono_jit_init_version("GodotEngine.RootDomain", "v4.0.30319");
+	return mono_jit_init_version("GodotEngine.RootDomain", runtime_version);
 }
 #endif
 
@@ -230,7 +251,6 @@ void GDMono::add_mono_shared_libs_dir_to_path() {
 }
 
 void GDMono::determine_mono_dirs(String &r_assembly_rootdir, String &r_config_dir) {
-
 	String bundled_assembly_rootdir = GodotSharpDirs::get_data_mono_lib_dir();
 	String bundled_config_dir = GodotSharpDirs::get_data_mono_etc_dir();
 
@@ -293,7 +313,6 @@ void GDMono::determine_mono_dirs(String &r_assembly_rootdir, String &r_config_di
 }
 
 void GDMono::initialize() {
-
 	ERR_FAIL_NULL(Engine::get_singleton());
 
 	print_verbose("Mono: Initializing module...");
@@ -313,14 +332,22 @@ void GDMono::initialize() {
 	determine_mono_dirs(assembly_rootdir, config_dir);
 
 	// Leak if we call mono_set_dirs more than once
-	mono_set_dirs(assembly_rootdir.length() ? assembly_rootdir.utf8().get_data() : NULL,
-			config_dir.length() ? config_dir.utf8().get_data() : NULL);
+	mono_set_dirs(assembly_rootdir.length() ? assembly_rootdir.utf8().get_data() : nullptr,
+			config_dir.length() ? config_dir.utf8().get_data() : nullptr);
 
 	add_mono_shared_libs_dir_to_path();
 #endif
 
+#ifdef ANDROID_ENABLED
+	mono_config_parse_memory(get_godot_android_mono_config().utf8().get_data());
+#else
+	mono_config_parse(nullptr);
+#endif
+
 #if defined(ANDROID_ENABLED)
-	GDMonoAndroid::initialize();
+	gdmono::android::support::initialize();
+#elif defined(IPHONE_ENABLED)
+	gdmono::ios::support::initialize();
 #endif
 
 	GDMonoAssembly::initialize();
@@ -329,13 +356,7 @@ void GDMono::initialize() {
 	gd_mono_profiler_init();
 #endif
 
-#ifdef ANDROID_ENABLED
-	mono_config_parse_memory(get_godot_android_mono_config().utf8().get_data());
-#else
-	mono_config_parse(NULL);
-#endif
-
-	mono_install_unhandled_exception_hook(&unhandled_exception_hook, NULL);
+	mono_install_unhandled_exception_hook(&unhandled_exception_hook, nullptr);
 
 #ifndef TOOLS_ENABLED
 	// Exported games that don't use C# must still work. They likely don't ship with mscorlib.
@@ -354,7 +375,7 @@ void GDMono::initialize() {
 #endif
 
 	// NOTE: Internal calls must be registered after the Mono runtime initialization.
-	// Otherwise registration fails with the error: 'assertion 'hash != NULL' failed'.
+	// Otherwise registration fails with the error: 'assertion 'hash != nullptr' failed'.
 
 	root_domain = gd_initialize_mono_runtime();
 	ERR_FAIL_NULL_MSG(root_domain, "Mono: Failed to initialize runtime.");
@@ -370,15 +391,19 @@ void GDMono::initialize() {
 	print_verbose("Mono: Runtime initialized");
 
 #if defined(ANDROID_ENABLED)
-	GDMonoAndroid::register_internal_calls();
+	gdmono::android::support::register_internal_calls();
 #endif
 
 	// mscorlib assembly MUST be present at initialization
 	bool corlib_loaded = _load_corlib_assembly();
 	ERR_FAIL_COND_MSG(!corlib_loaded, "Mono: Failed to load mscorlib assembly.");
 
+#ifndef GD_MONO_SINGLE_APPDOMAIN
 	Error domain_load_err = _load_scripts_domain();
 	ERR_FAIL_COND_MSG(domain_load_err != OK, "Mono: Failed to load scripts domain.");
+#else
+	scripts_domain = root_domain;
+#endif
 
 	_register_internal_calls();
 
@@ -386,7 +411,6 @@ void GDMono::initialize() {
 }
 
 void GDMono::initialize_load_assemblies() {
-
 #ifndef MONO_GLUE_ENABLED
 	CRASH_NOW_MSG("Mono: This binary was built with 'mono_glue=no'; cannot load assemblies.");
 #endif
@@ -399,22 +423,28 @@ void GDMono::initialize_load_assemblies() {
 #if defined(TOOLS_ENABLED)
 	bool tool_assemblies_loaded = _load_tools_assemblies();
 	CRASH_COND_MSG(!tool_assemblies_loaded, "Mono: Failed to load '" TOOLS_ASM_NAME "' assemblies.");
+
+	if (Main::is_project_manager()) {
+		return;
+	}
 #endif
 
 	// Load the project's main assembly. This doesn't necessarily need to succeed.
 	// The game may not be using .NET at all, or if the project does use .NET and
 	// we're running in the editor, it may just happen to be it wasn't built yet.
 	if (!_load_project_assembly()) {
-		if (OS::get_singleton()->is_stdout_verbose())
+		if (OS::get_singleton()->is_stdout_verbose()) {
 			print_error("Mono: Failed to load project assembly");
+		}
 	}
 }
 
 bool GDMono::_are_api_assemblies_out_of_sync() {
 	bool out_of_sync = core_api_assembly.assembly && (core_api_assembly.out_of_sync || !GDMonoCache::cached_data.godot_api_cache_updated);
 #ifdef TOOLS_ENABLED
-	if (!out_of_sync)
+	if (!out_of_sync) {
 		out_of_sync = editor_api_assembly.assembly && editor_api_assembly.out_of_sync;
+	}
 #endif
 	return out_of_sync;
 }
@@ -444,6 +474,7 @@ uint64_t get_editor_api_hash() {
 uint32_t get_bindings_version() {
 	GD_UNREACHABLE();
 }
+
 uint32_t get_cs_glue_version() {
 	GD_UNREACHABLE();
 }
@@ -485,21 +516,25 @@ void GDMono::_init_exception_policy() {
 	}
 }
 
-void GDMono::add_assembly(uint32_t p_domain_id, GDMonoAssembly *p_assembly) {
-
+void GDMono::add_assembly(int32_t p_domain_id, GDMonoAssembly *p_assembly) {
 	assemblies[p_domain_id][p_assembly->get_name()] = p_assembly;
 }
 
-GDMonoAssembly **GDMono::get_loaded_assembly(const String &p_name) {
+GDMonoAssembly *GDMono::get_loaded_assembly(const String &p_name) {
+	if (p_name == "mscorlib" && corlib_assembly) {
+		return corlib_assembly;
+	}
 
 	MonoDomain *domain = mono_domain_get();
-	uint32_t domain_id = domain ? mono_domain_get_id(domain) : 0;
-	return assemblies[domain_id].getptr(p_name);
+	int32_t domain_id = domain ? mono_domain_get_id(domain) : 0;
+	GDMonoAssembly **result = assemblies[domain_id].getptr(p_name);
+	return result ? *result : nullptr;
 }
 
 bool GDMono::load_assembly(const String &p_name, GDMonoAssembly **r_assembly, bool p_refonly) {
-
+#ifdef DEBUG_ENABLED
 	CRASH_COND(!r_assembly);
+#endif
 
 	MonoAssemblyName *aname = mono_assembly_name_new(p_name.utf8());
 	bool result = load_assembly(p_name, aname, r_assembly, p_refonly);
@@ -510,27 +545,27 @@ bool GDMono::load_assembly(const String &p_name, GDMonoAssembly **r_assembly, bo
 }
 
 bool GDMono::load_assembly(const String &p_name, MonoAssemblyName *p_aname, GDMonoAssembly **r_assembly, bool p_refonly) {
+#ifdef DEBUG_ENABLED
+	CRASH_COND(!r_assembly);
+#endif
 
+	return load_assembly(p_name, p_aname, r_assembly, p_refonly, GDMonoAssembly::get_default_search_dirs());
+}
+
+bool GDMono::load_assembly(const String &p_name, MonoAssemblyName *p_aname, GDMonoAssembly **r_assembly, bool p_refonly, const Vector<String> &p_search_dirs) {
+#ifdef DEBUG_ENABLED
 	CRASH_COND(!r_assembly);
+#endif
 
 	print_verbose("Mono: Loading assembly " + p_name + (p_refonly ? " (refonly)" : "") + "...");
 
-	MonoImageOpenStatus status = MONO_IMAGE_OK;
-	MonoAssembly *assembly = mono_assembly_load_full(p_aname, NULL, &status, p_refonly);
+	GDMonoAssembly *assembly = GDMonoAssembly::load(p_name, p_aname, p_refonly, p_search_dirs);
 
-	if (!assembly)
+	if (!assembly) {
 		return false;
+	}
 
-	ERR_FAIL_COND_V(status != MONO_IMAGE_OK, false);
-
-	uint32_t domain_id = mono_domain_get_id(mono_domain_get());
-
-	GDMonoAssembly **stored_assembly = assemblies[domain_id].getptr(p_name);
-
-	ERR_FAIL_COND_V(stored_assembly == NULL, false);
-	ERR_FAIL_COND_V((*stored_assembly)->get_assembly() != assembly, false);
-
-	*r_assembly = *stored_assembly;
+	*r_assembly = assembly;
 
 	print_verbose("Mono: Assembly " + p_name + (p_refonly ? " (refonly)" : "") + " loaded from path: " + (*r_assembly)->get_path());
 
@@ -538,23 +573,15 @@ bool GDMono::load_assembly(const String &p_name, MonoAssemblyName *p_aname, GDMo
 }
 
 bool GDMono::load_assembly_from(const String &p_name, const String &p_path, GDMonoAssembly **r_assembly, bool p_refonly) {
-
 	CRASH_COND(!r_assembly);
 
 	print_verbose("Mono: Loading assembly " + p_name + (p_refonly ? " (refonly)" : "") + "...");
 
 	GDMonoAssembly *assembly = GDMonoAssembly::load_from(p_name, p_path, p_refonly);
 
-	if (!assembly)
+	if (!assembly) {
 		return false;
-
-#ifdef DEBUG_ENABLED
-	uint32_t domain_id = mono_domain_get_id(mono_domain_get());
-	GDMonoAssembly **stored_assembly = assemblies[domain_id].getptr(p_name);
-
-	ERR_FAIL_COND_V(stored_assembly == NULL, false);
-	ERR_FAIL_COND_V(*stored_assembly != assembly, false);
-#endif
+	}
 
 	*r_assembly = assembly;
 
@@ -574,16 +601,19 @@ ApiAssemblyInfo::Version ApiAssemblyInfo::Version::get_from_loaded_assembly(GDMo
 
 	if (nativecalls_klass) {
 		GDMonoField *api_hash_field = nativecalls_klass->get_field("godot_api_hash");
-		if (api_hash_field)
-			api_assembly_version.godot_api_hash = GDMonoMarshal::unbox<uint64_t>(api_hash_field->get_value(NULL));
+		if (api_hash_field) {
+			api_assembly_version.godot_api_hash = GDMonoMarshal::unbox<uint64_t>(api_hash_field->get_value(nullptr));
+		}
 
 		GDMonoField *binds_ver_field = nativecalls_klass->get_field("bindings_version");
-		if (binds_ver_field)
-			api_assembly_version.bindings_version = GDMonoMarshal::unbox<uint32_t>(binds_ver_field->get_value(NULL));
+		if (binds_ver_field) {
+			api_assembly_version.bindings_version = GDMonoMarshal::unbox<uint32_t>(binds_ver_field->get_value(nullptr));
+		}
 
 		GDMonoField *cs_glue_ver_field = nativecalls_klass->get_field("cs_glue_version");
-		if (cs_glue_ver_field)
-			api_assembly_version.cs_glue_version = GDMonoMarshal::unbox<uint32_t>(cs_glue_ver_field->get_value(NULL));
+		if (cs_glue_ver_field) {
+			api_assembly_version.cs_glue_version = GDMonoMarshal::unbox<uint32_t>(cs_glue_ver_field->get_value(nullptr));
+		}
 	}
 
 	return api_assembly_version;
@@ -594,21 +624,21 @@ String ApiAssemblyInfo::to_string(ApiAssemblyInfo::Type p_type) {
 }
 
 bool GDMono::_load_corlib_assembly() {
-
-	if (corlib_assembly)
+	if (corlib_assembly) {
 		return true;
+	}
 
 	bool success = load_assembly("mscorlib", &corlib_assembly);
 
-	if (success)
+	if (success) {
 		GDMonoCache::update_corlib_cache();
+	}
 
 	return success;
 }
 
 #ifdef TOOLS_ENABLED
 bool GDMono::copy_prebuilt_api_assembly(ApiAssemblyInfo::Type p_api_type, const String &p_config) {
-
 	String src_dir = GodotSharpDirs::get_data_editor_prebuilt_api_dir().plus_file(p_config);
 	String dst_dir = GodotSharpDirs::get_res_assemblies_base_dir().plus_file(p_config);
 
@@ -621,7 +651,7 @@ bool GDMono::copy_prebuilt_api_assembly(ApiAssemblyInfo::Type p_api_type, const
 		memdelete(da);
 
 		if (err != OK) {
-			ERR_PRINTS("Failed to create destination directory for the API assemblies. Error: " + itos(err) + ".");
+			ERR_PRINT("Failed to create destination directory for the API assemblies. Error: " + itos(err) + ".");
 			return false;
 		}
 	}
@@ -629,16 +659,18 @@ bool GDMono::copy_prebuilt_api_assembly(ApiAssemblyInfo::Type p_api_type, const
 	DirAccessRef da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
 
 	String xml_file = assembly_name + ".xml";
-	if (da->copy(src_dir.plus_file(xml_file), dst_dir.plus_file(xml_file)) != OK)
-		WARN_PRINTS("Failed to copy '" + xml_file + "'.");
+	if (da->copy(src_dir.plus_file(xml_file), dst_dir.plus_file(xml_file)) != OK) {
+		WARN_PRINT("Failed to copy '" + xml_file + "'.");
+	}
 
 	String pdb_file = assembly_name + ".pdb";
-	if (da->copy(src_dir.plus_file(pdb_file), dst_dir.plus_file(pdb_file)) != OK)
-		WARN_PRINTS("Failed to copy '" + pdb_file + "'.");
+	if (da->copy(src_dir.plus_file(pdb_file), dst_dir.plus_file(pdb_file)) != OK) {
+		WARN_PRINT("Failed to copy '" + pdb_file + "'.");
+	}
 
 	String assembly_file = assembly_name + ".dll";
 	if (da->copy(src_dir.plus_file(assembly_file), dst_dir.plus_file(assembly_file)) != OK) {
-		ERR_PRINTS("Failed to copy '" + assembly_file + "'.");
+		ERR_PRINT("Failed to copy '" + assembly_file + "'.");
 		return false;
 	}
 
@@ -649,13 +681,15 @@ static bool try_get_cached_api_hash_for(const String &p_api_assemblies_dir, bool
 	String core_api_assembly_path = p_api_assemblies_dir.plus_file(CORE_API_ASSEMBLY_NAME ".dll");
 	String editor_api_assembly_path = p_api_assemblies_dir.plus_file(EDITOR_API_ASSEMBLY_NAME ".dll");
 
-	if (!FileAccess::exists(core_api_assembly_path) || !FileAccess::exists(editor_api_assembly_path))
+	if (!FileAccess::exists(core_api_assembly_path) || !FileAccess::exists(editor_api_assembly_path)) {
 		return false;
+	}
 
 	String cached_api_hash_path = p_api_assemblies_dir.plus_file("api_hash_cache.cfg");
 
-	if (!FileAccess::exists(cached_api_hash_path))
+	if (!FileAccess::exists(cached_api_hash_path)) {
 		return false;
+	}
 
 	Ref<ConfigFile> cfg;
 	cfg.instance();
@@ -679,7 +713,6 @@ static bool try_get_cached_api_hash_for(const String &p_api_assemblies_dir, bool
 }
 
 static void create_cached_api_hash_for(const String &p_api_assemblies_dir) {
-
 	String core_api_assembly_path = p_api_assemblies_dir.plus_file(CORE_API_ASSEMBLY_NAME ".dll");
 	String editor_api_assembly_path = p_api_assemblies_dir.plus_file(EDITOR_API_ASSEMBLY_NAME ".dll");
 	String cached_api_hash_path = p_api_assemblies_dir.plus_file("api_hash_cache.cfg");
@@ -714,7 +747,7 @@ bool GDMono::_temp_domain_load_are_assemblies_out_of_sync(const String &p_config
 	GDMono::LoadedApiAssembly temp_editor_api_assembly;
 
 	if (!_try_load_api_assemblies(temp_core_api_assembly, temp_editor_api_assembly,
-				p_config, /* refonly: */ true, /* loaded_callback: */ NULL)) {
+				p_config, /* refonly: */ true, /* loaded_callback: */ nullptr)) {
 		return temp_core_api_assembly.out_of_sync || temp_editor_api_assembly.out_of_sync;
 	}
 
@@ -722,7 +755,6 @@ bool GDMono::_temp_domain_load_are_assemblies_out_of_sync(const String &p_config
 }
 
 String GDMono::update_api_assemblies_from_prebuilt(const String &p_config, const bool *p_core_api_out_of_sync, const bool *p_editor_api_out_of_sync) {
-
 #define FAIL_REASON(m_out_of_sync, m_prebuilt_exists)                            \
 	(                                                                            \
 			(m_out_of_sync ?                                                     \
@@ -750,8 +782,9 @@ String GDMono::update_api_assemblies_from_prebuilt(const String &p_config, const
 
 	// Note: Even if only one of the assemblies if missing or out of sync, we update both
 
-	if (!api_assemblies_out_of_sync && FileAccess::exists(core_assembly_path) && FileAccess::exists(editor_assembly_path))
+	if (!api_assemblies_out_of_sync && FileAccess::exists(core_assembly_path) && FileAccess::exists(editor_assembly_path)) {
 		return String(); // No update needed
+	}
 
 	print_verbose("Updating '" + p_config + "' API assemblies");
 
@@ -779,9 +812,9 @@ String GDMono::update_api_assemblies_from_prebuilt(const String &p_config, const
 #endif
 
 bool GDMono::_load_core_api_assembly(LoadedApiAssembly &r_loaded_api_assembly, const String &p_config, bool p_refonly) {
-
-	if (r_loaded_api_assembly.assembly)
+	if (r_loaded_api_assembly.assembly) {
 		return true;
+	}
 
 #ifdef TOOLS_ENABLED
 	// For the editor and the editor player we want to load it from a specific path to make sure we can keep it up to date
@@ -813,9 +846,9 @@ bool GDMono::_load_core_api_assembly(LoadedApiAssembly &r_loaded_api_assembly, c
 
 #ifdef TOOLS_ENABLED
 bool GDMono::_load_editor_api_assembly(LoadedApiAssembly &r_loaded_api_assembly, const String &p_config, bool p_refonly) {
-
-	if (r_loaded_api_assembly.assembly)
+	if (r_loaded_api_assembly.assembly) {
 		return true;
+	}
 
 	// For the editor and the editor player we want to load it from a specific path to make sure we can keep it up to date
 
@@ -845,30 +878,35 @@ bool GDMono::_load_editor_api_assembly(LoadedApiAssembly &r_loaded_api_assembly,
 bool GDMono::_try_load_api_assemblies(LoadedApiAssembly &r_core_api_assembly, LoadedApiAssembly &r_editor_api_assembly,
 		const String &p_config, bool p_refonly, CoreApiAssemblyLoadedCallback p_callback) {
 	if (!_load_core_api_assembly(r_core_api_assembly, p_config, p_refonly)) {
-		if (OS::get_singleton()->is_stdout_verbose())
+		if (OS::get_singleton()->is_stdout_verbose()) {
 			print_error("Mono: Failed to load Core API assembly");
+		}
 		return false;
 	}
 
 #ifdef TOOLS_ENABLED
 	if (!_load_editor_api_assembly(r_editor_api_assembly, p_config, p_refonly)) {
-		if (OS::get_singleton()->is_stdout_verbose())
+		if (OS::get_singleton()->is_stdout_verbose()) {
 			print_error("Mono: Failed to load Editor API assembly");
+		}
 		return false;
 	}
 
-	if (r_editor_api_assembly.out_of_sync)
+	if (r_editor_api_assembly.out_of_sync) {
 		return false;
+	}
 #endif
 
 	// Check if the core API assembly is out of sync only after trying to load the
 	// editor API assembly. Otherwise, if both assemblies are out of sync, we would
 	// only update the former as we won't know the latter also needs to be updated.
-	if (r_core_api_assembly.out_of_sync)
+	if (r_core_api_assembly.out_of_sync) {
 		return false;
+	}
 
-	if (p_callback)
+	if (p_callback) {
 		return p_callback();
+	}
 
 	return true;
 }
@@ -876,8 +914,9 @@ bool GDMono::_try_load_api_assemblies(LoadedApiAssembly &r_core_api_assembly, Lo
 bool GDMono::_on_core_api_assembly_loaded() {
 	GDMonoCache::update_godot_api_cache();
 
-	if (!GDMonoCache::cached_data.godot_api_cache_updated)
+	if (!GDMonoCache::cached_data.godot_api_cache_updated) {
 		return false;
+	}
 
 	get_singleton()->_install_trace_listener();
 
@@ -890,11 +929,10 @@ bool GDMono::_try_load_api_assemblies_preset() {
 }
 
 void GDMono::_load_api_assemblies() {
-
 	bool api_assemblies_loaded = _try_load_api_assemblies_preset();
 
+#if defined(TOOLS_ENABLED) && !defined(GD_MONO_SINGLE_APPDOMAIN)
 	if (!api_assemblies_loaded) {
-#ifdef TOOLS_ENABLED
 		// The API assemblies are out of sync or some other error happened. Fine, try one more time, but
 		// this time update them from the prebuilt assemblies directory before trying to load them again.
 
@@ -915,8 +953,8 @@ void GDMono::_load_api_assemblies() {
 
 		// 4. Try loading the updated assemblies
 		api_assemblies_loaded = _try_load_api_assemblies_preset();
-#endif
 	}
+#endif
 
 	if (!api_assemblies_loaded) {
 		// welp... too bad
@@ -943,9 +981,9 @@ void GDMono::_load_api_assemblies() {
 
 #ifdef TOOLS_ENABLED
 bool GDMono::_load_tools_assemblies() {
-
-	if (tools_assembly && tools_project_editor_assembly)
+	if (tools_assembly && tools_project_editor_assembly) {
 		return true;
+	}
 
 	bool success = load_assembly(TOOLS_ASM_NAME, &tools_assembly) &&
 				   load_assembly(TOOLS_PROJECT_EDITOR_ASM_NAME, &tools_project_editor_assembly);
@@ -955,9 +993,9 @@ bool GDMono::_load_tools_assemblies() {
 #endif
 
 bool GDMono::_load_project_assembly() {
-
-	if (project_assembly)
+	if (project_assembly) {
 		return true;
+	}
 
 	String appname = ProjectSettings::get_singleton()->get("application/config/name");
 	String appname_safe = OS::get_singleton()->get_safe_dir_name(appname);
@@ -975,14 +1013,13 @@ bool GDMono::_load_project_assembly() {
 }
 
 void GDMono::_install_trace_listener() {
-
 #ifdef DEBUG_ENABLED
 	// Install the trace listener now before the project assembly is loaded
 	GDMonoClass *debug_utils = get_core_api_assembly()->get_class(BINDINGS_NAMESPACE, "DebuggingUtils");
 	GDMonoMethod *install_func = debug_utils->get_method("InstallTraceListener");
 
-	MonoException *exc = NULL;
-	install_func->invoke_raw(NULL, NULL, &exc);
+	MonoException *exc = nullptr;
+	install_func->invoke_raw(nullptr, nullptr, &exc);
 	if (exc) {
 		GDMonoUtils::debug_print_unhandled_exception(exc);
 		ERR_PRINT("Failed to install 'System.Diagnostics.Trace' listener.");
@@ -990,9 +1027,9 @@ void GDMono::_install_trace_listener() {
 #endif
 }
 
+#ifndef GD_MONO_SINGLE_APPDOMAIN
 Error GDMono::_load_scripts_domain() {
-
-	ERR_FAIL_COND_V(scripts_domain != NULL, ERR_BUG);
+	ERR_FAIL_COND_V(scripts_domain != nullptr, ERR_BUG);
 
 	print_verbose("Mono: Loading scripts domain...");
 
@@ -1006,13 +1043,13 @@ Error GDMono::_load_scripts_domain() {
 }
 
 Error GDMono::_unload_scripts_domain() {
-
 	ERR_FAIL_NULL_V(scripts_domain, ERR_BUG);
 
-	print_verbose("Mono: Unloading scripts domain...");
+	print_verbose("Mono: Finalizing scripts domain...");
 
-	if (mono_domain_get() != root_domain)
+	if (mono_domain_get() != root_domain) {
 		mono_domain_set(root_domain, true);
+	}
 
 	finalizing_scripts_domain = true;
 
@@ -1028,21 +1065,23 @@ Error GDMono::_unload_scripts_domain() {
 
 	_domain_assemblies_cleanup(mono_domain_get_id(scripts_domain));
 
-	core_api_assembly.assembly = NULL;
+	core_api_assembly.assembly = nullptr;
 #ifdef TOOLS_ENABLED
-	editor_api_assembly.assembly = NULL;
+	editor_api_assembly.assembly = nullptr;
 #endif
 
-	project_assembly = NULL;
+	project_assembly = nullptr;
 #ifdef TOOLS_ENABLED
-	tools_assembly = NULL;
-	tools_project_editor_assembly = NULL;
+	tools_assembly = nullptr;
+	tools_project_editor_assembly = nullptr;
 #endif
 
 	MonoDomain *domain = scripts_domain;
-	scripts_domain = NULL;
+	scripts_domain = nullptr;
+
+	print_verbose("Mono: Unloading scripts domain...");
 
-	MonoException *exc = NULL;
+	MonoException *exc = nullptr;
 	mono_domain_try_unload(domain, (MonoObject **)&exc);
 
 	if (exc) {
@@ -1053,10 +1092,10 @@ Error GDMono::_unload_scripts_domain() {
 
 	return OK;
 }
+#endif
 
 #ifdef GD_MONO_HOT_RELOAD
 Error GDMono::reload_scripts_domain() {
-
 	ERR_FAIL_COND_V(!runtime_initialized, ERR_BUG);
 
 	if (scripts_domain) {
@@ -1091,17 +1130,18 @@ Error GDMono::reload_scripts_domain() {
 }
 #endif
 
+#ifndef GD_MONO_SINGLE_APPDOMAIN
 Error GDMono::finalize_and_unload_domain(MonoDomain *p_domain) {
-
-	CRASH_COND(p_domain == NULL);
+	CRASH_COND(p_domain == nullptr);
 	CRASH_COND(p_domain == GDMono::get_singleton()->get_scripts_domain()); // Should use _unload_scripts_domain() instead
 
 	String domain_name = mono_domain_get_friendly_name(p_domain);
 
 	print_verbose("Mono: Unloading domain '" + domain_name + "'...");
 
-	if (mono_domain_get() == p_domain)
+	if (mono_domain_get() == p_domain) {
 		mono_domain_set(root_domain, true);
+	}
 
 	if (!mono_domain_finalize(p_domain, 2000)) {
 		ERR_PRINT("Mono: Domain finalization timeout.");
@@ -1111,63 +1151,68 @@ Error GDMono::finalize_and_unload_domain(MonoDomain *p_domain) {
 
 	_domain_assemblies_cleanup(mono_domain_get_id(p_domain));
 
-	MonoException *exc = NULL;
+	MonoException *exc = nullptr;
 	mono_domain_try_unload(p_domain, (MonoObject **)&exc);
 
 	if (exc) {
-		ERR_PRINTS("Exception thrown when unloading domain '" + domain_name + "'.");
+		ERR_PRINT("Exception thrown when unloading domain '" + domain_name + "'.");
 		GDMonoUtils::debug_print_unhandled_exception(exc);
 		return FAILED;
 	}
 
 	return OK;
 }
+#endif
 
 GDMonoClass *GDMono::get_class(MonoClass *p_raw_class) {
-
 	MonoImage *image = mono_class_get_image(p_raw_class);
 
-	if (image == corlib_assembly->get_image())
+	if (image == corlib_assembly->get_image()) {
 		return corlib_assembly->get_class(p_raw_class);
+	}
 
-	uint32_t domain_id = mono_domain_get_id(mono_domain_get());
+	int32_t domain_id = mono_domain_get_id(mono_domain_get());
 	HashMap<String, GDMonoAssembly *> &domain_assemblies = assemblies[domain_id];
 
-	const String *k = NULL;
+	const String *k = nullptr;
 	while ((k = domain_assemblies.next(k))) {
 		GDMonoAssembly *assembly = domain_assemblies.get(*k);
 		if (assembly->get_image() == image) {
 			GDMonoClass *klass = assembly->get_class(p_raw_class);
-
-			if (klass)
+			if (klass) {
 				return klass;
+			}
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 GDMonoClass *GDMono::get_class(const StringName &p_namespace, const StringName &p_name) {
+	GDMonoClass *klass = corlib_assembly->get_class(p_namespace, p_name);
+	if (klass) {
+		return klass;
+	}
 
-	uint32_t domain_id = mono_domain_get_id(mono_domain_get());
+	int32_t domain_id = mono_domain_get_id(mono_domain_get());
 	HashMap<String, GDMonoAssembly *> &domain_assemblies = assemblies[domain_id];
 
-	const String *k = NULL;
+	const String *k = nullptr;
 	while ((k = domain_assemblies.next(k))) {
 		GDMonoAssembly *assembly = domain_assemblies.get(*k);
-		GDMonoClass *klass = assembly->get_class(p_namespace, p_name);
-		if (klass)
+		klass = assembly->get_class(p_namespace, p_name);
+		if (klass) {
 			return klass;
+		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
-void GDMono::_domain_assemblies_cleanup(uint32_t p_domain_id) {
-
+void GDMono::_domain_assemblies_cleanup(int32_t p_domain_id) {
 	HashMap<String, GDMonoAssembly *> &domain_assemblies = assemblies[p_domain_id];
 
-	const String *k = NULL;
+	const String *k = nullptr;
 	while ((k = domain_assemblies.next(k))) {
 		memdelete(domain_assemblies.get(*k));
 	}
@@ -1176,15 +1221,15 @@ void GDMono::_domain_assemblies_cleanup(uint32_t p_domain_id) {
 }
 
 void GDMono::unhandled_exception_hook(MonoObject *p_exc, void *) {
-
 	// This method will be called by the runtime when a thrown exception is not handled.
 	// It won't be called when we manually treat a thrown exception as unhandled.
 	// We assume the exception was already printed before calling this hook.
 
 #ifdef DEBUG_ENABLED
 	GDMonoUtils::debug_send_unhandled_exception_error((MonoException *)p_exc);
-	if (ScriptDebugger::get_singleton())
-		ScriptDebugger::get_singleton()->idle_poll();
+	if (EngineDebugger::is_active()) {
+		EngineDebugger::get_singleton()->poll_events(false);
+	}
 #endif
 
 	exit(mono_environment_exitcode_get());
@@ -1193,7 +1238,6 @@ void GDMono::unhandled_exception_hook(MonoObject *p_exc, void *) {
 }
 
 GDMono::GDMono() {
-
 	singleton = this;
 
 	gdmono_log = memnew(GDMonoLog);
@@ -1201,14 +1245,14 @@ GDMono::GDMono() {
 	runtime_initialized = false;
 	finalizing_scripts_domain = false;
 
-	root_domain = NULL;
-	scripts_domain = NULL;
+	root_domain = nullptr;
+	scripts_domain = nullptr;
 
-	corlib_assembly = NULL;
-	project_assembly = NULL;
+	corlib_assembly = nullptr;
+	project_assembly = nullptr;
 #ifdef TOOLS_ENABLED
-	tools_assembly = NULL;
-	tools_project_editor_assembly = NULL;
+	tools_assembly = nullptr;
+	tools_project_editor_assembly = nullptr;
 #endif
 
 	api_core_hash = 0;
@@ -1220,20 +1264,51 @@ GDMono::GDMono() {
 }
 
 GDMono::~GDMono() {
-
 	if (is_runtime_initialized()) {
+#ifndef GD_MONO_SINGLE_APPDOMAIN
 		if (scripts_domain) {
 			Error err = _unload_scripts_domain();
 			if (err != OK) {
 				ERR_PRINT("Mono: Failed to unload scripts domain.");
 			}
 		}
+#else
+		CRASH_COND(scripts_domain != root_domain);
+
+		print_verbose("Mono: Finalizing scripts domain...");
+
+		if (mono_domain_get() != root_domain)
+			mono_domain_set(root_domain, true);
+
+		finalizing_scripts_domain = true;
+
+		if (!mono_domain_finalize(root_domain, 2000)) {
+			ERR_PRINT("Mono: Domain finalization timeout.");
+		}
+
+		finalizing_scripts_domain = false;
+
+		mono_gc_collect(mono_gc_max_generation());
+
+		GDMonoCache::clear_godot_api_cache();
+
+		_domain_assemblies_cleanup(mono_domain_get_id(root_domain));
+
+		core_api_assembly.assembly = nullptr;
+
+		project_assembly = nullptr;
+
+		root_domain = nullptr;
+		scripts_domain = nullptr;
 
-		const uint32_t *k = NULL;
+		// Leave the rest to 'mono_jit_cleanup'
+#endif
+
+		const int32_t *k = nullptr;
 		while ((k = assemblies.next(k))) {
 			HashMap<String, GDMonoAssembly *> &domain_assemblies = assemblies.get(*k);
 
-			const String *kk = NULL;
+			const String *kk = nullptr;
 			while ((kk = domain_assemblies.next(kk))) {
 				memdelete(domain_assemblies.get(*kk));
 			}
@@ -1244,94 +1319,95 @@ GDMono::~GDMono() {
 
 		mono_jit_cleanup(root_domain);
 
-#if defined(ANDROID_ENABLED)
-		GDMonoAndroid::cleanup();
-#endif
-
 		print_verbose("Mono: Finalized");
 
 		runtime_initialized = false;
 	}
 
-	if (gdmono_log)
+#if defined(ANDROID_ENABLED)
+	gdmono::android::support::cleanup();
+#endif
+
+	if (gdmono_log) {
 		memdelete(gdmono_log);
+	}
 
-	singleton = NULL;
+	singleton = nullptr;
 }
 
-_GodotSharp *_GodotSharp::singleton = NULL;
+_GodotSharp *_GodotSharp::singleton = nullptr;
 
 void _GodotSharp::attach_thread() {
-
 	GDMonoUtils::attach_current_thread();
 }
 
 void _GodotSharp::detach_thread() {
-
 	GDMonoUtils::detach_current_thread();
 }
 
 int32_t _GodotSharp::get_domain_id() {
-
 	MonoDomain *domain = mono_domain_get();
-	CRASH_COND(!domain); // User must check if runtime is initialized before calling this method
+	ERR_FAIL_NULL_V(domain, -1);
 	return mono_domain_get_id(domain);
 }
 
 int32_t _GodotSharp::get_scripts_domain_id() {
-
+	ERR_FAIL_NULL_V_MSG(GDMono::get_singleton(),
+			-1, "The Mono runtime is not initialized");
 	MonoDomain *domain = GDMono::get_singleton()->get_scripts_domain();
-	CRASH_COND(!domain); // User must check if scripts domain is loaded before calling this method
+	ERR_FAIL_NULL_V(domain, -1);
 	return mono_domain_get_id(domain);
 }
 
 bool _GodotSharp::is_scripts_domain_loaded() {
-
-	return GDMono::get_singleton()->is_runtime_initialized() && GDMono::get_singleton()->get_scripts_domain() != NULL;
+	return GDMono::get_singleton() != nullptr &&
+		   GDMono::get_singleton()->is_runtime_initialized() &&
+		   GDMono::get_singleton()->get_scripts_domain() != nullptr;
 }
 
 bool _GodotSharp::_is_domain_finalizing_for_unload(int32_t p_domain_id) {
-
 	return is_domain_finalizing_for_unload(p_domain_id);
 }
 
-bool _GodotSharp::is_domain_finalizing_for_unload() {
-
-	return is_domain_finalizing_for_unload(mono_domain_get());
-}
-
 bool _GodotSharp::is_domain_finalizing_for_unload(int32_t p_domain_id) {
-
 	return is_domain_finalizing_for_unload(mono_domain_get_by_id(p_domain_id));
 }
 
 bool _GodotSharp::is_domain_finalizing_for_unload(MonoDomain *p_domain) {
+	GDMono *gd_mono = GDMono::get_singleton();
 
-	if (!p_domain)
-		return true;
-	if (p_domain == GDMono::get_singleton()->get_scripts_domain() && GDMono::get_singleton()->is_finalizing_scripts_domain())
+	ERR_FAIL_COND_V_MSG(!gd_mono || !gd_mono->is_runtime_initialized(),
+			false, "The Mono runtime is not initialized");
+
+	ERR_FAIL_NULL_V(p_domain, true);
+
+	if (p_domain == gd_mono->get_scripts_domain() && gd_mono->is_finalizing_scripts_domain()) {
 		return true;
+	}
+
 	return mono_domain_is_unloading(p_domain);
 }
 
 bool _GodotSharp::is_runtime_shutting_down() {
-
 	return mono_runtime_is_shutting_down();
 }
 
 bool _GodotSharp::is_runtime_initialized() {
-
-	return GDMono::get_singleton()->is_runtime_initialized();
+	return GDMono::get_singleton() != nullptr && GDMono::get_singleton()->is_runtime_initialized();
 }
 
 void _GodotSharp::_reload_assemblies(bool p_soft_reload) {
 #ifdef GD_MONO_HOT_RELOAD
-	CSharpLanguage::get_singleton()->reload_assemblies(p_soft_reload);
+	CRASH_COND(CSharpLanguage::get_singleton() == nullptr);
+	// This method may be called more than once with `call_deferred`, so we need to check
+	// again if reloading is needed to avoid reloading multiple times unnecessarily.
+	if (CSharpLanguage::get_singleton()->is_assembly_reloading_needed()) {
+		CSharpLanguage::get_singleton()->reload_assemblies(p_soft_reload);
+	}
 #endif
 }
 
 void _GodotSharp::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("attach_thread"), &_GodotSharp::attach_thread);
 	ClassDB::bind_method(D_METHOD("detach_thread"), &_GodotSharp::detach_thread);
 
@@ -1346,11 +1422,9 @@ void _GodotSharp::_bind_methods() {
 }
 
 _GodotSharp::_GodotSharp() {
-
 	singleton = this;
 }
 
 _GodotSharp::~_GodotSharp() {
-
-	singleton = NULL;
+	singleton = nullptr;
 }
diff --git a/modules/mono/mono_gd/gd_mono.h b/modules/mono/mono_gd/gd_mono.h
index 306fa15f12..18f7418049 100644
--- a/modules/mono/mono_gd/gd_mono.h
+++ b/modules/mono/mono_gd/gd_mono.h
@@ -48,9 +48,9 @@ enum Type {
 };
 
 struct Version {
-	uint64_t godot_api_hash;
-	uint32_t bindings_version;
-	uint32_t cs_glue_version;
+	uint64_t godot_api_hash = 0;
+	uint32_t bindings_version = 0;
+	uint32_t cs_glue_version = 0;
 
 	bool operator==(const Version &p_other) const {
 		return godot_api_hash == p_other.godot_api_hash &&
@@ -58,11 +58,7 @@ struct Version {
 			   cs_glue_version == p_other.cs_glue_version;
 	}
 
-	Version() :
-			godot_api_hash(0),
-			bindings_version(0),
-			cs_glue_version(0) {
-	}
+	Version() {}
 
 	Version(uint64_t p_godot_api_hash,
 			uint32_t p_bindings_version,
@@ -79,7 +75,6 @@ String to_string(Type p_type);
 } // namespace ApiAssemblyInfo
 
 class GDMono {
-
 public:
 	enum UnhandledExceptionPolicy {
 		POLICY_TERMINATE_APP,
@@ -87,13 +82,10 @@ public:
 	};
 
 	struct LoadedApiAssembly {
-		GDMonoAssembly *assembly;
-		bool out_of_sync;
+		GDMonoAssembly *assembly = nullptr;
+		bool out_of_sync = false;
 
-		LoadedApiAssembly() :
-				assembly(NULL),
-				out_of_sync(false) {
-		}
+		LoadedApiAssembly() {}
 	};
 
 private:
@@ -105,7 +97,7 @@ private:
 	MonoDomain *root_domain;
 	MonoDomain *scripts_domain;
 
-	HashMap<uint32_t, HashMap<String, GDMonoAssembly *> > assemblies;
+	HashMap<int32_t, HashMap<String, GDMonoAssembly *>> assemblies;
 
 	GDMonoAssembly *corlib_assembly;
 	GDMonoAssembly *project_assembly;
@@ -144,10 +136,12 @@ private:
 
 	void _register_internal_calls();
 
+#ifndef GD_MONO_SINGLE_APPDOMAIN
 	Error _load_scripts_domain();
 	Error _unload_scripts_domain();
+#endif
 
-	void _domain_assemblies_cleanup(uint32_t p_domain_id);
+	void _domain_assemblies_cleanup(int32_t p_domain_id);
 
 	uint64_t api_core_hash;
 #ifdef TOOLS_ENABLED
@@ -171,14 +165,16 @@ protected:
 public:
 #ifdef DEBUG_METHODS_ENABLED
 	uint64_t get_api_core_hash() {
-		if (api_core_hash == 0)
+		if (api_core_hash == 0) {
 			api_core_hash = ClassDB::get_api_hash(ClassDB::API_CORE);
+		}
 		return api_core_hash;
 	}
 #ifdef TOOLS_ENABLED
 	uint64_t get_api_editor_hash() {
-		if (api_editor_hash == 0)
+		if (api_editor_hash == 0) {
 			api_editor_hash = ClassDB::get_api_hash(ClassDB::API_EDITOR);
+		}
 		return api_editor_hash;
 	}
 #endif // TOOLS_ENABLED
@@ -198,18 +194,18 @@ public:
 
 #ifdef TOOLS_ENABLED
 	bool copy_prebuilt_api_assembly(ApiAssemblyInfo::Type p_api_type, const String &p_config);
-	String update_api_assemblies_from_prebuilt(const String &p_config, const bool *p_core_api_out_of_sync = NULL, const bool *p_editor_api_out_of_sync = NULL);
+	String update_api_assemblies_from_prebuilt(const String &p_config, const bool *p_core_api_out_of_sync = nullptr, const bool *p_editor_api_out_of_sync = nullptr);
 #endif
 
 	static GDMono *get_singleton() { return singleton; }
 
-	GD_NORETURN static void unhandled_exception_hook(MonoObject *p_exc, void *p_user_data);
+	[[noreturn]] static void unhandled_exception_hook(MonoObject *p_exc, void *p_user_data);
 
 	UnhandledExceptionPolicy get_unhandled_exception_policy() const { return unhandled_exception_policy; }
 
 	// Do not use these, unless you know what you're doing
-	void add_assembly(uint32_t p_domain_id, GDMonoAssembly *p_assembly);
-	GDMonoAssembly **get_loaded_assembly(const String &p_name);
+	void add_assembly(int32_t p_domain_id, GDMonoAssembly *p_assembly);
+	GDMonoAssembly *get_loaded_assembly(const String &p_name);
 
 	_FORCE_INLINE_ bool is_runtime_initialized() const { return runtime_initialized && !mono_runtime_is_shutting_down() /* stays true after shutdown finished */; }
 
@@ -239,6 +235,7 @@ public:
 
 	bool load_assembly(const String &p_name, GDMonoAssembly **r_assembly, bool p_refonly = false);
 	bool load_assembly(const String &p_name, MonoAssemblyName *p_aname, GDMonoAssembly **r_assembly, bool p_refonly = false);
+	bool load_assembly(const String &p_name, MonoAssemblyName *p_aname, GDMonoAssembly **r_assembly, bool p_refonly, const Vector<String> &p_search_dirs);
 	bool load_assembly_from(const String &p_name, const String &p_path, GDMonoAssembly **r_assembly, bool p_refonly = false);
 
 	Error finalize_and_unload_domain(MonoDomain *p_domain);
@@ -253,23 +250,22 @@ public:
 namespace gdmono {
 
 class ScopeDomain {
-
 	MonoDomain *prev_domain;
 
 public:
 	ScopeDomain(MonoDomain *p_domain) {
-		MonoDomain *prev_domain = mono_domain_get();
+		prev_domain = mono_domain_get();
 		if (prev_domain != p_domain) {
-			this->prev_domain = prev_domain;
 			mono_domain_set(p_domain, false);
 		} else {
-			this->prev_domain = NULL;
+			prev_domain = nullptr;
 		}
 	}
 
 	~ScopeDomain() {
-		if (prev_domain)
+		if (prev_domain) {
 			mono_domain_set(prev_domain, false);
+		}
 	}
 };
 
@@ -282,8 +278,9 @@ public:
 	}
 
 	~ScopeExitDomainUnload() {
-		if (domain)
+		if (domain) {
 			GDMono::get_singleton()->finalize_and_unload_domain(domain);
+		}
 	}
 };
 
@@ -304,9 +301,6 @@ class _GodotSharp : public Object {
 
 	bool _is_domain_finalizing_for_unload(int32_t p_domain_id);
 
-	List<NodePath *> np_delete_queue;
-	List<RID *> rid_delete_queue;
-
 	void _reload_assemblies(bool p_soft_reload);
 
 protected:
@@ -324,7 +318,6 @@ public:
 
 	bool is_scripts_domain_loaded();
 
-	bool is_domain_finalizing_for_unload();
 	bool is_domain_finalizing_for_unload(int32_t p_domain_id);
 	bool is_domain_finalizing_for_unload(MonoDomain *p_domain);
 
diff --git a/modules/mono/mono_gd/gd_mono_assembly.cpp b/modules/mono/mono_gd/gd_mono_assembly.cpp
index 6cf5377e2c..6e351001d4 100644
--- a/modules/mono/mono_gd/gd_mono_assembly.cpp
+++ b/modules/mono/mono_gd/gd_mono_assembly.cpp
@@ -33,6 +33,7 @@
 #include <mono/metadata/mono-debug.h>
 #include <mono/metadata/tokentype.h>
 
+#include "core/io/file_access_pack.h"
 #include "core/list.h"
 #include "core/os/file_access.h"
 #include "core/os/os.h"
@@ -42,13 +43,9 @@
 #include "gd_mono_cache.h"
 #include "gd_mono_class.h"
 
-bool GDMonoAssembly::no_search = false;
-bool GDMonoAssembly::in_preload = false;
-
 Vector<String> GDMonoAssembly::search_dirs;
 
 void GDMonoAssembly::fill_search_dirs(Vector<String> &r_search_dirs, const String &p_custom_config, const String &p_custom_bcl_dir) {
-
 	String framework_dir;
 
 	if (!p_custom_bcl_dir.empty()) {
@@ -78,7 +75,7 @@ void GDMonoAssembly::fill_search_dirs(Vector<String> &r_search_dirs, const Strin
 	if (p_custom_config.empty()) {
 		r_search_dirs.push_back(GodotSharpDirs::get_res_assemblies_dir());
 	} else {
-		String api_config = p_custom_config == "Release" ? "Release" : "Debug";
+		String api_config = p_custom_config == "ExportRelease" ? "Release" : "Debug";
 		r_search_dirs.push_back(GodotSharpDirs::get_res_assemblies_base_dir().plus_file(api_config));
 	}
 
@@ -94,19 +91,30 @@ void GDMonoAssembly::fill_search_dirs(Vector<String> &r_search_dirs, const Strin
 #endif
 }
 
-void GDMonoAssembly::assembly_load_hook(MonoAssembly *assembly, void *user_data) {
+// This is how these assembly loading hooks work:
+//
+// - The 'search' hook checks if the assembly has already been loaded, to avoid loading again.
+// - The 'preload' hook does the actual loading and is only called if the
+//   'search' hook didn't find the assembly in the list of loaded assemblies.
+// - The 'load' hook is called after the assembly has been loaded. Its job is to add the
+//   assembly to the list of loaded assemblies so that the 'search' hook can look it up.
+
+void GDMonoAssembly::assembly_load_hook(MonoAssembly *assembly, [[maybe_unused]] void *user_data) {
+	String name = String::utf8(mono_assembly_name_get_name(mono_assembly_get_name(assembly)));
+
+	MonoImage *image = mono_assembly_get_image(assembly);
 
-	if (no_search)
-		return;
+	GDMonoAssembly *gdassembly = memnew(GDMonoAssembly(name, image, assembly));
 
-	// If our search and preload hooks fail to load the assembly themselves, the mono runtime still might.
-	// Just do Assembly.LoadFrom("/Full/Path/On/Disk.dll");
-	// In this case, we wouldn't have the assembly known in GDMono, which causes crashes
-	// if any class inside the assembly is looked up by Godot.
-	// And causing a lookup like that is as easy as throwing an exception defined in it...
-	// No, we can't make the assembly load hooks smart enough because they get passed a MonoAssemblyName* only,
-	// not the disk path passed to say Assembly.LoadFrom().
-	_wrap_mono_assembly(assembly);
+#ifdef GD_MONO_HOT_RELOAD
+	String path = String::utf8(mono_image_get_filename(image));
+	if (FileAccess::exists(path)) {
+		gdassembly->modified_time = FileAccess::get_modified_time(path);
+	}
+#endif
+
+	MonoDomain *domain = mono_domain_get();
+	GDMono::get_singleton()->add_assembly(domain ? mono_domain_get_id(domain) : 0, gdassembly);
 }
 
 MonoAssembly *GDMonoAssembly::assembly_search_hook(MonoAssemblyName *aname, void *user_data) {
@@ -125,78 +133,25 @@ MonoAssembly *GDMonoAssembly::assembly_refonly_preload_hook(MonoAssemblyName *an
 	return GDMonoAssembly::_preload_hook(aname, assemblies_path, user_data, true);
 }
 
-MonoAssembly *GDMonoAssembly::_search_hook(MonoAssemblyName *aname, void *user_data, bool refonly) {
-
-	(void)user_data; // UNUSED
-
+MonoAssembly *GDMonoAssembly::_search_hook(MonoAssemblyName *aname, [[maybe_unused]] void *user_data, bool refonly) {
 	String name = String::utf8(mono_assembly_name_get_name(aname));
 	bool has_extension = name.ends_with(".dll") || name.ends_with(".exe");
 
-	if (no_search)
-		return NULL;
-
-	GDMonoAssembly **loaded_asm = GDMono::get_singleton()->get_loaded_assembly(has_extension ? name.get_basename() : name);
-	if (loaded_asm)
-		return (*loaded_asm)->get_assembly();
-
-	no_search = true; // Avoid the recursion madness
-
-	GDMonoAssembly *res = _load_assembly_search(name, search_dirs, refonly);
-
-	no_search = false;
-
-	return res ? res->get_assembly() : NULL;
-}
-
-static _THREAD_LOCAL_(MonoImage *) image_corlib_loading = NULL;
-
-MonoAssembly *GDMonoAssembly::_preload_hook(MonoAssemblyName *aname, char **, void *user_data, bool refonly) {
-
-	(void)user_data; // UNUSED
-
-	{
-		// If we find the assembly here, we load it with 'mono_assembly_load_from_full',
-		// which in turn invokes load hooks before returning the MonoAssembly to us.
-		// One of the load hooks is 'load_aot_module'. This hook can end up calling preload hooks
-		// again for the same assembly in certain in certain circumstances (the 'do_load_image' part).
-		// If this is the case and we return NULL due to the no_search condition below,
-		// it will result in an internal crash later on. Therefore we need to return the assembly we didn't
-		// get yet from 'mono_assembly_load_from_full'. Luckily we have the image, which already got it.
-		// This must be done here. If done in search hooks, it would cause 'mono_assembly_load_from_full'
-		// to think another MonoAssembly for this assembly was already loaded, making it delete its own,
-		// when in fact both pointers were the same... This hooks thing is confusing.
-		if (image_corlib_loading) {
-			return mono_image_get_assembly(image_corlib_loading);
-		}
+	GDMonoAssembly *loaded_asm = GDMono::get_singleton()->get_loaded_assembly(has_extension ? name.get_basename() : name);
+	if (loaded_asm) {
+		return loaded_asm->get_assembly();
 	}
 
-	if (no_search)
-		return NULL;
-
-	no_search = true;
-	in_preload = true;
+	return nullptr;
+}
 
+MonoAssembly *GDMonoAssembly::_preload_hook(MonoAssemblyName *aname, char **, [[maybe_unused]] void *user_data, bool refonly) {
 	String name = String::utf8(mono_assembly_name_get_name(aname));
-	bool has_extension = name.ends_with(".dll");
-
-	GDMonoAssembly *res = NULL;
-	if (has_extension ? name == "mscorlib.dll" : name == "mscorlib") {
-		GDMonoAssembly **stored_assembly = GDMono::get_singleton()->get_loaded_assembly(has_extension ? name.get_basename() : name);
-		if (stored_assembly)
-			return (*stored_assembly)->get_assembly();
-
-		res = _load_assembly_search("mscorlib.dll", search_dirs, refonly);
-	}
-
-	no_search = false;
-	in_preload = false;
-
-	return res ? res->get_assembly() : NULL;
+	return _load_assembly_search(name, aname, refonly, search_dirs);
 }
 
-GDMonoAssembly *GDMonoAssembly::_load_assembly_search(const String &p_name, const Vector<String> &p_search_dirs, bool p_refonly) {
-
-	GDMonoAssembly *res = NULL;
+MonoAssembly *GDMonoAssembly::_load_assembly_search(const String &p_name, MonoAssemblyName *p_aname, bool p_refonly, const Vector<String> &p_search_dirs) {
+	MonoAssembly *res = nullptr;
 	String path;
 
 	bool has_extension = p_name.ends_with(".dll") || p_name.ends_with(".exe");
@@ -207,32 +162,34 @@ GDMonoAssembly *GDMonoAssembly::_load_assembly_search(const String &p_name, cons
 		if (has_extension) {
 			path = search_dir.plus_file(p_name);
 			if (FileAccess::exists(path)) {
-				res = _load_assembly_from(p_name.get_basename(), path, p_refonly);
-				if (res != NULL)
+				res = _real_load_assembly_from(path, p_refonly, p_aname);
+				if (res != nullptr) {
 					return res;
+				}
 			}
 		} else {
 			path = search_dir.plus_file(p_name + ".dll");
 			if (FileAccess::exists(path)) {
-				res = _load_assembly_from(p_name, path, p_refonly);
-				if (res != NULL)
+				res = _real_load_assembly_from(path, p_refonly, p_aname);
+				if (res != nullptr) {
 					return res;
+				}
 			}
 
 			path = search_dir.plus_file(p_name + ".exe");
 			if (FileAccess::exists(path)) {
-				res = _load_assembly_from(p_name, path, p_refonly);
-				if (res != NULL)
+				res = _real_load_assembly_from(path, p_refonly, p_aname);
+				if (res != nullptr) {
 					return res;
+				}
 			}
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 String GDMonoAssembly::find_assembly(const String &p_name) {
-
 	String path;
 
 	bool has_extension = p_name.ends_with(".dll") || p_name.ends_with(".exe");
@@ -242,110 +199,97 @@ String GDMonoAssembly::find_assembly(const String &p_name) {
 
 		if (has_extension) {
 			path = search_dir.plus_file(p_name);
-			if (FileAccess::exists(path))
+			if (FileAccess::exists(path)) {
 				return path;
+			}
 		} else {
 			path = search_dir.plus_file(p_name + ".dll");
-			if (FileAccess::exists(path))
+			if (FileAccess::exists(path)) {
 				return path;
+			}
 
 			path = search_dir.plus_file(p_name + ".exe");
-			if (FileAccess::exists(path))
+			if (FileAccess::exists(path)) {
 				return path;
+			}
 		}
 	}
 
 	return String();
 }
 
-GDMonoAssembly *GDMonoAssembly::_load_assembly_from(const String &p_name, const String &p_path, bool p_refonly) {
-
-	GDMonoAssembly *assembly = memnew(GDMonoAssembly(p_name, p_path));
-
-	Error err = assembly->load(p_refonly);
-
-	if (err != OK) {
-		memdelete(assembly);
-		ERR_FAIL_V(NULL);
-	}
-
-	MonoDomain *domain = mono_domain_get();
-	GDMono::get_singleton()->add_assembly(domain ? mono_domain_get_id(domain) : 0, assembly);
-
-	return assembly;
-}
-
-void GDMonoAssembly::_wrap_mono_assembly(MonoAssembly *assembly) {
-	String name = String::utf8(mono_assembly_name_get_name(mono_assembly_get_name(assembly)));
-
-	MonoImage *image = mono_assembly_get_image(assembly);
-
-	GDMonoAssembly *gdassembly = memnew(GDMonoAssembly(name, mono_image_get_filename(image)));
-	Error err = gdassembly->wrapper_for_image(image);
-
-	if (err != OK) {
-		memdelete(gdassembly);
-		ERR_FAIL();
-	}
-
-	MonoDomain *domain = mono_domain_get();
-	GDMono::get_singleton()->add_assembly(domain ? mono_domain_get_id(domain) : 0, gdassembly);
-}
-
 void GDMonoAssembly::initialize() {
-
 	fill_search_dirs(search_dirs);
 
-	mono_install_assembly_search_hook(&assembly_search_hook, NULL);
-	mono_install_assembly_refonly_search_hook(&assembly_refonly_search_hook, NULL);
-	mono_install_assembly_preload_hook(&assembly_preload_hook, NULL);
-	mono_install_assembly_refonly_preload_hook(&assembly_refonly_preload_hook, NULL);
-	mono_install_assembly_load_hook(&assembly_load_hook, NULL);
+	mono_install_assembly_search_hook(&assembly_search_hook, nullptr);
+	mono_install_assembly_refonly_search_hook(&assembly_refonly_search_hook, nullptr);
+	mono_install_assembly_preload_hook(&assembly_preload_hook, nullptr);
+	mono_install_assembly_refonly_preload_hook(&assembly_refonly_preload_hook, nullptr);
+	mono_install_assembly_load_hook(&assembly_load_hook, nullptr);
 }
 
-Error GDMonoAssembly::load(bool p_refonly) {
-
-	ERR_FAIL_COND_V(loaded, ERR_FILE_ALREADY_IN_USE);
-
-	refonly = p_refonly;
-
-	uint64_t last_modified_time = FileAccess::get_modified_time(path);
-
-	Vector<uint8_t> data = FileAccess::get_file_as_array(path);
-	ERR_FAIL_COND_V(data.empty(), ERR_FILE_CANT_READ);
+MonoAssembly *GDMonoAssembly::_real_load_assembly_from(const String &p_path, bool p_refonly, MonoAssemblyName *p_aname) {
+	Vector<uint8_t> data = FileAccess::get_file_as_array(p_path);
+	ERR_FAIL_COND_V_MSG(data.empty(), nullptr, "Could read the assembly in the specified location");
 
 	String image_filename;
 
 #ifdef ANDROID_ENABLED
-	if (path.begins_with("res://")) {
-		image_filename = path.substr(6, path.length());
+	if (p_path.begins_with("res://")) {
+		image_filename = p_path.substr(6, p_path.length());
 	} else {
-		image_filename = ProjectSettings::get_singleton()->globalize_path(path);
+		image_filename = ProjectSettings::get_singleton()->globalize_path(p_path);
 	}
 #else
 	// FIXME: globalize_path does not work on exported games
-	image_filename = ProjectSettings::get_singleton()->globalize_path(path);
+	image_filename = ProjectSettings::get_singleton()->globalize_path(p_path);
 #endif
 
 	MonoImageOpenStatus status = MONO_IMAGE_OK;
 
-	image = mono_image_open_from_data_with_name(
+	MonoImage *image = mono_image_open_from_data_with_name(
 			(char *)&data[0], data.size(),
-			true, &status, refonly,
-			image_filename.utf8().get_data());
+			true, &status, p_refonly,
+			image_filename.utf8());
+
+	ERR_FAIL_COND_V_MSG(status != MONO_IMAGE_OK || !image, nullptr, "Failed to open assembly image from memory: '" + p_path + "'.");
+
+	if (p_aname != nullptr) {
+		// Check assembly version
+		const MonoTableInfo *table = mono_image_get_table_info(image, MONO_TABLE_ASSEMBLY);
+
+		ERR_FAIL_NULL_V(table, nullptr);
 
-	ERR_FAIL_COND_V(status != MONO_IMAGE_OK, ERR_FILE_CANT_OPEN);
-	ERR_FAIL_NULL_V(image, ERR_FILE_CANT_OPEN);
+		if (mono_table_info_get_rows(table)) {
+			uint32_t cols[MONO_ASSEMBLY_SIZE];
+			mono_metadata_decode_row(table, 0, cols, MONO_ASSEMBLY_SIZE);
+
+			// Not sure about .NET's policy. We will only ensure major and minor are equal, and ignore build and revision.
+			uint16_t major = cols[MONO_ASSEMBLY_MAJOR_VERSION];
+			uint16_t minor = cols[MONO_ASSEMBLY_MINOR_VERSION];
+
+			uint16_t required_minor;
+			uint16_t required_major = mono_assembly_name_get_version(p_aname, &required_minor, nullptr, nullptr);
+
+			if (required_major != 0) {
+				if (major != required_major && minor != required_minor) {
+					mono_image_close(image);
+					return nullptr;
+				}
+			}
+		}
+	}
 
 #ifdef DEBUG_ENABLED
 	Vector<uint8_t> pdb_data;
-	String pdb_path(path + ".pdb");
+	String pdb_path(p_path + ".pdb");
 
 	if (!FileAccess::exists(pdb_path)) {
-		pdb_path = path.get_basename() + ".pdb"; // without .dll
+		pdb_path = p_path.get_basename() + ".pdb"; // without .dll
 
-		if (!FileAccess::exists(pdb_path))
+		if (!FileAccess::exists(pdb_path)) {
 			goto no_pdb;
+		}
 	}
 
 	pdb_data = FileAccess::get_file_as_array(pdb_path);
@@ -357,44 +301,34 @@ no_pdb:
 
 #endif
 
-	bool is_corlib_preload = in_preload && name == "mscorlib";
+	bool need_manual_load_hook = mono_image_get_assembly(image) != nullptr; // Re-using an existing image with an assembly loaded
 
-	if (is_corlib_preload)
-		image_corlib_loading = image;
+	status = MONO_IMAGE_OK;
 
-	assembly = mono_assembly_load_from_full(image, image_filename.utf8().get_data(), &status, refonly);
+	MonoAssembly *assembly = mono_assembly_load_from_full(image, image_filename.utf8().get_data(), &status, p_refonly);
 
-	if (is_corlib_preload)
-		image_corlib_loading = NULL;
+	ERR_FAIL_COND_V_MSG(status != MONO_IMAGE_OK || !assembly, nullptr, "Failed to load assembly for image");
 
-	ERR_FAIL_COND_V(status != MONO_IMAGE_OK || assembly == NULL, ERR_FILE_CANT_OPEN);
+	if (need_manual_load_hook) {
+		// For some reason if an assembly survived domain reloading (maybe because it's referenced somewhere else),
+		// the mono internal search hook don't detect it, yet mono_image_open_from_data_with_name re-uses the image
+		// and assembly, and mono_assembly_load_from_full doesn't call the load hook. We need to call it manually.
+		String name = String::utf8(mono_assembly_name_get_name(mono_assembly_get_name(assembly)));
+		bool has_extension = name.ends_with(".dll") || name.ends_with(".exe");
+		GDMonoAssembly *loaded_asm = GDMono::get_singleton()->get_loaded_assembly(has_extension ? name.get_basename() : name);
+		if (!loaded_asm) {
+			assembly_load_hook(assembly, nullptr);
+		}
+	}
 
 	// Decrement refcount which was previously incremented by mono_image_open_from_data_with_name
 	mono_image_close(image);
 
-	loaded = true;
-	modified_time = last_modified_time;
-
-	return OK;
-}
-
-Error GDMonoAssembly::wrapper_for_image(MonoImage *p_image) {
-
-	ERR_FAIL_COND_V(loaded, ERR_FILE_ALREADY_IN_USE);
-
-	assembly = mono_image_get_assembly(p_image);
-	ERR_FAIL_NULL_V(assembly, FAILED);
-
-	image = p_image;
-
-	loaded = true;
-
-	return OK;
+	return assembly;
 }
 
 void GDMonoAssembly::unload() {
-
-	ERR_FAIL_COND(!loaded);
+	ERR_FAIL_NULL(image); // Should not be called if already unloaded
 
 	for (Map<MonoClass *, GDMonoClass *>::Element *E = cached_raw.front(); E; E = E->next()) {
 		memdelete(E->value());
@@ -403,26 +337,30 @@ void GDMonoAssembly::unload() {
 	cached_classes.clear();
 	cached_raw.clear();
 
-	assembly = NULL;
-	image = NULL;
-	loaded = false;
+	assembly = nullptr;
+	image = nullptr;
 }
 
-GDMonoClass *GDMonoAssembly::get_class(const StringName &p_namespace, const StringName &p_name) {
+String GDMonoAssembly::get_path() const {
+	return String::utf8(mono_image_get_filename(image));
+}
 
-	ERR_FAIL_COND_V(!loaded, NULL);
+GDMonoClass *GDMonoAssembly::get_class(const StringName &p_namespace, const StringName &p_name) {
+	ERR_FAIL_NULL_V(image, nullptr);
 
 	ClassKey key(p_namespace, p_name);
 
 	GDMonoClass **match = cached_classes.getptr(key);
 
-	if (match)
+	if (match) {
 		return *match;
+	}
 
 	MonoClass *mono_class = mono_class_from_name(image, String(p_namespace).utf8(), String(p_name).utf8());
 
-	if (!mono_class)
-		return NULL;
+	if (!mono_class) {
+		return nullptr;
+	}
 
 	GDMonoClass *wrapped_class = memnew(GDMonoClass(p_namespace, p_name, mono_class, this));
 
@@ -433,13 +371,13 @@ GDMonoClass *GDMonoAssembly::get_class(const StringName &p_namespace, const Stri
 }
 
 GDMonoClass *GDMonoAssembly::get_class(MonoClass *p_mono_class) {
-
-	ERR_FAIL_COND_V(!loaded, NULL);
+	ERR_FAIL_NULL_V(image, nullptr);
 
 	Map<MonoClass *, GDMonoClass *>::Element *match = cached_raw.find(p_mono_class);
 
-	if (match)
+	if (match) {
 		return match->value();
+	}
 
 	StringName namespace_name = mono_class_get_namespace(p_mono_class);
 	StringName class_name = mono_class_get_name(p_mono_class);
@@ -453,14 +391,14 @@ GDMonoClass *GDMonoAssembly::get_class(MonoClass *p_mono_class) {
 }
 
 GDMonoClass *GDMonoAssembly::get_object_derived_class(const StringName &p_class) {
-
-	GDMonoClass *match = NULL;
+	GDMonoClass *match = nullptr;
 
 	if (gdobject_class_cache_updated) {
 		Map<StringName, GDMonoClass *>::Element *result = gdobject_class_cache.find(p_class);
 
-		if (result)
+		if (result) {
 			match = result->get();
+		}
 	} else {
 		List<GDMonoClass *> nested_classes;
 
@@ -469,30 +407,34 @@ GDMonoClass *GDMonoAssembly::get_object_derived_class(const StringName &p_class)
 		for (int i = 1; i < rows; i++) {
 			MonoClass *mono_class = mono_class_get(image, (i + 1) | MONO_TOKEN_TYPE_DEF);
 
-			if (!mono_class_is_assignable_from(CACHED_CLASS_RAW(GodotObject), mono_class))
+			if (!mono_class_is_assignable_from(CACHED_CLASS_RAW(GodotObject), mono_class)) {
 				continue;
+			}
 
 			GDMonoClass *current = get_class(mono_class);
 
-			if (!current)
+			if (!current) {
 				continue;
+			}
 
 			nested_classes.push_back(current);
 
-			if (!match && current->get_name() == p_class)
+			if (!match && current->get_name() == p_class) {
 				match = current;
+			}
 
 			while (!nested_classes.empty()) {
 				GDMonoClass *current_nested = nested_classes.front()->get();
-				nested_classes.pop_back();
+				nested_classes.pop_front();
 
-				void *iter = NULL;
+				void *iter = nullptr;
 
 				while (true) {
 					MonoClass *raw_nested = mono_class_get_nested_types(current_nested->get_mono_ptr(), &iter);
 
-					if (!raw_nested)
+					if (!raw_nested) {
 						break;
+					}
 
 					GDMonoClass *nested_class = get_class(raw_nested);
 
@@ -512,34 +454,54 @@ GDMonoClass *GDMonoAssembly::get_object_derived_class(const StringName &p_class)
 	return match;
 }
 
-GDMonoAssembly *GDMonoAssembly::load_from(const String &p_name, const String &p_path, bool p_refonly) {
+GDMonoAssembly *GDMonoAssembly::load(const String &p_name, MonoAssemblyName *p_aname, bool p_refonly, const Vector<String> &p_search_dirs) {
+	if (GDMono::get_singleton()->get_corlib_assembly() && (p_name == "mscorlib" || p_name == "mscorlib.dll")) {
+		return GDMono::get_singleton()->get_corlib_assembly();
+	}
 
-	GDMonoAssembly **loaded_asm = GDMono::get_singleton()->get_loaded_assembly(p_name);
-	if (loaded_asm)
-		return *loaded_asm;
-#ifdef DEBUG_ENABLED
-	CRASH_COND(!FileAccess::exists(p_path));
-#endif
-	no_search = true;
-	GDMonoAssembly *res = _load_assembly_from(p_name, p_path, p_refonly);
-	no_search = false;
-	return res;
+	// We need to manually call the search hook in this case, as it won't be called in the next step
+	MonoAssembly *assembly = mono_assembly_invoke_search_hook(p_aname);
+
+	if (!assembly) {
+		assembly = _load_assembly_search(p_name, p_aname, p_refonly, p_search_dirs);
+		if (!assembly) {
+			return nullptr;
+		}
+	}
+
+	GDMonoAssembly *loaded_asm = GDMono::get_singleton()->get_loaded_assembly(p_name);
+	ERR_FAIL_NULL_V_MSG(loaded_asm, nullptr, "Loaded assembly missing from table. Did we not receive the load hook?");
+	ERR_FAIL_COND_V(loaded_asm->get_assembly() != assembly, nullptr);
+
+	return loaded_asm;
 }
 
-GDMonoAssembly::GDMonoAssembly(const String &p_name, const String &p_path) {
+GDMonoAssembly *GDMonoAssembly::load_from(const String &p_name, const String &p_path, bool p_refonly) {
+	if (p_name == "mscorlib" || p_name == "mscorlib.dll") {
+		return GDMono::get_singleton()->get_corlib_assembly();
+	}
+
+	// We need to manually call the search hook in this case, as it won't be called in the next step
+	MonoAssemblyName *aname = mono_assembly_name_new(p_name.utf8());
+	MonoAssembly *assembly = mono_assembly_invoke_search_hook(aname);
+	mono_assembly_name_free(aname);
+	mono_free(aname);
+
+	if (!assembly) {
+		assembly = _real_load_assembly_from(p_path, p_refonly);
+		if (!assembly) {
+			return nullptr;
+		}
+	}
 
-	loaded = false;
-	gdobject_class_cache_updated = false;
-	name = p_name;
-	path = p_path;
-	refonly = false;
-	modified_time = 0;
-	assembly = NULL;
-	image = NULL;
+	GDMonoAssembly *loaded_asm = GDMono::get_singleton()->get_loaded_assembly(p_name);
+	ERR_FAIL_NULL_V_MSG(loaded_asm, nullptr, "Loaded assembly missing from table. Did we not receive the load hook?");
+
+	return loaded_asm;
 }
 
 GDMonoAssembly::~GDMonoAssembly() {
-
-	if (loaded)
+	if (image) {
 		unload();
+	}
 }
diff --git a/modules/mono/mono_gd/gd_mono_assembly.h b/modules/mono/mono_gd/gd_mono_assembly.h
index 4740e10339..63899dc9be 100644
--- a/modules/mono/mono_gd/gd_mono_assembly.h
+++ b/modules/mono/mono_gd/gd_mono_assembly.h
@@ -40,7 +40,6 @@
 #include "gd_mono_utils.h"
 
 class GDMonoAssembly {
-
 	struct ClassKey {
 		struct Hasher {
 			static _FORCE_INLINE_ uint32_t hash(const ClassKey &p_key) {
@@ -68,24 +67,20 @@ class GDMonoAssembly {
 		StringName class_name;
 	};
 
-	MonoAssembly *assembly;
+	String name;
 	MonoImage *image;
+	MonoAssembly *assembly;
 
-	bool refonly;
-	bool loaded;
+#ifdef GD_MONO_HOT_RELOAD
+	uint64_t modified_time = 0;
+#endif
 
-	String name;
-	String path;
-	uint64_t modified_time;
+	bool gdobject_class_cache_updated = false;
+	Map<StringName, GDMonoClass *> gdobject_class_cache;
 
 	HashMap<ClassKey, GDMonoClass *, ClassKey::Hasher> cached_classes;
 	Map<MonoClass *, GDMonoClass *> cached_raw;
 
-	bool gdobject_class_cache_updated;
-	Map<StringName, GDMonoClass *> gdobject_class_cache;
-
-	static bool no_search;
-	static bool in_preload;
 	static Vector<String> search_dirs;
 
 	static void assembly_load_hook(MonoAssembly *assembly, void *user_data);
@@ -97,25 +92,24 @@ class GDMonoAssembly {
 	static MonoAssembly *_search_hook(MonoAssemblyName *aname, void *user_data, bool refonly);
 	static MonoAssembly *_preload_hook(MonoAssemblyName *aname, char **assemblies_path, void *user_data, bool refonly);
 
-	static GDMonoAssembly *_load_assembly_from(const String &p_name, const String &p_path, bool p_refonly);
-	static GDMonoAssembly *_load_assembly_search(const String &p_name, const Vector<String> &p_search_dirs, bool p_refonly);
-	static void _wrap_mono_assembly(MonoAssembly *assembly);
+	static MonoAssembly *_real_load_assembly_from(const String &p_path, bool p_refonly, MonoAssemblyName *p_aname = nullptr);
+	static MonoAssembly *_load_assembly_search(const String &p_name, MonoAssemblyName *p_aname, bool p_refonly, const Vector<String> &p_search_dirs);
 
 	friend class GDMono;
 	static void initialize();
 
 public:
-	Error load(bool p_refonly);
-	Error wrapper_for_image(MonoImage *p_image);
 	void unload();
 
-	_FORCE_INLINE_ bool is_refonly() const { return refonly; }
-	_FORCE_INLINE_ bool is_loaded() const { return loaded; }
 	_FORCE_INLINE_ MonoImage *get_image() const { return image; }
 	_FORCE_INLINE_ MonoAssembly *get_assembly() const { return assembly; }
 	_FORCE_INLINE_ String get_name() const { return name; }
-	_FORCE_INLINE_ String get_path() const { return path; }
+
+#ifdef GD_MONO_HOT_RELOAD
 	_FORCE_INLINE_ uint64_t get_modified_time() const { return modified_time; }
+#endif
+
+	String get_path() const;
 
 	GDMonoClass *get_class(const StringName &p_namespace, const StringName &p_name);
 	GDMonoClass *get_class(MonoClass *p_mono_class);
@@ -125,10 +119,16 @@ public:
 	static String find_assembly(const String &p_name);
 
 	static void fill_search_dirs(Vector<String> &r_search_dirs, const String &p_custom_config = String(), const String &p_custom_bcl_dir = String());
+	static const Vector<String> &get_default_search_dirs() { return search_dirs; }
 
+	static GDMonoAssembly *load(const String &p_name, MonoAssemblyName *p_aname, bool p_refonly, const Vector<String> &p_search_dirs);
 	static GDMonoAssembly *load_from(const String &p_name, const String &p_path, bool p_refonly);
 
-	GDMonoAssembly(const String &p_name, const String &p_path = String());
+	GDMonoAssembly(const String &p_name, MonoImage *p_image, MonoAssembly *p_assembly) :
+			name(p_name),
+			image(p_image),
+			assembly(p_assembly) {
+	}
 	~GDMonoAssembly();
 };
 
diff --git a/modules/mono/mono_gd/gd_mono_cache.cpp b/modules/mono/mono_gd/gd_mono_cache.cpp
index f1f6524cd2..29aef6e609 100644
--- a/modules/mono/mono_gd/gd_mono_cache.cpp
+++ b/modules/mono/mono_gd/gd_mono_cache.cpp
@@ -40,11 +40,11 @@ namespace GDMonoCache {
 
 CachedData cached_data;
 
-#define CACHE_AND_CHECK(m_var, m_val)                                               \
-	{                                                                               \
-		CRASH_COND(m_var != NULL);                                                  \
-		m_var = m_val;                                                              \
-		ERR_FAIL_COND_MSG(m_var == NULL, "Mono Cache: Member " #m_var " is null."); \
+#define CACHE_AND_CHECK(m_var, m_val)                                                  \
+	{                                                                                  \
+		CRASH_COND(m_var != nullptr);                                                  \
+		m_var = m_val;                                                                 \
+		ERR_FAIL_COND_MSG(m_var == nullptr, "Mono Cache: Member " #m_var " is null."); \
 	}
 
 #define CACHE_CLASS_AND_CHECK(m_class, m_val) CACHE_AND_CHECK(cached_data.class_##m_class, m_val)
@@ -54,140 +54,143 @@ CachedData cached_data;
 #define CACHE_METHOD_AND_CHECK(m_class, m_method, m_val) CACHE_AND_CHECK(cached_data.method_##m_class##_##m_method, m_val)
 #define CACHE_PROPERTY_AND_CHECK(m_class, m_property, m_val) CACHE_AND_CHECK(cached_data.property_##m_class##_##m_property, m_val)
 
-#define CACHE_METHOD_THUNK_AND_CHECK_IMPL(m_var, m_val)                                        \
-	{                                                                                          \
-		CRASH_COND(!m_var.is_null());                                                          \
-		ERR_FAIL_COND_MSG(m_val == NULL, "Mono Cache: Method for member " #m_var " is null."); \
-		m_var.set_from_method(m_val);                                                          \
-		ERR_FAIL_COND_MSG(m_var.is_null(), "Mono Cache: Member " #m_var " is null.");          \
+#define CACHE_METHOD_THUNK_AND_CHECK_IMPL(m_var, m_val)                                           \
+	{                                                                                             \
+		CRASH_COND(!m_var.is_null());                                                             \
+		ERR_FAIL_COND_MSG(m_val == nullptr, "Mono Cache: Method for member " #m_var " is null."); \
+		m_var.set_from_method(m_val);                                                             \
+		ERR_FAIL_COND_MSG(m_var.is_null(), "Mono Cache: Member " #m_var " is null.");             \
 	}
 
 #define CACHE_METHOD_THUNK_AND_CHECK(m_class, m_method, m_val) CACHE_METHOD_THUNK_AND_CHECK_IMPL(cached_data.methodthunk_##m_class##_##m_method, m_val)
 
 void CachedData::clear_corlib_cache() {
-
 	corlib_cache_updated = false;
 
-	class_MonoObject = NULL;
-	class_bool = NULL;
-	class_int8_t = NULL;
-	class_int16_t = NULL;
-	class_int32_t = NULL;
-	class_int64_t = NULL;
-	class_uint8_t = NULL;
-	class_uint16_t = NULL;
-	class_uint32_t = NULL;
-	class_uint64_t = NULL;
-	class_float = NULL;
-	class_double = NULL;
-	class_String = NULL;
-	class_IntPtr = NULL;
-
-	class_System_Collections_IEnumerable = NULL;
-	class_System_Collections_IDictionary = NULL;
+	class_MonoObject = nullptr;
+	class_bool = nullptr;
+	class_int8_t = nullptr;
+	class_int16_t = nullptr;
+	class_int32_t = nullptr;
+	class_int64_t = nullptr;
+	class_uint8_t = nullptr;
+	class_uint16_t = nullptr;
+	class_uint32_t = nullptr;
+	class_uint64_t = nullptr;
+	class_float = nullptr;
+	class_double = nullptr;
+	class_String = nullptr;
+	class_IntPtr = nullptr;
+
+	class_System_Collections_IEnumerable = nullptr;
+	class_System_Collections_ICollection = nullptr;
+	class_System_Collections_IDictionary = nullptr;
 
 #ifdef DEBUG_ENABLED
-	class_System_Diagnostics_StackTrace = NULL;
+	class_System_Diagnostics_StackTrace = nullptr;
 	methodthunk_System_Diagnostics_StackTrace_GetFrames.nullify();
-	method_System_Diagnostics_StackTrace_ctor_bool = NULL;
-	method_System_Diagnostics_StackTrace_ctor_Exception_bool = NULL;
+	method_System_Diagnostics_StackTrace_ctor_bool = nullptr;
+	method_System_Diagnostics_StackTrace_ctor_Exception_bool = nullptr;
 #endif
 
-	class_KeyNotFoundException = NULL;
+	class_KeyNotFoundException = nullptr;
 }
 
 void CachedData::clear_godot_api_cache() {
-
 	godot_api_cache_updated = false;
 
-	rawclass_Dictionary = NULL;
-
-	class_Vector2 = NULL;
-	class_Rect2 = NULL;
-	class_Transform2D = NULL;
-	class_Vector3 = NULL;
-	class_Basis = NULL;
-	class_Quat = NULL;
-	class_Transform = NULL;
-	class_AABB = NULL;
-	class_Color = NULL;
-	class_Plane = NULL;
-	class_NodePath = NULL;
-	class_RID = NULL;
-	class_GodotObject = NULL;
-	class_GodotResource = NULL;
-	class_Node = NULL;
-	class_Control = NULL;
-	class_Spatial = NULL;
-	class_WeakRef = NULL;
-	class_Array = NULL;
-	class_Dictionary = NULL;
-	class_MarshalUtils = NULL;
-	class_ISerializationListener = NULL;
+	rawclass_Dictionary = nullptr;
+
+	class_Vector2 = nullptr;
+	class_Vector2i = nullptr;
+	class_Rect2 = nullptr;
+	class_Rect2i = nullptr;
+	class_Transform2D = nullptr;
+	class_Vector3 = nullptr;
+	class_Vector3i = nullptr;
+	class_Basis = nullptr;
+	class_Quat = nullptr;
+	class_Transform = nullptr;
+	class_AABB = nullptr;
+	class_Color = nullptr;
+	class_Plane = nullptr;
+	class_StringName = nullptr;
+	class_NodePath = nullptr;
+	class_RID = nullptr;
+	class_GodotObject = nullptr;
+	class_GodotResource = nullptr;
+	class_Node = nullptr;
+	class_Control = nullptr;
+	class_Node3D = nullptr;
+	class_WeakRef = nullptr;
+	class_Callable = nullptr;
+	class_SignalInfo = nullptr;
+	class_Array = nullptr;
+	class_Dictionary = nullptr;
+	class_MarshalUtils = nullptr;
+	class_ISerializationListener = nullptr;
 
 #ifdef DEBUG_ENABLED
-	class_DebuggingUtils = NULL;
+	class_DebuggingUtils = nullptr;
 	methodthunk_DebuggingUtils_GetStackFrameInfo.nullify();
 #endif
 
-	class_ExportAttribute = NULL;
-	field_ExportAttribute_hint = NULL;
-	field_ExportAttribute_hintString = NULL;
-	class_SignalAttribute = NULL;
-	class_ToolAttribute = NULL;
-	class_RemoteAttribute = NULL;
-	class_SyncAttribute = NULL;
-	class_MasterAttribute = NULL;
-	class_PuppetAttribute = NULL;
-	class_SlaveAttribute = NULL;
-	class_RemoteSyncAttribute = NULL;
-	class_MasterSyncAttribute = NULL;
-	class_PuppetSyncAttribute = NULL;
-	class_GodotMethodAttribute = NULL;
-	field_GodotMethodAttribute_methodName = NULL;
-
-	field_GodotObject_ptr = NULL;
-	field_NodePath_ptr = NULL;
-	field_Image_ptr = NULL;
-	field_RID_ptr = NULL;
+	class_ExportAttribute = nullptr;
+	field_ExportAttribute_hint = nullptr;
+	field_ExportAttribute_hintString = nullptr;
+	class_SignalAttribute = nullptr;
+	class_ToolAttribute = nullptr;
+	class_RemoteAttribute = nullptr;
+	class_MasterAttribute = nullptr;
+	class_PuppetAttribute = nullptr;
+	class_RemoteSyncAttribute = nullptr;
+	class_MasterSyncAttribute = nullptr;
+	class_PuppetSyncAttribute = nullptr;
+	class_GodotMethodAttribute = nullptr;
+	field_GodotMethodAttribute_methodName = nullptr;
+
+	field_GodotObject_ptr = nullptr;
+	field_StringName_ptr = nullptr;
+	field_NodePath_ptr = nullptr;
+	field_Image_ptr = nullptr;
+	field_RID_ptr = nullptr;
 
 	methodthunk_GodotObject_Dispose.nullify();
 	methodthunk_Array_GetPtr.nullify();
 	methodthunk_Dictionary_GetPtr.nullify();
 	methodthunk_SignalAwaiter_SignalCallback.nullify();
-	methodthunk_SignalAwaiter_FailureCallback.nullify();
 	methodthunk_GodotTaskScheduler_Activate.nullify();
 
+	methodthunk_Delegate_Equals.nullify();
+
+	methodthunk_DelegateUtils_TrySerializeDelegate.nullify();
+	methodthunk_DelegateUtils_TryDeserializeDelegate.nullify();
+
 	// Start of MarshalUtils methods
 
 	methodthunk_MarshalUtils_TypeIsGenericArray.nullify();
 	methodthunk_MarshalUtils_TypeIsGenericDictionary.nullify();
+	methodthunk_MarshalUtils_TypeIsSystemGenericList.nullify();
+	methodthunk_MarshalUtils_TypeIsSystemGenericDictionary.nullify();
+	methodthunk_MarshalUtils_TypeIsGenericIEnumerable.nullify();
+	methodthunk_MarshalUtils_TypeIsGenericICollection.nullify();
+	methodthunk_MarshalUtils_TypeIsGenericIDictionary.nullify();
 
 	methodthunk_MarshalUtils_ArrayGetElementType.nullify();
 	methodthunk_MarshalUtils_DictionaryGetKeyValueTypes.nullify();
 
-	methodthunk_MarshalUtils_GenericIEnumerableIsAssignableFromType.nullify();
-	methodthunk_MarshalUtils_GenericIDictionaryIsAssignableFromType.nullify();
-	methodthunk_MarshalUtils_GenericIEnumerableIsAssignableFromType_with_info.nullify();
-	methodthunk_MarshalUtils_GenericIDictionaryIsAssignableFromType_with_info.nullify();
-
 	methodthunk_MarshalUtils_MakeGenericArrayType.nullify();
 	methodthunk_MarshalUtils_MakeGenericDictionaryType.nullify();
 
-	methodthunk_MarshalUtils_EnumerableToArray.nullify();
-	methodthunk_MarshalUtils_IDictionaryToDictionary.nullify();
-	methodthunk_MarshalUtils_GenericIDictionaryToDictionary.nullify();
-
 	// End of MarshalUtils methods
 
-	task_scheduler_handle = Ref<MonoGCHandle>();
+	task_scheduler_handle = Ref<MonoGCHandleRef>();
 }
 
 #define GODOT_API_CLASS(m_class) (GDMono::get_singleton()->get_core_api_assembly()->get_class(BINDINGS_NAMESPACE, #m_class))
 #define GODOT_API_NS_CLASS(m_ns, m_class) (GDMono::get_singleton()->get_core_api_assembly()->get_class(m_ns, #m_class))
 
 void update_corlib_cache() {
-
 	CACHE_CLASS_AND_CHECK(MonoObject, GDMono::get_singleton()->get_corlib_assembly()->get_class(mono_get_object_class()));
 	CACHE_CLASS_AND_CHECK(bool, GDMono::get_singleton()->get_corlib_assembly()->get_class(mono_get_boolean_class()));
 	CACHE_CLASS_AND_CHECK(int8_t, GDMono::get_singleton()->get_corlib_assembly()->get_class(mono_get_sbyte_class()));
@@ -204,6 +207,7 @@ void update_corlib_cache() {
 	CACHE_CLASS_AND_CHECK(IntPtr, GDMono::get_singleton()->get_corlib_assembly()->get_class(mono_get_intptr_class()));
 
 	CACHE_CLASS_AND_CHECK(System_Collections_IEnumerable, GDMono::get_singleton()->get_corlib_assembly()->get_class("System.Collections", "IEnumerable"));
+	CACHE_CLASS_AND_CHECK(System_Collections_ICollection, GDMono::get_singleton()->get_corlib_assembly()->get_class("System.Collections", "ICollection"));
 	CACHE_CLASS_AND_CHECK(System_Collections_IDictionary, GDMono::get_singleton()->get_corlib_assembly()->get_class("System.Collections", "IDictionary"));
 
 #ifdef DEBUG_ENABLED
@@ -213,31 +217,38 @@ void update_corlib_cache() {
 	CACHE_METHOD_AND_CHECK(System_Diagnostics_StackTrace, ctor_Exception_bool, CACHED_CLASS(System_Diagnostics_StackTrace)->get_method_with_desc("System.Diagnostics.StackTrace:.ctor(System.Exception,bool)", true));
 #endif
 
+	CACHE_METHOD_THUNK_AND_CHECK(Delegate, Equals, GDMono::get_singleton()->get_corlib_assembly()->get_class("System", "Delegate")->get_method_with_desc("System.Delegate:Equals(object)", true));
+
 	CACHE_CLASS_AND_CHECK(KeyNotFoundException, GDMono::get_singleton()->get_corlib_assembly()->get_class("System.Collections.Generic", "KeyNotFoundException"));
 
 	cached_data.corlib_cache_updated = true;
 }
 
 void update_godot_api_cache() {
-
 	CACHE_CLASS_AND_CHECK(Vector2, GODOT_API_CLASS(Vector2));
+	CACHE_CLASS_AND_CHECK(Vector2i, GODOT_API_CLASS(Vector2i));
 	CACHE_CLASS_AND_CHECK(Rect2, GODOT_API_CLASS(Rect2));
+	CACHE_CLASS_AND_CHECK(Rect2i, GODOT_API_CLASS(Rect2i));
 	CACHE_CLASS_AND_CHECK(Transform2D, GODOT_API_CLASS(Transform2D));
 	CACHE_CLASS_AND_CHECK(Vector3, GODOT_API_CLASS(Vector3));
+	CACHE_CLASS_AND_CHECK(Vector3i, GODOT_API_CLASS(Vector3i));
 	CACHE_CLASS_AND_CHECK(Basis, GODOT_API_CLASS(Basis));
 	CACHE_CLASS_AND_CHECK(Quat, GODOT_API_CLASS(Quat));
 	CACHE_CLASS_AND_CHECK(Transform, GODOT_API_CLASS(Transform));
 	CACHE_CLASS_AND_CHECK(AABB, GODOT_API_CLASS(AABB));
 	CACHE_CLASS_AND_CHECK(Color, GODOT_API_CLASS(Color));
 	CACHE_CLASS_AND_CHECK(Plane, GODOT_API_CLASS(Plane));
+	CACHE_CLASS_AND_CHECK(StringName, GODOT_API_CLASS(StringName));
 	CACHE_CLASS_AND_CHECK(NodePath, GODOT_API_CLASS(NodePath));
 	CACHE_CLASS_AND_CHECK(RID, GODOT_API_CLASS(RID));
 	CACHE_CLASS_AND_CHECK(GodotObject, GODOT_API_CLASS(Object));
 	CACHE_CLASS_AND_CHECK(GodotResource, GODOT_API_CLASS(Resource));
 	CACHE_CLASS_AND_CHECK(Node, GODOT_API_CLASS(Node));
 	CACHE_CLASS_AND_CHECK(Control, GODOT_API_CLASS(Control));
-	CACHE_CLASS_AND_CHECK(Spatial, GODOT_API_CLASS(Spatial));
+	CACHE_CLASS_AND_CHECK(Node3D, GODOT_API_CLASS(Node3D));
 	CACHE_CLASS_AND_CHECK(WeakRef, GODOT_API_CLASS(WeakRef));
+	CACHE_CLASS_AND_CHECK(Callable, GODOT_API_CLASS(Callable));
+	CACHE_CLASS_AND_CHECK(SignalInfo, GODOT_API_CLASS(SignalInfo));
 	CACHE_CLASS_AND_CHECK(Array, GODOT_API_NS_CLASS(BINDINGS_NAMESPACE_COLLECTIONS, Array));
 	CACHE_CLASS_AND_CHECK(Dictionary, GODOT_API_NS_CLASS(BINDINGS_NAMESPACE_COLLECTIONS, Dictionary));
 	CACHE_CLASS_AND_CHECK(MarshalUtils, GODOT_API_CLASS(MarshalUtils));
@@ -254,10 +265,8 @@ void update_godot_api_cache() {
 	CACHE_CLASS_AND_CHECK(SignalAttribute, GODOT_API_CLASS(SignalAttribute));
 	CACHE_CLASS_AND_CHECK(ToolAttribute, GODOT_API_CLASS(ToolAttribute));
 	CACHE_CLASS_AND_CHECK(RemoteAttribute, GODOT_API_CLASS(RemoteAttribute));
-	CACHE_CLASS_AND_CHECK(SyncAttribute, GODOT_API_CLASS(SyncAttribute));
 	CACHE_CLASS_AND_CHECK(MasterAttribute, GODOT_API_CLASS(MasterAttribute));
 	CACHE_CLASS_AND_CHECK(PuppetAttribute, GODOT_API_CLASS(PuppetAttribute));
-	CACHE_CLASS_AND_CHECK(SlaveAttribute, GODOT_API_CLASS(SlaveAttribute));
 	CACHE_CLASS_AND_CHECK(RemoteSyncAttribute, GODOT_API_CLASS(RemoteSyncAttribute));
 	CACHE_CLASS_AND_CHECK(MasterSyncAttribute, GODOT_API_CLASS(MasterSyncAttribute));
 	CACHE_CLASS_AND_CHECK(PuppetSyncAttribute, GODOT_API_CLASS(PuppetSyncAttribute));
@@ -265,6 +274,7 @@ void update_godot_api_cache() {
 	CACHE_FIELD_AND_CHECK(GodotMethodAttribute, methodName, CACHED_CLASS(GodotMethodAttribute)->get_field("methodName"));
 
 	CACHE_FIELD_AND_CHECK(GodotObject, ptr, CACHED_CLASS(GodotObject)->get_field(BINDINGS_PTR_FIELD));
+	CACHE_FIELD_AND_CHECK(StringName, ptr, CACHED_CLASS(StringName)->get_field(BINDINGS_PTR_FIELD));
 	CACHE_FIELD_AND_CHECK(NodePath, ptr, CACHED_CLASS(NodePath)->get_field(BINDINGS_PTR_FIELD));
 	CACHE_FIELD_AND_CHECK(RID, ptr, CACHED_CLASS(RID)->get_field(BINDINGS_PTR_FIELD));
 
@@ -272,29 +282,27 @@ void update_godot_api_cache() {
 	CACHE_METHOD_THUNK_AND_CHECK(Array, GetPtr, GODOT_API_NS_CLASS(BINDINGS_NAMESPACE_COLLECTIONS, Array)->get_method("GetPtr", 0));
 	CACHE_METHOD_THUNK_AND_CHECK(Dictionary, GetPtr, GODOT_API_NS_CLASS(BINDINGS_NAMESPACE_COLLECTIONS, Dictionary)->get_method("GetPtr", 0));
 	CACHE_METHOD_THUNK_AND_CHECK(SignalAwaiter, SignalCallback, GODOT_API_CLASS(SignalAwaiter)->get_method("SignalCallback", 1));
-	CACHE_METHOD_THUNK_AND_CHECK(SignalAwaiter, FailureCallback, GODOT_API_CLASS(SignalAwaiter)->get_method("FailureCallback", 0));
 	CACHE_METHOD_THUNK_AND_CHECK(GodotTaskScheduler, Activate, GODOT_API_CLASS(GodotTaskScheduler)->get_method("Activate", 0));
 
+	CACHE_METHOD_THUNK_AND_CHECK(DelegateUtils, TrySerializeDelegate, GODOT_API_CLASS(DelegateUtils)->get_method("TrySerializeDelegate", 2));
+	CACHE_METHOD_THUNK_AND_CHECK(DelegateUtils, TryDeserializeDelegate, GODOT_API_CLASS(DelegateUtils)->get_method("TryDeserializeDelegate", 2));
+
 	// Start of MarshalUtils methods
 
 	CACHE_METHOD_THUNK_AND_CHECK(MarshalUtils, TypeIsGenericArray, GODOT_API_CLASS(MarshalUtils)->get_method("TypeIsGenericArray", 1));
 	CACHE_METHOD_THUNK_AND_CHECK(MarshalUtils, TypeIsGenericDictionary, GODOT_API_CLASS(MarshalUtils)->get_method("TypeIsGenericDictionary", 1));
+	CACHE_METHOD_THUNK_AND_CHECK(MarshalUtils, TypeIsSystemGenericList, GODOT_API_CLASS(MarshalUtils)->get_method("TypeIsSystemGenericList", 1));
+	CACHE_METHOD_THUNK_AND_CHECK(MarshalUtils, TypeIsSystemGenericDictionary, GODOT_API_CLASS(MarshalUtils)->get_method("TypeIsSystemGenericDictionary", 1));
+	CACHE_METHOD_THUNK_AND_CHECK(MarshalUtils, TypeIsGenericIEnumerable, GODOT_API_CLASS(MarshalUtils)->get_method("TypeIsGenericIEnumerable", 1));
+	CACHE_METHOD_THUNK_AND_CHECK(MarshalUtils, TypeIsGenericICollection, GODOT_API_CLASS(MarshalUtils)->get_method("TypeIsGenericICollection", 1));
+	CACHE_METHOD_THUNK_AND_CHECK(MarshalUtils, TypeIsGenericIDictionary, GODOT_API_CLASS(MarshalUtils)->get_method("TypeIsGenericIDictionary", 1));
 
 	CACHE_METHOD_THUNK_AND_CHECK(MarshalUtils, ArrayGetElementType, GODOT_API_CLASS(MarshalUtils)->get_method("ArrayGetElementType", 2));
 	CACHE_METHOD_THUNK_AND_CHECK(MarshalUtils, DictionaryGetKeyValueTypes, GODOT_API_CLASS(MarshalUtils)->get_method("DictionaryGetKeyValueTypes", 3));
 
-	CACHE_METHOD_THUNK_AND_CHECK(MarshalUtils, GenericIEnumerableIsAssignableFromType, GODOT_API_CLASS(MarshalUtils)->get_method("GenericIEnumerableIsAssignableFromType", 1));
-	CACHE_METHOD_THUNK_AND_CHECK(MarshalUtils, GenericIDictionaryIsAssignableFromType, GODOT_API_CLASS(MarshalUtils)->get_method("GenericIDictionaryIsAssignableFromType", 1));
-	CACHE_METHOD_THUNK_AND_CHECK(MarshalUtils, GenericIEnumerableIsAssignableFromType_with_info, GODOT_API_CLASS(MarshalUtils)->get_method("GenericIEnumerableIsAssignableFromType", 2));
-	CACHE_METHOD_THUNK_AND_CHECK(MarshalUtils, GenericIDictionaryIsAssignableFromType_with_info, GODOT_API_CLASS(MarshalUtils)->get_method("GenericIDictionaryIsAssignableFromType", 3));
-
 	CACHE_METHOD_THUNK_AND_CHECK(MarshalUtils, MakeGenericArrayType, GODOT_API_CLASS(MarshalUtils)->get_method("MakeGenericArrayType", 1));
 	CACHE_METHOD_THUNK_AND_CHECK(MarshalUtils, MakeGenericDictionaryType, GODOT_API_CLASS(MarshalUtils)->get_method("MakeGenericDictionaryType", 2));
 
-	CACHE_METHOD_THUNK_AND_CHECK(MarshalUtils, EnumerableToArray, GODOT_API_CLASS(MarshalUtils)->get_method("EnumerableToArray", 2));
-	CACHE_METHOD_THUNK_AND_CHECK(MarshalUtils, IDictionaryToDictionary, GODOT_API_CLASS(MarshalUtils)->get_method("IDictionaryToDictionary", 2));
-	CACHE_METHOD_THUNK_AND_CHECK(MarshalUtils, GenericIDictionaryToDictionary, GODOT_API_CLASS(MarshalUtils)->get_method("GenericIDictionaryToDictionary", 2));
-
 	// End of MarshalUtils methods
 
 #ifdef DEBUG_ENABLED
@@ -304,7 +312,7 @@ void update_godot_api_cache() {
 	// TODO Move to CSharpLanguage::init() and do handle disposal
 	MonoObject *task_scheduler = mono_object_new(mono_domain_get(), GODOT_API_CLASS(GodotTaskScheduler)->get_mono_ptr());
 	GDMonoUtils::runtime_object_init(task_scheduler, GODOT_API_CLASS(GodotTaskScheduler));
-	cached_data.task_scheduler_handle = MonoGCHandle::create_strong(task_scheduler);
+	cached_data.task_scheduler_handle = MonoGCHandleRef::create_strong(task_scheduler);
 
 	cached_data.godot_api_cache_updated = true;
 }
diff --git a/modules/mono/mono_gd/gd_mono_cache.h b/modules/mono/mono_gd/gd_mono_cache.h
index 1dc6b70479..a7bbc763a7 100644
--- a/modules/mono/mono_gd/gd_mono_cache.h
+++ b/modules/mono/mono_gd/gd_mono_cache.h
@@ -37,7 +37,6 @@
 namespace GDMonoCache {
 
 struct CachedData {
-
 	// -----------------------------------------------
 	// corlib classes
 
@@ -58,6 +57,7 @@ struct CachedData {
 	GDMonoClass *class_IntPtr; // System.IntPtr
 
 	GDMonoClass *class_System_Collections_IEnumerable;
+	GDMonoClass *class_System_Collections_ICollection;
 	GDMonoClass *class_System_Collections_IDictionary;
 
 #ifdef DEBUG_ENABLED
@@ -73,23 +73,29 @@ struct CachedData {
 	// -----------------------------------------------
 
 	GDMonoClass *class_Vector2;
+	GDMonoClass *class_Vector2i;
 	GDMonoClass *class_Rect2;
+	GDMonoClass *class_Rect2i;
 	GDMonoClass *class_Transform2D;
 	GDMonoClass *class_Vector3;
+	GDMonoClass *class_Vector3i;
 	GDMonoClass *class_Basis;
 	GDMonoClass *class_Quat;
 	GDMonoClass *class_Transform;
 	GDMonoClass *class_AABB;
 	GDMonoClass *class_Color;
 	GDMonoClass *class_Plane;
+	GDMonoClass *class_StringName;
 	GDMonoClass *class_NodePath;
 	GDMonoClass *class_RID;
 	GDMonoClass *class_GodotObject;
 	GDMonoClass *class_GodotResource;
 	GDMonoClass *class_Node;
 	GDMonoClass *class_Control;
-	GDMonoClass *class_Spatial;
+	GDMonoClass *class_Node3D;
 	GDMonoClass *class_WeakRef;
+	GDMonoClass *class_Callable;
+	GDMonoClass *class_SignalInfo;
 	GDMonoClass *class_Array;
 	GDMonoClass *class_Dictionary;
 	GDMonoClass *class_MarshalUtils;
@@ -106,17 +112,16 @@ struct CachedData {
 	GDMonoClass *class_SignalAttribute;
 	GDMonoClass *class_ToolAttribute;
 	GDMonoClass *class_RemoteAttribute;
-	GDMonoClass *class_SyncAttribute;
+	GDMonoClass *class_MasterAttribute;
+	GDMonoClass *class_PuppetAttribute;
 	GDMonoClass *class_RemoteSyncAttribute;
 	GDMonoClass *class_MasterSyncAttribute;
 	GDMonoClass *class_PuppetSyncAttribute;
-	GDMonoClass *class_MasterAttribute;
-	GDMonoClass *class_PuppetAttribute;
-	GDMonoClass *class_SlaveAttribute;
 	GDMonoClass *class_GodotMethodAttribute;
 	GDMonoField *field_GodotMethodAttribute_methodName;
 
 	GDMonoField *field_GodotObject_ptr;
+	GDMonoField *field_StringName_ptr;
 	GDMonoField *field_NodePath_ptr;
 	GDMonoField *field_Image_ptr;
 	GDMonoField *field_RID_ptr;
@@ -125,32 +130,32 @@ struct CachedData {
 	GDMonoMethodThunkR<Array *, MonoObject *> methodthunk_Array_GetPtr;
 	GDMonoMethodThunkR<Dictionary *, MonoObject *> methodthunk_Dictionary_GetPtr;
 	GDMonoMethodThunk<MonoObject *, MonoArray *> methodthunk_SignalAwaiter_SignalCallback;
-	GDMonoMethodThunk<MonoObject *> methodthunk_SignalAwaiter_FailureCallback;
 	GDMonoMethodThunk<MonoObject *> methodthunk_GodotTaskScheduler_Activate;
 
+	GDMonoMethodThunkR<MonoBoolean, MonoObject *, MonoObject *> methodthunk_Delegate_Equals;
+
+	GDMonoMethodThunkR<MonoBoolean, MonoDelegate *, MonoObject *> methodthunk_DelegateUtils_TrySerializeDelegate;
+	GDMonoMethodThunkR<MonoBoolean, MonoObject *, MonoDelegate **> methodthunk_DelegateUtils_TryDeserializeDelegate;
+
 	// Start of MarshalUtils methods
 
 	GDMonoMethodThunkR<MonoBoolean, MonoReflectionType *> methodthunk_MarshalUtils_TypeIsGenericArray;
 	GDMonoMethodThunkR<MonoBoolean, MonoReflectionType *> methodthunk_MarshalUtils_TypeIsGenericDictionary;
+	GDMonoMethodThunkR<MonoBoolean, MonoReflectionType *> methodthunk_MarshalUtils_TypeIsSystemGenericList;
+	GDMonoMethodThunkR<MonoBoolean, MonoReflectionType *> methodthunk_MarshalUtils_TypeIsSystemGenericDictionary;
+	GDMonoMethodThunkR<MonoBoolean, MonoReflectionType *> methodthunk_MarshalUtils_TypeIsGenericIEnumerable;
+	GDMonoMethodThunkR<MonoBoolean, MonoReflectionType *> methodthunk_MarshalUtils_TypeIsGenericICollection;
+	GDMonoMethodThunkR<MonoBoolean, MonoReflectionType *> methodthunk_MarshalUtils_TypeIsGenericIDictionary;
 
 	GDMonoMethodThunk<MonoReflectionType *, MonoReflectionType **> methodthunk_MarshalUtils_ArrayGetElementType;
 	GDMonoMethodThunk<MonoReflectionType *, MonoReflectionType **, MonoReflectionType **> methodthunk_MarshalUtils_DictionaryGetKeyValueTypes;
 
-	GDMonoMethodThunkR<MonoBoolean, MonoReflectionType *> methodthunk_MarshalUtils_GenericIEnumerableIsAssignableFromType;
-	GDMonoMethodThunkR<MonoBoolean, MonoReflectionType *> methodthunk_MarshalUtils_GenericIDictionaryIsAssignableFromType;
-	GDMonoMethodThunkR<MonoBoolean, MonoReflectionType *, MonoReflectionType **> methodthunk_MarshalUtils_GenericIEnumerableIsAssignableFromType_with_info;
-	GDMonoMethodThunkR<MonoBoolean, MonoReflectionType *, MonoReflectionType **, MonoReflectionType **> methodthunk_MarshalUtils_GenericIDictionaryIsAssignableFromType_with_info;
-
 	GDMonoMethodThunkR<MonoReflectionType *, MonoReflectionType *> methodthunk_MarshalUtils_MakeGenericArrayType;
 	GDMonoMethodThunkR<MonoReflectionType *, MonoReflectionType *, MonoReflectionType *> methodthunk_MarshalUtils_MakeGenericDictionaryType;
 
-	GDMonoMethodThunk<MonoObject *, Array *> methodthunk_MarshalUtils_EnumerableToArray;
-	GDMonoMethodThunk<MonoObject *, Dictionary *> methodthunk_MarshalUtils_IDictionaryToDictionary;
-	GDMonoMethodThunk<MonoObject *, Dictionary *> methodthunk_MarshalUtils_GenericIDictionaryToDictionary;
-
 	// End of MarshalUtils methods
 
-	Ref<MonoGCHandle> task_scheduler_handle;
+	Ref<MonoGCHandleRef> task_scheduler_handle;
 
 	bool corlib_cache_updated;
 	bool godot_api_cache_updated;
@@ -177,14 +182,6 @@ inline void clear_godot_api_cache() {
 	cached_data.clear_godot_api_cache();
 }
 
-_FORCE_INLINE_ bool tools_godot_api_check() {
-#ifdef TOOLS_ENABLED
-	return cached_data.godot_api_cache_updated;
-#else
-	return true; // Assume it's updated if this was called, otherwise it's a bug
-#endif
-}
-
 } // namespace GDMonoCache
 
 #define CACHED_CLASS(m_class) (GDMonoCache::cached_data.class_##m_class)
@@ -195,10 +192,4 @@ _FORCE_INLINE_ bool tools_godot_api_check() {
 #define CACHED_METHOD_THUNK(m_class, m_method) (GDMonoCache::cached_data.methodthunk_##m_class##_##m_method)
 #define CACHED_PROPERTY(m_class, m_property) (GDMonoCache::cached_data.property_##m_class##_##m_property)
 
-#ifdef REAL_T_IS_DOUBLE
-#define REAL_T_MONOCLASS CACHED_CLASS_RAW(double)
-#else
-#define REAL_T_MONOCLASS CACHED_CLASS_RAW(float)
-#endif
-
 #endif // GD_MONO_CACHE_H
diff --git a/modules/mono/mono_gd/gd_mono_class.cpp b/modules/mono/mono_gd/gd_mono_class.cpp
index 2132fd36f7..6575cbc1c8 100644
--- a/modules/mono/mono_gd/gd_mono_class.cpp
+++ b/modules/mono/mono_gd/gd_mono_class.cpp
@@ -31,6 +31,7 @@
 #include "gd_mono_class.h"
 
 #include <mono/metadata/attrdefs.h>
+#include <mono/metadata/debug-helpers.h>
 
 #include "gd_mono_assembly.h"
 #include "gd_mono_cache.h"
@@ -40,7 +41,7 @@ String GDMonoClass::get_full_name(MonoClass *p_mono_class) {
 	// mono_type_get_full_name is not exposed to embedders, but this seems to do the job
 	MonoReflectionType *type_obj = mono_type_get_object(mono_domain_get(), get_mono_type(p_mono_class));
 
-	MonoException *exc = NULL;
+	MonoException *exc = nullptr;
 	MonoString *str = GDMonoUtils::object_to_string((MonoObject *)type_obj, &exc);
 	UNHANDLED_EXCEPTION(exc);
 
@@ -55,7 +56,11 @@ String GDMonoClass::get_full_name() const {
 	return get_full_name(mono_class);
 }
 
-MonoType *GDMonoClass::get_mono_type() {
+String GDMonoClass::get_type_desc() const {
+	return GDMonoUtils::get_type_desc(get_mono_type());
+}
+
+MonoType *GDMonoClass::get_mono_type() const {
 	// Careful, you cannot compare two MonoType*.
 	// There is mono_metadata_type_equal, how is this different from comparing two MonoClass*?
 	return get_mono_type(mono_class);
@@ -74,27 +79,42 @@ bool GDMonoClass::is_assignable_from(GDMonoClass *p_from) const {
 	return mono_class_is_assignable_from(mono_class, p_from->mono_class);
 }
 
-GDMonoClass *GDMonoClass::get_parent_class() {
+StringName GDMonoClass::get_namespace() const {
+	GDMonoClass *nesting_class = get_nesting_class();
+	if (!nesting_class) {
+		return namespace_name;
+	}
+	return nesting_class->get_namespace();
+}
+
+String GDMonoClass::get_name_for_lookup() const {
+	GDMonoClass *nesting_class = get_nesting_class();
+	if (!nesting_class) {
+		return class_name;
+	}
+	return nesting_class->get_name_for_lookup() + "/" + class_name;
+}
+
+GDMonoClass *GDMonoClass::get_parent_class() const {
 	MonoClass *parent_mono_class = mono_class_get_parent(mono_class);
-	return parent_mono_class ? GDMono::get_singleton()->get_class(parent_mono_class) : NULL;
+	return parent_mono_class ? GDMono::get_singleton()->get_class(parent_mono_class) : nullptr;
 }
 
-GDMonoClass *GDMonoClass::get_nesting_class() {
+GDMonoClass *GDMonoClass::get_nesting_class() const {
 	MonoClass *nesting_type = mono_class_get_nesting_type(mono_class);
-	return nesting_type ? GDMono::get_singleton()->get_class(nesting_type) : NULL;
+	return nesting_type ? GDMono::get_singleton()->get_class(nesting_type) : nullptr;
 }
 
 #ifdef TOOLS_ENABLED
 Vector<MonoClassField *> GDMonoClass::get_enum_fields() {
-
 	bool class_is_enum = mono_class_is_enum(mono_class);
 	ERR_FAIL_COND_V(!class_is_enum, Vector<MonoClassField *>());
 
 	Vector<MonoClassField *> enum_fields;
 
-	void *iter = NULL;
-	MonoClassField *raw_field = NULL;
-	while ((raw_field = mono_class_get_fields(get_mono_ptr(), &iter)) != NULL) {
+	void *iter = nullptr;
+	MonoClassField *raw_field = nullptr;
+	while ((raw_field = mono_class_get_fields(get_mono_ptr(), &iter)) != nullptr) {
 		uint32_t field_flags = mono_field_get_flags(raw_field);
 
 		// Enums have an instance field named value__ which holds the value of the enum.
@@ -109,53 +129,54 @@ Vector<MonoClassField *> GDMonoClass::get_enum_fields() {
 #endif
 
 bool GDMonoClass::has_attribute(GDMonoClass *p_attr_class) {
-
 #ifdef DEBUG_ENABLED
 	ERR_FAIL_NULL_V(p_attr_class, false);
 #endif
 
-	if (!attrs_fetched)
+	if (!attrs_fetched) {
 		fetch_attributes();
+	}
 
-	if (!attributes)
+	if (!attributes) {
 		return false;
+	}
 
 	return mono_custom_attrs_has_attr(attributes, p_attr_class->get_mono_ptr());
 }
 
 MonoObject *GDMonoClass::get_attribute(GDMonoClass *p_attr_class) {
-
 #ifdef DEBUG_ENABLED
-	ERR_FAIL_NULL_V(p_attr_class, NULL);
+	ERR_FAIL_NULL_V(p_attr_class, nullptr);
 #endif
 
-	if (!attrs_fetched)
+	if (!attrs_fetched) {
 		fetch_attributes();
+	}
 
-	if (!attributes)
-		return NULL;
+	if (!attributes) {
+		return nullptr;
+	}
 
 	return mono_custom_attrs_get_attr(attributes, p_attr_class->get_mono_ptr());
 }
 
 void GDMonoClass::fetch_attributes() {
-
-	ERR_FAIL_COND(attributes != NULL);
+	ERR_FAIL_COND(attributes != nullptr);
 
 	attributes = mono_custom_attrs_from_class(get_mono_ptr());
 	attrs_fetched = true;
 }
 
 void GDMonoClass::fetch_methods_with_godot_api_checks(GDMonoClass *p_native_base) {
-
 	CRASH_COND(!CACHED_CLASS(GodotObject)->is_assignable_from(this));
 
-	if (methods_fetched)
+	if (methods_fetched) {
 		return;
+	}
 
-	void *iter = NULL;
-	MonoMethod *raw_method = NULL;
-	while ((raw_method = mono_class_get_methods(get_mono_ptr(), &iter)) != NULL) {
+	void *iter = nullptr;
+	MonoMethod *raw_method = nullptr;
+	while ((raw_method = mono_class_get_methods(get_mono_ptr(), &iter)) != nullptr) {
 		StringName name = mono_method_get_name(raw_method);
 
 		// get_method implicitly fetches methods and adds them to this->methods
@@ -163,11 +184,10 @@ void GDMonoClass::fetch_methods_with_godot_api_checks(GDMonoClass *p_native_base
 		ERR_CONTINUE(!method);
 
 		if (method->get_name() != name) {
-
 #ifdef DEBUG_ENABLED
 			String fullname = method->get_ret_type_full_name() + " " + name + "(" + method->get_signature_desc(true) + ")";
-			WARN_PRINTS("Method '" + fullname + "' is hidden by Godot API method. Should be '" +
-						method->get_full_name_no_class() + "'. In class '" + namespace_name + "." + class_name + "'.");
+			WARN_PRINT("Method '" + fullname + "' is hidden by Godot API method. Should be '" +
+					   method->get_full_name_no_class() + "'. In class '" + namespace_name + "." + class_name + "'.");
 #endif
 			continue;
 		}
@@ -177,7 +197,6 @@ void GDMonoClass::fetch_methods_with_godot_api_checks(GDMonoClass *p_native_base
 		// This allows us to warn the user here if he is using snake_case by mistake.
 
 		if (p_native_base != this) {
-
 			GDMonoClass *native_top = p_native_base;
 			while (native_top) {
 				GDMonoMethod *m = native_top->get_method(name, method->get_parameters_count());
@@ -185,23 +204,25 @@ void GDMonoClass::fetch_methods_with_godot_api_checks(GDMonoClass *p_native_base
 				if (m && m->get_name() != name) {
 					// found
 					String fullname = m->get_ret_type_full_name() + " " + name + "(" + m->get_signature_desc(true) + ")";
-					WARN_PRINTS("Method '" + fullname + "' should be '" + m->get_full_name_no_class() +
-								"'. In class '" + namespace_name + "." + class_name + "'.");
+					WARN_PRINT("Method '" + fullname + "' should be '" + m->get_full_name_no_class() +
+							   "'. In class '" + namespace_name + "." + class_name + "'.");
 					break;
 				}
 
-				if (native_top == CACHED_CLASS(GodotObject))
+				if (native_top == CACHED_CLASS(GodotObject)) {
 					break;
+				}
 
 				native_top = native_top->get_parent_class();
 			}
 		}
 #endif
 
-		uint32_t flags = mono_method_get_flags(method->mono_method, NULL);
+		uint32_t flags = mono_method_get_flags(method->mono_method, nullptr);
 
-		if (!(flags & MONO_METHOD_ATTR_VIRTUAL))
+		if (!(flags & MONO_METHOD_ATTR_VIRTUAL)) {
 			continue;
+		}
 
 		// Virtual method of Godot Object derived type, let's try to find GodotMethod attribute
 
@@ -223,15 +244,17 @@ void GDMonoClass::fetch_methods_with_godot_api_checks(GDMonoClass *p_native_base
 #endif
 				MethodKey key = MethodKey(godot_method_name, method->get_parameters_count());
 				GDMonoMethod **existing_method = methods.getptr(key);
-				if (existing_method)
+				if (existing_method) {
 					memdelete(*existing_method); // Must delete old one
+				}
 				methods.set(key, method);
 
 				break;
 			}
 
-			if (top == CACHED_CLASS(GodotObject))
+			if (top == CACHED_CLASS(GodotObject)) {
 				break;
+			}
 
 			top = top->get_parent_class();
 		}
@@ -241,40 +264,44 @@ void GDMonoClass::fetch_methods_with_godot_api_checks(GDMonoClass *p_native_base
 }
 
 GDMonoMethod *GDMonoClass::get_fetched_method_unknown_params(const StringName &p_name) {
+	ERR_FAIL_COND_V(!methods_fetched, nullptr);
 
-	ERR_FAIL_COND_V(!methods_fetched, NULL);
-
-	const MethodKey *k = NULL;
+	const MethodKey *k = nullptr;
 
 	while ((k = methods.next(k))) {
-		if (k->name == p_name)
+		if (k->name == p_name) {
 			return methods.get(*k);
+		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 bool GDMonoClass::has_fetched_method_unknown_params(const StringName &p_name) {
-
-	return get_fetched_method_unknown_params(p_name) != NULL;
+	return get_fetched_method_unknown_params(p_name) != nullptr;
 }
 
 bool GDMonoClass::implements_interface(GDMonoClass *p_interface) {
-
 	return mono_class_implements_interface(mono_class, p_interface->get_mono_ptr());
 }
 
-GDMonoMethod *GDMonoClass::get_method(const StringName &p_name, int p_params_count) {
+bool GDMonoClass::has_public_parameterless_ctor() {
+	GDMonoMethod *ctor = get_method(".ctor", 0);
+	return ctor && ctor->get_visibility() == IMonoClassMember::PUBLIC;
+}
 
+GDMonoMethod *GDMonoClass::get_method(const StringName &p_name, int p_params_count) {
 	MethodKey key = MethodKey(p_name, p_params_count);
 
 	GDMonoMethod **match = methods.getptr(key);
 
-	if (match)
+	if (match) {
 		return *match;
+	}
 
-	if (methods_fetched)
-		return NULL;
+	if (methods_fetched) {
+		return nullptr;
+	}
 
 	MonoMethod *raw_method = mono_class_get_method_from_name(mono_class, String(p_name).utf8().get_data(), p_params_count);
 
@@ -285,11 +312,10 @@ GDMonoMethod *GDMonoClass::get_method(const StringName &p_name, int p_params_cou
 		return method;
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 GDMonoMethod *GDMonoClass::get_method(MonoMethod *p_raw_method) {
-
 	MonoMethodSignature *sig = mono_method_signature(p_raw_method);
 
 	int params_count = mono_signature_get_param_count(sig);
@@ -299,22 +325,21 @@ GDMonoMethod *GDMonoClass::get_method(MonoMethod *p_raw_method) {
 }
 
 GDMonoMethod *GDMonoClass::get_method(MonoMethod *p_raw_method, const StringName &p_name) {
-
 	MonoMethodSignature *sig = mono_method_signature(p_raw_method);
 	int params_count = mono_signature_get_param_count(sig);
 	return get_method(p_raw_method, p_name, params_count);
 }
 
 GDMonoMethod *GDMonoClass::get_method(MonoMethod *p_raw_method, const StringName &p_name, int p_params_count) {
-
-	ERR_FAIL_NULL_V(p_raw_method, NULL);
+	ERR_FAIL_NULL_V(p_raw_method, nullptr);
 
 	MethodKey key = MethodKey(p_name, p_params_count);
 
 	GDMonoMethod **match = methods.getptr(key);
 
-	if (match)
+	if (match) {
 		return *match;
+	}
 
 	GDMonoMethod *method = memnew(GDMonoMethod(p_name, p_raw_method));
 	methods.set(key, method);
@@ -323,25 +348,29 @@ GDMonoMethod *GDMonoClass::get_method(MonoMethod *p_raw_method, const StringName
 }
 
 GDMonoMethod *GDMonoClass::get_method_with_desc(const String &p_description, bool p_include_namespace) {
-
 	MonoMethodDesc *desc = mono_method_desc_new(p_description.utf8().get_data(), p_include_namespace);
 	MonoMethod *method = mono_method_desc_search_in_class(desc, mono_class);
 	mono_method_desc_free(desc);
 
-	ERR_FAIL_COND_V(mono_method_get_class(method) != mono_class, NULL);
+	if (!method) {
+		return nullptr;
+	}
+
+	ERR_FAIL_COND_V(mono_method_get_class(method) != mono_class, nullptr);
 
 	return get_method(method);
 }
 
 GDMonoField *GDMonoClass::get_field(const StringName &p_name) {
-
 	Map<StringName, GDMonoField *>::Element *result = fields.find(p_name);
 
-	if (result)
+	if (result) {
 		return result->value();
+	}
 
-	if (fields_fetched)
-		return NULL;
+	if (fields_fetched) {
+		return nullptr;
+	}
 
 	MonoClassField *raw_field = mono_class_get_field_from_name(mono_class, String(p_name).utf8().get_data());
 
@@ -352,17 +381,17 @@ GDMonoField *GDMonoClass::get_field(const StringName &p_name) {
 		return field;
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 const Vector<GDMonoField *> &GDMonoClass::get_all_fields() {
-
-	if (fields_fetched)
+	if (fields_fetched) {
 		return fields_list;
+	}
 
-	void *iter = NULL;
-	MonoClassField *raw_field = NULL;
-	while ((raw_field = mono_class_get_fields(mono_class, &iter)) != NULL) {
+	void *iter = nullptr;
+	MonoClassField *raw_field = nullptr;
+	while ((raw_field = mono_class_get_fields(mono_class, &iter)) != nullptr) {
 		StringName name = mono_field_get_name(raw_field);
 
 		Map<StringName, GDMonoField *>::Element *match = fields.find(name);
@@ -382,14 +411,15 @@ const Vector<GDMonoField *> &GDMonoClass::get_all_fields() {
 }
 
 GDMonoProperty *GDMonoClass::get_property(const StringName &p_name) {
-
 	Map<StringName, GDMonoProperty *>::Element *result = properties.find(p_name);
 
-	if (result)
+	if (result) {
 		return result->value();
+	}
 
-	if (properties_fetched)
-		return NULL;
+	if (properties_fetched) {
+		return nullptr;
+	}
 
 	MonoProperty *raw_property = mono_class_get_property_from_name(mono_class, String(p_name).utf8().get_data());
 
@@ -400,17 +430,17 @@ GDMonoProperty *GDMonoClass::get_property(const StringName &p_name) {
 		return property;
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 const Vector<GDMonoProperty *> &GDMonoClass::get_all_properties() {
-
-	if (properties_fetched)
+	if (properties_fetched) {
 		return properties_list;
+	}
 
-	void *iter = NULL;
-	MonoProperty *raw_property = NULL;
-	while ((raw_property = mono_class_get_properties(mono_class, &iter)) != NULL) {
+	void *iter = nullptr;
+	MonoProperty *raw_property = nullptr;
+	while ((raw_property = mono_class_get_properties(mono_class, &iter)) != nullptr) {
 		StringName name = mono_property_get_name(raw_property);
 
 		Map<StringName, GDMonoProperty *>::Element *match = properties.find(name);
@@ -430,12 +460,13 @@ const Vector<GDMonoProperty *> &GDMonoClass::get_all_properties() {
 }
 
 const Vector<GDMonoClass *> &GDMonoClass::get_all_delegates() {
-	if (delegates_fetched)
+	if (delegates_fetched) {
 		return delegates_list;
+	}
 
-	void *iter = NULL;
-	MonoClass *raw_class = NULL;
-	while ((raw_class = mono_class_get_nested_types(mono_class, &iter)) != NULL) {
+	void *iter = nullptr;
+	MonoClass *raw_class = nullptr;
+	while ((raw_class = mono_class_get_nested_types(mono_class, &iter)) != nullptr) {
 		if (mono_class_is_delegate(raw_class)) {
 			StringName name = mono_class_get_name(raw_class);
 
@@ -457,11 +488,10 @@ const Vector<GDMonoClass *> &GDMonoClass::get_all_delegates() {
 }
 
 const Vector<GDMonoMethod *> &GDMonoClass::get_all_methods() {
-
 	if (!method_list_fetched) {
-		void *iter = NULL;
-		MonoMethod *raw_method = NULL;
-		while ((raw_method = mono_class_get_methods(get_mono_ptr(), &iter)) != NULL) {
+		void *iter = nullptr;
+		MonoMethod *raw_method = nullptr;
+		while ((raw_method = mono_class_get_methods(get_mono_ptr(), &iter)) != nullptr) {
 			method_list.push_back(memnew(GDMonoMethod(mono_method_get_name(raw_method), raw_method)));
 		}
 
@@ -472,14 +502,13 @@ const Vector<GDMonoMethod *> &GDMonoClass::get_all_methods() {
 }
 
 GDMonoClass::GDMonoClass(const StringName &p_namespace, const StringName &p_name, MonoClass *p_class, GDMonoAssembly *p_assembly) {
-
 	namespace_name = p_namespace;
 	class_name = p_name;
 	mono_class = p_class;
 	assembly = p_assembly;
 
 	attrs_fetched = false;
-	attributes = NULL;
+	attributes = nullptr;
 
 	methods_fetched = false;
 	method_list_fetched = false;
@@ -489,7 +518,6 @@ GDMonoClass::GDMonoClass(const StringName &p_namespace, const StringName &p_name
 }
 
 GDMonoClass::~GDMonoClass() {
-
 	if (attributes) {
 		mono_custom_attrs_free(attributes);
 	}
@@ -512,7 +540,7 @@ GDMonoClass::~GDMonoClass() {
 		Vector<GDMonoMethod *> deleted_methods;
 		deleted_methods.resize(methods.size());
 
-		const MethodKey *k = NULL;
+		const MethodKey *k = nullptr;
 		while ((k = methods.next(k))) {
 			GDMonoMethod *method = methods.get(*k);
 
diff --git a/modules/mono/mono_gd/gd_mono_class.h b/modules/mono/mono_gd/gd_mono_class.h
index 0c9a8cdafe..44b146b87c 100644
--- a/modules/mono/mono_gd/gd_mono_class.h
+++ b/modules/mono/mono_gd/gd_mono_class.h
@@ -31,8 +31,6 @@
 #ifndef GD_MONO_CLASS_H
 #define GD_MONO_CLASS_H
 
-#include <mono/metadata/debug-helpers.h>
-
 #include "core/map.h"
 #include "core/ustring.h"
 
@@ -107,21 +105,23 @@ public:
 	static MonoType *get_mono_type(MonoClass *p_mono_class);
 
 	String get_full_name() const;
-	MonoType *get_mono_type();
+	String get_type_desc() const;
+	MonoType *get_mono_type() const;
 
 	uint32_t get_flags() const;
 	bool is_static() const;
 
 	bool is_assignable_from(GDMonoClass *p_from) const;
 
-	_FORCE_INLINE_ StringName get_namespace() const { return namespace_name; }
+	StringName get_namespace() const;
 	_FORCE_INLINE_ StringName get_name() const { return class_name; }
+	String get_name_for_lookup() const;
 
 	_FORCE_INLINE_ MonoClass *get_mono_ptr() const { return mono_class; }
 	_FORCE_INLINE_ const GDMonoAssembly *get_assembly() const { return assembly; }
 
-	GDMonoClass *get_parent_class();
-	GDMonoClass *get_nesting_class();
+	GDMonoClass *get_parent_class() const;
+	GDMonoClass *get_nesting_class() const;
 
 #ifdef TOOLS_ENABLED
 	Vector<MonoClassField *> get_enum_fields();
@@ -137,6 +137,7 @@ public:
 	void fetch_methods_with_godot_api_checks(GDMonoClass *p_native_base);
 
 	bool implements_interface(GDMonoClass *p_interface);
+	bool has_public_parameterless_ctor();
 
 	GDMonoMethod *get_method(const StringName &p_name, int p_params_count = 0);
 	GDMonoMethod *get_method(MonoMethod *p_raw_method);
diff --git a/modules/mono/mono_gd/gd_mono_field.cpp b/modules/mono/mono_gd/gd_mono_field.cpp
index 3e0f9a3f15..563c45e71f 100644
--- a/modules/mono/mono_gd/gd_mono_field.cpp
+++ b/modules/mono/mono_gd/gd_mono_field.cpp
@@ -37,6 +37,10 @@
 #include "gd_mono_marshal.h"
 #include "gd_mono_utils.h"
 
+void GDMonoField::set_value(MonoObject *p_object, MonoObject *p_value) {
+	mono_field_set_value(p_object, mono_field, p_value);
+}
+
 void GDMonoField::set_value_raw(MonoObject *p_object, void *p_ptr) {
 	mono_field_set_value(p_object, mono_field, &p_ptr);
 }
@@ -112,7 +116,7 @@ void GDMonoField::set_value_from_variant(MonoObject *p_object, const Variant &p_
 		case MONO_TYPE_STRING: {
 			if (p_value.get_type() == Variant::NIL) {
 				// Otherwise, Variant -> String would return the string "Null"
-				MonoString *mono_string = NULL;
+				MonoString *mono_string = nullptr;
 				mono_field_set_value(p_object, mono_field, mono_string);
 			} else {
 				MonoString *mono_string = GDMonoMarshal::mono_string_from_godot(p_value);
@@ -128,11 +132,21 @@ void GDMonoField::set_value_from_variant(MonoObject *p_object, const Variant &p_
 				break;
 			}
 
+			if (tclass == CACHED_CLASS(Vector2i)) {
+				SET_FROM_STRUCT(Vector2i);
+				break;
+			}
+
 			if (tclass == CACHED_CLASS(Rect2)) {
 				SET_FROM_STRUCT(Rect2);
 				break;
 			}
 
+			if (tclass == CACHED_CLASS(Rect2i)) {
+				SET_FROM_STRUCT(Rect2i);
+				break;
+			}
+
 			if (tclass == CACHED_CLASS(Transform2D)) {
 				SET_FROM_STRUCT(Transform2D);
 				break;
@@ -143,6 +157,11 @@ void GDMonoField::set_value_from_variant(MonoObject *p_object, const Variant &p_
 				break;
 			}
 
+			if (tclass == CACHED_CLASS(Vector3i)) {
+				SET_FROM_STRUCT(Vector3i);
+				break;
+			}
+
 			if (tclass == CACHED_CLASS(Basis)) {
 				SET_FROM_STRUCT(Basis);
 				break;
@@ -173,6 +192,18 @@ void GDMonoField::set_value_from_variant(MonoObject *p_object, const Variant &p_
 				break;
 			}
 
+			if (tclass == CACHED_CLASS(Callable)) {
+				GDMonoMarshal::M_Callable val = GDMonoMarshal::callable_to_managed(p_value.operator Callable());
+				mono_field_set_value(p_object, mono_field, &val);
+				break;
+			}
+
+			if (tclass == CACHED_CLASS(SignalInfo)) {
+				GDMonoMarshal::M_SignalInfo val = GDMonoMarshal::signal_info_to_managed(p_value.operator Signal());
+				mono_field_set_value(p_object, mono_field, &val);
+				break;
+			}
+
 			if (mono_class_is_enum(tclass->get_mono_ptr())) {
 				MonoType *enum_basetype = mono_class_enum_basetype(tclass->get_mono_ptr());
 				switch (mono_type_get_type(enum_basetype)) {
@@ -247,37 +278,54 @@ void GDMonoField::set_value_from_variant(MonoObject *p_object, const Variant &p_
 			}
 
 			if (array_type->eklass == CACHED_CLASS_RAW(uint8_t)) {
-				SET_FROM_ARRAY(PoolByteArray);
+				SET_FROM_ARRAY(PackedByteArray);
 				break;
 			}
 
 			if (array_type->eklass == CACHED_CLASS_RAW(int32_t)) {
-				SET_FROM_ARRAY(PoolIntArray);
+				SET_FROM_ARRAY(PackedInt32Array);
 				break;
 			}
 
-			if (array_type->eklass == REAL_T_MONOCLASS) {
-				SET_FROM_ARRAY(PoolRealArray);
+			if (array_type->eklass == CACHED_CLASS_RAW(int64_t)) {
+				SET_FROM_ARRAY(PackedInt64Array);
+				break;
+			}
+
+			if (array_type->eklass == CACHED_CLASS_RAW(float)) {
+				SET_FROM_ARRAY(PackedFloat32Array);
+				break;
+			}
+
+			if (array_type->eklass == CACHED_CLASS_RAW(double)) {
+				SET_FROM_ARRAY(PackedFloat64Array);
 				break;
 			}
 
 			if (array_type->eklass == CACHED_CLASS_RAW(String)) {
-				SET_FROM_ARRAY(PoolStringArray);
+				SET_FROM_ARRAY(PackedStringArray);
 				break;
 			}
 
 			if (array_type->eklass == CACHED_CLASS_RAW(Vector2)) {
-				SET_FROM_ARRAY(PoolVector2Array);
+				SET_FROM_ARRAY(PackedVector2Array);
 				break;
 			}
 
 			if (array_type->eklass == CACHED_CLASS_RAW(Vector3)) {
-				SET_FROM_ARRAY(PoolVector3Array);
+				SET_FROM_ARRAY(PackedVector3Array);
 				break;
 			}
 
 			if (array_type->eklass == CACHED_CLASS_RAW(Color)) {
-				SET_FROM_ARRAY(PoolColorArray);
+				SET_FROM_ARRAY(PackedColorArray);
+				break;
+			}
+
+			GDMonoClass *array_type_class = GDMono::get_singleton()->get_class(array_type->eklass);
+			if (CACHED_CLASS(GodotObject)->is_assignable_from(array_type_class)) {
+				MonoArray *managed = GDMonoMarshal::Array_to_mono_array(p_value.operator ::Array(), array_type_class);
+				mono_field_set_value(p_object, mono_field, managed);
 				break;
 			}
 
@@ -294,6 +342,12 @@ void GDMonoField::set_value_from_variant(MonoObject *p_object, const Variant &p_
 				break;
 			}
 
+			if (CACHED_CLASS(StringName) == type_class) {
+				MonoObject *managed = GDMonoUtils::create_managed_from(p_value.operator StringName());
+				mono_field_set_value(p_object, mono_field, managed);
+				break;
+			}
+
 			if (CACHED_CLASS(NodePath) == type_class) {
 				MonoObject *managed = GDMonoUtils::create_managed_from(p_value.operator NodePath());
 				mono_field_set_value(p_object, mono_field, managed);
@@ -306,56 +360,22 @@ void GDMonoField::set_value_from_variant(MonoObject *p_object, const Variant &p_
 				break;
 			}
 
-			if (CACHED_CLASS(Dictionary) == type_class) {
+			// Godot.Collections.Dictionary or IDictionary
+			if (CACHED_CLASS(Dictionary) == type_class || type_class == CACHED_CLASS(System_Collections_IDictionary)) {
 				MonoObject *managed = GDMonoUtils::create_managed_from(p_value.operator Dictionary(), CACHED_CLASS(Dictionary));
 				mono_field_set_value(p_object, mono_field, managed);
 				break;
 			}
 
-			if (CACHED_CLASS(Array) == type_class) {
+			// Godot.Collections.Array or ICollection or IEnumerable
+			if (CACHED_CLASS(Array) == type_class ||
+					type_class == CACHED_CLASS(System_Collections_ICollection) ||
+					type_class == CACHED_CLASS(System_Collections_IEnumerable)) {
 				MonoObject *managed = GDMonoUtils::create_managed_from(p_value.operator Array(), CACHED_CLASS(Array));
 				mono_field_set_value(p_object, mono_field, managed);
 				break;
 			}
 
-			// The order in which we check the following interfaces is very important (dictionaries and generics first)
-
-			MonoReflectionType *reftype = mono_type_get_object(mono_domain_get(), type_class->get_mono_type());
-
-			MonoReflectionType *key_reftype, *value_reftype;
-			if (GDMonoUtils::Marshal::generic_idictionary_is_assignable_from(reftype, &key_reftype, &value_reftype)) {
-				MonoObject *managed = GDMonoUtils::create_managed_from(p_value.operator Dictionary(),
-						GDMonoUtils::Marshal::make_generic_dictionary_type(key_reftype, value_reftype));
-				mono_field_set_value(p_object, mono_field, managed);
-				break;
-			}
-
-			if (type_class->implements_interface(CACHED_CLASS(System_Collections_IDictionary))) {
-				MonoObject *managed = GDMonoUtils::create_managed_from(p_value.operator Dictionary(), CACHED_CLASS(Dictionary));
-				mono_field_set_value(p_object, mono_field, managed);
-				break;
-			}
-
-			MonoReflectionType *elem_reftype;
-			if (GDMonoUtils::Marshal::generic_ienumerable_is_assignable_from(reftype, &elem_reftype)) {
-				MonoObject *managed = GDMonoUtils::create_managed_from(p_value.operator Array(),
-						GDMonoUtils::Marshal::make_generic_array_type(elem_reftype));
-				mono_field_set_value(p_object, mono_field, managed);
-				break;
-			}
-
-			if (type_class->implements_interface(CACHED_CLASS(System_Collections_IEnumerable))) {
-				if (GDMonoCache::tools_godot_api_check()) {
-					MonoObject *managed = GDMonoUtils::create_managed_from(p_value.operator Array(), CACHED_CLASS(Array));
-					mono_field_set_value(p_object, mono_field, managed);
-					break;
-				} else {
-					MonoObject *managed = (MonoObject *)GDMonoMarshal::Array_to_mono_array(p_value.operator Array());
-					mono_field_set_value(p_object, mono_field, managed);
-					break;
-				}
-			}
-
 			ERR_FAIL_MSG("Attempted to set the value of a field of unmarshallable type: '" + type_class->get_name() + "'.");
 		} break;
 
@@ -370,7 +390,7 @@ void GDMonoField::set_value_from_variant(MonoObject *p_object, const Variant &p_
 					int32_t val = p_value.operator signed int();
 					mono_field_set_value(p_object, mono_field, &val);
 				} break;
-				case Variant::REAL: {
+				case Variant::FLOAT: {
 #ifdef REAL_T_IS_DOUBLE
 					double val = p_value.operator double();
 					mono_field_set_value(p_object, mono_field, &val);
@@ -386,12 +406,21 @@ void GDMonoField::set_value_from_variant(MonoObject *p_object, const Variant &p_
 				case Variant::VECTOR2: {
 					SET_FROM_STRUCT(Vector2);
 				} break;
+				case Variant::VECTOR2I: {
+					SET_FROM_STRUCT(Vector2i);
+				} break;
 				case Variant::RECT2: {
 					SET_FROM_STRUCT(Rect2);
 				} break;
+				case Variant::RECT2I: {
+					SET_FROM_STRUCT(Rect2i);
+				} break;
 				case Variant::VECTOR3: {
 					SET_FROM_STRUCT(Vector3);
 				} break;
+				case Variant::VECTOR3I: {
+					SET_FROM_STRUCT(Vector3i);
+				} break;
 				case Variant::TRANSFORM2D: {
 					SET_FROM_STRUCT(Transform2D);
 				} break;
@@ -413,6 +442,10 @@ void GDMonoField::set_value_from_variant(MonoObject *p_object, const Variant &p_
 				case Variant::COLOR: {
 					SET_FROM_STRUCT(Color);
 				} break;
+				case Variant::STRING_NAME: {
+					MonoObject *managed = GDMonoUtils::create_managed_from(p_value.operator StringName());
+					mono_field_set_value(p_object, mono_field, managed);
+				} break;
 				case Variant::NODE_PATH: {
 					MonoObject *managed = GDMonoUtils::create_managed_from(p_value.operator NodePath());
 					mono_field_set_value(p_object, mono_field, managed);
@@ -424,8 +457,15 @@ void GDMonoField::set_value_from_variant(MonoObject *p_object, const Variant &p_
 				case Variant::OBJECT: {
 					MonoObject *managed = GDMonoUtils::unmanaged_get_managed(p_value.operator Object *());
 					mono_field_set_value(p_object, mono_field, managed);
-					break;
-				}
+				} break;
+				case Variant::CALLABLE: {
+					GDMonoMarshal::M_Callable val = GDMonoMarshal::callable_to_managed(p_value.operator Callable());
+					mono_field_set_value(p_object, mono_field, &val);
+				} break;
+				case Variant::SIGNAL: {
+					GDMonoMarshal::M_SignalInfo val = GDMonoMarshal::signal_info_to_managed(p_value.operator Signal());
+					mono_field_set_value(p_object, mono_field, &val);
+				} break;
 				case Variant::DICTIONARY: {
 					MonoObject *managed = GDMonoUtils::create_managed_from(p_value.operator Dictionary(), CACHED_CLASS(Dictionary));
 					mono_field_set_value(p_object, mono_field, managed);
@@ -434,85 +474,102 @@ void GDMonoField::set_value_from_variant(MonoObject *p_object, const Variant &p_
 					MonoObject *managed = GDMonoUtils::create_managed_from(p_value.operator Array(), CACHED_CLASS(Array));
 					mono_field_set_value(p_object, mono_field, managed);
 				} break;
-				case Variant::POOL_BYTE_ARRAY: {
-					SET_FROM_ARRAY(PoolByteArray);
+				case Variant::PACKED_BYTE_ARRAY: {
+					SET_FROM_ARRAY(PackedByteArray);
+				} break;
+				case Variant::PACKED_INT32_ARRAY: {
+					SET_FROM_ARRAY(PackedInt32Array);
 				} break;
-				case Variant::POOL_INT_ARRAY: {
-					SET_FROM_ARRAY(PoolIntArray);
+				case Variant::PACKED_INT64_ARRAY: {
+					SET_FROM_ARRAY(PackedInt64Array);
 				} break;
-				case Variant::POOL_REAL_ARRAY: {
-					SET_FROM_ARRAY(PoolRealArray);
+				case Variant::PACKED_FLOAT32_ARRAY: {
+					SET_FROM_ARRAY(PackedFloat32Array);
 				} break;
-				case Variant::POOL_STRING_ARRAY: {
-					SET_FROM_ARRAY(PoolStringArray);
+				case Variant::PACKED_FLOAT64_ARRAY: {
+					SET_FROM_ARRAY(PackedFloat64Array);
 				} break;
-				case Variant::POOL_VECTOR2_ARRAY: {
-					SET_FROM_ARRAY(PoolVector2Array);
+				case Variant::PACKED_STRING_ARRAY: {
+					SET_FROM_ARRAY(PackedStringArray);
 				} break;
-				case Variant::POOL_VECTOR3_ARRAY: {
-					SET_FROM_ARRAY(PoolVector3Array);
+				case Variant::PACKED_VECTOR2_ARRAY: {
+					SET_FROM_ARRAY(PackedVector2Array);
 				} break;
-				case Variant::POOL_COLOR_ARRAY: {
-					SET_FROM_ARRAY(PoolColorArray);
+				case Variant::PACKED_VECTOR3_ARRAY: {
+					SET_FROM_ARRAY(PackedVector3Array);
 				} break;
-				default: break;
+				case Variant::PACKED_COLOR_ARRAY: {
+					SET_FROM_ARRAY(PackedColorArray);
+				} break;
+				default:
+					break;
 			}
 		} break;
 
 		case MONO_TYPE_GENERICINST: {
 			MonoReflectionType *reftype = mono_type_get_object(mono_domain_get(), type.type_class->get_mono_type());
 
+			// Godot.Collections.Dictionary<TKey, TValue>
 			if (GDMonoUtils::Marshal::type_is_generic_dictionary(reftype)) {
 				MonoObject *managed = GDMonoUtils::create_managed_from(p_value.operator Dictionary(), type.type_class);
 				mono_field_set_value(p_object, mono_field, managed);
 				break;
 			}
 
+			// Godot.Collections.Array<T>
 			if (GDMonoUtils::Marshal::type_is_generic_array(reftype)) {
 				MonoObject *managed = GDMonoUtils::create_managed_from(p_value.operator Array(), type.type_class);
 				mono_field_set_value(p_object, mono_field, managed);
 				break;
 			}
 
-			// The order in which we check the following interfaces is very important (dictionaries and generics first)
-
-			MonoReflectionType *key_reftype, *value_reftype;
-			if (GDMonoUtils::Marshal::generic_idictionary_is_assignable_from(reftype, &key_reftype, &value_reftype)) {
-				MonoObject *managed = GDMonoUtils::create_managed_from(p_value.operator Dictionary(),
-						GDMonoUtils::Marshal::make_generic_dictionary_type(key_reftype, value_reftype));
+			// System.Collections.Generic.Dictionary<TKey, TValue>
+			if (GDMonoUtils::Marshal::type_is_system_generic_dictionary(reftype)) {
+				MonoReflectionType *key_reftype = nullptr;
+				MonoReflectionType *value_reftype = nullptr;
+				GDMonoUtils::Marshal::dictionary_get_key_value_types(reftype, &key_reftype, &value_reftype);
+				MonoObject *managed = GDMonoMarshal::Dictionary_to_system_generic_dict(p_value.operator Dictionary(),
+						type.type_class, key_reftype, value_reftype);
 				mono_field_set_value(p_object, mono_field, managed);
 				break;
 			}
 
-			if (type.type_class->implements_interface(CACHED_CLASS(System_Collections_IDictionary))) {
-				MonoObject *managed = GDMonoUtils::create_managed_from(p_value.operator Dictionary(), CACHED_CLASS(Dictionary));
+			// System.Collections.Generic.List<T>
+			if (GDMonoUtils::Marshal::type_is_system_generic_list(reftype)) {
+				MonoReflectionType *elem_reftype = nullptr;
+				GDMonoUtils::Marshal::array_get_element_type(reftype, &elem_reftype);
+				MonoObject *managed = GDMonoMarshal::Array_to_system_generic_list(p_value.operator Array(),
+						type.type_class, elem_reftype);
 				mono_field_set_value(p_object, mono_field, managed);
 				break;
 			}
 
-			MonoReflectionType *elem_reftype;
-			if (GDMonoUtils::Marshal::generic_ienumerable_is_assignable_from(reftype, &elem_reftype)) {
-				MonoObject *managed = GDMonoUtils::create_managed_from(p_value.operator Array(),
-						GDMonoUtils::Marshal::make_generic_array_type(elem_reftype));
+			// IDictionary<TKey, TValue>
+			if (GDMonoUtils::Marshal::type_is_generic_idictionary(reftype)) {
+				MonoReflectionType *key_reftype;
+				MonoReflectionType *value_reftype;
+				GDMonoUtils::Marshal::dictionary_get_key_value_types(reftype, &key_reftype, &value_reftype);
+				GDMonoClass *godot_dict_class = GDMonoUtils::Marshal::make_generic_dictionary_type(key_reftype, value_reftype);
+
+				MonoObject *managed = GDMonoUtils::create_managed_from(p_value.operator Dictionary(), godot_dict_class);
 				mono_field_set_value(p_object, mono_field, managed);
 				break;
 			}
 
-			if (type.type_class->implements_interface(CACHED_CLASS(System_Collections_IEnumerable))) {
-				if (GDMonoCache::tools_godot_api_check()) {
-					MonoObject *managed = GDMonoUtils::create_managed_from(p_value.operator Array(), CACHED_CLASS(Array));
-					mono_field_set_value(p_object, mono_field, managed);
-					break;
-				} else {
-					MonoObject *managed = (MonoObject *)GDMonoMarshal::Array_to_mono_array(p_value.operator Array());
-					mono_field_set_value(p_object, mono_field, managed);
-					break;
-				}
+			// ICollection<T> or IEnumerable<T>
+			if (GDMonoUtils::Marshal::type_is_generic_icollection(reftype) || GDMonoUtils::Marshal::type_is_generic_ienumerable(reftype)) {
+				MonoReflectionType *elem_reftype;
+				GDMonoUtils::Marshal::array_get_element_type(reftype, &elem_reftype);
+				GDMonoClass *godot_array_class = GDMonoUtils::Marshal::make_generic_array_type(elem_reftype);
+
+				MonoObject *managed = GDMonoUtils::create_managed_from(p_value.operator Array(), godot_array_class);
+				mono_field_set_value(p_object, mono_field, managed);
+				break;
 			}
 		} break;
 
 		default: {
-			ERR_PRINTS("Attempted to set the value of a field of unexpected type encoding: " + itos(type.type_encoding) + ".");
+			ERR_PRINT("Attempted to set the value of a field of unexpected type encoding: " + itos(type.type_encoding) + ".");
 		} break;
 	}
 
@@ -540,29 +597,33 @@ String GDMonoField::get_string_value(MonoObject *p_object) {
 bool GDMonoField::has_attribute(GDMonoClass *p_attr_class) {
 	ERR_FAIL_NULL_V(p_attr_class, false);
 
-	if (!attrs_fetched)
+	if (!attrs_fetched) {
 		fetch_attributes();
+	}
 
-	if (!attributes)
+	if (!attributes) {
 		return false;
+	}
 
 	return mono_custom_attrs_has_attr(attributes, p_attr_class->get_mono_ptr());
 }
 
 MonoObject *GDMonoField::get_attribute(GDMonoClass *p_attr_class) {
-	ERR_FAIL_NULL_V(p_attr_class, NULL);
+	ERR_FAIL_NULL_V(p_attr_class, nullptr);
 
-	if (!attrs_fetched)
+	if (!attrs_fetched) {
 		fetch_attributes();
+	}
 
-	if (!attributes)
-		return NULL;
+	if (!attributes) {
+		return nullptr;
+	}
 
 	return mono_custom_attrs_get_attr(attributes, p_attr_class->get_mono_ptr());
 }
 
 void GDMonoField::fetch_attributes() {
-	ERR_FAIL_COND(attributes != NULL);
+	ERR_FAIL_COND(attributes != nullptr);
 	attributes = mono_custom_attrs_from_field(owner->get_mono_ptr(), mono_field);
 	attrs_fetched = true;
 }
@@ -598,7 +659,7 @@ GDMonoField::GDMonoField(MonoClassField *p_mono_field, GDMonoClass *p_owner) {
 	type.type_class = GDMono::get_singleton()->get_class(field_type_class);
 
 	attrs_fetched = false;
-	attributes = NULL;
+	attributes = nullptr;
 }
 
 GDMonoField::~GDMonoField() {
diff --git a/modules/mono/mono_gd/gd_mono_field.h b/modules/mono/mono_gd/gd_mono_field.h
index 76ee0963c4..5b40b439f9 100644
--- a/modules/mono/mono_gd/gd_mono_field.h
+++ b/modules/mono/mono_gd/gd_mono_field.h
@@ -36,7 +36,6 @@
 #include "i_mono_class_member.h"
 
 class GDMonoField : public IMonoClassMember {
-
 	GDMonoClass *owner;
 	MonoClassField *mono_field;
 
@@ -47,21 +46,22 @@ class GDMonoField : public IMonoClassMember {
 	MonoCustomAttrInfo *attributes;
 
 public:
-	virtual GDMonoClass *get_enclosing_class() const GD_FINAL { return owner; }
+	virtual GDMonoClass *get_enclosing_class() const final { return owner; }
 
-	virtual MemberType get_member_type() const GD_FINAL { return MEMBER_TYPE_FIELD; }
+	virtual MemberType get_member_type() const final { return MEMBER_TYPE_FIELD; }
 
-	virtual StringName get_name() const GD_FINAL { return name; }
+	virtual StringName get_name() const final { return name; }
 
-	virtual bool is_static() GD_FINAL;
-	virtual Visibility get_visibility() GD_FINAL;
+	virtual bool is_static() final;
+	virtual Visibility get_visibility() final;
 
-	virtual bool has_attribute(GDMonoClass *p_attr_class) GD_FINAL;
-	virtual MonoObject *get_attribute(GDMonoClass *p_attr_class) GD_FINAL;
+	virtual bool has_attribute(GDMonoClass *p_attr_class) final;
+	virtual MonoObject *get_attribute(GDMonoClass *p_attr_class) final;
 	void fetch_attributes();
 
 	_FORCE_INLINE_ ManagedType get_type() const { return type; }
 
+	void set_value(MonoObject *p_object, MonoObject *p_value);
 	void set_value_raw(MonoObject *p_object, void *p_ptr);
 	void set_value_from_variant(MonoObject *p_object, const Variant &p_value);
 
diff --git a/modules/mono/mono_gd/gd_mono_internals.cpp b/modules/mono/mono_gd/gd_mono_internals.cpp
index 75aa77c7b0..fe1c2d28dd 100644
--- a/modules/mono/mono_gd/gd_mono_internals.cpp
+++ b/modules/mono/mono_gd/gd_mono_internals.cpp
@@ -33,17 +33,18 @@
 #include "../csharp_script.h"
 #include "../mono_gc_handle.h"
 #include "../utils/macros.h"
-#include "../utils/thread_local.h"
 #include "gd_mono_class.h"
 #include "gd_mono_marshal.h"
 #include "gd_mono_utils.h"
 
+#include "core/debugger/engine_debugger.h"
+#include "core/debugger/script_debugger.h"
+
 #include <mono/metadata/exception.h>
 
 namespace GDMonoInternals {
 
 void tie_managed_to_unmanaged(MonoObject *managed, Object *unmanaged) {
-
 	// This method should not fail
 
 	CRASH_COND(!unmanaged);
@@ -59,7 +60,7 @@ void tie_managed_to_unmanaged(MonoObject *managed, Object *unmanaged) {
 
 	GDMonoClass *native = GDMonoUtils::get_class_native_base(klass);
 
-	CRASH_COND(native == NULL);
+	CRASH_COND(native == nullptr);
 
 	if (native == klass) {
 		// If it's just a wrapper Godot class and not a custom inheriting class, then attach a
@@ -73,7 +74,7 @@ void tie_managed_to_unmanaged(MonoObject *managed, Object *unmanaged) {
 		script_binding.inited = true;
 		script_binding.type_name = NATIVE_GDMONOCLASS_NAME(klass);
 		script_binding.wrapper_class = klass;
-		script_binding.gchandle = ref ? MonoGCHandle::create_weak(managed) : MonoGCHandle::create_strong(managed);
+		script_binding.gchandle = ref ? MonoGCHandleData::new_weak_handle(managed) : MonoGCHandleData::new_strong_handle(managed);
 		script_binding.owner = unmanaged;
 
 		if (ref) {
@@ -99,29 +100,32 @@ void tie_managed_to_unmanaged(MonoObject *managed, Object *unmanaged) {
 		return;
 	}
 
-	Ref<MonoGCHandle> gchandle = ref ? MonoGCHandle::create_weak(managed) : MonoGCHandle::create_strong(managed);
+	MonoGCHandleData gchandle = ref ? MonoGCHandleData::new_weak_handle(managed) : MonoGCHandleData::new_strong_handle(managed);
 
 	Ref<CSharpScript> script = CSharpScript::create_for_managed_type(klass, native);
 
 	CRASH_COND(script.is_null());
 
-	ScriptInstance *si = CSharpInstance::create_for_managed_type(unmanaged, script.ptr(), gchandle);
+	CSharpInstance *csharp_instance = CSharpInstance::create_for_managed_type(unmanaged, script.ptr(), gchandle);
 
-	unmanaged->set_script_and_instance(script.get_ref_ptr(), si);
+	unmanaged->set_script_and_instance(script, csharp_instance);
+
+	csharp_instance->connect_event_signals();
 }
 
 void unhandled_exception(MonoException *p_exc) {
-	mono_unhandled_exception((MonoObject *)p_exc); // prints the exception as well
+	mono_print_unhandled_exception((MonoObject *)p_exc);
 
 	if (GDMono::get_singleton()->get_unhandled_exception_policy() == GDMono::POLICY_TERMINATE_APP) {
 		// Too bad 'mono_invoke_unhandled_exception_hook' is not exposed to embedders
-		GDMono::unhandled_exception_hook((MonoObject *)p_exc, NULL);
+		GDMono::unhandled_exception_hook((MonoObject *)p_exc, nullptr);
 		GD_UNREACHABLE();
 	} else {
 #ifdef DEBUG_ENABLED
-		GDMonoUtils::debug_send_unhandled_exception_error((MonoException *)p_exc);
-		if (ScriptDebugger::get_singleton())
-			ScriptDebugger::get_singleton()->idle_poll();
+		GDMonoUtils::debug_send_unhandled_exception_error(p_exc);
+		if (EngineDebugger::is_active()) {
+			EngineDebugger::get_singleton()->poll_events(false);
+		}
 #endif
 	}
 }
diff --git a/modules/mono/mono_gd/gd_mono_log.cpp b/modules/mono/mono_gd/gd_mono_log.cpp
index ad68a4d90e..b8ee0204c4 100644
--- a/modules/mono/mono_gd/gd_mono_log.cpp
+++ b/modules/mono/mono_gd/gd_mono_log.cpp
@@ -46,44 +46,50 @@ static CharString get_default_log_level() {
 #endif
 }
 
-GDMonoLog *GDMonoLog::singleton = NULL;
+GDMonoLog *GDMonoLog::singleton = nullptr;
 
-#if !defined(JAVASCRIPT_ENABLED)
+#ifdef GD_MONO_LOG_ENABLED
 
 static int get_log_level_id(const char *p_log_level) {
-
-	const char *valid_log_levels[] = { "error", "critical", "warning", "message", "info", "debug", NULL };
+	const char *valid_log_levels[] = { "error", "critical", "warning", "message", "info", "debug", nullptr };
 
 	int i = 0;
 	while (valid_log_levels[i]) {
-		if (!strcmp(valid_log_levels[i], p_log_level))
+		if (!strcmp(valid_log_levels[i], p_log_level)) {
 			return i;
+		}
 		i++;
 	}
 
 	return -1;
 }
 
-void GDMonoLog::mono_log_callback(const char *log_domain, const char *log_level, const char *message, mono_bool fatal, void *) {
+static String make_text(const char *log_domain, const char *log_level, const char *message) {
+	String text(message);
+	text += " (in domain ";
+	text += log_domain;
+	if (log_level) {
+		text += ", ";
+		text += log_level;
+	}
+	text += ")";
+	return text;
+}
 
+void GDMonoLog::mono_log_callback(const char *log_domain, const char *log_level, const char *message, mono_bool fatal, void *) {
 	FileAccess *f = GDMonoLog::get_singleton()->log_file;
 
 	if (GDMonoLog::get_singleton()->log_level_id >= get_log_level_id(log_level)) {
-		String text(message);
-		text += " (in domain ";
-		text += log_domain;
-		if (log_level) {
-			text += ", ";
-			text += log_level;
-		}
-		text += ")\n";
+		String text = make_text(log_domain, log_level, message);
+		text += "\n";
 
 		f->seek_end();
 		f->store_string(text);
 	}
 
 	if (fatal) {
-		ERR_PRINTS("Mono: FATAL ERROR, ABORTING! Logfile: '" + GDMonoLog::get_singleton()->log_file_path + "'.");
+		String text = make_text(log_domain, log_level, message);
+		ERR_PRINT("Mono: FATAL ERROR '" + text + "', ABORTING! Logfile: '" + GDMonoLog::get_singleton()->log_file_path + "'.");
 		// Make sure to flush before aborting
 		f->flush();
 		f->close();
@@ -94,7 +100,6 @@ void GDMonoLog::mono_log_callback(const char *log_domain, const char *log_level,
 }
 
 bool GDMonoLog::_try_create_logs_dir(const String &p_logs_dir) {
-
 	if (!DirAccess::exists(p_logs_dir)) {
 		DirAccessRef diraccess = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
 		ERR_FAIL_COND_V(!diraccess, false);
@@ -106,7 +111,6 @@ bool GDMonoLog::_try_create_logs_dir(const String &p_logs_dir) {
 }
 
 void GDMonoLog::_delete_old_log_files(const String &p_logs_dir) {
-
 	static const uint64_t MAX_SECS = 5 * 86400; // 5 days
 
 	DirAccessRef da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
@@ -119,10 +123,12 @@ void GDMonoLog::_delete_old_log_files(const String &p_logs_dir) {
 
 	String current;
 	while ((current = da->get_next()).length()) {
-		if (da->current_is_dir())
+		if (da->current_is_dir()) {
 			continue;
-		if (!current.ends_with(".txt"))
+		}
+		if (!current.ends_with(".txt")) {
 			continue;
+		}
 
 		uint64_t modified_time = FileAccess::get_modified_time(da->get_current_dir().plus_file(current));
 
@@ -135,11 +141,10 @@ void GDMonoLog::_delete_old_log_files(const String &p_logs_dir) {
 }
 
 void GDMonoLog::initialize() {
-
 	CharString log_level = OS::get_singleton()->get_environment("GODOT_MONO_LOG_LEVEL").utf8();
 
 	if (log_level.length() != 0 && get_log_level_id(log_level.get_data()) == -1) {
-		ERR_PRINTS(String() + "Mono: Ignoring invalid log level (GODOT_MONO_LOG_LEVEL): '" + log_level.get_data() + "'.");
+		ERR_PRINT(String() + "Mono: Ignoring invalid log level (GODOT_MONO_LOG_LEVEL): '" + log_level.get_data() + "'.");
 		log_level = CharString();
 	}
 
@@ -167,7 +172,7 @@ void GDMonoLog::initialize() {
 
 		log_file = FileAccess::open(log_file_path, FileAccess::WRITE);
 		if (!log_file) {
-			ERR_PRINTS("Mono: Cannot create log file at: " + log_file_path);
+			ERR_PRINT("Mono: Cannot create log file at: " + log_file_path);
 		}
 	}
 
@@ -175,7 +180,7 @@ void GDMonoLog::initialize() {
 	log_level_id = get_log_level_id(log_level.get_data());
 
 	if (log_file) {
-		OS::get_singleton()->print("Mono: Logfile is: %s\n", log_file_path.utf8().get_data());
+		OS::get_singleton()->print("Mono: Log file is: '%s'\n", log_file_path.utf8().get_data());
 		mono_trace_set_log_handler(mono_log_callback, this);
 	} else {
 		OS::get_singleton()->printerr("Mono: No log file, using default log handler\n");
@@ -183,15 +188,13 @@ void GDMonoLog::initialize() {
 }
 
 GDMonoLog::GDMonoLog() {
-
 	singleton = this;
 
 	log_level_id = -1;
 }
 
 GDMonoLog::~GDMonoLog() {
-
-	singleton = NULL;
+	singleton = nullptr;
 
 	if (log_file) {
 		log_file->close();
@@ -207,13 +210,11 @@ void GDMonoLog::initialize() {
 }
 
 GDMonoLog::GDMonoLog() {
-
 	singleton = this;
 }
 
 GDMonoLog::~GDMonoLog() {
-
-	singleton = NULL;
+	singleton = nullptr;
 }
 
 #endif // !defined(JAVASCRIPT_ENABLED)
diff --git a/modules/mono/mono_gd/gd_mono_log.h b/modules/mono/mono_gd/gd_mono_log.h
index ecf4c78b1a..3a52316060 100644
--- a/modules/mono/mono_gd/gd_mono_log.h
+++ b/modules/mono/mono_gd/gd_mono_log.h
@@ -35,13 +35,17 @@
 
 #include "core/typedefs.h"
 
-#if !defined(JAVASCRIPT_ENABLED)
+#if !defined(JAVASCRIPT_ENABLED) && !defined(IPHONE_ENABLED)
+// We have custom mono log callbacks for WASM and iOS
+#define GD_MONO_LOG_ENABLED
+#endif
+
+#ifdef GD_MONO_LOG_ENABLED
 #include "core/os/file_access.h"
 #endif
 
 class GDMonoLog {
-
-#if !defined(JAVASCRIPT_ENABLED)
+#ifdef GD_MONO_LOG_ENABLED
 	int log_level_id;
 
 	FileAccess *log_file;
diff --git a/modules/mono/mono_gd/gd_mono_marshal.cpp b/modules/mono/mono_gd/gd_mono_marshal.cpp
index b81c20348d..c460e283ea 100644
--- a/modules/mono/mono_gd/gd_mono_marshal.cpp
+++ b/modules/mono/mono_gd/gd_mono_marshal.cpp
@@ -30,13 +30,14 @@
 
 #include "gd_mono_marshal.h"
 
+#include "../signal_awaiter_utils.h"
 #include "gd_mono.h"
 #include "gd_mono_cache.h"
 #include "gd_mono_class.h"
 
 namespace GDMonoMarshal {
 
-Variant::Type managed_to_variant_type(const ManagedType &p_type) {
+Variant::Type managed_to_variant_type(const ManagedType &p_type, bool *r_nil_is_variant) {
 	switch (p_type.type_encoding) {
 		case MONO_TYPE_BOOLEAN:
 			return Variant::BOOL;
@@ -60,9 +61,9 @@ Variant::Type managed_to_variant_type(const ManagedType &p_type) {
 			return Variant::INT;
 
 		case MONO_TYPE_R4:
-			return Variant::REAL;
+			return Variant::FLOAT;
 		case MONO_TYPE_R8:
-			return Variant::REAL;
+			return Variant::FLOAT;
 
 		case MONO_TYPE_STRING: {
 			return Variant::STRING;
@@ -71,67 +72,119 @@ Variant::Type managed_to_variant_type(const ManagedType &p_type) {
 		case MONO_TYPE_VALUETYPE: {
 			GDMonoClass *vtclass = p_type.type_class;
 
-			if (vtclass == CACHED_CLASS(Vector2))
+			if (vtclass == CACHED_CLASS(Vector2)) {
 				return Variant::VECTOR2;
+			}
+
+			if (vtclass == CACHED_CLASS(Vector2i)) {
+				return Variant::VECTOR2I;
+			}
 
-			if (vtclass == CACHED_CLASS(Rect2))
+			if (vtclass == CACHED_CLASS(Rect2)) {
 				return Variant::RECT2;
+			}
 
-			if (vtclass == CACHED_CLASS(Transform2D))
+			if (vtclass == CACHED_CLASS(Rect2i)) {
+				return Variant::RECT2I;
+			}
+
+			if (vtclass == CACHED_CLASS(Transform2D)) {
 				return Variant::TRANSFORM2D;
+			}
 
-			if (vtclass == CACHED_CLASS(Vector3))
+			if (vtclass == CACHED_CLASS(Vector3)) {
 				return Variant::VECTOR3;
+			}
+
+			if (vtclass == CACHED_CLASS(Vector3i)) {
+				return Variant::VECTOR3I;
+			}
 
-			if (vtclass == CACHED_CLASS(Basis))
+			if (vtclass == CACHED_CLASS(Basis)) {
 				return Variant::BASIS;
+			}
 
-			if (vtclass == CACHED_CLASS(Quat))
+			if (vtclass == CACHED_CLASS(Quat)) {
 				return Variant::QUAT;
+			}
 
-			if (vtclass == CACHED_CLASS(Transform))
+			if (vtclass == CACHED_CLASS(Transform)) {
 				return Variant::TRANSFORM;
+			}
 
-			if (vtclass == CACHED_CLASS(AABB))
+			if (vtclass == CACHED_CLASS(AABB)) {
 				return Variant::AABB;
+			}
 
-			if (vtclass == CACHED_CLASS(Color))
+			if (vtclass == CACHED_CLASS(Color)) {
 				return Variant::COLOR;
+			}
 
-			if (vtclass == CACHED_CLASS(Plane))
+			if (vtclass == CACHED_CLASS(Plane)) {
 				return Variant::PLANE;
+			}
+
+			if (vtclass == CACHED_CLASS(Callable)) {
+				return Variant::CALLABLE;
+			}
 
-			if (mono_class_is_enum(vtclass->get_mono_ptr()))
+			if (vtclass == CACHED_CLASS(SignalInfo)) {
+				return Variant::SIGNAL;
+			}
+
+			if (mono_class_is_enum(vtclass->get_mono_ptr())) {
 				return Variant::INT;
+			}
 		} break;
 
 		case MONO_TYPE_ARRAY:
 		case MONO_TYPE_SZARRAY: {
 			MonoArrayType *array_type = mono_type_get_array_type(p_type.type_class->get_mono_type());
 
-			if (array_type->eklass == CACHED_CLASS_RAW(MonoObject))
+			if (array_type->eklass == CACHED_CLASS_RAW(MonoObject)) {
 				return Variant::ARRAY;
+			}
 
-			if (array_type->eklass == CACHED_CLASS_RAW(uint8_t))
-				return Variant::POOL_BYTE_ARRAY;
+			if (array_type->eklass == CACHED_CLASS_RAW(uint8_t)) {
+				return Variant::PACKED_BYTE_ARRAY;
+			}
+
+			if (array_type->eklass == CACHED_CLASS_RAW(int32_t)) {
+				return Variant::PACKED_INT32_ARRAY;
+			}
 
-			if (array_type->eklass == CACHED_CLASS_RAW(int32_t))
-				return Variant::POOL_INT_ARRAY;
+			if (array_type->eklass == CACHED_CLASS_RAW(int64_t)) {
+				return Variant::PACKED_INT64_ARRAY;
+			}
 
-			if (array_type->eklass == REAL_T_MONOCLASS)
-				return Variant::POOL_REAL_ARRAY;
+			if (array_type->eklass == CACHED_CLASS_RAW(float)) {
+				return Variant::PACKED_FLOAT32_ARRAY;
+			}
 
-			if (array_type->eklass == CACHED_CLASS_RAW(String))
-				return Variant::POOL_STRING_ARRAY;
+			if (array_type->eklass == CACHED_CLASS_RAW(double)) {
+				return Variant::PACKED_FLOAT64_ARRAY;
+			}
 
-			if (array_type->eklass == CACHED_CLASS_RAW(Vector2))
-				return Variant::POOL_VECTOR2_ARRAY;
+			if (array_type->eklass == CACHED_CLASS_RAW(String)) {
+				return Variant::PACKED_STRING_ARRAY;
+			}
+
+			if (array_type->eklass == CACHED_CLASS_RAW(Vector2)) {
+				return Variant::PACKED_VECTOR2_ARRAY;
+			}
+
+			if (array_type->eklass == CACHED_CLASS_RAW(Vector3)) {
+				return Variant::PACKED_VECTOR3_ARRAY;
+			}
 
-			if (array_type->eklass == CACHED_CLASS_RAW(Vector3))
-				return Variant::POOL_VECTOR3_ARRAY;
+			if (array_type->eklass == CACHED_CLASS_RAW(Color)) {
+				return Variant::PACKED_COLOR_ARRAY;
+			}
 
-			if (array_type->eklass == CACHED_CLASS_RAW(Color))
-				return Variant::POOL_COLOR_ARRAY;
+			GDMonoClass *array_type_class = GDMono::get_singleton()->get_class(array_type->eklass);
+			if (CACHED_CLASS(GodotObject)->is_assignable_from(array_type_class)) {
+				return Variant::ARRAY;
+			}
 		} break;
 
 		case MONO_TYPE_CLASS: {
@@ -142,6 +195,10 @@ Variant::Type managed_to_variant_type(const ManagedType &p_type) {
 				return Variant::OBJECT;
 			}
 
+			if (CACHED_CLASS(StringName) == type_class) {
+				return Variant::STRING_NAME;
+			}
+
 			if (CACHED_CLASS(NodePath) == type_class) {
 				return Variant::NODE_PATH;
 			}
@@ -158,51 +215,55 @@ Variant::Type managed_to_variant_type(const ManagedType &p_type) {
 				return Variant::ARRAY;
 			}
 
-			// The order in which we check the following interfaces is very important (dictionaries and generics first)
-
-			MonoReflectionType *reftype = mono_type_get_object(mono_domain_get(), type_class->get_mono_type());
-
-			if (GDMonoUtils::Marshal::generic_idictionary_is_assignable_from(reftype)) {
+			// IDictionary
+			if (p_type.type_class == CACHED_CLASS(System_Collections_IDictionary)) {
 				return Variant::DICTIONARY;
 			}
 
-			if (type_class->implements_interface(CACHED_CLASS(System_Collections_IDictionary))) {
-				return Variant::DICTIONARY;
-			}
-
-			if (GDMonoUtils::Marshal::generic_ienumerable_is_assignable_from(reftype)) {
+			// ICollection or IEnumerable
+			if (p_type.type_class == CACHED_CLASS(System_Collections_ICollection) ||
+					p_type.type_class == CACHED_CLASS(System_Collections_IEnumerable)) {
 				return Variant::ARRAY;
 			}
+		} break;
 
-			if (type_class->implements_interface(CACHED_CLASS(System_Collections_IEnumerable))) {
-				return Variant::ARRAY;
+		case MONO_TYPE_OBJECT: {
+			if (r_nil_is_variant) {
+				*r_nil_is_variant = true;
 			}
+			return Variant::NIL;
 		} break;
 
 		case MONO_TYPE_GENERICINST: {
 			MonoReflectionType *reftype = mono_type_get_object(mono_domain_get(), p_type.type_class->get_mono_type());
 
+			// Godot.Collections.Dictionary<TKey, TValue>
 			if (GDMonoUtils::Marshal::type_is_generic_dictionary(reftype)) {
 				return Variant::DICTIONARY;
 			}
 
+			// Godot.Collections.Array<T>
 			if (GDMonoUtils::Marshal::type_is_generic_array(reftype)) {
 				return Variant::ARRAY;
 			}
 
-			// The order in which we check the following interfaces is very important (dictionaries and generics first)
-
-			if (GDMonoUtils::Marshal::generic_idictionary_is_assignable_from(reftype))
-				return Variant::DICTIONARY;
-
-			if (p_type.type_class->implements_interface(CACHED_CLASS(System_Collections_IDictionary))) {
+			// System.Collections.Generic.Dictionary<TKey, TValue>
+			if (GDMonoUtils::Marshal::type_is_system_generic_dictionary(reftype)) {
 				return Variant::DICTIONARY;
 			}
 
-			if (GDMonoUtils::Marshal::generic_ienumerable_is_assignable_from(reftype))
+			// System.Collections.Generic.List<T>
+			if (GDMonoUtils::Marshal::type_is_system_generic_list(reftype)) {
 				return Variant::ARRAY;
+			}
 
-			if (p_type.type_class->implements_interface(CACHED_CLASS(System_Collections_IEnumerable))) {
+			// IDictionary<TKey, TValue>
+			if (GDMonoUtils::Marshal::type_is_generic_idictionary(reftype)) {
+				return Variant::DICTIONARY;
+			}
+
+			// ICollection<T> or IEnumerable<T>
+			if (GDMonoUtils::Marshal::type_is_generic_icollection(reftype) || GDMonoUtils::Marshal::type_is_generic_ienumerable(reftype)) {
 				return Variant::ARRAY;
 			}
 		} break;
@@ -211,16 +272,30 @@ Variant::Type managed_to_variant_type(const ManagedType &p_type) {
 		} break;
 	}
 
+	if (r_nil_is_variant) {
+		*r_nil_is_variant = false;
+	}
+
 	// Unknown
 	return Variant::NIL;
 }
 
 bool try_get_array_element_type(const ManagedType &p_array_type, ManagedType &r_elem_type) {
 	switch (p_array_type.type_encoding) {
+		case MONO_TYPE_ARRAY:
+		case MONO_TYPE_SZARRAY: {
+			MonoArrayType *array_type = mono_type_get_array_type(p_array_type.type_class->get_mono_type());
+			GDMonoClass *array_type_class = GDMono::get_singleton()->get_class(array_type->eklass);
+			r_elem_type = ManagedType::from_class(array_type_class);
+			return true;
+		} break;
 		case MONO_TYPE_GENERICINST: {
 			MonoReflectionType *array_reftype = mono_type_get_object(mono_domain_get(), p_array_type.type_class->get_mono_type());
 
-			if (GDMonoUtils::Marshal::type_is_generic_array(array_reftype)) {
+			if (GDMonoUtils::Marshal::type_is_generic_array(array_reftype) ||
+					GDMonoUtils::Marshal::type_is_system_generic_list(array_reftype) ||
+					GDMonoUtils::Marshal::type_is_generic_icollection(array_reftype) ||
+					GDMonoUtils::Marshal::type_is_generic_ienumerable(array_reftype)) {
 				MonoReflectionType *elem_reftype;
 
 				GDMonoUtils::Marshal::array_get_element_type(array_reftype, &elem_reftype);
@@ -228,12 +303,6 @@ bool try_get_array_element_type(const ManagedType &p_array_type, ManagedType &r_
 				r_elem_type = ManagedType::from_reftype(elem_reftype);
 				return true;
 			}
-
-			MonoReflectionType *elem_reftype;
-			if (GDMonoUtils::Marshal::generic_ienumerable_is_assignable_from(array_reftype, &elem_reftype)) {
-				r_elem_type = ManagedType::from_reftype(elem_reftype);
-				return true;
-			}
 		} break;
 		default: {
 		} break;
@@ -242,73 +311,6 @@ bool try_get_array_element_type(const ManagedType &p_array_type, ManagedType &r_
 	return false;
 }
 
-bool try_get_dictionary_key_value_types(const ManagedType &p_dictionary_type, ManagedType &r_key_type, ManagedType &r_value_type) {
-	switch (p_dictionary_type.type_encoding) {
-		case MONO_TYPE_GENERICINST: {
-			MonoReflectionType *dict_reftype = mono_type_get_object(mono_domain_get(), p_dictionary_type.type_class->get_mono_type());
-
-			if (GDMonoUtils::Marshal::type_is_generic_dictionary(dict_reftype)) {
-				MonoReflectionType *key_reftype;
-				MonoReflectionType *value_reftype;
-
-				GDMonoUtils::Marshal::dictionary_get_key_value_types(dict_reftype, &key_reftype, &value_reftype);
-
-				r_key_type = ManagedType::from_reftype(key_reftype);
-				r_value_type = ManagedType::from_reftype(value_reftype);
-				return true;
-			}
-
-			MonoReflectionType *key_reftype, *value_reftype;
-			if (GDMonoUtils::Marshal::generic_idictionary_is_assignable_from(dict_reftype, &key_reftype, &value_reftype)) {
-				r_key_type = ManagedType::from_reftype(key_reftype);
-				r_value_type = ManagedType::from_reftype(value_reftype);
-				return true;
-			}
-		} break;
-		default: {
-		} break;
-	}
-
-	return false;
-}
-
-String mono_to_utf8_string(MonoString *p_mono_string) {
-	MonoError error;
-	char *utf8 = mono_string_to_utf8_checked(p_mono_string, &error);
-
-	if (!mono_error_ok(&error)) {
-		ERR_PRINTS(String() + "Failed to convert MonoString* to UTF-8: '" + mono_error_get_message(&error) + "'.");
-		mono_error_cleanup(&error);
-		return String();
-	}
-
-	String ret = String::utf8(utf8);
-
-	mono_free(utf8);
-
-	return ret;
-}
-
-String mono_to_utf16_string(MonoString *p_mono_string) {
-	int len = mono_string_length(p_mono_string);
-	String ret;
-
-	if (len == 0)
-		return ret;
-
-	ret.resize(len + 1);
-	ret.set(len, 0);
-
-	CharType *src = (CharType *)mono_string_chars(p_mono_string);
-	CharType *dst = ret.ptrw();
-
-	for (int i = 0; i < len; i++) {
-		dst[i] = src[i];
-	}
-
-	return ret;
-}
-
 MonoObject *variant_to_mono_object(const Variant *p_var) {
 	ManagedType type;
 
@@ -374,8 +376,9 @@ MonoObject *variant_to_mono_object(const Variant *p_var, const ManagedType &p_ty
 		}
 
 		case MONO_TYPE_STRING: {
-			if (p_var->get_type() == Variant::NIL)
-				return NULL; // Otherwise, Variant -> String would return the string "Null"
+			if (p_var->get_type() == Variant::NIL) {
+				return nullptr; // Otherwise, Variant -> String would return the string "Null"
+			}
 			return (MonoObject *)mono_string_from_godot(p_var->operator String());
 		} break;
 
@@ -387,11 +390,21 @@ MonoObject *variant_to_mono_object(const Variant *p_var, const ManagedType &p_ty
 				return mono_value_box(mono_domain_get(), CACHED_CLASS_RAW(Vector2), &from);
 			}
 
+			if (vtclass == CACHED_CLASS(Vector2i)) {
+				GDMonoMarshal::M_Vector2i from = MARSHALLED_OUT(Vector2i, p_var->operator ::Vector2i());
+				return mono_value_box(mono_domain_get(), CACHED_CLASS_RAW(Vector2i), &from);
+			}
+
 			if (vtclass == CACHED_CLASS(Rect2)) {
 				GDMonoMarshal::M_Rect2 from = MARSHALLED_OUT(Rect2, p_var->operator ::Rect2());
 				return mono_value_box(mono_domain_get(), CACHED_CLASS_RAW(Rect2), &from);
 			}
 
+			if (vtclass == CACHED_CLASS(Rect2i)) {
+				GDMonoMarshal::M_Rect2i from = MARSHALLED_OUT(Rect2i, p_var->operator ::Rect2i());
+				return mono_value_box(mono_domain_get(), CACHED_CLASS_RAW(Rect2i), &from);
+			}
+
 			if (vtclass == CACHED_CLASS(Transform2D)) {
 				GDMonoMarshal::M_Transform2D from = MARSHALLED_OUT(Transform2D, p_var->operator ::Transform2D());
 				return mono_value_box(mono_domain_get(), CACHED_CLASS_RAW(Transform2D), &from);
@@ -402,6 +415,11 @@ MonoObject *variant_to_mono_object(const Variant *p_var, const ManagedType &p_ty
 				return mono_value_box(mono_domain_get(), CACHED_CLASS_RAW(Vector3), &from);
 			}
 
+			if (vtclass == CACHED_CLASS(Vector3i)) {
+				GDMonoMarshal::M_Vector3i from = MARSHALLED_OUT(Vector3i, p_var->operator ::Vector3i());
+				return mono_value_box(mono_domain_get(), CACHED_CLASS_RAW(Vector3i), &from);
+			}
+
 			if (vtclass == CACHED_CLASS(Basis)) {
 				GDMonoMarshal::M_Basis from = MARSHALLED_OUT(Basis, p_var->operator ::Basis());
 				return mono_value_box(mono_domain_get(), CACHED_CLASS_RAW(Basis), &from);
@@ -432,6 +450,16 @@ MonoObject *variant_to_mono_object(const Variant *p_var, const ManagedType &p_ty
 				return mono_value_box(mono_domain_get(), CACHED_CLASS_RAW(Plane), &from);
 			}
 
+			if (vtclass == CACHED_CLASS(Callable)) {
+				GDMonoMarshal::M_Callable from = GDMonoMarshal::callable_to_managed(p_var->operator Callable());
+				return mono_value_box(mono_domain_get(), CACHED_CLASS_RAW(Callable), &from);
+			}
+
+			if (vtclass == CACHED_CLASS(SignalInfo)) {
+				GDMonoMarshal::M_SignalInfo from = GDMonoMarshal::signal_info_to_managed(p_var->operator Signal());
+				return mono_value_box(mono_domain_get(), CACHED_CLASS_RAW(SignalInfo), &from);
+			}
+
 			if (mono_class_is_enum(vtclass->get_mono_ptr())) {
 				MonoType *enum_basetype = mono_class_enum_basetype(vtclass->get_mono_ptr());
 				MonoClass *enum_baseclass = mono_class_from_mono_type(enum_basetype);
@@ -477,7 +505,7 @@ MonoObject *variant_to_mono_object(const Variant *p_var, const ManagedType &p_ty
 						return BOX_ENUM(enum_baseclass, val);
 					}
 					default: {
-						ERR_FAIL_V_MSG(NULL, "Attempted to convert Variant to a managed enum value of unmarshallable base type.");
+						ERR_FAIL_V_MSG(nullptr, "Attempted to convert Variant to a managed enum value of unmarshallable base type.");
 					}
 				}
 			}
@@ -487,31 +515,52 @@ MonoObject *variant_to_mono_object(const Variant *p_var, const ManagedType &p_ty
 		case MONO_TYPE_SZARRAY: {
 			MonoArrayType *array_type = mono_type_get_array_type(p_type.type_class->get_mono_type());
 
-			if (array_type->eklass == CACHED_CLASS_RAW(MonoObject))
+			if (array_type->eklass == CACHED_CLASS_RAW(MonoObject)) {
 				return (MonoObject *)Array_to_mono_array(p_var->operator Array());
+			}
+
+			if (array_type->eklass == CACHED_CLASS_RAW(uint8_t)) {
+				return (MonoObject *)PackedByteArray_to_mono_array(p_var->operator PackedByteArray());
+			}
 
-			if (array_type->eklass == CACHED_CLASS_RAW(uint8_t))
-				return (MonoObject *)PoolByteArray_to_mono_array(p_var->operator PoolByteArray());
+			if (array_type->eklass == CACHED_CLASS_RAW(int32_t)) {
+				return (MonoObject *)PackedInt32Array_to_mono_array(p_var->operator PackedInt32Array());
+			}
 
-			if (array_type->eklass == CACHED_CLASS_RAW(int32_t))
-				return (MonoObject *)PoolIntArray_to_mono_array(p_var->operator PoolIntArray());
+			if (array_type->eklass == CACHED_CLASS_RAW(int64_t)) {
+				return (MonoObject *)PackedInt64Array_to_mono_array(p_var->operator PackedInt64Array());
+			}
 
-			if (array_type->eklass == REAL_T_MONOCLASS)
-				return (MonoObject *)PoolRealArray_to_mono_array(p_var->operator PoolRealArray());
+			if (array_type->eklass == CACHED_CLASS_RAW(float)) {
+				return (MonoObject *)PackedFloat32Array_to_mono_array(p_var->operator PackedFloat32Array());
+			}
 
-			if (array_type->eklass == CACHED_CLASS_RAW(String))
-				return (MonoObject *)PoolStringArray_to_mono_array(p_var->operator PoolStringArray());
+			if (array_type->eklass == CACHED_CLASS_RAW(double)) {
+				return (MonoObject *)PackedFloat64Array_to_mono_array(p_var->operator PackedFloat64Array());
+			}
 
-			if (array_type->eklass == CACHED_CLASS_RAW(Vector2))
-				return (MonoObject *)PoolVector2Array_to_mono_array(p_var->operator PoolVector2Array());
+			if (array_type->eklass == CACHED_CLASS_RAW(String)) {
+				return (MonoObject *)PackedStringArray_to_mono_array(p_var->operator PackedStringArray());
+			}
 
-			if (array_type->eklass == CACHED_CLASS_RAW(Vector3))
-				return (MonoObject *)PoolVector3Array_to_mono_array(p_var->operator PoolVector3Array());
+			if (array_type->eklass == CACHED_CLASS_RAW(Vector2)) {
+				return (MonoObject *)PackedVector2Array_to_mono_array(p_var->operator PackedVector2Array());
+			}
 
-			if (array_type->eklass == CACHED_CLASS_RAW(Color))
-				return (MonoObject *)PoolColorArray_to_mono_array(p_var->operator PoolColorArray());
+			if (array_type->eklass == CACHED_CLASS_RAW(Vector3)) {
+				return (MonoObject *)PackedVector3Array_to_mono_array(p_var->operator PackedVector3Array());
+			}
 
-			ERR_FAIL_V_MSG(NULL, "Attempted to convert Variant to a managed array of unmarshallable element type.");
+			if (array_type->eklass == CACHED_CLASS_RAW(Color)) {
+				return (MonoObject *)PackedColorArray_to_mono_array(p_var->operator PackedColorArray());
+			}
+
+			GDMonoClass *array_type_class = GDMono::get_singleton()->get_class(array_type->eklass);
+			if (CACHED_CLASS(GodotObject)->is_assignable_from(array_type_class)) {
+				return (MonoObject *)Array_to_mono_array(p_var->operator Array(), array_type_class);
+			}
+
+			ERR_FAIL_V_MSG(nullptr, "Attempted to convert Variant to a managed array of unmarshallable element type.");
 		} break;
 
 		case MONO_TYPE_CLASS: {
@@ -522,6 +571,10 @@ MonoObject *variant_to_mono_object(const Variant *p_var, const ManagedType &p_ty
 				return GDMonoUtils::unmanaged_get_managed(p_var->operator Object *());
 			}
 
+			if (CACHED_CLASS(StringName) == type_class) {
+				return GDMonoUtils::create_managed_from(p_var->operator StringName());
+			}
+
 			if (CACHED_CLASS(NodePath) == type_class) {
 				return GDMonoUtils::create_managed_from(p_var->operator NodePath());
 			}
@@ -530,41 +583,17 @@ MonoObject *variant_to_mono_object(const Variant *p_var, const ManagedType &p_ty
 				return GDMonoUtils::create_managed_from(p_var->operator RID());
 			}
 
-			if (CACHED_CLASS(Dictionary) == type_class) {
+			// Godot.Collections.Dictionary or IDictionary
+			if (CACHED_CLASS(Dictionary) == type_class || CACHED_CLASS(System_Collections_IDictionary) == type_class) {
 				return GDMonoUtils::create_managed_from(p_var->operator Dictionary(), CACHED_CLASS(Dictionary));
 			}
 
-			if (CACHED_CLASS(Array) == type_class) {
+			// Godot.Collections.Array or ICollection or IEnumerable
+			if (CACHED_CLASS(Array) == type_class ||
+					CACHED_CLASS(System_Collections_ICollection) == type_class ||
+					CACHED_CLASS(System_Collections_IEnumerable) == type_class) {
 				return GDMonoUtils::create_managed_from(p_var->operator Array(), CACHED_CLASS(Array));
 			}
-
-			// The order in which we check the following interfaces is very important (dictionaries and generics first)
-
-			MonoReflectionType *reftype = mono_type_get_object(mono_domain_get(), type_class->get_mono_type());
-
-			MonoReflectionType *key_reftype, *value_reftype;
-			if (GDMonoUtils::Marshal::generic_idictionary_is_assignable_from(reftype, &key_reftype, &value_reftype)) {
-				return GDMonoUtils::create_managed_from(p_var->operator Dictionary(),
-						GDMonoUtils::Marshal::make_generic_dictionary_type(key_reftype, value_reftype));
-			}
-
-			if (type_class->implements_interface(CACHED_CLASS(System_Collections_IDictionary))) {
-				return GDMonoUtils::create_managed_from(p_var->operator Dictionary(), CACHED_CLASS(Dictionary));
-			}
-
-			MonoReflectionType *elem_reftype;
-			if (GDMonoUtils::Marshal::generic_ienumerable_is_assignable_from(reftype, &elem_reftype)) {
-				return GDMonoUtils::create_managed_from(p_var->operator Array(),
-						GDMonoUtils::Marshal::make_generic_array_type(elem_reftype));
-			}
-
-			if (type_class->implements_interface(CACHED_CLASS(System_Collections_IEnumerable))) {
-				if (GDMonoCache::tools_godot_api_check()) {
-					return GDMonoUtils::create_managed_from(p_var->operator Array(), CACHED_CLASS(Array));
-				} else {
-					return (MonoObject *)GDMonoMarshal::Array_to_mono_array(p_var->operator Array());
-				}
-			}
 		} break;
 		case MONO_TYPE_OBJECT: {
 			// Variant
@@ -574,10 +603,10 @@ MonoObject *variant_to_mono_object(const Variant *p_var, const ManagedType &p_ty
 					return BOX_BOOLEAN(val);
 				}
 				case Variant::INT: {
-					int32_t val = p_var->operator signed int();
-					return BOX_INT32(val);
+					int64_t val = p_var->operator int64_t();
+					return BOX_INT64(val);
 				}
-				case Variant::REAL: {
+				case Variant::FLOAT: {
 #ifdef REAL_T_IS_DOUBLE
 					double val = p_var->operator double();
 					return BOX_DOUBLE(val);
@@ -592,14 +621,26 @@ MonoObject *variant_to_mono_object(const Variant *p_var, const ManagedType &p_ty
 					GDMonoMarshal::M_Vector2 from = MARSHALLED_OUT(Vector2, p_var->operator ::Vector2());
 					return mono_value_box(mono_domain_get(), CACHED_CLASS_RAW(Vector2), &from);
 				}
+				case Variant::VECTOR2I: {
+					GDMonoMarshal::M_Vector2i from = MARSHALLED_OUT(Vector2i, p_var->operator ::Vector2i());
+					return mono_value_box(mono_domain_get(), CACHED_CLASS_RAW(Vector2i), &from);
+				}
 				case Variant::RECT2: {
 					GDMonoMarshal::M_Rect2 from = MARSHALLED_OUT(Rect2, p_var->operator ::Rect2());
 					return mono_value_box(mono_domain_get(), CACHED_CLASS_RAW(Rect2), &from);
 				}
+				case Variant::RECT2I: {
+					GDMonoMarshal::M_Rect2i from = MARSHALLED_OUT(Rect2i, p_var->operator ::Rect2i());
+					return mono_value_box(mono_domain_get(), CACHED_CLASS_RAW(Rect2i), &from);
+				}
 				case Variant::VECTOR3: {
 					GDMonoMarshal::M_Vector3 from = MARSHALLED_OUT(Vector3, p_var->operator ::Vector3());
 					return mono_value_box(mono_domain_get(), CACHED_CLASS_RAW(Vector3), &from);
 				}
+				case Variant::VECTOR3I: {
+					GDMonoMarshal::M_Vector3i from = MARSHALLED_OUT(Vector3i, p_var->operator ::Vector3i());
+					return mono_value_box(mono_domain_get(), CACHED_CLASS_RAW(Vector3i), &from);
+				}
 				case Variant::TRANSFORM2D: {
 					GDMonoMarshal::M_Transform2D from = MARSHALLED_OUT(Transform2D, p_var->operator ::Transform2D());
 					return mono_value_box(mono_domain_get(), CACHED_CLASS_RAW(Transform2D), &from);
@@ -628,80 +669,103 @@ MonoObject *variant_to_mono_object(const Variant *p_var, const ManagedType &p_ty
 					GDMonoMarshal::M_Color from = MARSHALLED_OUT(Color, p_var->operator ::Color());
 					return mono_value_box(mono_domain_get(), CACHED_CLASS_RAW(Color), &from);
 				}
+				case Variant::STRING_NAME:
+					return GDMonoUtils::create_managed_from(p_var->operator StringName());
 				case Variant::NODE_PATH:
 					return GDMonoUtils::create_managed_from(p_var->operator NodePath());
 				case Variant::_RID:
 					return GDMonoUtils::create_managed_from(p_var->operator RID());
 				case Variant::OBJECT:
 					return GDMonoUtils::unmanaged_get_managed(p_var->operator Object *());
+				case Variant::CALLABLE: {
+					GDMonoMarshal::M_Callable from = GDMonoMarshal::callable_to_managed(p_var->operator Callable());
+					return mono_value_box(mono_domain_get(), CACHED_CLASS_RAW(Callable), &from);
+				}
+				case Variant::SIGNAL: {
+					GDMonoMarshal::M_SignalInfo from = GDMonoMarshal::signal_info_to_managed(p_var->operator Signal());
+					return mono_value_box(mono_domain_get(), CACHED_CLASS_RAW(SignalInfo), &from);
+				}
 				case Variant::DICTIONARY:
 					return GDMonoUtils::create_managed_from(p_var->operator Dictionary(), CACHED_CLASS(Dictionary));
 				case Variant::ARRAY:
 					return GDMonoUtils::create_managed_from(p_var->operator Array(), CACHED_CLASS(Array));
-				case Variant::POOL_BYTE_ARRAY:
-					return (MonoObject *)PoolByteArray_to_mono_array(p_var->operator PoolByteArray());
-				case Variant::POOL_INT_ARRAY:
-					return (MonoObject *)PoolIntArray_to_mono_array(p_var->operator PoolIntArray());
-				case Variant::POOL_REAL_ARRAY:
-					return (MonoObject *)PoolRealArray_to_mono_array(p_var->operator PoolRealArray());
-				case Variant::POOL_STRING_ARRAY:
-					return (MonoObject *)PoolStringArray_to_mono_array(p_var->operator PoolStringArray());
-				case Variant::POOL_VECTOR2_ARRAY:
-					return (MonoObject *)PoolVector2Array_to_mono_array(p_var->operator PoolVector2Array());
-				case Variant::POOL_VECTOR3_ARRAY:
-					return (MonoObject *)PoolVector3Array_to_mono_array(p_var->operator PoolVector3Array());
-				case Variant::POOL_COLOR_ARRAY:
-					return (MonoObject *)PoolColorArray_to_mono_array(p_var->operator PoolColorArray());
+				case Variant::PACKED_BYTE_ARRAY:
+					return (MonoObject *)PackedByteArray_to_mono_array(p_var->operator PackedByteArray());
+				case Variant::PACKED_INT32_ARRAY:
+					return (MonoObject *)PackedInt32Array_to_mono_array(p_var->operator PackedInt32Array());
+				case Variant::PACKED_INT64_ARRAY:
+					return (MonoObject *)PackedInt64Array_to_mono_array(p_var->operator PackedInt64Array());
+				case Variant::PACKED_FLOAT32_ARRAY:
+					return (MonoObject *)PackedFloat32Array_to_mono_array(p_var->operator PackedFloat32Array());
+				case Variant::PACKED_FLOAT64_ARRAY:
+					return (MonoObject *)PackedFloat64Array_to_mono_array(p_var->operator PackedFloat64Array());
+				case Variant::PACKED_STRING_ARRAY:
+					return (MonoObject *)PackedStringArray_to_mono_array(p_var->operator PackedStringArray());
+				case Variant::PACKED_VECTOR2_ARRAY:
+					return (MonoObject *)PackedVector2Array_to_mono_array(p_var->operator PackedVector2Array());
+				case Variant::PACKED_VECTOR3_ARRAY:
+					return (MonoObject *)PackedVector3Array_to_mono_array(p_var->operator PackedVector3Array());
+				case Variant::PACKED_COLOR_ARRAY:
+					return (MonoObject *)PackedColorArray_to_mono_array(p_var->operator PackedColorArray());
 				default:
-					return NULL;
+					return nullptr;
 			}
 			break;
 			case MONO_TYPE_GENERICINST: {
 				MonoReflectionType *reftype = mono_type_get_object(mono_domain_get(), p_type.type_class->get_mono_type());
 
+				// Godot.Collections.Dictionary<TKey, TValue>
 				if (GDMonoUtils::Marshal::type_is_generic_dictionary(reftype)) {
 					return GDMonoUtils::create_managed_from(p_var->operator Dictionary(), p_type.type_class);
 				}
 
+				// Godot.Collections.Array<T>
 				if (GDMonoUtils::Marshal::type_is_generic_array(reftype)) {
 					return GDMonoUtils::create_managed_from(p_var->operator Array(), p_type.type_class);
 				}
 
-				// The order in which we check the following interfaces is very important (dictionaries and generics first)
-
-				MonoReflectionType *key_reftype, *value_reftype;
-				if (GDMonoUtils::Marshal::generic_idictionary_is_assignable_from(reftype, &key_reftype, &value_reftype)) {
-					return GDMonoUtils::create_managed_from(p_var->operator Dictionary(),
-							GDMonoUtils::Marshal::make_generic_dictionary_type(key_reftype, value_reftype));
+				// System.Collections.Generic.Dictionary<TKey, TValue>
+				if (GDMonoUtils::Marshal::type_is_system_generic_dictionary(reftype)) {
+					MonoReflectionType *key_reftype = nullptr;
+					MonoReflectionType *value_reftype = nullptr;
+					GDMonoUtils::Marshal::dictionary_get_key_value_types(reftype, &key_reftype, &value_reftype);
+					return Dictionary_to_system_generic_dict(p_var->operator Dictionary(), p_type.type_class, key_reftype, value_reftype);
 				}
 
-				if (p_type.type_class->implements_interface(CACHED_CLASS(System_Collections_IDictionary))) {
-					return GDMonoUtils::create_managed_from(p_var->operator Dictionary(), CACHED_CLASS(Dictionary));
+				// System.Collections.Generic.List<T>
+				if (GDMonoUtils::Marshal::type_is_system_generic_list(reftype)) {
+					MonoReflectionType *elem_reftype = nullptr;
+					GDMonoUtils::Marshal::array_get_element_type(reftype, &elem_reftype);
+					return Array_to_system_generic_list(p_var->operator Array(), p_type.type_class, elem_reftype);
 				}
 
-				MonoReflectionType *elem_reftype;
-				if (GDMonoUtils::Marshal::generic_ienumerable_is_assignable_from(reftype, &elem_reftype)) {
-					return GDMonoUtils::create_managed_from(p_var->operator Array(),
-							GDMonoUtils::Marshal::make_generic_array_type(elem_reftype));
+				// IDictionary<TKey, TValue>
+				if (GDMonoUtils::Marshal::type_is_generic_idictionary(reftype)) {
+					MonoReflectionType *key_reftype;
+					MonoReflectionType *value_reftype;
+					GDMonoUtils::Marshal::dictionary_get_key_value_types(reftype, &key_reftype, &value_reftype);
+					GDMonoClass *godot_dict_class = GDMonoUtils::Marshal::make_generic_dictionary_type(key_reftype, value_reftype);
+
+					return GDMonoUtils::create_managed_from(p_var->operator Dictionary(), godot_dict_class);
 				}
 
-				if (p_type.type_class->implements_interface(CACHED_CLASS(System_Collections_IEnumerable))) {
-					if (GDMonoCache::tools_godot_api_check()) {
-						return GDMonoUtils::create_managed_from(p_var->operator Array(), CACHED_CLASS(Array));
-					} else {
-						return (MonoObject *)GDMonoMarshal::Array_to_mono_array(p_var->operator Array());
-					}
+				// ICollection<T> or IEnumerable<T>
+				if (GDMonoUtils::Marshal::type_is_generic_icollection(reftype) || GDMonoUtils::Marshal::type_is_generic_ienumerable(reftype)) {
+					MonoReflectionType *elem_reftype;
+					GDMonoUtils::Marshal::array_get_element_type(reftype, &elem_reftype);
+					GDMonoClass *godot_array_class = GDMonoUtils::Marshal::make_generic_array_type(elem_reftype);
+
+					return GDMonoUtils::create_managed_from(p_var->operator Array(), godot_array_class);
 				}
 			} break;
 		} break;
 	}
 
-	ERR_FAIL_V_MSG(NULL, "Attempted to convert Variant to an unmarshallable managed type. Name: '" +
-								 p_type.type_class->get_name() + "' Encoding: " + itos(p_type.type_encoding) + ".");
+	ERR_FAIL_V_MSG(nullptr, "Attempted to convert Variant to an unmarshallable managed type. Name: '" +
+									p_type.type_class->get_name() + "' Encoding: " + itos(p_type.type_encoding) + ".");
 }
 
 Variant mono_object_to_variant_impl(MonoObject *p_obj, const ManagedType &p_type, bool p_fail_with_err = true) {
-
 	ERR_FAIL_COND_V(!p_type.type_class, Variant());
 
 	switch (p_type.type_encoding) {
@@ -735,75 +799,128 @@ Variant mono_object_to_variant_impl(MonoObject *p_obj, const ManagedType &p_type
 			return unbox<double>(p_obj);
 
 		case MONO_TYPE_STRING: {
-			if (p_obj == NULL)
+			if (p_obj == nullptr) {
 				return Variant(); // NIL
+			}
 			return mono_string_to_godot_not_null((MonoString *)p_obj);
 		} break;
 
 		case MONO_TYPE_VALUETYPE: {
 			GDMonoClass *vtclass = p_type.type_class;
 
-			if (vtclass == CACHED_CLASS(Vector2))
-				return MARSHALLED_IN(Vector2, (GDMonoMarshal::M_Vector2 *)mono_object_unbox(p_obj));
+			if (vtclass == CACHED_CLASS(Vector2)) {
+				return MARSHALLED_IN(Vector2, unbox_addr<GDMonoMarshal::M_Vector2>(p_obj));
+			}
 
-			if (vtclass == CACHED_CLASS(Rect2))
-				return MARSHALLED_IN(Rect2, (GDMonoMarshal::M_Rect2 *)mono_object_unbox(p_obj));
+			if (vtclass == CACHED_CLASS(Vector2i)) {
+				return MARSHALLED_IN(Vector2i, unbox_addr<GDMonoMarshal::M_Vector2i>(p_obj));
+			}
 
-			if (vtclass == CACHED_CLASS(Transform2D))
-				return MARSHALLED_IN(Transform2D, (GDMonoMarshal::M_Transform2D *)mono_object_unbox(p_obj));
+			if (vtclass == CACHED_CLASS(Rect2)) {
+				return MARSHALLED_IN(Rect2, unbox_addr<GDMonoMarshal::M_Rect2>(p_obj));
+			}
 
-			if (vtclass == CACHED_CLASS(Vector3))
-				return MARSHALLED_IN(Vector3, (GDMonoMarshal::M_Vector3 *)mono_object_unbox(p_obj));
+			if (vtclass == CACHED_CLASS(Rect2i)) {
+				return MARSHALLED_IN(Rect2i, unbox_addr<GDMonoMarshal::M_Rect2i>(p_obj));
+			}
 
-			if (vtclass == CACHED_CLASS(Basis))
-				return MARSHALLED_IN(Basis, (GDMonoMarshal::M_Basis *)mono_object_unbox(p_obj));
+			if (vtclass == CACHED_CLASS(Transform2D)) {
+				return MARSHALLED_IN(Transform2D, unbox_addr<GDMonoMarshal::M_Transform2D>(p_obj));
+			}
 
-			if (vtclass == CACHED_CLASS(Quat))
-				return MARSHALLED_IN(Quat, (GDMonoMarshal::M_Quat *)mono_object_unbox(p_obj));
+			if (vtclass == CACHED_CLASS(Vector3)) {
+				return MARSHALLED_IN(Vector3, unbox_addr<GDMonoMarshal::M_Vector3>(p_obj));
+			}
 
-			if (vtclass == CACHED_CLASS(Transform))
-				return MARSHALLED_IN(Transform, (GDMonoMarshal::M_Transform *)mono_object_unbox(p_obj));
+			if (vtclass == CACHED_CLASS(Vector3i)) {
+				return MARSHALLED_IN(Vector3i, unbox_addr<GDMonoMarshal::M_Vector3i>(p_obj));
+			}
 
-			if (vtclass == CACHED_CLASS(AABB))
-				return MARSHALLED_IN(AABB, (GDMonoMarshal::M_AABB *)mono_object_unbox(p_obj));
+			if (vtclass == CACHED_CLASS(Basis)) {
+				return MARSHALLED_IN(Basis, unbox_addr<GDMonoMarshal::M_Basis>(p_obj));
+			}
+
+			if (vtclass == CACHED_CLASS(Quat)) {
+				return MARSHALLED_IN(Quat, unbox_addr<GDMonoMarshal::M_Quat>(p_obj));
+			}
+
+			if (vtclass == CACHED_CLASS(Transform)) {
+				return MARSHALLED_IN(Transform, unbox_addr<GDMonoMarshal::M_Transform>(p_obj));
+			}
+
+			if (vtclass == CACHED_CLASS(AABB)) {
+				return MARSHALLED_IN(AABB, unbox_addr<GDMonoMarshal::M_AABB>(p_obj));
+			}
+
+			if (vtclass == CACHED_CLASS(Color)) {
+				return MARSHALLED_IN(Color, unbox_addr<GDMonoMarshal::M_Color>(p_obj));
+			}
 
-			if (vtclass == CACHED_CLASS(Color))
-				return MARSHALLED_IN(Color, (GDMonoMarshal::M_Color *)mono_object_unbox(p_obj));
+			if (vtclass == CACHED_CLASS(Plane)) {
+				return MARSHALLED_IN(Plane, unbox_addr<GDMonoMarshal::M_Plane>(p_obj));
+			}
 
-			if (vtclass == CACHED_CLASS(Plane))
-				return MARSHALLED_IN(Plane, (GDMonoMarshal::M_Plane *)mono_object_unbox(p_obj));
+			if (vtclass == CACHED_CLASS(Callable)) {
+				return managed_to_callable(unbox<GDMonoMarshal::M_Callable>(p_obj));
+			}
 
-			if (mono_class_is_enum(vtclass->get_mono_ptr()))
+			if (vtclass == CACHED_CLASS(SignalInfo)) {
+				return managed_to_signal_info(unbox<GDMonoMarshal::M_SignalInfo>(p_obj));
+			}
+
+			if (mono_class_is_enum(vtclass->get_mono_ptr())) {
 				return unbox<int32_t>(p_obj);
+			}
 		} break;
 
 		case MONO_TYPE_ARRAY:
 		case MONO_TYPE_SZARRAY: {
 			MonoArrayType *array_type = mono_type_get_array_type(p_type.type_class->get_mono_type());
 
-			if (array_type->eklass == CACHED_CLASS_RAW(MonoObject))
+			if (array_type->eklass == CACHED_CLASS_RAW(MonoObject)) {
 				return mono_array_to_Array((MonoArray *)p_obj);
+			}
+
+			if (array_type->eklass == CACHED_CLASS_RAW(uint8_t)) {
+				return mono_array_to_PackedByteArray((MonoArray *)p_obj);
+			}
 
-			if (array_type->eklass == CACHED_CLASS_RAW(uint8_t))
-				return mono_array_to_PoolByteArray((MonoArray *)p_obj);
+			if (array_type->eklass == CACHED_CLASS_RAW(int32_t)) {
+				return mono_array_to_PackedInt32Array((MonoArray *)p_obj);
+			}
 
-			if (array_type->eklass == CACHED_CLASS_RAW(int32_t))
-				return mono_array_to_PoolIntArray((MonoArray *)p_obj);
+			if (array_type->eklass == CACHED_CLASS_RAW(int64_t)) {
+				return mono_array_to_PackedInt64Array((MonoArray *)p_obj);
+			}
 
-			if (array_type->eklass == REAL_T_MONOCLASS)
-				return mono_array_to_PoolRealArray((MonoArray *)p_obj);
+			if (array_type->eklass == CACHED_CLASS_RAW(float)) {
+				return mono_array_to_PackedFloat32Array((MonoArray *)p_obj);
+			}
 
-			if (array_type->eklass == CACHED_CLASS_RAW(String))
-				return mono_array_to_PoolStringArray((MonoArray *)p_obj);
+			if (array_type->eklass == CACHED_CLASS_RAW(double)) {
+				return mono_array_to_PackedFloat64Array((MonoArray *)p_obj);
+			}
 
-			if (array_type->eklass == CACHED_CLASS_RAW(Vector2))
-				return mono_array_to_PoolVector2Array((MonoArray *)p_obj);
+			if (array_type->eklass == CACHED_CLASS_RAW(String)) {
+				return mono_array_to_PackedStringArray((MonoArray *)p_obj);
+			}
 
-			if (array_type->eklass == CACHED_CLASS_RAW(Vector3))
-				return mono_array_to_PoolVector3Array((MonoArray *)p_obj);
+			if (array_type->eklass == CACHED_CLASS_RAW(Vector2)) {
+				return mono_array_to_PackedVector2Array((MonoArray *)p_obj);
+			}
+
+			if (array_type->eklass == CACHED_CLASS_RAW(Vector3)) {
+				return mono_array_to_PackedVector3Array((MonoArray *)p_obj);
+			}
+
+			if (array_type->eklass == CACHED_CLASS_RAW(Color)) {
+				return mono_array_to_PackedColorArray((MonoArray *)p_obj);
+			}
 
-			if (array_type->eklass == CACHED_CLASS_RAW(Color))
-				return mono_array_to_PoolColorArray((MonoArray *)p_obj);
+			GDMonoClass *array_type_class = GDMono::get_singleton()->get_class(array_type->eklass);
+			if (CACHED_CLASS(GodotObject)->is_assignable_from(array_type_class)) {
+				return mono_array_to_Array((MonoArray *)p_obj);
+			}
 
 			if (p_fail_with_err) {
 				ERR_FAIL_V_MSG(Variant(), "Attempted to convert a managed array of unmarshallable element type to Variant.");
@@ -818,13 +935,18 @@ Variant mono_object_to_variant_impl(MonoObject *p_obj, const ManagedType &p_type
 			// GodotObject
 			if (CACHED_CLASS(GodotObject)->is_assignable_from(type_class)) {
 				Object *ptr = unbox<Object *>(CACHED_FIELD(GodotObject, ptr)->get_value(p_obj));
-				if (ptr != NULL) {
+				if (ptr != nullptr) {
 					Reference *ref = Object::cast_to<Reference>(ptr);
 					return ref ? Variant(Ref<Reference>(ref)) : Variant(ptr);
 				}
 				return Variant();
 			}
 
+			if (CACHED_CLASS(StringName) == type_class) {
+				StringName *ptr = unbox<StringName *>(CACHED_FIELD(StringName, ptr)->get_value(p_obj));
+				return ptr ? Variant(*ptr) : Variant();
+			}
+
 			if (CACHED_CLASS(NodePath) == type_class) {
 				NodePath *ptr = unbox<NodePath *>(CACHED_FIELD(NodePath, ptr)->get_value(p_obj));
 				return ptr ? Variant(*ptr) : Variant();
@@ -835,74 +957,55 @@ Variant mono_object_to_variant_impl(MonoObject *p_obj, const ManagedType &p_type
 				return ptr ? Variant(*ptr) : Variant();
 			}
 
-			if (CACHED_CLASS(Array) == type_class) {
-				MonoException *exc = NULL;
-				Array *ptr = CACHED_METHOD_THUNK(Array, GetPtr).invoke(p_obj, &exc);
-				UNHANDLED_EXCEPTION(exc);
-				return ptr ? Variant(*ptr) : Variant();
-			}
-
+			// Godot.Collections.Dictionary
 			if (CACHED_CLASS(Dictionary) == type_class) {
-				MonoException *exc = NULL;
+				MonoException *exc = nullptr;
 				Dictionary *ptr = CACHED_METHOD_THUNK(Dictionary, GetPtr).invoke(p_obj, &exc);
 				UNHANDLED_EXCEPTION(exc);
 				return ptr ? Variant(*ptr) : Variant();
 			}
 
-			// The order in which we check the following interfaces is very important (dictionaries and generics first)
-
-			MonoReflectionType *reftype = mono_type_get_object(mono_domain_get(), type_class->get_mono_type());
-
-			if (GDMonoUtils::Marshal::generic_idictionary_is_assignable_from(reftype)) {
-				return GDMonoUtils::Marshal::generic_idictionary_to_dictionary(p_obj);
-			}
-
-			if (type_class->implements_interface(CACHED_CLASS(System_Collections_IDictionary))) {
-				return GDMonoUtils::Marshal::idictionary_to_dictionary(p_obj);
-			}
-
-			if (GDMonoUtils::Marshal::generic_ienumerable_is_assignable_from(reftype)) {
-				return GDMonoUtils::Marshal::enumerable_to_array(p_obj);
-			}
-
-			if (type_class->implements_interface(CACHED_CLASS(System_Collections_IEnumerable))) {
-				return GDMonoUtils::Marshal::enumerable_to_array(p_obj);
+			// Godot.Collections.Array
+			if (CACHED_CLASS(Array) == type_class) {
+				MonoException *exc = nullptr;
+				Array *ptr = CACHED_METHOD_THUNK(Array, GetPtr).invoke(p_obj, &exc);
+				UNHANDLED_EXCEPTION(exc);
+				return ptr ? Variant(*ptr) : Variant();
 			}
 		} break;
 
 		case MONO_TYPE_GENERICINST: {
 			MonoReflectionType *reftype = mono_type_get_object(mono_domain_get(), p_type.type_class->get_mono_type());
 
+			// Godot.Collections.Dictionary<TKey, TValue>
 			if (GDMonoUtils::Marshal::type_is_generic_dictionary(reftype)) {
-				MonoException *exc = NULL;
+				MonoException *exc = nullptr;
 				MonoObject *ret = p_type.type_class->get_method("GetPtr")->invoke(p_obj, &exc);
 				UNHANDLED_EXCEPTION(exc);
 				return *unbox<Dictionary *>(ret);
 			}
 
+			// Godot.Collections.Array<T>
 			if (GDMonoUtils::Marshal::type_is_generic_array(reftype)) {
-				MonoException *exc = NULL;
+				MonoException *exc = nullptr;
 				MonoObject *ret = p_type.type_class->get_method("GetPtr")->invoke(p_obj, &exc);
 				UNHANDLED_EXCEPTION(exc);
 				return *unbox<Array *>(ret);
 			}
 
-			// The order in which we check the following interfaces is very important (dictionaries and generics first)
-
-			if (GDMonoUtils::Marshal::generic_idictionary_is_assignable_from(reftype)) {
-				return GDMonoUtils::Marshal::generic_idictionary_to_dictionary(p_obj);
-			}
-
-			if (p_type.type_class->implements_interface(CACHED_CLASS(System_Collections_IDictionary))) {
-				return GDMonoUtils::Marshal::idictionary_to_dictionary(p_obj);
-			}
-
-			if (GDMonoUtils::Marshal::generic_ienumerable_is_assignable_from(reftype)) {
-				return GDMonoUtils::Marshal::enumerable_to_array(p_obj);
+			// System.Collections.Generic.Dictionary<TKey, TValue>
+			if (GDMonoUtils::Marshal::type_is_system_generic_dictionary(reftype)) {
+				MonoReflectionType *key_reftype = nullptr;
+				MonoReflectionType *value_reftype = nullptr;
+				GDMonoUtils::Marshal::dictionary_get_key_value_types(reftype, &key_reftype, &value_reftype);
+				return system_generic_dict_to_Dictionary(p_obj, p_type.type_class, key_reftype, value_reftype);
 			}
 
-			if (p_type.type_class->implements_interface(CACHED_CLASS(System_Collections_IEnumerable))) {
-				return GDMonoUtils::Marshal::enumerable_to_array(p_obj);
+			// System.Collections.Generic.List<T>
+			if (GDMonoUtils::Marshal::type_is_system_generic_list(reftype)) {
+				MonoReflectionType *elem_reftype = nullptr;
+				GDMonoUtils::Marshal::array_get_element_type(reftype, &elem_reftype);
+				return system_generic_list_to_Array(p_obj, p_type.type_class, elem_reftype);
 			}
 		} break;
 	}
@@ -916,8 +1019,9 @@ Variant mono_object_to_variant_impl(MonoObject *p_obj, const ManagedType &p_type
 }
 
 Variant mono_object_to_variant(MonoObject *p_obj) {
-	if (!p_obj)
+	if (!p_obj) {
 		return Variant();
+	}
 
 	ManagedType type = ManagedType::from_class(mono_object_get_class(p_obj));
 
@@ -925,31 +1029,38 @@ Variant mono_object_to_variant(MonoObject *p_obj) {
 }
 
 Variant mono_object_to_variant(MonoObject *p_obj, const ManagedType &p_type) {
-	if (!p_obj)
+	if (!p_obj) {
 		return Variant();
+	}
 
 	return mono_object_to_variant_impl(p_obj, p_type);
 }
 
 Variant mono_object_to_variant_no_err(MonoObject *p_obj, const ManagedType &p_type) {
-	if (!p_obj)
+	if (!p_obj) {
 		return Variant();
+	}
 
 	return mono_object_to_variant_impl(p_obj, p_type, /* fail_with_err: */ false);
 }
 
 String mono_object_to_variant_string(MonoObject *p_obj, MonoException **r_exc) {
+	if (p_obj == nullptr) {
+		return String("null");
+	}
+
 	ManagedType type = ManagedType::from_class(mono_object_get_class(p_obj));
 	Variant var = GDMonoMarshal::mono_object_to_variant_no_err(p_obj, type);
 
-	if (var.get_type() == Variant::NIL && p_obj != NULL) {
+	if (var.get_type() == Variant::NIL && p_obj != nullptr) {
 		// Cannot convert MonoObject* to Variant; fallback to 'ToString()'.
-		MonoException *exc = NULL;
+		MonoException *exc = nullptr;
 		MonoString *mono_str = GDMonoUtils::object_to_string(p_obj, &exc);
 
 		if (exc) {
-			if (r_exc)
+			if (r_exc) {
 				*r_exc = exc;
+			}
 			return String();
 		}
 
@@ -959,10 +1070,97 @@ String mono_object_to_variant_string(MonoObject *p_obj, MonoException **r_exc) {
 	}
 }
 
+MonoObject *Dictionary_to_system_generic_dict(const Dictionary &p_dict, GDMonoClass *p_class, MonoReflectionType *p_key_reftype, MonoReflectionType *p_value_reftype) {
+	String ctor_desc = ":.ctor(System.Collections.Generic.IDictionary`2<" + GDMonoUtils::get_type_desc(p_key_reftype) +
+					   ", " + GDMonoUtils::get_type_desc(p_value_reftype) + ">)";
+	GDMonoMethod *ctor = p_class->get_method_with_desc(ctor_desc, true);
+	CRASH_COND(ctor == nullptr);
+
+	MonoObject *mono_object = mono_object_new(mono_domain_get(), p_class->get_mono_ptr());
+	ERR_FAIL_NULL_V(mono_object, nullptr);
+
+	GDMonoClass *godot_dict_class = GDMonoUtils::Marshal::make_generic_dictionary_type(p_key_reftype, p_value_reftype);
+	MonoObject *godot_dict = GDMonoUtils::create_managed_from(p_dict, godot_dict_class);
+
+	void *ctor_args[1] = { godot_dict };
+
+	MonoException *exc = nullptr;
+	ctor->invoke_raw(mono_object, ctor_args, &exc);
+	UNHANDLED_EXCEPTION(exc);
+
+	return mono_object;
+}
+
+Dictionary system_generic_dict_to_Dictionary(MonoObject *p_obj, [[maybe_unused]] GDMonoClass *p_class, MonoReflectionType *p_key_reftype, MonoReflectionType *p_value_reftype) {
+	GDMonoClass *godot_dict_class = GDMonoUtils::Marshal::make_generic_dictionary_type(p_key_reftype, p_value_reftype);
+	String ctor_desc = ":.ctor(System.Collections.Generic.IDictionary`2<" + GDMonoUtils::get_type_desc(p_key_reftype) +
+					   ", " + GDMonoUtils::get_type_desc(p_value_reftype) + ">)";
+	GDMonoMethod *godot_dict_ctor = godot_dict_class->get_method_with_desc(ctor_desc, true);
+	CRASH_COND(godot_dict_ctor == nullptr);
+
+	MonoObject *godot_dict = mono_object_new(mono_domain_get(), godot_dict_class->get_mono_ptr());
+	ERR_FAIL_NULL_V(godot_dict, Dictionary());
+
+	void *ctor_args[1] = { p_obj };
+
+	MonoException *exc = nullptr;
+	godot_dict_ctor->invoke_raw(godot_dict, ctor_args, &exc);
+	UNHANDLED_EXCEPTION(exc);
+
+	exc = nullptr;
+	MonoObject *ret = godot_dict_class->get_method("GetPtr")->invoke(godot_dict, &exc);
+	UNHANDLED_EXCEPTION(exc);
+
+	return *unbox<Dictionary *>(ret);
+}
+
+MonoObject *Array_to_system_generic_list(const Array &p_array, GDMonoClass *p_class, MonoReflectionType *p_elem_reftype) {
+	GDMonoClass *elem_class = ManagedType::from_reftype(p_elem_reftype).type_class;
+
+	String ctor_desc = ":.ctor(System.Collections.Generic.IEnumerable`1<" + elem_class->get_type_desc() + ">)";
+	GDMonoMethod *ctor = p_class->get_method_with_desc(ctor_desc, true);
+	CRASH_COND(ctor == nullptr);
+
+	MonoObject *mono_object = mono_object_new(mono_domain_get(), p_class->get_mono_ptr());
+	ERR_FAIL_NULL_V(mono_object, nullptr);
+
+	void *ctor_args[1] = { Array_to_mono_array(p_array, elem_class) };
+
+	MonoException *exc = nullptr;
+	ctor->invoke_raw(mono_object, ctor_args, &exc);
+	UNHANDLED_EXCEPTION(exc);
+
+	return mono_object;
+}
+
+Array system_generic_list_to_Array(MonoObject *p_obj, GDMonoClass *p_class, [[maybe_unused]] MonoReflectionType *p_elem_reftype) {
+	GDMonoMethod *to_array = p_class->get_method("ToArray", 0);
+	CRASH_COND(to_array == nullptr);
+
+	MonoException *exc = nullptr;
+	MonoArray *mono_array = (MonoArray *)to_array->invoke_raw(p_obj, nullptr, &exc);
+	UNHANDLED_EXCEPTION(exc);
+
+	return mono_array_to_Array(mono_array);
+}
+
 MonoArray *Array_to_mono_array(const Array &p_array) {
-	MonoArray *ret = mono_array_new(mono_domain_get(), CACHED_CLASS_RAW(MonoObject), p_array.size());
+	int length = p_array.size();
+	MonoArray *ret = mono_array_new(mono_domain_get(), CACHED_CLASS_RAW(MonoObject), length);
+
+	for (int i = 0; i < length; i++) {
+		MonoObject *boxed = variant_to_mono_object(p_array[i]);
+		mono_array_setref(ret, i, boxed);
+	}
+
+	return ret;
+}
+
+MonoArray *Array_to_mono_array(const Array &p_array, GDMonoClass *p_array_type_class) {
+	int length = p_array.size();
+	MonoArray *ret = mono_array_new(mono_domain_get(), p_array_type_class->get_mono_ptr(), length);
 
-	for (int i = 0; i < p_array.size(); i++) {
+	for (int i = 0; i < length; i++) {
 		MonoObject *boxed = variant_to_mono_object(p_array[i]);
 		mono_array_setref(ret, i, boxed);
 	}
@@ -972,8 +1170,9 @@ MonoArray *Array_to_mono_array(const Array &p_array) {
 
 Array mono_array_to_Array(MonoArray *p_array) {
 	Array ret;
-	if (!p_array)
+	if (!p_array) {
 		return ret;
+	}
 	int length = mono_array_length(p_array);
 	ret.resize(length);
 
@@ -985,95 +1184,148 @@ Array mono_array_to_Array(MonoArray *p_array) {
 	return ret;
 }
 
-// TODO: Use memcpy where possible
+MonoArray *PackedInt32Array_to_mono_array(const PackedInt32Array &p_array) {
+	const int32_t *src = p_array.ptr();
+	int length = p_array.size();
 
-MonoArray *PoolIntArray_to_mono_array(const PoolIntArray &p_array) {
-	PoolIntArray::Read r = p_array.read();
+	MonoArray *ret = mono_array_new(mono_domain_get(), CACHED_CLASS_RAW(int32_t), length);
 
-	MonoArray *ret = mono_array_new(mono_domain_get(), CACHED_CLASS_RAW(int32_t), p_array.size());
+	int32_t *dst = mono_array_addr(ret, int32_t, 0);
+	memcpy(dst, src, length * sizeof(int32_t));
 
-	for (int i = 0; i < p_array.size(); i++) {
-		mono_array_set(ret, int32_t, i, r[i]);
+	return ret;
+}
+
+PackedInt32Array mono_array_to_PackedInt32Array(MonoArray *p_array) {
+	PackedInt32Array ret;
+	if (!p_array) {
+		return ret;
 	}
+	int length = mono_array_length(p_array);
+	ret.resize(length);
+	int32_t *dst = ret.ptrw();
+
+	const int32_t *src = mono_array_addr(p_array, int32_t, 0);
+	memcpy(dst, src, length * sizeof(int32_t));
 
 	return ret;
 }
 
-PoolIntArray mono_array_to_PoolIntArray(MonoArray *p_array) {
-	PoolIntArray ret;
-	if (!p_array)
+MonoArray *PackedInt64Array_to_mono_array(const PackedInt64Array &p_array) {
+	const int64_t *src = p_array.ptr();
+	int length = p_array.size();
+
+	MonoArray *ret = mono_array_new(mono_domain_get(), CACHED_CLASS_RAW(int64_t), length);
+
+	int64_t *dst = mono_array_addr(ret, int64_t, 0);
+	memcpy(dst, src, length * sizeof(int64_t));
+
+	return ret;
+}
+
+PackedInt64Array mono_array_to_PackedInt64Array(MonoArray *p_array) {
+	PackedInt64Array ret;
+	if (!p_array) {
 		return ret;
+	}
 	int length = mono_array_length(p_array);
 	ret.resize(length);
-	PoolIntArray::Write w = ret.write();
+	int64_t *dst = ret.ptrw();
 
-	for (int i = 0; i < length; i++) {
-		w[i] = mono_array_get(p_array, int32_t, i);
-	}
+	const int64_t *src = mono_array_addr(p_array, int64_t, 0);
+	memcpy(dst, src, length * sizeof(int64_t));
 
 	return ret;
 }
 
-MonoArray *PoolByteArray_to_mono_array(const PoolByteArray &p_array) {
-	PoolByteArray::Read r = p_array.read();
+MonoArray *PackedByteArray_to_mono_array(const PackedByteArray &p_array) {
+	const uint8_t *src = p_array.ptr();
+	int length = p_array.size();
 
-	MonoArray *ret = mono_array_new(mono_domain_get(), CACHED_CLASS_RAW(uint8_t), p_array.size());
+	MonoArray *ret = mono_array_new(mono_domain_get(), CACHED_CLASS_RAW(uint8_t), length);
 
-	for (int i = 0; i < p_array.size(); i++) {
-		mono_array_set(ret, uint8_t, i, r[i]);
-	}
+	uint8_t *dst = mono_array_addr(ret, uint8_t, 0);
+	memcpy(dst, src, length * sizeof(uint8_t));
 
 	return ret;
 }
 
-PoolByteArray mono_array_to_PoolByteArray(MonoArray *p_array) {
-	PoolByteArray ret;
-	if (!p_array)
+PackedByteArray mono_array_to_PackedByteArray(MonoArray *p_array) {
+	PackedByteArray ret;
+	if (!p_array) {
 		return ret;
+	}
 	int length = mono_array_length(p_array);
 	ret.resize(length);
-	PoolByteArray::Write w = ret.write();
+	uint8_t *dst = ret.ptrw();
 
-	for (int i = 0; i < length; i++) {
-		w[i] = mono_array_get(p_array, uint8_t, i);
-	}
+	const uint8_t *src = mono_array_addr(p_array, uint8_t, 0);
+	memcpy(dst, src, length * sizeof(uint8_t));
 
 	return ret;
 }
 
-MonoArray *PoolRealArray_to_mono_array(const PoolRealArray &p_array) {
-	PoolRealArray::Read r = p_array.read();
+MonoArray *PackedFloat32Array_to_mono_array(const PackedFloat32Array &p_array) {
+	const float *src = p_array.ptr();
+	int length = p_array.size();
 
-	MonoArray *ret = mono_array_new(mono_domain_get(), REAL_T_MONOCLASS, p_array.size());
+	MonoArray *ret = mono_array_new(mono_domain_get(), CACHED_CLASS_RAW(float), length);
 
-	for (int i = 0; i < p_array.size(); i++) {
-		mono_array_set(ret, real_t, i, r[i]);
-	}
+	float *dst = mono_array_addr(ret, float, 0);
+	memcpy(dst, src, length * sizeof(float));
 
 	return ret;
 }
 
-PoolRealArray mono_array_to_PoolRealArray(MonoArray *p_array) {
-	PoolRealArray ret;
-	if (!p_array)
+PackedFloat32Array mono_array_to_PackedFloat32Array(MonoArray *p_array) {
+	PackedFloat32Array ret;
+	if (!p_array) {
 		return ret;
+	}
 	int length = mono_array_length(p_array);
 	ret.resize(length);
-	PoolRealArray::Write w = ret.write();
+	float *dst = ret.ptrw();
 
-	for (int i = 0; i < length; i++) {
-		w[i] = mono_array_get(p_array, real_t, i);
+	const float *src = mono_array_addr(p_array, float, 0);
+	memcpy(dst, src, length * sizeof(float));
+
+	return ret;
+}
+
+MonoArray *PackedFloat64Array_to_mono_array(const PackedFloat64Array &p_array) {
+	const double *src = p_array.ptr();
+	int length = p_array.size();
+
+	MonoArray *ret = mono_array_new(mono_domain_get(), CACHED_CLASS_RAW(double), length);
+
+	double *dst = mono_array_addr(ret, double, 0);
+	memcpy(dst, src, length * sizeof(double));
+
+	return ret;
+}
+
+PackedFloat64Array mono_array_to_PackedFloat64Array(MonoArray *p_array) {
+	PackedFloat64Array ret;
+	if (!p_array) {
+		return ret;
 	}
+	int length = mono_array_length(p_array);
+	ret.resize(length);
+	double *dst = ret.ptrw();
+
+	const double *src = mono_array_addr(p_array, double, 0);
+	memcpy(dst, src, length * sizeof(double));
 
 	return ret;
 }
 
-MonoArray *PoolStringArray_to_mono_array(const PoolStringArray &p_array) {
-	PoolStringArray::Read r = p_array.read();
+MonoArray *PackedStringArray_to_mono_array(const PackedStringArray &p_array) {
+	const String *r = p_array.ptr();
+	int length = p_array.size();
 
-	MonoArray *ret = mono_array_new(mono_domain_get(), CACHED_CLASS_RAW(String), p_array.size());
+	MonoArray *ret = mono_array_new(mono_domain_get(), CACHED_CLASS_RAW(String), length);
 
-	for (int i = 0; i < p_array.size(); i++) {
+	for (int i = 0; i < length; i++) {
 		MonoString *boxed = mono_string_from_godot(r[i]);
 		mono_array_setref(ret, i, boxed);
 	}
@@ -1081,13 +1333,14 @@ MonoArray *PoolStringArray_to_mono_array(const PoolStringArray &p_array) {
 	return ret;
 }
 
-PoolStringArray mono_array_to_PoolStringArray(MonoArray *p_array) {
-	PoolStringArray ret;
-	if (!p_array)
+PackedStringArray mono_array_to_PackedStringArray(MonoArray *p_array) {
+	PackedStringArray ret;
+	if (!p_array) {
 		return ret;
+	}
 	int length = mono_array_length(p_array);
 	ret.resize(length);
-	PoolStringArray::Write w = ret.write();
+	String *w = ret.ptrw();
 
 	for (int i = 0; i < length; i++) {
 		MonoString *elem = mono_array_get(p_array, MonoString *, i);
@@ -1097,88 +1350,191 @@ PoolStringArray mono_array_to_PoolStringArray(MonoArray *p_array) {
 	return ret;
 }
 
-MonoArray *PoolColorArray_to_mono_array(const PoolColorArray &p_array) {
-	PoolColorArray::Read r = p_array.read();
+MonoArray *PackedColorArray_to_mono_array(const PackedColorArray &p_array) {
+	const Color *src = p_array.ptr();
+	int length = p_array.size();
 
-	MonoArray *ret = mono_array_new(mono_domain_get(), CACHED_CLASS_RAW(Color), p_array.size());
+	MonoArray *ret = mono_array_new(mono_domain_get(), CACHED_CLASS_RAW(Color), length);
 
-	for (int i = 0; i < p_array.size(); i++) {
-		M_Color *raw = (M_Color *)mono_array_addr_with_size(ret, sizeof(M_Color), i);
-		*raw = MARSHALLED_OUT(Color, r[i]);
+	if constexpr (InteropLayout::MATCHES_Color) {
+		Color *dst = mono_array_addr(ret, Color, 0);
+		memcpy(dst, src, length * sizeof(Color));
+	} else {
+		for (int i = 0; i < length; i++) {
+			M_Color *raw = (M_Color *)mono_array_addr_with_size(ret, sizeof(M_Color), i);
+			*raw = MARSHALLED_OUT(Color, src[i]);
+		}
 	}
 
 	return ret;
 }
 
-PoolColorArray mono_array_to_PoolColorArray(MonoArray *p_array) {
-	PoolColorArray ret;
-	if (!p_array)
+PackedColorArray mono_array_to_PackedColorArray(MonoArray *p_array) {
+	PackedColorArray ret;
+	if (!p_array) {
 		return ret;
+	}
 	int length = mono_array_length(p_array);
 	ret.resize(length);
-	PoolColorArray::Write w = ret.write();
+	Color *dst = ret.ptrw();
 
-	for (int i = 0; i < length; i++) {
-		w[i] = MARSHALLED_IN(Color, (M_Color *)mono_array_addr_with_size(p_array, sizeof(M_Color), i));
+	if constexpr (InteropLayout::MATCHES_Color) {
+		const Color *src = mono_array_addr(p_array, Color, 0);
+		memcpy(dst, src, length * sizeof(Color));
+	} else {
+		for (int i = 0; i < length; i++) {
+			dst[i] = MARSHALLED_IN(Color, (M_Color *)mono_array_addr_with_size(p_array, sizeof(M_Color), i));
+		}
 	}
 
 	return ret;
 }
 
-MonoArray *PoolVector2Array_to_mono_array(const PoolVector2Array &p_array) {
-	PoolVector2Array::Read r = p_array.read();
+MonoArray *PackedVector2Array_to_mono_array(const PackedVector2Array &p_array) {
+	const Vector2 *src = p_array.ptr();
+	int length = p_array.size();
 
-	MonoArray *ret = mono_array_new(mono_domain_get(), CACHED_CLASS_RAW(Vector2), p_array.size());
+	MonoArray *ret = mono_array_new(mono_domain_get(), CACHED_CLASS_RAW(Vector2), length);
 
-	for (int i = 0; i < p_array.size(); i++) {
-		M_Vector2 *raw = (M_Vector2 *)mono_array_addr_with_size(ret, sizeof(M_Vector2), i);
-		*raw = MARSHALLED_OUT(Vector2, r[i]);
+	if constexpr (InteropLayout::MATCHES_Vector2) {
+		Vector2 *dst = mono_array_addr(ret, Vector2, 0);
+		memcpy(dst, src, length * sizeof(Vector2));
+	} else {
+		for (int i = 0; i < length; i++) {
+			M_Vector2 *raw = (M_Vector2 *)mono_array_addr_with_size(ret, sizeof(M_Vector2), i);
+			*raw = MARSHALLED_OUT(Vector2, src[i]);
+		}
 	}
 
 	return ret;
 }
 
-PoolVector2Array mono_array_to_PoolVector2Array(MonoArray *p_array) {
-	PoolVector2Array ret;
-	if (!p_array)
+PackedVector2Array mono_array_to_PackedVector2Array(MonoArray *p_array) {
+	PackedVector2Array ret;
+	if (!p_array) {
 		return ret;
+	}
 	int length = mono_array_length(p_array);
 	ret.resize(length);
-	PoolVector2Array::Write w = ret.write();
+	Vector2 *dst = ret.ptrw();
 
-	for (int i = 0; i < length; i++) {
-		w[i] = MARSHALLED_IN(Vector2, (M_Vector2 *)mono_array_addr_with_size(p_array, sizeof(M_Vector2), i));
+	if constexpr (InteropLayout::MATCHES_Vector2) {
+		const Vector2 *src = mono_array_addr(p_array, Vector2, 0);
+		memcpy(dst, src, length * sizeof(Vector2));
+	} else {
+		for (int i = 0; i < length; i++) {
+			dst[i] = MARSHALLED_IN(Vector2, (M_Vector2 *)mono_array_addr_with_size(p_array, sizeof(M_Vector2), i));
+		}
 	}
 
 	return ret;
 }
 
-MonoArray *PoolVector3Array_to_mono_array(const PoolVector3Array &p_array) {
-	PoolVector3Array::Read r = p_array.read();
+MonoArray *PackedVector3Array_to_mono_array(const PackedVector3Array &p_array) {
+	const Vector3 *src = p_array.ptr();
+	int length = p_array.size();
 
-	MonoArray *ret = mono_array_new(mono_domain_get(), CACHED_CLASS_RAW(Vector3), p_array.size());
+	MonoArray *ret = mono_array_new(mono_domain_get(), CACHED_CLASS_RAW(Vector3), length);
 
-	for (int i = 0; i < p_array.size(); i++) {
-		M_Vector3 *raw = (M_Vector3 *)mono_array_addr_with_size(ret, sizeof(M_Vector3), i);
-		*raw = MARSHALLED_OUT(Vector3, r[i]);
+	if constexpr (InteropLayout::MATCHES_Vector3) {
+		Vector3 *dst = mono_array_addr(ret, Vector3, 0);
+		memcpy(dst, src, length * sizeof(Vector3));
+	} else {
+		for (int i = 0; i < length; i++) {
+			M_Vector3 *raw = (M_Vector3 *)mono_array_addr_with_size(ret, sizeof(M_Vector3), i);
+			*raw = MARSHALLED_OUT(Vector3, src[i]);
+		}
 	}
 
 	return ret;
 }
 
-PoolVector3Array mono_array_to_PoolVector3Array(MonoArray *p_array) {
-	PoolVector3Array ret;
-	if (!p_array)
+PackedVector3Array mono_array_to_PackedVector3Array(MonoArray *p_array) {
+	PackedVector3Array ret;
+	if (!p_array) {
 		return ret;
+	}
 	int length = mono_array_length(p_array);
 	ret.resize(length);
-	PoolVector3Array::Write w = ret.write();
+	Vector3 *dst = ret.ptrw();
 
-	for (int i = 0; i < length; i++) {
-		w[i] = MARSHALLED_IN(Vector3, (M_Vector3 *)mono_array_addr_with_size(p_array, sizeof(M_Vector3), i));
+	if constexpr (InteropLayout::MATCHES_Vector3) {
+		const Vector3 *src = mono_array_addr(p_array, Vector3, 0);
+		memcpy(dst, src, length * sizeof(Vector3));
+	} else {
+		for (int i = 0; i < length; i++) {
+			dst[i] = MARSHALLED_IN(Vector3, (M_Vector3 *)mono_array_addr_with_size(p_array, sizeof(M_Vector3), i));
+		}
 	}
 
 	return ret;
 }
 
+Callable managed_to_callable(const M_Callable &p_managed_callable) {
+	if (p_managed_callable.delegate) {
+		// TODO: Use pooling for ManagedCallable instances.
+		CallableCustom *managed_callable = memnew(ManagedCallable(p_managed_callable.delegate));
+		return Callable(managed_callable);
+	} else {
+		Object *target = p_managed_callable.target ?
+								 unbox<Object *>(CACHED_FIELD(GodotObject, ptr)->get_value(p_managed_callable.target)) :
+								 nullptr;
+		StringName *method_ptr = unbox<StringName *>(CACHED_FIELD(StringName, ptr)->get_value(p_managed_callable.method_string_name));
+		StringName method = method_ptr ? *method_ptr : StringName();
+		return Callable(target, method);
+	}
+}
+
+M_Callable callable_to_managed(const Callable &p_callable) {
+	if (p_callable.is_custom()) {
+		CallableCustom *custom = p_callable.get_custom();
+		CallableCustom::CompareEqualFunc compare_equal_func = custom->get_compare_equal_func();
+
+		if (compare_equal_func == ManagedCallable::compare_equal_func_ptr) {
+			ManagedCallable *managed_callable = static_cast<ManagedCallable *>(custom);
+			return {
+				nullptr, nullptr,
+				managed_callable->get_delegate()
+			};
+		} else if (compare_equal_func == SignalAwaiterCallable::compare_equal_func_ptr) {
+			SignalAwaiterCallable *signal_awaiter_callable = static_cast<SignalAwaiterCallable *>(custom);
+			return {
+				GDMonoUtils::unmanaged_get_managed(ObjectDB::get_instance(signal_awaiter_callable->get_object())),
+				GDMonoUtils::create_managed_from(signal_awaiter_callable->get_signal()),
+				nullptr
+			};
+		} else if (compare_equal_func == EventSignalCallable::compare_equal_func_ptr) {
+			EventSignalCallable *event_signal_callable = static_cast<EventSignalCallable *>(custom);
+			return {
+				GDMonoUtils::unmanaged_get_managed(ObjectDB::get_instance(event_signal_callable->get_object())),
+				GDMonoUtils::create_managed_from(event_signal_callable->get_signal()),
+				nullptr
+			};
+		}
+
+		// Some other CallableCustom. We only support ManagedCallable.
+		return { nullptr, nullptr, nullptr };
+	} else {
+		MonoObject *target_managed = GDMonoUtils::unmanaged_get_managed(p_callable.get_object());
+		MonoObject *method_string_name_managed = GDMonoUtils::create_managed_from(p_callable.get_method());
+		return { target_managed, method_string_name_managed, nullptr };
+	}
+}
+
+Signal managed_to_signal_info(const M_SignalInfo &p_managed_signal) {
+	Object *owner = p_managed_signal.owner ?
+							unbox<Object *>(CACHED_FIELD(GodotObject, ptr)->get_value(p_managed_signal.owner)) :
+							nullptr;
+	StringName *name_ptr = unbox<StringName *>(CACHED_FIELD(StringName, ptr)->get_value(p_managed_signal.name_string_name));
+	StringName name = name_ptr ? *name_ptr : StringName();
+	return Signal(owner, name);
+}
+
+M_SignalInfo signal_info_to_managed(const Signal &p_signal) {
+	Object *owner = p_signal.get_object();
+	MonoObject *owner_managed = GDMonoUtils::unmanaged_get_managed(owner);
+	MonoObject *name_string_name_managed = GDMonoUtils::create_managed_from(p_signal.get_name());
+	return { owner_managed, name_string_name_managed };
+}
+
 } // namespace GDMonoMarshal
diff --git a/modules/mono/mono_gd/gd_mono_marshal.h b/modules/mono/mono_gd/gd_mono_marshal.h
index e662e7814e..a1fd975916 100644
--- a/modules/mono/mono_gd/gd_mono_marshal.h
+++ b/modules/mono/mono_gd/gd_mono_marshal.h
@@ -33,6 +33,7 @@
 
 #include "core/variant.h"
 
+#include "../managed_callable.h"
 #include "gd_mono.h"
 #include "gd_mono_utils.h"
 
@@ -62,43 +63,29 @@ T *unbox_addr(MonoObject *p_obj) {
 #define BOX_PTR(x) mono_value_box(mono_domain_get(), CACHED_CLASS_RAW(IntPtr), x)
 #define BOX_ENUM(m_enum_class, x) mono_value_box(mono_domain_get(), m_enum_class, &x)
 
-Variant::Type managed_to_variant_type(const ManagedType &p_type);
+Variant::Type managed_to_variant_type(const ManagedType &p_type, bool *r_nil_is_variant = nullptr);
 
 bool try_get_array_element_type(const ManagedType &p_array_type, ManagedType &r_elem_type);
-bool try_get_dictionary_key_value_types(const ManagedType &p_dictionary_type, ManagedType &r_key_type, ManagedType &r_value_type);
 
 // String
 
-String mono_to_utf8_string(MonoString *p_mono_string);
-String mono_to_utf16_string(MonoString *p_mono_string);
-
 _FORCE_INLINE_ String mono_string_to_godot_not_null(MonoString *p_mono_string) {
-	if (sizeof(CharType) == 2)
-		return mono_to_utf16_string(p_mono_string);
-
-	return mono_to_utf8_string(p_mono_string);
+	char32_t *utf32 = (char32_t *)mono_string_to_utf32(p_mono_string);
+	String ret = String(utf32);
+	mono_free(utf32);
+	return ret;
 }
 
 _FORCE_INLINE_ String mono_string_to_godot(MonoString *p_mono_string) {
-	if (p_mono_string == NULL)
+	if (p_mono_string == nullptr) {
 		return String();
+	}
 
 	return mono_string_to_godot_not_null(p_mono_string);
 }
 
-_FORCE_INLINE_ MonoString *mono_from_utf8_string(const String &p_string) {
-	return mono_string_new(mono_domain_get(), p_string.utf8().get_data());
-}
-
-_FORCE_INLINE_ MonoString *mono_from_utf16_string(const String &p_string) {
-	return mono_string_from_utf16((mono_unichar2 *)p_string.c_str());
-}
-
 _FORCE_INLINE_ MonoString *mono_string_from_godot(const String &p_string) {
-	if (sizeof(CharType) == 2)
-		return mono_from_utf16_string(p_string);
-
-	return mono_from_utf8_string(p_string);
+	return mono_string_from_utf32((mono_unichar4 *)(p_string.get_data()));
 }
 
 // Variant
@@ -122,51 +109,95 @@ Variant mono_object_to_variant_no_err(MonoObject *p_obj, const ManagedType &p_ty
 /// If the MonoObject* cannot be converted to Variant, then 'ToString()' is called instead.
 String mono_object_to_variant_string(MonoObject *p_obj, MonoException **r_exc);
 
+// System.Collections.Generic
+
+MonoObject *Dictionary_to_system_generic_dict(const Dictionary &p_dict, GDMonoClass *p_class, MonoReflectionType *p_key_reftype, MonoReflectionType *p_value_reftype);
+Dictionary system_generic_dict_to_Dictionary(MonoObject *p_obj, GDMonoClass *p_class, MonoReflectionType *p_key_reftype, MonoReflectionType *p_value_reftype);
+
+MonoObject *Array_to_system_generic_list(const Array &p_array, GDMonoClass *p_class, MonoReflectionType *p_elem_reftype);
+Array system_generic_list_to_Array(MonoObject *p_obj, GDMonoClass *p_class, MonoReflectionType *p_elem_reftype);
+
 // Array
 
 MonoArray *Array_to_mono_array(const Array &p_array);
+MonoArray *Array_to_mono_array(const Array &p_array, GDMonoClass *p_array_type_class);
 Array mono_array_to_Array(MonoArray *p_array);
 
-// PoolIntArray
+// PackedInt32Array
+
+MonoArray *PackedInt32Array_to_mono_array(const PackedInt32Array &p_array);
+PackedInt32Array mono_array_to_PackedInt32Array(MonoArray *p_array);
+
+// PackedInt64Array
 
-MonoArray *PoolIntArray_to_mono_array(const PoolIntArray &p_array);
-PoolIntArray mono_array_to_PoolIntArray(MonoArray *p_array);
+MonoArray *PackedInt64Array_to_mono_array(const PackedInt64Array &p_array);
+PackedInt64Array mono_array_to_PackedInt64Array(MonoArray *p_array);
 
-// PoolByteArray
+// PackedByteArray
 
-MonoArray *PoolByteArray_to_mono_array(const PoolByteArray &p_array);
-PoolByteArray mono_array_to_PoolByteArray(MonoArray *p_array);
+MonoArray *PackedByteArray_to_mono_array(const PackedByteArray &p_array);
+PackedByteArray mono_array_to_PackedByteArray(MonoArray *p_array);
 
-// PoolRealArray
+// PackedFloat32Array
 
-MonoArray *PoolRealArray_to_mono_array(const PoolRealArray &p_array);
-PoolRealArray mono_array_to_PoolRealArray(MonoArray *p_array);
+MonoArray *PackedFloat32Array_to_mono_array(const PackedFloat32Array &p_array);
+PackedFloat32Array mono_array_to_PackedFloat32Array(MonoArray *p_array);
 
-// PoolStringArray
+// PackedFloat64Array
 
-MonoArray *PoolStringArray_to_mono_array(const PoolStringArray &p_array);
-PoolStringArray mono_array_to_PoolStringArray(MonoArray *p_array);
+MonoArray *PackedFloat64Array_to_mono_array(const PackedFloat64Array &p_array);
+PackedFloat64Array mono_array_to_PackedFloat64Array(MonoArray *p_array);
 
-// PoolColorArray
+// PackedStringArray
 
-MonoArray *PoolColorArray_to_mono_array(const PoolColorArray &p_array);
-PoolColorArray mono_array_to_PoolColorArray(MonoArray *p_array);
+MonoArray *PackedStringArray_to_mono_array(const PackedStringArray &p_array);
+PackedStringArray mono_array_to_PackedStringArray(MonoArray *p_array);
 
-// PoolVector2Array
+// PackedColorArray
 
-MonoArray *PoolVector2Array_to_mono_array(const PoolVector2Array &p_array);
-PoolVector2Array mono_array_to_PoolVector2Array(MonoArray *p_array);
+MonoArray *PackedColorArray_to_mono_array(const PackedColorArray &p_array);
+PackedColorArray mono_array_to_PackedColorArray(MonoArray *p_array);
+
+// PackedVector2Array
+
+MonoArray *PackedVector2Array_to_mono_array(const PackedVector2Array &p_array);
+PackedVector2Array mono_array_to_PackedVector2Array(MonoArray *p_array);
+
+// PackedVector3Array
+
+MonoArray *PackedVector3Array_to_mono_array(const PackedVector3Array &p_array);
+PackedVector3Array mono_array_to_PackedVector3Array(MonoArray *p_array);
+
+#pragma pack(push, 1)
+
+struct M_Callable {
+	MonoObject *target;
+	MonoObject *method_string_name;
+	MonoDelegate *delegate;
+};
+
+struct M_SignalInfo {
+	MonoObject *owner;
+	MonoObject *name_string_name;
+};
+
+#pragma pack(pop)
 
-// PoolVector3Array
+// Callable
+Callable managed_to_callable(const M_Callable &p_managed_callable);
+M_Callable callable_to_managed(const Callable &p_callable);
 
-MonoArray *PoolVector3Array_to_mono_array(const PoolVector3Array &p_array);
-PoolVector3Array mono_array_to_PoolVector3Array(MonoArray *p_array);
+// SignalInfo
+Signal managed_to_signal_info(const M_SignalInfo &p_managed_signal);
+M_SignalInfo signal_info_to_managed(const Signal &p_signal);
 
 // Structures
 
 namespace InteropLayout {
 
 enum {
+	MATCHES_int = (sizeof(int32_t) == sizeof(uint32_t)),
+
 	MATCHES_float = (sizeof(float) == sizeof(uint32_t)),
 
 	MATCHES_double = (sizeof(double) == sizeof(uint64_t)),
@@ -181,10 +212,18 @@ enum {
 					   offsetof(Vector2, x) == (sizeof(real_t) * 0) &&
 					   offsetof(Vector2, y) == (sizeof(real_t) * 1)),
 
+	MATCHES_Vector2i = (MATCHES_int && (sizeof(Vector2i) == (sizeof(int32_t) * 2)) &&
+						offsetof(Vector2i, x) == (sizeof(int32_t) * 0) &&
+						offsetof(Vector2i, y) == (sizeof(int32_t) * 1)),
+
 	MATCHES_Rect2 = (MATCHES_Vector2 && (sizeof(Rect2) == (sizeof(Vector2) * 2)) &&
 					 offsetof(Rect2, position) == (sizeof(Vector2) * 0) &&
 					 offsetof(Rect2, size) == (sizeof(Vector2) * 1)),
 
+	MATCHES_Rect2i = (MATCHES_Vector2i && (sizeof(Rect2i) == (sizeof(Vector2i) * 2)) &&
+					  offsetof(Rect2i, position) == (sizeof(Vector2i) * 0) &&
+					  offsetof(Rect2i, size) == (sizeof(Vector2i) * 1)),
+
 	MATCHES_Transform2D = (MATCHES_Vector2 && (sizeof(Transform2D) == (sizeof(Vector2) * 3))), // No field offset required, it stores an array
 
 	MATCHES_Vector3 = (MATCHES_real_t && (sizeof(Vector3) == (sizeof(real_t) * 3)) &&
@@ -192,6 +231,11 @@ enum {
 					   offsetof(Vector3, y) == (sizeof(real_t) * 1) &&
 					   offsetof(Vector3, z) == (sizeof(real_t) * 2)),
 
+	MATCHES_Vector3i = (MATCHES_int && (sizeof(Vector3i) == (sizeof(int32_t) * 3)) &&
+						offsetof(Vector3i, x) == (sizeof(int32_t) * 0) &&
+						offsetof(Vector3i, y) == (sizeof(int32_t) * 1) &&
+						offsetof(Vector3i, z) == (sizeof(int32_t) * 2)),
+
 	MATCHES_Basis = (MATCHES_Vector3 && (sizeof(Basis) == (sizeof(Vector3) * 3))), // No field offset required, it stores an array
 
 	MATCHES_Quat = (MATCHES_real_t && (sizeof(Quat) == (sizeof(real_t) * 4)) &&
@@ -222,8 +266,9 @@ enum {
 // In the future we may force this if we want to ref return these structs
 #ifdef GD_MONO_FORCE_INTEROP_STRUCT_COPY
 /* clang-format off */
-GD_STATIC_ASSERT(MATCHES_Vector2 && MATCHES_Rect2 && MATCHES_Transform2D && MATCHES_Vector3 &&
-				MATCHES_Basis && MATCHES_Quat && MATCHES_Transform && MATCHES_AABB && MATCHES_Color &&MATCHES_Plane);
+static_assert(MATCHES_Vector2 && MATCHES_Rect2 && MATCHES_Transform2D && MATCHES_Vector3 &&
+				MATCHES_Basis && MATCHES_Quat && MATCHES_Transform && MATCHES_AABB && MATCHES_Color &&
+				MATCHES_Plane && MATCHES_Vector2i && MATCHES_Rect2i && MATCHES_Vector3i);
 /* clang-format on */
 #endif
 
@@ -244,6 +289,19 @@ struct M_Vector2 {
 	}
 };
 
+struct M_Vector2i {
+	int32_t x, y;
+
+	static _FORCE_INLINE_ Vector2i convert_to(const M_Vector2i &p_from) {
+		return Vector2i(p_from.x, p_from.y);
+	}
+
+	static _FORCE_INLINE_ M_Vector2i convert_from(const Vector2i &p_from) {
+		M_Vector2i ret = { p_from.x, p_from.y };
+		return ret;
+	}
+};
+
 struct M_Rect2 {
 	M_Vector2 position;
 	M_Vector2 size;
@@ -259,6 +317,21 @@ struct M_Rect2 {
 	}
 };
 
+struct M_Rect2i {
+	M_Vector2i position;
+	M_Vector2i size;
+
+	static _FORCE_INLINE_ Rect2i convert_to(const M_Rect2i &p_from) {
+		return Rect2i(M_Vector2i::convert_to(p_from.position),
+				M_Vector2i::convert_to(p_from.size));
+	}
+
+	static _FORCE_INLINE_ M_Rect2i convert_from(const Rect2i &p_from) {
+		M_Rect2i ret = { M_Vector2i::convert_from(p_from.position), M_Vector2i::convert_from(p_from.size) };
+		return ret;
+	}
+};
+
 struct M_Transform2D {
 	M_Vector2 elements[3];
 
@@ -291,6 +364,19 @@ struct M_Vector3 {
 	}
 };
 
+struct M_Vector3i {
+	int32_t x, y, z;
+
+	static _FORCE_INLINE_ Vector3i convert_to(const M_Vector3i &p_from) {
+		return Vector3i(p_from.x, p_from.y, p_from.z);
+	}
+
+	static _FORCE_INLINE_ M_Vector3i convert_from(const Vector3i &p_from) {
+		M_Vector3i ret = { p_from.x, p_from.y, p_from.z };
+		return ret;
+	}
+};
+
 struct M_Basis {
 	M_Vector3 elements[3];
 
@@ -416,9 +502,12 @@ struct M_Plane {
 	}
 
 DECL_TYPE_MARSHAL_TEMPLATES(Vector2)
+DECL_TYPE_MARSHAL_TEMPLATES(Vector2i)
 DECL_TYPE_MARSHAL_TEMPLATES(Rect2)
+DECL_TYPE_MARSHAL_TEMPLATES(Rect2i)
 DECL_TYPE_MARSHAL_TEMPLATES(Transform2D)
 DECL_TYPE_MARSHAL_TEMPLATES(Vector3)
+DECL_TYPE_MARSHAL_TEMPLATES(Vector3i)
 DECL_TYPE_MARSHAL_TEMPLATES(Basis)
 DECL_TYPE_MARSHAL_TEMPLATES(Quat)
 DECL_TYPE_MARSHAL_TEMPLATES(Transform)
diff --git a/modules/mono/mono_gd/gd_mono_method.cpp b/modules/mono/mono_gd/gd_mono_method.cpp
index 971c5ac737..04f3b25a70 100644
--- a/modules/mono/mono_gd/gd_mono_method.cpp
+++ b/modules/mono/mono_gd/gd_mono_method.cpp
@@ -30,13 +30,14 @@
 
 #include "gd_mono_method.h"
 
+#include <mono/metadata/attrdefs.h>
+#include <mono/metadata/debug-helpers.h>
+
 #include "gd_mono_cache.h"
 #include "gd_mono_class.h"
 #include "gd_mono_marshal.h"
 #include "gd_mono_utils.h"
 
-#include <mono/metadata/attrdefs.h>
-
 void GDMonoMethod::_update_signature() {
 	// Apparently MonoMethodSignature needs not to be freed.
 	// mono_method_signature caches the result, we don't need to cache it ourselves.
@@ -58,9 +59,9 @@ void GDMonoMethod::_update_signature(MonoMethodSignature *p_method_sig) {
 		}
 	}
 
-	void *iter = NULL;
+	void *iter = nullptr;
 	MonoType *param_raw_type;
-	while ((param_raw_type = mono_signature_get_params(p_method_sig, &iter)) != NULL) {
+	while ((param_raw_type = mono_signature_get_params(p_method_sig, &iter)) != nullptr) {
 		ManagedType param_type;
 
 		param_type.type_encoding = mono_type_get_type(param_raw_type);
@@ -81,11 +82,11 @@ GDMonoClass *GDMonoMethod::get_enclosing_class() const {
 }
 
 bool GDMonoMethod::is_static() {
-	return mono_method_get_flags(mono_method, NULL) & MONO_METHOD_ATTR_STATIC;
+	return mono_method_get_flags(mono_method, nullptr) & MONO_METHOD_ATTR_STATIC;
 }
 
 IMonoClassMember::Visibility GDMonoMethod::get_visibility() {
-	switch (mono_method_get_flags(mono_method, NULL) & MONO_METHOD_ATTR_ACCESS_MASK) {
+	switch (mono_method_get_flags(mono_method, nullptr) & MONO_METHOD_ATTR_ACCESS_MASK) {
 		case MONO_METHOD_ATTR_PRIVATE:
 			return IMonoClassMember::PRIVATE;
 		case MONO_METHOD_ATTR_FAM_AND_ASSEM:
@@ -101,55 +102,46 @@ IMonoClassMember::Visibility GDMonoMethod::get_visibility() {
 	}
 }
 
-MonoObject *GDMonoMethod::invoke(MonoObject *p_object, const Variant **p_params, MonoException **r_exc) {
-	if (get_return_type().type_encoding != MONO_TYPE_VOID || get_parameters_count() > 0) {
-		MonoArray *params = mono_array_new(mono_domain_get(), CACHED_CLASS_RAW(MonoObject), get_parameters_count());
+MonoObject *GDMonoMethod::invoke(MonoObject *p_object, const Variant **p_params, MonoException **r_exc) const {
+	MonoException *exc = nullptr;
+	MonoObject *ret;
+
+	if (params_count > 0) {
+		MonoArray *params = mono_array_new(mono_domain_get(), CACHED_CLASS_RAW(MonoObject), params_count);
 
 		for (int i = 0; i < params_count; i++) {
 			MonoObject *boxed_param = GDMonoMarshal::variant_to_mono_object(p_params[i], param_types[i]);
 			mono_array_setref(params, i, boxed_param);
 		}
 
-		MonoException *exc = NULL;
-		MonoObject *ret = GDMonoUtils::runtime_invoke_array(mono_method, p_object, params, &exc);
-
-		if (exc) {
-			ret = NULL;
-			if (r_exc) {
-				*r_exc = exc;
-			} else {
-				GDMonoUtils::set_pending_exception(exc);
-			}
-		}
-
-		return ret;
+		ret = GDMonoUtils::runtime_invoke_array(mono_method, p_object, params, &exc);
 	} else {
-		MonoException *exc = NULL;
-		GDMonoUtils::runtime_invoke(mono_method, p_object, NULL, &exc);
-
-		if (exc) {
-			if (r_exc) {
-				*r_exc = exc;
-			} else {
-				GDMonoUtils::set_pending_exception(exc);
-			}
-		}
+		ret = GDMonoUtils::runtime_invoke(mono_method, p_object, nullptr, &exc);
+	}
 
-		return NULL;
+	if (exc) {
+		ret = nullptr;
+		if (r_exc) {
+			*r_exc = exc;
+		} else {
+			GDMonoUtils::set_pending_exception(exc);
+		}
 	}
+
+	return ret;
 }
 
-MonoObject *GDMonoMethod::invoke(MonoObject *p_object, MonoException **r_exc) {
-	ERR_FAIL_COND_V(get_parameters_count() > 0, NULL);
-	return invoke_raw(p_object, NULL, r_exc);
+MonoObject *GDMonoMethod::invoke(MonoObject *p_object, MonoException **r_exc) const {
+	ERR_FAIL_COND_V(get_parameters_count() > 0, nullptr);
+	return invoke_raw(p_object, nullptr, r_exc);
 }
 
-MonoObject *GDMonoMethod::invoke_raw(MonoObject *p_object, void **p_params, MonoException **r_exc) {
-	MonoException *exc = NULL;
+MonoObject *GDMonoMethod::invoke_raw(MonoObject *p_object, void **p_params, MonoException **r_exc) const {
+	MonoException *exc = nullptr;
 	MonoObject *ret = GDMonoUtils::runtime_invoke(mono_method, p_object, p_params, &exc);
 
 	if (exc) {
-		ret = NULL;
+		ret = nullptr;
 		if (r_exc) {
 			*r_exc = exc;
 		} else {
@@ -163,29 +155,33 @@ MonoObject *GDMonoMethod::invoke_raw(MonoObject *p_object, void **p_params, Mono
 bool GDMonoMethod::has_attribute(GDMonoClass *p_attr_class) {
 	ERR_FAIL_NULL_V(p_attr_class, false);
 
-	if (!attrs_fetched)
+	if (!attrs_fetched) {
 		fetch_attributes();
+	}
 
-	if (!attributes)
+	if (!attributes) {
 		return false;
+	}
 
 	return mono_custom_attrs_has_attr(attributes, p_attr_class->get_mono_ptr());
 }
 
 MonoObject *GDMonoMethod::get_attribute(GDMonoClass *p_attr_class) {
-	ERR_FAIL_NULL_V(p_attr_class, NULL);
+	ERR_FAIL_NULL_V(p_attr_class, nullptr);
 
-	if (!attrs_fetched)
+	if (!attrs_fetched) {
 		fetch_attributes();
+	}
 
-	if (!attributes)
-		return NULL;
+	if (!attributes) {
+		return nullptr;
+	}
 
 	return mono_custom_attrs_get_attr(attributes, p_attr_class->get_mono_ptr());
 }
 
 void GDMonoMethod::fetch_attributes() {
-	ERR_FAIL_COND(attributes != NULL);
+	ERR_FAIL_COND(attributes != nullptr);
 	attributes = mono_custom_attrs_from_method(mono_method);
 	attrs_fetched = true;
 }
@@ -247,22 +243,32 @@ void GDMonoMethod::get_parameter_names(Vector<StringName> &names) const {
 }
 
 void GDMonoMethod::get_parameter_types(Vector<ManagedType> &types) const {
-	for (int i = 0; i < param_types.size(); ++i) {
+	for (int i = 0; i < params_count; ++i) {
 		types.push_back(param_types[i]);
 	}
 }
 
 const MethodInfo &GDMonoMethod::get_method_info() {
-
 	if (!method_info_fetched) {
 		method_info.name = name;
-		method_info.return_val = PropertyInfo(GDMonoMarshal::managed_to_variant_type(return_type), "");
+
+		bool nil_is_variant = false;
+		method_info.return_val = PropertyInfo(GDMonoMarshal::managed_to_variant_type(return_type, &nil_is_variant), "");
+		if (method_info.return_val.type == Variant::NIL && nil_is_variant) {
+			method_info.return_val.usage |= PROPERTY_USAGE_NIL_IS_VARIANT;
+		}
 
 		Vector<StringName> names;
 		get_parameter_names(names);
 
 		for (int i = 0; i < params_count; ++i) {
-			method_info.arguments.push_back(PropertyInfo(GDMonoMarshal::managed_to_variant_type(param_types[i]), names[i]));
+			nil_is_variant = false;
+			PropertyInfo arg_info = PropertyInfo(GDMonoMarshal::managed_to_variant_type(param_types[i], &nil_is_variant), names[i]);
+			if (arg_info.type == Variant::NIL && nil_is_variant) {
+				arg_info.usage |= PROPERTY_USAGE_NIL_IS_VARIANT;
+			}
+
+			method_info.arguments.push_back(arg_info);
 		}
 
 		// TODO: default arguments
@@ -281,7 +287,7 @@ GDMonoMethod::GDMonoMethod(StringName p_name, MonoMethod *p_method) {
 	method_info_fetched = false;
 
 	attrs_fetched = false;
-	attributes = NULL;
+	attributes = nullptr;
 
 	_update_signature();
 }
diff --git a/modules/mono/mono_gd/gd_mono_method.h b/modules/mono/mono_gd/gd_mono_method.h
index b47e42dec2..f78f57dca0 100644
--- a/modules/mono/mono_gd/gd_mono_method.h
+++ b/modules/mono/mono_gd/gd_mono_method.h
@@ -36,7 +36,6 @@
 #include "i_mono_class_member.h"
 
 class GDMonoMethod : public IMonoClassMember {
-
 	StringName name;
 
 	int params_count;
@@ -57,28 +56,28 @@ class GDMonoMethod : public IMonoClassMember {
 	MonoMethod *mono_method;
 
 public:
-	virtual GDMonoClass *get_enclosing_class() const GD_FINAL;
+	virtual GDMonoClass *get_enclosing_class() const final;
 
-	virtual MemberType get_member_type() const GD_FINAL { return MEMBER_TYPE_METHOD; }
+	virtual MemberType get_member_type() const final { return MEMBER_TYPE_METHOD; }
 
-	virtual StringName get_name() const GD_FINAL { return name; }
+	virtual StringName get_name() const final { return name; }
 
-	virtual bool is_static() GD_FINAL;
+	virtual bool is_static() final;
 
-	virtual Visibility get_visibility() GD_FINAL;
+	virtual Visibility get_visibility() final;
 
-	virtual bool has_attribute(GDMonoClass *p_attr_class) GD_FINAL;
-	virtual MonoObject *get_attribute(GDMonoClass *p_attr_class) GD_FINAL;
+	virtual bool has_attribute(GDMonoClass *p_attr_class) final;
+	virtual MonoObject *get_attribute(GDMonoClass *p_attr_class) final;
 	void fetch_attributes();
 
-	_FORCE_INLINE_ MonoMethod *get_mono_ptr() { return mono_method; }
+	_FORCE_INLINE_ MonoMethod *get_mono_ptr() const { return mono_method; }
 
-	_FORCE_INLINE_ int get_parameters_count() { return params_count; }
-	_FORCE_INLINE_ ManagedType get_return_type() { return return_type; }
+	_FORCE_INLINE_ int get_parameters_count() const { return params_count; }
+	_FORCE_INLINE_ ManagedType get_return_type() const { return return_type; }
 
-	MonoObject *invoke(MonoObject *p_object, const Variant **p_params, MonoException **r_exc = NULL);
-	MonoObject *invoke(MonoObject *p_object, MonoException **r_exc = NULL);
-	MonoObject *invoke_raw(MonoObject *p_object, void **p_params, MonoException **r_exc = NULL);
+	MonoObject *invoke(MonoObject *p_object, const Variant **p_params, MonoException **r_exc = nullptr) const;
+	MonoObject *invoke(MonoObject *p_object, MonoException **r_exc = nullptr) const;
+	MonoObject *invoke_raw(MonoObject *p_object, void **p_params, MonoException **r_exc = nullptr) const;
 
 	String get_full_name(bool p_signature = false) const;
 	String get_full_name_no_class() const;
diff --git a/modules/mono/mono_gd/gd_mono_method_thunk.h b/modules/mono/mono_gd/gd_mono_method_thunk.h
index d8c9a5eb02..01f3ae342a 100644
--- a/modules/mono/mono_gd/gd_mono_method_thunk.h
+++ b/modules/mono/mono_gd/gd_mono_method_thunk.h
@@ -39,7 +39,7 @@
 #include "gd_mono_method.h"
 #include "gd_mono_utils.h"
 
-#if !defined(JAVASCRIPT_ENABLED)
+#if !defined(JAVASCRIPT_ENABLED) && !defined(IPHONE_ENABLED)
 #define HAVE_METHOD_THUNKS
 #endif
 
@@ -47,10 +47,9 @@
 
 template <class... ParamTypes>
 struct GDMonoMethodThunk {
-
 	typedef void(GD_MONO_STDCALL *M)(ParamTypes... p_args, MonoException **);
 
-	M mono_method_thunk;
+	M mono_method_thunk = nullptr;
 
 public:
 	_FORCE_INLINE_ void invoke(ParamTypes... p_args, MonoException **r_exc) {
@@ -60,16 +59,16 @@ public:
 	}
 
 	_FORCE_INLINE_ bool is_null() {
-		return mono_method_thunk == NULL;
+		return mono_method_thunk == nullptr;
 	}
 
 	_FORCE_INLINE_ void nullify() {
-		mono_method_thunk = NULL;
+		mono_method_thunk = nullptr;
 	}
 
 	_FORCE_INLINE_ void set_from_method(GDMonoMethod *p_mono_method) {
 #ifdef DEBUG_ENABLED
-		CRASH_COND(p_mono_method == NULL);
+		CRASH_COND(p_mono_method == nullptr);
 		CRASH_COND(p_mono_method->get_return_type().type_encoding != MONO_TYPE_VOID);
 
 		if (p_mono_method->is_static()) {
@@ -81,9 +80,7 @@ public:
 		mono_method_thunk = (M)mono_method_get_unmanaged_thunk(p_mono_method->get_mono_ptr());
 	}
 
-	GDMonoMethodThunk() :
-			mono_method_thunk(NULL) {
-	}
+	GDMonoMethodThunk() {}
 
 	explicit GDMonoMethodThunk(GDMonoMethod *p_mono_method) {
 		set_from_method(p_mono_method);
@@ -92,10 +89,9 @@ public:
 
 template <class R, class... ParamTypes>
 struct GDMonoMethodThunkR {
-
 	typedef R(GD_MONO_STDCALL *M)(ParamTypes... p_args, MonoException **);
 
-	M mono_method_thunk;
+	M mono_method_thunk = nullptr;
 
 public:
 	_FORCE_INLINE_ R invoke(ParamTypes... p_args, MonoException **r_exc) {
@@ -106,16 +102,16 @@ public:
 	}
 
 	_FORCE_INLINE_ bool is_null() {
-		return mono_method_thunk == NULL;
+		return mono_method_thunk == nullptr;
 	}
 
 	_FORCE_INLINE_ void nullify() {
-		mono_method_thunk = NULL;
+		mono_method_thunk = nullptr;
 	}
 
 	_FORCE_INLINE_ void set_from_method(GDMonoMethod *p_mono_method) {
 #ifdef DEBUG_ENABLED
-		CRASH_COND(p_mono_method == NULL);
+		CRASH_COND(p_mono_method == nullptr);
 		CRASH_COND(p_mono_method->get_return_type().type_encoding == MONO_TYPE_VOID);
 
 		if (p_mono_method->is_static()) {
@@ -127,13 +123,11 @@ public:
 		mono_method_thunk = (M)mono_method_get_unmanaged_thunk(p_mono_method->get_mono_ptr());
 	}
 
-	GDMonoMethodThunkR() :
-			mono_method_thunk(NULL) {
-	}
+	GDMonoMethodThunkR() {}
 
 	explicit GDMonoMethodThunkR(GDMonoMethod *p_mono_method) {
 #ifdef DEBUG_ENABLED
-		CRASH_COND(p_mono_method == NULL);
+		CRASH_COND(p_mono_method == nullptr);
 #endif
 		mono_method_thunk = (M)mono_method_get_unmanaged_thunk(p_mono_method->get_mono_ptr());
 	}
@@ -146,7 +140,7 @@ struct VariadicInvokeMonoMethodImpl {
 	static void invoke(GDMonoMethod *p_mono_method, P1 p_arg1, ParamTypes... p_args, MonoException **r_exc) {
 		if (p_mono_method->is_static()) {
 			void *args[ThunkParamCount] = { p_arg1, p_args... };
-			p_mono_method->invoke_raw(NULL, args, r_exc);
+			p_mono_method->invoke_raw(nullptr, args, r_exc);
 		} else {
 			void *args[ThunkParamCount] = { p_args... };
 			p_mono_method->invoke_raw((MonoObject *)p_arg1, args, r_exc);
@@ -167,7 +161,7 @@ struct VariadicInvokeMonoMethod<0> {
 #ifdef DEBUG_ENABLED
 		CRASH_COND(!p_mono_method->is_static());
 #endif
-		p_mono_method->invoke_raw(NULL, NULL, r_exc);
+		p_mono_method->invoke_raw(nullptr, nullptr, r_exc);
 	}
 };
 
@@ -176,9 +170,9 @@ struct VariadicInvokeMonoMethod<1, P1> {
 	static void invoke(GDMonoMethod *p_mono_method, P1 p_arg1, MonoException **r_exc) {
 		if (p_mono_method->is_static()) {
 			void *args[1] = { p_arg1 };
-			p_mono_method->invoke_raw(NULL, args, r_exc);
+			p_mono_method->invoke_raw(nullptr, args, r_exc);
 		} else {
-			p_mono_method->invoke_raw((MonoObject *)p_arg1, NULL, r_exc);
+			p_mono_method->invoke_raw((MonoObject *)p_arg1, nullptr, r_exc);
 		}
 	}
 };
@@ -203,7 +197,7 @@ struct VariadicInvokeMonoMethodRImpl {
 	static R invoke(GDMonoMethod *p_mono_method, P1 p_arg1, ParamTypes... p_args, MonoException **r_exc) {
 		if (p_mono_method->is_static()) {
 			void *args[ThunkParamCount] = { p_arg1, p_args... };
-			MonoObject *r = p_mono_method->invoke_raw(NULL, args, r_exc);
+			MonoObject *r = p_mono_method->invoke_raw(nullptr, args, r_exc);
 			return unbox_if_needed<R>(r, p_mono_method->get_return_type());
 		} else {
 			void *args[ThunkParamCount] = { p_args... };
@@ -226,7 +220,7 @@ struct VariadicInvokeMonoMethodR<0, R> {
 #ifdef DEBUG_ENABLED
 		CRASH_COND(!p_mono_method->is_static());
 #endif
-		MonoObject *r = p_mono_method->invoke_raw(NULL, NULL, r_exc);
+		MonoObject *r = p_mono_method->invoke_raw(nullptr, nullptr, r_exc);
 		return unbox_if_needed<R>(r, p_mono_method->get_return_type());
 	}
 };
@@ -236,10 +230,10 @@ struct VariadicInvokeMonoMethodR<1, R, P1> {
 	static R invoke(GDMonoMethod *p_mono_method, P1 p_arg1, MonoException **r_exc) {
 		if (p_mono_method->is_static()) {
 			void *args[1] = { p_arg1 };
-			MonoObject *r = p_mono_method->invoke_raw(NULL, args, r_exc);
+			MonoObject *r = p_mono_method->invoke_raw(nullptr, args, r_exc);
 			return unbox_if_needed<R>(r, p_mono_method->get_return_type());
 		} else {
-			MonoObject *r = p_mono_method->invoke_raw((MonoObject *)p_arg1, NULL, r_exc);
+			MonoObject *r = p_mono_method->invoke_raw((MonoObject *)p_arg1, nullptr, r_exc);
 			return unbox_if_needed<R>(r, p_mono_method->get_return_type());
 		}
 	}
@@ -247,8 +241,7 @@ struct VariadicInvokeMonoMethodR<1, R, P1> {
 
 template <class... ParamTypes>
 struct GDMonoMethodThunk {
-
-	GDMonoMethod *mono_method;
+	GDMonoMethod *mono_method = nullptr;
 
 public:
 	_FORCE_INLINE_ void invoke(ParamTypes... p_args, MonoException **r_exc) {
@@ -256,16 +249,16 @@ public:
 	}
 
 	_FORCE_INLINE_ bool is_null() {
-		return mono_method == NULL;
+		return mono_method == nullptr;
 	}
 
 	_FORCE_INLINE_ void nullify() {
-		mono_method = NULL;
+		mono_method = nullptr;
 	}
 
 	_FORCE_INLINE_ void set_from_method(GDMonoMethod *p_mono_method) {
 #ifdef DEBUG_ENABLED
-		CRASH_COND(p_mono_method == NULL);
+		CRASH_COND(p_mono_method == nullptr);
 		CRASH_COND(p_mono_method->get_return_type().type_encoding != MONO_TYPE_VOID);
 
 		if (p_mono_method->is_static()) {
@@ -277,9 +270,7 @@ public:
 		mono_method = p_mono_method;
 	}
 
-	GDMonoMethodThunk() :
-			mono_method(NULL) {
-	}
+	GDMonoMethodThunk() {}
 
 	explicit GDMonoMethodThunk(GDMonoMethod *p_mono_method) {
 		set_from_method(p_mono_method);
@@ -288,8 +279,7 @@ public:
 
 template <class R, class... ParamTypes>
 struct GDMonoMethodThunkR {
-
-	GDMonoMethod *mono_method;
+	GDMonoMethod *mono_method = nullptr;
 
 public:
 	_FORCE_INLINE_ R invoke(ParamTypes... p_args, MonoException **r_exc) {
@@ -297,16 +287,16 @@ public:
 	}
 
 	_FORCE_INLINE_ bool is_null() {
-		return mono_method == NULL;
+		return mono_method == nullptr;
 	}
 
 	_FORCE_INLINE_ void nullify() {
-		mono_method = NULL;
+		mono_method = nullptr;
 	}
 
 	_FORCE_INLINE_ void set_from_method(GDMonoMethod *p_mono_method) {
 #ifdef DEBUG_ENABLED
-		CRASH_COND(p_mono_method == NULL);
+		CRASH_COND(p_mono_method == nullptr);
 		CRASH_COND(p_mono_method->get_return_type().type_encoding == MONO_TYPE_VOID);
 
 		if (p_mono_method->is_static()) {
@@ -318,9 +308,7 @@ public:
 		mono_method = p_mono_method;
 	}
 
-	GDMonoMethodThunkR() :
-			mono_method(NULL) {
-	}
+	GDMonoMethodThunkR() {}
 
 	explicit GDMonoMethodThunkR(GDMonoMethod *p_mono_method) {
 		set_from_method(p_mono_method);
diff --git a/modules/mono/mono_gd/gd_mono_property.cpp b/modules/mono/mono_gd/gd_mono_property.cpp
index 3b5ce58d80..bc3be97102 100644
--- a/modules/mono/mono_gd/gd_mono_property.cpp
+++ b/modules/mono/mono_gd/gd_mono_property.cpp
@@ -57,7 +57,7 @@ GDMonoProperty::GDMonoProperty(MonoProperty *p_mono_property, GDMonoClass *p_own
 
 		MonoMethodSignature *setter_sig = mono_method_signature(prop_method);
 
-		void *iter = NULL;
+		void *iter = nullptr;
 		MonoType *param_raw_type = mono_signature_get_params(setter_sig, &iter);
 
 		type.type_encoding = mono_type_get_type(param_raw_type);
@@ -66,7 +66,7 @@ GDMonoProperty::GDMonoProperty(MonoProperty *p_mono_property, GDMonoClass *p_own
 	}
 
 	attrs_fetched = false;
-	attributes = NULL;
+	attributes = nullptr;
 }
 
 GDMonoProperty::~GDMonoProperty() {
@@ -77,17 +77,19 @@ GDMonoProperty::~GDMonoProperty() {
 
 bool GDMonoProperty::is_static() {
 	MonoMethod *prop_method = mono_property_get_get_method(mono_property);
-	if (prop_method == NULL)
+	if (prop_method == nullptr) {
 		prop_method = mono_property_get_set_method(mono_property);
-	return mono_method_get_flags(prop_method, NULL) & MONO_METHOD_ATTR_STATIC;
+	}
+	return mono_method_get_flags(prop_method, nullptr) & MONO_METHOD_ATTR_STATIC;
 }
 
 IMonoClassMember::Visibility GDMonoProperty::get_visibility() {
 	MonoMethod *prop_method = mono_property_get_get_method(mono_property);
-	if (prop_method == NULL)
+	if (prop_method == nullptr) {
 		prop_method = mono_property_get_set_method(mono_property);
+	}
 
-	switch (mono_method_get_flags(prop_method, NULL) & MONO_METHOD_ATTR_ACCESS_MASK) {
+	switch (mono_method_get_flags(prop_method, nullptr) & MONO_METHOD_ATTR_ACCESS_MASK) {
 		case MONO_METHOD_ATTR_PRIVATE:
 			return IMonoClassMember::PRIVATE;
 		case MONO_METHOD_ATTR_FAM_AND_ASSEM:
@@ -106,46 +108,50 @@ IMonoClassMember::Visibility GDMonoProperty::get_visibility() {
 bool GDMonoProperty::has_attribute(GDMonoClass *p_attr_class) {
 	ERR_FAIL_NULL_V(p_attr_class, false);
 
-	if (!attrs_fetched)
+	if (!attrs_fetched) {
 		fetch_attributes();
+	}
 
-	if (!attributes)
+	if (!attributes) {
 		return false;
+	}
 
 	return mono_custom_attrs_has_attr(attributes, p_attr_class->get_mono_ptr());
 }
 
 MonoObject *GDMonoProperty::get_attribute(GDMonoClass *p_attr_class) {
-	ERR_FAIL_NULL_V(p_attr_class, NULL);
+	ERR_FAIL_NULL_V(p_attr_class, nullptr);
 
-	if (!attrs_fetched)
+	if (!attrs_fetched) {
 		fetch_attributes();
+	}
 
-	if (!attributes)
-		return NULL;
+	if (!attributes) {
+		return nullptr;
+	}
 
 	return mono_custom_attrs_get_attr(attributes, p_attr_class->get_mono_ptr());
 }
 
 void GDMonoProperty::fetch_attributes() {
-	ERR_FAIL_COND(attributes != NULL);
+	ERR_FAIL_COND(attributes != nullptr);
 	attributes = mono_custom_attrs_from_property(owner->get_mono_ptr(), mono_property);
 	attrs_fetched = true;
 }
 
 bool GDMonoProperty::has_getter() {
-	return mono_property_get_get_method(mono_property) != NULL;
+	return mono_property_get_get_method(mono_property) != nullptr;
 }
 
 bool GDMonoProperty::has_setter() {
-	return mono_property_get_set_method(mono_property) != NULL;
+	return mono_property_get_set_method(mono_property) != nullptr;
 }
 
 void GDMonoProperty::set_value(MonoObject *p_object, MonoObject *p_value, MonoException **r_exc) {
 	MonoMethod *prop_method = mono_property_get_set_method(mono_property);
 	MonoArray *params = mono_array_new(mono_domain_get(), CACHED_CLASS_RAW(MonoObject), 1);
 	mono_array_setref(params, 0, p_value);
-	MonoException *exc = NULL;
+	MonoException *exc = nullptr;
 	GDMonoUtils::runtime_invoke_array(prop_method, p_object, params, &exc);
 	if (exc) {
 		if (r_exc) {
@@ -157,7 +163,7 @@ void GDMonoProperty::set_value(MonoObject *p_object, MonoObject *p_value, MonoEx
 }
 
 void GDMonoProperty::set_value(MonoObject *p_object, void **p_params, MonoException **r_exc) {
-	MonoException *exc = NULL;
+	MonoException *exc = nullptr;
 	GDMonoUtils::property_set_value(mono_property, p_object, p_params, &exc);
 
 	if (exc) {
@@ -170,11 +176,11 @@ void GDMonoProperty::set_value(MonoObject *p_object, void **p_params, MonoExcept
 }
 
 MonoObject *GDMonoProperty::get_value(MonoObject *p_object, MonoException **r_exc) {
-	MonoException *exc = NULL;
-	MonoObject *ret = GDMonoUtils::property_get_value(mono_property, p_object, NULL, &exc);
+	MonoException *exc = nullptr;
+	MonoObject *ret = GDMonoUtils::property_get_value(mono_property, p_object, nullptr, &exc);
 
 	if (exc) {
-		ret = NULL;
+		ret = nullptr;
 		if (r_exc) {
 			*r_exc = exc;
 		} else {
diff --git a/modules/mono/mono_gd/gd_mono_property.h b/modules/mono/mono_gd/gd_mono_property.h
index 692037f76a..611ac293e4 100644
--- a/modules/mono/mono_gd/gd_mono_property.h
+++ b/modules/mono/mono_gd/gd_mono_property.h
@@ -36,7 +36,6 @@
 #include "i_mono_class_member.h"
 
 class GDMonoProperty : public IMonoClassMember {
-
 	GDMonoClass *owner;
 	MonoProperty *mono_property;
 
@@ -47,17 +46,17 @@ class GDMonoProperty : public IMonoClassMember {
 	MonoCustomAttrInfo *attributes;
 
 public:
-	virtual GDMonoClass *get_enclosing_class() const GD_FINAL { return owner; }
+	virtual GDMonoClass *get_enclosing_class() const final { return owner; }
 
-	virtual MemberType get_member_type() const GD_FINAL { return MEMBER_TYPE_PROPERTY; }
+	virtual MemberType get_member_type() const final { return MEMBER_TYPE_PROPERTY; }
 
-	virtual StringName get_name() const GD_FINAL { return name; }
+	virtual StringName get_name() const final { return name; }
 
-	virtual bool is_static() GD_FINAL;
-	virtual Visibility get_visibility() GD_FINAL;
+	virtual bool is_static() final;
+	virtual Visibility get_visibility() final;
 
-	virtual bool has_attribute(GDMonoClass *p_attr_class) GD_FINAL;
-	virtual MonoObject *get_attribute(GDMonoClass *p_attr_class) GD_FINAL;
+	virtual bool has_attribute(GDMonoClass *p_attr_class) final;
+	virtual MonoObject *get_attribute(GDMonoClass *p_attr_class) final;
 	void fetch_attributes();
 
 	bool has_getter();
@@ -65,9 +64,9 @@ public:
 
 	_FORCE_INLINE_ ManagedType get_type() const { return type; }
 
-	void set_value(MonoObject *p_object, MonoObject *p_value, MonoException **r_exc = NULL);
-	void set_value(MonoObject *p_object, void **p_params, MonoException **r_exc = NULL);
-	MonoObject *get_value(MonoObject *p_object, MonoException **r_exc = NULL);
+	void set_value(MonoObject *p_object, MonoObject *p_value, MonoException **r_exc = nullptr);
+	void set_value(MonoObject *p_object, void **p_params, MonoException **r_exc = nullptr);
+	MonoObject *get_value(MonoObject *p_object, MonoException **r_exc = nullptr);
 
 	bool get_bool_value(MonoObject *p_object);
 	int get_int_value(MonoObject *p_object);
diff --git a/modules/mono/mono_gd/gd_mono_utils.cpp b/modules/mono/mono_gd/gd_mono_utils.cpp
index 4e7f590a69..3f1155f430 100644
--- a/modules/mono/mono_gd/gd_mono_utils.cpp
+++ b/modules/mono/mono_gd/gd_mono_utils.cpp
@@ -30,32 +30,33 @@
 
 #include "gd_mono_utils.h"
 
+#include <mono/metadata/debug-helpers.h>
 #include <mono/metadata/exception.h>
 
+#include "core/debugger/engine_debugger.h"
+#include "core/debugger/script_debugger.h"
 #include "core/os/dir_access.h"
+#include "core/os/mutex.h"
 #include "core/os/os.h"
-#include "core/project_settings.h"
 #include "core/reference.h"
 
 #ifdef TOOLS_ENABLED
-#include "editor/script_editor_debugger.h"
+#include "editor/debugger/editor_debugger_node.h"
 #endif
 
 #include "../csharp_script.h"
 #include "../utils/macros.h"
-#include "../utils/mutex_utils.h"
 #include "gd_mono.h"
 #include "gd_mono_cache.h"
 #include "gd_mono_class.h"
 #include "gd_mono_marshal.h"
-#include "gd_mono_method_thunk.h"
 
 namespace GDMonoUtils {
 
 MonoObject *unmanaged_get_managed(Object *unmanaged) {
-
-	if (!unmanaged)
-		return NULL;
+	if (!unmanaged) {
+		return nullptr;
+	}
 
 	if (unmanaged->get_script_instance()) {
 		CSharpInstance *cs_instance = CAST_CSHARP_INSTANCE(unmanaged->get_script_instance());
@@ -69,28 +70,28 @@ MonoObject *unmanaged_get_managed(Object *unmanaged) {
 
 	void *data = unmanaged->get_script_instance_binding(CSharpLanguage::get_singleton()->get_language_index());
 
-	ERR_FAIL_NULL_V(data, NULL);
+	ERR_FAIL_NULL_V(data, nullptr);
 
 	CSharpScriptBinding &script_binding = ((Map<Object *, CSharpScriptBinding>::Element *)data)->value();
 
 	if (!script_binding.inited) {
-		SCOPED_MUTEX_LOCK(CSharpLanguage::get_singleton()->get_language_bind_mutex());
+		MutexLock lock(CSharpLanguage::get_singleton()->get_language_bind_mutex());
 
 		if (!script_binding.inited) { // Other thread may have set it up
 			// Already had a binding that needs to be setup
 			CSharpLanguage::get_singleton()->setup_csharp_script_binding(script_binding, unmanaged);
 
-			ERR_FAIL_COND_V(!script_binding.inited, NULL);
+			ERR_FAIL_COND_V(!script_binding.inited, nullptr);
 		}
 	}
 
-	Ref<MonoGCHandle> &gchandle = script_binding.gchandle;
-	ERR_FAIL_COND_V(gchandle.is_null(), NULL);
+	MonoGCHandleData &gchandle = script_binding.gchandle;
 
-	MonoObject *target = gchandle->get_target();
+	MonoObject *target = gchandle.get_target();
 
-	if (target)
+	if (target) {
 		return target;
+	}
 
 	CSharpLanguage::get_singleton()->release_script_gchandle(gchandle);
 
@@ -98,13 +99,13 @@ MonoObject *unmanaged_get_managed(Object *unmanaged) {
 
 #ifdef DEBUG_ENABLED
 	CRASH_COND(script_binding.type_name == StringName());
-	CRASH_COND(script_binding.wrapper_class == NULL);
+	CRASH_COND(script_binding.wrapper_class == nullptr);
 #endif
 
 	MonoObject *mono_object = GDMonoUtils::create_managed_for_godot_object(script_binding.wrapper_class, script_binding.type_name, unmanaged);
-	ERR_FAIL_NULL_V(mono_object, NULL);
+	ERR_FAIL_NULL_V(mono_object, nullptr);
 
-	gchandle->set_handle(MonoGCHandle::new_strong_handle(mono_object), MonoGCHandle::STRONG_HANDLE);
+	gchandle = MonoGCHandleData::new_strong_handle(mono_object);
 
 	// Tie managed to unmanaged
 	Reference *ref = Object::cast_to<Reference>(unmanaged);
@@ -126,10 +127,15 @@ void set_main_thread(MonoThread *p_thread) {
 }
 
 MonoThread *attach_current_thread() {
-	ERR_FAIL_COND_V(!GDMono::get_singleton()->is_runtime_initialized(), NULL);
+	ERR_FAIL_COND_V(!GDMono::get_singleton()->is_runtime_initialized(), nullptr);
 	MonoDomain *scripts_domain = GDMono::get_singleton()->get_scripts_domain();
+#ifndef GD_MONO_SINGLE_APPDOMAIN
 	MonoThread *mono_thread = mono_thread_attach(scripts_domain ? scripts_domain : mono_get_root_domain());
-	ERR_FAIL_NULL_V(mono_thread, NULL);
+#else
+	// The scripts domain is the root domain
+	MonoThread *mono_thread = mono_thread_attach(scripts_domain);
+#endif
+	ERR_FAIL_NULL_V(mono_thread, nullptr);
 	return mono_thread;
 }
 
@@ -151,13 +157,36 @@ MonoThread *get_current_thread() {
 }
 
 bool is_thread_attached() {
-	return mono_domain_get() != NULL;
+	return mono_domain_get() != nullptr;
+}
+
+uint32_t new_strong_gchandle(MonoObject *p_object) {
+	return mono_gchandle_new(p_object, /* pinned: */ false);
+}
+
+uint32_t new_strong_gchandle_pinned(MonoObject *p_object) {
+	return mono_gchandle_new(p_object, /* pinned: */ true);
+}
+
+uint32_t new_weak_gchandle(MonoObject *p_object) {
+	return mono_gchandle_new_weakref(p_object, /* track_resurrection: */ false);
+}
+
+void free_gchandle(uint32_t p_gchandle) {
+	mono_gchandle_free(p_gchandle);
 }
 
 void runtime_object_init(MonoObject *p_this_obj, GDMonoClass *p_class, MonoException **r_exc) {
 	GDMonoMethod *ctor = p_class->get_method(".ctor", 0);
 	ERR_FAIL_NULL(ctor);
-	ctor->invoke_raw(p_this_obj, NULL, r_exc);
+	ctor->invoke_raw(p_this_obj, nullptr, r_exc);
+}
+
+bool mono_delegate_equal(MonoDelegate *p_a, MonoDelegate *p_b) {
+	MonoException *exc = nullptr;
+	MonoBoolean res = CACHED_METHOD_THUNK(Delegate, Equals).invoke((MonoObject *)p_a, (MonoObject *)p_b, &exc);
+	UNHANDLED_EXCEPTION(exc);
+	return (bool)res;
 }
 
 GDMonoClass *get_object_class(MonoObject *p_object) {
@@ -167,8 +196,9 @@ GDMonoClass *get_object_class(MonoObject *p_object) {
 GDMonoClass *type_get_proxy_class(const StringName &p_type) {
 	String class_name = p_type;
 
-	if (class_name[0] == '_')
+	if (class_name[0] == '_') {
 		class_name = class_name.substr(1, class_name.length());
+	}
 
 	GDMonoClass *klass = GDMono::get_singleton()->get_core_api_assembly()->get_class(BINDINGS_NAMESPACE, class_name);
 
@@ -191,24 +221,27 @@ GDMonoClass *get_class_native_base(GDMonoClass *p_class) {
 
 	do {
 		const GDMonoAssembly *assembly = klass->get_assembly();
-		if (assembly == GDMono::get_singleton()->get_core_api_assembly())
+
+		if (assembly == GDMono::get_singleton()->get_core_api_assembly()) {
 			return klass;
+		}
 #ifdef TOOLS_ENABLED
-		if (assembly == GDMono::get_singleton()->get_editor_api_assembly())
+		if (assembly == GDMono::get_singleton()->get_editor_api_assembly()) {
 			return klass;
+		}
 #endif
-	} while ((klass = klass->get_parent_class()) != NULL);
+	} while ((klass = klass->get_parent_class()) != nullptr);
 
-	return NULL;
+	return nullptr;
 }
 
 MonoObject *create_managed_for_godot_object(GDMonoClass *p_class, const StringName &p_native, Object *p_object) {
 	bool parent_is_object_class = ClassDB::is_parent_class(p_object->get_class_name(), p_native);
-	ERR_FAIL_COND_V_MSG(!parent_is_object_class, NULL,
+	ERR_FAIL_COND_V_MSG(!parent_is_object_class, nullptr,
 			"Type inherits from native type '" + p_native + "', so it can't be instanced in object of type: '" + p_object->get_class() + "'.");
 
 	MonoObject *mono_object = mono_object_new(mono_domain_get(), p_class->get_mono_ptr());
-	ERR_FAIL_NULL_V(mono_object, NULL);
+	ERR_FAIL_NULL_V(mono_object, nullptr);
 
 	CACHED_FIELD(GodotObject, ptr)->set_value_raw(mono_object, p_object);
 
@@ -218,9 +251,21 @@ MonoObject *create_managed_for_godot_object(GDMonoClass *p_class, const StringNa
 	return mono_object;
 }
 
+MonoObject *create_managed_from(const StringName &p_from) {
+	MonoObject *mono_object = mono_object_new(mono_domain_get(), CACHED_CLASS_RAW(StringName));
+	ERR_FAIL_NULL_V(mono_object, nullptr);
+
+	// Construct
+	GDMonoUtils::runtime_object_init(mono_object, CACHED_CLASS(StringName));
+
+	CACHED_FIELD(StringName, ptr)->set_value_raw(mono_object, memnew(StringName(p_from)));
+
+	return mono_object;
+}
+
 MonoObject *create_managed_from(const NodePath &p_from) {
 	MonoObject *mono_object = mono_object_new(mono_domain_get(), CACHED_CLASS_RAW(NodePath));
-	ERR_FAIL_NULL_V(mono_object, NULL);
+	ERR_FAIL_NULL_V(mono_object, nullptr);
 
 	// Construct
 	GDMonoUtils::runtime_object_init(mono_object, CACHED_CLASS(NodePath));
@@ -232,7 +277,7 @@ MonoObject *create_managed_from(const NodePath &p_from) {
 
 MonoObject *create_managed_from(const RID &p_from) {
 	MonoObject *mono_object = mono_object_new(mono_domain_get(), CACHED_CLASS_RAW(RID));
-	ERR_FAIL_NULL_V(mono_object, NULL);
+	ERR_FAIL_NULL_V(mono_object, nullptr);
 
 	// Construct
 	GDMonoUtils::runtime_object_init(mono_object, CACHED_CLASS(RID));
@@ -244,15 +289,15 @@ MonoObject *create_managed_from(const RID &p_from) {
 
 MonoObject *create_managed_from(const Array &p_from, GDMonoClass *p_class) {
 	MonoObject *mono_object = mono_object_new(mono_domain_get(), p_class->get_mono_ptr());
-	ERR_FAIL_NULL_V(mono_object, NULL);
+	ERR_FAIL_NULL_V(mono_object, nullptr);
 
 	// Search constructor that takes a pointer as parameter
 	MonoMethod *m;
-	void *iter = NULL;
+	void *iter = nullptr;
 	while ((m = mono_class_get_methods(p_class->get_mono_ptr(), &iter))) {
 		if (strcmp(mono_method_get_name(m), ".ctor") == 0) {
 			MonoMethodSignature *sig = mono_method_signature(m);
-			void *front = NULL;
+			void *front = nullptr;
 			if (mono_signature_get_param_count(sig) == 1 &&
 					mono_class_from_mono_type(mono_signature_get_params(sig, &front)) == CACHED_CLASS(IntPtr)->get_mono_ptr()) {
 				break;
@@ -260,12 +305,12 @@ MonoObject *create_managed_from(const Array &p_from, GDMonoClass *p_class) {
 		}
 	}
 
-	CRASH_COND(m == NULL);
+	CRASH_COND(m == nullptr);
 
 	Array *new_array = memnew(Array(p_from));
 	void *args[1] = { &new_array };
 
-	MonoException *exc = NULL;
+	MonoException *exc = nullptr;
 	GDMonoUtils::runtime_invoke(m, mono_object, args, &exc);
 	UNHANDLED_EXCEPTION(exc);
 
@@ -274,15 +319,15 @@ MonoObject *create_managed_from(const Array &p_from, GDMonoClass *p_class) {
 
 MonoObject *create_managed_from(const Dictionary &p_from, GDMonoClass *p_class) {
 	MonoObject *mono_object = mono_object_new(mono_domain_get(), p_class->get_mono_ptr());
-	ERR_FAIL_NULL_V(mono_object, NULL);
+	ERR_FAIL_NULL_V(mono_object, nullptr);
 
 	// Search constructor that takes a pointer as parameter
 	MonoMethod *m;
-	void *iter = NULL;
+	void *iter = nullptr;
 	while ((m = mono_class_get_methods(p_class->get_mono_ptr(), &iter))) {
 		if (strcmp(mono_method_get_name(m), ".ctor") == 0) {
 			MonoMethodSignature *sig = mono_method_signature(m);
-			void *front = NULL;
+			void *front = nullptr;
 			if (mono_signature_get_param_count(sig) == 1 &&
 					mono_class_from_mono_type(mono_signature_get_params(sig, &front)) == CACHED_CLASS(IntPtr)->get_mono_ptr()) {
 				break;
@@ -290,12 +335,12 @@ MonoObject *create_managed_from(const Dictionary &p_from, GDMonoClass *p_class)
 		}
 	}
 
-	CRASH_COND(m == NULL);
+	CRASH_COND(m == nullptr);
 
 	Dictionary *new_dict = memnew(Dictionary(p_from));
 	void *args[1] = { &new_dict };
 
-	MonoException *exc = NULL;
+	MonoException *exc = nullptr;
 	GDMonoUtils::runtime_invoke(m, mono_object, args, &exc);
 	UNHANDLED_EXCEPTION(exc);
 
@@ -305,7 +350,7 @@ MonoObject *create_managed_from(const Dictionary &p_from, GDMonoClass *p_class)
 MonoDomain *create_domain(const String &p_friendly_name) {
 	print_verbose("Mono: Creating domain '" + p_friendly_name + "'...");
 
-	MonoDomain *domain = mono_domain_create_appdomain((char *)p_friendly_name.utf8().get_data(), NULL);
+	MonoDomain *domain = mono_domain_create_appdomain((char *)p_friendly_name.utf8().get_data(), nullptr);
 
 	if (domain) {
 		// Workaround to avoid this exception:
@@ -317,6 +362,14 @@ MonoDomain *create_domain(const String &p_friendly_name) {
 	return domain;
 }
 
+String get_type_desc(MonoType *p_type) {
+	return mono_type_full_name(p_type);
+}
+
+String get_type_desc(MonoReflectionType *p_reftype) {
+	return get_type_desc(mono_reflection_type_get_type(p_reftype));
+}
+
 String get_exception_name_and_message(MonoException *p_exc) {
 	String res;
 
@@ -330,20 +383,12 @@ String get_exception_name_and_message(MonoException *p_exc) {
 	res += ": ";
 
 	MonoProperty *prop = mono_class_get_property_from_name(klass, "Message");
-	MonoString *msg = (MonoString *)property_get_value(prop, (MonoObject *)p_exc, NULL, NULL);
+	MonoString *msg = (MonoString *)property_get_value(prop, (MonoObject *)p_exc, nullptr, nullptr);
 	res += GDMonoMarshal::mono_string_to_godot(msg);
 
 	return res;
 }
 
-void set_exception_message(MonoException *p_exc, String message) {
-	MonoClass *klass = mono_object_get_class((MonoObject *)p_exc);
-	MonoProperty *prop = mono_class_get_property_from_name(klass, "Message");
-	MonoString *msg = GDMonoMarshal::mono_string_from_godot(message);
-	void *params[1] = { msg };
-	property_set_value(prop, (MonoObject *)p_exc, params, NULL);
-}
-
 void debug_print_unhandled_exception(MonoException *p_exc) {
 	print_unhandled_exception(p_exc);
 	debug_send_unhandled_exception_error(p_exc);
@@ -351,16 +396,21 @@ void debug_print_unhandled_exception(MonoException *p_exc) {
 
 void debug_send_unhandled_exception_error(MonoException *p_exc) {
 #ifdef DEBUG_ENABLED
-	if (!ScriptDebugger::get_singleton()) {
+	if (!EngineDebugger::is_active()) {
 #ifdef TOOLS_ENABLED
 		if (Engine::get_singleton()->is_editor_hint()) {
-			ERR_PRINTS(GDMonoUtils::get_exception_name_and_message(p_exc));
+			ERR_PRINT(GDMonoUtils::get_exception_name_and_message(p_exc));
 		}
 #endif
 		return;
 	}
 
-	_TLS_RECURSION_GUARD_;
+	static thread_local bool _recursion_flag_ = false;
+	if (_recursion_flag_) {
+		return;
+	}
+	_recursion_flag_ = true;
+	SCOPE_EXIT { _recursion_flag_ = false; };
 
 	ScriptLanguage::StackInfo separator;
 	separator.file = String();
@@ -370,14 +420,14 @@ void debug_send_unhandled_exception_error(MonoException *p_exc) {
 	Vector<ScriptLanguage::StackInfo> si;
 	String exc_msg;
 
-	while (p_exc != NULL) {
+	while (p_exc != nullptr) {
 		GDMonoClass *st_klass = CACHED_CLASS(System_Diagnostics_StackTrace);
 		MonoObject *stack_trace = mono_object_new(mono_domain_get(), st_klass->get_mono_ptr());
 
 		MonoBoolean need_file_info = true;
 		void *ctor_args[2] = { p_exc, &need_file_info };
 
-		MonoException *unexpected_exc = NULL;
+		MonoException *unexpected_exc = nullptr;
 		CACHED_METHOD(System_Diagnostics_StackTrace, ctor_Exception_bool)->invoke_raw(stack_trace, ctor_args, &unexpected_exc);
 
 		if (unexpected_exc) {
@@ -386,21 +436,23 @@ void debug_send_unhandled_exception_error(MonoException *p_exc) {
 		}
 
 		Vector<ScriptLanguage::StackInfo> _si;
-		if (stack_trace != NULL) {
+		if (stack_trace != nullptr) {
 			_si = CSharpLanguage::get_singleton()->stack_trace_get_info(stack_trace);
-			for (int i = _si.size() - 1; i >= 0; i--)
+			for (int i = _si.size() - 1; i >= 0; i--) {
 				si.insert(0, _si[i]);
+			}
 		}
 
 		exc_msg += (exc_msg.length() > 0 ? " ---> " : "") + GDMonoUtils::get_exception_name_and_message(p_exc);
 
 		GDMonoClass *exc_class = GDMono::get_singleton()->get_class(mono_get_exception_class());
 		GDMonoProperty *inner_exc_prop = exc_class->get_property("InnerException");
-		CRASH_COND(inner_exc_prop == NULL);
+		CRASH_COND(inner_exc_prop == nullptr);
 
 		MonoObject *inner_exc = inner_exc_prop->get_value((MonoObject *)p_exc);
-		if (inner_exc != NULL)
+		if (inner_exc != nullptr) {
 			si.insert(0, separator);
+		}
 
 		p_exc = (MonoException *)inner_exc;
 	}
@@ -410,7 +462,7 @@ void debug_send_unhandled_exception_error(MonoException *p_exc) {
 	int line = si.size() ? si[0].line : __LINE__;
 	String error_msg = "Unhandled exception";
 
-	ScriptDebugger::get_singleton()->send_error(func, file, line, error_msg, exc_msg, ERR_HANDLER_ERROR, si);
+	EngineDebugger::get_script_debugger()->send_error(func, file, line, error_msg, exc_msg, ERR_HANDLER_ERROR, si);
 #endif
 }
 
@@ -431,14 +483,13 @@ void set_pending_exception(MonoException *p_exc) {
 	}
 
 	if (!mono_runtime_set_pending_exception(p_exc, false)) {
-		ERR_PRINTS("Exception thrown from managed code, but it could not be set as pending:");
+		ERR_PRINT("Exception thrown from managed code, but it could not be set as pending:");
 		GDMonoUtils::debug_print_unhandled_exception(p_exc);
 	}
 #endif
 }
 
-_THREAD_LOCAL_(int)
-current_invoke_count = 0;
+thread_local int current_invoke_count = 0;
 
 MonoObject *runtime_invoke(MonoMethod *p_method, void *p_obj, void **p_params, MonoException **r_exc) {
 	GD_MONO_BEGIN_RUNTIME_INVOKE;
@@ -511,9 +562,10 @@ namespace Marshal {
 
 #ifdef MONO_GLUE_ENABLED
 #ifdef TOOLS_ENABLED
-#define NO_GLUE_RET(m_ret)                                                   \
-	{                                                                        \
-		if (!GDMonoCache::cached_data.godot_api_cache_updated) return m_ret; \
+#define NO_GLUE_RET(m_ret)                                     \
+	{                                                          \
+		if (!GDMonoCache::cached_data.godot_api_cache_updated) \
+			return m_ret;                                      \
 	}
 #else
 #define NO_GLUE_RET(m_ret) \
@@ -526,7 +578,7 @@ namespace Marshal {
 
 bool type_is_generic_array(MonoReflectionType *p_reftype) {
 	NO_GLUE_RET(false);
-	MonoException *exc = NULL;
+	MonoException *exc = nullptr;
 	MonoBoolean res = CACHED_METHOD_THUNK(MarshalUtils, TypeIsGenericArray).invoke(p_reftype, &exc);
 	UNHANDLED_EXCEPTION(exc);
 	return (bool)res;
@@ -534,94 +586,75 @@ bool type_is_generic_array(MonoReflectionType *p_reftype) {
 
 bool type_is_generic_dictionary(MonoReflectionType *p_reftype) {
 	NO_GLUE_RET(false);
-	MonoException *exc = NULL;
+	MonoException *exc = nullptr;
 	MonoBoolean res = CACHED_METHOD_THUNK(MarshalUtils, TypeIsGenericDictionary).invoke(p_reftype, &exc);
 	UNHANDLED_EXCEPTION(exc);
 	return (bool)res;
 }
 
-void array_get_element_type(MonoReflectionType *p_array_reftype, MonoReflectionType **r_elem_reftype) {
-	MonoException *exc = NULL;
-	CACHED_METHOD_THUNK(MarshalUtils, ArrayGetElementType).invoke(p_array_reftype, r_elem_reftype, &exc);
-	UNHANDLED_EXCEPTION(exc);
-}
-
-void dictionary_get_key_value_types(MonoReflectionType *p_dict_reftype, MonoReflectionType **r_key_reftype, MonoReflectionType **r_value_reftype) {
-	MonoException *exc = NULL;
-	CACHED_METHOD_THUNK(MarshalUtils, DictionaryGetKeyValueTypes).invoke(p_dict_reftype, r_key_reftype, r_value_reftype, &exc);
-	UNHANDLED_EXCEPTION(exc);
-}
-
-bool generic_ienumerable_is_assignable_from(MonoReflectionType *p_reftype) {
+bool type_is_system_generic_list(MonoReflectionType *p_reftype) {
 	NO_GLUE_RET(false);
-	MonoException *exc = NULL;
-	MonoBoolean res = CACHED_METHOD_THUNK(MarshalUtils, GenericIEnumerableIsAssignableFromType).invoke(p_reftype, &exc);
+	MonoException *exc = nullptr;
+	MonoBoolean res = CACHED_METHOD_THUNK(MarshalUtils, TypeIsSystemGenericList).invoke(p_reftype, &exc);
 	UNHANDLED_EXCEPTION(exc);
 	return (bool)res;
 }
 
-bool generic_idictionary_is_assignable_from(MonoReflectionType *p_reftype) {
+bool type_is_system_generic_dictionary(MonoReflectionType *p_reftype) {
 	NO_GLUE_RET(false);
-	MonoException *exc = NULL;
-	MonoBoolean res = CACHED_METHOD_THUNK(MarshalUtils, GenericIDictionaryIsAssignableFromType).invoke(p_reftype, &exc);
+	MonoException *exc = nullptr;
+	MonoBoolean res = CACHED_METHOD_THUNK(MarshalUtils, TypeIsSystemGenericDictionary).invoke(p_reftype, &exc);
 	UNHANDLED_EXCEPTION(exc);
 	return (bool)res;
 }
 
-bool generic_ienumerable_is_assignable_from(MonoReflectionType *p_reftype, MonoReflectionType **r_elem_reftype) {
+bool type_is_generic_ienumerable(MonoReflectionType *p_reftype) {
 	NO_GLUE_RET(false);
-	MonoException *exc = NULL;
-	MonoBoolean res = CACHED_METHOD_THUNK(MarshalUtils, GenericIEnumerableIsAssignableFromType_with_info).invoke(p_reftype, r_elem_reftype, &exc);
+	MonoException *exc = nullptr;
+	MonoBoolean res = CACHED_METHOD_THUNK(MarshalUtils, TypeIsGenericIEnumerable).invoke(p_reftype, &exc);
 	UNHANDLED_EXCEPTION(exc);
 	return (bool)res;
 }
 
-bool generic_idictionary_is_assignable_from(MonoReflectionType *p_reftype, MonoReflectionType **r_key_reftype, MonoReflectionType **r_value_reftype) {
+bool type_is_generic_icollection(MonoReflectionType *p_reftype) {
 	NO_GLUE_RET(false);
-	MonoException *exc = NULL;
-	MonoBoolean res = CACHED_METHOD_THUNK(MarshalUtils, GenericIDictionaryIsAssignableFromType_with_info).invoke(p_reftype, r_key_reftype, r_value_reftype, &exc);
+	MonoException *exc = nullptr;
+	MonoBoolean res = CACHED_METHOD_THUNK(MarshalUtils, TypeIsGenericICollection).invoke(p_reftype, &exc);
 	UNHANDLED_EXCEPTION(exc);
 	return (bool)res;
 }
 
-Array enumerable_to_array(MonoObject *p_enumerable) {
-	NO_GLUE_RET(Array());
-	Array result;
-	MonoException *exc = NULL;
-	CACHED_METHOD_THUNK(MarshalUtils, EnumerableToArray).invoke(p_enumerable, &result, &exc);
+bool type_is_generic_idictionary(MonoReflectionType *p_reftype) {
+	NO_GLUE_RET(false);
+	MonoException *exc = nullptr;
+	MonoBoolean res = CACHED_METHOD_THUNK(MarshalUtils, TypeIsGenericIDictionary).invoke(p_reftype, &exc);
 	UNHANDLED_EXCEPTION(exc);
-	return result;
+	return (bool)res;
 }
 
-Dictionary idictionary_to_dictionary(MonoObject *p_idictionary) {
-	NO_GLUE_RET(Dictionary());
-	Dictionary result;
-	MonoException *exc = NULL;
-	CACHED_METHOD_THUNK(MarshalUtils, IDictionaryToDictionary).invoke(p_idictionary, &result, &exc);
+void array_get_element_type(MonoReflectionType *p_array_reftype, MonoReflectionType **r_elem_reftype) {
+	MonoException *exc = nullptr;
+	CACHED_METHOD_THUNK(MarshalUtils, ArrayGetElementType).invoke(p_array_reftype, r_elem_reftype, &exc);
 	UNHANDLED_EXCEPTION(exc);
-	return result;
 }
 
-Dictionary generic_idictionary_to_dictionary(MonoObject *p_generic_idictionary) {
-	NO_GLUE_RET(Dictionary());
-	Dictionary result;
-	MonoException *exc = NULL;
-	CACHED_METHOD_THUNK(MarshalUtils, GenericIDictionaryToDictionary).invoke(p_generic_idictionary, &result, &exc);
+void dictionary_get_key_value_types(MonoReflectionType *p_dict_reftype, MonoReflectionType **r_key_reftype, MonoReflectionType **r_value_reftype) {
+	MonoException *exc = nullptr;
+	CACHED_METHOD_THUNK(MarshalUtils, DictionaryGetKeyValueTypes).invoke(p_dict_reftype, r_key_reftype, r_value_reftype, &exc);
 	UNHANDLED_EXCEPTION(exc);
-	return result;
 }
 
 GDMonoClass *make_generic_array_type(MonoReflectionType *p_elem_reftype) {
-	NO_GLUE_RET(NULL);
-	MonoException *exc = NULL;
+	NO_GLUE_RET(nullptr);
+	MonoException *exc = nullptr;
 	MonoReflectionType *reftype = CACHED_METHOD_THUNK(MarshalUtils, MakeGenericArrayType).invoke(p_elem_reftype, &exc);
 	UNHANDLED_EXCEPTION(exc);
 	return GDMono::get_singleton()->get_class(mono_class_from_mono_type(mono_reflection_type_get_type(reftype)));
 }
 
 GDMonoClass *make_generic_dictionary_type(MonoReflectionType *p_key_reftype, MonoReflectionType *p_value_reftype) {
-	NO_GLUE_RET(NULL);
-	MonoException *exc = NULL;
+	NO_GLUE_RET(nullptr);
+	MonoException *exc = nullptr;
 	MonoReflectionType *reftype = CACHED_METHOD_THUNK(MarshalUtils, MakeGenericDictionaryType).invoke(p_key_reftype, p_value_reftype, &exc);
 	UNHANDLED_EXCEPTION(exc);
 	return GDMono::get_singleton()->get_class(mono_class_from_mono_type(mono_reflection_type_get_type(reftype)));
@@ -629,8 +662,7 @@ GDMonoClass *make_generic_dictionary_type(MonoReflectionType *p_key_reftype, Mon
 
 } // namespace Marshal
 
-ScopeThreadAttach::ScopeThreadAttach() :
-		mono_thread(NULL) {
+ScopeThreadAttach::ScopeThreadAttach() {
 	if (likely(GDMono::get_singleton()->is_runtime_initialized()) && unlikely(!mono_domain_get())) {
 		mono_thread = GDMonoUtils::attach_current_thread();
 	}
@@ -642,6 +674,10 @@ ScopeThreadAttach::~ScopeThreadAttach() {
 	}
 }
 
-// namespace Marshal
+StringName get_native_godot_class_name(GDMonoClass *p_class) {
+	MonoObject *native_name_obj = p_class->get_field(BINDINGS_NATIVE_NAME_FIELD)->get_value(nullptr);
+	StringName *ptr = GDMonoMarshal::unbox<StringName *>(CACHED_FIELD(StringName, ptr)->get_value(native_name_obj));
+	return ptr ? *ptr : StringName();
+}
 
 } // namespace GDMonoUtils
diff --git a/modules/mono/mono_gd/gd_mono_utils.h b/modules/mono/mono_gd/gd_mono_utils.h
index db9f99bfdc..5958bf3cc1 100644
--- a/modules/mono/mono_gd/gd_mono_utils.h
+++ b/modules/mono/mono_gd/gd_mono_utils.h
@@ -35,17 +35,17 @@
 
 #include "../mono_gc_handle.h"
 #include "../utils/macros.h"
-#include "../utils/thread_local.h"
 #include "gd_mono_header.h"
 
 #include "core/object.h"
 #include "core/reference.h"
 
 #define UNHANDLED_EXCEPTION(m_exc)                     \
-	if (unlikely(m_exc != NULL)) {                     \
+	if (unlikely(m_exc != nullptr)) {                  \
 		GDMonoUtils::debug_unhandled_exception(m_exc); \
 		GD_UNREACHABLE();                              \
-	}
+	} else                                             \
+		((void)0)
 
 namespace GDMonoUtils {
 
@@ -53,22 +53,18 @@ namespace Marshal {
 
 bool type_is_generic_array(MonoReflectionType *p_reftype);
 bool type_is_generic_dictionary(MonoReflectionType *p_reftype);
+bool type_is_system_generic_list(MonoReflectionType *p_reftype);
+bool type_is_system_generic_dictionary(MonoReflectionType *p_reftype);
+bool type_is_generic_ienumerable(MonoReflectionType *p_reftype);
+bool type_is_generic_icollection(MonoReflectionType *p_reftype);
+bool type_is_generic_idictionary(MonoReflectionType *p_reftype);
 
 void array_get_element_type(MonoReflectionType *p_array_reftype, MonoReflectionType **r_elem_reftype);
 void dictionary_get_key_value_types(MonoReflectionType *p_dict_reftype, MonoReflectionType **r_key_reftype, MonoReflectionType **r_value_reftype);
 
-bool generic_ienumerable_is_assignable_from(MonoReflectionType *p_reftype);
-bool generic_idictionary_is_assignable_from(MonoReflectionType *p_reftype);
-bool generic_ienumerable_is_assignable_from(MonoReflectionType *p_reftype, MonoReflectionType **r_elem_reftype);
-bool generic_idictionary_is_assignable_from(MonoReflectionType *p_reftype, MonoReflectionType **r_key_reftype, MonoReflectionType **r_value_reftype);
-
 GDMonoClass *make_generic_array_type(MonoReflectionType *p_elem_reftype);
 GDMonoClass *make_generic_dictionary_type(MonoReflectionType *p_key_reftype, MonoReflectionType *p_value_reftype);
 
-Array enumerable_to_array(MonoObject *p_enumerable);
-Dictionary idictionary_to_dictionary(MonoObject *p_idictionary);
-Dictionary generic_idictionary_to_dictionary(MonoObject *p_generic_idictionary);
-
 } // namespace Marshal
 
 _FORCE_INLINE_ void hash_combine(uint32_t &p_hash, const uint32_t &p_with_hash) {
@@ -78,7 +74,7 @@ _FORCE_INLINE_ void hash_combine(uint32_t &p_hash, const uint32_t &p_with_hash)
 /**
  * If the object has a csharp script, returns the target of the gchandle stored in the script instance
  * Otherwise returns a newly constructed MonoObject* which is attached to the object
- * Returns NULL on error
+ * Returns nullptr on error
  */
 MonoObject *unmanaged_get_managed(Object *unmanaged);
 
@@ -89,11 +85,14 @@ void detach_current_thread(MonoThread *p_mono_thread);
 MonoThread *get_current_thread();
 bool is_thread_attached();
 
-_FORCE_INLINE_ bool is_main_thread() {
-	return mono_domain_get() != NULL && mono_thread_get_main() == mono_thread_current();
-}
+uint32_t new_strong_gchandle(MonoObject *p_object);
+uint32_t new_strong_gchandle_pinned(MonoObject *p_object);
+uint32_t new_weak_gchandle(MonoObject *p_object);
+void free_gchandle(uint32_t p_gchandle);
+
+void runtime_object_init(MonoObject *p_this_obj, GDMonoClass *p_class, MonoException **r_exc = nullptr);
 
-void runtime_object_init(MonoObject *p_this_obj, GDMonoClass *p_class, MonoException **r_exc = NULL);
+bool mono_delegate_equal(MonoDelegate *p_a, MonoDelegate *p_b);
 
 GDMonoClass *get_object_class(MonoObject *p_object);
 GDMonoClass *type_get_proxy_class(const StringName &p_type);
@@ -101,6 +100,7 @@ GDMonoClass *get_class_native_base(GDMonoClass *p_class);
 
 MonoObject *create_managed_for_godot_object(GDMonoClass *p_class, const StringName &p_native, Object *p_object);
 
+MonoObject *create_managed_from(const StringName &p_from);
 MonoObject *create_managed_from(const NodePath &p_from);
 MonoObject *create_managed_from(const RID &p_from);
 MonoObject *create_managed_from(const Array &p_from, GDMonoClass *p_class);
@@ -108,8 +108,10 @@ MonoObject *create_managed_from(const Dictionary &p_from, GDMonoClass *p_class);
 
 MonoDomain *create_domain(const String &p_friendly_name);
 
+String get_type_desc(MonoType *p_type);
+String get_type_desc(MonoReflectionType *p_reftype);
+
 String get_exception_name_and_message(MonoException *p_exc);
-void set_exception_message(MonoException *p_exc, String message);
 
 void debug_print_unhandled_exception(MonoException *p_exc);
 void debug_send_unhandled_exception_error(MonoException *p_exc);
@@ -123,11 +125,12 @@ void print_unhandled_exception(MonoException *p_exc);
  */
 void set_pending_exception(MonoException *p_exc);
 
-extern _THREAD_LOCAL_(int) current_invoke_count;
+extern thread_local int current_invoke_count;
 
 _FORCE_INLINE_ int get_runtime_invoke_count() {
 	return current_invoke_count;
 }
+
 _FORCE_INLINE_ int &get_runtime_invoke_count_ref() {
 	return current_invoke_count;
 }
@@ -149,29 +152,35 @@ struct ScopeThreadAttach {
 	~ScopeThreadAttach();
 
 private:
-	MonoThread *mono_thread;
+	MonoThread *mono_thread = nullptr;
 };
 
+StringName get_native_godot_class_name(GDMonoClass *p_class);
+
 } // namespace GDMonoUtils
 
-#define NATIVE_GDMONOCLASS_NAME(m_class) (GDMonoMarshal::mono_string_to_godot((MonoString *)m_class->get_field(BINDINGS_NATIVE_NAME_FIELD)->get_value(NULL)))
+#define NATIVE_GDMONOCLASS_NAME(m_class) (GDMonoUtils::get_native_godot_class_name(m_class))
 
 #define GD_MONO_BEGIN_RUNTIME_INVOKE                                              \
 	int &_runtime_invoke_count_ref = GDMonoUtils::get_runtime_invoke_count_ref(); \
-	_runtime_invoke_count_ref += 1;
+	_runtime_invoke_count_ref += 1;                                               \
+	((void)0)
 
-#define GD_MONO_END_RUNTIME_INVOKE \
-	_runtime_invoke_count_ref -= 1;
+#define GD_MONO_END_RUNTIME_INVOKE  \
+	_runtime_invoke_count_ref -= 1; \
+	((void)0)
 
 #define GD_MONO_SCOPE_THREAD_ATTACH                                   \
 	GDMonoUtils::ScopeThreadAttach __gdmono__scope__thread__attach__; \
-	(void)__gdmono__scope__thread__attach__;
+	(void)__gdmono__scope__thread__attach__;                          \
+	((void)0)
 
 #ifdef DEBUG_ENABLED
-#define GD_MONO_ASSERT_THREAD_ATTACHED \
-	{ CRASH_COND(!GDMonoUtils::is_thread_attached()); }
+#define GD_MONO_ASSERT_THREAD_ATTACHED              \
+	CRASH_COND(!GDMonoUtils::is_thread_attached()); \
+	((void)0)
 #else
-#define GD_MONO_ASSERT_THREAD_ATTACHED
+#define GD_MONO_ASSERT_THREAD_ATTACHED ((void)0)
 #endif
 
 #endif // GD_MONOUTILS_H
diff --git a/modules/mono/mono_gd/managed_type.h b/modules/mono/mono_gd/managed_type.h
index 11b832d0cc..491a2f3d20 100644
--- a/modules/mono/mono_gd/managed_type.h
+++ b/modules/mono/mono_gd/managed_type.h
@@ -36,18 +36,15 @@
 #include "gd_mono_header.h"
 
 struct ManagedType {
-	int type_encoding;
-	GDMonoClass *type_class;
+	int type_encoding = 0;
+	GDMonoClass *type_class = nullptr;
 
 	static ManagedType from_class(GDMonoClass *p_class);
 	static ManagedType from_class(MonoClass *p_mono_class);
 	static ManagedType from_type(MonoType *p_mono_type);
 	static ManagedType from_reftype(MonoReflectionType *p_mono_reftype);
 
-	ManagedType() :
-			type_encoding(0),
-			type_class(NULL) {
-	}
+	ManagedType() {}
 
 	ManagedType(int p_type_encoding, GDMonoClass *p_type_class) :
 			type_encoding(p_type_encoding),
diff --git a/modules/mono/mono_gd/gd_mono_android.cpp b/modules/mono/mono_gd/support/android_support.cpp
index 27f394fae0..8bcdeec9dd 100644
--- a/modules/mono/mono_gd/gd_mono_android.cpp
+++ b/modules/mono/mono_gd/support/android_support.cpp
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  gd_mono_android.cpp                                                  */
+/*  android_support.cpp                                                  */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "gd_mono_android.h"
+#include "android_support.h"
 
 #if defined(ANDROID_ENABLED)
 
@@ -49,14 +49,16 @@
 #include "platform/android/os_android.h"
 #include "platform/android/thread_jandroid.h"
 
-#include "../utils/path_utils.h"
-#include "../utils/string_utils.h"
-#include "gd_mono_cache.h"
-#include "gd_mono_marshal.h"
+#include "../../utils/path_utils.h"
+#include "../../utils/string_utils.h"
+#include "../gd_mono_cache.h"
+#include "../gd_mono_marshal.h"
 
 // Warning: JNI boilerplate ahead... continue at your own risk
 
-namespace GDMonoAndroid {
+namespace gdmono {
+namespace android {
+namespace support {
 
 template <typename T>
 struct ScopedLocalRef {
@@ -67,7 +69,7 @@ struct ScopedLocalRef {
 	_FORCE_INLINE_ operator T() const { return local_ref; }
 	_FORCE_INLINE_ operator jvalue() const { return (jvalue)local_ref; }
 
-	_FORCE_INLINE_ operator bool() const { return local_ref != NULL; }
+	_FORCE_INLINE_ operator bool() const { return local_ref != nullptr; }
 
 	_FORCE_INLINE_ bool operator==(std::nullptr_t) const {
 		return local_ref == nullptr;
@@ -122,7 +124,7 @@ String determine_app_native_lib_dir() {
 
 	String result;
 
-	const char *const nativeLibraryDirUtf8 = env->GetStringUTFChars(nativeLibraryDir, NULL);
+	const char *const nativeLibraryDirUtf8 = env->GetStringUTFChars(nativeLibraryDir, nullptr);
 	if (nativeLibraryDirUtf8) {
 		result.parse_utf8(nativeLibraryDirUtf8);
 		env->ReleaseStringUTFChars(nativeLibraryDir, nativeLibraryDirUtf8);
@@ -150,21 +152,21 @@ int gd_mono_convert_dl_flags(int flags) {
 	return lflags;
 }
 
-#ifndef GD_MONO_ANDROID_SO_NAME
-#define GD_MONO_ANDROID_SO_NAME "libmonosgen-2.0.so"
+#ifndef GD_MONO_SO_NAME
+#define GD_MONO_SO_NAME "libmonosgen-2.0.so"
 #endif
 
-const char *mono_so_name = GD_MONO_ANDROID_SO_NAME;
+const char *mono_so_name = GD_MONO_SO_NAME;
 const char *godot_so_name = "libgodot_android.so";
 
-void *mono_dl_handle = NULL;
-void *godot_dl_handle = NULL;
+void *mono_dl_handle = nullptr;
+void *godot_dl_handle = nullptr;
 
 void *try_dlopen(const String &p_so_path, int p_flags) {
 	if (!FileAccess::exists(p_so_path)) {
 		if (OS::get_singleton()->is_stdout_verbose())
 			OS::get_singleton()->print("Cannot find shared library: '%s'\n", p_so_path.utf8().get_data());
-		return NULL;
+		return nullptr;
 	}
 
 	int lflags = gd_mono_convert_dl_flags(p_flags);
@@ -174,7 +176,7 @@ void *try_dlopen(const String &p_so_path, int p_flags) {
 	if (!handle) {
 		if (OS::get_singleton()->is_stdout_verbose())
 			OS::get_singleton()->print("Failed to open shared library: '%s'. Error: '%s'\n", p_so_path.utf8().get_data(), dlerror());
-		return NULL;
+		return nullptr;
 	}
 
 	if (OS::get_singleton()->is_stdout_verbose())
@@ -184,7 +186,7 @@ void *try_dlopen(const String &p_so_path, int p_flags) {
 }
 
 void *gd_mono_android_dlopen(const char *p_name, int p_flags, char **r_err, void *p_user_data) {
-	if (p_name == NULL) {
+	if (p_name == nullptr) {
 		// __Internal
 
 		if (!mono_dl_handle) {
@@ -209,7 +211,7 @@ void *gd_mono_android_dlopen(const char *p_name, int p_flags, char **r_err, void
 		return try_dlopen(so_path, p_flags);
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 void *gd_mono_android_dlsym(void *p_handle, const char *p_name, char **r_err, void *p_user_data) {
@@ -230,7 +232,7 @@ void *gd_mono_android_dlsym(void *p_handle, const char *p_name, char **r_err, vo
 	if (r_err)
 		*r_err = str_format_new("%s\n", dlerror());
 
-	return NULL;
+	return nullptr;
 }
 
 void *gd_mono_android_dlclose(void *p_handle, void *p_user_data) {
@@ -238,9 +240,9 @@ void *gd_mono_android_dlclose(void *p_handle, void *p_user_data) {
 
 	// Not sure if this ever happens. Does Mono close the handle for the main module?
 	if (p_handle == mono_dl_handle)
-		mono_dl_handle = NULL;
+		mono_dl_handle = nullptr;
 
-	return NULL;
+	return nullptr;
 }
 
 int32_t build_version_sdk_int = 0;
@@ -265,7 +267,7 @@ int32_t get_build_version_sdk_int() {
 	return build_version_sdk_int;
 }
 
-jobject certStore = NULL; // KeyStore
+jobject certStore = nullptr; // KeyStore
 
 MonoBoolean _gd_mono_init_cert_store() {
 	// The JNI code is the equivalent of:
@@ -293,7 +295,7 @@ MonoBoolean _gd_mono_init_cert_store() {
 	if (jni_exception_check(env))
 		return 0;
 
-	env->CallVoidMethod(certStoreLocal, load, NULL);
+	env->CallVoidMethod(certStoreLocal, load, nullptr);
 
 	if (jni_exception_check(env))
 		return 0;
@@ -315,9 +317,9 @@ MonoArray *_gd_mono_android_cert_store_lookup(MonoString *p_alias) {
 	char *alias_utf8 = mono_string_to_utf8_checked(p_alias, &mono_error);
 
 	if (!mono_error_ok(&mono_error)) {
-		ERR_PRINTS(String() + "Failed to convert MonoString* to UTF-8: '" + mono_error_get_message(&mono_error) + "'.");
+		ERR_PRINT(String() + "Failed to convert MonoString* to UTF-8: '" + mono_error_get_message(&mono_error) + "'.");
 		mono_error_cleanup(&mono_error);
-		return NULL;
+		return nullptr;
 	}
 
 	JNIEnv *env = ThreadAndroid::get_env();
@@ -326,20 +328,20 @@ MonoArray *_gd_mono_android_cert_store_lookup(MonoString *p_alias) {
 	mono_free(alias_utf8);
 
 	ScopedLocalRef<jclass> keyStoreClass(env, env->FindClass("java/security/KeyStore"));
-	ERR_FAIL_NULL_V(keyStoreClass, NULL);
+	ERR_FAIL_NULL_V(keyStoreClass, nullptr);
 	ScopedLocalRef<jclass> certificateClass(env, env->FindClass("java/security/cert/Certificate"));
-	ERR_FAIL_NULL_V(certificateClass, NULL);
+	ERR_FAIL_NULL_V(certificateClass, nullptr);
 
 	jmethodID getCertificate = env->GetMethodID(keyStoreClass, "getCertificate", "(Ljava/lang/String;)Ljava/security/cert/Certificate;");
-	ERR_FAIL_NULL_V(getCertificate, NULL);
+	ERR_FAIL_NULL_V(getCertificate, nullptr);
 
 	jmethodID getEncoded = env->GetMethodID(certificateClass, "getEncoded", "()[B");
-	ERR_FAIL_NULL_V(getEncoded, NULL);
+	ERR_FAIL_NULL_V(getEncoded, nullptr);
 
 	ScopedLocalRef<jobject> certificate(env, env->CallObjectMethod(certStore, getCertificate, js_alias.get()));
 
 	if (!certificate)
-		return NULL;
+		return nullptr;
 
 	ScopedLocalRef<jbyteArray> encoded(env, (jbyteArray)env->CallObjectMethod(certificate, getEncoded));
 	jsize encodedLength = env->GetArrayLength(encoded);
@@ -352,11 +354,16 @@ MonoArray *_gd_mono_android_cert_store_lookup(MonoString *p_alias) {
 	return encoded_ret;
 }
 
+void register_internal_calls() {
+	mono_add_internal_call("Android.Runtime.AndroidEnvironment::_gd_mono_init_cert_store", (void *)_gd_mono_init_cert_store);
+	mono_add_internal_call("Android.Runtime.AndroidEnvironment::_gd_mono_android_cert_store_lookup", (void *)_gd_mono_android_cert_store_lookup);
+}
+
 void initialize() {
 	// We need to set this environment variable to make the monodroid BCL use btls instead of legacy as the default provider
 	OS::get_singleton()->set_environment("XA_TLS_PROVIDER", "btls");
 
-	mono_dl_fallback_register(gd_mono_android_dlopen, gd_mono_android_dlsym, gd_mono_android_dlclose, NULL);
+	mono_dl_fallback_register(gd_mono_android_dlopen, gd_mono_android_dlsym, gd_mono_android_dlclose, nullptr);
 
 	String app_native_lib_dir = get_app_native_lib_dir();
 	String so_path = path::join(app_native_lib_dir, godot_so_name);
@@ -364,31 +371,28 @@ void initialize() {
 	godot_dl_handle = try_dlopen(so_path, gd_mono_convert_dl_flags(MONO_DL_LAZY));
 }
 
-void register_internal_calls() {
-	mono_add_internal_call("Android.Runtime.AndroidEnvironment::_gd_mono_init_cert_store", (void *)_gd_mono_init_cert_store);
-	mono_add_internal_call("Android.Runtime.AndroidEnvironment::_gd_mono_android_cert_store_lookup", (void *)_gd_mono_android_cert_store_lookup);
-}
-
 void cleanup() {
 	// This is called after shutting down the Mono runtime
 
 	if (mono_dl_handle)
-		gd_mono_android_dlclose(mono_dl_handle, NULL);
+		gd_mono_android_dlclose(mono_dl_handle, nullptr);
 
 	if (godot_dl_handle)
-		gd_mono_android_dlclose(godot_dl_handle, NULL);
+		gd_mono_android_dlclose(godot_dl_handle, nullptr);
 
 	JNIEnv *env = ThreadAndroid::get_env();
 
 	if (certStore) {
 		env->DeleteGlobalRef(certStore);
-		certStore = NULL;
+		certStore = nullptr;
 	}
 }
 
-} // namespace GDMonoAndroid
+} // namespace support
+} // namespace android
+} // namespace gdmono
 
-using namespace GDMonoAndroid;
+using namespace gdmono::android::support;
 
 // The following are P/Invoke functions required by the monodroid profile of the BCL.
 // These are P/Invoke functions and not internal calls, hence why they use
@@ -417,7 +421,7 @@ GD_PINVOKE_EXPORT int32_t monodroid_get_system_property(const char *p_name, char
 			memcpy(*r_value, prop_value_str, len);
 			(*r_value)[len] = '\0';
 		} else {
-			*r_value = NULL;
+			*r_value = nullptr;
 		}
 	}
 
@@ -604,7 +608,7 @@ GD_PINVOKE_EXPORT int32_t _monodroid_get_dns_servers(void **r_dns_servers_array)
 	if (!r_dns_servers_array)
 		return -1;
 
-	*r_dns_servers_array = NULL;
+	*r_dns_servers_array = nullptr;
 
 	char *dns_servers[dns_servers_len];
 	int dns_servers_count = 0;
@@ -648,23 +652,23 @@ GD_PINVOKE_EXPORT const char *_monodroid_timezone_get_default_id() {
 	JNIEnv *env = ThreadAndroid::get_env();
 
 	ScopedLocalRef<jclass> timeZoneClass(env, env->FindClass("java/util/TimeZone"));
-	ERR_FAIL_NULL_V(timeZoneClass, NULL);
+	ERR_FAIL_NULL_V(timeZoneClass, nullptr);
 
 	jmethodID getDefault = env->GetStaticMethodID(timeZoneClass, "getDefault", "()Ljava/util/TimeZone;");
-	ERR_FAIL_NULL_V(getDefault, NULL);
+	ERR_FAIL_NULL_V(getDefault, nullptr);
 
 	jmethodID getID = env->GetMethodID(timeZoneClass, "getID", "()Ljava/lang/String;");
-	ERR_FAIL_NULL_V(getID, NULL);
+	ERR_FAIL_NULL_V(getID, nullptr);
 
 	ScopedLocalRef<jobject> defaultTimeZone(env, env->CallStaticObjectMethod(timeZoneClass, getDefault));
 
 	if (!defaultTimeZone)
-		return NULL;
+		return nullptr;
 
 	ScopedLocalRef<jstring> defaultTimeZoneID(env, (jstring)env->CallObjectMethod(defaultTimeZone, getID));
 
 	if (!defaultTimeZoneID)
-		return NULL;
+		return nullptr;
 
 	const char *default_time_zone_id = env->GetStringUTFChars(defaultTimeZoneID, 0);
 
diff --git a/modules/mono/mono_gd/gd_mono_android.h b/modules/mono/mono_gd/support/android_support.h
index 0e04847924..dc2e6c95ed 100644..100755
--- a/modules/mono/mono_gd/gd_mono_android.h
+++ b/modules/mono/mono_gd/support/android_support.h
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  gd_mono_android.h                                                    */
+/*  android_support.h                                                    */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,25 +28,28 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GD_MONO_ANDROID_H
-#define GD_MONO_ANDROID_H
+#ifndef ANDROID_SUPPORT_H
+#define ANDROID_SUPPORT_H
 
 #if defined(ANDROID_ENABLED)
 
 #include "core/ustring.h"
 
-namespace GDMonoAndroid {
+namespace gdmono {
+namespace android {
+namespace support {
 
 String get_app_native_lib_dir();
 
 void initialize();
+void cleanup();
 
 void register_internal_calls();
 
-void cleanup();
-
-} // namespace GDMonoAndroid
+} // namespace support
+} // namespace android
+} // namespace gdmono
 
 #endif // ANDROID_ENABLED
 
-#endif // GD_MONO_ANDROID_H
+#endif // ANDROID_SUPPORT_H
diff --git a/modules/mono/mono_gd/support/ios_support.h b/modules/mono/mono_gd/support/ios_support.h
new file mode 100755
index 0000000000..e28af120e3
--- /dev/null
+++ b/modules/mono/mono_gd/support/ios_support.h
@@ -0,0 +1,51 @@
+/*************************************************************************/
+/*  ios_support.h                                                        */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef IOS_SUPPORT_H
+#define IOS_SUPPORT_H
+
+#if defined(IPHONE_ENABLED)
+
+#include "core/ustring.h"
+
+namespace gdmono {
+namespace ios {
+namespace support {
+
+void initialize();
+void cleanup();
+
+} // namespace support
+} // namespace ios
+} // namespace gdmono
+
+#endif // IPHONE_ENABLED
+
+#endif // IOS_SUPPORT_H
diff --git a/modules/mono/mono_gd/support/ios_support.mm b/modules/mono/mono_gd/support/ios_support.mm
new file mode 100644
index 0000000000..e3d1a647fd
--- /dev/null
+++ b/modules/mono/mono_gd/support/ios_support.mm
@@ -0,0 +1,151 @@
+/*************************************************************************/
+/*  ios_support.mm                                                       */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "ios_support.h"
+
+#if defined(IPHONE_ENABLED)
+
+#import <Foundation/Foundation.h>
+#include <os/log.h>
+
+#include "core/ustring.h"
+
+#include "../gd_mono_marshal.h"
+
+// Implemented mostly following: https://github.com/mono/mono/blob/master/sdks/ios/app/runtime.m
+
+// Definition generated by the Godot exporter
+extern "C" void gd_mono_setup_aot();
+
+namespace gdmono {
+namespace ios {
+namespace support {
+
+void ios_mono_log_callback(const char *log_domain, const char *log_level, const char *message, mono_bool fatal, void *user_data) {
+	os_log_info(OS_LOG_DEFAULT, "(%s %s) %s", log_domain, log_level, message);
+	if (fatal) {
+		os_log_info(OS_LOG_DEFAULT, "Exit code: %d.", 1);
+		exit(1);
+	}
+}
+
+void initialize() {
+	mono_dllmap_insert(NULL, "System.Native", NULL, "__Internal", NULL);
+	mono_dllmap_insert(NULL, "System.IO.Compression.Native", NULL, "__Internal", NULL);
+	mono_dllmap_insert(NULL, "System.Security.Cryptography.Native.Apple", NULL, "__Internal", NULL);
+
+#ifdef IOS_DEVICE
+	// This function is defined in an auto-generated source file
+	gd_mono_setup_aot();
+#endif
+
+	mono_set_signal_chaining(true);
+	mono_set_crash_chaining(true);
+}
+
+void cleanup() {
+}
+
+} // namespace support
+} // namespace ios
+} // namespace gdmono
+
+// The following are P/Invoke functions required by the monotouch profile of the BCL.
+// These are P/Invoke functions and not internal calls, hence why they use
+// 'mono_bool' and 'const char*' instead of 'MonoBoolean' and 'MonoString*'.
+
+#define GD_PINVOKE_EXPORT extern "C" __attribute__((visibility("default")))
+
+GD_PINVOKE_EXPORT const char *xamarin_get_locale_country_code() {
+	NSLocale *locale = [NSLocale currentLocale];
+	NSString *countryCode = [locale objectForKey:NSLocaleCountryCode];
+	if (countryCode == NULL) {
+		return strdup("US");
+	}
+	return strdup([countryCode UTF8String]);
+}
+
+GD_PINVOKE_EXPORT void xamarin_log(const uint16_t *p_unicode_message) {
+	int length = 0;
+	const uint16_t *ptr = p_unicode_message;
+	while (*ptr++)
+		length += sizeof(uint16_t);
+	NSString *msg = [[NSString alloc] initWithBytes:p_unicode_message length:length encoding:NSUTF16LittleEndianStringEncoding];
+
+	os_log_info(OS_LOG_DEFAULT, "%{public}@", msg);
+}
+
+GD_PINVOKE_EXPORT const char *xamarin_GetFolderPath(int p_folder) {
+	NSSearchPathDirectory dd = (NSSearchPathDirectory)p_folder;
+	NSURL *url = [[[NSFileManager defaultManager] URLsForDirectory:dd inDomains:NSUserDomainMask] lastObject];
+	NSString *path = [url path];
+	return strdup([path UTF8String]);
+}
+
+GD_PINVOKE_EXPORT char *xamarin_timezone_get_local_name() {
+	NSTimeZone *tz = nil;
+	tz = [NSTimeZone localTimeZone];
+	NSString *name = [tz name];
+	return (name != nil) ? strdup([name UTF8String]) : strdup("Local");
+}
+
+GD_PINVOKE_EXPORT char **xamarin_timezone_get_names(uint32_t *p_count) {
+	NSArray *array = [NSTimeZone knownTimeZoneNames];
+	*p_count = array.count;
+	char **result = (char **)malloc(sizeof(char *) * (*p_count));
+	for (uint32_t i = 0; i < *p_count; i++) {
+		NSString *s = [array objectAtIndex:i];
+		result[i] = strdup(s.UTF8String);
+	}
+	return result;
+}
+
+GD_PINVOKE_EXPORT void *xamarin_timezone_get_data(const char *p_name, uint32_t *p_size) { // FIXME: uint32_t since Dec 2019, unsigned long before
+	NSTimeZone *tz = nil;
+	if (p_name) {
+		NSString *n = [[NSString alloc] initWithUTF8String:p_name];
+		tz = [[[NSTimeZone alloc] initWithName:n] autorelease];
+		[n release];
+	} else {
+		tz = [NSTimeZone localTimeZone];
+	}
+	NSData *data = [tz data];
+	*p_size = [data length];
+	void *result = malloc(*p_size);
+	memcpy(result, data.bytes, *p_size);
+	return result;
+}
+
+GD_PINVOKE_EXPORT void xamarin_start_wwan(const char *p_uri) {
+	// FIXME: What's this for? No idea how to implement.
+	os_log_error(OS_LOG_DEFAULT, "Not implemented: 'xamarin_start_wwan'");
+}
+
+#endif // IPHONE_ENABLED
diff --git a/modules/mono/register_types.cpp b/modules/mono/register_types.cpp
index 4823ba3679..98c3ba1324 100644
--- a/modules/mono/register_types.cpp
+++ b/modules/mono/register_types.cpp
@@ -34,11 +34,11 @@
 
 #include "csharp_script.h"
 
-CSharpLanguage *script_language_cs = NULL;
+CSharpLanguage *script_language_cs = nullptr;
 Ref<ResourceFormatLoaderCSharpScript> resource_loader_cs;
 Ref<ResourceFormatSaverCSharpScript> resource_saver_cs;
 
-_GodotSharp *_godotsharp = NULL;
+_GodotSharp *_godotsharp = nullptr;
 
 void register_mono_types() {
 	ClassDB::register_class<CSharpScript>();
@@ -62,8 +62,9 @@ void register_mono_types() {
 void unregister_mono_types() {
 	ScriptServer::unregister_language(script_language_cs);
 
-	if (script_language_cs)
+	if (script_language_cs) {
 		memdelete(script_language_cs);
+	}
 
 	ResourceLoader::remove_resource_format_loader(resource_loader_cs);
 	resource_loader_cs.unref();
@@ -71,6 +72,7 @@ void unregister_mono_types() {
 	ResourceSaver::remove_resource_format_saver(resource_saver_cs);
 	resource_saver_cs.unref();
 
-	if (_godotsharp)
+	if (_godotsharp) {
 		memdelete(_godotsharp);
+	}
 }
diff --git a/modules/mono/register_types.h b/modules/mono/register_types.h
index 7fd0d24eb0..e30d9a8abd 100644
--- a/modules/mono/register_types.h
+++ b/modules/mono/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef MONO_REGISTER_TYPES_H
+#define MONO_REGISTER_TYPES_H
+
 void register_mono_types();
 void unregister_mono_types();
+
+#endif // MONO_REGISTER_TYPES_H
diff --git a/modules/mono/signal_awaiter_utils.cpp b/modules/mono/signal_awaiter_utils.cpp
index d3226762ea..bd67b03c8e 100644
--- a/modules/mono/signal_awaiter_utils.cpp
+++ b/modules/mono/signal_awaiter_utils.cpp
@@ -36,108 +36,197 @@
 #include "mono_gd/gd_mono_marshal.h"
 #include "mono_gd/gd_mono_utils.h"
 
-namespace SignalAwaiterUtils {
-
-Error connect_signal_awaiter(Object *p_source, const String &p_signal, Object *p_target, MonoObject *p_awaiter) {
-
+Error gd_mono_connect_signal_awaiter(Object *p_source, const StringName &p_signal, Object *p_target, MonoObject *p_awaiter) {
 	ERR_FAIL_NULL_V(p_source, ERR_INVALID_DATA);
 	ERR_FAIL_NULL_V(p_target, ERR_INVALID_DATA);
 
-	Ref<SignalAwaiterHandle> sa_con = memnew(SignalAwaiterHandle(p_awaiter));
-#ifdef DEBUG_ENABLED
-	sa_con->set_connection_target(p_target);
-#endif
+	// TODO: Use pooling for ManagedCallable instances.
+	SignalAwaiterCallable *awaiter_callable = memnew(SignalAwaiterCallable(p_target, p_awaiter, p_signal));
+	Callable callable = Callable(awaiter_callable);
+
+	return p_source->connect(p_signal, callable, Vector<Variant>(), Object::CONNECT_ONESHOT);
+}
+
+bool SignalAwaiterCallable::compare_equal(const CallableCustom *p_a, const CallableCustom *p_b) {
+	const SignalAwaiterCallable *a = static_cast<const SignalAwaiterCallable *>(p_a);
+	const SignalAwaiterCallable *b = static_cast<const SignalAwaiterCallable *>(p_b);
 
-	Vector<Variant> binds;
-	binds.push_back(sa_con);
+	if (a->target_id != b->target_id) {
+		return false;
+	}
+
+	if (a->signal != b->signal) {
+		return false;
+	}
+
+	return true;
+}
+
+bool SignalAwaiterCallable::compare_less(const CallableCustom *p_a, const CallableCustom *p_b) {
+	if (compare_equal(p_a, p_b)) {
+		return false;
+	}
+	return p_a < p_b;
+}
 
-	Error err = p_source->connect(p_signal, sa_con.ptr(),
-			CSharpLanguage::get_singleton()->get_string_names()._signal_callback,
-			binds, Object::CONNECT_ONESHOT);
+uint32_t SignalAwaiterCallable::hash() const {
+	uint32_t hash = signal.hash();
+	return hash_djb2_one_64(target_id, hash);
+}
 
-	if (err != OK) {
-		// Set it as completed to prevent it from calling the failure callback when released.
-		// The awaiter will be aware of the failure by checking the returned error.
-		sa_con->set_completed(true);
+String SignalAwaiterCallable::get_as_text() const {
+	Object *base = ObjectDB::get_instance(target_id);
+	if (base) {
+		String class_name = base->get_class();
+		Ref<Script> script = base->get_script();
+		if (script.is_valid() && script->get_path().is_resource_file()) {
+			class_name += "(" + script->get_path().get_file() + ")";
+		}
+		return class_name + "::SignalAwaiterMiddleman::" + String(signal);
+	} else {
+		return "null::SignalAwaiterMiddleman::" + String(signal);
 	}
+}
+
+CallableCustom::CompareEqualFunc SignalAwaiterCallable::get_compare_equal_func() const {
+	return compare_equal_func_ptr;
+}
+
+CallableCustom::CompareLessFunc SignalAwaiterCallable::get_compare_less_func() const {
+	return compare_less_func_ptr;
+}
 
-	return err;
+ObjectID SignalAwaiterCallable::get_object() const {
+	return target_id;
 }
-} // namespace SignalAwaiterUtils
 
-Variant SignalAwaiterHandle::_signal_callback(const Variant **p_args, int p_argcount, Variant::CallError &r_error) {
+void SignalAwaiterCallable::call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, Callable::CallError &r_call_error) const {
+	r_call_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD; // Can't find anything better
+	r_return_value = Variant();
 
 #ifdef DEBUG_ENABLED
-	ERR_FAIL_COND_V_MSG(conn_target_id && !ObjectDB::get_instance(conn_target_id), Variant(),
+	ERR_FAIL_COND_MSG(target_id.is_valid() && !ObjectDB::get_instance(target_id),
 			"Resumed after await, but class instance is gone.");
 #endif
 
-	if (p_argcount < 1) {
-		r_error.error = Variant::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
-		r_error.argument = 1;
-		return Variant();
+	MonoArray *signal_args = mono_array_new(mono_domain_get(), CACHED_CLASS_RAW(MonoObject), p_argcount);
+
+	for (int i = 0; i < p_argcount; i++) {
+		MonoObject *boxed = GDMonoMarshal::variant_to_mono_object(*p_arguments[i]);
+		mono_array_setref(signal_args, i, boxed);
 	}
 
-	Ref<SignalAwaiterHandle> self = *p_args[p_argcount - 1];
+	MonoObject *awaiter = awaiter_handle.get_target();
 
-	if (self.is_null()) {
-		r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
-		r_error.argument = p_argcount - 1;
-		r_error.expected = Variant::OBJECT;
-		return Variant();
+	if (!awaiter) {
+		r_call_error.error = Callable::CallError::CALL_ERROR_INSTANCE_IS_NULL;
+		return;
+	}
+
+	MonoException *exc = nullptr;
+	CACHED_METHOD_THUNK(SignalAwaiter, SignalCallback).invoke(awaiter, signal_args, &exc);
+
+	if (exc) {
+		GDMonoUtils::set_pending_exception(exc);
+		ERR_FAIL();
+	} else {
+		r_call_error.error = Callable::CallError::CALL_OK;
 	}
+}
 
-	set_completed(true);
+SignalAwaiterCallable::SignalAwaiterCallable(Object *p_target, MonoObject *p_awaiter, const StringName &p_signal) :
+		target_id(p_target->get_instance_id()),
+		awaiter_handle(MonoGCHandleData::new_strong_handle(p_awaiter)),
+		signal(p_signal) {
+}
 
-	int signal_argc = p_argcount - 1;
-	MonoArray *signal_args = mono_array_new(mono_domain_get(), CACHED_CLASS_RAW(MonoObject), signal_argc);
+SignalAwaiterCallable::~SignalAwaiterCallable() {
+	awaiter_handle.release();
+}
 
-	for (int i = 0; i < signal_argc; i++) {
-		MonoObject *boxed = GDMonoMarshal::variant_to_mono_object(*p_args[i]);
-		mono_array_setref(signal_args, i, boxed);
+bool EventSignalCallable::compare_equal(const CallableCustom *p_a, const CallableCustom *p_b) {
+	const EventSignalCallable *a = static_cast<const EventSignalCallable *>(p_a);
+	const EventSignalCallable *b = static_cast<const EventSignalCallable *>(p_b);
+
+	if (a->owner != b->owner) {
+		return false;
+	}
+
+	if (a->event_signal != b->event_signal) {
+		return false;
 	}
 
-	MonoException *exc = NULL;
-	GD_MONO_BEGIN_RUNTIME_INVOKE;
-	CACHED_METHOD_THUNK(SignalAwaiter, SignalCallback).invoke(get_target(), signal_args, &exc);
-	GD_MONO_END_RUNTIME_INVOKE;
+	return true;
+}
 
-	if (exc) {
-		GDMonoUtils::set_pending_exception(exc);
-		ERR_FAIL_V(Variant());
+bool EventSignalCallable::compare_less(const CallableCustom *p_a, const CallableCustom *p_b) {
+	if (compare_equal(p_a, p_b)) {
+		return false;
 	}
+	return p_a < p_b;
+}
+
+uint32_t EventSignalCallable::hash() const {
+	uint32_t hash = event_signal->field->get_name().hash();
+	return hash_djb2_one_64(owner->get_instance_id(), hash);
+}
 
-	return Variant();
+String EventSignalCallable::get_as_text() const {
+	String class_name = owner->get_class();
+	Ref<Script> script = owner->get_script();
+	if (script.is_valid() && script->get_path().is_resource_file()) {
+		class_name += "(" + script->get_path().get_file() + ")";
+	}
+	StringName signal = event_signal->field->get_name();
+	return class_name + "::EventSignalMiddleman::" + String(signal);
 }
 
-void SignalAwaiterHandle::_bind_methods() {
+CallableCustom::CompareEqualFunc EventSignalCallable::get_compare_equal_func() const {
+	return compare_equal_func_ptr;
+}
 
-	ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT, "_signal_callback", &SignalAwaiterHandle::_signal_callback, MethodInfo("_signal_callback"));
+CallableCustom::CompareLessFunc EventSignalCallable::get_compare_less_func() const {
+	return compare_less_func_ptr;
 }
 
-SignalAwaiterHandle::SignalAwaiterHandle(MonoObject *p_managed) :
-		MonoGCHandle(MonoGCHandle::new_strong_handle(p_managed), STRONG_HANDLE) {
+ObjectID EventSignalCallable::get_object() const {
+	return owner->get_instance_id();
+}
 
-#ifdef DEBUG_ENABLED
-	conn_target_id = 0;
-#endif
+StringName EventSignalCallable::get_signal() const {
+	return event_signal->field->get_name();
 }
 
-SignalAwaiterHandle::~SignalAwaiterHandle() {
+void EventSignalCallable::call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, Callable::CallError &r_call_error) const {
+	r_call_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD; // Can't find anything better
+	r_return_value = Variant();
 
-	if (!completed) {
-		MonoObject *awaiter = get_target();
+	ERR_FAIL_COND(p_argcount < event_signal->invoke_method->get_parameters_count());
 
-		if (awaiter) {
-			MonoException *exc = NULL;
-			GD_MONO_BEGIN_RUNTIME_INVOKE;
-			CACHED_METHOD_THUNK(SignalAwaiter, FailureCallback).invoke(awaiter, &exc);
-			GD_MONO_END_RUNTIME_INVOKE;
+	CSharpInstance *csharp_instance = CAST_CSHARP_INSTANCE(owner->get_script_instance());
+	ERR_FAIL_NULL(csharp_instance);
 
-			if (exc) {
-				GDMonoUtils::set_pending_exception(exc);
-				ERR_FAIL();
-			}
-		}
+	MonoObject *owner_managed = csharp_instance->get_mono_object();
+	ERR_FAIL_NULL(owner_managed);
+
+	MonoObject *delegate_field_value = event_signal->field->get_value(owner_managed);
+	if (!delegate_field_value) {
+		r_call_error.error = Callable::CallError::CALL_OK;
+		return;
 	}
+
+	MonoException *exc = nullptr;
+	event_signal->invoke_method->invoke(delegate_field_value, p_arguments, &exc);
+
+	if (exc) {
+		GDMonoUtils::set_pending_exception(exc);
+		ERR_FAIL();
+	} else {
+		r_call_error.error = Callable::CallError::CALL_OK;
+	}
+}
+
+EventSignalCallable::EventSignalCallable(Object *p_owner, const CSharpScript::EventSignal *p_event_signal) :
+		owner(p_owner),
+		event_signal(p_event_signal) {
 }
diff --git a/modules/mono/signal_awaiter_utils.h b/modules/mono/signal_awaiter_utils.h
index a9956ad5ba..c550315a23 100644
--- a/modules/mono/signal_awaiter_utils.h
+++ b/modules/mono/signal_awaiter_utils.h
@@ -32,40 +32,66 @@
 #define SIGNAL_AWAITER_UTILS_H
 
 #include "core/reference.h"
+
+#include "csharp_script.h"
 #include "mono_gc_handle.h"
 
-namespace SignalAwaiterUtils {
+Error gd_mono_connect_signal_awaiter(Object *p_source, const StringName &p_signal, Object *p_target, MonoObject *p_awaiter);
+
+class SignalAwaiterCallable : public CallableCustom {
+	ObjectID target_id;
+	MonoGCHandleData awaiter_handle;
+	StringName signal;
+
+public:
+	static bool compare_equal(const CallableCustom *p_a, const CallableCustom *p_b);
+	static bool compare_less(const CallableCustom *p_a, const CallableCustom *p_b);
 
-Error connect_signal_awaiter(Object *p_source, const String &p_signal, Object *p_target, MonoObject *p_awaiter);
-}
+	static constexpr CompareEqualFunc compare_equal_func_ptr = &SignalAwaiterCallable::compare_equal;
+	static constexpr CompareEqualFunc compare_less_func_ptr = &SignalAwaiterCallable::compare_less;
 
-class SignalAwaiterHandle : public MonoGCHandle {
+	uint32_t hash() const override;
 
-	GDCLASS(SignalAwaiterHandle, MonoGCHandle);
+	String get_as_text() const override;
 
-	bool completed;
+	CompareEqualFunc get_compare_equal_func() const override;
+	CompareLessFunc get_compare_less_func() const override;
 
-#ifdef DEBUG_ENABLED
-	ObjectID conn_target_id;
-#endif
+	ObjectID get_object() const override;
 
-	Variant _signal_callback(const Variant **p_args, int p_argcount, Variant::CallError &r_error);
+	_FORCE_INLINE_ StringName get_signal() const { return signal; }
+
+	void call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, Callable::CallError &r_call_error) const override;
+
+	SignalAwaiterCallable(Object *p_target, MonoObject *p_awaiter, const StringName &p_signal);
+	~SignalAwaiterCallable();
+};
 
-protected:
-	static void _bind_methods();
+class EventSignalCallable : public CallableCustom {
+	Object *owner;
+	const CSharpScript::EventSignal *event_signal;
 
 public:
-	_FORCE_INLINE_ bool is_completed() { return completed; }
-	_FORCE_INLINE_ void set_completed(bool p_completed) { completed = p_completed; }
+	static bool compare_equal(const CallableCustom *p_a, const CallableCustom *p_b);
+	static bool compare_less(const CallableCustom *p_a, const CallableCustom *p_b);
+
+	static constexpr CompareEqualFunc compare_equal_func_ptr = &EventSignalCallable::compare_equal;
+	static constexpr CompareEqualFunc compare_less_func_ptr = &EventSignalCallable::compare_less;
+
+	uint32_t hash() const override;
+
+	String get_as_text() const override;
+
+	CompareEqualFunc get_compare_equal_func() const override;
+	CompareLessFunc get_compare_less_func() const override;
+
+	ObjectID get_object() const override;
+
+	StringName get_signal() const;
 
-#ifdef DEBUG_ENABLED
-	_FORCE_INLINE_ void set_connection_target(Object *p_target) {
-		conn_target_id = p_target->get_instance_id();
-	}
-#endif
+	void call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, Callable::CallError &r_call_error) const override;
 
-	SignalAwaiterHandle(MonoObject *p_managed);
-	~SignalAwaiterHandle();
+	EventSignalCallable(Object *p_owner, const CSharpScript::EventSignal *p_event_signal);
 };
 
 #endif // SIGNAL_AWAITER_UTILS_H
diff --git a/modules/mono/utils/macros.h b/modules/mono/utils/macros.h
index 754000dc14..c76619cca4 100644
--- a/modules/mono/utils/macros.h
+++ b/modules/mono/utils/macros.h
@@ -36,38 +36,6 @@
 #define _GD_VARNAME_CONCAT_(m_a, m_b, m_c) _GD_VARNAME_CONCAT_A_(m_a, m_b, m_c)
 #define GD_UNIQUE_NAME(m_name) _GD_VARNAME_CONCAT_(m_name, _, __COUNTER__)
 
-// static assert
-// TODO: Get rid of this macro once we upgrade to C++11
-
-#ifdef __cpp_static_assert
-#define GD_STATIC_ASSERT(m_cond) static_assert((m_cond), "Condition '" #m_cond "' failed")
-#else
-#define GD_STATIC_ASSERT(m_cond) typedef int GD_UNIQUE_NAME(godot_static_assert)[((m_cond) ? 1 : -1)]
-#endif
-
-// final
-// TODO: Get rid of this macro once we upgrade to C++11
-
-#if (__cplusplus >= 201103L)
-#define GD_FINAL final
-#else
-#define GD_FINAL
-#endif
-
-// noreturn
-// TODO: Get rid of this macro once we upgrade to C++11
-
-#if (__cplusplus >= 201103L)
-#define GD_NORETURN [[noreturn]]
-#elif defined(__GNUC__)
-#define GD_NORETURN __attribute__((noreturn))
-#elif defined(_MSC_VER)
-#define GD_NORETURN __declspec(noreturn)
-#else
-#define GD_NORETURN
-#pragma message "Macro GD_NORETURN will have no effect"
-#endif
-
 // unreachable
 
 #if defined(_MSC_VER)
@@ -78,7 +46,28 @@
 #define GD_UNREACHABLE() \
 	CRASH_NOW();         \
 	do {                 \
-	} while (true);
+	} while (true)
 #endif
 
+namespace gdmono {
+
+template <typename F>
+struct ScopeExit {
+	ScopeExit(F p_exit_func) :
+			exit_func(p_exit_func) {}
+	~ScopeExit() { exit_func(); }
+	F exit_func;
+};
+
+class ScopeExitAux {
+public:
+	template <typename F>
+	ScopeExit<F> operator+(F p_exit_func) { return ScopeExit<F>(p_exit_func); }
+};
+
+} // namespace gdmono
+
+#define SCOPE_EXIT \
+	auto GD_UNIQUE_NAME(gd_scope_exit) = gdmono::ScopeExitAux() + [=]() -> void
+
 #endif // UTIL_MACROS_H
diff --git a/modules/mono/utils/mono_reg_utils.cpp b/modules/mono/utils/mono_reg_utils.cpp
index c1cd5f1db4..a619f0b975 100644
--- a/modules/mono/utils/mono_reg_utils.cpp
+++ b/modules/mono/utils/mono_reg_utils.cpp
@@ -58,7 +58,6 @@ REGSAM _get_bitness_sam() {
 }
 
 LONG _RegOpenKey(HKEY hKey, LPCWSTR lpSubKey, PHKEY phkResult) {
-
 	LONG res = RegOpenKeyExW(hKey, lpSubKey, 0, KEY_READ, phkResult);
 
 	if (res != ERROR_SUCCESS)
@@ -68,18 +67,16 @@ LONG _RegOpenKey(HKEY hKey, LPCWSTR lpSubKey, PHKEY phkResult) {
 }
 
 LONG _RegKeyQueryString(HKEY hKey, const String &p_value_name, String &r_value) {
-
 	Vector<WCHAR> buffer;
 	buffer.resize(512);
 	DWORD dwBufferSize = buffer.size();
 
-	LONG res = RegQueryValueExW(hKey, p_value_name.c_str(), 0, NULL, (LPBYTE)buffer.ptr(), &dwBufferSize);
+	LONG res = RegQueryValueExW(hKey, (LPCWSTR)(p_value_name.utf16().get_data()), 0, nullptr, (LPBYTE)buffer.ptr(), &dwBufferSize);
 
 	if (res == ERROR_MORE_DATA) {
 		// dwBufferSize now contains the actual size
-		Vector<WCHAR> buffer;
 		buffer.resize(dwBufferSize);
-		res = RegQueryValueExW(hKey, p_value_name.c_str(), 0, NULL, (LPBYTE)buffer.ptr(), &dwBufferSize);
+		res = RegQueryValueExW(hKey, (LPCWSTR)(p_value_name.utf16().get_data()), 0, nullptr, (LPBYTE)buffer.ptr(), &dwBufferSize);
 	}
 
 	if (res == ERROR_SUCCESS) {
@@ -92,9 +89,8 @@ LONG _RegKeyQueryString(HKEY hKey, const String &p_value_name, String &r_value)
 }
 
 LONG _find_mono_in_reg(const String &p_subkey, MonoRegInfo &r_info, bool p_old_reg = false) {
-
 	HKEY hKey;
-	LONG res = _RegOpenKey(HKEY_LOCAL_MACHINE, p_subkey.c_str(), &hKey);
+	LONG res = _RegOpenKey(HKEY_LOCAL_MACHINE, (LPCWSTR)(p_subkey.utf16().get_data()), &hKey);
 
 	if (res != ERROR_SUCCESS)
 		goto cleanup;
@@ -128,11 +124,10 @@ cleanup:
 }
 
 LONG _find_mono_in_reg_old(const String &p_subkey, MonoRegInfo &r_info) {
-
 	String default_clr;
 
 	HKEY hKey;
-	LONG res = _RegOpenKey(HKEY_LOCAL_MACHINE, p_subkey.c_str(), &hKey);
+	LONG res = _RegOpenKey(HKEY_LOCAL_MACHINE, (LPCWSTR)(p_subkey.utf16().get_data()), &hKey);
 
 	if (res != ERROR_SUCCESS)
 		goto cleanup;
@@ -150,7 +145,6 @@ cleanup:
 }
 
 MonoRegInfo find_mono() {
-
 	MonoRegInfo info;
 
 	if (_find_mono_in_reg("Software\\Mono", info) == ERROR_SUCCESS)
@@ -163,7 +157,6 @@ MonoRegInfo find_mono() {
 }
 
 String find_msbuild_tools_path() {
-
 	String msbuild_tools_path;
 
 	// Try to find 15.0 with vswhere
@@ -180,7 +173,7 @@ String find_msbuild_tools_path() {
 
 	String output;
 	int exit_code;
-	OS::get_singleton()->execute(vswhere_path, vswhere_args, true, NULL, &output, &exit_code);
+	OS::get_singleton()->execute(vswhere_path, vswhere_args, true, nullptr, &output, &exit_code);
 
 	if (exit_code == 0) {
 		Vector<String> lines = output.split("\n");
@@ -232,6 +225,7 @@ cleanup:
 
 	return msbuild_tools_path;
 }
+
 } // namespace MonoRegUtils
 
 #endif // WINDOWS_ENABLED
diff --git a/modules/mono/utils/mono_reg_utils.h b/modules/mono/utils/mono_reg_utils.h
index f844a7233a..4ef876f2b6 100644
--- a/modules/mono/utils/mono_reg_utils.h
+++ b/modules/mono/utils/mono_reg_utils.h
@@ -36,7 +36,6 @@
 #include "core/ustring.h"
 
 struct MonoRegInfo {
-
 	String version;
 	String install_root_dir;
 	String assembly_dir;
diff --git a/modules/mono/utils/osx_utils.cpp b/modules/mono/utils/osx_utils.cpp
index 432b306414..e68466b1cf 100644
--- a/modules/mono/utils/osx_utils.cpp
+++ b/modules/mono/utils/osx_utils.cpp
@@ -38,25 +38,21 @@
 #include <CoreServices/CoreServices.h>
 
 bool osx_is_app_bundle_installed(const String &p_bundle_id) {
-
-	CFURLRef app_url = NULL;
-	CFStringRef bundle_id = CFStringCreateWithCString(NULL, p_bundle_id.utf8(), kCFStringEncodingUTF8);
-	OSStatus result = LSFindApplicationForInfo(kLSUnknownCreator, bundle_id, NULL, NULL, &app_url);
+	CFStringRef bundle_id = CFStringCreateWithCString(nullptr, p_bundle_id.utf8(), kCFStringEncodingUTF8);
+	CFArrayRef result = LSCopyApplicationURLsForBundleIdentifier(bundle_id, nullptr);
 	CFRelease(bundle_id);
 
-	if (app_url)
-		CFRelease(app_url);
-
-	switch (result) {
-		case noErr:
+	if (result) {
+		if (CFArrayGetCount(result) > 0) {
+			CFRelease(result);
 			return true;
-		case kLSApplicationNotFoundErr:
-			break;
-		default:
-			break;
+		} else {
+			CFRelease(result);
+			return false;
+		}
+	} else {
+		return false;
 	}
-
-	return false;
 }
 
 #endif
diff --git a/modules/mono/utils/path_utils.cpp b/modules/mono/utils/path_utils.cpp
index 545da6c79e..5d1abd0c09 100644
--- a/modules/mono/utils/path_utils.cpp
+++ b/modules/mono/utils/path_utils.cpp
@@ -50,52 +50,30 @@
 
 namespace path {
 
-String find_executable(const String &p_name) {
-#ifdef WINDOWS_ENABLED
-	Vector<String> exts = OS::get_singleton()->get_environment("PATHEXT").split(ENV_PATH_SEP, false);
-#endif
-	Vector<String> env_path = OS::get_singleton()->get_environment("PATH").split(ENV_PATH_SEP, false);
-
-	if (env_path.empty())
-		return String();
-
-	for (int i = 0; i < env_path.size(); i++) {
-		String p = path::join(env_path[i], p_name);
-
-#ifdef WINDOWS_ENABLED
-		for (int j = 0; j < exts.size(); j++) {
-			String p2 = p + exts[j].to_lower(); // lowercase to reduce risk of case mismatch warning
-
-			if (FileAccess::exists(p2))
-				return p2;
-		}
-#else
-		if (FileAccess::exists(p))
-			return p;
-#endif
-	}
-
-	return String();
-}
-
 String cwd() {
 #ifdef WINDOWS_ENABLED
-	const DWORD expected_size = ::GetCurrentDirectoryW(0, NULL);
+	const DWORD expected_size = ::GetCurrentDirectoryW(0, nullptr);
 
-	String buffer;
+	Char16String buffer;
 	buffer.resize((int)expected_size);
-	if (::GetCurrentDirectoryW(expected_size, buffer.ptrw()) == 0)
+	if (::GetCurrentDirectoryW(expected_size, (wchar_t *)buffer.ptrw()) == 0)
 		return ".";
 
-	return buffer.simplify_path();
+	String result;
+	if (result.parse_utf16(buffer.ptr())) {
+		return ".";
+	}
+	return result.simplify_path();
 #else
 	char buffer[PATH_MAX];
-	if (::getcwd(buffer, sizeof(buffer)) == NULL)
+	if (::getcwd(buffer, sizeof(buffer)) == nullptr) {
 		return ".";
+	}
 
 	String result;
-	if (result.parse_utf8(buffer))
+	if (result.parse_utf8(buffer)) {
 		return ".";
+	}
 
 	return result.simplify_path();
 #endif
@@ -112,48 +90,57 @@ String abspath(const String &p_path) {
 String realpath(const String &p_path) {
 #ifdef WINDOWS_ENABLED
 	// Open file without read/write access
-	HANDLE hFile = ::CreateFileW(p_path.c_str(), 0,
+	HANDLE hFile = ::CreateFileW((LPCWSTR)(p_path.utf16().get_data()), 0,
 			FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
-			NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+			nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
 
 	if (hFile == INVALID_HANDLE_VALUE)
 		return p_path;
 
-	const DWORD expected_size = ::GetFinalPathNameByHandleW(hFile, NULL, 0, FILE_NAME_NORMALIZED);
+	const DWORD expected_size = ::GetFinalPathNameByHandleW(hFile, nullptr, 0, FILE_NAME_NORMALIZED);
 
 	if (expected_size == 0) {
 		::CloseHandle(hFile);
 		return p_path;
 	}
 
-	String buffer;
+	Char16String buffer;
 	buffer.resize((int)expected_size);
-	::GetFinalPathNameByHandleW(hFile, buffer.ptrw(), expected_size, FILE_NAME_NORMALIZED);
+	::GetFinalPathNameByHandleW(hFile, (wchar_t *)buffer.ptrw(), expected_size, FILE_NAME_NORMALIZED);
 
 	::CloseHandle(hFile);
-	return buffer.simplify_path();
+
+	String result;
+	if (result.parse_utf16(buffer.ptr())) {
+		return p_path;
+	}
+
+	return result.simplify_path();
 #elif UNIX_ENABLED
-	char *resolved_path = ::realpath(p_path.utf8().get_data(), NULL);
+	char *resolved_path = ::realpath(p_path.utf8().get_data(), nullptr);
 
-	if (!resolved_path)
+	if (!resolved_path) {
 		return p_path;
+	}
 
 	String result;
 	bool parse_ok = result.parse_utf8(resolved_path);
 	::free(resolved_path);
 
-	if (parse_ok)
+	if (parse_ok) {
 		return p_path;
+	}
 
 	return result.simplify_path();
 #endif
 }
 
 String join(const String &p_a, const String &p_b) {
-	if (p_a.empty())
+	if (p_a.empty()) {
 		return p_b;
+	}
 
-	const CharType a_last = p_a[p_a.length() - 1];
+	const char32_t a_last = p_a[p_a.length() - 1];
 	if ((a_last == '/' || a_last == '\\') ||
 			(p_b.size() > 0 && (p_b[0] == '/' || p_b[0] == '\\'))) {
 		return p_a + p_b;
@@ -178,8 +165,9 @@ String relative_to_impl(const String &p_path, const String &p_relative_to) {
 	} else {
 		String base_dir = p_relative_to.get_base_dir();
 
-		if (base_dir.length() <= 2 && (base_dir.empty() || base_dir.ends_with(":")))
+		if (base_dir.length() <= 2 && (base_dir.empty() || base_dir.ends_with(":"))) {
 			return p_path;
+		}
 
 		return String("..").plus_file(relative_to_impl(p_path, base_dir));
 	}
diff --git a/modules/mono/utils/path_utils.h b/modules/mono/utils/path_utils.h
index 9965f58b0a..bcd8af8bb9 100644
--- a/modules/mono/utils/path_utils.h
+++ b/modules/mono/utils/path_utils.h
@@ -40,8 +40,6 @@ String join(const String &p_a, const String &p_b);
 String join(const String &p_a, const String &p_b, const String &p_c);
 String join(const String &p_a, const String &p_b, const String &p_c, const String &p_d);
 
-String find_executable(const String &p_name);
-
 /// Returns a normalized absolute path to the current working directory
 String cwd();
 
diff --git a/modules/mono/utils/string_utils.cpp b/modules/mono/utils/string_utils.cpp
index 911ac5c4a3..65da4328f6 100644
--- a/modules/mono/utils/string_utils.cpp
+++ b/modules/mono/utils/string_utils.cpp
@@ -38,16 +38,18 @@
 namespace {
 
 int sfind(const String &p_text, int p_from) {
-	if (p_from < 0)
+	if (p_from < 0) {
 		return -1;
+	}
 
 	int src_len = 2;
 	int len = p_text.length();
 
-	if (len == 0)
+	if (len == 0) {
 		return -1;
+	}
 
-	const CharType *src = p_text.c_str();
+	const char32_t *src = p_text.get_data();
 
 	for (int i = p_from; i <= (len - src_len); i++) {
 		bool found = true;
@@ -62,7 +64,7 @@ int sfind(const String &p_text, int p_from) {
 					found = src[read_pos] == '%';
 					break;
 				case 1: {
-					CharType c = src[read_pos];
+					char32_t c = src[read_pos];
 					found = src[read_pos] == 's' || (c >= '0' && c <= '4');
 					break;
 				}
@@ -75,17 +77,20 @@ int sfind(const String &p_text, int p_from) {
 			}
 		}
 
-		if (found)
+		if (found) {
 			return i;
+		}
 	}
 
 	return -1;
 }
+
 } // namespace
 
 String sformat(const String &p_text, const Variant &p1, const Variant &p2, const Variant &p3, const Variant &p4, const Variant &p5) {
-	if (p_text.length() < 2)
+	if (p_text.length() < 2) {
 		return p_text;
+	}
 
 	Array args;
 
@@ -116,7 +121,7 @@ String sformat(const String &p_text, const Variant &p1, const Variant &p2, const
 	int result = 0;
 
 	while ((result = sfind(p_text, search_from)) >= 0) {
-		CharType c = p_text[result + 1];
+		char32_t c = p_text[result + 1];
 
 		int req_index = (c == 's' ? findex++ : c - '0');
 
@@ -132,7 +137,6 @@ String sformat(const String &p_text, const Variant &p1, const Variant &p2, const
 
 #ifdef TOOLS_ENABLED
 bool is_csharp_keyword(const String &p_name) {
-
 	// Reserved keywords
 
 	return p_name == "abstract" || p_name == "as" || p_name == "base" || p_name == "bool" ||
@@ -162,22 +166,22 @@ String escape_csharp_keyword(const String &p_name) {
 #endif
 
 Error read_all_file_utf8(const String &p_path, String &r_content) {
-	PoolVector<uint8_t> sourcef;
+	Vector<uint8_t> sourcef;
 	Error err;
 	FileAccess *f = FileAccess::open(p_path, FileAccess::READ, &err);
 	ERR_FAIL_COND_V_MSG(err != OK, err, "Cannot open file '" + p_path + "'.");
 
 	int len = f->get_len();
 	sourcef.resize(len + 1);
-	PoolVector<uint8_t>::Write w = sourcef.write();
-	int r = f->get_buffer(w.ptr(), len);
+	uint8_t *w = sourcef.ptrw();
+	int r = f->get_buffer(w, len);
 	f->close();
 	memdelete(f);
 	ERR_FAIL_COND_V(r != len, ERR_CANT_OPEN);
 	w[len] = 0;
 
 	String source;
-	if (source.parse_utf8((const char *)w.ptr())) {
+	if (source.parse_utf8((const char *)w)) {
 		ERR_FAIL_V(ERR_INVALID_DATA);
 	}
 
@@ -196,23 +200,13 @@ String str_format(const char *p_format, ...) {
 
 	return res;
 }
-// va_copy was defined in the C99, but not in C++ standards before C++11.
-// When you compile C++ without --std=c++<XX> option, compilers still define
-// va_copy, otherwise you have to use the internal version (__va_copy).
-#if !defined(va_copy)
-#if defined(__GNUC__)
-#define va_copy(d, s) __va_copy((d), (s))
-#else
-#define va_copy(d, s) ((d) = (s))
-#endif
-#endif
 
 #if defined(MINGW_ENABLED) || defined(_MSC_VER) && _MSC_VER < 1900
 #define gd_vsnprintf(m_buffer, m_count, m_format, m_args_copy) vsnprintf_s(m_buffer, m_count, _TRUNCATE, m_format, m_args_copy)
 #define gd_vscprintf(m_format, m_args_copy) _vscprintf(m_format, m_args_copy)
 #else
 #define gd_vsnprintf(m_buffer, m_count, m_format, m_args_copy) vsnprintf(m_buffer, m_count, m_format, m_args_copy)
-#define gd_vscprintf(m_format, m_args_copy) vsnprintf(NULL, 0, p_format, m_args_copy)
+#define gd_vscprintf(m_format, m_args_copy) vsnprintf(nullptr, 0, p_format, m_args_copy)
 #endif
 
 String str_format(const char *p_format, va_list p_list) {
diff --git a/modules/mono/utils/thread_local.h b/modules/mono/utils/thread_local.h
deleted file mode 100644
index b1cc2e37ea..0000000000
--- a/modules/mono/utils/thread_local.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/*************************************************************************/
-/*  thread_local.h                                                       */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
-/*                                                                       */
-/* Permission is hereby granted, free of charge, to any person obtaining */
-/* a copy of this software and associated documentation files (the       */
-/* "Software"), to deal in the Software without restriction, including   */
-/* without limitation the rights to use, copy, modify, merge, publish,   */
-/* distribute, sublicense, and/or sell copies of the Software, and to    */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions:                                             */
-/*                                                                       */
-/* The above copyright notice and this permission notice shall be        */
-/* included in all copies or substantial portions of the Software.       */
-/*                                                                       */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
-/*************************************************************************/
-
-#ifndef THREAD_LOCAL_H
-#define THREAD_LOCAL_H
-
-#ifdef HAVE_CXX11_THREAD_LOCAL
-#define _THREAD_LOCAL_(m_t) thread_local m_t
-#else
-
-#if !defined(__GNUC__) && !defined(_MSC_VER)
-#error Platform or compiler not supported
-#endif
-
-#if defined(__GNUC__)
-
-#ifdef HAVE_GCC___THREAD
-#define _THREAD_LOCAL_(m_t) __thread m_t
-#else
-#define USE_CUSTOM_THREAD_LOCAL
-#endif
-
-#elif defined(_MSC_VER)
-
-#ifdef HAVE_DECLSPEC_THREAD
-#define _THREAD_LOCAL_(m_t) __declspec(thread) m_t
-#else
-#define USE_CUSTOM_THREAD_LOCAL
-#endif
-
-#endif // __GNUC__ _MSC_VER
-
-#endif // HAVE_CXX11_THREAD_LOCAL
-
-#ifdef USE_CUSTOM_THREAD_LOCAL
-#define _THREAD_LOCAL_(m_t) ThreadLocal<m_t>
-#endif
-
-#include "core/typedefs.h"
-
-#ifdef WINDOWS_ENABLED
-#define _CALLBACK_FUNC_ __stdcall
-#else
-#define _CALLBACK_FUNC_
-#endif
-
-struct ThreadLocalStorage {
-
-	void *get_value() const;
-	void set_value(void *p_value) const;
-
-	void alloc(void(_CALLBACK_FUNC_ *p_destr_callback)(void *));
-	void free();
-
-private:
-	struct Impl;
-	Impl *pimpl;
-};
-
-template <typename T>
-class ThreadLocal {
-
-	ThreadLocalStorage storage;
-
-	T init_val;
-
-	static void _CALLBACK_FUNC_ destr_callback(void *tls_data) {
-		memdelete(static_cast<T *>(tls_data));
-	}
-
-	T *_tls_get_value() const {
-		void *tls_data = storage.get_value();
-
-		if (tls_data)
-			return static_cast<T *>(tls_data);
-
-		T *data = memnew(T(init_val));
-
-		storage.set_value(data);
-
-		return data;
-	}
-
-	void _initialize(const T &p_init_val) {
-		init_val = p_init_val;
-		storage.alloc(&destr_callback);
-	}
-
-public:
-	ThreadLocal() {
-		_initialize(T());
-	}
-
-	ThreadLocal(const T &p_init_val) {
-		_initialize(p_init_val);
-	}
-
-	ThreadLocal(const ThreadLocal &other) {
-		_initialize(*other._tls_get_value());
-	}
-
-	~ThreadLocal() {
-		storage.free();
-	}
-
-	_FORCE_INLINE_ T *operator&() const {
-		return _tls_get_value();
-	}
-
-	_FORCE_INLINE_ operator T &() const {
-		return *_tls_get_value();
-	}
-
-	_FORCE_INLINE_ ThreadLocal &operator=(const T &val) {
-		T *ptr = _tls_get_value();
-		*ptr = val;
-		return *this;
-	}
-};
-
-struct FlagScopeGuard {
-
-	FlagScopeGuard(bool &p_flag) :
-			flag(p_flag) {
-		flag = !flag;
-	}
-
-	~FlagScopeGuard() {
-		flag = !flag;
-	}
-
-private:
-	bool &flag;
-};
-
-#undef _CALLBACK_FUNC_
-
-#define _TLS_RECURSION_GUARD_V_(m_ret)                    \
-	static _THREAD_LOCAL_(bool) _recursion_flag_ = false; \
-	if (_recursion_flag_)                                 \
-		return m_ret;                                     \
-	FlagScopeGuard _recursion_guard_(_recursion_flag_);
-
-#define _TLS_RECURSION_GUARD_                             \
-	static _THREAD_LOCAL_(bool) _recursion_flag_ = false; \
-	if (_recursion_flag_)                                 \
-		return;                                           \
-	FlagScopeGuard _recursion_guard_(_recursion_flag_);
-
-#endif // THREAD_LOCAL_H
diff --git a/modules/ogg/SCsub b/modules/ogg/SCsub
index 6a72a519fe..e768fb4ae8 100644
--- a/modules/ogg/SCsub
+++ b/modules/ogg/SCsub
@@ -1,12 +1,15 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
+
+# Only kept to build the thirdparty library used by the theora and webm
+# modules.
 
 env_ogg = env_modules.Clone()
 
 # Thirdparty source files
-if env['builtin_libogg']:
+if env["builtin_libogg"]:
     thirdparty_dir = "#thirdparty/libogg/"
     thirdparty_sources = [
         "bitwise.c",
diff --git a/modules/ogg/config.py b/modules/ogg/config.py
index 1c8cd12a2d..d22f9454ed 100644
--- a/modules/ogg/config.py
+++ b/modules/ogg/config.py
@@ -1,5 +1,6 @@
 def can_build(env, platform):
     return True
 
+
 def configure(env):
     pass
diff --git a/modules/ogg/register_types.h b/modules/ogg/register_types.h
index 09095c9b62..849d27bb06 100644
--- a/modules/ogg/register_types.h
+++ b/modules/ogg/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef OGG_REGISTER_TYPES_H
+#define OGG_REGISTER_TYPES_H
+
 void register_ogg_types();
 void unregister_ogg_types();
+
+#endif // OGG_REGISTER_TYPES_H
diff --git a/modules/opensimplex/SCsub b/modules/opensimplex/SCsub
index 311d33b047..52d8b145ef 100644
--- a/modules/opensimplex/SCsub
+++ b/modules/opensimplex/SCsub
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_opensimplex = env_modules.Clone()
 
diff --git a/modules/opensimplex/config.py b/modules/opensimplex/config.py
index c1010ad433..90b85dbd70 100644
--- a/modules/opensimplex/config.py
+++ b/modules/opensimplex/config.py
@@ -1,14 +1,17 @@
 def can_build(env, platform):
-	  return True
+    return True
+
 
 def configure(env):
-	pass
+    pass
+
 
 def get_doc_classes():
     return [
         "NoiseTexture",
-        "OpenSimplexNoise"
+        "OpenSimplexNoise",
     ]
 
+
 def get_doc_path():
     return "doc_classes"
diff --git a/modules/opensimplex/doc_classes/NoiseTexture.xml b/modules/opensimplex/doc_classes/NoiseTexture.xml
index 0790cde557..c06f3096de 100644
--- a/modules/opensimplex/doc_classes/NoiseTexture.xml
+++ b/modules/opensimplex/doc_classes/NoiseTexture.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="NoiseTexture" inherits="Texture" version="4.0">
+<class name="NoiseTexture" inherits="Texture2D" version="4.0">
 	<brief_description>
 		[OpenSimplexNoise] filled texture.
 	</brief_description>
 	<description>
 		Uses an [OpenSimplexNoise] to fill the texture data. You can specify the texture size but keep in mind that larger textures will take longer to generate and seamless noise only works with square sized textures.
 		NoiseTexture can also generate normalmap textures.
-		The class uses [Thread]s to generate the texture data internally, so [method Texture.get_data] may return [code]null[/code] if the generation process has not completed yet. In that case, you need to wait for the texture to be generated before accessing the data:
+		The class uses [Thread]s to generate the texture data internally, so [method Texture2D.get_data] may return [code]null[/code] if the generation process has not completed yet. In that case, you need to wait for the texture to be generated before accessing the data:
 		[codeblock]
 		var texture = preload("res://noise.tres")
 		yield(texture, "changed")
@@ -24,7 +24,6 @@
 		<member name="bump_strength" type="float" setter="set_bump_strength" getter="get_bump_strength" default="8.0">
 			Strength of the bump maps used in this texture. A higher value will make the bump maps appear larger while a lower value will make them appear softer.
 		</member>
-		<member name="flags" type="int" setter="set_flags" getter="get_flags" override="true" default="7" />
 		<member name="height" type="int" setter="set_height" getter="get_height" default="512">
 			Height of the generated texture.
 		</member>
diff --git a/modules/opensimplex/icons/icon_noise_texture.svg b/modules/opensimplex/icons/NoiseTexture.svg
index 5908c2b2d4..5908c2b2d4 100644
--- a/modules/opensimplex/icons/icon_noise_texture.svg
+++ b/modules/opensimplex/icons/NoiseTexture.svg
diff --git a/modules/opensimplex/noise_texture.cpp b/modules/opensimplex/noise_texture.cpp
index aa1c822813..1181e69cd3 100644
--- a/modules/opensimplex/noise_texture.cpp
+++ b/modules/opensimplex/noise_texture.cpp
@@ -34,7 +34,7 @@
 
 NoiseTexture::NoiseTexture() {
 	update_queued = false;
-	noise_thread = NULL;
+	noise_thread = nullptr;
 	regen_queued = false;
 	first_time = true;
 
@@ -42,17 +42,16 @@ NoiseTexture::NoiseTexture() {
 	seamless = false;
 	as_normalmap = false;
 	bump_strength = 8.0;
-	flags = FLAGS_DEFAULT;
 
 	noise = Ref<OpenSimplexNoise>();
 
-	texture = VS::get_singleton()->texture_create();
-
 	_queue_update();
 }
 
 NoiseTexture::~NoiseTexture() {
-	VS::get_singleton()->free(texture);
+	if (texture.is_valid()) {
+		RS::get_singleton()->free(texture);
+	}
 	if (noise_thread) {
 		Thread::wait_to_finish(noise_thread);
 		memdelete(noise_thread);
@@ -60,7 +59,6 @@ NoiseTexture::~NoiseTexture() {
 }
 
 void NoiseTexture::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_width", "width"), &NoiseTexture::set_width);
 	ClassDB::bind_method(D_METHOD("set_height", "height"), &NoiseTexture::set_height);
 
@@ -77,7 +75,6 @@ void NoiseTexture::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_bump_strength"), &NoiseTexture::get_bump_strength);
 
 	ClassDB::bind_method(D_METHOD("_update_texture"), &NoiseTexture::_update_texture);
-	ClassDB::bind_method(D_METHOD("_queue_update"), &NoiseTexture::_queue_update);
 	ClassDB::bind_method(D_METHOD("_generate_texture"), &NoiseTexture::_generate_texture);
 	ClassDB::bind_method(D_METHOD("_thread_done", "image"), &NoiseTexture::_thread_done);
 
@@ -85,12 +82,11 @@ void NoiseTexture::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "height", PROPERTY_HINT_RANGE, "1,2048,1,or_greater"), "set_height", "get_height");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "seamless"), "set_seamless", "get_seamless");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "as_normalmap"), "set_as_normalmap", "is_normalmap");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "bump_strength", PROPERTY_HINT_RANGE, "0,32,0.1,or_greater"), "set_bump_strength", "get_bump_strength");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "bump_strength", PROPERTY_HINT_RANGE, "0,32,0.1,or_greater"), "set_bump_strength", "get_bump_strength");
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "noise", PROPERTY_HINT_RESOURCE_TYPE, "OpenSimplexNoise"), "set_noise", "get_noise");
 }
 
 void NoiseTexture::_validate_property(PropertyInfo &property) const {
-
 	if (property.name == "bump_strength") {
 		if (!as_normalmap) {
 			property.usage = PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL;
@@ -101,18 +97,21 @@ void NoiseTexture::_validate_property(PropertyInfo &property) const {
 void NoiseTexture::_set_texture_data(const Ref<Image> &p_image) {
 	data = p_image;
 	if (data.is_valid()) {
-		VS::get_singleton()->texture_allocate(texture, size.x, size.y, 0, Image::FORMAT_RGBA8, VS::TEXTURE_TYPE_2D, flags);
-		VS::get_singleton()->texture_set_data(texture, p_image);
+		if (texture.is_valid()) {
+			RID new_texture = RS::get_singleton()->texture_2d_create(p_image);
+			RS::get_singleton()->texture_replace(texture, new_texture);
+		} else {
+			texture = RS::get_singleton()->texture_2d_create(p_image);
+		}
 	}
 	emit_changed();
 }
 
 void NoiseTexture::_thread_done(const Ref<Image> &p_image) {
-
 	_set_texture_data(p_image);
 	Thread::wait_to_finish(noise_thread);
 	memdelete(noise_thread);
-	noise_thread = NULL;
+	noise_thread = nullptr;
 	if (regen_queued) {
 		noise_thread = Thread::create(_thread_function, this);
 		regen_queued = false;
@@ -125,24 +124,28 @@ void NoiseTexture::_thread_function(void *p_ud) {
 }
 
 void NoiseTexture::_queue_update() {
-
-	if (update_queued)
+	if (update_queued) {
 		return;
+	}
 
 	update_queued = true;
 	call_deferred("_update_texture");
 }
 
 Ref<Image> NoiseTexture::_generate_texture() {
+	// Prevent memdelete due to unref() on other thread.
+	Ref<OpenSimplexNoise> ref_noise = noise;
 
-	if (noise.is_null()) return Ref<Image>();
+	if (ref_noise.is_null()) {
+		return Ref<Image>();
+	}
 
 	Ref<Image> image;
 
 	if (seamless) {
-		image = noise->get_seamless_image(size.x);
+		image = ref_noise->get_seamless_image(size.x);
 	} else {
-		image = noise->get_image(size.x, size.y);
+		image = ref_noise->get_image(size.x, size.y);
 	}
 
 	if (as_normalmap) {
@@ -162,7 +165,6 @@ void NoiseTexture::_update_texture() {
 	use_thread = false;
 #endif
 	if (use_thread) {
-
 		if (!noise_thread) {
 			noise_thread = Thread::create(_thread_function, this);
 			regen_queued = false;
@@ -178,14 +180,15 @@ void NoiseTexture::_update_texture() {
 }
 
 void NoiseTexture::set_noise(Ref<OpenSimplexNoise> p_noise) {
-	if (p_noise == noise)
+	if (p_noise == noise) {
 		return;
+	}
 	if (noise.is_valid()) {
-		noise->disconnect(CoreStringNames::get_singleton()->changed, this, "_queue_update");
+		noise->disconnect(CoreStringNames::get_singleton()->changed, callable_mp(this, &NoiseTexture::_queue_update));
 	}
 	noise = p_noise;
 	if (noise.is_valid()) {
-		noise->connect(CoreStringNames::get_singleton()->changed, this, "_queue_update");
+		noise->connect(CoreStringNames::get_singleton()->changed, callable_mp(this, &NoiseTexture::_queue_update));
 	}
 	_queue_update();
 }
@@ -195,19 +198,25 @@ Ref<OpenSimplexNoise> NoiseTexture::get_noise() {
 }
 
 void NoiseTexture::set_width(int p_width) {
-	if (p_width == size.x) return;
+	if (p_width == size.x) {
+		return;
+	}
 	size.x = p_width;
 	_queue_update();
 }
 
 void NoiseTexture::set_height(int p_height) {
-	if (p_height == size.y) return;
+	if (p_height == size.y) {
+		return;
+	}
 	size.y = p_height;
 	_queue_update();
 }
 
 void NoiseTexture::set_seamless(bool p_seamless) {
-	if (p_seamless == seamless) return;
+	if (p_seamless == seamless) {
+		return;
+	}
 	seamless = p_seamless;
 	_queue_update();
 }
@@ -217,7 +226,9 @@ bool NoiseTexture::get_seamless() {
 }
 
 void NoiseTexture::set_as_normalmap(bool p_as_normalmap) {
-	if (p_as_normalmap == as_normalmap) return;
+	if (p_as_normalmap == as_normalmap) {
+		return;
+	}
 	as_normalmap = p_as_normalmap;
 	_queue_update();
 	_change_notify();
@@ -228,38 +239,35 @@ bool NoiseTexture::is_normalmap() {
 }
 
 void NoiseTexture::set_bump_strength(float p_bump_strength) {
-
-	if (p_bump_strength == bump_strength) return;
+	if (p_bump_strength == bump_strength) {
+		return;
+	}
 	bump_strength = p_bump_strength;
-	if (as_normalmap)
+	if (as_normalmap) {
 		_queue_update();
+	}
 }
 
 float NoiseTexture::get_bump_strength() {
-
 	return bump_strength;
 }
 
 int NoiseTexture::get_width() const {
-
 	return size.x;
 }
 
 int NoiseTexture::get_height() const {
-
 	return size.y;
 }
 
-void NoiseTexture::set_flags(uint32_t p_flags) {
-	flags = p_flags;
-	VS::get_singleton()->texture_set_flags(texture, flags);
-}
+RID NoiseTexture::get_rid() const {
+	if (!texture.is_valid()) {
+		texture = RS::get_singleton()->texture_2d_placeholder_create();
+	}
 
-uint32_t NoiseTexture::get_flags() const {
-	return flags;
+	return texture;
 }
 
 Ref<Image> NoiseTexture::get_data() const {
-
 	return data;
 }
diff --git a/modules/opensimplex/noise_texture.h b/modules/opensimplex/noise_texture.h
index 285fd1eba9..7357e54e35 100644
--- a/modules/opensimplex/noise_texture.h
+++ b/modules/opensimplex/noise_texture.h
@@ -39,8 +39,8 @@
 #include "editor/editor_plugin.h"
 #include "editor/property_editor.h"
 
-class NoiseTexture : public Texture {
-	GDCLASS(NoiseTexture, Texture);
+class NoiseTexture : public Texture2D {
+	GDCLASS(NoiseTexture, Texture2D);
 
 private:
 	Ref<Image> data;
@@ -51,7 +51,7 @@ private:
 	bool update_queued;
 	bool regen_queued;
 
-	RID texture;
+	mutable RID texture;
 	uint32_t flags;
 
 	Ref<OpenSimplexNoise> noise;
@@ -70,7 +70,7 @@ private:
 
 protected:
 	static void _bind_methods();
-	virtual void _validate_property(PropertyInfo &property) const;
+	virtual void _validate_property(PropertyInfo &property) const override;
 
 public:
 	void set_noise(Ref<OpenSimplexNoise> p_noise);
@@ -88,16 +88,13 @@ public:
 	void set_bump_strength(float p_bump_strength);
 	float get_bump_strength();
 
-	int get_width() const;
-	int get_height() const;
+	int get_width() const override;
+	int get_height() const override;
 
-	virtual void set_flags(uint32_t p_flags);
-	virtual uint32_t get_flags() const;
+	virtual RID get_rid() const override;
+	virtual bool has_alpha() const override { return false; }
 
-	virtual RID get_rid() const { return texture; }
-	virtual bool has_alpha() const { return false; }
-
-	virtual Ref<Image> get_data() const;
+	virtual Ref<Image> get_data() const override;
 
 	NoiseTexture();
 	virtual ~NoiseTexture();
diff --git a/modules/opensimplex/open_simplex_noise.cpp b/modules/opensimplex/open_simplex_noise.cpp
index bd187e6b5b..b08219d258 100644
--- a/modules/opensimplex/open_simplex_noise.cpp
+++ b/modules/opensimplex/open_simplex_noise.cpp
@@ -33,7 +33,6 @@
 #include "core/core_string_names.h"
 
 OpenSimplexNoise::OpenSimplexNoise() {
-
 	seed = 0;
 	persistence = 0.5;
 	octaves = 3;
@@ -53,9 +52,9 @@ void OpenSimplexNoise::_init_seeds() {
 }
 
 void OpenSimplexNoise::set_seed(int p_seed) {
-
-	if (seed == p_seed)
+	if (seed == p_seed) {
 		return;
+	}
 
 	seed = p_seed;
 
@@ -65,12 +64,13 @@ void OpenSimplexNoise::set_seed(int p_seed) {
 }
 
 int OpenSimplexNoise::get_seed() {
-
 	return seed;
 }
 
 void OpenSimplexNoise::set_octaves(int p_octaves) {
-	if (p_octaves == octaves) return;
+	if (p_octaves == octaves) {
+		return;
+	}
 
 	ERR_FAIL_COND_MSG(p_octaves > MAX_OCTAVES, vformat("The number of OpenSimplexNoise octaves is limited to %d; ignoring the new value.", MAX_OCTAVES));
 
@@ -79,33 +79,38 @@ void OpenSimplexNoise::set_octaves(int p_octaves) {
 }
 
 void OpenSimplexNoise::set_period(float p_period) {
-	if (p_period == period) return;
+	if (p_period == period) {
+		return;
+	}
 	period = p_period;
 	emit_changed();
 }
 
 void OpenSimplexNoise::set_persistence(float p_persistence) {
-	if (p_persistence == persistence) return;
+	if (p_persistence == persistence) {
+		return;
+	}
 	persistence = p_persistence;
 	emit_changed();
 }
 
 void OpenSimplexNoise::set_lacunarity(float p_lacunarity) {
-	if (p_lacunarity == lacunarity) return;
+	if (p_lacunarity == lacunarity) {
+		return;
+	}
 	lacunarity = p_lacunarity;
 	emit_changed();
 }
 
 Ref<Image> OpenSimplexNoise::get_image(int p_width, int p_height) {
-
-	PoolVector<uint8_t> data;
+	Vector<uint8_t> data;
 	data.resize(p_width * p_height * 4);
 
-	PoolVector<uint8_t>::Write wd8 = data.write();
+	uint8_t *wd8 = data.ptrw();
 
 	for (int i = 0; i < p_height; i++) {
 		for (int j = 0; j < p_width; j++) {
-			float v = get_noise_2d(i, j);
+			float v = get_noise_2d(j, i);
 			v = v * 0.5 + 0.5; // Normalize [0..1]
 			uint8_t value = uint8_t(CLAMP(v * 255.0, 0, 255));
 			wd8[(i * p_width + j) * 4 + 0] = value;
@@ -120,15 +125,13 @@ Ref<Image> OpenSimplexNoise::get_image(int p_width, int p_height) {
 }
 
 Ref<Image> OpenSimplexNoise::get_seamless_image(int p_size) {
-
-	PoolVector<uint8_t> data;
+	Vector<uint8_t> data;
 	data.resize(p_size * p_size * 4);
 
-	PoolVector<uint8_t>::Write wd8 = data.write();
+	uint8_t *wd8 = data.ptrw();
 
 	for (int i = 0; i < p_size; i++) {
 		for (int j = 0; j < p_size; j++) {
-
 			float ii = (float)i / (float)p_size;
 			float jj = (float)j / (float)p_size;
 
@@ -157,7 +160,6 @@ Ref<Image> OpenSimplexNoise::get_seamless_image(int p_size) {
 }
 
 void OpenSimplexNoise::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("get_seed"), &OpenSimplexNoise::get_seed);
 	ClassDB::bind_method(D_METHOD("set_seed", "seed"), &OpenSimplexNoise::set_seed);
 
@@ -186,18 +188,16 @@ void OpenSimplexNoise::_bind_methods() {
 
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "seed"), "set_seed", "get_seed");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "octaves", PROPERTY_HINT_RANGE, vformat("1,%d,1", MAX_OCTAVES)), "set_octaves", "get_octaves");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "period", PROPERTY_HINT_RANGE, "0.1,256.0,0.1"), "set_period", "get_period");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "persistence", PROPERTY_HINT_RANGE, "0.0,1.0,0.001"), "set_persistence", "get_persistence");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "lacunarity", PROPERTY_HINT_RANGE, "0.1,4.0,0.01"), "set_lacunarity", "get_lacunarity");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "period", PROPERTY_HINT_RANGE, "0.1,256.0,0.1"), "set_period", "get_period");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "persistence", PROPERTY_HINT_RANGE, "0.0,1.0,0.001"), "set_persistence", "get_persistence");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "lacunarity", PROPERTY_HINT_RANGE, "0.1,4.0,0.01"), "set_lacunarity", "get_lacunarity");
 }
 
 float OpenSimplexNoise::get_noise_1d(float x) {
-
 	return get_noise_2d(x, 1.0);
 }
 
 float OpenSimplexNoise::get_noise_2d(float x, float y) {
-
 	x /= period;
 	y /= period;
 
@@ -218,7 +218,6 @@ float OpenSimplexNoise::get_noise_2d(float x, float y) {
 }
 
 float OpenSimplexNoise::get_noise_3d(float x, float y, float z) {
-
 	x /= period;
 	y /= period;
 	z /= period;
@@ -241,7 +240,6 @@ float OpenSimplexNoise::get_noise_3d(float x, float y, float z) {
 }
 
 float OpenSimplexNoise::get_noise_4d(float x, float y, float z, float w) {
-
 	x /= period;
 	y /= period;
 	z /= period;
diff --git a/modules/opensimplex/register_types.cpp b/modules/opensimplex/register_types.cpp
index 6fae1fe415..fef90cdce3 100644
--- a/modules/opensimplex/register_types.cpp
+++ b/modules/opensimplex/register_types.cpp
@@ -33,7 +33,6 @@
 #include "open_simplex_noise.h"
 
 void register_opensimplex_types() {
-
 	ClassDB::register_class<OpenSimplexNoise>();
 	ClassDB::register_class<NoiseTexture>();
 }
diff --git a/modules/opensimplex/register_types.h b/modules/opensimplex/register_types.h
index 56e128f09e..51c6815eae 100644
--- a/modules/opensimplex/register_types.h
+++ b/modules/opensimplex/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef OPENSIMPLEX_REGISTER_TYPES_H
+#define OPENSIMPLEX_REGISTER_TYPES_H
+
 void register_opensimplex_types();
 void unregister_opensimplex_types();
+
+#endif // OPENSIMPLEX_REGISTER_TYPES_H
diff --git a/modules/opus/SCsub b/modules/opus/SCsub
index 1db5b0987e..52c61fa708 100644
--- a/modules/opus/SCsub
+++ b/modules/opus/SCsub
@@ -1,18 +1,19 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
-stub = True
+# Only kept to build the thirdparty library used by the webm module.
+# AudioStreamOpus was dropped in 3.0 due to incompatibility with the new audio
+# engine. If you want to port it, fetch it from the Git history.
 
 env_opus = env_modules.Clone()
 
 # Thirdparty source files
-if env['builtin_opus']:
+if env["builtin_opus"]:
     thirdparty_dir = "#thirdparty/opus/"
 
     thirdparty_sources = [
-
         # Sync with opus_sources.mk
         "opus.c",
         "opus_decoder.c",
@@ -21,17 +22,14 @@ if env['builtin_opus']:
         "opus_multistream_encoder.c",
         "opus_multistream_decoder.c",
         "repacketizer.c",
-
         "analysis.c",
         "mlp.c",
         "mlp_data.c",
-
         # Sync with libopusfile Makefile.am
         "info.c",
         "internal.c",
         "opusfile.c",
         "stream.c",
-
         # Sync with celt_sources.mk
         "celt/bands.c",
         "celt/celt.c",
@@ -51,12 +49,11 @@ if env['builtin_opus']:
         "celt/quant_bands.c",
         "celt/rate.c",
         "celt/vq.c",
-        #"celt/arm/arm_celt_map.c",
-        #"celt/arm/armcpu.c",
-        #"celt/arm/celt_ne10_fft.c",
-        #"celt/arm/celt_ne10_mdct.c",
-        #"celt/arm/celt_neon_intr.c",
-
+        # "celt/arm/arm_celt_map.c",
+        # "celt/arm/armcpu.c",
+        # "celt/arm/celt_ne10_fft.c",
+        # "celt/arm/celt_ne10_mdct.c",
+        # "celt/arm/celt_neon_intr.c",
         # Sync with silk_sources.mk
         "silk/CNG.c",
         "silk/code_signs.c",
@@ -205,7 +202,7 @@ if env['builtin_opus']:
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources + opus_sources_silk]
 
     # also requires libogg
-    if env['builtin_libogg']:
+    if env["builtin_libogg"]:
         env_opus.Prepend(CPPPATH=["#thirdparty/libogg"])
 
     env_opus.Append(CPPDEFINES=["HAVE_CONFIG_H"])
@@ -221,23 +218,22 @@ if env['builtin_opus']:
     env_opus.Prepend(CPPPATH=[thirdparty_dir + "/" + dir for dir in thirdparty_include_paths])
 
     if env["platform"] == "android":
-        if ("android_arch" in env and env["android_arch"] == "armv7"):
+        if "android_arch" in env and env["android_arch"] == "armv7":
             env_opus.Append(CPPDEFINES=["OPUS_ARM_OPT"])
-        elif ("android_arch" in env and env["android_arch"] == "arm64v8"):
+        elif "android_arch" in env and env["android_arch"] == "arm64v8":
             env_opus.Append(CPPDEFINES=["OPUS_ARM64_OPT"])
     elif env["platform"] == "iphone":
-        if ("arch" in env and env["arch"] == "arm"):
+        if "arch" in env and env["arch"] == "arm":
             env_opus.Append(CPPDEFINES=["OPUS_ARM_OPT"])
-        elif ("arch" in env and env["arch"] == "arm64"):
+        elif "arch" in env and env["arch"] == "arm64":
+            env_opus.Append(CPPDEFINES=["OPUS_ARM64_OPT"])
+    elif env["platform"] == "osx":
+        if "arch" in env and env["arch"] == "arm64":
             env_opus.Append(CPPDEFINES=["OPUS_ARM64_OPT"])
 
     env_thirdparty = env_opus.Clone()
     env_thirdparty.disable_warnings()
     env_thirdparty.add_source_files(env.modules_sources, thirdparty_sources)
 
-if not stub:
-    # Module files
-    env_opus.add_source_files(env.modules_sources, "*.cpp")
-else:
-    # Module files
-    env_opus.add_source_files(env.modules_sources, "stub/register_types.cpp")
+# Module files
+env_opus.add_source_files(env.modules_sources, "register_types.cpp")
diff --git a/modules/opus/audio_stream_opus.cpp b/modules/opus/audio_stream_opus.cpp
deleted file mode 100644
index 67a07628d9..0000000000
--- a/modules/opus/audio_stream_opus.cpp
+++ /dev/null
@@ -1,379 +0,0 @@
-/*************************************************************************/
-/*  audio_stream_opus.cpp                                                */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
-/*                                                                       */
-/* Permission is hereby granted, free of charge, to any person obtaining */
-/* a copy of this software and associated documentation files (the       */
-/* "Software"), to deal in the Software without restriction, including   */
-/* without limitation the rights to use, copy, modify, merge, publish,   */
-/* distribute, sublicense, and/or sell copies of the Software, and to    */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions:                                             */
-/*                                                                       */
-/* The above copyright notice and this permission notice shall be        */
-/* included in all copies or substantial portions of the Software.       */
-/*                                                                       */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
-/*************************************************************************/
-
-#include "audio_stream_opus.h"
-
-/**
-	@author George Marques <george@gmarqu.es>
-*/
-
-const float AudioStreamPlaybackOpus::osrate = 48000.0f;
-
-int AudioStreamPlaybackOpus::_op_read_func(void *_stream, unsigned char *_ptr, int _nbytes) {
-	FileAccess *fa = (FileAccess *)_stream;
-
-	if (fa->eof_reached())
-		return 0;
-
-	uint8_t *dst = (uint8_t *)_ptr;
-
-	int read = fa->get_buffer(dst, _nbytes);
-
-	return read;
-}
-
-int AudioStreamPlaybackOpus::_op_seek_func(void *_stream, opus_int64 _offset, int _whence) {
-
-#ifdef SEEK_SET
-	FileAccess *fa = (FileAccess *)_stream;
-
-	switch (_whence) {
-		case SEEK_SET: {
-			fa->seek(_offset);
-		} break;
-		case SEEK_CUR: {
-			fa->seek(fa->get_position() + _offset);
-		} break;
-		case SEEK_END: {
-			fa->seek_end(_offset);
-		} break;
-		default: {
-			ERR_PRINT("Opus seek function failure: Unexpected value in _whence\n");
-		}
-	}
-	int ret = fa->eof_reached() ? -1 : 0;
-	return ret;
-#else
-	return -1; // no seeking
-#endif
-}
-
-int AudioStreamPlaybackOpus::_op_close_func(void *_stream) {
-	if (!_stream)
-		return 0;
-	FileAccess *fa = (FileAccess *)_stream;
-	if (fa->is_open())
-		fa->close();
-	return 0;
-}
-
-opus_int64 AudioStreamPlaybackOpus::_op_tell_func(void *_stream) {
-	FileAccess *_fa = (FileAccess *)_stream;
-	return (opus_int64)_fa->get_position();
-}
-
-void AudioStreamPlaybackOpus::_clear_stream() {
-	if (!stream_loaded)
-		return;
-
-	op_free(opus_file);
-	_close_file();
-
-	stream_loaded = false;
-	stream_channels = 1;
-	playing = false;
-}
-
-void AudioStreamPlaybackOpus::_close_file() {
-	if (f) {
-		memdelete(f);
-		f = NULL;
-	}
-}
-
-Error AudioStreamPlaybackOpus::_load_stream() {
-
-	ERR_FAIL_COND_V(!stream_valid, ERR_UNCONFIGURED);
-
-	_clear_stream();
-	if (file == "")
-		return ERR_INVALID_DATA;
-
-	Error err;
-	f = FileAccess::open(file, FileAccess::READ, &err);
-
-	ERR_FAIL_COND_V_MSG(err, err, "Cannot open file '" + file + "'.");
-
-	int _err = 0;
-
-	opus_file = op_open_callbacks(f, &_op_callbacks, NULL, 0, &_err);
-
-	switch (_err) {
-		case OP_EREAD: { // - Can't read the file.
-			memdelete(f);
-			f = NULL;
-			ERR_FAIL_V(ERR_FILE_CANT_READ);
-		} break;
-		case OP_EVERSION: // - Unrecognized version number.
-		case OP_ENOTFORMAT: // - Stream is not Opus data.
-		case OP_EIMPL: { // - Stream used non-implemented feature.
-			memdelete(f);
-			f = NULL;
-			ERR_FAIL_V(ERR_FILE_UNRECOGNIZED);
-		} break;
-		case OP_EBADLINK: // - Failed to find old data after seeking.
-		case OP_EBADTIMESTAMP: // - Timestamp failed the validity checks.
-		case OP_EBADHEADER: { // - Invalid or missing Opus bitstream header.
-			memdelete(f);
-			f = NULL;
-			ERR_FAIL_V(ERR_FILE_CORRUPT);
-		} break;
-		case OP_EFAULT: { // - Internal logic fault; indicates a bug or heap/stack corruption.
-			memdelete(f);
-			f = NULL;
-			ERR_FAIL_V(ERR_BUG);
-		} break;
-	}
-	repeats = 0;
-	stream_loaded = true;
-
-	return OK;
-}
-
-AudioStreamPlaybackOpus::AudioStreamPlaybackOpus() {
-	loops = false;
-	playing = false;
-	f = NULL;
-	stream_loaded = false;
-	stream_valid = false;
-	repeats = 0;
-	paused = true;
-	stream_channels = 0;
-	current_section = 0;
-	length = 0;
-	loop_restart_time = 0;
-	pre_skip = 0;
-
-	_op_callbacks.read = _op_read_func;
-	_op_callbacks.seek = _op_seek_func;
-	_op_callbacks.tell = _op_tell_func;
-	_op_callbacks.close = _op_close_func;
-}
-
-Error AudioStreamPlaybackOpus::set_file(const String &p_file) {
-	file = p_file;
-	stream_valid = false;
-	Error err;
-	f = FileAccess::open(file, FileAccess::READ, &err);
-
-	ERR_FAIL_COND_V_MSG(err, err, "Cannot open file '" + file + "'.");
-
-	int _err;
-
-	opus_file = op_open_callbacks(f, &_op_callbacks, NULL, 0, &_err);
-
-	switch (_err) {
-		case OP_EREAD: { // - Can't read the file.
-			memdelete(f);
-			f = NULL;
-			ERR_FAIL_V(ERR_FILE_CANT_READ);
-		} break;
-		case OP_EVERSION: // - Unrecognized version number.
-		case OP_ENOTFORMAT: // - Stream is not Opus data.
-		case OP_EIMPL: { // - Stream used non-implemented feature.
-			memdelete(f);
-			f = NULL;
-			ERR_FAIL_V(ERR_FILE_UNRECOGNIZED);
-		} break;
-		case OP_EBADLINK: // - Failed to find old data after seeking.
-		case OP_EBADTIMESTAMP: // - Timestamp failed the validity checks.
-		case OP_EBADHEADER: { // - Invalid or missing Opus bitstream header.
-			memdelete(f);
-			f = NULL;
-			ERR_FAIL_V(ERR_FILE_CORRUPT);
-		} break;
-		case OP_EFAULT: { // - Internal logic fault; indicates a bug or heap/stack corruption.
-			memdelete(f);
-			f = NULL;
-			ERR_FAIL_V(ERR_BUG);
-		} break;
-	}
-
-	const OpusHead *oinfo = op_head(opus_file, -1);
-
-	stream_channels = oinfo->channel_count;
-	pre_skip = oinfo->pre_skip;
-	frames_mixed = pre_skip;
-	ogg_int64_t len = op_pcm_total(opus_file, -1);
-	if (len < 0) {
-		length = 0;
-	} else {
-		length = (len / osrate);
-	}
-
-	op_free(opus_file);
-	memdelete(f);
-	f = NULL;
-	stream_valid = true;
-
-	return OK;
-}
-
-void AudioStreamPlaybackOpus::play(float p_from) {
-	if (playing)
-		stop();
-
-	if (_load_stream() != OK)
-		return;
-
-	frames_mixed = pre_skip;
-	playing = true;
-	if (p_from > 0) {
-		seek(p_from);
-	}
-}
-
-void AudioStreamPlaybackOpus::stop() {
-	_clear_stream();
-	playing = false;
-}
-
-void AudioStreamPlaybackOpus::seek(float p_time) {
-	if (!playing) return;
-	ogg_int64_t pcm_offset = (ogg_int64_t)(p_time * osrate);
-	bool ok = op_pcm_seek(opus_file, pcm_offset) == 0;
-	if (!ok) {
-		ERR_PRINT("Seek time over stream size.");
-		return;
-	}
-	frames_mixed = osrate * p_time;
-}
-
-int AudioStreamPlaybackOpus::mix(int16_t *p_buffer, int p_frames) {
-	if (!playing)
-		return 0;
-
-	int total = p_frames;
-
-	while (true) {
-
-		int todo = p_frames;
-
-		if (todo < MIN_MIX) {
-			break;
-		}
-
-		int ret = op_read(opus_file, (opus_int16 *)p_buffer, todo * stream_channels, &current_section);
-		if (ret < 0) {
-			playing = false;
-			ERR_BREAK_MSG(ret < 0, "Error reading Opus file: " + file + ".");
-		} else if (ret == 0) { // end of song, reload?
-			op_free(opus_file);
-
-			_close_file();
-
-			f = FileAccess::open(file, FileAccess::READ);
-
-			int errv = 0;
-			opus_file = op_open_callbacks(f, &_op_callbacks, NULL, 0, &errv);
-			if (errv != 0) {
-				playing = false;
-				break; // :(
-			}
-
-			if (!has_loop()) {
-				playing = false;
-				repeats = 1;
-				break;
-			}
-
-			if (loop_restart_time) {
-				bool ok = op_pcm_seek(opus_file, (loop_restart_time * osrate) + pre_skip) == 0;
-				if (!ok) {
-					playing = false;
-					ERR_PRINT("Loop restart time rejected");
-				}
-
-				frames_mixed = (loop_restart_time * osrate) + pre_skip;
-			} else {
-				frames_mixed = pre_skip;
-			}
-			repeats++;
-			continue;
-		}
-
-		stream_channels = op_head(opus_file, current_section)->channel_count;
-
-		frames_mixed += ret;
-
-		p_buffer += ret * stream_channels;
-		p_frames -= ret;
-	}
-
-	return total - p_frames;
-}
-
-float AudioStreamPlaybackOpus::get_length() const {
-	if (!stream_loaded) {
-		if (const_cast<AudioStreamPlaybackOpus *>(this)->_load_stream() != OK)
-			return 0;
-	}
-	return length;
-}
-
-float AudioStreamPlaybackOpus::get_playback_position() const {
-
-	int32_t frames = int32_t(frames_mixed);
-	if (frames < 0)
-		frames = 0;
-	return double(frames) / osrate;
-}
-
-int AudioStreamPlaybackOpus::get_minimum_buffer_size() const {
-	return MIN_MIX;
-}
-
-AudioStreamPlaybackOpus::~AudioStreamPlaybackOpus() {
-	_clear_stream();
-}
-
-RES ResourceFormatLoaderAudioStreamOpus::load(const String &p_path, const String &p_original_path, Error *r_error) {
-	if (r_error)
-		*r_error = OK;
-
-	AudioStreamOpus *opus_stream = memnew(AudioStreamOpus);
-	opus_stream->set_file(p_path);
-	return Ref<AudioStreamOpus>(opus_stream);
-}
-
-void ResourceFormatLoaderAudioStreamOpus::get_recognized_extensions(List<String> *p_extensions) const {
-
-	p_extensions->push_back("opus");
-}
-String ResourceFormatLoaderAudioStreamOpus::get_resource_type(const String &p_path) const {
-
-	if (p_path.get_extension().to_lower() == "opus")
-		return "AudioStreamOpus";
-	return "";
-}
-
-bool ResourceFormatLoaderAudioStreamOpus::handles_type(const String &p_type) const {
-	return (p_type == "AudioStream" || p_type == "AudioStreamOpus");
-}
diff --git a/modules/opus/audio_stream_opus.h b/modules/opus/audio_stream_opus.h
deleted file mode 100644
index 5c0a02a9d0..0000000000
--- a/modules/opus/audio_stream_opus.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*************************************************************************/
-/*  audio_stream_opus.h                                                  */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
-/*                                                                       */
-/* Permission is hereby granted, free of charge, to any person obtaining */
-/* a copy of this software and associated documentation files (the       */
-/* "Software"), to deal in the Software without restriction, including   */
-/* without limitation the rights to use, copy, modify, merge, publish,   */
-/* distribute, sublicense, and/or sell copies of the Software, and to    */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions:                                             */
-/*                                                                       */
-/* The above copyright notice and this permission notice shall be        */
-/* included in all copies or substantial portions of the Software.       */
-/*                                                                       */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
-/*************************************************************************/
-
-#ifndef AUDIO_STREAM_OPUS_H
-#define AUDIO_STREAM_OPUS_H
-
-#include "core/io/resource_loader.h"
-#include "core/os/file_access.h"
-#include "scene/resources/audio_stream.h"
-
-#include <opus/opusfile.h>
-
-/**
-	@author George Marques <george@gmarqu.es>
-*/
-
-class AudioStreamPlaybackOpus : public AudioStreamPlayback {
-
-	GDCLASS(AudioStreamPlaybackOpus, AudioStreamPlayback);
-
-	enum {
-		MIN_MIX = 1024
-	};
-
-	FileAccess *f;
-
-	OpusFileCallbacks _op_callbacks;
-	float length;
-	static int _op_read_func(void *_stream, unsigned char *_ptr, int _nbytes);
-	static int _op_seek_func(void *_stream, opus_int64 _offset, int _whence);
-	static int _op_close_func(void *_stream);
-	static opus_int64 _op_tell_func(void *_stream);
-	static const float osrate;
-
-	String file;
-	int64_t frames_mixed;
-
-	bool stream_loaded;
-	volatile bool playing;
-	OggOpusFile *opus_file;
-	int stream_channels;
-	int current_section;
-	int pre_skip;
-
-	bool paused;
-	bool loops;
-	int repeats;
-
-	Error _load_stream();
-	void _clear_stream();
-	void _close_file();
-
-	bool stream_valid;
-	float loop_restart_time;
-
-public:
-	Error set_file(const String &p_file);
-
-	virtual void play(float p_from = 0);
-	virtual void stop();
-	virtual bool is_playing() const { return playing; }
-
-	virtual void set_loop_restart_time(float p_time) { loop_restart_time = p_time; }
-
-	virtual void set_paused(bool p_paused) { paused = p_paused; }
-	virtual bool is_paused() const { return paused; }
-
-	virtual void set_loop(bool p_enable) { loops = p_enable; }
-	virtual bool has_loop() const { return loops; }
-
-	virtual float get_length() const;
-
-	virtual String get_stream_name() const { return ""; }
-
-	virtual int get_loop_count() const { return repeats; }
-
-	virtual float get_playback_position() const;
-	virtual void seek(float p_time);
-
-	virtual int get_channels() const { return stream_channels; }
-	virtual int get_mix_rate() const { return osrate; }
-
-	virtual int get_minimum_buffer_size() const;
-
-	virtual int mix(int16_t *p_buffer, int p_frames);
-
-	AudioStreamPlaybackOpus();
-	~AudioStreamPlaybackOpus();
-};
-
-class AudioStreamOpus : public AudioStream {
-
-	GDCLASS(AudioStreamOpus, AudioStream);
-
-	String file;
-
-public:
-	Ref<AudioStreamPlayback> instance_playback() {
-		Ref<AudioStreamPlaybackOpus> pb = memnew(AudioStreamPlaybackOpus);
-		pb->set_file(file);
-		return pb;
-	}
-
-	void set_file(const String &p_file) { file = p_file; }
-};
-
-class ResourceFormatLoaderAudioStreamOpus : public ResourceFormatLoader {
-public:
-	virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
-	virtual void get_recognized_extensions(List<String> *p_extensions) const;
-	virtual bool handles_type(const String &p_type) const;
-	virtual String get_resource_type(const String &p_path) const;
-};
-
-#endif // AUDIO_STREAM_OPUS_H
diff --git a/modules/opus/config.py b/modules/opus/config.py
index a1cde10ea0..9ff7b2dece 100644
--- a/modules/opus/config.py
+++ b/modules/opus/config.py
@@ -1,13 +1,6 @@
 def can_build(env, platform):
-    return True
+    return env.module_check_dependencies("opus", ["ogg"])
+
 
 def configure(env):
     pass
-
-def get_doc_classes():
-    return [
-        "AudioStreamOpus",
-    ]
-
-def get_doc_path():
-    return "doc_classes"
diff --git a/modules/opus/register_types.cpp b/modules/opus/register_types.cpp
index dff309b49c..a4329e142c 100644
--- a/modules/opus/register_types.cpp
+++ b/modules/opus/register_types.cpp
@@ -30,23 +30,8 @@
 
 #include "register_types.h"
 
-#include "audio_stream_opus.h"
+// Dummy module as libvorbis is needed by other modules (theora ...)
 
-static Ref<ResourceFormatLoaderAudioStreamOpus> opus_stream_loader;
+void register_opus_types() {}
 
-void register_opus_types() {
-	// Sorry guys, do not enable this unless you can figure out a way
-	// to get Opus to not do any memory allocation or system calls
-	// in the audio thread.
-	// Currently the implementation even reads files from the audio thread,
-	// and this is not how audio programming works.
-
-	//opus_stream_loader = memnew(ResourceFormatLoaderAudioStreamOpus);
-	//ResourceLoader::add_resource_format_loader(opus_stream_loader);
-	//ClassDB::register_class<AudioStreamOpus>();
-}
-
-void unregister_opus_types() {
-
-	//memdelete(opus_stream_loader);
-}
+void unregister_opus_types() {}
diff --git a/modules/opus/register_types.h b/modules/opus/register_types.h
index 445be4e166..ad6e083c82 100644
--- a/modules/opus/register_types.h
+++ b/modules/opus/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef OPUS_REGISTER_TYPES_H
+#define OPUS_REGISTER_TYPES_H
+
 void register_opus_types();
 void unregister_opus_types();
+
+#endif // OPUS_REGISTER_TYPES_H
diff --git a/modules/pvr/SCsub b/modules/pvr/SCsub
index 18da38fbbd..e0baf851f1 100644
--- a/modules/pvr/SCsub
+++ b/modules/pvr/SCsub
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_pvr = env_modules.Clone()
 
diff --git a/modules/pvr/config.py b/modules/pvr/config.py
index 1c8cd12a2d..d22f9454ed 100644
--- a/modules/pvr/config.py
+++ b/modules/pvr/config.py
@@ -1,5 +1,6 @@
 def can_build(env, platform):
     return True
 
+
 def configure(env):
     pass
diff --git a/modules/pvr/register_types.cpp b/modules/pvr/register_types.cpp
index 5f900a0256..1eb697bba3 100644
--- a/modules/pvr/register_types.cpp
+++ b/modules/pvr/register_types.cpp
@@ -35,13 +35,11 @@
 static Ref<ResourceFormatPVR> resource_loader_pvr;
 
 void register_pvr_types() {
-
 	resource_loader_pvr.instance();
 	ResourceLoader::add_resource_format_loader(resource_loader_pvr);
 }
 
 void unregister_pvr_types() {
-
 	ResourceLoader::remove_resource_format_loader(resource_loader_pvr);
 	resource_loader_pvr.unref();
 }
diff --git a/modules/pvr/register_types.h b/modules/pvr/register_types.h
index 06c54f50b1..8318996a46 100644
--- a/modules/pvr/register_types.h
+++ b/modules/pvr/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef PVR_REGISTER_TYPES_H
+#define PVR_REGISTER_TYPES_H
+
 void register_pvr_types();
 void unregister_pvr_types();
+
+#endif // PVR_REGISTER_TYPES_H
diff --git a/modules/pvr/texture_loader_pvr.cpp b/modules/pvr/texture_loader_pvr.cpp
index 65c21d5af8..36c0913f62 100644
--- a/modules/pvr/texture_loader_pvr.cpp
+++ b/modules/pvr/texture_loader_pvr.cpp
@@ -51,22 +51,24 @@ enum PVRFLags {
 
 };
 
-RES ResourceFormatPVR::load(const String &p_path, const String &p_original_path, Error *r_error) {
-
-	if (r_error)
+RES ResourceFormatPVR::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, bool p_no_cache) {
+	if (r_error) {
 		*r_error = ERR_CANT_OPEN;
+	}
 
 	Error err;
 	FileAccess *f = FileAccess::open(p_path, FileAccess::READ, &err);
-	if (!f)
+	if (!f) {
 		return RES();
+	}
 
 	FileAccessRef faref(f);
 
 	ERR_FAIL_COND_V(err, RES());
 
-	if (r_error)
+	if (r_error) {
 		*r_error = ERR_FILE_CORRUPT;
+	}
 
 	uint32_t hsize = f->get_32();
 
@@ -96,12 +98,12 @@ RES ResourceFormatPVR::load(const String &p_path, const String &p_original_path,
 	print_line("surfcount: "+itos(surfcount));
 	*/
 
-	PoolVector<uint8_t> data;
+	Vector<uint8_t> data;
 	data.resize(surfsize);
 
 	ERR_FAIL_COND_V(data.size() == 0, RES());
 
-	PoolVector<uint8_t>::Write w = data.write();
+	uint8_t *w = data.ptrw();
 	f->get_buffer(&w[0], surfsize);
 	err = f->get_error();
 	ERR_FAIL_COND_V(err != OK, RES());
@@ -109,11 +111,14 @@ RES ResourceFormatPVR::load(const String &p_path, const String &p_original_path,
 	Image::Format format = Image::FORMAT_MAX;
 
 	switch (flags & 0xFF) {
-
 		case 0x18:
-		case 0xC: format = (flags & PVR_HAS_ALPHA) ? Image::FORMAT_PVRTC2A : Image::FORMAT_PVRTC2; break;
+		case 0xC:
+			format = (flags & PVR_HAS_ALPHA) ? Image::FORMAT_PVRTC2A : Image::FORMAT_PVRTC2;
+			break;
 		case 0x19:
-		case 0xD: format = (flags & PVR_HAS_ALPHA) ? Image::FORMAT_PVRTC4A : Image::FORMAT_PVRTC4; break;
+		case 0xD:
+			format = (flags & PVR_HAS_ALPHA) ? Image::FORMAT_PVRTC4A : Image::FORMAT_PVRTC4;
+			break;
 		case 0x16:
 			format = Image::FORMAT_L8;
 			break;
@@ -152,42 +157,35 @@ RES ResourceFormatPVR::load(const String &p_path, const String &p_original_path,
 			ERR_FAIL_V_MSG(RES(), "Unsupported format in PVR texture: " + itos(flags & 0xFF) + ".");
 	}
 
-	w.release();
-
-	int tex_flags = Texture::FLAG_FILTER | Texture::FLAG_REPEAT;
-
-	if (mipmaps)
-		tex_flags |= Texture::FLAG_MIPMAPS;
-
 	Ref<Image> image = memnew(Image(width, height, mipmaps, format, data));
 	ERR_FAIL_COND_V(image->empty(), RES());
 
 	Ref<ImageTexture> texture = memnew(ImageTexture);
-	texture->create_from_image(image, tex_flags);
+	texture->create_from_image(image);
 
-	if (r_error)
+	if (r_error) {
 		*r_error = OK;
+	}
 
 	return texture;
 }
 
 void ResourceFormatPVR::get_recognized_extensions(List<String> *p_extensions) const {
-
 	p_extensions->push_back("pvr");
 }
-bool ResourceFormatPVR::handles_type(const String &p_type) const {
 
-	return ClassDB::is_parent_class(p_type, "Texture");
+bool ResourceFormatPVR::handles_type(const String &p_type) const {
+	return ClassDB::is_parent_class(p_type, "Texture2D");
 }
-String ResourceFormatPVR::get_resource_type(const String &p_path) const {
 
-	if (p_path.get_extension().to_lower() == "pvr")
-		return "Texture";
+String ResourceFormatPVR::get_resource_type(const String &p_path) const {
+	if (p_path.get_extension().to_lower() == "pvr") {
+		return "Texture2D";
+	}
 	return "";
 }
 
 static void _compress_pvrtc4(Image *p_img) {
-
 	Ref<Image> img = p_img->duplicate();
 
 	bool make_mipmaps = false;
@@ -196,8 +194,9 @@ static void _compress_pvrtc4(Image *p_img) {
 		img->resize_to_po2(true);
 	}
 	img->convert(Image::FORMAT_RGBA8);
-	if (!img->has_mipmaps() && make_mipmaps)
+	if (!img->has_mipmaps() && make_mipmaps) {
 		img->generate_mipmaps();
+	}
 
 	bool use_alpha = img->detect_alpha();
 
@@ -205,13 +204,12 @@ static void _compress_pvrtc4(Image *p_img) {
 	new_img.instance();
 	new_img->create(img->get_width(), img->get_height(), img->has_mipmaps(), use_alpha ? Image::FORMAT_PVRTC4A : Image::FORMAT_PVRTC4);
 
-	PoolVector<uint8_t> data = new_img->get_data();
+	Vector<uint8_t> data = new_img->get_data();
 	{
-		PoolVector<uint8_t>::Write wr = data.write();
-		PoolVector<uint8_t>::Read r = img->get_data().read();
+		uint8_t *wr = data.ptrw();
+		const uint8_t *r = img->get_data().ptr();
 
 		for (int i = 0; i <= new_img->get_mipmap_count(); i++) {
-
 			int ofs, size, w, h;
 			img->get_mipmap_offset_size_and_dimensions(i, ofs, size, w, h);
 			Javelin::RgbaBitmap bm(w, h);
@@ -229,7 +227,6 @@ static void _compress_pvrtc4(Image *p_img) {
 }
 
 ResourceFormatPVR::ResourceFormatPVR() {
-
 	Image::_image_decompress_pvrtc = _pvrtc_decompress;
 	Image::_image_compress_pvrtc4_func = _compress_pvrtc4;
 	Image::_image_compress_pvrtc2_func = _compress_pvrtc4;
@@ -262,31 +259,28 @@ struct PVRTCBlock {
 };
 
 _FORCE_INLINE_ bool is_po2(uint32_t p_input) {
-
-	if (p_input == 0)
-		return 0;
+	if (p_input == 0) {
+		return false;
+	}
 	uint32_t minus1 = p_input - 1;
-	return ((p_input | minus1) == (p_input ^ minus1)) ? 1 : 0;
+	return ((p_input | minus1) == (p_input ^ minus1)) ? true : false;
 }
 
 static void unpack_5554(const PVRTCBlock *p_block, int p_ab_colors[2][4]) {
-
 	uint32_t raw_bits[2];
 	raw_bits[0] = p_block->data[1] & (0xFFFE);
 	raw_bits[1] = p_block->data[1] >> 16;
 
 	for (int i = 0; i < 2; i++) {
-
 		if (raw_bits[i] & (1 << 15)) {
-
 			p_ab_colors[i][0] = (raw_bits[i] >> 10) & 0x1F;
 			p_ab_colors[i][1] = (raw_bits[i] >> 5) & 0x1F;
 			p_ab_colors[i][2] = raw_bits[i] & 0x1F;
-			if (i == 0)
+			if (i == 0) {
 				p_ab_colors[0][2] |= p_ab_colors[0][2] >> 4;
+			}
 			p_ab_colors[i][3] = 0xF;
 		} else {
-
 			p_ab_colors[i][0] = (raw_bits[i] >> (8 - 1)) & 0x1E;
 			p_ab_colors[i][1] = (raw_bits[i] >> (4 - 1)) & 0x1E;
 
@@ -295,10 +289,11 @@ static void unpack_5554(const PVRTCBlock *p_block, int p_ab_colors[2][4]) {
 
 			p_ab_colors[i][2] = (raw_bits[i] & 0xF) << 1;
 
-			if (i == 0)
+			if (i == 0) {
 				p_ab_colors[0][2] |= p_ab_colors[0][2] >> 3;
-			else
+			} else {
 				p_ab_colors[0][2] |= p_ab_colors[0][2] >> 4;
+			}
 
 			p_ab_colors[i][3] = (raw_bits[i] >> 11) & 0xE;
 		}
@@ -306,15 +301,12 @@ static void unpack_5554(const PVRTCBlock *p_block, int p_ab_colors[2][4]) {
 }
 
 static void unpack_modulations(const PVRTCBlock *p_block, const int p_2bit, int p_modulation[8][16], int p_modulation_modes[8][16], int p_x, int p_y) {
-
 	int block_mod_mode = p_block->data[1] & 1;
 	uint32_t modulation_bits = p_block->data[0];
 
 	if (p_2bit && block_mod_mode) {
-
 		for (int y = 0; y < BLK_Y_SIZE; y++) {
 			for (int x = 0; x < BLK_X_2BPP; x++) {
-
 				p_modulation_modes[y + p_y][x + p_x] = block_mod_mode;
 
 				if (((x ^ y) & 1) == 0) {
@@ -325,15 +317,15 @@ static void unpack_modulations(const PVRTCBlock *p_block, const int p_2bit, int
 		}
 
 	} else if (p_2bit) {
-
 		for (int y = 0; y < BLK_Y_SIZE; y++) {
 			for (int x = 0; x < BLK_X_2BPP; x++) {
 				p_modulation_modes[y + p_y][x + p_x] = block_mod_mode;
 
-				if (modulation_bits & 1)
+				if (modulation_bits & 1) {
 					p_modulation[y + p_y][x + p_x] = 0x3;
-				else
+				} else {
 					p_modulation[y + p_y][x + p_x] = 0x0;
+				}
 
 				modulation_bits >>= 1;
 			}
@@ -368,10 +360,11 @@ static void interpolate_colors(const int p_colorp[4], const int p_colorq[4], con
 
 	v = (y & 0x3) | ((~y & 0x2) << 1);
 
-	if (p_2bit)
+	if (p_2bit) {
 		u = (x & 0x7) | ((~x & 0x4) << 1);
-	else
+	} else {
 		u = (x & 0x3) | ((~x & 0x2) << 1);
+	}
 
 	v = v - BLK_Y_SIZE / 2;
 
@@ -427,19 +420,20 @@ static void get_modulation_value(int x, int y, const int p_2bit, const int p_mod
 
 	y = (y & 0x3) | ((~y & 0x2) << 1);
 
-	if (p_2bit)
+	if (p_2bit) {
 		x = (x & 0x7) | ((~x & 0x4) << 1);
-	else
+	} else {
 		x = (x & 0x3) | ((~x & 0x2) << 1);
+	}
 
 	*p_dopt = 0;
 
 	if (p_modulation_modes[y][x] == 0) {
 		mod_val = rep_vals0[p_modulation[y][x]];
 	} else if (p_2bit) {
-		if (((x ^ y) & 1) == 0)
+		if (((x ^ y) & 1) == 0) {
 			mod_val = rep_vals0[p_modulation[y][x]];
-		else if (p_modulation_modes[y][x] == 1) {
+		} else if (p_modulation_modes[y][x] == 1) {
 			mod_val = (rep_vals0[p_modulation[y - 1][x]] +
 							  rep_vals0[p_modulation[y + 1][x]] +
 							  rep_vals0[p_modulation[y][x - 1]] +
@@ -466,7 +460,6 @@ static void get_modulation_value(int x, int y, const int p_2bit, const int p_mod
 static int disable_twiddling = 0;
 
 static uint32_t twiddle_uv(uint32_t p_height, uint32_t p_width, uint32_t p_y, uint32_t p_x) {
-
 	uint32_t twiddled;
 
 	uint32_t min_dimension;
@@ -491,8 +484,9 @@ static uint32_t twiddle_uv(uint32_t p_height, uint32_t p_width, uint32_t p_y, ui
 		max_value = p_y;
 	}
 
-	if (disable_twiddling)
+	if (disable_twiddling) {
 		return (p_y * p_width + p_x);
+	}
 
 	scr_bit_pos = 1;
 	dst_bit_pos = 1;
@@ -541,7 +535,7 @@ static void decompress_pvrtc(PVRTCBlock *p_comp_img, const int p_2bit, const int
 	// local neighbourhood of blocks
 	PVRTCBlock *p_blocks[2][2];
 
-	PVRTCBlock *prev[2][2] = { { NULL, NULL }, { NULL, NULL } };
+	PVRTCBlock *prev[2][2] = { { nullptr, nullptr }, { nullptr, nullptr } };
 
 	struct
 	{
@@ -552,17 +546,17 @@ static void decompress_pvrtc(PVRTCBlock *p_comp_img, const int p_2bit, const int
 
 	int r_result[4];
 
-	if (p_2bit)
+	if (p_2bit) {
 		x_block_size = BLK_X_2BPP;
-	else
+	} else {
 		x_block_size = BLK_X_4BPP;
+	}
 
 	block_width = MAX(2, p_width / x_block_size);
 	block_height = MAX(2, p_height / BLK_Y_SIZE);
 
 	for (y = 0; y < p_height; y++) {
 		for (x = 0; x < p_width; x++) {
-
 			block_x = (x - x_block_size / 2);
 			blk_y = (y - BLK_Y_SIZE / 2);
 
@@ -627,8 +621,9 @@ static void decompress_pvrtc(PVRTCBlock *p_comp_img, const int p_2bit, const int
 				r_result[i] >>= 3;
 			}
 
-			if (DoPT)
+			if (DoPT) {
 				r_result[3] = 0;
+			}
 
 			u_pos = (x + y * p_width) << 2;
 			p_dst[u_pos + 0] = (uint8_t)r_result[0];
@@ -640,25 +635,22 @@ static void decompress_pvrtc(PVRTCBlock *p_comp_img, const int p_2bit, const int
 }
 
 static void _pvrtc_decompress(Image *p_img) {
-
 	ERR_FAIL_COND(p_img->get_format() != Image::FORMAT_PVRTC2 && p_img->get_format() != Image::FORMAT_PVRTC2A && p_img->get_format() != Image::FORMAT_PVRTC4 && p_img->get_format() != Image::FORMAT_PVRTC4A);
 
 	bool _2bit = (p_img->get_format() == Image::FORMAT_PVRTC2 || p_img->get_format() == Image::FORMAT_PVRTC2A);
 
-	PoolVector<uint8_t> data = p_img->get_data();
-	PoolVector<uint8_t>::Read r = data.read();
+	Vector<uint8_t> data = p_img->get_data();
+	const uint8_t *r = data.ptr();
 
-	PoolVector<uint8_t> newdata;
+	Vector<uint8_t> newdata;
 	newdata.resize(p_img->get_width() * p_img->get_height() * 4);
-	PoolVector<uint8_t>::Write w = newdata.write();
-
-	decompress_pvrtc((PVRTCBlock *)r.ptr(), _2bit, p_img->get_width(), p_img->get_height(), 0, (unsigned char *)w.ptr());
+	uint8_t *w = newdata.ptrw();
 
-	w.release();
-	r.release();
+	decompress_pvrtc((PVRTCBlock *)r, _2bit, p_img->get_width(), p_img->get_height(), 0, (unsigned char *)w);
 
 	bool make_mipmaps = p_img->has_mipmaps();
 	p_img->create(p_img->get_width(), p_img->get_height(), false, Image::FORMAT_RGBA8, newdata);
-	if (make_mipmaps)
+	if (make_mipmaps) {
 		p_img->generate_mipmaps();
+	}
 }
diff --git a/modules/pvr/texture_loader_pvr.h b/modules/pvr/texture_loader_pvr.h
index e384ed2b4c..07ef129689 100644
--- a/modules/pvr/texture_loader_pvr.h
+++ b/modules/pvr/texture_loader_pvr.h
@@ -36,7 +36,7 @@
 
 class ResourceFormatPVR : public ResourceFormatLoader {
 public:
-	virtual RES load(const String &p_path, const String &p_original_path, Error *r_error = NULL);
+	virtual RES load(const String &p_path, const String &p_original_path, Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, bool p_no_cache = false);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual bool handles_type(const String &p_type) const;
 	virtual String get_resource_type(const String &p_path) const;
diff --git a/modules/recast/SCsub b/modules/recast/SCsub
deleted file mode 100644
index 94d9968164..0000000000
--- a/modules/recast/SCsub
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env python
-
-Import('env')
-Import('env_modules')
-
-env_recast = env_modules.Clone()
-
-# Thirdparty source files
-if env['builtin_recast']:
-    thirdparty_dir = "#thirdparty/recastnavigation/Recast/"
-    thirdparty_sources = [
-		"Source/Recast.cpp",
-		"Source/RecastAlloc.cpp",
-		"Source/RecastArea.cpp",
-		"Source/RecastAssert.cpp",
-		"Source/RecastContour.cpp",
-		"Source/RecastFilter.cpp",
-		"Source/RecastLayers.cpp",
-		"Source/RecastMesh.cpp",
-		"Source/RecastMeshDetail.cpp",
-		"Source/RecastRasterization.cpp",
-		"Source/RecastRegion.cpp",
-    ]
-    thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
-
-    env_recast.Prepend(CPPPATH=[thirdparty_dir + "/Include"])
-
-    env_thirdparty = env_recast.Clone()
-    env_thirdparty.disable_warnings()
-    env_thirdparty.add_source_files(env.modules_sources, thirdparty_sources)
-
-# Godot source files
-env_recast.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/regex/SCsub b/modules/regex/SCsub
index 6238cd3d9f..2afacc1d9c 100644
--- a/modules/regex/SCsub
+++ b/modules/regex/SCsub
@@ -1,16 +1,16 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_regex = env_modules.Clone()
 
-if env['builtin_pcre2']:
-    thirdparty_dir = '#thirdparty/pcre2/src/'
-    thirdparty_flags = ['PCRE2_STATIC', 'HAVE_CONFIG_H']
+if env["builtin_pcre2"]:
+    thirdparty_dir = "#thirdparty/pcre2/src/"
+    thirdparty_flags = ["PCRE2_STATIC", "HAVE_CONFIG_H", "SUPPORT_UNICODE"]
 
-    if env['builtin_pcre2_with_jit']:
-        thirdparty_flags.append('SUPPORT_JIT')
+    if env["builtin_pcre2_with_jit"]:
+        thirdparty_flags.append("SUPPORT_JIT")
 
     thirdparty_sources = [
         "pcre2_auto_possess.c",
@@ -24,7 +24,7 @@ if env['builtin_pcre2']:
         "pcre2_extuni.c",
         "pcre2_find_bracket.c",
         "pcre2_jit_compile.c",
-        #"pcre2_jit_match.c", "pcre2_jit_misc.c", # these files are included in pcre2_jit_compile.c.
+        # "pcre2_jit_match.c", "pcre2_jit_misc.c", # these files are included in pcre2_jit_compile.c.
         "pcre2_maketables.c",
         "pcre2_match.c",
         "pcre2_match_data.c",
diff --git a/modules/regex/config.py b/modules/regex/config.py
index 42cfe3b43c..df9f44cb95 100644
--- a/modules/regex/config.py
+++ b/modules/regex/config.py
@@ -1,14 +1,17 @@
 def can_build(env, platform):
     return True
 
+
 def configure(env):
     pass
 
+
 def get_doc_classes():
     return [
         "RegEx",
         "RegExMatch",
     ]
 
+
 def get_doc_path():
     return "doc_classes"
diff --git a/modules/regex/doc_classes/RegEx.xml b/modules/regex/doc_classes/RegEx.xml
index e9f46b9853..312275842a 100644
--- a/modules/regex/doc_classes/RegEx.xml
+++ b/modules/regex/doc_classes/RegEx.xml
@@ -10,8 +10,8 @@
 		var regex = RegEx.new()
 		regex.compile("\\w-(\\d+)")
 		[/codeblock]
-		The search pattern must be escaped first for gdscript before it is escaped for the expression. For example, [code]compile("\\d+")[/code] would be read by RegEx as [code]\d+[/code]. Similarly, [code]compile("\"(?:\\\\.|[^\"])*\"")[/code] would be read as [code]"(?:\\.|[^"])*"[/code].
-		Using [method search] you can find the pattern within the given text. If a pattern is found, [RegExMatch] is returned and you can retrieve details of the results using functions such as [method RegExMatch.get_string] and [method RegExMatch.get_start].
+		The search pattern must be escaped first for GDScript before it is escaped for the expression. For example, [code]compile("\\d+")[/code] would be read by RegEx as [code]\d+[/code]. Similarly, [code]compile("\"(?:\\\\.|[^\"])*\"")[/code] would be read as [code]"(?:\\.|[^"])*"[/code].
+		Using [method search], you can find the pattern within the given text. If a pattern is found, [RegExMatch] is returned and you can retrieve details of the results using methods such as [method RegExMatch.get_string] and [method RegExMatch.get_start].
 		[codeblock]
 		var regex = RegEx.new()
 		regex.compile("\\w-(\\d+)")
@@ -19,7 +19,7 @@
 		if result:
 		    print(result.get_string()) # Would print n-0123
 		[/codeblock]
-		The results of capturing groups [code]()[/code] can be retrieved by passing the group number to the various functions in [RegExMatch]. Group 0 is the default and will always refer to the entire pattern. In the above example, calling [code]result.get_string(1)[/code] would give you [code]0123[/code].
+		The results of capturing groups [code]()[/code] can be retrieved by passing the group number to the various methods in [RegExMatch]. Group 0 is the default and will always refer to the entire pattern. In the above example, calling [code]result.get_string(1)[/code] would give you [code]0123[/code].
 		This version of RegEx also supports named capturing groups, and the names can be used to retrieve the results. If two or more groups have the same name, the name would only refer to the first one with a match.
 		[codeblock]
 		var regex = RegEx.new()
@@ -32,9 +32,19 @@
 		[codeblock]
 		for result in regex.search_all("d01, d03, d0c, x3f and x42"):
 		    print(result.get_string("digit"))
-		# Would print 01 03 3f 42
-		# Note that d0c would not match
+		# Would print 01 03 0 3f 42
 		[/codeblock]
+		[b]Example of splitting a string using a RegEx:[/b]
+		[codeblock]
+		var regex = RegEx.new()
+		regex.compile("\\S+") # Negated whitespace character class.
+		var results = []
+		for match in regex.search_all("One  Two \n\tThree"):
+		    results.push_back(match.get_string())
+		# The `results` array now contains "One", "Two", "Three".
+		[/codeblock]
+		[b]Note:[/b] Godot's regex implementation is based on the [url=https://www.pcre.org/]PCRE2[/url] library. You can view the full pattern reference [url=https://www.pcre.org/current/doc/html/pcre2pattern.html]here[/url].
+		[b]Tip:[/b] You can use [url=https://regexr.com/]Regexr[/url] to test regular expressions online.
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/modules/regex/doc_classes/RegExMatch.xml b/modules/regex/doc_classes/RegExMatch.xml
index 151e881b6f..a45de60aef 100644
--- a/modules/regex/doc_classes/RegExMatch.xml
+++ b/modules/regex/doc_classes/RegExMatch.xml
@@ -49,7 +49,7 @@
 	</methods>
 	<members>
 		<member name="names" type="Dictionary" setter="" getter="get_names" default="{}">
-			A dictionary of named groups and its corresponding group number. Only groups with that were matched are included. If multiple groups have the same name, that name would refer to the first matching one.
+			A dictionary of named groups and its corresponding group number. Only groups that were matched are included. If multiple groups have the same name, that name would refer to the first matching one.
 		</member>
 		<member name="strings" type="Array" setter="" getter="get_strings" default="[  ]">
 			An [Array] of the match and its capturing groups.
diff --git a/modules/regex/regex.cpp b/modules/regex/regex.cpp
index 53d1a1dd65..c10a276eae 100644
--- a/modules/regex/regex.cpp
+++ b/modules/regex/regex.cpp
@@ -36,51 +36,46 @@ extern "C" {
 }
 
 static void *_regex_malloc(PCRE2_SIZE size, void *user) {
-
 	return memalloc(size);
 }
 
 static void _regex_free(void *ptr, void *user) {
-
 	memfree(ptr);
 }
 
 int RegExMatch::_find(const Variant &p_name) const {
-
 	if (p_name.is_num()) {
-
 		int i = (int)p_name;
-		if (i >= data.size())
+		if (i >= data.size()) {
 			return -1;
+		}
 		return i;
 
 	} else if (p_name.get_type() == Variant::STRING) {
-
 		const Map<String, int>::Element *found = names.find((String)p_name);
-		if (found)
+		if (found) {
 			return found->value();
+		}
 	}
 
 	return -1;
 }
 
 String RegExMatch::get_subject() const {
-
 	return subject;
 }
 
 int RegExMatch::get_group_count() const {
-
-	if (data.size() == 0)
+	if (data.size() == 0) {
 		return 0;
+	}
 	return data.size() - 1;
 }
 
 Dictionary RegExMatch::get_names() const {
-
 	Dictionary result;
 
-	for (const Map<String, int>::Element *i = names.front(); i != NULL; i = i->next()) {
+	for (const Map<String, int>::Element *i = names.front(); i != nullptr; i = i->next()) {
 		result[i->key()] = i->value();
 	}
 
@@ -88,13 +83,11 @@ Dictionary RegExMatch::get_names() const {
 }
 
 Array RegExMatch::get_strings() const {
-
 	Array result;
 
 	int size = data.size();
 
 	for (int i = 0; i < size; i++) {
-
 		int start = data[i].start;
 
 		if (start == -1) {
@@ -111,16 +104,17 @@ Array RegExMatch::get_strings() const {
 }
 
 String RegExMatch::get_string(const Variant &p_name) const {
-
 	int id = _find(p_name);
 
-	if (id < 0)
+	if (id < 0) {
 		return String();
+	}
 
 	int start = data[id].start;
 
-	if (start == -1)
+	if (start == -1) {
 		return String();
+	}
 
 	int length = data[id].end - start;
 
@@ -128,27 +122,26 @@ String RegExMatch::get_string(const Variant &p_name) const {
 }
 
 int RegExMatch::get_start(const Variant &p_name) const {
-
 	int id = _find(p_name);
 
-	if (id < 0)
+	if (id < 0) {
 		return -1;
+	}
 
 	return data[id].start;
 }
 
 int RegExMatch::get_end(const Variant &p_name) const {
-
 	int id = _find(p_name);
 
-	if (id < 0)
+	if (id < 0) {
 		return -1;
+	}
 
 	return data[id].end;
 }
 
 void RegExMatch::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("get_subject"), &RegExMatch::get_subject);
 	ClassDB::bind_method(D_METHOD("get_group_count"), &RegExMatch::get_group_count);
 	ClassDB::bind_method(D_METHOD("get_names"), &RegExMatch::get_names);
@@ -163,37 +156,17 @@ void RegExMatch::_bind_methods() {
 }
 
 void RegEx::_pattern_info(uint32_t what, void *where) const {
-
-	if (sizeof(CharType) == 2) {
-
-		pcre2_pattern_info_16((pcre2_code_16 *)code, what, where);
-
-	} else {
-
-		pcre2_pattern_info_32((pcre2_code_32 *)code, what, where);
-	}
+	pcre2_pattern_info_32((pcre2_code_32 *)code, what, where);
 }
 
 void RegEx::clear() {
-
-	if (sizeof(CharType) == 2) {
-
-		if (code) {
-			pcre2_code_free_16((pcre2_code_16 *)code);
-			code = NULL;
-		}
-
-	} else {
-
-		if (code) {
-			pcre2_code_free_32((pcre2_code_32 *)code);
-			code = NULL;
-		}
+	if (code) {
+		pcre2_code_free_32((pcre2_code_32 *)code);
+		code = nullptr;
 	}
 }
 
 Error RegEx::compile(const String &p_pattern) {
-
 	pattern = p_pattern;
 	clear();
 
@@ -201,122 +174,67 @@ Error RegEx::compile(const String &p_pattern) {
 	PCRE2_SIZE offset;
 	uint32_t flags = PCRE2_DUPNAMES;
 
-	if (sizeof(CharType) == 2) {
-
-		pcre2_general_context_16 *gctx = (pcre2_general_context_16 *)general_ctx;
-		pcre2_compile_context_16 *cctx = pcre2_compile_context_create_16(gctx);
-		PCRE2_SPTR16 p = (PCRE2_SPTR16)pattern.c_str();
+	pcre2_general_context_32 *gctx = (pcre2_general_context_32 *)general_ctx;
+	pcre2_compile_context_32 *cctx = pcre2_compile_context_create_32(gctx);
+	PCRE2_SPTR32 p = (PCRE2_SPTR32)pattern.get_data();
 
-		code = pcre2_compile_16(p, pattern.length(), flags, &err, &offset, cctx);
+	code = pcre2_compile_32(p, pattern.length(), flags, &err, &offset, cctx);
 
-		pcre2_compile_context_free_16(cctx);
+	pcre2_compile_context_free_32(cctx);
 
-		if (!code) {
-			PCRE2_UCHAR16 buf[256];
-			pcre2_get_error_message_16(err, buf, 256);
-			String message = String::num(offset) + ": " + String((const CharType *)buf);
-			ERR_PRINT(message.utf8());
-			return FAILED;
-		}
-
-	} else {
-
-		pcre2_general_context_32 *gctx = (pcre2_general_context_32 *)general_ctx;
-		pcre2_compile_context_32 *cctx = pcre2_compile_context_create_32(gctx);
-		PCRE2_SPTR32 p = (PCRE2_SPTR32)pattern.c_str();
-
-		code = pcre2_compile_32(p, pattern.length(), flags, &err, &offset, cctx);
-
-		pcre2_compile_context_free_32(cctx);
-
-		if (!code) {
-			PCRE2_UCHAR32 buf[256];
-			pcre2_get_error_message_32(err, buf, 256);
-			String message = String::num(offset) + ": " + String((const CharType *)buf);
-			ERR_PRINT(message.utf8());
-			return FAILED;
-		}
+	if (!code) {
+		PCRE2_UCHAR32 buf[256];
+		pcre2_get_error_message_32(err, buf, 256);
+		String message = String::num(offset) + ": " + String((const char32_t *)buf);
+		ERR_PRINT(message.utf8());
+		return FAILED;
 	}
 	return OK;
 }
 
 Ref<RegExMatch> RegEx::search(const String &p_subject, int p_offset, int p_end) const {
-
-	ERR_FAIL_COND_V(!is_valid(), NULL);
+	ERR_FAIL_COND_V(!is_valid(), nullptr);
 
 	Ref<RegExMatch> result = memnew(RegExMatch);
 
 	int length = p_subject.length();
-	if (p_end >= 0 && p_end < length)
+	if (p_end >= 0 && p_end < length) {
 		length = p_end;
+	}
 
-	if (sizeof(CharType) == 2) {
-
-		pcre2_code_16 *c = (pcre2_code_16 *)code;
-		pcre2_general_context_16 *gctx = (pcre2_general_context_16 *)general_ctx;
-		pcre2_match_context_16 *mctx = pcre2_match_context_create_16(gctx);
-		PCRE2_SPTR16 s = (PCRE2_SPTR16)p_subject.c_str();
-
-		pcre2_match_data_16 *match = pcre2_match_data_create_from_pattern_16(c, gctx);
-
-		int res = pcre2_match_16(c, s, length, p_offset, 0, match, mctx);
-
-		if (res < 0) {
-			pcre2_match_data_free_16(match);
-			return NULL;
-		}
-
-		uint32_t size = pcre2_get_ovector_count_16(match);
-		PCRE2_SIZE *ovector = pcre2_get_ovector_pointer_16(match);
-
-		result->data.resize(size);
-
-		for (uint32_t i = 0; i < size; i++) {
-
-			result->data.write[i].start = ovector[i * 2];
-			result->data.write[i].end = ovector[i * 2 + 1];
-		}
-
-		pcre2_match_data_free_16(match);
-		pcre2_match_context_free_16(mctx);
-
-	} else {
-
-		pcre2_code_32 *c = (pcre2_code_32 *)code;
-		pcre2_general_context_32 *gctx = (pcre2_general_context_32 *)general_ctx;
-		pcre2_match_context_32 *mctx = pcre2_match_context_create_32(gctx);
-		PCRE2_SPTR32 s = (PCRE2_SPTR32)p_subject.c_str();
-
-		pcre2_match_data_32 *match = pcre2_match_data_create_from_pattern_32(c, gctx);
+	pcre2_code_32 *c = (pcre2_code_32 *)code;
+	pcre2_general_context_32 *gctx = (pcre2_general_context_32 *)general_ctx;
+	pcre2_match_context_32 *mctx = pcre2_match_context_create_32(gctx);
+	PCRE2_SPTR32 s = (PCRE2_SPTR32)p_subject.get_data();
 
-		int res = pcre2_match_32(c, s, length, p_offset, 0, match, mctx);
+	pcre2_match_data_32 *match = pcre2_match_data_create_from_pattern_32(c, gctx);
 
-		if (res < 0) {
-			pcre2_match_data_free_32(match);
-			pcre2_match_context_free_32(mctx);
+	int res = pcre2_match_32(c, s, length, p_offset, 0, match, mctx);
 
-			return NULL;
-		}
-
-		uint32_t size = pcre2_get_ovector_count_32(match);
-		PCRE2_SIZE *ovector = pcre2_get_ovector_pointer_32(match);
+	if (res < 0) {
+		pcre2_match_data_free_32(match);
+		pcre2_match_context_free_32(mctx);
 
-		result->data.resize(size);
+		return nullptr;
+	}
 
-		for (uint32_t i = 0; i < size; i++) {
+	uint32_t size = pcre2_get_ovector_count_32(match);
+	PCRE2_SIZE *ovector = pcre2_get_ovector_pointer_32(match);
 
-			result->data.write[i].start = ovector[i * 2];
-			result->data.write[i].end = ovector[i * 2 + 1];
-		}
+	result->data.resize(size);
 
-		pcre2_match_data_free_32(match);
-		pcre2_match_context_free_32(mctx);
+	for (uint32_t i = 0; i < size; i++) {
+		result->data.write[i].start = ovector[i * 2];
+		result->data.write[i].end = ovector[i * 2 + 1];
 	}
 
+	pcre2_match_data_free_32(match);
+	pcre2_match_context_free_32(mctx);
+
 	result->subject = p_subject;
 
 	uint32_t count;
-	const CharType *table;
+	const char32_t *table;
 	uint32_t entry_size;
 
 	_pattern_info(PCRE2_INFO_NAMECOUNT, &count);
@@ -324,13 +242,14 @@ Ref<RegExMatch> RegEx::search(const String &p_subject, int p_offset, int p_end)
 	_pattern_info(PCRE2_INFO_NAMEENTRYSIZE, &entry_size);
 
 	for (uint32_t i = 0; i < count; i++) {
-
-		CharType id = table[i * entry_size];
-		if (result->data[id].start == -1)
+		char32_t id = table[i * entry_size];
+		if (result->data[id].start == -1) {
 			continue;
+		}
 		String name = &table[i * entry_size + 1];
-		if (result->names.has(name))
+		if (result->names.has(name)) {
 			continue;
+		}
 
 		result->names.insert(name, id);
 	}
@@ -339,13 +258,13 @@ Ref<RegExMatch> RegEx::search(const String &p_subject, int p_offset, int p_end)
 }
 
 Array RegEx::search_all(const String &p_subject, int p_offset, int p_end) const {
-
 	int last_end = -1;
 	Array result;
 	Ref<RegExMatch> match = search(p_subject, p_offset, p_end);
 	while (match.is_valid()) {
-		if (last_end == match->get_end(0))
+		if (last_end == match->get_end(0)) {
 			break;
+		}
 		result.push_back(match);
 		last_end = match->get_end(0);
 		match = search(p_subject, match->get_end(0), p_end);
@@ -354,7 +273,6 @@ Array RegEx::search_all(const String &p_subject, int p_offset, int p_end) const
 }
 
 String RegEx::sub(const String &p_subject, const String &p_replacement, bool p_all, int p_offset, int p_end) const {
-
 	ERR_FAIL_COND_V(!is_valid(), String());
 
 	// safety_zone is the number of chars we allocate in addition to the number of chars expected in order to
@@ -364,83 +282,55 @@ String RegEx::sub(const String &p_subject, const String &p_replacement, bool p_a
 	const int safety_zone = 1;
 
 	PCRE2_SIZE olength = p_subject.length() + 1; // space for output string and one terminating \0 character
-	Vector<CharType> output;
+	Vector<char32_t> output;
 	output.resize(olength + safety_zone);
 
 	uint32_t flags = PCRE2_SUBSTITUTE_OVERFLOW_LENGTH;
-	if (p_all)
+	if (p_all) {
 		flags |= PCRE2_SUBSTITUTE_GLOBAL;
+	}
 
 	PCRE2_SIZE length = p_subject.length();
-	if (p_end >= 0 && (uint32_t)p_end < length)
+	if (p_end >= 0 && (uint32_t)p_end < length) {
 		length = p_end;
+	}
 
-	if (sizeof(CharType) == 2) {
-
-		pcre2_code_16 *c = (pcre2_code_16 *)code;
-		pcre2_general_context_16 *gctx = (pcre2_general_context_16 *)general_ctx;
-		pcre2_match_context_16 *mctx = pcre2_match_context_create_16(gctx);
-		PCRE2_SPTR16 s = (PCRE2_SPTR16)p_subject.c_str();
-		PCRE2_SPTR16 r = (PCRE2_SPTR16)p_replacement.c_str();
-		PCRE2_UCHAR16 *o = (PCRE2_UCHAR16 *)output.ptrw();
-
-		pcre2_match_data_16 *match = pcre2_match_data_create_from_pattern_16(c, gctx);
-
-		int res = pcre2_substitute_16(c, s, length, p_offset, flags, match, mctx, r, p_replacement.length(), o, &olength);
-
-		if (res == PCRE2_ERROR_NOMEMORY) {
-			output.resize(olength + safety_zone);
-			o = (PCRE2_UCHAR16 *)output.ptrw();
-			res = pcre2_substitute_16(c, s, length, p_offset, flags, match, mctx, r, p_replacement.length(), o, &olength);
-		}
-
-		pcre2_match_data_free_16(match);
-		pcre2_match_context_free_16(mctx);
-
-		if (res < 0)
-			return String();
-
-	} else {
+	pcre2_code_32 *c = (pcre2_code_32 *)code;
+	pcre2_general_context_32 *gctx = (pcre2_general_context_32 *)general_ctx;
+	pcre2_match_context_32 *mctx = pcre2_match_context_create_32(gctx);
+	PCRE2_SPTR32 s = (PCRE2_SPTR32)p_subject.get_data();
+	PCRE2_SPTR32 r = (PCRE2_SPTR32)p_replacement.get_data();
+	PCRE2_UCHAR32 *o = (PCRE2_UCHAR32 *)output.ptrw();
 
-		pcre2_code_32 *c = (pcre2_code_32 *)code;
-		pcre2_general_context_32 *gctx = (pcre2_general_context_32 *)general_ctx;
-		pcre2_match_context_32 *mctx = pcre2_match_context_create_32(gctx);
-		PCRE2_SPTR32 s = (PCRE2_SPTR32)p_subject.c_str();
-		PCRE2_SPTR32 r = (PCRE2_SPTR32)p_replacement.c_str();
-		PCRE2_UCHAR32 *o = (PCRE2_UCHAR32 *)output.ptrw();
+	pcre2_match_data_32 *match = pcre2_match_data_create_from_pattern_32(c, gctx);
 
-		pcre2_match_data_32 *match = pcre2_match_data_create_from_pattern_32(c, gctx);
+	int res = pcre2_substitute_32(c, s, length, p_offset, flags, match, mctx, r, p_replacement.length(), o, &olength);
 
-		int res = pcre2_substitute_32(c, s, length, p_offset, flags, match, mctx, r, p_replacement.length(), o, &olength);
+	if (res == PCRE2_ERROR_NOMEMORY) {
+		output.resize(olength + safety_zone);
+		o = (PCRE2_UCHAR32 *)output.ptrw();
+		res = pcre2_substitute_32(c, s, length, p_offset, flags, match, mctx, r, p_replacement.length(), o, &olength);
+	}
 
-		if (res == PCRE2_ERROR_NOMEMORY) {
-			output.resize(olength + safety_zone);
-			o = (PCRE2_UCHAR32 *)output.ptrw();
-			res = pcre2_substitute_32(c, s, length, p_offset, flags, match, mctx, r, p_replacement.length(), o, &olength);
-		}
+	pcre2_match_data_free_32(match);
+	pcre2_match_context_free_32(mctx);
 
-		pcre2_match_data_free_32(match);
-		pcre2_match_context_free_32(mctx);
-
-		if (res < 0)
-			return String();
+	if (res < 0) {
+		return String();
 	}
 
 	return String(output.ptr(), olength);
 }
 
 bool RegEx::is_valid() const {
-
-	return (code != NULL);
+	return (code != nullptr);
 }
 
 String RegEx::get_pattern() const {
-
 	return pattern;
 }
 
 int RegEx::get_group_count() const {
-
 	ERR_FAIL_COND_V(!is_valid(), 0);
 
 	uint32_t count;
@@ -451,13 +341,12 @@ int RegEx::get_group_count() const {
 }
 
 Array RegEx::get_names() const {
-
 	Array result;
 
 	ERR_FAIL_COND_V(!is_valid(), result);
 
 	uint32_t count;
-	const CharType *table;
+	const char32_t *table;
 	uint32_t entry_size;
 
 	_pattern_info(PCRE2_INFO_NAMECOUNT, &count);
@@ -465,7 +354,6 @@ Array RegEx::get_names() const {
 	_pattern_info(PCRE2_INFO_NAMEENTRYSIZE, &entry_size);
 
 	for (uint32_t i = 0; i < count; i++) {
-
 		String name = &table[i * entry_size + 1];
 		if (result.find(name) < 0) {
 			result.append(name);
@@ -476,50 +364,24 @@ Array RegEx::get_names() const {
 }
 
 RegEx::RegEx() {
-
-	if (sizeof(CharType) == 2) {
-
-		general_ctx = pcre2_general_context_create_16(&_regex_malloc, &_regex_free, NULL);
-
-	} else {
-
-		general_ctx = pcre2_general_context_create_32(&_regex_malloc, &_regex_free, NULL);
-	}
-	code = NULL;
+	general_ctx = pcre2_general_context_create_32(&_regex_malloc, &_regex_free, nullptr);
+	code = nullptr;
 }
 
 RegEx::RegEx(const String &p_pattern) {
-
-	if (sizeof(CharType) == 2) {
-
-		general_ctx = pcre2_general_context_create_16(&_regex_malloc, &_regex_free, NULL);
-
-	} else {
-
-		general_ctx = pcre2_general_context_create_32(&_regex_malloc, &_regex_free, NULL);
-	}
-	code = NULL;
+	general_ctx = pcre2_general_context_create_32(&_regex_malloc, &_regex_free, nullptr);
+	code = nullptr;
 	compile(p_pattern);
 }
 
 RegEx::~RegEx() {
-
-	if (sizeof(CharType) == 2) {
-
-		if (code)
-			pcre2_code_free_16((pcre2_code_16 *)code);
-		pcre2_general_context_free_16((pcre2_general_context_16 *)general_ctx);
-
-	} else {
-
-		if (code)
-			pcre2_code_free_32((pcre2_code_32 *)code);
-		pcre2_general_context_free_32((pcre2_general_context_32 *)general_ctx);
+	if (code) {
+		pcre2_code_free_32((pcre2_code_32 *)code);
 	}
+	pcre2_general_context_free_32((pcre2_general_context_32 *)general_ctx);
 }
 
 void RegEx::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("clear"), &RegEx::clear);
 	ClassDB::bind_method(D_METHOD("compile", "pattern"), &RegEx::compile);
 	ClassDB::bind_method(D_METHOD("search", "subject", "offset", "end"), &RegEx::search, DEFVAL(0), DEFVAL(-1));
diff --git a/modules/regex/regex.h b/modules/regex/regex.h
index a342c17c78..52b49c783e 100644
--- a/modules/regex/regex.h
+++ b/modules/regex/regex.h
@@ -39,7 +39,6 @@
 #include "core/vector.h"
 
 class RegExMatch : public Reference {
-
 	GDCLASS(RegExMatch, Reference);
 
 	struct Range {
@@ -70,7 +69,6 @@ public:
 };
 
 class RegEx : public Reference {
-
 	GDCLASS(RegEx, Reference);
 
 	void *general_ctx;
diff --git a/modules/regex/register_types.cpp b/modules/regex/register_types.cpp
index 77b19fa8f0..5d4aeba2d7 100644
--- a/modules/regex/register_types.cpp
+++ b/modules/regex/register_types.cpp
@@ -33,7 +33,6 @@
 #include "regex.h"
 
 void register_regex_types() {
-
 	ClassDB::register_class<RegExMatch>();
 	ClassDB::register_class<RegEx>();
 }
diff --git a/modules/regex/register_types.h b/modules/regex/register_types.h
index 99a6bbeb2c..cf377cdf5f 100644
--- a/modules/regex/register_types.h
+++ b/modules/regex/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef REGEX_REGISTER_TYPES_H
+#define REGEX_REGISTER_TYPES_H
+
 void register_regex_types();
 void unregister_regex_types();
+
+#endif // REGEX_REGISTER_TYPES_H
diff --git a/modules/register_module_types.h b/modules/register_module_types.h
index a8eb68b929..acd9fc7c97 100644
--- a/modules/register_module_types.h
+++ b/modules/register_module_types.h
@@ -31,9 +31,8 @@
 #ifndef REGISTER_MODULE_TYPES_H
 #define REGISTER_MODULE_TYPES_H
 
-//
-
+void preregister_module_types();
 void register_module_types();
 void unregister_module_types();
 
-#endif
+#endif // REGISTER_MODULE_TYPES_H
diff --git a/modules/squish/SCsub b/modules/squish/SCsub
index 15320bcd0c..b31032403f 100644
--- a/modules/squish/SCsub
+++ b/modules/squish/SCsub
@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_squish = env_modules.Clone()
 
 # Thirdparty source files
-if env['builtin_squish']:
+if env["builtin_squish"]:
     thirdparty_dir = "#thirdparty/squish/"
     thirdparty_sources = [
         "alpha.cpp",
diff --git a/modules/squish/config.py b/modules/squish/config.py
index 1c8cd12a2d..d22f9454ed 100644
--- a/modules/squish/config.py
+++ b/modules/squish/config.py
@@ -1,5 +1,6 @@
 def can_build(env, platform):
     return True
 
+
 def configure(env):
     pass
diff --git a/modules/squish/image_compress_squish.cpp b/modules/squish/image_compress_squish.cpp
index 58b8115dfc..c510779317 100644
--- a/modules/squish/image_compress_squish.cpp
+++ b/modules/squish/image_compress_squish.cpp
@@ -37,20 +37,20 @@ void image_decompress_squish(Image *p_image) {
 	int h = p_image->get_height();
 
 	Image::Format target_format = Image::FORMAT_RGBA8;
-	PoolVector<uint8_t> data;
+	Vector<uint8_t> data;
 	int target_size = Image::get_image_data_size(w, h, target_format, p_image->has_mipmaps());
 	int mm_count = p_image->get_mipmap_count();
 	data.resize(target_size);
 
-	PoolVector<uint8_t>::Read rb = p_image->get_data().read();
-	PoolVector<uint8_t>::Write wb = data.write();
+	const uint8_t *rb = p_image->get_data().ptr();
+	uint8_t *wb = data.ptrw();
 
 	int squish_flags = Image::FORMAT_MAX;
 	if (p_image->get_format() == Image::FORMAT_DXT1) {
 		squish_flags = squish::kDxt1;
 	} else if (p_image->get_format() == Image::FORMAT_DXT3) {
 		squish_flags = squish::kDxt3;
-	} else if (p_image->get_format() == Image::FORMAT_DXT5) {
+	} else if (p_image->get_format() == Image::FORMAT_DXT5 || p_image->get_format() == Image::FORMAT_DXT5_RA_AS_RG) {
 		squish_flags = squish::kDxt5;
 	} else if (p_image->get_format() == Image::FORMAT_RGTC_R) {
 		squish_flags = squish::kBc4;
@@ -71,97 +71,55 @@ void image_decompress_squish(Image *p_image) {
 	}
 
 	p_image->create(p_image->get_width(), p_image->get_height(), p_image->has_mipmaps(), target_format, data);
-}
 
-void image_compress_squish(Image *p_image, float p_lossy_quality, Image::CompressSource p_source) {
+	if (p_image->get_format() == Image::FORMAT_DXT5_RA_AS_RG) {
+		p_image->convert_ra_rgba8_to_rg();
+	}
+}
 
-	if (p_image->get_format() >= Image::FORMAT_DXT1)
+void image_compress_squish(Image *p_image, float p_lossy_quality, Image::UsedChannels p_channels) {
+	if (p_image->get_format() >= Image::FORMAT_DXT1) {
 		return; //do not compress, already compressed
+	}
 
 	int w = p_image->get_width();
 	int h = p_image->get_height();
 
 	if (p_image->get_format() <= Image::FORMAT_RGBA8) {
-
 		int squish_comp = squish::kColourRangeFit;
 
-		if (p_lossy_quality > 0.85)
+		if (p_lossy_quality > 0.85) {
 			squish_comp = squish::kColourIterativeClusterFit;
-		else if (p_lossy_quality > 0.75)
+		} else if (p_lossy_quality > 0.75) {
 			squish_comp = squish::kColourClusterFit;
+		}
 
 		Image::Format target_format = Image::FORMAT_RGBA8;
 
-		Image::DetectChannels dc = p_image->get_detected_channels();
-
-		if (p_source == Image::COMPRESS_SOURCE_LAYERED) {
-			//keep what comes in
-			switch (p_image->get_format()) {
-				case Image::FORMAT_L8: {
-					dc = Image::DETECTED_L;
-				} break;
-				case Image::FORMAT_LA8: {
-					dc = Image::DETECTED_LA;
-				} break;
-				case Image::FORMAT_R8: {
-					dc = Image::DETECTED_R;
-				} break;
-				case Image::FORMAT_RG8: {
-					dc = Image::DETECTED_RG;
-				} break;
-				case Image::FORMAT_RGB8: {
-					dc = Image::DETECTED_RGB;
-				} break;
-				case Image::FORMAT_RGBA8:
-				case Image::FORMAT_RGBA4444:
-				case Image::FORMAT_RGBA5551: {
-					dc = Image::DETECTED_RGBA;
-				} break;
-				default: {
-				}
-			}
-		}
-
 		p_image->convert(Image::FORMAT_RGBA8); //still uses RGBA to convert
 
-		if (p_source == Image::COMPRESS_SOURCE_SRGB && (dc == Image::DETECTED_R || dc == Image::DETECTED_RG)) {
-			//R and RG do not support SRGB
-			dc = Image::DETECTED_RGB;
-		}
-
-		if (p_source == Image::COMPRESS_SOURCE_NORMAL) {
-			//R and RG do not support SRGB
-			dc = Image::DETECTED_RG;
-		}
-
-		switch (dc) {
-			case Image::DETECTED_L: {
-
+		switch (p_channels) {
+			case Image::USED_CHANNELS_L: {
 				target_format = Image::FORMAT_DXT1;
 				squish_comp |= squish::kDxt1;
 			} break;
-			case Image::DETECTED_LA: {
-
+			case Image::USED_CHANNELS_LA: {
 				target_format = Image::FORMAT_DXT5;
 				squish_comp |= squish::kDxt5;
 			} break;
-			case Image::DETECTED_R: {
-
+			case Image::USED_CHANNELS_R: {
 				target_format = Image::FORMAT_RGTC_R;
 				squish_comp |= squish::kBc4;
 			} break;
-			case Image::DETECTED_RG: {
-
+			case Image::USED_CHANNELS_RG: {
 				target_format = Image::FORMAT_RGTC_RG;
 				squish_comp |= squish::kBc5;
 			} break;
-			case Image::DETECTED_RGB: {
-
+			case Image::USED_CHANNELS_RGB: {
 				target_format = Image::FORMAT_DXT1;
 				squish_comp |= squish::kDxt1;
 			} break;
-			case Image::DETECTED_RGBA: {
-
+			case Image::USED_CHANNELS_RGBA: {
 				//TODO, should convert both, then measure which one does a better job
 				target_format = Image::FORMAT_DXT5;
 				squish_comp |= squish::kDxt5;
@@ -173,19 +131,18 @@ void image_compress_squish(Image *p_image, float p_lossy_quality, Image::Compres
 			}
 		}
 
-		PoolVector<uint8_t> data;
+		Vector<uint8_t> data;
 		int target_size = Image::get_image_data_size(w, h, target_format, p_image->has_mipmaps());
 		int mm_count = p_image->has_mipmaps() ? Image::get_image_required_mipmaps(w, h, target_format) : 0;
 		data.resize(target_size);
 		int shift = Image::get_format_pixel_rshift(target_format);
 
-		PoolVector<uint8_t>::Read rb = p_image->get_data().read();
-		PoolVector<uint8_t>::Write wb = data.write();
+		const uint8_t *rb = p_image->get_data().ptr();
+		uint8_t *wb = data.ptrw();
 
 		int dst_ofs = 0;
 
 		for (int i = 0; i <= mm_count; i++) {
-
 			int bw = w % 4 != 0 ? w + (4 - w % 4) : w;
 			int bh = h % 4 != 0 ? h + (4 - h % 4) : h;
 
@@ -196,9 +153,6 @@ void image_compress_squish(Image *p_image, float p_lossy_quality, Image::Compres
 			h = MAX(h / 2, 1);
 		}
 
-		rb.release();
-		wb.release();
-
 		p_image->create(p_image->get_width(), p_image->get_height(), p_image->has_mipmaps(), target_format, data);
 	}
 }
diff --git a/modules/squish/image_compress_squish.h b/modules/squish/image_compress_squish.h
index b5a209ceb9..19e6d57474 100644
--- a/modules/squish/image_compress_squish.h
+++ b/modules/squish/image_compress_squish.h
@@ -33,7 +33,7 @@
 
 #include "core/image.h"
 
-void image_compress_squish(Image *p_image, float p_lossy_quality, Image::CompressSource p_source);
+void image_compress_squish(Image *p_image, float p_lossy_quality, Image::UsedChannels p_channels);
 void image_decompress_squish(Image *p_image);
 
 #endif // IMAGE_COMPRESS_SQUISH_H
diff --git a/modules/squish/register_types.cpp b/modules/squish/register_types.cpp
index 2a0cf82b56..ad28aff058 100644
--- a/modules/squish/register_types.cpp
+++ b/modules/squish/register_types.cpp
@@ -32,7 +32,6 @@
 #include "image_compress_squish.h"
 
 void register_squish_types() {
-
 	Image::set_compress_bc_func(image_compress_squish);
 	Image::_image_decompress_bc = image_decompress_squish;
 }
diff --git a/modules/squish/register_types.h b/modules/squish/register_types.h
index 0845e2b500..ab56c54d4a 100644
--- a/modules/squish/register_types.h
+++ b/modules/squish/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef SQUISH_REGISTER_TYPES_H
+#define SQUISH_REGISTER_TYPES_H
+
 void register_squish_types();
 void unregister_squish_types();
+
+#endif // SQUISH_REGISTER_TYPES_H
diff --git a/modules/stb_vorbis/SCsub b/modules/stb_vorbis/SCsub
index d14939a3b1..266c87c802 100644
--- a/modules/stb_vorbis/SCsub
+++ b/modules/stb_vorbis/SCsub
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_stb_vorbis = env_modules.Clone()
 
diff --git a/modules/stb_vorbis/audio_stream_ogg_vorbis.cpp b/modules/stb_vorbis/audio_stream_ogg_vorbis.cpp
index b80b126bde..346833ab9c 100644
--- a/modules/stb_vorbis/audio_stream_ogg_vorbis.cpp
+++ b/modules/stb_vorbis/audio_stream_ogg_vorbis.cpp
@@ -33,7 +33,6 @@
 #include "core/os/file_access.h"
 
 void AudioStreamPlaybackOGGVorbis::_mix_internal(AudioFrame *p_buffer, int p_frames) {
-
 	ERR_FAIL_COND(!active);
 
 	int todo = p_frames;
@@ -57,7 +56,8 @@ void AudioStreamPlaybackOGGVorbis::_mix_internal(AudioFrame *p_buffer, int p_fra
 
 		if (todo) {
 			//end of file!
-			if (vorbis_stream->loop) {
+			bool is_not_empty = mixed > 0 || stb_vorbis_stream_length_in_samples(ogg_stream) > 0;
+			if (vorbis_stream->loop && is_not_empty) {
 				//loop
 				seek(vorbis_stream->loop_offset);
 				loops++;
@@ -75,12 +75,10 @@ void AudioStreamPlaybackOGGVorbis::_mix_internal(AudioFrame *p_buffer, int p_fra
 }
 
 float AudioStreamPlaybackOGGVorbis::get_stream_sampling_rate() {
-
 	return vorbis_stream->sample_rate;
 }
 
 void AudioStreamPlaybackOGGVorbis::start(float p_from_pos) {
-
 	active = true;
 	seek(p_from_pos);
 	loops = 0;
@@ -88,27 +86,25 @@ void AudioStreamPlaybackOGGVorbis::start(float p_from_pos) {
 }
 
 void AudioStreamPlaybackOGGVorbis::stop() {
-
 	active = false;
 }
-bool AudioStreamPlaybackOGGVorbis::is_playing() const {
 
+bool AudioStreamPlaybackOGGVorbis::is_playing() const {
 	return active;
 }
 
 int AudioStreamPlaybackOGGVorbis::get_loop_count() const {
-
 	return loops;
 }
 
 float AudioStreamPlaybackOGGVorbis::get_playback_position() const {
-
 	return float(frames_mixed) / vorbis_stream->sample_rate;
 }
-void AudioStreamPlaybackOGGVorbis::seek(float p_time) {
 
-	if (!active)
+void AudioStreamPlaybackOGGVorbis::seek(float p_time) {
+	if (!active) {
 		return;
+	}
 
 	if (p_time >= vorbis_stream->get_length()) {
 		p_time = 0;
@@ -121,19 +117,18 @@ void AudioStreamPlaybackOGGVorbis::seek(float p_time) {
 AudioStreamPlaybackOGGVorbis::~AudioStreamPlaybackOGGVorbis() {
 	if (ogg_alloc.alloc_buffer) {
 		stb_vorbis_close(ogg_stream);
-		AudioServer::get_singleton()->audio_data_free(ogg_alloc.alloc_buffer);
+		memfree(ogg_alloc.alloc_buffer);
 	}
 }
 
 Ref<AudioStreamPlayback> AudioStreamOGGVorbis::instance_playback() {
-
 	Ref<AudioStreamPlaybackOGGVorbis> ovs;
 
-	ERR_FAIL_COND_V(data == NULL, ovs);
+	ERR_FAIL_COND_V(data == nullptr, ovs);
 
 	ovs.instance();
 	ovs->vorbis_stream = Ref<AudioStreamOGGVorbis>(this);
-	ovs->ogg_alloc.alloc_buffer = (char *)AudioServer::get_singleton()->audio_data_alloc(decode_mem_size);
+	ovs->ogg_alloc.alloc_buffer = (char *)memalloc(decode_mem_size);
 	ovs->ogg_alloc.alloc_buffer_length_in_bytes = decode_mem_size;
 	ovs->frames_mixed = 0;
 	ovs->active = false;
@@ -141,9 +136,8 @@ Ref<AudioStreamPlayback> AudioStreamOGGVorbis::instance_playback() {
 	int error;
 	ovs->ogg_stream = stb_vorbis_open_memory((const unsigned char *)data, data_len, &error, &ovs->ogg_alloc);
 	if (!ovs->ogg_stream) {
-
-		AudioServer::get_singleton()->audio_data_free(ovs->ogg_alloc.alloc_buffer);
-		ovs->ogg_alloc.alloc_buffer = NULL;
+		memfree(ovs->ogg_alloc.alloc_buffer);
+		ovs->ogg_alloc.alloc_buffer = nullptr;
 		ERR_FAIL_COND_V(!ovs->ogg_stream, Ref<AudioStreamPlaybackOGGVorbis>());
 	}
 
@@ -151,49 +145,46 @@ Ref<AudioStreamPlayback> AudioStreamOGGVorbis::instance_playback() {
 }
 
 String AudioStreamOGGVorbis::get_stream_name() const {
-
 	return ""; //return stream_name;
 }
 
 void AudioStreamOGGVorbis::clear_data() {
 	if (data) {
-		AudioServer::get_singleton()->audio_data_free(data);
-		data = NULL;
+		memfree(data);
+		data = nullptr;
 		data_len = 0;
 	}
 }
 
-void AudioStreamOGGVorbis::set_data(const PoolVector<uint8_t> &p_data) {
-
+void AudioStreamOGGVorbis::set_data(const Vector<uint8_t> &p_data) {
 	int src_data_len = p_data.size();
-#define MAX_TEST_MEM (1 << 20)
-
 	uint32_t alloc_try = 1024;
-	PoolVector<char> alloc_mem;
-	PoolVector<char>::Write w;
-	stb_vorbis *ogg_stream = NULL;
+	Vector<char> alloc_mem;
+	char *w;
+	stb_vorbis *ogg_stream = nullptr;
 	stb_vorbis_alloc ogg_alloc;
 
-	while (alloc_try < MAX_TEST_MEM) {
+	// Vorbis comments may be up to UINT32_MAX, but that's arguably pretty rare.
+	// Let's go with 2^30 so we don't risk going out of bounds.
+	const uint32_t MAX_TEST_MEM = 1 << 30;
 
+	while (alloc_try < MAX_TEST_MEM) {
 		alloc_mem.resize(alloc_try);
-		w = alloc_mem.write();
+		w = alloc_mem.ptrw();
 
-		ogg_alloc.alloc_buffer = w.ptr();
+		ogg_alloc.alloc_buffer = w;
 		ogg_alloc.alloc_buffer_length_in_bytes = alloc_try;
 
-		PoolVector<uint8_t>::Read src_datar = p_data.read();
+		const uint8_t *src_datar = p_data.ptr();
 
 		int error;
-		ogg_stream = stb_vorbis_open_memory((const unsigned char *)src_datar.ptr(), src_data_len, &error, &ogg_alloc);
+		ogg_stream = stb_vorbis_open_memory((const unsigned char *)src_datar, src_data_len, &error, &ogg_alloc);
 
 		if (!ogg_stream && error == VORBIS_outofmem) {
-			w.release();
 			alloc_try *= 2;
 		} else {
-
 			ERR_FAIL_COND(alloc_try == MAX_TEST_MEM);
-			ERR_FAIL_COND(ogg_stream == NULL);
+			ERR_FAIL_COND(ogg_stream == nullptr);
 
 			stb_vorbis_info info = stb_vorbis_get_info(ogg_stream);
 
@@ -209,23 +200,25 @@ void AudioStreamOGGVorbis::set_data(const PoolVector<uint8_t> &p_data) {
 			// free any existing data
 			clear_data();
 
-			data = AudioServer::get_singleton()->audio_data_alloc(src_data_len, src_datar.ptr());
+			data = memalloc(src_data_len);
+			copymem(data, src_datar, src_data_len);
 			data_len = src_data_len;
 
 			break;
 		}
 	}
-}
 
-PoolVector<uint8_t> AudioStreamOGGVorbis::get_data() const {
+	ERR_FAIL_COND_MSG(alloc_try == MAX_TEST_MEM, vformat("Couldn't set vorbis data even with an alloc buffer of %d bytes, report bug.", MAX_TEST_MEM));
+}
 
-	PoolVector<uint8_t> vdata;
+Vector<uint8_t> AudioStreamOGGVorbis::get_data() const {
+	Vector<uint8_t> vdata;
 
 	if (data_len && data) {
 		vdata.resize(data_len);
 		{
-			PoolVector<uint8_t>::Write w = vdata.write();
-			copymem(w.ptr(), data, data_len);
+			uint8_t *w = vdata.ptrw();
+			copymem(w, data, data_len);
 		}
 	}
 
@@ -237,7 +230,6 @@ void AudioStreamOGGVorbis::set_loop(bool p_enable) {
 }
 
 bool AudioStreamOGGVorbis::has_loop() const {
-
 	return loop;
 }
 
@@ -250,12 +242,10 @@ float AudioStreamOGGVorbis::get_loop_offset() const {
 }
 
 float AudioStreamOGGVorbis::get_length() const {
-
 	return length;
 }
 
 void AudioStreamOGGVorbis::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_data", "data"), &AudioStreamOGGVorbis::set_data);
 	ClassDB::bind_method(D_METHOD("get_data"), &AudioStreamOGGVorbis::get_data);
 
@@ -265,14 +255,13 @@ void AudioStreamOGGVorbis::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_loop_offset", "seconds"), &AudioStreamOGGVorbis::set_loop_offset);
 	ClassDB::bind_method(D_METHOD("get_loop_offset"), &AudioStreamOGGVorbis::get_loop_offset);
 
-	ADD_PROPERTY(PropertyInfo(Variant::POOL_BYTE_ARRAY, "data", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_data", "get_data");
+	ADD_PROPERTY(PropertyInfo(Variant::PACKED_BYTE_ARRAY, "data", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_data", "get_data");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "loop"), "set_loop", "has_loop");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "loop_offset"), "set_loop_offset", "get_loop_offset");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "loop_offset"), "set_loop_offset", "get_loop_offset");
 }
 
 AudioStreamOGGVorbis::AudioStreamOGGVorbis() {
-
-	data = NULL;
+	data = nullptr;
 	data_len = 0;
 	length = 0;
 	sample_rate = 1;
diff --git a/modules/stb_vorbis/audio_stream_ogg_vorbis.h b/modules/stb_vorbis/audio_stream_ogg_vorbis.h
index e909759acb..5070f2a078 100644
--- a/modules/stb_vorbis/audio_stream_ogg_vorbis.h
+++ b/modules/stb_vorbis/audio_stream_ogg_vorbis.h
@@ -39,7 +39,6 @@
 class AudioStreamOGGVorbis;
 
 class AudioStreamPlaybackOGGVorbis : public AudioStreamPlaybackResampled {
-
 	GDCLASS(AudioStreamPlaybackOGGVorbis, AudioStreamPlaybackResampled);
 
 	stb_vorbis *ogg_stream;
@@ -53,25 +52,24 @@ class AudioStreamPlaybackOGGVorbis : public AudioStreamPlaybackResampled {
 	Ref<AudioStreamOGGVorbis> vorbis_stream;
 
 protected:
-	virtual void _mix_internal(AudioFrame *p_buffer, int p_frames);
-	virtual float get_stream_sampling_rate();
+	virtual void _mix_internal(AudioFrame *p_buffer, int p_frames) override;
+	virtual float get_stream_sampling_rate() override;
 
 public:
-	virtual void start(float p_from_pos = 0.0);
-	virtual void stop();
-	virtual bool is_playing() const;
+	virtual void start(float p_from_pos = 0.0) override;
+	virtual void stop() override;
+	virtual bool is_playing() const override;
 
-	virtual int get_loop_count() const; //times it looped
+	virtual int get_loop_count() const override; //times it looped
 
-	virtual float get_playback_position() const;
-	virtual void seek(float p_time);
+	virtual float get_playback_position() const override;
+	virtual void seek(float p_time) override;
 
 	AudioStreamPlaybackOGGVorbis() {}
 	~AudioStreamPlaybackOGGVorbis();
 };
 
 class AudioStreamOGGVorbis : public AudioStream {
-
 	GDCLASS(AudioStreamOGGVorbis, AudioStream);
 	OBJ_SAVE_TYPE(AudioStream); // Saves derived classes with common type so they can be interchanged.
 	RES_BASE_EXTENSION("oggstr");
@@ -99,13 +97,13 @@ public:
 	void set_loop_offset(float p_seconds);
 	float get_loop_offset() const;
 
-	virtual Ref<AudioStreamPlayback> instance_playback();
-	virtual String get_stream_name() const;
+	virtual Ref<AudioStreamPlayback> instance_playback() override;
+	virtual String get_stream_name() const override;
 
-	void set_data(const PoolVector<uint8_t> &p_data);
-	PoolVector<uint8_t> get_data() const;
+	void set_data(const Vector<uint8_t> &p_data);
+	Vector<uint8_t> get_data() const;
 
-	virtual float get_length() const; //if supported, otherwise return 0
+	virtual float get_length() const override; //if supported, otherwise return 0
 
 	AudioStreamOGGVorbis();
 	virtual ~AudioStreamOGGVorbis();
diff --git a/modules/stb_vorbis/config.py b/modules/stb_vorbis/config.py
index 200b8dfd50..1eb0a8cf33 100644
--- a/modules/stb_vorbis/config.py
+++ b/modules/stb_vorbis/config.py
@@ -1,13 +1,16 @@
 def can_build(env, platform):
     return True
 
+
 def configure(env):
     pass
 
+
 def get_doc_classes():
     return [
         "AudioStreamOGGVorbis",
     ]
 
+
 def get_doc_path():
     return "doc_classes"
diff --git a/modules/stb_vorbis/doc_classes/AudioStreamOGGVorbis.xml b/modules/stb_vorbis/doc_classes/AudioStreamOGGVorbis.xml
index 38d3bd5468..8a1bb62e24 100644
--- a/modules/stb_vorbis/doc_classes/AudioStreamOGGVorbis.xml
+++ b/modules/stb_vorbis/doc_classes/AudioStreamOGGVorbis.xml
@@ -11,7 +11,7 @@
 	<methods>
 	</methods>
 	<members>
-		<member name="data" type="PoolByteArray" setter="set_data" getter="get_data" default="PoolByteArray(  )">
+		<member name="data" type="PackedByteArray" setter="set_data" getter="get_data" default="PackedByteArray(  )">
 			Contains the audio data in bytes.
 		</member>
 		<member name="loop" type="bool" setter="set_loop" getter="has_loop" default="false">
diff --git a/modules/stb_vorbis/register_types.cpp b/modules/stb_vorbis/register_types.cpp
index ac2612bd6a..6669d30278 100644
--- a/modules/stb_vorbis/register_types.cpp
+++ b/modules/stb_vorbis/register_types.cpp
@@ -38,7 +38,6 @@
 #endif
 
 void register_stb_vorbis_types() {
-
 #ifdef TOOLS_ENABLED
 	if (Engine::get_singleton()->is_editor_hint()) {
 		Ref<ResourceImporterOGGVorbis> ogg_import;
diff --git a/modules/stb_vorbis/register_types.h b/modules/stb_vorbis/register_types.h
index f6147abd01..f5a1dd31bc 100644
--- a/modules/stb_vorbis/register_types.h
+++ b/modules/stb_vorbis/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef STB_VORBIS_REGISTER_TYPES_H
+#define STB_VORBIS_REGISTER_TYPES_H
+
 void register_stb_vorbis_types();
 void unregister_stb_vorbis_types();
+
+#endif // STB_VORBIS_REGISTER_TYPES_H
diff --git a/modules/stb_vorbis/resource_importer_ogg_vorbis.cpp b/modules/stb_vorbis/resource_importer_ogg_vorbis.cpp
index 06399f4005..d68d050d34 100644
--- a/modules/stb_vorbis/resource_importer_ogg_vorbis.cpp
+++ b/modules/stb_vorbis/resource_importer_ogg_vorbis.cpp
@@ -35,16 +35,14 @@
 #include "scene/resources/texture.h"
 
 String ResourceImporterOGGVorbis::get_importer_name() const {
-
 	return "ogg_vorbis";
 }
 
 String ResourceImporterOGGVorbis::get_visible_name() const {
-
 	return "OGGVorbis";
 }
-void ResourceImporterOGGVorbis::get_recognized_extensions(List<String> *p_extensions) const {
 
+void ResourceImporterOGGVorbis::get_recognized_extensions(List<String> *p_extensions) const {
 	p_extensions->push_back("ogg");
 }
 
@@ -53,31 +51,27 @@ String ResourceImporterOGGVorbis::get_save_extension() const {
 }
 
 String ResourceImporterOGGVorbis::get_resource_type() const {
-
 	return "AudioStreamOGGVorbis";
 }
 
 bool ResourceImporterOGGVorbis::get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const {
-
 	return true;
 }
 
 int ResourceImporterOGGVorbis::get_preset_count() const {
 	return 0;
 }
-String ResourceImporterOGGVorbis::get_preset_name(int p_idx) const {
 
+String ResourceImporterOGGVorbis::get_preset_name(int p_idx) const {
 	return String();
 }
 
 void ResourceImporterOGGVorbis::get_import_options(List<ImportOption> *r_options, int p_preset) const {
-
 	r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "loop"), true));
-	r_options->push_back(ImportOption(PropertyInfo(Variant::REAL, "loop_offset"), 0));
+	r_options->push_back(ImportOption(PropertyInfo(Variant::FLOAT, "loop_offset"), 0));
 }
 
 Error ResourceImporterOGGVorbis::import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files, Variant *r_metadata) {
-
 	bool loop = p_options["loop"];
 	float loop_offset = p_options["loop_offset"];
 
@@ -87,11 +81,11 @@ Error ResourceImporterOGGVorbis::import(const String &p_source_file, const Strin
 
 	size_t len = f->get_len();
 
-	PoolVector<uint8_t> data;
+	Vector<uint8_t> data;
 	data.resize(len);
-	PoolVector<uint8_t>::Write w = data.write();
+	uint8_t *w = data.ptrw();
 
-	f->get_buffer(w.ptr(), len);
+	f->get_buffer(w, len);
 
 	memdelete(f);
 
diff --git a/modules/stb_vorbis/resource_importer_ogg_vorbis.h b/modules/stb_vorbis/resource_importer_ogg_vorbis.h
index 43541bcf3c..47f0039328 100644
--- a/modules/stb_vorbis/resource_importer_ogg_vorbis.h
+++ b/modules/stb_vorbis/resource_importer_ogg_vorbis.h
@@ -38,19 +38,19 @@ class ResourceImporterOGGVorbis : public ResourceImporter {
 	GDCLASS(ResourceImporterOGGVorbis, ResourceImporter);
 
 public:
-	virtual String get_importer_name() const;
-	virtual String get_visible_name() const;
-	virtual void get_recognized_extensions(List<String> *p_extensions) const;
-	virtual String get_save_extension() const;
-	virtual String get_resource_type() const;
+	virtual String get_importer_name() const override;
+	virtual String get_visible_name() const override;
+	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
+	virtual String get_save_extension() const override;
+	virtual String get_resource_type() const override;
 
-	virtual int get_preset_count() const;
-	virtual String get_preset_name(int p_idx) const;
+	virtual int get_preset_count() const override;
+	virtual String get_preset_name(int p_idx) const override;
 
-	virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const;
-	virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const;
+	virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const override;
+	virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const override;
 
-	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = NULL, Variant *r_metadata = NULL);
+	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr) override;
 
 	ResourceImporterOGGVorbis();
 };
diff --git a/modules/svg/SCsub b/modules/svg/SCsub
index 9324c1634b..0bfba34fe5 100644
--- a/modules/svg/SCsub
+++ b/modules/svg/SCsub
@@ -1,22 +1,18 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_svg = env_modules.Clone()
 
 # Thirdparty source files
 thirdparty_dir = "#thirdparty/nanosvg/"
 thirdparty_sources = [
-		"nanosvg.cc"
+    "nanosvg.cc",
 ]
 thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
 env_svg.Prepend(CPPPATH=[thirdparty_dir])
-# FIXME: Needed in editor/editor_themes.cpp for now, but ideally there
-# shouldn't be a dependency on modules/ and its own 3rd party deps.
-env.Prepend(CPPPATH=[thirdparty_dir])
-env.Append(CPPDEFINES=["SVG_ENABLED"])
 
 env_thirdparty = env_svg.Clone()
 env_thirdparty.disable_warnings()
diff --git a/modules/svg/config.py b/modules/svg/config.py
index 1c8cd12a2d..d22f9454ed 100644
--- a/modules/svg/config.py
+++ b/modules/svg/config.py
@@ -1,5 +1,6 @@
 def can_build(env, platform):
     return True
 
+
 def configure(env):
     pass
diff --git a/modules/svg/image_loader_svg.cpp b/modules/svg/image_loader_svg.cpp
index 11ae2f81bf..8ca4452ac9 100644
--- a/modules/svg/image_loader_svg.cpp
+++ b/modules/svg/image_loader_svg.cpp
@@ -30,9 +30,8 @@
 
 #include "image_loader_svg.h"
 
-#include "core/os/os.h"
-#include "core/print_string.h"
-#include "core/ustring.h"
+#include <nanosvg.h>
+#include <nanosvgrast.h>
 
 void SVGRasterizer::rasterize(NSVGimage *p_image, float p_tx, float p_ty, float p_scale, unsigned char *p_dst, int p_w, int p_h, int p_stride) {
 	nsvgRasterize(rasterizer, p_image, p_tx, p_ty, p_scale, p_dst, p_w, p_h, p_stride);
@@ -41,6 +40,7 @@ void SVGRasterizer::rasterize(NSVGimage *p_image, float p_tx, float p_ty, float
 SVGRasterizer::SVGRasterizer() {
 	rasterizer = nsvgCreateRasterizer();
 }
+
 SVGRasterizer::~SVGRasterizer() {
 	nsvgDeleteRasterizer(rasterizer);
 }
@@ -48,7 +48,6 @@ SVGRasterizer::~SVGRasterizer() {
 SVGRasterizer ImageLoaderSVG::rasterizer;
 
 inline void change_nsvg_paint_color(NSVGpaint *p_paint, const uint32_t p_old, const uint32_t p_new) {
-
 	if (p_paint->type == NSVG_PAINT_COLOR) {
 		if (p_paint->color << 8 == p_old << 8) {
 			p_paint->color = (p_paint->color & 0xFF000000) | (p_new & 0x00FFFFFF);
@@ -65,9 +64,7 @@ inline void change_nsvg_paint_color(NSVGpaint *p_paint, const uint32_t p_old, co
 }
 
 void ImageLoaderSVG::_convert_colors(NSVGimage *p_svg_image) {
-
-	for (NSVGshape *shape = p_svg_image->shapes; shape != NULL; shape = shape->next) {
-
+	for (NSVGshape *shape = p_svg_image->shapes; shape != nullptr; shape = shape->next) {
 		for (int i = 0; i < replace_colors.old_colors.size(); i++) {
 			change_nsvg_paint_color(&(shape->stroke), replace_colors.old_colors[i], replace_colors.new_colors[i]);
 			change_nsvg_paint_color(&(shape->fill), replace_colors.old_colors[i], replace_colors.new_colors[i]);
@@ -76,7 +73,6 @@ void ImageLoaderSVG::_convert_colors(NSVGimage *p_svg_image) {
 }
 
 void ImageLoaderSVG::set_convert_colors(Dictionary *p_replace_color) {
-
 	if (p_replace_color) {
 		Dictionary replace_color = *p_replace_color;
 		for (int i = 0; i < replace_color.keys().size(); i++) {
@@ -95,11 +91,11 @@ void ImageLoaderSVG::set_convert_colors(Dictionary *p_replace_color) {
 	}
 }
 
-Error ImageLoaderSVG::_create_image(Ref<Image> p_image, const PoolVector<uint8_t> *p_data, float p_scale, bool upsample, bool convert_colors) {
+Error ImageLoaderSVG::_create_image(Ref<Image> p_image, const Vector<uint8_t> *p_data, float p_scale, bool upsample, bool convert_colors) {
 	NSVGimage *svg_image;
-	PoolVector<uint8_t>::Read src_r = p_data->read();
-	svg_image = nsvgParse((char *)src_r.ptr(), "px", 96);
-	if (svg_image == NULL) {
+	const uint8_t *src_r = p_data->ptr();
+	svg_image = nsvgParse((char *)src_r, "px", 96);
+	if (svg_image == nullptr) {
 		ERR_PRINT("SVG Corrupted");
 		return ERR_FILE_CORRUPT;
 	}
@@ -116,14 +112,13 @@ Error ImageLoaderSVG::_create_image(Ref<Image> p_image, const PoolVector<uint8_t
 	const int h = (int)(svg_image->height * p_scale * upscale);
 	ERR_FAIL_COND_V_MSG(h > Image::MAX_HEIGHT, ERR_PARAMETER_RANGE_ERROR, vformat("Can't create image from SVG with scale %s, the resulting image size exceeds max height.", rtos(p_scale)));
 
-	PoolVector<uint8_t> dst_image;
+	Vector<uint8_t> dst_image;
 	dst_image.resize(w * h * 4);
 
-	PoolVector<uint8_t>::Write dw = dst_image.write();
+	uint8_t *dw = dst_image.ptrw();
 
-	rasterizer.rasterize(svg_image, 0, 0, p_scale * upscale, (unsigned char *)dw.ptr(), w, h, w * 4);
+	rasterizer.rasterize(svg_image, 0, 0, p_scale * upscale, (unsigned char *)dw, w, h, w * 4);
 
-	dw.release();
 	p_image->create(w, h, false, Image::FORMAT_RGBA8, dst_image);
 	if (upsample) {
 		p_image->shrink_x2();
@@ -135,30 +130,27 @@ Error ImageLoaderSVG::_create_image(Ref<Image> p_image, const PoolVector<uint8_t
 }
 
 Error ImageLoaderSVG::create_image_from_string(Ref<Image> p_image, const char *p_svg_str, float p_scale, bool upsample, bool convert_colors) {
-
 	size_t str_len = strlen(p_svg_str);
-	PoolVector<uint8_t> src_data;
+	Vector<uint8_t> src_data;
 	src_data.resize(str_len + 1);
-	PoolVector<uint8_t>::Write src_w = src_data.write();
-	memcpy(src_w.ptr(), p_svg_str, str_len + 1);
+	uint8_t *src_w = src_data.ptrw();
+	memcpy(src_w, p_svg_str, str_len + 1);
 
 	return _create_image(p_image, &src_data, p_scale, upsample, convert_colors);
 }
 
 Error ImageLoaderSVG::load_image(Ref<Image> p_image, FileAccess *f, bool p_force_linear, float p_scale) {
-
 	uint32_t size = f->get_len();
-	PoolVector<uint8_t> src_image;
+	Vector<uint8_t> src_image;
 	src_image.resize(size + 1);
-	PoolVector<uint8_t>::Write src_w = src_image.write();
-	f->get_buffer(src_w.ptr(), size);
-	src_w.ptr()[size] = '\0';
+	uint8_t *src_w = src_image.ptrw();
+	f->get_buffer(src_w, size);
+	src_w[size] = '\0';
 
 	return _create_image(p_image, &src_image, p_scale, 1.0);
 }
 
 void ImageLoaderSVG::get_recognized_extensions(List<String> *p_extensions) const {
-
 	p_extensions->push_back("svg");
 	p_extensions->push_back("svgz");
 }
diff --git a/modules/svg/image_loader_svg.h b/modules/svg/image_loader_svg.h
index 9e9366e91b..ecaba5052b 100644
--- a/modules/svg/image_loader_svg.h
+++ b/modules/svg/image_loader_svg.h
@@ -34,15 +34,15 @@
 #include "core/io/image_loader.h"
 #include "core/ustring.h"
 
-#include <nanosvg.h>
-#include <nanosvgrast.h>
-
 /**
 	@author Daniel Ramirez <djrmuv@gmail.com>
 */
 
-class SVGRasterizer {
+// Forward declare and include thirdparty headers in .cpp.
+struct NSVGrasterizer;
+struct NSVGimage;
 
+class SVGRasterizer {
 	NSVGrasterizer *rasterizer;
 
 public:
@@ -59,10 +59,10 @@ class ImageLoaderSVG : public ImageFormatLoader {
 	} replace_colors;
 	static SVGRasterizer rasterizer;
 	static void _convert_colors(NSVGimage *p_svg_image);
-	static Error _create_image(Ref<Image> p_image, const PoolVector<uint8_t> *p_data, float p_scale, bool upsample, bool convert_colors = false);
+	static Error _create_image(Ref<Image> p_image, const Vector<uint8_t> *p_data, float p_scale, bool upsample, bool convert_colors = false);
 
 public:
-	static void set_convert_colors(Dictionary *p_replace_color = NULL);
+	static void set_convert_colors(Dictionary *p_replace_color = nullptr);
 	static Error create_image_from_string(Ref<Image> p_image, const char *p_svg_str, float p_scale, bool upsample, bool convert_colors = false);
 
 	virtual Error load_image(Ref<Image> p_image, FileAccess *f, bool p_force_linear, float p_scale);
diff --git a/modules/svg/register_types.cpp b/modules/svg/register_types.cpp
index b0782dae88..9fbefd2cfe 100644
--- a/modules/svg/register_types.cpp
+++ b/modules/svg/register_types.cpp
@@ -32,15 +32,13 @@
 
 #include "image_loader_svg.h"
 
-static ImageLoaderSVG *image_loader_svg = NULL;
+static ImageLoaderSVG *image_loader_svg = nullptr;
 
 void register_svg_types() {
-
 	image_loader_svg = memnew(ImageLoaderSVG);
 	ImageLoader::add_image_format_loader(image_loader_svg);
 }
 
 void unregister_svg_types() {
-
 	memdelete(image_loader_svg);
 }
diff --git a/modules/svg/register_types.h b/modules/svg/register_types.h
index aa50540552..a3d914e0cb 100644
--- a/modules/svg/register_types.h
+++ b/modules/svg/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef SVG_REGISTER_TYPES_H
+#define SVG_REGISTER_TYPES_H
+
 void register_svg_types();
 void unregister_svg_types();
+
+#endif // SVG_REGISTER_TYPES_H
diff --git a/modules/tga/SCsub b/modules/tga/SCsub
index 7e405f405c..067caa6ea0 100644
--- a/modules/tga/SCsub
+++ b/modules/tga/SCsub
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_tga = env_modules.Clone()
 
diff --git a/modules/tga/config.py b/modules/tga/config.py
index 1c8cd12a2d..d22f9454ed 100644
--- a/modules/tga/config.py
+++ b/modules/tga/config.py
@@ -1,5 +1,6 @@
 def can_build(env, platform):
     return True
 
+
 def configure(env):
     pass
diff --git a/modules/tga/image_loader_tga.cpp b/modules/tga/image_loader_tga.cpp
index 480016eb97..1475d24792 100644
--- a/modules/tga/image_loader_tga.cpp
+++ b/modules/tga/image_loader_tga.cpp
@@ -30,18 +30,21 @@
 
 #include "image_loader_tga.h"
 
+#include "core/error_macros.h"
+#include "core/io/file_access_memory.h"
 #include "core/os/os.h"
 #include "core/print_string.h"
 
 Error ImageLoaderTGA::decode_tga_rle(const uint8_t *p_compressed_buffer, size_t p_pixel_size, uint8_t *p_uncompressed_buffer, size_t p_output_size) {
 	Error error;
 
-	PoolVector<uint8_t> pixels;
+	Vector<uint8_t> pixels;
 	error = pixels.resize(p_pixel_size);
-	if (error != OK)
+	if (error != OK) {
 		return error;
+	}
 
-	PoolVector<uint8_t>::Write pixels_w = pixels.write();
+	uint8_t *pixels_w = pixels.ptrw();
 
 	size_t compressed_pos = 0;
 	size_t output_pos = 0;
@@ -55,12 +58,12 @@ Error ImageLoaderTGA::decode_tga_rle(const uint8_t *p_compressed_buffer, size_t
 
 		if (c & 0x80) {
 			for (size_t i = 0; i < p_pixel_size; i++) {
-				pixels_w.ptr()[i] = p_compressed_buffer[compressed_pos];
+				pixels_w[i] = p_compressed_buffer[compressed_pos];
 				compressed_pos += 1;
 			}
 			for (size_t i = 0; i < count; i++) {
 				for (size_t j = 0; j < p_pixel_size; j++) {
-					p_uncompressed_buffer[output_pos + j] = pixels_w.ptr()[j];
+					p_uncompressed_buffer[output_pos + j] = pixels_w[j];
 				}
 				output_pos += p_pixel_size;
 			}
@@ -77,7 +80,6 @@ Error ImageLoaderTGA::decode_tga_rle(const uint8_t *p_compressed_buffer, size_t
 }
 
 Error ImageLoaderTGA::convert_to_image(Ref<Image> p_image, const uint8_t *p_buffer, const tga_header_s &p_header, const uint8_t *p_palette, const bool p_is_monochrome) {
-
 #define TGA_PUT_PIXEL(r, g, b, a)             \
 	int image_data_ofs = ((y * width) + x);   \
 	image_data_w[image_data_ofs * 4 + 0] = r; \
@@ -116,9 +118,9 @@ Error ImageLoaderTGA::convert_to_image(Ref<Image> p_image, const uint8_t *p_buff
 		x_end = -1;
 	}
 
-	PoolVector<uint8_t> image_data;
+	Vector<uint8_t> image_data;
 	image_data.resize(width * height * sizeof(uint32_t));
-	PoolVector<uint8_t>::Write image_data_w = image_data.write();
+	uint8_t *image_data_w = image_data.ptrw();
 
 	size_t i = 0;
 	uint32_t x = x_start;
@@ -199,16 +201,13 @@ Error ImageLoaderTGA::convert_to_image(Ref<Image> p_image, const uint8_t *p_buff
 		}
 	}
 
-	image_data_w.release();
-
-	p_image->create(width, height, 0, Image::FORMAT_RGBA8, image_data);
+	p_image->create(width, height, false, Image::FORMAT_RGBA8, image_data);
 
 	return OK;
 }
 
 Error ImageLoaderTGA::load_image(Ref<Image> p_image, FileAccess *f, bool p_force_linear, float p_scale) {
-
-	PoolVector<uint8_t> src_image;
+	Vector<uint8_t> src_image;
 	int src_image_len = f->get_len();
 	ERR_FAIL_COND_V(src_image_len == 0, ERR_FILE_CORRUPT);
 	ERR_FAIL_COND_V(src_image_len < (int)sizeof(tga_header_s), ERR_FILE_CORRUPT);
@@ -236,8 +235,9 @@ Error ImageLoaderTGA::load_image(Ref<Image> p_image, FileAccess *f, bool p_force
 	bool has_color_map = (tga_header.image_type == TGA_TYPE_RLE_INDEXED || tga_header.image_type == TGA_TYPE_INDEXED);
 	bool is_monochrome = (tga_header.image_type == TGA_TYPE_RLE_MONOCHROME || tga_header.image_type == TGA_TYPE_MONOCHROME);
 
-	if (tga_header.image_type == TGA_TYPE_NO_DATA)
+	if (tga_header.image_type == TGA_TYPE_NO_DATA) {
 		err = FAILED;
+	}
 
 	if (has_color_map) {
 		if (tga_header.color_map_length > 256 || (tga_header.color_map_depth != 24) || tga_header.color_map_type != 1) {
@@ -249,8 +249,9 @@ Error ImageLoaderTGA::load_image(Ref<Image> p_image, FileAccess *f, bool p_force
 		}
 	}
 
-	if (tga_header.image_width <= 0 || tga_header.image_height <= 0)
+	if (tga_header.image_width <= 0 || tga_header.image_height <= 0) {
 		err = FAILED;
+	}
 
 	if (!(tga_header.pixel_depth == 8 || tga_header.pixel_depth == 24 || tga_header.pixel_depth == 32)) {
 		err = FAILED;
@@ -259,49 +260,48 @@ Error ImageLoaderTGA::load_image(Ref<Image> p_image, FileAccess *f, bool p_force
 	if (err == OK) {
 		f->seek(f->get_position() + tga_header.id_length);
 
-		PoolVector<uint8_t> palette;
+		Vector<uint8_t> palette;
 
 		if (has_color_map) {
 			size_t color_map_size = tga_header.color_map_length * (tga_header.color_map_depth >> 3);
 			err = palette.resize(color_map_size);
 			if (err == OK) {
-				PoolVector<uint8_t>::Write palette_w = palette.write();
+				uint8_t *palette_w = palette.ptrw();
 				f->get_buffer(&palette_w[0], color_map_size);
 			} else {
 				return OK;
 			}
 		}
 
-		PoolVector<uint8_t>::Write src_image_w = src_image.write();
+		uint8_t *src_image_w = src_image.ptrw();
 		f->get_buffer(&src_image_w[0], src_image_len - f->get_position());
 
-		PoolVector<uint8_t>::Read src_image_r = src_image.read();
+		const uint8_t *src_image_r = src_image.ptr();
 
 		const size_t pixel_size = tga_header.pixel_depth >> 3;
 		const size_t buffer_size = (tga_header.image_width * tga_header.image_height) * pixel_size;
 
-		PoolVector<uint8_t> uncompressed_buffer;
+		Vector<uint8_t> uncompressed_buffer;
 		uncompressed_buffer.resize(buffer_size);
-		PoolVector<uint8_t>::Write uncompressed_buffer_w = uncompressed_buffer.write();
-		PoolVector<uint8_t>::Read uncompressed_buffer_r;
+		uint8_t *uncompressed_buffer_w = uncompressed_buffer.ptrw();
+		const uint8_t *uncompressed_buffer_r;
 
-		const uint8_t *buffer = NULL;
+		const uint8_t *buffer = nullptr;
 
 		if (is_encoded) {
-
-			err = decode_tga_rle(src_image_r.ptr(), pixel_size, uncompressed_buffer_w.ptr(), buffer_size);
+			err = decode_tga_rle(src_image_r, pixel_size, uncompressed_buffer_w, buffer_size);
 
 			if (err == OK) {
-				uncompressed_buffer_r = uncompressed_buffer.read();
-				buffer = uncompressed_buffer_r.ptr();
+				uncompressed_buffer_r = uncompressed_buffer.ptr();
+				buffer = uncompressed_buffer_r;
 			}
 		} else {
-			buffer = src_image_r.ptr();
+			buffer = src_image_r;
 		};
 
 		if (err == OK) {
-			PoolVector<uint8_t>::Read palette_r = palette.read();
-			err = convert_to_image(p_image, buffer, tga_header, palette_r.ptr(), is_monochrome);
+			const uint8_t *palette_r = palette.ptr();
+			err = convert_to_image(p_image, buffer, tga_header, palette_r, is_monochrome);
 		}
 	}
 
@@ -310,9 +310,20 @@ Error ImageLoaderTGA::load_image(Ref<Image> p_image, FileAccess *f, bool p_force
 }
 
 void ImageLoaderTGA::get_recognized_extensions(List<String> *p_extensions) const {
-
 	p_extensions->push_back("tga");
 }
 
+static Ref<Image> _tga_mem_loader_func(const uint8_t *p_png, int p_size) {
+	FileAccessMemory memfile;
+	Error open_memfile_error = memfile.open_custom(p_png, p_size);
+	ERR_FAIL_COND_V_MSG(open_memfile_error, Ref<Image>(), "Could not create memfile for TGA image buffer.");
+	Ref<Image> img;
+	img.instance();
+	Error load_error = ImageLoaderTGA().load_image(img, &memfile, false, 1.0f);
+	ERR_FAIL_COND_V_MSG(load_error, Ref<Image>(), "Failed to load TGA image.");
+	return img;
+}
+
 ImageLoaderTGA::ImageLoaderTGA() {
+	Image::_tga_mem_loader_func = _tga_mem_loader_func;
 }
diff --git a/modules/tga/register_types.cpp b/modules/tga/register_types.cpp
index 359f4d785e..320f748083 100644
--- a/modules/tga/register_types.cpp
+++ b/modules/tga/register_types.cpp
@@ -32,15 +32,13 @@
 
 #include "image_loader_tga.h"
 
-static ImageLoaderTGA *image_loader_tga = NULL;
+static ImageLoaderTGA *image_loader_tga = nullptr;
 
 void register_tga_types() {
-
 	image_loader_tga = memnew(ImageLoaderTGA);
 	ImageLoader::add_image_format_loader(image_loader_tga);
 }
 
 void unregister_tga_types() {
-
 	memdelete(image_loader_tga);
 }
diff --git a/modules/tga/register_types.h b/modules/tga/register_types.h
index beef05a590..94a77d295e 100644
--- a/modules/tga/register_types.h
+++ b/modules/tga/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef TGA_REGISTER_TYPES_H
+#define TGA_REGISTER_TYPES_H
+
 void register_tga_types();
 void unregister_tga_types();
+
+#endif // TGA_REGISTER_TYPES_H
diff --git a/modules/theora/SCsub b/modules/theora/SCsub
index ff65d2f8ec..a01e65b4b0 100644
--- a/modules/theora/SCsub
+++ b/modules/theora/SCsub
@@ -1,71 +1,71 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_theora = env_modules.Clone()
 
 # Thirdparty source files
-if env['builtin_libtheora']:
+if env["builtin_libtheora"]:
     thirdparty_dir = "#thirdparty/libtheora/"
     thirdparty_sources = [
-        #"analyze.c",
-        #"apiwrapper.c",
+        # "analyze.c",
+        # "apiwrapper.c",
         "bitpack.c",
         "cpu.c",
-        #"decapiwrapper.c",
+        # "decapiwrapper.c",
         "decinfo.c",
         "decode.c",
         "dequant.c",
-        #"encapiwrapper.c",
-        #"encfrag.c",
-        #"encinfo.c",
-        #"encode.c",
-        #"encoder_disabled.c",
-        #"enquant.c",
-        #"fdct.c",
+        # "encapiwrapper.c",
+        # "encfrag.c",
+        # "encinfo.c",
+        # "encode.c",
+        # "encoder_disabled.c",
+        # "enquant.c",
+        # "fdct.c",
         "fragment.c",
         "huffdec.c",
-        #"huffenc.c",
+        # "huffenc.c",
         "idct.c",
         "info.c",
         "internal.c",
-        #"mathops.c",
-        #"mcenc.c",
+        # "mathops.c",
+        # "mcenc.c",
         "quant.c",
-        #"rate.c",
+        # "rate.c",
         "state.c",
-        #"tokenize.c",
+        # "tokenize.c",
     ]
 
     thirdparty_sources_x86 = [
-        #"x86/mmxencfrag.c",
-        #"x86/mmxfdct.c",
+        # "x86/mmxencfrag.c",
+        # "x86/mmxfdct.c",
         "x86/mmxfrag.c",
         "x86/mmxidct.c",
         "x86/mmxstate.c",
-        #"x86/sse2fdct.c",
-        #"x86/x86enc.c",
+        # "x86/sse2fdct.c",
+        # "x86/x86enc.c",
         "x86/x86state.c",
     ]
 
     thirdparty_sources_x86_vc = [
-        #"x86_vc/mmxencfrag.c",
-        #"x86_vc/mmxfdct.c",
+        # "x86_vc/mmxencfrag.c",
+        # "x86_vc/mmxfdct.c",
         "x86_vc/mmxfrag.c",
         "x86_vc/mmxidct.c",
         "x86_vc/mmxstate.c",
-        #"x86_vc/x86enc.c",
+        # "x86_vc/x86enc.c",
         "x86_vc/x86state.c",
     ]
 
-    if (env["x86_libtheora_opt_gcc"]):
+    if env["x86_libtheora_opt_gcc"]:
         thirdparty_sources += thirdparty_sources_x86
 
-    if (env["x86_libtheora_opt_vc"]):
+    if env["x86_libtheora_opt_vc"]:
         thirdparty_sources += thirdparty_sources_x86_vc
 
-    if (env["x86_libtheora_opt_gcc"] or env["x86_libtheora_opt_vc"]):
+    if env["x86_libtheora_opt_gcc"] or env["x86_libtheora_opt_vc"]:
         env_theora.Append(CPPDEFINES=["OC_X86_ASM"])
 
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
@@ -73,9 +73,9 @@ if env['builtin_libtheora']:
     env_theora.Prepend(CPPPATH=[thirdparty_dir])
 
     # also requires libogg and libvorbis
-    if env['builtin_libogg']:
+    if env["builtin_libogg"]:
         env_theora.Prepend(CPPPATH=["#thirdparty/libogg"])
-    if env['builtin_libvorbis']:
+    if env["builtin_libvorbis"]:
         env_theora.Prepend(CPPPATH=["#thirdparty/libvorbis"])
 
     env_thirdparty = env_theora.Clone()
diff --git a/modules/theora/config.py b/modules/theora/config.py
index c7713d7607..b063ed51f9 100644
--- a/modules/theora/config.py
+++ b/modules/theora/config.py
@@ -1,13 +1,16 @@
 def can_build(env, platform):
-    return True
+    return env.module_check_dependencies("theora", ["ogg", "vorbis"])
+
 
 def configure(env):
     pass
 
+
 def get_doc_classes():
     return [
         "VideoStreamTheora",
     ]
 
+
 def get_doc_path():
     return "doc_classes"
diff --git a/modules/theora/doc_classes/VideoStreamTheora.xml b/modules/theora/doc_classes/VideoStreamTheora.xml
index 92244a4d28..cb8852d5ef 100644
--- a/modules/theora/doc_classes/VideoStreamTheora.xml
+++ b/modules/theora/doc_classes/VideoStreamTheora.xml
@@ -4,7 +4,8 @@
 		[VideoStream] resource for Ogg Theora videos.
 	</brief_description>
 	<description>
-		[VideoStream] resource handling the [url=https://www.theora.org/]Ogg Theora[/url] video format with [code].ogv[/code] extension.
+		[VideoStream] resource handling the [url=https://www.theora.org/]Ogg Theora[/url] video format with [code].ogv[/code] extension. The Theora codec is less efficient than [VideoStreamWebm]'s VP8 and VP9, but it requires less CPU resources to decode. The Theora codec is decoded on the CPU.
+		[b]Note:[/b] While Ogg Theora videos can also have an [code].ogg[/code] extension, you will have to rename the extension to [code].ogv[/code] to use those videos within Godot.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -22,7 +23,7 @@
 			<argument index="0" name="file" type="String">
 			</argument>
 			<description>
-				Sets the Ogg Theora video file that this [VideoStreamTheora] resource handles. The [code]file[/code] name should have the [code].o[/code] extension.
+				Sets the Ogg Theora video file that this [VideoStreamTheora] resource handles. The [code]file[/code] name should have the [code].ogv[/code] extension.
 			</description>
 		</method>
 	</methods>
diff --git a/modules/theora/register_types.cpp b/modules/theora/register_types.cpp
index f58e27c855..0676cab5c5 100644
--- a/modules/theora/register_types.cpp
+++ b/modules/theora/register_types.cpp
@@ -35,7 +35,6 @@
 static Ref<ResourceFormatLoaderTheora> resource_loader_theora;
 
 void register_theora_types() {
-
 	resource_loader_theora.instance();
 	ResourceLoader::add_resource_format_loader(resource_loader_theora, true);
 
@@ -43,7 +42,6 @@ void register_theora_types() {
 }
 
 void unregister_theora_types() {
-
 	ResourceLoader::remove_resource_format_loader(resource_loader_theora);
 	resource_loader_theora.unref();
 }
diff --git a/modules/theora/register_types.h b/modules/theora/register_types.h
index 66eb49aed1..4f0670b2c7 100644
--- a/modules/theora/register_types.h
+++ b/modules/theora/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef THEORA_REGISTER_TYPES_H
+#define THEORA_REGISTER_TYPES_H
+
 void register_theora_types();
 void unregister_theora_types();
+
+#endif // THEORA_REGISTER_TYPES_H
diff --git a/modules/theora/video_stream_theora.cpp b/modules/theora/video_stream_theora.cpp
index cf1fc3f175..498391e44a 100644
--- a/modules/theora/video_stream_theora.cpp
+++ b/modules/theora/video_stream_theora.cpp
@@ -36,7 +36,6 @@
 #include "thirdparty/misc/yuv2rgb.h"
 
 int VideoStreamPlaybackTheora::buffer_data() {
-
 	char *buffer = ogg_sync_buffer(&oy, 4096);
 
 #ifdef THEORA_USE_THREAD_STREAMING
@@ -69,39 +68,38 @@ int VideoStreamPlaybackTheora::buffer_data() {
 int VideoStreamPlaybackTheora::queue_page(ogg_page *page) {
 	if (theora_p) {
 		ogg_stream_pagein(&to, page);
-		if (to.e_o_s)
+		if (to.e_o_s) {
 			theora_eos = true;
+		}
 	}
 	if (vorbis_p) {
 		ogg_stream_pagein(&vo, page);
-		if (vo.e_o_s)
+		if (vo.e_o_s) {
 			vorbis_eos = true;
+		}
 	}
 	return 0;
 }
 
-void VideoStreamPlaybackTheora::video_write(void) {
+void VideoStreamPlaybackTheora::video_write() {
 	th_ycbcr_buffer yuv;
 	th_decode_ycbcr_out(td, yuv);
 
 	int pitch = 4;
 	frame_data.resize(size.x * size.y * pitch);
 	{
-		PoolVector<uint8_t>::Write w = frame_data.write();
-		char *dst = (char *)w.ptr();
+		uint8_t *w = frame_data.ptrw();
+		char *dst = (char *)w;
 
 		//uv_offset=(ti.pic_x/2)+(yuv[1].stride)*(ti.pic_y/2);
 
 		if (px_fmt == TH_PF_444) {
-
 			yuv444_2_rgb8888((uint8_t *)dst, (uint8_t *)yuv[0].data, (uint8_t *)yuv[1].data, (uint8_t *)yuv[2].data, size.x, size.y, yuv[0].stride, yuv[1].stride, size.x << 2);
 
 		} else if (px_fmt == TH_PF_422) {
-
 			yuv422_2_rgb8888((uint8_t *)dst, (uint8_t *)yuv[0].data, (uint8_t *)yuv[1].data, (uint8_t *)yuv[2].data, size.x, size.y, yuv[0].stride, yuv[1].stride, size.x << 2);
 
 		} else if (px_fmt == TH_PF_420) {
-
 			yuv420_2_rgb8888((uint8_t *)dst, (uint8_t *)yuv[0].data, (uint8_t *)yuv[1].data, (uint8_t *)yuv[2].data, size.x, size.y, yuv[0].stride, yuv[1].stride, size.x << 2);
 		};
 
@@ -110,15 +108,15 @@ void VideoStreamPlaybackTheora::video_write(void) {
 
 	Ref<Image> img = memnew(Image(size.x, size.y, 0, Image::FORMAT_RGBA8, frame_data)); //zero copy image creation
 
-	texture->set_data(img); //zero copy send to visual server
+	texture->update(img, true); //zero copy send to visual server
 
 	frames_pending = 1;
 }
 
 void VideoStreamPlaybackTheora::clear() {
-
-	if (!file)
+	if (!file) {
 		return;
+	}
 
 	if (vorbis_p) {
 		ogg_stream_clear(&vo);
@@ -144,7 +142,7 @@ void VideoStreamPlaybackTheora::clear() {
 	thread_sem->post(); //just in case
 	Thread::wait_to_finish(thread);
 	memdelete(thread);
-	thread = NULL;
+	thread = nullptr;
 	ring_buffer.clear();
 #endif
 
@@ -159,15 +157,14 @@ void VideoStreamPlaybackTheora::clear() {
 	if (file) {
 		memdelete(file);
 	}
-	file = NULL;
+	file = nullptr;
 	playing = false;
 };
 
 void VideoStreamPlaybackTheora::set_file(const String &p_file) {
-
 	ERR_FAIL_COND(playing);
 	ogg_packet op;
-	th_setup_info *ts = NULL;
+	th_setup_info *ts = nullptr;
 
 	file_name = p_file;
 	if (file) {
@@ -209,7 +206,9 @@ void VideoStreamPlaybackTheora::set_file(const String &p_file) {
 
 	while (!stateflag) {
 		int ret = buffer_data();
-		if (ret == 0) break;
+		if (ret == 0) {
+			break;
+		}
 		while (ogg_sync_pageout(&oy, &og) > 0) {
 			ogg_stream_state test;
 
@@ -231,7 +230,6 @@ void VideoStreamPlaybackTheora::set_file(const String &p_file) {
 				copymem(&to, &test, sizeof(test));
 				theora_p = 1;
 			} else if (!vorbis_p && vorbis_synthesis_headerin(&vi, &vc, &op) >= 0) {
-
 				/* it is vorbis */
 				if (audio_track_skip) {
 					vorbis_info_clear(&vi);
@@ -286,7 +284,9 @@ void VideoStreamPlaybackTheora::set_file(const String &p_file) {
 				return;
 			}
 			vorbis_p++;
-			if (vorbis_p == 3) break;
+			if (vorbis_p == 3) {
+				break;
+			}
 		}
 
 		/* The header pages/packets will arrive before anything else we
@@ -336,7 +336,9 @@ void VideoStreamPlaybackTheora::set_file(const String &p_file) {
 		size.x = w;
 		size.y = h;
 
-		texture->create(w, h, Image::FORMAT_RGBA8, Texture::FLAG_FILTER | Texture::FLAG_VIDEO_SURFACE);
+		Ref<Image> img;
+		img.instance();
+		img->create(w, h, false, Image::FORMAT_RGBA8);
 
 	} else {
 		/* tear down the partial theora setup */
@@ -363,19 +365,20 @@ void VideoStreamPlaybackTheora::set_file(const String &p_file) {
 };
 
 float VideoStreamPlaybackTheora::get_time() const {
-
-	return time - AudioServer::get_singleton()->get_output_latency() - delay_compensation; //-((get_total())/(float)vi.rate);
+	// FIXME: AudioServer output latency was fixed in af9bb0e, previously it used to
+	// systematically return 0. Now that it gives a proper latency, it broke this
+	// code where the delay compensation likely never really worked.
+	return time - /* AudioServer::get_singleton()->get_output_latency() - */ delay_compensation;
 };
 
-Ref<Texture> VideoStreamPlaybackTheora::get_texture() const {
-
+Ref<Texture2D> VideoStreamPlaybackTheora::get_texture() const {
 	return texture;
 }
 
 void VideoStreamPlaybackTheora::update(float p_delta) {
-
-	if (!file)
+	if (!file) {
 		return;
+	}
 
 	if (!playing || paused) {
 		//printf("not playing\n");
@@ -409,13 +412,11 @@ void VideoStreamPlaybackTheora::update(float p_delta) {
 			/* if there's pending, decoded audio, grab it */
 			ret = vorbis_synthesis_pcmout(&vd, &pcm);
 			if (ret > 0) {
-
 				const int AUXBUF_LEN = 4096;
 				int to_read = ret;
 				float aux_buffer[AUXBUF_LEN];
 
 				while (to_read) {
-
 					int m = MIN(AUXBUF_LEN / vi.channels, to_read);
 
 					int count = 0;
@@ -443,7 +444,6 @@ void VideoStreamPlaybackTheora::update(float p_delta) {
 				audio_frames_wrote += ret - to_read;
 
 			} else {
-
 				/* no pending audio; is there a pending packet to decode? */
 				if (ogg_stream_packetout(&vo, &op) > 0) {
 					if (vorbis_synthesis(&vb, &op) == 0) { /* test for success! */
@@ -456,14 +456,14 @@ void VideoStreamPlaybackTheora::update(float p_delta) {
 
 			audio_done = videobuf_time < (audio_frames_wrote / float(vi.rate));
 
-			if (buffer_full)
+			if (buffer_full) {
 				break;
+			}
 		}
 
 		while (theora_p && !frame_done) {
 			/* theora is one in, one out... */
 			if (ogg_stream_packetout(&to, &op) > 0) {
-
 				if (false && pp_inc) {
 					pp_level += pp_inc;
 					th_decode_ctl(td, TH_DECCTL_SET_PPLEVEL, &pp_level,
@@ -530,7 +530,6 @@ void VideoStreamPlaybackTheora::update(float p_delta) {
 
 		/* are we at or past time for this video frame? */
 		if (videobuf_ready && videobuf_time <= get_time()) {
-
 			//video_write();
 			//videobuf_ready=0;
 		} else {
@@ -550,10 +549,9 @@ void VideoStreamPlaybackTheora::update(float p_delta) {
 };
 
 void VideoStreamPlaybackTheora::play() {
-
-	if (!playing)
+	if (!playing) {
 		time = 0;
-	else {
+	} else {
 		stop();
 	}
 
@@ -563,9 +561,7 @@ void VideoStreamPlaybackTheora::play() {
 };
 
 void VideoStreamPlaybackTheora::stop() {
-
 	if (playing) {
-
 		clear();
 		set_file(file_name); //reset
 	}
@@ -574,86 +570,68 @@ void VideoStreamPlaybackTheora::stop() {
 };
 
 bool VideoStreamPlaybackTheora::is_playing() const {
-
 	return playing;
 };
 
 void VideoStreamPlaybackTheora::set_paused(bool p_paused) {
-
 	paused = p_paused;
 };
 
 bool VideoStreamPlaybackTheora::is_paused() const {
-
 	return paused;
 };
 
-void VideoStreamPlaybackTheora::set_loop(bool p_enable){
-
-};
+void VideoStreamPlaybackTheora::set_loop(bool p_enable) {
+}
 
 bool VideoStreamPlaybackTheora::has_loop() const {
-
 	return false;
 };
 
 float VideoStreamPlaybackTheora::get_length() const {
-
 	return 0;
 };
 
 String VideoStreamPlaybackTheora::get_stream_name() const {
-
 	return "";
 };
 
 int VideoStreamPlaybackTheora::get_loop_count() const {
-
 	return 0;
 };
 
 float VideoStreamPlaybackTheora::get_playback_position() const {
-
 	return get_time();
 };
 
-void VideoStreamPlaybackTheora::seek(float p_time){
-
-	// no
-};
+void VideoStreamPlaybackTheora::seek(float p_time) {
+}
 
 void VideoStreamPlaybackTheora::set_mix_callback(AudioMixCallback p_callback, void *p_userdata) {
-
 	mix_callback = p_callback;
 	mix_udata = p_userdata;
 }
 
 int VideoStreamPlaybackTheora::get_channels() const {
-
 	return vi.channels;
 }
 
 void VideoStreamPlaybackTheora::set_audio_track(int p_idx) {
-
 	audio_track = p_idx;
 }
 
 int VideoStreamPlaybackTheora::get_mix_rate() const {
-
 	return vi.rate;
 }
 
 #ifdef THEORA_USE_THREAD_STREAMING
 
 void VideoStreamPlaybackTheora::_streaming_thread(void *ud) {
-
 	VideoStreamPlaybackTheora *vs = (VideoStreamPlaybackTheora *)ud;
 
 	while (!vs->thread_exit) {
-
 		//just fill back the buffer
 		if (!vs->thread_eof) {
-
 			int to_read = vs->ring_buffer.space_left();
 			if (to_read) {
 				int read = vs->file->get_buffer(vs->read_buffer.ptr(), to_read);
@@ -669,8 +647,7 @@ void VideoStreamPlaybackTheora::_streaming_thread(void *ud) {
 #endif
 
 VideoStreamPlaybackTheora::VideoStreamPlaybackTheora() {
-
-	file = NULL;
+	file = nullptr;
 	theora_p = 0;
 	vorbis_p = 0;
 	videobuf_ready = 0;
@@ -681,8 +658,8 @@ VideoStreamPlaybackTheora::VideoStreamPlaybackTheora() {
 
 	buffering = false;
 	texture = Ref<ImageTexture>(memnew(ImageTexture));
-	mix_callback = NULL;
-	mix_udata = NULL;
+	mix_callback = nullptr;
+	mix_udata = nullptr;
 	audio_track = 0;
 	delay_compensation = 0;
 	audio_frames_wrote = 0;
@@ -692,7 +669,7 @@ VideoStreamPlaybackTheora::VideoStreamPlaybackTheora() {
 	ring_buffer.resize(rb_power);
 	read_buffer.resize(RB_SIZE_KB * 1024);
 	thread_sem = Semaphore::create();
-	thread = NULL;
+	thread = nullptr;
 	thread_exit = false;
 	thread_eof = false;
 
@@ -700,19 +677,18 @@ VideoStreamPlaybackTheora::VideoStreamPlaybackTheora() {
 };
 
 VideoStreamPlaybackTheora::~VideoStreamPlaybackTheora() {
-
 #ifdef THEORA_USE_THREAD_STREAMING
 
 	memdelete(thread_sem);
 #endif
 	clear();
 
-	if (file)
+	if (file) {
 		memdelete(file);
+	}
 };
 
 void VideoStreamTheora::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_file", "file"), &VideoStreamTheora::set_file);
 	ClassDB::bind_method(D_METHOD("get_file"), &VideoStreamTheora::get_file);
 
@@ -721,8 +697,7 @@ void VideoStreamTheora::_bind_methods() {
 
 ////////////
 
-RES ResourceFormatLoaderTheora::load(const String &p_path, const String &p_original_path, Error *r_error) {
-
+RES ResourceFormatLoaderTheora::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, bool p_no_cache) {
 	FileAccess *f = FileAccess::open(p_path, FileAccess::READ);
 	if (!f) {
 		if (r_error) {
@@ -746,19 +721,17 @@ RES ResourceFormatLoaderTheora::load(const String &p_path, const String &p_origi
 }
 
 void ResourceFormatLoaderTheora::get_recognized_extensions(List<String> *p_extensions) const {
-
 	p_extensions->push_back("ogv");
 }
 
 bool ResourceFormatLoaderTheora::handles_type(const String &p_type) const {
-
 	return ClassDB::is_parent_class(p_type, "VideoStream");
 }
 
 String ResourceFormatLoaderTheora::get_resource_type(const String &p_path) const {
-
 	String el = p_path.get_extension().to_lower();
-	if (el == "ogv")
+	if (el == "ogv") {
 		return "VideoStreamTheora";
+	}
 	return "";
 }
diff --git a/modules/theora/video_stream_theora.h b/modules/theora/video_stream_theora.h
index 0f201ffa9d..84f816acf8 100644
--- a/modules/theora/video_stream_theora.h
+++ b/modules/theora/video_stream_theora.h
@@ -45,7 +45,6 @@
 //#define THEORA_USE_THREAD_STREAMING
 
 class VideoStreamPlaybackTheora : public VideoStreamPlayback {
-
 	GDCLASS(VideoStreamPlaybackTheora, VideoStreamPlayback);
 
 	enum {
@@ -54,7 +53,7 @@ class VideoStreamPlaybackTheora : public VideoStreamPlayback {
 
 	//Image frames[MAX_FRAMES];
 	Image::Format format;
-	PoolVector<uint8_t> frame_data;
+	Vector<uint8_t> frame_data;
 	int frames_pending;
 	FileAccess *file;
 	String file_name;
@@ -63,7 +62,7 @@ class VideoStreamPlaybackTheora : public VideoStreamPlayback {
 
 	int buffer_data();
 	int queue_page(ogg_page *page);
-	void video_write(void);
+	void video_write();
 	float get_time() const;
 
 	bool theora_eos;
@@ -126,42 +125,41 @@ protected:
 	void clear();
 
 public:
-	virtual void play();
-	virtual void stop();
-	virtual bool is_playing() const;
+	virtual void play() override;
+	virtual void stop() override;
+	virtual bool is_playing() const override;
 
-	virtual void set_paused(bool p_paused);
-	virtual bool is_paused() const;
+	virtual void set_paused(bool p_paused) override;
+	virtual bool is_paused() const override;
 
-	virtual void set_loop(bool p_enable);
-	virtual bool has_loop() const;
+	virtual void set_loop(bool p_enable) override;
+	virtual bool has_loop() const override;
 
-	virtual float get_length() const;
+	virtual float get_length() const override;
 
 	virtual String get_stream_name() const;
 
 	virtual int get_loop_count() const;
 
-	virtual float get_playback_position() const;
-	virtual void seek(float p_time);
+	virtual float get_playback_position() const override;
+	virtual void seek(float p_time) override;
 
 	void set_file(const String &p_file);
 
-	virtual Ref<Texture> get_texture() const;
-	virtual void update(float p_delta);
+	virtual Ref<Texture2D> get_texture() const override;
+	virtual void update(float p_delta) override;
 
-	virtual void set_mix_callback(AudioMixCallback p_callback, void *p_userdata);
-	virtual int get_channels() const;
-	virtual int get_mix_rate() const;
+	virtual void set_mix_callback(AudioMixCallback p_callback, void *p_userdata) override;
+	virtual int get_channels() const override;
+	virtual int get_mix_rate() const override;
 
-	virtual void set_audio_track(int p_idx);
+	virtual void set_audio_track(int p_idx) override;
 
 	VideoStreamPlaybackTheora();
 	~VideoStreamPlaybackTheora();
 };
 
 class VideoStreamTheora : public VideoStream {
-
 	GDCLASS(VideoStreamTheora, VideoStream);
 
 	String file;
@@ -171,7 +169,7 @@ protected:
 	static void _bind_methods();
 
 public:
-	Ref<VideoStreamPlayback> instance_playback() {
+	Ref<VideoStreamPlayback> instance_playback() override {
 		Ref<VideoStreamPlaybackTheora> pb = memnew(VideoStreamPlaybackTheora);
 		pb->set_audio_track(audio_track);
 		pb->set_file(file);
@@ -180,14 +178,14 @@ public:
 
 	void set_file(const String &p_file) { file = p_file; }
 	String get_file() { return file; }
-	void set_audio_track(int p_track) { audio_track = p_track; }
+	void set_audio_track(int p_track) override { audio_track = p_track; }
 
 	VideoStreamTheora() { audio_track = 0; }
 };
 
 class ResourceFormatLoaderTheora : public ResourceFormatLoader {
 public:
-	virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
+	virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, bool p_no_cache = false);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual bool handles_type(const String &p_type) const;
 	virtual String get_resource_type(const String &p_path) const;
diff --git a/modules/tinyexr/SCsub b/modules/tinyexr/SCsub
index 97f9797b58..84b3b4015b 100644
--- a/modules/tinyexr/SCsub
+++ b/modules/tinyexr/SCsub
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_tinyexr = env_modules.Clone()
 
@@ -15,6 +15,9 @@ thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
 env_tinyexr.Prepend(CPPPATH=[thirdparty_dir])
 
+# Enable threaded loading with C++11.
+env_tinyexr.Append(CPPDEFINES=["TINYEXR_USE_THREAD"])
+
 env_thirdparty = env_tinyexr.Clone()
 env_thirdparty.disable_warnings()
 env_thirdparty.add_source_files(env.modules_sources, thirdparty_sources)
diff --git a/modules/tinyexr/config.py b/modules/tinyexr/config.py
index 098f1eafa9..53b8f2f2e3 100644
--- a/modules/tinyexr/config.py
+++ b/modules/tinyexr/config.py
@@ -1,5 +1,6 @@
 def can_build(env, platform):
-    return env['tools']
+    return env["tools"]
+
 
 def configure(env):
     pass
diff --git a/modules/tinyexr/image_loader_tinyexr.cpp b/modules/tinyexr/image_loader_tinyexr.cpp
index bca3b749e3..5bdcb84244 100644
--- a/modules/tinyexr/image_loader_tinyexr.cpp
+++ b/modules/tinyexr/image_loader_tinyexr.cpp
@@ -36,13 +36,12 @@
 #include "thirdparty/tinyexr/tinyexr.h"
 
 Error ImageLoaderTinyEXR::load_image(Ref<Image> p_image, FileAccess *f, bool p_force_linear, float p_scale) {
-
-	PoolVector<uint8_t> src_image;
+	Vector<uint8_t> src_image;
 	int src_image_len = f->get_len();
 	ERR_FAIL_COND_V(src_image_len == 0, ERR_FILE_CORRUPT);
 	src_image.resize(src_image_len);
 
-	PoolVector<uint8_t>::Write w = src_image.write();
+	uint8_t *w = src_image.ptrw();
 
 	f->get_buffer(&w[0], src_image_len);
 
@@ -56,36 +55,37 @@ Error ImageLoaderTinyEXR::load_image(Ref<Image> p_image, FileAccess *f, bool p_f
 	EXRVersion exr_version;
 	EXRImage exr_image;
 	EXRHeader exr_header;
-	const char *err = NULL;
+	const char *err = nullptr;
 
 	InitEXRHeader(&exr_header);
 
-	int ret = ParseEXRVersionFromMemory(&exr_version, w.ptr(), src_image_len);
+	int ret = ParseEXRVersionFromMemory(&exr_version, w, src_image_len);
 	if (ret != TINYEXR_SUCCESS) {
-
 		return ERR_FILE_CORRUPT;
 	}
 
-	ret = ParseEXRHeaderFromMemory(&exr_header, &exr_version, w.ptr(), src_image_len, &err);
+	ret = ParseEXRHeaderFromMemory(&exr_header, &exr_version, w, src_image_len, &err);
 	if (ret != TINYEXR_SUCCESS) {
 		if (err) {
-			ERR_PRINTS(String(err));
+			ERR_PRINT(String(err));
 		}
 		return ERR_FILE_CORRUPT;
 	}
 
 	// Read HALF channel as FLOAT. (GH-13490)
+	bool use_float16 = false;
 	for (int i = 0; i < exr_header.num_channels; i++) {
 		if (exr_header.pixel_types[i] == TINYEXR_PIXELTYPE_HALF) {
+			use_float16 = true;
 			exr_header.requested_pixel_types[i] = TINYEXR_PIXELTYPE_FLOAT;
 		}
 	}
 
 	InitEXRImage(&exr_image);
-	ret = LoadEXRImageFromMemory(&exr_image, &exr_header, w.ptr(), src_image_len, &err);
+	ret = LoadEXRImageFromMemory(&exr_image, &exr_header, w, src_image_len, &err);
 	if (ret != TINYEXR_SUCCESS) {
 		if (err) {
-			ERR_PRINTS(String(err));
+			ERR_PRINT(String(err));
 		}
 		return ERR_FILE_CORRUPT;
 	}
@@ -104,52 +104,40 @@ Error ImageLoaderTinyEXR::load_image(Ref<Image> p_image, FileAccess *f, bool p_f
 			idxB = c;
 		} else if (strcmp(exr_header.channels[c].name, "A") == 0) {
 			idxA = c;
-		}
-	}
-
-	if (exr_header.num_channels == 1) {
-		// Grayscale channel only.
-		idxR = 0;
-		idxG = 0;
-		idxB = 0;
-		idxA = 0;
-	} else {
-		// Assume RGB(A)
-		if (idxR == -1) {
-			ERR_PRINT("TinyEXR: R channel not found.");
-			// @todo { free exr_image }
-			return ERR_FILE_CORRUPT;
-		}
-
-		if (idxG == -1) {
-			ERR_PRINT("TinyEXR: G channel not found.");
-			// @todo { free exr_image }
-			return ERR_FILE_CORRUPT;
-		}
-
-		if (idxB == -1) {
-			ERR_PRINT("TinyEXR: B channel not found.");
-			// @todo { free exr_image }
-			return ERR_FILE_CORRUPT;
+		} else if (strcmp(exr_header.channels[c].name, "Y") == 0) {
+			idxR = c;
+			idxG = c;
+			idxB = c;
 		}
 	}
 
 	// EXR image data loaded, now parse it into Godot-friendly image data
 
-	PoolVector<uint8_t> imgdata;
+	Vector<uint8_t> imgdata;
 	Image::Format format;
 	int output_channels = 0;
 
+	int channel_size = use_float16 ? 2 : 4;
 	if (idxA != -1) {
-
-		imgdata.resize(exr_image.width * exr_image.height * 8); //RGBA16
-		format = Image::FORMAT_RGBAH;
+		imgdata.resize(exr_image.width * exr_image.height * 4 * channel_size); //RGBA
+		format = use_float16 ? Image::FORMAT_RGBAH : Image::FORMAT_RGBAF;
 		output_channels = 4;
-	} else {
-
-		imgdata.resize(exr_image.width * exr_image.height * 6); //RGB16
-		format = Image::FORMAT_RGBH;
+	} else if (idxB != -1) {
+		ERR_FAIL_COND_V(idxG == -1, ERR_FILE_CORRUPT);
+		ERR_FAIL_COND_V(idxR == -1, ERR_FILE_CORRUPT);
+		imgdata.resize(exr_image.width * exr_image.height * 3 * channel_size); //RGB
+		format = use_float16 ? Image::FORMAT_RGBH : Image::FORMAT_RGBF;
 		output_channels = 3;
+	} else if (idxG != -1) {
+		ERR_FAIL_COND_V(idxR == -1, ERR_FILE_CORRUPT);
+		imgdata.resize(exr_image.width * exr_image.height * 2 * channel_size); //RG
+		format = use_float16 ? Image::FORMAT_RGH : Image::FORMAT_RGF;
+		output_channels = 2;
+	} else {
+		ERR_FAIL_COND_V(idxR == -1, ERR_FILE_CORRUPT);
+		imgdata.resize(exr_image.width * exr_image.height * 1 * channel_size); //R
+		format = use_float16 ? Image::FORMAT_RH : Image::FORMAT_RF;
+		output_channels = 1;
 	}
 
 	EXRTile single_image_tile;
@@ -179,54 +167,113 @@ Error ImageLoaderTinyEXR::load_image(Ref<Image> p_image, FileAccess *f, bool p_f
 		exr_tiles = exr_image.tiles;
 	}
 
+	//print_line("reading format: " + Image::get_format_name(format));
 	{
-		PoolVector<uint8_t>::Write wd = imgdata.write();
-		uint16_t *iw = (uint16_t *)wd.ptr();
+		uint8_t *wd = imgdata.ptrw();
+		uint16_t *iw16 = (uint16_t *)wd;
+		float *iw32 = (float *)wd;
 
 		// Assume `out_rgba` have enough memory allocated.
 		for (int tile_index = 0; tile_index < num_tiles; tile_index++) {
-
 			const EXRTile &tile = exr_tiles[tile_index];
 
 			int tw = tile.width;
 			int th = tile.height;
 
 			const float *r_channel_start = reinterpret_cast<const float *>(tile.images[idxR]);
-			const float *g_channel_start = reinterpret_cast<const float *>(tile.images[idxG]);
-			const float *b_channel_start = reinterpret_cast<const float *>(tile.images[idxB]);
-			const float *a_channel_start = NULL;
+			const float *g_channel_start = nullptr;
+			const float *b_channel_start = nullptr;
+			const float *a_channel_start = nullptr;
 
+			if (idxG != -1) {
+				g_channel_start = reinterpret_cast<const float *>(tile.images[idxG]);
+			}
+			if (idxB != -1) {
+				b_channel_start = reinterpret_cast<const float *>(tile.images[idxB]);
+			}
 			if (idxA != -1) {
 				a_channel_start = reinterpret_cast<const float *>(tile.images[idxA]);
 			}
 
-			uint16_t *first_row_w = iw + (tile.offset_y * tile_height * exr_image.width + tile.offset_x * tile_width) * output_channels;
+			uint16_t *first_row_w16 = iw16 + (tile.offset_y * tile_height * exr_image.width + tile.offset_x * tile_width) * output_channels;
+			float *first_row_w32 = iw32 + (tile.offset_y * tile_height * exr_image.width + tile.offset_x * tile_width) * output_channels;
 
 			for (int y = 0; y < th; y++) {
 				const float *r_channel = r_channel_start + y * tile_width;
-				const float *g_channel = g_channel_start + y * tile_width;
-				const float *b_channel = b_channel_start + y * tile_width;
-				const float *a_channel = NULL;
-
+				const float *g_channel = nullptr;
+				const float *b_channel = nullptr;
+				const float *a_channel = nullptr;
+				if (g_channel_start) {
+					g_channel = g_channel_start + y * tile_width;
+				}
+				if (b_channel_start) {
+					b_channel = b_channel_start + y * tile_width;
+				}
 				if (a_channel_start) {
 					a_channel = a_channel_start + y * tile_width;
 				}
 
-				uint16_t *row_w = first_row_w + (y * exr_image.width * output_channels);
-
-				for (int x = 0; x < tw; x++) {
-
-					Color color(*r_channel++, *g_channel++, *b_channel++);
-
-					if (p_force_linear)
-						color = color.to_linear();
-
-					*row_w++ = Math::make_half_float(color.r);
-					*row_w++ = Math::make_half_float(color.g);
-					*row_w++ = Math::make_half_float(color.b);
-
-					if (idxA != -1) {
-						*row_w++ = Math::make_half_float(*a_channel++);
+				if (use_float16) {
+					uint16_t *row_w = first_row_w16 + (y * exr_image.width * output_channels);
+
+					for (int x = 0; x < tw; x++) {
+						Color color;
+						color.r = *r_channel++;
+						if (g_channel) {
+							color.g = *g_channel++;
+						}
+						if (b_channel) {
+							color.b = *b_channel++;
+						}
+						if (a_channel) {
+							color.a = *a_channel++;
+						}
+
+						if (p_force_linear) {
+							color = color.to_linear();
+						}
+
+						*row_w++ = Math::make_half_float(color.r);
+						if (g_channel) {
+							*row_w++ = Math::make_half_float(color.g);
+						}
+						if (b_channel) {
+							*row_w++ = Math::make_half_float(color.b);
+						}
+						if (a_channel) {
+							*row_w++ = Math::make_half_float(color.a);
+						}
+					}
+				} else {
+					float *row_w = first_row_w32 + (y * exr_image.width * output_channels);
+
+					for (int x = 0; x < tw; x++) {
+						Color color;
+						color.r = *r_channel++;
+						if (g_channel) {
+							color.g = *g_channel++;
+						}
+						if (b_channel) {
+							color.b = *b_channel++;
+						}
+						if (a_channel) {
+							color.a = *a_channel++;
+						}
+
+						if (p_force_linear) {
+							color = color.to_linear();
+						}
+
+						*row_w++ = color.r;
+						if (g_channel) {
+							*row_w++ = color.g;
+						}
+						if (b_channel) {
+							*row_w++ = color.b;
+						}
+						if (a_channel) {
+							*row_w++ = color.a;
+						}
 					}
 				}
 			}
@@ -235,8 +282,6 @@ Error ImageLoaderTinyEXR::load_image(Ref<Image> p_image, FileAccess *f, bool p_f
 
 	p_image->create(exr_image.width, exr_image.height, false, format, imgdata);
 
-	w.release();
-
 	FreeEXRHeader(&exr_header);
 	FreeEXRImage(&exr_image);
 
@@ -244,7 +289,6 @@ Error ImageLoaderTinyEXR::load_image(Ref<Image> p_image, FileAccess *f, bool p_f
 }
 
 void ImageLoaderTinyEXR::get_recognized_extensions(List<String> *p_extensions) const {
-
 	p_extensions->push_back("exr");
 }
 
diff --git a/modules/tinyexr/image_loader_tinyexr.h b/modules/tinyexr/image_loader_tinyexr.h
index af95989254..ff040b0915 100644
--- a/modules/tinyexr/image_loader_tinyexr.h
+++ b/modules/tinyexr/image_loader_tinyexr.h
@@ -34,7 +34,6 @@
 #include "core/io/image_loader.h"
 
 class ImageLoaderTinyEXR : public ImageFormatLoader {
-
 public:
 	virtual Error load_image(Ref<Image> p_image, FileAccess *f, bool p_force_linear, float p_scale);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
diff --git a/modules/tinyexr/image_saver_tinyexr.cpp b/modules/tinyexr/image_saver_tinyexr.cpp
index 17f920746f..420619bd5f 100644
--- a/modules/tinyexr/image_saver_tinyexr.cpp
+++ b/modules/tinyexr/image_saver_tinyexr.cpp
@@ -58,7 +58,8 @@ static bool is_supported_format(Image::Format p_format) {
 enum SrcPixelType {
 	SRC_FLOAT,
 	SRC_HALF,
-	SRC_BYTE
+	SRC_BYTE,
+	SRC_UNSUPPORTED
 };
 
 static SrcPixelType get_source_pixel_type(Image::Format p_format) {
@@ -79,7 +80,7 @@ static SrcPixelType get_source_pixel_type(Image::Format p_format) {
 		case Image::FORMAT_RGBA8:
 			return SRC_BYTE;
 		default:
-			CRASH_NOW();
+			return SRC_UNSUPPORTED;
 	}
 }
 
@@ -101,7 +102,7 @@ static int get_target_pixel_type(Image::Format p_format) {
 		case Image::FORMAT_RGBA8:
 			return TINYEXR_PIXELTYPE_HALF;
 		default:
-			CRASH_NOW();
+			return -1;
 	}
 }
 
@@ -112,7 +113,7 @@ static int get_pixel_type_size(int p_pixel_type) {
 		case TINYEXR_PIXELTYPE_FLOAT:
 			return 4;
 	}
-	CRASH_NOW();
+	return -1;
 }
 
 static int get_channel_count(Image::Format p_format) {
@@ -134,12 +135,11 @@ static int get_channel_count(Image::Format p_format) {
 		case Image::FORMAT_RGBA8:
 			return 4;
 		default:
-			CRASH_NOW();
+			return -1;
 	}
 }
 
 Error save_exr(const String &p_path, const Ref<Image> &p_img, bool p_grayscale) {
-
 	Image::Format format = p_img->get_format();
 
 	if (!is_supported_format(format)) {
@@ -158,7 +158,7 @@ Error save_exr(const String &p_path, const Ref<Image> &p_img, bool p_grayscale)
 
 	// Godot does not support more than 4 channels,
 	// so we can preallocate header infos on the stack and use only the subset we need
-	PoolByteArray channels[max_channels];
+	PackedByteArray channels[max_channels];
 	unsigned char *channels_ptrs[max_channels];
 	EXRChannelInfo channel_infos[max_channels];
 	int pixel_types[max_channels];
@@ -173,57 +173,57 @@ Error save_exr(const String &p_path, const Ref<Image> &p_img, bool p_grayscale)
 	};
 
 	int channel_count = get_channel_count(format);
+	ERR_FAIL_COND_V(channel_count < 0, ERR_UNAVAILABLE);
 	ERR_FAIL_COND_V(p_grayscale && channel_count != 1, ERR_INVALID_PARAMETER);
 
 	int target_pixel_type = get_target_pixel_type(format);
+	ERR_FAIL_COND_V(target_pixel_type < 0, ERR_UNAVAILABLE);
 	int target_pixel_type_size = get_pixel_type_size(target_pixel_type);
+	ERR_FAIL_COND_V(target_pixel_type_size < 0, ERR_UNAVAILABLE);
 	SrcPixelType src_pixel_type = get_source_pixel_type(format);
+	ERR_FAIL_COND_V(src_pixel_type == SRC_UNSUPPORTED, ERR_UNAVAILABLE);
 	const int pixel_count = p_img->get_width() * p_img->get_height();
 
 	const int *channel_mapping = channel_mappings[channel_count - 1];
 
 	{
-		PoolByteArray src_data = p_img->get_data();
-		PoolByteArray::Read src_r = src_data.read();
+		PackedByteArray src_data = p_img->get_data();
+		const uint8_t *src_r = src_data.ptr();
 
 		for (int channel_index = 0; channel_index < channel_count; ++channel_index) {
-
 			// De-interleave channels
 
-			PoolByteArray &dst = channels[channel_index];
+			PackedByteArray &dst = channels[channel_index];
 			dst.resize(pixel_count * target_pixel_type_size);
 
-			PoolByteArray::Write dst_w = dst.write();
+			uint8_t *dst_w = dst.ptrw();
 
 			if (src_pixel_type == SRC_FLOAT && target_pixel_type == TINYEXR_PIXELTYPE_FLOAT) {
-
 				// Note: we don't save mipmaps
 				CRASH_COND(src_data.size() < pixel_count * channel_count * target_pixel_type_size);
 
-				const float *src_rp = (float *)src_r.ptr();
-				float *dst_wp = (float *)dst_w.ptr();
+				const float *src_rp = (float *)src_r;
+				float *dst_wp = (float *)dst_w;
 
 				for (int i = 0; i < pixel_count; ++i) {
 					dst_wp[i] = src_rp[channel_index + i * channel_count];
 				}
 
 			} else if (src_pixel_type == SRC_HALF && target_pixel_type == TINYEXR_PIXELTYPE_HALF) {
-
 				CRASH_COND(src_data.size() < pixel_count * channel_count * target_pixel_type_size);
 
-				const uint16_t *src_rp = (uint16_t *)src_r.ptr();
-				uint16_t *dst_wp = (uint16_t *)dst_w.ptr();
+				const uint16_t *src_rp = (uint16_t *)src_r;
+				uint16_t *dst_wp = (uint16_t *)dst_w;
 
 				for (int i = 0; i < pixel_count; ++i) {
 					dst_wp[i] = src_rp[channel_index + i * channel_count];
 				}
 
 			} else if (src_pixel_type == SRC_BYTE && target_pixel_type == TINYEXR_PIXELTYPE_HALF) {
-
 				CRASH_COND(src_data.size() < pixel_count * channel_count);
 
-				const uint8_t *src_rp = (uint8_t *)src_r.ptr();
-				uint16_t *dst_wp = (uint16_t *)dst_w.ptr();
+				const uint8_t *src_rp = (uint8_t *)src_r;
+				uint16_t *dst_wp = (uint16_t *)dst_w;
 
 				for (int i = 0; i < pixel_count; ++i) {
 					dst_wp[i] = Math::make_half_float(src_rp[channel_index + i * channel_count] / 255.f);
@@ -235,7 +235,7 @@ Error save_exr(const String &p_path, const Ref<Image> &p_img, bool p_grayscale)
 
 			int remapped_index = channel_mapping[channel_index];
 
-			channels_ptrs[remapped_index] = dst_w.ptr();
+			channels_ptrs[remapped_index] = dst_w;
 
 			// No conversion
 			pixel_types[remapped_index] = target_pixel_type;
@@ -262,13 +262,21 @@ Error save_exr(const String &p_path, const Ref<Image> &p_img, bool p_grayscale)
 	header.channels = channel_infos;
 	header.pixel_types = pixel_types;
 	header.requested_pixel_types = requested_pixel_types;
+	header.compression_type = TINYEXR_COMPRESSIONTYPE_PIZ;
+
+	unsigned char *mem = nullptr;
+	const char *err = nullptr;
+
+	size_t bytes = SaveEXRImageToMemory(&image, &header, &mem, &err);
 
-	CharString utf8_filename = p_path.utf8();
-	const char *err;
-	int ret = SaveEXRImageToFile(&image, &header, utf8_filename.ptr(), &err);
-	if (ret != TINYEXR_SUCCESS) {
+	if (bytes == 0) {
 		print_error(String("Saving EXR failed. Error: {0}").format(varray(err)));
 		return ERR_FILE_CANT_WRITE;
+	} else {
+		FileAccessRef ref = FileAccess::open(p_path, FileAccess::WRITE);
+		ERR_FAIL_COND_V(!ref, ERR_FILE_CANT_WRITE);
+		ref->store_buffer(mem, bytes);
+		free(mem);
 	}
 
 	return OK;
diff --git a/modules/tinyexr/register_types.cpp b/modules/tinyexr/register_types.cpp
index d8529fd893..9d0fb8729e 100644
--- a/modules/tinyexr/register_types.cpp
+++ b/modules/tinyexr/register_types.cpp
@@ -33,10 +33,9 @@
 #include "image_loader_tinyexr.h"
 #include "image_saver_tinyexr.h"
 
-static ImageLoaderTinyEXR *image_loader_tinyexr = NULL;
+static ImageLoaderTinyEXR *image_loader_tinyexr = nullptr;
 
 void register_tinyexr_types() {
-
 	image_loader_tinyexr = memnew(ImageLoaderTinyEXR);
 	ImageLoader::add_image_format_loader(image_loader_tinyexr);
 
@@ -44,8 +43,7 @@ void register_tinyexr_types() {
 }
 
 void unregister_tinyexr_types() {
-
 	memdelete(image_loader_tinyexr);
 
-	Image::save_exr_func = NULL;
+	Image::save_exr_func = nullptr;
 }
diff --git a/modules/tinyexr/register_types.h b/modules/tinyexr/register_types.h
index 2028cd4a33..9739488312 100644
--- a/modules/tinyexr/register_types.h
+++ b/modules/tinyexr/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef TINYEXR_REGISTER_TYPES_H
+#define TINYEXR_REGISTER_TYPES_H
+
 void register_tinyexr_types();
 void unregister_tinyexr_types();
+
+#endif // TINYEXR_REGISTER_TYPES_H
diff --git a/modules/upnp/SCsub b/modules/upnp/SCsub
index 3f56a69594..2e129e15ca 100644
--- a/modules/upnp/SCsub
+++ b/modules/upnp/SCsub
@@ -1,13 +1,13 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_upnp = env_modules.Clone()
 
 # Thirdparty source files
 
-if env['builtin_miniupnpc']:
+if env["builtin_miniupnpc"]:
     thirdparty_dir = "#thirdparty/miniupnpc/"
     thirdparty_sources = [
         "miniupnpc.c",
diff --git a/modules/upnp/config.py b/modules/upnp/config.py
index 8724ff1a51..3e15b940a1 100644
--- a/modules/upnp/config.py
+++ b/modules/upnp/config.py
@@ -1,14 +1,17 @@
 def can_build(env, platform):
     return True
 
+
 def configure(env):
     pass
 
+
 def get_doc_classes():
     return [
         "UPNP",
-        "UPNPDevice"
+        "UPNPDevice",
     ]
 
+
 def get_doc_path():
     return "doc_classes"
diff --git a/modules/upnp/doc_classes/UPNP.xml b/modules/upnp/doc_classes/UPNP.xml
index 8549c173db..785c8dad50 100644
--- a/modules/upnp/doc_classes/UPNP.xml
+++ b/modules/upnp/doc_classes/UPNP.xml
@@ -45,7 +45,7 @@
 			<description>
 				Adds a mapping to forward the external [code]port[/code] (between 1 and 65535) on the default gateway (see [method get_gateway]) to the [code]internal_port[/code] on the local machine for the given protocol [code]proto[/code] (either [code]TCP[/code] or [code]UDP[/code], with UDP being the default). If a port mapping for the given port and protocol combination already exists on that gateway device, this method tries to overwrite it. If that is not desired, you can retrieve the gateway manually with [method get_gateway] and call [method add_port_mapping] on it, if any.
 				If [code]internal_port[/code] is [code]0[/code] (the default), the same port number is used for both the external and the internal port (the [code]port[/code] value).
-				The description ([code]desc[/code]) is shown in some router UIs and can be used to point out which application added the mapping, and the lifetime of the mapping can be limited by [code]duration[/code]. However, some routers are incompatible with one or both of these, so use with caution and add fallback logic in case of errors to retry without them if in doubt.
+				The description ([code]desc[/code]) is shown in some router UIs and can be used to point out which application added the mapping. The mapping's lease duration can be limited by specifying a [code]duration[/code] (in seconds). However, some routers are incompatible with one or both of these, so use with caution and add fallback logic in case of errors to retry without them if in doubt.
 				See [enum UPNPResult] for possible return values.
 			</description>
 		</method>
diff --git a/modules/upnp/register_types.cpp b/modules/upnp/register_types.cpp
index 270aa2d7e8..34900206de 100644
--- a/modules/upnp/register_types.cpp
+++ b/modules/upnp/register_types.cpp
@@ -36,7 +36,6 @@
 #include "upnp_device.h"
 
 void register_upnp_types() {
-
 	ClassDB::register_class<UPNP>();
 	ClassDB::register_class<UPNPDevice>();
 }
diff --git a/modules/upnp/register_types.h b/modules/upnp/register_types.h
index 4d752e4a94..0c71db9ffa 100644
--- a/modules/upnp/register_types.h
+++ b/modules/upnp/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef UPNP_REGISTER_TYPES_H
+#define UPNP_REGISTER_TYPES_H
+
 void register_upnp_types();
 void unregister_upnp_types();
+
+#endif // UPNP_REGISTER_TYPES_H
diff --git a/modules/upnp/upnp.cpp b/modules/upnp/upnp.cpp
index 5ef7575b0c..988bf3017d 100644
--- a/modules/upnp/upnp.cpp
+++ b/modules/upnp/upnp.cpp
@@ -44,9 +44,8 @@ bool UPNP::is_common_device(const String &dev) const {
 }
 
 int UPNP::discover(int timeout, int ttl, const String &device_filter) {
-	ERR_FAIL_COND_V(timeout < 0, UPNP_RESULT_INVALID_PARAM);
-	ERR_FAIL_COND_V(ttl < 0, UPNP_RESULT_INVALID_PARAM);
-	ERR_FAIL_COND_V(ttl > 255, UPNP_RESULT_INVALID_PARAM);
+	ERR_FAIL_COND_V_MSG(timeout < 0, UPNP_RESULT_INVALID_PARAM, "The response's wait time can't be negative.");
+	ERR_FAIL_COND_V_MSG(ttl < 0 || ttl > 255, UPNP_RESULT_INVALID_PARAM, "The time-to-live must be set between 0 and 255 (inclusive).");
 
 	devices.clear();
 
@@ -54,9 +53,9 @@ int UPNP::discover(int timeout, int ttl, const String &device_filter) {
 	struct UPNPDev *devlist;
 
 	if (is_common_device(device_filter)) {
-		devlist = upnpDiscover(timeout, discover_multicast_if.utf8().get_data(), NULL, discover_local_port, discover_ipv6, ttl, &error);
+		devlist = upnpDiscover(timeout, discover_multicast_if.utf8().get_data(), nullptr, discover_local_port, discover_ipv6, ttl, &error);
 	} else {
-		devlist = upnpDiscoverAll(timeout, discover_multicast_if.utf8().get_data(), NULL, discover_local_port, discover_ipv6, ttl, &error);
+		devlist = upnpDiscoverAll(timeout, discover_multicast_if.utf8().get_data(), nullptr, discover_local_port, discover_ipv6, ttl, &error);
 	}
 
 	if (error != UPNPDISCOVER_SUCCESS) {
@@ -133,7 +132,7 @@ void UPNP::parse_igd(Ref<UPNPDevice> dev, UPNPDev *devlist) {
 
 	parserootdesc(xml, size, &data);
 	free(xml);
-	xml = 0;
+	xml = nullptr;
 
 	GetUPNPUrls(urls, &data, dev->get_description_url().utf8().get_data(), 0);
 
@@ -235,20 +234,20 @@ int UPNP::get_device_count() const {
 }
 
 Ref<UPNPDevice> UPNP::get_device(int index) const {
-	ERR_FAIL_INDEX_V(index, devices.size(), NULL);
+	ERR_FAIL_INDEX_V(index, devices.size(), nullptr);
 
 	return devices.get(index);
 }
 
 void UPNP::add_device(Ref<UPNPDevice> device) {
-	ERR_FAIL_COND(device == NULL);
+	ERR_FAIL_COND(device == nullptr);
 
 	devices.push_back(device);
 }
 
 void UPNP::set_device(int index, Ref<UPNPDevice> device) {
 	ERR_FAIL_INDEX(index, devices.size());
-	ERR_FAIL_COND(device == NULL);
+	ERR_FAIL_COND(device == nullptr);
 
 	devices.set(index, device);
 }
@@ -264,17 +263,17 @@ void UPNP::clear_devices() {
 }
 
 Ref<UPNPDevice> UPNP::get_gateway() const {
-	ERR_FAIL_COND_V(devices.size() < 1, NULL);
+	ERR_FAIL_COND_V_MSG(devices.size() < 1, nullptr, "Couldn't find any UPNPDevices.");
 
 	for (int i = 0; i < devices.size(); i++) {
 		Ref<UPNPDevice> dev = get_device(i);
 
-		if (dev != NULL && dev->is_valid_gateway()) {
+		if (dev != nullptr && dev->is_valid_gateway()) {
 			return dev;
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 void UPNP::set_discover_multicast_if(const String &m_if) {
@@ -304,7 +303,7 @@ bool UPNP::is_discover_ipv6() const {
 String UPNP::query_external_address() const {
 	Ref<UPNPDevice> dev = get_gateway();
 
-	if (dev == NULL) {
+	if (dev == nullptr) {
 		return "";
 	}
 
@@ -314,7 +313,7 @@ String UPNP::query_external_address() const {
 int UPNP::add_port_mapping(int port, int port_internal, String desc, String proto, int duration) const {
 	Ref<UPNPDevice> dev = get_gateway();
 
-	if (dev == NULL) {
+	if (dev == nullptr) {
 		return UPNP_RESULT_NO_GATEWAY;
 	}
 
@@ -326,7 +325,7 @@ int UPNP::add_port_mapping(int port, int port_internal, String desc, String prot
 int UPNP::delete_port_mapping(int port, String proto) const {
 	Ref<UPNPDevice> dev = get_gateway();
 
-	if (dev == NULL) {
+	if (dev == nullptr) {
 		return UPNP_RESULT_NO_GATEWAY;
 	}
 
diff --git a/modules/upnp/upnp.h b/modules/upnp/upnp.h
index d052e155de..1c4b5549f4 100644
--- a/modules/upnp/upnp.h
+++ b/modules/upnp/upnp.h
@@ -38,7 +38,6 @@
 #include <miniupnpc/miniupnpc.h>
 
 class UPNP : public Reference {
-
 	GDCLASS(UPNP, Reference);
 
 private:
@@ -46,7 +45,7 @@ private:
 	int discover_local_port;
 	bool discover_ipv6;
 
-	Vector<Ref<UPNPDevice> > devices;
+	Vector<Ref<UPNPDevice>> devices;
 
 	bool is_common_device(const String &dev) const;
 	void add_device_to_list(UPNPDev *dev, UPNPDev *devlist);
diff --git a/modules/upnp/upnp_device.cpp b/modules/upnp/upnp_device.cpp
index 6edfbc2d7d..40eb6106a0 100644
--- a/modules/upnp/upnp_device.cpp
+++ b/modules/upnp/upnp_device.cpp
@@ -35,7 +35,7 @@
 #include <miniupnpc/upnpcommands.h>
 
 String UPNPDevice::query_external_address() const {
-	ERR_FAIL_COND_V(!is_valid_gateway(), "");
+	ERR_FAIL_COND_V_MSG(!is_valid_gateway(), "", "The Internet Gateway Device must be valid.");
 
 	char addr[16];
 	int i = UPNP_GetExternalIPAddress(
@@ -43,17 +43,17 @@ String UPNPDevice::query_external_address() const {
 			igd_service_type.utf8().get_data(),
 			(char *)&addr);
 
-	ERR_FAIL_COND_V(i != UPNPCOMMAND_SUCCESS, "");
+	ERR_FAIL_COND_V_MSG(i != UPNPCOMMAND_SUCCESS, "", "Couldn't get external IP address.");
 
 	return String(addr);
 }
 
 int UPNPDevice::add_port_mapping(int port, int port_internal, String desc, String proto, int duration) const {
-	ERR_FAIL_COND_V(!is_valid_gateway(), UPNP::UPNP_RESULT_INVALID_GATEWAY);
-	ERR_FAIL_COND_V(port < 1 || port > 65535, UPNP::UPNP_RESULT_INVALID_PORT);
-	ERR_FAIL_COND_V(port_internal < 0 || port_internal > 65535, UPNP::UPNP_RESULT_INVALID_PORT); // Needs to allow 0 because 0 signifies "use external port as internal port"
-	ERR_FAIL_COND_V(proto != "UDP" && proto != "TCP", UPNP::UPNP_RESULT_INVALID_PROTOCOL);
-	ERR_FAIL_COND_V(duration < 0, UPNP::UPNP_RESULT_INVALID_DURATION);
+	ERR_FAIL_COND_V_MSG(!is_valid_gateway(), UPNP::UPNP_RESULT_INVALID_GATEWAY, "The Internet Gateway Device must be valid.");
+	ERR_FAIL_COND_V_MSG(port < 1 || port > 65535, UPNP::UPNP_RESULT_INVALID_PORT, "The port number must be set between 1 and 65535 (inclusive).");
+	ERR_FAIL_COND_V_MSG(port_internal < 0 || port_internal > 65535, UPNP::UPNP_RESULT_INVALID_PORT, "The port number must be set between 0 and 65535 (inclusive)."); // Needs to allow 0 because 0 signifies "use external port as internal port"
+	ERR_FAIL_COND_V_MSG(proto != "UDP" && proto != "TCP", UPNP::UPNP_RESULT_INVALID_PROTOCOL, "The protocol must be either TCP or UDP.");
+	ERR_FAIL_COND_V_MSG(duration < 0, UPNP::UPNP_RESULT_INVALID_DURATION, "The port mapping's lease duration can't be negative.");
 
 	if (port_internal < 1) {
 		port_internal = port;
@@ -65,29 +65,29 @@ int UPNPDevice::add_port_mapping(int port, int port_internal, String desc, Strin
 			itos(port).utf8().get_data(),
 			itos(port_internal).utf8().get_data(),
 			igd_our_addr.utf8().get_data(),
-			desc.empty() ? 0 : desc.utf8().get_data(),
+			desc.empty() ? nullptr : desc.utf8().get_data(),
 			proto.utf8().get_data(),
-			NULL, // Remote host, always NULL as IGDs don't support it
-			duration > 0 ? itos(duration).utf8().get_data() : 0);
+			nullptr, // Remote host, always nullptr as IGDs don't support it
+			duration > 0 ? itos(duration).utf8().get_data() : nullptr);
 
-	ERR_FAIL_COND_V(i != UPNPCOMMAND_SUCCESS, UPNP::upnp_result(i));
+	ERR_FAIL_COND_V_MSG(i != UPNPCOMMAND_SUCCESS, UPNP::upnp_result(i), "Couldn't add port mapping.");
 
 	return UPNP::UPNP_RESULT_SUCCESS;
 }
 
 int UPNPDevice::delete_port_mapping(int port, String proto) const {
-	ERR_FAIL_COND_V(port < 1 || port > 65535, UPNP::UPNP_RESULT_INVALID_PORT);
-	ERR_FAIL_COND_V(proto != "UDP" && proto != "TCP", UPNP::UPNP_RESULT_INVALID_PROTOCOL);
+	ERR_FAIL_COND_V_MSG(port < 1 || port > 65535, UPNP::UPNP_RESULT_INVALID_PORT, "The port number must be set between 1 and 65535 (inclusive).");
+	ERR_FAIL_COND_V_MSG(proto != "UDP" && proto != "TCP", UPNP::UPNP_RESULT_INVALID_PROTOCOL, "The protocol must be either TCP or UDP.");
 
 	int i = UPNP_DeletePortMapping(
 			igd_control_url.utf8().get_data(),
 			igd_service_type.utf8().get_data(),
 			itos(port).utf8().get_data(),
 			proto.utf8().get_data(),
-			NULL // Remote host, always NULL as IGDs don't support it
+			nullptr // Remote host, always nullptr as IGDs don't support it
 	);
 
-	ERR_FAIL_COND_V(i != UPNPCOMMAND_SUCCESS, UPNP::upnp_result(i));
+	ERR_FAIL_COND_V_MSG(i != UPNPCOMMAND_SUCCESS, UPNP::upnp_result(i), "Couldn't delete port mapping.");
 
 	return UPNP::UPNP_RESULT_SUCCESS;
 }
diff --git a/modules/upnp/upnp_device.h b/modules/upnp/upnp_device.h
index f25d3427fc..4b519fce32 100644
--- a/modules/upnp/upnp_device.h
+++ b/modules/upnp/upnp_device.h
@@ -34,7 +34,6 @@
 #include "core/reference.h"
 
 class UPNPDevice : public Reference {
-
 	GDCLASS(UPNPDevice, Reference);
 
 public:
diff --git a/modules/vhacd/SCsub b/modules/vhacd/SCsub
index 685976dc33..ecd432b275 100644
--- a/modules/vhacd/SCsub
+++ b/modules/vhacd/SCsub
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_vhacd = env_modules.Clone()
 
@@ -19,7 +19,7 @@ thirdparty_sources = [
     "src/btAlignedAllocator.cpp",
     "src/vhacdRaycastMesh.cpp",
     "src/VHACD.cpp",
-    "src/btConvexHullComputer.cpp"
+    "src/btConvexHullComputer.cpp",
 ]
 
 thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
diff --git a/modules/vhacd/config.py b/modules/vhacd/config.py
index 9ced70d2fb..d22f9454ed 100644
--- a/modules/vhacd/config.py
+++ b/modules/vhacd/config.py
@@ -1,6 +1,6 @@
 def can_build(env, platform):
     return True
 
+
 def configure(env):
     pass
-
diff --git a/modules/vhacd/register_types.cpp b/modules/vhacd/register_types.cpp
index 26c6146bab..40c5e47440 100644
--- a/modules/vhacd/register_types.cpp
+++ b/modules/vhacd/register_types.cpp
@@ -32,8 +32,7 @@
 #include "scene/resources/mesh.h"
 #include "thirdparty/vhacd/public/VHACD.h"
 
-static Vector<Vector<Face3> > convex_decompose(const Vector<Face3> &p_faces) {
-
+static Vector<Vector<Face3>> convex_decompose(const Vector<Face3> &p_faces) {
 	Vector<float> vertices;
 	vertices.resize(p_faces.size() * 9);
 	Vector<uint32_t> indices;
@@ -54,7 +53,7 @@ static Vector<Vector<Face3> > convex_decompose(const Vector<Face3> &p_faces) {
 
 	int hull_count = decomposer->GetNConvexHulls();
 
-	Vector<Vector<Face3> > ret;
+	Vector<Vector<Face3>> ret;
 
 	for (int i = 0; i < hull_count; i++) {
 		Vector<Face3> triangles;
@@ -84,5 +83,5 @@ void register_vhacd_types() {
 }
 
 void unregister_vhacd_types() {
-	Mesh::convex_composition_function = NULL;
+	Mesh::convex_composition_function = nullptr;
 }
diff --git a/modules/vhacd/register_types.h b/modules/vhacd/register_types.h
index de56620813..d02a990901 100644
--- a/modules/vhacd/register_types.h
+++ b/modules/vhacd/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef VHACD_REGISTER_TYPES_H
+#define VHACD_REGISTER_TYPES_H
+
 void register_vhacd_types();
 void unregister_vhacd_types();
+
+#endif // VHACD_REGISTER_TYPES_H
diff --git a/modules/visual_script/SCsub b/modules/visual_script/SCsub
index 3c3d2caa57..16faea08d7 100644
--- a/modules/visual_script/SCsub
+++ b/modules/visual_script/SCsub
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_vs = env_modules.Clone()
 
diff --git a/modules/visual_script/config.py b/modules/visual_script/config.py
index 087a13a200..b15479797c 100644
--- a/modules/visual_script/config.py
+++ b/modules/visual_script/config.py
@@ -1,12 +1,13 @@
 def can_build(env, platform):
     return True
 
+
 def configure(env):
     pass
 
+
 def get_doc_classes():
     return [
-        "@VisualScript",
         "VisualScriptBasicTypeConstant",
         "VisualScriptBuiltinFunc",
         "VisualScriptClassConstant",
@@ -56,5 +57,6 @@ def get_doc_classes():
         "VisualScriptYield",
     ]
 
+
 def get_doc_path():
     return "doc_classes"
diff --git a/modules/visual_script/doc_classes/@VisualScript.xml b/modules/visual_script/doc_classes/@VisualScript.xml
deleted file mode 100644
index a2b966bfbb..0000000000
--- a/modules/visual_script/doc_classes/@VisualScript.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="@VisualScript" version="4.0">
-	<brief_description>
-		Built-in visual script functions.
-	</brief_description>
-	<description>
-		A list of built-in visual script functions, see [VisualScriptBuiltinFunc] and [VisualScript].
-	</description>
-	<tutorials>
-	</tutorials>
-	<methods>
-	</methods>
-	<constants>
-	</constants>
-</class>
diff --git a/modules/visual_script/doc_classes/VisualScript.xml b/modules/visual_script/doc_classes/VisualScript.xml
index 9cd79aa781..088d84d2ec 100644
--- a/modules/visual_script/doc_classes/VisualScript.xml
+++ b/modules/visual_script/doc_classes/VisualScript.xml
@@ -9,13 +9,13 @@
 		You are most likely to use this class via the Visual Script editor or when writing plugins for it.
 	</description>
 	<tutorials>
-		<link>https://docs.godotengine.org/en/latest/getting_started/scripting/visual_script/index.html</link>
+		<link title="VisualScript tutorial index">https://docs.godotengine.org/en/latest/getting_started/scripting/visual_script/index.html</link>
 	</tutorials>
 	<methods>
 		<method name="add_custom_signal">
 			<return type="void">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
 			<description>
 				Add a custom signal with the specified name to the VisualScript.
@@ -24,7 +24,7 @@
 		<method name="add_function">
 			<return type="void">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
 			<description>
 				Add a function with the specified name to the VisualScript.
@@ -33,7 +33,7 @@
 		<method name="add_node">
 			<return type="void">
 			</return>
-			<argument index="0" name="func" type="String">
+			<argument index="0" name="func" type="StringName">
 			</argument>
 			<argument index="1" name="id" type="int">
 			</argument>
@@ -48,7 +48,7 @@
 		<method name="add_variable">
 			<return type="void">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
 			<argument index="1" name="default_value" type="Variant" default="null">
 			</argument>
@@ -61,7 +61,7 @@
 		<method name="custom_signal_add_argument">
 			<return type="void">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
 			<argument index="1" name="type" type="int" enum="Variant.Type">
 			</argument>
@@ -76,7 +76,7 @@
 		<method name="custom_signal_get_argument_count" qualifiers="const">
 			<return type="int">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
 			<description>
 				Get the count of a custom signal's arguments.
@@ -85,7 +85,7 @@
 		<method name="custom_signal_get_argument_name" qualifiers="const">
 			<return type="String">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
 			<argument index="1" name="argidx" type="int">
 			</argument>
@@ -96,7 +96,7 @@
 		<method name="custom_signal_get_argument_type" qualifiers="const">
 			<return type="int" enum="Variant.Type">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
 			<argument index="1" name="argidx" type="int">
 			</argument>
@@ -107,7 +107,7 @@
 		<method name="custom_signal_remove_argument">
 			<return type="void">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
 			<argument index="1" name="argidx" type="int">
 			</argument>
@@ -118,7 +118,7 @@
 		<method name="custom_signal_set_argument_name">
 			<return type="void">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
 			<argument index="1" name="argidx" type="int">
 			</argument>
@@ -131,7 +131,7 @@
 		<method name="custom_signal_set_argument_type">
 			<return type="void">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
 			<argument index="1" name="argidx" type="int">
 			</argument>
@@ -144,7 +144,7 @@
 		<method name="custom_signal_swap_argument">
 			<return type="void">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
 			<argument index="1" name="argidx" type="int">
 			</argument>
@@ -157,7 +157,7 @@
 		<method name="data_connect">
 			<return type="void">
 			</return>
-			<argument index="0" name="func" type="String">
+			<argument index="0" name="func" type="StringName">
 			</argument>
 			<argument index="1" name="from_node" type="int">
 			</argument>
@@ -174,7 +174,7 @@
 		<method name="data_disconnect">
 			<return type="void">
 			</return>
-			<argument index="0" name="func" type="String">
+			<argument index="0" name="func" type="StringName">
 			</argument>
 			<argument index="1" name="from_node" type="int">
 			</argument>
@@ -191,7 +191,7 @@
 		<method name="get_function_node_id" qualifiers="const">
 			<return type="int">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
 			<description>
 				Returns the id of a function's entry point node.
@@ -200,7 +200,7 @@
 		<method name="get_function_scroll" qualifiers="const">
 			<return type="Vector2">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
 			<description>
 				Returns the position of the center of the screen for a given function.
@@ -209,7 +209,7 @@
 		<method name="get_node" qualifiers="const">
 			<return type="VisualScriptNode">
 			</return>
-			<argument index="0" name="func" type="String">
+			<argument index="0" name="func" type="StringName">
 			</argument>
 			<argument index="1" name="id" type="int">
 			</argument>
@@ -220,7 +220,7 @@
 		<method name="get_node_position" qualifiers="const">
 			<return type="Vector2">
 			</return>
-			<argument index="0" name="func" type="String">
+			<argument index="0" name="func" type="StringName">
 			</argument>
 			<argument index="1" name="id" type="int">
 			</argument>
@@ -231,7 +231,7 @@
 		<method name="get_variable_default_value" qualifiers="const">
 			<return type="Variant">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
 			<description>
 				Returns the default (initial) value of a variable.
@@ -240,7 +240,7 @@
 		<method name="get_variable_export" qualifiers="const">
 			<return type="bool">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
 			<description>
 				Returns whether a variable is exported.
@@ -249,7 +249,7 @@
 		<method name="get_variable_info" qualifiers="const">
 			<return type="Dictionary">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
 			<description>
 				Returns the information for a given variable as a dictionary. The information includes its name, type, hint and usage.
@@ -258,7 +258,7 @@
 		<method name="has_custom_signal" qualifiers="const">
 			<return type="bool">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
 			<description>
 				Returns whether a signal exists with the specified name.
@@ -267,7 +267,7 @@
 		<method name="has_data_connection" qualifiers="const">
 			<return type="bool">
 			</return>
-			<argument index="0" name="func" type="String">
+			<argument index="0" name="func" type="StringName">
 			</argument>
 			<argument index="1" name="from_node" type="int">
 			</argument>
@@ -284,7 +284,7 @@
 		<method name="has_function" qualifiers="const">
 			<return type="bool">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
 			<description>
 				Returns whether a function exists with the specified name.
@@ -293,7 +293,7 @@
 		<method name="has_node" qualifiers="const">
 			<return type="bool">
 			</return>
-			<argument index="0" name="func" type="String">
+			<argument index="0" name="func" type="StringName">
 			</argument>
 			<argument index="1" name="id" type="int">
 			</argument>
@@ -304,7 +304,7 @@
 		<method name="has_sequence_connection" qualifiers="const">
 			<return type="bool">
 			</return>
-			<argument index="0" name="func" type="String">
+			<argument index="0" name="func" type="StringName">
 			</argument>
 			<argument index="1" name="from_node" type="int">
 			</argument>
@@ -319,7 +319,7 @@
 		<method name="has_variable" qualifiers="const">
 			<return type="bool">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
 			<description>
 				Returns whether a variable exists with the specified name.
@@ -328,7 +328,7 @@
 		<method name="remove_custom_signal">
 			<return type="void">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
 			<description>
 				Remove a custom signal with the given name.
@@ -337,7 +337,7 @@
 		<method name="remove_function">
 			<return type="void">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
 			<description>
 				Remove a specific function and its nodes from the script.
@@ -346,7 +346,7 @@
 		<method name="remove_node">
 			<return type="void">
 			</return>
-			<argument index="0" name="func" type="String">
+			<argument index="0" name="func" type="StringName">
 			</argument>
 			<argument index="1" name="id" type="int">
 			</argument>
@@ -357,7 +357,7 @@
 		<method name="remove_variable">
 			<return type="void">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
 			<description>
 				Remove a variable with the given name.
@@ -366,9 +366,9 @@
 		<method name="rename_custom_signal">
 			<return type="void">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
-			<argument index="1" name="new_name" type="String">
+			<argument index="1" name="new_name" type="StringName">
 			</argument>
 			<description>
 				Change the name of a custom signal.
@@ -377,9 +377,9 @@
 		<method name="rename_function">
 			<return type="void">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
-			<argument index="1" name="new_name" type="String">
+			<argument index="1" name="new_name" type="StringName">
 			</argument>
 			<description>
 				Change the name of a function.
@@ -388,9 +388,9 @@
 		<method name="rename_variable">
 			<return type="void">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
-			<argument index="1" name="new_name" type="String">
+			<argument index="1" name="new_name" type="StringName">
 			</argument>
 			<description>
 				Change the name of a variable.
@@ -399,7 +399,7 @@
 		<method name="sequence_connect">
 			<return type="void">
 			</return>
-			<argument index="0" name="func" type="String">
+			<argument index="0" name="func" type="StringName">
 			</argument>
 			<argument index="1" name="from_node" type="int">
 			</argument>
@@ -415,7 +415,7 @@
 		<method name="sequence_disconnect">
 			<return type="void">
 			</return>
-			<argument index="0" name="func" type="String">
+			<argument index="0" name="func" type="StringName">
 			</argument>
 			<argument index="1" name="from_node" type="int">
 			</argument>
@@ -430,7 +430,7 @@
 		<method name="set_function_scroll">
 			<return type="void">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
 			<argument index="1" name="ofs" type="Vector2">
 			</argument>
@@ -441,7 +441,7 @@
 		<method name="set_instance_base_type">
 			<return type="void">
 			</return>
-			<argument index="0" name="type" type="String">
+			<argument index="0" name="type" type="StringName">
 			</argument>
 			<description>
 				Set the base type of the script.
@@ -450,7 +450,7 @@
 		<method name="set_node_position">
 			<return type="void">
 			</return>
-			<argument index="0" name="func" type="String">
+			<argument index="0" name="func" type="StringName">
 			</argument>
 			<argument index="1" name="id" type="int">
 			</argument>
@@ -463,7 +463,7 @@
 		<method name="set_variable_default_value">
 			<return type="void">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
 			<argument index="1" name="value" type="Variant">
 			</argument>
@@ -474,7 +474,7 @@
 		<method name="set_variable_export">
 			<return type="void">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
 			<argument index="1" name="enable" type="bool">
 			</argument>
@@ -485,7 +485,7 @@
 		<method name="set_variable_info">
 			<return type="void">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="name" type="StringName">
 			</argument>
 			<argument index="1" name="value" type="Dictionary">
 			</argument>
diff --git a/modules/visual_script/doc_classes/VisualScriptBasicTypeConstant.xml b/modules/visual_script/doc_classes/VisualScriptBasicTypeConstant.xml
index c8e391c4a1..4d07f878a2 100644
--- a/modules/visual_script/doc_classes/VisualScriptBasicTypeConstant.xml
+++ b/modules/visual_script/doc_classes/VisualScriptBasicTypeConstant.xml
@@ -14,7 +14,7 @@
 		<member name="basic_type" type="int" setter="set_basic_type" getter="get_basic_type" enum="Variant.Type" default="0">
 			The type to get the constant from.
 		</member>
-		<member name="constant" type="String" setter="set_basic_type_constant" getter="get_basic_type_constant">
+		<member name="constant" type="StringName" setter="set_basic_type_constant" getter="get_basic_type_constant">
 			The name of the constant to return.
 		</member>
 	</members>
diff --git a/modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml b/modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml
index 95085d9652..ef4183e6f6 100644
--- a/modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml
+++ b/modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml
@@ -89,7 +89,7 @@
 		<constant name="MATH_EASE" value="23" enum="BuiltinFunc">
 			Easing function, based on exponent. 0 is constant, 1 is linear, 0 to 1 is ease-in, 1+ is ease out. Negative values are in-out/out in.
 		</constant>
-		<constant name="MATH_DECIMALS" value="24" enum="BuiltinFunc">
+		<constant name="MATH_STEP_DECIMALS" value="24" enum="BuiltinFunc">
 			Return the number of digit places after the decimal that the first non-zero digit occurs.
 		</constant>
 		<constant name="MATH_STEPIFY" value="25" enum="BuiltinFunc">
@@ -197,10 +197,10 @@
 			Deserialize a [Variant] from a string serialized using [constant VAR_TO_STR].
 		</constant>
 		<constant name="VAR_TO_BYTES" value="61" enum="BuiltinFunc">
-			Serialize a [Variant] to a [PoolByteArray].
+			Serialize a [Variant] to a [PackedByteArray].
 		</constant>
 		<constant name="BYTES_TO_VAR" value="62" enum="BuiltinFunc">
-			Deserialize a [Variant] from a [PoolByteArray] serialized using [constant VAR_TO_BYTES].
+			Deserialize a [Variant] from a [PackedByteArray] serialized using [constant VAR_TO_BYTES].
 		</constant>
 		<constant name="COLORN" value="63" enum="BuiltinFunc">
 			Return the [Color] with the given name and alpha ranging from 0 to 1.
diff --git a/modules/visual_script/doc_classes/VisualScriptClassConstant.xml b/modules/visual_script/doc_classes/VisualScriptClassConstant.xml
index cf35808823..de5d731cc0 100644
--- a/modules/visual_script/doc_classes/VisualScriptClassConstant.xml
+++ b/modules/visual_script/doc_classes/VisualScriptClassConstant.xml
@@ -15,10 +15,10 @@
 	<methods>
 	</methods>
 	<members>
-		<member name="base_type" type="String" setter="set_base_type" getter="get_base_type" default="&quot;Object&quot;">
+		<member name="base_type" type="StringName" setter="set_base_type" getter="get_base_type" default="@&quot;Object&quot;">
 			The constant's parent class.
 		</member>
-		<member name="constant" type="String" setter="set_class_constant" getter="get_class_constant" default="&quot;&quot;">
+		<member name="constant" type="StringName" setter="set_class_constant" getter="get_class_constant" default="@&quot;&quot;">
 			The constant to return. See the given class for its available constants.
 		</member>
 	</members>
diff --git a/modules/visual_script/doc_classes/VisualScriptEmitSignal.xml b/modules/visual_script/doc_classes/VisualScriptEmitSignal.xml
index 60a19ac7a7..5c9c8d3eca 100644
--- a/modules/visual_script/doc_classes/VisualScriptEmitSignal.xml
+++ b/modules/visual_script/doc_classes/VisualScriptEmitSignal.xml
@@ -15,7 +15,7 @@
 	<methods>
 	</methods>
 	<members>
-		<member name="signal" type="String" setter="set_signal" getter="get_signal" default="&quot;&quot;">
+		<member name="signal" type="StringName" setter="set_signal" getter="get_signal" default="@&quot;&quot;">
 			The signal to emit.
 		</member>
 	</members>
diff --git a/modules/visual_script/doc_classes/VisualScriptFunctionCall.xml b/modules/visual_script/doc_classes/VisualScriptFunctionCall.xml
index 16c3af7ab2..2d0fac1fa0 100644
--- a/modules/visual_script/doc_classes/VisualScriptFunctionCall.xml
+++ b/modules/visual_script/doc_classes/VisualScriptFunctionCall.xml
@@ -11,19 +11,19 @@
 	<members>
 		<member name="base_script" type="String" setter="set_base_script" getter="get_base_script">
 		</member>
-		<member name="base_type" type="String" setter="set_base_type" getter="get_base_type" default="&quot;Object&quot;">
+		<member name="base_type" type="StringName" setter="set_base_type" getter="get_base_type" default="@&quot;Object&quot;">
 		</member>
 		<member name="basic_type" type="int" setter="set_basic_type" getter="get_basic_type" enum="Variant.Type">
 		</member>
 		<member name="call_mode" type="int" setter="set_call_mode" getter="get_call_mode" enum="VisualScriptFunctionCall.CallMode" default="0">
 		</member>
-		<member name="function" type="String" setter="set_function" getter="get_function" default="&quot;&quot;">
+		<member name="function" type="StringName" setter="set_function" getter="get_function" default="@&quot;&quot;">
 		</member>
 		<member name="node_path" type="NodePath" setter="set_base_path" getter="get_base_path">
 		</member>
 		<member name="rpc_call_mode" type="int" setter="set_rpc_call_mode" getter="get_rpc_call_mode" enum="VisualScriptFunctionCall.RPCCallMode" default="0">
 		</member>
-		<member name="singleton" type="String" setter="set_singleton" getter="get_singleton">
+		<member name="singleton" type="StringName" setter="set_singleton" getter="get_singleton">
 		</member>
 		<member name="use_default_args" type="int" setter="set_use_default_args" getter="get_use_default_args">
 		</member>
diff --git a/modules/visual_script/doc_classes/VisualScriptInputAction.xml b/modules/visual_script/doc_classes/VisualScriptInputAction.xml
index 0b6325bf0a..6c296fdb4b 100644
--- a/modules/visual_script/doc_classes/VisualScriptInputAction.xml
+++ b/modules/visual_script/doc_classes/VisualScriptInputAction.xml
@@ -9,7 +9,7 @@
 	<methods>
 	</methods>
 	<members>
-		<member name="action" type="String" setter="set_action_name" getter="get_action_name" default="&quot;&quot;">
+		<member name="action" type="StringName" setter="set_action_name" getter="get_action_name" default="@&quot;&quot;">
 		</member>
 		<member name="mode" type="int" setter="set_action_mode" getter="get_action_mode" enum="VisualScriptInputAction.Mode" default="0">
 		</member>
diff --git a/modules/visual_script/doc_classes/VisualScriptLocalVar.xml b/modules/visual_script/doc_classes/VisualScriptLocalVar.xml
index 6c31ae1a30..c3741eea89 100644
--- a/modules/visual_script/doc_classes/VisualScriptLocalVar.xml
+++ b/modules/visual_script/doc_classes/VisualScriptLocalVar.xml
@@ -18,7 +18,7 @@
 		<member name="type" type="int" setter="set_var_type" getter="get_var_type" enum="Variant.Type" default="0">
 			The local variable's type.
 		</member>
-		<member name="var_name" type="String" setter="set_var_name" getter="get_var_name" default="&quot;new_local&quot;">
+		<member name="var_name" type="StringName" setter="set_var_name" getter="get_var_name" default="@&quot;new_local&quot;">
 			The local variable's name.
 		</member>
 	</members>
diff --git a/modules/visual_script/doc_classes/VisualScriptLocalVarSet.xml b/modules/visual_script/doc_classes/VisualScriptLocalVarSet.xml
index 0a9a509958..619bbb90ca 100644
--- a/modules/visual_script/doc_classes/VisualScriptLocalVarSet.xml
+++ b/modules/visual_script/doc_classes/VisualScriptLocalVarSet.xml
@@ -20,7 +20,7 @@
 		<member name="type" type="int" setter="set_var_type" getter="get_var_type" enum="Variant.Type" default="0">
 			The local variable's type.
 		</member>
-		<member name="var_name" type="String" setter="set_var_name" getter="get_var_name" default="&quot;new_local&quot;">
+		<member name="var_name" type="StringName" setter="set_var_name" getter="get_var_name" default="@&quot;new_local&quot;">
 			The local variable's name.
 		</member>
 	</members>
diff --git a/modules/visual_script/doc_classes/VisualScriptPropertyGet.xml b/modules/visual_script/doc_classes/VisualScriptPropertyGet.xml
index cf436116b8..f13d449064 100644
--- a/modules/visual_script/doc_classes/VisualScriptPropertyGet.xml
+++ b/modules/visual_script/doc_classes/VisualScriptPropertyGet.xml
@@ -11,15 +11,15 @@
 	<members>
 		<member name="base_script" type="String" setter="set_base_script" getter="get_base_script">
 		</member>
-		<member name="base_type" type="String" setter="set_base_type" getter="get_base_type" default="&quot;Object&quot;">
+		<member name="base_type" type="StringName" setter="set_base_type" getter="get_base_type" default="@&quot;Object&quot;">
 		</member>
 		<member name="basic_type" type="int" setter="set_basic_type" getter="get_basic_type" enum="Variant.Type">
 		</member>
-		<member name="index" type="String" setter="set_index" getter="get_index">
+		<member name="index" type="StringName" setter="set_index" getter="get_index">
 		</member>
 		<member name="node_path" type="NodePath" setter="set_base_path" getter="get_base_path">
 		</member>
-		<member name="property" type="String" setter="set_property" getter="get_property" default="&quot;&quot;">
+		<member name="property" type="StringName" setter="set_property" getter="get_property" default="@&quot;&quot;">
 		</member>
 		<member name="set_mode" type="int" setter="set_call_mode" getter="get_call_mode" enum="VisualScriptPropertyGet.CallMode" default="0">
 		</member>
diff --git a/modules/visual_script/doc_classes/VisualScriptPropertySet.xml b/modules/visual_script/doc_classes/VisualScriptPropertySet.xml
index 357b4b9f5c..629576e261 100644
--- a/modules/visual_script/doc_classes/VisualScriptPropertySet.xml
+++ b/modules/visual_script/doc_classes/VisualScriptPropertySet.xml
@@ -13,15 +13,15 @@
 		</member>
 		<member name="base_script" type="String" setter="set_base_script" getter="get_base_script">
 		</member>
-		<member name="base_type" type="String" setter="set_base_type" getter="get_base_type" default="&quot;Object&quot;">
+		<member name="base_type" type="StringName" setter="set_base_type" getter="get_base_type" default="@&quot;Object&quot;">
 		</member>
 		<member name="basic_type" type="int" setter="set_basic_type" getter="get_basic_type" enum="Variant.Type">
 		</member>
-		<member name="index" type="String" setter="set_index" getter="get_index">
+		<member name="index" type="StringName" setter="set_index" getter="get_index">
 		</member>
 		<member name="node_path" type="NodePath" setter="set_base_path" getter="get_base_path">
 		</member>
-		<member name="property" type="String" setter="set_property" getter="get_property" default="&quot;&quot;">
+		<member name="property" type="StringName" setter="set_property" getter="get_property" default="@&quot;&quot;">
 		</member>
 		<member name="set_mode" type="int" setter="set_call_mode" getter="get_call_mode" enum="VisualScriptPropertySet.CallMode" default="0">
 		</member>
diff --git a/modules/visual_script/doc_classes/VisualScriptTypeCast.xml b/modules/visual_script/doc_classes/VisualScriptTypeCast.xml
index 43fe9d16ea..80a8d31041 100644
--- a/modules/visual_script/doc_classes/VisualScriptTypeCast.xml
+++ b/modules/visual_script/doc_classes/VisualScriptTypeCast.xml
@@ -11,7 +11,7 @@
 	<members>
 		<member name="base_script" type="String" setter="set_base_script" getter="get_base_script" default="&quot;&quot;">
 		</member>
-		<member name="base_type" type="String" setter="set_base_type" getter="get_base_type" default="&quot;Object&quot;">
+		<member name="base_type" type="StringName" setter="set_base_type" getter="get_base_type" default="@&quot;Object&quot;">
 		</member>
 	</members>
 	<constants>
diff --git a/modules/visual_script/doc_classes/VisualScriptVariableGet.xml b/modules/visual_script/doc_classes/VisualScriptVariableGet.xml
index 0746ab293e..d182e14e4d 100644
--- a/modules/visual_script/doc_classes/VisualScriptVariableGet.xml
+++ b/modules/visual_script/doc_classes/VisualScriptVariableGet.xml
@@ -15,7 +15,7 @@
 	<methods>
 	</methods>
 	<members>
-		<member name="var_name" type="String" setter="set_variable" getter="get_variable" default="&quot;&quot;">
+		<member name="var_name" type="StringName" setter="set_variable" getter="get_variable" default="@&quot;&quot;">
 			The variable's name.
 		</member>
 	</members>
diff --git a/modules/visual_script/doc_classes/VisualScriptVariableSet.xml b/modules/visual_script/doc_classes/VisualScriptVariableSet.xml
index e7d83e60ab..3bd392dd85 100644
--- a/modules/visual_script/doc_classes/VisualScriptVariableSet.xml
+++ b/modules/visual_script/doc_classes/VisualScriptVariableSet.xml
@@ -16,7 +16,7 @@
 	<methods>
 	</methods>
 	<members>
-		<member name="var_name" type="String" setter="set_variable" getter="get_variable" default="&quot;&quot;">
+		<member name="var_name" type="StringName" setter="set_variable" getter="get_variable" default="@&quot;&quot;">
 			The variable's name.
 		</member>
 	</members>
diff --git a/modules/visual_script/doc_classes/VisualScriptYieldSignal.xml b/modules/visual_script/doc_classes/VisualScriptYieldSignal.xml
index 8f6941ce1e..483cdfeaf8 100644
--- a/modules/visual_script/doc_classes/VisualScriptYieldSignal.xml
+++ b/modules/visual_script/doc_classes/VisualScriptYieldSignal.xml
@@ -9,13 +9,13 @@
 	<methods>
 	</methods>
 	<members>
-		<member name="base_type" type="String" setter="set_base_type" getter="get_base_type" default="&quot;Object&quot;">
+		<member name="base_type" type="StringName" setter="set_base_type" getter="get_base_type" default="@&quot;Object&quot;">
 		</member>
 		<member name="call_mode" type="int" setter="set_call_mode" getter="get_call_mode" enum="VisualScriptYieldSignal.CallMode" default="0">
 		</member>
 		<member name="node_path" type="NodePath" setter="set_base_path" getter="get_base_path">
 		</member>
-		<member name="signal" type="String" setter="set_signal" getter="get_signal" default="&quot;&quot;">
+		<member name="signal" type="StringName" setter="set_signal" getter="get_signal" default="@&quot;&quot;">
 		</member>
 	</members>
 	<constants>
diff --git a/modules/visual_script/icons/icon_visual_script.svg b/modules/visual_script/icons/VisualScript.svg
index f6475d590e..f6475d590e 100644
--- a/modules/visual_script/icons/icon_visual_script.svg
+++ b/modules/visual_script/icons/VisualScript.svg
diff --git a/modules/visual_script/register_types.cpp b/modules/visual_script/register_types.cpp
index 63bd88ad81..8afed1229f 100644
--- a/modules/visual_script/register_types.cpp
+++ b/modules/visual_script/register_types.cpp
@@ -41,13 +41,12 @@
 #include "visual_script_nodes.h"
 #include "visual_script_yield_nodes.h"
 
-VisualScriptLanguage *visual_script_language = NULL;
+VisualScriptLanguage *visual_script_language = nullptr;
 #ifdef TOOLS_ENABLED
-static _VisualScriptEditor *vs_editor_singleton = NULL;
+static _VisualScriptEditor *vs_editor_singleton = nullptr;
 #endif
 
 void register_visual_script_types() {
-
 	visual_script_language = memnew(VisualScriptLanguage);
 	//script_language_gd->init();
 	ScriptServer::register_language(visual_script_language);
@@ -125,7 +124,6 @@ void register_visual_script_types() {
 }
 
 void unregister_visual_script_types() {
-
 	unregister_visual_script_nodes();
 
 	ScriptServer::unregister_language(visual_script_language);
@@ -136,6 +134,7 @@ void unregister_visual_script_types() {
 		memdelete(vs_editor_singleton);
 	}
 #endif
-	if (visual_script_language)
+	if (visual_script_language) {
 		memdelete(visual_script_language);
+	}
 }
diff --git a/modules/visual_script/register_types.h b/modules/visual_script/register_types.h
index 546c2fbff3..c18c2930b1 100644
--- a/modules/visual_script/register_types.h
+++ b/modules/visual_script/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef VISUAL_SCRIPT_REGISTER_TYPES_H
+#define VISUAL_SCRIPT_REGISTER_TYPES_H
+
 void register_visual_script_types();
 void unregister_visual_script_types();
+
+#endif // VISUAL_SCRIPT_REGISTER_TYPES_H
diff --git a/modules/visual_script/visual_script.cpp b/modules/visual_script/visual_script.cpp
index c591e3b5c2..1af4b46e22 100644
--- a/modules/visual_script/visual_script.cpp
+++ b/modules/visual_script/visual_script.cpp
@@ -42,7 +42,6 @@ void VisualScriptNode::set_breakpoint(bool p_breakpoint) {
 }
 
 bool VisualScriptNode::is_breakpoint() const {
-
 	return breakpoint;
 }
 
@@ -51,7 +50,6 @@ void VisualScriptNode::ports_changed_notify() {
 }
 
 void VisualScriptNode::set_default_input_value(int p_port, const Variant &p_value) {
-
 	ERR_FAIL_INDEX(p_port, default_input_values.size());
 
 	default_input_values[p_port] = p_value;
@@ -64,13 +62,11 @@ void VisualScriptNode::set_default_input_value(int p_port, const Variant &p_valu
 }
 
 Variant VisualScriptNode::get_default_input_value(int p_port) const {
-
 	ERR_FAIL_INDEX_V(p_port, default_input_values.size(), Variant());
 	return default_input_values[p_port];
 }
 
 void VisualScriptNode::_set_default_input_values(Array p_values) {
-
 	default_input_values = p_values;
 }
 
@@ -79,27 +75,25 @@ void VisualScriptNode::validate_input_default_values() {
 
 	//actually validate on save
 	for (int i = 0; i < get_input_value_port_count(); i++) {
-
 		Variant::Type expected = get_input_value_port_info(i).type;
 
 		if (expected == Variant::NIL || expected == default_input_values[i].get_type()) {
 			continue;
 		} else {
 			//not the same, reconvert
-			Variant::CallError ce;
+			Callable::CallError ce;
 			Variant existing = default_input_values[i];
 			const Variant *existingp = &existing;
 			default_input_values[i] = Variant::construct(expected, &existingp, 1, ce, false);
-			if (ce.error != Variant::CallError::CALL_OK) {
+			if (ce.error != Callable::CallError::CALL_OK) {
 				//could not convert? force..
-				default_input_values[i] = Variant::construct(expected, NULL, 0, ce, false);
+				default_input_values[i] = Variant::construct(expected, nullptr, 0, ce, false);
 			}
 		}
 	}
 }
 
 Array VisualScriptNode::_get_default_input_values() const {
-
 	//validate on save, since on load there is little info about this
 	Array values = default_input_values;
 	values.resize(get_input_value_port_count());
@@ -112,7 +106,6 @@ String VisualScriptNode::get_text() const {
 }
 
 void VisualScriptNode::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("get_visual_script"), &VisualScriptNode::get_visual_script);
 	ClassDB::bind_method(D_METHOD("set_default_input_value", "port_idx", "value"), &VisualScriptNode::set_default_input_value);
 	ClassDB::bind_method(D_METHOD("get_default_input_value", "port_idx"), &VisualScriptNode::get_default_input_value);
@@ -125,7 +118,6 @@ void VisualScriptNode::_bind_methods() {
 }
 
 VisualScriptNode::TypeGuess VisualScriptNode::guess_output_type(TypeGuess *p_inputs, int p_output) const {
-
 	PropertyInfo pinfo = get_output_value_port_info(p_output);
 
 	TypeGuess tg;
@@ -139,9 +131,9 @@ VisualScriptNode::TypeGuess VisualScriptNode::guess_output_type(TypeGuess *p_inp
 }
 
 Ref<VisualScript> VisualScriptNode::get_visual_script() const {
-
-	if (scripts_used.size())
+	if (scripts_used.size()) {
 		return Ref<VisualScript>(scripts_used.front()->get());
+	}
 
 	return Ref<VisualScript>();
 }
@@ -155,13 +147,11 @@ VisualScriptNode::VisualScriptNode() {
 /////////////////////
 
 VisualScriptNodeInstance::VisualScriptNodeInstance() {
-
-	sequence_outputs = NULL;
-	input_ports = NULL;
+	sequence_outputs = nullptr;
+	input_ports = nullptr;
 }
 
 VisualScriptNodeInstance::~VisualScriptNodeInstance() {
-
 	if (sequence_outputs) {
 		memdelete_arr(sequence_outputs);
 	}
@@ -176,7 +166,6 @@ VisualScriptNodeInstance::~VisualScriptNodeInstance() {
 }
 
 void VisualScript::add_function(const StringName &p_name) {
-
 	ERR_FAIL_COND(instances.size());
 	ERR_FAIL_COND(!String(p_name).is_valid_identifier());
 	ERR_FAIL_COND(functions.has(p_name));
@@ -186,17 +175,15 @@ void VisualScript::add_function(const StringName &p_name) {
 }
 
 bool VisualScript::has_function(const StringName &p_name) const {
-
 	return functions.has(p_name);
 }
-void VisualScript::remove_function(const StringName &p_name) {
 
+void VisualScript::remove_function(const StringName &p_name) {
 	ERR_FAIL_COND(instances.size());
 	ERR_FAIL_COND(!functions.has(p_name));
 
 	for (Map<int, Function::NodeData>::Element *E = functions[p_name].nodes.front(); E; E = E->next()) {
-
-		E->get().node->disconnect("ports_changed", this, "_node_ports_changed");
+		E->get().node->disconnect("ports_changed", callable_mp(this, &VisualScript::_node_ports_changed));
 		E->get().node->scripts_used.erase(this);
 	}
 
@@ -204,11 +191,11 @@ void VisualScript::remove_function(const StringName &p_name) {
 }
 
 void VisualScript::rename_function(const StringName &p_name, const StringName &p_new_name) {
-
 	ERR_FAIL_COND(instances.size());
 	ERR_FAIL_COND(!functions.has(p_name));
-	if (p_new_name == p_name)
+	if (p_new_name == p_name) {
 		return;
+	}
 
 	ERR_FAIL_COND(!String(p_new_name).is_valid_identifier());
 
@@ -221,19 +208,16 @@ void VisualScript::rename_function(const StringName &p_name, const StringName &p
 }
 
 void VisualScript::set_function_scroll(const StringName &p_name, const Vector2 &p_scroll) {
-
 	ERR_FAIL_COND(!functions.has(p_name));
 	functions[p_name].scroll = p_scroll;
 }
 
 Vector2 VisualScript::get_function_scroll(const StringName &p_name) const {
-
 	ERR_FAIL_COND_V(!functions.has(p_name), Vector2());
 	return functions[p_name].scroll;
 }
 
 void VisualScript::get_function_list(List<StringName> *r_functions) const {
-
 	for (const Map<StringName, Function>::Element *E = functions.front(); E; E = E->next()) {
 		r_functions->push_back(E->key());
 	}
@@ -242,18 +226,15 @@ void VisualScript::get_function_list(List<StringName> *r_functions) const {
 }
 
 int VisualScript::get_function_node_id(const StringName &p_name) const {
-
 	ERR_FAIL_COND_V(!functions.has(p_name), -1);
 
 	return functions[p_name].function_id;
 }
 
 void VisualScript::_node_ports_changed(int p_id) {
-
 	StringName function;
 
 	for (Map<StringName, Function>::Element *E = functions.front(); E; E = E->next()) {
-
 		if (E->get().nodes.has(p_id)) {
 			function = E->key();
 			break;
@@ -274,11 +255,9 @@ void VisualScript::_node_ports_changed(int p_id) {
 
 		for (Set<SequenceConnection>::Element *E = func.sequence_connections.front(); E; E = E->next()) {
 			if (E->get().from_node == p_id && E->get().from_output >= vsn->get_output_sequence_port_count()) {
-
 				to_remove.push_back(E->get());
 			}
 			if (E->get().to_node == p_id && !vsn->has_input_sequence_port()) {
-
 				to_remove.push_back(E->get());
 			}
 		}
@@ -290,7 +269,6 @@ void VisualScript::_node_ports_changed(int p_id) {
 	}
 
 	{
-
 		List<DataConnection> to_remove;
 
 		for (Set<DataConnection>::Element *E = func.data_connections.front(); E; E = E->next()) {
@@ -315,12 +293,10 @@ void VisualScript::_node_ports_changed(int p_id) {
 }
 
 void VisualScript::add_node(const StringName &p_func, int p_id, const Ref<VisualScriptNode> &p_node, const Point2 &p_pos) {
-
 	ERR_FAIL_COND(instances.size());
 	ERR_FAIL_COND(!functions.has(p_func));
 
 	for (Map<StringName, Function>::Element *E = functions.front(); E; E = E->next()) {
-
 		ERR_FAIL_COND(E->get().nodes.has(p_id)); //id can exist only one in script, even for different functions
 	}
 
@@ -338,7 +314,7 @@ void VisualScript::add_node(const StringName &p_func, int p_id, const Ref<Visual
 	nd.pos = p_pos;
 
 	Ref<VisualScriptNode> vsn = p_node;
-	vsn->connect("ports_changed", this, "_node_ports_changed", varray(p_id));
+	vsn->connect("ports_changed", callable_mp(this, &VisualScript::_node_ports_changed), varray(p_id));
 	vsn->scripts_used.insert(this);
 	vsn->validate_input_default_values(); // Validate when fully loaded
 
@@ -346,7 +322,6 @@ void VisualScript::add_node(const StringName &p_func, int p_id, const Ref<Visual
 }
 
 void VisualScript::remove_node(const StringName &p_func, int p_id) {
-
 	ERR_FAIL_COND(instances.size());
 	ERR_FAIL_COND(!functions.has(p_func));
 	Function &func = functions[p_func];
@@ -368,7 +343,6 @@ void VisualScript::remove_node(const StringName &p_func, int p_id) {
 	}
 
 	{
-
 		List<DataConnection> to_remove;
 
 		for (Set<DataConnection>::Element *E = func.data_connections.front(); E; E = E->next()) {
@@ -387,14 +361,13 @@ void VisualScript::remove_node(const StringName &p_func, int p_id) {
 		func.function_id = -1; //revert to invalid
 	}
 
-	func.nodes[p_id].node->disconnect("ports_changed", this, "_node_ports_changed");
+	func.nodes[p_id].node->disconnect("ports_changed", callable_mp(this, &VisualScript::_node_ports_changed));
 	func.nodes[p_id].node->scripts_used.erase(this);
 
 	func.nodes.erase(p_id);
 }
 
 bool VisualScript::has_node(const StringName &p_func, int p_id) const {
-
 	ERR_FAIL_COND_V(!functions.has(p_func), false);
 	const Function &func = functions[p_func];
 
@@ -402,7 +375,6 @@ bool VisualScript::has_node(const StringName &p_func, int p_id) const {
 }
 
 Ref<VisualScriptNode> VisualScript::get_node(const StringName &p_func, int p_id) const {
-
 	ERR_FAIL_COND_V(!functions.has(p_func), Ref<VisualScriptNode>());
 	const Function &func = functions[p_func];
 
@@ -412,7 +384,6 @@ Ref<VisualScriptNode> VisualScript::get_node(const StringName &p_func, int p_id)
 }
 
 void VisualScript::set_node_position(const StringName &p_func, int p_id, const Point2 &p_pos) {
-
 	ERR_FAIL_COND(instances.size());
 	ERR_FAIL_COND(!functions.has(p_func));
 	Function &func = functions[p_func];
@@ -422,7 +393,6 @@ void VisualScript::set_node_position(const StringName &p_func, int p_id, const P
 }
 
 Point2 VisualScript::get_node_position(const StringName &p_func, int p_id) const {
-
 	ERR_FAIL_COND_V(!functions.has(p_func), Point2());
 	const Function &func = functions[p_func];
 
@@ -431,7 +401,6 @@ Point2 VisualScript::get_node_position(const StringName &p_func, int p_id) const
 }
 
 void VisualScript::get_node_list(const StringName &p_func, List<int> *r_nodes) const {
-
 	ERR_FAIL_COND(!functions.has(p_func));
 	const Function &func = functions[p_func];
 
@@ -441,7 +410,6 @@ void VisualScript::get_node_list(const StringName &p_func, List<int> *r_nodes) c
 }
 
 void VisualScript::sequence_connect(const StringName &p_func, int p_from_node, int p_from_output, int p_to_node) {
-
 	ERR_FAIL_COND(instances.size());
 	ERR_FAIL_COND(!functions.has(p_func));
 	Function &func = functions[p_func];
@@ -456,7 +424,6 @@ void VisualScript::sequence_connect(const StringName &p_func, int p_from_node, i
 }
 
 void VisualScript::sequence_disconnect(const StringName &p_func, int p_from_node, int p_from_output, int p_to_node) {
-
 	ERR_FAIL_COND(!functions.has(p_func));
 	Function &func = functions[p_func];
 
@@ -470,7 +437,6 @@ void VisualScript::sequence_disconnect(const StringName &p_func, int p_from_node
 }
 
 bool VisualScript::has_sequence_connection(const StringName &p_func, int p_from_node, int p_from_output, int p_to_node) const {
-
 	ERR_FAIL_COND_V(!functions.has(p_func), false);
 	const Function &func = functions[p_func];
 
@@ -483,7 +449,6 @@ bool VisualScript::has_sequence_connection(const StringName &p_func, int p_from_
 }
 
 void VisualScript::get_sequence_connection_list(const StringName &p_func, List<SequenceConnection> *r_connection) const {
-
 	ERR_FAIL_COND(!functions.has(p_func));
 	const Function &func = functions[p_func];
 
@@ -493,7 +458,6 @@ void VisualScript::get_sequence_connection_list(const StringName &p_func, List<S
 }
 
 void VisualScript::data_connect(const StringName &p_func, int p_from_node, int p_from_port, int p_to_node, int p_to_port) {
-
 	ERR_FAIL_COND(instances.size());
 	ERR_FAIL_COND(!functions.has(p_func));
 	Function &func = functions[p_func];
@@ -510,7 +474,6 @@ void VisualScript::data_connect(const StringName &p_func, int p_from_node, int p
 }
 
 void VisualScript::data_disconnect(const StringName &p_func, int p_from_node, int p_from_port, int p_to_node, int p_to_port) {
-
 	ERR_FAIL_COND(!functions.has(p_func));
 	Function &func = functions[p_func];
 
@@ -526,7 +489,6 @@ void VisualScript::data_disconnect(const StringName &p_func, int p_from_node, in
 }
 
 bool VisualScript::has_data_connection(const StringName &p_func, int p_from_node, int p_from_port, int p_to_node, int p_to_port) const {
-
 	ERR_FAIL_COND_V(!functions.has(p_func), false);
 	const Function &func = functions[p_func];
 
@@ -540,20 +502,19 @@ bool VisualScript::has_data_connection(const StringName &p_func, int p_from_node
 }
 
 bool VisualScript::is_input_value_port_connected(const StringName &p_func, int p_node, int p_port) const {
-
 	ERR_FAIL_COND_V(!functions.has(p_func), false);
 	const Function &func = functions[p_func];
 
 	for (const Set<DataConnection>::Element *E = func.data_connections.front(); E; E = E->next()) {
-		if (E->get().to_node == p_node && E->get().to_port == p_port)
+		if (E->get().to_node == p_node && E->get().to_port == p_port) {
 			return true;
+		}
 	}
 
 	return false;
 }
 
 bool VisualScript::get_input_value_port_connection_source(const StringName &p_func, int p_node, int p_port, int *r_node, int *r_port) const {
-
 	ERR_FAIL_COND_V(!functions.has(p_func), false);
 	const Function &func = functions[p_func];
 
@@ -569,7 +530,6 @@ bool VisualScript::get_input_value_port_connection_source(const StringName &p_fu
 }
 
 void VisualScript::get_data_connection_list(const StringName &p_func, List<DataConnection> *r_connection) const {
-
 	ERR_FAIL_COND(!functions.has(p_func));
 	const Function &func = functions[p_func];
 
@@ -583,7 +543,6 @@ void VisualScript::set_tool_enabled(bool p_enabled) {
 }
 
 void VisualScript::add_variable(const StringName &p_name, const Variant &p_default_value, bool p_export) {
-
 	ERR_FAIL_COND(instances.size());
 	ERR_FAIL_COND(!String(p_name).is_valid_identifier());
 	ERR_FAIL_COND(variables.has(p_name));
@@ -603,12 +562,10 @@ void VisualScript::add_variable(const StringName &p_name, const Variant &p_defau
 }
 
 bool VisualScript::has_variable(const StringName &p_name) const {
-
 	return variables.has(p_name);
 }
 
 void VisualScript::remove_variable(const StringName &p_name) {
-
 	ERR_FAIL_COND(!variables.has(p_name));
 	variables.erase(p_name);
 
@@ -618,7 +575,6 @@ void VisualScript::remove_variable(const StringName &p_name) {
 }
 
 void VisualScript::set_variable_default_value(const StringName &p_name, const Variant &p_value) {
-
 	ERR_FAIL_COND(!variables.has(p_name));
 
 	variables[p_name].default_value = p_value;
@@ -627,13 +583,13 @@ void VisualScript::set_variable_default_value(const StringName &p_name, const Va
 	_update_placeholders();
 #endif
 }
-Variant VisualScript::get_variable_default_value(const StringName &p_name) const {
 
+Variant VisualScript::get_variable_default_value(const StringName &p_name) const {
 	ERR_FAIL_COND_V(!variables.has(p_name), Variant());
 	return variables[p_name].default_value;
 }
-void VisualScript::set_variable_info(const StringName &p_name, const PropertyInfo &p_info) {
 
+void VisualScript::set_variable_info(const StringName &p_name, const PropertyInfo &p_info) {
 	ERR_FAIL_COND(instances.size());
 	ERR_FAIL_COND(!variables.has(p_name));
 	variables[p_name].info = p_info;
@@ -643,14 +599,13 @@ void VisualScript::set_variable_info(const StringName &p_name, const PropertyInf
 	_update_placeholders();
 #endif
 }
-PropertyInfo VisualScript::get_variable_info(const StringName &p_name) const {
 
+PropertyInfo VisualScript::get_variable_info(const StringName &p_name) const {
 	ERR_FAIL_COND_V(!variables.has(p_name), PropertyInfo());
 	return variables[p_name].info;
 }
 
 void VisualScript::set_variable_export(const StringName &p_name, bool p_export) {
-
 	ERR_FAIL_COND(!variables.has(p_name));
 
 	variables[p_name]._export = p_export;
@@ -660,30 +615,32 @@ void VisualScript::set_variable_export(const StringName &p_name, bool p_export)
 }
 
 bool VisualScript::get_variable_export(const StringName &p_name) const {
-
 	ERR_FAIL_COND_V(!variables.has(p_name), false);
 	return variables[p_name]._export;
 }
 
 void VisualScript::_set_variable_info(const StringName &p_name, const Dictionary &p_info) {
-
 	PropertyInfo pinfo;
-	if (p_info.has("type"))
+	if (p_info.has("type")) {
 		pinfo.type = Variant::Type(int(p_info["type"]));
-	if (p_info.has("name"))
+	}
+	if (p_info.has("name")) {
 		pinfo.name = p_info["name"];
-	if (p_info.has("hint"))
+	}
+	if (p_info.has("hint")) {
 		pinfo.hint = PropertyHint(int(p_info["hint"]));
-	if (p_info.has("hint_string"))
+	}
+	if (p_info.has("hint_string")) {
 		pinfo.hint_string = p_info["hint_string"];
-	if (p_info.has("usage"))
+	}
+	if (p_info.has("usage")) {
 		pinfo.usage = p_info["usage"];
+	}
 
 	set_variable_info(p_name, pinfo);
 }
 
 Dictionary VisualScript::_get_variable_info(const StringName &p_name) const {
-
 	PropertyInfo pinfo = get_variable_info(p_name);
 	Dictionary d;
 	d["type"] = pinfo.type;
@@ -696,7 +653,6 @@ Dictionary VisualScript::_get_variable_info(const StringName &p_name) const {
 }
 
 void VisualScript::get_variable_list(List<StringName> *r_variables) const {
-
 	for (Map<StringName, Variable>::Element *E = variables.front(); E; E = E->next()) {
 		r_variables->push_back(E->key());
 	}
@@ -705,17 +661,16 @@ void VisualScript::get_variable_list(List<StringName> *r_variables) const {
 }
 
 void VisualScript::set_instance_base_type(const StringName &p_type) {
-
 	ERR_FAIL_COND(instances.size());
 	base_type = p_type;
 }
 
 void VisualScript::rename_variable(const StringName &p_name, const StringName &p_new_name) {
-
 	ERR_FAIL_COND(instances.size());
 	ERR_FAIL_COND(!variables.has(p_name));
-	if (p_new_name == p_name)
+	if (p_new_name == p_name) {
 		return;
+	}
 
 	ERR_FAIL_COND(!String(p_new_name).is_valid_identifier());
 
@@ -725,10 +680,31 @@ void VisualScript::rename_variable(const StringName &p_name, const StringName &p
 
 	variables[p_new_name] = variables[p_name];
 	variables.erase(p_name);
+
+	List<StringName> funcs;
+	get_function_list(&funcs);
+	for (List<StringName>::Element *F = funcs.front(); F; F = F->next()) { // loop through all the functions
+		List<int> ids;
+		get_node_list(F->get(), &ids);
+		for (List<int>::Element *E = ids.front(); E; E = E->next()) {
+			Ref<VisualScriptVariableGet> nodeget = get_node(F->get(), E->get());
+			if (nodeget.is_valid()) {
+				if (nodeget->get_variable() == p_name) {
+					nodeget->set_variable(p_new_name);
+				}
+			} else {
+				Ref<VisualScriptVariableSet> nodeset = get_node(F->get(), E->get());
+				if (nodeset.is_valid()) {
+					if (nodeset->get_variable() == p_name) {
+						nodeset->set_variable(p_new_name);
+					}
+				}
+			}
+		}
+	}
 }
 
 void VisualScript::add_custom_signal(const StringName &p_name) {
-
 	ERR_FAIL_COND(instances.size());
 	ERR_FAIL_COND(!String(p_name).is_valid_identifier());
 	ERR_FAIL_COND(custom_signals.has(p_name));
@@ -737,48 +713,49 @@ void VisualScript::add_custom_signal(const StringName &p_name) {
 }
 
 bool VisualScript::has_custom_signal(const StringName &p_name) const {
-
 	return custom_signals.has(p_name);
 }
-void VisualScript::custom_signal_add_argument(const StringName &p_func, Variant::Type p_type, const String &p_name, int p_index) {
 
+void VisualScript::custom_signal_add_argument(const StringName &p_func, Variant::Type p_type, const String &p_name, int p_index) {
 	ERR_FAIL_COND(instances.size());
 	ERR_FAIL_COND(!custom_signals.has(p_func));
 	Argument arg;
 	arg.type = p_type;
 	arg.name = p_name;
-	if (p_index < 0)
+	if (p_index < 0) {
 		custom_signals[p_func].push_back(arg);
-	else
+	} else {
 		custom_signals[p_func].insert(0, arg);
+	}
 }
-void VisualScript::custom_signal_set_argument_type(const StringName &p_func, int p_argidx, Variant::Type p_type) {
 
+void VisualScript::custom_signal_set_argument_type(const StringName &p_func, int p_argidx, Variant::Type p_type) {
 	ERR_FAIL_COND(instances.size());
 	ERR_FAIL_COND(!custom_signals.has(p_func));
 	ERR_FAIL_INDEX(p_argidx, custom_signals[p_func].size());
 	custom_signals[p_func].write[p_argidx].type = p_type;
 }
-Variant::Type VisualScript::custom_signal_get_argument_type(const StringName &p_func, int p_argidx) const {
 
+Variant::Type VisualScript::custom_signal_get_argument_type(const StringName &p_func, int p_argidx) const {
 	ERR_FAIL_COND_V(!custom_signals.has(p_func), Variant::NIL);
 	ERR_FAIL_INDEX_V(p_argidx, custom_signals[p_func].size(), Variant::NIL);
 	return custom_signals[p_func][p_argidx].type;
 }
+
 void VisualScript::custom_signal_set_argument_name(const StringName &p_func, int p_argidx, const String &p_name) {
 	ERR_FAIL_COND(instances.size());
 	ERR_FAIL_COND(!custom_signals.has(p_func));
 	ERR_FAIL_INDEX(p_argidx, custom_signals[p_func].size());
 	custom_signals[p_func].write[p_argidx].name = p_name;
 }
-String VisualScript::custom_signal_get_argument_name(const StringName &p_func, int p_argidx) const {
 
+String VisualScript::custom_signal_get_argument_name(const StringName &p_func, int p_argidx) const {
 	ERR_FAIL_COND_V(!custom_signals.has(p_func), String());
 	ERR_FAIL_INDEX_V(p_argidx, custom_signals[p_func].size(), String());
 	return custom_signals[p_func][p_argidx].name;
 }
-void VisualScript::custom_signal_remove_argument(const StringName &p_func, int p_argidx) {
 
+void VisualScript::custom_signal_remove_argument(const StringName &p_func, int p_argidx) {
 	ERR_FAIL_COND(instances.size());
 	ERR_FAIL_COND(!custom_signals.has(p_func));
 	ERR_FAIL_INDEX(p_argidx, custom_signals[p_func].size());
@@ -786,12 +763,11 @@ void VisualScript::custom_signal_remove_argument(const StringName &p_func, int p
 }
 
 int VisualScript::custom_signal_get_argument_count(const StringName &p_func) const {
-
 	ERR_FAIL_COND_V(!custom_signals.has(p_func), 0);
 	return custom_signals[p_func].size();
 }
-void VisualScript::custom_signal_swap_argument(const StringName &p_func, int p_argidx, int p_with_argidx) {
 
+void VisualScript::custom_signal_swap_argument(const StringName &p_func, int p_argidx, int p_with_argidx) {
 	ERR_FAIL_COND(instances.size());
 	ERR_FAIL_COND(!custom_signals.has(p_func));
 	ERR_FAIL_INDEX(p_argidx, custom_signals[p_func].size());
@@ -799,19 +775,19 @@ void VisualScript::custom_signal_swap_argument(const StringName &p_func, int p_a
 
 	SWAP(custom_signals[p_func].write[p_argidx], custom_signals[p_func].write[p_with_argidx]);
 }
-void VisualScript::remove_custom_signal(const StringName &p_name) {
 
+void VisualScript::remove_custom_signal(const StringName &p_name) {
 	ERR_FAIL_COND(instances.size());
 	ERR_FAIL_COND(!custom_signals.has(p_name));
 	custom_signals.erase(p_name);
 }
 
 void VisualScript::rename_custom_signal(const StringName &p_name, const StringName &p_new_name) {
-
 	ERR_FAIL_COND(instances.size());
 	ERR_FAIL_COND(!custom_signals.has(p_name));
-	if (p_new_name == p_name)
+	if (p_new_name == p_name) {
 		return;
+	}
 
 	ERR_FAIL_COND(!String(p_new_name).is_valid_identifier());
 
@@ -824,8 +800,7 @@ void VisualScript::rename_custom_signal(const StringName &p_name, const StringNa
 }
 
 void VisualScript::get_custom_signal_list(List<StringName> *r_custom_signals) const {
-
-	for (const Map<StringName, Vector<Argument> >::Element *E = custom_signals.front(); E; E = E->next()) {
+	for (const Map<StringName, Vector<Argument>>::Element *E = custom_signals.front(); E; E = E->next()) {
 		r_custom_signals->push_back(E->key());
 	}
 
@@ -833,11 +808,11 @@ void VisualScript::get_custom_signal_list(List<StringName> *r_custom_signals) co
 }
 
 int VisualScript::get_available_id() const {
-
 	int max_id = 0;
 	for (Map<StringName, Function>::Element *E = functions.front(); E; E = E->next()) {
-		if (E->get().nodes.empty())
+		if (E->get().nodes.empty()) {
 			continue;
+		}
 
 		int last_id = E->get().nodes.back()->key();
 		max_id = MAX(max_id, last_id + 1);
@@ -849,12 +824,10 @@ int VisualScript::get_available_id() const {
 /////////////////////////////////
 
 bool VisualScript::can_instance() const {
-
 	return true; //ScriptServer::is_scripting_enabled();
 }
 
 StringName VisualScript::get_instance_base_type() const {
-
 	return base_type;
 }
 
@@ -864,21 +837,20 @@ Ref<Script> VisualScript::get_base_script() const {
 
 #ifdef TOOLS_ENABLED
 void VisualScript::_placeholder_erased(PlaceHolderScriptInstance *p_placeholder) {
-
 	placeholders.erase(p_placeholder);
 }
 
 void VisualScript::_update_placeholders() {
-
-	if (placeholders.size() == 0)
+	if (placeholders.size() == 0) {
 		return; //no bother if no placeholders
+	}
 	List<PropertyInfo> pinfo;
 	Map<StringName, Variant> values;
 
 	for (Map<StringName, Variable>::Element *E = variables.front(); E; E = E->next()) {
-
-		if (!E->get()._export)
+		if (!E->get()._export) {
 			continue;
+		}
 
 		PropertyInfo p = E->get().info;
 		p.name = String(E->key());
@@ -887,7 +859,6 @@ void VisualScript::_update_placeholders() {
 	}
 
 	for (Set<PlaceHolderScriptInstance *>::Element *E = placeholders.front(); E; E = E->next()) {
-
 		E->get()->update(pinfo, values);
 	}
 }
@@ -895,11 +866,9 @@ void VisualScript::_update_placeholders() {
 #endif
 
 ScriptInstance *VisualScript::instance_create(Object *p_this) {
-
 #ifdef TOOLS_ENABLED
 
 	if (!ScriptServer::is_scripting_enabled() && !is_tool_script) {
-
 		PlaceHolderScriptInstance *sins = memnew(PlaceHolderScriptInstance(VisualScriptLanguage::singleton, Ref<Script>((Script *)this), p_this));
 		placeholders.insert(sins);
 
@@ -907,9 +876,9 @@ ScriptInstance *VisualScript::instance_create(Object *p_this) {
 		Map<StringName, Variant> values;
 
 		for (Map<StringName, Variable>::Element *E = variables.front(); E; E = E->next()) {
-
-			if (!E->get()._export)
+			if (!E->get()._export) {
 				continue;
+			}
 
 			PropertyInfo p = E->get().info;
 			p.name = String(E->key());
@@ -926,29 +895,24 @@ ScriptInstance *VisualScript::instance_create(Object *p_this) {
 	VisualScriptInstance *instance = memnew(VisualScriptInstance);
 	instance->create(Ref<VisualScript>(this), p_this);
 
-	if (VisualScriptLanguage::singleton->lock)
-		VisualScriptLanguage::singleton->lock->lock();
-
-	instances[p_this] = instance;
+	{
+		MutexLock lock(VisualScriptLanguage::singleton->lock);
 
-	if (VisualScriptLanguage::singleton->lock)
-		VisualScriptLanguage::singleton->lock->unlock();
+		instances[p_this] = instance;
+	}
 
 	return instance;
 }
 
 bool VisualScript::instance_has(const Object *p_this) const {
-
 	return instances.has((Object *)p_this);
 }
 
 bool VisualScript::has_source_code() const {
-
 	return false;
 }
 
 String VisualScript::get_source_code() const {
-
 	return String();
 }
 
@@ -956,12 +920,10 @@ void VisualScript::set_source_code(const String &p_code) {
 }
 
 Error VisualScript::reload(bool p_keep_state) {
-
 	return OK;
 }
 
 bool VisualScript::is_tool() const {
-
 	return is_tool_script;
 }
 
@@ -970,19 +932,15 @@ bool VisualScript::is_valid() const {
 }
 
 ScriptLanguage *VisualScript::get_language() const {
-
 	return VisualScriptLanguage::singleton;
 }
 
 bool VisualScript::has_script_signal(const StringName &p_signal) const {
-
 	return custom_signals.has(p_signal);
 }
 
 void VisualScript::get_script_signal_list(List<MethodInfo> *r_signals) const {
-
-	for (const Map<StringName, Vector<Argument> >::Element *E = custom_signals.front(); E; E = E->next()) {
-
+	for (const Map<StringName, Vector<Argument>>::Element *E = custom_signals.front(); E; E = E->next()) {
 		MethodInfo mi;
 		mi.name = E->key();
 		for (int i = 0; i < E->get().size(); i++) {
@@ -997,21 +955,19 @@ void VisualScript::get_script_signal_list(List<MethodInfo> *r_signals) const {
 }
 
 bool VisualScript::get_property_default_value(const StringName &p_property, Variant &r_value) const {
-
-	if (!variables.has(p_property))
+	if (!variables.has(p_property)) {
 		return false;
+	}
 
 	r_value = variables[p_property].default_value;
 	return true;
 }
-void VisualScript::get_script_method_list(List<MethodInfo> *p_list) const {
 
+void VisualScript::get_script_method_list(List<MethodInfo> *p_list) const {
 	for (Map<StringName, Function>::Element *E = functions.front(); E; E = E->next()) {
-
 		MethodInfo mi;
 		mi.name = E->key();
 		if (E->get().function_id >= 0) {
-
 			Ref<VisualScriptFunction> func = E->get().nodes[E->get().function_id].node;
 			if (func.is_valid()) {
 				for (int i = 0; i < func->get_argument_count(); i++) {
@@ -1028,22 +984,20 @@ void VisualScript::get_script_method_list(List<MethodInfo> *p_list) const {
 }
 
 bool VisualScript::has_method(const StringName &p_method) const {
-
 	return functions.has(p_method);
 }
-MethodInfo VisualScript::get_method_info(const StringName &p_method) const {
 
+MethodInfo VisualScript::get_method_info(const StringName &p_method) const {
 	const Map<StringName, Function>::Element *E = functions.find(p_method);
-	if (!E)
+	if (!E) {
 		return MethodInfo();
+	}
 
 	MethodInfo mi;
 	mi.name = E->key();
 	if (E->get().function_id >= 0) {
-
 		Ref<VisualScriptFunction> func = E->get().nodes[E->get().function_id].node;
 		if (func.is_valid()) {
-
 			for (int i = 0; i < func->get_argument_count(); i++) {
 				PropertyInfo arg;
 				arg.name = func->get_argument_name(i);
@@ -1061,7 +1015,6 @@ MethodInfo VisualScript::get_method_info(const StringName &p_method) const {
 }
 
 void VisualScript::get_script_property_list(List<PropertyInfo> *p_list) const {
-
 	List<StringName> vars;
 	get_variable_list(&vars);
 
@@ -1078,8 +1031,9 @@ int VisualScript::get_member_line(const StringName &p_member) const {
 #ifdef TOOLS_ENABLED
 	if (has_function(p_member)) {
 		for (Map<int, Function::NodeData>::Element *E = functions[p_member].nodes.front(); E; E = E->next()) {
-			if (Object::cast_to<VisualScriptFunction>(E->get().node.ptr()))
+			if (Object::cast_to<VisualScriptFunction>(E->get().node.ptr())) {
 				return E->key();
+			}
 		}
 	}
 #endif
@@ -1088,9 +1042,7 @@ int VisualScript::get_member_line(const StringName &p_member) const {
 
 #ifdef TOOLS_ENABLED
 bool VisualScript::are_subnodes_edited() const {
-
 	for (const Map<StringName, Function>::Element *E = functions.front(); E; E = E->next()) {
-
 		for (const Map<int, Function::NodeData>::Element *F = E->get().nodes.front(); F; F = F->next()) {
 			if (F->get().node->is_edited()) {
 				return true;
@@ -1102,16 +1054,69 @@ bool VisualScript::are_subnodes_edited() const {
 }
 #endif
 
-void VisualScript::_set_data(const Dictionary &p_data) {
+Vector<ScriptNetData> VisualScript::get_rpc_methods() const {
+	return rpc_functions;
+}
+
+uint16_t VisualScript::get_rpc_method_id(const StringName &p_method) const {
+	for (int i = 0; i < rpc_functions.size(); i++) {
+		if (rpc_functions[i].name == p_method) {
+			return i;
+		}
+	}
+	return UINT16_MAX;
+}
+
+StringName VisualScript::get_rpc_method(const uint16_t p_rpc_method_id) const {
+	ERR_FAIL_COND_V(p_rpc_method_id >= rpc_functions.size(), StringName());
+	return rpc_functions[p_rpc_method_id].name;
+}
+
+MultiplayerAPI::RPCMode VisualScript::get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const {
+	ERR_FAIL_COND_V(p_rpc_method_id >= rpc_functions.size(), MultiplayerAPI::RPC_MODE_DISABLED);
+	return rpc_functions[p_rpc_method_id].mode;
+}
+
+MultiplayerAPI::RPCMode VisualScript::get_rpc_mode(const StringName &p_method) const {
+	return get_rpc_mode_by_id(get_rpc_method_id(p_method));
+}
+
+Vector<ScriptNetData> VisualScript::get_rset_properties() const {
+	return rpc_variables;
+}
+
+uint16_t VisualScript::get_rset_property_id(const StringName &p_variable) const {
+	for (int i = 0; i < rpc_variables.size(); i++) {
+		if (rpc_variables[i].name == p_variable) {
+			return i;
+		}
+	}
+	return UINT16_MAX;
+}
+
+StringName VisualScript::get_rset_property(const uint16_t p_rset_property_id) const {
+	ERR_FAIL_COND_V(p_rset_property_id >= rpc_variables.size(), StringName());
+	return rpc_variables[p_rset_property_id].name;
+}
+
+MultiplayerAPI::RPCMode VisualScript::get_rset_mode_by_id(const uint16_t p_rset_variable_id) const {
+	ERR_FAIL_COND_V(p_rset_variable_id >= rpc_variables.size(), MultiplayerAPI::RPC_MODE_DISABLED);
+	return rpc_variables[p_rset_variable_id].mode;
+}
+
+MultiplayerAPI::RPCMode VisualScript::get_rset_mode(const StringName &p_variable) const {
+	return get_rset_mode_by_id(get_rset_property_id(p_variable));
+}
 
+void VisualScript::_set_data(const Dictionary &p_data) {
 	Dictionary d = p_data;
-	if (d.has("base_type"))
+	if (d.has("base_type")) {
 		base_type = d["base_type"];
+	}
 
 	variables.clear();
 	Array vars = d["variables"];
 	for (int i = 0; i < vars.size(); i++) {
-
 		Dictionary v = vars[i];
 		StringName name = v["name"];
 		add_variable(name);
@@ -1123,7 +1128,6 @@ void VisualScript::_set_data(const Dictionary &p_data) {
 	custom_signals.clear();
 	Array sigs = d["signals"];
 	for (int i = 0; i < sigs.size(); i++) {
-
 		Dictionary cs = sigs[i];
 		add_custom_signal(cs["name"]);
 
@@ -1140,7 +1144,6 @@ void VisualScript::_set_data(const Dictionary &p_data) {
 	Vector2 last_size = Vector2(0.0, 0.0);
 
 	for (int i = 0; i < funcs.size(); i++) {
-
 		Dictionary func = funcs[i];
 
 		StringName name = func["name"];
@@ -1190,31 +1193,52 @@ void VisualScript::_set_data(const Dictionary &p_data) {
 		Array sequence_connections = func["sequence_connections"];
 
 		for (int j = 0; j < sequence_connections.size(); j += 3) {
-
 			sequence_connect(name, sequence_connections[j + 0], sequence_connections[j + 1], sequence_connections[j + 2]);
 		}
 
 		Array data_connections = func["data_connections"];
 
 		for (int j = 0; j < data_connections.size(); j += 4) {
-
 			data_connect(name, data_connections[j + 0], data_connections[j + 1], data_connections[j + 2], data_connections[j + 3]);
 		}
 	}
 
-	if (d.has("is_tool_script"))
+	if (d.has("is_tool_script")) {
 		is_tool_script = d["is_tool_script"];
-	else
+	} else {
 		is_tool_script = false;
+	}
+
+	// Takes all the rpc methods
+	rpc_functions.clear();
+	rpc_variables.clear();
+	for (Map<StringName, Function>::Element *E = functions.front(); E; E = E->next()) {
+		if (E->get().function_id >= 0 && E->get().nodes.find(E->get().function_id)) {
+			Ref<VisualScriptFunction> vsf = E->get().nodes[E->get().function_id].node;
+			if (vsf.is_valid()) {
+				if (vsf->get_rpc_mode() != MultiplayerAPI::RPC_MODE_DISABLED) {
+					ScriptNetData nd;
+					nd.name = E->key();
+					nd.mode = vsf->get_rpc_mode();
+					if (rpc_functions.find(nd) == -1) {
+						rpc_functions.push_back(nd);
+					}
+				}
+			}
+		}
+	}
+
+	// Visual script doesn't have rset :(
+
+	// Sort so we are 100% that they are always the same.
+	rpc_functions.sort_custom<SortNetData>();
 }
 
 Dictionary VisualScript::_get_data() const {
-
 	Dictionary d;
 	d["base_type"] = base_type;
 	Array vars;
 	for (const Map<StringName, Variable>::Element *E = variables.front(); E; E = E->next()) {
-
 		Dictionary var = _get_variable_info(E->key());
 		var["name"] = E->key(); //make sure it's the right one
 		var["default_value"] = E->get().default_value;
@@ -1224,8 +1248,7 @@ Dictionary VisualScript::_get_data() const {
 	d["variables"] = vars;
 
 	Array sigs;
-	for (const Map<StringName, Vector<Argument> >::Element *E = custom_signals.front(); E; E = E->next()) {
-
+	for (const Map<StringName, Vector<Argument>>::Element *E = custom_signals.front(); E; E = E->next()) {
 		Dictionary cs;
 		cs["name"] = E->key();
 		Array args;
@@ -1243,7 +1266,6 @@ Dictionary VisualScript::_get_data() const {
 	Array funcs;
 
 	for (const Map<StringName, Function>::Element *E = functions.front(); E; E = E->next()) {
-
 		Dictionary func;
 		func["name"] = E->key();
 		func["function_id"] = E->get().function_id;
@@ -1252,7 +1274,6 @@ Dictionary VisualScript::_get_data() const {
 		Array nodes;
 
 		for (const Map<int, Function::NodeData>::Element *F = E->get().nodes.front(); F; F = F->next()) {
-
 			nodes.push_back(F->key());
 			nodes.push_back(F->get().pos);
 			nodes.push_back(F->get().node);
@@ -1263,7 +1284,6 @@ Dictionary VisualScript::_get_data() const {
 		Array sequence_connections;
 
 		for (const Set<SequenceConnection>::Element *F = E->get().sequence_connections.front(); F; F = F->next()) {
-
 			sequence_connections.push_back(F->get().from_node);
 			sequence_connections.push_back(F->get().from_output);
 			sequence_connections.push_back(F->get().to_node);
@@ -1274,7 +1294,6 @@ Dictionary VisualScript::_get_data() const {
 		Array data_connections;
 
 		for (const Set<DataConnection>::Element *F = E->get().data_connections.front(); F; F = F->next()) {
-
 			data_connections.push_back(F->get().from_node);
 			data_connections.push_back(F->get().from_port);
 			data_connections.push_back(F->get().to_node);
@@ -1294,9 +1313,6 @@ Dictionary VisualScript::_get_data() const {
 }
 
 void VisualScript::_bind_methods() {
-
-	ClassDB::bind_method(D_METHOD("_node_ports_changed"), &VisualScript::_node_ports_changed);
-
 	ClassDB::bind_method(D_METHOD("add_function", "name"), &VisualScript::add_function);
 	ClassDB::bind_method(D_METHOD("has_function", "name"), &VisualScript::has_function);
 	ClassDB::bind_method(D_METHOD("remove_function", "name"), &VisualScript::remove_function);
@@ -1359,11 +1375,14 @@ void VisualScript::_bind_methods() {
 }
 
 VisualScript::VisualScript() {
-
 	base_type = "Object";
 	is_tool_script = false;
 }
 
+bool VisualScript::inherits_script(const Ref<Script> &p_script) const {
+	return this == p_script.ptr(); //there is no inheritance in visual scripts, so this is enough
+}
+
 StringName VisualScript::get_default_func() const {
 	return StringName("f_312843592");
 }
@@ -1382,7 +1401,6 @@ Set<int> VisualScript::get_output_sequence_ports_connected(const String &edited_
 }
 
 VisualScript::~VisualScript() {
-
 	while (!functions.empty()) {
 		remove_function(functions.front()->key());
 	}
@@ -1391,10 +1409,10 @@ VisualScript::~VisualScript() {
 ////////////////////////////////////////////
 
 bool VisualScriptInstance::set(const StringName &p_name, const Variant &p_value) {
-
 	Map<StringName, Variant>::Element *E = variables.find(p_name);
-	if (!E)
+	if (!E) {
 		return false;
+	}
 
 	E->get() = p_value;
 
@@ -1402,45 +1420,45 @@ bool VisualScriptInstance::set(const StringName &p_name, const Variant &p_value)
 }
 
 bool VisualScriptInstance::get(const StringName &p_name, Variant &r_ret) const {
-
 	const Map<StringName, Variant>::Element *E = variables.find(p_name);
-	if (!E)
+	if (!E) {
 		return false;
+	}
 
 	r_ret = E->get();
 	return true;
 }
-void VisualScriptInstance::get_property_list(List<PropertyInfo> *p_properties) const {
 
+void VisualScriptInstance::get_property_list(List<PropertyInfo> *p_properties) const {
 	for (const Map<StringName, VisualScript::Variable>::Element *E = script->variables.front(); E; E = E->next()) {
-
-		if (!E->get()._export)
+		if (!E->get()._export) {
 			continue;
+		}
 		PropertyInfo p = E->get().info;
 		p.name = String(E->key());
 		p.usage |= PROPERTY_USAGE_SCRIPT_VARIABLE;
 		p_properties->push_back(p);
 	}
 }
-Variant::Type VisualScriptInstance::get_property_type(const StringName &p_name, bool *r_is_valid) const {
 
+Variant::Type VisualScriptInstance::get_property_type(const StringName &p_name, bool *r_is_valid) const {
 	const Map<StringName, VisualScript::Variable>::Element *E = script->variables.find(p_name);
 	if (!E) {
-		if (r_is_valid)
+		if (r_is_valid) {
 			*r_is_valid = false;
+		}
 		ERR_FAIL_V(Variant::NIL);
 	}
 
-	if (r_is_valid)
+	if (r_is_valid) {
 		*r_is_valid = true;
+	}
 
 	return E->get().info.type;
 }
 
 void VisualScriptInstance::get_method_list(List<MethodInfo> *p_list) const {
-
 	for (const Map<StringName, VisualScript::Function>::Element *E = script->functions.front(); E; E = E->next()) {
-
 		if (E->key() == script->get_default_func()) {
 			continue;
 		}
@@ -1448,10 +1466,8 @@ void VisualScriptInstance::get_method_list(List<MethodInfo> *p_list) const {
 		MethodInfo mi;
 		mi.name = E->key();
 		if (E->get().function_id >= 0 && E->get().nodes.has(E->get().function_id)) {
-
 			Ref<VisualScriptFunction> vsf = E->get().nodes[E->get().function_id].node;
 			if (vsf.is_valid()) {
-
 				for (int i = 0; i < vsf->get_argument_count(); i++) {
 					PropertyInfo arg;
 					arg.name = vsf->get_argument_name(i);
@@ -1469,10 +1485,11 @@ void VisualScriptInstance::get_method_list(List<MethodInfo> *p_list) const {
 		p_list->push_back(mi);
 	}
 }
-bool VisualScriptInstance::has_method(const StringName &p_method) const {
 
-	if (p_method == script->get_default_func())
+bool VisualScriptInstance::has_method(const StringName &p_method) const {
+	if (p_method == script->get_default_func()) {
 		return false;
+	}
 
 	return script->functions.has(p_method);
 }
@@ -1480,30 +1497,28 @@ bool VisualScriptInstance::has_method(const StringName &p_method) const {
 //#define VSDEBUG(m_text) print_line(m_text)
 #define VSDEBUG(m_text)
 
-void VisualScriptInstance::_dependency_step(VisualScriptNodeInstance *node, int p_pass, int *pass_stack, const Variant **input_args, Variant **output_args, Variant *variant_stack, Variant::CallError &r_error, String &error_str, VisualScriptNodeInstance **r_error_node) {
-
+void VisualScriptInstance::_dependency_step(VisualScriptNodeInstance *node, int p_pass, int *pass_stack, const Variant **input_args, Variant **output_args, Variant *variant_stack, Callable::CallError &r_error, String &error_str, VisualScriptNodeInstance **r_error_node) {
 	ERR_FAIL_COND(node->pass_idx == -1);
 
-	if (pass_stack[node->pass_idx] == p_pass)
+	if (pass_stack[node->pass_idx] == p_pass) {
 		return;
+	}
 
 	pass_stack[node->pass_idx] = p_pass;
 
 	if (!node->dependencies.empty()) {
-
 		int dc = node->dependencies.size();
 		VisualScriptNodeInstance **deps = node->dependencies.ptrw();
 
 		for (int i = 0; i < dc; i++) {
-
 			_dependency_step(deps[i], p_pass, pass_stack, input_args, output_args, variant_stack, r_error, error_str, r_error_node);
-			if (r_error.error != Variant::CallError::CALL_OK)
+			if (r_error.error != Callable::CallError::CALL_OK) {
 				return;
+			}
 		}
 	}
 
 	for (int i = 0; i < node->input_port_count; i++) {
-
 		int index = node->input_ports[i] & VisualScriptNodeInstance::INPUT_MASK;
 
 		if (node->input_ports[i] & VisualScriptNodeInstance::INPUT_DEFAULT_VALUE_BIT) {
@@ -1518,17 +1533,16 @@ void VisualScriptInstance::_dependency_step(VisualScriptNodeInstance *node, int
 		output_args[i] = &variant_stack[node->output_ports[i]];
 	}
 
-	Variant *working_mem = node->working_mem_idx >= 0 ? &variant_stack[node->working_mem_idx] : (Variant *)NULL;
+	Variant *working_mem = node->working_mem_idx >= 0 ? &variant_stack[node->working_mem_idx] : (Variant *)nullptr;
 
 	node->step(input_args, output_args, VisualScriptNodeInstance::START_MODE_BEGIN_SEQUENCE, working_mem, r_error, error_str);
 	//ignore return
-	if (r_error.error != Variant::CallError::CALL_OK) {
+	if (r_error.error != Callable::CallError::CALL_OK) {
 		*r_error_node = node;
 	}
 }
 
-Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p_stack, int p_stack_size, VisualScriptNodeInstance *p_node, int p_flow_stack_pos, int p_pass, bool p_resuming_yield, Variant::CallError &r_error) {
-
+Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p_stack, int p_stack_size, VisualScriptNodeInstance *p_node, int p_flow_stack_pos, int p_pass, bool p_resuming_yield, Callable::CallError &r_error) {
 	Map<StringName, Function>::Element *F = functions.find(p_method);
 	ERR_FAIL_COND_V(!F, Variant());
 	Function *f = &F->get();
@@ -1539,8 +1553,8 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p
 	const Variant **input_args = (const Variant **)(sequence_bits + f->node_count);
 	Variant **output_args = (Variant **)(input_args + max_input_args);
 	int flow_max = f->flow_stack_size;
-	int *flow_stack = flow_max ? (int *)(output_args + max_output_args) : (int *)NULL;
-	int *pass_stack = flow_stack ? (int *)(flow_stack + flow_max) : (int *)NULL;
+	int *flow_stack = flow_max ? (int *)(output_args + max_output_args) : (int *)nullptr;
+	int *pass_stack = flow_stack ? (int *)(flow_stack + flow_max) : (int *)nullptr;
 
 	String error_str;
 
@@ -1548,18 +1562,17 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p
 	bool error = false;
 	int current_node_id = f->node;
 	Variant return_value;
-	Variant *working_mem = NULL;
+	Variant *working_mem = nullptr;
 
 	int flow_stack_pos = p_flow_stack_pos;
 
 #ifdef DEBUG_ENABLED
-	if (ScriptDebugger::get_singleton()) {
+	if (EngineDebugger::is_active()) {
 		VisualScriptLanguage::singleton->enter_function(this, &p_method, variant_stack, &working_mem, &current_node_id);
 	}
 #endif
 
 	while (true) {
-
 		p_pass++; //increment pass
 		current_node_id = node->get_id();
 
@@ -1567,7 +1580,7 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p
 		VSDEBUG("AT STACK POS: " + itos(flow_stack_pos));
 
 		//setup working mem
-		working_mem = node->working_mem_idx >= 0 ? &variant_stack[node->working_mem_idx] : (Variant *)NULL;
+		working_mem = node->working_mem_idx >= 0 ? &variant_stack[node->working_mem_idx] : (Variant *)nullptr;
 
 		VSDEBUG("WORKING MEM: " + itos(node->working_mem_idx));
 
@@ -1578,18 +1591,15 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p
 				input_args[i] = &variant_stack[i];
 			}
 		} else {
-
 			//run dependencies first
 
 			if (!node->dependencies.empty()) {
-
 				int dc = node->dependencies.size();
 				VisualScriptNodeInstance **deps = node->dependencies.ptrw();
 
 				for (int i = 0; i < dc; i++) {
-
 					_dependency_step(deps[i], p_pass, pass_stack, input_args, output_args, variant_stack, r_error, error_str, &node);
-					if (r_error.error != Variant::CallError::CALL_OK) {
+					if (r_error.error != Callable::CallError::CALL_OK) {
 						error = true;
 						current_node_id = node->id;
 						break;
@@ -1598,12 +1608,10 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p
 			}
 
 			if (!error) {
-
 				//setup input pointers normally
 				VSDEBUG("INPUT PORTS: " + itos(node->input_port_count));
 
 				for (int i = 0; i < node->input_port_count; i++) {
-
 					int index = node->input_ports[i] & VisualScriptNodeInstance::INPUT_MASK;
 
 					if (node->input_ports[i] & VisualScriptNodeInstance::INPUT_DEFAULT_VALUE_BIT) {
@@ -1619,8 +1627,9 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p
 			}
 		}
 
-		if (error)
+		if (error) {
 			break;
+		}
 
 		//setup output pointers
 
@@ -1649,7 +1658,7 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p
 
 		int ret = node->step(input_args, output_args, start_mode, working_mem, r_error, error_str);
 
-		if (r_error.error != Variant::CallError::CALL_OK) {
+		if (r_error.error != Callable::CallError::CALL_OK) {
 			//use error from step
 			error = true;
 			break;
@@ -1658,7 +1667,7 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p
 		if (ret & VisualScriptNodeInstance::STEP_YIELD_BIT) {
 			//yielded!
 			if (node->get_working_memory_size() == 0) {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 				error_str = RTR("A node yielded without working memory, please read the docs on how to yield properly!");
 				error = true;
 				break;
@@ -1666,8 +1675,7 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p
 			} else {
 				Ref<VisualScriptFunctionState> state = *working_mem;
 				if (!state.is_valid()) {
-
-					r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+					r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 					error_str = RTR("Node yielded, but did not return a function state in the first working memory.");
 					error = true;
 					break;
@@ -1686,11 +1694,11 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p
 				state->pass = p_pass;
 				copymem(state->stack.ptrw(), p_stack, p_stack_size);
 				//step 2, run away, return directly
-				r_error.error = Variant::CallError::CALL_OK;
+				r_error.error = Callable::CallError::CALL_OK;
 
 #ifdef DEBUG_ENABLED
 				//will re-enter later, so exiting
-				if (ScriptDebugger::get_singleton()) {
+				if (EngineDebugger::is_active()) {
 					VisualScriptLanguage::singleton->exit_function();
 				}
 #endif
@@ -1700,26 +1708,28 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p
 		}
 
 #ifdef DEBUG_ENABLED
-		if (ScriptDebugger::get_singleton()) {
+		if (EngineDebugger::is_active()) {
 			// line
 			bool do_break = false;
 
-			if (ScriptDebugger::get_singleton()->get_lines_left() > 0) {
-
-				if (ScriptDebugger::get_singleton()->get_depth() <= 0)
-					ScriptDebugger::get_singleton()->set_lines_left(ScriptDebugger::get_singleton()->get_lines_left() - 1);
-				if (ScriptDebugger::get_singleton()->get_lines_left() <= 0)
+			if (EngineDebugger::get_script_debugger()->get_lines_left() > 0) {
+				if (EngineDebugger::get_script_debugger()->get_depth() <= 0) {
+					EngineDebugger::get_script_debugger()->set_lines_left(EngineDebugger::get_script_debugger()->get_lines_left() - 1);
+				}
+				if (EngineDebugger::get_script_debugger()->get_lines_left() <= 0) {
 					do_break = true;
+				}
 			}
 
-			if (ScriptDebugger::get_singleton()->is_breakpoint(current_node_id, source))
+			if (EngineDebugger::get_script_debugger()->is_breakpoint(current_node_id, source)) {
 				do_break = true;
+			}
 
 			if (do_break) {
 				VisualScriptLanguage::singleton->debug_break("Breakpoint", true);
 			}
 
-			ScriptDebugger::get_singleton()->line_poll();
+			EngineDebugger::get_singleton()->line_poll();
 		}
 #endif
 		int output = ret & VisualScriptNodeInstance::STEP_MASK;
@@ -1728,8 +1738,7 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p
 
 		if (ret & VisualScriptNodeInstance::STEP_EXIT_FUNCTION_BIT) {
 			if (node->get_working_memory_size() == 0) {
-
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 				error_str = RTR("Return value must be assigned to first element of node working memory! Fix your node please.");
 				error = true;
 			} else {
@@ -1741,33 +1750,27 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p
 			break; //exit function requested, bye
 		}
 
-		VisualScriptNodeInstance *next = NULL; //next node
+		VisualScriptNodeInstance *next = nullptr; //next node
 
 		if ((ret == output || ret & VisualScriptNodeInstance::STEP_FLAG_PUSH_STACK_BIT) && node->sequence_output_count) {
 			//if no exit bit was set, and has sequence outputs, guess next node
 			if (output >= node->sequence_output_count) {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 				error_str = RTR("Node returned an invalid sequence output: ") + itos(output);
 				error = true;
 				break;
 			}
 
 			next = node->sequence_outputs[output];
-			if (next) {
-				VSDEBUG("GOT NEXT NODE - " + itos(next->get_id()));
-			} else {
-				VSDEBUG("GOT NEXT NODE - NULL");
-			}
+			VSDEBUG("GOT NEXT NODE - " + (next ? itos(next->get_id()) : "NULL"));
 		}
 
 		if (flow_stack) {
-
 			//update flow stack pos (may have changed)
 			flow_stack[flow_stack_pos] = current_node_id;
 
 			//add stack push bit if requested
 			if (ret & VisualScriptNodeInstance::STEP_FLAG_PUSH_STACK_BIT) {
-
 				flow_stack[flow_stack_pos] |= VisualScriptNodeInstance::FLOW_STACK_PUSHED_BIT;
 				sequence_bits[node->sequence_index] = true; //remember sequence bit
 				VSDEBUG("NEXT SEQ - FLAG BIT");
@@ -1788,7 +1791,6 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p
 					break; //simply exit without value or error
 				}
 			} else if (next) {
-
 				if (sequence_bits[next->sequence_index]) {
 					// what happened here is that we are entering a node that is in the middle of doing a sequence (pushed stack) from the front
 					// because each node has a working memory, we can't really do a sub-sequence
@@ -1798,7 +1800,6 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p
 					bool found = false;
 
 					for (int i = flow_stack_pos; i >= 0; i--) {
-
 						if ((flow_stack[i] & VisualScriptNodeInstance::FLOW_STACK_MASK) == next->get_id()) {
 							flow_stack_pos = i; //roll back and remove bit
 							flow_stack[i] = next->get_id();
@@ -1808,7 +1809,7 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p
 					}
 
 					if (!found) {
-						r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+						r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 						error_str = RTR("Found sequence bit but not the node in the stack, report bug!");
 						error = true;
 						break;
@@ -1820,7 +1821,7 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p
 				} else {
 					// check for stack overflow
 					if (flow_stack_pos + 1 >= flow_max) {
-						r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+						r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 						error_str = RTR("Stack overflow with stack depth: ") + itos(output);
 						error = true;
 						break;
@@ -1840,10 +1841,8 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p
 				bool found = false;
 
 				for (int i = flow_stack_pos; i >= 0; i--) {
-
 					VSDEBUG("FS " + itos(i) + " - " + itos(flow_stack[i]));
 					if (flow_stack[i] & VisualScriptNodeInstance::FLOW_STACK_PUSHED_BIT) {
-
 						node = instances[flow_stack[i] & VisualScriptNodeInstance::FLOW_STACK_MASK];
 						flow_stack_pos = i;
 						found = true;
@@ -1859,35 +1858,32 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p
 				VSDEBUG("NO NEXT NODE, GO BACK TO: " + itos(flow_stack_pos));
 			}
 		} else {
-
 			node = next; //stackless mode, simply assign next node
 		}
 	}
 
 	if (error) {
-
 		//error
 		// function, file, line, error, explanation
 		String err_file = script->get_path();
 		String err_func = p_method;
 		int err_line = current_node_id; //not a line but it works as one
 
-		if (node && (r_error.error != Variant::CallError::CALL_ERROR_INVALID_METHOD || error_str == String())) {
-
+		if (node && (r_error.error != Callable::CallError::CALL_ERROR_INVALID_METHOD || error_str == String())) {
 			if (error_str != String()) {
 				error_str += " ";
 			}
 
-			if (r_error.error == Variant::CallError::CALL_ERROR_INVALID_ARGUMENT) {
+			if (r_error.error == Callable::CallError::CALL_ERROR_INVALID_ARGUMENT) {
 				int errorarg = r_error.argument;
-				error_str += "Cannot convert argument " + itos(errorarg + 1) + " to " + Variant::get_type_name(r_error.expected) + ".";
-			} else if (r_error.error == Variant::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS) {
+				error_str += "Cannot convert argument " + itos(errorarg + 1) + " to " + Variant::get_type_name(Variant::Type(r_error.expected)) + ".";
+			} else if (r_error.error == Callable::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS) {
 				error_str += "Expected " + itos(r_error.argument) + " arguments.";
-			} else if (r_error.error == Variant::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS) {
+			} else if (r_error.error == Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS) {
 				error_str += "Expected " + itos(r_error.argument) + " arguments.";
-			} else if (r_error.error == Variant::CallError::CALL_ERROR_INVALID_METHOD) {
+			} else if (r_error.error == Callable::CallError::CALL_ERROR_INVALID_METHOD) {
 				error_str += "Invalid Call.";
-			} else if (r_error.error == Variant::CallError::CALL_ERROR_INSTANCE_IS_NULL) {
+			} else if (r_error.error == Callable::CallError::CALL_ERROR_INSTANCE_IS_NULL) {
 				error_str += "Base Instance is null";
 			}
 		}
@@ -1896,18 +1892,16 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p
 		// debugger break did not happen
 
 		if (!VisualScriptLanguage::singleton->debug_break(error_str, false)) {
-
 			_err_print_error(err_func.utf8().get_data(), err_file.utf8().get_data(), err_line, error_str.utf8().get_data(), ERR_HANDLER_SCRIPT);
 		}
 
 		//}
 	} else {
-
 		//return_value=
 	}
 
 #ifdef DEBUG_ENABLED
-	if (ScriptDebugger::get_singleton()) {
+	if (EngineDebugger::is_active()) {
 		VisualScriptLanguage::singleton->exit_function();
 	}
 #endif
@@ -1920,13 +1914,12 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p
 	return return_value;
 }
 
-Variant VisualScriptInstance::call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error) {
-
-	r_error.error = Variant::CallError::CALL_OK; //ok by default
+Variant VisualScriptInstance::call(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
+	r_error.error = Callable::CallError::CALL_OK; //ok by default
 
 	Map<StringName, Function>::Element *F = functions.find(p_method);
 	if (!F) {
-		r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+		r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 		return Variant();
 	}
 
@@ -1957,8 +1950,8 @@ Variant VisualScriptInstance::call(const StringName &p_method, const Variant **p
 	const Variant **input_args = (const Variant **)(sequence_bits + f->node_count);
 	Variant **output_args = (Variant **)(input_args + max_input_args);
 	int flow_max = f->flow_stack_size;
-	int *flow_stack = flow_max ? (int *)(output_args + max_output_args) : (int *)NULL;
-	int *pass_stack = flow_stack ? (int *)(flow_stack + flow_max) : (int *)NULL;
+	int *flow_stack = flow_max ? (int *)(output_args + max_output_args) : (int *)nullptr;
+	int *pass_stack = flow_stack ? (int *)(flow_stack + flow_max) : (int *)nullptr;
 
 	for (int i = 0; i < f->node_count; i++) {
 		sequence_bits[i] = false; //all starts as false
@@ -1968,7 +1961,7 @@ Variant VisualScriptInstance::call(const StringName &p_method, const Variant **p
 
 	Map<int, VisualScriptNodeInstance *>::Element *E = instances.find(f->node);
 	if (!E) {
-		r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+		r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 
 		ERR_FAIL_V_MSG(Variant(), "No VisualScriptFunction node in function.");
 	}
@@ -1982,14 +1975,14 @@ Variant VisualScriptInstance::call(const StringName &p_method, const Variant **p
 	VSDEBUG("ARGUMENTS: " + itos(f->argument_count) = " RECEIVED: " + itos(p_argcount));
 
 	if (p_argcount < f->argument_count) {
-		r_error.error = Variant::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
+		r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
 		r_error.argument = node->get_input_port_count();
 
 		return Variant();
 	}
 
 	if (p_argcount > f->argument_count) {
-		r_error.error = Variant::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS;
+		r_error.error = Callable::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS;
 		r_error.argument = node->get_input_port_count();
 
 		return Variant();
@@ -2009,69 +2002,82 @@ Variant VisualScriptInstance::call(const StringName &p_method, const Variant **p
 }
 
 void VisualScriptInstance::notification(int p_notification) {
-
 	//do nothing as this is called using virtual
 
 	Variant what = p_notification;
 	const Variant *whatp = &what;
-	Variant::CallError ce;
+	Callable::CallError ce;
 	call(VisualScriptLanguage::singleton->notification, &whatp, 1, ce); //do as call
 }
 
 String VisualScriptInstance::to_string(bool *r_valid) {
 	if (has_method(CoreStringNames::get_singleton()->_to_string)) {
-		Variant::CallError ce;
-		Variant ret = call(CoreStringNames::get_singleton()->_to_string, NULL, 0, ce);
-		if (ce.error == Variant::CallError::CALL_OK) {
+		Callable::CallError ce;
+		Variant ret = call(CoreStringNames::get_singleton()->_to_string, nullptr, 0, ce);
+		if (ce.error == Callable::CallError::CALL_OK) {
 			if (ret.get_type() != Variant::STRING) {
-				if (r_valid)
+				if (r_valid) {
 					*r_valid = false;
+				}
 				ERR_FAIL_V_MSG(String(), "Wrong type for " + CoreStringNames::get_singleton()->_to_string + ", must be a String.");
 			}
-			if (r_valid)
+			if (r_valid) {
 				*r_valid = true;
+			}
 			return ret.operator String();
 		}
 	}
-	if (r_valid)
+	if (r_valid) {
 		*r_valid = false;
+	}
 	return String();
 }
 
 Ref<Script> VisualScriptInstance::get_script() const {
-
 	return script;
 }
 
-MultiplayerAPI::RPCMode VisualScriptInstance::get_rpc_mode(const StringName &p_method) const {
+Vector<ScriptNetData> VisualScriptInstance::get_rpc_methods() const {
+	return script->get_rpc_methods();
+}
 
-	if (p_method == script->get_default_func())
-		return MultiplayerAPI::RPC_MODE_DISABLED;
+uint16_t VisualScriptInstance::get_rpc_method_id(const StringName &p_method) const {
+	return script->get_rpc_method_id(p_method);
+}
 
-	const Map<StringName, VisualScript::Function>::Element *E = script->functions.find(p_method);
-	if (!E) {
-		return MultiplayerAPI::RPC_MODE_DISABLED;
-	}
+StringName VisualScriptInstance::get_rpc_method(const uint16_t p_rpc_method_id) const {
+	return script->get_rpc_method(p_rpc_method_id);
+}
 
-	if (E->get().function_id >= 0 && E->get().nodes.has(E->get().function_id)) {
+MultiplayerAPI::RPCMode VisualScriptInstance::get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const {
+	return script->get_rpc_mode_by_id(p_rpc_method_id);
+}
 
-		Ref<VisualScriptFunction> vsf = E->get().nodes[E->get().function_id].node;
-		if (vsf.is_valid()) {
+MultiplayerAPI::RPCMode VisualScriptInstance::get_rpc_mode(const StringName &p_method) const {
+	return script->get_rpc_mode(p_method);
+}
 
-			return vsf->get_rpc_mode();
-		}
-	}
+Vector<ScriptNetData> VisualScriptInstance::get_rset_properties() const {
+	return script->get_rset_properties();
+}
 
-	return MultiplayerAPI::RPC_MODE_DISABLED;
+uint16_t VisualScriptInstance::get_rset_property_id(const StringName &p_variable) const {
+	return script->get_rset_property_id(p_variable);
 }
 
-MultiplayerAPI::RPCMode VisualScriptInstance::get_rset_mode(const StringName &p_variable) const {
+StringName VisualScriptInstance::get_rset_property(const uint16_t p_rset_property_id) const {
+	return script->get_rset_property(p_rset_property_id);
+}
 
-	return MultiplayerAPI::RPC_MODE_DISABLED;
+MultiplayerAPI::RPCMode VisualScriptInstance::get_rset_mode_by_id(const uint16_t p_rset_variable_id) const {
+	return script->get_rset_mode_by_id(p_rset_variable_id);
 }
 
-void VisualScriptInstance::create(const Ref<VisualScript> &p_script, Object *p_owner) {
+MultiplayerAPI::RPCMode VisualScriptInstance::get_rset_mode(const StringName &p_variable) const {
+	return script->get_rset_mode(p_variable);
+}
 
+void VisualScriptInstance::create(const Ref<VisualScript> &p_script, Object *p_owner) {
 	script = p_script;
 	owner = p_owner;
 	source = p_script->get_path();
@@ -2082,16 +2088,21 @@ void VisualScriptInstance::create(const Ref<VisualScript> &p_script, Object *p_o
 	if (Object::cast_to<Node>(p_owner)) {
 		//turn on these if they exist and base is a node
 		Node *node = Object::cast_to<Node>(p_owner);
-		if (p_script->functions.has("_process"))
+		if (p_script->functions.has("_process")) {
 			node->set_process(true);
-		if (p_script->functions.has("_physics_process"))
+		}
+		if (p_script->functions.has("_physics_process")) {
 			node->set_physics_process(true);
-		if (p_script->functions.has("_input"))
+		}
+		if (p_script->functions.has("_input")) {
 			node->set_process_input(true);
-		if (p_script->functions.has("_unhandled_input"))
+		}
+		if (p_script->functions.has("_unhandled_input")) {
 			node->set_process_unhandled_input(true);
-		if (p_script->functions.has("_unhandled_key_input"))
+		}
+		if (p_script->functions.has("_unhandled_key_input")) {
 			node->set_process_unhandled_key_input(true);
+		}
 	}
 
 	for (const Map<StringName, VisualScript::Variable>::Element *E = script->variables.front(); E; E = E->next()) {
@@ -2099,7 +2110,6 @@ void VisualScriptInstance::create(const Ref<VisualScript> &p_script, Object *p_o
 	}
 
 	for (const Map<StringName, VisualScript::Function>::Element *E = script->functions.front(); E; E = E->next()) {
-
 		if (E->key() == script->get_default_func()) {
 			continue;
 		}
@@ -2138,7 +2148,6 @@ void VisualScriptInstance::create(const Ref<VisualScript> &p_script, Object *p_o
 
 		//first create the nodes
 		for (const Map<int, VisualScript::Function::NodeData>::Element *F = E->get().nodes.front(); F; F = F->next()) {
-
 			Ref<VisualScriptNode> node = F->get().node;
 
 			VisualScriptNodeInstance *instance = node->instance(this); //create instance
@@ -2148,18 +2157,17 @@ void VisualScriptInstance::create(const Ref<VisualScript> &p_script, Object *p_o
 
 			instance->id = F->key();
 			instance->input_port_count = node->get_input_value_port_count();
-			instance->input_ports = NULL;
+			instance->input_ports = nullptr;
 			instance->output_port_count = node->get_output_value_port_count();
-			instance->output_ports = NULL;
+			instance->output_ports = nullptr;
 			instance->sequence_output_count = node->get_output_sequence_port_count();
 			instance->sequence_index = function.node_count++;
-			instance->sequence_outputs = NULL;
+			instance->sequence_outputs = nullptr;
 			instance->pass_idx = -1;
 
 			if (instance->input_port_count) {
 				instance->input_ports = memnew_arr(int, instance->input_port_count);
 				for (int i = 0; i < instance->input_port_count; i++) {
-
 					instance->input_ports[i] = -1; //if not assigned, will become default value
 				}
 			}
@@ -2174,7 +2182,7 @@ void VisualScriptInstance::create(const Ref<VisualScript> &p_script, Object *p_o
 			if (instance->sequence_output_count) {
 				instance->sequence_outputs = memnew_arr(VisualScriptNodeInstance *, instance->sequence_output_count);
 				for (int i = 0; i < instance->sequence_output_count; i++) {
-					instance->sequence_outputs[i] = NULL; //if it remains null, flow ends here
+					instance->sequence_outputs[i] = nullptr; //if it remains null, flow ends here
 				}
 			}
 
@@ -2184,10 +2192,11 @@ void VisualScriptInstance::create(const Ref<VisualScript> &p_script, Object *p_o
 
 				StringName var_name;
 
-				if (Object::cast_to<VisualScriptLocalVar>(*node))
+				if (Object::cast_to<VisualScriptLocalVar>(*node)) {
 					var_name = String(Object::cast_to<VisualScriptLocalVar>(*node)->get_var_name()).strip_edges();
-				else
+				} else {
 					var_name = String(Object::cast_to<VisualScriptLocalVarSet>(*node)->get_var_name()).strip_edges();
+				}
 
 				if (!local_var_indices.has(var_name)) {
 					local_var_indices[var_name] = function.max_stack;
@@ -2214,7 +2223,6 @@ void VisualScriptInstance::create(const Ref<VisualScript> &p_script, Object *p_o
 		//second pass, do data connections
 
 		for (const Set<VisualScript::DataConnection>::Element *F = E->get().data_connections.front(); F; F = F->next()) {
-
 			VisualScript::DataConnection dc = F->get();
 			ERR_CONTINUE(!instances.has(dc.from_node));
 			VisualScriptNodeInstance *from = instances[dc.from_node];
@@ -2224,7 +2232,6 @@ void VisualScriptInstance::create(const Ref<VisualScript> &p_script, Object *p_o
 			ERR_CONTINUE(dc.to_port >= to->input_port_count);
 
 			if (from->output_ports[dc.from_port] == -1) {
-
 				int stack_pos = function.max_stack++;
 				from->output_ports[dc.from_port] = stack_pos;
 			}
@@ -2244,7 +2251,6 @@ void VisualScriptInstance::create(const Ref<VisualScript> &p_script, Object *p_o
 		//third pass, do sequence connections
 
 		for (const Set<VisualScript::SequenceConnection>::Element *F = E->get().sequence_connections.front(); F; F = F->next()) {
-
 			VisualScript::SequenceConnection sc = F->get();
 			ERR_CONTINUE(!instances.has(sc.from_node));
 			VisualScriptNodeInstance *from = instances[sc.from_node];
@@ -2260,7 +2266,6 @@ void VisualScriptInstance::create(const Ref<VisualScript> &p_script, Object *p_o
 		// 2) connect unassigned output ports to trash
 
 		for (const Map<int, VisualScript::Function::NodeData>::Element *F = E->get().nodes.front(); F; F = F->next()) {
-
 			ERR_CONTINUE(!instances.has(F->key()));
 
 			Ref<VisualScriptNode> node = F->get().node;
@@ -2269,7 +2274,6 @@ void VisualScriptInstance::create(const Ref<VisualScript> &p_script, Object *p_o
 			// connect to default values
 			for (int i = 0; i < instance->input_port_count; i++) {
 				if (instance->input_ports[i] == -1) {
-
 					//unassigned, connect to default val
 					instance->input_ports[i] = default_values.size() | VisualScriptNodeInstance::INPUT_DEFAULT_VALUE_BIT;
 					default_values.push_back(node->get_default_input_value(i));
@@ -2289,7 +2293,6 @@ void VisualScriptInstance::create(const Ref<VisualScript> &p_script, Object *p_o
 }
 
 ScriptLanguage *VisualScriptInstance::get_language() {
-
 	return VisualScriptLanguage::singleton;
 }
 
@@ -2297,14 +2300,11 @@ VisualScriptInstance::VisualScriptInstance() {
 }
 
 VisualScriptInstance::~VisualScriptInstance() {
+	{
+		MutexLock lock(VisualScriptLanguage::singleton->lock);
 
-	if (VisualScriptLanguage::singleton->lock)
-		VisualScriptLanguage::singleton->lock->lock();
-
-	script->instances.erase(owner);
-
-	if (VisualScriptLanguage::singleton->lock)
-		VisualScriptLanguage::singleton->lock->unlock();
+		script->instances.erase(owner);
+	}
 
 	for (Map<int, VisualScriptNodeInstance *>::Element *E = instances.front(); E; E = E->next()) {
 		memdelete(E->get());
@@ -2315,29 +2315,27 @@ VisualScriptInstance::~VisualScriptInstance() {
 
 /////////////////////
 
-Variant VisualScriptFunctionState::_signal_callback(const Variant **p_args, int p_argcount, Variant::CallError &r_error) {
-
+Variant VisualScriptFunctionState::_signal_callback(const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
 	ERR_FAIL_COND_V(function == StringName(), Variant());
 
 #ifdef DEBUG_ENABLED
 
-	ERR_FAIL_COND_V_MSG(instance_id && !ObjectDB::get_instance(instance_id), Variant(), "Resumed after yield, but class instance is gone.");
-	ERR_FAIL_COND_V_MSG(script_id && !ObjectDB::get_instance(script_id), Variant(), "Resumed after yield, but script is gone.");
+	ERR_FAIL_COND_V_MSG(instance_id.is_valid() && !ObjectDB::get_instance(instance_id), Variant(), "Resumed after yield, but class instance is gone.");
+	ERR_FAIL_COND_V_MSG(script_id.is_valid() && !ObjectDB::get_instance(script_id), Variant(), "Resumed after yield, but script is gone.");
 
 #endif
 
-	r_error.error = Variant::CallError::CALL_OK;
+	r_error.error = Callable::CallError::CALL_OK;
 
 	Array args;
 
 	if (p_argcount == 0) {
-		r_error.error = Variant::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
+		r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
 		r_error.argument = 1;
 		return Variant();
 	} else if (p_argcount == 1) {
 		//noooneee, reserved for me, me and only me.
 	} else {
-
 		for (int i = 0; i < p_argcount - 1; i++) {
 			args.push_back(*p_args[i]);
 		}
@@ -2346,13 +2344,13 @@ Variant VisualScriptFunctionState::_signal_callback(const Variant **p_args, int
 	Ref<VisualScriptFunctionState> self = *p_args[p_argcount - 1]; //hi, I'm myself, needed this to remain alive.
 
 	if (self.is_null()) {
-		r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+		r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 		r_error.argument = p_argcount - 1;
 		r_error.expected = Variant::OBJECT;
 		return Variant();
 	}
 
-	r_error.error = Variant::CallError::CALL_OK;
+	r_error.error = Callable::CallError::CALL_OK;
 
 	Variant *working_mem = ((Variant *)stack.ptr()) + working_mem_index;
 
@@ -2364,32 +2362,29 @@ Variant VisualScriptFunctionState::_signal_callback(const Variant **p_args, int
 }
 
 void VisualScriptFunctionState::connect_to_signal(Object *p_obj, const String &p_signal, Array p_binds) {
-
 	Vector<Variant> binds;
 	for (int i = 0; i < p_binds.size(); i++) {
 		binds.push_back(p_binds[i]);
 	}
 	binds.push_back(Ref<VisualScriptFunctionState>(this)); //add myself on the back to avoid dying from unreferencing
-	p_obj->connect(p_signal, this, "_signal_callback", binds, CONNECT_ONESHOT);
+	p_obj->connect_compat(p_signal, this, "_signal_callback", binds, CONNECT_ONESHOT);
 }
 
 bool VisualScriptFunctionState::is_valid() const {
-
 	return function != StringName();
 }
 
 Variant VisualScriptFunctionState::resume(Array p_args) {
-
 	ERR_FAIL_COND_V(function == StringName(), Variant());
 #ifdef DEBUG_ENABLED
 
-	ERR_FAIL_COND_V_MSG(instance_id && !ObjectDB::get_instance(instance_id), Variant(), "Resumed after yield, but class instance is gone.");
-	ERR_FAIL_COND_V_MSG(script_id && !ObjectDB::get_instance(script_id), Variant(), "Resumed after yield, but script is gone.");
+	ERR_FAIL_COND_V_MSG(instance_id.is_valid() && !ObjectDB::get_instance(instance_id), Variant(), "Resumed after yield, but class instance is gone.");
+	ERR_FAIL_COND_V_MSG(script_id.is_valid() && !ObjectDB::get_instance(script_id), Variant(), "Resumed after yield, but script is gone.");
 
 #endif
 
-	Variant::CallError r_error;
-	r_error.error = Variant::CallError::CALL_OK;
+	Callable::CallError r_error;
+	r_error.error = Callable::CallError::CALL_OK;
 
 	Variant *working_mem = ((Variant *)stack.ptr()) + working_mem_index;
 
@@ -2401,7 +2396,6 @@ Variant VisualScriptFunctionState::resume(Array p_args) {
 }
 
 void VisualScriptFunctionState::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("connect_to_signal", "obj", "signals", "args"), &VisualScriptFunctionState::connect_to_signal);
 	ClassDB::bind_method(D_METHOD("resume", "args"), &VisualScriptFunctionState::resume, DEFVAL(Variant()));
 	ClassDB::bind_method(D_METHOD("is_valid"), &VisualScriptFunctionState::is_valid);
@@ -2412,7 +2406,6 @@ VisualScriptFunctionState::VisualScriptFunctionState() {
 }
 
 VisualScriptFunctionState::~VisualScriptFunctionState() {
-
 	if (function != StringName()) {
 		Variant *s = ((Variant *)stack.ptr());
 		for (int i = 0; i < variant_stack_size; i++) {
@@ -2424,37 +2417,39 @@ VisualScriptFunctionState::~VisualScriptFunctionState() {
 ///////////////////////////////////////////////
 
 String VisualScriptLanguage::get_name() const {
-
 	return "VisualScript";
 }
 
 /* LANGUAGE FUNCTIONS */
 void VisualScriptLanguage::init() {
 }
-String VisualScriptLanguage::get_type() const {
 
+String VisualScriptLanguage::get_type() const {
 	return "VisualScript";
 }
-String VisualScriptLanguage::get_extension() const {
 
+String VisualScriptLanguage::get_extension() const {
 	return "vs";
 }
-Error VisualScriptLanguage::execute_file(const String &p_path) {
 
+Error VisualScriptLanguage::execute_file(const String &p_path) {
 	return OK;
 }
+
 void VisualScriptLanguage::finish() {
 }
 
 /* EDITOR FUNCTIONS */
 void VisualScriptLanguage::get_reserved_words(List<String> *p_words) const {
 }
+
 void VisualScriptLanguage::get_comment_delimiters(List<String> *p_delimiters) const {
 }
+
 void VisualScriptLanguage::get_string_delimiters(List<String> *p_delimiters) const {
 }
-Ref<Script> VisualScriptLanguage::get_template(const String &p_class_name, const String &p_base_class_name) const {
 
+Ref<Script> VisualScriptLanguage::get_template(const String &p_class_name, const String &p_base_class_name) const {
 	Ref<VisualScript> script;
 	script.instance();
 	script->set_instance_base_type(p_base_class_name);
@@ -2462,7 +2457,6 @@ Ref<Script> VisualScriptLanguage::get_template(const String &p_class_name, const
 }
 
 bool VisualScriptLanguage::is_using_templates() {
-
 	return true;
 }
 
@@ -2472,32 +2466,32 @@ void VisualScriptLanguage::make_template(const String &p_class_name, const Strin
 }
 
 bool VisualScriptLanguage::validate(const String &p_script, int &r_line_error, int &r_col_error, String &r_test_error, const String &p_path, List<String> *r_functions, List<ScriptLanguage::Warning> *r_warnings, Set<int> *r_safe_lines) const {
-
 	return false;
 }
-Script *VisualScriptLanguage::create_script() const {
 
+Script *VisualScriptLanguage::create_script() const {
 	return memnew(VisualScript);
 }
-bool VisualScriptLanguage::has_named_classes() const {
 
+bool VisualScriptLanguage::has_named_classes() const {
 	return false;
 }
-bool VisualScriptLanguage::supports_builtin_mode() const {
 
+bool VisualScriptLanguage::supports_builtin_mode() const {
 	return true;
 }
-int VisualScriptLanguage::find_function(const String &p_function, const String &p_code) const {
 
+int VisualScriptLanguage::find_function(const String &p_function, const String &p_code) const {
 	return -1;
 }
-String VisualScriptLanguage::make_function(const String &p_class, const String &p_name, const PoolStringArray &p_args) const {
 
+String VisualScriptLanguage::make_function(const String &p_class, const String &p_name, const PackedStringArray &p_args) const {
 	return String();
 }
 
 void VisualScriptLanguage::auto_indent_code(String &p_code, int p_from_line, int p_to_line) const {
 }
+
 void VisualScriptLanguage::add_global_constant(const StringName &p_variable, const Variant &p_value) {
 }
 
@@ -2506,12 +2500,11 @@ void VisualScriptLanguage::add_global_constant(const StringName &p_variable, con
 bool VisualScriptLanguage::debug_break_parse(const String &p_file, int p_node, const String &p_error) {
 	//break because of parse error
 
-	if (ScriptDebugger::get_singleton() && Thread::get_caller_id() == Thread::get_main_id()) {
-
+	if (EngineDebugger::is_active() && Thread::get_caller_id() == Thread::get_main_id()) {
 		_debug_parse_err_node = p_node;
 		_debug_parse_err_file = p_file;
 		_debug_error = p_error;
-		ScriptDebugger::get_singleton()->debug(this, false, true);
+		EngineDebugger::get_script_debugger()->debug(this, false, true);
 		return true;
 	} else {
 		return false;
@@ -2519,13 +2512,11 @@ bool VisualScriptLanguage::debug_break_parse(const String &p_file, int p_node, c
 }
 
 bool VisualScriptLanguage::debug_break(const String &p_error, bool p_allow_continue) {
-
-	if (ScriptDebugger::get_singleton() && Thread::get_caller_id() == Thread::get_main_id()) {
-
+	if (EngineDebugger::is_active() && Thread::get_caller_id() == Thread::get_main_id()) {
 		_debug_parse_err_node = -1;
 		_debug_parse_err_file = "";
 		_debug_error = p_error;
-		ScriptDebugger::get_singleton()->debug(this, p_allow_continue, true);
+		EngineDebugger::get_script_debugger()->debug(this, p_allow_continue, true);
 		return true;
 	} else {
 		return false;
@@ -2533,21 +2524,21 @@ bool VisualScriptLanguage::debug_break(const String &p_error, bool p_allow_conti
 }
 
 String VisualScriptLanguage::debug_get_error() const {
-
 	return _debug_error;
 }
 
 int VisualScriptLanguage::debug_get_stack_level_count() const {
-
-	if (_debug_parse_err_node >= 0)
+	if (_debug_parse_err_node >= 0) {
 		return 1;
+	}
 
 	return _debug_call_stack_pos;
 }
-int VisualScriptLanguage::debug_get_stack_level_line(int p_level) const {
 
-	if (_debug_parse_err_node >= 0)
+int VisualScriptLanguage::debug_get_stack_level_line(int p_level) const {
+	if (_debug_parse_err_node >= 0) {
 		return _debug_parse_err_node;
+	}
 
 	ERR_FAIL_INDEX_V(p_level, _debug_call_stack_pos, -1);
 
@@ -2555,28 +2546,31 @@ int VisualScriptLanguage::debug_get_stack_level_line(int p_level) const {
 
 	return *(_call_stack[l].current_id);
 }
-String VisualScriptLanguage::debug_get_stack_level_function(int p_level) const {
 
-	if (_debug_parse_err_node >= 0)
+String VisualScriptLanguage::debug_get_stack_level_function(int p_level) const {
+	if (_debug_parse_err_node >= 0) {
 		return "";
+	}
 
 	ERR_FAIL_INDEX_V(p_level, _debug_call_stack_pos, "");
 	int l = _debug_call_stack_pos - p_level - 1;
 	return *_call_stack[l].function;
 }
-String VisualScriptLanguage::debug_get_stack_level_source(int p_level) const {
 
-	if (_debug_parse_err_node >= 0)
+String VisualScriptLanguage::debug_get_stack_level_source(int p_level) const {
+	if (_debug_parse_err_node >= 0) {
 		return _debug_parse_err_file;
+	}
 
 	ERR_FAIL_INDEX_V(p_level, _debug_call_stack_pos, "");
 	int l = _debug_call_stack_pos - p_level - 1;
 	return _call_stack[l].instance->get_script_ptr()->get_path();
 }
-void VisualScriptLanguage::debug_get_stack_level_locals(int p_level, List<String> *p_locals, List<Variant> *p_values, int p_max_subitems, int p_max_depth) {
 
-	if (_debug_parse_err_node >= 0)
+void VisualScriptLanguage::debug_get_stack_level_locals(int p_level, List<String> *p_locals, List<Variant> *p_values, int p_max_subitems, int p_max_depth) {
+	if (_debug_parse_err_node >= 0) {
 		return;
+	}
 
 	ERR_FAIL_INDEX(p_level, _debug_call_stack_pos);
 
@@ -2613,7 +2607,6 @@ void VisualScriptLanguage::debug_get_stack_level_locals(int p_level, List<String
 	}
 
 	for (int i = 0; i < node->output_port_count; i++) {
-
 		String name = node->get_base_node()->get_output_value_port_info(i).name;
 		if (name == String()) {
 			name = "out_" + itos(i);
@@ -2648,17 +2641,19 @@ void VisualScriptLanguage::debug_get_stack_level_locals(int p_level, List<String
     }
 */
 }
-void VisualScriptLanguage::debug_get_stack_level_members(int p_level, List<String> *p_members, List<Variant> *p_values, int p_max_subitems, int p_max_depth) {
 
-	if (_debug_parse_err_node >= 0)
+void VisualScriptLanguage::debug_get_stack_level_members(int p_level, List<String> *p_members, List<Variant> *p_values, int p_max_subitems, int p_max_depth) {
+	if (_debug_parse_err_node >= 0) {
 		return;
+	}
 
 	ERR_FAIL_INDEX(p_level, _debug_call_stack_pos);
 	int l = _debug_call_stack_pos - p_level - 1;
 
 	Ref<VisualScript> vs = _call_stack[l].instance->get_script();
-	if (vs.is_null())
+	if (vs.is_null()) {
 		return;
+	}
 
 	List<StringName> vars;
 	vs->get_variable_list(&vars);
@@ -2672,48 +2667,48 @@ void VisualScriptLanguage::debug_get_stack_level_members(int p_level, List<Strin
 }
 
 void VisualScriptLanguage::debug_get_globals(List<String> *p_locals, List<Variant> *p_values, int p_max_subitems, int p_max_depth) {
-
 	//no globals are really reachable in gdscript
 }
-String VisualScriptLanguage::debug_parse_stack_level_expression(int p_level, const String &p_expression, int p_max_subitems, int p_max_depth) {
 
+String VisualScriptLanguage::debug_parse_stack_level_expression(int p_level, const String &p_expression, int p_max_subitems, int p_max_depth) {
 	return "";
 }
 
 void VisualScriptLanguage::reload_all_scripts() {
 }
+
 void VisualScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_soft_reload) {
 }
+
 /* LOADER FUNCTIONS */
 
 void VisualScriptLanguage::get_recognized_extensions(List<String> *p_extensions) const {
-
 	p_extensions->push_back("vs");
 }
+
 void VisualScriptLanguage::get_public_functions(List<MethodInfo> *p_functions) const {
 }
-void VisualScriptLanguage::get_public_constants(List<Pair<String, Variant> > *p_constants) const {
+
+void VisualScriptLanguage::get_public_constants(List<Pair<String, Variant>> *p_constants) const {
 }
 
 void VisualScriptLanguage::profiling_start() {
 }
+
 void VisualScriptLanguage::profiling_stop() {
 }
 
 int VisualScriptLanguage::profiling_get_accumulated_data(ProfilingInfo *p_info_arr, int p_info_max) {
-
 	return 0;
 }
 
 int VisualScriptLanguage::profiling_get_frame_data(ProfilingInfo *p_info_arr, int p_info_max) {
-
 	return 0;
 }
 
-VisualScriptLanguage *VisualScriptLanguage::singleton = NULL;
+VisualScriptLanguage *VisualScriptLanguage::singleton = nullptr;
 
 void VisualScriptLanguage::add_register_func(const String &p_name, VisualScriptNodeRegisterFunc p_func) {
-
 	ERR_FAIL_COND(register_funcs.has(p_name));
 	register_funcs[p_name] = p_func;
 }
@@ -2724,28 +2719,22 @@ void VisualScriptLanguage::remove_register_func(const String &p_name) {
 }
 
 Ref<VisualScriptNode> VisualScriptLanguage::create_node_from_name(const String &p_name) {
-
 	ERR_FAIL_COND_V(!register_funcs.has(p_name), Ref<VisualScriptNode>());
 
 	return register_funcs[p_name](p_name);
 }
 
 void VisualScriptLanguage::get_registered_node_names(List<String> *r_names) {
-
 	for (Map<String, VisualScriptNodeRegisterFunc>::Element *E = register_funcs.front(); E; E = E->next()) {
 		r_names->push_back(E->key());
 	}
 }
 
 VisualScriptLanguage::VisualScriptLanguage() {
-
 	notification = "_notification";
 	_step = "_step";
 	_subcall = "_subcall";
 	singleton = this;
-#ifndef NO_THREADS
-	lock = Mutex::create();
-#endif
 
 	_debug_parse_err_node = -1;
 	_debug_parse_err_file = "";
@@ -2753,24 +2742,20 @@ VisualScriptLanguage::VisualScriptLanguage() {
 	int dmcs = GLOBAL_DEF("debug/settings/visual_script/max_call_stack", 1024);
 	ProjectSettings::get_singleton()->set_custom_property_info("debug/settings/visual_script/max_call_stack", PropertyInfo(Variant::INT, "debug/settings/visual_script/max_call_stack", PROPERTY_HINT_RANGE, "1024,4096,1,or_greater")); //minimum is 1024
 
-	if (ScriptDebugger::get_singleton()) {
+	if (EngineDebugger::is_active()) {
 		//debugging enabled!
 		_debug_max_call_stack = dmcs;
 		_call_stack = memnew_arr(CallLevel, _debug_max_call_stack + 1);
 
 	} else {
 		_debug_max_call_stack = 0;
-		_call_stack = NULL;
+		_call_stack = nullptr;
 	}
 }
 
 VisualScriptLanguage::~VisualScriptLanguage() {
-
-	if (lock)
-		memdelete(lock);
-
 	if (_call_stack) {
 		memdelete_arr(_call_stack);
 	}
-	singleton = NULL;
+	singleton = nullptr;
 }
diff --git a/modules/visual_script/visual_script.h b/modules/visual_script/visual_script.h
index 9305226dc6..cb5ed37ba1 100644
--- a/modules/visual_script/visual_script.h
+++ b/modules/visual_script/visual_script.h
@@ -31,6 +31,8 @@
 #ifndef VISUAL_SCRIPT_H
 #define VISUAL_SCRIPT_H
 
+#include "core/debugger/engine_debugger.h"
+#include "core/debugger/script_debugger.h"
 #include "core/os/thread.h"
 #include "core/script_language.h"
 
@@ -87,7 +89,6 @@ public:
 	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) = 0;
 
 	struct TypeGuess {
-
 		Variant::Type type;
 		StringName gdclass;
 		Ref<Script> script;
@@ -155,7 +156,7 @@ public:
 
 	virtual int get_working_memory_size() const { return 0; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) = 0; //do a step, return which sequence port to go out
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) = 0; //do a step, return which sequence port to go out
 
 	Ref<VisualScriptNode> get_base_node() { return Ref<VisualScriptNode>(base); }
 
@@ -164,16 +165,13 @@ public:
 };
 
 class VisualScript : public Script {
-
 	GDCLASS(VisualScript, Script);
 
 	RES_BASE_EXTENSION("vs");
 
 public:
 	struct SequenceConnection {
-
 		union {
-
 			struct {
 				uint64_t from_node : 24;
 				uint64_t from_output : 16;
@@ -183,15 +181,12 @@ public:
 		};
 
 		bool operator<(const SequenceConnection &p_connection) const {
-
 			return id < p_connection.id;
 		}
 	};
 
 	struct DataConnection {
-
 		union {
-
 			struct {
 				uint64_t from_node : 24;
 				uint64_t from_port : 8;
@@ -202,7 +197,6 @@ public:
 		};
 
 		bool operator<(const DataConnection &p_connection) const {
-
 			return id < p_connection.id;
 		}
 	};
@@ -244,7 +238,9 @@ private:
 
 	Map<StringName, Function> functions;
 	Map<StringName, Variable> variables;
-	Map<StringName, Vector<Argument> > custom_signals;
+	Map<StringName, Vector<Argument>> custom_signals;
+	Vector<ScriptNetData> rpc_functions;
+	Vector<ScriptNetData> rpc_variables;
 
 	Map<Object *, VisualScriptInstance *> instances;
 
@@ -253,7 +249,7 @@ private:
 #ifdef TOOLS_ENABLED
 	Set<PlaceHolderScriptInstance *> placeholders;
 	//void _update_placeholder(PlaceHolderScriptInstance *p_placeholder);
-	virtual void _placeholder_erased(PlaceHolderScriptInstance *p_placeholder);
+	virtual void _placeholder_erased(PlaceHolderScriptInstance *p_placeholder) override;
 	void _update_placeholders();
 #endif
 
@@ -268,6 +264,8 @@ protected:
 	static void _bind_methods();
 
 public:
+	bool inherits_script(const Ref<Script> &p_script) const override;
+
 	// TODO: Remove it in future when breaking changes are acceptable
 	StringName get_default_func() const;
 	void add_function(const StringName &p_name);
@@ -332,35 +330,47 @@ public:
 
 	void set_instance_base_type(const StringName &p_type);
 
-	virtual bool can_instance() const;
+	virtual bool can_instance() const override;
 
-	virtual Ref<Script> get_base_script() const;
-	virtual StringName get_instance_base_type() const;
-	virtual ScriptInstance *instance_create(Object *p_this);
-	virtual bool instance_has(const Object *p_this) const;
+	virtual Ref<Script> get_base_script() const override;
+	virtual StringName get_instance_base_type() const override;
+	virtual ScriptInstance *instance_create(Object *p_this) override;
+	virtual bool instance_has(const Object *p_this) const override;
 
-	virtual bool has_source_code() const;
-	virtual String get_source_code() const;
-	virtual void set_source_code(const String &p_code);
-	virtual Error reload(bool p_keep_state = false);
+	virtual bool has_source_code() const override;
+	virtual String get_source_code() const override;
+	virtual void set_source_code(const String &p_code) override;
+	virtual Error reload(bool p_keep_state = false) override;
 
-	virtual bool is_tool() const;
-	virtual bool is_valid() const;
+	virtual bool is_tool() const override;
+	virtual bool is_valid() const override;
 
-	virtual ScriptLanguage *get_language() const;
+	virtual ScriptLanguage *get_language() const override;
 
-	virtual bool has_script_signal(const StringName &p_signal) const;
-	virtual void get_script_signal_list(List<MethodInfo> *r_signals) const;
+	virtual bool has_script_signal(const StringName &p_signal) const override;
+	virtual void get_script_signal_list(List<MethodInfo> *r_signals) const override;
 
-	virtual bool get_property_default_value(const StringName &p_property, Variant &r_value) const;
-	virtual void get_script_method_list(List<MethodInfo> *p_list) const;
+	virtual bool get_property_default_value(const StringName &p_property, Variant &r_value) const override;
+	virtual void get_script_method_list(List<MethodInfo> *p_list) const override;
 
-	virtual bool has_method(const StringName &p_method) const;
-	virtual MethodInfo get_method_info(const StringName &p_method) const;
+	virtual bool has_method(const StringName &p_method) const override;
+	virtual MethodInfo get_method_info(const StringName &p_method) const override;
+
+	virtual void get_script_property_list(List<PropertyInfo> *p_list) const override;
 
-	virtual void get_script_property_list(List<PropertyInfo> *p_list) const;
+	virtual int get_member_line(const StringName &p_member) const override;
 
-	virtual int get_member_line(const StringName &p_member) const;
+	virtual Vector<ScriptNetData> get_rpc_methods() const override;
+	virtual uint16_t get_rpc_method_id(const StringName &p_method) const override;
+	virtual StringName get_rpc_method(const uint16_t p_rpc_method_id) const override;
+	virtual MultiplayerAPI::RPCMode get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const override;
+	virtual MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const override;
+
+	virtual Vector<ScriptNetData> get_rset_properties() const override;
+	virtual uint16_t get_rset_property_id(const StringName &p_property) const override;
+	virtual StringName get_rset_property(const uint16_t p_rset_property_id) const override;
+	virtual MultiplayerAPI::RPCMode get_rset_mode_by_id(const uint16_t p_rpc_method_id) const override;
+	virtual MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const override;
 
 #ifdef TOOLS_ENABLED
 	virtual bool are_subnodes_edited() const;
@@ -394,8 +404,8 @@ class VisualScriptInstance : public ScriptInstance {
 
 	StringName source;
 
-	void _dependency_step(VisualScriptNodeInstance *node, int p_pass, int *pass_stack, const Variant **input_args, Variant **output_args, Variant *variant_stack, Variant::CallError &r_error, String &error_str, VisualScriptNodeInstance **r_error_node);
-	Variant _call_internal(const StringName &p_method, void *p_stack, int p_stack_size, VisualScriptNodeInstance *p_node, int p_flow_stack_pos, int p_pass, bool p_resuming_yield, Variant::CallError &r_error);
+	void _dependency_step(VisualScriptNodeInstance *node, int p_pass, int *pass_stack, const Variant **input_args, Variant **output_args, Variant *variant_stack, Callable::CallError &r_error, String &error_str, VisualScriptNodeInstance **r_error_node);
+	Variant _call_internal(const StringName &p_method, void *p_stack, int p_stack_size, VisualScriptNodeInstance *p_node, int p_flow_stack_pos, int p_pass, bool p_resuming_yield, Callable::CallError &r_error);
 
 	//Map<StringName,Function> functions;
 	friend class VisualScriptFunctionState; //for yield
@@ -404,29 +414,29 @@ public:
 	virtual bool set(const StringName &p_name, const Variant &p_value);
 	virtual bool get(const StringName &p_name, Variant &r_ret) const;
 	virtual void get_property_list(List<PropertyInfo> *p_properties) const;
-	virtual Variant::Type get_property_type(const StringName &p_name, bool *r_is_valid = NULL) const;
+	virtual Variant::Type get_property_type(const StringName &p_name, bool *r_is_valid = nullptr) const;
 
 	virtual void get_method_list(List<MethodInfo> *p_list) const;
 	virtual bool has_method(const StringName &p_method) const;
-	virtual Variant call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error);
+	virtual Variant call(const StringName &p_method, const Variant **p_args, int p_argcount, Callable::CallError &r_error);
 	virtual void notification(int p_notification);
 	String to_string(bool *r_valid);
 
 	bool set_variable(const StringName &p_variable, const Variant &p_value) {
-
 		Map<StringName, Variant>::Element *E = variables.find(p_variable);
-		if (!E)
+		if (!E) {
 			return false;
+		}
 
 		E->get() = p_value;
 		return true;
 	}
 
 	bool get_variable(const StringName &p_variable, Variant *r_variable) const {
-
 		const Map<StringName, Variant>::Element *E = variables.find(p_variable);
-		if (!E)
+		if (!E) {
 			return false;
+		}
 
 		*r_variable = E->get();
 		return true;
@@ -441,7 +451,16 @@ public:
 
 	virtual ScriptLanguage *get_language();
 
+	virtual Vector<ScriptNetData> get_rpc_methods() const;
+	virtual uint16_t get_rpc_method_id(const StringName &p_method) const;
+	virtual StringName get_rpc_method(const uint16_t p_rpc_method_id) const;
+	virtual MultiplayerAPI::RPCMode get_rpc_mode_by_id(const uint16_t p_rpc_method_id) const;
 	virtual MultiplayerAPI::RPCMode get_rpc_mode(const StringName &p_method) const;
+
+	virtual Vector<ScriptNetData> get_rset_properties() const;
+	virtual uint16_t get_rset_property_id(const StringName &p_property) const;
+	virtual StringName get_rset_property(const uint16_t p_rset_property_id) const;
+	virtual MultiplayerAPI::RPCMode get_rset_mode_by_id(const uint16_t p_rpc_method_id) const;
 	virtual MultiplayerAPI::RPCMode get_rset_mode(const StringName &p_variable) const;
 
 	VisualScriptInstance();
@@ -449,7 +468,6 @@ public:
 };
 
 class VisualScriptFunctionState : public Reference {
-
 	GDCLASS(VisualScriptFunctionState, Reference);
 	friend class VisualScriptInstance;
 
@@ -464,7 +482,7 @@ class VisualScriptFunctionState : public Reference {
 	int flow_stack_pos;
 	int pass;
 
-	Variant _signal_callback(const Variant **p_args, int p_argcount, Variant::CallError &r_error);
+	Variant _signal_callback(const Variant **p_args, int p_argcount, Callable::CallError &r_error);
 
 protected:
 	static void _bind_methods();
@@ -480,11 +498,9 @@ public:
 typedef Ref<VisualScriptNode> (*VisualScriptNodeRegisterFunc)(const String &p_type);
 
 class VisualScriptLanguage : public ScriptLanguage {
-
 	Map<String, VisualScriptNodeRegisterFunc> register_funcs;
 
 	struct CallLevel {
-
 		Variant *stack;
 		Variant **work_mem;
 		const StringName *function;
@@ -507,23 +523,24 @@ public:
 
 	static VisualScriptLanguage *singleton;
 
-	Mutex *lock;
+	Mutex lock;
 
 	bool debug_break(const String &p_error, bool p_allow_continue = true);
 	bool debug_break_parse(const String &p_file, int p_node, const String &p_error);
 
 	_FORCE_INLINE_ void enter_function(VisualScriptInstance *p_instance, const StringName *p_function, Variant *p_stack, Variant **p_work_mem, int *current_id) {
-
-		if (Thread::get_main_id() != Thread::get_caller_id())
+		if (Thread::get_main_id() != Thread::get_caller_id()) {
 			return; //no support for other threads than main for now
+		}
 
-		if (ScriptDebugger::get_singleton()->get_lines_left() > 0 && ScriptDebugger::get_singleton()->get_depth() >= 0)
-			ScriptDebugger::get_singleton()->set_depth(ScriptDebugger::get_singleton()->get_depth() + 1);
+		if (EngineDebugger::get_script_debugger()->get_lines_left() > 0 && EngineDebugger::get_script_debugger()->get_depth() >= 0) {
+			EngineDebugger::get_script_debugger()->set_depth(EngineDebugger::get_script_debugger()->get_depth() + 1);
+		}
 
 		if (_debug_call_stack_pos >= _debug_max_call_stack) {
 			//stack overflow
 			_debug_error = "Stack Overflow (Stack Size: " + itos(_debug_max_call_stack) + ")";
-			ScriptDebugger::get_singleton()->debug(this);
+			EngineDebugger::get_script_debugger()->debug(this);
 			return;
 		}
 
@@ -536,17 +553,17 @@ public:
 	}
 
 	_FORCE_INLINE_ void exit_function() {
-
-		if (Thread::get_main_id() != Thread::get_caller_id())
+		if (Thread::get_main_id() != Thread::get_caller_id()) {
 			return; //no support for other threads than main for now
+		}
 
-		if (ScriptDebugger::get_singleton()->get_lines_left() > 0 && ScriptDebugger::get_singleton()->get_depth() >= 0)
-			ScriptDebugger::get_singleton()->set_depth(ScriptDebugger::get_singleton()->get_depth() - 1);
+		if (EngineDebugger::get_script_debugger()->get_lines_left() > 0 && EngineDebugger::get_script_debugger()->get_depth() >= 0) {
+			EngineDebugger::get_script_debugger()->set_depth(EngineDebugger::get_script_debugger()->get_depth() - 1);
+		}
 
 		if (_debug_call_stack_pos == 0) {
-
 			_debug_error = "Stack Underflow (Engine Bug)";
-			ScriptDebugger::get_singleton()->debug(this);
+			EngineDebugger::get_script_debugger()->debug(this);
 			return;
 		}
 
@@ -571,12 +588,12 @@ public:
 	virtual Ref<Script> get_template(const String &p_class_name, const String &p_base_class_name) const;
 	virtual bool is_using_templates();
 	virtual void make_template(const String &p_class_name, const String &p_base_class_name, Ref<Script> &p_script);
-	virtual bool validate(const String &p_script, int &r_line_error, int &r_col_error, String &r_test_error, const String &p_path = "", List<String> *r_functions = NULL, List<ScriptLanguage::Warning> *r_warnings = NULL, Set<int> *r_safe_lines = NULL) const;
+	virtual bool validate(const String &p_script, int &r_line_error, int &r_col_error, String &r_test_error, const String &p_path = "", List<String> *r_functions = nullptr, List<ScriptLanguage::Warning> *r_warnings = nullptr, Set<int> *r_safe_lines = nullptr) const;
 	virtual Script *create_script() const;
 	virtual bool has_named_classes() const;
 	virtual bool supports_builtin_mode() const;
 	virtual int find_function(const String &p_function, const String &p_code) const;
-	virtual String make_function(const String &p_class, const String &p_name, const PoolStringArray &p_args) const;
+	virtual String make_function(const String &p_class, const String &p_name, const PackedStringArray &p_args) const;
 	virtual void auto_indent_code(String &p_code, int p_from_line, int p_to_line) const;
 	virtual void add_global_constant(const StringName &p_variable, const Variant &p_value);
 
@@ -598,7 +615,7 @@ public:
 
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual void get_public_functions(List<MethodInfo> *p_functions) const;
-	virtual void get_public_constants(List<Pair<String, Variant> > *p_constants) const;
+	virtual void get_public_constants(List<Pair<String, Variant>> *p_constants) const;
 
 	virtual void profiling_start();
 	virtual void profiling_stop();
@@ -618,7 +635,6 @@ public:
 //aid for registering
 template <class T>
 static Ref<VisualScriptNode> create_node_generic(const String &p_name) {
-
 	Ref<T> node;
 	node.instance();
 	return node;
diff --git a/modules/visual_script/visual_script_builtin_funcs.cpp b/modules/visual_script/visual_script_builtin_funcs.cpp
index 2894f6367b..177f9192b8 100644
--- a/modules/visual_script/visual_script_builtin_funcs.cpp
+++ b/modules/visual_script/visual_script_builtin_funcs.cpp
@@ -63,7 +63,7 @@ const char *VisualScriptBuiltinFunc::func_name[VisualScriptBuiltinFunc::FUNC_MAX
 	"is_nan",
 	"is_inf",
 	"ease",
-	"decimals",
+	"step_decimals",
 	"stepify",
 	"lerp",
 	"inverse_lerp",
@@ -110,30 +110,26 @@ const char *VisualScriptBuiltinFunc::func_name[VisualScriptBuiltinFunc::FUNC_MAX
 };
 
 VisualScriptBuiltinFunc::BuiltinFunc VisualScriptBuiltinFunc::find_function(const String &p_string) {
-
 	for (int i = 0; i < FUNC_MAX; i++) {
-		if (p_string == func_name[i])
+		if (p_string == func_name[i]) {
 			return BuiltinFunc(i);
+		}
 	}
 
 	return FUNC_MAX;
 }
 
 String VisualScriptBuiltinFunc::get_func_name(BuiltinFunc p_func) {
-
 	ERR_FAIL_INDEX_V(p_func, FUNC_MAX, String());
 	return func_name[p_func];
 }
 
 int VisualScriptBuiltinFunc::get_output_sequence_port_count() const {
-
 	return has_input_sequence_port() ? 1 : 0;
 }
 
 bool VisualScriptBuiltinFunc::has_input_sequence_port() const {
-
 	switch (func) {
-
 		case MATH_RANDOMIZE:
 		case TEXT_PRINT:
 		case TEXT_PRINTERR:
@@ -145,9 +141,7 @@ bool VisualScriptBuiltinFunc::has_input_sequence_port() const {
 }
 
 int VisualScriptBuiltinFunc::get_func_argument_count(BuiltinFunc p_func) {
-
 	switch (p_func) {
-
 		case MATH_RANDOMIZE:
 		case MATH_RAND:
 		case MATH_RANDF:
@@ -171,7 +165,7 @@ int VisualScriptBuiltinFunc::get_func_argument_count(BuiltinFunc p_func) {
 		case MATH_EXP:
 		case MATH_ISNAN:
 		case MATH_ISINF:
-		case MATH_DECIMALS:
+		case MATH_STEP_DECIMALS:
 		case MATH_SEED:
 		case MATH_RANDSEED:
 		case MATH_DEG2RAD:
@@ -228,11 +222,10 @@ int VisualScriptBuiltinFunc::get_func_argument_count(BuiltinFunc p_func) {
 }
 
 int VisualScriptBuiltinFunc::get_input_value_port_count() const {
-
 	return get_func_argument_count(func);
 }
-int VisualScriptBuiltinFunc::get_output_value_port_count() const {
 
+int VisualScriptBuiltinFunc::get_output_value_port_count() const {
 	switch (func) {
 		case MATH_RANDOMIZE:
 		case TEXT_PRINT:
@@ -250,14 +243,11 @@ int VisualScriptBuiltinFunc::get_output_value_port_count() const {
 }
 
 String VisualScriptBuiltinFunc::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 PropertyInfo VisualScriptBuiltinFunc::get_input_value_port_info(int p_idx) const {
-
 	switch (func) {
-
 		case MATH_SIN:
 		case MATH_COS:
 		case MATH_TAN:
@@ -277,144 +267,158 @@ PropertyInfo VisualScriptBuiltinFunc::get_input_value_port_info(int p_idx) const
 		case MATH_EXP:
 		case MATH_ISNAN:
 		case MATH_ISINF: {
-			return PropertyInfo(Variant::REAL, "s");
+			return PropertyInfo(Variant::FLOAT, "s");
 		} break;
 		case MATH_ATAN2: {
-			if (p_idx == 0)
-				return PropertyInfo(Variant::REAL, "y");
-			else
-				return PropertyInfo(Variant::REAL, "x");
+			if (p_idx == 0) {
+				return PropertyInfo(Variant::FLOAT, "y");
+			} else {
+				return PropertyInfo(Variant::FLOAT, "x");
+			}
 		} break;
 		case MATH_FMOD:
 		case MATH_FPOSMOD:
 		case LOGIC_MAX:
 		case LOGIC_MIN: {
-			if (p_idx == 0)
-				return PropertyInfo(Variant::REAL, "a");
-			else
-				return PropertyInfo(Variant::REAL, "b");
+			if (p_idx == 0) {
+				return PropertyInfo(Variant::FLOAT, "a");
+			} else {
+				return PropertyInfo(Variant::FLOAT, "b");
+			}
 		} break;
 		case MATH_POSMOD: {
-			if (p_idx == 0)
+			if (p_idx == 0) {
 				return PropertyInfo(Variant::INT, "a");
-			else
+			} else {
 				return PropertyInfo(Variant::INT, "b");
+			}
 		} break;
 		case MATH_POW: {
-			if (p_idx == 0)
-				return PropertyInfo(Variant::REAL, "base");
-			else
-				return PropertyInfo(Variant::REAL, "exp");
+			if (p_idx == 0) {
+				return PropertyInfo(Variant::FLOAT, "base");
+			} else {
+				return PropertyInfo(Variant::FLOAT, "exp");
+			}
 		} break;
 		case MATH_EASE: {
-			if (p_idx == 0)
-				return PropertyInfo(Variant::REAL, "s");
-			else
-				return PropertyInfo(Variant::REAL, "curve");
+			if (p_idx == 0) {
+				return PropertyInfo(Variant::FLOAT, "s");
+			} else {
+				return PropertyInfo(Variant::FLOAT, "curve");
+			}
 		} break;
-		case MATH_DECIMALS: {
-			return PropertyInfo(Variant::REAL, "step");
+		case MATH_STEP_DECIMALS: {
+			return PropertyInfo(Variant::FLOAT, "step");
 		} break;
 		case MATH_STEPIFY: {
-			if (p_idx == 0)
-				return PropertyInfo(Variant::REAL, "s");
-			else
-				return PropertyInfo(Variant::REAL, "steps");
+			if (p_idx == 0) {
+				return PropertyInfo(Variant::FLOAT, "s");
+			} else {
+				return PropertyInfo(Variant::FLOAT, "steps");
+			}
 		} break;
 		case MATH_LERP:
 		case MATH_LERP_ANGLE:
 		case MATH_INVERSE_LERP:
 		case MATH_SMOOTHSTEP: {
-			if (p_idx == 0)
-				return PropertyInfo(Variant::REAL, "from");
-			else if (p_idx == 1)
-				return PropertyInfo(Variant::REAL, "to");
-			else
-				return PropertyInfo(Variant::REAL, "weight");
+			if (p_idx == 0) {
+				return PropertyInfo(Variant::FLOAT, "from");
+			} else if (p_idx == 1) {
+				return PropertyInfo(Variant::FLOAT, "to");
+			} else {
+				return PropertyInfo(Variant::FLOAT, "weight");
+			}
 		} break;
 		case MATH_RANGE_LERP: {
-			if (p_idx == 0)
-				return PropertyInfo(Variant::REAL, "value");
-			else if (p_idx == 1)
-				return PropertyInfo(Variant::REAL, "istart");
-			else if (p_idx == 2)
-				return PropertyInfo(Variant::REAL, "istop");
-			else if (p_idx == 3)
-				return PropertyInfo(Variant::REAL, "ostart");
-			else
-				return PropertyInfo(Variant::REAL, "ostop");
+			if (p_idx == 0) {
+				return PropertyInfo(Variant::FLOAT, "value");
+			} else if (p_idx == 1) {
+				return PropertyInfo(Variant::FLOAT, "istart");
+			} else if (p_idx == 2) {
+				return PropertyInfo(Variant::FLOAT, "istop");
+			} else if (p_idx == 3) {
+				return PropertyInfo(Variant::FLOAT, "ostart");
+			} else {
+				return PropertyInfo(Variant::FLOAT, "ostop");
+			}
 		} break;
 		case MATH_MOVE_TOWARD: {
-			if (p_idx == 0)
-				return PropertyInfo(Variant::REAL, "from");
-			else if (p_idx == 1)
-				return PropertyInfo(Variant::REAL, "to");
-			else
-				return PropertyInfo(Variant::REAL, "delta");
+			if (p_idx == 0) {
+				return PropertyInfo(Variant::FLOAT, "from");
+			} else if (p_idx == 1) {
+				return PropertyInfo(Variant::FLOAT, "to");
+			} else {
+				return PropertyInfo(Variant::FLOAT, "delta");
+			}
 		} break;
 		case MATH_DECTIME: {
-			if (p_idx == 0)
-				return PropertyInfo(Variant::REAL, "value");
-			else if (p_idx == 1)
-				return PropertyInfo(Variant::REAL, "amount");
-			else
-				return PropertyInfo(Variant::REAL, "step");
+			if (p_idx == 0) {
+				return PropertyInfo(Variant::FLOAT, "value");
+			} else if (p_idx == 1) {
+				return PropertyInfo(Variant::FLOAT, "amount");
+			} else {
+				return PropertyInfo(Variant::FLOAT, "step");
+			}
 		} break;
 		case MATH_RANDOMIZE:
 		case MATH_RAND:
 		case MATH_RANDF: {
-
 		} break;
 		case MATH_RANDOM: {
-			if (p_idx == 0)
-				return PropertyInfo(Variant::REAL, "from");
-			else
-				return PropertyInfo(Variant::REAL, "to");
+			if (p_idx == 0) {
+				return PropertyInfo(Variant::FLOAT, "from");
+			} else {
+				return PropertyInfo(Variant::FLOAT, "to");
+			}
 		} break;
 		case MATH_SEED:
 		case MATH_RANDSEED: {
 			return PropertyInfo(Variant::INT, "seed");
 		} break;
 		case MATH_DEG2RAD: {
-			return PropertyInfo(Variant::REAL, "deg");
+			return PropertyInfo(Variant::FLOAT, "deg");
 		} break;
 		case MATH_RAD2DEG: {
-			return PropertyInfo(Variant::REAL, "rad");
+			return PropertyInfo(Variant::FLOAT, "rad");
 		} break;
 		case MATH_LINEAR2DB: {
-			return PropertyInfo(Variant::REAL, "nrg");
+			return PropertyInfo(Variant::FLOAT, "nrg");
 		} break;
 		case MATH_DB2LINEAR: {
-			return PropertyInfo(Variant::REAL, "db");
+			return PropertyInfo(Variant::FLOAT, "db");
 		} break;
 		case MATH_POLAR2CARTESIAN: {
-			if (p_idx == 0)
-				return PropertyInfo(Variant::REAL, "r");
-			else
-				return PropertyInfo(Variant::REAL, "th");
+			if (p_idx == 0) {
+				return PropertyInfo(Variant::FLOAT, "r");
+			} else {
+				return PropertyInfo(Variant::FLOAT, "th");
+			}
 		} break;
 		case MATH_CARTESIAN2POLAR: {
-			if (p_idx == 0)
-				return PropertyInfo(Variant::REAL, "x");
-			else
-				return PropertyInfo(Variant::REAL, "y");
+			if (p_idx == 0) {
+				return PropertyInfo(Variant::FLOAT, "x");
+			} else {
+				return PropertyInfo(Variant::FLOAT, "y");
+			}
 		} break;
 		case MATH_WRAP: {
-			if (p_idx == 0)
+			if (p_idx == 0) {
 				return PropertyInfo(Variant::INT, "value");
-			else if (p_idx == 1)
+			} else if (p_idx == 1) {
 				return PropertyInfo(Variant::INT, "min");
-			else
+			} else {
 				return PropertyInfo(Variant::INT, "max");
+			}
 		} break;
 		case MATH_WRAPF:
 		case LOGIC_CLAMP: {
-			if (p_idx == 0)
-				return PropertyInfo(Variant::REAL, "value");
-			else if (p_idx == 1)
-				return PropertyInfo(Variant::REAL, "min");
-			else
-				return PropertyInfo(Variant::REAL, "max");
+			if (p_idx == 0) {
+				return PropertyInfo(Variant::FLOAT, "value");
+			} else if (p_idx == 1) {
+				return PropertyInfo(Variant::FLOAT, "min");
+			} else {
+				return PropertyInfo(Variant::FLOAT, "max");
+			}
 		} break;
 		case LOGIC_NEAREST_PO2: {
 			return PropertyInfo(Variant::INT, "value");
@@ -423,16 +427,18 @@ PropertyInfo VisualScriptBuiltinFunc::get_input_value_port_info(int p_idx) const
 			return PropertyInfo(Variant::OBJECT, "source");
 		} break;
 		case FUNC_FUNCREF: {
-			if (p_idx == 0)
+			if (p_idx == 0) {
 				return PropertyInfo(Variant::OBJECT, "instance");
-			else
+			} else {
 				return PropertyInfo(Variant::STRING, "funcname");
+			}
 		} break;
 		case TYPE_CONVERT: {
-			if (p_idx == 0)
+			if (p_idx == 0) {
 				return PropertyInfo(Variant::NIL, "what");
-			else
+			} else {
 				return PropertyInfo(Variant::STRING, "type");
+			}
 		} break;
 		case TYPE_OF: {
 			return PropertyInfo(Variant::NIL, "what");
@@ -453,29 +459,30 @@ PropertyInfo VisualScriptBuiltinFunc::get_input_value_port_info(int p_idx) const
 			return PropertyInfo(Variant::NIL, "value");
 		} break;
 		case STR_TO_VAR: {
-
 			return PropertyInfo(Variant::STRING, "string");
 		} break;
 		case VAR_TO_STR:
 		case VAR_TO_BYTES: {
-			if (p_idx == 0)
+			if (p_idx == 0) {
 				return PropertyInfo(Variant::NIL, "var");
-			else
+			} else {
 				return PropertyInfo(Variant::BOOL, "full_objects");
+			}
 
 		} break;
 		case BYTES_TO_VAR: {
-
-			if (p_idx == 0)
-				return PropertyInfo(Variant::POOL_BYTE_ARRAY, "bytes");
-			else
+			if (p_idx == 0) {
+				return PropertyInfo(Variant::PACKED_BYTE_ARRAY, "bytes");
+			} else {
 				return PropertyInfo(Variant::BOOL, "allow_objects");
+			}
 		} break;
 		case COLORN: {
-			if (p_idx == 0)
+			if (p_idx == 0) {
 				return PropertyInfo(Variant::STRING, "name");
-			else
-				return PropertyInfo(Variant::REAL, "alpha");
+			} else {
+				return PropertyInfo(Variant::FLOAT, "alpha");
+			}
 		} break;
 		case FUNC_MAX: {
 		}
@@ -485,10 +492,8 @@ PropertyInfo VisualScriptBuiltinFunc::get_input_value_port_info(int p_idx) const
 }
 
 PropertyInfo VisualScriptBuiltinFunc::get_output_value_port_info(int p_idx) const {
-
 	Variant::Type t = Variant::NIL;
 	switch (func) {
-
 		case MATH_SIN:
 		case MATH_COS:
 		case MATH_TAN:
@@ -504,12 +509,14 @@ PropertyInfo VisualScriptBuiltinFunc::get_output_value_port_info(int p_idx) cons
 		case MATH_FPOSMOD:
 		case MATH_FLOOR:
 		case MATH_CEIL: {
-			t = Variant::REAL;
+			t = Variant::FLOAT;
 		} break;
-		case MATH_POSMOD:
-		case MATH_ROUND: {
+		case MATH_POSMOD: {
 			t = Variant::INT;
 		} break;
+		case MATH_ROUND: {
+			t = Variant::FLOAT;
+		} break;
 		case MATH_ABS: {
 			t = Variant::NIL;
 		} break;
@@ -519,16 +526,16 @@ PropertyInfo VisualScriptBuiltinFunc::get_output_value_port_info(int p_idx) cons
 		case MATH_POW:
 		case MATH_LOG:
 		case MATH_EXP: {
-			t = Variant::REAL;
+			t = Variant::FLOAT;
 		} break;
 		case MATH_ISNAN:
 		case MATH_ISINF: {
 			t = Variant::BOOL;
 		} break;
 		case MATH_EASE: {
-			t = Variant::REAL;
+			t = Variant::FLOAT;
 		} break;
-		case MATH_DECIMALS: {
+		case MATH_STEP_DECIMALS: {
 			t = Variant::INT;
 		} break;
 		case MATH_STEPIFY:
@@ -539,36 +546,33 @@ PropertyInfo VisualScriptBuiltinFunc::get_output_value_port_info(int p_idx) cons
 		case MATH_SMOOTHSTEP:
 		case MATH_MOVE_TOWARD:
 		case MATH_DECTIME: {
-			t = Variant::REAL;
+			t = Variant::FLOAT;
 
 		} break;
 		case MATH_RANDOMIZE: {
-
 		} break;
 		case MATH_RAND: {
-
 			t = Variant::INT;
 		} break;
 		case MATH_RANDF:
 		case MATH_RANDOM: {
-			t = Variant::REAL;
+			t = Variant::FLOAT;
 		} break;
 		case MATH_SEED: {
-
 		} break;
 		case MATH_RANDSEED: {
-
-			if (p_idx == 0)
+			if (p_idx == 0) {
 				return PropertyInfo(Variant::INT, "rnd");
-			else
+			} else {
 				return PropertyInfo(Variant::INT, "seed");
+			}
 		} break;
 		case MATH_DEG2RAD:
 		case MATH_RAD2DEG:
 		case MATH_LINEAR2DB:
 		case MATH_WRAPF:
 		case MATH_DB2LINEAR: {
-			t = Variant::REAL;
+			t = Variant::FLOAT;
 		} break;
 		case MATH_POLAR2CARTESIAN:
 		case MATH_CARTESIAN2POLAR: {
@@ -580,24 +584,20 @@ PropertyInfo VisualScriptBuiltinFunc::get_output_value_port_info(int p_idx) cons
 		case LOGIC_MAX:
 		case LOGIC_MIN:
 		case LOGIC_CLAMP: {
-
 		} break;
 
 		case LOGIC_NEAREST_PO2: {
 			t = Variant::NIL;
 		} break;
 		case OBJ_WEAKREF: {
-
 			t = Variant::OBJECT;
 
 		} break;
 		case FUNC_FUNCREF: {
-
 			t = Variant::OBJECT;
 
 		} break;
 		case TYPE_CONVERT: {
-
 		} break;
 		case TEXT_ORD:
 		case TYPE_OF: {
@@ -605,41 +605,37 @@ PropertyInfo VisualScriptBuiltinFunc::get_output_value_port_info(int p_idx) cons
 
 		} break;
 		case TYPE_EXISTS: {
-
 			t = Variant::BOOL;
 
 		} break;
 		case TEXT_CHAR:
 		case TEXT_STR: {
-
 			t = Variant::STRING;
 
 		} break;
 		case TEXT_PRINT: {
-
 		} break;
 		case TEXT_PRINTERR: {
-
 		} break;
 		case TEXT_PRINTRAW: {
-
 		} break;
 		case VAR_TO_STR: {
 			t = Variant::STRING;
 		} break;
 		case STR_TO_VAR: {
-
 		} break;
 		case VAR_TO_BYTES: {
-			if (p_idx == 0)
-				t = Variant::POOL_BYTE_ARRAY;
-			else
+			if (p_idx == 0) {
+				t = Variant::PACKED_BYTE_ARRAY;
+			} else {
 				t = Variant::BOOL;
+			}
 
 		} break;
 		case BYTES_TO_VAR: {
-			if (p_idx == 1)
+			if (p_idx == 1) {
 				t = Variant::BOOL;
+			}
 		} break;
 		case COLORN: {
 			t = Variant::COLOR;
@@ -656,15 +652,14 @@ String VisualScriptBuiltinFunc::get_caption() const {
 
 	return "BuiltinFunc";
 }
+
 */
 
 String VisualScriptBuiltinFunc::get_caption() const {
-
 	return func_name[func];
 }
 
 void VisualScriptBuiltinFunc::set_func(BuiltinFunc p_which) {
-
 	ERR_FAIL_INDEX(p_which, FUNC_MAX);
 	func = p_which;
 	_change_notify();
@@ -675,206 +670,168 @@ VisualScriptBuiltinFunc::BuiltinFunc VisualScriptBuiltinFunc::get_func() {
 	return func;
 }
 
-#define VALIDATE_ARG_NUM(m_arg)                                          \
-	if (!p_inputs[m_arg]->is_num()) {                                    \
-		r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT; \
-		r_error.argument = m_arg;                                        \
-		r_error.expected = Variant::REAL;                                \
-		return;                                                          \
+#define VALIDATE_ARG_NUM(m_arg)                                           \
+	if (!p_inputs[m_arg]->is_num()) {                                     \
+		r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; \
+		r_error.argument = m_arg;                                         \
+		r_error.expected = Variant::FLOAT;                                \
+		return;                                                           \
 	}
 
-void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func, const Variant **p_inputs, Variant *r_return, Variant::CallError &r_error, String &r_error_str) {
-
+void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func, const Variant **p_inputs, Variant *r_return, Callable::CallError &r_error, String &r_error_str) {
 	switch (p_func) {
 		case VisualScriptBuiltinFunc::MATH_SIN: {
-
 			VALIDATE_ARG_NUM(0);
 			*r_return = Math::sin((double)*p_inputs[0]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_COS: {
-
 			VALIDATE_ARG_NUM(0);
 			*r_return = Math::cos((double)*p_inputs[0]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_TAN: {
-
 			VALIDATE_ARG_NUM(0);
 			*r_return = Math::tan((double)*p_inputs[0]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_SINH: {
-
 			VALIDATE_ARG_NUM(0);
 			*r_return = Math::sinh((double)*p_inputs[0]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_COSH: {
-
 			VALIDATE_ARG_NUM(0);
 			*r_return = Math::cosh((double)*p_inputs[0]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_TANH: {
-
 			VALIDATE_ARG_NUM(0);
 			*r_return = Math::tanh((double)*p_inputs[0]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_ASIN: {
-
 			VALIDATE_ARG_NUM(0);
 			*r_return = Math::asin((double)*p_inputs[0]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_ACOS: {
-
 			VALIDATE_ARG_NUM(0);
 			*r_return = Math::acos((double)*p_inputs[0]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_ATAN: {
-
 			VALIDATE_ARG_NUM(0);
 			*r_return = Math::atan((double)*p_inputs[0]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_ATAN2: {
-
 			VALIDATE_ARG_NUM(0);
 			VALIDATE_ARG_NUM(1);
 			*r_return = Math::atan2((double)*p_inputs[0], (double)*p_inputs[1]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_SQRT: {
-
 			VALIDATE_ARG_NUM(0);
 			*r_return = Math::sqrt((double)*p_inputs[0]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_FMOD: {
-
 			VALIDATE_ARG_NUM(0);
 			VALIDATE_ARG_NUM(1);
 			*r_return = Math::fmod((double)*p_inputs[0], (double)*p_inputs[1]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_FPOSMOD: {
-
 			VALIDATE_ARG_NUM(0);
 			VALIDATE_ARG_NUM(1);
 			*r_return = Math::fposmod((double)*p_inputs[0], (double)*p_inputs[1]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_POSMOD: {
-
 			VALIDATE_ARG_NUM(0);
 			VALIDATE_ARG_NUM(1);
 			*r_return = Math::posmod((int)*p_inputs[0], (int)*p_inputs[1]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_FLOOR: {
-
 			VALIDATE_ARG_NUM(0);
 			*r_return = Math::floor((double)*p_inputs[0]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_CEIL: {
-
 			VALIDATE_ARG_NUM(0);
 			*r_return = Math::ceil((double)*p_inputs[0]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_ROUND: {
-
 			VALIDATE_ARG_NUM(0);
 			*r_return = Math::round((double)*p_inputs[0]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_ABS: {
-
 			if (p_inputs[0]->get_type() == Variant::INT) {
-
 				int64_t i = *p_inputs[0];
 				*r_return = ABS(i);
-			} else if (p_inputs[0]->get_type() == Variant::REAL) {
-
+			} else if (p_inputs[0]->get_type() == Variant::FLOAT) {
 				real_t r = *p_inputs[0];
 				*r_return = Math::abs(r);
 			} else {
-
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
-				r_error.expected = Variant::REAL;
+				r_error.expected = Variant::FLOAT;
 			}
 		} break;
 		case VisualScriptBuiltinFunc::MATH_SIGN: {
-
 			if (p_inputs[0]->get_type() == Variant::INT) {
-
 				int64_t i = *p_inputs[0];
 				*r_return = i < 0 ? -1 : (i > 0 ? +1 : 0);
-			} else if (p_inputs[0]->get_type() == Variant::REAL) {
-
+			} else if (p_inputs[0]->get_type() == Variant::FLOAT) {
 				real_t r = *p_inputs[0];
 				*r_return = r < 0.0 ? -1.0 : (r > 0.0 ? +1.0 : 0.0);
 			} else {
-
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
-				r_error.expected = Variant::REAL;
+				r_error.expected = Variant::FLOAT;
 			}
 		} break;
 		case VisualScriptBuiltinFunc::MATH_POW: {
-
 			VALIDATE_ARG_NUM(0);
 			VALIDATE_ARG_NUM(1);
 			*r_return = Math::pow((double)*p_inputs[0], (double)*p_inputs[1]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_LOG: {
-
 			VALIDATE_ARG_NUM(0);
 			*r_return = Math::log((double)*p_inputs[0]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_EXP: {
-
 			VALIDATE_ARG_NUM(0);
 			*r_return = Math::exp((double)*p_inputs[0]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_ISNAN: {
-
 			VALIDATE_ARG_NUM(0);
 			*r_return = Math::is_nan((double)*p_inputs[0]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_ISINF: {
-
 			VALIDATE_ARG_NUM(0);
 			*r_return = Math::is_inf((double)*p_inputs[0]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_EASE: {
-
 			VALIDATE_ARG_NUM(0);
 			VALIDATE_ARG_NUM(1);
 			*r_return = Math::ease((double)*p_inputs[0], (double)*p_inputs[1]);
 		} break;
-		case VisualScriptBuiltinFunc::MATH_DECIMALS: {
-
+		case VisualScriptBuiltinFunc::MATH_STEP_DECIMALS: {
 			VALIDATE_ARG_NUM(0);
 			*r_return = Math::step_decimals((double)*p_inputs[0]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_STEPIFY: {
-
 			VALIDATE_ARG_NUM(0);
 			VALIDATE_ARG_NUM(1);
 			*r_return = Math::stepify((double)*p_inputs[0], (double)*p_inputs[1]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_LERP: {
-
 			VALIDATE_ARG_NUM(0);
 			VALIDATE_ARG_NUM(1);
 			VALIDATE_ARG_NUM(2);
 			*r_return = Math::lerp((double)*p_inputs[0], (double)*p_inputs[1], (double)*p_inputs[2]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_LERP_ANGLE: {
-
 			VALIDATE_ARG_NUM(0);
 			VALIDATE_ARG_NUM(1);
 			VALIDATE_ARG_NUM(2);
 			*r_return = Math::lerp_angle((double)*p_inputs[0], (double)*p_inputs[1], (double)*p_inputs[2]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_INVERSE_LERP: {
-
 			VALIDATE_ARG_NUM(0);
 			VALIDATE_ARG_NUM(1);
 			VALIDATE_ARG_NUM(2);
 			*r_return = Math::inverse_lerp((double)*p_inputs[0], (double)*p_inputs[1], (double)*p_inputs[2]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_RANGE_LERP: {
-
 			VALIDATE_ARG_NUM(0);
 			VALIDATE_ARG_NUM(1);
 			VALIDATE_ARG_NUM(2);
@@ -889,14 +846,12 @@ void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func, const Variant **p_in
 			*r_return = Math::smoothstep((double)*p_inputs[0], (double)*p_inputs[1], (double)*p_inputs[2]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_MOVE_TOWARD: {
-
 			VALIDATE_ARG_NUM(0);
 			VALIDATE_ARG_NUM(1);
 			VALIDATE_ARG_NUM(2);
 			*r_return = Math::move_toward((double)*p_inputs[0], (double)*p_inputs[1], (double)*p_inputs[2]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_DECTIME: {
-
 			VALIDATE_ARG_NUM(0);
 			VALIDATE_ARG_NUM(1);
 			VALIDATE_ARG_NUM(2);
@@ -913,20 +868,17 @@ void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func, const Variant **p_in
 			*r_return = Math::randf();
 		} break;
 		case VisualScriptBuiltinFunc::MATH_RANDOM: {
-
 			VALIDATE_ARG_NUM(0);
 			VALIDATE_ARG_NUM(1);
 			*r_return = Math::random((double)*p_inputs[0], (double)*p_inputs[1]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_SEED: {
-
 			VALIDATE_ARG_NUM(0);
 			uint64_t seed = *p_inputs[0];
 			Math::seed(seed);
 
 		} break;
 		case VisualScriptBuiltinFunc::MATH_RANDSEED: {
-
 			VALIDATE_ARG_NUM(0);
 			uint64_t seed = *p_inputs[0];
 			int ret = Math::rand_from_seed(&seed);
@@ -937,22 +889,18 @@ void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func, const Variant **p_in
 
 		} break;
 		case VisualScriptBuiltinFunc::MATH_DEG2RAD: {
-
 			VALIDATE_ARG_NUM(0);
 			*r_return = Math::deg2rad((double)*p_inputs[0]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_RAD2DEG: {
-
 			VALIDATE_ARG_NUM(0);
 			*r_return = Math::rad2deg((double)*p_inputs[0]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_LINEAR2DB: {
-
 			VALIDATE_ARG_NUM(0);
 			*r_return = Math::linear2db((double)*p_inputs[0]);
 		} break;
 		case VisualScriptBuiltinFunc::MATH_DB2LINEAR: {
-
 			VALIDATE_ARG_NUM(0);
 			*r_return = Math::db2linear((double)*p_inputs[0]);
 		} break;
@@ -983,9 +931,7 @@ void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func, const Variant **p_in
 			*r_return = Math::wrapf((double)*p_inputs[0], (double)*p_inputs[1], (double)*p_inputs[2]);
 		} break;
 		case VisualScriptBuiltinFunc::LOGIC_MAX: {
-
 			if (p_inputs[0]->get_type() == Variant::INT && p_inputs[1]->get_type() == Variant::INT) {
-
 				int64_t a = *p_inputs[0];
 				int64_t b = *p_inputs[1];
 				*r_return = MAX(a, b);
@@ -1001,9 +947,7 @@ void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func, const Variant **p_in
 
 		} break;
 		case VisualScriptBuiltinFunc::LOGIC_MIN: {
-
 			if (p_inputs[0]->get_type() == Variant::INT && p_inputs[1]->get_type() == Variant::INT) {
-
 				int64_t a = *p_inputs[0];
 				int64_t b = *p_inputs[1];
 				*r_return = MIN(a, b);
@@ -1018,9 +962,7 @@ void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func, const Variant **p_in
 			}
 		} break;
 		case VisualScriptBuiltinFunc::LOGIC_CLAMP: {
-
 			if (p_inputs[0]->get_type() == Variant::INT && p_inputs[1]->get_type() == Variant::INT && p_inputs[2]->get_type() == Variant::INT) {
-
 				int64_t a = *p_inputs[0];
 				int64_t b = *p_inputs[1];
 				int64_t c = *p_inputs[2];
@@ -1038,16 +980,13 @@ void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func, const Variant **p_in
 			}
 		} break;
 		case VisualScriptBuiltinFunc::LOGIC_NEAREST_PO2: {
-
 			VALIDATE_ARG_NUM(0);
 			int64_t num = *p_inputs[0];
 			*r_return = next_power_of_2(num);
 		} break;
 		case VisualScriptBuiltinFunc::OBJ_WEAKREF: {
-
 			if (p_inputs[0]->get_type() != Variant::OBJECT) {
-
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
 				r_error.expected = Variant::OBJECT;
 
@@ -1055,10 +994,8 @@ void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func, const Variant **p_in
 			}
 
 			if (p_inputs[0]->is_ref()) {
-
 				REF r = *p_inputs[0];
 				if (!r.is_valid()) {
-
 					return;
 				}
 
@@ -1068,7 +1005,6 @@ void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func, const Variant **p_in
 			} else {
 				Object *obj = *p_inputs[0];
 				if (!obj) {
-
 					return;
 				}
 				Ref<WeakRef> wref = memnew(WeakRef);
@@ -1078,18 +1014,15 @@ void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func, const Variant **p_in
 
 		} break;
 		case VisualScriptBuiltinFunc::FUNC_FUNCREF: {
-
 			if (p_inputs[0]->get_type() != Variant::OBJECT) {
-
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
 				r_error.expected = Variant::OBJECT;
 
 				return;
 			}
 			if (p_inputs[1]->get_type() != Variant::STRING && p_inputs[1]->get_type() != Variant::NODE_PATH) {
-
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 1;
 				r_error.expected = Variant::STRING;
 
@@ -1105,43 +1038,36 @@ void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func, const Variant **p_in
 
 		} break;
 		case VisualScriptBuiltinFunc::TYPE_CONVERT: {
-
 			VALIDATE_ARG_NUM(1);
 			int type = *p_inputs[1];
 			if (type < 0 || type >= Variant::VARIANT_MAX) {
-
 				r_error_str = RTR("Invalid type argument to convert(), use TYPE_* constants.");
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
 				r_error.expected = Variant::INT;
 				return;
 
 			} else {
-
 				*r_return = Variant::construct(Variant::Type(type), p_inputs, 1, r_error);
 			}
 		} break;
 		case VisualScriptBuiltinFunc::TYPE_OF: {
-
 			*r_return = p_inputs[0]->get_type();
 
 		} break;
 		case VisualScriptBuiltinFunc::TYPE_EXISTS: {
-
 			*r_return = ClassDB::class_exists(*p_inputs[0]);
 
 		} break;
 		case VisualScriptBuiltinFunc::TEXT_CHAR: {
-
-			CharType result[2] = { *p_inputs[0], 0 };
+			char32_t result[2] = { *p_inputs[0], 0 };
 
 			*r_return = String(result);
 
 		} break;
 		case VisualScriptBuiltinFunc::TEXT_ORD: {
-
 			if (p_inputs[0]->get_type() != Variant::STRING) {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
 				r_error.expected = Variant::STRING;
 
@@ -1151,7 +1077,7 @@ void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func, const Variant **p_in
 			String str = p_inputs[0]->operator String();
 
 			if (str.length() != 1) {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
 				r_error.expected = Variant::STRING;
 				*r_return = "Expected a string of length 1 (a character).";
@@ -1163,41 +1089,35 @@ void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func, const Variant **p_in
 
 		} break;
 		case VisualScriptBuiltinFunc::TEXT_STR: {
-
 			String str = *p_inputs[0];
 
 			*r_return = str;
 
 		} break;
 		case VisualScriptBuiltinFunc::TEXT_PRINT: {
-
 			String str = *p_inputs[0];
 			print_line(str);
 
 		} break;
 
 		case VisualScriptBuiltinFunc::TEXT_PRINTERR: {
-
 			String str = *p_inputs[0];
 			print_error(str);
 
 		} break;
 		case VisualScriptBuiltinFunc::TEXT_PRINTRAW: {
-
 			String str = *p_inputs[0];
 			OS::get_singleton()->print("%s", str.utf8().get_data());
 
 		} break;
 		case VisualScriptBuiltinFunc::VAR_TO_STR: {
-
 			String vars;
 			VariantWriter::write_to_string(*p_inputs[0], vars);
 			*r_return = vars;
 		} break;
 		case VisualScriptBuiltinFunc::STR_TO_VAR: {
-
 			if (p_inputs[0]->get_type() != Variant::STRING) {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
 				r_error.expected = Variant::STRING;
 
@@ -1212,7 +1132,7 @@ void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func, const Variant **p_in
 			Error err = VariantParser::parse(&ss, *r_return, errs, line);
 
 			if (err != OK) {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
 				r_error.expected = Variant::STRING;
 				*r_return = "Parse error at line " + itos(line) + ": " + errs;
@@ -1221,19 +1141,18 @@ void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func, const Variant **p_in
 
 		} break;
 		case VisualScriptBuiltinFunc::VAR_TO_BYTES: {
-
 			if (p_inputs[1]->get_type() != Variant::BOOL) {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 1;
 				r_error.expected = Variant::BOOL;
 				return;
 			}
-			PoolByteArray barr;
+			PackedByteArray barr;
 			int len;
 			bool full_objects = *p_inputs[1];
-			Error err = encode_variant(*p_inputs[0], NULL, len, full_objects);
+			Error err = encode_variant(*p_inputs[0], nullptr, len, full_objects);
 			if (err) {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
 				r_error.expected = Variant::NIL;
 				r_error_str = "Unexpected error encoding variable to bytes, likely unserializable type found (Object or RID).";
@@ -1242,37 +1161,36 @@ void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func, const Variant **p_in
 
 			barr.resize(len);
 			{
-				PoolByteArray::Write w = barr.write();
-				encode_variant(*p_inputs[0], w.ptr(), len, full_objects);
+				uint8_t *w = barr.ptrw();
+				encode_variant(*p_inputs[0], w, len, full_objects);
 			}
 			*r_return = barr;
 		} break;
 		case VisualScriptBuiltinFunc::BYTES_TO_VAR: {
-
-			if (p_inputs[0]->get_type() != Variant::POOL_BYTE_ARRAY) {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+			if (p_inputs[0]->get_type() != Variant::PACKED_BYTE_ARRAY) {
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 0;
-				r_error.expected = Variant::POOL_BYTE_ARRAY;
+				r_error.expected = Variant::PACKED_BYTE_ARRAY;
 				return;
 			}
 			if (p_inputs[1]->get_type() != Variant::BOOL) {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument = 1;
 				r_error.expected = Variant::BOOL;
 				return;
 			}
 
-			PoolByteArray varr = *p_inputs[0];
+			PackedByteArray varr = *p_inputs[0];
 			bool allow_objects = *p_inputs[1];
 			Variant ret;
 			{
-				PoolByteArray::Read r = varr.read();
-				Error err = decode_variant(ret, r.ptr(), varr.size(), NULL, allow_objects);
+				const uint8_t *r = varr.ptr();
+				Error err = decode_variant(ret, r, varr.size(), nullptr, allow_objects);
 				if (err != OK) {
 					r_error_str = RTR("Not enough bytes for decoding bytes, or invalid format.");
-					r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+					r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 					r_error.argument = 0;
-					r_error.expected = Variant::POOL_BYTE_ARRAY;
+					r_error.expected = Variant::PACKED_BYTE_ARRAY;
 					return;
 				}
 			}
@@ -1281,7 +1199,6 @@ void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func, const Variant **p_in
 
 		} break;
 		case VisualScriptBuiltinFunc::COLORN: {
-
 			VALIDATE_ARG_NUM(1);
 
 			Color color = Color::named(*p_inputs[0]);
@@ -1306,15 +1223,13 @@ public:
 	//virtual bool is_output_port_unsequenced(int p_idx) const { return false; }
 	//virtual bool get_output_port_unsequenced(int p_idx,Variant* r_value,Variant* p_working_mem,String &r_error) const { return true; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		VisualScriptBuiltinFunc::exec_func(func, p_inputs, p_outputs[0], r_error, r_error_str);
 		return 0;
 	}
 };
 
 VisualScriptNodeInstance *VisualScriptBuiltinFunc::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceBuiltinFunc *instance = memnew(VisualScriptNodeInstanceBuiltinFunc);
 	instance->node = this;
 	instance->instance = p_instance;
@@ -1323,16 +1238,15 @@ VisualScriptNodeInstance *VisualScriptBuiltinFunc::instance(VisualScriptInstance
 }
 
 void VisualScriptBuiltinFunc::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_func", "which"), &VisualScriptBuiltinFunc::set_func);
 	ClassDB::bind_method(D_METHOD("get_func"), &VisualScriptBuiltinFunc::get_func);
 
 	String cc;
 
 	for (int i = 0; i < FUNC_MAX; i++) {
-
-		if (i > 0)
+		if (i > 0) {
 			cc += ",";
+		}
 		cc += func_name[i];
 	}
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "function", PROPERTY_HINT_ENUM, cc), "set_func", "get_func");
@@ -1361,7 +1275,7 @@ void VisualScriptBuiltinFunc::_bind_methods() {
 	BIND_ENUM_CONSTANT(MATH_ISNAN);
 	BIND_ENUM_CONSTANT(MATH_ISINF);
 	BIND_ENUM_CONSTANT(MATH_EASE);
-	BIND_ENUM_CONSTANT(MATH_DECIMALS);
+	BIND_ENUM_CONSTANT(MATH_STEP_DECIMALS);
 	BIND_ENUM_CONSTANT(MATH_STEPIFY);
 	BIND_ENUM_CONSTANT(MATH_LERP);
 	BIND_ENUM_CONSTANT(MATH_INVERSE_LERP);
@@ -1409,24 +1323,20 @@ void VisualScriptBuiltinFunc::_bind_methods() {
 }
 
 VisualScriptBuiltinFunc::VisualScriptBuiltinFunc(VisualScriptBuiltinFunc::BuiltinFunc func) {
-
 	this->func = func;
 }
 
 VisualScriptBuiltinFunc::VisualScriptBuiltinFunc() {
-
 	func = MATH_SIN;
 }
 
 template <VisualScriptBuiltinFunc::BuiltinFunc func>
 static Ref<VisualScriptNode> create_builtin_func_node(const String &p_name) {
-
 	Ref<VisualScriptBuiltinFunc> node = memnew(VisualScriptBuiltinFunc(func));
 	return node;
 }
 
 void register_visual_script_builtin_func_node() {
-
 	VisualScriptLanguage::singleton->add_register_func("functions/built_in/sin", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_SIN>);
 	VisualScriptLanguage::singleton->add_register_func("functions/built_in/cos", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_COS>);
 	VisualScriptLanguage::singleton->add_register_func("functions/built_in/tan", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_TAN>);
@@ -1455,7 +1365,7 @@ void register_visual_script_builtin_func_node() {
 	VisualScriptLanguage::singleton->add_register_func("functions/built_in/isinf", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_ISINF>);
 
 	VisualScriptLanguage::singleton->add_register_func("functions/built_in/ease", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_EASE>);
-	VisualScriptLanguage::singleton->add_register_func("functions/built_in/decimals", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_DECIMALS>);
+	VisualScriptLanguage::singleton->add_register_func("functions/built_in/step_decimals", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_STEP_DECIMALS>);
 	VisualScriptLanguage::singleton->add_register_func("functions/built_in/stepify", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_STEPIFY>);
 	VisualScriptLanguage::singleton->add_register_func("functions/built_in/lerp", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_LERP>);
 	VisualScriptLanguage::singleton->add_register_func("functions/built_in/lerp_angle", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_LERP_ANGLE>);
diff --git a/modules/visual_script/visual_script_builtin_funcs.h b/modules/visual_script/visual_script_builtin_funcs.h
index f5021cb545..aee2ed79ce 100644
--- a/modules/visual_script/visual_script_builtin_funcs.h
+++ b/modules/visual_script/visual_script_builtin_funcs.h
@@ -34,7 +34,6 @@
 #include "visual_script.h"
 
 class VisualScriptBuiltinFunc : public VisualScriptNode {
-
 	GDCLASS(VisualScriptBuiltinFunc, VisualScriptNode);
 
 public:
@@ -63,7 +62,7 @@ public:
 		MATH_ISNAN,
 		MATH_ISINF,
 		MATH_EASE,
-		MATH_DECIMALS,
+		MATH_STEP_DECIMALS,
 		MATH_STEPIFY,
 		MATH_LERP,
 		MATH_INVERSE_LERP,
@@ -112,7 +111,7 @@ public:
 
 	static int get_func_argument_count(BuiltinFunc p_func);
 	static String get_func_name(BuiltinFunc p_func);
-	static void exec_func(BuiltinFunc p_func, const Variant **p_inputs, Variant *r_return, Variant::CallError &r_error, String &r_error_str);
+	static void exec_func(BuiltinFunc p_func, const Variant **p_inputs, Variant *r_return, Callable::CallError &r_error, String &r_error_str);
 	static BuiltinFunc find_function(const String &p_string);
 
 private:
@@ -123,25 +122,25 @@ protected:
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
+	virtual String get_caption() const override;
 	//virtual String get_text() const;
-	virtual String get_category() const { return "functions"; }
+	virtual String get_category() const override { return "functions"; }
 
 	void set_func(BuiltinFunc p_which);
 	BuiltinFunc get_func();
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptBuiltinFunc(VisualScriptBuiltinFunc::BuiltinFunc func);
 	VisualScriptBuiltinFunc();
diff --git a/modules/visual_script/visual_script_editor.cpp b/modules/visual_script/visual_script_editor.cpp
index ec20698ae8..b1d8c05d87 100644
--- a/modules/visual_script/visual_script_editor.cpp
+++ b/modules/visual_script/visual_script_editor.cpp
@@ -30,15 +30,15 @@
 
 #include "visual_script_editor.h"
 
+#include "core/input/input.h"
 #include "core/object.h"
-#include "core/os/input.h"
 #include "core/os/keyboard.h"
 #include "core/script_language.h"
 #include "core/variant.h"
 #include "editor/editor_node.h"
 #include "editor/editor_resource_preview.h"
 #include "editor/editor_scale.h"
-#include "scene/main/viewport.h"
+#include "scene/main/window.h"
 #include "visual_script_expression.h"
 #include "visual_script_flow_control.h"
 #include "visual_script_func_nodes.h"
@@ -46,7 +46,6 @@
 
 #ifdef TOOLS_ENABLED
 class VisualScriptEditorSignalEdit : public Object {
-
 	GDCLASS(VisualScriptEditorSignalEdit, Object);
 
 	StringName sig;
@@ -62,22 +61,21 @@ protected:
 	}
 
 	void _sig_changed() {
-
 		_change_notify();
 		emit_signal("changed");
 	}
 
 	bool _set(const StringName &p_name, const Variant &p_value) {
-
-		if (sig == StringName())
+		if (sig == StringName()) {
 			return false;
+		}
 
 		if (p_name == "argument_count") {
-
 			int new_argc = p_value;
 			int argc = script->custom_signal_get_argument_count(sig);
-			if (argc == new_argc)
+			if (argc == new_argc) {
 				return true;
+			}
 
 			undo_redo->create_action(TTR("Change Signal Arguments"));
 
@@ -87,9 +85,7 @@ protected:
 					undo_redo->add_undo_method(script.ptr(), "custom_signal_add_argument", sig, script->custom_signal_get_argument_name(sig, i), script->custom_signal_get_argument_type(sig, i), -1);
 				}
 			} else if (new_argc > argc) {
-
 				for (int i = argc; i < new_argc; i++) {
-
 					undo_redo->add_do_method(script.ptr(), "custom_signal_add_argument", sig, Variant::NIL, "arg" + itos(i + 1), -1);
 					undo_redo->add_undo_method(script.ptr(), "custom_signal_remove_argument", sig, argc);
 				}
@@ -107,7 +103,6 @@ protected:
 			ERR_FAIL_INDEX_V(idx, script->custom_signal_get_argument_count(sig), false);
 			String what = String(p_name).get_slice("/", 2);
 			if (what == "type") {
-
 				int old_type = script->custom_signal_get_argument_type(sig, idx);
 				int new_type = p_value;
 				undo_redo->create_action(TTR("Change Argument Type"));
@@ -119,7 +114,6 @@ protected:
 			}
 
 			if (what == "name") {
-
 				String old_name = script->custom_signal_get_argument_name(sig, idx);
 				String new_name = p_value;
 				undo_redo->create_action(TTR("Change Argument name"));
@@ -134,9 +128,9 @@ protected:
 	}
 
 	bool _get(const StringName &p_name, Variant &r_ret) const {
-
-		if (sig == StringName())
+		if (sig == StringName()) {
 			return false;
+		}
 
 		if (p_name == "argument_count") {
 			r_ret = script->custom_signal_get_argument_count(sig);
@@ -159,9 +153,9 @@ protected:
 		return false;
 	}
 	void _get_property_list(List<PropertyInfo> *p_list) const {
-
-		if (sig == StringName())
+		if (sig == StringName()) {
 			return;
+		}
 
 		p_list->push_back(PropertyInfo(Variant::INT, "argument_count", PROPERTY_HINT_RANGE, "0,256"));
 		String argt = "Variant";
@@ -177,16 +171,14 @@ protected:
 
 public:
 	void edit(const StringName &p_sig) {
-
 		sig = p_sig;
 		_change_notify();
 	}
 
-	VisualScriptEditorSignalEdit() { undo_redo = NULL; }
+	VisualScriptEditorSignalEdit() { undo_redo = nullptr; }
 };
 
 class VisualScriptEditorVariableEdit : public Object {
-
 	GDCLASS(VisualScriptEditorVariableEdit, Object);
 
 	StringName var;
@@ -203,20 +195,18 @@ protected:
 	}
 
 	void _var_changed() {
-
 		_change_notify();
 		emit_signal("changed");
 	}
 	void _var_value_changed() {
-
 		_change_notify("value"); //so the whole tree is not redrawn, makes editing smoother in general
 		emit_signal("changed");
 	}
 
 	bool _set(const StringName &p_name, const Variant &p_value) {
-
-		if (var == StringName())
+		if (var == StringName()) {
 			return false;
+		}
 
 		if (String(p_name) == "value") {
 			undo_redo->create_action(TTR("Set Variable Default Value"));
@@ -232,7 +222,6 @@ protected:
 		Dictionary d = script->call("get_variable_info", var);
 
 		if (String(p_name) == "type") {
-
 			Dictionary dc = d.duplicate();
 			dc["type"] = p_value;
 			undo_redo->create_action(TTR("Set Variable Type"));
@@ -245,7 +234,6 @@ protected:
 		}
 
 		if (String(p_name) == "hint") {
-
 			Dictionary dc = d.duplicate();
 			dc["hint"] = p_value;
 			undo_redo->create_action(TTR("Set Variable Type"));
@@ -258,7 +246,6 @@ protected:
 		}
 
 		if (String(p_name) == "hint_string") {
-
 			Dictionary dc = d.duplicate();
 			dc["hint_string"] = p_value;
 			undo_redo->create_action(TTR("Set Variable Type"));
@@ -280,9 +267,9 @@ protected:
 	}
 
 	bool _get(const StringName &p_name, Variant &r_ret) const {
-
-		if (var == StringName())
+		if (var == StringName()) {
 			return false;
+		}
 
 		if (String(p_name) == "value") {
 			r_ret = script->get_variable_default_value(var);
@@ -312,9 +299,9 @@ protected:
 		return false;
 	}
 	void _get_property_list(List<PropertyInfo> *p_list) const {
-
-		if (var == StringName())
+		if (var == StringName()) {
 			return;
+		}
 
 		String argt = "Variant";
 		for (int i = 1; i < Variant::VARIANT_MAX; i++) {
@@ -330,96 +317,233 @@ protected:
 
 public:
 	void edit(const StringName &p_var) {
-
 		var = p_var;
 		_change_notify();
 	}
 
-	VisualScriptEditorVariableEdit() { undo_redo = NULL; }
+	VisualScriptEditorVariableEdit() { undo_redo = nullptr; }
 };
 
 static Color _color_from_type(Variant::Type p_type, bool dark_theme = true) {
 	Color color;
-	if (dark_theme)
+	if (dark_theme) {
 		switch (p_type) {
-			case Variant::NIL: color = Color(0.41, 0.93, 0.74); break;
-
-			case Variant::BOOL: color = Color(0.55, 0.65, 0.94); break;
-			case Variant::INT: color = Color(0.49, 0.78, 0.94); break;
-			case Variant::REAL: color = Color(0.38, 0.85, 0.96); break;
-			case Variant::STRING: color = Color(0.42, 0.65, 0.93); break;
-
-			case Variant::VECTOR2: color = Color(0.74, 0.57, 0.95); break;
-			case Variant::RECT2: color = Color(0.95, 0.57, 0.65); break;
-			case Variant::VECTOR3: color = Color(0.84, 0.49, 0.93); break;
-			case Variant::TRANSFORM2D: color = Color(0.77, 0.93, 0.41); break;
-			case Variant::PLANE: color = Color(0.97, 0.44, 0.44); break;
-			case Variant::QUAT: color = Color(0.93, 0.41, 0.64); break;
-			case Variant::AABB: color = Color(0.93, 0.47, 0.57); break;
-			case Variant::BASIS: color = Color(0.89, 0.93, 0.41); break;
-			case Variant::TRANSFORM: color = Color(0.96, 0.66, 0.43); break;
-
-			case Variant::COLOR: color = Color(0.62, 1.0, 0.44); break;
-			case Variant::NODE_PATH: color = Color(0.41, 0.58, 0.93); break;
-			case Variant::_RID: color = Color(0.41, 0.93, 0.6); break;
-			case Variant::OBJECT: color = Color(0.47, 0.95, 0.91); break;
-			case Variant::DICTIONARY: color = Color(0.47, 0.93, 0.69); break;
-
-			case Variant::ARRAY: color = Color(0.88, 0.88, 0.88); break;
-			case Variant::POOL_BYTE_ARRAY: color = Color(0.67, 0.96, 0.78); break;
-			case Variant::POOL_INT_ARRAY: color = Color(0.69, 0.86, 0.96); break;
-			case Variant::POOL_REAL_ARRAY: color = Color(0.59, 0.91, 0.97); break;
-			case Variant::POOL_STRING_ARRAY: color = Color(0.62, 0.77, 0.95); break;
-			case Variant::POOL_VECTOR2_ARRAY: color = Color(0.82, 0.7, 0.96); break;
-			case Variant::POOL_VECTOR3_ARRAY: color = Color(0.87, 0.61, 0.95); break;
-			case Variant::POOL_COLOR_ARRAY: color = Color(0.91, 1.0, 0.59); break;
+			case Variant::NIL:
+				color = Color(0.41, 0.93, 0.74);
+				break;
+
+			case Variant::BOOL:
+				color = Color(0.55, 0.65, 0.94);
+				break;
+			case Variant::INT:
+				color = Color(0.49, 0.78, 0.94);
+				break;
+			case Variant::FLOAT:
+				color = Color(0.38, 0.85, 0.96);
+				break;
+			case Variant::STRING:
+				color = Color(0.42, 0.65, 0.93);
+				break;
+
+			case Variant::VECTOR2:
+				color = Color(0.74, 0.57, 0.95);
+				break;
+			case Variant::VECTOR2I:
+				color = Color(0.74, 0.57, 0.95);
+				break;
+			case Variant::RECT2:
+				color = Color(0.95, 0.57, 0.65);
+				break;
+			case Variant::RECT2I:
+				color = Color(0.95, 0.57, 0.65);
+				break;
+			case Variant::VECTOR3:
+				color = Color(0.84, 0.49, 0.93);
+				break;
+			case Variant::VECTOR3I:
+				color = Color(0.84, 0.49, 0.93);
+				break;
+			case Variant::TRANSFORM2D:
+				color = Color(0.77, 0.93, 0.41);
+				break;
+			case Variant::PLANE:
+				color = Color(0.97, 0.44, 0.44);
+				break;
+			case Variant::QUAT:
+				color = Color(0.93, 0.41, 0.64);
+				break;
+			case Variant::AABB:
+				color = Color(0.93, 0.47, 0.57);
+				break;
+			case Variant::BASIS:
+				color = Color(0.89, 0.93, 0.41);
+				break;
+			case Variant::TRANSFORM:
+				color = Color(0.96, 0.66, 0.43);
+				break;
+
+			case Variant::COLOR:
+				color = Color(0.62, 1.0, 0.44);
+				break;
+			case Variant::NODE_PATH:
+				color = Color(0.41, 0.58, 0.93);
+				break;
+			case Variant::_RID:
+				color = Color(0.41, 0.93, 0.6);
+				break;
+			case Variant::OBJECT:
+				color = Color(0.47, 0.95, 0.91);
+				break;
+			case Variant::DICTIONARY:
+				color = Color(0.47, 0.93, 0.69);
+				break;
+
+			case Variant::ARRAY:
+				color = Color(0.88, 0.88, 0.88);
+				break;
+			case Variant::PACKED_BYTE_ARRAY:
+				color = Color(0.67, 0.96, 0.78);
+				break;
+			case Variant::PACKED_INT32_ARRAY:
+				color = Color(0.69, 0.86, 0.96);
+				break;
+			case Variant::PACKED_FLOAT32_ARRAY:
+				color = Color(0.59, 0.91, 0.97);
+				break;
+			case Variant::PACKED_INT64_ARRAY:
+				color = Color(0.69, 0.86, 0.96);
+				break;
+			case Variant::PACKED_FLOAT64_ARRAY:
+				color = Color(0.59, 0.91, 0.97);
+				break;
+			case Variant::PACKED_STRING_ARRAY:
+				color = Color(0.62, 0.77, 0.95);
+				break;
+			case Variant::PACKED_VECTOR2_ARRAY:
+				color = Color(0.82, 0.7, 0.96);
+				break;
+			case Variant::PACKED_VECTOR3_ARRAY:
+				color = Color(0.87, 0.61, 0.95);
+				break;
+			case Variant::PACKED_COLOR_ARRAY:
+				color = Color(0.91, 1.0, 0.59);
+				break;
 
 			default:
 				color.set_hsv(p_type / float(Variant::VARIANT_MAX), 0.7, 0.7);
 		}
-	else
+	} else {
 		switch (p_type) {
-			case Variant::NIL: color = Color(0.15, 0.89, 0.63); break;
-
-			case Variant::BOOL: color = Color(0.43, 0.56, 0.92); break;
-			case Variant::INT: color = Color(0.31, 0.7, 0.91); break;
-			case Variant::REAL: color = Color(0.15, 0.8, 0.94); break;
-			case Variant::STRING: color = Color(0.27, 0.56, 0.91); break;
-
-			case Variant::VECTOR2: color = Color(0.68, 0.46, 0.93); break;
-			case Variant::RECT2: color = Color(0.93, 0.46, 0.56); break;
-			case Variant::VECTOR3: color = Color(0.86, 0.42, 0.93); break;
-			case Variant::TRANSFORM2D: color = Color(0.59, 0.81, 0.1); break;
-			case Variant::PLANE: color = Color(0.97, 0.44, 0.44); break;
-			case Variant::QUAT: color = Color(0.93, 0.41, 0.64); break;
-			case Variant::AABB: color = Color(0.93, 0.47, 0.57); break;
-			case Variant::BASIS: color = Color(0.7, 0.73, 0.1); break;
-			case Variant::TRANSFORM: color = Color(0.96, 0.56, 0.28); break;
-
-			case Variant::COLOR: color = Color(0.24, 0.75, 0.0); break;
-			case Variant::NODE_PATH: color = Color(0.41, 0.58, 0.93); break;
-			case Variant::_RID: color = Color(0.17, 0.9, 0.45); break;
-			case Variant::OBJECT: color = Color(0.07, 0.84, 0.76); break;
-			case Variant::DICTIONARY: color = Color(0.34, 0.91, 0.62); break;
-
-			case Variant::ARRAY: color = Color(0.45, 0.45, 0.45); break;
-			case Variant::POOL_BYTE_ARRAY: color = Color(0.38, 0.92, 0.6); break;
-			case Variant::POOL_INT_ARRAY: color = Color(0.38, 0.73, 0.92); break;
-			case Variant::POOL_REAL_ARRAY: color = Color(0.25, 0.83, 0.95); break;
-			case Variant::POOL_STRING_ARRAY: color = Color(0.38, 0.62, 0.92); break;
-			case Variant::POOL_VECTOR2_ARRAY: color = Color(0.62, 0.36, 0.92); break;
-			case Variant::POOL_VECTOR3_ARRAY: color = Color(0.79, 0.35, 0.92); break;
-			case Variant::POOL_COLOR_ARRAY: color = Color(0.57, 0.73, 0.0); break;
+			case Variant::NIL:
+				color = Color(0.15, 0.89, 0.63);
+				break;
+
+			case Variant::BOOL:
+				color = Color(0.43, 0.56, 0.92);
+				break;
+			case Variant::INT:
+				color = Color(0.31, 0.7, 0.91);
+				break;
+			case Variant::FLOAT:
+				color = Color(0.15, 0.8, 0.94);
+				break;
+			case Variant::STRING:
+				color = Color(0.27, 0.56, 0.91);
+				break;
+
+			case Variant::VECTOR2:
+				color = Color(0.68, 0.46, 0.93);
+				break;
+			case Variant::VECTOR2I:
+				color = Color(0.68, 0.46, 0.93);
+				break;
+			case Variant::RECT2:
+				color = Color(0.93, 0.46, 0.56);
+				break;
+			case Variant::RECT2I:
+				color = Color(0.93, 0.46, 0.56);
+				break;
+			case Variant::VECTOR3:
+				color = Color(0.86, 0.42, 0.93);
+				break;
+			case Variant::VECTOR3I:
+				color = Color(0.86, 0.42, 0.93);
+				break;
+			case Variant::TRANSFORM2D:
+				color = Color(0.59, 0.81, 0.1);
+				break;
+			case Variant::PLANE:
+				color = Color(0.97, 0.44, 0.44);
+				break;
+			case Variant::QUAT:
+				color = Color(0.93, 0.41, 0.64);
+				break;
+			case Variant::AABB:
+				color = Color(0.93, 0.47, 0.57);
+				break;
+			case Variant::BASIS:
+				color = Color(0.7, 0.73, 0.1);
+				break;
+			case Variant::TRANSFORM:
+				color = Color(0.96, 0.56, 0.28);
+				break;
+
+			case Variant::COLOR:
+				color = Color(0.24, 0.75, 0.0);
+				break;
+			case Variant::NODE_PATH:
+				color = Color(0.41, 0.58, 0.93);
+				break;
+			case Variant::_RID:
+				color = Color(0.17, 0.9, 0.45);
+				break;
+			case Variant::OBJECT:
+				color = Color(0.07, 0.84, 0.76);
+				break;
+			case Variant::DICTIONARY:
+				color = Color(0.34, 0.91, 0.62);
+				break;
+
+			case Variant::ARRAY:
+				color = Color(0.45, 0.45, 0.45);
+				break;
+			case Variant::PACKED_BYTE_ARRAY:
+				color = Color(0.38, 0.92, 0.6);
+				break;
+			case Variant::PACKED_INT32_ARRAY:
+				color = Color(0.38, 0.73, 0.92);
+				break;
+			case Variant::PACKED_FLOAT32_ARRAY:
+				color = Color(0.25, 0.83, 0.95);
+				break;
+			case Variant::PACKED_INT64_ARRAY:
+				color = Color(0.38, 0.73, 0.92);
+				break;
+			case Variant::PACKED_FLOAT64_ARRAY:
+				color = Color(0.25, 0.83, 0.95);
+				break;
+			case Variant::PACKED_STRING_ARRAY:
+				color = Color(0.38, 0.62, 0.92);
+				break;
+			case Variant::PACKED_VECTOR2_ARRAY:
+				color = Color(0.62, 0.36, 0.92);
+				break;
+			case Variant::PACKED_VECTOR3_ARRAY:
+				color = Color(0.79, 0.35, 0.92);
+				break;
+			case Variant::PACKED_COLOR_ARRAY:
+				color = Color(0.57, 0.73, 0.0);
+				break;
 
 			default:
 				color.set_hsv(p_type / float(Variant::VARIANT_MAX), 0.3, 0.3);
 		}
+	}
 
 	return color;
 }
 
 void VisualScriptEditor::_update_graph_connections() {
-
 	graph->clear_connections();
 
 	List<StringName> funcs;
@@ -431,12 +555,10 @@ void VisualScriptEditor::_update_graph_connections() {
 	}
 
 	for (List<StringName>::Element *F = funcs.front(); F; F = F->next()) {
-
 		List<VisualScript::SequenceConnection> sequence_conns;
 		script->get_sequence_connection_list(F->get(), &sequence_conns);
 
 		for (List<VisualScript::SequenceConnection>::Element *E = sequence_conns.front(); E; E = E->next()) {
-
 			graph->connect_node(itos(E->get().from_node), E->get().from_output, itos(E->get().to_node), 0);
 		}
 
@@ -444,7 +566,6 @@ void VisualScriptEditor::_update_graph_connections() {
 		script->get_data_connection_list(F->get(), &data_conns);
 
 		for (List<VisualScript::DataConnection>::Element *E = data_conns.front(); E; E = E->next()) {
-
 			VisualScript::DataConnection dc = E->get();
 
 			Ref<VisualScriptNode> from_node = script->get_node(F->get(), E->get().from_node);
@@ -462,9 +583,9 @@ void VisualScriptEditor::_update_graph_connections() {
 }
 
 void VisualScriptEditor::_update_graph(int p_only_id) {
-
-	if (updating_graph)
+	if (updating_graph) {
 		return;
+	}
 
 	updating_graph = true;
 
@@ -472,13 +593,12 @@ void VisualScriptEditor::_update_graph(int p_only_id) {
 	if (p_only_id >= 0) {
 		if (graph->has_node(itos(p_only_id))) {
 			Node *gid = graph->get_node(itos(p_only_id));
-			if (gid)
+			if (gid) {
 				memdelete(gid);
+			}
 		}
 	} else {
-
 		for (int i = 0; i < graph->get_child_count(); i++) {
-
 			if (Object::cast_to<GraphNode>(graph->get_child(i))) {
 				memdelete(graph->get_child(i));
 				i--;
@@ -499,37 +619,42 @@ void VisualScriptEditor::_update_graph(int p_only_id) {
 	graph->show();
 	select_func_text->hide();
 
-	Ref<Texture> type_icons[Variant::VARIANT_MAX] = {
-		Control::get_icon("Variant", "EditorIcons"),
-		Control::get_icon("bool", "EditorIcons"),
-		Control::get_icon("int", "EditorIcons"),
-		Control::get_icon("float", "EditorIcons"),
-		Control::get_icon("String", "EditorIcons"),
-		Control::get_icon("Vector2", "EditorIcons"),
-		Control::get_icon("Rect2", "EditorIcons"),
-		Control::get_icon("Vector3", "EditorIcons"),
-		Control::get_icon("Transform2D", "EditorIcons"),
-		Control::get_icon("Plane", "EditorIcons"),
-		Control::get_icon("Quat", "EditorIcons"),
-		Control::get_icon("AABB", "EditorIcons"),
-		Control::get_icon("Basis", "EditorIcons"),
-		Control::get_icon("Transform", "EditorIcons"),
-		Control::get_icon("Color", "EditorIcons"),
-		Control::get_icon("NodePath", "EditorIcons"),
-		Control::get_icon("RID", "EditorIcons"),
-		Control::get_icon("MiniObject", "EditorIcons"),
-		Control::get_icon("Dictionary", "EditorIcons"),
-		Control::get_icon("Array", "EditorIcons"),
-		Control::get_icon("PoolByteArray", "EditorIcons"),
-		Control::get_icon("PoolIntArray", "EditorIcons"),
-		Control::get_icon("PoolRealArray", "EditorIcons"),
-		Control::get_icon("PoolStringArray", "EditorIcons"),
-		Control::get_icon("PoolVector2Array", "EditorIcons"),
-		Control::get_icon("PoolVector3Array", "EditorIcons"),
-		Control::get_icon("PoolColorArray", "EditorIcons")
+	Ref<Texture2D> type_icons[Variant::VARIANT_MAX] = {
+		Control::get_theme_icon("Variant", "EditorIcons"),
+		Control::get_theme_icon("bool", "EditorIcons"),
+		Control::get_theme_icon("int", "EditorIcons"),
+		Control::get_theme_icon("float", "EditorIcons"),
+		Control::get_theme_icon("String", "EditorIcons"),
+		Control::get_theme_icon("Vector2", "EditorIcons"),
+		Control::get_theme_icon("Vector2i", "EditorIcons"),
+		Control::get_theme_icon("Rect2", "EditorIcons"),
+		Control::get_theme_icon("Rect2i", "EditorIcons"),
+		Control::get_theme_icon("Vector3", "EditorIcons"),
+		Control::get_theme_icon("Vector3i", "EditorIcons"),
+		Control::get_theme_icon("Transform2D", "EditorIcons"),
+		Control::get_theme_icon("Plane", "EditorIcons"),
+		Control::get_theme_icon("Quat", "EditorIcons"),
+		Control::get_theme_icon("AABB", "EditorIcons"),
+		Control::get_theme_icon("Basis", "EditorIcons"),
+		Control::get_theme_icon("Transform", "EditorIcons"),
+		Control::get_theme_icon("Color", "EditorIcons"),
+		Control::get_theme_icon("NodePath", "EditorIcons"),
+		Control::get_theme_icon("RID", "EditorIcons"),
+		Control::get_theme_icon("MiniObject", "EditorIcons"),
+		Control::get_theme_icon("Callable", "EditorIcons"),
+		Control::get_theme_icon("Signal", "EditorIcons"),
+		Control::get_theme_icon("Dictionary", "EditorIcons"),
+		Control::get_theme_icon("Array", "EditorIcons"),
+		Control::get_theme_icon("PackedByteArray", "EditorIcons"),
+		Control::get_theme_icon("PackedInt32Array", "EditorIcons"),
+		Control::get_theme_icon("PackedFloat32Array", "EditorIcons"),
+		Control::get_theme_icon("PackedStringArray", "EditorIcons"),
+		Control::get_theme_icon("PackedVector2Array", "EditorIcons"),
+		Control::get_theme_icon("PackedVector3Array", "EditorIcons"),
+		Control::get_theme_icon("PackedColorArray", "EditorIcons")
 	};
 
-	Ref<Texture> seq_port = Control::get_icon("VisualShaderPort", "EditorIcons");
+	Ref<Texture2D> seq_port = Control::get_theme_icon("VisualShaderPort", "EditorIcons");
 
 	for (List<StringName>::Element *F = funcs.front(); F; F = F->next()) { // loop through all the functions
 
@@ -538,9 +663,9 @@ void VisualScriptEditor::_update_graph(int p_only_id) {
 		StringName editor_icons = "EditorIcons";
 
 		for (List<int>::Element *E = ids.front(); E; E = E->next()) {
-
-			if (p_only_id >= 0 && p_only_id != E->get())
+			if (p_only_id >= 0 && p_only_id != E->get()) {
 				continue;
+			}
 
 			Ref<VisualScriptNode> node = script->get_node(F->get(), E->get());
 			Vector2 pos = script->get_node_position(F->get(), E->get());
@@ -556,8 +681,8 @@ void VisualScriptEditor::_update_graph(int p_only_id) {
 
 			gnode->set_meta("__vnode", node);
 			gnode->set_name(itos(E->get()));
-			gnode->connect("dragged", this, "_node_moved", varray(E->get()));
-			gnode->connect("close_request", this, "_remove_node", varray(E->get()), CONNECT_DEFERRED);
+			gnode->connect("dragged", callable_mp(this, &VisualScriptEditor::_node_moved), varray(E->get()));
+			gnode->connect("close_request", callable_mp(this, &VisualScriptEditor::_remove_node), varray(E->get()), CONNECT_DEFERRED);
 
 			if (E->get() != script->get_function_node_id(F->get())) {
 				//function can't be erased
@@ -575,16 +700,17 @@ void VisualScriptEditor::_update_graph(int p_only_id) {
 					Button *btn = memnew(Button);
 					btn->set_text(TTR("Add Input Port"));
 					hbnc->add_child(btn);
-					btn->connect("pressed", this, "_add_input_port", varray(E->get()), CONNECT_DEFERRED);
+					btn->connect("pressed", callable_mp(this, &VisualScriptEditor::_add_input_port), varray(E->get()), CONNECT_DEFERRED);
 				}
 				if (nd_list->is_output_port_editable()) {
-					if (nd_list->is_input_port_editable())
+					if (nd_list->is_input_port_editable()) {
 						hbnc->add_spacer();
+					}
 					has_gnode_text = true;
 					Button *btn = memnew(Button);
 					btn->set_text(TTR("Add Output Port"));
 					hbnc->add_child(btn);
-					btn->connect("pressed", this, "_add_output_port", varray(E->get()), CONNECT_DEFERRED);
+					btn->connect("pressed", callable_mp(this, &VisualScriptEditor::_add_output_port), varray(E->get()), CONNECT_DEFERRED);
 				}
 				gnode->add_child(hbnc);
 			} else if (Object::cast_to<VisualScriptExpression>(node.ptr())) {
@@ -592,9 +718,9 @@ void VisualScriptEditor::_update_graph(int p_only_id) {
 				LineEdit *line_edit = memnew(LineEdit);
 				line_edit->set_text(node->get_text());
 				line_edit->set_expand_to_text_length(true);
-				line_edit->add_font_override("font", get_font("source", "EditorFonts"));
+				line_edit->add_theme_font_override("font", get_theme_font("source", "EditorFonts"));
 				gnode->add_child(line_edit);
-				line_edit->connect("text_changed", this, "_expression_text_changed", varray(E->get()));
+				line_edit->connect("text_changed", callable_mp(this, &VisualScriptEditor::_expression_text_changed), varray(E->get()));
 			} else {
 				String text = node->get_text();
 				if (!text.empty()) {
@@ -610,29 +736,38 @@ void VisualScriptEditor::_update_graph(int p_only_id) {
 				gnode->set_comment(true);
 				gnode->set_resizable(true);
 				gnode->set_custom_minimum_size(vsc->get_size() * EDSCALE);
-				gnode->connect("resize_request", this, "_comment_node_resized", varray(E->get()));
+				gnode->connect("resize_request", callable_mp(this, &VisualScriptEditor::_comment_node_resized), varray(E->get()));
 			}
 
 			if (node_styles.has(node->get_category())) {
 				Ref<StyleBoxFlat> sbf = node_styles[node->get_category()];
-				if (gnode->is_comment())
+				if (gnode->is_comment()) {
 					sbf = EditorNode::get_singleton()->get_theme_base()->get_theme()->get_stylebox("comment", "GraphNode");
+				}
 
 				Color c = sbf->get_border_color();
+				Color ic = c;
 				c.a = 1;
 				if (EditorSettings::get_singleton()->get("interface/theme/use_graph_node_headers")) {
-					Color mono_color = ((c.r + c.g + c.b) / 3) < 0.7 ? Color(1.0, 1.0, 1.0) : Color(0.0, 0.0, 0.0);
+					Color mono_color;
+					if (((c.r + c.g + c.b) / 3) < 0.7) {
+						mono_color = Color(1.0, 1.0, 1.0);
+						ic = Color(0.0, 0.0, 0.0, 0.7);
+					} else {
+						mono_color = Color(0.0, 0.0, 0.0);
+						ic = Color(1.0, 1.0, 1.0, 0.7);
+					}
 					mono_color.a = 0.85;
 					c = mono_color;
 				}
-				gnode->add_color_override("title_color", c);
+				gnode->add_theme_color_override("title_color", c);
 				c.a = 0.7;
-				gnode->add_color_override("close_color", c);
-				gnode->add_color_override("resizer_color", c);
-				gnode->add_style_override("frame", sbf);
+				gnode->add_theme_color_override("close_color", c);
+				gnode->add_theme_color_override("resizer_color", ic);
+				gnode->add_theme_style_override("frame", sbf);
 			}
 
-			const Color mono_color = get_color("mono_color", "Editor");
+			const Color mono_color = get_theme_color("mono_color", "Editor");
 
 			int slot_idx = 0;
 
@@ -656,12 +791,10 @@ void VisualScriptEditor::_update_graph(int p_only_id) {
 			int mixed_seq_ports = 0;
 
 			if (!single_seq_output) {
-
 				if (node->has_mixed_input_and_sequence_ports()) {
 					mixed_seq_ports = node->get_output_sequence_port_count();
 				} else {
 					for (int i = 0; i < node->get_output_sequence_port_count(); i++) {
-
 						Label *text2 = memnew(Label);
 						text2->set_text(node->get_output_sequence_port_text(i));
 						text2->set_align(Label::ALIGN_RIGHT);
@@ -673,7 +806,6 @@ void VisualScriptEditor::_update_graph(int p_only_id) {
 			}
 
 			for (int i = 0; i < MAX(node->get_output_value_port_count(), MAX(mixed_seq_ports, node->get_input_value_port_count())); i++) {
-
 				bool left_ok = false;
 				Variant::Type left_type = Variant::NIL;
 				String left_name;
@@ -701,8 +833,7 @@ void VisualScriptEditor::_update_graph(int p_only_id) {
 				vbc->add_child(hbc);
 				vbc->add_child(hbc2);
 				if (left_ok) {
-
-					Ref<Texture> t;
+					Ref<Texture2D> t;
 					if (left_type >= 0 && left_type < Variant::VARIANT_MAX) {
 						t = type_icons[left_type];
 					}
@@ -720,8 +851,8 @@ void VisualScriptEditor::_update_graph(int p_only_id) {
 							name_box->set_custom_minimum_size(Size2(60 * EDSCALE, 0));
 							name_box->set_text(left_name);
 							name_box->set_expand_to_text_length(true);
-							name_box->connect("resized", this, "_update_node_size", varray(E->get()));
-							name_box->connect("focus_exited", this, "_port_name_focus_out", varray(name_box, E->get(), i, true));
+							name_box->connect("resized", callable_mp(this, &VisualScriptEditor::_update_node_size), varray(E->get()));
+							name_box->connect("focus_exited", callable_mp(this, &VisualScriptEditor::_port_name_focus_out), varray(name_box, E->get(), i, true));
 						} else {
 							hbc->add_child(memnew(Label(left_name)));
 						}
@@ -734,35 +865,33 @@ void VisualScriptEditor::_update_graph(int p_only_id) {
 							opbtn->select(left_type);
 							opbtn->set_custom_minimum_size(Size2(100 * EDSCALE, 0));
 							hbc->add_child(opbtn);
-							opbtn->connect("item_selected", this, "_change_port_type", varray(E->get(), i, true), CONNECT_DEFERRED);
+							opbtn->connect("item_selected", callable_mp(this, &VisualScriptEditor::_change_port_type), varray(E->get(), i, true), CONNECT_DEFERRED);
 						}
 
 						Button *rmbtn = memnew(Button);
-						rmbtn->set_icon(EditorNode::get_singleton()->get_gui_base()->get_icon("Remove", "EditorIcons"));
+						rmbtn->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon("Remove", "EditorIcons"));
 						hbc->add_child(rmbtn);
-						rmbtn->connect("pressed", this, "_remove_input_port", varray(E->get(), i), CONNECT_DEFERRED);
+						rmbtn->connect("pressed", callable_mp(this, &VisualScriptEditor::_remove_input_port), varray(E->get(), i), CONNECT_DEFERRED);
 					} else {
 						hbc->add_child(memnew(Label(left_name)));
 					}
 
 					if (left_type != Variant::NIL && !script->is_input_value_port_connected(F->get(), E->get(), i)) {
-
 						PropertyInfo pi = node->get_input_value_port_info(i);
 						Button *button = memnew(Button);
 						Variant value = node->get_default_input_value(i);
 						if (value.get_type() != left_type) {
 							//different type? for now convert
 							//not the same, reconvert
-							Variant::CallError ce;
+							Callable::CallError ce;
 							const Variant *existingp = &value;
 							value = Variant::construct(left_type, &existingp, 1, ce, false);
 						}
 
 						if (left_type == Variant::COLOR) {
 							button->set_custom_minimum_size(Size2(30, 0) * EDSCALE);
-							button->connect("draw", this, "_draw_color_over_button", varray(button, value));
+							button->connect("draw", callable_mp(this, &VisualScriptEditor::_draw_color_over_button), varray(button, value));
 						} else if (left_type == Variant::OBJECT && Ref<Resource>(value).is_valid()) {
-
 							Ref<Resource> res = value;
 							Array arr;
 							arr.push_back(button->get_instance_id());
@@ -770,13 +899,11 @@ void VisualScriptEditor::_update_graph(int p_only_id) {
 							EditorResourcePreview::get_singleton()->queue_edited_resource_preview(res, this, "_button_resource_previewed", arr);
 
 						} else if (pi.type == Variant::INT && pi.hint == PROPERTY_HINT_ENUM) {
-
 							button->set_text(pi.hint_string.get_slice(",", value));
 						} else {
-
 							button->set_text(value);
 						}
-						button->connect("pressed", this, "_default_value_edited", varray(button, E->get(), i));
+						button->connect("pressed", callable_mp(this, &VisualScriptEditor::_default_value_edited), varray(button, E->get(), i));
 						hbc2->add_child(button);
 					}
 				} else {
@@ -789,7 +916,6 @@ void VisualScriptEditor::_update_graph(int p_only_id) {
 				hbc2->add_spacer();
 
 				if (i < mixed_seq_ports) {
-
 					Label *text2 = memnew(Label);
 					text2->set_text(node->get_output_sequence_port_text(i));
 					text2->set_align(Label::ALIGN_RIGHT);
@@ -797,12 +923,11 @@ void VisualScriptEditor::_update_graph(int p_only_id) {
 				}
 
 				if (right_ok) {
-
 					if (is_vslist) {
 						Button *rmbtn = memnew(Button);
-						rmbtn->set_icon(EditorNode::get_singleton()->get_gui_base()->get_icon("Remove", "EditorIcons"));
+						rmbtn->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon("Remove", "EditorIcons"));
 						hbc->add_child(rmbtn);
-						rmbtn->connect("pressed", this, "_remove_output_port", varray(E->get(), i), CONNECT_DEFERRED);
+						rmbtn->connect("pressed", callable_mp(this, &VisualScriptEditor::_remove_output_port), varray(E->get(), i), CONNECT_DEFERRED);
 
 						if (nd_list->is_output_port_type_editable()) {
 							OptionButton *opbtn = memnew(OptionButton);
@@ -812,7 +937,7 @@ void VisualScriptEditor::_update_graph(int p_only_id) {
 							opbtn->select(right_type);
 							opbtn->set_custom_minimum_size(Size2(100 * EDSCALE, 0));
 							hbc->add_child(opbtn);
-							opbtn->connect("item_selected", this, "_change_port_type", varray(E->get(), i, false), CONNECT_DEFERRED);
+							opbtn->connect("item_selected", callable_mp(this, &VisualScriptEditor::_change_port_type), varray(E->get(), i, false), CONNECT_DEFERRED);
 						}
 
 						if (nd_list->is_output_port_name_editable()) {
@@ -821,8 +946,8 @@ void VisualScriptEditor::_update_graph(int p_only_id) {
 							name_box->set_custom_minimum_size(Size2(60 * EDSCALE, 0));
 							name_box->set_text(right_name);
 							name_box->set_expand_to_text_length(true);
-							name_box->connect("resized", this, "_update_node_size", varray(E->get()));
-							name_box->connect("focus_exited", this, "_port_name_focus_out", varray(name_box, E->get(), i, false));
+							name_box->connect("resized", callable_mp(this, &VisualScriptEditor::_update_node_size), varray(E->get()));
+							name_box->connect("focus_exited", callable_mp(this, &VisualScriptEditor::_port_name_focus_out), varray(name_box, E->get(), i, false));
 						} else {
 							hbc->add_child(memnew(Label(right_name)));
 						}
@@ -830,7 +955,7 @@ void VisualScriptEditor::_update_graph(int p_only_id) {
 						hbc->add_child(memnew(Label(right_name)));
 					}
 
-					Ref<Texture> t;
+					Ref<Texture2D> t;
 					if (right_type >= 0 && right_type < Variant::VARIANT_MAX) {
 						t = type_icons[right_type];
 					}
@@ -844,9 +969,9 @@ void VisualScriptEditor::_update_graph(int p_only_id) {
 
 				gnode->add_child(vbc);
 
-				bool dark_theme = get_constant("dark_theme", "Editor");
+				bool dark_theme = get_theme_constant("dark_theme", "Editor");
 				if (i < mixed_seq_ports) {
-					gnode->set_slot(slot_idx, left_ok, left_type, _color_from_type(left_type, dark_theme), true, TYPE_SEQUENCE, mono_color, Ref<Texture>(), seq_port);
+					gnode->set_slot(slot_idx, left_ok, left_type, _color_from_type(left_type, dark_theme), true, TYPE_SEQUENCE, mono_color, Ref<Texture2D>(), seq_port);
 				} else {
 					gnode->set_slot(slot_idx, left_ok, left_type, _color_from_type(left_type, dark_theme), right_ok, right_type, _color_from_type(right_type, dark_theme));
 				}
@@ -868,12 +993,12 @@ void VisualScriptEditor::_update_graph(int p_only_id) {
 }
 
 void VisualScriptEditor::_change_port_type(int p_select, int p_id, int p_port, bool is_input) {
-
 	StringName func = _get_function_of_node(p_id);
 
 	Ref<VisualScriptLists> vsn = script->get_node(func, p_id);
-	if (!vsn.is_valid())
+	if (!vsn.is_valid()) {
 		return;
+	}
 
 	undo_redo->create_action("Change Port Type");
 	if (is_input) {
@@ -887,24 +1012,27 @@ void VisualScriptEditor::_change_port_type(int p_select, int p_id, int p_port, b
 }
 
 void VisualScriptEditor::_update_node_size(int p_id) {
-
 	Node *node = graph->get_node(itos(p_id));
-	if (Object::cast_to<Control>(node))
+	if (Object::cast_to<Control>(node)) {
 		Object::cast_to<Control>(node)->set_size(Vector2(1, 1)); //shrink if text is smaller
+	}
 }
+
 void VisualScriptEditor::_port_name_focus_out(const Node *p_name_box, int p_id, int p_port, bool is_input) {
 	StringName func = _get_function_of_node(p_id);
 
 	Ref<VisualScriptLists> vsn = script->get_node(func, p_id);
-	if (!vsn.is_valid())
+	if (!vsn.is_valid()) {
 		return;
+	}
 
 	String text;
 
-	if (Object::cast_to<LineEdit>(p_name_box))
+	if (Object::cast_to<LineEdit>(p_name_box)) {
 		text = Object::cast_to<LineEdit>(p_name_box)->get_text();
-	else
+	} else {
 		return;
+	}
 
 	undo_redo->create_action("Change Port Name");
 	if (is_input) {
@@ -928,14 +1056,13 @@ void VisualScriptEditor::_update_members() {
 	TreeItem *functions = members->create_item(root);
 	functions->set_selectable(0, false);
 	functions->set_text(0, TTR("Functions:"));
-	functions->add_button(0, Control::get_icon("Override", "EditorIcons"), 1, false, TTR("Override an existing built-in function."));
-	functions->add_button(0, Control::get_icon("Add", "EditorIcons"), 0, false, TTR("Create a new function."));
-	functions->set_custom_color(0, Control::get_color("mono_color", "Editor"));
+	functions->add_button(0, Control::get_theme_icon("Override", "EditorIcons"), 1, false, TTR("Override an existing built-in function."));
+	functions->add_button(0, Control::get_theme_icon("Add", "EditorIcons"), 0, false, TTR("Create a new function."));
+	functions->set_custom_color(0, Control::get_theme_color("mono_color", "Editor"));
 
 	List<StringName> func_names;
 	script->get_function_list(&func_names);
 	for (List<StringName>::Element *E = func_names.front(); E; E = E->next()) {
-
 		if (E->get() == default_func) {
 			continue;
 		}
@@ -944,45 +1071,51 @@ void VisualScriptEditor::_update_members() {
 		ti->set_text(0, E->get());
 		ti->set_selectable(0, true);
 		ti->set_metadata(0, E->get());
-		ti->add_button(0, Control::get_icon("Edit", "EditorIcons"), 0);
-		if (selected == E->get())
+		ti->add_button(0, Control::get_theme_icon("Edit", "EditorIcons"), 0);
+		if (selected == E->get()) {
 			ti->select(0);
+		}
 	}
 
 	TreeItem *variables = members->create_item(root);
 	variables->set_selectable(0, false);
 	variables->set_text(0, TTR("Variables:"));
-	variables->add_button(0, Control::get_icon("Add", "EditorIcons"), -1, false, TTR("Create a new variable."));
-	variables->set_custom_color(0, Control::get_color("mono_color", "Editor"));
-
-	Ref<Texture> type_icons[Variant::VARIANT_MAX] = {
-		Control::get_icon("Variant", "EditorIcons"),
-		Control::get_icon("bool", "EditorIcons"),
-		Control::get_icon("int", "EditorIcons"),
-		Control::get_icon("float", "EditorIcons"),
-		Control::get_icon("String", "EditorIcons"),
-		Control::get_icon("Vector2", "EditorIcons"),
-		Control::get_icon("Rect2", "EditorIcons"),
-		Control::get_icon("Vector3", "EditorIcons"),
-		Control::get_icon("Transform2D", "EditorIcons"),
-		Control::get_icon("Plane", "EditorIcons"),
-		Control::get_icon("Quat", "EditorIcons"),
-		Control::get_icon("AABB", "EditorIcons"),
-		Control::get_icon("Basis", "EditorIcons"),
-		Control::get_icon("Transform", "EditorIcons"),
-		Control::get_icon("Color", "EditorIcons"),
-		Control::get_icon("NodePath", "EditorIcons"),
-		Control::get_icon("RID", "EditorIcons"),
-		Control::get_icon("MiniObject", "EditorIcons"),
-		Control::get_icon("Dictionary", "EditorIcons"),
-		Control::get_icon("Array", "EditorIcons"),
-		Control::get_icon("PoolByteArray", "EditorIcons"),
-		Control::get_icon("PoolIntArray", "EditorIcons"),
-		Control::get_icon("PoolRealArray", "EditorIcons"),
-		Control::get_icon("PoolStringArray", "EditorIcons"),
-		Control::get_icon("PoolVector2Array", "EditorIcons"),
-		Control::get_icon("PoolVector3Array", "EditorIcons"),
-		Control::get_icon("PoolColorArray", "EditorIcons")
+	variables->add_button(0, Control::get_theme_icon("Add", "EditorIcons"), -1, false, TTR("Create a new variable."));
+	variables->set_custom_color(0, Control::get_theme_color("mono_color", "Editor"));
+
+	Ref<Texture2D> type_icons[Variant::VARIANT_MAX] = {
+		Control::get_theme_icon("Variant", "EditorIcons"),
+		Control::get_theme_icon("bool", "EditorIcons"),
+		Control::get_theme_icon("int", "EditorIcons"),
+		Control::get_theme_icon("float", "EditorIcons"),
+		Control::get_theme_icon("String", "EditorIcons"),
+		Control::get_theme_icon("Vector2", "EditorIcons"),
+		Control::get_theme_icon("Vector2i", "EditorIcons"),
+		Control::get_theme_icon("Rect2", "EditorIcons"),
+		Control::get_theme_icon("Rect2i", "EditorIcons"),
+		Control::get_theme_icon("Vector3", "EditorIcons"),
+		Control::get_theme_icon("Vector3i", "EditorIcons"),
+		Control::get_theme_icon("Transform2D", "EditorIcons"),
+		Control::get_theme_icon("Plane", "EditorIcons"),
+		Control::get_theme_icon("Quat", "EditorIcons"),
+		Control::get_theme_icon("AABB", "EditorIcons"),
+		Control::get_theme_icon("Basis", "EditorIcons"),
+		Control::get_theme_icon("Transform", "EditorIcons"),
+		Control::get_theme_icon("Color", "EditorIcons"),
+		Control::get_theme_icon("NodePath", "EditorIcons"),
+		Control::get_theme_icon("RID", "EditorIcons"),
+		Control::get_theme_icon("MiniObject", "EditorIcons"),
+		Control::get_theme_icon("Callable", "EditorIcons"),
+		Control::get_theme_icon("Signal", "EditorIcons"),
+		Control::get_theme_icon("Dictionary", "EditorIcons"),
+		Control::get_theme_icon("Array", "EditorIcons"),
+		Control::get_theme_icon("PackedByteArray", "EditorIcons"),
+		Control::get_theme_icon("PackedInt32Array", "EditorIcons"),
+		Control::get_theme_icon("PackedFloat32Array", "EditorIcons"),
+		Control::get_theme_icon("PackedStringArray", "EditorIcons"),
+		Control::get_theme_icon("PackedVector2Array", "EditorIcons"),
+		Control::get_theme_icon("PackedVector3Array", "EditorIcons"),
+		Control::get_theme_icon("PackedColorArray", "EditorIcons")
 	};
 
 	List<StringName> var_names;
@@ -991,22 +1124,23 @@ void VisualScriptEditor::_update_members() {
 		TreeItem *ti = members->create_item(variables);
 
 		ti->set_text(0, E->get());
-		Variant var = script->get_variable_default_value(E->get());
-		ti->set_suffix(0, "= " + String(var));
+
+		ti->set_suffix(0, "= " + _sanitized_variant_text(E->get()));
 		ti->set_icon(0, type_icons[script->get_variable_info(E->get()).type]);
 
 		ti->set_selectable(0, true);
 		ti->set_editable(0, true);
 		ti->set_metadata(0, E->get());
-		if (selected == E->get())
+		if (selected == E->get()) {
 			ti->select(0);
+		}
 	}
 
 	TreeItem *_signals = members->create_item(root);
 	_signals->set_selectable(0, false);
 	_signals->set_text(0, TTR("Signals:"));
-	_signals->add_button(0, Control::get_icon("Add", "EditorIcons"), -1, false, TTR("Create a new signal."));
-	_signals->set_custom_color(0, Control::get_color("mono_color", "Editor"));
+	_signals->add_button(0, Control::get_theme_icon("Add", "EditorIcons"), -1, false, TTR("Create a new signal."));
+	_signals->set_custom_color(0, Control::get_theme_color("mono_color", "Editor"));
 
 	List<StringName> signal_names;
 	script->get_custom_signal_list(&signal_names);
@@ -1016,26 +1150,39 @@ void VisualScriptEditor::_update_members() {
 		ti->set_selectable(0, true);
 		ti->set_editable(0, true);
 		ti->set_metadata(0, E->get());
-		if (selected == E->get())
+		if (selected == E->get()) {
 			ti->select(0);
+		}
 	}
 
 	String base_type = script->get_instance_base_type();
 	String icon_type = base_type;
-	if (!Control::has_icon(base_type, "EditorIcons")) {
+	if (!Control::has_theme_icon(base_type, "EditorIcons")) {
 		icon_type = "Object";
 	}
 
 	base_type_select->set_text(base_type);
-	base_type_select->set_icon(Control::get_icon(icon_type, "EditorIcons"));
+	base_type_select->set_icon(Control::get_theme_icon(icon_type, "EditorIcons"));
 
 	updating_members = false;
 }
 
-void VisualScriptEditor::_member_selected() {
+String VisualScriptEditor::_sanitized_variant_text(const StringName &property_name) {
+	Variant var = script->get_variable_default_value(property_name);
 
-	if (updating_members)
+	if (script->get_variable_info(property_name).type != Variant::NIL) {
+		Callable::CallError ce;
+		const Variant *converted = &var;
+		var = Variant::construct(script->get_variable_info(property_name).type, &converted, 1, ce, false);
+	}
+
+	return String(var);
+}
+
+void VisualScriptEditor::_member_selected() {
+	if (updating_members) {
 		return;
+	}
 
 	TreeItem *ti = members->get_selected();
 	ERR_FAIL_COND(!ti);
@@ -1043,7 +1190,6 @@ void VisualScriptEditor::_member_selected() {
 	selected = ti->get_metadata(0);
 
 	if (ti->get_parent() == members->get_root()->get_children()) {
-
 #ifdef OSX_ENABLED
 		bool held_ctrl = Input::get_singleton()->is_key_pressed(KEY_META);
 #else
@@ -1057,9 +1203,9 @@ void VisualScriptEditor::_member_selected() {
 }
 
 void VisualScriptEditor::_member_edited() {
-
-	if (updating_members)
+	if (updating_members) {
 		return;
+	}
 
 	TreeItem *ti = members->get_edited();
 	ERR_FAIL_COND(!ti);
@@ -1067,11 +1213,11 @@ void VisualScriptEditor::_member_edited() {
 	String name = ti->get_metadata(0);
 	String new_name = ti->get_text(0);
 
-	if (name == new_name)
+	if (name == new_name) {
 		return;
+	}
 
 	if (!new_name.is_valid_identifier()) {
-
 		EditorNode::get_singleton()->show_warning(TTR("Name is not a valid identifier:") + " " + new_name);
 		updating_members = true;
 		ti->set_text(0, name);
@@ -1080,7 +1226,6 @@ void VisualScriptEditor::_member_edited() {
 	}
 
 	if (script->has_function(new_name) || script->has_variable(new_name) || script->has_custom_signal(new_name)) {
-
 		EditorNode::get_singleton()->show_warning(TTR("Name already in use by another func/var/signal:") + " " + new_name);
 		updating_members = true;
 		ti->set_text(0, name);
@@ -1091,7 +1236,6 @@ void VisualScriptEditor::_member_edited() {
 	TreeItem *root = members->get_root();
 
 	if (ti->get_parent() == root->get_children()) {
-
 		selected = new_name;
 
 		int node_id = script->get_function_node_id(name);
@@ -1115,8 +1259,9 @@ void VisualScriptEditor::_member_edited() {
 			script->get_node_list(E->get(), &lst);
 			for (List<int>::Element *F = lst.front(); F; F = F->next()) {
 				Ref<VisualScriptFunctionCall> fncall = script->get_node(E->get(), F->get());
-				if (!fncall.is_valid())
+				if (!fncall.is_valid()) {
 					continue;
+				}
 				if (fncall->get_function() == name) {
 					undo_redo->add_do_method(fncall.ptr(), "set_function", new_name);
 					undo_redo->add_undo_method(fncall.ptr(), "set_function", name);
@@ -1136,13 +1281,14 @@ void VisualScriptEditor::_member_edited() {
 	}
 
 	if (ti->get_parent() == root->get_children()->get_next()) {
-
 		selected = new_name;
 		undo_redo->create_action(TTR("Rename Variable"));
 		undo_redo->add_do_method(script.ptr(), "rename_variable", name, new_name);
 		undo_redo->add_undo_method(script.ptr(), "rename_variable", new_name, name);
 		undo_redo->add_do_method(this, "_update_members");
 		undo_redo->add_undo_method(this, "_update_members");
+		undo_redo->add_do_method(this, "_update_graph");
+		undo_redo->add_undo_method(this, "_update_graph");
 		undo_redo->add_do_method(this, "emit_signal", "edited_script_changed");
 		undo_redo->add_undo_method(this, "emit_signal", "edited_script_changed");
 		undo_redo->commit_action();
@@ -1151,7 +1297,6 @@ void VisualScriptEditor::_member_edited() {
 	}
 
 	if (ti->get_parent() == root->get_children()->get_next()->get_next()) {
-
 		selected = new_name;
 		undo_redo->create_action(TTR("Rename Signal"));
 		undo_redo->add_do_method(script.ptr(), "rename_custom_signal", name, new_name);
@@ -1188,8 +1333,9 @@ void VisualScriptEditor::_create_function() {
 	for (int i = 0; i < func_input_vbox->get_child_count(); i++) {
 		OptionButton *opbtn = Object::cast_to<OptionButton>(func_input_vbox->get_child(i)->get_child(3));
 		LineEdit *lne = Object::cast_to<LineEdit>(func_input_vbox->get_child(i)->get_child(1));
-		if (!opbtn || !lne)
+		if (!opbtn || !lne) {
 			continue;
+		}
 		Variant::Type arg_type = Variant::Type(opbtn->get_selected());
 		String arg_name = lne->get_text();
 		func_node->add_argument(arg_type, arg_name);
@@ -1225,7 +1371,7 @@ void VisualScriptEditor::_add_func_input() {
 	LineEdit *name_box = memnew(LineEdit);
 	name_box->set_h_size_flags(SIZE_EXPAND_FILL);
 	name_box->set_text("input");
-	name_box->connect("focus_entered", this, "_deselect_input_names");
+	name_box->connect("focus_entered", callable_mp(this, &VisualScriptEditor::_deselect_input_names));
 	hbox->add_child(name_box);
 
 	Label *type_label = memnew(Label);
@@ -1234,13 +1380,14 @@ void VisualScriptEditor::_add_func_input() {
 
 	OptionButton *type_box = memnew(OptionButton);
 	type_box->set_custom_minimum_size(Size2(120 * EDSCALE, 0));
-	for (int i = Variant::NIL; i < Variant::VARIANT_MAX; i++)
+	for (int i = Variant::NIL; i < Variant::VARIANT_MAX; i++) {
 		type_box->add_item(Variant::get_type_name(Variant::Type(i)));
+	}
 	type_box->select(1);
 	hbox->add_child(type_box);
 
 	Button *delete_button = memnew(Button);
-	delete_button->set_icon(EditorNode::get_singleton()->get_gui_base()->get_icon("Remove", "EditorIcons"));
+	delete_button->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon("Remove", "EditorIcons"));
 	delete_button->set_tooltip(vformat(TTR("Delete input port")));
 	hbox->add_child(delete_button);
 
@@ -1250,9 +1397,9 @@ void VisualScriptEditor::_add_func_input() {
 	}
 
 	func_input_vbox->add_child(hbox);
-	hbox->set_meta("id", hbox->get_position_in_parent());
+	hbox->set_meta("id", hbox->get_index());
 
-	delete_button->connect("pressed", this, "_remove_func_input", varray(hbox));
+	delete_button->connect("pressed", callable_mp(this, &VisualScriptEditor::_remove_func_input), varray(hbox));
 
 	name_box->select_all();
 	name_box->grab_focus();
@@ -1267,13 +1414,13 @@ void VisualScriptEditor::_deselect_input_names() {
 	int cn = func_input_vbox->get_child_count();
 	for (int i = 0; i < cn; i++) {
 		LineEdit *lne = Object::cast_to<LineEdit>(func_input_vbox->get_child(i)->get_child(1));
-		if (lne)
+		if (lne) {
 			lne->deselect();
+		}
 	}
 }
 
 void VisualScriptEditor::_member_button(Object *p_item, int p_column, int p_button) {
-
 	TreeItem *ti = Object::cast_to<TreeItem>(p_item);
 
 	TreeItem *root = members->get_root();
@@ -1288,7 +1435,6 @@ void VisualScriptEditor::_member_button(Object *p_item, int p_column, int p_butt
 
 				return;
 			} else if (p_button == 0) {
-
 				String name = _validate_name("new_function");
 				selected = name;
 				Vector2 ofs = _get_available_pos();
@@ -1356,12 +1502,12 @@ void VisualScriptEditor::_member_button(Object *p_item, int p_column, int p_butt
 }
 
 void VisualScriptEditor::_add_input_port(int p_id) {
-
 	StringName func = _get_function_of_node(p_id);
 
 	Ref<VisualScriptLists> vsn = script->get_node(func, p_id);
-	if (!vsn.is_valid())
+	if (!vsn.is_valid()) {
 		return;
+	}
 
 	updating_graph = true;
 
@@ -1378,12 +1524,12 @@ void VisualScriptEditor::_add_input_port(int p_id) {
 }
 
 void VisualScriptEditor::_add_output_port(int p_id) {
-
 	StringName func = _get_function_of_node(p_id);
 
 	Ref<VisualScriptLists> vsn = script->get_node(func, p_id);
-	if (!vsn.is_valid())
+	if (!vsn.is_valid()) {
 		return;
+	}
 
 	updating_graph = true;
 
@@ -1400,12 +1546,12 @@ void VisualScriptEditor::_add_output_port(int p_id) {
 }
 
 void VisualScriptEditor::_remove_input_port(int p_id, int p_port) {
-
 	StringName func = _get_function_of_node(p_id);
 
 	Ref<VisualScriptLists> vsn = script->get_node(func, p_id);
-	if (!vsn.is_valid())
+	if (!vsn.is_valid()) {
 		return;
+	}
 
 	updating_graph = true;
 
@@ -1414,14 +1560,16 @@ void VisualScriptEditor::_remove_input_port(int p_id, int p_port) {
 	int conn_from = -1, conn_port = -1;
 	script->get_input_value_port_connection_source(func, p_id, p_port, &conn_from, &conn_port);
 
-	if (conn_from != -1)
+	if (conn_from != -1) {
 		undo_redo->add_do_method(script.ptr(), "data_disconnect", func, conn_from, conn_port, p_id, p_port);
+	}
 
 	undo_redo->add_do_method(vsn.ptr(), "remove_input_data_port", p_port);
 	undo_redo->add_do_method(this, "_update_graph", p_id);
 
-	if (conn_from != -1)
+	if (conn_from != -1) {
 		undo_redo->add_undo_method(script.ptr(), "data_connect", func, conn_from, conn_port, p_id, p_port);
+	}
 
 	undo_redo->add_undo_method(vsn.ptr(), "add_input_data_port", vsn->get_input_value_port_info(p_port).type, vsn->get_input_value_port_info(p_port).name, p_port);
 	undo_redo->add_undo_method(this, "_update_graph", p_id);
@@ -1432,12 +1580,12 @@ void VisualScriptEditor::_remove_input_port(int p_id, int p_port) {
 }
 
 void VisualScriptEditor::_remove_output_port(int p_id, int p_port) {
-
 	StringName func = _get_function_of_node(p_id);
 
 	Ref<VisualScriptLists> vsn = script->get_node(func, p_id);
-	if (!vsn.is_valid())
+	if (!vsn.is_valid()) {
 		return;
+	}
 
 	updating_graph = true;
 
@@ -1446,12 +1594,13 @@ void VisualScriptEditor::_remove_output_port(int p_id, int p_port) {
 	List<VisualScript::DataConnection> data_connections;
 	script->get_data_connection_list(func, &data_connections);
 
-	HashMap<int, Set<int> > conn_map;
+	HashMap<int, Set<int>> conn_map;
 	for (const List<VisualScript::DataConnection>::Element *E = data_connections.front(); E; E = E->next()) {
 		if (E->get().from_node == p_id && E->get().from_port == p_port) {
 			// push into the connections map
-			if (!conn_map.has(E->get().to_node))
+			if (!conn_map.has(E->get().to_node)) {
 				conn_map.set(E->get().to_node, Set<int>());
+			}
 			conn_map[E->get().to_node].insert(E->get().to_port);
 		}
 	}
@@ -1476,12 +1625,12 @@ void VisualScriptEditor::_remove_output_port(int p_id, int p_port) {
 }
 
 void VisualScriptEditor::_expression_text_changed(const String &p_text, int p_id) {
-
 	StringName func = _get_function_of_node(p_id);
 
 	Ref<VisualScriptExpression> vse = script->get_node(func, p_id);
-	if (!vse.is_valid())
+	if (!vse.is_valid()) {
 		return;
+	}
 
 	updating_graph = true;
 
@@ -1493,15 +1642,17 @@ void VisualScriptEditor::_expression_text_changed(const String &p_text, int p_id
 	undo_redo->commit_action();
 
 	Node *node = graph->get_node(itos(p_id));
-	if (Object::cast_to<Control>(node))
+	if (Object::cast_to<Control>(node)) {
 		Object::cast_to<Control>(node)->set_size(Vector2(1, 1)); //shrink if text is smaller
+	}
 
 	updating_graph = false;
 }
 
 Vector2 VisualScriptEditor::_get_available_pos(bool centered, Vector2 ofs) const {
-	if (centered)
+	if (centered) {
 		ofs = graph->get_scroll_ofs() + graph->get_size() * 0.5;
+	}
 
 	if (graph->is_using_snap()) {
 		int snap = graph->get_snap();
@@ -1527,8 +1678,9 @@ Vector2 VisualScriptEditor::_get_available_pos(bool centered, Vector2 ofs) const
 				}
 			}
 		}
-		if (exists)
+		if (exists) {
 			continue;
+		}
 		break;
 	}
 
@@ -1536,12 +1688,10 @@ Vector2 VisualScriptEditor::_get_available_pos(bool centered, Vector2 ofs) const
 }
 
 String VisualScriptEditor::_validate_name(const String &p_name) const {
-
 	String valid = p_name;
 
 	int counter = 1;
 	while (true) {
-
 		bool exists = script->has_function(valid) || script->has_variable(valid) || script->has_custom_signal(valid);
 
 		if (exists) {
@@ -1557,7 +1707,6 @@ String VisualScriptEditor::_validate_name(const String &p_name) const {
 }
 
 void VisualScriptEditor::_on_nodes_delete() {
-
 	// delete all the selected nodes
 
 	List<int> to_erase;
@@ -1571,13 +1720,13 @@ void VisualScriptEditor::_on_nodes_delete() {
 		}
 	}
 
-	if (to_erase.empty())
+	if (to_erase.empty()) {
 		return;
+	}
 
 	undo_redo->create_action(TTR("Remove VisualScript Nodes"));
 
 	for (List<int>::Element *F = to_erase.front(); F; F = F->next()) {
-
 		int cr_node = F->get();
 
 		StringName func = _get_function_of_node(cr_node);
@@ -1589,7 +1738,6 @@ void VisualScriptEditor::_on_nodes_delete() {
 		script->get_sequence_connection_list(func, &sequence_conns);
 
 		for (List<VisualScript::SequenceConnection>::Element *E = sequence_conns.front(); E; E = E->next()) {
-
 			if (E->get().from_node == cr_node || E->get().to_node == cr_node) {
 				undo_redo->add_undo_method(script.ptr(), "sequence_connect", func, E->get().from_node, E->get().from_output, E->get().to_node);
 			}
@@ -1599,7 +1747,6 @@ void VisualScriptEditor::_on_nodes_delete() {
 		script->get_data_connection_list(func, &data_conns);
 
 		for (List<VisualScript::DataConnection>::Element *E = data_conns.front(); E; E = E->next()) {
-
 			if (E->get().from_node == F->get() || E->get().to_node == F->get()) {
 				undo_redo->add_undo_method(script.ptr(), "data_connect", func, E->get().from_node, E->get().from_port, E->get().to_node, E->get().to_port);
 			}
@@ -1612,7 +1759,6 @@ void VisualScriptEditor::_on_nodes_delete() {
 }
 
 void VisualScriptEditor::_on_nodes_duplicate() {
-
 	Set<int> to_duplicate;
 	List<StringName> funcs;
 
@@ -1627,8 +1773,9 @@ void VisualScriptEditor::_on_nodes_duplicate() {
 		}
 	}
 
-	if (to_duplicate.empty())
+	if (to_duplicate.empty()) {
 		return;
+	}
 
 	undo_redo->create_action(TTR("Duplicate VisualScript Nodes"));
 	int idc = script->get_available_id() + 1;
@@ -1637,7 +1784,6 @@ void VisualScriptEditor::_on_nodes_duplicate() {
 	HashMap<int, int> remap;
 
 	for (Set<int>::Element *F = to_duplicate.front(); F; F = F->next()) {
-
 		// duplicate from the specific function but place it into the default func as it would lack the connections
 		StringName func = _get_function_of_node(F->get());
 		Ref<VisualScriptNode> node = script->get_node(func, F->get());
@@ -1689,10 +1835,11 @@ void VisualScriptEditor::_on_nodes_duplicate() {
 }
 
 void VisualScriptEditor::_generic_search(String p_base_type, Vector2 pos, bool node_centered) {
-	if (node_centered)
+	if (node_centered) {
 		port_action_pos = graph->get_size() / 2.0f;
-	else
+	} else {
 		port_action_pos = graph->get_viewport()->get_mouse_position() - graph->get_global_position();
+	}
 
 	new_connect_node_select->select_from_visual_script(p_base_type, false, false); // neither connecting nor reset text
 
@@ -1701,8 +1848,9 @@ void VisualScriptEditor::_generic_search(String p_base_type, Vector2 pos, bool n
 	pos.x = pos.x > bounds.x ? bounds.x : pos.x;
 	pos.y = pos.y > bounds.y ? bounds.y : pos.y;
 
-	if (pos != Vector2())
+	if (pos != Vector2()) {
 		new_connect_node_select->set_position(pos);
+	}
 }
 
 void VisualScriptEditor::_input(const Ref<InputEvent> &p_event) {
@@ -1726,7 +1874,6 @@ void VisualScriptEditor::_graph_gui_input(const Ref<InputEvent> &p_event) {
 }
 
 void VisualScriptEditor::_members_gui_input(const Ref<InputEvent> &p_event) {
-
 	Ref<InputEventKey> key = p_event;
 	if (key.is_valid() && key->is_pressed() && !key->is_echo()) {
 		if (members->has_focus()) {
@@ -1756,21 +1903,19 @@ void VisualScriptEditor::_members_gui_input(const Ref<InputEvent> &p_event) {
 	Ref<InputEventMouseButton> btn = p_event;
 	if (btn.is_valid() && btn->is_doubleclick()) {
 		TreeItem *ti = members->get_selected();
-		if (ti && ti->get_parent() == members->get_root()->get_children()) // to check if it's a function
+		if (ti && ti->get_parent() == members->get_root()->get_children()) { // to check if it's a function
 			_center_on_node(ti->get_metadata(0), script->get_function_node_id(ti->get_metadata(0)));
+		}
 	}
 }
 
 void VisualScriptEditor::_rename_function(const String &name, const String &new_name) {
-
 	if (!new_name.is_valid_identifier()) {
-
 		EditorNode::get_singleton()->show_warning(TTR("Name is not a valid identifier:") + " " + new_name);
 		return;
 	}
 
 	if (script->has_function(new_name) || script->has_variable(new_name) || script->has_custom_signal(new_name)) {
-
 		EditorNode::get_singleton()->show_warning(TTR("Name already in use by another func/var/signal:") + " " + new_name);
 		return;
 	}
@@ -1796,8 +1941,9 @@ void VisualScriptEditor::_rename_function(const String &name, const String &new_
 		script->get_node_list(E->get(), &lst);
 		for (List<int>::Element *F = lst.front(); F; F = F->next()) {
 			Ref<VisualScriptFunctionCall> fncall = script->get_node(E->get(), F->get());
-			if (!fncall.is_valid())
+			if (!fncall.is_valid()) {
 				continue;
+			}
 			if (fncall->get_function() == name) {
 				undo_redo->add_do_method(fncall.ptr(), "set_function", new_name);
 				undo_redo->add_undo_method(fncall.ptr(), "set_function", name);
@@ -1815,12 +1961,12 @@ void VisualScriptEditor::_rename_function(const String &name, const String &new_
 }
 
 void VisualScriptEditor::_fn_name_box_input(const Ref<InputEvent> &p_event) {
-
-	if (!function_name_edit->is_visible())
+	if (!function_name_edit->is_visible()) {
 		return;
+	}
 
 	Ref<InputEventKey> key = p_event;
-	if (key.is_valid() && key->is_pressed() && key->get_scancode() == KEY_ENTER) {
+	if (key.is_valid() && key->is_pressed() && key->get_keycode() == KEY_ENTER) {
 		function_name_edit->hide();
 		_rename_function(selected, function_name_box->get_text());
 		function_name_box->clear();
@@ -1828,31 +1974,28 @@ void VisualScriptEditor::_fn_name_box_input(const Ref<InputEvent> &p_event) {
 }
 
 Variant VisualScriptEditor::get_drag_data_fw(const Point2 &p_point, Control *p_from) {
-
 	if (p_from == members) {
-
 		TreeItem *it = members->get_item_at_position(p_point);
-		if (!it)
+		if (!it) {
 			return Variant();
+		}
 
 		String type = it->get_metadata(0);
 
-		if (type == String())
+		if (type == String()) {
 			return Variant();
+		}
 
 		Dictionary dd;
 		TreeItem *root = members->get_root();
 
 		if (it->get_parent() == root->get_children()) {
-
 			dd["type"] = "visual_script_function_drag";
 			dd["function"] = type;
 		} else if (it->get_parent() == root->get_children()->get_next()) {
-
 			dd["type"] = "visual_script_variable_drag";
 			dd["variable"] = type;
 		} else if (it->get_parent() == root->get_children()->get_next()->get_next()) {
-
 			dd["type"] = "visual_script_signal_drag";
 			dd["signal"] = type;
 
@@ -1869,9 +2012,7 @@ Variant VisualScriptEditor::get_drag_data_fw(const Point2 &p_point, Control *p_f
 }
 
 bool VisualScriptEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const {
-
 	if (p_from == graph) {
-
 		Dictionary d = p_data;
 		if (d.has("type") &&
 				(String(d["type"]) == "visual_script_node_drag" ||
@@ -1882,9 +2023,7 @@ bool VisualScriptEditor::can_drop_data_fw(const Point2 &p_point, const Variant &
 						String(d["type"]) == "resource" ||
 						String(d["type"]) == "files" ||
 						String(d["type"]) == "nodes")) {
-
 			if (String(d["type"]) == "obj_property") {
-
 #ifdef OSX_ENABLED
 				const_cast<VisualScriptEditor *>(this)->_show_hint(vformat(TTR("Hold %s to drop a Getter. Hold Shift to drop a generic signature."), find_keycode_name(KEY_META)));
 #else
@@ -1893,7 +2032,6 @@ bool VisualScriptEditor::can_drop_data_fw(const Point2 &p_point, const Variant &
 			}
 
 			if (String(d["type"]) == "nodes") {
-
 #ifdef OSX_ENABLED
 				const_cast<VisualScriptEditor *>(this)->_show_hint(vformat(TTR("Hold %s to drop a simple reference to the node."), find_keycode_name(KEY_META)));
 #else
@@ -1902,7 +2040,6 @@ bool VisualScriptEditor::can_drop_data_fw(const Point2 &p_point, const Variant &
 			}
 
 			if (String(d["type"]) == "visual_script_variable_drag") {
-
 #ifdef OSX_ENABLED
 				const_cast<VisualScriptEditor *>(this)->_show_hint(vformat(TTR("Hold %s to drop a Variable Setter."), find_keycode_name(KEY_META)));
 #else
@@ -1918,26 +2055,27 @@ bool VisualScriptEditor::can_drop_data_fw(const Point2 &p_point, const Variant &
 }
 
 static Node *_find_script_node(Node *p_edited_scene, Node *p_current_node, const Ref<Script> &script) {
-
-	if (p_edited_scene != p_current_node && p_current_node->get_owner() != p_edited_scene)
-		return NULL;
+	if (p_edited_scene != p_current_node && p_current_node->get_owner() != p_edited_scene) {
+		return nullptr;
+	}
 
 	Ref<Script> scr = p_current_node->get_script();
 
-	if (scr.is_valid() && scr == script)
+	if (scr.is_valid() && scr == script) {
 		return p_current_node;
+	}
 
 	for (int i = 0; i < p_current_node->get_child_count(); i++) {
 		Node *n = _find_script_node(p_edited_scene, p_current_node->get_child(i), script);
-		if (n)
+		if (n) {
 			return n;
+		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) {
-
 	if (p_from != graph) {
 		return;
 	}
@@ -1972,7 +2110,6 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
 	}
 
 	if (String(d["type"]) == "visual_script_variable_drag") {
-
 #ifdef OSX_ENABLED
 		bool use_set = Input::get_singleton()->is_key_pressed(KEY_META);
 #else
@@ -1993,7 +2130,6 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
 			vnodes->set_variable(d["variable"]);
 			vnode = vnodes;
 		} else {
-
 			Ref<VisualScriptVariableGet> vnodeg;
 			vnodeg.instance();
 			vnodeg->set_variable(d["variable"]);
@@ -2017,7 +2153,6 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
 	}
 
 	if (String(d["type"]) == "visual_script_function_drag") {
-
 		Vector2 ofs = graph->get_scroll_ofs() + p_point;
 		if (graph->is_using_snap()) {
 			int snap = graph->get_snap();
@@ -2050,7 +2185,6 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
 	}
 
 	if (String(d["type"]) == "visual_script_signal_drag") {
-
 		Vector2 ofs = graph->get_scroll_ofs() + p_point;
 		if (graph->is_using_snap()) {
 			int snap = graph->get_snap();
@@ -2080,7 +2214,6 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
 	}
 
 	if (String(d["type"]) == "resource") {
-
 		Vector2 ofs = graph->get_scroll_ofs() + p_point;
 		if (graph->is_using_snap()) {
 			int snap = graph->get_snap();
@@ -2110,7 +2243,6 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
 	}
 
 	if (String(d["type"]) == "files") {
-
 		Vector2 ofs = graph->get_scroll_ofs() + p_point;
 		if (graph->is_using_snap()) {
 			int snap = graph->get_snap();
@@ -2128,10 +2260,10 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
 			undo_redo->create_action(TTR("Add Preload Node"));
 
 			for (int i = 0; i < files.size(); i++) {
-
 				Ref<Resource> res = ResourceLoader::load(files[i]);
-				if (!res.is_valid())
+				if (!res.is_valid()) {
 					continue;
+				}
 
 				Ref<VisualScriptPreload> prnode;
 				prnode.instance();
@@ -2150,7 +2282,6 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
 		}
 
 		for (List<int>::Element *E = new_ids.front(); E; E = E->next()) {
-
 			Node *node = graph->get_node(itos(E->get()));
 			if (node) {
 				graph->set_selected(node);
@@ -2160,7 +2291,6 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
 	}
 
 	if (String(d["type"]) == "nodes") {
-
 		Node *sn = _find_script_node(get_tree()->get_edited_scene_root(), get_tree()->get_edited_scene_root(), script);
 
 		if (!sn) {
@@ -2192,7 +2322,6 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
 		}
 
 		for (int i = 0; i < nodes.size(); i++) {
-
 			NodePath np = nodes[i];
 			Node *node = get_node(np);
 			if (!node) {
@@ -2230,7 +2359,6 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
 	}
 
 	if (String(d["type"]) == "obj_property") {
-
 		Node *sn = _find_script_node(get_tree()->get_edited_scene_root(), get_tree()->get_edited_scene_root(), script);
 
 		if (!sn && !Input::get_singleton()->is_key_pressed(KEY_SHIFT)) {
@@ -2240,8 +2368,9 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
 
 		Object *obj = d["object"];
 
-		if (!obj)
+		if (!obj) {
 			return;
+		}
 
 		Node *node = Object::cast_to<Node>(obj);
 		Vector2 ofs = graph->get_scroll_ofs() + p_point;
@@ -2259,18 +2388,17 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
 #endif
 
 		if (!node || Input::get_singleton()->is_key_pressed(KEY_SHIFT)) {
-
-			if (use_get)
+			if (use_get) {
 				undo_redo->create_action(TTR("Add Getter Property"));
-			else
+			} else {
 				undo_redo->create_action(TTR("Add Setter Property"));
+			}
 
 			int base_id = script->get_available_id();
 
 			Ref<VisualScriptNode> vnode;
 
 			if (!use_get) {
-
 				Ref<VisualScriptPropertySet> pset;
 				pset.instance();
 				pset->set_call_mode(VisualScriptPropertySet::CALL_MODE_INSTANCE);
@@ -2281,7 +2409,6 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
 					}*/
 				vnode = pset;
 			} else {
-
 				Ref<VisualScriptPropertyGet> pget;
 				pget.instance();
 				pget->set_call_mode(VisualScriptPropertyGet::CALL_MODE_INSTANCE);
@@ -2303,18 +2430,17 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
 			undo_redo->commit_action();
 
 		} else {
-
-			if (use_get)
+			if (use_get) {
 				undo_redo->create_action(TTR("Add Getter Property"));
-			else
+			} else {
 				undo_redo->create_action(TTR("Add Setter Property"));
+			}
 
 			int base_id = script->get_available_id();
 
 			Ref<VisualScriptNode> vnode;
 
 			if (!use_get) {
-
 				Ref<VisualScriptPropertySet> pset;
 				pset.instance();
 				if (sn == node) {
@@ -2326,7 +2452,6 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
 
 				vnode = pset;
 			} else {
-
 				Ref<VisualScriptPropertyGet> pget;
 				pget.instance();
 				if (sn == node) {
@@ -2352,33 +2477,33 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
 }
 
 void VisualScriptEditor::_selected_method(const String &p_method, const String &p_type, const bool p_connecting) {
-
 	Ref<VisualScriptFunctionCall> vsfc = script->get_node(default_func, selecting_method_id);
-	if (!vsfc.is_valid())
+	if (!vsfc.is_valid()) {
 		return;
+	}
 	vsfc->set_function(p_method);
 }
 
 void VisualScriptEditor::_draw_color_over_button(Object *obj, Color p_color) {
-
 	Button *button = Object::cast_to<Button>(obj);
-	if (!button)
+	if (!button) {
 		return;
+	}
 
-	Ref<StyleBox> normal = get_stylebox("normal", "Button");
+	Ref<StyleBox> normal = get_theme_stylebox("normal", "Button");
 	button->draw_rect(Rect2(normal->get_offset(), button->get_size() - normal->get_minimum_size()), p_color);
 }
 
-void VisualScriptEditor::_button_resource_previewed(const String &p_path, const Ref<Texture> &p_preview, const Ref<Texture> &p_small_preview, Variant p_ud) {
-
+void VisualScriptEditor::_button_resource_previewed(const String &p_path, const Ref<Texture2D> &p_preview, const Ref<Texture2D> &p_small_preview, Variant p_ud) {
 	Array ud = p_ud;
 	ERR_FAIL_COND(ud.size() != 2);
 
 	ObjectID id = ud[0];
 	Object *obj = ObjectDB::get_instance(id);
 
-	if (!obj)
+	if (!obj) {
 		return;
+	}
 
 	Button *b = Object::cast_to<Button>(obj);
 	ERR_FAIL_COND(!b);
@@ -2386,7 +2511,6 @@ void VisualScriptEditor::_button_resource_previewed(const String &p_path, const
 	if (p_preview.is_null()) {
 		b->set_text(ud[1]);
 	} else {
-
 		b->set_icon(p_preview);
 	}
 }
@@ -2401,14 +2525,15 @@ RES VisualScriptEditor::get_edited_resource() const {
 }
 
 void VisualScriptEditor::set_edited_resource(const RES &p_res) {
-
+	ERR_FAIL_COND(script.is_valid());
+	ERR_FAIL_COND(p_res.is_null());
 	script = p_res;
 	signal_editor->script = script;
 	signal_editor->undo_redo = undo_redo;
 	variable_editor->script = script;
 	variable_editor->undo_redo = undo_redo;
 
-	script->connect("node_ports_changed", this, "_node_ports_changed");
+	script->connect("node_ports_changed", callable_mp(this, &VisualScriptEditor::_node_ports_changed));
 
 	default_func = script->get_default_func();
 
@@ -2422,8 +2547,10 @@ void VisualScriptEditor::set_edited_resource(const RES &p_res) {
 	_update_members();
 }
 
-Vector<String> VisualScriptEditor::get_functions() {
+void VisualScriptEditor::enable_editor() {
+}
 
+Vector<String> VisualScriptEditor::get_functions() {
 	return Vector<String>();
 }
 
@@ -2431,34 +2558,38 @@ void VisualScriptEditor::reload_text() {
 }
 
 String VisualScriptEditor::get_name() {
-
 	String name;
 
 	if (script->get_path().find("local://") == -1 && script->get_path().find("::") == -1) {
 		name = script->get_path().get_file();
 		if (is_unsaved()) {
+			if (script->get_path().empty()) {
+				name = TTR("[unsaved]");
+			}
 			name += "(*)";
 		}
-	} else if (script->get_name() != "")
+	} else if (script->get_name() != "") {
 		name = script->get_name();
-	else
+	} else {
 		name = script->get_class() + "(" + itos(script->get_instance_id()) + ")";
+	}
 
 	return name;
 }
 
-Ref<Texture> VisualScriptEditor::get_icon() {
-
-	return Control::get_icon("VisualScript", "EditorIcons");
+Ref<Texture2D> VisualScriptEditor::get_theme_icon() {
+	return Control::get_theme_icon("VisualScript", "EditorIcons");
 }
 
 bool VisualScriptEditor::is_unsaved() {
-
-	return script->is_edited() || script->are_subnodes_edited();
+	bool unsaved =
+			script->is_edited() ||
+			script->are_subnodes_edited() ||
+			script->get_path().empty(); // In memory.
+	return unsaved;
 }
 
 Variant VisualScriptEditor::get_edit_state() {
-
 	Dictionary d;
 	d["function"] = default_func;
 	d["scroll"] = graph->get_scroll_ofs();
@@ -2469,7 +2600,6 @@ Variant VisualScriptEditor::get_edit_state() {
 }
 
 void VisualScriptEditor::set_edit_state(const Variant &p_state) {
-
 	Dictionary d = p_state;
 	if (d.has("function")) {
 		selected = default_func;
@@ -2493,15 +2623,15 @@ void VisualScriptEditor::set_edit_state(const Variant &p_state) {
 }
 
 void VisualScriptEditor::_center_on_node(const StringName &p_func, int p_id) {
-
 	Node *n = graph->get_node(itos(p_id));
 	GraphNode *gn = Object::cast_to<GraphNode>(n);
 
 	// clear selection
 	for (int i = 0; i < graph->get_child_count(); i++) {
 		GraphNode *gnd = Object::cast_to<GraphNode>(graph->get_child(i));
-		if (gnd)
+		if (gnd) {
 			gnd->set_selected(false);
+		}
 	}
 
 	if (gn) {
@@ -2514,18 +2644,16 @@ void VisualScriptEditor::_center_on_node(const StringName &p_func, int p_id) {
 }
 
 void VisualScriptEditor::goto_line(int p_line, bool p_with_error) {
-
 	p_line += 1; //add one because script lines begin from 0.
 
-	if (p_with_error)
+	if (p_with_error) {
 		error_line = p_line;
+	}
 
 	List<StringName> functions;
 	script->get_function_list(&functions);
 	for (List<StringName>::Element *E = functions.front(); E; E = E->next()) {
-
 		if (script->has_node(E->get(), p_line)) {
-
 			_update_graph();
 			_update_members();
 
@@ -2556,7 +2684,6 @@ void VisualScriptEditor::convert_indent_to_tabs() {
 }
 
 void VisualScriptEditor::ensure_focus() {
-
 	graph->grab_focus();
 }
 
@@ -2567,26 +2694,24 @@ void VisualScriptEditor::reload(bool p_soft) {
 	_update_graph();
 }
 
-void VisualScriptEditor::get_breakpoints(List<int> *p_breakpoints) {
-
+Array VisualScriptEditor::get_breakpoints() {
+	Array breakpoints;
 	List<StringName> functions;
 	script->get_function_list(&functions);
 	for (List<StringName>::Element *E = functions.front(); E; E = E->next()) {
-
 		List<int> nodes;
 		script->get_node_list(E->get(), &nodes);
 		for (List<int>::Element *F = nodes.front(); F; F = F->next()) {
-
 			Ref<VisualScriptNode> vsn = script->get_node(E->get(), F->get());
 			if (vsn->is_breakpoint()) {
-				p_breakpoints->push_back(F->get() - 1); //subtract 1 because breakpoints in text start from zero
+				breakpoints.push_back(F->get() - 1); //subtract 1 because breakpoints in text start from zero
 			}
 		}
 	}
+	return breakpoints;
 }
 
-void VisualScriptEditor::add_callback(const String &p_function, PoolStringArray p_args) {
-
+void VisualScriptEditor::add_callback(const String &p_function, PackedStringArray p_args) {
 	if (script->has_function(p_function)) {
 		_update_members();
 		_update_graph();
@@ -2597,7 +2722,6 @@ void VisualScriptEditor::add_callback(const String &p_function, PoolStringArray
 	Ref<VisualScriptFunction> func;
 	func.instance();
 	for (int i = 0; i < p_args.size(); i++) {
-
 		String name = p_args[i];
 		Variant::Type type = Variant::NIL;
 
@@ -2605,7 +2729,6 @@ void VisualScriptEditor::add_callback(const String &p_function, PoolStringArray
 			String tt = name.get_slice(":", 1);
 			name = name.get_slice(":", 0);
 			for (int j = 0; j < Variant::VARIANT_MAX; j++) {
-
 				String tname = Variant::get_type_name(Variant::Type(j));
 				if (tname == tt) {
 					type = Variant::Type(j);
@@ -2632,7 +2755,6 @@ bool VisualScriptEditor::show_members_overview() {
 }
 
 void VisualScriptEditor::update_settings() {
-
 	_update_graph();
 }
 
@@ -2647,12 +2769,10 @@ void VisualScriptEditor::set_tooltip_request_func(String p_method, Object *p_obj
 }
 
 Control *VisualScriptEditor::get_edit_menu() {
-
 	return edit_menu;
 }
 
 void VisualScriptEditor::_change_base_type() {
-
 	select_base_type->popup_create(true, true);
 }
 
@@ -2666,7 +2786,6 @@ void VisualScriptEditor::clear_edit_menu() {
 }
 
 void VisualScriptEditor::_change_base_type_callback() {
-
 	String bt = select_base_type->get_selected_type();
 
 	ERR_FAIL_COND(bt == String());
@@ -2679,16 +2798,15 @@ void VisualScriptEditor::_change_base_type_callback() {
 }
 
 void VisualScriptEditor::_node_selected(Node *p_node) {
-
 	Ref<VisualScriptNode> vnode = p_node->get_meta("__vnode");
-	if (vnode.is_null())
+	if (vnode.is_null()) {
 		return;
+	}
 
 	EditorNode::get_singleton()->push_item(vnode.ptr()); //edit node in inspector
 }
 
 static bool _get_out_slot(const Ref<VisualScriptNode> &p_node, int p_slot, int &r_real_slot, bool &r_sequence) {
-
 	if (p_slot < p_node->get_output_sequence_port_count()) {
 		r_sequence = true;
 		r_real_slot = p_slot;
@@ -2703,7 +2821,6 @@ static bool _get_out_slot(const Ref<VisualScriptNode> &p_node, int p_slot, int &
 }
 
 static bool _get_in_slot(const Ref<VisualScriptNode> &p_node, int p_slot, int &r_real_slot, bool &r_sequence) {
-
 	if (p_slot == 0 && p_node->has_input_sequence_port()) {
 		r_sequence = true;
 		r_real_slot = 0;
@@ -2717,30 +2834,28 @@ static bool _get_in_slot(const Ref<VisualScriptNode> &p_node, int p_slot, int &r
 }
 
 void VisualScriptEditor::_begin_node_move() {
-
 	undo_redo->create_action(TTR("Move Node(s)"));
 }
 
 void VisualScriptEditor::_end_node_move() {
-
 	undo_redo->commit_action();
 }
 
 void VisualScriptEditor::_move_node(const StringName &p_func, int p_id, const Vector2 &p_to) {
-
-	if (!script->has_function(p_func))
+	if (!script->has_function(p_func)) {
 		return;
+	}
 
 	Node *node = graph->get_node(itos(p_id));
 
-	if (Object::cast_to<GraphNode>(node))
+	if (Object::cast_to<GraphNode>(node)) {
 		Object::cast_to<GraphNode>(node)->set_offset(p_to);
+	}
 
 	script->set_node_position(p_func, p_id, p_to / EDSCALE);
 }
 
 StringName VisualScriptEditor::_get_function_of_node(int p_id) const {
-
 	List<StringName> funcs;
 	script->get_function_list(&funcs);
 	for (List<StringName>::Element *E = funcs.front(); E; E = E->next()) {
@@ -2753,7 +2868,6 @@ StringName VisualScriptEditor::_get_function_of_node(int p_id) const {
 }
 
 void VisualScriptEditor::_node_moved(Vector2 p_from, Vector2 p_to, int p_id) {
-
 	StringName func = _get_function_of_node(p_id);
 
 	undo_redo->add_do_method(this, "_move_node", func, p_id, p_to);
@@ -2761,7 +2875,6 @@ void VisualScriptEditor::_node_moved(Vector2 p_from, Vector2 p_to, int p_id) {
 }
 
 void VisualScriptEditor::_remove_node(int p_id) {
-
 	undo_redo->create_action(TTR("Remove VisualScript Node"));
 
 	StringName func = _get_function_of_node(p_id);
@@ -2773,7 +2886,6 @@ void VisualScriptEditor::_remove_node(int p_id) {
 	script->get_sequence_connection_list(func, &sequence_conns);
 
 	for (List<VisualScript::SequenceConnection>::Element *E = sequence_conns.front(); E; E = E->next()) {
-
 		if (E->get().from_node == p_id || E->get().to_node == p_id) {
 			undo_redo->add_undo_method(script.ptr(), "sequence_connect", func, E->get().from_node, E->get().from_output, E->get().to_node);
 		}
@@ -2783,7 +2895,6 @@ void VisualScriptEditor::_remove_node(int p_id) {
 	script->get_data_connection_list(func, &data_conns);
 
 	for (List<VisualScript::DataConnection>::Element *E = data_conns.front(); E; E = E->next()) {
-
 		if (E->get().from_node == p_id || E->get().to_node == p_id) {
 			undo_redo->add_undo_method(script.ptr(), "data_connect", func, E->get().from_node, E->get().from_port, E->get().to_node, E->get().to_port);
 		}
@@ -2796,7 +2907,6 @@ void VisualScriptEditor::_remove_node(int p_id) {
 }
 
 void VisualScriptEditor::_node_ports_changed(const String &p_func, int p_id) {
-
 	_update_graph(p_id);
 }
 
@@ -2808,15 +2918,15 @@ bool VisualScriptEditor::node_has_sequence_connections(const StringName &p_func,
 		int from = E->get().from_node;
 		int to = E->get().to_node;
 
-		if (to == p_id || from == p_id)
+		if (to == p_id || from == p_id) {
 			return true;
+		}
 	}
 
 	return false;
 }
 
 void VisualScriptEditor::_graph_connected(const String &p_from, int p_from_slot, const String &p_to, int p_to_slot) {
-
 	StringName from_func = _get_function_of_node(p_from.to_int());
 
 	Ref<VisualScriptNode> from_node = script->get_node(from_func, p_from.to_int());
@@ -2825,8 +2935,9 @@ void VisualScriptEditor::_graph_connected(const String &p_from, int p_from_slot,
 	bool from_seq;
 	int from_port;
 
-	if (!_get_out_slot(from_node, p_from_slot, from_port, from_seq))
+	if (!_get_out_slot(from_node, p_from_slot, from_port, from_seq)) {
 		return; //can't connect this, it's invalid
+	}
 
 	StringName to_func = _get_function_of_node(p_to.to_int());
 
@@ -2836,8 +2947,9 @@ void VisualScriptEditor::_graph_connected(const String &p_from, int p_from_slot,
 	bool to_seq;
 	int to_port;
 
-	if (!_get_in_slot(to_node, p_to_slot, to_port, to_seq))
+	if (!_get_in_slot(to_node, p_to_slot, to_port, to_seq)) {
 		return; //can't connect this, it's invalid
+	}
 
 	ERR_FAIL_COND(from_seq != to_seq);
 
@@ -2910,8 +3022,8 @@ void VisualScriptEditor::_graph_connected(const String &p_from, int p_from_slot,
 		if (to_type != Variant::NIL && from_type != Variant::NIL && to_type != from_type) {
 			// add a constructor node between the ports
 			bool exceptions = false; // true if there are any exceptions
-			exceptions = exceptions || (to_type == Variant::INT && from_type == Variant::REAL);
-			exceptions = exceptions || (to_type == Variant::REAL && from_type == Variant::INT);
+			exceptions = exceptions || (to_type == Variant::INT && from_type == Variant::FLOAT);
+			exceptions = exceptions || (to_type == Variant::FLOAT && from_type == Variant::INT);
 			if (Variant::can_convert(from_type, to_type) && !exceptions) {
 				MethodInfo mi;
 				mi.name = Variant::get_type_name(to_type);
@@ -2938,19 +3050,21 @@ void VisualScriptEditor::_graph_connected(const String &p_from, int p_from_slot,
 					Vector2 constructor_pos;
 					if ((to_node_pos.x - from_node_pos.x) < 0) {
 						// to is behind from node
-						if (to_node_pos.x > (from_node_pos.x - to_node_size.x - 240))
+						if (to_node_pos.x > (from_node_pos.x - to_node_size.x - 240)) {
 							new_to_node_pos.x = from_node_pos.x - to_node_size.x - 240; // approx size of constructor node + padding
-						else
+						} else {
 							new_to_node_pos.x = to_node_pos.x;
+						}
 						new_to_node_pos.y = to_node_pos.y;
 						constructor_pos.x = from_node_pos.x - 210;
 						constructor_pos.y = to_node_pos.y;
 					} else {
 						// to is ahead of from node
-						if (to_node_pos.x < (from_node_size.x + from_node_pos.x + 240))
+						if (to_node_pos.x < (from_node_size.x + from_node_pos.x + 240)) {
 							new_to_node_pos.x = from_node_size.x + from_node_pos.x + 240; // approx size of constructor node + padding
-						else
+						} else {
 							new_to_node_pos.x = to_node_pos.x;
+						}
 						new_to_node_pos.y = to_node_pos.y;
 						constructor_pos.x = from_node_size.x + from_node_pos.x + 10;
 						constructor_pos.y = to_node_pos.y;
@@ -3014,7 +3128,6 @@ void VisualScriptEditor::_graph_connected(const String &p_from, int p_from_slot,
 }
 
 void VisualScriptEditor::_graph_disconnected(const String &p_from, int p_from_slot, const String &p_to, int p_to_slot) {
-
 	StringName func = _get_function_of_node(p_from.to_int());
 	ERR_FAIL_COND(func != _get_function_of_node(p_to.to_int()));
 
@@ -3024,8 +3137,9 @@ void VisualScriptEditor::_graph_disconnected(const String &p_from, int p_from_sl
 	bool from_seq;
 	int from_port;
 
-	if (!_get_out_slot(from_node, p_from_slot, from_port, from_seq))
+	if (!_get_out_slot(from_node, p_from_slot, from_port, from_seq)) {
 		return; //can't connect this, it's invalid
+	}
 
 	Ref<VisualScriptNode> to_node = script->get_node(func, p_to.to_int());
 	ERR_FAIL_COND(!to_node.is_valid());
@@ -3033,8 +3147,9 @@ void VisualScriptEditor::_graph_disconnected(const String &p_from, int p_from_sl
 	bool to_seq;
 	int to_port;
 
-	if (!_get_in_slot(to_node, p_to_slot, to_port, to_seq))
+	if (!_get_in_slot(to_node, p_to_slot, to_port, to_seq)) {
 		return; //can't connect this, it's invalid
+	}
 
 	ERR_FAIL_COND(from_seq != to_seq);
 
@@ -3044,7 +3159,6 @@ void VisualScriptEditor::_graph_disconnected(const String &p_from, int p_from_sl
 		undo_redo->add_do_method(script.ptr(), "sequence_disconnect", func, p_from.to_int(), from_port, p_to.to_int());
 		undo_redo->add_undo_method(script.ptr(), "sequence_connect", func, p_from.to_int(), from_port, p_to.to_int());
 	} else {
-
 		can_swap = true;
 		data_disconnect_node = p_to.to_int();
 		data_disconnect_port = to_port;
@@ -3064,10 +3178,9 @@ void VisualScriptEditor::_graph_disconnected(const String &p_from, int p_from_sl
 }
 
 void VisualScriptEditor::_move_nodes_with_rescan(const StringName &p_func_from, const StringName &p_func_to, int p_id) {
-
 	Set<int> nodes_to_move;
-	HashMap<int, Map<int, int> > seqconns_to_move; // from => List(outp, to)
-	HashMap<int, Map<int, Pair<int, int> > > dataconns_to_move; // to => List(inp_p => from, outp)
+	HashMap<int, Map<int, int>> seqconns_to_move; // from => List(outp, to)
+	HashMap<int, Map<int, Pair<int, int>>> dataconns_to_move; // to => List(inp_p => from, outp)
 
 	nodes_to_move.insert(p_id);
 	Set<int> sequence_connections;
@@ -3075,14 +3188,15 @@ void VisualScriptEditor::_move_nodes_with_rescan(const StringName &p_func_from,
 		List<VisualScript::SequenceConnection> sequence_conns;
 		script->get_sequence_connection_list(p_func_from, &sequence_conns);
 
-		HashMap<int, Map<int, int> > seqcons; // from => List(out_p => to)
+		HashMap<int, Map<int, int>> seqcons; // from => List(out_p => to)
 
 		for (List<VisualScript::SequenceConnection>::Element *E = sequence_conns.front(); E; E = E->next()) {
 			int from = E->get().from_node;
 			int to = E->get().to_node;
 			int out_p = E->get().from_output;
-			if (!seqcons.has(from))
+			if (!seqcons.has(from)) {
 				seqcons.set(from, Map<int, int>());
+			}
 			seqcons[from].insert(out_p, to);
 			sequence_connections.insert(to);
 			sequence_connections.insert(from);
@@ -3090,7 +3204,7 @@ void VisualScriptEditor::_move_nodes_with_rescan(const StringName &p_func_from,
 
 		int conn = p_id;
 		List<int> stack;
-		HashMap<int, Set<int> > seen; // from, outp
+		HashMap<int, Set<int>> seen; // from, outp
 		while (seqcons.has(conn)) {
 			for (auto E = seqcons[conn].front(); E; E = E->next()) {
 				if (seen.has(conn) && seen[conn].has(E->key())) {
@@ -3105,12 +3219,14 @@ void VisualScriptEditor::_move_nodes_with_rescan(const StringName &p_func_from,
 					}
 					continue;
 				}
-				if (!seen.has(conn))
+				if (!seen.has(conn)) {
 					seen.set(conn, Set<int>());
+				}
 				seen[conn].insert(E->key());
 				stack.push_back(conn);
-				if (!seqconns_to_move.has(conn))
+				if (!seqconns_to_move.has(conn)) {
 					seqconns_to_move.set(conn, Map<int, int>());
+				}
 				seqconns_to_move[conn].insert(E->key(), E->get());
 				conn = E->get();
 				nodes_to_move.insert(conn);
@@ -3126,8 +3242,9 @@ void VisualScriptEditor::_move_nodes_with_rescan(const StringName &p_func_from,
 	{
 		List<VisualScript::DataConnection> data_connections;
 		script->get_data_connection_list(p_func_from, &data_connections);
+		int func_from_node_id = script->get_function_node_id(p_func_from);
 
-		HashMap<int, Map<int, Pair<int, int> > > connections;
+		HashMap<int, Map<int, Pair<int, int>>> connections;
 
 		for (List<VisualScript::DataConnection>::Element *E = data_connections.front(); E; E = E->next()) {
 			int from = E->get().from_node;
@@ -3135,15 +3252,21 @@ void VisualScriptEditor::_move_nodes_with_rescan(const StringName &p_func_from,
 			int out_p = E->get().from_port;
 			int in_p = E->get().to_port;
 
-			if (!connections.has(to))
-				connections.set(to, Map<int, Pair<int, int> >());
+			// skip if the from_node is a function node
+			if (from == func_from_node_id) {
+				continue;
+			}
+
+			if (!connections.has(to)) {
+				connections.set(to, Map<int, Pair<int, int>>());
+			}
 			connections[to].insert(in_p, Pair<int, int>(from, out_p));
 		}
 
 		// go through the HashMap and do all sorts of crazy ass stuff now...
 		Set<int> nodes_to_be_added;
 		for (Set<int>::Element *F = nodes_to_move.front(); F; F = F->next()) {
-			HashMap<int, Set<int> > seen;
+			HashMap<int, Set<int>> seen;
 			List<int> stack;
 			int id = F->get();
 			while (connections.has(id)) {
@@ -3173,12 +3296,14 @@ void VisualScriptEditor::_move_nodes_with_rescan(const StringName &p_func_from,
 						}
 					}
 
-					if (!seen.has(id))
+					if (!seen.has(id)) {
 						seen.set(id, Set<int>());
+					}
 					seen[id].insert(E->key());
 					stack.push_back(id);
-					if (!dataconns_to_move.has(id))
-						dataconns_to_move.set(id, Map<int, Pair<int, int> >());
+					if (!dataconns_to_move.has(id)) {
+						dataconns_to_move.set(id, Map<int, Pair<int, int>>());
+					}
 					dataconns_to_move[id].insert(E->key(), Pair<int, int>(E->get().first, E->get().second));
 					id = E->get().first;
 					nodes_to_be_added.insert(id);
@@ -3249,7 +3374,7 @@ void VisualScriptEditor::_move_nodes_with_rescan(const StringName &p_func_from,
 	dataconns_to_move.get_key_list(&keys);
 	for (List<int>::Element *E = keys.front(); E; E = E->next()) {
 		int to_node = E->get(); // to_node
-		for (Map<int, Pair<int, int> >::Element *F = dataconns_to_move[E->get()].front(); F; F = F->next()) {
+		for (Map<int, Pair<int, int>>::Element *F = dataconns_to_move[E->get()].front(); F; F = F->next()) {
 			int inp_p = F->key();
 			Pair<int, int> fro = F->get();
 
@@ -3274,22 +3399,22 @@ void VisualScriptEditor::_move_nodes_with_rescan(const StringName &p_func_from,
 }
 
 void VisualScriptEditor::_graph_connect_to_empty(const String &p_from, int p_from_slot, const Vector2 &p_release_pos) {
-
 	Node *node = graph->get_node(p_from);
 	GraphNode *gn = Object::cast_to<GraphNode>(node);
-	if (!gn)
+	if (!gn) {
 		return;
+	}
 
 	StringName func = _get_function_of_node(p_from.to_int());
 
 	Ref<VisualScriptNode> vsn = script->get_node(func, p_from.to_int());
-	if (!vsn.is_valid())
+	if (!vsn.is_valid()) {
 		return;
+	}
 
 	port_action_pos = p_release_pos;
 
 	if (p_from_slot < vsn->get_output_sequence_port_count()) {
-
 		port_action_node = p_from.to_int();
 		port_action_output = p_from_slot;
 		_port_action_menu(CREATE_ACTION, func);
@@ -3301,12 +3426,12 @@ void VisualScriptEditor::_graph_connect_to_empty(const String &p_from, int p_fro
 }
 
 VisualScriptNode::TypeGuess VisualScriptEditor::_guess_output_type(int p_port_action_node, int p_port_action_output, Set<int> &visited_nodes) {
-
 	VisualScriptNode::TypeGuess tg;
 	tg.type = Variant::NIL;
 
-	if (visited_nodes.has(p_port_action_node))
+	if (visited_nodes.has(p_port_action_node)) {
 		return tg; //no loop
+	}
 
 	visited_nodes.insert(p_port_action_node);
 
@@ -3315,7 +3440,6 @@ VisualScriptNode::TypeGuess VisualScriptEditor::_guess_output_type(int p_port_ac
 	Ref<VisualScriptNode> node = script->get_node(func, p_port_action_node);
 
 	if (!node.is_valid()) {
-
 		return tg;
 	}
 
@@ -3332,16 +3456,13 @@ VisualScriptNode::TypeGuess VisualScriptEditor::_guess_output_type(int p_port_ac
 			int from_port;
 
 			if (script->get_input_value_port_connection_source(func, p_port_action_node, i, &from_node, &from_port)) {
-
 				g = _guess_output_type(from_node, from_port, visited_nodes);
 			} else {
 				Variant defval = node->get_default_input_value(i);
 				if (defval.get_type() == Variant::OBJECT) {
-
 					Object *obj = defval;
 
 					if (obj) {
-
 						g.type = Variant::OBJECT;
 						g.gdclass = obj->get_class();
 						g.script = obj->get_script();
@@ -3357,7 +3478,6 @@ VisualScriptNode::TypeGuess VisualScriptEditor::_guess_output_type(int p_port_ac
 }
 
 void VisualScriptEditor::_port_action_menu(int p_option, const StringName &func) {
-
 	Vector2 ofs = graph->get_scroll_ofs() + port_action_pos;
 	if (graph->is_using_snap()) {
 		int snap = graph->get_snap();
@@ -3368,7 +3488,6 @@ void VisualScriptEditor::_port_action_menu(int p_option, const StringName &func)
 	Set<int> vn;
 
 	switch (p_option) {
-
 		case CREATE_CALL_SET_GET: {
 			Ref<VisualScriptFunctionCall> n;
 			n.instance();
@@ -3432,10 +3551,9 @@ void VisualScriptEditor::_port_action_menu(int p_option, const StringName &func)
 }
 
 void VisualScriptEditor::connect_data(Ref<VisualScriptNode> vnode_old, Ref<VisualScriptNode> vnode, int new_id) {
-
 	undo_redo->create_action(TTR("Connect Node Data"));
 	VisualScriptReturn *vnode_return = Object::cast_to<VisualScriptReturn>(vnode.ptr());
-	if (vnode_return != NULL && vnode_old->get_output_value_port_count() > 0) {
+	if (vnode_return != nullptr && vnode_old->get_output_value_port_count() > 0) {
 		vnode_return->set_enable_return_value(true);
 	}
 	if (vnode_old->get_output_value_port_count() <= 0) {
@@ -3458,7 +3576,6 @@ void VisualScriptEditor::connect_data(Ref<VisualScriptNode> vnode_old, Ref<Visua
 }
 
 void VisualScriptEditor::_selected_connect_node(const String &p_text, const String &p_category, const bool p_connecting) {
-
 	Vector2 ofs = graph->get_scroll_ofs() + port_action_pos;
 	if (graph->is_using_snap()) {
 		int snap = graph->get_snap();
@@ -3480,8 +3597,9 @@ void VisualScriptEditor::_selected_connect_node(const String &p_text, const Stri
 	if (p_category == "visualscript") {
 		Ref<VisualScriptNode> vnode_new = VisualScriptLanguage::singleton->create_node_from_name(p_text);
 		Ref<VisualScriptNode> vnode_old;
-		if (port_node_exists)
+		if (port_node_exists) {
 			vnode_old = script->get_node(func, port_action_node);
+		}
 		int new_id = script->get_available_id();
 
 		if (Object::cast_to<VisualScriptOperator>(vnode_new.ptr()) && vnode_old.is_valid()) {
@@ -3520,18 +3638,15 @@ void VisualScriptEditor::_selected_connect_node(const String &p_text, const Stri
 	Ref<VisualScriptPropertySet> script_prop_set;
 
 	if (p_category == String("method")) {
-
 		Ref<VisualScriptFunctionCall> n;
 		n.instance();
 		vnode = n;
 	} else if (p_category == String("set")) {
-
 		Ref<VisualScriptPropertySet> n;
 		n.instance();
 		vnode = n;
 		script_prop_set = n;
 	} else if (p_category == String("get")) {
-
 		Ref<VisualScriptPropertyGet> n;
 		n.instance();
 		n->set_property(p_text);
@@ -3540,33 +3655,27 @@ void VisualScriptEditor::_selected_connect_node(const String &p_text, const Stri
 
 	if (p_category == String("action")) {
 		if (p_text == "VisualScriptCondition") {
-
 			Ref<VisualScriptCondition> n;
 			n.instance();
 			vnode = n;
 		}
 		if (p_text == "VisualScriptSwitch") {
-
 			Ref<VisualScriptSwitch> n;
 			n.instance();
 			vnode = n;
 		} else if (p_text == "VisualScriptSequence") {
-
 			Ref<VisualScriptSequence> n;
 			n.instance();
 			vnode = n;
 		} else if (p_text == "VisualScriptIterator") {
-
 			Ref<VisualScriptIterator> n;
 			n.instance();
 			vnode = n;
 		} else if (p_text == "VisualScriptWhile") {
-
 			Ref<VisualScriptWhile> n;
 			n.instance();
 			vnode = n;
 		} else if (p_text == "VisualScriptReturn") {
-
 			Ref<VisualScriptReturn> n;
 			n.instance();
 			vnode = n;
@@ -3581,15 +3690,15 @@ void VisualScriptEditor::_selected_connect_node(const String &p_text, const Stri
 	undo_redo->add_undo_method(this, "_update_graph", new_id);
 	undo_redo->commit_action();
 
-	if (script_prop_set.is_valid())
+	if (script_prop_set.is_valid()) {
 		script_prop_set->set_property(p_text);
+	}
 
 	port_action_new_node = new_id;
 
 	Ref<VisualScriptNode> vsn = script->get_node(func, port_action_new_node);
 
 	if (Object::cast_to<VisualScriptFunctionCall>(vsn.ptr())) {
-
 		Ref<VisualScriptFunctionCall> vsfc = vsn;
 		vsfc->set_function(p_text);
 
@@ -3694,18 +3803,18 @@ void VisualScriptEditor::_selected_connect_node(const String &p_text, const Stri
 		}
 	}
 	_update_graph(port_action_new_node);
-	if (port_node_exists)
+	if (port_node_exists) {
 		_update_graph_connections();
+	}
 }
 
 void VisualScriptEditor::connect_seq(Ref<VisualScriptNode> vnode_old, Ref<VisualScriptNode> vnode_new, int new_id) {
-
 	VisualScriptOperator *vnode_operator = Object::cast_to<VisualScriptOperator>(vnode_new.ptr());
-	if (vnode_operator != NULL && !vnode_operator->has_input_sequence_port()) {
+	if (vnode_operator != nullptr && !vnode_operator->has_input_sequence_port()) {
 		return;
 	}
 	VisualScriptConstructor *vnode_constructor = Object::cast_to<VisualScriptConstructor>(vnode_new.ptr());
-	if (vnode_constructor != NULL) {
+	if (vnode_constructor != nullptr) {
 		return;
 	}
 	if (vnode_old->get_output_sequence_port_count() <= 0) {
@@ -3747,7 +3856,6 @@ void VisualScriptEditor::connect_seq(Ref<VisualScriptNode> vnode_old, Ref<Visual
 }
 
 void VisualScriptEditor::_selected_new_virtual_method(const String &p_text, const String &p_category, const bool p_connecting) {
-
 	String name = p_text;
 	if (script->has_function(name)) {
 		EditorNode::get_singleton()->show_warning(vformat(TTR("Script already has function '%s'"), name));
@@ -3810,10 +3918,10 @@ void VisualScriptEditor::_cancel_connect_node() {
 }
 
 int VisualScriptEditor::_create_new_node_from_name(const String &p_text, const Vector2 &p_point, const StringName &p_func) {
-
 	StringName func = default_func;
-	if (p_func != StringName())
+	if (p_func != StringName()) {
 		func = p_func;
+	}
 
 	Ref<VisualScriptNode> vnode = VisualScriptLanguage::singleton->create_node_from_name(p_text);
 	int new_id = script->get_available_id();
@@ -3827,10 +3935,10 @@ int VisualScriptEditor::_create_new_node_from_name(const String &p_text, const V
 }
 
 void VisualScriptEditor::_default_value_changed() {
-
 	Ref<VisualScriptNode> vsn = script->get_node(_get_function_of_node(editing_id), editing_id);
-	if (vsn.is_null())
+	if (vsn.is_null()) {
 		return;
+	}
 
 	undo_redo->create_action(TTR("Change Input Value"));
 	undo_redo->add_do_method(vsn.ptr(), "set_default_input_value", editing_input, default_value_edit->get_variant());
@@ -3842,16 +3950,15 @@ void VisualScriptEditor::_default_value_changed() {
 }
 
 void VisualScriptEditor::_default_value_edited(Node *p_button, int p_id, int p_input_port) {
-
 	Ref<VisualScriptNode> vsn = script->get_node(_get_function_of_node(p_id), p_id);
-	if (vsn.is_null())
+	if (vsn.is_null()) {
 		return;
+	}
 
 	PropertyInfo pinfo = vsn->get_input_value_port_info(p_input_port);
 	Variant existing = vsn->get_default_input_value(p_input_port);
 	if (pinfo.type != Variant::NIL && existing.get_type() != pinfo.type) {
-
-		Variant::CallError ce;
+		Callable::CallError ce;
 		const Variant *existingp = &existing;
 		existing = Variant::construct(pinfo.type, &existingp, 1, ce, false);
 	}
@@ -3860,7 +3967,6 @@ void VisualScriptEditor::_default_value_edited(Node *p_button, int p_id, int p_i
 	default_value_edit->set_size(Size2(1, 1));
 
 	if (pinfo.type == Variant::NODE_PATH) {
-
 		Node *edited_scene = get_tree()->get_edited_scene_root();
 		if (edited_scene) { // Fixing an old crash bug ( Visual Script Crashes on editing NodePath with an empty scene open)
 			Node *script_node = _find_script_node(edited_scene, edited_scene, script);
@@ -3877,11 +3983,12 @@ void VisualScriptEditor::_default_value_edited(Node *p_button, int p_id, int p_i
 		}
 	}
 
-	if (default_value_edit->edit(NULL, pinfo.name, pinfo.type, existing, pinfo.hint, pinfo.hint_string)) {
-		if (pinfo.hint == PROPERTY_HINT_MULTILINE_TEXT)
+	if (default_value_edit->edit(nullptr, pinfo.name, pinfo.type, existing, pinfo.hint, pinfo.hint_string)) {
+		if (pinfo.hint == PROPERTY_HINT_MULTILINE_TEXT) {
 			default_value_edit->popup_centered_ratio();
-		else
+		} else {
 			default_value_edit->popup();
+		}
 	}
 
 	editing_id = p_id;
@@ -3889,39 +3996,38 @@ void VisualScriptEditor::_default_value_edited(Node *p_button, int p_id, int p_i
 }
 
 void VisualScriptEditor::_show_hint(const String &p_hint) {
-
 	hint_text->set_text(p_hint);
 	hint_text->show();
 	hint_text_timer->start();
 }
 
 void VisualScriptEditor::_hide_timer() {
-
 	hint_text->hide();
 }
 
 void VisualScriptEditor::_notification(int p_what) {
-
 	switch (p_what) {
 		case NOTIFICATION_READY: {
-			variable_editor->connect("changed", this, "_update_members");
-			signal_editor->connect("changed", this, "_update_members");
-			FALLTHROUGH;
+			variable_editor->connect("changed", callable_mp(this, &VisualScriptEditor::_update_members));
+			variable_editor->connect("changed", callable_mp(this, &VisualScriptEditor::_update_graph), varray(-1), CONNECT_DEFERRED);
+			signal_editor->connect("changed", callable_mp(this, &VisualScriptEditor::_update_members));
+			signal_editor->connect("changed", callable_mp(this, &VisualScriptEditor::_update_graph), varray(-1), CONNECT_DEFERRED);
+			[[fallthrough]];
 		}
 		case NOTIFICATION_THEME_CHANGED: {
 			if (p_what != NOTIFICATION_READY && !is_visible_in_tree()) {
 				return;
 			}
 
-			edit_variable_edit->add_style_override("bg", get_stylebox("bg", "Tree"));
-			edit_signal_edit->add_style_override("bg", get_stylebox("bg", "Tree"));
-			func_input_scroll->add_style_override("bg", get_stylebox("bg", "Tree"));
+			edit_variable_edit->add_theme_style_override("bg", get_theme_stylebox("bg", "Tree"));
+			edit_signal_edit->add_theme_style_override("bg", get_theme_stylebox("bg", "Tree"));
+			func_input_scroll->add_theme_style_override("bg", get_theme_stylebox("bg", "Tree"));
 
 			Ref<Theme> tm = EditorNode::get_singleton()->get_theme_base()->get_theme();
 
 			bool dark_theme = tm->get_constant("dark_theme", "Editor");
 
-			List<Pair<String, Color> > colors;
+			List<Pair<String, Color>> colors;
 			if (dark_theme) {
 				colors.push_back(Pair<String, Color>("flow_control", Color(0.96, 0.96, 0.96)));
 				colors.push_back(Pair<String, Color>("functions", Color(0.96, 0.52, 0.51)));
@@ -3938,7 +4044,7 @@ void VisualScriptEditor::_notification(int p_what) {
 				colors.push_back(Pair<String, Color>("constants", Color(0.94, 0.18, 0.49)));
 			}
 
-			for (List<Pair<String, Color> >::Element *E = colors.front(); E; E = E->next()) {
+			for (List<Pair<String, Color>>::Element *E = colors.front(); E; E = E->next()) {
 				Ref<StyleBoxFlat> sb = tm->get_stylebox("frame", "GraphNode");
 				if (!sb.is_null()) {
 					Ref<StyleBoxFlat> frame_style = sb->duplicate();
@@ -3962,9 +4068,9 @@ void VisualScriptEditor::_notification(int p_what) {
 }
 
 void VisualScriptEditor::_graph_ofs_changed(const Vector2 &p_ofs) {
-
-	if (updating_graph || !script.is_valid())
+	if (updating_graph || !script.is_valid()) {
 		return;
+	}
 
 	updating_graph = true;
 
@@ -3977,20 +4083,22 @@ void VisualScriptEditor::_graph_ofs_changed(const Vector2 &p_ofs) {
 }
 
 void VisualScriptEditor::_comment_node_resized(const Vector2 &p_new_size, int p_node) {
-
-	if (updating_graph)
+	if (updating_graph) {
 		return;
+	}
 
 	StringName func = _get_function_of_node(p_node);
 
 	Ref<VisualScriptComment> vsc = script->get_node(func, p_node);
-	if (vsc.is_null())
+	if (vsc.is_null()) {
 		return;
+	}
 
 	Node *node = graph->get_node(itos(p_node));
 	GraphNode *gn = Object::cast_to<GraphNode>(node);
-	if (!gn)
+	if (!gn) {
 		return;
+	}
 
 	updating_graph = true;
 
@@ -4008,13 +4116,11 @@ void VisualScriptEditor::_comment_node_resized(const Vector2 &p_new_size, int p_
 }
 
 void VisualScriptEditor::_menu_option(int p_what) {
-
 	switch (p_what) {
 		case EDIT_DELETE_NODES: {
 			_on_nodes_delete();
 		} break;
 		case EDIT_TOGGLE_BREAKPOINT: {
-
 			List<String> reselect;
 			for (int i = 0; i < graph->get_child_count(); i++) {
 				GraphNode *gn = Object::cast_to<GraphNode>(graph->get_child(i));
@@ -4044,8 +4150,9 @@ void VisualScriptEditor::_menu_option(int p_what) {
 		} break;
 		case EDIT_COPY_NODES:
 		case EDIT_CUT_NODES: {
-			if (!script->has_function(default_func))
+			if (!script->has_function(default_func)) {
 				break;
+			}
 
 			clipboard->nodes.clear();
 			clipboard->data_connections.clear();
@@ -4056,7 +4163,6 @@ void VisualScriptEditor::_menu_option(int p_what) {
 				GraphNode *gn = Object::cast_to<GraphNode>(graph->get_child(i));
 				if (gn) {
 					if (gn->is_selected()) {
-
 						int id = String(gn->get_name()).to_int();
 						StringName func = _get_function_of_node(id);
 						Ref<VisualScriptNode> node = script->get_node(func, id);
@@ -4073,8 +4179,9 @@ void VisualScriptEditor::_menu_option(int p_what) {
 				}
 			}
 
-			if (clipboard->nodes.empty())
+			if (clipboard->nodes.empty()) {
 				break;
+			}
 
 			for (Set<String>::Element *F = funcs.front(); F; F = F->next()) {
 				List<VisualScript::SequenceConnection> sequence_connections;
@@ -4082,9 +4189,7 @@ void VisualScriptEditor::_menu_option(int p_what) {
 				script->get_sequence_connection_list(F->get(), &sequence_connections);
 
 				for (List<VisualScript::SequenceConnection>::Element *E = sequence_connections.front(); E; E = E->next()) {
-
 					if (clipboard->nodes.has(E->get().from_node) && clipboard->nodes.has(E->get().to_node)) {
-
 						clipboard->sequence_connections.insert(E->get());
 					}
 				}
@@ -4094,9 +4199,7 @@ void VisualScriptEditor::_menu_option(int p_what) {
 				script->get_data_connection_list(F->get(), &data_connections);
 
 				for (List<VisualScript::DataConnection>::Element *E = data_connections.front(); E; E = E->next()) {
-
 					if (clipboard->nodes.has(E->get().from_node) && clipboard->nodes.has(E->get().to_node)) {
-
 						clipboard->data_connections.insert(E->get());
 					}
 				}
@@ -4107,8 +4210,9 @@ void VisualScriptEditor::_menu_option(int p_what) {
 
 		} break;
 		case EDIT_PASTE_NODES: {
-			if (!script->has_function(default_func))
+			if (!script->has_function(default_func)) {
 				break;
+			}
 
 			if (clipboard->nodes.empty()) {
 				EditorNode::get_singleton()->show_warning(TTR("Clipboard is empty!"));
@@ -4137,8 +4241,7 @@ void VisualScriptEditor::_menu_option(int p_what) {
 				}
 			}
 
-			for (Map<int, Ref<VisualScriptNode> >::Element *E = clipboard->nodes.front(); E; E = E->next()) {
-
+			for (Map<int, Ref<VisualScriptNode>>::Element *E = clipboard->nodes.front(); E; E = E->next()) {
 				Ref<VisualScriptNode> node = E->get()->duplicate();
 
 				int new_id = idc++;
@@ -4157,13 +4260,11 @@ void VisualScriptEditor::_menu_option(int p_what) {
 			}
 
 			for (Set<VisualScript::SequenceConnection>::Element *E = clipboard->sequence_connections.front(); E; E = E->next()) {
-
 				undo_redo->add_do_method(script.ptr(), "sequence_connect", default_func, remap[E->get().from_node], E->get().from_output, remap[E->get().to_node]);
 				undo_redo->add_undo_method(script.ptr(), "sequence_disconnect", default_func, remap[E->get().from_node], E->get().from_output, remap[E->get().to_node]);
 			}
 
 			for (Set<VisualScript::DataConnection>::Element *E = clipboard->data_connections.front(); E; E = E->next()) {
-
 				undo_redo->add_do_method(script.ptr(), "data_connect", default_func, remap[E->get().from_node], E->get().from_port, remap[E->get().to_node], E->get().to_port);
 				undo_redo->add_undo_method(script.ptr(), "data_disconnect", default_func, remap[E->get().from_node], E->get().from_port, remap[E->get().to_node], E->get().to_port);
 			}
@@ -4182,9 +4283,8 @@ void VisualScriptEditor::_menu_option(int p_what) {
 			}
 		} break;
 		case EDIT_CREATE_FUNCTION: {
-
 			StringName function = "";
-			Map<int, Ref<VisualScriptNode> > nodes;
+			Map<int, Ref<VisualScriptNode>> nodes;
 			Set<int> selections;
 			for (int i = 0; i < graph->get_child_count(); i++) {
 				GraphNode *gn = Object::cast_to<GraphNode>(graph->get_child(i));
@@ -4224,9 +4324,9 @@ void VisualScriptEditor::_menu_option(int p_what) {
 			Set<int> end_nodes;
 			if (nodes.size() == 1) {
 				Ref<VisualScriptNode> nd = script->get_node(function, nodes.front()->key());
-				if (nd.is_valid() && nd->has_input_sequence_port())
+				if (nd.is_valid() && nd->has_input_sequence_port()) {
 					start_node = nodes.front()->key();
-				else {
+				} else {
 					EditorNode::get_singleton()->show_warning(TTR("Select at least one node with sequence port."));
 					return;
 				}
@@ -4240,7 +4340,7 @@ void VisualScriptEditor::_menu_option(int p_what) {
 					// the user wants to connect the nodes
 					int top_nd = -1;
 					Vector2 top;
-					for (Map<int, Ref<VisualScriptNode> >::Element *E = nodes.front(); E; E = E->next()) {
+					for (Map<int, Ref<VisualScriptNode>>::Element *E = nodes.front(); E; E = E->next()) {
 						Ref<VisualScriptNode> nd = script->get_node(function, E->key());
 						if (nd.is_valid() && nd->has_input_sequence_port()) {
 							if (top_nd < 0) {
@@ -4255,9 +4355,9 @@ void VisualScriptEditor::_menu_option(int p_what) {
 						}
 					}
 					Ref<VisualScriptNode> nd = script->get_node(function, top_nd);
-					if (nd.is_valid() && nd->has_input_sequence_port())
+					if (nd.is_valid() && nd->has_input_sequence_port()) {
 						start_node = top_nd;
-					else {
+					} else {
 						EditorNode::get_singleton()->show_warning(TTR("Select at least one node with sequence port."));
 						return;
 					}
@@ -4304,7 +4404,7 @@ void VisualScriptEditor::_menu_option(int p_what) {
 			}
 
 			List<Variant::Type> inputs; // input types
-			List<Pair<int, int> > input_connections;
+			List<Pair<int, int>> input_connections;
 			{
 				List<VisualScript::DataConnection> dats;
 				script->get_data_connection_list(function, &dats);
@@ -4347,7 +4447,7 @@ void VisualScriptEditor::_menu_option(int p_what) {
 
 			// Move the nodes
 
-			for (Map<int, Ref<VisualScriptNode> >::Element *E = nodes.front(); E; E = E->next()) {
+			for (Map<int, Ref<VisualScriptNode>>::Element *E = nodes.front(); E; E = E->next()) {
 				undo_redo->add_do_method(script.ptr(), "remove_node", function, E->key());
 				undo_redo->add_do_method(script.ptr(), "add_node", new_fn, E->key(), E->get(), script->get_node_position(function, E->key()));
 
@@ -4402,7 +4502,7 @@ void VisualScriptEditor::_menu_option(int p_what) {
 
 			// * might make the system more intelligent by checking port from info.
 			int i = 0;
-			List<Pair<int, int> >::Element *F = input_connections.front();
+			List<Pair<int, int>>::Element *F = input_connections.front();
 			for (List<Variant::Type>::Element *E = inputs.front(); E && F; E = E->next(), F = F->next()) {
 				func_node->add_argument(E->get(), "arg_" + String::num_int64(i), i);
 				undo_redo->add_do_method(script.ptr(), "data_connect", new_fn, fn_id, i, F->get().first, F->get().second);
@@ -4454,7 +4554,6 @@ void VisualScriptEditor::_get_ends(int p_node, const List<VisualScript::Sequence
 }
 
 void VisualScriptEditor::_member_rmb_selected(const Vector2 &p_pos) {
-
 	TreeItem *ti = members->get_selected();
 	ERR_FAIL_COND(!ti);
 
@@ -4467,12 +4566,11 @@ void VisualScriptEditor::_member_rmb_selected(const Vector2 &p_pos) {
 
 	TreeItem *root = members->get_root();
 
-	Ref<Texture> del_icon = Control::get_icon("Remove", "EditorIcons");
+	Ref<Texture2D> del_icon = Control::get_theme_icon("Remove", "EditorIcons");
 
-	Ref<Texture> edit_icon = Control::get_icon("Edit", "EditorIcons");
+	Ref<Texture2D> edit_icon = Control::get_theme_icon("Edit", "EditorIcons");
 
 	if (ti->get_parent() == root->get_children()) {
-
 		member_type = MEMBER_FUNCTION;
 		member_name = ti->get_text(0);
 		member_popup->add_icon_shortcut(edit_icon, ED_GET_SHORTCUT("visual_script_editor/edit_member"), MEMBER_EDIT);
@@ -4483,7 +4581,6 @@ void VisualScriptEditor::_member_rmb_selected(const Vector2 &p_pos) {
 	}
 
 	if (ti->get_parent() == root->get_children()->get_next()) {
-
 		member_type = MEMBER_VARIABLE;
 		member_name = ti->get_text(0);
 		member_popup->add_icon_shortcut(edit_icon, ED_GET_SHORTCUT("visual_script_editor/edit_member"), MEMBER_EDIT);
@@ -4494,7 +4591,6 @@ void VisualScriptEditor::_member_rmb_selected(const Vector2 &p_pos) {
 	}
 
 	if (ti->get_parent() == root->get_children()->get_next()->get_next()) {
-
 		member_type = MEMBER_SIGNAL;
 		member_name = ti->get_text(0);
 		member_popup->add_icon_shortcut(edit_icon, ED_GET_SHORTCUT("visual_script_editor/edit_member"), MEMBER_EDIT);
@@ -4506,10 +4602,8 @@ void VisualScriptEditor::_member_rmb_selected(const Vector2 &p_pos) {
 }
 
 void VisualScriptEditor::_member_option(int p_option) {
-
 	switch (member_type) {
 		case MEMBER_FUNCTION: {
-
 			if (p_option == MEMBER_REMOVE) {
 				//delete the function
 				String name = member_name;
@@ -4552,7 +4646,6 @@ void VisualScriptEditor::_member_option(int p_option) {
 			}
 		} break;
 		case MEMBER_VARIABLE: {
-
 			String name = member_name;
 
 			if (p_option == MEMBER_REMOVE) {
@@ -4566,7 +4659,7 @@ void VisualScriptEditor::_member_option(int p_option) {
 			} else if (p_option == MEMBER_EDIT) {
 				variable_editor->edit(name);
 				edit_variable_dialog->set_title(TTR("Editing Variable:") + " " + name);
-				edit_variable_dialog->popup_centered_minsize(Size2(400, 200) * EDSCALE);
+				edit_variable_dialog->popup_centered(Size2(400, 200) * EDSCALE);
 			}
 		} break;
 		case MEMBER_SIGNAL: {
@@ -4587,96 +4680,43 @@ void VisualScriptEditor::_member_option(int p_option) {
 			} else if (p_option == MEMBER_EDIT) {
 				signal_editor->edit(name);
 				edit_signal_dialog->set_title(TTR("Editing Signal:") + " " + name);
-				edit_signal_dialog->popup_centered_minsize(Size2(400, 300) * EDSCALE);
+				edit_signal_dialog->popup_centered(Size2(400, 300) * EDSCALE);
 			}
 		} break;
 	}
 }
 
-void VisualScriptEditor::add_syntax_highlighter(SyntaxHighlighter *p_highlighter) {
+void VisualScriptEditor::add_syntax_highlighter(Ref<EditorSyntaxHighlighter> p_highlighter) {
 }
 
-void VisualScriptEditor::set_syntax_highlighter(SyntaxHighlighter *p_highlighter) {
+void VisualScriptEditor::set_syntax_highlighter(Ref<EditorSyntaxHighlighter> p_highlighter) {
 }
 
 void VisualScriptEditor::_bind_methods() {
-
-	ClassDB::bind_method("_member_button", &VisualScriptEditor::_member_button);
-	ClassDB::bind_method("_member_edited", &VisualScriptEditor::_member_edited);
-	ClassDB::bind_method("_member_selected", &VisualScriptEditor::_member_selected);
-	ClassDB::bind_method("_update_members", &VisualScriptEditor::_update_members);
-	ClassDB::bind_method("_members_gui_input", &VisualScriptEditor::_members_gui_input);
-	ClassDB::bind_method("_member_rmb_selected", &VisualScriptEditor::_member_rmb_selected);
-	ClassDB::bind_method("_member_option", &VisualScriptEditor::_member_option);
-	ClassDB::bind_method("_fn_name_box_input", &VisualScriptEditor::_fn_name_box_input);
-
-	ClassDB::bind_method("_change_base_type", &VisualScriptEditor::_change_base_type);
-	ClassDB::bind_method("_change_base_type_callback", &VisualScriptEditor::_change_base_type_callback);
-	ClassDB::bind_method("_toggle_tool_script", &VisualScriptEditor::_toggle_tool_script);
-	ClassDB::bind_method("_node_selected", &VisualScriptEditor::_node_selected);
-	ClassDB::bind_method("_node_moved", &VisualScriptEditor::_node_moved);
 	ClassDB::bind_method("_move_node", &VisualScriptEditor::_move_node);
-	ClassDB::bind_method("_begin_node_move", &VisualScriptEditor::_begin_node_move);
-	ClassDB::bind_method("_end_node_move", &VisualScriptEditor::_end_node_move);
-	ClassDB::bind_method("_remove_node", &VisualScriptEditor::_remove_node);
 	ClassDB::bind_method("_update_graph", &VisualScriptEditor::_update_graph, DEFVAL(-1));
-	ClassDB::bind_method("_node_ports_changed", &VisualScriptEditor::_node_ports_changed);
-
-	ClassDB::bind_method("_create_function_dialog", &VisualScriptEditor::_create_function_dialog);
-	ClassDB::bind_method("_create_function", &VisualScriptEditor::_create_function);
-	ClassDB::bind_method("_add_node_dialog", &VisualScriptEditor::_add_node_dialog);
-	ClassDB::bind_method("_add_func_input", &VisualScriptEditor::_add_func_input);
-	ClassDB::bind_method("_remove_func_input", &VisualScriptEditor::_remove_func_input);
-	ClassDB::bind_method("_deselect_input_names", &VisualScriptEditor::_deselect_input_names);
-
-	ClassDB::bind_method("_default_value_edited", &VisualScriptEditor::_default_value_edited);
-	ClassDB::bind_method("_default_value_changed", &VisualScriptEditor::_default_value_changed);
-	ClassDB::bind_method("_menu_option", &VisualScriptEditor::_menu_option);
-	ClassDB::bind_method("_graph_ofs_changed", &VisualScriptEditor::_graph_ofs_changed);
+
 	ClassDB::bind_method("_center_on_node", &VisualScriptEditor::_center_on_node);
-	ClassDB::bind_method("_comment_node_resized", &VisualScriptEditor::_comment_node_resized);
 	ClassDB::bind_method("_button_resource_previewed", &VisualScriptEditor::_button_resource_previewed);
 	ClassDB::bind_method("_port_action_menu", &VisualScriptEditor::_port_action_menu);
-	ClassDB::bind_method("_selected_connect_node", &VisualScriptEditor::_selected_connect_node);
-	ClassDB::bind_method("_selected_new_virtual_method", &VisualScriptEditor::_selected_new_virtual_method);
 
-	ClassDB::bind_method("_cancel_connect_node", &VisualScriptEditor::_cancel_connect_node);
 	ClassDB::bind_method("_create_new_node_from_name", &VisualScriptEditor::_create_new_node_from_name);
-	ClassDB::bind_method("_expression_text_changed", &VisualScriptEditor::_expression_text_changed);
-	ClassDB::bind_method("_add_input_port", &VisualScriptEditor::_add_input_port);
-	ClassDB::bind_method("_add_output_port", &VisualScriptEditor::_add_output_port);
-	ClassDB::bind_method("_remove_input_port", &VisualScriptEditor::_remove_input_port);
-	ClassDB::bind_method("_remove_output_port", &VisualScriptEditor::_remove_output_port);
-	ClassDB::bind_method("_change_port_type", &VisualScriptEditor::_change_port_type);
-	ClassDB::bind_method("_update_node_size", &VisualScriptEditor::_update_node_size);
-	ClassDB::bind_method("_port_name_focus_out", &VisualScriptEditor::_port_name_focus_out);
 
 	ClassDB::bind_method("get_drag_data_fw", &VisualScriptEditor::get_drag_data_fw);
 	ClassDB::bind_method("can_drop_data_fw", &VisualScriptEditor::can_drop_data_fw);
 	ClassDB::bind_method("drop_data_fw", &VisualScriptEditor::drop_data_fw);
 
 	ClassDB::bind_method("_input", &VisualScriptEditor::_input);
-	ClassDB::bind_method("_graph_gui_input", &VisualScriptEditor::_graph_gui_input);
-
-	ClassDB::bind_method("_on_nodes_delete", &VisualScriptEditor::_on_nodes_delete);
-	ClassDB::bind_method("_on_nodes_duplicate", &VisualScriptEditor::_on_nodes_duplicate);
-
-	ClassDB::bind_method("_hide_timer", &VisualScriptEditor::_hide_timer);
-
-	ClassDB::bind_method("_graph_connected", &VisualScriptEditor::_graph_connected);
-	ClassDB::bind_method("_graph_disconnected", &VisualScriptEditor::_graph_disconnected);
-	ClassDB::bind_method("_graph_connect_to_empty", &VisualScriptEditor::_graph_connect_to_empty);
 
 	ClassDB::bind_method("_update_graph_connections", &VisualScriptEditor::_update_graph_connections);
-
-	ClassDB::bind_method("_selected_method", &VisualScriptEditor::_selected_method);
-	ClassDB::bind_method("_draw_color_over_button", &VisualScriptEditor::_draw_color_over_button);
+	ClassDB::bind_method("_update_members", &VisualScriptEditor::_update_members);
 
 	ClassDB::bind_method("_generic_search", &VisualScriptEditor::_generic_search);
+
+	ClassDB::bind_method(D_METHOD("add_syntax_highlighter", "highlighter"), &VisualScriptEditor::add_syntax_highlighter);
 }
 
 VisualScriptEditor::VisualScriptEditor() {
-
 	if (!clipboard) {
 		clipboard = memnew(Clipboard);
 	}
@@ -4697,7 +4737,7 @@ VisualScriptEditor::VisualScriptEditor() {
 	edit_menu->get_popup()->add_separator();
 	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("visual_script_editor/create_function"), EDIT_CREATE_FUNCTION);
 	edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("visual_script_editor/refresh_nodes"), REFRESH_GRAPH);
-	edit_menu->get_popup()->connect("id_pressed", this, "_menu_option");
+	edit_menu->get_popup()->connect("id_pressed", callable_mp(this, &VisualScriptEditor::_menu_option));
 
 	members_section = memnew(VBoxContainer);
 	// Add but wait until done setting up this.
@@ -4707,7 +4747,7 @@ VisualScriptEditor::VisualScriptEditor() {
 	CheckButton *tool_script_check = memnew(CheckButton);
 	tool_script_check->set_text(TTR("Make Tool:"));
 	members_section->add_child(tool_script_check);
-	tool_script_check->connect("pressed", this, "_toggle_tool_script");
+	tool_script_check->connect("pressed", callable_mp(this, &VisualScriptEditor::_toggle_tool_script));
 
 	///       Members        ///
 
@@ -4715,11 +4755,11 @@ VisualScriptEditor::VisualScriptEditor() {
 	members_section->add_margin_child(TTR("Members:"), members, true);
 	members->set_custom_minimum_size(Size2(0, 50 * EDSCALE));
 	members->set_hide_root(true);
-	members->connect("button_pressed", this, "_member_button");
-	members->connect("item_edited", this, "_member_edited");
-	members->connect("cell_selected", this, "_member_selected", varray(), CONNECT_DEFERRED);
-	members->connect("gui_input", this, "_members_gui_input");
-	members->connect("item_rmb_selected", this, "_member_rmb_selected");
+	members->connect("button_pressed", callable_mp(this, &VisualScriptEditor::_member_button));
+	members->connect("item_edited", callable_mp(this, &VisualScriptEditor::_member_edited));
+	members->connect("cell_selected", callable_mp(this, &VisualScriptEditor::_member_selected), varray(), CONNECT_DEFERRED);
+	members->connect("gui_input", callable_mp(this, &VisualScriptEditor::_members_gui_input));
+	members->connect("item_rmb_selected", callable_mp(this, &VisualScriptEditor::_member_rmb_selected));
 	members->set_allow_rmb_select(true);
 	members->set_allow_reselect(true);
 	members->set_hide_folding(true);
@@ -4727,13 +4767,12 @@ VisualScriptEditor::VisualScriptEditor() {
 
 	member_popup = memnew(PopupMenu);
 	add_child(member_popup);
-	member_popup->connect("id_pressed", this, "_member_option");
+	member_popup->connect("id_pressed", callable_mp(this, &VisualScriptEditor::_member_option));
 
-	function_name_edit = memnew(PopupDialog);
+	function_name_edit = memnew(AcceptDialog);
 	function_name_box = memnew(LineEdit);
 	function_name_edit->add_child(function_name_box);
-	function_name_edit->set_h_size_flags(SIZE_EXPAND);
-	function_name_box->connect("gui_input", this, "_fn_name_box_input");
+	function_name_box->connect("gui_input", callable_mp(this, &VisualScriptEditor::_fn_name_box_input));
 	function_name_box->set_expand_to_text_length(true);
 	add_child(function_name_edit);
 
@@ -4743,15 +4782,15 @@ VisualScriptEditor::VisualScriptEditor() {
 	add_child(graph);
 	graph->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 	graph->set_anchors_and_margins_preset(Control::PRESET_WIDE);
-	graph->connect("node_selected", this, "_node_selected");
-	graph->connect("_begin_node_move", this, "_begin_node_move");
-	graph->connect("_end_node_move", this, "_end_node_move");
-	graph->connect("delete_nodes_request", this, "_on_nodes_delete");
-	graph->connect("duplicate_nodes_request", this, "_on_nodes_duplicate");
-	graph->connect("gui_input", this, "_graph_gui_input");
+	graph->connect("node_selected", callable_mp(this, &VisualScriptEditor::_node_selected));
+	graph->connect("_begin_node_move", callable_mp(this, &VisualScriptEditor::_begin_node_move));
+	graph->connect("_end_node_move", callable_mp(this, &VisualScriptEditor::_end_node_move));
+	graph->connect("delete_nodes_request", callable_mp(this, &VisualScriptEditor::_on_nodes_delete));
+	graph->connect("duplicate_nodes_request", callable_mp(this, &VisualScriptEditor::_on_nodes_duplicate));
+	graph->connect("gui_input", callable_mp(this, &VisualScriptEditor::_graph_gui_input));
 	graph->set_drag_forwarding(this);
 	graph->hide();
-	graph->connect("scroll_offset_changed", this, "_graph_ofs_changed");
+	graph->connect("scroll_offset_changed", callable_mp(this, &VisualScriptEditor::_graph_ofs_changed));
 
 	/// Add Buttons to Top Bar/Zoom bar.
 	HBoxContainer *graph_hbc = graph->get_zoom_hbox();
@@ -4761,18 +4800,18 @@ VisualScriptEditor::VisualScriptEditor() {
 	graph_hbc->add_child(base_lbl);
 
 	base_type_select = memnew(Button);
-	base_type_select->connect("pressed", this, "_change_base_type");
+	base_type_select->connect("pressed", callable_mp(this, &VisualScriptEditor::_change_base_type));
 	graph_hbc->add_child(base_type_select);
 
 	Button *add_nds = memnew(Button);
 	add_nds->set_text(TTR("Add Nodes..."));
 	graph_hbc->add_child(add_nds);
-	add_nds->connect("pressed", this, "_add_node_dialog");
+	add_nds->connect("pressed", callable_mp(this, &VisualScriptEditor::_add_node_dialog));
 
 	Button *fn_btn = memnew(Button);
 	fn_btn->set_text(TTR("Add Function..."));
 	graph_hbc->add_child(fn_btn);
-	fn_btn->connect("pressed", this, "_create_function_dialog");
+	fn_btn->connect("pressed", callable_mp(this, &VisualScriptEditor::_create_function_dialog));
 
 	// Add Function Dialog.
 	VBoxContainer *function_vb = memnew(VBoxContainer);
@@ -4790,7 +4829,7 @@ VisualScriptEditor::VisualScriptEditor() {
 	func_name_box->set_h_size_flags(SIZE_EXPAND_FILL);
 	func_name_box->set_placeholder(TTR("function_name"));
 	func_name_box->set_text("");
-	func_name_box->connect("focus_entered", this, "_deselect_input_names");
+	func_name_box->connect("focus_entered", callable_mp(this, &VisualScriptEditor::_deselect_input_names));
 	func_name_hbox->add_child(func_name_box);
 
 	// Add minor setting for function if needed, here!
@@ -4800,7 +4839,7 @@ VisualScriptEditor::VisualScriptEditor() {
 	Button *add_input_button = memnew(Button);
 	add_input_button->set_h_size_flags(SIZE_EXPAND_FILL);
 	add_input_button->set_text(TTR("Add Input"));
-	add_input_button->connect("pressed", this, "_add_func_input");
+	add_input_button->connect("pressed", callable_mp(this, &VisualScriptEditor::_add_func_input));
 	function_vb->add_child(add_input_button);
 
 	func_input_scroll = memnew(ScrollContainer);
@@ -4812,11 +4851,10 @@ VisualScriptEditor::VisualScriptEditor() {
 	func_input_scroll->add_child(func_input_vbox);
 
 	function_create_dialog = memnew(ConfirmationDialog);
-	function_create_dialog->set_v_size_flags(SIZE_EXPAND_FILL);
 	function_create_dialog->set_title(TTR("Create Function"));
 	function_create_dialog->add_child(function_vb);
 	function_create_dialog->get_ok()->set_text(TTR("Create"));
-	function_create_dialog->get_ok()->connect("pressed", this, "_create_function");
+	function_create_dialog->get_ok()->connect("pressed", callable_mp(this, &VisualScriptEditor::_create_function));
 	add_child(function_create_dialog);
 
 	select_func_text = memnew(Label);
@@ -4836,7 +4874,7 @@ VisualScriptEditor::VisualScriptEditor() {
 
 	hint_text_timer = memnew(Timer);
 	hint_text_timer->set_wait_time(4);
-	hint_text_timer->connect("timeout", this, "_hide_timer");
+	hint_text_timer->connect("timeout", callable_mp(this, &VisualScriptEditor::_hide_timer));
 	add_child(hint_text_timer);
 
 	// Allowed casts (connections).
@@ -4854,9 +4892,9 @@ VisualScriptEditor::VisualScriptEditor() {
 
 	graph->add_valid_left_disconnect_type(TYPE_SEQUENCE);
 
-	graph->connect("connection_request", this, "_graph_connected");
-	graph->connect("disconnection_request", this, "_graph_disconnected");
-	graph->connect("connection_to_empty", this, "_graph_connect_to_empty");
+	graph->connect("connection_request", callable_mp(this, &VisualScriptEditor::_graph_connected));
+	graph->connect("disconnection_request", callable_mp(this, &VisualScriptEditor::_graph_disconnected));
+	graph->connect("connection_to_empty", callable_mp(this, &VisualScriptEditor::_graph_connect_to_empty));
 
 	edit_signal_dialog = memnew(AcceptDialog);
 	edit_signal_dialog->get_ok()->set_text(TTR("Close"));
@@ -4880,7 +4918,7 @@ VisualScriptEditor::VisualScriptEditor() {
 
 	select_base_type = memnew(CreateDialog);
 	select_base_type->set_base_type("Object"); // Anything goes.
-	select_base_type->connect("create", this, "_change_base_type_callback");
+	select_base_type->connect("create", callable_mp(this, &VisualScriptEditor::_change_base_type_callback));
 	add_child(select_base_type);
 
 	undo_redo = EditorNode::get_singleton()->get_undo_redo();
@@ -4892,49 +4930,46 @@ VisualScriptEditor::VisualScriptEditor() {
 
 	default_value_edit = memnew(CustomPropertyEditor);
 	add_child(default_value_edit);
-	default_value_edit->connect("variant_changed", this, "_default_value_changed");
+	default_value_edit->connect("variant_changed", callable_mp(this, &VisualScriptEditor::_default_value_changed));
 
 	method_select = memnew(VisualScriptPropertySelector);
 	add_child(method_select);
-	method_select->connect("selected", this, "_selected_method");
+	method_select->connect("selected", callable_mp(this, &VisualScriptEditor::_selected_method));
 	error_line = -1;
 
 	new_connect_node_select = memnew(VisualScriptPropertySelector);
 	add_child(new_connect_node_select);
-	new_connect_node_select->set_resizable(true);
-	new_connect_node_select->connect("selected", this, "_selected_connect_node");
-	new_connect_node_select->get_cancel()->connect("pressed", this, "_cancel_connect_node");
+	new_connect_node_select->connect("selected", callable_mp(this, &VisualScriptEditor::_selected_connect_node));
+	new_connect_node_select->get_cancel()->connect("pressed", callable_mp(this, &VisualScriptEditor::_cancel_connect_node));
 
 	new_virtual_method_select = memnew(VisualScriptPropertySelector);
 	add_child(new_virtual_method_select);
-	new_virtual_method_select->connect("selected", this, "_selected_new_virtual_method");
+	new_virtual_method_select->connect("selected", callable_mp(this, &VisualScriptEditor::_selected_new_virtual_method));
 }
 
 VisualScriptEditor::~VisualScriptEditor() {
-
 	undo_redo->clear_history(); // Avoid crashes.
 	memdelete(signal_editor);
 	memdelete(variable_editor);
 }
 
 static ScriptEditorBase *create_editor(const RES &p_resource) {
-
 	if (Object::cast_to<VisualScript>(*p_resource)) {
 		return memnew(VisualScriptEditor);
 	}
 
-	return NULL;
+	return nullptr;
 }
 
-VisualScriptEditor::Clipboard *VisualScriptEditor::clipboard = NULL;
+VisualScriptEditor::Clipboard *VisualScriptEditor::clipboard = nullptr;
 
 void VisualScriptEditor::free_clipboard() {
-	if (clipboard)
+	if (clipboard) {
 		memdelete(clipboard);
+	}
 }
 
 static void register_editor_callback() {
-
 	ScriptEditor::register_create_script_editor_function(create_editor);
 
 	ED_SHORTCUT("visual_script_editor/delete_selected", TTR("Delete Selected"), KEY_DELETE);
@@ -4949,21 +4984,19 @@ static void register_editor_callback() {
 }
 
 void VisualScriptEditor::register_editor() {
-
 	// Too early to register stuff here, request a callback.
 	EditorNode::add_plugin_init_callback(register_editor_callback);
 }
 
 Ref<VisualScriptNode> _VisualScriptEditor::create_node_custom(const String &p_name) {
-
 	Ref<VisualScriptCustomNode> node;
 	node.instance();
 	node->set_script(singleton->custom_nodes[p_name]);
 	return node;
 }
 
-_VisualScriptEditor *_VisualScriptEditor::singleton = NULL;
-Map<String, RefPtr> _VisualScriptEditor::custom_nodes;
+_VisualScriptEditor *_VisualScriptEditor::singleton = nullptr;
+Map<String, REF> _VisualScriptEditor::custom_nodes;
 
 _VisualScriptEditor::_VisualScriptEditor() {
 	singleton = this;
@@ -4975,7 +5008,7 @@ _VisualScriptEditor::~_VisualScriptEditor() {
 
 void _VisualScriptEditor::add_custom_node(const String &p_name, const String &p_category, const Ref<Script> &p_script) {
 	String node_name = "custom/" + p_category + "/" + p_name;
-	custom_nodes.insert(node_name, p_script.get_ref_ptr());
+	custom_nodes.insert(node_name, p_script);
 	VisualScriptLanguage::singleton->add_register_func(node_name, &_VisualScriptEditor::create_node_custom);
 	emit_signal("custom_nodes_updated");
 }
diff --git a/modules/visual_script/visual_script_editor.h b/modules/visual_script/visual_script_editor.h
index 7f3bf79d50..66e435741f 100644
--- a/modules/visual_script/visual_script_editor.h
+++ b/modules/visual_script/visual_script_editor.h
@@ -114,7 +114,7 @@ class VisualScriptEditor : public ScriptEditorBase {
 	UndoRedo *undo_redo;
 
 	Tree *members;
-	PopupDialog *function_name_edit;
+	AcceptDialog *function_name_edit;
 	LineEdit *function_name_box;
 
 	Label *hint_text;
@@ -133,10 +133,10 @@ class VisualScriptEditor : public ScriptEditorBase {
 		String name;
 		Variant::Type ret;
 		bool ret_variant;
-		Vector<Pair<Variant::Type, String> > args;
+		Vector<Pair<Variant::Type, String>> args;
 	};
 
-	HashMap<StringName, Ref<StyleBox> > node_styles;
+	HashMap<StringName, Ref<StyleBox>> node_styles;
 	StringName edited_func;
 	StringName default_func;
 
@@ -146,14 +146,14 @@ class VisualScriptEditor : public ScriptEditorBase {
 	bool updating_members;
 
 	void _update_members();
+	String _sanitized_variant_text(const StringName &property_name);
 
 	StringName selected;
 
 	String _validate_name(const String &p_name) const;
 
 	struct Clipboard {
-
-		Map<int, Ref<VisualScriptNode> > nodes;
+		Map<int, Ref<VisualScriptNode>> nodes;
 		Map<int, Vector2> nodes_positions;
 
 		Set<VisualScript::SequenceConnection> sequence_connections;
@@ -277,7 +277,7 @@ class VisualScriptEditor : public ScriptEditorBase {
 	void _selected_method(const String &p_method, const String &p_type, const bool p_connecting);
 
 	void _draw_color_over_button(Object *obj, Color p_color);
-	void _button_resource_previewed(const String &p_path, const Ref<Texture> &p_preview, const Ref<Texture> &p_small_preview, Variant p_ud);
+	void _button_resource_previewed(const String &p_path, const Ref<Texture2D> &p_preview, const Ref<Texture2D> &p_small_preview, Variant p_ud);
 
 	VisualScriptNode::TypeGuess _guess_output_type(int p_port_action_node, int p_port_action_output, Set<int> &p_visited_nodes);
 
@@ -289,39 +289,40 @@ protected:
 	static void _bind_methods();
 
 public:
-	virtual void add_syntax_highlighter(SyntaxHighlighter *p_highlighter);
-	virtual void set_syntax_highlighter(SyntaxHighlighter *p_highlighter);
-
-	virtual void apply_code();
-	virtual RES get_edited_resource() const;
-	virtual void set_edited_resource(const RES &p_res);
-	virtual Vector<String> get_functions();
-	virtual void reload_text();
-	virtual String get_name();
-	virtual Ref<Texture> get_icon();
-	virtual bool is_unsaved();
-	virtual Variant get_edit_state();
-	virtual void set_edit_state(const Variant &p_state);
-	virtual void goto_line(int p_line, bool p_with_error = false);
-	virtual void set_executing_line(int p_line);
-	virtual void clear_executing_line();
-	virtual void trim_trailing_whitespace();
-	virtual void insert_final_newline();
-	virtual void convert_indent_to_spaces();
-	virtual void convert_indent_to_tabs();
-	virtual void ensure_focus();
-	virtual void tag_saved_version();
-	virtual void reload(bool p_soft);
-	virtual void get_breakpoints(List<int> *p_breakpoints);
-	virtual void add_callback(const String &p_function, PoolStringArray p_args);
-	virtual void update_settings();
-	virtual bool show_members_overview();
-	virtual void set_debugger_active(bool p_active);
-	virtual void set_tooltip_request_func(String p_method, Object *p_obj);
-	virtual Control *get_edit_menu();
-	virtual void clear_edit_menu();
-	virtual bool can_lose_focus_on_node_selection() { return false; }
-	virtual void validate();
+	virtual void add_syntax_highlighter(Ref<EditorSyntaxHighlighter> p_highlighter) override;
+	virtual void set_syntax_highlighter(Ref<EditorSyntaxHighlighter> p_highlighter) override;
+
+	virtual void apply_code() override;
+	virtual RES get_edited_resource() const override;
+	virtual void set_edited_resource(const RES &p_res) override;
+	virtual void enable_editor() override;
+	virtual Vector<String> get_functions() override;
+	virtual void reload_text() override;
+	virtual String get_name() override;
+	virtual Ref<Texture2D> get_theme_icon() override;
+	virtual bool is_unsaved() override;
+	virtual Variant get_edit_state() override;
+	virtual void set_edit_state(const Variant &p_state) override;
+	virtual void goto_line(int p_line, bool p_with_error = false) override;
+	virtual void set_executing_line(int p_line) override;
+	virtual void clear_executing_line() override;
+	virtual void trim_trailing_whitespace() override;
+	virtual void insert_final_newline() override;
+	virtual void convert_indent_to_spaces() override;
+	virtual void convert_indent_to_tabs() override;
+	virtual void ensure_focus() override;
+	virtual void tag_saved_version() override;
+	virtual void reload(bool p_soft) override;
+	virtual Array get_breakpoints() override;
+	virtual void add_callback(const String &p_function, PackedStringArray p_args) override;
+	virtual void update_settings() override;
+	virtual bool show_members_overview() override;
+	virtual void set_debugger_active(bool p_active) override;
+	virtual void set_tooltip_request_func(String p_method, Object *p_obj) override;
+	virtual Control *get_edit_menu() override;
+	virtual void clear_edit_menu() override;
+	virtual bool can_lose_focus_on_node_selection() override { return false; }
+	virtual void validate() override;
 
 	static void register_editor();
 
@@ -341,7 +342,7 @@ protected:
 	static void _bind_methods();
 	static _VisualScriptEditor *singleton;
 
-	static Map<String, RefPtr> custom_nodes;
+	static Map<String, REF> custom_nodes;
 	static Ref<VisualScriptNode> create_node_custom(const String &p_name);
 
 public:
diff --git a/modules/visual_script/visual_script_expression.cpp b/modules/visual_script/visual_script_expression.cpp
index 4feef53c2e..60a439b291 100644
--- a/modules/visual_script/visual_script_expression.cpp
+++ b/modules/visual_script/visual_script_expression.cpp
@@ -31,7 +31,6 @@
 #include "visual_script_expression.h"
 
 bool VisualScriptExpression::_set(const StringName &p_name, const Variant &p_value) {
-
 	if (String(p_name) == "expression") {
 		expression = p_value;
 		expression_dirty = true;
@@ -52,7 +51,6 @@ bool VisualScriptExpression::_set(const StringName &p_name, const Variant &p_val
 	}
 
 	if (String(p_name) == "input_count") {
-
 		int from = inputs.size();
 		inputs.resize(int(p_value));
 		for (int i = from; i < inputs.size(); i++) {
@@ -70,17 +68,14 @@ bool VisualScriptExpression::_set(const StringName &p_name, const Variant &p_val
 	}
 
 	if (String(p_name).begins_with("input_")) {
-
 		int idx = String(p_name).get_slicec('_', 1).get_slicec('/', 0).to_int();
 		ERR_FAIL_INDEX_V(idx, inputs.size(), false);
 
 		String what = String(p_name).get_slice("/", 1);
 
 		if (what == "type") {
-
 			inputs.write[idx].type = Variant::Type(int(p_value));
 		} else if (what == "name") {
-
 			inputs.write[idx].name = p_value;
 		} else {
 			return false;
@@ -95,7 +90,6 @@ bool VisualScriptExpression::_set(const StringName &p_name, const Variant &p_val
 }
 
 bool VisualScriptExpression::_get(const StringName &p_name, Variant &r_ret) const {
-
 	if (String(p_name) == "expression") {
 		r_ret = expression;
 		return true;
@@ -117,17 +111,14 @@ bool VisualScriptExpression::_get(const StringName &p_name, Variant &r_ret) cons
 	}
 
 	if (String(p_name).begins_with("input_")) {
-
 		int idx = String(p_name).get_slicec('_', 1).get_slicec('/', 0).to_int();
 		ERR_FAIL_INDEX_V(idx, inputs.size(), false);
 
 		String what = String(p_name).get_slice("/", 1);
 
 		if (what == "type") {
-
 			r_ret = inputs[idx].type;
 		} else if (what == "name") {
-
 			r_ret = inputs[idx].name;
 		} else {
 			return false;
@@ -138,8 +129,8 @@ bool VisualScriptExpression::_get(const StringName &p_name, Variant &r_ret) cons
 
 	return false;
 }
-void VisualScriptExpression::_get_property_list(List<PropertyInfo> *p_list) const {
 
+void VisualScriptExpression::_get_property_list(List<PropertyInfo> *p_list) const {
 	String argt = "Any";
 	for (int i = 1; i < Variant::VARIANT_MAX; i++) {
 		argt += "," + Variant::get_type_name(Variant::Type(i));
@@ -151,117 +142,99 @@ void VisualScriptExpression::_get_property_list(List<PropertyInfo> *p_list) cons
 	p_list->push_back(PropertyInfo(Variant::BOOL, "sequenced"));
 
 	for (int i = 0; i < inputs.size(); i++) {
-
 		p_list->push_back(PropertyInfo(Variant::INT, "input_" + itos(i) + "/type", PROPERTY_HINT_ENUM, argt));
 		p_list->push_back(PropertyInfo(Variant::STRING, "input_" + itos(i) + "/name"));
 	}
 }
 
 int VisualScriptExpression::get_output_sequence_port_count() const {
-
 	return sequenced ? 1 : 0;
 }
-bool VisualScriptExpression::has_input_sequence_port() const {
 
+bool VisualScriptExpression::has_input_sequence_port() const {
 	return sequenced;
 }
 
 String VisualScriptExpression::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 int VisualScriptExpression::get_input_value_port_count() const {
-
 	return inputs.size();
 }
-int VisualScriptExpression::get_output_value_port_count() const {
 
+int VisualScriptExpression::get_output_value_port_count() const {
 	return 1;
 }
 
 PropertyInfo VisualScriptExpression::get_input_value_port_info(int p_idx) const {
-
 	return PropertyInfo(inputs[p_idx].type, inputs[p_idx].name);
 }
-PropertyInfo VisualScriptExpression::get_output_value_port_info(int p_idx) const {
 
+PropertyInfo VisualScriptExpression::get_output_value_port_info(int p_idx) const {
 	return PropertyInfo(output_type, "result");
 }
 
 String VisualScriptExpression::get_caption() const {
-
 	return "Expression";
 }
-String VisualScriptExpression::get_text() const {
 
+String VisualScriptExpression::get_text() const {
 	return expression;
 }
 
 Error VisualScriptExpression::_get_token(Token &r_token) {
-
 	while (true) {
 #define GET_CHAR() (str_ofs >= expression.length() ? 0 : expression[str_ofs++])
 
-		CharType cchar = GET_CHAR();
+		char32_t cchar = GET_CHAR();
 		if (cchar == 0) {
 			r_token.type = TK_EOF;
 			return OK;
 		}
 
 		switch (cchar) {
-
 			case 0: {
 				r_token.type = TK_EOF;
 				return OK;
 			} break;
 			case '{': {
-
 				r_token.type = TK_CURLY_BRACKET_OPEN;
 				return OK;
 			};
 			case '}': {
-
 				r_token.type = TK_CURLY_BRACKET_CLOSE;
 				return OK;
 			};
 			case '[': {
-
 				r_token.type = TK_BRACKET_OPEN;
 				return OK;
 			};
 			case ']': {
-
 				r_token.type = TK_BRACKET_CLOSE;
 				return OK;
 			};
 			case '(': {
-
 				r_token.type = TK_PARENTHESIS_OPEN;
 				return OK;
 			};
 			case ')': {
-
 				r_token.type = TK_PARENTHESIS_CLOSE;
 				return OK;
 			};
 			case ',': {
-
 				r_token.type = TK_COMMA;
 				return OK;
 			};
 			case ':': {
-
 				r_token.type = TK_COLON;
 				return OK;
 			};
 			case '.': {
-
 				r_token.type = TK_PERIOD;
 				return OK;
 			};
 			case '=': {
-
 				cchar = GET_CHAR();
 				if (cchar == '=') {
 					r_token.type = TK_OP_EQUAL;
@@ -273,7 +246,6 @@ Error VisualScriptExpression::_get_token(Token &r_token) {
 				return OK;
 			};
 			case '!': {
-
 				if (expression[str_ofs] == '=') {
 					r_token.type = TK_OP_NOT_EQUAL;
 					str_ofs++;
@@ -283,7 +255,6 @@ Error VisualScriptExpression::_get_token(Token &r_token) {
 				return OK;
 			};
 			case '>': {
-
 				if (expression[str_ofs] == '=') {
 					r_token.type = TK_OP_GREATER_EQUAL;
 					str_ofs++;
@@ -296,7 +267,6 @@ Error VisualScriptExpression::_get_token(Token &r_token) {
 				return OK;
 			};
 			case '<': {
-
 				if (expression[str_ofs] == '=') {
 					r_token.type = TK_OP_LESS_EQUAL;
 					str_ofs++;
@@ -329,7 +299,6 @@ Error VisualScriptExpression::_get_token(Token &r_token) {
 				return OK;
 			};
 			case '&': {
-
 				if (expression[str_ofs] == '&') {
 					r_token.type = TK_OP_AND;
 					str_ofs++;
@@ -339,7 +308,6 @@ Error VisualScriptExpression::_get_token(Token &r_token) {
 				return OK;
 			};
 			case '|': {
-
 				if (expression[str_ofs] == '|') {
 					r_token.type = TK_OP_OR;
 					str_ofs++;
@@ -349,23 +317,19 @@ Error VisualScriptExpression::_get_token(Token &r_token) {
 				return OK;
 			};
 			case '^': {
-
 				r_token.type = TK_OP_BIT_XOR;
 
 				return OK;
 			};
 			case '~': {
-
 				r_token.type = TK_OP_BIT_INVERT;
 
 				return OK;
 			};
 			case '"': {
-
 				String str;
 				while (true) {
-
-					CharType ch = GET_CHAR();
+					char32_t ch = GET_CHAR();
 
 					if (ch == 0) {
 						_set_error("Unterminated String");
@@ -376,26 +340,34 @@ Error VisualScriptExpression::_get_token(Token &r_token) {
 					} else if (ch == '\\') {
 						//escaped characters...
 
-						CharType next = GET_CHAR();
+						char32_t next = GET_CHAR();
 						if (next == 0) {
 							_set_error("Unterminated String");
 							r_token.type = TK_ERROR;
 							return ERR_PARSE_ERROR;
 						}
-						CharType res = 0;
+						char32_t res = 0;
 
 						switch (next) {
-
-							case 'b': res = 8; break;
-							case 't': res = 9; break;
-							case 'n': res = 10; break;
-							case 'f': res = 12; break;
-							case 'r': res = 13; break;
+							case 'b':
+								res = 8;
+								break;
+							case 't':
+								res = 9;
+								break;
+							case 'n':
+								res = 10;
+								break;
+							case 'f':
+								res = 12;
+								break;
+							case 'r':
+								res = 13;
+								break;
 							case 'u': {
-								//hexnumbarh - oct is deprecated
-
+								// hex number
 								for (int j = 0; j < 4; j++) {
-									CharType c = GET_CHAR();
+									char32_t c = GET_CHAR();
 
 									if (c == 0) {
 										_set_error("Unterminated String");
@@ -403,12 +375,11 @@ Error VisualScriptExpression::_get_token(Token &r_token) {
 										return ERR_PARSE_ERROR;
 									}
 									if (!((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F'))) {
-
 										_set_error("Malformed hex constant in string");
 										r_token.type = TK_ERROR;
 										return ERR_PARSE_ERROR;
 									}
-									CharType v;
+									char32_t v;
 									if (c >= '0' && c <= '9') {
 										v = c - '0';
 									} else if (c >= 'a' && c <= 'f') {
@@ -418,7 +389,7 @@ Error VisualScriptExpression::_get_token(Token &r_token) {
 										v = c - 'A';
 										v += 10;
 									} else {
-										ERR_PRINT("BUG");
+										ERR_PRINT("Bug parsing hex constant.");
 										v = 0;
 									}
 
@@ -427,13 +398,8 @@ Error VisualScriptExpression::_get_token(Token &r_token) {
 								}
 
 							} break;
-							//case '\"': res='\"'; break;
-							//case '\\': res='\\'; break;
-							//case '/': res='/'; break;
 							default: {
 								res = next;
-								//r_err_str="Invalid escape sequence";
-								//return ERR_PARSE_ERROR;
 							} break;
 						}
 
@@ -450,7 +416,6 @@ Error VisualScriptExpression::_get_token(Token &r_token) {
 
 			} break;
 			default: {
-
 				if (cchar <= 32) {
 					break;
 				}
@@ -466,16 +431,14 @@ Error VisualScriptExpression::_get_token(Token &r_token) {
 #define READING_DONE 4
 					int reading = READING_INT;
 
-					CharType c = cchar;
+					char32_t c = cchar;
 					bool exp_sign = false;
 					bool exp_beg = false;
 					bool is_float = false;
 
 					while (true) {
-
 						switch (reading) {
 							case READING_INT: {
-
 								if (c >= '0' && c <= '9') {
 									//pass
 								} else if (c == '.') {
@@ -489,9 +452,7 @@ Error VisualScriptExpression::_get_token(Token &r_token) {
 
 							} break;
 							case READING_DEC: {
-
 								if (c >= '0' && c <= '9') {
-
 								} else if (c == 'e') {
 									reading = READING_EXP;
 
@@ -501,13 +462,13 @@ Error VisualScriptExpression::_get_token(Token &r_token) {
 
 							} break;
 							case READING_EXP: {
-
 								if (c >= '0' && c <= '9') {
 									exp_beg = true;
 
 								} else if ((c == '-' || c == '+') && !exp_sign && !exp_beg) {
-									if (c == '-')
+									if (c == '-') {
 										is_float = true;
+									}
 									exp_sign = true;
 
 								} else {
@@ -516,8 +477,9 @@ Error VisualScriptExpression::_get_token(Token &r_token) {
 							} break;
 						}
 
-						if (reading == READING_DONE)
+						if (reading == READING_DONE) {
 							break;
+						}
 						num += String::chr(c);
 						c = GET_CHAR();
 					}
@@ -526,19 +488,18 @@ Error VisualScriptExpression::_get_token(Token &r_token) {
 
 					r_token.type = TK_CONSTANT;
 
-					if (is_float)
-						r_token.value = num.to_double();
-					else
+					if (is_float) {
+						r_token.value = num.to_float();
+					} else {
 						r_token.value = num.to_int();
+					}
 					return OK;
 
 				} else if ((cchar >= 'A' && cchar <= 'Z') || (cchar >= 'a' && cchar <= 'z') || cchar == '_') {
-
 					String id;
 					bool first = true;
 
 					while ((cchar >= 'A' && cchar <= 'Z') || (cchar >= 'a' && cchar <= 'z') || cchar == '_' || (!first && cchar >= '0' && cchar <= '9')) {
-
 						id += String::chr(cchar);
 						cchar = GET_CHAR();
 						first = false;
@@ -578,7 +539,6 @@ Error VisualScriptExpression::_get_token(Token &r_token) {
 					} else if (id == "self") {
 						r_token.type = TK_SELF;
 					} else {
-
 						for (int i = 0; i < Variant::VARIANT_MAX; i++) {
 							if (id == Variant::get_type_name(Variant::Type(i))) {
 								r_token.type = TK_BASIC_TYPE;
@@ -653,17 +613,17 @@ const char *VisualScriptExpression::token_name[TK_MAX] = {
 };
 
 VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() {
-
 	Vector<Expression> expression;
 
 	while (true) {
 		//keep appending stuff to expression
-		ENode *expr = NULL;
+		ENode *expr = nullptr;
 
 		Token tk;
 		_get_token(tk);
-		if (error_set)
-			return NULL;
+		if (error_set) {
+			return nullptr;
+		}
 
 		switch (tk.type) {
 			case TK_CURLY_BRACKET_OPEN: {
@@ -671,7 +631,6 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() {
 				DictionaryNode *dn = alloc_node<DictionaryNode>();
 
 				while (true) {
-
 					int cofs = str_ofs;
 					_get_token(tk);
 					if (tk.type == TK_CURLY_BRACKET_CLOSE) {
@@ -680,19 +639,21 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() {
 					str_ofs = cofs; //revert
 					//parse an expression
 					ENode *expr2 = _parse_expression();
-					if (!expr2)
-						return NULL;
+					if (!expr2) {
+						return nullptr;
+					}
 					dn->dict.push_back(expr2);
 
 					_get_token(tk);
 					if (tk.type != TK_COLON) {
 						_set_error("Expected ':'");
-						return NULL;
+						return nullptr;
 					}
 
 					expr2 = _parse_expression();
-					if (!expr2)
-						return NULL;
+					if (!expr2) {
+						return nullptr;
+					}
 
 					dn->dict.push_back(expr2);
 
@@ -715,7 +676,6 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() {
 				ArrayNode *an = alloc_node<ArrayNode>();
 
 				while (true) {
-
 					int cofs = str_ofs;
 					_get_token(tk);
 					if (tk.type == TK_BRACKET_CLOSE) {
@@ -724,8 +684,9 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() {
 					str_ofs = cofs; //revert
 					//parse an expression
 					ENode *expr2 = _parse_expression();
-					if (!expr2)
-						return NULL;
+					if (!expr2) {
+						return nullptr;
+					}
 					an->array.push_back(expr2);
 
 					cofs = str_ofs;
@@ -744,19 +705,19 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() {
 			case TK_PARENTHESIS_OPEN: {
 				//a suexpression
 				ENode *e = _parse_expression();
-				if (error_set)
-					return NULL;
+				if (error_set) {
+					return nullptr;
+				}
 				_get_token(tk);
 				if (tk.type != TK_PARENTHESIS_CLOSE) {
 					_set_error("Expected ')'");
-					return NULL;
+					return nullptr;
 				}
 
 				expr = e;
 
 			} break;
 			case TK_IDENTIFIER: {
-
 				String what = tk.value;
 				int index = -1;
 				for (int i = 0; i < inputs.size(); i++) {
@@ -772,11 +733,10 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() {
 					expr = input;
 				} else {
 					_set_error("Invalid input identifier '" + what + "'. For script variables, use self (locals are for inputs)." + what);
-					return NULL;
+					return nullptr;
 				}
 			} break;
 			case TK_SELF: {
-
 				SelfNode *self = alloc_node<SelfNode>();
 				expr = self;
 			} break;
@@ -792,14 +752,13 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() {
 				_get_token(tk);
 				if (tk.type != TK_PARENTHESIS_OPEN) {
 					_set_error("Expected '('");
-					return NULL;
+					return nullptr;
 				}
 
 				ConstructorNode *constructor = alloc_node<ConstructorNode>();
 				constructor->data_type = bt;
 
 				while (true) {
-
 					int cofs = str_ofs;
 					_get_token(tk);
 					if (tk.type == TK_PARENTHESIS_CLOSE) {
@@ -808,8 +767,9 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() {
 					str_ofs = cofs; //revert
 					//parse an expression
 					ENode *expr2 = _parse_expression();
-					if (!expr2)
-						return NULL;
+					if (!expr2) {
+						return nullptr;
+					}
 
 					constructor->arguments.push_back(expr2);
 
@@ -833,14 +793,13 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() {
 				_get_token(tk);
 				if (tk.type != TK_PARENTHESIS_OPEN) {
 					_set_error("Expected '('");
-					return NULL;
+					return nullptr;
 				}
 
 				BuiltinFuncNode *bifunc = alloc_node<BuiltinFuncNode>();
 				bifunc->func = VisualScriptBuiltinFunc::BuiltinFunc(int(tk.value));
 
 				while (true) {
-
 					int cofs = str_ofs;
 					_get_token(tk);
 					if (tk.type == TK_PARENTHESIS_CLOSE) {
@@ -849,8 +808,9 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() {
 					str_ofs = cofs; //revert
 					//parse an expression
 					ENode *expr2 = _parse_expression();
-					if (!expr2)
-						return NULL;
+					if (!expr2) {
+						return nullptr;
+					}
 
 					bifunc->arguments.push_back(expr2);
 
@@ -874,7 +834,6 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() {
 
 			} break;
 			case TK_OP_SUB: {
-
 				Expression e;
 				e.is_op = true;
 				e.op = Variant::OP_NEGATE;
@@ -882,7 +841,6 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() {
 				continue;
 			} break;
 			case TK_OP_NOT: {
-
 				Expression e;
 				e.is_op = true;
 				e.op = Variant::OP_NOT;
@@ -892,7 +850,7 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() {
 
 			default: {
 				_set_error("Expected expression.");
-				return NULL;
+				return nullptr;
 			} break;
 		}
 
@@ -901,8 +859,9 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() {
 		while (true) {
 			int cofs2 = str_ofs;
 			_get_token(tk);
-			if (error_set)
-				return NULL;
+			if (error_set) {
+				return nullptr;
+			}
 
 			bool done = false;
 
@@ -914,15 +873,16 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() {
 					index->base = expr;
 
 					ENode *what = _parse_expression();
-					if (!what)
-						return NULL;
+					if (!what) {
+						return nullptr;
+					}
 
 					index->index = what;
 
 					_get_token(tk);
 					if (tk.type != TK_BRACKET_CLOSE) {
 						_set_error("Expected ']' at end of index.");
-						return NULL;
+						return nullptr;
 					}
 					expr = index;
 
@@ -932,7 +892,7 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() {
 					_get_token(tk);
 					if (tk.type != TK_IDENTIFIER) {
 						_set_error("Expected identifier after '.'");
-						return NULL;
+						return nullptr;
 					}
 
 					StringName identifier = tk.value;
@@ -946,7 +906,6 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() {
 						func_call->base = expr;
 
 						while (true) {
-
 							int cofs3 = str_ofs;
 							_get_token(tk);
 							if (tk.type == TK_PARENTHESIS_CLOSE) {
@@ -955,8 +914,9 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() {
 							str_ofs = cofs3; //revert
 							//parse an expression
 							ENode *expr2 = _parse_expression();
-							if (!expr2)
-								return NULL;
+							if (!expr2) {
+								return nullptr;
+							}
 
 							func_call->arguments.push_back(expr2);
 
@@ -989,8 +949,9 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() {
 				} break;
 			}
 
-			if (done)
+			if (done) {
 				break;
+			}
 		}
 
 		//push expression
@@ -1005,33 +966,76 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() {
 
 		int cofs = str_ofs;
 		_get_token(tk);
-		if (error_set)
-			return NULL;
+		if (error_set) {
+			return nullptr;
+		}
 
 		Variant::Operator op = Variant::OP_MAX;
 
 		switch (tk.type) {
-			case TK_OP_IN: op = Variant::OP_IN; break;
-			case TK_OP_EQUAL: op = Variant::OP_EQUAL; break;
-			case TK_OP_NOT_EQUAL: op = Variant::OP_NOT_EQUAL; break;
-			case TK_OP_LESS: op = Variant::OP_LESS; break;
-			case TK_OP_LESS_EQUAL: op = Variant::OP_LESS_EQUAL; break;
-			case TK_OP_GREATER: op = Variant::OP_GREATER; break;
-			case TK_OP_GREATER_EQUAL: op = Variant::OP_GREATER_EQUAL; break;
-			case TK_OP_AND: op = Variant::OP_AND; break;
-			case TK_OP_OR: op = Variant::OP_OR; break;
-			case TK_OP_NOT: op = Variant::OP_NOT; break;
-			case TK_OP_ADD: op = Variant::OP_ADD; break;
-			case TK_OP_SUB: op = Variant::OP_SUBTRACT; break;
-			case TK_OP_MUL: op = Variant::OP_MULTIPLY; break;
-			case TK_OP_DIV: op = Variant::OP_DIVIDE; break;
-			case TK_OP_MOD: op = Variant::OP_MODULE; break;
-			case TK_OP_SHIFT_LEFT: op = Variant::OP_SHIFT_LEFT; break;
-			case TK_OP_SHIFT_RIGHT: op = Variant::OP_SHIFT_RIGHT; break;
-			case TK_OP_BIT_AND: op = Variant::OP_BIT_AND; break;
-			case TK_OP_BIT_OR: op = Variant::OP_BIT_OR; break;
-			case TK_OP_BIT_XOR: op = Variant::OP_BIT_XOR; break;
-			case TK_OP_BIT_INVERT: op = Variant::OP_BIT_NEGATE; break;
+			case TK_OP_IN:
+				op = Variant::OP_IN;
+				break;
+			case TK_OP_EQUAL:
+				op = Variant::OP_EQUAL;
+				break;
+			case TK_OP_NOT_EQUAL:
+				op = Variant::OP_NOT_EQUAL;
+				break;
+			case TK_OP_LESS:
+				op = Variant::OP_LESS;
+				break;
+			case TK_OP_LESS_EQUAL:
+				op = Variant::OP_LESS_EQUAL;
+				break;
+			case TK_OP_GREATER:
+				op = Variant::OP_GREATER;
+				break;
+			case TK_OP_GREATER_EQUAL:
+				op = Variant::OP_GREATER_EQUAL;
+				break;
+			case TK_OP_AND:
+				op = Variant::OP_AND;
+				break;
+			case TK_OP_OR:
+				op = Variant::OP_OR;
+				break;
+			case TK_OP_NOT:
+				op = Variant::OP_NOT;
+				break;
+			case TK_OP_ADD:
+				op = Variant::OP_ADD;
+				break;
+			case TK_OP_SUB:
+				op = Variant::OP_SUBTRACT;
+				break;
+			case TK_OP_MUL:
+				op = Variant::OP_MULTIPLY;
+				break;
+			case TK_OP_DIV:
+				op = Variant::OP_DIVIDE;
+				break;
+			case TK_OP_MOD:
+				op = Variant::OP_MODULE;
+				break;
+			case TK_OP_SHIFT_LEFT:
+				op = Variant::OP_SHIFT_LEFT;
+				break;
+			case TK_OP_SHIFT_RIGHT:
+				op = Variant::OP_SHIFT_RIGHT;
+				break;
+			case TK_OP_BIT_AND:
+				op = Variant::OP_BIT_AND;
+				break;
+			case TK_OP_BIT_OR:
+				op = Variant::OP_BIT_OR;
+				break;
+			case TK_OP_BIT_XOR:
+				op = Variant::OP_BIT_XOR;
+				break;
+			case TK_OP_BIT_INVERT:
+				op = Variant::OP_BIT_NEGATE;
+				break;
 			default: {
 			};
 		}
@@ -1053,15 +1057,12 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() {
 	/* Reduce the set set of expressions and place them in an operator tree, respecting precedence */
 
 	while (expression.size() > 1) {
-
 		int next_op = -1;
 		int min_priority = 0xFFFFF;
 		bool is_unary = false;
 
 		for (int i = 0; i < expression.size(); i++) {
-
 			if (!expression[i].is_op) {
-
 				continue;
 			}
 
@@ -1070,7 +1071,6 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() {
 			bool unary = false;
 
 			switch (expression[i].op) {
-
 				case Variant::OP_BIT_NEGATE:
 					priority = 0;
 					unary = true;
@@ -1080,40 +1080,78 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() {
 					unary = true;
 					break;
 
-				case Variant::OP_MULTIPLY: priority = 2; break;
-				case Variant::OP_DIVIDE: priority = 2; break;
-				case Variant::OP_MODULE: priority = 2; break;
+				case Variant::OP_MULTIPLY:
+					priority = 2;
+					break;
+				case Variant::OP_DIVIDE:
+					priority = 2;
+					break;
+				case Variant::OP_MODULE:
+					priority = 2;
+					break;
 
-				case Variant::OP_ADD: priority = 3; break;
-				case Variant::OP_SUBTRACT: priority = 3; break;
+				case Variant::OP_ADD:
+					priority = 3;
+					break;
+				case Variant::OP_SUBTRACT:
+					priority = 3;
+					break;
 
-				case Variant::OP_SHIFT_LEFT: priority = 4; break;
-				case Variant::OP_SHIFT_RIGHT: priority = 4; break;
+				case Variant::OP_SHIFT_LEFT:
+					priority = 4;
+					break;
+				case Variant::OP_SHIFT_RIGHT:
+					priority = 4;
+					break;
 
-				case Variant::OP_BIT_AND: priority = 5; break;
-				case Variant::OP_BIT_XOR: priority = 6; break;
-				case Variant::OP_BIT_OR: priority = 7; break;
+				case Variant::OP_BIT_AND:
+					priority = 5;
+					break;
+				case Variant::OP_BIT_XOR:
+					priority = 6;
+					break;
+				case Variant::OP_BIT_OR:
+					priority = 7;
+					break;
 
-				case Variant::OP_LESS: priority = 8; break;
-				case Variant::OP_LESS_EQUAL: priority = 8; break;
-				case Variant::OP_GREATER: priority = 8; break;
-				case Variant::OP_GREATER_EQUAL: priority = 8; break;
+				case Variant::OP_LESS:
+					priority = 8;
+					break;
+				case Variant::OP_LESS_EQUAL:
+					priority = 8;
+					break;
+				case Variant::OP_GREATER:
+					priority = 8;
+					break;
+				case Variant::OP_GREATER_EQUAL:
+					priority = 8;
+					break;
 
-				case Variant::OP_EQUAL: priority = 8; break;
-				case Variant::OP_NOT_EQUAL: priority = 8; break;
+				case Variant::OP_EQUAL:
+					priority = 8;
+					break;
+				case Variant::OP_NOT_EQUAL:
+					priority = 8;
+					break;
 
-				case Variant::OP_IN: priority = 10; break;
+				case Variant::OP_IN:
+					priority = 10;
+					break;
 
 				case Variant::OP_NOT:
 					priority = 11;
 					unary = true;
 					break;
-				case Variant::OP_AND: priority = 12; break;
-				case Variant::OP_OR: priority = 13; break;
+				case Variant::OP_AND:
+					priority = 12;
+					break;
+				case Variant::OP_OR:
+					priority = 13;
+					break;
 
 				default: {
 					_set_error("Parser bug, invalid operator in expression: " + itos(expression[i].op));
-					return NULL;
+					return nullptr;
 				}
 			}
 
@@ -1128,51 +1166,45 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() {
 		}
 
 		if (next_op == -1) {
-
 			_set_error("Yet another parser bug....");
-			ERR_FAIL_V(NULL);
+			ERR_FAIL_V(nullptr);
 		}
 
 		// OK! create operator..
 		if (is_unary) {
-
 			int expr_pos = next_op;
 			while (expression[expr_pos].is_op) {
-
 				expr_pos++;
 				if (expr_pos == expression.size()) {
 					//can happen..
 					_set_error("Unexpected end of expression...");
-					return NULL;
+					return nullptr;
 				}
 			}
 
-			//consecutively do unary opeators
+			//consecutively do unary operators
 			for (int i = expr_pos - 1; i >= next_op; i--) {
-
 				OperatorNode *op = alloc_node<OperatorNode>();
 				op->op = expression[i].op;
 				op->nodes[0] = expression[i + 1].node;
-				op->nodes[1] = NULL;
+				op->nodes[1] = nullptr;
 				expression.write[i].is_op = false;
 				expression.write[i].node = op;
 				expression.remove(i + 1);
 			}
 
 		} else {
-
 			if (next_op < 1 || next_op >= (expression.size() - 1)) {
 				_set_error("Parser bug...");
-				ERR_FAIL_V(NULL);
+				ERR_FAIL_V(nullptr);
 			}
 
 			OperatorNode *op = alloc_node<OperatorNode>();
 			op->op = expression[next_op].op;
 
 			if (expression[next_op - 1].is_op) {
-
 				_set_error("Parser bug...");
-				ERR_FAIL_V(NULL);
+				ERR_FAIL_V(nullptr);
 			}
 
 			if (expression[next_op + 1].is_op) {
@@ -1182,7 +1214,7 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() {
 				// due to how precedence works, unaries will always disappear first
 
 				_set_error("Unexpected two consecutive operators.");
-				return NULL;
+				return nullptr;
 			}
 
 			op->nodes[0] = expression[next_op - 1].node; //expression goes as left
@@ -1199,14 +1231,14 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() {
 }
 
 bool VisualScriptExpression::_compile_expression() {
-
-	if (!expression_dirty)
+	if (!expression_dirty) {
 		return error_set;
+	}
 
 	if (nodes) {
 		memdelete(nodes);
-		nodes = NULL;
-		root = NULL;
+		nodes = nullptr;
+		root = nullptr;
 	}
 
 	error_str = String();
@@ -1216,11 +1248,11 @@ bool VisualScriptExpression::_compile_expression() {
 	root = _parse_expression();
 
 	if (error_set) {
-		root = NULL;
+		root = nullptr;
 		if (nodes) {
 			memdelete(nodes);
 		}
-		nodes = NULL;
+		nodes = nullptr;
 		return true;
 	}
 
@@ -1235,39 +1267,36 @@ public:
 
 	//virtual int get_working_memory_size() const { return 0; }
 	//execute by parsing the tree directly
-	virtual bool _execute(const Variant **p_inputs, VisualScriptExpression::ENode *p_node, Variant &r_ret, String &r_error_str, Variant::CallError &ce) {
-
+	virtual bool _execute(const Variant **p_inputs, VisualScriptExpression::ENode *p_node, Variant &r_ret, String &r_error_str, Callable::CallError &ce) {
 		switch (p_node->type) {
 			case VisualScriptExpression::ENode::TYPE_INPUT: {
-
 				const VisualScriptExpression::InputNode *in = static_cast<const VisualScriptExpression::InputNode *>(p_node);
 				r_ret = *p_inputs[in->index];
 			} break;
 			case VisualScriptExpression::ENode::TYPE_CONSTANT: {
-
 				const VisualScriptExpression::ConstantNode *c = static_cast<const VisualScriptExpression::ConstantNode *>(p_node);
 				r_ret = c->value;
 
 			} break;
 			case VisualScriptExpression::ENode::TYPE_SELF: {
-
 				r_ret = instance->get_owner_ptr();
 			} break;
 			case VisualScriptExpression::ENode::TYPE_OPERATOR: {
-
 				const VisualScriptExpression::OperatorNode *op = static_cast<const VisualScriptExpression::OperatorNode *>(p_node);
 
 				Variant a;
 				bool ret = _execute(p_inputs, op->nodes[0], a, r_error_str, ce);
-				if (ret)
+				if (ret) {
 					return true;
+				}
 
 				Variant b;
 
 				if (op->nodes[1]) {
 					ret = _execute(p_inputs, op->nodes[1], b, r_error_str, ce);
-					if (ret)
+					if (ret) {
 						return true;
+					}
 				}
 
 				bool valid = true;
@@ -1279,19 +1308,20 @@ public:
 
 			} break;
 			case VisualScriptExpression::ENode::TYPE_INDEX: {
-
 				const VisualScriptExpression::IndexNode *index = static_cast<const VisualScriptExpression::IndexNode *>(p_node);
 
 				Variant base;
 				bool ret = _execute(p_inputs, index->base, base, r_error_str, ce);
-				if (ret)
+				if (ret) {
 					return true;
+				}
 
 				Variant idx;
 
 				ret = _execute(p_inputs, index->index, idx, r_error_str, ce);
-				if (ret)
+				if (ret) {
 					return true;
+				}
 
 				bool valid;
 				r_ret = base.get(idx, &valid);
@@ -1302,13 +1332,13 @@ public:
 
 			} break;
 			case VisualScriptExpression::ENode::TYPE_NAMED_INDEX: {
-
 				const VisualScriptExpression::NamedIndexNode *index = static_cast<const VisualScriptExpression::NamedIndexNode *>(p_node);
 
 				Variant base;
 				bool ret = _execute(p_inputs, index->base, base, r_error_str, ce);
-				if (ret)
+				if (ret) {
 					return true;
+				}
 
 				bool valid;
 				r_ret = base.get_named(index->name, &valid);
@@ -1324,11 +1354,11 @@ public:
 				Array arr;
 				arr.resize(array->array.size());
 				for (int i = 0; i < array->array.size(); i++) {
-
 					Variant value;
 					bool ret = _execute(p_inputs, array->array[i], value, r_error_str, ce);
-					if (ret)
+					if (ret) {
 						return true;
+					}
 					arr[i] = value;
 				}
 
@@ -1340,16 +1370,17 @@ public:
 
 				Dictionary d;
 				for (int i = 0; i < dictionary->dict.size(); i += 2) {
-
 					Variant key;
 					bool ret = _execute(p_inputs, dictionary->dict[i + 0], key, r_error_str, ce);
-					if (ret)
+					if (ret) {
 						return true;
+					}
 
 					Variant value;
 					ret = _execute(p_inputs, dictionary->dict[i + 1], value, r_error_str, ce);
-					if (ret)
+					if (ret) {
 						return true;
+					}
 
 					d[key] = value;
 				}
@@ -1357,7 +1388,6 @@ public:
 				r_ret = d;
 			} break;
 			case VisualScriptExpression::ENode::TYPE_CONSTRUCTOR: {
-
 				const VisualScriptExpression::ConstructorNode *constructor = static_cast<const VisualScriptExpression::ConstructorNode *>(p_node);
 
 				Vector<Variant> arr;
@@ -1366,25 +1396,24 @@ public:
 				argp.resize(constructor->arguments.size());
 
 				for (int i = 0; i < constructor->arguments.size(); i++) {
-
 					Variant value;
 					bool ret = _execute(p_inputs, constructor->arguments[i], value, r_error_str, ce);
-					if (ret)
+					if (ret) {
 						return true;
+					}
 					arr.write[i] = value;
 					argp.write[i] = &arr[i];
 				}
 
 				r_ret = Variant::construct(constructor->data_type, (const Variant **)argp.ptr(), argp.size(), ce);
 
-				if (ce.error != Variant::CallError::CALL_OK) {
+				if (ce.error != Callable::CallError::CALL_OK) {
 					r_error_str = "Invalid arguments to construct '" + Variant::get_type_name(constructor->data_type) + "'.";
 					return true;
 				}
 
 			} break;
 			case VisualScriptExpression::ENode::TYPE_BUILTIN_FUNC: {
-
 				const VisualScriptExpression::BuiltinFuncNode *bifunc = static_cast<const VisualScriptExpression::BuiltinFuncNode *>(p_node);
 
 				Vector<Variant> arr;
@@ -1393,31 +1422,31 @@ public:
 				argp.resize(bifunc->arguments.size());
 
 				for (int i = 0; i < bifunc->arguments.size(); i++) {
-
 					Variant value;
 					bool ret = _execute(p_inputs, bifunc->arguments[i], value, r_error_str, ce);
-					if (ret)
+					if (ret) {
 						return true;
+					}
 					arr.write[i] = value;
 					argp.write[i] = &arr[i];
 				}
 
 				VisualScriptBuiltinFunc::exec_func(bifunc->func, (const Variant **)argp.ptr(), &r_ret, ce, r_error_str);
 
-				if (ce.error != Variant::CallError::CALL_OK) {
+				if (ce.error != Callable::CallError::CALL_OK) {
 					r_error_str = "Builtin Call Failed. " + r_error_str;
 					return true;
 				}
 
 			} break;
 			case VisualScriptExpression::ENode::TYPE_CALL: {
-
 				const VisualScriptExpression::CallNode *call = static_cast<const VisualScriptExpression::CallNode *>(p_node);
 
 				Variant base;
 				bool ret = _execute(p_inputs, call->base, base, r_error_str, ce);
-				if (ret)
+				if (ret) {
 					return true;
+				}
 
 				Vector<Variant> arr;
 				Vector<const Variant *> argp;
@@ -1425,18 +1454,18 @@ public:
 				argp.resize(call->arguments.size());
 
 				for (int i = 0; i < call->arguments.size(); i++) {
-
 					Variant value;
 					bool ret2 = _execute(p_inputs, call->arguments[i], value, r_error_str, ce);
-					if (ret2)
+					if (ret2) {
 						return true;
+					}
 					arr.write[i] = value;
 					argp.write[i] = &arr[i];
 				}
 
 				r_ret = base.call(call->method, (const Variant **)argp.ptr(), argp.size(), ce);
 
-				if (ce.error != Variant::CallError::CALL_OK) {
+				if (ce.error != Callable::CallError::CALL_OK) {
 					r_error_str = "On call to '" + String(call->method) + "':";
 					return true;
 				}
@@ -1446,24 +1475,22 @@ public:
 		return false;
 	}
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		if (!expression->root || expression->error_set) {
 			r_error_str = expression->error_str;
-			r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+			r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 			return 0;
 		}
 
 		bool error = _execute(p_inputs, expression->root, *p_outputs[0], r_error_str, r_error);
-		if (error && r_error.error == Variant::CallError::CALL_OK) {
-			r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+		if (error && r_error.error == Callable::CallError::CALL_OK) {
+			r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 		}
 
 #ifdef DEBUG_ENABLED
 		if (!error && expression->output_type != Variant::NIL && !Variant::can_convert_strict(p_outputs[0]->get_type(), expression->output_type)) {
-
 			r_error_str += "Can't convert expression result from " + Variant::get_type_name(p_outputs[0]->get_type()) + " to " + Variant::get_type_name(expression->output_type) + ".";
-			r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+			r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 		}
 #endif
 
@@ -1472,7 +1499,6 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptExpression::instance(VisualScriptInstance *p_instance) {
-
 	_compile_expression();
 	VisualScriptNodeInstanceExpression *instance = memnew(VisualScriptNodeInstanceExpression);
 	instance->instance = p_instance;
@@ -1484,19 +1510,17 @@ VisualScriptExpression::VisualScriptExpression() {
 	output_type = Variant::NIL;
 	expression_dirty = true;
 	error_set = true;
-	root = NULL;
-	nodes = NULL;
+	root = nullptr;
+	nodes = nullptr;
 	sequenced = false;
 }
 
 VisualScriptExpression::~VisualScriptExpression() {
-
 	if (nodes) {
 		memdelete(nodes);
 	}
 }
 
 void register_visual_script_expression_node() {
-
 	VisualScriptLanguage::singleton->add_register_func("operators/expression", create_node_generic<VisualScriptExpression>);
 }
diff --git a/modules/visual_script/visual_script_expression.h b/modules/visual_script/visual_script_expression.h
index d131713ef0..2b3b25842d 100644
--- a/modules/visual_script/visual_script_expression.h
+++ b/modules/visual_script/visual_script_expression.h
@@ -35,12 +35,10 @@
 #include "visual_script_builtin_funcs.h"
 
 class VisualScriptExpression : public VisualScriptNode {
-
 	GDCLASS(VisualScriptExpression, VisualScriptNode);
 	friend class VisualScriptNodeInstanceExpression;
 
 	struct Input {
-
 		Variant::Type type;
 		String name;
 
@@ -101,14 +99,14 @@ class VisualScriptExpression : public VisualScriptNode {
 
 	static const char *token_name[TK_MAX];
 	struct Token {
-
 		TokenType type;
 		Variant value;
 	};
 
 	void _set_error(const String &p_err) {
-		if (error_set)
+		if (error_set) {
 			return;
+		}
 		error_str = p_err;
 		error_set = true;
 	}
@@ -119,7 +117,6 @@ class VisualScriptExpression : public VisualScriptNode {
 	bool error_set;
 
 	struct ENode {
-
 		enum Type {
 			TYPE_INPUT,
 			TYPE_CONSTANT,
@@ -138,7 +135,7 @@ class VisualScriptExpression : public VisualScriptNode {
 
 		Type type;
 
-		ENode() { next = NULL; }
+		ENode() { next = nullptr; }
 		virtual ~ENode() {
 			if (next) {
 				memdelete(next);
@@ -147,7 +144,6 @@ class VisualScriptExpression : public VisualScriptNode {
 	};
 
 	struct Expression {
-
 		bool is_op;
 		union {
 			Variant::Operator op;
@@ -158,7 +154,6 @@ class VisualScriptExpression : public VisualScriptNode {
 	ENode *_parse_expression();
 
 	struct InputNode : public ENode {
-
 		int index;
 		InputNode() {
 			type = TYPE_INPUT;
@@ -166,7 +161,6 @@ class VisualScriptExpression : public VisualScriptNode {
 	};
 
 	struct ConstantNode : public ENode {
-
 		Variant value;
 		ConstantNode() {
 			type = TYPE_CONSTANT;
@@ -174,7 +168,6 @@ class VisualScriptExpression : public VisualScriptNode {
 	};
 
 	struct OperatorNode : public ENode {
-
 		Variant::Operator op;
 
 		ENode *nodes[2];
@@ -185,7 +178,6 @@ class VisualScriptExpression : public VisualScriptNode {
 	};
 
 	struct SelfNode : public ENode {
-
 		SelfNode() {
 			type = TYPE_SELF;
 		}
@@ -267,22 +259,22 @@ protected:
 	void _get_property_list(List<PropertyInfo> *p_list) const;
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_text() const;
-	virtual String get_category() const { return "operators"; }
+	virtual String get_caption() const override;
+	virtual String get_text() const override;
+	virtual String get_category() const override { return "operators"; }
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptExpression();
 	~VisualScriptExpression();
diff --git a/modules/visual_script/visual_script_flow_control.cpp b/modules/visual_script/visual_script_flow_control.cpp
index 213dc897af..3ed20fab35 100644
--- a/modules/visual_script/visual_script_flow_control.cpp
+++ b/modules/visual_script/visual_script_flow_control.cpp
@@ -39,78 +39,70 @@
 //////////////////////////////////////////
 
 int VisualScriptReturn::get_output_sequence_port_count() const {
-
 	return 0;
 }
 
 bool VisualScriptReturn::has_input_sequence_port() const {
-
 	return true;
 }
 
 int VisualScriptReturn::get_input_value_port_count() const {
-
 	return with_value ? 1 : 0;
 }
-int VisualScriptReturn::get_output_value_port_count() const {
 
+int VisualScriptReturn::get_output_value_port_count() const {
 	return 0;
 }
 
 String VisualScriptReturn::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 PropertyInfo VisualScriptReturn::get_input_value_port_info(int p_idx) const {
-
 	PropertyInfo pinfo;
 	pinfo.name = "result";
 	pinfo.type = type;
 	return pinfo;
 }
+
 PropertyInfo VisualScriptReturn::get_output_value_port_info(int p_idx) const {
 	return PropertyInfo();
 }
 
 String VisualScriptReturn::get_caption() const {
-
 	return "Return";
 }
 
 String VisualScriptReturn::get_text() const {
-
 	return get_name();
 }
 
 void VisualScriptReturn::set_return_type(Variant::Type p_type) {
-
-	if (type == p_type)
+	if (type == p_type) {
 		return;
+	}
 	type = p_type;
 	ports_changed_notify();
 }
 
 Variant::Type VisualScriptReturn::get_return_type() const {
-
 	return type;
 }
 
 void VisualScriptReturn::set_enable_return_value(bool p_enable) {
-	if (with_value == p_enable)
+	if (with_value == p_enable) {
 		return;
+	}
 
 	with_value = p_enable;
 	ports_changed_notify();
 }
 
 bool VisualScriptReturn::is_return_value_enabled() const {
-
 	return with_value;
 }
 
 void VisualScriptReturn::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_return_type", "type"), &VisualScriptReturn::set_return_type);
 	ClassDB::bind_method(D_METHOD("get_return_type"), &VisualScriptReturn::get_return_type);
 	ClassDB::bind_method(D_METHOD("set_enable_return_value", "enable"), &VisualScriptReturn::set_enable_return_value);
@@ -135,8 +127,7 @@ public:
 	//virtual bool is_output_port_unsequenced(int p_idx) const { return false; }
 	//virtual bool get_output_port_unsequenced(int p_idx,Variant* r_value,Variant* p_working_mem,String &r_error) const { return true; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		if (with_value) {
 			*p_working_mem = *p_inputs[0];
 			return STEP_EXIT_FUNCTION_BIT;
@@ -148,7 +139,6 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptReturn::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceReturn *instance = memnew(VisualScriptNodeInstanceReturn);
 	instance->node = this;
 	instance->instance = p_instance;
@@ -157,14 +147,12 @@ VisualScriptNodeInstance *VisualScriptReturn::instance(VisualScriptInstance *p_i
 }
 
 VisualScriptReturn::VisualScriptReturn() {
-
 	with_value = false;
 	type = Variant::NIL;
 }
 
 template <bool with_value>
 static Ref<VisualScriptNode> create_return_node(const String &p_name) {
-
 	Ref<VisualScriptReturn> node;
 	node.instance();
 	node->set_enable_return_value(with_value);
@@ -176,52 +164,47 @@ static Ref<VisualScriptNode> create_return_node(const String &p_name) {
 //////////////////////////////////////////
 
 int VisualScriptCondition::get_output_sequence_port_count() const {
-
 	return 3;
 }
 
 bool VisualScriptCondition::has_input_sequence_port() const {
-
 	return true;
 }
 
 int VisualScriptCondition::get_input_value_port_count() const {
-
 	return 1;
 }
-int VisualScriptCondition::get_output_value_port_count() const {
 
+int VisualScriptCondition::get_output_value_port_count() const {
 	return 0;
 }
 
 String VisualScriptCondition::get_output_sequence_port_text(int p_port) const {
-
-	if (p_port == 0)
+	if (p_port == 0) {
 		return "true";
-	else if (p_port == 1)
+	} else if (p_port == 1) {
 		return "false";
-	else
+	} else {
 		return "done";
+	}
 }
 
 PropertyInfo VisualScriptCondition::get_input_value_port_info(int p_idx) const {
-
 	PropertyInfo pinfo;
 	pinfo.name = "cond";
 	pinfo.type = Variant::BOOL;
 	return pinfo;
 }
+
 PropertyInfo VisualScriptCondition::get_output_value_port_info(int p_idx) const {
 	return PropertyInfo();
 }
 
 String VisualScriptCondition::get_caption() const {
-
 	return "Condition";
 }
 
 String VisualScriptCondition::get_text() const {
-
 	return "if (cond) is:  ";
 }
 
@@ -237,19 +220,18 @@ public:
 	//virtual bool is_output_port_unsequenced(int p_idx) const { return false; }
 	//virtual bool get_output_port_unsequenced(int p_idx,Variant* r_value,Variant* p_working_mem,String &r_error) const { return true; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
-		if (p_start_mode == START_MODE_CONTINUE_SEQUENCE)
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
+		if (p_start_mode == START_MODE_CONTINUE_SEQUENCE) {
 			return 2;
-		else if (p_inputs[0]->operator bool())
+		} else if (p_inputs[0]->operator bool()) {
 			return 0 | STEP_FLAG_PUSH_STACK_BIT;
-		else
+		} else {
 			return 1 | STEP_FLAG_PUSH_STACK_BIT;
+		}
 	}
 };
 
 VisualScriptNodeInstance *VisualScriptCondition::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceCondition *instance = memnew(VisualScriptNodeInstanceCondition);
 	instance->node = this;
 	instance->instance = p_instance;
@@ -264,50 +246,45 @@ VisualScriptCondition::VisualScriptCondition() {
 //////////////////////////////////////////
 
 int VisualScriptWhile::get_output_sequence_port_count() const {
-
 	return 2;
 }
 
 bool VisualScriptWhile::has_input_sequence_port() const {
-
 	return true;
 }
 
 int VisualScriptWhile::get_input_value_port_count() const {
-
 	return 1;
 }
-int VisualScriptWhile::get_output_value_port_count() const {
 
+int VisualScriptWhile::get_output_value_port_count() const {
 	return 0;
 }
 
 String VisualScriptWhile::get_output_sequence_port_text(int p_port) const {
-
-	if (p_port == 0)
+	if (p_port == 0) {
 		return "repeat";
-	else
+	} else {
 		return "exit";
+	}
 }
 
 PropertyInfo VisualScriptWhile::get_input_value_port_info(int p_idx) const {
-
 	PropertyInfo pinfo;
 	pinfo.name = "cond";
 	pinfo.type = Variant::BOOL;
 	return pinfo;
 }
+
 PropertyInfo VisualScriptWhile::get_output_value_port_info(int p_idx) const {
 	return PropertyInfo();
 }
 
 String VisualScriptWhile::get_caption() const {
-
 	return "While";
 }
 
 String VisualScriptWhile::get_text() const {
-
 	return "while (cond): ";
 }
 
@@ -323,24 +300,24 @@ public:
 	//virtual bool is_output_port_unsequenced(int p_idx) const { return false; }
 	//virtual bool get_output_port_unsequenced(int p_idx,Variant* r_value,Variant* p_working_mem,String &r_error) const { return true; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		bool keep_going = p_inputs[0]->operator bool();
 
-		if (keep_going)
+		if (keep_going) {
 			return 0 | STEP_FLAG_PUSH_STACK_BIT;
-		else
+		} else {
 			return 1;
+		}
 	}
 };
 
 VisualScriptNodeInstance *VisualScriptWhile::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceWhile *instance = memnew(VisualScriptNodeInstanceWhile);
 	instance->node = this;
 	instance->instance = p_instance;
 	return instance;
 }
+
 VisualScriptWhile::VisualScriptWhile() {
 }
 
@@ -349,52 +326,48 @@ VisualScriptWhile::VisualScriptWhile() {
 //////////////////////////////////////////
 
 int VisualScriptIterator::get_output_sequence_port_count() const {
-
 	return 2;
 }
 
 bool VisualScriptIterator::has_input_sequence_port() const {
-
 	return true;
 }
 
 int VisualScriptIterator::get_input_value_port_count() const {
-
 	return 1;
 }
-int VisualScriptIterator::get_output_value_port_count() const {
 
+int VisualScriptIterator::get_output_value_port_count() const {
 	return 1;
 }
 
 String VisualScriptIterator::get_output_sequence_port_text(int p_port) const {
-
-	if (p_port == 0)
+	if (p_port == 0) {
 		return "each";
-	else
+	} else {
 		return "exit";
+	}
 }
 
 PropertyInfo VisualScriptIterator::get_input_value_port_info(int p_idx) const {
-
 	PropertyInfo pinfo;
 	pinfo.name = "input";
 	pinfo.type = Variant::NIL;
 	return pinfo;
 }
+
 PropertyInfo VisualScriptIterator::get_output_value_port_info(int p_idx) const {
 	PropertyInfo pinfo;
 	pinfo.name = "elem";
 	pinfo.type = Variant::NIL;
 	return pinfo;
 }
-String VisualScriptIterator::get_caption() const {
 
+String VisualScriptIterator::get_caption() const {
 	return "Iterator";
 }
 
 String VisualScriptIterator::get_text() const {
-
 	return "for (elem) in (input): ";
 }
 
@@ -410,26 +383,26 @@ public:
 	//virtual bool is_output_port_unsequenced(int p_idx) const { return false; }
 	//virtual bool get_output_port_unsequenced(int p_idx,Variant* r_value,Variant* p_working_mem,String &r_error) const { return true; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		if (p_start_mode == START_MODE_BEGIN_SEQUENCE) {
 			p_working_mem[0] = *p_inputs[0];
 			bool valid;
 			bool can_iter = p_inputs[0]->iter_init(p_working_mem[1], valid);
 
 			if (!valid) {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 				r_error_str = RTR("Input type not iterable: ") + Variant::get_type_name(p_inputs[0]->get_type());
 				return 0;
 			}
 
-			if (!can_iter)
+			if (!can_iter) {
 				return 1; //nothing to iterate
+			}
 
 			*p_outputs[0] = p_working_mem[0].iter_get(p_working_mem[1], valid);
 
 			if (!valid) {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 				r_error_str = RTR("Iterator became invalid");
 				return 0;
 			}
@@ -440,18 +413,19 @@ public:
 			bool can_iter = p_working_mem[0].iter_next(p_working_mem[1], valid);
 
 			if (!valid) {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 				r_error_str = RTR("Iterator became invalid: ") + Variant::get_type_name(p_inputs[0]->get_type());
 				return 0;
 			}
 
-			if (!can_iter)
+			if (!can_iter) {
 				return 1; //nothing to iterate
+			}
 
 			*p_outputs[0] = p_working_mem[0].iter_get(p_working_mem[1], valid);
 
 			if (!valid) {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 				r_error_str = RTR("Iterator became invalid");
 				return 0;
 			}
@@ -462,7 +436,6 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptIterator::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceIterator *instance = memnew(VisualScriptNodeInstanceIterator);
 	instance->node = this;
 	instance->instance = p_instance;
@@ -477,62 +450,56 @@ VisualScriptIterator::VisualScriptIterator() {
 //////////////////////////////////////////
 
 int VisualScriptSequence::get_output_sequence_port_count() const {
-
 	return steps;
 }
 
 bool VisualScriptSequence::has_input_sequence_port() const {
-
 	return true;
 }
 
 int VisualScriptSequence::get_input_value_port_count() const {
-
 	return 0;
 }
-int VisualScriptSequence::get_output_value_port_count() const {
 
+int VisualScriptSequence::get_output_value_port_count() const {
 	return 1;
 }
 
 String VisualScriptSequence::get_output_sequence_port_text(int p_port) const {
-
 	return itos(p_port + 1);
 }
 
 PropertyInfo VisualScriptSequence::get_input_value_port_info(int p_idx) const {
 	return PropertyInfo();
 }
+
 PropertyInfo VisualScriptSequence::get_output_value_port_info(int p_idx) const {
 	return PropertyInfo(Variant::INT, "current");
 }
-String VisualScriptSequence::get_caption() const {
 
+String VisualScriptSequence::get_caption() const {
 	return "Sequence";
 }
 
 String VisualScriptSequence::get_text() const {
-
 	return "in order: ";
 }
 
 void VisualScriptSequence::set_steps(int p_steps) {
-
 	ERR_FAIL_COND(p_steps < 1);
-	if (steps == p_steps)
+	if (steps == p_steps) {
 		return;
+	}
 
 	steps = p_steps;
 	ports_changed_notify();
 }
 
 int VisualScriptSequence::get_steps() const {
-
 	return steps;
 }
 
 void VisualScriptSequence::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_steps", "steps"), &VisualScriptSequence::set_steps);
 	ClassDB::bind_method(D_METHOD("get_steps"), &VisualScriptSequence::get_steps);
 
@@ -549,10 +516,8 @@ public:
 	//virtual bool is_output_port_unsequenced(int p_idx) const { return false; }
 	//virtual bool get_output_port_unsequenced(int p_idx,Variant* r_value,Variant* p_working_mem,String &r_error) const { return true; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		if (p_start_mode == START_MODE_BEGIN_SEQUENCE) {
-
 			p_working_mem[0] = 0;
 		}
 
@@ -560,9 +525,9 @@ public:
 
 		*p_outputs[0] = step;
 
-		if (step + 1 == steps)
+		if (step + 1 == steps) {
 			return step;
-		else {
+		} else {
 			p_working_mem[0] = step + 1;
 			return step | STEP_FLAG_PUSH_STACK_BIT;
 		}
@@ -570,15 +535,14 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptSequence::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceSequence *instance = memnew(VisualScriptNodeInstanceSequence);
 	instance->node = this;
 	instance->instance = p_instance;
 	instance->steps = steps;
 	return instance;
 }
-VisualScriptSequence::VisualScriptSequence() {
 
+VisualScriptSequence::VisualScriptSequence() {
 	steps = 1;
 }
 
@@ -587,52 +551,46 @@ VisualScriptSequence::VisualScriptSequence() {
 //////////////////////////////////////////
 
 int VisualScriptSwitch::get_output_sequence_port_count() const {
-
 	return case_values.size() + 1;
 }
 
 bool VisualScriptSwitch::has_input_sequence_port() const {
-
 	return true;
 }
 
 int VisualScriptSwitch::get_input_value_port_count() const {
-
 	return case_values.size() + 1;
 }
-int VisualScriptSwitch::get_output_value_port_count() const {
 
+int VisualScriptSwitch::get_output_value_port_count() const {
 	return 0;
 }
 
 String VisualScriptSwitch::get_output_sequence_port_text(int p_port) const {
-
-	if (p_port == case_values.size())
+	if (p_port == case_values.size()) {
 		return "done";
+	}
 
 	return String();
 }
 
 PropertyInfo VisualScriptSwitch::get_input_value_port_info(int p_idx) const {
-
 	if (p_idx < case_values.size()) {
 		return PropertyInfo(case_values[p_idx].type, " =");
-	} else
+	} else {
 		return PropertyInfo(Variant::NIL, "input");
+	}
 }
 
 PropertyInfo VisualScriptSwitch::get_output_value_port_info(int p_idx) const {
-
 	return PropertyInfo();
 }
 
 String VisualScriptSwitch::get_caption() const {
-
 	return "Switch";
 }
 
 String VisualScriptSwitch::get_text() const {
-
 	return "'input' is:";
 }
 
@@ -645,14 +603,12 @@ public:
 	//virtual bool is_output_port_unsequenced(int p_idx) const { return false; }
 	//virtual bool get_output_port_unsequenced(int p_idx,Variant* r_value,Variant* p_working_mem,String &r_error) const { return false; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		if (p_start_mode == START_MODE_CONTINUE_SEQUENCE) {
 			return case_count; //exit
 		}
 
 		for (int i = 0; i < case_count; i++) {
-
 			if (*p_inputs[i] == *p_inputs[case_count]) {
 				return i | STEP_FLAG_PUSH_STACK_BIT;
 			}
@@ -663,7 +619,6 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptSwitch::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceSwitch *instance = memnew(VisualScriptNodeInstanceSwitch);
 	instance->instance = p_instance;
 	instance->case_count = case_values.size();
@@ -671,7 +626,6 @@ VisualScriptNodeInstance *VisualScriptSwitch::instance(VisualScriptInstance *p_i
 }
 
 bool VisualScriptSwitch::_set(const StringName &p_name, const Variant &p_value) {
-
 	if (String(p_name) == "case_count") {
 		case_values.resize(p_value);
 		_change_notify();
@@ -680,7 +634,6 @@ bool VisualScriptSwitch::_set(const StringName &p_name, const Variant &p_value)
 	}
 
 	if (String(p_name).begins_with("case/")) {
-
 		int idx = String(p_name).get_slice("/", 1).to_int();
 		ERR_FAIL_INDEX_V(idx, case_values.size(), false);
 
@@ -695,14 +648,12 @@ bool VisualScriptSwitch::_set(const StringName &p_name, const Variant &p_value)
 }
 
 bool VisualScriptSwitch::_get(const StringName &p_name, Variant &r_ret) const {
-
 	if (String(p_name) == "case_count") {
 		r_ret = case_values.size();
 		return true;
 	}
 
 	if (String(p_name).begins_with("case/")) {
-
 		int idx = String(p_name).get_slice("/", 1).to_int();
 		ERR_FAIL_INDEX_V(idx, case_values.size(), false);
 
@@ -712,8 +663,8 @@ bool VisualScriptSwitch::_get(const StringName &p_name, Variant &r_ret) const {
 
 	return false;
 }
-void VisualScriptSwitch::_get_property_list(List<PropertyInfo> *p_list) const {
 
+void VisualScriptSwitch::_get_property_list(List<PropertyInfo> *p_list) const {
 	p_list->push_back(PropertyInfo(Variant::INT, "case_count", PROPERTY_HINT_RANGE, "0,128"));
 
 	String argt = "Any";
@@ -737,56 +688,49 @@ VisualScriptSwitch::VisualScriptSwitch() {
 //////////////////////////////////////////
 
 int VisualScriptTypeCast::get_output_sequence_port_count() const {
-
 	return 2;
 }
 
 bool VisualScriptTypeCast::has_input_sequence_port() const {
-
 	return true;
 }
 
 int VisualScriptTypeCast::get_input_value_port_count() const {
-
 	return 1;
 }
-int VisualScriptTypeCast::get_output_value_port_count() const {
 
+int VisualScriptTypeCast::get_output_value_port_count() const {
 	return 1;
 }
 
 String VisualScriptTypeCast::get_output_sequence_port_text(int p_port) const {
-
 	return p_port == 0 ? "yes" : "no";
 }
 
 PropertyInfo VisualScriptTypeCast::get_input_value_port_info(int p_idx) const {
-
 	return PropertyInfo(Variant::OBJECT, "instance");
 }
 
 PropertyInfo VisualScriptTypeCast::get_output_value_port_info(int p_idx) const {
-
 	return PropertyInfo(Variant::OBJECT, "", PROPERTY_HINT_TYPE_STRING, get_base_type());
 }
 
 String VisualScriptTypeCast::get_caption() const {
-
 	return "Type Cast";
 }
 
 String VisualScriptTypeCast::get_text() const {
-
-	if (script != String())
+	if (script != String()) {
 		return "Is " + script.get_file() + "?";
-	else
+	} else {
 		return "Is " + base_type + "?";
+	}
 }
 
 void VisualScriptTypeCast::set_base_type(const StringName &p_type) {
-
-	if (base_type == p_type)
+	if (base_type == p_type) {
 		return;
+	}
 
 	base_type = p_type;
 	_change_notify();
@@ -794,26 +738,24 @@ void VisualScriptTypeCast::set_base_type(const StringName &p_type) {
 }
 
 StringName VisualScriptTypeCast::get_base_type() const {
-
 	return base_type;
 }
 
 void VisualScriptTypeCast::set_base_script(const String &p_path) {
-
-	if (script == p_path)
+	if (script == p_path) {
 		return;
+	}
 
 	script = p_path;
 	_change_notify();
 	ports_changed_notify();
 }
-String VisualScriptTypeCast::get_base_script() const {
 
+String VisualScriptTypeCast::get_base_script() const {
 	return script;
 }
 
 VisualScriptTypeCast::TypeGuess VisualScriptTypeCast::guess_output_type(TypeGuess *p_inputs, int p_output) const {
-
 	TypeGuess tg;
 	tg.type = Variant::OBJECT;
 	if (script != String()) {
@@ -836,20 +778,18 @@ public:
 	//virtual bool is_output_port_unsequenced(int p_idx) const { return false; }
 	//virtual bool get_output_port_unsequenced(int p_idx,Variant* r_value,Variant* p_working_mem,String &r_error) const { return false; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		Object *obj = *p_inputs[0];
 
 		*p_outputs[0] = Variant();
 
 		if (!obj) {
-			r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+			r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 			r_error_str = "Instance is null";
 			return 0;
 		}
 
 		if (script != String()) {
-
 			Ref<Script> obj_script = obj->get_script();
 			if (!obj_script.is_valid()) {
 				return 1; //well, definitely not the script because object we got has no script.
@@ -861,13 +801,12 @@ public:
 			}
 			Ref<Script> cast_script = Ref<Resource>(ResourceCache::get(script));
 			if (!cast_script.is_valid()) {
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 				r_error_str = "Script path is not a script: " + script;
 				return 1;
 			}
 
 			while (obj_script.is_valid()) {
-
 				if (cast_script == obj_script) {
 					*p_outputs[0] = *p_inputs[0]; //copy
 					return 0; // it is the script, yey
@@ -882,13 +821,13 @@ public:
 		if (ClassDB::is_parent_class(obj->get_class_name(), base_type)) {
 			*p_outputs[0] = *p_inputs[0]; //copy
 			return 0;
-		} else
+		} else {
 			return 1;
+		}
 	}
 };
 
 VisualScriptNodeInstance *VisualScriptTypeCast::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceTypeCast *instance = memnew(VisualScriptNodeInstanceTypeCast);
 	instance->instance = p_instance;
 	instance->base_type = base_type;
@@ -897,7 +836,6 @@ VisualScriptNodeInstance *VisualScriptTypeCast::instance(VisualScriptInstance *p
 }
 
 void VisualScriptTypeCast::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_base_type", "type"), &VisualScriptTypeCast::set_base_type);
 	ClassDB::bind_method(D_METHOD("get_base_type"), &VisualScriptTypeCast::get_base_type);
 
@@ -911,8 +849,9 @@ void VisualScriptTypeCast::_bind_methods() {
 
 	String script_ext_hint;
 	for (List<String>::Element *E = script_extensions.front(); E; E = E->next()) {
-		if (script_ext_hint != String())
+		if (script_ext_hint != String()) {
 			script_ext_hint += ",";
+		}
 		script_ext_hint += "*." + E->get();
 	}
 
@@ -921,12 +860,10 @@ void VisualScriptTypeCast::_bind_methods() {
 }
 
 VisualScriptTypeCast::VisualScriptTypeCast() {
-
 	base_type = "Object";
 }
 
 void register_visual_script_flow_control_nodes() {
-
 	VisualScriptLanguage::singleton->add_register_func("flow_control/return", create_return_node<false>);
 	VisualScriptLanguage::singleton->add_register_func("flow_control/return_with_value", create_return_node<true>);
 	VisualScriptLanguage::singleton->add_register_func("flow_control/condition", create_node_generic<VisualScriptCondition>);
@@ -934,6 +871,6 @@ void register_visual_script_flow_control_nodes() {
 	VisualScriptLanguage::singleton->add_register_func("flow_control/iterator", create_node_generic<VisualScriptIterator>);
 	VisualScriptLanguage::singleton->add_register_func("flow_control/sequence", create_node_generic<VisualScriptSequence>);
 	VisualScriptLanguage::singleton->add_register_func("flow_control/switch", create_node_generic<VisualScriptSwitch>);
-	//VisualScriptLanguage::singleton->add_register_func("flow_control/input_filter", create_node_generic<VisualScriptInputFilter>);
+	//VisualScriptLanguage::singleton->add_register_func("flow_control/input", create_node_generic<VisualScriptInputFilter>);
 	VisualScriptLanguage::singleton->add_register_func("flow_control/type_cast", create_node_generic<VisualScriptTypeCast>);
 }
diff --git a/modules/visual_script/visual_script_flow_control.h b/modules/visual_script/visual_script_flow_control.h
index 8597d051db..1d0d6d103b 100644
--- a/modules/visual_script/visual_script_flow_control.h
+++ b/modules/visual_script/visual_script_flow_control.h
@@ -34,7 +34,6 @@
 #include "visual_script.h"
 
 class VisualScriptReturn : public VisualScriptNode {
-
 	GDCLASS(VisualScriptReturn, VisualScriptNode);
 
 	Variant::Type type;
@@ -44,20 +43,20 @@ protected:
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_text() const;
-	virtual String get_category() const { return "flow_control"; }
+	virtual String get_caption() const override;
+	virtual String get_text() const override;
+	virtual String get_category() const override { return "flow_control"; }
 
 	void set_return_type(Variant::Type);
 	Variant::Type get_return_type() const;
@@ -65,97 +64,93 @@ public:
 	void set_enable_return_value(bool p_enable);
 	bool is_return_value_enabled() const;
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptReturn();
 };
 
 class VisualScriptCondition : public VisualScriptNode {
-
 	GDCLASS(VisualScriptCondition, VisualScriptNode);
 
 protected:
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_text() const;
-	virtual String get_category() const { return "flow_control"; }
+	virtual String get_caption() const override;
+	virtual String get_text() const override;
+	virtual String get_category() const override { return "flow_control"; }
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptCondition();
 };
 
 class VisualScriptWhile : public VisualScriptNode {
-
 	GDCLASS(VisualScriptWhile, VisualScriptNode);
 
 protected:
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_text() const;
-	virtual String get_category() const { return "flow_control"; }
+	virtual String get_caption() const override;
+	virtual String get_text() const override;
+	virtual String get_category() const override { return "flow_control"; }
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptWhile();
 };
 
 class VisualScriptIterator : public VisualScriptNode {
-
 	GDCLASS(VisualScriptIterator, VisualScriptNode);
 
 protected:
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_text() const;
-	virtual String get_category() const { return "flow_control"; }
+	virtual String get_caption() const override;
+	virtual String get_text() const override;
+	virtual String get_category() const override { return "flow_control"; }
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptIterator();
 };
 
 class VisualScriptSequence : public VisualScriptNode {
-
 	GDCLASS(VisualScriptSequence, VisualScriptNode);
 
 	int steps;
@@ -164,31 +159,30 @@ protected:
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_text() const;
-	virtual String get_category() const { return "flow_control"; }
+	virtual String get_caption() const override;
+	virtual String get_text() const override;
+	virtual String get_category() const override { return "flow_control"; }
 
 	void set_steps(int p_steps);
 	int get_steps() const;
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptSequence();
 };
 
 class VisualScriptSwitch : public VisualScriptNode {
-
 	GDCLASS(VisualScriptSwitch, VisualScriptNode);
 
 	struct Case {
@@ -208,29 +202,28 @@ protected:
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
-	virtual bool has_mixed_input_and_sequence_ports() const { return true; }
+	virtual String get_output_sequence_port_text(int p_port) const override;
+	virtual bool has_mixed_input_and_sequence_ports() const override { return true; }
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_text() const;
-	virtual String get_category() const { return "flow_control"; }
+	virtual String get_caption() const override;
+	virtual String get_text() const override;
+	virtual String get_category() const override { return "flow_control"; }
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptSwitch();
 };
 
 class VisualScriptTypeCast : public VisualScriptNode {
-
 	GDCLASS(VisualScriptTypeCast, VisualScriptNode);
 
 	StringName base_type;
@@ -240,20 +233,20 @@ protected:
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_text() const;
-	virtual String get_category() const { return "flow_control"; }
+	virtual String get_caption() const override;
+	virtual String get_text() const override;
+	virtual String get_category() const override { return "flow_control"; }
 
 	void set_base_type(const StringName &p_type);
 	StringName get_base_type() const;
@@ -261,9 +254,9 @@ public:
 	void set_base_script(const String &p_path);
 	String get_base_script() const;
 
-	virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const;
+	virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const override;
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptTypeCast();
 };
diff --git a/modules/visual_script/visual_script_func_nodes.cpp b/modules/visual_script/visual_script_func_nodes.cpp
index 63c36ae431..f13377f3c8 100644
--- a/modules/visual_script/visual_script_func_nodes.cpp
+++ b/modules/visual_script/visual_script_func_nodes.cpp
@@ -42,95 +42,98 @@
 //////////////////////////////////////////
 
 int VisualScriptFunctionCall::get_output_sequence_port_count() const {
-
-	if ((method_cache.flags & METHOD_FLAG_CONST && call_mode != CALL_MODE_INSTANCE) || (call_mode == CALL_MODE_BASIC_TYPE && Variant::is_method_const(basic_type, function)))
+	if ((method_cache.flags & METHOD_FLAG_CONST && call_mode != CALL_MODE_INSTANCE) || (call_mode == CALL_MODE_BASIC_TYPE && Variant::is_method_const(basic_type, function))) {
 		return 0;
-	else
+	} else {
 		return 1;
+	}
 }
 
 bool VisualScriptFunctionCall::has_input_sequence_port() const {
-
 	return !((method_cache.flags & METHOD_FLAG_CONST && call_mode != CALL_MODE_INSTANCE) || (call_mode == CALL_MODE_BASIC_TYPE && Variant::is_method_const(basic_type, function)));
 }
 #ifdef TOOLS_ENABLED
 
 static Node *_find_script_node(Node *p_edited_scene, Node *p_current_node, const Ref<Script> &script) {
-
-	if (p_edited_scene != p_current_node && p_current_node->get_owner() != p_edited_scene)
-		return NULL;
+	if (p_edited_scene != p_current_node && p_current_node->get_owner() != p_edited_scene) {
+		return nullptr;
+	}
 
 	Ref<Script> scr = p_current_node->get_script();
 
-	if (scr.is_valid() && scr == script)
+	if (scr.is_valid() && scr == script) {
 		return p_current_node;
+	}
 
 	for (int i = 0; i < p_current_node->get_child_count(); i++) {
 		Node *n = _find_script_node(p_edited_scene, p_current_node->get_child(i), script);
-		if (n)
+		if (n) {
 			return n;
+		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 #endif
 Node *VisualScriptFunctionCall::_get_base_node() const {
-
 #ifdef TOOLS_ENABLED
 	Ref<Script> script = get_visual_script();
-	if (!script.is_valid())
-		return NULL;
+	if (!script.is_valid()) {
+		return nullptr;
+	}
 
 	MainLoop *main_loop = OS::get_singleton()->get_main_loop();
 	SceneTree *scene_tree = Object::cast_to<SceneTree>(main_loop);
 
-	if (!scene_tree)
-		return NULL;
+	if (!scene_tree) {
+		return nullptr;
+	}
 
 	Node *edited_scene = scene_tree->get_edited_scene_root();
 
-	if (!edited_scene)
-		return NULL;
+	if (!edited_scene) {
+		return nullptr;
+	}
 
 	Node *script_node = _find_script_node(edited_scene, edited_scene, script);
 
-	if (!script_node)
-		return NULL;
+	if (!script_node) {
+		return nullptr;
+	}
 
-	if (!script_node->has_node(base_path))
-		return NULL;
+	if (!script_node->has_node(base_path)) {
+		return nullptr;
+	}
 
 	Node *path_to = script_node->get_node(base_path);
 
 	return path_to;
 #else
 
-	return NULL;
+	return nullptr;
 #endif
 }
 
 StringName VisualScriptFunctionCall::_get_base_type() const {
-
-	if (call_mode == CALL_MODE_SELF && get_visual_script().is_valid())
+	if (call_mode == CALL_MODE_SELF && get_visual_script().is_valid()) {
 		return get_visual_script()->get_instance_base_type();
-	else if (call_mode == CALL_MODE_NODE_PATH && get_visual_script().is_valid()) {
+	} else if (call_mode == CALL_MODE_NODE_PATH && get_visual_script().is_valid()) {
 		Node *path = _get_base_node();
-		if (path)
+		if (path) {
 			return path->get_class();
+		}
 	}
 
 	return base_type;
 }
 
 int VisualScriptFunctionCall::get_input_value_port_count() const {
-
 	if (call_mode == CALL_MODE_BASIC_TYPE) {
 		Vector<Variant::Type> types = Variant::get_method_argument_types(basic_type, function);
 		return types.size() + (rpc_call_mode >= RPC_RELIABLE_TO_ID ? 1 : 0) + 1;
 
 	} else {
-
 		MethodBind *mb = ClassDB::get_method(_get_base_type(), function);
 		if (mb) {
 			int defaulted_args = mb->get_argument_count() < use_default_args ? mb->get_argument_count() : use_default_args;
@@ -141,10 +144,9 @@ int VisualScriptFunctionCall::get_input_value_port_count() const {
 		return method_cache.arguments.size() + (call_mode == CALL_MODE_INSTANCE ? 1 : 0) + (rpc_call_mode >= RPC_RELIABLE_TO_ID ? 1 : 0) - defaulted_args;
 	}
 }
-int VisualScriptFunctionCall::get_output_value_port_count() const {
 
+int VisualScriptFunctionCall::get_output_value_port_count() const {
 	if (call_mode == CALL_MODE_BASIC_TYPE) {
-
 		bool returns = false;
 		Variant::get_method_return_type(basic_type, function, &returns);
 		return returns ? 1 : 0;
@@ -154,8 +156,9 @@ int VisualScriptFunctionCall::get_output_value_port_count() const {
 		MethodBind *mb = ClassDB::get_method(_get_base_type(), function);
 		if (mb) {
 			ret = mb->has_return() ? 1 : 0;
-		} else
+		} else {
 			ret = 1; //it is assumed that script always returns something
+		}
 
 		if (call_mode == CALL_MODE_INSTANCE) {
 			ret++;
@@ -166,12 +169,10 @@ int VisualScriptFunctionCall::get_output_value_port_count() const {
 }
 
 String VisualScriptFunctionCall::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 PropertyInfo VisualScriptFunctionCall::get_input_value_port_info(int p_idx) const {
-
 	if (call_mode == CALL_MODE_INSTANCE || call_mode == CALL_MODE_BASIC_TYPE) {
 		if (p_idx == 0) {
 			PropertyInfo pi;
@@ -184,7 +185,6 @@ PropertyInfo VisualScriptFunctionCall::get_input_value_port_info(int p_idx) cons
 	}
 
 	if (rpc_call_mode >= RPC_RELIABLE_TO_ID) {
-
 		if (p_idx == 0) {
 			return PropertyInfo(Variant::INT, "peer_id");
 		} else {
@@ -195,13 +195,11 @@ PropertyInfo VisualScriptFunctionCall::get_input_value_port_info(int p_idx) cons
 #ifdef DEBUG_METHODS_ENABLED
 
 	if (call_mode == CALL_MODE_BASIC_TYPE) {
-
 		Vector<StringName> names = Variant::get_method_argument_names(basic_type, function);
 		Vector<Variant::Type> types = Variant::get_method_argument_types(basic_type, function);
 		return PropertyInfo(types[p_idx], names[p_idx]);
 
 	} else {
-
 		MethodBind *mb = ClassDB::get_method(_get_base_type(), function);
 		if (mb) {
 			return mb->get_argument_info(p_idx);
@@ -219,14 +217,11 @@ PropertyInfo VisualScriptFunctionCall::get_input_value_port_info(int p_idx) cons
 }
 
 PropertyInfo VisualScriptFunctionCall::get_output_value_port_info(int p_idx) const {
-
 #ifdef DEBUG_METHODS_ENABLED
 
 	if (call_mode == CALL_MODE_BASIC_TYPE) {
-
 		return PropertyInfo(Variant::get_method_return_type(basic_type, function), "");
 	} else {
-
 		if (call_mode == CALL_MODE_INSTANCE) {
 			if (p_idx == 0) {
 				return PropertyInfo(Variant::OBJECT, "pass", PROPERTY_HINT_TYPE_STRING, get_base_type());
@@ -260,20 +255,21 @@ PropertyInfo VisualScriptFunctionCall::get_output_value_port_info(int p_idx) con
 }
 
 String VisualScriptFunctionCall::get_caption() const {
-	if (call_mode == CALL_MODE_SELF)
+	if (call_mode == CALL_MODE_SELF) {
 		return "  " + String(function) + "()";
-	if (call_mode == CALL_MODE_SINGLETON)
+	}
+	if (call_mode == CALL_MODE_SINGLETON) {
 		return String(singleton) + ":" + String(function) + "()";
-	else if (call_mode == CALL_MODE_BASIC_TYPE)
+	} else if (call_mode == CALL_MODE_BASIC_TYPE) {
 		return Variant::get_type_name(basic_type) + "." + String(function) + "()";
-	else if (call_mode == CALL_MODE_NODE_PATH)
+	} else if (call_mode == CALL_MODE_NODE_PATH) {
 		return " [" + String(base_path.simplified()) + "]." + String(function) + "()";
-	else
+	} else {
 		return "  " + base_type + "." + String(function) + "()";
+	}
 }
 
 String VisualScriptFunctionCall::get_text() const {
-
 	if (rpc_call_mode) {
 		return "RPC";
 	}
@@ -281,9 +277,9 @@ String VisualScriptFunctionCall::get_text() const {
 }
 
 void VisualScriptFunctionCall::set_basic_type(Variant::Type p_type) {
-
-	if (basic_type == p_type)
+	if (basic_type == p_type) {
 		return;
+	}
 	basic_type = p_type;
 
 	_change_notify();
@@ -291,14 +287,13 @@ void VisualScriptFunctionCall::set_basic_type(Variant::Type p_type) {
 }
 
 Variant::Type VisualScriptFunctionCall::get_basic_type() const {
-
 	return basic_type;
 }
 
 void VisualScriptFunctionCall::set_base_type(const StringName &p_type) {
-
-	if (base_type == p_type)
+	if (base_type == p_type) {
 		return;
+	}
 
 	base_type = p_type;
 	_change_notify();
@@ -306,14 +301,13 @@ void VisualScriptFunctionCall::set_base_type(const StringName &p_type) {
 }
 
 StringName VisualScriptFunctionCall::get_base_type() const {
-
 	return base_type;
 }
 
 void VisualScriptFunctionCall::set_base_script(const String &p_path) {
-
-	if (base_script == p_path)
+	if (base_script == p_path) {
 		return;
+	}
 
 	base_script = p_path;
 	_change_notify();
@@ -321,14 +315,13 @@ void VisualScriptFunctionCall::set_base_script(const String &p_path) {
 }
 
 String VisualScriptFunctionCall::get_base_script() const {
-
 	return base_script;
 }
 
 void VisualScriptFunctionCall::set_singleton(const StringName &p_type) {
-
-	if (singleton == p_type)
+	if (singleton == p_type) {
 		return;
+	}
 
 	singleton = p_type;
 	Object *obj = Engine::get_singleton()->get_singleton_object(singleton);
@@ -341,7 +334,6 @@ void VisualScriptFunctionCall::set_singleton(const StringName &p_type) {
 }
 
 StringName VisualScriptFunctionCall::get_singleton() const {
-
 	return singleton;
 }
 
@@ -350,7 +342,6 @@ void VisualScriptFunctionCall::_update_method_cache() {
 	Ref<Script> script;
 
 	if (call_mode == CALL_MODE_NODE_PATH) {
-
 		Node *node = _get_base_node();
 		if (node) {
 			type = node->get_class();
@@ -358,7 +349,6 @@ void VisualScriptFunctionCall::_update_method_cache() {
 			script = node->get_script();
 		}
 	} else if (call_mode == CALL_MODE_SELF) {
-
 		if (get_visual_script().is_valid()) {
 			type = get_visual_script()->get_instance_base_type();
 			base_type = type; //cache, too
@@ -366,7 +356,6 @@ void VisualScriptFunctionCall::_update_method_cache() {
 		}
 
 	} else if (call_mode == CALL_MODE_SINGLETON) {
-
 		Object *obj = Engine::get_singleton()->get_singleton_object(singleton);
 		if (obj) {
 			type = obj->get_class();
@@ -374,17 +363,13 @@ void VisualScriptFunctionCall::_update_method_cache() {
 		}
 
 	} else if (call_mode == CALL_MODE_INSTANCE) {
-
 		type = base_type;
 		if (base_script != String()) {
-
 			if (!ResourceCache::has(base_script) && ScriptServer::edit_request_func) {
-
 				ScriptServer::edit_request_func(base_script); //make sure it's loaded
 			}
 
 			if (ResourceCache::has(base_script)) {
-
 				script = Ref<Resource>(ResourceCache::get(base_script));
 			} else {
 				return;
@@ -421,16 +406,15 @@ void VisualScriptFunctionCall::_update_method_cache() {
 			}
 		}
 	} else if (script.is_valid() && script->has_method(function)) {
-
 		method_cache = script->get_method_info(function);
 		use_default_args = method_cache.default_arguments.size();
 	}
 }
 
 void VisualScriptFunctionCall::set_function(const StringName &p_type) {
-
-	if (function == p_type)
+	if (function == p_type) {
 		return;
+	}
 
 	function = p_type;
 
@@ -445,15 +429,15 @@ void VisualScriptFunctionCall::set_function(const StringName &p_type) {
 	_change_notify();
 	ports_changed_notify();
 }
-StringName VisualScriptFunctionCall::get_function() const {
 
+StringName VisualScriptFunctionCall::get_function() const {
 	return function;
 }
 
 void VisualScriptFunctionCall::set_base_path(const NodePath &p_type) {
-
-	if (base_path == p_type)
+	if (base_path == p_type) {
 		return;
+	}
 
 	base_path = p_type;
 	_change_notify();
@@ -461,59 +445,54 @@ void VisualScriptFunctionCall::set_base_path(const NodePath &p_type) {
 }
 
 NodePath VisualScriptFunctionCall::get_base_path() const {
-
 	return base_path;
 }
 
 void VisualScriptFunctionCall::set_call_mode(CallMode p_mode) {
-
-	if (call_mode == p_mode)
+	if (call_mode == p_mode) {
 		return;
+	}
 
 	call_mode = p_mode;
 	_change_notify();
 	ports_changed_notify();
 }
-VisualScriptFunctionCall::CallMode VisualScriptFunctionCall::get_call_mode() const {
 
+VisualScriptFunctionCall::CallMode VisualScriptFunctionCall::get_call_mode() const {
 	return call_mode;
 }
 
 void VisualScriptFunctionCall::set_use_default_args(int p_amount) {
-
-	if (use_default_args == p_amount)
+	if (use_default_args == p_amount) {
 		return;
+	}
 
 	use_default_args = p_amount;
 	ports_changed_notify();
 }
 
 void VisualScriptFunctionCall::set_rpc_call_mode(VisualScriptFunctionCall::RPCCallMode p_mode) {
-
-	if (rpc_call_mode == p_mode)
+	if (rpc_call_mode == p_mode) {
 		return;
+	}
 	rpc_call_mode = p_mode;
 	ports_changed_notify();
 	_change_notify();
 }
 
 VisualScriptFunctionCall::RPCCallMode VisualScriptFunctionCall::get_rpc_call_mode() const {
-
 	return rpc_call_mode;
 }
 
 int VisualScriptFunctionCall::get_use_default_args() const {
-
 	return use_default_args;
 }
 
 void VisualScriptFunctionCall::set_validate(bool p_amount) {
-
 	validate = p_amount;
 }
 
 bool VisualScriptFunctionCall::get_validate() const {
-
 	return validate;
 }
 
@@ -523,12 +502,10 @@ void VisualScriptFunctionCall::_set_argument_cache(const Dictionary &p_cache) {
 }
 
 Dictionary VisualScriptFunctionCall::_get_argument_cache() const {
-
 	return method_cache;
 }
 
 void VisualScriptFunctionCall::_validate_property(PropertyInfo &property) const {
-
 	if (property.name == "base_type") {
 		if (call_mode != CALL_MODE_INSTANCE) {
 			property.usage = PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL;
@@ -556,8 +533,9 @@ void VisualScriptFunctionCall::_validate_property(PropertyInfo &property) const
 			property.hint = PROPERTY_HINT_ENUM;
 			String sl;
 			for (List<Engine::Singleton>::Element *E = names.front(); E; E = E->next()) {
-				if (sl != String())
+				if (sl != String()) {
 					sl += ",";
+				}
 				sl += E->get().name;
 			}
 			property.hint_string = sl;
@@ -568,7 +546,6 @@ void VisualScriptFunctionCall::_validate_property(PropertyInfo &property) const
 		if (call_mode != CALL_MODE_NODE_PATH) {
 			property.usage = 0;
 		} else {
-
 			Node *bnode = _get_base_node();
 			if (bnode) {
 				property.hint_string = bnode->get_path(); //convert to loong string
@@ -577,9 +554,7 @@ void VisualScriptFunctionCall::_validate_property(PropertyInfo &property) const
 	}
 
 	if (property.name == "function") {
-
 		if (call_mode == CALL_MODE_BASIC_TYPE) {
-
 			property.hint = PROPERTY_HINT_METHOD_OF_VARIANT_TYPE;
 			property.hint_string = Variant::get_type_name(basic_type);
 
@@ -587,13 +562,11 @@ void VisualScriptFunctionCall::_validate_property(PropertyInfo &property) const
 			property.hint = PROPERTY_HINT_METHOD_OF_SCRIPT;
 			property.hint_string = itos(get_visual_script()->get_instance_id());
 		} else if (call_mode == CALL_MODE_SINGLETON) {
-
 			Object *obj = Engine::get_singleton()->get_singleton_object(singleton);
 			if (obj) {
 				property.hint = PROPERTY_HINT_METHOD_OF_INSTANCE;
 				property.hint_string = itos(obj->get_instance_id());
 			} else {
-
 				property.hint = PROPERTY_HINT_METHOD_OF_BASE_TYPE;
 				property.hint_string = base_type; //should be cached
 			}
@@ -603,15 +576,12 @@ void VisualScriptFunctionCall::_validate_property(PropertyInfo &property) const
 
 			if (base_script != String()) {
 				if (!ResourceCache::has(base_script) && ScriptServer::edit_request_func) {
-
 					ScriptServer::edit_request_func(base_script); //make sure it's loaded
 				}
 
 				if (ResourceCache::has(base_script)) {
-
 					Ref<Script> script = Ref<Resource>(ResourceCache::get(base_script));
 					if (script.is_valid()) {
-
 						property.hint = PROPERTY_HINT_METHOD_OF_SCRIPT;
 						property.hint_string = itos(script->get_instance_id());
 					}
@@ -631,18 +601,15 @@ void VisualScriptFunctionCall::_validate_property(PropertyInfo &property) const
 	}
 
 	if (property.name == "use_default_args") {
-
 		property.hint = PROPERTY_HINT_RANGE;
 
 		int mc = 0;
 
 		if (call_mode == CALL_MODE_BASIC_TYPE) {
-
 			mc = Variant::get_method_default_arguments(basic_type, function).size();
 		} else {
 			MethodBind *mb = ClassDB::get_method(_get_base_type(), function);
 			if (mb) {
-
 				mc = mb->get_default_argument_count();
 			}
 		}
@@ -650,7 +617,6 @@ void VisualScriptFunctionCall::_validate_property(PropertyInfo &property) const
 		if (mc == 0) {
 			property.usage = 0; //do not show
 		} else {
-
 			property.hint_string = "0," + itos(mc) + ",1";
 		}
 	}
@@ -663,7 +629,6 @@ void VisualScriptFunctionCall::_validate_property(PropertyInfo &property) const
 }
 
 void VisualScriptFunctionCall::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_base_type", "base_type"), &VisualScriptFunctionCall::set_base_type);
 	ClassDB::bind_method(D_METHOD("get_base_type"), &VisualScriptFunctionCall::get_base_type);
 
@@ -699,8 +664,9 @@ void VisualScriptFunctionCall::_bind_methods() {
 
 	String bt;
 	for (int i = 0; i < Variant::VARIANT_MAX; i++) {
-		if (i > 0)
+		if (i > 0) {
 			bt += ",";
+		}
 
 		bt += Variant::get_type_name(Variant::Type(i));
 	}
@@ -712,8 +678,9 @@ void VisualScriptFunctionCall::_bind_methods() {
 
 	String script_ext_hint;
 	for (List<String>::Element *E = script_extensions.front(); E; E = E->next()) {
-		if (script_ext_hint != String())
+		if (script_ext_hint != String()) {
 			script_ext_hint += ",";
+		}
 		script_ext_hint += "*." + E->get();
 	}
 
@@ -761,13 +728,14 @@ public:
 	//virtual bool get_output_port_unsequenced(int p_idx,Variant* r_value,Variant* p_working_mem,String &r_error) const { return true; }
 
 	_FORCE_INLINE_ bool call_rpc(Object *p_base, const Variant **p_args, int p_argcount) {
-
-		if (!p_base)
+		if (!p_base) {
 			return false;
+		}
 
 		Node *node = Object::cast_to<Node>(p_base);
-		if (!node)
+		if (!node) {
 			return false;
+		}
 
 		int to_id = 0;
 		bool reliable = true;
@@ -788,12 +756,9 @@ public:
 		return true;
 	}
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		switch (call_mode) {
-
 			case VisualScriptFunctionCall::CALL_MODE_SELF: {
-
 				Object *object = instance->get_owner_ptr();
 
 				if (rpc_mode) {
@@ -805,17 +770,16 @@ public:
 				}
 			} break;
 			case VisualScriptFunctionCall::CALL_MODE_NODE_PATH: {
-
 				Node *node = Object::cast_to<Node>(instance->get_owner_ptr());
 				if (!node) {
-					r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+					r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 					r_error_str = "Base object is not a Node!";
 					return 0;
 				}
 
 				Node *another = node->get_node(node_path);
 				if (!another) {
-					r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+					r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 					r_error_str = "Path does not lead Node!";
 					return 0;
 				}
@@ -831,7 +795,6 @@ public:
 			} break;
 			case VisualScriptFunctionCall::CALL_MODE_INSTANCE:
 			case VisualScriptFunctionCall::CALL_MODE_BASIC_TYPE: {
-
 				Variant v = *p_inputs[0];
 
 				if (rpc_mode) {
@@ -846,7 +809,7 @@ public:
 						} else if (returns == 1) {
 							v.call(function, p_inputs + 1, input_args, r_error);
 						} else {
-							r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+							r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 							r_error_str = "Invalid returns count for call_mode == CALL_MODE_INSTANCE";
 							return 0;
 						}
@@ -863,10 +826,9 @@ public:
 
 			} break;
 			case VisualScriptFunctionCall::CALL_MODE_SINGLETON: {
-
 				Object *object = Engine::get_singleton()->get_singleton_object(singleton);
 				if (!object) {
-					r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+					r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 					r_error_str = "Invalid singleton name: '" + String(singleton) + "'";
 					return 0;
 				}
@@ -882,9 +844,8 @@ public:
 		}
 
 		if (!validate) {
-
 			//ignore call errors if validation is disabled
-			r_error.error = Variant::CallError::CALL_OK;
+			r_error.error = Callable::CallError::CALL_OK;
 			r_error_str = String();
 		}
 
@@ -893,7 +854,6 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptFunctionCall::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceFunctionCall *instance = memnew(VisualScriptNodeInstanceFunctionCall);
 	instance->node = this;
 	instance->instance = p_instance;
@@ -909,7 +869,6 @@ VisualScriptNodeInstance *VisualScriptFunctionCall::instance(VisualScriptInstanc
 }
 
 VisualScriptFunctionCall::TypeGuess VisualScriptFunctionCall::guess_output_type(TypeGuess *p_inputs, int p_output) const {
-
 	if (p_output == 0 && call_mode == CALL_MODE_INSTANCE) {
 		return p_inputs[0];
 	}
@@ -918,7 +877,6 @@ VisualScriptFunctionCall::TypeGuess VisualScriptFunctionCall::guess_output_type(
 }
 
 VisualScriptFunctionCall::VisualScriptFunctionCall() {
-
 	validate = true;
 	call_mode = CALL_MODE_SELF;
 	basic_type = Variant::NIL;
@@ -929,7 +887,6 @@ VisualScriptFunctionCall::VisualScriptFunctionCall() {
 
 template <VisualScriptFunctionCall::CallMode cmode>
 static Ref<VisualScriptNode> create_function_call_node(const String &p_name) {
-
 	Ref<VisualScriptFunctionCall> node;
 	node.instance();
 	node->set_call_mode(cmode);
@@ -941,87 +898,85 @@ static Ref<VisualScriptNode> create_function_call_node(const String &p_name) {
 //////////////////////////////////////////
 
 int VisualScriptPropertySet::get_output_sequence_port_count() const {
-
 	return call_mode != CALL_MODE_BASIC_TYPE ? 1 : 0;
 }
 
 bool VisualScriptPropertySet::has_input_sequence_port() const {
-
 	return call_mode != CALL_MODE_BASIC_TYPE;
 }
 
 Node *VisualScriptPropertySet::_get_base_node() const {
-
 #ifdef TOOLS_ENABLED
 	Ref<Script> script = get_visual_script();
-	if (!script.is_valid())
-		return NULL;
+	if (!script.is_valid()) {
+		return nullptr;
+	}
 
 	MainLoop *main_loop = OS::get_singleton()->get_main_loop();
 
 	SceneTree *scene_tree = Object::cast_to<SceneTree>(main_loop);
 
-	if (!scene_tree)
-		return NULL;
+	if (!scene_tree) {
+		return nullptr;
+	}
 
 	Node *edited_scene = scene_tree->get_edited_scene_root();
 
-	if (!edited_scene)
-		return NULL;
+	if (!edited_scene) {
+		return nullptr;
+	}
 
 	Node *script_node = _find_script_node(edited_scene, edited_scene, script);
 
-	if (!script_node)
-		return NULL;
+	if (!script_node) {
+		return nullptr;
+	}
 
-	if (!script_node->has_node(base_path))
-		return NULL;
+	if (!script_node->has_node(base_path)) {
+		return nullptr;
+	}
 
 	Node *path_to = script_node->get_node(base_path);
 
 	return path_to;
 #else
 
-	return NULL;
+	return nullptr;
 #endif
 }
 
 StringName VisualScriptPropertySet::_get_base_type() const {
-
-	if (call_mode == CALL_MODE_SELF && get_visual_script().is_valid())
+	if (call_mode == CALL_MODE_SELF && get_visual_script().is_valid()) {
 		return get_visual_script()->get_instance_base_type();
-	else if (call_mode == CALL_MODE_NODE_PATH && get_visual_script().is_valid()) {
+	} else if (call_mode == CALL_MODE_NODE_PATH && get_visual_script().is_valid()) {
 		Node *path = _get_base_node();
-		if (path)
+		if (path) {
 			return path->get_class();
+		}
 	}
 
 	return base_type;
 }
 
 int VisualScriptPropertySet::get_input_value_port_count() const {
-
 	int pc = (call_mode == CALL_MODE_BASIC_TYPE || call_mode == CALL_MODE_INSTANCE) ? 2 : 1;
 
 	return pc;
 }
-int VisualScriptPropertySet::get_output_value_port_count() const {
 
+int VisualScriptPropertySet::get_output_value_port_count() const {
 	return (call_mode == CALL_MODE_BASIC_TYPE || call_mode == CALL_MODE_INSTANCE) ? 1 : 0;
 }
 
 String VisualScriptPropertySet::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 void VisualScriptPropertySet::_adjust_input_index(PropertyInfo &pinfo) const {
-
 	if (index != StringName()) {
-
 		Variant v;
-		Variant::CallError ce;
-		v = Variant::construct(pinfo.type, NULL, 0, ce);
+		Callable::CallError ce;
+		v = Variant::construct(pinfo.type, nullptr, 0, ce);
 		Variant i = v.get(index);
 		pinfo.type = i.get_type();
 	}
@@ -1065,7 +1020,6 @@ PropertyInfo VisualScriptPropertySet::get_output_value_port_info(int p_idx) cons
 }
 
 String VisualScriptPropertySet::get_caption() const {
-
 	static const char *opname[ASSIGN_OP_MAX] = {
 		"Set", "Add", "Subtract", "Multiply", "Divide", "Mod", "ShiftLeft", "ShiftRight", "BitAnd", "BitOr", "BitXor"
 	};
@@ -1079,7 +1033,6 @@ String VisualScriptPropertySet::get_caption() const {
 }
 
 String VisualScriptPropertySet::get_text() const {
-
 	if (call_mode == CALL_MODE_BASIC_TYPE) {
 		return String("On ") + Variant::get_type_name(basic_type);
 	}
@@ -1096,22 +1049,21 @@ String VisualScriptPropertySet::get_text() const {
 void VisualScriptPropertySet::_update_base_type() {
 	//cache it because this information may not be available on load
 	if (call_mode == CALL_MODE_NODE_PATH) {
-
 		Node *node = _get_base_node();
 		if (node) {
 			base_type = node->get_class();
 		}
 	} else if (call_mode == CALL_MODE_SELF) {
-
 		if (get_visual_script().is_valid()) {
 			base_type = get_visual_script()->get_instance_base_type();
 		}
 	}
 }
-void VisualScriptPropertySet::set_basic_type(Variant::Type p_type) {
 
-	if (basic_type == p_type)
+void VisualScriptPropertySet::set_basic_type(Variant::Type p_type) {
+	if (basic_type == p_type) {
 		return;
+	}
 	basic_type = p_type;
 
 	_change_notify();
@@ -1120,14 +1072,13 @@ void VisualScriptPropertySet::set_basic_type(Variant::Type p_type) {
 }
 
 Variant::Type VisualScriptPropertySet::get_basic_type() const {
-
 	return basic_type;
 }
 
 void VisualScriptPropertySet::set_base_type(const StringName &p_type) {
-
-	if (base_type == p_type)
+	if (base_type == p_type) {
 		return;
+	}
 
 	base_type = p_type;
 	_change_notify();
@@ -1135,14 +1086,13 @@ void VisualScriptPropertySet::set_base_type(const StringName &p_type) {
 }
 
 StringName VisualScriptPropertySet::get_base_type() const {
-
 	return base_type;
 }
 
 void VisualScriptPropertySet::set_base_script(const String &p_path) {
-
-	if (base_script == p_path)
+	if (base_script == p_path) {
 		return;
+	}
 
 	base_script = p_path;
 	_change_notify();
@@ -1150,45 +1100,40 @@ void VisualScriptPropertySet::set_base_script(const String &p_path) {
 }
 
 String VisualScriptPropertySet::get_base_script() const {
-
 	return base_script;
 }
 
 void VisualScriptPropertySet::_update_cache() {
-
-	if (!Object::cast_to<SceneTree>(OS::get_singleton()->get_main_loop()))
+	if (!Object::cast_to<SceneTree>(OS::get_singleton()->get_main_loop())) {
 		return;
+	}
 
-	if (!Engine::get_singleton()->is_editor_hint()) //only update cache if editor exists, it's pointless otherwise
+	if (!Engine::get_singleton()->is_editor_hint()) { //only update cache if editor exists, it's pointless otherwise
 		return;
+	}
 
 	if (call_mode == CALL_MODE_BASIC_TYPE) {
-
 		//not super efficient..
 
 		Variant v;
-		Variant::CallError ce;
-		v = Variant::construct(basic_type, NULL, 0, ce);
+		Callable::CallError ce;
+		v = Variant::construct(basic_type, nullptr, 0, ce);
 
 		List<PropertyInfo> pinfo;
 		v.get_property_list(&pinfo);
 
 		for (List<PropertyInfo>::Element *E = pinfo.front(); E; E = E->next()) {
-
 			if (E->get().name == property) {
-
 				type_cache = E->get();
 			}
 		}
 
 	} else {
-
 		StringName type;
 		Ref<Script> script;
-		Node *node = NULL;
+		Node *node = nullptr;
 
 		if (call_mode == CALL_MODE_NODE_PATH) {
-
 			node = _get_base_node();
 			if (node) {
 				type = node->get_class();
@@ -1196,24 +1141,19 @@ void VisualScriptPropertySet::_update_cache() {
 				script = node->get_script();
 			}
 		} else if (call_mode == CALL_MODE_SELF) {
-
 			if (get_visual_script().is_valid()) {
 				type = get_visual_script()->get_instance_base_type();
 				base_type = type; //cache, too
 				script = get_visual_script();
 			}
 		} else if (call_mode == CALL_MODE_INSTANCE) {
-
 			type = base_type;
 			if (base_script != String()) {
-
 				if (!ResourceCache::has(base_script) && ScriptServer::edit_request_func) {
-
 					ScriptServer::edit_request_func(base_script); //make sure it's loaded
 				}
 
 				if (ResourceCache::has(base_script)) {
-
 					script = Ref<Resource>(ResourceCache::get(base_script));
 				} else {
 					return;
@@ -1224,19 +1164,16 @@ void VisualScriptPropertySet::_update_cache() {
 		List<PropertyInfo> pinfo;
 
 		if (node) {
-
 			node->get_property_list(&pinfo);
 		} else {
 			ClassDB::get_property_list(type, &pinfo);
 		}
 
 		if (script.is_valid()) {
-
 			script->get_script_property_list(&pinfo);
 		}
 
 		for (List<PropertyInfo>::Element *E = pinfo.front(); E; E = E->next()) {
-
 			if (E->get().name == property) {
 				type_cache = E->get();
 				return;
@@ -1246,9 +1183,9 @@ void VisualScriptPropertySet::_update_cache() {
 }
 
 void VisualScriptPropertySet::set_property(const StringName &p_type) {
-
-	if (property == p_type)
+	if (property == p_type) {
 		return;
+	}
 
 	property = p_type;
 	index = StringName();
@@ -1256,15 +1193,15 @@ void VisualScriptPropertySet::set_property(const StringName &p_type) {
 	_change_notify();
 	ports_changed_notify();
 }
-StringName VisualScriptPropertySet::get_property() const {
 
+StringName VisualScriptPropertySet::get_property() const {
 	return property;
 }
 
 void VisualScriptPropertySet::set_base_path(const NodePath &p_type) {
-
-	if (base_path == p_type)
+	if (base_path == p_type) {
 		return;
+	}
 
 	base_path = p_type;
 	_update_base_type();
@@ -1273,22 +1210,21 @@ void VisualScriptPropertySet::set_base_path(const NodePath &p_type) {
 }
 
 NodePath VisualScriptPropertySet::get_base_path() const {
-
 	return base_path;
 }
 
 void VisualScriptPropertySet::set_call_mode(CallMode p_mode) {
-
-	if (call_mode == p_mode)
+	if (call_mode == p_mode) {
 		return;
+	}
 
 	call_mode = p_mode;
 	_update_base_type();
 	_change_notify();
 	ports_changed_notify();
 }
-VisualScriptPropertySet::CallMode VisualScriptPropertySet::get_call_mode() const {
 
+VisualScriptPropertySet::CallMode VisualScriptPropertySet::get_call_mode() const {
 	return call_mode;
 }
 
@@ -1297,14 +1233,13 @@ void VisualScriptPropertySet::_set_type_cache(const Dictionary &p_type) {
 }
 
 Dictionary VisualScriptPropertySet::_get_type_cache() const {
-
 	return type_cache;
 }
 
 void VisualScriptPropertySet::set_index(const StringName &p_type) {
-
-	if (index == p_type)
+	if (index == p_type) {
 		return;
+	}
 	index = p_type;
 	_update_cache();
 	_change_notify();
@@ -1312,15 +1247,14 @@ void VisualScriptPropertySet::set_index(const StringName &p_type) {
 }
 
 StringName VisualScriptPropertySet::get_index() const {
-
 	return index;
 }
 
 void VisualScriptPropertySet::set_assign_op(AssignOp p_op) {
-
 	ERR_FAIL_INDEX(p_op, ASSIGN_OP_MAX);
-	if (assign_op == p_op)
+	if (assign_op == p_op) {
 		return;
+	}
 
 	assign_op = p_op;
 	_update_cache();
@@ -1333,7 +1267,6 @@ VisualScriptPropertySet::AssignOp VisualScriptPropertySet::get_assign_op() const
 }
 
 void VisualScriptPropertySet::_validate_property(PropertyInfo &property) const {
-
 	if (property.name == "base_type") {
 		if (call_mode != CALL_MODE_INSTANCE) {
 			property.usage = PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL;
@@ -1356,7 +1289,6 @@ void VisualScriptPropertySet::_validate_property(PropertyInfo &property) const {
 		if (call_mode != CALL_MODE_NODE_PATH) {
 			property.usage = 0;
 		} else {
-
 			Node *bnode = _get_base_node();
 			if (bnode) {
 				property.hint_string = bnode->get_path(); //convert to loong string
@@ -1365,9 +1297,7 @@ void VisualScriptPropertySet::_validate_property(PropertyInfo &property) const {
 	}
 
 	if (property.name == "property") {
-
 		if (call_mode == CALL_MODE_BASIC_TYPE) {
-
 			property.hint = PROPERTY_HINT_PROPERTY_OF_VARIANT_TYPE;
 			property.hint_string = Variant::get_type_name(basic_type);
 
@@ -1380,15 +1310,12 @@ void VisualScriptPropertySet::_validate_property(PropertyInfo &property) const {
 
 			if (base_script != String()) {
 				if (!ResourceCache::has(base_script) && ScriptServer::edit_request_func) {
-
 					ScriptServer::edit_request_func(base_script); //make sure it's loaded
 				}
 
 				if (ResourceCache::has(base_script)) {
-
 					Ref<Script> script = Ref<Resource>(ResourceCache::get(base_script));
 					if (script.is_valid()) {
-
 						property.hint = PROPERTY_HINT_PROPERTY_OF_SCRIPT;
 						property.hint_string = itos(script->get_instance_id());
 					}
@@ -1408,9 +1335,8 @@ void VisualScriptPropertySet::_validate_property(PropertyInfo &property) const {
 	}
 
 	if (property.name == "index") {
-
-		Variant::CallError ce;
-		Variant v = Variant::construct(type_cache.type, NULL, 0, ce);
+		Callable::CallError ce;
+		Variant v = Variant::construct(type_cache.type, nullptr, 0, ce);
 		List<PropertyInfo> plist;
 		v.get_property_list(&plist);
 		String options = "";
@@ -1421,13 +1347,13 @@ void VisualScriptPropertySet::_validate_property(PropertyInfo &property) const {
 		property.hint = PROPERTY_HINT_ENUM;
 		property.hint_string = options;
 		property.type = Variant::STRING;
-		if (options == "")
+		if (options == "") {
 			property.usage = 0; //hide if type has no usable index
+		}
 	}
 }
 
 void VisualScriptPropertySet::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_base_type", "base_type"), &VisualScriptPropertySet::set_base_type);
 	ClassDB::bind_method(D_METHOD("get_base_type"), &VisualScriptPropertySet::get_base_type);
 
@@ -1457,8 +1383,9 @@ void VisualScriptPropertySet::_bind_methods() {
 
 	String bt;
 	for (int i = 0; i < Variant::VARIANT_MAX; i++) {
-		if (i > 0)
+		if (i > 0) {
 			bt += ",";
+		}
 
 		bt += Variant::get_type_name(Variant::Type(i));
 	}
@@ -1470,8 +1397,9 @@ void VisualScriptPropertySet::_bind_methods() {
 
 	String script_ext_hint;
 	for (List<String>::Element *E = script_extensions.front(); E; E = E->next()) {
-		if (script_ext_hint != String())
+		if (script_ext_hint != String()) {
 			script_ext_hint += ",";
+		}
 		script_ext_hint += "*." + E->get();
 	}
 
@@ -1520,11 +1448,9 @@ public:
 	//virtual bool get_output_port_unsequenced(int p_idx,Variant* r_value,Variant* p_working_mem,String &r_error) const { return true; }
 
 	_FORCE_INLINE_ void _process_get(Variant &source, const Variant &p_argument, bool &valid) {
-
 		if (index != StringName() && assign_op == VisualScriptPropertySet::ASSIGN_OP_NONE) {
 			source.set_named(index, p_argument, &valid);
 		} else {
-
 			Variant value;
 			if (index != StringName()) {
 				value = source.get_named(index, &valid);
@@ -1578,12 +1504,9 @@ public:
 		}
 	}
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		switch (call_mode) {
-
 			case VisualScriptPropertySet::CALL_MODE_SELF: {
-
 				Object *object = instance->get_owner_ptr();
 
 				bool valid;
@@ -1597,22 +1520,21 @@ public:
 				}
 
 				if (!valid) {
-					r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+					r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 					r_error_str = "Invalid set value '" + String(*p_inputs[0]) + "' on property '" + String(property) + "' of type " + object->get_class();
 				}
 			} break;
 			case VisualScriptPropertySet::CALL_MODE_NODE_PATH: {
-
 				Node *node = Object::cast_to<Node>(instance->get_owner_ptr());
 				if (!node) {
-					r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+					r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 					r_error_str = "Base object is not a Node!";
 					return 0;
 				}
 
 				Node *another = node->get_node(node_path);
 				if (!another) {
-					r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+					r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 					r_error_str = "Path does not lead Node!";
 					return 0;
 				}
@@ -1620,7 +1542,6 @@ public:
 				bool valid;
 
 				if (needs_get) {
-
 					Variant value = another->get(property, &valid);
 					_process_get(value, *p_inputs[0], valid);
 					another->set(property, value, &valid);
@@ -1629,14 +1550,13 @@ public:
 				}
 
 				if (!valid) {
-					r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+					r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 					r_error_str = "Invalid set value '" + String(*p_inputs[0]) + "' on property '" + String(property) + "' of type " + another->get_class();
 				}
 
 			} break;
 			case VisualScriptPropertySet::CALL_MODE_INSTANCE:
 			case VisualScriptPropertySet::CALL_MODE_BASIC_TYPE: {
-
 				Variant v = *p_inputs[0];
 
 				bool valid;
@@ -1651,7 +1571,7 @@ public:
 				}
 
 				if (!valid) {
-					r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+					r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 					r_error_str = "Invalid set value '" + String(*p_inputs[1]) + "' (" + Variant::get_type_name(p_inputs[1]->get_type()) + ") on property '" + String(property) + "' of type " + Variant::get_type_name(v.get_type());
 				}
 
@@ -1664,7 +1584,6 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptPropertySet::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstancePropertySet *instance = memnew(VisualScriptNodeInstancePropertySet);
 	instance->node = this;
 	instance->instance = p_instance;
@@ -1678,15 +1597,14 @@ VisualScriptNodeInstance *VisualScriptPropertySet::instance(VisualScriptInstance
 }
 
 VisualScriptPropertySet::TypeGuess VisualScriptPropertySet::guess_output_type(TypeGuess *p_inputs, int p_output) const {
-
 	if (p_output == 0 && call_mode == CALL_MODE_INSTANCE) {
 		return p_inputs[0];
 	}
 
 	return VisualScriptNode::guess_output_type(p_inputs, p_output);
 }
-VisualScriptPropertySet::VisualScriptPropertySet() {
 
+VisualScriptPropertySet::VisualScriptPropertySet() {
 	assign_op = ASSIGN_OP_NONE;
 	call_mode = CALL_MODE_SELF;
 	base_type = "Object";
@@ -1695,7 +1613,6 @@ VisualScriptPropertySet::VisualScriptPropertySet() {
 
 template <VisualScriptPropertySet::CallMode cmode>
 static Ref<VisualScriptNode> create_property_set_node(const String &p_name) {
-
 	Ref<VisualScriptPropertySet> node;
 	node.instance();
 	node->set_call_mode(cmode);
@@ -1707,94 +1624,93 @@ static Ref<VisualScriptNode> create_property_set_node(const String &p_name) {
 //////////////////////////////////////////
 
 int VisualScriptPropertyGet::get_output_sequence_port_count() const {
-
 	return 0; // (call_mode==CALL_MODE_SELF || call_mode==CALL_MODE_NODE_PATH)?0:1;
 }
 
 bool VisualScriptPropertyGet::has_input_sequence_port() const {
-
 	return false; //(call_mode==CALL_MODE_SELF || call_mode==CALL_MODE_NODE_PATH)?false:true;
 }
+
 void VisualScriptPropertyGet::_update_base_type() {
 	//cache it because this information may not be available on load
 	if (call_mode == CALL_MODE_NODE_PATH) {
-
 		Node *node = _get_base_node();
 		if (node) {
 			base_type = node->get_class();
 		}
 	} else if (call_mode == CALL_MODE_SELF) {
-
 		if (get_visual_script().is_valid()) {
 			base_type = get_visual_script()->get_instance_base_type();
 		}
 	}
 }
-Node *VisualScriptPropertyGet::_get_base_node() const {
 
+Node *VisualScriptPropertyGet::_get_base_node() const {
 #ifdef TOOLS_ENABLED
 	Ref<Script> script = get_visual_script();
-	if (!script.is_valid())
-		return NULL;
+	if (!script.is_valid()) {
+		return nullptr;
+	}
 
 	MainLoop *main_loop = OS::get_singleton()->get_main_loop();
 
 	SceneTree *scene_tree = Object::cast_to<SceneTree>(main_loop);
 
-	if (!scene_tree)
-		return NULL;
+	if (!scene_tree) {
+		return nullptr;
+	}
 
 	Node *edited_scene = scene_tree->get_edited_scene_root();
 
-	if (!edited_scene)
-		return NULL;
+	if (!edited_scene) {
+		return nullptr;
+	}
 
 	Node *script_node = _find_script_node(edited_scene, edited_scene, script);
 
-	if (!script_node)
-		return NULL;
+	if (!script_node) {
+		return nullptr;
+	}
 
-	if (!script_node->has_node(base_path))
-		return NULL;
+	if (!script_node->has_node(base_path)) {
+		return nullptr;
+	}
 
 	Node *path_to = script_node->get_node(base_path);
 
 	return path_to;
 #else
 
-	return NULL;
+	return nullptr;
 #endif
 }
 
 StringName VisualScriptPropertyGet::_get_base_type() const {
-
-	if (call_mode == CALL_MODE_SELF && get_visual_script().is_valid())
+	if (call_mode == CALL_MODE_SELF && get_visual_script().is_valid()) {
 		return get_visual_script()->get_instance_base_type();
-	else if (call_mode == CALL_MODE_NODE_PATH && get_visual_script().is_valid()) {
+	} else if (call_mode == CALL_MODE_NODE_PATH && get_visual_script().is_valid()) {
 		Node *path = _get_base_node();
-		if (path)
+		if (path) {
 			return path->get_class();
+		}
 	}
 
 	return base_type;
 }
 
 int VisualScriptPropertyGet::get_input_value_port_count() const {
-
 	return (call_mode == CALL_MODE_BASIC_TYPE || call_mode == CALL_MODE_INSTANCE) ? 1 : 0;
 }
-int VisualScriptPropertyGet::get_output_value_port_count() const {
 
+int VisualScriptPropertyGet::get_output_value_port_count() const {
 	return 1;
 }
 
 String VisualScriptPropertyGet::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 PropertyInfo VisualScriptPropertyGet::get_input_value_port_info(int p_idx) const {
-
 	if (call_mode == CALL_MODE_INSTANCE || call_mode == CALL_MODE_BASIC_TYPE) {
 		if (p_idx == 0) {
 			PropertyInfo pi;
@@ -1819,12 +1735,10 @@ PropertyInfo VisualScriptPropertyGet::get_output_value_port_info(int p_idx) cons
 }
 
 String VisualScriptPropertyGet::get_caption() const {
-
 	return String("Get ") + property;
 }
 
 String VisualScriptPropertyGet::get_text() const {
-
 	if (call_mode == CALL_MODE_BASIC_TYPE) {
 		return String("On ") + Variant::get_type_name(basic_type);
 	}
@@ -1839,9 +1753,9 @@ String VisualScriptPropertyGet::get_text() const {
 }
 
 void VisualScriptPropertyGet::set_base_type(const StringName &p_type) {
-
-	if (base_type == p_type)
+	if (base_type == p_type) {
 		return;
+	}
 
 	base_type = p_type;
 	_change_notify();
@@ -1849,14 +1763,13 @@ void VisualScriptPropertyGet::set_base_type(const StringName &p_type) {
 }
 
 StringName VisualScriptPropertyGet::get_base_type() const {
-
 	return base_type;
 }
 
 void VisualScriptPropertyGet::set_base_script(const String &p_path) {
-
-	if (base_script == p_path)
+	if (base_script == p_path) {
 		return;
+	}
 
 	base_script = p_path;
 	_change_notify();
@@ -1864,40 +1777,33 @@ void VisualScriptPropertyGet::set_base_script(const String &p_path) {
 }
 
 String VisualScriptPropertyGet::get_base_script() const {
-
 	return base_script;
 }
 
 void VisualScriptPropertyGet::_update_cache() {
-
 	if (call_mode == CALL_MODE_BASIC_TYPE) {
-
 		//not super efficient..
 
 		Variant v;
-		Variant::CallError ce;
-		v = Variant::construct(basic_type, NULL, 0, ce);
+		Callable::CallError ce;
+		v = Variant::construct(basic_type, nullptr, 0, ce);
 
 		List<PropertyInfo> pinfo;
 		v.get_property_list(&pinfo);
 
 		for (List<PropertyInfo>::Element *E = pinfo.front(); E; E = E->next()) {
-
 			if (E->get().name == property) {
-
 				type_cache = E->get().type;
 				return;
 			}
 		}
 
 	} else {
-
 		StringName type;
 		Ref<Script> script;
-		Node *node = NULL;
+		Node *node = nullptr;
 
 		if (call_mode == CALL_MODE_NODE_PATH) {
-
 			node = _get_base_node();
 			if (node) {
 				type = node->get_class();
@@ -1905,24 +1811,19 @@ void VisualScriptPropertyGet::_update_cache() {
 				script = node->get_script();
 			}
 		} else if (call_mode == CALL_MODE_SELF) {
-
 			if (get_visual_script().is_valid()) {
 				type = get_visual_script()->get_instance_base_type();
 				base_type = type; //cache, too
 				script = get_visual_script();
 			}
 		} else if (call_mode == CALL_MODE_INSTANCE) {
-
 			type = base_type;
 			if (base_script != String()) {
-
 				if (!ResourceCache::has(base_script) && ScriptServer::edit_request_func) {
-
 					ScriptServer::edit_request_func(base_script); //make sure it's loaded
 				}
 
 				if (ResourceCache::has(base_script)) {
-
 					script = Ref<Resource>(ResourceCache::get(base_script));
 				} else {
 					return;
@@ -1942,7 +1843,6 @@ void VisualScriptPropertyGet::_update_cache() {
 		}
 
 		if (node) {
-
 			Variant prop = node->get(property, &valid);
 			if (valid) {
 				type_cache = prop.get_type();
@@ -1951,7 +1851,6 @@ void VisualScriptPropertyGet::_update_cache() {
 		}
 
 		if (script.is_valid()) {
-
 			type_ret = script->get_static_property_type(property, &valid);
 
 			if (valid) {
@@ -1963,9 +1862,9 @@ void VisualScriptPropertyGet::_update_cache() {
 }
 
 void VisualScriptPropertyGet::set_property(const StringName &p_type) {
-
-	if (property == p_type)
+	if (property == p_type) {
 		return;
+	}
 
 	property = p_type;
 
@@ -1973,15 +1872,15 @@ void VisualScriptPropertyGet::set_property(const StringName &p_type) {
 	_change_notify();
 	ports_changed_notify();
 }
-StringName VisualScriptPropertyGet::get_property() const {
 
+StringName VisualScriptPropertyGet::get_property() const {
 	return property;
 }
 
 void VisualScriptPropertyGet::set_base_path(const NodePath &p_type) {
-
-	if (base_path == p_type)
+	if (base_path == p_type) {
 		return;
+	}
 
 	base_path = p_type;
 	_change_notify();
@@ -1990,29 +1889,28 @@ void VisualScriptPropertyGet::set_base_path(const NodePath &p_type) {
 }
 
 NodePath VisualScriptPropertyGet::get_base_path() const {
-
 	return base_path;
 }
 
 void VisualScriptPropertyGet::set_call_mode(CallMode p_mode) {
-
-	if (call_mode == p_mode)
+	if (call_mode == p_mode) {
 		return;
+	}
 
 	call_mode = p_mode;
 	_change_notify();
 	_update_base_type();
 	ports_changed_notify();
 }
-VisualScriptPropertyGet::CallMode VisualScriptPropertyGet::get_call_mode() const {
 
+VisualScriptPropertyGet::CallMode VisualScriptPropertyGet::get_call_mode() const {
 	return call_mode;
 }
 
 void VisualScriptPropertyGet::set_basic_type(Variant::Type p_type) {
-
-	if (basic_type == p_type)
+	if (basic_type == p_type) {
 		return;
+	}
 	basic_type = p_type;
 
 	_change_notify();
@@ -2020,7 +1918,6 @@ void VisualScriptPropertyGet::set_basic_type(Variant::Type p_type) {
 }
 
 Variant::Type VisualScriptPropertyGet::get_basic_type() const {
-
 	return basic_type;
 }
 
@@ -2029,14 +1926,13 @@ void VisualScriptPropertyGet::_set_type_cache(Variant::Type p_type) {
 }
 
 Variant::Type VisualScriptPropertyGet::_get_type_cache() const {
-
 	return type_cache;
 }
 
 void VisualScriptPropertyGet::set_index(const StringName &p_type) {
-
-	if (index == p_type)
+	if (index == p_type) {
 		return;
+	}
 	index = p_type;
 	_update_cache();
 	_change_notify();
@@ -2044,12 +1940,10 @@ void VisualScriptPropertyGet::set_index(const StringName &p_type) {
 }
 
 StringName VisualScriptPropertyGet::get_index() const {
-
 	return index;
 }
 
 void VisualScriptPropertyGet::_validate_property(PropertyInfo &property) const {
-
 	if (property.name == "base_type") {
 		if (call_mode != CALL_MODE_INSTANCE) {
 			property.usage = PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL;
@@ -2072,7 +1966,6 @@ void VisualScriptPropertyGet::_validate_property(PropertyInfo &property) const {
 		if (call_mode != CALL_MODE_NODE_PATH) {
 			property.usage = 0;
 		} else {
-
 			Node *bnode = _get_base_node();
 			if (bnode) {
 				property.hint_string = bnode->get_path(); //convert to loong string
@@ -2081,9 +1974,7 @@ void VisualScriptPropertyGet::_validate_property(PropertyInfo &property) const {
 	}
 
 	if (property.name == "property") {
-
 		if (call_mode == CALL_MODE_BASIC_TYPE) {
-
 			property.hint = PROPERTY_HINT_PROPERTY_OF_VARIANT_TYPE;
 			property.hint_string = Variant::get_type_name(basic_type);
 
@@ -2096,15 +1987,12 @@ void VisualScriptPropertyGet::_validate_property(PropertyInfo &property) const {
 
 			if (base_script != String()) {
 				if (!ResourceCache::has(base_script) && ScriptServer::edit_request_func) {
-
 					ScriptServer::edit_request_func(base_script); //make sure it's loaded
 				}
 
 				if (ResourceCache::has(base_script)) {
-
 					Ref<Script> script = Ref<Resource>(ResourceCache::get(base_script));
 					if (script.is_valid()) {
-
 						property.hint = PROPERTY_HINT_PROPERTY_OF_SCRIPT;
 						property.hint_string = itos(script->get_instance_id());
 					}
@@ -2123,9 +2011,8 @@ void VisualScriptPropertyGet::_validate_property(PropertyInfo &property) const {
 	}
 
 	if (property.name == "index") {
-
-		Variant::CallError ce;
-		Variant v = Variant::construct(type_cache, NULL, 0, ce);
+		Callable::CallError ce;
+		Variant v = Variant::construct(type_cache, nullptr, 0, ce);
 		List<PropertyInfo> plist;
 		v.get_property_list(&plist);
 		String options = "";
@@ -2136,13 +2023,13 @@ void VisualScriptPropertyGet::_validate_property(PropertyInfo &property) const {
 		property.hint = PROPERTY_HINT_ENUM;
 		property.hint_string = options;
 		property.type = Variant::STRING;
-		if (options == "")
+		if (options == "") {
 			property.usage = 0; //hide if type has no usable index
+		}
 	}
 }
 
 void VisualScriptPropertyGet::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_base_type", "base_type"), &VisualScriptPropertyGet::set_base_type);
 	ClassDB::bind_method(D_METHOD("get_base_type"), &VisualScriptPropertyGet::get_base_type);
 
@@ -2169,8 +2056,9 @@ void VisualScriptPropertyGet::_bind_methods() {
 
 	String bt;
 	for (int i = 0; i < Variant::VARIANT_MAX; i++) {
-		if (i > 0)
+		if (i > 0) {
 			bt += ",";
+		}
 
 		bt += Variant::get_type_name(Variant::Type(i));
 	}
@@ -2182,8 +2070,9 @@ void VisualScriptPropertyGet::_bind_methods() {
 
 	String script_ext_hint;
 	for (List<String>::Element *E = script_extensions.front(); E; E = E->next()) {
-		if (script_ext_hint != String())
+		if (script_ext_hint != String()) {
 			script_ext_hint += ",";
+		}
 		script_ext_hint += "." + E->get();
 	}
 
@@ -2211,12 +2100,9 @@ public:
 	VisualScriptPropertyGet *node;
 	VisualScriptInstance *instance;
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		switch (call_mode) {
-
 			case VisualScriptPropertyGet::CALL_MODE_SELF: {
-
 				Object *object = instance->get_owner_ptr();
 
 				bool valid;
@@ -2228,23 +2114,22 @@ public:
 				}
 
 				if (!valid) {
-					r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+					r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 					r_error_str = RTR("Invalid index property name.");
 					return 0;
 				}
 			} break;
 			case VisualScriptPropertyGet::CALL_MODE_NODE_PATH: {
-
 				Node *node = Object::cast_to<Node>(instance->get_owner_ptr());
 				if (!node) {
-					r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+					r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 					r_error_str = RTR("Base object is not a Node!");
 					return 0;
 				}
 
 				Node *another = node->get_node(node_path);
 				if (!another) {
-					r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+					r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 					r_error_str = RTR("Path does not lead Node!");
 					return 0;
 				}
@@ -2258,14 +2143,13 @@ public:
 				}
 
 				if (!valid) {
-					r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+					r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 					r_error_str = vformat(RTR("Invalid index property name '%s' in node %s."), String(property), another->get_name());
 					return 0;
 				}
 
 			} break;
 			default: {
-
 				bool valid;
 				Variant v = *p_inputs[0];
 
@@ -2275,7 +2159,7 @@ public:
 				}
 
 				if (!valid) {
-					r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+					r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 					r_error_str = RTR("Invalid index property name.");
 				}
 			};
@@ -2286,7 +2170,6 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptPropertyGet::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstancePropertyGet *instance = memnew(VisualScriptNodeInstancePropertyGet);
 	instance->node = this;
 	instance->instance = p_instance;
@@ -2299,7 +2182,6 @@ VisualScriptNodeInstance *VisualScriptPropertyGet::instance(VisualScriptInstance
 }
 
 VisualScriptPropertyGet::VisualScriptPropertyGet() {
-
 	call_mode = CALL_MODE_SELF;
 	base_type = "Object";
 	basic_type = Variant::NIL;
@@ -2308,7 +2190,6 @@ VisualScriptPropertyGet::VisualScriptPropertyGet() {
 
 template <VisualScriptPropertyGet::CallMode cmode>
 static Ref<VisualScriptNode> create_property_get_node(const String &p_name) {
-
 	Ref<VisualScriptPropertyGet> node;
 	node.instance();
 	node->set_call_mode(cmode);
@@ -2320,44 +2201,40 @@ static Ref<VisualScriptNode> create_property_get_node(const String &p_name) {
 //////////////////////////////////////////
 
 int VisualScriptEmitSignal::get_output_sequence_port_count() const {
-
 	return 1;
 }
 
 bool VisualScriptEmitSignal::has_input_sequence_port() const {
-
 	return true;
 }
 
 int VisualScriptEmitSignal::get_input_value_port_count() const {
-
 	Ref<VisualScript> vs = get_visual_script();
 	if (vs.is_valid()) {
-
-		if (!vs->has_custom_signal(name))
+		if (!vs->has_custom_signal(name)) {
 			return 0;
+		}
 
 		return vs->custom_signal_get_argument_count(name);
 	}
 
 	return 0;
 }
+
 int VisualScriptEmitSignal::get_output_value_port_count() const {
 	return 0;
 }
 
 String VisualScriptEmitSignal::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 PropertyInfo VisualScriptEmitSignal::get_input_value_port_info(int p_idx) const {
-
 	Ref<VisualScript> vs = get_visual_script();
 	if (vs.is_valid()) {
-
-		if (!vs->has_custom_signal(name))
+		if (!vs->has_custom_signal(name)) {
 			return PropertyInfo();
+		}
 
 		return PropertyInfo(vs->custom_signal_get_argument_type(name, p_idx), vs->custom_signal_get_argument_name(name, p_idx));
 	}
@@ -2366,32 +2243,29 @@ PropertyInfo VisualScriptEmitSignal::get_input_value_port_info(int p_idx) const
 }
 
 PropertyInfo VisualScriptEmitSignal::get_output_value_port_info(int p_idx) const {
-
 	return PropertyInfo();
 }
 
 String VisualScriptEmitSignal::get_caption() const {
-
 	return "Emit " + String(name);
 }
 
 void VisualScriptEmitSignal::set_signal(const StringName &p_type) {
-
-	if (name == p_type)
+	if (name == p_type) {
 		return;
+	}
 
 	name = p_type;
 
 	_change_notify();
 	ports_changed_notify();
 }
-StringName VisualScriptEmitSignal::get_signal() const {
 
+StringName VisualScriptEmitSignal::get_signal() const {
 	return name;
 }
 
 void VisualScriptEmitSignal::_validate_property(PropertyInfo &property) const {
-
 	if (property.name == "signal") {
 		property.hint = PROPERTY_HINT_ENUM;
 
@@ -2399,15 +2273,14 @@ void VisualScriptEmitSignal::_validate_property(PropertyInfo &property) const {
 
 		Ref<VisualScript> vs = get_visual_script();
 		if (vs.is_valid()) {
-
 			vs->get_custom_signal_list(&sigs);
 		}
 
 		String ml;
 		for (List<StringName>::Element *E = sigs.front(); E; E = E->next()) {
-
-			if (ml != String())
+			if (ml != String()) {
 				ml += ",";
+			}
 			ml += E->get();
 		}
 
@@ -2416,7 +2289,6 @@ void VisualScriptEmitSignal::_validate_property(PropertyInfo &property) const {
 }
 
 void VisualScriptEmitSignal::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_signal", "name"), &VisualScriptEmitSignal::set_signal);
 	ClassDB::bind_method(D_METHOD("get_signal"), &VisualScriptEmitSignal::get_signal);
 
@@ -2434,8 +2306,7 @@ public:
 	//virtual bool is_output_port_unsequenced(int p_idx) const { return false; }
 	//virtual bool get_output_port_unsequenced(int p_idx,Variant* r_value,Variant* p_working_mem,String &r_error) const { return true; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		Object *obj = instance->get_owner_ptr();
 
 		obj->emit_signal(name, p_inputs, argcount);
@@ -2445,7 +2316,6 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptEmitSignal::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceEmitSignal *instance = memnew(VisualScriptNodeInstanceEmitSignal);
 	instance->node = this;
 	instance->instance = p_instance;
@@ -2458,7 +2328,6 @@ VisualScriptEmitSignal::VisualScriptEmitSignal() {
 }
 
 static Ref<VisualScriptNode> create_basic_type_call_node(const String &p_name) {
-
 	Vector<String> path = p_name.split("/");
 	ERR_FAIL_COND_V(path.size() < 4, Ref<VisualScriptNode>());
 	String base_type = path[2];
@@ -2470,7 +2339,6 @@ static Ref<VisualScriptNode> create_basic_type_call_node(const String &p_name) {
 	Variant::Type type = Variant::VARIANT_MAX;
 
 	for (int i = 0; i < Variant::VARIANT_MAX; i++) {
-
 		if (Variant::get_type_name(Variant::Type(i)) == base_type) {
 			type = Variant::Type(i);
 			break;
@@ -2487,7 +2355,6 @@ static Ref<VisualScriptNode> create_basic_type_call_node(const String &p_name) {
 }
 
 void register_visual_script_func_nodes() {
-
 	VisualScriptLanguage::singleton->add_register_func("functions/call", create_node_generic<VisualScriptFunctionCall>);
 	VisualScriptLanguage::singleton->add_register_func("functions/set", create_node_generic<VisualScriptPropertySet>);
 	VisualScriptLanguage::singleton->add_register_func("functions/get", create_node_generic<VisualScriptPropertyGet>);
@@ -2497,11 +2364,10 @@ void register_visual_script_func_nodes() {
 	VisualScriptLanguage::singleton->add_register_func("functions/emit_signal", create_node_generic<VisualScriptEmitSignal>);
 
 	for (int i = 0; i < Variant::VARIANT_MAX; i++) {
-
 		Variant::Type t = Variant::Type(i);
 		String type_name = Variant::get_type_name(t);
-		Variant::CallError ce;
-		Variant vt = Variant::construct(t, NULL, 0, ce);
+		Callable::CallError ce;
+		Variant vt = Variant::construct(t, nullptr, 0, ce);
 		List<MethodInfo> ml;
 		vt.get_method_list(&ml);
 
diff --git a/modules/visual_script/visual_script_func_nodes.h b/modules/visual_script/visual_script_func_nodes.h
index 2dba0ae3c1..8372df561f 100644
--- a/modules/visual_script/visual_script_func_nodes.h
+++ b/modules/visual_script/visual_script_func_nodes.h
@@ -34,7 +34,6 @@
 #include "visual_script.h"
 
 class VisualScriptFunctionCall : public VisualScriptNode {
-
 	GDCLASS(VisualScriptFunctionCall, VisualScriptNode);
 
 public:
@@ -76,25 +75,25 @@ private:
 	Dictionary _get_argument_cache() const;
 
 protected:
-	virtual void _validate_property(PropertyInfo &property) const;
+	virtual void _validate_property(PropertyInfo &property) const override;
 
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_text() const;
-	virtual String get_category() const { return "functions"; }
+	virtual String get_caption() const override;
+	virtual String get_text() const override;
+	virtual String get_category() const override { return "functions"; }
 
 	void set_basic_type(Variant::Type p_type);
 	Variant::Type get_basic_type() const;
@@ -126,9 +125,9 @@ public:
 	void set_rpc_call_mode(RPCCallMode p_mode);
 	RPCCallMode get_rpc_call_mode() const;
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
-	virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const;
+	virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const override;
 
 	VisualScriptFunctionCall();
 };
@@ -137,7 +136,6 @@ VARIANT_ENUM_CAST(VisualScriptFunctionCall::CallMode);
 VARIANT_ENUM_CAST(VisualScriptFunctionCall::RPCCallMode);
 
 class VisualScriptPropertySet : public VisualScriptNode {
-
 	GDCLASS(VisualScriptPropertySet, VisualScriptNode);
 
 public:
@@ -189,25 +187,25 @@ private:
 	void _adjust_input_index(PropertyInfo &pinfo) const;
 
 protected:
-	virtual void _validate_property(PropertyInfo &property) const;
+	virtual void _validate_property(PropertyInfo &property) const override;
 
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_text() const;
-	virtual String get_category() const { return "functions"; }
+	virtual String get_caption() const override;
+	virtual String get_text() const override;
+	virtual String get_category() const override { return "functions"; }
 
 	void set_base_type(const StringName &p_type);
 	StringName get_base_type() const;
@@ -233,8 +231,8 @@ public:
 	void set_assign_op(AssignOp p_op);
 	AssignOp get_assign_op() const;
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
-	virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const;
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
+	virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const override;
 
 	VisualScriptPropertySet();
 };
@@ -243,7 +241,6 @@ VARIANT_ENUM_CAST(VisualScriptPropertySet::CallMode);
 VARIANT_ENUM_CAST(VisualScriptPropertySet::AssignOp);
 
 class VisualScriptPropertyGet : public VisualScriptNode {
-
 	GDCLASS(VisualScriptPropertyGet, VisualScriptNode);
 
 public:
@@ -276,25 +273,25 @@ private:
 	Variant::Type _get_type_cache() const;
 
 protected:
-	virtual void _validate_property(PropertyInfo &property) const;
+	virtual void _validate_property(PropertyInfo &property) const override;
 
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_text() const;
-	virtual String get_category() const { return "functions"; }
+	virtual String get_caption() const override;
+	virtual String get_text() const override;
+	virtual String get_category() const override { return "functions"; }
 
 	void set_base_type(const StringName &p_type);
 	StringName get_base_type() const;
@@ -317,7 +314,7 @@ public:
 	void set_index(const StringName &p_type);
 	StringName get_index() const;
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptPropertyGet();
 };
@@ -325,37 +322,36 @@ public:
 VARIANT_ENUM_CAST(VisualScriptPropertyGet::CallMode);
 
 class VisualScriptEmitSignal : public VisualScriptNode {
-
 	GDCLASS(VisualScriptEmitSignal, VisualScriptNode);
 
 private:
 	StringName name;
 
 protected:
-	virtual void _validate_property(PropertyInfo &property) const;
+	virtual void _validate_property(PropertyInfo &property) const override;
 
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
+	virtual String get_caption() const override;
 	//virtual String get_text() const;
-	virtual String get_category() const { return "functions"; }
+	virtual String get_category() const override { return "functions"; }
 
 	void set_signal(const StringName &p_type);
 	StringName get_signal() const;
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptEmitSignal();
 };
diff --git a/modules/visual_script/visual_script_nodes.cpp b/modules/visual_script/visual_script_nodes.cpp
index 86c1080182..1b77ed3168 100644
--- a/modules/visual_script/visual_script_nodes.cpp
+++ b/modules/visual_script/visual_script_nodes.cpp
@@ -32,7 +32,7 @@
 
 #include "core/engine.h"
 #include "core/global_constants.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/os.h"
 #include "core/project_settings.h"
 #include "scene/main/node.h"
@@ -43,13 +43,12 @@
 //////////////////////////////////////////
 
 bool VisualScriptFunction::_set(const StringName &p_name, const Variant &p_value) {
-
 	if (p_name == "argument_count") {
-
 		int new_argc = p_value;
 		int argc = arguments.size();
-		if (argc == new_argc)
+		if (argc == new_argc) {
 			return true;
+		}
 
 		arguments.resize(new_argc);
 
@@ -66,7 +65,6 @@ bool VisualScriptFunction::_set(const StringName &p_name, const Variant &p_value
 		ERR_FAIL_INDEX_V(idx, arguments.size(), false);
 		String what = String(p_name).get_slice("/", 1);
 		if (what == "type") {
-
 			Variant::Type new_type = Variant::Type(int(p_value));
 			arguments.write[idx].type = new_type;
 			ports_changed_notify();
@@ -75,7 +73,6 @@ bool VisualScriptFunction::_set(const StringName &p_name, const Variant &p_value
 		}
 
 		if (what == "name") {
-
 			arguments.write[idx].name = p_value;
 			ports_changed_notify();
 			return true;
@@ -107,7 +104,6 @@ bool VisualScriptFunction::_set(const StringName &p_name, const Variant &p_value
 }
 
 bool VisualScriptFunction::_get(const StringName &p_name, Variant &r_ret) const {
-
 	if (p_name == "argument_count") {
 		r_ret = arguments.size();
 		return true;
@@ -148,8 +144,8 @@ bool VisualScriptFunction::_get(const StringName &p_name, Variant &r_ret) const
 
 	return false;
 }
-void VisualScriptFunction::_get_property_list(List<PropertyInfo> *p_list) const {
 
+void VisualScriptFunction::_get_property_list(List<PropertyInfo> *p_list) const {
 	p_list->push_back(PropertyInfo(Variant::INT, "argument_count", PROPERTY_HINT_RANGE, "0,256"));
 	String argt = "Any";
 	for (int i = 1; i < Variant::VARIANT_MAX; i++) {
@@ -171,35 +167,30 @@ void VisualScriptFunction::_get_property_list(List<PropertyInfo> *p_list) const
 }
 
 int VisualScriptFunction::get_output_sequence_port_count() const {
-
 	return 1;
 }
 
 bool VisualScriptFunction::has_input_sequence_port() const {
-
 	return false;
 }
 
 int VisualScriptFunction::get_input_value_port_count() const {
-
 	return 0;
 }
-int VisualScriptFunction::get_output_value_port_count() const {
 
+int VisualScriptFunction::get_output_value_port_count() const {
 	return arguments.size();
 }
 
 String VisualScriptFunction::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 PropertyInfo VisualScriptFunction::get_input_value_port_info(int p_idx) const {
-
 	ERR_FAIL_V(PropertyInfo());
 }
-PropertyInfo VisualScriptFunction::get_output_value_port_info(int p_idx) const {
 
+PropertyInfo VisualScriptFunction::get_output_value_port_info(int p_idx) const {
 	ERR_FAIL_INDEX_V(p_idx, arguments.size(), PropertyInfo());
 	PropertyInfo out;
 	out.type = arguments[p_idx].type;
@@ -210,55 +201,53 @@ PropertyInfo VisualScriptFunction::get_output_value_port_info(int p_idx) const {
 }
 
 String VisualScriptFunction::get_caption() const {
-
 	return "Function";
 }
 
 String VisualScriptFunction::get_text() const {
-
 	return get_name(); //use name as function name I guess
 }
 
 void VisualScriptFunction::add_argument(Variant::Type p_type, const String &p_name, int p_index, const PropertyHint p_hint, const String &p_hint_string) {
-
 	Argument arg;
 	arg.name = p_name;
 	arg.type = p_type;
 	arg.hint = p_hint;
 	arg.hint_string = p_hint_string;
-	if (p_index >= 0)
+	if (p_index >= 0) {
 		arguments.insert(p_index, arg);
-	else
+	} else {
 		arguments.push_back(arg);
+	}
 
 	ports_changed_notify();
 }
-void VisualScriptFunction::set_argument_type(int p_argidx, Variant::Type p_type) {
 
+void VisualScriptFunction::set_argument_type(int p_argidx, Variant::Type p_type) {
 	ERR_FAIL_INDEX(p_argidx, arguments.size());
 
 	arguments.write[p_argidx].type = p_type;
 	ports_changed_notify();
 }
-Variant::Type VisualScriptFunction::get_argument_type(int p_argidx) const {
 
+Variant::Type VisualScriptFunction::get_argument_type(int p_argidx) const {
 	ERR_FAIL_INDEX_V(p_argidx, arguments.size(), Variant::NIL);
 	return arguments[p_argidx].type;
 }
-void VisualScriptFunction::set_argument_name(int p_argidx, const String &p_name) {
 
+void VisualScriptFunction::set_argument_name(int p_argidx, const String &p_name) {
 	ERR_FAIL_INDEX(p_argidx, arguments.size());
 
 	arguments.write[p_argidx].name = p_name;
 	ports_changed_notify();
 }
-String VisualScriptFunction::get_argument_name(int p_argidx) const {
 
+String VisualScriptFunction::get_argument_name(int p_argidx) const {
 	ERR_FAIL_INDEX_V(p_argidx, arguments.size(), String());
 	return arguments[p_argidx].name;
 }
-void VisualScriptFunction::remove_argument(int p_argidx) {
 
+void VisualScriptFunction::remove_argument(int p_argidx) {
 	ERR_FAIL_INDEX(p_argidx, arguments.size());
 
 	arguments.remove(p_argidx);
@@ -266,7 +255,6 @@ void VisualScriptFunction::remove_argument(int p_argidx) {
 }
 
 int VisualScriptFunction::get_argument_count() const {
-
 	return arguments.size();
 }
 
@@ -285,8 +273,7 @@ public:
 
 	//virtual int get_working_memory_size() const { return 0; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		int ac = node->get_argument_count();
 
 		for (int i = 0; i < ac; i++) {
@@ -294,7 +281,7 @@ public:
 			Variant::Type expected = node->get_argument_type(i);
 			if (expected != Variant::NIL) {
 				if (!Variant::can_convert_strict(p_inputs[i]->get_type(), expected)) {
-					r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+					r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
 					r_error.expected = expected;
 					r_error.argument = i;
 					return 0;
@@ -310,7 +297,6 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptFunction::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceFunction *instance = memnew(VisualScriptNodeInstanceFunction);
 	instance->node = this;
 	instance->instance = p_instance;
@@ -318,7 +304,6 @@ VisualScriptNodeInstance *VisualScriptFunction::instance(VisualScriptInstance *p
 }
 
 VisualScriptFunction::VisualScriptFunction() {
-
 	stack_size = 256;
 	stack_less = false;
 	sequenced = true;
@@ -335,23 +320,19 @@ bool VisualScriptFunction::is_stack_less() const {
 }
 
 void VisualScriptFunction::set_sequenced(bool p_enable) {
-
 	sequenced = p_enable;
 }
 
 bool VisualScriptFunction::is_sequenced() const {
-
 	return sequenced;
 }
 
 void VisualScriptFunction::set_stack_size(int p_size) {
-
 	ERR_FAIL_COND(p_size < 1 || p_size > 100000);
 	stack_size = p_size;
 }
 
 int VisualScriptFunction::get_stack_size() const {
-
 	return stack_size;
 }
 
@@ -360,10 +341,12 @@ int VisualScriptFunction::get_stack_size() const {
 //////////////////////////////////////////
 
 int VisualScriptLists::get_output_sequence_port_count() const {
-	if (sequenced)
+	if (sequenced) {
 		return 1;
+	}
 	return 0;
 }
+
 bool VisualScriptLists::has_input_sequence_port() const {
 	return sequenced;
 }
@@ -375,6 +358,7 @@ String VisualScriptLists::get_output_sequence_port_text(int p_port) const {
 int VisualScriptLists::get_input_value_port_count() const {
 	return inputports.size();
 }
+
 int VisualScriptLists::get_output_value_port_count() const {
 	return outputports.size();
 }
@@ -387,6 +371,7 @@ PropertyInfo VisualScriptLists::get_input_value_port_info(int p_idx) const {
 	pi.type = inputports[p_idx].type;
 	return pi;
 }
+
 PropertyInfo VisualScriptLists::get_output_value_port_info(int p_idx) const {
 	ERR_FAIL_INDEX_V(p_idx, outputports.size(), PropertyInfo());
 
@@ -399,9 +384,11 @@ PropertyInfo VisualScriptLists::get_output_value_port_info(int p_idx) const {
 bool VisualScriptLists::is_input_port_editable() const {
 	return ((flags & INPUT_EDITABLE) == INPUT_EDITABLE);
 }
+
 bool VisualScriptLists::is_input_port_name_editable() const {
 	return ((flags & INPUT_NAME_EDITABLE) == INPUT_NAME_EDITABLE);
 }
+
 bool VisualScriptLists::is_input_port_type_editable() const {
 	return ((flags & INPUT_TYPE_EDITABLE) == INPUT_TYPE_EDITABLE);
 }
@@ -409,22 +396,23 @@ bool VisualScriptLists::is_input_port_type_editable() const {
 bool VisualScriptLists::is_output_port_editable() const {
 	return ((flags & OUTPUT_EDITABLE) == OUTPUT_EDITABLE);
 }
+
 bool VisualScriptLists::is_output_port_name_editable() const {
 	return ((flags & INPUT_NAME_EDITABLE) == INPUT_NAME_EDITABLE);
 }
+
 bool VisualScriptLists::is_output_port_type_editable() const {
 	return ((flags & INPUT_TYPE_EDITABLE) == INPUT_TYPE_EDITABLE);
 }
 
 // for the inspector
 bool VisualScriptLists::_set(const StringName &p_name, const Variant &p_value) {
-
 	if (p_name == "input_count" && is_input_port_editable()) {
-
 		int new_argc = p_value;
 		int argc = inputports.size();
-		if (argc == new_argc)
+		if (argc == new_argc) {
 			return true;
+		}
 
 		inputports.resize(new_argc);
 
@@ -441,7 +429,6 @@ bool VisualScriptLists::_set(const StringName &p_name, const Variant &p_value) {
 		ERR_FAIL_INDEX_V(idx, inputports.size(), false);
 		String what = String(p_name).get_slice("/", 1);
 		if (what == "type") {
-
 			Variant::Type new_type = Variant::Type(int(p_value));
 			inputports.write[idx].type = new_type;
 			ports_changed_notify();
@@ -450,7 +437,6 @@ bool VisualScriptLists::_set(const StringName &p_name, const Variant &p_value) {
 		}
 
 		if (what == "name") {
-
 			inputports.write[idx].name = p_value;
 			ports_changed_notify();
 			return true;
@@ -458,11 +444,11 @@ bool VisualScriptLists::_set(const StringName &p_name, const Variant &p_value) {
 	}
 
 	if (p_name == "output_count" && is_output_port_editable()) {
-
 		int new_argc = p_value;
 		int argc = outputports.size();
-		if (argc == new_argc)
+		if (argc == new_argc) {
 			return true;
+		}
 
 		outputports.resize(new_argc);
 
@@ -479,7 +465,6 @@ bool VisualScriptLists::_set(const StringName &p_name, const Variant &p_value) {
 		ERR_FAIL_INDEX_V(idx, outputports.size(), false);
 		String what = String(p_name).get_slice("/", 1);
 		if (what == "type") {
-
 			Variant::Type new_type = Variant::Type(int(p_value));
 			outputports.write[idx].type = new_type;
 			ports_changed_notify();
@@ -488,7 +473,6 @@ bool VisualScriptLists::_set(const StringName &p_name, const Variant &p_value) {
 		}
 
 		if (what == "name") {
-
 			outputports.write[idx].name = p_value;
 			ports_changed_notify();
 			return true;
@@ -503,8 +487,8 @@ bool VisualScriptLists::_set(const StringName &p_name, const Variant &p_value) {
 
 	return false;
 }
-bool VisualScriptLists::_get(const StringName &p_name, Variant &r_ret) const {
 
+bool VisualScriptLists::_get(const StringName &p_name, Variant &r_ret) const {
 	if (p_name == "input_count" && is_input_port_editable()) {
 		r_ret = inputports.size();
 		return true;
@@ -548,8 +532,8 @@ bool VisualScriptLists::_get(const StringName &p_name, Variant &r_ret) const {
 
 	return false;
 }
-void VisualScriptLists::_get_property_list(List<PropertyInfo> *p_list) const {
 
+void VisualScriptLists::_get_property_list(List<PropertyInfo> *p_list) const {
 	if (is_input_port_editable()) {
 		p_list->push_back(PropertyInfo(Variant::INT, "input_count", PROPERTY_HINT_RANGE, "0,256"));
 		String argt = "Any";
@@ -580,25 +564,27 @@ void VisualScriptLists::_get_property_list(List<PropertyInfo> *p_list) const {
 
 // input data port interaction
 void VisualScriptLists::add_input_data_port(Variant::Type p_type, const String &p_name, int p_index) {
-
-	if (!is_input_port_editable())
+	if (!is_input_port_editable()) {
 		return;
+	}
 
 	Port inp;
 	inp.name = p_name;
 	inp.type = p_type;
-	if (p_index >= 0)
+	if (p_index >= 0) {
 		inputports.insert(p_index, inp);
-	else
+	} else {
 		inputports.push_back(inp);
+	}
 
 	ports_changed_notify();
 	_change_notify();
 }
-void VisualScriptLists::set_input_data_port_type(int p_idx, Variant::Type p_type) {
 
-	if (!is_input_port_type_editable())
+void VisualScriptLists::set_input_data_port_type(int p_idx, Variant::Type p_type) {
+	if (!is_input_port_type_editable()) {
 		return;
+	}
 
 	ERR_FAIL_INDEX(p_idx, inputports.size());
 
@@ -606,10 +592,11 @@ void VisualScriptLists::set_input_data_port_type(int p_idx, Variant::Type p_type
 	ports_changed_notify();
 	_change_notify();
 }
-void VisualScriptLists::set_input_data_port_name(int p_idx, const String &p_name) {
 
-	if (!is_input_port_name_editable())
+void VisualScriptLists::set_input_data_port_name(int p_idx, const String &p_name) {
+	if (!is_input_port_name_editable()) {
 		return;
+	}
 
 	ERR_FAIL_INDEX(p_idx, inputports.size());
 
@@ -617,10 +604,11 @@ void VisualScriptLists::set_input_data_port_name(int p_idx, const String &p_name
 	ports_changed_notify();
 	_change_notify();
 }
-void VisualScriptLists::remove_input_data_port(int p_argidx) {
 
-	if (!is_input_port_editable())
+void VisualScriptLists::remove_input_data_port(int p_argidx) {
+	if (!is_input_port_editable()) {
 		return;
+	}
 
 	ERR_FAIL_INDEX(p_argidx, inputports.size());
 
@@ -632,25 +620,27 @@ void VisualScriptLists::remove_input_data_port(int p_argidx) {
 
 // output data port interaction
 void VisualScriptLists::add_output_data_port(Variant::Type p_type, const String &p_name, int p_index) {
-
-	if (!is_output_port_editable())
+	if (!is_output_port_editable()) {
 		return;
+	}
 
 	Port out;
 	out.name = p_name;
 	out.type = p_type;
-	if (p_index >= 0)
+	if (p_index >= 0) {
 		outputports.insert(p_index, out);
-	else
+	} else {
 		outputports.push_back(out);
+	}
 
 	ports_changed_notify();
 	_change_notify();
 }
-void VisualScriptLists::set_output_data_port_type(int p_idx, Variant::Type p_type) {
 
-	if (!is_output_port_type_editable())
+void VisualScriptLists::set_output_data_port_type(int p_idx, Variant::Type p_type) {
+	if (!is_output_port_type_editable()) {
 		return;
+	}
 
 	ERR_FAIL_INDEX(p_idx, outputports.size());
 
@@ -658,10 +648,11 @@ void VisualScriptLists::set_output_data_port_type(int p_idx, Variant::Type p_typ
 	ports_changed_notify();
 	_change_notify();
 }
-void VisualScriptLists::set_output_data_port_name(int p_idx, const String &p_name) {
 
-	if (!is_output_port_name_editable())
+void VisualScriptLists::set_output_data_port_name(int p_idx, const String &p_name) {
+	if (!is_output_port_name_editable()) {
 		return;
+	}
 
 	ERR_FAIL_INDEX(p_idx, outputports.size());
 
@@ -669,10 +660,11 @@ void VisualScriptLists::set_output_data_port_name(int p_idx, const String &p_nam
 	ports_changed_notify();
 	_change_notify();
 }
-void VisualScriptLists::remove_output_data_port(int p_argidx) {
 
-	if (!is_output_port_editable())
+void VisualScriptLists::remove_output_data_port(int p_argidx) {
+	if (!is_output_port_editable()) {
 		return;
+	}
 
 	ERR_FAIL_INDEX(p_argidx, outputports.size());
 
@@ -684,11 +676,13 @@ void VisualScriptLists::remove_output_data_port(int p_argidx) {
 
 // sequences
 void VisualScriptLists::set_sequenced(bool p_enable) {
-	if (sequenced == p_enable)
+	if (sequenced == p_enable) {
 		return;
+	}
 	sequenced = p_enable;
 	ports_changed_notify();
 }
+
 bool VisualScriptLists::is_sequenced() const {
 	return sequenced;
 }
@@ -716,10 +710,12 @@ void VisualScriptLists::_bind_methods() {
 //////////////////////////////////////////
 
 int VisualScriptComposeArray::get_output_sequence_port_count() const {
-	if (sequenced)
+	if (sequenced) {
 		return 1;
+	}
 	return 0;
 }
+
 bool VisualScriptComposeArray::has_input_sequence_port() const {
 	return sequenced;
 }
@@ -731,6 +727,7 @@ String VisualScriptComposeArray::get_output_sequence_port_text(int p_port) const
 int VisualScriptComposeArray::get_input_value_port_count() const {
 	return inputports.size();
 }
+
 int VisualScriptComposeArray::get_output_value_port_count() const {
 	return 1;
 }
@@ -743,6 +740,7 @@ PropertyInfo VisualScriptComposeArray::get_input_value_port_info(int p_idx) cons
 	pi.type = inputports[p_idx].type;
 	return pi;
 }
+
 PropertyInfo VisualScriptComposeArray::get_output_value_port_info(int p_idx) const {
 	PropertyInfo pi;
 	pi.name = "out";
@@ -753,6 +751,7 @@ PropertyInfo VisualScriptComposeArray::get_output_value_port_info(int p_idx) con
 String VisualScriptComposeArray::get_caption() const {
 	return "Compose Array";
 }
+
 String VisualScriptComposeArray::get_text() const {
 	return "";
 }
@@ -762,12 +761,12 @@ public:
 	int input_count = 0;
 	virtual int get_working_memory_size() const { return 0; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		if (input_count > 0) {
 			Array arr;
-			for (int i = 0; i < input_count; i++)
+			for (int i = 0; i < input_count; i++) {
 				arr.push_back((*p_inputs[i]));
+			}
 			Variant va = Variant(arr);
 
 			*p_outputs[0] = va;
@@ -778,7 +777,6 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptComposeArray::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptComposeArrayNode *instance = memnew(VisualScriptComposeArrayNode);
 	instance->input_count = inputports.size();
 	return instance;
@@ -795,31 +793,26 @@ VisualScriptComposeArray::VisualScriptComposeArray() {
 //////////////////////////////////////////
 
 int VisualScriptOperator::get_output_sequence_port_count() const {
-
 	return 0;
 }
 
 bool VisualScriptOperator::has_input_sequence_port() const {
-
 	return false;
 }
 
 int VisualScriptOperator::get_input_value_port_count() const {
-
 	return (op == Variant::OP_BIT_NEGATE || op == Variant::OP_NOT || op == Variant::OP_NEGATE || op == Variant::OP_POSITIVE) ? 1 : 2;
 }
-int VisualScriptOperator::get_output_value_port_count() const {
 
+int VisualScriptOperator::get_output_value_port_count() const {
 	return 1;
 }
 
 String VisualScriptOperator::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 PropertyInfo VisualScriptOperator::get_input_value_port_info(int p_idx) const {
-
 	static const Variant::Type port_types[Variant::OP_MAX][2] = {
 		{ Variant::NIL, Variant::NIL }, //OP_EQUAL,
 		{ Variant::NIL, Variant::NIL }, //OP_NOT_EQUAL,
@@ -857,10 +850,12 @@ PropertyInfo VisualScriptOperator::get_input_value_port_info(int p_idx) const {
 	PropertyInfo pinfo;
 	pinfo.name = p_idx == 0 ? "A" : "B";
 	pinfo.type = port_types[op][p_idx];
-	if (pinfo.type == Variant::NIL)
+	if (pinfo.type == Variant::NIL) {
 		pinfo.type = typed;
+	}
 	return pinfo;
 }
+
 PropertyInfo VisualScriptOperator::get_output_value_port_info(int p_idx) const {
 	static const Variant::Type port_types[Variant::OP_MAX] = {
 		//comparison
@@ -898,8 +893,9 @@ PropertyInfo VisualScriptOperator::get_output_value_port_info(int p_idx) const {
 	PropertyInfo pinfo;
 	pinfo.name = "";
 	pinfo.type = port_types[op];
-	if (pinfo.type == Variant::NIL)
+	if (pinfo.type == Variant::NIL) {
 		pinfo.type = typed;
+	}
 	return pinfo;
 }
 
@@ -937,71 +933,67 @@ static const char *op_names[] = {
 };
 
 String VisualScriptOperator::get_caption() const {
-
-	static const wchar_t *op_names[] = {
+	static const char32_t *op_names[] = {
 		//comparison
-		L"A = B", //OP_EQUAL,
-		L"A \u2260 B", //OP_NOT_EQUAL,
-		L"A < B", //OP_LESS,
-		L"A \u2264 B", //OP_LESS_EQUAL,
-		L"A > B", //OP_GREATER,
-		L"A \u2265 B", //OP_GREATER_EQUAL,
+		U"A = B", //OP_EQUAL,
+		U"A \u2260 B", //OP_NOT_EQUAL,
+		U"A < B", //OP_LESS,
+		U"A \u2264 B", //OP_LESS_EQUAL,
+		U"A > B", //OP_GREATER,
+		U"A \u2265 B", //OP_GREATER_EQUAL,
 		//mathematic
-		L"A + B", //OP_ADD,
-		L"A - B", //OP_SUBTRACT,
-		L"A \u00D7 B", //OP_MULTIPLY,
-		L"A \u00F7 B", //OP_DIVIDE,
-		L"\u00AC A", //OP_NEGATE,
-		L"+ A", //OP_POSITIVE,
-		L"A mod B", //OP_MODULE,
-		L"A .. B", //OP_STRING_CONCAT,
+		U"A + B", //OP_ADD,
+		U"A - B", //OP_SUBTRACT,
+		U"A \u00D7 B", //OP_MULTIPLY,
+		U"A \u00F7 B", //OP_DIVIDE,
+		U"\u00AC A", //OP_NEGATE,
+		U"+ A", //OP_POSITIVE,
+		U"A mod B", //OP_MODULE,
+		U"A .. B", //OP_STRING_CONCAT,
 		//bitwise
-		L"A << B", //OP_SHIFT_LEFT,
-		L"A >> B", //OP_SHIFT_RIGHT,
-		L"A & B", //OP_BIT_AND,
-		L"A | B", //OP_BIT_OR,
-		L"A ^ B", //OP_BIT_XOR,
-		L"~A", //OP_BIT_NEGATE,
+		U"A << B", //OP_SHIFT_LEFT,
+		U"A >> B", //OP_SHIFT_RIGHT,
+		U"A & B", //OP_BIT_AND,
+		U"A | B", //OP_BIT_OR,
+		U"A ^ B", //OP_BIT_XOR,
+		U"~A", //OP_BIT_NEGATE,
 		//logic
-		L"A and B", //OP_AND,
-		L"A or B", //OP_OR,
-		L"A xor B", //OP_XOR,
-		L"not A", //OP_NOT,
-		L"A in B", //OP_IN,
+		U"A and B", //OP_AND,
+		U"A or B", //OP_OR,
+		U"A xor B", //OP_XOR,
+		U"not A", //OP_NOT,
+		U"A in B", //OP_IN,
 
 	};
 	return op_names[op];
 }
 
 void VisualScriptOperator::set_operator(Variant::Operator p_op) {
-
-	if (op == p_op)
+	if (op == p_op) {
 		return;
+	}
 	op = p_op;
 	ports_changed_notify();
 }
 
 Variant::Operator VisualScriptOperator::get_operator() const {
-
 	return op;
 }
 
 void VisualScriptOperator::set_typed(Variant::Type p_op) {
-
-	if (typed == p_op)
+	if (typed == p_op) {
 		return;
+	}
 
 	typed = p_op;
 	ports_changed_notify();
 }
 
 Variant::Type VisualScriptOperator::get_typed() const {
-
 	return typed;
 }
 
 void VisualScriptOperator::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_operator", "op"), &VisualScriptOperator::set_operator);
 	ClassDB::bind_method(D_METHOD("get_operator"), &VisualScriptOperator::get_operator);
 
@@ -1010,8 +1002,9 @@ void VisualScriptOperator::_bind_methods() {
 
 	String types;
 	for (int i = 0; i < Variant::OP_MAX; i++) {
-		if (i > 0)
+		if (i > 0) {
 			types += ",";
+		}
 		types += op_names[i];
 	}
 
@@ -1031,26 +1024,24 @@ public:
 
 	//virtual int get_working_memory_size() const { return 0; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		bool valid;
 		if (unary) {
-
 			Variant::evaluate(op, *p_inputs[0], Variant(), *p_outputs[0], valid);
 		} else {
 			Variant::evaluate(op, *p_inputs[0], *p_inputs[1], *p_outputs[0], valid);
 		}
 
 		if (!valid) {
-
-			r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+			r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 			if (p_outputs[0]->get_type() == Variant::STRING) {
 				r_error_str = *p_outputs[0];
 			} else {
-				if (unary)
+				if (unary) {
 					r_error_str = String(op_names[op]) + RTR(": Invalid argument of type: ") + Variant::get_type_name(p_inputs[0]->get_type());
-				else
+				} else {
 					r_error_str = String(op_names[op]) + RTR(": Invalid arguments: ") + "A: " + Variant::get_type_name(p_inputs[0]->get_type()) + "  B: " + Variant::get_type_name(p_inputs[1]->get_type());
+				}
 			}
 		}
 
@@ -1059,7 +1050,6 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptOperator::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceOperator *instance = memnew(VisualScriptNodeInstanceOperator);
 	instance->unary = get_input_value_port_count() == 1;
 	instance->op = op;
@@ -1067,14 +1057,12 @@ VisualScriptNodeInstance *VisualScriptOperator::instance(VisualScriptInstance *p
 }
 
 VisualScriptOperator::VisualScriptOperator() {
-
 	op = Variant::OP_ADD;
 	typed = Variant::NIL;
 }
 
 template <Variant::Operator OP>
 static Ref<VisualScriptNode> create_op_node(const String &p_name) {
-
 	Ref<VisualScriptOperator> node;
 	node.instance();
 	node->set_operator(OP);
@@ -1086,31 +1074,26 @@ static Ref<VisualScriptNode> create_op_node(const String &p_name) {
 //////////////////////////////////////////
 
 int VisualScriptSelect::get_output_sequence_port_count() const {
-
 	return 0;
 }
 
 bool VisualScriptSelect::has_input_sequence_port() const {
-
 	return false;
 }
 
 int VisualScriptSelect::get_input_value_port_count() const {
-
 	return 3;
 }
-int VisualScriptSelect::get_output_value_port_count() const {
 
+int VisualScriptSelect::get_output_value_port_count() const {
 	return 1;
 }
 
 String VisualScriptSelect::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 PropertyInfo VisualScriptSelect::get_input_value_port_info(int p_idx) const {
-
 	if (p_idx == 0) {
 		return PropertyInfo(Variant::BOOL, "cond");
 	} else if (p_idx == 1) {
@@ -1119,37 +1102,33 @@ PropertyInfo VisualScriptSelect::get_input_value_port_info(int p_idx) const {
 		return PropertyInfo(typed, "b");
 	}
 }
-PropertyInfo VisualScriptSelect::get_output_value_port_info(int p_idx) const {
 
+PropertyInfo VisualScriptSelect::get_output_value_port_info(int p_idx) const {
 	return PropertyInfo(typed, "out");
 }
 
 String VisualScriptSelect::get_caption() const {
-
 	return "Select";
 }
 
 String VisualScriptSelect::get_text() const {
-
 	return "a if cond, else b";
 }
 
 void VisualScriptSelect::set_typed(Variant::Type p_op) {
-
-	if (typed == p_op)
+	if (typed == p_op) {
 		return;
+	}
 
 	typed = p_op;
 	ports_changed_notify();
 }
 
 Variant::Type VisualScriptSelect::get_typed() const {
-
 	return typed;
 }
 
 void VisualScriptSelect::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_typed", "type"), &VisualScriptSelect::set_typed);
 	ClassDB::bind_method(D_METHOD("get_typed"), &VisualScriptSelect::get_typed);
 
@@ -1165,26 +1144,24 @@ class VisualScriptNodeInstanceSelect : public VisualScriptNodeInstance {
 public:
 	//virtual int get_working_memory_size() const { return 0; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		bool cond = *p_inputs[0];
-		if (cond)
+		if (cond) {
 			*p_outputs[0] = *p_inputs[1];
-		else
+		} else {
 			*p_outputs[0] = *p_inputs[2];
+		}
 
 		return 0;
 	}
 };
 
 VisualScriptNodeInstance *VisualScriptSelect::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceSelect *instance = memnew(VisualScriptNodeInstanceSelect);
 	return instance;
 }
 
 VisualScriptSelect::VisualScriptSelect() {
-
 	typed = Variant::NIL;
 }
 
@@ -1193,36 +1170,30 @@ VisualScriptSelect::VisualScriptSelect() {
 //////////////////////////////////////////
 
 int VisualScriptVariableGet::get_output_sequence_port_count() const {
-
 	return 0;
 }
 
 bool VisualScriptVariableGet::has_input_sequence_port() const {
-
 	return false;
 }
 
 int VisualScriptVariableGet::get_input_value_port_count() const {
-
 	return 0;
 }
-int VisualScriptVariableGet::get_output_value_port_count() const {
 
+int VisualScriptVariableGet::get_output_value_port_count() const {
 	return 1;
 }
 
 String VisualScriptVariableGet::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 PropertyInfo VisualScriptVariableGet::get_input_value_port_info(int p_idx) const {
-
 	return PropertyInfo();
 }
 
 PropertyInfo VisualScriptVariableGet::get_output_value_port_info(int p_idx) const {
-
 	PropertyInfo pinfo;
 	pinfo.name = "value";
 	if (get_visual_script().is_valid() && get_visual_script()->has_variable(variable)) {
@@ -1235,24 +1206,22 @@ PropertyInfo VisualScriptVariableGet::get_output_value_port_info(int p_idx) cons
 }
 
 String VisualScriptVariableGet::get_caption() const {
-
 	return "Get " + variable;
 }
-void VisualScriptVariableGet::set_variable(StringName p_variable) {
 
-	if (variable == p_variable)
+void VisualScriptVariableGet::set_variable(StringName p_variable) {
+	if (variable == p_variable) {
 		return;
+	}
 	variable = p_variable;
 	ports_changed_notify();
 }
 
 StringName VisualScriptVariableGet::get_variable() const {
-
 	return variable;
 }
 
 void VisualScriptVariableGet::_validate_property(PropertyInfo &property) const {
-
 	if (property.name == "var_name" && get_visual_script().is_valid()) {
 		Ref<VisualScript> vs = get_visual_script();
 		List<StringName> vars;
@@ -1260,8 +1229,9 @@ void VisualScriptVariableGet::_validate_property(PropertyInfo &property) const {
 
 		String vhint;
 		for (List<StringName>::Element *E = vars.front(); E; E = E->next()) {
-			if (vhint != String())
+			if (vhint != String()) {
 				vhint += ",";
+			}
 
 			vhint += E->get().operator String();
 		}
@@ -1272,7 +1242,6 @@ void VisualScriptVariableGet::_validate_property(PropertyInfo &property) const {
 }
 
 void VisualScriptVariableGet::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_variable", "name"), &VisualScriptVariableGet::set_variable);
 	ClassDB::bind_method(D_METHOD("get_variable"), &VisualScriptVariableGet::get_variable);
 
@@ -1285,10 +1254,9 @@ public:
 	VisualScriptInstance *instance;
 	StringName variable;
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		if (!instance->get_variable(variable, p_outputs[0])) {
-			r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+			r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 			r_error_str = RTR("VariableGet not found in script: ") + "'" + String(variable) + "'";
 			return 0;
 		}
@@ -1297,13 +1265,13 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptVariableGet::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceVariableGet *instance = memnew(VisualScriptNodeInstanceVariableGet);
 	instance->node = this;
 	instance->instance = p_instance;
 	instance->variable = variable;
 	return instance;
 }
+
 VisualScriptVariableGet::VisualScriptVariableGet() {
 }
 
@@ -1312,31 +1280,26 @@ VisualScriptVariableGet::VisualScriptVariableGet() {
 //////////////////////////////////////////
 
 int VisualScriptVariableSet::get_output_sequence_port_count() const {
-
 	return 1;
 }
 
 bool VisualScriptVariableSet::has_input_sequence_port() const {
-
 	return true;
 }
 
 int VisualScriptVariableSet::get_input_value_port_count() const {
-
 	return 1;
 }
-int VisualScriptVariableSet::get_output_value_port_count() const {
 
+int VisualScriptVariableSet::get_output_value_port_count() const {
 	return 0;
 }
 
 String VisualScriptVariableSet::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 PropertyInfo VisualScriptVariableSet::get_input_value_port_info(int p_idx) const {
-
 	PropertyInfo pinfo;
 	pinfo.name = "set";
 	if (get_visual_script().is_valid() && get_visual_script()->has_variable(variable)) {
@@ -1349,30 +1312,26 @@ PropertyInfo VisualScriptVariableSet::get_input_value_port_info(int p_idx) const
 }
 
 PropertyInfo VisualScriptVariableSet::get_output_value_port_info(int p_idx) const {
-
 	return PropertyInfo();
 }
 
 String VisualScriptVariableSet::get_caption() const {
-
 	return "Set " + variable;
 }
 
 void VisualScriptVariableSet::set_variable(StringName p_variable) {
-
-	if (variable == p_variable)
+	if (variable == p_variable) {
 		return;
+	}
 	variable = p_variable;
 	ports_changed_notify();
 }
 
 StringName VisualScriptVariableSet::get_variable() const {
-
 	return variable;
 }
 
 void VisualScriptVariableSet::_validate_property(PropertyInfo &property) const {
-
 	if (property.name == "var_name" && get_visual_script().is_valid()) {
 		Ref<VisualScript> vs = get_visual_script();
 		List<StringName> vars;
@@ -1380,8 +1339,9 @@ void VisualScriptVariableSet::_validate_property(PropertyInfo &property) const {
 
 		String vhint;
 		for (List<StringName>::Element *E = vars.front(); E; E = E->next()) {
-			if (vhint != String())
+			if (vhint != String()) {
 				vhint += ",";
+			}
 
 			vhint += E->get().operator String();
 		}
@@ -1392,7 +1352,6 @@ void VisualScriptVariableSet::_validate_property(PropertyInfo &property) const {
 }
 
 void VisualScriptVariableSet::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_variable", "name"), &VisualScriptVariableSet::set_variable);
 	ClassDB::bind_method(D_METHOD("get_variable"), &VisualScriptVariableSet::get_variable);
 
@@ -1407,11 +1366,9 @@ public:
 
 	//virtual int get_working_memory_size() const { return 0; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		if (!instance->set_variable(variable, *p_inputs[0])) {
-
-			r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+			r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 			r_error_str = RTR("VariableSet not found in script: ") + "'" + String(variable) + "'";
 		}
 
@@ -1420,13 +1377,13 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptVariableSet::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceVariableSet *instance = memnew(VisualScriptNodeInstanceVariableSet);
 	instance->node = this;
 	instance->instance = p_instance;
 	instance->variable = variable;
 	return instance;
 }
+
 VisualScriptVariableSet::VisualScriptVariableSet() {
 }
 
@@ -1435,36 +1392,30 @@ VisualScriptVariableSet::VisualScriptVariableSet() {
 //////////////////////////////////////////
 
 int VisualScriptConstant::get_output_sequence_port_count() const {
-
 	return 0;
 }
 
 bool VisualScriptConstant::has_input_sequence_port() const {
-
 	return false;
 }
 
 int VisualScriptConstant::get_input_value_port_count() const {
-
 	return 0;
 }
-int VisualScriptConstant::get_output_value_port_count() const {
 
+int VisualScriptConstant::get_output_value_port_count() const {
 	return 1;
 }
 
 String VisualScriptConstant::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 PropertyInfo VisualScriptConstant::get_input_value_port_info(int p_idx) const {
-
 	return PropertyInfo();
 }
 
 PropertyInfo VisualScriptConstant::get_output_value_port_info(int p_idx) const {
-
 	PropertyInfo pinfo;
 	pinfo.name = String(value);
 	pinfo.type = type;
@@ -1472,51 +1423,48 @@ PropertyInfo VisualScriptConstant::get_output_value_port_info(int p_idx) const {
 }
 
 String VisualScriptConstant::get_caption() const {
-
 	return "Constant";
 }
 
 void VisualScriptConstant::set_constant_type(Variant::Type p_type) {
-
-	if (type == p_type)
+	if (type == p_type) {
 		return;
+	}
 
 	type = p_type;
-	Variant::CallError ce;
-	value = Variant::construct(type, NULL, 0, ce);
+	Callable::CallError ce;
+	value = Variant::construct(type, nullptr, 0, ce);
 	ports_changed_notify();
 	_change_notify();
 }
 
 Variant::Type VisualScriptConstant::get_constant_type() const {
-
 	return type;
 }
 
 void VisualScriptConstant::set_constant_value(Variant p_value) {
-
-	if (value == p_value)
+	if (value == p_value) {
 		return;
+	}
 
 	value = p_value;
 	ports_changed_notify();
 }
-Variant VisualScriptConstant::get_constant_value() const {
 
+Variant VisualScriptConstant::get_constant_value() const {
 	return value;
 }
 
 void VisualScriptConstant::_validate_property(PropertyInfo &property) const {
-
 	if (property.name == "value") {
 		property.type = type;
-		if (type == Variant::NIL)
+		if (type == Variant::NIL) {
 			property.usage = 0; //do not save if nil
+		}
 	}
 }
 
 void VisualScriptConstant::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_constant_type", "type"), &VisualScriptConstant::set_constant_type);
 	ClassDB::bind_method(D_METHOD("get_constant_type"), &VisualScriptConstant::get_constant_type);
 
@@ -1537,22 +1485,19 @@ public:
 	Variant constant;
 	//virtual int get_working_memory_size() const { return 0; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		*p_outputs[0] = constant;
 		return 0;
 	}
 };
 
 VisualScriptNodeInstance *VisualScriptConstant::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceConstant *instance = memnew(VisualScriptNodeInstanceConstant);
 	instance->constant = value;
 	return instance;
 }
 
 VisualScriptConstant::VisualScriptConstant() {
-
 	type = Variant::NIL;
 }
 
@@ -1561,36 +1506,30 @@ VisualScriptConstant::VisualScriptConstant() {
 //////////////////////////////////////////
 
 int VisualScriptPreload::get_output_sequence_port_count() const {
-
 	return 0;
 }
 
 bool VisualScriptPreload::has_input_sequence_port() const {
-
 	return false;
 }
 
 int VisualScriptPreload::get_input_value_port_count() const {
-
 	return 0;
 }
-int VisualScriptPreload::get_output_value_port_count() const {
 
+int VisualScriptPreload::get_output_value_port_count() const {
 	return 1;
 }
 
 String VisualScriptPreload::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 PropertyInfo VisualScriptPreload::get_input_value_port_info(int p_idx) const {
-
 	return PropertyInfo();
 }
 
 PropertyInfo VisualScriptPreload::get_output_value_port_info(int p_idx) const {
-
 	PropertyInfo pinfo;
 	pinfo.type = Variant::OBJECT;
 	if (preload.is_valid()) {
@@ -1611,26 +1550,23 @@ PropertyInfo VisualScriptPreload::get_output_value_port_info(int p_idx) const {
 }
 
 String VisualScriptPreload::get_caption() const {
-
 	return "Preload";
 }
 
 void VisualScriptPreload::set_preload(const Ref<Resource> &p_preload) {
-
-	if (preload == p_preload)
+	if (preload == p_preload) {
 		return;
+	}
 
 	preload = p_preload;
 	ports_changed_notify();
 }
 
 Ref<Resource> VisualScriptPreload::get_preload() const {
-
 	return preload;
 }
 
 void VisualScriptPreload::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_preload", "resource"), &VisualScriptPreload::set_preload);
 	ClassDB::bind_method(D_METHOD("get_preload"), &VisualScriptPreload::get_preload);
 
@@ -1642,15 +1578,13 @@ public:
 	Ref<Resource> preload;
 	//virtual int get_working_memory_size() const { return 0; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		*p_outputs[0] = preload;
 		return 0;
 	}
 };
 
 VisualScriptNodeInstance *VisualScriptPreload::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstancePreload *instance = memnew(VisualScriptNodeInstancePreload);
 	instance->preload = preload;
 	return instance;
@@ -1664,31 +1598,26 @@ VisualScriptPreload::VisualScriptPreload() {
 //////////////////////////////////////////
 
 int VisualScriptIndexGet::get_output_sequence_port_count() const {
-
 	return 0;
 }
 
 bool VisualScriptIndexGet::has_input_sequence_port() const {
-
 	return false;
 }
 
 int VisualScriptIndexGet::get_input_value_port_count() const {
-
 	return 2;
 }
-int VisualScriptIndexGet::get_output_value_port_count() const {
 
+int VisualScriptIndexGet::get_output_value_port_count() const {
 	return 1;
 }
 
 String VisualScriptIndexGet::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 PropertyInfo VisualScriptIndexGet::get_input_value_port_info(int p_idx) const {
-
 	if (p_idx == 0) {
 		return PropertyInfo(Variant::NIL, "base");
 	} else {
@@ -1697,12 +1626,10 @@ PropertyInfo VisualScriptIndexGet::get_input_value_port_info(int p_idx) const {
 }
 
 PropertyInfo VisualScriptIndexGet::get_output_value_port_info(int p_idx) const {
-
 	return PropertyInfo();
 }
 
 String VisualScriptIndexGet::get_caption() const {
-
 	return "Get Index";
 }
 
@@ -1710,13 +1637,12 @@ class VisualScriptNodeInstanceIndexGet : public VisualScriptNodeInstance {
 public:
 	//virtual int get_working_memory_size() const { return 0; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		bool valid;
 		*p_outputs[0] = p_inputs[0]->get(*p_inputs[1], &valid);
 
 		if (!valid) {
-			r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+			r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 			r_error_str = "Invalid get: " + p_inputs[0]->get_construct_string();
 		}
 		return 0;
@@ -1724,10 +1650,10 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptIndexGet::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceIndexGet *instance = memnew(VisualScriptNodeInstanceIndexGet);
 	return instance;
 }
+
 VisualScriptIndexGet::VisualScriptIndexGet() {
 }
 
@@ -1736,31 +1662,26 @@ VisualScriptIndexGet::VisualScriptIndexGet() {
 //////////////////////////////////////////
 
 int VisualScriptIndexSet::get_output_sequence_port_count() const {
-
 	return 1;
 }
 
 bool VisualScriptIndexSet::has_input_sequence_port() const {
-
 	return true;
 }
 
 int VisualScriptIndexSet::get_input_value_port_count() const {
-
 	return 3;
 }
-int VisualScriptIndexSet::get_output_value_port_count() const {
 
+int VisualScriptIndexSet::get_output_value_port_count() const {
 	return 0;
 }
 
 String VisualScriptIndexSet::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 PropertyInfo VisualScriptIndexSet::get_input_value_port_info(int p_idx) const {
-
 	if (p_idx == 0) {
 		return PropertyInfo(Variant::NIL, "base");
 	} else if (p_idx == 1) {
@@ -1772,12 +1693,10 @@ PropertyInfo VisualScriptIndexSet::get_input_value_port_info(int p_idx) const {
 }
 
 PropertyInfo VisualScriptIndexSet::get_output_value_port_info(int p_idx) const {
-
 	return PropertyInfo();
 }
 
 String VisualScriptIndexSet::get_caption() const {
-
 	return "Set Index";
 }
 
@@ -1785,14 +1704,13 @@ class VisualScriptNodeInstanceIndexSet : public VisualScriptNodeInstance {
 public:
 	//virtual int get_working_memory_size() const { return 0; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		bool valid;
 		*p_outputs[0] = *p_inputs[0];
 		p_outputs[0]->set(*p_inputs[1], *p_inputs[2], &valid);
 
 		if (!valid) {
-			r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+			r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 			r_error_str = "Invalid set: " + p_inputs[1]->get_construct_string();
 		}
 		return 0;
@@ -1800,10 +1718,10 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptIndexSet::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceIndexSet *instance = memnew(VisualScriptNodeInstanceIndexSet);
 	return instance;
 }
+
 VisualScriptIndexSet::VisualScriptIndexSet() {
 }
 
@@ -1812,46 +1730,39 @@ VisualScriptIndexSet::VisualScriptIndexSet() {
 //////////////////////////////////////////
 
 int VisualScriptGlobalConstant::get_output_sequence_port_count() const {
-
 	return 0;
 }
 
 bool VisualScriptGlobalConstant::has_input_sequence_port() const {
-
 	return false;
 }
 
 int VisualScriptGlobalConstant::get_input_value_port_count() const {
-
 	return 0;
 }
-int VisualScriptGlobalConstant::get_output_value_port_count() const {
 
+int VisualScriptGlobalConstant::get_output_value_port_count() const {
 	return 1;
 }
 
 String VisualScriptGlobalConstant::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 PropertyInfo VisualScriptGlobalConstant::get_input_value_port_info(int p_idx) const {
-
 	return PropertyInfo();
 }
 
 PropertyInfo VisualScriptGlobalConstant::get_output_value_port_info(int p_idx) const {
 	String name = GlobalConstants::get_global_constant_name(index);
-	return PropertyInfo(Variant::REAL, name);
+	return PropertyInfo(Variant::INT, name);
 }
 
 String VisualScriptGlobalConstant::get_caption() const {
-
 	return "Global Constant";
 }
 
 void VisualScriptGlobalConstant::set_global_constant(int p_which) {
-
 	index = p_which;
 	_change_notify();
 	ports_changed_notify();
@@ -1866,38 +1777,34 @@ public:
 	int index;
 	//virtual int get_working_memory_size() const { return 0; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		*p_outputs[0] = GlobalConstants::get_global_constant_value(index);
 		return 0;
 	}
 };
 
 VisualScriptNodeInstance *VisualScriptGlobalConstant::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceGlobalConstant *instance = memnew(VisualScriptNodeInstanceGlobalConstant);
 	instance->index = index;
 	return instance;
 }
 
 void VisualScriptGlobalConstant::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_global_constant", "index"), &VisualScriptGlobalConstant::set_global_constant);
 	ClassDB::bind_method(D_METHOD("get_global_constant"), &VisualScriptGlobalConstant::get_global_constant);
 
 	String cc;
 
 	for (int i = 0; i < GlobalConstants::get_global_constant_count(); i++) {
-
-		if (i > 0)
+		if (i > 0) {
 			cc += ",";
+		}
 		cc += GlobalConstants::get_global_constant_name(i);
 	}
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "constant", PROPERTY_HINT_ENUM, cc), "set_global_constant", "get_global_constant");
 }
 
 VisualScriptGlobalConstant::VisualScriptGlobalConstant() {
-
 	index = 0;
 }
 
@@ -1906,46 +1813,42 @@ VisualScriptGlobalConstant::VisualScriptGlobalConstant() {
 //////////////////////////////////////////
 
 int VisualScriptClassConstant::get_output_sequence_port_count() const {
-
 	return 0;
 }
 
 bool VisualScriptClassConstant::has_input_sequence_port() const {
-
 	return false;
 }
 
 int VisualScriptClassConstant::get_input_value_port_count() const {
-
 	return 0;
 }
-int VisualScriptClassConstant::get_output_value_port_count() const {
 
+int VisualScriptClassConstant::get_output_value_port_count() const {
 	return 1;
 }
 
 String VisualScriptClassConstant::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 PropertyInfo VisualScriptClassConstant::get_input_value_port_info(int p_idx) const {
-
 	return PropertyInfo();
 }
 
 PropertyInfo VisualScriptClassConstant::get_output_value_port_info(int p_idx) const {
-
-	return PropertyInfo(Variant::INT, String(base_type) + "." + String(name));
+	if (name == "") {
+		return PropertyInfo(Variant::INT, String(base_type));
+	} else {
+		return PropertyInfo(Variant::INT, String(base_type) + "." + String(name));
+	}
 }
 
 String VisualScriptClassConstant::get_caption() const {
-
 	return "Class Constant";
 }
 
 void VisualScriptClassConstant::set_class_constant(const StringName &p_which) {
-
 	name = p_which;
 	_change_notify();
 	ports_changed_notify();
@@ -1956,8 +1859,23 @@ StringName VisualScriptClassConstant::get_class_constant() {
 }
 
 void VisualScriptClassConstant::set_base_type(const StringName &p_which) {
-
 	base_type = p_which;
+	List<String> constants;
+	ClassDB::get_integer_constant_list(base_type, &constants, true);
+	if (constants.size() > 0) {
+		bool found_name = false;
+		for (List<String>::Element *E = constants.front(); E; E = E->next()) {
+			if (E->get() == name) {
+				found_name = true;
+				break;
+			}
+		}
+		if (!found_name) {
+			name = constants[0];
+		}
+	} else {
+		name = "";
+	}
 	_change_notify();
 	ports_changed_notify();
 }
@@ -1972,11 +1890,10 @@ public:
 	bool valid;
 	//virtual int get_working_memory_size() const { return 0; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		if (!valid) {
 			r_error_str = "Invalid constant name, pick a valid class constant.";
-			r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+			r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 		}
 
 		*p_outputs[0] = value;
@@ -1985,16 +1902,13 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptClassConstant::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceClassConstant *instance = memnew(VisualScriptNodeInstanceClassConstant);
 	instance->value = ClassDB::get_integer_constant(base_type, name, &instance->valid);
 	return instance;
 }
 
 void VisualScriptClassConstant::_validate_property(PropertyInfo &property) const {
-
 	if (property.name == "constant") {
-
 		List<String> constants;
 		ClassDB::get_integer_constant_list(base_type, &constants, true);
 
@@ -2009,7 +1923,6 @@ void VisualScriptClassConstant::_validate_property(PropertyInfo &property) const
 }
 
 void VisualScriptClassConstant::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_class_constant", "name"), &VisualScriptClassConstant::set_class_constant);
 	ClassDB::bind_method(D_METHOD("get_class_constant"), &VisualScriptClassConstant::get_class_constant);
 
@@ -2021,7 +1934,6 @@ void VisualScriptClassConstant::_bind_methods() {
 }
 
 VisualScriptClassConstant::VisualScriptClassConstant() {
-
 	base_type = "Object";
 }
 
@@ -2030,51 +1942,46 @@ VisualScriptClassConstant::VisualScriptClassConstant() {
 //////////////////////////////////////////
 
 int VisualScriptBasicTypeConstant::get_output_sequence_port_count() const {
-
 	return 0;
 }
 
 bool VisualScriptBasicTypeConstant::has_input_sequence_port() const {
-
 	return false;
 }
 
 int VisualScriptBasicTypeConstant::get_input_value_port_count() const {
-
 	return 0;
 }
-int VisualScriptBasicTypeConstant::get_output_value_port_count() const {
 
+int VisualScriptBasicTypeConstant::get_output_value_port_count() const {
 	return 1;
 }
 
 String VisualScriptBasicTypeConstant::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 PropertyInfo VisualScriptBasicTypeConstant::get_input_value_port_info(int p_idx) const {
-
 	return PropertyInfo();
 }
 
 PropertyInfo VisualScriptBasicTypeConstant::get_output_value_port_info(int p_idx) const {
-
-	return PropertyInfo(Variant::INT, "value");
+	return PropertyInfo(type, "value");
 }
 
 String VisualScriptBasicTypeConstant::get_caption() const {
-
 	return "Basic Constant";
 }
 
 String VisualScriptBasicTypeConstant::get_text() const {
-
-	return Variant::get_type_name(type) + "." + String(name);
+	if (name == "") {
+		return Variant::get_type_name(type);
+	} else {
+		return Variant::get_type_name(type) + "." + String(name);
+	}
 }
 
 void VisualScriptBasicTypeConstant::set_basic_type_constant(const StringName &p_which) {
-
 	name = p_which;
 	_change_notify();
 	ports_changed_notify();
@@ -2085,8 +1992,24 @@ StringName VisualScriptBasicTypeConstant::get_basic_type_constant() const {
 }
 
 void VisualScriptBasicTypeConstant::set_basic_type(Variant::Type p_which) {
-
 	type = p_which;
+
+	List<StringName> constants;
+	Variant::get_constants_for_type(type, &constants);
+	if (constants.size() > 0) {
+		bool found_name = false;
+		for (List<StringName>::Element *E = constants.front(); E; E = E->next()) {
+			if (E->get() == name) {
+				found_name = true;
+				break;
+			}
+		}
+		if (!found_name) {
+			name = constants[0];
+		}
+	} else {
+		name = "";
+	}
 	_change_notify();
 	ports_changed_notify();
 }
@@ -2101,11 +2024,10 @@ public:
 	bool valid;
 	//virtual int get_working_memory_size() const { return 0; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		if (!valid) {
 			r_error_str = "Invalid constant name, pick a valid basic type constant.";
-			r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+			r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 		}
 
 		*p_outputs[0] = value;
@@ -2114,16 +2036,13 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptBasicTypeConstant::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceBasicTypeConstant *instance = memnew(VisualScriptNodeInstanceBasicTypeConstant);
 	instance->value = Variant::get_constant_value(type, name, &instance->valid);
 	return instance;
 }
 
 void VisualScriptBasicTypeConstant::_validate_property(PropertyInfo &property) const {
-
 	if (property.name == "constant") {
-
 		List<StringName> constants;
 		Variant::get_constants_for_type(type, &constants);
 
@@ -2142,7 +2061,6 @@ void VisualScriptBasicTypeConstant::_validate_property(PropertyInfo &property) c
 }
 
 void VisualScriptBasicTypeConstant::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_basic_type", "name"), &VisualScriptBasicTypeConstant::set_basic_type);
 	ClassDB::bind_method(D_METHOD("get_basic_type"), &VisualScriptBasicTypeConstant::get_basic_type);
 
@@ -2159,7 +2077,6 @@ void VisualScriptBasicTypeConstant::_bind_methods() {
 }
 
 VisualScriptBasicTypeConstant::VisualScriptBasicTypeConstant() {
-
 	type = Variant::NIL;
 }
 
@@ -2190,46 +2107,38 @@ double VisualScriptMathConstant::const_value[MATH_CONSTANT_MAX] = {
 };
 
 int VisualScriptMathConstant::get_output_sequence_port_count() const {
-
 	return 0;
 }
 
 bool VisualScriptMathConstant::has_input_sequence_port() const {
-
 	return false;
 }
 
 int VisualScriptMathConstant::get_input_value_port_count() const {
-
 	return 0;
 }
-int VisualScriptMathConstant::get_output_value_port_count() const {
 
+int VisualScriptMathConstant::get_output_value_port_count() const {
 	return 1;
 }
 
 String VisualScriptMathConstant::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 PropertyInfo VisualScriptMathConstant::get_input_value_port_info(int p_idx) const {
-
 	return PropertyInfo();
 }
 
 PropertyInfo VisualScriptMathConstant::get_output_value_port_info(int p_idx) const {
-
-	return PropertyInfo(Variant::REAL, const_name[constant]);
+	return PropertyInfo(Variant::FLOAT, const_name[constant]);
 }
 
 String VisualScriptMathConstant::get_caption() const {
-
 	return "Math Constant";
 }
 
 void VisualScriptMathConstant::set_math_constant(MathConstant p_which) {
-
 	constant = p_which;
 	_change_notify();
 	ports_changed_notify();
@@ -2244,31 +2153,28 @@ public:
 	float value;
 	//virtual int get_working_memory_size() const { return 0; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		*p_outputs[0] = value;
 		return 0;
 	}
 };
 
 VisualScriptNodeInstance *VisualScriptMathConstant::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceMathConstant *instance = memnew(VisualScriptNodeInstanceMathConstant);
 	instance->value = const_value[constant];
 	return instance;
 }
 
 void VisualScriptMathConstant::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_math_constant", "which"), &VisualScriptMathConstant::set_math_constant);
 	ClassDB::bind_method(D_METHOD("get_math_constant"), &VisualScriptMathConstant::get_math_constant);
 
 	String cc;
 
 	for (int i = 0; i < MATH_CONSTANT_MAX; i++) {
-
-		if (i > 0)
+		if (i > 0) {
 			cc += ",";
+		}
 		cc += const_name[i];
 	}
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "constant", PROPERTY_HINT_ENUM, cc), "set_math_constant", "get_math_constant");
@@ -2285,7 +2191,6 @@ void VisualScriptMathConstant::_bind_methods() {
 }
 
 VisualScriptMathConstant::VisualScriptMathConstant() {
-
 	constant = MATH_CONSTANT_ONE;
 }
 
@@ -2294,46 +2199,38 @@ VisualScriptMathConstant::VisualScriptMathConstant() {
 //////////////////////////////////////////
 
 int VisualScriptEngineSingleton::get_output_sequence_port_count() const {
-
 	return 0;
 }
 
 bool VisualScriptEngineSingleton::has_input_sequence_port() const {
-
 	return false;
 }
 
 int VisualScriptEngineSingleton::get_input_value_port_count() const {
-
 	return 0;
 }
-int VisualScriptEngineSingleton::get_output_value_port_count() const {
 
+int VisualScriptEngineSingleton::get_output_value_port_count() const {
 	return 1;
 }
 
 String VisualScriptEngineSingleton::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 PropertyInfo VisualScriptEngineSingleton::get_input_value_port_info(int p_idx) const {
-
 	return PropertyInfo();
 }
 
 PropertyInfo VisualScriptEngineSingleton::get_output_value_port_info(int p_idx) const {
-
 	return PropertyInfo(Variant::OBJECT, singleton);
 }
 
 String VisualScriptEngineSingleton::get_caption() const {
-
 	return "Get Engine Singleton";
 }
 
 void VisualScriptEngineSingleton::set_singleton(const String &p_string) {
-
 	singleton = p_string;
 
 	_change_notify();
@@ -2350,22 +2247,19 @@ public:
 
 	//virtual int get_working_memory_size() const { return 0; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		*p_outputs[0] = singleton;
 		return 0;
 	}
 };
 
 VisualScriptNodeInstance *VisualScriptEngineSingleton::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceEngineSingleton *instance = memnew(VisualScriptNodeInstanceEngineSingleton);
 	instance->singleton = Engine::get_singleton()->get_singleton_object(singleton);
 	return instance;
 }
 
 VisualScriptEngineSingleton::TypeGuess VisualScriptEngineSingleton::guess_output_type(TypeGuess *p_inputs, int p_output) const {
-
 	Object *obj = Engine::get_singleton()->get_singleton_object(singleton);
 	TypeGuess tg;
 	tg.type = Variant::OBJECT;
@@ -2378,7 +2272,6 @@ VisualScriptEngineSingleton::TypeGuess VisualScriptEngineSingleton::guess_output
 }
 
 void VisualScriptEngineSingleton::_validate_property(PropertyInfo &property) const {
-
 	String cc;
 
 	List<Engine::Singleton> singletons;
@@ -2386,11 +2279,13 @@ void VisualScriptEngineSingleton::_validate_property(PropertyInfo &property) con
 	Engine::get_singleton()->get_singletons(&singletons);
 
 	for (List<Engine::Singleton>::Element *E = singletons.front(); E; E = E->next()) {
-		if (E->get().name == "VS" || E->get().name == "PS" || E->get().name == "PS2D" || E->get().name == "AS" || E->get().name == "TS" || E->get().name == "SS" || E->get().name == "SS2D")
+		if (E->get().name == "VS" || E->get().name == "PS" || E->get().name == "PS2D" || E->get().name == "AS" || E->get().name == "TS" || E->get().name == "SS" || E->get().name == "SS2D") {
 			continue; //skip these, too simple named
+		}
 
-		if (cc != String())
+		if (cc != String()) {
 			cc += ",";
+		}
 		cc += E->get().name;
 	}
 
@@ -2399,7 +2294,6 @@ void VisualScriptEngineSingleton::_validate_property(PropertyInfo &property) con
 }
 
 void VisualScriptEngineSingleton::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_singleton", "name"), &VisualScriptEngineSingleton::set_singleton);
 	ClassDB::bind_method(D_METHOD("get_singleton"), &VisualScriptEngineSingleton::get_singleton);
 
@@ -2407,7 +2301,6 @@ void VisualScriptEngineSingleton::_bind_methods() {
 }
 
 VisualScriptEngineSingleton::VisualScriptEngineSingleton() {
-
 	singleton = String();
 }
 
@@ -2416,46 +2309,38 @@ VisualScriptEngineSingleton::VisualScriptEngineSingleton() {
 //////////////////////////////////////////
 
 int VisualScriptSceneNode::get_output_sequence_port_count() const {
-
 	return 0;
 }
 
 bool VisualScriptSceneNode::has_input_sequence_port() const {
-
 	return false;
 }
 
 int VisualScriptSceneNode::get_input_value_port_count() const {
-
 	return 0;
 }
-int VisualScriptSceneNode::get_output_value_port_count() const {
 
+int VisualScriptSceneNode::get_output_value_port_count() const {
 	return 1;
 }
 
 String VisualScriptSceneNode::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 PropertyInfo VisualScriptSceneNode::get_input_value_port_info(int p_idx) const {
-
 	return PropertyInfo();
 }
 
 PropertyInfo VisualScriptSceneNode::get_output_value_port_info(int p_idx) const {
-
 	return PropertyInfo(Variant::OBJECT, path.simplified());
 }
 
 String VisualScriptSceneNode::get_caption() const {
-
 	return "Get Scene Node";
 }
 
 void VisualScriptSceneNode::set_node_path(const NodePath &p_path) {
-
 	path = p_path;
 	_change_notify();
 	ports_changed_notify();
@@ -2473,18 +2358,17 @@ public:
 
 	//virtual int get_working_memory_size() const { return 0; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		Node *node = Object::cast_to<Node>(instance->get_owner_ptr());
 		if (!node) {
-			r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+			r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 			r_error_str = "Base object is not a Node!";
 			return 0;
 		}
 
 		Node *another = node->get_node(path);
 		if (!another) {
-			r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+			r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 			r_error_str = "Path does not lead Node!";
 			return 0;
 		}
@@ -2496,7 +2380,6 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptSceneNode::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceSceneNode *instance = memnew(VisualScriptNodeInstanceSceneNode);
 	instance->node = this;
 	instance->instance = p_instance;
@@ -2507,52 +2390,57 @@ VisualScriptNodeInstance *VisualScriptSceneNode::instance(VisualScriptInstance *
 #ifdef TOOLS_ENABLED
 
 static Node *_find_script_node(Node *p_edited_scene, Node *p_current_node, const Ref<Script> &script) {
-
-	if (p_edited_scene != p_current_node && p_current_node->get_owner() != p_edited_scene)
-		return NULL;
+	if (p_edited_scene != p_current_node && p_current_node->get_owner() != p_edited_scene) {
+		return nullptr;
+	}
 
 	Ref<Script> scr = p_current_node->get_script();
 
-	if (scr.is_valid() && scr == script)
+	if (scr.is_valid() && scr == script) {
 		return p_current_node;
+	}
 
 	for (int i = 0; i < p_current_node->get_child_count(); i++) {
 		Node *n = _find_script_node(p_edited_scene, p_current_node->get_child(i), script);
-		if (n)
+		if (n) {
 			return n;
+		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 #endif
 
 VisualScriptSceneNode::TypeGuess VisualScriptSceneNode::guess_output_type(TypeGuess *p_inputs, int p_output) const {
-
 	VisualScriptSceneNode::TypeGuess tg;
 	tg.type = Variant::OBJECT;
 	tg.gdclass = "Node";
 
 #ifdef TOOLS_ENABLED
 	Ref<Script> script = get_visual_script();
-	if (!script.is_valid())
+	if (!script.is_valid()) {
 		return tg;
+	}
 
 	MainLoop *main_loop = OS::get_singleton()->get_main_loop();
 	SceneTree *scene_tree = Object::cast_to<SceneTree>(main_loop);
 
-	if (!scene_tree)
+	if (!scene_tree) {
 		return tg;
+	}
 
 	Node *edited_scene = scene_tree->get_edited_scene_root();
 
-	if (!edited_scene)
+	if (!edited_scene) {
 		return tg;
+	}
 
 	Node *script_node = _find_script_node(edited_scene, edited_scene, script);
 
-	if (!script_node)
+	if (!script_node) {
 		return tg;
+	}
 
 	Node *another = script_node->get_node(path);
 
@@ -2565,29 +2453,31 @@ VisualScriptSceneNode::TypeGuess VisualScriptSceneNode::guess_output_type(TypeGu
 }
 
 void VisualScriptSceneNode::_validate_property(PropertyInfo &property) const {
-
 #ifdef TOOLS_ENABLED
 	if (property.name == "node_path") {
-
 		Ref<Script> script = get_visual_script();
-		if (!script.is_valid())
+		if (!script.is_valid()) {
 			return;
+		}
 
 		MainLoop *main_loop = OS::get_singleton()->get_main_loop();
 		SceneTree *scene_tree = Object::cast_to<SceneTree>(main_loop);
 
-		if (!scene_tree)
+		if (!scene_tree) {
 			return;
+		}
 
 		Node *edited_scene = scene_tree->get_edited_scene_root();
 
-		if (!edited_scene)
+		if (!edited_scene) {
 			return;
+		}
 
 		Node *script_node = _find_script_node(edited_scene, edited_scene, script);
 
-		if (!script_node)
+		if (!script_node) {
 			return;
+		}
 
 		property.hint_string = script_node->get_path();
 	}
@@ -2595,7 +2485,6 @@ void VisualScriptSceneNode::_validate_property(PropertyInfo &property) const {
 }
 
 void VisualScriptSceneNode::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_node_path", "path"), &VisualScriptSceneNode::set_node_path);
 	ClassDB::bind_method(D_METHOD("get_node_path"), &VisualScriptSceneNode::get_node_path);
 
@@ -2603,7 +2492,6 @@ void VisualScriptSceneNode::_bind_methods() {
 }
 
 VisualScriptSceneNode::VisualScriptSceneNode() {
-
 	path = String(".");
 }
 
@@ -2612,41 +2500,34 @@ VisualScriptSceneNode::VisualScriptSceneNode() {
 //////////////////////////////////////////
 
 int VisualScriptSceneTree::get_output_sequence_port_count() const {
-
 	return 0;
 }
 
 bool VisualScriptSceneTree::has_input_sequence_port() const {
-
 	return false;
 }
 
 int VisualScriptSceneTree::get_input_value_port_count() const {
-
 	return 0;
 }
-int VisualScriptSceneTree::get_output_value_port_count() const {
 
+int VisualScriptSceneTree::get_output_value_port_count() const {
 	return 1;
 }
 
 String VisualScriptSceneTree::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 PropertyInfo VisualScriptSceneTree::get_input_value_port_info(int p_idx) const {
-
 	return PropertyInfo();
 }
 
 PropertyInfo VisualScriptSceneTree::get_output_value_port_info(int p_idx) const {
-
 	return PropertyInfo(Variant::OBJECT, "Scene Tree", PROPERTY_HINT_TYPE_STRING, "SceneTree");
 }
 
 String VisualScriptSceneTree::get_caption() const {
-
 	return "Get Scene Tree";
 }
 
@@ -2657,18 +2538,17 @@ public:
 
 	//virtual int get_working_memory_size() const { return 0; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		Node *node = Object::cast_to<Node>(instance->get_owner_ptr());
 		if (!node) {
-			r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+			r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 			r_error_str = "Base object is not a Node!";
 			return 0;
 		}
 
 		SceneTree *tree = node->get_tree();
 		if (!tree) {
-			r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+			r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 			r_error_str = "Attempt to get SceneTree while node is not in the active tree.";
 			return 0;
 		}
@@ -2680,7 +2560,6 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptSceneTree::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceSceneTree *instance = memnew(VisualScriptNodeInstanceSceneTree);
 	instance->node = this;
 	instance->instance = p_instance;
@@ -2688,7 +2567,6 @@ VisualScriptNodeInstance *VisualScriptSceneTree::instance(VisualScriptInstance *
 }
 
 VisualScriptSceneTree::TypeGuess VisualScriptSceneTree::guess_output_type(TypeGuess *p_inputs, int p_output) const {
-
 	TypeGuess tg;
 	tg.type = Variant::OBJECT;
 	tg.gdclass = "SceneTree";
@@ -2709,46 +2587,38 @@ VisualScriptSceneTree::VisualScriptSceneTree() {
 //////////////////////////////////////////
 
 int VisualScriptResourcePath::get_output_sequence_port_count() const {
-
 	return 0;
 }
 
 bool VisualScriptResourcePath::has_input_sequence_port() const {
-
 	return false;
 }
 
 int VisualScriptResourcePath::get_input_value_port_count() const {
-
 	return 0;
 }
-int VisualScriptResourcePath::get_output_value_port_count() const {
 
+int VisualScriptResourcePath::get_output_value_port_count() const {
 	return 1;
 }
 
 String VisualScriptResourcePath::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 PropertyInfo VisualScriptResourcePath::get_input_value_port_info(int p_idx) const {
-
 	return PropertyInfo();
 }
 
 PropertyInfo VisualScriptResourcePath::get_output_value_port_info(int p_idx) const {
-
 	return PropertyInfo(Variant::STRING, path);
 }
 
 String VisualScriptResourcePath::get_caption() const {
-
 	return "Resource Path";
 }
 
 void VisualScriptResourcePath::set_resource_path(const String &p_path) {
-
 	path = p_path;
 	_change_notify();
 	ports_changed_notify();
@@ -2764,22 +2634,19 @@ public:
 
 	//virtual int get_working_memory_size() const { return 0; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		*p_outputs[0] = path;
 		return 0;
 	}
 };
 
 VisualScriptNodeInstance *VisualScriptResourcePath::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceResourcePath *instance = memnew(VisualScriptNodeInstanceResourcePath);
 	instance->path = path;
 	return instance;
 }
 
 void VisualScriptResourcePath::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_resource_path", "path"), &VisualScriptResourcePath::set_resource_path);
 	ClassDB::bind_method(D_METHOD("get_resource_path"), &VisualScriptResourcePath::get_resource_path);
 
@@ -2787,7 +2654,6 @@ void VisualScriptResourcePath::_bind_methods() {
 }
 
 VisualScriptResourcePath::VisualScriptResourcePath() {
-
 	path = "";
 }
 
@@ -2796,47 +2662,41 @@ VisualScriptResourcePath::VisualScriptResourcePath() {
 //////////////////////////////////////////
 
 int VisualScriptSelf::get_output_sequence_port_count() const {
-
 	return 0;
 }
 
 bool VisualScriptSelf::has_input_sequence_port() const {
-
 	return false;
 }
 
 int VisualScriptSelf::get_input_value_port_count() const {
-
 	return 0;
 }
-int VisualScriptSelf::get_output_value_port_count() const {
 
+int VisualScriptSelf::get_output_value_port_count() const {
 	return 1;
 }
 
 String VisualScriptSelf::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 PropertyInfo VisualScriptSelf::get_input_value_port_info(int p_idx) const {
-
 	return PropertyInfo();
 }
 
 PropertyInfo VisualScriptSelf::get_output_value_port_info(int p_idx) const {
-
 	String type_name;
-	if (get_visual_script().is_valid())
+	if (get_visual_script().is_valid()) {
 		type_name = get_visual_script()->get_instance_base_type();
-	else
+	} else {
 		type_name = "instance";
+	}
 
 	return PropertyInfo(Variant::OBJECT, type_name);
 }
 
 String VisualScriptSelf::get_caption() const {
-
 	return "Get Self";
 }
 
@@ -2846,29 +2706,27 @@ public:
 
 	//virtual int get_working_memory_size() const { return 0; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		*p_outputs[0] = instance->get_owner_ptr();
 		return 0;
 	}
 };
 
 VisualScriptNodeInstance *VisualScriptSelf::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceSelf *instance = memnew(VisualScriptNodeInstanceSelf);
 	instance->instance = p_instance;
 	return instance;
 }
 
 VisualScriptSelf::TypeGuess VisualScriptSelf::guess_output_type(TypeGuess *p_inputs, int p_output) const {
-
 	VisualScriptSceneNode::TypeGuess tg;
 	tg.type = Variant::OBJECT;
 	tg.gdclass = "Object";
 
 	Ref<Script> script = get_visual_script();
-	if (!script.is_valid())
+	if (!script.is_valid()) {
 		return tg;
+	}
 
 	tg.gdclass = script->get_instance_base_type();
 	tg.script = script;
@@ -2887,7 +2745,6 @@ VisualScriptSelf::VisualScriptSelf() {
 //////////////////////////////////////////
 
 int VisualScriptCustomNode::get_output_sequence_port_count() const {
-
 	if (get_script_instance() && get_script_instance()->has_method("_get_output_sequence_port_count")) {
 		return get_script_instance()->call("_get_output_sequence_port_count");
 	}
@@ -2895,7 +2752,6 @@ int VisualScriptCustomNode::get_output_sequence_port_count() const {
 }
 
 bool VisualScriptCustomNode::has_input_sequence_port() const {
-
 	if (get_script_instance() && get_script_instance()->has_method("_has_input_sequence_port")) {
 		return get_script_instance()->call("_has_input_sequence_port");
 	}
@@ -2903,14 +2759,13 @@ bool VisualScriptCustomNode::has_input_sequence_port() const {
 }
 
 int VisualScriptCustomNode::get_input_value_port_count() const {
-
 	if (get_script_instance() && get_script_instance()->has_method("_get_input_value_port_count")) {
 		return get_script_instance()->call("_get_input_value_port_count");
 	}
 	return 0;
 }
-int VisualScriptCustomNode::get_output_value_port_count() const {
 
+int VisualScriptCustomNode::get_output_value_port_count() const {
 	if (get_script_instance() && get_script_instance()->has_method("_get_output_value_port_count")) {
 		return get_script_instance()->call("_get_output_value_port_count");
 	}
@@ -2918,7 +2773,6 @@ int VisualScriptCustomNode::get_output_value_port_count() const {
 }
 
 String VisualScriptCustomNode::get_output_sequence_port_text(int p_port) const {
-
 	if (get_script_instance() && get_script_instance()->has_method("_get_output_sequence_port_text")) {
 		return get_script_instance()->call("_get_output_sequence_port_text", p_port);
 	}
@@ -2927,7 +2781,6 @@ String VisualScriptCustomNode::get_output_sequence_port_text(int p_port) const {
 }
 
 PropertyInfo VisualScriptCustomNode::get_input_value_port_info(int p_idx) const {
-
 	PropertyInfo info;
 	if (get_script_instance() && get_script_instance()->has_method("_get_input_value_port_type")) {
 		info.type = Variant::Type(int(get_script_instance()->call("_get_input_value_port_type", p_idx)));
@@ -2939,7 +2792,6 @@ PropertyInfo VisualScriptCustomNode::get_input_value_port_info(int p_idx) const
 }
 
 PropertyInfo VisualScriptCustomNode::get_output_value_port_info(int p_idx) const {
-
 	PropertyInfo info;
 	if (get_script_instance() && get_script_instance()->has_method("_get_output_value_port_type")) {
 		info.type = Variant::Type(int(get_script_instance()->call("_get_output_value_port_type", p_idx)));
@@ -2951,7 +2803,6 @@ PropertyInfo VisualScriptCustomNode::get_output_value_port_info(int p_idx) const
 }
 
 String VisualScriptCustomNode::get_caption() const {
-
 	if (get_script_instance() && get_script_instance()->has_method("_get_caption")) {
 		return get_script_instance()->call("_get_caption");
 	}
@@ -2959,7 +2810,6 @@ String VisualScriptCustomNode::get_caption() const {
 }
 
 String VisualScriptCustomNode::get_text() const {
-
 	if (get_script_instance() && get_script_instance()->has_method("_get_text")) {
 		return get_script_instance()->call("_get_text");
 	}
@@ -2967,7 +2817,6 @@ String VisualScriptCustomNode::get_text() const {
 }
 
 String VisualScriptCustomNode::get_category() const {
-
 	if (get_script_instance() && get_script_instance()->has_method("_get_category")) {
 		return get_script_instance()->call("_get_category");
 	}
@@ -2983,13 +2832,12 @@ public:
 	int work_mem_size;
 
 	virtual int get_working_memory_size() const { return work_mem_size; }
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		if (node->get_script_instance()) {
 #ifdef DEBUG_ENABLED
 			if (!node->get_script_instance()->has_method(VisualScriptLanguage::singleton->_step)) {
 				r_error_str = RTR("Custom node has no _step() method, can't process graph.");
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 				return 0;
 			}
 #endif
@@ -3016,13 +2864,13 @@ public:
 			Variant ret = node->get_script_instance()->call(VisualScriptLanguage::singleton->_step, in_values, out_values, p_start_mode, work_mem);
 			if (ret.get_type() == Variant::STRING) {
 				r_error_str = ret;
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 				return 0;
 			} else if (ret.is_num()) {
 				ret_out = ret;
 			} else {
 				r_error_str = RTR("Invalid return value from _step(), must be integer (seq out), or string (error).");
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 				return 0;
 			}
 
@@ -3046,7 +2894,6 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptCustomNode::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceCustomNode *instance = memnew(VisualScriptNodeInstanceCustomNode);
 	instance->instance = p_instance;
 	instance->node = this;
@@ -3067,7 +2914,6 @@ void VisualScriptCustomNode::_script_changed() {
 }
 
 void VisualScriptCustomNode::_bind_methods() {
-
 	BIND_VMETHOD(MethodInfo(Variant::INT, "_get_output_sequence_port_count"));
 	BIND_VMETHOD(MethodInfo(Variant::BOOL, "_has_input_sequence_port"));
 
@@ -3091,8 +2937,6 @@ void VisualScriptCustomNode::_bind_methods() {
 	stepmi.return_val.usage |= PROPERTY_USAGE_NIL_IS_VARIANT;
 	BIND_VMETHOD(stepmi);
 
-	ClassDB::bind_method(D_METHOD("_script_changed"), &VisualScriptCustomNode::_script_changed);
-
 	BIND_ENUM_CONSTANT(START_MODE_BEGIN_SEQUENCE);
 	BIND_ENUM_CONSTANT(START_MODE_CONTINUE_SEQUENCE);
 	BIND_ENUM_CONSTANT(START_MODE_RESUME_YIELD);
@@ -3105,7 +2949,7 @@ void VisualScriptCustomNode::_bind_methods() {
 }
 
 VisualScriptCustomNode::VisualScriptCustomNode() {
-	connect("script_changed", this, "_script_changed");
+	connect("script_changed", callable_mp(this, &VisualScriptCustomNode::_script_changed));
 }
 
 //////////////////////////////////////////
@@ -3113,42 +2957,35 @@ VisualScriptCustomNode::VisualScriptCustomNode() {
 //////////////////////////////////////////
 
 int VisualScriptSubCall::get_output_sequence_port_count() const {
-
 	return 1;
 }
 
 bool VisualScriptSubCall::has_input_sequence_port() const {
-
 	return true;
 }
 
 int VisualScriptSubCall::get_input_value_port_count() const {
-
 	Ref<Script> script = get_script();
 
 	if (script.is_valid() && script->has_method(VisualScriptLanguage::singleton->_subcall)) {
-
 		MethodInfo mi = script->get_method_info(VisualScriptLanguage::singleton->_subcall);
 		return mi.arguments.size();
 	}
 
 	return 0;
 }
-int VisualScriptSubCall::get_output_value_port_count() const {
 
+int VisualScriptSubCall::get_output_value_port_count() const {
 	return 1;
 }
 
 String VisualScriptSubCall::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 PropertyInfo VisualScriptSubCall::get_input_value_port_info(int p_idx) const {
-
 	Ref<Script> script = get_script();
 	if (script.is_valid() && script->has_method(VisualScriptLanguage::singleton->_subcall)) {
-
 		MethodInfo mi = script->get_method_info(VisualScriptLanguage::singleton->_subcall);
 		return mi.arguments[p_idx];
 	}
@@ -3157,7 +2994,6 @@ PropertyInfo VisualScriptSubCall::get_input_value_port_info(int p_idx) const {
 }
 
 PropertyInfo VisualScriptSubCall::get_output_value_port_info(int p_idx) const {
-
 	Ref<Script> script = get_script();
 	if (script.is_valid() && script->has_method(VisualScriptLanguage::singleton->_subcall)) {
 		MethodInfo mi = script->get_method_info(VisualScriptLanguage::singleton->_subcall);
@@ -3167,25 +3003,24 @@ PropertyInfo VisualScriptSubCall::get_output_value_port_info(int p_idx) const {
 }
 
 String VisualScriptSubCall::get_caption() const {
-
 	return "SubCall";
 }
 
 String VisualScriptSubCall::get_text() const {
-
 	Ref<Script> script = get_script();
 	if (script.is_valid()) {
-		if (script->get_name() != String())
+		if (script->get_name() != String()) {
 			return script->get_name();
-		if (script->get_path().is_resource_file())
+		}
+		if (script->get_path().is_resource_file()) {
 			return script->get_path().get_file();
+		}
 		return script->get_class();
 	}
 	return "";
 }
 
 String VisualScriptSubCall::get_category() const {
-
 	return "custom";
 }
 
@@ -3198,11 +3033,10 @@ public:
 
 	//virtual int get_working_memory_size() const { return 0; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		if (!valid) {
 			r_error_str = "Node requires a script with a _subcall(<args>) method to work.";
-			r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+			r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 			return 0;
 		}
 		*p_outputs[0] = subcall->call(VisualScriptLanguage::singleton->_subcall, p_inputs, input_args, r_error);
@@ -3211,7 +3045,6 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptSubCall::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceSubCall *instance = memnew(VisualScriptNodeInstanceSubCall);
 	instance->instance = p_instance;
 	Ref<Script> script = get_script();
@@ -3225,7 +3058,6 @@ VisualScriptNodeInstance *VisualScriptSubCall::instance(VisualScriptInstance *p_
 }
 
 void VisualScriptSubCall::_bind_methods() {
-
 	MethodInfo scmi(Variant::NIL, "_subcall", PropertyInfo(Variant::NIL, "arguments"));
 	scmi.return_val.usage |= PROPERTY_USAGE_NIL_IS_VARIANT;
 	BIND_VMETHOD(scmi);
@@ -3239,87 +3071,78 @@ VisualScriptSubCall::VisualScriptSubCall() {
 //////////////////////////////////////////
 
 int VisualScriptComment::get_output_sequence_port_count() const {
-
 	return 0;
 }
 
 bool VisualScriptComment::has_input_sequence_port() const {
-
 	return false;
 }
 
 int VisualScriptComment::get_input_value_port_count() const {
 	return 0;
 }
-int VisualScriptComment::get_output_value_port_count() const {
 
+int VisualScriptComment::get_output_value_port_count() const {
 	return 0;
 }
 
 String VisualScriptComment::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 PropertyInfo VisualScriptComment::get_input_value_port_info(int p_idx) const {
-
 	return PropertyInfo();
 }
 
 PropertyInfo VisualScriptComment::get_output_value_port_info(int p_idx) const {
-
 	return PropertyInfo();
 }
 
 String VisualScriptComment::get_caption() const {
-
 	return title;
 }
 
 String VisualScriptComment::get_text() const {
-
 	return description;
 }
 
 void VisualScriptComment::set_title(const String &p_title) {
-
-	if (title == p_title)
+	if (title == p_title) {
 		return;
+	}
 	title = p_title;
 	ports_changed_notify();
 }
 
 String VisualScriptComment::get_title() const {
-
 	return title;
 }
 
 void VisualScriptComment::set_description(const String &p_description) {
-
-	if (description == p_description)
+	if (description == p_description) {
 		return;
+	}
 	description = p_description;
 	ports_changed_notify();
 }
-String VisualScriptComment::get_description() const {
 
+String VisualScriptComment::get_description() const {
 	return description;
 }
 
 void VisualScriptComment::set_size(const Size2 &p_size) {
-
-	if (size == p_size)
+	if (size == p_size) {
 		return;
+	}
 	size = p_size;
 	ports_changed_notify();
 }
-Size2 VisualScriptComment::get_size() const {
 
+Size2 VisualScriptComment::get_size() const {
 	return size;
 }
 
 String VisualScriptComment::get_category() const {
-
 	return "data";
 }
 
@@ -3329,21 +3152,18 @@ public:
 
 	//virtual int get_working_memory_size() const { return 0; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		return 0;
 	}
 };
 
 VisualScriptNodeInstance *VisualScriptComment::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceComment *instance = memnew(VisualScriptNodeInstanceComment);
 	instance->instance = p_instance;
 	return instance;
 }
 
 void VisualScriptComment::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_title", "title"), &VisualScriptComment::set_title);
 	ClassDB::bind_method(D_METHOD("get_title"), &VisualScriptComment::get_title);
 
@@ -3359,7 +3179,6 @@ void VisualScriptComment::_bind_methods() {
 }
 
 VisualScriptComment::VisualScriptComment() {
-
 	title = "Comment";
 	size = Size2(150, 150);
 }
@@ -3369,70 +3188,60 @@ VisualScriptComment::VisualScriptComment() {
 //////////////////////////////////////////
 
 int VisualScriptConstructor::get_output_sequence_port_count() const {
-
 	return 0;
 }
 
 bool VisualScriptConstructor::has_input_sequence_port() const {
-
 	return false;
 }
 
 int VisualScriptConstructor::get_input_value_port_count() const {
 	return constructor.arguments.size();
 }
-int VisualScriptConstructor::get_output_value_port_count() const {
 
+int VisualScriptConstructor::get_output_value_port_count() const {
 	return 1;
 }
 
 String VisualScriptConstructor::get_output_sequence_port_text(int p_port) const {
-
 	return "";
 }
 
 PropertyInfo VisualScriptConstructor::get_input_value_port_info(int p_idx) const {
-
 	return constructor.arguments[p_idx];
 }
 
 PropertyInfo VisualScriptConstructor::get_output_value_port_info(int p_idx) const {
-
 	return PropertyInfo(type, "value");
 }
 
 String VisualScriptConstructor::get_caption() const {
-
 	return "Construct " + Variant::get_type_name(type);
 }
 
 String VisualScriptConstructor::get_category() const {
-
 	return "functions";
 }
 
 void VisualScriptConstructor::set_constructor_type(Variant::Type p_type) {
-
-	if (type == p_type)
+	if (type == p_type) {
 		return;
+	}
 
 	type = p_type;
 	ports_changed_notify();
 }
 
 Variant::Type VisualScriptConstructor::get_constructor_type() const {
-
 	return type;
 }
 
 void VisualScriptConstructor::set_constructor(const Dictionary &p_info) {
-
 	constructor = MethodInfo::from_dict(p_info);
 	ports_changed_notify();
 }
 
 Dictionary VisualScriptConstructor::get_constructor() const {
-
 	return constructor;
 }
 
@@ -3444,11 +3253,10 @@ public:
 
 	//virtual int get_working_memory_size() const { return 0; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
-		Variant::CallError ce;
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
+		Callable::CallError ce;
 		*p_outputs[0] = Variant::construct(type, p_inputs, argcount, ce);
-		if (ce.error != Variant::CallError::CALL_OK) {
+		if (ce.error != Callable::CallError::CALL_OK) {
 			r_error_str = "Invalid arguments for constructor";
 		}
 
@@ -3457,7 +3265,6 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptConstructor::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceConstructor *instance = memnew(VisualScriptNodeInstanceConstructor);
 	instance->instance = p_instance;
 	instance->type = type;
@@ -3466,7 +3273,6 @@ VisualScriptNodeInstance *VisualScriptConstructor::instance(VisualScriptInstance
 }
 
 void VisualScriptConstructor::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_constructor_type", "type"), &VisualScriptConstructor::set_constructor_type);
 	ClassDB::bind_method(D_METHOD("get_constructor_type"), &VisualScriptConstructor::get_constructor_type);
 
@@ -3478,14 +3284,12 @@ void VisualScriptConstructor::_bind_methods() {
 }
 
 VisualScriptConstructor::VisualScriptConstructor() {
-
 	type = Variant::NIL;
 }
 
-static Map<String, Pair<Variant::Type, MethodInfo> > constructor_map;
+static Map<String, Pair<Variant::Type, MethodInfo>> constructor_map;
 
 static Ref<VisualScriptNode> create_constructor_node(const String &p_name) {
-
 	ERR_FAIL_COND_V(!constructor_map.has(p_name), Ref<VisualScriptNode>());
 
 	Ref<VisualScriptConstructor> vsc;
@@ -3501,69 +3305,60 @@ static Ref<VisualScriptNode> create_constructor_node(const String &p_name) {
 //////////////////////////////////////////
 
 int VisualScriptLocalVar::get_output_sequence_port_count() const {
-
 	return 0;
 }
 
 bool VisualScriptLocalVar::has_input_sequence_port() const {
-
 	return false;
 }
 
 int VisualScriptLocalVar::get_input_value_port_count() const {
 	return 0;
 }
-int VisualScriptLocalVar::get_output_value_port_count() const {
 
+int VisualScriptLocalVar::get_output_value_port_count() const {
 	return 1;
 }
 
 String VisualScriptLocalVar::get_output_sequence_port_text(int p_port) const {
-
 	return "";
 }
 
 PropertyInfo VisualScriptLocalVar::get_input_value_port_info(int p_idx) const {
-
 	return PropertyInfo();
 }
-PropertyInfo VisualScriptLocalVar::get_output_value_port_info(int p_idx) const {
 
+PropertyInfo VisualScriptLocalVar::get_output_value_port_info(int p_idx) const {
 	return PropertyInfo(type, name);
 }
 
 String VisualScriptLocalVar::get_caption() const {
-
 	return "Get Local Var";
 }
 
 String VisualScriptLocalVar::get_category() const {
-
 	return "data";
 }
 
 void VisualScriptLocalVar::set_var_name(const StringName &p_name) {
-
-	if (name == p_name)
+	if (name == p_name) {
 		return;
+	}
 
 	name = p_name;
 	ports_changed_notify();
 }
 
 StringName VisualScriptLocalVar::get_var_name() const {
-
 	return name;
 }
 
 void VisualScriptLocalVar::set_var_type(Variant::Type p_type) {
-
 	type = p_type;
 	ports_changed_notify();
 }
 
 Variant::Type VisualScriptLocalVar::get_var_type() const {
-
 	return type;
 }
 
@@ -3573,15 +3368,13 @@ public:
 	StringName name;
 
 	virtual int get_working_memory_size() const { return 1; }
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		*p_outputs[0] = *p_working_mem;
 		return 0;
 	}
 };
 
 VisualScriptNodeInstance *VisualScriptLocalVar::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceLocalVar *instance = memnew(VisualScriptNodeInstanceLocalVar);
 	instance->instance = p_instance;
 	instance->name = name;
@@ -3590,7 +3383,6 @@ VisualScriptNodeInstance *VisualScriptLocalVar::instance(VisualScriptInstance *p
 }
 
 void VisualScriptLocalVar::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_var_name", "name"), &VisualScriptLocalVar::set_var_name);
 	ClassDB::bind_method(D_METHOD("get_var_name"), &VisualScriptLocalVar::get_var_name);
 
@@ -3607,7 +3399,6 @@ void VisualScriptLocalVar::_bind_methods() {
 }
 
 VisualScriptLocalVar::VisualScriptLocalVar() {
-
 	name = "new_local";
 	type = Variant::NIL;
 }
@@ -3617,74 +3408,64 @@ VisualScriptLocalVar::VisualScriptLocalVar() {
 //////////////////////////////////////////
 
 int VisualScriptLocalVarSet::get_output_sequence_port_count() const {
-
 	return 1;
 }
 
 bool VisualScriptLocalVarSet::has_input_sequence_port() const {
-
 	return true;
 }
 
 int VisualScriptLocalVarSet::get_input_value_port_count() const {
 	return 1;
 }
-int VisualScriptLocalVarSet::get_output_value_port_count() const {
 
+int VisualScriptLocalVarSet::get_output_value_port_count() const {
 	return 1;
 }
 
 String VisualScriptLocalVarSet::get_output_sequence_port_text(int p_port) const {
-
 	return "";
 }
 
 PropertyInfo VisualScriptLocalVarSet::get_input_value_port_info(int p_idx) const {
-
 	return PropertyInfo(type, "set");
 }
-PropertyInfo VisualScriptLocalVarSet::get_output_value_port_info(int p_idx) const {
 
+PropertyInfo VisualScriptLocalVarSet::get_output_value_port_info(int p_idx) const {
 	return PropertyInfo(type, "get");
 }
 
 String VisualScriptLocalVarSet::get_caption() const {
-
 	return "Set Local Var";
 }
 
 String VisualScriptLocalVarSet::get_text() const {
-
 	return name;
 }
 
 String VisualScriptLocalVarSet::get_category() const {
-
 	return "data";
 }
 
 void VisualScriptLocalVarSet::set_var_name(const StringName &p_name) {
-
-	if (name == p_name)
+	if (name == p_name) {
 		return;
+	}
 
 	name = p_name;
 	ports_changed_notify();
 }
 
 StringName VisualScriptLocalVarSet::get_var_name() const {
-
 	return name;
 }
 
 void VisualScriptLocalVarSet::set_var_type(Variant::Type p_type) {
-
 	type = p_type;
 	ports_changed_notify();
 }
 
 Variant::Type VisualScriptLocalVarSet::get_var_type() const {
-
 	return type;
 }
 
@@ -3694,8 +3475,7 @@ public:
 	StringName name;
 
 	virtual int get_working_memory_size() const { return 1; }
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		*p_working_mem = *p_inputs[0];
 		*p_outputs[0] = *p_working_mem;
 		return 0;
@@ -3703,7 +3483,6 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptLocalVarSet::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceLocalVarSet *instance = memnew(VisualScriptNodeInstanceLocalVarSet);
 	instance->instance = p_instance;
 	instance->name = name;
@@ -3712,7 +3491,6 @@ VisualScriptNodeInstance *VisualScriptLocalVarSet::instance(VisualScriptInstance
 }
 
 void VisualScriptLocalVarSet::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_var_name", "name"), &VisualScriptLocalVarSet::set_var_name);
 	ClassDB::bind_method(D_METHOD("get_var_name"), &VisualScriptLocalVarSet::get_var_name);
 
@@ -3729,7 +3507,6 @@ void VisualScriptLocalVarSet::_bind_methods() {
 }
 
 VisualScriptLocalVarSet::VisualScriptLocalVarSet() {
-
 	name = "new_local";
 	type = Variant::NIL;
 }
@@ -3739,34 +3516,30 @@ VisualScriptLocalVarSet::VisualScriptLocalVarSet() {
 //////////////////////////////////////////
 
 int VisualScriptInputAction::get_output_sequence_port_count() const {
-
 	return 0;
 }
 
 bool VisualScriptInputAction::has_input_sequence_port() const {
-
 	return false;
 }
 
 int VisualScriptInputAction::get_input_value_port_count() const {
 	return 0;
 }
-int VisualScriptInputAction::get_output_value_port_count() const {
 
+int VisualScriptInputAction::get_output_value_port_count() const {
 	return 1;
 }
 
 String VisualScriptInputAction::get_output_sequence_port_text(int p_port) const {
-
 	return "";
 }
 
 PropertyInfo VisualScriptInputAction::get_input_value_port_info(int p_idx) const {
-
 	return PropertyInfo();
 }
-PropertyInfo VisualScriptInputAction::get_output_value_port_info(int p_idx) const {
 
+PropertyInfo VisualScriptInputAction::get_output_value_port_info(int p_idx) const {
 	String mstr;
 	switch (mode) {
 		case MODE_PRESSED: {
@@ -3787,39 +3560,36 @@ PropertyInfo VisualScriptInputAction::get_output_value_port_info(int p_idx) cons
 }
 
 String VisualScriptInputAction::get_caption() const {
-
 	return "Action " + name;
 }
 
 String VisualScriptInputAction::get_category() const {
-
 	return "data";
 }
 
 void VisualScriptInputAction::set_action_name(const StringName &p_name) {
-
-	if (name == p_name)
+	if (name == p_name) {
 		return;
+	}
 
 	name = p_name;
 	ports_changed_notify();
 }
 
 StringName VisualScriptInputAction::get_action_name() const {
-
 	return name;
 }
 
 void VisualScriptInputAction::set_action_mode(Mode p_mode) {
-
-	if (mode == p_mode)
+	if (mode == p_mode) {
 		return;
+	}
 
 	mode = p_mode;
 	ports_changed_notify();
 }
-VisualScriptInputAction::Mode VisualScriptInputAction::get_action_mode() const {
 
+VisualScriptInputAction::Mode VisualScriptInputAction::get_action_mode() const {
 	return mode;
 }
 
@@ -3829,8 +3599,7 @@ public:
 	StringName action;
 	VisualScriptInputAction::Mode mode;
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		switch (mode) {
 			case VisualScriptInputAction::MODE_PRESSED: {
 				*p_outputs[0] = Input::get_singleton()->is_action_pressed(action);
@@ -3851,7 +3620,6 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptInputAction::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceInputAction *instance = memnew(VisualScriptNodeInstanceInputAction);
 	instance->instance = p_instance;
 	instance->action = name;
@@ -3861,9 +3629,7 @@ VisualScriptNodeInstance *VisualScriptInputAction::instance(VisualScriptInstance
 }
 
 void VisualScriptInputAction::_validate_property(PropertyInfo &property) const {
-
 	if (property.name == "action") {
-
 		property.hint = PROPERTY_HINT_ENUM;
 		String actions;
 
@@ -3874,8 +3640,9 @@ void VisualScriptInputAction::_validate_property(PropertyInfo &property) const {
 		for (List<PropertyInfo>::Element *E = pinfo.front(); E; E = E->next()) {
 			const PropertyInfo &pi = E->get();
 
-			if (!pi.name.begins_with("input/"))
+			if (!pi.name.begins_with("input/")) {
 				continue;
+			}
 
 			String name = pi.name.substr(pi.name.find("/") + 1, pi.name.length());
 
@@ -3885,8 +3652,9 @@ void VisualScriptInputAction::_validate_property(PropertyInfo &property) const {
 		al.sort();
 
 		for (int i = 0; i < al.size(); i++) {
-			if (actions != String())
+			if (actions != String()) {
 				actions += ",";
+			}
 			actions += al[i];
 		}
 
@@ -3895,7 +3663,6 @@ void VisualScriptInputAction::_validate_property(PropertyInfo &property) const {
 }
 
 void VisualScriptInputAction::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_action_name", "name"), &VisualScriptInputAction::set_action_name);
 	ClassDB::bind_method(D_METHOD("get_action_name"), &VisualScriptInputAction::get_action_name);
 
@@ -3912,7 +3679,6 @@ void VisualScriptInputAction::_bind_methods() {
 }
 
 VisualScriptInputAction::VisualScriptInputAction() {
-
 	name = "";
 	mode = MODE_PRESSED;
 }
@@ -3922,60 +3688,51 @@ VisualScriptInputAction::VisualScriptInputAction() {
 //////////////////////////////////////////
 
 int VisualScriptDeconstruct::get_output_sequence_port_count() const {
-
 	return 0;
 }
 
 bool VisualScriptDeconstruct::has_input_sequence_port() const {
-
 	return false;
 }
 
 int VisualScriptDeconstruct::get_input_value_port_count() const {
 	return 1;
 }
-int VisualScriptDeconstruct::get_output_value_port_count() const {
 
+int VisualScriptDeconstruct::get_output_value_port_count() const {
 	return elements.size();
 }
 
 String VisualScriptDeconstruct::get_output_sequence_port_text(int p_port) const {
-
 	return "";
 }
 
 PropertyInfo VisualScriptDeconstruct::get_input_value_port_info(int p_idx) const {
-
 	return PropertyInfo(type, "value");
 }
 
 PropertyInfo VisualScriptDeconstruct::get_output_value_port_info(int p_idx) const {
-
 	return PropertyInfo(elements[p_idx].type, elements[p_idx].name);
 }
 
 String VisualScriptDeconstruct::get_caption() const {
-
 	return "Deconstruct " + Variant::get_type_name(type);
 }
 
 String VisualScriptDeconstruct::get_category() const {
-
 	return "functions";
 }
 
 void VisualScriptDeconstruct::_update_elements() {
-
 	elements.clear();
 	Variant v;
-	Variant::CallError ce;
-	v = Variant::construct(type, NULL, 0, ce);
+	Callable::CallError ce;
+	v = Variant::construct(type, nullptr, 0, ce);
 
 	List<PropertyInfo> pinfo;
 	v.get_property_list(&pinfo);
 
 	for (List<PropertyInfo>::Element *E = pinfo.front(); E; E = E->next()) {
-
 		Element e;
 		e.name = E->get().name;
 		e.type = E->get().type;
@@ -3984,9 +3741,9 @@ void VisualScriptDeconstruct::_update_elements() {
 }
 
 void VisualScriptDeconstruct::set_deconstruct_type(Variant::Type p_type) {
-
-	if (type == p_type)
+	if (type == p_type) {
 		return;
+	}
 
 	type = p_type;
 	_update_elements();
@@ -3995,12 +3752,10 @@ void VisualScriptDeconstruct::set_deconstruct_type(Variant::Type p_type) {
 }
 
 Variant::Type VisualScriptDeconstruct::get_deconstruct_type() const {
-
 	return type;
 }
 
 void VisualScriptDeconstruct::_set_elem_cache(const Array &p_elements) {
-
 	ERR_FAIL_COND(p_elements.size() % 2 == 1);
 	elements.resize(p_elements.size() / 2);
 	for (int i = 0; i < elements.size(); i++) {
@@ -4010,7 +3765,6 @@ void VisualScriptDeconstruct::_set_elem_cache(const Array &p_elements) {
 }
 
 Array VisualScriptDeconstruct::_get_elem_cache() const {
-
 	Array ret;
 	for (int i = 0; i < elements.size(); i++) {
 		ret.push_back(elements[i].name);
@@ -4026,8 +3780,7 @@ public:
 
 	//virtual int get_working_memory_size() const { return 0; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		Variant in = *p_inputs[0];
 
 		for (int i = 0; i < outputs.size(); i++) {
@@ -4035,7 +3788,7 @@ public:
 			*p_outputs[i] = in.get(outputs[i], &valid);
 			if (!valid) {
 				r_error_str = "Can't obtain element '" + String(outputs[i]) + "' from " + Variant::get_type_name(in.get_type());
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 				return 0;
 			}
 		}
@@ -4045,7 +3798,6 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptDeconstruct::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceDeconstruct *instance = memnew(VisualScriptNodeInstanceDeconstruct);
 	instance->instance = p_instance;
 	instance->outputs.resize(elements.size());
@@ -4060,7 +3812,6 @@ void VisualScriptDeconstruct::_validate_property(PropertyInfo &property) const {
 }
 
 void VisualScriptDeconstruct::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_deconstruct_type", "type"), &VisualScriptDeconstruct::set_deconstruct_type);
 	ClassDB::bind_method(D_METHOD("get_deconstruct_type"), &VisualScriptDeconstruct::get_deconstruct_type);
 
@@ -4077,7 +3828,6 @@ void VisualScriptDeconstruct::_bind_methods() {
 }
 
 VisualScriptDeconstruct::VisualScriptDeconstruct() {
-
 	type = Variant::NIL;
 }
 
@@ -4090,7 +3840,6 @@ static Ref<VisualScriptNode> create_node_deconst_typed(const String &p_name) {
 }
 
 void register_visual_script_nodes() {
-
 	VisualScriptLanguage::singleton->add_register_func("data/set_variable", create_node_generic<VisualScriptVariableSet>);
 	VisualScriptLanguage::singleton->add_register_func("data/get_variable", create_node_generic<VisualScriptVariableGet>);
 	VisualScriptLanguage::singleton->add_register_func("data/engine_singleton", create_node_generic<VisualScriptEngineSingleton>);
@@ -4147,9 +3896,12 @@ void register_visual_script_nodes() {
 	VisualScriptLanguage::singleton->add_register_func("operators/logic/select", create_node_generic<VisualScriptSelect>);
 
 	VisualScriptLanguage::singleton->add_register_func("functions/deconstruct/" + Variant::get_type_name(Variant::Type::VECTOR2), create_node_deconst_typed<Variant::Type::VECTOR2>);
+	VisualScriptLanguage::singleton->add_register_func("functions/deconstruct/" + Variant::get_type_name(Variant::Type::VECTOR2I), create_node_deconst_typed<Variant::Type::VECTOR2I>);
 	VisualScriptLanguage::singleton->add_register_func("functions/deconstruct/" + Variant::get_type_name(Variant::Type::VECTOR3), create_node_deconst_typed<Variant::Type::VECTOR3>);
+	VisualScriptLanguage::singleton->add_register_func("functions/deconstruct/" + Variant::get_type_name(Variant::Type::VECTOR3I), create_node_deconst_typed<Variant::Type::VECTOR3I>);
 	VisualScriptLanguage::singleton->add_register_func("functions/deconstruct/" + Variant::get_type_name(Variant::Type::COLOR), create_node_deconst_typed<Variant::Type::COLOR>);
 	VisualScriptLanguage::singleton->add_register_func("functions/deconstruct/" + Variant::get_type_name(Variant::Type::RECT2), create_node_deconst_typed<Variant::Type::RECT2>);
+	VisualScriptLanguage::singleton->add_register_func("functions/deconstruct/" + Variant::get_type_name(Variant::Type::RECT2I), create_node_deconst_typed<Variant::Type::RECT2I>);
 	VisualScriptLanguage::singleton->add_register_func("functions/deconstruct/" + Variant::get_type_name(Variant::Type::TRANSFORM2D), create_node_deconst_typed<Variant::Type::TRANSFORM2D>);
 	VisualScriptLanguage::singleton->add_register_func("functions/deconstruct/" + Variant::get_type_name(Variant::Type::PLANE), create_node_deconst_typed<Variant::Type::PLANE>);
 	VisualScriptLanguage::singleton->add_register_func("functions/deconstruct/" + Variant::get_type_name(Variant::Type::QUAT), create_node_deconst_typed<Variant::Type::QUAT>);
@@ -4159,12 +3911,10 @@ void register_visual_script_nodes() {
 	VisualScriptLanguage::singleton->add_register_func("functions/compose_array", create_node_generic<VisualScriptComposeArray>);
 
 	for (int i = 1; i < Variant::VARIANT_MAX; i++) {
-
 		List<MethodInfo> constructors;
 		Variant::get_constructor_list(Variant::Type(i), &constructors);
 
 		for (List<MethodInfo>::Element *E = constructors.front(); E; E = E->next()) {
-
 			if (E->get().arguments.size() > 0) {
 				String name = "functions/constructors/" + Variant::get_type_name(Variant::Type(i)) + "(";
 				for (int j = 0; j < E->get().arguments.size(); j++) {
@@ -4189,6 +3939,5 @@ void register_visual_script_nodes() {
 }
 
 void unregister_visual_script_nodes() {
-
 	constructor_map.clear();
 }
diff --git a/modules/visual_script/visual_script_nodes.h b/modules/visual_script/visual_script_nodes.h
index 0df5071491..b6061f8838 100644
--- a/modules/visual_script/visual_script_nodes.h
+++ b/modules/visual_script/visual_script_nodes.h
@@ -34,7 +34,6 @@
 #include "visual_script.h"
 
 class VisualScriptFunction : public VisualScriptNode {
-
 	GDCLASS(VisualScriptFunction, VisualScriptNode);
 
 	struct Argument {
@@ -57,20 +56,20 @@ protected:
 	void _get_property_list(List<PropertyInfo> *p_list) const;
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_text() const;
-	virtual String get_category() const { return "flow_control"; }
+	virtual String get_caption() const override;
+	virtual String get_text() const override;
+	virtual String get_category() const override { return "flow_control"; }
 
 	void add_argument(Variant::Type p_type, const String &p_name, int p_index = -1, const PropertyHint p_hint = PROPERTY_HINT_NONE, const String &p_hint_string = String(""));
 	void set_argument_type(int p_argidx, Variant::Type p_type);
@@ -98,13 +97,12 @@ public:
 	void set_rpc_mode(MultiplayerAPI::RPCMode p_mode);
 	MultiplayerAPI::RPCMode get_rpc_mode() const;
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptFunction();
 };
 
 class VisualScriptLists : public VisualScriptNode {
-
 	GDCLASS(VisualScriptLists, VisualScriptNode)
 
 	struct Port {
@@ -144,20 +142,16 @@ public:
 	virtual bool is_input_port_name_editable() const;
 	virtual bool is_input_port_type_editable() const;
 
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
-
-	virtual String get_caption() const = 0;
-	virtual String get_text() const = 0;
-	virtual String get_category() const = 0;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
 	void add_input_data_port(Variant::Type p_type, const String &p_name, int p_index = -1);
 	void set_input_data_port_type(int p_idx, Variant::Type p_type);
@@ -176,32 +170,30 @@ public:
 };
 
 class VisualScriptComposeArray : public VisualScriptLists {
-
 	GDCLASS(VisualScriptComposeArray, VisualScriptLists)
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_text() const;
-	virtual String get_category() const { return "functions"; }
+	virtual String get_caption() const override;
+	virtual String get_text() const override;
+	virtual String get_category() const override { return "functions"; }
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptComposeArray();
 };
 
 class VisualScriptOperator : public VisualScriptNode {
-
 	GDCLASS(VisualScriptOperator, VisualScriptNode);
 
 	Variant::Type typed;
@@ -211,19 +203,19 @@ protected:
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_category() const { return "operators"; }
+	virtual String get_caption() const override;
+	virtual String get_category() const override { return "operators"; }
 
 	void set_operator(Variant::Operator p_op);
 	Variant::Operator get_operator() const;
@@ -231,13 +223,12 @@ public:
 	void set_typed(Variant::Type p_op);
 	Variant::Type get_typed() const;
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptOperator();
 };
 
 class VisualScriptSelect : public VisualScriptNode {
-
 	GDCLASS(VisualScriptSelect, VisualScriptNode);
 
 	Variant::Type typed;
@@ -246,120 +237,117 @@ protected:
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_text() const;
-	virtual String get_category() const { return "operators"; }
+	virtual String get_caption() const override;
+	virtual String get_text() const override;
+	virtual String get_category() const override { return "operators"; }
 
 	void set_typed(Variant::Type p_op);
 	Variant::Type get_typed() const;
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptSelect();
 };
 
 class VisualScriptVariableGet : public VisualScriptNode {
-
 	GDCLASS(VisualScriptVariableGet, VisualScriptNode);
 
 	StringName variable;
 
 protected:
-	virtual void _validate_property(PropertyInfo &property) const;
+	virtual void _validate_property(PropertyInfo &property) const override;
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_category() const { return "data"; }
+	virtual String get_caption() const override;
+	virtual String get_category() const override { return "data"; }
 
 	void set_variable(StringName p_variable);
 	StringName get_variable() const;
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptVariableGet();
 };
 
 class VisualScriptVariableSet : public VisualScriptNode {
-
 	GDCLASS(VisualScriptVariableSet, VisualScriptNode);
 
 	StringName variable;
 
 protected:
-	virtual void _validate_property(PropertyInfo &property) const;
+	virtual void _validate_property(PropertyInfo &property) const override;
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_category() const { return "data"; }
+	virtual String get_caption() const override;
+	virtual String get_category() const override { return "data"; }
 
 	void set_variable(StringName p_variable);
 	StringName get_variable() const;
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptVariableSet();
 };
 
 class VisualScriptConstant : public VisualScriptNode {
-
 	GDCLASS(VisualScriptConstant, VisualScriptNode);
 
 	Variant::Type type;
 	Variant value;
 
 protected:
-	virtual void _validate_property(PropertyInfo &property) const;
+	virtual void _validate_property(PropertyInfo &property) const override;
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_category() const { return "constants"; }
+	virtual String get_caption() const override;
+	virtual String get_category() const override { return "constants"; }
 
 	void set_constant_type(Variant::Type p_type);
 	Variant::Type get_constant_type() const;
@@ -367,13 +355,12 @@ public:
 	void set_constant_value(Variant p_value);
 	Variant get_constant_value() const;
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptConstant();
 };
 
 class VisualScriptPreload : public VisualScriptNode {
-
 	GDCLASS(VisualScriptPreload, VisualScriptNode);
 
 	Ref<Resource> preload;
@@ -382,78 +369,75 @@ protected:
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_category() const { return "data"; }
+	virtual String get_caption() const override;
+	virtual String get_category() const override { return "data"; }
 
 	void set_preload(const Ref<Resource> &p_preload);
 	Ref<Resource> get_preload() const;
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptPreload();
 };
 
 class VisualScriptIndexGet : public VisualScriptNode {
-
 	GDCLASS(VisualScriptIndexGet, VisualScriptNode);
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_category() const { return "operators"; }
+	virtual String get_caption() const override;
+	virtual String get_category() const override { return "operators"; }
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptIndexGet();
 };
 
 class VisualScriptIndexSet : public VisualScriptNode {
-
 	GDCLASS(VisualScriptIndexSet, VisualScriptNode);
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_category() const { return "operators"; }
+	virtual String get_caption() const override;
+	virtual String get_category() const override { return "operators"; }
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptIndexSet();
 };
 
 class VisualScriptGlobalConstant : public VisualScriptNode {
-
 	GDCLASS(VisualScriptGlobalConstant, VisualScriptNode);
 
 	int index;
@@ -461,30 +445,29 @@ class VisualScriptGlobalConstant : public VisualScriptNode {
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_category() const { return "constants"; }
+	virtual String get_caption() const override;
+	virtual String get_category() const override { return "constants"; }
 
 	void set_global_constant(int p_which);
 	int get_global_constant();
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptGlobalConstant();
 };
 
 class VisualScriptClassConstant : public VisualScriptNode {
-
 	GDCLASS(VisualScriptClassConstant, VisualScriptNode);
 
 	StringName base_type;
@@ -492,22 +475,22 @@ class VisualScriptClassConstant : public VisualScriptNode {
 
 protected:
 	static void _bind_methods();
-	virtual void _validate_property(PropertyInfo &property) const;
+	virtual void _validate_property(PropertyInfo &property) const override;
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_category() const { return "constants"; }
+	virtual String get_caption() const override;
+	virtual String get_category() const override { return "constants"; }
 
 	void set_class_constant(const StringName &p_which);
 	StringName get_class_constant();
@@ -515,13 +498,12 @@ public:
 	void set_base_type(const StringName &p_which);
 	StringName get_base_type();
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptClassConstant();
 };
 
 class VisualScriptBasicTypeConstant : public VisualScriptNode {
-
 	GDCLASS(VisualScriptBasicTypeConstant, VisualScriptNode);
 
 	Variant::Type type;
@@ -529,23 +511,23 @@ class VisualScriptBasicTypeConstant : public VisualScriptNode {
 
 protected:
 	static void _bind_methods();
-	virtual void _validate_property(PropertyInfo &property) const;
+	virtual void _validate_property(PropertyInfo &property) const override;
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_text() const;
-	virtual String get_category() const { return "constants"; }
+	virtual String get_caption() const override;
+	virtual String get_text() const override;
+	virtual String get_category() const override { return "constants"; }
 
 	void set_basic_type_constant(const StringName &p_which);
 	StringName get_basic_type_constant() const;
@@ -553,13 +535,12 @@ public:
 	void set_basic_type(Variant::Type p_which);
 	Variant::Type get_basic_type() const;
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptBasicTypeConstant();
 };
 
 class VisualScriptMathConstant : public VisualScriptNode {
-
 	GDCLASS(VisualScriptMathConstant, VisualScriptNode);
 
 public:
@@ -584,24 +565,24 @@ protected:
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_category() const { return "constants"; }
+	virtual String get_caption() const override;
+	virtual String get_category() const override { return "constants"; }
 
 	void set_math_constant(MathConstant p_which);
 	MathConstant get_math_constant();
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptMathConstant();
 };
@@ -609,108 +590,104 @@ public:
 VARIANT_ENUM_CAST(VisualScriptMathConstant::MathConstant)
 
 class VisualScriptEngineSingleton : public VisualScriptNode {
-
 	GDCLASS(VisualScriptEngineSingleton, VisualScriptNode);
 
 	String singleton;
 
 protected:
-	void _validate_property(PropertyInfo &property) const;
+	void _validate_property(PropertyInfo &property) const override;
 
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_category() const { return "data"; }
+	virtual String get_caption() const override;
+	virtual String get_category() const override { return "data"; }
 
 	void set_singleton(const String &p_string);
 	String get_singleton();
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
-	virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const;
+	virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const override;
 
 	VisualScriptEngineSingleton();
 };
 
 class VisualScriptSceneNode : public VisualScriptNode {
-
 	GDCLASS(VisualScriptSceneNode, VisualScriptNode);
 
 	NodePath path;
 
 protected:
-	virtual void _validate_property(PropertyInfo &property) const;
+	virtual void _validate_property(PropertyInfo &property) const override;
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_category() const { return "data"; }
+	virtual String get_caption() const override;
+	virtual String get_category() const override { return "data"; }
 
 	void set_node_path(const NodePath &p_path);
 	NodePath get_node_path();
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
-	virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const;
+	virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const override;
 
 	VisualScriptSceneNode();
 };
 
 class VisualScriptSceneTree : public VisualScriptNode {
-
 	GDCLASS(VisualScriptSceneTree, VisualScriptNode);
 
 protected:
-	virtual void _validate_property(PropertyInfo &property) const;
+	virtual void _validate_property(PropertyInfo &property) const override;
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_category() const { return "data"; }
+	virtual String get_caption() const override;
+	virtual String get_category() const override { return "data"; }
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
-	virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const;
+	virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const override;
 
 	VisualScriptSceneTree();
 };
 
 class VisualScriptResourcePath : public VisualScriptNode {
-
 	GDCLASS(VisualScriptResourcePath, VisualScriptNode);
 
 	String path;
@@ -719,59 +696,57 @@ protected:
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_category() const { return "data"; }
+	virtual String get_caption() const override;
+	virtual String get_category() const override { return "data"; }
 
 	void set_resource_path(const String &p_path);
 	String get_resource_path();
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptResourcePath();
 };
 
 class VisualScriptSelf : public VisualScriptNode {
-
 	GDCLASS(VisualScriptSelf, VisualScriptNode);
 
 protected:
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_category() const { return "data"; }
+	virtual String get_caption() const override;
+	virtual String get_category() const override { return "data"; }
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
-	virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const;
+	virtual TypeGuess guess_output_type(TypeGuess *p_inputs, int p_output) const override;
 
 	VisualScriptSelf();
 };
 
 class VisualScriptCustomNode : public VisualScriptNode {
-
 	GDCLASS(VisualScriptCustomNode, VisualScriptNode);
 
 protected:
@@ -794,22 +769,22 @@ public:
 		STEP_YIELD_BIT = STEP_SHIFT << 4, //yield (will find VisualScriptFunctionState state in first working memory)
 	};
 
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_text() const;
-	virtual String get_category() const;
+	virtual String get_caption() const override;
+	virtual String get_text() const override;
+	virtual String get_category() const override;
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	void _script_changed();
 
@@ -819,35 +794,33 @@ public:
 VARIANT_ENUM_CAST(VisualScriptCustomNode::StartMode);
 
 class VisualScriptSubCall : public VisualScriptNode {
-
 	GDCLASS(VisualScriptSubCall, VisualScriptNode);
 
 protected:
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_text() const;
-	virtual String get_category() const;
+	virtual String get_caption() const override;
+	virtual String get_text() const override;
+	virtual String get_category() const override;
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptSubCall();
 };
 
 class VisualScriptComment : public VisualScriptNode {
-
 	GDCLASS(VisualScriptComment, VisualScriptNode);
 
 	String title;
@@ -858,20 +831,20 @@ protected:
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_text() const;
-	virtual String get_category() const;
+	virtual String get_caption() const override;
+	virtual String get_text() const override;
+	virtual String get_category() const override;
 
 	void set_title(const String &p_title);
 	String get_title() const;
@@ -882,13 +855,12 @@ public:
 	void set_size(const Size2 &p_size);
 	Size2 get_size() const;
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptComment();
 };
 
 class VisualScriptConstructor : public VisualScriptNode {
-
 	GDCLASS(VisualScriptConstructor, VisualScriptNode);
 
 	Variant::Type type;
@@ -898,19 +870,19 @@ protected:
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_category() const;
+	virtual String get_caption() const override;
+	virtual String get_category() const override;
 
 	void set_constructor_type(Variant::Type p_type);
 	Variant::Type get_constructor_type() const;
@@ -918,13 +890,12 @@ public:
 	void set_constructor(const Dictionary &p_info);
 	Dictionary get_constructor() const;
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptConstructor();
 };
 
 class VisualScriptLocalVar : public VisualScriptNode {
-
 	GDCLASS(VisualScriptLocalVar, VisualScriptNode);
 
 	StringName name;
@@ -934,19 +905,19 @@ protected:
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_category() const;
+	virtual String get_caption() const override;
+	virtual String get_category() const override;
 
 	void set_var_name(const StringName &p_name);
 	StringName get_var_name() const;
@@ -954,13 +925,12 @@ public:
 	void set_var_type(Variant::Type p_type);
 	Variant::Type get_var_type() const;
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptLocalVar();
 };
 
 class VisualScriptLocalVarSet : public VisualScriptNode {
-
 	GDCLASS(VisualScriptLocalVarSet, VisualScriptNode);
 
 	StringName name;
@@ -970,20 +940,20 @@ protected:
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_text() const;
-	virtual String get_category() const;
+	virtual String get_caption() const override;
+	virtual String get_text() const override;
+	virtual String get_category() const override;
 
 	void set_var_name(const StringName &p_name);
 	StringName get_var_name() const;
@@ -991,13 +961,12 @@ public:
 	void set_var_type(Variant::Type p_type);
 	Variant::Type get_var_type() const;
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptLocalVarSet();
 };
 
 class VisualScriptInputAction : public VisualScriptNode {
-
 	GDCLASS(VisualScriptInputAction, VisualScriptNode);
 
 public:
@@ -1012,24 +981,24 @@ public:
 	Mode mode;
 
 protected:
-	virtual void _validate_property(PropertyInfo &property) const;
+	virtual void _validate_property(PropertyInfo &property) const override;
 
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_category() const;
+	virtual String get_caption() const override;
+	virtual String get_category() const override;
 
 	void set_action_name(const StringName &p_name);
 	StringName get_action_name() const;
@@ -1037,7 +1006,7 @@ public:
 	void set_action_mode(Mode p_mode);
 	Mode get_action_mode() const;
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptInputAction();
 };
@@ -1045,7 +1014,6 @@ public:
 VARIANT_ENUM_CAST(VisualScriptInputAction::Mode)
 
 class VisualScriptDeconstruct : public VisualScriptNode {
-
 	GDCLASS(VisualScriptDeconstruct, VisualScriptNode);
 
 	struct Element {
@@ -1061,30 +1029,30 @@ class VisualScriptDeconstruct : public VisualScriptNode {
 	void _set_elem_cache(const Array &p_elements);
 	Array _get_elem_cache() const;
 
-	virtual void _validate_property(PropertyInfo &property) const;
+	virtual void _validate_property(PropertyInfo &property) const override;
 
 protected:
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_category() const;
+	virtual String get_caption() const override;
+	virtual String get_category() const override;
 
 	void set_deconstruct_type(Variant::Type p_type);
 	Variant::Type get_deconstruct_type() const;
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptDeconstruct();
 };
diff --git a/modules/visual_script/visual_script_property_selector.cpp b/modules/visual_script/visual_script_property_selector.cpp
index 99d7ffd05f..3c44faab90 100644
--- a/modules/visual_script/visual_script_property_selector.cpp
+++ b/modules/visual_script/visual_script_property_selector.cpp
@@ -39,30 +39,28 @@
 #include "modules/visual_script/visual_script_func_nodes.h"
 #include "modules/visual_script/visual_script_nodes.h"
 #include "scene/main/node.h"
-#include "scene/main/viewport.h"
+#include "scene/main/window.h"
 
 void VisualScriptPropertySelector::_text_changed(const String &p_newtext) {
 	_update_search();
 }
 
 void VisualScriptPropertySelector::_sbox_input(const Ref<InputEvent> &p_ie) {
-
 	Ref<InputEventKey> k = p_ie;
 
 	if (k.is_valid()) {
-
-		switch (k->get_scancode()) {
+		switch (k->get_keycode()) {
 			case KEY_UP:
 			case KEY_DOWN:
 			case KEY_PAGEUP:
 			case KEY_PAGEDOWN: {
-
 				search_options->call("_gui_input", k);
 				search_box->accept_event();
 
 				TreeItem *root = search_options->get_root();
-				if (!root->get_children())
+				if (!root->get_children()) {
 					break;
+				}
 
 				TreeItem *current = search_options->get_selected();
 
@@ -97,35 +95,37 @@ void VisualScriptPropertySelector::_update_search() {
 	for (List<StringName>::Element *E = base_list.front(); E; E = E->next()) {
 		List<MethodInfo> methods;
 		List<PropertyInfo> props;
-		TreeItem *category = NULL;
-		Ref<Texture> type_icons[Variant::VARIANT_MAX] = {
-			Control::get_icon("Variant", "EditorIcons"),
-			Control::get_icon("bool", "EditorIcons"),
-			Control::get_icon("int", "EditorIcons"),
-			Control::get_icon("float", "EditorIcons"),
-			Control::get_icon("String", "EditorIcons"),
-			Control::get_icon("Vector2", "EditorIcons"),
-			Control::get_icon("Rect2", "EditorIcons"),
-			Control::get_icon("Vector3", "EditorIcons"),
-			Control::get_icon("Transform2D", "EditorIcons"),
-			Control::get_icon("Plane", "EditorIcons"),
-			Control::get_icon("Quat", "EditorIcons"),
-			Control::get_icon("AABB", "EditorIcons"),
-			Control::get_icon("Basis", "EditorIcons"),
-			Control::get_icon("Transform", "EditorIcons"),
-			Control::get_icon("Color", "EditorIcons"),
-			Control::get_icon("Path", "EditorIcons"),
-			Control::get_icon("RID", "EditorIcons"),
-			Control::get_icon("Object", "EditorIcons"),
-			Control::get_icon("Dictionary", "EditorIcons"),
-			Control::get_icon("Array", "EditorIcons"),
-			Control::get_icon("PoolByteArray", "EditorIcons"),
-			Control::get_icon("PoolIntArray", "EditorIcons"),
-			Control::get_icon("PoolRealArray", "EditorIcons"),
-			Control::get_icon("PoolStringArray", "EditorIcons"),
-			Control::get_icon("PoolVector2Array", "EditorIcons"),
-			Control::get_icon("PoolVector3Array", "EditorIcons"),
-			Control::get_icon("PoolColorArray", "EditorIcons")
+		TreeItem *category = nullptr;
+		Ref<Texture2D> type_icons[Variant::VARIANT_MAX] = {
+			vbc->get_theme_icon("Variant", "EditorIcons"),
+			vbc->get_theme_icon("bool", "EditorIcons"),
+			vbc->get_theme_icon("int", "EditorIcons"),
+			vbc->get_theme_icon("float", "EditorIcons"),
+			vbc->get_theme_icon("String", "EditorIcons"),
+			vbc->get_theme_icon("Vector2", "EditorIcons"),
+			vbc->get_theme_icon("Rect2", "EditorIcons"),
+			vbc->get_theme_icon("Vector3", "EditorIcons"),
+			vbc->get_theme_icon("Transform2D", "EditorIcons"),
+			vbc->get_theme_icon("Plane", "EditorIcons"),
+			vbc->get_theme_icon("Quat", "EditorIcons"),
+			vbc->get_theme_icon("AABB", "EditorIcons"),
+			vbc->get_theme_icon("Basis", "EditorIcons"),
+			vbc->get_theme_icon("Transform", "EditorIcons"),
+			vbc->get_theme_icon("Color", "EditorIcons"),
+			vbc->get_theme_icon("Path", "EditorIcons"),
+			vbc->get_theme_icon("RID", "EditorIcons"),
+			vbc->get_theme_icon("Object", "EditorIcons"),
+			vbc->get_theme_icon("Dictionary", "EditorIcons"),
+			vbc->get_theme_icon("Array", "EditorIcons"),
+			vbc->get_theme_icon("PackedByteArray", "EditorIcons"),
+			vbc->get_theme_icon("PackedInt32Array", "EditorIcons"),
+			vbc->get_theme_icon("PackedFloat32Array", "EditorIcons"),
+			vbc->get_theme_icon("PackedInt64Array", "EditorIcons"),
+			vbc->get_theme_icon("PackedFloat64Array", "EditorIcons"),
+			vbc->get_theme_icon("PackedStringArray", "EditorIcons"),
+			vbc->get_theme_icon("PackedVector2Array", "EditorIcons"),
+			vbc->get_theme_icon("PackedVector3Array", "EditorIcons"),
+			vbc->get_theme_icon("PackedColorArray", "EditorIcons")
 		};
 		{
 			String b = String(E->get());
@@ -133,7 +133,7 @@ void VisualScriptPropertySelector::_update_search() {
 			if (category) {
 				category->set_text(0, b.replace_first("*", ""));
 				category->set_selectable(0, false);
-				Ref<Texture> icon;
+				Ref<Texture2D> icon;
 				String rep = b.replace("*", "");
 				icon = EditorNode::get_singleton()->get_class_icon(rep);
 				category->set_icon(0, icon);
@@ -151,11 +151,13 @@ void VisualScriptPropertySelector::_update_search() {
 				}
 			}
 			for (List<PropertyInfo>::Element *F = props.front(); F; F = F->next()) {
-				if (!(F->get().usage & PROPERTY_USAGE_EDITOR) && !(F->get().usage & PROPERTY_USAGE_SCRIPT_VARIABLE))
+				if (!(F->get().usage & PROPERTY_USAGE_EDITOR) && !(F->get().usage & PROPERTY_USAGE_SCRIPT_VARIABLE)) {
 					continue;
+				}
 
-				if (type_filter.size() && type_filter.find(F->get().type) == -1)
+				if (type_filter.size() && type_filter.find(F->get().type) == -1) {
 					continue;
+				}
 
 				// capitalize() also converts underscore to space, we'll match again both possible styles
 				String get_text_raw = String(vformat(TTR("Get %s"), F->get().name));
@@ -170,7 +172,7 @@ void VisualScriptPropertySelector::_update_search() {
 					item->set_metadata(0, F->get().name);
 					item->set_icon(0, type_icons[F->get().type]);
 					item->set_metadata(1, "get");
-					item->set_collapsed(1);
+					item->set_collapsed(true);
 					item->set_selectable(0, true);
 					item->set_selectable(1, false);
 					item->set_selectable(2, false);
@@ -193,11 +195,10 @@ void VisualScriptPropertySelector::_update_search() {
 		{
 			if (type != Variant::NIL) {
 				Variant v;
-				Variant::CallError ce;
-				v = Variant::construct(type, NULL, 0, ce);
+				Callable::CallError ce;
+				v = Variant::construct(type, nullptr, 0, ce);
 				v.get_method_list(&methods);
 			} else {
-
 				Object *obj = ObjectDB::get_instance(script);
 				if (Object::cast_to<Script>(obj)) {
 					Object::cast_to<Script>(obj)->get_script_method_list(&methods);
@@ -207,23 +208,24 @@ void VisualScriptPropertySelector::_update_search() {
 			}
 		}
 		for (List<MethodInfo>::Element *M = methods.front(); M; M = M->next()) {
-
 			String name = M->get().name.get_slice(":", 0);
-			if (name.begins_with("_") && !(M->get().flags & METHOD_FLAG_VIRTUAL))
+			if (name.begins_with("_") && !(M->get().flags & METHOD_FLAG_VIRTUAL)) {
 				continue;
+			}
 
-			if (virtuals_only && !(M->get().flags & METHOD_FLAG_VIRTUAL))
+			if (virtuals_only && !(M->get().flags & METHOD_FLAG_VIRTUAL)) {
 				continue;
+			}
 
-			if (!virtuals_only && (M->get().flags & METHOD_FLAG_VIRTUAL))
+			if (!virtuals_only && (M->get().flags & METHOD_FLAG_VIRTUAL)) {
 				continue;
+			}
 
 			MethodInfo mi = M->get();
 			String desc_arguments;
 			if (mi.arguments.size() > 0) {
 				desc_arguments = "(";
 				for (int i = 0; i < mi.arguments.size(); i++) {
-
 					if (i > 0) {
 						desc_arguments += ", ";
 					}
@@ -250,19 +252,19 @@ void VisualScriptPropertySelector::_update_search() {
 
 			TreeItem *item = search_options->create_item(category ? category : root);
 			item->set_text(0, desc);
-			item->set_icon(0, get_icon("MemberMethod", "EditorIcons"));
+			item->set_icon(0, vbc->get_theme_icon("MemberMethod", "EditorIcons"));
 			item->set_metadata(0, name);
 			item->set_selectable(0, true);
 
 			item->set_metadata(1, "method");
-			item->set_collapsed(1);
+			item->set_collapsed(true);
 			item->set_selectable(1, false);
 
 			item->set_selectable(2, false);
 			item->set_metadata(2, connecting);
 		}
 
-		if (category && category->get_children() == NULL) {
+		if (category && category->get_children() == nullptr) {
 			memdelete(category); //old category was unused
 		}
 	}
@@ -279,7 +281,7 @@ void VisualScriptPropertySelector::_update_search() {
 			if (type == Variant::BOOL) {
 				get_visual_node_names("operators/logic/", Set<String>(), found, root, search_box);
 			}
-			if (type == Variant::BOOL || type == Variant::INT || type == Variant::REAL || type == Variant::VECTOR2 || type == Variant::VECTOR3) {
+			if (type == Variant::BOOL || type == Variant::INT || type == Variant::FLOAT || type == Variant::VECTOR2 || type == Variant::VECTOR3) {
 				get_visual_node_names("operators/math/", Set<String>(), found, root, search_box);
 			}
 		}
@@ -302,23 +304,23 @@ void VisualScriptPropertySelector::_update_search() {
 	}
 
 	TreeItem *selected_item = search_options->search_item_text(search_box->get_text());
-	if (!found && selected_item != NULL) {
+	if (!found && selected_item != nullptr) {
 		selected_item->select(0);
 		found = true;
 	}
 
-	get_ok()->set_disabled(root->get_children() == NULL);
+	get_ok()->set_disabled(root->get_children() == nullptr);
 }
 
 void VisualScriptPropertySelector::create_visualscript_item(const String &name, TreeItem *const root, const String &search_input, const String &text) {
 	if (search_input == String() || text.findn(search_input) != -1) {
 		TreeItem *item = search_options->create_item(root);
 		item->set_text(0, text);
-		item->set_icon(0, get_icon("VisualScript", "EditorIcons"));
+		item->set_icon(0, vbc->get_theme_icon("VisualScript", "EditorIcons"));
 		item->set_metadata(0, name);
 		item->set_metadata(1, "action");
 		item->set_selectable(0, true);
-		item->set_collapsed(1);
+		item->set_collapsed(true);
 		item->set_selectable(1, false);
 		item->set_selectable(2, false);
 		item->set_metadata(2, connecting);
@@ -355,10 +357,11 @@ void VisualScriptPropertySelector::get_visual_node_names(const String &root_filt
 			continue;
 		}
 
-		bool in_modifier = false | p_modifiers.empty();
+		bool in_modifier = p_modifiers.empty();
 		for (Set<String>::Element *F = p_modifiers.front(); F && in_modifier; F = F->next()) {
-			if (E->get().findn(F->get()) != -1)
+			if (E->get().findn(F->get()) != -1) {
 				in_modifier = true;
+			}
 		}
 		if (!in_modifier) {
 			continue;
@@ -397,7 +400,7 @@ void VisualScriptPropertySelector::get_visual_node_names(const String &root_filt
 		}
 
 		item->set_text(0, type_name + String("").join(desc));
-		item->set_icon(0, get_icon("VisualScript", "EditorIcons"));
+		item->set_icon(0, vbc->get_theme_icon("VisualScript", "EditorIcons"));
 		item->set_selectable(0, true);
 		item->set_metadata(0, E->get());
 		item->set_selectable(0, true);
@@ -409,21 +412,21 @@ void VisualScriptPropertySelector::get_visual_node_names(const String &root_filt
 }
 
 void VisualScriptPropertySelector::_confirmed() {
-
 	TreeItem *ti = search_options->get_selected();
-	if (!ti)
+	if (!ti) {
 		return;
+	}
 	emit_signal("selected", ti->get_metadata(0), ti->get_metadata(1), ti->get_metadata(2));
-	hide();
+	set_visible(false);
 }
 
 void VisualScriptPropertySelector::_item_selected() {
-
 	help_bit->set_text("");
 
 	TreeItem *item = search_options->get_selected();
-	if (!item)
+	if (!item) {
 		return;
+	}
 	String name = item->get_metadata(0);
 
 	String class_type;
@@ -440,12 +443,11 @@ void VisualScriptPropertySelector::_item_selected() {
 	String at_class = class_type;
 
 	while (at_class != String()) {
-
 		Map<String, DocData::ClassDoc>::Element *E = dd->class_list.find(at_class);
 		if (E) {
 			for (int i = 0; i < E->get().properties.size(); i++) {
 				if (E->get().properties[i].name == name) {
-					text = E->get().properties[i].description;
+					text = DTR(E->get().properties[i].description);
 				}
 			}
 		}
@@ -455,12 +457,11 @@ void VisualScriptPropertySelector::_item_selected() {
 	at_class = class_type;
 
 	while (at_class != String()) {
-
 		Map<String, DocData::ClassDoc>::Element *C = dd->class_list.find(at_class);
 		if (C) {
 			for (int i = 0; i < C->get().methods.size(); i++) {
 				if (C->get().methods[i].name == name) {
-					text = C->get().methods[i].description;
+					text = DTR(C->get().methods[i].description);
 				}
 			}
 		}
@@ -472,14 +473,14 @@ void VisualScriptPropertySelector::_item_selected() {
 		for (int i = 0; i < T->get().methods.size(); i++) {
 			Vector<String> functions = name.rsplit("/", false, 1);
 			if (T->get().methods[i].name == functions[functions.size() - 1]) {
-				text = T->get().methods[i].description;
+				text = DTR(T->get().methods[i].description);
 			}
 		}
 	}
 
 	List<String> *names = memnew(List<String>);
 	VisualScriptLanguage::singleton->get_registered_node_names(names);
-	if (names->find(name) != NULL) {
+	if (names->find(name) != nullptr) {
 		Ref<VisualScriptOperator> operator_node = VisualScriptLanguage::singleton->create_node_from_name(name);
 		if (operator_node.is_valid()) {
 			Map<String, DocData::ClassDoc>::Element *F = dd->class_list.find(operator_node->get_class_name());
@@ -491,7 +492,7 @@ void VisualScriptPropertySelector::_item_selected() {
 		if (typecast_node.is_valid()) {
 			Map<String, DocData::ClassDoc>::Element *F = dd->class_list.find(typecast_node->get_class_name());
 			if (F) {
-				text = F->get().description;
+				text = DTR(F->get().description);
 			}
 		}
 
@@ -501,7 +502,7 @@ void VisualScriptPropertySelector::_item_selected() {
 			if (F) {
 				for (int i = 0; i < F->get().constants.size(); i++) {
 					if (F->get().constants[i].value.to_int() == int(builtin_node->get_func())) {
-						text = F->get().constants[i].description;
+						text = DTR(F->get().constants[i].description);
 					}
 				}
 			}
@@ -510,35 +511,37 @@ void VisualScriptPropertySelector::_item_selected() {
 
 	memdelete(names);
 
-	if (text == String())
+	if (text == String()) {
 		return;
+	}
 
 	help_bit->set_text(text);
 }
 
-void VisualScriptPropertySelector::_notification(int p_what) {
+void VisualScriptPropertySelector::_hide_requested() {
+	_cancel_pressed(); // From AcceptDialog.
+}
 
+void VisualScriptPropertySelector::_notification(int p_what) {
 	if (p_what == NOTIFICATION_ENTER_TREE) {
-
-		connect("confirmed", this, "_confirmed");
+		connect("confirmed", callable_mp(this, &VisualScriptPropertySelector::_confirmed));
 	}
 }
 
 void VisualScriptPropertySelector::select_method_from_base_type(const String &p_base, const String &p_current, const bool p_virtuals_only, const bool p_connecting, bool clear_text) {
-
 	base_type = p_base;
 	selected = p_current;
 	type = Variant::NIL;
-	script = 0;
 	properties = false;
-	instance = NULL;
+	instance = nullptr;
 	virtuals_only = p_virtuals_only;
 
 	show_window(.5f);
-	if (clear_text)
+	if (clear_text) {
 		search_box->set_text("");
-	else
+	} else {
 		search_box->select_all();
+	}
 	search_box->grab_focus();
 	connecting = p_connecting;
 
@@ -550,21 +553,20 @@ void VisualScriptPropertySelector::set_type_filter(const Vector<Variant::Type> &
 }
 
 void VisualScriptPropertySelector::select_from_base_type(const String &p_base, const String &p_current, bool p_virtuals_only, bool p_seq_connect, const bool p_connecting, bool clear_text) {
-
 	base_type = p_base;
 	selected = p_current;
 	type = Variant::NIL;
-	script = 0;
 	properties = true;
 	visual_script_generic = false;
-	instance = NULL;
+	instance = nullptr;
 	virtuals_only = p_virtuals_only;
 
 	show_window(.5f);
-	if (clear_text)
+	if (clear_text) {
 		search_box->set_text("");
-	else
+	} else {
 		search_box->select_all();
+	}
 	search_box->grab_focus();
 	seq_connect = p_seq_connect;
 	connecting = p_connecting;
@@ -581,14 +583,15 @@ void VisualScriptPropertySelector::select_from_script(const Ref<Script> &p_scrip
 	script = p_script->get_instance_id();
 	properties = true;
 	visual_script_generic = false;
-	instance = NULL;
+	instance = nullptr;
 	virtuals_only = false;
 
 	show_window(.5f);
-	if (clear_text)
+	if (clear_text) {
 		search_box->set_text("");
-	else
+	} else {
 		search_box->select_all();
+	}
 	search_box->grab_focus();
 	seq_connect = false;
 	connecting = p_connecting;
@@ -601,17 +604,17 @@ void VisualScriptPropertySelector::select_from_basic_type(Variant::Type p_type,
 	base_type = "";
 	selected = p_current;
 	type = p_type;
-	script = 0;
 	properties = true;
 	visual_script_generic = false;
-	instance = NULL;
+	instance = nullptr;
 	virtuals_only = false;
 
 	show_window(.5f);
-	if (clear_text)
+	if (clear_text) {
 		search_box->set_text("");
-	else
+	} else {
 		search_box->select_all();
+	}
 	search_box->grab_focus();
 	seq_connect = false;
 	connecting = p_connecting;
@@ -623,17 +626,17 @@ void VisualScriptPropertySelector::select_from_action(const String &p_type, cons
 	base_type = p_type;
 	selected = p_current;
 	type = Variant::NIL;
-	script = 0;
 	properties = false;
 	visual_script_generic = false;
-	instance = NULL;
+	instance = nullptr;
 	virtuals_only = false;
 
 	show_window(.5f);
-	if (clear_text)
+	if (clear_text) {
 		search_box->set_text("");
-	else
+	} else {
 		search_box->select_all();
+	}
 	search_box->grab_focus();
 	seq_connect = true;
 	connecting = p_connecting;
@@ -645,17 +648,17 @@ void VisualScriptPropertySelector::select_from_instance(Object *p_instance, cons
 	base_type = p_basetype;
 	selected = p_current;
 	type = Variant::NIL;
-	script = 0;
 	properties = true;
 	visual_script_generic = false;
 	instance = p_instance;
 	virtuals_only = false;
 
 	show_window(.5f);
-	if (clear_text)
+	if (clear_text) {
 		search_box->set_text("");
-	else
+	} else {
 		search_box->select_all();
+	}
 	search_box->grab_focus();
 	seq_connect = false;
 	connecting = p_connecting;
@@ -667,16 +670,16 @@ void VisualScriptPropertySelector::select_from_visual_script(const String &p_bas
 	base_type = p_base;
 	selected = "";
 	type = Variant::NIL;
-	script = 0;
 	properties = true;
 	visual_script_generic = true;
-	instance = NULL;
+	instance = nullptr;
 	virtuals_only = false;
 	show_window(.5f);
-	if (clear_text)
+	if (clear_text) {
 		search_box->set_text("");
-	else
+	} else {
 		search_box->select_all();
+	}
 	search_box->grab_focus();
 	connecting = p_connecting;
 
@@ -684,48 +687,36 @@ void VisualScriptPropertySelector::select_from_visual_script(const String &p_bas
 }
 
 void VisualScriptPropertySelector::show_window(float p_screen_ratio) {
-	Rect2 rect;
-	Point2 window_size = get_viewport_rect().size;
-	rect.size = (window_size * p_screen_ratio).floor();
-	rect.size.x = rect.size.x / 2.2f;
-	rect.position = ((window_size - rect.size) / 2.0f).floor();
-	popup(rect);
+	popup_centered_ratio(p_screen_ratio);
 }
 
 void VisualScriptPropertySelector::_bind_methods() {
-
-	ClassDB::bind_method(D_METHOD("_text_changed"), &VisualScriptPropertySelector::_text_changed);
-	ClassDB::bind_method(D_METHOD("_confirmed"), &VisualScriptPropertySelector::_confirmed);
-	ClassDB::bind_method(D_METHOD("_sbox_input"), &VisualScriptPropertySelector::_sbox_input);
-	ClassDB::bind_method(D_METHOD("_item_selected"), &VisualScriptPropertySelector::_item_selected);
-
 	ADD_SIGNAL(MethodInfo("selected", PropertyInfo(Variant::STRING, "name"), PropertyInfo(Variant::STRING, "category"), PropertyInfo(Variant::BOOL, "connecting")));
 }
 
 VisualScriptPropertySelector::VisualScriptPropertySelector() {
-
-	VBoxContainer *vbc = memnew(VBoxContainer);
+	vbc = memnew(VBoxContainer);
 	add_child(vbc);
 	//set_child_rect(vbc);
 	search_box = memnew(LineEdit);
 	vbc->add_margin_child(TTR("Search:"), search_box);
-	search_box->connect("text_changed", this, "_text_changed");
-	search_box->connect("gui_input", this, "_sbox_input");
+	search_box->connect("text_changed", callable_mp(this, &VisualScriptPropertySelector::_text_changed));
+	search_box->connect("gui_input", callable_mp(this, &VisualScriptPropertySelector::_sbox_input));
 	search_options = memnew(Tree);
 	vbc->add_margin_child(TTR("Matches:"), search_options, true);
 	get_ok()->set_text(TTR("Open"));
 	get_ok()->set_disabled(true);
 	register_text_enter(search_box);
 	set_hide_on_ok(false);
-	search_options->connect("item_activated", this, "_confirmed");
-	search_options->connect("cell_selected", this, "_item_selected");
+	search_options->connect("item_activated", callable_mp(this, &VisualScriptPropertySelector::_confirmed));
+	search_options->connect("cell_selected", callable_mp(this, &VisualScriptPropertySelector::_item_selected));
 	search_options->set_hide_root(true);
 	search_options->set_hide_folding(true);
 	virtuals_only = false;
 	seq_connect = false;
 	help_bit = memnew(EditorHelpBit);
 	vbc->add_margin_child(TTR("Description:"), help_bit);
-	help_bit->connect("request_hide", this, "_closed");
+	help_bit->connect("request_hide", callable_mp(this, &VisualScriptPropertySelector::_hide_requested));
 	search_options->set_columns(3);
 	search_options->set_column_expand(1, false);
 	search_options->set_column_expand(2, false);
diff --git a/modules/visual_script/visual_script_property_selector.h b/modules/visual_script/visual_script_property_selector.h
index a1eb0b842c..cc49b2863d 100644
--- a/modules/visual_script/visual_script_property_selector.h
+++ b/modules/visual_script/visual_script_property_selector.h
@@ -41,16 +41,16 @@ class VisualScriptPropertySelector : public ConfirmationDialog {
 	LineEdit *search_box;
 	Tree *search_options;
 
+	void _text_changed(const String &p_newtext);
+	void _sbox_input(const Ref<InputEvent> &p_ie);
 	void _update_search();
 
 	void create_visualscript_item(const String &name, TreeItem *const root, const String &search_input, const String &text);
-
 	void get_visual_node_names(const String &root_filter, const Set<String> &p_modifiers, bool &found, TreeItem *const root, LineEdit *const search_box);
 
-	void _sbox_input(const Ref<InputEvent> &p_ie);
-
 	void _confirmed();
-	void _text_changed(const String &p_newtext);
+	void _item_selected();
+	void _hide_requested();
 
 	EditorHelpBit *help_bit;
 
@@ -64,8 +64,7 @@ class VisualScriptPropertySelector : public ConfirmationDialog {
 	Object *instance;
 	bool virtuals_only;
 	bool seq_connect;
-
-	void _item_selected();
+	VBoxContainer *vbc;
 
 	Vector<Variant::Type> type_filter;
 
diff --git a/modules/visual_script/visual_script_yield_nodes.cpp b/modules/visual_script/visual_script_yield_nodes.cpp
index 877d5836d2..dd07cc45a7 100644
--- a/modules/visual_script/visual_script_yield_nodes.cpp
+++ b/modules/visual_script/visual_script_yield_nodes.cpp
@@ -40,51 +40,51 @@
 //////////////////////////////////////////
 
 int VisualScriptYield::get_output_sequence_port_count() const {
-
 	return 1;
 }
 
 bool VisualScriptYield::has_input_sequence_port() const {
-
 	return true;
 }
 
 int VisualScriptYield::get_input_value_port_count() const {
-
 	return 0;
 }
-int VisualScriptYield::get_output_value_port_count() const {
 
+int VisualScriptYield::get_output_value_port_count() const {
 	return 0;
 }
 
 String VisualScriptYield::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 PropertyInfo VisualScriptYield::get_input_value_port_info(int p_idx) const {
-
 	return PropertyInfo();
 }
 
 PropertyInfo VisualScriptYield::get_output_value_port_info(int p_idx) const {
-
 	return PropertyInfo();
 }
 
 String VisualScriptYield::get_caption() const {
-
 	return yield_mode == YIELD_RETURN ? "Yield" : "Wait";
 }
 
 String VisualScriptYield::get_text() const {
-
 	switch (yield_mode) {
-		case YIELD_RETURN: return ""; break;
-		case YIELD_FRAME: return "Next Frame"; break;
-		case YIELD_PHYSICS_FRAME: return "Next Physics Frame"; break;
-		case YIELD_WAIT: return rtos(wait_time) + " sec(s)"; break;
+		case YIELD_RETURN:
+			return "";
+			break;
+		case YIELD_FRAME:
+			return "Next Frame";
+			break;
+		case YIELD_PHYSICS_FRAME:
+			return "Next Physics Frame";
+			break;
+		case YIELD_WAIT:
+			return rtos(wait_time) + " sec(s)";
+			break;
 	}
 
 	return String();
@@ -99,8 +99,7 @@ public:
 	//virtual bool is_output_port_unsequenced(int p_idx) const { return false; }
 	//virtual bool get_output_port_unsequenced(int p_idx,Variant* r_value,Variant* p_working_mem,String &r_error) const { return false; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		if (p_start_mode == START_MODE_RESUME_YIELD) {
 			return 0; //resuming yield
 		} else {
@@ -109,7 +108,7 @@ public:
 			SceneTree *tree = Object::cast_to<SceneTree>(OS::get_singleton()->get_main_loop());
 			if (!tree) {
 				r_error_str = "Main Loop is not SceneTree";
-				r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+				r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 				return 0;
 			}
 
@@ -118,13 +117,18 @@ public:
 
 			int ret = STEP_YIELD_BIT;
 			switch (mode) {
-
 				case VisualScriptYield::YIELD_RETURN:
 					ret = STEP_EXIT_FUNCTION_BIT;
 					break; //return the yield
-				case VisualScriptYield::YIELD_FRAME: state->connect_to_signal(tree, "idle_frame", Array()); break;
-				case VisualScriptYield::YIELD_PHYSICS_FRAME: state->connect_to_signal(tree, "physics_frame", Array()); break;
-				case VisualScriptYield::YIELD_WAIT: state->connect_to_signal(tree->create_timer(wait_time).ptr(), "timeout", Array()); break;
+				case VisualScriptYield::YIELD_FRAME:
+					state->connect_to_signal(tree, "idle_frame", Array());
+					break;
+				case VisualScriptYield::YIELD_PHYSICS_FRAME:
+					state->connect_to_signal(tree, "physics_frame", Array());
+					break;
+				case VisualScriptYield::YIELD_WAIT:
+					state->connect_to_signal(tree->create_timer(wait_time).ptr(), "timeout", Array());
+					break;
 			}
 
 			*p_working_mem = state;
@@ -135,7 +139,6 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptYield::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceYield *instance = memnew(VisualScriptNodeInstanceYield);
 	//instance->instance=p_instance;
 	instance->mode = yield_mode;
@@ -144,34 +147,31 @@ VisualScriptNodeInstance *VisualScriptYield::instance(VisualScriptInstance *p_in
 }
 
 void VisualScriptYield::set_yield_mode(YieldMode p_mode) {
-
-	if (yield_mode == p_mode)
+	if (yield_mode == p_mode) {
 		return;
+	}
 	yield_mode = p_mode;
 	ports_changed_notify();
 	_change_notify();
 }
 
 VisualScriptYield::YieldMode VisualScriptYield::get_yield_mode() {
-
 	return yield_mode;
 }
 
 void VisualScriptYield::set_wait_time(float p_time) {
-
-	if (wait_time == p_time)
+	if (wait_time == p_time) {
 		return;
+	}
 	wait_time = p_time;
 	ports_changed_notify();
 }
 
 float VisualScriptYield::get_wait_time() {
-
 	return wait_time;
 }
 
 void VisualScriptYield::_validate_property(PropertyInfo &property) const {
-
 	if (property.name == "wait_time") {
 		if (yield_mode != YIELD_WAIT) {
 			property.usage = 0;
@@ -180,7 +180,6 @@ void VisualScriptYield::_validate_property(PropertyInfo &property) const {
 }
 
 void VisualScriptYield::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_yield_mode", "mode"), &VisualScriptYield::set_yield_mode);
 	ClassDB::bind_method(D_METHOD("get_yield_mode"), &VisualScriptYield::get_yield_mode);
 
@@ -188,7 +187,7 @@ void VisualScriptYield::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_wait_time"), &VisualScriptYield::get_wait_time);
 
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "mode", PROPERTY_HINT_ENUM, "Frame,Physics Frame,Time", PROPERTY_USAGE_NOEDITOR), "set_yield_mode", "get_yield_mode");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "wait_time"), "set_wait_time", "get_wait_time");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "wait_time"), "set_wait_time", "get_wait_time");
 
 	BIND_ENUM_CONSTANT(YIELD_FRAME);
 	BIND_ENUM_CONSTANT(YIELD_PHYSICS_FRAME);
@@ -196,14 +195,12 @@ void VisualScriptYield::_bind_methods() {
 }
 
 VisualScriptYield::VisualScriptYield() {
-
 	yield_mode = YIELD_FRAME;
 	wait_time = 1;
 }
 
 template <VisualScriptYield::YieldMode MODE>
 static Ref<VisualScriptNode> create_yield_node(const String &p_name) {
-
 	Ref<VisualScriptYield> node;
 	node.instance();
 	node->set_yield_mode(MODE);
@@ -215,126 +212,129 @@ static Ref<VisualScriptNode> create_yield_node(const String &p_name) {
 //////////////////////////////////////////////////
 
 int VisualScriptYieldSignal::get_output_sequence_port_count() const {
-
 	return 1;
 }
 
 bool VisualScriptYieldSignal::has_input_sequence_port() const {
-
 	return true;
 }
 #ifdef TOOLS_ENABLED
 
 static Node *_find_script_node(Node *p_edited_scene, Node *p_current_node, const Ref<Script> &script) {
-
-	if (p_edited_scene != p_current_node && p_current_node->get_owner() != p_edited_scene)
-		return NULL;
+	if (p_edited_scene != p_current_node && p_current_node->get_owner() != p_edited_scene) {
+		return nullptr;
+	}
 
 	Ref<Script> scr = p_current_node->get_script();
 
-	if (scr.is_valid() && scr == script)
+	if (scr.is_valid() && scr == script) {
 		return p_current_node;
+	}
 
 	for (int i = 0; i < p_current_node->get_child_count(); i++) {
 		Node *n = _find_script_node(p_edited_scene, p_current_node->get_child(i), script);
-		if (n)
+		if (n) {
 			return n;
+		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 #endif
 Node *VisualScriptYieldSignal::_get_base_node() const {
-
 #ifdef TOOLS_ENABLED
 	Ref<Script> script = get_visual_script();
-	if (!script.is_valid())
-		return NULL;
+	if (!script.is_valid()) {
+		return nullptr;
+	}
 
 	MainLoop *main_loop = OS::get_singleton()->get_main_loop();
 	SceneTree *scene_tree = Object::cast_to<SceneTree>(main_loop);
 
-	if (!scene_tree)
-		return NULL;
+	if (!scene_tree) {
+		return nullptr;
+	}
 
 	Node *edited_scene = scene_tree->get_edited_scene_root();
 
-	if (!edited_scene)
-		return NULL;
+	if (!edited_scene) {
+		return nullptr;
+	}
 
 	Node *script_node = _find_script_node(edited_scene, edited_scene, script);
 
-	if (!script_node)
-		return NULL;
+	if (!script_node) {
+		return nullptr;
+	}
 
-	if (!script_node->has_node(base_path))
-		return NULL;
+	if (!script_node->has_node(base_path)) {
+		return nullptr;
+	}
 
 	Node *path_to = script_node->get_node(base_path);
 
 	return path_to;
 #else
 
-	return NULL;
+	return nullptr;
 #endif
 }
 
 StringName VisualScriptYieldSignal::_get_base_type() const {
-
-	if (call_mode == CALL_MODE_SELF && get_visual_script().is_valid())
+	if (call_mode == CALL_MODE_SELF && get_visual_script().is_valid()) {
 		return get_visual_script()->get_instance_base_type();
-	else if (call_mode == CALL_MODE_NODE_PATH && get_visual_script().is_valid()) {
+	} else if (call_mode == CALL_MODE_NODE_PATH && get_visual_script().is_valid()) {
 		Node *path = _get_base_node();
-		if (path)
+		if (path) {
 			return path->get_class();
+		}
 	}
 
 	return base_type;
 }
 
 int VisualScriptYieldSignal::get_input_value_port_count() const {
-
-	if (call_mode == CALL_MODE_INSTANCE)
+	if (call_mode == CALL_MODE_INSTANCE) {
 		return 1;
-	else
+	} else {
 		return 0;
+	}
 }
-int VisualScriptYieldSignal::get_output_value_port_count() const {
 
+int VisualScriptYieldSignal::get_output_value_port_count() const {
 	MethodInfo sr;
 
-	if (!ClassDB::get_signal(_get_base_type(), signal, &sr))
+	if (!ClassDB::get_signal(_get_base_type(), signal, &sr)) {
 		return 0;
+	}
 
 	return sr.arguments.size();
 }
 
 String VisualScriptYieldSignal::get_output_sequence_port_text(int p_port) const {
-
 	return String();
 }
 
 PropertyInfo VisualScriptYieldSignal::get_input_value_port_info(int p_idx) const {
-
-	if (call_mode == CALL_MODE_INSTANCE)
+	if (call_mode == CALL_MODE_INSTANCE) {
 		return PropertyInfo(Variant::OBJECT, "instance");
-	else
+	} else {
 		return PropertyInfo();
+	}
 }
 
 PropertyInfo VisualScriptYieldSignal::get_output_value_port_info(int p_idx) const {
-
 	MethodInfo sr;
 
-	if (!ClassDB::get_signal(_get_base_type(), signal, &sr))
+	if (!ClassDB::get_signal(_get_base_type(), signal, &sr)) {
 		return PropertyInfo(); //no signal
+	}
 	ERR_FAIL_INDEX_V(p_idx, sr.arguments.size(), PropertyInfo());
 	return sr.arguments[p_idx];
 }
 
 String VisualScriptYieldSignal::get_caption() const {
-
 	static const char *cname[3] = {
 		"WaitSignal",
 		"WaitNodeSignal",
@@ -345,17 +345,17 @@ String VisualScriptYieldSignal::get_caption() const {
 }
 
 String VisualScriptYieldSignal::get_text() const {
-
-	if (call_mode == CALL_MODE_SELF)
+	if (call_mode == CALL_MODE_SELF) {
 		return "  " + String(signal) + "()";
-	else
+	} else {
 		return "  " + _get_base_type() + "." + String(signal) + "()";
+	}
 }
 
 void VisualScriptYieldSignal::set_base_type(const StringName &p_type) {
-
-	if (base_type == p_type)
+	if (base_type == p_type) {
 		return;
+	}
 
 	base_type = p_type;
 
@@ -364,29 +364,28 @@ void VisualScriptYieldSignal::set_base_type(const StringName &p_type) {
 }
 
 StringName VisualScriptYieldSignal::get_base_type() const {
-
 	return base_type;
 }
 
 void VisualScriptYieldSignal::set_signal(const StringName &p_type) {
-
-	if (signal == p_type)
+	if (signal == p_type) {
 		return;
+	}
 
 	signal = p_type;
 
 	_change_notify();
 	ports_changed_notify();
 }
-StringName VisualScriptYieldSignal::get_signal() const {
 
+StringName VisualScriptYieldSignal::get_signal() const {
 	return signal;
 }
 
 void VisualScriptYieldSignal::set_base_path(const NodePath &p_type) {
-
-	if (base_path == p_type)
+	if (base_path == p_type) {
 		return;
+	}
 
 	base_path = p_type;
 
@@ -395,14 +394,13 @@ void VisualScriptYieldSignal::set_base_path(const NodePath &p_type) {
 }
 
 NodePath VisualScriptYieldSignal::get_base_path() const {
-
 	return base_path;
 }
 
 void VisualScriptYieldSignal::set_call_mode(CallMode p_mode) {
-
-	if (call_mode == p_mode)
+	if (call_mode == p_mode) {
 		return;
+	}
 
 	call_mode = p_mode;
 
@@ -411,12 +409,10 @@ void VisualScriptYieldSignal::set_call_mode(CallMode p_mode) {
 }
 
 VisualScriptYieldSignal::CallMode VisualScriptYieldSignal::get_call_mode() const {
-
 	return call_mode;
 }
 
 void VisualScriptYieldSignal::_validate_property(PropertyInfo &property) const {
-
 	if (property.name == "base_type") {
 		if (call_mode != CALL_MODE_INSTANCE) {
 			property.usage = PROPERTY_USAGE_NOEDITOR;
@@ -427,7 +423,6 @@ void VisualScriptYieldSignal::_validate_property(PropertyInfo &property) const {
 		if (call_mode != CALL_MODE_NODE_PATH) {
 			property.usage = 0;
 		} else {
-
 			Node *bnode = _get_base_node();
 			if (bnode) {
 				property.hint_string = bnode->get_path(); //convert to loong string
@@ -444,8 +439,9 @@ void VisualScriptYieldSignal::_validate_property(PropertyInfo &property) const {
 
 		List<String> mstring;
 		for (List<MethodInfo>::Element *E = methods.front(); E; E = E->next()) {
-			if (E->get().name.begins_with("_"))
+			if (E->get().name.begins_with("_")) {
 				continue;
+			}
 			mstring.push_back(E->get().name.get_slice(":", 0));
 		}
 
@@ -453,9 +449,9 @@ void VisualScriptYieldSignal::_validate_property(PropertyInfo &property) const {
 
 		String ml;
 		for (List<String>::Element *E = mstring.front(); E; E = E->next()) {
-
-			if (ml != String())
+			if (ml != String()) {
 				ml += ",";
+			}
 			ml += E->get();
 		}
 
@@ -464,7 +460,6 @@ void VisualScriptYieldSignal::_validate_property(PropertyInfo &property) const {
 }
 
 void VisualScriptYieldSignal::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_base_type", "base_type"), &VisualScriptYieldSignal::set_base_type);
 	ClassDB::bind_method(D_METHOD("get_base_type"), &VisualScriptYieldSignal::get_base_type);
 
@@ -479,8 +474,9 @@ void VisualScriptYieldSignal::_bind_methods() {
 
 	String bt;
 	for (int i = 0; i < Variant::VARIANT_MAX; i++) {
-		if (i > 0)
+		if (i > 0) {
 			bt += ",";
+		}
 
 		bt += Variant::get_type_name(Variant::Type(i));
 	}
@@ -509,34 +505,30 @@ public:
 	//virtual bool is_output_port_unsequenced(int p_idx) const { return false; }
 	//virtual bool get_output_port_unsequenced(int p_idx,Variant* r_value,Variant* p_working_mem,String &r_error) const { return true; }
 
-	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Variant::CallError &r_error, String &r_error_str) {
-
+	virtual int step(const Variant **p_inputs, Variant **p_outputs, StartMode p_start_mode, Variant *p_working_mem, Callable::CallError &r_error, String &r_error_str) {
 		if (p_start_mode == START_MODE_RESUME_YIELD) {
 			return 0; //resuming yield
 		} else {
 			//yield
 
-			Object *object = NULL;
+			Object *object = nullptr;
 
 			switch (call_mode) {
-
 				case VisualScriptYieldSignal::CALL_MODE_SELF: {
-
 					object = instance->get_owner_ptr();
 
 				} break;
 				case VisualScriptYieldSignal::CALL_MODE_NODE_PATH: {
-
 					Node *node = Object::cast_to<Node>(instance->get_owner_ptr());
 					if (!node) {
-						r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+						r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 						r_error_str = "Base object is not a Node!";
 						return 0;
 					}
 
 					Node *another = node->get_node(node_path);
 					if (!another) {
-						r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+						r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 						r_error_str = "Path does not lead Node!";
 						return 0;
 					}
@@ -545,10 +537,9 @@ public:
 
 				} break;
 				case VisualScriptYieldSignal::CALL_MODE_INSTANCE: {
-
 					object = *p_inputs[0];
 					if (!object) {
-						r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+						r_error.error = Callable::CallError::CALL_ERROR_INVALID_METHOD;
 						r_error_str = "Supplied instance input is null.";
 						return 0;
 					}
@@ -569,7 +560,6 @@ public:
 };
 
 VisualScriptNodeInstance *VisualScriptYieldSignal::instance(VisualScriptInstance *p_instance) {
-
 	VisualScriptNodeInstanceYieldSignal *instance = memnew(VisualScriptNodeInstanceYieldSignal);
 	instance->node = this;
 	instance->instance = p_instance;
@@ -579,15 +569,14 @@ VisualScriptNodeInstance *VisualScriptYieldSignal::instance(VisualScriptInstance
 	instance->output_args = get_output_value_port_count();
 	return instance;
 }
-VisualScriptYieldSignal::VisualScriptYieldSignal() {
 
+VisualScriptYieldSignal::VisualScriptYieldSignal() {
 	call_mode = CALL_MODE_SELF;
 	base_type = "Object";
 }
 
 template <VisualScriptYieldSignal::CallMode cmode>
 static Ref<VisualScriptNode> create_yield_signal_node(const String &p_name) {
-
 	Ref<VisualScriptYieldSignal> node;
 	node.instance();
 	node->set_call_mode(cmode);
@@ -595,7 +584,6 @@ static Ref<VisualScriptNode> create_yield_signal_node(const String &p_name) {
 }
 
 void register_visual_script_yield_nodes() {
-
 	VisualScriptLanguage::singleton->add_register_func("functions/wait/wait_frame", create_yield_node<VisualScriptYield::YIELD_FRAME>);
 	VisualScriptLanguage::singleton->add_register_func("functions/wait/wait_physics_frame", create_yield_node<VisualScriptYield::YIELD_PHYSICS_FRAME>);
 	VisualScriptLanguage::singleton->add_register_func("functions/wait/wait_time", create_yield_node<VisualScriptYield::YIELD_WAIT>);
diff --git a/modules/visual_script/visual_script_yield_nodes.h b/modules/visual_script/visual_script_yield_nodes.h
index 4b976bd6c6..7a72211027 100644
--- a/modules/visual_script/visual_script_yield_nodes.h
+++ b/modules/visual_script/visual_script_yield_nodes.h
@@ -34,7 +34,6 @@
 #include "visual_script.h"
 
 class VisualScriptYield : public VisualScriptNode {
-
 	GDCLASS(VisualScriptYield, VisualScriptNode);
 
 public:
@@ -51,25 +50,25 @@ private:
 	float wait_time;
 
 protected:
-	virtual void _validate_property(PropertyInfo &property) const;
+	virtual void _validate_property(PropertyInfo &property) const override;
 
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_text() const;
-	virtual String get_category() const { return "functions"; }
+	virtual String get_caption() const override;
+	virtual String get_text() const override;
+	virtual String get_category() const override { return "functions"; }
 
 	void set_yield_mode(YieldMode p_mode);
 	YieldMode get_yield_mode();
@@ -77,14 +76,13 @@ public:
 	void set_wait_time(float p_time);
 	float get_wait_time();
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptYield();
 };
 VARIANT_ENUM_CAST(VisualScriptYield::YieldMode)
 
 class VisualScriptYieldSignal : public VisualScriptNode {
-
 	GDCLASS(VisualScriptYieldSignal, VisualScriptNode);
 
 public:
@@ -105,25 +103,25 @@ private:
 	StringName _get_base_type() const;
 
 protected:
-	virtual void _validate_property(PropertyInfo &property) const;
+	virtual void _validate_property(PropertyInfo &property) const override;
 
 	static void _bind_methods();
 
 public:
-	virtual int get_output_sequence_port_count() const;
-	virtual bool has_input_sequence_port() const;
+	virtual int get_output_sequence_port_count() const override;
+	virtual bool has_input_sequence_port() const override;
 
-	virtual String get_output_sequence_port_text(int p_port) const;
+	virtual String get_output_sequence_port_text(int p_port) const override;
 
-	virtual int get_input_value_port_count() const;
-	virtual int get_output_value_port_count() const;
+	virtual int get_input_value_port_count() const override;
+	virtual int get_output_value_port_count() const override;
 
-	virtual PropertyInfo get_input_value_port_info(int p_idx) const;
-	virtual PropertyInfo get_output_value_port_info(int p_idx) const;
+	virtual PropertyInfo get_input_value_port_info(int p_idx) const override;
+	virtual PropertyInfo get_output_value_port_info(int p_idx) const override;
 
-	virtual String get_caption() const;
-	virtual String get_text() const;
-	virtual String get_category() const { return "functions"; }
+	virtual String get_caption() const override;
+	virtual String get_text() const override;
+	virtual String get_category() const override { return "functions"; }
 
 	void set_base_type(const StringName &p_type);
 	StringName get_base_type() const;
@@ -137,7 +135,7 @@ public:
 	void set_call_mode(CallMode p_mode);
 	CallMode get_call_mode() const;
 
-	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance);
+	virtual VisualScriptNodeInstance *instance(VisualScriptInstance *p_instance) override;
 
 	VisualScriptYieldSignal();
 };
diff --git a/modules/vorbis/SCsub b/modules/vorbis/SCsub
index 3824fdd789..05d46757d3 100644
--- a/modules/vorbis/SCsub
+++ b/modules/vorbis/SCsub
@@ -1,18 +1,21 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
+
+# Only kept to build the thirdparty library used by the theora and webm
+# modules. We now use stb_vorbis for AudioStreamOGGVorbis.
 
 env_vorbis = env_modules.Clone()
 
 stub = True
 
 # Thirdparty source files
-if env['builtin_libvorbis']:
+if env["builtin_libvorbis"]:
     thirdparty_dir = "#thirdparty/libvorbis/"
     thirdparty_sources = [
-        #"analysis.c",
-        #"barkmel.c",
+        # "analysis.c",
+        # "barkmel.c",
         "bitrate.c",
         "block.c",
         "codebook.c",
@@ -26,14 +29,14 @@ if env['builtin_libvorbis']:
         "mapping0.c",
         "mdct.c",
         "psy.c",
-        #"psytune.c",
+        # "psytune.c",
         "registry.c",
         "res0.c",
         "sharedbook.c",
         "smallft.c",
         "synthesis.c",
-        #"tone.c",
-        #"vorbisenc.c",
+        # "tone.c",
+        # "vorbisenc.c",
         "vorbisfile.c",
         "window.c",
     ]
@@ -43,16 +46,12 @@ if env['builtin_libvorbis']:
     env_vorbis.Prepend(CPPPATH=[thirdparty_dir])
 
     # also requires libogg
-    if env['builtin_libogg']:
+    if env["builtin_libogg"]:
         env_vorbis.Prepend(CPPPATH=["#thirdparty/libogg"])
 
     env_thirdparty = env_vorbis.Clone()
     env_thirdparty.disable_warnings()
     env_thirdparty.add_source_files(env.modules_sources, thirdparty_sources)
 
-if not stub:
-    # Module files
-    env_vorbis.add_source_files(env.modules_sources, "*.cpp")
-else:
-    # Module files
-    env_vorbis.add_source_files(env.modules_sources, "stub/register_types.cpp")
+# Module files
+env_vorbis.add_source_files(env.modules_sources, "register_types.cpp")
diff --git a/modules/vorbis/audio_stream_ogg_vorbis.cpp b/modules/vorbis/audio_stream_ogg_vorbis.cpp
deleted file mode 100644
index 87067faf8e..0000000000
--- a/modules/vorbis/audio_stream_ogg_vorbis.cpp
+++ /dev/null
@@ -1,406 +0,0 @@
-/*************************************************************************/
-/*  audio_stream_ogg_vorbis.cpp                                          */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
-/*                                                                       */
-/* Permission is hereby granted, free of charge, to any person obtaining */
-/* a copy of this software and associated documentation files (the       */
-/* "Software"), to deal in the Software without restriction, including   */
-/* without limitation the rights to use, copy, modify, merge, publish,   */
-/* distribute, sublicense, and/or sell copies of the Software, and to    */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions:                                             */
-/*                                                                       */
-/* The above copyright notice and this permission notice shall be        */
-/* included in all copies or substantial portions of the Software.       */
-/*                                                                       */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
-/*************************************************************************/
-
-#include "audio_stream_ogg_vorbis.h"
-
-size_t AudioStreamPlaybackOGGVorbis::_ov_read_func(void *p_dst, size_t p_data, size_t p_count, void *_f) {
-
-	//printf("read to %p, %i bytes, %i nmemb, %p\n",p_dst,p_data,p_count,_f);
-	FileAccess *fa = (FileAccess *)_f;
-	size_t read_total = p_data * p_count;
-
-	if (fa->eof_reached())
-		return 0;
-
-	uint8_t *dst = (uint8_t *)p_dst;
-
-	int read = fa->get_buffer(dst, read_total);
-
-	return read;
-}
-
-int AudioStreamPlaybackOGGVorbis::_ov_seek_func(void *_f, ogg_int64_t offs, int whence) {
-
-	//printf("seek to %p, offs %i, whence %i\n",_f,(int)offs,whence);
-
-#ifdef SEEK_SET
-	//printf("seek set defined\n");
-	FileAccess *fa = (FileAccess *)_f;
-
-	if (whence == SEEK_SET) {
-
-		fa->seek(offs);
-	} else if (whence == SEEK_CUR) {
-
-		fa->seek(fa->get_position() + offs);
-	} else if (whence == SEEK_END) {
-
-		fa->seek_end(offs);
-	} else {
-
-		ERR_PRINT("Vorbis seek function failure: Unexpected value in _whence\n");
-	}
-	int ret = fa->eof_reached() ? -1 : 0;
-	//printf("returning %i\n",ret);
-	return ret;
-
-#else
-	return -1; // no seeking
-#endif
-}
-int AudioStreamPlaybackOGGVorbis::_ov_close_func(void *_f) {
-
-	//printf("close %p\n",_f);
-	if (!_f)
-		return 0;
-	FileAccess *fa = (FileAccess *)_f;
-	if (fa->is_open())
-		fa->close();
-	return 0;
-}
-long AudioStreamPlaybackOGGVorbis::_ov_tell_func(void *_f) {
-
-	//printf("close %p\n",_f);
-
-	FileAccess *fa = (FileAccess *)_f;
-	return fa->get_position();
-}
-
-int AudioStreamPlaybackOGGVorbis::mix(int16_t *p_buffer, int p_frames) {
-
-	if (!playing)
-		return 0;
-
-	int total = p_frames;
-	while (true) {
-
-		int todo = p_frames;
-
-		if (todo < MIN_MIX) {
-			break;
-		}
-
-#ifdef BIG_ENDIAN_ENABLED
-		long ret = ov_read(&vf, (char *)p_buffer, todo * stream_channels * sizeof(int16_t), 1, 2, 1, &current_section);
-#else
-		long ret = ov_read(&vf, (char *)p_buffer, todo * stream_channels * sizeof(int16_t), 0, 2, 1, &current_section);
-#endif
-
-		if (ret < 0) {
-
-			playing = false;
-			ERR_BREAK_MSG(ret < 0, "Error reading OGG Vorbis file: " + file + ".");
-		} else if (ret == 0) { // end of song, reload?
-
-			ov_clear(&vf);
-
-			_close_file();
-
-			if (!has_loop()) {
-
-				playing = false;
-				repeats = 1;
-				break;
-			}
-
-			f = FileAccess::open(file, FileAccess::READ);
-
-			int errv = ov_open_callbacks(f, &vf, NULL, 0, _ov_callbacks);
-			if (errv != 0) {
-				playing = false;
-				break; // :(
-			}
-
-			if (loop_restart_time) {
-				bool ok = ov_time_seek(&vf, loop_restart_time) == 0;
-				if (!ok) {
-					playing = false;
-					ERR_PRINT("Loop restart time rejected");
-				}
-
-				frames_mixed = stream_srate * loop_restart_time;
-			} else {
-
-				frames_mixed = 0;
-			}
-			repeats++;
-			continue;
-		}
-
-		ret /= stream_channels;
-		ret /= sizeof(int16_t);
-
-		frames_mixed += ret;
-
-		p_buffer += ret * stream_channels;
-		p_frames -= ret;
-	}
-
-	return total - p_frames;
-}
-
-void AudioStreamPlaybackOGGVorbis::play(float p_from) {
-
-	if (playing)
-		stop();
-
-	if (_load_stream() != OK)
-		return;
-
-	frames_mixed = 0;
-	playing = true;
-	if (p_from > 0) {
-		seek(p_from);
-	}
-}
-
-void AudioStreamPlaybackOGGVorbis::_close_file() {
-
-	if (f) {
-
-		memdelete(f);
-		f = NULL;
-	}
-}
-
-bool AudioStreamPlaybackOGGVorbis::is_playing() const {
-	return playing;
-}
-void AudioStreamPlaybackOGGVorbis::stop() {
-
-	_clear_stream();
-	playing = false;
-	//_clear();
-}
-
-float AudioStreamPlaybackOGGVorbis::get_playback_position() const {
-
-	int32_t frames = int32_t(frames_mixed);
-	if (frames < 0)
-		frames = 0;
-	return double(frames) / stream_srate;
-}
-
-void AudioStreamPlaybackOGGVorbis::seek(float p_time) {
-
-	if (!playing)
-		return;
-	bool ok = ov_time_seek(&vf, p_time) == 0;
-	ERR_FAIL_COND(!ok);
-	frames_mixed = stream_srate * p_time;
-}
-
-String AudioStreamPlaybackOGGVorbis::get_stream_name() const {
-
-	return "";
-}
-
-void AudioStreamPlaybackOGGVorbis::set_loop(bool p_enable) {
-
-	loops = p_enable;
-}
-
-bool AudioStreamPlaybackOGGVorbis::has_loop() const {
-
-	return loops;
-}
-
-int AudioStreamPlaybackOGGVorbis::get_loop_count() const {
-	return repeats;
-}
-
-Error AudioStreamPlaybackOGGVorbis::set_file(const String &p_file) {
-
-	file = p_file;
-	stream_valid = false;
-	Error err;
-	f = FileAccess::open(file, FileAccess::READ, &err);
-	ERR_FAIL_COND_V_MSG(err, err, "Cannot open file '" + p_file + "'.");
-
-	int errv = ov_open_callbacks(f, &vf, NULL, 0, _ov_callbacks);
-	switch (errv) {
-
-		case OV_EREAD: { // - A read from media returned an error.
-			memdelete(f);
-			f = NULL;
-			ERR_FAIL_V(ERR_FILE_CANT_READ);
-		} break;
-		case OV_EVERSION: // - Vorbis version mismatch.
-		case OV_ENOTVORBIS: { // - Bitstream is not Vorbis data.
-			memdelete(f);
-			f = NULL;
-			ERR_FAIL_V(ERR_FILE_UNRECOGNIZED);
-		} break;
-		case OV_EBADHEADER: { // - Invalid Vorbis bitstream header.
-			memdelete(f);
-			f = NULL;
-			ERR_FAIL_V(ERR_FILE_CORRUPT);
-		} break;
-		case OV_EFAULT: { // - Internal logic fault; indicates a bug or heap/stack corruption.
-			memdelete(f);
-			f = NULL;
-			ERR_FAIL_V(ERR_BUG);
-		} break;
-	}
-	const vorbis_info *vinfo = ov_info(&vf, -1);
-	stream_channels = vinfo->channels;
-	stream_srate = vinfo->rate;
-	length = ov_time_total(&vf, -1);
-	ov_clear(&vf);
-	memdelete(f);
-	f = NULL;
-	stream_valid = true;
-
-	return OK;
-}
-
-Error AudioStreamPlaybackOGGVorbis::_load_stream() {
-
-	ERR_FAIL_COND_V(!stream_valid, ERR_UNCONFIGURED);
-
-	_clear_stream();
-	if (file == "")
-		return ERR_INVALID_DATA;
-
-	Error err;
-	f = FileAccess::open(file, FileAccess::READ, &err);
-	ERR_FAIL_COND_V_MSG(err != OK, err, "Cannot open file '" + file + "'.");
-
-	int errv = ov_open_callbacks(f, &vf, NULL, 0, _ov_callbacks);
-	switch (errv) {
-
-		case OV_EREAD: { // - A read from media returned an error.
-			memdelete(f);
-			f = NULL;
-			ERR_FAIL_V(ERR_FILE_CANT_READ);
-		} break;
-		case OV_EVERSION: // - Vorbis version mismatch.
-		case OV_ENOTVORBIS: { // - Bitstream is not Vorbis data.
-			memdelete(f);
-			f = NULL;
-			ERR_FAIL_V(ERR_FILE_UNRECOGNIZED);
-		} break;
-		case OV_EBADHEADER: { // - Invalid Vorbis bitstream header.
-			memdelete(f);
-			f = NULL;
-			ERR_FAIL_V(ERR_FILE_CORRUPT);
-		} break;
-		case OV_EFAULT: { // - Internal logic fault; indicates a bug or heap/stack corruption.
-			memdelete(f);
-			f = NULL;
-			ERR_FAIL_V(ERR_BUG);
-		} break;
-	}
-	repeats = 0;
-	stream_loaded = true;
-
-	return OK;
-}
-
-float AudioStreamPlaybackOGGVorbis::get_length() const {
-
-	if (!stream_loaded) {
-		if (const_cast<AudioStreamPlaybackOGGVorbis *>(this)->_load_stream() != OK)
-			return 0;
-	}
-	return length;
-}
-
-void AudioStreamPlaybackOGGVorbis::_clear_stream() {
-
-	if (!stream_loaded)
-		return;
-
-	ov_clear(&vf);
-	_close_file();
-
-	stream_loaded = false;
-	//stream_channels=1;
-	playing = false;
-}
-
-void AudioStreamPlaybackOGGVorbis::set_paused(bool p_paused) {
-
-	paused = p_paused;
-}
-
-bool AudioStreamPlaybackOGGVorbis::is_paused() const {
-
-	return paused;
-}
-
-AudioStreamPlaybackOGGVorbis::AudioStreamPlaybackOGGVorbis() {
-
-	loops = false;
-	playing = false;
-	_ov_callbacks.read_func = _ov_read_func;
-	_ov_callbacks.seek_func = _ov_seek_func;
-	_ov_callbacks.close_func = _ov_close_func;
-	_ov_callbacks.tell_func = _ov_tell_func;
-	f = NULL;
-	stream_loaded = false;
-	stream_valid = false;
-	repeats = 0;
-	paused = true;
-	stream_channels = 0;
-	stream_srate = 0;
-	current_section = 0;
-	length = 0;
-	loop_restart_time = 0;
-}
-
-AudioStreamPlaybackOGGVorbis::~AudioStreamPlaybackOGGVorbis() {
-
-	_clear_stream();
-}
-
-RES ResourceFormatLoaderAudioStreamOGGVorbis::load(const String &p_path, const String &p_original_path, Error *r_error) {
-	if (r_error)
-		*r_error = OK;
-
-	AudioStreamOGGVorbis *ogg_stream = memnew(AudioStreamOGGVorbis);
-	ogg_stream->set_file(p_path);
-	return Ref<AudioStreamOGGVorbis>(ogg_stream);
-}
-
-void ResourceFormatLoaderAudioStreamOGGVorbis::get_recognized_extensions(List<String> *p_extensions) const {
-
-	p_extensions->push_back("ogg");
-}
-String ResourceFormatLoaderAudioStreamOGGVorbis::get_resource_type(const String &p_path) const {
-
-	if (p_path.get_extension().to_lower() == "ogg")
-		return "AudioStreamOGGVorbis";
-	return "";
-}
-
-bool ResourceFormatLoaderAudioStreamOGGVorbis::handles_type(const String &p_type) const {
-	return (p_type == "AudioStream" || p_type == "AudioStreamOGG" || p_type == "AudioStreamOGGVorbis");
-}
diff --git a/modules/vorbis/audio_stream_ogg_vorbis.h b/modules/vorbis/audio_stream_ogg_vorbis.h
deleted file mode 100644
index 739765a12f..0000000000
--- a/modules/vorbis/audio_stream_ogg_vorbis.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*************************************************************************/
-/*  audio_stream_ogg_vorbis.h                                            */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
-/*                                                                       */
-/* Permission is hereby granted, free of charge, to any person obtaining */
-/* a copy of this software and associated documentation files (the       */
-/* "Software"), to deal in the Software without restriction, including   */
-/* without limitation the rights to use, copy, modify, merge, publish,   */
-/* distribute, sublicense, and/or sell copies of the Software, and to    */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions:                                             */
-/*                                                                       */
-/* The above copyright notice and this permission notice shall be        */
-/* included in all copies or substantial portions of the Software.       */
-/*                                                                       */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
-/*************************************************************************/
-
-#ifndef AUDIO_STREAM_OGG_VORBIS_H
-#define AUDIO_STREAM_OGG_VORBIS_H
-
-#include "core/io/resource_loader.h"
-#include "core/os/file_access.h"
-#include "core/os/thread_safe.h"
-#include "scene/resources/audio_stream.h"
-
-#include <vorbis/vorbisfile.h>
-
-class AudioStreamPlaybackOGGVorbis : public AudioStreamPlayback {
-
-	GDCLASS(AudioStreamPlaybackOGGVorbis, AudioStreamPlayback);
-
-	enum {
-		MIN_MIX = 1024
-	};
-
-	FileAccess *f;
-
-	ov_callbacks _ov_callbacks;
-	float length;
-	static size_t _ov_read_func(void *p_dst, size_t p_data, size_t p_count, void *_f);
-	static int _ov_seek_func(void *_f, ogg_int64_t offs, int whence);
-	static int _ov_close_func(void *_f);
-	static long _ov_tell_func(void *_f);
-
-	String file;
-	int64_t frames_mixed;
-
-	bool stream_loaded;
-	volatile bool playing;
-	OggVorbis_File vf;
-	int stream_channels;
-	int stream_srate;
-	int current_section;
-
-	bool paused;
-	bool loops;
-	int repeats;
-
-	Error _load_stream();
-	void _clear_stream();
-	void _close_file();
-
-	bool stream_valid;
-	float loop_restart_time;
-
-public:
-	Error set_file(const String &p_file);
-
-	virtual void play(float p_from = 0);
-	virtual void stop();
-	virtual bool is_playing() const;
-
-	virtual void set_loop_restart_time(float p_time) { loop_restart_time = p_time; }
-
-	virtual void set_paused(bool p_paused);
-	virtual bool is_paused() const;
-
-	virtual void set_loop(bool p_enable);
-	virtual bool has_loop() const;
-
-	virtual float get_length() const;
-
-	virtual String get_stream_name() const;
-
-	virtual int get_loop_count() const;
-
-	virtual float get_playback_position() const;
-	virtual void seek(float p_time);
-
-	virtual int get_channels() const { return stream_channels; }
-	virtual int get_mix_rate() const { return stream_srate; }
-
-	virtual int get_minimum_buffer_size() const { return 0; }
-	virtual int mix(int16_t *p_buffer, int p_frames);
-
-	AudioStreamPlaybackOGGVorbis();
-	~AudioStreamPlaybackOGGVorbis();
-};
-
-class AudioStreamOGGVorbis : public AudioStream {
-
-	GDCLASS(AudioStreamOGGVorbis, AudioStream);
-
-	String file;
-
-public:
-	Ref<AudioStreamPlayback> instance_playback() {
-		Ref<AudioStreamPlaybackOGGVorbis> pb = memnew(AudioStreamPlaybackOGGVorbis);
-		pb->set_file(file);
-		return pb;
-	}
-
-	void set_file(const String &p_file) { file = p_file; }
-};
-
-class ResourceFormatLoaderAudioStreamOGGVorbis : public ResourceFormatLoader {
-public:
-	virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
-	virtual void get_recognized_extensions(List<String> *p_extensions) const;
-	virtual bool handles_type(const String &p_type) const;
-	virtual String get_resource_type(const String &p_path) const;
-};
-
-#endif // AUDIO_STREAM_OGG_H
diff --git a/modules/vorbis/config.py b/modules/vorbis/config.py
index 1c8cd12a2d..8a384e3066 100644
--- a/modules/vorbis/config.py
+++ b/modules/vorbis/config.py
@@ -1,5 +1,6 @@
 def can_build(env, platform):
-    return True
+    return env.module_check_dependencies("vorbis", ["ogg"])
+
 
 def configure(env):
     pass
diff --git a/modules/vorbis/register_types.cpp b/modules/vorbis/register_types.cpp
index de055551ad..8874b3887b 100644
--- a/modules/vorbis/register_types.cpp
+++ b/modules/vorbis/register_types.cpp
@@ -30,19 +30,8 @@
 
 #include "register_types.h"
 
-#include "audio_stream_ogg_vorbis.h"
+// Dummy module as libvorbis is needed by other modules (theora ...)
 
-static Ref<ResourceFormatLoaderAudioStreamOGGVorbis> vorbis_stream_loader;
+void register_vorbis_types() {}
 
-void register_vorbis_types() {
-
-	vorbis_stream_loader.instance();
-	ResourceLoader::add_resource_format_loader(vorbis_stream_loader);
-	ClassDB::register_class<AudioStreamOGGVorbis>();
-}
-
-void unregister_vorbis_types() {
-
-	ResourceLoader::remove_resource_format_loader(vorbis_stream_loader);
-	vorbis_stream_loader.unref();
-}
+void unregister_vorbis_types() {}
diff --git a/modules/vorbis/register_types.h b/modules/vorbis/register_types.h
index 83d4904a87..7fa0dfdeef 100644
--- a/modules/vorbis/register_types.h
+++ b/modules/vorbis/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef VORBIS_REGISTER_TYPES_H
+#define VORBIS_REGISTER_TYPES_H
+
 void register_vorbis_types();
 void unregister_vorbis_types();
+
+#endif // VORBIS_REGISTER_TYPES_H
diff --git a/modules/webm/SCsub b/modules/webm/SCsub
index 32e6727656..247b4ead37 100644
--- a/modules/webm/SCsub
+++ b/modules/webm/SCsub
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_webm = env_modules.Clone()
 
@@ -18,14 +18,14 @@ thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 env_webm.Prepend(CPPPATH=[thirdparty_dir, thirdparty_dir + "libwebm/"])
 
 # also requires libogg, libvorbis and libopus
-if env['builtin_libogg']:
+if env["builtin_libogg"]:
     env_webm.Prepend(CPPPATH=["#thirdparty/libogg"])
-if env['builtin_libvorbis']:
+if env["builtin_libvorbis"]:
     env_webm.Prepend(CPPPATH=["#thirdparty/libvorbis"])
-if env['builtin_opus']:
+if env["builtin_opus"]:
     env_webm.Prepend(CPPPATH=["#thirdparty/opus"])
 
-if env['builtin_libvpx']:
+if env["builtin_libvpx"]:
     env_webm.Prepend(CPPPATH=["#thirdparty/libvpx"])
     SConscript("libvpx/SCsub")
 
diff --git a/modules/webm/config.py b/modules/webm/config.py
index ba4dcce2f5..99f8ace114 100644
--- a/modules/webm/config.py
+++ b/modules/webm/config.py
@@ -1,13 +1,19 @@
 def can_build(env, platform):
-    return platform not in ['iphone']
+    if platform in ["iphone"]:
+        return False
+
+    return env.module_check_dependencies("webm", ["ogg", "opus", "vorbis"])
+
 
 def configure(env):
     pass
 
+
 def get_doc_classes():
     return [
         "VideoStreamWebm",
     ]
 
+
 def get_doc_path():
     return "doc_classes"
diff --git a/modules/webm/doc_classes/VideoStreamWebm.xml b/modules/webm/doc_classes/VideoStreamWebm.xml
index dfa04720cf..2edbc08cc8 100644
--- a/modules/webm/doc_classes/VideoStreamWebm.xml
+++ b/modules/webm/doc_classes/VideoStreamWebm.xml
@@ -4,7 +4,8 @@
 		[VideoStream] resource for WebM videos.
 	</brief_description>
 	<description>
-		[VideoStream] resource handling the [url=https://www.webmproject.org/]WebM[/url] video format with [code].webm[/code] extension.
+		[VideoStream] resource handling the [url=https://www.webmproject.org/]WebM[/url] video format with [code].webm[/code] extension. Both the VP8 and VP9 codecs are supported. The VP8 and VP9 codecs are more efficient than [VideoStreamTheora], but they require more CPU resources to decode (especially VP9). Both the VP8 and VP9 codecs are decoded on the CPU.
+		[b]Note:[/b] There are known bugs and performance issues with WebM video playback in Godot. If you run into problems, try using the Ogg Theora format instead: [VideoStreamTheora]
 	</description>
 	<tutorials>
 	</tutorials>
diff --git a/modules/webm/libvpx/SCsub b/modules/webm/libvpx/SCsub
index 14fa6c1268..d0744fa313 100644
--- a/modules/webm/libvpx/SCsub
+++ b/modules/webm/libvpx/SCsub
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 # Thirdparty sources
 
@@ -9,9 +9,7 @@ libvpx_dir = "#thirdparty/libvpx/"
 
 libvpx_sources = [
     "vp8/vp8_dx_iface.c",
-
     "vp8/common/generic/systemdependent.c",
-
     "vp8/common/alloccommon.c",
     "vp8/common/blockd.c",
     "vp8/common/copy_c.c",
@@ -37,16 +35,12 @@ libvpx_sources = [
     "vp8/common/swapyv12buffer.c",
     "vp8/common/treecoder.c",
     "vp8/common/vp8_loopfilter.c",
-
     "vp8/decoder/dboolhuff.c",
     "vp8/decoder/decodeframe.c",
     "vp8/decoder/decodemv.c",
     "vp8/decoder/detokenize.c",
     "vp8/decoder/onyxd_if.c",
-
-
     "vp9/vp9_dx_iface.c",
-
     "vp9/common/vp9_alloccommon.c",
     "vp9/common/vp9_blockd.c",
     "vp9/common/vp9_common_data.c",
@@ -69,21 +63,16 @@ libvpx_sources = [
     "vp9/common/vp9_seg_common.c",
     "vp9/common/vp9_thread_common.c",
     "vp9/common/vp9_tile_common.c",
-
     "vp9/decoder/vp9_decodeframe.c",
     "vp9/decoder/vp9_decodemv.c",
     "vp9/decoder/vp9_decoder.c",
     "vp9/decoder/vp9_detokenize.c",
     "vp9/decoder/vp9_dsubexp.c",
     "vp9/decoder/vp9_dthread.c",
-
-
     "vpx/src/vpx_codec.c",
     "vpx/src/vpx_decoder.c",
     "vpx/src/vpx_image.c",
     "vpx/src/vpx_psnr.c",
-
-
     "vpx_dsp/bitreader.c",
     "vpx_dsp/bitreader_buffer.c",
     "vpx_dsp/intrapred.c",
@@ -92,18 +81,11 @@ libvpx_sources = [
     "vpx_dsp/prob.c",
     "vpx_dsp/vpx_convolve.c",
     "vpx_dsp/vpx_dsp_rtcd.c",
-
-
     "vpx_mem/vpx_mem.c",
-
-
     "vpx_scale/vpx_scale_rtcd.c",
-
     "vpx_scale/generic/yv12config.c",
     "vpx_scale/generic/yv12extend.c",
-
-
-    "vpx_util/vpx_thread.c"
+    "vpx_util/vpx_thread.c",
 ]
 
 libvpx_sources_mt = [
@@ -114,29 +96,23 @@ libvpx_sources_intrin_x86 = [
     "vp8/common/x86/filter_x86.c",
     "vp8/common/x86/loopfilter_x86.c",
     "vp8/common/x86/vp8_asm_stubs.c",
-
-
-    "vpx_dsp/x86/vpx_asm_stubs.c"
+    "vpx_dsp/x86/vpx_asm_stubs.c",
 ]
 libvpx_sources_intrin_x86_mmx = [
     "vp8/common/x86/idct_blk_mmx.c",
 ]
 libvpx_sources_intrin_x86_sse2 = [
     "vp8/common/x86/idct_blk_sse2.c",
-
-
     "vp9/common/x86/vp9_idct_intrin_sse2.c",
-
-
     "vpx_dsp/x86/inv_txfm_sse2.c",
     "vpx_dsp/x86/loopfilter_sse2.c",
 ]
 libvpx_sources_intrin_x86_ssse3 = [
-    "vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c"
+    "vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c",
 ]
 libvpx_sources_intrin_x86_avx2 = [
     "vpx_dsp/x86/loopfilter_avx2.c",
-    "vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c"
+    "vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c",
 ]
 libvpx_sources_x86asm = [
     "vp8/common/x86/copy_sse2.asm",
@@ -153,8 +129,6 @@ libvpx_sources_x86asm = [
     "vp8/common/x86/subpixel_sse2.asm",
     "vp8/common/x86/subpixel_ssse3.asm",
     "vp8/common/x86/vp8_loopfilter_mmx.asm",
-
-
     "vpx_dsp/x86/intrapred_sse2.asm",
     "vpx_dsp/x86/intrapred_ssse3.asm",
     "vpx_dsp/x86/inv_wht_sse2.asm",
@@ -163,21 +137,15 @@ libvpx_sources_x86asm = [
     "vpx_dsp/x86/vpx_subpixel_8t_ssse3.asm",
     "vpx_dsp/x86/vpx_subpixel_bilinear_sse2.asm",
     "vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm",
-
-
-    "vpx_ports/emms.asm"
+    "vpx_ports/emms.asm",
 ]
 libvpx_sources_x86_64asm = [
     "vp8/common/x86/loopfilter_block_sse2_x86_64.asm",
-
-
-    "vpx_dsp/x86/inv_txfm_ssse3_x86_64.asm"
+    "vpx_dsp/x86/inv_txfm_ssse3_x86_64.asm",
 ]
 
 libvpx_sources_arm = [
     "vpx_ports/arm_cpudetect.c",
-
-
     "vp8/common/arm/loopfilter_arm.c",
 ]
 libvpx_sources_arm_neon = [
@@ -196,12 +164,8 @@ libvpx_sources_arm_neon = [
     "vp8/common/arm/neon/shortidct4x4llm_neon.c",
     "vp8/common/arm/neon/sixtappredict_neon.c",
     "vp8/common/arm/neon/vp8_loopfilter_neon.c",
-
-
     "vp9/common/arm/neon/vp9_iht4x4_add_neon.c",
     "vp9/common/arm/neon/vp9_iht8x8_add_neon.c",
-
-
     "vpx_dsp/arm/idct16x16_1_add_neon.c",
     "vpx_dsp/arm/idct16x16_add_neon.c",
     "vpx_dsp/arm/idct16x16_neon.c",
@@ -220,22 +184,22 @@ libvpx_sources_arm_neon = [
     "vpx_dsp/arm/vpx_convolve8_neon.c",
     "vpx_dsp/arm/vpx_convolve_avg_neon.c",
     "vpx_dsp/arm/vpx_convolve_copy_neon.c",
-    "vpx_dsp/arm/vpx_convolve_neon.c"
+    "vpx_dsp/arm/vpx_convolve_neon.c",
 ]
 libvpx_sources_arm_neon_gas = [
     "vpx_dsp/arm/gas/intrapred_neon_asm.s",
     "vpx_dsp/arm/gas/loopfilter_mb_neon.s",
-    "vpx_dsp/arm/gas/save_reg_neon.s"
+    "vpx_dsp/arm/gas/save_reg_neon.s",
 ]
 libvpx_sources_arm_neon_armasm_ms = [
     "vpx_dsp/arm/armasm_ms/intrapred_neon_asm.asm",
     "vpx_dsp/arm/armasm_ms/loopfilter_mb_neon.asm",
-    "vpx_dsp/arm/armasm_ms/save_reg_neon.asm"
+    "vpx_dsp/arm/armasm_ms/save_reg_neon.asm",
 ]
 libvpx_sources_arm_neon_gas_apple = [
     "vpx_dsp/arm/gas_apple/intrapred_neon_asm.s",
     "vpx_dsp/arm/gas_apple/loopfilter_mb_neon.s",
-    "vpx_dsp/arm/gas_apple/save_reg_neon.s"
+    "vpx_dsp/arm/gas_apple/save_reg_neon.s",
 ]
 
 libvpx_sources = [libvpx_dir + file for file in libvpx_sources]
@@ -258,25 +222,45 @@ env_libvpx = env_modules.Clone()
 env_libvpx.disable_warnings()
 env_libvpx.Prepend(CPPPATH=[libvpx_dir])
 
-webm_multithread = env["platform"] != 'javascript'
+webm_multithread = env["platform"] != "javascript"
 
 cpu_bits = env["bits"]
 webm_cpu_x86 = False
 webm_cpu_arm = False
-if env["platform"] == 'uwp':
-    if 'arm' in env["PROGSUFFIX"]:
+if env["platform"] == "uwp":
+    if "arm" in env["PROGSUFFIX"]:
         webm_cpu_arm = True
     else:
         webm_cpu_x86 = True
 else:
     import platform
-    is_x11_or_server_arm = ((env["platform"] == 'x11' or env["platform"] == 'server') and (platform.machine().startswith('arm') or platform.machine().startswith('aarch')))
-    is_ios_x86 = (env["platform"] == 'iphone' and ("arch" in env and env["arch"].startswith('x86')))
-    is_android_x86 = (env["platform"] == 'android' and env["android_arch"].startswith('x86'))
+
+    is_x11_or_server_arm = (env["platform"] == "linuxbsd" or env["platform"] == "server") and (
+        platform.machine().startswith("arm") or platform.machine().startswith("aarch")
+    )
+    is_macos_x86 = env["platform"] == "osx" and ("arch" in env and (env["arch"] != "arm64"))
+    is_ios_x86 = env["platform"] == "iphone" and ("arch" in env and env["arch"].startswith("x86"))
+    is_android_x86 = env["platform"] == "android" and env["android_arch"].startswith("x86")
     if is_android_x86:
-        cpu_bits = '32' if env["android_arch"] == 'x86' else '64'
-    webm_cpu_x86 = not is_x11_or_server_arm and (cpu_bits == '32' or cpu_bits == '64') and (env["platform"] == 'windows' or env["platform"] == 'x11' or env["platform"] == 'osx' or env["platform"] == 'haiku' or is_android_x86 or is_ios_x86)
-    webm_cpu_arm = is_x11_or_server_arm or (not is_ios_x86 and env["platform"] == 'iphone') or (not is_android_x86 and env["platform"] == 'android')
+        cpu_bits = "32" if env["android_arch"] == "x86" else "64"
+    webm_cpu_x86 = (
+        not is_x11_or_server_arm
+        and (cpu_bits == "32" or cpu_bits == "64")
+        and (
+            env["platform"] == "windows"
+            or env["platform"] == "linuxbsd"
+            or env["platform"] == "haiku"
+            or is_macos_x86
+            or is_android_x86
+            or is_ios_x86
+        )
+    )
+    webm_cpu_arm = (
+        is_x11_or_server_arm
+        or (not is_macos_x86 and env["platform"] == "osx")
+        or (not is_ios_x86 and env["platform"] == "iphone")
+        or (not is_android_x86 and env["platform"] == "android")
+    )
 
 if webm_cpu_x86:
     import subprocess
@@ -306,38 +290,43 @@ if webm_cpu_x86:
 webm_simd_optimizations = False
 
 if webm_cpu_x86:
-    if env["platform"] == 'windows' or env["platform"] == 'uwp':
-        env_libvpx["ASFORMAT"] = 'win'
-    elif env["platform"] == 'osx' or env["platform"] == "iphone":
-        env_libvpx["ASFORMAT"] = 'macho'
+    if env["platform"] == "windows" or env["platform"] == "uwp":
+        env_libvpx["ASFORMAT"] = "win"
+    elif env["platform"] == "osx" or env["platform"] == "iphone":
+        env_libvpx["ASFORMAT"] = "macho"
     else:
-        env_libvpx["ASFORMAT"] = 'elf'
+        env_libvpx["ASFORMAT"] = "elf"
     env_libvpx["ASFORMAT"] += cpu_bits
 
-    env_libvpx["AS"] = 'yasm'
-    env_libvpx["ASFLAGS"] = '-I' + libvpx_dir[1:] + ' -f $ASFORMAT -D $ASCPU'
-    env_libvpx["ASCOM"] = '$AS $ASFLAGS -o $TARGET $SOURCES'
+    env_libvpx["AS"] = "yasm"
+    env_libvpx["ASFLAGS"] = "-I" + libvpx_dir[1:] + " -f $ASFORMAT -D $ASCPU"
+    env_libvpx["ASCOM"] = "$AS $ASFLAGS -o $TARGET $SOURCES"
 
-    if cpu_bits == '32':
-        env_libvpx["ASCPU"] = 'X86_32'
-    elif cpu_bits == '64':
-        env_libvpx["ASCPU"] = 'X86_64'
+    if cpu_bits == "32":
+        env_libvpx["ASCPU"] = "X86_32"
+    elif cpu_bits == "64":
+        env_libvpx["ASCPU"] = "X86_64"
 
-    env_libvpx.Append(CPPDEFINES=['WEBM_X86ASM'])
+    env_libvpx.Append(CPPDEFINES=["WEBM_X86ASM"])
 
     webm_simd_optimizations = True
 
 if webm_cpu_arm:
-    if env["platform"] == 'iphone':
-        env_libvpx["ASFLAGS"] = '-arch armv7'
-    elif env["platform"] == 'android' and env["android_arch"] == 'armv7' or env["platform"] == 'x11' or env["platform"] == 'server':
-        env_libvpx["ASFLAGS"] = '-mfpu=neon'
-    elif env["platform"] == 'uwp':
-        env_libvpx["AS"] = 'armasm'
-        env_libvpx["ASFLAGS"] = ''
-        env_libvpx["ASCOM"] = '$AS $ASFLAGS -o $TARGET $SOURCES'
-
-    env_libvpx.Append(CPPDEFINES=['WEBM_ARMASM'])
+    if env["platform"] == "iphone":
+        env_libvpx["ASFLAGS"] = "-arch armv7"
+    elif (
+        env["platform"] == "android"
+        and env["android_arch"] == "armv7"
+        or env["platform"] == "linuxbsd"
+        or env["platform"] == "server"
+    ):
+        env_libvpx["ASFLAGS"] = "-mfpu=neon"
+    elif env["platform"] == "uwp":
+        env_libvpx["AS"] = "armasm"
+        env_libvpx["ASFLAGS"] = ""
+        env_libvpx["ASCOM"] = "$AS $ASFLAGS -o $TARGET $SOURCES"
+
+    env_libvpx.Append(CPPDEFINES=["WEBM_ARMASM"])
 
     webm_simd_optimizations = True
 
@@ -350,45 +339,49 @@ if webm_multithread:
     env_libvpx.add_source_files(env.modules_sources, libvpx_sources_mt)
 
 if webm_cpu_x86:
-    is_clang_or_gcc = ('gcc' in os.path.basename(env["CC"])) or ('clang' in os.path.basename(env["CC"])) or ("osxcross" in env)
+    is_clang_or_gcc = (
+        ("gcc" in os.path.basename(env["CC"])) or ("clang" in os.path.basename(env["CC"])) or ("osxcross" in env)
+    )
 
     env_libvpx_mmx = env_libvpx.Clone()
-    if cpu_bits == '32' and is_clang_or_gcc:
-        env_libvpx_mmx.Append(CCFLAGS=['-mmmx'])
+    if cpu_bits == "32" and is_clang_or_gcc:
+        env_libvpx_mmx.Append(CCFLAGS=["-mmmx"])
     env_libvpx_mmx.add_source_files(env.modules_sources, libvpx_sources_intrin_x86_mmx)
 
     env_libvpx_sse2 = env_libvpx.Clone()
-    if cpu_bits == '32' and is_clang_or_gcc:
-        env_libvpx_sse2.Append(CCFLAGS=['-msse2'])
+    if cpu_bits == "32" and is_clang_or_gcc:
+        env_libvpx_sse2.Append(CCFLAGS=["-msse2"])
     env_libvpx_sse2.add_source_files(env.modules_sources, libvpx_sources_intrin_x86_sse2)
 
     env_libvpx_ssse3 = env_libvpx.Clone()
     if is_clang_or_gcc:
-        env_libvpx_ssse3.Append(CCFLAGS=['-mssse3'])
+        env_libvpx_ssse3.Append(CCFLAGS=["-mssse3"])
     env_libvpx_ssse3.add_source_files(env.modules_sources, libvpx_sources_intrin_x86_ssse3)
 
     env_libvpx_avx2 = env_libvpx.Clone()
     if is_clang_or_gcc:
-        env_libvpx_avx2.Append(CCFLAGS=['-mavx2'])
+        env_libvpx_avx2.Append(CCFLAGS=["-mavx2"])
     env_libvpx_avx2.add_source_files(env.modules_sources, libvpx_sources_intrin_x86_avx2)
 
     env_libvpx.add_source_files(env.modules_sources, libvpx_sources_intrin_x86)
 
     env_libvpx.add_source_files(env.modules_sources, libvpx_sources_x86asm)
-    if cpu_bits == '64':
+    if cpu_bits == "64":
         env_libvpx.add_source_files(env.modules_sources, libvpx_sources_x86_64asm)
 elif webm_cpu_arm:
     env_libvpx.add_source_files(env.modules_sources, libvpx_sources_arm)
-    if env["platform"] == 'android':
+    if env["platform"] == "android":
         env_libvpx.Prepend(CPPPATH=[libvpx_dir + "third_party/android"])
         env_libvpx.add_source_files(env.modules_sources, [libvpx_dir + "third_party/android/cpu-features.c"])
 
     env_libvpx_neon = env_libvpx.Clone()
     env_libvpx_neon.add_source_files(env.modules_sources, libvpx_sources_arm_neon)
 
-    if env["platform"] == 'uwp':
+    if env["platform"] == "uwp":
         env_libvpx.add_source_files(env.modules_sources, libvpx_sources_arm_neon_armasm_ms)
-    elif env["platform"] == 'iphone':
+    elif env["platform"] == "iphone":
         env_libvpx.add_source_files(env.modules_sources, libvpx_sources_arm_neon_gas_apple)
-    elif (is_x11_or_server_arm and cpu_bits == '32') or (env["platform"] == 'android' and not env["android_arch"] == 'arm64v8'):
+    elif (is_x11_or_server_arm and cpu_bits == "32") or (
+        env["platform"] == "android" and not env["android_arch"] == "arm64v8"
+    ):
         env_libvpx.add_source_files(env.modules_sources, libvpx_sources_arm_neon_gas)
diff --git a/modules/webm/register_types.cpp b/modules/webm/register_types.cpp
index 5449dd458c..6248787879 100644
--- a/modules/webm/register_types.cpp
+++ b/modules/webm/register_types.cpp
@@ -35,7 +35,6 @@
 static Ref<ResourceFormatLoaderWebm> resource_loader_webm;
 
 void register_webm_types() {
-
 	resource_loader_webm.instance();
 	ResourceLoader::add_resource_format_loader(resource_loader_webm, true);
 
@@ -43,7 +42,6 @@ void register_webm_types() {
 }
 
 void unregister_webm_types() {
-
 	ResourceLoader::remove_resource_format_loader(resource_loader_webm);
 	resource_loader_webm.unref();
 }
diff --git a/modules/webm/register_types.h b/modules/webm/register_types.h
index 962a0dab4e..6a02e3a87a 100644
--- a/modules/webm/register_types.h
+++ b/modules/webm/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef WEBM_REGISTER_TYPES_H
+#define WEBM_REGISTER_TYPES_H
+
 void register_webm_types();
 void unregister_webm_types();
+
+#endif // WEBM_REGISTER_TYPES_H
diff --git a/modules/webm/video_stream_webm.cpp b/modules/webm/video_stream_webm.cpp
index 41f9e67672..832e14d91a 100644
--- a/modules/webm/video_stream_webm.cpp
+++ b/modules/webm/video_stream_webm.cpp
@@ -48,41 +48,39 @@
 #include <mkvparser/mkvparser.h>
 
 class MkvReader : public mkvparser::IMkvReader {
-
 public:
 	MkvReader(const String &p_file) {
-
 		file = FileAccess::open(p_file, FileAccess::READ);
 
 		ERR_FAIL_COND_MSG(!file, "Failed loading resource: '" + p_file + "'.");
 	}
 	~MkvReader() {
-
-		if (file)
+		if (file) {
 			memdelete(file);
+		}
 	}
 
 	virtual int Read(long long pos, long len, unsigned char *buf) {
-
 		if (file) {
-
-			if (file->get_position() != (size_t)pos)
+			if (file->get_position() != (size_t)pos) {
 				file->seek(pos);
-			if (file->get_buffer(buf, len) == len)
+			}
+			if (file->get_buffer(buf, len) == len) {
 				return 0;
+			}
 		}
 		return -1;
 	}
 
 	virtual int Length(long long *total, long long *available) {
-
 		if (file) {
-
 			const size_t len = file->get_len();
-			if (total)
+			if (total) {
 				*total = len;
-			if (available)
+			}
+			if (available) {
 				*available = len;
+			}
 			return 0;
 		}
 		return -1;
@@ -95,77 +93,54 @@ private:
 /**/
 
 VideoStreamPlaybackWebm::VideoStreamPlaybackWebm() :
-		audio_track(0),
-		webm(NULL),
-		video(NULL),
-		audio(NULL),
-		video_frames(NULL),
-		audio_frame(NULL),
-		video_frames_pos(0),
-		video_frames_capacity(0),
-		num_decoded_samples(0),
-		samples_offset(-1),
-		mix_callback(NULL),
-		mix_udata(NULL),
-		playing(false),
-		paused(false),
-		delay_compensation(0.0),
-		time(0.0),
-		video_frame_delay(0.0),
-		video_pos(0.0),
-		texture(memnew(ImageTexture)),
-		pcm(NULL) {}
-VideoStreamPlaybackWebm::~VideoStreamPlaybackWebm() {
 
+		texture(memnew(ImageTexture)) {}
+VideoStreamPlaybackWebm::~VideoStreamPlaybackWebm() {
 	delete_pointers();
 }
 
 bool VideoStreamPlaybackWebm::open_file(const String &p_file) {
-
 	file_name = p_file;
 	webm = memnew(WebMDemuxer(new MkvReader(file_name), 0, audio_track));
 	if (webm->isOpen()) {
-
 		video = memnew(VPXDecoder(*webm, OS::get_singleton()->get_processor_count()));
 		if (video->isOpen()) {
-
 			audio = memnew(OpusVorbisDecoder(*webm));
 			if (audio->isOpen()) {
-
 				audio_frame = memnew(WebMFrame);
 				pcm = (float *)memalloc(sizeof(float) * audio->getBufferSamples() * webm->getChannels());
 			} else {
-
 				memdelete(audio);
-				audio = NULL;
+				audio = nullptr;
 			}
 
 			frame_data.resize((webm->getWidth() * webm->getHeight()) << 2);
-			texture->create(webm->getWidth(), webm->getHeight(), Image::FORMAT_RGBA8, Texture::FLAG_FILTER | Texture::FLAG_VIDEO_SURFACE);
+			Ref<Image> img;
+			img.instance();
+			img->create(webm->getWidth(), webm->getHeight(), false, Image::FORMAT_RGBA8);
+			texture->create_from_image(img);
 
 			return true;
 		}
 		memdelete(video);
-		video = NULL;
+		video = nullptr;
 	}
 	memdelete(webm);
-	webm = NULL;
+	webm = nullptr;
 	return false;
 }
 
 void VideoStreamPlaybackWebm::stop() {
-
 	if (playing) {
-
 		delete_pointers();
 
-		pcm = NULL;
+		pcm = nullptr;
 
-		audio_frame = NULL;
-		video_frames = NULL;
+		audio_frame = nullptr;
+		video_frames = nullptr;
 
-		video = NULL;
-		audio = NULL;
+		video = nullptr;
+		audio = nullptr;
 
 		open_file(file_name); //Should not fail here...
 
@@ -177,8 +152,8 @@ void VideoStreamPlaybackWebm::stop() {
 	time = 0.0;
 	playing = false;
 }
-void VideoStreamPlaybackWebm::play() {
 
+void VideoStreamPlaybackWebm::play() {
 	stop();
 
 	delay_compensation = ProjectSettings::get_singleton()->get("audio/video_delay_compensation_ms");
@@ -188,58 +163,52 @@ void VideoStreamPlaybackWebm::play() {
 }
 
 bool VideoStreamPlaybackWebm::is_playing() const {
-
 	return playing;
 }
 
 void VideoStreamPlaybackWebm::set_paused(bool p_paused) {
-
 	paused = p_paused;
 }
-bool VideoStreamPlaybackWebm::is_paused() const {
 
+bool VideoStreamPlaybackWebm::is_paused() const {
 	return paused;
 }
 
 void VideoStreamPlaybackWebm::set_loop(bool p_enable) {
-
 	//Empty
 }
-bool VideoStreamPlaybackWebm::has_loop() const {
 
+bool VideoStreamPlaybackWebm::has_loop() const {
 	return false;
 }
 
 float VideoStreamPlaybackWebm::get_length() const {
-
-	if (webm)
+	if (webm) {
 		return webm->getLength();
+	}
 	return 0.0f;
 }
 
 float VideoStreamPlaybackWebm::get_playback_position() const {
-
 	return video_pos;
 }
-void VideoStreamPlaybackWebm::seek(float p_time) {
 
+void VideoStreamPlaybackWebm::seek(float p_time) {
 	//Not implemented
 }
 
 void VideoStreamPlaybackWebm::set_audio_track(int p_idx) {
-
 	audio_track = p_idx;
 }
 
-Ref<Texture> VideoStreamPlaybackWebm::get_texture() const {
-
+Ref<Texture2D> VideoStreamPlaybackWebm::get_texture() const {
 	return texture;
 }
 
 void VideoStreamPlaybackWebm::update(float p_delta) {
-
-	if ((!playing || paused) || !video)
+	if ((!playing || paused) || !video) {
 		return;
+	}
 
 	time += p_delta;
 
@@ -250,16 +219,13 @@ void VideoStreamPlaybackWebm::update(float p_delta) {
 	bool audio_buffer_full = false;
 
 	if (samples_offset > -1) {
-
 		//Mix remaining samples
 		const int to_read = num_decoded_samples - samples_offset;
 		const int mixed = mix_callback(mix_udata, pcm + samples_offset * webm->getChannels(), to_read);
 		if (mixed != to_read) {
-
 			samples_offset += mixed;
 			audio_buffer_full = true;
 		} else {
-
 			samples_offset = -1;
 		}
 	}
@@ -267,10 +233,8 @@ void VideoStreamPlaybackWebm::update(float p_delta) {
 	const bool hasAudio = (audio && mix_callback);
 	while ((hasAudio && !audio_buffer_full && !has_enough_video_frames()) ||
 			(!hasAudio && video_frames_pos == 0)) {
-
 		if (hasAudio && !audio_buffer_full && audio_frame->isValid() &&
 				audio->getPCMF(*audio_frame, pcm, num_decoded_samples) && num_decoded_samples > 0) {
-
 			const int mixed = mix_callback(mix_udata, pcm, num_decoded_samples);
 
 			if (mixed != num_decoded_samples) {
@@ -281,43 +245,38 @@ void VideoStreamPlaybackWebm::update(float p_delta) {
 
 		WebMFrame *video_frame;
 		if (video_frames_pos >= video_frames_capacity) {
-
 			WebMFrame **video_frames_new = (WebMFrame **)memrealloc(video_frames, ++video_frames_capacity * sizeof(void *));
 			ERR_FAIL_COND(!video_frames_new); //Out of memory
 			(video_frames = video_frames_new)[video_frames_capacity - 1] = memnew(WebMFrame);
 		}
 		video_frame = video_frames[video_frames_pos];
 
-		if (!webm->readFrame(video_frame, audio_frame)) //This will invalidate frames
+		if (!webm->readFrame(video_frame, audio_frame)) { //This will invalidate frames
 			break; //Can't demux, EOS?
+		}
 
-		if (video_frame->isValid())
+		if (video_frame->isValid()) {
 			++video_frames_pos;
+		}
 	};
 
 	bool video_frame_done = false;
 	while (video_frames_pos > 0 && !video_frame_done) {
-
 		WebMFrame *video_frame = video_frames[0];
 
 		// It seems VPXDecoder::decode has to be executed even though we might skip this frame
 		if (video->decode(*video_frame)) {
-
 			VPXDecoder::IMAGE_ERROR err;
 			VPXDecoder::Image image;
 
 			if (should_process(*video_frame)) {
-
 				if ((err = video->getImage(image)) != VPXDecoder::NO_FRAME) {
-
 					if (err == VPXDecoder::NO_ERROR && image.w == webm->getWidth() && image.h == webm->getHeight()) {
-
-						PoolVector<uint8_t>::Write w = frame_data.write();
+						uint8_t *w = frame_data.ptrw();
 						bool converted = false;
 
 						if (image.chromaShiftW == 0 && image.chromaShiftH == 0 && image.cs == VPX_CS_SRGB) {
-
-							uint8_t *wp = w.ptr();
+							uint8_t *wp = w;
 							unsigned char *rRow = image.planes[2];
 							unsigned char *gRow = image.planes[0];
 							unsigned char *bRow = image.planes[1];
@@ -334,29 +293,25 @@ void VideoStreamPlaybackWebm::update(float p_delta) {
 							}
 							converted = true;
 						} else if (image.chromaShiftW == 1 && image.chromaShiftH == 1) {
-
-							yuv420_2_rgb8888(w.ptr(), image.planes[0], image.planes[1], image.planes[2], image.w, image.h, image.linesize[0], image.linesize[1], image.w << 2);
+							yuv420_2_rgb8888(w, image.planes[0], image.planes[1], image.planes[2], image.w, image.h, image.linesize[0], image.linesize[1], image.w << 2);
 							//libyuv::I420ToARGB(image.planes[0], image.linesize[0], image.planes[2], image.linesize[2], image.planes[1], image.linesize[1], w.ptr(), image.w << 2, image.w, image.h);
 							converted = true;
 						} else if (image.chromaShiftW == 1 && image.chromaShiftH == 0) {
-
-							yuv422_2_rgb8888(w.ptr(), image.planes[0], image.planes[1], image.planes[2], image.w, image.h, image.linesize[0], image.linesize[1], image.w << 2);
+							yuv422_2_rgb8888(w, image.planes[0], image.planes[1], image.planes[2], image.w, image.h, image.linesize[0], image.linesize[1], image.w << 2);
 							//libyuv::I422ToARGB(image.planes[0], image.linesize[0], image.planes[2], image.linesize[2], image.planes[1], image.linesize[1], w.ptr(), image.w << 2, image.w, image.h);
 							converted = true;
 						} else if (image.chromaShiftW == 0 && image.chromaShiftH == 0) {
-
-							yuv444_2_rgb8888(w.ptr(), image.planes[0], image.planes[1], image.planes[2], image.w, image.h, image.linesize[0], image.linesize[1], image.w << 2);
+							yuv444_2_rgb8888(w, image.planes[0], image.planes[1], image.planes[2], image.w, image.h, image.linesize[0], image.linesize[1], image.w << 2);
 							//libyuv::I444ToARGB(image.planes[0], image.linesize[0], image.planes[2], image.linesize[2], image.planes[1], image.linesize[1], w.ptr(), image.w << 2, image.w, image.h);
 							converted = true;
 						} else if (image.chromaShiftW == 2 && image.chromaShiftH == 0) {
-
 							//libyuv::I411ToARGB(image.planes[0], image.linesize[0], image.planes[2], image.linesize[2] image.planes[1], image.linesize[1], w.ptr(), image.w << 2, image.w, image.h);
 							//converted = true;
 						}
 
 						if (converted) {
 							Ref<Image> img = memnew(Image(image.w, image.h, 0, Image::FORMAT_RGBA8, frame_data));
-							texture->set_data(img); //Zero copy send to visual server
+							texture->update(img); //Zero copy send to visual server
 							video_frame_done = true;
 						}
 					}
@@ -369,90 +324,99 @@ void VideoStreamPlaybackWebm::update(float p_delta) {
 		video_frames[video_frames_pos] = video_frame;
 	}
 
-	if (video_frames_pos == 0 && webm->isEOS())
+	if (video_frames_pos == 0 && webm->isEOS()) {
 		stop();
+	}
 }
 
 void VideoStreamPlaybackWebm::set_mix_callback(VideoStreamPlayback::AudioMixCallback p_callback, void *p_userdata) {
-
 	mix_callback = p_callback;
 	mix_udata = p_userdata;
 }
-int VideoStreamPlaybackWebm::get_channels() const {
 
-	if (audio)
+int VideoStreamPlaybackWebm::get_channels() const {
+	if (audio) {
 		return webm->getChannels();
+	}
 	return 0;
 }
-int VideoStreamPlaybackWebm::get_mix_rate() const {
 
-	if (audio)
+int VideoStreamPlaybackWebm::get_mix_rate() const {
+	if (audio) {
 		return webm->getSampleRate();
+	}
 	return 0;
 }
 
 inline bool VideoStreamPlaybackWebm::has_enough_video_frames() const {
 	if (video_frames_pos > 0) {
-
-		const double audio_delay = AudioServer::get_singleton()->get_output_latency();
+		// FIXME: AudioServer output latency was fixed in af9bb0e, previously it used to
+		// systematically return 0. Now that it gives a proper latency, it broke this
+		// code where the delay compensation likely never really worked.
+		//const double audio_delay = AudioServer::get_singleton()->get_output_latency();
 		const double video_time = video_frames[video_frames_pos - 1]->time;
-		return video_time >= time + audio_delay + delay_compensation;
+		return video_time >= time + /* audio_delay + */ delay_compensation;
 	}
 	return false;
 }
 
 bool VideoStreamPlaybackWebm::should_process(WebMFrame &video_frame) {
-	const double audio_delay = AudioServer::get_singleton()->get_output_latency();
-	return video_frame.time >= time + audio_delay + delay_compensation;
+	// FIXME: AudioServer output latency was fixed in af9bb0e, previously it used to
+	// systematically return 0. Now that it gives a proper latency, it broke this
+	// code where the delay compensation likely never really worked.
+	//const double audio_delay = AudioServer::get_singleton()->get_output_latency();
+	return video_frame.time >= time + /* audio_delay + */ delay_compensation;
 }
 
 void VideoStreamPlaybackWebm::delete_pointers() {
-
-	if (pcm)
+	if (pcm) {
 		memfree(pcm);
+	}
 
-	if (audio_frame)
+	if (audio_frame) {
 		memdelete(audio_frame);
+	}
 	if (video_frames) {
-		for (int i = 0; i < video_frames_capacity; ++i)
+		for (int i = 0; i < video_frames_capacity; ++i) {
 			memdelete(video_frames[i]);
+		}
 		memfree(video_frames);
 	}
 
-	if (video)
+	if (video) {
 		memdelete(video);
-	if (audio)
+	}
+	if (audio) {
 		memdelete(audio);
+	}
 
-	if (webm)
+	if (webm) {
 		memdelete(webm);
+	}
 }
 
 /**/
 
-VideoStreamWebm::VideoStreamWebm() :
-		audio_track(0) {}
+VideoStreamWebm::VideoStreamWebm() {}
 
 Ref<VideoStreamPlayback> VideoStreamWebm::instance_playback() {
-
 	Ref<VideoStreamPlaybackWebm> pb = memnew(VideoStreamPlaybackWebm);
 	pb->set_audio_track(audio_track);
-	if (pb->open_file(file))
+	if (pb->open_file(file)) {
 		return pb;
-	return NULL;
+	}
+	return nullptr;
 }
 
 void VideoStreamWebm::set_file(const String &p_file) {
-
 	file = p_file;
 }
-String VideoStreamWebm::get_file() {
 
+String VideoStreamWebm::get_file() {
 	return file;
 }
 
 void VideoStreamWebm::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_file", "file"), &VideoStreamWebm::set_file);
 	ClassDB::bind_method(D_METHOD("get_file"), &VideoStreamWebm::get_file);
 
@@ -460,14 +424,12 @@ void VideoStreamWebm::_bind_methods() {
 }
 
 void VideoStreamWebm::set_audio_track(int p_track) {
-
 	audio_track = p_track;
 }
 
 ////////////
 
-RES ResourceFormatLoaderWebm::load(const String &p_path, const String &p_original_path, Error *r_error) {
-
+RES ResourceFormatLoaderWebm::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, bool p_no_cache) {
 	FileAccess *f = FileAccess::open(p_path, FileAccess::READ);
 	if (!f) {
 		if (r_error) {
@@ -491,19 +453,17 @@ RES ResourceFormatLoaderWebm::load(const String &p_path, const String &p_origina
 }
 
 void ResourceFormatLoaderWebm::get_recognized_extensions(List<String> *p_extensions) const {
-
 	p_extensions->push_back("webm");
 }
 
 bool ResourceFormatLoaderWebm::handles_type(const String &p_type) const {
-
 	return ClassDB::is_parent_class(p_type, "VideoStream");
 }
 
 String ResourceFormatLoaderWebm::get_resource_type(const String &p_path) const {
-
 	String el = p_path.get_extension().to_lower();
-	if (el == "webm")
+	if (el == "webm") {
 		return "VideoStreamWebm";
+	}
 	return "";
 }
diff --git a/modules/webm/video_stream_webm.h b/modules/webm/video_stream_webm.h
index e679196cf2..25675cb248 100644
--- a/modules/webm/video_stream_webm.h
+++ b/modules/webm/video_stream_webm.h
@@ -40,31 +40,30 @@ class VPXDecoder;
 class OpusVorbisDecoder;
 
 class VideoStreamPlaybackWebm : public VideoStreamPlayback {
-
 	GDCLASS(VideoStreamPlaybackWebm, VideoStreamPlayback);
 
 	String file_name;
-	int audio_track;
+	int audio_track = 0;
 
-	WebMDemuxer *webm;
-	VPXDecoder *video;
-	OpusVorbisDecoder *audio;
+	WebMDemuxer *webm = nullptr;
+	VPXDecoder *video = nullptr;
+	OpusVorbisDecoder *audio = nullptr;
 
-	WebMFrame **video_frames, *audio_frame;
-	int video_frames_pos, video_frames_capacity;
+	WebMFrame **video_frames = nullptr, *audio_frame = nullptr;
+	int video_frames_pos = 0, video_frames_capacity = 0;
 
-	int num_decoded_samples, samples_offset;
-	AudioMixCallback mix_callback;
-	void *mix_udata;
+	int num_decoded_samples = 0, samples_offset = -1;
+	AudioMixCallback mix_callback = nullptr;
+	void *mix_udata = nullptr;
 
-	bool playing, paused;
-	double delay_compensation;
-	double time, video_frame_delay, video_pos;
+	bool playing = false, paused = false;
+	double delay_compensation = 0.0;
+	double time = 0.0, video_frame_delay = 0.0, video_pos = 0.0;
 
-	PoolVector<uint8_t> frame_data;
+	Vector<uint8_t> frame_data;
 	Ref<ImageTexture> texture;
 
-	float *pcm;
+	float *pcm = nullptr;
 
 public:
 	VideoStreamPlaybackWebm();
@@ -72,30 +71,30 @@ public:
 
 	bool open_file(const String &p_file);
 
-	virtual void stop();
-	virtual void play();
+	virtual void stop() override;
+	virtual void play() override;
 
-	virtual bool is_playing() const;
+	virtual bool is_playing() const override;
 
-	virtual void set_paused(bool p_paused);
-	virtual bool is_paused() const;
+	virtual void set_paused(bool p_paused) override;
+	virtual bool is_paused() const override;
 
-	virtual void set_loop(bool p_enable);
-	virtual bool has_loop() const;
+	virtual void set_loop(bool p_enable) override;
+	virtual bool has_loop() const override;
 
-	virtual float get_length() const;
+	virtual float get_length() const override;
 
-	virtual float get_playback_position() const;
-	virtual void seek(float p_time);
+	virtual float get_playback_position() const override;
+	virtual void seek(float p_time) override;
 
-	virtual void set_audio_track(int p_idx);
+	virtual void set_audio_track(int p_idx) override;
 
-	virtual Ref<Texture> get_texture() const;
-	virtual void update(float p_delta);
+	virtual Ref<Texture2D> get_texture() const override;
+	virtual void update(float p_delta) override;
 
-	virtual void set_mix_callback(AudioMixCallback p_callback, void *p_userdata);
-	virtual int get_channels() const;
-	virtual int get_mix_rate() const;
+	virtual void set_mix_callback(AudioMixCallback p_callback, void *p_userdata) override;
+	virtual int get_channels() const override;
+	virtual int get_mix_rate() const override;
 
 private:
 	inline bool has_enough_video_frames() const;
@@ -107,11 +106,10 @@ private:
 /**/
 
 class VideoStreamWebm : public VideoStream {
-
 	GDCLASS(VideoStreamWebm, VideoStream);
 
 	String file;
-	int audio_track;
+	int audio_track = 0;
 
 protected:
 	static void _bind_methods();
@@ -119,16 +117,16 @@ protected:
 public:
 	VideoStreamWebm();
 
-	virtual Ref<VideoStreamPlayback> instance_playback();
+	virtual Ref<VideoStreamPlayback> instance_playback() override;
 
 	virtual void set_file(const String &p_file);
 	String get_file();
-	virtual void set_audio_track(int p_track);
+	virtual void set_audio_track(int p_track) override;
 };
 
 class ResourceFormatLoaderWebm : public ResourceFormatLoader {
 public:
-	virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
+	virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, bool p_no_cache = false);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	virtual bool handles_type(const String &p_type) const;
 	virtual String get_resource_type(const String &p_path) const;
diff --git a/modules/webp/SCsub b/modules/webp/SCsub
index 666628bb44..58f2bb35e6 100644
--- a/modules/webp/SCsub
+++ b/modules/webp/SCsub
@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_webp = env_modules.Clone()
 
 # Thirdparty source files
-if env['builtin_libwebp']:
+if env["builtin_libwebp"]:
     thirdparty_dir = "#thirdparty/libwebp/"
     thirdparty_sources = [
         "dec/alpha_dec.c",
diff --git a/modules/webp/config.py b/modules/webp/config.py
index 1c8cd12a2d..d22f9454ed 100644
--- a/modules/webp/config.py
+++ b/modules/webp/config.py
@@ -1,5 +1,6 @@
 def can_build(env, platform):
     return True
 
+
 def configure(env):
     pass
diff --git a/modules/webp/image_loader_webp.cpp b/modules/webp/image_loader_webp.cpp
index 7f4afa9a08..d5c80e7909 100644
--- a/modules/webp/image_loader_webp.cpp
+++ b/modules/webp/image_loader_webp.cpp
@@ -38,48 +38,46 @@
 #include <webp/decode.h>
 #include <webp/encode.h>
 
-static PoolVector<uint8_t> _webp_lossy_pack(const Ref<Image> &p_image, float p_quality) {
-
-	ERR_FAIL_COND_V(p_image.is_null() || p_image->empty(), PoolVector<uint8_t>());
+static Vector<uint8_t> _webp_lossy_pack(const Ref<Image> &p_image, float p_quality) {
+	ERR_FAIL_COND_V(p_image.is_null() || p_image->empty(), Vector<uint8_t>());
 
 	Ref<Image> img = p_image->duplicate();
-	if (img->detect_alpha())
+	if (img->detect_alpha()) {
 		img->convert(Image::FORMAT_RGBA8);
-	else
+	} else {
 		img->convert(Image::FORMAT_RGB8);
+	}
 
 	Size2 s(img->get_width(), img->get_height());
-	PoolVector<uint8_t> data = img->get_data();
-	PoolVector<uint8_t>::Read r = data.read();
+	Vector<uint8_t> data = img->get_data();
+	const uint8_t *r = data.ptr();
 
-	uint8_t *dst_buff = NULL;
+	uint8_t *dst_buff = nullptr;
 	size_t dst_size = 0;
 	if (img->get_format() == Image::FORMAT_RGB8) {
-
-		dst_size = WebPEncodeRGB(r.ptr(), s.width, s.height, 3 * s.width, CLAMP(p_quality * 100.0, 0, 100.0), &dst_buff);
+		dst_size = WebPEncodeRGB(r, s.width, s.height, 3 * s.width, CLAMP(p_quality * 100.0, 0, 100.0), &dst_buff);
 	} else {
-		dst_size = WebPEncodeRGBA(r.ptr(), s.width, s.height, 4 * s.width, CLAMP(p_quality * 100.0, 0, 100.0), &dst_buff);
+		dst_size = WebPEncodeRGBA(r, s.width, s.height, 4 * s.width, CLAMP(p_quality * 100.0, 0, 100.0), &dst_buff);
 	}
 
-	ERR_FAIL_COND_V(dst_size == 0, PoolVector<uint8_t>());
-	PoolVector<uint8_t> dst;
+	ERR_FAIL_COND_V(dst_size == 0, Vector<uint8_t>());
+	Vector<uint8_t> dst;
 	dst.resize(4 + dst_size);
-	PoolVector<uint8_t>::Write w = dst.write();
+	uint8_t *w = dst.ptrw();
 	w[0] = 'W';
 	w[1] = 'E';
 	w[2] = 'B';
 	w[3] = 'P';
 	copymem(&w[4], dst_buff, dst_size);
 	free(dst_buff);
-	w.release();
+
 	return dst;
 }
 
-static Ref<Image> _webp_lossy_unpack(const PoolVector<uint8_t> &p_buffer) {
-
+static Ref<Image> _webp_lossy_unpack(const Vector<uint8_t> &p_buffer) {
 	int size = p_buffer.size() - 4;
 	ERR_FAIL_COND_V(size <= 0, Ref<Image>());
-	PoolVector<uint8_t>::Read r = p_buffer.read();
+	const uint8_t *r = p_buffer.ptr();
 
 	ERR_FAIL_COND_V(r[0] != 'W' || r[1] != 'E' || r[2] != 'B' || r[3] != 'P', Ref<Image>());
 	WebPBitstreamFeatures features;
@@ -93,29 +91,26 @@ static Ref<Image> _webp_lossy_unpack(const PoolVector<uint8_t> &p_buffer) {
 	print_line("alpha: "+itos(features.has_alpha));
 	*/
 
-	PoolVector<uint8_t> dst_image;
+	Vector<uint8_t> dst_image;
 	int datasize = features.width * features.height * (features.has_alpha ? 4 : 3);
 	dst_image.resize(datasize);
 
-	PoolVector<uint8_t>::Write dst_w = dst_image.write();
+	uint8_t *dst_w = dst_image.ptrw();
 
 	bool errdec = false;
 	if (features.has_alpha) {
-		errdec = WebPDecodeRGBAInto(&r[4], size, dst_w.ptr(), datasize, 4 * features.width) == NULL;
+		errdec = WebPDecodeRGBAInto(&r[4], size, dst_w, datasize, 4 * features.width) == nullptr;
 	} else {
-		errdec = WebPDecodeRGBInto(&r[4], size, dst_w.ptr(), datasize, 3 * features.width) == NULL;
+		errdec = WebPDecodeRGBInto(&r[4], size, dst_w, datasize, 3 * features.width) == nullptr;
 	}
 
 	ERR_FAIL_COND_V_MSG(errdec, Ref<Image>(), "Failed decoding WebP image.");
 
-	dst_w.release();
-
 	Ref<Image> img = memnew(Image(features.width, features.height, 0, features.has_alpha ? Image::FORMAT_RGBA8 : Image::FORMAT_RGB8, dst_image));
 	return img;
 }
 
 Error webp_load_image_from_buffer(Image *p_image, const uint8_t *p_buffer, int p_buffer_len) {
-
 	ERR_FAIL_NULL_V(p_image, ERR_INVALID_PARAMETER);
 
 	WebPBitstreamFeatures features;
@@ -123,28 +118,26 @@ Error webp_load_image_from_buffer(Image *p_image, const uint8_t *p_buffer, int p
 		ERR_FAIL_V(ERR_FILE_CORRUPT);
 	}
 
-	PoolVector<uint8_t> dst_image;
+	Vector<uint8_t> dst_image;
 	int datasize = features.width * features.height * (features.has_alpha ? 4 : 3);
 	dst_image.resize(datasize);
-	PoolVector<uint8_t>::Write dst_w = dst_image.write();
+	uint8_t *dst_w = dst_image.ptrw();
 
 	bool errdec = false;
 	if (features.has_alpha) {
-		errdec = WebPDecodeRGBAInto(p_buffer, p_buffer_len, dst_w.ptr(), datasize, 4 * features.width) == NULL;
+		errdec = WebPDecodeRGBAInto(p_buffer, p_buffer_len, dst_w, datasize, 4 * features.width) == nullptr;
 	} else {
-		errdec = WebPDecodeRGBInto(p_buffer, p_buffer_len, dst_w.ptr(), datasize, 3 * features.width) == NULL;
+		errdec = WebPDecodeRGBInto(p_buffer, p_buffer_len, dst_w, datasize, 3 * features.width) == nullptr;
 	}
-	dst_w.release();
 
 	ERR_FAIL_COND_V_MSG(errdec, ERR_FILE_CORRUPT, "Failed decoding WebP image.");
 
-	p_image->create(features.width, features.height, 0, features.has_alpha ? Image::FORMAT_RGBA8 : Image::FORMAT_RGB8, dst_image);
+	p_image->create(features.width, features.height, false, features.has_alpha ? Image::FORMAT_RGBA8 : Image::FORMAT_RGB8, dst_image);
 
 	return OK;
 }
 
 static Ref<Image> _webp_mem_loader_func(const uint8_t *p_png, int p_size) {
-
 	Ref<Image> img;
 	img.instance();
 	Error err = webp_load_image_from_buffer(img.ptr(), p_png, p_size);
@@ -153,25 +146,23 @@ static Ref<Image> _webp_mem_loader_func(const uint8_t *p_png, int p_size) {
 }
 
 Error ImageLoaderWEBP::load_image(Ref<Image> p_image, FileAccess *f, bool p_force_linear, float p_scale) {
-
-	PoolVector<uint8_t> src_image;
+	Vector<uint8_t> src_image;
 	int src_image_len = f->get_len();
 	ERR_FAIL_COND_V(src_image_len == 0, ERR_FILE_CORRUPT);
 	src_image.resize(src_image_len);
 
-	PoolVector<uint8_t>::Write w = src_image.write();
+	uint8_t *w = src_image.ptrw();
 
 	f->get_buffer(&w[0], src_image_len);
 
 	f->close();
 
-	Error err = webp_load_image_from_buffer(p_image.ptr(), w.ptr(), src_image_len);
+	Error err = webp_load_image_from_buffer(p_image.ptr(), w, src_image_len);
 
 	return err;
 }
 
 void ImageLoaderWEBP::get_recognized_extensions(List<String> *p_extensions) const {
-
 	p_extensions->push_back("webp");
 }
 
diff --git a/modules/webp/image_loader_webp.h b/modules/webp/image_loader_webp.h
index 9206ca2525..49a7407600 100644
--- a/modules/webp/image_loader_webp.h
+++ b/modules/webp/image_loader_webp.h
@@ -34,7 +34,6 @@
 #include "core/io/image_loader.h"
 
 class ImageLoaderWEBP : public ImageFormatLoader {
-
 public:
 	virtual Error load_image(Ref<Image> p_image, FileAccess *f, bool p_force_linear, float p_scale);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
diff --git a/modules/webp/register_types.cpp b/modules/webp/register_types.cpp
index 12a0c05f44..0788b06309 100644
--- a/modules/webp/register_types.cpp
+++ b/modules/webp/register_types.cpp
@@ -32,15 +32,13 @@
 
 #include "image_loader_webp.h"
 
-static ImageLoaderWEBP *image_loader_webp = NULL;
+static ImageLoaderWEBP *image_loader_webp = nullptr;
 
 void register_webp_types() {
-
 	image_loader_webp = memnew(ImageLoaderWEBP);
 	ImageLoader::add_image_format_loader(image_loader_webp);
 }
 
 void unregister_webp_types() {
-
 	memdelete(image_loader_webp);
 }
diff --git a/modules/webp/register_types.h b/modules/webp/register_types.h
index 9591b91558..d574d7be1d 100644
--- a/modules/webp/register_types.h
+++ b/modules/webp/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef WEBP_REGISTER_TYPES_H
+#define WEBP_REGISTER_TYPES_H
+
 void register_webp_types();
 void unregister_webp_types();
+
+#endif // WEBP_REGISTER_TYPES_H
diff --git a/modules/webrtc/SCsub b/modules/webrtc/SCsub
index 868553b879..20b4c8f8d2 100644
--- a/modules/webrtc/SCsub
+++ b/modules/webrtc/SCsub
@@ -1,15 +1,15 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 # Thirdparty source files
 
 env_webrtc = env_modules.Clone()
 use_gdnative = env_webrtc["module_gdnative_enabled"]
 
-if use_gdnative: # GDNative is retained in Javascript for export compatibility
-    env_webrtc.Append(CPPDEFINES=['WEBRTC_GDNATIVE_ENABLED'])
+if use_gdnative:  # GDNative is retained in Javascript for export compatibility
+    env_webrtc.Append(CPPDEFINES=["WEBRTC_GDNATIVE_ENABLED"])
     env_webrtc.Prepend(CPPPATH=["#modules/gdnative/include/"])
 
 env_webrtc.add_source_files(env.modules_sources, "*.cpp")
diff --git a/modules/webrtc/config.py b/modules/webrtc/config.py
index 48b4c33c5d..0a075ccef1 100644
--- a/modules/webrtc/config.py
+++ b/modules/webrtc/config.py
@@ -1,15 +1,18 @@
 def can_build(env, platform):
     return True
 
+
 def configure(env):
     pass
 
+
 def get_doc_classes():
     return [
         "WebRTCPeerConnection",
         "WebRTCDataChannel",
-        "WebRTCMultiplayer"
+        "WebRTCMultiplayer",
     ]
 
+
 def get_doc_path():
     return "doc_classes"
diff --git a/modules/webrtc/doc_classes/WebRTCPeerConnection.xml b/modules/webrtc/doc_classes/WebRTCPeerConnection.xml
index 504b4705d8..c80b903e39 100644
--- a/modules/webrtc/doc_classes/WebRTCPeerConnection.xml
+++ b/modules/webrtc/doc_classes/WebRTCPeerConnection.xml
@@ -97,7 +97,7 @@
 				        {
 				            "urls": [ "turn:turn.example.com:3478" ], # One or more TURN servers.
 				            "username": "a_username", # Optional username for the TURN server.
-				            "credentials": "a_password", # Optional password for the TURN server.
+				            "credential": "a_password", # Optional password for the TURN server.
 				        }
 				    ]
 				}
@@ -120,7 +120,7 @@
 			</argument>
 			<description>
 				Sets the SDP description of the local peer. This should be called in response to [signal session_description_created].
-				If [code]type[/code] is [code]answer[/code] the peer will start emitting [signal ice_candidate_created].
+				After calling this function the peer will start emitting [signal ice_candidate_created] (unless an [enum Error] different from [constant OK] is returned).
 			</description>
 		</method>
 		<method name="set_remote_description">
diff --git a/modules/webrtc/register_types.h b/modules/webrtc/register_types.h
index e6b50506e5..8f5b9e8452 100644
--- a/modules/webrtc/register_types.h
+++ b/modules/webrtc/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef WEBRTC_REGISTER_TYPES_H
+#define WEBRTC_REGISTER_TYPES_H
+
 void register_webrtc_types();
 void unregister_webrtc_types();
+
+#endif // WEBRTC_REGISTER_TYPES_H
diff --git a/modules/webrtc/webrtc_data_channel.h b/modules/webrtc/webrtc_data_channel.h
index e61f786ca1..1407f1e3bd 100644
--- a/modules/webrtc/webrtc_data_channel.h
+++ b/modules/webrtc/webrtc_data_channel.h
@@ -73,13 +73,6 @@ public:
 	virtual Error poll() = 0;
 	virtual void close() = 0;
 
-	/** Inherited from PacketPeer: **/
-	virtual int get_available_packet_count() const = 0;
-	virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size) = 0; ///< buffer is GONE after next get_packet
-	virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size) = 0;
-
-	virtual int get_max_packet_size() const = 0;
-
 	WebRTCDataChannel();
 	~WebRTCDataChannel();
 };
diff --git a/modules/webrtc/webrtc_data_channel_gdnative.cpp b/modules/webrtc/webrtc_data_channel_gdnative.cpp
index b0c4b473fc..67ad2c07ce 100644
--- a/modules/webrtc/webrtc_data_channel_gdnative.cpp
+++ b/modules/webrtc/webrtc_data_channel_gdnative.cpp
@@ -39,94 +39,94 @@ void WebRTCDataChannelGDNative::_bind_methods() {
 }
 
 WebRTCDataChannelGDNative::WebRTCDataChannelGDNative() {
-	interface = NULL;
+	interface = nullptr;
 }
 
 WebRTCDataChannelGDNative::~WebRTCDataChannelGDNative() {
 }
 
 Error WebRTCDataChannelGDNative::poll() {
-	ERR_FAIL_COND_V(interface == NULL, ERR_UNCONFIGURED);
+	ERR_FAIL_COND_V(interface == nullptr, ERR_UNCONFIGURED);
 	return (Error)interface->poll(interface->data);
 }
 
 void WebRTCDataChannelGDNative::close() {
-	ERR_FAIL_COND(interface == NULL);
+	ERR_FAIL_COND(interface == nullptr);
 	interface->close(interface->data);
 }
 
 void WebRTCDataChannelGDNative::set_write_mode(WriteMode p_mode) {
-	ERR_FAIL_COND(interface == NULL);
+	ERR_FAIL_COND(interface == nullptr);
 	interface->set_write_mode(interface->data, p_mode);
 }
 
 WebRTCDataChannel::WriteMode WebRTCDataChannelGDNative::get_write_mode() const {
-	ERR_FAIL_COND_V(interface == NULL, WRITE_MODE_BINARY);
+	ERR_FAIL_COND_V(interface == nullptr, WRITE_MODE_BINARY);
 	return (WriteMode)interface->get_write_mode(interface->data);
 }
 
 bool WebRTCDataChannelGDNative::was_string_packet() const {
-	ERR_FAIL_COND_V(interface == NULL, false);
+	ERR_FAIL_COND_V(interface == nullptr, false);
 	return interface->was_string_packet(interface->data);
 }
 
 WebRTCDataChannel::ChannelState WebRTCDataChannelGDNative::get_ready_state() const {
-	ERR_FAIL_COND_V(interface == NULL, STATE_CLOSED);
+	ERR_FAIL_COND_V(interface == nullptr, STATE_CLOSED);
 	return (ChannelState)interface->get_ready_state(interface->data);
 }
 
 String WebRTCDataChannelGDNative::get_label() const {
-	ERR_FAIL_COND_V(interface == NULL, "");
+	ERR_FAIL_COND_V(interface == nullptr, "");
 	return String(interface->get_label(interface->data));
 }
 
 bool WebRTCDataChannelGDNative::is_ordered() const {
-	ERR_FAIL_COND_V(interface == NULL, false);
+	ERR_FAIL_COND_V(interface == nullptr, false);
 	return interface->is_ordered(interface->data);
 }
 
 int WebRTCDataChannelGDNative::get_id() const {
-	ERR_FAIL_COND_V(interface == NULL, -1);
+	ERR_FAIL_COND_V(interface == nullptr, -1);
 	return interface->get_id(interface->data);
 }
 
 int WebRTCDataChannelGDNative::get_max_packet_life_time() const {
-	ERR_FAIL_COND_V(interface == NULL, -1);
+	ERR_FAIL_COND_V(interface == nullptr, -1);
 	return interface->get_max_packet_life_time(interface->data);
 }
 
 int WebRTCDataChannelGDNative::get_max_retransmits() const {
-	ERR_FAIL_COND_V(interface == NULL, -1);
+	ERR_FAIL_COND_V(interface == nullptr, -1);
 	return interface->get_max_retransmits(interface->data);
 }
 
 String WebRTCDataChannelGDNative::get_protocol() const {
-	ERR_FAIL_COND_V(interface == NULL, "");
+	ERR_FAIL_COND_V(interface == nullptr, "");
 	return String(interface->get_protocol(interface->data));
 }
 
 bool WebRTCDataChannelGDNative::is_negotiated() const {
-	ERR_FAIL_COND_V(interface == NULL, false);
+	ERR_FAIL_COND_V(interface == nullptr, false);
 	return interface->is_negotiated(interface->data);
 }
 
 Error WebRTCDataChannelGDNative::get_packet(const uint8_t **r_buffer, int &r_buffer_size) {
-	ERR_FAIL_COND_V(interface == NULL, ERR_UNCONFIGURED);
+	ERR_FAIL_COND_V(interface == nullptr, ERR_UNCONFIGURED);
 	return (Error)interface->get_packet(interface->data, r_buffer, &r_buffer_size);
 }
 
 Error WebRTCDataChannelGDNative::put_packet(const uint8_t *p_buffer, int p_buffer_size) {
-	ERR_FAIL_COND_V(interface == NULL, ERR_UNCONFIGURED);
+	ERR_FAIL_COND_V(interface == nullptr, ERR_UNCONFIGURED);
 	return (Error)interface->put_packet(interface->data, p_buffer, p_buffer_size);
 }
 
 int WebRTCDataChannelGDNative::get_max_packet_size() const {
-	ERR_FAIL_COND_V(interface == NULL, 0);
+	ERR_FAIL_COND_V(interface == nullptr, 0);
 	return interface->get_max_packet_size(interface->data);
 }
 
 int WebRTCDataChannelGDNative::get_available_packet_count() const {
-	ERR_FAIL_COND_V(interface == NULL, 0);
+	ERR_FAIL_COND_V(interface == nullptr, 0);
 	return interface->get_available_packet_count(interface->data);
 }
 
diff --git a/modules/webrtc/webrtc_data_channel_gdnative.h b/modules/webrtc/webrtc_data_channel_gdnative.h
index be3ea13028..03396d207d 100644
--- a/modules/webrtc/webrtc_data_channel_gdnative.h
+++ b/modules/webrtc/webrtc_data_channel_gdnative.h
@@ -28,11 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifdef WEBRTC_GDNATIVE_ENABLED
-
 #ifndef WEBRTC_DATA_CHANNEL_GDNATIVE_H
 #define WEBRTC_DATA_CHANNEL_GDNATIVE_H
 
+#ifdef WEBRTC_GDNATIVE_ENABLED
+
 #include "modules/gdnative/include/net/godot_net.h"
 #include "webrtc_data_channel.h"
 
@@ -48,33 +48,33 @@ private:
 public:
 	void set_native_webrtc_data_channel(const godot_net_webrtc_data_channel *p_impl);
 
-	virtual void set_write_mode(WriteMode mode);
-	virtual WriteMode get_write_mode() const;
-	virtual bool was_string_packet() const;
+	virtual void set_write_mode(WriteMode mode) override;
+	virtual WriteMode get_write_mode() const override;
+	virtual bool was_string_packet() const override;
 
-	virtual ChannelState get_ready_state() const;
-	virtual String get_label() const;
-	virtual bool is_ordered() const;
-	virtual int get_id() const;
-	virtual int get_max_packet_life_time() const;
-	virtual int get_max_retransmits() const;
-	virtual String get_protocol() const;
-	virtual bool is_negotiated() const;
+	virtual ChannelState get_ready_state() const override;
+	virtual String get_label() const override;
+	virtual bool is_ordered() const override;
+	virtual int get_id() const override;
+	virtual int get_max_packet_life_time() const override;
+	virtual int get_max_retransmits() const override;
+	virtual String get_protocol() const override;
+	virtual bool is_negotiated() const override;
 
-	virtual Error poll();
-	virtual void close();
+	virtual Error poll() override;
+	virtual void close() override;
 
 	/** Inherited from PacketPeer: **/
-	virtual int get_available_packet_count() const;
-	virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size); ///< buffer is GONE after next get_packet
-	virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size);
+	virtual int get_available_packet_count() const override;
+	virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size) override; ///< buffer is GONE after next get_packet
+	virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size) override;
 
-	virtual int get_max_packet_size() const;
+	virtual int get_max_packet_size() const override;
 
 	WebRTCDataChannelGDNative();
 	~WebRTCDataChannelGDNative();
 };
 
-#endif // WEBRTC_DATA_CHANNEL_GDNATIVE_H
-
 #endif // WEBRTC_GDNATIVE_ENABLED
+
+#endif // WEBRTC_DATA_CHANNEL_GDNATIVE_H
diff --git a/modules/webrtc/webrtc_data_channel_js.cpp b/modules/webrtc/webrtc_data_channel_js.cpp
index 37203a4ec9..2c648ba9f9 100644
--- a/modules/webrtc/webrtc_data_channel_js.cpp
+++ b/modules/webrtc/webrtc_data_channel_js.cpp
@@ -68,7 +68,6 @@ void WebRTCDataChannelJS::_on_error() {
 }
 
 void WebRTCDataChannelJS::_on_message(uint8_t *p_data, uint32_t p_size, bool p_is_string) {
-
 	ERR_FAIL_COND_MSG(in_buffer.space_left() < (int)(p_size + 5), "Buffer full! Dropping data.");
 
 	uint8_t is_string = p_is_string ? 1 : 0;
@@ -312,14 +311,14 @@ WebRTCDataChannelJS::WebRTCDataChannelJS(int js_id) {
 				return;
 			}
 			var len = buffer.length*buffer.BYTES_PER_ELEMENT;
-			var out = Module._malloc(len);
-			Module.HEAPU8.set(buffer, out);
+			var out = _malloc(len);
+			HEAPU8.set(buffer, out);
 			ccall("_emrtc_on_ch_message",
 				"void",
 				["number", "number", "number", "number"],
 				[c_ptr, out, len, is_string]
 			);
-			Module._free(out);
+			_free(out);
 		}
 
 	}, this, js_id);
@@ -334,7 +333,7 @@ WebRTCDataChannelJS::WebRTCDataChannelJS(int js_id) {
 		stringToUTF8(str, ptr, len+1);
 		return ptr;
 	}, js_id);
-	if(str != NULL) {
+	if(str != nullptr) {
 		_label.parse_utf8(str);
 		EM_ASM({ _free($0) }, str);
 	}
@@ -347,7 +346,7 @@ WebRTCDataChannelJS::WebRTCDataChannelJS(int js_id) {
 		stringToUTF8(str, ptr, len+1);
 		return ptr;
 	}, js_id);
-	if(str != NULL) {
+	if(str != nullptr) {
 		_protocol.parse_utf8(str);
 		EM_ASM({ _free($0) }, str);
 	}
diff --git a/modules/webrtc/webrtc_data_channel_js.h b/modules/webrtc/webrtc_data_channel_js.h
index 00b5963ea1..7545910e66 100644
--- a/modules/webrtc/webrtc_data_channel_js.h
+++ b/modules/webrtc/webrtc_data_channel_js.h
@@ -28,11 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifdef JAVASCRIPT_ENABLED
-
 #ifndef WEBRTC_DATA_CHANNEL_JS_H
 #define WEBRTC_DATA_CHANNEL_JS_H
 
+#ifdef JAVASCRIPT_ENABLED
+
 #include "webrtc_data_channel.h"
 
 class WebRTCDataChannelJS : public WebRTCDataChannel {
@@ -60,34 +60,34 @@ public:
 	void _on_error();
 	void _on_message(uint8_t *p_data, uint32_t p_size, bool p_is_string);
 
-	virtual void set_write_mode(WriteMode mode);
-	virtual WriteMode get_write_mode() const;
-	virtual bool was_string_packet() const;
+	virtual void set_write_mode(WriteMode mode) override;
+	virtual WriteMode get_write_mode() const override;
+	virtual bool was_string_packet() const override;
 
-	virtual ChannelState get_ready_state() const;
-	virtual String get_label() const;
-	virtual bool is_ordered() const;
-	virtual int get_id() const;
-	virtual int get_max_packet_life_time() const;
-	virtual int get_max_retransmits() const;
-	virtual String get_protocol() const;
-	virtual bool is_negotiated() const;
+	virtual ChannelState get_ready_state() const override;
+	virtual String get_label() const override;
+	virtual bool is_ordered() const override;
+	virtual int get_id() const override;
+	virtual int get_max_packet_life_time() const override;
+	virtual int get_max_retransmits() const override;
+	virtual String get_protocol() const override;
+	virtual bool is_negotiated() const override;
 
-	virtual Error poll();
-	virtual void close();
+	virtual Error poll() override;
+	virtual void close() override;
 
 	/** Inherited from PacketPeer: **/
-	virtual int get_available_packet_count() const;
-	virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size); ///< buffer is GONE after next get_packet
-	virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size);
+	virtual int get_available_packet_count() const override;
+	virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size) override; ///< buffer is GONE after next get_packet
+	virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size) override;
 
-	virtual int get_max_packet_size() const;
+	virtual int get_max_packet_size() const override;
 
 	WebRTCDataChannelJS();
 	WebRTCDataChannelJS(int js_id);
 	~WebRTCDataChannelJS();
 };
 
-#endif // WEBRTC_DATA_CHANNEL_JS_H
-
 #endif // JAVASCRIPT_ENABLED
+
+#endif // WEBRTC_DATA_CHANNEL_JS_H
diff --git a/modules/webrtc/webrtc_multiplayer.cpp b/modules/webrtc/webrtc_multiplayer.cpp
index 9df2420bbc..e0c0cad68c 100644
--- a/modules/webrtc/webrtc_multiplayer.cpp
+++ b/modules/webrtc/webrtc_multiplayer.cpp
@@ -65,12 +65,13 @@ bool WebRTCMultiplayer::is_server() const {
 }
 
 void WebRTCMultiplayer::poll() {
-	if (peer_map.size() == 0)
+	if (peer_map.size() == 0) {
 		return;
+	}
 
 	List<int> remove;
 	List<int> add;
-	for (Map<int, Ref<ConnectedPeer> >::Element *E = peer_map.front(); E; E = E->next()) {
+	for (Map<int, Ref<ConnectedPeer>>::Element *E = peer_map.front(); E; E = E->next()) {
 		Ref<ConnectedPeer> peer = E->get();
 		peer->connection->poll();
 		// Check peer state
@@ -89,7 +90,7 @@ void WebRTCMultiplayer::poll() {
 		}
 		// Check channels state
 		int ready = 0;
-		for (List<Ref<WebRTCDataChannel> >::Element *C = peer->channels.front(); C && C->get().is_valid(); C = C->next()) {
+		for (List<Ref<WebRTCDataChannel>>::Element *C = peer->channels.front(); C && C->get().is_valid(); C = C->next()) {
 			Ref<WebRTCDataChannel> ch = C->get();
 			switch (ch->get_ready_state()) {
 				case WebRTCDataChannel::STATE_CONNECTING:
@@ -113,15 +114,17 @@ void WebRTCMultiplayer::poll() {
 	// Remove disconnected peers
 	for (List<int>::Element *E = remove.front(); E; E = E->next()) {
 		remove_peer(E->get());
-		if (next_packet_peer == E->get())
+		if (next_packet_peer == E->get()) {
 			next_packet_peer = 0;
+		}
 	}
 	// Signal newly connected peers
 	for (List<int>::Element *E = add.front(); E; E = E->next()) {
 		// Already connected to server: simply notify new peer.
 		// NOTE: Mesh is always connected.
-		if (connection_status == CONNECTION_CONNECTED)
+		if (connection_status == CONNECTION_CONNECTED) {
 			emit_signal("peer_connected", E->get());
+		}
 
 		// Server emulation mode suppresses peer_conencted until server connects.
 		if (server_compat && E->get() == TARGET_PEER_SERVER) {
@@ -130,24 +133,28 @@ void WebRTCMultiplayer::poll() {
 			emit_signal("peer_connected", TARGET_PEER_SERVER);
 			emit_signal("connection_succeeded");
 			// Notify of all previously connected peers
-			for (Map<int, Ref<ConnectedPeer> >::Element *F = peer_map.front(); F; F = F->next()) {
-				if (F->key() != 1 && F->get()->connected)
+			for (Map<int, Ref<ConnectedPeer>>::Element *F = peer_map.front(); F; F = F->next()) {
+				if (F->key() != 1 && F->get()->connected) {
 					emit_signal("peer_connected", F->key());
+				}
 			}
 			break; // Because we already notified of all newly added peers.
 		}
 	}
 	// Fetch next packet
-	if (next_packet_peer == 0)
+	if (next_packet_peer == 0) {
 		_find_next_peer();
+	}
 }
 
 void WebRTCMultiplayer::_find_next_peer() {
-	Map<int, Ref<ConnectedPeer> >::Element *E = peer_map.find(next_packet_peer);
-	if (E) E = E->next();
+	Map<int, Ref<ConnectedPeer>>::Element *E = peer_map.find(next_packet_peer);
+	if (E) {
+		E = E->next();
+	}
 	// After last.
 	while (E) {
-		for (List<Ref<WebRTCDataChannel> >::Element *F = E->get()->channels.front(); F; F = F->next()) {
+		for (List<Ref<WebRTCDataChannel>>::Element *F = E->get()->channels.front(); F; F = F->next()) {
 			if (F->get()->get_available_packet_count()) {
 				next_packet_peer = E->key();
 				return;
@@ -158,14 +165,15 @@ void WebRTCMultiplayer::_find_next_peer() {
 	E = peer_map.front();
 	// Before last
 	while (E) {
-		for (List<Ref<WebRTCDataChannel> >::Element *F = E->get()->channels.front(); F; F = F->next()) {
+		for (List<Ref<WebRTCDataChannel>>::Element *F = E->get()->channels.front(); F; F = F->next()) {
 			if (F->get()->get_available_packet_count()) {
 				next_packet_peer = E->key();
 				return;
 			}
 		}
-		if (E->key() == (int)next_packet_peer)
+		if (E->key() == (int)next_packet_peer) {
 			break;
+		}
 		E = E->next();
 	}
 	// No packet found
@@ -190,10 +198,11 @@ Error WebRTCMultiplayer::initialize(int p_self_id, bool p_server_compat) {
 	server_compat = p_server_compat;
 
 	// Mesh and server are always connected
-	if (!server_compat || p_self_id == 1)
+	if (!server_compat || p_self_id == 1) {
 		connection_status = CONNECTION_CONNECTED;
-	else
+	} else {
 		connection_status = CONNECTION_CONNECTING;
+	}
 	return OK;
 }
 
@@ -204,7 +213,7 @@ int WebRTCMultiplayer::get_unique_id() const {
 
 void WebRTCMultiplayer::_peer_to_dict(Ref<ConnectedPeer> p_connected_peer, Dictionary &r_dict) {
 	Array channels;
-	for (List<Ref<WebRTCDataChannel> >::Element *F = p_connected_peer->channels.front(); F; F = F->next()) {
+	for (List<Ref<WebRTCDataChannel>>::Element *F = p_connected_peer->channels.front(); F; F = F->next()) {
 		channels.push_back(F->get());
 	}
 	r_dict["connection"] = p_connected_peer->connection;
@@ -225,7 +234,7 @@ Dictionary WebRTCMultiplayer::get_peer(int p_peer_id) {
 
 Dictionary WebRTCMultiplayer::get_peers() {
 	Dictionary out;
-	for (Map<int, Ref<ConnectedPeer> >::Element *E = peer_map.front(); E; E = E->next()) {
+	for (Map<int, Ref<ConnectedPeer>>::Element *E = peer_map.front(); E; E = E->next()) {
 		Dictionary d;
 		_peer_to_dict(E->get(), d);
 		out[E->key()] = d;
@@ -288,7 +297,7 @@ Error WebRTCMultiplayer::get_packet(const uint8_t **r_buffer, int &r_buffer_size
 		_find_next_peer();
 		ERR_FAIL_V(ERR_UNAVAILABLE);
 	}
-	for (List<Ref<WebRTCDataChannel> >::Element *E = peer_map[next_packet_peer]->channels.front(); E; E = E->next()) {
+	for (List<Ref<WebRTCDataChannel>>::Element *E = peer_map[next_packet_peer]->channels.front(); E; E = E->next()) {
 		if (E->get()->get_available_packet_count()) {
 			Error err = E->get()->get_packet(r_buffer, r_buffer_size);
 			_find_next_peer();
@@ -316,10 +325,9 @@ Error WebRTCMultiplayer::put_packet(const uint8_t *p_buffer, int p_buffer_size)
 			break;
 	}
 
-	Map<int, Ref<ConnectedPeer> >::Element *E = NULL;
+	Map<int, Ref<ConnectedPeer>>::Element *E = nullptr;
 
 	if (target_peer > 0) {
-
 		E = peer_map.find(target_peer);
 		ERR_FAIL_COND_V_MSG(!E, ERR_INVALID_PARAMETER, "Invalid target peer: " + itos(target_peer) + ".");
 
@@ -330,11 +338,11 @@ Error WebRTCMultiplayer::put_packet(const uint8_t *p_buffer, int p_buffer_size)
 	} else {
 		int exclude = -target_peer;
 
-		for (Map<int, Ref<ConnectedPeer> >::Element *F = peer_map.front(); F; F = F->next()) {
-
+		for (Map<int, Ref<ConnectedPeer>>::Element *F = peer_map.front(); F; F = F->next()) {
 			// Exclude packet. If target_peer == 0 then don't exclude any packets
-			if (target_peer != 0 && F->key() == exclude)
+			if (target_peer != 0 && F->key() == exclude) {
 				continue;
+			}
 
 			ERR_CONTINUE(F->value()->channels.size() <= ch || !F->value()->channels[ch].is_valid());
 			F->value()->channels[ch]->put_packet(p_buffer, p_buffer_size);
@@ -344,11 +352,12 @@ Error WebRTCMultiplayer::put_packet(const uint8_t *p_buffer, int p_buffer_size)
 }
 
 int WebRTCMultiplayer::get_available_packet_count() const {
-	if (next_packet_peer == 0)
+	if (next_packet_peer == 0) {
 		return 0; // To be sure next call to get_packet works if size > 0 .
+	}
 	int size = 0;
-	for (Map<int, Ref<ConnectedPeer> >::Element *E = peer_map.front(); E; E = E->next()) {
-		for (List<Ref<WebRTCDataChannel> >::Element *F = E->get()->channels.front(); F; F = F->next()) {
+	for (Map<int, Ref<ConnectedPeer>>::Element *E = peer_map.front(); E; E = E->next()) {
+		for (List<Ref<WebRTCDataChannel>>::Element *F = E->get()->channels.front(); F; F = F->next()) {
 			size += F->get()->get_available_packet_count();
 		}
 	}
@@ -371,6 +380,7 @@ WebRTCMultiplayer::WebRTCMultiplayer() {
 	unique_id = 0;
 	next_packet_peer = 0;
 	target_peer = 0;
+	client_count = 0;
 	transfer_mode = TRANSFER_MODE_RELIABLE;
 	refuse_connections = false;
 	connection_status = CONNECTION_DISCONNECTED;
diff --git a/modules/webrtc/webrtc_multiplayer.h b/modules/webrtc/webrtc_multiplayer.h
index 66a3cd0ff5..fb37bd7722 100644
--- a/modules/webrtc/webrtc_multiplayer.h
+++ b/modules/webrtc/webrtc_multiplayer.h
@@ -35,7 +35,6 @@
 #include "webrtc_peer_connection.h"
 
 class WebRTCMultiplayer : public NetworkedMultiplayerPeer {
-
 	GDCLASS(WebRTCMultiplayer, NetworkedMultiplayerPeer);
 
 protected:
@@ -50,16 +49,16 @@ private:
 	};
 
 	class ConnectedPeer : public Reference {
-
 	public:
 		Ref<WebRTCPeerConnection> connection;
-		List<Ref<WebRTCDataChannel> > channels;
+		List<Ref<WebRTCDataChannel>> channels;
 		bool connected;
 
 		ConnectedPeer() {
 			connected = false;
-			for (int i = 0; i < CH_RESERVED_MAX; i++)
+			for (int i = 0; i < CH_RESERVED_MAX; i++) {
 				channels.push_front(Ref<WebRTCDataChannel>());
+			}
 		}
 	};
 
@@ -72,7 +71,7 @@ private:
 	int next_packet_peer;
 	bool server_compat;
 
-	Map<int, Ref<ConnectedPeer> > peer_map;
+	Map<int, Ref<ConnectedPeer>> peer_map;
 
 	void _peer_to_dict(Ref<ConnectedPeer> p_connected_peer, Dictionary &r_dict);
 	void _find_next_peer();
@@ -90,27 +89,27 @@ public:
 	void close();
 
 	// PacketPeer
-	Error get_packet(const uint8_t **r_buffer, int &r_buffer_size); ///< buffer is GONE after next get_packet
-	Error put_packet(const uint8_t *p_buffer, int p_buffer_size);
-	int get_available_packet_count() const;
-	int get_max_packet_size() const;
+	Error get_packet(const uint8_t **r_buffer, int &r_buffer_size) override; ///< buffer is GONE after next get_packet
+	Error put_packet(const uint8_t *p_buffer, int p_buffer_size) override;
+	int get_available_packet_count() const override;
+	int get_max_packet_size() const override;
 
 	// NetworkedMultiplayerPeer
-	void set_transfer_mode(TransferMode p_mode);
-	TransferMode get_transfer_mode() const;
-	void set_target_peer(int p_peer_id);
+	void set_transfer_mode(TransferMode p_mode) override;
+	TransferMode get_transfer_mode() const override;
+	void set_target_peer(int p_peer_id) override;
 
-	int get_unique_id() const;
-	int get_packet_peer() const;
+	int get_unique_id() const override;
+	int get_packet_peer() const override;
 
-	bool is_server() const;
+	bool is_server() const override;
 
-	void poll();
+	void poll() override;
 
-	void set_refuse_new_connections(bool p_enable);
-	bool is_refusing_new_connections() const;
+	void set_refuse_new_connections(bool p_enable) override;
+	bool is_refusing_new_connections() const override;
 
-	ConnectionStatus get_connection_status() const;
+	ConnectionStatus get_connection_status() const override;
 };
 
-#endif
+#endif // WEBRTC_MULTIPLAYER_H
diff --git a/modules/webrtc/webrtc_peer_connection.cpp b/modules/webrtc/webrtc_peer_connection.cpp
index 90c62e2495..670924bca2 100644
--- a/modules/webrtc/webrtc_peer_connection.cpp
+++ b/modules/webrtc/webrtc_peer_connection.cpp
@@ -30,17 +30,16 @@
 
 #include "webrtc_peer_connection.h"
 
-WebRTCPeerConnection *(*WebRTCPeerConnection::_create)() = NULL;
+WebRTCPeerConnection *(*WebRTCPeerConnection::_create)() = nullptr;
 
 Ref<WebRTCPeerConnection> WebRTCPeerConnection::create_ref() {
-
 	return create();
 }
 
 WebRTCPeerConnection *WebRTCPeerConnection::create() {
-
-	if (!_create)
-		return NULL;
+	if (!_create) {
+		return nullptr;
+	}
 	return _create();
 }
 
diff --git a/modules/webrtc/webrtc_peer_connection_gdnative.cpp b/modules/webrtc/webrtc_peer_connection_gdnative.cpp
index 411ad50275..aaa45d3a54 100644
--- a/modules/webrtc/webrtc_peer_connection_gdnative.cpp
+++ b/modules/webrtc/webrtc_peer_connection_gdnative.cpp
@@ -36,12 +36,12 @@
 #include "modules/gdnative/nativescript/nativescript.h"
 #include "webrtc_data_channel_gdnative.h"
 
-const godot_net_webrtc_library *WebRTCPeerConnectionGDNative::default_library = NULL;
+const godot_net_webrtc_library *WebRTCPeerConnectionGDNative::default_library = nullptr;
 
 Error WebRTCPeerConnectionGDNative::set_default_library(const godot_net_webrtc_library *p_lib) {
 	if (default_library) {
 		const godot_net_webrtc_library *old = default_library;
-		default_library = NULL;
+		default_library = nullptr;
 		old->unregistered();
 	}
 	default_library = p_lib;
@@ -49,7 +49,6 @@ Error WebRTCPeerConnectionGDNative::set_default_library(const godot_net_webrtc_l
 }
 
 WebRTCPeerConnection *WebRTCPeerConnectionGDNative::_create() {
-
 	WebRTCPeerConnectionGDNative *obj = memnew(WebRTCPeerConnectionGDNative);
 	ERR_FAIL_COND_V_MSG(!default_library, obj, "Default GDNative WebRTC implementation not defined.");
 
@@ -64,54 +63,54 @@ void WebRTCPeerConnectionGDNative::_bind_methods() {
 }
 
 WebRTCPeerConnectionGDNative::WebRTCPeerConnectionGDNative() {
-	interface = NULL;
+	interface = nullptr;
 }
 
 WebRTCPeerConnectionGDNative::~WebRTCPeerConnectionGDNative() {
 }
 
 Error WebRTCPeerConnectionGDNative::initialize(Dictionary p_config) {
-	ERR_FAIL_COND_V(interface == NULL, ERR_UNCONFIGURED);
+	ERR_FAIL_COND_V(interface == nullptr, ERR_UNCONFIGURED);
 	return (Error)interface->initialize(interface->data, (const godot_dictionary *)&p_config);
 }
 
 Ref<WebRTCDataChannel> WebRTCPeerConnectionGDNative::create_data_channel(String p_label, Dictionary p_options) {
-	ERR_FAIL_COND_V(interface == NULL, NULL);
+	ERR_FAIL_COND_V(interface == nullptr, nullptr);
 	return (WebRTCDataChannel *)interface->create_data_channel(interface->data, p_label.utf8().get_data(), (const godot_dictionary *)&p_options);
 }
 
 Error WebRTCPeerConnectionGDNative::create_offer() {
-	ERR_FAIL_COND_V(interface == NULL, ERR_UNCONFIGURED);
+	ERR_FAIL_COND_V(interface == nullptr, ERR_UNCONFIGURED);
 	return (Error)interface->create_offer(interface->data);
 }
 
 Error WebRTCPeerConnectionGDNative::set_local_description(String p_type, String p_sdp) {
-	ERR_FAIL_COND_V(interface == NULL, ERR_UNCONFIGURED);
+	ERR_FAIL_COND_V(interface == nullptr, ERR_UNCONFIGURED);
 	return (Error)interface->set_local_description(interface->data, p_type.utf8().get_data(), p_sdp.utf8().get_data());
 }
 
 Error WebRTCPeerConnectionGDNative::set_remote_description(String p_type, String p_sdp) {
-	ERR_FAIL_COND_V(interface == NULL, ERR_UNCONFIGURED);
+	ERR_FAIL_COND_V(interface == nullptr, ERR_UNCONFIGURED);
 	return (Error)interface->set_remote_description(interface->data, p_type.utf8().get_data(), p_sdp.utf8().get_data());
 }
 
 Error WebRTCPeerConnectionGDNative::add_ice_candidate(String sdpMidName, int sdpMlineIndexName, String sdpName) {
-	ERR_FAIL_COND_V(interface == NULL, ERR_UNCONFIGURED);
+	ERR_FAIL_COND_V(interface == nullptr, ERR_UNCONFIGURED);
 	return (Error)interface->add_ice_candidate(interface->data, sdpMidName.utf8().get_data(), sdpMlineIndexName, sdpName.utf8().get_data());
 }
 
 Error WebRTCPeerConnectionGDNative::poll() {
-	ERR_FAIL_COND_V(interface == NULL, ERR_UNCONFIGURED);
+	ERR_FAIL_COND_V(interface == nullptr, ERR_UNCONFIGURED);
 	return (Error)interface->poll(interface->data);
 }
 
 void WebRTCPeerConnectionGDNative::close() {
-	ERR_FAIL_COND(interface == NULL);
+	ERR_FAIL_COND(interface == nullptr);
 	interface->close(interface->data);
 }
 
 WebRTCPeerConnection::ConnectionState WebRTCPeerConnectionGDNative::get_connection_state() const {
-	ERR_FAIL_COND_V(interface == NULL, STATE_DISCONNECTED);
+	ERR_FAIL_COND_V(interface == nullptr, STATE_DISCONNECTED);
 	return (ConnectionState)interface->get_connection_state(interface->data);
 }
 
diff --git a/modules/webrtc/webrtc_peer_connection_gdnative.h b/modules/webrtc/webrtc_peer_connection_gdnative.h
index 8e59ad62ba..846b65c466 100644
--- a/modules/webrtc/webrtc_peer_connection_gdnative.h
+++ b/modules/webrtc/webrtc_peer_connection_gdnative.h
@@ -28,11 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifdef WEBRTC_GDNATIVE_ENABLED
-
 #ifndef WEBRTC_PEER_CONNECTION_GDNATIVE_H
 #define WEBRTC_PEER_CONNECTION_GDNATIVE_H
 
+#ifdef WEBRTC_GDNATIVE_ENABLED
+
 #include "modules/gdnative/include/net/godot_net.h"
 #include "webrtc_peer_connection.h"
 
@@ -53,21 +53,21 @@ public:
 
 	void set_native_webrtc_peer_connection(const godot_net_webrtc_peer_connection *p_impl);
 
-	virtual ConnectionState get_connection_state() const;
+	virtual ConnectionState get_connection_state() const override;
 
-	virtual Error initialize(Dictionary p_config = Dictionary());
-	virtual Ref<WebRTCDataChannel> create_data_channel(String p_label, Dictionary p_options = Dictionary());
-	virtual Error create_offer();
-	virtual Error set_remote_description(String type, String sdp);
-	virtual Error set_local_description(String type, String sdp);
-	virtual Error add_ice_candidate(String sdpMidName, int sdpMlineIndexName, String sdpName);
-	virtual Error poll();
-	virtual void close();
+	virtual Error initialize(Dictionary p_config = Dictionary()) override;
+	virtual Ref<WebRTCDataChannel> create_data_channel(String p_label, Dictionary p_options = Dictionary()) override;
+	virtual Error create_offer() override;
+	virtual Error set_remote_description(String type, String sdp) override;
+	virtual Error set_local_description(String type, String sdp) override;
+	virtual Error add_ice_candidate(String sdpMidName, int sdpMlineIndexName, String sdpName) override;
+	virtual Error poll() override;
+	virtual void close() override;
 
 	WebRTCPeerConnectionGDNative();
 	~WebRTCPeerConnectionGDNative();
 };
 
-#endif // WEBRTC_PEER_CONNECTION_GDNATIVE_H
-
 #endif // WEBRTC_GDNATIVE_ENABLED
+
+#endif // WEBRTC_PEER_CONNECTION_GDNATIVE_H
diff --git a/modules/webrtc/webrtc_peer_connection_js.cpp b/modules/webrtc/webrtc_peer_connection_js.cpp
index a84dabab72..593c3a5162 100644
--- a/modules/webrtc/webrtc_peer_connection_js.cpp
+++ b/modules/webrtc/webrtc_peer_connection_js.cpp
@@ -279,7 +279,7 @@ Ref<WebRTCDataChannel> WebRTCPeerConnectionJS::create_data_channel(String p_chan
 		}
 	}, _js_id, p_channel.utf8().get_data(), config.utf8().get_data());
 	/* clang-format on */
-	ERR_FAIL_COND_V(id == 0, NULL);
+	ERR_FAIL_COND_V(id == 0, nullptr);
 	return memnew(WebRTCDataChannelJS(id));
 }
 
diff --git a/modules/webrtc/webrtc_peer_connection_js.h b/modules/webrtc/webrtc_peer_connection_js.h
index 6540077e84..cdaf3068e3 100644
--- a/modules/webrtc/webrtc_peer_connection_js.h
+++ b/modules/webrtc/webrtc_peer_connection_js.h
@@ -36,7 +36,6 @@
 #include "webrtc_peer_connection.h"
 
 class WebRTCPeerConnectionJS : public WebRTCPeerConnection {
-
 private:
 	int _js_id;
 	ConnectionState _conn_state;
diff --git a/modules/websocket/SCsub b/modules/websocket/SCsub
index 033169411f..af60055855 100644
--- a/modules/websocket/SCsub
+++ b/modules/websocket/SCsub
@@ -1,13 +1,13 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 # Thirdparty source files
 
 env_ws = env_modules.Clone()
 
-if env['builtin_wslay'] and not env["platform"] == "javascript": # already builtin for javascript
+if env["builtin_wslay"] and not env["platform"] == "javascript":  # already builtin for javascript
     wslay_dir = "#thirdparty/wslay/"
     wslay_sources = [
         "wslay_net.c",
diff --git a/modules/websocket/config.py b/modules/websocket/config.py
index f59ef432b4..9e27a1a0fe 100644
--- a/modules/websocket/config.py
+++ b/modules/websocket/config.py
@@ -1,16 +1,19 @@
 def can_build(env, platform):
     return True
 
+
 def configure(env):
     pass
 
+
 def get_doc_classes():
     return [
         "WebSocketClient",
         "WebSocketMultiplayerPeer",
         "WebSocketPeer",
-        "WebSocketServer"
+        "WebSocketServer",
     ]
 
+
 def get_doc_path():
     return "doc_classes"
diff --git a/modules/websocket/doc_classes/WebSocketClient.xml b/modules/websocket/doc_classes/WebSocketClient.xml
index 2549321db3..45db49c913 100644
--- a/modules/websocket/doc_classes/WebSocketClient.xml
+++ b/modules/websocket/doc_classes/WebSocketClient.xml
@@ -17,11 +17,11 @@
 			</return>
 			<argument index="0" name="url" type="String">
 			</argument>
-			<argument index="1" name="protocols" type="PoolStringArray" default="PoolStringArray(  )">
+			<argument index="1" name="protocols" type="PackedStringArray" default="PackedStringArray(  )">
 			</argument>
 			<argument index="2" name="gd_mp_api" type="bool" default="false">
 			</argument>
-			<argument index="3" name="custom_headers" type="PoolStringArray" default="PoolStringArray(  )">
+			<argument index="3" name="custom_headers" type="PackedStringArray" default="PackedStringArray(  )">
 			</argument>
 			<description>
 				Connects to the given URL requesting one of the given [code]protocols[/code] as sub-protocol. If the list empty (default), no sub-protocol will be requested.
diff --git a/modules/websocket/doc_classes/WebSocketServer.xml b/modules/websocket/doc_classes/WebSocketServer.xml
index f66e1bf54b..f7805209e2 100644
--- a/modules/websocket/doc_classes/WebSocketServer.xml
+++ b/modules/websocket/doc_classes/WebSocketServer.xml
@@ -63,7 +63,7 @@
 			</return>
 			<argument index="0" name="port" type="int">
 			</argument>
-			<argument index="1" name="protocols" type="PoolStringArray" default="PoolStringArray(  )">
+			<argument index="1" name="protocols" type="PackedStringArray" default="PackedStringArray(  )">
 			</argument>
 			<argument index="2" name="gd_mp_api" type="bool" default="false">
 			</argument>
diff --git a/modules/websocket/editor_debugger_server_websocket.cpp b/modules/websocket/editor_debugger_server_websocket.cpp
new file mode 100644
index 0000000000..95ea7ceafa
--- /dev/null
+++ b/modules/websocket/editor_debugger_server_websocket.cpp
@@ -0,0 +1,93 @@
+/*************************************************************************/
+/*  editor_debugger_server_websocket.cpp                                 */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "editor_debugger_server_websocket.h"
+
+#include "core/project_settings.h"
+#include "editor/editor_settings.h"
+#include "modules/websocket/remote_debugger_peer_websocket.h"
+
+void EditorDebuggerServerWebSocket::_peer_connected(int p_id, String _protocol) {
+	pending_peers.push_back(p_id);
+}
+
+void EditorDebuggerServerWebSocket::_peer_disconnected(int p_id, bool p_was_clean) {
+	if (pending_peers.find(p_id)) {
+		pending_peers.erase(p_id);
+	}
+}
+
+void EditorDebuggerServerWebSocket::poll() {
+	server->poll();
+}
+
+Error EditorDebuggerServerWebSocket::start() {
+	int remote_port = (int)EditorSettings::get_singleton()->get("network/debug/remote_port");
+	Vector<String> protocols;
+	protocols.push_back("binary"); // compatibility with EMSCRIPTEN TCP-to-WebSocket layer.
+	return server->listen(remote_port, protocols);
+}
+
+void EditorDebuggerServerWebSocket::stop() {
+	server->stop();
+	pending_peers.clear();
+}
+
+bool EditorDebuggerServerWebSocket::is_active() const {
+	return server->is_listening();
+}
+
+bool EditorDebuggerServerWebSocket::is_connection_available() const {
+	return pending_peers.size() > 0;
+}
+
+Ref<RemoteDebuggerPeer> EditorDebuggerServerWebSocket::take_connection() {
+	ERR_FAIL_COND_V(!is_connection_available(), Ref<RemoteDebuggerPeer>());
+	RemoteDebuggerPeer *peer = memnew(RemoteDebuggerPeerWebSocket(server->get_peer(pending_peers[0])));
+	pending_peers.pop_front();
+	return peer;
+}
+
+EditorDebuggerServerWebSocket::EditorDebuggerServerWebSocket() {
+	server = Ref<WebSocketServer>(WebSocketServer::create());
+	int max_pkts = (int)GLOBAL_GET("network/limits/debugger/max_queued_messages");
+	server->set_buffers(8192, max_pkts, 8192, max_pkts);
+	server->connect("client_connected", callable_mp(this, &EditorDebuggerServerWebSocket::_peer_connected));
+	server->connect("client_disconnected", callable_mp(this, &EditorDebuggerServerWebSocket::_peer_disconnected));
+}
+
+EditorDebuggerServerWebSocket::~EditorDebuggerServerWebSocket() {
+	stop();
+}
+
+EditorDebuggerServer *EditorDebuggerServerWebSocket::create(const String &p_protocol) {
+	ERR_FAIL_COND_V(p_protocol != "ws://", nullptr);
+	return memnew(EditorDebuggerServerWebSocket);
+}
diff --git a/modules/websocket/editor_debugger_server_websocket.h b/modules/websocket/editor_debugger_server_websocket.h
new file mode 100644
index 0000000000..861f389aab
--- /dev/null
+++ b/modules/websocket/editor_debugger_server_websocket.h
@@ -0,0 +1,62 @@
+/*************************************************************************/
+/*  editor_debugger_server_websocket.h                                   */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef SCRIPT_EDITOR_DEBUGGER_WEBSOCKET_H
+#define SCRIPT_EDITOR_DEBUGGER_WEBSOCKET_H
+
+#include "modules/websocket/websocket_server.h"
+
+#include "editor/debugger/editor_debugger_server.h"
+
+class EditorDebuggerServerWebSocket : public EditorDebuggerServer {
+	GDCLASS(EditorDebuggerServerWebSocket, EditorDebuggerServer);
+
+private:
+	Ref<WebSocketServer> server;
+	List<int> pending_peers;
+
+public:
+	static EditorDebuggerServer *create(const String &p_protocol);
+
+	void _peer_connected(int p_peer, String p_protocol);
+	void _peer_disconnected(int p_peer, bool p_was_clean);
+
+	void poll() override;
+	Error start() override;
+	void stop() override;
+	bool is_active() const override;
+	bool is_connection_available() const override;
+	Ref<RemoteDebuggerPeer> take_connection() override;
+
+	EditorDebuggerServerWebSocket();
+	~EditorDebuggerServerWebSocket();
+};
+
+#endif // SCRIPT_EDITOR_DEBUGGER_WEBSOCKET_H
diff --git a/modules/websocket/emws_client.cpp b/modules/websocket/emws_client.cpp
index 7e68936fc3..7c31449709 100644
--- a/modules/websocket/emws_client.cpp
+++ b/modules/websocket/emws_client.cpp
@@ -65,7 +65,6 @@ EMSCRIPTEN_KEEPALIVE void _esws_on_close(void *obj, int code, char *reason, int
 }
 
 Error EMWSClient::connect_to_host(String p_host, String p_path, uint16_t p_port, bool p_ssl, const Vector<String> p_protocols, const Vector<String> p_custom_headers) {
-
 	String proto_string;
 	for (int i = 0; i < p_protocols.size(); i++) {
 		if (i != 0)
@@ -91,10 +90,14 @@ Error EMWSClient::connect_to_host(String p_host, String p_path, uint16_t p_port,
 	int peer_sock = EM_ASM_INT({
 		var proto_str = UTF8ToString($2);
 		var socket = null;
-		if (proto_str) {
-			socket = new WebSocket(UTF8ToString($1), proto_str.split(","));
-		} else {
-			socket = new WebSocket(UTF8ToString($1));
+		try {
+			if (proto_str) {
+				socket = new WebSocket(UTF8ToString($1), proto_str.split(","));
+			} else {
+				socket = new WebSocket(UTF8ToString($1));
+			}
+		} catch (e) {
+			return -1;
 		}
 		var c_ptr = Module.IDHandler.get($0);
 		socket.binaryType = "arraybuffer";
@@ -138,14 +141,14 @@ Error EMWSClient::connect_to_host(String p_host, String p_path, uint16_t p_port,
 
 			}
 			var len = buffer.length*buffer.BYTES_PER_ELEMENT;
-			var out = Module._malloc(len);
-			Module.HEAPU8.set(buffer, out);
+			var out = _malloc(len);
+			HEAPU8.set(buffer, out);
 			ccall("_esws_on_message",
 				"void",
 				["number", "number", "number", "number"],
 				[c_ptr, out, len, is_string]
 			);
-			Module._free(out);
+			_free(out);
 		});
 
 		socket.addEventListener("error", function (event) {
@@ -174,8 +177,10 @@ Error EMWSClient::connect_to_host(String p_host, String p_path, uint16_t p_port,
 		return Module.IDHandler.add(socket);
 	}, _js_id, str.utf8().get_data(), proto_string.utf8().get_data());
 	/* clang-format on */
+	if (peer_sock == -1)
+		return FAILED;
 
-	static_cast<Ref<EMWSPeer> >(_peer)->set_sock(peer_sock, _in_buf_size, _in_pkt_size);
+	static_cast<Ref<EMWSPeer>>(_peer)->set_sock(peer_sock, _in_buf_size, _in_pkt_size);
 
 	return OK;
 };
@@ -184,33 +189,28 @@ void EMWSClient::poll() {
 }
 
 Ref<WebSocketPeer> EMWSClient::get_peer(int p_peer_id) const {
-
 	return _peer;
 }
 
 NetworkedMultiplayerPeer::ConnectionStatus EMWSClient::get_connection_status() const {
-
-	if (_peer->is_connected_to_host())
+	if (_peer->is_connected_to_host()) {
+		if (_is_connecting)
+			return CONNECTION_CONNECTING;
 		return CONNECTION_CONNECTED;
-
-	if (_is_connecting)
-		return CONNECTION_CONNECTING;
+	}
 
 	return CONNECTION_DISCONNECTED;
 };
 
 void EMWSClient::disconnect_from_host(int p_code, String p_reason) {
-
 	_peer->close(p_code, p_reason);
 };
 
 IP_Address EMWSClient::get_connected_host() const {
-
 	ERR_FAIL_V_MSG(IP_Address(), "Not supported in HTML5 export.");
 };
 
 uint16_t EMWSClient::get_connected_port() const {
-
 	ERR_FAIL_V_MSG(0, "Not supported in HTML5 export.");
 };
 
@@ -225,8 +225,9 @@ Error EMWSClient::set_buffers(int p_in_buffer, int p_in_packets, int p_out_buffe
 }
 
 EMWSClient::EMWSClient() {
-	_in_buf_size = nearest_shift((int)GLOBAL_GET(WSC_IN_BUF) - 1) + 10;
-	_in_pkt_size = nearest_shift((int)GLOBAL_GET(WSC_IN_PKT) - 1);
+	_in_buf_size = DEF_BUF_SHIFT;
+	_in_pkt_size = DEF_PKT_SHIFT;
+
 	_is_connecting = false;
 	_peer = Ref<EMWSPeer>(memnew(EMWSPeer));
 	/* clang-format off */
@@ -237,7 +238,6 @@ EMWSClient::EMWSClient() {
 };
 
 EMWSClient::~EMWSClient() {
-
 	disconnect_from_host();
 	_peer = Ref<EMWSPeer>();
 	/* clang-format off */
diff --git a/modules/websocket/emws_client.h b/modules/websocket/emws_client.h
index 9f1c220ed4..ab8a0612bb 100644
--- a/modules/websocket/emws_client.h
+++ b/modules/websocket/emws_client.h
@@ -38,7 +38,6 @@
 #include "websocket_client.h"
 
 class EMWSClient : public WebSocketClient {
-
 	GDCIIMPL(EMWSClient, WebSocketClient);
 
 private:
diff --git a/modules/websocket/emws_peer.cpp b/modules/websocket/emws_peer.cpp
index effed8e4d9..749f45451a 100644
--- a/modules/websocket/emws_peer.cpp
+++ b/modules/websocket/emws_peer.cpp
@@ -34,7 +34,6 @@
 #include "core/io/ip.h"
 
 void EMWSPeer::set_sock(int p_sock, unsigned int p_in_buf_size, unsigned int p_in_pkt_size) {
-
 	peer_sock = p_sock;
 	_in_buffer.resize(p_in_pkt_size, p_in_buf_size);
 	_packet_buffer.resize((1 << p_in_buf_size));
@@ -49,13 +48,11 @@ EMWSPeer::WriteMode EMWSPeer::get_write_mode() const {
 }
 
 Error EMWSPeer::read_msg(uint8_t *p_data, uint32_t p_size, bool p_is_string) {
-
 	uint8_t is_string = p_is_string ? 1 : 0;
 	return _in_buffer.write_packet(p_data, p_size, &is_string);
 }
 
 Error EMWSPeer::put_packet(const uint8_t *p_buffer, int p_buffer_size) {
-
 	int is_bin = write_mode == WebSocketPeer::WRITE_MODE_BINARY ? 1 : 0;
 
 	/* clang-format off */
@@ -68,12 +65,17 @@ Error EMWSPeer::put_packet(const uint8_t *p_buffer, int p_buffer_size) {
 			bytes_array[i] = getValue($1+i, 'i8');
 		}
 
-		if ($3) {
-			sock.send(bytes_array.buffer);
-		} else {
-			var string = new TextDecoder("utf-8").decode(bytes_array);
-			sock.send(string);
+		try {
+			if ($3) {
+				sock.send(bytes_array.buffer);
+			} else {
+				var string = new TextDecoder("utf-8").decode(bytes_array);
+				sock.send(string);
+			}
+		} catch (e) {
+			return 1;
 		}
+		return 0;
 	}, peer_sock, p_buffer, p_buffer_size, is_bin);
 	/* clang-format on */
 
@@ -81,38 +83,32 @@ Error EMWSPeer::put_packet(const uint8_t *p_buffer, int p_buffer_size) {
 };
 
 Error EMWSPeer::get_packet(const uint8_t **r_buffer, int &r_buffer_size) {
-
 	if (_in_buffer.packets_left() == 0)
 		return ERR_UNAVAILABLE;
 
-	PoolVector<uint8_t>::Write rw = _packet_buffer.write();
 	int read = 0;
-	Error err = _in_buffer.read_packet(rw.ptr(), _packet_buffer.size(), &_is_string, read);
+	Error err = _in_buffer.read_packet(_packet_buffer.ptrw(), _packet_buffer.size(), &_is_string, read);
 	ERR_FAIL_COND_V(err != OK, err);
 
-	*r_buffer = rw.ptr();
+	*r_buffer = _packet_buffer.ptr();
 	r_buffer_size = read;
 
 	return OK;
 };
 
 int EMWSPeer::get_available_packet_count() const {
-
 	return _in_buffer.packets_left();
 };
 
 bool EMWSPeer::was_string_packet() const {
-
 	return _is_string;
 };
 
 bool EMWSPeer::is_connected_to_host() const {
-
 	return peer_sock != -1;
 };
 
 void EMWSPeer::close(int p_code, String p_reason) {
-
 	if (peer_sock != -1) {
 		/* clang-format off */
 		EM_ASM({
@@ -130,17 +126,14 @@ void EMWSPeer::close(int p_code, String p_reason) {
 };
 
 IP_Address EMWSPeer::get_connected_host() const {
-
 	ERR_FAIL_V_MSG(IP_Address(), "Not supported in HTML5 export.");
 };
 
 uint16_t EMWSPeer::get_connected_port() const {
-
 	ERR_FAIL_V_MSG(0, "Not supported in HTML5 export.");
 };
 
 void EMWSPeer::set_no_delay(bool p_enabled) {
-
 	ERR_FAIL_MSG("'set_no_delay' is not supported in HTML5 export.");
 }
 
@@ -151,7 +144,6 @@ EMWSPeer::EMWSPeer() {
 };
 
 EMWSPeer::~EMWSPeer() {
-
 	close();
 };
 
diff --git a/modules/websocket/emws_peer.h b/modules/websocket/emws_peer.h
index 43b42f9be6..9c00f2d58b 100644
--- a/modules/websocket/emws_peer.h
+++ b/modules/websocket/emws_peer.h
@@ -41,14 +41,13 @@
 #include "websocket_peer.h"
 
 class EMWSPeer : public WebSocketPeer {
-
 	GDCIIMPL(EMWSPeer, WebSocketPeer);
 
 private:
 	int peer_sock;
 	WriteMode write_mode;
 
-	PoolVector<uint8_t> _packet_buffer;
+	Vector<uint8_t> _packet_buffer;
 	PacketBuffer<uint8_t> _in_buffer;
 	uint8_t _is_string;
 
diff --git a/modules/websocket/emws_server.cpp b/modules/websocket/emws_server.cpp
index 23faa05365..9d43283d3e 100644
--- a/modules/websocket/emws_server.cpp
+++ b/modules/websocket/emws_server.cpp
@@ -34,7 +34,6 @@
 #include "core/os/os.h"
 
 Error EMWSServer::listen(int p_port, Vector<String> p_protocols, bool gd_mp_api) {
-
 	return FAILED;
 }
 
@@ -50,22 +49,20 @@ bool EMWSServer::has_peer(int p_id) const {
 }
 
 Ref<WebSocketPeer> EMWSServer::get_peer(int p_id) const {
-	return NULL;
+	return nullptr;
 }
 
-PoolVector<String> EMWSServer::get_protocols() const {
-	PoolVector<String> out;
+Vector<String> EMWSServer::get_protocols() const {
+	Vector<String> out;
 
 	return out;
 }
 
 IP_Address EMWSServer::get_peer_address(int p_peer_id) const {
-
 	return IP_Address();
 }
 
 int EMWSServer::get_peer_port(int p_peer_id) const {
-
 	return 0;
 }
 
diff --git a/modules/websocket/emws_server.h b/modules/websocket/emws_server.h
index 869e59fe03..bb6f35a711 100644
--- a/modules/websocket/emws_server.h
+++ b/modules/websocket/emws_server.h
@@ -38,7 +38,6 @@
 #include "websocket_server.h"
 
 class EMWSServer : public WebSocketServer {
-
 	GDCIIMPL(EMWSServer, WebSocketServer);
 
 public:
@@ -53,7 +52,7 @@ public:
 	void disconnect_peer(int p_peer_id, int p_code = 1000, String p_reason = "");
 	int get_max_packet_size() const;
 	virtual void poll();
-	virtual PoolVector<String> get_protocols() const;
+	virtual Vector<String> get_protocols() const;
 
 	EMWSServer();
 	~EMWSServer();
diff --git a/modules/websocket/packet_buffer.h b/modules/websocket/packet_buffer.h
index ea3658c827..9973efe297 100644
--- a/modules/websocket/packet_buffer.h
+++ b/modules/websocket/packet_buffer.h
@@ -36,7 +36,6 @@
 
 template <class T>
 class PacketBuffer {
-
 private:
 	typedef struct {
 		uint32_t size;
@@ -63,7 +62,7 @@ public:
 		ERR_FAIL_COND_V(p_info && _packets.space_left() < 1, ERR_OUT_OF_MEMORY);
 #endif
 
-		// If p_info is NULL, only the payload is written
+		// If p_info is nullptr, only the payload is written
 		if (p_info) {
 			_Packet p;
 			p.size = p_size;
@@ -71,7 +70,7 @@ public:
 			_packets.write(p);
 		}
 
-		// If p_payload is NULL, only the packet information is written.
+		// If p_payload is nullptr, only the packet information is written.
 		if (p_payload) {
 			_payload.write((const uint8_t *)p_payload, p_size);
 		}
diff --git a/modules/websocket/register_types.cpp b/modules/websocket/register_types.cpp
index e389d75ffd..bc50de414e 100644
--- a/modules/websocket/register_types.cpp
+++ b/modules/websocket/register_types.cpp
@@ -40,24 +40,19 @@
 #include "wsl_client.h"
 #include "wsl_server.h"
 #endif
+#ifdef TOOLS_ENABLED
+#include "editor/debugger/editor_debugger_server.h"
+#include "editor/editor_node.h"
+#include "editor_debugger_server_websocket.h"
+#endif
 
-void register_websocket_types() {
-#define _SET_HINT(NAME, _VAL_, _MAX_) \
-	GLOBAL_DEF(NAME, _VAL_);          \
-	ProjectSettings::get_singleton()->set_custom_property_info(NAME, PropertyInfo(Variant::INT, NAME, PROPERTY_HINT_RANGE, "2," #_MAX_ ",1,or_greater"));
-
-	// Client buffers project settings
-	_SET_HINT(WSC_IN_BUF, 64, 4096);
-	_SET_HINT(WSC_IN_PKT, 1024, 16384);
-	_SET_HINT(WSC_OUT_BUF, 64, 4096);
-	_SET_HINT(WSC_OUT_PKT, 1024, 16384);
-
-	// Server buffers project settings
-	_SET_HINT(WSS_IN_BUF, 64, 4096);
-	_SET_HINT(WSS_IN_PKT, 1024, 16384);
-	_SET_HINT(WSS_OUT_BUF, 64, 4096);
-	_SET_HINT(WSS_OUT_PKT, 1024, 16384);
+#ifdef TOOLS_ENABLED
+static void _editor_init_callback() {
+	EditorDebuggerServer::register_protocol_handler("ws://", EditorDebuggerServerWebSocket::create);
+}
+#endif
 
+void register_websocket_types() {
 #ifdef JAVASCRIPT_ENABLED
 	EMWSPeer::make_default();
 	EMWSClient::make_default();
@@ -72,6 +67,10 @@ void register_websocket_types() {
 	ClassDB::register_custom_instance_class<WebSocketServer>();
 	ClassDB::register_custom_instance_class<WebSocketClient>();
 	ClassDB::register_custom_instance_class<WebSocketPeer>();
+
+#ifdef TOOLS_ENABLED
+	EditorNode::add_init_callback(&_editor_init_callback);
+#endif
 }
 
 void unregister_websocket_types() {}
diff --git a/modules/websocket/register_types.h b/modules/websocket/register_types.h
index b254b9dae8..bb7be57ab3 100644
--- a/modules/websocket/register_types.h
+++ b/modules/websocket/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef WEBSOCKET_REGISTER_TYPES_H
+#define WEBSOCKET_REGISTER_TYPES_H
+
 void register_websocket_types();
 void unregister_websocket_types();
+
+#endif // WEBSOCKET_REGISTER_TYPES_H
diff --git a/modules/websocket/remote_debugger_peer_websocket.cpp b/modules/websocket/remote_debugger_peer_websocket.cpp
new file mode 100644
index 0000000000..a67a959e31
--- /dev/null
+++ b/modules/websocket/remote_debugger_peer_websocket.cpp
@@ -0,0 +1,133 @@
+/*************************************************************************/
+/*  remote_debugger_peer_websocket.cpp                                   */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "remote_debugger_peer_websocket.h"
+
+#include "core/project_settings.h"
+
+Error RemoteDebuggerPeerWebSocket::connect_to_host(const String &p_uri) {
+	Vector<String> protocols;
+	protocols.push_back("binary"); // Compatibility for emscripten TCP-to-WebSocket.
+
+	ws_client->connect_to_url(p_uri, protocols);
+	ws_client->poll();
+
+	if (ws_client->get_connection_status() == WebSocketClient::CONNECTION_DISCONNECTED) {
+		ERR_PRINT("Remote Debugger: Unable to connect. Status: " + String::num(ws_client->get_connection_status()) + ".");
+		return FAILED;
+	}
+
+	ws_peer = ws_client->get_peer(1);
+
+	return OK;
+}
+
+bool RemoteDebuggerPeerWebSocket::is_peer_connected() {
+	return ws_peer.is_valid() && ws_peer->is_connected_to_host();
+}
+
+void RemoteDebuggerPeerWebSocket::poll() {
+	ws_client->poll();
+
+	while (ws_peer->is_connected_to_host() && ws_peer->get_available_packet_count() > 0 && in_queue.size() < max_queued_messages) {
+		Variant var;
+		Error err = ws_peer->get_var(var);
+		ERR_CONTINUE(err != OK);
+		ERR_CONTINUE(var.get_type() != Variant::ARRAY);
+		in_queue.push_back(var);
+	}
+
+	while (ws_peer->is_connected_to_host() && out_queue.size() > 0) {
+		Array var = out_queue[0];
+		Error err = ws_peer->put_var(var);
+		ERR_BREAK(err != OK); // Peer buffer full?
+		out_queue.pop_front();
+	}
+}
+
+int RemoteDebuggerPeerWebSocket::get_max_message_size() const {
+	return 8 << 20; // 8 Mib
+}
+
+bool RemoteDebuggerPeerWebSocket::has_message() {
+	return in_queue.size() > 0;
+}
+
+Array RemoteDebuggerPeerWebSocket::get_message() {
+	ERR_FAIL_COND_V(in_queue.size() < 1, Array());
+	Array msg = in_queue[0];
+	in_queue.pop_front();
+	return msg;
+}
+
+Error RemoteDebuggerPeerWebSocket::put_message(const Array &p_arr) {
+	if (out_queue.size() >= max_queued_messages) {
+		return ERR_OUT_OF_MEMORY;
+	}
+	out_queue.push_back(p_arr);
+	return OK;
+}
+
+void RemoteDebuggerPeerWebSocket::close() {
+	if (ws_peer.is_valid()) {
+		ws_peer.unref();
+	}
+	ws_client->disconnect_from_host();
+}
+
+bool RemoteDebuggerPeerWebSocket::can_block() const {
+#ifdef JAVASCRIPT_ENABLED
+	return false;
+#else
+	return true;
+#endif
+}
+
+RemoteDebuggerPeerWebSocket::RemoteDebuggerPeerWebSocket(Ref<WebSocketPeer> p_peer) {
+#ifdef JAVASCRIPT_ENABLED
+	ws_client = Ref<WebSocketClient>(memnew(EMWSClient));
+#else
+	ws_client = Ref<WebSocketClient>(memnew(WSLClient));
+#endif
+	max_queued_messages = (int)GLOBAL_GET("network/limits/debugger/max_queued_messages");
+	ws_client->set_buffers(8192, max_queued_messages, 8192, max_queued_messages);
+	ws_peer = p_peer;
+}
+
+RemoteDebuggerPeer *RemoteDebuggerPeerWebSocket::create(const String &p_uri) {
+	ERR_FAIL_COND_V(!p_uri.begins_with("ws://") && !p_uri.begins_with("wss://"), nullptr);
+	RemoteDebuggerPeerWebSocket *peer = memnew(RemoteDebuggerPeerWebSocket);
+	Error err = peer->connect_to_host(p_uri);
+	if (err != OK) {
+		memdelete(peer);
+		return nullptr;
+	}
+	return peer;
+}
diff --git a/modules/websocket/remote_debugger_peer_websocket.h b/modules/websocket/remote_debugger_peer_websocket.h
new file mode 100644
index 0000000000..bb03e5e892
--- /dev/null
+++ b/modules/websocket/remote_debugger_peer_websocket.h
@@ -0,0 +1,65 @@
+/*************************************************************************/
+/*  remote_debugger_peer_websocket.h                                     */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef SCRIPT_DEBUGGER_WEBSOCKET_H
+#define SCRIPT_DEBUGGER_WEBSOCKET_H
+
+#ifdef JAVASCRIPT_ENABLED
+#include "modules/websocket/emws_client.h"
+#else
+#include "modules/websocket/wsl_client.h"
+#endif
+#include "core/debugger/remote_debugger_peer.h"
+
+class RemoteDebuggerPeerWebSocket : public RemoteDebuggerPeer {
+	Ref<WebSocketClient> ws_client;
+	Ref<WebSocketPeer> ws_peer;
+	List<Array> in_queue;
+	List<Array> out_queue;
+
+	int max_queued_messages;
+
+public:
+	static RemoteDebuggerPeer *create(const String &p_uri);
+
+	Error connect_to_host(const String &p_uri);
+	bool is_peer_connected();
+	int get_max_message_size() const;
+	bool has_message();
+	Error put_message(const Array &p_arr);
+	Array get_message();
+	void close();
+	void poll();
+	bool can_block() const;
+
+	RemoteDebuggerPeerWebSocket(Ref<WebSocketPeer> p_peer = Ref<WebSocketPeer>());
+};
+
+#endif // SCRIPT_DEBUGGER_WEBSOCKET_H
diff --git a/modules/websocket/websocket_client.cpp b/modules/websocket/websocket_client.cpp
index 7ee4b990b5..8feaa9af5a 100644
--- a/modules/websocket/websocket_client.cpp
+++ b/modules/websocket/websocket_client.cpp
@@ -33,7 +33,6 @@
 GDCINULL(WebSocketClient);
 
 WebSocketClient::WebSocketClient() {
-
 	verify_ssl = true;
 }
 
@@ -54,8 +53,9 @@ Error WebSocketClient::connect_to_url(String p_url, const Vector<String> p_proto
 		port = 443;
 	} else {
 		ssl = false;
-		if (host.begins_with("ws://"))
+		if (host.begins_with("ws://")) {
 			host = host.substr(5, host.length() - 5);
+		}
 	}
 
 	// Path
@@ -66,7 +66,7 @@ Error WebSocketClient::connect_to_url(String p_url, const Vector<String> p_proto
 	}
 
 	// Port
-	p_len = host.find_last(":");
+	p_len = host.rfind(":");
 	if (p_len != -1 && p_len == host.find(":")) {
 		port = host.substr(p_len, host.length() - p_len).to_int();
 		host = host.substr(0, p_len);
@@ -76,33 +76,27 @@ Error WebSocketClient::connect_to_url(String p_url, const Vector<String> p_proto
 }
 
 void WebSocketClient::set_verify_ssl_enabled(bool p_verify_ssl) {
-
 	verify_ssl = p_verify_ssl;
 }
 
 bool WebSocketClient::is_verify_ssl_enabled() const {
-
 	return verify_ssl;
 }
 
 Ref<X509Certificate> WebSocketClient::get_trusted_ssl_certificate() const {
-
 	return ssl_cert;
 }
 
 void WebSocketClient::set_trusted_ssl_certificate(Ref<X509Certificate> p_cert) {
-
 	ERR_FAIL_COND(get_connection_status() != CONNECTION_DISCONNECTED);
 	ssl_cert = p_cert;
 }
 
 bool WebSocketClient::is_server() const {
-
 	return false;
 }
 
 void WebSocketClient::_on_peer_packet() {
-
 	if (_is_multiplayer) {
 		_process_multiplayer(get_peer(1), 1);
 	} else {
@@ -111,7 +105,6 @@ void WebSocketClient::_on_peer_packet() {
 }
 
 void WebSocketClient::_on_connect(String p_protocol) {
-
 	if (_is_multiplayer) {
 		// need to wait for ID confirmation...
 	} else {
@@ -120,12 +113,10 @@ void WebSocketClient::_on_connect(String p_protocol) {
 }
 
 void WebSocketClient::_on_close_request(int p_code, String p_reason) {
-
 	emit_signal("server_close_request", p_code, p_reason);
 }
 
 void WebSocketClient::_on_disconnect(bool p_was_clean) {
-
 	if (_is_multiplayer) {
 		emit_signal("connection_failed");
 	} else {
@@ -134,7 +125,6 @@ void WebSocketClient::_on_disconnect(bool p_was_clean) {
 }
 
 void WebSocketClient::_on_error() {
-
 	if (_is_multiplayer) {
 		emit_signal("connection_failed");
 	} else {
diff --git a/modules/websocket/websocket_client.h b/modules/websocket/websocket_client.h
index 4dc1224066..1053be22e3 100644
--- a/modules/websocket/websocket_client.h
+++ b/modules/websocket/websocket_client.h
@@ -37,7 +37,6 @@
 #include "websocket_peer.h"
 
 class WebSocketClient : public WebSocketMultiplayerPeer {
-
 	GDCLASS(WebSocketClient, WebSocketMultiplayerPeer);
 	GDCICLASS(WebSocketClient);
 
@@ -56,14 +55,12 @@ public:
 	Ref<X509Certificate> get_trusted_ssl_certificate() const;
 	void set_trusted_ssl_certificate(Ref<X509Certificate> p_cert);
 
-	virtual void poll() = 0;
 	virtual Error connect_to_host(String p_host, String p_path, uint16_t p_port, bool p_ssl, const Vector<String> p_protocol = Vector<String>(), const Vector<String> p_custom_headers = Vector<String>()) = 0;
 	virtual void disconnect_from_host(int p_code = 1000, String p_reason = "") = 0;
 	virtual IP_Address get_connected_host() const = 0;
 	virtual uint16_t get_connected_port() const = 0;
 
-	virtual bool is_server() const;
-	virtual ConnectionStatus get_connection_status() const = 0;
+	virtual bool is_server() const override;
 
 	void _on_peer_packet();
 	void _on_connect(String p_protocol);
@@ -71,8 +68,6 @@ public:
 	void _on_disconnect(bool p_was_clean);
 	void _on_error();
 
-	virtual Error set_buffers(int p_in_buffer, int p_in_packets, int p_out_buffer, int p_out_packets) = 0;
-
 	WebSocketClient();
 	~WebSocketClient();
 };
diff --git a/modules/websocket/websocket_macros.h b/modules/websocket/websocket_macros.h
index 8aa01a70ed..cf4545b435 100644
--- a/modules/websocket/websocket_macros.h
+++ b/modules/websocket/websocket_macros.h
@@ -31,15 +31,9 @@
 #ifndef WEBSOCKETMACTOS_H
 #define WEBSOCKETMACTOS_H
 
-#define WSC_IN_BUF "network/limits/websocket_client/max_in_buffer_kb"
-#define WSC_IN_PKT "network/limits/websocket_client/max_in_packets"
-#define WSC_OUT_BUF "network/limits/websocket_client/max_out_buffer_kb"
-#define WSC_OUT_PKT "network/limits/websocket_client/max_out_packets"
-
-#define WSS_IN_BUF "network/limits/websocket_server/max_in_buffer_kb"
-#define WSS_IN_PKT "network/limits/websocket_server/max_in_packets"
-#define WSS_OUT_BUF "network/limits/websocket_server/max_out_buffer_kb"
-#define WSS_OUT_PKT "network/limits/websocket_server/max_out_packets"
+// Defaults per peer buffers, 1024 packets with a shared 65536 bytes payload.
+#define DEF_PKT_SHIFT 10
+#define DEF_BUF_SHIFT 16
 
 /* clang-format off */
 #define GDCICLASS(CNAME) \
@@ -56,13 +50,13 @@ public:\
 	static CNAME *create() {\
 \
 		if (!_create)\
-			return NULL;\
+			return nullptr;\
 		return _create();\
 	}\
 protected:\
 
 #define GDCINULL(CNAME) \
-CNAME *(*CNAME::_create)() = NULL;
+CNAME *(*CNAME::_create)() = nullptr;
 
 #define GDCIIMPL(IMPNAME, CNAME) \
 public:\
diff --git a/modules/websocket/websocket_multiplayer_peer.cpp b/modules/websocket/websocket_multiplayer_peer.cpp
index 27ea50b524..fa2fe891a5 100644
--- a/modules/websocket/websocket_multiplayer_peer.cpp
+++ b/modules/websocket/websocket_multiplayer_peer.cpp
@@ -33,7 +33,6 @@
 #include "core/os/os.h"
 
 WebSocketMultiplayerPeer::WebSocketMultiplayerPeer() {
-
 	_is_multiplayer = false;
 	_peer_id = 0;
 	_target_peer = 0;
@@ -42,20 +41,17 @@ WebSocketMultiplayerPeer::WebSocketMultiplayerPeer() {
 	_current_packet.source = 0;
 	_current_packet.destination = 0;
 	_current_packet.size = 0;
-	_current_packet.data = NULL;
+	_current_packet.data = nullptr;
 }
 
 WebSocketMultiplayerPeer::~WebSocketMultiplayerPeer() {
-
 	_clear();
 }
 
 int WebSocketMultiplayerPeer::_gen_unique_id() const {
-
 	uint32_t hash = 0;
 
 	while (hash == 0 || hash == 1) {
-
 		hash = hash_djb2_one_32(
 				(uint32_t)OS::get_singleton()->get_ticks_usec());
 		hash = hash_djb2_one_32(
@@ -71,22 +67,22 @@ int WebSocketMultiplayerPeer::_gen_unique_id() const {
 
 	return hash;
 }
-void WebSocketMultiplayerPeer::_clear() {
 
+void WebSocketMultiplayerPeer::_clear() {
 	_peer_map.clear();
-	if (_current_packet.data != NULL)
+	if (_current_packet.data != nullptr) {
 		memfree(_current_packet.data);
+	}
 
 	for (List<Packet>::Element *E = _incoming_packets.front(); E; E = E->next()) {
 		memfree(E->get().data);
-		E->get().data = NULL;
+		E->get().data = nullptr;
 	}
 
 	_incoming_packets.clear();
 }
 
 void WebSocketMultiplayerPeer::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_buffers", "input_buffer_size_kb", "input_max_packets", "output_buffer_size_kb", "output_max_packets"), &WebSocketMultiplayerPeer::set_buffers);
 	ClassDB::bind_method(D_METHOD("get_peer", "peer_id"), &WebSocketMultiplayerPeer::get_peer);
 
@@ -97,21 +93,19 @@ void WebSocketMultiplayerPeer::_bind_methods() {
 // PacketPeer
 //
 int WebSocketMultiplayerPeer::get_available_packet_count() const {
-
 	ERR_FAIL_COND_V_MSG(!_is_multiplayer, 0, "Please use get_peer(ID).get_available_packet_count to get available packet count from peers when not using the MultiplayerAPI.");
 
 	return _incoming_packets.size();
 }
 
 Error WebSocketMultiplayerPeer::get_packet(const uint8_t **r_buffer, int &r_buffer_size) {
-
 	ERR_FAIL_COND_V_MSG(!_is_multiplayer, ERR_UNCONFIGURED, "Please use get_peer(ID).get_packet/var to communicate with peers when not using the MultiplayerAPI.");
 
 	r_buffer_size = 0;
 
-	if (_current_packet.data != NULL) {
+	if (_current_packet.data != nullptr) {
 		memfree(_current_packet.data);
-		_current_packet.data = NULL;
+		_current_packet.data = nullptr;
 	}
 
 	_current_packet = _incoming_packets.front()->get();
@@ -124,15 +118,14 @@ Error WebSocketMultiplayerPeer::get_packet(const uint8_t **r_buffer, int &r_buff
 }
 
 Error WebSocketMultiplayerPeer::put_packet(const uint8_t *p_buffer, int p_buffer_size) {
-
 	ERR_FAIL_COND_V_MSG(!_is_multiplayer, ERR_UNCONFIGURED, "Please use get_peer(ID).put_packet/var to communicate with peers when not using the MultiplayerAPI.");
 
-	PoolVector<uint8_t> buffer = _make_pkt(SYS_NONE, get_unique_id(), _target_peer, p_buffer, p_buffer_size);
+	Vector<uint8_t> buffer = _make_pkt(SYS_NONE, get_unique_id(), _target_peer, p_buffer, p_buffer_size);
 
 	if (is_server()) {
-		return _server_relay(1, _target_peer, &(buffer.read()[0]), buffer.size());
+		return _server_relay(1, _target_peer, &(buffer.ptr()[0]), buffer.size());
 	} else {
-		return get_peer(1)->put_packet(&(buffer.read()[0]), buffer.size());
+		return get_peer(1)->put_packet(&(buffer.ptr()[0]), buffer.size());
 	}
 }
 
@@ -140,23 +133,19 @@ Error WebSocketMultiplayerPeer::put_packet(const uint8_t *p_buffer, int p_buffer
 // NetworkedMultiplayerPeer
 //
 void WebSocketMultiplayerPeer::set_transfer_mode(TransferMode p_mode) {
-
 	// Websocket uses TCP, reliable
 }
 
 NetworkedMultiplayerPeer::TransferMode WebSocketMultiplayerPeer::get_transfer_mode() const {
-
 	// Websocket uses TCP, reliable
 	return TRANSFER_MODE_RELIABLE;
 }
 
 void WebSocketMultiplayerPeer::set_target_peer(int p_target_peer) {
-
 	_target_peer = p_target_peer;
 }
 
 int WebSocketMultiplayerPeer::get_packet_peer() const {
-
 	ERR_FAIL_COND_V_MSG(!_is_multiplayer, 1, "This function is not available when not using the MultiplayerAPI.");
 	ERR_FAIL_COND_V(_incoming_packets.size() == 0, 1);
 
@@ -164,35 +153,30 @@ int WebSocketMultiplayerPeer::get_packet_peer() const {
 }
 
 int WebSocketMultiplayerPeer::get_unique_id() const {
-
 	return _peer_id;
 }
 
 void WebSocketMultiplayerPeer::set_refuse_new_connections(bool p_enable) {
-
 	_refusing = p_enable;
 }
 
 bool WebSocketMultiplayerPeer::is_refusing_new_connections() const {
-
 	return _refusing;
 }
 
 void WebSocketMultiplayerPeer::_send_sys(Ref<WebSocketPeer> p_peer, uint8_t p_type, int32_t p_peer_id) {
-
 	ERR_FAIL_COND(!p_peer.is_valid());
 	ERR_FAIL_COND(!p_peer->is_connected_to_host());
 
-	PoolVector<uint8_t> message = _make_pkt(p_type, 1, 0, (uint8_t *)&p_peer_id, 4);
-	p_peer->put_packet(&(message.read()[0]), message.size());
+	Vector<uint8_t> message = _make_pkt(p_type, 1, 0, (uint8_t *)&p_peer_id, 4);
+	p_peer->put_packet(&(message.ptr()[0]), message.size());
 }
 
-PoolVector<uint8_t> WebSocketMultiplayerPeer::_make_pkt(uint8_t p_type, int32_t p_from, int32_t p_to, const uint8_t *p_data, uint32_t p_data_size) {
-
-	PoolVector<uint8_t> out;
+Vector<uint8_t> WebSocketMultiplayerPeer::_make_pkt(uint8_t p_type, int32_t p_from, int32_t p_to, const uint8_t *p_data, uint32_t p_data_size) {
+	Vector<uint8_t> out;
 	out.resize(PROTO_SIZE + p_data_size);
 
-	PoolVector<uint8_t>::Write w = out.write();
+	uint8_t *w = out.ptrw();
 	copymem(&w[0], &p_type, 1);
 	copymem(&w[1], &p_from, 4);
 	copymem(&w[5], &p_to, 4);
@@ -202,17 +186,17 @@ PoolVector<uint8_t> WebSocketMultiplayerPeer::_make_pkt(uint8_t p_type, int32_t
 }
 
 void WebSocketMultiplayerPeer::_send_add(int32_t p_peer_id) {
-
 	// First of all, confirm the ID!
 	_send_sys(get_peer(p_peer_id), SYS_ID, p_peer_id);
 
 	// Then send the server peer (which will trigger connection_succeded in client)
 	_send_sys(get_peer(p_peer_id), SYS_ADD, 1);
 
-	for (Map<int, Ref<WebSocketPeer> >::Element *E = _peer_map.front(); E; E = E->next()) {
+	for (Map<int, Ref<WebSocketPeer>>::Element *E = _peer_map.front(); E; E = E->next()) {
 		int32_t id = E->key();
-		if (p_peer_id == id)
+		if (p_peer_id == id) {
 			continue; // Skip the newwly added peer (already confirmed)
+		}
 
 		// Send new peer to others
 		_send_sys(get_peer(id), SYS_ADD, p_peer_id);
@@ -222,10 +206,11 @@ void WebSocketMultiplayerPeer::_send_add(int32_t p_peer_id) {
 }
 
 void WebSocketMultiplayerPeer::_send_del(int32_t p_peer_id) {
-	for (Map<int, Ref<WebSocketPeer> >::Element *E = _peer_map.front(); E; E = E->next()) {
+	for (Map<int, Ref<WebSocketPeer>>::Element *E = _peer_map.front(); E; E = E->next()) {
 		int32_t id = E->key();
-		if (p_peer_id != id)
+		if (p_peer_id != id) {
 			_send_sys(get_peer(id), SYS_DEL, p_peer_id);
+		}
 	}
 }
 
@@ -242,27 +227,25 @@ void WebSocketMultiplayerPeer::_store_pkt(int32_t p_source, int32_t p_dest, cons
 
 Error WebSocketMultiplayerPeer::_server_relay(int32_t p_from, int32_t p_to, const uint8_t *p_buffer, uint32_t p_buffer_size) {
 	if (p_to == 1) {
-
 		return OK; // Will not send to self
 
 	} else if (p_to == 0) {
-
-		for (Map<int, Ref<WebSocketPeer> >::Element *E = _peer_map.front(); E; E = E->next()) {
-			if (E->key() != p_from)
+		for (Map<int, Ref<WebSocketPeer>>::Element *E = _peer_map.front(); E; E = E->next()) {
+			if (E->key() != p_from) {
 				E->get()->put_packet(p_buffer, p_buffer_size);
+			}
 		}
 		return OK; // Sent to all but sender
 
 	} else if (p_to < 0) {
-
-		for (Map<int, Ref<WebSocketPeer> >::Element *E = _peer_map.front(); E; E = E->next()) {
-			if (E->key() != p_from && E->key() != -p_to)
+		for (Map<int, Ref<WebSocketPeer>>::Element *E = _peer_map.front(); E; E = E->next()) {
+			if (E->key() != p_from && E->key() != -p_to) {
 				E->get()->put_packet(p_buffer, p_buffer_size);
+			}
 		}
 		return OK; // Sent to all but sender and excluded
 
 	} else {
-
 		ERR_FAIL_COND_V(p_to == p_from, FAILED);
 
 		Ref<WebSocketPeer> peer_to = get_peer(p_to);
@@ -273,7 +256,6 @@ Error WebSocketMultiplayerPeer::_server_relay(int32_t p_from, int32_t p_to, cons
 }
 
 void WebSocketMultiplayerPeer::_process_multiplayer(Ref<WebSocketPeer> p_peer, uint32_t p_peer_id) {
-
 	ERR_FAIL_COND(!p_peer.is_valid());
 
 	const uint8_t *in_buffer;
@@ -304,21 +286,19 @@ void WebSocketMultiplayerPeer::_process_multiplayer(Ref<WebSocketPeer> p_peer, u
 			_store_pkt(from, to, in_buffer, data_size);
 
 		} else if (to == 0) {
-
 			// Broadcast, for us too
 			_store_pkt(from, to, in_buffer, data_size);
 
 		} else if (to < 0) {
-
 			// All but one, for us if not excluded
-			if (_peer_id != -(int32_t)p_peer_id)
+			if (_peer_id != -(int32_t)p_peer_id) {
 				_store_pkt(from, to, in_buffer, data_size);
+			}
 		}
 		// Relay if needed (i.e. "to" includes a peer that is not the server)
 		_server_relay(from, to, in_buffer, size);
 
 	} else {
-
 		if (type == SYS_NONE) { // Payload message
 
 			_store_pkt(from, to, in_buffer, data_size);
@@ -331,12 +311,12 @@ void WebSocketMultiplayerPeer::_process_multiplayer(Ref<WebSocketPeer> p_peer, u
 		copymem(&id, &in_buffer[PROTO_SIZE], 4);
 
 		switch (type) {
-
 			case SYS_ADD: // Add peer
 				_peer_map[id] = Ref<WebSocketPeer>();
 				emit_signal("peer_connected", id);
-				if (id == 1) // We just connected to the server
+				if (id == 1) { // We just connected to the server
 					emit_signal("connection_succeeded");
+				}
 				break;
 
 			case SYS_DEL: // Remove peer
diff --git a/modules/websocket/websocket_multiplayer_peer.h b/modules/websocket/websocket_multiplayer_peer.h
index 27cb6e4eb7..af26aef21e 100644
--- a/modules/websocket/websocket_multiplayer_peer.h
+++ b/modules/websocket/websocket_multiplayer_peer.h
@@ -37,11 +37,10 @@
 #include "websocket_peer.h"
 
 class WebSocketMultiplayerPeer : public NetworkedMultiplayerPeer {
-
 	GDCLASS(WebSocketMultiplayerPeer, NetworkedMultiplayerPeer);
 
 private:
-	PoolVector<uint8_t> _make_pkt(uint8_t p_type, int32_t p_from, int32_t p_to, const uint8_t *p_data, uint32_t p_data_size);
+	Vector<uint8_t> _make_pkt(uint8_t p_type, int32_t p_from, int32_t p_to, const uint8_t *p_data, uint32_t p_data_size);
 	void _store_pkt(int32_t p_source, int32_t p_dest, const uint8_t *p_data, uint32_t p_data_size);
 	Error _server_relay(int32_t p_from, int32_t p_to, const uint8_t *p_buffer, uint32_t p_buffer_size);
 
@@ -63,7 +62,7 @@ protected:
 	};
 
 	List<Packet> _incoming_packets;
-	Map<int, Ref<WebSocketPeer> > _peer_map;
+	Map<int, Ref<WebSocketPeer>> _peer_map;
 	Packet _current_packet;
 
 	bool _is_multiplayer;
@@ -80,21 +79,18 @@ protected:
 
 public:
 	/* NetworkedMultiplayerPeer */
-	void set_transfer_mode(TransferMode p_mode);
-	TransferMode get_transfer_mode() const;
-	void set_target_peer(int p_target_peer);
-	int get_packet_peer() const;
-	int get_unique_id() const;
-	virtual bool is_server() const = 0;
-	void set_refuse_new_connections(bool p_enable);
-	bool is_refusing_new_connections() const;
-	virtual ConnectionStatus get_connection_status() const = 0;
+	void set_transfer_mode(TransferMode p_mode) override;
+	TransferMode get_transfer_mode() const override;
+	void set_target_peer(int p_target_peer) override;
+	int get_packet_peer() const override;
+	int get_unique_id() const override;
+	void set_refuse_new_connections(bool p_enable) override;
+	bool is_refusing_new_connections() const override;
 
 	/* PacketPeer */
-	virtual int get_available_packet_count() const;
-	virtual int get_max_packet_size() const = 0;
-	virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size);
-	virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size);
+	virtual int get_available_packet_count() const override;
+	virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size) override;
+	virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size) override;
 
 	/* WebSocketPeer */
 	virtual Error set_buffers(int p_in_buffer, int p_in_packets, int p_out_buffer, int p_out_packets) = 0;
diff --git a/modules/websocket/websocket_peer.h b/modules/websocket/websocket_peer.h
index d4173600ec..a61943b615 100644
--- a/modules/websocket/websocket_peer.h
+++ b/modules/websocket/websocket_peer.h
@@ -36,7 +36,6 @@
 #include "websocket_macros.h"
 
 class WebSocketPeer : public PacketPeer {
-
 	GDCLASS(WebSocketPeer, PacketPeer);
 	GDCICLASS(WebSocketPeer);
 
@@ -50,11 +49,6 @@ protected:
 	static void _bind_methods();
 
 public:
-	virtual int get_available_packet_count() const = 0;
-	virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size) = 0;
-	virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size) = 0;
-	virtual int get_max_packet_size() const = 0;
-
 	virtual WriteMode get_write_mode() const = 0;
 	virtual void set_write_mode(WriteMode p_mode) = 0;
 
diff --git a/modules/websocket/websocket_server.cpp b/modules/websocket/websocket_server.cpp
index a7ced65543..b20b925dec 100644
--- a/modules/websocket/websocket_server.cpp
+++ b/modules/websocket/websocket_server.cpp
@@ -41,7 +41,6 @@ WebSocketServer::~WebSocketServer() {
 }
 
 void WebSocketServer::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("is_listening"), &WebSocketServer::is_listening);
 	ClassDB::bind_method(D_METHOD("listen", "port", "protocols", "gd_mp_api"), &WebSocketServer::listen, DEFVAL(Vector<String>()), DEFVAL(false));
 	ClassDB::bind_method(D_METHOD("stop"), &WebSocketServer::stop);
@@ -110,19 +109,18 @@ void WebSocketServer::set_ca_chain(Ref<X509Certificate> p_ca_chain) {
 }
 
 NetworkedMultiplayerPeer::ConnectionStatus WebSocketServer::get_connection_status() const {
-	if (is_listening())
+	if (is_listening()) {
 		return CONNECTION_CONNECTED;
+	}
 
 	return CONNECTION_DISCONNECTED;
 }
 
 bool WebSocketServer::is_server() const {
-
 	return true;
 }
 
 void WebSocketServer::_on_peer_packet(int32_t p_peer_id) {
-
 	if (_is_multiplayer) {
 		_process_multiplayer(get_peer(p_peer_id), p_peer_id);
 	} else {
@@ -131,7 +129,6 @@ void WebSocketServer::_on_peer_packet(int32_t p_peer_id) {
 }
 
 void WebSocketServer::_on_connect(int32_t p_peer_id, String p_protocol) {
-
 	if (_is_multiplayer) {
 		// Send add to clients
 		_send_add(p_peer_id);
@@ -142,7 +139,6 @@ void WebSocketServer::_on_connect(int32_t p_peer_id, String p_protocol) {
 }
 
 void WebSocketServer::_on_disconnect(int32_t p_peer_id, bool p_was_clean) {
-
 	if (_is_multiplayer) {
 		// Send delete to clients
 		_send_del(p_peer_id);
@@ -153,6 +149,5 @@ void WebSocketServer::_on_disconnect(int32_t p_peer_id, bool p_was_clean) {
 }
 
 void WebSocketServer::_on_close_request(int32_t p_peer_id, int p_code, String p_reason) {
-
 	emit_signal("client_close_request", p_peer_id, p_code, p_reason);
 }
diff --git a/modules/websocket/websocket_server.h b/modules/websocket/websocket_server.h
index 3ce4dbe711..064ad4f179 100644
--- a/modules/websocket/websocket_server.h
+++ b/modules/websocket/websocket_server.h
@@ -37,7 +37,6 @@
 #include "websocket_peer.h"
 
 class WebSocketServer : public WebSocketMultiplayerPeer {
-
 	GDCLASS(WebSocketServer, WebSocketMultiplayerPeer);
 	GDCICLASS(WebSocketServer);
 
@@ -51,14 +50,12 @@ protected:
 	Ref<X509Certificate> ca_chain;
 
 public:
-	virtual void poll() = 0;
 	virtual Error listen(int p_port, const Vector<String> p_protocols = Vector<String>(), bool gd_mp_api = false) = 0;
 	virtual void stop() = 0;
 	virtual bool is_listening() const = 0;
 	virtual bool has_peer(int p_id) const = 0;
-	virtual Ref<WebSocketPeer> get_peer(int p_id) const = 0;
-	virtual bool is_server() const;
-	ConnectionStatus get_connection_status() const;
+	virtual bool is_server() const override;
+	ConnectionStatus get_connection_status() const override;
 
 	virtual IP_Address get_peer_address(int p_peer_id) const = 0;
 	virtual int get_peer_port(int p_peer_id) const = 0;
@@ -81,8 +78,6 @@ public:
 	Ref<X509Certificate> get_ca_chain() const;
 	void set_ca_chain(Ref<X509Certificate> p_ca_chain);
 
-	virtual Error set_buffers(int p_in_buffer, int p_in_packets, int p_out_buffer, int p_out_packets) = 0;
-
 	WebSocketServer();
 	~WebSocketServer();
 };
diff --git a/modules/websocket/wsl_client.cpp b/modules/websocket/wsl_client.cpp
index 088f266f18..7d16c2e99f 100644
--- a/modules/websocket/wsl_client.cpp
+++ b/modules/websocket/wsl_client.cpp
@@ -117,10 +117,11 @@ bool WSLClient::_verify_headers(String &r_protocol) {
 		ERR_FAIL_COND_V_MSG(header.size() != 2, false, "Invalid header -> " + psa[i] + ".");
 		String name = header[0].to_lower();
 		String value = header[1].strip_edges();
-		if (headers.has(name))
+		if (headers.has(name)) {
 			headers[name] += "," + value;
-		else
+		} else {
 			headers[name] = value;
+		}
 	}
 
 #define _WSL_CHECK(NAME, VALUE)                                                         \
@@ -142,19 +143,20 @@ bool WSLClient::_verify_headers(String &r_protocol) {
 		r_protocol = headers["sec-websocket-protocol"];
 		bool valid = false;
 		for (int i = 0; i < _protocols.size(); i++) {
-			if (_protocols[i] != r_protocol)
+			if (_protocols[i] != r_protocol) {
 				continue;
+			}
 			valid = true;
 			break;
 		}
-		if (!valid)
+		if (!valid) {
 			return false;
+		}
 	}
 	return true;
 }
 
 Error WSLClient::connect_to_host(String p_host, String p_path, uint16_t p_port, bool p_ssl, const Vector<String> p_protocols, const Vector<String> p_custom_headers) {
-
 	ERR_FAIL_COND_V(_connection.is_valid(), ERR_ALREADY_IN_USE);
 
 	_peer = Ref<WSLPeer>(memnew(WSLPeer));
@@ -200,8 +202,9 @@ Error WSLClient::connect_to_host(String p_host, String p_path, uint16_t p_port,
 	if (p_protocols.size() > 0) {
 		request += "Sec-WebSocket-Protocol: ";
 		for (int i = 0; i < p_protocols.size(); i++) {
-			if (i != 0)
+			if (i != 0) {
 				request += ",";
+			}
 			request += p_protocols[i];
 		}
 		request += "\r\n";
@@ -229,8 +232,9 @@ void WSLClient::poll() {
 		return;
 	}
 
-	if (_connection.is_null())
+	if (_connection.is_null()) {
 		return; // Not connected.
+	}
 
 	switch (_tcp->get_status()) {
 		case StreamPeerTCP::STATUS_NONE:
@@ -253,13 +257,13 @@ void WSLClient::poll() {
 					}
 					_connection = ssl;
 				} else {
-					ssl = static_cast<Ref<StreamPeerSSL> >(_connection);
+					ssl = static_cast<Ref<StreamPeerSSL>>(_connection);
 					ERR_FAIL_COND(ssl.is_null()); // Bug?
 					ssl->poll();
 				}
-				if (ssl->get_status() == StreamPeerSSL::STATUS_HANDSHAKING)
+				if (ssl->get_status() == StreamPeerSSL::STATUS_HANDSHAKING) {
 					return; // Need more polling.
-				else if (ssl->get_status() != StreamPeerSSL::STATUS_CONNECTED) {
+				} else if (ssl->get_status() != StreamPeerSSL::STATUS_CONNECTED) {
 					disconnect_from_host();
 					_on_error();
 					return; // Error.
@@ -278,27 +282,26 @@ void WSLClient::poll() {
 }
 
 Ref<WebSocketPeer> WSLClient::get_peer(int p_peer_id) const {
-
-	ERR_FAIL_COND_V(p_peer_id != 1, NULL);
+	ERR_FAIL_COND_V(p_peer_id != 1, nullptr);
 
 	return _peer;
 }
 
 NetworkedMultiplayerPeer::ConnectionStatus WSLClient::get_connection_status() const {
-
-	if (_peer->is_connected_to_host())
+	if (_peer->is_connected_to_host()) {
 		return CONNECTION_CONNECTED;
+	}
 
-	if (_tcp->is_connected_to_host())
+	if (_tcp->is_connected_to_host()) {
 		return CONNECTION_CONNECTING;
+	}
 
 	return CONNECTION_DISCONNECTED;
 }
 
 void WSLClient::disconnect_from_host(int p_code, String p_reason) {
-
 	_peer->close(p_code, p_reason);
-	_connection = Ref<StreamPeer>(NULL);
+	_connection = Ref<StreamPeer>(nullptr);
 	_tcp = Ref<StreamPeerTCP>(memnew(StreamPeerTCP));
 
 	_key = "";
@@ -314,13 +317,11 @@ void WSLClient::disconnect_from_host(int p_code, String p_reason) {
 }
 
 IP_Address WSLClient::get_connected_host() const {
-
 	ERR_FAIL_COND_V(!_peer->is_connected_to_host(), IP_Address());
 	return _peer->get_connected_host();
 }
 
 uint16_t WSLClient::get_connected_port() const {
-
 	ERR_FAIL_COND_V(!_peer->is_connected_to_host(), 0);
 	return _peer->get_connected_port();
 }
@@ -336,10 +337,10 @@ Error WSLClient::set_buffers(int p_in_buffer, int p_in_packets, int p_out_buffer
 }
 
 WSLClient::WSLClient() {
-	_in_buf_size = nearest_shift((int)GLOBAL_GET(WSC_IN_BUF) - 1) + 10;
-	_in_pkt_size = nearest_shift((int)GLOBAL_GET(WSC_IN_PKT) - 1);
-	_out_buf_size = nearest_shift((int)GLOBAL_GET(WSC_OUT_BUF) - 1) + 10;
-	_out_pkt_size = nearest_shift((int)GLOBAL_GET(WSC_OUT_PKT) - 1);
+	_in_buf_size = DEF_BUF_SHIFT;
+	_in_pkt_size = DEF_PKT_SHIFT;
+	_out_buf_size = DEF_BUF_SHIFT;
+	_out_pkt_size = DEF_PKT_SHIFT;
 
 	_peer.instance();
 	_tcp.instance();
@@ -347,7 +348,6 @@ WSLClient::WSLClient() {
 }
 
 WSLClient::~WSLClient() {
-
 	_peer->close_now();
 	_peer->invalidate();
 	disconnect_from_host();
diff --git a/modules/websocket/wsl_client.h b/modules/websocket/wsl_client.h
index 2cecfd97ee..8355a5a737 100644
--- a/modules/websocket/wsl_client.h
+++ b/modules/websocket/wsl_client.h
@@ -41,7 +41,6 @@
 #include "wslay/wslay.h"
 
 class WSLClient : public WebSocketClient {
-
 	GDCIIMPL(WSLClient, WebSocketClient);
 
 private:
diff --git a/modules/websocket/wsl_peer.cpp b/modules/websocket/wsl_peer.cpp
index 08079145e4..bf1ba43f8a 100644
--- a/modules/websocket/wsl_peer.cpp
+++ b/modules/websocket/wsl_peer.cpp
@@ -43,10 +43,10 @@ String WSLPeer::generate_key() {
 	// Random key
 	RandomNumberGenerator rng;
 	rng.set_seed(OS::get_singleton()->get_unix_time());
-	PoolVector<uint8_t> bkey;
+	Vector<uint8_t> bkey;
 	int len = 16; // 16 bytes, as per RFC
 	bkey.resize(len);
-	PoolVector<uint8_t>::Write w = bkey.write();
+	uint8_t *w = bkey.ptrw();
 	for (int i = 0; i < len; i++) {
 		w[i] = (uint8_t)rng.randi_range(0, 255);
 	}
@@ -60,8 +60,9 @@ String WSLPeer::compute_key_response(String p_key) {
 }
 
 void WSLPeer::_wsl_destroy(struct PeerData **p_data) {
-	if (!p_data || !(*p_data))
+	if (!p_data || !(*p_data)) {
 		return;
+	}
 	struct PeerData *data = *p_data;
 	if (data->polling) {
 		data->destroy = true;
@@ -69,7 +70,7 @@ void WSLPeer::_wsl_destroy(struct PeerData **p_data) {
 	}
 	wslay_event_context_free(data->ctx);
 	memdelete(data);
-	*p_data = NULL;
+	*p_data = nullptr;
 }
 
 bool WSLPeer::_wsl_poll(struct PeerData *p_data) {
@@ -147,8 +148,9 @@ void wsl_msg_recv_callback(wslay_event_context_ptr ctx, const struct wslay_event
 	}
 	WSLPeer *peer = (WSLPeer *)peer_data->peer;
 
-	if (peer->parse_message(arg) != OK)
+	if (peer->parse_message(arg) != OK) {
 		return;
+	}
 
 	if (peer_data->is_server) {
 		WSLServer *helper = (WSLServer *)peer_data->obj;
@@ -163,9 +165,9 @@ wslay_event_callbacks wsl_callbacks = {
 	wsl_recv_callback,
 	wsl_send_callback,
 	wsl_genmask_callback,
-	NULL, /* on_frame_recv_start_callback */
-	NULL, /* on_frame_recv_callback */
-	NULL, /* on_frame_recv_end_callback */
+	nullptr, /* on_frame_recv_start_callback */
+	nullptr, /* on_frame_recv_callback */
+	nullptr, /* on_frame_recv_end_callback */
 	wsl_msg_recv_callback
 };
 
@@ -199,8 +201,8 @@ Error WSLPeer::parse_message(const wslay_event_on_msg_recv_arg *arg) {
 }
 
 void WSLPeer::make_context(PeerData *p_data, unsigned int p_in_buf_size, unsigned int p_in_pkt_size, unsigned int p_out_buf_size, unsigned int p_out_pkt_size) {
-	ERR_FAIL_COND(_data != NULL);
-	ERR_FAIL_COND(p_data == NULL);
+	ERR_FAIL_COND(_data != nullptr);
+	ERR_FAIL_COND(p_data == nullptr);
 
 	_in_buffer.resize(p_in_pkt_size, p_in_buf_size);
 	_packet_buffer.resize((1 << MAX(p_in_buf_size, p_out_buf_size)));
@@ -209,10 +211,11 @@ void WSLPeer::make_context(PeerData *p_data, unsigned int p_in_buf_size, unsigne
 	_data->peer = this;
 	_data->valid = true;
 
-	if (_data->is_server)
+	if (_data->is_server) {
 		wslay_event_context_server_init(&(_data->ctx), &wsl_callbacks, _data);
-	else
+	} else {
 		wslay_event_context_client_init(&(_data->ctx), &wsl_callbacks, _data);
+	}
 	wslay_event_config_set_max_recv_msg_length(_data->ctx, (1ULL << p_in_buf_size));
 }
 
@@ -225,16 +228,16 @@ WSLPeer::WriteMode WSLPeer::get_write_mode() const {
 }
 
 void WSLPeer::poll() {
-	if (!_data)
+	if (!_data) {
 		return;
+	}
 
 	if (_wsl_poll(_data)) {
-		_data = NULL;
+		_data = nullptr;
 	}
 }
 
 Error WSLPeer::put_packet(const uint8_t *p_buffer, int p_buffer_size) {
-
 	ERR_FAIL_COND_V(!is_connected_to_host(), FAILED);
 
 	struct wslay_event_msg msg; // Should I use fragmented?
@@ -251,40 +254,38 @@ Error WSLPeer::put_packet(const uint8_t *p_buffer, int p_buffer_size) {
 }
 
 Error WSLPeer::get_packet(const uint8_t **r_buffer, int &r_buffer_size) {
-
 	r_buffer_size = 0;
 
 	ERR_FAIL_COND_V(!is_connected_to_host(), FAILED);
 
-	if (_in_buffer.packets_left() == 0)
+	if (_in_buffer.packets_left() == 0) {
 		return ERR_UNAVAILABLE;
+	}
 
 	int read = 0;
-	PoolVector<uint8_t>::Write rw = _packet_buffer.write();
-	_in_buffer.read_packet(rw.ptr(), _packet_buffer.size(), &_is_string, read);
+	uint8_t *rw = _packet_buffer.ptrw();
+	_in_buffer.read_packet(rw, _packet_buffer.size(), &_is_string, read);
 
-	*r_buffer = rw.ptr();
+	*r_buffer = rw;
 	r_buffer_size = read;
 
 	return OK;
 }
 
 int WSLPeer::get_available_packet_count() const {
-
-	if (!is_connected_to_host())
+	if (!is_connected_to_host()) {
 		return 0;
+	}
 
 	return _in_buffer.packets_left();
 }
 
 bool WSLPeer::was_string_packet() const {
-
 	return _is_string;
 }
 
 bool WSLPeer::is_connected_to_host() const {
-
-	return _data != NULL;
+	return _data != nullptr;
 }
 
 void WSLPeer::close_now() {
@@ -305,43 +306,40 @@ void WSLPeer::close(int p_code, String p_reason) {
 }
 
 IP_Address WSLPeer::get_connected_host() const {
-
 	ERR_FAIL_COND_V(!is_connected_to_host() || _data->tcp.is_null(), IP_Address());
 
 	return _data->tcp->get_connected_host();
 }
 
 uint16_t WSLPeer::get_connected_port() const {
-
 	ERR_FAIL_COND_V(!is_connected_to_host() || _data->tcp.is_null(), 0);
 
 	return _data->tcp->get_connected_port();
 }
 
 void WSLPeer::set_no_delay(bool p_enabled) {
-
 	ERR_FAIL_COND(!is_connected_to_host() || _data->tcp.is_null());
 	_data->tcp->set_no_delay(p_enabled);
 }
 
 void WSLPeer::invalidate() {
-	if (_data)
+	if (_data) {
 		_data->valid = false;
+	}
 }
 
 WSLPeer::WSLPeer() {
-	_data = NULL;
+	_data = nullptr;
 	_is_string = 0;
 	close_code = -1;
 	write_mode = WRITE_MODE_BINARY;
 }
 
 WSLPeer::~WSLPeer() {
-
 	close();
 	invalidate();
 	_wsl_destroy(&_data);
-	_data = NULL;
+	_data = nullptr;
 }
 
 #endif // JAVASCRIPT_ENABLED
diff --git a/modules/websocket/wsl_peer.h b/modules/websocket/wsl_peer.h
index f1c45ee859..fe4abfb64c 100644
--- a/modules/websocket/wsl_peer.h
+++ b/modules/websocket/wsl_peer.h
@@ -44,7 +44,6 @@
 #define WSL_MAX_HEADER_SIZE 4096
 
 class WSLPeer : public WebSocketPeer {
-
 	GDCIIMPL(WSLPeer, WebSocketPeer);
 
 public:
@@ -67,10 +66,10 @@ public:
 			valid = false;
 			is_server = false;
 			id = 1;
-			ctx = NULL;
-			obj = NULL;
+			ctx = nullptr;
+			obj = nullptr;
 			closing = false;
-			peer = NULL;
+			peer = nullptr;
 		}
 	};
 
@@ -86,7 +85,7 @@ private:
 	// Our packet info is just a boolean (is_string), using uint8_t for it.
 	PacketBuffer<uint8_t> _in_buffer;
 
-	PoolVector<uint8_t> _packet_buffer;
+	Vector<uint8_t> _packet_buffer;
 
 	WriteMode write_mode;
 
diff --git a/modules/websocket/wsl_server.cpp b/modules/websocket/wsl_server.cpp
index 4db650a0c1..da7bfc70c0 100644
--- a/modules/websocket/wsl_server.cpp
+++ b/modules/websocket/wsl_server.cpp
@@ -60,10 +60,11 @@ bool WSLServer::PendingPeer::_parse_request(const Vector<String> p_protocols) {
 		ERR_FAIL_COND_V_MSG(header.size() != 2, false, "Invalid header -> " + psa[i]);
 		String name = header[0].to_lower();
 		String value = header[1].strip_edges();
-		if (headers.has(name))
+		if (headers.has(name)) {
 			headers[name] += "," + value;
-		else
+		} else {
 			headers[name] = value;
+		}
 	}
 #define _WSL_CHECK(NAME, VALUE)                                                         \
 	ERR_FAIL_COND_V_MSG(!headers.has(NAME) || headers[NAME].to_lower() != VALUE, false, \
@@ -83,44 +84,52 @@ bool WSLServer::PendingPeer::_parse_request(const Vector<String> p_protocols) {
 			String proto = protos[i].strip_edges();
 			// Check if we have the given protocol
 			for (int j = 0; j < p_protocols.size(); j++) {
-				if (proto != p_protocols[j])
+				if (proto != p_protocols[j]) {
 					continue;
+				}
 				protocol = proto;
 				break;
 			}
 			// Found a protocol
-			if (protocol != "")
+			if (protocol != "") {
 				break;
+			}
 		}
-		if (protocol == "") // Invalid protocol(s) requested
+		if (protocol == "") { // Invalid protocol(s) requested
 			return false;
-	} else if (p_protocols.size() > 0) // No protocol requested, but we need one
+		}
+	} else if (p_protocols.size() > 0) { // No protocol requested, but we need one
 		return false;
+	}
 	return true;
 }
 
 Error WSLServer::PendingPeer::do_handshake(const Vector<String> p_protocols) {
-	if (OS::get_singleton()->get_ticks_msec() - time > WSL_SERVER_TIMEOUT)
+	if (OS::get_singleton()->get_ticks_msec() - time > WSL_SERVER_TIMEOUT) {
 		return ERR_TIMEOUT;
+	}
 	if (use_ssl) {
-		Ref<StreamPeerSSL> ssl = static_cast<Ref<StreamPeerSSL> >(connection);
-		if (ssl.is_null())
+		Ref<StreamPeerSSL> ssl = static_cast<Ref<StreamPeerSSL>>(connection);
+		if (ssl.is_null()) {
 			return FAILED;
+		}
 		ssl->poll();
-		if (ssl->get_status() == StreamPeerSSL::STATUS_HANDSHAKING)
+		if (ssl->get_status() == StreamPeerSSL::STATUS_HANDSHAKING) {
 			return ERR_BUSY;
-		else if (ssl->get_status() != StreamPeerSSL::STATUS_CONNECTED)
+		} else if (ssl->get_status() != StreamPeerSSL::STATUS_CONNECTED) {
 			return FAILED;
+		}
 	}
 	if (!has_request) {
 		int read = 0;
 		while (true) {
 			ERR_FAIL_COND_V_MSG(req_pos >= WSL_MAX_HEADER_SIZE, ERR_OUT_OF_MEMORY, "Response headers too big.");
 			Error err = connection->get_partial_data(&req_buf[req_pos], 1, read);
-			if (err != OK) // Got an error
+			if (err != OK) { // Got an error
 				return FAILED;
-			else if (read != 1) // Busy, wait next poll
+			} else if (read != 1) { // Busy, wait next poll
 				return ERR_BUSY;
+			}
 			char *r = (char *)req_buf;
 			int l = req_pos;
 			if (l > 3 && r[l] == '\n' && r[l - 1] == '\r' && r[l - 2] == '\n' && r[l - 3] == '\r') {
@@ -132,8 +141,9 @@ Error WSLServer::PendingPeer::do_handshake(const Vector<String> p_protocols) {
 				s += "Upgrade: websocket\r\n";
 				s += "Connection: Upgrade\r\n";
 				s += "Sec-WebSocket-Accept: " + WSLPeer::compute_key_response(key) + "\r\n";
-				if (protocol != "")
+				if (protocol != "") {
 					s += "Sec-WebSocket-Protocol: " + protocol + "\r\n";
+				}
 				s += "\r\n";
 				response = s.utf8();
 				has_request = true;
@@ -150,8 +160,9 @@ Error WSLServer::PendingPeer::do_handshake(const Vector<String> p_protocols) {
 		}
 		response_sent += sent;
 	}
-	if (response_sent < response.size() - 1)
+	if (response_sent < response.size() - 1) {
 		return ERR_BUSY;
+	}
 	return OK;
 }
 
@@ -169,9 +180,8 @@ Error WSLServer::listen(int p_port, const Vector<String> p_protocols, bool gd_mp
 }
 
 void WSLServer::poll() {
-
 	List<int> remove_ids;
-	for (Map<int, Ref<WebSocketPeer> >::Element *E = _peer_map.front(); E; E = E->next()) {
+	for (Map<int, Ref<WebSocketPeer>>::Element *E = _peer_map.front(); E; E = E->next()) {
 		Ref<WSLPeer> peer = (WSLPeer *)E->get().ptr();
 		peer->poll();
 		if (!peer->is_connected_to_host()) {
@@ -184,8 +194,8 @@ void WSLServer::poll() {
 	}
 	remove_ids.clear();
 
-	List<Ref<PendingPeer> > remove_peers;
-	for (List<Ref<PendingPeer> >::Element *E = _pending.front(); E; E = E->next()) {
+	List<Ref<PendingPeer>> remove_peers;
+	for (List<Ref<PendingPeer>>::Element *E = _pending.front(); E; E = E->next()) {
 		Ref<PendingPeer> ppeer = E->get();
 		Error err = ppeer->do_handshake(_protocols);
 		if (err == ERR_BUSY) {
@@ -212,18 +222,20 @@ void WSLServer::poll() {
 		remove_peers.push_back(ppeer);
 		_on_connect(id, ppeer->protocol);
 	}
-	for (List<Ref<PendingPeer> >::Element *E = remove_peers.front(); E; E = E->next()) {
+	for (List<Ref<PendingPeer>>::Element *E = remove_peers.front(); E; E = E->next()) {
 		_pending.erase(E->get());
 	}
 	remove_peers.clear();
 
-	if (!_server->is_listening())
+	if (!_server->is_listening()) {
 		return;
+	}
 
 	while (_server->is_connection_available()) {
 		Ref<StreamPeerTCP> conn = _server->take_connection();
-		if (is_refusing_new_connections())
+		if (is_refusing_new_connections()) {
 			continue; // Conn will go out-of-scope and be closed.
+		}
 
 		Ref<PendingPeer> peer = memnew(PendingPeer);
 		if (private_key.is_valid() && ssl_cert.is_valid()) {
@@ -251,7 +263,7 @@ int WSLServer::get_max_packet_size() const {
 
 void WSLServer::stop() {
 	_server->stop();
-	for (Map<int, Ref<WebSocketPeer> >::Element *E = _peer_map.front(); E; E = E->next()) {
+	for (Map<int, Ref<WebSocketPeer>>::Element *E = _peer_map.front(); E; E = E->next()) {
 		Ref<WSLPeer> peer = (WSLPeer *)E->get().ptr();
 		peer->close_now();
 	}
@@ -265,7 +277,7 @@ bool WSLServer::has_peer(int p_id) const {
 }
 
 Ref<WebSocketPeer> WSLServer::get_peer(int p_id) const {
-	ERR_FAIL_COND_V(!has_peer(p_id), NULL);
+	ERR_FAIL_COND_V(!has_peer(p_id), nullptr);
 	return _peer_map[p_id];
 }
 
@@ -298,10 +310,10 @@ Error WSLServer::set_buffers(int p_in_buffer, int p_in_packets, int p_out_buffer
 }
 
 WSLServer::WSLServer() {
-	_in_buf_size = nearest_shift((int)GLOBAL_GET(WSS_IN_BUF) - 1) + 10;
-	_in_pkt_size = nearest_shift((int)GLOBAL_GET(WSS_IN_PKT) - 1);
-	_out_buf_size = nearest_shift((int)GLOBAL_GET(WSS_OUT_BUF) - 1) + 10;
-	_out_pkt_size = nearest_shift((int)GLOBAL_GET(WSS_OUT_PKT) - 1);
+	_in_buf_size = DEF_BUF_SHIFT;
+	_in_pkt_size = DEF_PKT_SHIFT;
+	_out_buf_size = DEF_BUF_SHIFT;
+	_out_pkt_size = DEF_PKT_SHIFT;
 	_server.instance();
 }
 
diff --git a/modules/websocket/wsl_server.h b/modules/websocket/wsl_server.h
index 649d1adee6..f86de02797 100644
--- a/modules/websocket/wsl_server.h
+++ b/modules/websocket/wsl_server.h
@@ -43,12 +43,10 @@
 #define WSL_SERVER_TIMEOUT 1000
 
 class WSLServer : public WebSocketServer {
-
 	GDCIIMPL(WSLServer, WebSocketServer);
 
 private:
 	class PendingPeer : public Reference {
-
 	private:
 		bool _parse_request(const Vector<String> p_protocols);
 
@@ -76,7 +74,7 @@ private:
 	int _out_buf_size;
 	int _out_pkt_size;
 
-	List<Ref<PendingPeer> > _pending;
+	List<Ref<PendingPeer>> _pending;
 	Ref<TCP_Server> _server;
 	Vector<String> _protocols;
 
diff --git a/modules/xatlas_unwrap/SCsub b/modules/xatlas_unwrap/SCsub
index b242fd4673..c659349d05 100644
--- a/modules/xatlas_unwrap/SCsub
+++ b/modules/xatlas_unwrap/SCsub
@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 
-Import('env')
-Import('env_modules')
+Import("env")
+Import("env_modules")
 
 env_xatlas_unwrap = env_modules.Clone()
 
 # Thirdparty source files
-if env['builtin_xatlas']:
+if env["builtin_xatlas"]:
     thirdparty_dir = "#thirdparty/xatlas/"
     thirdparty_sources = [
         "xatlas.cpp",
diff --git a/modules/xatlas_unwrap/config.py b/modules/xatlas_unwrap/config.py
index bd092bdc16..2e73c51626 100644
--- a/modules/xatlas_unwrap/config.py
+++ b/modules/xatlas_unwrap/config.py
@@ -1,5 +1,6 @@
 def can_build(env, platform):
-    return (env['tools'] and platform not in ["android", "ios"])
+    return env["tools"] and platform not in ["android", "ios"]
+
 
 def configure(env):
     pass
diff --git a/modules/xatlas_unwrap/register_types.cpp b/modules/xatlas_unwrap/register_types.cpp
index c69b566525..6242009f67 100644
--- a/modules/xatlas_unwrap/register_types.cpp
+++ b/modules/xatlas_unwrap/register_types.cpp
@@ -32,14 +32,90 @@
 
 #include "core/error_macros.h"
 
+#include "core/crypto/crypto_core.h"
+
 #include "thirdparty/xatlas/xatlas.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 
-extern bool (*array_mesh_lightmap_unwrap_callback)(float p_texel_size, const float *p_vertices, const float *p_normals, int p_vertex_count, const int *p_indices, const int *p_face_materials, int p_index_count, float **r_uv, int **r_vertex, int *r_vertex_count, int **r_index, int *r_index_count, int *r_size_hint_x, int *r_size_hint_y);
+extern bool (*array_mesh_lightmap_unwrap_callback)(float p_texel_size, const float *p_vertices, const float *p_normals, int p_vertex_count, const int *p_indices, int p_index_count, float **r_uv, int **r_vertex, int *r_vertex_count, int **r_index, int *r_index_count, int *r_size_hint_x, int *r_size_hint_y, int *&r_cache_data, unsigned int &r_cache_size, bool &r_used_cache);
+
+bool xatlas_mesh_lightmap_unwrap_callback(float p_texel_size, const float *p_vertices, const float *p_normals, int p_vertex_count, const int *p_indices, int p_index_count, float **r_uvs, int **r_vertices, int *r_vertex_count, int **r_indices, int *r_index_count, int *r_size_hint_x, int *r_size_hint_y, int *&r_cache_data, unsigned int &r_cache_size, bool &r_used_cache) {
+	CryptoCore::MD5Context ctx;
+	ctx.start();
+
+	ctx.update((unsigned char *)&p_texel_size, sizeof(float));
+	ctx.update((unsigned char *)p_indices, sizeof(int) * p_index_count);
+	ctx.update((unsigned char *)p_vertices, sizeof(float) * p_vertex_count);
+	ctx.update((unsigned char *)p_normals, sizeof(float) * p_vertex_count);
+
+	unsigned char hash[16];
+	ctx.finish(hash);
+
+	bool cached = false;
+	unsigned int cache_idx = 0;
+
+	if (r_used_cache && r_cache_size) {
+		//Check if hash is in cache data
+
+		int *cache_data = r_cache_data;
+		int n_entries = cache_data[0];
+		unsigned int r_idx = 1;
+		for (int i = 0; i < n_entries; ++i) {
+			if (memcmp(&cache_data[r_idx], hash, 16) == 0) {
+				cached = true;
+				cache_idx = r_idx;
+				break;
+			}
+
+			r_idx += 4; // hash
+			r_idx += 2; // size hint
+
+			int vertex_count = cache_data[r_idx];
+			r_idx += 1; // vertex count
+			r_idx += vertex_count; // vertex
+			r_idx += vertex_count * 2; // uvs
+
+			int index_count = cache_data[r_idx];
+			r_idx += 1; // index count
+			r_idx += index_count; // indices
+		}
+	}
+
+	if (r_used_cache && cached) {
+		int *cache_data = r_cache_data;
 
-bool xatlas_mesh_lightmap_unwrap_callback(float p_texel_size, const float *p_vertices, const float *p_normals, int p_vertex_count, const int *p_indices, const int *p_face_materials, int p_index_count, float **r_uv, int **r_vertex, int *r_vertex_count, int **r_index, int *r_index_count, int *r_size_hint_x, int *r_size_hint_y) {
+		// Return cache data pointer to the caller
+		r_cache_data = &cache_data[cache_idx];
+
+		cache_idx += 4;
+
+		// Load size
+		*r_size_hint_x = cache_data[cache_idx];
+		*r_size_hint_y = cache_data[cache_idx + 1];
+		cache_idx += 2;
+
+		// Load vertices
+		*r_vertex_count = cache_data[cache_idx];
+		cache_idx++;
+		*r_vertices = &cache_data[cache_idx];
+		cache_idx += *r_vertex_count;
+
+		// Load UVs
+		*r_uvs = (float *)&cache_data[cache_idx];
+		cache_idx += *r_vertex_count * 2;
+
+		// Load indices
+		*r_index_count = cache_data[cache_idx];
+		cache_idx++;
+		*r_indices = &cache_data[cache_idx];
+
+		// Return cache data size to the caller
+		r_cache_size = sizeof(int) * (4 + 2 + 1 + *r_vertex_count + (*r_vertex_count * 2) + 1 + *r_index_count); // hash + size hint + vertex_count + vertices + uvs + index_count + indices
+		r_used_cache = true;
+		return true;
+	}
 
 	//set up input mesh
 	xatlas::MeshDecl input_mesh;
@@ -52,7 +128,7 @@ bool xatlas_mesh_lightmap_unwrap_callback(float p_texel_size, const float *p_ver
 	input_mesh.vertexPositionStride = sizeof(float) * 3;
 	input_mesh.vertexNormalData = p_normals;
 	input_mesh.vertexNormalStride = sizeof(uint32_t) * 3;
-	input_mesh.vertexUvData = NULL;
+	input_mesh.vertexUvData = nullptr;
 	input_mesh.vertexUvStride = 0;
 
 	xatlas::ChartOptions chart_options;
@@ -60,6 +136,7 @@ bool xatlas_mesh_lightmap_unwrap_callback(float p_texel_size, const float *p_ver
 
 	pack_options.maxChartSize = 4096;
 	pack_options.blockAlign = true;
+	pack_options.padding = 1;
 	pack_options.texelsPerUnit = 1.0 / p_texel_size;
 
 	xatlas::Atlas *atlas = xatlas::Create();
@@ -68,7 +145,7 @@ bool xatlas_mesh_lightmap_unwrap_callback(float p_texel_size, const float *p_ver
 	ERR_FAIL_COND_V_MSG(err != xatlas::AddMeshError::Enum::Success, false, xatlas::StringForEnum(err));
 
 	printf("Generate..\n");
-	xatlas::Generate(atlas, chart_options, NULL, pack_options);
+	xatlas::Generate(atlas, chart_options, xatlas::ParameterizeOptions(), pack_options);
 
 	*r_size_hint_x = atlas->width;
 	*r_size_hint_y = atlas->height;
@@ -82,16 +159,16 @@ bool xatlas_mesh_lightmap_unwrap_callback(float p_texel_size, const float *p_ver
 
 	const xatlas::Mesh &output = atlas->meshes[0];
 
-	*r_vertex = (int *)malloc(sizeof(int) * output.vertexCount);
-	*r_uv = (float *)malloc(sizeof(float) * output.vertexCount * 2);
-	*r_index = (int *)malloc(sizeof(int) * output.indexCount);
+	*r_vertices = (int *)malloc(sizeof(int) * output.vertexCount);
+	*r_uvs = (float *)malloc(sizeof(float) * output.vertexCount * 2);
+	*r_indices = (int *)malloc(sizeof(int) * output.indexCount);
 
 	float max_x = 0;
 	float max_y = 0;
 	for (uint32_t i = 0; i < output.vertexCount; i++) {
-		(*r_vertex)[i] = output.vertexArray[i].xref;
-		(*r_uv)[i * 2 + 0] = output.vertexArray[i].uv[0] / w;
-		(*r_uv)[i * 2 + 1] = output.vertexArray[i].uv[1] / h;
+		(*r_vertices)[i] = output.vertexArray[i].xref;
+		(*r_uvs)[i * 2 + 0] = output.vertexArray[i].uv[0] / w;
+		(*r_uvs)[i * 2 + 1] = output.vertexArray[i].uv[1] / h;
 		max_x = MAX(max_x, output.vertexArray[i].uv[0]);
 		max_y = MAX(max_y, output.vertexArray[i].uv[1]);
 	}
@@ -100,18 +177,58 @@ bool xatlas_mesh_lightmap_unwrap_callback(float p_texel_size, const float *p_ver
 	*r_vertex_count = output.vertexCount;
 
 	for (uint32_t i = 0; i < output.indexCount; i++) {
-		(*r_index)[i] = output.indexArray[i];
+		(*r_indices)[i] = output.indexArray[i];
 	}
 
 	*r_index_count = output.indexCount;
 
 	xatlas::Destroy(atlas);
-	printf("Done\n");
+
+	if (r_used_cache) {
+		unsigned int new_cache_size = 4 + 2 + 1 + *r_vertex_count + (*r_vertex_count * 2) + 1 + *r_index_count; // hash + size hint + vertex_count + vertices + uvs + index_count + indices
+		new_cache_size *= sizeof(int);
+		int *new_cache_data = (int *)memalloc(new_cache_size);
+		unsigned int new_cache_idx = 0;
+
+		// hash
+		memcpy(&new_cache_data[new_cache_idx], hash, 16);
+		new_cache_idx += 4;
+
+		// size hint
+		new_cache_data[new_cache_idx] = *r_size_hint_x;
+		new_cache_data[new_cache_idx + 1] = *r_size_hint_y;
+		new_cache_idx += 2;
+
+		// vertex count
+		new_cache_data[new_cache_idx] = *r_vertex_count;
+		new_cache_idx++;
+
+		// vertices
+		memcpy(&new_cache_data[new_cache_idx], *r_vertices, sizeof(int) * *r_vertex_count);
+		new_cache_idx += *r_vertex_count;
+
+		// uvs
+		memcpy(&new_cache_data[new_cache_idx], *r_uvs, sizeof(float) * *r_vertex_count * 2);
+		new_cache_idx += *r_vertex_count * 2;
+
+		// index count
+		new_cache_data[new_cache_idx] = *r_index_count;
+		new_cache_idx++;
+
+		// indices
+		memcpy(&new_cache_data[new_cache_idx], *r_indices, sizeof(int) * *r_index_count);
+		new_cache_idx += *r_index_count;
+
+		// Return cache data to the caller
+		r_cache_data = new_cache_data;
+		r_cache_size = new_cache_size;
+		r_used_cache = false;
+	}
+
 	return true;
 }
 
 void register_xatlas_unwrap_types() {
-
 	array_mesh_lightmap_unwrap_callback = xatlas_mesh_lightmap_unwrap_callback;
 }
 
diff --git a/modules/xatlas_unwrap/register_types.h b/modules/xatlas_unwrap/register_types.h
index 3f2181fa63..fe924bab96 100644
--- a/modules/xatlas_unwrap/register_types.h
+++ b/modules/xatlas_unwrap/register_types.h
@@ -28,5 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef XATLAS_UNWRAP_REGISTER_TYPES_H
+#define XATLAS_UNWRAP_REGISTER_TYPES_H
+
 void register_xatlas_unwrap_types();
 void unregister_xatlas_unwrap_types();
+
+#endif // XATLAS_UNWRAP_REGISTER_TYPES_H