diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index 77391679..c9c18848 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -75,7 +75,8 @@ Omeka S Module (PHP-based)
 ### PHP Standards
 - Follow PSR-12 coding standards where applicable
 - Use proper type hints and return types
-- Document complex logic with clear comments
+- Document complex logic with inline comments only where strictly needed; comments must describe the current code, never reference previous versions or prior fixes
+- Class and method docblocks follow Python/Google style: a single summary sentence, followed by an optional blank line and longer description, `Args:`/`Returns:`/`Throws:` sections where appropriate, and `@param`/`@return` PHPDoc tags for type information
 - Prefer dependency injection over global state
 - Use Omeka S service manager patterns
 
@@ -93,13 +94,36 @@ Omeka S Module (PHP-based)
 
 ## Build, Validation, and Testing
 
+### Linting — Always Run
+
+**Always run `php -l` on every PHP file you create or modify before committing.** This catches parse errors immediately:
+
+```bash
+php -l path/to/File.php
+# or check all files at once:
+find . -name "*.php" -print0 | xargs -0 php -l | grep -v "No syntax errors"
+```
+
+### Omeka S Coding Standards
+
+Omeka S ships a PHP_CodeSniffer ruleset. When the Omeka S codebase is present, run it against changed files:
+
+```bash
+vendor/bin/phpcs --standard=vendor/omeka/omeka-s/coding-standards/Omeka/ruleset.xml src/Path/To/ChangedFile.php
+```
+
+Even without the full Omeka environment, apply these standards manually:
+- No `addCsrf()` calls — Omeka S adds CSRF to **all** forms automatically via its `Omeka\Form\Initializer\Csrf` initializer. Never call `addCsrf()` manually.
+- Forms extend `Laminas\Form\Form` (or an Omeka subclass); the initializer handles CSRF.
+- Verify every `use` import is spelled correctly (case-sensitive on Linux) and actually resolves.
+- Remove all unused `use` statements.
+
 ### Current State
-**No explicit build steps, CI/CD pipelines, or automated validation are currently present** in this repository.
+**No CI/CD pipelines or automated test suites are currently present** in this repository beyond `php -l`.
 
 ### What This Means for Agents
-- **Skip automatic build/validate steps** unless explicitly directed by task requirements
-- **No linting, testing, or compilation** commands to run by default
-- **Manual validation** may be performed by viewing files and inspecting code
+- **Always run `php -l`** on every changed PHP file — this is mandatory, not optional
+- **Manual validation** should also check method existence against Omeka S source (search GitHub omeka/omeka-s if needed)
 - **Future improvements**: Agents may recommend or prototype build/test infrastructure as part of code quality improvements
 
 ### Testing in Omeka Context
diff --git a/Module.php b/Module.php
index e4564db9..c48725bc 100644
--- a/Module.php
+++ b/Module.php
@@ -29,6 +29,7 @@
 use Teams\Form\Element\BlankTeamSelect;
 use Teams\Form\Element\RoleSelect;
 use Teams\Form\Element\TeamSelect;
+use Teams\Service\SitePermissionManager;
 use Omeka\Api\Adapter\ItemAdapter;
 use Omeka\Api\Adapter\ItemSetAdapter;
 use Omeka\Api\Adapter\MediaAdapter;
@@ -190,16 +191,16 @@ public function upgrade($oldVersion, $newVersion, ServiceLocatorInterface $servi
             $globalSettings = $serviceLocator->get('Omeka\Settings');
             $globalSettings->set('teams_filter_bypass_roles', ["global_admin"]);
         }
+        if (version_compare($oldVersion, '4.2.0', '<')) {
+            // Site permission sync cannot run here: module entities are not
+            // registered with Doctrine during the upgrade step. Use the
+            // "Sync Site Permissions" button on the module config page instead.
+        }
     }
 
     public function updateAllUserSites()
     {
-        $em = $this->getServiceLocator()->get('Omeka\EntityManager');
-        $active_users = $em->getRepository('Teams\Entity\TeamUser')->findAllBy(['is_active' => true]);
-
-        foreach ($active_users as $user) {
-            $this->updateUserSites($user->getUser()->getId());
-        }
+        $this->getServiceLocator()->get(SitePermissionManager::class)->updateAllUserDefaultSites();
     }
 
     public function handleConfigForm(AbstractController $controller)
@@ -213,6 +214,9 @@ public function handleConfigForm(AbstractController $controller)
         $globalSettings->set('teams_site_admin_make_user', $params['teams_site_admin_make_user']);
         $globalSettings->set('teams_filter_bypass_roles', $params['teams_filter_bypass_roles']);
 
+        if (!empty($params['teams_sync_site_permissions'])) {
+            $this->getServiceLocator()->get(SitePermissionManager::class)->syncAllSitePermissions();
+        }
     }
 
     public function getConfigForm(PhpRenderer $renderer)
@@ -955,16 +959,18 @@ public function userCreate(Event $event)
                     }
                 }
                 $role_id = $team_role_ids[$team_id];
-                $role = $em->getRepository('Teams\Entity\TeamRole')
-                    ->findOneBy(['id' => $role_id]);
                 $team_user_exists = $em->getRepository('Teams\Entity\TeamUser')
                     ->findOneBy(['team' => $team->getId(), 'user' => $user_id]);
                 if (!$team_user_exists) {
-                    $team_user = new TeamUser($team, $user, $role);
-                    $em->persist($team_user);
+                    // Create through the adapter so site-permission syncing is
+                    // handled automatically.
+                    $this->getServiceLocator()->get('Omeka\ApiManager')->create('team-user', [
+                        'team' => $team->getId(),
+                        'user' => $user_id,
+                        'role' => (int) $role_id,
+                    ]);
                 }
             }
