Tom - adjusting code to cope with archives from local filesystem.