More work towards getting the state engine for waiting for a connection to come back together