diff --git a/var/www/nameSearch.php b/var/www/nameSearch.php
new file mode 100644
index 0000000..2a73f98
--- /dev/null
+++ b/var/www/nameSearch.php
@@ -0,0 +1,8 @@
+<html>
+<body>
+
+First Name is  <?php echo $_POST["fname"]; ?><br>
+Last Name is <?php echo $_POST["lname"]; ?>
+
+</body>
+</html>
diff --git a/var/www/search.php b/var/www/search.php
index 7f6be88..a16288f 100644
--- a/var/www/search.php
+++ b/var/www/search.php
@@ -10,21 +10,24 @@ body {
 <h2><font color="white">Who would you like to search for</h2>
 
 <?php
-$name = $message = "";
+$name = $fname = $lname = "";
+$nameErr = $fnameErr = $lnameErr = "";
 
 
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
 	if (empty($_POST["name"])) {
-    	$name = "";
-  	} else {
-    	$comment = test_input($_POST["name"]);
+    		$nameErr = "Name is required";
+  	} 
+	else {
+    		$name = test_input($_POST["name"]);
+    		if (!preg_match("/^[a-zA-Z ]*$/",$name)) {
+      			$nameErr = "Only letters and white space allowed";
+    		}
   	}
 
-	if (empty($_POST["Message"])) {
-    	$message = "";
-  	} else {
-    	$message = test_input($_POST["message"]);
-  	}
+
+	
+
 }
 
 function test_input($data) {
@@ -35,16 +38,24 @@ function test_input($data) {
 }
 ?>
 
-<form method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>">  
-  Which Search:
-  <input type="radio" name="type" <?php if (isset($type) && $gender=="name") echo "checked";?> value="type">Name
-  <input type="radio" name="type" <?php if (isset($type) && $gender=="username") echo "checked";?> value="type">Username
-  <br><br>
-  Search Key: <br><input type="text" name="name" value="<?php echo $name;?>">
-  <br><br>
-  
-  <input type="submit" name="submit" value="Submit">  
+<form method="post" action="usernameSearch.php">  
+Username: <br><input type="text" name="username"><br>
+<input type="submit">  
 </form>
+<br>
+<form action="nameSearch.php" method="post">
+First Name: <input type="text" name="fname"><br>
+Last Name:  <input type="text" name="lname"><br>
+<input type="submit">
+</form>
+
+
+
+<?php
+echo $name;
+echo "<br>"
+?>
+
 </body>
 </html>
 
diff --git a/var/www/usernameSearch.php b/var/www/usernameSearch.php
new file mode 100644
index 0000000..124f6a7
--- /dev/null
+++ b/var/www/usernameSearch.php
@@ -0,0 +1,7 @@
+<html>
+<body>
+
+Username is  <?php echo $_POST["username"]; ?>
+
+</body>
+</html>
