         fields.append(self.unitsSystemField)
         fields.append(self.weightField)
         fields.append(self.heightField)
-        
+
         return fields
     }
-    
+
+    // TODO: Yanif: these should all be pulled from the UserManager.
     func setupValues() {
         let profileInfo = UserManager.sharedManager.getProfileCache()
-        
+
         for item in items {
-            
             if item.type == .FirstName {
                 item.setNewValue(AccountManager.shared.userInfo?.firstName)
             }

import MetabolicCompassKit

class ProfileModel: UserInfoModel {
    
    override func modelItems() -> [ModelItem] {
        
        var fields = [ModelItem]()
        
        fields.append(self.loadPhotoField)
        fields.append(self.firstNameField)
        fields.append(self.lastNameField)

            }
            else if item.type == .Email {
                item.setNewValue(UserManager.sharedManager.getUserId())
            }
            else {
                let profileItemInfo = profileInfo[item.name]

                if item.type == .Gender {
                    let gender = Gender.valueByTitle(profileItemInfo as! String)
                    item.setNewValue(gender.rawValue)
