almost totally working!  Just have to fix line-up corruption on restore