Reimplemented post.php functionality, fixed more merge conflicts