diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3d0269a5..778ad1c4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,7 +13,7 @@ jobs:
           - '3.12'
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 #      - name: Cache pip
 #        uses: actions/cache@v3
 #        with:
@@ -24,7 +24,7 @@ jobs:
 #            v1-pip-${{ runner.os }}
 #            v1-pip-
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install mreg-cli
@@ -46,9 +46,9 @@ jobs:
           - "3.12"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
diff --git a/ci/diff.py b/ci/diff.py
index bb13a6f8..392d6edd 100644
--- a/ci/diff.py
+++ b/ci/diff.py
@@ -1,26 +1,52 @@
+from __future__ import annotations
+
 import difflib
 import json
 import re
 import sys
 from typing import Any, Dict, List
 
-
-def replace_timestamps(obj: Any) -> Any:
-    """Recursively replace timestamp values in a JSON object.
-
-    :param obj: A JSON object (dict, list, or primitive type).
-    :returns: A new object with timestamps replaced.
-    """
-    timestamp_pattern = re.compile(
-        r"\d{4}-\d{2}-\d{2}[ T]\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:[+-]\d{2}:\d{2})?|\d{4}-\d{2}-\d{2}"
-    )
-    if isinstance(obj, dict):
-        return {k: replace_timestamps(v) for k, v in obj.items()}
-    elif isinstance(obj, list):
-        return [replace_timestamps(elem) for elem in obj]
-    elif isinstance(obj, str):
-        return timestamp_pattern.sub("<TIME>", obj)
-    return obj
+timestamp_pattern = re.compile(
+    r"\d{4}-\d{2}-\d{2}[ T]\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:[+-]\d{2}:\d{2})?|\d{4}-\d{2}-\d{2}"
+)
+datetime_str_pattern = re.compile(
+    r"\b[A-Za-z]{3}\s[A-Za-z]{3}\s+([0-2]?[0-9]|3[0-1])\s([0-1]?[0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])\s[0-9]{4}\b"
+)
+# datetime_str_pattern = re.compile(
+#     r"\b(Sun|Mon|Tue|Wed|Thu|Fri|Sat)\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s([0-2]?[0-9]|3[0-1])\s([0-1]?[0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])\s[0-9]{4}\b"
+# )
+serial_pattern = re.compile(r"\b[sS]erial:\s+\d+")
+ipv4_pattern = re.compile(r"((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\.?\b){4}")
+ipv6_pattern = re.compile(r"\b([0-9a-fA-F]{1,4}::?){1,7}[0-9a-fA-F]{1,4}\b")
+
+# Keeping this code in case we need to revert back to it:
+#
+# def replace_timestamps_and_more(obj: Any) -> Any:
+#     """Recursively replace timestamp values in a JSON object.
+#
+#     :param obj: A JSON object (dict, list, or primitive type).
+#     :returns: A new object with timestamps replaced.
+#     """
+#     if isinstance(obj, dict):
+#         #return {ipv4_pattern.sub("<IPv4>",k): replace_timestamps_and_more(v) for k, v in obj.items()}
+#         newdict = {}
+#         for k, v in obj.items():
+#             # some places, ip addresses are used as keys
+#             k = ipv4_pattern.sub("<IPv4>",k)
+#             k = ipv6_pattern.sub("<IPv6>",k)
+#             v = replace_timestamps_and_more(v)
+#             newdict[k] = v
+#         return newdict
+#     elif isinstance(obj, list):
+#         return [replace_timestamps_and_more(elem) for elem in obj]
+#     elif isinstance(obj, str):
+#         obj = timestamp_pattern.sub("<TIME>", obj)
+#         obj = datetime_str_pattern.sub("<TIME>", obj)
+#         obj = serial_pattern.sub("Serial: <NUMBER>", obj)
+#         obj = ipv4_pattern.sub("<IPv4>", obj)
+#         obj = ipv6_pattern.sub("<IPv6>", obj)
+#         return obj
+#     return obj
 
 
 def group_objects(json_file_path: str) -> List[List[Dict[str, Any]]]:
