diff --git a/web/src/components/things/SectionList.astro b/web/src/components/things/SectionList.astro
new file mode 100644
index 0000000..4630f1f
--- /dev/null
+++ b/web/src/components/things/SectionList.astro
@@ -0,0 +1,73 @@
+---
+
+import { slugify } from '../../utils/fetch-data';
+
+import type { Section } from '../../types/Service';
+
+interface Props {
+	title: string;
+	sections: Section[];
+  bigTitle?: boolean;
+}
+
+const { title, sections, bigTitle } = Astro.props;
+
+---
+
+{ bigTitle ?
+  <h2>{title}</h2> :
+  <a class="category-title" href={`/${slugify(title)}`}><h3>{title}</h3></a>
+}
+
+<ul>
+  {sections.map((section) => (
+    <li>
+      <a href={`/${slugify(title)}/${slugify(section.name)}`}>
+        <span>{section.name}</span> 
+        <span class="service-count">({section.services ? section.services.length : 0})</span>
+      </a>
+    </li>
+  ))}
+</ul>
+
+
+<style lang="scss">
+
+h2 {
+  font-family: "Lekton", sans-serif;
+  font-size: 2rem;
+  margin: -2rem 0 2rem -2rem;
+  box-shadow: 6px 6px 0 var(--foreground);
+  background: var(--accent);
+  color: var(--accent-fg);
+  width: fit-content;
+  padding: 0.25rem 0.5rem;
+}
+
+.category-title {
+  text-decoration: none;
+  color: var(--foreground);
+  h3 {
+    font-family: "Lekton", sans-serif;
+    font-weight: bold;
+    margin: 0;
+    font-size: 1.8rem;
+  }
+}
+
+ul {
+  list-style: circle;
+  padding-left: 1rem;
+  li {
+    margin: 0.5rem 0;
+    font-size: 1.25rem;
+    a {
+      text-decoration: none;
+      color: var(--foreground);
+    }
+    .service-count {
+      color: var(--accent-3);
+    }
+  }
+}
+</style>
diff --git a/web/src/components/things/ServiceList.astro b/web/src/components/things/ServiceList.astro
new file mode 100644
index 0000000..9b06248
--- /dev/null
+++ b/web/src/components/things/ServiceList.astro
@@ -0,0 +1,111 @@
+---
+
+import Button from '@components/form/Button.astro';
+import { parseMarkdown, formatLink } from '@utils/parse-markdown';
+import type { Service } from 'src/types/Service';
+
+const { title, services, subHeading, buttonLink } = Astro.props;
+
+---
+
+
+<section>
+  {services ? (
+    <ul>
+    {services.map((service: Service) => (
+      <li>
+        <div class="service-head">
+          <img src={service.icon || `https://icon.horse/icon/${formatLink(service.url)}`}
+            width="24" height="24" alt="icon" loading="lazy" decoding="async" />
+          {subHeading ? <h4>{service.name}</h4> : <h3>{service.name}</h3>}
+          {service.followWith && <p class="follow-with">({service.followWith})</p> }
+          <a class="service-link" href={service.url}>{formatLink(service.url)}</a>
+        </div>
+        <div class="service-body">
+          <p set:html={parseMarkdown(service.description)}></p>
+        </div>
+      </li>
+    ))}
+    </ul>
+  ) : (
+    <p class="nothing-yet">
+      <strong>⚠️ This section is still a work in progress ⚠️</strong><br />
+      Check back soon, or help us complete it by submiting a pull request on GitHub.
+    </p>
+  )}
+
+  {buttonLink && ( <Button text="View All" url={buttonLink} /> )}
+</section>
+
+
+<style lang="scss">
+
+  section {
+    padding: 1rem 0;
+    position: relative;
+    &:not(:last-child) {
+      border-bottom: 2px solid var(--accent-3);
+    }
+  }
+  
+  .nothing-yet {
+    font-size: 1.4rem;
+    opacity: 0.8;
+    font-style: italic;
+    text-align: center;
+    margin-bottom: 3rem;
+  }
+  
+  ul {
+    list-style: none;
+    padding: 0;
+    margin: 0 0 3rem 0;
+    li {
+      margin-bottom: 1rem;
+      .service-head {
+        display: flex;
+        align-items: center;
+        gap: 0.5rem;
+        h3, h4 {
+          margin: 0;
+          font-size: 1.6rem;
+        }
+        img {
+          border-radius: 4px;
+        }
+        .follow-with {
+          opacity: 0.7;
+          font-style: italic;
+          margin: 0;
+        }
+        .service-link {
+          max-width: 300px;
+          text-overflow: ellipsis;
+          overflow: hidden;
+          white-space: nowrap;
+        }
+      }
+  
+      .service-body {
+        margin: 0.5rem 0 2rem;
+        opacity: 0.8;
+        :global(p) {
+          margin: 0;
+          font-size: 1.2rem;
+          :global(a) {
+            color: var(--foregorund);
+          }
+        }
+      }
+    }
+  }
+
+section :global(.button) {
+  width: fit-content;
+  position: absolute;
+  right: 1rem;
+  margin-top: -2.5rem;
+  background: var(--accent-3);
+}
+  
+</style>