diff --git a/Question.php b/Question.php
index 259b9d2..4678270 100644
--- a/Question.php
+++ b/Question.php
@@ -13,25 +13,37 @@ class Question
 {
     private $question;
     private $answers;
-    private $right_answer_position;
+    private $correct_answer_position;
+    private $category_id;
+    private $category;
 
-    function __construct($offset, $db) {
-        $qid = $db->query('SELECT * FROM "Questions" ORDER BY "ID" OFFSET $1 LIMIT 1', array($offset));
-        $q = $db->query('SELECT "question" FROM "Questions" WHERE "ID" = $1', array($qid));
-        $a0 = $db->query('SELECT "answer0" FROM "Questions" WHERE "ID" = $1', array($qid));
-        $a1 = $db->query('SELECT "answer1" FROM "Questions" WHERE "ID" = $1', array($qid));
-        $a2 = $db->query('SELECT "answer2" FROM "Questions" WHERE "ID" = $1', array($qid));
-        $a3 = $db->query('SELECT "answer3" FROM "Questions" WHERE "ID" = $1', array($qid));
-        //$cid = $db->query('SELECT "Categories_ID" FROM '
+    function __construct($db, $id) {
+        $question_details = $db->query('SELECT "question", "answer0", "answer1", "answer2", "answer3", "Categories_ID"
+          FROM "Questions" WHERE "ID" = $1', array($id));
+        $q = $question_details[0];
+        $a0 = $question_details[1];
+        $a1 = $question_details[2];
+        $a2 = $question_details[3];
+        $a3 = $question_details[4];
+        $cid = $question_details[5];
+        $c = $db->query('SELECT "name" FROM "Categories" WHERE "ID" = $1', array($cid));
         $this->question = $q;
         $this->answers = array('a0' => $a0, 'a1' => $a1, 'a2' => $a2, 'a3' => $a3);
         shuffle($this->answers);
-        $this->right_answer_position = array_search('a0', $this->answers);
+        $this->correct_answer_position = array_search('a0', $this->answers);
+        $this->category_id = $cid;
+        $this->category = $c;
     }
 
     // Create the question message for API.
-    function get_question() {
-
+    function get_question_object() {
+        $question_object = array(
+            'categoryID' => $this->category_id,
+            'categoryName' => $this->category,
+            'question' => $this->question,
+            'answers' => [$this->answers['a0'], $this->answers['a1'], $this->answers['a2'], $this->answers['a3']]
+        );
+        return $question_object;
     }
 
 }
\ No newline at end of file