Initial stab at proper unique constraints