     
     override func viewDidLoad() {
         super.viewDidLoad()
-        // Do any additional setup after loading the view from its nib.
-        // tableView.rowHeight = UITableViewAutomaticDimension
+
         tableView.backgroundColor = UIColor.clearColor()
         
-        if let  sitesData = AppDataManageriOS.sharedInstance.defaults.dataForKey(DefaultKey.sitesArrayObjectsKey) {
-            if let sitesArray = NSKeyedUnarchiver.unarchiveObjectWithData(sitesData) as? [Site] {
-                sites = sitesArray
-            }
+        if let models = AppDataManageriOS.sharedInstance.defaults.arrayForKey(DefaultKey.modelArrayObjectsKey) as? [[String : AnyObject]] {
+            sites = models.flatMap( { WatchModel(fromDictionary: $0)?.generateSite() } )
         }
-        
-        // sites = AppDataManager.sharedInstance.sites
         
         let itemCount = sites.isEmpty ? 1 : sites.count
         

            let site = sites[indexPath.row]
            
            contentCell.configureCell(site)
            if (lastUpdatedTime?.timeIntervalSinceNow > 60 || lastUpdatedTime == nil || site.configuration == nil) {
                // No configuration was there... go get some.
                // println("Attempting to get configuration data from site...")
                refreshDataFor(site, index: indexPath.row)

            switch error {
                
            case .NoError :
                
                dispatch_async(dispatch_get_main_queue(), { () -> Void in
                    AppDataManageriOS.sharedInstance.updateSite(returnedSite)
                    self.lastUpdatedTime = returnedSite.lastConnectedDate
                    self.tableView.reloadRowsAtIndexPaths([NSIndexPath(forRow: index, inSection: 0)], withRowAnimation: .Automatic)
                    
                    AppDataManageriOS.sharedInstance.updateWatch(withAction: .UpdateComplication)
                })
                
                AppDataManageriOS.sharedInstance.saveData()
                
            default:
                print("\(__FUNCTION__) ERROR recieved: \(error.description)")
