TODO: don't add dups

done :-)