Fr search

finished implementing old search