continue
finish implemenation of search