diff --git a/archetypes.py b/archetypes.py
index e9d6cfc..8bc5e78 100644
--- a/archetypes.py
+++ b/archetypes.py
@@ -5,6 +5,7 @@ class Archetype:
     name = "basic"
     display_name = "Jack of All Trades"
     display_symbol = "🃏"
+    description= "Master of none. This archetype has no bonuses and no penalties."
 
     def modify_bat_rolls(self, outcome, rolls):
         """"modify the rolls used in batting before using the rolled values"""
@@ -47,8 +48,8 @@ def all_archetypes():
         Archetype
         ]
 
-def search_archetypes(name):
+def search_archetypes(text):
     for archetype in all_archetypes():
-        if archetype.name == name or archetype.display_name == name:
+        if archetype.name == text or archetype.display_name == text:
             return archetype
     return None
\ No newline at end of file
diff --git a/the_prestige.py b/the_prestige.py
index d4c6063..c1b3ea3 100644
--- a/the_prestige.py
+++ b/the_prestige.py
@@ -260,7 +260,7 @@ If you did it correctly, you'll get a team embed with a prompt to confirm. hit t
 class AssignArchetypeCommand(Command):
     name = "archetype"
     template = "m;archetype [team name]\n[player name]\n[archetype name]"
-    description = """Assigns an archetype to a player on your team. This can be changed at any time! For a description of a specific archetype, or a list of all archetypes, use m;archetypehelp."""
+    description = """Assigns an archetype to a player on your team. This can be changed at any time! For a description of a specific archetype, or a list of all archetypes, use m;listarchetypes."""
 
     async def execute(self, msg, command, flags):
         lines = command.split("\n")
@@ -293,6 +293,31 @@ class AssignArchetypeCommand(Command):
 
         await msg.channel.send("Player specialization is a beautiful thing, ain't it? Here's hoping they like it.")
 
+class ArchetypeHelpCommand(Command):
+    name = "listarchetypes"
+    template = "m;listarchetypes\nm;listarchetypes [archetype name]"
+    description = "Prints a list of all archetypes, or describes a given archetype."
+
+    async def execute(self, msg, command, flags):
+        archetype_list = archetypes.all_archetypes()
+        try:
+            archetype_name = command.split(" ",1)[1].strip()
+        except IndexError:
+            #this means it's just the command, hoo-ray            
+            string_list = ""
+            for arch in archetype_list:
+                string_list += arch.display_name + "\n"
+            await msg.channel.send(string_list)
+            return
+
+        arch = archetypes.search_archetypes(archetype_name)
+        if arch is None:
+            raise CommandError("We don't know what that archetype is. If you're trying to break new ground, here isn't the time *or* the place.")
+
+        await msg.channel.send(f"""{arch.display_name}
+Short name: {arch.name}
+
+{arch.description}""")
 
 class ImportCommand(Command):
     name = "import"
@@ -1590,6 +1615,7 @@ commands = [
     SetupGameCommand(),
     SaveTeamCommand(),
     AssignArchetypeCommand(),
+    ArchetypeHelpCommand(),
     ImportCommand(),
     SwapPlayerCommand(),
     MovePlayerCommand(),