Big step forward, batch sync works now