Search refactor

This is based from master and should be able to merge now.  Will wait till this one is merged before starting the next.
The filename should change if you're not going to use the Castles of Burgundy as the entry. Boo to choosing Dune anyway! :-)