diff --git a/analytics/meta/embed.php b/analytics/meta/embed.php
deleted file mode 100644
index e2c2def2..00000000
--- a/analytics/meta/embed.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-include '../../vendor/autoload.php';
-
-// The url of the metabase installation
-$metabaseUrl = '[https://viz.hispmd.merqconsultancy.org]';
-// The secret embed key from the admin settings screen
-$metabaseKey = '[c7242586ae89ceb5c0dd2ecab564b09c9b4f2b6e78b1491c7e8271f3ba2aa6cd]';
-// The id of the dashboard (from the url)
-$dashboardId = 2;
-// Any parameters to pass to the dashboard
-//$params = ['date' => 'past26weeks'];
-
-$metabase = new \Metabase\Embed($metabaseUrl, $metabaseKey);
-// Generate the HTML to create an iframe with the embedded dashboard
-echo $metabase->dashboardIframe($dashboardId, $params);
-?>
\ No newline at end of file
diff --git a/analytics/meta/metabase.php b/analytics/meta/metabase.php
deleted file mode 100644
index 8ba1218b..00000000
--- a/analytics/meta/metabase.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-
-namespace Metabase;
-
-use DateInterval;
-use DateTimeImmutable;
-use Lcobucci\JWT\Configuration;
-use Lcobucci\JWT\Signer\Key\InMemory;
-use Lcobucci\JWT\Signer\Hmac\Sha256;
-use Lcobucci\JWT\Token;
-
-/**
- * Convenience class to embed Metabase dashboards and questions
- */
-class Embed
-{
-    private $url;
-    private $key;
-
-    public $border;
-    public $title;
-    public $theme;
-
-    public $width;
-    public $height;
-
-    private $jwtConfig;
-
-    private $expirationSeconds;
-
-    /**
-     * Default constructor
-     *
-     * @param string $url    Base url for the Metabase installation
-     * @param string $key    Secret Metabase key
-     * @param bool   $title  Show dashboard/question title (default = false)
-     * @param string $width  Set css width of dashboard/question (default = 100%)
-     * @param string $height Set css height of dashboard/question (default = 800)
-     * @param bool   $border Show dashboard/question border (default = true)
-     * @param int $expirationSeconds Set jwt token expiration in seconds (default = null)
-     */
-    public function __construct($url, $key, $title = false, $width = '100%', $height = '800', $border = true, $expirationSeconds = null)
-    {
-        $this->url = $url;
-        $this->key = $key;
-        $this->border = $border;
-        $this->title = $title;
-        $this->width = $width;
-        $this->height = $height;
-        $this->expirationSeconds = $expirationSeconds;
-
-        $this->jwtConfig = Configuration::forSymmetricSigner(new Sha256(), InMemory::plainText($this->key));
-    }
-
-    /**
-     * Get the embed URL for a Metabase question
-     *
-     * @param int   $questionId The id of the question to embed
-     * @param array $params     An associate array with variables to be passed to the question
-     *
-     * @return string Embed URL
-     */
-    public function questionUrl($questionId, $params = [])
-    {
-        return $this->url('question', $questionId, $params);
-    }
-
-    /**
-     * Get the embed URL for a Metabase dashboard
-     *
-     * @param int   $dashboardId The id of the dashboard to embed
-     * @param array $params      An associate array with variables to be passed to the dashboard
-     *
-     * @return string Embed URL
-     */
-    public function dashboardUrl($dashboardId, $params = [])
-    {
-        return $this->url('dashboard', $dashboardId, $params);
-    }
-
-    /**
-     * Use JWT to encode tokens
-     *
-     * @param array $resource Resource to encode (question or dashboard)
-     * @param array $params   An associate array with variables to be passed to the dashboard
-     *
-     * @return string Token
-     */
-    private function encode($resource, $params)
-    {
-        $jwt = $this->jwtConfig->builder();
-        $jwt->withClaim('resource', $resource);
-        if (empty($params)) {
-            $jwt->withClaim('params', (object)[]);
-        } else {
-            $jwt->withClaim('params', $params);
-        }
-        if (!is_null($this->expirationSeconds)) {
-            $jwt->expiresAt((new DateTimeImmutable())->modify('+' . $this->expirationSeconds . ' seconds'));
-        }
-
-        return $jwt->getToken($this->jwtConfig->signer(), $this->jwtConfig->signingKey());
-    }
-
-    protected function url($resource, $id, $params)
-    {
-        // Generate auth token, using JWT
-        $token = $this->encode([$resource => $id], $params);
-
-        // Generate embed URL
-        $url = $this->url . '/embed/' . $resource . '/' . $token->toString() . '#';
-
-        // Should border be included
-        if ($this->border) {
-            $url .= 'bordered=true&';
-        } else {
-            $url .= 'bordered=false&';
-        }
-
-        // Should title be included
-        if ($this->title) {
-            $url .= 'titled=true&';
-        } else {
-            $url .= 'titled=false&';
-        }
-
-        // Set selected theme (if any)
-        if (!empty($this->theme)) {
-            $url .= 'theme=' . $this->theme . '&';
-        }
-
-        // Remove trailing &
-        $url = rtrim($url, '&');
-
-        return $url;
-    }
-
-    /**
-     * Generate the HTML to embed a question iframe with a given question id.
-     * It assumes no iframe border. Size can be manipulated via
-     * class $width/$height
-     *
-     * @param int   $questionId The id of the question to embed
-     * @param array $params     An associate array with variables to be passed to the question
-     *
-     * @return string Code to embed
-     */
-    public function questionIFrame($questionId, $params = [])
-    {
-        $url = $this->questionUrl($questionId, $params);
-        return $this->iframe($url);
-    }
-
-    /**
-     * Generate the HTML to embed a dashboard iframe with a given dashboard id.
-     * It assumes no iframe border. Size can be manipulated via
-     * class $width/$height
-     *
-     * @param int   $dashboardId The id of the dashboard to embed
-     * @param array $params      An associate array with variables to be passed to the dashboard
-     *
-     * @return string Code to embed
-     */
-    public function dashboardIFrame($dashboardId, $params = [])
-    {
-        $url = $this->dashboardUrl($dashboardId, $params);
-        return $this->iframe($url);
-    }
-
-    /**
-     * Generate the HTML to embed an iframe with a given URL.
-     * It assumes no iframe border. Size can be manipulated via
-     * class $width/$height
-     *
-     * @param string $iframeUrl The URL to create an iframe for
-     *
-     * @return string Code to embed
-     */
-    protected function iframe($iframeUrl)
-    {
-        return '<iframe
-            src="' . $iframeUrl . '"
-            frameborder="0"
-            width="' . $this->width . '"
-            height="' . $this->height . '"
-            allowtransparency></iframe>';
-    }
-}
\ No newline at end of file
diff --git a/analytics/tests/dashboard.html b/analytics/tests/dashboard.html
new file mode 100644
index 00000000..6056ce48
--- /dev/null
+++ b/analytics/tests/dashboard.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>TESTING Metabase Dashboard TEMPLATE</title>
+    <style>
+        html,
+        body {
+            margin: 0;
+            padding: 0;
+            height: 100%;
+            width: 100%;
+        }
+
+        iframe {
+            border: none;
+            width: 100%;
+            height: 100vh;
+            position: absolute;
+            top: 0;
+            left: 0;
+        }
+    </style>
+</head>
+
+<body>
+    <iframe id="metabase-iframe" src="" allowtransparency></iframe>
+    <script>
+        // Set dashboard ID dynamically
+        var dashboardId = 1; // Replace with dynamic ID if needed
+
+        // Make a request to the PHP server to generate the iframe URL for the selected dashboard ID
+        fetch('metabase.php?dashboardId=' + dashboardId)
+            .then(response => response.text())
+            .then(iframeUrl => {
+                document.getElementById('metabase-iframe').src = iframeUrl;
+            });
+    </script>
+</body>
+<!--If any Questions Please Contact https://github.com/MIKEINTOSHSYSTEMS -->
+
+</html>
\ No newline at end of file
diff --git a/analytics/meta/dashboard.php b/analytics/tests/dashboard.php
similarity index 100%
rename from analytics/meta/dashboard.php
rename to analytics/tests/dashboard.php
diff --git a/analytics/tests/index.php b/analytics/tests/index.php
index de69ced5..963d6c64 100644
--- a/analytics/tests/index.php
+++ b/analytics/tests/index.php
@@ -1,6 +1,6 @@
 <html>
     
