diff --git a/src/server/server.java b/src/server/server.java
index 8eefb1f..36a464a 100644
--- a/src/server/server.java
+++ b/src/server/server.java
@@ -16,6 +16,8 @@ public class server extends ServerNetworking implements Thermostatable {
 	int desiredTemperature;
 	// Thermostat IP address
 	String thermostatIP;
+	// Database object
+	Database dataStorage;
 	
 	public server() {
 		// Default admin user
@@ -31,60 +33,46 @@ public void receiveCurrentTemp() throws Exception {
 		super.receiveCurrentTemp(receiveCurrentTempPORT);		
 	}
 
-	@Override
 	public boolean createUser(String email, String password, String ip) {
-		// TODO Auto-generated method stub
-		return false;
+		dataStorage.createUser(email, password, ip);
+		return true;
 	}
 
-	@Override
-	public boolean createThermostat(String serial, String name,
-			String desiredTemp) {
+	public boolean createThermostat(String serial, String name, String desiredTemp) {
 		// TODO Auto-generated method stub
 		return false;
 	}
 
-	@Override
+	public boolean createThermostat(String serialnumber, String name, String ip, String currenttemp, String desiredtemp){
+		dataStorage.createThermostat(serialnumber, name, ip, currenttemp, desiredtemp);
+		return true;
+	}
+
 	public Hashtable<String, String> getUserFromEmail(String email) {
-		// TODO Auto-generated method stub
-		return null;
+		return dataStorage.getObjectFromTableAndKey("UserTable", email);
 	}
 
-	@Override
 	public Hashtable<String, String> getDeviceFromSerial(String serialnumber) {
-		// TODO Auto-generated method stub
-		return null;
+		return dataStorage.getObjectFromTableAndKey("Thermostat", serialnumber);
 	}
 
-	@Override
 	public String getCurrentTempFromSerialNumber(String serialnumber) {
-		// TODO Auto-generated method stub
-		return null;
+		return dataStorage.queryForValue("Thermostat", serialnumber, "currenttemp");
 	}
 
-	@Override
-	public void setCurrentTempForSerialNumber(String serialNumber,
-			String currtemp) {
-		// TODO Auto-generated method stub
-		
+	public void setCurrentTempForSerialNumber(String serialnumber, String currtemp) {
+		dataStorage.updateTable("Thermostat", serialnumber, "currenttemp", currtemp);
 	}
 
-	@Override
-	public void setDesiredTempForSerialNumber(String serialnumber,
-			String desiredtemp) {
-		// TODO Auto-generated method stub
-		
+	public void setDesiredTempForSerialNumber(String serialnumber, String desiredtemp) {
+		dataStorage.updateTable("Thermostat", serialnumber, "desiredtemp", desiredtemp);
 	}
 
-	@Override
 	public String getDevicesFromEmail(String email) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
-    @Override
     public void datastructureLogEvent(String query) {
-        // take this query string and pass it to the UI to display in the Log in the server text field
     }