WIP: Started sync functionality