Making the dup-checker a bit more fully functional, updated todo.