diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aconfig.html b/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aconfig.html
index cdb6b65..40fa2b9 100644
--- a/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aconfig.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aconfig.html
@@ -123,7 +123,7 @@ class confdroid_nagios::nagios::config (
 
 ) inherits confdroid_nagios::params {
   if $ng_nagios_server == $fqdn {
-    require confdroid_nagios::nagios::objects::commands
+#    require confdroid_nagios::nagios::objects::commands
     require confdroid_nagios::nagios::objects::template_rules
     require confdroid_nagios::nagios::objects::add_contact_rules
     require confdroid_nagios::nagios::objects::add_contactgroups_rules
diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Anagios.html b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Anagios.html
index 1d500e4..22a3825 100644
--- a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Anagios.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Anagios.html
@@ -276,134 +276,134 @@ class confdroid_nagios::server::nagios (
 
 ) inherits confdroid_nagios::params {
   if $ng_nagios_server == $fqdn {
-#    @@nagios_host { &#39;localhost&#39;:
-#      ensure              =&gt; $ng_ping_ensure,
-#      alias               =&gt; &#39;localhost&#39;,
-#      address             =&gt; &#39;127.0.0.1&#39;,
-#      use                 =&gt; &#39;linux-server&#39;,
-#      target              =&gt; $ng_target_localhost,
-#      hostgroups          =&gt; &#39;linux-servers&#39;,
-#      contacts            =&gt; $ng_contact_name,
-#      max_check_attempts  =&gt; $ng_max_check_attempts,
-#      notification_period =&gt; &#39;24x7&#39;,
-#      owner               =&gt; $ng_user,
-#      group               =&gt; $ng_user,
-#      mode                =&gt; &#39;0640&#39;,
-#      check_command       =&gt; &quot;check_ping!${ng_ping_warn}!${ng_ping_crit}&quot;,
-#      notify              =&gt; Service[$ng_service],
-#    }
+    @@nagios_host { &#39;localhost&#39;:
+      ensure              =&gt; $ng_ping_ensure,
+      alias               =&gt; &#39;localhost&#39;,
+      address             =&gt; &#39;127.0.0.1&#39;,
+      use                 =&gt; &#39;linux-server&#39;,
+      target              =&gt; $ng_target_localhost,
+      hostgroups          =&gt; &#39;linux-servers&#39;,
+      contacts            =&gt; $ng_contact_name,
+      max_check_attempts  =&gt; $ng_max_check_attempts,
+      notification_period =&gt; &#39;24x7&#39;,
+      owner               =&gt; $ng_user,
+      group               =&gt; $ng_user,
+      mode                =&gt; &#39;0640&#39;,
+      check_command       =&gt; &quot;check_ping!${ng_ping_warn}!${ng_ping_crit}&quot;,
+      notify              =&gt; Service[$ng_service],
+    }
 
-#    @@nagios_service { &#39;check_nagios_localhost&#39;:
-#      check_command       =&gt; &quot;check_nagios!${ng_spool_dir}/status.dat!5!/usr/sbin/nagios&quot;,
-#      use                 =&gt; &#39;generic-service&#39;,
-#      host_name           =&gt; &#39;localhost&#39;,
-#      notification_period =&gt; &#39;24x7&#39;,
-#      service_description =&gt; &#39;localhost_nagios_service&#39;,
-#      target              =&gt; $ng_target_service,
-#      owner               =&gt; $ng_user,
-#      group               =&gt; $ng_user,
-#      mode                =&gt; &#39;0640&#39;,
-#      contacts            =&gt; $ng_contact_name,
-#      notify              =&gt; Service[$ng_service],
-#    }
+    @@nagios_service { &#39;check_nagios_localhost&#39;:
+      check_command       =&gt; &quot;check_nagios!${ng_spool_dir}/status.dat!5!/usr/sbin/nagios&quot;,
+      use                 =&gt; &#39;generic-service&#39;,
+      host_name           =&gt; &#39;localhost&#39;,
+      notification_period =&gt; &#39;24x7&#39;,
+      service_description =&gt; &#39;localhost_nagios_service&#39;,
+      target              =&gt; $ng_target_service,
+      owner               =&gt; $ng_user,
+      group               =&gt; $ng_user,
+      mode                =&gt; &#39;0640&#39;,
+      contacts            =&gt; $ng_contact_name,
+      notify              =&gt; Service[$ng_service],
+    }
 
-#    @@nagios_service { &#39;root_partition_localhost&#39;:
-#      ensure              =&gt; $ng_disk_ensure,
-#      check_command       =&gt; &quot;check_nrpe!check_disk!${ng_disk_warn}!${ng_disk_crit}!/&quot;,
-#      use                 =&gt; &#39;generic-service&#39;,
-#      host_name           =&gt; &#39;localhost&#39;,
-#      contacts            =&gt; $ng_contact_name,
-#      notification_period =&gt; &#39;24x7&#39;,
-#      service_description =&gt; &#39;localhost_root_partition&#39;,
-#      servicegroups       =&gt; &#39;linux-services&#39;,
-#      target              =&gt; $ng_target_service,
-#      owner               =&gt; $ng_user,
-#      group               =&gt; $ng_user,
-#      mode                =&gt; &#39;0640&#39;,
-#      notify              =&gt; Service[$ng_service],
-#    }
+    @@nagios_service { &#39;root_partition_localhost&#39;:
+      ensure              =&gt; $ng_disk_ensure,
+      check_command       =&gt; &quot;check_nrpe!check_disk!${ng_disk_warn}!${ng_disk_crit}!/&quot;,
+      use                 =&gt; &#39;generic-service&#39;,
+      host_name           =&gt; &#39;localhost&#39;,
+      contacts            =&gt; $ng_contact_name,
+      notification_period =&gt; &#39;24x7&#39;,
+      service_description =&gt; &#39;localhost_root_partition&#39;,
+      servicegroups       =&gt; &#39;linux-services&#39;,
+      target              =&gt; $ng_target_service,
+      owner               =&gt; $ng_user,
+      group               =&gt; $ng_user,
+      mode                =&gt; &#39;0640&#39;,
+      notify              =&gt; Service[$ng_service],
+    }
 
-#    if $ng_enable_swap_check == true {
-#      @@nagios_service { &#39;Swap_Usage_localhost&#39;:
-#        ensure              =&gt; $ng_swap_ensure,
-#        check_command       =&gt; &quot;check_nrpe!check_swap!${ng_swap_warn}!${ng_swap_crit}&quot;,
-#        use                 =&gt; &#39;generic-service&#39;,
-#        host_name           =&gt; &#39;localhost&#39;,
-#        contacts            =&gt; $ng_contact_name,
-#        notification_period =&gt; &#39;24x7&#39;,
-#        service_description =&gt; &#39;localhost_swap_usage&#39;,
-#        servicegroups       =&gt; &#39;linux-services&#39;,
-#        target              =&gt; $ng_target_service,
-#        owner               =&gt; $ng_user,
-#        group               =&gt; $ng_user,
-#        mode                =&gt; &#39;0640&#39;,
-#        notify              =&gt; Service[$ng_service],
-#      }
-#    }
+    if $ng_enable_swap_check == true {
+      @@nagios_service { &#39;Swap_Usage_localhost&#39;:
+        ensure              =&gt; $ng_swap_ensure,
+        check_command       =&gt; &quot;check_nrpe!check_swap!${ng_swap_warn}!${ng_swap_crit}&quot;,
+        use                 =&gt; &#39;generic-service&#39;,
+        host_name           =&gt; &#39;localhost&#39;,
+        contacts            =&gt; $ng_contact_name,
+        notification_period =&gt; &#39;24x7&#39;,
+        service_description =&gt; &#39;localhost_swap_usage&#39;,
+        servicegroups       =&gt; &#39;linux-services&#39;,
+        target              =&gt; $ng_target_service,
+        owner               =&gt; $ng_user,
+        group               =&gt; $ng_user,
+        mode                =&gt; &#39;0640&#39;,
+        notify              =&gt; Service[$ng_service],
+      }
+    }
 
-#    @@nagios_service { &#39;Local_Users_localhost&#39;:
-#      ensure              =&gt; $ng_users_ensure,
-#      check_command       =&gt; &quot;check_nrpe!check_users!${ng_users_warn}!${ng_users_crit}&quot;,
-#      use                 =&gt; &#39;generic-service&#39;,
-#      host_name           =&gt; &#39;localhost&#39;,
-#      contacts            =&gt; $ng_contact_name,
-#      notification_period =&gt; &#39;24x7&#39;,
-#      service_description =&gt; &#39;localhost_local_users&#39;,
-#      servicegroups       =&gt; &#39;linux-services&#39;,
-#      target              =&gt; $ng_target_service,
-#      owner               =&gt; $ng_user,
-#      group               =&gt; $ng_user,
-#      mode                =&gt; &#39;0640&#39;,
-#      notify              =&gt; Service[$ng_service],
-#    }
+    @@nagios_service { &#39;Local_Users_localhost&#39;:
+      ensure              =&gt; $ng_users_ensure,
+      check_command       =&gt; &quot;check_nrpe!check_users!${ng_users_warn}!${ng_users_crit}&quot;,
+      use                 =&gt; &#39;generic-service&#39;,
+      host_name           =&gt; &#39;localhost&#39;,
+      contacts            =&gt; $ng_contact_name,
+      notification_period =&gt; &#39;24x7&#39;,
+      service_description =&gt; &#39;localhost_local_users&#39;,
+      servicegroups       =&gt; &#39;linux-services&#39;,
+      target              =&gt; $ng_target_service,
+      owner               =&gt; $ng_user,
+      group               =&gt; $ng_user,
+      mode                =&gt; &#39;0640&#39;,
+      notify              =&gt; Service[$ng_service],
+    }
 
-#    @@nagios_service { &#39;Total_Processes_localhost&#39;:
-#      ensure              =&gt; $ng_procs_tot_ensure,
-#      check_command       =&gt; &quot;check_nrpe!check_procs!${ng_procs_tot_warn}!${ng_procs_tot_crit}!${ng_procs_tot_param}&quot;,
-#      use                 =&gt; &#39;generic-service&#39;,
-#      host_name           =&gt; &#39;localhost&#39;,
-#      contacts            =&gt; $ng_contact_name,
-#      notification_period =&gt; &#39;24x7&#39;,
-#      service_description =&gt; &#39;localhost_total_processes&#39;,
-#      servicegroups       =&gt; &#39;linux-services&#39;,
-#      target              =&gt; $ng_target_service,
-#      owner               =&gt; $ng_user,
-#      group               =&gt; $ng_user,
-#      mode                =&gt; &#39;0640&#39;,
-#      notify              =&gt; Service[$ng_service],
-#    }
+    @@nagios_service { &#39;Total_Processes_localhost&#39;:
+      ensure              =&gt; $ng_procs_tot_ensure,
+      check_command       =&gt; &quot;check_nrpe!check_procs!${ng_procs_tot_warn}!${ng_procs_tot_crit}!${ng_procs_tot_param}&quot;,
+      use                 =&gt; &#39;generic-service&#39;,
+      host_name           =&gt; &#39;localhost&#39;,
+      contacts            =&gt; $ng_contact_name,
+      notification_period =&gt; &#39;24x7&#39;,
+      service_description =&gt; &#39;localhost_total_processes&#39;,
+      servicegroups       =&gt; &#39;linux-services&#39;,
+      target              =&gt; $ng_target_service,
+      owner               =&gt; $ng_user,
+      group               =&gt; $ng_user,
+      mode                =&gt; &#39;0640&#39;,
+      notify              =&gt; Service[$ng_service],
+    }
 
-#    @@nagios_service { &#39;Zombie_Processes_localhost&#39;:
-#      ensure              =&gt; $ng_procs_z_ensure,
-#      check_command       =&gt; &quot;check_nrpe!check_procs!${ng_procs_z_warn}!${ng_procs_z_crit}!${ng_procs_z_param}&quot;,
-#      use                 =&gt; &#39;generic-service&#39;,
-#      host_name           =&gt; &#39;localhost&#39;,
-#      contacts            =&gt; $ng_contact_name,
-#      notification_period =&gt; &#39;24x7&#39;,
-#      service_description =&gt; &#39;localhost_zombie_processes&#39;,
-#      servicegroups       =&gt; &#39;linux-services&#39;,
-#      target              =&gt; $ng_target_service,
-#      owner               =&gt; $ng_user,
-#      group               =&gt; $ng_user,
-#      mode                =&gt; &#39;0640&#39;,
-#      notify              =&gt; Service[$ng_service],
-#    }
+    @@nagios_service { &#39;Zombie_Processes_localhost&#39;:
+      ensure              =&gt; $ng_procs_z_ensure,
+      check_command       =&gt; &quot;check_nrpe!check_procs!${ng_procs_z_warn}!${ng_procs_z_crit}!${ng_procs_z_param}&quot;,
+      use                 =&gt; &#39;generic-service&#39;,
+      host_name           =&gt; &#39;localhost&#39;,
+      contacts            =&gt; $ng_contact_name,
+      notification_period =&gt; &#39;24x7&#39;,
+      service_description =&gt; &#39;localhost_zombie_processes&#39;,
+      servicegroups       =&gt; &#39;linux-services&#39;,
+      target              =&gt; $ng_target_service,
+      owner               =&gt; $ng_user,
+      group               =&gt; $ng_user,
+      mode                =&gt; &#39;0640&#39;,
+      notify              =&gt; Service[$ng_service],
+    }
 
-#    @@nagios_service { &#39;Current_Load_localhost&#39;:
-#      ensure              =&gt; $ng_load_ensure,
-#      check_command       =&gt; &quot;check_nrpe!check_load!${ng_load_warn}!${ng_load_crit}&quot;,
-#      use                 =&gt; &#39;generic-service&#39;,
-#      host_name           =&gt; &#39;localhost&#39;,
-#      contacts            =&gt; $ng_contact_name,
-#      notification_period =&gt; &#39;24x7&#39;,
-#      service_description =&gt; &#39;localhost_current_load&#39;,
-#      servicegroups       =&gt; &#39;linux-services&#39;,
-#      target              =&gt; $ng_target_service,
-#      owner               =&gt; $ng_user,
-#      group               =&gt; $ng_user,
-#      mode                =&gt; &#39;0640&#39;,
-#      notify              =&gt; Service[$ng_service],
-#    }
+    @@nagios_service { &#39;Current_Load_localhost&#39;:
+      ensure              =&gt; $ng_load_ensure,
+      check_command       =&gt; &quot;check_nrpe!check_load!${ng_load_warn}!${ng_load_crit}&quot;,
+      use                 =&gt; &#39;generic-service&#39;,
+      host_name           =&gt; &#39;localhost&#39;,
+      contacts            =&gt; $ng_contact_name,
+      notification_period =&gt; &#39;24x7&#39;,
+      service_description =&gt; &#39;localhost_current_load&#39;,
+      servicegroups       =&gt; &#39;linux-services&#39;,
+      target              =&gt; $ng_target_service,
+      owner               =&gt; $ng_user,
+      group               =&gt; $ng_user,
+      mode                =&gt; &#39;0640&#39;,
+      notify              =&gt; Service[$ng_service],
+    }
 
     resources { [&#39;nagios_host&#39;,
         &#39;nagios_hostgroup&#39;,