progress on sync stuff