Made some good progress on archiving