starting to sanitize some of our search
merge conflict