diff --git a/gdnative/basis.cpp b/gdnative/basis.cpp
index 62bb1d8..91029b8 100644
--- a/gdnative/basis.cpp
+++ b/gdnative/basis.cpp
@@ -39,31 +39,13 @@ extern "C" {
 
 static_assert(sizeof(pandemonium_basis) == sizeof(Basis), "Basis size mismatch");
 
-void GDAPI pandemonium_basis_new_with_rows(pandemonium_basis *r_dest, const pandemonium_vector3 *p_x_axis, const pandemonium_vector3 *p_y_axis, const pandemonium_vector3 *p_z_axis) {
-	const Vector3 *x_axis = (const Vector3 *)p_x_axis;
-	const Vector3 *y_axis = (const Vector3 *)p_y_axis;
-	const Vector3 *z_axis = (const Vector3 *)p_z_axis;
-	Basis *dest = (Basis *)r_dest;
-	*dest = Basis(*x_axis, *y_axis, *z_axis);
+void GDAPI pandemonium_basis_invert(pandemonium_basis *p_self) {
+	Basis *self = (Basis *)p_self;
+	self->invert();
 }
-
-void GDAPI pandemonium_basis_new_with_axis_and_angle(pandemonium_basis *r_dest, const pandemonium_vector3 *p_axis, const pandemonium_real p_phi) {
-	const Vector3 *axis = (const Vector3 *)p_axis;
-	Basis *dest = (Basis *)r_dest;
-	*dest = Basis(*axis, p_phi);
-}
-
-void GDAPI pandemonium_basis_new_with_euler(pandemonium_basis *r_dest, const pandemonium_vector3 *p_euler) {
-	const Vector3 *euler = (const Vector3 *)p_euler;
-	Basis *dest = (Basis *)r_dest;
-	*dest = Basis(*euler);
-}
-
-pandemonium_string GDAPI pandemonium_basis_as_string(const pandemonium_basis *p_self) {
-	pandemonium_string ret;
-	const Basis *self = (const Basis *)p_self;
-	memnew_placement(&ret, String(*self));
-	return ret;
+void GDAPI pandemonium_basis_transpose(pandemonium_basis *p_self) {
+	Basis *self = (Basis *)p_self;
+	self->transpose();
 }
 
 pandemonium_basis GDAPI pandemonium_basis_inverse(const pandemonium_basis *p_self) {
@@ -80,18 +62,23 @@ pandemonium_basis GDAPI pandemonium_basis_transposed(const pandemonium_basis *p_
 	return dest;
 }
 
-pandemonium_basis GDAPI pandemonium_basis_orthonormalized(const pandemonium_basis *p_self) {
-	pandemonium_basis dest;
-	const Basis *self = (const Basis *)p_self;
-	*((Basis *)&dest) = self->orthonormalized();
-	return dest;
-}
-
 pandemonium_real GDAPI pandemonium_basis_determinant(const pandemonium_basis *p_self) {
 	const Basis *self = (const Basis *)p_self;
 	return self->determinant();
 }
 
+void GDAPI pandemonium_basis_from_z(pandemonium_basis *p_self, const pandemonium_vector3 *p_z) {
+	Basis *self = (Basis *)p_self;
+	const Vector3 *z = (const Vector3 *)p_z;
+	self->from_z(*z);
+}
+
+void GDAPI pandemonium_basis_rotate(pandemonium_basis *p_self, const pandemonium_vector3 *p_axis, pandemonium_real p_phi) {
+	Basis *self = (Basis *)p_self;
+	const Vector3 *axis = (const Vector3 *)p_axis;
+	self->rotate(*axis, p_phi);
+}
+
 pandemonium_basis GDAPI pandemonium_basis_rotated(const pandemonium_basis *p_self, const pandemonium_vector3 *p_axis, const pandemonium_real p_phi) {
 	pandemonium_basis dest;
 	const Basis *self = (const Basis *)p_self;
@@ -100,20 +87,197 @@ pandemonium_basis GDAPI pandemonium_basis_rotated(const pandemonium_basis *p_sel
 	return dest;
 }
 
-pandemonium_basis GDAPI pandemonium_basis_scaled(const pandemonium_basis *p_self, const pandemonium_vector3 *p_scale) {
+void GDAPI pandemonium_basis_rotate_local(pandemonium_basis *p_self, const pandemonium_vector3 *p_axis, pandemonium_real p_phi) {
+	Basis *self = (Basis *)p_self;
+	const Vector3 *axis = (const Vector3 *)p_axis;
+	self->rotate_local(*axis, p_phi);
+}
+pandemonium_basis GDAPI pandemonium_basis_rotated_local(const pandemonium_basis *p_self, const pandemonium_vector3 *p_axis, pandemonium_real p_phi) {
 	pandemonium_basis dest;
 	const Basis *self = (const Basis *)p_self;
-	const Vector3 *scale = (const Vector3 *)p_scale;
-	*((Basis *)&dest) = self->scaled(*scale);
+	const Vector3 *axis = (const Vector3 *)p_axis;
+	*((Basis *)&dest) = self->rotated_local(*axis, p_phi);
 	return dest;
 }
 
-pandemonium_vector3 GDAPI pandemonium_basis_get_scale(const pandemonium_basis *p_self) {
+void GDAPI pandemonium_basis_rotate_euler(pandemonium_basis *p_self, const pandemonium_vector3 *p_euler) {
+	Basis *self = (Basis *)p_self;
+	const Vector3 *euler = (const Vector3 *)p_euler;
+	self->rotate(*euler);
+}
+pandemonium_basis GDAPI pandemonium_basis_rotated_euler(const pandemonium_basis *p_self, const pandemonium_vector3 *p_euler) {
+	pandemonium_basis dest;
+	const Basis *self = (const Basis *)p_self;
+	const Vector3 *euler = (const Vector3 *)p_euler;
+	*((Basis *)&dest) = self->rotated(*euler);
+	return dest;
+}
+
+void GDAPI pandemonium_basis_rotate_quat(pandemonium_basis *p_self, const pandemonium_quaternion *p_quat) {
+	Basis *self = (Basis *)p_self;
+	const Quaternion *quat = (const Quaternion *)p_quat;
+	self->rotate(*quat);
+}
+pandemonium_basis GDAPI pandemonium_basis_rotated_quat(const pandemonium_basis *p_self, const pandemonium_quaternion *p_quat) {
+	pandemonium_basis dest;
+	const Basis *self = (const Basis *)p_self;
+	const Quaternion *quat = (const Quaternion *)p_quat;
+	*((Basis *)&dest) = self->rotated(*quat);
+	return dest;
+}
+
+void GDAPI pandemonium_basis_rotatev(pandemonium_basis *p_self, const pandemonium_vector3 *p_euler) {
+	Basis *self = (Basis *)p_self;
+	const Vector3 *euler = (const Vector3 *)p_euler;
+	self->rotatev(*euler);
+}
+pandemonium_basis GDAPI pandemonium_basis_rotatedv(const pandemonium_basis *p_self, const pandemonium_vector3 *p_euler) {
+	pandemonium_basis dest;
+	const Basis *self = (const Basis *)p_self;
+	const Vector3 *euler = (const Vector3 *)p_euler;
+	*((Basis *)&dest) = self->rotatedv(*euler);
+	return dest;
+}
+void GDAPI pandemonium_basis_rotateq(pandemonium_basis *p_self, const pandemonium_quaternion *p_quat) {
+	Basis *self = (Basis *)p_self;
+	const Quaternion *quat = (const Quaternion *)p_quat;
+	self->rotateq(*quat);
+}
+pandemonium_basis GDAPI pandemonium_basis_rotatedq(const pandemonium_basis *p_self, const pandemonium_quaternion *p_quat) {
+	pandemonium_basis dest;
+	const Basis *self = (const Basis *)p_self;
+	const Quaternion *quat = (const Quaternion *)p_quat;
+	*((Basis *)&dest) = self->rotatedq(*quat);
+	return dest;
+}
+
+pandemonium_vector3 GDAPI pandemonium_basis_get_rotation_euler(const pandemonium_basis *p_self) {
 	pandemonium_vector3 dest;
 	const Basis *self = (const Basis *)p_self;
-	*((Vector3 *)&dest) = self->get_scale();
+	*((Vector3 *)&dest) = self->get_rotation_euler();
 	return dest;
 }
+void GDAPI pandemonium_basis_get_rotation_axis_angle(const pandemonium_basis *p_self, pandemonium_vector3 *p_axis, pandemonium_real p_angle) {
+	const Basis *self = (const Basis *)p_self;
+	Vector3 *axis = (Vector3 *)p_axis;
+	self->get_rotation_axis_angle(*axis, p_angle);
+}
+void GDAPI pandemonium_basis_get_rotation_axis_angle_local(const pandemonium_basis *p_self, pandemonium_vector3 *p_axis, pandemonium_real p_angle) {
+	const Basis *self = (const Basis *)p_self;
+	Vector3 *axis = (Vector3 *)p_axis;
+	self->get_rotation_axis_angle_local(*axis, p_angle);
+}
+pandemonium_quaternion GDAPI pandemonium_basis_get_rotation_quaternion(const pandemonium_basis *p_self) {
+	pandemonium_quaternion dest;
+	const Basis *self = (const Basis *)p_self;
+	*((Quaternion *)&dest) = self->get_rotation_quaternion();
+	return dest;
+}
+pandemonium_vector3 GDAPI pandemonium_basis_get_rotation(const pandemonium_basis *p_self) {
+	pandemonium_vector3 dest;
+	const Basis *self = (const Basis *)p_self;
+	*((Vector3 *)&dest) = self->get_rotation();
+	return dest;
+}
+
+void GDAPI pandemonium_basis_rotate_to_align(pandemonium_basis *p_self, const pandemonium_vector3 *p_start_direction, const pandemonium_vector3 *p_end_direction) {
+	Basis *self = (Basis *)p_self;
+	const Vector3 *start_direction = (const Vector3 *)p_start_direction;
+	const Vector3 *end_direction = (const Vector3 *)p_end_direction;
+	self->rotate_to_align(*start_direction, *end_direction);
+}
+
+pandemonium_vector3 GDAPI pandemonium_basis_rotref_posscale_decomposition(const pandemonium_basis *p_self, pandemonium_basis *rotref) {
+	pandemonium_vector3 dest;
+	const Basis *self = (const Basis *)p_self;
+	Basis *tref = (Basis *)rotref;
+	*((Vector3 *)&dest) = self->rotref_posscale_decomposition(*tref);
+	return dest;
+}
+
+pandemonium_vector3 GDAPI pandemonium_basis_get_euler_xyz(const pandemonium_basis *p_self) {
+	pandemonium_vector3 dest;
+	const Basis *self = (const Basis *)p_self;
+	*((Vector3 *)&dest) = self->get_euler_xyz();
+	return dest;
+}
+void GDAPI pandemonium_basis_set_euler_xyz(pandemonium_basis *p_self, const pandemonium_vector3 *p_euler) {
+	Basis *self = (Basis *)p_self;
+	const Vector3 *euler = (const Vector3 *)p_euler;
+	self->set_euler_xyz(*euler);
+}
+
+pandemonium_vector3 GDAPI pandemonium_basis_get_euler_xzy(const pandemonium_basis *p_self) {
+	pandemonium_vector3 dest;
+	const Basis *self = (const Basis *)p_self;
+	*((Vector3 *)&dest) = self->get_euler_xzy();
+	return dest;
+}
+void GDAPI pandemonium_basis_set_euler_xzy(pandemonium_basis *p_self, const pandemonium_vector3 *p_euler) {
+	Basis *self = (Basis *)p_self;
+	const Vector3 *euler = (const Vector3 *)p_euler;
+	self->set_euler_xzy(*euler);
+}
+
+pandemonium_vector3 GDAPI pandemonium_basis_get_euler_yzx(const pandemonium_basis *p_self) {
+	pandemonium_vector3 dest;
+	const Basis *self = (const Basis *)p_self;
+	*((Vector3 *)&dest) = self->get_euler_yzx();
+	return dest;
+}
+void GDAPI pandemonium_basis_set_euler_yzx(pandemonium_basis *p_self, const pandemonium_vector3 *p_euler) {
+	Basis *self = (Basis *)p_self;
+	const Vector3 *euler = (const Vector3 *)p_euler;
+	self->set_euler_yzx(*euler);
+}
+
+pandemonium_vector3 GDAPI pandemonium_basis_get_euler_yxz(const pandemonium_basis *p_self) {
+	pandemonium_vector3 dest;
+	const Basis *self = (const Basis *)p_self;
+	*((Vector3 *)&dest) = self->get_euler_yxz();
+	return dest;
+}
+void GDAPI pandemonium_basis_set_euler_yxz(pandemonium_basis *p_self, const pandemonium_vector3 *p_euler) {
+	Basis *self = (Basis *)p_self;
+	const Vector3 *euler = (const Vector3 *)p_euler;
+	self->set_euler_yxz(*euler);
+}
+
+pandemonium_vector3 GDAPI pandemonium_basis_get_euler_zxy(const pandemonium_basis *p_self) {
+	pandemonium_vector3 dest;
+	const Basis *self = (const Basis *)p_self;
+	*((Vector3 *)&dest) = self->get_euler_zxy();
+	return dest;
+}
+void GDAPI pandemonium_basis_set_euler_zxy(pandemonium_basis *p_self, const pandemonium_vector3 *p_euler) {
+	Basis *self = (Basis *)p_self;
+	const Vector3 *euler = (const Vector3 *)p_euler;
+	self->set_euler_zxy(*euler);
+}
+
+pandemonium_vector3 GDAPI pandemonium_basis_get_euler_zyx(const pandemonium_basis *p_self) {
+	pandemonium_vector3 dest;
+	const Basis *self = (const Basis *)p_self;
+	*((Vector3 *)&dest) = self->get_euler_zyx();
+	return dest;
+}
+void GDAPI pandemonium_basis_set_euler_zyx(pandemonium_basis *p_self, const pandemonium_vector3 *p_euler) {
+	Basis *self = (Basis *)p_self;
+	const Vector3 *euler = (const Vector3 *)p_euler;
+	self->set_euler_zyx(*euler);
+}
+
+pandemonium_vector3 GDAPI pandemonium_basis_get_euler(const pandemonium_basis *p_self) {
+	pandemonium_vector3 dest;
+	const Basis *self = (const Basis *)p_self;
+	*((Vector3 *)&dest) = self->get_euler();
+	return dest;
+}
+void GDAPI pandemonium_basis_set_euler(pandemonium_basis *p_self, const pandemonium_vector3 *p_euler) {
+	Basis *self = (Basis *)p_self;
+	const Vector3 *euler = (const Vector3 *)p_euler;
+	self->set_euler(*euler);
+}
 
 pandemonium_quaternion GDAPI pandemonium_basis_get_quaternion(const pandemonium_basis *p_self) {
 	pandemonium_quaternion dest;
@@ -128,6 +292,85 @@ void GDAPI pandemonium_basis_set_quaternion(pandemonium_basis *p_self, const pan
 	self->set_quaternion(*quaternion);
 }
 
+void GDAPI pandemonium_basis_get_axis_angle(const pandemonium_basis *p_self, pandemonium_vector3 *r_axis, pandemonium_real *r_angle) {
+	const Basis *self = (const Basis *)p_self;
+	Vector3 *axis = (Vector3 *)r_axis;
+	self->get_axis_angle(*axis, *r_angle);
+}
+void GDAPI pandemonium_basis_set_axis_angle(pandemonium_basis *p_self, const pandemonium_vector3 *p_axis, pandemonium_real p_phi) {
+	Basis *self = (Basis *)p_self;
+	const Vector3 *axis = (const Vector3 *)p_axis;
+	self->set_axis_angle(*axis, p_phi);
+}
+
+void GDAPI pandemonium_basis_scale(pandemonium_basis *p_self, const pandemonium_vector3 *p_scale) {
+	Basis *self = (Basis *)p_self;
+	const Vector3 *scale = (const Vector3 *)p_scale;
+	self->scale(*scale);
+}
+
+pandemonium_basis GDAPI pandemonium_basis_scaled(const pandemonium_basis *p_self, const pandemonium_vector3 *p_scale) {
+	pandemonium_basis dest;
+	const Basis *self = (const Basis *)p_self;
+	const Vector3 *scale = (const Vector3 *)p_scale;
+	*((Basis *)&dest) = self->scaled(*scale);
+	return dest;
+}
+
+void GDAPI pandemonium_basis_scale_local(pandemonium_basis *p_self, const pandemonium_vector3 *p_scale) {
+	Basis *self = (Basis *)p_self;
+	const Vector3 *scale = (const Vector3 *)p_scale;
+	self->scale_local(*scale);
+}
+pandemonium_basis GDAPI pandemonium_basis_scaled_local(const pandemonium_basis *p_self, const pandemonium_vector3 *p_scale) {
+	pandemonium_basis dest;
+	const Basis *self = (const Basis *)p_self;
+	const Vector3 *scale = (const Vector3 *)p_scale;
+	*((Basis *)&dest) = self->scaled_local(*scale);
+	return dest;
+}
+
+void GDAPI pandemonium_basis_scale_orthogonal(pandemonium_basis *p_self, const pandemonium_vector3 *p_scale) {
+	Basis *self = (Basis *)p_self;
+	const Vector3 *scale = (const Vector3 *)p_scale;
+	self->scale_orthogonal(*scale);
+}
+pandemonium_basis GDAPI pandemonium_basis_scaled_orthogonal(const pandemonium_basis *p_self, const pandemonium_vector3 *p_scale) {
+	pandemonium_basis dest;
+	const Basis *self = (const Basis *)p_self;
+	const Vector3 *scale = (const Vector3 *)p_scale;
+	*((Basis *)&dest) = self->scaled_orthogonal(*scale);
+	return dest;
+}
+
+void GDAPI pandemonium_basis_make_scale_uniform(pandemonium_basis *p_self) {
+	Basis *self = (Basis *)p_self;
+	self->make_scale_uniform();
+}
+pandemonium_real GDAPI pandemonium_basis_get_uniform_scale(const pandemonium_basis *p_self) {
+	const Basis *self = (const Basis *)p_self;
+	return self->get_uniform_scale();
+}
+
+pandemonium_vector3 GDAPI pandemonium_basis_get_scale(const pandemonium_basis *p_self) {
+	pandemonium_vector3 dest;
+	const Basis *self = (const Basis *)p_self;
+	*((Vector3 *)&dest) = self->get_scale();
+	return dest;
+}
+pandemonium_vector3 GDAPI pandemonium_basis_get_scale_abs(const pandemonium_basis *p_self) {
+	pandemonium_vector3 dest;
+	const Basis *self = (const Basis *)p_self;
+	*((Vector3 *)&dest) = self->get_scale_abs();
+	return dest;
+}
+pandemonium_vector3 GDAPI pandemonium_basis_get_scale_local(const pandemonium_basis *p_self) {
+	pandemonium_vector3 dest;
+	const Basis *self = (const Basis *)p_self;
+	*((Vector3 *)&dest) = self->get_scale_local();
+	return dest;
+}
+
 void GDAPI pandemonium_basis_set_axis_angle_scale(pandemonium_basis *p_self, const pandemonium_vector3 *p_axis, pandemonium_real p_phi, const pandemonium_vector3 *p_scale) {
 	Basis *self = (Basis *)p_self;
 	const Vector3 *axis = (const Vector3 *)p_axis;
@@ -149,13 +392,6 @@ void GDAPI pandemonium_basis_set_quaternion_scale(pandemonium_basis *p_self, con
 	self->set_quaternion_scale(*quaternion, *scale);
 }
 
-pandemonium_vector3 GDAPI pandemonium_basis_get_euler(const pandemonium_basis *p_self) {
-	pandemonium_vector3 dest;
-	const Basis *self = (const Basis *)p_self;
-	*((Vector3 *)&dest) = self->get_euler();
-	return dest;
-}
-
 pandemonium_real GDAPI pandemonium_basis_tdotx(const pandemonium_basis *p_self, const pandemonium_vector3 *p_with) {
 	const Basis *self = (const Basis *)p_self;
 	const Vector3 *with = (const Vector3 *)p_with;
@@ -174,6 +410,30 @@ pandemonium_real GDAPI pandemonium_basis_tdotz(const pandemonium_basis *p_self,
 	return self->tdotz(*with);
 }
 
+pandemonium_bool GDAPI pandemonium_basis_is_equal_approx(const pandemonium_basis *p_self, const pandemonium_basis *p_basis) {
+	const Basis *self = (const Basis *)p_self;
+	const Basis *basis = (const Basis *)p_basis;
+	return self->is_equal_approx(*basis);
+}
+pandemonium_bool GDAPI pandemonium_basis_is_equal_approx_ratio(const pandemonium_basis *p_self, const pandemonium_basis *p_a, const pandemonium_basis *p_b) {
+	const Basis *self = (const Basis *)p_self;
+	const Basis *a = (const Basis *)p_a;
+	const Basis *b = (const Basis *)p_b;
+	return self->is_equal_approx_ratio(*a, *b);
+}
+pandemonium_bool GDAPI pandemonium_basis_is_equal_approx_ratio_eps(const pandemonium_basis *p_self, const pandemonium_basis *p_a, const pandemonium_basis *p_b, pandemonium_real p_epsilon) {
+	const Basis *self = (const Basis *)p_self;
+	const Basis *a = (const Basis *)p_a;
+	const Basis *b = (const Basis *)p_b;
+	return self->is_equal_approx_ratio(*a, *b, p_epsilon);
+}
+
+pandemonium_bool GDAPI pandemonium_basis_operator_equal(const pandemonium_basis *p_self, const pandemonium_basis *p_b) {
+	const Basis *self = (const Basis *)p_self;
+	const Basis *b = (const Basis *)p_b;
+	return *self == *b;
+}
+
 pandemonium_vector3 GDAPI pandemonium_basis_xform(const pandemonium_basis *p_self, const pandemonium_vector3 *p_v) {
 	pandemonium_vector3 dest;
 	const Basis *self = (const Basis *)p_self;
@@ -190,63 +450,28 @@ pandemonium_vector3 GDAPI pandemonium_basis_xform_inv(const pandemonium_basis *p
 	return dest;
 }
 
-pandemonium_int GDAPI pandemonium_basis_get_orthogonal_index(const pandemonium_basis *p_self) {
+pandemonium_vector3i GDAPI pandemonium_basis_xform_v3i(const pandemonium_basis *p_self, const pandemonium_vector3i *p_vector) {
+	pandemonium_vector3i dest;
 	const Basis *self = (const Basis *)p_self;
-	return self->get_orthogonal_index();
+	const Vector3i *vector = (const Vector3i *)p_vector;
+	*((Vector3i *)&dest) = self->xform(*vector);
+	return dest;
 }
-
-void GDAPI pandemonium_basis_new(pandemonium_basis *r_dest) {
-	Basis *dest = (Basis *)r_dest;
-	*dest = Basis();
-}
-
-void GDAPI pandemonium_basis_new_with_euler_quaternion(pandemonium_basis *r_dest, const pandemonium_quaternion *p_euler) {
-	Basis *dest = (Basis *)r_dest;
-	const Quaternion *euler = (const Quaternion *)p_euler;
-	*dest = Basis(*euler);
-}
-
-// p_elements is a pointer to an array of 3 (!!) vector3
-void GDAPI pandemonium_basis_get_elements(const pandemonium_basis *p_self, pandemonium_vector3 *p_elements) {
+pandemonium_vector3i GDAPI pandemonium_basis_xform_inv_v3i(const pandemonium_basis *p_self, const pandemonium_vector3i *p_vector) {
+	pandemonium_vector3i dest;
 	const Basis *self = (const Basis *)p_self;
-	Vector3 *elements = (Vector3 *)p_elements;
-	elements[0] = self->rows[0];
-	elements[1] = self->rows[1];
-	elements[2] = self->rows[2];
-}
-
-pandemonium_vector3 GDAPI pandemonium_basis_get_axis(const pandemonium_basis *p_self, const pandemonium_int p_axis) {
-	pandemonium_vector3 dest;
-	Vector3 *d = (Vector3 *)&dest;
-	const Basis *self = (const Basis *)p_self;
-	*d = self->get_axis(p_axis);
+	const Vector3i *vector = (const Vector3i *)p_vector;
+	*((Vector3i *)&dest) = self->xform_inv(*vector);
 	return dest;
 }
 
-void GDAPI pandemonium_basis_set_axis(pandemonium_basis *p_self, const pandemonium_int p_axis, const pandemonium_vector3 *p_value) {
-	Basis *self = (Basis *)p_self;
-	const Vector3 *value = (const Vector3 *)p_value;
-	self->set_axis(p_axis, *value);
-}
-
-pandemonium_vector3 GDAPI pandemonium_basis_get_row(const pandemonium_basis *p_self, const pandemonium_int p_row) {
-	pandemonium_vector3 dest;
-	Vector3 *d = (Vector3 *)&dest;
-	const Basis *self = (const Basis *)p_self;
-	*d = self->get_row(p_row);
-	return dest;
-}
-
-void GDAPI pandemonium_basis_set_row(pandemonium_basis *p_self, const pandemonium_int p_row, const pandemonium_vector3 *p_value) {
-	Basis *self = (Basis *)p_self;
-	const Vector3 *value = (const Vector3 *)p_value;
-	self->set_row(p_row, *value);
-}
-
-pandemonium_bool GDAPI pandemonium_basis_operator_equal(const pandemonium_basis *p_self, const pandemonium_basis *p_b) {
+pandemonium_basis GDAPI pandemonium_basis_operator_multiply(const pandemonium_basis *p_self, const pandemonium_basis *p_b) {
+	pandemonium_basis raw_dest;
+	Basis *dest = (Basis *)&raw_dest;
 	const Basis *self = (const Basis *)p_self;
 	const Basis *b = (const Basis *)p_b;
-	return *self == *b;
+	*dest = *self * *b;
+	return raw_dest;
 }
 
 pandemonium_basis GDAPI pandemonium_basis_operator_add(const pandemonium_basis *p_self, const pandemonium_basis *p_b) {
@@ -267,15 +492,6 @@ pandemonium_basis GDAPI pandemonium_basis_operator_subtract(const pandemonium_ba
 	return raw_dest;
 }
 
-pandemonium_basis GDAPI pandemonium_basis_operator_multiply_vector(const pandemonium_basis *p_self, const pandemonium_basis *p_b) {
-	pandemonium_basis raw_dest;
-	Basis *dest = (Basis *)&raw_dest;
-	const Basis *self = (const Basis *)p_self;
-	const Basis *b = (const Basis *)p_b;
-	*dest = *self * *b;
-	return raw_dest;
-}
-
 pandemonium_basis GDAPI pandemonium_basis_operator_multiply_scalar(const pandemonium_basis *p_self, const pandemonium_real p_b) {
 	pandemonium_basis raw_dest;
 	Basis *dest = (Basis *)&raw_dest;
@@ -284,6 +500,35 @@ pandemonium_basis GDAPI pandemonium_basis_operator_multiply_scalar(const pandemo
 	return raw_dest;
 }
 
+pandemonium_int GDAPI pandemonium_basis_get_orthogonal_index(const pandemonium_basis *p_self) {
+	const Basis *self = (const Basis *)p_self;
+	return self->get_orthogonal_index();
+}
+
+void GDAPI pandemonium_basis_set_orthogonal_index(pandemonium_basis *p_self, pandemonium_int p_index) {
+	Basis *self = (Basis *)p_self;
+	self->set_orthogonal_index(p_index);
+}
+
+void GDAPI pandemonium_basis_set_diagonal(pandemonium_basis *p_self, const pandemonium_vector3 *p_diag) {
+	Basis *self = (Basis *)p_self;
+	const Vector3 *diag = (const Vector3 *)p_diag;
+	self->set_diagonal(*diag);
+}
+
+pandemonium_bool GDAPI pandemonium_basis_is_orthogonal(const pandemonium_basis *p_self) {
+	const Basis *self = (const Basis *)p_self;
+	return self->is_orthogonal();
+}
+pandemonium_bool GDAPI pandemonium_basis_is_diagonal(const pandemonium_basis *p_self) {
+	const Basis *self = (const Basis *)p_self;
+	return self->is_diagonal();
+}
+pandemonium_bool GDAPI pandemonium_basis_is_rotation(const pandemonium_basis *p_self) {
+	const Basis *self = (const Basis *)p_self;
+	return self->is_rotation();
+}
+
 pandemonium_basis GDAPI pandemonium_basis_slerp(const pandemonium_basis *p_self, const pandemonium_basis *p_b, const pandemonium_real p_t) {
 	pandemonium_basis raw_dest;
 	Basis *dest = (Basis *)&raw_dest;
@@ -292,6 +537,241 @@ pandemonium_basis GDAPI pandemonium_basis_slerp(const pandemonium_basis *p_self,
 	*dest = self->slerp(*b, p_t);
 	return raw_dest;
 }
+pandemonium_basis GDAPI pandemonium_basis_lerp(const pandemonium_basis *p_self, const pandemonium_basis *p_to, const pandemonium_real p_weight) {
+	pandemonium_basis dest;
+	const Basis *self = (const Basis *)p_self;
+	const Basis *to = (const Basis *)p_to;
+	*((Basis *)&dest) = self->lerp(*to, p_weight);
+	return dest;
+}
+void GDAPI pandemonium_basis_rotate_sh(pandemonium_basis *p_self, pandemonium_real *p_values) {
+	Basis *self = (Basis *)p_self;
+	self->rotate_sh(p_values);
+}
+
+pandemonium_string GDAPI pandemonium_basis_as_string(const pandemonium_basis *p_self) {
+	pandemonium_string ret;
+	const Basis *self = (const Basis *)p_self;
+	memnew_placement(&ret, String(*self));
+	return ret;
+}
+
+void GDAPI pandemonium_basis_set_real(pandemonium_basis *p_self, pandemonium_real xx, pandemonium_real xy, pandemonium_real xz, pandemonium_real yx, pandemonium_real yy, pandemonium_real yz, pandemonium_real zx, pandemonium_real zy, pandemonium_real zz) {
+	Basis *self = (Basis *)p_self;
+	self->set(xx, xy, xz, yx, yy, yz, zx, zy, zz);
+}
+void GDAPI pandemonium_basis_set_vector3(pandemonium_basis *p_self, const pandemonium_vector3 *p_x, const pandemonium_vector3 *p_y, const pandemonium_vector3 *p_z) {
+	Basis *self = (Basis *)p_self;
+	const Vector3 *x = (const Vector3 *)p_x;
+	const Vector3 *y = (const Vector3 *)p_y;
+	const Vector3 *z = (const Vector3 *)p_z;
+	self->set(*x, *y, *z);
+}
+
+pandemonium_vector3 GDAPI pandemonium_basis_get_column(const pandemonium_basis *p_self, pandemonium_int i) {
+	pandemonium_vector3 dest;
+	const Basis *self = (const Basis *)p_self;
+	*((Vector3 *)&dest) = self->get_column(i);
+	return dest;
+}
+void GDAPI pandemonium_basis_set_column(pandemonium_basis *p_self, pandemonium_int p_index, const pandemonium_vector3 *p_value) {
+	Basis *self = (Basis *)p_self;
+	const Vector3 *value = (const Vector3 *)p_value;
+	self->set_column(p_index, *value);
+}
+void GDAPI pandemonium_basis_set_columns(pandemonium_basis *p_self, const pandemonium_vector3 *p_x, const pandemonium_vector3 *p_y, const pandemonium_vector3 *p_z) {
+	Basis *self = (Basis *)p_self;
+	const Vector3 *x = (const Vector3 *)p_x;
+	const Vector3 *y = (const Vector3 *)p_y;
+	const Vector3 *z = (const Vector3 *)p_z;
+	self->set_columns(*x, *y, *z);
+}
+
+pandemonium_vector3 GDAPI pandemonium_basis_get_row(const pandemonium_basis *p_self, const pandemonium_int p_row) {
+	pandemonium_vector3 dest;
+	Vector3 *d = (Vector3 *)&dest;
+	const Basis *self = (const Basis *)p_self;
+	*d = self->get_row(p_row);
+	return dest;
+}
+
+void GDAPI pandemonium_basis_set_row(pandemonium_basis *p_self, const pandemonium_int p_row, const pandemonium_vector3 *p_value) {
+	Basis *self = (Basis *)p_self;
+	const Vector3 *value = (const Vector3 *)p_value;
+	self->set_row(p_row, *value);
+}
+
+pandemonium_vector3 GDAPI pandemonium_basis_get_axis(const pandemonium_basis *p_self, const pandemonium_int p_axis) {
+	pandemonium_vector3 dest;
+	Vector3 *d = (Vector3 *)&dest;
+	const Basis *self = (const Basis *)p_self;
+	*d = self->get_axis(p_axis);
+	return dest;
+}
+
+void GDAPI pandemonium_basis_set_axis(pandemonium_basis *p_self, const pandemonium_int p_axis, const pandemonium_vector3 *p_value) {
+	Basis *self = (Basis *)p_self;
+	const Vector3 *value = (const Vector3 *)p_value;
+	self->set_axis(p_axis, *value);
+}
+
+pandemonium_vector3 GDAPI pandemonium_basis_get_main_diagonal(const pandemonium_basis *p_self) {
+	pandemonium_vector3 dest;
+	const Basis *self = (const Basis *)p_self;
+	*((Vector3 *)&dest) = self->get_main_diagonal();
+	return dest;
+}
+
+void GDAPI pandemonium_basis_set_zero(pandemonium_basis *p_self) {
+	Basis *self = (Basis *)p_self;
+	self->set_zero();
+}
+
+pandemonium_basis GDAPI pandemonium_basis_transpose_xform(const pandemonium_basis *p_self, const pandemonium_basis *p_m) {
+	pandemonium_basis dest;
+	const Basis *self = (const Basis *)p_self;
+	const Basis *m = (const Basis *)p_m;
+	*((Basis *)&dest) = self->transpose_xform(*m);
+	return dest;
+}
+
+void GDAPI pandemonium_basis_orthonormalize(pandemonium_basis *p_self) {
+	Basis *self = (Basis *)p_self;
+	self->orthonormalize();
+}
+
+pandemonium_basis GDAPI pandemonium_basis_orthonormalized(const pandemonium_basis *p_self) {
+	pandemonium_basis dest;
+	const Basis *self = (const Basis *)p_self;
+	*((Basis *)&dest) = self->orthonormalized();
+	return dest;
+}
+
+void GDAPI pandemonium_basis_orthogonalize(pandemonium_basis *p_self) {
+	Basis *self = (Basis *)p_self;
+	self->orthogonalize();
+}
+pandemonium_basis GDAPI pandemonium_basis_orthogonalized(const pandemonium_basis *p_self) {
+	pandemonium_basis dest;
+	const Basis *self = (const Basis *)p_self;
+	*((Basis *)&dest) = self->orthogonalized();
+	return dest;
+}
+
+pandemonium_bool GDAPI pandemonium_basis_is_symmetric(const pandemonium_basis *p_self) {
+	const Basis *self = (const Basis *)p_self;
+	return self->is_symmetric();
+}
+pandemonium_basis GDAPI pandemonium_basis_diagonalize(pandemonium_basis *p_self) {
+	pandemonium_basis dest;
+	Basis *self = (Basis *)p_self;
+	*((Basis *)&dest) = self->diagonalize();
+	return dest;
+}
+
+pandemonium_basis GDAPI pandemonium_basis_get_normal_xform_basis(const pandemonium_basis *p_self) {
+	pandemonium_basis dest;
+	const Basis *self = (const Basis *)p_self;
+	*((Basis *)&dest) = self->get_normal_xform_basis();
+	return dest;
+}
+pandemonium_vector3 GDAPI pandemonium_basis_xform_normal_fast(const pandemonium_basis *p_self, const pandemonium_vector3 *p_vector) {
+	pandemonium_vector3 dest;
+	const Basis *self = (const Basis *)p_self;
+	const Vector3 *vector = (const Vector3 *)p_vector;
+	*((Vector3 *)&dest) = self->xform_normal_fast(*vector);
+	return dest;
+}
+pandemonium_vector3 GDAPI pandemonium_basis_xform_normal(const pandemonium_basis *p_self, const pandemonium_vector3 *p_vector) {
+	pandemonium_vector3 dest;
+	const Basis *self = (const Basis *)p_self;
+	const Vector3 *vector = (const Vector3 *)p_vector;
+	*((Vector3 *)&dest) = self->xform_normal(*vector);
+	return dest;
+}
+
+pandemonium_basis GDAPI pandemonium_basis_looking_at(const pandemonium_vector3 *p_target) {
+	pandemonium_basis dest;
+	const Vector3 *target = (const Vector3 *)p_target;
+	*((Basis *)&dest) = Basis::looking_at(*target);
+	return dest;
+}
+pandemonium_basis GDAPI pandemonium_basis_looking_at_up(const pandemonium_vector3 *p_target, const pandemonium_vector3 *p_up) {
+	pandemonium_basis dest;
+	const Vector3 *target = (const Vector3 *)p_target;
+	const Vector3 *up = (const Vector3 *)p_up;
+	*((Basis *)&dest) = Basis::looking_at(*target, *up);
+	return dest;
+}
+pandemonium_basis GDAPI pandemonium_basis_from_scale(const pandemonium_vector3 *p_scale) {
+	pandemonium_basis dest;
+	const Vector3 *scale = (const Vector3 *)p_scale;
+	*((Basis *)&dest) = Basis::from_scale(*scale);
+	return dest;
+}
+
+// p_elements is a pointer to an array of 3 (!!) vector3
+void GDAPI pandemonium_basis_get_elements(const pandemonium_basis *p_self, pandemonium_vector3 *p_elements) {
+	const Basis *self = (const Basis *)p_self;
+	Vector3 *elements = (Vector3 *)p_elements;
+	elements[0] = self->rows[0];
+	elements[1] = self->rows[1];
+	elements[2] = self->rows[2];
+}
+
+void GDAPI pandemonium_basis_new(pandemonium_basis *r_dest) {
+	Basis *dest = (Basis *)r_dest;
+	*dest = Basis();
+}
+
+void GDAPI pandemonium_basis_new_with_euler_quaternion(pandemonium_basis *r_dest, const pandemonium_quaternion *p_euler) {
+	Basis *dest = (Basis *)r_dest;
+	const Quaternion *euler = (const Quaternion *)p_euler;
+	*dest = Basis(*euler);
+}
+
+void GDAPI pandemonium_basis_new_with_rows(pandemonium_basis *r_dest, const pandemonium_vector3 *p_x_axis, const pandemonium_vector3 *p_y_axis, const pandemonium_vector3 *p_z_axis) {
+	const Vector3 *x_axis = (const Vector3 *)p_x_axis;
+	const Vector3 *y_axis = (const Vector3 *)p_y_axis;
+	const Vector3 *z_axis = (const Vector3 *)p_z_axis;
+	Basis *dest = (Basis *)r_dest;
+	*dest = Basis(*x_axis, *y_axis, *z_axis);
+}
+
+void GDAPI pandemonium_basis_new_with_axis_and_angle(pandemonium_basis *r_dest, const pandemonium_vector3 *p_axis, const pandemonium_real p_phi) {
+	const Vector3 *axis = (const Vector3 *)p_axis;
+	Basis *dest = (Basis *)r_dest;
+	*dest = Basis(*axis, p_phi);
+}
+
+void GDAPI pandemonium_basis_new_with_euler(pandemonium_basis *r_dest, const pandemonium_vector3 *p_euler) {
+	const Vector3 *euler = (const Vector3 *)p_euler;
+	Basis *dest = (Basis *)r_dest;
+	*dest = Basis(*euler);
+}
+
+void GDAPI pandemonium_basis_new_quaternion_scale(pandemonium_basis *r_dest, const pandemonium_quaternion *p_quat, const pandemonium_vector3 *p_scale) {
+	const Quaternion *quat = (const Quaternion *)p_quat;
+	const Vector3 *scale = (const Vector3 *)p_scale;
+	Basis *dest = (Basis *)r_dest;
+	*dest = Basis(*quat, *scale);
+}
+void GDAPI pandemonium_basis_new_euler_scale(pandemonium_basis *r_dest, const pandemonium_vector3 *p_euler, const pandemonium_vector3 *p_scale) {
+	const Vector3 *euler = (const Vector3 *)p_euler;
+	const Vector3 *scale = (const Vector3 *)p_scale;
+	Basis *dest = (Basis *)r_dest;
+	*dest = Basis(*euler, *scale);
+}
+void GDAPI pandemonium_basis_new_axis_phi_scale(pandemonium_basis *r_dest, const pandemonium_vector3 *p_axis, pandemonium_real p_phi, const pandemonium_vector3 *p_scale) {
+	const Vector3 *axis = (const Vector3 *)p_axis;
+	const Vector3 *scale = (const Vector3 *)p_scale;
+	Basis *dest = (Basis *)r_dest;
+	*dest = Basis(*axis, p_phi, *scale);
+}
+void GDAPI pandemonium_basis_new_floats(pandemonium_basis *r_dest, pandemonium_real xx, pandemonium_real xy, pandemonium_real xz, pandemonium_real yx, pandemonium_real yy, pandemonium_real yz, pandemonium_real zx, pandemonium_real zy, pandemonium_real zz) {
+	Basis *dest = (Basis *)r_dest;
+	*dest = Basis(xx, xy, xz, yx, yy, yz, zx, zy, zz);
+}
 
 #ifdef __cplusplus
 }
diff --git a/gdnative_api.json b/gdnative_api.json
index 847fbd2..dd45621 100644
--- a/gdnative_api.json
+++ b/gdnative_api.json
@@ -1228,7 +1228,7 @@
                 ]
             },
             {
-                "name": "pandemonium_basis_operator_multiply_vector",
+                "name": "pandemonium_basis_operator_multiply",
                 "return_type": "pandemonium_basis",
                 "arguments": [
                     ["const pandemonium_basis *", "p_self"],
diff --git a/include/gdn/basis.h b/include/gdn/basis.h
index 3d792a5..a434d3e 100644
--- a/include/gdn/basis.h
+++ b/include/gdn/basis.h
@@ -54,90 +54,91 @@ typedef struct {
 #include <gdn/gdnative.h>
 #include <gdn/quaternion.h>
 #include <gdn/vector3.h>
+#include <gdn/vector3i.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-//void invert();
-//void transpose();
+void GDAPI pandemonium_basis_invert(pandemonium_basis *p_self);
+void GDAPI pandemonium_basis_transpose(pandemonium_basis *p_self);
 
 pandemonium_basis GDAPI pandemonium_basis_inverse(const pandemonium_basis *p_self);
 pandemonium_basis GDAPI pandemonium_basis_transposed(const pandemonium_basis *p_self);
 
 pandemonium_real GDAPI pandemonium_basis_determinant(const pandemonium_basis *p_self);
 
-//void from_z(const Vector3 &p_z);
+void GDAPI pandemonium_basis_from_z(pandemonium_basis *p_self, const pandemonium_vector3 *p_z);
 
-//void rotate(const Vector3 &p_axis, real_t p_phi);
+void GDAPI pandemonium_basis_rotate(pandemonium_basis *p_self, const pandemonium_vector3 *p_axis, pandemonium_real p_phi);
 pandemonium_basis GDAPI pandemonium_basis_rotated(const pandemonium_basis *p_self, const pandemonium_vector3 *p_axis, const pandemonium_real p_phi);
 
-//void rotate_local(const Vector3 &p_axis, real_t p_phi);
-//Basis rotated_local(const Vector3 &p_axis, real_t p_phi) const;
+void GDAPI pandemonium_basis_rotate_local(pandemonium_basis *p_self, const pandemonium_vector3 *p_axis, pandemonium_real p_phi);
+pandemonium_basis GDAPI pandemonium_basis_rotated_local(const pandemonium_basis *p_self, const pandemonium_vector3 *p_axis, pandemonium_real p_phi);
 
-//void rotate(const Vector3 &p_euler);
-//Basis rotated(const Vector3 &p_euler) const;
+void GDAPI pandemonium_basis_rotate_euler(pandemonium_basis *p_self, const pandemonium_vector3 *p_euler);
+pandemonium_basis GDAPI pandemonium_basis_rotated_euler(const pandemonium_basis *p_self, const pandemonium_vector3 *p_euler);
 
-//void rotate(const Quaternion &p_quat);
-//Basis rotated(const Quaternion &p_quat) const;
+void GDAPI pandemonium_basis_rotate_quat(pandemonium_basis *p_self, const pandemonium_quaternion *p_quat);
+pandemonium_basis GDAPI pandemonium_basis_rotated_quat(const pandemonium_basis *p_self, const pandemonium_quaternion *p_quat);
 
-//_FORCE_INLINE_ void rotatev(const Vector3 &p_euler) { rotate(p_euler); }
-//_FORCE_INLINE_ Basis rotatedv(const Vector3 &p_euler) const { return rotated(p_euler); }
-//_FORCE_INLINE_ void rotateq(const Quaternion &p_quat) { rotate(p_quat); }
-//_FORCE_INLINE_ Basis rotatedq(const Quaternion &p_quat) const { return rotated(p_quat); }
+void GDAPI pandemonium_basis_rotatev(pandemonium_basis *p_self, const pandemonium_vector3 *p_euler);
+pandemonium_basis GDAPI pandemonium_basis_rotatedv(const pandemonium_basis *p_self, const pandemonium_vector3 *p_euler);
+void GDAPI pandemonium_basis_rotateq(pandemonium_basis *p_self, const pandemonium_quaternion *p_quat);
+pandemonium_basis GDAPI pandemonium_basis_rotatedq(const pandemonium_basis *p_self, const pandemonium_quaternion *p_quat);
 
-//Vector3 get_rotation_euler() const;
-//void get_rotation_axis_angle(Vector3 &p_axis, real_t &p_angle) const;
-//void get_rotation_axis_angle_local(Vector3 &p_axis, real_t &p_angle) const;
-//Quaternion get_rotation_quaternion() const;
-//Vector3 get_rotation() const { return get_rotation_euler(); };
+pandemonium_vector3 GDAPI pandemonium_basis_get_rotation_euler(const pandemonium_basis *p_self);
+void GDAPI pandemonium_basis_get_rotation_axis_angle(const pandemonium_basis *p_self, pandemonium_vector3 *p_axis, pandemonium_real p_angle);
+void GDAPI pandemonium_basis_get_rotation_axis_angle_local(const pandemonium_basis *p_self, pandemonium_vector3 *p_axis, pandemonium_real p_angle);
+pandemonium_quaternion GDAPI pandemonium_basis_get_rotation_quaternion(const pandemonium_basis *p_self);
+pandemonium_vector3 GDAPI pandemonium_basis_get_rotation(const pandemonium_basis *p_self);
 
-//void rotate_to_align(Vector3 p_start_direction, Vector3 p_end_direction);
+void GDAPI pandemonium_basis_rotate_to_align(pandemonium_basis *p_self, const pandemonium_vector3 *p_start_direction, const pandemonium_vector3 *p_end_direction);
 
-//Vector3 rotref_posscale_decomposition(Basis &rotref) const;
+pandemonium_vector3 GDAPI pandemonium_basis_rotref_posscale_decomposition(const pandemonium_basis *p_self, pandemonium_basis *rotref);
 
-//Vector3 get_euler_xyz() const;
-//void set_euler_xyz(const Vector3 &p_euler);
+pandemonium_vector3 GDAPI pandemonium_basis_get_euler_xyz(const pandemonium_basis *p_self);
+void GDAPI pandemonium_basis_set_euler_xyz(pandemonium_basis *p_self, const pandemonium_vector3 *p_euler);
 
-//Vector3 get_euler_xzy() const;
-//void set_euler_xzy(const Vector3 &p_euler);
+pandemonium_vector3 GDAPI pandemonium_basis_get_euler_xzy(const pandemonium_basis *p_self);
+void GDAPI pandemonium_basis_set_euler_xzy(pandemonium_basis *p_self, const pandemonium_vector3 *p_euler);
 
-//Vector3 get_euler_yzx() const;
-//void set_euler_yzx(const Vector3 &p_euler);
+pandemonium_vector3 GDAPI pandemonium_basis_get_euler_yzx(const pandemonium_basis *p_self);
+void GDAPI pandemonium_basis_set_euler_yzx(pandemonium_basis *p_self, const pandemonium_vector3 *p_euler);
 
-//Vector3 get_euler_yxz() const;
-//void set_euler_yxz(const Vector3 &p_euler);
+pandemonium_vector3 GDAPI pandemonium_basis_get_euler_yxz(const pandemonium_basis *p_self);
+void GDAPI pandemonium_basis_set_euler_yxz(pandemonium_basis *p_self, const pandemonium_vector3 *p_euler);
 
-//Vector3 get_euler_zxy() const;
-//void set_euler_zxy(const Vector3 &p_euler);
+pandemonium_vector3 GDAPI pandemonium_basis_get_euler_zxy(const pandemonium_basis *p_self);
+void GDAPI pandemonium_basis_set_euler_zxy(pandemonium_basis *p_self, const pandemonium_vector3 *p_euler);
 
-//Vector3 get_euler_zyx() const;
-//void set_euler_zyx(const Vector3 &p_euler);
+pandemonium_vector3 GDAPI pandemonium_basis_get_euler_zyx(const pandemonium_basis *p_self);
+void GDAPI pandemonium_basis_set_euler_zyx(pandemonium_basis *p_self, const pandemonium_vector3 *p_euler);
 
 pandemonium_vector3 GDAPI pandemonium_basis_get_euler(const pandemonium_basis *p_self);
-//void set_euler(const Vector3 &p_euler) { set_euler_yxz(p_euler); }
+void GDAPI pandemonium_basis_set_euler(pandemonium_basis *p_self, const pandemonium_vector3 *p_euler);
 
 pandemonium_quaternion GDAPI pandemonium_basis_get_quaternion(const pandemonium_basis *p_self);
 void GDAPI pandemonium_basis_set_quaternion(pandemonium_basis *p_self, const pandemonium_quaternion *p_quaternion);
 
-//void get_axis_angle(Vector3 &r_axis, real_t &r_angle) const;
-//void set_axis_angle(const Vector3 &p_axis, real_t p_phi);
+void GDAPI pandemonium_basis_get_axis_angle(const pandemonium_basis *p_self, pandemonium_vector3 *r_axis, pandemonium_real *r_angle);
+void GDAPI pandemonium_basis_set_axis_angle(pandemonium_basis *p_self, const pandemonium_vector3 *p_axis, pandemonium_real p_phi);
 
-//void scale(const Vector3 &p_scale);
+void GDAPI pandemonium_basis_scale(pandemonium_basis *p_self, const pandemonium_vector3 *p_scale);
 pandemonium_basis GDAPI pandemonium_basis_scaled(const pandemonium_basis *p_self, const pandemonium_vector3 *p_scale);
 
-//void scale_local(const Vector3 &p_scale);
-//Basis scaled_local(const Vector3 &p_scale) const;
+void GDAPI pandemonium_basis_scale_local(pandemonium_basis *p_self, const pandemonium_vector3 *p_scale);
+pandemonium_basis GDAPI pandemonium_basis_scaled_local(const pandemonium_basis *p_self, const pandemonium_vector3 *p_scale);
 
-//void scale_orthogonal(const Vector3 &p_scale);
-//Basis scaled_orthogonal(const Vector3 &p_scale) const;
+void GDAPI pandemonium_basis_scale_orthogonal(pandemonium_basis *p_self, const pandemonium_vector3 *p_scale);
+pandemonium_basis GDAPI pandemonium_basis_scaled_orthogonal(const pandemonium_basis *p_self, const pandemonium_vector3 *p_scale);
 
-//void make_scale_uniform();
-//float get_uniform_scale() const;
+void GDAPI pandemonium_basis_make_scale_uniform(pandemonium_basis *p_self);
+pandemonium_real GDAPI pandemonium_basis_get_uniform_scale(const pandemonium_basis *p_self);
 
 pandemonium_vector3 GDAPI pandemonium_basis_get_scale(const pandemonium_basis *p_self);
-//Vector3 get_scale_abs() const;
-//Vector3 get_scale_local() const;
+pandemonium_vector3 GDAPI pandemonium_basis_get_scale_abs(const pandemonium_basis *p_self);
+pandemonium_vector3 GDAPI pandemonium_basis_get_scale_local(const pandemonium_basis *p_self);
 
 void GDAPI pandemonium_basis_set_axis_angle_scale(pandemonium_basis *p_self, const pandemonium_vector3 *p_axis, pandemonium_real p_phi, const pandemonium_vector3 *p_scale);
 void GDAPI pandemonium_basis_set_euler_scale(pandemonium_basis *p_self, const pandemonium_vector3 *p_euler, const pandemonium_vector3 *p_scale);
@@ -147,44 +148,44 @@ pandemonium_real GDAPI pandemonium_basis_tdotx(const pandemonium_basis *p_self,
 pandemonium_real GDAPI pandemonium_basis_tdoty(const pandemonium_basis *p_self, const pandemonium_vector3 *p_with);
 pandemonium_real GDAPI pandemonium_basis_tdotz(const pandemonium_basis *p_self, const pandemonium_vector3 *p_with);
 
-//bool is_equal_approx(const Basis &p_basis) const;
-//bool is_equal_approx_ratio(const Basis &a, const Basis &b, real_t p_epsilon = UNIT_EPSILON) const;
+pandemonium_bool GDAPI pandemonium_basis_is_equal_approx(const pandemonium_basis *p_self, const pandemonium_basis *p_basis);
+pandemonium_bool GDAPI pandemonium_basis_is_equal_approx_ratio(const pandemonium_basis *p_self, const pandemonium_basis *p_a, const pandemonium_basis *p_b);
+pandemonium_bool GDAPI pandemonium_basis_is_equal_approx_ratio_eps(const pandemonium_basis *p_self, const pandemonium_basis *p_a, const pandemonium_basis *p_b, pandemonium_real p_epsilon);
 
 pandemonium_bool GDAPI pandemonium_basis_operator_equal(const pandemonium_basis *p_self, const pandemonium_basis *p_b);
 
 pandemonium_vector3 GDAPI pandemonium_basis_xform(const pandemonium_basis *p_self, const pandemonium_vector3 *p_v);
 pandemonium_vector3 GDAPI pandemonium_basis_xform_inv(const pandemonium_basis *p_self, const pandemonium_vector3 *p_v);
 
-//_FORCE_INLINE_ Vector3i xform(const Vector3i &p_vector) const;
-//_FORCE_INLINE_ Vector3i xform_inv(const Vector3i &p_vector) const;
+pandemonium_vector3i GDAPI pandemonium_basis_xform_v3i(const pandemonium_basis *p_self, const pandemonium_vector3i *p_vector);
+pandemonium_vector3i GDAPI pandemonium_basis_xform_inv_v3i(const pandemonium_basis *p_self, const pandemonium_vector3i *p_vector);
 
-//Remove _vector postfix
-pandemonium_basis GDAPI pandemonium_basis_operator_multiply_vector(const pandemonium_basis *p_self, const pandemonium_basis *p_b);
+pandemonium_basis GDAPI pandemonium_basis_operator_multiply(const pandemonium_basis *p_self, const pandemonium_basis *p_b);
 pandemonium_basis GDAPI pandemonium_basis_operator_add(const pandemonium_basis *p_self, const pandemonium_basis *p_b);
 pandemonium_basis GDAPI pandemonium_basis_operator_subtract(const pandemonium_basis *p_self, const pandemonium_basis *p_b);
 pandemonium_basis GDAPI pandemonium_basis_operator_multiply_scalar(const pandemonium_basis *p_self, const pandemonium_real p_b);
 
 pandemonium_int GDAPI pandemonium_basis_get_orthogonal_index(const pandemonium_basis *p_self);
-//void set_orthogonal_index(int p_index);
+void GDAPI pandemonium_basis_set_orthogonal_index(pandemonium_basis *p_self, pandemonium_int p_index);
 
-//void set_diagonal(const Vector3 &p_diag);
+void GDAPI pandemonium_basis_set_diagonal(pandemonium_basis *p_self, const pandemonium_vector3 *p_diag);
 
-//bool is_orthogonal() const;
-//bool is_diagonal() const;
-//bool is_rotation() const;
+pandemonium_bool GDAPI pandemonium_basis_is_orthogonal(const pandemonium_basis *p_self);
+pandemonium_bool GDAPI pandemonium_basis_is_diagonal(const pandemonium_basis *p_self);
+pandemonium_bool GDAPI pandemonium_basis_is_rotation(const pandemonium_basis *p_self);
 
 pandemonium_basis GDAPI pandemonium_basis_slerp(const pandemonium_basis *p_self, const pandemonium_basis *p_b, const pandemonium_real p_t);
-//_FORCE_INLINE_ Basis lerp(const Basis &p_to, const real_t &p_weight) const;
-//void rotate_sh(real_t *p_values);
+pandemonium_basis GDAPI pandemonium_basis_lerp(const pandemonium_basis *p_self, const pandemonium_basis *p_to, const pandemonium_real p_weight);
+void GDAPI pandemonium_basis_rotate_sh(pandemonium_basis *p_self, pandemonium_real *p_values);
 
 pandemonium_string GDAPI pandemonium_basis_as_string(const pandemonium_basis *p_self);
 
-//_FORCE_INLINE_ void set(real_t xx, real_t xy, real_t xz, real_t yx, real_t yy, real_t yz, real_t zx, real_t zy, real_t zz) {
-//_FORCE_INLINE_ void set(const Vector3 &p_x, const Vector3 &p_y, const Vector3 &p_z) {
+void GDAPI pandemonium_basis_set_real(pandemonium_basis *p_self, pandemonium_real xx, pandemonium_real xy, pandemonium_real xz, pandemonium_real yx, pandemonium_real yy, pandemonium_real yz, pandemonium_real zx, pandemonium_real zy, pandemonium_real zz);
+void GDAPI pandemonium_basis_set_vector3(pandemonium_basis *p_self, const pandemonium_vector3 *p_x, const pandemonium_vector3 *p_y, const pandemonium_vector3 *p_z);
 
-//_FORCE_INLINE_ Vector3 get_column(int i) const {
-//_FORCE_INLINE_ void set_column(int p_index, const Vector3 &p_value) {
-//_FORCE_INLINE_ void set_columns(const Vector3 &p_x, const Vector3 &p_y, const Vector3 &p_z) {
+pandemonium_vector3 GDAPI pandemonium_basis_get_column(const pandemonium_basis *p_self, pandemonium_int i);
+void GDAPI pandemonium_basis_set_column(pandemonium_basis *p_self, pandemonium_int p_index, const pandemonium_vector3 *p_value);
+void GDAPI pandemonium_basis_set_columns(pandemonium_basis *p_self, const pandemonium_vector3 *p_x, const pandemonium_vector3 *p_y, const pandemonium_vector3 *p_z);
 
 pandemonium_vector3 GDAPI pandemonium_basis_get_row(const pandemonium_basis *p_self, const pandemonium_int p_row);
 void GDAPI pandemonium_basis_set_row(pandemonium_basis *p_self, const pandemonium_int p_row, const pandemonium_vector3 *p_value);
@@ -192,27 +193,28 @@ void GDAPI pandemonium_basis_set_row(pandemonium_basis *p_self, const pandemoniu
 pandemonium_vector3 GDAPI pandemonium_basis_get_axis(const pandemonium_basis *p_self, const pandemonium_int p_axis);
 void GDAPI pandemonium_basis_set_axis(pandemonium_basis *p_self, const pandemonium_int p_axis, const pandemonium_vector3 *p_value);
 
-//_FORCE_INLINE_ Vector3 get_main_diagonal() const {
+pandemonium_vector3 GDAPI pandemonium_basis_get_main_diagonal(const pandemonium_basis *p_self);
 
-//_FORCE_INLINE_ void set_zero() {
+void GDAPI pandemonium_basis_set_zero(pandemonium_basis *p_self);
 
-//_FORCE_INLINE_ Basis transpose_xform(const Basis &m) const {
+pandemonium_basis GDAPI pandemonium_basis_transpose_xform(const pandemonium_basis *p_self, const pandemonium_basis *m);
 
-//void orthonormalize();
+void GDAPI pandemonium_basis_orthonormalize(pandemonium_basis *p_self);
 pandemonium_basis GDAPI pandemonium_basis_orthonormalized(const pandemonium_basis *p_self);
 
-//void orthogonalize();
-//Basis orthogonalized() const;
+void GDAPI pandemonium_basis_orthogonalize(pandemonium_basis *p_self);
+pandemonium_basis GDAPI pandemonium_basis_orthogonalized(const pandemonium_basis *p_self);
 
-//bool is_symmetric() const;
-//Basis diagonalize();
+pandemonium_bool GDAPI pandemonium_basis_is_symmetric(const pandemonium_basis *p_self);
+pandemonium_basis GDAPI pandemonium_basis_diagonalize(pandemonium_basis *p_self);
 
-//Basis get_normal_xform_basis() const { return inverse().transposed(); }
-//Vector3 xform_normal_fast(const Vector3 &p_vector) const { return xform(p_vector).normalized(); }
-//Vector3 xform_normal(const Vector3 &p_vector) const { return get_normal_xform_basis().xform_normal_fast(p_vector); }
+pandemonium_basis GDAPI pandemonium_basis_get_normal_xform_basis(const pandemonium_basis *p_self);
+pandemonium_vector3 GDAPI pandemonium_basis_xform_normal_fast(const pandemonium_basis *p_self, const pandemonium_vector3 *p_vector);
+pandemonium_vector3 GDAPI pandemonium_basis_xform_normal(const pandemonium_basis *p_self, const pandemonium_vector3 *p_vector);
 
-//static Basis looking_at(const Vector3 &p_target, const Vector3 &p_up = Vector3(0, 1, 0));
-//static Basis from_scale(const Vector3 &p_scale);
+pandemonium_basis GDAPI pandemonium_basis_looking_at(const pandemonium_vector3 *p_target);
+pandemonium_basis GDAPI pandemonium_basis_looking_at_up(const pandemonium_vector3 *p_target, const pandemonium_vector3 *p_up);
+pandemonium_basis GDAPI pandemonium_basis_from_scale(const pandemonium_vector3 *p_scale);
 
 // p_elements is a pointer to an array of 3 (!!) vector3
 void GDAPI pandemonium_basis_get_elements(const pandemonium_basis *p_self, pandemonium_vector3 *p_elements);
@@ -222,10 +224,10 @@ void GDAPI pandemonium_basis_new_with_rows(pandemonium_basis *r_dest, const pand
 void GDAPI pandemonium_basis_new_with_axis_and_angle(pandemonium_basis *r_dest, const pandemonium_vector3 *p_axis, const pandemonium_real p_phi);
 void GDAPI pandemonium_basis_new_with_euler(pandemonium_basis *r_dest, const pandemonium_vector3 *p_euler);
 void GDAPI pandemonium_basis_new_with_euler_quaternion(pandemonium_basis *r_dest, const pandemonium_quaternion *p_euler);
-//Basis(const Quaternion &p_quat, const Vector3 &p_scale) { set_quaternion_scale(p_quat, p_scale); }
-//Basis(const Vector3 &p_euler, const Vector3 &p_scale) { set_euler_scale(p_euler, p_scale); }
-//Basis(const Vector3 &p_axis, real_t p_phi, const Vector3 &p_scale) { set_axis_angle_scale(p_axis, p_phi, p_scale); }
-//Basis(real_t xx, real_t xy, real_t xz, real_t yx, real_t yy, real_t yz, real_t zx, real_t zy, real_t zz) {
+void GDAPI pandemonium_basis_new_quaternion_scale(pandemonium_basis *r_dest, const pandemonium_quaternion *p_quat, const pandemonium_vector3 *p_scale);
+void GDAPI pandemonium_basis_new_euler_scale(pandemonium_basis *r_dest, const pandemonium_vector3 *p_euler, const pandemonium_vector3 *p_scale);
+void GDAPI pandemonium_basis_new_axis_phi_scale(pandemonium_basis *r_dest, const pandemonium_vector3 *p_axis, pandemonium_real p_phi, const pandemonium_vector3 *p_scale);
+void GDAPI pandemonium_basis_new_floats(pandemonium_basis *r_dest, pandemonium_real xx, pandemonium_real xy, pandemonium_real xz, pandemonium_real yx, pandemonium_real yy, pandemonium_real yz, pandemonium_real zx, pandemonium_real zy, pandemonium_real zz);
 
 #ifdef __cplusplus
 }