Need to add check for duplicates