diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java
index 20904f0..0a0d0c2 100644
--- a/src/RomanNumerals.java
+++ b/src/RomanNumerals.java
@@ -1,8 +1,48 @@
 
 public class RomanNumerals {
+	
+	//test2
 	public int convertToInteger(String romanNum) {
-		// To be Implemented
-		return 0;
+		if(romanNum.length()==1){
 		
+			return returnValue(romanNum);
+		}else if(romanNum.length()==2){
+			if(returnValue(romanNum.substring(0, 1))<returnValue(romanNum.substring(1))){
+		    	return returnValue(romanNum.substring(1)) - returnValue(romanNum.substring(0, 1));
+		    }else{
+		    	return returnValue(romanNum.substring(1)) + returnValue(romanNum.substring(0, 1));
+		    }
+		}else {
+			if(returnValue(romanNum.substring(0,1))<returnValue(romanNum.substring(1,2))){
+				return convertToInteger(romanNum.substring(1))-convertToInteger(romanNum.substring(0,1));
+			}else{
+				return convertToInteger(romanNum.substring(0,1))+convertToInteger(romanNum.substring(1));
+			}
+			
+		}
+	
+		
+		
+	}
+	public int returnValue(String rom) {
+		if(rom.equals("I")){
+			return 1;
+		}else if(rom.equals("V")){
+			return 5;
+		}else if(rom.equals("X")){
+			return 10;
+		}else if(rom.equals("L")){
+			return 50;
+		}else if(rom.equals("C")){
+			return 100;
+		}else if(rom.equals("D")){
+			return 500;
+		}else if(rom.equals("M")){
+			return 1000;
+		}else {
+			return 0;
+		}
+	
+	
 	}
 }
diff --git a/tests/TestRomanNumerals.java b/tests/TestRomanNumerals.java
index 5d1de75..678201a 100644
--- a/tests/TestRomanNumerals.java
+++ b/tests/TestRomanNumerals.java
@@ -3,10 +3,81 @@
 import org.junit.Test;
 
 public class TestRomanNumerals {
-
+	RomanNumerals test = new RomanNumerals();
+	@Test
+	public void test_ConverterCreated() {
+		assertNotNull(test);
+	}
+	@Test
+	public void test_1() {
+		assertEquals(1,test.convertToInteger("I"));
+	}@Test
+	public void test_5() {
+		
+		assertEquals(5,test.convertToInteger("V"));
+	}@Test
+	public void test_10() {
+		
+		assertEquals(10,test.convertToInteger("X"));
+	}@Test
+	public void test_50() {
+		
+		assertEquals(50,test.convertToInteger("L"));
+	}@Test
+	public void test_100() {
+		
+		assertEquals(100,test.convertToInteger("C"));
+	}@Test
+	public void test_500() {
+		
+		assertEquals(500,test.convertToInteger("D"));
+	}@Test
+	public void test_1000() {
+		
+		assertEquals(1000,test.convertToInteger("M"));
+	}
+	
+	@Test
+	public void test_4() {		
+      	assertEquals(4,test.convertToInteger("IV"));
+	}
+	@Test
+	public void test_3() {		
+      	assertEquals(3,test.convertToInteger("III"));
+	}
+	@Test
+	public void test_8() {		
+      	assertEquals(8,test.convertToInteger("VIII"));
+	}
+	
+	@Test
+	public void test_80() {		
+      	assertEquals(80,test.convertToInteger("LXXX"));
+	}
+	@Test
+	public void test_400() {		
+      	assertEquals(400,test.convertToInteger("CD"));
+	}
+	
+	@Test
+	public void test_900() {		
+      	assertEquals(900,test.convertToInteger("CM"));
+	}
+	@Test
+	public void test_1984() {		
+      	assertEquals(1984,test.convertToInteger("MCMLXXXIV"));
+	}
 	@Test
-	public void test() {
-		fail("Not yet implemented");
+    public void test_2014() {		
+      	assertEquals(2014,test.convertToInteger("MMXIV"));
 	}
+	
+	
+	
+	
+	
+	
+	
 
+	
 }