WIP - Sync event based on location only removing needs for same state