Initial working version of sync on demand