Almost have this working again – I slightly mangled the restoration of entries here, so it’ll be a bit.