Started work on sync functionality