diff --git a/src/main/java/JobData.java b/src/main/java/JobData.java
index bcb4912f..a19f3a81 100644
--- a/src/main/java/JobData.java
+++ b/src/main/java/JobData.java
@@ -5,10 +5,7 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.Reader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 
 /**
  * Created by LaunchCode
@@ -75,7 +72,7 @@ public static ArrayList<HashMap<String, String>> findByColumnAndValue(String col
 
             String aValue = row.get(column);
 
-            if (aValue.contains(value)) {
+            if (aValue.toLowerCase().contains(value.toLowerCase())) {
                 jobs.add(row);
             }
         }
@@ -95,7 +92,22 @@ public static ArrayList<HashMap<String, String>> findByValue(String value) {
         loadData();
 
         // TODO - implement this method
-        return null;
+
+//        String valueLowerCase = value.toLowerCase();
+
+
+        ArrayList<HashMap<String, String>> jobList = new ArrayList<>();
+
+        for(HashMap<String, String> job : allJobs) {
+            for(Map.Entry<String, String> aValue : job.entrySet()) {
+
+                if (aValue.getValue().toLowerCase().contains(value.toLowerCase())) {
+                    jobList.add(job);
+                }
+            }
+        }
+
+        return jobList;
     }
 
     /**
diff --git a/src/main/java/TechJobs.java b/src/main/java/TechJobs.java
index 099f4efb..b0069711 100644
--- a/src/main/java/TechJobs.java
+++ b/src/main/java/TechJobs.java
@@ -1,10 +1,12 @@
+import javax.swing.*;
+import java.sql.SQLOutput;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Scanner;
 
 /**
- * Created by LaunchCode
+ * Created by LaunchCode4
  */
 public class TechJobs {
 
@@ -58,7 +60,7 @@ public static void main (String[] args) {
                 String searchField = getUserSelection("Search by:", columnChoices);
 
                 // What is their search term?
-                System.out.println("\nSearch term:");
+                System.out.print("\nSearch term:" + "\n");
                 String searchTerm = in.nextLine();
 
                 if (searchField.equals("all")) {
@@ -120,6 +122,22 @@ private static String getUserSelection(String menuHeader, HashMap<String, String
     // Print a list of jobs
     private static void printJobs(ArrayList<HashMap<String, String>> someJobs) {
 
-        System.out.println("printJobs is not implemented yet");
+        String asterisks = "*****";
+
+        if (someJobs.isEmpty()) {
+            System.out.print("No Results");
+        } else  {
+            for (HashMap<String, String> job : someJobs) {
+                System.out.println("\n" + asterisks);
+                for (String key : job.keySet()) {
+                    System.out.println(key + ": " + job.get(key));
+                }
+                System.out.println(asterisks);
+            }
+        }
+
+
+
+
     }
 }