diff --git a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh
index 3e84dc5..538aa4f 100755
--- a/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh
+++ b/file_fixes_and_new_services/Sovran_SystemsOS_File_Fixes_And_New_Services.sh
@@ -56,6 +56,14 @@ rm -rf /home/free/Downloads/add_external_backup_app.sh
 
 rm -rf /home/free/Downloads/update-agenix.sh
 
+#### SCRIPT 7 ####
+
+/run/current-system/sw/bin/wget "https://git.sovransystems.com/Sovran_Systems/Sovran_SystemsOS/raw/branch/main/file_fixes_and_new_services/element-calling_haven"
+
+/run/current-system/sw/bin/bash /home/free/Downloads/element-calling_haven.sh
+
+rm -rf /home/free/Downloads/element-calling_haven.sh
+
 
 #### REMOVAL OF MAIN SCRIPT ####
 
diff --git a/file_fixes_and_new_services/element-calling_haven.sh b/file_fixes_and_new_services/element-calling_haven.sh
new file mode 100644
index 0000000..331a693
--- /dev/null
+++ b/file_fixes_and_new_services/element-calling_haven.sh
@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+   
+function log_console () {
+  echo "`date` :: $1" >> /var/lib/beacons/awesome.log
+  echo $1
+}
+
+
+#### CHECK TO SEE IF IT HAS BEEN RUN BEFORE ####
+
+FILE=/var/lib/beacons/file_fixes_and_new_services/element-calling_haven/completed
+
+   if [ -e $FILE ]; then
+
+      /run/current-system/sw/bin/echo "File Found :), No Need to Run ... Exiting"
+         
+      exit 1
+
+   fi
+
+
+#### CREATE INITIAL TAG ####
+
+/run/current-system/sw/bin/mkdir -p /var/lib/beacons/file_fixes_and_new_services/element-calling_haven ; touch /var/lib/beacons/file_fixes_and_new_services/element-calling_haven/started
+
+   if [[ $? != 0 ]]; then
+
+      /run/current-system/sw/bin/echo "Could Not Create Initial Tag"
+
+      exit 1
+
+   fi
+
+
+#### MAIN SCRIPT ####
+
+  touch /var/lib/domains/haven
+  touch /var/lib/domains/element-calling
+
+   if [[ $? != 0 ]]; then
+
+      /run/current-system/sw/bin/echo "Could Not Run element-calling_haven"
+
+      exit 1
+
+   fi
+
+
+
+#### CREATE COMPELETE TAG ####
+
+/run/current-system/sw/bin/touch /var/lib/beacons/file_fixes_and_new_services/element-calling_haven/completed
+
+   if [[ $? != 0 ]]; then
+
+      /run/current-system/sw/bin/echo "Could Not Create Completed Tag"
+
+      exit 1
+
+   fi
+
+      
+exit 0
diff --git a/modules/element-calling.nix b/modules/element-calling.nix
index 592d1cd..04b7c40 100755
--- a/modules/element-calling.nix
+++ b/modules/element-calling.nix
@@ -6,14 +6,10 @@ in
 
 lib.mkIf config.sovran_systemsOS.features.element-calling {
 
-  systemd.tmpfiles.rules = lib.mkIf config.sovran_systemsOS.features.element-calling [
+  systemd.tmpfiles.rules = [
     "d /var/lib/domains/element-calling 0750 caddy php -"
   ];
 
-  services.element-call = lib.mkIf config.sovran_systemsOS.features.element-calling {
-    server_name = personalization.matrix_url or null;
-  };
-
   ####### CADDY CONFIGS #######
   "${personalization.matrix_url}" = lib.mkForce {
     extraConfig = ''