Modify-(First copy, still needs work)

Trying to follow the style that Xiao used for search to maintain
consistency