More work towards duplicate entries, not quite done.