diff --git a/starter-code/index.html b/starter-code/index.html
index 189a3311..89f6ce9d 100755
--- a/starter-code/index.html
+++ b/starter-code/index.html
@@ -26,10 +26,10 @@ <h1>Pizza Builder</h1>
           <button class="btn btn-green-peppers active">Green peppers</button>
         </li>
         <li>
-          <button class="btn btn-sauce active">White sauce</button>
+          <button class="btn btn-sauce">White sauce</button>
         </li>
         <li>
-          <button class="btn btn-crust active">Gluten-free crust</button>
+          <button class="btn btn-crust">Gluten-free crust</button>
         </li>
       </ul>
     </div>
@@ -268,9 +268,9 @@ <h2>Your pizza's price</h2>
       <section class="pep thirty-one">31</section>
       <section class="pep thirty-three">33</section>
 
-      <section class="crust crust-gluten-free">
+      <section class="crust">
         <section class="cheese"></section>
-        <section class="sauce sauce-white"></section>
+        <section class="sauce"></section>
       </section>
     </div>
     <!-- End Pizza -->
diff --git a/starter-code/pizza.js b/starter-code/pizza.js
index b473d048..251bcda8 100755
--- a/starter-code/pizza.js
+++ b/starter-code/pizza.js
@@ -1 +1,95 @@
 // Write your Pizza Builder JavaScript in this file.
+
+$(document).ready(function() {
+
+    $(".price li:contains(white sauce)").hide();
+    $(".price li:contains(gluten-free crust)").hide();
+    
+    calculatePrice();
+
+    $(".btn-pepperonni").click(function() {
+      if ($(this).hasClass("active")) {
+        $(".pep").hide();
+        $(this).removeClass("active");
+        $(".price li:contains(pepperonni)").hide();
+      } else {
+        $(".pep").show();
+        $(this).addClass("active");
+        $(".price li:contains(pepperonni)").show();
+      }
+    });
+
+    $(".btn-mushrooms").click(function() {
+      if ($(this).hasClass("active")) {
+        $(".mushroom").hide();
+        $(this).removeClass("active");
+        $(".price li:contains(mushrooms)").hide();
+      } else {
+        $(".mushroom").show();
+        $(this).addClass("active");
+        $(".price li:contains(mushrooms)").show();
+      }
+    });
+
+    $(".btn-green-peppers").click(function() {
+      if ($(this).hasClass("active")) {
+        $(".green-pepper").hide();
+        $(this).removeClass("active");
+        $(".price li:contains(green peppers)").hide();
+      } else {
+        $(".green-pepper").show();
+        $(this).addClass("active");
+        $(".price li:contains(green peppers)").show();
+      }
+    });
+
+
+    $(".btn-sauce").click(function() {
+      if ($(this).hasClass("active")) {
+        $(".sauce").removeClass("sauce-white");
+        $(this).removeClass("active");
+        $(".price li:contains(white sauce)").hide();
+      } else {
+        $(".sauce").addClass("sauce-white");
+        $(this).addClass("active");
+        $(".price li:contains(white sauce)").show();
+      }
+    });
+
+
+    $(".btn-crust").click(function() {
+      if ($(this).hasClass("active")) {
+        $(".crust").removeClass("crust-gluten-free");
+        $(this).removeClass("active");
+        $(".price li:contains(gluten-free crust)").hide();
+      } else {
+        $(".crust").addClass("crust-gluten-free");
+        $(this).addClass("active");
+        $(".price li:contains(gluten-free crust)").show();
+      }
+    });
+  
+    $("button").click(function() {
+      calculatePrice();
+    });
+    });
+  
+    function calculatePrice() {
+     let totalToppingPrice = 0;
+     $(".price ul li").each(function(index) {
+      if ($(this).css("display") !== "none") {
+        const price = +$(this)
+          .text()
+          .replace(/[^0-9]/gi, "");
+        totalToppingPrice = totalToppingPrice + price;
+      }
+    });
+  
+    let basePrice = +$(".price b")
+      .text()
+      .replace(/[^0-9]/gi, "");
+  
+    let totalPrice = totalToppingPrice + basePrice;
+  
+    $(".price strong").text("$" + totalPrice);
+  }
\ No newline at end of file