New Feature (Additonal): Search Functionality

Stylistic Changes / deletion fixes