Merged the listeners together so we only have one listener.  Also added
check for PhysicalShop