diff --git a/en1.yml b/en1.yml
index cd63545..703f356 100644
--- a/en1.yml
+++ b/en1.yml
@@ -2,108 +2,106 @@
 all:
   vars:
     ansible_user: ansible
-    protected_users: ["root", "ansible"]
-    enable_gui: false
-    enable_ssh: true
-    enable_ssh_password_auth: false
-    disable_sudo_password: false
-    enable_networkd: true
+    omni_protected_users: ["root", "ansible"]
+    omni_domain: net.enp.one
   children:
     servers:
       vars:
-        required_os: centos_8
+        omni_os:
+          name: centos
+          version_major: "8"
       hosts:
         jupiter:
           ansible_host: jupiter.net.enp.one
-          description: EN1 System Control Server
-          local_targets: ["core", "network"]
-          networking:
+          omni_description: EN1 System Control Server
+          omni_local_targets: ["core", "network"]
+          omni_networking:
             eno1:
               dhcp: true
             eno2:
               addresses: ["192.168.255.10/24"]
-        romulus:
-          ansible_host: romulus.net.enp.one
-          description: EN1 Hypervisor/Datastore
-          local_targets: ["core", "vms"]
-          networking:
-            em2:
-              addresses: ["192.168.255.20/24"]
-        remus:
-          ansible_host: remus.net.enp.one
-          description: EN1 Hypervisor/Datastore
-          local_targets: ["core", "vms"]
-          em2:
-            addresses: ["192.168.255.30/24"]
-        novis:
-          ansible_host: novis.tre2.local
-          description: EN1 Backup Storage
-          local_targets: ["core", "datastore"]
-      children:
-        vms:
-          vars:
-            disable_sudo_password: true
-            required_os: centos_8
-          hosts:
-            gitea:
-              ansible_host: vm-host-gitea.net.enp.one
-              description: "Application Host: Gitea VCS"
-              local_targets: ["admin", "vcs"]
-              networking:
-                eth0:
-                  dhcp: true
-            plex:
-              ansible_host: vm-host-plex.net.enp.one
-              description: "Application Host: Plex Media Server"
-              local_targets: ["admin", "plx"]
-              networking:
-                eth0:
-                  dhcp: true
-            bitwarden:
-              ansible_host: vm-host-bitwarden.net.enp.one
-              description: "Application Host: Bitwarden Password Manager"
-              local_targets: ["admin", "ssv"]
-              networking:
-                eth0:
-                  dhcp: true
-            nextcloud:
-              ansible_host: vm-host-nextcloud.net.enp.one
-              description: "Application Host: Nextcloud Web Storage"
-              local_targets: ["admin", "cfs"]
-              networking:
-                eth0:
-                  dhcp: true
-    workstations:
-      vars:
-        enable_gui: true
-        enable_ssh: false
-        enable_networkd: false
-      hosts:
-        omega:
-          ansible_host: localhost
-          description: Last
-          required_os: centos_7
-          local_targets: ["admin", "recovery"]
-        vigil-nox:
-          ansible_host: localhost
-          required_os: fedora_31
-          description: Watchman
-          local_targets: ["admin", "desktop"]
-        serico-nox:
-          ansible_host: localhost
-          description: Silk
-          required_os: fedora_31
-          local_targets: ["admin", "desktop"]
-        inerro:
-          ansible_host: localhost
-          description: Wanderer
-          required_os: fedora_31
-          local_targets: ["admin", "desktop"]
-network:
-  hosts:
-    router:
-      ansible_host: router.net.enp.one
-      ansible_network_os: edgeos
-      ansible_connection: network_cli
-      description: EN1 Core Gateway
-      targets: ["admin", "network"]
+#         romulus:
+#           ansible_host: romulus.net.enp.one
+#           description: EN1 Hypervisor/Datastore
+#           local_targets: ["core", "vms"]
+#           networking:
+#             em2:
+#               addresses: ["192.168.255.20/24"]
+#         remus:
+#           ansible_host: remus.net.enp.one
+#           description: EN1 Hypervisor/Datastore
+#           local_targets: ["core", "vms"]
+#           em2:
+#             addresses: ["192.168.255.30/24"]
+#         novis:
+#           ansible_host: novis.tre2.local
+#           description: EN1 Backup Storage
+#           local_targets: ["core", "datastore"]
+#       children:
+#         vms:
+#           vars:
+#             disable_sudo_password: true
+#             required_os: centos_8
+#           hosts:
+#             gitea:
+#               ansible_host: vm-host-gitea.net.enp.one
+#               description: "Application Host: Gitea VCS"
+#               local_targets: ["admin", "vcs"]
+#               networking:
+#                 eth0:
+#                   dhcp: true
+#             plex:
+#               ansible_host: vm-host-plex.net.enp.one
+#               description: "Application Host: Plex Media Server"
+#               local_targets: ["admin", "plx"]
+#               networking:
+#                 eth0:
+#                   dhcp: true
+#             bitwarden:
+#               ansible_host: vm-host-bitwarden.net.enp.one
+#               description: "Application Host: Bitwarden Password Manager"
+#               local_targets: ["admin", "ssv"]
+#               networking:
+#                 eth0:
+#                   dhcp: true
+#             nextcloud:
+#               ansible_host: vm-host-nextcloud.net.enp.one
+#               description: "Application Host: Nextcloud Web Storage"
+#               local_targets: ["admin", "cfs"]
+#               networking:
+#                 eth0:
+#                   dhcp: true
+#     workstations:
+#       vars:
+#         enable_gui: true
+#         enable_ssh: false
+#         enable_networkd: false
+#       hosts:
+#         omega:
+#           ansible_host: localhost
+#           description: Last
+#           required_os: centos_7
+#           local_targets: ["admin", "recovery"]
+#         vigil-nox:
+#           ansible_host: localhost
+#           required_os: fedora_31
+#           description: Watchman
+#           local_targets: ["admin", "desktop"]
+#         serico-nox:
+#           ansible_host: localhost
+#           description: Silk
+#           required_os: fedora_31
+#           local_targets: ["admin", "desktop"]
+#         inerro:
+#           ansible_host: localhost
+#           description: Wanderer
+#           required_os: fedora_31
+#           local_targets: ["admin", "desktop"]
+# network:
+#   hosts:
+#     router:
+#       ansible_host: router.net.enp.one
+#       ansible_network_os: edgeos
+#       ansible_connection: network_cli
+#       description: EN1 Core Gateway
+#       targets: ["admin", "network"]