Search

Search is merged with master and it works. Needs to be merged