Rework archiving

Addresses #102
Merge remote-tracking branch 'origin/master'
Tweak archiving

Addresses #102