Start implementing timestamps into sync