diff --git a/linspector.json b/linspector.json
index 18cf527..708fc08 100644
--- a/linspector.json
+++ b/linspector.json
@@ -1,63 +1,21 @@
 {
     "services":
     {
-        "discusage":
-        {
-            "command": "ssh @host df -a @device"
-        },
-        "load":
-        {
-            "command": "ssh @host uptime"
-        },
-        "dirsize":
-        {
-            "command": "ssh @host du -chs @path"
-        },
-        "filesize":
-        {
-            "command": "ssh @host du -chs @path"
-        },
-        "loggedinusercount":
-        {
-            "command": "ssh @host who | wc -l"
-        },
-        "loggedinusers":
-        {
-            "command": "ssh @host who"
-        },
-        "swapusage":
-        {
-            "command": "ssh @host cat /proc/swaps"
-        },
-        "processcount":
-        {
-            "command": "ssh @host ps ax | wc -l"
-        },
-        "processcountbyname":
-        {
-            "command": "ssh @host ps ax | grep @name | wc -l"
-        },
-        "fileage":
-        {
-            "command": "ssh @host ls -l @file"
-        },
-        "ping":
-        {
-            "command": "ping @host"
-        },
-        "snmpget":
-        {
-            "command": "snmpget -v1 -c public $oid "
-        },
-        "busy_waiting":
-        {
-            "command": "sleep 3600"
-        },
-        "htmlcontent":
-        {
-            "command": "wget -qO- @url",
-            "comment": "Get HTML Content for a string lookup."
-        }
+        "discusage": {"command": "ssh @host df -a @device" },
+        "load": {"command": "ssh @host uptime"},
+        "dirsize": { "command": "ssh @host du -chs @path"},
+        "filesize": {"command": "ssh @host du -chs @path"},
+        "loggedinusercount": {"command": "ssh @host who | wc -l"},
+        "loggedinusers": {"command": "ssh @host who"},
+        "swapusage": {"command": "ssh @host cat /proc/swaps"},
+        "processcount": {"command": "ssh @host ps ax | wc -l"},
+        "processcountbyname": {"command": "ssh @host ps ax | grep @name | wc -l"},
+        "fileage": {"command": "ssh @host ls -l @file"},
+        "ping": {"command": "ping @host"},
+        "snmpget": {"command": "snmpget -v1 -c public $oid "},
+        "busy_waiting": {"command": "sleep 3600"},
+        "htmlcontent": {"command": "wget -qO- @url",
+                        "comment": "Get HTML Content for a string lookup."}
     },
     "filters":
     {
@@ -324,21 +282,11 @@
                 ]
             }
         },
-        "www3.unixpeople.org":
-        {
-            "host": "23.23.23.25",
-            "parent": "router.systemchaos.org",
-            "services":
-            {
-                "discusage":
-                [
-                    { "device": "/dev/sda1", "warning": "80%", "critical": "90%" }
-                ],
-                "load":
-                [
-                    { "device": "all", "warning": 8.00, "critical": 12.00 }
-                ]
-            }
+        "www3.unixpeople.org": {"host": "23.23.23.25", "parent": "router.systemchaos.org",
+             "services": {"discusage":[{ "device": "/dev/sda1", "warning": "80%", "critical": "90%"}],
+                          "load":[{ "device": "all", "warning": 8.00, "critical": 12.00 }],
+                          "ping":[{"warning": "100ms", "critical": "250ms"}]
+             }
         },
         "www.systemchaos.org":
         {
@@ -364,111 +312,74 @@
                 ]
             }
         },
