first pass at decoupling from archiver.