Further clean up of db fucntions (now longer uses _row to handle objects)