[WIP] #15

Lookup completed
Search WIP  ;)