Fr search

finished implementing old search
Clean up as we discussed