diff --git a/website/public/API/getPosts.php b/website/public/API/getPosts.php
index eef8261..620a707 100644
--- a/website/public/API/getPosts.php
+++ b/website/public/API/getPosts.php
@@ -1,13 +1,17 @@
 <?php
 
-if(empty($_POST["usr"])) {
+if(empty($_POST["usr"]) and empty($_POST["grp"])) {
     header('HTTP/1.1 500 Non enough arguments');
 }
 
-require_once ("../../queries/user.php");
+require_once ("../../queries/post.php");
 require_once ("../../queries/nicetime.php");
 
-$posts = selectAllUserPosts($_POST["usr"]);
+if(empty($_POST["usr"])) {
+    $posts = selectAllPosts(0, $_POST["grp"]);
+} else {
+    $posts = selectAllPosts($_POST["usr"], 0);
+}
 
 if(!$posts) {
     header('HTTP/1.1 500 Query failed');
@@ -19,6 +23,4 @@ for($i = 0; $i < sizeof($results); $i++) {
     $results[$i]["nicetime"] = nicetime($results[$i]["creationdate"]);
 }
 
-//$results[0]["niceTime"] = nicetime($results[0]["creationdate"]);
-
 echo json_encode($results);
\ No newline at end of file
diff --git a/website/public/API/postComment.php b/website/public/API/postComment.php
index 30c02eb..e1d7617 100644
--- a/website/public/API/postComment.php
+++ b/website/public/API/postComment.php
@@ -3,7 +3,7 @@
 session_start();
 
 require("../../queries/post.php");
-require("../../queries/connect.php");
+require_once("../../queries/connect.php");
 require("../../queries/checkInput.php");
 print_r($_POST);
 if ($_POST['button'] == 'reaction') {
diff --git a/website/public/js/masonry.js b/website/public/js/masonry.js
index f30f0af..8d2080b 100644
--- a/website/public/js/masonry.js
+++ b/website/public/js/masonry.js
@@ -90,7 +90,7 @@ function masonry(mode) {
     /*
      * Get the posts from the server.
      */
-    $.post("API/getPosts.php", { usr : userID })
+    $.post("API/getPosts.php", { usr : userID, grp : groupID })
            .done(function(data) {
                posts = JSON.parse(data);
 
diff --git a/website/public/js/post.js b/website/public/js/post.js
index 1906428..4a8ebc7 100644
--- a/website/public/js/post.js
+++ b/website/public/js/post.js
@@ -4,7 +4,9 @@ function postComment(buttonValue) {
     $.post(
         "API/postComment.php",
         formData
-    );
+    ).done(function(data) {
+        console.log(data);
+    });
 
     $("#newcomment").val("");
 
diff --git a/website/queries/group_page.php b/website/queries/group_page.php
index 8921aa5..b3e454c 100644
--- a/website/queries/group_page.php
+++ b/website/queries/group_page.php
@@ -1,10 +1,11 @@
 <?php
 
-require("connect.php");
+require_once("connect.php");
 
 function selectGroupByName($name) {
     $stmt = prepareQuery("
         SELECT
+          `group_page`.`groupID`,
           `group_page`.`groupID`,
           `name`,
           `description`,
diff --git a/website/queries/post.php b/website/queries/post.php
index 1c09385..a175cda 100644
--- a/website/queries/post.php
+++ b/website/queries/post.php
@@ -1,5 +1,51 @@
 <?php
 
+require_once("connect.php");
+
+function selectAllPosts($userID, $groupID) {
+    $stmt = prepareQuery("
+        SELECT
+          `post`.`postID`,
+          `post`.`author`,
+          `title`,
+          CASE LENGTH(`post`.`content`) >= 150 AND `post`.`content` NOT LIKE '<img%'
+          WHEN TRUE THEN
+            CONCAT(LEFT(`post`.`content`, 150), '...')
+          WHEN FALSE THEN
+            `post`.`content`
+          END
+                                        AS `content`,
+          `post`.`creationdate`,
+          COUNT(DISTINCT `commentID`) AS `comments`,
+          COUNT(DISTINCT `niet_slecht`.`postID`) AS `niet_slechts`
+        FROM
+          `post`
+          LEFT JOIN
+          `niet_slecht`
+            ON
+              `post`.`postID` = `niet_slecht`.`postID`
+          LEFT JOIN
+          `comment`
+            ON
+              `post`.`postID` = `comment`.`postID`
+        WHERE
+          `post`.`author` = :userID AND
+          `groupID` IS NULL OR
+          `groupID` = :groupID
+        GROUP BY
+          `post`.`postID`
+        ORDER BY
+          `post`.`creationdate` DESC
+    ");
+    $stmt->bindParam(':userID', $userID, PDO::PARAM_INT);
+    $stmt->bindParam(':groupID', $groupID , PDO::PARAM_INT);
+    if(!$stmt->execute()) {
+        return False;
+    }
+    return $stmt;
+
+}
+
 function selectPostById($postID) {
     $stmt = prepareQuery("
         SELECT
diff --git a/website/queries/user.php b/website/queries/user.php
index ec211c0..e3bf758 100644
--- a/website/queries/user.php
+++ b/website/queries/user.php
@@ -103,47 +103,47 @@ function selectAllUserGroups($userID) {
     return $stmt;
 }
 
-function selectAllUserPosts($userID) {
-    $stmt = prepareQuery("
-        SELECT
-          `post`.`postID`,
-          `post`.`author`,
-          `title`,
-          CASE LENGTH(`post`.`content`) >= 150 AND `post`.`content` NOT LIKE '<img%'
-          WHEN TRUE THEN
-            CONCAT(LEFT(`post`.`content`, 150), '...')
-          WHEN FALSE THEN
-            `post`.`content`
-          END
-            AS `content`,
-          `post`.`creationdate`,
-          COUNT(`commentID`) AS `comments`,
-          COUNT(`niet_slecht`.`postID`) AS `niet_slechts`
-        FROM
-          `post`
-        LEFT JOIN
-        `niet_slecht`
-          ON
-            `post`.`postID` = `niet_slecht`.`postID`
-        LEFT JOIN
-          `comment`
-        ON
-          `post`.`postID` = `comment`.`postID`
-        WHERE
-          `post`.`author` = :userID AND
-          `groupID` IS NULL
-        GROUP BY
-          `post`.`postID`
-        ORDER BY
-          `post`.`creationdate` DESC
-    ");
-
-    $stmt->bindParam(':userID', $userID, PDO::PARAM_INT);
-    if(!$stmt->execute()) {
-        return False;
-    }
-    return $stmt;
-}
+//function selectAllUserPosts($userID) {
+//    $stmt = prepareQuery("
+//        SELECT
+//          `post`.`postID`,
+//          `post`.`author`,
+//          `title`,
+//          CASE LENGTH(`post`.`content`) >= 150 AND `post`.`content` NOT LIKE '<img%'
+//          WHEN TRUE THEN
+//            CONCAT(LEFT(`post`.`content`, 150), '...')
+//          WHEN FALSE THEN
+//            `post`.`content`
+//          END
+//            AS `content`,
+//          `post`.`creationdate`,
+//          COUNT(`commentID`) AS `comments`,
+//          COUNT(`niet_slecht`.`postID`) AS `niet_slechts`
+//        FROM
+//          `post`
+//        LEFT JOIN
+//        `niet_slecht`
+//          ON
+//            `post`.`postID` = `niet_slecht`.`postID`
+//        LEFT JOIN
+//          `comment`
+//        ON
+//          `post`.`postID` = `comment`.`postID`
+//        WHERE
+//          `post`.`author` = :userID AND
+//          `groupID` IS NULL
+//        GROUP BY
+//          `post`.`postID`
+//        ORDER BY
+//          `post`.`creationdate` DESC
+//    ");
+//
+//    $stmt->bindParam(':userID', $userID, PDO::PARAM_INT);
+//    if(!$stmt->execute()) {
+//        return False;
+//    }
+//    return $stmt;
+//}
 
 function select20UsersFromN($n) {
     $q = prepareQuery("