Sync with Cloud

Not finished yet