Migrate from local to sync
handle setup done elsewhere
message passing bugfix