diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate
index b6bfe13..6ea3898 100644
Binary files a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate and b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 77483bd..cd6efb9 100644
--- a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -42,11 +42,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/ListingPreviewViewController.swift"
-            timestampString = "494273923.911173"
+            timestampString = "494285108.864963"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "605"
-            endingLineNumber = "605"
+            startingLineNumber = "503"
+            endingLineNumber = "503"
             landmarkName = "ListingPreviewViewController"
             landmarkType = "3">
          </BreakpointContent>
@@ -58,11 +58,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/ListingPreviewViewController.swift"
-            timestampString = "494273923.911173"
+            timestampString = "494285108.864963"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "646"
-            endingLineNumber = "646"
+            startingLineNumber = "544"
+            endingLineNumber = "544"
             landmarkName = "collectionView(_:cellForItemAtIndexPath:)"
             landmarkType = "5">
          </BreakpointContent>
@@ -74,11 +74,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/ListingPreviewViewController.swift"
-            timestampString = "494273923.911173"
+            timestampString = "494285108.864963"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "617"
-            endingLineNumber = "617"
+            startingLineNumber = "515"
+            endingLineNumber = "515"
             landmarkName = "ListingPreviewViewController"
             landmarkType = "3">
          </BreakpointContent>
@@ -90,11 +90,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/ListingPreviewViewController.swift"
-            timestampString = "494273923.911173"
+            timestampString = "494285108.864963"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "738"
-            endingLineNumber = "738">
+            startingLineNumber = "636"
+            endingLineNumber = "636">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -104,11 +104,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/ListingPreviewViewController.swift"
-            timestampString = "494273923.911173"
+            timestampString = "494285108.864963"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "633"
-            endingLineNumber = "633"
+            startingLineNumber = "531"
+            endingLineNumber = "531"
             landmarkName = "collectionView(_:cellForItemAtIndexPath:)"
             landmarkType = "5">
          </BreakpointContent>
@@ -120,11 +120,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/ListingPreviewViewController.swift"
-            timestampString = "494273923.911173"
+            timestampString = "494285108.864963"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "716"
-            endingLineNumber = "716">
+            startingLineNumber = "614"
+            endingLineNumber = "614">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -150,11 +150,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/ListingPreviewViewController.swift"
-            timestampString = "494273923.911173"
+            timestampString = "494285108.864963"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "681"
-            endingLineNumber = "681"
+            startingLineNumber = "579"
+            endingLineNumber = "579"
             landmarkName = "ListingPreviewViewController"
             landmarkType = "3">
          </BreakpointContent>
@@ -182,11 +182,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/ListingPreviewViewController.swift"
-            timestampString = "494273923.911173"
+            timestampString = "494285108.864963"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "486"
-            endingLineNumber = "486"
+            startingLineNumber = "384"
+            endingLineNumber = "384"
             landmarkName = "publishItem(_:)"
             landmarkType = "5">
             <Locations>
@@ -230,11 +230,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/ListingPreviewViewController.swift"
-            timestampString = "494273923.911173"
+            timestampString = "494285108.864963"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "504"
-            endingLineNumber = "504"
+            startingLineNumber = "402"
+            endingLineNumber = "402"
             landmarkName = "publishItem(_:)"
             landmarkType = "5">
             <Locations>
@@ -278,11 +278,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/ListingPreviewViewController.swift"
-            timestampString = "494273923.911173"
+            timestampString = "494285108.864963"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "514"
-            endingLineNumber = "514"
+            startingLineNumber = "412"
+            endingLineNumber = "412"
             landmarkName = "publishItem(_:)"
             landmarkType = "5">
          </BreakpointContent>
@@ -294,11 +294,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/ListingPreviewViewController.swift"
-            timestampString = "494273923.911173"
+            timestampString = "494285108.864963"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "524"
-            endingLineNumber = "524"
+            startingLineNumber = "422"
+            endingLineNumber = "422"
             landmarkName = "publishItem(_:)"
             landmarkType = "5">
             <Locations>
@@ -357,11 +357,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/ListingPreviewViewController.swift"
-            timestampString = "494273923.911173"
+            timestampString = "494285108.864963"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "534"
-            endingLineNumber = "534"
+            startingLineNumber = "432"
+            endingLineNumber = "432"
             landmarkName = "publishItem(_:)"
             landmarkType = "5">
          </BreakpointContent>
@@ -373,11 +373,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/ListingPreviewViewController.swift"
-            timestampString = "494273923.911173"
+            timestampString = "494285108.864963"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "606"
-            endingLineNumber = "606"
+            startingLineNumber = "504"
+            endingLineNumber = "504"
             landmarkName = "ListingPreviewViewController"
             landmarkType = "3">
          </BreakpointContent>
@@ -389,11 +389,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/ListingPreviewViewController.swift"
-            timestampString = "494273923.911173"
+            timestampString = "494285108.864963"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "599"
-            endingLineNumber = "599"
+            startingLineNumber = "497"
+            endingLineNumber = "497"
             landmarkName = "ListingPreviewViewController"
             landmarkType = "3">
          </BreakpointContent>
