Added more code for syncing.
Added configs for sync.
Added sync message.
Merge branch 'test' into dev