Sync up recent work, merge up schemas