@@ -30,9 +56,16 @@ def group_objects(json_file_path: str) -> List[List[Dict[str, Any]]]:
     :returns: A list of grouped objects.
     """
     with open(json_file_path, "r") as f:
-        data = json.load(f)
-
-    data = [replace_timestamps(obj) for obj in data]
+        s = f.read()
+        s = timestamp_pattern.sub("<TIME>", s)
+        s = datetime_str_pattern.sub("<TIME>", s)
+        s = serial_pattern.sub("Serial: <NUMBER>", s)
+        s = ipv4_pattern.sub("<IPv4>", s)
+        s = ipv6_pattern.sub("<IPv6>", s)
+        s = re.sub(r"\s+", " ", s) # replace all whitespace with one space, so the diff doesn't complain about different lengths
+        data = json.loads(s)
+
+    #data = [replace_timestamps_and_more(obj) for obj in data]
 
     grouped_objects = []
     temp = []
diff --git a/ci/testsuite-result.json b/ci/testsuite-result.json
index 1a6d7f98..31c25359 100644
--- a/ci/testsuite-result.json
+++ b/ci/testsuite-result.json
@@ -6,8 +6,8 @@
     "command_issued": "zone create example.org hostmaster@example.org ns1.example.org  # should require force because ns1 is unknown",
     "ok": [],
     "warning": [
-      "WARNING: : host not found: 'ns1.example.org'",
-      "WARNING: : ns1.example.org is not in mreg, must force"
+      "Host ns1.example.org not found.",
+      "ns1.example.org is not in mreg, must force"
     ],
     "error": [],
     "output": [],
@@ -23,14 +23,11 @@
       },
       {
         "method": "GET",
-        "url": "/api/v1/hosts/?cnames__name=ns1.example.org",
+        "url": "/api/v1/cnames/ns1.example.org",
         "data": {},
-        "status": 200,
+        "status": 404,
         "response": {
-          "count": 0,
-          "next": null,
-          "previous": null,
-          "results": []
+          "detail": "Not found."
         }
       }
     ],
@@ -42,10 +39,10 @@
     "command_filter_negate": false,
     "command_issued": "zone create example.org hostmaster@example.org ns1.example.org -force",
     "ok": [
-      "OK: : created zone example.org"
+      "Created zone example.org"
     ],
     "warning": [
-      "WARNING: : host not found: 'ns1.example.org'"
+      "Host ns1.example.org not found."
     ],
     "error": [],
     "output": [],
@@ -61,14 +58,20 @@
       },
       {
         "method": "GET",
-        "url": "/api/v1/hosts/?cnames__name=ns1.example.org",
+        "url": "/api/v1/cnames/ns1.example.org",
         "data": {},
-        "status": 200,
+        "status": 404,
         "response": {
-          "count": 0,
-          "next": null,
-          "previous": null,
-          "results": []
+          "detail": "Not found."
+        }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/zones/forward/example.org",
+        "data": {},
+        "status": 404,
+        "response": {
+          "detail": "Not found."
         }
       },
       {
@@ -82,6 +85,29 @@
           ]
         },
         "status": 201
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/zones/forward/example.org",
+        "data": {},
+        "status": 200,
+        "response": {
+          "nameservers": [
+            {
+              "name": "ns1.example.org",
+              "ttl": null
+            }
+          ],
+          "updated": false,
+          "primary_ns": "ns1.example.org",
+          "email": "hostmaster@example.org",
+          "refresh": 10800,
+          "retry": 3600,
+          "expire": 1814400,
+          "soa_ttl": 43200,
+          "default_ttl": 43200,
+          "name": "example.org"
+        }
       }
     ],
     "time": null
@@ -95,11 +121,12 @@
     "warning": [],
     "error": [],
     "output": [
-      "Zone:               example.org",
+      "Name:               example.org",
       "        Nameservers:        hostname            TTL",
       "                            ns1.example.org     <not set>",
-      "Primary ns:         ns1.example.org",
+      "Primary NS:         ns1.example.org",
       "Email:              hostmaster@example.org",
+      "Serial:             3240605000",
       "Refresh:            10800",
       "Retry:              3600",
       "Expire:             1814400",
@@ -143,7 +170,7 @@
     "error": [],
     "output": [
       "Zones:",
-      "   example.org"
+      " example.org"
     ],
     "api_requests": [
       {
@@ -186,12 +213,35 @@
     "command_issued": "zone set_ns example.org ns2.example.org  #  requires force because ns2 is unknown",
     "ok": [],
     "warning": [
-      "WARNING: : host not found: 'ns2.example.org'",
-      "WARNING: : ns2.example.org is not in mreg, must force"
+      "Host ns2.example.org not found.",
+      "ns2.example.org is not in mreg, must force"
     ],
     "error": [],
     "output": [],
     "api_requests": [
+      {
+        "method": "GET",
+        "url": "/api/v1/zones/forward/example.org",
+        "data": {},
+        "status": 200,
+        "response": {
+          "nameservers": [
+            {
+              "name": "ns1.example.org",
+              "ttl": null
+            }
+          ],
+          "updated": false,
+          "primary_ns": "ns1.example.org",
+          "email": "hostmaster@example.org",
+          "refresh": 10800,
+          "retry": 3600,
+          "expire": 1814400,
+          "soa_ttl": 43200,
+          "default_ttl": 43200,
+          "name": "example.org"
+        }
+      },
       {
         "method": "GET",
         "url": "/api/v1/hosts/ns2.example.org",
@@ -203,14 +253,11 @@
       },
       {
         "method": "GET",
-        "url": "/api/v1/hosts/?cnames__name=ns2.example.org",
+        "url": "/api/v1/cnames/ns2.example.org",
         "data": {},
-        "status": 200,
+        "status": 404,
         "response": {
-          "count": 0,
-          "next": null,
-          "previous": null,
-          "results": []
+          "detail": "Not found."
         }
       }
     ],
@@ -222,35 +269,14 @@
     "command_filter_negate": false,
     "command_issued": "zone set_ns example.org ns2.example.org -force",
     "ok": [
-      "OK: : updated nameservers for example.org"
+      "Updated nameservers for example.org"
     ],
     "warning": [
-      "WARNING: : host not found: 'ns2.example.org'"
+      "Host ns2.example.org not found."
     ],
     "error": [],
     "output": [],
     "api_requests": [
-      {
-        "method": "GET",
-        "url": "/api/v1/hosts/ns2.example.org",
-        "data": {},
-        "status": 404,
-        "response": {
-          "detail": "Not found."
-        }
-      },
-      {
-        "method": "GET",
-        "url": "/api/v1/hosts/?cnames__name=ns2.example.org",
-        "data": {},
-        "status": 200,
-        "response": {
-          "count": 0,
-          "next": null,
-          "previous": null,
-          "results": []
-        }
-      },
       {
         "method": "GET",
         "url": "/api/v1/zones/forward/example.org",
@@ -274,6 +300,24 @@
           "name": "example.org"
         }
       },
+      {
+        "method": "GET",
+        "url": "/api/v1/hosts/ns2.example.org",
+        "data": {},
+        "status": 404,
+        "response": {
+          "detail": "Not found."
+        }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/cnames/ns2.example.org",
+        "data": {},
+        "status": 404,
+        "response": {
+          "detail": "Not found."
+        }
+      },
       {
         "method": "PATCH",
         "url": "/api/v1/zones/forward/example.org/nameservers",
@@ -293,7 +337,7 @@
     "command_filter_negate": false,
     "command_issued": "zone set_soa example.org -email hostperson@example.org -serialno 12345 -refresh 360 -retry 1800 -expire 2400 -soa-ttl 1800",
     "ok": [
-      "OK: : set soa for example.org"
+      "Updated SOA for example.org"
     ],
     "warning": [],
     "error": [],
@@ -327,13 +371,43 @@
         "url": "/api/v1/zones/forward/example.org",
         "data": {
           "email": "hostperson@example.org",
-          "expire": 2400,
+          "serialno": 12345,
           "refresh": 360,
           "retry": 1800,
-          "serialno": 12345,
+          "expire": 2400,
           "soa_ttl": 1800
         },
         "status": 204
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/zones/forward/?id=1",
+        "data": {},
+        "status": 200,
+        "response": {
+          "count": 1,
+          "next": null,
+          "previous": null,
+          "results": [
+            {
+              "nameservers": [
+                {
+                  "name": "ns2.example.org",
+                  "ttl": null
+                }
+              ],
+              "updated": true,
+              "primary_ns": "ns2.example.org",
+              "email": "hostperson@example.org",
+              "refresh": 360,
+              "retry": 1800,
+              "expire": 2400,
+              "soa_ttl": 1800,
+              "default_ttl": 43200,
+              "name": "example.org"
+            }
+          ]
+        }
       }
     ],
     "time": null
@@ -345,7 +419,7 @@
     "command_issued": "zone set_default_ttl example.org 60    # should fail, must be >= 300",
     "ok": [],
     "warning": [
-      "WARNING: : PATCH \"http://127.0.0.1:8000/api/v1/zones/forward/example.org\": 400: Bad Request\n{\n  \"default_ttl\": [\n    \"Ensure this value is greater than or equal to 300.\"\n  ]\n}"
+      "Invalid TTL value: 60 (300->68400)"
     ],
     "error": [],
     "output": [],
@@ -372,19 +446,6 @@
           "default_ttl": 43200,
           "name": "example.org"
         }
-      },
-      {
-        "method": "PATCH",
-        "url": "/api/v1/zones/forward/example.org",
-        "data": {
-          "default_ttl": 60
-        },
-        "status": 400,
-        "response": {
-          "default_ttl": [
-            "Ensure this value is greater than or equal to 300."
-          ]
-        }
       }
     ],
     "time": null
@@ -395,7 +456,7 @@
     "command_filter_negate": false,
     "command_issued": "zone set_default_ttl example.org 300",
     "ok": [
-      "OK: : set default TTL for example.org"
+      "Set default TTL for example.org"
     ],
     "warning": [],
     "error": [],
@@ -431,6 +492,36 @@
           "default_ttl": 300
         },
         "status": 204
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/zones/forward/?id=1",
+        "data": {},
+        "status": 200,
+        "response": {
+          "count": 1,
+          "next": null,
+          "previous": null,
+          "results": [
+            {
+              "nameservers": [
+                {
+                  "name": "ns2.example.org",
+                  "ttl": null
+                }
+              ],
+              "updated": true,
+              "primary_ns": "ns2.example.org",
+              "email": "hostperson@example.org",
+              "refresh": 360,
+              "retry": 1800,
+              "expire": 2400,
+              "soa_ttl": 1800,
+              "default_ttl": 300,
+              "name": "example.org"
+            }
+          ]
+        }
       }
     ],
     "time": null
@@ -441,7 +532,7 @@
     "command_filter_negate": false,
     "command_issued": "network create -network 10.0.2.0/28 -desc \"TinyNet\"",
     "ok": [
-      "OK: : created network 10.0.2.0/28"
+      "created network 10.0.2.0/28"
     ],
     "warning": [],
     "error": [],
@@ -465,12 +556,26 @@
         "data": {
           "network": "10.0.2.0/28",
           "description": "TinyNet",
-          "vlan": null,
-          "category": null,
-          "location": null,
           "frozen": false
         },
         "status": 201
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/networks/10.0.2.0/28",
+        "data": {},
+        "status": 200,
+        "response": {
+          "excluded_ranges": [],
+          "network": "10.0.2.0/28",
+          "description": "TinyNet",
+          "vlan": null,
+          "dns_delegated": false,
+          "category": "",
+          "location": "",
+          "frozen": false,
+          "reserved": 3
+        }
       }
     ],
     "time": null
@@ -484,9 +589,26 @@
     "warning": [],
     "error": [],
     "output": [
-      "No used addresses on 10.0.2.0/28"
+      "No used addresses on network 10.0.2.0/28"
     ],
     "api_requests": [
+      {
+        "method": "GET",
+        "url": "/api/v1/networks/10.0.2.0/28",
+        "data": {},
+        "status": 200,
+        "response": {
+          "excluded_ranges": [],
+          "network": "10.0.2.0/28",
+          "description": "TinyNet",
+          "vlan": null,
+          "dns_delegated": false,
+          "category": "",
+          "location": "",
+          "frozen": false,
+          "reserved": 3
+        }
+      },
       {
         "method": "GET",
         "url": "/api/v1/networks/10.0.2.0/28/used_host_list",
@@ -526,6 +648,23 @@
       "10.0.2.14                "
     ],
     "api_requests": [
+      {
+        "method": "GET",
+        "url": "/api/v1/networks/10.0.2.0/28",
+        "data": {},
+        "status": 200,
+        "response": {
+          "excluded_ranges": [],
+          "network": "10.0.2.0/28",
+          "description": "TinyNet",
+          "vlan": null,
+          "dns_delegated": false,
+          "category": "",
+          "location": "",
+          "frozen": false,
+          "reserved": 3
+        }
+      },      
       {
         "method": "GET",
         "url": "/api/v1/networks/10.0.2.0/28/unused_list",
@@ -554,7 +693,7 @@
     "command_filter_negate": false,
     "command_issued": "network set_reserved 10.0.2.0/28 8",
     "ok": [
-      "OK: : updated reserved to '8' for 10.0.2.0/28"
+      "Updated reserved to '8' for 10.0.2.0/28"
     ],
     "warning": [],
     "error": [],
@@ -584,6 +723,30 @@
           "reserved": 8
         },
         "status": 204
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/networks/?id=1",
+        "data": {},
+        "status": 200,
+        "response": {
+          "count": 1,
+          "next": null,
+          "previous": null,
+          "results": [
+            {
+              "excluded_ranges": [],
+              "network": "10.0.2.0/28",
+              "description": "TinyNet",
+              "vlan": null,
+              "dns_delegated": false,
+              "category": "",
+              "location": "",
+              "frozen": false,
+              "reserved": 8
+            }
+          ]
+        }
       }
     ],
     "time": null
@@ -594,24 +757,37 @@
     "command_filter_negate": false,
     "command_issued": "host add tinyhost -ip 10.0.2.0/28 -contact tinyhost@example.org",
     "ok": [
-      "OK: : created host tinyhost.example.org with IP 10.0.2.9"
-    ],
-    "warning": [
-      "WARNING: : host not found: tinyhost.example.org"
+      "Created host tinyhost.example.org"
     ],
+    "warning": [],
     "error": [],
-    "output": [],
+    "output": [
+      "Name:         tinyhost.example.org",
+      "Contact:      tinyhost@example.org",
+      "A_Records     IP            MAC",
+      "              10.0.2.14     <not set>",
+      "TTL:          (Default)",
+      "TXT:          v=spf1 -all",
+      "Created:      Fri Jun  7 10:43:30 2024",
+      "Updated:      Fri Jun  7 10:43:30 2024"
+    ],
     "api_requests": [
       {
         "method": "GET",
-        "url": "/api/v1/hosts/?name=tinyhost.example.org",
+        "url": "/api/v1/hosts/tinyhost.example.org",
         "data": {},
-        "status": 200,
+        "status": 404,
         "response": {
-          "count": 0,
-          "next": null,
-          "previous": null,
-          "results": []
+          "detail": "Not found."
+        }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/cnames/tinyhost.example.org",
+        "data": {},
+        "status": 404,
+        "response": {
+          "detail": "Not found."
         }
       },
       {
@@ -641,7 +817,66 @@
       },
       {
         "method": "GET",
-        "url": "/api/v1/cnames/?name=tinyhost.example.org",
+        "url": "/api/v1/networks/10.0.2.0/28",
+        "data": {},
+        "status": 200,
+        "response": {
+          "excluded_ranges": [],
+          "network": "10.0.2.0/28",
+          "description": "TinyNet",
+          "vlan": null,
+          "dns_delegated": false,
+          "category": "",
+          "location": "",
+          "frozen": false,
+          "reserved": 8
+        }
+      },      
+      {
+        "method": "POST",
+        "url": "/api/v1/hosts/",
+        "data": {
+          "name": "tinyhost.example.org",
+          "contact": "tinyhost@example.org",
+          "network": "10.0.2.0/28"
+        },
+        "status": 201
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/hosts/tinyhost.example.org",
+        "data": {},
+        "status": 200,
+        "response": {
+          "ipaddresses": [
+            {
+              "macaddress": "",
+              "ipaddress": "10.0.2.14",
+              "host": 1
+            }
+          ],
+          "cnames": [],
+          "mxs": [],
+          "txts": [
+            {
+              "txt": "v=spf1 -all",
+              "host": 1
+            }
+          ],
+          "ptr_overrides": [],
+          "hinfo": null,
+          "loc": null,
+          "bacnetid": null,
+          "name": "tinyhost.example.org",
+          "contact": "tinyhost@example.org",
+          "ttl": null,
+          "comment": "",
+          "zone": 1
+        }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/srvs/?host=1",
         "data": {},
         "status": 200,
         "response": {
@@ -653,56 +888,51 @@
       },
       {
         "method": "GET",
-        "url": "/api/v1/networks/10.0.2.0/28",
+        "url": "/api/v1/naptrs/?host=1",
         "data": {},
         "status": 200,
         "response": {
-          "excluded_ranges": [],
-          "network": "10.0.2.0/28",
-          "description": "TinyNet",
-          "vlan": null,
-          "dns_delegated": false,
-          "category": "",
-          "location": "",
-          "frozen": false,
-          "reserved": 8
+          "count": 0,
+          "next": null,
+          "previous": null,
+          "results": []
         }
       },
       {
         "method": "GET",
-        "url": "/api/v1/networks/10.0.2.0/28/first_unused",
+        "url": "/api/v1/sshfps/?host=1",
         "data": {},
         "status": 200,
-        "response": "10.0.2.9"
+        "response": {
+          "count": 0,
+          "next": null,
+          "previous": null,
+          "results": []
+        }
       },
       {
         "method": "GET",
-        "url": "/api/v1/networks/10.0.2.0/28/reserved_list",
+        "url": "/api/v1/hostpolicy/roles/?hosts=1",
         "data": {},
         "status": 200,
-        "response": [
-          "10.0.2.0",
-          "10.0.2.1",
-          "10.0.2.2",
-          "10.0.2.3",
-          "10.0.2.4",
-          "10.0.2.5",
-          "10.0.2.6",
-          "10.0.2.7",
-          "10.0.2.8",
-          "10.0.2.15"
-        ]
+        "response": {
+          "count": 0,
+          "next": null,
+          "previous": null,
+          "results": []
+        }
       },
       {
-        "method": "POST",
-        "url": "/api/v1/hosts/",
-        "data": {
-          "name": "tinyhost.example.org",
-          "contact": "tinyhost@example.org",
-          "comment": null,
-          "ipaddress": "10.0.2.9"
-        },
-        "status": 201
+        "method": "GET",
+        "url": "/api/v1/hostgroups/?hosts=1",
+        "data": {},
+        "status": 200,
+        "response": {
+          "count": 0,
+          "next": null,
+          "previous": null,
+          "results": []
+        }
       }
     ],
     "time": null
@@ -716,16 +946,33 @@
     "warning": [],
     "error": [],
     "output": [
-      "10.0.2.9                 tinyhost.example.org"
+      "10.0.2.14                                     tinyhost.example.org"
     ],
     "api_requests": [
+      {
+        "method": "GET",
+        "url": "/api/v1/networks/10.0.2.0/28",
+        "data": {},
+        "status": 200,
+        "response": {
+          "excluded_ranges": [],
+          "network": "10.0.2.0/28",
+          "description": "TinyNet",
+          "vlan": null,
+          "dns_delegated": false,
+          "category": "",
+          "location": "",
+          "frozen": false,
+          "reserved": 8
+        }
+      },      
       {
         "method": "GET",
         "url": "/api/v1/networks/10.0.2.0/28/used_host_list",
         "data": {},
         "status": 200,
         "response": {
-          "10.0.2.9": [
+          "10.0.2.14": [
             "tinyhost.example.org"
           ]
         }
@@ -749,24 +996,41 @@
     "warning": [],
     "error": [],
     "output": [
+      "10.0.2.9                 ",
       "10.0.2.10                ",
       "10.0.2.11                ",
       "10.0.2.12                ",
-      "10.0.2.13                ",
-      "10.0.2.14                "
+      "10.0.2.13                "
     ],
     "api_requests": [
+      {
+        "method": "GET",
+        "url": "/api/v1/networks/10.0.2.0/28",
+        "data": {},
+        "status": 200,
+        "response": {
+          "excluded_ranges": [],
+          "network": "10.0.2.0/28",
+          "description": "TinyNet",
+          "vlan": null,
+          "dns_delegated": false,
+          "category": "",
+          "location": "",
+          "frozen": false,
+          "reserved": 8
+        }
+      },
       {
         "method": "GET",
         "url": "/api/v1/networks/10.0.2.0/28/unused_list",
         "data": {},
         "status": 200,
         "response": [
+          "10.0.2.9",
           "10.0.2.10",
           "10.0.2.11",
           "10.0.2.12",
-          "10.0.2.13",
-          "10.0.2.14"
+          "10.0.2.13"
         ]
       }
     ],
@@ -778,7 +1042,7 @@
     "command_filter_negate": false,
     "command_issued": "host remove tinyhost",
     "ok": [
-      "OK: : removed tinyhost.example.org"
+      "removed tinyhost.example.org"
     ],
     "warning": [],
     "error": [],
@@ -793,7 +1057,7 @@
           "ipaddresses": [
             {
               "macaddress": "",
-              "ipaddress": "10.0.2.9",
+              "ipaddress": "10.0.2.14",
               "host": 1
             }
           ],
@@ -830,7 +1094,7 @@
       },
       {
         "method": "GET",
-        "url": "/api/v1/srvs/?host__name=tinyhost.example.org",
+        "url": "/api/v1/srvs/?host=1",
         "data": {},
         "status": 200,
         "response": {
@@ -855,7 +1119,7 @@
     "command_filter_negate": false,
     "command_issued": "network remove 10.0.2.0/28 -force",
     "ok": [
-      "OK: : removed network 10.0.2.0/28"
+        "Removed network 10.0.2.0/28"
     ],
     "warning": [],
     "error": [],
@@ -863,10 +1127,27 @@
     "api_requests": [
       {
         "method": "GET",
-        "url": "/api/v1/networks/10.0.2.0/28/used_list",
+        "url": "/api/v1/networks/10.0.2.0/28",
         "data": {},
         "status": 200,
-        "response": []
+        "response": {
+          "excluded_ranges": [],
+          "network": "10.0.2.0/28",
+          "description": "TinyNet",
+          "vlan": null,
+          "dns_delegated": false,
+          "category": "",
+          "location": "",
+          "frozen": false,
+          "reserved": 8
+        }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/networks/10.0.2.0/28/used_count",
+        "data": {},
+        "status": 200,
+        "response": 0
       },
       {
         "method": "DELETE",
@@ -883,7 +1164,7 @@
     "command_filter_negate": false,
     "command_issued": "network create -network 2001:db8::/64 -desc \"Lorem ipsum dolor sit amet\"",
     "ok": [
-      "OK: : created network 2001:db8::/64"
+      "created network 2001:db8::/64"
     ],
     "warning": [],
     "error": [],
@@ -907,12 +1188,26 @@
         "data": {
           "network": "2001:db8::/64",
           "description": "Lorem ipsum dolor sit amet",
-          "vlan": null,
-          "category": null,
-          "location": null,
           "frozen": false
         },
         "status": 201
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/networks/2001:db8::/64",
+        "data": {},
+        "status": 200,
+        "response": {
+          "excluded_ranges": [],
+          "network": "2001:db8::/64",
+          "description": "Lorem ipsum dolor sit amet",
+          "vlan": null,
+          "dns_delegated": false,
+          "category": "",
+          "location": "",
+          "frozen": false,
+          "reserved": 3
+        }
       }
     ],
     "time": null
@@ -926,9 +1221,26 @@
     "warning": [],
     "error": [],
     "output": [
-      "No used addresses on 2001:db8::/64"
+      "No used addresses on network 2001:db8::/64"
     ],
     "api_requests": [
+      {
+        "method": "GET",
+        "url": "/api/v1/networks/2001%3Adb8%3A%3A/64",
+        "data": {},
+        "status": 200,
+        "response": {
+          "excluded_ranges": [],
+          "network": "2001:db8::/64",
+          "description": "Lorem ipsum dolor sit amet",
+          "vlan": null,
+          "dns_delegated": false,
+          "category": "",
+          "location": "",
+          "frozen": false,
+          "reserved": 3
+        }
+      },
       {
         "method": "GET",
         "url": "/api/v1/networks/2001%3Adb8%3A%3A/64/used_host_list",
@@ -5053,6 +5365,23 @@
       "2001:db8::1003           "
     ],
     "api_requests": [
+      {
+        "method": "GET",
+        "url": "/api/v1/networks/2001%3Adb8%3A%3A/64",
+        "data": {},
+        "status": 200,
+        "response": {
+          "excluded_ranges": [],
+          "network": "2001:db8::/64",
+          "description": "Lorem ipsum dolor sit amet",
+          "vlan": null,
+          "dns_delegated": false,
+          "category": "",
+          "location": "",
+          "frozen": false,
+          "reserved": 3
+        }
+      },
       {
         "method": "GET",
         "url": "/api/v1/networks/2001%3Adb8%3A%3A/64/unused_list",
@@ -9166,7 +9495,7 @@
     "command_filter_negate": false,
     "command_issued": "network set_reserved 2001:db8::/64 50",
     "ok": [
-      "OK: : updated reserved to '50' for 2001:db8::/64"
+      "Updated reserved to '50' for 2001:db8::/64"
     ],
     "warning": [],
     "error": [],
@@ -9196,6 +9525,30 @@
           "reserved": 50
         },
         "status": 204
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/networks/?id=2",
+        "data": {},
+        "status": 200,
+        "response": {
+          "count": 1,
+          "next": null,
+          "previous": null,
+          "results": [
+            {
+              "excluded_ranges": [],
+              "network": "2001:db8::/64",
+              "description": "Lorem ipsum dolor sit amet",
+              "vlan": null,
+              "dns_delegated": false,
+              "category": "",
+              "location": "",
+              "frozen": false,
+              "reserved": 50
+            }
+          ]
+        }
       }
     ],
     "time": null
@@ -9206,24 +9559,37 @@
     "command_filter_negate": false,
     "command_issued": "host add tinyhost -ip 2001:db8::/64 -contact me@example.org",
     "ok": [
-      "OK: : created host tinyhost.example.org with IP 2001:db8::33"
-    ],
-    "warning": [
-      "WARNING: : host not found: tinyhost.example.org"
+      "Created host tinyhost.example.org"
     ],
+    "warning": [],
     "error": [],
-    "output": [],
+    "output": [
+      "Name:         tinyhost.example.org",
+      "Contact:      me@example.org",
+      "AAAA_Records  IP                            MAC",
+      "              2001:db8::f49e:aab:d943:f50b  <not set>",
+      "TTL:          (Default)",
+      "TXT:          v=spf1 -all",
+      "Created:      Fri Jun  7 10:43:31 2024",
+      "Updated:      Fri Jun  7 10:43:31 2024"
+    ],
     "api_requests": [
       {
         "method": "GET",
-        "url": "/api/v1/hosts/?name=tinyhost.example.org",
+        "url": "/api/v1/hosts/tinyhost.example.org",
         "data": {},
-        "status": 200,
+        "status": 404,
         "response": {
-          "count": 0,
-          "next": null,
-          "previous": null,
-          "results": []
+          "detail": "Not found."
+        }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/cnames/tinyhost.example.org",
+        "data": {},
+        "status": 404,
+        "response": {
+          "detail": "Not found."
         }
       },
       {
@@ -9253,7 +9619,66 @@
       },
       {
         "method": "GET",
-        "url": "/api/v1/cnames/?name=tinyhost.example.org",
+        "url": "/api/v1/networks/2001%3Adb8%3A%3A/64",
+        "data": {},
+        "status": 200,
+        "response": {
+          "excluded_ranges": [],
+          "network": "2001:db8::/64",
+          "description": "Lorem ipsum dolor sit amet",
+          "vlan": null,
+          "dns_delegated": false,
+          "category": "",
+          "location": "",
+          "frozen": false,
+          "reserved": 50
+        }
+      },      
+      {
+        "method": "POST",
+        "url": "/api/v1/hosts/",
+        "data": {
+          "name": "tinyhost.example.org",
+          "contact": "me@example.org",
+          "network": "2001:db8::/64"
+        },
+        "status": 201
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/hosts/tinyhost.example.org",
+        "data": {},
+        "status": 200,
+        "response": {
+          "ipaddresses": [
+            {
+              "macaddress": "",
+              "ipaddress": "2001:db8::f49e:aab:d943:f50b",
+              "host": 2
+            }
+          ],
+          "cnames": [],
+          "mxs": [],
+          "txts": [
+            {
+              "txt": "v=spf1 -all",
+              "host": 2
+            }
+          ],
+          "ptr_overrides": [],
+          "hinfo": null,
+          "loc": null,
+          "bacnetid": null,
+          "name": "tinyhost.example.org",
+          "contact": "me@example.org",
+          "ttl": null,
+          "comment": "",
+          "zone": 1
+        }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/srvs/?host=2",
         "data": {},
         "status": 200,
         "response": {
@@ -9265,97 +9690,51 @@
       },
       {
         "method": "GET",
-        "url": "/api/v1/networks/2001%3Adb8%3A%3A/64",
+        "url": "/api/v1/naptrs/?host=2",
         "data": {},
         "status": 200,
         "response": {
-          "excluded_ranges": [],
-          "network": "2001:db8::/64",
-          "description": "Lorem ipsum dolor sit amet",
-          "vlan": null,
-          "dns_delegated": false,
-          "category": "",
-          "location": "",
-          "frozen": false,
-          "reserved": 50
+          "count": 0,
+          "next": null,
+          "previous": null,
+          "results": []
         }
       },
       {
         "method": "GET",
-        "url": "/api/v1/networks/2001%3Adb8%3A%3A/64/first_unused",
+        "url": "/api/v1/sshfps/?host=2",
         "data": {},
         "status": 200,
-        "response": "2001:db8::33"
+        "response": {
+          "count": 0,
+          "next": null,
+          "previous": null,
+          "results": []
+        }
       },
       {
         "method": "GET",
-        "url": "/api/v1/networks/2001%3Adb8%3A%3A/64/reserved_list",
+        "url": "/api/v1/hostpolicy/roles/?hosts=2",
         "data": {},
         "status": 200,
-        "response": [
-          "2001:db8::",
-          "2001:db8::1",
-          "2001:db8::2",
-          "2001:db8::3",
-          "2001:db8::4",
-          "2001:db8::5",
-          "2001:db8::6",
-          "2001:db8::7",
-          "2001:db8::8",
-          "2001:db8::9",
-          "2001:db8::a",
-          "2001:db8::b",
-          "2001:db8::c",
-          "2001:db8::d",
-          "2001:db8::e",
-          "2001:db8::f",
-          "2001:db8::10",
-          "2001:db8::11",
-          "2001:db8::12",
-          "2001:db8::13",
-          "2001:db8::14",
-          "2001:db8::15",
-          "2001:db8::16",
-          "2001:db8::17",
-          "2001:db8::18",
-          "2001:db8::19",
-          "2001:db8::1a",
-          "2001:db8::1b",
-          "2001:db8::1c",
-          "2001:db8::1d",
-          "2001:db8::1e",
-          "2001:db8::1f",
-          "2001:db8::20",
-          "2001:db8::21",
-          "2001:db8::22",
-          "2001:db8::23",
-          "2001:db8::24",
-          "2001:db8::25",
-          "2001:db8::26",
-          "2001:db8::27",
-          "2001:db8::28",
-          "2001:db8::29",
-          "2001:db8::2a",
-          "2001:db8::2b",
-          "2001:db8::2c",
-          "2001:db8::2d",
-          "2001:db8::2e",
-          "2001:db8::2f",
-          "2001:db8::30",
-          "2001:db8::31",
-          "2001:db8::32"
-        ]
+        "response": {
+          "count": 0,
+          "next": null,
+          "previous": null,
+          "results": []
+        }
       },
       {
-        "method": "POST",
-        "url": "/api/v1/hosts/",
-        "data": {
-          "name": "tinyhost.example.org",
-          "contact": "me@example.org",
-          "comment": null,
-          "ipaddress": "2001:db8::33"
-        },
-        "status": 201
+        "method": "GET",
+        "url": "/api/v1/hostgroups/?hosts=2",
+        "data": {},
+        "status": 200,
+        "response": {
+          "count": 0,
+          "next": null,
+          "previous": null,
+          "results": []
+        }
       }
     ],
     "time": null
@@ -9365,13 +9744,11 @@
     "command_filter": "2001",
     "command_filter_negate": false,
     "command_issued": "host info tinyhost | 2001",
-    "ok": [
-      "OK: : printed host info for tinyhost.example.org"
-    ],
+    "ok": [],
     "warning": [],
     "error": [],
     "output": [
-      "              2001:db8::33    <not set>"
+      "              2001:db8::f49e:aab:d943:f50b  <not set>"
     ],
     "api_requests": [
       {
@@ -9383,7 +9760,7 @@
           "ipaddresses": [
             {
               "macaddress": "",
-              "ipaddress": "2001:db8::33",
+              "ipaddress": "2001:db8::f49e:aab:d943:f50b",
               "host": 2
             }
           ],
@@ -9444,7 +9821,7 @@
       },
       {
         "method": "GET",
-        "url": "/api/v1/hostpolicy/roles/?hosts__name=tinyhost.example.org",
+        "url": "/api/v1/hostpolicy/roles/?hosts=2",
         "data": {},
         "status": 200,
         "response": {
@@ -9453,7 +9830,19 @@
           "previous": null,
           "results": []
         }
-      }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/hostgroups/?hosts=2",
+        "data": {},
+        "status": 200,
+        "response": {
+          "count": 0,
+          "next": null,
+          "previous": null,
+          "results": []
+        }
+      }      
     ],
     "time": null
   },
@@ -9462,16 +9851,16 @@
     "command_filter": "example.org",
     "command_filter_negate": true,
     "command_issued": "host info tinyhost |! example.org",
-    "ok": [
-      "OK: : printed host info for tinyhost.example.org"
-    ],
+    "ok": [],
     "warning": [],
     "error": [],
     "output": [
       "AAAA_Records  IP              MAC",
       "              2001:db8::33    <not set>",
       "TTL:          (Default)",
-      "TXT:          v=spf1 -all"
+      "TXT:          v=spf1 -all",
+      "Created:      Fri Jun  7 16:28:33 2024",
+      "Updated:      Fri Jun  7 16:28:33 2024"
     ],
     "api_requests": [
       {
@@ -9483,7 +9872,7 @@
           "ipaddresses": [
             {
               "macaddress": "",
-              "ipaddress": "2001:db8::33",
+              "ipaddress": "2001:db8::f49e:aab:d943:f50b",
               "host": 2
             }
           ],
@@ -9544,7 +9933,19 @@
       },
       {
         "method": "GET",
-        "url": "/api/v1/hostpolicy/roles/?hosts__name=tinyhost.example.org",
+        "url": "/api/v1/hostpolicy/roles/?hosts=2",
+        "data": {},
+        "status": 200,
+        "response": {
+          "count": 0,
+          "next": null,
+          "previous": null,
+          "results": []
+        }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/hostgroups/?hosts=2",
         "data": {},
         "status": 200,
         "response": {
@@ -9563,7 +9964,7 @@
     "command_filter_negate": false,
     "command_issued": "host remove tinyhost",
     "ok": [
-      "OK: : removed tinyhost.example.org"
+      "removed tinyhost.example.org"
     ],
     "warning": [],
     "error": [],
@@ -9615,7 +10016,7 @@
       },
       {
         "method": "GET",
-        "url": "/api/v1/srvs/?host__name=tinyhost.example.org",
+        "url": "/api/v1/srvs/?host=2",
         "data": {},
         "status": 200,
         "response": {
@@ -9640,7 +10041,7 @@
     "command_filter_negate": false,
     "command_issued": "network remove 2001:db8::/64 -f",
     "ok": [
-      "OK: : removed network 2001:db8::/64"
+      "Removed network 2001:db8::/64"
     ],
     "warning": [],
     "error": [],
@@ -9648,10 +10049,27 @@
     "api_requests": [
       {
         "method": "GET",
-        "url": "/api/v1/networks/2001%3Adb8%3A%3A/64/used_list",
+        "url": "/api/v1/networks/2001%3Adb8%3A%3A/64",
         "data": {},
         "status": 200,
-        "response": []
+        "response": {
+          "excluded_ranges": [],
+          "network": "2001:db8::/64",
+          "description": "Lorem ipsum dolor sit amet",
+          "vlan": null,
+          "dns_delegated": false,
+          "category": "",
+          "location": "",
+          "frozen": false,
+          "reserved": 50
+        }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/networks/2001%3Adb8%3A%3A/64/used_count",
+        "data": {},
+        "status": 200,
+        "response": 0
       },
       {
         "method": "DELETE",
@@ -9668,7 +10086,7 @@
     "command_filter_negate": false,
     "command_issued": "network create -network 10.0.1.0/24 -desc \"Frozzzen\"        # frozen network",
     "ok": [
-      "OK: : created network 10.0.1.0/24"
+      "created network 10.0.1.0/24"
     ],
     "warning": [],
     "error": [],
@@ -9692,12 +10110,26 @@
         "data": {
           "network": "10.0.1.0/24",
           "description": "Frozzzen",
-          "vlan": null,
-          "category": null,
-          "location": null,
           "frozen": false
         },
         "status": 201
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/networks/10.0.1.0/24",
+        "data": {},
+        "status": 200,
+        "response": {
+          "excluded_ranges": [],
+          "network": "10.0.1.0/24",
+          "description": "Frozzzen",
+          "vlan": null,
+          "dns_delegated": false,
+          "category": "",
+          "location": "",
+          "frozen": false,
+          "reserved": 3
+        }
       }
     ],
     "time": null
@@ -9708,7 +10140,7 @@
     "command_filter_negate": false,
     "command_issued": "network set_frozen 10.0.1.0/24",
     "ok": [
-      "OK: : updated frozen to 'True' for 10.0.1.0/24"
+      "Updated frozen to 'True' for 10.0.1.0/24"
     ],
     "warning": [],
     "error": [],
@@ -9738,33 +10170,62 @@
           "frozen": true
         },
         "status": 204
-      }
-    ],
-    "time": null
-  },
-  {
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/networks/?id=3",
+        "data": {},
+        "status": 200,
+        "response": {
+          "count": 1,
+          "next": null,
+          "previous": null,
+          "results": [
+            {
+              "excluded_ranges": [],
+              "network": "10.0.1.0/24",
+              "description": "Frozzzen",
+              "vlan": null,
+              "dns_delegated": false,
+              "category": "",
+              "location": "",
+              "frozen": true,
+              "reserved": 3
+            }
+          ]
+        }
+      }      
+    ],
+    "time": null
+  },
+  {
     "command": "host add somehost -ip 10.0.1.0/24 -contact support@example.org",
     "command_filter": null,
     "command_filter_negate": false,
     "command_issued": "host add somehost -ip 10.0.1.0/24 -contact support@example.org  # should require force, because net's frozen",
     "ok": [],
     "warning": [
-      "WARNING: : host not found: somehost.example.org",
-      "WARNING: : network 10.0.1.0/24 is frozen, must force"
+      "Network 10.0.1.0/24 is frozen, must force"
     ],
     "error": [],
     "output": [],
     "api_requests": [
       {
         "method": "GET",
-        "url": "/api/v1/hosts/?name=somehost.example.org",
+        "url": "/api/v1/hosts/somehost.example.org",
         "data": {},
-        "status": 200,
+        "status": 404,
         "response": {
-          "count": 0,
-          "next": null,
-          "previous": null,
-          "results": []
+          "detail": "Not found."
+        }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/cnames/somehost.example.org",
+        "data": {},
+        "status": 404,
+        "response": {
+          "detail": "Not found."
         }
       },
       {
@@ -9792,18 +10253,6 @@
           }
         }
       },
-      {
-        "method": "GET",
-        "url": "/api/v1/cnames/?name=somehost.example.org",
-        "data": {},
-        "status": 200,
-        "response": {
-          "count": 0,
-          "next": null,
-          "previous": null,
-          "results": []
-        }
-      },
       {
         "method": "GET",
         "url": "/api/v1/networks/10.0.1.0/24",
@@ -9820,13 +10269,6 @@
           "frozen": true,
           "reserved": 3
         }
-      },
-      {
-        "method": "GET",
-        "url": "/api/v1/networks/10.0.1.0/24/first_unused",
-        "data": {},
-        "status": 200,
-        "response": "10.0.1.4"
       }
     ],
     "time": null
@@ -9837,7 +10279,7 @@
     "command_filter_negate": false,
     "command_issued": "network add_excluded_range 10.0.1.0/24 10.0.1.20 10.0.1.30",
     "ok": [
-      "OK: : Added exclude range to 10.0.1.0/24"
+      "Added exclude range to 10.0.1.0/24"
     ],
     "warning": [],
     "error": [],
@@ -9880,22 +10322,27 @@
     "command_issued": "host add somehost -ip 10.0.1.20 -contact support@example.org -force # should fail because ip is in excluded range",
     "ok": [],
     "warning": [
-      "WARNING: : host not found: somehost.example.org",
-      "WARNING: : POST \"http://127.0.0.1:8000/api/v1/hosts/\": 400: Bad Request\n{\n  \"non_field_errors\": [\n    \"IP 10.0.1.20 in an excluded range: 10.0.1.0/24 -> [10.0.1.20 -> [10.0.1.30]\"\n  ]\n}"
+      "POST \"http://127.0.0.1:8000/api/v1/hosts/\": 400: Bad Request\n{\n  \"non_field_errors\": [\n    \"IP 10.0.1.20 in an excluded range: 10.0.1.0/24 -> [10.0.1.20 -> [10.0.1.30]\"\n  ]\n}"
     ],
     "error": [],
     "output": [],
     "api_requests": [
       {
         "method": "GET",
-        "url": "/api/v1/hosts/?name=somehost.example.org",
+        "url": "/api/v1/hosts/somehost.example.org",
         "data": {},
-        "status": 200,
+        "status": 404,
         "response": {
-          "count": 0,
-          "next": null,
-          "previous": null,
-          "results": []
+          "detail": "Not found."
+        }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/cnames/somehost.example.org",
+        "data": {},
+        "status": 404,
+        "response": {
+          "detail": "Not found."
         }
       },
       {
@@ -9923,30 +10370,6 @@
           }
         }
       },
-      {
-        "method": "GET",
-        "url": "/api/v1/cnames/?name=somehost.example.org",
-        "data": {},
-        "status": 200,
-        "response": {
-          "count": 0,
-          "next": null,
-          "previous": null,
-          "results": []
-        }
-      },
-      {
-        "method": "GET",
-        "url": "/api/v1/hosts/?ipaddresses__ipaddress=10.0.1.20",
-        "data": {},
-        "status": 200,
-        "response": {
-          "count": 0,
-          "next": null,
-          "previous": null,
-          "results": []
-        }
-      },
       {
         "method": "GET",
         "url": "/api/v1/networks/ip/10.0.1.20",
@@ -9970,26 +10393,12 @@
           "reserved": 3
         }
       },
-      {
-        "method": "GET",
-        "url": "/api/v1/networks/10.0.1.0/24/reserved_list",
-        "data": {},
-        "status": 200,
-        "response": [
-          "10.0.1.0",
-          "10.0.1.1",
-          "10.0.1.2",
-          "10.0.1.3",
-          "10.0.1.255"
-        ]
-      },
       {
         "method": "POST",
         "url": "/api/v1/hosts/",
         "data": {
           "name": "somehost.example.org",
           "contact": "support@example.org",
-          "comment": null,
           "ipaddress": "10.0.1.20"
         },
         "status": 400,
@@ -10008,24 +10417,37 @@
     "command_filter_negate": false,
     "command_issued": "host add somehost -ip 10.0.1.0/24 -contact support@example.org -force",
     "ok": [
-      "OK: : created host somehost.example.org with IP 10.0.1.4"
-    ],
-    "warning": [
-      "WARNING: : host not found: somehost.example.org"
+      "Created host somehost.example.org"
     ],
+    "warning": [],
     "error": [],
-    "output": [],
+    "output": [
+      "Name:         somehost.example.org",
+      "Contact:      support@example.org",
+      "A_Records     IP            MAC",
+      "              10.0.1.79     <not set>",
+      "TTL:          (Default)",
+      "TXT:          v=spf1 -all",
+      "Created:      Mon Jun 10 16:15:46 2024",
+      "Updated:      Mon Jun 10 16:15:46 2024"
+    ],
     "api_requests": [
       {
         "method": "GET",
-        "url": "/api/v1/hosts/?name=somehost.example.org",
+        "url": "/api/v1/hosts/somehost.example.org",
         "data": {},
-        "status": 200,
+        "status": 404,
         "response": {
-          "count": 0,
-          "next": null,
-          "previous": null,
-          "results": []
+          "detail": "Not found."
+        }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/cnames/somehost.example.org",
+        "data": {},
+        "status": 404,
+        "response": {
+          "detail": "Not found."
         }
       },
       {
@@ -10053,18 +10475,6 @@
           }
         }
       },
-      {
-        "method": "GET",
-        "url": "/api/v1/cnames/?name=somehost.example.org",
-        "data": {},
-        "status": 200,
-        "response": {
-          "count": 0,
-          "next": null,
-          "previous": null,
-          "results": []
-        }
-      },
       {
         "method": "GET",
         "url": "/api/v1/networks/10.0.1.0/24",
@@ -10088,36 +10498,107 @@
           "reserved": 3
         }
       },
+      {
+        "method": "POST",
+        "url": "/api/v1/hosts/",
+        "data": {
+          "name": "somehost.example.org",
+          "contact": "support@example.org",
+          "network": "10.0.1.0/24"
+        },
+        "status": 201
+      },
       {
         "method": "GET",
-        "url": "/api/v1/networks/10.0.1.0/24/first_unused",
+        "url": "/api/v1/hosts/somehost.example.org",
         "data": {},
         "status": 200,
-        "response": "10.0.1.4"
+        "response": {
+          "ipaddresses": [
+            {
+              "macaddress": "",
+              "ipaddress": "10.0.1.79",
+              "host": 4
+            }
+          ],
+          "cnames": [],
+          "mxs": [],
+          "txts": [
+            {
+              "txt": "v=spf1 -all",
+              "host": 4
+            }
+          ],
+          "ptr_overrides": [],
+          "hinfo": null,
+          "loc": null,
+          "bacnetid": null,
+          "name": "somehost.example.org",
+          "contact": "support@example.org",
+          "ttl": null,
+          "comment": "",
+          "zone": 1
+        }
       },
       {
         "method": "GET",
-        "url": "/api/v1/networks/10.0.1.0/24/reserved_list",
+        "url": "/api/v1/srvs/?host=4",
         "data": {},
         "status": 200,
-        "response": [
-          "10.0.1.0",
-          "10.0.1.1",
-          "10.0.1.2",
-          "10.0.1.3",
-          "10.0.1.255"
-        ]
+        "response": {
+          "count": 0,
+          "next": null,
+          "previous": null,
+          "results": []
+        }
       },
       {
-        "method": "POST",
-        "url": "/api/v1/hosts/",
-        "data": {
-          "name": "somehost.example.org",
-          "contact": "support@example.org",
-          "comment": null,
-          "ipaddress": "10.0.1.4"
-        },
-        "status": 201
+        "method": "GET",
+        "url": "/api/v1/naptrs/?host=4",
+        "data": {},
+        "status": 200,
+        "response": {
+          "count": 0,
+          "next": null,
+          "previous": null,
+          "results": []
+        }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/sshfps/?host=4",
+        "data": {},
+        "status": 200,
+        "response": {
+          "count": 0,
+          "next": null,
+          "previous": null,
+          "results": []
+        }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/hostpolicy/roles/?hosts=4",
+        "data": {},
+        "status": 200,
+        "response": {
+          "count": 0,
+          "next": null,
+          "previous": null,
+          "results": []
+        }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/hostgroups/?hosts=4",
+        "data": {},
+        "status": 200,
+        "response": {
+          "count": 0,
+          "next": null,
+          "previous": null,
+          "results": []
+        }
       }
     ],
     "time": null
@@ -10136,11 +10617,34 @@
     "api_requests": [
       {
         "method": "GET",
-        "url": "/api/v1/networks/10.0.1.0/24/used_host_list",
+        "url": "/api/v1/networks/10.0.1.0/24",
         "data": {},
         "status": 200,
         "response": {
-          "10.0.1.4": [
+          "excluded_ranges": [
+            {
+              "start_ip": "10.0.1.20",
+              "end_ip": "10.0.1.30",
+              "network": 3
+            }
+          ],
+          "network": "10.0.1.0/24",
+          "description": "Frozzzen",
+          "vlan": null,
+          "dns_delegated": false,
+          "category": "",
+          "location": "",
+          "frozen": true,
+          "reserved": 3
+        }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/networks/10.0.1.0/24/used_host_list",
+        "data": {},
+        "status": 200,
+        "response": {
+          "10.0.1.79": [
             "somehost.example.org"
           ]
         }
@@ -11772,7 +12276,7 @@
     "command_filter_negate": false,
     "command_issued": "group create mygroup \"This describes the group\"",
     "ok": [
-      "OK: : Created new group 'mygroup'"
+      "Created new group mygroup"
     ],
     "warning": [],
     "error": [],
@@ -11780,14 +12284,11 @@
     "api_requests": [
       {
         "method": "GET",
-        "url": "/api/v1/hostgroups/?name=mygroup",
+        "url": "/api/v1/hostgroups/mygroup",
         "data": {},
-        "status": 200,
+        "status": 404,
         "response": {
-          "count": 0,
-          "next": null,
-          "previous": null,
-          "results": []
+          "detail": "Not found."
         }
       },
       {
@@ -11798,6 +12299,20 @@
           "description": "This describes the group"
         },
         "status": 201
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/hostgroups/mygroup",
+        "data": {},
+        "status": 200,
+        "response": {
+          "parent": [],
+          "groups": [],
+          "hosts": [],
+          "owners": [],
+          "name": "mygroup",
+          "description": "This describes the group"
+        }
       }
     ],
     "time": null
@@ -11808,24 +12323,35 @@
     "command_filter_negate": false,
     "command_issued": "host add testhost1",
     "ok": [
-      "OK: : created host testhost1.example.org"
-    ],
-    "warning": [
-      "WARNING: : host not found: testhost1.example.org"
+      "Created host testhost1.example.org"
     ],
+    "warning": [],
     "error": [],
-    "output": [],
+    "output": [
+      "Name:         testhost1.example.org",
+      "Contact:      ",
+      "TTL:          (Default)",
+      "TXT:          v=spf1 -all",
+      "Created:      Wed Jun  5 11:30:33 2024",
+      "Updated:      Wed Jun  5 11:30:33 2024"
+    ],
     "api_requests": [
       {
         "method": "GET",
-        "url": "/api/v1/hosts/?name=testhost1.example.org",
+        "url": "/api/v1/hosts/testhost1.example.org",
         "data": {},
-        "status": 200,
+        "status": 404,
         "response": {
-          "count": 0,
-          "next": null,
-          "previous": null,
-          "results": []
+          "detail": "Not found."
+        }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/cnames/testhost1.example.org",
+        "data": {},
+        "status": 404,
+        "response": {
+          "detail": "Not found."
         }
       },
       {
@@ -11853,9 +12379,43 @@
           }
         }
       },
+      {
+        "method": "POST",
+        "url": "/api/v1/hosts/",
+        "data": {
+          "name": "testhost1.example.org"
+        },
+        "status": 201
+      },
       {
         "method": "GET",
-        "url": "/api/v1/cnames/?name=testhost1.example.org",
+        "url": "/api/v1/hosts/testhost1.example.org",
+        "data": {},
+        "status": 200,
+        "response": {
+          "ipaddresses": [],
+          "cnames": [],
+          "mxs": [],
+          "txts": [
+            {
+              "txt": "v=spf1 -all",
+              "host": 7
+            }
+          ],
+          "ptr_overrides": [],
+          "hinfo": null,
+          "loc": null,
+          "bacnetid": null,
+          "name": "testhost1.example.org",
+          "contact": "",
+          "ttl": null,
+          "comment": "",
+          "zone": 1
+        }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/srvs/?host=7",
         "data": {},
         "status": 200,
         "response": {
@@ -11866,14 +12426,52 @@
         }
       },
       {
-        "method": "POST",
-        "url": "/api/v1/hosts/",
-        "data": {
-          "name": "testhost1.example.org",
-          "contact": null,
-          "comment": null
-        },
-        "status": 201
+        "method": "GET",
+        "url": "/api/v1/naptrs/?host=7",
+        "data": {},
+        "status": 200,
+        "response": {
+          "count": 0,
+          "next": null,
+          "previous": null,
+          "results": []
+        }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/sshfps/?host=7",
+        "data": {},
+        "status": 200,
+        "response": {
+          "count": 0,
+          "next": null,
+          "previous": null,
+          "results": []
+        }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/hostpolicy/roles/?hosts=7",
+        "data": {},
+        "status": 200,
+        "response": {
+          "count": 0,
+          "next": null,
+          "previous": null,
+          "results": []
+        }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/hostgroups/?hosts=7",
+        "data": {},
+        "status": 200,
+        "response": {
+          "count": 0,
+          "next": null,
+          "previous": null,
+          "results": []
+        }
       }
     ],
     "time": null
@@ -11884,24 +12482,35 @@
     "command_filter_negate": false,
     "command_issued": "host add testhost2",
     "ok": [
-      "OK: : created host testhost2.example.org"
-    ],
-    "warning": [
-      "WARNING: : host not found: testhost2.example.org"
+      "Created host testhost2.example.org"
     ],
+    "warning": [],
     "error": [],
-    "output": [],
+    "output": [
+      "Name:         testhost2.example.org",
+      "Contact:      ",
+      "TTL:          (Default)",
+      "TXT:          v=spf1 -all",
+      "Created:      Wed Jun  5 11:30:33 2024",
+      "Updated:      Wed Jun  5 11:30:33 2024"
+    ],
     "api_requests": [
       {
         "method": "GET",
-        "url": "/api/v1/hosts/?name=testhost2.example.org",
+        "url": "/api/v1/hosts/testhost2.example.org",
         "data": {},
-        "status": 200,
+        "status": 404,
         "response": {
-          "count": 0,
-          "next": null,
-          "previous": null,
-          "results": []
+          "detail": "Not found."
+        }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/cnames/testhost2.example.org",
+        "data": {},
+        "status": 404,
+        "response": {
+          "detail": "Not found."
         }
       },
       {
@@ -11929,9 +12538,43 @@
           }
         }
       },
+      {
+        "method": "POST",
+        "url": "/api/v1/hosts/",
+        "data": {
+          "name": "testhost2.example.org"
+        },
+        "status": 201
+      },
       {
         "method": "GET",
-        "url": "/api/v1/cnames/?name=testhost2.example.org",
+        "url": "/api/v1/hosts/testhost2.example.org",
+        "data": {},
+        "status": 200,
+        "response": {
+          "ipaddresses": [],
+          "cnames": [],
+          "mxs": [],
+          "txts": [
+            {
+              "txt": "v=spf1 -all",
+              "host": 8
+            }
+          ],
+          "ptr_overrides": [],
+          "hinfo": null,
+          "loc": null,
+          "bacnetid": null,
+          "name": "testhost2.example.org",
+          "contact": "",
+          "ttl": null,
+          "comment": "",
+          "zone": 1
+        }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/srvs/?host=8",
         "data": {},
         "status": 200,
         "response": {
@@ -11942,14 +12585,52 @@
         }
       },
       {
-        "method": "POST",
-        "url": "/api/v1/hosts/",
-        "data": {
-          "name": "testhost2.example.org",
-          "contact": null,
-          "comment": null
-        },
-        "status": 201
+        "method": "GET",
+        "url": "/api/v1/naptrs/?host=8",
+        "data": {},
+        "status": 200,
+        "response": {
+          "count": 0,
+          "next": null,
+          "previous": null,
+          "results": []
+        }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/sshfps/?host=8",
+        "data": {},
+        "status": 200,
+        "response": {
+          "count": 0,
+          "next": null,
+          "previous": null,
+          "results": []
+        }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/hostpolicy/roles/?hosts=8",
+        "data": {},
+        "status": 200,
+        "response": {
+          "count": 0,
+          "next": null,
+          "previous": null,
+          "results": []
+        }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/hostgroups/?hosts=8",
+        "data": {},
+        "status": 200,
+        "response": {
+          "count": 0,
+          "next": null,
+          "previous": null,
+          "results": []
+        }
       }
     ],
     "time": null
@@ -11960,7 +12641,7 @@
     "command_filter_negate": false,
     "command_issued": "group host_add mygroup testhost1",
     "ok": [
-      "OK: : Added host 'testhost1.example.org' to 'mygroup'"
+      "Added host 'testhost1.example.org' to 'mygroup'"
     ],
     "warning": [],
     "error": [],
@@ -11968,23 +12649,16 @@
     "api_requests": [
       {
         "method": "GET",
-        "url": "/api/v1/hostgroups/?name=mygroup",
+        "url": "/api/v1/hostgroups/mygroup",
         "data": {},
         "status": 200,
         "response": {
-          "count": 1,
-          "next": null,
-          "previous": null,
-          "results": [
-            {
-              "parent": [],
-              "groups": [],
-              "hosts": [],
-              "owners": [],
-              "name": "mygroup",
-              "description": "This describes the group"
-            }
-          ]
+          "parent": [],
+          "groups": [],
+          "hosts": [],
+          "owners": [],
+          "name": "mygroup",
+          "description": "This describes the group"
         }
       },
       {
@@ -11999,7 +12673,7 @@
           "txts": [
             {
               "txt": "v=spf1 -all",
-              "host": 9
+              "host": 7
             }
           ],
           "ptr_overrides": [],
@@ -12012,14 +12686,39 @@
           "comment": "",
           "zone": 1
         }
-      },
-      {
-        "method": "POST",
-        "url": "/api/v1/hostgroups/mygroup/hosts/",
-        "data": {
-          "name": "testhost1.example.org"
-        },
-        "status": 201
+      },
+      {
+        "method": "POST",
+        "url": "/api/v1/hostgroups/mygroup/hosts/",
+        "data": {
+          "name": "testhost1.example.org"
+        },
+        "status": 201
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/hostgroups/?id=1",
+        "data": {},
+        "status": 200,
+        "response": {
+          "count": 1,
+          "next": null,
+          "previous": null,
+          "results": [
+            {
+              "parent": [],
+              "groups": [],
+              "hosts": [
+                {
+                  "name": "testhost1.example.org"
+                }
+              ],
+              "owners": [],
+              "name": "mygroup",
+              "description": "This describes the group"
+            }
+          ]
+        }
       }
     ],
     "time": null
@@ -12030,7 +12729,7 @@
     "command_filter_negate": false,
     "command_issued": "group host_add mygroup testhost2",
     "ok": [
-      "OK: : Added host 'testhost2.example.org' to 'mygroup'"
+      "Added host 'testhost2.example.org' to 'mygroup'"
     ],
     "warning": [],
     "error": [],
@@ -12038,27 +12737,20 @@
     "api_requests": [
       {
         "method": "GET",
-        "url": "/api/v1/hostgroups/?name=mygroup",
+        "url": "/api/v1/hostgroups/mygroup",
         "data": {},
         "status": 200,
         "response": {
-          "count": 1,
-          "next": null,
-          "previous": null,
-          "results": [
+          "parent": [],
+          "groups": [],
+          "hosts": [
             {
-              "parent": [],
-              "groups": [],
-              "hosts": [
-                {
-                  "name": "testhost1.example.org"
-                }
-              ],
-              "owners": [],
-              "name": "mygroup",
-              "description": "This describes the group"
+              "name": "testhost1.example.org"
             }
-          ]
+          ],
+          "owners": [],
+          "name": "mygroup",
+          "description": "This describes the group"
         }
       },
       {
@@ -12073,7 +12765,7 @@
           "txts": [
             {
               "txt": "v=spf1 -all",
-              "host": 10
+              "host": 8
             }
           ],
           "ptr_overrides": [],
@@ -12094,25 +12786,10 @@
           "name": "testhost2.example.org"
         },
         "status": 201
-      }
-    ],
-    "time": null
-  },
-  {
-    "command": "group owner_add mygroup myself",
-    "command_filter": null,
-    "command_filter_negate": false,
-    "command_issued": "group owner_add mygroup myself",
-    "ok": [
-      "OK: : Added 'myself' as owner of 'mygroup'"
-    ],
-    "warning": [],
-    "error": [],
-    "output": [],
-    "api_requests": [
+      },
       {
         "method": "GET",
-        "url": "/api/v1/hostgroups/?name=mygroup",
+        "url": "/api/v1/hostgroups/?id=1",
         "data": {},
         "status": 200,
         "response": {
@@ -12137,25 +12814,17 @@
             }
           ]
         }
-      },
-      {
-        "method": "POST",
-        "url": "/api/v1/hostgroups/mygroup/owners/",
-        "data": {
-          "name": "myself"
-        },
-        "status": 201
       }
     ],
     "time": null
   },
   {
-    "command": "group host_remove mygroup testhost2",
+    "command": "group owner_add mygroup myself",
     "command_filter": null,
     "command_filter_negate": false,
-    "command_issued": "group host_remove mygroup testhost2",
+    "command_issued": "group owner_add mygroup myself",
     "ok": [
-      "OK: : Removed host 'testhost2.example.org' from 'mygroup'"
+      "Added owner 'myself' to 'mygroup'"
     ],
     "warning": [],
     "error": [],
@@ -12163,7 +12832,36 @@
     "api_requests": [
       {
         "method": "GET",
-        "url": "/api/v1/hostgroups/?name=mygroup",
+        "url": "/api/v1/hostgroups/mygroup",
+        "data": {},
+        "status": 200,
+        "response": {
+          "parent": [],
+          "groups": [],
+          "hosts": [
+            {
+              "name": "testhost1.example.org"
+            },
+            {
+              "name": "testhost2.example.org"
+            }
+          ],
+          "owners": [],
+          "name": "mygroup",
+          "description": "This describes the group"
+        }
+      },
+      {
+        "method": "POST",
+        "url": "/api/v1/hostgroups/mygroup/owners/",
+        "data": {
+          "name": "myself"
+        },
+        "status": 201
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/hostgroups/?id=1",
         "data": {},
         "status": 200,
         "response": {
@@ -12192,6 +12890,46 @@
             }
           ]
         }
+      }
+    ],
+    "time": null
+  },
+  {
+    "command": "group host_remove mygroup testhost2",
+    "command_filter": null,
+    "command_filter_negate": false,
+    "command_issued": "group host_remove mygroup testhost2",
+    "ok": [
+      "Removed host 'testhost2.example.org' from 'mygroup'"
+    ],
+    "warning": [],
+    "error": [],
+    "output": [],
+    "api_requests": [
+      {
+        "method": "GET",
+        "url": "/api/v1/hostgroups/mygroup",
+        "data": {},
+        "status": 200,
+        "response": {
+          "parent": [],
+          "groups": [],
+          "hosts": [
+            {
+              "name": "testhost1.example.org"
+            },
+            {
+              "name": "testhost2.example.org"
+            }
+          ],
+          "owners": [
+            {
+              "name": "myself"
+            }
+          ],
+          "name": "mygroup",
+          "description": "This describes the group"
+        }
       },
       {
         "method": "GET",
@@ -12205,7 +12943,7 @@
           "txts": [
             {
               "txt": "v=spf1 -all",
-              "host": 10
+              "host": 8
             }
           ],
           "ptr_overrides": [],
@@ -12224,28 +12962,10 @@
         "url": "/api/v1/hostgroups/mygroup/hosts/testhost2.example.org",
         "data": {},
         "status": 204
-      }
-    ],
-    "time": null
-  },
-  {
-    "command": "group info mygroup",
-    "command_filter": null,
-    "command_filter_negate": false,
-    "command_issued": "group info mygroup",
-    "ok": [],
-    "warning": [],
-    "error": [],
-    "output": [
-      "Name:          mygroup",
-      "Description:   This describes the group",
-      "Members:       1 host",
-      "Owners:        myself"
-    ],
-    "api_requests": [
+      },
       {
         "method": "GET",
-        "url": "/api/v1/hostgroups/?name=mygroup",
+        "url": "/api/v1/hostgroups/?id=1",
         "data": {},
         "status": 200,
         "response": {
@@ -12275,6 +12995,50 @@
     ],
     "time": null
   },
+  {
+    "command": "group info mygroup",
+    "command_filter": null,
+    "command_filter_negate": false,
+    "command_issued": "group info mygroup",
+    "ok": [],
+    "warning": [],
+    "error": [],
+    "output": [
+      "Name:         mygroup",
+      "Description:  This describes the group",
+      "Owners:       myself",
+      "Parents:      ",
+      "Groups:       ",
+      "Hosts:        1",
+      "Created:      Wed Jun  5 11:30:32 2024",
+      "Updated:      Wed Jun  5 11:30:34 2024"
+    ],
+    "api_requests": [
+      {
+        "method": "GET",
+        "url": "/api/v1/hostgroups/mygroup",
+        "data": {},
+        "status": 200,
+        "response": {
+          "parent": [],
+          "groups": [],
+          "hosts": [
+            {
+              "name": "testhost1.example.org"
+            }
+          ],
+          "owners": [
+            {
+              "name": "myself"
+            }
+          ],
+          "name": "mygroup",
+          "description": "This describes the group"
+        }
+      }
+    ],
+    "time": null
+  },
   {
     "command": "group history mygroup",
     "command_filter": null,
@@ -12462,7 +13226,7 @@
     "command_filter_negate": false,
     "command_issued": "group create yourgroup \"meh\"",
     "ok": [
-      "OK: : Created new group 'yourgroup'"
+      "Created new group yourgroup"
     ],
     "warning": [],
     "error": [],
@@ -12470,14 +13234,11 @@
     "api_requests": [
       {
         "method": "GET",
-        "url": "/api/v1/hostgroups/?name=yourgroup",
+        "url": "/api/v1/hostgroups/yourgroup",
         "data": {},
-        "status": 200,
+        "status": 404,
         "response": {
-          "count": 0,
-          "next": null,
-          "previous": null,
-          "results": []
+          "detail": "Not found."
         }
       },
       {
@@ -12488,7 +13249,21 @@
           "description": "meh"
         },
         "status": 201
-      }
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/hostgroups/yourgroup",
+        "data": {},
+        "status": 200,
+        "response": {
+          "parent": [],
+          "groups": [],
+          "hosts": [],
+          "owners": [],
+          "name": "yourgroup",
+          "description": "meh"
+        }
+      }      
     ],
     "time": null
   },
@@ -12498,7 +13273,7 @@
     "command_filter_negate": false,
     "command_issued": "group group_add mygroup yourgroup",
     "ok": [
-      "OK: : Added group 'yourgroup' to 'mygroup'"
+      "Added group 'yourgroup' to 'mygroup'"
     ],
     "warning": [],
     "error": [],
@@ -12506,52 +13281,38 @@
     "api_requests": [
       {
         "method": "GET",
-        "url": "/api/v1/hostgroups/?name=mygroup",
+        "url": "/api/v1/hostgroups/yourgroup",
         "data": {},
         "status": 200,
         "response": {
-          "count": 1,
-          "next": null,
-          "previous": null,
-          "results": [
-            {
-              "parent": [],
-              "groups": [],
-              "hosts": [
-                {
-                  "name": "testhost1.example.org"
-                }
-              ],
-              "owners": [
-                {
-                  "name": "myself"
-                }
-              ],
-              "name": "mygroup",
-              "description": "This describes the group"
-            }
-          ]
+          "parent": [],
+          "groups": [],
+          "hosts": [],
+          "owners": [],
+          "name": "yourgroup",
+          "description": "meh"
         }
       },
       {
         "method": "GET",
-        "url": "/api/v1/hostgroups/?name=yourgroup",
+        "url": "/api/v1/hostgroups/mygroup",
         "data": {},
         "status": 200,
         "response": {
-          "count": 1,
-          "next": null,
-          "previous": null,
-          "results": [
+          "parent": [],
+          "groups": [],
+          "hosts": [
             {
-              "parent": [],
-              "groups": [],
-              "hosts": [],
-              "owners": [],
-              "name": "yourgroup",
-              "description": "meh"
+              "name": "testhost1.example.org"
             }
-          ]
+          ],
+          "owners": [
+            {
+              "name": "myself"
+            }
+          ],
+          "name": "mygroup",
+          "description": "This describes the group"
         }
       },
       {
@@ -12561,28 +13322,10 @@
           "name": "yourgroup"
         },
         "status": 201
-      }
-    ],
-    "time": null
-  },
-  {
-    "command": "group info mygroup",
-    "command_filter": null,
-    "command_filter_negate": false,
-    "command_issued": "group info mygroup",
-    "ok": [],
-    "warning": [],
-    "error": [],
-    "output": [
-      "Name:          mygroup",
-      "Description:   This describes the group",
-      "Members:       1 host, 1 group",
-      "Owners:        myself"
-    ],
-    "api_requests": [
+      },
       {
         "method": "GET",
-        "url": "/api/v1/hostgroups/?name=mygroup",
+        "url": "/api/v1/hostgroups/?id=1",
         "data": {},
         "status": 200,
         "response": {
@@ -12610,7 +13353,55 @@
               "name": "mygroup",
               "description": "This describes the group"
             }
-          ]
+          ]
+        }
+      }
+    ],
+    "time": null
+  },
+  {
+    "command": "group info mygroup",
+    "command_filter": null,
+    "command_filter_negate": false,
+    "command_issued": "group info mygroup",
+    "ok": [],
+    "warning": [],
+    "error": [],
+    "output": [
+      "Name:         mygroup",
+      "Description:  This describes the group",
+      "Owners:       myself",
+      "Parents:      ",
+      "Groups:       yourgroup",
+      "Hosts:        1",
+      "Created:      Wed Jun  5 15:40:45 2024",
+      "Updated:      Wed Jun  5 15:40:47 2024"
+    ],
+    "api_requests": [
+      {
+        "method": "GET",
+        "url": "/api/v1/hostgroups/mygroup",
+        "data": {},
+        "status": 200,
+        "response": {
+          "parent": [],
+          "groups": [
+            {
+              "name": "yourgroup"
+            }
+          ],
+          "hosts": [
+            {
+              "name": "testhost1.example.org"
+            }
+          ],
+          "owners": [
+            {
+              "name": "myself"
+            }
+          ],
+          "name": "mygroup",
+          "description": "This describes the group"
         }
       }
     ],
@@ -12622,7 +13413,7 @@
     "command_filter_negate": false,
     "command_issued": "group group_remove mygroup yourgroup",
     "ok": [
-      "OK: : Removed group 'yourgroup' from 'mygroup'"
+      "Removed group 'yourgroup' from 'mygroup'"
     ],
     "warning": [],
     "error": [],
@@ -12630,7 +13421,39 @@
     "api_requests": [
       {
         "method": "GET",
-        "url": "/api/v1/hostgroups/?name=mygroup",
+        "url": "/api/v1/hostgroups/mygroup",
+        "data": {},
+        "status": 200,
+        "response": {
+          "parent": [],
+          "groups": [
+            {
+              "name": "yourgroup"
+            }
+          ],
+          "hosts": [
+            {
+              "name": "testhost1.example.org"
+            }
+          ],
+          "owners": [
+            {
+              "name": "myself"
+            }
+          ],
+          "name": "mygroup",
+          "description": "This describes the group"
+        }
+      },
+      {
+        "method": "DELETE",
+        "url": "/api/v1/hostgroups/mygroup/groups/yourgroup",
+        "data": {},
+        "status": 204
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/hostgroups/?id=1",
         "data": {},
         "status": 200,
         "response": {
@@ -12640,11 +13463,7 @@
           "results": [
             {
               "parent": [],
-              "groups": [
-                {
-                  "name": "yourgroup"
-                }
-              ],
+              "groups": [],
               "hosts": [
                 {
                   "name": "testhost1.example.org"
@@ -12660,12 +13479,6 @@
             }
           ]
         }
-      },
-      {
-        "method": "DELETE",
-        "url": "/api/v1/hostgroups/mygroup/groups/yourgroup",
-        "data": {},
-        "status": 204
       }
     ],
     "time": null
@@ -12676,7 +13489,7 @@
     "command_filter_negate": false,
     "command_issued": "group owner_add mygroup anotherowner",
     "ok": [
-      "OK: : Added 'anotherowner' as owner of 'mygroup'"
+      "Added owner 'anotherowner' to 'mygroup'"
     ],
     "warning": [],
     "error": [],
@@ -12684,7 +13497,37 @@
     "api_requests": [
       {
         "method": "GET",
-        "url": "/api/v1/hostgroups/?name=mygroup",
+        "url": "/api/v1/hostgroups/mygroup",
+        "data": {},
+        "status": 200,
+        "response": {
+          "parent": [],
+          "groups": [],
+          "hosts": [
+            {
+              "name": "testhost1.example.org"
+            }
+          ],
+          "owners": [
+            {
+              "name": "myself"
+            }
+          ],
+          "name": "mygroup",
+          "description": "This describes the group"
+        }
+      },
+      {
+        "method": "POST",
+        "url": "/api/v1/hostgroups/mygroup/owners/",
+        "data": {
+          "name": "anotherowner"
+        },
+        "status": 201
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/hostgroups/?id=1",
         "data": {},
         "status": 200,
         "response": {
@@ -12701,6 +13544,9 @@
                 }
               ],
               "owners": [
+                {
+                  "name": "anotherowner"
+                },
                 {
                   "name": "myself"
                 }
@@ -12710,14 +13556,6 @@
             }
           ]
         }
-      },
-      {
-        "method": "POST",
-        "url": "/api/v1/hostgroups/mygroup/owners/",
-        "data": {
-          "name": "anotherowner"
-        },
-        "status": 201
       }
     ],
     "time": null
@@ -12728,7 +13566,7 @@
     "command_filter_negate": false,
     "command_issued": "group owner_remove mygroup myself",
     "ok": [
-      "OK: : Removed 'myself' as owner of 'mygroup'"
+      "Removed owner 'myself' from 'mygroup'"
     ],
     "warning": [],
     "error": [],
@@ -12736,7 +13574,38 @@
     "api_requests": [
       {
         "method": "GET",
-        "url": "/api/v1/hostgroups/?name=mygroup",
+        "url": "/api/v1/hostgroups/mygroup",
+        "data": {},
+        "status": 200,
+        "response": {
+          "parent": [],
+          "groups": [],
+          "hosts": [
+            {
+              "name": "testhost1.example.org"
+            }
+          ],
+          "owners": [
+            {
+              "name": "anotherowner"
+            },
+            {
+              "name": "myself"
+            }
+          ],
+          "name": "mygroup",
+          "description": "This describes the group"
+        }
+      },
+      {
+        "method": "DELETE",
+        "url": "/api/v1/hostgroups/mygroup/owners/myself",
+        "data": {},
+        "status": 204
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/hostgroups/?id=1",
         "data": {},
         "status": 200,
         "response": {
@@ -12755,9 +13624,6 @@
               "owners": [
                 {
                   "name": "anotherowner"
-                },
-                {
-                  "name": "myself"
                 }
               ],
               "name": "mygroup",
@@ -12765,12 +13631,6 @@
             }
           ]
         }
-      },
-      {
-        "method": "DELETE",
-        "url": "/api/v1/hostgroups/mygroup/owners/myself",
-        "data": {},
-        "status": 204
       }
     ],
     "time": null
@@ -13070,39 +13930,32 @@
     "command_filter_negate": false,
     "command_issued": "group delete mygroup     # fails because the group contains testhost1, must force",
     "ok": [],
-    "warning": [],
-    "error": [
-      "ERROR: : Group contains 1 host(s) and 0 group(s), must force"
+    "warning": [
+      "Group contains hosts or groups, must force"
     ],
+    "error": [],
     "output": [],
     "api_requests": [
       {
         "method": "GET",
-        "url": "/api/v1/hostgroups/?name=mygroup",
+        "url": "/api/v1/hostgroups/mygroup",
         "data": {},
         "status": 200,
         "response": {
-          "count": 1,
-          "next": null,
-          "previous": null,
-          "results": [
+          "parent": [],
+          "groups": [],
+          "hosts": [
             {
-              "parent": [],
-              "groups": [],
-              "hosts": [
-                {
-                  "name": "testhost1.example.org"
-                }
-              ],
-              "owners": [
-                {
-                  "name": "anotherowner"
-                }
-              ],
-              "name": "mygroup",
-              "description": "This describes the group"
+              "name": "testhost1.example.org"
             }
-          ]
+          ],
+          "owners": [
+            {
+              "name": "anotherowner"
+            }
+          ],
+          "name": "mygroup",
+          "description": "This describes the group"
         }
       }
     ],
@@ -13114,7 +13967,7 @@
     "command_filter_negate": false,
     "command_issued": "group delete mygroup -force",
     "ok": [
-      "OK: : Deleted group 'mygroup'"
+      "Deleted group 'mygroup'"
     ],
     "warning": [],
     "error": [],
@@ -13122,31 +13975,24 @@
     "api_requests": [
       {
         "method": "GET",
-        "url": "/api/v1/hostgroups/?name=mygroup",
+        "url": "/api/v1/hostgroups/mygroup",
         "data": {},
         "status": 200,
         "response": {
-          "count": 1,
-          "next": null,
-          "previous": null,
-          "results": [
+          "parent": [],
+          "groups": [],
+          "hosts": [
             {
-              "parent": [],
-              "groups": [],
-              "hosts": [
-                {
-                  "name": "testhost1.example.org"
-                }
-              ],
-              "owners": [
-                {
-                  "name": "anotherowner"
-                }
-              ],
-              "name": "mygroup",
-              "description": "This describes the group"
+              "name": "testhost1.example.org"
             }
-          ]
+          ],
+          "owners": [
+            {
+              "name": "anotherowner"
+            }
+          ],
+          "name": "mygroup",
+          "description": "This describes the group"
         }
       },
       {
@@ -13164,7 +14010,7 @@
     "command_filter_negate": false,
     "command_issued": "group delete yourgroup",
     "ok": [
-      "OK: : Deleted group 'yourgroup'"
+      "Deleted group 'yourgroup'"
     ],
     "warning": [],
     "error": [],
@@ -13172,23 +14018,16 @@
     "api_requests": [
       {
         "method": "GET",
-        "url": "/api/v1/hostgroups/?name=yourgroup",
+        "url": "/api/v1/hostgroups/yourgroup",
         "data": {},
         "status": 200,
         "response": {
-          "count": 1,
-          "next": null,
-          "previous": null,
-          "results": [
-            {
-              "parent": [],
-              "groups": [],
-              "hosts": [],
-              "owners": [],
-              "name": "yourgroup",
-              "description": "meh"
-            }
-          ]
+          "parent": [],
+          "groups": [],
+          "hosts": [],
+          "owners": [],
+          "name": "yourgroup",
+          "description": "meh"
         }
       },
       {
@@ -13206,7 +14045,7 @@
     "command_filter_negate": false,
     "command_issued": "host remove testhost1",
     "ok": [
-      "OK: : removed testhost1.example.org"
+      "removed testhost1.example.org"
     ],
     "warning": [],
     "error": [],
@@ -13224,7 +14063,7 @@
           "txts": [
             {
               "txt": "v=spf1 -all",
-              "host": 9
+              "host": 7
             }
           ],
           "ptr_overrides": [],
@@ -13240,7 +14079,7 @@
       },
       {
         "method": "GET",
-        "url": "/api/v1/naptrs/?host=9",
+        "url": "/api/v1/naptrs/?host=7",
         "data": {},
         "status": 200,
         "response": {
@@ -13252,7 +14091,7 @@
       },
       {
         "method": "GET",
-        "url": "/api/v1/srvs/?host__name=testhost1.example.org",
+        "url": "/api/v1/srvs/?host=7",
         "data": {},
         "status": 200,
         "response": {
@@ -13277,7 +14116,7 @@
     "command_filter_negate": false,
     "command_issued": "host remove testhost2",
     "ok": [
-      "OK: : removed testhost2.example.org"
+      "removed testhost2.example.org"
     ],
     "warning": [],
     "error": [],
@@ -13295,7 +14134,7 @@
           "txts": [
             {
               "txt": "v=spf1 -all",
-              "host": 10
+              "host": 8
             }
           ],
           "ptr_overrides": [],
@@ -13311,7 +14150,7 @@
       },
       {
         "method": "GET",
-        "url": "/api/v1/naptrs/?host=10",
+        "url": "/api/v1/naptrs/?host=8",
         "data": {},
         "status": 200,
         "response": {
@@ -13323,7 +14162,7 @@
       },
       {
         "method": "GET",
-        "url": "/api/v1/srvs/?host__name=testhost2.example.org",
+        "url": "/api/v1/srvs/?host=8",
         "data": {},
         "status": 200,
         "response": {
@@ -26796,27 +27635,34 @@
     "warning": [],
     "error": [],
     "output": [
-      "Name:                  postit",
-      "Description:           This is a label",
-      "Roles with this label: ",
-      "    None",
+      "Name:         postit",
+      "Description:  This is a label",
+      "Roles with this label:",
+      "None",
       "Permissions with this label:",
-      "    None"
+      "None"
     ],
     "api_requests": [
       {
         "method": "GET",
-        "url": "/api/v1/labels/name/postit",
+        "url": "/api/v1/labels/?name=postit",
         "data": {},
         "status": 200,
         "response": {
-          "name": "postit",
-          "description": "This is a label"
+            "count": 1,
+            "next": null,
+            "previous": null,
+            "results": [
+                {
+                    "name": "postit",
+                    "description": "This is a label"
+                }
+            ]
         }
       },
       {
         "method": "GET",
-        "url": "/api/v1/hostpolicy/roles/?labels__name=postit",
+        "url": "/api/v1/hostpolicy/roles/?labels=1",
         "data": {},
         "status": 200,
         "response": {
@@ -26828,7 +27674,7 @@
       },
       {
         "method": "GET",
-        "url": "/api/v1/permissions/netgroupregex/?labels__name=postit",
+        "url": "/api/v1/permissions/netgroupregex/?labels=1",
         "data": {},
         "status": 200,
         "response": {
@@ -26842,10 +27688,10 @@
     "time": null
   },
   {
-    "command": "label rename postit mylabel -desc 'This is the new description'",
+    "command": "label rename postit mylabel",
     "command_filter": null,
     "command_filter_negate": false,
-    "command_issued": "label rename postit mylabel -desc 'This is the new description'",
+    "command_issued": "label rename postit mylabel",
     "ok": [
       "OK: : Renamed label \"postit\" to \"mylabel\""
     ],
@@ -26855,19 +27701,68 @@
     "api_requests": [
       {
         "method": "GET",
-        "url": "/api/v1/labels/name/postit",
+        "url": "/api/v1/labels/?name=postit",
         "data": {},
         "status": 200,
         "response": {
-          "name": "postit",
-          "description": "This is a label"
+          "count": 1,
+          "next": null,
+          "previous": null,
+          "results": [
+            {
+              "name": "postit",
+              "description": "This is a label"
+            }
+          ]
         }
       },
       {
         "method": "PATCH",
-        "url": "/api/v1/labels/name/postit",
+        "url": "/api/v1/labels/1",
         "data": {
+          "name": "mylabel"
+        },
+        "status": 204
+      },
+      {
+        "method": "GET",
+        "url": "/api/v1/labels/1",
+        "data": {},
+        "status": 200,
+        "response": {
+          "name": "mylabel",
+          "description": "This is a label"
+        }
+      }
+    ],
+    "time": null
+  },
+  {
+    "command": "label set_description mylabel 'This is the new description'",
+    "command_filter": null,
+    "command_filter_negate": false,
+    "command_issued": "label set_description mylabel 'This is the new description'",
+    "ok": [
+      "OK: : Set description for label \"mylabel\" to \"This is the new description\""
+    ],
+    "warning": [],
+    "error": [],
+    "output": [],
+    "api_requests": [
+      {
+        "method": "GET",
+        "url": "/api/v1/labels/name/mylabel",
+        "data": {},
+        "status": 200,
+        "response": {
           "name": "mylabel",
+          "description": "This is a label"
+        }
+      },
+      {
+        "method": "PATCH",
+        "url": "/api/v1/labels/name/mylabel",
+        "data": {
           "description": "This is the new description"
         },
         "status": 204
@@ -27737,4 +28632,4 @@
     ],
     "time": null
   }
-]
\ No newline at end of file
+]
diff --git a/mreg_cli/api/abstracts.py b/mreg_cli/api/abstracts.py
index 1dd7da74..d27dc3ad 100644
--- a/mreg_cli/api/abstracts.py
+++ b/mreg_cli/api/abstracts.py
@@ -164,15 +164,6 @@ def id_for_endpoint(self) -> int | str:
         field = self.endpoint().external_id_field()
         return getattr(self, field)
 
-    @classmethod
-    def field_for_endpoint(cls) -> str:
-        """Return the appropriate field for the object for its endpoint.
-
-        :param field: The field to return.
-        :returns: The correct field for the endpoint.
-        """
-        return cls.endpoint().external_id_field()
-
     @classmethod
     @abstractmethod
     def endpoint(cls) -> Endpoint:
@@ -408,7 +399,7 @@ def refetch(self) -> Self:
 
         :returns: The fetched object.
         """
