diff --git a/nullptr/commander.py b/nullptr/commander.py
index b7ba38e..04d0793 100644
--- a/nullptr/commander.py
+++ b/nullptr/commander.py
@@ -77,3 +77,15 @@ class Commander(CommandLine):
       total += 1
     dur = time() - start_time
     print(f'{total} jumpgates in {dur:.2f} seconds')
+    start_time = time()
+    total = 0
+    for m in self.store.all('', Waypoint, True):
+      total += 1
+    dur = time() - start_time
+    print(f'{total} waypoints in {dur:.2f} seconds')
+    start_time = time()
+    total = 0
+    for m in self.store.all('', System, True):
+      total += 1
+    dur = time() - start_time
+    print(f'{total} systems in {dur:.2f} seconds')