diff --git a/mozilla/webtools/addons/shared/lib/amo.class.php b/mozilla/webtools/addons/shared/lib/amo.class.php
index dc56f3ce9f4..5b20c100020 100644
--- a/mozilla/webtools/addons/shared/lib/amo.class.php
+++ b/mozilla/webtools/addons/shared/lib/amo.class.php
@@ -6,9 +6,6 @@
  */
 class AMO_Object
 {
-    var $cats;
-    var $apps;
-    var $platforms;
     var $db;
     var $tpl;
 
@@ -59,16 +56,25 @@ class AMO_Object
 
     /**
      * Get all category names.
+     *
+     * @return array
      */
-    function getCats()
+    function getCats($type=null)
     {
+        if (!empty($type)) {
+            $typesql = " WHERE cattype='{$type}' ";
+        } else {
+            $typesql = '';
+        }
+
         // Gather categories.
         $this->db->query("
-            SELECT
+            SELECT DISTINCT
                 CategoryID,
                 CatName
             FROM
                 categories
+            {$typesql}
             GROUP BY
                 CatName
             ORDER BY
@@ -76,12 +82,16 @@ class AMO_Object
         ", SQL_INIT, SQL_ASSOC);
 
         do {
-            $this->Cats[$this->db->record['CategoryID']] = $this->db->record['CatName'];
+            $retval[$this->db->record['CategoryID']] = $this->db->record['CatName'];
         } while ($this->db->next(SQL_ASSOC));
+
+        return $retval;
     }
     
     /**
      * Get all operating system names (platforms).  Used to populate forms.
+     *
+     * @return array
      */
     function getPlatforms()
     {
@@ -97,9 +107,10 @@ class AMO_Object
         ", SQL_INIT, SQL_ASSOC);
 
         do { 
-            $this->Platforms[$this->db->record['OSID']] = $this->db->record['OSName'];
+            $retval[$this->db->record['OSID']] = $this->db->record['OSName'];
         } while ($this->db->next(SQL_ASSOC));
 
+        return $retval;
     }
 
     /**
@@ -121,8 +132,86 @@ class AMO_Object
         ", SQL_INIT, SQL_ASSOC);
 
         do {
-            $this->Apps[$this->db->record['AppID']] = $this->db->record['AppName'];
+            $retval[$this->db->record['AppID']] = $this->db->record['AppName'];
         } while ($this->db->next(SQL_ASSOC));
+
+        return $retval;
     }
+
+    /**
+     * Get newest addons.
+     *
+     * @param string $app
+     * @param string $type
+     * @param int $limit
+     * @return array
+     */
+    function getNewestAddons($app='firefox',$type='E',$limit=10) {
+
+        // Get most popular extensions based on application.
+        $this->db->query("
+            SELECT DISTINCT
+                TM.ID ID, 
+                TM.Name name, 
+                TM.downloadcount dc,
+                TV.DateUpdated as dateupdated
+            FROM
+                main TM
+            INNER JOIN version TV ON TM.ID = TV.ID
+            INNER JOIN applications TA ON TV.AppID = TA.AppID
+            INNER JOIN os TOS ON TV.OSID = TOS.OSID
+            WHERE
+                AppName = '{$app}' AND 
+                downloadcount > '0' AND
+                approved = 'YES' AND
+                Type = '{$type}'
+            GROUP BY
+                TM.ID
+            ORDER BY
+                TV.dateupdated DESC , downloadcount DESC, rating DESC
+            LIMIT 
+                {$limit}
+        ", SQL_ALL, SQL_ASSOC);
+
+        return $this->db->record;
+    }
+
+    /**
+     * Get most popular addons.
+     *
+     * @param string $app
+     * @param string $type
+     * @param int $limit
+     * @return array
+     */
+     function getPopularAddons($app='firefox',$type='E', $limit=10) {
+
+        // Return most popular addons.
+        $this->db->query("
+            SELECT DISTINCT
+                TM.ID ID, 
+                TM.Name name, 
+                TM.downloadcount dc,
+                TV.DateUpdated as dateupdated
+            FROM
+                main TM
+            INNER JOIN version TV ON TM.ID = TV.ID
+            INNER JOIN applications TA ON TV.AppID = TA.AppID
+            INNER JOIN os TOS ON TV.OSID = TOS.OSID
+            WHERE
+                AppName = '{$app}' AND 
+                downloadcount > '0' AND
+                approved = 'YES' AND
+                Type = '{$type}'
+            GROUP BY
+                TM.ID
+            ORDER BY
+                downloadcount DESC, rating DESC, TV.dateupdated DESC 
+            LIMIT 
+                {$limit}
+        ", SQL_ALL, SQL_ASSOC);
+
+        return $this->db->record;
+     }
 }
 ?>