Still working on bugs in iCloud migration strategy.