inital search working
tightening up search