Still adding searching stuff

I sense strong redundancy in this one