Continued working on synchronization. This references #135