a lot of changes
Added init.py
Proper search implemented
Merge conflict fix