finish find(), starts to add wrappers and test