diff --git a/src/app/page.tsx b/src/app/page.tsx
index 19b5b2f..fa3b4a0 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -9,6 +9,7 @@ import SocialProofOne from "@/components/sections/socialProof/SocialProofOne";
 import TestimonialCardFifteen from "@/components/sections/testimonial/TestimonialCardFifteen";
 import ContactCTA from "@/components/sections/contact/ContactCTA";
 import FooterLogoEmphasis from "@/components/sections/footer/FooterLogoEmphasis";
+import FaqBase from "@/components/sections/faq/FaqBase";
 import Link from "next/link";
 import {
   Wrench,
@@ -75,10 +76,8 @@ export default function HomePage() {
           buttonAnimation="slide-up"
           background={{ variant: "radial-gradient" }}
           dashboard={{
-            title: "Why Choose Johnson Plumbing",
-            logoIcon: Shield,
-            imageSrc: "http://img.b2bpic.net/free-photo/service-man-adjusting-house-heating-system_1303-26545.jpg",
-            buttons: [
+            title: "Why Choose Johnson Plumbing",            logoIcon: Shield,
+            imageSrc: "http://img.b2bpic.net/free-photo/service-man-adjusting-house-heating-system_1303-26545.jpg",            buttons: [
               { text: "Call", href: "tel:0169323532" },
               { text: "Message", href: "https://wa.me/0169323532" },
             ],
@@ -89,31 +88,21 @@ export default function HomePage() {
             ],
             stats: [
               {
-                title: "Response Time",
-                values: ["30min", "45min", "60min"],
-                description: "Fast arrival in Vanderbijlpark area",
-              },
+                title: "Response Time",                values: [30, 45, 60],
+                description: "Fast arrival in Vanderbijlpark area"},
               {
-                title: "Customer Rating",
-                values: ["3.8", "4.2", "4.5"],
-                valueSuffix: "/5",
-                description: "Trusted by 21+ local reviews",
-              },
+                title: "Customer Rating",                values: [3.8, 4.2, 4.5],
+                valueSuffix: "/5",                description: "Trusted by 21+ local reviews"},
               {
-                title: "Insurance Claims",
-                values: ["50+", "100+", "150+"],
-                description: "Assistance on geyser replacements",
-              },
+                title: "Insurance Claims",                values: [50, 100, 150],
+                description: "Assistance on geyser replacements"},
             ],
-            listTitle: "Recent Completions",
-            listItems: [
+            listTitle: "Recent Completions",            listItems: [
               { icon: CheckCircle, title: "Geyser Replacement", status: "Completed" },
               { icon: Droplet, title: "Burst Pipe Repair", status: "Completed" },
               { icon: Zap, title: "Emergency Call", status: "Completed" },
             ],
-            searchPlaceholder: "Search services...",
-            chartTitle: "Monthly Service Calls",
-            chartData: [
+            searchPlaceholder: "Search services...",            chartTitle: "Monthly Service Calls",            chartData: [
               { value: 45 },
               { value: 62 },
               { value: 55 },
@@ -136,7 +125,7 @@ export default function HomePage() {
             { value: "20+", title: "Years of Local Service" },
             { value: "3.8★", title: "Customer Rating on Google" },
           ]}
-          imageSrc="http://img.b2bpic.net/free-photo/portrait-happy-auto-repairman-looking-camera-while-his-customers-are-standing-background_637285-7790.jpg?_wi=1"
+          imageSrc="http://img.b2bpic.net/free-photo/portrait-happy-auto-repairman-looking-camera-while-his-customers-are-standing-background_637285-7790.jpg"
           imageAlt="Johnson Plumbing professional team"
           mediaAnimation="slide-up"
           metricsAnimation="slide-up"
@@ -155,15 +144,7 @@ export default function HomePage() {
           textboxLayout="default"
           useInvertedBackground={false}
           names={[
-            "Vanderbijlpark Homeowners",
-            "Insurance Companies",
-            "Property Managers",
-            "Complex Maintenance",
-            "Local Businesses",
-            "Vereeniging Residents",
-            "Sasolburg Communities",
-            "Vaal Triangle Districts",
-          ]}
+            "Vanderbijlpark Homeowners",            "Insurance Companies",            "Property Managers",            "Complex Maintenance",            "Local Businesses",            "Vereeniging Residents",            "Sasolburg Communities",            "Vaal Triangle Districts"]}
           speed={40}
           showCard={true}
         />
@@ -177,21 +158,13 @@ export default function HomePage() {
           author="Maria van der Merwe, Homeowner"
           avatars={[
             {
-              src: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg",
-              alt: "Customer 1",
-            },
+              src: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg",              alt: "Customer 1"},
             {
-              src: "http://img.b2bpic.net/free-photo/smiling-man-sitting-cafe-table-gesturing_1262-1141.jpg",
-              alt: "Customer 2",
-            },
+              src: "http://img.b2bpic.net/free-photo/smiling-man-sitting-cafe-table-gesturing_1262-1141.jpg",              alt: "Customer 2"},
             {
-              src: "http://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg",
-              alt: "Customer 3",
-            },
+              src: "http://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg",              alt: "Customer 3"},
             {
-              src: "http://img.b2bpic.net/free-photo/confident-beautiful-young-businesswoman-looking-camera-head-shot-portrait_1163-4928.jpg",
-              alt: "Customer 4",
-            },
+              src: "http://img.b2bpic.net/free-photo/confident-beautiful-young-businesswoman-looking-camera-head-shot-portrait_1163-4928.jpg",              alt: "Customer 4"},
           ]}
           ratingAnimation="slide-up"
           avatarsAnimation="slide-up"
@@ -199,6 +172,36 @@ export default function HomePage() {
         />
       </div>
 
+      {/* FAQ Section */}
+      <div id="faq" data-section="faq" className="mx-auto px-4 md:px-6">
+        <FaqBase
+          title="Frequently Asked Questions"
+          description="Common questions about our plumbing services in Vanderbijlpark and the Vaal Triangle"
+          tag="Help & Support"
+          tagIcon={HelpCircle}
+          tagAnimation="slide-up"
+          textboxLayout="default"
+          useInvertedBackground={false}
+          faqsAnimation="slide-up"
+          animationType="smooth"
+          showCard={true}
+          faqs={[
+            {
+              id: "1",              title: "What areas do you service?",              content: "We service Vanderbijlpark, Vereeniging, Sasolburg, and the surrounding Vaal Triangle areas. For specific addresses, please call us at 016 932 3532 to confirm coverage."},
+            {
+              id: "2",              title: "Are you available for emergency plumbing?",              content: "Yes! We offer 24/7 emergency plumbing services for urgent burst pipes, major leaks, and other critical issues. Call 016 932 3532 for immediate assistance."},
+            {
+              id: "3",              title: "Do you assist with insurance claims?",              content: "Yes, we specialize in insurance claim plumbing work, particularly for geyser replacements. We provide claim documentation and work directly with insurance companies to streamline the process."},
+            {
+              id: "4",              title: "How quickly can you respond?",              content: "Our average response time in Vanderbijlpark is 30-60 minutes for emergency calls. For non-urgent issues, we offer flexible scheduling based on your availability."},
+            {
+              id: "5",              title: "What payment methods do you accept?",              content: "We accept cash, bank transfers, and card payments. For quote requests, we can provide detailed pricing before work begins."},
+            {
+              id: "6",              title: "Do you provide warranties on work?",              content: "Yes, all our plumbing work is backed by professional warranties. We guarantee quality workmanship and stand behind every installation and repair."},
+          ]}
+        />
+      </div>
+
       {/* Contact CTA Section */}
       <div id="contact-cta" data-section="contact-cta" className="mx-auto px-4 md:px-6">
         <ContactCTA
@@ -217,11 +220,6 @@ export default function HomePage() {
         />
       </div>
 
-      {/* FAQ Section */}
-      <div id="faq" data-section="faq" className="mx-auto px-4 md:px-6">
-        {/* FAQ component placeholder - to be added in next iteration */}
-      </div>
-
       {/* Footer */}
       <div id="footer" data-section="footer">
         <FooterLogoEmphasis