diff --git a/vultron/api.py b/vultron/api.py
index a4eb58a..a7e0e80 100644
--- a/vultron/api.py
+++ b/vultron/api.py
@@ -36,6 +36,8 @@ class Client:
     url = f"{self.endpoint}/{'/'.join(resources)}"
     res = requests.get(url, headers=self.hdrs)
 
+    # FIXME: Should apply errors from Vultr for extra details. Specficially 401
+    # should also inidicate if the IP is unauthorized.
     if res.status_code in (200, 202):
       return res.json()
     elif res.status_code == 204:
diff --git a/vultron/cmd.py b/vultron/cmd.py
index ce8bb84..25fcd0e 100644
--- a/vultron/cmd.py
+++ b/vultron/cmd.py
@@ -27,6 +27,8 @@ class NotEnoughArgs(vultron.err.Error):
       return f"sub-command requires 1 more argument: {name}"
 
 # FIXME: Handle paging
+# FIXME: Add generic list command
+# FIXME: Ability to nest commands via classes
 class Command:
   """A nop Vultron command. This feature is not implemented yet."""
 
@@ -64,6 +66,8 @@ class Command:
       display = vultron.display.FORMATS[self.out](data)
       print(display.render())
 
+  # FIXME: Support for aliases. E.g. BareMetal -> Bare-Metal
+  # FIXME: Or Bare_Metal -> Bare-Metal
   def find(self, name):
     needle = f"{self.FTR_PRFX}{name}".lower()
     haystack = dir(self)