Search Algorithm Updated

Search algorithm updated and just needs to be tested should be
significantly faster.