diff --git a/local.yml b/local.yml
index 4303a07..cb61583 100644
--- a/local.yml
+++ b/local.yml
@@ -59,11 +59,13 @@
     - name: Main | NixOS Setup
       block:
 
-        - ansible.builtin.include_tasks: tasks/general/software/nixos.yml
+        - name: Main | NixOS Setup | NixOS
+          ansible.builtin.include_tasks: tasks/general/software/nixos.yml
 
         # TBD if we are going to use this many, then just have IF statements
         #  and use blocks within the General area for NixOS vs not-NixOS.
-        - ansible.builtin.include_tasks: tasks/general/software/swap.yml
+        - name: Main | NixOS Setup | Swap
+          ansible.builtin.include_tasks: tasks/general/software/swap.yml
 
         - ansible.builtin.include_tasks: tasks/general/acct_mgmt/groups.yml
         - ansible.builtin.include_tasks: tasks/general/acct_mgmt/users.yml
@@ -176,10 +178,12 @@
 
         - name: Main | Workstation | Fancy Desktop Environments
           block:
+
             - ansible.builtin.include_tasks: tasks/workstation/linux/software/gnome.yml
               when: ansible_service_mgr == "systemd"
             - ansible.builtin.include_tasks: tasks/workstation/linux/software/cinnamon.yml
             - ansible.builtin.include_tasks: tasks/workstation/linux/software/lxqt.yml
+
           when: ansible_system == "Linux"
             and internet
             # TBD: Implement this: and extra_desktops
@@ -188,6 +192,7 @@
 
         - name: Main | Workstation Setup | Linux
           block:
+
             - ansible.builtin.include_tasks: tasks/workstation/linux/software/packages.yml
             - ansible.builtin.include_tasks: tasks/workstation/linux/software/tlp.yml
             - ansible.builtin.include_tasks: tasks/workstation/linux/software/lutris.yml
@@ -197,6 +202,7 @@
             - ansible.builtin.include_tasks: tasks/workstation/linux/software/hugo.yml
             - ansible.builtin.include_tasks: tasks/workstation/linux/software/brave.yml
               when: ansible_pkg_mgr in ("apt", "dnf", "zypper") and not mobile
+
           when: ansible_system == "Linux"
             and internet
 
@@ -211,12 +217,14 @@
         ## Configuration Tasks ##
         - name: Main | Workstation Setup | Configuration
           block:
+
             - ansible.builtin.include_tasks: tasks/workstation/shared/settings/gnome.yml
             - ansible.builtin.include_tasks: tasks/workstation/shared/settings/cinnamon.yml
             - ansible.builtin.include_tasks: tasks/workstation/shared/settings/xdg_autostart.yml
 
             - ansible.builtin.include_tasks: tasks/workstation/linux/cron/ansible.yml
               when: ansible_system == "Linux"
+
           when: not mobile
 
         - ansible.builtin.include_tasks: tasks/workstation/shared/settings/nfs.yml
@@ -233,12 +241,14 @@
         ## Final Tasks (SLOW) ##
         - name: Main | Workstation Setup | Linux [Slow]
           block:
+
             - ansible.builtin.include_tasks: tasks/workstation/linux/software/flatpaks.yml
               when: flatpak_distro
             - ansible.builtin.include_tasks: tasks/workstation/linux/software/java.yml
             - ansible.builtin.include_tasks: tasks/workstation/linux/software/flutter.yml
             - ansible.builtin.include_tasks: tasks/workstation/linux/software/android.yml
             - ansible.builtin.include_tasks: tasks/workstation/linux/software/llm.yml
+
           when: ansible_system == "Linux"
             and internet
 
@@ -291,15 +301,21 @@
     - name: Main | Server Setup
       block:
 
-        - ansible.builtin.include_tasks: tasks/server/software/services.yml
+        - name: Main | Server Setup | Services
+          ansible.builtin.include_tasks: tasks/server/software/services.yml
 
         - block:
-            - ansible.builtin.include_tasks: tasks/server/software/certbot.yml
-            - ansible.builtin.include_tasks: tasks/server/cron/certbot.yml
-          when: certbot
+
+            - name: Main | Server Setup | Certbot
+              ansible.builtin.include_tasks: tasks/server/software/certbot.yml
+            - name: Main | Server Setup | Certbot Cron
+              ansible.builtin.include_tasks: tasks/server/cron/certbot.yml
+              when: certbot
 
         - block:
-            - ansible.builtin.include_tasks: tasks/server/software/onlyoffice.yml
+
+            - name: Main | Server Setup | OnlyOffice
+              ansible.builtin.include_tasks: tasks/server/software/onlyoffice.yml
               when: onlyoffice
             - ansible.builtin.include_tasks: tasks/server/software/influxdb1.yml
               when: influxdb1
@@ -307,6 +323,7 @@
               when: influxdb2
             - ansible.builtin.include_tasks: tasks/server/software/grafana.yml
               when: grafana
+
           when: ansible_pkg_mgr == "apt"
 
         - ansible.builtin.include_tasks: tasks/server/software/hugo.yml
@@ -332,7 +349,8 @@
     - name: Main | Finish
       block:
 
-        - ansible.builtin.include_tasks: tasks/general/acct_mgmt/notify.yml
+        - name: Main | Finish | Notify
+          ansible.builtin.include_tasks: tasks/general/acct_mgmt/notify.yml
           vars:
             notify_message: "Provisioning Finished"