         return 1;
     }
     func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        if let theBurger = self.myBurger
-        {
-            return theBurger.count
-        }
-        return 0
+        
+        return self.currentBurgerIngredients.count
+        
     }
     func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCellWithIdentifier("burgerIngredientCell") as UITableViewCell
         
-        if let theBurger = self.myBurger
-        {
-            cell.textLabel?.text = theBurger[indexPath.row]
-        }
+        cell.textLabel?.text = self.currentBurgerIngredients[indexPath.row]
         
         return cell
     }

        if editingStyle == UITableViewCellEditingStyle.Delete
        {
            // remove the item from the array
            if (self.myBurger != nil)
            {
                self.myBurger?.removeAtIndex(indexPath.row)
                
                // update the tableview
                self.tableview.deleteRowsAtIndexPaths([indexPath], withRowAnimation: UITableViewRowAnimation.Top)
            }
        }
    }


    var currentBurgerItem : Int = 0
    let burgerHandler = BurgerHandler.sharedHandler
    let possibleIngredients = BurgerHandler.sharedHandler.ingredientsList()
    
    // The current burger: an array of ingredients. Starts as an empty array.
    var currentBurgerIngredients : [String] = []
    
    override func viewDidLoad() {
        super.viewDidLoad()
