TODO: don't add class dups

done :-)