Begin work refactoring archiving