diff --git a/.github/workflows/azure-static-web-apps-witty-grass-02cc39100.yml b/.github/workflows/azure-static-web-apps-witty-grass-02cc39100.yml
index 9eb2ac1..ff279eb 100644
--- a/.github/workflows/azure-static-web-apps-witty-grass-02cc39100.yml
+++ b/.github/workflows/azure-static-web-apps-witty-grass-02cc39100.yml
@@ -12,7 +12,6 @@ on:
 
 jobs:
   build_and_deploy_job:
-    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
     runs-on: ubuntu-latest
     name: Build and Deploy Job
     steps:
diff --git a/components/Cards/FavoritePeople.tsx b/components/Cards/FavoritePeople.tsx
index 50cd792..2557d96 100644
--- a/components/Cards/FavoritePeople.tsx
+++ b/components/Cards/FavoritePeople.tsx
@@ -13,19 +13,24 @@ interface Props {
 const FavoritePeople: React.FC<Props> = ({ className, favPeople }) => {
   return (
     <div className={clsx(className, styles.container)}>
-      <h1>Some of your twitter favorites are...</h1>
+      <h1 style={{ textAlign: "left" }}>
+        Some of our favorite beta testers are...
+      </h1>
       {favPeople.map((item) => (
         <div key={item.id} className={styles.itemContainer}>
-          <div className={styles.profileImageWrapper}>
-            <Image
-              src={item.profile_image_url?.replace("_normal", "") ?? ""}
-              layout="fill"
-              quality={100}
-              className={styles.profileImage}
-              priority
-              alt="user image"
-            />
-          </div>
+          {item.profile_image_url ? (
+            <div className={styles.profileImageWrapper}>
+              <Image
+                src={item.profile_image_url?.replace("_normal", "") ?? ""}
+                layout="fill"
+                quality={100}
+                className={styles.profileImage}
+                priority
+                alt="user image"
+              />
+            </div>
+          ) : null}
+
           <div className={styles.detailContainer}>
             <p>{item.name}</p>
             <p>@{item.username}</p>
diff --git a/components/DataLayer.tsx b/components/DataLayer.tsx
index 4ee9090..375a9db 100644
--- a/components/DataLayer.tsx
+++ b/components/DataLayer.tsx
@@ -37,27 +37,27 @@ export const DataLayerProvider: React.FC<DataLayerProviderType> = ({
   const router = useRouter();
   const [data, setData] = useState<DataLayerType | undefined>(undefined);
 
-  useEffect(() => {
-    const localStorageData = localStorage.getItem("wrapped_data");
+  // useEffect(() => {
+  //   const localStorageData = localStorage.getItem("wrapped_data");
 
-    try {
-      if (localStorageData) {
-        setData(JSON.parse(localStorageData));
-      }
-    } catch (err) {
-      // failed to parse data
-    }
-  }, []);
+  //   try {
+  //     if (localStorageData) {
+  //       setData(JSON.parse(localStorageData));
+  //     }
+  //   } catch (err) {
+  //     // failed to parse data
+  //   }
+  // }, []);
 
-  useEffect(() => {
-    if (data && data.twitterReport && doItOnce.current) {
-      localStorage.setItem("wrapped_data", JSON.stringify(data));
-      router.push("/wrapped");
-      doItOnce.current = false;
-    } else if (data?.error) {
-      router.push("/error");
-    }
-  }, [data, router]);
+  // useEffect(() => {
+  //   if (data && data.twitterReport && doItOnce.current) {
+  //     localStorage.setItem("wrapped_data", JSON.stringify(data));
+  //     router.push("/wrapped");
+  //     doItOnce.current = false;
+  //   } else if (data?.error) {
+  //     router.push("/error");
+  //   }
+  // }, [data, router]);
 
   return (
     <DataLayerContext.Provider value={[data, setData]}>
diff --git a/components/TwitterWrappedWrapped.tsx b/components/TwitterWrappedWrapped.tsx
new file mode 100644
index 0000000..f898599
--- /dev/null
+++ b/components/TwitterWrappedWrapped.tsx
@@ -0,0 +1,261 @@
+import { FC, useMemo, useRef } from "react";
+import { UserV2 } from "twitter-api-v2";
+import styles from "../styles/Wrapper.module.scss";
+import BigNumberCard from "./Cards/BigNumberCard";
+import FavoritePeople from "./Cards/FavoritePeople";
+import TextCard from "./Cards/TextCard";
+import Twemoji from "./Twemoji";
+
+const ParaTextWithEmoji = ({
+  text,
+  emoji,
+}: {
+  text: string;
+  emoji: string;
+}) => {
+  return (
+    <p key={0}>
+      {text}
+      <span
+        style={{
+          verticalAlign: "middle",
+          display: "inline-flex",
+          alignItems: "center",
+          justifyContent: "center",
+          marginLeft: "4px",
+        }}
+      >
+        <Twemoji emoji={emoji} width={20} height={20} />
+      </span>
+    </p>
+  );
+};
+
+const favPeople: UserV2[] = [
+  {
+    id: "nitro",
+    name: "Nirupama Singh",
+    username: "nitropumaa",
+  },
+  {
+    id: "adi",
+    name: "Aditya Oberai",
+    username: "adityaoberai1",
+  },
+  {
+    id: "raghav",
+    name: "Raghav Agarwal",
+    username: "raghav1687",
+  },
+  {
+    id: "ranjit",
+    name: "Ranjit",
+    username: "ranjitzade",
+  },
+  {
+    id: "harsh",
+    name: "Harsh Suryan",
+    username: "hksuryan",
+  },
+  {
+    id: "mitra",
+    name: "Haimantika Mitra",
+    username: "HaimantikaM",
+  },
+  {
+    id: "Shlokzz",
+    name: "Shloka",
+    username: "shlokasspam",
+  },
+];
+
+const favPeople2: UserV2[] = [
+  {
+    id: "darshan",
+    name: "Darshan",
+    username: "SirusTweets",
+  },
+  {
+    id: "Shrankhla",
+    name: "Shrankhla Srivastava",
+    username: "shrankhla3",
+  },
+  {
+    id: "sree",
+    name: "Sreekaran",
+    username: "skxrxn",
+  },
+  {
+    id: "otc",
+    name: "Our Tech Community",
+    username: "OurTechComm",
+  },
+];
+
+const TwitterWrappedWrapped: FC = () => {
+  // TODO: remove swipe gesture, make it tap gesture instead
+  // TODO: add instagram story sort of indicator
+
+  const array = useMemo(
+    () => [
+      <TextCard
+        key={1}
+        className={styles.card}
+        text={[
+          <ParaTextWithEmoji
+            key={1}
+            text="Last couple of days were fun and nerve wracking at the same time. It was one hell of a ride for me & twitter wrapped."
+            emoji="🫣"
+          />,
+        ]}
+      />,
+      <TextCard
+        key={2}
+        className={styles.card}
+        text={[
+          <ParaTextWithEmoji
+            key={1}
+            text="And with this this ride comes to an end so, how about one last wrapped?"
+            emoji="😍"
+          />,
+        ]}
+      />,
+      <BigNumberCard
+        key={3}
+        className={styles.card}
+        data={[
+          {
+            bigNumber: "20K",
+            text: (
+              <ParaTextWithEmoji
+                text={`the number of times twitter wrapped was opened in first 24 hours.`}
+                emoji="🤩"
+              />
+            ),
+          },
+        ]}
+      />,
+      <BigNumberCard
+        key={4}
+        className={styles.card}
+        data={[
+          {
+            bigNumber: "100K",
+            text: (
+              <ParaTextWithEmoji
+                text={`the number of hits we completed in first 48 hours of the project.`}
+                emoji="😍"
+              />
+            ),
+          },
+        ]}
+      />,
+      <BigNumberCard
+        key={5}
+        className={styles.card}
+        data={[
+          {
+            bigNumber: "227K",
+            text: (
+              <ParaTextWithEmoji
+                text={`the number of hits we completed in first 60 hours of the project. STONKS`}
+                emoji="💯"
+              />
+            ),
+          },
+        ]}
+      />,
+      <BigNumberCard
+        key={6}
+        className={styles.card}
+        data={[
+          {
+            bigNumber: ">150K",
+            text: (
+              <ParaTextWithEmoji
+                text={`that's how many times the wrapped api successfully delivered the twitter wrapped.`}
+                emoji="🥵"
+              />
+            ),
+          },
+        ]}
+      />,
+      <BigNumberCard
+        key={7}
+        className={styles.card}
+        data={[
+          {
+            bigNumber: "23K",
+            text: (
+              <ParaTextWithEmoji
+                text={`the number of times the wrapped API errored out in last 60 hours`}
+                emoji="💀"
+              />
+            ),
+          },
+        ]}
+      />,
+      <BigNumberCard
+        key={8}
+        className={styles.card}
+        data={[
+          {
+            bigNumber: ">10,000,000",
+            text: (
+              <ParaTextWithEmoji
+                text={`that's the number of tweets that were fetched during the 60 hour run of twitter wrapped.`}
+                emoji="🤯"
+              />
+            ),
+          },
+        ]}
+      />,
+      <TextCard
+        key={99}
+        className={styles.card}
+        text={[
+          <ParaTextWithEmoji
+            key={0}
+            text="but you all know how some people are always way more special than others right?"
+            emoji="🥰"
+          />,
+        ]}
+      />,
+      <FavoritePeople key={4} className={styles.card} favPeople={favPeople} />,
+      <FavoritePeople key={4} className={styles.card} favPeople={favPeople2} />,
+      <TextCard
+        key={108}
+        className={styles.card}
+        text={[
+          "Thank you all for your love & support <3",
+          <ParaTextWithEmoji
+            key={0}
+            text="And well that's all for this time around, see you next year? "
+            emoji="🫣"
+          />,
+        ]}
+      />,
+    ],
+    []
+  );
+
+  return (
+    <>
+      <div className={styles.border}>
+        <div className={styles.container}>{array}</div>
+      </div>
+      <div className={styles.keepSwiping}>
+        <h3>keep swiping to continue...</h3>
+      </div>
+      <div
+        className="sign"
+        style={{ marginTop: "2rem", marginBottom: "0.75rem" }}
+      >
+        crafted with ❤️ by{" "}
+        <a href="https://twitter.com/0xSaurabh">@0xSaurabh</a>
+      </div>
+    </>
+  );
+};
+
+export default TwitterWrappedWrapped;
diff --git a/pages/error.tsx b/pages/error.tsx
index ab95015..fa9f883 100644
--- a/pages/error.tsx
+++ b/pages/error.tsx
@@ -1,3 +1,4 @@
+import { GetServerSideProps } from "next";
 import Head from "next/head";
 import ErrorScreen from "../components/ErrorScreen";
 
@@ -12,4 +13,8 @@ const ErrorView = () => {
   );
 };
 
+export const getServerSideProps: GetServerSideProps = async () => {
+  return { redirect: { destination: "/", permanent: true } };
+};
+
 export default ErrorView;
diff --git a/pages/index.tsx b/pages/index.tsx
index 359e1ce..00e7ccd 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -1,50 +1,73 @@
-import type { NextPage } from "next";
+// import type { NextPage } from "next";
+// import Head from "next/head";
+// import Image from "next/image";
+// import Link from "next/link";
+
+// import styles from "../styles/Home.module.scss";
+// import logoStyles from "../styles/Logo.module.scss";
+// import TwitterLogo from "../assets/svg/twitter_white.svg";
+// import TwitterWrappedWrapped from "../components/TwitterWrappedWrapped";
+
+// const Home: NextPage = () => {
+//   return (
+//     <div>
+//       <Head>
+//         <title>Twitter Wrapped</title>
+//         <meta name="description" content="Twitter wrapped" />
+//       </Head>
+
+//       <div className={styles.container}>
+//         <div className={logoStyles.banner}>
+//           <h1>Twitter</h1>
+//           <h1>Wrapped</h1>
+//         </div>
+
+//         <Link href="/loading" passHref>
+//           <button className={styles.continue}>
+//             <div className={styles.twitterLogo}>
+//               <Image
+//                 src={TwitterLogo}
+//                 alt="twitter logo"
+//                 width={24}
+//                 height={24}
+//                 priority
+//               />
+//             </div>
+//             Sign in with twitter
+//           </button>
+//         </Link>
+//         <div className="sign" style={{ marginTop: "2rem" }}>
+//           crafted with ❤️ by{" "}
+//           <a
+//             href="https://twitter.com/0xSaurabh"
+//             target="_blank"
+//             rel="noopener noreferrer"
+//           >
+//             @0xSaurabh
+//           </a>
+//         </div>
+//       </div>
+//     </div>
+//   );
+// };
+
+// export default Home;
+
 import Head from "next/head";
-import Image from "next/image";
-import Link from "next/link";
+import { NextPage } from "next";
 
-import styles from "../styles/Home.module.scss";
-import logoStyles from "../styles/Logo.module.scss";
-import TwitterLogo from "../assets/svg/twitter_white.svg";
+import styles from "../styles/Wrapped.module.scss";
+import useDataLayer from "../components/DataLayer";
+import TwitterWrappedWrapped from "../components/TwitterWrappedWrapped";
 
 const Home: NextPage = () => {
   return (
     <div>
       <Head>
-        <title>Twitter Wrapped</title>
-        <meta name="description" content="Twitter wrapped" />
+        <title>Your Wrapped</title>
       </Head>
-
       <div className={styles.container}>
-        <div className={logoStyles.banner}>
-          <h1>Twitter</h1>
-          <h1>Wrapped</h1>
-        </div>
-
-        <Link href="/loading" passHref>
-          <button className={styles.continue}>
-            <div className={styles.twitterLogo}>
-              <Image
-                src={TwitterLogo}
-                alt="twitter logo"
-                width={24}
-                height={24}
-                priority
-              />
-            </div>
-            Sign in with twitter
-          </button>
-        </Link>
-        <div className="sign" style={{ marginTop: "2rem" }}>
-          crafted with ❤️ by{" "}
-          <a
-            href="https://twitter.com/0xSaurabh"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            @0xSaurabh
-          </a>
-        </div>
+        <TwitterWrappedWrapped />
       </div>
     </div>
   );
diff --git a/pages/loading.tsx b/pages/loading.tsx
index 5b2c616..0c117ff 100644
--- a/pages/loading.tsx
+++ b/pages/loading.tsx
@@ -13,30 +13,30 @@ interface PropType {
   authCode?: string;
 }
 
-async function getWrapped(authCode: string) {
-  const res = await fetch(url + "/api/wrapped", {
-    method: "POST",
-    body: JSON.stringify({ authCode }),
-  });
-  const data = await res.json();
-
-  return data;
-}
+// async function getWrapped(authCode: string) {
+//   const res = await fetch(url + "/api/wrapped", {
+//     method: "POST",
+//     body: JSON.stringify({ authCode }),
+//   });
+//   const data = await res.json();
+
+//   return data;
+// }
 
 const Wrapped: NextPage<PropType> = (props: PropType) => {
   const [_, setData] = useDataLayer();
 
-  useEffect(() => {
-    if (props.authCode) {
-      getWrapped(props.authCode)
-        .then((data) => {
-          setData({ twitterReport: data });
-        })
-        .catch((err) => setData({ error: err }));
-    } else {
-      window.location.href = createTwitterOAuthLink();
-    }
-  }, [props.authCode, setData]);
+  // useEffect(() => {
+  //   if (props.authCode) {
+  //     getWrapped(props.authCode)
+  //       .then((data) => {
+  //         setData({ twitterReport: data });
+  //       })
+  //       .catch((err) => setData({ error: err }));
+  //   } else {
+  //     window.location.href = createTwitterOAuthLink();
+  //   }
+  // }, [props.authCode, setData]);
 
   return (
     <div>
@@ -51,11 +51,13 @@ const Wrapped: NextPage<PropType> = (props: PropType) => {
 export const getServerSideProps: GetServerSideProps = async (
   ctx: GetServerSidePropsContext
 ) => {
-  if (typeof ctx.query.code === "string") {
-    return { props: { authCode: ctx.query.code } };
-  }
+  return { redirect: { destination: "/", permanent: true } };
+
+  // if (typeof ctx.query.code === "string") {
+  //   return { props: { authCode: ctx.query.code } };
+  // }
 
-  return { props: {} };
+  // return { props: {} };
 };
 
 export default Wrapped;
diff --git a/pages/wrapped.tsx b/pages/wrapped.tsx
index df85836..b9d54dc 100644
--- a/pages/wrapped.tsx
+++ b/pages/wrapped.tsx
@@ -5,6 +5,7 @@ import Wrapper from "../components/Wrapper";
 import styles from "../styles/Wrapped.module.scss";
 import useDataLayer from "../components/DataLayer";
 import ErrorScreen from "../components/ErrorScreen";
+import TwitterWrappedWrapped from "../components/TwitterWrappedWrapped";
 
 const Wrapped: NextPage = () => {
   const [data] = useDataLayer();
@@ -20,9 +21,14 @@ const Wrapped: NextPage = () => {
         ) : (
           <ErrorScreen />
         )}
+        <TwitterWrappedWrapped />
       </div>
     </div>
   );
 };
 
+export const getServerSideProps: GetServerSideProps = async () => {
+  return { redirect: { destination: "/", permanent: true } };
+};
+
 export default Wrapped;
diff --git a/styles/Cards/FavoritePeople.module.scss b/styles/Cards/FavoritePeople.module.scss
index afc3705..a62a483 100644
--- a/styles/Cards/FavoritePeople.module.scss
+++ b/styles/Cards/FavoritePeople.module.scss
@@ -5,7 +5,8 @@
 
   h1 {
     font-size: 1.25rem !important;
-    text-align: center !important;
+    // text-align: center !important;
+    margin: 0 1rem;
 
     padding-bottom: 2rem;
   }