diff --git a/examples/EdgeDB.Examples.CSharp/Examples/QueryBuilder.cs b/examples/EdgeDB.Examples.CSharp/Examples/QueryBuilder.cs
index e63c8f54..f4361339 100644
--- a/examples/EdgeDB.Examples.CSharp/Examples/QueryBuilder.cs
+++ b/examples/EdgeDB.Examples.CSharp/Examples/QueryBuilder.cs
@@ -43,7 +43,7 @@ public async Task ExecuteAsync(EdgeDBClient client)
         private static async Task QueryBuilderDemo(EdgeDBClient client)
         {
             // Selecting a type with autogen shape
-            var query = QueryBuilder.Select<Person>().Build().Prettify();
+            var query = QueryBuilder.Select<Person>().Compile().Prettify();
 
             // Adding a filter, orderby, offset, and limit
             query = QueryBuilder
@@ -52,19 +52,19 @@ private static async Task QueryBuilderDemo(EdgeDBClient client)
                 .OrderByDesending(x => x.Name)
                 .Offset(2)
                 .Limit(10)
-                .Build()
+                .Compile()
                 .Prettify();
 
             // Specifying a shape
             query = QueryBuilder.Select<Person>(shape =>
                 shape
                     .Explicitly(p => new { p.Name, p.Email, p.BestFriend })
-            ).Build().Prettify();
+            ).Compile().Prettify();
 
             // selecting things that are not types
             query = QueryBuilder.SelectExpression(() =>
                 EdgeQL.Count(QueryBuilder.Select<Person>())
-            ).Build().Prettify();
+            ).Compile().Prettify();
 
             // selecting 'free objects'
             query = QueryBuilder.SelectExpression(ctx => new
@@ -73,7 +73,7 @@ private static async Task QueryBuilderDemo(EdgeDBClient client)
                 MyNumber = 42,
                 SeveralNumbers = new long[] { 1, 2, 3 },
                 People = ctx.SubQuery(QueryBuilder.Select<Person>())
-            }).Build().Prettify();
+            }).Compile().Prettify();
 
             // Backlinks
             query = QueryBuilder.Select<Person>(shape => shape
@@ -85,7 +85,7 @@ private static async Task QueryBuilderDemo(EdgeDBClient client)
                     // you can pass in a string instead of an expression to select out a 'EdgeDBObject' type.
                     ReferencedFriends = ctx.BackLink<Person>(x => x.Friends)
                 })
-            ).Build().Prettify();
+            ).Compile().Prettify();
 
             // With object variables
             query = QueryBuilder
@@ -93,19 +93,19 @@ private static async Task QueryBuilderDemo(EdgeDBClient client)
                 .SelectExpression(ctx => new
                 {
                     PassedName = ctx.Variables.Args.Value.Name, PassedEmail = ctx.Variables.Args.Value.Email
-                }).Build().Prettify();
+                }).Compile().Prettify();
 
             // Inserting a new type
             var person = new Person { Email = "example@example.com", Name = "example" };
 
-            query = QueryBuilder.Insert(person).Build().Prettify();
+            query = QueryBuilder.Insert(person).Compile().Prettify();
 
             // Complex insert with links & dealing with conflicts
             query = (await QueryBuilder
                     .Insert(new Person { BestFriend = person, Name = "example2", Email = "example2@example.com" })
                     .UnlessConflict()
                     .ElseReturn()
-                    .BuildAsync(client))
+                    .CompileAsync(client))
                 .Prettify();
 
             // Manual conflicts
@@ -113,7 +113,7 @@ private static async Task QueryBuilderDemo(EdgeDBClient client)
                 .Insert(person)
                 .UnlessConflictOn(x => x.Email)
                 .ElseReturn()
-                .Build()
+                .Compile()
                 .Prettify();
 
             // Autogenerating unless conflict with introspection
@@ -121,7 +121,7 @@ private static async Task QueryBuilderDemo(EdgeDBClient client)
                     .Insert(person)
                     .UnlessConflict()
                     .ElseReturn()
-                    .BuildAsync(client))
+                    .CompileAsync(client))
                 .Prettify();
 
             // Bulk inserts
@@ -138,7 +138,7 @@ private static async Task QueryBuilderDemo(EdgeDBClient client)
 
             var tquery = await QueryBuilder.For(data,
                 x => QueryBuilder.Insert(x)
-            ).BuildAsync(client);
+            ).CompileAsync(client);
 
             // Else statements (upsert demo)
             query = (await QueryBuilder
@@ -147,21 +147,21 @@ private static async Task QueryBuilderDemo(EdgeDBClient client)
                     .Else(q =>
                         q.Update(old => new Person { Name = old!.Name!.ToLower() })
                     )
-                    .BuildAsync(client))
+                    .CompileAsync(client))
                 .Prettify();
 
             // Updating a type
             query = QueryBuilder
                 .Update<Person>(old => new Person { Name = "example new name" })
                 .Filter(x => x.Email == "example@example.com")
