Fail point

Need to revert, committing this to allow it.
Revert "Fail point"

This reverts commit c6eab52b1aab3b83c35baf2919ec17022f531e1c.
checkpoint #3

various progress including the Join Marquis