diff --git a/plonky2/src/fri/mod.rs b/plonky2/src/fri/mod.rs
index a0cd428b..c491f8f0 100644
--- a/plonky2/src/fri/mod.rs
+++ b/plonky2/src/fri/mod.rs
@@ -30,6 +30,20 @@ impl FriConfig {
     pub fn rate(&self) -> f64 {
         1.0 / ((1 << self.rate_bits) as f64)
     }
+
+    pub fn fri_params(&self, degree_bits: usize, hiding: bool) -> FriParams {
+        let reduction_arity_bits = self.reduction_strategy.reduction_arity_bits(
+            degree_bits,
+            self.rate_bits,
+            self.num_query_rounds,
+        );
+        FriParams {
+            config: self.clone(),
+            hiding,
+            degree_bits,
+            reduction_arity_bits,
+        }
+    }
 }
 
 /// FRI parameters, including generated parameters which are specific to an instance size, in
diff --git a/plonky2/src/fri/recursive_verifier.rs b/plonky2/src/fri/recursive_verifier.rs
index f51b8fe6..9b619ea8 100644
--- a/plonky2/src/fri/recursive_verifier.rs
+++ b/plonky2/src/fri/recursive_verifier.rs
@@ -398,7 +398,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
                 "A non-negligible portion of field elements are in the range that permits non-canonical encodings. Need to do more analysis or enforce canonical encodings.");
     }
 
-    pub(crate) fn add_virtual_fri_proof(
+    pub fn add_virtual_fri_proof(
         &mut self,
         num_leaves_per_oracle: &[usize],
         params: &FriParams,
diff --git a/plonky2/src/plonk/circuit_builder.rs b/plonky2/src/plonk/circuit_builder.rs
index cf89bf1a..e1536b3a 100644
--- a/plonky2/src/plonk/circuit_builder.rs
+++ b/plonky2/src/plonk/circuit_builder.rs
@@ -393,18 +393,9 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
     }
 
     fn fri_params(&self, degree_bits: usize) -> FriParams {
-        let fri_config = &self.config.fri_config;
-        let reduction_arity_bits = fri_config.reduction_strategy.reduction_arity_bits(
-            degree_bits,
-            fri_config.rate_bits,
-            fri_config.num_query_rounds,
-        );
-        FriParams {
-            config: fri_config.clone(),
-            hiding: self.config.zero_knowledge,
-            degree_bits,
-            reduction_arity_bits,
-        }
+        self.config
+            .fri_config
+            .fri_params(degree_bits, self.config.zero_knowledge)
     }
 
     /// The number of (base field) `arithmetic` operations that can be performed in a single gate.
diff --git a/starky/src/proof.rs b/starky/src/proof.rs
index 3e01621f..c505a59b 100644
--- a/starky/src/proof.rs
+++ b/starky/src/proof.rs
@@ -15,6 +15,7 @@ use rayon::prelude::*;
 
 use crate::config::StarkConfig;
 
+// TODO: Permutation polynomials.
 pub struct StarkProof<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize> {
     /// Merkle cap of LDEs of trace values.
     pub trace_cap: MerkleCap<F, C::Hasher>,
diff --git a/starky/src/prover.rs b/starky/src/prover.rs
index 93e01677..728def18 100644
--- a/starky/src/prover.rs
+++ b/starky/src/prover.rs
@@ -114,7 +114,7 @@ where
     let openings = StarkOpeningSet::new(zeta, g, &trace_commitment, &quotient_commitment);
     challenger.observe_openings(&openings.to_fri_openings());
 
-    // TODO: Add permuation checks
+    // TODO: Add permutation checks
     let initial_merkle_trees = &[&trace_commitment, &quotient_commitment];
     let fri_params = config.fri_params(degree_bits);
 
diff --git a/starky/src/recursive_verifier.rs b/starky/src/recursive_verifier.rs
index e672851c..2ac038d6 100644
--- a/starky/src/recursive_verifier.rs
+++ b/starky/src/recursive_verifier.rs
@@ -9,7 +9,8 @@ use plonky2::util::reducing::ReducingFactorTarget;
 use crate::config::StarkConfig;
 use crate::constraint_consumer::RecursiveConstraintConsumer;
 use crate::proof::{
-    StarkOpeningSetTarget, StarkProofChallengesTarget, StarkProofWithPublicInputsTarget,
+    StarkOpeningSetTarget, StarkProofChallengesTarget, StarkProofTarget,
+    StarkProofWithPublicInputsTarget,
 };
 use crate::stark::Stark;
 use crate::vars::StarkEvaluationTargets;
@@ -153,56 +154,59 @@ fn eval_l_1_and_l_last_recursively<F: RichField + Extendable<D>, const D: usize>
     )
 }
 
