diff --git a/htdocs/comments.php b/htdocs/comments.php
index 12853bd..e1ec76e 100644
--- a/htdocs/comments.php
+++ b/htdocs/comments.php
@@ -14,136 +14,22 @@ if (false === $r = $stats->getSignature($signature_id))
     return;
 }
 
-function renderComments($comments)
-{
-    global $S;
-    foreach($comments as $c):
-        $from = $c->name . " <" . $c->email . ">" . " " . date("r", $c->commented);
-        $comment = Markdown::defaultTransform($c->comment);
-        $del = "";
-        if ($S->user->is_admin || $S->user_id == $c->user_id)
-        {
-            $del = "<a class=\"del_comment\" data-id=\"{$c->id}\">Delete comment</a> ";
-        }
-        $gid = md5($c->email);
-        $avatar = (USE_SSL ? "https://secure.gravatar.com" : "http://www.gravatar.com") .  "/avatar/$gid?r=x&amp;d=mm&amp;s=48";
-        
-?>
-<div>
-<div style="float: left; display: inline-block; ">
-    <img style="border-radius: 5px; margin-top: 3px; border: 1px solid #444; filter: alpha(opacity=80); opacity: 0.8;" src="<?php echo $avatar ?>" />
-</div>
-<div class="ui-corner-all" style="margin: 2em 0; background-color: #252525; margin-left: 60px; margin-right: 20px;">
-    <div style="padding: 5px; border-bottom: 1px solid #444; vertical-align: middle;">
-        <?php echo $del . htmlentities($from) ?>
-    </div>
-    <div style="padding: 5px"><?php echo $comment ?></div>
-</div>
-</div>
-<?php
-    endforeach;
-}
-
 if ($_POST["action"] == "add_comment")
 {
     if (trim($_POST["comment"]))
     {
-        $stats->addSignatureComment($signature_id, $_POST["comment"]);
+        Comments::addSignatureComment($signature_id, $_POST["comment"]);
     }
-    renderComments($stats->getSignatureComments($signature_id));
+    Comments::renderComments($signature_id);
     return;
 }
 if ($_POST["action"] == "del_comment")
 {
-    $stats->delSignatureComment($signature_id, $_POST["delete_id"]);
-    renderComments($stats->getSignatureComments($signature_id));
+    Comments::delSignatureComment($signature_id, $_POST["delete_id"]);
+    Comments::renderComments($signature_id);
     return;
 }
 
-
-
-
-$comments = $stats->getSignatureComments($signature_id);
 if (!$ajax) Layout::header();
-?>
-<script>
-    var signature_id = <?php echo $signature_id ?>;
-
-    function updateDelLinks(){
-        $(".del_comment").each(function() {
-            var $link = $(this);
-            var id = $link.data("id");
-            
-            $link.button({
-                text: false,
-                icons: { primary: "ui-icon-close" },
-            })
-            .on("click", function(){
-                if (confirm("Delete comment?")) {
-
-                    data = {
-                        ajax: 1,
-                        action: "del_comment",
-                        signature_id: signature_id,
-                        delete_id: id,
-                    };
-        
-                    $.ajax({
-                        type: "POST",
-                        url: "comments.php",
-                        data: data,
-                        success: function(res) {
-                           $("#comments_scroller").html(res);
-                           $('#comments_scroller').scrollTop($('#comments_scroller')[0].scrollHeight);
-                           updateDelLinks();
-                        },
-                    });
-                }
-                
-            });
-
-        });
-        
-    };
-    
-    $(function(){
-        $("#add_comment").button()
-        .on("click", function(){
-
-            data = {
-                ajax: 1,
-                action: "add_comment",
-                signature_id: signature_id,
-                comment: $("#comment_input").val(),
-            };
-
-            $.ajax({
-                type: "POST",
-                url: "comments.php",
-                data: data,
-                success: function(res) {
-                   $("#comments_scroller").html(res);
-                   $('#comments_scroller').scrollTop($('#comments_scroller')[0].scrollHeight);
-                   updateDelLinks();
-                },
-            });
-        });
-        
-        $('#comments_scroller').scrollTop($('#comments_scroller')[0].scrollHeight);
-        
-        updateDelLinks();
-    });
-</script>
-
-<!--div id="comments_frame" style="height: 100%;"-->
-    <div id="comments_scroller" style="height: 300px; overflow-y: auto;"><?php echo renderComments($comments) ?></div>
-    <div id="new_comment" style="height: 100px;">
-        <a id="add_comment">Add comment</a>
-        <textarea id="comment_input" class="ui-widget-content" style="display: block; width: 100%; height: 100%; margin-top: 5px;"></textarea>
-    </div>
-    <div style="height: 30px;"></div>
-<!--/div-->
-
-<?php
-
+Comments::renderCommentPanel($signature_id);
 if (!$ajax) Layout::footer();