-                .Build()
+                .Compile()
                 .Prettify();
 
             // Deleting types
             query = QueryBuilder
                 .Delete<Person>()
                 .Filter(x => EdgeQL.ILike(x.Name, "e%"))
-                .Build()
+                .Compile()
                 .Prettify();
         }
     }
diff --git a/src/EdgeDB.Net.QueryBuilder/Compiled/CompiledQuery.cs b/src/EdgeDB.Net.QueryBuilder/Compiled/CompiledQuery.cs
new file mode 100644
index 00000000..5a00399d
--- /dev/null
+++ b/src/EdgeDB.Net.QueryBuilder/Compiled/CompiledQuery.cs
@@ -0,0 +1,67 @@
+using System.Collections.Immutable;
+using System.Text.RegularExpressions;
+
+namespace EdgeDB;
+
+public class CompiledQuery(string query, Dictionary<string, object?>? variables)
+{
+    public string Query { get; } = query;
+
+    public IReadOnlyDictionary<string, object?>? Variables { get; }
+        = variables?.ToImmutableDictionary();
+
+    internal readonly Dictionary<string, object?>? RawVariables = variables;
+
+    /// <summary>
+    ///     Prettifies the query text.
+    /// </summary>
+    /// <remarks>
+    ///     This method uses a lot of regex and can be unreliable, if
+    ///     you're using this in a production setting please use with care.
+    /// </remarks>
+    /// <returns>A prettified version of <see cref="Query"/>.</returns>
+    public string Prettify()
+    {
+        // add newlines
+        var result = Regex.Replace(Query, @"({|\(|\)|}|,)", m =>
+        {
+            switch (m.Groups[1].Value)
+            {
+                case "{" or "(" or ",":
+                    if (m.Groups[1].Value == "{" && Query[m.Index + 1] == '}')
+                        return m.Groups[1].Value;
+
+                    return $"{m.Groups[1].Value}\n";
+
+                default:
+                    return $"{((m.Groups[1].Value == "}" && (Query[m.Index - 1] == '{' || Query[m.Index - 1] == '}')) ? "" : "\n")}{m.Groups[1].Value}{((Query.Length != m.Index + 1 && (Query[m.Index + 1] != ',')) ? "\n" : "")}";
+            }
+        }).Trim().Replace("\n ", "\n");
+
+        // clean up newline func
+        result = Regex.Replace(result, "\n\n", m => "\n");
+
+        // add indentation
+        result = Regex.Replace(result, "^", m =>
+        {
+            int indent = 0;
+
+            foreach (var c in result[..m.Index])
+            {
+                if (c is '(' or '{')
+                    indent++;
+                if (c is ')' or '}')
+                    indent--;
+            }
+
+            var next = result.Length != m.Index ? result[m.Index] : '\0';
+
+            if (next is '}' or ')')
+                indent--;
+
+            return "".PadLeft(indent * 2);
+        }, RegexOptions.Multiline);
+
+        return result;
+    }
+}
diff --git a/src/EdgeDB.Net.QueryBuilder/Compiled/DebugCompiledQuery.cs b/src/EdgeDB.Net.QueryBuilder/Compiled/DebugCompiledQuery.cs
new file mode 100644
index 00000000..730561f1
--- /dev/null
+++ b/src/EdgeDB.Net.QueryBuilder/Compiled/DebugCompiledQuery.cs
@@ -0,0 +1,12 @@
+namespace EdgeDB.Compiled;
+
+public sealed class DebugCompiledQuery : CompiledQuery
+{
+
+
+    internal DebugCompiledQuery(string query, Dictionary<string, object?> variablesInternal, QueryWriter writer)
+        : base(query, variablesInternal)
+    {
+
+    }
+}
diff --git a/src/EdgeDB.Net.QueryBuilder/Extensions/QueryBuilderExtensions.cs b/src/EdgeDB.Net.QueryBuilder/Extensions/QueryBuilderExtensions.cs
index 7493ee0e..4c2de571 100644
--- a/src/EdgeDB.Net.QueryBuilder/Extensions/QueryBuilderExtensions.cs
+++ b/src/EdgeDB.Net.QueryBuilder/Extensions/QueryBuilderExtensions.cs
@@ -19,7 +19,7 @@ public static void WriteTo(this IQueryBuilder source, QueryWriter writer, IQuery
 
             target.Globals.AddRange(source.Globals);
 
-            source.InternalBuild(writer, context);
+            source.CompileInternal(writer, context);
         }
 
         public static void WriteTo(
@@ -38,7 +38,7 @@ public static void WriteTo(
                 expressionContext.SetGlobal(global.Name, global.Value, global.Reference);
             }
 
-            source.InternalBuild(writer, compileContext);
+            source.CompileInternal(writer, compileContext);
         }
 
         public static void WriteTo(this IQueryBuilder source, QueryWriter writer, QueryNode node, CompileContext? compileContext = null)
