Basic structure for the search feature is complete.
Fixed multiple issues.