Also -- we should probably treat "_" as another special char.  Some religions use "_"s more than "-"s in filenames.