Merged Evan's stuff

y u change search :(