[WIP] Moving to OOP for synchronization