Debugged find and implemented add

Haven't tested them yet. Hopefully they work fine.