Modifed to return a file listing as well