FIX synchronization. Tests are still missing.