Adding better shell and file search