Added rudimental search functionality