-        id_field = self.field_for_endpoint()
+        id_field = self.endpoint().external_id_field()
         identifier = getattr(self, id_field)
 
         if not identifier:
@@ -486,22 +477,12 @@ def create(cls, params: JsonMapping, fetch_after_create: bool = True) -> Self |
         if response and response.ok:
             location = response.headers.get("Location")
             if location and fetch_after_create:
-                obj = None
-                if cls.endpoint().external_id_field() == "name":
-                    obj = cls.get_by_field("name", location.split("/")[-1])
-                else:
-                    obj = cls.get_by_id(int(location.split("/")[-1]))
-
-                if obj:
-                    return obj
-
-                raise GetError(f"Could not fetch object from location {location}.")
-
+                return get_typed(location, cls)
             # else:
             # Lots of endpoints don't give locations on creation,
             # so we can't fetch the object, but it's not an error...
             # Per se.
-            # cli_warning("No location header in response.")
+            # raise APIError("No location header in response.")
 
         else:
             raise CreateError(f"Failed to create {cls} with {params} @ {cls.endpoint()}.")
diff --git a/mreg_cli/api/endpoints.py b/mreg_cli/api/endpoints.py
index 90b0cfd8..eb52bea5 100644
--- a/mreg_cli/api/endpoints.py
+++ b/mreg_cli/api/endpoints.py
@@ -3,30 +3,10 @@
 from __future__ import annotations
 
 from enum import Enum
