diff --git a/Input.js b/Input.js
index 3fc4881..5b11ff5 100644
--- a/Input.js
+++ b/Input.js
@@ -65,6 +65,14 @@ const goEastSynonyms = ["goeast", "east", "goright", "right", "e"]
 const goWestSynonyms = ["gowest", "west", "goleft", "left", "w"]
 const showDaySynonyms = ["showday", "showdate", "day", "date"]
 const setDaySynonyms = ["setday", "setdate"]
+const encounterSynonyms = ["encounter", "startencounter"]
+const showEnemiesSynonyms = ["showenemies", "enemies"]
+const addEnemySynonyms = ["addenemy"]
+const removeEnemySynonyms = ["removeenemy"]
+const initiativeSynonyms = ["initiative"]
+const setAcSynonyms = ["setac", "setarmorclass", "ac", "armorclass"]
+const turnSynonyms = ["turn", "doturn", "taketurn"]
+const fleeSynonyms = ["flee", "retreat", "runaway"]
 const helpSynonyms = ["help"]
 
 const modifier = (text) => {
@@ -106,7 +114,7 @@ const modifier = (text) => {
       return { text }
     }
 
-    if (!found) found = processCommandSynonyms(command, commandName, helpSynonyms.concat(rollSynonyms, noteSynonyms, eraseNoteSynonyms, showNotesSynonyms, clearNotesSynonyms, showCharactersSynonyms, removeCharacterSynonyms, generateNameSynonyms, setDefaultDifficultySynonyms, showDefaultDifficultySynonyms, renameCharacterSynonyms, cloneCharacterSynonyms, createLocationSynonyms, showLocationsSynonyms, goToLocationSynonyms, removeLocationSynonyms, getLocationSynonyms, clearLocationsSynonyms, goNorthSynonyms, goSouthSynonyms, goEastSynonyms, goWestSynonyms, resetSynonyms), function () {return true})
+    if (!found) found = processCommandSynonyms(command, commandName, helpSynonyms.concat(rollSynonyms, noteSynonyms, eraseNoteSynonyms, showNotesSynonyms, clearNotesSynonyms, showCharactersSynonyms, removeCharacterSynonyms, generateNameSynonyms, setDefaultDifficultySynonyms, showDefaultDifficultySynonyms, renameCharacterSynonyms, cloneCharacterSynonyms, createLocationSynonyms, showLocationsSynonyms, goToLocationSynonyms, removeLocationSynonyms, getLocationSynonyms, clearLocationsSynonyms, goNorthSynonyms, goSouthSynonyms, goEastSynonyms, goWestSynonyms, encounterSynonyms, showEnemiesSynonyms, addEnemySynonyms, removeEnemySynonyms, initiativeSynonyms, turnSynonyms, fleeSynonyms, resetSynonyms), function () {return true})
 
     if (found == null) {
       if (state.characterName == null) {
diff --git a/Output.js b/Output.js
index 2d97548..73eded5 100644
--- a/Output.js
+++ b/Output.js
@@ -254,6 +254,8 @@ const modifier = (text) => {
       text += "\n    Increases the character's health by the specified value. It's capped at the character's max health."
       text += "\n#damage value"
       text += "\n    Decreases the character's health by the specified value. Reaching 0 causes the character to become \"unconcious\"."
+      text += "\n#setac value"
+      text += "\n    Sets the armor class of the character. The default is 10"
       text += "\n#rest"
       text += "\n    Sets all of the characters' health to their maximums. Use #shortrest to only restore half health. This command increases the day counter and displays the number of days since your adventure began."
       text += "\n#showday"
@@ -343,6 +345,22 @@ const modifier = (text) => {
       text += "\n#spellbook"
       text += "\n    Shows the list of spells that the character has learned."
 
+      text += "\n\n--Combat--"
+      text += "\n#encounter (funny|easy|medium|hard|boss|god)"
+      text += "\n    Generate an encounter from the specified list. If a list is not specified, it will default to \"easy\""
+      text += "\n#showenemies"
+      text += "\n    Shows the list of current enemies."
+      text += "\n#addenemy name"
+      text += "\n    Adds the specified enemy to the list of enemies. It will automatically be assigned an inititiative."
+      text += "\n#removeenemy name or index"
+      text += "\n    Removes the enemy as specified by the name or index."
+      text += "\n#initiative"
+      text += "\n    Assigns initiative to all characters and enemies. This begins combat."
+      text += "\n#turn"
+      text += "\n    Updates the turn to the next character in combat. If it is an enemy, the enemy will attack. If it's a player character, the system will allow the player to take their turn. If there are no enemies left or all the player characters are dead, combat ends."
+      text += "\n#flee (dc or automatic|effortless|easy|)"
+      text += "\n    Shows the list of current enemies."
+
       text += "\n\n--Locations--"
       text += "\n#createlocation [(x) (y) or (here|far) or (distance)] location_name"
       text += "\n    Creates a location at the given coordinates. The coordinates must be integers. If the coordinates are not provided, they are randomized within a range of 10 units from the party's current location. You can also use \"here\" to indicate that the location is at party's coordinates. \"far\" indicates that the coordinates will be randomly generated 50-100 units away. You may also just specify a distance. Multiple locations may exist at the same coordinates. A story card is created for the location. Quotes are not necessary."