working on search
add working search
Simon removed
search done
clean team model