More archive work, almost user facing complete