Sync with Mac
Put the basic functionality together