diff --git a/src/components/FAQAccordion.svelte b/src/components/FAQAccordion.svelte
index a4d5669..34ed63a 100644
--- a/src/components/FAQAccordion.svelte
+++ b/src/components/FAQAccordion.svelte
@@ -1,12 +1,68 @@
 <script>
-	import { slide } from 'svelte/transition';
-	let isOpen = false;
-	export let entry;
-	const { title, description } = entry;
-	const toggle = () => (isOpen = !isOpen);
+	// import { slide } from 'svelte/transition';
+	import { Accordion } from '@skeletonlabs/skeleton-svelte';
+
+	// FAQ closed by default
+	let isOpen = $state(false);
+	// const toggle = () => (isOpen = !isOpen);
+
+	// Variable to be included into the component
+	let { /** @type {String} */ entries } = $props();
 </script>
 
-<div class="accordion-wrapper w-[500px]">
+<Accordion classes="w-[500px] max-w-[500px] transition-all ease-in-out" multiple>
+	{#snippet iconClosed()}
+		<svg
+			width="20"
+			height="20"
+			fill="none"
+			stroke-linecap="round"
+			stroke-linejoin="round"
+			stroke-width="2"
+			viewBox="0 0 24 24"
+			stroke="currentColor"
+			><path d="M9 5l7 7-7 7" />
+		</svg>
+	{/snippet}
+	{#snippet iconOpen()}
+		<svg
+			class="rotate-90"
+			width="20"
+			height="20"
+			fill="none"
+			stroke-linecap="round"
+			stroke-linejoin="round"
+			stroke-width="2"
+			viewBox="0 0 24 24"
+			stroke="currentColor"
+			><path d="M9 5l7 7-7 7" />
+		</svg>
+	{/snippet}
+	
+	{#each entries as entry, index}
+		<Accordion.Item
+			value={index.toString()}
+			classes="border-ecsess-200 mb-4 overflow-hidden rounded-xl border-2"
+			leadClasses="text-xl font-bold"
+			controlClasses="hover:bg-ecsess-black-hover
+            flex w-inherit cursor-pointer items-center justify-between
+            py-4 transition-colors ease-in-out"
+			panelClasses=" border-t-ecsess-200 max-h-fit border-t-2 bg-transparent p-4 bg-ecsess-400"
+		>
+			<!-- Control -->
+			{#snippet lead()}
+				{entry.question}
+			{/snippet}
+			{#snippet control()}{/snippet}
+
+			<!-- Panel -->
+			{#snippet panel()}{entry.answer}{/snippet}
+		</Accordion.Item>
+	{/each}
+</Accordion>
+
+<!-- 
+<div class="accordion-wrapper w-full max-w-[500px]">
 	<div
 		class="accordion-item
     border-ecsess-200 mb-4 overflow-hidden rounded-xl border-2
@@ -16,12 +72,12 @@
 			class="accordion-header hover:bg-ecsess-black-hover
             flex h-16 w-full cursor-pointer items-center justify-between
             px-4 transition-colors ease-in-out"
-			on:click={toggle}
+			onclick={toggle}
 			aria-expanded={isOpen}
 		>
-			<span class="font-bold text-xl">{title}</span>
+			<span class="text-xl font-bold">{question}</span>
 			<svg
-				class="accordion-icon transform-cpu ease-in-out transition-all"
+				class="accordion-icon transform-cpu transition-all ease-in-out"
 				width="20"
 				height="20"
 				fill="none"
@@ -36,14 +92,17 @@
 		</button>
 
 		{#if isOpen}
-			<div class="accordion-content max-h-fit border-t-2 border-t-ecsess-200 p-4 bg-transparent transition-all ease-in" transition:slide={{ duration: 300 }}>
-				<p>{@html description}</p>
+			<div
+				class="accordion-content border-t-ecsess-200 max-h-fit border-t-2 bg-transparent p-4 transition-all ease-in"
+				transition:slide={{ duration: 300 }}
+			>
+				<p>{answer}</p>
 			</div>
 		{/if}
 	</div>
-</div>
+</div> -->
 
-<style>
+<!-- <style>
 	[aria-expanded='true'] .accordion-icon {
 		transform: rotate(90deg);
 	}
@@ -52,4 +111,4 @@
 	.accordion-item.open .accordion-content {
 		background-color: var(--color-ecsess-black-hover);
 	}
-</style>
+</style> -->
diff --git a/src/routes/+page.server.js b/src/routes/+page.server.js
index 23207c0..97378eb 100644
--- a/src/routes/+page.server.js
+++ b/src/routes/+page.server.js
@@ -2,7 +2,8 @@ import { getFromCMS } from 'utils/utils.js';
 
 const homepageQuery = `*[_type == "homepage"]{
 	"description": description[],
-	"councilPhoto": councilPhoto.asset->url
+	"councilPhoto": councilPhoto.asset->url,
+	"faqs": faqs[]{ question, answer },
 }[0]`;
 
 const ohQuery = `*[_type=="oh"].schedule[]{
@@ -13,12 +14,26 @@ const ohQuery = `*[_type=="oh"].schedule[]{
 }`;
 
 export const load = async () => {
+	/**
+	 * @description Response data type based on the `homepageQuery` above.
+	 * Note that `description` is a rich/portable text type
+	 *
+	 * @type {{
+	 * 	description: import('@portabletext/svelte').InputValue,
+	 *  councilPhoto: string,
+	 * 	faqs: [{
+	 * 		question: string,
+	 * 		answer: string
+	 * 		}],
+	 * }}
+	 *
+	 */
 	let CMSresponse = await getFromCMS(homepageQuery);
 
 	return {
 		description: CMSresponse.description,
-		councilPhoto: CMSresponse.councilPhoto
+		councilPhoto: CMSresponse.councilPhoto,
+		faqs: CMSresponse.faqs
 		// ohs: await getFromCMS(ohQuery),
-		// FAQs: "",
 	};
 };
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index eb0d88d..e2c54cf 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -5,25 +5,6 @@
 
 	/** loading things from the server side */
 	let { data } = $props();
-
-	// Getting info from ECSESS CMS
-	let longAnswer =
-		'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.';
-
-	const faqs = [
-		{
-			q: 'A fequently asked question?',
-			a: 'This is a short answer'
-		},
-		{
-			q: 'A fequently asked question?',
-			a: 'This is a medium length answer. Lor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.'
-		},
-		{
-			q: 'A fequently asked question?',
-			a: 'This is a long answer. ' + longAnswer
-		}
-	];
 </script>
 
 <title> McGill ECSESS </title>
@@ -46,9 +27,7 @@
 	</div>
 	<div>
 		<h1>FAQ</h1>
-		{#each faqs as { q, a }}
-			<FaqAccordion entry={{ title: q, description: a }} />
-		{/each}
+		<FaqAccordion entries={data.faqs} />
 	</div>
 </Section>
 <!-- Office Hours Calendar -->