@@ -51,7 +51,7 @@ public static void WriteTo(this IQueryBuilder source, QueryWriter writer, QueryN
 
             node.Builder.QueryGlobals.AddRange(source.Globals);
 
-            source.InternalBuild(writer, compileContext);
+            source.CompileInternal(writer, compileContext);
         }
     }
 }
diff --git a/src/EdgeDB.Net.QueryBuilder/Interfaces/IQueryBuilder.cs b/src/EdgeDB.Net.QueryBuilder/Interfaces/IQueryBuilder.cs
index dd17910d..1b72b348 100644
--- a/src/EdgeDB.Net.QueryBuilder/Interfaces/IQueryBuilder.cs
+++ b/src/EdgeDB.Net.QueryBuilder/Interfaces/IQueryBuilder.cs
@@ -1,4 +1,5 @@
 using EdgeDB.Builders;
+using EdgeDB.Compiled;
 using EdgeDB.Interfaces;
 using EdgeDB.Interfaces.Queries;
 using EdgeDB.QueryNodes;
@@ -298,38 +299,25 @@ public interface IQueryBuilder
         internal Dictionary<string, object?> Variables { get; }
 
         /// <summary>
-        ///     Builds the current query.
+        ///     Compiles the current query.
         /// </summary>
         /// <remarks>
         ///     If the query requires introspection please use
-        ///     <see cref="BuildAsync(IEdgeDBQueryable, CancellationToken)"/>.
+        ///     <see cref="CompileAsync"/>.
         /// </remarks>
         /// <returns>
-        ///     A <see cref="BuiltQuery"/>.
+        ///     A <see cref="CompiledQuery"/>.
         /// </returns>
-        BuiltQuery Build();
+        CompiledQuery Compile();
 
         /// <summary>
-        ///     Builds the current query asynchronously, allowing database introspection.
+        ///     Compiles the current query asynchronously, allowing database introspection.
         /// </summary>
         /// <param name="edgedb">The client to preform introspection with.</param>
         /// <param name="token">A cancellation token to cancel the asynchronous operation.</param>
-        /// <returns>A <see cref="BuiltQuery"/>.</returns>
-        ValueTask<BuiltQuery> BuildAsync(IEdgeDBQueryable edgedb, CancellationToken token = default);
+        /// <returns>A <see cref="CompiledQuery"/>.</returns>
+        ValueTask<CompiledQuery> CompileAsync(IEdgeDBQueryable edgedb, CancellationToken token = default);
 
-        /// <summary>
-        ///     Builds the current query builder into its <see cref="BuiltQuery"/>
-        ///     form and excludes globals from the query text and puts them in
-        ///     <see cref="BuiltQuery.Globals"/>.
-        /// </summary>
-        /// <param name="preFinalizerModifier">
-        ///     A modifier delegate to change nodes behaviour before the finalizer is called.
-        /// </param>
-        /// <returns>
-        ///     A <see cref="BuiltQuery"/> which is the current query this builder has constructed.
-        /// </returns>
-        internal BuiltQuery BuildWithGlobals(Action<QueryNode>? preFinalizerModifier = null);
-
-        internal void InternalBuild(QueryWriter writer, CompileContext? context = null);
+        internal void CompileInternal(QueryWriter writer, CompileContext? context = null);
     }
 }
diff --git a/src/EdgeDB.Net.QueryBuilder/Lexical/QueryWriter.cs b/src/EdgeDB.Net.QueryBuilder/Lexical/QueryWriter.cs
index 6af8007f..fa44c2f3 100644
--- a/src/EdgeDB.Net.QueryBuilder/Lexical/QueryWriter.cs
+++ b/src/EdgeDB.Net.QueryBuilder/Lexical/QueryWriter.cs
@@ -26,13 +26,11 @@ public void Dispose()
         }
     }
 
-    public IReadOnlyDictionary<string, LinkedList<Marker>> Markers
-        => _markers;
+    public readonly Dictionary<string, LinkedList<Marker>> Markers;
 
     private readonly List<Marker> _markersRef;
 
     private readonly LooseLinkedList<Value> _tokens;
-    private readonly Dictionary<string, LinkedList<Marker>> _markers;
 
     private readonly List<INodeObserver> _observers = [];
 
@@ -43,7 +41,7 @@ public IReadOnlyDictionary<string, LinkedList<Marker>> Markers
     public QueryWriter()
     {
         _tokens = new();
-        _markers = new();
+        Markers = new();
         _markersRef = new();
         _track = null;
     }
