diff --git a/README.md b/README.md
index dedea3e3..9f6c8563 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,9 @@ An open source implementation of the Tailscale coordination server.
 - [x] Basic functionality (nodes can communicate with each other)
 - [x] Node registration through the web flow
 - [x] Network changes are relied to the nodes
+- [x] ~~Multiuser~~ Namespace support
+- [ ] Share nodes between ~~users~~ namespaces
 - [ ] Node registration via pre-auth keys
-- [ ] (WIP) Multiuser support
 - [ ] ACLs
 - [ ] DNS
 
@@ -16,7 +17,7 @@ An open source implementation of the Tailscale coordination server.
 
 ## Roadmap 🤷
 
-Adding multiuser support seems doable. Rather than actual users, this multi-tenancy will probably look more like namespaces in Kubernetes - a logical partitioning of resources created with a CLI.
+Basic multiuser support (multinamespace, actually) is now implemented. No node sharing or ACLs between namespaces yet though...
 
 Pre-auth keys should also be feasible.
 
diff --git a/cmd/headscale/headscale.go b/cmd/headscale/headscale.go
index b300c421..efaf4222 100644
--- a/cmd/headscale/headscale.go
+++ b/cmd/headscale/headscale.go
@@ -63,7 +63,12 @@ var registerCmd = &cobra.Command{
 		if err != nil {
 			log.Fatalf("Error initializing: %s", err)
 		}
-		h.RegisterMachine(args[0], args[1])
+		err = h.RegisterMachine(args[0], args[1])
+		if err != nil {
+			fmt.Printf("Error: %s", err)
+			return
+		}
+		fmt.Println("Ook.")
 	},
 }