Standing Pull Request For the Search/Buttons

This is not complete.  Threw this up here so that I could use github as a reference for previous versions as there are a lot modifications.