Started syncing and refactoring