Made some changes to how .find() works, inlined the duplicate check - should change...