Index: src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py
===================================================================
--- src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py	(revision 83d6249504661920123f31d028c17441433bf318)
+++ src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py	(revision 83d6249504661920123f31d028c17441433bf318)
@@ -1,7 +1,15 @@
 import sys
+import json
+import  os
 from PyQt4 import QtGui
 from PyQt4 import QtCore
 
 from UI.FittingUI import Ui_FittingUI
+
+from sasmodels import generate
+from sasmodels import modelinfo
+
+from collections import defaultdict
+from sas.sasgui.guiframe.CategoryInstaller import CategoryInstaller
 
 class FittingWindow(QtGui.QDialog, Ui_FittingUI):
@@ -13,6 +21,13 @@
         self.setupUi(self)
 
+        self._readCategoryInfo()
+        cat_list = sorted(self.master_category_dict.keys())
+        self.comboBox.addItems(cat_list)
         self.tableView.setModel(self._model_model)
-        self.setModelModel()
+
+        model_list = self.master_category_dict['Cylinder']
+        for (model, enabled) in model_list:
+            self.comboBox_2.addItem(model)
+        self.setModelModel('barbell')
 
         self.pushButton.setEnabled(False)
@@ -35,58 +50,72 @@
             self.tableView_2.setIndexWidget(i,c)
 
+    def _readCategoryInfo(self):
+        """
+        Reads the categories in from file
+        """
+        self.master_category_dict = defaultdict(list)
+        self.by_model_dict = defaultdict(list)
+        self.model_enabled_dict = defaultdict(bool)
+
+        try:
+            categorization_file = CategoryInstaller.get_user_file()
+            if not os.path.isfile(categorization_file):
+                categorization_file = CategoryInstaller.get_default_file()
+            cat_file = open(categorization_file, 'rb')
+            self.master_category_dict = json.load(cat_file)
+            self._regenerate_model_dict()
+            cat_file.close()
+        except IOError:
+            raise
+            print 'Problem reading in category file.'
+            print 'We even looked for it, made sure it was there.'
+            print 'An existential crisis if there ever was one.'
+
+    def _regenerate_model_dict(self):
+        """
+        regenerates self.by_model_dict which has each model name as the
+        key and the list of categories belonging to that model
+        along with the enabled mapping
+        """
+        self.by_model_dict = defaultdict(list)
+        for category in self.master_category_dict:
+            for (model, enabled) in self.master_category_dict[category]:
+                self.by_model_dict[model].append(category)
+                self.model_enabled_dict[model] = enabled
+
         
-    def setModelModel(self):
+    def setModelModel(self, model_name):
         # Crete/overwrite model items
 
-        parameters=[]
-        p=["scale", "1", "0", "inf", ""]
-        for i in xrange(1):
-            #for parameter in parameters.keys():
-            item1 = QtGui.QStandardItem("background")
+        model_name = str(model_name)
+        kernel_module = generate.load_kernel_module(model_name)
+        parameters = modelinfo.make_parameter_table(getattr(kernel_module, 'parameters', []))
+
+        #TODO: scaale and background are implicit in sasmodels and needs to be added
+        item1 = QtGui.QStandardItem('scale')
+        item1.setCheckable(True)
+        item2 = QtGui.QStandardItem('1.0')
+        item3 = QtGui.QStandardItem('0.0')
+        item4 = QtGui.QStandardItem('inf')
+        item5 = QtGui.QStandardItem('')
+        self._model_model.appendRow([item1, item2, item3, item4, item5])
+
+        item1 = QtGui.QStandardItem('background')
+        item1.setCheckable(True)
+        item2 = QtGui.QStandardItem('0.001')
+        item3 = QtGui.QStandardItem('-inf')
+        item4 = QtGui.QStandardItem('inf')
+        item5 = QtGui.QStandardItem('1/cm')
+        self._model_model.appendRow([item1, item2, item3, item4, item5])
+
+        #TODO: iq_parameters are used here. If orientation paramateres or magnetic are needed kernel_paramters should be used instead
+        #For orientation and magentic parameters param.type needs to be checked
+        for param in parameters.iq_parameters:
+            item1 = QtGui.QStandardItem(param.name)
             item1.setCheckable(True)
