diff --git a/node_modules/.DS_Store b/node_modules/.DS_Store
new file mode 100644
index 0000000..19a9def
Binary files /dev/null and b/node_modules/.DS_Store differ
diff --git a/validator.js b/validator.js
index 860dab4..1d2236b 100644
--- a/validator.js
+++ b/validator.js
@@ -1,7 +1,68 @@
+// $() is an alias for $(document).ready() when you pass it a function
 
-  //insert your code here
- 
-$(function(){
+$(document).ready( function() {
+	$(".errors").children().hide();
 
-  //insert your code here
+	$("form").submit( function() {
+			ValidateForm();
+	});
 });
+
+function ValidateForm() {
+		ValidateEmail();
+		ValidatePassword();
+	};
+
+	function PreventSubmission() {
+		event.preventDefault(); 
+	};
+
+	function ValidateEmail() {
+
+		var email = $("input:text").val();
+		var email_regex = /^([\w-]+(?:\.[\w-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$/i;
+		var invalid_format = !email_regex.test(email)
+
+		if (invalid_format) {
+			PreventSubmission;
+			$(".errors li:nth-child(1)").show();
+		}
+		else {
+			$(".errors li:nth-child(1)").hide();
+		};
+	};
+
+	function ValidatePassword() {
+		var password = $("input:password").val();
+		var capital_regex = /[A-Z]/;
+		var num_regex = /[0-9]/;
+		var min_length = 8; 
+		var too_short = password.length < min_length;
+		var no_capital_chars = !capital_regex.test(password)
+		var no_numbers = !num_regex.test(password)
+
+		if (too_short) {
+			PreventSubmission();
+			$(".errors li:nth-child(2)").show();
+		}
+		else {
+			$(".errors li:nth-child(2)").hide();
+		};
+
+
+		if (no_capital_chars) {
+			PreventSubmission();
+			$(".errors li:nth-child(3)").show();
+		}
+		else {
+			$(".errors li:nth-child(3)").hide();
+		};
+		
+		if (no_numbers) {
+			PreventSubmission();
+			$(".errors li:nth-child(4)").show();
+		}
+		else {
+			$(".errors li:nth-child(4)").hide();
+		};
+	};
\ No newline at end of file