More work on better restart / state approach.