Rethinking of shuffling and finishing out of some stuff on the Crisis form.