Added rudimentary search