rewrite of search controller
works.. now clean up location stuff