beginning stages of a search bar
more changes
completing the merge