Added first rudimentary search capability