-from typing import Any, Callable
+from typing import Literal
 from urllib.parse import quote, urljoin
 
 
-class hybridmethod:
-    """Decorator to allow a method to be called both as a class method and an instance method."""
-
-    def __init__(self, func: Callable[..., Any]):
-        """Initialize the hybrid method."""
-        self.func = func
-
-    def __get__(self, obj: object | None, cls: type | None = None):
-        """Return a method that can be called both as a class method and an instance method."""
-        if obj is None:
-            return classmethod(self.func).__get__(None, cls)
-        else:
-            # Called on an instance, act like an instance method
-            return self.func.__get__(obj)
-
-    def __call__(self, *args: Any, **kwargs: Any):
-        """Caller method."""
-        return self.func(*args, **kwargs)
-
-
 class Endpoint(str, Enum):
     """API endpoints."""
 
@@ -106,8 +86,7 @@ def requires_search_for_id(self) -> bool:
         """Return True if this endpoint requires a search for an ID."""
         return self.external_id_field() != "id"
 
-    @hybridmethod
-    def external_id_field(self) -> str:
+    def external_id_field(self) -> Literal["id", "name", "network", "host"]:
         """Return the name of the field that holds the external ID."""
         if self in (
             Endpoint.Hosts,
@@ -127,7 +106,6 @@ def external_id_field(self) -> str:
             return "host"
         return "id"
 
-    # Add methods via composition
     def with_id(self, identity: str | int) -> str:
         """Return the endpoint with an ID."""
         id_field = quote(str(identity))
diff --git a/mreg_cli/api/history.py b/mreg_cli/api/history.py
index b45792bc..80e70e1a 100644
--- a/mreg_cli/api/history.py
+++ b/mreg_cli/api/history.py
@@ -79,7 +79,9 @@ def msg(self, basename: str) -> str:
         action = self.action
         model = self.model
         if action in ("add", "remove"):
-            if self.name == basename:
+            if self.resource == "groups" and model in ("Host", "Group", "HostGroup"):
+                msg = self.data["name"]
+            elif self.name == basename:
                 msg = self.name
             else:
                 msg = self.resource + " " + self.name
diff --git a/mreg_cli/api/models.py b/mreg_cli/api/models.py
index 1c3eb6d6..ff63b740 100644
--- a/mreg_cli/api/models.py
+++ b/mreg_cli/api/models.py
@@ -24,12 +24,12 @@
 from mreg_cli.api.history import HistoryItem, HistoryResource
 from mreg_cli.config import MregCliConfig
 from mreg_cli.exceptions import (
-    CliWarning,
     CreateError,
     DeleteError,
     EntityAlreadyExists,
     EntityNotFound,
     EntityOwnershipMismatch,
+    ForceMissing,
     InputFailure,
     InternalError,
     InvalidIPAddress,
@@ -282,7 +282,7 @@ def valid_numeric_ttl(self, ttl: int) -> int:
         :raises InputFailure: If the TTL value is outside the bounds.
         :returns: A valid TTL vale
         """
-        if ttl <= self.MIN_TTL or ttl >= self.MAX_TTL:
+        if ttl < self.MIN_TTL or ttl > self.MAX_TTL:
             raise InputFailure(f"Invalid TTL value: {ttl} ({self.MIN_TTL}->{self.MAX_TTL})")
 
         return ttl
@@ -613,7 +613,7 @@ def verify_nameservers(cls, nameservers: list[str], force: bool = False) -> None
                     if not host.ipaddresses and not force:
                         errors.append(f"{nameserver} has no A-record/glue, must force")
         if errors:
-            raise CliWarning("\n".join(errors))
+            raise ForceMissing("\n".join(errors))
 
     @classmethod
     def create_zone(
@@ -848,15 +848,13 @@ def set_delegation_comment(self, name: str, comment: str) -> None:
         if not resp or not resp.ok:
             raise PatchError(f"Failed to update comment for delegation {delegation.name!r}")
 
-    def set_default_ttl(self, ttl: int) -> None:
+    def set_default_ttl(self, ttl: int) -> Self:
         """Set the default TTL for the zone.
 
         :param ttl: The TTL to set.
         """
         ttl = self.valid_numeric_ttl(ttl)
-        resp = patch(self.endpoint().with_id(self.id), default_ttl=ttl)
-        if not resp or not resp.ok:
-            raise PatchError(f"Failed to update default TTL for zone {self.name!r}")
+        return self.patch({"default_ttl": ttl})
 
     def update_nameservers(self, nameservers: list[str], force: bool = False) -> None:
         """Update the nameservers of the zone.
@@ -908,6 +906,9 @@ def get_from_hostname(cls, hostname: HostT) -> ForwardZoneDelegation | ForwardZo
         if "zone" in zoneblob:
             return ForwardZone.model_validate(zoneblob["zone"])
 
+        if "delegation" in zoneblob:
+            return ForwardZoneDelegation.model_validate(zoneblob["delegation"])
+
         raise UnexpectedDataError(f"Unexpected response from server: {zoneblob}")
 
 
@@ -1441,10 +1442,25 @@ def output(self, padding: int = 14) -> None:
 class ExcludedRange(FrozenModelWithTimestamps):
     """Model for an excluded IP range for a network."""
 
-    id: int
+    id: int  # noqa: A003
     network: int
-    start_ip: str  # TODO: use IPAddressField types
-    end_ip: str
+    start_ip: IPAddressField
+    end_ip: IPAddressField
+
+    @field_validator("start_ip", "end_ip", mode="before")
+    @classmethod
+    def convert_ip_address(cls, value: Any):
+        """Convert ipaddress string to IPAddressField if necessary."""
+        if isinstance(value, str):
+            try:
+                return IPAddressField(address=ipaddress.ip_address(value))
+            except ValueError as e:
+                raise InputFailure(f"Invalid IP address: {value}") from e
+        return value
+
+    def excluded_ips(self) -> int:
+        """Return the number of IP addresses in the excluded range."""
+        return int(self.end_ip.address) - int(self.start_ip.address) + 1
 
 
 class Network(FrozenModelWithTimestamps, APIMixin):
@@ -1609,6 +1625,12 @@ def fmt(label: str, value: Any) -> None:
             fmt("", ip)
         if ipnet.broadcast_address in reserved_ips:
             fmt("", f"{ipnet.broadcast_address} (broadcast)")
+        if self.excluded_ranges:
+            excluded_ips = 0
+            for ex_range in self.excluded_ranges:
+                excluded_ips += ex_range.excluded_ips()
+            fmt("Excluded ranges:", f"{excluded_ips} ipaddresses")
+            self.output_excluded_ranges(padding=padding)
         fmt("Used addresses:", self.get_used_count())
         fmt("Unused addresses:", f"{self.get_unused_count()} (excluding reserved adr.)")
 
@@ -1663,9 +1685,9 @@ def output_excluded_ranges(self, padding: int = 32) -> None:
             manager.add_line(f"No excluded ranges for network {self.network}")
             return
 
-        manager.add_line(f"{'Start IP':<{padding}}End IP")
+        # manager.add_line(f"{'Start IP':<{padding}}End IP")
         for exrange in self.excluded_ranges:
-            manager.add_line(f"{exrange.start_ip:<{padding}}{exrange.end_ip}")
+            manager.add_line(f" {str(exrange.start_ip):<{padding}} -> {exrange.end_ip}")
 
     def overlaps(self, other: Network | str | IP_NetworkT) -> bool:
         """Check if the network overlaps with another network."""
diff --git a/mreg_cli/cli.py b/mreg_cli/cli.py
index 585c1d0b..f3bb73a7 100644
--- a/mreg_cli/cli.py
+++ b/mreg_cli/cli.py
@@ -28,7 +28,7 @@
 from mreg_cli.commands.zone import ZoneCommands
 
 # Import other mreg_cli modules
-from mreg_cli.exceptions import CliError, CliWarning
+from mreg_cli.exceptions import CliError, CliWarning, InputFailure
 from mreg_cli.help_formatter import CustomHelpFormatter
 from mreg_cli.outputmanager import OutputManager
 from mreg_cli.types import CommandFunc, Flag
@@ -250,7 +250,11 @@ def process_command_line(self, line: str) -> None:
         output.clear()
         # Set the command that generated the output
         # Also remove filters and other noise.
-        cmd = output.from_command(line)
+        try:
+            cmd = output.from_command(line)
+        except (CliWarning, CliError) as exc:
+            exc.print_self()
+            return
         # Create and set the corrolation id, using the cleaned command
         # as the suffix. This is used to track the command in the logs
         # on the server side.
@@ -273,7 +277,7 @@ def _quit(_: argparse.Namespace) -> NoReturn:
 def _start_recording(args: argparse.Namespace) -> None:
     """Start recording commands and output to the given file."""
     if not args.filename:
-        raise CliError("No filename given.")
+        raise InputFailure("No filename given.")
 
     OutputManager().recording_start(args.filename)
 
diff --git a/mreg_cli/commands/dhcp.py b/mreg_cli/commands/dhcp.py
index ad06bb36..9ab66a63 100644
--- a/mreg_cli/commands/dhcp.py
+++ b/mreg_cli/commands/dhcp.py
@@ -10,7 +10,7 @@
 from mreg_cli.commands.base import BaseCommand
 from mreg_cli.commands.registry import CommandRegistry
 from mreg_cli.exceptions import EntityOwnershipMismatch, InputFailure
-from mreg_cli.log import cli_info
+from mreg_cli.outputmanager import OutputManager
 from mreg_cli.types import Flag
 
 command_registry = CommandRegistry()
@@ -80,9 +80,8 @@ def assoc(args: argparse.Namespace) -> None:
         ipaddress = host.get_associatable_ip()
 
     ipaddress.associate_mac(mac, force=force)
-    cli_info(
-        f"Associated mac address {mac} with ip {ipaddress.ip()}",
-        print_msg=True,
+    OutputManager().add_ok(
+        f"Associated mac address {mac} with ip {ipaddress.ip()}"
     )
 
 
@@ -130,7 +129,6 @@ def disassoc(args: argparse.Namespace) -> None:
             ipaddress = ips_with_mac[0]
 
     ipaddress.disassociate_mac()
-    cli_info(
-        f"Disassociated mac address {ipaddress.macaddress} from ip {ipaddress.ip()}",
-        print_msg=True,
+    OutputManager().add_ok(
+        f"Disassociated mac address {ipaddress.macaddress} from ip {ipaddress.ip()}"
     )
diff --git a/mreg_cli/commands/group.py b/mreg_cli/commands/group.py
index bb24a2b2..fd417040 100644
--- a/mreg_cli/commands/group.py
+++ b/mreg_cli/commands/group.py
@@ -9,7 +9,7 @@
 from mreg_cli.commands.base import BaseCommand
 from mreg_cli.commands.registry import CommandRegistry
 from mreg_cli.exceptions import CreateError, DeleteError, EntityNotFound, ForceMissing
-from mreg_cli.log import cli_info
+from mreg_cli.outputmanager import OutputManager
 from mreg_cli.types import Flag
 
 command_registry = CommandRegistry()
@@ -42,7 +42,7 @@ def create(args: argparse.Namespace) -> None:
     if not newgroup:
         raise CreateError("Failed to create new group '{args.name}'")
 
-    cli_info(f"Created new group {newgroup.name}", print_msg=True)
+    OutputManager().add_ok(f"Created new group {newgroup.name}")
 
 
 @command_registry.register_command(
@@ -79,7 +79,7 @@ def rename(args: argparse.Namespace) -> None:
     group = HostGroup.get_by_name_or_raise(args.oldname)
     HostGroup.get_by_name_and_raise(args.newname)
     group.rename(args.newname)
-    cli_info(f"Renamed group {args.oldname!r} to {args.newname!r}", True)
+    OutputManager().add_ok(f"Renamed group {args.oldname!r} to {args.newname!r}")
 
 
 @command_registry.register_command(
@@ -121,7 +121,7 @@ def group_delete(args: argparse.Namespace) -> None:
     if not group.delete():
         raise DeleteError(f"Failed to delete group {args.name}")
 
-    cli_info(f"Deleted group {args.name!r}", print_msg=True)
+    OutputManager().add_ok(f"Deleted group {args.name!r}")
 
 
 @command_registry.register_command(
@@ -143,7 +143,7 @@ def group_add(args: argparse.Namespace) -> None:
 
     for src in sourcegroups:
         destgroup.add_group(src.name)
-        cli_info(f"Added group {src.name!r} to {destgroup.name!r}", print_msg=True)
+        OutputManager().add_ok(f"Added group {src.name!r} to {destgroup.name!r}")
 
 
 @command_registry.register_command(
@@ -168,7 +168,7 @@ def group_remove(args: argparse.Namespace) -> None:
 
     for name in args.srcgroup:
         ownergroup.remove_group(name)
-        cli_info(f"Removed group {name!r} from {ownergroup.name!r}", print_msg=True)
+        OutputManager().add_ok(f"Removed group {name!r} from {ownergroup.name!r}")
 
 
 @command_registry.register_command(
@@ -191,7 +191,7 @@ def host_add(args: argparse.Namespace) -> None:
         host = Host.get_by_any_means_or_raise(name)
         fqname = host.name.hostname
         hostgroup.add_host(fqname)
-        cli_info(f"Added host {fqname!r} to {args.group!r}", print_msg=True)
+        OutputManager().add_ok(f"Added host {fqname!r} to {args.group!r}")
 
 
 @command_registry.register_command(
@@ -220,7 +220,7 @@ def host_remove(args: argparse.Namespace) -> None:
 
     for name in to_remove:
         hostgroup.remove_host(name)
-        cli_info(f"Removed host {name!r} from {args.group!r}", print_msg=True)
+        OutputManager().add_ok(f"Removed host {name!r} from {args.group!r}")
 
 
 @command_registry.register_command(
@@ -264,7 +264,7 @@ def owner_add(args: argparse.Namespace) -> None:
 
     for name in args.owners:
         hostgroup.add_owner(name)
-        cli_info(f"Added owner {name!r} to {args.group!r}", print_msg=True)
+        OutputManager().add_ok(f"Added owner {name!r} to {args.group!r}")
 
 
 @command_registry.register_command(
@@ -289,7 +289,7 @@ def owner_remove(args: argparse.Namespace) -> None:
 
     for name in args.owners:
         hostgroup.remove_owner(name)
-        cli_info(f"Removed owner {name!r} from {args.group!r}", print_msg=True)
+        OutputManager().add_ok(f"Removed owner {name!r} from {args.group!r}")
 
 
 @command_registry.register_command(
@@ -307,7 +307,7 @@ def set_description(args: argparse.Namespace) -> None:
     :param args: argparse.Namespace (name, description)
     """
     HostGroup.get_by_name_or_raise(args.name).set_description(args.description)
-    cli_info(f"Updated description to {args.description!r} for {args.name!r}", print_msg=True)
+    OutputManager().add_ok(f"Updated description to {args.description!r} for {args.name!r}")
 
 
 @command_registry.register_command(
diff --git a/mreg_cli/commands/host.py b/mreg_cli/commands/host.py
index fb9650d9..34dd0c83 100644
--- a/mreg_cli/commands/host.py
+++ b/mreg_cli/commands/host.py
@@ -14,7 +14,7 @@
 
 from mreg_cli.commands.base import BaseCommand
 from mreg_cli.commands.registry import CommandRegistry
-from mreg_cli.log import cli_error
+from mreg_cli.exceptions import InternalError
 
 registry = CommandRegistry()
 
@@ -45,7 +45,7 @@ def _import_submodules(self) -> None:
 
         # Get the directory path of the package
         if package.__file__ is None:
-            cli_error(f"Unable to initalize host submodules from {package_name}")
+            raise InternalError(f"Unable to initalize host submodules from {package_name}")
 
         package_dir = os.path.dirname(package.__file__)
 
diff --git a/mreg_cli/commands/host_submodules/a_aaaa.py b/mreg_cli/commands/host_submodules/a_aaaa.py
index 0e5c467c..7360dad0 100644
--- a/mreg_cli/commands/host_submodules/a_aaaa.py
+++ b/mreg_cli/commands/host_submodules/a_aaaa.py
@@ -26,7 +26,7 @@
     ForceMissing,
     InputFailure,
 )
-from mreg_cli.log import cli_info
+from mreg_cli.outputmanager import OutputManager
 from mreg_cli.types import Flag, IP_AddressT, IP_Version
 
 
@@ -79,9 +79,8 @@ def _ip_change(args: argparse.Namespace, ipversion: IP_Version) -> None:
 
     ip_obj.patch(fields={"ipaddress": str(new_ip)})
 
-    cli_info(
-        f"changed ip {args.old} to {new_ip} for {host}",
-        print_msg=True,
+    OutputManager().add_ok(
+        f"changed ip {args.old} to {new_ip} for {host}"
     )
 
 
@@ -119,7 +118,7 @@ def _ip_move(args: argparse.Namespace, ipversion: IP_Version) -> None:
         ptr.patch(fields={"host": to_host.id})
         msg += "Moved PTR override."
 
-    cli_info(msg, print_msg=True)
+    OutputManager().add_line(msg)
 
 
 def _ip_remove(args: argparse.Namespace, ipversion: IP_Version) -> None:
@@ -141,7 +140,7 @@ def _ip_remove(args: argparse.Namespace, ipversion: IP_Version) -> None:
         raise EntityNotFound(f"Host {host} does not have IP {ip}")
 
     if host_ip.delete():
-        cli_info(f"Removed ipaddress {args.ip} from {host}", print_msg=True)
+        OutputManager().add_ok(f"Removed ipaddress {args.ip} from {host}")
     else:
         raise DeleteError(f"Failed to remove ipaddress {args.ip} from {host}")
 
diff --git a/mreg_cli/commands/host_submodules/bacnet.py b/mreg_cli/commands/host_submodules/bacnet.py
index d09b2e58..5b5c55b7 100644
--- a/mreg_cli/commands/host_submodules/bacnet.py
+++ b/mreg_cli/commands/host_submodules/bacnet.py
@@ -21,7 +21,7 @@
     EntityOwnershipMismatch,
     InputFailure,
 )
-from mreg_cli.log import cli_info
+from mreg_cli.outputmanager import OutputManager
 from mreg_cli.types import Flag
 
 
@@ -54,7 +54,7 @@ def bacnetid_add(args: argparse.Namespace) -> None:
 
     validator = BacnetID.get(args.id)
     if validator and validator.hostname == host.name.hostname:
-        cli_info(f"Assigned BACnet ID {validator.id} to {validator.hostname}.", print_msg=True)
+        OutputManager().add_ok(f"Assigned BACnet ID {validator.id} to {validator.hostname}.")
     else:
         raise CreateError(f"Failed to assign BACnet ID {args.id} to {host.name.hostname}.")
 
@@ -78,7 +78,7 @@ def bacnetid_remove(args: argparse.Namespace) -> None:
         raise EntityNotFound(f"{host.name} does not have a BACnet ID assigned.")
 
     if host_bacnet.delete():
-        cli_info(f"Unassigned BACnet ID {host_bacnet.id} from {host.name}.", print_msg=True)
+        OutputManager().add_ok(f"Unassigned BACnet ID {host_bacnet.id} from {host.name}.")
     else:
         raise DeleteError(f"Failed to unassign BACnet ID {host_bacnet.id} from {host.name}.")
 
diff --git a/mreg_cli/commands/host_submodules/cname.py b/mreg_cli/commands/host_submodules/cname.py
index 3b3df75e..a8d41d36 100644
--- a/mreg_cli/commands/host_submodules/cname.py
+++ b/mreg_cli/commands/host_submodules/cname.py
@@ -15,7 +15,7 @@
     InputFailure,
     PatchError,
 )
-from mreg_cli.log import cli_info
+from mreg_cli.outputmanager import OutputManager
 from mreg_cli.types import Flag
 
 
@@ -64,7 +64,7 @@ def cname_add(args: argparse.Namespace) -> None:
     cname = CNAME.get_by_host_and_name(host.name, alias)
 
     if cname:
-        cli_info(f"Added CNAME {cname.name} for {host.name.hostname}.", print_msg=True)
+        OutputManager().add_ok(f"Added CNAME {cname.name} for {host.name.hostname}.")
     else:
         raise CreateError(f"Failed to add CNAME {alias} for {host.name.hostname}.")
 
@@ -106,7 +106,7 @@ def cname_remove(args: argparse.Namespace) -> None:
         )
 
     if cname.delete():
-        cli_info(f"Removed CNAME {cname.name} for {host.name}.", print_msg=True)
+        OutputManager().add_line(f"Removed CNAME {cname.name} for {host.name}.")
     else:
         raise DeleteError(f"Failed to remove CNAME {cname.name} for {host.name}.")
 
@@ -139,8 +139,8 @@ def cname_replace(args: argparse.Namespace) -> None:
 
     updated_cname = cname_obj.patch({"host": host.id})
     if updated_cname:
-        cli_info(
-            f"Moved CNAME alias {cname}: {old_host.name.hostname} -> {host.name}.", print_msg=True
+        OutputManager().add_ok(
+            f"Moved CNAME alias {cname}: {old_host.name.hostname} -> {host.name}."
         )
     else:
         raise PatchError(f"Failed to move CNAME alias {cname}.")
diff --git a/mreg_cli/commands/host_submodules/core.py b/mreg_cli/commands/host_submodules/core.py
index 2560f884..1471e340 100644
--- a/mreg_cli/commands/host_submodules/core.py
+++ b/mreg_cli/commands/host_submodules/core.py
@@ -15,8 +15,7 @@
 
 import argparse
 
-from mreg_cli.api.history import HistoryResource
-from mreg_cli.api.models import ForwardZone, Host, HostList, HostT, MACAddressField, NetworkOrIP
+from mreg_cli.api.models import ForwardZone, Host, HostList, HostT, MACAddressField, NetworkOrIP, Network
 from mreg_cli.commands.host import registry as command_registry
 from mreg_cli.exceptions import (
     CreateError,
@@ -28,7 +27,7 @@
     InputFailure,
     PatchError,
 )
-from mreg_cli.log import cli_info
+from mreg_cli.outputmanager import OutputManager
 from mreg_cli.types import Flag
 from mreg_cli.utilities.shared import convert_wildcard_to_regex
 
@@ -118,17 +117,23 @@ def add(args: argparse.Namespace) -> None:
     }
 
     if args.ip:
+        network = None
         net_or_ip = NetworkOrIP(ip_or_network=args.ip)
         if net_or_ip.is_ip():
             data["ipaddress"] = str(net_or_ip)
+            network = Network.get_by_ip(net_or_ip.as_ip())
         elif net_or_ip.is_network():
             data["network"] = str(net_or_ip)
+            network = Network.get_by_network(str(net_or_ip))
         else:
             raise EntityNotFound(f"Invalid ip or network: {args.ip}")
+        if network.frozen and not args.force:
+            raise ForceMissing(f"Network {network.network} is frozen, must force")
 
     host = Host.create(data)
     if not host:
         raise CreateError("Failed to add host.")
+    OutputManager().add_ok(f"Created host {host.name}")
 
     if macaddress is not None:
         if ip:
@@ -142,9 +147,8 @@ def add(args: argparse.Namespace) -> None:
             if len(host.ipaddresses) == 1:
                 host = host.associate_mac_to_ip(macaddress, host.ipaddresses[0].ipaddress)
             else:
-                cli_info(
-                    "Failed to associate MAC address to IP, multiple IP addresses after creation.",
-                    print_msg=True,
+                OutputManager().add_ok(
+                    "Failed to associate MAC address to IP, multiple IP addresses after creation."
                 )
 
     host.output()
@@ -244,7 +248,7 @@ def forced(override_required: str | None = None) -> bool:
                 warnings.append(f"    - {naptr.replacement}")
         else:
             for naptr in naptrs:
-                cli_info(
+                OutputManager().add_ok(
                     "deleted NAPTR record {} when removing {}".format(
                         naptr.replacement,
                         host.name,
@@ -260,7 +264,7 @@ def forced(override_required: str | None = None) -> bool:
                 warnings.append(f"    - {srv.name}")
         else:
             for srv in srvs:
-                cli_info(
+                OutputManager().add_ok(
                     "deleted SRV record {} when removing {}".format(
                         srv.name,
                         host.name,
@@ -275,7 +279,7 @@ def forced(override_required: str | None = None) -> bool:
                 warnings.append(f"    - {ptr.ipaddress}")
         else:
             for ptr in host.ptr_overrides:
-                cli_info(
+                OutputManager().add_ok(
                     "deleted PTR record {} when removing {}".format(
                         ptr.ipaddress,
                         host.name,
@@ -288,7 +292,7 @@ def forced(override_required: str | None = None) -> bool:
         raise ForceMissing(f"{host.name} requires force and override for deletion:\n{warn_msg}")
 
     if host.delete():
-        cli_info(f"removed {host.name}", print_msg=True)
+        OutputManager().add_ok(f"removed {host.name}")
     else:
         raise DeleteError(f"failed to remove {host.name}")
 
@@ -422,7 +426,7 @@ def rename(args: argparse.Namespace) -> None:
         raise ForceMissing("Wildcards must be forced.")
 
     new_host = old_host.rename(new_name)
-    cli_info(f"renamed {old_host} to {new_name}", print_msg=True)
+    OutputManager().add_ok(f"renamed {old_host} to {new_name}")
 
 
 # Add 'set_comment' as a sub command to the 'host' command
@@ -452,10 +456,7 @@ def set_comment(args: argparse.Namespace) -> None:
     if not updated_host:
         raise PatchError(f"Failed to update comment of {host.name}")
 
-    cli_info(
-        f"Updated comment of {host} to {args.comment}",
-        print_msg=True,
-    )
+    OutputManager().add_ok(f"Updated comment of {host} to {args.comment}")
 
 
 @command_registry.register_command(
@@ -478,7 +479,7 @@ def set_contact(args: argparse.Namespace) -> None:
     if not updated_host:
         raise PatchError(f"Failed to update contact of {host.name}")
 
-    cli_info(f"Updated contact of {host} to {args.contact}", print_msg=True)
+    OutputManager().add_ok(f"Updated contact of {host} to {args.contact}")
 
 
 @command_registry.register_command(
diff --git a/mreg_cli/commands/host_submodules/rr.py b/mreg_cli/commands/host_submodules/rr.py
index 5dd3c866..dd2542b9 100644
--- a/mreg_cli/commands/host_submodules/rr.py
+++ b/mreg_cli/commands/host_submodules/rr.py
@@ -66,7 +66,7 @@
     InputFailure,
     PatchError,
 )
-from mreg_cli.log import cli_info
+from mreg_cli.outputmanager import OutputManager
 from mreg_cli.types import Flag
 
 
@@ -95,7 +95,7 @@ def hinfo_add(args: argparse.Namespace) -> None:
     host = host.refetch()
 
     if host.hinfo and host.hinfo.cpu == args.cpu and host.hinfo.os == args.os:
-        cli_info(f"Added HINFO record for {host.name.hostname}.", print_msg=True)
+        OutputManager().add_ok(f"Added HINFO record for {host.name.hostname}.")
     else:
         raise CreateError(f"Failed to add correct HINFO for {host}")
 
@@ -121,7 +121,7 @@ def hinfo_remove(args: argparse.Namespace) -> None:
 
     hinfo = HInfo.get_by_field("host", str(host.id))
     if hinfo and hinfo.delete():
-        cli_info(f"Removed HINFO record for {host.name.hostname}.", print_msg=True)
+        OutputManager().add_ok(f"Removed HINFO record for {host.name.hostname}.")
     else:
         raise DeleteError(f"Failed to remove HINFO for {host}")
 
@@ -143,13 +143,13 @@ def hinfo_show(args: argparse.Namespace) -> None:
     """
     host = Host.get_by_any_means_or_raise(args.name)
     if not host.hinfo:
-        cli_info(f"No hinfo for {host.name.hostname}", print_msg=True)
+        OutputManager().add_line(f"No hinfo for {host.name.hostname}")
 
     hinfo = HInfo.get_by_field("host", str(host.id))
     if hinfo:
         hinfo.output()
     else:
-        cli_info(f"No hinfo for {host.name.hostname}", print_msg=True)
+        OutputManager().add_line(f"No hinfo for {host.name.hostname}")
 
 
 @command_registry.register_command(
@@ -172,7 +172,7 @@ def loc_remove(args: argparse.Namespace) -> None:
         raise EntityNotFound(f"{host} already has no loc set.")
 
     if host.loc.delete():
-        cli_info(f"Removed LOC for {host.name.hostname}.", print_msg=True)
+        OutputManager().add_ok(f"Removed LOC for {host.name.hostname}.")
     else:
         raise DeleteError(f"Failed to remove LOC for {host}")
 
@@ -202,7 +202,7 @@ def loc_add(args: argparse.Namespace) -> None:
     host = host.refetch()
 
     if host.loc and host.loc.loc == args.loc:
-        cli_info(f"Added LOC record for {host.name.hostname}.", print_msg=True)
+        OutputManager().add_ok(f"Added LOC record for {host.name.hostname}.")
     else:
         CreateError(f"Failed to set LOC for {host}")
 
@@ -251,7 +251,7 @@ def mx_add(args: argparse.Namespace) -> None:
         raise EntityAlreadyExists(f"{host} already has that MX defined.")
 
     MX.create({"host": str(host.id), "priority": args.priority, "mx": args.mx})
-    cli_info(f"Added MX record to {host.name.hostname}.", print_msg=True)
+    OutputManager().add_ok(f"Added MX record to {host.name.hostname}.")
 
 
 @command_registry.register_command(
@@ -277,7 +277,7 @@ def mx_remove(args: argparse.Namespace) -> None:
         )
 
     if mx.delete():
-        cli_info(f"deleted MX from {host.name.hostname}.", print_msg=True)
+        OutputManager().add_ok(f"deleted MX from {host.name.hostname}.")
     else:
         raise DeleteError(f"Failed to remove MX for {host}")
 
@@ -357,7 +357,7 @@ def naptr_add(args: argparse.Namespace) -> None:
     arg_data: dict[str, str | None] = {k: v for k, v in data.items()}
 
     NAPTR.create(arg_data)
-    cli_info(f"Added NAPTR record to {host.name.hostname}.", print_msg=True)
+    OutputManager().add_ok(f"Added NAPTR record to {host.name.hostname}.")
 
 
 @command_registry.register_command(
@@ -418,7 +418,7 @@ def naptr_remove(args: argparse.Namespace) -> None:
         raise EntityNotFound(f"No matching NAPTR record found for {host}")
 
     if len(to_delete) > 1 and not args.force:
-        cli_info("Found multiple matching NAPTR records:", print_msg=True)
+        OutputManager().add_line("Found multiple matching NAPTR records:")
         NAPTR.output_multiple(to_delete)
         raise ForceMissing("Use --force to delete all matching records.")
 
@@ -426,7 +426,7 @@ def naptr_remove(args: argparse.Namespace) -> None:
     # Right now we may end up in a situation where some records are deleted and some are not.
     for naptr in to_delete:
         if naptr.delete():
-            cli_info(f"Deleted NAPTR record from {host.name.hostname}.", print_msg=True)
+            OutputManager().add_ok(f"Deleted NAPTR record from {host.name.hostname}.")
         else:
             raise DeleteError(f"Failed to remove NAPTR for {host}")
 
@@ -491,9 +491,8 @@ def ptr_change(args: argparse.Namespace) -> None:
     if not ptr_override.patch(data):
         raise PatchError(f"Failed to move PTR record from {old_host} to {new_host}")
     else:
-        cli_info(
-            f"Moved PTR record {ip} from {old_host.name.hostname} to {new_host.name.hostname}.",
-            print_msg=True,
+        OutputManager().add_ok(
+            f"Moved PTR record {ip} from {old_host.name.hostname} to {new_host.name.hostname}."
         )
 
 
@@ -522,7 +521,7 @@ def ptr_remove(args: argparse.Namespace) -> None:
         raise EntityNotFound(f"No PTR record for {host} with IP {ip}")
 
     if ptr_override.delete():
-        cli_info(f"Removed PTR record {ip} from {host.name.hostname}.", print_msg=True)
+        OutputManager().add_ok(f"Removed PTR record {ip} from {host.name.hostname}.")
     else:
         raise DeleteError(f"Failed to remove PTR record from {host}")
 
@@ -563,7 +562,7 @@ def ptr_add(args: argparse.Namespace) -> None:
         raise ForceMissing("Address is reserved. Requires force")
 
     PTR_override.create({"host": str(host.id), "ipaddress": str(ip)})
-    cli_info(f"Added PTR record {ip} to {host.name.hostname}.", print_msg=True)
+    OutputManager().add_ok(f"Added PTR record {ip} to {host.name.hostname}.")
 
 
 @command_registry.register_command(
@@ -585,7 +584,7 @@ def ptr_show(args: argparse.Namespace) -> None:
 
     host = Host.get_by_any_means_or_raise(str(ip), inform_as_ptr=False)
     if not host.ptr_overrides:
-        cli_info(f"No PTR records for {host.name.hostname}", print_msg=True)
+        OutputManager().add_line(f"No PTR records for {host.name.hostname}")
 
     for ptr in host.ptr_overrides:
         if ip.as_ip() == ptr.ipaddress:
@@ -638,7 +637,7 @@ def srv_add(args: argparse.Namespace) -> None:
     arg_data: dict[str, str | None] = {k: v for k, v in data.items()}
 
     Srv.create(arg_data)
-    cli_info(f"Added SRV record {sname} with target {host}.", print_msg=True)
+    OutputManager().add_ok(f"Added SRV record {sname} with target {host}.")
 
 
 @command_registry.register_command(
@@ -694,7 +693,7 @@ def srv_remove(args: argparse.Namespace) -> None:
         )
 
     if srv.delete():
-        cli_info(f"Removed SRV record {sname} from {host.name.hostname}.", print_msg=True)
+        OutputManager().add_ok(f"Removed SRV record {sname} from {host.name.hostname}.")
     else:
         raise DeleteError(f"Failed to remove SRV for {sname}")
 
@@ -752,7 +751,7 @@ def sshfp_add(args: argparse.Namespace) -> None:
 
     arg_data: dict[str, str | None] = {k: v for k, v in data.items()}
     SSHFP.create(arg_data)
-    cli_info(f"Added SSHFP record for {host.name.hostname}.", print_msg=True)
+    OutputManager().add_ok(f"Added SSHFP record for {host.name.hostname}.")
 
 
 @command_registry.register_command(
@@ -798,9 +797,8 @@ def sshfp_remove(args: argparse.Namespace) -> None:
                 raise DeleteError(f"Failed to remove SSHFP for {host}")
             else:
                 fp = sshfp.fingerprint
-                cli_info(
-                    f"Removed SSHFP record with fingerprint {fp} for {host}.",
-                    print_msg=True,
+                OutputManager().add_ok(
+                    f"Removed SSHFP record with fingerprint {fp} for {host}."
                 )
 
 
@@ -876,7 +874,7 @@ def ttl_set(args: argparse.Namespace) -> None:
 
     result = target.patch({"ttl": valid_ttl})
     if result:
-        cli_info(f"Set TTL for {target} to {args.ttl}.", print_msg=True)
+        OutputManager().add_ok(f"Set TTL for {target} to {args.ttl}.")
     else:
         raise PatchError(f"Failed to set TTL for {target}")
 
@@ -927,7 +925,7 @@ def txt_add(args: argparse.Namespace) -> None:
         raise EntityAlreadyExists(f"{host} already has that TXT defined.")
 
     TXT.create({"host": str(host.id), "txt": args.text})
-    cli_info(f"Added TXT record to {host}.", print_msg=True)
+    OutputManager().add_ok(f"Added TXT record to {host}.")
 
 
 @command_registry.register_command(
@@ -956,7 +954,7 @@ def txt_remove(args: argparse.Namespace) -> None:
         raise EntityNotFound(f"{host} has no TXT record matching '{args.text}'")
 
     if txt.delete():
-        cli_info(f"Removed TXT record '{args.text}' from {host}.", print_msg=True)
+        OutputManager().add_ok(f"Removed TXT record '{args.text}' from {host}.")
     else:
         raise DeleteError(f"Failed to remove TXT with '{args.text}' for {host}")
 
diff --git a/mreg_cli/commands/label.py b/mreg_cli/commands/label.py
index c65f1633..87cc20fd 100644
--- a/mreg_cli/commands/label.py
+++ b/mreg_cli/commands/label.py
@@ -9,7 +9,7 @@
 from mreg_cli.commands.base import BaseCommand
 from mreg_cli.commands.registry import CommandRegistry
 from mreg_cli.exceptions import EntityNotFound, InputFailure
-from mreg_cli.log import cli_info
+
 from mreg_cli.outputmanager import OutputManager
 from mreg_cli.types import Flag
 
@@ -45,7 +45,7 @@ def label_add(args: argparse.Namespace) -> None:
     # https://github.com/unioslo/mreg/blob/eed5c154bcc47b1dea474feabad46125ebde0aec/mreg/api/v1/views_labels.py#L30
     # https://github.com/unioslo/mreg/blob/eed5c154bcc47b1dea474feabad46125ebde0aec/mreg/api/v1/views.py#L187
     Label.create({"name": args.name, "description": args.description}, fetch_after_create=False)
-    cli_info(f'Added label "{args.name}"', print_msg=True)
+    OutputManager().add_ok(f'Added label "{args.name}"')
 
 
 @command_registry.register_command(
@@ -55,7 +55,7 @@ def label_list(_: argparse.Namespace) -> None:
     """List labels."""
     labels = Label.get_all()
     if not labels:
-        cli_info("No labels", print_msg=True)
+        OutputManager().add_line("No labels")
         return
     OutputManager().add_formatted_table(("Name", "Description"), ("name", "description"), labels)
 
@@ -82,7 +82,7 @@ def label_delete(args: argparse.Namespace) -> None:
         raise EntityNotFound(f'Label "{args.name}" does not exist.')
 
     label.delete()
-    cli_info(f'Removed label "{args.name}"', print_msg=True)
+    OutputManager().add_ok(f'Removed label "{args.name}"')
 
 
 @command_registry.register_command(
@@ -118,7 +118,7 @@ def label_rename(args: argparse.Namespace) -> None:
     :param args: argparse.Namespace (oldname, newname)
     """
     Label.get_by_name_or_raise(args.oldname).rename(args.newname)
-    cli_info(f'Renamed label "{args.oldname}" to "{args.newname}"', print_msg=True)
+    OutputManager().add_ok(f'Renamed label "{args.oldname}" to "{args.newname}"')
 
 
 @command_registry.register_command(
@@ -144,4 +144,4 @@ def label_redesc(args: argparse.Namespace) -> None:
     :param args: argparse.Namespace (name, desc)
     """
     Label.get_by_name_or_raise(args.name).set_description(args.desc)
-    cli_info(f'Set description for label "{args.name}" to "{args.desc}"', print_msg=True)
+    OutputManager().add_ok(f'Set description for label "{args.name}" to "{args.desc}"')
diff --git a/mreg_cli/commands/network.py b/mreg_cli/commands/network.py
index 442f65e3..f72e9458 100644
--- a/mreg_cli/commands/network.py
+++ b/mreg_cli/commands/network.py
@@ -3,33 +3,23 @@
 from __future__ import annotations
 
 import argparse
-import ipaddress
-import urllib.parse
 from typing import Any
 
 from mreg_cli.api.fields import IPAddressField
 from mreg_cli.api.models import Network
 from mreg_cli.commands.base import BaseCommand
 from mreg_cli.commands.registry import CommandRegistry
-from mreg_cli.exceptions import DeleteError, ForceMissing, InputFailure
-from mreg_cli.log import cli_error, cli_info, cli_warning
+from mreg_cli.exceptions import (
+    DeleteError,
+    EntityNotFound,
+    ForceMissing,
+    InputFailure,
+    NetworkOverlap,
+)
 from mreg_cli.outputmanager import OutputManager
 from mreg_cli.types import Flag
-from mreg_cli.utilities.api import delete, get, patch, post
-from mreg_cli.utilities.network import (
-    get_network,
-    get_network_reserved_ips,
-    get_network_unused_list,
-    get_network_used_list,
-    ipsort,
-)
 from mreg_cli.utilities.shared import convert_wildcard_to_regex, string_to_int
-from mreg_cli.utilities.validators import (
-    is_valid_category_tag,
-    is_valid_ip,
-    is_valid_location_tag,
-    is_valid_network,
-)
+from mreg_cli.utilities.validators import is_valid_category_tag, is_valid_location_tag
 
 command_registry = CommandRegistry()
 
@@ -42,79 +32,6 @@ def __init__(self, cli: Any) -> None:
         super().__init__(cli, command_registry, "network", "Manage networks.", "Manage networks")
 
 
-def get_network_range_from_input(net: str) -> str:
-    """Return network range from input.
-
-    - If input is a valid ip address, return the network range of the ip address.
-    - If input is a valid network range, return the input.
-    - Otherwise, print a warning and abort.
-    """
-    if net.endswith("/"):
-        net = net[:-1]
-    if is_valid_ip(net):
-        network = get_network(net)
-        if not network:
-            cli_error(f"Network not found for ip {net}")
-        return network.network
-    elif is_valid_network(net):
-        return net
-    else:
-        cli_warning("Not a valid ip or network")
-
-
-# helper methods
-def print_network_unused(count: int, padding: int = 25) -> None:
-    """Pretty print amount of unused addresses."""
-    OutputManager().add_line(
-        "{1:<{0}}{2}{3}".format(padding, "Unused addresses:", count, " (excluding reserved adr.)")
-    )
-
-
-def format_network_excluded_ranges(info: list[dict[str, Any]], padding: int = 25) -> None:
-    """Pretty print excluded ranges."""
-    if not info:
-        return
-    count = 0
-    for i in info:
-        start_ip = ipaddress.ip_address(i["start_ip"])
-        end_ip = ipaddress.ip_address(i["end_ip"])
-        count += int(end_ip) - int(start_ip) + 1
-    manager = OutputManager()
-    manager.add_line("{1:<{0}}{2} ipaddresses".format(padding, "Excluded ranges:", count))
-    for i in info:
-        manager.add_line("{1:<{0}}{2} -> {3}".format(padding, "", i["start_ip"], i["end_ip"]))
-
-
-def format_network_reserved(ip_range: str, reserved: int, padding: int = 25) -> None:
-    """Pretty print ip range and reserved addresses list."""
-    network = ipaddress.ip_network(ip_range)
-    manager = OutputManager()
-    manager.add_line(
-        "{1:<{0}}{2} - {3}".format(
-            padding, "IP-range:", network.network_address, network.broadcast_address
-        )
-    )
-    manager.add_line("{1:<{0}}{2}".format(padding, "Reserved host addresses:", reserved))
-    manager.add_line("{1:<{0}}{2}{3}".format(padding, "", network.network_address, " (net)"))
-    res = get_network_reserved_ips(ip_range)
-    res.remove(str(network.network_address))
-    broadcast = False
-    if str(network.broadcast_address) in res:
-        res.remove(str(network.broadcast_address))
-        broadcast = True
-    for host in res:
-        manager.add_line("{1:<{0}}{2}".format(padding, "", host))
-    if broadcast:
-        manager.add_line(
-            "{1:<{0}}{2}{3}".format(padding, "", network.broadcast_address, " (broadcast)")
-        )
-
-
-def print_network(info: int | str, text: str, padding: int = 25) -> None:
-    """Pretty print network info."""
-    OutputManager().add_line("{1:<{0}}{2}".format(padding, text, info))
-
-
 ##########################################
 # Implementation of sub command 'create' #
 ##########################################
@@ -154,10 +71,8 @@ def create(args: argparse.Namespace) -> None:
     networks = Network.get_list()
     for network in networks:
         if network.overlaps(arg_network):
-            cli_warning(
-                "Overlap found between new network {} and existing network {}".format(
-                    arg_network, network.network
-                )
+            raise NetworkOverlap(
+                f"New network {arg_network} overlaps existing network {network.network}"
             )
 
     Network.create(
@@ -171,7 +86,7 @@ def create(args: argparse.Namespace) -> None:
         }
     )
 
-    cli_info(f"created network {args.network}", print_msg=True)
+    OutputManager().add_ok(f"created network {args.network}")
 
 
 @command_registry.register_command(
@@ -192,7 +107,7 @@ def info(args: argparse.Namespace) -> None:
 
     :param args: argparse.Namespace (networks)
     """
-    networks = [Network.get_by_network_or_raise(net) for net in args.networks]
+    networks = [Network.get_by_any_means_or_raise(net) for net in args.networks]
     Network.output_multiple(networks)
 
 
@@ -295,12 +210,12 @@ def find(args: argparse.Namespace) -> None:
             params[param] = val
 
         if not params:
-            cli_warning("Need at least one search criteria")
+            raise InputFailure("Need at least one search criteria")
 
         networks = Network.get_by_query(params)
 
     if not networks:
-        cli_warning("No networks matching the query were found.")
+        raise EntityNotFound("No networks matching the query were found.")
 
     Network.output_multiple(networks)
     if not args.silent:
@@ -367,7 +282,7 @@ def remove(args: argparse.Namespace) -> None:
     if not args.force:
         raise ForceMissing("Must force.")
     if net.delete():
-        cli_info(f"Removed network {args.network}", print_msg=True)
+        OutputManager().add_ok(f"Removed network {args.network}")
     else:
         raise DeleteError(f"Unable to delete network {args.network}")
 
@@ -389,7 +304,7 @@ def add_excluded_range(args: argparse.Namespace) -> None:
     """
     net = Network.get_by_network_or_raise(args.network)
     net.add_excluded_range(args.start_ip, args.end_ip)
-    cli_info(f"Added exclude range to {net.network}", True)
+    OutputManager().add_ok(f"Added exclude range to {net.network}")
 
 
 @command_registry.register_command(
@@ -409,7 +324,7 @@ def remove_excluded_range(args: argparse.Namespace) -> None:
     """
     net = Network.get_by_network_or_raise(args.network)
     net.remove_excluded_range(args.start_ip, args.end_ip)
-    cli_info(f"Removed exclude range from {net.network}", print_msg=True)
+    OutputManager().add_ok(f"Removed exclude range from {net.network}")
 
 
 @command_registry.register_command(
@@ -445,7 +360,7 @@ def set_category(args: argparse.Namespace) -> None:
     """
     net = Network.get_by_network_or_raise(args.network)
     net.set_category(args.category)
-    cli_info(f"Updated category tag to {args.category!r} for {net.network}", True)
+    OutputManager().add_ok(f"Updated category tag to {args.category!r} for {net.network}")
 
 
 @command_registry.register_command(
@@ -464,7 +379,7 @@ def set_description(args: argparse.Namespace) -> None:
     """
     net = Network.get_by_network_or_raise(args.network)
     net.set_description(args.description)
-    cli_info(f"Updated description to {args.description!r} for {net.network}", True)
+    OutputManager().add_ok(f"Updated description to {args.description!r} for {net.network}")
 
 
 @command_registry.register_command(
@@ -482,7 +397,7 @@ def set_dns_delegated(args: argparse.Namespace) -> None:
     """
     net = Network.get_by_network_or_raise(args.network)
     net.set_dns_delegation(True)
-    cli_info(f"Set DNS delegation to 'True' for {net.network!r}", True)
+    OutputManager().add_ok(f"Set DNS delegation to 'True' for {net.network!r}")
 
 
 @command_registry.register_command(
@@ -500,7 +415,7 @@ def set_frozen(args: argparse.Namespace) -> None:
     """
     net = Network.get_by_network_or_raise(args.network)
     net.set_frozen(True)
-    cli_info(f"Updated frozen to 'True' for {net.network}", print_msg=True)
+    OutputManager().add_ok(f"Updated frozen to 'True' for {net.network}")
 
 
 @command_registry.register_command(
@@ -519,7 +434,7 @@ def set_location(args: argparse.Namespace) -> None:
     """
     net = Network.get_by_network_or_raise(args.network)
     net.set_location(args.location)
-    cli_info(f"Updated location tag to '{args.location}' for {args.network}", True)
+    OutputManager().add_ok(f"Updated location tag to '{args.location}' for {args.network}")
 
 
 @command_registry.register_command(
@@ -543,7 +458,7 @@ def set_reserved(args: argparse.Namespace) -> None:
     """
     net = Network.get_by_network_or_raise(args.network)
     net.set_reserved(args.number)
-    cli_info(f"Updated reserved to '{args.number}' for {net.network}", print_msg=True)
+    OutputManager().add_ok(f"Updated reserved to '{args.number}' for {net.network}")
 
 
 @command_registry.register_command(
@@ -562,7 +477,7 @@ def set_vlan(args: argparse.Namespace) -> None:
     """
     net = Network.get_by_network_or_raise(args.network)
     net.set_vlan(args.vlan)
-    cli_info(f"Updated vlan to {args.vlan} for {net.network}", print_msg=True)
+    OutputManager().add_ok(f"Updated vlan to {args.vlan} for {net.network}")
 
 
 @command_registry.register_command(
@@ -580,7 +495,7 @@ def unset_dns_delegated(args: argparse.Namespace) -> None:
     """
     net = Network.get_by_network_or_raise(args.network)
     net.set_dns_delegation(False)
-    cli_info(f"Set DNS delegation to 'False' for {net.network!r}", True)
+    OutputManager().add_ok(f"Set DNS delegation to 'False' for {net.network!r}")
 
 
 @command_registry.register_command(
@@ -598,4 +513,4 @@ def unset_frozen(args: argparse.Namespace) -> None:
     """
     net = Network.get_by_network_or_raise(args.network)
     net.set_frozen(False)
-    cli_info(f"Updated frozen to 'False' for {net.network}", print_msg=True)
+    OutputManager().add_ok(f"Updated frozen to 'False' for {net.network}")
diff --git a/mreg_cli/commands/permission.py b/mreg_cli/commands/permission.py
index f146febd..1cd8cc93 100644
--- a/mreg_cli/commands/permission.py
+++ b/mreg_cli/commands/permission.py
@@ -9,7 +9,7 @@
 from mreg_cli.commands.base import BaseCommand
 from mreg_cli.commands.registry import CommandRegistry
 from mreg_cli.exceptions import DeleteError, EntityNotFound
-from mreg_cli.log import cli_info
+
 from mreg_cli.outputmanager import OutputManager
 from mreg_cli.types import Flag
 from mreg_cli.utilities.shared import convert_wildcard_to_regex
@@ -118,7 +118,7 @@ def network_add(args: argparse.Namespace) -> None:
 
     Permission.get_by_query_unique_and_raise(query)
     Permission.create(params=query)
-    cli_info(f"Added permission to {args.range}", print_msg=True)
+    OutputManager().add_ok(f"Added permission to {args.range}")
 
 
 @command_registry.register_command(
@@ -144,7 +144,7 @@ def network_remove(args: argparse.Namespace) -> None:
 
     permission = Permission.get_by_query_unique_or_raise(query)
     if permission.delete():
-        cli_info(f"Removed permission for {args.range}", print_msg=True)
+        OutputManager().add_ok(f"Removed permission for {args.range}")
     else:
         raise DeleteError(f"Failed to remove permission for {args.range}")
 
@@ -173,7 +173,7 @@ def add_label_to_permission(args: argparse.Namespace) -> None:
     }
     permission = Permission.get_by_query_unique_or_raise(query)
     permission.add_label(args.label)
-    cli_info(f"Added the label {args.label!r} to the permission.", print_msg=True)
+    OutputManager().add_ok(f"Added the label {args.label!r} to the permission.")
 
 
 @command_registry.register_command(
@@ -200,4 +200,4 @@ def remove_label_from_permission(args: argparse.Namespace) -> None:
     }
     permission = Permission.get_by_query_unique_or_raise(query)
     permission.remove_label(args.label)
-    cli_info(f"Removed the label {args.label!r} from the permission.", print_msg=True)
+    OutputManager().add_ok(f"Removed the label {args.label!r} from the permission.")
diff --git a/mreg_cli/commands/policy.py b/mreg_cli/commands/policy.py
index d263b3d6..ef9ebe8f 100644
--- a/mreg_cli/commands/policy.py
+++ b/mreg_cli/commands/policy.py
@@ -8,7 +8,7 @@
 from mreg_cli.api.models import Atom, Host, HostPolicy, Role
 from mreg_cli.commands.base import BaseCommand
 from mreg_cli.commands.registry import CommandRegistry
-from mreg_cli.log import cli_error, cli_info, cli_warning
+from mreg_cli.exceptions import CreateError, DeleteError, EntityAlreadyExists
 from mreg_cli.outputmanager import OutputManager
 from mreg_cli.types import Flag
 
@@ -52,7 +52,7 @@ def atom_create(args: argparse.Namespace) -> None:
         params["create_date"] = created
 
     Atom.create(params)
-    cli_info(f"Created new atom {name}", print_msg=True)
+    OutputManager().add_ok(f"Created new atom {name}")
 
 
 @command_registry.register_command(
@@ -72,9 +72,9 @@ def atom_delete(args: argparse.Namespace) -> None:
 
     atom = Atom.get_by_name_or_raise(name)
     if atom.delete():
-        cli_info(f"Deleted atom {name}", print_msg=True)
+        OutputManager().add_ok(f"Deleted atom {name}")
     else:
-        cli_error(f"Failed to delete atom {name}")
+        raise DeleteError(f"Failed to delete atom {name}")
 
 
 @command_registry.register_command(
@@ -104,7 +104,7 @@ def role_create(args: argparse.Namespace) -> None:
         params["create_date"] = created
 
     Role.create(params)
-    cli_info(f"Created new role {name!r}", print_msg=True)
+    OutputManager().add_ok(f"Created new role {name!r}")
 
 
 @command_registry.register_command(
@@ -124,9 +124,9 @@ def role_delete(args: argparse.Namespace) -> None:
 
     role = Role.get_by_name_or_raise(name)
     if role.delete():
-        cli_info(f"Deleted role {name!r}", print_msg=True)
+        OutputManager().add_ok(f"Deleted role {name!r}")
     else:
-        cli_error(f"Failed to delete role {name!r}")
+        raise DeleteError(f"Failed to delete role {name!r}")
 
 
 @command_registry.register_command(
@@ -148,9 +148,9 @@ def add_atom(args: argparse.Namespace) -> None:
 
     role = Role.get_by_name_or_raise(role_name)
     if role.add_atom(atom_name):
-        cli_info(f"Added atom {atom_name!r} to role {role_name!r}", print_msg=True)
+        OutputManager().add_ok(f"Added atom {atom_name!r} to role {role_name!r}")
     else:
-        cli_error(f"Failed to add atom {atom_name!r} to role {role_name!r}")
+        raise CreateError(f"Failed to add atom {atom_name!r} to role {role_name!r}")
 
 
 @command_registry.register_command(
@@ -172,9 +172,9 @@ def remove_atom(args: argparse.Namespace) -> None:
 
     role = Role.get_by_name_or_raise(role_name)
     if role.remove_atom(atom_name):
-        cli_info(f"Removed atom {atom_name!r} from role {role_name!r}", print_msg=True)
+        OutputManager().add_ok(f"Removed atom {atom_name!r} from role {role_name!r}")
     else:
-        cli_error(f"Failed to remove atom {atom_name!r} from role {role_name!r}")
+        raise DeleteError(f"Failed to remove atom {atom_name!r} from role {role_name!r}")
 
 
 @command_registry.register_command(
@@ -308,7 +308,7 @@ def host_add(args: argparse.Namespace) -> None:
 
     for host in hosts:
         role.add_host(host.name.hostname)
-        cli_info(f"Added host {host.name!r} to role {role_name!r}", print_msg=True)
+        OutputManager().add_ok(f"Added host {host.name!r} to role {role_name!r}")
 
 
 @command_registry.register_command(
@@ -380,7 +380,7 @@ def host_remove(args: argparse.Namespace) -> None:
 
     for host in hosts:
         role.remove_host(host.name.hostname)
-        cli_info(f"Removed host {host.name!r} from role {role_name!r}", print_msg=True)
+        OutputManager().add_ok(f"Removed host {host.name!r} from role {role_name!r}")
 
 
 @command_registry.register_command(
@@ -401,14 +401,14 @@ def rename(args: argparse.Namespace) -> None:
     newname: str = args.newname
 
     if oldname == newname:
-        cli_warning("Old and new names are the same")
+        raise EntityAlreadyExists("Old and new names are the same")
 
     # Check if role or atom with the new name already exists
     HostPolicy.get_role_or_atom_and_raise(newname)
 
     role_or_atom = HostPolicy.get_role_or_atom_or_raise(oldname)
     role_or_atom.rename(newname)
-    cli_info(f"Renamed {oldname!r} to {newname!r}", True)
+    OutputManager().add_ok(f"Renamed {oldname!r} to {newname!r}")
 
 
 @command_registry.register_command(
@@ -430,7 +430,7 @@ def set_description(args: argparse.Namespace) -> None:
 
     role_or_atom = HostPolicy.get_role_or_atom_or_raise(name)
     role_or_atom.set_description(description)
-    cli_info(f"updated description to {description!r} for {name!r}", print_msg=True)
+    OutputManager().add_ok(f"updated description to {description!r} for {name!r}")
 
 
 @command_registry.register_command(
@@ -452,7 +452,7 @@ def add_label_to_role(args: argparse.Namespace) -> None:
 
     role = Role.get_by_name_or_raise(role_name)
     role.add_label(label_name)
-    cli_info(f"Added the label {label_name!r} to the role {role_name!r}.", print_msg=True)
+    OutputManager().add_ok(f"Added the label {label_name!r} to the role {role_name!r}.")
 
 
 @command_registry.register_command(
@@ -474,7 +474,7 @@ def remove_label_from_role(args: argparse.Namespace) -> None:
 
     role = Role.get_by_name_or_raise(role_name)
     role.remove_label(label_name)
-    cli_info(f"Removed the label {label_name!r} from the role {role_name!r}.", print_msg=True)
+    OutputManager().add_ok(f"Removed the label {label_name!r} from the role {role_name!r}.")
 
 
 @command_registry.register_command(
diff --git a/mreg_cli/commands/zone.py b/mreg_cli/commands/zone.py
index 4ee0bb19..c93d69f4 100644
--- a/mreg_cli/commands/zone.py
+++ b/mreg_cli/commands/zone.py
@@ -8,8 +8,8 @@
 from mreg_cli.api.models import Zone
 from mreg_cli.commands.base import BaseCommand
 from mreg_cli.commands.registry import CommandRegistry
-from mreg_cli.exceptions import DeleteError
-from mreg_cli.log import cli_info, cli_warning
+from mreg_cli.exceptions import DeleteError, InputFailure
+from mreg_cli.outputmanager import OutputManager
 from mreg_cli.types import Flag
 
 command_registry = CommandRegistry()
@@ -40,7 +40,7 @@ def create(args: argparse.Namespace) -> None:
     :param args: argparse.Namespace (ns, force, zone, email)
     """
     Zone.create_zone(args.zone, args.email, args.ns, args.force)
-    cli_info(f"Created zone {args.zone}", print_msg=True)
+    OutputManager().add_ok(f"Created zone {args.zone}")
 
 
 @command_registry.register_command(
@@ -64,7 +64,7 @@ def delegation_create(args: argparse.Namespace) -> None:
     """
     zone = Zone.get_zone_or_raise(args.zone)
     zone.create_delegation(args.delegation, args.ns, args.comment, args.force)
-    cli_info(f"Created zone delegation {args.delegation}", print_msg=True)
+    OutputManager().add_ok(f"Created zone delegation {args.delegation}")
 
 
 @command_registry.register_command(
@@ -83,7 +83,7 @@ def zone_delete(args: argparse.Namespace) -> None:
     """
     zone = Zone.get_zone_or_raise(args.zone)
     if zone.delete_zone(args.force):
-        cli_info(f"Deleted zone {zone.name}", print_msg=True)
+        OutputManager().add_ok(f"Deleted zone {zone.name}")
     else:
         raise DeleteError(f"Unable to delete zone {zone.name}")
 
@@ -107,7 +107,7 @@ def delegation_delete(args: argparse.Namespace) -> None:
     # and we try to delete pederhan.uio.no?
     zone = Zone.get_zone_or_raise(args.zone)
     if zone.delete_delegation(args.delegation):
-        cli_info(f"Removed zone delegation {args.delegation}", True)
+        OutputManager().add_ok(f"Removed zone delegation {args.delegation}")
     else:
         raise DeleteError(f"Unable to delete delegation {args.delegation}")
 
@@ -154,7 +154,7 @@ def zone_list(args: argparse.Namespace) -> None:
     :param args: argparse.Namespace (forward, reverse)
     """
     if not (args.forward or args.reverse):
-        cli_warning("Add either -forward or -reverse as argument")
+        raise InputFailure("Add either -forward or -reverse as argument")
     Zone.output_zones(args.forward, args.reverse)
 
 
@@ -192,7 +192,7 @@ def zone_delegation_comment_set(args: argparse.Namespace) -> None:
     """
     zone = Zone.get_zone_or_raise(args.zone)
     zone.set_delegation_comment(args.delegation, args.comment)
-    cli_info(f"Updated comment for {args.delegation}", True)
+    OutputManager().add_ok(f"Updated comment for {args.delegation}")
 
 
 @command_registry.register_command(
@@ -211,7 +211,7 @@ def zone_delegation_comment_remove(args: argparse.Namespace) -> None:
     """
     zone = Zone.get_zone_or_raise(args.zone)
     zone.set_delegation_comment(args.delegation, "")
-    cli_info(f"Removed comment for {args.delegation}", True)
+    OutputManager().add_ok(f"Removed comment for {args.delegation}")
 
 
 @command_registry.register_command(
@@ -233,7 +233,7 @@ def set_ns(args: argparse.Namespace) -> None:
     """
     zone = Zone.get_zone_or_raise(args.zone)
     zone.update_nameservers(args.ns, args.force)
-    cli_info(f"Updated nameservers for {args.zone}", print_msg=True)
+    OutputManager().add_ok(f"Updated nameservers for {args.zone}")
 
 
 @command_registry.register_command(
@@ -266,7 +266,7 @@ def set_soa(args: argparse.Namespace) -> None:
         expire=args.expire,
         soa_ttl=args.soa_ttl,
     )
-    cli_info(f"Updated SOA for {args.zone}", print_msg=True)
+    OutputManager().add_ok(f"Updated SOA for {args.zone}")
 
 
 @command_registry.register_command(
@@ -285,4 +285,4 @@ def set_default_ttl(args: argparse.Namespace) -> None:
     """
     zone = Zone.get_zone_or_raise(args.zone)
     zone.set_default_ttl(args.ttl)
-    cli_info(f"Set default TTL for {args.zone}", print_msg=True)
+    OutputManager().add_ok(f"Set default TTL for {args.zone}")
diff --git a/mreg_cli/exceptions.py b/mreg_cli/exceptions.py
index 6031c454..178e4b01 100644
--- a/mreg_cli/exceptions.py
+++ b/mreg_cli/exceptions.py
@@ -8,6 +8,7 @@
 from __future__ import annotations
 
 import sys
+from typing import Any
 
 from prompt_toolkit import print_formatted_text
 from prompt_toolkit.formatted_text import HTML
@@ -35,12 +36,19 @@ class CliError(CliException):
     the user cannot be expected to resolve.
     """
 
+    def __init__(self, *args: Any, **kwargs: Any):
+        """Initialize the error."""
+        super().__init__(*args, **kwargs)
+        from mreg_cli.outputmanager import OutputManager
+
+        OutputManager().add_error(super().__str__())
+
     def formatted_exception(self) -> str:
         """Return a string formatted with HTML red tag for the error message.
 
         :returns: Formatted error message.
         """
-        return f"<ansired>{super().__str__()}</ansired>"
+        return f"<ansired>ERROR: {super().__str__()}</ansired>"
 
 
 class CliWarning(CliException):
@@ -49,6 +57,13 @@ class CliWarning(CliException):
     Warnings should be recoverable by changing the user input.
     """
 
+    def __init__(self, *args: Any, **kwargs: Any):
+        """Initialize the warning."""
+        super().__init__(*args, **kwargs)
+        from mreg_cli.outputmanager import OutputManager
+
+        OutputManager().add_warning(super().__str__())
+
     def formatted_exception(self) -> str:
         """Return a string formatted with HTML italic tag for the warning message.
 
@@ -105,6 +120,30 @@ class ValidationError(CliError):
     pass
 
 
+class FileError(CliError):
+    """Error class for file errors."""
+
+    pass
+
+
+class APINotOk(CliWarning):
+    """Warning class for API not returning OK."""
+
+    pass
+
+
+class TooManyResults(CliWarning):
+    """Warning class for too many results."""
+
+    pass
+
+
+class NoHistoryFound(CliWarning):
+    """Warning class for no history found."""
+
+    pass
+
+
 class EntityNotFound(CliWarning):
     """Warning class for an entity that was not found."""
 
@@ -165,6 +204,12 @@ class InvalidNetwork(CliWarning):
     pass
 
 
+class NetworkOverlap(CliWarning):
+    """Warning class for a networkthat overlaps with another network."""
+
+    pass
+
+
 class LoginFailedError(CliException):
     """Error class for login failure."""
 
diff --git a/mreg_cli/log.py b/mreg_cli/log.py
deleted file mode 100644
index efe27014..00000000
--- a/mreg_cli/log.py
+++ /dev/null
@@ -1,93 +0,0 @@
-"""Logging functions for the CLI."""
-
-from __future__ import annotations
-
-import getpass
-import inspect
-import re
-from datetime import datetime
-from typing import NoReturn
-
-from .exceptions import CliError, CliWarning
-from .outputmanager import OutputManager
-
-logfile = None
-
-
-def _prefix_from_stack() -> str:
-    """Get a prefix for log entries from the stack."""
-    stack = inspect.stack()
-    stack.reverse()
-    prefix = ""
-    for f in stack:
-        m = re.match("^do_(?P<name>.+)$", f[3])
-        if m:
-            prefix += " " + m.group("name")
-        m = re.match("^opt_(?P<name>.+)$", f[3])
-        if m:
-            prefix += " " + m.group("name")
-    return prefix.strip()
-
-
-def _write_log(entry: str, end: str = "\n") -> None:
-    """Write a log entry to the log file."""
-    if logfile is not None:
-        with open(logfile, "a+") as f:
-            f.write(entry + end)
-
-
-def cli_error(
-    msg: str, raise_exception: bool = True, exception: type[Exception] = CliError
-) -> NoReturn | None:
-    """Write a ERROR log entry."""
-    pre = _prefix_from_stack()
-    s = "{} {} [ERROR] {}: {}".format(
-        datetime.now().isoformat(sep=" ", timespec="seconds"),
-        getpass.getuser(),
-        pre,
-        msg,
-    )
-    _write_log(s)
-    msg = f"ERROR: {pre}: {msg}"
-    OutputManager().add_error(msg)
-    if raise_exception:
-        # A simplified message for console
-        raise exception(msg)
-    return None
-
-
-def cli_warning(
-    msg: str, raise_exception: bool = True, exception: type[Exception] = CliWarning
-) -> NoReturn | None:
-    """Write a WARNING log entry."""
-    pre = _prefix_from_stack()
-    s = "{} {} [WARNING] {}: {}".format(
-        datetime.now().isoformat(sep=" ", timespec="seconds"),
-        getpass.getuser(),
-        pre,
-        msg,
-    )
-    _write_log(s)
-    msg = f"WARNING: {pre}: {msg}"
-    OutputManager().add_warning(msg)
-    if raise_exception:
-        # A simplified message for console
-        raise exception(msg)
-    return None
-
-
-def cli_info(msg: str, print_msg: bool = False) -> None:
-    """Write an OK log entry."""
-    pre = _prefix_from_stack()
-    s = "{} {} [OK] {}: {}".format(
-        datetime.now().isoformat(sep=" ", timespec="seconds"),
-        getpass.getuser(),
-        pre,
-        msg,
-    )
-    _write_log(s)
-    msg = f"OK: {pre}: {msg}"
-    OutputManager().add_ok(msg)
-    if print_msg:
-        # A simplified message for console
-        print(msg)
diff --git a/mreg_cli/log.pyi b/mreg_cli/log.pyi
deleted file mode 100644
index 3b950f5a..00000000
--- a/mreg_cli/log.pyi
+++ /dev/null
@@ -1,37 +0,0 @@
-from __future__ import annotations
-
-from typing import Literal, NoReturn, overload
-
-@overload
-def cli_error(msg: str) -> NoReturn: ...
-@overload
-def cli_error(
-    msg: str, raise_exception: Literal[True] = True, exception: type[Exception] = ...
-) -> NoReturn: ...
-@overload
-def cli_error(
-    msg: str,
-    raise_exception: Literal[False] = False,
-    exception: type[Exception] = ...,
-) -> None: ...
-@overload
-def cli_error(
-    msg: str, raise_exception: bool = ..., exception: type[Exception] = ...
-) -> NoReturn | None: ...
-@overload
-def cli_warning(msg: str) -> NoReturn: ...
-@overload
-def cli_warning(
-    msg: str, raise_exception: Literal[True] = True, exception: type[Exception] = ...
-) -> NoReturn: ...
-@overload
-def cli_warning(
-    msg: str,
-    raise_exception: Literal[False] = False,
-    exception: type[Exception] = ...,
-) -> None: ...
-@overload
-def cli_warning(
-    msg: str, raise_exception: bool = ..., exception: type[Exception] = ...
-) -> NoReturn | None: ...
-def cli_info(msg: str, print_msg: bool = ...) -> None: ...
diff --git a/mreg_cli/main.py b/mreg_cli/main.py
index 80ee7257..193e60e9 100644
--- a/mreg_cli/main.py
+++ b/mreg_cli/main.py
@@ -17,8 +17,6 @@
 from mreg_cli.outputmanager import OutputManager
 from mreg_cli.utilities.api import try_token_or_login
 
-from . import log
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/mreg_cli/outputmanager.py b/mreg_cli/outputmanager.py
index a10c9d32..d7fb319f 100644
--- a/mreg_cli/outputmanager.py
+++ b/mreg_cli/outputmanager.py
@@ -19,7 +19,7 @@
 import requests
 from pydantic import BaseModel
 
-from mreg_cli.exceptions import CliError
+from mreg_cli.exceptions import FileError, InputFailure
 from mreg_cli.types import RecordingEntry, TimeInfo
 
 
@@ -175,7 +175,7 @@ def recording_start(self, filename: str) -> None:
             with open(filename, "w") as _:
                 pass
         except OSError as exc:
-            raise CliError(f"Unable open file for writing: {filename}") from exc
+            raise FileError(f"Unable open recording file for writing: {filename}") from exc
 
         self._recording = True
         self._filename = filename
@@ -388,12 +388,12 @@ def get_filter(self, command: str) -> tuple[str, Any, bool]:
                     filter_re = re.compile(filter_str)
                 except re.error as exc:
                     if "|" in filter_str:
-                        raise CliError(
-                            "ERROR: Command parts that contain a pipe ('|') must be quoted.",
+                        raise InputFailure(
+                            "Command parts that contain a pipe ('|') must be quoted.",
                         ) from exc
                     else:
-                        raise CliError(
-                            "ERROR: Unable to compile regex '{}': {}", filter_str, exc
+                        raise InputFailure(
+                            f"Unable to compile regex '{filter_str}': {exc}"
                         ) from exc
 
         return (command, filter_re, negate)
diff --git a/mreg_cli/utilities/api.py b/mreg_cli/utilities/api.py
index 0f021845..5e0dbbf1 100644
--- a/mreg_cli/utilities/api.py
+++ b/mreg_cli/utilities/api.py
@@ -11,30 +11,24 @@
 import os
 import re
 import sys
-from typing import (
-    Any,
-    Literal,
-    NoReturn,
-    TypeVar,
-    cast,
-    get_origin,
-    overload,
-)
+from typing import Any, Literal, NoReturn, TypeVar, cast, get_origin, overload
 from urllib.parse import urljoin
 from uuid import uuid4
 
 import requests
 from prompt_toolkit import prompt
-from pydantic import (
-    BaseModel,
-    TypeAdapter,
-    field_validator,
-)
+from pydantic import BaseModel, TypeAdapter, field_validator
 from requests import Response
 
 from mreg_cli.config import MregCliConfig
-from mreg_cli.exceptions import CliError, LoginFailedError, ValidationError
-from mreg_cli.log import cli_error, cli_warning
+from mreg_cli.exceptions import (
+    APINotOk,
+    CliError,
+    LoginFailedError,
+    MultipleEntititesFound,
+    TooManyResults,
+    ValidationError,
+)
 from mreg_cli.outputmanager import OutputManager
 from mreg_cli.tokenfile import TokenFile
 from mreg_cli.types import Json, JsonMapping
@@ -161,7 +155,7 @@ def prompt_for_password_and_try_update_token() -> None:
     try:
         user = MregCliConfig().get("user")
         if not user:
-            raise CliError("Unable to determine username.")
+            raise LoginFailedError("Unable to determine username.")
         auth_and_update_token(user, password)
     except CliError as e:
         e.print_self()
@@ -183,9 +177,9 @@ def auth_and_update_token(username: str, password: str) -> None:
             res = result.text
         if result.status_code == 400:
             if "non_field_errors" in res:
-                cli_error("Invalid username/password")
+                raise LoginFailedError("Invalid username/password")
         else:
-            cli_error(res)
+            raise LoginFailedError(res)
     token = result.json()["token"]
     set_session_token(token)
     TokenFile.set_entry(username, MregCliConfig().get_url(), token)
@@ -201,7 +195,7 @@ def result_check(result: Response, operation_type: str, url: str) -> None:
             pass
         else:
             message += f"\n{json.dumps(body, indent=2)}"
-        cli_warning(message)
+        raise APINotOk(message)
 
 
 def strip_none(data: dict[str, Any]) -> dict[str, Any]:
@@ -221,7 +215,7 @@ def strip_none(data: dict[str, Any]) -> dict[str, Any]:
 def _request_wrapper(
     operation_type: str,
     path: str,
-    params: dict[str, Any] | None = None,
+    params: JsonMapping | None = None,
     ok404: bool = False,
     first: bool = True,
     **data: Any,
@@ -243,6 +237,16 @@ def _request_wrapper(
     )
     result = cast(requests.Response, result)  # convince mypy that result is a Response
 
+    # This is a workaround for old server versions that can't handle JSON data in requests
+    if (
+        result.status_code == 500
+        and (operation_type == "post" or operation_type == "patch")
+        and params == {}
+        and data is not None
+    ):
+        result = getattr(session, operation_type)(url, params={}, timeout=HTTP_TIMEOUT, data=data)
+        result = cast(requests.Response, result)
+
     OutputManager().recording_request(operation_type, url, params, data, result)
 
     if first and result.status_code == 401:
@@ -256,22 +260,22 @@ def _request_wrapper(
 
 
 @overload
-def get(path: str, params: dict[str, Any] | None, ok404: Literal[True]) -> Response | None: ...
+def get(path: str, params: JsonMapping | None, ok404: Literal[True]) -> Response | None: ...
 
 
 @overload
-def get(path: str, params: dict[str, Any] | None, ok404: Literal[False]) -> Response: ...
+def get(path: str, params: JsonMapping | None, ok404: Literal[False]) -> Response: ...
 
 
 @overload
-def get(path: str, params: dict[str, Any] | None = ..., *, ok404: bool) -> Response | None: ...
+def get(path: str, params: JsonMapping | None = ..., *, ok404: bool) -> Response | None: ...
 
 
 @overload
-def get(path: str, params: dict[str, Any] | None = ...) -> Response: ...
+def get(path: str, params: JsonMapping | None = ...) -> Response: ...
 
 
-def get(path: str, params: dict[str, Any] | None = None, ok404: bool = False) -> Response | None:
+def get(path: str, params: JsonMapping | None = None, ok404: bool = False) -> Response | None:
     """Make a standard get request."""
     if params is None:
         params = {}
@@ -346,7 +350,7 @@ def get_item_by_key_value(
 
 def get_list_unique(
     path: str,
-    params: dict[str, str],
+    params: dict[str, str] | None = None,
     ok404: bool = False,
 ) -> None | JsonMapping:
     """Do a get request that returns a single result from a search.
@@ -374,7 +378,7 @@ class PaginatedResponse(BaseModel):
     """Paginated response data from the API."""
 
     count: int
-    next: str | None
+    next: str | None  # noqa: A003
     previous: str | None
     results: list[Json]
 
@@ -428,7 +432,7 @@ def validate_paginated_response(response: Response) -> PaginatedResponse:
 @overload
 def get_list_generic(
     path: str,
-    params: dict[str, Any] | None = None,
+    params: dict[str, str] | None = None,
     ok404: bool = False,
     limit: int | None = 500,
     expect_one_result: Literal[True] = True,
@@ -438,7 +442,7 @@ def get_list_generic(
 @overload
 def get_list_generic(
     path: str,
-    params: dict[str, Any] | None = None,
+    params: dict[str, str] | None = None,
     ok404: bool = False,
     limit: int | None = 500,
     expect_one_result: Literal[False] = False,
@@ -447,7 +451,7 @@ def get_list_generic(
 
 def get_list_generic(
     path: str,
-    params: dict[str, Any] | None = None,
+    params: JsonMapping | None = None,
     ok404: bool = False,
     limit: int | None = 500,
     expect_one_result: bool | None = False,
@@ -471,23 +475,6 @@ def get_list_generic(
 
     :returns: A list of dictionaries or a dictionary if expect_one_result is True.
     """
-
-    def _check_expect_one_result(
-        ret: list[Json],
-    ) -> Json | list[Json]:
-        if expect_one_result:
-            if len(ret) == 0:
-                return {}
-            if len(ret) != 1:
-                raise CliError(f"Expected exactly one result, got {len(ret)}.")
-
-            return ret[0]
-
-        return ret
-
-    if params is None:
-        params = {}
-
     response = get(path, params)
 
     # Non-paginated results, return them directly
@@ -497,17 +484,23 @@ def _check_expect_one_result(
     resp = validate_paginated_response(response)
 
     if limit and resp.count > abs(limit):
-        cli_warning(f"Too many hits ({resp.count}), please refine your search criteria.")
+        raise TooManyResults(f"Too many hits ({resp.count}), please refine your search criteria.")
 
     # Iterate over all pages and collect the results
     ret: list[Json] = resp.results
     while resp.next:
         response = get(resp.next, params=params, ok404=ok404)
         if response is None:
-            return _check_expect_one_result(ret)
+            break
         resp = validate_paginated_response(response)
         ret.extend(resp.results)
-    return _check_expect_one_result(ret)
+    if expect_one_result:
+        if len(ret) == 0:
+            return {}
+        if len(ret) != 1:
+            raise MultipleEntititesFound(f"Expected exactly one result, got {len(ret)}.")
+        return ret[0]
+    return ret
 
 
 def get_typed(
diff --git a/mreg_cli/utilities/history.py b/mreg_cli/utilities/history.py
deleted file mode 100644
index b4d3780f..00000000
--- a/mreg_cli/utilities/history.py
+++ /dev/null
@@ -1,97 +0,0 @@
-"""History log related functions."""
-
-from __future__ import annotations
-
-import json
-from typing import Any
-
-from dateutil.parser import parse
-
-from mreg_cli.log import cli_warning
-from mreg_cli.outputmanager import OutputManager
-from mreg_cli.utilities.api import get_list
-
-
-def get_history_items(
-    name: str, resource: str, data_relation: str | None = None
-) -> list[dict[str, Any]]:
-    """Get history items for a given name and resource."""
-    # First check if any model id with the name exists
-    path = "/api/v1/history/"
-    params = {
-        "resource": resource,
-        "name": name,
-    }
-    ret = get_list(path, params=params)
-    if len(ret) == 0:
-        cli_warning(f"No history found for {name}")
-    # Get all model ids, a group gets a new one when deleted and created again
-    model_ids = ",".join({str(i["model_id"]) for i in ret})
-    params = {
-        "resource": resource,
-        "model_id__in": model_ids,
-    }
-    ret = get_list(path, params=params)
-    if data_relation is not None:
-        params = {
-            "data__relation": data_relation,
-            "data__id__in": model_ids,
-        }
-        ret.extend(get_list(path, params=params))
-    return ret
-
-
-def format_history_items(ownname: str, items: list[dict[str, Any]]) -> None:
-    """Format history items for output."""
-
-    def _remove_unneded_keys(data: dict[str, Any]):
-        """Remove unneeded keys from data.
-
-        Note: This modifies the data passed in.
-        """
-        for key in (
-            "id",
-            "created_at",
-            "updated_at",
-        ):
-            data.pop(key, None)
-
-    for i in sorted(items, key=lambda i: parse(i["timestamp"])):
-        timestamp = parse(i["timestamp"]).strftime("%Y-%m-%d %H:%M:%S")
-        msg = ""
-        if isinstance(i["data"], dict):
-            data = i["data"]
-        else:
-            data = json.loads(i["data"])
-        action = i["action"]
-        model = i["model"]
-        if action in ("add", "remove"):
-            if i["name"] == ownname:
-                msg = data["name"]
-            else:
-                msg = i["resource"] + " " + i["name"]
-                if action == "add":
-                    action = "add to"
-                elif action == "remove":
-                    action = "remove from"
-        elif action == "create":
-            msg = ", ".join(f"{k} = '{v}'" for k, v in data.items())
-        elif action == "update":
-            if model in ("Ipaddress",):
-                msg = data["current_data"]["ipaddress"] + ", "
-            changes = []
-            for key, newval in data["update"].items():
-                oldval = data["current_data"][key] or "not set"
-                newval = newval or "not set"
-                changes.append(f"{key}: {oldval} -> {newval}")
-            msg += ",".join(changes)
-        elif action == "destroy":
-            _remove_unneded_keys(data)
-            if model == "Host":
-                msg = "deleted " + i["name"]
-            else:
-                msg = ", ".join(f"{k} = '{v}'" for k, v in data.items())
-        else:
-            cli_warning(f"Unhandled history entry: {i}")
-
-        OutputManager().add_line(f"{timestamp} [{i['user']}]: {model} {action}: {msg}")
diff --git a/mreg_cli/utilities/host.py b/mreg_cli/utilities/host.py
deleted file mode 100644
index 209f3a35..00000000
--- a/mreg_cli/utilities/host.py
+++ /dev/null
@@ -1,255 +0,0 @@
-"""Host-related utilities."""
-
-from __future__ import annotations
-
-import urllib.parse
-from typing import Any
-
-from mreg_cli.exceptions import CliWarning, EntityNotFound
-from mreg_cli.log import cli_error, cli_info, cli_warning
-from mreg_cli.utilities.api import get, get_list, patch
-from mreg_cli.utilities.network import ips_are_in_same_vlan
-from mreg_cli.utilities.shared import clean_hostname, format_mac
-from mreg_cli.utilities.validators import is_valid_ip, is_valid_ipv4, is_valid_ipv6, is_valid_mac
-
-
-def get_unique_ip_by_name_or_ip(arg: str) -> dict[str, Any]:
-    """Get A/AAAA record by either ip address or host name.
-
-    This will fail if:
-        - The host has multiple A/AAAA records and they are on different VLANs.
-        - The host has no A/AAAA records.
-        - The IP is used by multiple hosts.
-        - The IP or host doesn't exist.
-
-    If the host has one A and AAAA record on the same VLAN, the IPv4 address is returned.
-
-    :param arg: ip address or host name (as a string)
-
-    :return: A dict with the ip address information.
-    """
-    if is_valid_ip(arg):
-        path = "/api/v1/ipaddresses/"
-        params = {
-            "ipaddress": arg,
-        }
-        ips = get_list(path, params=params)
-        if not len(ips):
-            cli_warning(f"ip {arg} doesn't exist.")
-        elif len(ips) > 1:
-            cli_warning(f"ip {arg} is in use by {len(ips)} hosts")
-        return ips[0]
-
-    # We were not given an IP, so resolve as a host.
-    info = host_info_by_name(arg)
-    if len(info["ipaddresses"]) == 2:
-        # one of these may be is_valid_ip4 and the other is_valid_ip6.
-        ip1 = info["ipaddresses"][0]["ipaddress"]
-        ip2 = info["ipaddresses"][1]["ipaddress"]
-
-        if not (is_valid_ipv4(ip1) and is_valid_ipv6(ip2)) or (
-            is_valid_ipv6(ip1) and is_valid_ipv4(ip2)
-        ):
-            cli_warning(
-                f"{arg} has multiple addresses in the same address family."
-                " Please specify a specific address to use instead."
-            )
-
-        if ips_are_in_same_vlan([ip1, ip2]):
-            # In the case of the host having IPv4 and IPv6 on the same VLAN, we return the IPv4
-            # address. This works "okay" for now as its the only DUID type they can share.
-            if is_valid_ipv4(ip1):
-                return info["ipaddresses"][0]
-            return info["ipaddresses"][1]
-        else:
-            cli_warning(
-                "{} has one IPv4 and one IPv6 address, but they are on different VLANs.".format(
-                    info["name"]
-                )
-                + " Please specify a specific address to use instead."
-            )
-
-    elif len(info["ipaddresses"]) > 1:
-        cli_warning(
-            "{} has {} ip addresses, please enter one of the addresses instead.".format(
-                info["name"],
-                len(info["ipaddresses"]),
-            )
-        )
-    if len(info["ipaddresses"]) == 0:
-        cli_warning(
-            f"{arg} doesn't have any ip addresses.",
-            raise_exception=True,
-            exception=CliWarning,
-        )
-    ip = info["ipaddresses"][0]
-    return ip
-
-
-def assoc_mac_to_ip(mac: str, ip: dict[str, Any], force: bool = False) -> str | None:
-    """Associate MAC address with IP address."""
-    # MAC addr sanity check
-    if is_valid_mac(mac):
-        new_mac = format_mac(mac)
-        path = "/api/v1/ipaddresses/"
-        params = {
-            "macaddress": new_mac,
-            "ordering": "ipaddress",
-        }
-        macs = get_list(path, params=params)
-        ips = ", ".join([i["ipaddress"] for i in macs])
-        if len(macs) and not force:
-            cli_warning(
-                "mac {} already in use by: {}. Use force to add {} -> {} as well.".format(
-                    mac, ips, ip["ipaddress"], mac
-                )
-            )
-    else:
-        cli_warning(f"invalid MAC address: {mac}")
-
-    old_mac = ip.get("macaddress")
-    if old_mac == new_mac:
-        cli_info("new and old mac are identical. Ignoring.", print_msg=True)
-        return None
-    elif old_mac and not force:
-        cli_warning(
-            "ip {} has existing mac {}. Use force to replace.".format(ip["ipaddress"], old_mac)
-        )
-
-    # Update Ipaddress with a mac
-    path = f"/api/v1/ipaddresses/{ip['id']}"
-    patch(path, macaddress=new_mac)
-    return new_mac
-
-
-def cname_exists(cname: str) -> bool:
-    """Check if a cname exists."""
-    if len(get_list("/api/v1/cnames/", params={"name": cname})):
-        return True
-    else:
-        return False
-
-
-def host_info_by_name_or_ip(name_or_ip: str) -> dict[str, Any]:
-    """Return a dict with host information about the given host, or the host owning the given ip.
-
-    :param name_or_ip: Either a host name on short or long form or an ipv4/ipv6 address.
-    :return: A dict of the JSON object received with the host information
-    """
-    if is_valid_ip(name_or_ip):
-        name = resolve_ip(name_or_ip)
-    else:
-        name = name_or_ip
-    return host_info_by_name(name)
-
-
-def _host_info_by_name(name: str, follow_cname: bool = True) -> dict[str, Any] | None:
-    hostinfo = get(f"/api/v1/hosts/{urllib.parse.quote(name)}", ok404=True)
-
-    if hostinfo:
-        return hostinfo.json()
-    elif follow_cname:
-        # All host info data is returned from the API
-        path = "/api/v1/hosts/"
-        params = {"cnames__name": name}
-        hosts = get_list(path, params=params)
-        if len(hosts) == 1:
-            return hosts[0]
-    return None
-
-
-def host_info_by_name(name: str, follow_cname: bool = True) -> dict[str, Any]:
-    """Return a dict with host information about the given host.
-
-    :param name: A host name on either short or long form.
-    :param follow_cname: Indicate whether or not to check if name is a cname. If True (default)
-    if will attempt to get the host via the cname.
-    :return: A dict of the JSON object received with the host information
-    """
-    # Get longform of name
-    name = clean_hostname(name)
-    hostinfo = _host_info_by_name(name, follow_cname=follow_cname)
-    if hostinfo is None:
-        cli_warning(f"host not found: {name!r}", exception=EntityNotFound)
-
-    return hostinfo
-
-
-def resolve_name_or_ip(name_or_ip: str) -> str:
-    """Try to find a host from the given name/ip. Raises an exception if not."""
-    if is_valid_ip(name_or_ip):
-        return resolve_ip(name_or_ip)
-    else:
-        return get_host_by_name(name_or_ip)
-
-
-def resolve_ip(ip: str) -> str:
-    """Return a host name associated with ip."""
-    path = "/api/v1/hosts/"
-    params = {
-        "ipaddresses__ipaddress": ip,
-    }
-    hosts = get_list(path, params=params)
-
-    # Response data sanity check
-    if len(hosts) > 1:
-        cli_error(f'resolve ip got multiple matches for ip "{ip}"')
-
-    if len(hosts) == 0:
-        cli_warning(f"{ip} doesnt belong to any host", exception=EntityNotFound)
-    return hosts[0]["name"]
-
-
-def get_host_by_name(name: str) -> str:
-    """Try to find the named host. Raises an exception if not."""
-    hostname = clean_hostname(name)
-
-    path = "/api/v1/hosts/"
-    params = {
-        "name": hostname,
-    }
-    hosts = get_list(path, params=params)
-
-    if len(hosts) == 1:
-        assert hosts[0]["name"] == hostname
-        return hostname
-    cli_warning(f"host not found: {name}", exception=EntityNotFound)
-
-
-def _cname_info_by_name(name: str) -> dict[str, Any] | None:
-    """Return a dict with information about the given cname."""
-    path = "/api/v1/cnames/"
-    params = {
-        "name": name,
-    }
-    info = get_list(path, params=params)
-    if len(info) == 1:
-        return info[0]
-    return None
-
-
-def _srv_info_by_name(name: str) -> dict[str, Any] | None:
-    """Return a dict with information about the given srv."""
-    path = "/api/v1/srvs/"
-    params = {
-        "name": name,
-    }
-    info = get_list(path, params=params)
-    if len(info) == 1:
-        return info[0]
-    return None
-
-
-def get_info_by_name(name: str) -> tuple[str, dict[str, Any]]:
-    """Get host, cname or srv by name."""
-    name = clean_hostname(name)
-    info = _host_info_by_name(name, follow_cname=False)
-    if info is not None:
-        return "host", info
-    info = _cname_info_by_name(name)
-    if info is not None:
-        return "cname", info
-    info = _srv_info_by_name(name)
-    if info is not None:
-        return "srv", info
-    cli_warning(f"not found: {name!r}", exception=EntityNotFound)
diff --git a/mreg_cli/utilities/network.py b/mreg_cli/utilities/network.py
deleted file mode 100644
index 2bc27ff7..00000000
--- a/mreg_cli/utilities/network.py
+++ /dev/null
@@ -1,118 +0,0 @@
-"""Utility functions for mreg_cli.
-
-Due to circular dependencies, this module is not allowed to import anything from mreg_cli.
-And this rule is promptly broken by importing from mreg_cli.outputmanager...
-"""
-
-from __future__ import annotations
-
-import ipaddress
-import urllib.parse
-from collections.abc import Iterable
-from typing import Any
-
-from mreg_cli.api.models import Network
-from mreg_cli.log import cli_warning
-from mreg_cli.types import IP_networkTV
-from mreg_cli.utilities.api import get, get_typed
-from mreg_cli.utilities.validators import is_valid_ip, is_valid_network
-
-
-def get_network_first_unused_ip(network: dict[str, Any]) -> str:
-    """Return the first unused ip from a given network.
-
-    Assumes network exists.
-    :param network: dict with network info (key: "network").
-    :return: Ip address string.
-    """
-    unused = get_network_first_unused(network["network"])
-    if not unused:
-        cli_warning("No free addresses remaining on network {}".format(network["network"]))
-    return unused
-
-
-def ip_in_mreg_net(ip: str) -> bool:
-    """Return true if the ip is in a MREG controlled network."""
-    ipt = ipaddress.ip_address(ip)
-    net = Network.get_by_ip(ipt)
-    return bool(net)
-
-
-def ipsort(ips: Iterable[Any]) -> list[Any]:
-    """Sort a list of ips."""
-    return sorted(ips, key=lambda i: ipaddress.ip_address(i))
-
-
-def ips_are_in_same_vlan(ips: list[str]) -> bool:
-    """Return True if all ips are in the same vlan."""
-    # IPs must be in a network, and that network must have a vlan for this to work.
-    last_vlan = ""
-    for ip in ips:
-        network = Network.get_by_ip(ipaddress.ip_address(ip))
-        if not network:
-            return False
-
-        if not network.vlan:
-            return False
-
-        if last_vlan and network.vlan != last_vlan:
-            return False
-
-        last_vlan = network.vlan
-
-    return True
-
-
-def get_network(ip: str) -> Network | None:
-    """Return a network associated with given range or IP."""
-    if is_valid_network(ip):
-        path = f"/api/v1/networks/{urllib.parse.quote(ip)}"
-        return get(path).json()
-    elif is_valid_ip(ip):
-        net = Network.get_by_ip(ipaddress.ip_address(ip))
-        if net:
-            return net
-        cli_warning("ip address exists but is not an address in any existing network")
-    else:
-        cli_warning("Not a valid ip range or ip address")
-
-
-def get_network_used_count(ip_range: str) -> int:
-    """Return a count of the addresses in use on a given network."""
-    path = f"/api/v1/networks/{urllib.parse.quote(ip_range)}/used_count"
-    return get_typed(path, int)
-
-
-def get_network_used_list(ip_range: str) -> list[str]:
-    """Return a list of the addresses in use on a given network."""
-    path = f"/api/v1/networks/{urllib.parse.quote(ip_range)}/used_list"
-    return get_typed(path, list[str])
-
-
-def get_network_unused_count(ip_range: str) -> int:
-    """Return a count of the unused addresses on a given network."""
-    path = f"/api/v1/networks/{urllib.parse.quote(ip_range)}/unused_count"
-    return get_typed(path, int)
-
-
-def get_network_unused_list(ip_range: str) -> list[str]:
-    """Return a list of the unused addresses on a given network."""
-    path = f"/api/v1/networks/{urllib.parse.quote(ip_range)}/unused_list"
-    return get_typed(path, list[str])
-
-
-def get_network_first_unused(ip_range: str) -> str:
-    """Return the first unused address on a network, if any."""
-    path = f"/api/v1/networks/{urllib.parse.quote(ip_range)}/first_unused"
-    return get_typed(path, str)
-
-
-def get_network_reserved_ips(ip_range: str) -> list[str]:
-    """Return the first unused address on a network, if any."""
-    path = f"/api/v1/networks/{urllib.parse.quote(ip_range)}/reserved_list"
-    return get_typed(path, list[str])
-
-
-def network_is_supernet(a: IP_networkTV, b: IP_networkTV) -> bool:
-    """Return True if a is a supernet of b."""
-    return a.supernet_of(b)
diff --git a/mreg_cli/utilities/output.py b/mreg_cli/utilities/output.py
deleted file mode 100644
index 1d9cd2cc..00000000
--- a/mreg_cli/utilities/output.py
+++ /dev/null
@@ -1,339 +0,0 @@
-"""Field formatting functions for the CLI.
-
-These are typically utilities for formatting fields in a consistent way. The functions
-shall queue the output directly to the OutputManager, and will not return anything.
-
-Note that these functions *may* themselves require API calls to get additional data
-related to the field or dataset being formatted.
-"""
-
-from __future__ import annotations
-
-from collections.abc import Iterable
-from typing import Any
-
-from mreg_cli.log import cli_info, cli_warning
-from mreg_cli.outputmanager import OutputManager
-from mreg_cli.utilities.api import get_list
-from mreg_cli.utilities.validators import is_valid_ipv4, is_valid_ipv6
-
-
-def output_hinfo(hinfo: dict[str, Any] | None, padding: int = 14) -> None:
-    """Pretty given hinfo id."""
-    if hinfo is None:
-        return
-    OutputManager().add_line(
-        "{1:<{0}}cpu={2} os={3}".format(padding, "Hinfo:", hinfo["cpu"], hinfo["os"])
-    )
-
-
-def output_host_name(name: str | None, padding: int = 14) -> None:
-    """Pretty print given name."""
-    if name is None:
-        return
-    OutputManager().add_line("{1:<{0}}{2}".format(padding, "Name:", name))
-
-
-def output_contact(contact: str | None, padding: int = 14) -> None:
-    """Pretty print given contact."""
-    if contact is None:
-        return
-    OutputManager().add_line("{1:<{0}}{2}".format(padding, "Contact:", contact))
-
-
-def output_comment(comment: str | None, padding: int = 14) -> None:
-    """Pretty print given comment."""
-    if comment is None:
-        return
-    OutputManager().add_line("{1:<{0}}{2}".format(padding, "Comment:", comment))
-
-
-def output_ipaddresses(
-    ipaddresses: Iterable[dict[str, Any]], names: bool = False, padding: int = 14
-) -> None:
-    """Pretty print given ip addresses."""
-
-    def _find_padding(lst: Iterable[dict[str, Any]], attr: str):
-        return max(padding, max([len(i[attr]) for i in lst]) + 1)
-
-    manager = OutputManager()
-
-    if not ipaddresses:
-        return
-    a_records = []
-    aaaa_records = []
-    len_ip = _find_padding(ipaddresses, "ipaddress")
-    for record in ipaddresses:
-        if is_valid_ipv4(record["ipaddress"]):
-            a_records.append(record)
-        elif is_valid_ipv6(record["ipaddress"]):
-            aaaa_records.append(record)
-    if names:
-        len_names = _find_padding(ipaddresses, "name")
-    else:
-        len_names = padding
-    for records, text in ((a_records, "A_Records"), (aaaa_records, "AAAA_Records")):
-        if records:
-            manager.add_line("{1:<{0}}{2:<{3}}  {4}".format(len_names, text, "IP", len_ip, "MAC"))
-            for record in records:
-                ip = record["ipaddress"]
-                mac = record["macaddress"]
-                if names:
-                    name = record["name"]
-                else:
-                    name = ""
-                manager.add_line(
-                    "{1:<{0}}{2:<{3}}  {4}".format(
-                        len_names,
-                        name,
-                        ip if ip else "<not set>",
-                        len_ip,
-                        mac if mac else "<not set>",
-                    )
-                )
-
-
-def output_ttl(ttl: int, padding: int = 14) -> None:
-    """Pretty print given ttl."""
-    OutputManager().add_line("{1:<{0}}{2}".format(padding, "TTL:", ttl or "(Default)"))
-
-
-def output_loc(loc: dict[str, Any] | None, padding: int = 14) -> None:
-    """Pretty print given loc."""
-    if loc is None:
-        return
-    OutputManager().add_line("{1:<{0}}{2}".format(padding, "Loc:", loc["loc"]))
-
-
-def output_cname(cname: str, host: str, padding: int = 14) -> None:
-    """Pretty print given cname."""
-    OutputManager().add_line("{1:<{0}}{2} -> {3}".format(padding, "Cname:", cname, host))
-
-
-def output_mx(mxs: list[dict[str, Any]], padding: int = 14) -> None:
-    """Pretty print all MXs."""
-    if not mxs:
-        return
-    len_pri = len("Priority")
-    manager = OutputManager()
-    manager.add_line("{1:<{0}}{2} {3}".format(padding, "MX:", "Priority", "Server"))
-    for mx in sorted(mxs, key=lambda i: i["priority"]):
-        manager.add_line(
-            "{1:<{0}}{2:>{3}} {4}".format(padding, "", mx["priority"], len_pri, mx["mx"])
-        )
-
-
-def output_ptr(ip: str, host_name: str, padding: int = 14) -> None:
-    """Pretty print given txt."""
-    OutputManager().add_line("{1:<{0}}{2} -> {3}".format(padding, "PTR override:", ip, host_name))
-
-
-def output_txt(txt: str | None, padding: int = 14) -> None:
-    """Pretty print given txt."""
-    if txt is None:
-        return
-    OutputManager().add_line("{1:<{0}}{2}".format(padding, "TXT:", txt))
-
-
-def output_bacnetid(bacnetid: dict[str, Any] | None, padding: int = 14) -> None:
-    """Pretty print given txt."""
-    if bacnetid is None:
-        return
-    OutputManager().add_line("{1:<{0}}{2}".format(padding, "BACnet ID:", bacnetid["id"]))
-
-
-def output_policies(policies: list[str], padding: int = 14) -> None:
-    """Pretty print given policies.
-
-    This follows the output policy of printing nothing if there are no policies.
-    """
-    if not policies:
-        return
-    OutputManager().add_line("{1:<{0}}{2}".format(padding, "Policies:", ", ".join(policies)))
-
-
-def output_srv(srvs: list[dict[str, Any]] | None = None, host_id: str | None = None) -> None:
-    """Pretty print given srv."""
-    assert srvs is not None or host_id is not None
-    hostid2name = dict()
-    host_ids = set()
-
-    def print_srv(srv: dict[str, Any], hostname: str, padding: int = 14) -> None:
-        """Pretty print given srv."""
-        OutputManager().add_line(
-            "SRV: {1:<{0}} {2:^6} {3:^6} {4:^6} {5}".format(
-                padding,
-                srv["name"],
-                srv["priority"],
-                srv["weight"],
-                srv["port"],
-                hostname,
-            )
-        )
-
-    if srvs is None:
-        path = "/api/v1/srvs/"
-        params = {
-            "host": host_id,
-        }
-        srvs = get_list(path, params=params)
-
-    if len(srvs) == 0:
-        return
-
-    padding = 0
-
-    # The assert at the start of the method doesn't catch the None case,
-    # so to make linters happy, we need to check for it explicitly here.
-    if srvs is not None:
-        for srv in srvs:
-            if len(srv["name"]) > padding:
-                padding = len(srv["name"])
-            host_ids.add(str(srv["host"]))
-
-    arg = ",".join(host_ids)
-    hosts = get_list("/api/v1/hosts/", params={"id__in": arg})
-    for host in hosts:
-        hostid2name[host["id"]] = host["name"]
-
-    prev_name = ""
-    if srvs is not None:
-        for srv in srvs:
-            if prev_name == srv["name"]:
-                srv["name"] = ""
-            else:
-                prev_name = srv["name"]
-            print_srv(srv, hostid2name[srv["host"]], padding)
-
-
-def output_naptr(info: dict[str, str]) -> int:
-    """Pretty print given naptr."""
-    path = "/api/v1/naptrs/"
-    params = {
-        "host": info["id"],
-    }
-    naptrs = get_list(path, params=params)
-    headers = (
-        "NAPTRs:",
-        "Preference",
-        "Order",
-        "Flag",
-        "Service",
-        "Regex",
-        "Replacement",
-    )
-    row_format = "{:<14}" * len(headers)
-    manager = OutputManager()
-    if naptrs:
-        manager.add_line(row_format.format(*headers))
-        for naptr in naptrs:
-            manager.add_line(
-                row_format.format(
-                    "",
-                    naptr["preference"],
-                    naptr["order"],
-                    naptr["flag"],
-                    naptr["service"],
-                    naptr["regex"] or '""',
-                    naptr["replacement"],
-                )
-            )
-    return len(naptrs)
-
-
-def output_sshfp(info: dict[str, str]) -> int:
-    """Show SSHFP records for the host."""
-    path = "/api/v1/sshfps/"
-    params = {
-        "host": info["id"],
-    }
-    sshfps = get_list(path, params=params)
-    headers = ("SSHFPs:", "Algorithm", "Type", "Fingerprint")
-    row_format = "{:<14}" * len(headers)
-    manager = OutputManager()
-    if sshfps:
-        manager.add_line(row_format.format(*headers))
-        for sshfp in sshfps:
-            manager.add_line(
-                row_format.format(
-                    "",
-                    sshfp["algorithm"],
-                    sshfp["hash_type"],
-                    sshfp["fingerprint"],
-                )
-            )
-    return len(sshfps)
-
-
-def output_host_info(info: dict[str, Any]) -> None:
-    """Print all host info.
-
-    :param info: Host info dict from API.
-    """
-    output_host_name(info["name"])
-    output_contact(info["contact"])
-    if info["comment"]:
-        output_comment(info["comment"])
-    output_ipaddresses(info["ipaddresses"])
-    for ptr in info["ptr_overrides"]:
-        output_ptr(ptr["ipaddress"], info["name"])
-    output_ttl(info["ttl"])
-    output_mx(info["mxs"])
-    output_hinfo(info["hinfo"])
-    if info["loc"]:
-        output_loc(info["loc"])
-    for cname in info["cnames"]:
-        output_cname(cname["name"], info["name"])
-    for txt in info["txts"]:
-        output_txt(txt["txt"])
-    output_srv(host_id=info["id"])
-    output_naptr(info)
-    output_sshfp(info)
-    if "bacnetid" in info:
-        output_bacnetid(info.get("bacnetid"))
-
-    policies = get_list("/api/v1/hostpolicy/roles/", params={"hosts__name": info["name"]})
-    output_policies([p["name"] for p in policies])
-
-    cli_info("printed host info for {}".format(info["name"]))
-
-
-def output_ip_info(ip: str) -> None:
-    """Print all hosts which have a given IP. Also print out PTR override, if any.
-
-    :param ip: IP address to search for.
-    """
-    path = "/api/v1/hosts/"
-    params = {
-        "ipaddresses__ipaddress": ip,
-        "ordering": "name",
-    }
-    ip = ip.lower()
-    hosts = get_list(path, params=params)
-    ipaddresses = []
-    ptrhost = None
-    for info in hosts:
-        for i in info["ipaddresses"]:
-            if i["ipaddress"] == ip:
-                i["name"] = info["name"]
-                ipaddresses.append(i)
-        for i in info["ptr_overrides"]:
-            if i["ipaddress"] == ip:
-                ptrhost = info["name"]
-
-    output_ipaddresses(ipaddresses, names=True)
-    if len(ipaddresses) > 1 and ptrhost is None:
-        cli_warning(f"IP {ip} used by {len(ipaddresses)} hosts, but no PTR override")
-    if ptrhost is None:
-        path = "/api/v1/hosts/"
-        params = {
-            "ptr_overrides__ipaddress": ip,
-        }
-        hosts = get_list(path, params=params)
-        if hosts:
-            ptrhost = hosts[0]["name"]
-        elif ipaddresses:
-            ptrhost = "default"
-    if not ipaddresses and ptrhost is None:
-        cli_warning(f"Found no hosts or ptr override matching IP {ip}")
-    output_ptr(ip, str(ptrhost))
diff --git a/mreg_cli/utilities/shared.py b/mreg_cli/utilities/shared.py
index d96c6b33..5a1599c2 100644
--- a/mreg_cli/utilities/shared.py
+++ b/mreg_cli/utilities/shared.py
@@ -2,71 +2,17 @@
 
 from __future__ import annotations
 
-import re
 from typing import Any
 
-from mreg_cli.log import cli_warning
-
-
-# Temporary, to avoid circular imports and to allow old code to remain without
-# breaking. This should be removed once the all the old code is refactored.
-def clean_hostname(name: str | bytes) -> str:
-    """Ensure hostname is fully qualified, lowercase, and has valid characters.
-
-    :param name: The hostname to clean.
-
-    :raises CliWarning: If the hostname is invalid.
-
-    :returns: The cleaned hostname.
-    """
-    import re
-
-    from mreg_cli.config import MregCliConfig
-
-    # bytes?
-    if not isinstance(name, (str, bytes)):
-        cli_warning(f"Invalid input for hostname: {name}")
-
-    if isinstance(name, bytes):
-        name = name.decode()
-
-    name = name.lower()
-
-    # invalid characters?
-    if re.search(r"^(\*\.)?([a-z0-9_][a-z0-9\-]*\.?)+$", name) is None:
-        cli_warning(f"Invalid input for hostname: {name}")
-
-    # Assume user is happy with domain, but strip the dot.
-    if name.endswith("."):
-        return name[:-1]
-
-    # If a dot in name, assume long name.
-    if "." in name:
-        return name
-
-    config = MregCliConfig()
-    default_domain = config.get("domain")
-    # Append domain name if in config and it does not end with it
-    if default_domain and not name.endswith(default_domain):
-        return f"{name}.{default_domain}"
-    return name
+from mreg_cli.exceptions import InputFailure
 
 
 def string_to_int(value: Any, error_tag: str) -> int:
     """Convert a string to an integer."""
     try:
         return int(value)
-    except ValueError:
-        cli_warning("%s: Not a valid integer" % error_tag)
-
-
-def format_mac(mac: str) -> str:
-    """Create a strict 'aa:bb:cc:11:22:33' MAC address.
-
-    Replaces any other delimiters with a colon and turns it into all lower case.
-    """
-    mac = re.sub("[.:-]", "", mac).lower()
-    return ":".join(["%s" % (mac[i : i + 2]) for i in range(0, 12, 2)])
+    except ValueError as e:
+        raise InputFailure("%s: Not a valid integer" % error_tag) from e
 
 
 def convert_wildcard_to_regex(
diff --git a/mreg_cli/utilities/validators.py b/mreg_cli/utilities/validators.py
index 93640bd3..165d7911 100644
--- a/mreg_cli/utilities/validators.py
+++ b/mreg_cli/utilities/validators.py
@@ -6,75 +6,7 @@
 
 from __future__ import annotations
 
-import ipaddress
-import re
-
 from mreg_cli.config import MregCliConfig
-from mreg_cli.log import cli_warning
-from mreg_cli.types import IP_Version
-
-
-def is_valid_ip(ip: str) -> bool:
-    """Check if ip is valid ipv4 og ipv6."""
-    return is_valid_ipv4(ip) or is_valid_ipv6(ip)
-
-
-def is_valid_ipv4(ip: str) -> bool:
-    """Check if ip is valid ipv4."""
-    try:
-        ipaddress.IPv4Address(ip)
-    except ValueError:
-        return False
-    else:
-        return True
-
-
-def is_valid_ipv6(ip: str) -> bool:
-    """Check if ip is valid ipv6."""
-    try:
-        ipaddress.IPv6Address(ip)
-    except ValueError:
-        return False
-    else:
-        return True
-
-
-def is_valid_network(net: str) -> bool:
-    """Check if net is a valid network."""
-    if is_valid_ip(net):
-        return False
-    try:
-        ipaddress.ip_network(net)
-        return True
-    except ValueError:
-        return False
-
-
-def is_valid_mac(mac: str) -> bool:
-    """Check if mac is a valid MAC address."""
-    return bool(re.match(r"^([a-fA-F0-9]{2}[\.:-]?){5}[a-fA-F0-9]{2}$", mac))
-
-
-def is_valid_ttl(ttl: int | str | bytes) -> bool:  # int?
-    """Check application specific ttl restrictions."""
-    if ttl in ("", "default"):
-        return True
-    if not isinstance(ttl, int):
-        try:
-            ttl = int(ttl)
-        except ValueError:
-            return False
-    return 300 <= ttl <= 68400
-
-
-def is_valid_email(email: str | bytes) -> bool:
-    """Check if email looks like a valid email."""
-    if not isinstance(email, str):
-        try:
-            email = email.decode()
-        except ValueError:
-            return False
-    return True if re.match(r"^[^\s@]+@[^\s@]+\.[^\s@]+$", email) else False
 
 
 def is_valid_location_tag(loc: str) -> bool:
@@ -85,16 +17,3 @@ def is_valid_location_tag(loc: str) -> bool:
 def is_valid_category_tag(cat: str) -> bool:
     """Check if valid location tag."""
     return cat in MregCliConfig().get_category_tags()
-
-
-def is_ipversion(ip: str, ipversion: IP_Version) -> None:
-    """Check that the given ip is of the given ipversion."""
-    # Ip sanity check
-    if ipversion == 4:
-        if not is_valid_ipv4(ip):
-            cli_warning(f"not a valid ipv4: {ip}")
-    elif ipversion == 6:
-        if not is_valid_ipv6(ip):
-            cli_warning(f"not a valid ipv6: {ip}")
-    else:
-        cli_warning(f"Unknown ipversion: {ipversion}")
diff --git a/mreg_cli/utilities/zone.py b/mreg_cli/utilities/zone.py
deleted file mode 100644
index 6cb82960..00000000
--- a/mreg_cli/utilities/zone.py
+++ /dev/null
@@ -1,32 +0,0 @@
-"""Zone-related utilities for mreg_cli."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from mreg_cli.log import cli_warning
-from mreg_cli.utilities.api import get
-
-
-def zoneinfo_for_hostname(host: str) -> dict[str, Any] | None:
-    """Return zoneinfo for a hostname, or None if not found or invalid."""
-    if "." not in host:
-        return None
-
-    path = f"/api/v1/zones/forward/hostname/{host}"
-    zoneinfo = get(path, ok404=True)
-    return None if zoneinfo is None else zoneinfo.json()
-
-
-def zone_check_for_hostname(name: str, force: bool, require_zone: bool = False) -> None:
-    """Check if a hostname is in a zone controlled by MREG."""
-    # Require force if FQDN not in MREG zone
-    zoneinfo = zoneinfo_for_hostname(name)
-    if zoneinfo is None:
-        if require_zone:
-            cli_warning(f"{name} isn't in a zone controlled by MREG.")
-        if not force:
-            cli_warning(f"{name} isn't in a zone controlled by MREG, must force")
-    elif "delegation" in zoneinfo and not force:
-        delegation = zoneinfo["delegation"]["name"]
-        cli_warning(f"{name} is in zone delegation {delegation}, must force")