last commit included ways to handle the search stuff and zoom stuff better as well.