diff --git a/core/.js/src/main/scala/org/bitcoins/core/protocol/dlc/models/SigPointComputer.scala b/core/.js/src/main/scala/org/bitcoins/core/protocol/dlc/models/SigPointComputer.scala
deleted file mode 100644
index 9196ad8e28..0000000000
--- a/core/.js/src/main/scala/org/bitcoins/core/protocol/dlc/models/SigPointComputer.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.bitcoins.core.protocol.dlc.models
-
-import org.bitcoins.crypto.ECPublicKey
-
-case class SigPointComputer(private val computeSigPoint: () => ECPublicKey) {
-  lazy val compute: ECPublicKey = computeSigPoint()
-}
diff --git a/core/.jvm/src/main/scala/org/bitcoins/core/protocol/dlc/models/SigPointComputer.scala b/core/.jvm/src/main/scala/org/bitcoins/core/protocol/dlc/models/SigPointComputer.scala
deleted file mode 100644
index 3535df10ea..0000000000
--- a/core/.jvm/src/main/scala/org/bitcoins/core/protocol/dlc/models/SigPointComputer.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.bitcoins.core.protocol.dlc.models
-
-import org.bitcoins.crypto.ECPublicKey
-
-import scala.concurrent.{Await, ExecutionContext, Future}
-import scala.concurrent.duration.DurationInt
-
-case class SigPointComputer(private val computeSigPoint: () => ECPublicKey) {
-  private val sigPointF = Future(computeSigPoint())(ExecutionContext.global)
-
-  lazy val compute: ECPublicKey = {
-    Await.result(sigPointF, 20.seconds)
-  }
-}
diff --git a/core/src/main/scala/org/bitcoins/core/protocol/dlc/models/OracleOutcome.scala b/core/src/main/scala/org/bitcoins/core/protocol/dlc/models/OracleOutcome.scala
index 10fd1182f4..d789585322 100644
--- a/core/src/main/scala/org/bitcoins/core/protocol/dlc/models/OracleOutcome.scala
+++ b/core/src/main/scala/org/bitcoins/core/protocol/dlc/models/OracleOutcome.scala
@@ -28,8 +28,8 @@ sealed trait OracleOutcome {
   protected def computeSigPoint: ECPublicKey
 
   /** The adaptor point used to encrypt the signatures for this corresponding CET. */
-  def sigPoint: ECPublicKey = {
-    SigPointComputer(() => computeSigPoint).compute
+  lazy val sigPoint: ECPublicKey = {
+    computeSigPoint
   }
 
   /** The sum of all oracle nonces used in execution with this OracleOutcome. */
diff --git a/core/src/main/scala/org/bitcoins/core/protocol/dlc/sign/DLCTxSigner.scala b/core/src/main/scala/org/bitcoins/core/protocol/dlc/sign/DLCTxSigner.scala
index be1712a3e5..4ebf0339bb 100644
--- a/core/src/main/scala/org/bitcoins/core/protocol/dlc/sign/DLCTxSigner.scala
+++ b/core/src/main/scala/org/bitcoins/core/protocol/dlc/sign/DLCTxSigner.scala
@@ -194,11 +194,6 @@ case class DLCTxSigner(
   def createCETSigsAsync()(implicit
       ec: ExecutionContext): Future[CETSignatures] = {
     val outcomes = builder.contractInfo.allOutcomes
-    //divide and conquer
-
-    //we want a batch size of at least 1
-    val size =
-      Math.max(outcomes.length / Runtime.getRuntime.availableProcessors(), 1)
 
     val computeBatchFn: Vector[OracleOutcome] => Future[
       Vector[(OracleOutcome, ECAdaptorSignature)]] = {
@@ -210,8 +205,7 @@ case class DLCTxSigner(
 
     val cetSigsF: Future[Vector[(OracleOutcome, ECAdaptorSignature)]] = {
       FutureUtil.batchAndParallelExecute(elements = outcomes,
-                                         f = computeBatchFn,
-                                         batchSize = size)
+                                         f = computeBatchFn)
     }.map(_.flatten)
 
     for {
@@ -225,10 +219,38 @@ case class DLCTxSigner(
     val cetsAndSigs = buildAndSignCETs(builder.contractInfo.allOutcomes)
     val (msgs, cets, sigs) = cetsAndSigs.unzip3
     val refundSig = signRefundTx
-
     (CETSignatures(msgs.zip(sigs), refundSig), cets)
   }
 
+  /** The equivalent of [[createCETsAndCETSigs()]] but async */
+  def createCETsAndCETSigsAsync()(implicit
+  ec: ExecutionContext): Future[(CETSignatures, Vector[WitnessTransaction])] = {
+    val outcomes = builder.contractInfo.allOutcomes
+    val fn = { outcomes: Vector[OracleOutcome] =>
+      Future {
+        buildAndSignCETs(outcomes)
+      }
+    }
+    val cetsAndSigsF: Future[Vector[
+      Vector[(OracleOutcome, WitnessTransaction, ECAdaptorSignature)]]] = {
+      FutureUtil.batchAndParallelExecute[OracleOutcome,
+                                         Vector[(
+                                             OracleOutcome,
+                                             WitnessTransaction,
+                                             ECAdaptorSignature)]](elements =
+                                                                     outcomes,
+                                                                   f = fn)
+    }
+
+    val refundSig = signRefundTx
+
+    for {
+      cetsAndSigsNested <- cetsAndSigsF
+      cetsAndSigs = cetsAndSigsNested.flatten
+      (msgs, cets, sigs) = cetsAndSigs.unzip3
+    } yield (CETSignatures(msgs.zip(sigs), refundSig), cets)
+  }
+
   /** Creates this party's CETSignatures given the outcomes and their unsigned CETs */
   def createCETSigs(outcomesAndCETs: Vector[OutcomeCETPair]): CETSignatures = {
     val cetSigs = signGivenCETs(outcomesAndCETs)
diff --git a/core/src/main/scala/org/bitcoins/core/util/FutureUtil.scala b/core/src/main/scala/org/bitcoins/core/util/FutureUtil.scala
index e9c528cb66..ce28977959 100644
--- a/core/src/main/scala/org/bitcoins/core/util/FutureUtil.scala
+++ b/core/src/main/scala/org/bitcoins/core/util/FutureUtil.scala
@@ -103,9 +103,24 @@ object FutureUtil {
       elements: Vector[T],
       f: Vector[T] => Future[U],
       batchSize: Int)(implicit ec: ExecutionContext): Future[Vector[U]] = {
+    require(batchSize > 0, s"Cannot have batch size 0 or less, got=$batchSize")
     val batches = elements.grouped(batchSize).toVector
     val execute: Vector[Future[U]] = batches.map(b => f(b))
     val doneF = Future.sequence(execute)
     doneF
   }
+
+  /** Same as [[batchAndParallelExecute()]], but computes the batchSize based on the
+    * number of available processors on your machine
+    */
+  def batchAndParallelExecute[T, U](
+      elements: Vector[T],
+      f: Vector[T] => Future[U])(implicit
+      ec: ExecutionContext): Future[Vector[U]] = {
+    //divide and conquer
+    val batchSize =
+      Math.max(elements.length / Runtime.getRuntime.availableProcessors(), 1)
+
+    batchAndParallelExecute(elements, f, batchSize)
+  }
 }
diff --git a/testkit-core/src/main/scala/org/bitcoins/testkitcore/dlc/TestDLCClient.scala b/testkit-core/src/main/scala/org/bitcoins/testkitcore/dlc/TestDLCClient.scala
index 5aafa76abe..2183df2b99 100644
--- a/testkit-core/src/main/scala/org/bitcoins/testkitcore/dlc/TestDLCClient.scala
+++ b/testkit-core/src/main/scala/org/bitcoins/testkitcore/dlc/TestDLCClient.scala
@@ -68,9 +68,8 @@ case class TestDLCClient(
       getSigs: Future[(CETSignatures, FundingSignatures)]): Future[SetupDLC] = {
     require(!isInitiator, "You should call setupDLCOffer")
 
-    val (remoteCetSigs, cets) = dlcTxSigner.createCETsAndCETSigs()
-
     for {
+      (remoteCetSigs, cets) <- dlcTxSigner.createCETsAndCETSigsAsync()
       _ <- sendSigs(remoteCetSigs)
       (cetSigs, fundingSigs) <- getSigs
       setupDLC <- Future.fromTry {