diff --git a/.github/workflows/test_server.yaml b/.github/workflows/test_server.yaml
index b26780cba..65a08ce91 100644
--- a/.github/workflows/test_server.yaml
+++ b/.github/workflows/test_server.yaml
@@ -78,4 +78,4 @@ jobs:
           HT_DB_NAME: ${{ env.POSTGRES_DB }}
           HT_DB_PORT: ${{ job.services.postgres.ports[5432] }}
         run: |
-          pytest
+          pytest -n auto
diff --git a/.gitignore b/.gitignore
index 4b8ad2a4b..9d50cb701 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 **/.env
 **/.secrets
 .coverage
-.coveragerc
 **/*.sqlite3
 **/*.rdb
 **/.pytest_cache/
diff --git a/.idea/runConfigurations/PyTest.xml b/.idea/runConfigurations/PyTest.xml
index 945927aa3..f43d37a4c 100644
--- a/.idea/runConfigurations/PyTest.xml
+++ b/.idea/runConfigurations/PyTest.xml
@@ -1,6 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="PyTest" type="tests" factoryName="py.test">
     <module name="haztrak" />
+    <option name="ENV_FILES" value="" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <option name="SDK_HOME" value="" />
@@ -21,7 +22,7 @@
     </EXTENSION>
     <option name="_new_keywords" value="&quot;&quot;" />
     <option name="_new_parameters" value="&quot;&quot;" />
-    <option name="_new_additionalArguments" value="&quot;&quot;" />
+    <option name="_new_additionalArguments" value="&quot;-n auto&quot;" />
     <option name="_new_target" value="&quot;&quot;" />
     <option name="_new_targetType" value="&quot;CUSTOM&quot;" />
     <method v="2" />
