Added full search functionality; no tests yet
Merged ArvindWork2
Many more changes
Merged mahithWork into mine