WIP reconnect for #12