Added search functionality

Not a very mature system though...