added 'archive' and tests