FIrst pass at upstream syncs