-        "www01.linspector.org":
-        {
-            "host": "www01.linspector.org",
-            "parent": "router.systemchaos.org",
-            "services":
-            {
-                "ping":
-                [
-                    { "warning": "100ms", "critical": "250ms" }
-                ]
-            }
+        "www01.linspector.org": {"host": "www01.linspector.org", "parent": "router.systemchaos.org",
+            "services": {"ping":[{"warning": "100ms", "critical": "250ms"}]}
         },
-        "www02.linspector.org":
-        {
-            "host": "www02.linspector.org",
-            "parent": "router.systemchaos.org",
-            "services":
-            {
-                "ping":
-                [
-                    { "warning": "100ms", "critical": "250ms" }
-                ]
-            }
+        "www02.linspector.org": {"host": "www02.linspector.org", "parent": "router.systemchaos.org",
+            "services": {"ping":[{"warning": "100ms", "critical": "250ms"}]}
         },
-        "www03.linspector.org":
-        {
-            "host": "www03.linspector.org",
-            "parent": "router.systemchaos.org",
-            "services":
-            {
-                "ping":
-                [
-                    { "warning": "100ms", "critical": "250ms" }
-                ]
-            }
+        "www03.linspector.org": {"host": "www03.linspector.org", "parent": "router.systemchaos.org",
+            "services": {"ping":[{"warning": "100ms", "critical": "250ms"}]}
         },
-        "www04.linspector.org":
-        {
-            "host": "www04.linspector.org",
-            "parent": "router.systemchaos.org",
-            "services":
-            {
-                "ping":
-                [
-                    { "warning": "100ms", "critical": "250ms" }
-                ]
-            }
+        "www04.linspector.org": {"host": "www04.linspector.org", "parent": "router.systemchaos.org",
+            "services": {"ping":[{"warning": "100ms", "critical": "250ms"}]}
         },
-        "www05.linspector.org":
-        {
-            "host": "www05.linspector.org",
-            "parent": "router.systemchaos.org",
-            "services":
-            {
-                "ping":
-                [
-                    { "warning": "100ms", "critical": "250ms" }
-                ]
-            }
+        "www05.linspector.org": {"host": "www05.linspector.org", "parent": "router.systemchaos.org",
+            "services": {"ping":[{"warning": "100ms", "critical": "250ms"}]}
         },
-        "www06.linspector.org":
-        {
-            "host": "www06.linspector.org",
-            "parent": "router.systemchaos.org",
-            "services":
-            {
-                "ping":
-                [
-                    { "warning": "100ms", "critical": "250ms" }
-                ]
-            }
+        "www06.linspector.org": {"host": "www06.linspector.org", "parent": "router.systemchaos.org",
+            "services": {"ping":[{"warning": "100ms", "critical": "250ms"}]}
         },
-        "www07.linspector.org":
-        {
-            "host": "www07.linspector.org",
-            "parent": "router.systemchaos.org",
-            "services":
-            {
-                "ping":
-                [
-                    { "warning": "100ms", "critical": "250ms" }
-                ]
-            }
+        "www07.linspector.org": {"host": "www07.linspector.org", "parent": "router.systemchaos.org",
+            "services": {"ping":[{"warning": "100ms", "critical": "250ms"}]}
         },
-        "www08.linspector.org":
-        {
-            "host": "www08.linspector.org",
-            "parent": "router.systemchaos.org",
-            "services":
-            {
-                "ping":
-                [
-                    { "warning": "100ms", "critical": "250ms" }
-                ]
-            }
+        "www08.linspector.org": {"host": "www08.linspector.org", "parent": "router.systemchaos.org",
+            "services": {"ping":[{"warning": "100ms", "critical": "250ms"}]}
         },
-        "router.systemchaos.org":
-        {
-            "services":
-            {
-                "ping":
-                [
-                    { "warning": "100ms", "critical": "250ms" }
-                ]
-            }
+        "www09.linspector.org": {"host": "www09.linspector.org", "parent": "router.systemchaos.org",
+            "services": {"ping":[{"warning": "100ms", "critical": "250ms"}]}
+        },
+        "www10.linspector.org": {"host": "www10.linspector.org", "parent": "router.systemchaos.org",
+            "services": {"ping":[{"warning": "100ms", "critical": "250ms"}]}
+        },
+        "www11.linspector.org": {"host": "www11.linspector.org", "parent": "router.systemchaos.org",
+            "services": {"ping":[{"warning": "100ms", "critical": "250ms"}]}
+        },
+        "www12.linspector.org": {"host": "www12.linspector.org", "parent": "router.systemchaos.org",
+            "services": {"ping":[{"warning": "100ms", "critical": "250ms"}]}
+        },
+        "www13.linspector.org": {"host": "www13.linspector.org", "parent": "router.systemchaos.org",
+            "services": {"ping":[{"warning": "100ms", "critical": "250ms"}]}
+        },
+        "www14.linspector.org": {"host": "www14.linspector.org", "parent": "router.systemchaos.org",
+            "services": {"ping":[{"warning": "100ms", "critical": "250ms"}]}
+        },
+        "www15.linspector.org": {"host": "www15.linspector.org", "parent": "router.systemchaos.org",
+            "services": {"ping":[{"warning": "100ms", "critical": "250ms"}]}
+        },
+        "www16.linspector.org": {"host": "www16.linspector.org", "parent": "router.systemchaos.org",
+            "services": {"ping":[{"warning": "100ms", "critical": "250ms"}]}
+        },
+        "www17.linspector.org": {"host": "www17.linspector.org", "parent": "router.systemchaos.org",
+            "services": {"ping":[{"warning": "100ms", "critical": "250ms"}]}
+        },
+        "www18.linspector.org": {"host": "www18.linspector.org", "parent": "router.systemchaos.org",
+            "services": {"ping":[{"warning": "100ms", "critical": "250ms"}]}
+        },
+        "www19.linspector.org": {"host": "www19.linspector.org", "parent": "router.systemchaos.org",
+            "services": {"ping":[{"warning": "100ms", "critical": "250ms"}]}
+        },
+        "www20.linspector.org": {"host": "www20.linspector.org", "parent": "router.systemchaos.org",
+            "services": {"ping":[{"warning": "100ms", "critical": "250ms"}]}
+        },
+        "www21.linspector.org": {"host": "www21.linspector.org", "parent": "router.systemchaos.org",
+            "services": {"ping":[{"warning": "100ms", "critical": "250ms"}]}
+        },
+        "www22.linspector.org": {"host": "www22.linspector.org", "parent": "router.systemchaos.org",
+            "services": {"ping":[{"warning": "100ms", "critical": "250ms"}]}
+        },
+        "router.systemchaos.org": {"host": "192.168.2.1",
+            "services":{"ping":[{ "warning": "100ms", "critical": "250ms"}]}
         }
     },
     "hostgroups":
@@ -476,12 +387,13 @@
         "all":
         {
             "members": ["admin"],
-            "hosts": ["hanez",
-                                "www.unixpeople.org",
-                                "www2.unixpeople.org",
-                                "www3.unixpeople.org",
-                                "www.systemchaos.org",
-                                "router.systemchaos.org"],
+            "hosts": ["hanez", "www.unixpeople.org", "www2.unixpeople.org", "www3.unixpeople.org",
+                      "www.systemchaos.org", "router.systemchaos.org", "www01.linspector.org", "www02.linspector.org",
+                      "www03.linspector.org", "www04.linspector.org", "www05.linspector.org", "www06.linspector.org",
+                      "www07.linspector.org", "www08.linspector.org", "www09.linspector.org", "www10.linspector.org",
+                      "www11.linspector.org", "www12.linspector.org", "www13.linspector.org", "www14.linspector.org",
+                      "www15.linspector.org", "www16.linspector.org", "www17.linspector.org", "www18.linspector.org",
+                      "www19.linspector.org", "www20.linspector.org", "www21.linspector.org", "www22.linspector.org"],
             "parent": "network",
             "threshold": 10,
             "services":
@@ -491,10 +403,49 @@
                 "ping": ["onmondayandfriday"]
             }
         },
+        "all_for_hanez":
+        {
+            "members": ["hanez"],
+            "hosts": ["hanez", "www.unixpeople.org", "www2.unixpeople.org", "www3.unixpeople.org",
+                      "www.systemchaos.org", "router.systemchaos.org", "www01.linspector.org", "www02.linspector.org",
+                      "www03.linspector.org", "www04.linspector.org", "www05.linspector.org", "www06.linspector.org",
+                      "www07.linspector.org", "www08.linspector.org", "www09.linspector.org", "www10.linspector.org",
+                      "www11.linspector.org", "www12.linspector.org", "www13.linspector.org", "www14.linspector.org",
+                      "www15.linspector.org", "www16.linspector.org", "www17.linspector.org", "www18.linspector.org",
+                      "www19.linspector.org", "www20.linspector.org", "www21.linspector.org", "www22.linspector.org"],
+            "parent": "network",
+            "threshold": 10,
+            "services":
+            {
+            	"load": ["twentyfourseven"],
+            	"discusage":["twentyfourseven"],
+                "ping": ["twentyfourseven"]
+            }
+        },
+        "all_for_nonexistent":
+        {
+            "members": ["nonexistent"],
+            "hosts": ["hanez", "www.unixpeople.org", "www2.unixpeople.org", "www3.unixpeople.org",
+                      "www.systemchaos.org", "router.systemchaos.org", "www01.linspector.org", "www02.linspector.org",
+                      "www03.linspector.org", "www04.linspector.org", "www05.linspector.org", "www06.linspector.org",
+                      "www07.linspector.org", "www08.linspector.org", "www09.linspector.org", "www10.linspector.org",
+                      "www11.linspector.org", "www12.linspector.org", "www13.linspector.org", "www14.linspector.org",
+                      "www15.linspector.org", "www16.linspector.org", "www17.linspector.org", "www18.linspector.org",
+                      "www19.linspector.org", "www20.linspector.org", "www21.linspector.org", "www22.linspector.org"],
+            "parent": "network",
+            "threshold": 10,
+            "services":
+            {
+            	"load": ["nix"],
+            	"discusage":["nix"],
+                "ping": ["nix"]
+            }
+        },
         "hanez":
         {
             "members": ["hanez", "jens"],
-            "hosts": ["hanez", "router.systemchaos.org", "www.unixpeople.org", "www2.unixpeople.org", "www3.unixpeople.org"],
+            "hosts": ["hanez", "router.systemchaos.org", "www.unixpeople.org", "www2.unixpeople.org",
+                      "www3.unixpeople.org"],
             "parent": "network",
             "threshold": 5,
             "services": 
@@ -507,7 +458,7 @@
         "unixpeople":
         {
             "members": ["unixpeople", "admin", "hanez", "nobody"],
-            "hosts": ["www.unixpeople.org", "www2.unixpeople.org", "www3.unixpeople.org"],
+            "hosts": ["www.unixpeople.org", "www2.unixpeople.org", "www3.unixpeople.org", "www08.linspector.org"],
             "parent": "network",
             "threshold": 5,
             "services":
@@ -531,6 +482,20 @@
                 "ping": ["twentyfourseven"]
             }
         },
+        "linspector-02":
+        {
+            "members": ["linspector", "hanez", "nobody"],
+            "hosts": ["www09.linspector.org", "www10.linspector.org", "www11.linspector.org", "www12.linspector.org",
+                      "www13.linspector.org", "www14.linspector.org", "www15.linspector.org", "www16.linspector.org"],
+            "parent": "network",
+            "threshold": 5,
+            "services":
+            {
+                "load": ["twentyfourseven"],
+                "discusage": ["twentyfourseven"],
+                "ping": ["twentyfourseven"]
+            }
+        },
         "devserver":
         {
             "members": ["devs", "hanez"],
@@ -566,17 +531,6 @@
             }
         }
     },
-    "layouts" :
-    {
-    	"layout_1":
-    	{
-            "hostgroups": ["all", "hanez", "network"],
-            "enabled": true
-        },
-        "layout_2":
-    	{
-            "hostgroups": ["hanez", "ruff"],
-            "enabled": false
-        }
-    }
+    "layouts": {"production": {"hostgroups": ["all", "hanez", "network"], "enabled": true},
+                "lazy":       {"hostgroups": ["hanez", "ruff"], "enabled": false}}
 }