Add basic state syncing class
Update TODO