diff --git a/src/Script/ScriptHelpers.js b/src/Script/ScriptHelpers.js
index 3eff77f47..f1aab1c1e 100644
--- a/src/Script/ScriptHelpers.js
+++ b/src/Script/ScriptHelpers.js
@@ -295,7 +295,7 @@ function saveAndCloseScriptEditor() {
 //Checks that the string contains only valid characters for a filename, which are alphanumeric,
 // underscores, hyphens, and dots
 function checkValidFilename(filename) {
-	var regex = /^[.a-zA-Z0-9_-]+$/;
+	var regex = /^[.a-zA-Z0-9\/_-]+$/;
 
 	if (filename.match(regex)) {
 		return true;
diff --git a/src/Terminal.js b/src/Terminal.js
index 18f8c7fe1..ab0a09375 100644
--- a/src/Terminal.js
+++ b/src/Terminal.js
@@ -57,6 +57,7 @@ import {yesNoBoxCreate,
         yesNoBoxGetYesButton,
         yesNoBoxGetNoButton, yesNoBoxClose} from "../utils/YesNoBox";
 import { post,
+         postContent,
          postError,
          hackProgressBarPost,
          hackProgressPost }                 from "./ui/postToTerminal";
@@ -550,6 +551,15 @@ function determineAllPossibilitiesForTabCompletion(input, index=0) {
             allPos.push(currServ.scripts[i].filename);
         }
     }
+
+    if (input.startsWith("ls ")) {
+        for (var i = 0; i < currServ.textFiles.length; ++i) {
+            allPos.push(currServ.textFiles[i].fn);
+        }
+        for (var i = 0; i < currServ.scripts.length; ++i) {
+            allPos.push(currServ.scripts[i].filename);
+        }
+    }
     return allPos;
 }
 
@@ -1677,13 +1687,14 @@ let Terminal = {
     },
 
     executeListCommand: function(commandArray) {
-        if (commandArray.length !== 1 && commandArray.length !== 4) {
+        if (commandArray.length !== 1 && commandArray.length !== 2 && commandArray.length !== 4) {
             postError("Incorrect usage of ls command. Usage: ls [| grep pattern]");
             return;
         }
 
         // grep
-        var filter = null;
+        let filter = null;
+        let prefix = null;
         if (commandArray.length === 4) {
             if (commandArray[1] === "|" && commandArray[2] === "grep") {
                 if (commandArray[3] !== " ") {
@@ -1693,73 +1704,60 @@ let Terminal = {
                 postError("Incorrect usage of ls command. Usage: ls [| grep pattern]");
                 return;
             }
+        } else if (commandArray.length === 2) { // want to ls a folder
+            prefix = commandArray[1];
+            if (!prefix.endsWith("/")) {
+                prefix += "/";
+            }
         }
 
         //Display all programs and scripts
-        var allFiles = [];
+        let allFiles = [];
+        let folders = [];
+
+        function handleFn(fn) {
+            if (filter && !fn.includes(filter)) {
+                return;
+            }
+
+            if (prefix) {
+                if (!fn.startsWith(prefix)) {
+                    return;
+                } else {
+                    fn = fn.slice(prefix.length, fn.length);
+                }
+            }
+
+            if (fn.includes("/")) {
+                fn = fn.split("/")[0]+"/";
+                if (folders.includes(fn)) {
+                    return;
+                }
+                folders.push(fn);
+            }
+
+            allFiles.push(fn);
+        }
 
         //Get all of the programs and scripts on the machine into one temporary array
         const s = Player.getCurrentServer();
-        for (const program of s.programs) {
-            if (filter) {
-                if (program.includes(filter)) {
-                    allFiles.push(program);
-                }
-            } else {
-                allFiles.push(program);
-            }
-        }
-        for (const script of s.scripts) {
-            if (filter) {
-                if (script.filename.includes(filter)) {
-                    allFiles.push(script.filename);
-                }
-            } else {
-                allFiles.push(script.filename);
-            }
-
-        }
-        for (const msgOrLit of s.messages) {
-            if (filter) {
-                if (msgOrLit instanceof Message) {
-                    if (msgOrLit.filename.includes(filter)) {
-                        allFiles.push(msgOrLit.filename);
-                    }
-                } else if (msgOrLit.includes(filter)) {
-                    allFiles.push(msgOrLit);
-                }
-            } else {
-                if (msgOrLit instanceof Message) {
-                    allFiles.push(msgOrLit.filename);
-                } else {
-                    allFiles.push(msgOrLit);
-                }
-            }
-        }
-        for (const txt of s.textFiles) {
-            if (filter) {
-                if (txt.fn.includes(filter)) {
-                    allFiles.push(txt.fn);
-                }
-            } else {
-                allFiles.push(txt.fn);
-            }
-        }
-        for (const contract of s.contracts) {
-            if (filter) {
-                if (contract.fn.includes(filter)) {
-                    allFiles.push(contract.fn);
-                }
-            } else {
-                allFiles.push(contract.fn);
-            }
-        }
+        for (const program of s.programs) handleFn(program);
+        for (const script of s.scripts) handleFn(script.filename);
+        for (const txt of s.textFiles) handleFn(txt.fn);
+        for (const contract of s.contracts) handleFn(contract.fn);
+        for (const msgOrLit of s.messages) (msgOrLit instanceof Message) ? handleFn(msgOrLit.filename) : handleFn(msgOrLit);
 
         //Sort the files alphabetically then print each
         allFiles.sort();
 
         for (var i = 0; i < allFiles.length; i++) {
-            post(allFiles[i]);
+            let config = {};
+            if (allFiles[i].endsWith("/")) {
+                // Don't let the colorblind chose the color. I believe that's
+                // ubuntu folder color but what the fuck do I know.
+                config.color = "#58698c";
+            }
+            postContent(allFiles[i], config);
         }
     },
 
diff --git a/src/ui/postToTerminal.ts b/src/ui/postToTerminal.ts
index 40ee2dd78..1b396ad48 100644
--- a/src/ui/postToTerminal.ts
+++ b/src/ui/postToTerminal.ts
@@ -33,7 +33,7 @@ interface IPostContentConfig {
     color?: string; // Additional class for terminal-line. Does NOT replace
 }
 
-function postContent(input: string, config: IPostContentConfig = {}) {
+export function postContent(input: string, config: IPostContentConfig = {}) {
     // tslint:disable-next-line:max-line-length
     const style: string = `color: ${config.color != null ? config.color : "var(--my-font-color)"}; background-color:var(--my-background-color);${config.id === undefined ? " white-space:pre-wrap;" : ""}`;
     // tslint:disable-next-line:max-line-length