Still moving stuff into the sync_engine. Might have to make it sync-centric.