Added rudimentary search-system