diff --git a/index.php b/index.php
index 1c5c9bf..017ee16 100755
--- a/index.php
+++ b/index.php
@@ -1,5 +1,5 @@
-<?php 
-include 'header.php'; 
+<?php
+include 'header.php';
 require __DIR__.'/vendor/autoload.php';
 $parser = new Mni\FrontYAML\Parser();
 ?>
@@ -82,15 +82,16 @@ $parser = new Mni\FrontYAML\Parser();
                         </div>
                     <?php endforeach; ?>
                 </div>
-                
+
                 <h1>our <a href="https://tilde.zone/@tildeteam">mastodon</a> feed</h1>
                 <iframe allowfullscreen sandbox="allow-top-navigation allow-scripts" width="100%" height="800" src="https://www.mastofeed.com/api/feed?url=https%3A%2F%2Ftilde.zone%2Fusers%2Ftildeteam.atom&theme=dark&size=100&header=true&replies=true&boosts=true"></iframe>
             </div>
 
             <div class="col-md-5">
                 <h1>~users~</h1>
-                <p><em><a href="https://tilde.team/tilde.24h.html"><i class="fa fa-clock-o"></i> recent updates</a></em></p>
+                <p><em><a href="/tilde.24h.html"><i class="fa fa-clock-o"></i> recent updates</a></em></p>
                 <p>if you're not listed here, make some changes to your page</p>
+                <p><a href="/users/">all users</a></p>
                 <br><br>
                 <div class="list-group">
                 <ul>
diff --git a/users/index.php b/users/index.php
new file mode 100644
index 0000000..1f8c4fc
--- /dev/null
+++ b/users/index.php
@@ -0,0 +1,37 @@
+<?php
+include __DIR__.'/../header.php';
+
+$online_users = shell_exec("online-users");
+$total_users = shell_exec("members team | wc -w");
+?>
+
+<div class="row">
+    <?=$online_users?> users online of <?=$total_users?> total users
+    <img src="https://tilde.chat/badges/badge.php?channel=%23team" alt="users online in #team">
+</div>
+
+
+<div class="row">
+    <div class="col-md-5">
+        <h1>~all users~</h1>
+        <p><em><a href="/tilde.24h.html"><i class="fa fa-clock-o"></i> recent updates</a></em></p>
+        <br><br>
+        <div class="list-group">
+        <ul>
+        <?php
+        foreach (glob("/home/*") as $user):
+            if (!is_dir("$user/public_html")) continue;
+            $user = basename($user); ?>
+            <li style="list-style: none; margin-left: -40px;">
+                <a href="/~<?=$user?>/" class="list-group-item">
+                    <h6 class="list-group-item-heading">~<?=$user?></h5>
+                </a>
+            </li>
+        <?php endforeach; ?>
+        </ul>
+        </div>
+    </div>
+</div>
+
+<?php
+include __DIR__.'/../footer.php';