Began implementing find and add, first test not passed yet