Better way of handling what happens in Search class implemented...