@@ -199,12 +197,12 @@ private void UpdateMarkers(int position, int delta)
     }
 
     public bool TryGetMarker(string name, [MaybeNullWhen(false)] out LinkedList<Marker> markers)
-        => _markers.TryGetValue(name, out markers);
+        => Markers.TryGetValue(name, out markers);
 
     public QueryWriter Marker(MarkerType type, string name, in Value value)
     {
-        if (!_markers.TryGetValue(name, out var markers))
-            _markers[name] = markers = new();
+        if (!Markers.TryGetValue(name, out var markers))
+            Markers[name] = markers = new();
 
         var currentIndex = TailIndex;
         Append(in value, out var head);
@@ -224,8 +222,8 @@ public QueryWriter Marker(MarkerType type, string name, params Value[] values)
         if (values.Length == 0)
             return this;
 
-        if (!_markers.TryGetValue(name, out var markers))
-            _markers[name] = markers = new();
+        if (!Markers.TryGetValue(name, out var markers))
+            Markers[name] = markers = new();
 
         var currentIndex = TailIndex;
 
@@ -372,7 +370,7 @@ public StringBuilder Compile(StringBuilder? builder = null)
 
     public void Dispose()
     {
-        _markers.Clear();
+        Markers.Clear();
         _tokens.Clear();
         _observers.Clear();
         _markersRef.Clear();
diff --git a/src/EdgeDB.Net.QueryBuilder/QueryBuilder.cs b/src/EdgeDB.Net.QueryBuilder/QueryBuilder.cs
index b1bb3dc0..4e18a50e 100644
--- a/src/EdgeDB.Net.QueryBuilder/QueryBuilder.cs
+++ b/src/EdgeDB.Net.QueryBuilder/QueryBuilder.cs
@@ -193,27 +193,23 @@ private TNode AddNode<TNode>(NodeContext context, bool autoGenerated = false, Qu
         }
 
         /// <summary>
-        ///     Builds the current query builder into its <see cref="BuiltQuery"/> form.
+        ///     Compiles the current query builder into its <see cref="CompiledQuery"/> form.
         /// </summary>
         /// <returns>
-        ///     A <see cref="BuiltQuery"/> which is the current query this builder has constructed.
+        ///     A <see cref="CompiledQuery"/>.
         /// </returns>
-        internal BuiltQuery InternalBuild(CompileContext? context = null)
+        internal CompiledQuery CompileInternal(CompileContext? context = null)
         {
             context ??= new CompileContext();
 
             using var writer = new QueryWriter();
 
-            InternalBuild(writer, context);
+            CompileInternal(writer, context);
 
-            return new BuiltQuery(writer.Compile().ToString())
-            {
-                Parameters = _queryVariables,
-                Globals = _queryGlobals
-            };
+            return new CompiledQuery(writer.Compile().ToString(), _queryVariables);
         }
 
-        internal void InternalBuild(QueryWriter writer, CompileContext? context = null)
+        internal void CompileInternal(QueryWriter writer, CompileContext? context = null)
         {
             context ??= new();
 
@@ -268,24 +264,6 @@ internal void InternalBuild(QueryWriter writer, CompileContext? context = null)
                 nodes = nodes.Prepend(with).ToList();
             }
 
-            // // build each node starting at the last node.
-            // for (int i = nodes.Count - 1; i >= 0; i--)
-            // {
-            //     var node = nodes[i];
-            //
-            //     var result = node.Build();
-            //
-            //     // add the nodes query string if its not null or empty.
-            //     if (!string.IsNullOrEmpty(result.Query))
-            //         query.Add(result.Query);
-            //
-            //     // add any parameters the node has.
-            //     parameters.Add(result.Parameters);
-            // }
-
-            // // reverse our query string since we built our nodes in reverse.
-            // query.Reverse();
-
             // flatten our parameters into a single collection and make it distinct.
             var variables = parameters
                             .SelectMany(x => x)
@@ -293,48 +271,31 @@ internal void InternalBuild(QueryWriter writer, CompileContext? context = null)
 
             // add any variables that might have been added by other builders in a sub-query context.
             variables = variables.Concat(_queryVariables.Where(x => !variables.Any(x => x.Key == x.Key)));
-
-            // // construct a built query with our query text, variables, and globals.
-            // return new BuiltQuery(string.Join(' ', query))
-            // {
-            //     Parameters = variables
-            //                 .ToDictionary(x => x.Key, x => x.Value),
-            //
-            //     Globals = !includeGlobalsInQuery ? _queryGlobals : null
-            // };
         }
 
         /// <inheritdoc/>
-        public BuiltQuery Build()
-            => InternalBuild();
+        public CompiledQuery Compile()
+            => CompileInternal();
 
         /// <inheritdoc/>
-        public ValueTask<BuiltQuery> BuildAsync(IEdgeDBQueryable edgedb, CancellationToken token = default)
-            => IntrospectAndBuildAsync(edgedb, token);
-
-        /// <inheritdoc cref="IQueryBuilder.BuildWithGlobals"/>
-        internal BuiltQuery BuildWithGlobals(Action<QueryNode>? preFinalizerModifier = null)
-            => InternalBuild(new CompileContext()
-            {
-                IncludeGlobalsInQuery = false,
-                PreFinalizerModifier = preFinalizerModifier
-            });
+        public ValueTask<CompiledQuery> CompileAsync(IEdgeDBQueryable edgedb, CancellationToken token = default)
+            => IntrospectAndCompileAsync(edgedb, token);
 
         /// <summary>
-        ///     Preforms introspection and then builds this query builder into a <see cref="BuiltQuery"/>.
+        ///     Preforms introspection and then compiles this query builder into a <see cref="CompiledQuery"/>.
         /// </summary>
         /// <param name="edgedb">The client to preform introspection with.</param>
         /// <param name="token">A cancellation token to cancel the introspection query.</param>
         /// <returns>
-        ///     A ValueTask representing the (a)sync introspection and building operation.
-        ///     The result is the built form of this query builder.
+        ///     A ValueTask representing the (a)sync introspection and compiling operation.
+        ///     The result is the compiled form of this query builder.
         /// </returns>
-        private async ValueTask<BuiltQuery> IntrospectAndBuildAsync(IEdgeDBQueryable edgedb, CancellationToken token)
+        private async ValueTask<CompiledQuery> IntrospectAndCompileAsync(IEdgeDBQueryable edgedb, CancellationToken token)
         {
             if (_nodes.Any(x => x.RequiresIntrospection) || _queryGlobals.Any(x => x.Value is SubQuery subQuery && subQuery.RequiresIntrospection))
                 _schemaInfo ??= await SchemaIntrospector.GetOrCreateSchemaIntrospectionAsync(edgedb, token).ConfigureAwait(false);
 
-            var result = Build();
+            var result = Compile();
             _nodes.Clear();
             _queryGlobals.Clear();
 
@@ -585,30 +546,30 @@ private QueryBuilder<TType, TContext> Else(Func<IQueryBuilder<TType, TContext>,
         async Task<IReadOnlyCollection<TType?>> IMultiCardinalityExecutable<TType>.ExecuteAsync(IEdgeDBQueryable edgedb,
             Capabilities? capabilities, CancellationToken token)
         {
-            var result = await IntrospectAndBuildAsync(edgedb, token).ConfigureAwait(false);
-            return await edgedb.QueryAsync<TType>(result.Query, result.Parameters, capabilities, token).ConfigureAwait(false);
+            var result = await IntrospectAndCompileAsync(edgedb, token).ConfigureAwait(false);
+            return await edgedb.QueryAsync<TType>(result.Query, result.RawVariables, capabilities, token).ConfigureAwait(false);
         }
 
         /// <inheritdoc/>
         async Task<TType?> ISingleCardinalityExecutable<TType>.ExecuteAsync(IEdgeDBQueryable edgedb,
             Capabilities? capabilities, CancellationToken token)
         {
-            var result = await IntrospectAndBuildAsync(edgedb, token).ConfigureAwait(false);
-            return await edgedb.QuerySingleAsync<TType>(result.Query, result.Parameters, capabilities, token).ConfigureAwait(false);
+            var result = await IntrospectAndCompileAsync(edgedb, token).ConfigureAwait(false);
+            return await edgedb.QuerySingleAsync<TType>(result.Query, result.RawVariables, capabilities, token).ConfigureAwait(false);
         }
 
         /// <inheritdoc/>
         async Task<TType?> IMultiCardinalityExecutable<TType>.ExecuteSingleAsync(IEdgeDBQueryable edgedb, Capabilities? capabilities, CancellationToken token)
         {
-            var result = await IntrospectAndBuildAsync(edgedb, token).ConfigureAwait(false);
-            return await edgedb.QuerySingleAsync<TType>(result.Query, result.Parameters, capabilities, token).ConfigureAwait(false);
+            var result = await IntrospectAndCompileAsync(edgedb, token).ConfigureAwait(false);
+            return await edgedb.QuerySingleAsync<TType>(result.Query, result.RawVariables, capabilities, token).ConfigureAwait(false);
         }
 
         /// <inheritdoc/>
         async Task<TType> IMultiCardinalityExecutable<TType>.ExecuteRequiredSingleAsync(IEdgeDBQueryable edgedb, Capabilities? capabilities, CancellationToken token)
         {
-            var result = await IntrospectAndBuildAsync(edgedb, token).ConfigureAwait(false);
-            return await edgedb.QueryRequiredSingleAsync<TType>(result.Query, result.Parameters, capabilities, token).ConfigureAwait(false);
+            var result = await IntrospectAndCompileAsync(edgedb, token).ConfigureAwait(false);
+            return await edgedb.QueryRequiredSingleAsync<TType>(result.Query, result.RawVariables, capabilities, token).ConfigureAwait(false);
         }
 
 
@@ -616,99 +577,11 @@ async Task<TType> IMultiCardinalityExecutable<TType>.ExecuteRequiredSingleAsync(
         IReadOnlyCollection<QueryNode> IQueryBuilder.Nodes => _nodes;
         List<QueryGlobal> IQueryBuilder.Globals => _queryGlobals;
         Dictionary<string, object?> IQueryBuilder.Variables => _queryVariables;
-        BuiltQuery IQueryBuilder.BuildWithGlobals(Action<QueryNode>? preFinalizerModifier) => BuildWithGlobals(preFinalizerModifier);
 
-        void IQueryBuilder.InternalBuild(QueryWriter writer, CompileContext? context) =>
-            InternalBuild(writer, context);
+        void IQueryBuilder.CompileInternal(QueryWriter writer, CompileContext? context) =>
+            CompileInternal(writer, context);
 
         #endregion
     }
 
-
-    /// <summary>
-    ///     Represents a built query.
-    /// </summary>
-    [System.Diagnostics.DebuggerDisplay(@"{Query,nq}")]
-    public class BuiltQuery
-    {
-        /// <summary>
-        ///     Gets the query text.
-        /// </summary>
-        public string Query { get; internal init; }
-
-        /// <summary>
-        ///     Gets a collection of parameters for the query.
-        /// </summary>
-        public IDictionary<string, object?>? Parameters { get; internal init; }
-
-        /// <summary>
-        ///     Gets a prettified version of this query.
-        /// </summary>
-        public string Pretty
-            => Prettify();
-
-        internal List<QueryGlobal>? Globals { get; init; }
-
-        /// <summary>
-        ///     Creates a new built query.
-        /// </summary>
-        /// <param name="query">The query text.</param>
-        internal BuiltQuery(string query)
-        {
-            Query = query;
-        }
-
-        /// <summary>
-        ///     Prettifies the query text.
-        /// </summary>
-        /// <remarks>
-        ///     This method uses alot of regex and can be unreliable, if
-        ///     you're using this in a production setting please use with care.
-        /// </remarks>
-        /// <returns>A prettified version of <see cref="Query"/>.</returns>
-        public string Prettify()
-        {
-            // add newlines
-            var result = Regex.Replace(Query, @"({|\(|\)|}|,)", m =>
-            {
-                switch (m.Groups[1].Value)
-                {
-                    case "{" or "(" or ",":
-                        if (m.Groups[1].Value == "{" && Query[m.Index + 1] == '}')
-                            return m.Groups[1].Value;
-
-                        return $"{m.Groups[1].Value}\n";
-
-                    default:
-                        return $"{((m.Groups[1].Value == "}" && (Query[m.Index - 1] == '{' || Query[m.Index - 1] == '}')) ? "" : "\n")}{m.Groups[1].Value}{((Query.Length != m.Index + 1 && (Query[m.Index + 1] != ',')) ? "\n" : "")}";
-                }
-            }).Trim().Replace("\n ", "\n");
-
-            // clean up newline func
-            result = Regex.Replace(result, "\n\n", m => "\n");
-
-            // add indentation
-            result = Regex.Replace(result, "^", m =>
-            {
-                int indent = 0;
-
-                foreach (var c in result[..m.Index])
-                {
-                    if (c is '(' or '{')
-                        indent++;
-                    if (c is ')' or '}')
-                        indent--;
-                }
-
-                var next = result.Length != m.Index ? result[m.Index] : '\0';
-
-                if (next is '}' or ')')
-                    indent--;
-
-                return "".PadLeft(indent * 2);
-            }, RegexOptions.Multiline);
-
-            return result;
-        }
-    }
 }
diff --git a/src/EdgeDB.Net.QueryBuilder/Translators/Expressions/InitializationTranslator.cs b/src/EdgeDB.Net.QueryBuilder/Translators/Expressions/InitializationTranslator.cs
index a9b6cf74..a1e47d83 100644
--- a/src/EdgeDB.Net.QueryBuilder/Translators/Expressions/InitializationTranslator.cs
+++ b/src/EdgeDB.Net.QueryBuilder/Translators/Expressions/InitializationTranslator.cs
@@ -15,24 +15,18 @@ internal static class InitializationTranslator
     {
         public static Dictionary<MemberInfo, Expression> PullInitializationExpression(Expression expression)
         {
-            if(expression is MemberInitExpression memberInit)
+            return expression switch
             {
-                return memberInit.Bindings.ToDictionary(
-                    x => x.Member,
+                MemberInitExpression memberInit => memberInit.Bindings.ToDictionary(x => x.Member,
                     x => x is not MemberAssignment assignment
                         ? throw new InvalidOperationException($"Expected MemberAssignment, but got {x.GetType().Name}")
-                        : assignment.Expression
-                );
-            }
-            else if (expression is NewExpression newExpression)
-            {
-                if (newExpression.Members is null)
-                    throw new NullReferenceException("New expression must contain arguments");
-
-                return newExpression.Members.Zip(newExpression.Arguments).ToDictionary(x => x.First, x => x.Second);
-            }
-
-            throw new ArgumentException($"expression is not an initialization expression", nameof(expression));
+                        : assignment.Expression),
+                NewExpression {Members: null} => throw new NullReferenceException(
+                    "New expression must contain arguments"),
+                NewExpression newExpression => newExpression.Members!.Zip(newExpression.Arguments)
+                    .ToDictionary(x => x.First, x => x.Second),
+                _ => throw new ArgumentException($"expression is not an initialization expression", nameof(expression))
+            };
         }
 
         private static SubQuery? GenerateMultiLinkInserter(Type innerType, IEnumerable collection, ExpressionContext context)
@@ -50,34 +44,14 @@ public static Dictionary<MemberInfo, Expression> PullInitializationExpression(Ex
             if (!collection.Any())
                 return null;
 
-            return new SubQuery((info, subQuery) =>
+            return new SubQuery((info, writer) =>
             {
-                var builder = new QueryBuilder<T>(info);
-
-                var builtQuery = builder
+                new QueryBuilder<T>(info)
                     .For(collection, x => QueryBuilder
                         .Insert(x)
                         .UnlessConflict()
                     )
-                    .BuildWithGlobals();
-
-                if(builtQuery.Parameters is not null)
-                {
-                    foreach (var param in builtQuery.Parameters)
-                    {
-                        context.SetVariable(param.Key, param.Value);
-                    }
-                }
-
-                if(builtQuery.Globals is not null)
-                {
-                    foreach(var global in builtQuery.Globals)
-                    {
-                        context.SetGlobal(global.Name, global.Value, global.Reference);
-                    }
-                }
-
-                subQuery.Append(builtQuery.Query);
+                    .WriteTo(writer, context);
             });
         }
 
diff --git a/src/EdgeDB.Net.QueryBuilder/Translators/Expressions/MethodCallExpressionTranslator.cs b/src/EdgeDB.Net.QueryBuilder/Translators/Expressions/MethodCallExpressionTranslator.cs
index a8182979..44299af5 100644
--- a/src/EdgeDB.Net.QueryBuilder/Translators/Expressions/MethodCallExpressionTranslator.cs
+++ b/src/EdgeDB.Net.QueryBuilder/Translators/Expressions/MethodCallExpressionTranslator.cs
@@ -190,23 +190,10 @@ private static void TranslateToEdgeQL(MethodCallExpression expression, Expressio
                         var builder =
                             (IQueryBuilder)Expression.Lambda(expression.Arguments[0]).Compile().DynamicInvoke()!;
 
-                        // build it and copy its globals & parameters to our builder
-                        var result = builder.BuildWithGlobals();
+                        writer.Wrapped(writer => builder.WriteTo(writer, context));
 
-                        if (result.Parameters is not null)
-                            foreach (var parameter in result.Parameters)
-                                context.SetVariable(parameter.Key, parameter.Value);
-
-                        if (result.Globals is not null)
-                            foreach (var global in result.Globals)
-                                context.SetGlobal(global.Name, global.Value, global.Reference);
-
-                        writer
-                            .Append('(')
-                            .Append(result.Query)
-                            .Append(')');
-                    }
                         return;
+                    }
                     default:
                         throw new NotImplementedException(
                             $"{expression.Method.Name} does not have an implementation. This is a bug, please file a github issue with your query to reproduce this exception.");
diff --git a/src/EdgeDB.Net.Queryable/Extensions/QueryableExtensions.cs b/src/EdgeDB.Net.Queryable/Extensions/QueryableExtensions.cs
index b3c43226..b3773e2a 100644
--- a/src/EdgeDB.Net.Queryable/Extensions/QueryableExtensions.cs
+++ b/src/EdgeDB.Net.Queryable/Extensions/QueryableExtensions.cs
@@ -19,9 +19,9 @@ public static class QueryableExtensions
 
             var transient = queryable.Provider.ToTransient();
 
-            var builtQuery = await transient.Compile().BuildAsync(client, token);
+            var builtQuery = await transient.Compile().CompileAsync(client, token);
 
-            return await client.QueryAsync<T>(builtQuery.Query, builtQuery.Parameters, token: token);
+            return await client.QueryAsync<T>(builtQuery.Query, builtQuery.RawVariables, token: token);
         }
 
         public static async Task<T?> ExecuteSingleAsync<T>(
@@ -34,9 +34,9 @@ public static class QueryableExtensions
 
             var transient = queryable.Provider.ToTransient();
 
-            var builtQuery = await transient.Compile().BuildAsync(client, token);
+            var builtQuery = await transient.Compile().CompileAsync(client, token);
 
-            return await client.QuerySingleAsync<T>(builtQuery.Query, builtQuery.Parameters, token: token);
+            return await client.QuerySingleAsync<T>(builtQuery.Query, builtQuery.RawVariables, token: token);
         }
     }
 }
