big syncing changes, partially complete