sort by name, sort by date.  Need to do some cleanup, but it works