Started adding search capabilities, along with progressive rendering