-
+<!--
 <iframe
     src="https://viz.hispmd.merqconsultancy.org/public/dashboard/d918846e-4cd4-4909-837e-73c99e8f85d8"
     frameborder="0"
@@ -8,4 +8,7 @@
     height="100%"
     allowtransparency
 ></iframe>
-    </html>
\ No newline at end of file
+
+-->
+<h1>Analytics Testing</h1>
+</html>
\ No newline at end of file
diff --git a/analytics/tests/metabase.php b/analytics/tests/metabase.php
new file mode 100644
index 00000000..5f88122a
--- /dev/null
+++ b/analytics/tests/metabase.php
@@ -0,0 +1,46 @@
+<?php
+require '../../vendor/autoload.php';
+
+use Lcobucci\JWT\Configuration;
+use Lcobucci\JWT\Signer\Hmac\Sha256;
+use Lcobucci\JWT\Signer\Key\InMemory;
+
+// Metabase parameters
+$metabaseSiteUrl = 'https://viz.hispmd.merqconsultancy.org'; //replace with the right metabase url
+$metabaseSecretKey = '25893c16e94ac3c193ad2bfa3b2dbdba5ea0e663de266dc7649ffc9216e09865'; // Replace with your Metabase secret key
+
+// Get the dashboard ID from the query parameter
+$dashboardId = isset($_GET['dashboardId']) ? (int)$_GET['dashboardId'] : 0;
+
+if ($dashboardId <= 0) {
+    die('Invalid dashboard ID.');
+}
+
+// Create JWT configuration with HMAC SHA-256 signer
+$config = Configuration::forSymmetricSigner(
+    new Sha256(),
+    InMemory::plainText($metabaseSecretKey)
+);
+
+// Create the token
+$now = new DateTimeImmutable();
+$exp = $now->add(new DateInterval('PT10M')); // Token expires in 10 minutes
+
+// You can add parameters if needed for filtering or other purposes
+$params = (object)[];
+
+$token = $config->builder()
+    ->issuedBy($metabaseSiteUrl) // Configures the issuer (iss claim)
+    ->issuedAt($now) // Configures the time that the token was issued (iat claim)
+    ->expiresAt($exp) // Configures the expiration time of the token (exp claim)
+    ->withClaim('resource', ['dashboard' => $dashboardId]) // Add resource claim
+    ->withClaim('params', $params) // Add params claim as an object
+    ->getToken($config->signer(), $config->signingKey()); // Retrieves the generated token
+
+// Generate iframe URL
+$iframeUrl = $metabaseSiteUrl . "/embed/dashboard/" . $token->toString() . "#theme=transparent&bordered=false&titled=true";
+
+// Return the iframe URL
+echo htmlspecialchars($iframeUrl, ENT_QUOTES, 'UTF-8');
+// If any Questions Please Contact https://github.com/MIKEINTOSHSYSTEMS 
+?>
diff --git a/api/meta/base.php b/api/meta/base.php
new file mode 100644
index 00000000..5f88122a
--- /dev/null
+++ b/api/meta/base.php
@@ -0,0 +1,46 @@
+<?php
+require '../../vendor/autoload.php';
+
+use Lcobucci\JWT\Configuration;
+use Lcobucci\JWT\Signer\Hmac\Sha256;
+use Lcobucci\JWT\Signer\Key\InMemory;
+
+// Metabase parameters
+$metabaseSiteUrl = 'https://viz.hispmd.merqconsultancy.org'; //replace with the right metabase url
+$metabaseSecretKey = '25893c16e94ac3c193ad2bfa3b2dbdba5ea0e663de266dc7649ffc9216e09865'; // Replace with your Metabase secret key
+
+// Get the dashboard ID from the query parameter
+$dashboardId = isset($_GET['dashboardId']) ? (int)$_GET['dashboardId'] : 0;
+
+if ($dashboardId <= 0) {
+    die('Invalid dashboard ID.');
+}
+
+// Create JWT configuration with HMAC SHA-256 signer
+$config = Configuration::forSymmetricSigner(
+    new Sha256(),
+    InMemory::plainText($metabaseSecretKey)
+);
+
+// Create the token
+$now = new DateTimeImmutable();
+$exp = $now->add(new DateInterval('PT10M')); // Token expires in 10 minutes
+
+// You can add parameters if needed for filtering or other purposes
+$params = (object)[];
+
+$token = $config->builder()
+    ->issuedBy($metabaseSiteUrl) // Configures the issuer (iss claim)
+    ->issuedAt($now) // Configures the time that the token was issued (iat claim)
+    ->expiresAt($exp) // Configures the expiration time of the token (exp claim)
+    ->withClaim('resource', ['dashboard' => $dashboardId]) // Add resource claim
+    ->withClaim('params', $params) // Add params claim as an object
+    ->getToken($config->signer(), $config->signingKey()); // Retrieves the generated token
+
+// Generate iframe URL
+$iframeUrl = $metabaseSiteUrl . "/embed/dashboard/" . $token->toString() . "#theme=transparent&bordered=false&titled=true";
+
+// Return the iframe URL
+echo htmlspecialchars($iframeUrl, ENT_QUOTES, 'UTF-8');
+// If any Questions Please Contact https://github.com/MIKEINTOSHSYSTEMS 
+?>
diff --git a/api/meta/index.php b/api/meta/index.php
new file mode 100644
index 00000000..78e80ba2
--- /dev/null
+++ b/api/meta/index.php
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>TESTING Metabase Dashboard TEMPLATE</title>
+    <style>
+        html, body {
+            margin: 0;
+            padding: 0;
+            height: 100%;
+            width: 100%;
+        }
+        iframe {
+            border: none;
+            width: 100%;
+            height: 100vh;
+            position: absolute;
+            top: 0;
+            left: 0;
+        }
+    </style>
+</head>
+<body>
+    <iframe
+        id="metabase-iframe"
+        src=""
+        allowtransparency></iframe>
+    <script>
+        // Set dashboard ID dynamically
+        var dashboardId = 1; // Replace with dynamic ID if needed
+
+        // Make a request to the PHP server to generate the iframe URL for the selected dashboard ID
+        fetch('base.php?dashboardId=' + dashboardId)
+            .then(response => response.text())
+            .then(iframeUrl => {
+                document.getElementById('metabase-iframe').src = iframeUrl;
+            });
+    </script>
+</body>
+        <!--If any Questions Please Contact https://github.com/MIKEINTOSHSYSTEMS -->
+</html>