diff --git a/srv/About/Hardware.md b/srv/About/Hardware.md
index dbbeec6..c89a65c 100644
--- a/srv/About/Hardware.md
+++ b/srv/About/Hardware.md
@@ -1,45 +1,31 @@
 Machines
 =========
 
-For more technical details on our machines, see our [Machine List](http://wiki.csclub.uwaterloo.ca/Machine_List) page. All of our machines can be accessed via `ssh`.
-Our machines run Linux (usually Ubuntu.)
+For more technical details on our machines, see our [Machine List](http://wiki.csclub.uwaterloo.ca/Machine_List) page.
 
-Office Terminals
--------
-* <b>bit-shifter</b> (129.97.134.111)
-<br> Hosts the webcam counter
-* <b>strombola</b> (129.97.134.109)
-<br> Connected to backup speakers
-* <b>maltodextrin</b> (129.97.134.98)
-<br>Hosts a webcam
-<br>Chess robot
-* <b>natural-flavours</b> (129.97.134.36)
-* <b>nullsleep</b> (129.97.134.110)
-<br>Runs mpd for music, is connected to our main speakers
+All of our machines can be accessed via `ssh`.
 
-Servers
---------
-* <b>caffeine</b> (129.97.134.17)
-<br>Web server
-<br>Mail server
-<br>Note: please do not use this machine for long computations.
-* <b>corn-syrup</b> (129.97.134.72)
-<br>This machine is intended for large computations. It has two Xeon processors and 32 GB of RAM.
-* <b>denardo</b> (129.97.134.72)
-<br>UltraSparc architecture
-* <b>taurine</b> (129.97.134.34)
-<br>This is the prefered machine for screen sessions and irssi.
-* <b>rainbowdragoneyes</b> (129.97.134.127)
-<br>MIPS architecture
+<center>
+<table>
+  <tr><td>Hostname</td><td>Notes</td><td>General Use?</td></tr>
+  <tr><td>bit-shifter</td><td>Office terminal</td><td>✓</td></tr>
+  <tr><td>strombola</td><td>Office terminal</td><td>✓</td></tr>
+  <tr><td>maltodextrin</td><td>Office terminal</td><td>✓</td></tr>
+  <tr><td>natural-flavours</td><td>Office terminal</td><td>✓</td></tr>
+  <tr><td>nullsleep</td><td>Office terminal</td><td>✓</td></tr>
+  <tr><td>gwem</td><td>Office terminal</td><td>✓</td></tr>
+  <tr><td>caffeine (or csc/csclub)</td><td>Web/mail/etc. (is a container)</td><td>✓</td></tr>
+  <tr><td>corn-syrup</td><td>Containers, heavy computations.</td><td>✓</td></tr>
+  <tr><td>hfcs</td><td>TBA</td><td>✓</td></tr>
+  <tr><td>denardo</td><td>UltraSparc</td><td>✓</td></tr>
+  <tr><td>taurine</td><td>Preferred location for screen sessions</td><td>✓</td></tr>
+  <tr><td>rainbowdragoneyes</td><td>MIPS</td><td>✓</td></tr>
+  <tr><td>artificial-flavours</td><td>Backup server</td><td>✗</td></tr>
+  <tr><td>ginseng</td><td>File server</td><td>✗</td></tr>
+  <tr><td>glomag</td><td>Hosts the caffiene container</td><td>✗</td></tr>
+</table>
+</center>
 
-Syscom-only Servers
--------
-* <b>artificial-flavours</b> (129.97.134.33)
-<br>Backup server
-* <b>ginseng</b> (129.97.134.89)
-<br>File server
-* <b>glomag</b> (129.97.134.70)
-<br>This machine hosts the container for caffiene
 
 Gadgets
 ========