diff --git a/src/EdgeDB.Net.Queryable/GenericlessQueryBuilder.cs b/src/EdgeDB.Net.Queryable/GenericlessQueryBuilder.cs
index c89c6df4..ea723e31 100644
--- a/src/EdgeDB.Net.Queryable/GenericlessQueryBuilder.cs
+++ b/src/EdgeDB.Net.Queryable/GenericlessQueryBuilder.cs
@@ -369,14 +369,14 @@ public GenericlessQueryBuilder Else(Func<GenericlessQueryBuilder, GenericlessQue
 
         #region Building
 
-        private async ValueTask<BuiltQuery> IntrospectAndBuildAsync(IEdgeDBQueryable edgedb, CancellationToken token)
+        private async ValueTask<CompiledQuery> IntrospectAndBuildAsync(IEdgeDBQueryable edgedb, CancellationToken token)
         {
             if (_nodes.Any(x => x.RequiresIntrospection) ||
                 _queryGlobals.Any(x => x.Value is SubQuery subQuery && subQuery.RequiresIntrospection))
                 _schemaInfo ??= await SchemaIntrospector.GetOrCreateSchemaIntrospectionAsync(edgedb, token)
                     .ConfigureAwait(false);
 
-            var result = Build();
+            var result = Compile();
             _nodes.Clear();
             _queryGlobals.Clear();
 
@@ -384,24 +384,21 @@ private async ValueTask<BuiltQuery> IntrospectAndBuildAsync(IEdgeDBQueryable edg
         }
 
         /// <summary>
-        ///     Builds the current query builder into its <see cref="BuiltQuery"/> form.
+        ///     Compiles the current query builder into its <see cref="CompiledQuery"/> form.
         /// </summary>
         /// <returns>
-        ///     A <see cref="BuiltQuery"/> which is the current query this builder has constructed.
+        ///     A <see cref="CompiledQuery"/>.
         /// </returns>
-        internal BuiltQuery InternalBuild(CompileContext? context = null)
+        internal CompiledQuery CompileInternal(CompileContext? context = null)
         {
             var writer = new QueryWriter();
 
-            InternalBuild(writer, context);
+            CompileInternal(writer, context);
 
-            return new BuiltQuery(writer.Compile().ToString())
-            {
-                Parameters = _queryVariables, Globals = _queryGlobals
-            };
+            return new CompiledQuery(writer.Compile().ToString(), _queryVariables);
         }
 
-        internal void InternalBuild(QueryWriter writer, CompileContext? context = null)
+        internal void CompileInternal(QueryWriter writer, CompileContext? context = null)
         {
             context ??= new();
 
@@ -482,21 +479,13 @@ internal void InternalBuild(QueryWriter writer, CompileContext? context = null)
         }
 
         /// <inheritdoc/>
-        public BuiltQuery Build()
-            => InternalBuild();
+        public CompiledQuery Compile()
+            => CompileInternal();
 
         /// <inheritdoc/>
-        public ValueTask<BuiltQuery> BuildAsync(IEdgeDBQueryable edgedb, CancellationToken token = default)
+        public ValueTask<CompiledQuery> CompileAsync(IEdgeDBQueryable edgedb, CancellationToken token = default)
             => IntrospectAndBuildAsync(edgedb, token);
 
-        /// <inheritdoc cref="IQueryBuilder.BuildWithGlobals"/>
-        public BuiltQuery BuildWithGlobals(Action<QueryNode>? preFinalizerModifier = null)
-            => InternalBuild(new CompileContext()
-            {
-                IncludeGlobalsInQuery = false,
-                PreFinalizerModifier = preFinalizerModifier
-            });
-
         #endregion
 
         #region IQueryBuilder
@@ -510,8 +499,8 @@ List<QueryGlobal> IQueryBuilder.Globals
         Dictionary<string, object?> IQueryBuilder.Variables
             => _queryVariables;
 
-        void IQueryBuilder.InternalBuild(QueryWriter writer, CompileContext? context) =>
-            InternalBuild(writer, context);
+        void IQueryBuilder.CompileInternal(QueryWriter writer, CompileContext? context) =>
+            CompileInternal(writer, context);
 
         #endregion
     }