additional work on sync; testing tabs
manual merge