Added search. Not completely stable