Merging the restart with bootstrap

It is time to make the merge into master.  At this point things are further along on this branch than master.  Will finish up there.