             // TIMEBUCKETCELL
             if goaltype == "BudgetGoal" && activityGoal.maxDurationMinutes > 0 {
                 let cell: TimeBucketControlCell = tableView.dequeueReusableCellWithIdentifier("TimeBucketControlCell", forIndexPath: indexPath) as! TimeBucketControlCell
-                if animatedCells.contains(indexPath.row) {
-                    cell.animate = false
-                } else {
-                    cell.animate = true
-                }
+                
+                animateCell(cell, row: indexPath.row)
                 cell.setUpView(activityGoal)
                 animatedCells.append(indexPath.row)
                 return cell

        }
        // WE SHOULD NEVER END HERE ....
        return UITableViewCell(frame: CGRectZero)
    }
    
    // MARK: - Data loaders

            // TODO:  Changes this once the cell has been created
            else if goaltype == "BudgetGoal" && activityGoal.maxDurationMinutes == 0  {
                let cell: TimeBucketControlCell = tableView.dequeueReusableCellWithIdentifier("TimeBucketControlCell", forIndexPath: indexPath) as! TimeBucketControlCell

                animateCell(cell, row: indexPath.row)
                cell.setUpView(activityGoal)
                animatedCells.append(indexPath.row)
                return cell
