diff --git a/homelab/kavita/default.nix b/homelab/kavita/default.nix
new file mode 100644
index 0000000..f9a2727
--- /dev/null
+++ b/homelab/kavita/default.nix
@@ -0,0 +1,8 @@
+{ config, pkgs, lib, ... }:
+
+{
+  services.kavita = {
+     enable = true;
+     # tokenKeyFile = "/home/aaronh/TokenKey"; # Update depending on the setup
+  };
+}
diff --git a/hosts/x86_64/EDI/configuration.nix b/hosts/x86_64/edi/configuration.nix
similarity index 50%
rename from hosts/x86_64/EDI/configuration.nix
rename to hosts/x86_64/edi/configuration.nix
index b7d19c6..ff09c3c 100644
--- a/hosts/x86_64/EDI/configuration.nix
+++ b/hosts/x86_64/edi/configuration.nix
@@ -7,11 +7,34 @@
         #./home-assistant.nix
     ];
 
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader = {
+    systemd-boot.enable = true;
+    efi.canTouchEfiVariables = true;
+  };
+
   boot.kernelParams = [ "console=tty0" ];
   boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
 
+  # You can find the swraid ARRAY information with this command 
+  # sudo mdadm --detail --scan >> mdadm.conf
+  # Now just copy that information into the line
+
+  # The MAILADDR is to fix a warning for swraid
+  
+  boot.swraid = {
+     enable = true;
+     mdadmConf = ''
+        ARRAY /dev/md/edi:DATA metadata=1.2 UUID=f0384881:84c12f70:3dcad802:653ccc30
+        MAILADDR root
+     '';
+  };
+
+  fileSystems = {
+     "/home/aaronh/DATA" = {
+        device = "/dev/md127";
+     };
+  };
+
   nix.settings.extra-platforms = [ "aarch64-linux" ];  
   nix.buildMachines = [{ 
      hostName = "localhost";
@@ -21,6 +44,15 @@
      maxJobs = 8;
   }];
 
+  # Define user accounts
+  users.users.aaronh = {
+    description = "Aaron Honeycutt";
+    home = "/home/aaronh";
+    extraGroups = [ "wheel" "networkmanager" "adm"];
+    isNormalUser = true;
+    hashedPassword = "$6$aAcbLtqiqzySifls$jdKMOQjoWITHD/dWNNZVUH/qNc6aoJ7v4zYofi0U7IJSVTbmOfChS3mzaJbp57AodjdPNKPrnrip8Nlh2Qanx.";
+  };
+
   networking.hostName = "EDI";
   networking.firewall = {
     enable = true;
@@ -32,6 +64,7 @@
   ];
 
   # Enable the OpenSSH daemon.
+  services.openssh.enable = true;
   services.openssh.settings = {
     PermitRootLogin = "no";
   };