diff --git a/bin/.gitignore b/bin/.gitignore
new file mode 100644
index 0000000..6f06ffe
--- /dev/null
+++ b/bin/.gitignore
@@ -0,0 +1,3 @@
+/Spreadsheet.class
+/SpreadsheetTest.class
+/Cell.class
diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class
index 92b411f..fb8ddb4 100644
Binary files a/bin/Spreadsheet.class and b/bin/Spreadsheet.class differ
diff --git a/bin/SpreadsheetTest.class b/bin/SpreadsheetTest.class
index e7086bd..da3bcda 100644
Binary files a/bin/SpreadsheetTest.class and b/bin/SpreadsheetTest.class differ
diff --git a/src/Cell.java b/src/Cell.java
new file mode 100644
index 0000000..da4d1cf
--- /dev/null
+++ b/src/Cell.java
@@ -0,0 +1,18 @@
+
+public class Cell {
+	private String id;
+	private String value;
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getValue() {
+		return value;
+	}
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+}
diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java
index e4f120b..7d34d05 100644
--- a/src/Spreadsheet.java
+++ b/src/Spreadsheet.java
@@ -1,18 +1,30 @@
+import java.util.ArrayList;
 
 public class Spreadsheet {
 
-	public String get(String cell) {
-		// to be implemented
-		return null;
-	}
+	private ArrayList<Cell> cells =  new ArrayList<Cell>();
 	
 	public void set(String cell, String value) {
-		// to be implemented
+		Cell C = new Cell();
+		C.setId(cell);
+		C.setValue(value);
+		cells.add(C);
 	}
 	
-	public String evaluate(String cell) {
-		// to be implemented
-		return null;
+	
+	public String get(String cell) {
+		
+		cell.get(id);
+		return cell;
 	}
 	
+
+	
+	public String evaluate(String cell) {
+	
+		if (cell.substring(0).contains("[1-9]+") && (cell.substring(0).matches("[1-9]+"))){
+			return cell;	
+		}		
+		return "#Error";
+	}	
 }
diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java
index 9e0936a..4822ad7 100644
--- a/tests/SpreadsheetTest.java
+++ b/tests/SpreadsheetTest.java
@@ -7,9 +7,24 @@
 public class SpreadsheetTest {
 
 	@Test
-	public void test() {
-		fail("Not yet implemented");
+	public void test_EvaluatePass() {
+		Spreadsheet evaluate = new Spreadsheet();
+		evaluate.set("A3", "5");
+		String result = evaluate.evaluate("A3");
+		assertEquals("Contains only numbers", "5", result);
 		
+		
+	}
+
+
+
+	@Test
+	public void test_set(){
+		Spreadsheet set = new Spreadsheet();
+		set.set("A3", "5");
+		String result = set.get("A3");
+		assertEquals("5", result);
 	}
 
-}
+	
+	}
\ No newline at end of file