diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py
index 18c76432a..330cf1606 100644
--- a/gui/shipBrowser.py
+++ b/gui/shipBrowser.py
@@ -91,11 +91,12 @@ class ShipBrowser(wx.Panel):
         self._stage2Data = categoryID
 
         sMarket = service.Market.getInstance()
+        sFit = service.Fit.getInstance()
         self.lpane.RemoveAllChildren()
         shipList = sMarket.getShipList(categoryID)
         shipList.sort(key=self.raceNameKey)
         for ID, name, race in shipList:
-            self.lpane.AddWidget(ShipItem(self.lpane, ID, (name, 0), race))
+            self.lpane.AddWidget(ShipItem(self.lpane, ID, (name, len(sFit.getFitsWithShip(ID))), race))
 
         self.lpane.RefreshList()
         self.Show()
@@ -433,7 +434,8 @@ class ShipItem(wx.Window):
         event.Skip()
 
     def createNewFit(self, event=None):
-        print "New :", self.tcFitName.GetValue(), "GTFO from stage2 to stage 3 (refresh stage 3)"
+        sFit = service.Fit.getInstance()
+        sFit.newFit(self.shipID, self.tcFitName.GetValue())
         self.tcFitName.Show(False)
         self.editWasShown = 0
         wx.PostEvent(self.shipBrowser,Stage3Selected(shipID=self.shipID))
@@ -641,8 +643,6 @@ class FitItem(wx.Window):
             self.editWasShown = 0
             self.Refresh()
 
-
-
         event.Skip()
 
     def renameFit(self, event=None):
diff --git a/service/fit.py b/service/fit.py
index f55ca07a3..fed1017e5 100644
--- a/service/fit.py
+++ b/service/fit.py
@@ -45,10 +45,10 @@ class Fit(object):
         fit = eos.db.getFit(fitID)
         return fit.modules[pos]
 
-    def newFit(self, shipID, name):
+    def newFit(self, shipID, name=None):
         fit = eos.types.Fit()
         fit.ship = eos.types.Ship(eos.db.getItem(shipID))
-        fit.name = name
+        fit.name = name if name is not None else "New %s" % fit.ship.item.name
         fit.damagePattern = DamagePattern.getInstance().getDamagePattern("Uniform")
         eos.db.save(fit)
         fit.calculateModifiedAttributes()