GearSwap - Switching to using IDs