Getting the popup to work and have uniques
Fixing conflicts