diff --git a/src/RomanNumerals.java b/src/RomanNumerals.java
index 20904f0..31697f4 100644
--- a/src/RomanNumerals.java
+++ b/src/RomanNumerals.java
@@ -1,8 +1,158 @@
+import sun.security.util.Length;
 
 public class RomanNumerals {
+	
+	int length;
+	int length1;
+	
+	
 	public int convertToInteger(String romanNum) {
-		// To be Implemented
-		return 0;
+	
+	int Resultnum = 0;
 		
+	switch(romanNum){
+		case "I":
+			Resultnum = 1;
+			break;
+		case "II":
+			Resultnum = 2;
+			break;
+		case "III":
+			Resultnum = 3;
+			break;
+		case "IV":
+			Resultnum = 4;
+			break;
+		case "V":
+			Resultnum = 5;
+			break;
+		case "VI":
+			Resultnum = 6;
+			break;
+		case "VII":
+			Resultnum = 7;
+			break;
+		case "VIII":
+			Resultnum = 8;
+			break;
+		case "IX":
+			Resultnum = 9;
+			break;
+		}
+	
+	return Resultnum;
+	
 	}
+	
+	public int get_Roman_Number(String romanum){
+		
+		int RomanNumAsinteger = 0;
+		int Charsleft = 0;
+		
+		if(romanum.charAt(0) == 'M'){
+			RomanNumAsinteger = 1000;
+			Charsleft = Charsleft + 1;
+		}if(romanum.charAt(1) == 'C' || romanum.charAt(1) == 'D'){
+				RomanNumAsinteger = RomanNumAsinteger + this.gethundreds(romanum);
+		}
+		
+		int Length4 = romanum.length() - length - Charsleft;
+		Length4 = romanum.length() - Length4;
+		
+		if(romanum.charAt(Length4) == 'X' || romanum.charAt(Length4) == 'L'){
+			RomanNumAsinteger = RomanNumAsinteger + this.getTens(romanum, Length4);
+		}if(romanum.charAt(0) == 'I' || romanum.charAt(0) == 'V'){
+			RomanNumAsinteger = convertToInteger(romanum);
+		}else{
+		
+			Length4 = Length4 + length1;
+			StringBuilder builder = new StringBuilder();
+		
+			while(Length4 <= romanum.length() - 1){
+				builder.append(romanum.charAt(Length4));
+				Length4++;
+			}
+		
+			if(Length4 == romanum.length()){
+				RomanNumAsinteger = RomanNumAsinteger + convertToInteger(builder.toString());
+			}
+		}
+		
+		return RomanNumAsinteger;
+	}
+	
+	public int gethundreds(String romanum){
+		
+		int hundreds = 0;
+		
+		if(romanum.charAt(1) == 'C' && romanum.charAt(2) != 'C'){
+			hundreds = 100;
+			length = length + 1;
+		}else if(romanum.charAt(2) == 'C' && romanum.charAt(3) != 'C'){
+				hundreds = 200;
+				length = length + 2;
+		}else if(romanum.charAt(3) == 'C'){
+			hundreds = 300;
+			length = length + 3;
+		}else if(romanum.charAt(2) == 'D'){
+			hundreds = 400;
+			length = length + 2;
+		}else if(romanum.charAt(2) == 'M'){
+			hundreds = 900;
+			length = length + 2;
+		}else if(romanum.charAt(1) == 'D'){
+			hundreds = 500;
+			length = length + 1;
+		}else if(romanum.charAt(2) == 'C'){
+			hundreds = 600;
+			length = length + 2;
+		}else if(romanum.charAt(3) == 'C'){
+			hundreds = 700;
+			length = length + 3;
+		}else if(romanum.charAt(4) == 'C'){
+			hundreds = 800;
+			length = length + 4;
+		}
+		
+		return hundreds;
+		
+	}
+	
+	public int getTens(String romanum, int length2){
+		int tens = 0;
+		length1 = length2;
+		
+		if(romanum.charAt(length1) == 'X' || romanum.charAt(length1) == 'X' && romanum.charAt(length1 + 1) != 'X'){
+			tens = 10;
+			length1 = 1;
+		}else if(romanum.charAt(length1 + 1) == 'X' && romanum.charAt(length1 + 2) != 'X'){
+			tens = 20;
+			length1 = 2;
+		}else if(romanum.charAt(length1 + 2) == 'X' && romanum.charAt(length1) != 'L'){
+			tens = 30;
+			length1 = 3;
+		}else if(romanum.charAt(length1 + 2) == 'L' && romanum.charAt(length1 + 1) == 'X'){
+			tens = 40;
+			length1 = 2;
+		}else if(romanum.charAt(length1 + 2) == 'C'){
+			tens = 90;
+			length1 = 2;
+		}else if(romanum.charAt(length1) == 'L' && romanum.charAt(length1 + 1) != 'X'){
+			tens = 50;
+			length1 = 1;
+		}else if(romanum.charAt(length1 + 1) == 'X' && romanum.charAt(length1 + 2) != 'X'){
+			tens = 60;
+			length1 = 2;
+		}else if(romanum.charAt(length1 + 2) == 'X' && romanum.charAt(length1 + 3) != 'X'){
+			tens = 70;
+			length1 = 3;
+		}else if(romanum.charAt(length1 + 3) == 'X'){
+			tens = 80;
+			length1 = 4;
+		}
+			
+		return tens;
+		
+		}
+		
 }
diff --git a/tests/TestRomanNumerals.java b/tests/TestRomanNumerals.java
index 5d1de75..0590960 100644
--- a/tests/TestRomanNumerals.java
+++ b/tests/TestRomanNumerals.java
@@ -5,8 +5,35 @@
 public class TestRomanNumerals {
 
 	@Test
-	public void test() {
-		fail("Not yet implemented");
+	public void ConvertNumberlength1() {
+		
+		RomanNumerals romannumerals = new RomanNumerals();
+		
+		assertEquals(6, romannumerals.get_Roman_Number("VI"));
+	}
+	
+	@Test
+	public void ConvertNumberlength2() {
+		
+		RomanNumerals romannumerals = new RomanNumerals();
+		
+		assertEquals(8, romannumerals.get_Roman_Number("VIII"));
+	}
+	
+	@Test
+	public void ConvertNumber1384() {
+		
+		RomanNumerals romannumerals = new RomanNumerals();
+		
+		assertEquals(1384, romannumerals.get_Roman_Number("MCCCLXXXIV"));
+	}
+	
+	@Test
+	public void ConvertNumber1210() {
+		
+		RomanNumerals romannumerals = new RomanNumerals();
+		
+		assertEquals(1210, romannumerals.get_Roman_Number("MCCX"));
 	}
 
 }