@@ -467,11 +467,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/ListingPreviewViewController.swift"
-            timestampString = "494273923.911173"
+            timestampString = "494285108.864963"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "692"
-            endingLineNumber = "692">
+            startingLineNumber = "590"
+            endingLineNumber = "590">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -481,11 +481,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/ListingPreviewViewController.swift"
-            timestampString = "494273923.911173"
+            timestampString = "494285108.864963"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "725"
-            endingLineNumber = "725">
+            startingLineNumber = "623"
+            endingLineNumber = "623">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -527,11 +527,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/ListingPreviewViewController.swift"
-            timestampString = "494273923.911173"
+            timestampString = "494285108.864963"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "701"
-            endingLineNumber = "701">
+            startingLineNumber = "599"
+            endingLineNumber = "599">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
diff --git a/Vendoo/.DS_Store b/Vendoo/.DS_Store
index 37fe525..661de9b 100644
Binary files a/Vendoo/.DS_Store and b/Vendoo/.DS_Store differ
diff --git a/Vendoo/CategoriesTableViewController.swift b/Vendoo/CategoriesTableViewController.swift
index c8e14c9..f3081ef 100644
--- a/Vendoo/CategoriesTableViewController.swift
+++ b/Vendoo/CategoriesTableViewController.swift
@@ -569,10 +569,111 @@ class CategoriesTableViewController: UIViewController, UITableViewDelegate, UITa
     }
     
     func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
