Basic Search by name functionality now works. Needs Refactoring