Feature/cash 150

Move this logic back into the search method. You are duplicating a lot of code and work here.