diff --git a/runhaz.sh b/runhaz.sh
index 8d7f60148..13e907182 100755
--- a/runhaz.sh
+++ b/runhaz.sh
@@ -118,8 +118,8 @@ run_pre_commit() {
 
 run_coverage() {
     # Run the test suite with coverage
-    (cd $base_dir/server; eval "coverage run -m pytest")
-    (cd $base_dir/server; eval "coverage report")
+    (cd "$base_dir"/server || exit; eval "coverage run")
+    (cd "$base_dir"/server || exit; eval "coverage report")
     exit
   }
 
diff --git a/server/.coveragerc b/server/.coveragerc
new file mode 100644
index 000000000..24a3d8c49
--- /dev/null
+++ b/server/.coveragerc
@@ -0,0 +1,36 @@
+[run]
+source = apps
+branch = True
+command_line = -m pytest
+
+omit =
+    *admin.py
+    *apps.py
+    **/__init__.py
+    *wsgi.py
+    *asgi.py
+    *settings.py
+
+[report]
+# Exclude lines that are pragma: no cover
+exclude_lines =
+    pragma: no cover
+
+    # Don't complain about missing debug-only code:
+    def __repr__
+    if self\.debug
+
+    # Don't complain if tests don't hit defensive assertion code:
+    raise AssertionError
+    raise NotImplementedError
+
+    # Don't complain if non-runnable code isn't run:
+    if 0:
+    if __name__ == .__main__.:
+    pass
+
+# files to run coverage on but omit in the report
+omit =
+    **/migrations/*
+    **/test_*.py
+skip_empty = True
diff --git a/server/.gitignore b/server/.gitignore
index 57b196ba5..61e3a20a6 100644
--- a/server/.gitignore
+++ b/server/.gitignore
@@ -4,3 +4,4 @@ static/
 .mypy_cache
 test_db-journal
 **/*coverage.json
+/htmlcov/
diff --git a/server/apps/core/migrations/0001_initial.py b/server/apps/core/migrations/0001_initial.py
index d3334cc5c..bc7d85e80 100644
--- a/server/apps/core/migrations/0001_initial.py
+++ b/server/apps/core/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.10 on 2024-02-17 21:09
+# Generated by Django 4.2.10 on 2024-02-21 22:17
 
 import django.contrib.auth.models
 import django.contrib.auth.validators
diff --git a/server/apps/handler/migrations/0001_initial.py b/server/apps/handler/migrations/0001_initial.py
index 4e79aea07..50340df86 100644
--- a/server/apps/handler/migrations/0001_initial.py
+++ b/server/apps/handler/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.10 on 2024-02-17 21:09
+# Generated by Django 4.2.10 on 2024-02-21 22:17
 
 import apps.handler.models.contact_models
 from django.db import migrations, models
diff --git a/server/apps/handler/migrations/0002_initial.py b/server/apps/handler/migrations/0002_initial.py
index 464128c3f..28a65cfbd 100644
--- a/server/apps/handler/migrations/0002_initial.py
+++ b/server/apps/handler/migrations/0002_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.10 on 2024-02-17 21:09
+# Generated by Django 4.2.10 on 2024-02-21 22:17
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -9,8 +9,8 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('handler', '0001_initial'),
         ('manifest', '0001_initial'),
+        ('handler', '0001_initial'),
     ]
 
     operations = [
diff --git a/server/apps/handler/models/handler_models.py b/server/apps/handler/models/handler_models.py
index 65b2bd3dd..83d2ab2a1 100644
--- a/server/apps/handler/models/handler_models.py
+++ b/server/apps/handler/models/handler_models.py
@@ -15,7 +15,7 @@
 
 
 class HandlerManager(TrakBaseManager):
-    """Inter-model related functionality for the Handler Model"""
+    """model manager and query interface for Handler model."""
 
     def save(self, instance: Optional["Handler"], **handler_data) -> "Handler":
         paper_signature = handler_data.pop("paper_signature", None)
@@ -93,7 +93,7 @@ def __str__(self):
 
 
 class TransporterManager(HandlerManager):
-    """Inter-model related functionality for Transporter Model"""
+    """Transporter Model database querying interface"""
 
     def save(self, instance: Optional["Transporter"], **data: Dict) -> "Transporter":
         """Create a Transporter from a manifest instance and rcra_site dict"""
diff --git a/server/apps/handler/models/signature.py b/server/apps/handler/models/signature.py
index 6886a67af..02d05b915 100644
--- a/server/apps/handler/models/signature.py
+++ b/server/apps/handler/models/signature.py
@@ -83,9 +83,7 @@ def __str__(self):
 
 
 class ESignatureManager(TrakBaseManager):
-    """
-    Inter-model related functionality for ESignature Model
-    """
+    """ESignature Model database querying interface"""
 
     def save(self, **e_signature_data):
         """
diff --git a/server/apps/manifest/migrations/0001_initial.py b/server/apps/manifest/migrations/0001_initial.py
index e3ddb09e0..05193bc0c 100644
--- a/server/apps/manifest/migrations/0001_initial.py
+++ b/server/apps/manifest/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.10 on 2024-02-17 21:09
+# Generated by Django 4.2.10 on 2024-02-21 22:17
 
 import apps.manifest.models
 from django.db import migrations, models
diff --git a/server/apps/manifest/models.py b/server/apps/manifest/models.py
index 83fe23b6b..2b40a01e3 100644
--- a/server/apps/manifest/models.py
+++ b/server/apps/manifest/models.py
@@ -1,6 +1,7 @@
 import logging
 import re
-from typing import List, Optional
+from abc import ABC, abstractmethod
+from typing import List, Literal, Optional
 
 from django.conf import settings
 from django.core.exceptions import ValidationError
@@ -16,15 +17,13 @@
 
 
 def draft_mtn():
-    """
-    A callable that returns a timestamped draft MTN in lieu of an
-    official MTN from e-Manifest
-    """
+    """returns a timestamped draft MTN in lieu of an official MTN from e-Manifest"""
     mtn_count: int = Manifest.objects.all().count()
     return f"{str(mtn_count).zfill(9)}DFT"
 
 
 def validate_mtn(value):
+    """Validate manifest tracking number format"""
     if not re.match(r"[0-9]{9}[A-Z]{3}", value):
         raise ValidationError(
             _("%(value)s is not in valid MTN format: [0-9]{9}[A-Z]{3}"),
@@ -32,30 +31,76 @@ def validate_mtn(value):
         )
 
 
-class ManifestManager(models.Manager):
-    """Manifest Model querying interface"""
+class ManifestHandlerFilter(ABC):
+    """Abstract class with methods for filtering manifests by handler"""
+
+    @abstractmethod
+    def filter_by_epa_id(self, epa_id: str) -> QuerySet:
+        pass
+
+
+class GeneratorFilter(ManifestHandlerFilter):
+    """ManifestHandlerFilter implementation for filtering manifests by generator"""
+
+    def filter_by_epa_id(self, epa_id: str) -> Q:
+        return Q(generator__rcra_site__epa_id=epa_id)
+
+
+class TransporterFilter(ManifestHandlerFilter):
+    """ManifestHandlerFilter implementation for filtering manifests by Transporter"""
+
+    def filter_by_epa_id(self, epa_id: str) -> Q:
+        return Q(transporters__rcra_site__epa_id=epa_id)
+
 
-    def existing_mtn(self, *args, mtn: List[str]) -> QuerySet:
-        """
-        Filter non-existent manifest tracking numbers (MTN).
-        Also accepts *args to pass things like django.db.models.Q objects
-        """
-        return self.model.objects.filter(*args, mtn__in=mtn)
+class TsdfFilter(ManifestHandlerFilter):
+    """ManifestHandlerFilter implementation for filtering manifests by receiving facility"""
+
+    def filter_by_epa_id(self, epa_id: str) -> Q:
+        return Q(tsdf__rcra_site__epa_id=epa_id)
+
+
+class AllHandlerFilter(ManifestHandlerFilter):
+    """ManifestHandlerFilter implementation for filtering manifests by all handlers types"""
+
+    def filter_by_epa_id(self, epa_id: str) -> Q:
+        return Q(
+            Q(generator__rcra_site__epa_id=epa_id)
+            | Q(tsdf__rcra_site__epa_id=epa_id)
+            | Q(transporters__rcra_site__epa_id=epa_id)
+        )
+
+
+class HandlerFilterFactory:
+    """Abstract Factory for creating ManifestHandlerFilter instances based on site_type"""
 
     @staticmethod
-    def get_handler_query(site_id: str, site_type: RcraSiteType | str):
-        """Returns a Django Query object for filtering by rcra_site type"""
-        if isinstance(site_type, str) and not isinstance(site_type, RcraSiteType):
-            site_type = site_type.lower()
-        match site_type:
-            case RcraSiteType.GENERATOR | "generator":
-                return Q(generator__rcra_site__epa_id=site_id)
-            case RcraSiteType.TRANSPORTER | "transporter":
-                return Q(transporters__rcra_site__epa_id=site_id)
-            case RcraSiteType.TSDF | "tsdf":
-                return Q(tsdf__rcra_site__epa_id=site_id)
-            case _:
-                raise ValueError(f"unrecognized site_type argument {site_type}")
+    def get_filter(site_type: RcraSiteType | Literal["all"]):
+        if site_type == RcraSiteType.GENERATOR:
+            return GeneratorFilter()
+        elif site_type == RcraSiteType.TRANSPORTER:
+            return TransporterFilter()
+        elif site_type == RcraSiteType.TSDF:
+            return TsdfFilter()
+        elif site_type == "all":
+            return AllHandlerFilter()
+        else:
+            raise ValueError(f"unrecognized site_type argument {site_type}")
+
+
+class ManifestManager(models.Manager):
+    """Manifest Model database querying interface"""
+
+    def filter_existing_mtn(self, mtn: List[str]) -> QuerySet:
+        """Filter non-existent manifest tracking numbers (MTN)."""
+        return self.model.objects.filter(mtn__in=mtn)
+
+    def filter_by_handler_epa_id(
+        self, epa_ids: [str], site_type: RcraSiteType | Literal["all"] = "all"
+    ) -> QuerySet:
+        """Filter manifests by site_id and site_type"""
+        handler_filter = HandlerFilterFactory.get_filter(site_type)
+        return self.filter(handler_filter.filter_by_epa_id(epa_ids))
 
     @classmethod
     def save(cls, instance: Optional["Manifest"], **manifest_data: dict) -> "Manifest":
diff --git a/server/apps/manifest/serializers.py b/server/apps/manifest/serializers.py
index cf31b32ae..7fd55c826 100644
--- a/server/apps/manifest/serializers.py
+++ b/server/apps/manifest/serializers.py
@@ -21,12 +21,7 @@
 logger = logging.getLogger(__name__)
 
 
-class TrakBaseSerializer(serializers.ModelSerializer):
-    """
-    The Django Trak app base serializers class used to share functionality
-    across trak app serializers universally.
-    """
-
+class ManifestBaseSerializer(serializers.ModelSerializer):
     def __str__(self):
         return f"{self.__class__.__name__}"
 
@@ -47,7 +42,7 @@ def to_representation(self, instance):
         return data
 
 
-class AdditionalInfoSerializer(TrakBaseSerializer):
+class AdditionalInfoSerializer(ManifestBaseSerializer):
     originalManifestTrackingNumbers = serializers.JSONField(
         allow_null=True,
         required=False,
@@ -87,7 +82,7 @@ class Meta:
         )
 
 
-class ManifestSerializer(TrakBaseSerializer):
+class ManifestSerializer(ManifestBaseSerializer):
     """
     Manifest model serializer for JSON marshalling/unmarshalling
     """
@@ -281,7 +276,7 @@ class Meta:
         ]
 
 
-class PortOfEntrySerializer(TrakBaseSerializer):
+class PortOfEntrySerializer(ManifestBaseSerializer):
     """
     Serializer for Port Of Entry
     """
@@ -301,3 +296,31 @@ class PortOfEntrySerializer(TrakBaseSerializer):
     class Meta:
         model = PortOfEntry
         fields = ["state", "cityPort"]
+
+
+class MtnSerializer(serializers.ModelSerializer):
+    """Select details of a manifest including manifest tracking number (mtn)."""
+
+    manifestTrackingNumber = serializers.CharField(
+        source="mtn",
+        required=False,
+    )
+    # status
+    submissionType = serializers.CharField(
+        source="submission_type",
+        required=False,
+    )
+    signatureStatus = serializers.BooleanField(
+        source="signature_status",
+        allow_null=True,
+        default=False,
+    )
+
+    class Meta:
+        model = Manifest
+        fields = [
+            "manifestTrackingNumber",
+            "status",
+            "submissionType",
+            "signatureStatus",
+        ]
diff --git a/server/apps/manifest/services/__init__.py b/server/apps/manifest/services/__init__.py
index 5df666afd..b1b75b6b3 100644
--- a/server/apps/manifest/services/__init__.py
+++ b/server/apps/manifest/services/__init__.py
@@ -1,5 +1,5 @@
 from .emanifest import EManifest, EManifestError, PullManifestsResult, TaskResponse
-from .manifest_services import (
+from .manifest import (
     create_manifest,
     get_manifests,
     save_emanifest,
diff --git a/server/apps/manifest/services/emanifest.py b/server/apps/manifest/services/emanifest.py
index afe397fb6..10fcee4da 100644
--- a/server/apps/manifest/services/emanifest.py
+++ b/server/apps/manifest/services/emanifest.py
@@ -163,9 +163,10 @@ def save(self, manifest: dict) -> dict:
     def _filter_mtn(
         *, mtn: list[str], site_id: str, site_type: Literal["Generator", "Tsdf", "Transporter"]
     ) -> list[str]:
-        site_filter = Manifest.objects.get_handler_query(site_id, site_type)
-        existing_mtn = Manifest.objects.existing_mtn(site_filter, mtn=mtn)
-        return [manifest.mtn for manifest in existing_mtn]
+        handler_filter = Manifest.objects.filter_by_handler_epa_id([site_id], site_type)
+        existing_mtn = Manifest.objects.filter_existing_mtn(mtn=mtn)
+        filtered_mtn = handler_filter & existing_mtn
+        return [manifest.mtn for manifest in filtered_mtn]
 
     def _retrieve_manifest(self, mtn: str):
         """Retrieve a manifest from RCRAInfo"""
diff --git a/server/apps/manifest/services/manifest_services.py b/server/apps/manifest/services/manifest.py
similarity index 100%
rename from server/apps/manifest/services/manifest_services.py
rename to server/apps/manifest/services/manifest.py
diff --git a/server/apps/manifest/tests/test_models.py b/server/apps/manifest/tests/test_models.py
index c96b3a16e..0c951103b 100644
--- a/server/apps/manifest/tests/test_models.py
+++ b/server/apps/manifest/tests/test_models.py
@@ -2,7 +2,6 @@
 
 import pytest
 from django.core.exceptions import ValidationError
-from django.db.models import Q
 
 from apps.handler.serializers import HandlerSerializer
 from apps.manifest.models import Manifest, draft_mtn, validate_mtn
@@ -21,31 +20,15 @@ def test_draft_mtn_format(self):
 
     @pytest.mark.parametrize("mtn", ["123456789ELC", "111111111DFT", "100200300JJK"])
     def test_mtn_validation_raises_no_error(self, mtn):
-        # Act/Assert
         assert validate_mtn(mtn) is None
 
     @pytest.mark.parametrize("mtn", ["foo_bar", "111111DFT", "123456789"])
     def test_mtn_validation_raises_error(self, mtn):
-        # Act/Assert
         with pytest.raises(ValidationError):
             assert validate_mtn(mtn) is None
 
-    def test_get_handler_query_maps_handler_types(self):
-        query = Manifest.objects.get_handler_query(
-            site_type=RcraSiteType.GENERATOR, site_id="mock_EPA_ID"
-        )
-        assert isinstance(query, Q)
-
-    def test_get_handler_query_maps_strings(self):
-        query = Manifest.objects.get_handler_query(site_type="generator", site_id="mock_EPA_ID")
-        assert isinstance(query, Q)
-
-    def test_get_handler_query_raises_value_error(self):
-        with pytest.raises(ValueError):
-            Manifest.objects.get_handler_query(site_type="bad_argument", site_id="mock_EPA_ID")
-
 
-class TestManifestManagerSaveMethod:
+class TestManifestSaveMethod:
     def test_updates_the_manifest_tracking_number(self, manifest_factory):
         old_mtn = "000000123DFT"
         new_mtn = "000000123DFT"
@@ -82,3 +65,53 @@ def test_updates_tsdf(
         )
         new_manifest = Manifest.objects.save(original_manifest, **{"tsdf": validated_data})
         assert new_manifest.tsdf.rcra_site.epa_id == tsdf_epa_id
+
+
+class TestManifestManager:
+    def test_filter_manifest_by_site_by_all_handler_type_by_default(
+        self, manifest_factory, rcra_site_factory, manifest_handler_factory
+    ):
+        epa_id = "TXD987654321"
+        txd987654321 = rcra_site_factory(epa_id=epa_id)
+        my_handler = manifest_handler_factory(rcra_site=txd987654321)
+        manifest_factory(generator=my_handler)
+        manifest_factory(tsdf=my_handler)
+        assert Manifest.objects.filter_by_handler_epa_id(epa_id).count() == 2
+
+    def test_filter_manifests_where_site_is_generator(
+        self, manifest_factory, rcra_site_factory, manifest_handler_factory
+    ):
+        epa_id = "TXD987654321"
+        txd987654321 = rcra_site_factory(epa_id=epa_id)
+        manifest_generator = manifest_handler_factory(rcra_site=txd987654321)
+        manifest_factory(generator=manifest_generator)
+        manifest_factory(tsdf=manifest_generator)
+        assert (
+            Manifest.objects.filter_by_handler_epa_id(epa_id, RcraSiteType.GENERATOR).count() == 1
+        )
+
+    def test_filter_manifests_where_site_is_tsdf(
+        self, manifest_factory, rcra_site_factory, manifest_handler_factory
+    ):
+        epa_id = "TXD987654321"
+        txd987654321 = rcra_site_factory(epa_id=epa_id)
+        tsdf = manifest_handler_factory(rcra_site=txd987654321)
+        manifest_factory()
+        manifest_factory(tsdf=tsdf)
+        assert Manifest.objects.filter_by_handler_epa_id(epa_id, RcraSiteType.TSDF).count() == 1
+
+    def test_filter_manifest_where_site_is_transporter(
+        self,
+        manifest_factory,
+        rcra_site_factory,
+        manifest_handler_factory,
+        manifest_transporter_factory,
+    ):
+        epa_id = "TXD987654321"
+        txd987654321 = rcra_site_factory(epa_id=epa_id)
+        manifest = manifest_factory()
+        manifest_transporter_factory(rcra_site=txd987654321, manifest=manifest)
+        assert (
+            Manifest.objects.filter_by_handler_epa_id(epa_id, RcraSiteType.TRANSPORTER).count()
+            == 1
+        )
diff --git a/server/apps/manifest/tests/test_views.py b/server/apps/manifest/tests/test_views.py
index 77d0dec87..6a9ce90f6 100644
--- a/server/apps/manifest/tests/test_views.py
+++ b/server/apps/manifest/tests/test_views.py
@@ -3,7 +3,7 @@
 from rest_framework import status
 from rest_framework.test import APIRequestFactory, force_authenticate
 
-from apps.manifest.views import ManifestSignView, ManifestViewSet
+from apps.manifest.views import ElectronicManifestSignView, ManifestViewSet
 
 
 class TestManifestCRUD:
@@ -73,5 +73,5 @@ def test_returns_celery_task_id(
             format="json",
         )
         force_authenticate(request, user)
-        response = ManifestSignView.as_view()(request)
+        response = ElectronicManifestSignView.as_view()(request)
         assert response.data["taskId"] == self.mock_task_id
diff --git a/server/apps/manifest/urls.py b/server/apps/manifest/urls.py
index 9a2866af3..29884070d 100644
--- a/server/apps/manifest/urls.py
+++ b/server/apps/manifest/urls.py
@@ -3,7 +3,7 @@
 
 from apps.manifest.views import (  # type: ignore
     ElectronicManifestSaveView,
-    ManifestSignView,
+    ElectronicManifestSignView,
     ManifestViewSet,
     MtnListView,
     TrakSiteManifestSyncView,
@@ -19,7 +19,7 @@
             [
                 # Manifest
                 path("emanifest", ElectronicManifestSaveView.as_view()),
-                path("emanifest/sign", ManifestSignView.as_view()),
+                path("emanifest/sign", ElectronicManifestSignView.as_view()),
                 path("emanifest/sync", TrakSiteManifestSyncView.as_view()),
                 path("", include(manifest_router.urls)),
                 # MT
diff --git a/server/apps/manifest/views.py b/server/apps/manifest/views.py
index ce04f9867..bacfdc185 100644
--- a/server/apps/manifest/views.py
+++ b/server/apps/manifest/views.py
@@ -9,7 +9,7 @@
 
 from apps.handler.serializers import QuickerSignSerializer
 from apps.manifest.models import Manifest
-from apps.manifest.serializers import ManifestSerializer
+from apps.manifest.serializers import ManifestSerializer, MtnSerializer
 from apps.manifest.services import (
     EManifest,
     TaskResponse,
@@ -84,33 +84,6 @@ def post(self, request: Request) -> Response:
 class MtnListView(ListAPIView):
     """List of manifest tracking numbers and select details."""
 
-    class MtnSerializer(serializers.ModelSerializer):
-        """Select details of a manifest including manifest tracking number (mtn)."""
-
-        manifestTrackingNumber = serializers.CharField(
-            source="mtn",
-            required=False,
-        )
-        # status
-        submissionType = serializers.CharField(
-            source="submission_type",
-            required=False,
-        )
-        signatureStatus = serializers.BooleanField(
-            source="signature_status",
-            allow_null=True,
-            default=False,
-        )
-
-        class Meta:
-            model = Manifest
-            fields = [
-                "manifestTrackingNumber",
-                "status",
-                "submissionType",
-                "signatureStatus",
-            ]
-
     serializer_class = MtnSerializer
     queryset = Manifest.objects.all()
 
@@ -125,7 +98,7 @@ def get_queryset(self):
         )
 
 
-class ManifestSignView(GenericAPIView):
+class ElectronicManifestSignView(GenericAPIView):
     """
     Endpoint to Quicker Sign manifests via an async task
     """
diff --git a/server/apps/org/migrations/0001_initial.py b/server/apps/org/migrations/0001_initial.py
index 62ce05a1b..e3e7c0d22 100644
--- a/server/apps/org/migrations/0001_initial.py
+++ b/server/apps/org/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.10 on 2024-02-17 21:09
+# Generated by Django 4.2.10 on 2024-02-21 22:17
 
 from django.conf import settings
 from django.db import migrations, models
diff --git a/server/apps/org/services.py b/server/apps/org/services.py
index 36062f405..2914d61aa 100644
--- a/server/apps/org/services.py
+++ b/server/apps/org/services.py
@@ -1,7 +1,4 @@
-from django.db.models import QuerySet
-
 from apps.org.models import TrakOrg
-from apps.site.models import TrakSite
 
 
 def get_org_by_id(org_id: str) -> TrakOrg:
@@ -27,13 +24,3 @@ def get_rcrainfo_api_credentials_by_user(user_id: str) -> tuple[str, str] | None
             return org.rcrainfo_api_id_key
     except TrakOrg.DoesNotExist:
         return None
-
-
-def get_org_sites(org_id: str) -> [TrakSite]:
-    """Returns a tuple of (rcrainfo_api_id, rcrainfo_api_key) corresponding to the user's org"""
-    try:
-        sites: QuerySet = TrakSite.objects.filter(org_id=org_id)
-        sites.select_related("rcra_site")
-        return sites
-    except TrakSite.DoesNotExist:
-        return None
diff --git a/server/apps/org/urls.py b/server/apps/org/urls.py
index 96a783d71..0821a45f8 100644
--- a/server/apps/org/urls.py
+++ b/server/apps/org/urls.py
@@ -1,8 +1,7 @@
 from django.urls import path
 
-from apps.org.views import TrakOrgDetailsView, TrakOrgSitesListView
+from apps.org.views import TrakOrgDetailsView
 
 urlpatterns = [
-    path("org/<str:org_id>/site", TrakOrgSitesListView.as_view()),
     path("org/<str:org_id>", TrakOrgDetailsView.as_view()),
 ]
diff --git a/server/apps/org/views.py b/server/apps/org/views.py
index c9cb3e543..edda06394 100644
--- a/server/apps/org/views.py
+++ b/server/apps/org/views.py
@@ -5,26 +5,14 @@
 from rest_framework import status
 from rest_framework.generics import RetrieveAPIView
 from rest_framework.response import Response
-from rest_framework.views import APIView
 
 from apps.org.models import TrakOrg
 from apps.org.serializers import TrakOrgSerializer
-from apps.org.services import get_org_by_id, get_org_sites
-from apps.site.serializers import TrakSiteSerializer
+from apps.org.services import get_org_by_id
 
 logger = logging.getLogger(__name__)
 
 
-class TrakOrgSitesListView(APIView):
-    """Retrieve a list of sites for a given Org"""
-
-    @method_decorator(cache_page(60 * 15))
-    def get(self, request, *args, **kwargs):
-        haztrak_sites = get_org_sites(self.kwargs["org_id"])
-        serializer = TrakSiteSerializer(haztrak_sites, many=True)
-        return Response(data=serializer.data, status=status.HTTP_200_OK)
-
-
 class TrakOrgDetailsView(RetrieveAPIView):
     """Retrieve details for a given Org"""
 
diff --git a/server/apps/profile/migrations/0001_initial.py b/server/apps/profile/migrations/0001_initial.py
index 30ccc8840..452148d92 100644
--- a/server/apps/profile/migrations/0001_initial.py
+++ b/server/apps/profile/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.10 on 2024-02-17 21:09
+# Generated by Django 4.2.10 on 2024-02-21 22:17
 
 from django.conf import settings
 from django.db import migrations, models
diff --git a/server/apps/profile/serializers/__init__.py b/server/apps/profile/serializers/__init__.py
new file mode 100644
index 000000000..a087d1b88
--- /dev/null
+++ b/server/apps/profile/serializers/__init__.py
@@ -0,0 +1,3 @@
+from .rcrainfo_profile import RcrainfoProfileSerializer
+from .rcrasite_access import RcrainfoSitePermissionsSerializer, RcraSitePermissionSerializer
+from .trak_profile import TrakProfileSerializer
diff --git a/server/apps/profile/serializers.py b/server/apps/profile/serializers/rcrainfo_profile.py
similarity index 64%
rename from server/apps/profile/serializers.py
rename to server/apps/profile/serializers/rcrainfo_profile.py
index 1bae82684..72d43a956 100644
--- a/server/apps/profile/serializers.py
+++ b/server/apps/profile/serializers/rcrainfo_profile.py
@@ -1,34 +1,9 @@
 from rest_framework import serializers
 from rest_framework.serializers import ModelSerializer
 
-from apps.org.serializers import TrakOrgSerializer
-from apps.profile.models import RcrainfoProfile, TrakProfile
-from apps.rcrasite.serializers import RcraSitePermissionSerializer
-from apps.site.serializers import TrakSiteAccessSerializer
+from apps.profile.models import RcrainfoProfile
 
-
-class TrakProfileSerializer(ModelSerializer):
-    """Serializer for a user's profile"""
-
-    user = serializers.StringRelatedField(
-        required=False,
-    )
-    sites = TrakSiteAccessSerializer(
-        source="user.site_permissions",
-        many=True,
-    )
-    org = TrakOrgSerializer(
-        source="user.org_permissions.org",
-        required=False,
-    )
-
-    class Meta:
-        model = TrakProfile
-        fields = [
-            "user",
-            "sites",
-            "org",
-        ]
+from .rcrasite_access import RcraSitePermissionSerializer
 
 
 class RcrainfoProfileSerializer(ModelSerializer):
diff --git a/server/apps/rcrasite/serializers/profile_serializer.py b/server/apps/profile/serializers/rcrasite_access.py
similarity index 85%
rename from server/apps/rcrasite/serializers/profile_serializer.py
rename to server/apps/profile/serializers/rcrasite_access.py
index 35141e6a5..89018e3c1 100644
--- a/server/apps/rcrasite/serializers/profile_serializer.py
+++ b/server/apps/profile/serializers/rcrasite_access.py
@@ -1,16 +1,34 @@
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
 
-from ...profile.models import RcrainfoSiteAccess
-from .base_serializer import SitesBaseSerializer
+from apps.profile.models import RcrainfoSiteAccess
 
 
-class RcraSitePermissionSerializer(SitesBaseSerializer):
+class RcraSiteBaseSerializer(serializers.ModelSerializer):
+    def __str__(self):
+        return f"{self.__class__.__name__}"
+
+    def __repr__(self):
+        return f"<{self.__class__.__name__}({self.data})>"
+
+    def to_representation(self, instance):
+        """
+        Remove empty fields when serializing
+        """
+        data = super().to_representation(instance)
+        for field in self.fields:
+            try:
+                if data[field] is None:
+                    data.pop(field)
+            except KeyError:
+                pass
+        return data
+
+
+class RcraSitePermissionSerializer(RcraSiteBaseSerializer):
     """
-    RcraSitePermissions model serializer
     We use this internally because it's easier to handle, using consistent naming,
     Haztrak has a separate serializer for user permissions from RCRAInfo.
-    See RcraPermissionSerializer.
     """
 
     rcrainfo_modules = [
diff --git a/server/apps/profile/serializers/trak_profile.py b/server/apps/profile/serializers/trak_profile.py
new file mode 100644
index 000000000..41a61a200
--- /dev/null
+++ b/server/apps/profile/serializers/trak_profile.py
@@ -0,0 +1,30 @@
+from rest_framework import serializers
+from rest_framework.serializers import ModelSerializer
+
+from apps.org.serializers import TrakOrgSerializer
+from apps.profile.models import TrakProfile
+from apps.site.serializers import TrakSiteAccessSerializer
+
+
+class TrakProfileSerializer(ModelSerializer):
+    """Serializer for a user's profile"""
+
+    user = serializers.StringRelatedField(
+        required=False,
+    )
+    sites = TrakSiteAccessSerializer(
+        source="user.site_permissions",
+        many=True,
+    )
+    org = TrakOrgSerializer(
+        source="user.org_permissions.org",
+        required=False,
+    )
+
+    class Meta:
+        model = TrakProfile
+        fields = [
+            "user",
+            "sites",
+            "org",
+        ]
diff --git a/server/apps/profile/services.py b/server/apps/profile/services.py
index 532a5dddd..9b8db2af2 100644
--- a/server/apps/profile/services.py
+++ b/server/apps/profile/services.py
@@ -1,9 +1,16 @@
 """business logic related to a user's Haztrak profile (note: not their RcrainfoProfile)"""
+from typing import Optional
+
 from django.conf import settings
 from django.db import transaction
 
 from apps.core.models import TrakUser
-from apps.profile.models import RcrainfoProfile, TrakProfile
+from apps.core.services import RcrainfoService, get_rcrainfo_client
+from apps.profile.models import RcrainfoProfile, RcrainfoSiteAccess, TrakProfile
+from apps.profile.serializers import RcrainfoSitePermissionsSerializer
+from apps.rcrasite.models import RcraSite
+from apps.rcrasite.services import RcraSiteService
+from apps.site.services import TrakSiteServiceError
 
 
 @transaction.atomic
@@ -25,3 +32,97 @@ def get_user_profile(*, user: settings.AUTH_USER_MODEL) -> TrakProfile:
 def get_user_rcrainfo_profile(*, user: settings.AUTH_USER_MODEL) -> RcrainfoProfile:
     """Retrieve a user's locally stored RCRAInfo Profile"""
     return RcrainfoProfile.objects.get_by_trak_username(user.username)
+
+
+def get_or_create_rcra_profile(*, username: str) -> tuple[RcrainfoProfile, bool]:
+    """Retrieve a user's RcrainfoProfile"""
+    profile, created = RcrainfoProfile.objects.get_or_create(
+        haztrak_profile__user__username=username
+    )
+    if created:
+        haztrak_profile, created = get_or_create_profile(username=username)
+        haztrak_profile.rcrainfo_profile = profile
+        haztrak_profile.save()
+    return profile, created
+
+
+class RcraProfileServiceError(Exception):
+    """Exception for errors specific to the RcraProfileService"""
+
+    def __init__(self, message: str):
+        self.message = message
+        super().__init__(self.message)
+
+
+class RcraProfileService:
+    """
+    RcraProfileService encapsulates the RcrainfoProfile subdomain business logic
+    of a and exposes method corresponding to use cases.
+    """
+
+    def __init__(self, *, username: str, rcrainfo: Optional[RcrainfoService] = None):
+        self.username = username
+        profile, created = get_or_create_rcra_profile(username=username)
+        self.profile: RcrainfoProfile = profile
+        self.rcrainfo = rcrainfo or get_rcrainfo_client(username=username)
+
+    def update_rcrainfo_profile(self, *, rcrainfo_username: Optional[str] = None) -> None:
+        """
+        This high level function makes several requests to RCRAInfo to pull...
+        1. A user's rcrainfo site permissions, it creates a RcraSitePermissions for each
+        2. For each rcra site permission, it pulls the rcra_site details, and creates or updates
+         a RcraSite instance for each
+        3. If a Haztrak Site is not present, create one
+        """
+        try:
+            if rcrainfo_username is None:
+                rcrainfo_username = self.profile.rcra_username
+            profile_response = self.rcrainfo.get_user_rcrainfo_profile(
+                rcrainfo_username=rcrainfo_username
+            )
+            permissions = self._parse_rcra_response(rcra_response=profile_response.json())
+            self._save_rcrainfo_profile_permissions(permissions)
+        except (RcrainfoProfile.DoesNotExist, RcraSite.DoesNotExist) as exc:
+            raise RcraProfileServiceError(exc)
+
+    def _save_rcrainfo_profile_permissions(self, permissions: list[dict]) -> None:
+        """
+        This function creates or updates a user's RcraSitePermissions for each site permission
+        :param permissions: body of response from RCRAInfo
+        :return: None
+        """
+        try:
+            handler = RcraSiteService(username=self.username, rcrainfo=self.rcrainfo)
+            for rcra_site_permission in permissions:
+                rcra_site = handler.get_or_pull_rcra_site(rcra_site_permission["siteId"])
+                self._create_or_update_rcra_permission(
+                    epa_permission=rcra_site_permission, site=rcra_site
+                )
+        except TrakSiteServiceError as exc:
+            raise RcraProfileServiceError(f"Error creating or updating Haztrak Site {exc}")
+        except KeyError as exc:
+            raise RcraProfileServiceError(f"Error parsing RCRAInfo response: {str(exc)}")
+
+    @staticmethod
+    def _parse_rcra_response(*, rcra_response: dict) -> list:
+        try:
+            permissions = []
+            for permission_json in rcra_response["users"][0]["sites"]:
+                permissions.append(permission_json)
+            return permissions
+        except KeyError as exc:
+            raise RcraProfileServiceError(f"Error parsing RCRAInfo response: {str(exc)}")
+
+    @transaction.atomic
+    def _create_or_update_rcra_permission(
+        self, *, epa_permission: dict, site: RcraSite
+    ) -> RcrainfoSiteAccess:
+        permission_serializer = RcrainfoSitePermissionsSerializer(data=epa_permission)
+        if permission_serializer.is_valid():
+            obj, created = RcrainfoSiteAccess.objects.update_or_create(
+                **permission_serializer.validated_data, site=site, profile=self.profile
+            )
+            return obj
+        raise RcraProfileServiceError(
+            f"Error creating instance of RcraSitePermissions {permission_serializer.errors}"
+        )
diff --git a/server/apps/profile/tests/test_serializers.py b/server/apps/profile/tests/test_serializers.py
index 98866650c..a8bdcd1bd 100644
--- a/server/apps/profile/tests/test_serializers.py
+++ b/server/apps/profile/tests/test_serializers.py
@@ -1,10 +1,10 @@
 import pytest
 
 from apps.profile.models import RcrainfoSiteAccess
-from apps.profile.serializers import TrakProfileSerializer
-from apps.rcrasite.serializers import (
+from apps.profile.serializers import (
     RcrainfoSitePermissionsSerializer,
     RcraSitePermissionSerializer,
+    TrakProfileSerializer,
 )
 
 
diff --git a/server/apps/profile/tests/test_services.py b/server/apps/profile/tests/test_services.py
index 2151eac89..902940d4e 100644
--- a/server/apps/profile/tests/test_services.py
+++ b/server/apps/profile/tests/test_services.py
@@ -1,4 +1,9 @@
-from apps.profile.services import get_user_profile, get_user_rcrainfo_profile
+from apps.profile.models import RcrainfoProfile, TrakProfile
+from apps.profile.services import (
+    get_or_create_rcra_profile,
+    get_user_profile,
+    get_user_rcrainfo_profile,
+)
 
 
 class TestTrakProfileServices:
@@ -15,3 +20,32 @@ def test_getting_a_user_rcrainfo_profile(self, rcrainfo_profile_factory, profile
         trak_profile = profile_factory(rcrainfo_profile=rcrainfo_profile)
         returned_profile = get_user_rcrainfo_profile(user=trak_profile.user)
         assert returned_profile == rcrainfo_profile
+
+    def test_get_or_create_retrieves_by_username(
+        self, rcrainfo_profile_factory, user_factory, profile_factory
+    ):
+        username = "my_username"
+        mock_rcra_username = "my_rcra_username"
+        user = user_factory(username=username)
+        rcra_profile = rcrainfo_profile_factory(rcra_username=mock_rcra_username)
+        profile_factory(user=user, rcrainfo_profile=rcra_profile)
+        retrieved_rcra_profile, created = get_or_create_rcra_profile(username=username)
+        assert retrieved_rcra_profile == rcra_profile
+        assert created is False
+
+    def test_get_or_create_returns_true_if_new_profile(self, user_factory):
+        username = "my_username"
+        user_factory(username=username)
+        retrieved_rcra_profile, created = get_or_create_rcra_profile(username=username)
+        assert isinstance(retrieved_rcra_profile, RcrainfoProfile)
+        assert created is True
+
+    def test_creates_creates_a_haztrak_profile_if_not_present(self, user_factory):
+        # Arrange
+        username = "my_username"
+        user_factory(username=username)  # Note, we are not creating a HaztrakProfile
+        # Act
+        rcra_profile, created = get_or_create_rcra_profile(username=username)
+        # Assert
+        haztrak_profile = TrakProfile.objects.get(user__username=username)
+        assert haztrak_profile.rcrainfo_profile == rcra_profile
diff --git a/server/apps/rcrasite/migrations/0001_initial.py b/server/apps/rcrasite/migrations/0001_initial.py
index 31d3757a5..1f43f66b7 100644
--- a/server/apps/rcrasite/migrations/0001_initial.py
+++ b/server/apps/rcrasite/migrations/0001_initial.py
@@ -1,6 +1,6 @@
-# Generated by Django 4.2.10 on 2024-02-17 21:09
+# Generated by Django 4.2.10 on 2024-02-21 22:17
 
-import apps.rcrasite.models.contact_models
+import apps.rcrasite.models.contact
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -47,7 +47,7 @@ class Migration(migrations.Migration):
             name='RcraPhone',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('number', apps.rcrasite.models.contact_models.RcraPhoneNumber(max_length=12)),
+                ('number', apps.rcrasite.models.contact.RcraPhoneNumber(max_length=12)),
                 ('extension', models.CharField(blank=True, max_length=6, null=True)),
             ],
             options={
diff --git a/server/apps/rcrasite/models/__init__.py b/server/apps/rcrasite/models/__init__.py
index 6c9bfe424..ae7a47238 100644
--- a/server/apps/rcrasite/models/__init__.py
+++ b/server/apps/rcrasite/models/__init__.py
@@ -1,5 +1,5 @@
-from .contact_models import Address, Contact, RcraPhone, RcraStates
-from .site_models import (
+from .contact import Address, Contact, RcraCountries, RcraPhone, RcraStates
+from .rcrasite import (
     RcraSite,
     RcraSiteType,
     Role,
diff --git a/server/apps/rcrasite/models/contact_models.py b/server/apps/rcrasite/models/contact.py
similarity index 98%
rename from server/apps/rcrasite/models/contact_models.py
rename to server/apps/rcrasite/models/contact.py
index c375fd95a..51a99d747 100644
--- a/server/apps/rcrasite/models/contact_models.py
+++ b/server/apps/rcrasite/models/contact.py
@@ -175,9 +175,7 @@ def __str__(self):
 
 
 class ContactManager(SitesBaseManager):
-    """
-    Inter-model related functionality for Contact Model
-    """
+    """Contact Model database querying interface"""
 
     def save(self, **contact_data) -> models.QuerySet:
         """
diff --git a/server/apps/rcrasite/models/site_models.py b/server/apps/rcrasite/models/rcrasite.py
similarity index 94%
rename from server/apps/rcrasite/models/site_models.py
rename to server/apps/rcrasite/models/rcrasite.py
index 0e476cbb3..bc76f8743 100644
--- a/server/apps/rcrasite/models/site_models.py
+++ b/server/apps/rcrasite/models/rcrasite.py
@@ -5,8 +5,7 @@
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
-from apps.rcrasite.models import Address, Contact
-from apps.rcrasite.models.contact_models import RcraPhone
+from apps.rcrasite.models import Address, Contact, RcraPhone
 
 from .base_models import SitesBaseManager, SitesBaseModel
 
@@ -21,7 +20,11 @@ class RcraSiteType(models.TextChoices):
 
 
 class RcraSiteManager(SitesBaseManager):
-    """Inter-model related functionality for RcraSite Model"""
+    """RcraSite Model database querying interface"""
+
+    def get_by_epa_id(self, epa_id: str) -> "RcraSite":
+        """Return an RcraSite object by its epa_id"""
+        return self.get(epa_id__iexact=epa_id)
 
     def __init__(self):
         self.handler_data = None
diff --git a/server/apps/rcrasite/serializers/__init__.py b/server/apps/rcrasite/serializers/__init__.py
index ed0cfdae8..42c28a1ca 100644
--- a/server/apps/rcrasite/serializers/__init__.py
+++ b/server/apps/rcrasite/serializers/__init__.py
@@ -1,7 +1,3 @@
 from .address_serializer import AddressSerializer
 from .contact_serializer import ContactSerializer, RcraPhoneSerializer
-from .profile_serializer import (
-    RcrainfoSitePermissionsSerializer,
-    RcraSitePermissionSerializer,
-)
-from .site_serializer import RcraSiteSerializer
+from .site_serializer import RcraSiteSearchSerializer, RcraSiteSerializer
diff --git a/server/apps/rcrasite/serializers/address_serializer.py b/server/apps/rcrasite/serializers/address_serializer.py
index 426d3674d..1a31d169e 100644
--- a/server/apps/rcrasite/serializers/address_serializer.py
+++ b/server/apps/rcrasite/serializers/address_serializer.py
@@ -3,9 +3,8 @@
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
 
-from apps.rcrasite.models import Address, RcraStates
+from apps.rcrasite.models import Address, RcraCountries, RcraStates
 
-from ..models.contact_models import RcraCountries
 from .base_serializer import SitesBaseSerializer
 
 
diff --git a/server/apps/rcrasite/serializers/site_serializer.py b/server/apps/rcrasite/serializers/site_serializer.py
index 7d2180807..1d1e930e9 100644
--- a/server/apps/rcrasite/serializers/site_serializer.py
+++ b/server/apps/rcrasite/serializers/site_serializer.py
@@ -86,3 +86,21 @@ class Meta:
             "hasRegisteredEmanifestUser",
             "gisPrimary",
         ]
+
+
+class RcraSiteSearchSerializer(serializers.Serializer):
+    epaId = serializers.CharField(required=False, source="epa_id")
+    siteName = serializers.CharField(required=False, source="name")
+    siteType = serializers.ChoiceField(
+        required=False,
+        source="site_type",
+        choices=[
+            "transporter",
+            "Transporter",
+            "Tsdf",
+            "tsdf",
+            "designatedFacility",
+            "Generator",
+            "generator",
+        ],
+    )
diff --git a/server/apps/rcrasite/services/__init__.py b/server/apps/rcrasite/services/__init__.py
index 2d4f9960b..c472030e9 100644
--- a/server/apps/rcrasite/services/__init__.py
+++ b/server/apps/rcrasite/services/__init__.py
@@ -1,2 +1 @@
-from .rcra_profile_services import RcraProfileService, get_or_create_rcra_profile
 from .rcra_site_services import RcraSiteService
diff --git a/server/apps/rcrasite/services/rcra_profile_services.py b/server/apps/rcrasite/services/rcra_profile_services.py
deleted file mode 100644
index 0ec6a86f9..000000000
--- a/server/apps/rcrasite/services/rcra_profile_services.py
+++ /dev/null
@@ -1,112 +0,0 @@
-import logging
-from typing import Optional
-
-from django.db import transaction
-
-from apps.core.services import (
-    RcrainfoService,
-    get_rcrainfo_client,
-)
-from apps.profile.services import get_or_create_profile
-from apps.rcrasite.models import RcraSite
-from apps.rcrasite.serializers import RcrainfoSitePermissionsSerializer
-from apps.site.services import TrakSiteServiceError
-
-from ...profile.models import RcrainfoProfile, RcrainfoSiteAccess
-from .rcra_site_services import RcraSiteService
-
-logger = logging.getLogger(__name__)
-
-
-def get_or_create_rcra_profile(*, username: str) -> tuple[RcrainfoProfile, bool]:
-    """Retrieve a user's RcrainfoProfile"""
-    profile, created = RcrainfoProfile.objects.get_or_create(
-        haztrak_profile__user__username=username
-    )
-    if created:
-        haztrak_profile, created = get_or_create_profile(username=username)
-        haztrak_profile.rcrainfo_profile = profile
-        haztrak_profile.save()
-    return profile, created
-
-
-class RcraProfileServiceError(Exception):
-    """Exception for errors specific to the RcraProfileService"""
-
-    def __init__(self, message: str):
-        self.message = message
-        super().__init__(self.message)
-
-
-class RcraProfileService:
-    """
-    RcraProfileService encapsulates the RcrainfoProfile subdomain business logic
-    of a and exposes method corresponding to use cases.
-    """
-
-    def __init__(self, *, username: str, rcrainfo: Optional[RcrainfoService] = None):
-        self.username = username
-        profile, created = get_or_create_rcra_profile(username=username)
-        self.profile: RcrainfoProfile = profile
-        self.rcrainfo = rcrainfo or get_rcrainfo_client(username=username)
-
-    def update_rcrainfo_profile(self, *, rcrainfo_username: Optional[str] = None) -> None:
-        """
-        This high level function makes several requests to RCRAInfo to pull...
-        1. A user's rcrainfo site permissions, it creates a RcraSitePermissions for each
-        2. For each rcra site permission, it pulls the rcra_site details, and creates or updates
-         a RcraSite instance for each
-        3. If a Haztrak Site is not present, create one
-        """
-        try:
-            if rcrainfo_username is None:
-                rcrainfo_username = self.profile.rcra_username
-            profile_response = self.rcrainfo.get_user_rcrainfo_profile(
-                rcrainfo_username=rcrainfo_username
-            )
-            permissions = self._parse_rcra_response(rcra_response=profile_response.json())
-            self._save_rcrainfo_profile_permissions(permissions)
-        except (RcrainfoProfile.DoesNotExist, RcraSite.DoesNotExist) as exc:
-            raise RcraProfileServiceError(exc)
-
-    def _save_rcrainfo_profile_permissions(self, permissions: list[dict]) -> None:
-        """
-        This function creates or updates a user's RcraSitePermissions for each site permission
-        :param permissions: body of response from RCRAInfo
-        :return: None
-        """
-        try:
-            handler = RcraSiteService(username=self.username, rcrainfo=self.rcrainfo)
-            for rcra_site_permission in permissions:
-                rcra_site = handler.get_or_pull_rcra_site(rcra_site_permission["siteId"])
-                self._create_or_update_rcra_permission(
-                    epa_permission=rcra_site_permission, site=rcra_site
-                )
-        except TrakSiteServiceError as exc:
-            raise RcraProfileServiceError(f"Error creating or updating Haztrak Site {exc}")
-        except KeyError as exc:
-            raise RcraProfileServiceError(f"Error parsing RCRAInfo response: {str(exc)}")
-
-    @staticmethod
-    def _parse_rcra_response(*, rcra_response: dict) -> list:
-        try:
-            permissions = []
-            for permission_json in rcra_response["users"][0]["sites"]:
-                permissions.append(permission_json)
-            return permissions
-        except KeyError as exc:
-            raise RcraProfileServiceError(f"Error parsing RCRAInfo response: {str(exc)}")
-
-    @transaction.atomic
-    def _create_or_update_rcra_permission(
-        self, *, epa_permission: dict, site: RcraSite
-    ) -> RcrainfoSiteAccess:
-        permission_serializer = RcrainfoSitePermissionsSerializer(data=epa_permission)
-        if permission_serializer.is_valid():
-            obj, created = RcrainfoSiteAccess.objects.update_or_create(
-                **permission_serializer.validated_data, site=site, profile=self.profile
-            )
-            return obj
-        raise RcraProfileServiceError(
-            f"Error creating instance of RcraSitePermissions {permission_serializer.errors}"
-        )
diff --git a/server/apps/rcrasite/tasks/profile_tasks.py b/server/apps/rcrasite/tasks/profile_tasks.py
index 08203f97f..344fdefe8 100644
--- a/server/apps/rcrasite/tasks/profile_tasks.py
+++ b/server/apps/rcrasite/tasks/profile_tasks.py
@@ -4,7 +4,7 @@
 from celery.exceptions import Ignore, Reject
 from requests import RequestException
 
-from apps.rcrasite.services.rcra_profile_services import RcraProfileServiceError
+from apps.profile.services import RcraProfileService, RcraProfileServiceError
 
 logger = logging.getLogger(__name__)
 
@@ -22,7 +22,6 @@ def sync_user_rcrainfo_sites(self: RcraProfileTasks, username: str) -> None:
     This task initiates a call to the RcraProfileService to pull a user's RCRAInfo profile
     and update that information in Haztrak.
     """
-    from apps.rcrasite.services import RcraProfileService
 
     try:
         rcra_profile = RcraProfileService(username=username)
diff --git a/server/apps/rcrasite/tests/test_services.py b/server/apps/rcrasite/tests/test_services.py
deleted file mode 100644
index 6e478115e..000000000
--- a/server/apps/rcrasite/tests/test_services.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from apps.profile.models import RcrainfoProfile, TrakProfile
-from apps.rcrasite.services import get_or_create_rcra_profile
-
-
-class TestRcraProfileServices:
-    def test_get_or_create_retrieves_by_username(
-        self, rcrainfo_profile_factory, user_factory, profile_factory
-    ):
-        username = "my_username"
-        mock_rcra_username = "my_rcra_username"
-        user = user_factory(username=username)
-        rcra_profile = rcrainfo_profile_factory(rcra_username=mock_rcra_username)
-        profile_factory(user=user, rcrainfo_profile=rcra_profile)
-        retrieved_rcra_profile, created = get_or_create_rcra_profile(username=username)
-        assert retrieved_rcra_profile == rcra_profile
-        assert created is False
-
-    def test_get_or_create_returns_true_if_new_profile(self, user_factory):
-        username = "my_username"
-        user_factory(username=username)
-        retrieved_rcra_profile, created = get_or_create_rcra_profile(username=username)
-        assert isinstance(retrieved_rcra_profile, RcrainfoProfile)
-        assert created is True
-
-    def test_creates_creates_a_haztrak_profile_if_not_present(self, user_factory):
-        # Arrange
-        username = "my_username"
-        user_factory(username=username)  # Note, we are not creating a HaztrakProfile
-        # Act
-        rcra_profile, created = get_or_create_rcra_profile(username=username)
-        # Assert
-        haztrak_profile = TrakProfile.objects.get(user__username=username)
-        assert haztrak_profile.rcrainfo_profile == rcra_profile
diff --git a/server/apps/rcrasite/views.py b/server/apps/rcrasite/views.py
index 98af14807..a0060b50e 100644
--- a/server/apps/rcrasite/views.py
+++ b/server/apps/rcrasite/views.py
@@ -1,16 +1,17 @@
 import logging
 
+from django.core.exceptions import ValidationError
 from django.utils.decorators import method_decorator
 from django.views.decorators.cache import cache_page
 from drf_spectacular.utils import extend_schema, inline_serializer
-from rest_framework import permissions, serializers, status
+from rest_framework import serializers, status
 from rest_framework.generics import RetrieveAPIView
 from rest_framework.request import Request
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
 from apps.rcrasite.models import RcraSite
-from apps.rcrasite.serializers import RcraSiteSerializer
+from apps.rcrasite.serializers import RcraSiteSearchSerializer, RcraSiteSerializer
 from apps.rcrasite.services import RcraSiteService
 from apps.rcrasite.services.rcra_site_services import query_rcra_sites
 
@@ -25,14 +26,20 @@ class RcraSiteDetailsView(RetrieveAPIView):
 
     queryset = RcraSite.objects.all()
     serializer_class = RcraSiteSerializer
-    lookup_field = "epa_id__iexact"
     lookup_url_kwarg = "epa_id"
-    permission_classes = [permissions.IsAuthenticated]
 
     @method_decorator(cache_page(60 * 15))
     def get(self, request, *args, **kwargs):
         return super().get(request, *args, **kwargs)
 
+    def get_object(self):
+        try:
+            return RcraSite.objects.get_by_epa_id(self.kwargs[self.lookup_url_kwarg])
+        except KeyError:
+            raise ValidationError(
+                {"detail": "The EPA ID parameter is required to retrieve a site"}
+            )
+
 
 @extend_schema(
     responses=RcraSiteSerializer(many=True),
@@ -46,34 +53,17 @@ def get(self, request, *args, **kwargs):
     ),
 )
 class RcraSiteSearchView(APIView):
-    """Search for locally saved hazardous waste sites ("Generators", "Transporters", "Tsdf's")"""
+    """Search for locally saved hazardous waste sites ("Generators", "Transporters", "TSDF")"""
 
     queryset = RcraSite.objects.all()
     serializer_class = RcraSiteSerializer
 
-    class RcraSiteSearchSerializer(serializers.Serializer):
-        epaId = serializers.CharField(required=False, source="epa_id")
-        siteName = serializers.CharField(required=False, source="name")
-        siteType = serializers.ChoiceField(
-            required=False,
-            source="site_type",
-            choices=[
-                "transporter",
-                "Transporter",
-                "Tsdf",
-                "tsdf",
-                "designatedFacility",
-                "Generator",
-                "generator",
-            ],
-        )
-
     def get(self, request, *args, **kwargs):
         query_params = request.query_params
-        serializer = self.RcraSiteSearchSerializer(data=query_params)
+        serializer = RcraSiteSearchSerializer(data=query_params)
         serializer.is_valid(raise_exception=True)
         rcra_sites = query_rcra_sites(**serializer.validated_data)
-        data = RcraSiteSerializer(rcra_sites, many=True).data
+        data = self.serializer_class(rcra_sites, many=True).data
         return Response(data, status=status.HTTP_200_OK)
 
 
diff --git a/server/apps/site/migrations/0001_initial.py b/server/apps/site/migrations/0001_initial.py
index b4e1af2ae..7d9c29a4d 100644
--- a/server/apps/site/migrations/0001_initial.py
+++ b/server/apps/site/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.10 on 2024-02-17 21:09
+# Generated by Django 4.2.10 on 2024-02-21 22:17
 
 from django.conf import settings
 import django.core.validators
@@ -11,9 +11,9 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('rcrasite', '0001_initial'),
         ('org', '0001_initial'),
+        ('rcrasite', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
diff --git a/server/apps/site/models.py b/server/apps/site/models.py
index 185629c48..9275b1493 100644
--- a/server/apps/site/models.py
+++ b/server/apps/site/models.py
@@ -1,23 +1,39 @@
 from django.conf import settings
 from django.core.validators import MinLengthValidator
 from django.db import models
+from django.db.models import QuerySet
 
 
 class TrakSiteManager(models.Manager):
     """Custom manager for TrakSite model"""
 
-    def filter_by_username(self: models.Manager, username: str) -> models.QuerySet:
+    def filter_by_username(self: models.Manager, username: str) -> QuerySet:
         """filter a list of sites a user has access to (by username)"""
         return self.select_related("rcra_site").filter(traksiteaccess__user__username=username)
 
-    def filter_by_user(self: models.Manager, user: settings.AUTH_USER_MODEL) -> models.QuerySet:
+    def get_user_site_by_epa_id(
+        self: models.Manager, user: settings.AUTH_USER_MODEL, epa_id: str
+    ) -> QuerySet:
+        """Get a site by EPA ID number that a user has access to"""
+        combined_filter: QuerySet = self.filter_by_user(user) & self.filter_by_epa_id(epa_id)
+        return combined_filter.get()
+
+    def filter_by_user(self: models.Manager, user: settings.AUTH_USER_MODEL) -> QuerySet:
         """filter a list of sites a user has access to (by user object)"""
         return self.select_related("rcra_site").filter(traksiteaccess__user=user)
 
-    def filter_by_epa_id(self: models.Manager, epa_id: str) -> models.QuerySet:
-        """Get a sites by EPA ID number"""
+    def filter_by_epa_id(self: models.Manager, epa_id: str) -> QuerySet:
+        """filter a sites by EPA ID number"""
         return self.filter(rcra_site__epa_id=epa_id)
 
+    def get_by_epa_id(self: models.Manager, epa_id: str) -> QuerySet:
+        """Get a TrakSites by RCRAInfo EPA ID number. Throws TrakSite.DoesNotExist if not found."""
+        return self.filter_by_epa_id(epa_id).get()
+
+    def filter_by_org(self: models.Manager, org: settings.TRAK_ORG_MODEL) -> QuerySet:
+        """Get a list of sites by organization"""
+        return self.filter(org=org)
+
 
 class TrakSite(models.Model):
     """
diff --git a/server/apps/site/services.py b/server/apps/site/services.py
index c932b4301..57b454ad9 100644
--- a/server/apps/site/services.py
+++ b/server/apps/site/services.py
@@ -3,6 +3,7 @@
 from typing import Optional
 
 from django.db import transaction
+from django.db.models import QuerySet
 
 from apps.core.services import RcrainfoService, get_rcrainfo_client
 from apps.manifest.services import EManifest, PullManifestsResult, TaskResponse
@@ -38,7 +39,7 @@ def sync_rcrainfo_manifest(self, *, site_id: Optional[str] = None) -> TaskRespon
     def sync_manifests(self, *, site_id: str) -> PullManifestsResult:
         """Pull manifests and update the last sync date for a site"""
         try:
-            site = TrakSite.objects.get(rcra_site__epa_id=site_id)
+            site = TrakSite.objects.get_by_epa_id(site_id)
             updated_mtn = self._get_updated_mtn(
                 site_id=site.rcra_site.epa_id, last_sync_date=site.last_rcrainfo_manifest_sync
             )
@@ -62,3 +63,9 @@ def _get_updated_mtn(self, site_id: str, last_sync_date: datetime) -> list[str]:
 class TrakSiteServiceError(Exception):
     def __init__(self, message: str):
         super().__init__(message)
+
+
+def filter_sites_by_org(org_id: str) -> [TrakSite]:
+    """Returns a list of TrakSites associated with an Org."""
+    sites: QuerySet = TrakSite.objects.filter(org_id=org_id).select_related("rcra_site")
+    return sites
diff --git a/server/apps/site/tests/test_models.py b/server/apps/site/tests/test_models.py
index afc411cf6..2709c89f4 100644
--- a/server/apps/site/tests/test_models.py
+++ b/server/apps/site/tests/test_models.py
@@ -1,4 +1,5 @@
 import pytest
+from django.db.models import QuerySet
 
 from apps.site.models import TrakSite
 
@@ -41,7 +42,7 @@ def test_returns_false_if_admin_has_not_provided_api_credentials(
 
 
 class TestTrakSiteModelManager:
-    def test_get_user_sites_by_username(self, site_factory, site_access_factory, user_factory):
+    def test_filter_sites_by_username(self, site_factory, site_access_factory, user_factory):
         user = user_factory()
         site = site_factory()
         other_site = site_factory()
@@ -50,7 +51,7 @@ def test_get_user_sites_by_username(self, site_factory, site_access_factory, use
         assert site in sites
         assert other_site not in sites
 
-    def test_get_user_sites(self, site_factory, site_access_factory, user_factory):
+    def test_filter_user_sites(self, site_factory, site_access_factory, user_factory):
         user = user_factory()
         site = site_factory()
         other_site = site_factory()
@@ -58,3 +59,30 @@ def test_get_user_sites(self, site_factory, site_access_factory, user_factory):
         sites = TrakSite.objects.filter_by_user(user)
         assert site in sites
         assert other_site not in sites
+
+    def test_get_by_epa_id(self, site_factory):
+        site = site_factory()
+        returned_site = TrakSite.objects.get_by_epa_id(site.rcra_site.epa_id)
+        assert site == returned_site
+        assert isinstance(returned_site, TrakSite)
+
+    def test_get_by_epa_id_throws_does_not_exists(self, site_factory):
+        with pytest.raises(TrakSite.DoesNotExist):
+            TrakSite.objects.get_by_epa_id("bad_id")
+
+    def test_get_user_site(self, site_factory, site_access_factory, user_factory):
+        user = user_factory()
+        site = site_factory()
+        site_access_factory(site=site, user=user)
+        returned_site = TrakSite.objects.get_user_site_by_epa_id(user, site.rcra_site.epa_id)
+        assert isinstance(returned_site, TrakSite)
+        assert returned_site == site
+
+    def test_filter_sites_by_org(self, site_factory, org_factory):
+        org = org_factory()
+        sites = [site_factory(org=org) for _ in range(2)]
+        not_my_site = site_factory()
+        returned_sites = TrakSite.objects.filter_by_org(org.id)
+        assert isinstance(returned_sites, QuerySet)
+        assert set(sites).issubset(returned_sites)
+        assert not_my_site not in returned_sites
diff --git a/server/apps/site/tests/test_services.py b/server/apps/site/tests/test_services.py
new file mode 100644
index 000000000..3ac791519
--- /dev/null
+++ b/server/apps/site/tests/test_services.py
@@ -0,0 +1,9 @@
+from apps.site.services import filter_sites_by_org
+
+
+class TestFilterOrgSites:
+    def test_get_org_sites(self, org_factory, site_factory):
+        org = org_factory()
+        site = site_factory(org=org)
+        returned_sites = filter_sites_by_org(org_id=org.id)
+        assert site in returned_sites
diff --git a/server/apps/site/tests/test_views.py b/server/apps/site/tests/test_views.py
index c320f2dea..28f170457 100644
--- a/server/apps/site/tests/test_views.py
+++ b/server/apps/site/tests/test_views.py
@@ -124,7 +124,7 @@ def test_returns_list_of_organizations_sites(
         client = APIClient()
         client.force_authenticate(user=user)
         # Act
-        response = client.get(f"{self.URL}/{org.id}/site")
+        response = client.get(f"{self.URL}/{org.id}/sites")
         # Assert
         assert response.headers["Content-Type"] == "application/json"
         assert response.status_code == status.HTTP_200_OK
diff --git a/server/apps/site/urls.py b/server/apps/site/urls.py
index 31ca0043f..35d254cc3 100644
--- a/server/apps/site/urls.py
+++ b/server/apps/site/urls.py
@@ -1,6 +1,7 @@
 from django.urls import path
 
 from .views import (
+    TrakOrgSitesListView,
     TrakSiteDetailsView,
     TrakSiteListView,
 )
@@ -8,4 +9,5 @@
 urlpatterns = [
     path("site", TrakSiteListView.as_view()),
     path("site/<str:epa_id>", TrakSiteDetailsView.as_view()),
+    path("org/<str:org_id>/sites", TrakOrgSitesListView.as_view()),
 ]
diff --git a/server/apps/site/views.py b/server/apps/site/views.py
index ff27caa70..4e6cd85e6 100644
--- a/server/apps/site/views.py
+++ b/server/apps/site/views.py
@@ -2,10 +2,14 @@
 
 from django.utils.decorators import method_decorator
 from django.views.decorators.cache import cache_page
+from rest_framework import status
 from rest_framework.generics import ListAPIView, RetrieveAPIView
+from rest_framework.response import Response
+from rest_framework.views import APIView
 
 from apps.site.models import TrakSite
 from apps.site.serializers import TrakSiteSerializer
+from apps.site.services import filter_sites_by_org
 
 logger = logging.getLogger(__name__)
 
@@ -19,27 +23,39 @@ def get(self, request, *args, **kwargs):
         return super().get(request, *args, **kwargs)
 
     def get_queryset(self):
-        user = self.request.user
-        return TrakSite.objects.filter_by_user(user)
+        return TrakSite.objects.filter_by_user(self.request.user)
 
 
 @method_decorator(cache_page(60 * 15), name="dispatch")
 class TrakSiteDetailsView(RetrieveAPIView):
-    """
-    View to GET a Haztrak Site, which encapsulates the EPA RcraSite plus some.
-    """
+    """View details of a Haztrak Site, which encapsulates the EPA RcraSite plus some."""
 
     serializer_class = TrakSiteSerializer
-    lookup_field = "rcra_site__epa_id"
     lookup_url_kwarg = "epa_id"
     queryset = TrakSite.objects.all()
 
     @method_decorator(cache_page(60 * 15))
     def get(self, request, *args, **kwargs):
-        return super().get(request, *args, **kwargs)
+        try:
+            site = TrakSite.objects.get_user_site_by_epa_id(
+                request.user, self.kwargs.get("epa_id")
+            )
+            data = self.serializer_class(site).data
+            return Response(data, status=status.HTTP_200_OK)
+        except TrakSite.DoesNotExist as e:
+            return Response(data=str(e), status=status.HTTP_404_NOT_FOUND)
 
-    def get_queryset(self):
-        epa_id = self.kwargs["epa_id"]
-        filter_by_epa_id = TrakSite.objects.filter_by_epa_id(epa_id)
-        filter_by_user = TrakSite.objects.filter_by_user(self.request.user)
-        return filter_by_epa_id & filter_by_user
+
+class TrakOrgSitesListView(APIView):
+    """Retrieve a list of sites for a given Org"""
+
+    @method_decorator(cache_page(60 * 15))
+    def get(self, request, *args, **kwargs):
+        try:
+            trak_sites = filter_sites_by_org(self.kwargs["org_id"])
+            serializer = TrakSiteSerializer(trak_sites, many=True)
+            return Response(data=serializer.data, status=status.HTTP_200_OK)
+        except TrakSite.DoesNotExist as e:
+            return Response(data=str(e), status=status.HTTP_404_NOT_FOUND)
+        except KeyError:
+            return Response(data="bad request", status=status.HTTP_400_BAD_REQUEST)
diff --git a/server/apps/wasteline/migrations/0001_initial.py b/server/apps/wasteline/migrations/0001_initial.py
index 441db11c6..182020625 100644
--- a/server/apps/wasteline/migrations/0001_initial.py
+++ b/server/apps/wasteline/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.10 on 2024-02-17 21:09
+# Generated by Django 4.2.10 on 2024-02-21 22:17
 
 from django.db import migrations, models
 import django.db.models.deletion
diff --git a/server/apps/wasteline/views.py b/server/apps/wasteline/views.py
index aaa41c172..800d0f954 100644
--- a/server/apps/wasteline/views.py
+++ b/server/apps/wasteline/views.py
@@ -38,7 +38,6 @@ class StateWasteCodesView(ListAPIView):
     serializer_class = WasteCodeSerializer
     queryset = WasteCode.state.all()
     lookup_url_kwarg = "state_id"
-    lookup_field = "state_id"
 
     @method_decorator(cache_page(60 * 15 * 24))
     def get(self, request, *args, **kwargs):
diff --git a/server/requirements_dev.txt b/server/requirements_dev.txt
index ed8583a70..4637b26f4 100644
--- a/server/requirements_dev.txt
+++ b/server/requirements_dev.txt
@@ -12,3 +12,4 @@ django-stubs-ext==4.2.7
 Faker==23.1.0
 -r requirements.txt
 coverage==7.4.1
+pytest-xdist==3.5.0