diff --git a/.clj-kondo/.cache/v1/lock b/.clj-kondo/.cache/v1/lock
new file mode 100644
index 0000000..e69de29
diff --git a/.lsp/.cache/db.transit.json b/.lsp/.cache/db.transit.json
new file mode 100644
index 0000000..52d4536
--- /dev/null
+++ b/.lsp/.cache/db.transit.json
@@ -0,0 +1 @@
+["^ ","~:classpath",["~#set",[]],"~:project-hash","","~:project-root","/var/www/html/moodle/mod/cmi5launch","~:kondo-config-hash","56f27dae6e4a876734bf42298a7d3dc91d05917f53c9d98543cfd410bd88afe0","~:dependency-scheme","jar","~:analysis",null,"~:analysis-checksums",["^ "],"~:project-analysis-type","~:project-and-full-dependencies","~:version",12,"~:stubs-generation-namespaces",["^1",[]]]
\ No newline at end of file
diff --git a/AUview.php b/AUview.php
index 13318ea..0e5506d 100755
--- a/AUview.php
+++ b/AUview.php
@@ -76,7 +76,7 @@
 
     <script>
 
-        function key_test(registration) {
+        function key_tst(registration) {
 
             if (event.keyCode === 13 || event.keyCode === 32) {
                 mod_cmi5launch_launchexperience(registration);
diff --git a/amd/src/tenant.js b/amd/src/tenant.js
new file mode 100644
index 0000000..e69de29
diff --git a/classes/local/progress.php b/classes/local/progress.php
index 5163d1c..9394ba0 100755
--- a/classes/local/progress.php
+++ b/classes/local/progress.php
@@ -55,21 +55,30 @@ public function cmi5launch_request_statements_from_lrs($registrationid, $session
             'since' => $session->createdat,
         );
 
-        $statements = $this->cmi5launch_send_request_to_lrs($data, $session->id);
+        // Try and retrieve statements
+        try {
+            $statements = $this->cmi5launch_send_request_to_lrs($data, $session->id);
+/*
+            if ($statements === false || $statements == null) {
+                throw new \Exception ("No statements found.");
+            }
+            */
+            // The results come back as nested array under more then statements. We only want statements, and we want them unique.
+            $statement = array_chunk($statements["statements"], 1);
 
-        // The results come back as nested array under more then statements. We only want statements, and we want them unique.
-        $statement = array_chunk($statements["statements"], 1);
+            $length = count($statement);
 
-        $length = count($statement);
+            for ($i = 0; $i < $length; $i++) {
 
-        for ($i = 0; $i < $length; $i++) {
+                // This separates the larger statement into the separate sessions and verbs.
+                $current = ($statement[$i]);
+                array_push($result, array($registrationid => $current));
+            }
 
-            // This separates the larger statement into the separate sessions and verbs.
-            $current = ($statement[$i]);
-            array_push($result, array($registrationid => $current));
+            return $result;
+        } catch (\Throwable $e) {
+            echo 'Trouble retrieving statements from LRS. Caught exception: ',  $e->getMessage(), "\n";
         }
-
-        return $result;
     }
 
     /**
@@ -109,11 +118,18 @@ public function cmi5launch_send_request_to_lrs($data, $id) {
 
         // Sends the stream to the specified URL and stores results.
         // The false is use_include_path, which we dont want in this case, we want to go to the url.
-        $result = file_get_contents($url, false, $context);
-
-        $resultdecoded = json_decode($result, true);
+       try {
+            $result = file_get_contents($url, false, $context);
+            
+            $resultdecoded = json_decode($result, true);
+            return $resultdecoded;
+        } catch (\Throwable $e) {
+            echo 'Unable to communicate with LRS. Caught exception: ',  $e->getMessage(), "\n";
+            echo "<br>";
+            echo " Check LRS is up, username and password are correct, and LRS endpoint is correct.";
+        }
 
-        return $resultdecoded;
+        
     }
 
     /**
diff --git a/classes/local/setup_form.php b/classes/local/setup_form.php
new file mode 100644
index 0000000..d95a794
--- /dev/null
+++ b/classes/local/setup_form.php
@@ -0,0 +1,76 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Form for cmi5 connection, namely basic info - player url, user name and password. 
+ *
+ * @copyright  2023 Megan Bohland
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+// Moodleform is defined in formslib.php.
+require_once("$CFG->libdir/formslib.php");
+
+class setup_cmi5 extends moodleform {
+    // Add elements to form.
+    public function definition() {
+        // A reference to the form is stored in $this->form.
+        // A common convention is to store it in a variable, such as `$mform`.
+        $mform = $this->_form; // Don't forget the underscore!
+
+        // Add elements to your form. Second arg is the name of element
+        // Player url.
+        $mform->addElement('text', 'cmi5url', get_string('cmi5launchplayerurl', 'cmi5launch'));
+        // Set type of element.
+        $mform->setType('cmi5url', PARAM_NOTAGS);
+        // Default value.
+        $mform->setDefault('cmi5url', get_string('cmi5launchplayerurl_default', 'cmi5launch')); // The second arg here is the default value and appears in the text box.
+        // Add a rule to make this field required.
+        $mform->addRule('cmi5url', 'This is needed to connect to player', 'required'); 
+        // Add a help button with a help message.
+        $mform->addHelpButton('cmi5url', 'cmi5launchplayerurl', 'cmi5launch');
+
+        // User name.
+        $mform->addElement('text', 'cmi5name', get_string('cmi5launchbasicname', 'cmi5launch'));
+        // Set type of element.
+        $mform->setType('cmi5name', PARAM_NOTAGS);
+        // Default value.
+        $mform->setDefault('cmi5name', get_string('cmi5launchbasicname_default', 'cmi5launch')); // The second arg here is the default value and appears in the text box.
+        // Add a rule to make this field required.
+        $mform->addRule('cmi5name', 'This is needed to connect to player', 'required'); 
+        // Add a help button with a help message.
+        $mform->addHelpButton('cmi5name', 'cmi5launchbasicname', 'cmi5launch');
+        
+        // Password.
+        // Add elements to your form. Second arg is the name of element
+        $mform->addElement('text', 'cmi5password', get_string('cmi5launchbasepass', 'cmi5launch'));
+        // Set type of element.
+        $mform->setType('cmi5password', PARAM_NOTAGS);
+        // Default value.
+        $mform->setDefault('cmi5password', get_string('cmi5launchbasepass_default', 'cmi5launch')); // The second arg here is the default value and appears in the text box.
+        // Add a rule to make this field required.
+       $mform->addRule('cmi5password', 'This is needed to connect to player', 'required'); 
+       // Below is the help button, it sucks you have to push it to see the help text, but it is there
+       $mform->addHelpButton('cmi5password', 'cmi5launchbasepass', 'cmi5launch');
+
+         $this->add_action_buttons();
+    }
+
+    // Custom validation should be added here.
+    function validation($data, $files) {
+        return [];
+    }
+}
diff --git a/classes/local/tenant_form.php b/classes/local/tenant_form.php
new file mode 100644
index 0000000..b330bcf
--- /dev/null
+++ b/classes/local/tenant_form.php
@@ -0,0 +1,57 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Form for cmi5 connection, to enter tenant name. 
+ *
+ * @copyright  2023 Megan Bohland
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+// moodleform is defined in formslib.php
+require_once("$CFG->libdir/formslib.php");
+
+class setup_tenant extends moodleform {
+    
+    // Add elements to form.
+    public function definition() {
+        // A reference to the form is stored in $this->form.
+        // A common convention is to store it in a variable, such as `$mform`.
+        $mform = $this->_form; // Don't forget the underscore!
+
+        // Add elements to your form. Second arg is the name of element
+        $mform->addElement('text', 'cmi5tenant', get_string('cmi5launchtenantnamesetup', 'cmi5launch'));
+    // Add a help button with a help message.
+    $mform->addHelpButton('cmi5tenant', 'cmi5launchtenantnamesetup', 'cmi5launch');
+
+        // Set type of element.
+        $mform->setType('cmi5tenant', PARAM_NOTAGS);
+        // Default value.
+        $mform->setDefault('cmi5tenant', get_string('cmi5launchtenantname_default', 'cmi5launch')); // The second arg here is the default value and appears in the text box.
+        // Add a rule to make this field required.
+        $mform->addRule('cmi5tenant', 'This is needed to connect to player', 'required');
+
+        // $mform->addElement('header', 'cmi5instructions', 'Please enter a tenant name. When submitted it will create a tenant in the cmi5 player and automatically retrieve and save a bearer token for it as well.');
+        $mform->addElement('html', '<p>Please enter a tenant name. When submitted it will create a tenant in the cmi5 player and automatically retrieve and save a bearer token for it as well</p>'); 
+     
+        $this->add_action_buttons();
+    }
+
+    // Custom validation should be added here.
+    function validation($data, $files) {
+        return [];
+    }
+}
diff --git a/classes/local/token_form.php b/classes/local/token_form.php
new file mode 100644
index 0000000..c98e7f4
--- /dev/null
+++ b/classes/local/token_form.php
@@ -0,0 +1,56 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Form for cmi5 connection, and tenant and token. 
+ *
+ * @copyright  2023 Megan Bohland
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+// moodleform is defined in formslib.php
+require_once("$CFG->libdir/formslib.php");
+
+
+class setup_token extends moodleform {
+    // Add elements to form.
+    public function definition() {
+        // A reference to the form is stored in $this->form.
+        // A common convention is to store it in a variable, such as `$mform`.
+        $mform = $this->_form; // Don't forget the underscore!
+
+        // Elements are diff inputs in form
+
+
+        // Add elements to your form. Second arg is the name of element
+        $mform->addElement('text', 'cmi5token', get_string('cmi5launchtenanttoken', 'cmi5launch'));
+        // Set type of element.
+        $mform->setType('cmi5token', PARAM_NOTAGS);
+        // Default value.
+        $mform->setDefault('cmi5token', get_string('cmi5launchtenanttoken_default', 'cmi5launch')); // The second arg here is the default value and appears in the text box.
+        // These three go together for making one eleme
+       // $mform->addElement('button', 'generatetoken', 'Generate Token');
+        // Add a rule to make this field required.
+        $mform->addRule('cmi5token', 'This is needed to connect to player', 'required');
+
+        $this->add_action_buttons();
+    }
+
+    // Custom validation should be added here.
+    function validation($data, $files) {
+        return [];
+    }
+}
diff --git a/cmi5setup.php b/cmi5setup.php
new file mode 100644
index 0000000..4a7d7cb
--- /dev/null
+++ b/cmi5setup.php
@@ -0,0 +1,78 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Page to create cmi5 connection, and tenant and token. 
+ *
+ * @copyright  2023 Megan Bohland
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+
+// NEeded for moodle pae. sets up loabl
+require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
+
+// Tell moodle about our page, tell it what the url is.\\
+$PAGE->set_url('/mod/cmi5launch/setup.php');
+// Tell moodle the context, in this case the site context (it's system wide not a course or course page.)
+$PAGE->set_context(\context_system::instance());
+// Title tells what is on tab
+$PAGE->set_title(title: 'CMI5 Setup');
+
+//whenyou want to out put html use the moodle core output rendereer: often overridden in theme
+echo $OUTPUT->header();
+
+// Easier tom ake template as objec ttypecast to array 
+$templatecontext = (object) [
+    'texttodisplay' => 'This is the setup page for CMI5. Here you can create a new tenant for your CMI5 player. Please enter a name for your tenant below.',
+];
+// now render the mustache template we made.
+// takes template and template context - basically some vairables pasded into template and used to render stuff. 
+echo $OUTPUT->render_from_template('mod_cmi5launch/setup', $templatecontext);
+
+// When we first come here lets check if there are plugin settings for username, passowrd, and url, there should nt be so display the form.
+// If there are, then we should display the tenant form.
+// Retrieve the three settings from the database.
+$playerurl = get_config('cmi5launch', 'cmi5launchplayerurl');
+$playername = get_config('cmi5launch', 'cmi5launchbasicname');
+$playerpass = get_config('cmi5launch', 'cmi5launchbasepass');
+
+$playerpass = null;
+echo "<br>";
+echo"Settings are: ";
+echo $playerurl . " ";
+echo "<br>";
+echo $playername;
+echo "<br>";
+echo $playerpass;
+// If the settings are not set, then display the first form.
+if(!$playerurl || !$playername || !$playerpass){
+
+    redirect(url: $CFG->wwwroot . '/mod/cmi5launch/setupform.php', message: 'Cancelled');
+
+}
+
+
+
+echo $OUTPUT->footer();
+?>
+
+
+    <form id="gobackform" action="../../admin/settings.php" method="get">
+    <input id="section" name="section" type="hidden" value="modsettingcmi5launch">
+
+</form>
+
diff --git a/db/uninstall.php b/db/uninstall.php
index 62c4fa0..0261718 100755
--- a/db/uninstall.php
+++ b/db/uninstall.php
@@ -23,7 +23,6 @@
  */
 require_once(dirname(dirname(dirname(dirname(__FILE__)))).'/config.php');
 
-require_login($course, false, $cm);
 /**
  * Custom uninstallation procedure
  */
diff --git a/lang/en/cmi5launch.php b/lang/en/cmi5launch.php
index 90064ab..b05f872 100755
--- a/lang/en/cmi5launch.php
+++ b/lang/en/cmi5launch.php
@@ -35,6 +35,9 @@
 $string['modulename_help'] = 'A plug in for Moodle that allows the launch of cmi5 (xAPI) content which is then tracked to a separate LRS.';
 
 // Start Default LRS Admin Settings.
+// Header.
+$string['cmi5lrssettingsheader'] = 'LRS connection settings';
+
 $string['cmi5launchlrsfieldset'] = 'Default values for cmi5 launch link activity settings';
 $string['cmi5launchlrsfieldset_help'] = 'These are site-wide, default values used when creating a new activity. Each activity has the ability to override and provide alternative values.';
 
@@ -99,7 +102,11 @@
 $string['cmi5launchbasicname_default'] = '';
 
 $string['cmi5launchtenantname'] = 'cmi5 player: The cmi5 tenant username.';
+$string['cmi5launchtenantnamesetup'] = 'Please enter a value for cmi5 tenant name.';
+$string['cmi5launchtenantname'] = 'cmi5 player: The cmi5 tenant username.';
+$string['cmi5launchtenantnamesetup_help'] = ' The tenant name to be used in cmi5 player requests, and attached to the token. Alphanumeric characters and spaces accepted.';
 $string['cmi5launchtenantname_help'] = ' The tenant name attached to the token. Should only need to be used during initial setup. If for some reason the tenant name is changed a new bearer token will need to be generated. NOTE: changing a tenant name will require cmi5 launch link activites to need to be re-installed. Do not change name mid sessions! Data will be lost.';
+
 $string['cmi5launchtenantname_default'] = '';
 
 $string['cmi5launchbasepass'] = 'cmi5 player: basic password';
diff --git a/settings.php b/settings.php
index 2fbc097..3f98bff 100755
--- a/settings.php
+++ b/settings.php
@@ -17,7 +17,7 @@
 /* For global cmi5 settings  */
 
 /**
- * Defines the version of cmi5launch
+ * Cmi5 settings. Ability to update and change 
  *
  * This code fragment is called by moodle_needs_upgrading() and
  * /admin/index.php
@@ -28,32 +28,22 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-
-
-
 defined('MOODLE_INTERNAL') || die;
 
-use mod_cmi5launch\local\cmi5_connectors;
 ?>
 
 <script>
-// Function for popup window.
-function openprompt(){
 
-    var site = prompt("Please enter the tenant name:", "The cmi5 tenant name. Please enter a name you would like to use");
-    if (site != null) {
-      // Set the form paramters.
-      $('#variableName').val(site);
+    function totokenpage(){
 
         // Post it.
-        $('#settingform').submit();
+        $('#settingformtoken').submit();
     }
 
-}
-function totokenpage(){
+    function tosetup(){
 
-        // Post it.
-        $('#settingformtoken').submit();
+    // Post it.
+    $('#setupform').submit();
     }
 
 </script>
@@ -69,12 +59,15 @@ function totokenpage(){
     // From scorm grading stuff.
     $yesno = array(0 => get_string('no'),
                    1 => get_string('yes'));
-
+    
     // Default display settings.
     $settings->add(new admin_setting_heading('cmi5launch/cmi5launchlrsfieldset',
         get_string('cmi5launchlrsfieldset', 'cmi5launch'),
         get_string('cmi5launchlrsfieldset_help', 'cmi5launch')));
 
+        // LRS settings 
+    $settings->add(new admin_setting_heading('cmi5launch/cmi5lrssettings', get_string('cmi5lrssettingsheader', 'cmi5launch'), ''));
+
     $settings->add(new admin_setting_configtext_mod_cmi5launch('cmi5launch/cmi5launchlrsendpoint',
         get_string('cmi5launchlrsendpoint', 'cmi5launch'),
         get_string('cmi5launchlrsendpoint_help', 'cmi5launch'),
@@ -121,87 +114,88 @@ function totokenpage(){
         get_string('cmi5launchuseactoremail_help', 'cmi5launch'),
         1));
 
-    $settings->add(new admin_setting_heading('cmi5launch/cmi5launchsettings', get_string('cmi5launchsettingsheader', 'cmi5launch'), ''));
-
-
-    $settings->add(new admin_setting_configtext_mod_cmi5launch('cmi5launch/cmi5launchplayerurl',
-        get_string('cmi5launchplayerurl', 'cmi5launch'),
-        get_string('cmi5launchplayerurl_help', 'cmi5launch'),
-        get_string('cmi5launchplayerurl_default', 'cmi5launch'), PARAM_URL));
-
-    $setting = new admin_setting_configtext('cmi5launch/cmi5launchbasicname',
-        get_string('cmi5launchbasicname', 'cmi5launch'),
-        get_string('cmi5launchbasicname_help', 'cmi5launch'),
-        get_string('cmi5launchbasicname_default', 'cmi5launch'));
-    $settings->add($setting);
-
-    $setting = new admin_setting_configtext('cmi5launch/cmi5launchbasepass',
-        get_string('cmi5launchbasepass', 'cmi5launch'),
-        get_string('cmi5launchbasepass_help', 'cmi5launch'),
-        get_string('cmi5launchbasepass_default', 'cmi5launch'));
-    $settings->add($setting);
+    // The first time user logs in there will be a button for setup.
+    $showbutton = false;
+    // If tenantname or id is false, this is a first time setup we'll have the new button.
+    $tenantid = get_config('cmi5launch', 'cmi5launchtenantid');
+    $tenantname = get_config('cmi5launch', 'cmi5launchtenantname');
+    if ($tenantid == null || $tenantid == false) {
+        $showbutton = true;
 
+    }
+    $settings->add(new admin_setting_heading('cmi5launch/cmi5launchsettings', get_string('cmi5launchsettingsheader', 'cmi5launch'), ''));
 
-    // Buttons.
-    $linktotenant = "</br>
+  // We need to puck a diff thing for this button, we dont want the text baox available
+if ($showbutton) {
+    // show only a button, otherwise reg showing
+    $linktocmi5 = "</br>
     <p id=name >
         <div class='input-group rounded'>
-          <button class='btn btn-secondary' type='reset' name='tenantbutton' onclick='openprompt()'>
-            <span class='button-label'>Generate tenant</span>
+          <button class='btn btn-secondary' type='reset' name='cmi5button' onclick='tosetup()'>
+            <span class='button-label'>Enter cmi5 player info</span>
             </button>
         </div>
     </p>
       ";
-      $linktotoken = "</br>
-      <p id=name >
-          <div class='input-group rounded'>
-            <button class='btn btn-secondary' type='reset' name='tokenbutton' onclick='totokenpage()'>
-              <span class='button-label'>Generate bearer token</span>
-              </button>
-          </div>
-      </p>
-        ";
-      //$link ="<a href='http://www.google.com' target='_parent'><button>Click me !</button></a>";
-    
-      // Verify there is a tenant name and id. If there is, display it, if not allow them to make one.
-       // Retrieves the string if there or false if not.
-        $tenantname = get_config('cmi5launch', 'cmi5launchtenantname');
-        $tenantid = get_config('cmi5launch', 'cmi5launchtenantid');
-
-        // If niether are false.
-    if ($tenantname != null && $tenantid != null) {
-       
-        $todisplay  = "<b>Tenant name is: " . $tenantname . ". Tenant id is: " . $tenantid . "</b><div><br> The tenant name and ID have been set. They cannot be changed without causing problems with existing cmi5 launch link activities. To change, plugin must be uninstalled and reinstalled.</div> <div><br></div>";
-        $setting = new admin_setting_description('cmi5launchtenantmessage', "cmi5launch tenant name and id:",  $todisplay);
-        $settings->add($setting);
-    
+
+      //use this for the button instead of config text
+      $setting = new admin_setting_description('cmi5launchsetup', "<br><br>First time setup:", $linktocmi5);
+            $settings->add($setting);
+
     } else {
 
+        $settings->add(
+            new admin_setting_configtext_mod_cmi5launch(
+                'cmi5launch/cmi5launchplayerurl',
+                get_string('cmi5launchplayerurl', 'cmi5launch'),
+                get_string('cmi5launchplayerurl_help', 'cmi5launch'),
+                get_string('cmi5launchplayerurl_default', 'cmi5launch'),
+                PARAM_URL
+            )
+        );
+
         $setting = new admin_setting_configtext(
-            'cmi5launch/cmi5launchtenantname',
-            get_string('cmi5launchtenantname', 'cmi5launch'),
-            " " . get_string('cmi5launchtenantname_help', 'cmi5launch') . $linktotenant,
-            get_string('cmi5launchtenantname_default', 'cmi5launch')
+            'cmi5launch/cmi5launchbasicname',
+            get_string('cmi5launchbasicname', 'cmi5launch'),
+            get_string('cmi5launchbasicname_help', 'cmi5launch'),
+            get_string('cmi5launchbasicname_default', 'cmi5launch')
         );
         $settings->add($setting);
-    };
 
-    $setting = new admin_setting_configtext('cmi5launch/cmi5launchtenanttoken',
-        get_string('cmi5launchtenanttoken', 'cmi5launch'),
-        get_string('cmi5launchtenanttoken_help', 'cmi5launch') . $linktotoken,
-        get_string('cmi5launchtenanttoken_default', 'cmi5launch'));
-    $settings->add($setting);
+        $setting = new admin_setting_configtext(
+            'cmi5launch/cmi5launchbasepass',
+            get_string('cmi5launchbasepass', 'cmi5launch'),
+            get_string('cmi5launchbasepass_help', 'cmi5launch'),
+            get_string('cmi5launchbasepass_default', 'cmi5launch')
+        );
+        $settings->add($setting);
+
+     // Display tenant info
+        $todisplay = "<b>Tenant name is: " . $tenantname . ". Tenant id is: " . $tenantid . "</b><div><br> The tenant name and ID have been set. They cannot be changed without causing problems with existing cmi5 launch link activities. To change, plugin must be uninstalled and reinstalled.</div> <div><br></div>";
+        $setting = new admin_setting_description('cmi5launchtenantmessage', "cmi5launch tenant name and id:", $todisplay);
+        $settings->add($setting);
 
 
-    $setting=
-        new admin_setting_configselect_with_lock(
-            'restore/restore_replace_keep_roles_and_enrolments',
-            new lang_string('setting_keep_roles_and_enrolments', 'backup'),
-            new lang_string('config_keep_roles_and_enrolments', 'backup'),
-            array('value' => 0, 'locked' => 0),
-            array(1 => get_string('yes'), 0 => get_string('no'))
+        // Token generate button.
+        $linktotoken = "</br>
+        <p id=name >
+            <div class='input-group rounded'>
+              <button class='btn btn-secondary' type='reset' name='tokenbutton' onclick='totokenpage()'>
+                <span class='button-label'>Generate new bearer token</span>
+                </button>
+            </div>
+        </p>
+          ";
+        $setting = new admin_setting_configtext(
+            'cmi5launch/cmi5launchtenanttoken',
+            get_string('cmi5launchtenanttoken', 'cmi5launch'),
+            get_string('cmi5launchtenanttoken_help', 'cmi5launch') . $linktotoken,
+            get_string('cmi5launchtenanttoken_default', 'cmi5launch')
         );
-    $settings->add($setting);
+        $settings->add($setting);
+
+    }
+
 
     // MB.
     // Grade stuff I'm bringing over.
@@ -241,7 +235,13 @@ function totokenpage(){
 
     }
 
-    ?>  
+    ?> 
+    
+    <form id="setupform" action="../mod/cmi5launch/setupform.php" method="get">
+ 
+ </form>
+
+
     <form id="settingformtoken" action="../mod/cmi5launch/tokensetup.php" method="get">
  
 </form>
@@ -251,4 +251,4 @@ function totokenpage(){
         
         <input id="variableName" name="variableName" type="hidden" value="default">
 
-    </form>
+    </form>
\ No newline at end of file
diff --git a/setupform.php b/setupform.php
new file mode 100644
index 0000000..c33b0df
--- /dev/null
+++ b/setupform.php
@@ -0,0 +1,83 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Page to create cmi5 connection, and tenant and token. 
+ *
+ * @copyright  2023 Megan Bohland
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+
+// NEeded for moodle pae. sets up loabl
+require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
+// Include our class file
+require_once($CFG->dirroot.'/mod/cmi5launch/classes/local/setup_form.php');
+// Tell moodle about our page, tell it what the url is.\\
+$PAGE->set_url('/mod/cmi5launch/setupform.php');
+// Tell moodle the context, in this case the site context (it's system wide not a course or course page.)
+$PAGE->set_context(\context_system::instance());
+// Title tells what is on tab
+$PAGE->set_title(title: 'CMI5 Setup Form');
+
+// You want to initialze form in PHP before you echo to page. you dont want to rener while doing calcs
+
+// we want to display a form
+$mform = new setup_cmi5();
+
+// Form processing and displaying is done here.
+if ($mform->is_cancelled()) {
+    // If cancel was pressed, then redirect back to the settings page.
+    // in tutorial he goes back to the manage page, we will go back to settins page?
+    redirect(url: $CFG->wwwroot . '/admin/settings.php'. '?section=modsettingcmi5launch', message: "Cancelled");
+    //now he is dire ting to manage page which is equvalent to our cmi5setup page so we should redirect to that? why so many pages I wonder?
+  //  redirect(url: $CFG->wwwroot . '/mod/cmi5launch/cmi5setup.php', message: 'Cancelled');
+
+} else if ($fromform = $mform->get_data()) {
+    // When the form is submitted, and the data is successfully validated,
+    // the `get_data()` function will return the data posted in the form.
+
+    // REtrieve data from form.
+    $cmi5url = $fromform->cmi5url;
+    $cmi5name = $fromform->cmi5name;
+    $cmi5password = $fromform->cmi5password;
+
+    // Save data to the database, and configure the settings.
+    $resulturl = set_config('cmi5launchplayerurl', $cmi5url, $plugin = 'cmi5launch');
+    $resultname = set_config('cmi5launchbasicname', $cmi5name, $plugin = 'cmi5launch');
+    $resultpass = set_config('cmi5launchbasepass', $cmi5password, $plugin = 'cmi5launch');
+
+    
+    // As long as they are not null/false we can move on to the next form
+    if ($resulturl && $resultname && $resultpass){
+        //Move to next form
+        redirect(url: $CFG->wwwroot . '/mod/cmi5launch/tenantsetup.php', message: 'Successfully saved settings.');
+    }else{
+        // If for some reason they are null or false, then we will redirect back to the form.
+        redirect(url: $CFG->wwwroot . '/mod/cmi5launch/setupform.php', message: 'Failed to save to database. Please check database is accessable and try again.');
+
+    }
+
+};
+
+// Display page.
+echo $OUTPUT->header();
+// Display the form.
+$mform->display();
+
+echo $OUTPUT->footer();
+
+?>
diff --git a/templates/setup.mustache b/templates/setup.mustache
new file mode 100644
index 0000000..d90a1d2
--- /dev/null
+++ b/templates/setup.mustache
@@ -0,0 +1,27 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template mod_cmi5launch/setup
+
+
+    Example context (json):
+    {
+    }
+}}
+
+<h1> This si the setup page</h1>
+<p>{{texttodisplay}}</p>
\ No newline at end of file
diff --git a/tenantsetup.php b/tenantsetup.php
index 1300150..d429cbe 100644
--- a/tenantsetup.php
+++ b/tenantsetup.php
@@ -23,29 +23,22 @@
 
 use mod_cmi5launch\local\cmi5_connectors;
 
-?>
-
-<script>
 
-function goback(){
-   
-    // Retrieve the form and submit it.
-    let input = document.getElementById('gobackform');
-        input.submit();
-    }
-</script>
 
-<?php
 require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
 require_once($CFG->libdir.'/tablelib.php');
 require_once($CFG->dirroot.'/mod/cmi5launch/locallib.php');
 require_once($CFG->libdir.'/formslib.php');
 require_once($CFG->dirroot. '/reportbuilder/classes/local/report/column.php');
+// Include our class file
+require_once($CFG->dirroot.'/mod/cmi5launch/classes/local/tenant_form.php');
+// Tell moodle about our page, tell it what the url is.\\
+$PAGE->set_url('/mod/cmi5launch/tenantsetup.php');
+// Tell moodle the context, in this case the site context (it's system wide not a course or course page.)
+$PAGE->set_context(\context_system::instance());
+// Title tells what is on tab
+$PAGE->set_title(title: 'Creating a tenant');
 
-define('CMI5LAUNCH_REPORT_DEFAULT_PAGE_SIZE', 20);
-define('CMI5LAUNCH_REPORT_ATTEMPTS_ALL_STUDENTS', 0);
-define('CMI5LAUNCH_REPORT_ATTEMPTS_STUDENTS_WITH', 1);
-define('CMI5LAUNCH_REPORT_ATTEMPTS_STUDENTS_WITH_NO', 2);
 $PAGE->requires->jquery();
 
 global $cmi5launch, $CFG;
@@ -54,84 +47,88 @@ function goback(){
 $cmi5helper = new cmi5_connectors;
 $createtenant = $cmi5helper->cmi5launch_get_create_tenant();
 
-// Retrieve the name entered in previous page prompt.
-$fromsettings = required_param('variableName', PARAM_TEXT);
+// Instantiate form.
+$mform = new setup_tenant();
+
+// Form processing and displaying is done here.
+if ($mform->is_cancelled()) {
+
+    // If they cancel, redirect back to the setup page.
+    redirect(url: $CFG->wwwroot . '/mod/cmi5launch/setupform.php', message: 'Cancelled');
 
-// Return link/button to settings page.
- $link = "</br>
- <p id=name >
-     <div class='input-group rounded'>
-       <button class='btn btn-secondary' name='tenantbutton' onclick='goback()'>
-         <span class='button-label'>OK</span>
-         </button>
-     </div>
- </p>";
+} else if ($fromform = $mform->get_data()) {
 
- // Maybe we can have a thing here if fromsettings equals a keyword, say token, call token making stuff.
- // after all it doesn't need input from user. but we should write a catch to warn there is no tenant
- // because it does need a tenant to make a token.
+    // Retrieve username.
+    $cmi5tenant = $fromform->cmi5tenant;
 
- 
-if ($fromsettings != null) {
+    if ($cmi5tenant != null) {
 
+        // Make the new tenant and grab results.
+        // here is an aarea that could fail. Should we try catch or is that covered in the creat tenant call?
+        //TODO
+        $tenant = $createtenant($cmi5tenant);
 
-    // Make the new tenant and grab results.
-    $tenant = $createtenant($fromsettings);
+        // The return response should be json and have 'id' and 'code' 
+        $response = $tenant;
 
-    // The return response should be json and have 'id' and 'code' 
-    $response = $tenant;
+        // Save the code as the tenant name and ID as ID.
+        $name = $response['code'];
+        $id = $response['id'];
 
-    // Save the code as the tenant name and ID as ID.
-    $name = $response['code'];
-    $id = $response['id'];
+        echo "Tenant code: " . $name . "<br>";
+        echo "Tenant ID: " . $id . "<br>";
 
-    echo "Tenant code: " . $name . "<br>";
-    echo "Tenant ID: " . $id . "<br>";
+        // check we have a tenant and is, and save them to db for later retrieval (particularly id)
+        if ($name != null && $id != null) {
 
-    // check we have a tenant and is, and save them to db for later retrieval (particularly id)
-    if ($name != null && $id != null) {
 
+            $result = set_config('cmi5launchtenantname', $name, $plugin = 'cmi5launch');
 
-        $result = set_config('cmi5launchtenantname', $name, $plugin = 'cmi5launch');
-        
-        // But how can we save the id to DB when this page has no access to cmi5launch
-        // What if te id is saved as a invisible settings? 
-        // Is that a thing?
-        // But do we need an id? Probably not cause like...
-        // It saves over itself and we don't need to keep records do we?
-        // But then we would need to look it up with query right? Might be better to just save it someoien
-        // Lets see if we can just make a setting here!
-        $idresult = set_config('cmi5launchtenantid', $id, $plugin = 'cmi5launch');
+            $idresult = set_config('cmi5launchtenantid', $id, $plugin = 'cmi5launch');
 
-        if($idresult && $result ){
-            
-            // If result is true then redirect back to settings page.
-            $settingurl = new moodle_url($CFG->wwwroot . '/' . 'admin/settings.php', array('section' => 'modsettingcmi5launch'));
-            
-            redirect($settingurl, 'Successfully made and saved new tenant', 10);
+            if ($idresult && $result) {
 
+                // If result is true then redirect back to settings page.
+                // except now we dont want to redirect to  settings! We want to go to 
+                // The TOKEN setup form
+                // Wait, maybe it should do this automatically? Like they don't need to enter it sine we are making this make it for them, and we don't need them to
+                // press a button on a new form JUST to make a token. Lets do it behind the scenes and they can retrieve it if they want through an 
+                //echo or settings page? 
+//                $settingurl = new moodle_url($CFG->wwwroot . '/' . 'admin/settings.php', array('section' => 'modsettingcmi5launch'));
+                redirect(url: $CFG->wwwroot . '/mod/cmi5launch/tokensetup.php', message: 'Tenant made and saved successfully');
+
+               // redirect($settingurl, 'Successfully made and saved new tenant', 10);
+
+            } else {
+                echo "Failed to save tenant to DB.";
+                echo "<br>";
+                echo "Tenant name: " . $name . " failed to save as setting. With result " . $result . "<br>";
+                //if fail shoudl we freeze and alert user with a window towith error message
+
+                echo $link;
+            }
         } else {
-            echo "Failed to save tenant to DB.";
-            echo "<br>";
-            echo "Tenant name: " . $name . " failed to save as setting. With result " . $result . "<br>";
-            //if fail shoudl we freeze and alert user with a window towith error message
+
+            echo "Failed to make tenant. Check connection to player and tenant name (cannot reuse old tenant names).";
 
             echo $link;
         }
     } else {
 
-        echo "Failed to make tenant. Check connection to player and tenant name (cannot reuse old tenant names).";
+        // If there is no tenant name then alert user, when they click to clear take them back to settings page.
+        echo "Tenant name not retrieved or blank. Please try again.";
 
         echo $link;
+
     }
-} else {
-    
-    // If there is no tenant name then alert user, when they click to clear take them back to settings page.
-    echo "Tenant name not retrieved or blank. Please try again.";
- 
-    echo $link;
 
 }
+;
+echo $OUTPUT->header();
+
+// Display the form.
+$mform->display();
+echo $OUTPUT->footer();
 ?>
 
 
diff --git a/tokensetup.php b/tokensetup.php
index ca30cc3..4ee112d 100644
--- a/tokensetup.php
+++ b/tokensetup.php
@@ -23,25 +23,21 @@
 
 use mod_cmi5launch\local\cmi5_connectors;
 
-?>
-
-<script>
 
-function goback(){
-   
-    // Retrieve the form and submit it.
-    let input = document.getElementById('gobackform');
-        input.submit();
-    }
-</script>
 
-<?php
 require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
 require_once($CFG->libdir.'/tablelib.php');
 require_once($CFG->dirroot.'/mod/cmi5launch/locallib.php');
 require_once($CFG->libdir.'/formslib.php');
 require_once($CFG->dirroot. '/reportbuilder/classes/local/report/column.php');
-
+// Include our class file
+require_once($CFG->dirroot.'/mod/cmi5launch/classes/local/token_form.php');
+// Tell moodle about our page, tell it what the url is.\\
+$PAGE->set_url('/mod/cmi5launch/tokensetup.php');
+// Tell moodle the context, in this case the site context (it's system wide not a course or course page.)
+$PAGE->set_context(\context_system::instance());
+// Title tells what is on tab
+$PAGE->set_title(title: 'Creating a tenant');
 define('CMI5LAUNCH_REPORT_DEFAULT_PAGE_SIZE', 20);
 define('CMI5LAUNCH_REPORT_ATTEMPTS_ALL_STUDENTS', 0);
 define('CMI5LAUNCH_REPORT_ATTEMPTS_STUDENTS_WITH', 1);
@@ -54,18 +50,6 @@ function goback(){
 $cmi5helper = new cmi5_connectors;
 $gettoken = $cmi5helper->cmi5launch_get_retrieve_token();
 
-
-// Return link/button to settings page.
- $link = "</br>
- <p id=name >
-     <div class='input-group rounded'>
-       <button class='btn btn-secondary' name='tokenbutton' onclick='goback()'>
-         <span class='button-label'>OK</span>
-         </button>
-     </div>
- </p>";
-
-
  // Before a token can be made, there must be a tenant name and id, so verify these exist, if not throw error.
 
  // Retrieves the string if there or false if not.
@@ -117,6 +101,14 @@ function goback(){
     echo $link;
 
 }
+
+
+//whenyou want to out put html use the moodle core output rendereer: often overridden in theme
+echo $OUTPUT->header();
+ 
+// we want to display a form
+$mform = new setup_token();
+echo $OUTPUT->footer();
 ?>