diff --git a/bin/.gitignore b/bin/.gitignore
new file mode 100644
index 0000000..2079672
--- /dev/null
+++ b/bin/.gitignore
@@ -0,0 +1,2 @@
+/Spreadsheet.class
+/SpreadsheetTest.class
diff --git a/bin/Spreadsheet.class b/bin/Spreadsheet.class
index 92b411f..791dfc3 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..48845f0 100644
Binary files a/bin/SpreadsheetTest.class and b/bin/SpreadsheetTest.class differ
diff --git a/src/Spreadsheet.java b/src/Spreadsheet.java
index e4f120b..4d438c8 100644
--- a/src/Spreadsheet.java
+++ b/src/Spreadsheet.java
@@ -1,18 +1,24 @@
+import java.util.*;
+import java.util.regex.Pattern;
+
 
 public class Spreadsheet {
+	
+	HashMap<String,String> cells = new HashMap<String,String>();
 
 	public String get(String cell) {
-		// to be implemented
-		return null;
+		String value = cells.get(cell);
+		return value;
 	}
 	
 	public void set(String cell, String value) {
-		// to be implemented
+		cells.put(cell, value);
 	}
 	
-	public String evaluate(String cell) {
-		// to be implemented
-		return null;
-	}
+	// ## Not implemented yet ##
+	//public String evaluate(String cell) {
+	//	
+	//	Pattern correctFormats = Pattern.compile("");
+	//}
 	
 }
diff --git a/tests/SpreadsheetTest.java b/tests/SpreadsheetTest.java
index 9e0936a..aaf73cd 100644
--- a/tests/SpreadsheetTest.java
+++ b/tests/SpreadsheetTest.java
@@ -6,10 +6,47 @@
 
 public class SpreadsheetTest {
 
+	Spreadsheet testsheet = new Spreadsheet();
+
+	
 	@Test
-	public void test() {
-		fail("Not yet implemented");
+	public void testSetValueToCell() {
+		
+		// Arrange value to cell A1
+		testsheet.set("A1", "1");
 		
+		// Get value from cell A1
+		String value = testsheet.get("A1");
+		
+		// Assert
+		assertEquals("Failed to return value from cell", "1", value);
 	}
-
+	
+	
+	@Test
+	public void testNumberHandling() {
+		
+		// Arrange value to cell A1
+		testsheet.set("A1", "-1");
+		
+		// Get value from cell A1
+		String value = testsheet.get("A1");
+		
+		// Assert
+		assertEquals("Failed to return negative number from cell", "-1", value);
+	}
+	
+	
+	@Test
+	public void testErrorOnWrongFormat() {
+		// Arrange
+		testsheet.set("A1", "5A");
+		
+		// Get value from cell A1
+		String value = testsheet.get("A1");
+		
+		// Assert
+		assertEquals("Failed to return error on wrong format", "#Error", value);
+	}
+	
 }