diff --git a/htdocs/lib/Comments.php b/htdocs/lib/Comments.php
new file mode 100644
index 0000000..4f3f181
--- /dev/null
+++ b/htdocs/lib/Comments.php
@@ -0,0 +1,170 @@
+<?php
+
+class Comments
+{
+    function updateCommentCount($id)
+    {
+        $q = kl_str_sql("update signature set has_comments=(select count(*) as count from comment where signature_id=!i) where id=!i", $id, $id);
+        DBH::$db->query($q);
+    }
+
+    function addSignatureComment($id, $text)
+    {
+        global $S;
+        $q = kl_str_sql("insert into comment (signature_id, user_id, comment) values (!i, !i, !s)", $id, $S->user_id, $text);
+        DBH::$db->query($q);
+        self::updateCommentCount($id);
+    }
+    
+    function getSignatureComments($id)
+    {
+        $ret = array();
+        $q = kl_str_sql("select c.*, u.name, u.email from comment c join users u on c.user_id = u.user_id where signature_id=!i order by id asc;", $id);
+        if (!$res = DBH::$db->query($q)) return;
+        
+        while ($row = DBH::$db->fetchRow($res))
+        {
+            $c = new stdClass;
+            DBH::$db->loadFromDbRow($c, $res, $row);
+            $ret[] = $c;
+        }
+        
+        return $ret;
+    }
+    
+    function delSignatureComment($id, $del_id)
+    {
+        $q = kl_str_sql("delete from comment where id=!i", $del_id);
+        DBH::$db->query($q);
+        self::updateCommentCount($id);
+    }
+
+    function renderComments($id)
+    {
+        global $S;
+        $comments = self::getSignatureComments($id);
+        
+        foreach($comments as $c):
+            $from = $c->name . " <" . $c->email . ">" . " " . date("r", $c->commented);
+            $comment = Markdown::defaultTransform($c->comment);
+            $del = "";
+            if ($S->user->is_admin || $S->user_id == $c->user_id)
+            {
+                $del = "<a class=\"del_comment\" data-id=\"{$c->id}\">Delete comment</a> ";
+            }
+            $gid = md5($c->email);
+            $avatar = (USE_SSL ? "https://secure.gravatar.com" : "http://www.gravatar.com") .  "/avatar/$gid?r=x&amp;d=mm&amp;s=48";
+            
+    ?>
+    <div>
+    <div style="float: left; display: inline-block; ">
+        <img style="border-radius: 5px; margin-top: 3px; border: 1px solid #444; filter: alpha(opacity=80); opacity: 0.8;" src="<?php echo $avatar ?>" />
+    </div>
+    <div class="ui-corner-all" style="margin: 2em 0; background-color: #252525; margin-left: 60px; margin-right: 20px;">
+        <div style="padding: 5px; border-bottom: 1px solid #444; vertical-align: middle;">
+            <?php echo $del . htmlentities($from) ?>
+        </div>
+        <div style="padding: 5px"><?php echo $comment ?></div>
+    </div>
+    </div>
+    <?php
+        endforeach;
+    }
+    
+    
+    
+    
+    
+    
+    
+    function renderCommentPanel($id)
+    {
+
+
+?>
+<script>
+    var signature_id = <?php echo $id ?>;
+
+    function updateDelLinks(){
+        $(".del_comment").each(function() {
+            var $link = $(this);
+            var id = $link.data("id");
+            
+            $link.button({
+                text: false,
+                icons: { primary: "ui-icon-close" },
+            })
+            .on("click", function(){
+                if (confirm("Delete comment?")) {
+
+                    data = {
+                        ajax: 1,
+                        action: "del_comment",
+                        signature_id: signature_id,
+                        delete_id: id,
+                    };
+        
+                    $.ajax({
+                        type: "POST",
+                        url: "comments.php",
+                        data: data,
+                        success: function(res) {
+                           $("#comments_scroller").html(res);
+                           $('#comments_scroller').scrollTop($('#comments_scroller')[0].scrollHeight);
+                           updateDelLinks();
+                        },
+                    });
+                }
+                
+            });
+
+        });
+        
+    };
+    
+    $(function(){
+        $("#add_comment").button()
+        .on("click", function(){
+
+            data = {
+                ajax: 1,
+                action: "add_comment",
+                signature_id: signature_id,
+                comment: $("#comment_input").val(),
+            };
+
+            $.ajax({
+                type: "POST",
+                url: "comments.php",
+                data: data,
+                success: function(res) {
+                   $("#comments_scroller").html(res);
+                   $('#comments_scroller').scrollTop($('#comments_scroller')[0].scrollHeight);
+                   updateDelLinks();
+                },
+            });
+        });
+        
+        $('#comments_scroller').scrollTop($('#comments_scroller')[0].scrollHeight);
+        
+        updateDelLinks();
+    });
+</script>
+
+<div id="comments_frame">
+    <div id="comments_scroller" style="height: 300px; overflow-y: auto;"><?php echo self::renderComments($id) ?></div>
+    <div id="new_comment" style="height: 100px;">
+        <a id="add_comment">Add comment</a>
+        <textarea id="comment_input" class="ui-widget-content" style="display: block; width: 100%; height: 100%; margin-top: 5px;"></textarea>
+    </div>
+    <div style="height: 30px;"></div>
+</div>
+
+<?php
+
+
+
+
+    }
+
+}
\ No newline at end of file
diff --git a/htdocs/lib/CrashStats.php b/htdocs/lib/CrashStats.php
index 2c780f7..a410bbe 100644
--- a/htdocs/lib/CrashStats.php
+++ b/htdocs/lib/CrashStats.php
@@ -153,41 +153,4 @@ class CrashStats
         Memc::setq($q, $ret);
         return $ret;
     }
