diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fd0834200..374b303ad 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -216,7 +216,7 @@ git remote add upstream https://github.com/activist-org/activist.git
 
 6. You can visit <http://localhost:3000/> to see the development frontend once the container is up and running. From there click `View organizations` or `View events` to explore the platform.
 
-7. To view the backend admin UI and Swagger UI, visit <http://localhost:8000/> and <http://localhost:8000/v1/schema/swagger-ui/> respectively.
+7. To view the backend admin UI and Swagger UI, visit <http://localhost:8000/admin> and <http://localhost:8000/v1/schema/swagger-ui/> respectively.
 
 8. If you'd like to sign in to the frontend via <http://localhost:3000/auth/sign-in> or the Django admin panel via <http://localhost:8000/admin>, then you can use the fixtures `admin` user with the password `admin`.
 
@@ -238,11 +238,21 @@ The frontend currently uses [Yarn 1](https://classic.yarnpkg.com/lang/en/docs/in
 # In the root activist directory:
 cd frontend
 yarn install
-yarn run dev
+yarn run dev:local
 ```
 
 You can then visit http://localhost:3000/ to see the development frontend build once the server is up and running.
 
+You can also build the production version locally:
+
+```bash
+# In activist/frontend:
+yarn build:local
+
+# Run the production build:
+node .output/server/index.mjs
+```
+
 </p>
 </details>
 
diff --git a/README.md b/README.md
index 09adb5522..5888ccd9b 100644
--- a/README.md
+++ b/README.md
@@ -196,9 +196,16 @@ git remote add upstream https://github.com/activist-org/activist.git
    # docker compose --env-file .env.dev down
    ```
 
+   Sometimes changes to the database can cause the database population to fail in your environment. If this happens, you can destroy the deployment and rebuild it:
+
+   ```bash
+   # Destroy your current docker-compose deployment:
+   docker-compose rm -f -v --env-file .env.dev
+   ```
+
 6. You can then visit <http://localhost:3000> to see the development frontend build once the container is up and running. From there click `View organizations` or `View events` to explore the platform.
 
-7. To view the backend admin UI and Swagger UI, visit <http://localhost:8000/> and <http://localhost:8000/v1/schema/swagger-ui/> respectively.
+7. To view the backend admin UI and Swagger UI, visit <http://localhost:8000/admin> and <http://localhost:8000/v1/schema/swagger-ui/> respectively.
 
 8. If you'd like to sign in to the frontend via <http://localhost:3000/auth/sign-in> or the Django admin panel via <http://localhost:8000/admin>, then you can use the fixtures `admin` user with the password `admin`.
 
diff --git a/backend/backend/management/commands/populate_db.py b/backend/backend/management/commands/populate_db.py
index 9e0e90d74..f4649a2b8 100644
--- a/backend/backend/management/commands/populate_db.py
+++ b/backend/backend/management/commands/populate_db.py
@@ -10,7 +10,6 @@
 from entities.factories import (
     GroupFactory,
     GroupTextFactory,
-    OrganizationEventFactory,
     OrganizationFactory,
     OrganizationTextFactory,
 )
@@ -60,42 +59,47 @@ def handle(self, *args: str, **options: Unpack[Options]) -> None:
                 UserTopicFactory(user_id=user, topic_id=user_topic)
 
                 for o in range(num_orgs_per_user):
+                    for e in range(num_events_per_org):
+                        event_type = random.choice(["learn", "action"])
+                        event_type_verb = (
+                            "Learning about"
+                            if event_type == "learn"
+                            else "Fighting for"
+                        )
+
+                        event_texts = EventTextFactory(iso="en", primary=True)
+
+                        user_org_event = EventFactory(
+                            name=f"{user_topic.name} Event o{o}:e{e}",
+                            tagline=f"{event_type_verb} {user_topic.name}",
+                            type=event_type,
+                            texts=event_texts,
+                            created_by=user,
+                        )
+
+                    org_texts = OrganizationTextFactory(iso="wt", primary=True)
+
                     user_org = OrganizationFactory(
                         created_by=user,
                         org_name=f"organization_u{u}_o{o}",
+                        texts=org_texts,
                         name=f"{user_topic.name} Organization",
                         tagline=f"Fighting for {user_topic.name.lower()}",
                     )
 
-                    OrganizationTextFactory(org_id=user_org, iso="wt", primary=True)
+                    user_org.events.set([user_org_event])
 
                     for g in range(num_groups_per_org):
-                        user_org_group = GroupFactory(
+                        group_texts = GroupTextFactory(iso="en", primary=True)
+
+                        _ = GroupFactory(
                             created_by=user,
                             group_name=f"group_u{u}_o{o}_g{g}",
                             org_id=user_org,
+                            texts=group_texts,
                             name=f"{user_topic.name} Group",
                         )
 
-                        GroupTextFactory(
-                            group_id=user_org_group, iso="en", primary=True
-                        )
-
-                    for e in range(num_events_per_org):
-                        user_org_event = EventFactory(
-                            created_by=user,
-                            name=f"{user_topic.name} Event o{o}:e{e}",
-                            type=random.choice(["learn", "action"]),
-                        )
-
-                        EventTextFactory(
-                            event_id=user_org_event, iso="en", primary=True
-                        )
-
-                        OrganizationEventFactory(
-                            org_id=user_org, event_id=user_org_event
-                        )
-
             self.stdout.write(
                 self.style.ERROR(
                     f"Number of users created: {num_users}\n"
diff --git a/backend/content/factories.py b/backend/content/factories.py
index 3662fe7cd..3f3a417d5 100644
--- a/backend/content/factories.py
+++ b/backend/content/factories.py
@@ -117,7 +117,7 @@ class Meta:
     created_by = factory.SubFactory("authentication.factories.UserFactory")
     name = factory.Faker("name")
     description = factory.Faker("text")
-    location_id = factory.SubFactory(EntityLocationFactory)
+    location = factory.SubFactory(EntityLocationFactory)
     url = factory.Faker("url")
     is_private = factory.Faker("boolean")
     terms_checked = factory.Faker("boolean")
diff --git a/backend/content/models.py b/backend/content/models.py
index b25b22ee6..688c92c60 100644
--- a/backend/content/models.py
+++ b/backend/content/models.py
@@ -68,7 +68,7 @@ class Resource(models.Model):
     name = models.CharField(max_length=255)
     description = models.TextField(max_length=500)
     category = models.CharField(max_length=255, blank=True)
-    location_id = models.OneToOneField(
+    location = models.OneToOneField(
         "content.Location", on_delete=models.CASCADE, null=False, blank=False
     )
     url = models.URLField(max_length=255)
diff --git a/backend/entities/admin.py b/backend/entities/admin.py
index 75551f558..0f3347b1a 100644
--- a/backend/entities/admin.py
+++ b/backend/entities/admin.py
@@ -62,7 +62,7 @@ class OrganizationAdmin(admin.ModelAdmin[Organization]):
 
 
 class OrganizationTextAdmin(admin.ModelAdmin[OrganizationText]):
-    list_display = ["id", "org_id"]
+    list_display = ["id"]
 
 
 admin.site.register(Group, GroupAdmin)
diff --git a/backend/entities/factories.py b/backend/entities/factories.py
index 974fa064c..559c684a0 100644
--- a/backend/entities/factories.py
+++ b/backend/entities/factories.py
@@ -37,7 +37,7 @@ class Meta:
     terms_checked = factory.Faker("boolean")
     status = factory.SubFactory("entities.factories.StatusTypeFactory", name="Active")
     is_high_risk = factory.Faker("boolean")
-    location_id = factory.SubFactory("content.factories.EntityLocationFactory")
+    location = factory.SubFactory("content.factories.EntityLocationFactory")
     acceptance_date = factory.LazyFunction(
         lambda: datetime.datetime.now(tz=datetime.timezone.utc)
     )
@@ -56,7 +56,7 @@ class Meta:
     )
     terms_checked = factory.Faker("boolean")
     category = factory.Faker("word")
-    location_id = factory.SubFactory("content.factories.EntityLocationFactory")
+    location = factory.SubFactory("content.factories.EntityLocationFactory")
 
 
 # MARK: Bridge Tables
@@ -99,8 +99,7 @@ class GroupTextFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = GroupText
 
-    group_id = factory.SubFactory(GroupFactory)
-    iso = factory.Faker("word")
+    iso = "en"
     primary = factory.Faker("boolean")
     description = factory.Faker(provider="text", locale="la", max_nb_chars=1000)
     get_involved = factory.Faker(provider="text", locale="la")
@@ -186,7 +185,6 @@ class OrganizationTextFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = OrganizationText
 
-    org_id = factory.SubFactory(OrganizationFactory)
     iso = "en"
     primary = factory.Faker("boolean")
     description = factory.Faker(provider="text", locale="la", max_nb_chars=1000)
diff --git a/backend/entities/models.py b/backend/entities/models.py
index a012db902..b18c0baa4 100644
--- a/backend/entities/models.py
+++ b/backend/entities/models.py
@@ -25,7 +25,7 @@ class Organization(models.Model):
     icon_url = models.OneToOneField(
         "content.Image", on_delete=models.CASCADE, blank=True, null=True
     )
-    location_id = models.OneToOneField(
+    location = models.OneToOneField(
         "content.Location", on_delete=models.CASCADE, null=False, blank=False
     )
     get_involved_url = models.URLField(blank=True)
@@ -41,9 +41,11 @@ class Organization(models.Model):
     status_updated = models.DateTimeField(auto_now=True, null=True)
     acceptance_date = models.DateTimeField(blank=True, null=True)
     deletion_date = models.DateTimeField(blank=True, null=True)
-    org_text = models.ForeignKey(
+    texts = models.ForeignKey(
         "OrganizationText", on_delete=models.CASCADE, blank=True, null=True
     )
+    events = models.ManyToManyField("events.Event", blank=True)
+    resources = models.ManyToManyField("content.Resource", blank=True)
 
     def __str__(self) -> str:
         return self.name
@@ -56,13 +58,18 @@ class Group(models.Model):
     group_name = models.CharField(max_length=255)
     name = models.CharField(max_length=255)
     tagline = models.CharField(max_length=255, blank=True)
-    location_id = models.OneToOneField(
+    location = models.OneToOneField(
         "content.Location", on_delete=models.CASCADE, null=False, blank=False
     )
     category = models.CharField(max_length=255)
     get_involved_url = models.URLField(blank=True)
     terms_checked = models.BooleanField(default=False)
     creation_date = models.DateTimeField(auto_now_add=True)
+    texts = models.ForeignKey(
+        "GroupText", on_delete=models.CASCADE, blank=True, null=True
+    )
+    events = models.ManyToManyField("events.Event", blank=True)
+    resources = models.ManyToManyField("content.Resource", blank=True)
 
     def __str__(self) -> str:
         return self.name
@@ -135,7 +142,7 @@ def __str__(self) -> str:
 
 
 class GroupText(models.Model):
-    group_id = models.ForeignKey(Group, on_delete=models.CASCADE)
+    group_id = models.ForeignKey(Group, on_delete=models.CASCADE, null=True)
     iso = models.CharField(max_length=3, choices=ISO_CHOICES)
     primary = models.BooleanField(default=False)
     description = models.TextField(max_length=500)
@@ -243,6 +250,7 @@ def __str__(self) -> str:
 
 
 class OrganizationTask(models.Model):
+    id = models.UUIDField(primary_key=True, default=uuid4, editable=False)
     org_id = models.ForeignKey(Organization, on_delete=models.CASCADE)
     task_id = models.ForeignKey("content.Task", on_delete=models.CASCADE)
     group_id = models.ForeignKey(
@@ -254,7 +262,7 @@ def __str__(self) -> str:
 
 
 class OrganizationText(models.Model):
-    org_id = models.ForeignKey(Organization, on_delete=models.CASCADE)
+    org_id = models.ForeignKey(Organization, on_delete=models.CASCADE, null=True)
     iso = models.CharField(max_length=3, choices=ISO_CHOICES)
     primary = models.BooleanField(default=False)
     description = models.TextField(max_length=2500)
diff --git a/backend/entities/serializers.py b/backend/entities/serializers.py
index 3e18b9a30..00b0f37c5 100644
--- a/backend/entities/serializers.py
+++ b/backend/entities/serializers.py
@@ -6,6 +6,7 @@
 
 from rest_framework import serializers
 
+from content.serializers import LocationSerializer, ResourceSerializer
 from events.serializers import EventSerializer
 
 from .models import (
@@ -38,23 +39,55 @@
 # MARK: Main Tables
 
 
+class GroupTextSerializer(serializers.ModelSerializer[GroupText]):
+    class Meta:
+        model = GroupText
+        fields = "__all__"
+
+
 class GroupSerializer(serializers.ModelSerializer[Group]):
+    texts = GroupTextSerializer()
+    location = LocationSerializer(read_only=True)
+    events = EventSerializer(many=True, read_only=True)
+    resources = ResourceSerializer(many=True, read_only=True)
+
     class Meta:
         model = Group
+        extra_kwargs = {
+            "created_by": {"read_only": True},
+        }
+
         fields = "__all__"
 
+    def validate(self, data: dict[str, Any]) -> dict[str, Any]:
+        if data.get("terms_checked") is False:
+            raise serializers.ValidationError(
+                "You must accept the terms of service to create a group."
+            )
+
+        return data
+
+    def create(self, validated_data: dict[str, Any]) -> Group:
+        group = Group.objects.create(**validated_data)
 
-class OrganizationTextSerializer(serializers.ModelSerializer[OrganizationText]):
-    # mypy thinks a generic type argument is needed for StringRelatedField.
-    org_id = serializers.StringRelatedField(source="org_id.id")  # type: ignore[var-annotated]
+        if group:
+            texts = GroupText.objects.create(group_id=group)
+            group.texts = texts
 
+        return group
+
+
+class OrganizationTextSerializer(serializers.ModelSerializer[OrganizationText]):
     class Meta:
         model = OrganizationText
         fields = "__all__"
 
 
 class OrganizationSerializer(serializers.ModelSerializer[Organization]):
-    org_text = OrganizationTextSerializer(read_only=True)
+    texts = OrganizationTextSerializer()
+    location = LocationSerializer(read_only=True)
+    events = EventSerializer(many=True, read_only=True)
+    resources = ResourceSerializer(many=True, read_only=True)
 
     class Meta:
         model = Organization
@@ -65,22 +98,7 @@ class Meta:
             "acceptance_date": {"read_only": True},
         }
 
-        fields = [
-            "id",
-            "created_by",
-            "org_name",
-            "name",
-            "tagline",
-            "icon_url",
-            "location_id",
-            "get_involved_url",
-            "terms_checked",
-            "is_high_risk",
-            "status",
-            "status_updated",
-            "acceptance_date",
-            "org_text",
-        ]
+        fields = "__all__"
 
     def validate(self, data: dict[str, Any]) -> dict[str, Any]:
         if data.get("terms_checked") is False:
@@ -91,14 +109,11 @@ def validate(self, data: dict[str, Any]) -> dict[str, Any]:
         return data
 
     def create(self, validated_data: dict[str, Any]) -> Organization:
-        description = validated_data.pop("description", None)
         org = Organization.objects.create(**validated_data)
 
-        if org and description:
-            org_text = OrganizationText.objects.create(
-                org_id=org, description=description
-            )
-            org.org_text = org_text
+        if org:
+            texts = OrganizationText.objects.create(org_id=org)
+            org.texts = texts
 
         return org
 
@@ -148,12 +163,6 @@ class Meta:
         fields = "__all__"
 
 
-class GroupTextSerializer(serializers.ModelSerializer[GroupText]):
-    class Meta:
-        model = GroupText
-        fields = "__all__"
-
-
 class GroupTopicSerializer(serializers.ModelSerializer[GroupTopic]):
     class Meta:
         model = GroupTopic
diff --git a/backend/events/factories.py b/backend/events/factories.py
index 5e3a1d2b5..3f9d48ba5 100644
--- a/backend/events/factories.py
+++ b/backend/events/factories.py
@@ -30,7 +30,8 @@ class Meta:
     tagline = factory.Faker("word")
     type = random.choice(["learn", "action"])
     online_location_link = factory.Faker("url")
-    offline_location_id = factory.SubFactory("content.factories.EventLocationFactory")
+    offline_location = factory.SubFactory("content.factories.EventLocationFactory")
+    is_private = factory.Faker("boolean")
     start_time = factory.LazyFunction(
         lambda: datetime.datetime.now(tz=datetime.timezone.utc)
     )
@@ -49,7 +50,6 @@ class Meta:
             + datetime.timedelta(days=30),
         ]
     )
-    is_private = factory.Faker("boolean")
 
 
 class FormatFactory(factory.django.DjangoModelFactory):
@@ -139,8 +139,7 @@ class EventTextFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = EventText
 
-    event_id = factory.SubFactory(EventFactory)
-    iso = factory.Faker("word")
+    iso = "en"
     primary = factory.Faker("boolean")
     description = factory.Faker(provider="text", locale="la", max_nb_chars=1000)
     get_involved = factory.Faker(provider="text", locale="la")
diff --git a/backend/events/models.py b/backend/events/models.py
index 904cf2591..709127306 100644
--- a/backend/events/models.py
+++ b/backend/events/models.py
@@ -25,7 +25,7 @@ class Event(models.Model):
     )
     type = models.CharField(max_length=255)
     online_location_link = models.CharField(max_length=255, blank=True)
-    offline_location_id = models.OneToOneField(
+    offline_location = models.OneToOneField(
         "content.Location", on_delete=models.CASCADE, null=False, blank=False
     )
     get_involved_url = models.URLField(blank=True)
@@ -34,9 +34,10 @@ class Event(models.Model):
     end_time = models.DateTimeField()
     creation_date = models.DateTimeField(auto_now_add=True)
     deletion_date = models.DateTimeField(blank=True, null=True)
-    event_text = models.ForeignKey(
+    texts = models.ForeignKey(
         "EventText", on_delete=models.CASCADE, blank=True, null=True
     )
+    resources = models.ManyToManyField("content.Resource", blank=True)
 
     def __str__(self) -> str:
         return self.name
@@ -155,10 +156,10 @@ def __str__(self) -> str:
 
 
 class EventText(models.Model):
-    event_id = models.ForeignKey(Event, on_delete=models.CASCADE)
+    event_id = models.ForeignKey(Event, on_delete=models.CASCADE, null=True)
     iso = models.CharField(max_length=3, choices=ISO_CHOICES)
-    primary = models.BooleanField()
-    description = models.TextField(max_length=500)
+    primary = models.BooleanField(default=False)
+    description = models.TextField(max_length=2500)
     get_involved = models.TextField(max_length=500, blank=True)
 
     def __str__(self) -> str:
diff --git a/backend/events/serializers.py b/backend/events/serializers.py
index f88af3d4c..6f5d3a75b 100644
--- a/backend/events/serializers.py
+++ b/backend/events/serializers.py
@@ -8,6 +8,7 @@
 from django.utils.translation import gettext as _
 from rest_framework import serializers
 
+from content.serializers import LocationSerializer, ResourceSerializer
 from utils.utils import (
     validate_creation_and_deletion_dates,
     validate_creation_and_deprecation_dates,
@@ -40,7 +41,9 @@ class Meta:
 
 
 class EventSerializer(serializers.ModelSerializer[Event]):
-    event_text = EventTextSerializer()
+    texts = EventTextSerializer()
+    offline_location = LocationSerializer(read_only=True)
+    resources = ResourceSerializer(many=True, read_only=True)
 
     class Meta:
         model = Event
@@ -49,20 +52,7 @@ class Meta:
             "created_by": {"read_only": True},
         }
 
-        fields = [
-            "id",
-            "created_by",
-            "name",
-            "tagline",
-            "icon_url",
-            "type",
-            "online_location_link",
-            "offline_location_id",
-            "is_private",
-            "start_time",
-            "end_time",
-            "event_text",
-        ]
+        fields = "__all__"
 
     def validate(self, data: Dict[str, Union[str, int]]) -> Dict[str, Union[str, int]]:
         if parse_datetime(data["start_time"]) > parse_datetime(data["end_time"]):  # type: ignore
@@ -73,17 +63,19 @@ def validate(self, data: Dict[str, Union[str, int]]) -> Dict[str, Union[str, int
 
         validate_creation_and_deletion_dates(data)
 
+        if data.get("terms_checked") is False:
+            raise serializers.ValidationError(
+                "You must accept the terms of service to create an event."
+            )
+
         return data
 
     def create(self, validated_data: dict[str, Any]) -> Event:
-        description = validated_data.pop("description", None)
         event = Event.objects.create(**validated_data)
 
-        if event and description:
-            event_text = EventText.objects.create(
-                event_id=event, description=description
-            )
-            event.event_text = event_text
+        if event:
+            event_text = EventText.objects.create(event_id=event)
+            event.texts = event_text
 
         return event
 
diff --git a/frontend/components/card/CardDetails.vue b/frontend/components/card/CardDetails.vue
index 077fc2b9d..d8468dce0 100644
--- a/frontend/components/card/CardDetails.vue
+++ b/frontend/components/card/CardDetails.vue
@@ -8,19 +8,9 @@
             {{ $t("components.card_details.header") }}
           </h3>
           <IconEdit
-            @click="openModalEditAboutEvent"
-            @keydown.enter="openModalEditAboutEvent"
+            @click="openModalEditAboutEvent()"
+            @keydown.enter="openModalEditAboutEvent()"
           />
-          <!-- <ModalEditAboutEvent
-            v-if="event"
-            :event="event"
-            :sectionsToEdit="[
-              $t('_global.about'),
-              $t('components._global.participate'),
-              $t('components._global.offer_to_help_link'),
-            ]"
-            :isOpen="modalIsOpen"
-          /> -->
         </div>
         <div v-if="event" class="flex-col space-y-6 py-2">
           <div class="flex items-center gap-3">
@@ -31,14 +21,14 @@
             />
             <button
               v-if="event.organizations.length > 1"
-              @click="openModalOrganizationOverview"
-              @keydown.enter="openModalOrganizationOverview"
+              @click="openModalOrganizationOverview()"
+              @keydown.enter="openModalOrganizationOverview()"
               class="text-sm font-semibold text-black"
             >
               (+{{ event.organizations.length - 1 }} more)
             </button>
             <ModalOrganizationOverview
-              @closeModal="openModalOrganizationOverview"
+              @closeModal="openModalOrganizationOverview()"
               :cta="true"
               :event="event"
             />
@@ -48,10 +38,10 @@
             :label="$t('components.card_details.attending')"
           /> -->
           <MetaTagLocation
-            v-if="event.offlineLocationId"
-            :location="event.offlineLocationId"
+            v-if="event.offlineLocation"
+            :location="event.offlineLocation.displayName.split(',')[0]"
           />
-          <MetaTagDate :date="event.startTime" />
+          <MetaTagDate :date="event.startTime.split('T')[0]" />
         </div>
       </div>
     </div>
@@ -60,16 +50,19 @@
 
 <script setup lang="ts">
 import { useModalHandlers } from "~/composables/useModalHandlers";
-import type { Event } from "~/types/events/event";
-
-defineProps<{
-  event?: Event;
-}>();
 
 const { openModal: openModalEditAboutEvent } = useModalHandlers(
   "ModalEditAboutEvent"
 );
 const { openModal: openModalOrganizationOverview } = useModalHandlers(
-  "ModalCommandPalette"
+  "ModalOrganizationOverview"
 );
+
+const idParam = useRoute().params.id;
+const id = typeof idParam === "string" ? idParam : undefined;
+
+const eventStore = useEventStore();
+await eventStore.fetchById(id);
+
+const { event } = eventStore;
 </script>
diff --git a/frontend/components/card/about/CardAboutEvent.vue b/frontend/components/card/about/CardAboutEvent.vue
index 4c52f1bb7..d37ce990c 100644
--- a/frontend/components/card/about/CardAboutEvent.vue
+++ b/frontend/components/card/about/CardAboutEvent.vue
@@ -21,7 +21,7 @@
               'line-clamp-2': !expandText,
             }"
           >
-            {{ event.description }}
+            {{ event.texts.description }}
           </p>
           <div class="flex justify-center">
             <button
diff --git a/frontend/components/card/about/CardAboutGroup.vue b/frontend/components/card/about/CardAboutGroup.vue
index 2fecab876..8a0a6f2a1 100644
--- a/frontend/components/card/about/CardAboutGroup.vue
+++ b/frontend/components/card/about/CardAboutGroup.vue
@@ -27,7 +27,7 @@
           </div> -->
         <div class="flex items-center gap-3">
           <MetaTagLocation
-            :location="group.locationDisplayName.split(',')[0]"
+            :location="group.location.displayName.split(',')[0]"
           />
           <!-- <MetaTagMembers
               :members="group.members.length"
@@ -41,7 +41,7 @@
               'line-clamp-5': !expandText,
             }"
           >
-            {{ group.description }}
+            {{ group.texts.description }}
           </p>
           <div class="flex justify-center">
             <button
diff --git a/frontend/components/card/about/CardAboutOrganization.vue b/frontend/components/card/about/CardAboutOrganization.vue
index 276cfca15..08d34b7a1 100644
--- a/frontend/components/card/about/CardAboutOrganization.vue
+++ b/frontend/components/card/about/CardAboutOrganization.vue
@@ -33,7 +33,7 @@
         <!-- <ShieldTopic :topic="organization.topic" /> -->
         <div class="flex items-center gap-3">
           <MetaTagLocation
-            :location="organization.locationDisplayName.split(',')[0]"
+            :location="organization.location.displayName.split(',')[0]"
           />
           <!-- <MetaTagMembers
               :members="organization.members.length"
@@ -47,7 +47,7 @@
               'line-clamp-5': !expandText,
             }"
           >
-            {{ organization.description }}
+            {{ organization.texts.description }}
           </p>
           <div class="flex justify-center">
             <button
diff --git a/frontend/components/card/get-involved/CardGetInvolvedEvent.vue b/frontend/components/card/get-involved/CardGetInvolvedEvent.vue
index 442a24bc4..90e4787f5 100644
--- a/frontend/components/card/get-involved/CardGetInvolvedEvent.vue
+++ b/frontend/components/card/get-involved/CardGetInvolvedEvent.vue
@@ -18,8 +18,8 @@
       />
     </div>
     <div class="space-y-3 pt-3">
-      <p v-if="event.getInvolved">
-        {{ event.getInvolved }}
+      <p v-if="event.texts.getInvolved">
+        {{ event.texts.getInvolved }}
       </p>
       <p v-else>{{ $t("components._global.participate_subtext") }}</p>
       <!-- <p>
diff --git a/frontend/components/card/get-involved/CardGetInvolvedOrganization.vue b/frontend/components/card/get-involved/CardGetInvolvedOrganization.vue
index c972add3f..caadfaa2b 100644
--- a/frontend/components/card/get-involved/CardGetInvolvedOrganization.vue
+++ b/frontend/components/card/get-involved/CardGetInvolvedOrganization.vue
@@ -33,8 +33,8 @@
       </div>
       <ModalEditAboutOrganization
         :organization="organization"
-        :description="organization.description"
-        :getInvolved="organization.getInvolved"
+        :description="organization.texts.description"
+        :getInvolved="organization.texts.getInvolved"
         :getInvolvedUrl="organization.getInvolvedUrl"
       />
     </div>
@@ -50,8 +50,8 @@
         <Feed :organization="organization" />
       </div>
       <div v-else-if="organization.getInvolvedUrl">
-        <p v-if="organization.getInvolved">
-          {{ organization.getInvolved }}
+        <p v-if="organization.texts.getInvolved">
+          {{ organization.texts.getInvolved }}
         </p>
         <p v-else>
           {{
diff --git a/frontend/components/card/search-result/CardSearchResult.vue b/frontend/components/card/search-result/CardSearchResult.vue
index 15694f824..f158e004c 100644
--- a/frontend/components/card/search-result/CardSearchResult.vue
+++ b/frontend/components/card/search-result/CardSearchResult.vue
@@ -155,12 +155,9 @@
             v-if="aboveMediumBP"
             class="flex items-center space-x-3 lg:space-x-5"
           >
-            <MetaTagLocation
-              v-if="location"
-              :location="location.displayName.split(',')[0]"
-            />
+            <MetaTagLocation v-if="location" :location="location" />
             <MetaTagVideo
-              v-if="onlineLocation"
+              v-else-if="onlineLocation"
               :link="onlineLocation"
               label="components.card_search_result.view_video"
             />
@@ -172,10 +169,7 @@
             v-if="!aboveMediumBP"
             class="flex items-center justify-center space-x-4"
           >
-            <MetaTagLocation
-              v-if="location"
-              :location="location.displayName.split(',')[0]"
-            />
+            <MetaTagLocation v-if="location" :location="location" />
             <MetaTagVideo
               v-if="onlineLocation"
               :link="onlineLocation"
@@ -225,7 +219,6 @@
 <script setup lang="ts">
 import { useLinkURL } from "~/composables/useLinkURL";
 import type { User } from "~/types/auth/user";
-import type { Location } from "~/types/content/location";
 import type { Resource } from "~/types/content/resource";
 import type { Group } from "~/types/entities/group";
 import type { Organization } from "~/types/entities/organization";
@@ -269,22 +262,22 @@ const ariaLabel = computed<string>(() => {
 });
 
 const date = computed<string>(() => {
-  if (props.event) {
-    return props.event.startTime;
+  if (props.event && props.event.startTime) {
+    return props.event.startTime.split("T")[0];
   } else if (props.resource && props.resource.creationDate) {
-    return props.resource.creationDate;
+    return props.resource.creationDate.split("T")[0];
   } else {
     return "";
   }
 });
 
 const description = computed<string>(() => {
-  if (props.organization && props.organization.description) {
-    return props.organization.description;
-  } else if (props.group && props.group.description) {
-    return props.group.description;
-  } else if (props.event && props.event.description) {
-    return props.event.description;
+  if (props.organization && props.organization.texts.description) {
+    return props.organization.texts.description;
+  } else if (props.group && props.group.texts.description) {
+    return props.group.texts.description;
+  } else if (props.event && props.event.texts.description) {
+    return props.event.texts.description;
   } else if (props.resource && props.resource.description) {
     return props.resource.description;
   } else if (props.user && props.user.description) {
@@ -316,15 +309,15 @@ const imageUrl = computed<string>(() => {
   }
 });
 
-const locationId = computed<string>(() => {
-  if (props.organization) {
-    return props.organization.locationId;
-  } else if (props.group) {
-    return props.group.locationId;
-  } else if (props.event && props.event.offlineLocationId) {
-    return props.event.offlineLocationId;
-  } else if (props.resource && props.resource.locationId) {
-    return props.resource.locationId;
+const location = computed<string>(() => {
+  if (props.organization && props.organization.location) {
+    return props.organization.location.displayName.split(",")[0];
+  } else if (props.group && props.group.location) {
+    return props.group.location.displayName.split(",")[0];
+  } else if (props.event && props.event.offlineLocation) {
+    return props.event.offlineLocation.displayName.split(",")[0];
+  } else if (props.resource && props.resource.location) {
+    return props.resource.location.displayName.split(",")[0];
   } else if (props.user && props.user.location) {
     return props.user.location;
   } else {
@@ -332,19 +325,6 @@ const locationId = computed<string>(() => {
   }
 });
 
-let location: Location;
-
-const locationStore = useLocationStore();
-if (
-  props.organization ||
-  props.group ||
-  (props.event && props.event.offlineLocationId) ||
-  (props.resource && props.resource.locationId)
-) {
-  await locationStore.fetchById(locationId.value);
-  location = locationStore.location;
-}
-
 // const members = computed<number>(() => {
 //   if (props.organization && props.organization.members) {
 //     return props.organization.members.length;
diff --git a/frontend/components/media/MediaMap.vue b/frontend/components/media/MediaMap.vue
index c77ec7ffb..59c57f0d4 100644
--- a/frontend/components/media/MediaMap.vue
+++ b/frontend/components/media/MediaMap.vue
@@ -11,11 +11,12 @@ import MapLibreGlDirections, {
 } from "@maplibre/maplibre-gl-directions";
 import maplibregl, { type Map } from "maplibre-gl";
 import "maplibre-gl/dist/maplibre-gl.css";
+import type { Location } from "~/types/content/location";
 
 const props = defineProps<{
   markerColors: string[];
   eventNames: string[];
-  eventLocations: string[];
+  eventLocations: Location[];
 }>();
 
 const i18n = useI18n();
@@ -158,252 +159,248 @@ const setSelectedRoute = () => {
 // MARK: Map Creation
 
 onMounted(() => {
-  const nominatimLocationRequest =
-    "https://nominatim.openstreetmap.org/search?q=Brandenburg%20Gate%20Berlin&format=json";
-
-  fetch(nominatimLocationRequest)
-    .then((response) => response.json())
-    .then((data) => {
-      const location = data[0];
-      if (!isWebglSupported()) {
-        alert(i18n.t("components.media_map.maplibre_gl_alert"));
-      } else {
-        const map = new maplibregl.Map({
-          container: "map",
-          style: {
-            version: 8,
-            sources: {
-              "raster-tiles": {
-                type: "raster",
-                tiles: ["https://tile.openstreetmap.org/{z}/{x}/{y}.png"],
-                tileSize: 256,
-                attribution:
-                  '<a href="https://www.openstreetmap.org/copyright" target="_blank">&copy; OpenStreetMap</a>',
-              },
-              "cycle-raster-tiles": {
-                type: "raster",
-                tiles: [
-                  "https://a.tile-cyclosm.openstreetmap.fr/cyclosm-lite/{z}/{x}/{y}.png",
-                  "https://b.tile-cyclosm.openstreetmap.fr/cyclosm-lite/{z}/{x}/{y}.png",
-                  "https://c.tile-cyclosm.openstreetmap.fr/cyclosm-lite/{z}/{x}/{y}.png",
-                ],
-                tileSize: 256,
-                attribution:
-                  '<a href="https://www.cyclosm.org" target="_blank">CyclOSM</a> hosted by <a href="https://openstreetmap.fr" target="_blank">OSM France</a>',
-              },
-            },
-            layers: [
-              {
-                id: "background",
-                type: "background",
-                paint: {
-                  "background-color":
-                    colorMode.preference == "dark" ? "#131316" : "#F6F8FA",
-                },
-              },
-              {
-                id: "default-layer",
-                type: "raster",
-                source: "raster-tiles",
-                minzoom: 0,
-              },
-              {
-                id: "cycle-layer",
-                type: "raster",
-                source: "cycle-raster-tiles",
-                minzoom: 0,
-                layout: {
-                  visibility: "none",
-                },
-              },
-            ],
+  if (!isWebglSupported()) {
+    alert(i18n.t("components.media_map.maplibre_gl_alert"));
+  } else {
+    const map = new maplibregl.Map({
+      container: "map",
+      style: {
+        version: 8,
+        sources: {
+          "raster-tiles": {
+            type: "raster",
+            tiles: ["https://tile.openstreetmap.org/{z}/{x}/{y}.png"],
+            tileSize: 256,
+            attribution:
+              '<a href="https://www.openstreetmap.org/copyright" target="_blank">&copy; OpenStreetMap</a>',
           },
-          pitch: 20,
-          maxZoom: 20,
-        });
-
-        map.fitBounds(
-          [
-            [
-              parseFloat(location["boundingbox"][2]),
-              parseFloat(location["boundingbox"][0]),
-            ],
-            [
-              parseFloat(location["boundingbox"][3]),
-              parseFloat(location["boundingbox"][1]),
+          "cycle-raster-tiles": {
+            type: "raster",
+            tiles: [
+              "https://a.tile-cyclosm.openstreetmap.fr/cyclosm-lite/{z}/{x}/{y}.png",
+              "https://b.tile-cyclosm.openstreetmap.fr/cyclosm-lite/{z}/{x}/{y}.png",
+              "https://c.tile-cyclosm.openstreetmap.fr/cyclosm-lite/{z}/{x}/{y}.png",
             ],
-          ],
+            tileSize: 256,
+            attribution:
+              '<a href="https://www.cyclosm.org" target="_blank">CyclOSM</a> hosted by <a href="https://openstreetmap.fr" target="_blank">OSM France</a>',
+          },
+        },
+        layers: [
+          {
+            id: "background",
+            type: "background",
+            paint: {
+              "background-color":
+                colorMode.preference == "dark" ? "#131316" : "#F6F8FA",
+            },
+          },
           {
-            duration: 0,
-            padding: 120,
-          }
-        );
-
-        // MARK: Basic Controls
-
-        map.addControl(
-          new maplibregl.NavigationControl({
-            visualizePitch: true,
-          }),
-          "top-left"
-        );
-        map.addControl(new maplibregl.FullscreenControl());
-        map.addControl(
-          new maplibregl.GeolocateControl({
-            positionOptions: {
-              enableHighAccuracy: true,
+            id: "default-layer",
+            type: "raster",
+            source: "raster-tiles",
+            minzoom: 0,
+          },
+          {
+            id: "cycle-layer",
+            type: "raster",
+            source: "cycle-raster-tiles",
+            minzoom: 0,
+            layout: {
+              visibility: "none",
             },
-            trackUserLocation: true,
-          })
-        );
-
-        const popup = new maplibregl.Popup({
-          offset: 25,
-        }).setHTML(
-          `<div style="
+          },
+        ],
+      },
+      pitch: 20,
+      maxZoom: 20,
+    });
+
+    map.fitBounds(
+      [
+        [
+          parseFloat(props.eventLocations[0].bbox[2]),
+          parseFloat(props.eventLocations[0].bbox[0]),
+        ],
+        [
+          parseFloat(props.eventLocations[0].bbox[3]),
+          parseFloat(props.eventLocations[0].bbox[1]),
+        ],
+      ],
+      {
+        duration: 0,
+        padding: 120,
+      }
+    );
+
+    // MARK: Basic Controls
+
+    map.addControl(
+      new maplibregl.NavigationControl({
+        visualizePitch: true,
+      }),
+      "top-left"
+    );
+    map.addControl(new maplibregl.FullscreenControl());
+    map.addControl(
+      new maplibregl.GeolocateControl({
+        positionOptions: {
+          enableHighAccuracy: true,
+        },
+        trackUserLocation: true,
+      })
+    );
+
+    const popup = new maplibregl.Popup({
+      offset: 25,
+    }).setHTML(
+      `<div style="
             text-align: center;
             color: grey;"
           >
             <div style="font-size: 13px;">${props.eventNames[0]}</div>
-            <div style="color: grey;">${props.eventLocations[0]}</div>
+            <div style="color: grey;">${props.eventLocations[0].displayName}</div>
           </div>`
-        );
-
-        const marker = new maplibregl.Marker({
-          color: `${props.markerColors[0]}`,
-        });
-
-        marker.addClassName("cursor-pointer");
-        marker
-          .setLngLat([parseFloat(location["lon"]), parseFloat(location["lat"])])
-          .setPopup(popup)
-          .addTo(map);
-
-        // Arrow icon for directions.
-        map
-          .loadImage("/icons/from_library/bootstrap_arrow_right.png")
-          .then((image) => {
-            if (image) {
-              map.addImage("route-direction-arrow", image.data);
-            }
-          });
+    );
+
+    const marker = new maplibregl.Marker({
+      color: `${props.markerColors[0]}`,
+    });
 
-        map.on("load", () => {
-          const layers = layersFactory(
-            isTouchDevice ? 1.5 : 1,
-            isTouchDevice ? 2 : 1
-          );
+    marker.addClassName("cursor-pointer");
+    marker
+      .setLngLat([
+        parseFloat(props.eventLocations[0].lon),
+        parseFloat(props.eventLocations[0].lat),
+      ])
+      .setPopup(popup)
+      .addTo(map);
+
+    // Arrow icon for directions.
+    map
+      .loadImage("/icons/from_library/bootstrap_arrow_right.png")
+      .then((image) => {
+        if (image) {
+          map.addImage("route-direction-arrow", image.data);
+        }
+      });
+
+    map.on("load", () => {
+      const layers = layersFactory(
+        isTouchDevice ? 1.5 : 1,
+        isTouchDevice ? 2 : 1
+      );
+
+      // MARK: Directions Layer
+
+      // Add arrow to directions layer.
+      layers.push({
+        id: "maplibre-gl-directions-route-line-direction-arrow",
+        type: "symbol",
+        source: "maplibre-gl-directions",
+        layout: {
+          "symbol-placement": "line-center",
+          "icon-image": "route-direction-arrow",
+          "icon-size": [
+            "interpolate",
+            ["exponential", 1.5],
+            ["zoom"],
+            12,
+            0.85,
+            18,
+            1.4,
+          ],
+        },
+        paint: {
+          "icon-opacity": 1,
+        },
+        filter: ["==", ["get", "route"], "SELECTED"],
+      });
+
+      let directions = new MapLibreGlDirections(map, {
+        ...(selectedRoute = setSelectedRoute()),
+        requestOptions: {
+          alternatives: "true",
+        },
+        layers,
+      });
+
+      directions.interactive = true;
+      marker.getElement().addEventListener("mouseenter", () => {
+        directions.interactive = false;
+      });
+
+      marker.getElement().addEventListener("mouseleave", () => {
+        directions.interactive = true;
+      });
+
+      // MARK: Profile Switcher
+
+      map.addControl(
+        {
+          onAdd: function () {
+            const div = document.createElement("div");
+            div.className = "maplibregl-ctrl maplibregl-ctrl-custom-image";
+            div.innerHTML = currentProfile;
+
+            const updateSelectedProfile = () => {
+              toggleLayerHandler(map);
+
+              directions.destroy();
+              div.innerHTML = routeProfileHandler();
+
+              directions = new MapLibreGlDirections(map, {
+                ...(selectedRoute = setSelectedRoute()),
+                requestOptions: {
+                  alternatives: "true",
+                },
+                layers,
+              });
+
+              directions.interactive = true;
+              marker.getElement().addEventListener("mouseenter", () => {
+                directions.interactive = false;
+              });
+
+              marker.getElement().addEventListener("mouseleave", () => {
+                directions.interactive = true;
+              });
+            };
+
+            if (window.innerWidth < 768) {
+              div.addEventListener("touched", updateSelectedProfile);
+              div.addEventListener("click", updateSelectedProfile);
+            } else {
+              div.addEventListener("click", updateSelectedProfile);
+              document.addEventListener("keydown", (event) => {
+                if (event.key === "p") {
+                  updateSelectedProfile();
+                }
+              });
+            }
+            return div;
+          },
+          onRemove: function () {},
+        },
+        "top-right"
+      );
 
-          // MARK: Directions Layer
+      // MARK: Clear Directions
 
-          // Add arrow to directions layer.
-          layers.push({
-            id: "maplibre-gl-directions-route-line-direction-arrow",
-            type: "symbol",
-            source: "maplibre-gl-directions",
-            layout: {
-              "symbol-placement": "line-center",
-              "icon-image": "route-direction-arrow",
-              "icon-size": [
-                "interpolate",
-                ["exponential", 1.5],
-                ["zoom"],
-                12,
-                0.85,
-                18,
-                1.4,
-              ],
-            },
-            paint: {
-              "icon-opacity": 1,
-            },
-            filter: ["==", ["get", "route"], "SELECTED"],
-          });
+      const clearDirectionsControl = `
+          <div style="
+            background-color: rgba(255, 255, 255, 1);
+            padding: 1px 5px;
+            border-radius: 5px;
+            box-shadow: 0 0 1px 2px rgba(0, 0, 0, 0.15);
+            color: grey;
+            cursor: pointer"
+          >
+            Clear directions
+          </div>
+        `;
 
-          let directions = new MapLibreGlDirections(map, {
-            ...(selectedRoute = setSelectedRoute()),
-            requestOptions: {
-              alternatives: "true",
-            },
-            layers,
-          });
-
-          directions.interactive = true;
-          marker.getElement().addEventListener("mouseenter", () => {
-            directions.interactive = false;
-          });
-
-          marker.getElement().addEventListener("mouseleave", () => {
-            directions.interactive = true;
-          });
-
-          // MARK: Profile Switcher
-
-          map.addControl(
-            {
-              onAdd: function () {
-                const div = document.createElement("div");
-                div.className = "maplibregl-ctrl maplibregl-ctrl-custom-image";
-                div.innerHTML = currentProfile;
-
-                const updateSelectedProfile = () => {
-                  toggleLayerHandler(map);
-
-                  directions.destroy();
-                  div.innerHTML = routeProfileHandler();
-
-                  directions = new MapLibreGlDirections(map, {
-                    ...(selectedRoute = setSelectedRoute()),
-                    requestOptions: {
-                      alternatives: "true",
-                    },
-                    layers,
-                  });
-
-                  directions.interactive = true;
-                  marker.getElement().addEventListener("mouseenter", () => {
-                    directions.interactive = false;
-                  });
-
-                  marker.getElement().addEventListener("mouseleave", () => {
-                    directions.interactive = true;
-                  });
-                };
-
-                if (window.innerWidth < 768) {
-                  div.addEventListener("touched", updateSelectedProfile);
-                  div.addEventListener("click", updateSelectedProfile);
-                } else {
-                  div.addEventListener("click", updateSelectedProfile);
-                  document.addEventListener("keydown", (event) => {
-                    if (event.key === "p") {
-                      updateSelectedProfile();
-                    }
-                  });
-                }
-                return div;
-              },
-              onRemove: function () {},
-            },
-            "top-right"
-          );
-
-          // MARK: Clear Directions
-
-          const clearDirectionsControl = `
-            <div style="
-              background-color: rgba(255, 255, 255, 1);
-              padding: 1px 5px;
-              border-radius: 5px;
-              box-shadow: 0 0 1px 2px rgba(0, 0, 0, 0.15);
-              color: grey;
-              cursor: pointer"
-            >
-              Clear directions
-            </div>
-          `;
-
-          const clearDirectionsHotkeyControl = `
+      const clearDirectionsHotkeyControl = `
           <div style="
             background-color: rgba(255, 255, 255, 1);
             padding: 1px 5px;
@@ -416,32 +413,31 @@ onMounted(() => {
           </div>
         `;
 
-          map.addControl(
-            {
-              onAdd: function () {
-                const div = document.createElement("div");
-                div.className = "maplibregl-ctrl";
-                if (window.innerWidth < 768) {
-                  div.innerHTML = clearDirectionsControl;
-                  div.addEventListener("touchend", () => directions.clear());
-                  div.addEventListener("click", () => directions.clear()); // for small desktops or tiling
-                } else {
-                  div.innerHTML = clearDirectionsHotkeyControl;
-                  div.addEventListener("click", () => directions.clear());
-                  document.addEventListener("keydown", (event) => {
-                    if (event.key === "x") {
-                      directions.clear();
-                    }
-                  });
+      map.addControl(
+        {
+          onAdd: function () {
+            const div = document.createElement("div");
+            div.className = "maplibregl-ctrl";
+            if (window.innerWidth < 768) {
+              div.innerHTML = clearDirectionsControl;
+              div.addEventListener("touchend", () => directions.clear());
+              div.addEventListener("click", () => directions.clear()); // for small desktops or tiling
+            } else {
+              div.innerHTML = clearDirectionsHotkeyControl;
+              div.addEventListener("click", () => directions.clear());
+              document.addEventListener("keydown", (event) => {
+                if (event.key === "x") {
+                  directions.clear();
                 }
-                return div;
-              },
-              onRemove: function () {},
-            },
-            "bottom-left"
-          );
-        });
-      }
+              });
+            }
+            return div;
+          },
+          onRemove: function () {},
+        },
+        "bottom-left"
+      );
     });
+  }
 });
 </script>
diff --git a/frontend/components/modal/edit/about/ModalEditAboutEvent.vue b/frontend/components/modal/edit/about/ModalEditAboutEvent.vue
index 8686846ee..3679582c3 100644
--- a/frontend/components/modal/edit/about/ModalEditAboutEvent.vue
+++ b/frontend/components/modal/edit/about/ModalEditAboutEvent.vue
@@ -63,8 +63,8 @@ await eventStore.fetchById(id);
 const { event } = eventStore;
 
 const formData = ref({
-  description: event.description,
-  getInvolved: event.getInvolved,
+  description: event.texts.description,
+  getInvolved: event.texts.getInvolved,
   getInvolvedUrl: event.getInvolvedUrl,
 });
 
diff --git a/frontend/components/modal/edit/about/ModalEditAboutGroup.vue b/frontend/components/modal/edit/about/ModalEditAboutGroup.vue
index 7156d483b..785ae1f73 100644
--- a/frontend/components/modal/edit/about/ModalEditAboutGroup.vue
+++ b/frontend/components/modal/edit/about/ModalEditAboutGroup.vue
@@ -63,8 +63,8 @@ await groupStore.fetchById(id);
 const { group } = groupStore;
 
 const formData = ref({
-  description: group.description,
-  getInvolved: group.getInvolved,
+  description: group.texts.description,
+  getInvolved: group.texts.getInvolved,
   getInvolvedUrl: group.getInvolvedUrl,
 });
 
diff --git a/frontend/components/modal/edit/about/ModalEditAboutOrganization.vue b/frontend/components/modal/edit/about/ModalEditAboutOrganization.vue
index 14c7f5f1d..baae62e43 100644
--- a/frontend/components/modal/edit/about/ModalEditAboutOrganization.vue
+++ b/frontend/components/modal/edit/about/ModalEditAboutOrganization.vue
@@ -1,3 +1,4 @@
+<!-- Test comment, to check pre-commit hook -->
 <template>
   <ModalBase :modalName="modalName">
     <div class="flex flex-col space-y-7">
@@ -67,8 +68,8 @@ const formData = ref<OrganizationUpdateTextFormData>({
 });
 
 onMounted(() => {
-  formData.value.description = organization.description;
-  formData.value.getInvolved = organization.getInvolved;
+  formData.value.description = organization.texts.description;
+  formData.value.getInvolved = organization.texts.getInvolved;
   formData.value.getInvolvedUrl = organization.getInvolvedUrl;
 });
 
diff --git a/frontend/i18n/de.json b/frontend/i18n/de.json
index a14264eb7..7825ee7aa 100644
--- a/frontend/i18n/de.json
+++ b/frontend/i18n/de.json
@@ -364,7 +364,7 @@
   "pages._global.settings.save_settings": "Einstellungen speichern",
   "pages._global.settings.save_settings_aria_label": "Aktualisieren der Einstellungen",
   "pages._global.settings.settings_lower": "Einstellungen",
-  "pages._global.share_group": "Gruppe teilen",
+  "pages.organizations.groups.about.share_group": "Gruppe teilen",
   "pages._global.tasks.new_task": "Neue Aufgabe",
   "pages._global.tasks.new_task_aria_label": "Hinzufügen einer neuen Aufgabe zum Board",
   "pages._global.tasks.tasks_lower": "Aufgaben",
diff --git a/frontend/i18n/en-US.json b/frontend/i18n/en-US.json
index 475a9a65c..9845a6003 100644
--- a/frontend/i18n/en-US.json
+++ b/frontend/i18n/en-US.json
@@ -365,7 +365,7 @@
   "pages._global.settings.save_settings": "Save settings",
   "pages._global.settings.save_settings_aria_label": "Update the settings",
   "pages._global.settings.settings_lower": "settings",
-  "pages._global.share_group": "Share group",
+  "pages.organizations.groups.about.share_group": "Share group",
   "pages._global.tasks.new_task": "New task",
   "pages._global.tasks.new_task_aria_label": "Add a new task to the board",
   "pages._global.tasks.tasks_lower": "tasks",
diff --git a/frontend/i18n/fr.json b/frontend/i18n/fr.json
index a0b17e8f1..dd6183c43 100644
--- a/frontend/i18n/fr.json
+++ b/frontend/i18n/fr.json
@@ -68,6 +68,7 @@
   "components._global.participate": "Participer",
   "components._global.participate_subtext": "Cliquer sur \"Offrir de l’aide\" ci-dessous pour accéder à un formulaire où nous vous demanderons des informations sur la façon dont vous aimeriez participer.",
   "components._global.roadmap": "Feuille de route (roadmap)",
+  "components._global.star": "Étoile",
   "components._global.upvote_application_aria_label": "Voter pour soutenir l’organisation qui rejoint le mouvement",
   "components._global.working_groups_subtext": "Les groupes de travail suivants font partie de {entity_name}",
   "components.btn_road_map.aria_label": "En savoir plus sur la feuille de route d'Activist",
@@ -126,6 +127,7 @@
   "components.card_faq_entry.answer": "Réponse",
   "components.card_faq_entry.question": "Question",
   "components.card_get_involved_event.legal_disclaimer_subtext": "Veuillez lire la clause de non-responsabilité ci-dessous pour obtenir plus d’information sur vos droits pendant cet événement.",
+  "components.card_get_involved_organization.join_organization_no_info": "Aucune information n'est fournie pour l'instant sur l'adhésion à {entity_name}.",
   "components.card_get_involved_organization.view_all_groups": "Voir tous les groupes",
   "components.card_get_involved_organization.view_all_groups_aria_label": "Voir tous les groupes de cette organisation",
   "components.card_legal_disclaimer.header": "Mentions légales",
@@ -135,6 +137,7 @@
   "components.card_metrics_overview.new_organizations": "Nouvelles orgs",
   "components.card_org_application_vote.downvote_application_aria_label": "Voter pour ne pas appuyer l’organisation qui rejoint le mouvement",
   "components.card_search_result.event_img_alt_text": "Le logo de l’événement",
+  "components.card_search_result.label": "étoiles",
   "components.card_search_result.members": "Membres",
   "components.card_search_result.navigate_to_event_aria_label": "Accéder à la page de cet événement",
   "components.card_search_result.navigate_to_organization_aria_label": "Accéder à la page de cette organisation",
@@ -198,6 +201,7 @@
   "components.footer.flex._global.activist_tagline": "Une plateforme d’activisme open-source.",
   "components.footer.flex._global.copyright": "Copyright © {year} activist.",
   "components.footer.flex._global.powered_by_netlify": "Ce site est propulsé par Netlify.",
+  "components.footer_website.imprint": "Impression",
   "components.footer_website.privacy_policy": "Politique de confidentialité",
   "components.footer_website.source_code": "Code source",
   "components.footer_website.supporters": "Sympathisants",
@@ -341,6 +345,7 @@
   "composables.use_menu_entries_state.groups": "Groupes",
   "error.message": "Oups, quelque chose a mal tourné :",
   "error.title": "Erreur • Activist",
+  "layouts.auth.auth": "Authentication",
   "layouts.auth.reset_password_forgot_password": "Mot de passe oublié ?",
   "layouts.auth.set_password_set_new_password": "Définir un nouveau mot de passe",
   "layouts.auth.sign_in_welcome_back": "Heureux de te revoir !",
@@ -358,7 +363,7 @@
   "pages._global.settings.save_settings": "Enregistrer les paramètres",
   "pages._global.settings.save_settings_aria_label": "Mettre à jour les paramètres",
   "pages._global.settings.settings_lower": "paramètres",
-  "pages._global.share_group": "Partager groupe",
+  "pages.organizations.groups.about.share_group": "Partager groupe",
   "pages._global.tasks.new_task": "Nouvelle tâche",
   "pages._global.tasks.new_task_aria_label": "Ajouter une nouvelle tâche au tableau",
   "pages._global.tasks.tasks_lower": "tâches",
diff --git a/frontend/package.json b/frontend/package.json
index 1730557d6..a3a2d3af7 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -3,7 +3,9 @@
   "private": true,
   "scripts": {
     "build": "nuxt build",
+    "build:local": "env-cmd -f ../.env.dev nuxt build",
     "dev": "nuxt dev",
+    "dev:local": "env-cmd -f ../.env.dev nuxt dev",
     "generate": "nuxt generate",
     "preview": "nuxt preview",
     "postinstall": "nuxt prepare",
@@ -35,6 +37,7 @@
     "@vueuse/core": "11.1.0",
     "@vueuse/nuxt": "11.1.0",
     "cross-env": "7.0.3",
+    "env-cmd": "10.1.0",
     "eslint": "9.12.0",
     "eslint-plugin-vue": "9.30.0",
     "eslint-plugin-vuejs-accessibility": "2.4.1",
@@ -89,6 +92,7 @@
     "zxcvbn": "4.4.2"
   },
   "resolutions": {
+    "chokidar": "3.6.0",
     "playwright-core": "1.45.1"
   }
 }
diff --git a/frontend/pages/events/[id]/about.vue b/frontend/pages/events/[id]/about.vue
index b08c40f39..d07a5a14b 100644
--- a/frontend/pages/events/[id]/about.vue
+++ b/frontend/pages/events/[id]/about.vue
@@ -3,7 +3,7 @@
     <Head>
       <Title>{{ event.name }}</Title>
     </Head>
-    <HeaderAppPage :event="event">
+    <HeaderAppPage pageType="event">
       <div class="flex space-x-2 pb-3 lg:space-x-3 lg:pb-4">
         <BtnRouteExternal
           v-if="event.getInvolvedUrl"
@@ -28,8 +28,8 @@
           ariaLabel="_global.support_event_aria_label"
         /> -->
         <BtnAction
-          @click="openModal()"
-          @keydown.enter="openModal()"
+          @click="openModalSharePage()"
+          @keydown.enter="openModalSharePage()"
           class="w-max"
           :cta="true"
           :label="$t(shareButtonLabel)"
@@ -39,12 +39,7 @@
           iconSize="1.45em"
           :ariaLabel="$t('_global.share_event_aria_label')"
         />
-        <ModalSharePage
-          @closeModal="handleCloseModal"
-          :cta="true"
-          :event="event"
-          :isOpen="modalIsOpen"
-        />
+        <ModalSharePage :cta="true" :event="event" />
       </div>
     </HeaderAppPage>
     <div class="space-y-6 pb-6">
@@ -61,18 +56,17 @@
             'lg:col-span-2': !textExpanded,
             'lg:col-span-3': textExpanded,
           }"
-          aboutType="event"
           :event="event"
         />
         <MediaMap
-          v-if="event.offlineLocationId && !textExpanded"
+          v-if="event.offlineLocation && !textExpanded"
           class="h-[17.5rem] w-full"
           :markerColors="event.type === 'learn' ? ['#2176AE'] : ['#BA3D3B']"
           :eventNames="[event.name]"
-          :eventLocations="[event.offlineLocationId]"
+          :eventLocations="[event.offlineLocation]"
         />
       </div>
-      <CardAboutEvent aboutType="event" :event="event" />
+      <CardAboutEvent :event="event" />
       <CardGetInvolvedEvent
         :event="event"
         disclaimer="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet."
@@ -86,6 +80,8 @@
 import { BreakpointMap } from "~/types/breakpoint-map";
 import { IconMap } from "~/types/icon-map";
 
+const { openModal: openModalSharePage } = useModalHandlers("ModalSharePage");
+
 const idParam = useRoute().params.id;
 const id = typeof idParam === "string" ? idParam : undefined;
 
@@ -108,7 +104,7 @@ function updateShareBtnLabel() {
   if (windowWidth.value < BreakpointMap.SMALL) {
     shareButtonLabel.value = "_global.share";
   } else {
-    shareButtonLabel.value = "pages._global.share_group";
+    shareButtonLabel.value = "_global.share_event";
   }
 }
 
@@ -124,18 +120,4 @@ onUpdated(() => {
 onUnmounted(() => {
   window.removeEventListener("resize", updateShareBtnLabel);
 });
-
-const modals = useModals();
-const modalName = "ModalSharePage";
-const modalIsOpen = ref(false);
-
-function openModal() {
-  modals.openModal(modalName);
-  modalIsOpen.value = modals.modals[modalName].isOpen;
-}
-
-const handleCloseModal = () => {
-  modals.closeModal(modalName);
-  modalIsOpen.value = modals.modals[modalName].isOpen;
-};
 </script>
diff --git a/frontend/pages/organizations/[id]/groups/[id]/about.vue b/frontend/pages/organizations/[id]/groups/[id]/about.vue
index c88657219..5ba133d8c 100644
--- a/frontend/pages/organizations/[id]/groups/[id]/about.vue
+++ b/frontend/pages/organizations/[id]/groups/[id]/about.vue
@@ -116,7 +116,7 @@ function updateShareBtnLabel() {
   if (windowWidth.value < BreakpointMap.SMALL) {
     shareButtonLabel.value = "_global.share";
   } else {
-    shareButtonLabel.value = "pages._global.share_group";
+    shareButtonLabel.value = "pages.organizations.groups.about.share_group";
   }
 }
 
diff --git a/frontend/stores/event.ts b/frontend/stores/event.ts
index 11d7ef4c2..0e99ca575 100644
--- a/frontend/stores/event.ts
+++ b/frontend/stores/event.ts
@@ -1,11 +1,9 @@
-import type { PiniaResLocation } from "~/types/content/location";
 import type {
   Event,
-  EventText,
+  EventCreateFormData,
+  EventUpdateTextFormData,
   PiniaResEvent,
   PiniaResEvents,
-  PiniaResEventText,
-  PiniaResEventTexts,
 } from "~/types/events/event";
 
 interface EventStore {
@@ -29,11 +27,13 @@ export const useEventStore = defineStore("event", {
       type: "learn",
       onlineLocationLink: "",
 
-      offlineLocationId: "",
-      lat: "",
-      lon: "",
-      bbox: [""],
-      locationDisplayName: "",
+      offlineLocation: {
+        id: "",
+        lat: "",
+        lon: "",
+        bbox: [""],
+        displayName: "",
+      },
 
       getInvolvedUrl: "",
       socialLinks: [""],
@@ -44,8 +44,13 @@ export const useEventStore = defineStore("event", {
       organizations: [],
 
       eventTextId: "",
-      description: "",
-      getInvolved: "",
+      texts: {
+        eventId: "",
+        iso: "",
+        primary: false,
+        description: "",
+        getInvolved: "",
+      },
     },
 
     events: [],
@@ -53,79 +58,67 @@ export const useEventStore = defineStore("event", {
   actions: {
     // MARK: Create
 
-    async create() {},
+    async create(formData: EventCreateFormData) {
+      this.loading = true;
+
+      const token = localStorage.getItem("accessToken");
+
+      const responseEvent = await useFetch(
+        `${BASE_BACKEND_URL}/events/events/`,
+        {
+          method: "POST",
+          body: JSON.stringify({
+            name: formData.name,
+            location: formData.location,
+            tagline: formData.tagline,
+            social_accounts: formData.social_accounts,
+            created_by: "cdfecc96-2dd5-435b-baba-a7610afee70e",
+            description: formData.description,
+            topics: formData.topics,
+            high_risk: false,
+            total_flags: 0,
+            acceptance_date: new Date(),
+          }),
+          headers: {
+            Authorization: `Token ${token}`,
+          },
+        }
+      );
+
+      const responseEventData = responseEvent.data.value as unknown as Event;
+
+      if (responseEvent) {
+        this.loading = false;
+        return responseEventData.id;
+      }
+
+      this.loading = false;
+      return false;
+    },
 
     // MARK: Fetch By ID
 
     async fetchById(id: string | undefined) {
       this.loading = true;
 
-      const [resEvent, resEventTexts] = await Promise.all([
-        useAsyncData(
-          async () => await fetchWithoutToken(`/events/events/${id}`, {})
-        ),
-        // useAsyncData(
-        //   async () =>
-        //     await fetchWithoutToken(
-        //       `/entities/event_faq?event_id=${id}`,
-        //       {}
-        //     )
-        // ),
-        // useAsyncData(
-        //   async () =>
-        //     await fetchWithoutToken(
-        //       `/entities/event_resources?event_id=${id}`,
-        //       {}
-        //     )
-        // ),
-        useAsyncData(
-          async () =>
-            await fetchWithoutToken(`/events/event_texts?event_id=${id}`, {})
-        ),
-      ]);
-
-      const eventRes = resEvent.data as unknown as PiniaResEvent;
-      // const eventFAQRes = resEventFAQ.data as unknown as PiniaResEvent;
-      // const eventResourcesRes =
-      //   resEventResources.data as unknown as PiniaResEvent;
-      const eventTextsRes = resEventTexts.data as unknown as PiniaResEventText;
-
-      const event = eventRes._value;
-      // const faq = eventRes._value;
-      // const resources = eventRes._value;
-      const texts = eventTextsRes._value.results[0];
-
-      if (event.offlineLocationId) {
-        const eventLocation = (await Promise.all([
-          useAsyncData(
-            async () =>
-              await fetchWithoutToken(
-                `/content/locations/${event.offlineLocationId}`,
-                {}
-              )
-          ),
-        ])) as unknown as PiniaResLocation;
-
-        const location = eventLocation._value;
-
-        this.event.lat = location.lat;
-        this.event.lon = location.lon;
-        this.event.bbox = location.bbox;
-        this.event.locationDisplayName = location.displayName;
-      }
+      const resEvent = (await useAsyncData(
+        async () => await fetchWithoutToken(`/events/events/${id}`, {})
+      ).data) as unknown as PiniaResEvent;
+
+      const event = resEvent._value;
 
       this.event.id = event.id;
       this.event.name = event.name;
       this.event.tagline = event.tagline;
       this.event.iconUrl = event.iconUrl;
 
-      this.event.offlineLocationId = event.offlineLocationId;
+      this.event.offlineLocation = event.offlineLocation;
 
       this.event.getInvolvedUrl = event.getInvolvedUrl;
       this.event.socialLinks = event.socialLinks;
 
-      this.event.description = texts.description;
-      this.event.getInvolved = texts.getInvolved;
+      this.event.eventTextId = event.texts.eventId;
+      this.event.texts = event.texts;
 
       this.loading = false;
     },
@@ -135,72 +128,94 @@ export const useEventStore = defineStore("event", {
     async fetchAll() {
       this.loading = true;
 
-      const [responseEvents] = await Promise.all([
-        useAsyncData(
-          async () => await fetchWithoutToken(`/events/events/`, {})
-        ),
-      ]);
-
-      const events = responseEvents.data as unknown as PiniaResEvents;
-
-      if (events._value) {
-        const responseEventTexts = (await Promise.all(
-          events._value.map((event) =>
-            useAsyncData(
-              async () =>
-                await fetchWithoutToken(
-                  `/events/event_texts?event_id=${event.id}`,
-                  {}
-                )
-            )
-          )
-        )) as unknown as PiniaResEventTexts[];
-
-        const eventTextsData = responseEventTexts.map(
-          (text) => text.data._value.results[0]
-        ) as unknown as EventText[];
-
-        const eventsWithTexts = events._value.map(
-          (event: Event, index: number) => {
-            const texts = eventTextsData[index];
-            return {
-              id: event.id,
-              name: event.name,
-              tagline: event.tagline,
-              createdBy: event.createdBy,
-              iconUrl: event.iconUrl,
-              type: event.type,
-              onlineLocationLink: event.onlineLocationLink,
-
-              offlineLocation: event.offlineLocationId,
-              lat: event.lat,
-              lon: event.lon,
-              bbox: event.bbox,
-              locationDisplayName: event.locationDisplayName,
-
-              getInvolvedUrl: event.getInvolvedUrl,
-              socialLinks: event.socialLinks,
-              startTime: event.startTime,
-              endTime: event.endTime,
-              creationDate: event.creationDate,
-              organizations: event.organizations,
-
-              eventTextId: event.eventTextId,
-              description: texts.description,
-              getInvolved: texts.getInvolved,
-            };
-          }
-        );
-
-        this.events = eventsWithTexts;
+      const responseEvents = await useAsyncData(
+        async () => await fetchWithoutToken(`/events/events/`, {})
+      );
+
+      const allEvents = responseEvents.data as unknown as PiniaResEvents;
+
+      if (allEvents._value) {
+        const events = allEvents._value.map((event: Event) => {
+          return {
+            id: event.id,
+            name: event.name,
+            tagline: event.tagline,
+            createdBy: event.createdBy,
+            iconUrl: event.iconUrl,
+            type: event.type,
+            onlineLocationLink: event.onlineLocationLink,
+
+            offlineLocation: event.offlineLocation,
+
+            getInvolvedUrl: event.getInvolvedUrl,
+            socialLinks: event.socialLinks,
+            startTime: event.startTime,
+            endTime: event.endTime,
+            creationDate: event.creationDate,
+            organizations: event.organizations,
+
+            eventTextId: event.eventTextId,
+            texts: event.texts,
+          };
+        });
+
+        this.events = events;
       }
 
       this.loading = false;
     },
 
-    // MARK: Update
+    // MARK: Update Texts
+
+    async updateTexts(event: Event, formData: EventUpdateTextFormData) {
+      this.loading = true;
+
+      const token = localStorage.getItem("accessToken");
+
+      const responseEvent = await $fetch(
+        BASE_BACKEND_URL + `/events/events/${event.id}/`,
+        {
+          method: "PUT",
+          body: {
+            ...event,
+            getInvolvedUrl: formData.getInvolvedUrl,
+          },
+          headers: {
+            Authorization: `Token ${token}`,
+          },
+        }
+      );
+
+      const responseEventTexts = await $fetch(
+        BASE_BACKEND_URL + `/events/event_texts/${event.eventTextId}/`,
+        {
+          method: "PUT",
+          body: {
+            primary: true,
+            description: formData.description,
+            getInvolved: formData.getInvolved,
+            donate_prompt: "",
+            orgId: event.id,
+            iso: "en",
+          },
+          headers: {
+            Authorization: `Token ${token}`,
+          },
+        }
+      );
+
+      if (responseEvent && responseEventTexts) {
+        this.event.texts.description = formData.description;
+        this.event.texts.getInvolved = formData.getInvolved;
+        this.event.getInvolvedUrl = formData.getInvolvedUrl;
+
+        this.loading = false;
+
+        return true;
+      }
 
-    async update() {},
+      return false;
+    },
 
     // MARK: Delete
 
diff --git a/frontend/stores/group.ts b/frontend/stores/group.ts
index 430ca4004..86252f7f3 100644
--- a/frontend/stores/group.ts
+++ b/frontend/stores/group.ts
@@ -1,10 +1,10 @@
-import type { PiniaResLocation } from "~/types/content/location";
 import type {
   Group,
+  GroupCreateFormData,
+  GroupUpdateTextFormData,
   PiniaResGroup,
-  PiniaResGroupText,
+  PiniaResGroups,
 } from "~/types/entities/group";
-import type { PiniaResOrganization } from "~/types/entities/organization";
 
 interface GroupStore {
   loading: boolean;
@@ -26,12 +26,9 @@ export const useGroupStore = defineStore("group", {
       tagline: "",
       organization: "",
       createdBy: "",
+      iconUrl: "",
 
-      locationId: "",
-      lat: "",
-      lon: "",
-      bbox: [""],
-      locationDisplayName: "",
+      location: { id: "", lat: "", lon: "", bbox: [""], displayName: "" },
 
       getInvolvedUrl: "",
       socialLinks: [""],
@@ -39,9 +36,15 @@ export const useGroupStore = defineStore("group", {
 
       faqEntries: [""],
 
-      description: "",
-      getInvolved: "",
-      donationPrompt: "",
+      groupTextId: "",
+      texts: {
+        groupId: "",
+        iso: "",
+        primary: false,
+        description: "",
+        getInvolved: "",
+        donationPrompt: "",
+      },
     },
 
     groups: [],
@@ -49,101 +52,170 @@ export const useGroupStore = defineStore("group", {
   actions: {
     // MARK: Create
 
-    async create() {},
+    async create(formData: GroupCreateFormData) {
+      this.loading = true;
+
+      const token = localStorage.getItem("accessToken");
+
+      const responseGroup = await useFetch(
+        `${BASE_BACKEND_URL}/entities/groups/`,
+        {
+          method: "POST",
+          body: JSON.stringify({
+            name: formData.name,
+            location: formData.location,
+            tagline: formData.tagline,
+            social_accounts: formData.social_accounts,
+            created_by: "cdfecc96-2dd5-435b-baba-a7610afee70e",
+            description: formData.description,
+            topics: formData.topics,
+            high_risk: false,
+            total_flags: 0,
+            acceptance_date: new Date(),
+          }),
+          headers: {
+            Authorization: `Token ${token}`,
+          },
+        }
+      );
+
+      const responseGroupData = responseGroup.data.value as unknown as Group;
+
+      if (responseGroup) {
+        this.loading = false;
+        return responseGroupData.id;
+      }
+
+      this.loading = false;
+      return false;
+    },
 
     // MARK: Fetch By ID
 
     async fetchById(id: string | undefined) {
       this.loading = true;
 
-      const [resGroup, resGroupOrg, resGroupTexts] = await Promise.all([
-        useAsyncData(
+      const groupRes = (
+        await useAsyncData(
           async () => await fetchWithoutToken(`/entities/groups/${id}`, {})
-        ),
-        useAsyncData(
-          async () =>
-            await fetchWithoutToken(
-              `/entities/organizations?group_id=${id}`,
-              {}
-            )
-        ),
-        // useAsyncData(
-        //   async () =>
-        //     await fetchWithoutToken(
-        //       `/entities/group_faq?group_id=${id}`,
-        //       {}
-        //     )
-        // ),
-        // useAsyncData(
-        //   async () =>
-        //     await fetchWithoutToken(
-        //       `/entities/group_resources?group_id=${id}`,
-        //       {}
-        //     )
-        // ),
-        useAsyncData(
-          async () =>
-            await fetchWithoutToken(`/entities/group_texts?group_id=${id}`, {})
-        ),
-      ]);
-
-      const groupRes = resGroup.data as unknown as PiniaResGroup;
-      const groupOrgRes = resGroupOrg.data as unknown as PiniaResOrganization[];
-      // const groupFAQRes = resGroupFAQ.data as unknown as PiniaResGroup;
-      // const groupResourcesRes =
-      //   resGroupResources.data as unknown as PiniaResGroup;
-      const groupTextsRes = resGroupTexts.data as unknown as PiniaResGroupText;
+        )
+      ).data as unknown as PiniaResGroup;
 
       const group = groupRes._value;
-      const groupOrg = groupOrgRes[0]._value;
-      // const faq = groupRes._value;
-      // const groups = groupRes._value;
-      // const resources = groupRes._value;
-      const texts = groupTextsRes._value.results[0];
-
-      const groupLocation = (await Promise.all([
-        useAsyncData(
-          async () =>
-            await fetchWithoutToken(
-              `/content/locations/${group.locationId}`,
-              {}
-            )
-        ),
-      ])) as unknown as PiniaResLocation;
-
-      const location = groupLocation._value;
 
       this.group.id = group.id;
       this.group.name = group.name;
       this.group.tagline = group.tagline;
-      this.group.organization = groupOrg.id;
+      this.group.organization = group.organization;
 
-      this.group.locationId = group.locationId;
-      this.group.lat = location.lat;
-      this.group.lon = location.lon;
-      this.group.bbox = location.bbox;
-      this.group.locationDisplayName = location.displayName;
+      this.group.location = group.location;
 
       this.group.getInvolvedUrl = group.getInvolvedUrl;
       this.group.socialLinks = group.socialLinks;
 
-      this.group.description = texts.description;
-      this.group.getInvolved = texts.getInvolved;
-      this.group.donationPrompt = texts.donationPrompt;
+      this.group.groupTextId = group.texts.groupId;
+      this.group.texts = group.texts;
 
       this.loading = false;
     },
 
     // MARK: Fetch All
 
-    async fetchAll() {},
+    async fetchAll() {
+      this.loading = true;
+
+      const responseGroups = await useAsyncData(
+        async () => await fetchWithoutToken(`/entities/groups/`, {})
+      );
+
+      const allGroups = responseGroups.data as unknown as PiniaResGroups;
+
+      if (allGroups._value) {
+        const groups = allGroups._value.map((group: Group) => {
+          return {
+            id: group.id,
+            groupName: group.groupName,
+            name: group.name,
+            tagline: group.tagline,
+            organization: group.organization,
+            createdBy: group.createdBy,
+            iconUrl: group.iconUrl,
 
-    // MARK: Update
+            location: group.location,
 
-    async update() {},
+            getInvolvedUrl: group.getInvolvedUrl,
+            socialLinks: group.socialLinks,
+            creationDate: group.creationDate,
+
+            groupTextId: group.texts.groupId,
+            texts: group.texts,
+          };
+        });
+
+        this.groups = groups;
+      }
+
+      this.loading = false;
+    },
+
+    // MARK: Update Texts
+
+    async updateTexts(group: Group, formData: GroupUpdateTextFormData) {
+      this.loading = true;
+
+      const token = localStorage.getItem("accessToken");
+
+      const responseOrg = await $fetch(
+        BASE_BACKEND_URL + `/entities/groups/${group.id}/`,
+        {
+          method: "PUT",
+          body: {
+            ...group,
+            getInvolvedUrl: formData.getInvolvedUrl,
+          },
+          headers: {
+            Authorization: `Token ${token}`,
+          },
+        }
+      );
+
+      const responseOrgTexts = await $fetch(
+        BASE_BACKEND_URL + `/entities/organization_texts/${group.groupTextId}/`,
+        {
+          method: "PUT",
+          body: {
+            primary: true,
+            description: formData.description,
+            getInvolved: formData.getInvolved,
+            donate_prompt: "",
+            orgId: group.id,
+            iso: "en",
+          },
+          headers: {
+            Authorization: `Token ${token}`,
+          },
+        }
+      );
+
+      if (responseOrg && responseOrgTexts) {
+        this.group.texts.description = formData.description;
+        this.group.texts.getInvolved = formData.getInvolved;
+        this.group.getInvolvedUrl = formData.getInvolvedUrl;
+
+        this.loading = false;
+
+        return true;
+      }
+
+      return false;
+    },
 
     // MARK: Delete
 
-    async delete() {},
+    async delete() {
+      this.loading = true;
+
+      this.loading = false;
+    },
   },
 });
diff --git a/frontend/stores/location.ts b/frontend/stores/location.ts
index 36dc0ea22..d54ec4b1a 100644
--- a/frontend/stores/location.ts
+++ b/frontend/stores/location.ts
@@ -28,13 +28,10 @@ export const useLocationStore = defineStore("location", {
     async fetchById(id: string | undefined) {
       this.loading = true;
 
-      const [resLocation] = await Promise.all([
-        useAsyncData(
-          async () => await fetchWithoutToken(`/content/locations/${id}`, {})
-        ),
-      ]);
+      const locationRes = (await useAsyncData(
+        async () => await fetchWithoutToken(`/content/locations/${id}`, {})
+      ).data) as unknown as PiniaResLocation;
 
-      const locationRes = resLocation.data as unknown as PiniaResLocation;
       const location = locationRes._value;
 
       this.location.id = location.id;
diff --git a/frontend/stores/organization.ts b/frontend/stores/organization.ts
index 4dbbac161..dd7c47d21 100644
--- a/frontend/stores/organization.ts
+++ b/frontend/stores/organization.ts
@@ -1,13 +1,8 @@
-import type { PiniaResLocation } from "~/types/content/location";
 import type {
   Organization,
   OrganizationCreateFormData,
-  OrganizationText,
   OrganizationUpdateTextFormData,
   PiniaResOrganization,
-  PiniaResOrganizationEvents,
-  PiniaResOrganizationText,
-  PiniaResOrganizationTexts,
   PiniaResOrganizations,
 } from "~/types/entities/organization";
 import type { AddPayload } from "~/types/social-links-payload";
@@ -32,21 +27,23 @@ export const useOrganizationStore = defineStore("organization", {
       createdBy: "",
       iconUrl: "",
 
-      locationId: "",
-      lat: "",
-      lon: "",
-      bbox: [""],
-      locationDisplayName: "",
+      location: { id: "", lat: "", lon: "", bbox: [""], displayName: "" },
 
       getInvolvedUrl: "",
       socialLinks: [""],
       status: 1,
+      creationDate: "",
       groups: [],
 
       organizationTextId: "",
-      description: "",
-      getInvolved: "",
-      donationPrompt: "",
+      texts: {
+        orgId: "",
+        iso: "",
+        primary: false,
+        description: "",
+        getInvolved: "",
+        donationPrompt: "",
+      },
     },
 
     organizations: [],
@@ -85,10 +82,10 @@ export const useOrganizationStore = defineStore("organization", {
 
       if (responseOrg) {
         this.loading = false;
-
         return responseOrgData.id;
       }
 
+      this.loading = false;
       return false;
     },
 
@@ -97,72 +94,11 @@ export const useOrganizationStore = defineStore("organization", {
     async fetchById(id: string | undefined) {
       this.loading = true;
 
-      const [responseOrg, responseOrgTexts, responseOrgEvents] =
-        await Promise.all([
-          useAsyncData(
-            async () =>
-              await fetchWithoutToken(`/entities/organizations/${id}`, {})
-          ),
-          useAsyncData(
-            async () =>
-              await fetchWithoutToken(
-                `/entities/organization_texts?org_id=${id}`,
-                {}
-              )
-          ),
-          useAsyncData(
-            async () =>
-              await fetchWithoutToken(
-                `/entities/organization_events?org_id=${id}`,
-                {}
-              )
-          ),
-          // useAsyncData(
-          //   async () =>
-          //     await fetchWithoutToken(
-          //       `/entities/organization_faq?org_id=${id}`,
-          //       {}
-          //     )
-          // ),
-          // useAsyncData(
-          //   async () =>
-          //     await fetchWithoutToken(
-          //       `/entities/organization_resources?org_id=${id}`,
-          //       {}
-          //     )
-          // ),
-        ]);
-
-      const orgRes = responseOrg.data as unknown as PiniaResOrganization;
-      const orgTextsRes =
-        responseOrgTexts.data as unknown as PiniaResOrganizationText;
-      const orgEventsRes =
-        responseOrgEvents.data as unknown as PiniaResOrganizationEvents;
-      // const orgGroupRes = responseOrgGroups.data as unknown as PiniaResOrganizationGroup;
-      // const orgFAQRes = responseOrgFAQ.data as unknown as PiniaResOrganizationFAQ;
-      // const orgResourcesRes =
-      //   responseOrgResources.data as unknown as PiniaResOrganizationResource;
-
-      const organization = orgRes._value;
-      const texts = orgTextsRes._value.results[0];
-      const events = orgEventsRes._value.results;
-      // const faq = orgRes._value;
-      // const groups = orgRes._value;
-      // const resources = orgRes._value;
-
-      const orgLocation = (
-        await Promise.all([
-          useAsyncData(
-            async () =>
-              await fetchWithoutToken(
-                `/content/locations/${organization.locationId}`,
-                {}
-              )
-          ),
-        ])
-      )[0].data as unknown as PiniaResLocation;
-
-      const location = orgLocation._value;
+      const responseOrg = (await useAsyncData(
+        async () => await fetchWithoutToken(`/entities/organizations/${id}`, {})
+      ).data) as unknown as PiniaResOrganization;
+
+      const organization = responseOrg._value;
 
       this.organization.id = organization.id;
       this.organization.orgName = organization.orgName;
@@ -170,23 +106,16 @@ export const useOrganizationStore = defineStore("organization", {
       this.organization.tagline = organization.tagline;
       this.organization.iconUrl = organization.iconUrl;
 
-      this.organization.locationId = organization.locationId;
-      this.organization.lat = location.lat;
-      this.organization.lon = location.lon;
-      this.organization.bbox = location.bbox;
-      this.organization.locationDisplayName = location.displayName;
+      this.organization.location = organization.location;
 
       this.organization.getInvolvedUrl = organization.getInvolvedUrl;
       this.organization.socialLinks = organization.socialLinks;
       this.organization.status = organization.status;
 
-      this.organization.organizationTextId = texts.id;
-      this.organization.description = texts.description;
-      this.organization.getInvolved = texts.getInvolved;
-      this.organization.donationPrompt = texts.donationPrompt;
+      this.organization.organizationTextId = organization.texts.orgId;
+      this.organization.texts = organization.texts;
 
       this.organization.groups = organization.groups;
-      this.organization.events = events;
 
       this.loading = false;
     },
@@ -196,79 +125,42 @@ export const useOrganizationStore = defineStore("organization", {
     async fetchAll() {
       this.loading = true;
 
-      const [responseOrgs] = await Promise.all([
-        useAsyncData(
-          async () => await fetchWithoutToken(`/entities/organizations/`, {})
-        ),
-      ]);
+      const responseOrgs = await useAsyncData(
+        async () => await fetchWithoutToken(`/entities/organizations/`, {})
+      );
 
       const orgs = responseOrgs.data as unknown as PiniaResOrganizations;
 
       if (orgs._value) {
-        const responseOrgTexts = (await Promise.all([
-          useAsyncData(
-            async () =>
-              await fetchWithoutToken(`/entities/organization_texts/`, {})
-          ),
-        ])) as unknown as PiniaResOrganizationTexts[];
-
-        const orgTextsData = responseOrgTexts.map(
-          (text) => text.data._value.results
-        )[0] as unknown as OrganizationText[];
-
-        // Order texts based on the returned organizations.
-        const orgIds = orgs._value.map((o) => o.id);
-        const sortedOrgTextsData: OrganizationText[] = [];
-        for (const id of orgIds) {
-          for (const text of orgTextsData) {
-            if (text.orgId === id) {
-              sortedOrgTextsData.push(text);
-            }
-          }
-        }
-
-        // const sortedOrgLocations: Location[];
-        // Note: Ideally we'd have a bridge table of locations that are only for orgs.
-
-        const organizationsWithTexts = orgs._value.map(
-          (organization: Organization, index: number) => {
-            const texts = sortedOrgTextsData[index];
-            return {
-              id: organization.id,
-              orgName: organization.orgName,
-              name: organization.name,
-              tagline: organization.tagline,
-              createdBy: organization.createdBy,
-              iconUrl: organization.iconUrl,
-
-              locationId: organization.locationId,
-              lat: organization.lat,
-              lon: organization.lon,
-              bbox: organization.bbox,
-              locationDisplayName: organization.locationDisplayName,
-
-              getInvolvedUrl: organization.getInvolvedUrl,
-              socialLinks: organization.socialLinks,
-              status: organization.status,
-              groups: organization.groups,
-
-              organizationTextId: texts.id,
-              description: texts.description,
-              getInvolved: texts.getInvolved,
-              donationPrompt: texts.donationPrompt,
-            };
-          }
-        );
-
-        console.log(`Here: ${JSON.stringify(organizationsWithTexts)}`);
-
-        this.organizations = organizationsWithTexts;
+        const organizations = orgs._value.map((org: Organization) => {
+          return {
+            id: org.id,
+            orgName: org.orgName,
+            name: org.name,
+            tagline: org.tagline,
+            createdBy: org.createdBy,
+            iconUrl: org.iconUrl,
+
+            location: org.location,
+
+            getInvolvedUrl: org.getInvolvedUrl,
+            socialLinks: org.socialLinks,
+            status: org.status,
+            creationDate: org.creationDate,
+            groups: org.groups,
+
+            organizationTextId: org.texts.orgId,
+            texts: org.texts,
+          };
+        });
+
+        this.organizations = organizations;
       }
 
       this.loading = false;
     },
 
-    // MARK: Update
+    // MARK: Update Texts
 
     async updateTexts(
       org: Organization,
@@ -302,7 +194,7 @@ export const useOrganizationStore = defineStore("organization", {
             description: formData.description,
             getInvolved: formData.getInvolved,
             donate_prompt: "",
-            org_id: org.id,
+            orgId: org.id,
             iso: "en",
           },
           headers: {
@@ -312,8 +204,8 @@ export const useOrganizationStore = defineStore("organization", {
       );
 
       if (responseOrg && responseOrgTexts) {
-        this.organization.description = formData.description;
-        this.organization.getInvolved = formData.getInvolved;
+        this.organization.texts.description = formData.description;
+        this.organization.texts.getInvolved = formData.getInvolved;
         this.organization.getInvolvedUrl = formData.getInvolvedUrl;
 
         this.loading = false;
diff --git a/frontend/types/content/resource.d.ts b/frontend/types/content/resource.d.ts
index 4986dbae3..a784a9ca7 100644
--- a/frontend/types/content/resource.d.ts
+++ b/frontend/types/content/resource.d.ts
@@ -1,3 +1,4 @@
+import type { Location } from "~/types/content/location";
 import type { Organization } from "../entities/organization";
 
 // MARK: Main Table
@@ -9,7 +10,7 @@ export interface Resource {
   description: string;
   // category: string;
   organization: Organization;
-  locationId: string;
+  location: Location;
   resourceUrl: string;
   // isPrivate?: boolean;
   creationDate?: string;
diff --git a/frontend/types/entities/group.d.ts b/frontend/types/entities/group.d.ts
index 5ef7b1775..1af6bed4e 100644
--- a/frontend/types/entities/group.d.ts
+++ b/frontend/types/entities/group.d.ts
@@ -1,3 +1,5 @@
+import type { Location } from "~/types/content/location";
+
 // MARK: Main Table
 
 export interface Group {
@@ -7,32 +9,26 @@ export interface Group {
   tagline: string;
   organization: Organization;
   createdBy: User;
-  // category?: string;
+  iconUrl?: string;
 
-  locationId: string;
-  lat: string;
-  lon: string;
-  bbox: string[];
-  locationDisplayName: string;
+  location: Location;
 
   getInvolvedUrl: string;
   socialLinks: string[];
   creationDate: string;
-  // deletionDate: string;
 
   // group_event
-  // events: Event[];
+  events?: Event[];
 
-  // faq
+  // group_faq
   faqEntries?: FaqEntry[];
 
   // group_resource
   resources?: Resource[];
 
   // group_text
-  description: string;
-  getInvolved: string;
-  donationPrompt: string;
+  groupTextId: string;
+  texts: GroupText;
 
   // group_topic
   // topics?: Topic[];
@@ -91,19 +87,26 @@ export interface PiniaResGroup {
   _value: Group;
 }
 
-export interface PiniaResGroupText {
+export interface PiniaResGroups {
   __v_isShallow: boolean;
   __v_isRef: boolean;
-  _rawValue: {
-    count: integer;
-    next: null;
-    previous: null;
-    results: GroupText[];
-  };
-  _value: {
-    count: integer;
-    next: null;
-    previous: null;
-    results: GroupText[];
-  };
+  _rawValue: Group[];
+  _value: Group[];
+}
+
+// MARK: Form Data
+
+export interface GroupCreateFormData {
+  name: string;
+  tagline: string;
+  location: string;
+  description: string;
+  social_accounts: string[];
+  topics: Topic[];
+}
+
+export interface GroupUpdateTextFormData {
+  description: string;
+  getInvolved: string;
+  getInvolvedUrl: string;
 }
diff --git a/frontend/types/entities/organization.d.ts b/frontend/types/entities/organization.d.ts
index 5dd47dc17..78bcba262 100644
--- a/frontend/types/entities/organization.d.ts
+++ b/frontend/types/entities/organization.d.ts
@@ -1,3 +1,5 @@
+import type { Location } from "~/types/content/location";
+
 // MARK: Main Table
 
 export interface Organization {
@@ -8,11 +10,7 @@ export interface Organization {
   createdBy: string;
   iconUrl: string;
 
-  locationId: string;
-  lat: string;
-  lon: string;
-  bbox: string[];
-  locationDisplayName: string;
+  location: Location;
 
   getInvolvedUrl: string;
   socialLinks: string[];
@@ -24,14 +22,15 @@ export interface Organization {
   // organization_application
   // orgsInFavor?: Organization[];
   // orgsAgainst?: Organization[];
-  creationDate?: string;
+  creationDate: string;
 
   // discussion
   // discussions?: Discussion[];
 
-  // faq
+  // organization_faq
   faqEntries?: FaqEntry[];
 
+  // organization_group
   groups?: Group[];
 
   // organization_event
@@ -43,10 +42,9 @@ export interface Organization {
   // organization_task
   // task?: Task[];
 
+  // organization_text
   organizationTextId: string;
-  description: string;
-  getInvolved: string;
-  donationPrompt: string;
+  texts: OrganizationText;
 
   // organization_topic
   // topics?: Topic[];
@@ -88,7 +86,6 @@ export interface OrganizationTask {
 }
 
 export interface OrganizationText {
-  id: string;
   orgId: string;
   iso: string;
   primary: boolean;
@@ -118,76 +115,6 @@ export interface PiniaResOrganizations {
   _value: Organization[];
 }
 
-export interface PiniaResOrganizationEvents {
-  __v_isShallow: boolean;
-  __v_isRef: boolean;
-  _rawValue: {
-    count: integer;
-    next: null;
-    previous: null;
-    results: Event[];
-  };
-  _value: {
-    count: integer;
-    next: null;
-    previous: null;
-    results: Event[];
-  };
-}
-
-export interface PiniaResOrganizationText {
-  __v_isShallow: boolean;
-  __v_isRef: boolean;
-  _rawValue: {
-    count: integer;
-    next: null;
-    previous: null;
-    results: OrganizationText[];
-  };
-  _value: {
-    count: integer;
-    next: null;
-    previous: null;
-    results: OrganizationText[];
-  };
-}
-
-export interface PiniaResOrganizationTexts {
-  data: {
-    __v_isShallow: boolean;
-    __v_isRef: boolean;
-    _rawValue: {
-      count: number;
-      next: null;
-      previous: null;
-      results: OrganizationText[];
-    };
-    _value: {
-      count: number;
-      next: null;
-      previous: null;
-      results: OrganizationText[];
-    };
-  };
-  pending: {
-    __v_isShallow: boolean;
-    __v_isRef: boolean;
-    _rawValue: boolean;
-    _value: boolean;
-  };
-  error: {
-    _object: { [$key: string]: null };
-    _key: string;
-    __v_isRef: boolean;
-  };
-  status: {
-    __v_isShallow: boolean;
-    __v_isRef: boolean;
-    _rawValue: string;
-    _value: string;
-  };
-}
-
 // MARK: Form Data
 
 export interface OrganizationCreateFormData {
diff --git a/frontend/types/events/event.d.ts b/frontend/types/events/event.d.ts
index 9a3588d7c..cd77c0c1f 100644
--- a/frontend/types/events/event.d.ts
+++ b/frontend/types/events/event.d.ts
@@ -1,3 +1,5 @@
+import type { Location } from "~/types/content/location";
+
 // MARK: Main Table
 
 export interface Event {
@@ -9,11 +11,7 @@ export interface Event {
   type: "action" | "learn";
   onlineLocationLink?: string;
 
-  offlineLocationId?: string;
-  lat: string;
-  lon: string;
-  bbox: string[];
-  locationDisplayName: string;
+  offlineLocation?: Location;
 
   getInvolvedUrl?: string;
   socialLinks: string[];
@@ -34,9 +32,9 @@ export interface Event {
   // event_task
   // task?: Task[];
 
+  // event_text
   eventTextId: string;
-  description: string;
-  getInvolved: string;
+  texts: EventText;
 
   // support
   // supportingOrgs?: Organization[];
@@ -111,55 +109,19 @@ export interface PiniaResEvents {
   _value: Event[];
 }
 
-export interface PiniaResEventText {
-  __v_isShallow: boolean;
-  __v_isRef: boolean;
-  _rawValue: {
-    count: integer;
-    next: null;
-    previous: null;
-    results: EventText[];
-  };
-  _value: {
-    count: integer;
-    next: null;
-    previous: null;
-    results: EventText[];
-  };
+// MARK: Form Data
+
+export interface EventCreateFormData {
+  name: string;
+  tagline: string;
+  location: string;
+  description: string;
+  social_accounts: string[];
+  topics: Topic[];
 }
 
-export interface PiniaResEventTexts {
-  data: {
-    __v_isShallow: boolean;
-    __v_isRef: boolean;
-    _rawValue: {
-      count: number;
-      next: null;
-      previous: null;
-      results: EventText[];
-    };
-    _value: {
-      count: number;
-      next: null;
-      previous: null;
-      results: EventText[];
-    };
-  };
-  pending: {
-    __v_isShallow: boolean;
-    __v_isRef: boolean;
-    _rawValue: boolean;
-    _value: boolean;
-  };
-  error: {
-    _object: { [$key: string]: null };
-    _key: string;
-    __v_isRef: boolean;
-  };
-  status: {
-    __v_isShallow: boolean;
-    __v_isRef: boolean;
-    _rawValue: string;
-    _value: string;
-  };
+export interface EventUpdateTextFormData {
+  description: string;
+  getInvolved: string;
+  getInvolvedUrl: string;
 }
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index a8d529ebe..be8b398b4 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -3820,7 +3820,7 @@ check-error@^2.1.1:
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-2.1.1.tgz#87eb876ae71ee388fa0471fe423f494be1d96ccc"
   integrity sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==
 
-chokidar@^3.5.1, chokidar@^3.5.3, chokidar@^3.6.0:
+chokidar@3.6.0, chokidar@^3.5.1, chokidar@^3.5.3, chokidar@^3.6.0, chokidar@^4.0.1:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
   integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
@@ -3835,13 +3835,6 @@ chokidar@^3.5.1, chokidar@^3.5.3, chokidar@^3.6.0:
   optionalDependencies:
     fsevents "~2.3.2"
 
-chokidar@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-4.0.1.tgz#4a6dff66798fb0f72a94f616abbd7e1a19f31d41"
-  integrity sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==
-  dependencies:
-    readdirp "^4.0.1"
-
 chownr@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
@@ -4687,6 +4680,14 @@ entities@^4.2.0, entities@^4.5.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
   integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
 
+env-cmd@10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/env-cmd/-/env-cmd-10.1.0.tgz#c7f5d3b550c9519f137fdac4dd8fb6866a8c8c4b"
+  integrity sha512-mMdWTT9XKN7yNth/6N6g2GuKuJTsKMDHlQFUDacb/heQRRWOTIZ42t1rMHnQu4jYxU1ajdTeJM+9eEETlqToMA==
+  dependencies:
+    commander "^4.0.0"
+    cross-spawn "^7.0.0"
+
 error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
@@ -8917,11 +8918,6 @@ readdir-glob@^1.1.2:
   dependencies:
     minimatch "^5.1.0"
 
-readdirp@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-4.0.2.tgz#388fccb8b75665da3abffe2d8f8ed59fe74c230a"
-  integrity sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==
-
 readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"