Single archive support

Via #853 — for code review, and such.