Added a case for folders, still to-be-implemented