-            item2 = QtGui.QStandardItem("0.001")
-            item3 = QtGui.QStandardItem("-inf")
-            item4 = QtGui.QStandardItem("inf")
-            item5 = QtGui.QStandardItem("1/cm")
-            self._model_model.appendRow([item1, item2, item3, item4, item5])
-
-            item1 = QtGui.QStandardItem("l_radius")
-            item1.setCheckable(True)
-            item2 = QtGui.QStandardItem("100")
-            item3 = QtGui.QStandardItem("0")
-            item4 = QtGui.QStandardItem("inf")
-            item5 = QtGui.QStandardItem("A")
-            self._model_model.appendRow([item1, item2, item3, item4, item5])
-
-            item1 = QtGui.QStandardItem("ls_sld")
-            item1.setCheckable(True)
-            item2 = QtGui.QStandardItem("3.5e-06")
-            item3 = QtGui.QStandardItem("0")
-            item4 = QtGui.QStandardItem("inf")
-            item5 = QtGui.QStandardItem("1/A^2")
-            self._model_model.appendRow([item1, item2, item3, item4, item5])
-
-            item1 = QtGui.QStandardItem("s_radius")
-            item1.setCheckable(True)
-            item2 = QtGui.QStandardItem("25")
-            item3 = QtGui.QStandardItem("0")
-            item4 = QtGui.QStandardItem("inf")
-            item5 = QtGui.QStandardItem("A")
-            self._model_model.appendRow([item1, item2, item3, item4, item5])
-
-            item1 = QtGui.QStandardItem("solvent_sld")
-            item1.setCheckable(True)
-            item2 = QtGui.QStandardItem("6.36e-06")
-            item3 = QtGui.QStandardItem("0")
-            item4 = QtGui.QStandardItem("inf")
-            item5 = QtGui.QStandardItem("1/A^2")
-            self._model_model.appendRow([item1, item2, item3, item4, item5])
-
-            item1 = QtGui.QStandardItem("vol_frac_ls")
-            item1.setCheckable(True)
-            item2 = QtGui.QStandardItem("0.1")
-            item3 = QtGui.QStandardItem("0")
-            item4 = QtGui.QStandardItem("inf")
-            item5 = QtGui.QStandardItem("")
+            item2 = QtGui.QStandardItem(str(param.default))
+            item3 = QtGui.QStandardItem(str(param.limits[0]))
+            item4 = QtGui.QStandardItem(str(param.limits[1]))
+            item5 = QtGui.QStandardItem(param.units)
             self._model_model.appendRow([item1, item2, item3, item4, item5])
 
Index: src/sas/qtgui/Perspectives/Fitting/UI/FittingUI.ui
===================================================================
--- src/sas/qtgui/Perspectives/Fitting/UI/FittingUI.ui	(revision 83d6249504661920123f31d028c17441433bf318)
+++ src/sas/qtgui/Perspectives/Fitting/UI/FittingUI.ui	(revision 83d6249504661920123f31d028c17441433bf318)
@@ -7,5 +7,5 @@
     <x>0</x>
     <y>0</y>
-    <width>613</width>
+    <width>674</width>
     <height>723</height>
    </rect>
@@ -133,30 +133,8 @@
                 </item>
                 <item row="1" column="0">
-                 <widget class="QComboBox" name="comboBox">
-                  <item>
-                   <property name="text">
-                    <string>Shapes</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Shape-independent</string>
-                   </property>
-                  </item>
-                 </widget>
+                 <widget class="QComboBox" name="comboBox"/>
                 </item>
                 <item row="1" column="1">
-                 <widget class="QComboBox" name="comboBox_2">
-                  <item>
-                   <property name="text">
-                    <string>Binary HS Model</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>None</string>
-                   </property>
-                  </item>
-                 </widget>
+                 <widget class="QComboBox" name="comboBox_2"/>
                 </item>
                 <item row="1" column="2">
