More work on reboot/save config