changed logic

ok
Made a bunch of changes

Fixed search and remove, hopefully this works
Commiting master changes before merging