diff --git a/Controller/CoGrouperLitesController.php b/Controller/CoGrouperLitesController.php
index 57b143a..ccbaa42 100644
--- a/Controller/CoGrouperLitesController.php
+++ b/Controller/CoGrouperLitesController.php
@@ -31,7 +31,7 @@ public function display($id) {
 
     $this->set('pl_grouperlite_index_url', Router::url([
       'plugin' => "grouper_lite",
-      'controller' => 'GrouperGroups',
+      'controller' => 'grouper_groups',
       'action' => 'index',
       'co' => $this->cur_co['Co']['id'],
       'glid' => $id
diff --git a/Controller/GrouperGroupsController.php b/Controller/GrouperGroupsController.php
index 4dd3f1f..502c271 100644
--- a/Controller/GrouperGroupsController.php
+++ b/Controller/GrouperGroupsController.php
@@ -102,7 +102,7 @@ private function setConnection() {
    */
   public function index() {
     return $this->redirect(
-      array('controller' => 'GrouperGroups', 'action' => 'groupoptin')
+      array('controller' => 'grouper_groups', 'action' => 'groupoptin')
     );
   }
 
@@ -137,6 +137,8 @@ public function groupInfo() {
       $this->set('groupergroupssubscribers', array());
       $this->Flash->set(_txt('pl.grouperlite.message.flash.group-detail-members-failed'), array('key' => 'error'));
     }
+
+    $this->set('grouperbaseurl', $this->Session->read('Plugin.Grouper.Api.url'));
   }
 
   /**
@@ -178,8 +180,8 @@ public function groupOwner() {
     //Set initial settings for pagination
     $scope = [
       'userId' => $this->userId,
-      'page' => ($this->passedArgs['page'] ? $this->passedArgs['page']: $this->paginate['page']),
-      'limit' => ($this->passedArgs['limit'] ? $this->passedArgs['limit']: $this->paginate['limit']),
+      'page' => (isset($this->passedArgs['page']) ? $this->passedArgs['page']: $this->paginate['page']),
+      'limit' => (isset($this->passedArgs['limit']) ? $this->passedArgs['limit']: $this->paginate['limit']),
     ];
 
     if (isset($this->request->data['search'])) {
@@ -233,8 +235,8 @@ public function groupMember() {
     //Set initial settings for pagination
     $scope = [
       'userId' => $this->userId,
-      'page' => ($this->passedArgs['page'] ? $this->passedArgs['page']: $this->paginate['page']),
-      'limit' => ($this->passedArgs['limit'] ? $this->passedArgs['limit']: $this->paginate['limit']),
+      'page' => (isset($this->passedArgs['page']) ? $this->passedArgs['page']: $this->paginate['page']),
+      'limit' => (isset($this->passedArgs['limit']) ? $this->passedArgs['limit']: $this->paginate['limit']),
     ];
 
     if (isset($this->request->data['search'])) {
@@ -286,8 +288,8 @@ public function groupOptin() {
     //Set initial settings for pagination
     $scope = [
       'userId' => $this->userId,
-      'page' => ($this->passedArgs['page'] ? $this->passedArgs['page']: $this->paginate['page']),
-      'limit' => ($this->passedArgs['limit'] ? $this->passedArgs['limit']: $this->paginate['limit']),
+      'page' => (isset($this->passedArgs['page']) ? $this->passedArgs['page']: $this->paginate['page']),
+      'limit' => (isset($this->passedArgs['limit']) ? $this->passedArgs['limit']: $this->paginate['limit']),
     ];
 
     if (isset($this->request->data['search'])) {
@@ -337,31 +339,62 @@ public function groupOptin() {
    * Editing via a template will not be supported in this version of the plugin - Bill Kaufman
    *
    */
-  public function groupCreateTemplateForm() {
+  public function groupCreateTemplate() {
     if ($this->request->is('post')){
-      if(!$this->GrouperGroup->createGroupFromTemplate($this->userId, $this->request->data)){
+      if(!$this->GrouperGroup->createGroupWithTemplate($this->userId, $this->request->data)){
         $this->Flash->set("Error in creating group!", array('key' => 'error'));
         return $this->redirect(array('action' => 'groupoptin'));
+      } else {
+        $this->Flash->set("Success in creating group!", array('key' => 'success'));
+        return $this->redirect(array('action' => 'groupoptin'));
       }
     }
     $this->set('title', _txt('pl.grouperlite.title.templatecreate'));
   }
 
+  /**
+   * Delete a Grouper Group via Grouper Template
+   *
+   */
+  public function groupDeleteTemplate() {
+      if(!$this->GrouperGroup->deleteGroupWithTemplate($this->userId, $this->request->data)){
+        $this->Flash->set("Error in deleting group!", array('key' => 'error'));
+        return $this->redirect(array('action' => 'groupoptin'));
+      }
+
+    $this->set('title', _txt('pl.grouperlite.title.templatecreate'));
+  }
+
+
+  public function groupCreate() {
+    if ($this->request->is('post')){
+      if(!$this->GrouperGroup->createUpdateGroup($this->userId, $this->request->data)){
+        $this->Flash->set("Error in creating group!", array('key' => 'error'));
+        return $this->redirect(array('action' => 'groupOwner'));
+      } else {
+        $this->Flash->set("Your Group has been created!", array('key' => 'success'));
+        return $this->redirect(array('action' => 'groupOwner'));
+      }
+    }
 
-  //TODO - Need to combine this form with code below for groupCreate
-  public function groupCreateForm() {
     $this->set('title', _txt('pl.grouperlite.title.groupcreate'));
     $this->set('grouperstems', $this->GrouperGroup->getOwnedStems($this->userId));
   }
 
-  public function groupCreate() {
-    $name = urldecode($this->request->data['name']);
-    $set = urldecode($this->request->data['set']);
-    $descr = urldecode($this->request->data['description']);
-    // Debugger::dump($this->request->data);
-    $this->set('groupergroupadded', $this->GrouperGroup->createGroup($this->userId, $name, $set, $descr));
+  //TODO - Finish this call
+  public function groupDelete() {
+      if(!$this->GrouperGroup->deleteGroup($this->userId, $this->request->data)){
+        $this->Flash->set("Error in deleting group!", array('key' => 'error'));
+        return $this->redirect(array('action' => 'groupOwner'));
+      } else {
+        $this->Flash->set("Your Group has been deleted!", array('key' => 'success'));
+        return $this->redirect(array('action' => 'groupOwner'));
+      }
+
+    $this->set('grouperstems', $this->GrouperGroup->getOwnedStems($this->userId));
   }
 
+
   /**
    * Process to join a group displayed on the "Optin" page
    *
@@ -430,11 +463,19 @@ public function leaveGroup() {
   function isAuthorized() {
     $roles = $this->Role->calculateCMRoles();
 
-    //Need to pull in UserID for access to Grouper
+    //This call just pulls in user ID from comanage but not Grouper, need the Grouper Id for API calls.
+
     if ($this->Session->check('Auth.User.username')) {
       $this->userId = $this->Session->read('Auth.User.username');
     }
-
+/*
+    if ($this->Session->check('Plugin.Grouper.UserId')) {
+      $this->userId = $this->Session->read('Plugin.Grouper.UserId');
+    } else {
+      $this->userId = $this->GrouperGroup->getGrouperUserId();
+      $this->Session->write('Plugin.Grouper.UserId', $this->userId);
+    }
+*/
     // Determine what operations this user can perform
 
     // Construct the permission set for this user, which will also be passed to the view.
@@ -451,11 +492,11 @@ function isAuthorized() {
     $p['emaillistsmember'] = true;
     $p['emaillistsmanage'] = true;
     $p['emaillistsinfo'] = true;
-    $p['groupcreateform'] = true;
     $p['groupcreate'] = true;
+    $p['groupdelete'] = true;
     $p['joingroup'] = true;
     $p['leavegroup'] = true;
-    $p['groupcreatetemplateform'] = true;
+    $p['groupcreatetemplate'] = true;
 
     $this->set('permissions', $p);
 
@@ -464,13 +505,27 @@ function isAuthorized() {
 
   public function emaillistsOptin() {
     $this->set('title', _txt('pl.grouperlite.title.emaillists-join'));
-    // mock data
-    $this->set('group', array(
-      'member' => true,
-      'name' => 'Email List 1',
-      'description' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.',
-      'enabled' => 'T'
-    ));
+
+    //Set initial settings for pagination
+    $scope = [
+      'userId' => $this->userId,
+      'page' => (isset($this->passedArgs['page']) ? $this->passedArgs['page']: $this->paginate['page']),
+      'limit' => (isset($this->passedArgs['limit']) ? $this->passedArgs['limit']: $this->paginate['limit']),
+    ];
+
+    try {
+      //Add settings for optinEmailLists
+      $scope['method'] = 'optinEmailGroups';
+
+      $data = $this->Paginator->paginate('GrouperGroup', $scope);
+      $this->set('emailgroups', $data);
+
+    } catch (Exception $e) {
+      CakeLog::write('error', __METHOD__ . ': ' . var_export($e->getMessage(), true));
+      $this->Flash->set("An error occurred with the Optin Groups, please try again later.", array('key' => 'error'));
+      $this->set('emailgroups', array());
+      return;
+    }
 
     $this->set('isuserowner', $this->GrouperGroup->isUserOwner($this->userId));
     $this->set('isTemplateUser', $this->GrouperGroup->isTemplateUser($this->userId));
@@ -479,19 +534,34 @@ public function emaillistsOptin() {
   public function emaillistsMember()
   {
     $this->set('title', _txt('pl.grouperlite.title.emaillists-member'));
-    // mock data
-    $this->set('group', array(
-      'member' => true,
-      'name' => 'Email List 1',
-      'domain' => 'internet2',
-      'description' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.',
-      'enabled' => 'T'
-    ));
+
+    //Set initial settings for pagination
+    $scope = [
+      'userId' => $this->userId,
+      'page' => (isset($this->passedArgs['page']) ? $this->passedArgs['page']: $this->paginate['page']),
+      'limit' => (isset($this->passedArgs['limit']) ? $this->passedArgs['limit']: $this->paginate['limit']),
+    ];
+
+    try {
+      //Add setting for Group Membership
+      $scope['method'] = 'filteredMemberOfEmails';
+
+      $data = $this->Paginator->paginate('GrouperGroup', $scope);
+      $this->set('emailgroups', $data);
+
+    } catch (Exception $e) {
+      CakeLog::write('error', __METHOD__ . ': ' . var_export($e->getMessage(), true));
+
+      $this->Flash->set("Your Member Group cannot be found, please try again later.", array('key' => 'error'));
+      $this->set('emailgroups', array());
+      return;
+    }
 
     $this->set('isuserowner', $this->GrouperGroup->isUserOwner($this->userId));
     $this->set('isTemplateUser', $this->GrouperGroup->isTemplateUser($this->userId));
   }
 
+
   public function emaillistsManage() {
     $this->set('title', _txt('pl.grouperlite.title.emaillists-manage'));
     // mock data
@@ -523,5 +593,7 @@ public function emaillistInfo() {
       'enabled' => 'T',
       'attributes' => array()
     ));
+    $this->set('grouperbaseurl', $this->Session->read('Plugin.Grouper.Api.url'));
+
   }
 }
diff --git a/Lib/GrouperApiAccess.php b/Lib/GrouperApiAccess.php
index 87d1de4..67fad1e 100644
--- a/Lib/GrouperApiAccess.php
+++ b/Lib/GrouperApiAccess.php
@@ -71,16 +71,13 @@ public function __construct() {
   }
 
   /**
-   * NOT BEING USED
    * Get User information from Grouper Web Service
    *
-   * @param array $queryData Array of conditions for querying
-   * @return array
+   * @return String User ID in Grouper Groups
    * @throws Exception
    */
-  public function getGrouperUser(array $queryData) {
+  public function getGrouperUserId() {
 
-    $userId = $queryData['userId'];
     $this->http->setHeader(array('Content-Type' => 'application/json', 'Accept' => 'application/json'));
 
     // Create attributes want returned from call to Grouper WS
@@ -94,7 +91,7 @@ public function getGrouperUser(array $queryData) {
           'givenname'
         ),
         'wsSubjectLookups' => array(
-          array('subjectIdentifier' => $userId)
+          array('subjectIdentifier' => $_SERVER['REMOTE_USER'])
         )
       )
     );
@@ -114,7 +111,7 @@ public function getGrouperUser(array $queryData) {
       throw $e;
     }
 
-    return array();
+    return '';
   }
 
   /**
@@ -367,55 +364,74 @@ private function useMembershipUrl(array $queryData) {
     }
   }
 
+
   /**
-   * Returns a Distinct Grouper Group with its associated values
+   * Method used to CREATE a new Group in Grouper via the Template method.
    *
-   * @param array $queryData Array of conditions for querying
-   * @return array Array of attributes for a Group
+   * @param array $queryData Array of conditions and data adding new Grouper Group
+   * @return bool True if added successfully
    * @throws GrouperLiteException
+   *
    */
-  public function getGrouperGroupDescription(array $queryData) {
-    $groupName = $queryData['groupName'];
+  public function createGroupWithTemplate(array $queryData) {
+    //Currently only supporting create group, need to test if update a group will work!
+
+    $data = $queryData['data'];
+    $userId = $queryData['userId'];
 
     //Build request logic
-    $groupName = urlencode($groupName);
-    $connectionUrl = "{$this->config['fullUrl']}/groups/{$groupName}/memberships";
+    $inputFields = array();
+    foreach($data as $key => $value) {
+      $inputFields[] = array('name' => $key, 'value' => $value);
+    }
+
+    $groupToSave = array(
+      "WsRestGshTemplateExecRequest" => array(
+        "gshTemplateActAsSubjectLookup" => array(
+          "subjectSourceId" => "ldap",
+          "subjectId" => $userId
+        ),
+        "ownerStemLookup" => array(
+          "stemName" => "ref:incommon-collab"
+        ),
+        "ownerType" => "stem",
+        "configId" => "createNewWorkingGroup",
+        "inputs" => $inputFields
+      )
+    );
+
+    $this->http->setHeader(array('Content-Type' => 'application/json', 'Accept' => 'application/json'));
+    $connectionUrl = "{$this->config['fullUrl']}/gshTemplateExec";
 
     try {
-      $results = $this->http->sendRequest('GET', $connectionUrl);
+      $results = $this->http->sendRequest('POST', $connectionUrl, json_encode($groupToSave));
 
-      if (isset($results['WsGetMembershipsResults']['wsGroups']) && $results['WsGetMembershipsResults']['wsGroups'] != NULL) {
-        return $results['WsGetMembershipsResults']['wsGroups'];
+      if (isset($results['WsGshTemplateExecResult']['resultMetadata']['resultCode'])) {
+        if (stripos($results['WsGshTemplateExecResult']['resultMetadata']['resultCode'], "SUCCESS", 0) !== false) {
+          return true;
+        }
       }
     } catch (Exception $e) {
       CakeLog::write('error', __METHOD__ .  ': An error occurred');
       throw $e;
     }
-    return array();
+    return false;
   }
 
   /**
-   * Method used to create a new Group in Grouper via the Template method.
+   * Method used to DELETE a Group in Grouper via the Template method.
    *
    * @param array $queryData Array of conditions and data adding new Grouper Group
-   * @return bool True if added successfully
+   * @return bool True if deleted successfully
    * @throws GrouperLiteException
    *
    */
-  public function createGroupFromTemplate(array $queryData) {
-    //Currently only supporting create group, need to test if update a group will work!
+  public function deleteGroupWithTemplate(array $queryData) {
 
-    $data = $queryData['data'];
+    $workingGroupExt = $queryData['workingGroupExt'];
     $userId = $queryData['userId'];
 
-
-    //Build request logic
-    $inputFields = array();
-    foreach($data as $key => $value) {
-      $inputFields[] = array('name' => $key, 'value' => $value);
-    }
-
-    $groupToSave = array(
+    $groupToDelete = array(
       "WsRestGshTemplateExecRequest" => array(
         "gshTemplateActAsSubjectLookup" => array(
           "subjectSourceId" => "ldap",
@@ -425,20 +441,21 @@ public function createGroupFromTemplate(array $queryData) {
           "stemName" => "ref:incommon-collab"
         ),
         "ownerType" => "stem",
-        "configId" => "createNewWorkingGroup",
-        "inputs" => $inputFields
+        "configId" => "createWorkingGroup",
+        "inputs" => array(
+          array(
+            "name" => "gsh_input_workingGroupExtension",
+            "value" => $workingGroupExt
+          )
+        )
       )
     );
 
-    echo json_encode($groupToSave);
-    exit();
-    //TODO - take out exit and finish by running an example through
-
     $this->http->setHeader(array('Content-Type' => 'application/json', 'Accept' => 'application/json'));
     $connectionUrl = "{$this->config['fullUrl']}/gshTemplateExec";
 
     try {
-      $results = $this->http->sendRequest('POST', $connectionUrl, json_encode($groupToSave));
+      $results = $this->http->sendRequest('POST', $connectionUrl, json_encode($groupToDelete));
 
       if (isset($results['WsGshTemplateExecResult']['resultMetadata']['resultCode'])) {
         if (stripos($results['WsGshTemplateExecResult']['resultMetadata']['resultCode'], "SUCCESS", 0) !== false) {
@@ -453,7 +470,7 @@ public function createGroupFromTemplate(array $queryData) {
   }
 
   /**
-   * NOTE: This will probably changes once templates become available to use
+   * For creating/updating Ad-Hoc groups not using the Grouper Template format
    *
    * Create or Update a Group where User is Admin/Owner
    *
@@ -462,15 +479,19 @@ public function createGroupFromTemplate(array $queryData) {
    * @throws GrouperLiteException
    */
   public function createUpdateGroup(array $queryData) {
-    //TODO - Need to add checking for missing ':'
-    //Currently only supporting create group, need to test if update a group will work!
+    //TODO Currently only supporting create group, need to test if update a group will work!
 
-    $groupName = $queryData['groupName'];
-    $stemName = $queryData['stemName'];
+    $groupName = htmlentities($queryData['name']);
+    $stemName = htmlentities($queryData['stem']);
     $userId = $queryData['userId'];
-    $groupDescription = $queryData['groupDescription'];
+    $groupDescription = htmlentities($queryData['description']);
+    $privileges = $queryData['privileges'];
+
+    //Group name may be in "friendly" format, so need to do some small conversions before saving.
+    $newGroupName = ucfirst(strtolower($groupName));
+    $newGroupName = str_replace(' ', '', $newGroupName);
 
-    $newGroupToSave = $stemName . $groupName;
+    $newGroupToSave = "$stemName:$newGroupName";
 
     //Build request logic
     $groupToSave = array(
@@ -482,7 +503,8 @@ public function createUpdateGroup(array $queryData) {
           array(
             "wsGroup" => array(
               "description" => $groupDescription,
-              "name" => $newGroupToSave
+              "name" => $newGroupToSave,
+              "displayExtension" => $groupName
             ),
             "wsGroupLookup" => array(
               "groupName" => $groupDescription
@@ -510,15 +532,15 @@ public function createUpdateGroup(array $queryData) {
   }
 
   /**
-   * Listing of attributes in Grouper for a given Group Name
+   * Grouper Group information plus a listing of attributes in Grouper for that given Group
    *
    * @param array $queryData Array of conditions for querying
    * @return array Record of Grouper attributes for given GroupName
    * @throws GrouperLiteException
    */
-  public function getGroupAttributes(array $queryData) {
-    // Need to pass in the full stem path, so thing like sandbox:app:sympa are good!
+  public function getGrouperGroupInfo(array $queryData) {
     $groupName = $queryData['groupName'];
+    $groupInfo = array();
 
     //Build request logic
     $stemToFind = array(
@@ -538,14 +560,21 @@ public function getGroupAttributes(array $queryData) {
     try {
       $results = $this->http->sendRequest('POST', $connectionUrl, json_encode($stemToFind));
 
+      //Get the group information
+      if (isset($results['WsGetAttributeAssignmentsResults']['wsGroups']) && $results['WsGetAttributeAssignmentsResults']['wsGroups'] != NULL) {
+        $groupInfo = $results['WsGetAttributeAssignmentsResults']['wsGroups'];
+      }
+
+      //Now get the Group Attributes and add them to group
       if (isset($results['WsGetAttributeAssignmentsResults']['wsAttributeAssigns']) && $results['WsGetAttributeAssignmentsResults']['wsAttributeAssigns'] != NULL) {
-        return $results['WsGetAttributeAssignmentsResults']['wsAttributeAssigns'];
+        $groupInfo[0]["attributes"] = $results['WsGetAttributeAssignmentsResults']['wsAttributeAssigns'];
       }
+
+      return $groupInfo;
     } catch (Exception $e) {
       CakeLog::write('error', __METHOD__ .  ': An error occurred');
       throw $e;
     }
-    return array();
   }
 
 }
diff --git a/Lib/lang.php b/Lib/lang.php
index cecac6e..943488d 100644
--- a/Lib/lang.php
+++ b/Lib/lang.php
@@ -16,6 +16,7 @@
   'pl.grouperlite.nav.emaillists-member' => 'My email lists',
   'pl.grouperlite.nav.emaillists-manage' => 'Email lists I manage',
   'pl.grouperlite.nav.create-group' => 'Create group',
+  'pl.grouperlite.nav.create-working-group' => 'Create working group',
   'pl.grouperlite.nav.create-email' => 'Create email list',
   'pl.grouperlite.nav.emaillists' => 'Email Lists',
   'pl.grouperlite.nav.groups' => 'Groups',
@@ -131,5 +132,6 @@
 
   'pl.grouperlite.search.tags.text' => 'Search',
 
-  'pl.grouperlite.pagination.counter' => 'Viewing {:start}-{:end} of {:count}'
+  'pl.grouperlite.pagination.counter' => 'Viewing {:start}-{:end} of {:count}',
+  'pl.grouperlite.attributes.zero-state' => 'No Attributes Associated to this Group.'
 );
\ No newline at end of file
diff --git a/Model/GrouperGroup.php b/Model/GrouperGroup.php
index e8d14e2..fb3c7f4 100644
--- a/Model/GrouperGroup.php
+++ b/Model/GrouperGroup.php
@@ -47,6 +47,7 @@ class GrouperGroup extends GrouperLiteAppModel
   /** @var string  Group whose members can create Groups via Template process*/
   private $templateCreationGroup = 'ref:workinggroupadmins';
 
+
   /**
    * Verifies if user is an owner/admin of a group and then stores results in Session.
    * Session variable is reset on Group Creation and Group Deletion
@@ -84,6 +85,7 @@ public function isUserOwner(string $userId) {
     }
   }
 
+
   /**
    * Used to instantiate API class
    *
@@ -98,6 +100,24 @@ private function initApi() {
     }
   }
 
+  /**
+   * Gets the users Id from Grouper since can be different than what is in Comanage.
+   *
+   * @return String User's Id in Grouper
+   * @throws Exception
+   */
+  public function getGrouperUserId() {
+    $this->initApi();
+
+    try {
+      return $this->grouperAPI->getGrouperUserId();
+
+    } catch (Exception $e) {
+      CakeLog::write('error', __METHOD__ . ': An error occurred');
+      throw $e;
+    }
+  }
+
   /**
    * Return all Groups that a User belongs to in Grouper.
    * Will also add Optin Groups and flag them as joined so can display Optout option in UI.
@@ -136,6 +156,19 @@ public function filteredMemberOfGroups(array $conditions) {
     }
   }
 
+  public function filteredMemberOfEmails(array $conditions) {
+    $memberOfEmails = $this->filteredMemberOfGroups($conditions);
+
+    // Strip out all Groups that are not in Sympa Stem/Directory
+    foreach($memberOfEmails as $key => $value){
+      if(strpos($value['name'], 'sympa') === false) {
+        unset($memberOfEmails[$key]);
+      }
+    }
+
+    return $memberOfEmails;
+  }
+
   /**
    * Internal process used by other functions to fetch Groups the User is a member of
    *
@@ -212,14 +245,9 @@ public function groupDescriptions(string $groupName) {
       $args = array();
       $args['groupName'] = $groupName;
 
-      $groupDescription = $this->grouperAPI->getGrouperGroupDescription($args);
+      $groupDescription = $this->grouperAPI->getGrouperGroupInfo($args);
       $groupInfo = $this->getFriendlyName($groupDescription);
 
-      //make call to get attributes for group
-      $grouperAtt = new GrouperAttribute();
-      $groupAttributes = $grouperAtt->getGroupAttributes($groupName);
-
-      $groupInfo[0]["attributes"] = $groupAttributes;
       return $groupInfo;
 
     } catch (Exception $e) {
@@ -360,6 +388,19 @@ public function optinGroups(array $conditions) {
     }
   }
 
+  public function optinEmailGroups(array $conditions) {
+    $allGroups = $this->optinGroups($conditions);
+
+    // Strip out all Groups that are not in Sympa Stem/Directory
+    foreach($allGroups as $key => $value){
+      if(strpos($value['name'], 'sympa') === false) {
+        unset($allGroups[$key]);
+      }
+    }
+
+    return $allGroups;
+  }
+
   /**
    * Determine if User can use the Grouper Template to create a suite of Groups including Email lists.
    *
@@ -413,7 +454,7 @@ public function isTemplateUser(string $userId) {
    * @throws GrouperLiteException
    *
    */
-  public function createGroupFromTemplate(string $userId, array $groupData) {
+  public function createGroupWithTemplate(string $userId, array $groupData) {
     $this->initApi();
 
     try {
@@ -437,7 +478,36 @@ public function createGroupFromTemplate(string $userId, array $groupData) {
       // Reset Session variable that shows if User is an owner or not
       $this->resetUserOwner();
 
-      return $this->grouperAPI->createGroupFromTemplate($args);
+      return $this->grouperAPI->createGroupWithTemplate($args);
+
+    } catch (Exception $e) {
+      CakeLog::write('error', __METHOD__ . ': An error occurred');
+      throw $e;
+    }
+
+  }
+
+  /**
+   * Delete a Grouper Group using the Template methodology in Grouper
+   *
+   * @param string $userId Id of User
+   * @param array $groupData Data needed to delete a Grouper Group via Template
+   * @return bool True if successfully deleted record
+   * @throws GrouperLiteException
+   *
+   */
+  public function deleteGroupWithTemplate(string $userId, array $groupData) {
+    $this->initApi();
+
+    try {
+      $args = array();
+      $args['userId'] = $userId;
+      $args['workingGroupExt'] = $groupData['workingGroupExt'];
+
+      // Reset Session variable that shows if User is an owner or not
+      $this->resetUserOwner();
+
+      return $this->grouperAPI->deleteGroupWithTemplate($args);
 
     } catch (Exception $e) {
       CakeLog::write('error', __METHOD__ . ': An error occurred');
@@ -447,26 +517,20 @@ public function createGroupFromTemplate(string $userId, array $groupData) {
   }
 
   /**
-   * Creates a new Grouper Group
+   * Creates/Updates a new Grouper Group not Template related
    *
    * @param string $userId Id of user
-   * @param string $groupName Display Name of Group creating, do not confuse with Name field that is ID!
-   * @param string $stemName Full Stem (Folder) Name in format of 'stem:substem:subsubstem'
-   * @param string $groupDesc Description of Group creating
+   * @param array $data Data from form to Save in Grouper as a Group
    * @return bool True if saved | False if already created
    * @throws GrouperLiteException
    *
    */
-  public function createGroup(string $userId, string $groupName, string $stemName, string $groupDesc) {
+  public function createUpdateGroup(string $userId, array $data) {
     $this->initApi();
 
     try {
-      $args = array();
-      $args['groupType'] = 'Optins';
+      $args = $data;
       $args['userId'] = $userId;
-      $args['groupName'] = $groupName;
-      $args['stemName'] = $stemName;
-      $args['groupDescription'] = $groupDesc;
 
       // Reset Session variable that shows if User is an owner or not
       $this->resetUserOwner();
diff --git a/View/CoGrouperLites/display.ctp b/View/CoGrouperLites/display.ctp
index 3a56e7f..e8f38ac 100644
--- a/View/CoGrouperLites/display.ctp
+++ b/View/CoGrouperLites/display.ctp
@@ -53,7 +53,7 @@ echo $this->element('GrouperLite.base-styles');
                             <a class="btn btn-primary" href="<?php print $this->Html->url(
                                                                     array(
                                                                         'plugin' => "grouper_lite",
-                                                                        'controller' => 'GrouperGroups',
+                                                                        'controller' => 'grouper_groups',
                                                                         'action' => 'groupoptin',
                                                                         'co' => $coid,
                                                                         'glid' => $glid
@@ -64,7 +64,7 @@ echo $this->element('GrouperLite.base-styles');
                             <a class="btn btn-primary mt-1" href="<?php print $this->Html->url(
                                                                         array(
                                                                             'plugin' => "grouper_lite",
-                                                                            'controller' => 'GrouperGroups',
+                                                                            'controller' => 'grouper_groups',
                                                                             'action' => 'groupmember',
                                                                             'co' => $coid,
                                                                             'glid' => $glid
@@ -76,7 +76,7 @@ echo $this->element('GrouperLite.base-styles');
                             <a class="btn btn-primary mt-1" href="<?php print $this->Html->url(
                                                                         array(
                                                                             'plugin' => "grouper_lite",
-                                                                            'controller' => 'GrouperGroups',
+                                                                            'controller' => 'grouper_groups',
                                                                             'action' => 'groupowner',
                                                                             'co' => $coid,
                                                                             'glid' => $glid
@@ -93,7 +93,7 @@ echo $this->element('GrouperLite.base-styles');
                             <a class="btn btn-secondary" href="<?php print $this->Html->url(
                                                                     array(
                                                                         'plugin' => "grouper_lite",
-                                                                        'controller' => 'GrouperGroups',
+                                                                        'controller' => 'grouper_groups',
                                                                         'action' => 'emaillistsoptin',
                                                                         'co' => $coid,
                                                                         'glid' => $glid
@@ -104,7 +104,7 @@ echo $this->element('GrouperLite.base-styles');
                             <a class="btn btn-secondary mt-1" href="<?php print $this->Html->url(
                                                                         array(
                                                                             'plugin' => "grouper_lite",
-                                                                            'controller' => 'GrouperGroups',
+                                                                            'controller' => 'grouper_groups',
                                                                             'action' => 'emaillistsMember',
                                                                             'co' => $coid,
                                                                             'glid' => $glid
@@ -116,7 +116,7 @@ echo $this->element('GrouperLite.base-styles');
                             <a class="btn btn-secondary mt-1" href="<?php print $this->Html->url(
                                                                         array(
                                                                             'plugin' => "grouper_lite",
-                                                                            'controller' => 'GrouperGroups',
+                                                                            'controller' => 'grouper_groups',
                                                                             'action' => 'emaillistsManage',
                                                                             'co' => $coid,
                                                                             'glid' => $glid
diff --git a/View/Elements/Components/groupattributes.ctp b/View/Elements/Components/groupattributes.ctp
index f4589db..67019c8 100644
--- a/View/Elements/Components/groupattributes.ctp
+++ b/View/Elements/Components/groupattributes.ctp
@@ -1,27 +1,28 @@
 <?php if (count($attr) > 0) : ?>
-<table class="table table-striped w-100">
-    <thead>
-        <tr>
-            <th class="attr"><?php echo _txt('pl.grouperlite.table.attribute-name'); ?></th>
-            <th class="attr definition"><?php echo _txt('pl.grouperlite.table.attribute-description'); ?></th>
-            <th class="attr action"><?php echo _txt('pl.grouperlite.table.action'); ?></th>
-        </tr>
-    </thead>
-    <tbody>
-        <?php foreach ($attributes as $attr) : ?>
+    <table class="table table-striped w-100">
+        <thead>
             <tr>
-                <td><?php echo $attr['displayName']; ?></td>
-                <td><?php echo $attr['description'] ?></td>
-                <td>
-                    <a href="<?php echo $baseUrl . $attr['uuid']; ?>" class="btn btn-grouper btn btn-primary btn btn-raised btn btn-block" target="_blank" role="button">
-                        <?php echo _txt('pl.grouperlite.action.view'); ?> <i class="fa fa-external-link"></i>
-                    </a>
-                </td>
+                <th class="attr"><?php echo _txt('pl.grouperlite.table.attribute-name'); ?></th>
+                <th class="attr definition"><?php echo _txt('pl.grouperlite.table.attribute-description'); ?></th>
+                <th class="attr action"><?php echo _txt('pl.grouperlite.table.action'); ?></th>
             </tr>
-        <?php endforeach; ?>
-    </tbody>
-</table>
-<?php else : ?>
+        </thead>
+        <tbody>
+            <?php foreach ($attributes as $attr) : ?>
+                <tr>
+                    <td><?php echo $attr['attributeDefNameName']; ?></td>
+                    <td><?php echo $attr['attributeDefName'] ?></td>
+                    <td>
+                        <a href="<?php echo $baseUrl . $attr['attributeDefNameId']; ?>" class="btn btn-grouper btn btn-primary btn btn-raised btn btn-block" target="_blank" role="button">
+                            <?php echo _txt('pl.grouperlite.action.view'); ?> <i class="fa fa-external-link"></i>
+                        </a>
+                    </td>
+                </tr>
+            <?php endforeach; ?>
+        </tbody>
+    </table>
+<?php endif; ?>
+<?php if (count($attributes) < 1) : ?>
     <div class="alert alert-info">
         <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.group.info.attributes-zero-state'); ?></p>
     </div>
diff --git a/View/Elements/Components/navigation-emaillists.ctp b/View/Elements/Components/navigation-emaillists.ctp
index 7597315..60b3856 100644
--- a/View/Elements/Components/navigation-emaillists.ctp
+++ b/View/Elements/Components/navigation-emaillists.ctp
@@ -5,7 +5,7 @@
             print $this->Html->link(
                 _txt('pl.grouperlite.nav.emaillists-join'),
                 array(
-                    'controller' => 'GrouperGroups',
+                    'controller' => 'grouper_groups',
                     'action' => 'emaillistsoptin'
                 ),
                 array('class' => array('nav-link', $active == 'emaillistsoptin' ? 'active' : ''))
@@ -17,7 +17,7 @@
             print $this->Html->link(
                 _txt('pl.grouperlite.nav.emaillists-member'),
                 array(
-                    'controller' => 'GrouperGroups',
+                    'controller' => 'grouper_groups',
                     'action' => 'emaillistsmember'
                 ),
                 array('class' => array('nav-link', $active == 'emaillistsmember' ? 'active' : ''))
@@ -29,7 +29,7 @@
             print $this->Html->link(
                 _txt('pl.grouperlite.nav.emaillists-manage'),
                 array(
-                    'controller' => 'GrouperGroups',
+                    'controller' => 'grouper_groups',
                     'action' => 'emaillistsmanage'
                 ),
                 array('class' => array('nav-link', $active == 'emaillistsmanage' ? 'active' : ''))
@@ -42,7 +42,7 @@
             <?php
             $createEmailUrl = $this->Html->url(
                 array(
-                    'controller' => 'groupergroups',
+                    'controller' => 'grouper_groups',
                     'action' => 'groupcreatetemplateform'
                 )
             );
@@ -56,7 +56,7 @@
         <?php
         $gotoGroupsUrl = $this->Html->url(
             array(
-                'controller' => 'groupergroups',
+                'controller' => 'grouper_groups',
                 'action' => 'groupoptin'
             )
         );
diff --git a/View/Elements/Components/navigation-groups.ctp b/View/Elements/Components/navigation-groups.ctp
index 636e6c4..aadcef4 100644
--- a/View/Elements/Components/navigation-groups.ctp
+++ b/View/Elements/Components/navigation-groups.ctp
@@ -5,7 +5,7 @@
             print $this->Html->link(
                 _txt('pl.grouperlite.nav.groups-can-join'),
                 array(
-                    'controller' => 'groupergroups',
+                    'controller' => 'grouper_groups',
                     'action' => 'groupoptin'
                 ),
                 array('class' => array('nav-link', $active == 'groupoptin' ? 'active' : ''))
@@ -17,7 +17,7 @@
             print $this->Html->link(
                 _txt('pl.grouperlite.nav.memberships'),
                 array(
-                    'controller' => 'groupergroups',
+                    'controller' => 'grouper_groups',
                     'action' => 'groupmember'
                 ),
                 array('class' => array('nav-link', $active == 'groupmember' ? 'active' : ''))
@@ -29,7 +29,7 @@
             print $this->Html->link(
                 _txt('pl.grouperlite.nav.groups-presided'),
                 array(
-                    'controller' => 'groupergroups',
+                    'controller' => 'grouper_groups',
                     'action' => 'groupowner'
                 ),
                 array('class' => array('nav-link', $active == 'groupowner' ? 'active' : ''))
@@ -42,8 +42,8 @@
             <?php
             $createGroupUrl = $this->Html->url(
                 array(
-                    'controller' => 'groupergroups',
-                    'action' => 'groupcreateform'
+                    'controller' => 'grouper_groups',
+                    'action' => 'groupcreate'
                 )
             );
             ?>
@@ -52,11 +52,26 @@
             </a>
         </div>
     <?php } ?>
+  <?php if ($isuserowner === 'T') { ?>
+      <div class="align-self-center">
+        <?php
+        $createTemplateGroupUrl = $this->Html->url(
+          array(
+            'controller' => 'grouper_groups',
+            'action' => 'groupcreatetemplate'
+          )
+        );
+        ?>
+          <a href="<?php echo $createTemplateGroupUrl; ?>" class="btn btn-grouper btn btn-link px-3 py-2">
+              <i class="fa fa-plus-circle"></i>&nbsp; <?php echo _txt('pl.grouperlite.nav.create-working-group'); ?>
+          </a>
+      </div>
+  <?php } ?>
     <div class="align-self-center ml-auto">
         <?php
         $gotoEmailListsUrl = $this->Html->url(
             array(
-                'controller' => 'groupergroups',
+                'controller' => 'grouper_groups',
                 'action' => 'emaillistsoptin'
             )
         );
diff --git a/View/Elements/Components/optAction.ctp b/View/Elements/Components/optAction.ctp
index 2928dca..6ac08f5 100644
--- a/View/Elements/Components/optAction.ctp
+++ b/View/Elements/Components/optAction.ctp
@@ -1,5 +1,5 @@
 <?php echo $this->Form->create(false, array(
-  'url' => array('controller' => 'groupergroups', 'action' => $action),
+  'url' => array('controller' => 'grouper_groups', 'action' => $action),
   'class' => 'd-flex justify-content-center'
 )); ?>
 <?php print $this->Form->hidden('GroupName', array('default' => $group)); ?>
diff --git a/View/Elements/Components/search.ctp b/View/Elements/Components/search.ctp
index 37c1491..acd9fe7 100644
--- a/View/Elements/Components/search.ctp
+++ b/View/Elements/Components/search.ctp
@@ -16,7 +16,7 @@
     });
 </script>
 <?php echo $this->Form->create(false, array(
-    'url' => array('controller' => 'groupergroups', 'action' => $active),
+    'url' => array('controller' => 'grouper_groups', 'action' => $active),
     'class' => 'search mb-4'
 )); ?>
 <div id="search-grouper-form">
diff --git a/View/Elements/pagination.ctp b/View/Elements/pagination.ctp
index f3bafd2..a182dbd 100644
--- a/View/Elements/pagination.ctp
+++ b/View/Elements/pagination.ctp
@@ -124,14 +124,14 @@ $includeGoto = isset($goto) ? $goto : true;
             <select name="pageLimit" id="pageLimit">
                 <option value="20">20</option>
                 <option value="50">50</option>
-                <option value="all">all</option>
+                <option value="<?php echo $this->Paginator->params()['count'] ?>">All</option>
             </select>
             <p class=""><?php print _txt('fd.page.limit.records'); ?></p>
             <input type="submit" value="<?php print _txt('op.go'); ?>" class="btn btn-primary-light" />
             <script type="text/javascript">
                 $(function() {
                     // Check if the currentLimit holds an appropriate value on first load, and set the select option
-                    if (currentLimit != '' && (currentLimit == '2' || currentLimit == '4' || currentLimit == '6')) {
+                    if (currentLimit != '' && (currentLimit == '20' || currentLimit == '50' || currentLimit == '<?php echo $this->Paginator->params()['count'] ?>')) {
                         $("#pageLimit").val(currentLimit);
                     }
                 });
diff --git a/View/GrouperGroups/base.ctp b/View/GrouperGroups/base.ctp
index 6b393b3..54aaf95 100644
--- a/View/GrouperGroups/base.ctp
+++ b/View/GrouperGroups/base.ctp
@@ -6,7 +6,7 @@ print $this->Html->css('GrouperLite.co-grouper-plugin') . "\n    ";
 <?php /* only JQuery here - other scripts at bottom */
 print $this->Html->script('GrouperLite.typeahead.bundle.js') . "\n    ";
 
-$this->Html->addCrumb(_txt('pl.grouperlite.crumb.root'), array('controller' => 'groupergroups', 'action' => 'groupoptin'), array('prepend' => true));
+$this->Html->addCrumb(_txt('pl.grouperlite.crumb.root'), array('controller' => 'grouper_groups', 'action' => 'groupoptin'), array('prepend' => true));
 ?>
 
 <div id="grouper-plugin" class="grouper pt-2">
diff --git a/View/GrouperGroups/emaillistinfo.ctp b/View/GrouperGroups/emaillistinfo.ctp
index 61f6e35..4eaa7f7 100644
--- a/View/GrouperGroups/emaillistinfo.ctp
+++ b/View/GrouperGroups/emaillistinfo.ctp
@@ -1,7 +1,7 @@
 <?php $this->extend('/GrouperGroups/base'); ?>
 <?php
-$baseUrl = 'https://grouper.staging.at.internet2.edu/grouper/';
-$path = 'grouperUi/app/UiV2Main.index';
+$baseUrl = $grouperbaseurl;
+$path = '/grouper/grouperUi/app/UiV2Main.index';
 $groupOperation = '?operation=UiV2Group.viewGroup&groupId=';
 $groupUrlBase = $baseUrl . $path . $groupOperation;
 $attrOperation = '?operation=UiV2AttributeDefName.viewAttributeDefName&attributeDefNameId=';
@@ -62,7 +62,7 @@ $attrUrlBase = $baseUrl . $path . $attrOperation;
                     <?php echo $this->element('Components/subscriberList', array('subscribers' => $groupergroupssubscribers)); ?>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-grouper btn btn-link" data-dismiss="modal"><?php echo ('pl.grouperlite.action.close'); ?></button>
+                    <button type="button" class="btn btn-grouper btn btn-link" data-dismiss="modal"><?php echo _txt('pl.grouperlite.action.close'); ?></button>
                 </div>
             </div>
         </div>
diff --git a/View/GrouperGroups/emaillistsmanage.ctp b/View/GrouperGroups/emaillistsmanage.ctp
index ad29831..0a9bde0 100644
--- a/View/GrouperGroups/emaillistsmanage.ctp
+++ b/View/GrouperGroups/emaillistsmanage.ctp
@@ -18,7 +18,7 @@
                 <td><?php echo $this->Html->link(
                         isset($group['name']) ? $group['domain'] . ':' . $group['name'] : "--",
                         array(
-                            'controller' => 'groupergroups',
+                            'controller' => 'grouper_groups',
                             'action' => 'emaillistinfo',
                             '?' => array('groupname' => urlencode($group['name']))
                         )
diff --git a/View/GrouperGroups/emaillistsmember.ctp b/View/GrouperGroups/emaillistsmember.ctp
index cb66528..16e92a1 100644
--- a/View/GrouperGroups/emaillistsmember.ctp
+++ b/View/GrouperGroups/emaillistsmember.ctp
@@ -13,23 +13,27 @@
             </tr>
         </thead>
         <tbody>
+            <?php foreach ($emailgroups as $group) : ?>
             <tr>
                 <td><?php echo $this->Html->link(
-                        isset($group['name']) ? $group['domain'] . ':' . $group['name'] : "No Name",
-                        array(
-                            'controller' => 'groupergroups',
-                            'action' => 'emaillistinfo',
-                            '?' => array('groupname' => urlencode($group['name']))
-                        )
-                    ) ?></td>
+
+                    isset($group['name']) ? $group['domain'].':'.$group['name'] : "No Name",
+                    array(
+                        'controller' => 'grouper_groups',
+                        'action' => 'emaillistinfo',
+                        '?' => array('groupname' => urlencode($group['name']))
+                    )
+                ) ?></td>
                 <td><?php echo isset($group['description']) ? $group['description'] : _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
-                <td class="text-center">
-                    <button class="btn btn-raised btn-danger" type="submit">
-                        <?php echo _txt('pl.grouperlite.action.leave') ?>
-                        <i class="fa fa-<?php echo $member ? 'user-times' : 'users'; ?> fa-sm"></i>
-                    </button>
+                <td>
+                  <?php echo $group['optedin'] ? $this->element('GrouperLite.Components/optAction', array(
+                    'member' => $group['optedin'],
+                    'action' => 'leavegroup',
+                    'group' => $group['name']
+                  )) : ''; ?>
                 </td>
             </tr>
+            <?php endforeach; ?>
         </tbody>
     </table>
     <?php print $this->element("pagination", array(
diff --git a/View/GrouperGroups/emaillistsoptin.ctp b/View/GrouperGroups/emaillistsoptin.ctp
index 78103da..9490846 100644
--- a/View/GrouperGroups/emaillistsoptin.ctp
+++ b/View/GrouperGroups/emaillistsoptin.ctp
@@ -13,11 +13,12 @@
             </tr>
         </thead>
         <tbody>
+            <?php foreach ($emailgroups as $group) : ?>
             <tr>
                 <td><?php echo $this->Html->link(
                         isset($group['name']) ? $group['domain'] . ':' . $group['name'] : "No Name",
                         array(
-                            'controller' => 'groupergroups',
+                            'controller' => 'grouper_groups',
                             'action' => 'emaillistinfo',
                             '?' => array('groupname' => urlencode($group['name']))
                         )
@@ -30,6 +31,7 @@
                     </button>
                 </td>
             </tr>
+            <?php endforeach; ?>
         </tbody>
     </table>
     <?php print $this->element("pagination", array(
diff --git a/View/GrouperGroups/groupcreate.ctp b/View/GrouperGroups/groupcreate.ctp
index 15df446..df9058c 100644
--- a/View/GrouperGroups/groupcreate.ctp
+++ b/View/GrouperGroups/groupcreate.ctp
@@ -1 +1,35 @@
-Group Created!
\ No newline at end of file
+<?php
+$this->extend('/GrouperGroups/base');
+$this->Html->addCrumb('Create a Group');
+
+$model = $this->name;
+?>
+<hr />
+<div class="mt-4">
+    <div class="row">
+        <div class="col-lg-9 col-xs-12 col-xl-6">
+            <div class="create-group">
+                <div>Stems coming in are: Id=stem</div>
+                <?php foreach($grouperstems as $grouperstem) : ?>
+                  <div>Value=<?php echo $grouperstem['name'] ?> Display=<?php echo $grouperstem['displayName'] ?></div>
+                <?php endforeach; ?>
+
+                <?php echo $this->Form->create(false, array(
+                    'url' => array('controller' => 'grouper_groups', 'action' => 'groupcreate')
+                )); ?>
+                <?php
+                if (!empty($this->plugin)) {
+                    if (file_exists(APP . "Plugin/" . $this->plugin . "/View/" . $model . "/groupfields.inc")) {
+                        include(APP . "Plugin/" . $this->plugin . "/View/" . $model . "/groupfields.inc");
+                    } elseif (file_exists(LOCAL . "Plugin/" . $this->plugin . "/View/" . $model . "/groupfields.inc")) {
+                        include(LOCAL . "Plugin/" . $this->plugin . "/View/" . $model . "/groupfields.inc");
+                    }
+                } else {
+                    include(APP . "View/" . $model . "/groupfields.inc");
+                }
+                ?>
+                <?php echo $this->Form->end(); ?>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/View/GrouperGroups/groupcreateform.ctp b/View/GrouperGroups/groupcreateform.ctp
deleted file mode 100644
index c633d0f..0000000
--- a/View/GrouperGroups/groupcreateform.ctp
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-$this->extend('/GrouperGroups/base');
-$this->Html->addCrumb('Create a Group');
-
-$model = $this->name;
-?>
-<hr />
-<div class="mt-4">
-    <div class="row">
-        <div class="col-lg-9 col-xs-12 col-xl-6">
-            <div class="create-group">
-                <?php $this->Form->create(false, array(
-                    'url' => array('controller' => 'groupergroups', 'action' => 'groupcreate')
-                )); ?>
-                <?php
-                if (!empty($this->plugin)) {
-                    if (file_exists(APP . "Plugin/" . $this->plugin . "/View/" . $model . "/groupfields.inc")) {
-                        include(APP . "Plugin/" . $this->plugin . "/View/" . $model . "/groupfields.inc");
-                    } elseif (file_exists(LOCAL . "Plugin/" . $this->plugin . "/View/" . $model . "/groupfields.inc")) {
-                        include(LOCAL . "Plugin/" . $this->plugin . "/View/" . $model . "/groupfields.inc");
-                    }
-                } else {
-                    include(APP . "View/" . $model . "/groupfields.inc");
-                }
-                ?>
-                <?php $this->Form->end(); ?>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/View/GrouperGroups/groupcreatetemplateform.ctp b/View/GrouperGroups/groupcreatetemplate.ctp
similarity index 91%
rename from View/GrouperGroups/groupcreatetemplateform.ctp
rename to View/GrouperGroups/groupcreatetemplate.ctp
index a0b2e9c..f5b9bd9 100644
--- a/View/GrouperGroups/groupcreatetemplateform.ctp
+++ b/View/GrouperGroups/groupcreatetemplate.ctp
@@ -10,7 +10,7 @@ $model = $this->name;
         <div class="col-lg-9 col-xs-12 col-xl-6">
             <div class="create-group">
                 <?php echo $this->Form->create(false, array(
-                    'url' => array('controller' => 'groupergroups', 'action' => 'groupcreatetemplateform')
+                    'url' => array('controller' => 'grouper_groups', 'action' => 'groupcreatetemplate')
                 )); ?>
                 <?php
                 if (!empty($this->plugin)) {
diff --git a/View/GrouperGroups/groupfields.inc b/View/GrouperGroups/groupfields.inc
index 5bccc5c..a130056 100644
--- a/View/GrouperGroups/groupfields.inc
+++ b/View/GrouperGroups/groupfields.inc
@@ -1,5 +1,5 @@
 <?php
-$PRIVELAGES = array('READ', 'VIEW', 'OPTIN', 'OPTOUT', 'ATTRIBUTE_READ');
+$PRIVILEGES = array('READ', 'VIEW', 'OPTIN', 'OPTOUT', 'ATTRIBUTE_READ');
 ?>
 
 <script type="text/javascript">
@@ -164,9 +164,9 @@ $PRIVELAGES = array('READ', 'VIEW', 'OPTIN', 'OPTOUT', 'ATTRIBUTE_READ');
         <legend class="col-form-label col-sm-3 pt-0"><?php echo _txt('pl.grouperlite.form.group.privs.label'); ?>:</legend>
         <div class="col-sm-9">
             <div class="d-flex">
-                <?php foreach ($PRIVELAGES as $opt) : ?>
+                <?php foreach ($PRIVILEGES as $opt) : ?>
                     <div class="form-check mr-4">
-                        <?php echo $this->Form->checkbox('privelages', array(
+                        <?php echo $this->Form->checkbox('privileges', array(
                             'value' => $OPT,
                             'class' => 'form-check-input',
                             'id' => 'assign-' . $opt,
diff --git a/View/GrouperGroups/groupinfo.ctp b/View/GrouperGroups/groupinfo.ctp
index 80b8ae8..a989fa0 100644
--- a/View/GrouperGroups/groupinfo.ctp
+++ b/View/GrouperGroups/groupinfo.ctp
@@ -1,8 +1,8 @@
 <?php $this->extend('/GrouperGroups/base'); ?>
 <?php $this->Html->addCrumb('Group configuration'); ?>
 <?php
-$baseUrl = 'https://grouper.staging.at.internet2.edu/grouper/';
-$path = 'grouperUi/app/UiV2Main.index';
+$baseUrl = $grouperbaseurl;
+$path = '/grouper/grouperUi/app/UiV2Main.index';
 $groupOperation = '?operation=UiV2Group.viewGroup&groupId=';
 $groupUrlBase = $baseUrl . $path . $groupOperation;
 $attrOperation = '?operation=UiV2AttributeDefName.viewAttributeDefName&attributeDefNameId=';
@@ -63,7 +63,7 @@ $attrUrlBase = $baseUrl . $path . $attrOperation;
                     <?php echo $this->element('Components/subscriberList', array('subscribers' => $groupergroupssubscribers)); ?>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-grouper btn btn-link" data-dismiss="modal"><?php echo ('pl.grouperlite.action.close'); ?></button>
+                    <button type="button" class="btn btn-grouper btn btn-link" data-dismiss="modal"><?php echo _txt('pl.grouperlite.action.close'); ?></button>
                 </div>
             </div>
         </div>
diff --git a/View/GrouperGroups/groupmember.ctp b/View/GrouperGroups/groupmember.ctp
index 3231d90..8e0c956 100644
--- a/View/GrouperGroups/groupmember.ctp
+++ b/View/GrouperGroups/groupmember.ctp
@@ -23,7 +23,7 @@
                 <tr>
                     <td><a href="<?php echo $this->Html->url(
                                         array(
-                                            'controller' => 'groupergroups',
+                                            'controller' => 'grouper_groups',
                                             'action' => 'groupinfo',
                                             '?' => array('groupname' => urlencode($group['name']))
                                         )
diff --git a/View/GrouperGroups/groupoptin.ctp b/View/GrouperGroups/groupoptin.ctp
index cea9b3b..a3acc65 100644
--- a/View/GrouperGroups/groupoptin.ctp
+++ b/View/GrouperGroups/groupoptin.ctp
@@ -23,7 +23,7 @@
                 <tr>
                     <td><a href="<?php echo $this->Html->url(
                                         array(
-                                            'controller' => 'groupergroups',
+                                            'controller' => 'grouper_groups',
                                             'action' => 'groupinfo',
                                             '?' => array('groupname' => urlencode($group['name']))
                                         )
diff --git a/View/GrouperGroups/groupowner.ctp b/View/GrouperGroups/groupowner.ctp
index 33463c5..0e1baa1 100644
--- a/View/GrouperGroups/groupowner.ctp
+++ b/View/GrouperGroups/groupowner.ctp
@@ -24,7 +24,7 @@
                 <tr>
                     <td><a href="<?php echo $this->Html->url(
                                         array(
-                                            'controller' => 'groupergroups',
+                                            'controller' => 'grouper_groups',
                                             'action' => 'groupinfo',
                                             '?' => array('groupname' => urlencode($group['name']))
                                         )