-    
-    function updateCommentCount($id)
-    {
-        $q = kl_str_sql("update signature set has_comments=(select count(*) as count from comment where signature_id=!i) where id=!i", $id, $id);
-        DBH::$db->query($q);
-    }
-    
-    function addSignatureComment($id, $text)
-    {
-        global $S;
-        $q = kl_str_sql("insert into comment (signature_id, user_id, comment) values (!i, !i, !s)", $id, $S->user_id, $text);
-        DBH::$db->query($q);
-        self::updateCommentCount($id);
-    }
-    
-    function getSignatureComments($id)
-    {
-        $ret = array();
-        $q = kl_str_sql("select c.*, u.name, u.email from comment c join users u on c.user_id = u.user_id where signature_id=!i order by id asc;", $id);
-        if (!$res = DBH::$db->query($q)) return;
-        
-        while ($row = DBH::$db->fetchRow($res))
-        {
-            $c = new stdClass;
-            DBH::$db->loadFromDbRow($c, $res, $row);
-            $ret[] = $c;
-        }
-        
-        return $ret;
-    }
-    
-    function delSignatureComment($id, $del_id)
-    {
-        $q = kl_str_sql("delete from comment where id=!i", $del_id);
-        DBH::$db->query($q);
-        self::updateCommentCount($id);
-    }
 }
\ No newline at end of file