-// pub fn add_virtual_proof_with_pis<InnerC: GenericConfig<D, F = F>>(
-//     &mut self,
-//     common_data: &CommonCircuitData<F, InnerC, D>,
-// ) -> ProofWithPublicInputsTarget<D> {
-//     let proof = self.add_virtual_proof(common_data);
-//     let public_inputs = self.add_virtual_targets(common_data.num_public_inputs);
-//     ProofWithPublicInputsTarget {
-//         proof,
-//         public_inputs,
-//     }
-// }
-//
-// fn add_virtual_proof<InnerC: GenericConfig<D, F = F>>(
-//     &mut self,
-//     common_data: &CommonCircuitData<F, InnerC, D>,
-// ) -> ProofTarget<D> {
-//     let config = &common_data.config;
-//     let fri_params = &common_data.fri_params;
-//     let cap_height = fri_params.config.cap_height;
-//
-//     let num_leaves_per_oracle = &[
-//         common_data.num_preprocessed_polys(),
-//         config.num_wires,
-//         common_data.num_zs_partial_products_polys(),
-//         common_data.num_quotient_polys(),
-//     ];
-//
-//     ProofTarget {
-//         wires_cap: self.add_virtual_cap(cap_height),
-//         plonk_zs_partial_products_cap: self.add_virtual_cap(cap_height),
-//         quotient_polys_cap: self.add_virtual_cap(cap_height),
-//         openings: self.add_opening_set(common_data),
-//         opening_proof: self.add_virtual_fri_proof(num_leaves_per_oracle, fri_params),
-//     }
-// }
-//
-// fn add_opening_set<InnerC: GenericConfig<D, F = F>>(
-//     &mut self,
-//     common_data: &CommonCircuitData<F, InnerC, D>,
-// ) -> OpeningSetTarget<D> {
-//     let config = &common_data.config;
-//     let num_challenges = config.num_challenges;
-//     let total_partial_products = num_challenges * common_data.num_partial_products;
-//     OpeningSetTarget {
-//         constants: self.add_virtual_extension_targets(common_data.num_constants),
-//         plonk_sigmas: self.add_virtual_extension_targets(config.num_routed_wires),
-//         wires: self.add_virtual_extension_targets(config.num_wires),
-//         plonk_zs: self.add_virtual_extension_targets(num_challenges),
-//         plonk_zs_right: self.add_virtual_extension_targets(num_challenges),
-//         partial_products: self.add_virtual_extension_targets(total_partial_products),
-//         quotient_polys: self.add_virtual_extension_targets(common_data.num_quotient_polys()),
-//     }
-// }
+pub fn add_virtual_stark_proof_with_pis<
+    F: RichField + Extendable<D>,
+    S: Stark<F, D>,
+    const D: usize,
+>(
+    builder: &mut CircuitBuilder<F, D>,
+    stark: S,
+    config: &StarkConfig,
+    degree_bits: usize,
+) -> StarkProofWithPublicInputsTarget<D> {
+    let proof = add_virtual_stark_proof::<F, S, D>(builder, stark, config, degree_bits);
+    let public_inputs = builder.add_virtual_targets(S::PUBLIC_INPUTS);
+    StarkProofWithPublicInputsTarget {
+        proof,
+        public_inputs,
+    }
+}
+
+pub fn add_virtual_stark_proof<F: RichField + Extendable<D>, S: Stark<F, D>, const D: usize>(
+    builder: &mut CircuitBuilder<F, D>,
+    stark: S,
+    config: &StarkConfig,
+    degree_bits: usize,
+) -> StarkProofTarget<D> {
+    let fri_params = config.fri_config.fri_params(degree_bits, false);
+    let cap_height = fri_params.config.cap_height;
+
+    let num_leaves_per_oracle = &[
+        S::COLUMNS,
+        // TODO: permutation polys
+        stark.quotient_degree_factor() * config.num_challenges,
+    ];
+
+    StarkProofTarget {
+        trace_cap: builder.add_virtual_cap(cap_height),
+        quotient_polys_cap: builder.add_virtual_cap(cap_height),
+        openings: add_stark_opening_set::<F, S, D>(builder, stark, config),
+        opening_proof: builder.add_virtual_fri_proof(num_leaves_per_oracle, &fri_params),
+    }
+}
+
+fn add_stark_opening_set<F: RichField + Extendable<D>, S: Stark<F, D>, const D: usize>(
+    builder: &mut CircuitBuilder<F, D>,
+    stark: S,
+    config: &StarkConfig,
+) -> StarkOpeningSetTarget<D> {
+    let num_challenges = config.num_challenges;
+    StarkOpeningSetTarget {
+        local_values: builder.add_virtual_extension_targets(S::COLUMNS),
+        next_values: builder.add_virtual_extension_targets(S::COLUMNS),
+        permutation_zs: vec![/*TODO*/],
+        permutation_zs_right: vec![/*TODO*/],
+        quotient_polys: builder
+            .add_virtual_extension_targets(stark.quotient_degree_factor() * num_challenges),
+    }
+}