diff --git a/src/server/mysql.c b/src/server/mysql.c
--- a/src/server/mysql.c
+++ b/src/server/mysql.c
@@ -38,7 +38,24 @@
 #define SEVENTY_FIVE 75
 #define FORTY_TWO 42
 
-struct distrend_mysql_con 
+/**
+   performs mysql query.
+   errors will be logged to the user by this function.
+   @return pointer to query handle on success, NULL on failure
+ */
+distrend_mysql_result_t mysqlQuery(distrend_mysql_conn_t conn, char *query);
+
+/**
+   frees mysql query result. Accepts a NULL pointer and ignores it to
+   help deal with one-shot calls to mysqlQuery so that you don't have to
+   check if it returned NULL or not.
+   @return 0 on success
+ */
+int mysqlResultFree(distrend_mysql_result_t result);
+
+
+
+struct distrend_mysql_conn
 {
   MYSQL *mysqlconn;
   short pointlesscheck;
@@ -54,7 +71,7 @@ struct distrend_mysql_result
     funcs
  */
 
-int mysqlConnect(struct distrend_mysql_con **conn)
+int mysqlConnect(distrend_mysql_conn_t *conn)
 {
   MYSQL *mysqlconn;
 
@@ -72,7 +89,7 @@ int mysqlConnect(struct distrend_mysql_c
       return 1;
     }
 
-  *conn = malloc(sizeof(struct distrend_mysql_con));
+  *conn = malloc(sizeof(struct distrend_mysql_conn));
   if(!*conn)
     {
       mysql_close(mysqlconn);
@@ -85,13 +102,13 @@ int mysqlConnect(struct distrend_mysql_c
   return 0;
 }
 
-int mysqlDisconnect(distrend_mysql_con_t conn)
+int mysqlDisconnect(distrend_mysql_conn_t conn)
 {
   /**
      check if this handle is valid
    */
   if(conn->pointlesscheck != SEVENTY_FIVE)
-    fprintf(stderr, "warning, I was passed a bad struct distrend_mysql_con...\n");
+    fprintf(stderr, "warning, I was passed a bad struct distrend_mysql_conn...\n");
 
   /**
      invalidate handle :-D
@@ -106,7 +123,7 @@ int mysqlDisconnect(distrend_mysql_con_t
 }
 
 
-distrend_mysql_result_t mysqlQuery(distrend_mysql_con_t conn, char *query)
+distrend_mysql_result_t mysqlQuery(distrend_mysql_conn_t conn, char *query)
 {
   MYSQL_RES *result;
   distrend_mysql_result_t distrenresult;
@@ -115,7 +132,7 @@ distrend_mysql_result_t mysqlQuery(distr
      pointless sanity check
   */
   if(conn->pointlesscheck != SEVENTY_FIVE)
-    fprintf(stderr, "warning, I was passed a bad struct distrend_mysql_con...\n");
+    fprintf(stderr, "warning, I was passed a bad struct distrend_mysql_conn...\n");
   
   /** make sure that connection is still alive
    */
@@ -142,6 +159,9 @@ distrend_mysql_result_t mysqlQuery(distr
 
 int mysqlResultFree(distrend_mysql_result_t result)
 {
+  if(!result)
+    return 0;
+
   if(result->pointlesscheck != FORTY_TWO)
     fprintf(stderr, "%s:%d: I didn't get the type of handle I wanted\n", __FILE__, __LINE__);
 
@@ -151,17 +171,30 @@ int mysqlResultFree(distrend_mysql_resul
   return 0;
 }
 
+<<<<<<< local
+
+
+/*
+   Individual query functions:
+=======
 /**
    Querying Functions
+>>>>>>> other
  */
 
+<<<<<<< local
+=======
 /** Finish-Setter: Sets a frame to the "completed" status.*/
 // @QUERY: update `distren`.`Job` set `Finish_Confirmed`=1 where `Job_Key`='1' and `Frame` = somenumber;
 void finish_frame(int slaveKey, int jobKey, int frameNum, distrend_mysql_con_t conn)
 {
   MYSQL_RES *result;
   MYSQL_ROW row;
+>>>>>>> other
 
+<<<<<<< local
+void finish_frame(distrend_mysql_conn_t conn, int32_t jobkey, int32_t framenum)
+=======
   char *query = "update `distren`.`Job` set `Finish_Confirmed`=1 where `Job_Key`='1' and `Frame` = somenumber;";
   result = mysqlQuery(conn, query);
 
@@ -225,14 +258,35 @@ int change_job_priority(int jobKey, int 
 */
 // @QUERY: Frame_Get()
 int find_jobframe(int slaveKey, int *jobKey, int *frameNum, distrend_mysql_con_t conn)
+>>>>>>> other
 {
+<<<<<<< local
+  distrend_mysql_result_t result;
+  char *query;
+=======
   /*
   if(geninfo->hibernate)
     return 1;
+>>>>>>> other
 
+<<<<<<< local
+  /**
+    @TODO record the total rendering time for the frame
+   */
+=======
   unsigned int frame_counter;
   unsigned short int found;
+>>>>>>> other
 
+<<<<<<< local
+  _distren_asprintf(&query, "UPDATE `distren`.`Job` SET `Finish_Confirmed`=1 WHERE `Job_Key`=%d AND `Frame`=%d",
+		    jobkey, framenum);
+  
+  result = mysqlQuery(conn, query);
+  free(query);
+  
+  mysqlResultFree(result);
+=======
   struct distrenjob *distrenjob_ptr;
 
   found = 0;
@@ -270,4 +324,5 @@ int find_jobframe(int slaveKey, int *job
   *frame = &distrenjob_ptr->frameset[frame_counter];
 */
   return 0;
+>>>>>>> other
 }