Large restore config code change, initial

eom

Signed-off-by: Robert Tipton <tret@tretflix.com>