diff --git a/tests/run-macros/miniquill/Miniquill_1.scala b/tests/run-macros/miniquill/Miniquill_1.scala
new file mode 100644
index 000000000000..7431b4057a90
--- /dev/null
+++ b/tests/run-macros/miniquill/Miniquill_1.scala
@@ -0,0 +1,177 @@
+import scala.quoted._
+import scala.annotation.StaticAnnotation
+
+object Miniquill {
+
+
+  // DSL
+  sealed trait Query[+T] {
+    def map[R](f: T => R): Query[R]
+  }
+
+  sealed trait EntityQuery[T] extends Query[T] {
+    override def map[R](f: T => R): EntityQuery[R]
+  }
+
+  inline def query[T]: EntityQuery[T] = ${ queryImpl }
+
+  def queryImpl[T: Type](given qctx: QuoteContext): Expr[EntityQuery[T]] = {
+    import qctx.tasty.{_, given}
+    '{
+      querySchema[T](${Expr(typeOf[T].classSymbol.get.name)})
+    }
+  }
+  // AST
+  sealed trait Ast
+  sealed trait QueryTree extends Ast
+  case class Idnt(name: String) extends Ast
+  case class Map(query: Ast, alias: Idnt, body: Ast) extends QueryTree
+  case class Entity(name: String) extends QueryTree
+  case class Property(ast: Ast, name: String) extends Ast
+
+  sealed trait Operation extends Ast
+  case class BinaryOperation(a: Ast, operator: BinaryOperator, b: Ast) extends Operation
+
+  sealed trait Value extends Ast
+  case class Const(v: Double) extends Value
+
+  /* Operators */
+  sealed trait Operator
+  sealed trait BinaryOperator extends Operator
+  object NumericOperator {
+    case object `*` extends BinaryOperator
+  }
+
+  def lift(ast: Ast)(given qctx: QuoteContext): Expr[Ast] = ast match {
+    case Const(v) => '{ Const(${Expr(v)}) }
+    case Entity(name: String) => '{ Entity(${Expr(name)})  }
+    case Idnt(name: String) => '{ Idnt(${Expr(name)})  }
+    case Map(query: Ast, alias: Idnt, body: Ast) => '{ Map(${lift(query)}, ${lift(alias).asInstanceOf[Expr[Idnt]]}, ${lift(body)})  }
+    case BinaryOperation(a: Ast, operator: BinaryOperator, b: Ast) => '{ BinaryOperation(${lift(a)}, ${lift(operator).asInstanceOf[Expr[BinaryOperator]]}, ${lift(b)})  }
+    case Property(ast: Ast, name: String) => '{Property(${lift(ast)}, ${Expr(name)}) }
+    case t =>
+      println(t)
+      qctx.error("Lifting error: " + t)
+      ???
+  }
+
+  def lift(op: Operator)(given qctx: QuoteContext): Expr[Operator] = op match {
+    case NumericOperator.* => '{ NumericOperator.* }
+  }
+
+  def unlift(ast: Expr[Ast])(given qctx: QuoteContext): Ast = ast match {
+    case '{ Const(${b}) } =>
+      import scala.quoted.matching.{Const => Constant}
+      b match {
+        case Constant(v: Double) => Const(v)
+      }
+    case '{ Entity(${b})  } =>
+      import scala.quoted.matching.{Const => Constant}
+      b match {
+        case Constant(v: String) => Entity(v)
+      }
+    case '{ Idnt(${b}) } =>
+      import scala.quoted.matching.{Const => Constant}
+      b match {
+        case Constant(v: String) => Idnt(v)
+      }
+    case '{ Map(${query}, ${alias}, ${body}: Ast) } => Map(unlift(query), unlift(alias).asInstanceOf[Idnt], unlift(body))
+    case '{ BinaryOperation(${a}, ${operator}, ${b}: Ast) } => BinaryOperation(unlift(a), unlift1(operator).asInstanceOf[BinaryOperator], unlift(b))
+    case '{ Property(${ast}, ${name}) } =>
+      import scala.quoted.matching.{Const => Constant}
+      val unname = name match {
+        case Constant(v: String) => v
+      }
+
+      Property(unlift(ast), unname)
+    case t =>
+      println(t)
+      qctx.error("Lifting error: " + t)
+      ???
+  }
+
+  def unlift1(op: Expr[Operator])(given qctx: QuoteContext): Operator = op match {
+    case '{ NumericOperator.* } =>  NumericOperator.*
+  }
+
+  class Quoted[+T](val ast: Ast) {
+    override def toString = ast.toString
+  }
+  inline def quote[T](body: =>T) <: Quoted[T] = ${ quoteImpl[T]('body) }
+
+  class QuotedAst(ast: Ast) extends StaticAnnotation
+
+  def quoteImpl[T: Type](body: Expr[T])(given qctx: QuoteContext): Expr[Quoted[T]] = {
+    import qctx.tasty.{_, given}
+
+    val ast = astParser(body)
+
+    println(ast)
+
+    val reifiedAst = lift(ast)
+
+    '{
+       new Quoted[T](${reifiedAst})
+    }
+  }
+
+  def astParser[T: Type](in: Expr[T])(given qctx: QuoteContext): Ast = {
+    import qctx.tasty.{Type => _, _, given}
+
+    println("--> " + in.unseal)
+    println
+    object Seal {
+      def unapply[T](e: Term)(given qctx: QuoteContext) = {
+        implicit val ttpe: Type[T] = e.tpe.seal.asInstanceOf[Type[T]]
+
+        Some(e.seal.cast[T])
+      }
+    }
+
+    in.unseal.underlyingArgument match {
+      case Inlined(_, _, v) => astParser(v.seal.cast[T])
+      case Literal(Constant(v: Double)) => Const(v)
+      case Typed(t, _) => astParser(t.seal.cast[T])
+      case Apply(
+          TypeApply(
+            Select(
+              Typed(
+                Apply(
+                  TypeApply(t, List(targ)), _
+                ), _), _), _), Lambda(valdef :: Nil, Seal(body)) :: Nil) =>
+
+        val name: String = targ.tpe.classSymbol.get.name
+        Map(Entity(name), Idnt(valdef.symbol.name), astParser(body))
+
+      case Apply(Select(Seal(left), "*"), Seal(right) :: Nil) =>
+        BinaryOperation(astParser(left), NumericOperator.*, astParser(right))
+
+      case Apply(TypeApply(Ident("unquote"), _), List(quoted)) =>
+        val rhs = quoted.symbol.tree.asInstanceOf[ValDef].rhs.get.seal
+
+        rhs match {
+          case '{ new Quoted[$t]($ast) } => unlift(ast)
+        }
+
+      case Select(Seal(prefix), member) =>
+        Property(astParser(prefix), member)
+
+      case Ident(x) => Idnt(x)
+
+      case t =>
+        println(t)
+        summon[QuoteContext].error("Parsing error: " + in.show, in)
+        ???
+    }
+  }
+
+  def runQuery[T](query: Quoted[Query[T]]): String = ???
+
+  def run[T](query: Quoted[T]): String = {
+    query.ast.toString
+  }
+
+  implicit def unquote[T](quoted: Quoted[T]): T = ???
+
+  def querySchema[T](entity: String): EntityQuery[T] = ???
+}
\ No newline at end of file
diff --git a/tests/run-macros/miniquill/Test_2.scala b/tests/run-macros/miniquill/Test_2.scala
new file mode 100644
index 000000000000..7096d3d56eb1
--- /dev/null
+++ b/tests/run-macros/miniquill/Test_2.scala
@@ -0,0 +1,23 @@
+import Miniquill._
+
+@main
+def Test = {
+  val pi /*: Quoted[Double] */ = quote(3.14159)
+
+  // run(pi)
+  case class Circle(radius: Float)
+
+  val areas = quote {
+    query[Circle].map[Double]((c: Circle) => pi * c.radius): EntityQuery[Double]
+  }
+  /*
+    querySchema("Circle"): Playground.this.ctx.Quoted[Playground.this.ctx.EntityQuery[Playground.this.Circle]]{
+      def quoted: io.getquill.ast.Entity;
+      def ast: io.getquill.ast.Entity;
+      def id2124864049(): Unit;
+      val liftings: Object
+  */
+
+  run(areas)
+  // SELECT (3.14159 * c.radius) * c.radius FROM circle c
+}
\ No newline at end of file