diff --git a/README.md b/README.md
index 56cf5961..e5480a64 100644
--- a/README.md
+++ b/README.md
@@ -80,7 +80,6 @@ DATABASE_URL="postgis://test:my_passwd@localhost:5432/boranga_dev"
 LEDGER_DATABASE_URL='postgis://test:my_passwd@localhost:5432/boranga_dev'
 LEDGER_API_URL="http://localhost:8000"
 LEDGER_API_KEY="ledger_api_key__from__ledger_api_admin"
-SYSTEM_GROUPS=['Boranga Admin']
 SITE_PREFIX='boranga-dev'
 SITE_DOMAIN='dbca.wa.gov.au'
 SECRET_KEY='SECRET_KEY_YO'
@@ -94,7 +93,6 @@ DJANGO_HTTPS=True
 DEFAULT_FROM_EMAIL='no-reply@dbca.wa.gov.au'
 ALLOWED_HOSTS=['*']
 DEV_APP_BUILD_URL="http://localhost:8080/app.js"
-CONSOLE_EMAIL_BACKEND=True
 
 ```
 
diff --git a/boranga/components/conservation_status/email.py b/boranga/components/conservation_status/email.py
index f9e61615..0f2986bd 100644
--- a/boranga/components/conservation_status/email.py
+++ b/boranga/components/conservation_status/email.py
@@ -470,12 +470,18 @@ def send_approver_approve_email_notification(request, conservation_status):
     return msg
 
 
-def send_assessor_ready_for_agenda_email_notification(request, conservation_status):
+def send_assessor_ready_for_agenda_email_notification(
+    request, conservation_status, assessor_comment
+):
     """Recipient: Always internal users"""
 
     email = AssessorReadyForAgendaSendNotificationEmail()
     url = request.build_absolute_uri(reverse("internal-meeting-dashboard", kwargs={}))
-    context = {"cs_proposal": conservation_status, "url": url}
+    context = {
+        "cs_proposal": conservation_status,
+        "url": url,
+        "assessor_comment": assessor_comment,
+    }
 
     msg = email.send(conservation_status.assessor_recipients, context=context)
 
diff --git a/boranga/components/conservation_status/models.py b/boranga/components/conservation_status/models.py
index fa52f0f2..4237b531 100644
--- a/boranga/components/conservation_status/models.py
+++ b/boranga/components/conservation_status/models.py
@@ -49,6 +49,7 @@
     is_external_contributor,
     is_internal_contributor,
     member_ids,
+    no_commas_validator,
 )
 from boranga.ledger_api_utils import retrieve_email_user
 from boranga.settings import (
@@ -414,15 +415,9 @@ class ConservationStatus(SubmitterInformationModelMixin, RevisionedMixin):
         (PROCESSING_STATUS_DELISTED, "DeListed"),
         (PROCESSING_STATUS_CLOSED, "Closed"),
     )
-    # This status is used as a front end filter but shouldn't be in most cases
+    # This status is used as a front end filter but shouldn't be used in most cases
     # So it is deliberately not included in PROCESSING_STATUS_CHOICES
     PROCESSING_STATUS_DISCARDED_BY_ME = "discarded_by_me"
-    REVIEW_STATUS_CHOICES = (
-        ("not_reviewed", "Not Reviewed"),
-        ("awaiting_amendments", "Awaiting Amendments"),
-        ("amended", "Amended"),
-        ("accepted", "Accepted"),
-    )
     customer_status = models.CharField(
         "Customer Status",
         max_length=40,
@@ -430,11 +425,9 @@ class ConservationStatus(SubmitterInformationModelMixin, RevisionedMixin):
         default=CUSTOMER_STATUS_CHOICES[0][0],
     )
 
-    RECURRENCE_PATTERNS = [(1, "Month"), (2, "Year")]
     change_code = models.ForeignKey(
         ConservationChangeCode, on_delete=models.SET_NULL, blank=True, null=True
     )
-    change_date = models.DateField(null=True, blank=True)
 
     APPLICATION_TYPE_CHOICES = (
         ("new_proposal", "New Application"),
@@ -531,44 +524,6 @@ class ConservationStatus(SubmitterInformationModelMixin, RevisionedMixin):
     international_conservation = models.CharField(max_length=100, blank=True, null=True)
     conservation_criteria = models.CharField(max_length=100, blank=True, null=True)
 
-    # Conservation Lists and Categories (from a meeting)
-    recommended_wa_priority_list = models.ForeignKey(
-        WAPriorityList,
-        on_delete=models.PROTECT,
-        blank=True,
-        null=True,
-    )
-    recommended_wa_priority_category = models.ForeignKey(
-        WAPriorityCategory,
-        on_delete=models.PROTECT,
-        blank=True,
-        null=True,
-    )
-    recommended_wa_legislative_list = models.ForeignKey(
-        WALegislativeList,
-        on_delete=models.PROTECT,
-        blank=True,
-        null=True,
-    )
-    recommended_wa_legislative_category = models.ForeignKey(
-        WALegislativeCategory,
-        on_delete=models.PROTECT,
-        blank=True,
-        null=True,
-    )
-    recommended_commonwealth_conservation_list = models.ForeignKey(
-        CommonwealthConservationList,
-        on_delete=models.PROTECT,
-        blank=True,
-        null=True,
-    )
-    recommended_international_conservation = models.CharField(
-        max_length=100, blank=True, null=True
-    )
-    recommended_conservation_criteria = models.CharField(
-        max_length=100, blank=True, null=True
-    )
-
     APPROVAL_LEVEL_IMMEDIATE = "immediate"
     APPROVAL_LEVEL_MINISTER = "minister"
     APPROVAL_LEVEL_CHOICES = (
@@ -584,11 +539,6 @@ class ConservationStatus(SubmitterInformationModelMixin, RevisionedMixin):
 
     comment = models.CharField(max_length=512, blank=True, null=True)
     review_due_date = models.DateField(null=True, blank=True)
-    reviewed_by = models.IntegerField(null=True)  # EmailUserRO
-    recurrence_pattern = models.SmallIntegerField(
-        choices=RECURRENCE_PATTERNS, default=1
-    )
-    recurrence_schedule = models.IntegerField(null=True, blank=True)
     effective_from = models.DateField(null=True, blank=True)
     effective_to = models.DateField(null=True, blank=True)
     submitter = models.IntegerField(null=True)  # EmailUserRO
@@ -613,15 +563,12 @@ class ConservationStatus(SubmitterInformationModelMixin, RevisionedMixin):
     # Currently prev_processing_status is only used to keep track of status prior to unlock
     # so that when locked the record returns to the correct status
     prev_processing_status = models.CharField(max_length=30, blank=True, null=True)
-    review_status = models.CharField(
-        "Review Status",
-        max_length=30,
-        choices=REVIEW_STATUS_CHOICES,
-        default=REVIEW_STATUS_CHOICES[0][0],
-    )
     proposed_decline_status = models.BooleanField(default=False)
     deficiency_data = models.TextField(null=True, blank=True)  # deficiency comment
     assessor_data = models.TextField(null=True, blank=True)  # assessor comment
+
+    # When the CS proposal is sent back to the assessor this comment is used
+    # in the email
     approver_comment = models.TextField(blank=True)
     internal_application = models.BooleanField(default=False)
 
@@ -968,19 +915,20 @@ def has_assessor_mode(self, request):
             ConservationStatus.PROCESSING_STATUS_WITH_APPROVER,
             ConservationStatus.PROCESSING_STATUS_CLOSED,
             ConservationStatus.PROCESSING_STATUS_DECLINED,
+            ConservationStatus.PROCESSING_STATUS_DELISTED,
             ConservationStatus.PROCESSING_STATUS_DRAFT,
         ]
         if self.processing_status in status_without_assessor:
-            if self.processing_status in [
-                ConservationStatus.PROCESSING_STATUS_UNLOCKED,
-            ]:
-                return is_conservation_status_approver(request)
-
             return False
-        elif self.processing_status == ConservationStatus.PROCESSING_STATUS_APPROVED:
-            return is_conservation_status_assessor(
-                request
-            ) or is_conservation_status_approver(request)
+
+        if self.processing_status == ConservationStatus.PROCESSING_STATUS_APPROVED:
+            # Edge case that allows assessors to propose to delist without being assigned
+            # to the conservation status. This is due to the fact we only show either
+            # the assigned to dropdown for the approver or assessor and not both.
+            return is_conservation_status_assessor(request)
+
+        elif self.processing_status == ConservationStatus.PROCESSING_STATUS_UNLOCKED:
+            return is_conservation_status_approver(request)
         else:
             if not self.assigned_officer:
                 return False
@@ -990,21 +938,6 @@ def has_assessor_mode(self, request):
 
             return is_conservation_status_assessor(request)
 
-    def can_edit_recommended(self, request):
-        recommended_edit_status = [
-            ConservationStatus.PROCESSING_STATUS_READY_FOR_AGENDA
-        ]
-        if self.processing_status not in recommended_edit_status:
-            return False
-
-        if not self.assigned_officer:
-            return False
-
-        if not self.assigned_officer == request.user.id:
-            return False
-
-        return is_conservation_status_assessor(request)
-
     @transaction.atomic
     def assign_officer(self, request, officer):
         if not is_conservation_status_assessor(
@@ -1141,39 +1074,47 @@ def send_referral(self, request, referral_email, referral_text):
         ]:
             raise exceptions.ConservationStatusReferralCannotBeSent()
 
-        self.processing_status = ConservationStatus.PROCESSING_STATUS_WITH_REFERRAL
-        self.save()
-        referral = None
-
         # Check if the user is in ledger
         try:
-            user = EmailUser.objects.get(email__icontains=referral_email)
+            referee = EmailUser.objects.get(email__iexact=referral_email.strip())
         except EmailUser.DoesNotExist:
             raise ValidationError(
                 f"There is no user with email {referral_email} in the ledger system. "
                 "Please check the email and try again."
             )
 
+        # Don't allow users to refer to themselves
+        if referee.id == request.user.id:
+            raise ValidationError("You cannot refer to yourself")
+
+        # Don't allow users to refer to the submitter
+        if referee.id == self.submitter:
+            raise ValidationError("You cannot refer to the submitter")
+
+        referral = None
         try:
             ConservationStatusReferral.objects.get(
-                referral=user.id, conservation_status=self
+                referral=referee.id, conservation_status=self
             )
             raise ValidationError("A referral has already been sent to this user")
         except ConservationStatusReferral.DoesNotExist:
             referral = ConservationStatusReferral.objects.create(
                 conservation_status=self,
-                referral=user.id,
+                referral=referee.id,
                 sent_by=request.user.id,
                 text=referral_text,
                 assigned_officer=request.user.id,
             )
 
+        self.processing_status = ConservationStatus.PROCESSING_STATUS_WITH_REFERRAL
+        self.save()
+
         # Create a log entry for the proposal
         self.log_user_action(
             ConservationStatusUserAction.ACTION_SEND_REFERRAL_TO.format(
                 referral.id,
                 self.conservation_status_number,
-                f"{user.get_full_name()}({user.email})",
+                f"{referee.get_full_name()}({referee.email})",
             ),
             request,
         )
@@ -1183,7 +1124,7 @@ def send_referral(self, request, referral_email, referral_text):
             ConservationStatusUserAction.ACTION_SEND_REFERRAL_TO.format(
                 referral.id,
                 self.conservation_status_number,
-                f"{user.get_full_name()}({user.email})",
+                f"{referee.get_full_name()}({referee.email})",
             ),
             request,
         )
@@ -1216,12 +1157,16 @@ def move_to_status(self, request, status, approver_comment):
         if self.processing_status == status:
             return
 
-        if self.processing_status == ConservationStatus.PROCESSING_STATUS_WITH_APPROVER:
+        if (
+            self.processing_status
+            == ConservationStatus.PROCESSING_STATUS_READY_FOR_AGENDA
+        ):
             self.approver_comment = ""
             if approver_comment:
                 self.approver_comment = approver_comment
                 self.save()
                 send_proposal_approver_sendback_email_notification(request, self)
+
         previous_status = self.processing_status
         self.processing_status = status
         self.save()
@@ -1558,10 +1503,12 @@ def proposed_ready_for_agenda(self, request):
         self.customer_status = ConservationStatus.PROCESSING_STATUS_READY_FOR_AGENDA
         self.save()
 
+        assessor_comment = request.data.get("assessor_comment")
+
         # Log proposal action
         self.log_user_action(
             ConservationStatusUserAction.ACTION_PROPOSED_READY_FOR_AGENDA.format(
-                self.conservation_status_number
+                self.conservation_status_number, assessor_comment
             ),
             request,
         )
@@ -1569,12 +1516,14 @@ def proposed_ready_for_agenda(self, request):
         # Create a log entry for the user
         request.user.log_user_action(
             ConservationStatusUserAction.ACTION_PROPOSED_READY_FOR_AGENDA.format(
-                self.conservation_status_number,
+                self.conservation_status_number, assessor_comment
             ),
             request,
         )
 
-        send_assessor_ready_for_agenda_email_notification(request, self)
+        send_assessor_ready_for_agenda_email_notification(
+            request, self, assessor_comment
+        )
 
     @transaction.atomic
     def discard(self, request):
@@ -1971,6 +1920,10 @@ class ConservationStatusUserAction(UserAction):
     ACTION_PROPOSE_DELIST_PROPOSAL = (
         "Propose discard conservation status proposal {}. Reason: {}"
     )
+    ACTION_PROPOSED_READY_FOR_AGENDA = (
+        "Propose conservation status proposal {} "
+        "is ready for agenda. Assessor Comment: {}"
+    )
     ACTION_DELIST_PROPOSAL = "Delist conservation status proposal {}"
     ACTION_DISCARD_PROPOSAL_INTERNALLY = (
         "Discard conservation status proposal internally {}"
@@ -1986,9 +1939,6 @@ class ConservationStatusUserAction(UserAction):
     # Assessors
     ACTION_SAVE_ASSESSMENT_ = "Save assessment {}"
     ACTION_CONCLUDE_ASSESSMENT_ = "Conclude assessment {}"
-    ACTION_PROPOSED_READY_FOR_AGENDA = (
-        "Conservation status proposal {} has been proposed for ready for agenda"
-    )
     ACTION_PROPOSED_APPROVAL = (
         "Conservation status proposal {} has been proposed for approval"
     )
@@ -2134,36 +2084,7 @@ class Meta:
         app_label = "boranga"
 
 
-class ConservationStatusReferralDocument(Document):
-    referral = models.ForeignKey(
-        "ConservationStatusReferral",
-        related_name="referral_documents",
-        on_delete=models.CASCADE,
-    )
-    _file = models.FileField(
-        upload_to=update_referral_doc_filename, max_length=512, storage=private_storage
-    )
-    input_name = models.CharField(max_length=255, null=True, blank=True)
-    can_delete = models.BooleanField(
-        default=True
-    )  # after initial submit prevent document from being deleted
-
-    def delete(self):
-        if self.can_delete:
-            return self.can_delete
-        logger.info(
-            "Cannot delete existing document object after proposal has been submitted "
-            "(including document submitted before proposal pushback to status Draft): {}".format(
-                self.name
-            )
-        )
-
-    class Meta:
-        app_label = "boranga"
-
-
 class ConservationStatusReferral(models.Model):
-    SENT_CHOICES = ((1, "Sent From Assessor"), (2, "Sent From Referral"))
     PROCESSING_STATUS_WITH_REFERRAL = "with_referral"
     PROCESSING_STATUS_RECALLED = "recalled"
     PROCESSING_STATUS_COMPLETED = "completed"
@@ -2179,9 +2100,6 @@ class ConservationStatusReferral(models.Model):
     sent_by = models.IntegerField()  # EmailUserRO
     referral = models.IntegerField()  # EmailUserRO
     linked = models.BooleanField(default=False)
-    sent_from = models.SmallIntegerField(
-        choices=SENT_CHOICES, default=SENT_CHOICES[0][0]
-    )
     processing_status = models.CharField(
         "Processing Status",
         max_length=30,
@@ -2189,17 +2107,7 @@ class ConservationStatusReferral(models.Model):
         default=PROCESSING_STATUS_CHOICES[0][0],
     )
     text = models.TextField(blank=True)  # Assessor text when send_referral
-    referral_text = models.TextField(
-        blank=True
-    )  # used in other projects for complete referral comment but not used in boranga
     referral_comment = models.TextField(blank=True, null=True)  # Referral Comment
-    document = models.ForeignKey(
-        ConservationStatusReferralDocument,
-        blank=True,
-        null=True,
-        related_name="referral_document",
-        on_delete=models.SET_NULL,
-    )
     assigned_officer = models.IntegerField(null=True)  # EmailUserRO
     is_external = models.BooleanField(default=False)
 
@@ -2306,7 +2214,6 @@ def resend(self, request):
         )
         self.conservation_status.save()
 
-        self.sent_from = 1
         self.save()
 
         # Create a log entry for the conservation status
@@ -2341,10 +2248,14 @@ def send_referral(self, request, referral_email, referral_text):
         ):
             raise exceptions.ConservationStatusReferralCannotBeSent()
 
-        if request.user.id != self.referral:
-            raise exceptions.ReferralNotAuthorized()
-        if self.sent_from != 1:
-            raise exceptions.ReferralCanNotSend()
+        # Don't allow users to refer to themselves
+        if request.user.id == self.referral:
+            raise ValidationError("You cannot refer to yourself")
+
+        # Don't allow users to refer to the submitter
+        if request.user.id == self.conservation_status.submitter:
+            raise ValidationError("You cannot refer to the submitter")
+
         self.conservation_status.processing_status = (
             ConservationStatus.PROCESSING_STATUS_WITH_REFERRAL
         )
@@ -2377,7 +2288,6 @@ def send_referral(self, request, referral_email, referral_text):
                 conservation_status=self.conservation_status,
                 referral=referee.id,
                 sent_by=request.user.id,
-                sent_from=2,
                 text=referral_text,
             )
 
@@ -2461,16 +2371,16 @@ class ConservationStatusProposalRequest(models.Model):
     conservation_status = models.ForeignKey(
         ConservationStatus, on_delete=models.CASCADE
     )
-    subject = models.CharField(max_length=200, blank=True)
     text = models.TextField(blank=True)
-    officer = models.IntegerField(null=True)  # EmailUserRO
 
     class Meta:
         app_label = "boranga"
 
 
 class ProposalAmendmentReason(ArchivableModel):
-    reason = models.CharField("Reason", max_length=125)
+    reason = models.CharField(
+        "Reason", max_length=125, validators=[no_commas_validator]
+    )
 
     class Meta:
         app_label = "boranga"
diff --git a/boranga/components/conservation_status/serializers.py b/boranga/components/conservation_status/serializers.py
index 0fa1f03d..f0f65366 100644
--- a/boranga/components/conservation_status/serializers.py
+++ b/boranga/components/conservation_status/serializers.py
@@ -530,21 +530,11 @@ class BaseConservationStatusSerializer(serializers.ModelSerializer):
     group_type = serializers.SerializerMethodField(read_only=True)
     group_type_id = serializers.SerializerMethodField(read_only=True)
     is_submitter = serializers.SerializerMethodField(read_only=True)
-    wa_legislative_list = serializers.CharField(
-        source="wa_legislative_list.code", read_only=True, allow_null=True
-    )
-    wa_legislative_category = serializers.CharField(
-        source="wa_legislative_category.code", read_only=True, allow_null=True
-    )
-    wa_priority_list = serializers.CharField(
-        source="wa_priority_list.code", read_only=True, allow_null=True
-    )
-    wa_priority_category = serializers.CharField(
-        source="wa_priority_category.code", read_only=True, allow_null=True
-    )
-    commonwealth_conservation_list = serializers.CharField(
-        source="commonwealth_conservation_list.code", read_only=True, allow_null=True
-    )
+    wa_legislative_list = serializers.SerializerMethodField(read_only=True)
+    wa_legislative_category = serializers.SerializerMethodField(read_only=True)
+    wa_priority_list = serializers.SerializerMethodField(read_only=True)
+    wa_priority_category = serializers.SerializerMethodField(read_only=True)
+    commonwealth_conservation_list = serializers.SerializerMethodField(read_only=True)
 
     class Meta:
         model = ConservationStatus
@@ -568,13 +558,6 @@ class Meta:
             "commonwealth_conservation_list",
             "international_conservation",
             "conservation_criteria",
-            "recommended_wa_legislative_list_id",
-            "recommended_wa_legislative_category_id",
-            "recommended_wa_priority_list_id",
-            "recommended_wa_priority_category_id",
-            "recommended_commonwealth_conservation_list_id",
-            "recommended_international_conservation",
-            "recommended_conservation_criteria",
             "comment",
             "lodgement_date",
             "applicant_type",
@@ -583,7 +566,6 @@ class Meta:
             "assigned_officer",
             "customer_status",
             "processing_status",
-            "review_status",
             "readonly",
             "can_user_edit",
             "can_user_view",
@@ -598,6 +580,54 @@ class Meta:
             "is_submitter",
         )
 
+    def get_wa_legislative_list(self, obj):
+        if not obj.wa_legislative_list:
+            return None
+
+        if obj.wa_legislative_list.code and obj.wa_legislative_list.label:
+            return f"{obj.wa_legislative_list.code} - {obj.wa_legislative_list.label}"
+
+        return obj.wa_legislative_list.code
+
+    def get_wa_legislative_category(self, obj):
+        if not obj.wa_legislative_category:
+            return None
+
+        if obj.wa_legislative_category.code and obj.wa_legislative_category.label:
+            return f"{obj.wa_legislative_category.code} - {obj.wa_legislative_category.label}"
+
+        return obj.wa_legislative_category.code
+
+    def get_wa_priority_list(self, obj):
+        if not obj.wa_priority_list:
+            return None
+
+        if obj.wa_priority_list.code and obj.wa_priority_list.label:
+            return f"{obj.wa_priority_list.code} - {obj.wa_priority_list.label}"
+
+        return obj.wa_priority_list.code
+
+    def get_wa_priority_category(self, obj):
+        if not obj.wa_priority_category:
+            return None
+
+        if obj.wa_priority_category.code and obj.wa_priority_category.label:
+            return f"{obj.wa_priority_category.code} - {obj.wa_priority_category.label}"
+
+        return obj.wa_priority_category.code
+
+    def get_commonwealth_conservation_list(self, obj):
+        if not obj.commonwealth_conservation_list:
+            return None
+
+        if (
+            obj.commonwealth_conservation_list.code
+            and obj.commonwealth_conservation_list.label
+        ):
+            return f"{obj.commonwealth_conservation_list.code} - {obj.commonwealth_conservation_list.label}"
+
+        return obj.commonwealth_conservation_list.code
+
     def get_readonly(self, obj):
         return False
 
@@ -637,7 +667,6 @@ def get_is_submitter(self, obj):
 class ConservationStatusSerializer(BaseConservationStatusSerializer):
     submitter = serializers.SerializerMethodField(read_only=True)
     processing_status = serializers.SerializerMethodField(read_only=True)
-    review_status = serializers.SerializerMethodField(read_only=True)
     customer_status = serializers.SerializerMethodField(read_only=True)
     submitter_information = SubmitterInformationSerializer(read_only=True)
 
@@ -761,7 +790,6 @@ class InternalConservationStatusSerializer(BaseConservationStatusSerializer):
     )
     conservation_status_approval_document = serializers.SerializerMethodField()
     internal_user_edit = serializers.SerializerMethodField(read_only=True)
-    can_edit_recommended = serializers.SerializerMethodField(read_only=True)
     referrals = ConservationStatusProposalReferralSerializer(many=True)
     is_new_contributor = serializers.SerializerMethodField(read_only=True)
     internal_application = serializers.BooleanField(read_only=True)
@@ -789,13 +817,17 @@ class Meta:
             "community_id",
             "conservation_status_number",
             "wa_legislative_list_id",
+            "wa_legislative_list",
             "wa_legislative_category_id",
+            "wa_legislative_category",
             "wa_priority_list_id",
+            "wa_priority_list",
             "wa_priority_category_id",
+            "wa_priority_category",
             "commonwealth_conservation_list_id",
+            "commonwealth_conservation_list",
             "international_conservation",
             "conservation_criteria",
-            "recommended_conservation_criteria",
             "comment",
             "processing_status",
             "customer_status",
@@ -825,7 +857,6 @@ class Meta:
             "internal_user_edit",
             "conservation_status_approval_document",
             "approval_level",
-            "can_edit_recommended",
             "internal_application",
             "is_new_contributor",
             "change_code_id",
@@ -917,10 +948,6 @@ def get_conservation_status_approval_document(self, obj):
         except ConservationStatusIssuanceApprovalDetails.DoesNotExist:
             return None
 
-    def get_can_edit_recommended(self, obj):
-        request = self.context["request"]
-        return obj.can_edit_recommended(request)
-
     def get_is_new_contributor(self, obj):
         return is_new_external_contributor(obj.submitter)
 
@@ -1028,22 +1055,6 @@ class SaveSpeciesConservationStatusSerializer(BaseConservationStatusSerializer):
     commonwealth_conservation_list_id = serializers.IntegerField(
         required=False, allow_null=True, write_only=True
     )
-
-    recommended_wa_legislative_list_id = serializers.IntegerField(
-        required=False, allow_null=True, write_only=True
-    )
-    recommended_wa_legislative_category_id = serializers.IntegerField(
-        required=False, allow_null=True, write_only=True
-    )
-    recommended_wa_priority_list_id = serializers.IntegerField(
-        required=False, allow_null=True, write_only=True
-    )
-    recommended_wa_priority_category_id = serializers.IntegerField(
-        required=False, allow_null=True, write_only=True
-    )
-    recommended_commonwealth_conservation_list_id = serializers.IntegerField(
-        required=False, allow_null=True, write_only=True
-    )
     change_code_id = serializers.IntegerField(
         required=False, allow_null=True, write_only=True
     )
@@ -1061,13 +1072,6 @@ class Meta:
             "commonwealth_conservation_list_id",
             "international_conservation",
             "conservation_criteria",
-            "recommended_wa_legislative_list_id",
-            "recommended_wa_legislative_category_id",
-            "recommended_wa_priority_list_id",
-            "recommended_wa_priority_category_id",
-            "recommended_commonwealth_conservation_list_id",
-            "recommended_international_conservation",
-            "recommended_conservation_criteria",
             "comment",
             "lodgement_date",
             "listing_date",
@@ -1197,22 +1201,6 @@ class SaveCommunityConservationStatusSerializer(BaseConservationStatusSerializer
     commonwealth_conservation_list_id = serializers.IntegerField(
         required=False, allow_null=True, write_only=True
     )
-
-    recommended_wa_legislative_list_id = serializers.IntegerField(
-        required=False, allow_null=True, write_only=True
-    )
-    recommended_wa_legislative_category_id = serializers.IntegerField(
-        required=False, allow_null=True, write_only=True
-    )
-    recommended_wa_priority_list_id = serializers.IntegerField(
-        required=False, allow_null=True, write_only=True
-    )
-    recommended_wa_priority_category_id = serializers.IntegerField(
-        required=False, allow_null=True, write_only=True
-    )
-    recommended_commonwealth_conservation_list_id = serializers.IntegerField(
-        required=False, allow_null=True, write_only=True
-    )
     change_code_id = serializers.IntegerField(
         required=False, allow_null=True, write_only=True
     )
@@ -1230,13 +1218,6 @@ class Meta:
             "commonwealth_conservation_list_id",
             "international_conservation",
             "conservation_criteria",
-            "recommended_wa_legislative_list_id",
-            "recommended_wa_legislative_category_id",
-            "recommended_wa_priority_list_id",
-            "recommended_wa_priority_category_id",
-            "recommended_commonwealth_conservation_list_id",
-            "recommended_international_conservation",
-            "recommended_conservation_criteria",
             "comment",
             "lodgement_date",
             "applicant_type",
@@ -1288,7 +1269,7 @@ def validate(self, data):
 
         request = self.context.get("request")
         if request.user.email == data["email"]:
-            non_field_errors.append("You cannot send referral to yourself.")
+            non_field_errors.append("You cannot refer to yourself.")
         elif not data["email"]:
             non_field_errors.append("Referral not found.")
 
@@ -1315,7 +1296,6 @@ class DTConservationStatusReferralSerializer(serializers.ModelSerializer):
     referral = serializers.SerializerMethodField()
     referral_comment = serializers.SerializerMethodField()
     submitter = serializers.SerializerMethodField()
-    document = serializers.SerializerMethodField()
     can_user_process = serializers.SerializerMethodField()
     group_type = serializers.SerializerMethodField()
 
@@ -1341,8 +1321,6 @@ class Meta:
             "lodged_on",
             "conservation_status",
             "can_be_processed",
-            "document",
-            "referral_text",
             "referral_comment",
             "group_type",
             "species_number",
@@ -1373,9 +1351,6 @@ def get_submitter(self, obj):
         else:
             return ""
 
-    def get_document(self, obj):
-        return [obj.document.name, obj.document._file.url] if obj.document else None
-
     def get_can_user_process(self, obj):
         request = self.context["request"]
         if not obj.can_be_completed:
@@ -1514,9 +1489,7 @@ class Meta:
             "reason",
             "reason_text",
             "cs_amendment_request_documents",
-            "subject",
             "text",
-            "officer",
             "status",
             "conservation_status",
         ]
diff --git a/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_approver_sendback_notification.html b/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_approver_sendback_notification.html
index ff594f58..622db4fd 100644
--- a/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_approver_sendback_notification.html
+++ b/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_approver_sendback_notification.html
@@ -1,13 +1,13 @@
 {%  extends 'boranga/emails/base_email.html' %}
 
 {%  block content %}
-	The Proposal {{ cs_proposal.conservation_status_number }} has been sent back by approver.
+	The Proposal {{ cs_proposal.conservation_status_number }} has been sent back by the approver.
 
-    <p>Approver comments: {{ approver_comment }}</p>
+    <p>Reason / Comments: {{ approver_comment }}</p>
 
     <p>
         You can access this Proposal using the following link:
     </p>
 
     <a href="{{url}}">Access Proposal</a>
-{%  endblock %}
+{%  endblock %}
diff --git a/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_approver_sendback_notification.txt b/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_approver_sendback_notification.txt
index 15e3d817..52ed3a92 100644
--- a/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_approver_sendback_notification.txt
+++ b/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_approver_sendback_notification.txt
@@ -1,11 +1,11 @@
 {%  extends 'boranga/emails/base_email.txt' %}
 
 {%  block content %}
-    The Proposal {{ cs_proposal.conservation_status_number }} has been sent back by approver.
+    The Proposal {{ cs_proposal.conservation_status_number }} has been sent back by the approver.
 
-    Approver comments: {{ approver_comment }}
+    Reason / Comments: {{ approver_comment }}
 
     You can access this Proposal using the following link:
 
     {{url}}
-{%  endblock %}
+{%  endblock %}
diff --git a/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_assessor_ready_for_agenda_notification.html b/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_assessor_ready_for_agenda_notification.html
index 4e7661a5..cd108cfa 100644
--- a/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_assessor_ready_for_agenda_notification.html
+++ b/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_assessor_ready_for_agenda_notification.html
@@ -6,8 +6,16 @@
     </p>
 
     <p>
-        You can schedule a meeting for this Proposal using the following link:
+        Assessor Recommended Action / Comments:
     </p>
 
-    <a href="{{url}}">Schedule Meeting</a>
+    <p>
+        {{ assessor_comment }}
+    </p>
+
+    <p>
+        You can action this Proposal using the following link:
+    </p>
+
+    <a href="{{url}}">Conservation Status Proposal {{ cs_proposal.conservation_status_number }}</a>
 {%  endblock %}
diff --git a/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_assessor_ready_for_agenda_notification.txt b/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_assessor_ready_for_agenda_notification.txt
index 4505f715..e9198cda 100644
--- a/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_assessor_ready_for_agenda_notification.txt
+++ b/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_assessor_ready_for_agenda_notification.txt
@@ -3,7 +3,11 @@
 {%  block content %}
     The Conservation Status Proposal {{ cs_proposal.conservation_status_number }} has been assessed and is now 'Ready for Agenda'.
 
-    You can schedule a meeting for this Proposal using the following link:
+    Assessor Recommended Action / Comments:
+
+    {{ assessor_comment }}
+
+    You can action this Proposal using the following link:
 
     {{url}}
 {%  endblock %}
diff --git a/boranga/components/history/api.py b/boranga/components/history/api.py
index 972bb283..1bf06bd6 100644
--- a/boranga/components/history/api.py
+++ b/boranga/components/history/api.py
@@ -154,7 +154,7 @@ def search_versions(self, request, queryset, view):
                 )
                 queryset = queryset.filter(revision_id__in=remaining_revision_ids)
             except Exception as e:
-                logger.warn(f"Invalid search term: {e}")
+                logger.warning(f"Invalid search term: {e}")
 
         return queryset
 
@@ -268,7 +268,7 @@ def getVersionModelLookUpFieldValues(self, versions, model):
                 lookup_fields.append(i)
                 self.lookup_values[i] = lookup_value
             except Exception as e:
-                logger.warn(e)
+                logger.warning(e)
                 rejected_lookup_fields.append(i)
         self.lookup_fields = lookup_fields
 
diff --git a/boranga/components/main/api.py b/boranga/components/main/api.py
index 9914b171..4590b281 100755
--- a/boranga/components/main/api.py
+++ b/boranga/components/main/api.py
@@ -5,15 +5,17 @@
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.core.cache import cache
+from django.db.models import Q
 from django_filters import rest_framework as filters
 from rest_framework import filters as rest_framework_filters
 from rest_framework import viewsets
+from rest_framework.decorators import action
+from rest_framework.response import Response
 
 from boranga import helpers
-from boranga.components.main.models import GlobalSettings, HelpTextEntry
+from boranga.components.main.models import HelpTextEntry
 from boranga.components.main.serializers import (
     ContentTypeSerializer,
-    GlobalSettingsSerializer,
     HelpTextEntrySerializer,
 )
 from boranga.components.occurrence.models import Datum
@@ -22,16 +24,6 @@
 logger = logging.getLogger(__name__)
 
 
-class GlobalSettingsViewSet(viewsets.ReadOnlyModelViewSet):
-    queryset = GlobalSettings.objects.none()
-    serializer_class = GlobalSettingsSerializer
-
-    def get_queryset(self):
-        if self.request.user.is_authenticated:
-            qs = GlobalSettings.objects.all().order_by("id")
-            return qs
-
-
 class HelpTextEntryViewSet(viewsets.ReadOnlyModelViewSet):
     queryset = HelpTextEntry.objects.active()
     serializer_class = HelpTextEntrySerializer
@@ -54,6 +46,25 @@ class ContentTypeViewSet(viewsets.ReadOnlyModelViewSet):
     filterset_fields = ["app_label", "model"]
     search_fields = ["^model"]
 
+    @action(
+        methods=[
+            "GET",
+        ],
+        detail=False,
+    )
+    def ocr_bulk_import_content_types(self, request):
+        """Returns a list of content types that are allowed to be imported in the ocr bulk importer"""
+        content_types = ContentType.objects.filter(
+            app_label="boranga",
+        ).filter(
+            Q(model__startswith="occurrencereport")
+            | Q(model__startswith="ocr")
+            | Q(model__iexact="occurrence")
+            | Q(model__iexact="submitterinformation")
+        )
+        serializer = self.get_serializer(content_types, many=True)
+        return Response(serializer.data)
+
 
 class RetrieveActionLoggingViewsetMixin:
     """Mixin to automatically log user actions when a user retrieves an instance.
diff --git a/boranga/components/main/models.py b/boranga/components/main/models.py
index d5f61b0f..6eedf3d7 100644
--- a/boranga/components/main/models.py
+++ b/boranga/components/main/models.py
@@ -4,12 +4,11 @@
 from django.apps import apps
 from django.conf import settings
 from django.core.cache import cache
-from django.core.exceptions import ValidationError
 from django.core.files.storage import FileSystemStorage
 from django.db import models
 from reversion.models import Version
 
-from boranga.helpers import compressed_content_valid, file_extension_valid
+from boranga.helpers import check_file
 
 private_storage = FileSystemStorage(
     location=settings.BASE_DIR + "/private-media/", base_url="/private-media/"
@@ -183,54 +182,7 @@ def __str__(self):
         return self.name or self.filename
 
     def check_file(self, file):
-        # check if extension in whitelist
-        cache_key = settings.CACHE_KEY_FILE_EXTENSION_WHITELIST
-        whitelist = cache.get(cache_key)
-        if whitelist is None:
-            whitelist = FileExtensionWhitelist.objects.all()
-            cache.set(cache_key, whitelist, settings.CACHE_TIMEOUT_2_HOURS)
-
-        valid, compression = file_extension_valid(
-            str(file), whitelist, self._meta.model_name
-        )
-
-        if not valid:
-            raise ValidationError("File type/extension not supported")
-
-        if compression:
-            # supported compression check
-            valid = compressed_content_valid(file, whitelist, self._meta.model_name)
-            if not valid:
-                raise ValidationError("Unsupported type/extension in compressed file")
-
-
-class GlobalSettings(models.Model):
-    keys = (
-        ("credit_facility_link", "Credit Facility Link"),
-        ("deed_poll", "Deed poll"),
-        ("deed_poll_filming", "Deed poll Filming"),
-        ("deed_poll_event", "Deed poll Event"),
-        ("online_training_document", "Online Training Document"),
-        ("park_finder_link", "Park Finder Link"),
-        ("fees_and_charges", "Fees and charges link"),
-        ("event_fees_and_charges", "Event Fees and charges link"),
-        ("commercial_filming_handbook", "Commercial Filming Handbook link"),
-        ("park_stay_link", "Park Stay Link"),
-        ("event_traffic_code_of_practice", "Event traffic code of practice"),
-        ("trail_section_map", "Trail section map"),
-        ("dwer_application_form", "DWER Application Form"),
-    )
-    key = models.CharField(
-        max_length=255,
-        choices=keys,
-        blank=False,
-        null=False,
-    )
-    value = models.CharField(max_length=255)
-
-    class Meta:
-        app_label = "boranga"
-        verbose_name_plural = "Global Settings"
+        return check_file(file, self._meta.model_name)
 
 
 # @python_2_unicode_compatible
diff --git a/boranga/components/main/related_item.py b/boranga/components/main/related_item.py
index e9426d13..6ff7c630 100644
--- a/boranga/components/main/related_item.py
+++ b/boranga/components/main/related_item.py
@@ -11,6 +11,29 @@ def __init__(
         self.status = status
         self.action_url = action_url
 
+    def __hash__(self):
+        return hash(
+            (
+                self.model_name,
+                self.identifier,
+                self.descriptor,
+                self.status,
+                self.action_url,
+            )
+        )
+
+    def __eq__(self, other):
+        return (
+            self.identifier == other.identifier
+            and self.model_name == other.model_name
+            and self.descriptor == other.descriptor
+            and self.status == other.status
+            and self.action_url == other.action_url
+        )
+
+    def __str__(self):
+        return f"{self.identifier}"
+
 
 class RelatedItemsSerializer(serializers.Serializer):
     model_name = serializers.CharField()
diff --git a/boranga/components/main/serializers.py b/boranga/components/main/serializers.py
index 7f93ded9..7ff141af 100755
--- a/boranga/components/main/serializers.py
+++ b/boranga/components/main/serializers.py
@@ -1,17 +1,17 @@
 import logging
 
+from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
-from django.db.models.fields.related import ForeignKey, OneToOneField
+from django.db.models.fields.related import ForeignKey, ManyToManyField, OneToOneField
 from ledger_api_client.ledger_models import EmailUserRO
 from ledger_api_client.ledger_models import EmailUserRO as EmailUser
 from rest_framework import serializers
 
-from boranga.components.main.models import (
-    CommunicationsLogEntry,
-    GlobalSettings,
-    HelpTextEntry,
-)
+from boranga.components.main.models import CommunicationsLogEntry, HelpTextEntry
 from boranga.helpers import (
+    get_choices_for_field,
+    get_filter_field_options_for_field,
+    get_lookup_field_options_for_field,
     get_openpyxl_data_validation_type_for_django_field,
     is_django_admin,
 )
@@ -45,12 +45,6 @@ def get_documents(self, obj):
         return [[d.name, d._file.url] for d in obj.documents.all()]
 
 
-class GlobalSettingsSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = GlobalSettings
-        fields = ("key", "value")
-
-
 class EmailUserROSerializerForReferral(serializers.ModelSerializer):
     name = serializers.SerializerMethodField()
     telephone = serializers.CharField(source="phone_number")
@@ -136,6 +130,9 @@ def get_model_verbose_name(self, obj):
     def get_model_fields(self, obj):
         if not obj.model_class():
             return []
+
+        content_type = ContentType.objects.get_for_model(obj.model_class()).id
+
         fields = obj.model_class()._meta.get_fields()
         exclude_fields = []
         if hasattr(obj.model_class(), "BULK_IMPORT_EXCLUDE_FIELDS"):
@@ -144,6 +141,7 @@ def get_model_fields(self, obj):
         def filter_fields(field):
             return (
                 field.name not in exclude_fields
+                and field.name != "occurrence_report"
                 and not field.auto_created
                 and not (
                     field.is_relation
@@ -151,6 +149,7 @@ def filter_fields(field):
                     not in [
                         ForeignKey,
                         OneToOneField,
+                        ManyToManyField,
                     ]
                 )
             )
@@ -164,33 +163,30 @@ def filter_fields(field):
                 else field.name
             )
             field_type = str(type(field)).split(".")[-1].replace("'>", "")
-            choices = field.choices if hasattr(field, "choices") else None
             allow_null = field.null if hasattr(field, "null") else None
             max_length = field.max_length if hasattr(field, "max_length") else None
             xlsx_validation_type = get_openpyxl_data_validation_type_for_django_field(
                 field
             )
-            lookup_field_options = None
-            if hasattr(field, "related_model") and field.related_model:
-                related_model = field.related_model
-                fields = related_model._meta.get_fields()
-                lookup_field_options = [
-                    field.verbose_name.lower()
-                    for field in related_model._meta.get_fields()
-                    if not field.related_model
-                    and field.unique
-                    and not field.name.endswith("_number")
-                ]
+
+            if isinstance(field, GenericForeignKey):
+                continue
+
+            choices = get_choices_for_field(obj.model_class(), field)
+            lookup_field_options = get_lookup_field_options_for_field(field)
+            filter_field_options = get_filter_field_options_for_field(field)
             model_fields.append(
                 {
                     "name": field.name,
                     "display_name": display_name,
+                    "content_type": content_type,
                     "type": field_type,
-                    "choices": choices,
                     "allow_null": allow_null,
                     "max_length": max_length,
                     "xlsx_validation_type": xlsx_validation_type,
+                    "choices": choices,
                     "lookup_field_options": lookup_field_options,
+                    "filter_field_options": filter_field_options,
                 }
             )
         return model_fields
diff --git a/boranga/components/occurrence/api.py b/boranga/components/occurrence/api.py
index bbda71b5..e03b0856 100644
--- a/boranga/components/occurrence/api.py
+++ b/boranga/components/occurrence/api.py
@@ -1,5 +1,6 @@
 import json
 import logging
+import traceback
 from datetime import datetime, time
 from io import BytesIO
 
@@ -104,6 +105,7 @@
     RockType,
     SampleDestination,
     SampleType,
+    SchemaColumnLookupFilter,
     SecondarySign,
     SiteType,
     SoilColour,
@@ -141,6 +143,8 @@
     OccurrenceLogEntrySerializer,
     OccurrenceReportAmendmentRequestSerializer,
     OccurrenceReportBulkImportSchemaColumnSerializer,
+    OccurrenceReportBulkImportSchemaListSerializer,
+    OccurrenceReportBulkImportSchemaOccurrenceApproverSerializer,
     OccurrenceReportBulkImportSchemaSerializer,
     OccurrenceReportBulkImportTaskSerializer,
     OccurrenceReportDocumentSerializer,
@@ -208,6 +212,7 @@
 from boranga.helpers import (
     is_contributor,
     is_customer,
+    is_django_admin,
     is_internal,
     is_occurrence_approver,
     is_occurrence_assessor,
@@ -6278,7 +6283,7 @@ class OccurrenceReportBulkImportTaskViewSet(
     permission_classes = [OccurrenceReportBulkImportPermission]
     serializer_class = OccurrenceReportBulkImportTaskSerializer
     filter_backends = [OrderingFilter, filters.DjangoFilterBackend]
-    filterset_fields = ["processing_status"]
+    filterset_fields = ["processing_status", "schema__group_type__name"]
     ordering_fields = ["datetime_queued", "datetime_started", "datetime_completed"]
     pagination_class = LimitOffsetPagination
 
@@ -6292,20 +6297,27 @@ def perform_create(self, serializer):
                         OccurrenceReportBulkImportTask.PROCESSING_STATUS_FAILED
                     )
                     instance.datetime_error = timezone.now()
+                    error_message = ""
+                    for error in errors:
+                        error_message += f"Row: {error['row_index'] + 1}. Error: {error['error_message']}\n"
+                    instance.error_message = error_message
                 else:
                     instance.processing_status = (
                         OccurrenceReportBulkImportTask.PROCESSING_STATUS_COMPLETED
                     )
                     instance.datetime_completed = timezone.now()
-                instance.save()
+
             except Exception as e:
                 logger.error(
                     f"Error processing bulk import task {instance.id}: {str(e)}"
                 )
+                logger.error(traceback.format_exc())
                 instance.processing_status = (
                     OccurrenceReportBulkImportTask.PROCESSING_STATUS_FAILED
                 )
                 instance.datetime_error = timezone.now()
+                instance.error_message = str(e)
+            instance.save()
 
     @detail_route(methods=["patch"], detail=True)
     def retry(self, request, *args, **kwargs):
@@ -6333,6 +6345,13 @@ class OccurrenceReportBulkImportSchemaViewSet(
     filter_backends = [filters.DjangoFilterBackend]
     filterset_fields = ["group_type"]
 
+    def get_serializer_class(self):
+        if self.action == "list":
+            return OccurrenceReportBulkImportSchemaListSerializer
+        if not is_django_admin(self.request):
+            return OccurrenceReportBulkImportSchemaOccurrenceApproverSerializer
+        return super().get_serializer_class()
+
     def get_queryset(self):
         qs = self.queryset
         if not (is_internal(self.request) or self.request.user.is_superuser):
@@ -6367,7 +6386,9 @@ def get_schema_list_by_group_type(self, request, *args, **kwargs):
         group_type = GroupType.objects.get(name=group_type)
 
         schema = OccurrenceReportBulkImportSchema.objects.filter(group_type=group_type)
-        serializer = OccurrenceReportBulkImportSchemaSerializer(schema, many=True)
+        serializer = OccurrenceReportBulkImportSchemaListSerializer(
+            schema, many=True, context={"request": request}
+        )
         return Response(serializer.data)
 
     @detail_route(methods=["get"], detail=True)
@@ -6383,26 +6404,21 @@ def preview_import_file(self, request, *args, **kwargs):
         buffer.close()
         return response
 
-    @detail_route(methods=["post"], detail=True)
-    def copy(self, request, *args, **kwargs):
+    @detail_route(methods=["get"], detail=True)
+    def validate(self, request, *args, **kwargs):
         instance = self.get_object()
-        new_instance = instance.copy()
-        serializer = OccurrenceReportBulkImportSchemaSerializer(new_instance)
-        return Response(serializer.data, status=status.HTTP_201_CREATED)
+        errors = instance.validate(request.user.id)
+        if errors:
+            return Response(errors, status=status.HTTP_400_BAD_REQUEST)
+        return Response(status=status.HTTP_200_OK)
 
-    @detail_route(methods=["put"], detail=True)
-    def save_column(self, request, *args, **kwargs):
+    @detail_route(methods=["post"], detail=True)
+    def copy(self, request, *args, **kwargs):
         instance = self.get_object()
-        column_data = request.data.get("column_data", None)
-        if not column_data:
-            raise serializers.ValidationError("Column data is required")
-        serializer = OccurrenceReportBulkImportSchemaColumnSerializer(
-            instance, data=column_data
+        new_instance = instance.copy(request)
+        serializer = OccurrenceReportBulkImportSchemaSerializer(
+            new_instance, context={"request": request}
         )
-        serializer.is_valid(raise_exception=True)
-        serializer.save()
-
-        serializer = OccurrenceReportBulkImportSchemaSerializer(instance)
         return Response(serializer.data, status=status.HTTP_201_CREATED)
 
     @detail_route(methods=["get"], detail=False)
@@ -6412,31 +6428,43 @@ def default_value_choices(self, request, *args, **kwargs):
         )
         return Response(default_value_field.choices, status=status.HTTP_200_OK)
 
-    @detail_route(methods=["patch"], detail=True)
-    def reorder_column(self, request, *args, **kwargs):
-        instance = self.get_object()
 
-        # Don't order columns that haven't been saved
-        pk = request.data.get("id", None)
-        if not pk:
-            raise serializers.ValidationError(
-                "column must have id field to be reordered (i.e. record must be saved first)"
-            )
+class OccurrenceReportBulkImportSchemaColumnViewSet(
+    viewsets.GenericViewSet,
+    mixins.RetrieveModelMixin,
+    mixins.CreateModelMixin,
+    mixins.UpdateModelMixin,
+    mixins.ListModelMixin,
+):
+    queryset = OccurrenceReportBulkImportSchemaColumn.objects.all()
+    serializer_class = OccurrenceReportBulkImportSchemaColumnSerializer
+    permission_classes = [OccurrenceReportBulkImportPermission]
 
-        order = request.data.get("order", None)
-        if order is None:
-            raise serializers.ValidationError("order field is missing from column")
+    @detail_route(methods=["get"], detail=True)
+    def preview_foreign_key_values_xlsx(self, request, *args, **kwargs):
+        instance = self.get_object()
 
-        try:
-            column = instance.columns.get(pk=pk)
-        except OccurrenceReportBulkImportSchemaColumn.DoesNotExist:
-            raise serializers.ValidationError(
-                f"Column with id {pk} not found in schema"
+        buffer = BytesIO()
+        workbook = instance.preview_foreign_key_values_xlsx
+        if not workbook:
+            return Response(
+                {"message": "No foreign key values to preview"},
+                status=status.HTTP_404_NOT_FOUND,
             )
+        workbook.save(buffer)
+        buffer.seek(0)
+        filename = (
+            f"{instance.django_import_content_type.model}-{instance.django_import_field_name}"
+            f"-foreign-key-list-values.xlsx"
+        )
+        response = HttpResponse(buffer.read(), content_type="application/vnd.ms-excel")
+        response["Content-Disposition"] = f"attachment; filename={filename}"
+        buffer.close()
+        return response
 
-        column.to(order)
-
-        # instance.refresh_from_db()
-
-        serializer = OccurrenceReportBulkImportSchemaSerializer(instance)
-        return Response(serializer.data, status=status.HTTP_201_CREATED)
+    @list_route(methods=["get"], detail=False)
+    def get_lookup_filter_types(self, request, *args, **kwargs):
+        return Response(
+            SchemaColumnLookupFilter.LOOKUP_FILTER_TYPES,
+            status=status.HTTP_200_OK,
+        )
diff --git a/boranga/components/occurrence/models.py b/boranga/components/occurrence/models.py
index eebafd92..2d1e7411 100644
--- a/boranga/components/occurrence/models.py
+++ b/boranga/components/occurrence/models.py
@@ -1,12 +1,19 @@
 import hashlib
 import json
 import logging
+import mimetypes
 import os
+import random
+import string
+import traceback
+import zipfile
+import zoneinfo
 from abc import abstractmethod
 from datetime import datetime
+from datetime import timezone as dt_timezone
 from decimal import Decimal
+from io import BytesIO
 
-import dateutil
 import openpyxl
 import pyproj
 import reversion
@@ -19,13 +26,15 @@
 from django.contrib.gis.db.models.functions import Area
 from django.contrib.gis.geos import GEOSGeometry, Polygon
 from django.core.cache import cache
-from django.core.exceptions import ValidationError
+from django.core.exceptions import FieldDoesNotExist, FieldError, ValidationError
 from django.core.files.storage import FileSystemStorage
+from django.core.files.uploadedfile import InMemoryUploadedFile
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import IntegrityError, models, transaction
-from django.db.models import CharField, Count, Func, Max, Q
-from django.db.models.functions import Cast
+from django.db.models import CharField, Count, Func, ManyToManyField, Max, Q
+from django.db.models.functions import Cast, Length
 from django.utils import timezone
+from django.utils.functional import cached_property
 from ledger_api_client.ledger_models import EmailUserRO as EmailUser
 from ledger_api_client.managed_models import SystemGroup
 from multiselectfield import MultiSelectField
@@ -33,7 +42,7 @@
 from openpyxl.styles.fonts import Font
 from openpyxl.utils import get_column_letter
 from openpyxl.worksheet.datavalidation import DataValidation
-from ordered_model.models import OrderedModel
+from ordered_model.models import OrderedModel, OrderedModelManager
 from taggit.managers import TaggableManager
 
 from boranga import exceptions
@@ -77,11 +86,17 @@
     SubmitterInformationModelMixin,
 )
 from boranga.helpers import (
+    belongs_to_by_user_id,
     clone_model,
+    get_choices_for_field,
     get_display_field_for_model,
+    get_mock_request,
+    get_openpyxl_data_validation_type_for_django_field,
+    is_django_admin,
     is_occurrence_approver,
     is_occurrence_assessor,
     member_ids,
+    no_commas_validator,
 )
 from boranga.ledger_api_utils import retrieve_email_user
 from boranga.settings import (
@@ -201,6 +216,12 @@ class OccurrenceReport(SubmitterInformationModelMixin, RevisionedMixin):
         (PROCESSING_STATUS_CLOSED, "DeListed"),
     )
 
+    VALID_BULK_IMPORT_PROCESSING_STATUSES = [
+        (PROCESSING_STATUS_WITH_ASSESSOR, "With Assessor"),
+        (PROCESSING_STATUS_WITH_APPROVER, "With Approver"),
+        (PROCESSING_STATUS_APPROVED, "Approved"),
+    ]
+
     FINALISED_STATUSES = [
         PROCESSING_STATUS_APPROVED,
         PROCESSING_STATUS_DECLINED,
@@ -269,7 +290,9 @@ class OccurrenceReport(SubmitterInformationModelMixin, RevisionedMixin):
     occurrence_report_number = models.CharField(max_length=9, blank=True, default="")
 
     # Field to use when importing data from the legacy system
-    migrated_from_id = models.CharField(max_length=50, blank=True, default="")
+    migrated_from_id = models.CharField(
+        max_length=50, blank=True, null=True, unique=True
+    )
 
     observation_date = models.DateTimeField(null=True, blank=True)
     reported_date = models.DateTimeField(auto_now_add=True, null=False, blank=False)
@@ -470,8 +493,8 @@ def has_main_observer(self):
 
     def has_assessor_mode(self, request):
         status_with_assessor = [
-            "with_assessor",
-            "with_referral",
+            OccurrenceReport.PROCESSING_STATUS_WITH_ASSESSOR,
+            OccurrenceReport.PROCESSING_STATUS_WITH_REFERRAL,
         ]
         if self.processing_status not in status_with_assessor:
             return False
@@ -1092,6 +1115,14 @@ def send_referral(self, request, referral_email, referral_text):
                 "The user you want to send the referral to does not exist in the ledger database"
             )
 
+        # Don't allow the user to refer to themselves
+        if referee.id == request.user.id:
+            raise ValidationError("You cannot refer to yourself")
+
+        # Don't allow the user to refer to the submitter
+        if referee.id == self.submitter:
+            raise ValidationError("You cannot refer to the submitter")
+
         # Check if the referral has already been sent to this user
         if OccurrenceReportReferral.objects.filter(
             referral=referee.id, occurrence_report=self
@@ -1444,9 +1475,7 @@ def update_occurrence_report_referral_doc_filename(instance, filename):
 
 class OccurrenceReportProposalRequest(models.Model):
     occurrence_report = models.ForeignKey(OccurrenceReport, on_delete=models.CASCADE)
-    subject = models.CharField(max_length=200, blank=True)
     text = models.TextField(blank=True)
-    officer = models.IntegerField(null=True)  # EmailUserRO
 
     class Meta:
         app_label = "boranga"
@@ -1827,7 +1856,13 @@ class CoordinateSource(ArchivableModel):
 
     """
 
-    name = models.CharField(max_length=250, blank=False, null=False, unique=True)
+    name = models.CharField(
+        max_length=250,
+        blank=False,
+        null=False,
+        unique=True,
+        validators=[no_commas_validator],
+    )
 
     class Meta:
         app_label = "boranga"
@@ -1849,7 +1884,13 @@ class LocationAccuracy(ArchivableModel):
 
     """
 
-    name = models.CharField(max_length=250, blank=False, null=False, unique=True)
+    name = models.CharField(
+        max_length=250,
+        blank=False,
+        null=False,
+        unique=True,
+        validators=[no_commas_validator],
+    )
 
     class Meta:
         app_label = "boranga"
@@ -1887,8 +1928,6 @@ class OCRLocation(models.Model):
     location_accuracy = models.ForeignKey(
         LocationAccuracy, on_delete=models.SET_NULL, null=True, blank=True
     )
-    geojson_point = gis_models.PointField(srid=4326, blank=True, null=True)
-    geojson_polygon = gis_models.PolygonField(srid=4326, blank=True, null=True)
 
     region = models.ForeignKey(
         Region, default=None, on_delete=models.CASCADE, null=True, blank=True
@@ -2154,7 +2193,13 @@ class LandForm(ArchivableModel):
 
     """
 
-    name = models.CharField(max_length=250, blank=False, null=False, unique=True)
+    name = models.CharField(
+        max_length=250,
+        blank=False,
+        null=False,
+        unique=True,
+        validators=[no_commas_validator],
+    )
 
     class Meta:
         app_label = "boranga"
@@ -2175,7 +2220,13 @@ class RockType(ArchivableModel):
 
     """
 
-    name = models.CharField(max_length=250, blank=False, null=False, unique=True)
+    name = models.CharField(
+        max_length=250,
+        blank=False,
+        null=False,
+        unique=True,
+        validators=[no_commas_validator],
+    )
 
     class Meta:
         app_label = "boranga"
@@ -2196,7 +2247,13 @@ class SoilType(ArchivableModel):
 
     """
 
-    name = models.CharField(max_length=250, blank=False, null=False, unique=True)
+    name = models.CharField(
+        max_length=250,
+        blank=False,
+        null=False,
+        unique=True,
+        validators=[no_commas_validator],
+    )
 
     class Meta:
         app_label = "boranga"
@@ -2217,7 +2274,13 @@ class SoilColour(ArchivableModel):
 
     """
 
-    name = models.CharField(max_length=250, blank=False, null=False, unique=True)
+    name = models.CharField(
+        max_length=250,
+        blank=False,
+        null=False,
+        unique=True,
+        validators=[no_commas_validator],
+    )
 
     class Meta:
         app_label = "boranga"
@@ -2238,7 +2301,13 @@ class Drainage(ArchivableModel):
 
     """
 
-    name = models.CharField(max_length=250, blank=False, null=False, unique=True)
+    name = models.CharField(
+        max_length=250,
+        blank=False,
+        null=False,
+        unique=True,
+        validators=[no_commas_validator],
+    )
 
     class Meta:
         app_label = "boranga"
@@ -2259,7 +2328,13 @@ class SoilCondition(ArchivableModel):
 
     """
 
-    name = models.CharField(max_length=250, blank=False, null=False, unique=True)
+    name = models.CharField(
+        max_length=250,
+        blank=False,
+        null=False,
+        unique=True,
+        validators=[no_commas_validator],
+    )
 
     class Meta:
         app_label = "boranga"
@@ -2287,6 +2362,8 @@ class OCRHabitatComposition(models.Model):
         null=True,
         related_name="habitat_composition",
     )
+    # TODO: Consider fixing these to use a function that returns the choices
+    # as setting them in the __init__ method creates issues in other parts of the application
     land_form = MultiSelectField(max_length=250, blank=True, choices=[], null=True)
     rock_type = models.ForeignKey(
         RockType, on_delete=models.SET_NULL, null=True, blank=True
@@ -2421,7 +2498,13 @@ class Intensity(ArchivableModel):
 
     """
 
-    name = models.CharField(max_length=250, blank=False, null=False, unique=True)
+    name = models.CharField(
+        max_length=250,
+        blank=False,
+        null=False,
+        unique=True,
+        validators=[no_commas_validator],
+    )
 
     class Meta:
         app_label = "boranga"
@@ -2498,7 +2581,13 @@ class ObservationMethod(ArchivableModel):
 
     """
 
-    name = models.CharField(max_length=250, blank=False, null=False, unique=True)
+    name = models.CharField(
+        max_length=250,
+        blank=False,
+        null=False,
+        unique=True,
+        validators=[no_commas_validator],
+    )
 
     class Meta:
         app_label = "boranga"
@@ -2548,7 +2637,13 @@ class PlantCountMethod(ArchivableModel):
 
     """
 
-    name = models.CharField(max_length=250, blank=False, null=False, unique=True)
+    name = models.CharField(
+        max_length=250,
+        blank=False,
+        null=False,
+        unique=True,
+        validators=[no_commas_validator],
+    )
 
     class Meta:
         app_label = "boranga"
@@ -2569,7 +2664,13 @@ class PlantCountAccuracy(ArchivableModel):
 
     """
 
-    name = models.CharField(max_length=250, blank=False, null=False, unique=True)
+    name = models.CharField(
+        max_length=250,
+        blank=False,
+        null=False,
+        unique=True,
+        validators=[no_commas_validator],
+    )
 
     class Meta:
         app_label = "boranga"
@@ -2590,7 +2691,13 @@ class CountedSubject(ArchivableModel):
 
     """
 
-    name = models.CharField(max_length=250, blank=False, null=False, unique=True)
+    name = models.CharField(
+        max_length=250,
+        blank=False,
+        null=False,
+        unique=True,
+        validators=[no_commas_validator],
+    )
 
     class Meta:
         app_label = "boranga"
@@ -2611,7 +2718,13 @@ class PlantCondition(ArchivableModel):
 
     """
 
-    name = models.CharField(max_length=250, blank=False, null=False, unique=True)
+    name = models.CharField(
+        max_length=250,
+        blank=False,
+        null=False,
+        unique=True,
+        validators=[no_commas_validator],
+    )
 
     class Meta:
         app_label = "boranga"
@@ -2707,7 +2820,13 @@ class PrimaryDetectionMethod(ArchivableModel):
 
     """
 
-    name = models.CharField(max_length=250, blank=False, null=False, unique=True)
+    name = models.CharField(
+        max_length=250,
+        blank=False,
+        null=False,
+        unique=True,
+        validators=[no_commas_validator],
+    )
 
     class Meta:
         app_label = "boranga"
@@ -2727,7 +2846,13 @@ class ReproductiveState(ArchivableModel):
 
     """
 
-    name = models.CharField(max_length=250, blank=False, null=False, unique=True)
+    name = models.CharField(
+        max_length=250,
+        blank=False,
+        null=False,
+        unique=True,
+        validators=[no_commas_validator],
+    )
 
     class Meta:
         app_label = "boranga"
@@ -2748,7 +2873,13 @@ class AnimalHealth(models.Model):
 
     """
 
-    name = models.CharField(max_length=250, blank=False, null=False, unique=True)
+    name = models.CharField(
+        max_length=250,
+        blank=False,
+        null=False,
+        unique=True,
+        validators=[no_commas_validator],
+    )
 
     class Meta:
         app_label = "boranga"
@@ -2769,7 +2900,13 @@ class DeathReason(ArchivableModel):
 
     """
 
-    name = models.CharField(max_length=250, blank=False, null=False, unique=True)
+    name = models.CharField(
+        max_length=250,
+        blank=False,
+        null=False,
+        unique=True,
+        validators=[no_commas_validator],
+    )
 
     class Meta:
         app_label = "boranga"
@@ -2789,7 +2926,13 @@ class SecondarySign(ArchivableModel):
 
     """
 
-    name = models.CharField(max_length=250, blank=False, null=False, unique=True)
+    name = models.CharField(
+        max_length=250,
+        blank=False,
+        null=False,
+        unique=True,
+        validators=[no_commas_validator],
+    )
 
     class Meta:
         app_label = "boranga"
@@ -2899,7 +3042,13 @@ class IdentificationCertainty(ArchivableModel):
 
     """
 
-    name = models.CharField(max_length=250, blank=False, null=False, unique=True)
+    name = models.CharField(
+        max_length=250,
+        blank=False,
+        null=False,
+        unique=True,
+        validators=[no_commas_validator],
+    )
 
     class Meta:
         app_label = "boranga"
@@ -2920,7 +3069,9 @@ class SampleType(ArchivableModel):
 
     """
 
-    name = models.CharField(max_length=250, blank=False, null=False)
+    name = models.CharField(
+        max_length=250, blank=False, null=False, validators=[no_commas_validator]
+    )
     group_type = models.ForeignKey(
         GroupType, on_delete=models.SET_NULL, null=True, blank=True
     )
@@ -2942,7 +3093,9 @@ class SampleDestination(ArchivableModel):
 
     """
 
-    name = models.CharField(max_length=250, blank=False, null=False)
+    name = models.CharField(
+        max_length=250, blank=False, null=False, validators=[no_commas_validator]
+    )
 
     class Meta:
         app_label = "boranga"
@@ -2961,7 +3114,9 @@ class PermitType(ArchivableModel):
 
     """
 
-    name = models.CharField(max_length=250, blank=False, null=False)
+    name = models.CharField(
+        max_length=250, blank=False, null=False, validators=[no_commas_validator]
+    )
     group_type = models.ForeignKey(
         GroupType, on_delete=models.SET_NULL, null=True, blank=True
     )
@@ -3197,7 +3352,13 @@ def source(self):
 
 
 class WildStatus(ArchivableModel):
-    name = models.CharField(max_length=250, blank=False, null=False, unique=True)
+    name = models.CharField(
+        max_length=250,
+        blank=False,
+        null=False,
+        unique=True,
+        validators=[no_commas_validator],
+    )
 
     class Meta:
         app_label = "boranga"
@@ -3245,7 +3406,9 @@ class Occurrence(RevisionedMixin):
     occurrence_number = models.CharField(max_length=9, blank=True, default="")
 
     # Field to use when importing data from the legacy system
-    migrated_from_id = models.CharField(max_length=50, blank=True, default="")
+    migrated_from_id = models.CharField(
+        max_length=50, blank=True, null=True, unique=True
+    )
 
     occurrence_name = models.CharField(
         max_length=250, blank=True, null=True, unique=True
@@ -4188,8 +4351,6 @@ class OCCLocation(models.Model):
     location_accuracy = models.ForeignKey(
         LocationAccuracy, on_delete=models.SET_NULL, null=True, blank=True
     )
-    geojson_point = gis_models.PointField(srid=4326, blank=True, null=True)
-    geojson_polygon = gis_models.PolygonField(srid=4326, blank=True, null=True)
 
     region = models.ForeignKey(
         Region, default=None, on_delete=models.CASCADE, null=True, blank=True
@@ -4846,8 +5007,12 @@ def full_name(self):
 
 
 class OccurrenceTenurePurpose(ArchivableModel):
-    label = models.CharField(max_length=100, blank=True, null=True)
-    code = models.CharField(max_length=20, blank=True, null=True)
+    label = models.CharField(
+        max_length=100, blank=True, null=True, validators=[no_commas_validator]
+    )
+    code = models.CharField(
+        max_length=20, blank=True, null=True, validators=[no_commas_validator]
+    )
 
     class Meta:
         app_label = "boranga"
@@ -4859,8 +5024,12 @@ def __str__(self):
 
 
 class OccurrenceTenureVesting(models.Model):
-    label = models.CharField(max_length=100, blank=True, null=True)
-    code = models.CharField(max_length=20, blank=True, null=True)
+    label = models.CharField(
+        max_length=100, blank=True, null=True, validators=[no_commas_validator]
+    )
+    code = models.CharField(
+        max_length=20, blank=True, null=True, validators=[no_commas_validator]
+    )
 
     class Meta:
         app_label = "boranga"
@@ -5110,15 +5279,26 @@ def validate_bulk_import_file_extension(value):
     ext = os.path.splitext(value.name)[1]
     valid_extensions = [".xlsx"]
     if ext not in valid_extensions:
-        raise ValidationError(
-            "Only .xlsx files are supported by the bulk import facility!"
-        )
+        raise ValidationError("The bulk import file must be a .xlsx file")
+
 
+def validate_bulk_import_associated_files_extension(value):
+    ext = os.path.splitext(value.name)[1]
+    valid_extensions = [".zip"]
+    if ext not in valid_extensions:
+        raise ValidationError("The associated documents file must be a .zip file")
 
+
+# TODO: Would be nice to have the object id in the file path
+# bit tricky before the object has been saved..
 def get_occurrence_report_bulk_import_path(instance, filename):
     return f"occurrence_report/bulk-imports/{timezone.now()}/{filename}"
 
 
+def get_occurrence_report_bulk_import_associated_files_path(instance, filename):
+    return f"occurrence_report/bulk-imports/{timezone.now()}/{filename}"
+
+
 class OccurrenceReportBulkImportTask(ArchivableModel):
     schema = models.ForeignKey(
         "OccurrenceReportBulkImportSchema",
@@ -5132,6 +5312,14 @@ class OccurrenceReportBulkImportTask(ArchivableModel):
         storage=private_storage,
         validators=[validate_bulk_import_file_extension],
     )
+    _associated_files_zip = models.FileField(
+        upload_to=get_occurrence_report_bulk_import_associated_files_path,
+        max_length=512,
+        storage=private_storage,
+        validators=[validate_bulk_import_associated_files_extension],
+        null=True,
+        blank=True,
+    )
     # A hash of the file to allow for duplicate detection
     file_hash = models.CharField(max_length=64, null=True, blank=True)
 
@@ -5330,9 +5518,7 @@ def validate_headers(self, _file, schema):
         try:
             workbook = openpyxl.load_workbook(_file, read_only=True)
         except Exception as e:
-            logger.error(f"Error opening bulk import file {_file.name}: {e}")
-            logger.error("Unable to validate headers.")
-            return
+            raise ValidationError(f"Error opening bulk import file {_file}: {e}")
 
         sheet = workbook.active
 
@@ -5362,6 +5548,7 @@ def validate_headers(self, _file, schema):
             error_string += f" The file has the following headers that are not part of the schema: {extra_headers}"
         raise ValidationError(error_string)
 
+    @transaction.atomic
     def process(self):
         if self.processing_status == self.PROCESSING_STATUS_COMPLETED:
             logger.info(f"Bulk import task {self.id} has already been processed")
@@ -5401,6 +5588,9 @@ def process(self):
         # Get the first sheet
         sheet = workbook.active
 
+        # headers
+        headers = [cell.value for cell in sheet[1] if cell.value is not None]
+
         # Get the rows
         rows = list(
             sheet.iter_rows(
@@ -5412,7 +5602,7 @@ def process(self):
         )
 
         errors = []
-
+        ocr_migrated_from_ids = []
         # Process the rows
         for index, row in enumerate(rows):
             self.rows_processed = index + 1
@@ -5425,34 +5615,22 @@ def process(self):
 
             self.save()
 
-            self.process_row(index, row, errors)
+            self.process_row(ocr_migrated_from_ids, index, headers, row, errors)
 
-        if errors:
-            self.processing_status = (
-                OccurrenceReportBulkImportTask.PROCESSING_STATUS_FAILED
-            )
-            self.datetime_error = timezone.now()
-            self.error_message = "Errors occurred during processing:\n"
-            for error in errors:
-                self.error_message += error["error_message"] + "\n"
-        else:
-            # Set the task to completed
-            self.processing_status = (
-                OccurrenceReportBulkImportTask.PROCESSING_STATUS_COMPLETED
-            )
-            self.datetime_completed = timezone.now()
-        self.save()
+        if errors and len(errors) > 0:
+            # If a single thing went wrong roll back everything
+            # Imports either work completely or fail completely
+            transaction.set_rollback(True)
 
         return errors
 
-    def process_row(self, index, row, errors):
-        logger.debug(f"Processing row: Index {index}, Data: {row}")
+    def process_row(self, ocr_migrated_from_ids, index, headers, row, errors):
         row_hash = hashlib.sha256(str(row).encode()).hexdigest()
         if OccurrenceReport.objects.filter(import_hash=row_hash).exists():
             duplicate_ocr = OccurrenceReport.objects.get(import_hash=row_hash)
             error_message = (
                 f"Row {index} has the exact same data as "
-                f"Occurrence Report {duplicate_ocr.occurrence_report_number}"
+                f"Occurrence Report {duplicate_ocr.occurrence_report_number} did when it was imported."
             )
             errors.append(
                 {
@@ -5464,28 +5642,78 @@ def process_row(self, index, row, errors):
             )
             return
 
+        ocr_migrated_from_id = row[0]
+        mode = "create"
+        if (
+            ocr_migrated_from_id in ocr_migrated_from_ids
+            or OccurrenceReport.objects.filter(
+                migrated_from_id=ocr_migrated_from_id
+            ).exists()
+        ):
+            mode = "update"
+
+        if ocr_migrated_from_id not in ocr_migrated_from_ids:
+            # Because this is happening in a transaction we need to keep track of
+            # the ocr_migrated_from_ids that have been processed in this transaction
+            ocr_migrated_from_ids.append(ocr_migrated_from_id)
+
         row_error_count = 0
         total_column_error_count = 0
 
         models = {}
+        geometries = {}
+        many_to_many_fields = {}
 
         # Validate each cell
-        for index, column in enumerate(self.schema.columns.all()):
-            # logger.debug(f"  Processing column: {column}")
-
-            # logger.debug(f"  Cell value: {row[index]}")
+        for column_index, column in enumerate(self.schema.columns.all()):
             column_error_count = 0
 
-            cell_value = row[index]
+            cell_value = row[column_index]
+
+            cell_value, errors_added = column.validate(
+                self, cell_value, mode, index, headers, row, errors
+            )
+
+            model_class = apps.get_model(
+                "boranga", column.django_import_content_type.model
+            )
+            field = model_class._meta.get_field(column.django_import_field_name)
+
+            # Special case: geojson feature collection
+            # TODO: Consider modifying this so that it can support multiple geometry fields
+            # in the same model like the m2m one does below
+            if (
+                type(field) is gis_models.GeometryField
+                and type(cell_value) is list
+                and len(cell_value) > 0
+            ):
+                # Store every feature / geometry in the geometries dict
+                geometries[model_class._meta.model_name] = cell_value
+
+                # Set the first geometry as the cell value so that it is
+                # created with the main model instance
+                cell_value = geometries[model_class._meta.model_name][0]
+
+            # Special case: Many to many fields
+            if type(field) is ManyToManyField:
+                # Store the many to many field in the many_to_many_fields dict
+                # As you can't assign a list of models directly to a many to many field
+                # via model_data
+                if model_class._meta.model_name not in many_to_many_fields:
+                    many_to_many_fields[model_class._meta.model_name] = []
+                many_to_many_fields[model_class._meta.model_name].append(
+                    {"field": column.django_import_field_name, "value": cell_value}
+                )
 
-            cell_value, errors_added = column.validate(cell_value, index, errors)
+                # Continue to the next column without adding the cell value to the model data
+                continue
 
             column_error_count += errors_added
 
             row_error_count += column_error_count
             total_column_error_count += column_error_count
 
-            if column_error_count:
+            if column_error_count > 0:
                 continue
 
             model_name = column.django_import_content_type.model
@@ -5501,16 +5729,6 @@ def process_row(self, index, row, errors):
 
         model_instances = {}
         for current_model_name in models:
-            logger.debug(f"Processing model: {current_model_name}")
-            mode = "create"
-
-            # If we are at the top level model, check if we are creating a new instance or updating an existing one
-            if (
-                current_model_name == OccurrenceReport._meta.model_name
-                and OccurrenceReport.objects.filter(migrated_from_id=row[0]).exists()
-            ):
-                mode = "update"
-
             model_data = dict(
                 zip(
                     models[current_model_name]["field_names"],
@@ -5523,34 +5741,153 @@ def process_row(self, index, row, errors):
                 "boranga",
                 current_model_name,
             )
-            current_model_instance = model_class(**model_data)
 
-            logger.debug(
-                f"{current_model_name}.__dict__: {current_model_instance.__dict__}"
-            )
+            if mode == "update":
+                # Remove empty values from the model data
+                model_data = {k: v for k, v in model_data.items() if v is not None}
+
+                if current_model_name == OccurrenceReport._meta.model_name:
+                    # Remove the migrated_from_id field as we don't want to update it
+                    model_data.pop("migrated_from_id", None)
 
             # For OccurrenceReport check if we are creating or updating
             # and set appropriate fields if so
             if current_model_name == OccurrenceReport._meta.model_name:
                 if mode == "create":
+                    current_model_instance = OccurrenceReport(**model_data)
                     current_model_instance.bulk_import_task_id = self.pk
                     current_model_instance.import_hash = row_hash
                     current_model_instance.group_type_id = self.schema.group_type_id
+                    current_model_instance.submitter = self.email_user
+                    current_model_instance.lodgement_date = timezone.now()
                 else:
-                    current_model_instance.pk = OccurrenceReport.objects.get(
+                    current_model_instance = OccurrenceReport.objects.get(
                         migrated_from_id=row[0]
-                    ).pk
+                    )
+                    for field, value in model_data.items():
+                        setattr(current_model_instance, field, value)
+            elif current_model_name == Occurrence._meta.model_name:
+                occ_migrated_from_id = model_data.pop("migrated_from_id", None)
+                occurrence_number = model_data.pop("occurrence_number", None)
+
+                if occ_migrated_from_id and occurrence_number:
+                    error_message = (
+                        "Both migrated_from_id and occurrence_number were provided. "
+                        "Please provide only one of these fields."
+                    )
+                    errors.append(
+                        {
+                            "row_index": index,
+                            "error_type": "ambiguous_occurrence_idenfitier",
+                            "data": model_data,
+                            "error_message": error_message,
+                        }
+                    )
+                    return
+
+                if occurrence_number:
+                    try:
+                        current_model_instance = Occurrence.objects.get(
+                            occurrence_number=occurrence_number
+                        )
+                    except Occurrence.DoesNotExist:
+                        error_message = "The occurrence number provided does not exist in the database"
+                        errors.append(
+                            {
+                                "row_index": index,
+                                "error_type": "invalid_occurrence_number",
+                                "data": model_data,
+                                "error_message": error_message,
+                            }
+                        )
+                        return
+                else:
+                    if not occ_migrated_from_id:
+                        if not model_data.get("group_type"):
+                            model_data["group_type"] = self.schema.group_type
+                        current_model_instance = Occurrence(**model_data)
+                    else:
+                        if Occurrence.objects.filter(
+                            migrated_from_id=occ_migrated_from_id
+                        ).exists():
+                            current_model_instance = Occurrence.objects.get(
+                                migrated_from_id=occ_migrated_from_id
+                            )
+                        else:
+                            current_model_instance = Occurrence.objects.create(
+                                migrated_from_id=occ_migrated_from_id,
+                                group_type=self.schema.group_type,
+                                species=model_instances[
+                                    OccurrenceReport._meta.model_name
+                                ].species,
+                            )
+
+                        if (
+                            not current_model_instance.group_type
+                            == self.schema.group_type
+                        ):
+                            error_message = (
+                                "The group type of the occurrence does not "
+                                "match the group type of the schema"
+                            )
+                            errors.append(
+                                {
+                                    "row_index": index,
+                                    "error_type": "invalid_occurrence_group_type",
+                                    "data": model_data,
+                                    "error_message": error_message,
+                                }
+                            )
+                            return
+
+                        occurrence_report = model_instances[
+                            OccurrenceReport._meta.model_name
+                        ]
+                        if (
+                            not current_model_instance.species
+                            == occurrence_report.species
+                        ):
+                            error_message = (
+                                "The species of the occurrence does not match "
+                                "the species of the occurrence report"
+                            )
+                            errors.append(
+                                {
+                                    "row_index": index,
+                                    "error_type": "invalid_occurrence_species",
+                                    "data": model_data,
+                                    "error_message": error_message,
+                                }
+                            )
+                            return
+
+                        for field, value in model_data.items():
+                            setattr(current_model_instance, field, value)
+
+            elif current_model_name == SubmitterInformation._meta.model_name:
+                # Submitter information is created automatically when an OccurrenceReport is created
+                occurrence_report = model_instances[OccurrenceReport._meta.model_name]
+                current_model_instance = occurrence_report.submitter_information
+                for field, value in model_data.items():
+                    setattr(current_model_instance, field, value)
+            else:
+                current_model_instance = model_class(**model_data)
 
             # If we are at the top level model (OccurrenceReport) we don't need to relate it to anything
-            if not current_model_name == OccurrenceReport._meta.model_name:
+            # We also don't need to relate the Occurrence model to anything here as it is dealt with
+            # as a special case further down
+            # TODO: Optimize this relationships finder to minimise looping and move to a separate function
+            if current_model_name not in [
+                OccurrenceReport._meta.model_name,
+                Occurrence._meta.model_name,
+                SubmitterInformation._meta.model_name,
+            ]:
                 # Relate this model to it's parent instance
 
                 related_to_parent = False
+                # Look through all the model instances that have already been saved
+                for potential_parent_model_key in [m for m in model_instances]:
 
-                # Look through all the models being imported except for the current model
-                for potential_parent_model_key in [
-                    m for m in models if m != current_model_name
-                ]:
                     # Check if this model has a relationship with the current model
                     potential_parent_instance = model_instances[
                         potential_parent_model_key
@@ -5561,8 +5898,6 @@ def process_row(self, index, row, errors):
                     # to the parent model
                     for field in current_model_instance._meta.get_fields():
                         if field.related_model == potential_parent_instance.__class__:
-                            logger.debug(f" ---> {field} is a relationship")
-
                             # If it does, set the relationship
                             setattr(
                                 current_model_instance,
@@ -5572,14 +5907,9 @@ def process_row(self, index, row, errors):
                             related_to_parent = True
                             break
 
-                    if related_to_parent:
-                        break
-
                     # If we didn't find a relationship in the current model, search the parent model
                     for field in potential_parent_instance.__class__._meta.get_fields():
                         if field.related_model == current_model_instance:
-                            logger.debug(f" ---> {field} is a relationship")
-
                             # If it does, set the relationship
                             setattr(
                                 current_model_instance,
@@ -5589,9 +5919,6 @@ def process_row(self, index, row, errors):
                             related_to_parent = True
                             break
 
-                    if related_to_parent:
-                        break
-
                 if not related_to_parent:
                     error_message = (
                         "Could not find a parent model to relate this model to "
@@ -5608,11 +5935,49 @@ def process_row(self, index, row, errors):
                     return
 
             try:
-                current_model_instance.save()
+                if mode == "create" or (mode == "update" and len(model_data.keys())):
+                    current_model_instance.save()
+
+                self.ocr_bulk_import_generate_action_logs(mode, current_model_instance)
+
                 model_instances[current_model_instance._meta.model_name] = (
                     current_model_instance
                 )
-                logger.debug(f"Model instance created: {current_model_instance}")
+                logger.info(f"Model instance saved: {current_model_instance}")
+
+                # Deal with special case of relating Occurrence to OccurrenceReport
+                if (
+                    current_model_instance._meta.model_name
+                    == Occurrence._meta.model_name
+                ):
+                    current_model_instance.occurrence_reports.add(
+                        model_instances[OccurrenceReport._meta.model_name]
+                    )
+
+                # Deal with special case of creating mutliple geometries based on the
+                # geojson text from the column
+                if current_model_instance._meta.model_name in geometries:
+                    logger.info(
+                        f"Creating multiple geometries for {current_model_instance}"
+                    )
+                    for geometry in geometries[current_model_instance._meta.model_name][
+                        1:
+                    ]:
+                        current_model_instance.pk = None
+                        current_model_instance.geometry = geometry
+                        current_model_instance.save()
+
+                # Deal with special case of many to many fields
+                if current_model_instance._meta.model_name in many_to_many_fields:
+                    logger.info(
+                        f"Adding many to many fields for {current_model_instance}"
+                    )
+                    for m2m_field in many_to_many_fields[
+                        current_model_instance._meta.model_name
+                    ]:
+                        field = getattr(current_model_instance, m2m_field["field"])
+                        field.set(m2m_field["value"])
+
             except IntegrityError as e:
                 logger.error(f"Error creating model instance: {e}")
                 errors.append(
@@ -5626,6 +5991,57 @@ def process_row(self, index, row, errors):
 
         return
 
+    def ocr_bulk_import_generate_action_logs(self, mode, model_instance):
+        if not model_instance._meta.model_name == OccurrenceReport._meta.model_name:
+            return
+
+        log_suffix = " (via bulk importer)"
+        bulk_importer = EmailUser.objects.get(id=self.email_user)
+        request = get_mock_request(bulk_importer)
+        if mode == "create":
+            model_instance.log_user_action(
+                OccurrenceReportUserAction.ACTION_LODGE_PROPOSAL.format(
+                    model_instance.occurrence_report_number
+                )
+                + log_suffix,
+                request,
+            )
+            if model_instance.processing_status in [
+                OccurrenceReport.PROCESSING_STATUS_WITH_APPROVER,
+                OccurrenceReport.PROCESSING_STATUS_APPROVED,
+            ]:
+                assessor = EmailUser.objects.get(id=model_instance.assigned_officer)
+                request = get_mock_request(assessor)
+                model_instance.log_user_action(
+                    OccurrenceReportUserAction.ACTION_PROPOSED_APPROVAL.format(
+                        model_instance.occurrence_report_number
+                    )
+                    + log_suffix,
+                    request,
+                )
+            if (
+                model_instance.processing_status
+                == OccurrenceReport.PROCESSING_STATUS_APPROVED
+            ):
+                approver = EmailUser.objects.get(id=model_instance.assigned_approver)
+                request = get_mock_request(approver)
+                model_instance.log_user_action(
+                    OccurrenceReportUserAction.ACTION_APPROVE.format(
+                        model_instance.occurrence_report_number,
+                        approver.get_full_name(),
+                    )
+                    + log_suffix,
+                    request,
+                )
+        elif mode == "update":
+            model_instance.log_user_action(
+                OccurrenceReportUserAction.ACTION_EDIT_APPLICATION.format(
+                    model_instance.occurrence_report_number
+                )
+                + log_suffix,
+                request,
+            )
+
     def retry(self):
         self.processing_status = self.PROCESSING_STATUS_QUEUED
         self.datetime_started = None
@@ -5636,8 +6052,7 @@ def retry(self):
         self.save()
 
     def revert(self):
-        # TODO: Using delete here due to the sheer number of records that could be created
-        # Still need to consider if we want to archive them
+        # Note: Using delete here due to the sheer number of records that could be created
         OccurrenceReport.objects.filter(bulk_import_task=self).delete()
 
         self.processing_status = self.PROCESSING_STATUS_ARCHIVED
@@ -5653,7 +6068,8 @@ class OccurrenceReportBulkImportSchema(models.Model):
     name = models.CharField(max_length=255, blank=True, null=True)
     tags = TaggableManager(blank=True)
     datetime_created = models.DateTimeField(auto_now_add=True)
-    datetime_updated = models.DateTimeField(default=datetime.now)
+    datetime_updated = models.DateTimeField(auto_now=True)
+    is_master = models.BooleanField(default=False)
 
     class Meta:
         app_label = "boranga"
@@ -5689,6 +6105,23 @@ def save(self, *args, **kwargs):
                 django_import_field_name="migrated_from_id",
             )
 
+    @property
+    def mandatory_fields(self):
+        if self.group_type.name == "community":
+            return [
+                "migrated_from_id",
+                "community",
+                "processing_status",
+                "assigned_officer",
+            ]
+
+        return [
+            "migrated_from_id",
+            "species",
+            "processing_status",
+            "assigned_officer",
+        ]
+
     @property
     def preview_import_file(self):
         workbook = openpyxl.Workbook()
@@ -5719,25 +6152,45 @@ def preview_import_file(self):
                     f"Model {model_class} does not have field {column.django_import_field_name}"
                 )
             model_field = model_class._meta.get_field(column.django_import_field_name)
-            logger.debug(f"model_field_type: {type(model_field)}")
+
+            allow_blank = model_field.null
+            if allow_blank and column.xlsx_data_validation_allow_blank is False:
+                allow_blank = False
+
             dv = None
             if column.default_value is not None:
                 dv = DataValidation(
                     type=dv_types["list"],
-                    allow_blank=model_field.null,
+                    allow_blank=allow_blank,
                     formula1=column.default_value,
                     error=f"This field may only contain the value '{column.default_value}'",
                     errorTitle="Invalid value for column with default value",
                     prompt="Either leave the field blank or enter the default value",
                     promptTitle="Value",
                 )
+            elif isinstance(
+                model_field, MultiSelectField
+            ):  # MultiSelectField is a custom field, not a standard Django field
+                # Unfortunately there is no easy way to embed validation in .xlsx
+                # for a comma separated list of values so this will be validated
+                # during the import process
+                continue
             elif (
                 isinstance(model_field, models.fields.CharField) and model_field.choices
             ):
+                choices = [c[0] for c in model_field.choices]
+                if (
+                    model_class is OccurrenceReport
+                    and model_field.name == "processing_status"
+                ):
+                    choices = [
+                        c[0]
+                        for c in OccurrenceReport.VALID_BULK_IMPORT_PROCESSING_STATUSES
+                    ]
                 dv = DataValidation(
                     type=dv_types["list"],
-                    allow_blank=model_field.null,
-                    formula1=",".join([c[0] for c in model_field.choices]),
+                    allow_blank=allow_blank,
+                    formula1=",".join(choices),
                     error="Please select a valid option from the list",
                     errorTitle="Invalid selection",
                     prompt="Select a value from the list",
@@ -5746,7 +6199,7 @@ def preview_import_file(self):
             elif isinstance(model_field, models.fields.CharField):
                 dv = DataValidation(
                     type=dv_types["textLength"],
-                    allow_blank=model_field.null,
+                    allow_blank=allow_blank,
                     operator=dv_operators["lessThanOrEqual"],
                     formula1=f"{model_field.max_length}",
                     error="Text must be less than or equal to {model_field.max_length} characters",
@@ -5761,7 +6214,7 @@ def preview_import_file(self):
                     type=dv_types["date"],
                     operator=dv_operators["greaterThanOrEqual"],
                     formula1="1900-01-01",
-                    allow_blank=model_field.null,
+                    allow_blank=allow_blank,
                     error="Please enter a valid date",
                     errorTitle="Invalid date",
                     prompt="Enter a date",
@@ -5773,12 +6226,15 @@ def preview_import_file(self):
                     )
                     for cell in worksheet[column_letter]:
                         cell.style = date_style
-            elif isinstance(model_field, models.fields.IntegerField):
+            elif (
+                isinstance(model_field, models.fields.IntegerField)
+                and column.is_emailuser_column is False
+            ):
                 dv = DataValidation(
                     type=dv_types["whole"],
                     operator=dv_operators["greaterThanOrEqual"],
                     formula1="0",
-                    allow_blank=model_field.null,
+                    allow_blank=allow_blank,
                     error="Please enter a whole number",
                     errorTitle="Invalid number",
                     prompt="Enter a whole number",
@@ -5787,7 +6243,7 @@ def preview_import_file(self):
             elif isinstance(model_field, models.fields.DecimalField):
                 dv = DataValidation(
                     type=dv_types["decimal"],
-                    allow_blank=model_field.null,
+                    allow_blank=allow_blank,
                     error="Please enter a decimal number",
                     errorTitle="Invalid number",
                     prompt="Enter a decimal number",
@@ -5796,7 +6252,7 @@ def preview_import_file(self):
             elif isinstance(model_field, models.fields.BooleanField):
                 dv = DataValidation(
                     type=dv_types["list"],
-                    allow_blank=model_field.null,
+                    allow_blank=allow_blank,
                     formula1='"True,False"',
                     error="Please select True or False",
                     errorTitle="Invalid selection",
@@ -5817,6 +6273,7 @@ def preview_import_file(self):
                 if (
                     not related_model_qs.exists()
                     or related_model_qs.count() == 0
+                    or related_model._meta.model_name in ["species", "community"]
                     or related_model_qs.count()
                     > settings.OCR_BULK_IMPORT_LOOKUP_TABLE_RECORD_LIMIT
                 ):
@@ -5828,7 +6285,7 @@ def preview_import_file(self):
 
                 dv = DataValidation(
                     type=dv_types["list"],
-                    allow_blank=model_field.null,
+                    allow_blank=allow_blank,
                     formula1=f'"{",".join([str(getattr(obj, display_field)) for obj in related_model_qs])}"',
                     error="Please select a valid option from the list",
                     errorTitle="Invalid selection",
@@ -5863,48 +6320,264 @@ def preview_import_file(self):
         return workbook
 
     @transaction.atomic
-    def copy(self):
-        if not self.pk:
-            raise ValueError("Schema must be saved before it can be copied")
+    def validate(self, request_user_id: int):
+        # Tries adding valid sample data to each column and then saving to the database
+        # Returns any errors that occur
+        # Rolls back the transaction regardless of success or failure
 
-        if OccurrenceReportBulkImportSchema.objects.filter(
-            group_type=self.group_type
-        ).exists():
-            highest_version = OccurrenceReportBulkImportSchema.objects.filter(
-                group_type=self.group_type
-            ).aggregate(Max("version"))["version__max"]
-        else:
-            highest_version = 0
-        new_schema = OccurrenceReportBulkImportSchema(
-            group_type=self.group_type,
-            version=highest_version + 1,
-        )
-        if self.name:
-            new_schema.name = f"{self.name} (Copy)"
-        else:
-            new_schema.name = f"Copy of Version {self.version}"
-        new_schema.save()
-        django_import_content_type = ct_models.ContentType.objects.get_for_model(
-            OccurrenceReport
-        )
-        # Copy all columns except those that were automatically created
+        errors = []
+
+        columns = self.columns.all()
+        if not columns.exists() or columns.count() == 0:
+            errors.append(
+                {
+                    "error_type": "no_columns",
+                    "error_message": "No columns found in the schema",
+                }
+            )
+            return errors
+
+        for field in self.mandatory_fields:
+            if not columns.filter(
+                django_import_content_type=ct_models.ContentType.objects.get_for_model(
+                    OccurrenceReport
+                ),
+                django_import_field_name=field,
+            ).exists():
+                errors.append(
+                    {
+                        "error_type": "missing_mandatory_column",
+                        "error_message": f"Missing mandatory occurrence report column for django field: {field}",
+                    }
+                )
+                return errors
+
+        # Create a sample row of data
+        sample_row = []
+
+        # Special case where only a migrated_from_id or occurrence_number
+        # Should be provided when both columns are present otherwise validation will fail
+        row_contains_occ_migrated_from_id = (
+            columns.filter(
+                django_import_content_type=ct_models.ContentType.objects.get_for_model(
+                    Occurrence
+                ),
+                django_import_field_name="migrated_from_id",
+            ).exists()
+            and columns.filter(
+                django_import_content_type=ct_models.ContentType.objects.get_for_model(
+                    Occurrence
+                ),
+                django_import_field_name="occurrence_number",
+            ).exists()
+        )
+        species_or_community_identifier = None
+        for column in columns:
+            sample_value = column.get_sample_value(
+                errors, species_or_community_identifier
+            )
+            if (
+                column.django_import_content_type.model == Occurrence._meta.model_name
+                and column.django_import_field_name == "species"
+            ):
+                species_or_community_identifier = Species.objects.get(
+                    taxonomy__scientific_name=sample_value
+                )
+
+            if (
+                column.django_import_content_type.model == Occurrence._meta.model_name
+                and column.django_import_field_name == "community"
+            ):
+                species_or_community_identifier = Community.objects.get(
+                    taxonomy__community_migrated_id=sample_value
+                )
+
+            if (
+                column.django_import_content_type.model == Occurrence._meta.model_name
+                and column.django_import_field_name == "migrated_from_id"
+                and row_contains_occ_migrated_from_id
+            ):
+                sample_value = ""
+            sample_row.append(sample_value)
+
+        logger.info(f"Sample row: {sample_row}")
+
+        preview_import_file = self.preview_import_file
+
+        # Write the sample row to the file
+        sheet = preview_import_file.active
+        sheet.append(sample_row)
+
+        # Convert the import file to a Django File object
+        import_file_name = f"sample_{self.group_type.name}_{self.version}.xlsx"
+        import_file = InMemoryUploadedFile(
+            preview_import_file,
+            "_file",
+            import_file_name,
+            "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+            None,
+            None,
+        )
+        sample_associated_file = InMemoryUploadedFile(
+            BytesIO(b"I am a test file"),
+            "file",
+            "sample_file.txt",
+            "text/plain",
+            0,
+            None,
+        )
+        # Create a .zip file to house the sample associated file
+        zip_buffer = BytesIO()
+        with zipfile.ZipFile(zip_buffer, "w") as zip_file:
+            zip_file.writestr(
+                sample_associated_file.name, sample_associated_file.read()
+            )
+        zip_file_name = f"sample_{self.group_type.name}_{self.version}.zip"
+        zip_file = InMemoryUploadedFile(
+            zip_buffer,
+            "file",
+            zip_file_name,
+            "application/zip",
+            0,
+            None,
+        )
+
+        import_task = OccurrenceReportBulkImportTask(
+            schema=self,
+            _file=import_file,
+            _associated_files_zip=zip_file,
+            rows=1,
+            email_user=request_user_id,
+        )
+
+        # Convert the file to bytes
+        buffer = BytesIO()
+        preview_import_file.save(buffer)
+        buffer.seek(0)
+
+        try:
+            import_task.validate_headers(buffer, self)
+        except ValidationError as e:
+            logger.error(f"Error validating headers: {e}")
+            logger.error(traceback.format_exc())
+            errors.append(
+                {
+                    "error_type": "header_validation",
+                    "error_message": e.message,
+                }
+            )
+            transaction.set_rollback(True)
+            return errors
+
+        headers = [cell.value for cell in sheet[1] if cell.value is not None]
+
+        # Get the rows
+        row = list(
+            sheet.iter_rows(
+                min_row=2,
+                max_row=2,
+                max_col=self.columns.count(),
+                values_only=True,
+            )
+        )[0]
+
+        ocr_migrated_from_ids = []
+
+        try:
+            import_task.process_row(ocr_migrated_from_ids, 0, headers, row, errors)
+        except Exception as e:
+            logger.error(f"Error processing sample row: {e}")
+            logger.error(traceback.format_exc())
+            errors.append(
+                {
+                    "error_type": "row_validation",
+                    "error_message": f"Error processing sample row: {e}",
+                }
+            )
+            transaction.set_rollback(True)
+            return errors
+
+        transaction.set_rollback(True)
+        return errors
+
+    @transaction.atomic
+    def copy(self, request):
+        if not self.pk:
+            raise ValueError("Schema must be saved before it can be copied")
+
+        if OccurrenceReportBulkImportSchema.objects.filter(
+            group_type=self.group_type
+        ).exists():
+            highest_version = OccurrenceReportBulkImportSchema.objects.filter(
+                group_type=self.group_type
+            ).aggregate(Max("version"))["version__max"]
+        else:
+            highest_version = 0
+
+        new_schema = OccurrenceReportBulkImportSchema(
+            group_type=self.group_type,
+            version=highest_version + 1,
+        )
+        # If the user copying the schema has elevated permissions, the new schema
+        # will also be a master schema otherwise it will be a regular schema
+        if self.is_master and is_django_admin(request):
+            new_schema.is_master = True
+
+        if self.name:
+            new_schema.name = f"{self.name} (Copy)"
+        else:
+            new_schema.name = f"Copy of Version {self.version}"
+        new_schema.save()
+        django_import_content_type = ct_models.ContentType.objects.get_for_model(
+            OccurrenceReport
+        )
+        # Copy all columns except those that were automatically created
         for column in self.columns.exclude(
             django_import_content_type=django_import_content_type,
             django_import_field_name="migrated_from_id",
         ):
-            new_column = OccurrenceReportBulkImportSchemaColumn.objects.get(
-                pk=column.pk
-            )
-            new_column.pk = None
+            # Note: Due to an issue in django-ordered-model you can't use the
+            # method of cloning objects here where to make a copy of the object
+            # you set the pk to None and save it (that will mess up the ordering of
+            # the original schema's columns) Strange bug but can't be bothered looking into it further
+            new_column = OccurrenceReportBulkImportSchemaColumn()
+            for field in column._meta.fields:
+                if field.name == "id":
+                    continue
+                setattr(new_column, field.name, getattr(column, field.name))
             new_column.schema = new_schema
             new_column.save()
 
+            for lookup_filter in column.lookup_filters.all():
+                new_lookup_filter = SchemaColumnLookupFilter.objects.create(
+                    schema_column=new_column,
+                    filter_field_name=lookup_filter.filter_field_name,
+                    filter_type=lookup_filter.filter_type,
+                )
+
+                for value in lookup_filter.values.all():
+                    SchemaColumnLookupFilterValue.objects.create(
+                        lookup_filter=new_lookup_filter,
+                        filter_value=value.filter_value,
+                    )
+
         new_schema.tags.add(*self.tags.all())
 
+        if self.is_master and not is_django_admin(request):
+            # Columns copied from a 'master' schema will not be editable
+            # for occurrence approvers (only by superusers and django admins)
+            new_schema.columns.all().update(is_editable=False)
+
         return new_schema
 
 
+class OccurrenceReportBulkImportSchemaColumnManager(OrderedModelManager):
+    def get_queryset(self):
+        return super().get_queryset().prefetch_related("lookup_filters")
+
+
 class OccurrenceReportBulkImportSchemaColumn(OrderedModel):
+    objects = OccurrenceReportBulkImportSchemaColumnManager()
     schema = models.ForeignKey(
         OccurrenceReportBulkImportSchema,
         related_name="columns",
@@ -5920,51 +6593,30 @@ class OccurrenceReportBulkImportSchemaColumn(OrderedModel):
         related_name="import_columns",
     )
     django_import_field_name = models.CharField(max_length=50, blank=False, null=False)
-    django_lookup_field_name = models.CharField(
-        max_length=50, default="id", blank=True, null=True
-    )
+    django_lookup_field_name = models.CharField(max_length=50, blank=True, null=True)
 
     # The name of the column header in the .xlsx file
     xlsx_column_header_name = models.CharField(max_length=50, blank=False, null=False)
 
-    # The following fields are used to embed data validation in the .xlsx file
-    # so that the users can do a quick check before uploading
-    xlsx_data_validation_type = models.CharField(
-        max_length=20,
-        choices=sorted(
-            [(x, x) for x in DataValidation.type.values],
-            key=lambda x: (x[0] is None, x),
-        ),
-        null=True,
-        blank=True,
-    )
+    # This field allows the user that is generating the schema the ability to
+    # make non mandatory fields mandatory for a specific schema
     xlsx_data_validation_allow_blank = models.BooleanField(default=False)
-    xlsx_data_validation_operator = models.CharField(
-        max_length=20,
-        choices=sorted(
-            [(x, x) for x in DataValidation.operator.values],
-            key=lambda x: (x[0] is None, x),
-        ),
-        null=True,
-        blank=True,
-    )
-    xlsx_data_validation_formula1 = models.CharField(
-        max_length=50, blank=True, null=True
-    )
-    xlsx_data_validation_formula2 = models.CharField(
-        max_length=50, blank=True, null=True
-    )
+
+    # Columns copied from a 'master' schema will not be editable
+    # by occurrence approvers (only by superusers and django admins)
+    is_editable = models.BooleanField(default=True)
 
     order_with_respect_to = "schema"
 
-    DEFAULT_VALUE_REQUEST_USER_ID = "request_user_id"
-    DEFAULT_VALUE_CHOICES = ((DEFAULT_VALUE_REQUEST_USER_ID, "Request User ID"),)
+    DEFAULT_VALUE_BULK_IMPORT_SUBMITTER = "bulk_import_submitter"
+    DEFAULT_VALUE_CHOICES = (
+        (DEFAULT_VALUE_BULK_IMPORT_SUBMITTER, "Bulk Import Submitter"),
+    )
 
     default_value = models.CharField(
         max_length=255, choices=DEFAULT_VALUE_CHOICES, blank=True, null=True
     )
-
-    # TODO: How are we going to do the list lookup validation for much larger datasets (mostly for species)
+    is_emailuser_column = models.BooleanField(default=False)
 
     class Meta(OrderedModel.Meta):
         app_label = "boranga"
@@ -5996,149 +6648,1014 @@ class Meta(OrderedModel.Meta):
     def __str__(self):
         return f"{self.xlsx_column_header_name} - {self.schema}"
 
-    def validate(self, cell_value, index, errors):
-        errors_added = 0
-        if not self.xlsx_data_validation_allow_blank and not cell_value:
+    @property
+    def model_name(self):
+        if not self.django_import_content_type:
+            return None
+
+        model = self.django_import_content_type.model_class()
+        return model._meta.verbose_name
+
+    @property
+    def field(self):
+        if not self.django_import_content_type or not self.django_import_field_name:
+            return None
+
+        return self.django_import_content_type.model_class()._meta.get_field(
+            self.django_import_field_name
+        )
+
+    @property
+    def field_type(self):
+        if not self.field:
+            return None
+
+        return self.field.get_internal_type()
+
+    @property
+    def xlsx_validation_type(self):
+        if not self.field:
+            return None
+
+        return get_openpyxl_data_validation_type_for_django_field(
+            self.field, column=self
+        )
+
+    @property
+    def text_length(self):
+        if not self.field:
+            return None
+
+        if not isinstance(self.field, models.CharField):
+            return 32767
+
+        return self.field.max_length
+
+    @property
+    def choices(self):
+        if not self.field:
+            return None
+
+        model_class = self.django_import_content_type.model_class()
+
+        return get_choices_for_field(model_class, self.field)
+
+    @cached_property
+    def related_model(self):
+        if not self.django_import_content_type or not self.django_import_field_name:
+            return None
+
+        field = self.django_import_content_type.model_class()._meta.get_field(
+            self.django_import_field_name
+        )
+        if not isinstance(field, (models.ForeignKey, models.ManyToManyField)):
+            return None
+
+        return field.related_model
+
+    @cached_property
+    def display_field(self):
+        related_model = self.related_model
+
+        if not related_model:
+            return None
+
+        if self.django_lookup_field_name:
+            display_field = self.django_lookup_field_name
+        else:
+            display_field = get_display_field_for_model(related_model)
+
+        return display_field
+
+    @cached_property
+    def related_model_qs(self):
+        display_field = self.display_field
+
+        filter_dict = {f"{display_field}__isnull": False}
+        related_model_qs = self.related_model.objects.filter(**filter_dict)
+
+        if issubclass(self.related_model, ArchivableModel):
+            related_model_qs = self.related_model.objects.exclude(archived=True)
+
+        if hasattr(self.related_model, "group_type"):
+            related_model_qs = related_model_qs.only(display_field, "group_type")
+        else:
+            related_model_qs = related_model_qs.only(display_field)
+
+        return related_model_qs.order_by(display_field)
+
+    @cached_property
+    def filtered_related_model_qs(self):
+        if not self.related_model_qs:
+            return None
+
+        if not self.lookup_filters.exists():
+            return self.related_model_qs
+
+        related_model_qs = self.related_model_qs
+
+        related_model = self.related_model
+
+        # If the related model has a group_type field, filter by the schema's group type
+        # (i.e. flora, fauna or community)
+        if hasattr(related_model, "group_type"):
+            related_model_qs = related_model_qs.filter(
+                group_type=self.schema.group_type
+            )
+
+        # Apply any lookup filters if they exist
+        for lookup_filter in self.lookup_filters.all():
+            lookup_filter.filter_field_name + "__" + lookup_filter.filter_type
+            lookup_filter_value = lookup_filter.values.first().filter_value
+            if lookup_filter.values.count() > 1:
+                lookup_filter_value = lookup_filter.values.values_list(
+                    "filter_value", flat=True
+                )
+            if lookup_filter.filter_type == "in" and not isinstance(
+                lookup_filter_value, list
+            ):
+                lookup_filter_value = [lookup_filter_value]
+
+            related_model_qs = related_model_qs.filter(
+                **{
+                    lookup_filter.filter_field_name
+                    + "__"
+                    + lookup_filter.filter_type: lookup_filter_value
+                }
+            )
+
+        return related_model_qs
+
+    @cached_property
+    def foreign_key_count(self):
+        if not self.related_model_qs:
+            return 0
+
+        # Don't return the filtered count here as if we add filters on the front end
+        # the count will change which will then result in the advanced lookup interface
+        # No longer being shown
+        return self.related_model_qs.count()
+
+    @cached_property
+    def requires_lookup_field(self):
+        if not self.django_import_content_type or not self.django_import_field_name:
+            return False
+
+        if (
+            self.django_import_content_type
+            == ct_models.ContentType.objects.get_for_model(OccurrenceReport)
+            and self.django_import_field_name in ["species", "community"]
+        ):
+            return True
+
+        return (
+            self.foreign_key_count > settings.OCR_BULK_IMPORT_LOOKUP_TABLE_RECORD_LIMIT
+        )
+
+    @cached_property
+    def filtered_foreign_key_count(self):
+        if not self.filtered_related_model_qs:
+            return 0
+
+        return self.filtered_related_model_qs.count()
+
+    def get_sample_value(self, errors, species_or_community_identifier=None):
+        if not self.django_import_content_type:
             errors.append(
                 {
-                    "row_index": index,
-                    "error_type": "column",
-                    "data": cell_value,
-                    "error_message": f"Value in column {self.xlsx_column_header_name} is blank",
+                    "error_type": "no_import_content_type",
+                    "error_message": f"No import content type set for column {self}",
                 }
             )
-            errors_added += 1
+            return None
 
-        if self.xlsx_data_validation_type == "textLength":
-            if len(cell_value) > int(self.xlsx_data_validation_formula1):
-                error_message = f"Value {cell_value} in column {self.xlsx_column_header_name} has too many characters"
-                errors.append(
-                    {
-                        "row_index": index,
-                        "error_type": "column",
-                        "data": cell_value,
-                        "error_message": error_message,
-                    }
-                )
-                errors_added += 1
+        if not self.django_import_field_name:
+            errors.append(
+                {
+                    "error_type": "no_import_field_name",
+                    "error_message": f"No import field name set for column {self}",
+                }
+            )
+            return None
 
-        if self.xlsx_data_validation_type == "whole":
-            if not isinstance(cell_value, int):
+        try:
+            field = self.django_import_content_type.model_class()._meta.get_field(
+                self.django_import_field_name
+            )
+        except FieldDoesNotExist:
+            error_message = (
+                f"Field {self.django_import_field_name} not found in model "
+                f"{self.django_import_content_type.model_class()}"
+            )
+            errors.append(
+                {
+                    "error_type": "field_not_found",
+                    "error_message": error_message,
+                }
+            )
+            return None
+
+        if (
+            self.django_import_content_type
+            == ct_models.ContentType.objects.get_for_model(OccurrenceReport)
+            and self.django_import_field_name == "processing_status"
+        ):
+            # Special case as there are only 3 processing statuses allow for OCR
+            return random.choice(
+                [
+                    OccurrenceReport.PROCESSING_STATUS_WITH_ASSESSOR,
+                    OccurrenceReport.PROCESSING_STATUS_WITH_APPROVER,
+                    OccurrenceReport.PROCESSING_STATUS_APPROVED,
+                ]
+            )
+
+        if isinstance(field, models.ForeignKey):
+            related_model_qs = self.filtered_related_model_qs
+
+            if not related_model_qs.exists():
                 errors.append(
                     {
-                        "row_index": index,
-                        "error_type": "column",
-                        "data": cell_value,
-                        "error_message": f"Value {cell_value} in column {self.column_header_name} is not an integer",
+                        "error_type": "no_records",
+                        "error_message": f"No records found for foreign key {field.related_model._meta.model_name}",
                     }
                 )
-                errors_added += 1
 
-        if self.xlsx_data_validation_type == "decimal":
-            try:
-                cell_value = Decimal(cell_value)
-            except Exception:
+            display_field = self.display_field
+
+            random_value = (
+                related_model_qs.order_by("?")
+                .values_list(display_field, flat=True)
+                .first()
+            )
+
+            return random_value
+
+        if isinstance(field, models.ManyToManyField):
+            related_model_qs = self.filtered_related_model_qs
+
+            if not related_model_qs.exists():
+                error_message = f"No records found for many to many field {field.related_model._meta.model_name}"
                 errors.append(
                     {
-                        "row_index": index,
-                        "error_type": "column",
-                        "data": cell_value,
-                        "error_message": f"Value {cell_value} in column {self.column_header_name} is not a decimal",
+                        "error_type": "no_records",
+                        "error_message": error_message,
                     }
                 )
-                errors_added += 1
 
-        if self.xlsx_data_validation_type == "date":
-            try:
-                cell_value = dateutil.parser.parse(cell_value)
-            except Exception:
+            display_field = self.display_field
+
+            random_values = list(
+                related_model_qs.order_by("?")
+                .values_list(display_field, flat=True)
+                .distinct()[: random.randint(1, 3)]
+            )
+
+            return ",".join(random_values)
+
+        if isinstance(field, MultiSelectField):
+            model_class = self.django_import_content_type.model_class()
+            # Unfortunatly have to have an actual model instance to get the choices
+            # as they are defined in __init__
+            model_instance = model_class()
+            choices = model_instance._meta.get_field(
+                self.django_import_field_name
+            ).choices
+            if not choices or len(choices) == 0:
                 errors.append(
                     {
-                        "row_index": index,
-                        "error_type": "column",
-                        "data": cell_value,
-                        "error_message": f"Value {cell_value} in column {self.column_header_name} is not a date",
+                        "error_type": "no_choices",
+                        "error_message": f"No choices found for column {self.xlsx_column_header_name}",
                     }
                 )
-                errors_added += 1
-
-        if self.xlsx_data_validation_type == "time":
+                return None
+            return random.choice([choice[1] for choice in choices])
+
+        if isinstance(field, models.BooleanField):
+            return random.choice([True, False])
+
+        if isinstance(field, models.DecimalField):
+            decimal_places = field.decimal_places if field.decimal_places else 2
+            max_digits = field.max_digits if field.max_digits else 5
+            max_value = 10 ** (max_digits - decimal_places - 1)
+            return round(random.uniform(0, max_value), decimal_places)
+
+        if isinstance(field, models.IntegerField):
+            if self.is_emailuser_column:
+                user_qs = EmailUser.objects.filter(is_active=True)
+                if field.name == "assigned_officer":
+                    ocr_officer_ids = member_ids(
+                        settings.GROUP_NAME_OCCURRENCE_ASSESSOR
+                    )
+                    user_qs = user_qs.filter(id__in=ocr_officer_ids)
+                if field.name == "assigned_approver":
+                    ocr_approver_ids = member_ids(
+                        settings.GROUP_NAME_OCCURRENCE_APPROVER
+                    )
+                    user_qs = user_qs.filter(id__in=ocr_approver_ids)
+                user = user_qs.order_by("?").first()
+                return user.email
+            else:
+                min_value = field.min_value if hasattr(field, "min_value") else 0
+                max_value = field.max_value if hasattr(field, "max_value") else 10000
+                return random.randint(min_value, max_value)
+
+        if isinstance(field, models.DateField):
+            start = datetime(1900, 1, 1, 0, 0, 0, tzinfo=dt_timezone.utc).date()
+            end = timezone.now().date()
+            random_date = start + (end - start) * random.random()
+            return random_date.strftime("%d/%m/%Y")
+
+        if isinstance(field, models.DateTimeField):
+            start = datetime(1900, 1, 1, 0, 0, 0, tzinfo=dt_timezone.utc)
+            end = timezone.now()
+            random_datetime = start + (end - start) * random.random()
+            return random_datetime.strftime("%d/%m/%Y %H:%M:%S")
+
+        if isinstance(field, (models.CharField, models.TextField)):
+            if (
+                self.django_import_content_type.model_class() == Occurrence
+                and self.django_import_field_name == "occurrence_number"
+            ):
+                # Special case for occurrence number (Make sure that the occurrence is of the same
+                # group type as the schema and same species or community name as the sample data)
+                group_type = self.schema.group_type
+                random_occurrence = Occurrence.objects.filter(group_type=group_type)
+                filter_field = {
+                    "species__taxonomy__scientific_name": species_or_community_identifier
+                }
+                if group_type.name == "community":
+                    filter_field = {
+                        "community__taxonomy__community_migrated_id": species_or_community_identifier
+                    }
+                return (
+                    random_occurrence.filter(**filter_field)
+                    .order_by("?")
+                    .first()
+                    .occurrence_number
+                )
+
+            if hasattr(field, "max_length") and field.max_length:
+                random_length = random.randint(1, field.max_length)
+            else:
+                random_length = random.randint(1, 1000)
+            return "".join(
+                random.choices(
+                    string.ascii_letters + string.digits + " ", k=random_length
+                )
+            )
+
+        if isinstance(field, gis_models.GeometryField):
+            # Generate a random point and polygon that falls within Western Australia
+            # In this case the dbca building in Kensington
+            return json.dumps(
+                {
+                    "type": "FeatureCollection",
+                    "features": [
+                        {
+                            "type": "Feature",
+                            "geometry": {
+                                "type": "Point",
+                                "coordinates": [115.8840195356077, -31.99563118840819],
+                            },
+                        },
+                        {
+                            "type": "Feature",
+                            "geometry": {
+                                "type": "Polygon",
+                                "coordinates": [
+                                    [
+                                        [115.88337912139104, -31.995016820738698],
+                                        [115.88337912139104, -31.99586499034117],
+                                        [115.88434603648648, -31.99586499034117],
+                                        [115.88434603648648, -31.995016820738698],
+                                        [115.88337912139104, -31.995016820738698],
+                                    ]
+                                ],
+                            },
+                        },
+                    ],
+                }
+            )
+
+        if isinstance(field, models.FileField):
+            return "sample_file.txt"
+
+        raise ValueError(
+            f"Not able to generate sample data for field {field} of type {type(field)}"
+        )
+
+    @property
+    def preview_foreign_key_values_xlsx(self):
+        related_model_qs = self.filtered_related_model_qs
+
+        if not related_model_qs:
+            raise ValueError("No related model queryset found")
+
+        workbook = openpyxl.Workbook()
+        worksheet = workbook.active
+
+        display_field = self.display_field
+
+        # Query the max character length of the display field
+        max_length = related_model_qs.aggregate(
+            max_length=Max(Length(Cast(display_field, output_field=CharField())))
+        )["max_length"]
+
+        if len(self.xlsx_column_header_name) > max_length:
+            max_length = len(self.xlsx_column_header_name)
+
+        headers = [self.xlsx_column_header_name]
+        worksheet.append(headers)
+        for cell_value in related_model_qs.order_by(display_field).values_list(
+            display_field, flat=True
+        ):
+            worksheet.append([cell_value])
+
+        # Make the headers bold
+        worksheet["A1"].font = Font(bold=True)
+
+        # Make the column widths appropriate
+        worksheet.column_dimensions["A"].width = max_length + 2
+
+        return workbook
+
+    def validate(self, task, cell_value, mode, index, headers, row, errors):
+        from boranga.components.spatial.utils import get_geometry_array_from_geojson
+
+        errors_added = 0
+
+        if mode == "update" and (cell_value is None or cell_value == ""):
+            # When updating an OCR many of the columns may be blank
+            # So we don't need to validate them if they don't have a value
+            return cell_value, errors_added
+
+        try:
+            model_class = apps.get_model(
+                "boranga", self.django_import_content_type.model
+            )
+        except LookupError:
+            errors.append(
+                {
+                    "row_index": index,
+                    "error_type": "column",
+                    "data": cell_value,
+                    "error_message": f"Model class {self.django_import_content_type.model} not found",
+                }
+            )
+            errors_added += 1
+            return cell_value, errors_added
+
+        if not hasattr(model_class, self.django_import_field_name):
+            errors.append(
+                {
+                    "row_index": index,
+                    "error_type": "column",
+                    "data": cell_value,
+                    "error_message": f"Field {self.django_import_field_name} not found in model {model_class}",
+                }
+            )
+            errors_added += 1
+            return cell_value, errors_added
+
+        field = model_class._meta.get_field(self.django_import_field_name)
+
+        if self.default_value:
+            if self.default_value == self.DEFAULT_VALUE_BULK_IMPORT_SUBMITTER:
+                cell_value = task.email_user
+            return cell_value, errors_added
+
+        if (
+            self.django_import_content_type
+            == ct_models.ContentType.objects.get_for_model(OccurrenceReport)
+            and self.django_import_field_name == "processing_status"
+        ):
+            if cell_value not in [
+                c[0] for c in OccurrenceReport.VALID_BULK_IMPORT_PROCESSING_STATUSES
+            ]:
+                error_message = (
+                    f"Value {cell_value} in column {self.xlsx_column_header_name} "
+                    f"is not a valid processing status (must be one of "
+                    f"{str([c[0] for c in OccurrenceReport.VALID_BULK_IMPORT_PROCESSING_STATUSES])})"
+                )
+                errors.append(
+                    {
+                        "row_index": index,
+                        "error_type": "column",
+                        "data": cell_value,
+                        "error_message": error_message,
+                    }
+                )
+                errors_added += 1
+                return cell_value, errors_added
+
+            if cell_value in [
+                OccurrenceReport.PROCESSING_STATUS_WITH_APPROVER,
+                OccurrenceReport.PROCESSING_STATUS_APPROVED,
+            ]:
+                assigned_officer_column = self.schema.columns.filter(
+                    django_import_content_type=ct_models.ContentType.objects.get_for_model(
+                        OccurrenceReport
+                    ),
+                    django_import_field_name="assigned_officer",
+                ).first()
+                assigned_officer_email = row[
+                    headers.index(assigned_officer_column.xlsx_column_header_name)
+                ]
+                assigned_officer_id = None
+                try:
+                    assigned_officer_id = EmailUser.objects.get(
+                        email=assigned_officer_email
+                    ).id
+                except EmailUser.DoesNotExist:
+                    error_message = (
+                        "No ledger user found for assigned_officer with "
+                        f"email address: {assigned_officer_email}"
+                    )
+                    errors.append(
+                        {
+                            "row_index": index,
+                            "error_type": "column",
+                            "data": assigned_officer_email,
+                            "error_message": error_message,
+                        }
+                    )
+                    errors_added += 1
+                    return cell_value, errors_added
+
+                if not belongs_to_by_user_id(
+                    assigned_officer_id, settings.GROUP_NAME_OCCURRENCE_ASSESSOR
+                ):
+                    error_message = (
+                        f"User with email {assigned_officer_email} "
+                        f"(Ledger Emailuser ID: {assigned_officer_id}) is not a member"
+                        " of the occurrence assessor group"
+                    )
+                    errors.append(
+                        {
+                            "row_index": index,
+                            "error_type": "column",
+                            "data": assigned_officer_email,
+                            "error_message": error_message,
+                        }
+                    )
+                    errors_added += 1
+            if cell_value == OccurrenceReport.PROCESSING_STATUS_APPROVED:
+                assigned_approver_column = self.schema.columns.filter(
+                    django_import_content_type=ct_models.ContentType.objects.get_for_model(
+                        OccurrenceReport
+                    ),
+                    django_import_field_name="assigned_approver",
+                ).first()
+                assigned_approver_email = row[
+                    headers.index(assigned_approver_column.xlsx_column_header_name)
+                ]
+                assigned_approver_id = None
+                try:
+                    assigned_approver_id = EmailUser.objects.get(
+                        email=assigned_approver_email
+                    ).id
+                except EmailUser.DoesNotExist:
+                    error_message = (
+                        "No ledger user found for assigned_approver with "
+                        f"email address: {assigned_approver_email}"
+                    )
+                    errors.append(
+                        {
+                            "row_index": index,
+                            "error_type": "column",
+                            "data": assigned_approver_email,
+                            "error_message": error_message,
+                        }
+                    )
+                    errors_added += 1
+                    return cell_value, errors_added
+
+                if not belongs_to_by_user_id(
+                    assigned_approver_id, settings.GROUP_NAME_OCCURRENCE_APPROVER
+                ):
+                    error_message = (
+                        f"User with email {assigned_approver_email} "
+                        f"(Ledger Emailuser ID: {assigned_approver_id}) is not a member"
+                        " of the occurrence approver group"
+                    )
+                    errors.append(
+                        {
+                            "row_index": index,
+                            "error_type": "column",
+                            "data": assigned_approver_email,
+                            "error_message": error_message,
+                        }
+                    )
+                    errors_added += 1
+
+            return cell_value, errors_added
+
+        if not self.xlsx_data_validation_allow_blank and (
+            cell_value is None or cell_value == ""
+        ):
+            errors.append(
+                {
+                    "row_index": index,
+                    "error_type": "column",
+                    "data": cell_value,
+                    "error_message": f"Value in column {self.xlsx_column_header_name} is blank",
+                }
+            )
+            errors_added += 1
+
+        xlsx_data_validation_type = self.xlsx_validation_type
+
+        if self.is_emailuser_column:
+            if not cell_value:
+                # Depending on the status of the OCR the assigned_officer and / or assigned_approver
+                # fields may be blank
+                return cell_value, errors_added
             try:
-                cell_value = dateutil.parser.parse(cell_value)
-            except Exception:
+                cell_value = EmailUser.objects.get(email=cell_value).id
+            except EmailUser.DoesNotExist:
+                error_message = f"No ledger user found with email address: {cell_value}"
+                errors.append(
+                    {
+                        "row_index": index,
+                        "error_type": "column",
+                        "data": cell_value,
+                        "error_message": error_message,
+                    }
+                )
+                errors_added += 1
+            return cell_value, errors_added
+
+        if isinstance(field, MultiSelectField):
+            if not cell_value:
+                return cell_value, errors_added
+
+            if not isinstance(cell_value, str):
                 errors.append(
                     {
                         "row_index": index,
                         "error_type": "column",
                         "data": cell_value,
-                        "error_message": f"Value {cell_value} in column {self.column_header_name} is not a time",
+                        "error_message": f"Value {cell_value} in column {self.xlsx_column_header_name} is not a string",
                     }
                 )
                 errors_added += 1
+                return cell_value, errors_added
+
+            # Unfortunatly have to have an actual model instance to get the choices
+            # as they are defined in __init__
+            model_instance = model_class()
+            choices = model_instance._meta.get_field(
+                self.django_import_field_name
+            ).choices
+
+            display_values = cell_value.split(",")
+            cell_value = []
+            for display_value in [
+                display_value.strip() for display_value in display_values
+            ]:
+                if display_value not in [choice[1] for choice in choices]:
+                    error_message = (
+                        f"Value '{display_value}' in column {self.xlsx_column_header_name} "
+                        "is not in the list"
+                    )
+                    errors.append(
+                        {
+                            "row_index": index,
+                            "error_type": "column",
+                            "data": cell_value,
+                            "error_message": error_message,
+                        }
+                    )
+                    errors_added += 1
+                else:
+                    cell_value.append(
+                        [
+                            choice[0]
+                            for choice in field.choices
+                            if choice[1] == display_value
+                        ][0]
+                    )
+            return cell_value, errors_added
 
-        if self.xlsx_data_validation_type == "list":
-            if cell_value not in self.xlsx_data_validation_formula1:
+        if isinstance(field, models.FileField):
+            if not task._associated_files_zip:
+                error_message = "No associated files zip found"
                 errors.append(
                     {
                         "row_index": index,
                         "error_type": "column",
                         "data": cell_value,
-                        "error_message": f"Value {cell_value} in column {self.column_header_name} is not in the list",
+                        "error_message": error_message,
                     }
                 )
                 errors_added += 1
+                return cell_value, errors_added
 
-        model_class = apps.get_model("boranga", self.django_import_content_type.model)
-        if hasattr(model_class, self.django_import_field_name):
-            field = model_class._meta.get_field(self.django_import_field_name)
-            if isinstance(field, models.ForeignKey):
-                related_model = field.related_model
-                related_model_qs = related_model.objects.all()
+            associated_files_zip = zipfile.ZipFile(task._associated_files_zip, "r")
 
-                # Check if the related model is Archivable
-                if issubclass(related_model, ArchivableModel):
-                    related_model_qs = related_model_qs.exclude(archived=True)
+            # Check if the file exists in the zip
+            if cell_value not in associated_files_zip.namelist():
+                error_message = f"File {cell_value} not found in associated files zip"
+                errors.append(
+                    {
+                        "row_index": index,
+                        "error_type": "column",
+                        "data": cell_value,
+                        "error_message": error_message,
+                    }
+                )
+                errors_added += 1
+                return cell_value, errors_added
 
-                if not related_model_qs.exists() or related_model_qs.count() == 0:
-                    return cell_value, errors_added
+            # Get a reference to the file in memory
+            file_in_memory = associated_files_zip.open(cell_value)
 
-                if (
-                    related_model_qs.count()
-                    > settings.OCR_BULK_IMPORT_LOOKUP_TABLE_RECORD_LIMIT
-                ):
-                    # Use the django lookup field to find the value
-                    lookup_field = self.django_lookup_field_name
-                    try:
-                        related_model_instance = related_model_qs.get(
-                            **{lookup_field: cell_value}
-                        )
-                    except related_model.DoesNotExist:
-                        error_message = (
-                            f"Can't find {self.django_import_field_name} record by looking up "
-                            f"{self.django_lookup_field_name} with value {cell_value} "
-                            f"for column {self.column_header_name}"
-                        )
-                        errors.append(
-                            {
-                                "row_index": index,
-                                "error_type": "column",
-                                "data": cell_value,
-                                "error_message": error_message,
-                            }
-                        )
-                        errors_added += 1
-                        return cell_value, errors_added
+            extension = cell_value.split(".")[-1].lower()
+            # Get the content type of the file
+            try:
+                content_type = mimetypes.types_map["." + str(extension)]
+            except KeyError:
+                error_message = f"File extension {extension} not found in mimetypes"
+                errors.append(
+                    {
+                        "row_index": index,
+                        "error_type": "column",
+                        "data": cell_value,
+                        "error_message": error_message,
+                    }
+                )
+                errors_added += 1
+                return cell_value, errors_added
+
+            cell_value = InMemoryUploadedFile(
+                file_in_memory, field.name, cell_value, content_type, None, None
+            )
+
+            return cell_value, errors_added
+
+        if isinstance(field, gis_models.GeometryField):
+            try:
+                geom_json = json.loads(cell_value)
+            except json.JSONDecodeError:
+                error_message = f"Value {cell_value} in column {self.xlsx_column_header_name} is not a valid JSON"
+                errors.append(
+                    {
+                        "row_index": index,
+                        "error_type": "column",
+                        "data": cell_value,
+                        "error_message": error_message,
+                    }
+                )
+                errors_added += 1
+                return cell_value, errors_added
+
+            cell_value = []
+
+            geojson_type = geom_json.get("type", None)
+            if not geojson_type or geojson_type != "FeatureCollection":
+                error_message = (
+                    f"Value {cell_value} in column {self.xlsx_column_header_name} "
+                    "does not contain a valid FeatureCollection"
+                )
+                errors.append(
+                    {
+                        "row_index": index,
+                        "error_type": "column",
+                        "data": cell_value,
+                        "error_message": error_message,
+                    }
+                )
+                errors_added += 1
+
+                return cell_value, errors_added
+
+            cell_value = get_geometry_array_from_geojson(
+                geom_json,
+                cell_value,
+                index,
+                self.xlsx_column_header_name,
+                errors,
+                errors_added,
+            )
+
+            return cell_value, errors_added
 
-                    # Replace the lookup cell_value with the actual instance to assigned
-                    cell_value = related_model_instance
+        if xlsx_data_validation_type == "textLength" and field.max_length:
+            if len(str(cell_value)) > field.max_length:
+                error_message = f"Value {cell_value} in column {self.xlsx_column_header_name} has too many characters"
+                errors.append(
+                    {
+                        "row_index": index,
+                        "error_type": "column",
+                        "data": cell_value,
+                        "error_message": error_message,
+                    }
+                )
+                errors_added += 1
+
+        if xlsx_data_validation_type == "whole":
+            if not isinstance(cell_value, int):
+                errors_message = f"Value {cell_value} in column {self.xlsx_column_header_name} is not an integer"
+                errors.append(
+                    {
+                        "row_index": index,
+                        "error_type": "column",
+                        "data": cell_value,
+                        "error_message": errors_message,
+                    }
+                )
+                errors_added += 1
+
+        if xlsx_data_validation_type == "decimal":
+            try:
+                cell_value = Decimal(cell_value)
+            except Exception:
+                error_message = f"Value {cell_value} in column {self.xlsx_column_header_name} is not a decimal"
+                errors.append(
+                    {
+                        "row_index": index,
+                        "error_type": "column",
+                        "data": cell_value,
+                        "error_message": error_message,
+                    }
+                )
+                errors_added += 1
+
+        if xlsx_data_validation_type in ["date", "time"]:
+            # The cell_value should already be a datetime object since openpyxl
+            # converts cells formatted as dates to datetime objects automatically
+            # but when validating the schema
+            if not isinstance(cell_value, datetime):
+                try:
+                    if xlsx_data_validation_type == "date":
+                        cell_value = datetime.strptime(cell_value, "%d/%m/%Y")
+                    elif xlsx_data_validation_type == "time":
+                        cell_value = datetime.strptime(cell_value, "%d/%m/%Y %H:%M:%S")
+                except ValueError:
+                    error_message = (
+                        f"Value {cell_value} in column {self.xlsx_column_header_name} "
+                        "was not able to be converted to a datetime object"
+                    )
+                    errors.append(
+                        {
+                            "row_index": index,
+                            "error_type": "column",
+                            "data": cell_value,
+                            "error_message": error_message,
+                        }
+                    )
+                    errors_added += 1
                     return cell_value, errors_added
 
-                display_field = get_display_field_for_model(related_model)
+            # Make the datetime object timezone aware
+            cell_value = cell_value.replace(
+                tzinfo=zoneinfo.ZoneInfo(settings.TIME_ZONE)
+            )
 
-                if cell_value not in related_model_qs.values_list(
-                    display_field, flat=True
-                ):
-                    error_message = f"Value {cell_value} in column {self.column_header_name} is not in the lookup table"
+            return cell_value, errors_added
+
+        if isinstance(field, models.ForeignKey):
+            related_model = field.related_model
+            related_model_qs = self.related_model_qs
+
+            # Check if the related model is Archivable
+            if issubclass(related_model, ArchivableModel):
+                related_model_qs = related_model_qs.exclude(archived=True)
+
+            if not related_model_qs.exists() or related_model_qs.count() == 0:
+                error_message = f"No records found for foreign key {field.related_model._meta.model_name}"
+                errors.append(
+                    {
+                        "row_index": index,
+                        "error_type": "column",
+                        "data": cell_value,
+                        "error_message": error_message,
+                    }
+                )
+                return cell_value, errors_added
+
+            # Use the django lookup field to find the value
+            if self.django_lookup_field_name:
+                lookup_field = self.django_lookup_field_name
+            else:
+                lookup_field = get_display_field_for_model(related_model)
+
+            try:
+                related_model_instance = related_model_qs.get(
+                    **{lookup_field: cell_value}
+                )
+
+            except FieldError:
+                error_message = (
+                    f"Can't find {self.django_import_field_name} record by looking up "
+                    f"{lookup_field} with value {cell_value} "
+                    f"for column {self.xlsx_column_header_name} "
+                    f" no field {lookup_field} found in {related_model}"
+                )
+                errors.append(
+                    {
+                        "row_index": index,
+                        "error_type": "column",
+                        "data": cell_value,
+                        "error_message": error_message,
+                    }
+                )
+                errors_added += 1
+                return cell_value, errors_added
+            except related_model.DoesNotExist:
+                error_message = (
+                    f"Can't find {self.django_import_field_name} record by looking up "
+                    f"{self.django_lookup_field_name} with value {cell_value} "
+                    f"for column {self.xlsx_column_header_name}"
+                )
+                errors.append(
+                    {
+                        "row_index": index,
+                        "error_type": "column",
+                        "data": cell_value,
+                        "error_message": error_message,
+                    }
+                )
+                errors_added += 1
+                return cell_value, errors_added
+
+            # Replace the lookup cell_value with the actual instance to be assigned
+            cell_value = related_model_instance
+            return cell_value, errors_added
+
+        if isinstance(field, models.ManyToManyField):
+            related_model = field.related_model
+            related_model_qs = related_model.objects.all()
+
+            # Check if the related model is Archivable
+            if issubclass(related_model, ArchivableModel):
+                related_model_qs = related_model_qs.exclude(archived=True)
+
+            if not related_model_qs.exists() or related_model_qs.count() == 0:
+                return cell_value, errors_added
+
+            # Use the django lookup field to find the value
+            if self.django_lookup_field_name:
+                lookup_field = self.django_lookup_field_name
+            else:
+                lookup_field = get_display_field_for_model(related_model)
+
+            lookup_field += "__in"
+
+            cell_value = [
+                c.strip()
+                for c in cell_value.split(settings.OCR_BULK_IMPORT_M2M_DELIMITER)
+            ]
+
+            try:
+                related_model_instances = related_model_qs.filter(
+                    **{lookup_field: cell_value}
+                )
+            except FieldError:
+                error_message = (
+                    f"Can't find {self.django_import_field_name} record by looking up "
+                    f"{lookup_field} with value {cell_value} "
+                    f"for column {self.xlsx_column_header_name} "
+                    f" no field {lookup_field} found in {related_model}"
+                )
+                errors.append(
+                    {
+                        "row_index": index,
+                        "error_type": "column",
+                        "data": cell_value,
+                        "error_message": error_message,
+                    }
+                )
+                errors_added += 1
+                return cell_value, errors_added
+            except related_model.DoesNotExist:
+                error_message = (
+                    f"Can't find {self.django_import_field_name} record by looking up "
+                    f"{self.django_lookup_field_name} with value {cell_value} "
+                    f"for column {self.xlsx_column_header_name}"
+                )
+                errors.append(
+                    {
+                        "row_index": index,
+                        "error_type": "column",
+                        "data": cell_value,
+                        "error_message": error_message,
+                    }
+                )
+                errors_added += 1
+                return cell_value, errors_added
+
+            # Replace the lookup cell_value with a list of model instances to be assigned
+            cell_value = list(related_model_instances)
+            return cell_value, errors_added
+
+        if isinstance(field, models.BooleanField):
+            if cell_value is None or cell_value == "":
+                if not field.null:
+                    error_message = (
+                        f"Value {cell_value} in column {self.xlsx_column_header_name} "
+                        "is required to be a boolean"
+                    )
                     errors.append(
                         {
                             "row_index": index,
@@ -6148,10 +7665,111 @@ def validate(self, cell_value, index, errors):
                         }
                     )
                     errors_added += 1
+                return cell_value, errors_added
+
+            if cell_value not in [True, False]:
+                error_message = (
+                    f"Value {cell_value} in column {self.xlsx_column_header_name} "
+                    "is not a valid boolean"
+                )
+                errors.append(
+                    {
+                        "row_index": index,
+                        "error_type": "column",
+                        "data": cell_value,
+                        "error_message": error_message,
+                    }
+                )
+                errors_added += 1
+            return cell_value, errors_added
 
         return cell_value, errors_added
 
 
+class SchemaColumnLookupFilter(models.Model):
+    schema_column = models.ForeignKey(
+        OccurrenceReportBulkImportSchemaColumn,
+        related_name="lookup_filters",
+        on_delete=models.CASCADE,
+    )
+
+    LOOKUP_FILTER_TYPE_EXACT = "exact"
+    LOOKUP_FILTER_TYPE_IEXACT = "iexact"
+    LOOKUP_FILTER_TYPE_CONTAINS = "contains"
+    LOOKUP_FILTER_TYPE_ICONTAINS = "icontains"
+    LOOKUP_FILTER_TYPE_STARTSWITH = "startswith"
+    LOOKUP_FILTER_TYPE_ISTARTSWITH = "istartswith"
+    LOOKUP_FILTER_TYPE_ENDSWITH = "endswith"
+    LOOKUP_FILTER_TYPE_IENDSWITH = "iendswith"
+    LOOKUP_FILTER_TYPE_GT = "gt"
+    LOOKUP_FILTER_TYPE_GTE = "gte"
+    LOOKUP_FILTER_TYPE_LT = "lt"
+    LOOKUP_FILTER_TYPE_LTE = "lte"
+    # Only supporting a single value per lookup filter at this stage
+    # LOOKUP_FILTER_TYPE_IN = "in"
+
+    LOOKUP_FILTER_TYPES = (
+        (LOOKUP_FILTER_TYPE_EXACT, "Exact"),
+        (LOOKUP_FILTER_TYPE_IEXACT, "Case-insensitive Exact"),
+        (LOOKUP_FILTER_TYPE_CONTAINS, "Contains"),
+        (LOOKUP_FILTER_TYPE_ICONTAINS, "Case-insensitive Contains"),
+        (LOOKUP_FILTER_TYPE_STARTSWITH, "Starts with"),
+        (LOOKUP_FILTER_TYPE_ISTARTSWITH, "Case-insensitive Starts with"),
+        (LOOKUP_FILTER_TYPE_ENDSWITH, "Ends with"),
+        (LOOKUP_FILTER_TYPE_IENDSWITH, "Case-insensitive Ends with"),
+        (LOOKUP_FILTER_TYPE_GT, "Greater than"),
+        (LOOKUP_FILTER_TYPE_GTE, "Greater than or equal to"),
+        (LOOKUP_FILTER_TYPE_LT, "Less than"),
+        (LOOKUP_FILTER_TYPE_LTE, "Less than or equal to"),
+        # (LOOKUP_FILTER_TYPE_IN, "In"),
+    )
+
+    filter_field_name = models.CharField(max_length=50, blank=False, null=False)
+    filter_type = models.CharField(
+        max_length=50,
+        choices=LOOKUP_FILTER_TYPES,
+        default=LOOKUP_FILTER_TYPE_EXACT,
+        blank=False,
+        null=False,
+    )
+
+    class Meta:
+        app_label = "boranga"
+        verbose_name = "Schema Column Lookup Filter"
+        verbose_name_plural = "Schema Column Lookup Filters"
+        constraints = [
+            models.UniqueConstraint(
+                fields=["schema_column", "filter_field_name", "filter_type"],
+                name="unique_schema_column_lookup_field",
+                violation_error_message=(
+                    "A lookup filter with the same name and type "
+                    "already exists for this schema column"
+                ),
+            )
+        ]
+
+    def __str__(self):
+        return f"{self.schema_column} - {self.filter_field_name}"
+
+
+class SchemaColumnLookupFilterValue(models.Model):
+    lookup_filter = models.ForeignKey(
+        SchemaColumnLookupFilter,
+        related_name="values",
+        on_delete=models.CASCADE,
+    )
+
+    filter_value = models.CharField(max_length=255, blank=True, null=True)
+
+    class Meta:
+        app_label = "boranga"
+        verbose_name = "Schema Column Lookup Filter Value"
+        verbose_name_plural = "Schema Column Lookup Filter Values"
+
+    def __str__(self):
+        return f"{self.lookup_filter} - {self.filter_value}"
+
+
 # Occurrence Report Document
 reversion.register(OccurrenceReportDocument)
 
diff --git a/boranga/components/occurrence/permissions.py b/boranga/components/occurrence/permissions.py
index 6d975ca2..93457b6d 100644
--- a/boranga/components/occurrence/permissions.py
+++ b/boranga/components/occurrence/permissions.py
@@ -14,6 +14,7 @@
     is_conservation_status_approver,
     is_conservation_status_assessor,
     is_contributor,
+    is_django_admin,
     is_occurrence_approver,
     is_occurrence_assessor,
     is_occurrence_report_referee,
@@ -433,7 +434,23 @@ def has_permission(self, request, view):
         if request.user.is_superuser:
             return True
 
-        return is_occurrence_assessor(request)
+        return is_django_admin(request) or is_occurrence_approver(request)
+
+    def has_object_permission(self, request, view, obj):
+        if not request.user.is_authenticated:
+            return False
+
+        if request.user.is_superuser:
+            return True
+
+        if (
+            view.action != "copy"
+            and request.method not in permissions.SAFE_METHODS
+            and obj.is_master
+        ):
+            return is_django_admin(request)
+
+        return is_django_admin(request) or is_occurrence_approver(request)
 
 
 class OccurrencePermission(BasePermission):
diff --git a/boranga/components/occurrence/serializers.py b/boranga/components/occurrence/serializers.py
index 23aa866a..16f682c8 100644
--- a/boranga/components/occurrence/serializers.py
+++ b/boranga/components/occurrence/serializers.py
@@ -64,6 +64,8 @@
     OCRObserverDetail,
     OCRPlantCount,
     OCRVegetationStructure,
+    SchemaColumnLookupFilter,
+    SchemaColumnLookupFilterValue,
 )
 from boranga.components.spatial.utils import wkb_to_geojson
 from boranga.components.species_and_communities.models import (
@@ -72,9 +74,11 @@
 )
 from boranga.components.users.serializers import SubmitterInformationSerializer
 from boranga.helpers import (
+    check_file,
     is_conservation_status_approver,
     is_conservation_status_assessor,
     is_contributor,
+    is_django_admin,
     is_internal,
     is_new_external_contributor,
     is_occurrence_approver,
@@ -806,20 +810,6 @@ def get_has_points(self, obj):
             .exists()
         )
 
-    # def get_geojson_point(self,obj):
-    #     if(obj.geojson_point):
-    #         coordinates = GEOSGeometry(obj.geojson_point).coords
-    #         return coordinates
-    #     else:
-    #         return None
-
-    # def get_geojson_polygon(self,obj):
-    #     if(obj.geojson_polygon):
-    #         coordinates = GEOSGeometry(obj.geojson_polygon).coords
-    #         return coordinates
-    #     else:
-    #         return None
-
 
 class BaseTypeSerializer(serializers.Serializer):
     model_class = serializers.SerializerMethodField()
@@ -2358,9 +2348,7 @@ class Meta:
             "reason",
             "reason_text",
             "amendment_request_documents",
-            "subject",
             "text",
-            "officer",
             "status",
             "occurrence_report",
         ]
@@ -3843,8 +3831,33 @@ def get_last_updated_by(self, obj):
         return None
 
 
-class OccurrenceReportBulkImportSchemaColumnSerializer(serializers.ModelSerializer):
+class SchemaColumnLookupFilterValueNestedSerializer(serializers.ModelSerializer):
+    id = serializers.IntegerField(allow_null=True, required=False)
+    filter_value = serializers.CharField(
+        allow_null=True, allow_blank=True, required=False
+    )
+
+    class Meta:
+        model = SchemaColumnLookupFilterValue
+        fields = ["id", "filter_value"]
+        read_only_fields = ("id",)
+        validators = []  # Validation is done in the top parent serializer
+
+
+class SchemaColumnLookupFilterNestedSerializer(serializers.ModelSerializer):
+    id = serializers.IntegerField(allow_null=True, required=False)
+    values = SchemaColumnLookupFilterValueNestedSerializer(
+        many=True, allow_null=True, required=False
+    )
+
+    class Meta:
+        model = SchemaColumnLookupFilter
+        fields = "__all__"
+        read_only_fields = ("id",)
+        validators = []  # Validation is done in the top parent serializer
+
 
+class OccurrenceReportBulkImportSchemaColumnSerializer(serializers.ModelSerializer):
     class Meta:
         model = OccurrenceReportBulkImportSchemaColumn
         fields = "__all__"
@@ -3856,15 +3869,74 @@ class OccurrenceReportBulkImportSchemaColumnNestedSerializer(
 ):
     id = serializers.IntegerField(allow_null=True, required=False)
     order = serializers.IntegerField()
+    foreign_key_count = serializers.IntegerField(read_only=True)
+    requires_lookup_field = serializers.BooleanField(read_only=True)
+    model_name = serializers.CharField(read_only=True)
+    field_type = serializers.CharField(read_only=True)
+    xlsx_validation_type = serializers.CharField(read_only=True)
+    text_length = serializers.IntegerField(read_only=True)
+    choices = serializers.ListField(child=serializers.ListField(), read_only=True)
+    # Must keep both the full foreign key count and filtered as if the foreign_key_count
+    # fluctuates when filters are added it will cause issues with the frontend
+    foreign_key_count = serializers.IntegerField(read_only=True)
+    filtered_foreign_key_count = serializers.IntegerField(read_only=True)
+    lookup_filters = SchemaColumnLookupFilterNestedSerializer(
+        many=True, allow_null=True, required=False
+    )
+    is_editable_by_user = serializers.SerializerMethodField(read_only=True)
 
     class Meta:
         model = OccurrenceReportBulkImportSchemaColumn
         fields = "__all__"
         validators = []  # Validation is done in the parent serializer
 
+    def get_is_editable_by_user(self, obj):
+        request = self.context.get("request")
+        if obj.is_editable:
+            return True
+
+        return request.user.is_superuser or is_django_admin(request)
+
+
+class OccurrenceReportBulkImportSchemaListSerializer(serializers.ModelSerializer):
+    tags = TagListSerializerField(allow_null=True, required=False)
+    group_type_display = serializers.CharField(source="group_type.name", read_only=True)
+    version = serializers.CharField(read_only=True)
+    can_user_edit = serializers.SerializerMethodField(read_only=True)
+
+    class Meta:
+        model = OccurrenceReportBulkImportSchema
+        fields = [
+            "id",
+            "version",
+            "name",
+            "tags",
+            "group_type",
+            "group_type_display",
+            "datetime_created",
+            "datetime_updated",
+            "is_master",
+            "can_user_edit",
+        ]
+        read_only_fields = ("id",)
+
+    def get_can_user_edit(self, obj):
+        if not obj.is_master:
+            return True
+
+        request = self.context.get("request")
+
+        if not request.user.is_authenticated:
+            return False
+
+        if request.user.is_superuser:
+            return True
+
+        return is_django_admin(request)
+
 
 class OccurrenceReportBulkImportSchemaSerializer(
-    TaggitSerializer, serializers.ModelSerializer
+    TaggitSerializer, OccurrenceReportBulkImportSchemaListSerializer
 ):
     columns = OccurrenceReportBulkImportSchemaColumnNestedSerializer(
         many=True, allow_null=True, required=False
@@ -3872,14 +3944,27 @@ class OccurrenceReportBulkImportSchemaSerializer(
     tags = TagListSerializerField(allow_null=True, required=False)
     group_type_display = serializers.CharField(source="group_type.name", read_only=True)
     version = serializers.CharField(read_only=True)
+    can_user_edit = serializers.SerializerMethodField(read_only=True)
+    can_user_toggle_master = serializers.SerializerMethodField(read_only=True)
 
     class Meta:
         model = OccurrenceReportBulkImportSchema
         fields = "__all__"
         read_only_fields = ("id",)
 
+    def get_can_user_toggle_master(self, obj):
+        request = self.context.get("request")
+        if not request.user.is_authenticated:
+            return False
+
+        if request.user.is_superuser:
+            return True
+
+        return is_django_admin(request)
+
     @transaction.atomic
     def update(self, instance, validated_data):
+        request = self.context.get("request")
         columns_data = validated_data.pop("columns", None)
         if not columns_data or len(columns_data) == 0:
             return super().update(instance, validated_data)
@@ -3890,12 +3975,61 @@ def update(self, instance, validated_data):
         ]
         instance.columns.exclude(id__in=ids_to_keep).delete()
         for column_data in columns_data:
-            OccurrenceReportBulkImportSchemaColumn.objects.update_or_create(
-                pk=column_data.get("id"), defaults=column_data
+            if not is_django_admin(request):
+                column_data.pop("is_editable", None)
+            lookup_filters_data = column_data.pop("lookup_filters", None)
+            column, created = (
+                OccurrenceReportBulkImportSchemaColumn.objects.update_or_create(
+                    pk=column_data.get("id"), defaults=column_data
+                )
             )
+
+            if not lookup_filters_data:
+                column.lookup_filters.all().delete()
+                continue
+
+            ids_to_keep = [
+                lookup_filter["id"]
+                for lookup_filter in lookup_filters_data
+                if "id" in lookup_filter
+            ]
+            column.lookup_filters.exclude(id__in=ids_to_keep).delete()
+
+            for lookup_filter in lookup_filters_data:
+                values_data = lookup_filter.pop("values", None)
+                lookup, created = SchemaColumnLookupFilter.objects.update_or_create(
+                    pk=lookup_filter.get("id"),
+                    schema_column=column,
+                    defaults=lookup_filter,
+                )
+                if not values_data:
+                    continue
+
+                # For now not supporting multiple values
+                filter_value = values_data.pop(0)
+
+                filter_value, created = (
+                    SchemaColumnLookupFilterValue.objects.update_or_create(
+                        pk=filter_value.get("id"),
+                        lookup_filter=lookup,
+                        defaults=filter_value,
+                    )
+                )
+
         return super().update(instance, validated_data)
 
 
+class OccurrenceReportBulkImportSchemaOccurrenceApproverSerializer(
+    OccurrenceReportBulkImportSchemaSerializer
+):
+    is_master = serializers.BooleanField(read_only=True)
+
+    class Meta:
+        model = OccurrenceReportBulkImportSchema
+        fields = "__all__"
+        read_only_fields = ("id",)
+
+
 class OccurrenceReportBulkImportTaskSerializer(serializers.ModelSerializer):
     estimated_processing_time_human_readable = serializers.CharField(read_only=True)
     total_time_taken_human_readable = serializers.CharField(read_only=True)
@@ -3903,6 +4037,9 @@ class OccurrenceReportBulkImportTaskSerializer(serializers.ModelSerializer):
     file_name = serializers.CharField(read_only=True)
     percentage_complete = serializers.CharField(read_only=True)
     schema_id = serializers.IntegerField(write_only=True)
+    group_type_name = serializers.CharField(
+        source="schema__group_type__name", read_only=True
+    )
 
     class Meta:
         model = OccurrenceReportBulkImportTask
@@ -3922,10 +4059,19 @@ class Meta:
             "estimated_processing_time_human_readable",
             "total_time_taken_human_readable",
             "percentage_complete",
+            "group_type_name",
         )
 
     def validate(self, attrs):
         _file = attrs["_file"]
+        check_file(_file, OccurrenceReportBulkImportTask._meta.model_name)
+
+        _associated_files_zip = attrs.get("_associated_files_zip", None)
+        if _associated_files_zip:
+            check_file(
+                _associated_files_zip, OccurrenceReportBulkImportTask._meta.model_name
+            )
+
         try:
             schema = OccurrenceReportBulkImportSchema.objects.get(id=attrs["schema_id"])
         except OccurrenceReportBulkImportSchema.DoesNotExist:
diff --git a/boranga/components/spatial/utils.py b/boranga/components/spatial/utils.py
index 77a6ceb4..d2017384 100644
--- a/boranga/components/spatial/utils.py
+++ b/boranga/components/spatial/utils.py
@@ -13,7 +13,7 @@
 import shapely.geometry as shp
 from django.apps import apps
 from django.contrib.contenttypes import models as ct_models
-from django.contrib.gis.geos import GEOSGeometry
+from django.contrib.gis.geos import GEOSGeometry, Polygon
 from django.core.cache import cache
 from django.core.exceptions import ValidationError
 from django.db import IntegrityError
@@ -28,6 +28,7 @@
 from boranga import settings
 from boranga.components.occurrence.models import (
     BufferGeometry,
+    GeometryBase,
     OccurrenceGeometry,
     OccurrenceTenure,
 )
@@ -75,7 +76,7 @@ def intersect_geometry_with_layer(
         # though both forms are (topologically) valid by OGC definition, the jts (java topology suite) library only
         # seems to except singleton lists
         # (https://www.tsusiatsoftware.net/jts/javadoc/com/vividsolutions/jts/io/WKTReader.html)
-        logger.warn(
+        logger.warning(
             f"Converting MultiPoint geometry {test_geom} to double-bracket notation"
         )
         test_geom_wkt = (
@@ -149,7 +150,7 @@ def populate_occurrence_tenure_data(geometry_instance, features, request):
         tenure_area_ewkb = feature_json_to_geosgeometry(feature).ewkb
 
         if not feature_id:
-            logger.warn(f"Feature does not have an ID: {feature}")
+            logger.warning(f"Feature does not have an ID: {feature}")
             continue
         # Check if an occurrence tenure entry already exists for this feature ID
         occurrence_tenure_before = OccurrenceTenure.objects.filter(
@@ -260,7 +261,7 @@ def save_geometry(
     instance_model_name = instance._meta.model.__name__
 
     if not geometry_data:
-        logger.warn(f"No {instance_model_name} geometry to save")
+        logger.warning(f"No {instance_model_name} geometry to save")
         return {}
 
     InstanceGeometry = apps.get_model(
@@ -283,7 +284,9 @@ def save_geometry(
         == InstanceGeometry.objects.filter(**{instance_fk_field_name: instance}).count()
     ):
         # No feature to save and no feature to delete
-        logger.warn(f"{instance_model_name} geometry has no features to save or delete")
+        logger.warning(
+            f"{instance_model_name} geometry has no features to save or delete"
+        )
         return {}
 
     action = request.data.get("action", None)
@@ -295,7 +298,7 @@ def save_geometry(
         geometry_type = feature.get("geometry").get("type")
         # Check if feature is of a supported type, continue if not
         if geometry_type not in supported_geometry_types:
-            logger.warn(
+            logger.warning(
                 f"{instance_model_name}: {instance} contains a feature that is not a "
                 f"{' or '.join(supported_geometry_types)}: {feature}"
             )
@@ -387,7 +390,7 @@ def save_geometry(
                     logger.info("No tenure intersects query layer specified")
                     intersect_layer = None
                 except TileLayer.MultipleObjectsReturned:
-                    logger.warn("Multiple tenure intersects query layers found")
+                    logger.warning("Multiple tenure intersects query layers found")
                     intersect_layer = None
                 else:
                     plausibility_geometries = PlausibilityGeometry.objects.filter(
@@ -452,7 +455,7 @@ def save_geometry(
                 try:
                     geometry = InstanceGeometry.objects.get(id=feature.get("id"))
                 except InstanceGeometry.DoesNotExist:
-                    logger.warn(
+                    logger.warning(
                         f"{instance_model_name} geometry does not exist: {feature.get('id')}"
                     )
                     continue
@@ -1001,3 +1004,63 @@ def process_proxy(request, remoteurl, queryString, auth_user, auth_password):
             "Access Denied", content_type="text/html", status=401
         )
         return http_response
+
+
+def get_geometry_array_from_geojson(
+    geojson: dict,
+    cell_value: any,
+    index: int,
+    column_name: str,
+    errors: list,
+    errors_added: int,
+) -> list:
+    """
+    Extracts the geometry array from a GeoJSON object.
+    """
+    if not geojson:
+        return None
+
+    features = geojson.get("features")
+
+    geoms = []
+    bbox = Polygon.from_bbox(GeometryBase.EXTENT)
+
+    for feature in features:
+        geom = feature.get("geometry")
+
+        if not geom:
+            error_message = (
+                f"Geometry not defined in {cell_value} for column {column_name}"
+            )
+            errors.append(
+                {
+                    "row_index": index,
+                    "error_type": "column",
+                    "data": cell_value,
+                    "error_message": error_message,
+                }
+            )
+            errors_added += 1
+            continue
+
+        geom = GEOSGeometry(json.dumps(geom))
+
+        if not geom.within(bbox):
+            error_message = (
+                f"Geomtry defined in {cell_value} for column {column_name} "
+                "is not within Western Australia"
+            )
+            errors.append(
+                {
+                    "row_index": index,
+                    "error_type": "column",
+                    "data": cell_value,
+                    "error_message": error_message,
+                }
+            )
+            errors_added += 1
+            continue
+
+        geoms.append(geom)
+
+    return geoms
diff --git a/boranga/components/species_and_communities/models.py b/boranga/components/species_and_communities/models.py
index 3ec61a43..44cfe938 100644
--- a/boranga/components/species_and_communities/models.py
+++ b/boranga/components/species_and_communities/models.py
@@ -26,7 +26,11 @@
     UserAction,
 )
 from boranga.components.main.related_item import RelatedItem
-from boranga.helpers import is_species_communities_approver, member_ids
+from boranga.helpers import (
+    is_species_communities_approver,
+    member_ids,
+    no_commas_validator,
+)
 from boranga.ledger_api_utils import retrieve_email_user
 from boranga.settings import GROUP_NAME_SPECIES_COMMUNITIES_APPROVER
 
@@ -54,7 +58,9 @@ def update_community_comms_log_filename(instance, filename):
 
 
 class Region(models.Model):
-    name = models.CharField(unique=True, default=None, max_length=200)
+    name = models.CharField(
+        unique=True, default=None, max_length=200, validators=[no_commas_validator]
+    )
     forest_region = models.BooleanField(default=False)
 
     class Meta:
@@ -66,7 +72,9 @@ def __str__(self):
 
 
 class District(models.Model):
-    name = models.CharField(unique=True, max_length=200)
+    name = models.CharField(
+        unique=True, max_length=200, validators=[no_commas_validator]
+    )
     code = models.CharField(unique=True, max_length=3, null=True)
     region = models.ForeignKey(
         Region, on_delete=models.CASCADE, related_name="districts"
@@ -1518,6 +1526,9 @@ def get_related_items(self, filter_type, **kwargs):
                                 )
                             )
 
+        # Remove duplicates
+        return_list = list(set(return_list))
+
         return return_list
 
     @property
@@ -2045,7 +2056,9 @@ class DocumentCategory(ArchivableModel):
     - Table
     """
 
-    document_category_name = models.CharField(max_length=128, unique=True)
+    document_category_name = models.CharField(
+        max_length=128, unique=True, validators=[no_commas_validator]
+    )
 
     class Meta:
         app_label = "boranga"
@@ -2078,6 +2091,7 @@ class DocumentSubCategory(ArchivableModel):
     document_sub_category_name = models.CharField(
         max_length=128,
         unique=True,
+        validators=[no_commas_validator],
     )
 
     class Meta:
@@ -2247,7 +2261,9 @@ class ThreatCategory(ArchivableModel):
     # e.g. mechnical disturbance
     """
 
-    name = models.CharField(max_length=128, blank=False, unique=True)
+    name = models.CharField(
+        max_length=128, blank=False, unique=True, validators=[no_commas_validator]
+    )
 
     class Meta:
         app_label = "boranga"
@@ -2267,7 +2283,9 @@ class CurrentImpact(ArchivableModel):
 
     """
 
-    name = models.CharField(max_length=100, blank=False, unique=True)
+    name = models.CharField(
+        max_length=100, blank=False, unique=True, validators=[no_commas_validator]
+    )
 
     class Meta:
         app_label = "boranga"
@@ -2287,7 +2305,9 @@ class PotentialImpact(ArchivableModel):
 
     """
 
-    name = models.CharField(max_length=100, blank=False, unique=True)
+    name = models.CharField(
+        max_length=100, blank=False, unique=True, validators=[no_commas_validator]
+    )
 
     class Meta:
         app_label = "boranga"
@@ -2307,7 +2327,9 @@ class PotentialThreatOnset(ArchivableModel):
 
     """
 
-    name = models.CharField(max_length=100, blank=False, unique=True)
+    name = models.CharField(
+        max_length=100, blank=False, unique=True, validators=[no_commas_validator]
+    )
 
     class Meta:
         app_label = "boranga"
@@ -2325,7 +2347,9 @@ class ThreatAgent(ArchivableModel):
 
     """
 
-    name = models.CharField(max_length=100, blank=False, unique=True)
+    name = models.CharField(
+        max_length=100, blank=False, unique=True, validators=[no_commas_validator]
+    )
 
     class Meta:
         app_label = "boranga"
diff --git a/boranga/components/users/models.py b/boranga/components/users/models.py
index 691d9a52..abc7e05d 100755
--- a/boranga/components/users/models.py
+++ b/boranga/components/users/models.py
@@ -12,6 +12,7 @@
     Document,
     UserAction,
 )
+from boranga.helpers import no_commas_validator
 from boranga.ledger_api_utils import retrieve_email_user
 
 private_storage = FileSystemStorage(
@@ -23,7 +24,7 @@
 
 
 class SubmitterCategory(ArchivableModel):
-    name = models.CharField(max_length=100)
+    name = models.CharField(max_length=100, validators=[no_commas_validator])
     USER_TYPE_CHOICE_EXTERNAL = "external"
     USER_TYPE_CHOICE_INTERNAL = "internal"
     USER_TYPE_CHOICES = [
diff --git a/boranga/data/initial_data.json b/boranga/data/initial_data.json
deleted file mode 100755
index d19c6a1d..00000000
--- a/boranga/data/initial_data.json
+++ /dev/null
@@ -1,239 +0,0 @@
-[
-{
-    "model": "boranga.applicationtype",
-    "pk": 1,
-    "fields": {
-        "name": "T Class",
-        "order": 1,
-        "visible": true
-    }
-},
-{
-    "model": "boranga.applicationtype",
-    "pk": 2,
-    "fields": {
-        "name": "Filming",
-        "order": 2,
-        "visible": true
-    }
-},
-{
-    "model": "boranga.applicationtype",
-    "pk": 3,
-    "fields": {
-        "name": "Event",
-        "order": 3,
-        "visible": true
-    }
-},
-{
-    "model": "boranga.activitymatrix",
-    "pk": 1,
-    "fields": {
-        "name": "Commercial Operator",
-        "description": "testing",
-        "schema": [
-            {}
-        ],
-        "replaced_by": null,
-        "version": 1,
-        "ordered": false
-    }
-},
-{
-    "model": "boranga.proposaltype",
-    "pk": 1,
-    "fields": {
-        "description": "T Class Dummy",
-        "name": "T Class",
-        "schema": [
-            {}
-        ],
-        "replaced_by": null,
-        "version": 1
-    }
-},
-{
-    "model": "boranga.proposalassessorgroup",
-    "pk": 1,
-    "fields": {
-        "name": "Default Group",
-        "region": null,
-        "default": true,
-        "members": [
-            255
-        ]
-    }
-},
-{
-    "model": "boranga.proposalapprovergroup",
-    "pk": 1,
-    "fields": {
-        "name": "Default Group",
-        "region": null,
-        "default": true,
-        "members": [
-            255
-        ]
-    }
-},
-{
-    "model": "boranga.proposal",
-    "pk": 1,
-    "fields": {
-        "proposal_type": "new_proposal",
-        "data": [
-            {
-                "regionActivitySection": [
-                    {
-                        "Sub-activity level 2": "",
-                        "Sub-activity level 1": "",
-                        "District": null,
-                        "Management area": "",
-                        "Region": null,
-                        "ActivityType": ""
-                    }
-                ]
-            }
-        ],
-        "assessor_data": null,
-        "comment_data": null,
-        "schema": [
-            {}
-        ],
-        "proposed_issuance_approval": null,
-        "customer_status": "draft",
-        "applicant": 1,
-        "lodgement_number": "P000001",
-        "lodgement_sequence": 0,
-        "lodgement_date": null,
-        "proxy_applicant": null,
-        "submitter": 255,
-        "assigned_officer": null,
-        "assigned_approver": null,
-        "processing_status": "draft",
-        "id_check_status": "not_checked",
-        "compliance_check_status": "not_checked",
-        "character_check_status": "not_checked",
-        "review_status": "not_reviewed",
-        "approval": null,
-        "previous_application": null,
-        "proposed_decline_status": false,
-        "title": null,
-        "activity": "",
-        "tenure": null,
-        "region": null,
-        "district": null,
-        "application_type": 1,
-        "approval_level": "",
-        "approval_level_document": null,
-        "approval_comment": ""
-    }
-},
-{
-    "model": "boranga.proposal",
-    "pk": 2,
-    "fields": {
-        "proposal_type": "new_proposal",
-        "data": [
-            {
-                "regionActivitySection": [
-                    {
-                        "Sub-activity level 2": "",
-                        "Sub-activity level 1": "",
-                        "District": null,
-                        "Management area": "",
-                        "Region": null,
-                        "ActivityType": ""
-                    }
-                ]
-            }
-        ],
-        "assessor_data": null,
-        "comment_data": null,
-        "schema": [
-            {}
-        ],
-        "proposed_issuance_approval": null,
-        "customer_status": "draft",
-        "applicant": 1,
-        "lodgement_number": "P000002",
-        "lodgement_sequence": 0,
-        "lodgement_date": null,
-        "proxy_applicant": null,
-        "submitter": 255,
-        "assigned_officer": null,
-        "assigned_approver": null,
-        "processing_status": "draft",
-        "id_check_status": "not_checked",
-        "compliance_check_status": "not_checked",
-        "character_check_status": "not_checked",
-        "review_status": "not_reviewed",
-        "approval": null,
-        "previous_application": null,
-        "proposed_decline_status": false,
-        "title": null,
-        "activity": "",
-        "tenure": null,
-        "region": null,
-        "district": null,
-        "application_type": 1,
-        "approval_level": "",
-        "approval_level_document": null,
-        "approval_comment": ""
-    }
-},
-{
-    "model": "boranga.proposal",
-    "pk": 3,
-    "fields": {
-        "proposal_type": "new_proposal",
-        "data": [
-            {
-                "regionActivitySection": [
-                    {
-                        "Sub-activity level 2": "",
-                        "Sub-activity level 1": "",
-                        "District": null,
-                        "Management area": "",
-                        "Region": null,
-                        "ActivityType": ""
-                    }
-                ]
-            }
-        ],
-        "assessor_data": null,
-        "comment_data": null,
-        "schema": [
-            {}
-        ],
-        "proposed_issuance_approval": null,
-        "customer_status": "draft",
-        "applicant": 1,
-        "lodgement_number": "P000003",
-        "lodgement_sequence": 0,
-        "lodgement_date": null,
-        "proxy_applicant": null,
-        "submitter": 255,
-        "assigned_officer": null,
-        "assigned_approver": null,
-        "processing_status": "draft",
-        "id_check_status": "not_checked",
-        "compliance_check_status": "not_checked",
-        "character_check_status": "not_checked",
-        "review_status": "not_reviewed",
-        "approval": null,
-        "previous_application": null,
-        "proposed_decline_status": false,
-        "title": null,
-        "activity": "",
-        "tenure": null,
-        "region": null,
-        "district": null,
-        "application_type": 1,
-        "approval_level": "",
-        "approval_level_document": null,
-        "approval_comment": ""
-    }
-}
-]
diff --git a/boranga/frontend/boranga/package-lock.json b/boranga/frontend/boranga/package-lock.json
index a977fd54..7d2facb7 100644
--- a/boranga/frontend/boranga/package-lock.json
+++ b/boranga/frontend/boranga/package-lock.json
@@ -66,11 +66,11 @@
             }
         },
         "node_modules/@babel/code-frame": {
-            "version": "7.24.7",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
-            "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
+            "version": "7.25.7",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.25.7.tgz",
+            "integrity": "sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==",
             "dependencies": {
-                "@babel/highlight": "^7.24.7",
+                "@babel/highlight": "^7.25.7",
                 "picocolors": "^1.0.0"
             },
             "engines": {
@@ -78,35 +78,35 @@
             }
         },
         "node_modules/@babel/compat-data": {
-            "version": "7.25.4",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz",
-            "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==",
+            "version": "7.25.8",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.8.tgz",
+            "integrity": "sha512-ZsysZyXY4Tlx+Q53XdnOFmqwfB9QDTHYxaZYajWRoBLuLEAwI2UIbtxOjWh/cFaa9IKUlcB+DDuoskLuKu56JA==",
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/generator": {
-            "version": "7.25.6",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz",
-            "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==",
+            "version": "7.25.7",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.7.tgz",
+            "integrity": "sha512-5Dqpl5fyV9pIAD62yK9P7fcA768uVPUyrQmqpqstHWgMma4feF1x/oFysBCVZLY5wJ2GkMUCdsNDnGZrPoR6rA==",
             "dependencies": {
-                "@babel/types": "^7.25.6",
+                "@babel/types": "^7.25.7",
                 "@jridgewell/gen-mapping": "^0.3.5",
                 "@jridgewell/trace-mapping": "^0.3.25",
-                "jsesc": "^2.5.1"
+                "jsesc": "^3.0.2"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-compilation-targets": {
-            "version": "7.25.2",
-            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz",
-            "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==",
+            "version": "7.25.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.7.tgz",
+            "integrity": "sha512-DniTEax0sv6isaw6qSQSfV4gVRNtw2rte8HHM45t9ZR0xILaufBRNkpMifCRiAPyvL4ACD6v0gfCwCmtOQaV4A==",
             "dependencies": {
-                "@babel/compat-data": "^7.25.2",
-                "@babel/helper-validator-option": "^7.24.8",
-                "browserslist": "^4.23.1",
+                "@babel/compat-data": "^7.25.7",
+                "@babel/helper-validator-option": "^7.25.7",
+                "browserslist": "^4.24.0",
                 "lru-cache": "^5.1.1",
                 "semver": "^6.3.1"
             },
@@ -115,35 +115,35 @@
             }
         },
         "node_modules/@babel/helper-string-parser": {
-            "version": "7.24.8",
-            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
-            "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
+            "version": "7.25.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz",
+            "integrity": "sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==",
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-validator-identifier": {
-            "version": "7.24.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
-            "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
+            "version": "7.25.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz",
+            "integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==",
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-validator-option": {
-            "version": "7.24.8",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
-            "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==",
+            "version": "7.25.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.7.tgz",
+            "integrity": "sha512-ytbPLsm+GjArDYXJ8Ydr1c/KJuutjF2besPNbIZnZ6MKUxi/uTA22t2ymmA4WFjZFpjiAMO0xuuJPqK2nvDVfQ==",
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/highlight": {
-            "version": "7.24.7",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
-            "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
+            "version": "7.25.7",
+            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.7.tgz",
+            "integrity": "sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==",
             "dependencies": {
-                "@babel/helper-validator-identifier": "^7.24.7",
+                "@babel/helper-validator-identifier": "^7.25.7",
                 "chalk": "^2.4.2",
                 "js-tokens": "^4.0.0",
                 "picocolors": "^1.0.0"
@@ -217,11 +217,11 @@
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.25.6",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz",
-            "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==",
+            "version": "7.25.8",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.8.tgz",
+            "integrity": "sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==",
             "dependencies": {
-                "@babel/types": "^7.25.6"
+                "@babel/types": "^7.25.8"
             },
             "bin": {
                 "parser": "bin/babel-parser.js"
@@ -231,9 +231,9 @@
             }
         },
         "node_modules/@babel/runtime": {
-            "version": "7.25.6",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.6.tgz",
-            "integrity": "sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==",
+            "version": "7.25.7",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.7.tgz",
+            "integrity": "sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==",
             "dependencies": {
                 "regenerator-runtime": "^0.14.0"
             },
@@ -242,28 +242,28 @@
             }
         },
         "node_modules/@babel/template": {
-            "version": "7.25.0",
-            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz",
-            "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==",
+            "version": "7.25.7",
+            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.7.tgz",
+            "integrity": "sha512-wRwtAgI3bAS+JGU2upWNL9lSlDcRCqD05BZ1n3X2ONLH1WilFP6O1otQjeMK/1g0pvYcXC7b/qVUB1keofjtZA==",
             "dependencies": {
-                "@babel/code-frame": "^7.24.7",
-                "@babel/parser": "^7.25.0",
-                "@babel/types": "^7.25.0"
+                "@babel/code-frame": "^7.25.7",
+                "@babel/parser": "^7.25.7",
+                "@babel/types": "^7.25.7"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/traverse": {
-            "version": "7.25.6",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz",
-            "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==",
-            "dependencies": {
-                "@babel/code-frame": "^7.24.7",
-                "@babel/generator": "^7.25.6",
-                "@babel/parser": "^7.25.6",
-                "@babel/template": "^7.25.0",
-                "@babel/types": "^7.25.6",
+            "version": "7.25.7",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.7.tgz",
+            "integrity": "sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==",
+            "dependencies": {
+                "@babel/code-frame": "^7.25.7",
+                "@babel/generator": "^7.25.7",
+                "@babel/parser": "^7.25.7",
+                "@babel/template": "^7.25.7",
+                "@babel/types": "^7.25.7",
                 "debug": "^4.3.1",
                 "globals": "^11.1.0"
             },
@@ -272,12 +272,12 @@
             }
         },
         "node_modules/@babel/types": {
-            "version": "7.25.6",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz",
-            "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==",
+            "version": "7.25.8",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.8.tgz",
+            "integrity": "sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==",
             "dependencies": {
-                "@babel/helper-string-parser": "^7.24.8",
-                "@babel/helper-validator-identifier": "^7.24.7",
+                "@babel/helper-string-parser": "^7.25.7",
+                "@babel/helper-validator-identifier": "^7.25.7",
                 "to-fast-properties": "^2.0.0"
             },
             "engines": {
@@ -308,9 +308,9 @@
             }
         },
         "node_modules/@eslint-community/regexpp": {
-            "version": "4.11.0",
-            "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
-            "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
+            "version": "4.11.1",
+            "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.1.tgz",
+            "integrity": "sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==",
             "dev": true,
             "engines": {
                 "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@@ -407,9 +407,9 @@
             }
         },
         "node_modules/@eslint/js": {
-            "version": "8.57.0",
-            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
-            "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
+            "version": "8.57.1",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
+            "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",
             "dev": true,
             "engines": {
                 "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -437,13 +437,13 @@
             }
         },
         "node_modules/@humanwhocodes/config-array": {
-            "version": "0.11.14",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
-            "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+            "version": "0.13.0",
+            "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
+            "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
             "deprecated": "Use @eslint/config-array instead",
             "dev": true,
             "dependencies": {
-                "@humanwhocodes/object-schema": "^2.0.2",
+                "@humanwhocodes/object-schema": "^2.0.3",
                 "debug": "^4.3.1",
                 "minimatch": "^3.0.5"
             },
@@ -599,9 +599,9 @@
             "integrity": "sha512-/Ri4xDDpe12NT6Ex/DRgHzLlobiQXEW/hmG08w1wj/YU7hLemk97c+zHQFp0iZQ9r7YqgLEXZR2sls4HxBf9NA=="
         },
         "node_modules/@polka/url": {
-            "version": "1.0.0-next.25",
-            "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.25.tgz",
-            "integrity": "sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ=="
+            "version": "1.0.0-next.28",
+            "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.28.tgz",
+            "integrity": "sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw=="
         },
         "node_modules/@popperjs/core": {
             "version": "2.11.8",
@@ -2647,9 +2647,9 @@
             "integrity": "sha512-DauBl25PKZZ0WVJr42a6CNvI6efsdzofl9sajqZr2Gf5Gu733WkDdUGiPkUHXiUvYGzNNlFQde2wdZdfQPG+yw=="
         },
         "node_modules/@types/estree": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-            "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw=="
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+            "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="
         },
         "node_modules/@types/express": {
             "version": "4.17.21",
@@ -2663,9 +2663,20 @@
             }
         },
         "node_modules/@types/express-serve-static-core": {
-            "version": "4.19.5",
-            "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz",
-            "integrity": "sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg==",
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.0.tgz",
+            "integrity": "sha512-AbXMTZGt40T+KON9/Fdxx0B2WK5hsgxcfXJLr5bFpZ7b4JCex2WyQPTEKdXqfHiY5nKKBScZ7yCoO6Pvgxfvnw==",
+            "dependencies": {
+                "@types/node": "*",
+                "@types/qs": "*",
+                "@types/range-parser": "*",
+                "@types/send": "*"
+            }
+        },
+        "node_modules/@types/express/node_modules/@types/express-serve-static-core": {
+            "version": "4.19.6",
+            "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz",
+            "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==",
             "dependencies": {
                 "@types/node": "*",
                 "@types/qs": "*",
@@ -2730,9 +2741,9 @@
             "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag=="
         },
         "node_modules/@types/node": {
-            "version": "22.5.4",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz",
-            "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
+            "version": "22.7.5",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz",
+            "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==",
             "dependencies": {
                 "undici-types": "~6.19.2"
             }
@@ -2756,9 +2767,9 @@
             "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw=="
         },
         "node_modules/@types/qs": {
-            "version": "6.9.15",
-            "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.15.tgz",
-            "integrity": "sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg=="
+            "version": "6.9.16",
+            "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.16.tgz",
+            "integrity": "sha512-7i+zxXdPD0T4cKDuxCUXJ4wHcsJLwENa6Z3dCu8cfCK743OGy5Nu1RmAGqDPsoTDINVEcdXKRvR/zre+P2Ku1A=="
         },
         "node_modules/@types/range-parser": {
             "version": "1.2.7",
@@ -3011,49 +3022,49 @@
             "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
         },
         "node_modules/@vue/compiler-core": {
-            "version": "3.5.1",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.1.tgz",
-            "integrity": "sha512-WdjF+NSgFYdWttHevHw5uaJFtKPalhmxhlu2uREj8cLP0uyKKIR60/JvSZNTp0x+NSd63iTiORQTx3+tt55NWQ==",
+            "version": "3.5.12",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.12.tgz",
+            "integrity": "sha512-ISyBTRMmMYagUxhcpyEH0hpXRd/KqDU4ymofPgl2XAkY9ZhQ+h0ovEZJIiPop13UmR/54oA2cgMDjgroRelaEw==",
             "dependencies": {
                 "@babel/parser": "^7.25.3",
-                "@vue/shared": "3.5.1",
+                "@vue/shared": "3.5.12",
                 "entities": "^4.5.0",
                 "estree-walker": "^2.0.2",
                 "source-map-js": "^1.2.0"
             }
         },
         "node_modules/@vue/compiler-dom": {
-            "version": "3.5.1",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.1.tgz",
-            "integrity": "sha512-Ao23fB1lINo18HLCbJVApvzd9OQe8MgmQSgyY5+umbWj2w92w9KykVmJ4Iv2US5nak3ixc2B+7Km7JTNhQ8kSQ==",
+            "version": "3.5.12",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.12.tgz",
+            "integrity": "sha512-9G6PbJ03uwxLHKQ3P42cMTi85lDRvGLB2rSGOiQqtXELat6uI4n8cNz9yjfVHRPIu+MsK6TE418Giruvgptckg==",
             "dependencies": {
-                "@vue/compiler-core": "3.5.1",
-                "@vue/shared": "3.5.1"
+                "@vue/compiler-core": "3.5.12",
+                "@vue/shared": "3.5.12"
             }
         },
         "node_modules/@vue/compiler-sfc": {
-            "version": "3.5.1",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.1.tgz",
-            "integrity": "sha512-DFizMNH8eDglLhlfwJ0+ciBsztaYe3fY/zcZjrqL1ljXvUw/UpC84M1d7HpBTCW68SNqZyIxrs1XWmf+73Y65w==",
+            "version": "3.5.12",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.12.tgz",
+            "integrity": "sha512-2k973OGo2JuAa5+ZlekuQJtitI5CgLMOwgl94BzMCsKZCX/xiqzJYzapl4opFogKHqwJk34vfsaKpfEhd1k5nw==",
             "dependencies": {
                 "@babel/parser": "^7.25.3",
-                "@vue/compiler-core": "3.5.1",
-                "@vue/compiler-dom": "3.5.1",
-                "@vue/compiler-ssr": "3.5.1",
-                "@vue/shared": "3.5.1",
+                "@vue/compiler-core": "3.5.12",
+                "@vue/compiler-dom": "3.5.12",
+                "@vue/compiler-ssr": "3.5.12",
+                "@vue/shared": "3.5.12",
                 "estree-walker": "^2.0.2",
                 "magic-string": "^0.30.11",
-                "postcss": "^8.4.44",
+                "postcss": "^8.4.47",
                 "source-map-js": "^1.2.0"
             }
         },
         "node_modules/@vue/compiler-ssr": {
-            "version": "3.5.1",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.1.tgz",
-            "integrity": "sha512-C1hpSHQgRM8bg+5XWWD7CkFaVpSn9wZHCLRd10AmxqrH17d4EMP6+XcZpwBOM7H1jeStU5naEapZZWX0kso1tQ==",
+            "version": "3.5.12",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.12.tgz",
+            "integrity": "sha512-eLwc7v6bfGBSM7wZOGPmRavSWzNFF6+PdRhE+VFJhNCgHiF8AM7ccoqcv5kBXA2eWUfigD7byekvf/JsOfKvPA==",
             "dependencies": {
-                "@vue/compiler-dom": "3.5.1",
-                "@vue/shared": "3.5.1"
+                "@vue/compiler-dom": "3.5.12",
+                "@vue/shared": "3.5.12"
             }
         },
         "node_modules/@vue/component-compiler-utils": {
@@ -3115,9 +3126,9 @@
             "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="
         },
         "node_modules/@vue/shared": {
-            "version": "3.5.1",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.1.tgz",
-            "integrity": "sha512-NdcTRoO4KuW2RSFgpE2c+E/R/ZHaRzWPxAGxhmxZaaqLh6nYCXx7lc9a88ioqOCxCaV2SFJmujkxbUScW7dNsQ=="
+            "version": "3.5.12",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.12.tgz",
+            "integrity": "sha512-L2RPSAwUFbgZH20etwrXyVyCBu9OxRSi8T/38QsvnkJyvq2LufW2lDCOzm7t/U9C1mkhJGWYfCuFBCmIuNivrg=="
         },
         "node_modules/@vue/vue-loader-v15": {
             "name": "vue-loader",
@@ -3380,9 +3391,9 @@
             }
         },
         "node_modules/acorn-walk": {
-            "version": "8.3.3",
-            "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz",
-            "integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==",
+            "version": "8.3.4",
+            "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
+            "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
             "dependencies": {
                 "acorn": "^8.11.0"
             },
@@ -3757,9 +3768,9 @@
             "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
         },
         "node_modules/body-parser": {
-            "version": "1.20.2",
-            "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
-            "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
+            "version": "1.20.3",
+            "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+            "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
             "dependencies": {
                 "bytes": "3.1.2",
                 "content-type": "~1.0.5",
@@ -3769,7 +3780,7 @@
                 "http-errors": "2.0.0",
                 "iconv-lite": "0.4.24",
                 "on-finished": "2.4.1",
-                "qs": "6.11.0",
+                "qs": "6.13.0",
                 "raw-body": "2.5.2",
                 "type-is": "~1.6.18",
                 "unpipe": "1.0.0"
@@ -3852,9 +3863,9 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.23.3",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz",
-            "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
+            "version": "4.24.0",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz",
+            "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -3870,8 +3881,8 @@
                 }
             ],
             "dependencies": {
-                "caniuse-lite": "^1.0.30001646",
-                "electron-to-chromium": "^1.5.4",
+                "caniuse-lite": "^1.0.30001663",
+                "electron-to-chromium": "^1.5.28",
                 "node-releases": "^2.0.18",
                 "update-browserslist-db": "^1.1.0"
             },
@@ -4023,9 +4034,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001655",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz",
-            "integrity": "sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg==",
+            "version": "1.0.30001668",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001668.tgz",
+            "integrity": "sha512-nWLrdxqCdblixUO+27JtGJJE/txpJlyUy5YN1u53wLZkP0emYCo5zgS6QYft7VUYR42LGgi/S5hdLZTrnyIddw==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -4406,9 +4417,9 @@
             }
         },
         "node_modules/cookie": {
-            "version": "0.6.0",
-            "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
-            "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
+            "version": "0.7.1",
+            "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
+            "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
             "engines": {
                 "node": ">= 0.6"
             }
@@ -4852,11 +4863,11 @@
             "integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug=="
         },
         "node_modules/debug": {
-            "version": "4.3.6",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
-            "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
+            "version": "4.3.7",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+            "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
             "dependencies": {
-                "ms": "2.1.2"
+                "ms": "^2.1.3"
             },
             "engines": {
                 "node": ">=6.0"
@@ -5249,9 +5260,9 @@
             "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.14",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.14.tgz",
-            "integrity": "sha512-bEfPECb3fJ15eaDnu9LEJ2vPGD6W1vt7vZleSVyFhYuMIKm3vz/g9lt7IvEzgdwj58RjbPKUF2rXTCN/UW47tQ=="
+            "version": "1.5.38",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.38.tgz",
+            "integrity": "sha512-VbeVexmZ1IFh+5EfrYz1I0HTzHVIlJa112UEWhciPyeOcKJGeTv6N8WnG4wsQB81DGCaVEGhpSb6o6a8WYFXXg=="
         },
         "node_modules/emoji-regex": {
             "version": "8.0.0",
@@ -5267,9 +5278,9 @@
             }
         },
         "node_modules/encodeurl": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-            "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+            "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
             "engines": {
                 "node": ">= 0.8"
             }
@@ -5306,9 +5317,9 @@
             }
         },
         "node_modules/envinfo": {
-            "version": "7.13.0",
-            "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.13.0.tgz",
-            "integrity": "sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q==",
+            "version": "7.14.0",
+            "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.14.0.tgz",
+            "integrity": "sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==",
             "bin": {
                 "envinfo": "dist/cli.js"
             },
@@ -5418,16 +5429,17 @@
             }
         },
         "node_modules/eslint": {
-            "version": "8.57.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
-            "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
+            "version": "8.57.1",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
+            "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
+            "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
             "dev": true,
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.2.0",
                 "@eslint-community/regexpp": "^4.6.1",
                 "@eslint/eslintrc": "^2.1.4",
-                "@eslint/js": "8.57.0",
-                "@humanwhocodes/config-array": "^0.11.14",
+                "@eslint/js": "8.57.1",
+                "@humanwhocodes/config-array": "^0.13.0",
                 "@humanwhocodes/module-importer": "^1.0.1",
                 "@nodelib/fs.walk": "^1.2.8",
                 "@ungap/structured-clone": "^1.2.0",
@@ -5832,36 +5844,36 @@
             }
         },
         "node_modules/express": {
-            "version": "4.19.2",
-            "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
-            "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
+            "version": "4.21.1",
+            "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
+            "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
             "dependencies": {
                 "accepts": "~1.3.8",
                 "array-flatten": "1.1.1",
-                "body-parser": "1.20.2",
+                "body-parser": "1.20.3",
                 "content-disposition": "0.5.4",
                 "content-type": "~1.0.4",
-                "cookie": "0.6.0",
+                "cookie": "0.7.1",
                 "cookie-signature": "1.0.6",
                 "debug": "2.6.9",
                 "depd": "2.0.0",
-                "encodeurl": "~1.0.2",
+                "encodeurl": "~2.0.0",
                 "escape-html": "~1.0.3",
                 "etag": "~1.8.1",
-                "finalhandler": "1.2.0",
+                "finalhandler": "1.3.1",
                 "fresh": "0.5.2",
                 "http-errors": "2.0.0",
-                "merge-descriptors": "1.0.1",
+                "merge-descriptors": "1.0.3",
                 "methods": "~1.1.2",
                 "on-finished": "2.4.1",
                 "parseurl": "~1.3.3",
-                "path-to-regexp": "0.1.7",
+                "path-to-regexp": "0.1.10",
                 "proxy-addr": "~2.0.7",
-                "qs": "6.11.0",
+                "qs": "6.13.0",
                 "range-parser": "~1.2.1",
                 "safe-buffer": "5.2.1",
-                "send": "0.18.0",
-                "serve-static": "1.15.0",
+                "send": "0.19.0",
+                "serve-static": "1.16.2",
                 "setprototypeof": "1.2.0",
                 "statuses": "2.0.1",
                 "type-is": "~1.6.18",
@@ -5961,9 +5973,9 @@
             "dev": true
         },
         "node_modules/fast-uri": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz",
-            "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw=="
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.2.tgz",
+            "integrity": "sha512-GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row=="
         },
         "node_modules/fastest-levenshtein": {
             "version": "1.0.16",
@@ -6035,12 +6047,12 @@
             }
         },
         "node_modules/finalhandler": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-            "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+            "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
             "dependencies": {
                 "debug": "2.6.9",
-                "encodeurl": "~1.0.2",
+                "encodeurl": "~2.0.0",
                 "escape-html": "~1.0.3",
                 "on-finished": "2.4.1",
                 "parseurl": "~1.3.3",
@@ -6123,9 +6135,9 @@
             "dev": true
         },
         "node_modules/follow-redirects": {
-            "version": "1.15.8",
-            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.8.tgz",
-            "integrity": "sha512-xgrmBhBToVKay1q2Tao5LI26B83UhrB/vM1avwVSDzt8rx3rO6AizBAaF46EgksTVr+rFTQaqZZ9MVBfUe4nig==",
+            "version": "1.15.9",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+            "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
             "funding": [
                 {
                     "type": "individual",
@@ -6736,9 +6748,9 @@
             }
         },
         "node_modules/http-proxy-middleware": {
-            "version": "2.0.6",
-            "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
-            "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
+            "version": "2.0.7",
+            "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz",
+            "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
             "dependencies": {
                 "@types/http-proxy": "^1.17.8",
                 "http-proxy": "^1.18.1",
@@ -7207,14 +7219,14 @@
             }
         },
         "node_modules/jsesc": {
-            "version": "2.5.2",
-            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-            "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
+            "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
             "bin": {
                 "jsesc": "bin/jsesc"
             },
             "engines": {
-                "node": ">=4"
+                "node": ">=6"
             }
         },
         "node_modules/json-buffer": {
@@ -7309,20 +7321,20 @@
             }
         },
         "node_modules/launch-editor": {
-            "version": "2.8.2",
-            "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.8.2.tgz",
-            "integrity": "sha512-eF5slEUZXmi6WvFzI3dYcv+hA24/iKnROf24HztcURJpSz9RBmBgz5cNCVOeguouf1llrwy6Yctl4C4HM+xI8g==",
+            "version": "2.9.1",
+            "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.9.1.tgz",
+            "integrity": "sha512-Gcnl4Bd+hRO9P9icCP/RVVT2o8SFlPXofuCxvA2SaZuH45whSvf5p8x5oih5ftLiVhEI4sp5xDY+R+b3zJBh5w==",
             "dependencies": {
                 "picocolors": "^1.0.0",
                 "shell-quote": "^1.8.1"
             }
         },
         "node_modules/launch-editor-middleware": {
-            "version": "2.8.1",
-            "resolved": "https://registry.npmjs.org/launch-editor-middleware/-/launch-editor-middleware-2.8.1.tgz",
-            "integrity": "sha512-GWhcsTuzgRQguiiei0BrbLX7rS5Pcj+6VyynZlS7zlnmUvVAUUBnJjILIhuIgWJXn1WSMtkfHAkXFSoQeJvwdQ==",
+            "version": "2.9.1",
+            "resolved": "https://registry.npmjs.org/launch-editor-middleware/-/launch-editor-middleware-2.9.1.tgz",
+            "integrity": "sha512-4wF6AtPtaIENiZdH/a+3yW8Xni7uxzTEDd1z+gH00hUWBCSmQknFohznMd9BWhLk8MXObeB5ir69GbIr9qFW1w==",
             "dependencies": {
-                "launch-editor": "^2.8.1"
+                "launch-editor": "^2.9.1"
             }
         },
         "node_modules/lerc": {
@@ -7608,9 +7620,9 @@
             }
         },
         "node_modules/magic-string": {
-            "version": "0.30.11",
-            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
-            "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
+            "version": "0.30.12",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.12.tgz",
+            "integrity": "sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==",
             "dependencies": {
                 "@jridgewell/sourcemap-codec": "^1.5.0"
             }
@@ -7650,9 +7662,12 @@
             }
         },
         "node_modules/merge-descriptors": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-            "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+            "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
         },
         "node_modules/merge-source-map": {
             "version": "1.1.0",
@@ -7917,9 +7932,9 @@
             }
         },
         "node_modules/ms": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+            "version": "2.1.3",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
         },
         "node_modules/multicast-dns": {
             "version": "7.2.5",
@@ -8507,9 +8522,9 @@
             "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
         },
         "node_modules/path-to-regexp": {
-            "version": "0.1.7",
-            "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-            "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+            "version": "0.1.10",
+            "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
+            "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
         },
         "node_modules/path-type": {
             "version": "4.0.0",
@@ -8660,9 +8675,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.4.45",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.45.tgz",
-            "integrity": "sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==",
+            "version": "8.4.47",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
+            "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -8679,8 +8694,8 @@
             ],
             "dependencies": {
                 "nanoid": "^3.3.7",
-                "picocolors": "^1.0.1",
-                "source-map-js": "^1.2.0"
+                "picocolors": "^1.1.0",
+                "source-map-js": "^1.2.1"
             },
             "engines": {
                 "node": "^10 || ^12 || >=14"
@@ -9299,9 +9314,9 @@
             }
         },
         "node_modules/proj4": {
-            "version": "2.12.0",
-            "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.12.0.tgz",
-            "integrity": "sha512-cQJxcVX7+fmAhOxoazKgk76GkGYQ5HcLod4rdy2MizhPvLdrZQJThxsHoz/TjjdxUvTm/rbozMgE0q9mdXKWIw==",
+            "version": "2.12.1",
+            "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.12.1.tgz",
+            "integrity": "sha512-vmhP3hmstjXjzFwg8QXJwpoj4n7GVrXk3ZW3DzNK/Ur4cuwXq7ZiMXaWYvLYLQbX8n4MXgbwTr4lthOUZltBpA==",
             "dependencies": {
                 "mgrs": "1.0.0",
                 "wkt-parser": "^1.3.3"
@@ -9338,9 +9353,9 @@
             "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="
         },
         "node_modules/pump": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-            "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
+            "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
             "dependencies": {
                 "end-of-stream": "^1.1.0",
                 "once": "^1.3.1"
@@ -9355,11 +9370,11 @@
             }
         },
         "node_modules/qs": {
-            "version": "6.11.0",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-            "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+            "version": "6.13.0",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+            "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
             "dependencies": {
-                "side-channel": "^1.0.4"
+                "side-channel": "^1.0.6"
             },
             "engines": {
                 "node": ">=0.6"
@@ -9835,9 +9850,9 @@
             "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow=="
         },
         "node_modules/send": {
-            "version": "0.18.0",
-            "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-            "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+            "version": "0.19.0",
+            "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+            "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
             "dependencies": {
                 "debug": "2.6.9",
                 "depd": "2.0.0",
@@ -9870,10 +9885,13 @@
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
             "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         },
-        "node_modules/send/node_modules/ms": {
-            "version": "2.1.3",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+        "node_modules/send/node_modules/encodeurl": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+            "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+            "engines": {
+                "node": ">= 0.8"
+            }
         },
         "node_modules/serialize-javascript": {
             "version": "6.0.2",
@@ -9954,14 +9972,14 @@
             }
         },
         "node_modules/serve-static": {
-            "version": "1.15.0",
-            "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-            "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+            "version": "1.16.2",
+            "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+            "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
             "dependencies": {
-                "encodeurl": "~1.0.2",
+                "encodeurl": "~2.0.0",
                 "escape-html": "~1.0.3",
                 "parseurl": "~1.3.3",
-                "send": "0.18.0"
+                "send": "0.19.0"
             },
             "engines": {
                 "node": ">= 0.8.0"
@@ -10113,9 +10131,9 @@
             }
         },
         "node_modules/source-map-js": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
-            "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+            "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -10372,9 +10390,9 @@
             }
         },
         "node_modules/sweetalert2": {
-            "version": "11.13.2",
-            "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.13.2.tgz",
-            "integrity": "sha512-Q361QVJrDce3pA+46m2JmfDQyxxlmVE6t7ScoMwubm2PQKTlUqaMpzWq/DZRSPL8Sg2hUCzUAXQ9dwMPnbsy7Q==",
+            "version": "11.14.3",
+            "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.14.3.tgz",
+            "integrity": "sha512-6NuBHWJCv2gtw4y8PUXLB41hty+V6U2mKZMAvydL1IRPcORR0yuyq3cjFD/+ByrCk3muEFggbZX/x6HwmbVfbA==",
             "funding": {
                 "type": "individual",
                 "url": "https://github.com/sponsors/limonte"
@@ -10389,9 +10407,9 @@
             }
         },
         "node_modules/terser": {
-            "version": "5.31.6",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.6.tgz",
-            "integrity": "sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==",
+            "version": "5.34.1",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.34.1.tgz",
+            "integrity": "sha512-FsJZ7iZLd/BXkz+4xrRTGJ26o/6VTjQytUk8b8OxkwcD2I+79VPJlz7qss1+zE7h8GNIScFqXcDyJ/KqBYZFVA==",
             "dependencies": {
                 "@jridgewell/source-map": "^0.3.3",
                 "acorn": "^8.8.2",
@@ -10656,9 +10674,9 @@
             }
         },
         "node_modules/update-browserslist-db": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
-            "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+            "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -10674,8 +10692,8 @@
                 }
             ],
             "dependencies": {
-                "escalade": "^3.1.2",
-                "picocolors": "^1.0.1"
+                "escalade": "^3.2.0",
+                "picocolors": "^1.1.0"
             },
             "bin": {
                 "update-browserslist-db": "cli.js"
@@ -10883,9 +10901,9 @@
             "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
         },
         "node_modules/webpack": {
-            "version": "5.94.0",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
-            "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
+            "version": "5.95.0",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.95.0.tgz",
+            "integrity": "sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==",
             "dependencies": {
                 "@types/estree": "^1.0.5",
                 "@webassemblyjs/ast": "^1.12.1",
diff --git a/boranga/frontend/boranga/src/api.js b/boranga/frontend/boranga/src/api.js
index 5aed3129..84507f55 100644
--- a/boranga/frontend/boranga/src/api.js
+++ b/boranga/frontend/boranga/src/api.js
@@ -24,6 +24,7 @@ module.exports = {
     document_categories_dict: "/api/document_categories_dict",
     filtered_organisations: '/api/filtered_organisations',
     help_text_entries: "/api/help_text_entries",
+    lookup_schema_types: "/api/occurrence_report_bulk_import_schema_columns/get_lookup_filter_types/",
     marine_treeview: "/api/marine_treeview",
     occurrence_report_bulk_imports: "/api/occurrence_report_bulk_imports/",
     occurrence_report_bulk_import_schemas: "/api/occurrence_report_bulk_import_schemas/",
@@ -293,6 +294,10 @@ module.exports = {
         return `/api/committee/${committee_id}/committee_members/`;
     },
 
+    fields_by_model_name: function (model_name) {
+        `/api/content_types/fields_by_model_name/?model_name=${model_name}`;
+    },
+
     group_type_community: group_type_community,
     group_type_fauna: group_type_fauna,
     group_type_flora: group_type_flora,
diff --git a/boranga/frontend/boranga/src/components/common/blank_template.vue b/boranga/frontend/boranga/src/components/common/blank_template.vue
deleted file mode 100755
index 0190575b..00000000
--- a/boranga/frontend/boranga/src/components/common/blank_template.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-<template lang="html">
-    <div>
-    </div>
-</template>
-
-<script>
-import Vue from 'vue'
-import {
-  api_endpoints,
-  helpers
-}
-from '@/utils/hooks'
-
-import Treeselect from '@riophae/vue-treeselect'
-
-export default {
-    name:'TreeSelect',
-    components:{
-        Treeselect
-    },
-    props:{
-        proposal:{
-            type: Object,
-            required:true
-        },
-        boo_type:{
-            type: Boolean,
-            default: false
-        },
-        num_type:{
-            type: Number,
-            default: 100
-        },
-        str_type:{
-            type: String,
-            default: 'abc'
-        },
-    },
-
-    data() {
-      return {
-        items: [],
-      }
-    },
-
-    computed: {
-    },
-
-    methods:{
-        fetchDataExample: function(){
-            let vm = this;
-
-            //vm.$http.get(api_endpoints.park_treeview).then((response) => { 
-            //console.log('treeview_url: ' + api_endpoints.park_treeview + '?format=json&proposal=' + vm.proposal.id)
-            vm.$http.get(api_endpoints.park_treeview + '?format=json&proposal=' + vm.proposal.id)
-            .then((response) => {
-                vm.options = response.body['options'];
-                vm.selected_items = response.body['selected_items'];
-            },(error) => {
-                console.log(error);
-            })
-        },
-        test:function(event, node){
-            alert("event: " + event + " park_id: " + node.raw.id + ", park_name: " + node.raw.label );
-            console.log("event: " + event + " park_id: " + node.raw.id + ", park_name: " + node.raw.label );
-        },
-        mousedown_event_stop_propagation:function(){
-            $('.option-label-container').on('mousedown', function(e) {
-                e.stopPropagation();
-                return false;
-            });
-        },
-    },
-
-    beforeUpdate: function() {
-    },
-
-    updated: function() {
-    },
-
-    beforeMount: function() {
-    },
-
-    mounted:function () {
-        let vm = this;
-        //vm.fetchParkTreeview()
-    }
-}
-</script>
-
-<style lang="css" scoped>
-</style>
-
diff --git a/boranga/frontend/boranga/src/components/common/comms_logs.vue b/boranga/frontend/boranga/src/components/common/comms_logs.vue
index 1432a5d8..1ae9f22a 100755
--- a/boranga/frontend/boranga/src/components/common/comms_logs.vue
+++ b/boranga/frontend/boranga/src/components/common/comms_logs.vue
@@ -4,7 +4,7 @@
         <div class="card mb-3">
             <div class="card-header">Logs</div>
             <div class="card-body border-bottom">
-                <label for="assigned-to" class="form-label">Communications</label>
+                <label for="assigned-to" class="form-label">Communication Logs</label>
                 <div class="rounded border py-2">
                     <span class="ps-3 pe-2"><i class="bi bi-card-list"></i> </span>
                     <a href="#" class="pe-5" ref="showCommsBtn" @click.prevent>View</a>
@@ -18,7 +18,7 @@
                 </div>
             </div>
             <div class="card-body">
-                <label for="assigned-to" class="form-label">Actions</label>
+                <label for="assigned-to" class="form-label">Action Logs</label>
                 <div class="rounded border py-2">
                     <span class="ps-3 pe-2"><i class="bi bi-card-list"></i> </span>
                     <a href="#" ref="showActionBtn" @click.prevent>View</a>
diff --git a/boranga/frontend/boranga/src/components/common/component_map.vue b/boranga/frontend/boranga/src/components/common/component_map.vue
index 33bd83ef..3fba787c 100644
--- a/boranga/frontend/boranga/src/components/common/component_map.vue
+++ b/boranga/frontend/boranga/src/components/common/component_map.vue
@@ -4580,6 +4580,15 @@ export default {
                 layer_name = this.defaultQueryLayerName;
             }
             const format = new GeoJSON();
+            if (!this.layerSources[layer_name]) {
+                // Just adding this to cover the case of the user quickly
+                // pressing save and exit button before the map is fully loaded
+                // and the layer sources are not yet available
+                console.error(
+                    `Layer source ${layer_name} not found. Cannot get features.`
+                );
+                return;
+            }
             const layerFeatures = this.layerSources[layer_name].getFeatures();
 
             const features = [];
diff --git a/boranga/frontend/boranga/src/components/common/component_map_test.vue b/boranga/frontend/boranga/src/components/common/component_map_test.vue
deleted file mode 100644
index 257d638a..00000000
--- a/boranga/frontend/boranga/src/components/common/component_map_test.vue
+++ /dev/null
@@ -1,329 +0,0 @@
-<template lang="html">
-    <div class="map-wrapper row col-sm-12">
-       <div :id="elem_id" class="map">
-           <div class="basemap-button">
-               <img v-if="showSatIcon" id="basemap_sat" src="../../assets/satellite_icon.jpg" @click="setBaseLayer('sat')" />
-               <img v-if="!showSatIcon" id="basemap_osm" src="../../assets/map_icon.png" @click="setBaseLayer('osm')" />
-           </div>
-           <div class="optional-layers-wrapper">
-               <div class="optional-layers-button-wrapper">
-                   <div :class="[
-                               mode == 'measure' ? 'optional-layers-button-active': 'optional-layers-button'
-                               ]"
-                   >
-                       <img class="svg-icon" src="../../assets/ruler.svg" />
-                   </div>
-               </div>
-               <div class="optional-layers-button-wrapper">
-                   <div :class="[
-                               mode == 'draw' ? 'optional-layers-button-active': 'optional-layers-button'
-                               ]"
-                   >
-                       <img class="svg-icon" src="../../assets/pen-icon.svg" />
-                   </div>
-               </div>
-               <div class="optional-layers-button-wrapper">
-                   <a id="download" download="features.json">Download</a>
-               </div>
-           </div>
-       </div>
-       <button class="col-sm-1" type="submit">Save Point</button>
-       <div class="overlay-container">
-           <span class="overlay-text" id="feature-id"></span>
-       </div>
-       <div id="coordinates" class="coordinates"></div>
-       <div id="mouse-overlay" class="overlay"></div>
-   </div>
-</template>
-
-<script>
-import { v4 as uuid } from 'uuid';
-import Vue from 'vue' ;
-import VectorLayer from 'ol/layer/Vector';
-import VectorSource from 'ol/source/Vector';
-import 'ol/ol.css';
-import Map from 'ol/Map';
-import View from 'ol/View';
-//import Feature from 'ol/Feature';
-import TileLayer from 'ol/layer/Tile';
-import TileWMS from 'ol/source/TileWMS';
-import OSM from 'ol/source/OSM';
-import GeoJSON from 'ol/format/GeoJSON';
-import { Circle as CircleStyle, Fill, Stroke, Style, Text, RegularShape } from 'ol/style';
-import OverlayLayer from 'ol/Overlay';
-import Feature from 'ol/Feature';
-import { Draw, Modify, Snap, Select } from 'ol/interaction';
-import { MousePosition, defaults as DefaultControls } from 'ol/control';
-import { createStringXY } from 'ol/coordinate';
-import Point from 'ol/geom/Point';
-import {
- api_endpoints,
- helpers
-}
-from '@/utils/hooks'
-import Ocr_location from './occurrence/ocr_location.vue';
-import { Polygon } from 'ol/geom';
-
-export default {
-       name: 'MapComponent',
-       props:{
-           occurrence_report_obj:{
-               type: Object,
-               required:true
-           },
-           is_external:{
-             type: Boolean,
-             default: false
-           },
-       },
-       data:function () {
-           let vm = this;
-           return{
-               elem_id: uuid(),
-               map: null,
-               showSatIcon: true,
-               form:null,
-               errors: false,
-               tileLayerOSM: null,
-               tileLayerSat: null,
-               mode: 'normal',
-               source : null,
-               modelQuerySource: null,
-               point_data:null,
-               shapefile_json: {"type":"FeatureCollection","features":[{"type":"Feature","properties":{"id":1},"geometry":{"coordinates":[[[116.06664827879348,-31.93675031506431],[116.06664827879348,-31.994867724519167],[116.17443408838562,-31.994867724519167],[116.17443408838562,-31.93675031506431],[116.06664827879348,-31.93675031506431]]],"type":"Polygon"}},{"type":"Feature","properties":{"id":2},"geometry":{"type":"Polygon","coordinates":[[[116.04653664085203,-31.89991187254868],[116.04545524108961,-31.89995697026007],[116.0443842526443,-31.90009182921046],[116.04333398668759,-31.90031515102484],[116.04231455505979,-31.90062478562606],[116.0413357729947,-31.901017751916903],[116.04040706468766,-31.9014902664569],[116.03953737261281,-31.902037779858986],[116.03873507145939,-31.90265502055705],[116.03800788751451,-31.903336045524537],[116.03736282426674,-31.9040742974576],[116.03680609494673,-31.904862667874127],[116.03634306265535,-31.90569356552278],[116.03597818865663,-31.906558989445326],[116.03571498933616,-31.90745060599025],[116.03555600224243,-31.908359829037533],[116.03550276154138,-31.90927790266327],[116.03555578312505,-31.910195985448997],[116.03571455952195,-31.91110523562421],[116.03597756466311,-31.911996896222504],[116.03634226846226,-31.912862379430912],[116.03680516107445,-31.913693349319594],[116.03736178660341,-31.914481802154175],[116.03800678593703,-31.915220143516045],[116.03873394830072,-31.915901261486383],[116.0395362710353,-31.916518595187295],[116.04040602702435,-31.917066198018183],[116.04133483912238,-31.917538794976238],[116.04231376086666,-31.91793183350711],[116.04333336269406,-31.9182415273942],[116.04438382283006,-31.91846489326196],[116.0454550219722,-31.918599779340276],[116.04653664085203,-31.918644886211645],[116.04761825973183,-31.918599779340276],[116.04868945887398,-31.91846489326196],[116.04973991901,-31.9182415273942],[116.05075952083739,-31.91793183350711],[116.05173844258168,-31.917538794976238],[116.0526672546797,-31.917066198018183],[116.05353701066875,-31.916518595187295],[116.05433933340333,-31.915901261486383],[116.05506649576701,-31.915220143516045],[116.05571149510062,-31.914481802154175],[116.05626812062958,-31.913693349319594],[116.05673101324177,-31.912862379430912],[116.05709571704094,-31.911996896222504],[116.05735872218212,-31.91110523562421],[116.05751749857902,-31.910195985448997],[116.05757052016266,-31.90927790266327],[116.0575172794616,-31.908359829037533],[116.05735829236791,-31.90745060599025],[116.05709509304744,-31.906558989445326],[116.0567302190487,-31.90569356552278],[116.05626718675732,-31.904862667874127],[116.05571045743731,-31.9040742974576],[116.05506539418953,-31.903336045524537],[116.05433821024468,-31.90265502055705],[116.05353590909125,-31.902037779858986],[116.05266621701638,-31.9014902664569],[116.05173750870935,-31.901017751916903],[116.05075872664425,-31.90062478562606],[116.04973929501647,-31.90031515102484],[116.04868902905974,-31.90009182921046],[116.04761804061444,-31.89995697026007],[116.04653664085203,-31.89991187254868]]]}}]},
-           }
-       },
-       components: {
-       },
-       computed: {
-           title: function(){
-               return "Add Location";
-       },
-           
-       },
-       watch:{
-       },
-       methods:{
-           eventListeners:function (){
-               let vm = this;
-           },
-           initMap: function (){
-               let vm = this;
-
-               let satelliteTileWms = new TileWMS({
-                   url: env['kmi_server_url'] + '/geoserver/public/wms',
-                   params: {
-                       'FORMAT': 'image/png',
-                       'VERSION': '1.1.1',
-                       tiled: true,
-                       STYLES: '',
-                       LAYERS: 'public:mapbox-satellite',
-                   } 
-               });
-
-               // let streetsTileWMS = new TileWMS({
-               //     url: env['kmi_server_url'] + '/geoserver/public/wms',
-               //     params: {
-               //         'FORMAT': 'image/png',
-               //         'VERSION': '1.1.1',
-               //         tiled: true,
-               //         STYLES: '',
-               //         LAYERS: `public:${baselayer_name}`
-               //     }
-               // });
-               vm.tileLayerOSM = new TileLayer({
-                   title: 'StreetsMap',
-                   type: 'base',
-                   visible: true,
-                   source: new OSM(),
-               });
-               vm.tileLayerSat = new TileLayer({
-                   title: 'Satellite',
-                   type: 'base',
-                   visible: false,
-                   source: satelliteTileWms,
-               })
-
-               vm.map = new Map({
-                   target: vm.elem_id,
-                   layers: [
-                       vm.tileLayerOSM, 
-                       vm.tileLayerSat,
-                   ],
-                   view: new View({
-                       center: [115.95, -31.95],
-                       zoom: 7,
-                       projection: 'EPSG:4326',
-                   }),
-                   controls: DefaultControls().extend([
-                       new MousePosition({
-                       coordinateFormat: createStringXY(4), // Format coordinates with 4 decimal places
-                       projection: 'EPSG:4326', // Use WGS 84 projection (longitude/latitude)
-                       target: document.getElementById('coordinates'), // The DOM element to display coordinates
-                       undefinedHTML: '&nbsp;', // Text to display when the mouse is not over the map
-                       }),
-                   ]),
-               })
-
-               // update map extent when new features added
-               //vm.map.on('rendercomplete', vm.displayAllFeatures());
-
-               let fillStyle = new Fill({
-                   color: [84,118,255,1]
-               })
-
-               let strokeStyle = new Stroke({
-                   color: [46,45,45,1],
-                   width: 1.2
-               })
-
-               let circleStyle = new CircleStyle({
-                   fill: new Fill({
-                       color: [245,49,5,1]
-                   }),
-                   radius: 7,
-                   stroke: strokeStyle,
-               })
-
-               vm.source = new VectorSource({
-                   //features: new GeoJSON().readFeatures(vm.shapefile_json),
-               })
-
-               let vectorData = new VectorLayer({
-                   source: vm.source,
-                   visible: true,
-                   title: 'VectorDataExample',
-                   style: new Style({
-                       fill: fillStyle,
-                       stroke: strokeStyle,
-                       image: circleStyle,
-                   })
-               })
-
-               // Create a feature with a marker
-               // var marker = new ol.Feature({
-               //     geometry: new ol.geom.Point(ol.proj.fromLonLat([longitude, latitude]))
-               // });
-
-               // // Add the feature to the vector layer
-               // vectorLayer.getSource().addFeature(marker);
-
-               vm.map.addLayer(vectorData);
-
-               const draw = new Draw({
-                   type: 'Polygon',
-                   source: vm.source
-               });
-               vm.map.addInteraction(draw)
-
-               draw.on('drawend', (event) => {
-                   const geometry = event.feature.getGeometry();
-                   //vm.occurrence_report_obj.location.geojson_point = `POINT(${coordinates[0]} ${coordinates[1]})`;
-                   let polygonCoordinates = geometry.getCoordinates()[0].map(coord => coord.join(' '));
-                   vm.occurrence_report_obj.location.geojson_polygon = polygonCoordinates.join(',')
-               });
-
-
-               //vector Feature popup
-               let overlayElement = document.querySelector('.overlay-container');
-               let overlayLayer = new OverlayLayer({
-                   element: overlayElement
-               })
-
-               vm.map.addOverlay(overlayLayer);
-               let overlayFeatureId = document.getElementById('feature-id');
-
-               vm.map.on('click', function(e){
-                   overlayLayer.setPosition(undefined);
-                   vm.map.forEachFeatureAtPixel(e.pixel, function(feature,layer){
-                       let clickedCoords=e.coordinate
-                       overlayLayer.setPosition(clickedCoords);
-                       overlayFeatureId.innerHTML=clickedCoords;
-                       //console.log(feature.get('id'));
-                   })
-               })
-
-               // Create a custom overlay for displaying coordinates on top of the mouse
-               const mouseOverlay = new OverlayLayer({
-                   element: document.getElementById('mouse-overlay'),
-                   positioning: 'bottom-left',
-                   stopEvent: false, // Allow map events to pass through the overlay
-               });
-
-               vm.map.addOverlay(mouseOverlay);
-               
-               // Add a mousemove event listener to update the overlay's position
-               vm.map.on('pointermove', (e) => {
-                   if (e.dragging) {
-                       return;
-                   }
-                   const coordinate = e.coordinate;
-                   mouseOverlay.setPosition(coordinate);
-                   document.getElementById('mouse-overlay').innerHTML=coordinate;
-               });
-
-            },
-            setBaseLayer: function(selected_layer_name){
-               console.log('in setBaseLayer')
-               if (selected_layer_name == 'sat') {
-                   this.toggleSatIcon('sat');
-                   this.tileLayerOSM.setVisible(false)
-                   this.tileLayerSat.setVisible(true)
-               } else {
-                   this.toggleSatIcon('osm');
-                   this.tileLayerOSM.setVisible(true)
-                   this.tileLayerSat.setVisible(false)
-               }
-           },
-           toggleSatIcon: function(layer) {
-               if (layer === 'osm') {
-                   this.showSatIcon = true;
-               } else {
-                   this.showSatIcon = false;
-               }
-           },
-       },
-       created: async function() {
-           let vm=this;
-           
-       },
-       mounted: function(){
-           let vm = this;
-           vm.initMap();
-           const format = new GeoJSON({featureProjection: 'EPSG:4326'});
-           const download = document.getElementById('download');
-           vm.source.on('change', function () {
-           const features = vm.source.getFeatures();
-           const json = format.writeFeatures(features);
-           console.log(json);
-           download.href =
-               'data:application/json;charset=utf-8,' + encodeURIComponent(json);
-           });
-           if(vm.occurrence_report_obj.location.geojson_point!=null){
-               //vm.source.addFeature(vm.occurrence_report_obj.location.geojson_point)
-               vm.source.clear();
-               vm.point_data = new Point(vm.occurrence_report_obj.location.geojson_point);
-               var feature = new Feature({
-                   geometry: vm.point_data,
-                   // You can also add properties to the feature here
-               });
-               vm.source.addFeature(feature);
-           }
-           if(vm.occurrence_report_obj.location.geojson_polygon!=null){
-               //vm.source.addFeature(vm.occurrence_report_obj.location.geojson_point)
-               vm.source.clear();
-               let polygon_data = new Polygon(vm.occurrence_report_obj.location.geojson_polygon);
-               var feature = new Feature({
-                   geometry: polygon_data,
-                   // You can also add properties to the feature here
-               });
-               vm.source.addFeature(feature);
-           }
-       },
-   }
-</script>
-
-<style lang="css" scoped>
-@import '../../../../../static/boranga/css/map.css';
-</style>
-
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue b/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
index db08d555..5b2a3882 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
@@ -1,7 +1,7 @@
 <template lang="html">
     <div id="communityStatus">
         <FormSection :formCollapse="false" label="Conservation Status" Index="conservation_status">
-            <form @change="$emit('saveConservationStatus')">
+            <form @change="saveConservationStatus($event)">
                 <template v-if="!is_external && !conservation_status_obj.can_user_edit">
                     <CollapsibleComponent component_title="Assessment Comments" ref="assessment_comments"
                         :collapsed="false">
@@ -76,7 +76,7 @@
                         <label for="change_code" class="col-sm-4 col-form-label fw-bold">Change Type <span
                                 class="text-danger">*</span></label>
                         <div class="col-sm-8">
-                            <template v-if="!isReadOnly && 'Unlocked' != conservation_status_obj.processing_status">
+                            <template v-if="!isReadOnly">
                                 <template
                                     v-if="change_codes && change_codes.length > 0 && conservation_status_obj.change_code_id && !change_codes.map((d) => d.id).includes(conservation_status_obj.change_code_id)">
                                     <input type="text" v-if="conservation_status_obj.change_code"
@@ -87,6 +87,7 @@
                                     </div>
                                 </template>
                                 <select class="form-select" v-model="conservation_status_obj.change_code_id">
+                                    <option :value="null">Select the appropriate Change type</option>
                                     <option v-for="change_code in change_codes" :value="change_code.id"
                                         v-bind:key="change_code.id">
                                         {{ change_code.code }}
@@ -117,14 +118,14 @@
                             <label for="effective_from" class="col-sm-3 col-form-label">Effective From:</label>
                             <div class="col-sm-3">
                                 <input type="date" placeholder="DD/MM/YYYY" class="form-control" id="effective_from"
-                                    v-model="conservation_status_obj.effective_from" :disabled="true" />
+                                    v-model="conservation_status_obj.effective_from" :disabled="isReadOnly" />
                             </div>
                         </template>
                         <template v-if="conservation_status_obj.effective_to">
                             <label for="effective_to" class="col-sm-3 col-form-label">Effective to:</label>
                             <div class="col-sm-3">
-                                <input type="date" readonly placeholder="DD/MM/YYYY" class="form-control"
-                                    id="effective_to" v-model="conservation_status_obj.effective_to" :disabled="true" />
+                                <input type="date" placeholder="DD/MM/YYYY" class="form-control"
+                                    id="effective_to" v-model="conservation_status_obj.effective_to" :disabled="isReadOnly" />
                             </div>
                         </template>
                     </div>
@@ -174,8 +175,8 @@
                                 </select>
                             </template>
                             <template v-else>
-                                <input class="form-control" type="text" :disabled="isReadOnly"
-                                    v-model="conservation_status_obj.wa_legislative_list" />
+                                <input class="form-control" type="text" :disabled="true"
+                                :value="conservation_status_obj.wa_legislative_list ? conservation_status_obj.wa_legislative_list : 'N/A'" />
                             </template>
                         </div>
                     </div>
@@ -206,8 +207,8 @@
                                 </select>
                             </template>
                             <template v-else>
-                                <input class="form-control" type="text" :disabled="isReadOnly"
-                                    v-model="conservation_status_obj.wa_legislative_category" />
+                                <input class="form-control" type="text" :disabled="true"
+                                :value="conservation_status_obj.wa_legislative_category ? conservation_status_obj.wa_legislative_category : 'N/A'" />
                             </template>
                         </div>
                     </div>
@@ -237,8 +238,8 @@
                                 </select>
                             </template>
                             <template v-else>
-                                <input class="form-control" type="text" :disabled="isReadOnly"
-                                    v-model="conservation_status_obj.wa_priority_list" />
+                                <input class="form-control" type="text" :disabled="true"
+                                :value="conservation_status_obj.wa_priority_list ? conservation_status_obj.wa_priority_list : 'N/A'" />
                             </template>
                         </div>
                     </div>
@@ -268,8 +269,8 @@
                                 </select>
                             </template>
                             <template v-else>
-                                <input class="form-control" type="text" :disabled="isReadOnly"
-                                    v-model="conservation_status_obj.wa_priority_category" />
+                                <input class="form-control" type="text" :disabled="true"
+                                :value="conservation_status_obj.wa_priority_category ? conservation_status_obj.wa_priority_category : 'N/A'" />
                             </template>
                         </div>
                     </div>
@@ -302,8 +303,8 @@
                                 </select>
                             </template>
                             <template v-else>
-                                <input class="form-control" type="text" :disabled="isReadOnly"
-                                    v-model="conservation_status_obj.commonwealth_conservation_list" />
+                                <input class="form-control" type="text" :disabled="true"
+                                :value="conservation_status_obj.commonwealth_conservation_list ? conservation_status_obj.commonwealth_conservation_list : 'N/A'" />
                             </template>
                         </div>
                     </div>
@@ -313,7 +314,7 @@
                         <div class="col-sm-8">
                             <input :disabled="isReadOnly" type="text" class="form-control"
                                 id="proposed_international_conservation"
-                                placeholder="Enter International Conservation Details if Applicable"
+                                :placeholder="isReadOnly ? 'N/A' : 'Enter International Conservation Details if Applicable'"
                                 v-model="conservation_status_obj.international_conservation" />
                         </div>
                     </div>
@@ -323,7 +324,7 @@
                         <div class="col-sm-8">
                             <input :disabled="isReadOnly" type="text" class="form-control"
                                 id="proposed_conservation_criteria"
-                                placeholder="Enter Conservation Criteria if Applicable"
+                                :placeholder="isReadOnly ? 'N/A' : 'Enter Conservation Criteria if Applicable'"
                                 v-model="conservation_status_obj.conservation_criteria" />
                         </div>
                     </div>
@@ -537,7 +538,6 @@ export default {
             change_codes: [],
             filtered_wa_legislative_categories: [],
             filtered_wa_priority_categories: [],
-            filtered_recommended_wa_legislative_categories: [],
             referral_comments_boxes: [],
             community_display: '',
         }
@@ -562,7 +562,7 @@ export default {
                 this.conservation_status_obj.processing_status == "With Assessor";
         },
         listing_and_review_due_date_disabled: function () {
-            return this.isReadOnly || this.conservation_status_obj.processing_status != "With Assessor"
+            return this.isReadOnly || !["With Assessor", "Unlocked"].includes(this.conservation_status_obj.processing_status)
         },
         approval_level_disabled: function () {
             return this.isReadOnly || !['With Assessor', 'With Referral'].includes(this.conservation_status_obj.processing_status);
@@ -607,7 +607,7 @@ export default {
             ) {
                 return true;
             } else {
-                if (this.conservation_status_obj.processing_status == "Ready For Agenda") {
+                if (["Ready For Agenda", "Approved", "Closed", "DeListed", "Discarded"].includes(this.conservation_status_obj.processing_status)) {
                     return true;
                 }
                 if (
@@ -635,7 +635,7 @@ export default {
             }
         },
         conservation_list_proposed: function () {
-            return !(this.conservation_status_obj.processing_status == "Approved" || this.conservation_status_obj.processing_status == "DeListed")
+            return !(['Approved', 'DeListed', 'Declined', 'Closed', 'Unlocked'].includes(this.conservation_status_obj.processing_status))
         },
         canViewCurrentList: function () {
             return (this.conservation_status_obj.processing_status == "Approved" || this.conservation_status_obj.processing_status == "DeListed") ? false : true;
@@ -688,6 +688,7 @@ export default {
                     let data = e.params.data.id;
                     vm.conservation_status_obj.community_id = data
                     vm.community_display = e.params.data.text;
+                    vm.$emit('saveConservationStatus');
                 }).
                 on("select2:unselect", function (e) {
                     var selected = $(e.currentTarget);
@@ -738,28 +739,6 @@ export default {
                 });
             });
         },
-        filterRecommendedWALegislativeCategories: function (event) {
-            this.$nextTick(() => {
-                if (event) {
-                    this.conservation_status_obj.recommended_wa_legislative_category_id = null;
-                }
-
-                this.filtered_recommended_wa_legislative_categories = this.wa_priority_categories.filter((choice) => {
-                    return choice.list_ids.includes(this.conservation_status_obj.recommended_wa_legislative_list_id);
-                });
-            });
-        },
-        filterRecommendedWAPriorityCategories: function (event) {
-            this.$nextTick(() => {
-                if (event) {
-                    this.conservation_status_obj.recommended_wa_priority_category_id = null;
-                }
-
-                this.filtered_recommended_wa_priority_categories = this.wa_priority_categories.filter((choice) => {
-                    return choice.list_ids.includes(this.conservation_status_obj.recommended_wa_priority_list_id);
-                });
-            });
-        },
         generateReferralCommentBoxes: function () {
             var box_visibility = this.conservation_status_obj.assessor_mode.assessor_box_view
             var assessor_mode = this.conservation_status_obj.assessor_mode.assessor_level
@@ -785,6 +764,16 @@ export default {
         toggleComment: function (updatedShowComment) {
             this.isShowComment = updatedShowComment;
         },
+        saveConservationStatus: function (e) {
+            if(e.target.classList.contains('input.select2-search__field')){
+                // We will emit this save from the select 2 event instead
+                // as it requires some time to populate the selected value
+                // and we don't want to save the conservation status before the
+                // select2 value is populated
+                return;
+            }
+            this.$emit('saveConservationStatus');
+        },
     },
     created: async function () {
         let vm = this;
@@ -802,8 +791,6 @@ export default {
             this.getCommunityDisplay();
             this.filterWALegislativeCategories();
             this.filterWAPriorityCategories();
-            this.filterRecommendedWALegislativeCategories();
-            this.filterRecommendedWAPriorityCategories();
             if (!vm.is_external) {
                 this.generateReferralCommentBoxes();
             }
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/cs_documents.vue b/boranga/frontend/boranga/src/components/common/conservation_status/cs_documents.vue
index 650aa91e..c2cea3a6 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/cs_documents.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/cs_documents.vue
@@ -306,7 +306,7 @@ export default {
                         .then((response) => {
                             swal.fire({
                                 title: 'Discarded',
-                                text: 'Your document has been removed',
+                                text: 'The document has been discarded',
                                 icon: 'success',
                                 customClass: {
                                     confirmButton: 'btn btn-primary'
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/cs_more_referrals.vue b/boranga/frontend/boranga/src/components/common/conservation_status/cs_more_referrals.vue
index e14415b9..dba8b209 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/cs_more_referrals.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/cs_more_referrals.vue
@@ -58,8 +58,6 @@ export default {
                         title: 'Referral',
                         data: 'referral',
                         render: function (data, type, full) {
-                            console.log(data);
-
                             return `<span>${data.first_name} ${data.last_name}</span>`;
                         }
                     },
@@ -88,7 +86,6 @@ export default {
                     {
                         title: 'Referral Comments',
                         data: 'referral_comment',
-
                         'render': function (value) {
                             var ellipsis = '...',
                                 truncated = _.truncate(value, {
@@ -233,11 +230,16 @@ export default {
 
                 // activate popover when table is drawn.
                 vm.table.on('draw.dt', function () {
-                    var $tablePopover = $(this).find('[data-bs-toggle="popover"]');
-                    if ($tablePopover.length > 0) {
-                        $tablePopover.popover();
+                    var tablePopover = $(this).find('[data-bs-toggle="popover"]');
+                    if (tablePopover.length > 0) {
+                        new bootstrap.Popover(tablePopover, {
+                            html: true,
+                            trigger: 'hover',
+                            placement: 'bottom',
+                            container: 'body',
+                        });
                         // the next line prevents from scrolling up to the top after clicking on the popover.
-                        $($tablePopover).on('click', function (e) {
+                        $(tablePopover).on('click', function (e) {
                             e.preventDefault();
                             return true;
                         });
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue b/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
index 51609115..d07e7042 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
@@ -1,7 +1,7 @@
 <template lang="html">
     <div id="speciesStatus">
         <FormSection :formCollapse="false" label="Conservation Status" Index="conservation_status">
-            <form @change="$emit('saveConservationStatus')">
+            <form @change="saveConservationStatus($event)">
                 <template v-if="!is_external && !conservation_status_obj.can_user_edit">
                     <CollapsibleComponent component_title="Assessment Comments" ref="assessment_comments"
                         :collapsed="false">
@@ -84,7 +84,7 @@
                         <label for="change_code" class="col-sm-4 col-form-label fw-bold">Change Type <span
                                 class="text-danger">*</span></label>
                         <div class="col-sm-8">
-                            <template v-if="!isReadOnly && 'Unlocked' != conservation_status_obj.processing_status">
+                            <template v-if="!isReadOnly">
                                 <template
                                     v-if="change_codes && change_codes.length > 0 && conservation_status_obj.change_code_id && !change_codes.map((d) => d.id).includes(conservation_status_obj.change_code_id)">
                                     <input type="text" v-if="conservation_status_obj.change_code"
@@ -95,6 +95,7 @@
                                     </div>
                                 </template>
                                 <select class="form-select" v-model="conservation_status_obj.change_code_id">
+                                    <option :value="null">Select the appropriate Change type</option>
                                     <option v-for="change_code in change_codes" :value="change_code.id"
                                         v-bind:key="change_code.id">
                                         {{ change_code.code }}
@@ -125,14 +126,14 @@
                             <label for="effective_from" class="col-sm-3 col-form-label">Effective From:</label>
                             <div class="col-sm-3">
                                 <input type="date" placeholder="DD/MM/YYYY" class="form-control" id="effective_from"
-                                    v-model="conservation_status_obj.effective_from" :disabled="true" />
+                                    v-model="conservation_status_obj.effective_from" :disabled="isReadOnly" />
                             </div>
                         </template>
                         <template v-if="conservation_status_obj.effective_to">
                             <label for="effective_to" class="col-sm-3 col-form-label">Effective to:</label>
                             <div class="col-sm-3">
-                                <input type="date" readonly placeholder="DD/MM/YYYY" class="form-control"
-                                    id="effective_to" v-model="conservation_status_obj.effective_to" :disabled="true" />
+                                <input type="date" placeholder="DD/MM/YYYY" class="form-control"
+                                    id="effective_to" v-model="conservation_status_obj.effective_to" :disabled="isReadOnly" />
                             </div>
                         </template>
                     </div>
@@ -182,8 +183,8 @@
                                 </select>
                             </template>
                             <template v-else>
-                                <input class="form-control" type="text" :disabled="isReadOnly"
-                                    v-model="conservation_status_obj.wa_legislative_list" />
+                                <input class="form-control" type="text" :disabled="true"
+                                    :value="conservation_status_obj.wa_legislative_list ? conservation_status_obj.wa_legislative_list : 'N/A'" />
                             </template>
                         </div>
                     </div>
@@ -214,8 +215,8 @@
                                 </select>
                             </template>
                             <template v-else>
-                                <input class="form-control" type="text" :disabled="isReadOnly"
-                                    v-model="conservation_status_obj.wa_legislative_category" />
+                                <input class="form-control" type="text" :disabled="true"
+                                :value="conservation_status_obj.wa_legislative_category ? conservation_status_obj.wa_legislative_category : 'N/A'" />
                             </template>
                         </div>
                     </div>
@@ -245,8 +246,8 @@
                                 </select>
                             </template>
                             <template v-else>
-                                <input class="form-control" type="text" :disabled="isReadOnly"
-                                    v-model="conservation_status_obj.wa_priority_list" />
+                                <input class="form-control" type="text" :disabled="true"
+                                    :value="conservation_status_obj.wa_priority_list ? conservation_status_obj.wa_priority_list : 'N/A'" />
                             </template>
                         </div>
                     </div>
@@ -276,8 +277,8 @@
                                 </select>
                             </template>
                             <template v-else>
-                                <input class="form-control" type="text" :disabled="isReadOnly"
-                                    v-model="conservation_status_obj.wa_priority_category" />
+                                <input class="form-control" type="text" :disabled="true"
+                                :value="conservation_status_obj.wa_priority_category ? conservation_status_obj.wa_priority_category : 'N/A'" />
                             </template>
                         </div>
                     </div>
@@ -310,8 +311,8 @@
                                 </select>
                             </template>
                             <template v-else>
-                                <input class="form-control" type="text" :disabled="isReadOnly"
-                                    v-model="conservation_status_obj.commonwealth_conservation_list" />
+                                <input class="form-control" type="text" :disabled="true"
+                                :value="conservation_status_obj.commonwealth_conservation_list ? conservation_status_obj.commonwealth_conservation_list : 'N/A'" />
                             </template>
                         </div>
                     </div>
@@ -321,7 +322,7 @@
                         <div class="col-sm-8">
                             <input :disabled="isReadOnly" type="text" class="form-control"
                                 id="proposed_international_conservation"
-                                placeholder="Enter International Conservation Details if Applicable"
+                                :placeholder="isReadOnly ? 'N/A' : 'Enter International Conservation Details if Applicable'"
                                 v-model="conservation_status_obj.international_conservation" />
                         </div>
                     </div>
@@ -331,7 +332,7 @@
                         <div class="col-sm-8">
                             <input :disabled="isReadOnly" type="text" class="form-control"
                                 id="proposed_conservation_criteria"
-                                placeholder="Enter Conservation Criteria if Applicable"
+                                :placeholder="isReadOnly ? 'N/A' : 'Enter Conservation Criteria if Applicable'"
                                 v-model="conservation_status_obj.conservation_criteria" />
                         </div>
                     </div>
@@ -544,7 +545,6 @@ export default {
             change_codes: [],
             filtered_wa_legislative_categories: [],
             filtered_wa_priority_categories: [],
-            filtered_recommended_wa_legislative_categories: [],
             referral_comments_boxes: [],
             species_display: '',
             taxon_previous_name: '',
@@ -569,7 +569,7 @@ export default {
                 this.conservation_status_obj.processing_status == "With Assessor";
         },
         listing_and_review_due_date_disabled: function () {
-            return this.isReadOnly || this.conservation_status_obj.processing_status != "With Assessor"
+            return this.isReadOnly || !["With Assessor", "Unlocked"].includes(this.conservation_status_obj.processing_status)
         },
         approval_level_disabled: function () {
             return this.isReadOnly || !['With Assessor', 'With Referral'].includes(this.conservation_status_obj.processing_status);
@@ -628,7 +628,7 @@ export default {
             return true;
         },
         conservation_list_proposed: function () {
-            return !(this.conservation_status_obj.processing_status == "Approved" || this.conservation_status_obj.processing_status == "DeListed")
+            return !(['Approved', 'DeListed', 'Declined', 'Closed', 'Unlocked'].includes(this.conservation_status_obj.processing_status))
         },
         canViewCurrentList: function () {
             return (this.conservation_status_obj.processing_status == "Approved" || this.conservation_status_obj.processing_status == "DeListed") ? false : true;
@@ -681,6 +681,7 @@ export default {
                     vm.conservation_status_obj.species_taxonomy_id = data.id
                     vm.species_display = data.text;
                     vm.taxon_previous_name = data.taxon_previous_name;
+                    vm.$emit('saveConservationStatus');
                 }).
                 on("select2:unselect", function (e) {
                     var selected = $(e.currentTarget);
@@ -734,28 +735,6 @@ export default {
                 });
             });
         },
-        filterRecommendedWALegislativeCategories: function (event) {
-            this.$nextTick(() => {
-                if (event) {
-                    this.conservation_status_obj.recommended_wa_legislative_category_id = null;
-                }
-
-                this.filtered_recommended_wa_legislative_categories = this.wa_priority_categories.filter((choice) => {
-                    return choice.list_ids.includes(this.conservation_status_obj.recommended_wa_legislative_list_id);
-                });
-            });
-        },
-        filterRecommendedWAPriorityCategories: function (event) {
-            this.$nextTick(() => {
-                if (event) {
-                    this.conservation_status_obj.recommended_wa_priority_category_id = null;
-                }
-
-                this.filtered_recommended_wa_priority_categories = this.wa_priority_categories.filter((choice) => {
-                    return choice.list_ids.includes(this.conservation_status_obj.recommended_wa_priority_list_id);
-                });
-            });
-        },
         generateReferralCommentBoxes: function () {
             var box_visibility = this.conservation_status_obj.assessor_mode.assessor_box_view
             var assessor_mode = this.conservation_status_obj.assessor_mode.assessor_level
@@ -783,6 +762,16 @@ export default {
         toggleComment: function (updatedShowComment) {
             this.isShowComment = updatedShowComment;
         },
+        saveConservationStatus: function (e) {
+            if(e.target.classList.contains('input.select2-search__field')){
+                // We will emit this save from the select 2 event instead
+                // as it requires some time to populate the selected value
+                // and we don't want to save the conservation status before the
+                // select2 value is populated
+                return;
+            }
+            this.$emit('saveConservationStatus');
+        },
     },
     created: async function () {
         let vm = this;
@@ -800,8 +789,6 @@ export default {
             this.getSpeciesDisplay();
             this.filterWALegislativeCategories();
             this.filterWAPriorityCategories();
-            this.filterRecommendedWALegislativeCategories();
-            this.filterRecommendedWAPriorityCategories();
             if (!vm.is_external) {
                 this.generateReferralCommentBoxes();
             }
diff --git a/boranga/frontend/boranga/src/components/common/more_referrals.vue b/boranga/frontend/boranga/src/components/common/more_referrals.vue
deleted file mode 100755
index 01f7b161..00000000
--- a/boranga/frontend/boranga/src/components/common/more_referrals.vue
+++ /dev/null
@@ -1,271 +0,0 @@
-<template id="more-referrals">
-    <div>
-        <a v-if="!isFinalised" ref="showRef" @click.prevent="" role="button" class="mt-2 float-end">Show All Referrals</a>
-    </div>
-</template>
-
-<script>
-import {
-    constants,
-    api_endpoints,
-    helpers
-} from '@/utils/hooks'
-export default {
-    name: 'MoreReferrals',
-    props: {
-        isFinalised: {
-            type: Boolean,
-            required: true
-        },
-        canAction: {
-            type: Boolean,
-            required: true
-        },
-        proposal: {
-            type: Object,
-            required: true
-        },
-        referral_url: {
-            type: String,
-            default: null
-        }
-    },
-    data() {
-        let vm = this;
-        return {
-            table: null,
-            dateFormat: 'DD/MM/YYYY HH:mm:ss',
-            datatable_url: '',
-            datatable_options: {
-                language: {
-                    processing: constants.DATATABLE_PROCESSING_HTML
-                },
-                responsive: true,
-                deferRender: true,
-                autowidth: true,
-                processing: true,
-                ajax: {
-                    "url": this.referral_url,
-                    "dataSrc": '',
-                },
-                columns: [
-                    {
-                        title: 'Sent On',
-                        data: 'lodged_on',
-                        render: function (date) {
-                            return moment(date).format(vm.dateFormat);
-                        }
-                    },
-                    {
-                        title: 'Referral',
-                        data: 'referral',
-                        render: function (data, type, full) {
-                            return `<span>${data.first_name} ${data.last_name}</span>`;
-                        }
-                    },
-                    {
-                        title: 'Status',
-                        data: 'processing_status'
-                    },
-                    {
-                        title: 'Action',
-                        data: 'id',
-                        render: function (data, type, full) {
-                            var result = '';
-                            if (!vm.canAction) {
-                                return result;
-                            }
-                            var user = full.referral.first_name + ' ' + full.referral.last_name;
-                            if (full.processing_status == 'Awaiting') {
-                                result = `<a href="" data-id="${data}" data-user="${user}" class="remindRef">Remind</a>/<a href="" data-id="${data}" data-user="${user}" class="recallRef">Recall</a>`;
-                            }
-                            else {
-                                result = `<a href="" data-id="${data}" data-user="${user}" class="resendRef">Resend</a>`;
-                            }
-                            return result;
-                        }
-                    },
-                    {
-                        title: 'Referral Comments',
-                        data: 'referral_text',
-
-                        'render': function (value) {
-                            var ellipsis = '...',
-                                truncated = _.truncate(value, {
-                                    length: 20,
-                                    omission: ellipsis,
-                                    separator: ' '
-                                }),
-                                result = '<span>' + truncated + '</span>',
-                                popTemplate = _.template('<a href="#" ' +
-                                    'role="button" ' +
-                                    'data-bs-toggle="popover" ' +
-                                    'data-bs-trigger="click" ' +
-                                    'data-bs-placement="top auto"' +
-                                    'data-bs-html="true" ' +
-                                    'data-bs-content="<%= text %>" ' +
-                                    '>more</a>');
-                            if (_.endsWith(truncated, ellipsis)) {
-                                result += popTemplate({
-                                    text: value
-                                });
-                            }
-
-                            return result;
-                        },
-                    }
-                ]
-            },
-        }
-    },
-    methods: {
-        remindReferral: function (_id, user) {
-            let vm = this;
-
-            vm.$http.get(helpers.add_endpoint_json(api_endpoints.referrals, _id + '/remind')).then(response => {
-                vm.$emit('refreshFromResponse', response);
-                vm.table.ajax.reload();
-                swal(
-                    'Referral Reminder',
-                    'A reminder has been sent to ' + user,
-                    'success'
-                )
-            },
-                error => {
-                    swal(
-                        'Proposal Error',
-                        helpers.apiVueResourceError(error),
-                        'error'
-                    )
-                });
-        },
-        resendReferral: function (_id, user) {
-            let vm = this;
-            vm.$http.get(helpers.add_endpoint_json(api_endpoints.referrals, _id + '/resend')).then(response => {
-                vm.$emit('refreshFromResponse', response);
-                vm.table.ajax.reload();
-                swal(
-                    'Referral Resent',
-                    'The referral has been resent to ' + user,
-                    'success'
-                )
-            },
-                error => {
-                    swal(
-                        'Proposal Error',
-                        helpers.apiVueResourceError(error),
-                        'error'
-                    )
-                });
-        },
-        recallReferral: function (_id, user) {
-            let vm = this;
-            swal({
-                title: "Loading...",
-                //text: "Loading...",
-                allowOutsideClick: false,
-                allowEscapeKey: false,
-                onOpen: () => {
-                    swal.showLoading()
-                }
-            })
-            vm.$http.get(helpers.add_endpoint_json(api_endpoints.referrals, _id + '/recall')).then(response => {
-                swal.hideLoading();
-                swal.close();
-                vm.$emit('refreshFromResponse', response);
-                vm.table.ajax.reload();
-                swal(
-                    'Referral Recall',
-                    'The referall has been recalled from ' + user,
-                    'success'
-                )
-            },
-                error => {
-                    swal(
-                        'Proposal Error',
-                        helpers.apiVueResourceError(error),
-                        'error'
-                    )
-                });
-        },
-        initialiseTable: function () {
-            // To allow table elements (ref: https://getbootstrap.com/docs/5.1/getting-started/javascript/#sanitizer)
-            var myDefaultAllowList = bootstrap.Tooltip.Default.allowList
-            myDefaultAllowList.table = []
-
-            let vm = this;
-            let table_id = 'more-referrals-table' + vm._uid;
-            let popover_name = 'popover-' + vm._uid;
-            let my_content = '<table id="' + table_id + '" class="hover table table-striped table-bordered dt-responsive" cellspacing="0" width="100%"></table>'
-            let my_template = '<div class="popover ' + popover_name + '" role="tooltip"><div class="popover-arrow" style="top:110px;"></div><h3 class="popover-header"></h3><div class="popover-body"></div></div>'
-            let popover_elem = $(vm.$refs.showRef)[0]
-
-            new bootstrap.Popover(popover_elem, {
-                html: true,
-                content: my_content,
-                template: my_template,
-                title: 'Referrals',
-                container: 'body',
-                placement: 'right',
-                trigger: "click focus",
-            })
-            popover_elem.addEventListener('inserted.bs.popover', function () {
-                vm.table = $('#' + table_id).DataTable(vm.datatable_options);
-
-                // activate popover when table is drawn.
-                vm.table.on('draw.dt', function () {
-                    var $tablePopover = $(this).find('[data-bs-toggle="popover"]');
-                    if ($tablePopover.length > 0) {
-                        $tablePopover.popover();
-                        // the next line prevents from scrolling up to the top after clicking on the popover.
-                        $($tablePopover).on('click', function (e) {
-                            e.preventDefault();
-                            return true;
-                        });
-                    }
-                }).on('click', '.resendRef', function (e) {
-                    e.preventDefault();
-                    var _id = $(this).data('id');
-                    var user = $(this).data('user');
-                    vm.resendReferral(_id, user);
-                }).on('click', '.recallRef', function (e) {
-                    e.preventDefault();
-                    var _id = $(this).data('id');
-                    var user = $(this).data('user');
-                    vm.recallReferral(_id, user);
-                }).on('click', '.remindRef', function (e) {
-                    e.preventDefault();
-                    var _id = $(this).data('id');
-                    var user = $(this).data('user');
-                    vm.remindReferral(_id, user);
-                });
-            })
-            popover_elem.addEventListener('shown.bs.popover', function () {
-                console.log('in shown.bs.popover')
-
-                var el = vm.$refs.showRef;
-                var popoverheight = parseInt($('.' + popover_name).height());
-
-                var popover_bounding_top = parseInt($('.' + popover_name)[0].getBoundingClientRect().top);
-                var popover_bounding_bottom = parseInt($('.' + popover_name)[0].getBoundingClientRect().bottom);
-
-                var el_bounding_top = parseInt($(el)[0].getBoundingClientRect().top);
-                var el_bounding_bottom = parseInt($(el)[0].getBoundingClientRect().top);
-
-                var diff = el_bounding_top - popover_bounding_top;
-
-                var position = parseInt($('.' + popover_name).position().top);
-                var pos2 = parseInt($(el).position().top) - 5;
-
-                var x = diff + 5;
-                $('.' + popover_name).children('.arrow').css('top', x + 'px');
-            })
-        },
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.initialiseTable()
-        })
-    },
-}
-</script>
diff --git a/boranga/frontend/boranga/src/components/common/occurrence/occ_documents.vue b/boranga/frontend/boranga/src/components/common/occurrence/occ_documents.vue
index 10b1bea9..d9eb9577 100644
--- a/boranga/frontend/boranga/src/components/common/occurrence/occ_documents.vue
+++ b/boranga/frontend/boranga/src/components/common/occurrence/occ_documents.vue
@@ -297,7 +297,7 @@ export default {
                         .then((response) => {
                             swal.fire({
                                 title: 'Discarded',
-                                text: 'Your document has been removed',
+                                text: 'The document has been discarded',
                                 icon: 'success',
                                 customClass: {
                                     confirmButton: 'btn btn-primary',
diff --git a/boranga/frontend/boranga/src/components/common/occurrence/ocr_documents.vue b/boranga/frontend/boranga/src/components/common/occurrence/ocr_documents.vue
index 6bad99d0..6cf4d0a9 100644
--- a/boranga/frontend/boranga/src/components/common/occurrence/ocr_documents.vue
+++ b/boranga/frontend/boranga/src/components/common/occurrence/ocr_documents.vue
@@ -311,7 +311,7 @@ export default {
                         .then((response) => {
                             swal.fire({
                                 title: 'Discarded',
-                                text: 'Your document has been removed',
+                                text: 'The document has been discarded',
                                 icon: 'success',
                                 customClass: {
                                     confirmButton: 'btn btn-primary',
diff --git a/boranga/frontend/boranga/src/components/common/occurrence/ocr_more_referrals.vue b/boranga/frontend/boranga/src/components/common/occurrence/ocr_more_referrals.vue
index c26bc201..59902e2c 100644
--- a/boranga/frontend/boranga/src/components/common/occurrence/ocr_more_referrals.vue
+++ b/boranga/frontend/boranga/src/components/common/occurrence/ocr_more_referrals.vue
@@ -58,8 +58,6 @@ export default {
                         title: 'Referral',
                         data: 'referral',
                         render: function (data, type, full) {
-                            console.log(data);
-
                             return `<span>${data.first_name} ${data.last_name}</span>`;
                         }
                     },
@@ -201,7 +199,7 @@ export default {
             myDefaultAllowList.table = []
 
             let vm = this;
-            let table_id = 'cs-more-referrals-table' + vm._uid;
+            let table_id = 'ocr-more-referrals-table' + vm._uid;
             let popover_name = 'popover-' + vm._uid;
             let my_content = '<table id="' + table_id + '" class="hover table table-striped table-bordered dt-responsive" cellspacing="0" width="100%"></table>'
             let my_template = '<div class="popover ' + popover_name + '" role="tooltip"><div class="popover-arrow" style="top:110px;"></div><h3 class="popover-header"></h3><div class="popover-body"></div></div>'
@@ -223,11 +221,15 @@ export default {
 
                 // activate popover when table is drawn.
                 vm.table.on('draw.dt', function () {
-                    var $tablePopover = $(this).find('[data-bs-toggle="popover"]');
-                    if ($tablePopover.length > 0) {
-                        $tablePopover.popover();
-                        // the next line prevents from scrolling up to the top after clicking on the popover.
-                        $($tablePopover).on('click', function (e) {
+                    var tablePopover = $(this).find('[data-bs-toggle="popover"]');
+                    if (tablePopover.length > 0) {
+                        new bootstrap.Popover(tablePopover, {
+                            html: true,
+                            trigger: 'hover',
+                            placement: 'bottom',
+                            container: 'body',
+                        });                        // the next line prevents from scrolling up to the top after clicking on the popover.
+                        $(tablePopover).on('click', function (e) {
                             e.preventDefault();
                             return true;
                         });
diff --git a/boranga/frontend/boranga/src/components/common/species_communities/community_documents.vue b/boranga/frontend/boranga/src/components/common/species_communities/community_documents.vue
index 84b241b6..86b955bf 100644
--- a/boranga/frontend/boranga/src/components/common/species_communities/community_documents.vue
+++ b/boranga/frontend/boranga/src/components/common/species_communities/community_documents.vue
@@ -295,7 +295,7 @@ export default {
                         .then((response) => {
                             swal.fire({
                                 title: 'Discarded',
-                                text: 'Your document has been removed',
+                                text: 'The document has been discarded',
                                 icon: 'success',
                                 customClass: {
                                     confirmButton: 'btn btn-primary'
diff --git a/boranga/frontend/boranga/src/components/common/species_communities/species_documents.vue b/boranga/frontend/boranga/src/components/common/species_communities/species_documents.vue
index 939632bd..c7a05527 100644
--- a/boranga/frontend/boranga/src/components/common/species_communities/species_documents.vue
+++ b/boranga/frontend/boranga/src/components/common/species_communities/species_documents.vue
@@ -293,7 +293,7 @@ export default {
                         .then((response) => {
                             swal.fire({
                                 title: 'Discarded',
-                                text: 'Your document has been removed',
+                                text: 'The document has been discarded',
                                 icon: 'success',
                                 customClass: {
                                     confirmButton: 'btn btn-primary'
diff --git a/boranga/frontend/boranga/src/components/external/conservation_status/conservation_status_proposal.vue b/boranga/frontend/boranga/src/components/external/conservation_status/conservation_status_proposal.vue
index 5cbce99f..ebcdb741 100644
--- a/boranga/frontend/boranga/src/components/external/conservation_status/conservation_status_proposal.vue
+++ b/boranga/frontend/boranga/src/components/external/conservation_status/conservation_status_proposal.vue
@@ -39,7 +39,8 @@
             </div>
             <ProposalConservationStatus v-if="conservation_status_obj"
                 :conservation_status_obj="conservation_status_obj" id="ConservationStatusStart"
-                :canEditStatus="canEditStatus" :is_external="true" ref="conservation_status">
+                :canEditStatus="canEditStatus" :is_external="true" ref="conservation_status"
+                @saveConservationStatus="save_wo_confirm">
             </ProposalConservationStatus>
             <div>
                 <input type="hidden" name="csrfmiddlewaretoken" :value="csrf_token" />
@@ -60,20 +61,25 @@
                                     </div>
                                     <div class="col-md-6 text-end" style="margin-top:5px">
                                         <button v-if="savingCSProposal" type="button" class="btn btn-primary me-2"
-                                            disabled>Save and Continue <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
+                                            disabled>Save and
+                                            Continue <span class="spinner-border spinner-border-sm" role="status"
+                                                aria-hidden="true"></span>
                                             <span class="visually-hidden">Loading...</span></button>
                                         <input v-else type="button" @click.prevent="save" class="btn btn-primary me-2"
                                             value="Save and Continue" :disabled="saveExitCSProposal || paySubmitting" />
 
                                         <button v-if="saveExitCSProposal" type="button" class="btn btn-primary me-2"
-                                            disabled>Save and Exit <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
+                                            disabled>Save
+                                            and Exit <span class="spinner-border spinner-border-sm" role="status"
+                                                aria-hidden="true"></span>
                                             <span class="visually-hidden">Loading...</span></button>
                                         <input v-else type="button" @click.prevent="save_exit"
                                             class="btn btn-primary me-2" value="Save and Exit"
                                             :disabled="savingCSProposal || paySubmitting" />
 
                                         <button v-if="paySubmitting" type="button" class="btn btn-primary"
-                                            disabled>Submit <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
+                                            disabled>Submit <span class="spinner-border spinner-border-sm" role="status"
+                                                aria-hidden="true"></span>
                                             <span class="visually-hidden">Loading...</span></button>
                                         <input v-else type="button" @click.prevent="submit" class="btn btn-primary"
                                             :value="'Submit'" :disabled="saveExitCSProposal || savingCSProposal" />
@@ -83,10 +89,10 @@
                                 </div>
                                 <div v-else class="container">
                                     <p class="pull-right" style="margin-top:5px;">
-                                            <router-link class="btn btn-primary"
-                                                :to="{ name: 'external-conservation_status-dash' }">Back to
-                                                Dashboard</router-link>
-                                        </p>
+                                        <router-link class="btn btn-primary"
+                                            :to="{ name: 'external-conservation_status-dash' }">Back to
+                                            Dashboard</router-link>
+                                    </p>
                                 </div>
                             </div>
                         </div>
@@ -122,7 +128,6 @@ export default {
             savingCSProposal: false,
             paySubmitting: false,
             newText: "",
-            pBody: 'pBody',
             missing_fields: [],
             proposal_parks: null,
             isSaved: false,
@@ -139,31 +144,9 @@ export default {
         cs_proposal_form_url: function () {
             return (this.conservation_status_obj) ? `/api/conservation_status/${this.conservation_status_obj.id}/draft.json` : '';
         },
-        application_fee_url: function () {
-            return (this.proposal) ? `/application_fee/${this.proposal.id}/` : '';
-        },
-        proposal_submit_url: function () {
-            return (this.proposal) ? `/api/proposal/${this.proposal.id}/submit.json` : '';
-            //return this.submit();
-        },
-        canEditActivities: function () {
-            return this.conservation_status_obj ? this.conservation_status_obj.can_user_edit : 'false';
-        },
         canEditStatus: function () {
             return this.conservation_status_obj ? this.conservation_status_obj.can_user_edit : 'false';
         },
-        canEditPeriod: function () {
-            return this.proposal ? this.conservation_status_obj.can_user_edit : 'false';
-        },
-        application_type_tclass: function () {
-            return api_endpoints.t_class;
-        },
-        application_type_filming: function () {
-            return api_endpoints.filming;
-        },
-        application_type_event: function () {
-            return api_endpoints.event;
-        },
         display_group_type: function () {
             let group_type_string = this.conservation_status_obj.group_type
             // to Capitalize only first character
@@ -251,11 +234,12 @@ export default {
                 }
             });
         },
-        save_wo_confirm: function (e) {
-            let vm = this;
-            let formData = vm.set_formData()
+        save_wo_confirm: function () {
+            this.$http.post(this.cs_proposal_form_url, this.conservation_status_obj).then(res => {
 
-            vm.$http.post(vm.cs_proposal_form_url, formData);
+            }, err => {
+                console.log(err);
+            });
         },
         save_before_submit: async function (e) {
             let vm = this;
diff --git a/boranga/frontend/boranga/src/components/internal/conservation_status/back_to_assessor.vue b/boranga/frontend/boranga/src/components/internal/conservation_status/back_to_assessor.vue
new file mode 100644
index 00000000..f27038fa
--- /dev/null
+++ b/boranga/frontend/boranga/src/components/internal/conservation_status/back_to_assessor.vue
@@ -0,0 +1,103 @@
+<template lang="html">
+    <div id="internal-conservation-status-proposal-back-to-assessor">
+        <modal id="myModal" transition="modal fade" @ok="ok()" @cancel="close()"
+            :title="`Send CS${conservation_status_id} Back to Assessor`" okText="Back to Assessor" large>
+            <div class="container-fluid">
+                <div class="row">
+                    <form class="form-horizontal needs-validation" id="back-to-assessor-form" name="back-to-assessor-form" novalidate>
+                        <alert v-if="errors" type="danger"><strong>{{ errors }}</strong></alert>
+                        <div class="col-sm-12">
+                            <div class="row mb-3">
+                                <div class="col">
+                                    <div class="form-group">
+                                        <label class="control-label mb-3" for="Name">Reason / Comments</label>
+                                        <textarea class="form-control" name="approver_comment" ref="approver_comment"
+                                            required v-model="approver_comment"></textarea>
+                                        <div class="invalid-feedback">
+                                            Please enter the reason for sending the Conservation Status Proposal back to the Assessor.
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </modal>
+    </div>
+</template>
+
+<script>
+import modal from '@vue-utils/bootstrap-modal.vue'
+import alert from '@vue-utils/alert.vue'
+import { helpers, api_endpoints } from "@/utils/hooks.js"
+
+export default {
+    name: 'back-to-assessor',
+    components: {
+        modal,
+        alert,
+    },
+    props: {
+        conservation_status_id: {
+            type: Number,
+        },
+    },
+    data: function () {
+        return {
+            approver_comment: null,
+            isModalOpen: false,
+            errors: null,
+        }
+    },
+    emits: ['refreshFromResponse'],
+    watch: {
+        isModalOpen: function (val) {
+            if (val) {
+                this.$nextTick(() => {
+                    $(this.$refs.approver_comment).focus();
+                });
+            }
+        }
+    },
+    methods: {
+        ok: function () {
+            let vm = this;
+            var form = document.getElementById('back-to-assessor-form');
+            if (form.checkValidity()) {
+                vm.backToAssessor();
+            } else {
+                form.classList.add('was-validated');
+                $('#back-to-assessor-form').find(':invalid').first().focus();
+            }
+            return false;
+        },
+        close: function () {
+            this.approver_comment = null;
+            this.errors = null;
+            this.isModalOpen = false;
+        },
+        backToAssessor: function () {
+            let vm = this;
+            vm.errors = null;
+            let data = { 'status': 'with_assessor', 'approver_comment': vm.approver_comment }
+            vm.$http.post(helpers.add_endpoint_json(api_endpoints.conservation_status, (vm.conservation_status_id + '/switch_status')), JSON.stringify(data), {
+                emulateJSON: true,
+            })
+                .then((response) => {
+                    vm.$emit('refreshFromResponse', response);
+                    this.close();
+                }, (error) => {
+                    swal.fire({
+                        title: 'Application Error',
+                        text: helpers.apiVueResourceError(error),
+                        icon: 'error',
+                        customClass: {
+                            confirmButton: 'btn btn-primary',
+                        },
+                    });
+                });
+        },
+    },
+}
+</script>
diff --git a/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue b/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
index 316857b0..3ffa6c38 100644
--- a/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
+++ b/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
@@ -27,7 +27,8 @@
                                     <div class="form-group">
                                         <template
                                             v-if="['Ready For Agenda', 'With Approver', 'Unlocked', 'Approved', 'Closed', 'DeListed'].includes(conservation_status_obj.processing_status)">
-                                            <select ref="assigned_officer" :disabled="!canAction || canLock" class="form-control"
+                                            <select ref="assigned_officer" :disabled="!canAction || canLock"
+                                                class="form-control"
                                                 v-model="conservation_status_obj.assigned_approver">
                                                 <option v-for="member in conservation_status_obj.allowed_assessors"
                                                     :value="member.id">{{ member.first_name }} {{ member.last_name }}
@@ -198,7 +199,6 @@
                                 </div>
                             </div>
                         </div>
-
                         <div v-if="show_finalised_actions" class="card-body border-top">
                             <div class="row">
                                 <div class="col-sm-12 top-buffer-s">
@@ -272,34 +272,12 @@
                                             </div>
                                         </div>
                                     </template>
-                                    <template v-if="conservation_status_obj.processing_status == 'Ready For Agenda'">
-                                        <div class="row" v-if="conservation_status_obj.approval_level == 'minister'">
-                                            <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary top-buffer-s"
-                                                    @click.prevent="declineProposal()">Decline</button><br />
-                                            </div>
-                                        </div>
-                                        <div class="row" v-if="conservation_status_obj.approval_level == 'minister'">
-                                            <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary top-buffer-s"
-                                                    @click.prevent="issueProposal()">Approve</button><br />
-                                            </div>
-                                        </div>
-                                    </template>
                                     <template
-                                        v-else-if="conservation_status_obj.processing_status == 'Ready For Agenda'">
-                                        <div class="row">
-                                            <div class="col-sm-12">
-                                                <label class="control-label pull-left" for="Name">Approver
-                                                    Comments</label>
-                                                <textarea class="form-control" name="name"
-                                                    v-model="approver_comment"></textarea><br>
-                                            </div>
-                                        </div>
+                                        v-if="conservation_status_obj.processing_status == 'Ready For Agenda' && conservation_status_obj.approval_level == 'minister'">
                                         <div class="row">
                                             <div class="col-sm-12">
                                                 <button style="width:90%;" class="btn btn-primary"
-                                                    @click.prevent="switchStatus('with_assessor')">Back To
+                                                    @click.prevent="backToAssessor">Back To
                                                     Assessor</button><br />
                                             </div>
                                         </div>
@@ -422,6 +400,10 @@
         </div>
         <AmendmentRequest ref="amendment_request" :conservation_status_id="conservation_status_obj.id"
             @refreshFromResponse="refreshFromResponse"></AmendmentRequest>
+        <BackToAssessor ref="back_to_assessor_modal" :conservation_status_id="conservation_status_obj.id"
+            @refreshFromResponse="refreshFromResponse"></BackToAssessor>
+        <ProposeReadyForAgenda ref="propose_ready_for_agenda_modal" :conservation_status_id="conservation_status_obj.id"
+            @refreshFromResponse="refreshFromResponse"></ProposeReadyForAgenda>
         <ProposedDecline ref="proposed_decline" :processing_status="conservation_status_obj.processing_status"
             :conservation_status_id="conservation_status_obj.id" @refreshFromResponse="refreshFromResponse">
         </ProposedDecline>
@@ -441,6 +423,8 @@ import datatable from '@vue-utils/datatable.vue'
 import CommsLogs from '@common-utils/comms_logs.vue'
 import Submission from '@common-utils/submission.vue'
 import AmendmentRequest from './amendment_request.vue'
+import BackToAssessor from './back_to_assessor.vue'
+import ProposeReadyForAgenda from './propose_ready_for_agenda.vue'
 import ProposedDecline from './proposal_proposed_decline'
 import ProposeDelist from './proposal_propose_delist'
 import ProposedApproval from './proposed_issuance.vue'
@@ -473,7 +457,6 @@ export default {
             approver_comment: '',
             sendingReferral: false,
             changingStatus: false,
-            proposeReadyForAgenda: false,
             external_referee_email: '',
             DATE_TIME_FORMAT: 'DD/MM/YYYY HH:mm:ss',
             comms_url: helpers.add_endpoint_json(api_endpoints.conservation_status, vm.$route.params.conservation_status_id + '/comms_log'),
@@ -490,6 +473,8 @@ export default {
         Submission,
         ProposalConservationStatus,
         AmendmentRequest,
+        BackToAssessor,
+        ProposeReadyForAgenda,
         CSMoreReferrals,
         ProposedDecline,
         ProposeDelist,
@@ -723,19 +708,10 @@ export default {
             this.$refs.amendment_request.isModalOpen = true;
         },
         proposedReadyForAgenda: function () {
-            let vm = this;
             if (!this.validateConservationStatus()) {
                 return;
             }
-            vm.proposeReadyForAgenda = true;
-            vm.$http.post(helpers.add_endpoint_json(api_endpoints.conservation_status, vm.conservation_status_obj.id + '/proposed_ready_for_agenda')).then((response) => {
-                vm.proposeReadyForAgenda = false;
-                vm.$router.push({ path: '/internal/conservation-status/' }); //Navigate to dashboard page after Propose issue.
-            }, (error) => {
-                vm.errors = true;
-                vm.proposeReadyForAgenda = false;
-                vm.errorString = helpers.apiVueResourceError(error);
-            });
+            this.$refs.propose_ready_for_agenda_modal.isModalOpen = true;
         },
         proposeDelist: function () {
             this.$refs.propose_delist.isModalOpen = true;
@@ -1035,8 +1011,8 @@ export default {
             vm.original_conservation_status_obj = helpers.copyObject(response.body);
             vm.conservation_status_obj = helpers.copyObject(response.body);
             vm.$nextTick(() => {
-                vm.initialiseAssignedOfficerSelect(true);
-                vm.updateAssignedOfficerSelect();
+                vm.initialisedSelects = false;
+                vm.initialiseSelects();
             });
         },
         assignTo: function () {
@@ -1426,6 +1402,9 @@ export default {
                     });
                 });
         },
+        backToAssessor: function () {
+            this.$refs.back_to_assessor_modal.isModalOpen = true;
+        },
         switchStatus: function (status) {
             let vm = this;
             if (vm.conservation_status_obj.processing_status == 'With Approver' && status == 'with_assessor') {
diff --git a/boranga/frontend/boranga/src/components/internal/conservation_status/propose_ready_for_agenda.vue b/boranga/frontend/boranga/src/components/internal/conservation_status/propose_ready_for_agenda.vue
new file mode 100644
index 00000000..2b5d2157
--- /dev/null
+++ b/boranga/frontend/boranga/src/components/internal/conservation_status/propose_ready_for_agenda.vue
@@ -0,0 +1,93 @@
+<template lang="html">
+    <div id="internal-conservation-status-proposal-propose-ready-for-agenda">
+        <modal id="myModal" transition="modal fade" @ok="ok()" @cancel="close()"
+            :title="`Propose CS${conservation_status_id} Ready for Agenda`" okText="Ready for Agenda" large>
+            <div class="container-fluid">
+                <div class="row">
+                    <form class="form-horizontal needs-validation" id="propose-ready-for-agenda-form"
+                        name="propose-ready-for-agenda-form" novalidate>
+                        <alert v-if="errors" type="danger"><strong>{{ errors }}</strong></alert>
+                        <div class="col-sm-12">
+                            <div class="row mb-3">
+                                <div class="col">
+                                    <div class="form-group">
+                                        <label class="control-label mb-3" for="Name">Recommended Action (Decline or
+                                            Approve) / Comments</label>
+                                        <textarea class="form-control" name="assessor_comment" ref="assessor_comment"
+                                            required v-model="assessor_comment"></textarea>
+                                        <div class="invalid-feedback">
+                                            Please enter your recommended action and any other comments.
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </modal>
+    </div>
+</template>
+
+<script>
+import modal from '@vue-utils/bootstrap-modal.vue'
+import alert from '@vue-utils/alert.vue'
+import { helpers, api_endpoints } from "@/utils/hooks.js"
+
+export default {
+    name: 'ProposeReadyForAgenda',
+    components: {
+        modal,
+        alert,
+    },
+    props: {
+        conservation_status_id: {
+            type: Number,
+        },
+    },
+    data: function () {
+        return {
+            assessor_comment: null,
+            isModalOpen: false,
+            errors: null,
+        }
+    },
+    emits: ['refreshFromResponse'],
+    watch: {
+        isModalOpen: function (val) {
+            if (val) {
+                this.$nextTick(() => {
+                    $(this.$refs.assessor_comment).focus();
+                });
+            }
+        }
+    },
+    methods: {
+        ok: function () {
+            let vm = this;
+            var form = document.getElementById('propose-ready-for-agenda-form');
+            if (form.checkValidity()) {
+                vm.proposeReadyForAgenda();
+            } else {
+                form.classList.add('was-validated');
+                $('#propose-ready-for-agenda-form').find(':invalid').first().focus();
+            }
+            return false;
+        },
+        close: function () {
+            this.assessor_comment = null;
+            this.errors = null;
+            this.isModalOpen = false;
+        },
+        proposeReadyForAgenda: function () {
+            let vm = this;
+            vm.$http.post(helpers.add_endpoint_json(api_endpoints.conservation_status, vm.conservation_status_id + '/proposed_ready_for_agenda'), { 'assessor_comment': vm.assessor_comment }).then((response) => {
+                vm.$router.push({ path: '/internal/conservation-status/' }); //Navigate to dashboard page after Propose issue.
+            }, (error) => {
+                vm.errors = true;
+                vm.errorString = helpers.apiVueResourceError(error);
+            });
+        }
+    },
+}
+</script>
diff --git a/boranga/frontend/boranga/src/components/internal/meetings/meeting.vue b/boranga/frontend/boranga/src/components/internal/meetings/meeting.vue
index f9712881..c624c661 100644
--- a/boranga/frontend/boranga/src/components/internal/meetings/meeting.vue
+++ b/boranga/frontend/boranga/src/components/internal/meetings/meeting.vue
@@ -372,9 +372,6 @@ export default {
                     blank_fields.push('Please select at least two committee members who will be attending');
                 }
             }
-            if (vm.$refs.cs_queue.$refs.cs_queue_datatable.vmDataTable.rows().count() == 0) {
-                blank_fields.push(' Please add at least one Agenda record')
-            }
             if (vm.meeting_obj.location_id == null || vm.meeting_obj.location_id == '') {
                 blank_fields.push(' Please select Location')
             }
diff --git a/boranga/frontend/boranga/src/components/internal/occurrence/bulk_import.vue b/boranga/frontend/boranga/src/components/internal/occurrence/bulk_import.vue
index e4710e9a..6e836439 100644
--- a/boranga/frontend/boranga/src/components/internal/occurrence/bulk_import.vue
+++ b/boranga/frontend/boranga/src/components/internal/occurrence/bulk_import.vue
@@ -15,50 +15,69 @@
                     <div class="card">
                         <div class="card-body">
                             <form id="bulk-import-form" class="needs-validation" no-validate>
-                                <div class="mb-3">
+                                <div v-if="schema_versions" class="mb-3">
                                     <label for="schema-version" class="form-label"><span class="fw-bold">Step 1:
                                         </span>Select the bulk import schema version to use:</label>
                                     <select class="form-select text-secondary w-50" id="schema-version"
-                                        ref="schema-version" v-model="selected_schema_version"
+                                        ref="schema-version" v-model="selected_schema"
                                         aria-label="Select Schema Version" @change="resetFileField">
                                         <option :value="null" selected>Select Bulk Import Schema Version</option>
                                         <option v-for="schema_version in schema_versions" :value="schema_version">{{
                                             getSchemaVersionText(schema_version) }}</option>
                                     </select>
                                 </div>
+                                <div v-else class="spinner-border text-primary" role="status">
+                                    <span class="visually-hidden">Loading...</span>
+                                </div>
                                 <div v-if="selected_schema_version" class="border-top mb-3 pt-2">
                                     <label for="schema-version" class="form-label"><span class="fw-bold">Step 2:
                                         </span>Make sure your import file matches the schema:</label>
-                                    <div>
-                                        <table class="table table-sm table-bordered">
+                                    <div class="table-responsive mb-2">
+                                        <table class="table table-sm table-bordered custom-table">
                                             <thead>
                                                 <tr>
                                                     <th v-for="column in selected_schema_version.columns" scope="col">{{
-                                                        column.xlsx_column_header_name }}</th>
+                                                        column.xlsx_column_header_name }} <span class="text-danger"
+                                                            title="Mandatory Column"
+                                                            v-if="column.xlsx_data_validation_allow_blank == false">*</span>
+                                                    </th>
                                                 </tr>
                                             </thead>
                                             <tbody>
                                                 <tr>
-                                                    <td v-for="column in selected_schema_version.columns">{{
-                                                        column.xlsx_data_validation_type ?
-                                                            column.xlsx_data_validation_type : 'None' }}</td>
+                                                    <td v-for="column in selected_schema_version.columns">
+                                                        <i class="bi bi-info-circle-fill text-primary" role="button"
+                                                            data-bs-toggle="popover" data-bs-placement="bottom"
+                                                            title="Column Information" :data-bs-html="true"
+                                                            :data-bs-content="columnInformation(column)"></i>
+                                                    </td>
                                                 </tr>
                                             </tbody>
                                         </table>
                                     </div>
                                     <div>
-                                        <a :href="`/api/occurrence_report_bulk_import_schemas/${selected_schema_version.id}/preview_import_file/`"
+                                        <a :href="`/api/occurrence_report_bulk_import_schemas/${selected_schema_version.id}/preview_import_file/?updated=${selected_schema_version.datetime_updated}`"
                                             class="btn btn-primary" target="_blank"><i class="bi bi-filetype-xlsx"></i>
                                             Download Preview Bulk Import File</a>
                                     </div>
                                 </div>
                                 <div v-if="selected_schema_version" class="border-top w-75 mb-3 pt-2">
                                     <label for="bulk-import-file" class="form-label"><span class="fw-bold">Step 3:
+                                        </span> Select the .zip file containing any associated documents (Optional)</label>
+                                    <div class="input-group">
+                                        <input type="file" class="form-control text-secondary"
+                                            id="bulk-import-associated-files-zip"
+                                            ref="bulk-import-associated-files-zip"
+                                            accept=".zip">
+                                    </div>
+                                </div>
+                                <div v-if="selected_schema_version" class="border-top w-75 mb-3 pt-2">
+                                    <label for="bulk-import-file" class="form-label"><span class="fw-bold">Step 4:
                                         </span> Select the bulk import file (.xlsx)</label>
                                     <div class="input-group">
                                         <input type="file" class="form-control text-secondary"
                                             :class="importFileErrors ? 'is-invalid' : ''" id="bulk-import-file"
-                                            ref="bulk-import-file" aria-describedby="bulk-import-button"
+                                            ref="bulk-import-file"
                                             @change="bulkImportFileSelected"
                                             accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet">
                                         <div v-if="importFileErrors" class="invalid-feedback mt-3">
@@ -93,10 +112,12 @@
                                     <tbody class="text-muted">
                                         <tr v-for="queuedImport in queuedImports" class="">
                                             <td>{{ new Date(queuedImport.datetime_queued).toLocaleString() }}</td>
-                                            <td class="text-truncate" style="max-width: 350px;">{{
-                                                queuedImport.file_name }}</td>
+                                            <td class="text-truncate" style="max-width: 350px;"
+                                                :title="queuedImport.file_name">{{
+                                                    queuedImport.file_name }}</td>
                                             <td>{{ queuedImport.file_size_megabytes }} MB</td>
-                                            <td class="text-end pe-3">{{ queuedImport.rows ? queuedImport.rows : 'Not Counted' }}</td>
+                                            <td class="text-end pe-3">{{ queuedImport.rows ? queuedImport.rows : 'Not
+                                                Counted' }}</td>
                                             <td>{{ queuedImport.estimated_processing_time_human_readable }}</td>
                                         </tr>
                                     </tbody>
@@ -130,7 +151,9 @@
                                         <tr v-for="currentlyRunningImport in currentlyRunningImports" class="">
                                             <td>{{ new Date(currentlyRunningImport.datetime_started).toLocaleString() }}
                                             </td>
-                                            <td>{{ currentlyRunningImport.file_name }}</td>
+                                            <td class="text-truncate" style="max-width: 350px;"
+                                                :title="currentlyRunningImport.file_name">{{
+                                                    currentlyRunningImport.file_name }}</td>
                                             <td>{{ currentlyRunningImport.file_size_megabytes }} MB</td>
                                             <td style="min-width: 200px;">
                                                 <div class="progress">
@@ -170,8 +193,9 @@
                                         <tr v-for="failedImport in failedImports.results"
                                             :id="`failed-import-${failedImport.id}`" class="">
                                             <td>{{ new Date(failedImport.datetime_started).toLocaleString() }}</td>
-                                            <td class="text-truncate" style="max-width: 350px;">{{
-                                                failedImport.file_name }}</td>
+                                            <td class="text-truncate" style="max-width: 350px;"
+                                                :title="failedImport.file_name">{{
+                                                    failedImport.file_name }}</td>
                                             <td>{{ failedImport.file_size_megabytes }} MB</td>
                                             <td class="">{{ failedImport.rows ? failedImport.rows :
                                                 'Not Counted' }}</td>
@@ -226,7 +250,7 @@
                                                 Completed</th>
                                             <th scope="col"><i class="bi bi-filetype-xlsx text-success"></i> File Name
                                             </th>
-                                            <th scope="col"><i class="bi bi-list-ol text-success"></i> Records Imported
+                                            <th scope="col"><i class="bi bi-list-ol text-success"></i> Rows Processed
                                             </th>
                                             <th scope="col"><i class="bi bi-hourglass-bottom text-success"></i> Total
                                                 Time Taken</th>
@@ -237,8 +261,9 @@
                                         <tr v-for="completedImport in completedImports.results" class="">
                                             <td>{{ new Date(completedImport.datetime_completed).toLocaleString() }}
                                             </td>
-                                            <td class="text-truncate" style="max-width: 350px;">{{
-                                                completedImport.file_name }}</td>
+                                            <td class="text-truncate" style="max-width: 350px;"
+                                                :title="completedImport.file_name">{{
+                                                    completedImport.file_name }}</td>
                                             <td class="">{{ completedImport.rows_processed
                                                 }}</td>
                                             <td>{{ completedImport.total_time_taken_human_readable }}</td>
@@ -283,7 +308,8 @@ export default {
             timer: null,
             currentlyRunningTimer: null,
             selectedErrors: '',
-            schema_versions: [],
+            schema_versions: null,
+            selected_schema: null,
             selected_schema_version: null,
             importFileErrors: null
         }
@@ -298,12 +324,29 @@ export default {
     },
     methods: {
         getSchemaVersionText(schema_version) {
-            return `Version: ${schema_version.version} (Created: ${new Date(schema_version.datetime_created).toLocaleDateString()} ${new Date(schema_version.datetime_created).toLocaleTimeString()}, Updated: ${new Date(schema_version.datetime_updated).toLocaleDateString()} ${new Date(schema_version.datetime_updated).toLocaleTimeString()})`;
+            return `Version: ${schema_version.version} - ${schema_version.name ? schema_version.name : 'No Name'}`;
         },
         resetFileField() {
-            this.$nextTick(() => {
-                this.importFileErrors = null;
-                this.form.classList.remove('was-validated');
+            this.$http.get(`${api_endpoints.occurrence_report_bulk_import_schemas}${this.selected_schema.id}/`).then((response) => {
+                this.selected_schema_version = response.body;
+                this.$nextTick(() => {
+                    this.importFileErrors = null;
+                    this.form.classList.remove('was-validated');
+                    // Enable all bootstrap 5 popovers
+                    var popoverTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="popover"]'))
+                    var myDefaultAllowList = bootstrap.Tooltip.Default.allowList
+                    myDefaultAllowList.table = []
+                    myDefaultAllowList.tr = []
+                    myDefaultAllowList.td = []
+                    myDefaultAllowList.th = []
+                    myDefaultAllowList.thead = []
+                    myDefaultAllowList.tbody = []
+                    popoverTriggerList.map(function (popoverTriggerEl) {
+                        return bootstrap.Popover.getOrCreateInstance(popoverTriggerEl)
+                    });
+                });
+            }, (error) => {
+                console.log(error);
             });
         },
         bulkImportFileSelected(event) {
@@ -314,6 +357,10 @@ export default {
             const file = event.target.files[0];
             const formData = new FormData();
             formData.append('_file', file);
+            const associated_files = this.$refs['bulk-import-associated-files-zip'].files;
+            if(associated_files.length > 0) {
+                formData.append('_associated_files_zip', associated_files[0]);
+            }
             formData.append('schema_id', this.selected_schema_version.id);
 
             this.$http.post(api_endpoints.occurrence_report_bulk_imports, formData).then((response) => {
@@ -322,6 +369,7 @@ export default {
                     this.importFileErrors = null;
                     this.form.classList.remove('was-validated');
                     this.$refs['bulk-import-file'].value = '';
+                    this.$refs['bulk-import-associated-files-zip'].value = '';
                     swal.fire({
                         title: 'Bulk Import Added to Queue',
                         text: 'The bulk import of occurrence reports has been added to the queue for processing',
@@ -335,12 +383,14 @@ export default {
                 } else {
                     this.importFileErrors = response.body;
                     event.target.value = '';
+                    this.$refs['bulk-import-associated-files-zip'].value = '';
                     this.$refs['bulk-import-file'].setCustomValidity('Invalid field');
                     this.form.classList.add('was-validated');
                 }
             }, (error) => {
                 this.importFileErrors = error.body;
                 event.target.value = '';
+                this.$refs['bulk-import-associated-files-zip'].value = '';
                 this.$refs['bulk-import-file'].setCustomValidity('Invalid field');
                 this.form.classList.add('was-validated');
                 console.log(error.body);
@@ -371,23 +421,26 @@ export default {
             }, (error) => {
                 console.log(error);
             });
+        },
+        async fetchSchema() {
+
         },
         fetchQueuedImports() {
-            this.$http.get(`${api_endpoints.occurrence_report_bulk_imports}?processing_status=queued`).then((response) => {
+            this.$http.get(`${api_endpoints.occurrence_report_bulk_imports}?processing_status=queued&schema__group_type__name=${this.$route.query.group_type}`).then((response) => {
                 this.queuedImports = response.body.results;
             }, (error) => {
                 console.log(error);
             });
         },
         fetchCurrentlyRunningImports() {
-            this.$http.get(`${api_endpoints.occurrence_report_bulk_imports}?processing_status=started`).then((response) => {
+            this.$http.get(`${api_endpoints.occurrence_report_bulk_imports}?processing_status=started&schema__group_type__name=${this.$route.query.group_type}`).then((response) => {
                 this.currentlyRunningImports = response.body.results;
             }, (error) => {
                 console.log(error);
             });
         },
         fetchFailedImports() {
-            this.$http.get(`${api_endpoints.occurrence_report_bulk_imports}?processing_status=failed&limit=${this.failedImportsLimit}&ordering=-datetime_started`).then((response) => {
+            this.$http.get(`${api_endpoints.occurrence_report_bulk_imports}?processing_status=failed&schema__group_type__name=${this.$route.query.group_type}&limit=${this.failedImportsLimit}&ordering=-datetime_started`).then((response) => {
                 this.failedImports = response.body;
             }, (error) => {
                 console.log(error);
@@ -398,7 +451,7 @@ export default {
             this.fetchFailedImports();
         },
         fetchCompletedImports() {
-            this.$http.get(`${api_endpoints.occurrence_report_bulk_imports}?processing_status=completed&limit=${this.completedImportsLimit}`).then((response) => {
+            this.$http.get(`${api_endpoints.occurrence_report_bulk_imports}?processing_status=completed&schema__group_type__name=${this.$route.query.group_type}&limit=${this.completedImportsLimit}&ordering=-datetime_completed`).then((response) => {
                 this.completedImports = response.body;
             }, (error) => {
                 console.log(error);
@@ -443,7 +496,7 @@ export default {
                         this.completedImports = this.completedImports.results.filter((completedImport) => {
                             return completedImport.id !== bulkImportTaskId;
                         });
-                        this.fetchQueuedImports();
+                        this.fetchCompletedImports();
                     }, (error) => {
                         console.log(error);
                     });
@@ -455,6 +508,43 @@ export default {
             this.fetchQueuedImports();
             this.fetchFailedImports();
             this.fetchCompletedImports();
+        },
+        columnInformation(column) {
+            let html = '<table class="table table-sm table-striped">'
+            html += `<tr><th>Column Name</th><td>${column.xlsx_column_header_name}</td></tr>`
+            html += `<tr><th>Django Model Name</th><td class="text-capitalize">${column.model_name}</td></tr>`
+            html += `<tr><th>Django Field Name</th><td>${column.django_import_field_name}</td></tr>`
+            html += `<tr><th>Django Field Type</th><td>${column.field_type}</td></tr>`
+            html += `<tr><th>Allow Blank</th><td>${column.xlsx_data_validation_allow_blank ? 'Yes' : 'No'}</td></tr>`
+            if ('textLength' == column.xlsx_validation_type) {
+                html += `<tr><th>Maximum Text Length</th><td>${column.text_length}</td></tr>`
+            }
+            if (column.xlsx_validation_type) {
+                html += `<tr><th>Validation Type${column.requires_lookup_field ? ' (Django)' : ` (.xlsx)`}</th><td>${column.xlsx_validation_type}</td></tr>`
+            }
+            if ('list' == column.xlsx_validation_type) {
+                if (column.choices && column.choices.length > 0) {
+                    html += '<tr><th class="align-top">Choices</th><td>';
+                    for (let choice of column.choices) {
+                        html += `${choice[1]}<br>`
+                    }
+                    html += '</td></tr>';
+                } else {
+                    if (column.requires_lookup_field) {
+                        html += `<tr><th>Lookup Field</th><td>${column.django_lookup_field_name}</td></tr>`
+                        if (column.lookup_filters && column.lookup_filters.length > 0) {
+                            html += `<tr><th>Lookup Filters</th><td>`
+                            for (let lookupFilter of column.lookup_filters) {
+                                html += `<div>Field: ${lookupFilter.filter_field_name}, Filter Type: ${lookupFilter.filter_type}, Value: ${lookupFilter.values[0].filter_value}</div>`
+                            }
+                            html += '</td></tr>'
+                        }
+                        html += `<tr><th>Preview Choices (.xlsx)</th><td><a class="ms-0 ps-0" href="/api/occurrence_report_bulk_import_schema_columns/${column.id}/preview_foreign_key_values_xlsx/">Preview ${column.filtered_foreign_key_count} Choices</a></td></tr>`
+                    }
+                }
+            }
+            html += '</table>'
+            return html;
         }
     },
     created() {
@@ -478,6 +568,11 @@ export default {
 }
 </script>
 <style scoped>
+table.custom-table th,
+td {
+    white-space: nowrap;
+}
+
 div.currently-running {
     border-color: rgba(34, 111, 187, 1);
     animation: border-pulsate 1s infinite;
diff --git a/boranga/frontend/boranga/src/components/internal/occurrence/bulk_import_schema.vue b/boranga/frontend/boranga/src/components/internal/occurrence/bulk_import_schema.vue
index 63d9e40d..2734e755 100644
--- a/boranga/frontend/boranga/src/components/internal/occurrence/bulk_import_schema.vue
+++ b/boranga/frontend/boranga/src/components/internal/occurrence/bulk_import_schema.vue
@@ -15,63 +15,90 @@
         </div>
         <div v-if="schema" class="row mb-3">
             <div class="col">
-                <div class="card">
-                    <div class="card-body">
-                        <div class="border-bottom pb-3 mb-3">
-                            <div class="row">
-                                <div class="col-5">
-                                    <h4 class="text-capitalize">{{ schema.group_type_display }} Bulk Import
-                                        Schema <span class="badge bg-secondary ms-3">Version: {{ schema.version
-                                            }}</span></h4>
-                                </div>
-                                <div class="col-7">
-                                    <div class="input-group float-start me-3" style="width:250px;">
-                                        <span class="input-group-text" id="basic-addon1"><i
-                                                class="bi bi-tag-fill text-secondary"></i></span>
-                                        <input type="text" class="form-control form-control-sm" placeholder="Add tag"
-                                            @keydown="addTag" />
-                                    </div>
-                                    <div class="float-end">
-                                        <button role="button" class="btn btn-primary me-2"
-                                            @click.prevent="validateSchema()"><i class="bi bi-card-checklist me-1"></i>
-                                            Validate Schema</button>
-                                        <a role="button" class="btn btn-primary"
-                                            :href="`http://internalhost:9060/api/occurrence_report_bulk_import_schemas/${schema.id}/preview_import_file/`"><i
-                                                class="bi bi-filetype-xlsx me-1"></i> Preview .xlsx File</a>
+                <form>
+                    <fieldset id="main-schema-fieldset" :class="!schema.can_user_edit ? 'disabled' : ''">
+                        <div class="card">
+                            <div class="card-body">
+                                <div class="border-bottom pb-3 mb-3">
+                                    <div class="row">
+                                        <div class="col-5">
+                                            <h4 class="text-capitalize">{{ schema.group_type_display }} Bulk Import
+                                                Schema <span class="badge bg-secondary ms-3">V{{ schema.version
+                                                    }}</span></h4>
+                                        </div>
+                                        <div class="col-7">
+                                            <div class="input-group float-start me-3" style="width:250px;">
+                                                <span class="input-group-text" id="basic-addon1"><i
+                                                        class="bi bi-tag-fill text-secondary"></i></span>
+                                                <input type="text" class="form-control form-control-sm"
+                                                    placeholder="Add tag" @keydown="addTag" />
+                                            </div>
+                                            <div class="float-end">
+                                                <button type="button" id="copy-schema" class="btn btn-primary me-2"
+                                                    :disabled="false" @click.prevent="copySchema(schema.id)"><i
+                                                        class="bi bi-copy me-2"></i>
+                                                    Copy</button>
+                                                <button type="button" class="btn btn-primary me-2"
+                                                    @click.prevent="validate()"><i
+                                                        class="bi bi-card-checklist me-1"></i>
+                                                    Validate</button>
+                                                <a role="button" class="btn btn-primary"
+                                                    :href="`/api/occurrence_report_bulk_import_schemas/${schema.id}/preview_import_file/?updated=${schema.datetime_updated}`"><i
+                                                        class="bi bi-filetype-xlsx me-1"></i> Preview</a>
 
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                        </div>
-                        <div class="">
-                            <div class="row align-items-center">
-                                <label for="schema-name" class="col-sm-1 col-form-label">Name</label>
-                                <div class="col-sm-4">
-                                    <input type="text" class="form-control" id="schema-name" ref="schema-name"
-                                        v-model="schema.name" aria-describedby="schema-name-help"
-                                        placeholder="Enter Schema Name" autofocus>
+                                <div class="border-bottom pb-3 mb-2">
+                                    <div class="row align-items-center">
+                                        <label for="schema-name" class="col-sm-1 col-form-label">Name</label>
+                                        <div class="col-sm-7">
+                                            <input type="text" class="form-control" id="schema-name" ref="schema-name"
+                                                v-model="schema.name" placeholder="Enter Schema Name" autofocus>
+                                        </div>
+                                    </div>
                                 </div>
-                                <label for="schema-tags" class="col-sm-1 col-form-label">Tags</label>
-                                <div class="col-sm-6">
-                                    <template v-if="schema.tags && schema.tags.length > 0">
-                                        <span class="d-inline-flex align-items-center badge bg-info fs-6 my-2 me-2"
-                                            v-for="(tag, index) in schema.tags" :key="tag">{{ tag }}<i
-                                                class="bi bi-x-circle-fill ps-2" role="button"
-                                                @click="removeTag(index)"></i></span>
-                                    </template>
-                                    <template v-else>
-                                        <span class="text-muted">No tags added</span>
-                                    </template>
+                                <div class="pb-0 mb-0">
+                                    <div class="row align-items-center">
+                                        <template>
+                                            <label for="schema-name" class="col-sm-2 col-form-label">Master Schema<i
+                                                    class="bi bi-lock-fill text-warning ms-2"
+                                                    title="This is a Master Schema. When copied by an Occurrence Approver, any columns from the master will be locked."
+                                                    v-if="schema.is_master"></i></label>
+                                            <div v-if="schema.can_user_toggle_master" class="col-sm-1">
+                                                <div class="form-check form-switch form-switch-lg"
+                                                    style="transform: scale(1.3);">
+                                                    <input class="form-check-input" type="checkbox"
+                                                        id="is-master-schema" v-model="schema.is_master"
+                                                        @change="save()">
+                                                </div>
+                                            </div>
+                                        </template>
+                                        <label for="schema-tags" class="col-sm-1 col-form-label">Tags</label>
+                                        <div class="col-sm-6">
+                                            <template v-if="schema.tags && schema.tags.length > 0">
+                                                <span
+                                                    class="d-inline-flex align-items-center badge bg-info fs-6 my-2 me-2"
+                                                    v-for="(tag, index) in schema.tags" :key="tag">{{ tag }}<i
+                                                        v-if="schema.can_user_edit" class="bi bi-x-circle-fill ps-2"
+                                                        role="button" @click="removeTag(index)"></i></span>
+                                            </template>
+                                            <template v-else>
+                                                <span class="text-muted">No tags added</span>
+                                            </template>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div v-if="errors" class="mb-3">
+                                    <alert type="danger">
+                                        {{ errors }}
+                                    </alert>
                                 </div>
                             </div>
                         </div>
-                        <div v-if="errors" class="mb-3">
-                            <alert type="danger">
-                                {{ errors }}
-                            </alert>
-                        </div>
-                    </div>
-                </div>
+                    </fieldset>
+                </form>
             </div>
         </div>
         <div v-if="schema" class="row">
@@ -83,28 +110,41 @@
                             <span class="text-muted ms-2 fs-6">(.xlsx)</span>
                         </h5>
                         <div class="">
-                            <table class="table table-bordered table-hover table-sm">
+                            <table class="table table-hover table-sm table-schema">
                                 <tbody class="columns">
                                     <tr v-for="(column, index) in schema.columns"
-                                        :class="selectedColumn == column ? 'active' : ''" @click="selectColumn(column)"
+                                        :class="classesForRow(index, column, selectedColumn)"
+                                        @click="selectColumn(column)"
+                                        :style="selectedColumn == column ? '' : `background-color:${stringToRGBAColor(column.model_name)};`"
                                         role="button" :key="column.id">
-                                        <th style="width:5%" class="text-center">{{ index +
-                                            1 }}
-                                        </th>
-                                        <th class="ps-3" style="font-size:0.9em; width:40%">
-                                            <span class="text-truncate pe-1">{{
-                                                column.xlsx_column_header_name }}</span>
+                                        <td style="width:5%" class="text-center fw-bold"
+                                            :class="selectedColumn == column ? 'text-light' : ''">{{ index +
+                                                1 }}
+                                        </td>
+                                        <td class="ps-3 fw-bold" style="font-size:0.9em; width:40%"
+                                            :class="selectedColumn == column ? 'py-1' : ''">
+                                            <span class="text-truncate pe-1"
+                                                :class="selectedColumn == column ? 'text-light' : ''">{{
+                                                    column.xlsx_column_header_name }}</span>
                                             <span class="text-danger" title="Mandatory Column"
                                                 v-if="column.xlsx_data_validation_allow_blank == false">*</span>
-                                        </th>
-                                        <td class="text-muted text-center" style="width:10%">
+                                            <small class="d-block text-capitalize mb-0"
+                                                :class="selectedColumn == column ? 'text-light' : 'text-muted'">
+                                                {{ column.model_name }}
+                                            </small>
+                                        </td>
+                                        <td class="text-center"
+                                            :class="selectedColumn == column ? 'text-light' : 'text-muted'"
+                                            style="width:10%">
                                             <i class="bi bi-eye-fill " role="button"
-                                                :class="index == 0 || schema.columns.length <= 2 || !column.id ? 'me-4' : 'me-2'"></i>
-                                            <i v-if="!index == 0 && schema.columns.length > 2 && column.id"
+                                                :class="schema.can_user_edit && column.is_editable_by_user && (index == 0 || schema.columns.length <= 2 || !column.id) ? 'me-4' : 'me-2'"></i>
+                                            <i v-if="schema.can_user_edit && column.is_editable_by_user && (!index == 0 && schema.columns.length > 2 && column.id)"
                                                 class="bi bi-arrow-down-up" role="button" style="cursor:move;"></i>
+                                            <i v-if="column.id && !column.is_editable_by_user" class="bi bi-lock-fill"
+                                                :title="`Column ${column.xlsx_column_header_name} is locked as it was copied from a master schema`"></i>
                                         </td>
                                     </tr>
-                                    <tr class="border-bottom-0"
+                                    <tr v-if="schema.can_user_edit" class="border-bottom-0"
                                         :class="schema.columns.length == 0 ? 'border-top-0' : ''"
                                         @click.prevent="addNewColumn" role="button">
                                         <th class="border-0 ps-3 pt-2 text-muted" colspan="2">Add <template
@@ -123,265 +163,312 @@
             <div class="col-8">
                 <div v-if="addEditMode && selectedColumn" class="card sticky-top">
                     <div class="card-body">
-                        <h5 class="card-title border-bottom pb-2 mb-3">
+                        <h5 class="card-title border-bottom pb-3 mb-3">
                             Selected Column Details
                         </h5>
                         <form @submit.prevent="" class="needs-validation" novalidate>
-                            <div class="row d-flex align-items-center mb-2">
-                                <label for="inputEmail3" class="col-sm-4 col-form-label">Django Import
-                                    Model</label>
-                                <div class="col-sm-8 ">
-                                    <select class="form-select form-select-sm" aria-label="Django Import Model"
-                                        ref="django-import-model" v-model="selectedColumn.django_import_content_type"
-                                        :disabled="selectedColumn.order == 0" @change="selectDjangoImportContentType">
-                                        <option value="">Select Django Import Model
-                                        </option>
-                                        <template v-if="selectedColumn.id">
-                                            <option v-for="djangoContentType in djangoContentTypes"
-                                                :value="djangoContentType.id">{{
-                                                    djangoContentType.model_verbose_name }}
-                                            </option>
-                                        </template>
-                                        <template v-else>
-                                            <option v-for="djangoContentType in djangoContentTypesFiltered"
-                                                :value="djangoContentType.id">{{
-                                                    djangoContentType.model_verbose_name }}
-                                            </option>
-                                        </template>
-                                    </select>
-                                </div>
-                            </div>
-                            <div v-if="selectedContentType && !selectedColumn?.id && !showDjangoImportFieldSelect"
-                                class="row d-flex align-items-start mb-2">
-                                <label for="inputEmail3" class="col-sm-4 col-form-label">Operation</label>
-                                <div class="col-sm-8 ">
-                                    <button class="btn btn-primary btn-sm d-block mb-2"
-                                        @click.prevent="addAllColumns(false)"><i
-                                            class="bi bi-plus-circle-fill me-1"></i>
-                                        Add All Fields</button>
-                                    <button class="btn btn-primary btn-sm me-2 d-block mb-2"
-                                        @click.prevent="addAllColumns(true)"><i class="bi bi-plus-circle-fill me-1"></i>
-                                        Add All Mandatory Fields</button>
-                                    <button class="btn btn-primary btn-sm d-block" @click.prevent="addSingleColumn()"><i
-                                            class="bi bi-plus-circle-fill me-1"></i>
-                                        Add a Single Field</button>
-                                </div>
-                            </div>
-                            <div v-if="showDjangoImportFieldSelect" class="row d-flex align-items-center mb-2">
-                                <label for="inputEmail3" class="col-sm-4 col-form-label">Django Import
-                                    Field</label>
-                                <div class="col-sm-8 ">
-                                    <select class="form-select form-select-sm" aria-label="Django Import Field"
-                                        ref="django-import-field" v-model="selectedColumn.django_import_field_name"
-                                        :disabled="selectedColumn.order == 0" @change="selectDjangoImportField">
-                                        <option value="">Select Django Import Field
-                                        </option>
-                                        <template v-if="selectedColumn.id">
-                                            <option v-for="modelField in selectedContentType.model_fields"
-                                                :value="modelField.name">
-                                                {{
-                                                    modelField.display_name }} ({{
-                                                    modelField.type }}) <template v-if="!modelField.allow_null">*</template>
-                                            </option>
-                                        </template>
-                                        <template v-else>
-                                            <option v-for="modelField in djangoImportFieldsFiltered"
-                                                :value="modelField.name">
-                                                {{
-                                                    modelField.display_name }} ({{
-                                                    modelField.type }}) <template v-if="!modelField.allow_null">*</template>
-                                            </option>
-                                        </template>
-                                    </select>
-                                </div>
-                            </div>
-                            <template v-if="selectedField">
+                            <fieldset :disabled="!schema.can_user_edit || !selectedColumn.is_editable_by_user">
                                 <div class="row d-flex align-items-center mb-2">
-                                    <label for="column-name" class="col-sm-4 col-form-label">Column
-                                        Name</label>
+                                    <label for="inputEmail3" class="col-sm-4 col-form-label">Django Import
+                                        Model</label>
                                     <div class="col-sm-8 ">
-                                        <div class="input-group input-group-sm">
-                                            <input type="text" class="form-control" name="column-name" id="column-name"
-                                                ref="column-name" aria-describedby="helpId"
-                                                v-model="selectedColumn.xlsx_column_header_name" />
-                                        </div>
-                                    </div>
-                                </div>
-                                <div v-if="selectedField.type == 'IntegerField' && this.defaultValueChoices && this.defaultValueChoices.length > 0"
-                                    class="row d-flex align-items-center mb-2">
-                                    <label for="default-value" class="col-sm-4 col-form-label">Default
-                                        Value</label>
-                                    <div class="col-sm-8 ">
-                                        <div class="input-group input-group-sm">
-                                            <select class="form-select" v-model="selectedColumn.default_value"
-                                                id="default-value">
-                                                <option :value="null">No Default
+                                        <select class="form-select form-select-sm" aria-label="Django Import Model"
+                                            ref="django-import-model"
+                                            v-model="selectedColumn.django_import_content_type"
+                                            :disabled="selectedColumn.order == 0"
+                                            @change="selectDjangoImportContentType">
+                                            <option value="">Select Django Import Model
+                                            </option>
+                                            <template v-if="selectedColumn.id">
+                                                <option v-for="djangoContentType in djangoContentTypes"
+                                                    :value="djangoContentType.id">{{
+                                                        djangoContentType.model_verbose_name ?
+                                                            djangoContentType.model_verbose_name : djangoContentType.model }}
                                                 </option>
-                                                <option v-for="choice in defaultValueChoices" :value="choice[0]">{{
-                                                    choice[1] }}
+                                            </template>
+                                            <template v-else>
+                                                <option v-for="djangoContentType in djangoContentTypesFiltered"
+                                                    :value="djangoContentType.id">{{
+                                                        djangoContentType.model_verbose_name ?
+                                                            djangoContentType.model_verbose_name : djangoContentType.model }}
                                                 </option>
-                                            </select>
-                                        </div>
+                                            </template>
+                                        </select>
                                     </div>
                                 </div>
-                                <div class="row d-flex align-items-center mb-2">
-                                    <label for="inputEmail3" class="col-sm-4 col-form-label">Django
-                                        Field
-                                        Type</label>
+                                <div v-if="selectedContentType && !selectedColumn?.id && !showDjangoImportFieldSelect"
+                                    class="row d-flex align-items-start mb-2">
+                                    <label for="inputEmail3" class="col-sm-4 col-form-label">Operation</label>
                                     <div class="col-sm-8 ">
-                                        <div class="input-group input-group-sm">
-                                            <input type="text" class="form-control" name="" id=""
-                                                aria-describedby="helpId" placeholder="" disabled
-                                                :value="selectedField.type" />
-                                        </div>
+                                        <button type="button" class="btn btn-primary btn-sm d-block mb-2"
+                                            @click.prevent="addAllColumns(false)"><i
+                                                class="bi bi-plus-circle-fill me-1"></i>
+                                            Add All Fields</button>
+                                        <button type="button" class="btn btn-primary btn-sm me-2 d-block mb-2"
+                                            @click.prevent="addAllColumns(true)"><i
+                                                class="bi bi-plus-circle-fill me-1"></i>
+                                            Add All Mandatory Fields</button>
+                                        <button type="button" class="btn btn-primary btn-sm d-block"
+                                            @click.prevent="addSingleColumn()"><i
+                                                class="bi bi-plus-circle-fill me-1"></i>
+                                            Add a Single Field</button>
                                     </div>
                                 </div>
-                                <div class="row d-flex align-items-center mb-2">
-                                    <label for="inputEmail3" class="col-sm-4 col-form-label">Excel
-                                        Validation
-                                        Type</label>
+                                <div v-if="showDjangoImportFieldSelect" class="row d-flex align-items-center mb-2">
+                                    <label for="inputEmail3" class="col-sm-4 col-form-label">Django Import
+                                        Field</label>
                                     <div class="col-sm-8 ">
-                                        <div class="input-group input-group-sm">
-                                            <input type="text" class="form-control form-control-sm" name="" id=""
-                                                aria-describedby="helpId" placeholder="" disabled
-                                                :value="selectedField.xlsx_validation_type ? selectedField.xlsx_validation_type : 'None'" />
-                                            <template v-if="selectedField.xlsx_validation_type == 'date'">
-                                                <span class="input-group-text" id="datetime-format">Format:</span>
-                                                <span class="input-group-text" id="datetime-format-mask">DD/MM/YYYY
-                                                    HH:MM:SS</span>
+                                        <select class="form-select form-select-sm" aria-label="Django Import Field"
+                                            ref="django-import-field" v-model="selectedColumn.django_import_field_name"
+                                            :disabled="selectedColumn.order == 0" @change="selectDjangoImportField">
+                                            <option value="">Select Django Import Field
+                                            </option>
+                                            <template v-if="selectedColumn.id">
+                                                <option v-for="modelField in selectedContentType.model_fields"
+                                                    :value="modelField.name">
+                                                    {{
+                                                        modelField.display_name }} ({{
+                                                        modelField.type }}) <template
+                                                        v-if="!modelField.allow_null">*</template>
+                                                </option>
                                             </template>
-                                            <template
-                                                v-if="selectedField.xlsx_validation_type == 'list' && selectedField.choices && selectedField.choices.length > 0">
-                                                <button class="btn btn-primary" data-bs-toggle="modal"
-                                                    data-bs-target="#preview-choices"><i class="bi bi-search"
-                                                        role="button"></i> Preview
-                                                    List Choices</button>
-                                                <div class="modal fade" id="preview-choices" data-bs-backdrop="static"
-                                                    data-bs-keyboard="false" tabindex="-1"
-                                                    aria-labelledby="preview-choices-label" aria-hidden="true">
-                                                    <div class="modal-dialog">
-                                                        <div class="modal-content">
-                                                            <div class="modal-header">
-                                                                <h5 class="modal-title" id="preview-choices-label">
-                                                                    {{
-                                                                        selectedField.display_name
-                                                                    }} List
-                                                                    Choices
-                                                                </h5>
-                                                                <button type="button" class="btn-close"
-                                                                    data-bs-dismiss="modal" aria-label="Close"></button>
-                                                            </div>
-                                                            <div class="modal-body">
-                                                                <div class="table-responsive">
-                                                                    <table
-                                                                        class="table table-bordered table-hover table-sm">
-                                                                        <tbody>
-                                                                            <tr v-for="choice in selectedField.choices"
-                                                                                class="">
-                                                                                <td>{{
-                                                                                    choice[0]
-                                                                                    }}
-                                                                                </td>
-                                                                            </tr>
-                                                                        </tbody>
-                                                                    </table>
-                                                                </div>
-                                                            </div>
-                                                            <div class="modal-footer">
-                                                                <button type="button" class="btn btn-secondary"
-                                                                    data-bs-dismiss="modal">Close</button>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
+                                            <template v-else>
+                                                <option v-for="modelField in djangoImportFieldsFiltered"
+                                                    :value="modelField.name">
+                                                    {{
+                                                        modelField.display_name }} ({{
+                                                        modelField.type }}) <template
+                                                        v-if="!modelField.allow_null">*</template>
+                                                </option>
                                             </template>
-                                        </div>
+                                        </select>
                                     </div>
                                 </div>
-                                <div v-if="selectedField.xlsx_validation_type" class="row mb-2">
-                                    <label for="inputEmail3" class="col-sm-4 col-form-label">Excel Data
-                                        Validations<i id="pre-import-validation-help-text"
-                                            class="bi bi-info-circle-fill text-primary ms-2" data-bs-toggle="popover"
-                                            data-bs-trigger="hover focus"
-                                            data-bs-content="Basic validations embedded in the .xlsx file"
-                                            data-bs-placement="top"></i></label>
-                                    <div class="col-sm-4">
-                                        <div class="input-group input-group-sm mb-2">
-                                            <span class="input-group-text" id="allow-blank-label">Allow
-                                                Blank</span>
-                                            <select class="form-select w-50" aria-label="Allow Blank"
-                                                aria-describedby="allow-blank-label"
-                                                :disabled="!selectedField.allow_null"
-                                                v-model="selectedColumn.xlsx_data_validation_allow_blank">
-                                                <option :value="true">Yes</option>
-                                                <option :value="false">No</option>
-                                            </select>
+                                <template v-if="selectedField">
+                                    <div class="row d-flex align-items-center mb-2">
+                                        <label for="column-name" class="col-sm-4 col-form-label">Column
+                                            Name</label>
+                                        <div class="col-sm-8 ">
+                                            <div class="input-group input-group-sm">
+                                                <input type="text" class="form-control" name="column-name"
+                                                    id="column-name" ref="column-name"
+                                                    v-model="selectedColumn.xlsx_column_header_name" />
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div v-if="selectedField.type == 'IntegerField' && this.defaultValueChoices && this.defaultValueChoices.length > 0"
+                                        class="row d-flex align-items-center mb-2">
+                                        <label for="default-value" class="col-sm-4 col-form-label">Default
+                                            Value</label>
+                                        <div class="col-sm-8 ">
+                                            <div class="input-group input-group-sm">
+                                                <select class="form-select" v-model="selectedColumn.default_value"
+                                                    id="default-value">
+                                                    <option :value="null">No Default
+                                                    </option>
+                                                    <option v-for="choice in defaultValueChoices" :value="choice[0]">{{
+                                                        choice[1] }}
+                                                    </option>
+                                                </select>
+                                            </div>
                                         </div>
-                                        <div class="input-group input-group-sm mb-2">
-                                            <span class="input-group-text" id="basic-addon1">Max
-                                                Length</span>
-                                            <input type="text" class="form-control" aria-label="Max Length"
-                                                aria-describedby="basic-addon1"
-                                                :value="selectedField.max_length ? selectedField.max_length : 'N/A'"
-                                                disabled>
+                                    </div>
+                                    <div v-if="selectedField.type == 'IntegerField' && !selectedColumn.default_value"
+                                        class="row d-flex align-items-center mb-2">
+                                        <label for="default-value" class="col-sm-4 col-form-label">Ledger Email User
+                                            Column?<i id="is-email-user-column-help-text"
+                                                class="bi bi-info-circle-fill text-primary ms-2"
+                                                data-bs-toggle="popover" data-bs-trigger="hover focus"
+                                                data-bs-content="If set to 'Yes' the column value will be validated as an email address during the import and  the email will be used to lookup the user id in ledger"
+                                                data-bs-placement="top"></i></label>
+                                        <div class="col-sm-8 ">
+                                            <div class="input-group input-group-sm">
+                                                <select class="form-select w-50" aria-label="Allow Blank"
+                                                    v-model="selectedColumn.is_emailuser_column">
+                                                    <option :value="true">Yes</option>
+                                                    <option :value="false">No</option>
+                                                </select>
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
-                            </template>
-                            <div v-if="showDjangoLookupField" class="row mb-2">
-                                <label for="inputEmail3" class="col-sm-4 col-form-label">Django
-                                    Lookup Field<i id="django-lookup-field-help-text"
-                                        class="bi bi-info-circle-fill text-primary ms-2" data-bs-toggle="popover"
-                                        data-bs-trigger="hover focus"
-                                        :data-bs-content="`Which field to use when looking up the ${selectedField.display_name} record. <br>(Advanced: You can use a custom field name if it's not in the list and it may span model relationships e.g. 'taxonomy__scientific_name' )`"
-                                        data-bs-placement="top" :data-bs-html="true"></i></label>
-                                <div class="col-sm-8">
-                                    <fieldset class="border p-2 mb-2">
-                                        <div class="input-group input-group-sm mb-1">
-                                            <span class="input-group-text w-25" id="lookup-field">
-                                                Lookup Field</span>
-                                            <select v-if="!customLookupField" class="form-select"
-                                                aria-label="Lookup Field"
-                                                v-model="selectedColumn.django_lookup_field_name"
-                                                @change="selectLookupField()">
-                                                <option v-for="lookupField in selectedField.lookup_field_options"
-                                                    :value="lookupField">{{
-                                                        lookupField }}</option>
-                                                <option value="custom">custom</option>
-                                            </select>
-                                            <select v-else ref="lookup-field" class="form-select"
-                                                aria-label="Lookup Field" @change="selectLookupField()">
-                                                <option v-for="lookupField in selectedField.lookup_field_options"
-                                                    :value="lookupField">{{
-                                                        lookupField }}</option>
-                                                <option value="custom" selected>custom</option>
-                                            </select>
+                                    <div class="row d-flex align-items-center mb-2">
+                                        <label for="inputEmail3" class="col-sm-4 col-form-label">Django
+                                            Field
+                                            Type</label>
+                                        <div class="col-sm-8 ">
+                                            <div class="input-group input-group-sm">
+                                                <input type="text" class="form-control" name="" id="" placeholder=""
+                                                    disabled :value="selectedField.type" />
+                                            </div>
                                         </div>
-                                        <input v-if="customLookupField" ref="custom-lookup-field"
-                                            class="form-control form-control-sm mt-2" type="text"
-                                            placeholder="Enter Custom Lookup Field" aria-label="Custom Lookup Field"
-                                            aria-describedby="lookup-field"
-                                            v-model="selectedColumn.django_lookup_field_name">
-                                    </fieldset>
+                                    </div>
+                                    <div class="row d-flex align-items-center mb-2">
+                                        <label for="xlsx-validation-type" class="col-sm-4 col-form-label">Excel
+                                            Validation
+                                            Type</label>
+                                        <div class="col-sm-8 ">
+                                            <div class="input-group input-group-sm">
+                                                <input type="text" class="form-control form-control-sm"
+                                                    name="xlsx-validation-type" id="xlsx-validation-type" disabled
+                                                    :value="excelValidationType()" />
+                                                <template v-if="selectedField.xlsx_validation_type == 'date'">
+                                                    <span class="input-group-text" id="datetime-format">Format:</span>
+                                                    <span class="input-group-text" id="datetime-format-mask">DD/MM/YYYY
+                                                        HH:MM:SS</span>
+                                                </template>
+                                                <template v-if="selectedField.xlsx_validation_type == 'list'">
+                                                    <button type="button"
+                                                        v-if="selectedField.choices && selectedField.choices.length > 0"
+                                                        class="btn btn-primary" data-bs-toggle="modal"
+                                                        data-bs-target="#preview-choices"><i class="bi bi-search"
+                                                            role="button"></i> Preview
+                                                        List Choices</button>
+                                                </template>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div v-if="selectedField.xlsx_validation_type" class="row mb-2">
+                                        <label for="inputEmail3" class="col-sm-4 col-form-label">Excel Data
+                                            Validations<i id="pre-import-validation-help-text"
+                                                class="bi bi-info-circle-fill text-primary ms-2"
+                                                data-bs-toggle="popover" data-bs-trigger="hover focus"
+                                                data-bs-content="Basic validations embedded in the .xlsx file"
+                                                data-bs-placement="top"></i></label>
+                                        <div class="col-sm-4">
+                                            <div class="input-group input-group-sm mb-2">
+                                                <span class="input-group-text" id="allow-blank-label">Allow
+                                                    Blank</span>
+                                                <select class="form-select w-50" aria-label="Allow Blank"
+                                                    :disabled="!selectedField.allow_null"
+                                                    v-model="selectedColumn.xlsx_data_validation_allow_blank">
+                                                    <option :value="true">Yes</option>
+                                                    <option :value="false">No</option>
+                                                </select>
+                                            </div>
+                                            <div class="input-group input-group-sm mb-2">
+                                                <span class="input-group-text" id="max-length">Max
+                                                    Length</span>
+                                                <input type="text" class="form-control" aria-label="Max Length"
+                                                    aria-describedby="max-length"
+                                                    :value="selectedField.max_length ? selectedField.max_length : 'N/A'"
+                                                    disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </template>
+                                <div v-if="showDjangoLookupField" class="row mb-2">
+                                    <label for="inputEmail3" class="col-sm-4 col-form-label">Django
+                                        Lookup Field<i id="django-lookup-field-help-text"
+                                            class="bi bi-info-circle-fill text-primary ms-2" data-bs-toggle="popover"
+                                            data-bs-trigger="hover focus"
+                                            :data-bs-content="`Which field to use when looking up the ${selectedField.display_name} record. <br>(Advanced: You can use a custom field name if it's not in the list and it may span model relationships e.g. 'taxonomy__scientific_name' )`"
+                                            data-bs-placement="top" :data-bs-html="true"></i></label>
+                                    <div class="col-sm-8">
+                                        <fieldset class="border p-2 mb-2">
+                                            <div class="input-group input-group-sm mb-1">
+                                                <span class="input-group-text w-25" id="lookup-field">
+                                                    Lookup Field</span>
+                                                <template v-if="!customLookupField">
+                                                    <select class="form-select" aria-label="Lookup Field"
+                                                        v-model="selectedColumn.django_lookup_field_name"
+                                                        @change="selectLookupField()">
+                                                        <option
+                                                            v-for="lookupField in selectedField.lookup_field_options"
+                                                            :value="lookupField">{{
+                                                                lookupField }}</option>
+                                                        <option value="custom">custom</option>
+                                                    </select>
+                                                    <a v-if="selectedColumn.id" class="btn btn-primary"
+                                                        :href="`/api/occurrence_report_bulk_import_schema_columns/${selectedColumn.id}/preview_foreign_key_values_xlsx/`"><i
+                                                            class="bi bi-filetype-xlsx" role="button"></i> Preview
+                                                        Choices</a>
+                                                </template>
+                                                <select v-else ref="lookup-field" class="form-select"
+                                                    aria-label="Lookup Field" @change="selectLookupField()">
+                                                    <option v-for="lookupField in selectedField.lookup_field_options"
+                                                        :value="lookupField">{{
+                                                            lookupField }}</option>
+                                                    <option value="custom" selected>custom</option>
+                                                </select>
+                                            </div>
+                                            <div v-if="customLookupField" class="input-group input-group-sm mb-2 mt-2">
+                                                <input ref="custom-lookup-field" class="form-control form-control-sm"
+                                                    type="text" placeholder="Enter Custom Lookup Field"
+                                                    aria-label="Custom Lookup Field"
+                                                    v-model="selectedColumn.django_lookup_field_name">
+                                                <a v-if="selectedColumn.id" class="btn btn-primary"
+                                                    :href="`/api/occurrence_report_bulk_import_schema_columns/${selectedColumn.id}/preview_foreign_key_values_xlsx/`"><i
+                                                        class="bi bi-filetype-xlsx" role="button"></i> Preview {{
+                                                            selectedColumn.filtered_foreign_key_count }} Choices</a>
+                                            </div>
+                                            <div>
+                                                <button type="button" class="btn btn-primary btn-sm mb-2"
+                                                    @click.prevent="addLookupFilter()">
+                                                    <i class="bi bi-plus-circle-fill me-2"></i>Add Lookup
+                                                    Filter</button>
+                                                <template
+                                                    v-if="selectedColumn.lookup_filters && selectedColumn.lookup_filters.length > 0">
+                                                    <div v-for="(lookupFilter, index) in selectedColumn.lookup_filters"
+                                                        class="input-group input-group-sm mb-2">
+                                                        <select class="form-select"
+                                                            v-model="selectedColumn.lookup_filters[index].filter_field_name"
+                                                            @change="lookupFilterFieldChanged(selectedColumn.lookup_filters[index])">
+                                                            <option value="" disabled>Select Field</option>
+                                                            <option v-for="field in selectedField.filter_field_options"
+                                                                :value="field">{{ field }}</option>
+                                                        </select>
+                                                        <select class="form-select"
+                                                            v-model="selectedColumn.lookup_filters[index].filter_type">
+                                                            <option v-for="lookupFilter in lookupSchematypes"
+                                                                :value="lookupFilter[0]">{{ lookupFilter[1] }}</option>
+                                                        </select>
+                                                        <input
+                                                            v-if="selectedColumn.lookup_filters[index].values && selectedColumn.lookup_filters[index].values.length > 0"
+                                                            type="text" class="form-control" placeholder="Enter Value"
+                                                            aria-label="Enter Value"
+                                                            v-model="selectedColumn.lookup_filters[index].values[0].filter_value"
+                                                            @change="lookupFilterValueChanged($event, selectedColumn.lookup_filters[index])">
+                                                        <input v-else type="text" class="form-control"
+                                                            placeholder="Select Field First" disabled>
+
+                                                        <button type="button" class="btn btn-danger"
+                                                            @click.prevent="removeLookupFilter(selectedColumn, index)">
+                                                            <i class="bi bi-x-circle-fill"></i>
+                                                        </button>
+                                                    </div>
+                                                </template>
+                                            </div>
+                                        </fieldset>
+                                    </div>
                                 </div>
-                            </div>
+                            </fieldset>
+
                             <div class="border-top pt-3 d-flex justify-content-end">
-                                <button class="btn btn-primary btn-sm me-2" @click.prevent="save()"><i
-                                        class="bi bi-floppy-fill me-1"></i>
-                                    Save
-                                    Column <template v-if="saving"><span class="spinner-border spinner-border-sm ms-2"
-                                            role="status" aria-hidden="true"></span>
-                                        <span class="visually-hidden">Loading...</span></template></button>
-                                <button class="btn btn-danger btn-sm" v-if="!selectedColumn.id"
-                                    @click.prevent="cancelAddingColumn(selectedColumn)"><i
-                                        class="bi bi-x-circle-fill me-1"></i>
-                                    Cancel
-                                    Adding
-                                    Column</button>
-                                <button v-else-if="selectedColumn.order != 0" class="btn btn-danger btn-sm"
-                                    @click.prevent="removeColumn(selectedColumn)"><i class="bi bi-trash3-fill me-1"></i>
-                                    Delete
-                                    Column</button>
+                                <button class="btn btn-primary btn-sm me-2" @click.prevent="selectedColumn = null">
+                                    <i class="bi bi-x-square me-1"></i> Unselect Column
+                                </button>
+                                <template v-if="schema.can_user_edit && selectedColumn.is_editable_by_user">
+                                    <button
+                                        v-if="selectedColumn.django_import_content_type && selectedColumn.django_import_field_name"
+                                        class="btn btn-primary btn-sm me-2" @click.prevent="save()"><i
+                                            class="bi bi-floppy-fill me-1"></i>
+                                        Save
+                                        Column <template v-if="saving"><span
+                                                class="spinner-border spinner-border-sm ms-2" role="status"
+                                                aria-hidden="true"></span>
+                                            <span class="visually-hidden">Loading...</span></template></button>
+                                    <button class="btn btn-danger btn-sm" v-if="!selectedColumn.id"
+                                        @click.prevent="cancelAddingColumn(selectedColumn)"><i
+                                            class="bi bi-x-circle-fill me-1"></i>
+                                        Cancel
+                                        Adding
+                                        Column</button>
+                                    <button v-else-if="selectedColumn.order != 0" class="btn btn-danger btn-sm"
+                                        @click.prevent="removeColumn(selectedColumn)"><i
+                                            class="bi bi-trash3-fill me-1"></i>
+                                        Delete
+                                        Column</button>
+                                </template>
                             </div>
                         </form>
                     </div>
@@ -401,7 +488,7 @@
                 </div>
             </div>
         </div>
-        <div class="row">
+        <div v-if="schema" class="row">
             <div class="navbar fixed-bottom" style="background-color: rgb(245, 245, 245);">
                 <div class="container">
                     <div class="col-md-6">
@@ -409,8 +496,8 @@
                                 href="/internal/occurrence_report/bulk_import_schema/">Return to Dashboard </a>
                         </div>
                     </div>
-                    <div class="col-md-6 text-end"><button class="btn btn-primary me-2 float-end"
-                            @click.prevent="save()">Save
+                    <div v-if="schema.can_user_edit" class="col-md-6 text-end"><button
+                            class="btn btn-primary me-2 float-end" @click.prevent="save()">Save
                             and
                             Continue <template v-if="saving"><span class="spinner-border spinner-border-sm ms-2"
                                     role="status" aria-hidden="true"></span>
@@ -423,6 +510,46 @@
                 </div>
             </div>
         </div>
+        <template
+            v-if="selectedField && selectedField.xlsx_validation_type == 'list' && selectedField.choices && selectedField.choices.length > 0">
+            <div class="modal fade" id="preview-choices" data-bs-backdrop="static" data-bs-keyboard="false"
+                tabindex="-1" aria-labelledby="preview-choices-label" aria-hidden="true">
+                <div class="modal-dialog">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <h5 class="modal-title" id="preview-choices-label">
+                                {{
+                                    selectedField.display_name
+                                }} List
+                                Choices
+                            </h5>
+                            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                        </div>
+                        <div class="modal-body">
+                            <div class="table-responsive">
+                                <table class="table table-bordered table-hover table-sm">
+                                    <tbody>
+                                        <tr v-for="choice in selectedField.choices" class="">
+                                            <td>
+                                                <template
+                                                    v-if="['MultiSelectField', 'ForeignKey', 'ManyToManyField'].includes(selectedField.type)">{{
+                                                        choice[1] }}</template>
+                                                <template v-else>{{
+                                                    choice[0]
+                                                    }}</template>
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
+                        <div class="modal-footer">
+                            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </template>
     </div>
 </template>
 
@@ -447,6 +574,7 @@ export default {
             selectedField: null,
             customLookupField: false,
             previousCustomLookupField: null,
+            lookupSchematypes: null,
             sortable: null,
             addEditMode: false,
             showDjangoImportFieldSelect: false,
@@ -463,30 +591,46 @@ export default {
             return this.selectedColumn &&
                 this.selectedColumn.xlsx_column_header_name &&
                 this.selectedColumn.django_import_content_type &&
-                this.selectedColumn.django_import_field_name && this.selectedField && this.selectedField.type === 'ForeignKey';
+                this.selectedColumn.requires_lookup_field &&
+                this.selectedColumn.django_import_field_name && this.selectedField && ['ManyToManyField', 'ForeignKey'].includes(this.selectedField.type);
         },
     },
     methods: {
+        fetchLookupSchematypes() {
+            this.$http.get(api_endpoints.lookup_schema_types)
+                .then(response => {
+                    this.lookupSchematypes = response.data
+                })
+                .catch(error => {
+                    console.error(error)
+                })
+        },
         fetchBulkImportSchema() {
             this.$http.get(`${api_endpoints.occurrence_report_bulk_import_schemas}${this.$route.params.bulk_import_schema_id}/`)
                 .then(response => {
                     this.schema = response.data
+                    this.fetchContentTypes()
                     this.$nextTick(() => {
-                        var el = document.querySelector('.columns')
-                        this.sortable = Sortable.create(
-                            el, {
-                            animation: 150,
-                            handle: '.bi-arrow-down-up',
-                            onEnd: (event) => {
-                                let column = this.schema.columns.splice(event.oldIndex, 1)[0]
-                                this.schema.columns.splice(event.newIndex, 0, column)
-                                // Update the order of the columns
-                                this.schema.columns.forEach((column, index) => {
-                                    column.order = index
-                                })
-                                this.save()
-                            }
-                        })
+                        if (!this.schema.can_user_edit) {
+                            this.disableMainFieldsetInputs();
+                        } else {
+                            this.enableMainFieldsetInputs();
+                            var el = document.querySelector('.columns')
+                            this.sortable = Sortable.create(
+                                el, {
+                                animation: 150,
+                                handle: '.bi-arrow-down-up',
+                                onEnd: (event) => {
+                                    let column = this.schema.columns.splice(event.oldIndex, 1)[0]
+                                    this.schema.columns.splice(event.newIndex, 0, column)
+                                    // Update the order of the columns
+                                    this.schema.columns.forEach((column, index) => {
+                                        column.order = index
+                                    })
+                                    this.save()
+                                }
+                            })
+                        }
                     })
                 })
                 .catch(error => {
@@ -494,36 +638,22 @@ export default {
                 })
         },
         fetchContentTypes() {
-            this.$http.get(`${api_endpoints.content_types}`, {
-                params: {
-                    app_label: 'boranga',
-                    search: 'occurrencereport'
-                }
-            })
+            this.$http.get(`${api_endpoints.content_types}ocr_bulk_import_content_types/`)
                 .then(response => {
-                    this.djangoContentTypes = response.data.results
-                    this.$http.get(`${api_endpoints.content_types}`, {
-                        params: {
-                            app_label: 'boranga',
-                            search: 'ocr'
-                        }
-                    })
-                        .then(response => {
-                            this.djangoContentTypes.push(...response.data.results)
-                            // Filter out content types that have no fields or no model_verbose_name
-                            this.djangoContentTypesFiltered = this.djangoContentTypes.filter(
-                                djangoContentType => djangoContentType.model_fields.length > 0 && djangoContentType.model_verbose_name
+                    this.djangoContentTypes = response.data
+                    // Filter out content types that have no fields
+                    this.djangoContentTypesFiltered = this.djangoContentTypes.filter(
+                        djangoContentType => djangoContentType.model_fields.length > 0
+                    )
+                    // Filter out content types where all their fields are already columns in the schema
+                    this.djangoContentTypesFiltered = this.djangoContentTypesFiltered.filter(
+                        djangoContentType => !djangoContentType.model_fields.every(
+                            modelField => this.schema.columns.some(
+                                column => (column.django_import_field_name == modelField.name &&
+                                    column.django_import_content_type == modelField.content_type)
                             )
-                            // Filter out content types where all their fields are already columns in the schema
-                            this.djangoContentTypesFiltered = this.djangoContentTypesFiltered.filter(
-                                djangoContentType => !djangoContentType.model_fields.every(
-                                    modelField => this.schema.columns.some(column => column.django_import_field_name == modelField.name)
-                                )
-                            )
-                        })
-                        .catch(error => {
-                            console.error(error)
-                        })
+                        )
+                    )
                 })
                 .catch(error => {
                     console.error(error)
@@ -551,10 +681,26 @@ export default {
             )[0]
             // Filter out fields that are already columns in the schema
             this.djangoImportFieldsFiltered = this.selectedContentType.model_fields.filter(
-                modelField => !this.schema.columns.some(column => column.django_import_field_name == modelField.name)
+                modelField => !this.schema.columns.some(column => column.django_import_field_name == modelField.name &&
+                    column.django_import_content_type == modelField.content_type)
             )
+            // If there are already other columns with the same django content type
+            // then move the selected column to the end of the list of those columns
+            if (this.schema.columns.filter(column => column.django_import_content_type == this.selectedColumn.django_import_content_type).length > 1) {
+                let lastColumn = this.schema.columns.findLast(
+                    column => column.django_import_content_type == this.selectedColumn.django_import_content_type
+                        && column.django_import_field_name != this.selectedColumn.django_import_field_name)
+                let lastColumnIndex = this.schema.columns.indexOf(lastColumn) + 1
+                this.schema.columns.splice(this.selectedColumnIndex, 1)
+                this.schema.columns.splice(lastColumnIndex, 0, this.selectedColumn)
+                this.selectedColumnIndex = lastColumnIndex
+                // Update the order of the columns to reflect the new order
+                this.applyOrderToColumns()
+            }
             this.$nextTick(() => {
                 this.enablePopovers();
+                this.selectedColumn.model_name = this.selectedContentType.model_verbose_name
+                document.querySelector('tr.active').scrollIntoView();
             })
         },
         selectDjangoImportField() {
@@ -588,12 +734,13 @@ export default {
                 })
             } else {
                 this.customLookupField = false
-                this.selectedColumn.django_lookup_field_name = 'id'
+                this.selectedColumn.django_lookup_field_name = this.$refs['lookup-field'].value
             }
         },
         getNewColumnData() {
             return {
                 id: null,
+                order: this.schema.columns.length,
                 schema: this.schema.id,
                 django_import_content_type: '',
                 django_import_field_name: '',
@@ -602,7 +749,8 @@ export default {
                 xlsx_data_validation_allow_blank: true,
                 default_value: null,
                 import_validations: [],
-                order: this.schema.columns.length
+                lookup_filters: [],
+                is_editable_by_user: true
             }
         },
         addSingleColumn() {
@@ -620,6 +768,7 @@ export default {
             this.selectedColumn = this.newColumn
             this.selectedColumnIndex = this.schema.columns.indexOf(this.newColumn)
             this.addEditMode = true
+            this.showDjangoImportFieldSelect = false
             this.$nextTick(() => {
                 this.enablePopovers();
                 this.$refs['django-import-model'].focus()
@@ -628,7 +777,7 @@ export default {
         addAllColumns(onlyMandatory) {
             swal.fire({
                 title: onlyMandatory ? `Add All Mandatory Fields` : `Add All Fields`,
-                text: onlyMandatory ? `Are you sure you want to add all mandatory fields from the "${this.selectedContentType.model_verbose_name}" model?` : `Are you sure you want to add all fields from the "${this.selectedContentType.model_verbose_name}" model?`,
+                text: onlyMandatory ? `Are you sure you want to add all mandatory fields from the "${this.selectedContentType.model_verbose_name ? this.selectedContentType.model_verbose_name : this.selectedContentType.model}" model?` : `Are you sure you want to add all fields from the "${this.selectedContentType.model_verbose_name}" model?`,
                 icon: 'question',
                 showCancelButton: true,
                 confirmButtonText: 'Confirm',
@@ -652,18 +801,56 @@ export default {
                             import_validations: []
                         }
                     })
-                    console.log(newColumns)
                     // Remove columns that are already in the schema
                     newColumns = newColumns.filter(newColumn => !this.schema.columns.some(column => column.django_import_field_name == newColumn.django_import_field_name))
+
+                    if(newColumns.length == 0) {
+                        swal.fire({
+                            title: 'No New Columns Added',
+                            text: 'All fields from the selected model are already in the schema',
+                            icon: 'info',
+                            confirmButtonText: 'OK',
+                            customClass: {
+                                confirmButton: 'btn btn-primary'
+                            }
+                        })
+                        return
+                    }
+
                     if (onlyMandatory) {
                         newColumns = newColumns.filter(column => !column.xlsx_data_validation_allow_blank)
                     }
-                    let order = this.schema.columns.length
-                    newColumns.forEach(column => {
-                        column.order = order
-                        order++
-                    })
-                    this.schema.columns.push(...newColumns)
+
+                    if(newColumns.length == 0) {
+                        swal.fire({
+                            title: 'No New Columns Added',
+                            text: 'There are no mandatory fields from the selected model that are not already in the schema',
+                            icon: 'info',
+                            confirmButtonText: 'OK',
+                            customClass: {
+                                confirmButton: 'btn btn-primary'
+                            }
+                        })
+                        return
+                    }
+
+                    let selectedContentType = this.selectedColumn.django_import_content_type;
+                    this.schema.columns.splice(this.selectedColumnIndex, 1)
+                    this.selectedColumn = null
+                    this.newColumn = null
+                    this.addEditMode = false
+
+                    let lastColumnIndex = this.schema.columns.length;
+                    if(this.schema.columns.filter(column => column.django_import_content_type == selectedContentType).length > 0) {
+                        let lastColumn = this.schema.columns.findLast(column => column.django_import_content_type == selectedContentType)
+                        lastColumnIndex = this.schema.columns.indexOf(lastColumn) + 1
+                    }
+
+                    for (let i = 0; i < newColumns.length; i++) {
+                        this.schema.columns.splice(lastColumnIndex + i, 0, newColumns[i])
+                    }
+                    this.applyOrderToColumns()
+
                     this.save()
                     this.addEditMode = false
                 } else {
@@ -672,7 +859,11 @@ export default {
                     }
                 }
             })
-
+        },
+        applyOrderToColumns() {
+            this.schema.columns.forEach((column, index) => {
+                column.order = index
+            })
         },
         selectColumn(column) {
             if (column.django_import_content_type) {
@@ -694,7 +885,7 @@ export default {
             this.selectedColumn = column
             this.selectedColumnIndex = this.schema.columns.indexOf(column)
             this.addEditMode = true
-            if (this.selectedColumn.id) {
+            if (this.selectedColumn.id && column.django_import_field_name) {
                 this.showDjangoImportFieldSelect = true
             }
             this.$nextTick(() => {
@@ -728,7 +919,7 @@ export default {
                     this.schema.columns = this.schema.columns.filter(column => column !== this.selectedColumn)
                     this.selectedColumn = null
                     this.addEditMode = false
-
+                    this.applyOrderToColumns()
                     if (column.id) {
                         this.save()
                     }
@@ -755,24 +946,59 @@ export default {
             this.schema.tags.splice(index, 1)
             this.save();
         },
-        validateSchema() {
-            swal.fire({
-                title: 'Validate Schema',
-                text: 'Not yet implemented',
-                icon: 'warning',
-                showCancelButton: false,
-                cancelButtonText: 'Cancel',
-                customClass: {
-                    confirmButton: 'btn btn-primary',
-                    cancelButton: 'btn btn-secondary me-2'
-                },
-            })
+        validate() {
+            this.$http.get(`${api_endpoints.occurrence_report_bulk_import_schemas}${this.schema.id}/validate/`)
+                .then(response => {
+                    swal.fire({
+                        title: 'Schema Validated Successfully',
+                        text: response.data,
+                        icon: 'success',
+                        confirmButtonText: 'OK',
+                        customClass: {
+                            confirmButton: 'btn btn-primary'
+                        }
+                    })
+                })
+                .catch(error => {
+                    let errors = null;
+                    if (Object.hasOwn(error, 'data')) {
+                        errors = error.data
+                    } else if (Object.hasOwn(error, 'body')) {
+                        errors = error.body
+                    }
+                    let error_message = 'Something went wrong :-('
+                    if (errors instanceof Array) {
+                        error_message = ''
+                        for (let i = 0; i < errors.length; i++) {
+                            error_message += `<li class="mb-2">${errors[i].error_message}</li>`
+                        }
+                    }
+                    swal.fire({
+                        title: 'Schema Validation Failed',
+                        html: error_message,
+                        icon: 'error',
+                        confirmButtonText: 'OK',
+                        customClass: {
+                            confirmButton: 'btn btn-primary'
+                        }
+                    })
+                })
         },
         save() {
             // If there is a column with no django_import_content_type or django_import_field_name, remove it
             if (this.schema.columns.some(column => !column.django_import_content_type || !column.django_import_field_name)) {
                 this.schema.columns = this.schema.columns.filter(column => column.django_import_content_type && column.django_import_field_name)
+                this.selectedColumn = null
+                this.selectedColumnIndex = null
+                this.addEditMode = false
             }
+            // If there is a lookup filter with no filter_field_name, remove it
+            this.schema.columns.forEach(column => {
+                if (column.lookup_filters) {
+                    column.lookup_filters = column.lookup_filters.filter(filter => filter.filter_field_name)
+                }
+            })
+
             this.saving = true;
             this.errors = null;
             this.$http.put(`${api_endpoints.occurrence_report_bulk_import_schemas}${this.schema.id}/`, this.schema)
@@ -793,22 +1019,119 @@ export default {
             this.save()
             this.$router.push(`/internal/occurrence_report/bulk_import_schema/`)
         },
+        copySchema(id) {
+            this.$http.post(`${api_endpoints.occurrence_report_bulk_import_schemas}${id}/copy/`)
+                .then(response => {
+                    if (response.status === 201) {
+                        swal.fire({
+                            title: 'Success',
+                            text: 'Schema copied successfully',
+                            icon: 'success',
+                            showConfirmButton: false,
+                            timer: 1500
+                        })
+                        this.$router.push(`/internal/occurrence_report/bulk_import_schema/${response.data.id}`)
+                        this.fetchBulkImportSchema()
+                    }
+                })
+                .catch(error => {
+                    console.error(error)
+                })
+        },
         enablePopovers() {
             // enable all bootstrap 5 popovers
             var popoverTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="popover"]'))
             popoverTriggerList.map(function (popoverTriggerEl) {
                 return new bootstrap.Popover(popoverTriggerEl)
             })
+        },
+        stringToRGBAColor(str) {
+            if (!str) {
+                return '';
+            }
+            let hash = 0;
+            for (let i = 0; i < str.length; i++) {
+                hash = str.charCodeAt(i) + ((hash << 5) - hash);
+            }
+            let c = (hash & 0x00FFFFFF)
+                .toString(16)
+                .toUpperCase();
+            let color_hash = '#' + "00000".substring(0, 6 - c.length) + c;
+            // Consvert to RGB
+            let r = parseInt(color_hash.slice(1, 3), 16);
+            let g = parseInt(color_hash.slice(3, 5), 16);
+            let b = parseInt(color_hash.slice(5, 7), 16);
+            return `rgba(${r}, ${g}, ${b}, 0.1)`;
+        },
+        classesForRow(index, column, selectedColumn) {
+            let classes = selectedColumn == column ? 'active bg-success' : ''
+            let next_index = index + 1;
+            if (next_index > this.schema.columns.length - 1) {
+                return classes
+            }
+            let next_column = this.schema.columns[next_index]
+            if (next_column.django_import_content_type != column.django_import_content_type) {
+                classes += ' border-bottom border-secondary last-row-for-model'
+            }
+            return classes
+        },
+        excelValidationType() {
+            if (this.selectedColumn.is_emailuser_column) {
+                return 'None'
+            }
+            return this.selectedField.xlsx_validation_type ? this.selectedField.xlsx_validation_type : 'None'
+        },
+        addLookupFilter() {
+            if (!this.selectedColumn.lookup_filters) {
+                this.selectedColumn.lookup_filters = []
+            }
+            this.selectedColumn.lookup_filters.push({
+                id: null,
+                schema_column: this.selectedColumn.id,
+                filter_field_name: '',
+                filter_type: 'exact',
+                values: []
+            })
+        },
+        removeLookupFilter(column, index) {
+            let lookup_filter_id = column.lookup_filters[index].id
+            column.lookup_filters.splice(index, 1)
+            if (lookup_filter_id) {
+                this.save()
+            }
+        },
+        lookupFilterFieldChanged(lookupFilter) {
+            if (lookupFilter.values.length == 0) {
+                lookupFilter.values.push({
+                    id: null,
+                    filter_value: ''
+                })
+            } else {
+                lookupFilter.values[0].filter_value = ''
+            }
+            this.save()
+        },
+        lookupFilterValueChanged() {
+            this.save()
+        },
+        disableMainFieldsetInputs() {
+            document.querySelectorAll('fieldset#main-schema-fieldset input').forEach(input => {
+                input.disabled = true
+            })
+        },
+        enableMainFieldsetInputs() {
+            document.querySelectorAll('fieldset#main-schema-fieldset input').forEach(input => {
+                input.disabled = false
+            })
         }
     },
     created() {
         this.fetchBulkImportSchema()
-        this.fetchContentTypes()
         this.fetchDefaultValueChoices()
+        this.fetchLookupSchematypes()
     },
     onRouteEnter() {
         this.fetchBulkImportSchema()
-        this.fetchContentTypes()
     }
 }
 </script>
@@ -823,11 +1146,11 @@ div.scroll {
     white-space: nowrap;
 }
 
-.sticky-top {
-    top: 1.5em;
+table.table-schema {
+    border-collapse: collapse;
 }
 
-tr.active {
-    background: rgba(51, 170, 51, .4)
+.sticky-top {
+    top: 1.5em;
 }
 </style>
diff --git a/boranga/frontend/boranga/src/components/internal/occurrence/bulk_import_schema_list.vue b/boranga/frontend/boranga/src/components/internal/occurrence/bulk_import_schema_list.vue
index ddd15e79..384d06ba 100644
--- a/boranga/frontend/boranga/src/components/internal/occurrence/bulk_import_schema_list.vue
+++ b/boranga/frontend/boranga/src/components/internal/occurrence/bulk_import_schema_list.vue
@@ -23,7 +23,7 @@
                             </form>
                             <div>
                                 <button v-if="groupType" class="btn btn-primary float" @click="createNewVersion"><i
-                                        class="bi bi-plus-circle-fill"></i> Create New Version</button>
+                                        class="bi bi-plus-circle-fill me-2"></i>Create New Version</button>
                             </div>
                         </div>
                     </div>
@@ -42,16 +42,17 @@
                                 </tr>
                             </thead>
                             <tbody class="text-muted">
-                                <tr v-for="schema in bulkSchemas" class="">
-                                    <td>{{ schema.version }}</td>
-                                    <td class="text-truncate text-align-end" style="max-width: 300px;"
+                                <tr v-for="schema in bulkSchemas" :class="schema.is_master ? 'master-schema' : ''">
+                                    <td>{{ schema.version }}<i class="bi bi-lock-fill text-warning fs-5 ps-2" v-if="schema.is_master"></i></td>
+                                    <td class="text-truncate text-align-end" style="max-width: 285px;"
                                         :title="schema.name">{{
                                             schema.name }}</td>
                                     <td class="text-truncate"><span class="badge bg-info fs-6 me-2"
-                                            v-for="(tag, index) in schema.tags.slice(0, 3)" :key="tag">{{ tag }}</span>
-                                        <span v-if="schema.tags.length > 3"
+                                            v-for="(tag, index) in tags_to_show(schema.tags)" :key="tag">{{ tag
+                                            }}</span>
+                                        <span v-if="schema.tags.length > tags_to_show(schema.tags).length"
                                             :title="String(schema.tags).replace(/,/g, ', ')" @click.prevent="">+{{
-                                            schema.tags.length - 3 }}</span>
+                                                schema.tags.length - tags_to_show(schema.tags).length }}</span>
                                     </td>
                                     <td>{{ new
                                         Date(schema.datetime_created).toLocaleDateString() }} {{ new
@@ -62,7 +63,8 @@
                                     <td>
                                         <a class="btn btn-sm btn-primary my-0 me-2" role="button"
                                             :href="`/internal/occurrence_report/bulk_import_schema/${schema.id}`"><i
-                                                class="bi bi-pencil-fill me-2"></i> Edit</a>
+                                                class="bi me-2" :class="schema.can_user_edit ? 'bi-pencil-fill' : 'bi-eye-fill'"></i> <template v-if="schema.can_user_edit">Edit</template><template v-else>View</template></a>
+
                                         <button class="btn btn-sm btn-primary my-0"
                                             @click.prevent="copySchema(schema.id)"><i class="bi bi-copy me-2"></i>
                                             Create a Copy</button>
@@ -71,6 +73,11 @@
                             </tbody>
                         </table>
                     </div>
+                    <div v-else-if="loadingSchemas" class="text-center">
+                        <div class="spinner-border text-primary" role="status">
+                            <span class="visually-hidden">Loading...</span>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
@@ -89,6 +96,7 @@ export default {
             groupTypes: null,
             groupType: null,
             bulkSchemas: null,
+            loadingSchemas: false
         }
     },
     components: {
@@ -110,6 +118,7 @@ export default {
                 return
             }
             localStorage.setItem('ocr-bulk-import-group-type', this.groupType)
+            this.loadingSchemas = true
             this.$http.get(api_endpoints.occurrence_report_bulk_import_schemas, {
                 params: {
                     group_type: this.groupType
@@ -121,6 +130,9 @@ export default {
                 .catch(error => {
                     console.error(error)
                 })
+                .finally(() => {
+                    this.loadingSchemas = false
+                })
         },
         copySchema(id) {
             this.$http.post(`${api_endpoints.occurrence_report_bulk_import_schemas}${id}/copy/`)
@@ -159,6 +171,19 @@ export default {
                 .catch(error => {
                     console.error(error)
                 })
+        },
+        tags_to_show(tags) {
+            let total_chars = tags.length * 2;
+            let tags_to_show = [];
+            for (let i = 0; i < tags.length; i++) {
+                total_chars += tags[i].length;
+                if (total_chars <= 30) {
+                    tags_to_show.push(tags[i]);
+                } else {
+                    break;
+                }
+            }
+            return tags_to_show;
         }
     },
     created() {
@@ -170,3 +195,8 @@ export default {
     }
 }
 </script>
+<style scoped>
+.master-schema {
+    background-color: rgba(255, 193, 7, 0.3);
+}
+</style>
diff --git a/boranga/frontend/boranga/src/components/internal/species_communities/proposal_add_requirement.vue b/boranga/frontend/boranga/src/components/internal/species_communities/proposal_add_requirement.vue
deleted file mode 100755
index de16c10e..00000000
--- a/boranga/frontend/boranga/src/components/internal/species_communities/proposal_add_requirement.vue
+++ /dev/null
@@ -1,463 +0,0 @@
-<template lang="html">
-    <div id="proposalRequirementDetail">
-        <modal transition="modal fade" @ok="ok()" @cancel="cancel()" title="Requirement" large>
-            <div class="container-fluid">
-                <div class="row">
-                    <form class="form-horizontal" name="requirementForm">
-                        <alert :show.sync="showError" type="danger"><strong>{{ errorString }}</strong></alert>
-                        <div class="col-sm-12">
-                            <div class="form-group">
-                                <label class="radio-inline control-label"><input type="radio" name="requirementType"
-                                        :value="true" v-model="requirement.standard">Standard Requirement</label>
-                                <label class="radio-inline"><input type="radio" name="requirementType" :value="false"
-                                        v-model="requirement.standard">Free Text Requirement</label>
-                            </div>
-                        </div>
-                        <div class="col-sm-12">
-                            <div class="form-group">
-                                <div class="row">
-                                    <div class="col-sm-3">
-                                        <label class="control-label pull-left" for="Name">Requirement</label>
-                                    </div>
-                                    <div class="col-sm-9" v-if="requirement.standard">
-                                        <div style="width:70% !important">
-                                            <select class="form-control" ref="standard_req" name="standard_requirement"
-                                                v-model="requirement.standard_requirement">
-                                                <option v-for="r in requirements" :value="r.id">{{ r.code }} {{ r.text
-                                                    }}
-                                                </option>
-                                            </select>
-                                        </div>
-                                    </div>
-                                    <div class="col-sm-9" v-else>
-                                        <textarea style="width: 70%;" class="form-control" name="free_requirement"
-                                            v-model="requirement.free_requirement"></textarea>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <div class="row">
-                                    <div class="col-sm-3">
-                                        <label class="control-label pull-left" for="Name">Due Date</label>
-                                    </div>
-                                    <div class="col-sm-9">
-                                        <div class="input-group date" ref="due_date" style="width: 70%;">
-                                            <input type="text" class="form-control" name="due_date"
-                                                placeholder="DD/MM/YYYY" v-model="requirement.due_date">
-                                            <span class="input-group-addon">
-                                                <span class="glyphicon glyphicon-calendar"></span>
-                                            </span>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <div class="row">
-                                    <div class="col-sm-9">
-                                        <div class="input-group date" ref="add_attachments" style="width: 70%;">
-                                            <FileField2 ref="filefield"
-                                                :uploaded_documents="requirement.requirement_documents"
-                                                :delete_url="delete_url" :proposal_id="proposal_id" isRepeatable="true"
-                                                name="requirements_file" @refreshFromResponse="refreshFromResponse" />
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <template v-if="validDate">
-                                <div class="form-group">
-                                    <div class="row">
-                                        <div class="col-sm-3">
-                                            <label class="control-label pull-left" for="Name">Notification only</label>
-                                        </div>
-                                        <div class="col-sm-9">
-                                            <label class="checkbox-inline"><input type="checkbox"
-                                                    v-model="requirement.notification_only"></label>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <div class="row">
-                                        <div class="col-sm-3">
-                                            <label class="control-label pull-left" for="Name">Recurrence</label>
-                                        </div>
-                                        <div class="col-sm-9">
-                                            <label class="checkbox-inline"><input type="checkbox"
-                                                    v-model="requirement.recurrence"></label>
-                                        </div>
-                                    </div>
-                                </div>
-                                <template v-if="requirement.recurrence">
-                                    <div class="form-group">
-                                        <div class="row">
-                                            <div class="col-sm-3">
-                                                <label class="control-label pull-left" for="Name">Recurrence
-                                                    pattern</label>
-                                            </div>
-                                            <div class="col-sm-9">
-                                                <label class="radio-inline control-label"><input type="radio"
-                                                        name="recurrenceSchedule" value="1"
-                                                        v-model="requirement.recurrence_pattern">Weekly</label>
-                                                <label class="radio-inline control-label"><input type="radio"
-                                                        name="recurrenceSchedule" value="2"
-                                                        v-model="requirement.recurrence_pattern">Monthly</label>
-                                                <label class="radio-inline control-label"><input type="radio"
-                                                        name="recurrenceSchedule" value="3"
-                                                        v-model="requirement.recurrence_pattern">Yearly</label>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <div class="row">
-                                            <div class="col-sm-12">
-                                                <label class="control-label" for="Name">
-                                                    <strong class="pull-left">Recur every</strong>
-                                                    <input class="pull-left" style="width:10%; margin-left:10px;"
-                                                        type="number" name="schedule"
-                                                        v-model="requirement.recurrence_schedule" />
-                                                    <strong v-if="requirement.recurrence_pattern == '1'"
-                                                        class="pull-left" style="margin-left:10px;">week(s)</strong>
-                                                    <strong v-else-if="requirement.recurrence_pattern == '2'"
-                                                        class="pull-left" style="margin-left:10px;">month(s)</strong>
-                                                    <strong v-else-if="requirement.recurrence_pattern == '3'"
-                                                        class="pull-left" style="margin-left:10px;">year(s)</strong>
-                                                </label>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </template>
-                            </template>
-                        </div>
-                    </form>
-                </div>
-            </div>
-            <div slot="footer">
-                <button type="button" class="btn btn-secondary me-2" @click="cancel">Cancel</button>
-                <template v-if="requirement.id">
-                    <button type="button" v-if="updatingRequirement" disabled class="btn btn-primary"
-                        @click="ok">Updating <span class="spinner-border spinner-border-sm" role="status"
-                            aria-hidden="true"></span>
-                        <span class="visually-hidden">Loading...</span></button>
-                    <button type="button" v-else class="btn btn-primary" @click="ok">Update</button>
-                </template>
-                <template v-else>
-                    <button type="button" v-if="addingRequirement" disabled class="btn btn-primary" @click="ok">Adding
-                        <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
-                        <span class="visually-hidden">Loading...</span></button>
-                    <button type="button" v-else class="btn btn-primary" @click="ok">Add</button>
-                </template>
-            </div>
-        </modal>
-    </div>
-</template>
-
-<script>
-import FileField2 from '@/components/forms/filefield.vue'
-import modal from '@vue-utils/bootstrap-modal.vue'
-import alert from '@vue-utils/alert.vue'
-import { helpers, api_endpoints } from "@/utils/hooks.js"
-export default {
-    name: 'Requirement-Detail',
-    components: {
-        FileField2,
-        modal,
-        alert
-    },
-    props: {
-        proposal_id: {
-            type: Number,
-            required: true
-        },
-        requirements: {
-            type: Array,
-            required: true
-        },
-        hasReferralMode: {
-            type: Boolean,
-            default: false
-        },
-        referral_group: {
-            type: Number,
-            default: null
-        },
-        hasDistrictAssessorMode: {
-            type: Boolean,
-            default: false
-        },
-        district_proposal: {
-            type: Number,
-            default: null
-
-        },
-        district: {
-            type: Number,
-            default: null
-        }
-    },
-    data: function () {
-        let vm = this;
-        return {
-            isModalOpen: false,
-            form: null,
-            requirement: {
-                id: '',
-                due_date: '',
-                standard: true,
-                recurrence: false,
-                recurrence_pattern: '1',
-                proposal: vm.proposal_id,
-                referral_group: vm.referral_group,
-                num_files: 0,
-                input_name: 'requirement_doc',
-                requirement_documents: [],
-                district_proposal: vm.district_proposal,
-                district: vm.district,
-            },
-            addingRequirement: false,
-            updatingRequirement: false,
-            validation_form: null,
-            type: '1',
-            errors: false,
-            errorString: '',
-            successString: '',
-            success: false,
-            datepickerOptions: {
-                format: 'DD/MM/YYYY',
-                showClear: true,
-                useCurrent: false,
-                keepInvalid: true,
-                allowInputToggle: true
-            },
-            validDate: false,
-        }
-    },
-    computed: {
-        showError: function () {
-            var vm = this;
-            return vm.errors;
-        },
-        due_date: {
-            cache: false,
-            get() {
-                if (this.requirement.due_date == undefined || this.requirement.due_date == '' || this.requirement.due_date == null) {
-                    return '';
-                }
-                else {
-                    return this.requirement.due_date;
-                }
-            }
-        },
-        delete_url: function () {
-            return (this.requirement.id) ? '/api/proposal_requirements/' + this.requirement.id + '/delete_document/' : '';
-        }
-    },
-    watch: {
-        due_date: function () {
-            this.validDate = moment(this.requirement.due_date, 'DD/MM/YYYY').isValid();
-        },
-    },
-    methods: {
-        refreshFromResponse: function (updated_docs) {
-            this.requirement.requirement_documents = updated_docs;
-        },
-        initialiseRequirement: function () {
-            this.requirement = {
-                due_date: '',
-                standard: true,
-                recurrence: false,
-                recurrence_pattern: '1',
-                proposal: vm.proposal_id,
-                referral_group: vm.referral_group
-            }
-        },
-        ok: function () {
-            let vm = this;
-            if ($(vm.form).valid()) {
-                vm.sendData();
-                vm.$refs.filefield.reset_files();
-            }
-        },
-        cancel: function () {
-            this.close()
-            this.$refs.filefield.reset_files();
-        },
-        close: function () {
-            this.isModalOpen = false;
-            $(this.$refs.standard_req).val(null).trigger('change');
-            this.requirement = {
-                standard: true,
-                recurrence: false,
-                due_date: '',
-                recurrence_pattern: '1',
-                proposal: this.proposal_id
-            };
-            this.$refs.filefield.reset_files();
-            this.errors = false;
-            $('.has-error').removeClass('has-error');
-            $(this.$refs.due_date).data('DateTimePicker').clear();
-            this.validation_form.resetForm();
-        },
-        fetchContact: function (id) {
-            let vm = this;
-            vm.$http.get(api_endpoints.contact(id)).then((response) => {
-                vm.contact = response.body; vm.isModalOpen = true;
-            }, (error) => {
-                console.log(error);
-            });
-        },
-        sendData: function () {
-            let vm = this;
-            vm.errors = false;
-            let requirement = JSON.parse(JSON.stringify(vm.requirement));
-            if (requirement.standard) {
-                requirement.free_requirement = '';
-            }
-            else {
-                requirement.standard_requirement = '';
-                $(this.$refs.standard_req).val(null).trigger('change');
-            }
-            if (!requirement.due_date) {
-                requirement.due_date = null;
-                requirement.recurrence = false;
-                delete requirement.recurrence_pattern;
-                requirement.recurrence_schedule ? delete requirement.recurrence_schedule : '';
-            }
-
-            let formData = new FormData()
-
-            // Add files to formData
-            var files = vm.$refs.filefield.files;
-            $.each(files, function (idx, v) {
-                var file = v['file'];
-                var filename = v['name'];
-                var name = 'file-' + idx;
-                formData.append(name, file, filename);
-            });
-            requirement.num_files = files.length;
-            requirement.input_name = 'requirement_doc';
-            requirement.proposal = vm.proposal_id;
-
-            if (vm.requirement.id) {
-                vm.updatingRequirement = true;
-                requirement.update = true;
-                formData.append('data', JSON.stringify(requirement));
-                vm.$http.put(helpers.add_endpoint_json(api_endpoints.proposal_requirements, requirement.id), formData, {
-                    emulateJSON: true,
-                }).then((response) => {
-                    vm.updatingRequirement = false;
-                    vm.$parent.updatedRequirements();
-                    vm.close();
-                }, (error) => {
-                    vm.errors = true;
-                    vm.errorString = helpers.apiVueResourceError(error);
-                    vm.updatingRequirement = false;
-                });
-            } else {
-                vm.addingRequirement = true;
-                requirement.update = false;
-                formData.append('data', JSON.stringify(requirement));
-                vm.$http.post(api_endpoints.proposal_requirements, formData, {
-                    emulateJSON: true,
-                }).then((response) => {
-                    vm.addingRequirement = false;
-                    vm.close();
-                    vm.$parent.updatedRequirements();
-                }, (error) => {
-                    vm.errors = true;
-                    vm.addingRequirement = false;
-                    vm.errorString = helpers.apiVueResourceError(error);
-                });
-            }
-        },
-        addFormValidations: function () {
-            let vm = this;
-            vm.validation_form = $(vm.form).validate({
-                rules: {
-                    standard_requirement: {
-                        required: {
-                            depends: function (el) {
-                                return vm.requirement.standard;
-                            }
-                        }
-                    },
-                    free_requirement: {
-                        required: {
-                            depends: function (el) {
-                                return !vm.requirement.standard;
-                            }
-                        }
-                    },
-                    schedule: {
-                        required: {
-                            depends: function (el) {
-                                return vm.requirement.recurrence;
-                            }
-                        }
-                    }
-                },
-                messages: {
-                    arrival: "field is required",
-                    departure: "field is required",
-                    campground: "field is required",
-                    campsite: "field is required"
-                },
-                showErrors: function (errorMap, errorList) {
-                    $.each(this.validElements(), function (index, element) {
-                        var $element = $(element);
-                        $element.attr("data-original-title", "").parents('.form-group').removeClass('has-error');
-                    });
-                    // destroy tooltips on valid elements
-                    $("." + this.settings.validClass).tooltip("destroy");
-                    // add or update tooltips
-                    for (var i = 0; i < errorList.length; i++) {
-                        var error = errorList[i];
-                        $(error.element)
-                            .tooltip({
-                                trigger: "focus"
-                            })
-                            .attr("data-original-title", error.message)
-                            .parents('.form-group').addClass('has-error');
-                    }
-                }
-            });
-        },
-        eventListeners: function () {
-            let vm = this;
-            // Initialise Date Picker
-            $(vm.$refs.due_date).datetimepicker(vm.datepickerOptions);
-            $(vm.$refs.due_date).on('dp.change', function (e) {
-                if ($(vm.$refs.due_date).data('DateTimePicker').date()) {
-                    vm.requirement.due_date = e.date.format('DD/MM/YYYY');
-                }
-                else if ($(vm.$refs.due_date).data('date') === "") {
-                    vm.requirement.due_date = "";
-                }
-            });
-
-            // Intialise select2
-            $(vm.$refs.standard_req).select2({
-                "theme": "bootstrap",
-                allowClear: true,
-                minimumInputLength: 2,
-                placeholder: "Select Requirement"
-            }).
-                on("select2:select", function (e) {
-                    var selected = $(e.currentTarget);
-                    vm.requirement.standard_requirement = selected.val();
-                }).
-                on("select2:unselect", function (e) {
-                    var selected = $(e.currentTarget);
-                    vm.requirement.standard_requirement = selected.val();
-                });
-        }
-    },
-    mounted: function () {
-        let vm = this;
-        vm.form = document.forms.requirementForm;
-        vm.addFormValidations();
-        this.$nextTick(() => {
-            vm.eventListeners();
-        });
-        vm.requirement.requirement_documents = vm.$refs.filefield.uploaded_documents;
-    }
-}
-</script>
diff --git a/boranga/helpers.py b/boranga/helpers.py
index 4a804fb1..3b71e338 100755
--- a/boranga/helpers.py
+++ b/boranga/helpers.py
@@ -7,10 +7,12 @@
 from django.conf import settings
 from django.core.cache import cache
 from django.core.exceptions import ValidationError
+from django.core.validators import RegexValidator
 from django.db import models
 from django.db.models import Q
 from ledger_api_client.ledger_models import EmailUserRO as EmailUser
 from ledger_api_client.managed_models import SystemGroup
+from multiselectfield import MultiSelectField
 
 from boranga.settings import (
     DJANGO_ADMIN_GROUP,
@@ -27,6 +29,28 @@
 logger = logging.getLogger(__name__)
 
 
+def check_file(file, model_name):
+    from boranga.components.main.models import FileExtensionWhitelist
+
+    # check if extension in whitelist
+    cache_key = settings.CACHE_KEY_FILE_EXTENSION_WHITELIST
+    whitelist = cache.get(cache_key)
+    if whitelist is None:
+        whitelist = FileExtensionWhitelist.objects.all()
+        cache.set(cache_key, whitelist, settings.CACHE_TIMEOUT_2_HOURS)
+
+    valid, compression = file_extension_valid(str(file), whitelist, model_name)
+
+    if not valid:
+        raise ValidationError("File type/extension not supported")
+
+    if compression:
+        # supported compression check
+        valid = compressed_content_valid(file, whitelist, model_name)
+        if not valid:
+            raise ValidationError("Unsupported type/extension in compressed file")
+
+
 def file_extension_valid(file, whitelist, model):
 
     logger.info("Uploaded File: " + file + " For Model: " + model)
@@ -43,7 +67,7 @@ def file_extension_valid(file, whitelist, model):
     if valid:
         compression = check.first().compressed
     else:
-        logger.warn(
+        logger.warning(
             "Uploaded File: " + file + " For Model: " + model + " to be Rejected"
         )
 
@@ -56,7 +80,7 @@ def tar_content_valid(file, whitelist, model):
     for i in tarFile.getnames():
         valid, compression = file_extension_valid(i, whitelist, model)
         if compression:
-            logger.warn(
+            logger.warning(
                 "Uploaded File: "
                 + str(file)
                 + " For Model: "
@@ -77,7 +101,7 @@ def sevenz_content_valid(file, whitelist, model):
     for i in sevenZipFile.getnames():
         valid, compression = file_extension_valid(i, whitelist, model)
         if compression:
-            logger.warn(
+            logger.warning(
                 "Uploaded File: "
                 + str(file)
                 + " For Model: "
@@ -98,16 +122,19 @@ def zip_content_valid(file, whitelist, model):
     for i in zipFile.filelist:
         valid, compression = file_extension_valid(i.filename, whitelist, model)
         if compression:
-            logger.warn(
-                "Uploaded File: "
-                + str(file)
-                + " For Model: "
-                + model
-                + " to be Rejected"
-            )
-            raise ValidationError(
-                "Compressed files not supported within compressed files"
-            )
+            if not i.filename.endswith(".zip"):
+                logger.warning(
+                    "Uploaded File: "
+                    + str(file)
+                    + " For Model: "
+                    + model
+                    + " to be Rejected"
+                )
+                raise ValidationError(
+                    "The only compressed format allowed in a .zip file is .zip"
+                )
+            valid = zip_content_valid(zipFile.open(i.filename), whitelist, model)
+
         if not valid:
             return False
 
@@ -401,9 +428,13 @@ def get_instance_identifier(instance):
     )
 
 
-def get_openpyxl_data_validation_type_for_django_field(field):
+def get_openpyxl_data_validation_type_for_django_field(field, column=None):
     from openpyxl.worksheet.datavalidation import DataValidation
 
+    if field in ["species", "community"]:
+        # There are always lookup tables (never embedded validation)
+        return None
+
     dv_types = dict(zip(DataValidation.type.values, DataValidation.type.values))
 
     field_type_map = {
@@ -411,13 +442,22 @@ def get_openpyxl_data_validation_type_for_django_field(field):
         models.IntegerField: "whole",
         models.DecimalField: "decimal",
         models.BooleanField: "list",
+        models.ForeignKey: "list",
         models.DateField: "date",
         models.DateTimeField: "date",
     }
 
-    if isinstance(field, models.CharField) and field.choices:
+    if isinstance(field, MultiSelectField) or (
+        isinstance(field, models.CharField) and field.choices
+    ):
         return dv_types["list"]
 
+    if column:
+        if isinstance(field, models.IntegerField) and column.is_emailuser_column:
+            # No embedded validation for email user columns because
+            # validating emails in Excel is a pain
+            return None
+
     for django_field, dv_type in field_type_map.items():
         if isinstance(field, django_field):
             return dv_types[dv_type]
@@ -496,22 +536,99 @@ def get_display_field_for_model(model: models.Model) -> str:
     Returns the field name to display for a model in the admin list display.
     """
     # Find the best field to use for a display value
-    display_field = None
-    fields = model._meta.get_fields()
-    for field in fields:
-        if field.name in settings.OCR_BULK_IMPORT_LOOKUP_TABLE_DISPLAY_FIELDS:
-            display_field = field.name
-            break
-
-    if not display_field:
-        # If we can't find a display field, we'll just use the first CharField we find
-        for field in fields:
-            if isinstance(field, models.fields.CharField):
-                display_field = field.name
-                break
-
-    if not display_field:
-        # Fall back to the id
-        display_field = "id"
-
-    return display_field
+    field_names = [field.name for field in model._meta.get_fields()]
+    for field_name in settings.OCR_BULK_IMPORT_LOOKUP_TABLE_DISPLAY_FIELDS:
+        if field_name in field_names:
+            return field_name
+
+    # If we can't find a display field, we'll just use the first CharField we find
+    for field_name in field_names:
+        if isinstance(model._meta.get_field(field_name), models.fields.CharField):
+            return field_name
+
+    return "id"
+
+
+def get_choices_for_field(
+    model_class: models.base.ModelBase, field: models.Field
+) -> list | None:
+    from boranga.components.main.models import ArchivableModel
+    from boranga.components.occurrence.models import OccurrenceReport
+
+    if model_class is OccurrenceReport and field.name == "processing_status":
+        # Only certain statuses are valid for OCR bulk import processing
+        return OccurrenceReport.VALID_BULK_IMPORT_PROCESSING_STATUSES
+
+    choices = field.choices if hasattr(field, "choices") else None
+
+    if isinstance(field, MultiSelectField):
+        # Have to create an instance for the choices to be populated :-(
+        # as for some reason they are populated in the __init__ method
+        instance = model_class()
+        multi_select_field = instance._meta.get_field(field.name)
+        choices = multi_select_field.choices
+    elif isinstance(field, (models.ForeignKey, models.ManyToManyField)):
+        related_model = field.related_model
+        related_model_qs = related_model.objects.all()
+
+        if issubclass(related_model, ArchivableModel):
+            related_model_qs = related_model_qs.filter(archived=False)
+
+        related_model_count = related_model_qs.count()
+
+        if (
+            related_model_count == 0
+            or field.name in ["species", "community"]
+            or related_model_count > settings.OCR_BULK_IMPORT_LOOKUP_TABLE_RECORD_LIMIT
+        ):
+            choices = None
+        else:
+            display_field = get_display_field_for_model(related_model)
+            choices = list(related_model_qs.values_list("id", display_field))
+
+    return choices
+
+
+def get_lookup_field_options_for_field(field: models.Field) -> list | None:
+    lookup_field_options = None
+
+    if isinstance(field, (models.ForeignKey, models.ManyToManyField)):
+        related_model = field.related_model
+        lookup_field_options = [
+            field.verbose_name.lower()
+            for field in related_model._meta.get_fields()
+            if not field.related_model
+            and (hasattr(field, "unique") and field.unique)
+            and not field.name.endswith("_number")
+        ]
+
+    return lookup_field_options
+
+
+def get_filter_field_options_for_field(field: models.Field) -> list:
+    if not isinstance(field, (models.ForeignKey, models.ManyToManyField)):
+        return []
+
+    return [
+        field.name
+        for field in field.related_model._meta.get_fields()
+        if not field.related_model
+    ]
+
+
+def get_mock_request(emailuser: EmailUser):
+    request = type("Request", (), {})()
+    request.user = type("User", (), {})()
+    request.user.id = emailuser.id
+    return request
+
+
+# Because the OCR Bulk Importer uses commas to embed list validation in the .xlsx
+# import files, we need to ensure that the display field for the lookup table
+# does not contain commas.
+no_commas_validator = RegexValidator(
+    "[,]",
+    code="comma_not_allowed",
+    message="Commas not allowed in the display field for a django lookup.",
+    inverse_match=True,
+)
diff --git a/boranga/management/__init__.py b/boranga/management/__init__.py
index e69de29b..acd6c236 100755
--- a/boranga/management/__init__.py
+++ b/boranga/management/__init__.py
@@ -0,0 +1,6 @@
+import warnings
+
+from django.core.cache import CacheKeyWarning
+
+# We are not going to use memcached, so we can ignore this warning
+warnings.simplefilter("ignore", CacheKeyWarning)
diff --git a/boranga/management/commands/ocr_process_bulk_import_queue.py b/boranga/management/commands/ocr_process_bulk_import_queue.py
index b8b11705..e0957c16 100644
--- a/boranga/management/commands/ocr_process_bulk_import_queue.py
+++ b/boranga/management/commands/ocr_process_bulk_import_queue.py
@@ -56,7 +56,23 @@ def handle(self, *args, **options):
 
         try:
             # Process the task
-            task.process()
+            errors = task.process()
+            if errors:
+                task.processing_status = (
+                    OccurrenceReportBulkImportTask.PROCESSING_STATUS_FAILED
+                )
+                task.datetime_error = timezone.now()
+                task.error_message = "Errors occurred during processing:\n"
+                for error in errors:
+                    task.error_message += f"Row: {error['row_index'] + 1}. Error: {error['error_message']}\n"
+            else:
+                # Set the task to completed
+                task.processing_status = (
+                    OccurrenceReportBulkImportTask.PROCESSING_STATUS_COMPLETED
+                )
+                task.datetime_completed = timezone.now()
+            task.save()
+
         except KeyboardInterrupt:
             logger.info(f"OCR Bulk Import Task {task.id} was interrupted")
             task.processing_status = (
diff --git a/boranga/migrations/0460_remove_occlocation_geojson_point_and_more.py b/boranga/migrations/0460_remove_occlocation_geojson_point_and_more.py
new file mode 100644
index 00000000..eddfdf48
--- /dev/null
+++ b/boranga/migrations/0460_remove_occlocation_geojson_point_and_more.py
@@ -0,0 +1,29 @@
+# Generated by Django 5.0.9 on 2024-09-16 02:11
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0459_alter_communitydocument__file_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="occlocation",
+            name="geojson_point",
+        ),
+        migrations.RemoveField(
+            model_name="occlocation",
+            name="geojson_polygon",
+        ),
+        migrations.RemoveField(
+            model_name="ocrlocation",
+            name="geojson_point",
+        ),
+        migrations.RemoveField(
+            model_name="ocrlocation",
+            name="geojson_polygon",
+        ),
+    ]
diff --git a/boranga/migrations/0461_delete_globalsettings_alter_communitydocument__file_and_more.py b/boranga/migrations/0461_delete_globalsettings_alter_communitydocument__file_and_more.py
new file mode 100644
index 00000000..65039b07
--- /dev/null
+++ b/boranga/migrations/0461_delete_globalsettings_alter_communitydocument__file_and_more.py
@@ -0,0 +1,16 @@
+# Generated by Django 5.0.9 on 2024-09-17 03:01
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0460_remove_occlocation_geojson_point_and_more"),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name="GlobalSettings",
+        ),
+    ]
diff --git a/boranga/migrations/0462_remove_conservationstatus_recommended_commonwealth_conservation_list_and_more.py b/boranga/migrations/0462_remove_conservationstatus_recommended_commonwealth_conservation_list_and_more.py
new file mode 100644
index 00000000..55db31d2
--- /dev/null
+++ b/boranga/migrations/0462_remove_conservationstatus_recommended_commonwealth_conservation_list_and_more.py
@@ -0,0 +1,44 @@
+# Generated by Django 5.0.9 on 2024-09-17 08:14
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "boranga",
+            "0461_delete_globalsettings_alter_communitydocument__file_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="conservationstatus",
+            name="recommended_commonwealth_conservation_list",
+        ),
+        migrations.RemoveField(
+            model_name="conservationstatus",
+            name="recommended_conservation_criteria",
+        ),
+        migrations.RemoveField(
+            model_name="conservationstatus",
+            name="recommended_international_conservation",
+        ),
+        migrations.RemoveField(
+            model_name="conservationstatus",
+            name="recommended_wa_legislative_category",
+        ),
+        migrations.RemoveField(
+            model_name="conservationstatus",
+            name="recommended_wa_legislative_list",
+        ),
+        migrations.RemoveField(
+            model_name="conservationstatus",
+            name="recommended_wa_priority_category",
+        ),
+        migrations.RemoveField(
+            model_name="conservationstatus",
+            name="recommended_wa_priority_list",
+        ),
+    ]
diff --git a/boranga/migrations/0463_remove_conservationstatus_change_date_and_more.py b/boranga/migrations/0463_remove_conservationstatus_change_date_and_more.py
new file mode 100644
index 00000000..46e7714c
--- /dev/null
+++ b/boranga/migrations/0463_remove_conservationstatus_change_date_and_more.py
@@ -0,0 +1,20 @@
+# Generated by Django 5.0.9 on 2024-09-17 08:20
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "boranga",
+            "0462_remove_conservationstatus_recommended_commonwealth_conservation_list_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="conservationstatus",
+            name="change_date",
+        ),
+    ]
diff --git a/boranga/migrations/0464_remove_conservationstatus_recurrence_pattern_and_more.py b/boranga/migrations/0464_remove_conservationstatus_recurrence_pattern_and_more.py
new file mode 100644
index 00000000..45fc2b8e
--- /dev/null
+++ b/boranga/migrations/0464_remove_conservationstatus_recurrence_pattern_and_more.py
@@ -0,0 +1,17 @@
+# Generated by Django 5.0.9 on 2024-09-17 08:29
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0463_remove_conservationstatus_change_date_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="conservationstatus",
+            name="recurrence_pattern",
+        ),
+    ]
diff --git a/boranga/migrations/0465_remove_conservationstatus_recurrence_schedule_and_more.py b/boranga/migrations/0465_remove_conservationstatus_recurrence_schedule_and_more.py
new file mode 100644
index 00000000..684f52ca
--- /dev/null
+++ b/boranga/migrations/0465_remove_conservationstatus_recurrence_schedule_and_more.py
@@ -0,0 +1,17 @@
+# Generated by Django 5.0.9 on 2024-09-18 01:23
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0464_remove_conservationstatus_recurrence_pattern_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="conservationstatus",
+            name="recurrence_schedule",
+        ),
+    ]
diff --git a/boranga/migrations/0466_remove_conservationstatus_review_status_and_more.py b/boranga/migrations/0466_remove_conservationstatus_review_status_and_more.py
new file mode 100644
index 00000000..051944b0
--- /dev/null
+++ b/boranga/migrations/0466_remove_conservationstatus_review_status_and_more.py
@@ -0,0 +1,17 @@
+# Generated by Django 5.0.9 on 2024-09-18 01:27
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0465_remove_conservationstatus_recurrence_schedule_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="conservationstatus",
+            name="review_status",
+        ),
+    ]
diff --git a/boranga/migrations/0467_remove_conservationstatus_reviewed_by_and_more.py b/boranga/migrations/0467_remove_conservationstatus_reviewed_by_and_more.py
new file mode 100644
index 00000000..2457ea12
--- /dev/null
+++ b/boranga/migrations/0467_remove_conservationstatus_reviewed_by_and_more.py
@@ -0,0 +1,17 @@
+# Generated by Django 5.0.9 on 2024-09-18 01:33
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0466_remove_conservationstatus_review_status_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="conservationstatus",
+            name="reviewed_by",
+        ),
+    ]
diff --git a/boranga/migrations/0468_remove_conservationstatusreferral_document_and_more.py b/boranga/migrations/0468_remove_conservationstatusreferral_document_and_more.py
new file mode 100644
index 00000000..84a1b0ab
--- /dev/null
+++ b/boranga/migrations/0468_remove_conservationstatusreferral_document_and_more.py
@@ -0,0 +1,17 @@
+# Generated by Django 5.0.9 on 2024-09-18 01:58
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0467_remove_conservationstatus_reviewed_by_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="conservationstatusreferral",
+            name="document",
+        ),
+    ]
diff --git a/boranga/migrations/0469_remove_conservationstatusreferral_referral_text_and_more.py b/boranga/migrations/0469_remove_conservationstatusreferral_referral_text_and_more.py
new file mode 100644
index 00000000..a9827f43
--- /dev/null
+++ b/boranga/migrations/0469_remove_conservationstatusreferral_referral_text_and_more.py
@@ -0,0 +1,17 @@
+# Generated by Django 5.0.9 on 2024-09-18 05:30
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0468_remove_conservationstatusreferral_document_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="conservationstatusreferral",
+            name="referral_text",
+        ),
+    ]
diff --git a/boranga/migrations/0470_remove_conservationstatusreferral_sent_from_and_more.py b/boranga/migrations/0470_remove_conservationstatusreferral_sent_from_and_more.py
new file mode 100644
index 00000000..464d8c4f
--- /dev/null
+++ b/boranga/migrations/0470_remove_conservationstatusreferral_sent_from_and_more.py
@@ -0,0 +1,17 @@
+# Generated by Django 5.0.9 on 2024-09-18 05:33
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0469_remove_conservationstatusreferral_referral_text_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="conservationstatusreferral",
+            name="sent_from",
+        ),
+    ]
diff --git a/boranga/migrations/0471_alter_communitydocument__file_and_more.py b/boranga/migrations/0471_alter_communitydocument__file_and_more.py
new file mode 100644
index 00000000..71ec8a11
--- /dev/null
+++ b/boranga/migrations/0471_alter_communitydocument__file_and_more.py
@@ -0,0 +1,16 @@
+# Generated by Django 5.0.9 on 2024-09-18 05:44
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0470_remove_conservationstatusreferral_sent_from_and_more"),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name="ConservationStatusReferralDocument",
+        ),
+    ]
diff --git a/boranga/migrations/0472_remove_conservationstatusproposalrequest_officer_and_more.py b/boranga/migrations/0472_remove_conservationstatusproposalrequest_officer_and_more.py
new file mode 100644
index 00000000..19229c5a
--- /dev/null
+++ b/boranga/migrations/0472_remove_conservationstatusproposalrequest_officer_and_more.py
@@ -0,0 +1,21 @@
+# Generated by Django 5.0.9 on 2024-09-18 05:58
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0471_alter_communitydocument__file_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="conservationstatusproposalrequest",
+            name="officer",
+        ),
+        migrations.RemoveField(
+            model_name="conservationstatusproposalrequest",
+            name="subject",
+        ),
+    ]
diff --git a/boranga/migrations/0473_alter_communitydocument__file_and_more.py b/boranga/migrations/0473_alter_communitydocument__file_and_more.py
new file mode 100644
index 00000000..db405672
--- /dev/null
+++ b/boranga/migrations/0473_alter_communitydocument__file_and_more.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.0.9 on 2024-09-19 02:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0472_remove_conservationstatusproposalrequest_officer_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="occurrencereportbulkimportschemacolumn",
+            name="django_lookup_field_name",
+            field=models.CharField(blank=True, max_length=50, null=True),
+        ),
+    ]
diff --git a/boranga/migrations/0474_alter_communitydocument__file_and_more.py b/boranga/migrations/0474_alter_communitydocument__file_and_more.py
new file mode 100644
index 00000000..b39da08f
--- /dev/null
+++ b/boranga/migrations/0474_alter_communitydocument__file_and_more.py
@@ -0,0 +1,23 @@
+# Generated by Django 5.0.9 on 2024-09-26 04:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0473_alter_communitydocument__file_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="occurrence",
+            name="migrated_from_id",
+            field=models.CharField(blank=True, max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name="occurrencereport",
+            name="migrated_from_id",
+            field=models.CharField(blank=True, max_length=50, null=True),
+        ),
+    ]
diff --git a/boranga/migrations/0475_auto_20240926_1222.py b/boranga/migrations/0475_auto_20240926_1222.py
new file mode 100644
index 00000000..83a96283
--- /dev/null
+++ b/boranga/migrations/0475_auto_20240926_1222.py
@@ -0,0 +1,21 @@
+# Generated by Django 5.0.9 on 2024-09-26 04:22
+
+from django.db import migrations
+
+
+def set_emtpy_migrated_from_ids_to_null(apps, schema_editor):
+    Occurrence = apps.get_model("boranga", "Occurrence")
+    occurrences = Occurrence.objects.filter(migrated_from_id="")
+    occurrences.update(migrated_from_id=None)
+    OccurrenceReport = apps.get_model("boranga", "OccurrenceReport")
+    reports = OccurrenceReport.objects.filter(migrated_from_id="")
+    reports.update(migrated_from_id=None)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0474_alter_communitydocument__file_and_more"),
+    ]
+
+    operations = []
diff --git a/boranga/migrations/0476_auto_20240926_1225.py b/boranga/migrations/0476_auto_20240926_1225.py
new file mode 100644
index 00000000..9339fcba
--- /dev/null
+++ b/boranga/migrations/0476_auto_20240926_1225.py
@@ -0,0 +1,23 @@
+# Generated by Django 5.0.9 on 2024-09-26 04:25
+
+from django.db import migrations
+
+
+def set_emtpy_migrated_from_ids_to_null(apps, schema_editor):
+    Occurrence = apps.get_model("boranga", "Occurrence")
+    occurrences = Occurrence.objects.filter(migrated_from_id="")
+    occurrences.update(migrated_from_id=None)
+    OccurrenceReport = apps.get_model("boranga", "OccurrenceReport")
+    reports = OccurrenceReport.objects.filter(migrated_from_id="")
+    reports.update(migrated_from_id=None)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0475_auto_20240926_1222"),
+    ]
+
+    operations = [
+        migrations.RunPython(set_emtpy_migrated_from_ids_to_null),
+    ]
diff --git a/boranga/migrations/0477_alter_communitydocument__file_and_more.py b/boranga/migrations/0477_alter_communitydocument__file_and_more.py
new file mode 100644
index 00000000..843bfd09
--- /dev/null
+++ b/boranga/migrations/0477_alter_communitydocument__file_and_more.py
@@ -0,0 +1,23 @@
+# Generated by Django 5.0.9 on 2024-09-26 04:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0476_auto_20240926_1225"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="occurrence",
+            name="migrated_from_id",
+            field=models.CharField(blank=True, max_length=50, null=True, unique=True),
+        ),
+        migrations.AlterField(
+            model_name="occurrencereport",
+            name="migrated_from_id",
+            field=models.CharField(blank=True, max_length=50, null=True, unique=True),
+        ),
+    ]
diff --git a/boranga/migrations/0478_remove_occurrencereportbulkimportschemacolumn_xlsx_data_validation_formula1_and_more.py b/boranga/migrations/0478_remove_occurrencereportbulkimportschemacolumn_xlsx_data_validation_formula1_and_more.py
new file mode 100644
index 00000000..a60d825b
--- /dev/null
+++ b/boranga/migrations/0478_remove_occurrencereportbulkimportschemacolumn_xlsx_data_validation_formula1_and_more.py
@@ -0,0 +1,29 @@
+# Generated by Django 5.0.9 on 2024-09-30 03:43
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0477_alter_communitydocument__file_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="occurrencereportbulkimportschemacolumn",
+            name="xlsx_data_validation_formula1",
+        ),
+        migrations.RemoveField(
+            model_name="occurrencereportbulkimportschemacolumn",
+            name="xlsx_data_validation_formula2",
+        ),
+        migrations.RemoveField(
+            model_name="occurrencereportbulkimportschemacolumn",
+            name="xlsx_data_validation_operator",
+        ),
+        migrations.RemoveField(
+            model_name="occurrencereportbulkimportschemacolumn",
+            name="xlsx_data_validation_type",
+        ),
+    ]
diff --git a/boranga/migrations/0479_alter_communitydocument__file_and_more.py b/boranga/migrations/0479_alter_communitydocument__file_and_more.py
new file mode 100644
index 00000000..22f64a4c
--- /dev/null
+++ b/boranga/migrations/0479_alter_communitydocument__file_and_more.py
@@ -0,0 +1,107 @@
+# Generated by Django 5.0.9 on 2024-09-30 08:29
+
+import boranga.components.conservation_status.models
+import boranga.components.meetings.models
+import boranga.components.occurrence.models
+import boranga.components.species_and_communities.models
+import boranga.components.users.models
+import django.core.files.storage
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "boranga",
+            "0478_remove_occurrencereportbulkimportschemacolumn_xlsx_data_validation_formula1_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="SchemaColumnLookupFilter",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("filter_field_name", models.CharField(max_length=50)),
+                (
+                    "filter_type",
+                    models.CharField(
+                        choices=[
+                            ("exact", "Exact"),
+                            ("iexact", "Case-insensitive Exact"),
+                            ("contains", "Contains"),
+                            ("icontains", "Case-insensitive Contains"),
+                            ("startswith", "Starts with"),
+                            ("istartswith", "Case-insensitive Starts with"),
+                            ("endswith", "Ends with"),
+                            ("iendswith", "Case-insensitive Ends with"),
+                            ("gt", "Greater than"),
+                            ("gte", "Greater than or equal to"),
+                            ("lt", "Less than"),
+                            ("lte", "Less than or equal to"),
+                            ("in", "In"),
+                        ],
+                        default="exact",
+                        max_length=50,
+                    ),
+                ),
+                (
+                    "schema_column",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="lookup_filters",
+                        to="boranga.occurrencereportbulkimportschemacolumn",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Schema Column Lookup Filter",
+                "verbose_name_plural": "Schema Column Lookup Filters",
+            },
+        ),
+        migrations.CreateModel(
+            name="SchemaColumnLookupFilterValue",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("filter_value", models.CharField(max_length=255)),
+                (
+                    "lookup_filter",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="values",
+                        to="boranga.schemacolumnlookupfilter",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Schema Column Lookup Filter Value",
+                "verbose_name_plural": "Schema Column Lookup Filter Values",
+            },
+        ),
+        migrations.AddConstraint(
+            model_name="schemacolumnlookupfilter",
+            constraint=models.UniqueConstraint(
+                fields=("schema_column", "filter_field_name", "filter_type"),
+                name="unique_schema_column_lookup_field",
+                violation_error_message="A lookup filter with the same name and type already exists for this schema column",
+            ),
+        ),
+    ]
diff --git a/boranga/migrations/0480_alter_communitydocument__file_and_more.py b/boranga/migrations/0480_alter_communitydocument__file_and_more.py
new file mode 100644
index 00000000..9e09fed6
--- /dev/null
+++ b/boranga/migrations/0480_alter_communitydocument__file_and_more.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.0.9 on 2024-10-02 06:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0479_alter_communitydocument__file_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="schemacolumnlookupfiltervalue",
+            name="filter_value",
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+    ]
diff --git a/boranga/migrations/0481_alter_communitydocument__file_and_more.py b/boranga/migrations/0481_alter_communitydocument__file_and_more.py
new file mode 100644
index 00000000..c0c92fae
--- /dev/null
+++ b/boranga/migrations/0481_alter_communitydocument__file_and_more.py
@@ -0,0 +1,45 @@
+# Generated by Django 5.0.9 on 2024-10-03 06:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0480_alter_communitydocument__file_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="occurrencereportbulkimportschemacolumn",
+            name="default_value",
+            field=models.CharField(
+                blank=True,
+                choices=[("bulk_import_submitter", "Bulk Import Submitter")],
+                max_length=255,
+                null=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="schemacolumnlookupfilter",
+            name="filter_type",
+            field=models.CharField(
+                choices=[
+                    ("exact", "Exact"),
+                    ("iexact", "Case-insensitive Exact"),
+                    ("contains", "Contains"),
+                    ("icontains", "Case-insensitive Contains"),
+                    ("startswith", "Starts with"),
+                    ("istartswith", "Case-insensitive Starts with"),
+                    ("endswith", "Ends with"),
+                    ("iendswith", "Case-insensitive Ends with"),
+                    ("gt", "Greater than"),
+                    ("gte", "Greater than or equal to"),
+                    ("lt", "Less than"),
+                    ("lte", "Less than or equal to"),
+                ],
+                default="exact",
+                max_length=50,
+            ),
+        ),
+    ]
diff --git a/boranga/migrations/0482_occurrencereportbulkimportschemacolumn_is_emailuser_column_and_more.py b/boranga/migrations/0482_occurrencereportbulkimportschemacolumn_is_emailuser_column_and_more.py
new file mode 100644
index 00000000..62d49a61
--- /dev/null
+++ b/boranga/migrations/0482_occurrencereportbulkimportschemacolumn_is_emailuser_column_and_more.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.0.9 on 2024-10-03 06:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0481_alter_communitydocument__file_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="occurrencereportbulkimportschemacolumn",
+            name="is_emailuser_column",
+            field=models.BooleanField(default=False),
+        ),
+    ]
diff --git a/boranga/migrations/0483_remove_occurrencereportproposalrequest_officer_and_more.py b/boranga/migrations/0483_remove_occurrencereportproposalrequest_officer_and_more.py
new file mode 100644
index 00000000..3d729077
--- /dev/null
+++ b/boranga/migrations/0483_remove_occurrencereportproposalrequest_officer_and_more.py
@@ -0,0 +1,218 @@
+# Generated by Django 5.0.9 on 2024-10-09 05:02
+
+import django.core.files.storage
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('boranga', '0482_occurrencereportbulkimportschemacolumn_is_emailuser_column_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='occurrencereportproposalrequest',
+            name='officer',
+        ),
+        migrations.RemoveField(
+            model_name='occurrencereportproposalrequest',
+            name='subject',
+        ),
+        migrations.AlterField(
+            model_name='animalhealth',
+            name='name',
+            field=models.CharField(max_length=250, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='coordinatesource',
+            name='name',
+            field=models.CharField(max_length=250, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='countedsubject',
+            name='name',
+            field=models.CharField(max_length=250, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='currentimpact',
+            name='name',
+            field=models.CharField(max_length=100, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='deathreason',
+            name='name',
+            field=models.CharField(max_length=250, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='district',
+            name='name',
+            field=models.CharField(max_length=200, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='documentcategory',
+            name='document_category_name',
+            field=models.CharField(max_length=128, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='documentsubcategory',
+            name='document_sub_category_name',
+            field=models.CharField(max_length=128, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='drainage',
+            name='name',
+            field=models.CharField(max_length=250, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='identificationcertainty',
+            name='name',
+            field=models.CharField(max_length=250, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='intensity',
+            name='name',
+            field=models.CharField(max_length=250, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='landform',
+            name='name',
+            field=models.CharField(max_length=250, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='locationaccuracy',
+            name='name',
+            field=models.CharField(max_length=250, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='observationmethod',
+            name='name',
+            field=models.CharField(max_length=250, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='occurrencetenurepurpose',
+            name='code',
+            field=models.CharField(blank=True, max_length=20, null=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='occurrencetenurepurpose',
+            name='label',
+            field=models.CharField(blank=True, max_length=100, null=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='occurrencetenurevesting',
+            name='code',
+            field=models.CharField(blank=True, max_length=20, null=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='occurrencetenurevesting',
+            name='label',
+            field=models.CharField(blank=True, max_length=100, null=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='permittype',
+            name='name',
+            field=models.CharField(max_length=250, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='plantcondition',
+            name='name',
+            field=models.CharField(max_length=250, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='plantcountaccuracy',
+            name='name',
+            field=models.CharField(max_length=250, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='plantcountmethod',
+            name='name',
+            field=models.CharField(max_length=250, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='potentialimpact',
+            name='name',
+            field=models.CharField(max_length=100, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='potentialthreatonset',
+            name='name',
+            field=models.CharField(max_length=100, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='primarydetectionmethod',
+            name='name',
+            field=models.CharField(max_length=250, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='proposalamendmentreason',
+            name='reason',
+            field=models.CharField(max_length=125, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')], verbose_name='Reason'),
+        ),
+        migrations.AlterField(
+            model_name='region',
+            name='name',
+            field=models.CharField(default=None, max_length=200, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='reproductivestate',
+            name='name',
+            field=models.CharField(max_length=250, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='rocktype',
+            name='name',
+            field=models.CharField(max_length=250, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='sampledestination',
+            name='name',
+            field=models.CharField(max_length=250, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='sampletype',
+            name='name',
+            field=models.CharField(max_length=250, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='secondarysign',
+            name='name',
+            field=models.CharField(max_length=250, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='soilcolour',
+            name='name',
+            field=models.CharField(max_length=250, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='soilcondition',
+            name='name',
+            field=models.CharField(max_length=250, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='soiltype',
+            name='name',
+            field=models.CharField(max_length=250, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='submittercategory',
+            name='name',
+            field=models.CharField(max_length=100, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='threatagent',
+            name='name',
+            field=models.CharField(max_length=100, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='threatcategory',
+            name='name',
+            field=models.CharField(max_length=128, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+        migrations.AlterField(
+            model_name='wildstatus',
+            name='name',
+            field=models.CharField(max_length=250, unique=True, validators=[django.core.validators.RegexValidator('[,]', code='comma_not_allowed', inverse_match=True, message='Commas not allowed in the display field for a django lookup.')]),
+        ),
+    ]
diff --git a/boranga/migrations/0484_occurrencereportbulkimportschema_is_master_and_more.py b/boranga/migrations/0484_occurrencereportbulkimportschema_is_master_and_more.py
new file mode 100644
index 00000000..6a72d258
--- /dev/null
+++ b/boranga/migrations/0484_occurrencereportbulkimportschema_is_master_and_more.py
@@ -0,0 +1,23 @@
+# Generated by Django 5.0.9 on 2024-10-10 01:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0483_remove_occurrencereportproposalrequest_officer_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="occurrencereportbulkimportschema",
+            name="is_master",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name="occurrencereportbulkimportschemacolumn",
+            name="is_editable",
+            field=models.BooleanField(default=True),
+        ),
+    ]
diff --git a/boranga/migrations/0485_alter_communitydocument__file_and_more.py b/boranga/migrations/0485_alter_communitydocument__file_and_more.py
new file mode 100644
index 00000000..5ae35c49
--- /dev/null
+++ b/boranga/migrations/0485_alter_communitydocument__file_and_more.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.0.9 on 2024-10-10 06:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0484_occurrencereportbulkimportschema_is_master_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="occurrencereportbulkimportschema",
+            name="datetime_updated",
+            field=models.DateTimeField(auto_now=True),
+        ),
+    ]
diff --git a/boranga/migrations/0486_occurrencereportbulkimporttask__associated_files_zip_and_more.py b/boranga/migrations/0486_occurrencereportbulkimporttask__associated_files_zip_and_more.py
new file mode 100644
index 00000000..df113baa
--- /dev/null
+++ b/boranga/migrations/0486_occurrencereportbulkimporttask__associated_files_zip_and_more.py
@@ -0,0 +1,32 @@
+# Generated by Django 5.0.9 on 2024-10-11 01:55
+
+import boranga.components.occurrence.models
+import django.core.files.storage
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0485_alter_communitydocument__file_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="occurrencereportbulkimporttask",
+            name="_associated_files_zip",
+            field=models.FileField(
+                blank=True,
+                max_length=512,
+                null=True,
+                storage=django.core.files.storage.FileSystemStorage(
+                    base_url="/private-media/",
+                    location="/home/oak/dev/boranga/private-media/",
+                ),
+                upload_to=boranga.components.occurrence.models.get_occurrence_report_bulk_import_associated_files_path,
+                validators=[
+                    boranga.components.occurrence.models.validate_bulk_import_associated_files_extension
+                ],
+            ),
+        ),
+    ]
diff --git a/boranga/settings.py b/boranga/settings.py
index 20da555e..47cd87c2 100755
--- a/boranga/settings.py
+++ b/boranga/settings.py
@@ -285,6 +285,11 @@ def show_toolbar(request):
 
 RUNNING_DEVSERVER = len(sys.argv) > 1 and sys.argv[1] == "runserver"
 
+SECURE_CROSS_ORIGIN_OPENER_POLICY = env(
+    "SECURE_CROSS_ORIGIN_OPENER_POLICY",
+    "same-origin",
+)
+
 # Sentry settings
 SENTRY_DSN = env("SENTRY_DSN", default=None)
 SENTRY_SAMPLE_RATE = env("SENTRY_SAMPLE_RATE", default=1.0)  # Error sampling rate
@@ -487,10 +492,13 @@ def show_toolbar(request):
 
 OCR_BULK_IMPORT_LOOKUP_TABLE_DISPLAY_FIELDS = [
     "name",
+    "label",
     "display_name",
     "code",
 ]
 
 OCR_BULK_IMPORT_LOOKUP_TABLE_RECORD_LIMIT = env(
-    "OCR_BULK_IMPORT_LOOKUP_TABLE_RECORD_LIMIT", 100
+    "OCR_BULK_IMPORT_LOOKUP_TABLE_RECORD_LIMIT", 30
 )
+
+OCR_BULK_IMPORT_M2M_DELIMITER = env("OCR_BULK_IMPORT_M2M_DELIMITER", "||")
diff --git a/boranga/templates/webtemplate_dbca/includes/staff_menu.html b/boranga/templates/webtemplate_dbca/includes/staff_menu.html
index 8d808e22..923daeda 100644
--- a/boranga/templates/webtemplate_dbca/includes/staff_menu.html
+++ b/boranga/templates/webtemplate_dbca/includes/staff_menu.html
@@ -1,8 +1,10 @@
 {% load users %}
 {% is_django_admin as is_django_admin_user %}
+{% is_occurrence_approver as is_occurrence_approver %}
+
 {% if is_django_admin_user %}
     <li><a class="dropdown-item" href="{% url 'admin:index' %}">Admin</a></li>
 {% endif %}
-{% if is_django_admin_user or request.user.is_superuser %}
+{% if request.user.is_superuser or is_django_admin_user or is_occurrence_approver %}
     <li><a class="dropdown-item" href="/internal/occurrence_report/bulk_import_schema/">OCR Bulk Import Schema</a></li>
 {% endif %}
diff --git a/boranga/urls.py b/boranga/urls.py
index 816d2e38..ae60d758 100755
--- a/boranga/urls.py
+++ b/boranga/urls.py
@@ -160,6 +160,11 @@ def trigger_error(request):
     occurrence_api.OccurrenceReportBulkImportSchemaViewSet,
     "occurrence_report_bulk_import_schemas",
 )
+router.register(
+    r"occurrence_report_bulk_import_schema_columns",
+    occurrence_api.OccurrenceReportBulkImportSchemaColumnViewSet,
+    "occurrence_report_bulk_import_schema_columns",
+)
 router.register(r"observer_detail", occurrence_api.ObserverDetailViewSet)
 router.register(r"contact_detail", occurrence_api.ContactDetailViewSet)
 router.register(r"occurrence_sites", occurrence_api.OccurrenceSiteViewSet)
@@ -170,7 +175,6 @@ def trigger_error(request):
 router.register(r"occ_threat", occurrence_api.OCCConservationThreatViewSet)
 
 router.register(r"users", users_api.UserViewSet)
-router.register(r"global_settings", main_api.GlobalSettingsViewSet)
 
 router.register(r"tile_layer", spatial_api.TileLayerViewSet, "tile_layer")
 router.register(r"regions", species_communities_api.RegionViewSet, "regions")
diff --git a/manage.py b/manage.py
index 6ac292de..b3648a70 100755
--- a/manage.py
+++ b/manage.py
@@ -1,20 +1,15 @@
 #!/usr/bin/env python3
-import confy
 import os
 import sys
 
-#confy.read_environment_file()
-
-#if __name__ == "__main__":
-#    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "boranga.settings")
-#    from django.core.management import execute_from_command_line
-#    execute_from_command_line(sys.argv)
+import confy
 
-dot_env = os.path.join(os.getcwd(), '.env')
+dot_env = os.path.join(os.getcwd(), ".env")
 if os.path.exists(dot_env):
     confy.read_environment_file()
 
 if __name__ == "__main__":
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "boranga.settings")
     from django.core.management import execute_from_command_line
+
     execute_from_command_line(sys.argv)
diff --git a/requirements.txt b/requirements.txt
index 4014510b..a6122e86 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 git+https://github.com/dbca-wa/webtemplate2.git#egg=webtemplate_dbca
 psycopg2-binary~=2.9
-Django~=5.0.8
+Django~=5.0.9
 django-extensions~=3.2
 ipython~=8.22
 git+https://github.com/dbca-wa/ledger_api_client.git#egg=ledger_api_client
@@ -40,7 +40,7 @@ xlwt==1.3.0
 xlsxwriter~=3.2
 gunicorn~=23.0
 dj-static==0.0.6
-Pillow~=10.4
+pillow~=10.4
 mixer~=7.2
 django-dirtyfields~=1.9
 python-docx~=1.1.0