add() and find() are working correctly

fixing issues with next() now