WIP for Matt.  Search results shown in messy way atm