diff --git a/datastruct.txt b/datastruct.txt
index 6f29230..de80668 100644
Binary files a/datastruct.txt and b/datastruct.txt differ
diff --git a/src/InputOutput/Database.java b/src/InputOutput/Database.java
index 27ef322..361c9d7 100644
--- a/src/InputOutput/Database.java
+++ b/src/InputOutput/Database.java
@@ -8,9 +8,7 @@ public class Database extends DataStructure implements Thermostatable{
 
 	public Database(Thermostatable owner){
         super(owner);
-		this.updateTable("UserTable", null, null, null);
-	
-		this.updateTable("Thermostat", null, null, null);
+		
 	}
 	
 	public boolean createUser(String username, String password, String ip, String email){
diff --git a/src/testing/DataStructureTest.java b/src/testing/DataStructureTest.java
index 4455826..323f602 100644
--- a/src/testing/DataStructureTest.java
+++ b/src/testing/DataStructureTest.java
@@ -1,10 +1,12 @@
 package testing;
+import java.util.Hashtable;
+
 import InputOutput.*;
 
-public class DataStructureTest {
+public class DataStructureTest implements Thermostatable{
 	
 	public DataStructureTest(){
-		DataStructure struct  = new DataStructure();
+		DataStructure struct  = new DataStructure(this);
 
         this.testReadWrite(struct);
         this.testDiskWriteRead(struct);
@@ -46,7 +48,7 @@ public void testReadWrite(DataStructure struct){
     }
 
     public void testDiskWriteRead(DataStructure struct){
-        struct = new DataStructure();
+        struct = new DataStructure(this);
         struct.restoreFromDisk();
 
         if(struct.queryForValue("UserTable","david.paquette@uconn.edu", "password").equals("mypass")){
@@ -59,4 +61,62 @@ public void testDiskWriteRead(DataStructure struct){
 	public static void main(String[] args){
 		DataStructureTest test = new DataStructureTest();
 	}
+
+	@Override
+	public boolean createUser(String username, String password, String ip,
+			String email) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean createThermostat(String serial, String name,
+			String desiredTemp) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public Hashtable<String, String> getUserFromEmail(String email) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Hashtable<String, String> getDeviceFromSerial(String serialnumber) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getCurrentTempFromSerialNumber(String serialnumber) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void setCurrentTempForSerialNumber(String serialNumber,
+			String currtemp) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setDesiredTempForSerialNumber(String serialnumber,
+			String desiredtemp) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public String getDevicesFromEmail(String email) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void datastructureLogEvent(String query) {
+		// TODO Auto-generated method stub
+		
+	}
 }
diff --git a/src/testing/DatabaseTest.java b/src/testing/DatabaseTest.java
index 1502eab..23b828e 100644
--- a/src/testing/DatabaseTest.java
+++ b/src/testing/DatabaseTest.java
@@ -1,4 +1,6 @@
 package testing;
+import java.util.Hashtable;
+
 import InputOutput.*;
 import static org.junit.Assert.assertEquals;
 
@@ -8,17 +10,80 @@
 import org.junit.runners.JUnit4;
 
 
-public class DatabaseTest {
+public class DatabaseTest implements Thermostatable{
 
 	/**
 	 * @param args
 	 */
-	public static void main(String[] args) {
-		Database testbase =new Database();
-		testbase.set
+	public DatabaseTest(){
+		Database testbase =new Database(this);
+		assert(testbase.createUser("herp@derp.com", "herpderp", "123456789.0", "herp@derp.com")== true);
+		Hashtable<String, String> testuser = testbase.getUserFromEmail("herp@derp.com");
+		assert(testuser.get("email")=="herp@derp.com");
+		assert(testuser.get("ip")=="123456789.0");
 		
+	}
+
+	@Override
+	public boolean createUser(String username, String password, String ip,
+			String email) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean createThermostat(String serial, String name,
+			String desiredTemp) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public Hashtable<String, String> getUserFromEmail(String email) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Hashtable<String, String> getDeviceFromSerial(String serialnumber) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getCurrentTempFromSerialNumber(String serialnumber) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void setCurrentTempForSerialNumber(String serialNumber,
+			String currtemp) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void setDesiredTempForSerialNumber(String serialnumber,
+			String desiredtemp) {
+		// TODO Auto-generated method stub
 		
+	}
 
+	@Override
+	public String getDevicesFromEmail(String email) {
+		// TODO Auto-generated method stub
+		return null;
 	}
 
+	@Override
+	public void datastructureLogEvent(String query) {
+		// TODO Auto-generated method stub
+		
+	}
+	public static void main(String[] args) {
+		new DatabaseTest();
+		
+	}	
+
 }