Finished the find and add methods, with some bugs that still need to be worked out