* start work on better searches
* add locations