-            $em->flush();
             if ($default_team) {
                 $em->getRepository('Teams\Entity\TeamUser')
                     ->findOneBy(['team' => $default_team, 'user' => $user_id])
@@ -1039,27 +1045,7 @@ public function updateItemSites($item_id)
 
     public function updateUserSites($user_id)
     {
-        $em = $this->getServiceLocator()->get('Omeka\EntityManager');
-
-        $userSettings = $this->getServiceLocator()->get('Omeka\Settings\User');
-
-        $site_ids = [];
-        $settingId = 'default_item_sites';
-
-        $active_team = $em->getRepository('Teams\Entity\TeamUser')
-            ->findOneBy(['user' => $user_id, 'is_current' => true]);
-        if ($active_team) {
-            $active_team = $active_team->getTeam();
-
-            $team_sites = $active_team->getTeamSites();
-
-            foreach ($team_sites as $team_site):
-                $site_ids[] = $team_site->getSite()->getId();
-            endforeach;
-
-            //update default sites
-            $userSettings->set($settingId, $site_ids, $user_id);
-        }
+        $this->getServiceLocator()->get(SitePermissionManager::class)->updateUserDefaultSites($user_id);
     }
 
     /**
@@ -1154,33 +1140,17 @@ public function siteCreate(Event $event)
 
             $team_ids = $request->getContent()['team'];
 
-            $all_teams_users = [];
             $all_team_resources = [];
 
-            //add team sites
+            // Create team-site associations through the adapter so that
+            // site-permission syncing is handled automatically.
+            $api = $this->getServiceLocator()->get('Omeka\ApiManager');
             foreach ($team_ids as $team_id):
                 $team = $teams->findOneBy(['id' => $team_id]);
-                $team_site = new TeamSite($team, $site);
-                $em->persist($team_site);
-
-                //get team users
-                $all_teams_users[] = $team->getTeamUsers();
+                $api->create('team-site', ['team' => $team_id, 'site' => $site_id]);
 
                 //get team items
                 $all_team_resources[] = $team->getTeamResources();
-
-            endforeach;
-            $em->flush();
-
-            //update current team users to include new site in their default sites
-            foreach ($all_teams_users as $team_users):
-                foreach ($team_users as $team_user):
-                    if ($team_user->getCurrent()) {
-                        $user_id = $team_user->getUser()->getId();
-                        $this->updateUserSites($user_id);
-                    }
-
-                endforeach;
             endforeach;
 
             //update all item-site to include all items from the site's teams
@@ -1265,8 +1235,6 @@ public function userUpdate(Event $event)
 
                         //get it this way because the roles are added dynamically as js and not part of pre-baked form
                         $role_id = $request->getContent()['o-module-teams:TeamRole'][$team_id];
-                        $role = $em->getRepository('Teams\Entity\TeamRole')
-                                ->findOneBy(['id' => $role_id]);
 
                         $team_user_exists = $em->getRepository('Teams\Entity\TeamUser')
                                 ->findOneBy(['team' => $team->getId(), 'user' => $user_id]);
@@ -1274,21 +1242,21 @@ public function userUpdate(Event $event)
                         if ($team_user_exists) {
                             echo $team_user_exists->getId();
                         } else {
-                            $team_user = new TeamUser($team, $user, $role);
-                            $em->persist($team_user);
+                            // Create through the adapter so site-permission syncing is
+                            // handled automatically.
+                            $teamUserResponse = $this->getServiceLocator()->get('Omeka\ApiManager')->create('team-user', [
+                                'team' => $team->getId(),
+                                'user' => $user_id,
+                                'role' => (int) $role_id,
+                            ]);
+                            $teamUserEntity = $teamUserResponse->getContent();
                             if ($team_id == $current_team_id) {
-                                $team_user->setCurrent(true);
+                                $teamUserEntity->setCurrent(true);
+                                $em->flush();
                             }
-                            $em->persist($team_user);
-
-                            //this is not ideal to flush each iteration, but it is how to check to make sure they didn't
-                            //TODO: catch this in chosen-trigger.js instead
-                            $em->flush();
                         }
 
                     endforeach;
-
-                    $em->flush();
                 }
                 if (array_key_exists('o-module-teams:DefaultTeam', $request->getContent())) {
                     if ($current_user->getRole() == 'global_admin' or $current_user->getId() == $target_user) {
@@ -1403,43 +1371,27 @@ public function siteUpdate(Event $event)
                 $added_teams = array_diff($form_teams, $existing_teams);
                 $removed_teams = array_diff($existing_teams, $form_teams);
 
-                foreach ($team_sites as $team_site):
-                    if (in_array($team_site->getTeam()->getId(), $removed_teams)) {
-                        $em->remove($team_site);
-                    }
-                endforeach;
-                $em->flush();
+                // Delete removed team-site associations through the adapter so that
+                // site-permission cleanup is handled automatically.
+                $api = $this->getServiceLocator()->get('Omeka\ApiManager');
+                foreach ($removed_teams as $team_id) {
+                    $api->delete('team-site', ['team' => $team_id, 'site' => $site_id]);
+                }
 
-                //add teams to the site for each new team listed in the form
-                foreach ($added_teams as $team):
-                    $team_site = new TeamSite(
-                        $em->getRepository('Teams\Entity\Team')->findOneBy(['id' => $team]),
-                        $em->getRepository('Omeka\Entity\Site')->findOneBy(['id' => $site_id])
-                    );
-                    $em->persist($team_site);
-                endforeach;
-                $em->flush();
+                // Add new team-site associations through the adapter so that
+                // site-permission syncing is handled automatically.
+                foreach ($added_teams as $team_id) {
+                    $api->create('team-site', ['team' => $team_id, 'site' => $site_id]);
+                }
 
-                //get any items or users that need to be updated
-                //by either removing or adding item-sits or user default site
+                //get any items that need their site membership updated
                 $delta_item_site = [];
-                $delta_user_site = [];
                 foreach (array_merge($added_teams, $removed_teams) as $team_id) {
                     $delta_item_site[] = $em->getRepository('Teams\Entity\Team')
                         ->findOneBy(['id' => $team_id])
                         ->getTeamResources();
-                    $delta_user_site[] = $em->getRepository('Teams\Entity\Team')
-                        ->findOneBy(['id' => $team_id])
-                        ->getTeamUsers();
                 }
 
-                //update current team users to include new site in their default sites
-                foreach ($delta_user_site as $team_users) {
-                    foreach ($team_users as $team_user) {
-                        $user_id = $team_user->getUser()->getId();
-                        $this->updateUserSites($user_id);
-                    }
-                }
                 foreach ($delta_item_site as $team_item_collection) {
                     foreach ($team_item_collection as $team_item) {
                         $this->updateItemSites($team_item->getResource()->getId());
@@ -1952,6 +1904,43 @@ public function siteEdit(Event $event)
         echo $view->partial('teams/partial/site-admin/edit', ['site_teams' => $site_teams, 'team_ids' => $team_ids]);
     }
 
+    /**
+     * Warns that site user roles are managed by Teams, and annotates each user
+     * row in the Omeka site-admin permissions table with the team(s) responsible.
+     *
+     * @param Event $event
+     */
+    public function siteUsersTeamsInfo(Event $event)
+    {
+        $view = $event->getTarget();
+        $site = $view->vars()->site;
+        if (!$site) {
+            return;
+        }
+
+        $messenger = new Messenger();
+        $messenger->addWarning(
+            'User roles on this site are managed by the Teams module. '
+            . 'Manual changes made here may be overwritten the next time team memberships or roles are updated.'
+        );
+
+        $em = $this->getServiceLocator()->get('Omeka\EntityManager');
+        $teamSites = $em->getRepository('Teams\Entity\TeamSite')->findBy(['site' => $site->id()]);
+
+        // Build userId => [teamName, ...] for every user who has a team-managed
+        // permission on this site.
+        $teamManagedUsers = [];
+        foreach ($teamSites as $teamSite) {
+            $team = $teamSite->getTeam();
+            $teamUsers = $em->getRepository('Teams\Entity\TeamUser')->findBy(['team' => $team->getId()]);
+            foreach ($teamUsers as $teamUser) {
+                $userId = $teamUser->getUser()->getId();
+                $teamManagedUsers[$userId][] = $team->getName();
+            }
+        }
+
+        echo $view->partial('teams/partial/site-admin/users-teams-info', ['teamManagedUsers' => $teamManagedUsers]);
+    }
 
     public function getModules()
     {
diff --git a/asset/js/inject-removal-util-element.js b/asset/js/inject-removal-util-element.js
index c9f031f6..805bbaf3 100644
--- a/asset/js/inject-removal-util-element.js
+++ b/asset/js/inject-removal-util-element.js
@@ -1,25 +1,13 @@
 $(window).on('load', function() {
-    $("#o-modules-team-remove-item-sets").parent().parent().css('visibility', 'hidden');
-    $("#o-modules-team-remove-resource-templates").parent().parent().css('visibility', 'hidden');
-
-    //not ideal, but for some reason the chosen option from chosen-options.js are getting unset, so settin them here
+    // Initialize chosen on the item-sets and resource-templates multiselects.
+    // Chosen handles deselection natively: deselected values are removed from
+    // the select element, so they are omitted from the submitted form data and
+    // the adapter treats them as removed.
     $("#o-modules-team-item-sets").chosen({
         allow_single_deselect: true,
         disable_search_threshold: 10,
         width: '100%',
         include_group_label_in_selected: true,
-    }).change( function(event, params) {
-            let $values = $("#o-modules-team-remove-item-sets").val();
-            if (params.deselected){
-                let $label = $("#o-modules-team-item-sets option[value='"+params.deselected+"']").text();
-                $("#o-modules-team-remove-item-sets").append('<option value='+params.deselected+'>'+$label+'</option>').trigger("chosen:updated");
-                $values.push(params.deselected);
-                console.log($values);
-            }
-            if (params.selected) {
-                $values.splice($.inArray(params.selected, $values), 1);
-            }
-            $("#o-modules-team-remove-item-sets").val($values).trigger("chosen:updated");
     });
 
     $("#o-modules-team-resource-templates").chosen({
@@ -27,17 +15,5 @@ $(window).on('load', function() {
         disable_search_threshold: 10,
         width: '100%',
         include_group_label_in_selected: true,
-    }).change( function(event, params) {
-        let $values = $("#o-modules-team-remove-resource-templates").val();
-        if (params.deselected){
-            let $label = $("#o-modules-team-resource-templates option[value='"+params.deselected+"']").text();
-            $("#o-modules-team-remove-resource-templates").append('<option value='+params.deselected+'>'+$label+'</option>').trigger("chosen:updated");
-            $values.push(params.deselected);
-            console.log($values);
-        }
-        if (params.selected) {
-            $values.splice($.inArray(params.selected, $values), 1);
-        }
-        $("#o-modules-team-remove-resource-templates").val($values).trigger("chosen:updated");
     });
 });
diff --git a/asset/js/team-users.js b/asset/js/team-users.js
index 0fb6ad8b..0dbe049e 100644
--- a/asset/js/team-users.js
+++ b/asset/js/team-users.js
@@ -1,4 +1,6 @@
-//adapted from site-users.js v4.0.0
+// Adapted from omeka/omeka-s site-users.js.
+// Key ordering requirement: Omeka.initializeSelector must run first so that
+// the DOM rows exist before we try to set the role <select> values.
 $(document).ready(function() {
     var permissionsTable = $('#site-user-permissions');
     var existingRows = permissionsTable.data('existing-rows');
@@ -15,15 +17,20 @@ $(document).ready(function() {
         index++;
     };
 
+    // Bind the appendRow handler before initializing so it fires for every row,
+    // including those created for pre-existing team members.
+    permissionsTable.on('appendRow', function() {
+        updateRowIndex($('[name="o:team_users[__index__][o:user][o:id]"]').val());
+    });
+
+    // Initialize the selector first — this creates DOM rows from existingRows
+    // and triggers 'appendRow' (and therefore updateRowIndex) for each one.
+    Omeka.initializeSelector('#site-user-permissions', '#user-selector');
+
+    // Now that rows are in the DOM, restore each member's saved role selection.
     $.each(existingRows, function() {
         var selectedRole = this.role;
-        var existingRowValueInput = $('.resource-id[value="' + this.id + '"]');
-        var existingRow = existingRowValueInput.parents('.resource-row');
+        var existingRow = $('.resource-id[value="' + this.id + '"]').parents('.resource-row');
         existingRow.find('select').val(selectedRole);
-        updateRowIndex(this.id);
-    });
-
-    permissionsTable.on('appendRow', function() {
-        updateRowIndex($('[name="o:team_users[__index__][o:user][o:id]"]').val());
     });
 });
diff --git a/composer.json b/composer.json
new file mode 100644
index 00000000..efa5deb5
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,14 @@
+{
+    "name": "uiuclibrary/teams",
+    "description": "Omeka S module for team-based resource visibility and permission management",
+    "type": "omeka-module",
+    "license": "Apache-2.0",
+    "require-dev": {
+        "friendsofphp/php-cs-fixer": "^3.0"
+    },
+    "config": {
+        "allow-plugins": {
+            "composer/package-versions-deprecated": true
+        }
+    }
+}
diff --git a/config/module.config.php b/config/module.config.php
index f091c5f1..797ba447 100644
--- a/config/module.config.php
+++ b/config/module.config.php
@@ -78,13 +78,14 @@
         'factories' => [
             \Teams\Acl\TeamRolePermissionAssertion::class => \Teams\Service\Acl\TeamRolePermissionAssertionFactory::class,
             \Teams\Service\AclRuleManager::class => \Teams\Service\AclRuleManagerFactory::class,
+            \Teams\Service\SitePermissionManager::class => \Teams\Service\SitePermissionManagerFactory::class,
         ],
     ],
     'form_elements' => [
         'invokables' => [
-            Form\TeamForm::class => Form\TeamForm::class,
         ],
         'factories' => [
+            Form\TeamForm::class => Service\Form\TeamFormFactory::class,
             Form\Element\TeamSelect::class => Service\Form\Element\TeamSelectFactory::class,
             Form\Element\AllTeamSelect::class => Service\Form\Element\AllTeamSelectFactory::class,
             Form\Element\BlankTeamSelect::class => Service\Form\Element\BlankTeamSelectFactory::class,
@@ -94,7 +95,6 @@
             Form\Element\AllSiteSelect::class => Service\Form\Element\AllSiteSelectFactory::class,
             Form\Element\AllSiteSelectOrdered::class => Service\Form\Element\AllSiteSelectOrderedFactory::class,
             Form\ConfigForm::class => Service\Form\ConfigFormFactory::class,
-            Form\SecondaryResourcesForm::class => Service\Form\SecondaryResourceFormFactory::class,
             Form\Element\TeamName::class => Service\Form\Element\TeamNameFactory::class,
             Form\Element\RoleName::class => Service\Form\Element\RoleNameFactory::class,
             Form\Element\ItemSetTeamSelect::class => Service\Form\Element\ItemSetTeamSelectFactory::class,
@@ -112,7 +112,7 @@
         'factories' => [
             'roleAuth' => Service\ViewHelper\RoleAuthFactory::class,
             'allUserSelect'  => Service\ViewHelper\AllUserSelectFactory::class,
-
+            'teamSiteUsers' => Service\ViewHelper\TeamSiteUsersFactory::class,
         ]
     ],
     'controllers' => [
@@ -197,18 +197,6 @@
 
                                 ]
                             ],
-                            'user' => [
-                                'type' => 'Literal',
-                                'options' => [
-                                    'route' => '/user',
-                                    'defaults' => [
-                                        //TODO change to correct controller when complete
-                                        'controller' => 'Update',
-                                        'action' => 'user'
-                                    ]
-
-                                ]
-                            ],
                             'roles' => [
                                 'type' => Literal::class,
                                 'options' => [
diff --git a/config/module.ini b/config/module.ini
index 59f8d97d..bc400db7 100644
--- a/config/module.ini
+++ b/config/module.ini
@@ -1,6 +1,6 @@
 [info]
 name         = "Teams"
-version      = "4.1.0"
+version      = "4.2.0"
 author       = "Alex Dryden"
 configurable = true
 description  = "Assigns items and itemsets to teams so that only approved team mates see them"
diff --git a/src/Api/Adapter/AbstractTeamEntityAdapter.php b/src/Api/Adapter/AbstractTeamEntityAdapter.php
index 5974b328..f3527fa0 100644
--- a/src/Api/Adapter/AbstractTeamEntityAdapter.php
+++ b/src/Api/Adapter/AbstractTeamEntityAdapter.php
@@ -167,29 +167,28 @@ public function validateRequest(Request $request, ErrorStore $errorStore)
         $data = [];
         if (Request::CREATE === $request->getOperation()){
             $data = $request->getContent();
-        } elseif (Request::DELETE === $request->getOperation()) {
+        } elseif (Request::UPDATE === $request->getOperation() || Request::DELETE === $request->getOperation()) {
             $data = $request->getId();
         }
         if (!is_array($data)){
             $errorStore->addError('o:id', new Message('The %s id must be an array.', $this->getResourceName())); // @translate
             return;
         }
-        if (!array_key_exists('o:team',$data)){
-            $errorStore->addError('o:team', 'The request lacks a team id.'); // @translate
 
+        // Normalise plain keys (team/user) to their JSON-LD equivalents (o:team/o:user)
+        // before validating, so callers using either convention are accepted.
+        if (!array_key_exists('o:team', $data) && array_key_exists('team', $data)) {
+            $data['o:team'] = $data['team'];
         }
-        if (!array_key_exists($entity_index,$data)){
-            $errorStore->addError($entity_index, new Message('The request lacks a %s id.',$this->getMappedEntityName())); // @translate
+        if (!array_key_exists($entity_index, $data) && array_key_exists($this->getMappedEntityName(), $data)) {
+            $data[$entity_index] = $data[$this->getMappedEntityName()];
         }
 
-
-        //is that id a team
-        if ($data['team']){
-            $data['o:team'] = $data['team'];
+        if (!array_key_exists('o:team', $data)){
+            $errorStore->addError('o:team', 'The request lacks a team id.'); // @translate
         }
-
-        if ($data[$this->getMappedEntityName()]){
-            $data[$entity_index] = $data[$this->getMappedEntityName()];
+        if (!array_key_exists($entity_index, $data)){
+            $errorStore->addError($entity_index, new Message('The request lacks a %s id.', $this->getMappedEntityName())); // @translate
         }
 
         $team = $this->getEntityManager()
@@ -301,7 +300,7 @@ public function batchDelete(Request $request)
 
     public function update(Request $request)
     {
-        AbstractAdapter::update($request);
+        return parent::update($request);
     }
 
     public function batchUpdate(Request $request)
diff --git a/src/Api/Adapter/TeamAdapter.php b/src/Api/Adapter/TeamAdapter.php
index 9918de6d..7a7d2460 100644
--- a/src/Api/Adapter/TeamAdapter.php
+++ b/src/Api/Adapter/TeamAdapter.php
@@ -5,11 +5,16 @@
 use Omeka\Api\Adapter\AbstractAdapter;
 use Teams\Api\Representation\TeamRepresentation;
 use Teams\Entity\Team;
+use Teams\Entity\TeamResource;
+use Teams\Entity\TeamResourceTemplate;
+use Teams\Entity\TeamSite;
+use Teams\Entity\TeamUser;
 use Omeka\Api\Adapter\AbstractEntityAdapter;
 use Omeka\Api\Request;
 use Omeka\Entity\EntityInterface;
 use Omeka\Stdlib\ErrorStore;
 use Omeka\Stdlib\Message;
+use Teams\Service\SitePermissionManager;
 
 class TeamAdapter extends AbstractEntityAdapter
 {
@@ -49,6 +54,226 @@ public function hydrate(
                 $entity->setDescription($description);
             }
         }
+
+        $em = $this->getEntityManager();
+
+        // Association diffs are only meaningful on UPDATE, when the entity
+        // already exists. The AddController handles these independently.
+        if (Request::UPDATE === $request->getOperation()) {
+        // Hydrate team users: accepts o:team_users as an array of
+        // {o:user: {o:id: N}, o:team_role: {o:id: N}} entries.
+        if ($this->shouldHydrate($request, 'o:team_users')) {
+            $teamUsers = $request->getValue('o:team_users', []);
+            $teamId = $entity->getId();
+
+            $submittedUserIds = array_column(
+                array_column($teamUsers, 'o:user'),
+                'o:id'
+            );
+
+            $existingTeamUsers = $em->getRepository(TeamUser::class)
+                ->findBy(['team' => $teamId]);
+
+            // Remove users no longer in the submitted list.
+            foreach ($existingTeamUsers as $existingTeamUser) {
+                $userId = $existingTeamUser->getUser()->getId();
+                if (!in_array($userId, $submittedUserIds)) {
+                    $em->remove($existingTeamUser);
+                }
+            }
+
+            // Index existing by user id for quick lookup.
+            $existingByUserId = [];
+            foreach ($existingTeamUsers as $existingTeamUser) {
+                $existingByUserId[$existingTeamUser->getUser()->getId()] = $existingTeamUser;
+            }
+
+            foreach ($teamUsers as $teamUserData) {
+                $userId = (int) $teamUserData['o:user']['o:id'];
+                $roleId = (int) $teamUserData['o:team_role']['o:id'];
+
+                $userEntity = $em->find('Omeka\Entity\User', $userId);
+                $roleEntity = $em->find('Teams\Entity\TeamRole', $roleId);
+
+                if (!$userEntity || !$roleEntity) {
+                    continue;
+                }
+
+                if (isset($existingByUserId[$userId])) {
+                    // Update role if changed.
+                    $existingByUserId[$userId]->setRole($roleEntity);
+                } else {
+                    $newTeamUser = new TeamUser($entity, $userEntity, $roleEntity);
+                    $em->persist($newTeamUser);
+                }
+            }
+        }
+
+        // Hydrate site associations: accepts o:team_sites as an array of site IDs.
+        if ($this->shouldHydrate($request, 'o:team_sites')) {
+            $submittedSiteIds = array_map('intval', (array) $request->getValue('o:team_sites', []));
+            $teamId = $entity->getId();
+
+            $existingTeamSites = $em->getRepository(TeamSite::class)
+                ->findBy(['team' => $teamId]);
+
+            $existingSiteIds = array_map(
+                fn(TeamSite $ts) => $ts->getSite()->getId(),
+                $existingTeamSites
+            );
+
+            // Remove sites no longer in submitted list.
+            foreach ($existingTeamSites as $existingTeamSite) {
+                if (!in_array($existingTeamSite->getSite()->getId(), $submittedSiteIds)) {
+                    $em->remove($existingTeamSite);
+                }
+            }
+
+            // Add new sites.
+            foreach ($submittedSiteIds as $siteId) {
+                if (!in_array($siteId, $existingSiteIds)) {
+                    $siteEntity = $em->find('Omeka\Entity\Site', $siteId);
+                    if ($siteEntity) {
+                        $em->persist(new TeamSite($entity, $siteEntity));
+                    }
+                }
+            }
+        }
+
+        // Hydrate item-set associations: accepts o:item_sets as an array of
+        // resource IDs and o:recursive_item_sets as a boolean flag.
+        // Direct EntityManager operations are used here (not the API manager)
+        // to avoid nested API calls from within hydrate(), which would trigger
+        // Omeka's response-validation and cause a BadResponseException.
+        if ($this->shouldHydrate($request, 'o:item_sets')) {
+            $submittedItemSetIds = array_map('intval', (array) $request->getValue('o:item_sets', []));
+            $recursive = (bool) $request->getValue('o:recursive_item_sets', false);
+            $teamId = $entity->getId();
+
+            // Fetch only TeamResource entries whose resource is an item set,
+            // so that plain-item associations are not accidentally removed.
+            $existingTeamResources = $em->createQuery(
+                'SELECT tr FROM Teams\Entity\TeamResource tr'
+                . ' JOIN Omeka\Entity\ItemSet iset WITH iset.id = tr.resource'
+                . ' WHERE tr.team = :teamId'
+            )->setParameter('teamId', $teamId)->getResult();
+
+            $existingItemSetIds = array_map(
+                fn(TeamResource $tr) => $tr->getResource()->getId(),
+                $existingTeamResources
+            );
+
+            // Build a lookup of existing TeamResource entities by resource id.
+            $existingByResourceId = [];
+            foreach ($existingTeamResources as $tr) {
+                $existingByResourceId[$tr->getResource()->getId()] = $tr;
+            }
+
+            // Collect team sites once if syncSites is needed.
+            $teamSiteEntities = $em->getRepository(TeamSite::class)->findBy(['team' => $teamId]);
+
+            // Remove item sets no longer in submitted list.
+            foreach ($existingItemSetIds as $existingId) {
+                if (!in_array($existingId, $submittedItemSetIds)) {
+                    $resourceEntity = $em->find('Omeka\Entity\Resource', $existingId);
+                    if ($resourceEntity) {
+                        // Recursively remove child resources when requested.
+                        if ($recursive && $resourceEntity->getResourceName() === 'item_sets') {
+                            $childResources = $em->getRepository('Omeka\Entity\Resource')
+                                ->createQueryBuilder('r')
+                                ->join('Omeka\Entity\Item', 'i', 'WITH', 'i.id = r.id')
+                                ->join('i.itemSets', 'iset')
+                                ->where('iset.id = :itemSetId')
+                                ->setParameter('itemSetId', $existingId)
+                                ->getQuery()
+                                ->getResult();
+                            foreach ($childResources as $childResource) {
+                                $childTeamResource = $em->getRepository(TeamResource::class)
+                                    ->findOneBy(['team' => $teamId, 'resource' => $childResource->getId()]);
+                                if ($childTeamResource) {
+                                    $this->removeSiteAssociations($childResource, $teamSiteEntities);
+                                    $em->remove($childTeamResource);
+                                }
+                            }
+                        }
+                        // Sync site associations.
+                        $this->removeSiteAssociations($resourceEntity, $teamSiteEntities);
+                        $em->remove($existingByResourceId[$existingId]);
+                    }
+                }
+            }
+
+            // Add new item sets.
+            foreach ($submittedItemSetIds as $itemSetId) {
+                if (!in_array($itemSetId, $existingItemSetIds)) {
+                    $resourceEntity = $em->find('Omeka\Entity\Resource', $itemSetId);
+                    if (!$resourceEntity) {
+                        continue;
+                    }
+                    $em->persist(new TeamResource($entity, $resourceEntity));
+                    // Sync site associations.
+                    $this->addSiteAssociations($resourceEntity, $teamSiteEntities);
+                    // Recursively add child resources when requested.
+                    if ($recursive && $resourceEntity->getResourceName() === 'item_sets') {
+                        $childResources = $em->getRepository('Omeka\Entity\Resource')
+                            ->createQueryBuilder('r')
+                            ->join('Omeka\Entity\Item', 'i', 'WITH', 'i.id = r.id')
+                            ->join('i.itemSets', 'iset')
+                            ->where('iset.id = :itemSetId')
+                            ->setParameter('itemSetId', $itemSetId)
+                            ->getQuery()
+                            ->getResult();
+                        foreach ($childResources as $childResource) {
+                            $alreadyExists = $em->getRepository(TeamResource::class)
+                                ->findOneBy(['team' => $teamId, 'resource' => $childResource->getId()]);
+                            if (!$alreadyExists) {
+                                $em->persist(new TeamResource($entity, $childResource));
+                                $this->addSiteAssociations($childResource, $teamSiteEntities);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        // Hydrate resource-template associations: accepts o:resource_templates
+        // as an array of resource-template IDs. Direct EM ops for same reason
+        // as item sets above.
+        if ($this->shouldHydrate($request, 'o:resource_templates')) {
+            $submittedTemplateIds = array_map('intval', (array) $request->getValue('o:resource_templates', []));
+            $teamId = $entity->getId();
+
+            $existingTeamTemplates = $em->getRepository(TeamResourceTemplate::class)
+                ->findBy(['team' => $teamId]);
+
+            $existingTemplateIds = array_map(
+                fn(TeamResourceTemplate $trt) => $trt->getResourceTemplate()->getId(),
+                $existingTeamTemplates
+            );
+
+            $existingByTemplateId = [];
+            foreach ($existingTeamTemplates as $trt) {
+                $existingByTemplateId[$trt->getResourceTemplate()->getId()] = $trt;
+            }
+
+            // Remove templates no longer in submitted list.
+            foreach ($existingTemplateIds as $existingId) {
+                if (!in_array($existingId, $submittedTemplateIds)) {
+                    $em->remove($existingByTemplateId[$existingId]);
+                }
+            }
+
+            // Add new templates.
+            foreach ($submittedTemplateIds as $templateId) {
+                if (!in_array($templateId, $existingTemplateIds)) {
+                    $templateEntity = $em->find('Omeka\Entity\ResourceTemplate', $templateId);
+                    if ($templateEntity) {
+                        $em->persist(new TeamResourceTemplate($entity, $templateEntity));
+                    }
+                }
+            }
+        }
+        } // end if (Request::UPDATE === ...)
     }
 
     public function buildQuery(QueryBuilder $qb, array $query)
@@ -183,7 +408,66 @@ public function batchCreate(Request $request)
 
     public function update(Request $request)
     {
-        AbstractAdapter::batchCreate($request);
+        $teamId = $request->getId();
+        $em = $this->getEntityManager();
+
+        // Snapshot pre-update state so we can compute targeted sync diffs.
+        $team = $em->find(Team::class, $teamId);
+        $beforeUserRoles = [];
+        foreach ($team->getTeamUsers() as $teamUser) {
+            $beforeUserRoles[$teamUser->getUser()->getId()] = $teamUser->getRole()->getId();
+        }
+        $beforeSiteIds = array_map(
+            fn(TeamSite $ts) => $ts->getSite()->getId(),
+            $team->getTeamSites()->toArray()
+        );
+
+        $response = parent::update($request);
+
+        // Sync site permissions based on the user and site diffs.
+        $sitePermissionManager = $this->getServiceLocator()->get(SitePermissionManager::class);
+
+        $team = $em->find(Team::class, $teamId);
+        $afterUserRoles = [];
+        foreach ($team->getTeamUsers() as $teamUser) {
+            $afterUserRoles[$teamUser->getUser()->getId()] = $teamUser->getRole()->getId();
+        }
+
+        $addedUserIds   = array_diff_key($afterUserRoles, $beforeUserRoles);
+        $removedUserIds = array_diff_key($beforeUserRoles, $afterUserRoles);
+        $keptUserIds    = array_intersect_key($beforeUserRoles, $afterUserRoles);
+
+        foreach (array_keys($addedUserIds) as $userId) {
+            $sitePermissionManager->syncSitePermissionsForUser($userId, $teamId, false);
+        }
+        foreach (array_keys($removedUserIds) as $userId) {
+            $sitePermissionManager->removeSitePermissionsForUser($userId, $teamId, null, false);
+        }
+        foreach (array_keys($keptUserIds) as $userId) {
+            if ($beforeUserRoles[$userId] !== $afterUserRoles[$userId]) {
+                $sitePermissionManager->syncSitePermissionsForUser($userId, $teamId, false);
+            }
+        }
+
+        $afterSiteIds   = array_map(
+            fn(TeamSite $ts) => $ts->getSite()->getId(),
+            $team->getTeamSites()->toArray()
+        );
+        $addedSiteIds   = array_diff($afterSiteIds, $beforeSiteIds);
+        $removedSiteIds = array_diff($beforeSiteIds, $afterSiteIds);
+
+        foreach ($addedSiteIds as $siteId) {
+            $sitePermissionManager->syncSitePermissionsForTeamOnSiteAdded($teamId, $siteId, false);
+        }
+        foreach ($removedSiteIds as $siteId) {
+            $sitePermissionManager->removeSitePermissionsForTeamOnSiteRemoved($teamId, $siteId, false);
+        }
+
+        if ($addedUserIds || $removedUserIds || $keptUserIds || $addedSiteIds || $removedSiteIds) {
+            $em->flush();
+        }
+
+        return $response;
     }
 
     public function batchUpdate(Request $request)
@@ -195,4 +479,52 @@ public function batchDelete(Request $request)
     {
         AbstractAdapter::batchDelete($request);
     }
+
+    /**
+     * Adds team-site site memberships to a resource entity.
+     *
+     * Called when an item set or child item is added to a team so that the
+     * resource is also associated with every site the team belongs to.
+     *
+     * @param \Omeka\Entity\Resource $resource
+     * @param TeamSite[] $teamSites
+     */
+    private function addSiteAssociations($resource, array $teamSites): void
+    {
+        if (!method_exists($resource, 'getSites') || empty($teamSites)) {
+            return;
+        }
+        $itemSites = $resource->getSites();
+        $em = $this->getEntityManager();
+        foreach ($teamSites as $teamSite) {
+            $siteEntity = $em->find('Omeka\Entity\Site', $teamSite->getSite()->getId());
+            if ($siteEntity && !$itemSites->contains($siteEntity)) {
+                $itemSites->add($siteEntity);
+            }
+        }
+    }
+
+    /**
+     * Removes team-site memberships from a resource entity.
+     *
+     * Called when an item set or child item is removed from a team so that
+     * the resource is disassociated from the team's sites.
+     *
+     * @param \Omeka\Entity\Resource $resource
+     * @param TeamSite[] $teamSites
+     */
+    private function removeSiteAssociations($resource, array $teamSites): void
+    {
+        if (!method_exists($resource, 'getSites') || empty($teamSites)) {
+            return;
+        }
+        $itemSites = $resource->getSites();
+        $em = $this->getEntityManager();
+        foreach ($teamSites as $teamSite) {
+            $siteEntity = $em->find('Omeka\Entity\Site', $teamSite->getSite()->getId());
+            if ($siteEntity) {
+                $itemSites->removeElement($siteEntity);
+            }
+        }
+    }
 }
diff --git a/src/Api/Adapter/TeamResourceAdapter.php b/src/Api/Adapter/TeamResourceAdapter.php
index a08136b4..899c4000 100644
--- a/src/Api/Adapter/TeamResourceAdapter.php
+++ b/src/Api/Adapter/TeamResourceAdapter.php
@@ -340,6 +340,7 @@ public function delete(Request $request)
             }
         }
 
+        $entity = null;
         $exists = $this->getServiceLocator()->get('Omeka\ApiManager')
             ->search('team-resource', ['team' => $request->getValue('team'), 'resource' => $request->getValue('resource')])
             ->getContent();
diff --git a/src/Api/Adapter/TeamRoleAdapter.php b/src/Api/Adapter/TeamRoleAdapter.php
index 6702a03d..69c12f4d 100644
--- a/src/Api/Adapter/TeamRoleAdapter.php
+++ b/src/Api/Adapter/TeamRoleAdapter.php
@@ -224,7 +224,7 @@ public function batchCreate(Request $request)
 
     public function update(Request $request)
     {
-        AbstractAdapter::batchCreate($request);
+        return parent::update($request);
     }
 
     public function batchUpdate(Request $request)
@@ -234,7 +234,7 @@ public function batchUpdate(Request $request)
 
     public function delete(Request $request)
     {
-        AbstractAdapter::delete($request);
+        return parent::delete($request);
     }
 
     public function batchDelete(Request $request)
diff --git a/src/Api/Adapter/TeamSiteAdapter.php b/src/Api/Adapter/TeamSiteAdapter.php
index 1417087e..bcc52a5d 100644
--- a/src/Api/Adapter/TeamSiteAdapter.php
+++ b/src/Api/Adapter/TeamSiteAdapter.php
@@ -2,8 +2,6 @@
 namespace Teams\Api\Adapter;
 
 use Doctrine\ORM\QueryBuilder;
-use Doctrine\ORM\Tools\Pagination\Paginator;
-use Laminas\EventManager\Event;
 use Omeka\Api\Adapter\AbstractAdapter;
 use Omeka\Api\Adapter\AbstractEntityAdapter;
 use Omeka\Api\Exception;
@@ -14,6 +12,7 @@
 use Omeka\Stdlib\ErrorStore;
 use Teams\Entity\TeamSite;
 use Teams\Api\Representation\TeamSiteRepresentation;
+use Teams\Service\SitePermissionManager;
 
 class TeamSiteAdapter extends AbstractTeamEntityAdapter
 {
@@ -50,17 +49,25 @@ public function hydrate(
         ErrorStore $errorStore
     ) {
         if ($this->shouldHydrate($request, 'team')) {
-            $team_id = $request->getValue('team');
-            if (!is_null($team_id)) {
-                $team_id = trim($team_id);
-                $entity->setTeamId($team_id);
+            $teamId = $request->getValue('team');
+            if (!is_null($teamId)) {
+                $team = $this->getEntityManager()
+                    ->getRepository('Teams\Entity\Team')
+                    ->findOneBy(['id' => (int) $teamId]);
+                if ($team) {
+                    $entity->setTeam($team);
+                }
             }
         }
         if ($this->shouldHydrate($request, 'site')) {
-            $team_site_id = $request->getValue('site');
-            if (!is_null($team_site_id)) {
-                $team_site_id = trim($team_site_id);
-                $entity->setTeamSiteId($team_site_id);
+            $siteId = $request->getValue('site');
+            if (!is_null($siteId)) {
+                $site = $this->getEntityManager()
+                    ->getRepository('Omeka\Entity\Site')
+                    ->findOneBy(['id' => (int) $siteId]);
+                if ($site) {
+                    $entity->setSite($site);
+                }
             }
         }
     }
@@ -108,34 +115,86 @@ public function read(Request $request)
     {
         AbstractTeamEntityAdapter::read($request);
     }
+
     public function create(Request $request)
     {
-        AbstractTeamEntityAdapter::create($request);
+        $user = $this->getServiceLocator()->get('Omeka\AuthenticationService')->getIdentity();
+        $this->validateRequest($request, new ErrorStore());
+        $this->teamAuthority($request, $request->getValue('team'), $user);
+
+        $teamEntity = $this->getEntityManager()
+            ->getRepository('Teams\Entity\Team')
+            ->findOneBy(['id' => $request->getValue('team')]);
+        $siteEntity = $this->getEntityManager()
+            ->getRepository('Omeka\Entity\Site')
+            ->findOneBy(['id' => $request->getValue('site')]);
+
+        $teamSite = new TeamSite($teamEntity, $siteEntity);
+        $this->getEntityManager()->persist($teamSite);
+        if ($request->getOption('flushEntityManager', true)) {
+            $this->getEntityManager()->flush();
+            $this->getEntityManager()->refresh($teamSite);
+        }
+
+        // Sync Omeka site permissions for all users in the team now that
+        // this site has been added to it.
+        $this->getServiceLocator()->get(SitePermissionManager::class)
+            ->syncSitePermissionsForTeamOnSiteAdded(
+                $teamEntity->getId(),
+                $siteEntity->getId()
+            );
+
+        return new Response($teamSite);
     }
 
     public function batchCreate(Request $request)
     {
-        AbstractTeamEntityAdapter::batchCreate($request);
+        AbstractAdapter::batchCreate($request);
     }
 
     public function update(Request $request)
     {
-        AbstractTeamEntityAdapter::batchCreate($request);
+        return parent::update($request);
     }
 
     public function batchUpdate(Request $request)
     {
-        AbstractTeamEntityAdapter::batchUpdate($request);
+        AbstractAdapter::batchUpdate($request);
     }
 
     public function delete(Request $request)
     {
-        AbstractTeamEntityAdapter::delete($request);
+        $id = $request->getId();
+        $entity = $this->getEntityManager()
+            ->getRepository(TeamSite::class)
+            ->findOneBy(['team' => $id['team'], 'site' => $id['site']]);
+
+        if (!$entity) {
+            throw new Exception\NotFoundException(sprintf(
+                $this->getTranslator()->translate('TeamSite with team=%1$s site=%2$s not found'),
+                $id['team'], $id['site']
+            ));
+        }
+
+        $this->getEntityManager()->remove($entity);
+        if ($request->getOption('flushEntityManager', true)) {
+            $this->getEntityManager()->flush();
+        }
+
+        // Remove Omeka site permissions for all users in the team now that
+        // this site has been removed from it.
+        $this->getServiceLocator()->get(SitePermissionManager::class)
+            ->removeSitePermissionsForTeamOnSiteRemoved(
+                $id['team'],
+                $id['site']
+            );
+
+        return new Response($entity);
     }
 
     public function batchDelete(Request $request)
     {
-        AbstractTeamEntityAdapter::batchDelete($request);
+        AbstractAdapter::batchDelete($request);
     }
 
     public function getMappedEntityClass()
diff --git a/src/Api/Adapter/TeamUserAdapter.php b/src/Api/Adapter/TeamUserAdapter.php
index afb0f491..454c94fb 100644
--- a/src/Api/Adapter/TeamUserAdapter.php
+++ b/src/Api/Adapter/TeamUserAdapter.php
@@ -10,6 +10,7 @@
 use Omeka\Entity\User;
 use Teams\Api\Representation\TeamUserRepresentation;
 use Teams\Entity\TeamRole;
+use Teams\Service\SitePermissionManager;
 use Teams\Entity\TeamUser;
 use Omeka\Api\Adapter\AbstractEntityAdapter;
 use Omeka\Api\Request;
@@ -68,11 +69,18 @@ public function hydrate(
             }
         }
 
-        if ($this->shouldHydrate($request, 'o:role')) {
-            $role = $request->getValue('o:role');
-            if (!is_null($role)) {
-                $role = trim($role);
-                $entity->setRole($role);
+        // Accept 'role' (plain key used by update) or 'o:role' (JSON-LD key).
+        // Both must resolve to a TeamRole entity before setting.
+        $roleId = null;
+        if ($this->shouldHydrate($request, 'role')) {
+            $roleId = $request->getValue('role');
+        } elseif ($this->shouldHydrate($request, 'o:role')) {
+            $roleId = $request->getValue('o:role');
+        }
+        if (!is_null($roleId)) {
+            $roleEntity = $this->getEntityManager()->find('Teams\Entity\TeamRole', (int) $roleId);
+            if ($roleEntity) {
+                $entity->setRole($roleEntity);
             }
         }
 
@@ -174,6 +182,14 @@ public function create(Request $request)
             // that have not been loaded.
             $this->getEntityManager()->refresh($teamResource);
         }
+
+        // Sync Omeka site permissions for the user now that the TeamUser row exists.
+        $this->getServiceLocator()->get(SitePermissionManager::class)
+            ->syncSitePermissionsForUser(
+                $teamResource->getUser()->getId(),
+                $teamResource->getTeam()->getId()
+            );
+
         return new Response($teamResource);
     }
 
@@ -184,7 +200,19 @@ public function batchCreate(Request $request)
 
     public function update(Request $request)
     {
-        AbstractAdapter::batchCreate($request);
+        $response = parent::update($request);
+
+        // Re-sync site permissions in case the role changed.
+        $teamUser = $response->getContent();
+        if ($teamUser instanceof TeamUser) {
+            $this->getServiceLocator()->get(SitePermissionManager::class)
+                ->syncSitePermissionsForUser(
+                    $teamUser->getUser()->getId(),
+                    $teamUser->getTeam()->getId()
+                );
+        }
+
+        return $response;
     }
 
     public function batchUpdate(Request $request)
diff --git a/src/Controller/AddController.php b/src/Controller/AddController.php
index 6c7bc523..8ba82808 100644
--- a/src/Controller/AddController.php
+++ b/src/Controller/AddController.php
@@ -2,23 +2,9 @@
 namespace Teams\Controller;
 
 use Doctrine\ORM\EntityManager;
-use Omeka\Form\ConfirmForm;
-use Omeka\Form\ResourceBatchUpdateForm;
-use Omeka\Form\ResourceForm;
-use Omeka\Media\Ingester\Manager;
-use Omeka\Stdlib\Message;
-use phpDocumentor\Reflection\Types\This;
 use Teams\Entity\TeamAsset;
-use Teams\Entity\TeamResource;
-use Teams\Entity\TeamResourceTemplate;
-use Teams\Entity\TeamSite;
-use Teams\Entity\TeamUser;
-use Teams\Form\SecondaryResourcesForm;
-use Teams\Form\TeamItemSetForm;
-use Teams\Form\TeamResourcesForm;
-use Teams\Form\TeamRoleForm;
 use Teams\Form\TeamForm;
-use Teams\Form\TeamUserForm;
+use Teams\Form\TeamRoleForm;
 use Laminas\Mvc\Controller\AbstractActionController;
 use Laminas\View\Model\ViewModel;
 
@@ -34,174 +20,138 @@ class AddController extends AbstractActionController
      */
     public function __construct(EntityManager $entityManager)
     {
-        $this->entityManager = $entityManager;
+            $this->entityManager = $entityManager;
     }
 
 
     public function teamAddAction()
     {
-        $request   = $this->getRequest();
-
-        $form = $this->getForm(TeamForm::class);
-        $userForm = $this->getForm(TeamUserForm::class);
-        $itemsetForm = $this->getForm(TeamItemSetForm::class);
-        $resourceForm = $this->getForm(TeamResourcesForm::class)->setAttribute('id', 'team-resources-form');
-        $secondaryResourcesForm = $this->getForm(SecondaryResourcesForm::class,
-            ['team_id'=>0]
-        );
-        $view = new ViewModel(
-            [
-                'form' => $form,
-                'itemsetForm' => $itemsetForm,
-                'resourceForm' => $resourceForm,
-                'secondaryResourcesForm' => $secondaryResourcesForm,
-            ]
-        );
-
-        //if it is get, then give them the form
-        if (! $request->isPost()) {
-            return $view;
-        }
-
-        if (! $this->teamAuth()->teamAuthorized($this->identity(), 'add', 'team')){
-            $this->messenger()->addError("You aren't authorized to add teams");
-            return $view;
-        }
-        //TODO: turn the section where user+role are added into a form so it can be populated below
-        $form->setData($request->getPost());
-        $userForm->setData($request->getPost());
-        $itemsetForm->setData($request->getPost());
-        $resourceForm->setData($request->getPost());
-        if (! $form->isValid()) {
-            return $view;
-        }
-
-        $data = $request->getPost('team');
-
-        $newTeam = $this->api($form)->create('team', $data);
-
-        //add the users, resources and sites to the team
-        if ($newTeam) {
+            $request = $this->getRequest();
+
+            /** @var TeamForm $form */
+            $form = $this->getForm(TeamForm::class);
+            $form->setAttribute('id', 'team-add-form');
+
+            $view = new ViewModel([
+                'form'                   => $form,
+                'team'                   => [],
+                'bypassTeamFilterRoles'  => [],
+                'user'                   => $this->identity(),
+                'isAdd'                  => true,
+            ]);
+
+            if (! $request->isPost()) {
+                return $view;
+            }
+
+            if (! $this->teamAuth()->teamAuthorized($this->identity(), 'add', 'team')) {
+                $this->messenger()->addError("You aren't authorized to add teams");
+                return $view;
+            }
+
+            $postData = $request->getPost()->toArray();
+            $form->setData($postData);
+            if (! $form->isValid()) {
+                $this->messenger()->addFormErrors($form);
+                return $view;
+            }
+
+            $newTeam = $this->api($form)->create('team', [
+                'o:name' => $postData['o:name'] ?? '',
+                'o:description' => $postData['o:description'] ?? '',
+            ]);
+
+            if (! $newTeam) {
+                return $view;
+            }
+
+            $teamId = $newTeam->getContent()->id();
             $teamEntity = $this->entityManager->getRepository('Teams\Entity\Team')
-                ->findOneBy(['id' => (int)$newTeam->getContent()->id()]);
-            if ($request->getPost('o:team_users')) {
-                foreach ($request->getPost('o:team_users') as $team_user):
-                    $user = $this->entityManager->getRepository('Omeka\Entity\User')
-                        ->findOneBy(['id' => (int)$team_user['o:user']['o:id']]);
-                    $role = $this->entityManager->getRepository('Teams\Entity\TeamRole')
-                        ->findOneBy(['id' => (int)$team_user['o:team_role']['o:id']]);
-
-                    $teamUser = new TeamUser($teamEntity, $user, $role);
-                    $teamUser->setCurrent(null);
-                    $this->entityManager->persist($teamUser);
-                endforeach;
-                $this->entityManager->flush();
+                ->findOneBy(['id' => (int) $teamId]);
+
+            // Users and roles
+            foreach ($postData['o:team_users'] ?? [] as $teamUser) {
+                $this->api()->create('team-user', [
+                    'team' => $teamId,
+                    'user' => (int) $teamUser['o:user']['o:id'],
+                    'role' => (int) $teamUser['o:team_role']['o:id'],
+                ]);
             }
 
-            //persist the sites (no possibility of duplicates, so don't need to save to associative array)
-            if (isset($request->getPost('site')['site']['o:site'])) {
-                foreach ($request->getPost('site')['site']['o:site'] as $site_id):
-                    $site_id = (int)$site_id;
-                    $site = $this->entityManager->getRepository('Omeka\Entity\Site')
-                        ->findOneBy(['id' => $site_id]);
-                    $team_site = new TeamSite($teamEntity, $site);
-                    $this->entityManager->persist($team_site);
-                endforeach;
-                $this->entityManager->flush();
+            // Sites
+            foreach ($postData['team_sites'] ?? [] as $siteId) {
+                $this->api()->create('team-site', [
+                    'team' => $teamId,
+                    'site' => (int) $siteId,
+                ]);
             }
-            $asset_array = array();
-            $formData = $this->params()->fromPost();
-            $formData['item_pool'] .= "&bypass_team_filter=true";
-            $resourceForm->setData($formData);
-            parse_str($formData['item_pool'], $itemPool);
-            if ($formData['item_assignment_action'] && $formData['item_assignment_action'] !== 'no_action') {
+
+            // Item assignment job
+            $itemPoolStr = $postData['item_pool'] ?? '';
+            $itemPoolStr .= '&bypass_team_filter=true';
+            parse_str($itemPoolStr, $itemPool);
+            if (! empty($postData['item_assignment_action']) && $postData['item_assignment_action'] !== 'no_action') {
                 $this->jobDispatcher()->dispatch('Teams\Job\UpdateTeamResources', [
-                    'teams' => [$newTeam->getContent()->id() => $itemPool],
-                    'action' => $formData['item_assignment_action'],
+                    'teams' => [$teamId => $itemPool],
+                    'action' => $postData['item_assignment_action'],
                 ]);
                 $this->messenger()->addSuccess('Item assignment in progress. To see the new item count, refresh the page.'); // @translate
             }
 
-            $secondaryResourcesForm->setData($formData);
-            $recursive = $formData['recursive_item_sets'] ?? false;
-            if (isset($formData['item_sets'])) {
-                foreach ($formData['item_sets'] as $item_set_id) {
-                    $exists = $this->api()->search('team-resource', ['team' => $teamEntity->getId(), 'resource' => $item_set_id]);
-                    if (count($exists->getContent()) < 1) {
-                        $this->api()->create('team-resource', ['team' => $teamEntity->getId(), 'resource' => $item_set_id],[], ['recursive'=>$recursive, 'syncSites'=>true]);
-                    }
+            // Item sets
+            $recursive = $postData['recursive_item_sets'] ?? false;
+            foreach ($postData['item_sets'] ?? [] as $itemSetId) {
+                if (count($this->api()->search('team-resource', ['team' => $teamEntity->getId(), 'resource' => $itemSetId])->getContent()) < 1) {
+                    $this->api()->create('team-resource', ['team' => $teamEntity->getId(), 'resource' => $itemSetId], [], ['recursive' => $recursive, 'syncSites' => true]);
                 }
             }
-            if (isset($formData['resource_templates'])){
-                foreach ($formData['resource_templates'] as $resource_template_id) {
-                    if (count($this->api()->search('team-resource-template', ['team'=>$teamEntity->getId(), 'resource-template'=>$resource_template_id])->getContent())<1){
-                        $this->api()->create('team-resource-template', ['team'=>$teamEntity->getId(), 'resource-template'=>$resource_template_id]);
-                    }
+
+            // Resource templates
+            foreach ($postData['resource_templates'] ?? [] as $templateId) {
+                if (count($this->api()->search('team-resource-template', ['team' => $teamEntity->getId(), 'resource-template' => $templateId])->getContent()) < 1) {
+                    $this->api()->create('team-resource-template', ['team' => $teamEntity->getId(), 'resource-template' => $templateId]);
                 }
             }
 
+            $this->messenger()->addSuccess(sprintf("Successfully added the team: '%s'", $postData['o:name']));
+            return $this->redirect()->toUrl($newTeam->getContent()->url());
+    }
 
+    public function roleAddAction()
+    {
+            $form = $this->getForm(TeamRoleForm::class);
+            $request   = $this->getRequest();
+            $view = new ViewModel(['form' => $form]);
 
-            //TODO: add assets to secondaryResourcesForm.
+            //if it is get, then give them the form
+            if (! $request->isPost()) {
+                return $view;
+            }
 
-            // persist the assets
-            foreach (array_keys($asset_array) as $asset_id):
-                $asset = $this->entityManager->getRepository('Omeka\Entity\Asset')
-                    ->findOneBy(['id' => $asset_id]);
-                $team_asset = new TeamAsset($teamEntity, $asset);
-                $this->entityManager->persist($team_asset);
-            endforeach;
+            if (! $this->teamAuth()->teamAuthorized($this->identity(), 'add', 'role')){
+                $this->messenger()->addError("You aren't authorized to add roles");
+                return $view;
+            }
 
+            //otherwise, set the data
+            $form->setData($request->getPost());
 
-            $successMessage = sprintf("Successfully added the team: '%s'", $data['o:name']);
-            $this->messenger()->addSuccess($successMessage);
-            return $this->redirect()->toUrl($newTeam->getContent()->url());
-        }
-        $view = new ViewModel;
-        $view->setVariable('form', $form);
-        $view->setVariable('itemsetForm', $itemsetForm);
-        $view->setVariable('team_users', $request->getPost('o:team_users'));
-        $view->setVariable('resourceForm', $resourceForm);
-
-        return $view;
-    }
+            //get the data from the post
+            $data = $request->getPost('role');
 
-    public function roleAddAction()
-    {
-        $form = $this->getForm(TeamRoleForm::class);
-        $request   = $this->getRequest();
-        $view = new ViewModel(['form' => $form]);
-
-        //if it is get, then give them the form
-        if (! $request->isPost()) {
-            return $view;
-        }
-
-        if (! $this->teamAuth()->teamAuthorized($this->identity(), 'add', 'role')){
-            $this->messenger()->addError("You aren't authorized to add roles");
-            return $view;
-        }
-
-        //otherwise, set the data
-        $form->setData($request->getPost());
-
-        //get the data from the post
-        $data = $request->getPost('role');
-
-        //if the form isn't valid, return it
-        if (!$form->isValid()) {
-            return $view;
-        }
-
-        $newRole = $this->api($form)->create('team-role', $data);
-
-        if ($newRole) {
-            //        return new ViewModel(['data' => $data]);
-            $successMessage = sprintf("Successfully added the role: '%s'", $data['o:name']);
-            $this->messenger()->addSuccess($successMessage);
-            return $this->redirect()->toRoute('admin/teams/roles/detail',  ['id' => $newRole->getContent()->id()]);
-        } else {
-            return $view;
-        }
+            //if the form isn't valid, return it
+            if (!$form->isValid()) {
+                return $view;
+            }
+
+            $newRole = $this->api($form)->create('team-role', $data);
+
+            if ($newRole) {
+                $successMessage = sprintf("Successfully added the role: '%s'", $data['o:name']);
+                $this->messenger()->addSuccess($successMessage);
+                return $this->redirect()->toRoute('admin/teams/roles/detail',  ['id' => $newRole->getContent()->id()]);
+            } else {
+                return $view;
+            }
     }
 }
diff --git a/src/Controller/DeleteController.php b/src/Controller/DeleteController.php
index dd7040d5..b933dbb6 100644
--- a/src/Controller/DeleteController.php
+++ b/src/Controller/DeleteController.php
@@ -2,10 +2,7 @@
 namespace Teams\Controller;
 
 use Doctrine\ORM\EntityManager;
-use Doctrine\ORM\QueryBuilder;
 use Omeka\Api\Exception\InvalidArgumentException;
-use Omeka\Api\Request;
-use Laminas\EventManager\Event;
 use Laminas\Mvc\Controller\AbstractActionController;
 use Laminas\View\Model\ViewModel;
 
@@ -23,17 +20,6 @@ public function __construct(EntityManager $entityManager)
     {
         $this->entityManager = $entityManager;
     }
-    public function createNamedParameter(
-        QueryBuilder $qb,
-        $value,
-        $prefix = 'omeka_'
-    ) {
-        $index = 0;
-        $placeholder = $prefix . $index;
-        $index++;
-        $qb->setParameter($placeholder, $value);
-        return ":$placeholder";
-    }
     public function teamDeleteAction()
     {
         //is there an id?
@@ -75,13 +61,10 @@ public function roleDeleteAction()
     {
         $user = $this->identity()->getRole();
         $id = $this->params()->fromRoute('id');
-        $role = $this->entityManager->getRepository('Teams\Entity\TeamRole')
-            ->findOneBy(['id'=> $id]);
         $request = $this->getRequest();
 
-        //test to see if anyone has this role. If they do, don't delete it.
         $role_users = $this->entityManager->getRepository('Teams\Entity\TeamUser')
-            ->findBy(['role'=>$id]);
+            ->findBy(['role' => $id]);
         $view = new ViewModel(
             [
                 'role_users' => $role_users,
@@ -96,17 +79,17 @@ public function roleDeleteAction()
             $this->messenger()->addError('You are not authorized to delete roles');
             return $view;
         }
-        if ($role_users){
+        if ($role_users) {
             $this->messenger()->addError('This role can not be deleted while users are assigned to it');
             return $view;
         }
         if ($request->getPost('confirm') == 'Delete') {
-            $this->entityManager->remove($role);
-            $this->entityManager->flush();
-            $this->messenger()->addSuccess(sprintf('Successfully deleted role "%s"', $role->getName()));
+            $role = $this->entityManager->getRepository('Teams\Entity\TeamRole')
+                ->findOneBy(['id' => $id]);
+            $roleName = $role ? $role->getName() : $id;
+            $this->api()->delete('team-role', $id);
+            $this->messenger()->addSuccess(sprintf('Successfully deleted role "%s"', $roleName));
         }
         return $this->redirect()->toRoute('admin/teams/roles');
-
-
     }
 }
diff --git a/src/Controller/IndexController.php b/src/Controller/IndexController.php
index ac3174b4..181d4b5a 100644
--- a/src/Controller/IndexController.php
+++ b/src/Controller/IndexController.php
@@ -2,7 +2,6 @@
 namespace Teams\Controller;
 
 use Doctrine\ORM\EntityManager;
-use Omeka\Api\Request;
 use Omeka\Form\ConfirmForm;
 use Laminas\EventManager\Event;
 use Laminas\Form\Form;
@@ -160,58 +159,19 @@ public function deleteAction()
             $form = $this->getForm(ConfirmForm::class);
             $form->setData($this->getRequest()->getPost());
             if ($form->isValid()) {
-                $entityManager = $this->entityManager;
                 $user_id = $this->identity()->getId();
-                $team_id = $entityManager
+                $team_id = $this->entityManager
                     ->getRepository('Teams\Entity\TeamUser')
-                    ->findOneBy(['is_current'=>true, 'user'=>$user_id])
+                    ->findOneBy(['is_current' => true, 'user' => $user_id])
                     ->getTeam()->getId();
 
-                //array of media ids
-                $media_ids = [];
-
-                //date to update last modified
-                $datetime = new \DateTime('now');
-                foreach ($this->api()->read('items', $this->params('id'))->getContent()->media() as $media):
-                    $media_ids[] = $media->id();
-                endforeach;
-
-                $entity = $entityManager
-                    ->getRepository('Teams\Entity\TeamResource')
-                    ->findOneBy(['team'=>$team_id, 'resource'=> $this->params('id')]);
-
-                $request = new Request('delete', 'team_resource');
-                $event = new Event('api.hydrate.pre', $this, [
-                    'entity' => $entity,
-                    'request' => $request,
-                ]);
-                $this->getEventManager()->triggerEvent($event);
-                if ($entity) {
-                    $entity->getResource()->setModified($datetime);
-                    $entityManager->remove($entity);
-
-                    //remove associated media from the team
-                    foreach ($media_ids as $media_id):
-                        $tr = $entityManager->getRepository('Teams\Entity\TeamResource')
-                            ->findOneBy(['team' => $team_id, 'resource' => $media_id]);
-                    if ($tr) {
-                        $entityManager->remove($tr);
-                        $this->messenger()->addSuccess('Associated Media successfully removed from your team.'); // @translate
-                        $entityManager->getRepository('Omeka\Entity\Resource')
-                                ->findOneBy(['id'=>$media_id])->setModified($datetime);
-                    }
-                    endforeach;
-                    $entityManager->flush();
-                    $this->messenger()->addSuccess('Item successfully removed from your team. Item remains available to other teams if they are linked to it.'); // @translate
-                } else {
-                    $this->messenger()->addError('something went wrong'); // @translate
-                }
-                $event = new Event('api.execute.post', $this, [
-                    'entity' => $entity,
-                    'request' => $request,
-                ]);
-                $this->getEventManager()->triggerEvent($event);
-
+                $this->api()->delete(
+                    'team-resource',
+                    [],
+                    ['team' => $team_id, 'resource' => $this->params('id')],
+                    ['recursive' => true]
+                );
+                $this->messenger()->addSuccess('Item successfully removed from your team. Item remains available to other teams if they are linked to it.'); // @translate
             } else {
                 $this->messenger()->addFormErrors($form);
             }
diff --git a/src/Controller/UpdateController.php b/src/Controller/UpdateController.php
index b4248ad6..1c948559 100644
--- a/src/Controller/UpdateController.php
+++ b/src/Controller/UpdateController.php
@@ -2,22 +2,10 @@
 namespace Teams\Controller;
 
 use Doctrine\ORM\EntityManager;
-use Doctrine\ORM\NonUniqueResultException;
-use Doctrine\ORM\OptimisticLockException;
-use Doctrine\ORM\ORMException;
-use Doctrine\ORM\QueryBuilder;
-use Omeka\Api\Request;
-use Teams\Entity\TeamSite;
-use Teams\Entity\TeamUser;
-use Teams\Form\SecondaryResourcesForm;
-use Teams\Form\TeamItemsetAddRemoveForm;
-use Teams\Form\TeamResourcesForm;
-use Teams\Form\TeamSitesAddRemoveForm;
-use Teams\Form\TeamDetailsForm;
-use Laminas\EventManager\Event;
 use Laminas\Mvc\Controller\AbstractActionController;
-use Laminas\Stdlib\ArrayObject;
 use Laminas\View\Model\ViewModel;
+use Teams\Form\TeamForm;
+use Teams\Service\SitePermissionManager;
 
 
 class UpdateController extends AbstractActionController
@@ -27,436 +15,106 @@ class UpdateController extends AbstractActionController
      */
     protected $entityManager;
 
+    /**
+     * @var SitePermissionManager
+     */
+    protected SitePermissionManager $sitePermissionManager;
+
     /**
      * @param EntityManager $entityManager
+     * @param SitePermissionManager $sitePermissionManager
      */
-    public function __construct(EntityManager $entityManager)
+    public function __construct(EntityManager $entityManager, SitePermissionManager $sitePermissionManager)
     {
         $this->entityManager = $entityManager;
+        $this->sitePermissionManager = $sitePermissionManager;
     }
 
-    public function createNamedParameter(
-        QueryBuilder $qb,
-        $value,
-        $prefix = 'omeka_'
-    ) {
-        $index = 0;
-        $placeholder = $prefix . $index;
-        $index++;
-        $qb->setParameter($placeholder, $value);
-        return ":$placeholder";
-    }
-
-    public function addTeamUser(int $team_id, int $user_id, int $role_id)
-    {
-        if (! $this->teamAuth()->teamAuthorized($this->identity(), 'update', 'team', $team_id)){
-            $this->messenger()->addError("You aren't authorized to change this team");
-            return null;
-        } else {
-            $team = $this->entityManager->find('Teams\Entity\Team', $team_id);
-            $user = $this->entityManager->find('Omeka\Entity\User', $user_id);
-            $role = $this->entityManager->find('Teams\Entity\TeamRole', $role_id);
-            $team_user = new TeamUser($team, $user, $role);
-            $this->entityManager->persist($team_user);
-
-            //flushing here because this is a mini-form and we want to see the name pop up
-            //more efficient solution would be to have JS handle the popping and batch update
-            $this->entityManager->flush();
-            return $team_user;
-        }
-    }
-
-    public function removeTeamUser(int $team_id, int $user)
-    {
-        if (! $this->teamAuth()->teamAuthorized($this->identity(), 'update', 'team', $team_id)){
-            $this->messenger()->addError("You aren't authorized to change this team");
-        } else {
-            $this->messenger()->addError("removed user");
-
-            $em = $this->entityManager;
-            $team_user = $em->find('Teams\Entity\TeamUser', ['team' => $team_id, 'user' => $user]);
-            $em->remove($team_user);
-
-            //flushing here because this is a mini-form and we want to see the name pop up
-            //more efficient solution would be to have JS handle the popping and batch update
-            $em->flush();
-        }
-    }
-
-    public function updateRole(int $team_id, int $user_id, int $role_id)
-    {
-        if (! $this->teamAuth()->teamAuthorized($this->identity(), 'update', 'team', $team_id)){
-            $this->messenger()->addError("You aren't authorized to change this team");
-        } else {
-            $em = $this->entityManager;
-            $team_user = $em->find('Teams\Entity\TeamUser', ['team' => $team_id, 'user'=>$user_id]);
-            $user_role = $em->find('Teams\Entity\TeamRole', $role_id);
-            $team_user->setRole($user_role);
-            $em->flush();
-        }
-
-    }
-
-    public function processItemSets(int $item_set_id)
-    {
-        $resource_array = array();
-        if ((int)$item_set_id>0) {
-            $item_set_id = (int)$item_set_id;
-
-            //TODO: why isn't this a list?
-            //add all items belonging to itemset
-            foreach ($this->api()->search('items', ['item_set_id'=>$item_set_id, 'bypass_team_filter' => true])->getContent() as $item):
-                $resource_array += [$item->id() => true];
-
-            //add all media belonging to to the item
-            foreach ($this->api()->search('media', ['item_id'=>$item->id(), 'bypass_team_filter' => true])->getContent() as $media):
-                    $resource_array += [$media->id()=>true];
-            endforeach;
-            endforeach;
-        }
-        //add itemset itself
-        $resource_array += [$item_set_id => true];
-
-        return $resource_array;
-    }
-
-    /**
-     * @throws ORMException
-     * @throws OptimisticLockException
-     * @throws NonUniqueResultException
-     */
     public function teamUpdateAction()
     {
+        $teamId = $this->params()->fromRoute('id');
 
-        $team_id = $this->params()->fromRoute('id');
-        $team = $this->entityManager->getRepository('Teams\Entity\Team')->findOneBy(['id' => $team_id]);
-        $team_sites = $this->entityManager
-            ->getRepository('Teams\Entity\TeamSite')
-            ->findBy(['team'=>$team_id]);
-
-        $current_sites = [];
-        $valueOptions = [];
-
-//        get current sites for the team and populate the sites chosen select element
-//        set up the sites form TODO:refactor most of this into the form, which is only used here
-        foreach ($team_sites as $team_site) {
-            $current_sites[] = $team_site->getSite()->getId();
+        // Authorization check before any POST processing.
+        if (! $this->teamAuth()->teamAuthorized($this->identity(), 'update', 'team_user', $teamId)) {
+            $this->messenger()->addError("You aren't authorized to edit this team");
+            return $this->redirect()->toRoute('admin/teams/detail', ['id' => $teamId]);
         }
 
-        $all_sites = $this->api()->search('sites', ['bypass_team_filter'=>true])->getContent();
-        foreach ($all_sites as $site) {
-            if ($site->owner()) {
-                $owner = $site->owner()->name();
-            } else {
-                $owner = 'No One';
-            }
-            $site_name = $site->title() . ' (' . $owner . ')';
-            $site_id = $site->id();
-
+        $teamRepresentation = $this->api()->read('team', ['id' => $teamId])->getContent();
+        $team = $this->entityManager->getRepository('Teams\Entity\Team')->findOneBy(['id' => $teamId]);
 
-            $valueOption = [];
-            $valueOption['value'] = $site_id;
-            $valueOption['label'] = $site_name;
-            if (in_array($site_id, $current_sites)) {
-                $valueOption['attributes'] = ['selected' => true];
-            }
-            $valueOptions[] = $valueOption;
-        }
+        /** @var TeamForm $form */
+        $form = $this->getForm(TeamForm::class, ['team_id' => $teamId]);
+        $form->setAttribute('id', 'team-update-form');
+        $form->setAttribute('action', $this->url()->fromRoute('admin/teams/detail/update', ['id' => $teamId]));
 
-        $sitesForm = $this->getForm(TeamSitesAddRemoveForm::class);
-        $sites = $sitesForm->get('teamSites')->get('o:site');
-        $sites->setAttribute('multiple', true);
-        $sites->setAttribute('id', 'sites');
+        // Pre-populate the form with the current team name and description.
+        $form->setData($teamRepresentation->getJsonLd());
 
-        $sites->setEmptyOption('None');
-        $sites->setValueOptions($valueOptions);
+        $bypassTeamFilterRoles = $this->settings()->get('teams_filter_bypass_roles');
 
-
-        //set up the item set form
-        $itemsetForm = $this->getForm(TeamItemsetAddRemoveForm::class);
-        $user = $this->identity();
-        //TODO rename this to TeamDetail form or find a way to string these all together
-        $teamDetailsForm = $this->getForm(TeamDetailsForm::class);
-
-        //TODO: get team with a one line entity manager call
-        $criteria = ['id' => $team_id];
-        $qb = $this->entityManager->createQueryBuilder();
-        $entityClass = 'Teams\Entity\Team';
-
-        $qb->select('omeka_root')->from($entityClass, 'omeka_root');
-        foreach ($criteria as $field => $value) {
-            $qb->andWhere($qb->expr()->eq(
-                "omeka_root.$field",
-                $this->createNamedParameter($qb, $value)
-            ));
-        }
-        $qb->setMaxResults(1);
-
-        $entity = $qb->getQuery()->getOneOrNullResult();
-
-
-        $data = $this->api()->read('team', ['id'=>$team_id])->getContent();
-        $request = new Request('update', 'team');
-        $event = new Event('api.hydrate.pre', $this, [
-            'entity' => $entity,
-            'request' => $request,
+        $view = new ViewModel([
+            'team' => $team,
+            'teamRepresentation' => $teamRepresentation,
+            'form' => $form,
+            'bypassTeamFilterRoles' => $bypassTeamFilterRoles,
+            'id' => $teamId,
+            'user' => $this->identity(),
         ]);
-        $this->getEventManager()->triggerEvent($event);
-
-
-        //TODO (refactor) this is probably a stupid way to do this
-
-        //get all of the users and put them in an associative array id:name
-        $all_u_array = array();
-        $all_u_collection = $this->api()->search('users')->getContent();
-        foreach ($all_u_collection as $u):
-            $all_u_array[$u->id()] = $u->name();
-        endforeach;
-
-        //get the team's users and put them in an associative array id:name
-        $team_u_array = array();
-        $team_u_collection = $this->api()->read('team', ['id'=>$team_id])->getContent()->teamUsers();
-        foreach ($team_u_collection as $team_user):
-            $team_u_array[$team_user->getUser()->getId()] = $team_user->getUser()->getName();
-        endforeach;
 
-        //get the users available to be added to the team
-        $available_u_array = array_diff($all_u_array, $team_u_array);
-
-        //TODO (refactor) was trying to see if there was an easier way to get these objects into an array but consistency is more important
-        $role_query = $this->entityManager->createQuery('select partial r.{id, name} from Teams\Entity\TeamRole r');
-        $roles = $role_query->getResult();
-        $roles_array =  $role_query->getResult(\Doctrine\ORM\Query::HYDRATE_ARRAY);
-
-        //create an array object to hold the contents to pre-fill the form with
-        //TODO (emulate) this is the procedure to use to populate forms. Copy this.
-        $fill = new ArrayObject;
-        $fill['o:name'] = $data->getJsonLd()['o:name'];
-        $fill['o:description'] = $data->getJsonLd()['o:description'];
-        $teamDetailsForm->bind($fill);
-
-        //is it a post request?
-        //TODO (refactor) clean up this, only send what is needed
         $request = $this->getRequest();
-
-        $resourceForm = $this->getForm(TeamResourcesForm::class)->setAttribute('id', 'team-resources-form');
-        $secondaryResourcesForm = $this->getForm(SecondaryResourcesForm::class,
-        ['team_id'=>$team_id]
-        );
-
-        $bypass_team_filter_roles = $this->settings()->get('teams_filter_bypass_roles');
-        $view = new ViewModel([
-            'team'=>$team,
-            'form' => $teamDetailsForm,
-            'resourceForm' => $resourceForm,
-            'secondaryResourcesForm' => $secondaryResourcesForm,
-            'bypassTeamFilterRoles' => $bypass_team_filter_roles,
-            'id' => $team_id,
-            'roles'=> $roles,
-            'roles_array' => $roles_array,
-            'all_u_collection' => $all_u_collection,
-            'team_u_collection' => $team_u_collection,
-            'team_u_array'=>$team_u_array,
-            'available_u_array'=>$available_u_array,
-            'user' => $user,
-            'itemsetForm' => $itemsetForm,
-            'sitesForm' => $sitesForm,
-        ]);
         if (! $request->isPost()) {
             return $view;
         }
 
+        $postData = $this->params()->fromPost();
 
-        $post_data = $request->getPost();
-        if (!$this->teamAuth()->teamAuthorized($this->identity(), 'update', 'team_user', $team_id)) {
-            $this->messenger()->addError("You aren't authorized to change the team details");
+        $form->setData($postData);
+        if (! $form->isValid()) {
+            $this->messenger()->addFormErrors($form);
             return $view;
-        } else {
-            //first update the team name and description
-            $qb = $this->entityManager->createQueryBuilder();
-            $qb->update('Teams\Entity\Team', 'team')
-                ->set('team.name', '?1')
-                ->set('team.description', '?2')
-                ->where('team.id = ?3')
-                ->setParameter(1, $post_data['o:name'])
-                ->setParameter(2, $post_data['o:description'])
-                ->setParameter(3, $team_id)
-                ->getQuery()
-                ->execute();
         }
-        if (!$this->teamAuth()->teamAuthorized($this->identity(), 'update', 'team_user', $team_id)) {
-            $this->messenger()->addError("You aren't authorized to change team members");
-            return $view;
-        } else {
-            $teamUsers = $request->getPost('o:team_users');
-            //remove team users not in the form
-            $formTeamUsers = array();
-            foreach ($teamUsers as $teamUser){
-                $formTeamUsers[] = $teamUser['o:user']['o:id'];
-            }
-
-            $oldTeamUsers= $this->api()->search('team-user', ['team'=>$team_id], ['returnScalar'=>'user'])->getContent();
-            foreach ($oldTeamUsers as $oldTeamUser) {
-                if (!in_array($oldTeamUser,$formTeamUsers)) {
-                    $this->api()->delete('team-user',['team'=>$team_id, 'user'=>$oldTeamUser]);
-                }
-            }
-            //add team users or update permissions
-            foreach ($teamUsers as $teamUser) {
-                //using search instead of read because read will throw a not found error instead of returning empty
-                $teamUserExists = $this->api()->search('team-user', ['team'=>$team_id, 'user'=>$teamUser['o:user']['o:id']])->getContent();
-
-                if ($teamUserExists){
-                    $role = $this->api()->read('team-role',['id'=>$teamUser['o:team_role']['o:id']])->getContent();
-                    $teamUserExists[0]->getEntity()->setRole($role->getEntity());
-                } else {
-                    $this->api()
-                        ->create('team-user',
-                            [
-                                'team'=>$team_id,
-                                'user'=>$teamUser['o:user']['o:id'],
-                                'role'=>$teamUser['o:team_role']['o:id']
-                            ]);
-                }
-            }
-        }
-
-        //TODO:need to update this for users who have the update and bypass_team_filter
-        if (! $this->teamAuth()->teamAuthorized($this->identity(), 'update', 'team', $team_id)){
-            $this->messenger()->addError("You aren't authorized to change this team");
-            return $view;
-        } else {
-
-            //process items
-            $formData = $this->params()->fromPost();
-            $resourceForm->setData($formData);
-            parse_str($formData['item_pool'], $itemPool);
-            if ($formData['item_assignment_action'] && $formData['item_assignment_action'] !== 'no_action') {
-                $this->jobDispatcher()->dispatch('Teams\Job\UpdateTeamResources', [
-                    'teams' => [$team_id => $itemPool],
-                    'action' => $formData['item_assignment_action'],
-                ]);
-                $this->messenger()->addSuccess('Item assignment in progress. To see the new item count, refresh the page.'); // @translate
-            }
-
-            //process item sets and resource templates
-
-            //remove item sets
-            $secondaryResourcesForm->setData($formData);
-
-            $recursive = $formData['recursive_item_sets'] ?? false;
-            if (isset($formData['remove_item_sets'])){
-                $remove_item_sets = $formData['remove_item_sets'];
-                foreach ($remove_item_sets as $item_set_id) {
-                    //todo: delete expects the id to be in the second parameter, for now just leaving empty because team resource uses a composite key
-                    $this->api()->delete('team-resource', [], ['team' => $team_id, 'resource' => $item_set_id],['recursive'=>$recursive, 'syncSites' => true]);
-                }
-            }
-            //add item sets
-            if (isset($formData['item_sets'])) {
-                foreach ($formData['item_sets'] as $item_set_id) {
-                    //todo: implement the read operation
-                    $exists = $this->api()->search('team-resource', ['team' => $team_id, 'resource' => $item_set_id]);
-                    if (count($exists->getContent()) < 1) {
-                        $this->api()->create('team-resource', ['team' => $team_id, 'resource' => $item_set_id], [], ['recursive' => $recursive, 'syncSites' => true]);
-                    }
-                }
-            }
-
-            //remove resource templates
-            $secondaryResourcesForm->setData($formData);
-            if (isset($formData['remove_resource_templates'])){
-                foreach ($formData['remove_resource_templates'] as $resource_template_id) {
-                    //todo: delete expects the id to be in the second parameter, for now just leaving empty because team resource uses a composite key
-                    $this->api()->delete('team-resource-template', [], ['team' => $team_id, 'resource-template' => $resource_template_id]);
-                }
-            }
-            //add resource templates
-            if (isset($formData['resource_templates'])){
-                foreach ($formData['resource_templates'] as $resource_template_id) {
-                    if (count($this->api()->search('team-resource-template', ['team'=>$team_id, 'resource-template'=>$resource_template_id])->getContent())<1){
-                        $this->api()->create('team-resource-template', ['team'=>$team_id, 'resource-template'=>$resource_template_id]);
-                    }
-                }
-            }
-
-            $em = $this->entityManager;
-            //handle new sites
-            foreach ($post_data['teamSites']['o:site'] as $site) {
-                if (!in_array($site, $current_sites)) {
-                    $site = $em->getRepository('Omeka\Entity\Site')->findOneBy(['id'=>$site]);
-                    $ts = new TeamSite($team, $site);
-                    $request = new Request('create', 'team_site');
-                    $event = new Event('api.hydrate.pre', $this, [
-                        'entity' => $ts,
-                        'request' => $request,
-                    ]);
-                    $this->getEventManager()->triggerEvent($event);
 
-                    $em->persist($ts);
-                }
-            }
+        $this->api($form)->update('team', $teamId, [
+            'o:name'               => $postData['o:name'],
+            'o:description'        => $postData['o:description'],
+            'o:team_users'         => $postData['o:team_users'] ?? [],
+            'o:team_sites'         => $postData['team_sites'] ?? [],
+            'o:item_sets'          => $postData['item_sets'] ?? [],
+            'o:recursive_item_sets' => $postData['recursive_item_sets'] ?? false,
+            'o:resource_templates' => $postData['resource_templates'] ?? [],
+        ]);
 
-            //handle removed sites
-            foreach ($current_sites as $site) {
-                if (!in_array($site, $post_data['teamSites']['o:site'])) {
-                    $ts = $em->getRepository('Teams\Entity\TeamSite')->findOneBy(['team'=>$team_id, 'site'=>$site]);
-                    $request = new Request('delete', 'team_site');
-                    $event = new Event('api.hydrate.pre', $this, [
-                        'entity' => $ts,
-                        'request' => $request,
-                    ]);
-                    $this->getEventManager()->triggerEvent($event);
-                    $em->remove($ts);
-                }
-            }
-            $em->flush();
+        // Dispatch a background job for item assignment if an action was requested.
+        parse_str($postData['item_pool'] ?? '', $itemPool);
+        if (! empty($postData['item_assignment_action']) && $postData['item_assignment_action'] !== 'no_action') {
+            $this->jobDispatcher()->dispatch('Teams\Job\UpdateTeamResources', [
+                'teams' => [$teamId => $itemPool],
+                'action' => $postData['item_assignment_action'],
+            ]);
+            $this->messenger()->addSuccess('Item assignment in progress. To see the new item count, refresh the page.'); // @translate
         }
 
-        $successMessage = sprintf("Successfully updated the %s team", $team->getName());
-        $this->messenger()->addSuccess($successMessage);
+        $this->messenger()->addSuccess(sprintf("Successfully updated the %s team", $team->getName()));
 
-        return $this->redirect()->toRoute('admin/teams/detail',['id'=>$team_id]);
-    }
-
-    public function userAction()
-    {
-        $request = $this->getRequest();
-        if ($request->isPost()) {
-            $data = $request->getPost();
-            $user_teams = $data['user-information']['o-module-teams:Team'];
-            //wrong!! not really able to get from the param, would need to extract from the return url
-            $user_id = $this->params('id');
-            $em = $this->entityManager;
-
-            foreach ($user_teams as $team_id):
-                $team = $em->getRepository('Teams\Entity\Team')->findOneBy(['id' => $team_id]);
-            $user = $em->getRepository('Omeka\Entity\User')->findOneBy(['id'=>$user_id]);
-            $role = $em->getRepository('Teams\Entity\TeamRole')->findOneBy(['id' => 1]);
-            $team_user = new TeamUser($team, $user, $role);
-            $team_user->setCurrent(null);
-            $em->persist($team_user);
-            endforeach;
-            $em->flush();
-            $request = $this->getRequest();
-            $return = $request->getHeader('referer');
-//            return $this->redirect()->toUrl($data['return_url']);
-            return $this->redirect()->toUrl($return);
-        }
+        return $this->redirect()->toRoute('admin/teams/detail', ['id' => $teamId]);
     }
 
+    /**
+     * Switches the user's active team and updates their default item sites.
+     */
     public function currentTeamAction()
     {
         $user_id = $this->identity()->getId();
         $request = $this->getRequest();
 
         if ($request->isPost()) {
-            $data =  $request->getPost();
-
+            $data = $request->getPost();
             $em = $this->entityManager;
-            $team_user = $em->getRepository('Teams\Entity\TeamUser');
-            $old_current = $team_user->findOneBy(['user' => $user_id, 'is_current' => 1]);
-            $new_current = $team_user->findOneBy(['user'=> $user_id, 'team'=>$data['team_id']]);
+            $teamUserRepo = $em->getRepository('Teams\Entity\TeamUser');
+
+            $old_current = $teamUserRepo->findOneBy(['user' => $user_id, 'is_current' => 1]);
+            $new_current = $teamUserRepo->findOneBy(['user' => $user_id, 'team' => $data['team_id']]);
 
             if ($old_current) {
                 $old_current->setCurrent(null);
@@ -465,26 +123,11 @@ public function currentTeamAction()
             if ($new_current) {
                 $new_current->setCurrent(true);
                 $em->flush();
-                $team = $new_current->getTeam();
-
-                //the sites for the team the user just switched to
-
-                $team_sites = $team->getTeamSites();
-                $site_ids = [];
-                foreach ($team_sites as $team_site):
-                    $site_ids[] = strval($team_site->getSite()->getId());
-                endforeach;
-
-                //update so those are the user's default sites for items
-                $settingId = 'default_item_sites';
-                $settingValue = $site_ids;
-                $this->userSettings()->set($settingId, $settingValue, $user_id);
+                $this->sitePermissionManager->updateUserDefaultSites($user_id);
             } else {
                 $this->messenger()->addError("Team not found");
             }
 
-
-
             return $this->redirect()->toUrl($data['return_url']);
         }
     }
diff --git a/src/Form/AddMemberForm.php b/src/Form/AddMemberForm.php
deleted file mode 100644
index 6c2d9493..00000000
--- a/src/Form/AddMemberForm.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-namespace Teams\Form;
-
-use Laminas\Form\Form;
-use Laminas\Form\Element;
-
-
-class AddMemberForm extends Form
-{
-    public function init()
-    {
-        $this->setAttribute('id', 'add-member-form');
-
-        $this->add([
-            'type' => 'hidden',
-            'name' => 'user_id'
-        ]);
-
-
-        $this->add([
-            'type' => 'submit',
-            'name' => 'submit',
-            'attributes' => [
-                'value' => 'Add User to Team',
-            ],
-        ]);
-    }
-
-}
diff --git a/src/Form/AddSiteToTeamFieldset.php b/src/Form/AddSiteToTeamFieldset.php
deleted file mode 100644
index 1dc77df3..00000000
--- a/src/Form/AddSiteToTeamFieldset.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-
-namespace Teams\Form;
-
-use Teams\Form\Element\AllItemSetSelect;
-use Teams\Form\Element\AllSiteSelect;
-use Teams\Form\Element\RoleSelect;
-use Teams\Form\Element\UserSelect;
-use Laminas\Form\Fieldset;
-
-class AddSiteToTeamFieldset extends Fieldset
-{
-    public function init()
-    {
-        $this->add([
-            'name' => 'o:site',
-            'type' => AllSiteSelect::class,
-            'options' => [
-                'label' => 'Site', // @translate
-                'chosen' => true,
-            ],
-            'attributes' => [
-                'multiple' => true,
-            ],
-
-        ]);
-    }
-}
diff --git a/src/Form/AddSitesToTeam.php b/src/Form/AddSitesToTeam.php
deleted file mode 100644
index 3a40275f..00000000
--- a/src/Form/AddSitesToTeam.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-
-namespace Teams\Form;
-
-use Laminas\Form\Form;
-
-class AddSitesToTeam extends Form
-{
-    public function init()
-    {
-        $this->add([
-            'name' => 'site',
-            'type' => AddSiteToTeamFieldset::class,
-        ]);
-//        $this->add([
-//            'name' => 'user',
-//            'type' => TeamUserFieldset::class,
-//        ]);
-    }
-}
diff --git a/src/Form/ConfigForm.php b/src/Form/ConfigForm.php
index ebb72a95..1429bffe 100644
--- a/src/Form/ConfigForm.php
+++ b/src/Form/ConfigForm.php
@@ -70,6 +70,15 @@ public function init()
                 ],
             ]);
 
+        $this->add([
+            'name' => 'teams_sync_site_permissions',
+            'type' => 'submit',
+            'attributes' => [
+                'value' => 'Sync Site Permissions', // @translate
+                'id' => 'teams_sync_site_permissions',
+            ],
+        ]);
+
     }
     public function setGlobalSettings($globalSettings)
     {
diff --git a/src/Form/SecondaryResourcesForm.php b/src/Form/SecondaryResourcesForm.php
deleted file mode 100644
index 1ca2ed57..00000000
--- a/src/Form/SecondaryResourcesForm.php
+++ /dev/null
@@ -1,252 +0,0 @@
-<?php
-
-namespace Teams\Form;
-
-use Doctrine\ORM\EntityManager;
-use InvalidArgumentException;
-use Laminas\Authentication\AuthenticationService;
-use Laminas\Form\Element\Select;
-use Omeka\Api\Manager as ApiManager;
-use Omeka\Api\Representation\AbstractResourceRepresentation;
-use Laminas\Form\Form;
-use Omeka\Settings\Settings;
-use Teams\Form\Element\ItemSetTeamSelect;
-use Teams\Form\Element\ResourceTemplateTeamsSelect;
-
-
-class SecondaryResourcesForm extends Form
-{
-
-    protected $options;
-
-    /**
-     * @var EntityManager
-     */
-    protected EntityManager $entityManager;
-
-    /**
-     * @var ApiManager
-     */
-    protected ApiManager $apiManager;
-
-    /**
-     * @var AuthenticationService
-     */
-    protected AuthenticationService $authenticationService;
-
-    /**
-     * @var Settings
-     */
-    protected $settings;
-
-    public function __construct($name = null, $options = [])
-    {
-        parent::__construct($name,  $options);
-    }
-
-    public function init()
-    {
-        //determine which roles can bypass team filter
-
-        if (is_array($this->settings->get('teams_filter_bypass_roles'))) {
-            $show_all_options = in_array($this->authenticationService->getIdentity()->getRole(), $this->settings->get('teams_filter_bypass_roles'));
-        } else {
-            $show_all_options = $this->authenticationService->getIdentity()->getRole() === 'global_admin';
-        }
-
-        $this->setAttribute('id', 'team-secondary-resources-form');
-
-        if (array_key_exists('team_id', $this->options)){
-            $teamId = $this->options['team_id'];
-        } else {
-            $teamId = 0;
-        }
-        if ($teamId === 0) {
-            $disableGroupBy = true;
-        } else {
-            $disableGroupBy = false;
-        }
-
-        $this->add([
-            'name' => 'recursive_item_sets',
-            'type' => 'checkbox',
-            'options' => [
-                'label' => 'Recursively add items of selected item sets?', // @translate
-                'info' => 'This will also add all of the items inside the itemset', // @translate
-            ],
-            'attributes' => [
-                'id' => 'o-modules-team-recursive_item_sets',
-                'value' => true,
-            ],
-
-        ]);
-        $this->add([
-            'name' => 'item_sets',
-            'type' => ItemSetTeamSelect::class,
-            'options' => [
-                'disable_group_by' => $disableGroupBy,
-                'group_by' => ['team' => $teamId],
-                'label' => 'Select Item Sets',
-                'query' => ['bypass_team_filter' => true, 'all_user_teams'=>true],
-                'filter_resource_representations' => $show_all_options ? "" : function ($itemsets) {
-                    // The user must have permission to assign items to the site.
-                    foreach ($itemsets as $index => $itemset) {
-                        if (!$this->userAllowed($itemset)) {
-                            unset($itemsets[$index]);
-                        }
-                    }
-                    return $itemsets;
-                },
-
-            ],
-            'attributes' => [
-                'value' =>  $teamId ? $this->apiManager->search('team-resource', ['team'=>$teamId], ['returnScalar' => 'resource'])->getContent():[],
-                'id' => 'o-modules-team-item-sets',
-                'class' => 'chosen-select',
-                'multiple' => true,
-                'data-placeholder' => 'Select item sets', // @translate
-
-            ]
-        ]);
-        $this->add([
-            'name' => 'resource_templates',
-            'type' => ResourceTemplateTeamsSelect::class,
-            'options' => [
-                'disable_group_by' => $disableGroupBy,
-                'group_by' => ['team' => $teamId],
-                'label' => 'Select Resource Templates',
-                'query' => ['bypass_team_filter' => true, 'all_user_teams'=>true], //get all the responses, then filter below as appropriate
-                'class' => 'chosen-select',
-                'filter_resource_representations' => $show_all_options ? "" : function ($templates) {
-                    // The user must have permission to assign items to the site.
-                    foreach ($templates as $index => $template) {
-                        if (!$this->userAllowed($template)) {
-                            unset($templates[$index]);
-                        }
-                    }
-                    return $templates;
-                },
-            ],
-            'attributes' => [
-                'value' =>  $teamId ? $this->apiManager->search('team-resource-template', ['team'=>$teamId], ['returnScalar' => 'resource_template'])->getContent():[],
-                'class' => 'chosen-select',
-                'multiple' => true,
-                'id' => 'o-modules-team-resource-templates',
-                'data-placeholder' => 'Select resource templates', // @translate
-
-            ]
-        ]);
-        $this->add([
-            'name' => 'remove_item_sets',
-            'type' => Select::class,
-            'options' => [
-                'label' => 'Item Sets to be removed',
-            ],
-            'attributes' => [
-                'id' => 'o-modules-team-remove-item-sets',
-                'class' => 'chosen-select',
-                'multiple' => true,
-                'data-placeholder' => 'None', // @translate
-
-            ]
-        ]);
-        $this->add([
-            'name' => 'remove_resource_templates',
-            'type' => Select::class,
-            'options' => [
-                'label' => 'Resource Templates to be removed',
-            ],
-            'attributes' => [
-                'id' => 'o-modules-team-remove-resource-templates',
-                'class' => 'chosen-select',
-                'multiple' => true,
-                'data-placeholder' => 'None', // @translate
-            ]
-        ]);
-
-
-
-    }
-
-    /**
-     * Determines if the user should be able to add this resource to other teams by checking to see if the user has
-     * resource editing privileges in any team where the resource is a team_resource. I.e., is there any context where
-     * the user can edit this item? If so, then they can edit which teams it belongs in.
-     *
-     * @param AbstractResourceRepresentation $resource
-     * @return bool
-     *
-     */
-    private function userAllowed(AbstractResourceRepresentation $resource): bool
-    {
-        $user = $this->authenticationService->getIdentity();
-        $users_edit_roles = $this->apiManager->search('team-user', ['user'=> $user, 'can_delete_resources'=>1], ['returnScalar' => 'team'] )->getContent();
-        if (str_contains('resource-template', $resource->getControllerName())) {
-            $resource_type = 'resource-template';
-        } elseif(str_contains($resource->getControllerName(), 'item') || str_contains('media', $resource->getControllerName())) {
-            $resource_type = 'resource';
-        } else
-        {
-            throw new InvalidArgumentException(
-                sprintf(
-                    'Cant create query for "%1$s" type resource.',
-                    $resource->getControllerName()
-                )
-            );
-        }
-
-        $resources_teams = $this->apiManager->search('team-' . $resource_type, [$resource_type => $resource->id()], ['returnScalar'=>'team'])->getContent();
-
-        if (!empty(array_intersect($users_edit_roles, $resources_teams))){
-            return true;
-        } else {
-            return false;
-        }
-
-    }
-
-
-    /**
-     * @param ApiManager $apiManager
-     * @return void
-     */
-    public function setApiManager(ApiManager $apiManager)
-    {
-        $this->apiManager = $apiManager;
-    }
-
-    /**
-     * @param AuthenticationService $authenticationService
-     * @return void
-     */
-    public function setAuthService(AuthenticationService $authenticationService)
-    {
-        $this->authenticationService = $authenticationService;
-    }
-
-
-    /**
-     * @param EntityManager $entityManager
-     */
-    public function setEntityManager(EntityManager $entityManager)
-    {
-        $this->entityManager = $entityManager;
-    }
-
-    /**
-     * @param Settings $settings
-     */
-    public function setSettings(Settings $settings)
-    {
-        $this->settings = $settings;
-    }
-
-    /**
-     * @return Settings
-     */
-    public function getSettings(): Settings
-    {
-        return $this->settings;
-    }
-
-}
\ No newline at end of file
diff --git a/src/Form/TeamAddUserRole.php b/src/Form/TeamAddUserRole.php
deleted file mode 100644
index b0e94553..00000000
--- a/src/Form/TeamAddUserRole.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-
-namespace Teams\Form;
-
-use Laminas\Form\Form;
-
-class TeamAddUserRole extends Form
-{
-    public function init()
-    {
-        $this->add([
-            'name' => 'user and role',
-            'type' => TeamAddUserRoleFieldset::class,
-        ]);
-
-
-        $this->add([
-            'name' => 'add',
-            'type' => 'button',
-            'options' => [
-                'label' => 'add'
-            ]
-
-        ]);
-    }
-}
diff --git a/src/Form/TeamAddUserRoleFieldset.php b/src/Form/TeamAddUserRoleFieldset.php
deleted file mode 100644
index 4accadc2..00000000
--- a/src/Form/TeamAddUserRoleFieldset.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-
-namespace Teams\Form;
-
-use Teams\Form\Element\RoleSelect;
-use Teams\Form\Element\UserSelect;
-use Laminas\Form\Fieldset;
-
-class TeamAddUserRoleFieldset extends Fieldset
-{
-    public function init()
-    {
-        $this->add([
-            'name' => 'o:user',
-            'type' => UserSelect::class,
-            'options' => [
-                'label' => 'User', // @translate
-                'chosen' => true,
-            ],
-            'attributes' => [
-            ],
-
-        ]);
-
-        $this->add([
-            'name' => 'o:role',
-            'type' => RoleSelect::class,
-            'options' => [
-                'label' => 'Role', // @translate
-                'chosen' => true,
-            ],
-            'attributes' => [
-            ],
-
-        ]);
-    }
-}
diff --git a/src/Form/TeamCompactForm.php b/src/Form/TeamCompactForm.php
deleted file mode 100644
index 073a696b..00000000
--- a/src/Form/TeamCompactForm.php
+++ /dev/null
@@ -1,278 +0,0 @@
-<?php
-namespace Omeka\Form;
-
-use Omeka\Form\Element\ResourceSelect;
-use Omeka\Permissions\Acl;
-use Omeka\Settings\Settings;
-use Omeka\Settings\UserSettings;
-use Laminas\Form\Form;
-use Laminas\EventManager\EventManagerAwareTrait;
-use Laminas\EventManager\Event;
-
-class TeamCompactForm extends Form
-{
-    use EventManagerAwareTrait;
-
-//    /**
-//     * @var array
-//     */
-//    protected $options = [
-//        'include_role' => false,
-//        'include_admin_roles' => false,
-//        'include_is_active' => false,
-//        'current_password' => false,
-//        'include_password' => false,
-//        'include_key' => false,
-//    ];
-
-    /**
-     * @var Acl
-     */
-    protected $acl;
-
-    /**
-     * @var Settings
-     */
-    protected $settings;
-
-    /**
-     * @var UserSettings
-     */
-    protected $userSettings;
-
-    public function __construct($name = null, $options = [])
-    {
-        parent::__construct($name, array_merge($this->options, $options));
-    }
-
-    public function init()
-    {
-        $this->add([
-            'name' => 'user-information',
-            'type' => 'fieldset',
-        ]);
-        $this->add([
-            'name' => 'user-settings',
-            'type' => 'fieldset',
-        ]);
-        $this->add([
-            'name' => 'change-password',
-            'type' => 'fieldset',
-        ]);
-        $this->add([
-            'name' => 'edit-keys',
-            'type' => 'fieldset',
-        ]);
-        $this->get('user-information')->add([
-            'name' => 'o:email',
-            'type' => 'Email',
-            'options' => [
-                'label' => 'Email', // @translate
-            ],
-            'attributes' => [
-                'id' => 'email',
-                'required' => true,
-            ],
-        ]);
-        $this->get('user-information')->add([
-            'name' => 'o:name',
-            'type' => 'Text',
-            'options' => [
-                'label' => 'Display name', // @translate
-            ],
-            'attributes' => [
-                'id' => 'name',
-                'required' => true,
-            ],
-        ]);
-
-        if ($this->getOption('include_role')) {
-            $excludeAdminRoles = !$this->getOption('include_admin_roles');
-            $roles = $this->getAcl()->getRoleLabels($excludeAdminRoles);
-            $this->get('user-information')
-                ->add([
-                'name' => 'o:role',
-                'type' => 'select',
-                'options' => [
-                    'label' => 'Role', // @translate
-                    'empty_option' => 'Select role…', // @translate
-                    'value_options' => $roles,
-                ],
-                'attributes' => [
-                    'id' => 'role',
-                    'required' => true,
-                ],
-            ]);
-        }
-
-        if ($this->getOption('include_is_active')) {
-            $this->get('user-information')->add([
-                'name' => 'o:is_active',
-                'type' => 'checkbox',
-                'options' => [
-                    'label' => 'Is active', // @translate
-                ],
-                'attributes' => [
-                    'id' => 'is-active',
-                ],
-            ]);
-        }
-
-        $userId = $this->getOption('user_id');
-        $locale = $userId ? $this->userSettings->get('locale', null, $userId) : null;
-        if (null === $locale) {
-            $locale = $this->settings->get('locale');
-        }
-        $this->get('user-settings')->add([
-            'name' => 'locale',
-            'type' => 'Omeka\Form\Element\LocaleSelect',
-            'options' => [
-                'label' => 'Locale', // @translate
-                'info' => 'Global locale/language code for all interfaces.', // @translate
-            ],
-            'attributes' => [
-                'value' => $locale,
-                'class' => 'chosen-select',
-                'id' => 'locale',
-            ],
-        ]);
-        $this->get('user-settings')->add([
-            'name' => 'default_resource_template',
-            'type' => ResourceSelect::class,
-            'attributes' => [
-                'value' => $userId ? $this->userSettings->get('default_resource_template', null, $userId) : '',
-                'class' => 'chosen-select',
-                'data-placeholder' => 'Select a template', // @translate
-                'id' => 'default_resource_template',
-            ],
-            'options' => [
-                'label' => 'Default resource template', // @translate
-                'empty_option' => '',
-                'resource_value_options' => [
-                    'resource' => 'resource_templates',
-                    'query' => [],
-                    'option_text_callback' => function ($resourceTemplate) {
-                        return $resourceTemplate->label();
-                    },
-                ],
-            ],
-        ]);
-
-        if ($this->getOption('include_password')) {
-            if ($this->getOption('current_password')) {
-                $this->get('change-password')->add([
-                    'name' => 'current-password',
-                    'type' => 'password',
-                    'options' => [
-                        'label' => 'Current password', // @translate
-                    ],
-                    'attributes' => [
-                        'id' => 'current-password',
-                    ],
-                ]);
-            }
-            $this->get('change-password')->add([
-                'name' => 'password-confirm',
-                'type' => 'Omeka\Form\Element\PasswordConfirm',
-            ]);
-            $this->get('change-password')->get('password-confirm')->setLabels(
-                'New password', // @translate
-                'Confirm new password' // @translate
-            );
-        }
-
-        if ($this->getOption('include_key')) {
-            $this->get('edit-keys')->add([
-                'name' => 'new-key-label',
-                'type' => 'Text',
-                'options' => [
-                    'label' => 'New key label', // @translate
-                ],
-                'attributes' => [
-                    'id' => 'new-key-label',
-                ],
-            ]);
-        }
-
-        $addEvent = new Event('form.add_elements', $this);
-        $this->getEventManager()->triggerEvent($addEvent);
-
-        // separate input filter stuff so that the event work right
-        $inputFilter = $this->getInputFilter();
-
-        $inputFilter->get('user-settings')->add([
-            'name' => 'locale',
-            'allow_empty' => true,
-        ]);
-        $inputFilter->get('user-settings')->add([
-            'name' => 'default_resource_template',
-            'allow_empty' => true,
-        ]);
-
-        if ($this->getOption('include_key')) {
-            $inputFilter->get('edit-keys')->add([
-                'name' => 'new-key-label',
-                'required' => false,
-                'validators' => [
-                    [
-                        'name' => 'StringLength',
-                        'options' => [
-                            'max' => 255,
-                        ],
-                    ],
-                ],
-            ]);
-        }
-
-        $filterEvent = new Event('form.add_input_filters', $this, ['inputFilter' => $inputFilter]);
-        $this->getEventManager()->triggerEvent($filterEvent);
-    }
-
-    /**
-     * @param Acl $acl
-     */
-    public function setAcl(Acl $acl)
-    {
-        $this->acl = $acl;
-    }
-
-    /**
-     * @return Acl
-     */
-    public function getAcl()
-    {
-        return $this->acl;
-    }
-
-    /**
-     * @param Settings $settings
-     */
-    public function setSettings(Settings $settings)
-    {
-        $this->settings = $settings;
-    }
-
-    /**
-     * @return Settings
-     */
-    public function getSettings()
-    {
-        return $this->settings;
-    }
-
-    /**
-     * @param UserSettings $userSettings
-     */
-    public function setUserSettings(UserSettings $userSettings)
-    {
-        $this->userSettings = $userSettings;
-    }
-
-    /**
-     * @return UserSettings
-     */
-    public function getUserSettings()
-    {
-        return $this->userSettings;
-    }
-}
diff --git a/src/Form/TeamDetailsForm.php b/src/Form/TeamDetailsForm.php
deleted file mode 100644
index 4fec981f..00000000
--- a/src/Form/TeamDetailsForm.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-namespace Teams\Form;
-
-use Laminas\Form\Form;
-use Laminas\Form\Element;
-
-
-class TeamDetailsForm extends Form
-{
-    public function init()
-    {
-        $this->setAttribute('id', 'team-update-form');
-
-        $this->add([
-            'type' => 'hidden',
-            'name' => 'id',
-
-        ]);
-
-        $this->add([
-            //extremely important  that this match what is in the API adapter: Teams\Api\Representation getJsonLd()
-            'name' => 'o:name',
-            'type' => 'Text',
-            'options' => [
-                'label' => 'Name', // @translate
-            ],
-            'attributes' => [
-                'id' => 'name',
-                'required' => true,
-            ],
-        ]);
-
-        $this->add([
-
-            //extremely important  that this match what is in the API adapter: Teams\Api\Representation getJsonLd()
-            'name' => 'o:description',
-            'type' => 'Text',
-            'options' => [
-                'label' => 'Description', // @translate
-            ],
-            'attributes' => [
-                'id' => 'comment',
-            ],
-        ]);
-
-
-        //if the other option from the view won't work, this is a kinda clunky option. Better would be to use some JS
-        //to make make an interactive grab-and-put form
-//        $this->add(
-//            array('name' => 'o:user_add[]',
-//            'type' => 'Select',
-//            'options' => array(
-//                'label' => 'Add a User to the Team',
-//                'empty_option' => 'Select a User',
-//                'value_options' => array()
-//            )
-//        ));
-//
-//        $this->add([
-//            'name' => 'o:user_remove',
-//            'type' => 'Select',
-//            'options' => array(
-//                'label' => 'Remove a User from the Team',
-//                'empty_option' => 'Select a User',
-//                'value_options' => array()
-//            )
-//        ]);
-
-//        $this->add([
-//            'type' => 'submit',
-//            'name' => 'submit',
-//            'attributes' => [
-//                'value' => 'Update Team',
-//            ],
-//        ]);
-    }
-
-}
diff --git a/src/Form/TeamFieldset.php b/src/Form/TeamFieldset.php
deleted file mode 100644
index e96def62..00000000
--- a/src/Form/TeamFieldset.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-namespace Teams\Form;
-
-use Teams\Form\Element\AllTeamSelect;
-use Teams\Form\Element\TeamName;
-use Teams\Form\Element\TeamSelect;
-use Teams\Form\Element\UserSelect;
-use Laminas\Form\Fieldset;
-use Laminas\Form\Element;
-
-
-class TeamFieldset extends Fieldset
-{
-
-
-    public function init()
-    {
-        $this->setAttribute('id', 'team-form');
-
-        $this->add([
-            'type' => 'hidden',
-            'name' => 'id',
-
-        ]);
-
-        $this->add([
-            //extremely important  that this match what is in the API adapter: Teams\Api\Representation getJsonLd()
-            'name' => 'o:name',
-            'type' => TeamName::class,
-            'options' => [
-                'label' => 'Name', // @translate
-            ],
-            'attributes' => [
-                'id' => 'name',
-                'required' => true,
-            ],
-        ]);
-
-        $this->add([
-
-            //extremely important  that this match what is in the API adapter: Teams\Api\Representation getJsonLd()
-            'name' => 'o:description',
-            'type' => 'Text',
-            'options' => [
-                'label' => 'Description', // @translate
-            ],
-            'attributes' => [
-                'id' => 'comment',
-                'required' => false,
-            ],
-        ]);
-    }
-}
diff --git a/src/Form/TeamForm.php b/src/Form/TeamForm.php
index 4a8b1479..936a7138 100644
--- a/src/Form/TeamForm.php
+++ b/src/Form/TeamForm.php
@@ -1,15 +1,253 @@
 <?php
 namespace Teams\Form;
 
+use Laminas\Authentication\AuthenticationService;
 use Laminas\Form\Form;
+use Omeka\Api\Manager as ApiManager;
+use Omeka\Form\Element as OmekaElement;
+use Omeka\Settings\Settings;
+use Teams\Form\Element\AllSiteSelect;
+use Teams\Form\Element\ItemSetTeamSelect;
+use Teams\Form\Element\ResourceTemplateTeamsSelect;
 
+/**
+ * Form for creating and editing a team.
+ *
+ * All fields are assembled by TeamFormFactory, which injects the required
+ * services before the form manager calls init().
+ *
+ * Options:
+ *   team_id (int): The id of the team being edited, or 0 / absent for a new team.
+ */
 class TeamForm extends Form
 {
-    public function init()
+    /**
+     * @var ApiManager
+     */
+    protected ApiManager $apiManager;
+
+    /**
+     * @var AuthenticationService
+     */
+    protected AuthenticationService $authService;
+
+    /**
+     * @var Settings
+     */
+    protected Settings $settings;
+
+    public function init(): void
     {
+        $teamId = (int) ($this->getOption('team_id') ?? 0);
+        $isNewTeam = ($teamId === 0);
+
+        // --- Team details ---
+
+        $this->add([
+            'name' => 'o:name',
+            'type' => 'Text',
+            'options' => [
+                'label' => 'Name', // @translate
+            ],
+            'attributes' => [
+                'id' => 'name',
+                'required' => true,
+            ],
+        ]);
+
+        $this->add([
+            'name' => 'o:description',
+            'type' => 'Text',
+            'options' => [
+                'label' => 'Description', // @translate
+            ],
+            'attributes' => [
+                'id' => 'comment',
+                'required' => false,
+            ],
+        ]);
+
+        // --- Item management ---
+
+        $this->add([
+            'type' => 'radio',
+            'name' => 'item_assignment_action',
+            'options' => [
+                'label' => 'Manage current items', // @translate
+                'value_options' => [
+                    'no_action' => 'Do nothing', // @translate
+                    'add' => 'Add - keep existing items and assign items from a new search query', // @translate
+                    'replace' => 'Replace - unassign all items and assign items from a new search query', // @translate
+                    'remove' => 'Remove - unassign items from a new search query', // @translate
+                    'remove_all' => 'Remove all - unassign all items', // @translate
+                ],
+            ],
+            'attributes' => [
+                'value' => 'no_action',
+            ],
+        ]);
+
+        $this->add([
+            'type' => 'checkbox',
+            'name' => 'save_search',
+        ]);
+
+        $this->add([
+            'type' => OmekaElement\Query::class,
+            'name' => 'item_pool',
+            'options' => [
+                'label' => 'Search query', // @translate
+                'query_resource_type' => 'items',
+                'query_partial_excludelist' => [
+                    'common/advanced-search/site',
+                    'common/advanced-search/sort',
+                ],
+            ],
+        ]);
+
+        // --- Secondary resources ---
+
+        $bypassRoles = $this->settings->get('teams_filter_bypass_roles');
+        $showAllOptions = is_array($bypassRoles)
+            ? in_array($this->authService->getIdentity()->getRole(), $bypassRoles)
+            : $this->authService->getIdentity()->getRole() === 'global_admin';
+
+        $this->add([
+            'name' => 'recursive_item_sets',
+            'type' => 'checkbox',
+            'options' => [
+                'label' => 'Recursively add items of selected item sets?', // @translate
+                'info' => 'This will also add all of the items inside the itemset', // @translate
+            ],
+            'attributes' => [
+                'id' => 'o-modules-team-recursive_item_sets',
+                'value' => true,
+            ],
+        ]);
+
+        $this->add([
+            'name' => 'item_sets',
+            'type' => ItemSetTeamSelect::class,
+            'options' => [
+                'disable_group_by' => $isNewTeam,
+                'group_by' => ['team' => $teamId],
+                'label' => 'Select Item Sets', // @translate
+                'query' => ['bypass_team_filter' => true, 'all_user_teams' => true],
+                'filter_resource_representations' => $showAllOptions ? '' : function ($itemsets) {
+                    foreach ($itemsets as $index => $itemset) {
+                        if (!$this->userAllowedToAssign($itemset)) {
+                            unset($itemsets[$index]);
+                        }
+                    }
+                    return $itemsets;
+                },
+            ],
+            'attributes' => [
+                'value' => $isNewTeam
+                    ? []
+                    : $this->apiManager->search('team-resource', ['team' => $teamId], ['returnScalar' => 'resource'])->getContent(),
+                'id' => 'o-modules-team-item-sets',
+                'class' => 'chosen-select',
+                'multiple' => true,
+                'data-placeholder' => 'Select item sets', // @translate
+            ],
+        ]);
+
+        $this->add([
+            'name' => 'resource_templates',
+            'type' => ResourceTemplateTeamsSelect::class,
+            'options' => [
+                'disable_group_by' => $isNewTeam,
+                'group_by' => ['team' => $teamId],
+                'label' => 'Select Resource Templates', // @translate
+                'query' => ['bypass_team_filter' => true, 'all_user_teams' => true],
+                'filter_resource_representations' => $showAllOptions ? '' : function ($templates) {
+                    foreach ($templates as $index => $template) {
+                        if (!$this->userAllowedToAssign($template)) {
+                            unset($templates[$index]);
+                        }
+                    }
+                    return $templates;
+                },
+            ],
+            'attributes' => [
+                'value' => $isNewTeam
+                    ? []
+                    : $this->apiManager->search('team-resource-template', ['team' => $teamId], ['returnScalar' => 'resource_template'])->getContent(),
+                'class' => 'chosen-select',
+                'multiple' => true,
+                'id' => 'o-modules-team-resource-templates',
+                'data-placeholder' => 'Select resource templates', // @translate
+            ],
+        ]);
+
         $this->add([
-            'name' => 'team',
-            'type' => TeamFieldset::class,
+            'name' => 'team_sites',
+            'type' => AllSiteSelect::class,
+            'options' => [
+                'label' => 'Sites', // @translate
+                'info' => 'The sites that should belong to this team', // @translate
+            ],
+            'attributes' => [
+                'id' => 'sites',
+                'class' => 'chosen-select',
+                'multiple' => true,
+                'value' => $isNewTeam
+                    ? []
+                    : array_values($this->apiManager
+                        ->search('team-site', ['team' => $teamId], ['returnScalar' => 'site'])
+                        ->getContent()),
+            ],
         ]);
+
+        $inputFilter = $this->getInputFilter();
+        $inputFilter->add(['name' => 'item_assignment_action', 'allow_empty' => true]);
+        $inputFilter->add(['name' => 'save_search', 'allow_empty' => true]);
+        $inputFilter->add(['name' => 'team_sites', 'allow_empty' => true, 'required' => false]);
+
+
+        parent::init();
+    }
+
+    /**
+     * Returns true if the current user may assign the given resource to another team.
+     *
+     * @param \Omeka\Api\Representation\AbstractResourceRepresentation $resource
+     */
+    private function userAllowedToAssign($resource): bool
+    {
+        $user = $this->authService->getIdentity();
+        $editableTeams = $this->apiManager
+            ->search('team-user', ['user' => $user, 'can_delete_resources' => 1], ['returnScalar' => 'team'])
+            ->getContent();
+
+        if (str_contains($resource->getControllerName(), 'resource-template')) {
+            $resourceType = 'resource-template';
+        } elseif (str_contains($resource->getControllerName(), 'item') || str_contains($resource->getControllerName(), 'media')) {
+            $resourceType = 'resource';
+        } else {
+            return false;
+        }
+
+        $resourceTeams = $this->apiManager
+            ->search('team-' . $resourceType, [$resourceType => $resource->id()], ['returnScalar' => 'team'])
+            ->getContent();
+
+        return !empty(array_intersect($editableTeams, $resourceTeams));
+    }
+
+    public function setApiManager(ApiManager $apiManager): void
+    {
+        $this->apiManager = $apiManager;
+    }
+
+    public function setAuthService(AuthenticationService $authService): void
+    {
+        $this->authService = $authService;
+    }
+
+    public function setSettings(Settings $settings): void
+    {
+        $this->settings = $settings;
     }
 }
diff --git a/src/Form/TeamItemSetFieldset.php b/src/Form/TeamItemSetFieldset.php
deleted file mode 100644
index 3f8d7e89..00000000
--- a/src/Form/TeamItemSetFieldset.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-
-namespace Teams\Form;
-
-use Teams\Form\Element\AllItemSetSelect;
-use Teams\Form\Element\RoleSelect;
-use Teams\Form\Element\UserSelect;
-use Laminas\Form\Fieldset;
-
-class TeamItemSetFieldset extends Fieldset
-{
-    public function init()
-    {
-        $this->add([
-            'name' => 'o:itemset',
-            'type' => AllItemSetSelect::class,
-            'options' => [
-                'label' => 'Item Set', // @translate
-                'chosen' => true,
-            ],
-            'attributes' => [
-                'multiple' => true,
-            ],
-
-        ]);
-
-        $this->add([
-            'name' => 'o:user',
-            'type' => UserSelect::class,
-            'options' => [
-                'label' => 'Users', // @translate
-                'chosen' => true,
-            ],
-            'attributes' => [
-                'multiple' => true,
-            ],
-
-        ]);
-    }
-}
diff --git a/src/Form/TeamItemSetForm.php b/src/Form/TeamItemSetForm.php
deleted file mode 100644
index a718fadf..00000000
--- a/src/Form/TeamItemSetForm.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-
-namespace Teams\Form;
-
-use Laminas\Form\Form;
-
-class TeamItemSetForm extends Form
-{
-    public function init()
-    {
-        $this->add([
-            'name' => 'itemset',
-            'type' => 'fieldset',
-        ]);
-        $this->add([
-            'name' => 'site',
-            'type' => 'fieldset',
-        ]);
-
-        $this->get('itemset')->add([
-            'name' => 'itemset',
-            'type' => TeamItemSetFieldset::class,
-        ]);
-
-        $this->get('site')->add([
-            'name' => 'site',
-            'type' => AddSiteToTeamFieldset::class,
-        ]);
-    }
-}
diff --git a/src/Form/TeamItemsetAddRemoveForm.php b/src/Form/TeamItemsetAddRemoveForm.php
deleted file mode 100644
index edac28ed..00000000
--- a/src/Form/TeamItemsetAddRemoveForm.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-
-namespace Teams\Form;
-
-use Laminas\Form\Form;
-
-class TeamItemsetAddRemoveForm extends Form
-{
-    public function init()
-    {
-        $this->add([
-            'name' => 'addCollections',
-            'type' => TeamItemSetFieldset::class,
-        ]);
-
-        $this->add([
-            'name' => 'rmCollections',
-            'type' => TeamItemSetFieldset::class,
-
-        ]);
-    }
-}
diff --git a/src/Form/TeamResourcesForm.php b/src/Form/TeamResourcesForm.php
deleted file mode 100644
index da90f386..00000000
--- a/src/Form/TeamResourcesForm.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace Teams\Form;
-
-class TeamResourcesForm extends \Omeka\Form\SiteResourcesForm
-{
-
-
-}
\ No newline at end of file
diff --git a/src/Form/TeamSitesAddRemoveForm.php b/src/Form/TeamSitesAddRemoveForm.php
deleted file mode 100644
index 8c801f3d..00000000
--- a/src/Form/TeamSitesAddRemoveForm.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-
-namespace Teams\Form;
-
-use Laminas\Form\Form;
-use Teams\Form\Element\AllSiteSelect;
-
-class TeamSitesAddRemoveForm extends Form
-{
-    public function init()
-    {
-        $this->add([
-            'name' => 'teamSites',
-            'type' => TeamSitesFieldset::class,
-        ]);
-    }
-}
diff --git a/src/Form/TeamSitesFieldset.php b/src/Form/TeamSitesFieldset.php
deleted file mode 100644
index d0f40cd8..00000000
--- a/src/Form/TeamSitesFieldset.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-
-namespace Teams\Form;
-
-use Laminas\Form\Fieldset;
-use Teams\Form\Element\AllSiteSelect;
-
-class TeamSitesFieldset extends Fieldset
-{
-    public function init()
-    {
-        $this->add([
-            'name' => 'o:site',
-            'type' => AllSiteSelect::class,
-            'options' => [
-                'label' => 'Sites', // @translate
-                'chosen' => true,
-                'info' => 'The sites that should belong to this team'
-            ],
-            'attributes' => [
-                'multiple' => true,
-            ],
-
-        ]);
-    }
-}
diff --git a/src/Form/TeamUserForm.php b/src/Form/TeamUserForm.php
deleted file mode 100644
index f282236b..00000000
--- a/src/Form/TeamUserForm.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-
-namespace Teams\Form;
-
-use Laminas\Form\Form;
-
-class TeamUserForm extends Form
-{
-    public function init()
-    {
-        $this->add([
-            'name' => 'team',
-            'type' => TeamUserFieldset::class,
-        ]);
-    }
-}
diff --git a/src/Mvc/Controller/Plugin/TeamAuth.php b/src/Mvc/Controller/Plugin/TeamAuth.php
index 8074575d..8de8775a 100644
--- a/src/Mvc/Controller/Plugin/TeamAuth.php
+++ b/src/Mvc/Controller/Plugin/TeamAuth.php
@@ -59,10 +59,15 @@ public function teamAuthorized(User $user, string $action, string $domain, int $
             $action = 'add';
         }
         $resourceDomains = ['team_resource','team_resource_template','team_asset','team-resource','team-resource-template','team-asset'];
-        if (in_array($domain,$resourceDomains)) {
+        if (in_array($domain, $resourceDomains)) {
             $domain = 'resource';
         }
 
+        $siteDomains = ['team_site', 'team-site'];
+        if (in_array($domain, $siteDomains)) {
+            $domain = 'site';
+        }
+
         //validate inputs
         if (!in_array($action, $this->actions)) {
             throw new InvalidArgumentException(
diff --git a/src/Service/Form/SecondaryResourceFormFactory.php b/src/Service/Form/SecondaryResourceFormFactory.php
deleted file mode 100644
index 02edcd0a..00000000
--- a/src/Service/Form/SecondaryResourceFormFactory.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace Teams\Service\Form;
-
-use Interop\Container\Containerinterface;
-use Teams\Form\SecondaryResourcesForm;
-
-class SecondaryResourceFormFactory
-{
-    public function __invoke(ContainerInterface $services, $requestedName, ?array $options = null)
-    {
-        $form = new SecondaryResourcesForm(null, $options);
-
-        $form->setApiManager($services->get('Omeka\ApiManager'));
-        $form->setAuthService($services->get('Omeka\AuthenticationService'));
-        $form->setEntityManager($services->get('Omeka\EntityManager'));
-        $form->setSettings($services->get('Omeka\Settings'));
-        return $form;
-    }
-}
\ No newline at end of file
diff --git a/src/Service/Form/TeamFormFactory.php b/src/Service/Form/TeamFormFactory.php
new file mode 100644
index 00000000..4524edc0
--- /dev/null
+++ b/src/Service/Form/TeamFormFactory.php
@@ -0,0 +1,27 @@
+<?php
+namespace Teams\Service\Form;
+
+use Interop\Container\ContainerInterface;
+use Teams\Form\TeamForm;
+
+/**
+ * Factory for the consolidated TeamForm.
+ *
+ * Follows the Omeka S ResourceForm factory pattern: inject services into the
+ * form object before the form manager calls init(), then return it.
+ *
+ * $options are passed straight through from the controller's
+ *   $this->getForm(TeamForm::class, ['team_id' => $id])
+ * call so that init() can pre-populate fields for an existing team.
+ */
+class TeamFormFactory
+{
+    public function __invoke(ContainerInterface $services, $requestedName, ?array $options = null): TeamForm
+    {
+        $form = new TeamForm(null, $options ?? []);
+        $form->setApiManager($services->get('Omeka\ApiManager'));
+        $form->setAuthService($services->get('Omeka\AuthenticationService'));
+        $form->setSettings($services->get('Omeka\Settings'));
+        return $form;
+    }
+}
diff --git a/src/Service/SitePermissionManager.php b/src/Service/SitePermissionManager.php
new file mode 100644
index 00000000..e9bd2cfd
--- /dev/null
+++ b/src/Service/SitePermissionManager.php
@@ -0,0 +1,381 @@
+<?php
+namespace Teams\Service;
+
+use Doctrine\Common\Collections\Criteria;
+use Doctrine\ORM\EntityManager;
+use Omeka\Api\Manager as ApiManager;
+use Omeka\Entity\SitePermission;
+use Laminas\Log\Logger;
+use Omeka\Settings\UserSettings;
+
+/**
+ * Manages Omeka site user permissions in sync with Teams role assignments.
+ *
+ * This service is the authoritative place for all site-permission business logic:
+ * - Keeping Omeka native site roles (viewer / admin) in sync when a user's team role
+ *   changes, or when sites are added/removed from a team.
+ * - Updating the `default_item_sites` user setting that controls which sites appear
+ *   in the item-creation form for a given user.
+ *
+ * All Teams entity reads go through the Omeka API (with bypass_team_filter so admin
+ * operations are never restricted by the current user's active team). The entity
+ * manager is used only for SitePermission writes, since Omeka exposes no API
+ * resource for individual site permissions.
+ */
+class SitePermissionManager
+{
+    /**
+     * @var ApiManager
+     */
+    private ApiManager $api;
+
+    /**
+     * @var EntityManager
+     */
+    private EntityManager $entityManager;
+
+    /**
+     * @var UserSettings
+     */
+    private UserSettings $userSettings;
+
+    /**
+     * @var Logger
+     */
+    protected Logger $logger;
+
+    /**
+     * @param ApiManager    $api
+     * @param EntityManager $entityManager
+     * @param UserSettings  $userSettings
+     * @param Logger        $logger
+     */
+    public function __construct(ApiManager $api, EntityManager $entityManager, UserSettings $userSettings, Logger $logger)
+    {
+        $this->api = $api;
+        $this->entityManager = $entityManager;
+        $this->userSettings = $userSettings;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Sync Omeka site permissions for a user in a specific team.
+     *
+     * Assigns ROLE_ADMIN if the team role has `can_add_site_pages`, otherwise ROLE_VIEWER,
+     * for every site associated with the team. The final role is the highest across all
+     * of the user's team memberships so that a downgrade in one team never overrides a
+     * higher privilege granted by another.
+     *
+     * @param int  $userId
+     * @param int  $teamId
+     * @param bool $flush Whether to flush the entity manager after syncing. Pass
+     *                    false when calling in a loop and flush once afterward.
+     */
+    public function syncSitePermissionsForUser(int $userId, int $teamId, bool $flush = true): void
+    {
+        $em = $this->entityManager;
+
+        $teamUserReps = $this->api->search('team-user', [
+            'team' => $teamId,
+            'user' => $userId,
+            'bypass_team_filter' => true,
+        ])->getContent();
+
+        if (empty($teamUserReps)) {
+            return;
+        }
+
+        $teamUserRep = $teamUserReps[0];
+        $user = $teamUserRep->user();       // Omeka\Entity\User
+        $teamRole = $teamUserRep->role();   // Teams\Entity\TeamRole
+        $canAddSitePages = $teamRole->getCanAddSitePages();
+        $omekaSiteRole = $canAddSitePages
+            ? SitePermission::ROLE_ADMIN
+            : SitePermission::ROLE_VIEWER;
+
+        $this->logger->info(sprintf(
+            '[SitePermissionManager] syncSitePermissionsForUser: userId=%d, teamId=%d, teamRoleId=%d, teamRoleName="%s", canAddSitePages=%s => omekaSiteRole="%s"',
+            $userId,
+            $teamId,
+            $teamRole->getId(),
+            $teamRole->getName(),
+            $canAddSitePages ? 'true' : 'false',
+            $omekaSiteRole
+        ));
+
+        $teamSiteReps = $this->api->search('team-site', [
+            'team' => $teamId,
+            'bypass_team_filter' => true,
+        ])->getContent();
+
+        foreach ($teamSiteReps as $teamSiteRep) {
+            $site = $em->find('Omeka\Entity\Site', $teamSiteRep->resource());
+            if (!$site) {
+                continue;
+            }
+
+            // Use the highest role across all of the user's teams for this site.
+            $finalRole = $this->getHighestRoleFromTeams($userId, $site->getId()) ?? $omekaSiteRole;
+
+            $sitePermissions = $site->getSitePermissions();
+            $criteria = Criteria::create()->where(Criteria::expr()->eq('user', $user));
+            $existingPermission = $sitePermissions->matching($criteria)->first();
+
+            if ($existingPermission) {
+                $this->logger->info(sprintf(
+                    '[SitePermissionManager] siteId=%d: updating existing SitePermission from "%s" to "%s" for userId=%d',
+                    $site->getId(),
+                    $existingPermission->getRole(),
+                    $finalRole,
+                    $userId
+                ));
+                $existingPermission->setRole($finalRole);
+            } else {
+                $this->logger->info(sprintf(
+                    '[SitePermissionManager] siteId=%d: creating new SitePermission with role "%s" for userId=%d',
+                    $site->getId(),
+                    $finalRole,
+                    $userId
+                ));
+                $sitePermission = new SitePermission();
+                $sitePermission->setSite($site);
+                $sitePermission->setUser($user);
+                $sitePermission->setRole($finalRole);
+                $em->persist($sitePermission);
+                $sitePermissions->add($sitePermission);
+            }
+        }
+
+        if ($flush) {
+            $em->flush();
+        }
+    }
+
+    /**
+     * Sync or remove Omeka site permissions for a user leaving a team.
+     *
+     * If the user still belongs to other teams that share a given site, their
+     * permission is recalculated across all team memberships. If no team grants
+     * access to a site, the permission is removed entirely.
+     *
+     * @param int      $userId
+     * @param int      $teamId  The team the user is being removed from.
+     * @param int|null $siteId  If set, only process this one site. When the TeamSite
+     *                          row has already been deleted, the site entity is fetched
+     *                          directly by ID rather than through TeamSite.
+     * @param bool     $flush   Whether to flush the entity manager after syncing.
+     */
+    public function removeSitePermissionsForUser(int $userId, int $teamId, ?int $siteId = null, bool $flush = true): void
+    {
+        $em = $this->entityManager;
+
+        $user = $em->find('Omeka\Entity\User', $userId);
+        if (!$user) {
+            return;
+        }
+
+        if ($siteId !== null) {
+            // The TeamSite row has already been deleted by the time this method is
+            // called. Fetch the site entity directly so permission cleanup still runs.
+            $site = $em->find('Omeka\Entity\Site', $siteId);
+            if (!$site) {
+                if ($flush) {
+                    $em->flush();
+                }
+                return;
+            }
+            $sites = [$site];
+        } else {
+            $teamSiteReps = $this->api->search('team-site', [
+                'team' => $teamId,
+                'bypass_team_filter' => true,
+            ])->getContent();
+            $sites = array_filter(array_map(
+                fn($rep) => $em->find('Omeka\Entity\Site', $rep->resource()),
+                $teamSiteReps
+            ));
+        }
+
+        foreach ($sites as $site) {
+            $sitePermissions = $site->getSitePermissions();
+            $userCriteria = Criteria::create()->where(Criteria::expr()->eq('user', $user));
+            $existingPermission = $sitePermissions->matching($userCriteria)->first();
+
+            if (!$existingPermission) {
+                continue;
+            }
+
+            // Recalculate the role across all remaining team memberships.
+            $syncedRole = $this->getHighestRoleFromTeams($userId, $site->getId());
+
+            if ($syncedRole !== null) {
+                $existingPermission->setRole($syncedRole);
+            } else {
+                $sitePermissions->removeElement($existingPermission);
+                $em->remove($existingPermission);
+            }
+        }
+
+        if ($flush) {
+            $em->flush();
+        }
+    }
+
+    /**
+     * Sync Omeka site permissions for all users in a team when a site is added.
+     *
+     * @param int  $teamId
+     * @param int  $siteId
+     * @param bool $flush  Whether to flush the entity manager after syncing.
+     */
+    public function syncSitePermissionsForTeamOnSiteAdded(int $teamId, int $siteId, bool $flush = true): void
+    {
+        $teamUserReps = $this->api->search('team-user', [
+            'team' => $teamId,
+            'bypass_team_filter' => true,
+        ])->getContent();
+
+        foreach ($teamUserReps as $teamUserRep) {
+            $this->syncSitePermissionsForUser($teamUserRep->user()->getId(), $teamId, false);
+        }
+
+        if ($flush) {
+            $this->entityManager->flush();
+        }
+    }
+
+    /**
+     * Remove Omeka site permissions for all users in a team when a site is removed.
+     *
+     * @param int  $teamId
+     * @param int  $siteId
+     * @param bool $flush  Whether to flush the entity manager after syncing.
+     */
+    public function removeSitePermissionsForTeamOnSiteRemoved(int $teamId, int $siteId, bool $flush = true): void
+    {
+        $teamUserReps = $this->api->search('team-user', [
+            'team' => $teamId,
+            'bypass_team_filter' => true,
+        ])->getContent();
+
+        foreach ($teamUserReps as $teamUserRep) {
+            $this->removeSitePermissionsForUser($teamUserRep->user()->getId(), $teamId, $siteId, false);
+        }
+
+        if ($flush) {
+            $this->entityManager->flush();
+        }
+    }
+
+    /**
+     * Update the `default_item_sites` user setting so the user's item-creation form
+     * defaults to the sites of their current active team.
+     *
+     * @param int $userId
+     */
+    public function updateUserDefaultSites(int $userId): void
+    {
+        $teamUserReps = $this->api->search('team-user', [
+            'user' => $userId,
+            'current' => true,
+            'bypass_team_filter' => true,
+        ])->getContent();
+
+        if (empty($teamUserReps)) {
+            return;
+        }
+
+        $activeTeamId = $teamUserReps[0]->team()->getId();
+        $teamSiteReps = $this->api->search('team-site', [
+            'team' => $activeTeamId,
+            'bypass_team_filter' => true,
+        ])->getContent();
+
+        $siteIds = array_map(fn($rep) => $rep->resource(), $teamSiteReps);
+
+        $this->userSettings->set('default_item_sites', $siteIds, $userId);
+    }
+
+    /**
+     * Update `default_item_sites` for all users who have an active team.
+     */
+    public function updateAllUserDefaultSites(): void
+    {
+        $teamUserReps = $this->api->search('team-user', [
+            'current' => true,
+            'bypass_team_filter' => true,
+        ])->getContent();
+
+        foreach ($teamUserReps as $teamUserRep) {
+            $this->updateUserDefaultSites($teamUserRep->user()->getId());
+        }
+    }
+
+    /**
+     * Sync Omeka site permissions for every team-user-site combination.
+     *
+     * Used by the module upgrade routine to bring existing installations into sync.
+     */
+    public function syncAllSitePermissions(): void
+    {
+        $teamUserReps = $this->api->search('team-user', [
+            'bypass_team_filter' => true,
+        ])->getContent();
+
+        foreach ($teamUserReps as $teamUserRep) {
+            $this->syncSitePermissionsForUser(
+                $teamUserRep->user()->getId(),
+                $teamUserRep->team()->getId(),
+                false
+            );
+        }
+        $this->entityManager->flush();
+    }
+
+    /**
+     * Determine the Omeka site role a user should hold on a site based on all
+     * of their current team memberships.
+     *
+     * Returns null if no team the user belongs to includes this site (the
+     * permission should be removed entirely). Returns ROLE_ADMIN if any qualifying
+     * team has can_add_site_pages = true, otherwise ROLE_VIEWER.
+     *
+     * @param int $userId
+     * @param int $siteId
+     * @return string|null
+     */
+    private function getHighestRoleFromTeams(int $userId, int $siteId): ?string
+    {
+        $teamUserReps = $this->api->search('team-user', [
+            'user' => $userId,
+            'bypass_team_filter' => true,
+        ])->getContent();
+
+        $hasAnySite = false;
+        $canManage = false;
+
+        foreach ($teamUserReps as $teamUserRep) {
+            $teamSiteReps = $this->api->search('team-site', [
+                'team' => $teamUserRep->team()->getId(),
+                'site' => $siteId,
+                'bypass_team_filter' => true,
+            ])->getContent();
+
+            if (empty($teamSiteReps)) {
+                continue;
+            }
+
+            $hasAnySite = true;
+            if ($teamUserRep->role()->getCanAddSitePages()) {
+                $canManage = true;
+                break; // Admin wins; no need to check further.
+            }
+        }
+
+        if (!$hasAnySite) {
+            return null;
+        }
+
+        return $canManage ? SitePermission::ROLE_ADMIN : SitePermission::ROLE_VIEWER;
+    }
+}
diff --git a/src/Service/SitePermissionManagerFactory.php b/src/Service/SitePermissionManagerFactory.php
new file mode 100644
index 00000000..050a8ebd
--- /dev/null
+++ b/src/Service/SitePermissionManagerFactory.php
@@ -0,0 +1,25 @@
+<?php
+namespace Teams\Service;
+
+use Interop\Container\ContainerInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
+
+class SitePermissionManagerFactory implements FactoryInterface
+{
+    /**
+     *
+     * @param ContainerInterface $container
+     * @param $requestedName
+     * @param array|null $options
+     * @return SitePermissionManager
+     */
+    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
+    {
+        return new SitePermissionManager(
+            $container->get('Omeka\ApiManager'),
+            $container->get('Omeka\EntityManager'),
+            $container->get('Omeka\Settings\User'),
+            $container->get('Omeka\Logger')
+        );
+    }
+}
diff --git a/src/Service/UpdateControllerFactory.php b/src/Service/UpdateControllerFactory.php
index 25e1febb..3df1ad5a 100644
--- a/src/Service/UpdateControllerFactory.php
+++ b/src/Service/UpdateControllerFactory.php
@@ -10,8 +10,10 @@ class UpdateControllerFactory implements FactoryInterface
 {
     public function __invoke(ContainerInterface $services, $requestedName, array $options = null)
     {
-        $addController = new UpdateController($services->get('Omeka\EntityManager'));
-        return $addController;
+        return new UpdateController(
+            $services->get('Omeka\EntityManager'),
+            $services->get(SitePermissionManager::class)
+        );
     }
 }
 
diff --git a/src/Service/ViewHelper/TeamSiteUsersFactory.php b/src/Service/ViewHelper/TeamSiteUsersFactory.php
new file mode 100644
index 00000000..d0eb69f5
--- /dev/null
+++ b/src/Service/ViewHelper/TeamSiteUsersFactory.php
@@ -0,0 +1,13 @@
+<?php
+namespace Teams\Service\ViewHelper;
+
+use Interop\Container\ContainerInterface;
+use Teams\View\Helper\TeamSiteUsers;
+
+class TeamSiteUsersFactory
+{
+    public function __invoke(ContainerInterface $services, $requestedName, array $options = null): TeamSiteUsers
+    {
+        return new TeamSiteUsers($services->get('Omeka\EntityManager'));
+    }
+}
diff --git a/src/View/Helper/TeamSiteUsers.php b/src/View/Helper/TeamSiteUsers.php
new file mode 100644
index 00000000..0c7a13e3
--- /dev/null
+++ b/src/View/Helper/TeamSiteUsers.php
@@ -0,0 +1,80 @@
+<?php
+namespace Teams\View\Helper;
+
+use Doctrine\ORM\EntityManager;
+use Laminas\View\Helper\AbstractHelper;
+
+/**
+ * Returns a map of userId => string[] (team names) for users whose site role
+ * on the given site is managed through a Teams assignment.
+ *
+ * Extracted from the inline service-locator call in
+ * view/omeka/site-admin/index/users.phtml so that the entity manager is
+ * properly injected (avoiding the deprecated getServiceLocator() call).
+ */
+class TeamSiteUsers extends AbstractHelper
+{
+    /**
+     * @var EntityManager
+     */
+    private EntityManager $entityManager;
+
+    public function __construct(EntityManager $entityManager)
+    {
+        $this->entityManager = $entityManager;
+    }
+
+    /**
+     * @param  int $siteId
+     * @return array<int, string[]>  userId => list of team names granting the highest role, or empty array on error
+     */
+    public function __invoke(int $siteId): array
+    {
+        try {
+            $teamSites = $this->entityManager
+                ->getRepository('Teams\Entity\TeamSite')
+                ->findBy(['site' => $siteId]);
+
+            // Collect per-user: highest role flag and which team(s) grant it.
+            // Role priority: admin (can_add_site_pages=true) > viewer.
+            $userHighestCanManage = []; // userId => bool
+            $userTeamsByRole = []; // userId => ['admin' => [], 'viewer' => []]
+
+            foreach ($teamSites as $teamSite) {
+                $team = $teamSite->getTeam();
+                $teamUsers = $this->entityManager
+                    ->getRepository('Teams\Entity\TeamUser')
+                    ->findBy(['team' => $team->getId()]);
+
+                foreach ($teamUsers as $teamUser) {
+                    $userId = $teamUser->getUser()->getId();
+                    $canManage = (bool) $teamUser->getRole()->getCanAddSitePages();
+
+                    if (!isset($userHighestCanManage[$userId])) {
+                        $userHighestCanManage[$userId] = false;
+                        $userTeamsByRole[$userId] = ['admin' => [], 'viewer' => []];
+                    }
+
+                    if ($canManage) {
+                        $userHighestCanManage[$userId] = true;
+                        $userTeamsByRole[$userId]['admin'][] = $team->getName();
+                    } else {
+                        $userTeamsByRole[$userId]['viewer'][] = $team->getName();
+                    }
+                }
+            }
+
+            // Return only the team(s) that grant the user's highest role.
+            $teamManagedUsers = [];
+            foreach ($userHighestCanManage as $userId => $canManage) {
+                $teamManagedUsers[$userId] = $canManage
+                    ? $userTeamsByRole[$userId]['admin']
+                    : $userTeamsByRole[$userId]['viewer'];
+            }
+
+            return $teamManagedUsers;
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+}
diff --git a/view/omeka/site-admin/index/users.phtml b/view/omeka/site-admin/index/users.phtml
new file mode 100644
index 00000000..f255590d
--- /dev/null
+++ b/view/omeka/site-admin/index/users.phtml
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Overrides the Omeka S core site-admin users template to add a "Managed by Teams"
+ * column to the permissions table, showing which team(s) grant each user their role.
+ *
+ * Copied from omeka/omeka-s at commit e107b1c1d993ea93f10b587330b1f3e1b88aebcc
+ * (application/view/omeka/site-admin/index/users.phtml) and modified to inject
+ * Teams module data.
+ *
+ * Existing permissions are rendered server-side so user names are always visible,
+ * even for users filtered out of the team-scoped sidebar selector. The row template
+ * (data-row-template) is retained for new users added via the sidebar. Omeka's
+ * initializeSelector skips rows whose .resource-id value already exists in the table,
+ * so the PHP-rendered rows are not duplicated. site-users.js iterates data-existing-rows
+ * to replace __index__ placeholders with real indices and confirm role selections.
+ */
+$translate = $this->plugin('translate');
+$this->headScript()->appendFile($this->assetUrl('js/site-users.js', 'Omeka'));
+$this->htmlElement('body')->appendAttribute('class', 'sites users');
+$form->prepare();
+$escape = $this->plugin('escapeHtml');
+$delete = $translate('Delete');
+$restore = $translate('Restore');
+$roles = [
+    'viewer' => $translate('Viewer'),
+    'editor' => $translate('Creator'),
+    'admin' => $translate('Manager'),
+];
+
+// Build userId => [teamName, ...] map via the injected view helper (no getServiceLocator).
+$teamManagedUsers = $this->teamSiteUsers($site->id());
+$hasTeamData = !empty($teamManagedUsers);
+
+// Row template used by initializeSelector for *new* users added from the sidebar.
+$userRowTemplate = '
+<tr class="resource-row">
+    <td class="data-value" data-row-key="child-search"></td>
+    <td><select name="o:site_permission[__index__][o:role]">';
+foreach ($roles as $key => $value) {
+    $userRowTemplate .= '<option value="' . $key . '">' . $value . '</option>';
+}
+$userRowTemplate .= '</select></td>';
+if ($hasTeamData) {
+    $userRowTemplate .= '
+    <td class="teams-managed-cell"></td>';
+}
+$userRowTemplate .= '
+    <td>
+        <ul class="actions">
+            <li>' . $this->hyperlink('', '#', ['class' => 'o-icon-delete', 'title' => $delete]) . '</li>
+        </ul>
+        <input type="hidden" class="resource-id" name="o:site_permission[__index__][o:user][o:id]">
+    </td>
+</tr>
+';
+
+$sitePermissions = $site->sitePermissions();
+
+// data-existing-rows is consumed by site-users.js to assign indices and confirm
+// role selections on the PHP-rendered rows. Names and team data are rendered
+// directly in PHP, so they are not needed here.
+$existingRowsData = [];
+foreach ($sitePermissions as $sitePermission) {
+    $existingRowsData[] = [
+        'id'   => $sitePermission->user()->id(),
+        'role' => $sitePermission->role(),
+    ];
+}
+?>
+
+<?php echo $this->pageTitle($translate('User permissions'), 1, $translate('Sites')); ?>
+
+<?php if ($hasTeamData): ?>
+<div class="messages">
+    <div class="warning"><?php echo $escape($translate(
+        'User roles on this site are managed by the Teams module. Manual changes made here may be overwritten when team memberships or roles are next updated.'
+    )); ?></div>
+</div>
+<?php endif; ?>
+
+<?php echo $this->form()->openTag($form); ?>
+<?php echo $this->formCollection($form, false); ?>
+
+<div id="page-actions">
+    <?php echo $this->cancelButton(); ?>
+    <button><?php echo $translate('Save'); ?></button>
+</div>
+
+<table id="site-user-permissions" data-row-template="<?php echo $escape($userRowTemplate); ?>" data-existing-rows="<?php echo $this->escapeHtml(json_encode($existingRowsData)); ?>" class="selector-table tablesaw tablesaw-stack <?php echo (count($sitePermissions) > 0) ? '' : 'empty'; ?>" data-tablesaw-mode="stack">
+    <thead>
+        <tr>
+            <th scope="col"><?php echo $translate('User'); ?></th>
+            <th scope="col"><?php echo $translate('Role'); ?></th>
+            <?php if ($hasTeamData): ?>
+            <th scope="col"><?php echo $translate('Managed by Team(s)'); ?></th>
+            <?php endif; ?>
+            <th></th>
+        </tr>
+    </thead>
+    <tbody class="resource-rows">
+    <?php foreach ($sitePermissions as $permIndex => $sitePermission):
+        $user = $sitePermission->user();
+        $teamsManaged = $hasTeamData
+            ? (!empty($teamManagedUsers[$user->id()])
+                ? implode(', ', array_unique($teamManagedUsers[$user->id()]))
+                : '')
+            : '';
+    ?>
+        <tr class="resource-row">
+            <td class="data-value" data-row-key="child-search"><?php echo $escape($user->name()); ?></td>
+            <td>
+                <select name="o:site_permission[<?php echo $permIndex; ?>][o:role]">
+                    <?php foreach ($roles as $roleKey => $roleLabel): ?>
+                    <option value="<?php echo $roleKey; ?>"<?php echo $sitePermission->role() === $roleKey ? ' selected' : ''; ?>><?php echo $roleLabel; ?></option>
+                    <?php endforeach; ?>
+                </select>
+            </td>
+            <?php if ($hasTeamData): ?>
+            <td class="teams-managed-cell"><?php echo $escape($teamsManaged); ?></td>
+            <?php endif; ?>
+            <td>
+                <ul class="actions">
+                    <li><?php echo $this->hyperlink('', '#', ['class' => 'o-icon-delete', 'title' => $delete]); ?></li>
+                </ul>
+                <input type="hidden" class="resource-id" name="o:site_permission[<?php echo $permIndex; ?>][o:user][o:id]" value="<?php echo $user->id(); ?>">
+            </td>
+        </tr>
+    <?php endforeach; ?>
+    </tbody>
+</table>
+<div class="no-resources">
+    <p><?php echo $translate('This site has no users. Add users using the interface to the right.'); ?></p>
+</div>
+<button id="site-user-selector-button" class="mobile-only"><?php echo $translate('Add new user'); ?></button>
+<?php echo $this->userSelector($translate('Click on a user to add them to the site.')); ?>
+
+<?php echo $this->form()->closeTag(); ?>
+
+<script>
+  Omeka.initializeSelector('#site-user-permissions', '#user-selector');
+</script>
+
+
diff --git a/view/teams/add/team-add.phtml b/view/teams/add/team-add.phtml
index 2d829f49..cd49fb80 100644
--- a/view/teams/add/team-add.phtml
+++ b/view/teams/add/team-add.phtml
@@ -2,108 +2,40 @@
 $this->headScript()->appendFile($this->assetUrl('vendor/sortablejs/Sortable.min.js', 'Omeka'));
 $this->headScript()->appendFile($this->assetUrl('js/site-resources.js', 'Omeka'));
 $this->headScript()->appendFile($this->assetUrl('js/inject-removal-util-element.js', 'Teams'));
-
-echo $this->pageTitle("Add new team");
-if ($this->roleAuth()->teamAuthorized('add', 'team')):
-
-$this->htmlElement('body')->appendAttribute('class', 'add');
 $this->headLink()->prependStylesheet($this->assetUrl('css/teams.css', 'Teams'));
 $this->headScript()->appendFile($this->assetUrl('js/team-users.js', 'Teams'));
-$formElement = $this->plugin('formElement');
-?>
-<div id="page-actions">
-    <button type="submit" form="new_team" value="Submit">Add team</button>
-</div>
-<?php
 
 $translate = $this->plugin('translate');
-$escape = $this->plugin('escapeHtml');
-
-$sectionNavs = [
-    'team-info' => $translate('Info'),
-    'team-members' => $translate('Users'),
-    'team-resources' => $translate('Resources'),
-    'team-secondary-resources' => $translate('Other Resources'),
-    'team-sites' => $translate('Sites'),
-];
-echo $this->sectionNav($sectionNavs, 'view.add.section_nav');
-    $form = $this->form;
-    $form->setAttribute('id', 'new_team');
-    $form->prepare();
-    echo $this->form()->openTag($form);
-?>
-    <fieldset id="team-info" class="section active">
-        <?php echo $this->formCollection($form); ?>
-    </fieldset>
-
-<fieldset id="team-members" class="section">
-    <?php echo $this->partial('teams/team/manage-users', [
-        'team' => [],
-        'bypass_teams_filter' => true,
-
-    ]);
-    ?>
-</fieldset>
-
-<?php
-$itemsetForm = $this->itemsetForm;
-$itemsetForm->prepare();
-$formElement = $this->plugin('formElement');
-echo $this->form()->openTag($itemsetForm);
-$resourceForm->get('item_assignment_action')
-    ->setValueOptions(
-        [
-            'no_action' => 'Do nothing', // @translate
-            'add' => 'Add - assign items from a search query', // @translate
-        ]
-    )->setOptions(['label' => 'Add items to the team'])
+$this->htmlElement('body')->appendAttribute('class', 'teams add');
 ?>
-    <div id="team-resources" class="manual-assignment section">
-        <?php echo $this->formRow($resourceForm->get('item_assignment_action')); ?>
-        <div id="item-pool-container" style="display: none;">
-            <?php echo $this->formRow($resourceForm->get('item_pool')); ?>
-            <div id="save-search">
-                <label><?php echo $this->translate('Keep this query'); ?><?php echo $this->formElement($resourceForm->get('save_search')); ?></label>
-            </div>
-        </div>
-    </div>
-    <div id="team-secondary-resources" class="manual-assignment section">
-
-        <h2>Select resource templates for this team</h2>
-        <?php
-        $secondaryResourcesForm->setLabel("Add and Remove Templates and Item Sets");
-        echo $this->formCollection($secondaryResourcesForm);
-        ?>
-    </div>
+<?php echo $this->pageTitle($translate('Add new team')); ?>
+<?php $this->trigger('view.add.before'); ?>
+
+<?php if ($this->roleAuth()->teamAuthorized('add', 'team')): ?>
+
+<?php echo $this->partial('teams/team/edit-form', [
+    'form'                    => $this->form,
+    'team'                    => $this->team,
+    'bypassTeamFilterRoles'   => $this->bypassTeamFilterRoles,
+    'user'                    => $this->user,
+    'isAdd'                   => true,
+    'sectionNavEvent'         => 'view.add.section_nav',
+    'action'                  => 'add',
+]); ?>
+
+<?php else: ?>
+<?php $glob_admin_url = $this->hyperlink(
+    $translate('global admins'),
+    $this->url(
+        'admin/default',
+        ['controller' => 'user', 'action' => 'browse'],
+        ['query' => ['role' => 'global_admin', 'active' => '1']]
+    )
+); ?>
+<div class="breadcrumbs">
+    <?php echo sprintf($translate('Only the %s can add new teams.'), $glob_admin_url); ?>
+</div>
+<?php endif; ?>
 
+<?php $this->trigger('view.add.after'); ?>
 
-<fieldset id="team-sites" class="section">
-    <div class="selection-criteria">
-        <p>
-            Attach sites to team.
-        </p>
-        <div class="select-by-item-set-content">
-            <?php echo $this->formCollection($itemsetForm->get('site')); ?>
-        </div>
-    </div>
-</fieldset>
-<?php
-echo $this->form()->closeTag();
-else: ?>
-    <?php $glob_admin_url = $this->hyperlink(
-        'global admins',
-        $this->url(
-            'admin/default',
-            [ 'controller' => 'user', 'action' => 'browse'],
-            [
-                'query' => [
-                    'role' => 'global_admin',
-                    'active' => '1',
-                ],
-            ]
-        )
-    ); ?>
-    <div class="breadcrumbs">
-    Only the <?php echo $glob_admin_url ?> can add new teams.
-    </div>
-<?php endif;
diff --git a/view/teams/partial/resource-template/edit.phtml b/view/teams/partial/resource-template/edit.phtml
index b62f88fb..34be274a 100644
--- a/view/teams/partial/resource-template/edit.phtml
+++ b/view/teams/partial/resource-template/edit.phtml
@@ -12,7 +12,7 @@ endforeach;
     window.addEventListener("load", function () {
 
 
-        let current_teams = <?php echo json_encode($team)?>;
+        let current_teams = <?php echo json_encode($team, JSON_HEX_TAG | JSON_HEX_AMP)?>;
 
 
         let select = document.getElementById('team');
diff --git a/view/teams/partial/site-admin/edit.phtml b/view/teams/partial/site-admin/edit.phtml
index 8f4face4..a2bbcf60 100644
--- a/view/teams/partial/site-admin/edit.phtml
+++ b/view/teams/partial/site-admin/edit.phtml
@@ -3,7 +3,7 @@
 window.addEventListener("load", function () {
 
 
-        let current_teams = <?php echo json_encode($this->team_ids)?>;
+        let current_teams = <?php echo json_encode($this->team_ids, JSON_HEX_TAG | JSON_HEX_AMP)?>;
 
 
         let select = document.getElementById('team_selected');
diff --git a/view/teams/partial/site-admin/users-teams-info.phtml b/view/teams/partial/site-admin/users-teams-info.phtml
new file mode 100644
index 00000000..9f323faf
--- /dev/null
+++ b/view/teams/partial/site-admin/users-teams-info.phtml
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Annotates the Omeka site admin user-permissions table with the team that
+ * granted each user their site role.
+ *
+ * Variables:
+ *   $this->teamManagedUsers  array  userId (int) => array of team names (string[])
+ */
+$teamManagedUsers = $this->teamManagedUsers;
+$translate = $this->plugin('translate');
+
+if (empty($teamManagedUsers)) {
+    return;
+}
+?>
+<div class="teams-permissions-info" style="margin-top:1.5em;">
+    <h3><?php echo $translate('Team-Managed User Permissions'); ?></h3>
+    <p><?php echo $translate('The following users have site roles granted by the Teams module. The column shows which team(s) are responsible.'); ?></p>
+    <table>
+        <thead>
+            <tr>
+                <th><?php echo $translate('User ID'); ?></th>
+                <th><?php echo $translate('Granting Team(s)'); ?></th>
+            </tr>
+        </thead>
+        <tbody>
+        <?php foreach ($teamManagedUsers as $userId => $teams): ?>
+            <tr>
+                <td><?php echo (int) $userId; ?></td>
+                <td><?php echo $this->escapeHtml(implode(', ', $teams)); ?></td>
+            </tr>
+        <?php endforeach; ?>
+        </tbody>
+    </table>
+</div>
diff --git a/view/teams/partial/team/add-user-and-role.phtml b/view/teams/partial/team/add-user-and-role.phtml
index dc9039af..fc968c29 100644
--- a/view/teams/partial/team/add-user-and-role.phtml
+++ b/view/teams/partial/team/add-user-and-role.phtml
@@ -44,8 +44,8 @@
 
                 }
 
-                users = <?php echo json_encode($this->available_u_array);?>;
-                roles = <?php echo json_encode($this->roles);?>;
+                users = <?php echo json_encode($this->available_u_array, JSON_HEX_TAG | JSON_HEX_AMP);?>;
+                roles = <?php echo json_encode($this->roles, JSON_HEX_TAG | JSON_HEX_AMP);?>;
                 function addUser() {
                     let nm = document.getElementById("new-member-choice");
                     let nmr = document.getElementById("new-member-role");
diff --git a/view/teams/partial/user/edit.phtml b/view/teams/partial/user/edit.phtml
index 75fb9042..76766e9b 100644
--- a/view/teams/partial/user/edit.phtml
+++ b/view/teams/partial/user/edit.phtml
@@ -18,8 +18,8 @@ endforeach;
 
     window.addEventListener("load", function () {
 
-        let current_teams = <?php echo json_encode($team)?>;
-        let current_roles = <?php echo json_encode($role)?>;
+        let current_teams = <?php echo json_encode($team, JSON_HEX_TAG | JSON_HEX_AMP)?>;
+        let current_roles = <?php echo json_encode($role, JSON_HEX_TAG | JSON_HEX_AMP)?>;
 
 
         let select = document.getElementById('team');
diff --git a/view/teams/team/edit-form.phtml b/view/teams/team/edit-form.phtml
new file mode 100644
index 00000000..c4f14ab9
--- /dev/null
+++ b/view/teams/team/edit-form.phtml
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Shared form partial for both team add and team edit pages.
+ * Follows the Omeka S form.phtml pattern: one form tag, CSRF at bottom.
+ *
+ * Expected variables:
+ * @var \Teams\Form\TeamForm $form  The consolidated team form (all sections).
+ * @var \Teams\Entity\Team|array|null $team  Null / empty array on the add page.
+ * @var array|null $bypassTeamFilterRoles
+ * @var \Omeka\Entity\User $user
+ * @var bool $isAdd  True on the add page; controls per-section auth checks.
+ * @var string $sectionNavEvent  e.g. 'view.edit.section_nav' or 'view.add.section_nav'
+ * @var string $action  'edit' or 'add'
+ */
+$translate   = $this->plugin('translate');
+$escape      = $this->plugin('escapeHtml');
+$formElement = $this->plugin('formElement');
+
+$sectionNavs = [
+    'team-info'                => $translate('Info'),
+    'team-members'             => $translate('Users'),
+    'team-resources'           => $translate('Resources'),
+    'team-secondary-resources' => $translate('Other Resources'),
+    'team-sites'               => $translate('Sites'),
+];
+echo $this->sectionNav($sectionNavs, $sectionNavEvent ?? ($isAdd ? 'view.add.section_nav' : 'view.edit.section_nav'));
+
+$form->prepare();
+echo $this->form()->openTag($form);
+?>
+
+<?php $this->trigger("view.{$action}.form.before", ['form' => $form]); ?>
+
+<fieldset id="team-info" class="section active">
+    <div class="meta-group">
+        <?php echo $this->formRow($form->get('o:name')); ?>
+        <?php echo $this->formRow($form->get('o:description')); ?>
+    </div>
+</fieldset>
+
+<?php if (!$isAdd && !$this->roleAuth()->teamAuthorized('update', 'team_user')): ?>
+<fieldset id="team-members" class="section">
+    <p><?php echo $translate('You are only authorized to Manage Team Users'); ?></p>
+</fieldset>
+<?php else: ?>
+<fieldset id="team-members" class="section">
+    <?php echo $this->partial('teams/team/manage-users', [
+        'team'                => $team,
+        'bypass_teams_filter' => true,
+    ]); ?>
+</fieldset>
+<?php endif; ?>
+
+<?php if (!$isAdd && !$this->roleAuth()->teamAuthorized('update', 'resource')): ?>
+<div id="team-resources" class="section">
+    <p><?php echo $translate('You are only authorized to Manage Team Users'); ?></p>
+</div>
+<?php else: ?>
+<div id="team-resources" class="manual-assignment section">
+    <?php echo $this->formRow($form->get('item_assignment_action')); ?>
+    <div id="item-pool-container" style="display: none;">
+        <?php echo $this->formRow($form->get('item_pool')); ?>
+        <div id="save-search">
+            <label>
+                <?php echo $translate('Keep this query'); ?>
+                <?php echo $formElement($form->get('save_search')); ?>
+            </label>
+        </div>
+    </div>
+</div>
+<?php endif; ?>
+
+<?php if (!$isAdd && !$this->roleAuth()->teamAuthorized('update', 'resource')): ?>
+<div id="team-secondary-resources" class="section">
+    <p><?php echo $translate('You are only authorized to Manage Team Users'); ?></p>
+</div>
+<?php else: ?>
+<div id="team-secondary-resources" class="manual-assignment section">
+    <h2><?php echo $translate('Select resource templates for this team'); ?></h2>
+    <?php if (!$isAdd && !in_array($user->getRole(), $bypassTeamFilterRoles ?? [])): ?>
+        <p><?php echo $translate('You can only add resources from other teams where your team role has resource edit privileges.'); ?></p>
+        <p><?php echo $translate('Users with these roles have broader privileges:'); ?></p>
+        <ul>
+            <?php foreach ($bypassTeamFilterRoles ?? [] as $role): ?>
+                <li><?php echo $escape(str_replace('_', ' ', $role)); ?></li>
+            <?php endforeach; ?>
+        </ul>
+    <?php endif; ?>
+    <?php
+    if (!$isAdd) {
+        $form->get('recursive_item_sets')->setOptions([
+            'label' => $translate('Recursively manage items from item sets?'),
+            'info'  => $translate('Add/remove all of the items from the item sets when you add/remove them'),
+        ]);
+    }
+    echo $this->formRow($form->get('recursive_item_sets'));
+    echo $this->formRow($form->get('item_sets'));
+    echo $this->formRow($form->get('resource_templates'));
+    ?>
+</div>
+<?php endif; ?>
+
+<?php if (!$isAdd && !$this->roleAuth()->teamAuthorized('update', 'site')): ?>
+<div id="team-sites" class="section">
+    <p><?php echo $translate('You are only authorized to Manage Team Users'); ?></p>
+</div>
+<?php else: ?>
+<div id="team-sites" class="section">
+    <div class="selection-criteria">
+        <div class="select-by-item-set-content">
+            <?php echo $this->formRow($form->get('team_sites')); ?>
+        </div>
+    </div>
+</div>
+<?php endif; ?>
+
+<?php $this->trigger("view.{$action}.form.after", ['form' => $form]); ?>
+
+<div id="page-actions">
+    <?php if (!$isAdd): echo $this->cancelButton(); endif; ?>
+    <button type="submit"><?php echo $isAdd ? $translate('Add team') : $translate('Save Edits'); ?></button>
+</div>
+
+<?php echo $formElement($form->get('csrf')); ?>
+
+<?php echo $this->form()->closeTag(); ?>
diff --git a/view/teams/team/manage-users.phtml b/view/teams/team/manage-users.phtml
index 49fb33d4..a5173aea 100644
--- a/view/teams/team/manage-users.phtml
+++ b/view/teams/team/manage-users.phtml
@@ -1,6 +1,5 @@
 <?php
 $translate = $this->plugin('translate');
-$this->headScript()->appendFile($this->assetUrl('js/site-users.js', 'Omeka'));
 $this->htmlElement('body')->appendAttribute('class', 'sites users');
 $escape = $this->plugin('escapeHtml');
 $delete = $translate('Delete');
@@ -53,10 +52,4 @@ if ($team) {
     <p><?php echo $translate('This team has no users. Add users using the interface to the right.'); ?></p>
 </div>
 <button id="site-user-selector-button" class="mobile-only"><?php echo $translate('Add new user'); ?></button>
-<?php echo $this->allUserSelector($translate('Click on a user to add them to the team.'),true,$this->bypass_teams_filter); ?>
-
-
-
-<script>
-    Omeka.initializeSelector('#site-user-permissions', '#user-selector');
-</script>
+<?php echo $this->allUserSelector($translate('Click on a user to add them to the team.'), true, $this->bypass_teams_filter); ?>
diff --git a/view/teams/update/team-update.phtml b/view/teams/update/team-update.phtml
index 1401083c..2954c6a9 100644
--- a/view/teams/update/team-update.phtml
+++ b/view/teams/update/team-update.phtml
@@ -1,122 +1,26 @@
-
 <?php
 $this->headScript()->appendFile($this->assetUrl('vendor/sortablejs/Sortable.min.js', 'Omeka'));
 $this->headScript()->appendFile($this->assetUrl('js/site-resources.js', 'Omeka'));
 $this->headScript()->appendFile($this->assetUrl('js/inject-removal-util-element.js', 'Teams'));
+$this->headScript()->appendFile($this->assetUrl('js/team-users.js', 'Teams'));
+$this->headLink()->prependStylesheet($this->assetUrl('css/teams.css', 'Teams'));
 
 $translate = $this->plugin('translate');
-$escape = $this->plugin('escapeHtml');
-$this->htmlElement('body')->appendAttribute('class', 'items edit');
-
-$sectionNavs = [
-    'team-info' => $translate('Info'),
-    'team-members' => $translate('Users'),
-    'team-resources' => $translate('Resources'),
-    'team-secondary-resources' => $translate('Other Resources'),
-    'team-sites' => $translate('Sites'),
-//    'team-assets' => $translate('Assets')
-];
+$this->htmlElement('body')->appendAttribute('class', 'teams edit');
 ?>
-<?php echo $this->sectionNav($sectionNavs, 'view.show.section_nav'); ?>
-
-<h1>Update Team for <?php echo $this->form->get('o:name')->getValue()?></h1>
-<div id="page-actions">
-        <?php echo $this->cancelButton(); ?>
-    <button type="submit" form="team-update-form" value="Submit">Save Edits</button>
-</div>
-<?php
-$form = $this->form;
-$this->headScript()->appendFile($this->assetUrl('js/team-users.js', 'Teams'));
-
-
-$form->prepare();
-
-echo $this->form()->openTag($form);?>
-
-<div id="team-info" class="active section">
-    <div class="meta-group">
-        <?php echo $this->formCollection($form); ?>
-    </div>
-</div>
-<?php echo $this->form()->openTag($form);?>
-
-<?php if ($this->roleAuth()->teamAuthorized('update', 'team_user')): ?>
-
-    <fieldset id="team-members" class="section">
-
-    <?php echo $this->partial('teams/team/manage-users', [
-        'team' => $this->team,
-        'bypass_teams_filter' => true,
-
-    ]);
-    ?>
-    </fieldset>
-<?php endif; ?>
-
-<?php if ($this->roleAuth()->teamAuthorized('update', 'resource')): ?>
-    <div id="team-resources" class="manual-assignment section">
-        <?php echo $this->formRow($resourceForm->get('item_assignment_action')); ?>
-        <div id="item-pool-container" style="display: none;">
-            <?php echo $this->formRow($resourceForm->get('item_pool')); ?>
-            <div id="save-search">
-                <label><?php echo $this->translate('Keep this query'); ?><?php echo $this->formElement($resourceForm->get('save_search')); ?></label>
-            </div>
-        </div>
-    </div>
-<?php else: ?>
-    <div id="team-resources" class="section">
-        <p>You are only authorized to Manage Team Users</p>
-    </div>
-<?php endif; ?>
-<?php if ($this->roleAuth()->teamAuthorized('update', 'resource')): ?>
-
-    <div id="team-secondary-resources" class="manual-assignment section">
-
-        <h2>Select resource templates for this team</h2>
-        <?php if (!in_array($user->getRole(),  $bypassTeamFilterRoles) ): ?>
-            <p>You can only add resources from other teams where your team role has resource edit privileges.</p>
-            <p> Users with these roles have broader privileges: </p>
-                <ul>
-            <?php foreach ($bypassTeamFilterRoles as $role): ?>
-                    <li>
-                        <?php echo str_replace('_', ' ', $role)?>
-                    </li>
-            <?php endforeach ?>
-                </ul>
-        <?php endif ?>
-        <?php
-        $secondaryResourcesForm->setLabel("Add and Remove Templates and Item Sets");
-        $secondaryResourcesForm->get('recursive_item_sets')->setOptions(['label'=>'Recursively manage items from item sets?']);
-        $secondaryResourcesForm->get('recursive_item_sets')->setOptions(['info'=>'Add/remove all of the items from the item sets when you add/remove them']);
-
-        echo $this->formCollection($secondaryResourcesForm);
-        ?>
-    </div>
-<?php else: ?>
-    <div id="team-resources" class="section">
-        <p>You are only authorized to Manage Team Users</p>
-    </div>
-<?php endif; ?>
-<?php if ($this->roleAuth()->teamAuthorized('update', 'site')): ?>
-    <div id="team-sites" class="section">
-        <div class="selection-criteria">
-            <div class="select-by-item-set-content">
-                <?php
-                $sitesForm = $this->sitesForm;
-                $fs = $sitesForm->getFieldsets();
-                $fs['teamSites']->setLabel('Add or Remove Sites ');
-                $sitesForm->prepare();
-                echo $this->form()->openTag($sitesForm);
-                echo $this->formCollection($sitesForm);
-                echo $this->form()->closeTag($sitesForm)
-                ?>
-            </div>
-        </div>
-    </div>
-<?php else: ?>
-    <div id="team-sites" class="section">
-        <p>You are only authorized to Manage Team Users</p>
-    </div>
-<?php endif; ?>
-<?php echo $this->form()->closeTag(); ?>
-
+<?php echo $this->pageTitle($this->teamRepresentation->name(), 1, $translate('Teams'), $translate('Edit')); ?>
+<?php $this->trigger('view.edit.before'); ?>
+
+<?php echo $this->partial('teams/team/edit-form', [
+    'form'                   => $this->form,
+    'team'                   => $this->team,
+    'bypassTeamFilterRoles'  => $this->bypassTeamFilterRoles,
+    'user'                   => $this->user,
+    'isAdd'                  => false,
+    'sectionNavEvent'        => 'view.edit.section_nav',
+    'action'                 => 'edit',
+]); ?>
+
+<?php echo $this->deleteConfirm($this->teamRepresentation, 'team'); ?>
+
+<?php $this->trigger('view.edit.after'); ?>