model + search

with new stuff