Feature/intermittent background sync