First draft of the new failover code.