-        self.selectedCategory = self.categories[indexPath.row]
+        
+        switch self.categories[indexPath.row] {
+        case "Antiques":
+            self.selectedCategory = "Antiques"
+            break
+        case "Art":
+            self.selectedCategory = "Art"
+            break
+        case "Baby":
+            self.selectedCategory = "Baby"
+            break
+        case "Bath, Beauty & Health":
+            self.selectedCategory = "Health and Beauty"
+            break
+        case "Books":
+            self.selectedCategory = "Books"
+            break
+        case "Business & Industrial":
+            self.selectedCategory = "Business and Industrial"
+            break
+        case "Cameras & Photo":
+            self.selectedCategory = "Cameras and Photo"
+            break
+        case "Cell Phones & Accessories":
+            self.selectedCategory = "Cell Phones and Accessories"
+            break
+        case "Clothing & Shoes":
+            self.selectedCategory = "Clothing, Shoes and Accessories"
+            break
+        case "Coins & Paper Money":
+            self.selectedCategory = "Coins and Paper Money"
+            break
+        case "Collectibles":
+            self.selectedCategory = "Collectibles"
+            break
+        case "Computers/Tablets and Networking":
+            self.selectedCategory = "Computers/Tablets and Networking"
+            break
+        case "Consumer Electronics":
+            self.selectedCategory = "Consumer Electronics"
+            break
+        case "Crafts":
+            self.selectedCategory = "Crafts"
+            break
+        case "Dolls & Miniatures":
+            self.selectedCategory = "Dolls and Bears"
+            break
+        case "DVDs & Movies":
+            self.selectedCategory = "DVDs & Movies"
+            break
+        case "Entertainment Memorabilia":
+            self.selectedCategory = "Entertainment Memorabilia"
+            break
+        case "Everything Else":
+            self.selectedCategory = "Everything Else"
+            break
+        case "Gift Cards & Coupons":
+            self.selectedCategory = "Gift Cards and Coupons"
+            break
+        case "Home/Houseware & Garden":
+            self.selectedCategory = "Coins and Paper Money"
+            break
+        case "Jewelry & Watches":
+            self.selectedCategory = "Jewelry and Watches"
+            break
+        case "Musical Instruments & Gear":
+            self.selectedCategory = "Musical Instruments and Gear"
+            break
+        case "Pet Supplies":
+            self.selectedCategory = "Pet Supplies"
+            break
+        case "Pottery & Glass":
+            self.selectedCategory = "Pottery and Glass"
+            break
+        case "Real Estate":
+            self.selectedCategory = "Real Estate"
+            break
+        case "Specialty Services":
+            self.selectedCategory = "Specialty Services"
+            break
+        case "Sporting Goods":
+            self.selectedCategory = "Sporting Goods"
+            break
+        case "Sports Memorabilia & Fan Shop":
+            self.selectedCategory = "Sports Mem, Cards and Fan Shop"
+            break
+        case "Tickets & Experiences":
+            self.selectedCategory = "Tickets and Experiences"
+            break
+        case "Toys & Hobbies":
+            self.selectedCategory = "Toys and Hobbies"
+            break
+        case "Travel":
+            self.selectedCategory = "Travel"
+            break
+        case "Video Games & Consoles":
+            self.selectedCategory = "Video Games and Consoles"
+            break
+        default:
+            break
+        }
+        
         let cell: CategoryCell! = tableView.cellForRowAtIndexPath(indexPath) as! CategoryCell//tableView.dequeueReusableCellWithIdentifier("CategoryCell", forIndexPath: indexPath) as? CategoryCell
         if(cell.shouldAskAboutLeafCategories){
-            var alert = UIAlertController(title: "Explore Subcategories", message: "Would you like to see the subcategories for \(self.selectedCategory). NOTE: Only Required If Posting to Ebay", preferredStyle: .Alert)
+            let alert = UIAlertController(title: "Explore Subcategories", message: "Would you like to see the subcategories for \(self.selectedCategory). NOTE: Only Required If Posting to Ebay", preferredStyle: .Alert)
             
             alert.addAction(UIAlertAction(title: "Yes", style: .Default, handler: {(action: UIAlertAction!) in
                 self.navigateCategories()
diff --git a/Vendoo/CategoryPopUpController.swift b/Vendoo/CategoryPopUpController.swift
index 8807fc1..8e85e20 100644
--- a/Vendoo/CategoryPopUpController.swift
+++ b/Vendoo/CategoryPopUpController.swift
@@ -59,6 +59,7 @@ class CategoryPopUpController: UIViewController {
             }
         }
         
+        self.categoryList = Dictionary<Int, AnyObject>()
         self.ebayManager.getSubCategories(selectedCategory, detailLevel: self.parentCategory.count + 1, catCode: catCode, onCompletion: {
             (dict, error) -> Void in
             var index = 0
diff --git a/Vendoo/ListingPreviewViewController.swift b/Vendoo/ListingPreviewViewController.swift
index 63f7fd1..3d26171 100644
--- a/Vendoo/ListingPreviewViewController.swift
+++ b/Vendoo/ListingPreviewViewController.swift
@@ -174,108 +174,6 @@ extension ListingPreviewViewController {
             //post to ebay
             if(self.networksDictionary["ebay"]!){
                 dispatch_group_enter(postingGroup)
-                var categoryCode: String!
-                var dict = EbayWebServiceManager.settingsDictionary["categories"]!
-                switch self.itemCategory.text {
-                case "Antiques":
-                    categoryCode = (dict["Antiques"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Art":
-                    categoryCode = (dict["Art"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Baby":
-                    categoryCode = (dict["Baby"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Bath, Beauty & Health":
-                    categoryCode = (dict["Health and Beauty"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Books":
-                    categoryCode = (dict["Books"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Business & Industrial":
-                    categoryCode = (dict["Business and Industrial"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Cameras & Photo":
-                    categoryCode = (dict["Cameras and Photo"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Cell Phones & Accessories":
-                    categoryCode = (dict["Cell Phones and Accessories"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Clothing & Shoes":
-                    categoryCode = (dict["Clothing, Shoes and Accessories"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Coins & Paper Money":
-                    categoryCode = (dict["Coins and Paper Money"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Collectibles":
-                    categoryCode = (dict["Collectibles"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Computers/Tablets and Networking":
-                    categoryCode = (dict["Computers/Tablets and Networking"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Consumer Electronics":
-                    categoryCode = (dict["Consumer Electronics"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Crafts":
-                    categoryCode = (dict["Crafts"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Dolls & Miniatures":
-                    categoryCode = (dict["Dolls and Bears"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "DVDs & Movies":
-                    categoryCode = (dict["DVDs & Movies"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Entertainment Memorabilia":
-                    categoryCode = (dict["Entertainment Memorabilia"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Everything Else":
-                    categoryCode = (dict["Everything Else"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Gift Cards & Coupons":
-                    categoryCode = (dict["Gift Cards and Coupons"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Home/Houseware & Garden":
-                    categoryCode = (dict["Coins and Paper Money"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Jewelry & Watches":
-                    categoryCode = (dict["Jewelry and Watches"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Musical Instruments & Gear":
-                    categoryCode = (dict["Musical Instruments and Gear"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Pet Supplies":
-                    categoryCode = (dict["Pet Supplies"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Pottery & Glass":
-                    categoryCode = (dict["Pottery and Glass"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Real Estate":
-                    categoryCode = (dict["Real Estate"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Specialty Services":
-                    categoryCode = (dict["Specialty Services"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Sporting Goods":
-                    categoryCode = (dict["Sporting Goods"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Sports Memorabilia & Fan Shop":
-                    categoryCode = (dict["Sports Mem, Cards and Fan Shop"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Tickets & Experiences":
-                    categoryCode = (dict["Tickets and Experiences"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Toys & Hobbies":
-                    categoryCode = (dict["Toys and Hobbies"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Travel":
-                    categoryCode = (dict["Travel"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                case "Video Games & Consoles":
-                    categoryCode = (dict["Video Games and Consoles"] as! Dictionary<String, AnyObject>)["cat_id"] as! String
-                    break
-                default:
-                    break
-                }
                 
                 let body: [String: String] = [ "title": self.itemTitle.text,
                                                   "quantity":self.itemQuantity.text,