diff --git a/Makefile b/Makefile
index 7eb64a9..d673a17 100644
--- a/Makefile
+++ b/Makefile
@@ -5,13 +5,29 @@ help: ## Print the help message
 		sort | \
 		column -s ':' -t
 
-map.txt: map.ge ## Making map.txt
-	grep -v '# unimportant' $< | graph-easy --boxart > $@
-	cat $@
+########## Network Map ##########
 
-full_map.txt: map.ge ## Generating full_map.txt with graph-easy
-	graph-easy --boxart < $< > $@
-	cat $@
+graph_cmd = graph-easy --boxart
+
+queries = queries authqueries
+
+query_formats = $(patsubst %, .dbs/%.txt, $(queries))
+
+.dbs/:
+	mkdir $@
+
+$(query_formats): .dbs/%.txt: | .dbs/
+	echo "[ {{name}} ] -- $(basename $(@F)) --> [ {{$(basename $(@F))}} ]" > $@
+
+.PHONY: map
+map: .dbs/network.txt ## Show a network map
+	$(graph_cmd) < $<
+
+.dbs/network.txt: network.rec $(query_formats)
+	$(RM) .dbs/network.txt
+	$(foreach relation, $(queries), \
+	recsel $< -t lxc -e "$(relation) != ''" -p name,$(relation) | recfmt -f .dbs/$(relation).txt >> $@ ;\
+	)
 
 ########## Man Pages ##########
 
@@ -56,3 +72,4 @@ pages: $(kralmans) $(krovmans) $(setupmans) $(splintmans)
 
 clean:
 	$(RM) $(kralmans) $(krovmans)
+	$(RM) -r .dbs
diff --git a/map.ge b/map.ge
deleted file mode 100644
index a4cd284..0000000
--- a/map.ge
+++ /dev/null
@@ -1,39 +0,0 @@
-# Network map of Decentrala.  Use with:
-# graph-easy --boxart < netmap.txt
-
-(Mox
-	[ m_router ]{label: router ;}
-	[ wireguard ] --> [ m_nginx ]{label: nginx-11 ;}
-	[ wiki ] --> [ m_nginx ]
-	[ gitea ] --> [ m_nginx ]
-	[ tor11 ] --> [ m_nginx ] --> [ m_router ]
-	[ smtp ]
-)
-
-(Serverko
-	[ s_nginx ]{label: nginx-12 ;}
-	[ s_router ]{label: router ;}
-	[ s_nginx ] --> [ nextcloud ]
-	[ s_nginx ] --> [ tor12 ]
-	[ s_nginx ] --> [ s_router ]
-)
-
-(splint.rs # unimportant
-	[ soft-serve ] # unimportant
-	[ mail-cache ]# unimportant
-) # unimportant
-
-[ tor12 ] <..> [ onions ] <..> [ tor11 ]
-[ m_router ] <..> [ BGP ] <..> [ madness ] <..> [ s_router ]
-[ smtp ] <..> [ madness ]
-[ madness ] <..> [  mail-cache ]# unimportant
-[ A ]{label: "" ;}
-[ B ]{label: "" ;}
-[ C ]{label: "" ;}
-[ D ]{label: "" ;}
-[ onions ] <..> [ A ]
-[ onions ] <..> [ B ]
-[ A ] <..> [ C ]
-[ B ] <..> [ D ]
-
-(Sharks! [ D ])