Jurn's Commit

Added Search Stuff